aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
Diffstat (limited to 'cmd')
-rw-r--r--cmd/evm/main.go5
-rw-r--r--cmd/mist/main.go2
-rw-r--r--cmd/utils/vm_env.go2
3 files changed, 5 insertions, 4 deletions
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
}
diff --git a/cmd/mist/main.go b/cmd/mist/main.go
index 457773c14..ae7101f14 100644
--- a/cmd/mist/main.go
+++ b/cmd/mist/main.go
@@ -29,7 +29,7 @@ import (
const (
ClientIdentifier = "Mist"
- Version = "0.7.3"
+ Version = "0.7.4"
)
var ethereum *eth.Ethereum
diff --git a/cmd/utils/vm_env.go b/cmd/utils/vm_env.go
index b06611cdd..e201627e2 100644
--- a/cmd/utils/vm_env.go
+++ b/cmd/utils/vm_env.go
@@ -35,7 +35,7 @@ func (self *VMEnv) BlockHash() []byte { return self.block.Hash() }
func (self *VMEnv) Value() *big.Int { return self.value }
func (self *VMEnv) State() *state.State { return self.state }
func (self *VMEnv) GasLimit() *big.Int { return self.block.GasLimit }
-func (self *VMEnv) AddLog(state.Log) {}
+func (self *VMEnv) AddLog(*state.Log) {}
func (self *VMEnv) Transfer(from, to vm.Account, amount *big.Int) error {
return vm.Transfer(from, to, amount)
}