forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 10:22:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

core/vm: Remove EnableWagon after merge

Browse source 
Wagon should be enabled by default when having EWASMBlock set to 0.
This commit is contained in:
Guillaume Ballet 2018-10-05 12:33:23 +02:00
parent 8054399e1b
commit ae38665a35
4 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/ewasm/main.go
View file

@ -85,7 +85,7 @@ func runCmd(ctx *cli.Context) error {
contract := coreVM.NewContract(coreVM.AccountRef(callerAddr), coreVM.AccountRef(contractAddr), big.NewInt(100), gas) contract := coreVM.NewContract(coreVM.AccountRef(callerAddr), coreVM.AccountRef(contractAddr), big.NewInt(100), gas)
contract.Code = code contract.Code = code
evm := coreVM.NewEVM(coreVM.Context{}, statedb, &params.ChainConfig{}, coreVM.Config{EnableWagon: true}) evm := coreVM.NewEVM(coreVM.Context{}, statedb, &params.ChainConfig{}, coreVM.Config{})
// &ewasm.Contract{ // &ewasm.Contract{
// StateDB: statedb, // StateDB: statedb,
// Gas: 100, // Gas: 100,

5
core/vm/evm.go
View file

@ -140,7 +140,7 @@ func NewEVM(ctx Context, statedb StateDB, chainConfig *params.ChainConfig, vmCon
} }
if chainConfig.IsEWASM(ctx.BlockNumber) { if chainConfig.IsEWASM(ctx.BlockNumber) {
// to be implemented by EVM-C and Wagon PRs. // to be implemented by EVM-C.
// if vmConfig.EWASMInterpreter != "" { // if vmConfig.EWASMInterpreter != "" {
// extIntOpts := strings.Split(vmConfig.EWASMInterpreter, ":") // extIntOpts := strings.Split(vmConfig.EWASMInterpreter, ":")
// path := extIntOpts[0] // path := extIntOpts[0]
@ -150,9 +150,8 @@ func NewEVM(ctx Context, statedb StateDB, chainConfig *params.ChainConfig, vmCon
// } // }
// evm.interpreters = append(evm.interpreters, NewEVMVCInterpreter(evm, vmConfig, options)) // evm.interpreters = append(evm.interpreters, NewEVMVCInterpreter(evm, vmConfig, options))
// } else { // } else {
evm.interpreters = append(evm.interpreters, NewEWASMInterpreter(evm, vmConfig)) evm.interpreters = append(evm.interpreters, NewEWASMInterpreter(evm, vmConfig))
// } // }
panic("No supported ewasm interpreter yet.")
} }
// vmConfig.EVMInterpreter will be used by EVM-C, it won't be checked here // vmConfig.EVMInterpreter will be used by EVM-C, it won't be checked here

1
tests/ewasm_test.go
View file

@ -36,7 +36,6 @@ func TestEWASMVM(t *testing.T) {
t.Skip("constantinople not supported yet") t.Skip("constantinople not supported yet")
} }
withTrace(t, test.gasLimit(subtest), func(vmconfig vm.Config) error { withTrace(t, test.gasLimit(subtest), func(vmconfig vm.Config) error {
vmconfig.EnableWagon = true
_, err := test.Run(subtest, vmconfig) _, err := test.Run(subtest, vmconfig)
return st.checkFailure(t, name, err) return st.checkFailure(t, name, err)
}) })

1
tests/init.go
View file

@ -52,6 +52,7 @@ var Forks = map[string]*params.ChainConfig{
EIP158Block: big.NewInt(0), EIP158Block: big.NewInt(0),
DAOForkBlock: big.NewInt(0), DAOForkBlock: big.NewInt(0),
ByzantiumBlock: big.NewInt(0), ByzantiumBlock: big.NewInt(0),
EWASMBlock: big.NewInt(0),
}, },
"Constantinople": { "Constantinople": {
ChainID: big.NewInt(1), ChainID: big.NewInt(1),