Merge branch 'develop' into fix/fix-monotonicity-auto-heal

ethereum-optimism · Jun 11, 2021 · 33ccb2c · 33ccb2c
2 parents 0e8eacf + 85362d4
commit 33ccb2c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/.changeset/weak-terms-worry.md b/.changeset/weak-terms-worry.md
@@ -0,0 +1,5 @@
+---
+'@eth-optimism/batch-submitter': patch
+---
+
+Log additional data in monotonicity violation
diff --git a/packages/batch-submitter/src/batch-submitter/tx-batch-submitter.ts b/packages/batch-submitter/src/batch-submitter/tx-batch-submitter.ts
@@ -356,13 +356,17 @@ export class TransactionBatchSubmitter extends BatchSubmitter {
     // Verify all of the batch elements are monotonic
     let lastTimestamp: number
     let lastBlockNumber: number
-    for (const ele of batch) {
+    for (const [idx, ele] of batch.entries()) {
       if (ele.timestamp < lastTimestamp) {
-        this.logger.error('Timestamp monotonicity violated! Element', { ele })
+        this.logger.error('Timestamp monotonicity violated! Element', {
+          idx,
+          ele,
+        })
         return false
       }
       if (ele.blockNumber < lastBlockNumber) {
         this.logger.error('Block Number monotonicity violated! Element', {
+          idx,
           ele,
         })
         return false