Merge remote-tracking branch 'upstream/develop' into p2p.crypto

cmd/ethereum/repl/repl.go

@@ -86,6 +86,11 @@ func (self *JSRepl) Stop() {
 }
 
 func (self *JSRepl) parseInput(code string) {
+	defer func() {
+		if r := recover(); r != nil {
+			fmt.Println("[native] error", r)
+		}
+	}()
 
 	value, err := self.re.Run(code)
 	if err != nil {

cmd/ethtest/main.go

@@ -32,6 +32,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/ethutil"
+	"github.com/ethereum/go-ethereum/logger"
 	"github.com/ethereum/go-ethereum/state"
 	"github.com/ethereum/go-ethereum/tests/helper"
 )
@@ -119,6 +120,8 @@ func RunVmTest(r io.Reader) (failed int) {
 				}
 			}
 		}
+
+		logger.Flush()
 	}
 
 	return

cmd/mist/assets/qml/browser.qml

@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.1
 import QtWebKit 3.0
 import QtWebKit.experimental 1.0
 import QtQuick.Controls 1.0;
@@ -8,441 +8,474 @@ import QtQuick.Window 2.1;
 import Ethereum 1.0
 
 Rectangle {
-    id: window
+	id: window
-    property var title: "Browser"
+	property var title: "Browser"
-    property var iconSource: "../browser.png"
+	property var iconSource: "../browser.png"
-    property var menuItem
+	property var menuItem
-
+
-    property alias url: webview.url
+	property alias url: webview.url
-    property alias webView: webview
+	property alias webView: webview
-
+
-    property var cleanPath: false
+	property var cleanPath: false
-    property var open: function(url) {
+	property var open: function(url) {
-        if(!window.cleanPath) {
+		if(!window.cleanPath) {
-            var uri = url;
+			var uri = url;
-            if(!/.*\:\/\/.*/.test(uri)) {
+			if(!/.*\:\/\/.*/.test(uri)) {
-                uri = "http://" + uri;
+				uri = "http://" + uri;
-            }
+			}
-
+
-            var reg = /(^https?\:\/\/(?:www\.)?)([a-zA-Z0-9_\-]*\.eth)(.*)/
+			var reg = /(^https?\:\/\/(?:www\.)?)([a-zA-Z0-9_\-]*\.eth)(.*)/
-
+
-            if(reg.test(uri)) {
+			if(reg.test(uri)) {
-                uri.replace(reg, function(match, pre, domain, path) {
+				uri.replace(reg, function(match, pre, domain, path) {
-                    uri = pre;
+					uri = pre;
-
+
-                    var lookup = eth.lookupDomain(domain.substring(0, domain.length - 4));
+					var lookup = eth.lookupDomain(domain.substring(0, domain.length - 4));
-                    var ip = [];
+					var ip = [];
-                    for(var i = 0, l = lookup.length; i < l; i++) {
+					for(var i = 0, l = lookup.length; i < l; i++) {
-                        ip.push(lookup.charCodeAt(i))
+						ip.push(lookup.charCodeAt(i))
-                    }
+					}
-
+
-                    if(ip.length != 0) {
+					if(ip.length != 0) {
-                        uri += lookup;
+						uri += lookup;
-                    } else {
+					} else {
-                        uri += domain;
+						uri += domain;
-                    }
+					}
-
+
-                    uri += path;
+					uri += path;
-                });
+				});
-            }
+			}
-
+
-            window.cleanPath = true;
+			window.cleanPath = true;
-
+
-            webview.url = uri;
+			webview.url = uri;
-
+
-            //uriNav.text = uri.text.replace(/(^https?\:\/\/(?:www\.)?)([a-zA-Z0-9_\-]*\.\w{2,3})(.*)/, "$1$2<span style='color:#CCC'>$3</span>");
+			//uriNav.text = uri.text.replace(/(^https?\:\/\/(?:www\.)?)([a-zA-Z0-9_\-]*\.\w{2,3})(.*)/, "$1$2<span style='color:#CCC'>$3</span>");
-            uriNav.text = uri;
+			uriNav.text = uri;
-        } else {
+		} else {
-            // Prevent inf loop.
+			// Prevent inf loop.
-            window.cleanPath = false;
+			window.cleanPath = false;
-        }
+		}
-    }
+	}
-
+
-    Component.onCompleted: {
+	Component.onCompleted: {
-        webview.url = "http://etherian.io"
+		webview.url = "http://etherian.io"
-    }
+	}
-
+
-    signal messages(var messages, int id);
+	signal messages(var messages, int id);
-    onMessages: {
+	onMessages: {
-        // Bit of a cheat to get proper JSON
+		// Bit of a cheat to get proper JSON
-        var m = JSON.parse(JSON.parse(JSON.stringify(messages)))
+		var m = JSON.parse(JSON.parse(JSON.stringify(messages)))
-        webview.postEvent("eth_changed", id, m);
+		webview.postEvent("eth_changed", id, m);
-    }
+	}
-
+
-    function onShhMessage(message, id) {
+	function onShhMessage(message, id) {
-	    webview.postEvent("shh_changed", id, message)
+		webview.postEvent("shh_changed", id, message)
-    }
+	}
-
+
-    Item {
+	Item {
-        objectName: "root"
+		objectName: "root"
-        id: root
+		id: root
-        anchors.fill: parent
+		anchors.fill: parent
-        state: "inspectorShown"
+		state: "inspectorShown"
-
+
-        RowLayout {
+		RowLayout {
-            id: navBar
+			id: navBar
-            height: 40
+			height: 40
-            anchors {
+			anchors {
-                left: parent.left
+				left: parent.left
-                right: parent.right
+				right: parent.right
-                leftMargin: 7
+				leftMargin: 7
-            }
+			}
-
+
-            Button {
+			Button {
-                id: back
+				id: back
-                onClicked: {
+				onClicked: {
-                    webview.goBack()
+					webview.goBack()
-                }
-                style: ButtonStyle {
-                    background: Image {
-                        source: "../back.png"
-                        width: 30
-                        height: 30
-                    }
-                }
-            }
-
-            TextField {
-                anchors {
-                    left: back.right
-                    right: toggleInspector.left
-                    leftMargin: 5
-                    rightMargin: 5
-                }
-                //text: "http://etherian.io"
-		text: webview.url;
-                id: uriNav
-                y: parent.height / 2 - this.height / 2
-
-                Keys.onReturnPressed: {
-                    webview.url = this.text;
-                }
-            }
-
-            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
-            }
-
-            //property var cleanPath: false
-            onNavigationRequested: {
-                window.open(request.url.toString());					
-            }
-
-	    function injectJs(js) {
-		webview.experimental.navigatorQtObjectEnabled = true;
-		webview.experimental.evaluateJavaScript(js)
-		webview.experimental.javascriptEnabled = true;
-	    }
-
-            function sendMessage(data) {
-                webview.experimental.postMessage(JSON.stringify(data))
-            }
-
-
-            experimental.preferences.javascriptEnabled: true
-            experimental.preferences.navigatorQtObjectEnabled: true
-            experimental.preferences.developerExtrasEnabled: true
-            experimental.userScripts: ["../ext/q.js", "../ext/ethereum.js/lib/web3.js", "../ext/ethereum.js/lib/qt.js", "../ext/setup.js"]
-            experimental.onMessageReceived: {
-                console.log("[onMessageReceived]: ", message.data)
-                // TODO move to messaging.js
-                var data = JSON.parse(message.data)
-
-                try {
-                    switch(data.call) {
-                        case "eth_compile":
-                        postData(data._id, eth.compile(data.args[0]))
-                        break
-
-                        case "eth_coinbase":
-                        postData(data._id, eth.coinBase())
-
-                        case "eth_account":
-                        postData(data._id, eth.key().address);
-
-                        case "eth_istening":
-                        postData(data._id, eth.isListening())
-
-                        break
-
-                        case "eth_mining":
-                        postData(data._id, eth.isMining())
-
-                        break
-
-                        case "eth_peerCount":
-                        postData(data._id, eth.peerCount())
-
-                        break
-
-                        case "eth_countAt":
-                        require(1)
-                        postData(data._id, eth.txCountAt(data.args[0]))
-
-                        break
-
-                        case "eth_codeAt":
-                        require(1)
-                        var code = eth.codeAt(data.args[0])
-                        postData(data._id, code);
-
-                        break
-
-                        case "eth_blockByNumber":
-                        require(1)
-                        var block = eth.blockByNumber(data.args[0])
-                        postData(data._id, block)
-                        break
-
-                        case "eth_blockByHash":
-                        require(1)
-                        var block = eth.blockByHash(data.args[0])
-                        postData(data._id, block)
-                        break
-
-                        require(2)
-                        var block = eth.blockByHash(data.args[0])
-                        postData(data._id, block.transactions[data.args[1]])
-                        break
-
-                        case "eth_transactionByHash":
-                        case "eth_transactionByNumber":
-                        require(2)
-
-                        var block;
-                        if (data.call === "transactionByHash")
-                            block = eth.blockByHash(data.args[0])
-                        else
-                            block = eth.blockByNumber(data.args[0])
-
-                        var tx = block.transactions.get(data.args[1])
-
-                        postData(data._id, tx)
-                        break
-
-                        case "eth_uncleByHash":
-                        case "eth_uncleByNumber":
-                        require(2)
-
-                        var block;
-                        if (data.call === "uncleByHash")
-                            block = eth.blockByHash(data.args[0])
-                        else
-                            block = eth.blockByNumber(data.args[0])
-
-                        var uncle = block.uncles.get(data.args[1])
-
-                        postData(data._id, uncle)
-
-                        break
-
-                        case "transact":
-                        require(5)
-
-                        var tx = eth.transact(data.args)
-                        postData(data._id, tx)
-
-                        break
-
-                        case "eth_stateAt":
-                        require(2);
-
-                        var storage = eth.storageAt(data.args[0], data.args[1]);
-                        postData(data._id, storage)
-
-                        break
-
-                        case "eth_call":
-                        require(1);
-                        var ret = eth.call(data.args)
-                        postData(data._id, ret)
-                        break
-
-                        case "eth_balanceAt":
-                        require(1);
-
-                        postData(data._id, eth.balanceAt(data.args[0]));
-                        break
-
-                        case "eth_watch":
-                        require(2)
-                        eth.watch(data.args[0], data.args[1])
-
-                        case "eth_disconnect":
-                        require(1)
-                        postData(data._id, null)
-                        break;
-
-                        case "eth_newFilterString":
-                        require(1)
-                        var id = eth.newFilterString(data.args[0])
-                        postData(data._id, id);
-                        break;
-
-                        case "eth_newFilter":
-                        require(1)
-                        var id = eth.newFilter(data.args[0])
-
-                        postData(data._id, id);
-                        break;
-
-                        case "eth_filterLogs":
-                        require(1);
-
-                        var messages = eth.messages(data.args[0]);
-                        var m = JSON.parse(JSON.parse(JSON.stringify(messages)))
-                        postData(data._id, m);
-
-                        break;
-
-                        case "eth_deleteFilter":
-                        require(1);
-                        eth.uninstallFilter(data.args[0])
-                        break;
-
-
-			case "shh_newFilter":
-			require(1);
-			var id = shh.watch(data.args[0], window);
-			postData(data._id, id);
-			break;
-
-			case "shh_newIdentity":
-				var id = shh.newIdentity()
-				postData(data._id, id)
-
-				break
-
-			case "shh_post":
-				require(1);
-
-				var params = data.args[0];
-				var fields = ["payload", "to", "from"];
-				for(var i = 0; i < fields.length; i++) {
-					params[fields[i]] = params[fields[i]] || "";
 				}
-				if(typeof params.payload !== "object") { params.payload = [params.payload]; } //params.payload = params.payload.join(""); }
+				style: ButtonStyle {
-				params.topics = params.topics || [];
+					background: Image {
-				params.priority = params.priority || 1000;
+						source: "../back.png"
-				params.ttl = params.ttl || 100;
+						width: 30
+						height: 30
+					}
+				}
+			}
 
-				shh.post(params.payload, params.to, params.from, params.topics, params.priority, params.ttl);
+			TextField {
+				anchors {
+					left: back.right
+					right: toggleInspector.left
+					leftMargin: 5
+					rightMargin: 5
+				}
+				//text: "http://etherian.io"
+				text: webview.url;
+				id: uriNav
+				y: parent.height / 2 - this.height / 2
 
-				break;
+				Keys.onReturnPressed: {
+					webview.url = this.text;
+				}
+			}
 
-			case "shh_getMessages":
+			Button {
-				require(1);
+				id: toggleInspector
-
+				anchors {
-				var m = shh.messages(data.args[0]);
+					right: parent.right
-				var messages = JSON.parse(JSON.parse(JSON.stringify(m)));
+				}
-				postData(data._id, messages);
+				iconSource: "../bug.png"
-
+				onClicked: {
-				break;
+					if(inspector.visible == true){
-                    }
+						inspector.visible = false
-                } catch(e) {
+					}else{
-                    console.log(data.call + ": " + e)
+						inspector.visible = true
-
+						inspector.url = webview.experimental.remoteInspectorUrl
-                    postData(data._id, null);
+					}
-                }
+				}
-            }
+			}
+		}
 
 
-            function post(seed, data) {
+		WebView {
-                postData(data._id, data)
+			objectName: "webView"
-            }
+			id: webview
+			anchors {
+				left: parent.left
+				right: parent.right
+				bottom: parent.bottom
+				top: navBar.bottom
+			}
 
-            function require(args, num) {
+			//property var cleanPath: false
-                if(args.length < num) {
+			onNavigationRequested: {
-                    throw("required argument count of "+num+" got "+args.length);
+				window.open(request.url.toString());					
-                }
+			}
-            }
-            function postData(seed, data) {
-                webview.experimental.postMessage(JSON.stringify({data: data, _id: seed}))
-            }
-            function postEvent(event, id, data) {
-                webview.experimental.postMessage(JSON.stringify({data: data, _id: id, _event: event}))
-            }
 
-            function onWatchedCb(data, id) {
+			function injectJs(js) {
-                var messages = JSON.parse(data)
+				webview.experimental.navigatorQtObjectEnabled = true;
-                postEvent("watched:"+id, messages)
+				webview.experimental.evaluateJavaScript(js)
-            }
+				webview.experimental.javascriptEnabled = true;
+			}
 
-            function onNewBlockCb(block) {
+			function sendMessage(data) {
-                postEvent("block:new", block)
+				webview.experimental.postMessage(JSON.stringify(data))
-            }
+			}
-            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 {
+			experimental.preferences.javascriptEnabled: true
-            id: sizeGrip
+			experimental.preferences.webGLEnabled: true
-            color: "gray"
+			experimental.itemSelector:  MouseArea {
-            visible: false
+				// To avoid conflicting with ListView.model when inside Initiator context.
-            height: 10
+				property QtObject selectorModel: model
-            anchors {
+				anchors.fill: parent
-                left: root.left
+				onClicked: selectorModel.reject()
-                right: root.right
-            }
-            y: Math.round(root.height * 2 / 3)
 
-            MouseArea {
+				Menu {
-                anchors.fill: parent
+					visible: true
-                drag.target: sizeGrip
+					id: itemSelector
-                drag.minimumY: 0
-                drag.maximumY: root.height
-                drag.axis: Drag.YAxis
-            }
-        }
 
-        WebView {
+					Instantiator {
-            id: inspector
+						model: selectorModel.items
-            visible: false
+						delegate: MenuItem {
-            anchors {
+							text: model.text
-                left: root.left
+							onTriggered: {
-                right: root.right
+								selectorModel.accept(index)
-                top: sizeGrip.bottom
+							}
-                bottom: root.bottom
+						}
-            }
+						onObjectAdded: itemSelector.insertItem(index, object)
-        }
+						onObjectRemoved: itemSelector.removeItem(object)
+					}
+				}
 
-        states: [
+				Component.onCompleted: {
-            State {
+					itemSelector.popup()
-                name: "inspectorShown"
+				}
-                PropertyChanges {
+			}
-                    target: inspector
+			experimental.preferences.webAudioEnabled: true
-                }
+			experimental.preferences.navigatorQtObjectEnabled: true
-            }
+			experimental.preferences.developerExtrasEnabled: true
-        ]
+			experimental.userScripts: ["../ext/q.js", "../ext/ethereum.js/lib/web3.js", "../ext/ethereum.js/lib/qt.js", "../ext/setup.js"]
-    }
+			experimental.onMessageReceived: {
+				console.log("[onMessageReceived]: ", message.data)
+				// TODO move to messaging.js
+				var data = JSON.parse(message.data)
+
+				try {
+					switch(data.call) {
+						case "eth_compile":
+						postData(data._id, eth.compile(data.args[0]))
+						break
+
+						case "eth_coinbase":
+						postData(data._id, eth.coinBase())
+
+						case "eth_account":
+						postData(data._id, eth.key().address);
+
+						case "eth_istening":
+						postData(data._id, eth.isListening())
+
+						break
+
+						case "eth_mining":
+						postData(data._id, eth.isMining())
+
+						break
+
+						case "eth_peerCount":
+						postData(data._id, eth.peerCount())
+
+						break
+
+						case "eth_countAt":
+						require(1)
+						postData(data._id, eth.txCountAt(data.args[0]))
+
+						break
+
+						case "eth_codeAt":
+						require(1)
+						var code = eth.codeAt(data.args[0])
+						postData(data._id, code);
+
+						break
+
+						case "eth_blockByNumber":
+						require(1)
+						var block = eth.blockByNumber(data.args[0])
+						postData(data._id, block)
+						break
+
+						case "eth_blockByHash":
+						require(1)
+						var block = eth.blockByHash(data.args[0])
+						postData(data._id, block)
+						break
+
+						require(2)
+						var block = eth.blockByHash(data.args[0])
+						postData(data._id, block.transactions[data.args[1]])
+						break
+
+						case "eth_transactionByHash":
+						case "eth_transactionByNumber":
+						require(2)
+
+						var block;
+						if (data.call === "transactionByHash")
+						block = eth.blockByHash(data.args[0])
+						else
+						block = eth.blockByNumber(data.args[0])
+
+						var tx = block.transactions.get(data.args[1])
+
+						postData(data._id, tx)
+						break
+
+						case "eth_uncleByHash":
+						case "eth_uncleByNumber":
+						require(2)
+
+						var block;
+						if (data.call === "uncleByHash")
+						block = eth.blockByHash(data.args[0])
+						else
+						block = eth.blockByNumber(data.args[0])
+
+						var uncle = block.uncles.get(data.args[1])
+
+						postData(data._id, uncle)
+
+						break
+
+						case "transact":
+						require(5)
+
+						var tx = eth.transact(data.args)
+						postData(data._id, tx)
+
+						break
+
+						case "eth_stateAt":
+						require(2);
+
+						var storage = eth.storageAt(data.args[0], data.args[1]);
+						postData(data._id, storage)
+
+						break
+
+						case "eth_call":
+						require(1);
+						var ret = eth.call(data.args)
+						postData(data._id, ret)
+						break
+
+						case "eth_balanceAt":
+						require(1);
+
+						postData(data._id, eth.balanceAt(data.args[0]));
+						break
+
+						case "eth_watch":
+						require(2)
+						eth.watch(data.args[0], data.args[1])
+
+						case "eth_disconnect":
+						require(1)
+						postData(data._id, null)
+						break;
+
+						case "eth_newFilterString":
+						require(1)
+						var id = eth.newFilterString(data.args[0])
+						postData(data._id, id);
+						break;
+
+						case "eth_newFilter":
+						require(1)
+						var id = eth.newFilter(data.args[0])
+
+						postData(data._id, id);
+						break;
+
+						case "eth_filterLogs":
+						require(1);
+
+						var messages = eth.messages(data.args[0]);
+						var m = JSON.parse(JSON.parse(JSON.stringify(messages)))
+						postData(data._id, m);
+
+						break;
+
+						case "eth_deleteFilter":
+						require(1);
+						eth.uninstallFilter(data.args[0])
+						break;
+
+
+						case "shh_newFilter":
+						require(1);
+						var id = shh.watch(data.args[0], window);
+						postData(data._id, id);
+						break;
+
+						case "shh_newIdentity":
+						var id = shh.newIdentity()
+						postData(data._id, id)
+
+						break
+
+						case "shh_post":
+						require(1);
+
+						var params = data.args[0];
+						var fields = ["payload", "to", "from"];
+						for(var i = 0; i < fields.length; i++) {
+							params[fields[i]] = params[fields[i]] || "";
+						}
+						if(typeof params.payload !== "object") { params.payload = [params.payload]; } //params.payload = params.payload.join(""); }
+						params.topics = params.topics || [];
+						params.priority = params.priority || 1000;
+						params.ttl = params.ttl || 100;
+
+						shh.post(params.payload, params.to, params.from, params.topics, params.priority, params.ttl);
+
+						break;
+
+						case "shh_getMessages":
+						require(1);
+
+						var m = shh.messages(data.args[0]);
+						var messages = JSON.parse(JSON.parse(JSON.stringify(m)));
+						postData(data._id, messages);
+
+						break;
+
+						case "ssh_newGroup":
+						postData(data._id, "");
+						break;
+					}
+				} catch(e) {
+					console.log(data.call + ": " + e)
+
+					postData(data._id, null);
+				}
+			}
+
+
+			function post(seed, data) {
+				postData(data._id, data)
+			}
+
+			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, _id: seed}))
+			}
+			function postEvent(event, id, data) {
+				webview.experimental.postMessage(JSON.stringify({data: data, _id: id, _event: event}))
+			}
+
+			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
+			}
+		}
+
+		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
+				}
+			}
+		]
+	}
 }

core/block_processor.go

@@ -242,8 +242,7 @@ func (sm *BlockProcessor) ValidateBlock(block, parent *types.Block) error {
 	}
 
 	expd := CalcDifficulty(block, parent)
-	if expd.Cmp(block.Header().Difficulty) < 0 {
+	if expd.Cmp(block.Header().Difficulty) != 0 {
-		fmt.Println("parent\n", parent)
 		return fmt.Errorf("Difficulty check failed for block %v, %v", block.Header().Difficulty, expd)
 	}
 

core/chain_manager.go

@@ -23,12 +23,11 @@ type StateQuery interface {
 func CalcDifficulty(block, parent *types.Block) *big.Int {
 	diff := new(big.Int)
 
-	bh, ph := block.Header(), parent.Header()
+	adjust := new(big.Int).Rsh(parent.Difficulty(), 10)
-	adjust := new(big.Int).Rsh(ph.Difficulty, 10)
+	if block.Time() >= parent.Time()+8 {
-	if bh.Time >= ph.Time+13 {
+		diff.Sub(parent.Difficulty(), adjust)
-		diff.Sub(ph.Difficulty, adjust)
 	} else {
-		diff.Add(ph.Difficulty, adjust)
+		diff.Add(parent.Difficulty(), adjust)
 	}
 
 	return diff

tests/files/VMTests/RandomTests/201501132239PYTHON.json

@@ -0,0 +1,52 @@
+{
+    "randomVMtest" : {
+        "callcreates" : [
+            {
+                "data" : "0x0000",
+                "destination" : "",
+                "gasLimit" : "9890",
+                "value" : "0"
+            }
+        ],
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
+            "currentGasLimit" : "1000000",
+            "currentNumber" : "300",
+            "currentTimestamp" : "2",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "code" : "0x454041404340424282f0046855",
+            "data" : "0x",
+            "gas" : "10000",
+            "gasPrice" : "100000000000000",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000"
+        },
+        "gas" : "9888",
+        "logs" : [
+        ],
+        "out" : "0x",
+        "post" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x454041404340424282f0046855",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x454041404340424282f0046855",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        }
+    }
+}

tests/files/VMTests/RandomTests/201501132242PYTHON.json

@@ -0,0 +1,52 @@
+{
+    "randomVMtest" : {
+        "callcreates" : [
+            {
+                "data" : "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                "destination" : "",
+                "gasLimit" : "9886",
+                "value" : "1000000"
+            }
+        ],
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
+            "currentGasLimit" : "1000000",
+            "currentNumber" : "300",
+            "currentTimestamp" : "2",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "code" : "0x43434045f0",
+            "data" : "0x",
+            "gas" : "10000",
+            "gasPrice" : "100000000000000",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000"
+        },
+        "gas" : "9886",
+        "logs" : [
+        ],
+        "out" : "0x",
+        "post" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "999999999999000000",
+                "code" : "0x43434045f0",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x43434045f0",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        }
+    }
+}

tests/files/VMTests/RandomTests/201501132304PYTHON.json

@@ -0,0 +1,52 @@
+{
+    "randomVMtest" : {
+        "callcreates" : [
+            {
+                "data" : "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                "destination" : "",
+                "gasLimit" : "9875",
+                "value" : "1000000"
+            }
+        ],
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
+            "currentGasLimit" : "1000000",
+            "currentNumber" : "300",
+            "currentTimestamp" : "2",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "code" : "0x444542434345f04077606c623845110155",
+            "data" : "0x",
+            "gas" : "10000",
+            "gasPrice" : "100000000000000",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000"
+        },
+        "gas" : "9873",
+        "logs" : [
+        ],
+        "out" : "0x",
+        "post" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "999999999999000000",
+                "code" : "0x444542434345f04077606c623845110155",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x444542434345f04077606c623845110155",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        }
+    }
+}

tests/files/VMTests/RandomTests/201501132305PYTHON.json

@@ -0,0 +1,52 @@
+{
+    "randomVMtest" : {
+        "callcreates" : [
+            {
+                "data" : "0x0000",
+                "destination" : "",
+                "gasLimit" : "9892",
+                "value" : "2"
+            }
+        ],
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
+            "currentGasLimit" : "1000000",
+            "currentNumber" : "300",
+            "currentTimestamp" : "2",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "code" : "0x41404542424042f0ff6567",
+            "data" : "0x",
+            "gas" : "10000",
+            "gasPrice" : "100000000000000",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000"
+        },
+        "gas" : "9892",
+        "logs" : [
+        ],
+        "out" : "0x",
+        "post" : {
+            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "999999999999999998",
+                "code" : "0x",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x41404542424042f0ff6567",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        }
+    }
+}

tests/files/VMTests/RandomTests/201501140910CPPJIT.json

@@ -0,0 +1,46 @@
+{
+    "randomVMtest" : {
+        "callcreates" : [
+        ],
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
+            "currentGasLimit" : "1000000",
+            "currentNumber" : "300",
+            "currentTimestamp" : "2",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "code" : "0x44434345454045411a55",
+            "data" : "0x",
+            "gas" : "10000",
+            "gasPrice" : "100000000000000",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000"
+        },
+        "gas" : "9891",
+        "logs" : [
+        ],
+        "out" : "0x",
+        "post" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x44434345454045411a55",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x44434345454045411a55",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        }
+    }
+}

tests/files/VMTests/RandomTests/201501140911CPPJIT.json

@@ -0,0 +1,31 @@
+{
+    "randomVMtest" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
+            "currentGasLimit" : "1000000",
+            "currentNumber" : "300",
+            "currentTimestamp" : "2",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "code" : "0x42454542134442451a97749771",
+            "data" : "0x",
+            "gas" : "10000",
+            "gasPrice" : "100000000000000",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x42454542134442451a97749771",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        }
+    }
+}

tests/files/VMTests/RandomTests/201501140912CPPJIT.json

@@ -0,0 +1,31 @@
+{
+    "randomVMtest" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
+            "currentGasLimit" : "1000000",
+            "currentNumber" : "300",
+            "currentTimestamp" : "2",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "code" : "0x4242454042454544531a53660a99321a55",
+            "data" : "0x",
+            "gas" : "10000",
+            "gasPrice" : "100000000000000",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x4242454042454544531a53660a99321a55",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        }
+    }
+}

tests/files/VMTests/RandomTests/201501140914CPPJIT.json

@@ -0,0 +1,46 @@
+{
+    "randomVMtest" : {
+        "callcreates" : [
+        ],
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
+            "currentGasLimit" : "1000000",
+            "currentNumber" : "300",
+            "currentTimestamp" : "2",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "code" : "0x454045451a4043407352723258639c55",
+            "data" : "0x",
+            "gas" : "10000",
+            "gasPrice" : "100000000000000",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000"
+        },
+        "gas" : "9991",
+        "logs" : [
+        ],
+        "out" : "0x",
+        "post" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x454045451a4043407352723258639c55",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x454045451a4043407352723258639c55",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        }
+    }
+}

tests/files/VMTests/RandomTests/201501140918PYTHON.json

@@ -0,0 +1,54 @@
+{
+    "randomVMtest" : {
+        "callcreates" : [
+            {
+                "data" : "0x0000",
+                "destination" : "",
+                "gasLimit" : "9887",
+                "value" : "1000000"
+            }
+        ],
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
+            "currentGasLimit" : "1000000",
+            "currentNumber" : "300",
+            "currentTimestamp" : "2",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "code" : "0x424345f04141454432833458505555",
+            "data" : "0x",
+            "gas" : "10000",
+            "gasPrice" : "100000000000000",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000"
+        },
+        "gas" : "9278",
+        "logs" : [
+        ],
+        "out" : "0x",
+        "post" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "999999999999000000",
+                "code" : "0x424345f04141454432833458505555",
+                "nonce" : "0",
+                "storage" : {
+                    "0x0de0b6b3a7640000" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "0xcd1722f3947def4cf144679da39c4c32bdc35681" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+                }
+            }
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x424345f04141454432833458505555",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        }
+    }
+}

ui/qt/qwhisper/message.go

@@ -17,7 +17,7 @@ func ToQMessage(msg *whisper.Message) *Message {
 	return &Message{
 		ref:     msg,
 		Flags:   int32(msg.Flags),
-		Payload: ethutil.Bytes2Hex(msg.Payload),
+		Payload: "0x" + ethutil.Bytes2Hex(msg.Payload),
-		From:    ethutil.Bytes2Hex(crypto.FromECDSAPub(msg.Recover())),
+		From:    "0x" + ethutil.Bytes2Hex(crypto.FromECDSAPub(msg.Recover())),
 	}
 }

ui/qt/qwhisper/whisper.go

@@ -41,32 +41,41 @@ func (self *Whisper) Post(payload []string, to, from string, topics []string, pr
 		data = append(data, fromHex(d)...)
 	}
 
-	msg := whisper.NewMessage(data)
+	pk := crypto.ToECDSAPub(fromHex(from))
-	envelope, err := msg.Seal(time.Duration(priority*100000), whisper.Opts{
+	if key := self.Whisper.GetIdentity(pk); key != nil {
-		Ttl:    time.Duration(ttl) * time.Second,
+		msg := whisper.NewMessage(data)
-		To:     crypto.ToECDSAPub(fromHex(to)),
+		envelope, err := msg.Seal(time.Duration(priority*100000), whisper.Opts{
-		From:   crypto.ToECDSA(fromHex(from)),
+			Ttl:    time.Duration(ttl) * time.Second,
-		Topics: whisper.TopicsFromString(topics...),
+			To:     crypto.ToECDSAPub(fromHex(to)),
-	})
+			From:   key,
-	if err != nil {
+			Topics: whisper.TopicsFromString(topics...),
-		qlogger.Infoln(err)
+		})
-		// handle error
+
-		return
+		if err != nil {
+			qlogger.Infoln(err)
+			// handle error
+			return
+		}
+
+		if err := self.Whisper.Send(envelope); err != nil {
+			qlogger.Infoln(err)
+			// handle error
+			return
+		}
+	} else {
+		qlogger.Infoln("unmatched pub / priv for seal")
 	}
 
-	if err := self.Whisper.Send(envelope); err != nil {
-		qlogger.Infoln(err)
-		// handle error
-		return
-	}
 }
 
 func (self *Whisper) NewIdentity() string {
-	return toHex(self.Whisper.NewIdentity().D.Bytes())
+	key := self.Whisper.NewIdentity()
+
+	return toHex(crypto.FromECDSAPub(&key.PublicKey))
 }
 
 func (self *Whisper) HasIdentity(key string) bool {
-	return self.Whisper.HasIdentity(crypto.ToECDSA(fromHex(key)))
+	return self.Whisper.HasIdentity(crypto.ToECDSAPub(fromHex(key)))
 }
 
 func (self *Whisper) Watch(opts map[string]interface{}, view *qml.Common) int {

whisper/whisper.go

@@ -60,7 +60,7 @@ type Whisper struct {
 
 	quit chan struct{}
 
-	keys []*ecdsa.PrivateKey
+	keys map[string]*ecdsa.PrivateKey
 }
 
 func New() *Whisper {
@@ -69,6 +69,7 @@ func New() *Whisper {
 		filters:  filter.New(),
 		expiry:   make(map[uint32]*set.SetNonTS),
 		quit:     make(chan struct{}),
+		keys:     make(map[string]*ecdsa.PrivateKey),
 	}
 	whisper.filters.Start()
 
@@ -101,18 +102,18 @@ func (self *Whisper) NewIdentity() *ecdsa.PrivateKey {
 	if err != nil {
 		panic(err)
 	}
-	self.keys = append(self.keys, key)
+
+	self.keys[string(crypto.FromECDSAPub(&key.PublicKey))] = key
 
 	return key
 }
 
-func (self *Whisper) HasIdentity(key *ecdsa.PrivateKey) bool {
+func (self *Whisper) HasIdentity(key *ecdsa.PublicKey) bool {
-	for _, key := range self.keys {
+	return self.keys[string(crypto.FromECDSAPub(key))] != nil
-		if key.D.Cmp(key.D) == 0 {
+}
-			return true
+
-		}
+func (self *Whisper) GetIdentity(key *ecdsa.PublicKey) *ecdsa.PrivateKey {
-	}
+	return self.keys[string(crypto.FromECDSAPub(key))]
-	return false
 }
 
 func (self *Whisper) Watch(opts Filter) int {