From f59f515defa5735c59b3bae8a44844678adf1a2d Mon Sep 17 00:00:00 2001 From: obscuren Date: Thu, 8 May 2014 18:24:28 +0200 Subject: Cleanup --- ethereal/assets/qml/newTransaction/_new_contract.qml | 2 +- ethereal/assets/qml/newTransaction/_simple_send.qml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'ethereal/assets/qml') diff --git a/ethereal/assets/qml/newTransaction/_new_contract.qml b/ethereal/assets/qml/newTransaction/_new_contract.qml index 0794d3dcd..f6ed77fb6 100644 --- a/ethereal/assets/qml/newTransaction/_new_contract.qml +++ b/ethereal/assets/qml/newTransaction/_new_contract.qml @@ -150,7 +150,7 @@ Component { text: "Send" onClicked: { //this.enabled = false - var res = eth.createTx(txFuelRecipient.text, txValue.text, txGas.text, txGasPrice.text, codeView.text) + var res = eth.create(txFuelRecipient.text, txValue.text, txGas.text, txGasPrice.text, codeView.text) if(res[1]) { txResult.text = "Your contract could not be send over the network:\n" txResult.text += res[1].error() diff --git a/ethereal/assets/qml/newTransaction/_simple_send.qml b/ethereal/assets/qml/newTransaction/_simple_send.qml index d460797ea..12420c15a 100644 --- a/ethereal/assets/qml/newTransaction/_simple_send.qml +++ b/ethereal/assets/qml/newTransaction/_simple_send.qml @@ -77,12 +77,12 @@ Component { text: "Send" onClicked: { //this.enabled = false - var res = eth.createTx(txSimpleRecipient.text, txSimpleValue.text,"","","") + var res = eth.transact(txSimpleRecipient.text, txSimpleValue.text,"","","") if(res[1]) { txSimpleResult.text = "There has been an error broadcasting your transaction:" + res[1].error() } else { txSimpleResult.text = "Your transaction has been broadcasted over the network.\nYour transaction id is:" - txSimpleOutput.text = res[0] + txSimpleOutput.text = res[0].hash this.visible = false simpleSendColumn.state = "DONE" } -- cgit v1.2.3 From 1471585af082632b33eae5bf489d0ae0b277b369 Mon Sep 17 00:00:00 2001 From: obscuren Date: Sat, 10 May 2014 01:57:10 +0200 Subject: Moved Ext app js to its own dir --- ethereal/assets/qml/newTransaction/_new_contract.qml | 2 +- ethereal/assets/qml/webapp.qml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'ethereal/assets/qml') diff --git a/ethereal/assets/qml/newTransaction/_new_contract.qml b/ethereal/assets/qml/newTransaction/_new_contract.qml index f6ed77fb6..f8f3d53a0 100644 --- a/ethereal/assets/qml/newTransaction/_new_contract.qml +++ b/ethereal/assets/qml/newTransaction/_new_contract.qml @@ -158,7 +158,7 @@ Component { mainContractColumn.state = "ERROR" } else { txResult.text = "Your transaction has been submitted:\n" - txOutput.text = res[0] + txOutput.text = res[0].address mainContractColumn.state = "DONE" } } diff --git a/ethereal/assets/qml/webapp.qml b/ethereal/assets/qml/webapp.qml index d02c9a82e..1f3c3874a 100644 --- a/ethereal/assets/qml/webapp.qml +++ b/ethereal/assets/qml/webapp.qml @@ -39,7 +39,7 @@ ApplicationWindow { experimental.preferences.javascriptEnabled: true experimental.preferences.navigatorQtObjectEnabled: true experimental.preferences.developerExtrasEnabled: true - experimental.userScripts: [ui.assetPath("ethereum.js")] + experimental.userScripts: [ui.assetPath("ext/pre.js"), ui.assetPath("ext/big.js"), ui.assetPath("ext/string.js"), ui.assetPath("ext/ethereum.js")] experimental.onMessageReceived: { console.log("[onMessageReceived]: ", message.data) // TODO move to messaging.js -- cgit v1.2.3