pull in geth changes for state recreation

blocks_reexecutor/blocks_reexecutor.go

@@ -68,7 +68,7 @@ type BlocksReExecutor struct {
 	stopwaiter.StopWaiter
 	config       *Config
 	blockchain   *core.BlockChain
-	stateFor     func(header *types.Header) (*state.StateDB, error)
+	stateFor     arbitrum.StateForHeaderFunction
 	done         chan struct{}
 	fatalErrChan chan error
 	startBlock   uint64
@@ -110,7 +110,10 @@ func New(c *Config, blockchain *core.BlockChain, fatalErrChan chan error) *Block
 		startBlock:   start,
 		done:         make(chan struct{}, c.Room),
 		fatalErrChan: fatalErrChan,
-		stateFor:     func(header *types.Header) (*state.StateDB, error) { return blockchain.StateAt(header.Root) },
+		stateFor: func(header *types.Header) (*state.StateDB, arbitrum.StateReleaseFunc, error) {
+			state, err := blockchain.StateAt(header.Root)
+			return state, arbitrum.NoopStateRelease, err
+		},
 	}
 }
 
@@ -120,7 +123,9 @@ func (s *BlocksReExecutor) LaunchBlocksReExecution(ctx context.Context, currentB
 	if start < s.startBlock {
 		start = s.startBlock
 	}
-	startState, startHeader, err := arbitrum.FindLastAvailableState(ctx, s.blockchain, s.stateFor, s.blockchain.GetHeaderByNumber(start), nil, -1)
+	// we don't use state release pattern here
+	// TODO do we want to use release pattern here?
+	startState, startHeader, _, err := arbitrum.FindLastAvailableState(ctx, s.blockchain, s.stateFor, s.blockchain.GetHeaderByNumber(start), nil, -1)
 	if err != nil {
 		s.fatalErrChan <- fmt.Errorf("blocksReExecutor failed to get last available state while searching for state at %d, err: %w", start, err)
 		return s.startBlock

system_tests/common_test.go

@@ -35,6 +35,7 @@ import (
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/accounts/keystore"
+	"github.com/ethereum/go-ethereum/arbitrum"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/core/types"
@@ -183,6 +184,13 @@ func (b *NodeBuilder) DefaultConfig(t *testing.T, withL1 bool) *NodeBuilder {
 }
 
 func (b *NodeBuilder) Build(t *testing.T) func() {
+	if b.execConfig.RPC.MaxRecreateStateDepth == arbitrum.UninitializedMaxRecreateStateDepth {
+		if b.execConfig.Caching.Archive {
+			b.execConfig.RPC.MaxRecreateStateDepth = arbitrum.DefaultArchiveNodeMaxRecreateStateDepth
+		} else {
+			b.execConfig.RPC.MaxRecreateStateDepth = arbitrum.DefaultNonArchiveNodeMaxRecreateStateDepth
+		}
+	}
 	if b.withL1 {
 		l1, l2 := NewTestClient(b.ctx), NewTestClient(b.ctx)
 		b.L2Info, l2.ConsensusNode, l2.Client, l2.Stack, b.L1Info, l1.L1Backend, l1.Client, l1.Stack =
@@ -229,6 +237,13 @@ func (b *NodeBuilder) Build2ndNode(t *testing.T, params *SecondNodeParams) (*Tes
 	if params.execConfig == nil {
 		params.execConfig = b.execConfig
 	}
+	if params.execConfig.RPC.MaxRecreateStateDepth == arbitrum.UninitializedMaxRecreateStateDepth {
+		if params.execConfig.Caching.Archive {
+			params.execConfig.RPC.MaxRecreateStateDepth = arbitrum.DefaultArchiveNodeMaxRecreateStateDepth
+		} else {
+			params.execConfig.RPC.MaxRecreateStateDepth = arbitrum.DefaultNonArchiveNodeMaxRecreateStateDepth
+		}
+	}
 
 	l2 := NewTestClient(b.ctx)
 	l2.Client, l2.ConsensusNode =