diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-21 01:13:46 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-21 01:13:46 +0800 |
| commit | bd7ebbcd5b77ce4fdd471b44f0acda80f2b3ceca (patch) | |
| tree | 46ab5943fd5e26198067aeec4a44287452eb2a32 /cmd/evm | |
| parent | 771bfe9e78f9952002a71cccc8d41c8c544fdfcb (diff) | |
| parent | d586a633ff005ac01c9f1eb33552d147cf6c883e (diff) | |
| download | go-tangerine-bd7ebbcd5b77ce4fdd471b44f0acda80f2b3ceca.tar go-tangerine-bd7ebbcd5b77ce4fdd471b44f0acda80f2b3ceca.tar.gz go-tangerine-bd7ebbcd5b77ce4fdd471b44f0acda80f2b3ceca.tar.bz2 go-tangerine-bd7ebbcd5b77ce4fdd471b44f0acda80f2b3ceca.tar.lz go-tangerine-bd7ebbcd5b77ce4fdd471b44f0acda80f2b3ceca.tar.xz go-tangerine-bd7ebbcd5b77ce4fdd471b44f0acda80f2b3ceca.tar.zst go-tangerine-bd7ebbcd5b77ce4fdd471b44f0acda80f2b3ceca.zip | |
Merge branch 'release/0.9.0'
Diffstat (limited to 'cmd/evm')
| -rw-r--r-- | cmd/evm/main.go | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/cmd/evm/main.go b/cmd/evm/main.go index 2bdfdfa9f..432cbd001 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -17,8 +17,6 @@ /** * @authors * Jeffrey Wilcke <i@jev.io> - * @date 2014 - * */ package main @@ -38,7 +36,6 @@ import ( "github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/state" - "github.com/ethereum/go-ethereum/trie" "github.com/ethereum/go-ethereum/vm" ) @@ -65,7 +62,7 @@ func main() { ethutil.ReadConfig("/tmp/evmtest", "/tmp/evm", "") db, _ := ethdb.NewMemDatabase() - statedb := state.New(trie.New(db, "")) + statedb := state.New(nil, db) sender := statedb.NewStateObject([]byte("sender")) receiver := statedb.NewStateObject([]byte("receiver")) //receiver.SetCode([]byte(*code)) @@ -131,8 +128,15 @@ func (self *VMEnv) Difficulty() *big.Int { return ethutil.Big1 } func (self *VMEnv) BlockHash() []byte { return make([]byte, 32) } func (self *VMEnv) Value() *big.Int { return self.value } func (self *VMEnv) GasLimit() *big.Int { return big.NewInt(1000000000) } +func (self *VMEnv) VmType() vm.Type { return vm.StdVmTy } func (self *VMEnv) Depth() int { return 0 } func (self *VMEnv) SetDepth(i int) { self.depth = i } +func (self *VMEnv) GetHash(n uint64) []byte { + if self.block.Number().Cmp(big.NewInt(int64(n))) == 0 { + return self.block.Hash() + } + return nil +} func (self *VMEnv) AddLog(log state.Log) { self.state.AddLog(log) } @@ -144,19 +148,19 @@ func (self *VMEnv) vm(addr, data []byte, gas, price, value *big.Int) *core.Execu 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) { +func (self *VMEnv) Call(caller vm.ContextRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error) { exe := self.vm(addr, data, gas, price, value) ret, err := exe.Call(addr, caller) self.Gas = exe.Gas return ret, err } -func (self *VMEnv) CallCode(caller vm.ClosureRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error) { +func (self *VMEnv) CallCode(caller vm.ContextRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error) { exe := self.vm(caller.Address(), data, gas, price, value) return exe.Call(addr, caller) } -func (self *VMEnv) Create(caller vm.ClosureRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error, vm.ClosureRef) { +func (self *VMEnv) Create(caller vm.ContextRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error, vm.ContextRef) { exe := self.vm(addr, data, gas, price, value) return exe.Create(caller) } |