Fix some failing hive tests in the devp2p/snap sync test suite (#3847)

* Add missing forks and set fork block correctly for merge config

* Remove TTD check in common

* common: fix mergeForkBlock

* Move around everything

* Add mergeNetSplitBlock if not provided

* fix common logic

* fix spelling

* address feedback and remove cli opt for setting post merge forkID block

* Add paris hardfork if not present

* Address feedback

* Fix logic for setting merge forks when not present

* spell check

---------

Co-authored-by: Jochem Brouwer <[email protected]>
Co-authored-by: acolytec3 <[email protected]>

Author: 3 people

packages/block/test/testdata/goerliCommon.ts

@@ -74,17 +74,12 @@ export const Goerli: ChainConfig = {
       forkHash: '0xb8c6299d',
     },
     {
-      // The forkHash will remain same as mergeForkIdTransition is post merge,
+      // The forkHash will remain same as MergeNetsplitBlock is post merge,
       // terminal block: https://goerli.etherscan.io/block/7382818
       name: 'paris',
       block: 7382819,
       forkHash: '0xb8c6299d',
     },
-    {
-      name: 'mergeForkIdTransition',
-      block: null,
-      forkHash: null,
-    },
     {
       name: 'shanghai',
       block: null,

packages/blockchain/test/testdata/goerliCommon.ts

@@ -74,14 +74,14 @@ export const Goerli: ChainConfig = {
       forkHash: '0xb8c6299d',
     },
     {
-      // The forkHash will remain same as mergeForkIdTransition is post merge,
+      // The forkHash will remain same as mergeNetsplitBlock is post merge,
       // terminal block: https://goerli.etherscan.io/block/7382818
       name: 'paris',
       block: 7382819,
       forkHash: '0xb8c6299d',
     },
     {
-      name: 'mergeForkIdTransition',
+      name: 'mergeNetsplitBlock',
       block: null,
       forkHash: null,
     },

packages/client/bin/utils.ts

@@ -123,12 +123,6 @@ export function getArgs(): ClientOpts {
         describe: 'A custom trusted setup txt file for initializing the kzg library',
         coerce: (arg: string) => (arg ? path.resolve(arg) : undefined),
       })
-      .option('mergeForkIdPostMerge', {
-        describe:
-          'Place mergeForkIdTransition hardfork before (false) or after (true) Merge hardfork in the custom gethGenesis',
-        boolean: true,
-        default: true,
-      })
       .option('bootnodes', {
         describe:
           'Comma-separated list of network bootnodes (format: "enode://<id>@<host:port>,enode://..." ("[?discport=<port>]" not supported) or path to a bootnode.txt file',
@@ -736,7 +730,6 @@ export async function generateClientConfig(args: ClientOpts) {
     const chainName = path.parse(args.gethGenesis).base.split('.')[0]
     common = createCommonFromGethGenesis(genesisFile, {
       chain: chainName,
-      mergeForkIdPostMerge: args.mergeForkIdPostMerge,
     })
     ;(common.customCrypto as any) = cryptoFunctions
     customGenesisState = parseGethGenesisState(genesisFile)

packages/client/src/rpc/modules/engine/CLConnectionManager.ts

@@ -115,11 +115,11 @@ export class CLConnectionManager {
       maximumFractionDigits: 1,
     })
 
-    if (this.config.chainCommon.gteHardfork(Hardfork.MergeForkIdTransition)) {
+    if (this.config.chainCommon.gteHardfork(Hardfork.MergeNetsplitBlock)) {
       this.start()
     } else {
       this.config.events.on(Event.CHAIN_UPDATED, () => {
-        if (this.config.chainCommon.gteHardfork(Hardfork.MergeForkIdTransition)) {
+        if (this.config.chainCommon.gteHardfork(Hardfork.MergeNetsplitBlock)) {
           this.start()
         }
       })
@@ -311,24 +311,6 @@ export class CLConnectionManager {
       this.disconnectedCheckIndex++
     }
 
-    if (
-      this.config.chainCommon.hardfork() === Hardfork.MergeForkIdTransition &&
-      !this.config.chainCommon.gteHardfork(Hardfork.Paris)
-    ) {
-      if (this.connectionStatus === ConnectionStatus.Disconnected) {
-        logCLStatus(
-          this.config.logger,
-          'CL client connection is needed, Merge HF happening soon',
-          logLevel.WARN,
-        )
-        logCLStatus(
-          this.config.logger,
-          '(no CL <-> EL communication yet, connection might be in a workable state though)',
-          logLevel.WARN,
-        )
-      }
-    }
-
     if (
       !this.oneTimeMergeCLConnectionCheck &&
       this.config.chainCommon.hardfork() === Hardfork.Paris

packages/client/src/types.ts

@@ -78,7 +78,6 @@ export interface ClientOpts {
   customGenesisState?: string
   gethGenesis?: string
   trustedSetup?: string
-  mergeForkIdPostMerge?: boolean
   bootnodes?: string | string[]
   port?: number
   extIP?: string

packages/client/test/cli/cli.spec.ts

@@ -624,7 +624,6 @@ describe('[CLI]', () => {
       '--dev=poa',
       '--isSingleNode=true',
       '--sync="none"',
-      '--mergeForkIdPostMerge=false',
     ]
     const onData = async (
       message: string,

packages/client/test/sim/configs/4844-devnet.ts

@@ -14,6 +14,7 @@ export const devnet4844Config = {
     muirGlacierBlock: 0,
     berlinBlock: 0,
     londonBlock: 0,
+    mergeForkBlock: 0,
     shanghaiTime: 0,
     cancunTime: 0,
     clique: {

packages/client/test/testdata/common/goerliCommon.ts

@@ -74,14 +74,14 @@ export const Goerli: ChainConfig = {
       forkHash: '0xb8c6299d',
     },
     {
-      // The forkHash will remain same as mergeForkIdTransition is post merge,
+      // The forkHash will remain same as mergeNetsplitBlock is post merge,
       // terminal block: https://goerli.etherscan.io/block/7382818
       name: 'paris',
       block: 7382819,
       forkHash: '0xb8c6299d',
     },
     {
-      name: 'mergeForkIdTransition',
+      name: 'mergeNetsplitBlock',
       block: null,
       forkHash: null,
     },

packages/client/test/testdata/common/mergeTestnet.ts

@@ -55,7 +55,7 @@ export const mergeTestnetData: ChainConfig = {
       block: 3,
     },
     {
-      name: 'mergeForkIdTransition',
+      name: 'mergeNetsplitBlock',
       block: 3,
     },
   ],

packages/client/test/testdata/geth-genesis/eip4844.ts

@@ -12,6 +12,7 @@ export const eip4844Data = {
     muirGlacierBlock: 0,
     berlinBlock: 0,
     londonBlock: 0,
+    mergeForkBlock: 0,
     shanghaiTime: 0,
     cancunTime: 0,
     clique: {