all: backport from bnb-chain/bsc#543

Signed-off-by: jsvisa <delweng@gmail.com>

cmd/geth/chaincmd.go

@@ -210,7 +210,7 @@ func initGenesis(ctx *cli.Context) error {
  overrides.OverrideVerkle = new(big.Int).SetInt64(v)
  }
  for _, name := range []string{"chaindata", "lightchaindata"} {
- chaindb, err := stack.OpenDatabaseWithFreezer(name, 0, 0, ctx.String(utils.AncientFlag.Name), "", false)
+ chaindb, err := stack.OpenDatabase(name, 0, 0, "", false)
  if err != nil {
  utils.Fatalf("Failed to open database: %v", err)
  }
@@ -416,7 +416,7 @@ func importPreimages(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- db := utils.MakeChainDatabase(ctx, stack, false)
+ db := utils.MakeChainDatabase(ctx, stack, false, false)
  defer db.Close()
  start := time.Now()
 
@@ -438,7 +438,7 @@ func exportPreimages(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- db := utils.MakeChainDatabase(ctx, stack, true)
+ db := utils.MakeChainDatabase(ctx, stack, true, false)
  defer db.Close()
  start := time.Now()
 
@@ -452,7 +452,7 @@ func exportPreimages(ctx *cli.Context) error {
 }
 
 func parseDumpConfig(ctx *cli.Context, stack *node.Node) (*state.DumpConfig, ethdb.Database, common.Hash, error) {
- db := utils.MakeChainDatabase(ctx, stack, true)
+ db := utils.MakeChainDatabase(ctx, stack, true, false)
  defer db.Close()
 
  var header *types.Header

cmd/geth/dbcmd.go

@@ -290,7 +290,7 @@ func inspect(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- db := utils.MakeChainDatabase(ctx, stack, true)
+ db := utils.MakeChainDatabase(ctx, stack, true, false)
  defer db.Close()
 
  return rawdb.InspectDatabase(db, prefix, start)
@@ -317,7 +317,7 @@ func checkStateContent(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- db := utils.MakeChainDatabase(ctx, stack, true)
+ db := utils.MakeChainDatabase(ctx, stack, true, false)
  defer db.Close()
 
  var (
@@ -381,7 +381,7 @@ func dbStats(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- db := utils.MakeChainDatabase(ctx, stack, true)
+ db := utils.MakeChainDatabase(ctx, stack, true, false)
  defer db.Close()
 
  showLeveldbStats(db)
@@ -393,7 +393,7 @@ func dbCompact(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- db := utils.MakeChainDatabase(ctx, stack, false)
+ db := utils.MakeChainDatabase(ctx, stack, false, false)
  defer db.Close()
 
  log.Info("Stats before compaction")
@@ -421,7 +421,7 @@ func dbGet(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- db := utils.MakeChainDatabase(ctx, stack, true)
+ db := utils.MakeChainDatabase(ctx, stack, true, false)
  defer db.Close()
 
  key, err := common.ParseHexOrString(ctx.Args().Get(0))
@@ -450,7 +450,7 @@ func dbDelete(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- db := utils.MakeChainDatabase(ctx, stack, false)
+ db := utils.MakeChainDatabase(ctx, stack, false, false)
  defer db.Close()
 
  key, err := common.ParseHexOrString(ctx.Args().Get(0))
@@ -481,7 +481,7 @@ func dbPut(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- db := utils.MakeChainDatabase(ctx, stack, false)
+ db := utils.MakeChainDatabase(ctx, stack, false, false)
  defer db.Close()
 
  var (
@@ -520,7 +520,7 @@ func dbDumpTrie(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- db := utils.MakeChainDatabase(ctx, stack, true)
+ db := utils.MakeChainDatabase(ctx, stack, true, false)
  defer db.Close()
 
  triedb := utils.MakeTrieDatabase(ctx, db, false, true)
@@ -658,7 +658,7 @@ func importLDBdata(ctx *cli.Context) error {
  close(stop)
  }()
 
- db := utils.MakeChainDatabase(ctx, stack, false)
+ db := utils.MakeChainDatabase(ctx, stack, false, false)
  defer db.Close()
  return utils.ImportLDBData(db, fName, int64(start), stop)
 }
@@ -767,15 +767,15 @@ func exportChaindata(ctx *cli.Context) error {
  close(stop)
  }()
 
- db := utils.MakeChainDatabase(ctx, stack, true)
+ db := utils.MakeChainDatabase(ctx, stack, true, false)
  defer db.Close()
  return utils.ExportChaindata(ctx.Args().Get(1), kind, exporter(db), stop)
 }
 
 func showMetaData(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
- db := utils.MakeChainDatabase(ctx, stack, true)
+ db := utils.MakeChainDatabase(ctx, stack, true, false)
  defer db.Close()
 
  ancients, err := db.Ancients()

cmd/geth/snapshot.go

@@ -160,7 +160,7 @@ func pruneState(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- chaindb := utils.MakeChainDatabase(ctx, stack, false)
+ chaindb := utils.MakeChainDatabase(ctx, stack, false, false)
  defer chaindb.Close()
 
  if rawdb.ReadStateScheme(chaindb) != rawdb.HashScheme {
@@ -203,7 +203,7 @@ func verifyState(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- chaindb := utils.MakeChainDatabase(ctx, stack, true)
+ chaindb := utils.MakeChainDatabase(ctx, stack, true, false)
  defer chaindb.Close()
 
  headBlock := rawdb.ReadHeadBlock(chaindb)
@@ -256,7 +256,7 @@ func checkDanglingStorage(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- db := utils.MakeChainDatabase(ctx, stack, true)
+ db := utils.MakeChainDatabase(ctx, stack, true, false)
  defer db.Close()
  return snapshot.CheckDanglingStorage(db)
 }
@@ -268,7 +268,7 @@ func traverseState(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- chaindb := utils.MakeChainDatabase(ctx, stack, true)
+ chaindb := utils.MakeChainDatabase(ctx, stack, true, false)
  defer chaindb.Close()
 
  triedb := utils.MakeTrieDatabase(ctx, chaindb, false, true)
@@ -392,7 +392,7 @@ func traverseRawState(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- chaindb := utils.MakeChainDatabase(ctx, stack, true)
+ chaindb := utils.MakeChainDatabase(ctx, stack, true, false)
  defer chaindb.Close()
 
  triedb := utils.MakeTrieDatabase(ctx, chaindb, false, true)
@@ -689,7 +689,7 @@ func checkAccount(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- chaindb := utils.MakeChainDatabase(ctx, stack, true)
+ chaindb := utils.MakeChainDatabase(ctx, stack, true, false)
  defer chaindb.Close()
 
  start := time.Now()

cmd/geth/verkle.go

@@ -117,7 +117,7 @@ func verifyVerkle(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- chaindb := utils.MakeChainDatabase(ctx, stack, true)
+ chaindb := utils.MakeChainDatabase(ctx, stack, true, false)
  defer chaindb.Close()
  headBlock := rawdb.ReadHeadBlock(chaindb)
 
@@ -174,7 +174,7 @@ func expandVerkle(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- chaindb := utils.MakeChainDatabase(ctx, stack, true)
+ chaindb := utils.MakeChainDatabase(ctx, stack, true, false)
  defer chaindb.Close()
  var (
  rootC common.Hash

cmd/utils/flags.go

@@ -2184,7 +2184,7 @@ func SplitTagsFlag(tagsFlag string) map[string]string {
 }
 
 // MakeChainDatabase opens a database using the flags passed to the client and will hard crash if it fails.
-func MakeChainDatabase(ctx *cli.Context, stack *node.Node, readonly bool) ethdb.Database {
+func MakeChainDatabase(ctx *cli.Context, stack *node.Node, readonly, disableFreeze bool) ethdb.Database {
  var (
  cache = ctx.Int(CacheFlag.Name) * ctx.Int(CacheDatabaseFlag.Name) / 100
  handles = MakeDatabaseHandles(ctx.Int(FDLimitFlag.Name))
@@ -2205,7 +2205,7 @@ func MakeChainDatabase(ctx *cli.Context, stack *node.Node, readonly bool) ethdb.
  case ctx.String(SyncModeFlag.Name) == "light":
  chainDb, err = stack.OpenDatabase("lightchaindata", cache, handles, "", readonly)
  default:
- chainDb, err = stack.OpenDatabaseWithFreezer("chaindata", cache, handles, ctx.String(AncientFlag.Name), "", readonly)
+ chainDb, err = stack.OpenDatabaseWithFreezer("chaindata", cache, handles, ctx.String(AncientFlag.Name), "", readonly, disableFreeze, false)
  }
 
  if err != nil {
@@ -2224,7 +2224,7 @@ func tryMakeReadOnlyDatabase(ctx *cli.Context, stack *node.Node) ethdb.Database
  if rawdb.PreexistingDatabase(stack.ResolvePath("chaindata")) == "" {
  readonly = false
  }
- return MakeChainDatabase(ctx, stack, readonly)
+ return MakeChainDatabase(ctx, stack, readonly, false)
 }
 
 func IsNetworkPreset(ctx *cli.Context) bool {
@@ -2289,7 +2289,7 @@ func MakeGenesis(ctx *cli.Context) *core.Genesis {
 func MakeChain(ctx *cli.Context, stack *node.Node, readonly bool) (*core.BlockChain, ethdb.Database) {
  var (
  gspec = MakeGenesis(ctx)
- chainDb = MakeChainDatabase(ctx, stack, readonly)
+ chainDb = MakeChainDatabase(ctx, stack, readonly, false)
  )
 
  config, err := core.LoadChainConfig(chainDb, gspec)

core/blockchain_test.go

@@ -946,7 +946,7 @@ func testFastVsFullChains(t *testing.T, scheme string) {
  t.Fatalf("failed to insert receipt %d: %v", n, err)
  }
  // Freezer style fast import the chain.
- ancientDb, err := rawdb.NewDatabaseWithFreezer(rawdb.NewMemoryDatabase(), t.TempDir(), "", false)
+ ancientDb, err := rawdb.NewDatabaseWithFreezer(rawdb.NewMemoryDatabase(), t.TempDir(), "", false, false, false)
  if err != nil {
  t.Fatalf("failed to create temp freezer db: %v", err)
  }
@@ -1051,7 +1051,7 @@ func testLightVsFastVsFullChainHeads(t *testing.T, scheme string) {
 
  // makeDb creates a db instance for testing.
  makeDb := func() ethdb.Database {
- db, err := rawdb.NewDatabaseWithFreezer(rawdb.NewMemoryDatabase(), t.TempDir(), "", false)
+ db, err := rawdb.NewDatabaseWithFreezer(rawdb.NewMemoryDatabase(), t.TempDir(), "", false, false, false)
  if err != nil {
  t.Fatalf("failed to create temp freezer db: %v", err)
  }
@@ -2017,7 +2017,7 @@ func testLargeReorgTrieGC(t *testing.T, scheme string) {
  competitor, _ := GenerateChain(genesis.Config, shared[len(shared)-1], engine, genDb, 2*int(defaultCacheConfig.TriesInMemory)+1, func(i int, b *BlockGen) { b.SetCoinbase(common.Address{3}) })
 
  // Import the shared chain and the original canonical one
- db, _ := rawdb.NewDatabaseWithFreezer(rawdb.NewMemoryDatabase(), t.TempDir(), "", false)
+ db, _ := rawdb.NewDatabaseWithFreezer(rawdb.NewMemoryDatabase(), t.TempDir(), "", false, false, false)
  defer db.Close()
 
  chain, err := NewBlockChain(db, DefaultCacheConfigWithScheme(scheme), genesis, nil, engine, vm.Config{}, nil, nil, nil)
@@ -2090,7 +2090,7 @@ func testBlockchainRecovery(t *testing.T, scheme string) {
  _, blocks, receipts := GenerateChainWithGenesis(gspec, ethash.NewFaker(), int(height), nil)
 
  // Import the chain as a ancient-first node and ensure all pointers are updated
- ancientDb, err := rawdb.NewDatabaseWithFreezer(rawdb.NewMemoryDatabase(), t.TempDir(), "", false)
+ ancientDb, err := rawdb.NewDatabaseWithFreezer(rawdb.NewMemoryDatabase(), t.TempDir(), "", false, false, false)
  if err != nil {
  t.Fatalf("failed to create temp freezer db: %v", err)
  }
@@ -2171,7 +2171,7 @@ func testInsertReceiptChainRollback(t *testing.T, scheme string) {
  }
 
  // Set up a BlockChain that uses the ancient store.
- ancientDb, err := rawdb.NewDatabaseWithFreezer(rawdb.NewMemoryDatabase(), t.TempDir(), "", false)
+ ancientDb, err := rawdb.NewDatabaseWithFreezer(rawdb.NewMemoryDatabase(), t.TempDir(), "", false, false, false)
  if err != nil {
  t.Fatalf("failed to create temp freezer db: %v", err)
  }
@@ -2250,7 +2250,7 @@ func testLowDiffLongChain(t *testing.T, scheme string) {
  })
 
  // Import the canonical chain
- diskdb, _ := rawdb.NewDatabaseWithFreezer(rawdb.NewMemoryDatabase(), t.TempDir(), "", false)
+ diskdb, _ := rawdb.NewDatabaseWithFreezer(rawdb.NewMemoryDatabase(), t.TempDir(), "", false, false, false)
  defer diskdb.Close()
 
  chain, err := NewBlockChain(diskdb, DefaultCacheConfigWithScheme(scheme), genesis, nil, engine, vm.Config{}, nil, nil, nil)
@@ -2483,7 +2483,7 @@ func testInsertKnownChainData(t *testing.T, typ string, scheme string) {
  b.OffsetTime(-9) // A higher difficulty
  })
  // Import the shared chain and the original canonical one
- chaindb, err := rawdb.NewDatabaseWithFreezer(rawdb.NewMemoryDatabase(), t.TempDir(), "", false)
+ chaindb, err := rawdb.NewDatabaseWithFreezer(rawdb.NewMemoryDatabase(), t.TempDir(), "", false, false, false)
  if err != nil {
  t.Fatalf("failed to create temp freezer db: %v", err)
  }
@@ -2668,7 +2668,7 @@ func testInsertKnownChainDataWithMerging(t *testing.T, typ string, mergeHeight i
  }
  })
  // Import the shared chain and the original canonical one
- chaindb, err := rawdb.NewDatabaseWithFreezer(rawdb.NewMemoryDatabase(), t.TempDir(), "", false)
+ chaindb, err := rawdb.NewDatabaseWithFreezer(rawdb.NewMemoryDatabase(), t.TempDir(), "", false, false, false)
  if err != nil {
  t.Fatalf("failed to create temp freezer db: %v", err)
  }
@@ -3026,7 +3026,7 @@ func TestTransactionIndices(t *testing.T) {
  limit := []uint64{0, 32, 64, 128}
  for _, l := range limit {
  frdir := t.TempDir()
- ancientDb, _ := rawdb.NewDatabaseWithFreezer(rawdb.NewMemoryDatabase(), frdir, "", false)
+ ancientDb, _ := rawdb.NewDatabaseWithFreezer(rawdb.NewMemoryDatabase(), frdir, "", false, false, false)
  _, _ = rawdb.WriteAncientBlocks(ancientDb, append([]*types.Block{gspec.ToBlock()}, blocks...), append([]types.Receipts{{}}, receipts...), append([]types.Receipts{{}}, borReceipts...), big.NewInt(0))
 
  l := l
@@ -3050,7 +3050,7 @@ func TestTransactionIndices(t *testing.T) {
  }
 
  // Reconstruct a block chain which only reserves HEAD-64 tx indices
- ancientDb, _ := rawdb.NewDatabaseWithFreezer(rawdb.NewMemoryDatabase(), t.TempDir(), "", false)
+ ancientDb, _ := rawdb.NewDatabaseWithFreezer(rawdb.NewMemoryDatabase(), t.TempDir(), "", false, false, false)
  defer ancientDb.Close()
 
  _, _ = rawdb.WriteAncientBlocks(ancientDb, append([]*types.Block{gspec.ToBlock()}, blocks...), append([]types.Receipts{{}}, receipts...), append([]types.Receipts{{}}, borReceipts...), big.NewInt(0))
@@ -3140,7 +3140,7 @@ func testSkipStaleTxIndicesInSnapSync(t *testing.T, scheme string) {
  }
  }
 
- ancientDb, err := rawdb.NewDatabaseWithFreezer(rawdb.NewMemoryDatabase(), t.TempDir(), "", false)
+ ancientDb, err := rawdb.NewDatabaseWithFreezer(rawdb.NewMemoryDatabase(), t.TempDir(), "", false, false, false)
  if err != nil {
  t.Fatalf("failed to create temp freezer db: %v", err)
  }
@@ -4260,7 +4260,7 @@ func testSetCanonical(t *testing.T, scheme string) {
 
  gen.AddTx(tx)
  })
- diskdb, _ := rawdb.NewDatabaseWithFreezer(rawdb.NewMemoryDatabase(), t.TempDir(), "", false)
+ diskdb, _ := rawdb.NewDatabaseWithFreezer(rawdb.NewMemoryDatabase(), t.TempDir(), "", false, false, false)
  defer diskdb.Close()
 
  chain, err := NewBlockChain(diskdb, DefaultCacheConfigWithScheme(scheme), gspec, nil, engine, vm.Config{}, nil, nil, nil)
@@ -4639,7 +4639,7 @@ func TestTxIndexer(t *testing.T) {
 
  for _, c := range cases {
  frdir := t.TempDir()
- db, _ := rawdb.NewDatabaseWithFreezer(rawdb.NewMemoryDatabase(), frdir, "", false)
+ db, _ := rawdb.NewDatabaseWithFreezer(rawdb.NewMemoryDatabase(), frdir, "", false, false, false)
  _, _ = rawdb.WriteAncientBlocks(db, append([]*types.Block{gspec.ToBlock()}, blocks...), append([]types.Receipts{{}}, receipts...), append([]types.Receipts{{}}, borReceipts...), big.NewInt(0))
 
  // Index the initial blocks from ancient store

core/rawdb/accessors_chain_test.go

@@ -470,7 +470,7 @@ func checkReceiptsRLP(have, want types.Receipts) error {
 func TestAncientStorage(t *testing.T) {
  // Freezer style fast import the chain.
  frdir := t.TempDir()
- db, err := NewDatabaseWithFreezer(NewMemoryDatabase(), frdir, "", false)
+ db, err := NewDatabaseWithFreezer(NewMemoryDatabase(), frdir, "", false, false, false)
  if err != nil {
  t.Fatalf("failed to create database with ancient backend")
  }
@@ -630,7 +630,7 @@ func BenchmarkWriteAncientBlocks(b *testing.B) {
  // Open freezer database.
  frdir := b.TempDir()
 
- db, err := NewDatabaseWithFreezer(NewMemoryDatabase(), frdir, "", false)
+ db, err := NewDatabaseWithFreezer(NewMemoryDatabase(), frdir, "", false, false, false)
  if err != nil {
  b.Fatalf("failed to create database with ancient backend")
  }
@@ -961,7 +961,7 @@ func TestHeadersRLPStorage(t *testing.T) {
  // Have N headers in the freezer
  frdir := t.TempDir()
 
- db, err := NewDatabaseWithFreezer(NewMemoryDatabase(), frdir, "", false)
+ db, err := NewDatabaseWithFreezer(NewMemoryDatabase(), frdir, "", false, false, false)
  if err != nil {
  t.Fatalf("failed to create database with ancient backend")
  }

core/rawdb/chain_freezer.go

@@ -52,8 +52,8 @@ type chainFreezer struct {
 }
 
 // newChainFreezer initializes the freezer for ancient chain data.
-func newChainFreezer(datadir string, namespace string, readonly bool) (*chainFreezer, error) {
- freezer, err := NewChainFreezer(datadir, namespace, readonly)
+func newChainFreezer(datadir string, namespace string, readonly bool, offset uint64) (*chainFreezer, error) {
+ freezer, err := NewChainFreezer(datadir, namespace, readonly, offset)
  if err != nil {
  return nil, err
  }