eth: core: remove notion of terminal pow block

core/blockchain.go

@@ -473,9 +473,6 @@ func (bc *BlockChain) loadLastState() error {
 	if pivot := rawdb.ReadLastPivotNumber(bc.db); pivot != nil {
 		log.Info("Loaded last fast-sync pivot marker", "number", *pivot)
 	}
-	if terminalHeader := bc.CurrentTerminalHeader(); terminalHeader != nil {
-		log.Info("Loaded terminal block", "number", terminalHeader.Number, "hash", terminalHeader.Hash())
-	}
 	return nil
 }
 

core/blockchain_reader.go

@@ -49,22 +49,6 @@ func (bc *BlockChain) CurrentFastBlock() *types.Block {
 	return bc.currentFastBlock.Load().(*types.Block)
 }
 
-// CurrentTerminalHeader retrieves the current terminal header of the canonical
-// chain. The block is retrieved from the blockchain's internal cache.
-func (bc *BlockChain) CurrentTerminalHeader() *types.Header {
-	if head := rawdb.ReadTerminalBlockHash(bc.db); head != (common.Hash{}) {
-		if header := bc.GetHeaderByHash(head); header != nil {
-			return header
-		}
-	}
-	return nil
-}
-
-// SetTerminalBlock sets the current terminal block.
-func (bc *BlockChain) SetTerminalBlock(header *types.Header) {
-	rawdb.WriteTerminalBlockHash(bc.db, header.Hash())
-}
-
 // HasHeader checks if a block header is present in the database or not, caching
 // it if present.
 func (bc *BlockChain) HasHeader(hash common.Hash, number uint64) bool {

core/headerchain.go

@@ -231,11 +231,7 @@ func (hc *HeaderChain) WriteHeaders(headers []*types.Header) (int, error) {
 			hash = header.Hash()
 		}
 		number := header.Number.Uint64()
-		old := new(big.Int).Set(newTD)
 		newTD.Add(newTD, header.Difficulty)
-		if hc.config.TerminalTotalDifficulty != nil && old.Cmp(hc.config.TerminalTotalDifficulty) < 0 && newTD.Cmp(hc.config.TerminalTotalDifficulty) >= 0 {
-			rawdb.WriteTerminalBlockHash(hc.chainDb, header.Hash())
-		}
 
 		// If the parent was not present, store it
 		// If the header is already known, skip it, otherwise store

core/rawdb/accessors_chain.go

@@ -216,22 +216,6 @@ func WriteHeadFastBlockHash(db ethdb.KeyValueWriter, hash common.Hash) {
 	}
 }
 
-// ReadTerminalBlockHash retrieves the hash of the current terminal block.
-func ReadTerminalBlockHash(db ethdb.KeyValueReader) common.Hash {
-	data, _ := db.Get(headTerminalBlockKey)
-	if len(data) == 0 {
-		return common.Hash{}
-	}
-	return common.BytesToHash(data)
-}
-
-// WriteTerminalBlockHash stores the hash of the current fast-sync head block.
-func WriteTerminalBlockHash(db ethdb.KeyValueWriter, hash common.Hash) {
-	if err := db.Put(headTerminalBlockKey, hash.Bytes()); err != nil {
-		log.Crit("Failed to store last terminal block hash", "err", err)
-	}
-}
-
 // ReadLastPivotNumber retrieves the number of the last pivot block. If the node
 // full synced, the last pivot will always be nil.
 func ReadLastPivotNumber(db ethdb.KeyValueReader) *uint64 {

core/rawdb/database.go

@@ -408,7 +408,7 @@ func InspectDatabase(db ethdb.Database, keyPrefix, keyStart []byte) error {
 				databaseVersionKey, headHeaderKey, headBlockKey, headFastBlockKey, lastPivotKey,
 				fastTrieProgressKey, snapshotDisabledKey, SnapshotRootKey, snapshotJournalKey,
 				snapshotGeneratorKey, snapshotRecoveryKey, txIndexTailKey, fastTxLookupLimitKey,
-				uncleanShutdownKey, badBlockKey, transitionStatusKey, skeletonSyncStatusKey, headTerminalBlockKey,
+				uncleanShutdownKey, badBlockKey, transitionStatusKey, skeletonSyncStatusKey,
 			} {
 				if bytes.Equal(key, meta) {
 					metadata.Add(size)

core/rawdb/schema.go

@@ -39,9 +39,6 @@ var (
 	// headFastBlockKey tracks the latest known incomplete block's hash during fast sync.
 	headFastBlockKey = []byte("LastFast")
 
-	// headTerminalBlockKey tracks the latest known terminal hash.
-	headTerminalBlockKey = []byte("LastTerminal")
-
 	// lastPivotKey tracks the last pivot block used by fast sync (to reenable on sethead).
 	lastPivotKey = []byte("LastPivot")
 

eth/catalyst/api.go

@@ -215,20 +215,6 @@ func (api *ConsensusAPI) ExchangeTransitionConfigurationV1(config beacon.Transit
 		log.Warn("Invalid TTD configured", "geth", config.TerminalTotalDifficulty, "consensus client", ttd)
 		return nil, fmt.Errorf("invalid ttd: EL %v CL %v", config.TerminalTotalDifficulty, ttd)
 	}
-	terminalHeader := api.eth.BlockChain().CurrentTerminalHeader()
-	if terminalHeader != nil {
-		if config.TerminalBlockNumber != 0 && uint64(config.TerminalBlockNumber) != terminalHeader.Number.Uint64() {
-			return nil, fmt.Errorf("invalid terminal block number, got %v want %v", config.TerminalBlockNumber, terminalHeader.Number)
-		}
-
-		if config.TerminalBlockHash != (common.Hash{}) && config.TerminalBlockHash != terminalHeader.Hash() {
-			return nil, fmt.Errorf("invalid terminal block hash, got %v want %v", config.TerminalBlockHash, terminalHeader.Hash())
-		}
-		// TODO (MariusVanDerWijden): Here we used to return the correct terminal hash + number
-		// but according to the spec we should return the hash + number set by the user.
-		// Since we have no way of setting hash + number yet, just return TTD.
-		return &beacon.TransitionConfigurationV1{TerminalTotalDifficulty: (*hexutil.Big)(ttd)}, nil
-	}
 
 	if config.TerminalBlockHash != (common.Hash{}) {
 		return nil, fmt.Errorf("invalid terminal block hash, no terminal header set")

eth/catalyst/api_test.go

@@ -486,7 +486,6 @@ func TestExchangeTransitionConfig(t *testing.T) {
 	var (
 		api = NewConsensusAPI(ethservice)
 	)
-	ethservice.BlockChain().SetTerminalBlock(preMergeBlocks[len(preMergeBlocks)-1].Header())
 	// invalid ttd
 	config := beacon.TransitionConfigurationV1{
 		TerminalTotalDifficulty: (*hexutil.Big)(big.NewInt(0)),
@@ -496,15 +495,6 @@ func TestExchangeTransitionConfig(t *testing.T) {
 	if _, err := api.ExchangeTransitionConfigurationV1(config); err == nil {
 		t.Fatal("expected error on invalid config, invalid ttd")
 	}
-	// invalid terminal block bumber
-	config = beacon.TransitionConfigurationV1{
-		TerminalTotalDifficulty: (*hexutil.Big)(genesis.Config.TerminalTotalDifficulty),
-		TerminalBlockHash:       common.Hash{},
-		TerminalBlockNumber:     1,
-	}
-	if _, err := api.ExchangeTransitionConfigurationV1(config); err == nil {
-		t.Fatal("expected error on invalid config, invalid blocknumber")
-	}
 	// invalid terminal block hash
 	config = beacon.TransitionConfigurationV1{
 		TerminalTotalDifficulty: (*hexutil.Big)(genesis.Config.TerminalTotalDifficulty),
@@ -523,13 +513,4 @@ func TestExchangeTransitionConfig(t *testing.T) {
 	if _, err := api.ExchangeTransitionConfigurationV1(config); err != nil {
 		t.Fatalf("expected no error on valid config, got %v", err)
 	}
-	// valid config
-	config = beacon.TransitionConfigurationV1{
-		TerminalTotalDifficulty: (*hexutil.Big)(genesis.Config.TerminalTotalDifficulty),
-		TerminalBlockHash:       preMergeBlocks[len(preMergeBlocks)-1].Hash(),
-		TerminalBlockNumber:     hexutil.Uint64(preMergeBlocks[len(preMergeBlocks)-1].NumberU64()),
-	}
-	if _, err := api.ExchangeTransitionConfigurationV1(config); err != nil {
-		t.Fatalf("expected no error on valid config, got %v", err)
-	}
 }