all: core rework for the merge transition (ethereum#23761)

* all: work for eth1/2 transtition

* consensus/beacon, eth: change beacon difficulty to 0

* eth: updates

* all: add terminalBlockDifficulty config, fix rebasing issues

* eth: implemented merge interop spec

* internal/ethapi: update to v1.0.0.alpha.2

                                                                 This commit updates the code to the new spec, moving payloadId into
                                                                 it's own object. It also fixes an issue with finalizing an empty blockhash.
                                                                 It also properly sets the basefee

* all: sync polishes, other fixes + refactors

* core, eth: correct semantics for LeavePoW, EnterPoS

* core: fixed rebasing artifacts

* core: light: performance improvements

* core: use keyed field (f)

* core: eth: fix compilation issues + tests

* eth/catalyst: dbetter error codes

* all: move Merger to consensus/, remove reliance on it in bc

* all: renamed EnterPoS and LeavePoW to ReachTDD and FinalizePoS

* core: make mergelogs a function

* core: use InsertChain instead of InsertBlock

* les: drop merger from lightchain object

* consensus: add merger

* core: recoverAncestors in catalyst mode

* core: fix nitpick

* all: removed merger from beacon, use TTD, nitpicks

* consensus: eth: add docstring, removed unnecessary code duplication

* consensus/beacon: better comment

* all: easy to fix nitpicks by karalabe

* consensus/beacon: verify known headers to be sure

* core: comments

* core: eth: don't drop peers who advertise blocks, nitpicks

* core: never add beacon blocks to the future queue

* core: fixed nitpicks

* consensus/beacon: simplify IsTTDReached check

* consensus/beacon: correct IsTTDReached check

Co-authored-by: rjl493456442 <[email protected]>
Co-authored-by: Péter Szilágyi <[email protected]>

cmd/geth/config.go

@@ -32,7 +32,6 @@ import (
  "github.com/ethereum/go-ethereum/accounts/scwallet"
  "github.com/ethereum/go-ethereum/accounts/usbwallet"
  "github.com/ethereum/go-ethereum/cmd/utils"
- "github.com/ethereum/go-ethereum/eth/catalyst"
  "github.com/ethereum/go-ethereum/eth/ethconfig"
  "github.com/ethereum/go-ethereum/internal/ethapi"
  "github.com/ethereum/go-ethereum/log"
@@ -159,17 +158,10 @@ func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) {
  if ctx.GlobalIsSet(utils.OverrideArrowGlacierFlag.Name) {
  cfg.Eth.OverrideArrowGlacier = new(big.Int).SetUint64(ctx.GlobalUint64(utils.OverrideArrowGlacierFlag.Name))
  }
- backend, eth := utils.RegisterEthService(stack, &cfg.Eth)
-
- // Configure catalyst.
- if ctx.GlobalBool(utils.CatalystFlag.Name) {
- if eth == nil {
- utils.Fatalf("Catalyst does not work in light client mode.")
- }
- if err := catalyst.Register(stack, eth); err != nil {
- utils.Fatalf("%v", err)
- }
+ if ctx.GlobalIsSet(utils.OverrideTerminalTotalDifficulty.Name) {
+ cfg.Eth.Genesis.Config.TerminalTotalDifficulty = new(big.Int).SetUint64(ctx.GlobalUint64(utils.OverrideTerminalTotalDifficulty.Name))
  }
+ backend, _ := utils.RegisterEthService(stack, &cfg.Eth, ctx.GlobalBool(utils.CatalystFlag.Name))
 
  // Configure GraphQL if requested
  if ctx.GlobalIsSet(utils.GraphQLEnabledFlag.Name) {

cmd/geth/main.go

@@ -72,6 +72,7 @@ var (
  utils.USBFlag,
  utils.SmartCardDaemonPathFlag,
  utils.OverrideArrowGlacierFlag,
+ utils.OverrideTerminalTotalDifficulty,
  utils.EthashCacheDirFlag,
  utils.EthashCachesInMemoryFlag,
  utils.EthashCachesOnDiskFlag,

cmd/utils/flags.go

@@ -45,6 +45,7 @@ import (
  "github.com/ethereum/go-ethereum/core/vm"
  "github.com/ethereum/go-ethereum/crypto"
  "github.com/ethereum/go-ethereum/eth"
+ "github.com/ethereum/go-ethereum/eth/catalyst"
  "github.com/ethereum/go-ethereum/eth/downloader"
  "github.com/ethereum/go-ethereum/eth/ethconfig"
  "github.com/ethereum/go-ethereum/eth/gasprice"
@@ -248,6 +249,10 @@ var (
  Name: "override.arrowglacier",
  Usage: "Manually specify Arrow Glacier fork-block, overriding the bundled setting",
  }
+ OverrideTerminalTotalDifficulty = cli.Uint64Flag{
+ Name: "override.terminaltotaldifficulty",
+ Usage: "Manually specify TerminalTotalDifficulty, overriding the bundled setting",
+ }
  // Light server and client settings
  LightServeFlag = cli.IntFlag{
  Name: "light.serve",
@@ -1196,7 +1201,7 @@ func SetP2PConfig(ctx *cli.Context, cfg *p2p.Config) {
  cfg.NetRestrict = list
  }
 
- if ctx.GlobalBool(DeveloperFlag.Name) || ctx.GlobalBool(CatalystFlag.Name) {
+ if ctx.GlobalBool(DeveloperFlag.Name) {
  // --dev mode can't use p2p networking.
  cfg.MaxPeers = 0
  cfg.ListenAddr = ""
@@ -1705,13 +1710,18 @@ func SetDNSDiscoveryDefaults(cfg *ethconfig.Config, genesis common.Hash) {
 // RegisterEthService adds an Ethereum client to the stack.
 // The second return value is the full node instance, which may be nil if the
 // node is running as a light client.
-func RegisterEthService(stack *node.Node, cfg *ethconfig.Config) (ethapi.Backend, *eth.Ethereum) {
+func RegisterEthService(stack *node.Node, cfg *ethconfig.Config, isCatalyst bool) (ethapi.Backend, *eth.Ethereum) {
  if cfg.SyncMode == downloader.LightSync {
  backend, err := les.New(stack, cfg)
  if err != nil {
  Fatalf("Failed to register the Ethereum service: %v", err)
  }
  stack.RegisterAPIs(tracers.APIs(backend.ApiBackend))
+ if isCatalyst {
+ if err := catalyst.RegisterLight(stack, backend); err != nil {
+ Fatalf("Failed to register the catalyst service: %v", err)
+ }
+ }
  return backend.ApiBackend, nil
  }
  backend, err := eth.New(stack, cfg)
@@ -1724,6 +1734,11 @@ func RegisterEthService(stack *node.Node, cfg *ethconfig.Config) (ethapi.Backend
  Fatalf("Failed to create the LES server: %v", err)
  }
  }
+ if isCatalyst {
+ if err := catalyst.Register(stack, backend); err != nil {
+ Fatalf("Failed to register the catalyst service: %v", err)
+ }
+ }
  stack.RegisterAPIs(tracers.APIs(backend.APIBackend))
  return backend.APIBackend, backend
 }