evmc: Add InitEVMC() for EVMC initialization at startup

cmd/evm/runner.go

@@ -183,6 +183,8 @@ func runCmd(ctx *cli.Context) error {
 		},
 	}
 
+	vm.InitEVMC(runtimeConfig.EVMConfig.EVMInterpreter, runtimeConfig.EVMConfig.EWASMInterpreter)
+
 	if cpuProfilePath := ctx.GlobalString(CPUProfileFlag.Name); cpuProfilePath != "" {
 		f, err := os.Create(cpuProfilePath)
 		if err != nil {

cmd/utils/flags.go

@@ -1502,6 +1502,8 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *eth.Config) {
 			cfg.Miner.GasPrice = big.NewInt(1)
 		}
 	}
+
+	vm.InitEVMC(cfg.EVMInterpreter, cfg.EWASMInterpreter)
 }
 
 // SetDashboardConfig applies dashboard related command line flags to the config.

core/vm/evmc.go

@@ -53,6 +53,16 @@ var (
 	ewasmModule EVMCModule
 )
 
+// InitEVMC initializes the EVMC modules.
+func InitEVMC(evmConfig string, ewasmConfig string) {
+	if evmConfig != "" {
+		initEVMC(&evmModule, evmc.CapabilityEVM1, evmConfig)
+	}
+	if ewasmConfig != "" {
+		initEVMC(&ewasmModule, evmc.CapabilityEWASM, ewasmConfig)
+	}
+}
+
 func initEVMC(module *EVMCModule, cap evmc.Capability, config string) {
 	module.once.Do(func() {
 		options := strings.Split(config, ",")
@@ -102,8 +112,6 @@ func NewEVMC(cap evmc.Capability, config string, env *EVM) *EVMC {
 		panic(fmt.Errorf("EVMC: Unknown capability %d", cap))
 	}
 
-	initEVMC(module, cap, config)
-
 	return &EVMC{module.instance, env, cap, false}
 }
 

tests/state_test.go

@@ -77,6 +77,7 @@ var testVMConfig = func() vm.Config {
 	flag.StringVar(&vmconfig.EVMInterpreter, utils.EVMInterpreterFlag.Name, utils.EVMInterpreterFlag.Value, utils.EVMInterpreterFlag.Usage)
 	flag.StringVar(&vmconfig.EWASMInterpreter, utils.EWASMInterpreterFlag.Name, utils.EWASMInterpreterFlag.Value, utils.EWASMInterpreterFlag.Usage)
 	flag.Parse()
+	vm.InitEVMC(vmconfig.EVMInterpreter, vmconfig.EWASMInterpreter)
 	return vmconfig
 }()