Fix/hashed node insert values at stem

cmd/evm/internal/t8ntool/execution.go

@@ -39,6 +39,7 @@ import (
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/ethereum/go-ethereum/rlp"
 	"github.com/ethereum/go-ethereum/trie"
+	"github.com/ethereum/go-ethereum/trie/bintrie"
 	"github.com/ethereum/go-ethereum/triedb"
 	"github.com/holiman/uint256"
 	"golang.org/x/crypto/sha3"
@@ -47,7 +48,7 @@ import (
 type Prestate struct {
 	Env stEnv                         `json:"env"`
 	Pre types.GenesisAlloc            `json:"pre"`
-	VKT map[common.Hash]hexutil.Bytes `json:"vkt,omitempty"`
+	BT  map[common.Hash]hexutil.Bytes `json:"vkt,omitempty"`
 }
 
 //go:generate go run github.com/fjl/gencodec -type ExecutionResult -field-override executionResultMarshaling -out gen_execresult.go
@@ -418,25 +419,28 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig,
 		execRs.Requests = requests
 	}
 
-	// Re-create statedb instance with new root upon the updated database
-	// for accessing latest states.
+	// Re-create statedb instance with new root for MPT mode
 	statedb, err = state.New(root, statedb.Database())
 	if err != nil {
 		return nil, nil, nil, NewError(ErrorEVM, fmt.Errorf("could not reopen state: %v", err))
 	}
+
 	body, _ := rlp.EncodeToBytes(includedTxs)
 	return statedb, execRs, body, nil
 }
 
-func MakePreState(db ethdb.Database, chainConfig *params.ChainConfig, pre *Prestate, verkle bool) *state.StateDB {
-	tdb := triedb.NewDatabase(db, &triedb.Config{Preimages: true, IsVerkle: verkle})
+func MakePreState(db ethdb.Database, chainConfig *params.ChainConfig, pre *Prestate, isBintrie bool) *state.StateDB {
+	tdb := triedb.NewDatabase(db, &triedb.Config{Preimages: true, IsVerkle: isBintrie})
 	sdb := state.NewDatabase(tdb, nil)
 
 	root := types.EmptyRootHash
-	if verkle {
-		root = types.EmptyVerkleHash
+	if isBintrie {
+		root = types.EmptyBinaryHash
+	}
+	statedb, err := state.New(root, sdb)
+	if err != nil {
+		panic(fmt.Errorf("failed to create initial statedb: %v", err))
 	}
-	statedb, _ := state.New(root, sdb)
 	for addr, a := range pre.Pre {
 		statedb.SetCode(addr, a.Code, tracing.CodeChangeUnspecified)
 		statedb.SetNonce(addr, a.Nonce, tracing.NonceChangeGenesis)
@@ -450,13 +454,20 @@ func MakePreState(db ethdb.Database, chainConfig *params.ChainConfig, pre *Prest
 	if err != nil {
 		panic(err)
 	}
-	// If verkle mode started, establish the conversion
-	if verkle {
-		if _, ok := statedb.GetTrie().(*trie.VerkleTrie); ok {
+	// If bintrie mode started, check if conversion happened
+	if isBintrie {
+		if _, ok := statedb.GetTrie().(*bintrie.BinaryTrie); ok {
 			return statedb
 		}
+		//TODO(@CPerezz): Fix this in upstream geth
+		// If we're in bintrie mode but don't have a BinaryTrie, something went wrong
+		panic(fmt.Errorf("binary trie mode enabled but trie is %T, not *bintrie.BinaryTrie", statedb.GetTrie()))
+	}
+	// For MPT mode, reopen the state with the committed root
+	statedb, err = state.New(mptRoot, sdb)
+	if err != nil {
+		panic(fmt.Errorf("failed to re-open statedb after commit with root %x: %v", mptRoot, err))
 	}
-	statedb, _ = state.New(mptRoot, sdb)
 	return statedb
 }
 

cmd/evm/internal/t8ntool/flags.go

@@ -88,9 +88,9 @@ var (
 			"\t<file> - into the file <file> ",
 		Value: "block.json",
 	}
-	OutputVKTFlag = &cli.StringFlag{
+	OutputBTFlag = &cli.StringFlag{
 		Name: "output.vkt",
-		Usage: "Determines where to put the `VKT` of the post-state.\n" +
+		Usage: "Determines where to put the `BT` of the post-state.\n" +
 			"\t`stdout` - into the stdout output\n" +
 			"\t`stderr` - into the stderr output\n" +
 			"\t<file> - into the file <file> ",
@@ -139,9 +139,10 @@ var (
 		Usage: "`stdin` or file name of where to find the transactions list in RLP form.",
 		Value: "txs.rlp",
 	}
-	InputVKTFlag = &cli.StringFlag{
+	// TODO(@CPerezz): rename `Name` of the file in a follow-up PR (relays on EEST -> https://github.com/ethereum/execution-spec-tests/tree/verkle/main)
+	InputBTFlag = &cli.StringFlag{
 		Name:  "input.vkt",
-		Usage: "`stdin` or file name of where to find the prestate VKT.",
+		Usage: "`stdin` or file name of where to find the prestate BT.",
 	}
 	SealCliqueFlag = &cli.StringFlag{
 		Name:  "seal.clique",