alternate fix of skipping only pos validation on genesis

ethereumjs · Nov 19, 2022 · 3aa4ad6 · 3aa4ad6
1 parent a671e21
commit 3aa4ad6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/packages/block/src/header.ts b/packages/block/src/header.ts
@@ -347,7 +347,7 @@ export class BlockHeader {
    * @throws if any check fails
    */
   _consensusFormatValidation() {
-    const { nonce, uncleHash, difficulty, extraData } = this
+    const { nonce, uncleHash, difficulty, extraData, number } = this
     const hardfork = this._common.hardfork()
 
     // Consensus type dependent checks
@@ -394,7 +394,7 @@ export class BlockHeader {
       }
     }
     // Validation for PoS blocks (EIP-3675)
-    if (this._common.consensusType() === ConsensusType.ProofOfStake) {
+    if (this._common.consensusType() === ConsensusType.ProofOfStake && number > BigInt(0)) {
       let error = false
       let errorMsg = ''
 

diff --git a/packages/evm/src/evm.ts b/packages/evm/src/evm.ts
@@ -263,6 +263,7 @@ export class EVM implements EVMInterface {
       Hardfork.GrayGlacier,
       Hardfork.MergeForkIdTransition,
       Hardfork.Merge,
+      Hardfork.Shanghai,
     ]
     if (!supportedHardforks.includes(this._common.hardfork() as Hardfork)) {
       throw new Error(