Paratrie 2

cmd/evm/internal/t8ntool/transition.go

@@ -307,7 +307,7 @@ func Main(ctx *cli.Context) error {
 	}
 	defer tx.Rollback()
 
-	sd, err := libstate.NewSharedDomains(tx, log.New())
+	sd, err := libstate.NewSharedDomains(tx, db, log.New())
 	if err != nil {
 		return err
 	}
@@ -330,7 +330,7 @@ func Main(ctx *cli.Context) error {
 	}
 
 	// state root calculation
-	root, err := CalculateStateRoot(tx)
+	root, err := CalculateStateRoot(tx, db)
 	if err != nil {
 		return err
 	}
@@ -621,7 +621,7 @@ func NewHeader(env stEnv) *types.Header {
 	return &header
 }
 
-func CalculateStateRoot(tx kv.RwTx) (*libcommon.Hash, error) {
+func CalculateStateRoot(tx kv.RwTx, db kv.RoDB) (*libcommon.Hash, error) {
 	// Generate hashed state
 	c, err := tx.RwCursor(kv.PlainState)
 	if err != nil {
@@ -630,7 +630,7 @@ func CalculateStateRoot(tx kv.RwTx) (*libcommon.Hash, error) {
 	defer c.Close()
 	h := libcommon.NewHasher()
 	defer libcommon.ReturnHasherToPool(h)
-	domains, err := libstate.NewSharedDomains(tx, log.New())
+	domains, err := libstate.NewSharedDomains(tx, db, log.New())
 	if err != nil {
 		return nil, fmt.Errorf("NewSharedDomains: %w", err)
 	}

cmd/evm/runner.go

@@ -186,7 +186,7 @@ func runCmd(ctx *cli.Context) error {
 	}
 	defer tx.Rollback()
 
-	sd, err := state2.NewSharedDomains(tx, log.Root())
+	sd, err := state2.NewSharedDomains(tx, db, log.Root())
 	if err != nil {
 		return err
 	}

cmd/evm/staterunner.go

@@ -165,7 +165,7 @@ func aggregateResultsFromStateTests(
 			// Run the test and aggregate the result
 			result := &StatetestResult{Name: key, Fork: st.Fork, Pass: true}
 
-			statedb, root, err := test.Run(tx, st, cfg, dirs)
+			statedb, root, err := test.Run(tx, db, st, cfg, dirs)
 			if err != nil {
 				// Test failed, mark as so and dump any state to aid debugging
 				result.Pass, result.Error = false, err.Error()

cmd/integration/commands/stages.go

@@ -664,7 +664,7 @@ func stageSnapshots(db kv.TemporalRwDB, ctx context.Context, logger log.Logger)
 		ac := agg.BeginFilesRo()
 		defer ac.Close()
 
-		domains, err := libstate.NewSharedDomains(tx, logger)
+		domains, err := libstate.NewSharedDomains(tx, db, logger)
 		if err != nil {
 			return err
 		}
@@ -1116,7 +1116,7 @@ func stageExec(db kv.TemporalRwDB, ctx context.Context, logger log.Logger) error
 
 	if unwind > 0 {
 		u := sync.NewUnwindState(stages.Execution, s.BlockNumber-unwind, s.BlockNumber, true, false)
-		err := stagedsync.UnwindExecutionStage(u, s, txc, ctx, cfg, logger)
+		err := stagedsync.UnwindExecutionStage(u, s, txc, db, ctx, cfg, logger)
 		if err != nil {
 			return err
 		}
@@ -1143,7 +1143,7 @@ func stageExec(db kv.TemporalRwDB, ctx context.Context, logger log.Logger) error
 				return err
 			}
 			if execProgress == 0 {
-				doms, err := libstate.NewSharedDomains(tx, log.New())
+				doms, err := libstate.NewSharedDomains(tx, db, log.New())
 				if err != nil {
 					panic(err)
 				}
@@ -1170,15 +1170,15 @@ func stageExec(db kv.TemporalRwDB, ctx context.Context, logger log.Logger) error
 			defer tx.Rollback()
 			for bn := execProgress; bn < block; bn++ {
 				txc.Tx = tx
-				if err := stagedsync.SpawnExecuteBlocksStage(s, sync, txc, bn, ctx, cfg, logger); err != nil {
+				if err := stagedsync.SpawnExecuteBlocksStage(s, sync, txc, db, bn, ctx, cfg, logger); err != nil {
 					return err
 				}
 			}
 		} else {
 			if err := db.Update(ctx, func(tx kv.RwTx) error {
 				for bn := execProgress; bn < block; bn++ {
 					txc.Tx = tx
-					if err := stagedsync.SpawnExecuteBlocksStage(s, sync, txc, bn, ctx, cfg, logger); err != nil {
+					if err := stagedsync.SpawnExecuteBlocksStage(s, sync, txc, db, bn, ctx, cfg, logger); err != nil {
 						return err
 					}
 				}
@@ -1190,7 +1190,7 @@ func stageExec(db kv.TemporalRwDB, ctx context.Context, logger log.Logger) error
 		return nil
 	}
 
-	if err := stagedsync.SpawnExecuteBlocksStage(s, sync, txc, block, ctx, cfg, logger); err != nil {
+	if err := stagedsync.SpawnExecuteBlocksStage(s, sync, txc, db, block, ctx, cfg, logger); err != nil {
 		return err
 	}
 

cmd/integration/commands/state_domains.go

@@ -471,7 +471,7 @@ func requestDomains(chainDb, stateDb kv.RwDB, ctx context.Context, readDomain st
 	stateTx, err := stateDb.BeginRw(ctx)
 	must(err)
 	defer stateTx.Rollback()
-	domains, err := state3.NewSharedDomains(stateTx, logger)
+	domains, err := state3.NewSharedDomains(stateTx, chainDb, logger)
 	if err != nil {
 		return err
 	}

cmd/integration/commands/state_stages.go

@@ -172,7 +172,7 @@ func syncBySmallSteps(db kv.TemporalRwDB, miningConfig params.MiningConfig, ctx
 	}
 	defer tx.Rollback()
 
-	sd, err := stateLib.NewSharedDomains(tx, logger1)
+	sd, err := stateLib.NewSharedDomains(tx, db, logger1)
 	if err != nil {
 		return err
 	}
@@ -193,7 +193,7 @@ func syncBySmallSteps(db kv.TemporalRwDB, miningConfig params.MiningConfig, ctx
 
 	execUntilFunc := func(execToBlock uint64) stagedsync.ExecFunc {
 		return func(badBlockUnwind bool, s *stagedsync.StageState, unwinder stagedsync.Unwinder, txc wrap.TxContainer, logger log.Logger) error {
-			if err := stagedsync.SpawnExecuteBlocksStage(s, unwinder, txc, execToBlock, ctx, execCfg, logger); err != nil {
+			if err := stagedsync.SpawnExecuteBlocksStage(s, unwinder, txc, db, execToBlock, ctx, execCfg, logger); err != nil {
 				return fmt.Errorf("spawnExecuteBlocksStage: %w", err)
 			}
 			return nil
@@ -425,7 +425,7 @@ func loopExec(db kv.TemporalRwDB, ctx context.Context, unwind uint64, logger log
 
 	// set block limit of execute stage
 	sync.MockExecFunc(stages.Execution, func(badBlockUnwind bool, stageState *stagedsync.StageState, unwinder stagedsync.Unwinder, txc wrap.TxContainer, logger log.Logger) error {
-		if err = stagedsync.SpawnExecuteBlocksStage(stageState, sync, txc, to, ctx, cfg, logger); err != nil {
+		if err = stagedsync.SpawnExecuteBlocksStage(stageState, sync, txc, db, to, ctx, cfg, logger); err != nil {
 			return fmt.Errorf("spawnExecuteBlocksStage: %w", err)
 		}
 		return nil

core/chain_makers.go

@@ -332,7 +332,7 @@ func GenerateChain(config *chain.Config, parent *types.Block, engine consensus.E
 	defer tx.Rollback()
 	logger := log.New("generate-chain", config.ChainName)
 
-	domains, err := libstate.NewSharedDomains(tx, logger)
+	domains, err := libstate.NewSharedDomains(tx, db, logger)
 	if err != nil {
 		return nil, err
 	}
@@ -454,8 +454,8 @@ func hashKeyAndAddIncarnation(k []byte, h *libcommon.Hasher) (newK []byte, err e
 	return newK, nil
 }
 
-func CalcHashRootForTests(tx kv.RwTx, header *types.Header, histV4, trace bool) (hashRoot libcommon.Hash, err error) {
-	domains, err := libstate.NewSharedDomains(tx, log.New())
+func CalcHashRootForTests(tx kv.RwTx, db kv.RwDB, header *types.Header, histV4, trace bool) (hashRoot libcommon.Hash, err error) {
+	domains, err := libstate.NewSharedDomains(tx, db, log.New())
 	if err != nil {
 		return hashRoot, fmt.Errorf("NewSharedDomains: %w", err)
 	}

core/genesis_write.go

@@ -522,7 +522,7 @@ func GenesisToBlock(g *types.Genesis, dirs datadir.Dirs, logger log.Logger) (*ty
 		}
 		defer tx.Rollback()
 
-		sd, err := state2.NewSharedDomains(tx, logger)
+		sd, err := state2.NewSharedDomains(tx, tdb, logger)
 		if err != nil {
 			return err
 		}

core/rawdb/rawtemporaldb/accessors_receipt_test.go

@@ -21,7 +21,7 @@ func TestAppendReceipt(t *testing.T) {
 	defer tx.Rollback()
 
 	ttx := tx.(kv.TemporalTx)
-	doms, err := state.NewSharedDomains(ttx, log.New())
+	doms, err := state.NewSharedDomains(ttx, db, log.New())
 	require.NoError(err)
 	defer doms.Close()
 	doms.SetTx(ttx)

core/state/access_list_test.go

@@ -89,9 +89,9 @@ func TestAccessList(t *testing.T) {
 	addr := common.HexToAddress
 	slot := common.HexToHash
 
-	_, tx, _ := NewTestTemporalDb(t)
+	db, tx, _ := NewTestTemporalDb(t)
 
-	domains, err := stateLib.NewSharedDomains(tx, log.New())
+	domains, err := stateLib.NewSharedDomains(tx, db, log.New())
 	require.NoError(t, err)
 	defer domains.Close()
 

core/state/database_test.go

@@ -923,8 +923,8 @@ func TestReproduceCrash(t *testing.T) {
 	storageKey2 := libcommon.HexToHash("0x0e4c0e7175f9d22279a4f63ff74f7fa28b7a954a6454debaa62ce43dd9132542")
 	value2 := uint256.NewInt(0x58c00a51)
 
-	_, tx, _ := state.NewTestTemporalDb(t)
-	sd, err := state3.NewSharedDomains(tx, log.New())
+	db, tx, _ := state.NewTestTemporalDb(t)
+	sd, err := state3.NewSharedDomains(tx, db, log.New())
 	require.NoError(t, err)
 	t.Cleanup(sd.Close)
 
@@ -1343,8 +1343,8 @@ func TestChangeAccountCodeBetweenBlocks(t *testing.T) {
 	t.Parallel()
 	contract := libcommon.HexToAddress("0x71dd1027069078091B3ca48093B00E4735B20624")
 
-	_, tx, _ := state.NewTestTemporalDb(t)
-	sd, err := state3.NewSharedDomains(tx, log.New())
+	db, tx, _ := state.NewTestTemporalDb(t)
+	sd, err := state3.NewSharedDomains(tx, db, log.New())
 	require.NoError(t, err)
 	t.Cleanup(sd.Close)
 
@@ -1393,8 +1393,8 @@ func TestCacheCodeSizeSeparately(t *testing.T) {
 	contract := libcommon.HexToAddress("0x71dd1027069078091B3ca48093B00E4735B20624")
 	//root := libcommon.HexToHash("0xb939e5bcf5809adfb87ab07f0795b05b95a1d64a90f0eddd0c3123ac5b433854")
 
-	_, tx, _ := state.NewTestTemporalDb(t)
-	sd, err := state3.NewSharedDomains(tx, log.New())
+	db, tx, _ := state.NewTestTemporalDb(t)
+	sd, err := state3.NewSharedDomains(tx, db, log.New())
 	require.NoError(t, err)
 	t.Cleanup(sd.Close)
 
@@ -1431,8 +1431,8 @@ func TestCacheCodeSizeInTrie(t *testing.T) {
 	contract := libcommon.HexToAddress("0x71dd1027069078091B3ca48093B00E4735B20624")
 	root := libcommon.HexToHash("0xb939e5bcf5809adfb87ab07f0795b05b95a1d64a90f0eddd0c3123ac5b433854")
 
-	_, tx, _ := state.NewTestTemporalDb(t)
-	sd, err := state3.NewSharedDomains(tx, log.New())
+	db, tx, _ := state.NewTestTemporalDb(t)
+	sd, err := state3.NewSharedDomains(tx, db, log.New())
 	require.NoError(t, err)
 	t.Cleanup(sd.Close)
 

core/state/intra_block_state_logger_test.go

@@ -114,9 +114,9 @@ func TestStateLogger(t *testing.T) {
 
 	for _, tt := range cases {
 		t.Run(tt.name, func(t *testing.T) {
-			_, tx, _ := NewTestTemporalDb(t)
+			db, tx, _ := NewTestTemporalDb(t)
 
-			domains, err := stateLib.NewSharedDomains(tx, log.New())
+			domains, err := stateLib.NewSharedDomains(tx, db, log.New())
 			require.NoError(t, err)
 			defer domains.Close()
 

core/state/intra_block_state_test.go

@@ -261,7 +261,7 @@ func (test *snapshotTest) run() bool {
 	}
 	defer tx.Rollback()
 
-	domains, err := stateLib.NewSharedDomains(tx, log.New())
+	domains, err := stateLib.NewSharedDomains(tx, _db, log.New())
 	if err != nil {
 		test.err = err
 		return false

core/state/state_test.go

@@ -139,7 +139,7 @@ func (s *StateSuite) SetUpTest(c *checker.C) {
 	}
 	defer tx.Rollback()
 
-	domains, err := stateLib.NewSharedDomains(tx, log.New())
+	domains, err := stateLib.NewSharedDomains(tx, _db, log.New())
 	if err != nil {
 		panic(err)
 	}
@@ -250,9 +250,9 @@ func (s *StateSuite) TestSnapshotEmpty(c *checker.C) {
 func TestSnapshot2(t *testing.T) {
 	//TODO: why I shouldn't recreate writer here? And why domains.SetBlockNum(1) is enough for green test?
 	t.Parallel()
-	_, tx, _ := NewTestTemporalDb(t)
+	db, tx, _ := NewTestTemporalDb(t)
 
-	domains, err := stateLib.NewSharedDomains(tx, log.New())
+	domains, err := stateLib.NewSharedDomains(tx, db, log.New())
 	require.NoError(t, err)
 	defer domains.Close()
 
@@ -414,9 +414,9 @@ func NewTestTemporalDb(tb testing.TB) (kv.TemporalRwDB, kv.TemporalRwTx, *state.
 
 func TestDump(t *testing.T) {
 	t.Parallel()
-	_, tx, _ := NewTestTemporalDb(t)
+	db, tx, _ := NewTestTemporalDb(t)
 
-	domains, err := state.NewSharedDomains(tx, log.New())
+	domains, err := state.NewSharedDomains(tx, db, log.New())
 	require.NoError(t, err)
 	defer domains.Close()
 

core/test/domains_restart_test.go

@@ -103,7 +103,7 @@ func Test_AggregatorV3_RestartOnDatadir_WithoutDB(t *testing.T) {
 	domCtx := agg.BeginFilesRo()
 	defer domCtx.Close()
 
-	domains, err := state.NewSharedDomains(tx, log.New())
+	domains, err := state.NewSharedDomains(tx, db, log.New())
 	require.NoError(t, err)
 	defer domains.Close()
 	domains.SetTxNum(0)
@@ -215,7 +215,7 @@ func Test_AggregatorV3_RestartOnDatadir_WithoutDB(t *testing.T) {
 	require.NoError(t, err)
 	domCtx = agg.BeginFilesRo()
 	defer domCtx.Close()
-	domains, err = state.NewSharedDomains(tx, log.New())
+	domains, err = state.NewSharedDomains(tx, db, log.New())
 	require.NoError(t, err)
 	defer domains.Close()
 
@@ -249,7 +249,7 @@ func Test_AggregatorV3_RestartOnDatadir_WithoutDB(t *testing.T) {
 	defer tx.Rollback()
 	domCtx = agg.BeginFilesRo()
 	defer domCtx.Close()
-	domains, err = state.NewSharedDomains(tx, log.New())
+	domains, err = state.NewSharedDomains(tx, db, log.New())
 	require.NoError(t, err)
 	defer domains.Close()
 	writer = state2.NewWriterV4(domains)
@@ -309,7 +309,7 @@ func Test_AggregatorV3_RestartOnDatadir_WithoutAnything(t *testing.T) {
 	domCtx := agg.BeginFilesRo()
 	defer domCtx.Close()
 
-	domains, err := state.NewSharedDomains(tx, log.New())
+	domains, err := state.NewSharedDomains(tx, db, log.New())
 	require.NoError(t, err)
 	defer domains.Close()
 	domains.SetTxNum(0)
@@ -399,7 +399,7 @@ func Test_AggregatorV3_RestartOnDatadir_WithoutAnything(t *testing.T) {
 
 	domCtx = agg.BeginFilesRo()
 	defer domCtx.Close()
-	domains, err = state.NewSharedDomains(tx, log.New())
+	domains, err = state.NewSharedDomains(tx, db, log.New())
 	require.NoError(t, err)
 	defer domains.Close()
 
@@ -419,7 +419,7 @@ func Test_AggregatorV3_RestartOnDatadir_WithoutAnything(t *testing.T) {
 	defer tx.Rollback()
 	domCtx = agg.BeginFilesRo()
 	defer domCtx.Close()
-	domains, err = state.NewSharedDomains(tx, log.New())
+	domains, err = state.NewSharedDomains(tx, db, log.New())
 	require.NoError(t, err)
 	defer domains.Close()
 
@@ -486,7 +486,7 @@ func TestCommit(t *testing.T) {
 
 	domCtx := agg.BeginFilesRo()
 	defer domCtx.Close()
-	domains, err := state.NewSharedDomains(tx, log.New())
+	domains, err := state.NewSharedDomains(tx, db, log.New())
 	require.NoError(t, err)
 	defer domains.Close()
 
@@ -519,7 +519,7 @@ func TestCommit(t *testing.T) {
 	require.NoError(t, err)
 
 	core.GenerateTrace = true
-	oldHash, err := core.CalcHashRootForTests(tx, &types.Header{Number: big.NewInt(1)}, true, true)
+	oldHash, err := core.CalcHashRootForTests(tx, db, &types.Header{Number: big.NewInt(1)}, true, true)
 	require.NoError(t, err)
 
 	t.Logf("old hash %x\n", oldHash)

core/vm/gas_table_test.go

@@ -118,7 +118,7 @@ func testTemporalTxSD(t *testing.T, db *temporal.DB) (kv.RwTx, *state3.SharedDom
 	require.NoError(t, err)
 	t.Cleanup(tx.Rollback)
 
-	sd, err := state3.NewSharedDomains(tx, log.New())
+	sd, err := state3.NewSharedDomains(tx, db, log.New())
 	require.NoError(t, err)
 	t.Cleanup(sd.Close)
 
@@ -200,7 +200,7 @@ func TestCreateGas(t *testing.T) {
 		eface := *(*[2]uintptr)(unsafe.Pointer(&tx))
 		fmt.Printf("init tx %x\n", eface[1])
 
-		domains, err := state3.NewSharedDomains(txc.Tx, log.New())
+		domains, err := state3.NewSharedDomains(txc.Tx, db, log.New())
 		require.NoError(t, err)
 		defer domains.Close()
 		txc.Doms = domains

core/vm/runtime/runtime.go

@@ -145,7 +145,7 @@ func Execute(code, input []byte, cfg *Config, tempdir string) ([]byte, *state.In
 			return nil, nil, err
 		}
 		defer tx.Rollback()
-		sd, err := state3.NewSharedDomains(tx, log.New())
+		sd, err := state3.NewSharedDomains(tx, db, log.New())
 		if err != nil {
 			return nil, nil, err
 		}
@@ -207,7 +207,7 @@ func Create(input []byte, cfg *Config, blockNr uint64) ([]byte, libcommon.Addres
 			return nil, [20]byte{}, 0, err
 		}
 		defer tx.Rollback()
-		sd, err := state3.NewSharedDomains(tx, log.New())
+		sd, err := state3.NewSharedDomains(tx, db, log.New())
 		if err != nil {
 			return nil, [20]byte{}, 0, err
 		}