diff options
| author | obscuren <geffobscura@gmail.com> | 2014-06-26 18:10:11 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-06-26 18:10:11 +0800 |
| commit | b89076faa2748a41031c4bc33bbdeba3e2effd01 (patch) | |
| tree | c4fd86c0f45fb9b1cbbcf4fa0c894af8b3ecf1c9 /ethereal | |
| parent | b3367ec0e3e69694481cccd9335a63d2c559a543 (diff) | |
| download | go-tangerine-b89076faa2748a41031c4bc33bbdeba3e2effd01.tar go-tangerine-b89076faa2748a41031c4bc33bbdeba3e2effd01.tar.gz go-tangerine-b89076faa2748a41031c4bc33bbdeba3e2effd01.tar.bz2 go-tangerine-b89076faa2748a41031c4bc33bbdeba3e2effd01.tar.lz go-tangerine-b89076faa2748a41031c4bc33bbdeba3e2effd01.tar.xz go-tangerine-b89076faa2748a41031c4bc33bbdeba3e2effd01.tar.zst go-tangerine-b89076faa2748a41031c4bc33bbdeba3e2effd01.zip | |
Added amount to contract during debugging
Diffstat (limited to 'ethereal')
| -rw-r--r-- | ethereal/assets/debugger/debugger.qml | 6 | ||||
| -rw-r--r-- | ethereal/ui/debugger.go | 14 |
2 files changed, 12 insertions, 8 deletions
diff --git a/ethereal/assets/debugger/debugger.qml b/ethereal/assets/debugger/debugger.qml index 6f53697c9..d54c79523 100644 --- a/ethereal/assets/debugger/debugger.qml +++ b/ethereal/assets/debugger/debugger.qml @@ -10,9 +10,9 @@ ApplicationWindow { visible: false title: "IceCREAM" minimumWidth: 1280 - minimumHeight: 900 + minimumHeight: 700 width: 1290 - height: 900 + height: 700 property alias codeText: codeEditor.text property alias dataText: rawDataField.text @@ -56,7 +56,7 @@ ApplicationWindow { Rectangle { color: "#00000000" - height: 500 + height: 330 anchors.left: parent.left anchors.right: parent.right diff --git a/ethereal/ui/debugger.go b/ethereal/ui/debugger.go index f49741e09..85dd45563 100644 --- a/ethereal/ui/debugger.go +++ b/ethereal/ui/debugger.go @@ -96,16 +96,20 @@ func (self *DebuggerWindow) Debug(valueStr, gasStr, gasPriceStr, scriptStr, data self.win.Root().Call("setAsm", str) } - gas := ethutil.Big(gasStr) - gasPrice := ethutil.Big(gasPriceStr) - // Contract addr as test address - keyPair := ethutil.GetKeyRing().Get(0) - callerTx := ethchain.NewContractCreationTx(ethutil.Big(valueStr), gas, gasPrice, script) + var ( + gas = ethutil.Big(gasStr) + gasPrice = ethutil.Big(gasPriceStr) + value = ethutil.Big(valueStr) + // Contract addr as test address + keyPair = ethutil.GetKeyRing().Get(0) + callerTx = ethchain.NewContractCreationTx(ethutil.Big(valueStr), gas, gasPrice, script) + ) callerTx.Sign(keyPair.PrivateKey) state := self.lib.eth.BlockChain().CurrentBlock.State() account := self.lib.eth.StateManager().TransState().GetAccount(keyPair.Address()) contract := ethchain.MakeContract(callerTx, state) + contract.Amount = value callerClosure := ethchain.NewClosure(account, contract, script, state, gas, gasPrice) block := self.lib.eth.BlockChain().CurrentBlock |