Merge pull request ethereumjs#647 from ethereumjs/fix/getOpcodesForHF

holgerd77 · web-flow · commit 2d9c9230ca26 · 2020-01-08T22:09:53.000+01:00
Fix getOpcodesForHF for when HF &gt; istanbul
diff --git a/lib/evm/opcodes.ts b/lib/evm/opcodes.ts
@@ -1,3 +1,5 @@
+import Common from 'ethereumjs-common'
+
 export interface Opcode {
   name: string
   fee: number
@@ -180,8 +182,8 @@ const istanbulOpcodes: OpcodeList = {
   0x54: { name: 'SLOAD', fee: 800, isAsync: true },
 }
 
-export function getOpcodesForHF(hf: string) {
-  if (hf === 'istanbul') {
+export function getOpcodesForHF(common: Common) {
+  if (common.gteHardfork('istanbul')) {
     return { ...opcodes, ...istanbulOpcodes }
   } else {
     return { ...opcodes }
diff --git a/lib/index.ts b/lib/index.ts
@@ -110,7 +110,7 @@ export default class VM extends AsyncEventEmitter {
     }
 
     // Set list of opcodes based on HF
-    this._opcodes = getOpcodesForHF(this._common.hardfork()!)
+    this._opcodes = getOpcodesForHF(this._common)
 
     if (opts.stateManager) {
       this.stateManager = opts.stateManager
diff --git a/tests/api/index.js b/tests/api/index.js
@@ -43,7 +43,7 @@ tape('VM with default blockchain', (t) => {
   })
 
   t.test('should accept a common object as option', (st) => {
-    const common = new Common('mainnet')
+    const common = new Common('mainnet', 'istanbul')
 
     const vm = new VM({ common })
     st.equal(vm._common, common)
diff --git a/tests/api/opcodes.js b/tests/api/opcodes.js
@@ -0,0 +1,26 @@
+const tape = require('tape')
+const { getOpcodesForHF } = require('../../dist/evm/opcodes')
+const Common = require('ethereumjs-common').default
+
+const CHAINID = 0x46
+
+tape('getOpcodesForHF', (t) => {
+  t.test('shouldnt apply istanbul opcode changes for petersburg', (st) => {
+    const c = new Common('mainnet', 'petersburg')
+    const opcodes = getOpcodesForHF(c)
+    st.assert(opcodes[CHAINID] === undefined)
+    st.end()
+  })
+
+  t.test('should correctly apply istanbul opcode when hf >= istanbul', (st) => {
+    let c = new Common('mainnet', 'istanbul')
+    let opcodes = getOpcodesForHF(c)
+    st.equal(opcodes[CHAINID].name, 'CHAINID')
+
+    c = new Common('mainnet', 'muirGlacier')
+    opcodes = getOpcodesForHF(c)
+    st.equal(opcodes[CHAINID].name, 'CHAINID')
+
+    st.end()
+  })
+})

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ export default class VM extends AsyncEventEmitter {`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`// Set list of opcodes based on HF`
`113`		`- this._opcodes = getOpcodesForHF(this._common.hardfork()!)`
	`113`	`+ this._opcodes = getOpcodesForHF(this._common)`
`114`	`114`
`115`	`115`	`if (opts.stateManager) {`
`116`	`116`	`this.stateManager = opts.stateManager`