aboutsummaryrefslogtreecommitdiffstats
path: root/ethereal
diff options
context:
space:
mode:
Diffstat (limited to 'ethereal')
-rw-r--r--ethereal/assets/qml/wallet.qml2
-rw-r--r--ethereal/ui/library.go4
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{})