Re-wrote ethereum.js

2 files changed, 312 insertions, 270 deletions

diff --git a/mist/assets/qml/wallet.qml b/mist/assets/qml/wallet.qml
index 5b402a214..c4379cd47 100644
--- a/mist/assets/qml/wallet.qml
+++ b/mist/assets/qml/wallet.qml
@@ -14,20 +14,22 @@ ApplicationWindow {
 
     property alias miningButtonText: miningButton.text
     property var ethx : Eth.ethx
+    property var web
 
-    width: 900
-    height: 600
+    width: 1024
+    height: 750
     minimumHeight: 300
 
     title: "Mist"
 
     // This signal is used by the filter API. The filter API connects using this signal handler from
     // the different QML files and plugins.
-    signal message(var callback, int seed);
+    signal messages(var messages, int id);
     function invokeFilterCallback(data, receiverSeed) {
         //var messages = JSON.parse(data)
         // Signal handler
-        message(data, receiverSeed);
+        messages(data, receiverSeed);
+	root.web.messages(data, receiverSeed);
     }
 
     TextField {
@@ -44,7 +46,7 @@ ApplicationWindow {
     // Takes care of loading all default plugins
     Component.onCompleted: {
         addPlugin("./views/wallet.qml", {noAdd: true, close: false, section: "ethereum", active: true});
-        addPlugin("./webapp.qml", {noAdd: true, close: false, section: "ethereum", active: true});
+        root.web = addPlugin("./webapp.qml", {noAdd: true, close: false, section: "ethereum", active: true});
 
         addPlugin("./views/transaction.qml", {noAdd: true, close: false, section: "legacy"});
         addPlugin("./views/chain.qml", {noAdd: true, close: false, section: "legacy"});
diff --git a/mist/assets/qml/webapp.qml b/mist/assets/qml/webapp.qml
index 186718ab5..8801b6b47 100644
--- a/mist/assets/qml/webapp.qml
+++ b/mist/assets/qml/webapp.qml
@@ -10,265 +10,279 @@ import Ethereum 1.0
 import "../ext/qml_messaging.js" as Messaging
 
 //ApplicationWindow {
-Rectangle {
-	id: window
-	property var title: "Browser"
-	property var iconSource: "../browser.png"
-	property var menuItem
+	Rectangle {
+		id: window
+		property var title: "Browser"
+		property var iconSource: "../browser.png"
+		property var menuItem
 
-	property alias url: webview.url
-	property alias webView: webview
+		property alias url: webview.url
+		property alias webView: webview
 
-	Component.onCompleted: {
-		webview.url = "http://etherian.io"
-	}
+		Component.onCompleted: {
+			webview.url = "http://etherian.io"
+		}
 
-	Item {
-		objectName: "root"
-		id: root
-		anchors.fill: parent
-		state: "inspectorShown"
-
-		RowLayout {
-			id: navBar
-			height: 40
-			anchors {
-				left: parent.left
-				right: parent.right
-				leftMargin: 7
-			}
+		signal messages(var messages, int id);
+		onMessages: {
+			// Bit of a cheat to get proper JSON
+			var m = JSON.parse(JSON.parse(JSON.stringify(messages)))
+			webview.postEvent("messages", [m, id]);
+		}
 
-			Button {
-				id: back
-				onClicked: {
-					webview.goBack()
-				}
-				style: ButtonStyle {
-					background: Image {
-						source: "../back.png"
-						width: 30
-						height: 30
-					}
-				}
-			}
+		Item {
+			objectName: "root"
+			id: root
+			anchors.fill: parent
+			state: "inspectorShown"
 
-			TextField {
+			RowLayout {
+				id: navBar
+				height: 40
 				anchors {
-					left: back.right
-					right: toggleInspector.left
-					leftMargin: 5
-					rightMargin: 5
+					left: parent.left
+					right: parent.right
+					leftMargin: 7
 				}
-				text: "http://etherian.io"
-				id: uriNav
-				y: parent.height / 2 - this.height / 2
 
-				Keys.onReturnPressed: {
-					webview.url = this.text;
+				Button {
+					id: back
+					onClicked: {
+						webview.goBack()
+					}
+					style: ButtonStyle {
+						background: Image {
+							source: "../back.png"
+							width: 30
+							height: 30
+						}
+					}
 				}
-			}
 
-			Button {
-				id: toggleInspector
-				anchors {
-					right: parent.right
+				TextField {
+					anchors {
+						left: back.right
+						right: toggleInspector.left
+						leftMargin: 5
+						rightMargin: 5
+					}
+					text: "http://etherian.io"
+					id: uriNav
+					y: parent.height / 2 - this.height / 2
+
+					Keys.onReturnPressed: {
+						webview.url = this.text;
+					}
 				}
-				iconSource: "../bug.png"
-				onClicked: {
-					if(inspector.visible == true){
-						inspector.visible = false
-					}else{
-						inspector.visible = true
-						inspector.url = webview.experimental.remoteInspectorUrl
+
+				Button {
+					id: toggleInspector
+					anchors {
+						right: parent.right
+					}
+					iconSource: "../bug.png"
+					onClicked: {
+						if(inspector.visible == true){
+							inspector.visible = false
+						}else{
+							inspector.visible = true
+							inspector.url = webview.experimental.remoteInspectorUrl
+						}
 					}
 				}
 			}
-		}
 
 
-		WebView {
-			objectName: "webView"
-			id: webview
-			anchors {
-				left: parent.left
-				right: parent.right
-				bottom: parent.bottom
-				top: navBar.bottom
-			}
+			WebView {
+				objectName: "webView"
+				id: webview
+				anchors {
+					left: parent.left
+					right: parent.right
+					bottom: parent.bottom
+					top: navBar.bottom
+				}
 
-			property var cleanPath: false
-			onNavigationRequested: {
-				if(!this.cleanPath) {
-					var uri = request.url.toString();
-					if(!/.*\:\/\/.*/.test(uri)) {
-						uri = "http://" + uri;
+				property var cleanPath: false
+				onNavigationRequested: {
+					if(!this.cleanPath) {
+						var uri = request.url.toString();
+						if(!/.*\:\/\/.*/.test(uri)) {
+							uri = "http://" + uri;
+						}
+
+						var reg = /(^https?\:\/\/(?:www\.)?)([a-zA-Z0-9_\-]*\.eth)(.*)/
+
+						if(reg.test(uri)) {
+							uri.replace(reg, function(match, pre, domain, path) {
+								uri = pre;
+
+								var lookup = eth.lookupDomain(domain.substring(0, domain.length - 4));
+								var ip = [];
+								for(var i = 0, l = lookup.length; i < l; i++) {
+									ip.push(lookup.charCodeAt(i))
+								}
+
+								if(ip.length != 0) {
+									uri += lookup;
+								} else {
+									uri += domain;
+								}
+
+								uri += path;
+							});
+						}
+
+						this.cleanPath = true;
+
+						webview.url = uri;
+					} else {
+						// Prevent inf loop.
+						this.cleanPath = false;
 					}
+				}
 
-					var reg = /(^https?\:\/\/(?:www\.)?)([a-zA-Z0-9_\-]*\.eth)(.*)/
-
-					if(reg.test(uri)) {
-						uri.replace(reg, function(match, pre, domain, path) {
-							uri = pre;
-
-							var lookup = eth.lookupDomain(domain.substring(0, domain.length - 4));
-							var ip = [];
-							for(var i = 0, l = lookup.length; i < l; i++) {
-								ip.push(lookup.charCodeAt(i))
-							}
-
-							if(ip.length != 0) {
-								uri += lookup;
-							} else {
-								uri += domain;
-							}
+				function sendMessage(data) {
+					webview.experimental.postMessage(JSON.stringify(data))
+				}
 
-							uri += path;
-						});
+				onTitleChanged: {
+					var data = Messaging.HandleMessage(title);
+					if(data) {
+						sendMessage(data)
 					}
-
-					this.cleanPath = true;
-
-					webview.url = uri;
-				} else {
-					// Prevent inf loop.
-					this.cleanPath = false;
 				}
-			}
 
-			function sendMessage(data) {
-				//this.experimental.evaluateJavaScript("window.____returnData="+JSON.stringify(data));
-				webview.experimental.postMessage(JSON.stringify(data))
-			}
-
-			onTitleChanged: {
-				var data = Messaging.HandleMessage(title);
-				if(data) {
-					sendMessage(data)
-				}
-			}
+				experimental.preferences.javascriptEnabled: true
+				experimental.preferences.navigatorQtObjectEnabled: true
+				experimental.preferences.developerExtrasEnabled: true
+				experimental.userScripts: ["../ext/q.js", "../ext/pre.js", "../ext/big.js", "../ext/string.js", "../ext/html_messaging.js"]
+				experimental.onMessageReceived: {
+					console.log("[onMessageReceived]: ", message.data)
+					// TODO move to messaging.js
+					var data = JSON.parse(message.data)
+
+					try {
+						switch(data.call) {
+							case "compile":
+							postData(data._seed, eth.compile(data.args[0]))
+							break
 
-			experimental.preferences.javascriptEnabled: true
-			experimental.preferences.navigatorQtObjectEnabled: true
-			experimental.preferences.developerExtrasEnabled: true
-			experimental.userScripts: ["../ext/q.js", "../ext/pre.js", "../ext/big.js", "../ext/string.js", "../ext/html_messaging.js"]
-			experimental.onMessageReceived: {
-				console.log("[onMessageReceived]: ", message.data)
-				// TODO move to messaging.js
-				var data = JSON.parse(message.data)
+							case "getCoinBase":
+							postData(data._seed, eth.coinBase())
 
-				try {
-					switch(data.call) {
-						case "compile":
-						postData(data._seed, eth.compile(data.args[0]))
-						break
+							break
 
-						case "getCoinBase":
-						postData(data._seed, eth.coinBase())
+							case "getIsListening":
+							postData(data._seed, eth.isListening())
 
-						break
+							break
 
-						case "getIsListening":
-						postData(data._seed, eth.isListening())
+							case "getIsMining":
+							postData(data._seed, eth.isMining())
 
-						break
+							break
 
-						case "getIsMining":
-						postData(data._seed, eth.isMining())
+							case "getPeerCount":
+							postData(data._seed, eth.peerCount())
 
-						break
+							break
 
-						case "getPeerCount":
-						postData(data._seed, eth.peerCount())
+							case "getCountAt":
+							require(1)
+							postData(data._seed, eth.txCountAt(data.args[0]))
 
-						break
+							break
 
-						case "getTxCountAt":
-						require(1)
-						postData(data._seed, eth.txCountAt(data.args[0]))
+							case "getCodeAt":
+							require(1)
+							var code = eth.codeAt(data.args[0])
+							postData(data._seed, code);
 
-						break
+							break
 
-						case "getBlockByNumber":
-						var block = eth.blockByNumber(data.args[0])
-						postData(data._seed, block)
+							case "getBlockByNumber":
+							var block = eth.blockByNumber(data.args[0])
+							postData(data._seed, block)
 
-						break
+							break
 
-						case "getBlockByHash":
-						var block = eth.blockByHash(data.args[0])
-						postData(data._seed, block)
+							case "getBlockByHash":
+							var block = eth.blockByHash(data.args[0])
+							postData(data._seed, block)
 
-						break
+							break
 
-						case "transact":
-						require(5)
+							case "transact":
+							require(5)
 
-						var tx = eth.transact(data.args)
-						console.log("transactx", tx)
-						postData(data._seed, tx)
+							var tx = eth.transact(data.args)
+							postData(data._seed, tx)
 
-						break
+							break
 
-						case "getStorage":
-						require(2);
+							case "getStorageAt":
+							require(2);
 
-						var stateObject = eth.stateObject(data.args[0])
-						var storage = stateObject.storageAt(data.args[1])
-						postData(data._seed, storage)
+							var storage = eth.storageAt(data.args[0], data.args[1]);
+							postData(data._seed, storage)
 
-						break
+							break
 
-						case "getEachStorage":
-						require(1);
-						var storage = JSON.parse(eth.eachStorage(data.args[0]))
-						postData(data._seed, storage)
+							case "call":
+							require(1);
+							var ret = eth.call(data.args)
+							postData(data._seed, ret)
 
-						break
+							break
 
-						case "getTransactionsFor":
-						require(1);
-						var txs = eth.transactionsFor(data.args[0], true)
-						postData(data._seed, txs)
+							case "getEachStorage":
+							require(1);
+							var storage = JSON.parse(eth.eachStorage(data.args[0]))
+							postData(data._seed, storage)
 
-						break
+							break
 
-						case "getBalance":
-						require(1);
+							case "getTransactionsFor":
+							require(1);
+							var txs = eth.transactionsFor(data.args[0], true)
+							postData(data._seed, txs)
 
-						postData(data._seed, eth.stateObject(data.args[0]).value());
+							break
 
-						break
+							case "getBalanceAt":
+							require(1);
 
-						case "getKey":
-						var key = eth.key().privateKey;
+							postData(data._seed, eth.balanceAt(data.args[0]));
 
-						postData(data._seed, key)
-						break
+							break
 
-						/*
-						case "watch":
-							require(1)
-							eth.watch(data.args[0], data.args[1]);
+							case "getKey":
+							var key = eth.key().privateKey;
 
+							postData(data._seed, key)
 							break
-						*/
-					       case "watch":
-					       		require(2)
+
+							case "watch":
+							require(2)
 							eth.watch(data.args[0], data.args[1])
 
-						case "disconnect":
-						require(1)
-						postData(data._seed, null)
+							case "disconnect":
+							require(1)
+							postData(data._seed, null)
+
+							break;
 
-						break;
+							case "getSecretToAddress":
+							require(1)
 
-						case "getSecretToAddress":
-						require(1)
-						postData(data._seed, eth.secretToAddress(data.args[0]))
+							var addr = eth.secretToAddress(data.args[0])
+							console.log("getsecret", addr)
+							postData(data._seed, addr)
 
-						break;
+							break;
 
-						case "messages":
+							case "messages":
 							require(1);
 
 							var messages = JSON.parse(eth.getMessages(data.args[0]))
@@ -276,94 +290,120 @@ Rectangle {
 
 							break
 
-						case "mutan":
+							case "mutan":
 							require(1)
 
 							var code = eth.compileMutan(data.args[0])
 							postData(data._seed, "0x"+code)
 
 							break;
-					}
-				} catch(e) {
-					console.log(data.call + ": " + e)
 
-					postData(data._seed, null);
+							case "newFilterString":
+							require(1)
+							var id = eth.newFilterString(data.args[0])
+							postData(data._seed, id);
+							break;
+							case "newFilter":
+							require(1)
+							var id = eth.newFilter(data.args[0])
+
+							postData(data._seed, id);
+							break;
+
+							case "getMessages":
+							require(1);
+
+							var messages = eth.messages(data.args[0]);
+							var m = JSON.parse(JSON.parse(JSON.stringify(messages)))
+							postData(data._seed, m);
+
+							break;
+
+							case "deleteFilter":
+							require(1);
+							eth.uninstallFilter(data.args[0])
+							break;
+						}
+					} catch(e) {
+						console.log(data.call + ": " + e)
+
+						postData(data._seed, null);
+					}
 				}
-			}
 
-			function post(seed, data) {
-				console.log("data", data)
-				postData(data._seed, data)
-			}
 
-			function require(args, num) {
-				if(args.length < num) {
-					throw("required argument count of "+num+" got "+args.length);
+				function post(seed, data) {
+					postData(data._seed, data)
 				}
-			}
-			function postData(seed, data) {
-				webview.experimental.postMessage(JSON.stringify({data: data, _seed: seed}))
-			}
-			function postEvent(event, data) {
-				webview.experimental.postMessage(JSON.stringify({data: data, _event: event}))
-			}
 
-			function onWatchedCb(data, id) {
-				var messages = JSON.parse(data)
-				postEvent("watched:"+id, messages)
-			}
+				function require(args, num) {
+					if(args.length < num) {
+						throw("required argument count of "+num+" got "+args.length);
+					}
+				}
+				function postData(seed, data) {
+					webview.experimental.postMessage(JSON.stringify({data: data, _seed: seed}))
+				}
+				function postEvent(event, data) {
+					webview.experimental.postMessage(JSON.stringify({data: data, _event: event}))
+				}
 
-			function onNewBlockCb(block) {
-				postEvent("block:new", block)
-			}
-			function onObjectChangeCb(stateObject) {
-				postEvent("object:"+stateObject.address(), stateObject)
-			}
-			function onStorageChangeCb(storageObject) {
-				var ev = ["storage", storageObject.stateAddress, storageObject.address].join(":");
-				postEvent(ev, [storageObject.address, storageObject.value])
+				function onWatchedCb(data, id) {
+					var messages = JSON.parse(data)
+					postEvent("watched:"+id, messages)
+				}
+
+				function onNewBlockCb(block) {
+					postEvent("block:new", block)
+				}
+				function onObjectChangeCb(stateObject) {
+					postEvent("object:"+stateObject.address(), stateObject)
+				}
+				function onStorageChangeCb(storageObject) {
+					var ev = ["storage", storageObject.stateAddress, storageObject.address].join(":");
+					postEvent(ev, [storageObject.address, storageObject.value])
+				}
 			}
-		}
 
 
-		Rectangle {
-			id: sizeGrip
-			color: "gray"
-			visible: false
-			height: 10
-			anchors {
-				left: root.left
-				right: root.right
-			}
-			y: Math.round(root.height * 2 / 3)
-
-			MouseArea {
-				anchors.fill: parent
-				drag.target: sizeGrip
-				drag.minimumY: 0
-				drag.maximumY: root.height
-				drag.axis: Drag.YAxis
+			Rectangle {
+				id: sizeGrip
+				color: "gray"
+				visible: false
+				height: 10
+				anchors {
+					left: root.left
+					right: root.right
+				}
+				y: Math.round(root.height * 2 / 3)
+
+				MouseArea {
+					anchors.fill: parent
+					drag.target: sizeGrip
+					drag.minimumY: 0
+					drag.maximumY: root.height
+					drag.axis: Drag.YAxis
+				}
 			}
-		}
 
-		WebView {
-			id: inspector
-			visible: false
-			anchors {
-				left: root.left
-				right: root.right
-				top: sizeGrip.bottom
-				bottom: root.bottom
+			WebView {
+				id: inspector
+				visible: false
+				anchors {
+					left: root.left
+					right: root.right
+					top: sizeGrip.bottom
+					bottom: root.bottom
+				}
 			}
-		}
 
-		states: [
-			State {
-				name: "inspectorShown"
-				PropertyChanges {
-					target: inspector
+			states: [
+				State {
+					name: "inspectorShown"
+					PropertyChanges {
+						target: inspector
+					}
 				}
-			}
-		]
+			]
+		}
 	}
-}