Avoids edge case causing missing blocks due to backfilling blocks ahe… (#170)

* Avoids edge case causing missing blocks due to backfilling blocks ahead of the event scraper.

* Prettier.

* Upper case SQL.

---------

Co-authored-by: Andrés Elizondo <[email protected]>

Author: AndresElizondo

src/config.ts

@@ -146,10 +146,10 @@ export const SCRAPER_MODE: ScraperMode =
     process.env.SCRAPER_MODE === undefined
         ? DEFAULT_SCRAPER_MODE
         : process.env.SCRAPER_MODE === 'BLOCKS'
-            ? 'BLOCKS'
-            : process.env.SCRAPER_MODE === 'EVENTS'
-                ? 'EVENTS'
-                : throwError('Wrong SCRAPER_MODE');
+        ? 'BLOCKS'
+        : process.env.SCRAPER_MODE === 'EVENTS'
+        ? 'EVENTS'
+        : throwError('Wrong SCRAPER_MODE');
 export const METRICS_PATH = process.env.METRICS_PATH || DEFAULT_METRICS_PATH;
 
 export const PROMETHEUS_PORT = getIntConfig('PROMETHEUS_PORT', DEFAULT_PROMETHEUS_PORT);
@@ -390,13 +390,13 @@ export const FEAT_UNISWAP_V2_PAIR_CREATED_EVENT = getBoolConfig(
 export const UNISWAP_V2_PAIR_CREATED_PROTOCOL_CONTRACT_ADDRESSES_AND_START_BLOCKS = process.env
     .UNISWAP_V2_PAIR_CREATED_PROTOCOL_CONTRACT_ADDRESSES_AND_START_BLOCKS
     ? process.env.UNISWAP_V2_PAIR_CREATED_PROTOCOL_CONTRACT_ADDRESSES_AND_START_BLOCKS.split(',').map((contract) => {
-        const [name, factoryAddress, startBlock] = contract.split(':');
-        return {
-            name,
-            factoryAddress,
-            startBlock: parseInt(startBlock),
-        };
-    })
+          const [name, factoryAddress, startBlock] = contract.split(':');
+          return {
+              name,
+              factoryAddress,
+              startBlock: parseInt(startBlock),
+          };
+      })
     : [];
 
 if (

src/scripts/pull_and_save_block_events.ts

@@ -363,6 +363,7 @@ export class BlockEventsScraper {
             `SELECT DISTINCT block_number
              FROM ${SCHEMA}.tx_backfill
              WHERE done = false
+             AND block_number < (SELECT MAX(block_number) FROM ${SCHEMA}.blocks)
              ORDER BY block_number
              LIMIT ${MAX_BLOCKS_TO_PULL}`,
         );