From d30571a7a84de5a1a3287e764210a3803d7a307f Mon Sep 17 00:00:00 2001 From: obscuren Date: Mon, 10 Nov 2014 11:47:37 +0100 Subject: Added VM testing tool --- cmd/evm/main.go | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100644 cmd/evm/main.go (limited to 'cmd/evm/main.go') diff --git a/cmd/evm/main.go b/cmd/evm/main.go new file mode 100644 index 000000000..984fd6c57 --- /dev/null +++ b/cmd/evm/main.go @@ -0,0 +1,109 @@ +/* + This file is part of go-ethereum + + go-ethereum is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + go-ethereum is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with go-ethereum. If not, see . +*/ +/** + * @authors + * Jeffrey Wilcke + * @date 2014 + * + */ + +package main + +import ( + "flag" + "fmt" + "log" + "math/big" + "os" + "runtime" + "time" + + "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" +) + +var ( + code = flag.String("code", "", "evm code") + loglevel = flag.Int("log", 4, "log level") + gas = flag.String("gas", "1000000", "gas amount") + price = flag.String("price", "0", "gas price") + dump = flag.Bool("dump", false, "dump state after run") +) + +func perr(v ...interface{}) { + fmt.Println(v...) + //os.Exit(1) +} + +func main() { + flag.Parse() + + logger.AddLogSystem(logger.NewStdLogSystem(os.Stdout, log.LstdFlags, logger.LogLevel(*loglevel))) + + ethutil.ReadConfig(".ethtest", "/tmp/evm", "") + + stateObject := state.NewStateObject([]byte("evmuser")) + closure := vm.NewClosure(nil, stateObject, stateObject, ethutil.Hex2Bytes(*code), ethutil.Big(*gas), ethutil.Big(*price)) + + tstart := time.Now() + + ret, _, e := closure.Call(vm.New(NewVmEnv(), vm.DebugVmTy), nil) + + logger.Flush() + if e != nil { + perr(e) + } + + var mem runtime.MemStats + runtime.ReadMemStats(&mem) + fmt.Printf("vm took %v\n", time.Since(tstart)) + fmt.Printf(`alloc: %d +tot alloc: %d +no. malloc: %d +heap alloc: %d +heap objs: %d +num gc: %d +`, mem.Alloc, mem.TotalAlloc, mem.Mallocs, mem.HeapAlloc, mem.HeapObjects, mem.NumGC) + + fmt.Printf("%x\n", ret) +} + +type VmEnv struct { + state *state.State +} + +func NewVmEnv() *VmEnv { + return &VmEnv{state.New(trie.New(nil, ""))} +} + +func (VmEnv) Origin() []byte { return nil } +func (VmEnv) BlockNumber() *big.Int { return nil } +func (VmEnv) BlockHash() []byte { return nil } +func (VmEnv) PrevHash() []byte { return nil } +func (VmEnv) Coinbase() []byte { return nil } +func (VmEnv) Time() int64 { return 0 } +func (VmEnv) GasLimit() *big.Int { return nil } +func (VmEnv) Difficulty() *big.Int { return nil } +func (VmEnv) Value() *big.Int { return nil } +func (self *VmEnv) State() *state.State { return self.state } +func (VmEnv) AddLog(state.Log) {} +func (VmEnv) Transfer(from, to vm.Account, amount *big.Int) error { + return nil +} -- cgit v1.2.3 From ebb7db263ff219eaaacaa2d74d42f69fcd396645 Mon Sep 17 00:00:00 2001 From: obscuren Date: Mon, 10 Nov 2014 12:42:16 +0100 Subject: Added dumps --- cmd/evm/main.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'cmd/evm/main.go') diff --git a/cmd/evm/main.go b/cmd/evm/main.go index 984fd6c57..aaff5c796 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -32,6 +32,7 @@ import ( "runtime" "time" + "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/state" @@ -64,13 +65,18 @@ func main() { tstart := time.Now() - ret, _, e := closure.Call(vm.New(NewVmEnv(), vm.DebugVmTy), nil) + env := NewVmEnv() + ret, _, e := closure.Call(vm.New(env, vm.DebugVmTy), nil) logger.Flush() if e != nil { perr(e) } + if *dump { + fmt.Println(string(env.state.Dump())) + } + var mem runtime.MemStats runtime.ReadMemStats(&mem) fmt.Printf("vm took %v\n", time.Since(tstart)) @@ -90,7 +96,8 @@ type VmEnv struct { } func NewVmEnv() *VmEnv { - return &VmEnv{state.New(trie.New(nil, ""))} + db, _ := ethdb.NewMemDatabase() + return &VmEnv{state.New(trie.New(db, ""))} } func (VmEnv) Origin() []byte { return nil } -- cgit v1.2.3 From ad0acb5762669aac8d39bd65c0c5df23efbb2d9e Mon Sep 17 00:00:00 2001 From: obscuren Date: Mon, 10 Nov 2014 13:27:24 +0100 Subject: Moved messages eventing to chain manager --- cmd/evm/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmd/evm/main.go') diff --git a/cmd/evm/main.go b/cmd/evm/main.go index aaff5c796..0cc0af62a 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -58,7 +58,7 @@ func main() { logger.AddLogSystem(logger.NewStdLogSystem(os.Stdout, log.LstdFlags, logger.LogLevel(*loglevel))) - ethutil.ReadConfig(".ethtest", "/tmp/evm", "") + ethutil.ReadConfig("/tm/evmtest", "/tmp/evm", "") stateObject := state.NewStateObject([]byte("evmuser")) closure := vm.NewClosure(nil, stateObject, stateObject, ethutil.Hex2Bytes(*code), ethutil.Big(*gas), ethutil.Big(*price)) -- cgit v1.2.3 From 6c9e503eb8d41d331d6a74e69539a06590072190 Mon Sep 17 00:00:00 2001 From: obscuren Date: Tue, 11 Nov 2014 22:51:26 +0100 Subject: Removed all implicit logging. Fixed gas issues and jump errors --- cmd/evm/main.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'cmd/evm/main.go') diff --git a/cmd/evm/main.go b/cmd/evm/main.go index 0cc0af62a..2b4d47684 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -46,6 +46,7 @@ var ( gas = flag.String("gas", "1000000", "gas amount") price = flag.String("price", "0", "gas price") dump = flag.Bool("dump", false, "dump state after run") + data = flag.String("data", "", "data") ) func perr(v ...interface{}) { @@ -66,7 +67,7 @@ func main() { tstart := time.Now() env := NewVmEnv() - ret, _, e := closure.Call(vm.New(env, vm.DebugVmTy), nil) + ret, _, e := closure.Call(vm.New(env, vm.DebugVmTy), ethutil.Hex2Bytes(*data)) logger.Flush() if e != nil { @@ -110,7 +111,7 @@ func (VmEnv) GasLimit() *big.Int { return nil } func (VmEnv) Difficulty() *big.Int { return nil } func (VmEnv) Value() *big.Int { return nil } func (self *VmEnv) State() *state.State { return self.state } -func (VmEnv) AddLog(state.Log) {} +func (VmEnv) AddLog(*state.Log) {} func (VmEnv) Transfer(from, to vm.Account, amount *big.Int) error { return nil } -- cgit v1.2.3 From 3664cd58e3631fccf4d9aba1932e0bb63ad442a6 Mon Sep 17 00:00:00 2001 From: obscuren Date: Thu, 4 Dec 2014 11:30:41 +0100 Subject: Updated testing tools --- cmd/evm/main.go | 90 +++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 68 insertions(+), 22 deletions(-) (limited to 'cmd/evm/main.go') diff --git a/cmd/evm/main.go b/cmd/evm/main.go index 2b4d47684..fb1be3caa 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -32,6 +32,8 @@ import ( "runtime" "time" + "github.com/ethereum/go-ethereum/core" + "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/logger" @@ -45,6 +47,7 @@ var ( loglevel = flag.Int("log", 4, "log level") gas = flag.String("gas", "1000000", "gas amount") price = flag.String("price", "0", "gas price") + value = flag.String("value", "0", "tx value") dump = flag.Bool("dump", false, "dump state after run") data = flag.String("data", "", "data") ) @@ -61,13 +64,17 @@ func main() { ethutil.ReadConfig("/tm/evmtest", "/tmp/evm", "") - stateObject := state.NewStateObject([]byte("evmuser")) - closure := vm.NewClosure(nil, stateObject, stateObject, ethutil.Hex2Bytes(*code), ethutil.Big(*gas), ethutil.Big(*price)) + db, _ := ethdb.NewMemDatabase() + statedb := state.New(trie.New(db, "")) + sender := statedb.NewStateObject([]byte("sender")) + receiver := statedb.NewStateObject([]byte("receiver")) + receiver.SetCode([]byte(*code)) + + vmenv := NewEnv(statedb, []byte("evmuser"), ethutil.Big(*value)) tstart := time.Now() - env := NewVmEnv() - ret, _, e := closure.Call(vm.New(env, vm.DebugVmTy), ethutil.Hex2Bytes(*data)) + ret, e := vmenv.Call(sender, receiver.Address(), ethutil.Hex2Bytes(*data), ethutil.Big(*gas), ethutil.Big(*price), ethutil.Big(*value)) logger.Flush() if e != nil { @@ -75,7 +82,7 @@ func main() { } if *dump { - fmt.Println(string(env.state.Dump())) + fmt.Println(string(statedb.Dump())) } var mem runtime.MemStats @@ -92,26 +99,65 @@ num gc: %d fmt.Printf("%x\n", ret) } -type VmEnv struct { +type VMEnv struct { state *state.State + block *types.Block + + transactor []byte + value *big.Int + + depth int + Gas *big.Int + time int64 } -func NewVmEnv() *VmEnv { - db, _ := ethdb.NewMemDatabase() - return &VmEnv{state.New(trie.New(db, ""))} +func NewEnv(state *state.State, transactor []byte, value *big.Int) *VMEnv { + return &VMEnv{ + state: state, + transactor: transactor, + value: value, + time: time.Now().Unix(), + } +} + +func (self *VMEnv) State() *state.State { return self.state } +func (self *VMEnv) Origin() []byte { return self.transactor } +func (self *VMEnv) BlockNumber() *big.Int { return ethutil.Big0 } +func (self *VMEnv) PrevHash() []byte { return make([]byte, 32) } +func (self *VMEnv) Coinbase() []byte { return self.transactor } +func (self *VMEnv) Time() int64 { return self.time } +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) Depth() int { return self.depth } +func (self *VMEnv) SetDepth(i int) { self.depth = i } +func (self *VMEnv) AddLog(log *state.Log) { + self.state.AddLog(log) +} +func (self *VMEnv) Transfer(from, to vm.Account, amount *big.Int) error { + return vm.Transfer(from, to, amount) +} + +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) +} + +func (self *VMEnv) Call(caller vm.ClosureRef, 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) { + exe := self.vm(caller.Address(), data, gas, price, value) + return exe.Call(addr, caller) } -func (VmEnv) Origin() []byte { return nil } -func (VmEnv) BlockNumber() *big.Int { return nil } -func (VmEnv) BlockHash() []byte { return nil } -func (VmEnv) PrevHash() []byte { return nil } -func (VmEnv) Coinbase() []byte { return nil } -func (VmEnv) Time() int64 { return 0 } -func (VmEnv) GasLimit() *big.Int { return nil } -func (VmEnv) Difficulty() *big.Int { return nil } -func (VmEnv) Value() *big.Int { return nil } -func (self *VmEnv) State() *state.State { return self.state } -func (VmEnv) AddLog(*state.Log) {} -func (VmEnv) Transfer(from, to vm.Account, amount *big.Int) error { - return nil +func (self *VMEnv) Create(caller vm.ClosureRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error, vm.ClosureRef) { + exe := self.vm(addr, data, gas, price, value) + return exe.Create(caller) } -- cgit v1.2.3 From bff5999efaaa0aa7a2b6518b58d489ad4be9e4ff Mon Sep 17 00:00:00 2001 From: obscuren Date: Thu, 4 Dec 2014 12:09:22 +0100 Subject: sort tests for evm --- cmd/evm/main.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'cmd/evm/main.go') diff --git a/cmd/evm/main.go b/cmd/evm/main.go index fb1be3caa..ade4fa611 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -45,7 +45,7 @@ import ( var ( code = flag.String("code", "", "evm code") loglevel = flag.Int("log", 4, "log level") - gas = flag.String("gas", "1000000", "gas amount") + gas = flag.String("gas", "1000000000", "gas amount") price = flag.String("price", "0", "gas price") value = flag.String("value", "0", "tx value") dump = flag.Bool("dump", false, "dump state after run") @@ -68,7 +68,8 @@ func main() { statedb := state.New(trie.New(db, "")) sender := statedb.NewStateObject([]byte("sender")) receiver := statedb.NewStateObject([]byte("receiver")) - receiver.SetCode([]byte(*code)) + //receiver.SetCode([]byte(*code)) + receiver.SetCode(ethutil.Hex2Bytes(*code)) vmenv := NewEnv(statedb, []byte("evmuser"), ethutil.Big(*value)) @@ -100,7 +101,7 @@ num gc: %d } type VMEnv struct { - state *state.State + state *state.StateDB block *types.Block transactor []byte @@ -111,7 +112,7 @@ type VMEnv struct { time int64 } -func NewEnv(state *state.State, transactor []byte, value *big.Int) *VMEnv { +func NewEnv(state *state.StateDB, transactor []byte, value *big.Int) *VMEnv { return &VMEnv{ state: state, transactor: transactor, @@ -120,7 +121,7 @@ func NewEnv(state *state.State, transactor []byte, value *big.Int) *VMEnv { } } -func (self *VMEnv) State() *state.State { return self.state } +func (self *VMEnv) State() *state.StateDB { return self.state } func (self *VMEnv) Origin() []byte { return self.transactor } func (self *VMEnv) BlockNumber() *big.Int { return ethutil.Big0 } func (self *VMEnv) PrevHash() []byte { return make([]byte, 32) } @@ -130,7 +131,7 @@ 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) Depth() int { return self.depth } +func (self *VMEnv) Depth() int { return 0 } func (self *VMEnv) SetDepth(i int) { self.depth = i } func (self *VMEnv) AddLog(log *state.Log) { self.state.AddLog(log) -- cgit v1.2.3 From 3043b233ea4df9b630638d75f3589b94653ccfa9 Mon Sep 17 00:00:00 2001 From: obscuren Date: Thu, 4 Dec 2014 12:35:23 +0100 Subject: Log is now interface --- cmd/evm/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmd/evm/main.go') diff --git a/cmd/evm/main.go b/cmd/evm/main.go index ade4fa611..1e6c807b1 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -62,7 +62,7 @@ func main() { logger.AddLogSystem(logger.NewStdLogSystem(os.Stdout, log.LstdFlags, logger.LogLevel(*loglevel))) - ethutil.ReadConfig("/tm/evmtest", "/tmp/evm", "") + ethutil.ReadConfig("/tmp/evmtest", "/tmp/evm", "") db, _ := ethdb.NewMemDatabase() statedb := state.New(trie.New(db, "")) -- cgit v1.2.3 From 1fb84d3c5f486ef0d42a21f3cd8416d6ef211604 Mon Sep 17 00:00:00 2001 From: obscuren Date: Wed, 10 Dec 2014 10:57:19 +0100 Subject: Fixed tests --- cmd/evm/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmd/evm/main.go') diff --git a/cmd/evm/main.go b/cmd/evm/main.go index 1e6c807b1..c6c986a04 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -133,7 +133,7 @@ func (self *VMEnv) Value() *big.Int { return self.value } func (self *VMEnv) GasLimit() *big.Int { return big.NewInt(1000000000) } func (self *VMEnv) Depth() int { return 0 } func (self *VMEnv) SetDepth(i int) { self.depth = i } -func (self *VMEnv) AddLog(log *state.Log) { +func (self *VMEnv) AddLog(log state.Log) { self.state.AddLog(log) } func (self *VMEnv) Transfer(from, to vm.Account, amount *big.Int) error { -- cgit v1.2.3