Develop Rebase Fixes (2022-03-05)

ethereumjs · Jun 2, 2022 · 5e09ca5 · 5e09ca5
1 parent a7e0b0c
commit 5e09ca5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/packages/vm/src/index.ts b/packages/vm/src/index.ts
@@ -293,6 +293,8 @@ export default class VM extends AsyncEventEmitter {
       Hardfork.Berlin,
       Hardfork.London,
       Hardfork.ArrowGlacier,
+      Hardfork.PreMerge,
+      Hardfork.Merge,
     ]
     if (!supportedHardforks.includes(this._common.hardfork() as Hardfork)) {
       throw new Error(

diff --git a/packages/vm/tests/api/index.spec.ts b/packages/vm/tests/api/index.spec.ts
@@ -67,7 +67,7 @@ tape('VM -> basic instantiation / boolean switches', (t) => {
 
 tape('VM -> supportedHardforks', (t) => {
   t.test('should throw when common is set to an unsupported hardfork', async (st) => {
-    const common = new Common({ chain: Chain.Mainnet, hardfork: Hardfork.Merge })
+    const common = new Common({ chain: Chain.Mainnet, hardfork: Hardfork.Shanghai })
     try {
       await VM.create({ common })
       st.fail('should have failed for unsupported hardfork')