Update logic for checking for constantinople in opFns.js to handle multiple supported forks

danjm · danjm · commit ceb17876507b · 2019-02-06T09:57:05.000-03:30
diff --git a/lib/vm/opFns.js b/lib/vm/opFns.js
@@ -1082,15 +1082,15 @@ function isCreateOpCode (opName) {
 }
 
 function getContractStorage (runState, address, key, cb) {
-  if (runState._common.activeHardfork() === 'constantinople') {
+  if (runState._common.hardfork() === 'constantinople') {
     runState.storageReader.getContractStorage(address, key, cb)
   } else {
     runState.stateManager.getContractStorage(address, key, cb)
   }
 }
 
 function updateSstoreGas (runState, found, value) {
-  if (runState._common.activeHardfork() === 'constantinople') {
+  if (runState._common.hardfork() === 'constantinople') {
     var original = found.original
     var current = found.current
     if (current.equals(value)) {

Original file line number	Diff line number	Diff line change
`@@ -1082,15 +1082,15 @@ function isCreateOpCode (opName) {`
`1082`	`1082`	`}`
`1083`	`1083`
`1084`	`1084`	`function getContractStorage (runState, address, key, cb) {`
`1085`		`- if (runState._common.activeHardfork() === 'constantinople') {`
	`1085`	`+ if (runState._common.hardfork() === 'constantinople') {`
`1086`	`1086`	`runState.storageReader.getContractStorage(address, key, cb)`
`1087`	`1087`	`} else {`
`1088`	`1088`	`runState.stateManager.getContractStorage(address, key, cb)`
`1089`	`1089`	`}`
`1090`	`1090`	`}`
`1091`	`1091`
`1092`	`1092`	`function updateSstoreGas (runState, found, value) {`
`1093`		`- if (runState._common.activeHardfork() === 'constantinople') {`
	`1093`	`+ if (runState._common.hardfork() === 'constantinople') {`
`1094`	`1094`	`var original = found.original`
`1095`	`1095`	`var current = found.current`
`1096`	`1096`	`if (current.equals(value)) {`