all: change chain head markers from block to header (ethereum#26777)

accounts/abi/bind/backends/simulated.go

@@ -95,7 +95,10 @@ func NewSimulatedBackendWithDatabase(database ethdb.Database, alloc core.Genesis
  backend.filterSystem = filters.NewFilterSystem(filterBackend, filters.Config{})
  backend.events = filters.NewEventSystem(backend.filterSystem, false)
 
- backend.rollback(blockchain.CurrentBlock())
+ header := backend.blockchain.CurrentBlock()
+ block := backend.blockchain.GetBlock(header.Hash(), header.Number.Uint64())
+
+ backend.rollback(block)
  return backend
 }
 
@@ -135,7 +138,10 @@ func (b *SimulatedBackend) Rollback() {
  b.mu.Lock()
  defer b.mu.Unlock()
 
- b.rollback(b.blockchain.CurrentBlock())
+ header := b.blockchain.CurrentBlock()
+ block := b.blockchain.GetBlock(header.Hash(), header.Number.Uint64())
+
+ b.rollback(block)
 }
 
 func (b *SimulatedBackend) rollback(parent *types.Block) {
@@ -174,7 +180,7 @@ func (b *SimulatedBackend) Fork(ctx context.Context, parent common.Hash) error {
 
 // stateByBlockNumber retrieves a state by a given blocknumber.
 func (b *SimulatedBackend) stateByBlockNumber(ctx context.Context, blockNumber *big.Int) (*state.StateDB, error) {
- if blockNumber == nil || blockNumber.Cmp(b.blockchain.CurrentBlock().Number()) == 0 {
+ if blockNumber == nil || blockNumber.Cmp(b.blockchain.CurrentBlock().Number) == 0 {
  return b.blockchain.State()
  }
  block, err := b.blockByNumber(ctx, blockNumber)
@@ -303,7 +309,7 @@ func (b *SimulatedBackend) BlockByNumber(ctx context.Context, number *big.Int) (
 // (associated with its hash) if found without Lock.
 func (b *SimulatedBackend) blockByNumber(ctx context.Context, number *big.Int) (*types.Block, error) {
  if number == nil || number.Cmp(b.pendingBlock.Number()) == 0 {
- return b.blockchain.CurrentBlock(), nil
+ return b.blockByHash(ctx, b.blockchain.CurrentBlock().Hash())
  }
 
  block := b.blockchain.GetBlockByNumber(uint64(number.Int64()))
@@ -431,7 +437,7 @@ func (b *SimulatedBackend) CallContract(ctx context.Context, call ethereum.CallM
  b.mu.Lock()
  defer b.mu.Unlock()
 
- if blockNumber != nil && blockNumber.Cmp(b.blockchain.CurrentBlock().Number()) != 0 {
+ if blockNumber != nil && blockNumber.Cmp(b.blockchain.CurrentBlock().Number) != 0 {
  return nil, errBlockNumberUnsupported
  }
  stateDB, err := b.blockchain.State()
@@ -455,7 +461,7 @@ func (b *SimulatedBackend) PendingCallContract(ctx context.Context, call ethereu
  defer b.mu.Unlock()
  defer b.pendingState.RevertToSnapshot(b.pendingState.Snapshot())
 
- res, err := b.callContract(ctx, call, b.pendingBlock, b.pendingState)
+ res, err := b.callContract(ctx, call, b.pendingBlock.Header(), b.pendingState)
  if err != nil {
  return nil, err
  }
@@ -549,7 +555,7 @@ func (b *SimulatedBackend) EstimateGas(ctx context.Context, call ethereum.CallMs
  call.Gas = gas
 
  snapshot := b.pendingState.Snapshot()
- res, err := b.callContract(ctx, call, b.pendingBlock, b.pendingState)
+ res, err := b.callContract(ctx, call, b.pendingBlock.Header(), b.pendingState)
  b.pendingState.RevertToSnapshot(snapshot)
 
  if err != nil {
@@ -599,7 +605,7 @@ func (b *SimulatedBackend) EstimateGas(ctx context.Context, call ethereum.CallMs
 
 // callContract implements common code between normal and pending contract calls.
 // state is modified during execution, make sure to copy it if necessary.
-func (b *SimulatedBackend) callContract(ctx context.Context, call ethereum.CallMsg, block *types.Block, stateDB *state.StateDB) (*core.ExecutionResult, error) {
+func (b *SimulatedBackend) callContract(ctx context.Context, call ethereum.CallMsg, header *types.Header, stateDB *state.StateDB) (*core.ExecutionResult, error) {
  // Gas prices post 1559 need to be initialized
  if call.GasPrice != nil && (call.GasFeeCap != nil || call.GasTipCap != nil) {
  return nil, errors.New("both gasPrice and (maxFeePerGas or maxPriorityFeePerGas) specified")
@@ -645,7 +651,7 @@ func (b *SimulatedBackend) callContract(ctx context.Context, call ethereum.CallM
  msg := callMsg{call}
 
  txContext := core.NewEVMTxContext(msg)
- evmContext := core.NewEVMBlockContext(block.Header(), b.blockchain, nil)
+ evmContext := core.NewEVMBlockContext(header, b.blockchain, nil)
  // Create a new environment which holds all relevant information
  // about the transaction and calling mechanisms.
  vmEnv := vm.NewEVM(evmContext, txContext, stateDB, b.config, vm.Config{NoBaseFee: true})
@@ -854,15 +860,9 @@ func (fb *filterBackend) HeaderByNumber(ctx context.Context, number rpc.BlockNum
  case rpc.LatestBlockNumber:
  return fb.bc.CurrentHeader(), nil
  case rpc.FinalizedBlockNumber:
- if block := fb.bc.CurrentFinalizedBlock(); block != nil {
- return block.Header(), nil
- }
- return nil, errors.New("finalized block not found")
+ return fb.bc.CurrentFinalBlock(), nil
  case rpc.SafeBlockNumber:
- if block := fb.bc.CurrentSafeBlock(); block != nil {
- return block.Header(), nil
- }
- return nil, errors.New("safe block not found")
+ return fb.bc.CurrentSafeBlock(), nil
  default:
  return fb.bc.GetHeaderByNumber(uint64(number.Int64())), nil
  }

accounts/abi/bind/backends/simulated_test.go

@@ -1189,7 +1189,7 @@ func TestFork(t *testing.T) {
  sim.Commit()
  }
  // 3.
- if sim.blockchain.CurrentBlock().NumberU64() != uint64(n) {
+ if sim.blockchain.CurrentBlock().Number.Uint64() != uint64(n) {
  t.Error("wrong chain length")
  }
  // 4.
@@ -1199,7 +1199,7 @@ func TestFork(t *testing.T) {
  sim.Commit()
  }
  // 6.
- if sim.blockchain.CurrentBlock().NumberU64() != uint64(n+1) {
+ if sim.blockchain.CurrentBlock().Number.Uint64() != uint64(n+1) {
  t.Error("wrong chain length")
  }
 }
@@ -1344,7 +1344,7 @@ func TestCommitReturnValue(t *testing.T) {
  sim := simTestBackend(testAddr)
  defer sim.Close()
 
- startBlockHeight := sim.blockchain.CurrentBlock().NumberU64()
+ startBlockHeight := sim.blockchain.CurrentBlock().Number.Uint64()
 
  // Test if Commit returns the correct block hash
  h1 := sim.Commit()

cmd/geth/chaincmd.go

@@ -349,8 +349,8 @@ func exportChain(ctx *cli.Context) error {
  if first < 0 || last < 0 {
  utils.Fatalf("Export error: block number must be greater than 0\n")
  }
- if head := chain.CurrentFastBlock(); uint64(last) > head.NumberU64() {
- utils.Fatalf("Export error: block number %d larger than head block %d\n", uint64(last), head.NumberU64())
+ if head := chain.CurrentSnapBlock(); uint64(last) > head.Number.Uint64() {
+ utils.Fatalf("Export error: block number %d larger than head block %d\n", uint64(last), head.Number.Uint64())
  }
  err = utils.ExportAppendChain(chain, fp, uint64(first), uint64(last))
  }

cmd/utils/cmd.go

@@ -222,7 +222,7 @@ func missingBlocks(chain *core.BlockChain, blocks []*types.Block) []*types.Block
  head := chain.CurrentBlock()
  for i, block := range blocks {
  // If we're behind the chain head, only check block, state is available at head
- if head.NumberU64() > block.NumberU64() {
+ if head.Number.Uint64() > block.NumberU64() {
  if !chain.HasBlock(block.Hash(), block.NumberU64()) {
  return blocks[i:]
  }

consensus/clique/clique_test.go

@@ -93,7 +93,7 @@ func TestReimportMirroredState(t *testing.T) {
  if _, err := chain.InsertChain(blocks[:2]); err != nil {
  t.Fatalf("failed to insert initial blocks: %v", err)
  }
- if head := chain.CurrentBlock().NumberU64(); head != 2 {
+ if head := chain.CurrentBlock().Number.Uint64(); head != 2 {
  t.Fatalf("chain head mismatch: have %d, want %d", head, 2)
  }
 
@@ -106,7 +106,7 @@ func TestReimportMirroredState(t *testing.T) {
  if _, err := chain.InsertChain(blocks[2:]); err != nil {
  t.Fatalf("failed to insert final block: %v", err)
  }
- if head := chain.CurrentBlock().NumberU64(); head != 3 {
+ if head := chain.CurrentBlock().Number.Uint64(); head != 3 {
  t.Fatalf("chain head mismatch: have %d, want %d", head, 3)
  }
 }