feat: active pbss

cmd/evm/blockrunner.go

@@ -22,6 +22,7 @@ import (
  "fmt"
  "os"
 
+ "github.com/ethereum/go-ethereum/core/rawdb"
  "github.com/ethereum/go-ethereum/core/vm"
  "github.com/ethereum/go-ethereum/eth/tracers/logger"
  "github.com/ethereum/go-ethereum/log"
@@ -64,7 +65,7 @@ func blockTestCmd(ctx *cli.Context) error {
  return err
  }
  for i, test := range tests {
- if err := test.Run(false, tracer); err != nil {
+ if err := test.Run(false, rawdb.HashScheme, tracer); err != nil {
  return fmt.Errorf("test %v: %w", i, err)
  }
  }

cmd/evm/runner.go

@@ -42,6 +42,7 @@ import (
  "github.com/ethereum/go-ethereum/log"
  "github.com/ethereum/go-ethereum/params"
  "github.com/ethereum/go-ethereum/trie"
+ "github.com/ethereum/go-ethereum/trie/triedb/hashdb"
  "github.com/urfave/cli/v2"
 )
 
@@ -142,12 +143,23 @@ func runCmd(ctx *cli.Context) error {
  gen := readGenesis(ctx.String(GenesisFlag.Name))
  genesisConfig = gen
  db := rawdb.NewMemoryDatabase()
- genesis := gen.MustCommit(db)
- sdb := state.NewDatabaseWithConfig(db, &trie.Config{Preimages: preimages})
+ triedb := trie.NewDatabase(db, &trie.Config{
+ Preimages: preimages,
+ HashDB: hashdb.Defaults,
+ })
+ defer triedb.Close()
+ genesis := gen.MustCommit(db, triedb)
+ sdb := state.NewDatabaseWithNodeDB(db, triedb)
  statedb, _ = state.New(genesis.Root(), sdb, nil)
  chainConfig = gen.Config
  } else {
- sdb := state.NewDatabaseWithConfig(rawdb.NewMemoryDatabase(), &trie.Config{Preimages: preimages})
+ db := rawdb.NewMemoryDatabase()
+ triedb := trie.NewDatabase(db, &trie.Config{
+ Preimages: preimages,
+ HashDB: hashdb.Defaults,
+ })
+ defer triedb.Close()
+ sdb := state.NewDatabaseWithNodeDB(db, triedb)
  statedb, _ = state.New(types.EmptyRootHash, sdb, nil)
  genesisConfig = new(core.Genesis)
  }

cmd/evm/staterunner.go

@@ -23,7 +23,9 @@ import (
  "os"
 
  "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/rawdb"
  "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/state/snapshot"
  "github.com/ethereum/go-ethereum/core/vm"
  "github.com/ethereum/go-ethereum/eth/tracers/logger"
  "github.com/ethereum/go-ethereum/log"
@@ -104,25 +106,22 @@ func runStateTest(fname string, cfg vm.Config, jsonOut, dump bool) error {
  for _, st := range test.Subtests() {
  // Run the test and aggregate the result
  result := &StatetestResult{Name: key, Fork: st.Fork, Pass: true}
- _, s, err := test.Run(st, cfg, false)
- // print state root for evmlab tracing
- if s != nil {
- root := s.IntermediateRoot(false)
- result.Root = &root
- if jsonOut {
- fmt.Fprintf(os.Stderr, "{\"stateRoot\": \"%#x\"}\n", root)
+ test.Run(st, cfg, false, rawdb.HashScheme, func(err error, snaps *snapshot.Tree, state *state.StateDB) {
+ if err != nil {
+ // Test failed, mark as so and dump any state to aid debugging
+ result.Pass, result.Error = false, err.Error()
+ if dump {
+ dump := state.RawDump(nil)
+ result.State = &dump
+ }
+ } else {
+ root := state.IntermediateRoot(false)
+ result.Root = &root
+ if jsonOut {
+ fmt.Fprintf(os.Stderr, "{\"stateRoot\": \"%#x\"}\n", root)
+ }
  }
- }
- if err != nil {
- // Test failed, mark as so and dump any state to aid debugging
- result.Pass, result.Error = false, err.Error()
- if dump && s != nil {
- s, _ = state.New(*result.Root, s.Database(), nil)
- dump := s.RawDump(nil)
- result.State = &dump
- }
- }
-
+ })
  results = append(results, *result)
  }
  }

cmd/geth/chaincmd.go

@@ -44,7 +44,6 @@ import (
  "github.com/ethereum/go-ethereum/metrics"
  "github.com/ethereum/go-ethereum/node"
  "github.com/ethereum/go-ethereum/p2p/enode"
- "github.com/ethereum/go-ethereum/trie"
  "github.com/urfave/cli/v2"
 )
 
@@ -54,7 +53,10 @@ var (
  Name: "init",
  Usage: "Bootstrap and initialize a new genesis block",
  ArgsUsage: "<genesisPath>",
- Flags: flags.Merge([]cli.Flag{utils.CachePreimagesFlag}, utils.DatabasePathFlags),
+ Flags: flags.Merge([]cli.Flag{
+ utils.CachePreimagesFlag,
+ utils.StateSchemeFlag,
+ }, utils.DatabasePathFlags),
  Description: `
 The init command initializes a new genesis block and definition for the network.
 This is a destructive action and changes the network in which you will be
@@ -116,6 +118,9 @@ if one is set. Otherwise it prints the genesis from the datadir.`,
  utils.MetricsInfluxDBBucketFlag,
  utils.MetricsInfluxDBOrganizationFlag,
  utils.TxLookupLimitFlag,
+ utils.TransactionHistoryFlag,
+ utils.StateSchemeFlag,
+ utils.StateHistoryFlag,
  }, utils.DatabasePathFlags),
  Description: `
 The import command imports blocks from an RLP-encoded form. The form can be one file
@@ -132,6 +137,7 @@ processing will proceed even if an individual RLP-file import failure occurs.`,
  Flags: flags.Merge([]cli.Flag{
  utils.CacheFlag,
  utils.SyncModeFlag,
+ utils.StateSchemeFlag,
  }, utils.DatabasePathFlags),
  Description: `
 Requires a first argument of the file to write to.
@@ -181,6 +187,7 @@ It's deprecated, please use "geth db export" instead.
  utils.IncludeIncompletesFlag,
  utils.StartKeyFlag,
  utils.DumpLimitFlag,
+ utils.StateSchemeFlag,
  }, utils.DatabasePathFlags),
  Description: `
 This command dumps out the state for a given block (or latest, if none provided).
@@ -217,14 +224,15 @@ func initGenesis(ctx *cli.Context) error {
  if err != nil {
  utils.Fatalf("Failed to open database: %v", err)
  }
- triedb := trie.NewDatabaseWithConfig(chaindb, &trie.Config{
- Preimages: ctx.Bool(utils.CachePreimagesFlag.Name),
- })
+ defer chaindb.Close()
+
+ triedb := utils.MakeTrieDatabase(ctx, chaindb, ctx.Bool(utils.CachePreimagesFlag.Name), false)
+ defer triedb.Close()
+
  _, hash, err := core.SetupGenesisBlock(chaindb, triedb, genesis)
  if err != nil {
  utils.Fatalf("Failed to write genesis block: %v", err)
  }
- chaindb.Close()
  log.Info("Successfully wrote genesis state", "database", name, "hash", hash)
  }
  return nil
@@ -422,7 +430,7 @@ func dumpGenesis(ctx *cli.Context) error {
  if ctx.IsSet(utils.DataDirFlag.Name) {
  utils.Fatalf("no existing datadir at %s", stack.Config().DataDir)
  }
- utils.Fatalf("no network preset provided. no exisiting genesis in the default datadir")
+ utils.Fatalf("no network preset provided, no existing genesis in the default datadir")
  return nil
 }
 
@@ -646,10 +654,10 @@ func dump(ctx *cli.Context) error {
  if err != nil {
  return err
  }
- config := &trie.Config{
-  Preimages: true, // always enable preimage lookup
- }
- state, err := state.New(root, state.NewDatabaseWithConfig(db, config), nil)
+ triedb := utils.MakeTrieDatabase(ctx, db, true, false) // always enable preimage lookup
+ defer triedb.Close()
+
+ state, err := state.New(root, state.NewDatabaseWithNodeDB(db, triedb), nil)
  if err != nil {
  return err
  }

cmd/geth/dbcmd.go

@@ -154,6 +154,7 @@ WARNING: This is a low-level operation which may cause database corruption!`,
  ArgsUsage: "<hex-encoded state root> <hex-encoded account hash> <hex-encoded storage trie root> <hex-encoded start (optional)> <int max elements (optional)>",
  Flags: flags.Merge([]cli.Flag{
  utils.SyncModeFlag,
+ utils.StateSchemeFlag,
  }, utils.NetworkFlags, utils.DatabasePathFlags),
  Description: "This command looks up the specified database key from the database.",
  }
@@ -504,6 +505,9 @@ func dbDumpTrie(ctx *cli.Context) error {
  db := utils.MakeChainDatabase(ctx, stack, true, false)
  defer db.Close()
 
+ triedb := utils.MakeTrieDatabase(ctx, db, false, true)
+ defer triedb.Close()
+
  var (
  state []byte
  storage []byte
@@ -537,7 +541,7 @@ func dbDumpTrie(ctx *cli.Context) error {
  }
  }
  id := trie.StorageTrieID(common.BytesToHash(state), common.BytesToHash(account), common.BytesToHash(storage))
- theTrie, err := trie.New(id, trie.NewDatabase(db))
+ theTrie, err := trie.New(id, triedb)
  if err != nil {
  return err
  }

cmd/geth/genesis_test.go

@@ -176,12 +176,12 @@ func TestCustomBackend(t *testing.T) {
  { // Can't start pebble on top of leveldb
  initArgs: []string{"--db.engine", "leveldb"},
  execArgs: []string{"--db.engine", "pebble"},
- execExpect: `Fatal: Failed to register the Ethereum service: db.engine choice was pebble but found pre-existing leveldb database in specified data directory`,
+ execExpect: `Fatal: Could not open database: db.engine choice was pebble but found pre-existing leveldb database in specified data directory`,
  },
  { // Can't start leveldb on top of pebble
  initArgs: []string{"--db.engine", "pebble"},
  execArgs: []string{"--db.engine", "leveldb"},
- execExpect: `Fatal: Failed to register the Ethereum service: db.engine choice was leveldb but found pre-existing pebble database in specified data directory`,
+ execExpect: `Fatal: Could not open database: db.engine choice was leveldb but found pre-existing pebble database in specified data directory`,
  },
  { // Reject invalid backend choice
  initArgs: []string{"--db.engine", "mssql"},

cmd/geth/main.go

@@ -94,6 +94,9 @@ var (
  utils.GCModeFlag,
  utils.SnapshotFlag,
  utils.TxLookupLimitFlag,
+ utils.TransactionHistoryFlag,
+ utils.StateSchemeFlag,
+ utils.StateHistoryFlag,
  utils.LightServeFlag,
  utils.LightIngressFlag,
  utils.LightEgressFlag,

cmd/geth/pruneblock_test.go

@@ -41,6 +41,7 @@ import (
  "github.com/ethereum/go-ethereum/node"
  "github.com/ethereum/go-ethereum/params"
  "github.com/ethereum/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/trie"
 )
 
 var (
@@ -136,7 +137,11 @@ func BlockchainCreator(t *testing.T, chaindbPath, AncientPath string, blockRemai
  t.Fatalf("failed to create database with ancient backend")
  }
  defer db.Close()
- genesis := gspec.MustCommit(db)
+
+ triedb := trie.NewDatabase(db, nil)
+ defer triedb.Close()
+
+ genesis := gspec.MustCommit(db, triedb)
  // Initialize a fresh chain with only a genesis block
  blockchain, err := core.NewBlockChain(db, config, gspec, nil, engine, vm.Config{}, nil, nil)
  if err != nil {