diff options
| author | obscuren <geffobscura@gmail.com> | 2015-01-02 17:30:27 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-01-02 17:30:27 +0800 |
| commit | 0fb1bcd32192b8bf05a328b955a08da4cefe0180 (patch) | |
| tree | 67460b927eb41b2876e8e6b7eb9dece494dbd088 /cmd/evm | |
| parent | 8da07e91e40c1d1bb43763b7e959ae92e5770af2 (diff) | |
| parent | a4dc12f12c7a06f5e28d5b1e760249875ef7a8c5 (diff) | |
| download | go-tangerine-0fb1bcd32192b8bf05a328b955a08da4cefe0180.tar go-tangerine-0fb1bcd32192b8bf05a328b955a08da4cefe0180.tar.gz go-tangerine-0fb1bcd32192b8bf05a328b955a08da4cefe0180.tar.bz2 go-tangerine-0fb1bcd32192b8bf05a328b955a08da4cefe0180.tar.lz go-tangerine-0fb1bcd32192b8bf05a328b955a08da4cefe0180.tar.xz go-tangerine-0fb1bcd32192b8bf05a328b955a08da4cefe0180.tar.zst go-tangerine-0fb1bcd32192b8bf05a328b955a08da4cefe0180.zip | |
Merge branch 'poc8' into docbranch
Diffstat (limited to 'cmd/evm')
| -rw-r--r-- | cmd/evm/main.go | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/cmd/evm/main.go b/cmd/evm/main.go index c6c986a04..66bba7289 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -37,8 +37,8 @@ import ( "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/logger" + "github.com/ethereum/go-ethereum/ptrie" "github.com/ethereum/go-ethereum/state" - "github.com/ethereum/go-ethereum/trie" "github.com/ethereum/go-ethereum/vm" ) @@ -65,7 +65,7 @@ func main() { ethutil.ReadConfig("/tmp/evmtest", "/tmp/evm", "") db, _ := ethdb.NewMemDatabase() - statedb := state.New(trie.New(db, "")) + statedb := state.New(ptrie.New(nil, db)) sender := statedb.NewStateObject([]byte("sender")) receiver := statedb.NewStateObject([]byte("receiver")) //receiver.SetCode([]byte(*code)) @@ -141,9 +141,7 @@ func (self *VMEnv) Transfer(from, to vm.Account, amount *big.Int) error { } func (self *VMEnv) vm(addr, data []byte, gas, price, value *big.Int) *core.Execution { - evm := vm.New(self, vm.DebugVmTy) - - return core.NewExecution(evm, addr, data, gas, price, value) + return core.NewExecution(self, addr, data, gas, price, value) } func (self *VMEnv) Call(caller vm.ClosureRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error) { |