Skip to content

Commit

Permalink
Merge branch 'state-release-test' into state-release
Browse files Browse the repository at this point in the history
  • Loading branch information
@magicxyyz
magicxyyz committed Dec 19, 2023
2 parents 1234559 + ea05f0a commit dc936ea
Show file tree
Hide file tree
Showing 3 changed files with 116 additions and 62 deletions.
174 changes: 112 additions & 62 deletions system_tests/recreatestate_rpc_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,16 @@ import (
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/rawdb"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/ethclient"
"github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/params"
"github.com/ethereum/go-ethereum/rpc"
"github.com/ethereum/go-ethereum/trie"
"github.com/offchainlabs/nitro/arbnode"
"github.com/offchainlabs/nitro/execution/gethexec"
"github.com/offchainlabs/nitro/util"
)

func prepareNodeWithHistory(t *testing.T, ctx context.Context, execConfig *gethexec.Config, txCount uint64) (node *arbnode.Node, executionNode *gethexec.ExecutionNode, l2client *ethclient.Client, cancel func()) {
t.Helper()
builder := NewNodeBuilder(ctx).DefaultConfig(t, true)
builder.execConfig = execConfig
cleanup := builder.Build(t)
builder.L2Info.GenerateAccount("User2")
func makeSomeTransfers(t *testing.T, ctx context.Context, builder *NodeBuilder, txCount uint64) {
var txs []*types.Transaction
for i := uint64(0); i < txCount; i++ {
tx := builder.L2Info.PrepareTx("Owner", "User2", builder.L2Info.TransferGas, common.Big1, nil)
Expand All @@ -39,8 +34,16 @@ func prepareNodeWithHistory(t *testing.T, ctx context.Context, execConfig *gethe
_, err := builder.L2.EnsureTxSucceeded(tx)
Require(t, err)
}
}

return builder.L2.ConsensusNode, builder.L2.ExecNode, builder.L2.Client, cleanup
func prepareNodeWithHistory(t *testing.T, ctx context.Context, execConfig *gethexec.Config, txCount uint64) (*NodeBuilder, func()) {
t.Helper()
builder := NewNodeBuilder(ctx).DefaultConfig(t, true)
builder.execConfig = execConfig
cleanup := builder.Build(t)
builder.L2Info.GenerateAccount("User2")
makeSomeTransfers(t, ctx, builder, txCount)
return builder, cleanup
}

func fillHeaderCache(t *testing.T, bc *core.BlockChain, from, to uint64) {
Expand Down Expand Up @@ -90,17 +93,18 @@ func removeStatesFromDb(t *testing.T, bc *core.BlockChain, db ethdb.Database, fr
func TestRecreateStateForRPCNoDepthLimit(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
nodeConfig := gethexec.ConfigDefaultTest()
nodeConfig.RPC.MaxRecreateStateDepth = arbitrum.InfiniteMaxRecreateStateDepth
nodeConfig.Sequencer.MaxBlockSpeed = 0
nodeConfig.Sequencer.MaxTxDataSize = 150 // 1 test tx ~= 110
nodeConfig.Caching.Archive = true
execConfig := gethexec.ConfigDefaultTest()
execConfig.RPC.MaxRecreateStateDepth = arbitrum.InfiniteMaxRecreateStateDepth
execConfig.Sequencer.MaxBlockSpeed = 0
execConfig.Sequencer.MaxTxDataSize = 150 // 1 test tx ~= 110
execConfig.Caching.Archive = true
// disable trie/Database.cleans cache, so as states removed from ChainDb won't be cached there
nodeConfig.Caching.TrieCleanCache = 0
nodeConfig.Caching.MaxNumberOfBlocksToSkipStateSaving = 0
nodeConfig.Caching.MaxAmountOfGasToSkipStateSaving = 0
_, execNode, l2client, cancelNode := prepareNodeWithHistory(t, ctx, nodeConfig, 32)
execConfig.Caching.TrieCleanCache = 0
execConfig.Caching.MaxNumberOfBlocksToSkipStateSaving = 0
execConfig.Caching.MaxAmountOfGasToSkipStateSaving = 0
builder, cancelNode := prepareNodeWithHistory(t, ctx, execConfig, 32)
defer cancelNode()
execNode, l2client := builder.L2.ExecNode, builder.L2.Client
bc := execNode.Backend.ArbInterface().BlockChain()
db := execNode.Backend.ChainDb()

Expand All @@ -124,17 +128,18 @@ func TestRecreateStateForRPCBigEnoughDepthLimit(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
depthGasLimit := int64(256 * util.NormalizeL2GasForL1GasInitial(800_000, params.GWei))
nodeConfig := gethexec.ConfigDefaultTest()
nodeConfig.RPC.MaxRecreateStateDepth = depthGasLimit
nodeConfig.Sequencer.MaxBlockSpeed = 0
nodeConfig.Sequencer.MaxTxDataSize = 150 // 1 test tx ~= 110
nodeConfig.Caching.Archive = true
execConfig := gethexec.ConfigDefaultTest()
execConfig.RPC.MaxRecreateStateDepth = depthGasLimit
execConfig.Sequencer.MaxBlockSpeed = 0
execConfig.Sequencer.MaxTxDataSize = 150 // 1 test tx ~= 110
execConfig.Caching.Archive = true
// disable trie/Database.cleans cache, so as states removed from ChainDb won't be cached there
nodeConfig.Caching.TrieCleanCache = 0
nodeConfig.Caching.MaxNumberOfBlocksToSkipStateSaving = 0
nodeConfig.Caching.MaxAmountOfGasToSkipStateSaving = 0
_, execNode, l2client, cancelNode := prepareNodeWithHistory(t, ctx, nodeConfig, 32)
execConfig.Caching.TrieCleanCache = 0
execConfig.Caching.MaxNumberOfBlocksToSkipStateSaving = 0
execConfig.Caching.MaxAmountOfGasToSkipStateSaving = 0
builder, cancelNode := prepareNodeWithHistory(t, ctx, execConfig, 32)
defer cancelNode()
execNode, l2client := builder.L2.ExecNode, builder.L2.Client
bc := execNode.Backend.ArbInterface().BlockChain()
db := execNode.Backend.ChainDb()

Expand All @@ -158,17 +163,18 @@ func TestRecreateStateForRPCBigEnoughDepthLimit(t *testing.T) {
func TestRecreateStateForRPCDepthLimitExceeded(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
nodeConfig := gethexec.ConfigDefaultTest()
nodeConfig.RPC.MaxRecreateStateDepth = int64(200)
nodeConfig.Sequencer.MaxBlockSpeed = 0
nodeConfig.Sequencer.MaxTxDataSize = 150 // 1 test tx ~= 110
nodeConfig.Caching.Archive = true
execConfig := gethexec.ConfigDefaultTest()
execConfig.RPC.MaxRecreateStateDepth = int64(200)
execConfig.Sequencer.MaxBlockSpeed = 0
execConfig.Sequencer.MaxTxDataSize = 150 // 1 test tx ~= 110
execConfig.Caching.Archive = true
// disable trie/Database.cleans cache, so as states removed from ChainDb won't be cached there
nodeConfig.Caching.TrieCleanCache = 0
nodeConfig.Caching.MaxNumberOfBlocksToSkipStateSaving = 0
nodeConfig.Caching.MaxAmountOfGasToSkipStateSaving = 0
_, execNode, l2client, cancelNode := prepareNodeWithHistory(t, ctx, nodeConfig, 32)
execConfig.Caching.TrieCleanCache = 0
execConfig.Caching.MaxNumberOfBlocksToSkipStateSaving = 0
execConfig.Caching.MaxAmountOfGasToSkipStateSaving = 0
builder, cancelNode := prepareNodeWithHistory(t, ctx, execConfig, 32)
defer cancelNode()
execNode, l2client := builder.L2.ExecNode, builder.L2.Client
bc := execNode.Backend.ArbInterface().BlockChain()
db := execNode.Backend.ChainDb()

Expand All @@ -192,17 +198,18 @@ func TestRecreateStateForRPCMissingBlockParent(t *testing.T) {
var headerCacheLimit uint64 = 512
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
nodeConfig := gethexec.ConfigDefaultTest()
nodeConfig.RPC.MaxRecreateStateDepth = arbitrum.InfiniteMaxRecreateStateDepth
nodeConfig.Sequencer.MaxBlockSpeed = 0
nodeConfig.Sequencer.MaxTxDataSize = 150 // 1 test tx ~= 110
nodeConfig.Caching.Archive = true
execConfig := gethexec.ConfigDefaultTest()
execConfig.RPC.MaxRecreateStateDepth = arbitrum.InfiniteMaxRecreateStateDepth
execConfig.Sequencer.MaxBlockSpeed = 0
execConfig.Sequencer.MaxTxDataSize = 150 // 1 test tx ~= 110
execConfig.Caching.Archive = true
// disable trie/Database.cleans cache, so as states removed from ChainDb won't be cached there
nodeConfig.Caching.TrieCleanCache = 0
nodeConfig.Caching.MaxNumberOfBlocksToSkipStateSaving = 0
nodeConfig.Caching.MaxAmountOfGasToSkipStateSaving = 0
_, execNode, l2client, cancelNode := prepareNodeWithHistory(t, ctx, nodeConfig, headerCacheLimit+5)
execConfig.Caching.TrieCleanCache = 0
execConfig.Caching.MaxNumberOfBlocksToSkipStateSaving = 0
execConfig.Caching.MaxAmountOfGasToSkipStateSaving = 0
builder, cancelNode := prepareNodeWithHistory(t, ctx, execConfig, headerCacheLimit+5)
defer cancelNode()
execNode, l2client := builder.L2.ExecNode, builder.L2.Client
bc := execNode.Backend.ArbInterface().BlockChain()
db := execNode.Backend.ChainDb()

Expand Down Expand Up @@ -237,16 +244,17 @@ func TestRecreateStateForRPCBeyondGenesis(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()

nodeConfig := gethexec.ConfigDefaultTest()
nodeConfig.RPC.MaxRecreateStateDepth = arbitrum.InfiniteMaxRecreateStateDepth
nodeConfig.Sequencer.MaxBlockSpeed = 0
nodeConfig.Sequencer.MaxTxDataSize = 150 // 1 test tx ~= 110
nodeConfig.Caching.Archive = true
execConfig := gethexec.ConfigDefaultTest()
execConfig.RPC.MaxRecreateStateDepth = arbitrum.InfiniteMaxRecreateStateDepth
execConfig.Sequencer.MaxBlockSpeed = 0
execConfig.Sequencer.MaxTxDataSize = 150 // 1 test tx ~= 110
execConfig.Caching.Archive = true
// disable trie/Database.cleans cache, so as states removed from ChainDb won't be cached there
nodeConfig.Caching.TrieCleanCache = 0
nodeConfig.Caching.MaxNumberOfBlocksToSkipStateSaving = 0
nodeConfig.Caching.MaxAmountOfGasToSkipStateSaving = 0
_, execNode, l2client, cancelNode := prepareNodeWithHistory(t, ctx, nodeConfig, 32)
execConfig.Caching.TrieCleanCache = 0
execConfig.Caching.MaxNumberOfBlocksToSkipStateSaving = 0
execConfig.Caching.MaxAmountOfGasToSkipStateSaving = 0
builder, cancelNode := prepareNodeWithHistory(t, ctx, execConfig, 32)
execNode, l2client := builder.L2.ExecNode, builder.L2.Client
defer cancelNode()
bc := execNode.Backend.ArbInterface().BlockChain()
db := execNode.Backend.ChainDb()
Expand All @@ -272,17 +280,18 @@ func TestRecreateStateForRPCBlockNotFoundWhileRecreating(t *testing.T) {
var blockCacheLimit uint64 = 256
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
nodeConfig := gethexec.ConfigDefaultTest()
nodeConfig.RPC.MaxRecreateStateDepth = arbitrum.InfiniteMaxRecreateStateDepth
nodeConfig.Sequencer.MaxBlockSpeed = 0
nodeConfig.Sequencer.MaxTxDataSize = 150 // 1 test tx ~= 110
nodeConfig.Caching.Archive = true
execConfig := gethexec.ConfigDefaultTest()
execConfig.RPC.MaxRecreateStateDepth = arbitrum.InfiniteMaxRecreateStateDepth
execConfig.Sequencer.MaxBlockSpeed = 0
execConfig.Sequencer.MaxTxDataSize = 150 // 1 test tx ~= 110
execConfig.Caching.Archive = true
// disable trie/Database.cleans cache, so as states removed from ChainDb won't be cached there
nodeConfig.Caching.TrieCleanCache = 0
execConfig.Caching.TrieCleanCache = 0

nodeConfig.Caching.MaxNumberOfBlocksToSkipStateSaving = 0
nodeConfig.Caching.MaxAmountOfGasToSkipStateSaving = 0
_, execNode, l2client, cancelNode := prepareNodeWithHistory(t, ctx, nodeConfig, blockCacheLimit+4)
execConfig.Caching.MaxNumberOfBlocksToSkipStateSaving = 0
execConfig.Caching.MaxAmountOfGasToSkipStateSaving = 0
builder, cancelNode := prepareNodeWithHistory(t, ctx, execConfig, blockCacheLimit+4)
execNode, l2client := builder.L2.ExecNode, builder.L2.Client
defer cancelNode()
bc := execNode.Backend.ArbInterface().BlockChain()
db := execNode.Backend.ChainDb()
Expand Down Expand Up @@ -459,3 +468,44 @@ func TestSkippingSavingStateAndRecreatingAfterRestart(t *testing.T) {
}
}
}

func TestGettingStateForRPC(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
execConfig := gethexec.ConfigDefaultTest()
execConfig.Caching.SnapshotCache = 0 // disable snapshots
execConfig.Caching.BlockAge = 0
execConfig.Sequencer.MaxBlockSpeed = 0
execConfig.Sequencer.MaxTxDataSize = 150 // 1 test tx ~= 110
builder, cancelNode := prepareNodeWithHistory(t, ctx, execConfig, 16)
execNode, _ := builder.L2.ExecNode, builder.L2.Client
defer cancelNode()
bc := execNode.Backend.ArbInterface().BlockChain()
api := execNode.Backend.APIBackend()

header := bc.CurrentBlock()
if header == nil {
Fatal(t, "failed to get current block header")
}
state, _, err := api.StateAndHeaderByNumber(ctx, rpc.BlockNumber(header.Number.Uint64()))
Require(t, err)
addr := builder.L2Info.GetAddress("User2")
exists := state.Exist(addr)
err = state.Error()
Require(t, err)
if !exists {
Fatal(t, "User2 address does not exist in the state")
}
// Get the state again to avoid caching
state, _, err = api.StateAndHeaderByNumber(ctx, rpc.BlockNumber(header.Number.Uint64()))

Check failure on line 500 in system_tests/recreatestate_rpc_test.go

View workflow job for this annotation

GitHub Actions / Go Tests (defaults) 

ineffectual assignment to err (ineffassign)

Check failure on line 500 in system_tests/recreatestate_rpc_test.go

View workflow job for this annotation

GitHub Actions / Go Tests (race) 

ineffectual assignment to err (ineffassign)

Check failure on line 500 in system_tests/recreatestate_rpc_test.go

View workflow job for this annotation

GitHub Actions / Go Tests (challenge) 

ineffectual assignment to err (ineffassign)

blockCountRequiredToFlushDirties := builder.execConfig.Caching.BlockCount
makeSomeTransfers(t, ctx, builder, blockCountRequiredToFlushDirties)

exists = state.Exist(addr)
err = state.Error()
Require(t, err)
if !exists {
Fatal(t, "User2 address does not exist in the state")
}
}
0 validator/server_api/valiation_api.go → validator/server_api/validation_api.go
View file
File renamed without changes.
4 changes: 4 additions & 0 deletions validator/server_arb/validator_spawner.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,11 @@ import (

"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/metrics"
)

var arbitratorValidationSteps = metrics.NewRegisteredHistogram("arbitrator/validation/steps", nil, metrics.NewBoundedHistogramSample())

type ArbitratorSpawnerConfig struct {
Workers int `koanf:"workers" reload:"hot"`
OutputPath string `koanf:"output-path" reload:"hot"`
Expand Down Expand Up @@ -146,6 +149,7 @@ func (v *ArbitratorSpawner) execute(
}
steps += count
}
arbitratorValidationSteps.Update(int64(mach.GetStepCount()))
if mach.IsErrored() {
log.Error("machine entered errored state during attempted validation", "block", entry.Id)
return validator.GoGlobalState{}, errors.New("machine entered errored state during attempted validation")
Expand Down

0 comments on commit dc936ea

Please sign in to comment.