diff options
author | obscuren <geffobscura@gmail.com> | 2015-02-05 07:05:49 +0800 |
---|---|---|
committer | obscuren <geffobscura@gmail.com> | 2015-02-05 07:05:49 +0800 |
commit | 292f7ada8ea4f709ef90b2c20888cdbfbf7b06c6 (patch) | |
tree | 4b4df7e821fcb3f5ba3309f6d250dce98b6bba97 /vm/vm.go | |
parent | 65158d39b0632226c168b9a3415365ca8f072cbf (diff) | |
parent | 7c278d6ac20e7f34816f02d6db7f8aeb5d8ebc94 (diff) | |
download | go-tangerine-292f7ada8ea4f709ef90b2c20888cdbfbf7b06c6.tar go-tangerine-292f7ada8ea4f709ef90b2c20888cdbfbf7b06c6.tar.gz go-tangerine-292f7ada8ea4f709ef90b2c20888cdbfbf7b06c6.tar.bz2 go-tangerine-292f7ada8ea4f709ef90b2c20888cdbfbf7b06c6.tar.lz go-tangerine-292f7ada8ea4f709ef90b2c20888cdbfbf7b06c6.tar.xz go-tangerine-292f7ada8ea4f709ef90b2c20888cdbfbf7b06c6.tar.zst go-tangerine-292f7ada8ea4f709ef90b2c20888cdbfbf7b06c6.zip |
Merge branch 'develop' into miner
Diffstat (limited to 'vm/vm.go')
-rw-r--r-- | vm/vm.go | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -510,7 +510,7 @@ func (self *Vm) Run(me, caller ContextRef, code []byte, value, gas, price *big.I case GASPRICE: stack.Push(context.Price) - self.Printf(" => %v", context.Price) + self.Printf(" => %x", context.Price) // 0x40 range case BLOCKHASH: @@ -643,6 +643,8 @@ func (self *Vm) Run(me, caller ContextRef, code []byte, value, gas, price *big.I stack.Push(big.NewInt(int64(mem.Len()))) case GAS: stack.Push(context.Gas) + + self.Printf(" => %x", context.Gas) // 0x60 range case CREATE: @@ -653,6 +655,7 @@ func (self *Vm) Run(me, caller ContextRef, code []byte, value, gas, price *big.I gas = new(big.Int).Set(context.Gas) addr []byte ) + self.Endl() context.UseGas(context.Gas) ret, suberr, ref := self.env.Create(context, nil, input, gas, price, value) @@ -673,7 +676,6 @@ func (self *Vm) Run(me, caller ContextRef, code []byte, value, gas, price *big.I stack.Push(ethutil.BigD(addr)) - self.Printf(" (*) %x", addr) } // Debug hook |