Merge upstream commit ethereum#28124

eth/downloader: fix genesis state missing due to state sync (ethereum#28124)

 Conflicts:
  core/blockchain.go
These conflicts were dut to our changes in setHeadBeyondRoot.
In the function call upstream only indented the code, but tested
Upstream also added to the file an assumption that genesis is block 0,
which we removed.

core/blockchain.go

@@ -379,31 +379,41 @@ func NewBlockChain(db ethdb.Database, cacheConfig *CacheConfig, chainConfig *par
  // Make sure the state associated with the block is available
  head := bc.CurrentBlock()
  if !bc.HasState(head.Root) {
- // Head state is missing, before the state recovery, find out the
- // disk layer point of snapshot(if it's enabled). Make sure the
- // rewound point is lower than disk layer.
- var diskRoot common.Hash
- if bc.cacheConfig.SnapshotLimit > 0 {
- diskRoot = rawdb.ReadSnapshotRoot(bc.db)
- }
- if diskRoot != (common.Hash{}) {
- log.Warn("Head state missing, repairing", "number", head.Number, "hash", head.Hash(), "snaproot", diskRoot)
-
- snapDisk, diskRootFound, err := bc.setHeadBeyondRoot(head.Number.Uint64(), 0, diskRoot, true, bc.cacheConfig.SnapshotRestoreMaxGas)
- if err != nil {
- return nil, err
+ if head.Number.Uint64() <= bc.genesisBlock.NumberU64() {
+ // The genesis state is missing, which is only possible in the path-based
+ // scheme. This situation occurs when the state syncer overwrites it.
+ //
+ // The solution is to reset the state to the genesis state. Although it may not
+ // match the sync target, the state healer will later address and correct any
+ // inconsistencies.
+ bc.resetState()
+ } else {
+ // Head state is missing, before the state recovery, find out the
+ // disk layer point of snapshot(if it's enabled). Make sure the
+ // rewound point is lower than disk layer.
+ var diskRoot common.Hash
+ if bc.cacheConfig.SnapshotLimit > 0 {
+ diskRoot = rawdb.ReadSnapshotRoot(bc.db)
  }
- // Chain rewound, persist old snapshot number to indicate recovery procedure
- if diskRootFound {
- rawdb.WriteSnapshotRecoveryNumber(bc.db, snapDisk)
+ if diskRoot != (common.Hash{}) {
+ log.Warn("Head state missing, repairing", "number", head.Number, "hash", head.Hash(), "snaproot", diskRoot)
+
+ snapDisk, diskRootFound, err := bc.setHeadBeyondRoot(head.Number.Uint64(), 0, diskRoot, true, bc.cacheConfig.SnapshotRestoreMaxGas)
+ if err != nil {
+ return nil, err
+ }
+ // Chain rewound, persist old snapshot number to indicate recovery procedure
+ if diskRootFound {
+ rawdb.WriteSnapshotRecoveryNumber(bc.db, snapDisk)
+ } else {
+ log.Warn("Snapshot root not found or too far back. Recreating snapshot from scratch.")
+ rawdb.DeleteSnapshotRecoveryNumber(bc.db)
+ }
  } else {
- log.Warn("Snapshot root not found or too far back. Recreating snapshot from scratch.")
- rawdb.DeleteSnapshotRecoveryNumber(bc.db)
- }
- } else {
- log.Warn("Head state missing, repairing", "number", head.Number, "hash", head.Hash())
- if _, _, err := bc.setHeadBeyondRoot(head.Number.Uint64(), 0, common.Hash{}, true, 0); err != nil {
- return nil, err
+ log.Warn("Head state missing, repairing", "number", head.Number, "hash", head.Hash())
+ if _, _, err := bc.setHeadBeyondRoot(head.Number.Uint64(), 0, common.Hash{}, true, 0); err != nil {
+ return nil, err
+ }
  }
  }
  }
@@ -662,6 +672,28 @@ func (bc *BlockChain) SetSafe(header *types.Header) {
  }
 }
 
+// resetState resets the persistent state to genesis state if it's not present.
+func (bc *BlockChain) resetState() {
+ // Short circuit if the genesis state is already present.
+ root := bc.genesisBlock.Root()
+ if bc.HasState(root) {
+ return
+ }
+ // Reset the state database to empty for committing genesis state.
+ // Note, it should only happen in path-based scheme and Reset function
+ // is also only call-able in this mode.
+ if bc.triedb.Scheme() == rawdb.PathScheme {
+ if err := bc.triedb.Reset(types.EmptyRootHash); err != nil {
+ log.Crit("Failed to clean state", "err", err) // Shouldn't happen
+ }
+ }
+ // Write genesis state into database.
+ if err := CommitGenesisState(bc.db, bc.triedb, bc.genesisBlock.Hash()); err != nil {
+ log.Crit("Failed to commit genesis state", "err", err)
+ }
+ log.Info("Reset state to genesis", "root", root)
+}
+
 // setHeadBeyondRoot rewinds the local chain to a new head with the extra condition
 // that the rewind must pass the specified state root. The extra condition is
 // ignored if it causes rolling back more than rewindLimit Gas (0 meaning infinte).
@@ -691,25 +723,6 @@ func (bc *BlockChain) setHeadBeyondRoot(head uint64, time uint64, root common.Ha
  pivot := rawdb.ReadLastPivotNumber(bc.db)
  frozen, _ := bc.db.Ancients()
 
- // resetState resets the persistent state to genesis if it's not available.
- resetState := func() {
- // Short circuit if the genesis state is already present.
- if bc.HasState(bc.genesisBlock.Root()) {
- return
- }
- // Reset the state database to empty for committing genesis state.
- // Note, it should only happen in path-based scheme and Reset function
- // is also only call-able in this mode.
- if bc.triedb.Scheme() == rawdb.PathScheme {
- if err := bc.triedb.Reset(types.EmptyRootHash); err != nil {
- log.Crit("Failed to clean state", "err", err) // Shouldn't happen
- }
- }
- // Write genesis state into database.
- if err := CommitGenesisState(bc.db, bc.triedb, bc.genesisBlock.Hash()); err != nil {
- log.Crit("Failed to commit genesis state", "err", err)
- }
- }
  updateFn := func(db ethdb.KeyValueWriter, header *types.Header) (*types.Header, bool) {
  // Rewind the blockchain, ensuring we don't end up with a stateless head
  // block. Note, depth equality is permitted to allow using SetHead as a
@@ -719,7 +732,7 @@ func (bc *BlockChain) setHeadBeyondRoot(head uint64, time uint64, root common.Ha
  if newHeadBlock == nil {
  log.Error("Gap in the chain, rewinding to genesis", "number", header.Number, "hash", header.Hash())
  newHeadBlock = bc.genesisBlock
- resetState()
+ bc.resetState()
  } else {
  // Block exists, keep rewinding until we find one with state,
  // keeping rewinding until we exceed the optional threshold
@@ -772,7 +785,7 @@ func (bc *BlockChain) setHeadBeyondRoot(head uint64, time uint64, root common.Ha
  }
  if rootFound || newHeadBlock.NumberU64() <= bc.genesisBlock.NumberU64() {
  if newHeadBlock.NumberU64() <= bc.genesisBlock.NumberU64() {
- resetState()
+ bc.resetState()
  } else if !bc.HasState(newHeadBlock.Root()) {
  // Rewind to a block with recoverable state. If the state is
  // missing, run the state recovery here.

eth/downloader/downloader.go

@@ -398,7 +398,14 @@ func (d *Downloader) synchronise(id string, hash common.Hash, td, ttd *big.Int,
  log.Info("Block synchronisation started")
  }
  if mode == SnapSync {
- // Snap sync uses the snapshot namespace to store potentially flakey data until
+ // Snap sync will directly modify the persistent state, making the entire
+ // trie database unusable until the state is fully synced. To prevent any
+ // subsequent state reads, explicitly disable the trie database and state
+ // syncer is responsible to address and correct any state missing.
+ if d.blockchain.TrieDB().Scheme() == rawdb.PathScheme {
+ d.blockchain.TrieDB().Reset(types.EmptyRootHash)
+ }
+ // Snap sync uses the snapshot namespace to store potentially flaky data until
  // sync completely heals and finishes. Pause snapshot maintenance in the mean-
  // time to prevent access.
  if snapshots := d.blockchain.Snapshots(); snapshots != nil { // Only nil in tests

internal/ethapi/api.go

@@ -1706,8 +1706,8 @@ func newRPCTransaction(tx *types.Transaction, blockHash common.Hash, blockNumber
 func effectiveGasPrice(tx *types.Transaction, baseFee *big.Int) *big.Int {
  fee := tx.GasTipCap()
  fee = fee.Add(fee, baseFee)
- if tx.GasTipCapIntCmp(fee) < 0 {
- return tx.GasTipCap()
+ if tx.GasFeeCapIntCmp(fee) < 0 {
+ return tx.GasFeeCap()
  }
  return fee
 }

internal/flags/helpers.go

@@ -225,7 +225,7 @@ func wordWrap(s string, width int) string {
  return output.String()
 }
 
-// AutoEnvVars extens all the specific CLI flags with automatically generated
+// AutoEnvVars extends all the specific CLI flags with automatically generated
 // env vars by capitalizing the flag, replacing . with _ and prefixing it with
 // the specified string.
 //

params/config.go

@@ -364,7 +364,7 @@ func (c *CliqueConfig) String() string {
 func (c *ChainConfig) Description() string {
  var banner string
 
- // Create some basinc network config output
+ // Create some basic network config output
  network := NetworkNames[c.ChainID.String()]
  if network == "" {
  network = "unknown"