diff options
| author | obscuren <geffobscura@gmail.com> | 2014-03-31 06:22:50 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-03-31 06:22:50 +0800 |
| commit | 97b98b1250890977ea622af378fe864e4620e313 (patch) | |
| tree | f9a51c45028d227e7d5cec55d54927e18dab349a /ethereal | |
| parent | ebbc5e7cb8b3886c8557f9f8623113f52f7f5e4a (diff) | |
| download | go-tangerine-97b98b1250890977ea622af378fe864e4620e313.tar go-tangerine-97b98b1250890977ea622af378fe864e4620e313.tar.gz go-tangerine-97b98b1250890977ea622af378fe864e4620e313.tar.bz2 go-tangerine-97b98b1250890977ea622af378fe864e4620e313.tar.lz go-tangerine-97b98b1250890977ea622af378fe864e4620e313.tar.xz go-tangerine-97b98b1250890977ea622af378fe864e4620e313.tar.zst go-tangerine-97b98b1250890977ea622af378fe864e4620e313.zip | |
Fixed an issue with sending gas to a contract
Diffstat (limited to 'ethereal')
| -rw-r--r-- | ethereal/assets/qml/wallet.qml | 2 | ||||
| -rw-r--r-- | ethereal/ui/library.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ethereal/assets/qml/wallet.qml b/ethereal/assets/qml/wallet.qml index f6b31f0fd..9093e3ca8 100644 --- a/ethereal/assets/qml/wallet.qml +++ b/ethereal/assets/qml/wallet.qml @@ -198,7 +198,7 @@ ApplicationWindow { id: txButton text: "Send" onClicked: { - this.enabled = false + //this.enabled = false console.log(eth.createTx(txRecipient.text, txValue.text, txGas.text, txGasPrice.text, codeView.text)) } } diff --git a/ethereal/ui/library.go b/ethereal/ui/library.go index 692ec454c..6f8cb6f65 100644 --- a/ethereal/ui/library.go +++ b/ethereal/ui/library.go @@ -30,7 +30,7 @@ func (lib *EthLib) CreateTx(recipient, valueStr, gasStr, gasPriceStr, data strin keyPair := ethutil.Config.Db.GetKeys()[0] value := ethutil.Big(valueStr) - gas := ethutil.Big(valueStr) + gas := ethutil.Big(gasStr) gasPrice := ethutil.Big(gasPriceStr) var tx *ethchain.Transaction // Compile and assemble the given data @@ -40,7 +40,7 @@ func (lib *EthLib) CreateTx(recipient, valueStr, gasStr, gasPriceStr, data strin return err.Error() } - code := ethutil.Assemble(asm) + code := ethutil.Assemble(asm...) tx = ethchain.NewContractCreationTx(value, gasPrice, code) } else { tx = ethchain.NewTransactionMessage(hash, value, gasPrice, gas, []string{}) |