Moving over to ethpipe

5 files changed, 20 insertions, 6 deletions

diff --git a/ethereal/assets/ext/ethereum.js b/ethereal/assets/ext/ethereum.js
index 03b25179b..fb8bd23a7 100644
--- a/ethereal/assets/ext/ethereum.js
+++ b/ethereal/assets/ext/ethereum.js
@@ -4,6 +4,16 @@ window.eth = {
 	_callbacks: {},
 	_onCallbacks: {},
 
+    test: function() {
+        var t = undefined;
+        navigator.qt.onmessage = function(d) { t = d; }
+        for(;;) {
+            if(t !== undefined) {
+                return t
+            }
+        }
+    },
+
 	mutan: function(code) {
 	},
 
diff --git a/ethereal/assets/ext/test.html b/ethereal/assets/ext/test.html
index 0d6b710fa..980001f90 100644
--- a/ethereal/assets/ext/test.html
+++ b/ethereal/assets/ext/test.html
@@ -25,6 +25,10 @@ function test() {
 	eth.getEachStorageAt("9ef0f0d81e040012600b0c1abdef7c48f720f88a", function(a, b) {
 			console.log(a,b)
 	})
+
+	eth.getBlock("f70097659f329a09642a27f11338d9269de64f1d4485786e36bfc410832148cd", function(block) {
+			console.log(block)
+	})
 }
 </script>
 
diff --git a/ethereal/assets/qml/views/info.qml b/ethereal/assets/qml/views/info.qml
index fcddd46e2..3335a306a 100644
--- a/ethereal/assets/qml/views/info.qml
+++ b/ethereal/assets/qml/views/info.qml
@@ -28,7 +28,7 @@ Rectangle {
 			text: "Address"
 		}
 		TextField {
-			text: pub.getKey().address
+			text: eth.getKey().address
 			width: 500
 		}
 
diff --git a/ethereal/assets/qml/views/transaction.qml b/ethereal/assets/qml/views/transaction.qml
index 80e1670f8..ac38ebe0c 100644
--- a/ethereal/assets/qml/views/transaction.qml
+++ b/ethereal/assets/qml/views/transaction.qml
@@ -169,7 +169,7 @@ Rectangle {
 			onClicked: {
 				var value = txValue.text + denomModel.get(valueDenom.currentIndex).zeros;
 				var gasPrice = txGasPrice.text + denomModel.get(gasDenom.currentIndex).zeros;
-				var res = gui.create(txFuelRecipient.text, value, txGas.text, gasPrice, codeView.text)
+				var res = gui.transact(txFuelRecipient.text, value, txGas.text, gasPrice, codeView.text)
 				if(res[1]) {
 					txResult.text = "Your contract <b>could not</b> be sent over the network:\n<b>"
 					txResult.text += res[1].error()
diff --git a/ethereal/assets/qml/webapp.qml b/ethereal/assets/qml/webapp.qml
index 5faf50e91..ac48e32a1 100644
--- a/ethereal/assets/qml/webapp.qml
+++ b/ethereal/assets/qml/webapp.qml
@@ -165,13 +165,13 @@ ApplicationWindow {
 						break
 
 						case "getBlockByNumber":
-						var block = eth.getBlock(data.args[0])
+						var block = eth.getBlockByNumber(data.args[0])
 						postData(data._seed, block)
 
 						break
 
 						case "getBlockByHash":
-						var block = eth.getBlock(data.args[0])
+						var block = eth.getBlockByHash(data.args[0])
 						postData(data._seed, block)
 
 						break
@@ -195,8 +195,8 @@ ApplicationWindow {
 
 						case "getEachStorage":
 						require(1);
-						var stateObject = eth.getStateObject(data.args[0]).stateKeyVal(true)
-						postData(data._seed,stateObject)
+						var storage = eth.getEachStorage(data.args[0])
+						postData(data._seed, storage)
 
 						break