diff options
| author | Ethan Buchman <ethan@coinculture.info> | 2015-02-18 08:25:18 +0800 |
|---|---|---|
| committer | Ethan Buchman <ethan@coinculture.info> | 2015-02-18 08:25:18 +0800 |
| commit | 2ba65f4fbaea49c1e0d99959b0331e09b153f931 (patch) | |
| tree | add8cabb05cd7fbf0ba4b4bbaf9460dacfc2082d /cmd/mist/debugger.go | |
| parent | 2da367a2bee84d74d1bb0ea1b42d4c22fae486dd (diff) | |
| parent | 60318c96d03bcaaf731802b1080a3d87cb482124 (diff) | |
| download | dexon-2ba65f4fbaea49c1e0d99959b0331e09b153f931.tar dexon-2ba65f4fbaea49c1e0d99959b0331e09b153f931.tar.gz dexon-2ba65f4fbaea49c1e0d99959b0331e09b153f931.tar.bz2 dexon-2ba65f4fbaea49c1e0d99959b0331e09b153f931.tar.lz dexon-2ba65f4fbaea49c1e0d99959b0331e09b153f931.tar.xz dexon-2ba65f4fbaea49c1e0d99959b0331e09b153f931.tar.zst dexon-2ba65f4fbaea49c1e0d99959b0331e09b153f931.zip | |
Merge branch 'develop' of https://github.com/ethereum/go-ethereum into develop
Diffstat (limited to 'cmd/mist/debugger.go')
| -rw-r--r-- | cmd/mist/debugger.go | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/cmd/mist/debugger.go b/cmd/mist/debugger.go index 58d8da7b2..c1ab2f3f1 100644 --- a/cmd/mist/debugger.go +++ b/cmd/mist/debugger.go @@ -29,10 +29,11 @@ import ( "github.com/ethereum/go-ethereum/cmd/utils" "github.com/ethereum/go-ethereum/core" + "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/vm" - "gopkg.in/qml.v1" + "github.com/obscuren/qml" ) type DebuggerWindow struct { @@ -154,14 +155,17 @@ func (self *DebuggerWindow) Debug(valueStr, gasStr, gasPriceStr, scriptStr, data block := self.lib.eth.ChainManager().CurrentBlock() - env := utils.NewEnv(self.lib.eth.ChainManager(), statedb, block, account.Address(), value) + msg := types.NewTransactionMessage(nil, value, gas, gasPrice, data) + env := core.NewEnv(statedb, self.lib.eth.ChainManager(), msg, block) self.Logf("callsize %d", len(script)) go func() { + pgas := new(big.Int).Set(gas) ret, err := env.Call(account, contract.Address(), data, gas, gasPrice, ethutil.Big0) - //ret, g, err := callerClosure.Call(evm, data) - tot := new(big.Int).Mul(env.Gas, gasPrice) - self.Logf("gas usage %v total price = %v (%v)", env.Gas, tot, ethutil.CurrencyToString(tot)) + + rgas := new(big.Int).Sub(pgas, gas) + tot := new(big.Int).Mul(rgas, gasPrice) + self.Logf("gas usage %v total price = %v (%v)", rgas, tot, ethutil.CurrencyToString(tot)) if err != nil { self.Logln("exited with errors:", err) } else { |