diff --git a/cmd/evm/main.go b/cmd/evm/main.go index 465148e8358d..b7bb52425e83 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -172,25 +172,25 @@ var verkleCommand = &cli.Command{ }, { Name: "single-key", - Aliases: []string{"V"}, + Aliases: []string{"vk"}, Usage: "compute the verkle tree key given an address and optional slot number", Action: t8ntool.VerkleKey, }, { Name: "code-chunk-key", - Aliases: []string{"VCK"}, + Aliases: []string{"vck"}, Usage: "compute the verkle tree key given an address and chunk number", Action: t8ntool.VerkleCodeChunkKey, }, { Name: "chunkify-code", - Aliases: []string{"VCC"}, + Aliases: []string{"vcc"}, Usage: "chunkify a given bytecode", Action: t8ntool.VerkleChunkifyCode, }, { Name: "state-root", - Aliases: []string{"VR"}, + Aliases: []string{"vsr"}, Usage: "compute the state-root of a verkle tree for the given alloc", Action: t8ntool.VerkleRoot, Flags: []cli.Flag{ diff --git a/consensus/beacon/consensus.go b/consensus/beacon/consensus.go index acf5abeb1a99..1fe5ffb612ff 100644 --- a/consensus/beacon/consensus.go +++ b/consensus/beacon/consensus.go @@ -28,6 +28,7 @@ import ( "github.com/ethereum/go-ethereum/core/overlay" "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/rpc" "github.com/ethereum/go-ethereum/trie" @@ -365,6 +366,7 @@ func (beacon *Beacon) Finalize(chain consensus.ChainHeaderReader, header *types. // fmt.Println("at block", header.Number, "performing transition?", state.Database().InTransition()) parent := chain.GetHeaderByHash(header.ParentHash) if err := overlay.OverlayVerkleTransition(state, parent.Root, chain.Config().OverlayStride); err != nil { + log.Error("error performing the transition", "err", err) panic(fmt.Sprintf("error performing the transition: %s", err)) } } diff --git a/core/genesis.go b/core/genesis.go index 24bd7a2af6f7..b5fe17a6f4ae 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -161,6 +161,7 @@ func (ga *GenesisAlloc) flush(db ethdb.Database, triedb *trie.Database, blockhas } for addr, account := range *ga { + // TODO set back to AddBalance after rebase statedb.SetBalance(addr, account.Balance) statedb.SetCode(addr, account.Code) statedb.SetNonce(addr, account.Nonce)