common: Schedule Shanghai on mainnet! (#2591)

* common: Schedule Shanghai on mainnet! * clear hf timestamp for test
ethereumjs · Mar 17, 2023 · cbf9a04 · cbf9a04
1 parent 178d07e
commit cbf9a04
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/packages/block/test/difficulty.spec.ts b/packages/block/test/difficulty.spec.ts
@@ -56,6 +56,13 @@ tape('[Header]: difficulty tests', (t) => {
       for (const testName in testData) {
         const test = testData[testName]
         const common = new Common({ chain: Chain.Mainnet, hardfork })
+        // Unschedule any timestamp since tests are not configured for timestamps
+        common
+          .hardforks()
+          .filter((hf) => hf.timestamp !== undefined)
+          .map((hf) => {
+            hf.timestamp = undefined
+          })
         const blockOpts = { common }
         const uncleHash = test.parentUncles === '0x00' ? undefined : test.parentUncles
         const parentBlock = Block.fromBlockData(

diff --git a/packages/common/src/chains/mainnet.json b/packages/common/src/chains/mainnet.json
@@ -102,7 +102,8 @@
     {
       "name": "shanghai",
       "block": null,
-      "forkHash": null
+      "timestamp": "1681338455",
+      "forkHash": "0xdce96c2d"
     }
   ],
   "bootstrapNodes": [

diff --git a/packages/common/test/hardforks.spec.ts b/packages/common/test/hardforks.spec.ts
@@ -330,6 +330,13 @@ tape('[Common]: Hardfork logic', function (t: tape.Test) {
     st.equal(c.forkHash(Hardfork.SpuriousDragon, genesisHash), '0x3edd5b10', msg)
 
     c = new Common({ chain: Chain.Mainnet, hardfork: Hardfork.Shanghai })
+    // unschedule shanghai on it to test
+    c.hardforks()
+      .filter((hf) => hf.name === Hardfork.Shanghai)
+      .map((hf) => {
+        hf.block = null
+        hf.timestamp = undefined
+      })
     let f = () => {
       c.forkHash(Hardfork.Shanghai)
     }