core/vm: Allow using EVMC also as an EVM

chfast · chfast · commit 3f221d6882bc · 2018-10-26T13:50:54.000+02:00
diff --git a/core/vm/evm.go b/core/vm/evm.go
@@ -147,8 +147,12 @@ func NewEVM(ctx Context, statedb StateDB, chainConfig *params.ChainConfig, vmCon
 		}
 	}
 
-	// vmConfig.EVMInterpreter will be used by EVM-C, it won't be checked here
-	// as we always want to have the built-in EVM as the failover option.
+	if vmConfig.EVMInterpreter != "" {
+		// Create custom EVM.
+		evm.interpreters = append(evm.interpreters, NewEVMC(vmConfig.EVMInterpreter, evm))
+	}
+
+	// Keep the built-in EVM as the failover option.
 	evm.interpreters = append(evm.interpreters, NewEVMInterpreter(evm, vmConfig))
 
 	return evm

Original file line number	Diff line number	Diff line change
`@@ -147,8 +147,12 @@ func NewEVM(ctx Context, statedb StateDB, chainConfig *params.ChainConfig, vmCon`
`147`	`147`	`}`
`148`	`148`	`}`
`149`	`149`
`150`		`- // vmConfig.EVMInterpreter will be used by EVM-C, it won't be checked here`
`151`		`- // as we always want to have the built-in EVM as the failover option.`
	`150`	`+ if vmConfig.EVMInterpreter != "" {`
	`151`	`+ // Create custom EVM.`
	`152`	`+ evm.interpreters = append(evm.interpreters, NewEVMC(vmConfig.EVMInterpreter, evm))`
	`153`	`+ }`
	`154`	`+`
	`155`	`+ // Keep the built-in EVM as the failover option.`
`152`	`156`	`evm.interpreters = append(evm.interpreters, NewEVMInterpreter(evm, vmConfig))`
`153`	`157`
`154`	`158`	`return evm`