From a1e55cb56a9ba6d437ae1d3e106b2c35637cfe4e Mon Sep 17 00:00:00 2001
From: holgerd77 <Holger.Drewes@gmail.com>
Date: Wed, 12 Aug 2020 10:06:55 +0200
Subject: [PATCH] vm: moved BEGINSUB, RETURNSUB and JUMPSUB opcodes to
 dedicated Berlin HF opcode section in opcodes.ts

---
 packages/vm/lib/evm/opcodes.ts | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/vm/lib/evm/opcodes.ts b/packages/vm/lib/evm/opcodes.ts
index 3ae30274a4b..455516c2c2a 100644
--- a/packages/vm/lib/evm/opcodes.ts
+++ b/packages/vm/lib/evm/opcodes.ts
@@ -104,9 +104,6 @@ const opcodes = {
   0x59: { name: 'MSIZE', isAsync: false },
   0x5a: { name: 'GAS', isAsync: false },
   0x5b: { name: 'JUMPDEST', isAsync: false },
-  0x5c: { name: 'BEGINSUB', isAsync: false },
-  0x5d: { name: 'RETURNSUB', isAsync: false },
-  0x5e: { name: 'JUMPSUB', isAsync: false },
 
   // 0x60, range
   0x60: { name: 'PUSH', isAsync: false },
@@ -228,6 +225,14 @@ const hardforkOpcodes = [
       0x47: { name: 'SELFBALANCE', isAsync: false }, // EIP 1884
     },
   },
+  {
+    hardforkName: 'berlin',
+    opcodes: {
+      0x5c: { name: 'BEGINSUB', isAsync: false }, // EIP 2315
+      0x5d: { name: 'RETURNSUB', isAsync: false }, // EIP 2315
+      0x5e: { name: 'JUMPSUB', isAsync: false }, // EIP 2315
+    },
+  },
 ]
 
 /**