Merge branch 'develop' into aj/remove-config

.circleci/config.yml

@@ -1098,7 +1098,7 @@ jobs:
             ./hive \
             -sim=<<parameters.sim>> \
             -sim.loglevel=5 \
-            -client=go-ethereum,op-geth_optimism,op-proposer_<<parameters.version>>,op-batcher_<<parameters.version>>,op-node_<<parameters.version>> |& tee /tmp/hive.log || echo "failed."
+            -client=go-ethereum_v1.11.6,op-geth_optimism,op-proposer_<<parameters.version>>,op-batcher_<<parameters.version>>,op-node_<<parameters.version>> |& tee /tmp/hive.log || echo "failed."
       - run:
           command: |
             tar -cvf /tmp/workspace.tgz -C /home/circleci/project /home/circleci/project/workspace

op-chain-ops/cmd/rollover/main.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"math/big"
 	"os"
@@ -112,6 +111,7 @@ func main() {
 				}
 				log.Info("Searching backwards for final deposit", "start", blockNumber)
 
+				// Walk backards through the blocks until we find the final deposit.
 				for {
 					bn := new(big.Int).SetUint64(blockNumber)
 					log.Info("Checking L2 block", "number", bn)
@@ -131,18 +131,35 @@ func main() {
 					if err != nil {
 						return err
 					}
+					// If the queue origin is l1, then it is a deposit.
 					if json.QueueOrigin == "l1" {
 						if json.QueueIndex == nil {
-							// This should never happen
-							return errors.New("queue index is nil")
+							// This should never happen.
+							return fmt.Errorf("queue index is nil for tx %s at height %d", hash.Hex(), blockNumber)
 						}
 						queueIndex := uint64(*json.QueueIndex)
+						// Check to see if the final deposit was ingested. Subtract 1 here to handle zero
+						// indexing.
 						if queueIndex == queueLength.Uint64()-1 {
 							log.Info("Found final deposit in l2geth", "queue-index", queueIndex)
 							break
 						}
+						// If the queue index is less than the queue length, then not all deposits have
+						// been ingested by l2geth yet. This means that we need to reset the blocknumber
+						// to the latest block number to restart walking backwards to find deposits that
+						// have yet to be ingested.
 						if queueIndex < queueLength.Uint64() {
-							return errors.New("missed final deposit")
+							log.Info("Not all deposits ingested", "queue-index", queueIndex, "queue-length", queueLength.Uint64())
+							time.Sleep(time.Second * 3)
+							blockNumber, err = clients.L2Client.BlockNumber(context.Background())
+							if err != nil {
+								return err
+							}
+							continue
+						}
+						// The queueIndex should never be greater than the queue length.
+						if queueIndex > queueLength.Uint64() {
+							log.Warn("Queue index is greater than queue length", "queue-index", queueIndex, "queue-length", queueLength.Uint64())
 						}
 					}
 					blockNumber--