pull in geth changes for state recreation

system_tests/recreatestate_rpc_test.go

@@ -3,6 +3,7 @@ package arbtest
 import (
 	"context"
 	"errors"
+	"fmt"
 	"math/big"
 	"strings"
 	"testing"
@@ -306,7 +307,7 @@ func TestRecreateStateForRPCBlockNotFoundWhileRecreating(t *testing.T) {
 		hash := rawdb.ReadCanonicalHash(db, lastBlock)
 		Fatal(t, "Didn't fail to get balance at block:", lastBlock, " with hash:", hash, ", lastBlock:", lastBlock)
 	}
-	if !strings.Contains(err.Error(), "block not found while recreating") {
+	if !strings.Contains(err.Error(), fmt.Sprintf("block #%d not found", blockBodyToRemove)) {
 		Fatal(t, "Failed with unexpected error: \"", err, "\", at block:", lastBlock, "lastBlock:", lastBlock)
 	}
 }

system_tests/seqinbox_test.go

@@ -163,8 +163,9 @@ func testSequencerInboxReaderImpl(t *testing.T, validator bool) {
 	ownerAddress := builder.L2Info.GetAddress("Owner")
 	var startL2BlockNumber uint64 = 0
 
-	startState, _, err := l2Backend.APIBackend().StateAndHeaderByNumber(ctx, rpc.LatestBlockNumber)
+	startState, _, release, err := l2Backend.APIBackend().StateAndHeaderByNumber(ctx, rpc.LatestBlockNumber)
 	Require(t, err)
+	defer release()
 	startOwnerBalance := startState.GetBalance(ownerAddress)
 	startOwnerNonce := startState.GetNonce(ownerAddress)
 
@@ -429,8 +430,9 @@ func testSequencerInboxReaderImpl(t *testing.T, validator bool) {
 			if block == nil {
 				Fatal(t, "missing state block", state.l2BlockNumber)
 			}
-			stateDb, _, err := l2Backend.APIBackend().StateAndHeaderByNumber(ctx, rpc.BlockNumber(state.l2BlockNumber))
+			stateDb, _, release, err := l2Backend.APIBackend().StateAndHeaderByNumber(ctx, rpc.BlockNumber(state.l2BlockNumber))
 			Require(t, err)
+			defer release()
 			for acct, expectedBalance := range state.balances {
 				haveBalance := stateDb.GetBalance(acct)
 				if expectedBalance.Cmp(haveBalance) < 0 {