Cancun spec and config for mainnet (#6679)

NethermindEth · Feb 13, 2024 · d1575b2 · d1575b2
1 parent dc320a1
commit d1575b2
Show file tree

Hide file tree

Showing 46 changed files with 304 additions and 221 deletions.
diff --git a/src/Nethermind/Chains/foundation.json b/src/Nethermind/Chains/foundation.json
@@ -185,6 +185,11 @@
     "eip3855TransitionTimestamp": "0x64373057",
     "eip3860TransitionTimestamp": "0x64373057",
     "eip4895TransitionTimestamp": "0x64373057",
+    "eip1153TransitionTimestamp": "0x65F1B057",
+    "eip4788TransitionTimestamp": "0x65F1B057",
+    "eip4844TransitionTimestamp": "0x65F1B057",
+    "eip5656TransitionTimestamp": "0x65F1B057",
+    "eip6780TransitionTimestamp": "0x65F1B057",
     "terminalTotalDifficulty": "C70D808A128D7380000"
   },
   "genesis": {

diff --git a/src/Nethermind/Nethermind.Merge.Plugin.Test/EngineModuleTests.V1.cs b/src/Nethermind/Nethermind.Merge.Plugin.Test/EngineModuleTests.V1.cs
@@ -1553,8 +1553,11 @@ public void Should_return_expected_capabilities_for_mainnet()
             nameof(IEngineRpcModule.engine_forkchoiceUpdatedV2),
             nameof(IEngineRpcModule.engine_newPayloadV2),
             nameof(IEngineRpcModule.engine_getPayloadBodiesByHashV1),
-            nameof(IEngineRpcModule.engine_getPayloadBodiesByRangeV1)
+            nameof(IEngineRpcModule.engine_getPayloadBodiesByRangeV1),
 
+            nameof(IEngineRpcModule.engine_getPayloadV3),
+            nameof(IEngineRpcModule.engine_forkchoiceUpdatedV3),
+            nameof(IEngineRpcModule.engine_newPayloadV3)
         };
         Assert.That(result, Is.EquivalentTo(expectedMethods));
     }

diff --git a/src/Nethermind/Nethermind.Network.Test/ForkInfoTests.cs b/src/Nethermind/Nethermind.Network.Test/ForkInfoTests.cs
@@ -47,10 +47,12 @@ public class ForkInfoTests
     [TestCase(13_772_999, 0ul, "0xb715077d", 13_773_000ul, "Last London")]
     [TestCase(13_773_000, 0ul, "0x20c327fc", 15_050_000ul, "First Arrow Glacier")]
     [TestCase(15_049_999, 0ul, "0x20c327fc", 15_050_000ul, "Last Arrow Glacier")]
-    [TestCase(15_050_000, 0ul, "0xf0afd0e3", 1681338455ul, "First Gray Glacier")]
-    [TestCase(15_051_000, 0ul, "0xf0afd0e3", 1681338455ul, "Future Gray Glacier")]
-    [TestCase(15_051_000, 1681338455ul, "0xdce96c2d", 0ul, "First Shanghai timestamp")]
-    [TestCase(15_051_000, 9981338455ul, "0xdce96c2d", 0ul, "Future Shanghai timestamp")]
+    [TestCase(15_050_000, 0ul, "0xf0afd0e3", 1_681_338_455ul, "First Gray Glacier")]
+    [TestCase(15_051_000, 0ul, "0xf0afd0e3", 1_681_338_455ul, "Future Gray Glacier")]
+    [TestCase(15_051_000, 1_681_338_455ul, "0xdce96c2d", 1_710_338_135ul, "First Shanghai timestamp")]
+    [TestCase(15_051_000, 1_710_338_134ul, "0xdce96c2d", 1_710_338_135ul, "Future Shanghai timestamp")]
+    [TestCase(15_051_000, 1_710_338_135ul, "0x9f3d2254", 0ul, "First Cancun timestamp")]
+    [TestCase(15_051_000, 1_810_338_135ul, "0x9f3d2254", 0ul, "Future Cancun timestamp")]
     public void Fork_id_and_hash_as_expected(long head, ulong headTimestamp, string forkHashHex, ulong next, string description)
     {
         Test(head, headTimestamp, KnownHashes.MainnetGenesis, forkHashHex, next, description, MainnetSpecProvider.Instance, "foundation.json");

diff --git a/src/Nethermind/Nethermind.Runner.Test/ConfigFilesTests.cs b/src/Nethermind/Nethermind.Runner.Test/ConfigFilesTests.cs
@@ -196,7 +196,7 @@ public void Network_diag_tracer_disabled_by_default(string configWildcard)
         [TestCase("poacore", 2048)]
         [TestCase("energy", 2048)]
         [TestCase("chiado", 1024)]
-        [TestCase("^mainnet ^spaceneth ^volta ^energy ^poacore ^gnosis ^chiado", 1024)]
+        [TestCase("^mainnet ^spaceneth ^volta ^energy ^poacore ^gnosis", 1024)]
         [TestCase("spaceneth", 128)]
         public void Tx_pool_defaults_are_correct(string configWildcard, int poolSize)
         {
@@ -338,8 +338,9 @@ public void Simulating_block_production_on_every_slot_is_always_disabled(string
         [TestCase("sepolia", BlobsSupportMode.StorageWithReorgs)]
         [TestCase("holesky", BlobsSupportMode.StorageWithReorgs)]
         [TestCase("chiado", BlobsSupportMode.StorageWithReorgs)]
-        [TestCase("mainnet", BlobsSupportMode.Disabled)]
-        [TestCase("gnosis", BlobsSupportMode.Disabled)]
+        [TestCase("mainnet", BlobsSupportMode.StorageWithReorgs)]
+        [TestCase("gnosis", BlobsSupportMode.StorageWithReorgs)]
+        [TestCase("^goerli ^sepolia ^holesky ^chiado ^mainnet ^gnosis", BlobsSupportMode.Disabled)]
         public void Blob_txs_support_is_correct(string configWildcard, BlobsSupportMode blobsSupportMode)
         {
             Test<ITxPoolConfig, BlobsSupportMode>(configWildcard, c => c.BlobsSupport, blobsSupportMode);

diff --git a/src/Nethermind/Nethermind.Runner/configs/AuraTest.cfg b/src/Nethermind/Nethermind.Runner/configs/AuraTest.cfg
@@ -1,6 +1,6 @@
 {
   "Init": {
-    "ChainSpecPath": "chainspec/AuRaTest.json",    
+    "ChainSpecPath": "chainspec/AuRaTest.json",
     "GenesisHash": "0xa13552e2290059c2736d101e945071a5f3768bc3338c73724184b0606eb8df1d",
     "BaseDbPath": "nethermind_db/aura",
     "LogFileName": "AuraTest.logs.txt"

diff --git a/src/Nethermind/Nethermind.Runner/configs/base-goerli.cfg b/src/Nethermind/Nethermind.Runner/configs/base-goerli.cfg
@@ -1,17 +1,20 @@
 {
-    "Init" : {
-        "ChainSpecPath" : "chainspec/base-goerli.json",
-        "GenesisHash" : "0xa3ab140f15ea7f7443a4702da64c10314eb04d488e72974e02e2d728096b4f76",
-        "BaseDbPath" : "nethermind_db/base-goerli",
-        "LogFileName" : "base-goerli.logs.txt",
-        "DisableGcOnNewPayload": false
-    },
-    "Sync": {
-        "NetworkingEnabled": false
-    },
-    "JsonRpc" : {
-        "Enabled" : true,
-        "Port" : 8545,
-        "EnginePort" : 8551
-    }
+  "Init": {
+    "ChainSpecPath": "chainspec/base-goerli.json",
+    "GenesisHash": "0xa3ab140f15ea7f7443a4702da64c10314eb04d488e72974e02e2d728096b4f76",
+    "BaseDbPath": "nethermind_db/base-goerli",
+    "LogFileName": "base-goerli.logs.txt",
+    "DisableGcOnNewPayload": false
+  },
+  "TxPool": {
+    "BlobsSupport": "Disabled"
+  },
+  "Sync": {
+    "NetworkingEnabled": false
+  },
+  "JsonRpc": {
+    "Enabled": true,
+    "Port": 8545,
+    "EnginePort": 8551
+  }
 }
diff --git a/src/Nethermind/Nethermind.Runner/configs/base-goerli_archive.cfg b/src/Nethermind/Nethermind.Runner/configs/base-goerli_archive.cfg
@@ -1,20 +1,23 @@
 {
-    "Init" : {
-      "ChainSpecPath" : "chainspec/base-goerli.json",
-      "GenesisHash" : "0xa3ab140f15ea7f7443a4702da64c10314eb04d488e72974e02e2d728096b4f76",
-      "BaseDbPath" : "nethermind_db/base-goerli-archive",
-      "LogFileName" : "base-goerli-archive.logs.txt",
-      "DisableGcOnNewPayload": false
-    },
-    "Sync": {
-      "NetworkingEnabled": false
-    },
-    "Pruning": {
-      "Mode": "None"
-    },
-    "JsonRpc" : {
-      "Enabled" : true,
-      "Port" : 8545,
-      "EnginePort" : 8551
-    }
+  "Init": {
+    "ChainSpecPath": "chainspec/base-goerli.json",
+    "GenesisHash": "0xa3ab140f15ea7f7443a4702da64c10314eb04d488e72974e02e2d728096b4f76",
+    "BaseDbPath": "nethermind_db/base-goerli-archive",
+    "LogFileName": "base-goerli-archive.logs.txt",
+    "DisableGcOnNewPayload": false
+  },
+  "TxPool": {
+    "BlobsSupport": "Disabled"
+  },
+  "Sync": {
+    "NetworkingEnabled": false
+  },
+  "Pruning": {
+    "Mode": "None"
+  },
+  "JsonRpc": {
+    "Enabled": true,
+    "Port": 8545,
+    "EnginePort": 8551
+  }
 }
diff --git a/src/Nethermind/Nethermind.Runner/configs/base-mainnet.cfg b/src/Nethermind/Nethermind.Runner/configs/base-mainnet.cfg
@@ -1,17 +1,20 @@
 {
-    "Init" : {
-        "ChainSpecPath" : "chainspec/base-mainnet.json",
-        "GenesisHash" : "0xf712aa9241cc24369b143cf6dce85f0902a9731e70d66818a3a5845b296c73dd",
-        "BaseDbPath" : "nethermind_db/base-mainnet",
-        "LogFileName" : "base-mainnet.logs.txt",
-        "DisableGcOnNewPayload": false
-    },
-    "Sync": {
-      "NetworkingEnabled": false
-    },
-    "JsonRpc" : {
-        "Enabled" : true,
-        "Port" : 8545,
-        "EnginePort" : 8551
-    }
+  "Init": {
+    "ChainSpecPath": "chainspec/base-mainnet.json",
+    "GenesisHash": "0xf712aa9241cc24369b143cf6dce85f0902a9731e70d66818a3a5845b296c73dd",
+    "BaseDbPath": "nethermind_db/base-mainnet",
+    "LogFileName": "base-mainnet.logs.txt",
+    "DisableGcOnNewPayload": false
+  },
+  "TxPool": {
+    "BlobsSupport": "Disabled"
+  },
+  "Sync": {
+    "NetworkingEnabled": false
+  },
+  "JsonRpc": {
+    "Enabled": true,
+    "Port": 8545,
+    "EnginePort": 8551
+  }
 }
diff --git a/src/Nethermind/Nethermind.Runner/configs/base-mainnet_archive.cfg b/src/Nethermind/Nethermind.Runner/configs/base-mainnet_archive.cfg
@@ -1,20 +1,23 @@
 {
-    "Init" : {
-      "ChainSpecPath" : "chainspec/base-mainnet.json",
-      "GenesisHash" : "0xf712aa9241cc24369b143cf6dce85f0902a9731e70d66818a3a5845b296c73dd",
-      "BaseDbPath" : "nethermind_db/base-mainnet-archive",
-      "LogFileName" : "base-mainnet-archive.logs.txt",
-      "DisableGcOnNewPayload": false
-    },
-    "Sync": {
-      "NetworkingEnabled": false
-    },
-    "Pruning": {
-      "Mode": "None"
-    },
-    "JsonRpc" : {
-      "Enabled" : true,
-      "Port" : 8545,
-      "EnginePort" : 8551
-    }
+  "Init": {
+    "ChainSpecPath": "chainspec/base-mainnet.json",
+    "GenesisHash": "0xf712aa9241cc24369b143cf6dce85f0902a9731e70d66818a3a5845b296c73dd",
+    "BaseDbPath": "nethermind_db/base-mainnet-archive",
+    "LogFileName": "base-mainnet-archive.logs.txt",
+    "DisableGcOnNewPayload": false
+  },
+  "TxPool": {
+    "BlobsSupport": "Disabled"
+  },
+  "Sync": {
+    "NetworkingEnabled": false
+  },
+  "Pruning": {
+    "Mode": "None"
+  },
+  "JsonRpc": {
+    "Enabled": true,
+    "Port": 8545,
+    "EnginePort": 8551
+  }
 }
diff --git a/src/Nethermind/Nethermind.Runner/configs/base-sepolia.cfg b/src/Nethermind/Nethermind.Runner/configs/base-sepolia.cfg
@@ -1,17 +1,20 @@
 {
   "Init": {
-    "ChainSpecPath" : "chainspec/base-sepolia.json",
-    "GenesisHash" : "0x0dcc9e089e30b90ddfc55be9a37dd15bc551aeee999d2e2b51414c54eaf934e4",
-    "BaseDbPath" : "nethermind_db/base-sepolia",
-    "LogFileName" : "base-sepolia.logs.txt",
+    "ChainSpecPath": "chainspec/base-sepolia.json",
+    "GenesisHash": "0x0dcc9e089e30b90ddfc55be9a37dd15bc551aeee999d2e2b51414c54eaf934e4",
+    "BaseDbPath": "nethermind_db/base-sepolia",
+    "LogFileName": "base-sepolia.logs.txt",
     "DisableGcOnNewPayload": false
   },
+  "TxPool": {
+    "BlobsSupport": "Disabled"
+  },
   "Sync": {
     "NetworkingEnabled": false
   },
   "JsonRpc": {
-    "Enabled" : true,
-    "Port" : 8545,
-    "EnginePort" : 8551
+    "Enabled": true,
+    "Port": 8545,
+    "EnginePort": 8551
   }
 }
diff --git a/src/Nethermind/Nethermind.Runner/configs/base-sepolia_archive.cfg b/src/Nethermind/Nethermind.Runner/configs/base-sepolia_archive.cfg
@@ -1,20 +1,23 @@
 {
   "Init": {
-    "ChainSpecPath" : "chainspec/base-sepolia.json",
-    "GenesisHash" : "0x0dcc9e089e30b90ddfc55be9a37dd15bc551aeee999d2e2b51414c54eaf934e4",
-    "BaseDbPath" : "nethermind_db/base-sepolia-archive",
-    "LogFileName" : "base-sepolia-archive.logs.txt",
+    "ChainSpecPath": "chainspec/base-sepolia.json",
+    "GenesisHash": "0x0dcc9e089e30b90ddfc55be9a37dd15bc551aeee999d2e2b51414c54eaf934e4",
+    "BaseDbPath": "nethermind_db/base-sepolia-archive",
+    "LogFileName": "base-sepolia-archive.logs.txt",
     "DisableGcOnNewPayload": false
   },
+  "TxPool": {
+    "BlobsSupport": "Disabled"
+  },
   "Sync": {
     "NetworkingEnabled": false
   },
   "Pruning": {
     "Mode": "None"
   },
   "JsonRpc": {
-    "Enabled" : true,
-    "Port" : 8545,
-    "EnginePort" : 8551
+    "Enabled": true,
+    "Port": 8545,
+    "EnginePort": 8551
   }
 }
diff --git a/src/Nethermind/Nethermind.Runner/configs/chiado.cfg b/src/Nethermind/Nethermind.Runner/configs/chiado.cfg
@@ -6,8 +6,7 @@
     "LogFileName": "chiado.logs.txt"
   },
   "TxPool": {
-    "Size": 1024,
-    "BlobsSupport": "StorageWithReorgs"
+    "Size": 1024
   },
   "JsonRpc": {
     "Enabled": true,
@@ -44,4 +43,4 @@
       16
     ]
   }
-}
+}
diff --git a/src/Nethermind/Nethermind.Runner/configs/chiado_archive.cfg b/src/Nethermind/Nethermind.Runner/configs/chiado_archive.cfg
@@ -6,8 +6,7 @@
     "LogFileName": "chiado_archive.logs.txt"
   },
   "TxPool": {
-    "Size": 1024,
-    "BlobsSupport": "StorageWithReorgs"
+    "Size": 1024
   },
   "JsonRpc": {
     "Enabled": true,

diff --git a/src/Nethermind/Nethermind.Runner/configs/energyweb.cfg b/src/Nethermind/Nethermind.Runner/configs/energyweb.cfg
@@ -6,6 +6,9 @@
     "LogFileName": "energyweb.logs.txt",
     "MemoryHint": 768000000
   },
+  "TxPool": {
+    "BlobsSupport": "Disabled"
+  },
   "Sync": {
     "FastSync": true,
     "PivotNumber": 28390000,
@@ -27,4 +30,4 @@
   "Merge": {
     "Enabled": false
   }
-}
+}
diff --git a/src/Nethermind/Nethermind.Runner/configs/energyweb_archive.cfg b/src/Nethermind/Nethermind.Runner/configs/energyweb_archive.cfg
@@ -6,6 +6,9 @@
     "LogFileName": "energyweb_archive.logs.txt",
     "MemoryHint": 768000000
   },
+  "TxPool": {
+    "BlobsSupport": "Disabled"
+  },
   "Sync": {
     "UseGethLimitsInFastBlocks": false
   },
@@ -31,6 +34,6 @@
     "TxLookupLimit": 0
   },
   "Merge": {
-	"Enabled": false
+    "Enabled": false
   }
 }
diff --git a/src/Nethermind/Nethermind.Runner/configs/exosama.cfg b/src/Nethermind/Nethermind.Runner/configs/exosama.cfg
@@ -6,6 +6,9 @@
     "LogFileName": "exosama.logs.txt",
     "MemoryHint": 768000000
   },
+  "TxPool": {
+    "BlobsSupport": "Disabled"
+  },
   "Sync": {
     "FastSync": true,
     "PivotNumber": 8230000,
@@ -27,4 +30,4 @@
   "Merge": {
     "Enabled": false
   }
-}
+}
diff --git a/src/Nethermind/Nethermind.Runner/configs/exosama_archive.cfg b/src/Nethermind/Nethermind.Runner/configs/exosama_archive.cfg
@@ -6,6 +6,9 @@
     "LogFileName": "exosama_archive.logs.txt",
     "MemoryHint": 768000000
   },
+  "TxPool": {
+    "BlobsSupport": "Disabled"
+  },
   "Sync": {
     "UseGethLimitsInFastBlocks": false
   },
@@ -25,6 +28,6 @@
     "Mode": "None"
   },
   "Merge": {
-	"Enabled": false
+    "Enabled": false
   }
 }
diff --git a/src/Nethermind/Nethermind.Runner/configs/goerli.cfg b/src/Nethermind/Nethermind.Runner/configs/goerli.cfg
@@ -7,8 +7,7 @@
     "MemoryHint": 768000000
   },
   "TxPool": {
-    "Size": 1024,
-    "BlobsSupport": "StorageWithReorgs"
+    "Size": 1024
   },
   "Db": {
     "EnableMetricsUpdater": true
@@ -53,4 +52,4 @@
   "Merge": {
     "Enabled": true
   }
-}
+}