[VM/Common] Add right fork base fees, remove STATICCALL from base opc…

…odes
ethereumjs · Jul 3, 2020 · 1a23f44 · 1a23f44
1 parent a44f7f0
commit 1a23f44
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 10 deletions.
diff --git a/packages/common/src/hardforks/chainstart.json b/packages/common/src/hardforks/chainstart.json
@@ -50,7 +50,7 @@
       "d": "Once per word of the SHA3 operation's data"
     },
     "sload": {
-      "v": 200,
+      "v": 50,
       "d": "Base fee of the SLOAD opcode"
     },
     "sstoreSet": {
@@ -86,7 +86,7 @@
       "d": "Base fee of the CREATE opcode"
     },
     "call": {
-      "v": 700,
+      "v": 40,
       "d": "Base fee of the CALL opcode"
     },
     "callStipend": {
@@ -258,7 +258,7 @@
       "d": "Base fee of the ADDRESS opcode"
     },
     "balance": {
-      "v": 400,
+      "v": 20,
       "d": "Base fee of the BALANCE opcode"
     },
     "origin": {
@@ -298,11 +298,11 @@
       "d": "Base fee of the GASPRICE opcode"
     },
     "extcodesize": {
-      "v": 700,
+      "v": 20,
       "d": "Base fee of the EXTCODESIZE opcode"
     },
     "extcodecopy": {
-      "v": 700,
+      "v": 20,
       "d": "Base fee of the EXTCODECOPY opcode"
     },
     "blockhash": {
@@ -382,7 +382,7 @@
       "d": "Base fee of the SWAP opcode"
     },
     "callcode": {
-      "v": 700,
+      "v": 40,
       "d": "Base fee of the CALLCODE opcode"
     },
     "return": {
@@ -398,7 +398,7 @@
       "d": "Base fee of the INVALID opcode"
     },
     "selfdestruct": {
-      "v": 5000,
+      "v": 0,
       "d": "Base fee of the SELFDESTRUCT opcode"
     }
   },

diff --git a/packages/common/src/hardforks/homestead.json b/packages/common/src/hardforks/homestead.json
@@ -8,10 +8,9 @@
   "gasConfig": {},
   "gasPrices": {
     "delegatecall": {
-      "v": 700,
+      "v": 40,
       "d": "Base fee of the DELEGATECALL opcode"
     }
-
   },
   "vm": {},
   "pow": {}

diff --git a/packages/common/src/hardforks/tangerineWhistle.json b/packages/common/src/hardforks/tangerineWhistle.json
@@ -14,6 +14,30 @@
     "call": {
       "v": 700,
       "d": "Once per CALL operation & message call transaction"
+    },
+    "extcodesize": {
+      "v": 700,
+      "d": "Base fee of the EXTCODESIZE opcode"
+    },
+    "extcodecopy": {
+      "v": 700,
+      "d": "Base fee of the EXTCODECOPY opcode"
+    },
+    "balance": {
+      "v": 400,
+      "d": "Base fee of the BALANCE opcode"
+    },
+    "delegatecall": {
+      "v": 700,
+      "d": "Base fee of the DELEGATECALL opcode"
+    },
+    "callcode": {
+      "v": 700,
+      "d": "Base fee of the CALLCODE opcode"
+    },
+    "selfdestruct": {
+      "v": 5000,
+      "d": "Base fee of the SELFDESTRUCT opcode"
     }
   },
   "vm": {},

diff --git a/packages/vm/lib/evm/opcodes.ts b/packages/vm/lib/evm/opcodes.ts
@@ -184,7 +184,6 @@ const opcodes = {
   0xf1: { name: 'CALL', isAsync: true },
   0xf2: { name: 'CALLCODE', isAsync: true },
   0xf3: { name: 'RETURN', isAsync: false },
-  0xfa: { name: 'STATICCALL', isAsync: true },
 
   // '0x70', range - other
   0xfe: { name: 'INVALID', isAsync: false },