Remove totalTerminalDifficultyPassed (#2934)

status-im · Dec 13, 2024 · a57958f · a57958f
1 parent 2e5ef4f
commit a57958f
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 23 deletions.
diff --git a/hive_integration/nodocker/engine/engine_tests.nim b/hive_integration/nodocker/engine/engine_tests.nim
@@ -33,12 +33,10 @@ import
   ./engine/misc,
   ./engine/rpc
 
-proc getGenesis(cs: EngineSpec, param: NetworkParams) =  
+proc getGenesis(cs: EngineSpec, param: NetworkParams) =
   # Set the terminal total difficulty
   let realTTD = param.genesis.difficulty + cs.ttd.u256
   param.config.terminalTotalDifficulty = Opt.some(realTTD)
-  if param.genesis.difficulty <= realTTD:
-    param.config.terminalTotalDifficultyPassed = Opt.some(true)
 
   # Set the genesis timestamp if provided
   if cs.genesisTimestamp != 0:
@@ -58,7 +56,7 @@ proc executeEngineSpec*(ws: BaseSpec): bool =
     ws.getGenesisFn(ws, conf.networkParams)
   else:
     cs.getGenesis(conf.networkParams)
-    
+
   let env  = TestEnv.new(conf)
   env.engine.setRealTTD()
   env.setupCLMock()

diff --git a/nimbus/common/chain_config.nim b/nimbus/common/chain_config.nim
@@ -514,7 +514,6 @@ func chainConfigForNetwork*(id: NetworkId): ChainConfig =
       londonBlock:         Opt.some(0.BlockNumber),
       mergeForkBlock:      Opt.some(0.BlockNumber),
       terminalTotalDifficulty: Opt.some(0.u256),
-      terminalTotalDifficultyPassed: Opt.some(true),
       shanghaiTime:        Opt.some(1_696_000_704.EthTime),
       cancunTime:          Opt.some(1_707_305_664.EthTime), # 2024-02-07 11:34:24
       depositContractAddress: Opt.some(HOLESKYNET_DEPOSIT_CONTRACT_ADDRESS),

diff --git a/nimbus/common/common.nim b/nimbus/common/common.nim
@@ -392,9 +392,6 @@ func daoForkSupport*(com: CommonRef): bool =
 func ttd*(com: CommonRef): Opt[DifficultyInt] =
   com.config.terminalTotalDifficulty
 
-func ttdPassed*(com: CommonRef): bool =
-  com.config.terminalTotalDifficultyPassed.get(false)
-
 func pruneHistory*(com: CommonRef): bool =
   com.pruneHistory
 

diff --git a/nimbus/common/hardforks.nim b/nimbus/common/hardforks.nim
@@ -48,7 +48,6 @@ type
   MergeForkTransitionThreshold* = object
     number*: Opt[BlockNumber]
     ttd*: Opt[DifficultyInt]
-    ttdPassed*: Opt[bool]
 
   ForkTransitionTable* = object
     blockNumberThresholds*: array[Frontier..GrayGlacier, Opt[BlockNumber]]
@@ -121,11 +120,9 @@ func isGTETransitionThreshold*(map: ForkTransitionTable, forkDeterminer: ForkDet
     map.blockNumberThresholds[fork].isSome and forkDeterminer.number >= map.blockNumberThresholds[fork].get
   elif fork == MergeFork:
     # MergeFork is a special case that can use either block number or ttd;
-    # ttdPassed > block number > ttd takes precedence.
+    # block number > ttd takes precedence.
     let t = map.mergeForkTransitionThreshold
-    if t.ttdPassed.isSome:
-      t.ttdPassed.get
-    elif t.number.isSome:
+    if t.number.isSome:
       forkDeterminer.number >= t.number.get
     elif t.ttd.isSome and forkDeterminer.td.isSome:
       forkDeterminer.td.get >= t.ttd.get
@@ -177,7 +174,6 @@ type
     osakaTime*          : Opt[EthTime]
 
     terminalTotalDifficulty*: Opt[UInt256]
-    terminalTotalDifficultyPassed*: Opt[bool]
     depositContractAddress*: Opt[Address]
 
   # These are used for checking that the values of the fields
@@ -241,7 +237,6 @@ func mergeForkTransitionThreshold*(conf: ChainConfig): MergeForkTransitionThresh
   MergeForkTransitionThreshold(
     number: conf.mergeForkBlock,
     ttd: conf.terminalTotalDifficulty,
-    ttdPassed: conf.terminalTotalDifficultyPassed
   )
 
 func toForkTransitionTable*(conf: ChainConfig): ForkTransitionTable =
@@ -287,7 +282,6 @@ func populateFromForkTransitionTable*(conf: ChainConfig, t: ForkTransitionTable)
 
   conf.mergeForkBlock          = t.mergeForkTransitionThreshold.number
   conf.terminalTotalDifficulty = t.mergeForkTransitionThreshold.ttd
-  conf.terminalTotalDifficultyPassed = t.mergeForkTransitionThreshold.ttdPassed
 
   conf.shanghaiTime        = t.timeThresholds[HardFork.Shanghai]
   conf.cancunTime          = t.timeThresholds[HardFork.Cancun]

diff --git a/tests/customgenesis/cancun123.json b/tests/customgenesis/cancun123.json
@@ -13,7 +13,6 @@
     "berlinBlock": 0,
     "londonBlock": 0,
     "terminalTotalDifficulty": 0,
-    "terminalTotalDifficultyPassed": true,
     "shanghaiTime": 0,
     "cancunTime": 0
   },

diff --git a/tests/customgenesis/engine_api_genesis.json b/tests/customgenesis/engine_api_genesis.json
@@ -12,8 +12,7 @@
     "berlinBlock": 0,
     "londonBlock": 0,
     "mergeNetsplitBlock": 0,
-    "terminalTotalDifficulty": 0,
-    "terminalTotalDifficultyPassed": true,
+    "terminalTotalDifficulty": 0
   },
   "alloc": {
     "0x0000000000000000000000000000000000000000": {

diff --git a/tests/customgenesis/geth_holesky.json b/tests/customgenesis/geth_holesky.json
@@ -13,7 +13,6 @@
     "londonBlock": 0,
     "mergeNetsplitBlock": 0,
     "terminalTotalDifficulty": 0,
-    "terminalTotalDifficultyPassed": true,
     "shanghaiTime": 1696000704
   },
   "alloc": {

diff --git a/tests/customgenesis/holesky.json b/tests/customgenesis/holesky.json
@@ -13,7 +13,6 @@
     "londonBlock": 0,
     "mergeForkBlock": 0,
     "terminalTotalDifficulty": 0,
-    "terminalTotalDifficultyPassed": true,
     "shanghaiTime": 1696000704
   },
   "genesis": {

diff --git a/tests/customgenesis/mekong.json b/tests/customgenesis/mekong.json
@@ -13,7 +13,6 @@
     "londonBlock": 0,
     "mergeNetsplitBlock": 0,
     "terminalTotalDifficulty": 0,
-    "terminalTotalDifficultyPassed": true,
     "shanghaiTime": 0,
     "cancunTime": 0,
     "depositContractAddress": "0x4242424242424242424242424242424242424242",

diff --git a/tests/test_forkid.nim b/tests/test_forkid.nim
@@ -96,7 +96,6 @@ func config(shanghai, cancun: uint64): ChainConfig =
     berlinBlock:                   Opt.some(0'u64),
     londonBlock:                   Opt.some(0'u64),
     terminalTotalDifficulty:       Opt.some(0.u256),
-    terminalTotalDifficultyPassed: Opt.some(true),
     mergeForkBlock:                Opt.some(0'u64),
     shanghaiTime:                  Opt.some(shanghai.EthTime),
     cancunTime:                    Opt.some(cancun.EthTime),