core/vm: Allow using EVMC also as an EVM

ethereum · Oct 26, 2018 · 3f221d6 · 3f221d6
1 parent b2d49c7
commit 3f221d6
Showing 1 changed file with 6 additions and 2 deletions.
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