all: apply flock for locking file and upgrade golang from 1.20 to 1.22

.github/workflows/test-pr.yml

@@ -24,7 +24,7 @@ jobs:
  - name: 'Setup Go'
  uses: actions/setup-go@v5
  with:
- go-version: '1.20.10'
+ go-version: '1.22.8'
 
  - name: 'Go Test- Test Coverage'
  run: make test

Dockerfile

@@ -1,13 +1,13 @@
 # Build Geth in a stock Go builder container
-FROM golang:1.20.10-alpine3.18@sha256:0d6e012ec44ed21993ee2ccf05839844f13347165ce7599a8e8442b02f836b45 as builder
+FROM golang:1.22.8-alpine3.19@sha256:fe5bea2e1ab3ffebe0267393fea88fcb197e2dbbb1e2dbabeec6dd9ccb0e1871 as builder
 
 RUN apk add --no-cache make gcc musl-dev linux-headers git libstdc++-dev
 
 COPY . /opt
 RUN cd /opt && make ronin
 
 # Pull Geth into a second stage deploy alpine container
-FROM alpine:3.18@sha256:5292533eb4efd4b5cf35e93b5a2b7d0e07ea193224c49446c7802c19ee4f2da5
+FROM alpine:3.19@sha256:ae65dbf8749a7d4527648ccee1fa3deb6bfcae34cbc30fc67aa45c44dcaa90ee
 
 RUN apk add --no-cache ca-certificates
 WORKDIR "/opt"

cmd/devp2p/internal/ethtest/suite_test.go

@@ -91,8 +91,6 @@ func setupGeth(stack *node.Node) error {
  Genesis: &chain.genesis,
  NetworkId: chain.genesis.Config.ChainID.Uint64(), // 19763
  DatabaseCache: 10,
- TrieCleanCache: 10,
- TrieCleanCacheJournal: "",
  TrieCleanCacheRejournal: 60 * time.Minute,
  TrieDirtyCache: 16,
  TrieTimeout: 60 * time.Minute,

cmd/evm/internal/t8ntool/execution.go

@@ -242,7 +242,7 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig,
  statedb.AddBalance(pre.Env.Coinbase, minerReward)
  }
  // Commit block
- root, err := statedb.Commit(chainConfig.IsEIP158(vmContext.BlockNumber))
+ root, err := statedb.Commit(vmContext.BlockNumber.Uint64(), chainConfig.IsEIP158(vmContext.BlockNumber))
  if err != nil {
  fmt.Fprintf(os.Stderr, "Could not commit state: %v", err)
  return nil, nil, NewError(ErrorEVM, fmt.Errorf("could not commit state: %v", err))
@@ -273,7 +273,7 @@ func MakePreState(db ethdb.Database, accounts core.GenesisAlloc) *state.StateDB
  }
  }
  // Commit and re-open to start with a clean state.
- root, _ := statedb.Commit(false)
+ root, _ := statedb.Commit(0, false)
  statedb, _ = state.New(root, sdb, nil)
  return statedb
 }

cmd/evm/runner.go

@@ -20,8 +20,6 @@ import (
  "bytes"
  "encoding/json"
  "fmt"
- "github.com/ethereum/go-ethereum/eth/tracers/logger"
- "github.com/ethereum/go-ethereum/internal/flags"
  "io/ioutil"
  "math/big"
  "os"
@@ -30,6 +28,9 @@ import (
  "testing"
  "time"
 
+ "github.com/ethereum/go-ethereum/eth/tracers/logger"
+ "github.com/ethereum/go-ethereum/internal/flags"
+
  "github.com/ethereum/go-ethereum/cmd/evm/internal/compiler"
  "github.com/ethereum/go-ethereum/cmd/utils"
  "github.com/ethereum/go-ethereum/common"
@@ -269,7 +270,7 @@ func runCmd(ctx *cli.Context) error {
  output, leftOverGas, stats, err := timedExec(bench, execFunc)
 
  if ctx.Bool(DumpFlag.Name) {
- statedb.Commit(true)
+ statedb.Commit(0, true)
  statedb.IntermediateRoot(true)
  fmt.Println(string(statedb.Dump(nil)))
  }

cmd/ronin/config.go

@@ -287,6 +287,10 @@ func deprecated(field string) bool {
  return true
  case "ethconfig.Config.EWASMInterpreter":
  return true
+ case "ethconfig.Config.TrieCleanCacheJournal":
+ return true
+ case "ethconfig.Config.TrieCleanCacheRejournal":
+ return true
  default:
  return false
  }

cmd/ronin/dbcmd.go

@@ -180,7 +180,7 @@ WARNING: This is a low-level operation which may cause database corruption!`,
  Action: dbDumpTrie,
  Name: "dumptrie",
  Usage: "Show the storage key/values of a given storage trie",
- ArgsUsage: "<hex-encoded storage trie root> <hex-encoded start (optional)> <int max elements (optional)>",
+ ArgsUsage: "<hex-encoded state root> <hex-encoded account hash> <hex-encoded storage trie root> <hex-encoded start (optional)> <int max elements (optional)>",
  Flags: []cli.Flag{
  utils.DataDirFlag,
  utils.DBEngineFlag,
@@ -468,7 +468,7 @@ func dbPut(ctx *cli.Context) error {
 
 // dbDumpTrie shows the key-value slots of a given storage trie
 func dbDumpTrie(ctx *cli.Context) error {
- if ctx.NArg() < 1 {
+ if ctx.NArg() < 3 {
  return fmt.Errorf("required arguments: %v", ctx.Command.ArgsUsage)
  }
  stack, _ := makeConfigNode(ctx)
@@ -477,29 +477,39 @@ func dbDumpTrie(ctx *cli.Context) error {
  db := utils.MakeChainDatabase(ctx, stack, true)
  defer db.Close()
  var (
- root []byte
- start []byte
- max = int64(-1)
- err error
+ state []byte
+ storage []byte
+ account []byte
+ start []byte
+ max = int64(-1)
+ err error
  )
- if root, err = hexutil.Decode(ctx.Args().Get(0)); err != nil {
- log.Info("Could not decode the root", "error", err)
+ if state, err = hexutil.Decode(ctx.Args().Get(0)); err != nil {
+ log.Info("Could not decode the state", "error", err)
  return err
  }
- stRoot := common.BytesToHash(root)
- if ctx.NArg() >= 2 {
- if start, err = hexutil.Decode(ctx.Args().Get(1)); err != nil {
+ if account, err = hexutil.Decode(ctx.Args().Get(1)); err != nil {
+ log.Info("Could not decode the account hash", "error", err)
+ return err
+ }
+ if storage, err = hexutil.Decode(ctx.Args().Get(2)); err != nil {
+ log.Info("Could not decode the storage trie root", "error", err)
+ return err
+ }
+ if ctx.NArg() > 3 {
+ if start, err = hexutil.Decode(ctx.Args().Get(3)); err != nil {
  log.Info("Could not decode the seek position", "error", err)
  return err
  }
  }
- if ctx.NArg() >= 3 {
- if max, err = strconv.ParseInt(ctx.Args().Get(2), 10, 64); err != nil {
+ if ctx.NArg() > 4 {
+ if max, err = strconv.ParseInt(ctx.Args().Get(4), 10, 64); err != nil {
  log.Info("Could not decode the max count", "error", err)
  return err
  }
  }
- theTrie, err := trie.New(common.Hash{}, stRoot, trie.NewDatabase(db))
+ id := trie.StorageTrieID(common.BytesToHash(state), common.BytesToHash(account), common.BytesToHash(storage))
+ theTrie, err := trie.New(id, trie.NewDatabase(db))
  if err != nil {
  return err
  }

cmd/ronin/main.go

@@ -118,8 +118,8 @@ var (
  utils.CacheFlag,
  utils.CacheDatabaseFlag,
  utils.CacheTrieFlag,
- utils.CacheTrieJournalFlag,
- utils.CacheTrieRejournalFlag,
+ utils.CacheTrieJournalFlag, // deprecated
+ utils.CacheTrieRejournalFlag, // deprecated
  utils.CacheGCFlag,
  utils.CacheSnapshotFlag,
  utils.CacheNoPrefetchFlag,

cmd/ronin/snapshot.go

@@ -66,7 +66,6 @@ var (
  utils.SepoliaFlag,
  utils.RinkebyFlag,
  utils.GoerliFlag,
- utils.CacheTrieJournalFlag,
  utils.BloomFilterSizeFlag,
  },
  Description: `
@@ -187,11 +186,12 @@ block is used.
 )
 
 func pruneState(ctx *cli.Context) error {
- stack, config := makeConfigNode(ctx)
+ stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
  chaindb := utils.MakeChainDatabase(ctx, stack, false)
- pruner, err := pruner.NewPruner(chaindb, stack.ResolvePath(""), stack.ResolvePath(config.Eth.TrieCleanCacheJournal), ctx.Uint64(utils.BloomFilterSizeFlag.Name))
+ pruner, err := pruner.NewPruner(chaindb, stack.ResolvePath(""),
+ ctx.Uint64(utils.BloomFilterSizeFlag.Name))
  if err != nil {
  log.Error("Failed to open snapshot tree", "err", err)
  return err
@@ -283,7 +283,7 @@ func traverseState(ctx *cli.Context) error {
  log.Info("Start traversing the state", "root", root, "number", headBlock.NumberU64())
  }
  triedb := trie.NewDatabase(chaindb)
- t, err := trie.NewSecure(common.Hash{}, root, triedb)
+ t, err := trie.NewSecure(trie.StateTrieID(root), triedb)
  if err != nil {
  log.Error("Failed to open trie", "root", root, "err", err)
  return err
@@ -304,7 +304,7 @@ func traverseState(ctx *cli.Context) error {
  return err
  }
  if acc.Root != emptyRoot {
- storageTrie, err := trie.NewSecure(common.BytesToHash(accIter.Key), acc.Root, triedb)
+ storageTrie, err := trie.NewSecure(trie.StorageTrieID(root, common.BytesToHash(accIter.Key), acc.Root), triedb)
  if err != nil {
  log.Error("Failed to open storage trie", "root", acc.Root, "err", err)
  return err
@@ -373,7 +373,7 @@ func traverseRawState(ctx *cli.Context) error {
  log.Info("Start traversing the state", "root", root, "number", headBlock.NumberU64())
  }
  triedb := trie.NewDatabase(chaindb)
- t, err := trie.NewSecure(common.Hash{}, root, triedb)
+ t, err := trie.NewSecure(trie.StateTrieID(root), triedb)
  if err != nil {
  log.Error("Failed to open trie", "root", root, "err", err)
  return err
@@ -394,8 +394,7 @@ func traverseRawState(ctx *cli.Context) error {
  if node != (common.Hash{}) {
  // Check the present for non-empty hash node(embedded node doesn't
  // have their own hash).
- blob := rawdb.ReadTrieNode(chaindb, node)
- if len(blob) == 0 {
+ if !rawdb.HasLegacyTrieNode(chaindb, node) {
  log.Error("Missing trie node(account)", "hash", node)
  return errors.New("missing account")
  }
@@ -410,7 +409,7 @@ func traverseRawState(ctx *cli.Context) error {
  return errors.New("invalid account")
  }
  if acc.Root != emptyRoot {
- storageTrie, err := trie.NewSecure(common.BytesToHash(accIter.LeafKey()), acc.Root, triedb)
+ storageTrie, err := trie.NewSecure(trie.StorageTrieID(root, common.BytesToHash(accIter.LeafKey()), acc.Root), triedb)
  if err != nil {
  log.Error("Failed to open storage trie", "root", acc.Root, "err", err)
  return errors.New("missing storage trie")
@@ -423,8 +422,7 @@ func traverseRawState(ctx *cli.Context) error {
  // Check the present for non-empty hash node(embedded node doesn't
  // have their own hash).
  if node != (common.Hash{}) {
- blob := rawdb.ReadTrieNode(chaindb, node)
- if len(blob) == 0 {
+ if !rawdb.HasLegacyTrieNode(chaindb, node) {
  log.Error("Missing trie node(storage)", "hash", node)
  return errors.New("missing storage")
  }
@@ -498,14 +496,14 @@ func dumpState(ctx *cli.Context) error {
  Root common.Hash `json:"root"`
  }{root})
  for accIt.Next() {
- account, err := snapshot.FullAccount(accIt.Account())
+ account, err := types.FullAccount(accIt.Account())
  if err != nil {
  return err
  }
  da := &state.DumpAccount{
  Balance: account.Balance.String(),
  Nonce: account.Nonce,
- Root: account.Root,
+ Root: account.Root.Bytes(),
  CodeHash: account.CodeHash,
  SecureKey: accIt.Hash().Bytes(),
  }

cmd/utils/flags.go

@@ -479,18 +479,6 @@ var (
  Value: 15,
  Category: flags.PerfCategory,
  }
- CacheTrieJournalFlag = &cli.StringFlag{
- Name: "cache.trie.journal",
- Usage: "Disk journal directory for trie cache to survive node restarts",
- Value: ethconfig.Defaults.TrieCleanCacheJournal,
- Category: flags.PerfCategory,
- }
- CacheTrieRejournalFlag = &cli.DurationFlag{
- Name: "cache.trie.rejournal",
- Usage: "Time interval to regenerate the trie cache journal",
- Value: ethconfig.Defaults.TrieCleanCacheRejournal,
- Category: flags.PerfCategory,
- }
  CacheGCFlag = &cli.IntFlag{
  Name: "cache.gc",
  Usage: "Percentage of cache memory allowance to use for trie pruning (default = 25% full mode, 0% archive mode)",
@@ -1922,12 +1910,6 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
  if ctx.IsSet(CacheFlag.Name) || ctx.IsSet(CacheTrieFlag.Name) {
  cfg.TrieCleanCache = ctx.Int(CacheFlag.Name) * ctx.Int(CacheTrieFlag.Name) / 100
  }
- if ctx.IsSet(CacheTrieJournalFlag.Name) {
- cfg.TrieCleanCacheJournal = ctx.String(CacheTrieJournalFlag.Name)
- }
- if ctx.IsSet(CacheTrieRejournalFlag.Name) {
- cfg.TrieCleanCacheRejournal = ctx.Duration(CacheTrieRejournalFlag.Name)
- }
  if ctx.IsSet(CacheFlag.Name) || ctx.IsSet(CacheGCFlag.Name) {
  cfg.TrieDirtyCache = ctx.Int(CacheFlag.Name) * ctx.Int(CacheGCFlag.Name) / 100
  }

cmd/utils/flags_legacy.go

@@ -20,6 +20,7 @@ import (
  "fmt"
 
  "github.com/ethereum/go-ethereum/eth/ethconfig"
+ "github.com/ethereum/go-ethereum/internal/flags"
  "github.com/urfave/cli/v2"
 )
 
@@ -35,6 +36,8 @@ var ShowDeprecated = &cli.Command{
 var DeprecatedFlags = []cli.Flag{
  LegacyMinerGasTargetFlag,
  NoUSBFlag,
+ CacheTrieJournalFlag,
+ CacheTrieRejournalFlag,
 }
 
 var (
@@ -49,6 +52,17 @@ var (
  Usage: "Target gas floor for mined blocks (deprecated)",
  Value: ethconfig.Defaults.Miner.GasFloor,
  }
+ // (Deprecated Oct 2024, shown in aliased flags section)
+ CacheTrieJournalFlag = &cli.StringFlag{
+ Name: "cache.trie.journal",
+ Usage: "Disk journal directory for trie cache to survive node restarts",
+ Category: flags.PerfCategory,
+ }
+ CacheTrieRejournalFlag = &cli.DurationFlag{
+ Name: "cache.trie.rejournal",
+ Usage: "Time interval to regenerate the trie cache journal",
+ Category: flags.PerfCategory,
+ }
 )
 
 // showDeprecated displays deprecated flags that will be soon removed from the codebase.

common/types.go

@@ -79,6 +79,11 @@ func (h Hash) Big() *big.Int { return new(big.Int).SetBytes(h[:]) }
 // Hex converts a hash to a hex string.
 func (h Hash) Hex() string { return hexutil.Encode(h[:]) }
 
+// Cmp compares two hashes.
+func (h Hash) Cmp(other Hash) int {
+ return bytes.Compare(h[:], other[:])
+}
+
 // TerminalString implements log.TerminalStringer, formatting a string for console
 // output during logging.
 func (h Hash) TerminalString() string {