resolve comments

ethereumjs · Jun 23, 2022 · 9d9aab9 · 9d9aab9
1 parent a45e1ae
commit 9d9aab9
Show file tree

Hide file tree

Showing 8 changed files with 21,396 additions and 5 deletions.
diff --git a/packages/block/test/difficulty.spec.ts b/packages/block/test/difficulty.spec.ts
@@ -47,9 +47,8 @@ const hardforkTestData: TestData = {
   arrowGlacier:
     require('../../ethereum-tests/DifficultyTests/dfArrowGlacier/difficultyArrowGlacier.json')
       .difficultyArrowGlacier.ArrowGlacier,
-  grayGlacier:
-    require('../../ethereum-tests/DifficultyTests/dfGrayGlacier/difficultyGrayGlacier.json')
-      .difficultyGrayGlacier.GrayGlacier,
+  grayGlacier: require('./testdata/dfGrayGlacier/difficultyGrayGlacier.json').difficultyGrayGlacier
+    .GrayGlacier,
 }
 
 const chainTestData: TestData = {

diff --git a/packages/block/test/testdata/dfGrayGlacier/difficultyGrayGlacier.json b/packages/block/test/testdata/dfGrayGlacier/difficultyGrayGlacier.json
diff --git a/packages/block/test/testdata/dfGrayGlacier/difficultyGrayGlacierForkBlock.json b/packages/block/test/testdata/dfGrayGlacier/difficultyGrayGlacierForkBlock.json
diff --git a/packages/block/test/testdata/dfGrayGlacier/difficultyGrayGlacierMinus1.json b/packages/block/test/testdata/dfGrayGlacier/difficultyGrayGlacierMinus1.json
diff --git a/packages/block/test/testdata/dfGrayGlacier/difficultyGrayGlacierTimeDiff1.json b/packages/block/test/testdata/dfGrayGlacier/difficultyGrayGlacierTimeDiff1.json
diff --git a/packages/block/test/testdata/dfGrayGlacier/difficultyGrayGlacierTimeDiff2.json b/packages/block/test/testdata/dfGrayGlacier/difficultyGrayGlacierTimeDiff2.json
diff --git a/packages/common/src/chains/mainnet.json b/packages/common/src/chains/mainnet.json
@@ -88,7 +88,7 @@
     {
       "name": "grayGlacier",
       "block": 15050000,
-      "forkHash": null
+      "forkHash": "0xf0afd0e3"
     },
     {
       "name": "mergeForkIdTransition",

diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts
@@ -80,9 +80,9 @@ export enum Hardfork {
   London = 'london',
   ArrowGlacier = 'arrowGlacier',
   GrayGlacier = 'grayGlacier',
-  Shanghai = 'shanghai',
   MergeForkIdTransition = 'mergeForkIdTransition',
   Merge = 'merge',
+  Shanghai = 'shanghai',
 }
 
 export enum ConsensusType {