Common, Block: Add arrowGlacier HF (#1527)

* common/vm: add arrowGlacier HF * common: fix tests * common: fix eip 4345 minimum hardfork * block: added ArrowGlacier difficulty tests * Common: added forkHash for ArrowGlacier HF Co-authored-by: holgerd77 <[email protected]>
ethereumjs · Nov 8, 2021 · 309988c · 309988c
1 parent c230e51
commit 309988c
Show file tree

Hide file tree

Showing 10 changed files with 7,101 additions and 3 deletions.
diff --git a/packages/block/test/difficulty.spec.ts b/packages/block/test/difficulty.spec.ts
@@ -34,6 +34,8 @@ tape('[Header]: difficulty tests', (t) => {
       require('./testdata/difficultyEIP2384_random.json').tests,
       require('./testdata/difficultyEIP2384_random_to20M.json').tests
     ),
+    arrowGlacier: require('./testdata/difficultyArrowGlacier.json').difficultyArrowGlacier
+      .ArrowGlacier,
   }
 
   /* eslint-disable-next-line no-restricted-syntax */

diff --git a/packages/block/test/testdata/difficultyArrowGlacier.json b/packages/block/test/testdata/difficultyArrowGlacier.json
diff --git a/packages/common/src/chains/mainnet.json b/packages/common/src/chains/mainnet.json
@@ -80,6 +80,11 @@
       "block": 12965000, 
       "forkHash": "0xb715077d"
     },
+    {
+      "name": "arrowGlacier",
+      "block": 13773000,
+      "forkHash": "0x20c327fc"
+    },
     {
       "name": "merge",
       "block": null,

diff --git a/packages/common/src/eips/4345.json b/packages/common/src/eips/4345.json
@@ -0,0 +1,17 @@
+{
+    "name": "EIP-4345",
+    "number": 4345,
+    "comment": "Difficulty Bomb Delay to June 2022",
+    "url": "https://eips.ethereum.org/EIPS/eip-4345",
+    "status": "Review",
+    "minimumHardfork": "london",
+    "gasConfig": {},
+    "gasPrices": {},
+    "vm": {},
+    "pow": {
+        "difficultyBombDelay": {
+            "v": 10700000,
+            "d": "the amount of blocks to delay the difficulty bomb with"
+        }
+    }
+}
diff --git a/packages/common/src/eips/index.ts b/packages/common/src/eips/index.ts
@@ -13,4 +13,5 @@ export const EIPs: eipsType = {
   3541: require('./3541.json'),
   3554: require('./3554.json'),
   3675: require('./3675.json'),
+  4345: require('./4345.json'),
 }
diff --git a/packages/common/src/hardforks/arrowGlacier.json b/packages/common/src/hardforks/arrowGlacier.json
@@ -0,0 +1,11 @@
+{
+    "name": "arrowGlacier",
+    "comment": "HF to delay the difficulty bomb",
+    "url": "https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/arrow-glacier.md",
+    "status": "Final",
+    "eips": [4345],
+    "gasConfig": {},
+    "gasPrices": {},
+    "vm": {},
+    "pow": {}
+}
diff --git a/packages/common/src/hardforks/index.ts b/packages/common/src/hardforks/index.ts
@@ -12,5 +12,6 @@ export const hardforks = [
   ['berlin', require('./berlin.json')],
   ['london', require('./london.json')],
   ['shanghai', require('./shanghai.json')],
+  ['arrowGlacier', require('./arrowGlacier.json')],
   ['merge', require('./merge.json')],
 ]
diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts
@@ -77,6 +77,7 @@ export enum Hardfork {
   MuirGlacier = 'muirGlacier',
   Berlin = 'berlin',
   London = 'london',
+  ArrowGlacier = 'arrowGlacier',
   Shanghai = 'shanghai',
   Merge = 'merge',
 }

diff --git a/packages/common/tests/hardforks.spec.ts b/packages/common/tests/hardforks.spec.ts
@@ -16,6 +16,7 @@ tape('[Common]: Hardfork logic', function (t: tape.Test) {
       Hardfork.Istanbul,
       Hardfork.Berlin,
       Hardfork.London,
+      Hardfork.ArrowGlacier,
       Hardfork.Shanghai,
       Hardfork.Merge,
     ]
@@ -40,7 +41,8 @@ tape('[Common]: Hardfork logic', function (t: tape.Test) {
     st.equal(c.getHardforkByBlockNumber(9200000), Hardfork.MuirGlacier, msg)
     st.equal(c.getHardforkByBlockNumber(12244000), Hardfork.Berlin, msg)
     st.equal(c.getHardforkByBlockNumber(12965000), Hardfork.London, msg)
-    st.equal(c.getHardforkByBlockNumber(999999999999), Hardfork.London, msg)
+    st.equal(c.getHardforkByBlockNumber(13773000), Hardfork.ArrowGlacier, msg)
+    st.equal(c.getHardforkByBlockNumber(999999999999), Hardfork.ArrowGlacier, msg)
 
     msg = 'should set HF correctly'
 
@@ -50,7 +52,8 @@ tape('[Common]: Hardfork logic', function (t: tape.Test) {
     st.equal(c.setHardforkByBlockNumber(1400000), Hardfork.Homestead, msg)
     st.equal(c.setHardforkByBlockNumber(12244000), Hardfork.Berlin, msg)
     st.equal(c.setHardforkByBlockNumber(12965000), Hardfork.London, msg)
-    st.equal(c.setHardforkByBlockNumber(999999999999), Hardfork.London, msg)
+    st.equal(c.setHardforkByBlockNumber(13773000), Hardfork.ArrowGlacier, msg)
+    st.equal(c.setHardforkByBlockNumber(999999999999), Hardfork.ArrowGlacier, msg)
 
     c = new Common({ chain: Chain.Ropsten })
     st.equal(c.setHardforkByBlockNumber(0), 'tangerineWhistle', msg)
@@ -177,7 +180,7 @@ tape('[Common]: Hardfork logic', function (t: tape.Test) {
 
     c = new Common({ chain: Chain.Mainnet })
     msg = 'should return correct number of active HFs for mainnet'
-    st.equal(c.activeHardforks().length, 12, msg)
+    st.equal(c.activeHardforks().length, 13, msg)
 
     c = new Common({ chain: Chain.Rinkeby })
     msg = 'should return correct number of active HFs for rinkeby'

diff --git a/packages/vm/src/index.ts b/packages/vm/src/index.ts
@@ -216,6 +216,7 @@ export default class VM extends AsyncEventEmitter {
         'istanbul',
         'muirGlacier',
         'berlin',
+        'arrowGlacier',
       ]
 
       this._common = new Common({