resolve comments

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

Hide file tree

Showing 9 changed files with 21,397 additions and 6 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 {

diff --git a/packages/ethereum-tests b/packages/ethereum-tests
+2 −0		.gitignore
+131 −0		BlockchainTests/GeneralStateTests/stExample/mergeTest.json
+429 −0		BlockchainTests/TransitionTests/bcArrowGlacierToMerge/powToPosBlockRejection.json
+336 −0		BlockchainTests/TransitionTests/bcArrowGlacierToMerge/powToPosTest.json
+85 −85		BlockchainTests/ValidBlocks/bcEIP1559/burnVerify.json
+709 −0		BlockchainTests/ValidBlocks/bcEIP1559/burnVerifyLondon.json
+133 −126		BlockchainTests/ValidBlocks/bcEIP1559/tips.json
+1,295 −0		BlockchainTests/ValidBlocks/bcEIP1559/tipsLondon.json
+124 −3		BlockchainTests/ValidBlocks/bcExample/basefeeExample.json
+244 −0		BlockchainTests/ValidBlocks/bcExample/mergeExample.json
+7,056 −0		DifficultyTests/dfGrayGlacier/difficultyGrayGlacier.json
+4,016 −0		DifficultyTests/dfGrayGlacier/difficultyGrayGlacierForkBlock.json
+7,056 −0		DifficultyTests/dfGrayGlacier/difficultyGrayGlacierMinus1.json
+1,632 −0		DifficultyTests/dfGrayGlacier/difficultyGrayGlacierTimeDiff1.json
+1,632 −0		DifficultyTests/dfGrayGlacier/difficultyGrayGlacierTimeDiff2.json
+81 −0		GeneralStateTests/stExample/mergeTest.json
+3 −3		TransactionTests/ttEIP1559/maxPriorityFeePerGas00prefix.json
+3 −3		TransactionTests/ttEIP1559/maxPriorityFeePerGass32BytesValue.json
+13 −3		docs/blockchain-tutorial.rst
+10 −0		docs/retesteth-tutorial.rst
+20 −91		docs/t8ntool-ref.rst
+5 −3		docs/test_filler/test_blockheader.rst
+113 −0		src/BlockchainTestsFiller/InvalidBlocks/bcExpectSection/result_MergeEnvConvertionFiller.json
+113 −0		src/BlockchainTestsFiller/InvalidBlocks/bcExpectSection/result_eip1559EnvConvertionFiller.json
+112 −0		src/BlockchainTestsFiller/InvalidBlocks/bcExpectSection/result_legacyEnvConvertionFiller.json
+208 −0		src/BlockchainTestsFiller/TransitionTests/bcArrowGlacierToMerge/powToPosBlockRejectionFiller.json
+172 −0		src/BlockchainTestsFiller/TransitionTests/bcArrowGlacierToMerge/powToPosTestFiller.json
+22 −15		src/BlockchainTestsFiller/ValidBlocks/bcEIP1559/burnVerifyFiller.yml
+465 −0		src/BlockchainTestsFiller/ValidBlocks/bcEIP1559/burnVerifyLondonFiller.yml
+9 −3		src/BlockchainTestsFiller/ValidBlocks/bcEIP1559/tipsFiller.yml
+637 −0		src/BlockchainTestsFiller/ValidBlocks/bcEIP1559/tipsLondonFiller.yml
+86 −0		src/BlockchainTestsFiller/ValidBlocks/bcExample/mergeExampleFiller.json
+13 −0		src/DifficultyTestsFiller/dfGrayGlacier/difficultyGrayGlacierFiller.json
+13 −0		src/DifficultyTestsFiller/dfGrayGlacier/difficultyGrayGlacierForkBlockFiller.json
+13 −0		src/DifficultyTestsFiller/dfGrayGlacier/difficultyGrayGlacierMinus1Filler.json
+13 −0		src/DifficultyTestsFiller/dfGrayGlacier/difficultyGrayGlacierTimeDiff1Filler.json
+13 −0		src/DifficultyTestsFiller/dfGrayGlacier/difficultyGrayGlacierTimeDiff2Filler.json
+69 −0		src/GeneralStateTestsFiller/stExample/mergeTestFiller.yml
+130 −0		src/GeneralStateTestsFiller/stExpectSection/result_eip1559EnvConvertionFiller.json
+129 −0		src/GeneralStateTestsFiller/stExpectSection/result_legacyEnvConvertionFiller.json
+130 −0		src/GeneralStateTestsFiller/stExpectSection/result_mergeEnvConvertionFiller.json
+1 −1		src/TransactionTestsFiller/ttEIP1559/maxPriorityFeePerGas00prefixFiller.json
+1 −1		src/TransactionTestsFiller/ttEIP1559/maxPriorityFeePerGass32BytesValueFiller.json