New ropsten TTD (#4068)

* new TTD * PoSSwitcher small fix
NethermindEth · May 26, 2022 · 155ca7a · 155ca7a
1 parent b7cafb8
commit 155ca7a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/src/Nethermind/Chains/ropsten.json b/src/Nethermind/Chains/ropsten.json
@@ -61,7 +61,7 @@
         "eip3198Transition": "0xA03549",
         "eip3529Transition": "0xA03549",
         "eip3541Transition": "0xA03549",
-        "terminalTotalDifficulty": "9AA7E6F278147E"
+        "terminalTotalDifficulty": "152D02C7E14AF6800000"
     },
 	"genesis": {
 		"seal": {

diff --git a/src/Nethermind/Nethermind.Merge.Plugin/PoSSwitcher.cs b/src/Nethermind/Nethermind.Merge.Plugin/PoSSwitcher.cs
@@ -90,13 +90,12 @@ private void Initialize()
         {
             LoadTerminalBlock();
             LoadFinalizedBlockHash();
+            _specProvider.UpdateMergeTransitionInfo(_firstPoSBlockNumber, _mergeConfig.TerminalTotalDifficultyParsed);
+            LoadFinalTotalDifficulty();
 
             if (_terminalBlockNumber != null || _finalTotalDifficulty != null)
                 _hasEverReachedTerminalDifficulty = true;
 
-            _specProvider.UpdateMergeTransitionInfo(_firstPoSBlockNumber, _mergeConfig.TerminalTotalDifficultyParsed);
-
-            LoadFinalTotalDifficulty();
             if (_terminalBlockNumber == null)
                 _blockTree.NewHeadBlock += CheckIfTerminalBlockReached;
 

diff --git a/src/Nethermind/Nethermind.Runner/configs/ropsten.cfg b/src/Nethermind/Nethermind.Runner/configs/ropsten.cfg
@@ -46,6 +46,6 @@
   },
   "Merge": {
     "Enabled": true,
-    "TerminalTotalDifficulty": "43531756765713534"
+    "TerminalTotalDifficulty": "100000000000000000000000"
   }
 }
diff --git a/src/Nethermind/Nethermind.Runner/configs/ropsten_archive.cfg b/src/Nethermind/Nethermind.Runner/configs/ropsten_archive.cfg
@@ -28,6 +28,6 @@
   },
   "Merge": {
     "Enabled": true,
-    "TerminalTotalDifficulty": "43531756765713534"
+    "TerminalTotalDifficulty": "100000000000000000000000"
   }
 }