Only load transactions, blocks, and events from after the fork block (#…

…5221)
trufflesuite · Feb 6, 2023 · 940de3e · 940de3e
1 parent 2b4e426
commit 940de3e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/src/integrations/ethereum/common/redux/blocks/actions.js b/src/integrations/ethereum/common/redux/blocks/actions.js
@@ -13,11 +13,16 @@ export const clearBlocksInView = function() {
 };
 
 export const requestPage = function(startBlockNumber, endBlockNumber) {
-  endBlockNumber = endBlockNumber || 0;
   return function(dispatch, getState) {
     if (startBlockNumber == null) {
       startBlockNumber = getState().core.latestBlock;
     }
+    if (endBlockNumber == null) {
+      const state = getState();
+      endBlockNumber = state.config.settings.workspace.server.fork
+        ? state.config.settings.workspace.server.fork_block_number + 1
+        : 0;
+    }
 
     let earliestBlockToRequest = Math.max(
       startBlockNumber - PAGE_SIZE,

diff --git a/src/integrations/ethereum/common/redux/events/actions.js b/src/integrations/ethereum/common/redux/events/actions.js
@@ -19,11 +19,17 @@ export const setSubscribedTopics = function(topics) {
 
 export const SET_LOADING = `${prefix}/SET_LOADING`;
 export const requestPage = function(startBlockNumber, endBlockNumber) {
-  endBlockNumber = endBlockNumber || 0;
   return async function(dispatch, getState) {
     if (startBlockNumber == null) {
       startBlockNumber = getState().core.latestBlock;
     }
+    if (endBlockNumber == null) {
+      const state = getState();
+      endBlockNumber = state.config.settings.workspace.server.fork
+        ? state.config.settings.workspace.server.fork_block_number + 1
+        : 0;
+    }
+
 
     let earliestBlockToRequest = Math.max(
       startBlockNumber - PAGE_SIZE,

diff --git a/src/integrations/ethereum/common/redux/transactions/actions.js b/src/integrations/ethereum/common/redux/transactions/actions.js
@@ -17,11 +17,16 @@ export const clearTransactionsInView = function() {
 
 export const SET_LOADING = `${prefix}/SET_LOADING`;
 export const requestPage = function(startBlockNumber, endBlockNumber) {
-  endBlockNumber = endBlockNumber || 0;
   return function(dispatch, getState) {
     if (startBlockNumber == null) {
       startBlockNumber = getState().core.latestBlock;
     }
+    if (endBlockNumber == null) {
+      const state = getState();
+      endBlockNumber = state.config.settings.workspace.server.fork
+        ? state.config.settings.workspace.server.fork_block_number + 1
+        : 0;
+    }
 
     let earliestBlockRequested = Math.max(
       startBlockNumber - PAGE_SIZE,