Merge pull request #1390 from ethereum-optimism/develop

Develop To Master PR

.changeset/real-cooks-lick.md

+---
+"@eth-optimism/core-utils": patch
+---
+
+Watcher: Make blocks to fetch a config option

.changeset/strong-crabs-hammer.md

+---
+"@eth-optimism/core-utils": patch
+---
+
+Lower NUM_BLOCKS_TO_FETCH in Watcher

packages/core-utils/src/watcher.ts

@@ -11,13 +11,14 @@ export interface WatcherOptions {
   l1: Layer
   l2: Layer
   pollInterval?: number
+  blocksToFetch?: number
 }
 
 export class Watcher {
   public l1: Layer
   public l2: Layer
   public pollInterval = 3000
-  public NUM_BLOCKS_TO_FETCH = 10_000_000
+  public blocksToFetch = 2000
 
   constructor(opts: WatcherOptions) {
     this.l1 = opts.l1
@@ -25,6 +26,9 @@ export class Watcher {
     if (opts.pollInterval) {
       this.pollInterval = opts.pollInterval
     }
+    if (opts.blocksToFetch) {
+      this.blocksToFetch = opts.blocksToFetch
+    }
   }
 
   public async getMessageHashesFromL1Tx(l1TxHash: string): Promise<string[]> {
@@ -83,7 +87,7 @@ export class Watcher {
     // scan for transaction with specified message
     while (matches.length === 0) {
       const blockNumber = await layer.provider.getBlockNumber()
-      const startingBlock = Math.max(blockNumber - this.NUM_BLOCKS_TO_FETCH, 0)
+      const startingBlock = Math.max(blockNumber - this.blocksToFetch, 0)
       const successFilter: ethers.providers.Filter = {
         address: layer.messengerAddress,
         topics: [ethers.utils.id(`RelayedMessage(bytes32)`)],