Fixes

* Make sure batcher key used by default in the devnet tests is the
  same one registered in the inbox contract
* Remove check in batcher that prevents it from sending transactions
  to Espresso immediately

Author: jbearer

espresso/devnet-tests/devnet_tools.go

@@ -51,9 +51,15 @@ func NewDevnet(ctx context.Context, t *testing.T) *Devnet {
 
 	d := new(Devnet)
 	d.ctx = ctx
-	d.secrets = *secrets.DefaultSecrets
 
-	var err error
+	mnemonics := *secrets.DefaultMnemonicConfig
+	mnemonics.Batcher = "m/44'/60'/0'/0/0"
+	secrets, err := mnemonics.Secrets()
+	if err != nil {
+		panic(fmt.Sprintf("failed to create default secrets: %e", err))
+	}
+	d.secrets = *secrets
+
 	if outageTime, ok := os.LookupEnv("ESPRESSO_DEVNET_TESTS_OUTAGE_PERIOD"); ok {
 		d.outageTime, err = time.ParseDuration(outageTime)
 		if err != nil {

espresso/docker-compose.yml

@@ -324,8 +324,8 @@ services:
     command:
       - op-batcher
       - --espresso-light-client-addr=0x703848f4c85f18e3acd8196c8ec91eb0b7bd0797
-      - --testing-espresso-batcher-private-key=${OP_TESTING_BATCHER_PRIVATE_KEY:-0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80} # Default value for testing
-      - --private-key=${OP_BATCHER_PRIVATE_KEY:-"0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"} # Arbitrary value for testing
+      - --testing-espresso-batcher-private-key=${OP_TESTING_BATCHER_PRIVATE_KEY:-$OPERATOR_PRIVATE_KEY}
+      - --private-key=${OP_BATCHER_PRIVATE_KEY:-$OPERATOR_PRIVATE_KEY}
       - --throttle-threshold=0
       - --max-channel-duration=2
       - --target-num-frames=1

op-batcher/batcher/espresso.go

@@ -933,10 +933,6 @@ func (l *BlockLoader) nextBlockRange(newSyncStatus *eth.SyncStatus) (inclusiveBl
 		return inclusiveBlockRange{}, ActionReset
 	}
 
-	if newSyncStatus.UnsafeL2.Number <= lastQueuedBlock.Number+1 {
-		return inclusiveBlockRange{}, ActionRetry
-	}
-
 	if safeL2.Number > firstQueuedBlock.Number {
 		numFinalizedBlocks := safeL2.Number - firstQueuedBlock.Number
 		l.batcher.Log.Warn(