Merge pull request #1404 from ethereum-optimism/matt/watcher-l1-l2-blocksToFetch

tynes · web-flow · commit 0aea323d3326 · 2021-09-22T13:48:39.000-07:00
Watcher: l1 vs l2 blocksToFetch
diff --git a/.changeset/yellow-windows-scream.md b/.changeset/yellow-windows-scream.md
@@ -0,0 +1,5 @@
+---
+'@eth-optimism/core-utils': minor
+---
+
+Allow a configurable L1 and L2 blocks to fetch in the watcher
diff --git a/packages/core-utils/src/watcher.ts b/packages/core-utils/src/watcher.ts
@@ -2,33 +2,43 @@
 import { ethers } from 'ethers'
 import { Provider, TransactionReceipt } from '@ethersproject/abstract-provider'
 
+const SENT_MESSAGE = ethers.utils.id('SentMessage(bytes)')
+const RELAYED_MESSAGE = ethers.utils.id(`RelayedMessage(bytes32)`)
+const FAILED_RELAYED_MESSAGE = ethers.utils.id(`FailedRelayedMessage(bytes32)`)
+
 export interface Layer {
   provider: Provider
   messengerAddress: string
+  blocksToFetch?: number
 }
 
 export interface WatcherOptions {
   l1: Layer
   l2: Layer
   pollInterval?: number
   blocksToFetch?: number
+  pollForPending?: boolean
 }
 
 export class Watcher {
   public l1: Layer
   public l2: Layer
   public pollInterval = 3000
   public blocksToFetch = 1500
+  public pollForPending = true
 
   constructor(opts: WatcherOptions) {
     this.l1 = opts.l1
     this.l2 = opts.l2
-    if (opts.pollInterval) {
+    if (typeof opts.pollInterval === 'number') {
       this.pollInterval = opts.pollInterval
     }
-    if (opts.blocksToFetch) {
+    if (typeof opts.blocksToFetch === 'number') {
       this.blocksToFetch = opts.blocksToFetch
     }
+    if (typeof opts.pollForPending === 'boolean') {
+      this.pollForPending = opts.pollForPending
+    }
   }
 
   public async getMessageHashesFromL1Tx(l1TxHash: string): Promise<string[]> {
@@ -40,14 +50,14 @@ export class Watcher {
 
   public async getL1TransactionReceipt(
     l2ToL1MsgHash: string,
-    pollForPending = true
+    pollForPending?
   ): Promise<TransactionReceipt> {
     return this.getTransactionReceipt(this.l1, l2ToL1MsgHash, pollForPending)
   }
 
   public async getL2TransactionReceipt(
     l1ToL2MsgHash: string,
-    pollForPending = true
+    pollForPending?
   ): Promise<TransactionReceipt> {
     return this.getTransactionReceipt(this.l2, l1ToL2MsgHash, pollForPending)
   }
@@ -65,7 +75,7 @@ export class Watcher {
     for (const log of receipt.logs) {
       if (
         log.address === layer.messengerAddress &&
-        log.topics[0] === ethers.utils.id('SentMessage(bytes)')
+        log.topics[0] === SENT_MESSAGE
       ) {
         const [message] = ethers.utils.defaultAbiCoder.decode(
           ['bytes'],
@@ -80,22 +90,31 @@ export class Watcher {
   public async getTransactionReceipt(
     layer: Layer,
     msgHash: string,
-    pollForPending = true
+    pollForPending?
   ): Promise<TransactionReceipt> {
+    if (typeof pollForPending !== 'boolean') {
+      pollForPending = this.pollForPending
+    }
+
     let matches: ethers.providers.Log[] = []
 
+    let blocksToFetch = layer.blocksToFetch
+    if (typeof blocksToFetch !== 'number') {
+      blocksToFetch = this.blocksToFetch
+    }
+
     // scan for transaction with specified message
     while (matches.length === 0) {
       const blockNumber = await layer.provider.getBlockNumber()
-      const startingBlock = Math.max(blockNumber - this.blocksToFetch, 0)
+      const startingBlock = Math.max(blockNumber - blocksToFetch, 0)
       const successFilter: ethers.providers.Filter = {
         address: layer.messengerAddress,
-        topics: [ethers.utils.id(`RelayedMessage(bytes32)`)],
+        topics: [RELAYED_MESSAGE],
         fromBlock: startingBlock,
       }
       const failureFilter: ethers.providers.Filter = {
         address: layer.messengerAddress,
-        topics: [ethers.utils.id(`FailedRelayedMessage(bytes32)`)],
+        topics: [FAILED_RELAYED_MESSAGE],
         fromBlock: startingBlock,
       }
       const successLogs = await layer.provider.getLogs(successFilter)

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'@eth-optimism/core-utils': minor
 +---
++
 +Allow a configurable L1 and L2 blocks to fetch in the watcher