From 567428fb3489d639cd7fdcd50e4362be52745ec4 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Tue, 17 Feb 2015 16:12:55 +0100
Subject: Filter and mutex locks added

---
 cmd/mist/assets/examples/coin.html | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'cmd/mist/assets')

diff --git a/cmd/mist/assets/examples/coin.html b/cmd/mist/assets/examples/coin.html
index ca7a9c0dd..cb9d471de 100644
--- a/cmd/mist/assets/examples/coin.html
+++ b/cmd/mist/assets/examples/coin.html
@@ -80,11 +80,6 @@
 		refresh();
 	});
 
-	var ev = contract.SingleTransact({})
-	ev.watch(function(log) {
-	someElement.innerHTML += "tnaheousnthaoeu";
-	});
-	
 	eth.watch('chain').changed(function() {
 		refresh();
 	});
-- 
cgit v1.2.3


From 9a2be227a6486dd514d64981fb964e86e0bb0467 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Tue, 17 Feb 2015 16:18:29 +0100
Subject: commented peer count out

---
 cmd/mist/assets/qml/main.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cmd/mist/assets')

diff --git a/cmd/mist/assets/qml/main.qml b/cmd/mist/assets/qml/main.qml
index 9a6bf5273..e194c9f09 100644
--- a/cmd/mist/assets/qml/main.qml
+++ b/cmd/mist/assets/qml/main.qml
@@ -888,7 +888,7 @@ ApplicationWindow {
         function addPeer(peer) { peerModel.append(peer) }
 
         function setPeerCounters(text) {
-            peerCounterLabel.text = text
+            //peerCounterLabel.text = text
         }
 
         function timeAgo(unixTs){
-- 
cgit v1.2.3


From 13c00afc68652d517f91313bb8c3eeb206d23f22 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Tue, 17 Feb 2015 16:54:52 +0100
Subject: Implement register and watchTx

---
 cmd/mist/assets/ext/ethereum.js/dist/ethereum.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'cmd/mist/assets')

diff --git a/cmd/mist/assets/ext/ethereum.js/dist/ethereum.js b/cmd/mist/assets/ext/ethereum.js/dist/ethereum.js
index d0e9d3cb7..83b598b3f 100644
--- a/cmd/mist/assets/ext/ethereum.js/dist/ethereum.js
+++ b/cmd/mist/assets/ext/ethereum.js/dist/ethereum.js
@@ -1417,6 +1417,8 @@ var ethMethods = function () {
 
     var methods = [
     { name: 'balanceAt', call: 'eth_balanceAt' },
+    { name: 'register', call: 'eth_register' },
+    { name: 'unregister', call: 'eth_unregister' },
     { name: 'stateAt', call: 'eth_stateAt' },
     { name: 'storageAt', call: 'eth_storageAt' },
     { name: 'countAt', call: 'eth_countAt'},
-- 
cgit v1.2.3


From 7fc9b5b3f9ca0111cc4bc1b2a6b4bb2eccd3e048 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Tue, 17 Feb 2015 22:20:47 +0100
Subject: Changed to ChainEvent and fixed a nil pointer in transact

---
 cmd/mist/assets/examples/info.html | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'cmd/mist/assets')

diff --git a/cmd/mist/assets/examples/info.html b/cmd/mist/assets/examples/info.html
index d8816b19f..2a405c280 100644
--- a/cmd/mist/assets/examples/info.html
+++ b/cmd/mist/assets/examples/info.html
@@ -71,6 +71,10 @@
     document.querySelector("#gas_price").innerHTML = eth.gasPrice;
     document.querySelector("#mining").innerHTML = eth.mining;
     document.querySelector("#listening").innerHTML = eth.listening;
+    eth.watch('chain').changed(function() {
+		    document.querySelector("#number").innerHTML = eth.number;
+		     });
+
 </script>
 
 </html>
-- 
cgit v1.2.3


From c1474e1877641cb80ed0c935a3bd5b3d5c2fe3ac Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Tue, 17 Feb 2015 23:10:37 +0100
Subject: Removed mined transactions from pending view. Closes #321

---
 cmd/mist/assets/qml/main.qml             | 2 +-
 cmd/mist/assets/qml/views/pending_tx.qml | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'cmd/mist/assets')

diff --git a/cmd/mist/assets/qml/main.qml b/cmd/mist/assets/qml/main.qml
index e194c9f09..3089fc46f 100644
--- a/cmd/mist/assets/qml/main.qml
+++ b/cmd/mist/assets/qml/main.qml
@@ -876,7 +876,7 @@ ApplicationWindow {
         }
 
         function setWalletValue(value) {
-            walletValueLabel.text = value
+            //walletValueLabel.text = value
         }
 
         function loadPlugin(name) {
diff --git a/cmd/mist/assets/qml/views/pending_tx.qml b/cmd/mist/assets/qml/views/pending_tx.qml
index 4442a69db..3dcedeff2 100644
--- a/cmd/mist/assets/qml/views/pending_tx.qml
+++ b/cmd/mist/assets/qml/views/pending_tx.qml
@@ -41,4 +41,13 @@ Rectangle {
 
 		pendingTxModel.insert(0, {hash: tx.hash, to: tx.address, from: tx.sender, value: tx.value, contract: isContract})
 	}
+
+	function removeTx(tx) {
+		for (var i = 0; i < pendingTxModel.count; i++) {
+			if (tx.hash === pendingTxModel.get(i).hash) {
+				pendingTxModel.remove(i);
+				break;
+			}
+		}
+	}
 }
-- 
cgit v1.2.3


From 60318c96d03bcaaf731802b1080a3d87cb482124 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Tue, 17 Feb 2015 23:22:42 +0100
Subject: removed old wallet

---
 cmd/mist/assets/qml/main.qml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'cmd/mist/assets')

diff --git a/cmd/mist/assets/qml/main.qml b/cmd/mist/assets/qml/main.qml
index 3089fc46f..f9bfd9b8d 100644
--- a/cmd/mist/assets/qml/main.qml
+++ b/cmd/mist/assets/qml/main.qml
@@ -46,7 +46,6 @@ ApplicationWindow {
         walletWeb.view.url = "http://ethereum-dapp-wallet.meteor.com/";
         walletWeb.menuItem.title = "Wallet";
 
-        addPlugin("./views/wallet.qml", {noAdd: true, close: false, section: "legacy"});        
         addPlugin("./views/miner.qml", {noAdd: true, close: false, section: "ethereum", active: false});
         addPlugin("./views/transaction.qml", {noAdd: true, close: false, section: "legacy"});
         addPlugin("./views/whisper.qml", {noAdd: true, close: false, section: "legacy"});
-- 
cgit v1.2.3


From 0057bb4ef6d55b5d580a4e0421526a477ef93de9 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Thu, 19 Feb 2015 11:51:38 +0100
Subject: WIP QT Clipboard

---
 cmd/mist/assets/qml/main.qml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'cmd/mist/assets')

diff --git a/cmd/mist/assets/qml/main.qml b/cmd/mist/assets/qml/main.qml
index f9bfd9b8d..5f7f05d83 100644
--- a/cmd/mist/assets/qml/main.qml
+++ b/cmd/mist/assets/qml/main.qml
@@ -246,6 +246,7 @@ ApplicationWindow {
                 }
             }
         }
+
     }
 
     property var blockModel: ListModel {
-- 
cgit v1.2.3


From 1ec6190e866eeefd91ea82b31da9f94753685a4a Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Thu, 19 Feb 2015 16:39:20 +0100
Subject: cmd/mist: show peer names in peers window

---
 cmd/mist/assets/qml/main.qml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'cmd/mist/assets')

diff --git a/cmd/mist/assets/qml/main.qml b/cmd/mist/assets/qml/main.qml
index f9bfd9b8d..31d240b5f 100644
--- a/cmd/mist/assets/qml/main.qml
+++ b/cmd/mist/assets/qml/main.qml
@@ -927,7 +927,8 @@ ApplicationWindow {
                      model: peerModel
                      TableViewColumn{width: 180; role: "addr" ; title: "Remote Address" }
                      TableViewColumn{width: 280; role: "nodeID" ; title: "Node ID" }
-                     TableViewColumn{width: 180; role: "caps" ; title: "Capabilities" }
+                     TableViewColumn{width: 100; role: "name" ; title: "Name" }
+                     TableViewColumn{width: 40; role: "caps" ; title: "Capabilities" }
                  }
              }
          }
-- 
cgit v1.2.3


From fa4cbad315609e41d88c59ecbce7c6c6169fc57a Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Thu, 19 Feb 2015 22:33:22 +0100
Subject: Optimisations and fixed a couple of DDOS issues in the miner

---
 cmd/mist/assets/examples/bomb.html | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 cmd/mist/assets/examples/bomb.html

(limited to 'cmd/mist/assets')

diff --git a/cmd/mist/assets/examples/bomb.html b/cmd/mist/assets/examples/bomb.html
new file mode 100644
index 000000000..62540f9bb
--- /dev/null
+++ b/cmd/mist/assets/examples/bomb.html
@@ -0,0 +1,22 @@
+<html>
+<head>
+<script src="../ext/bignumber.min.js"></script>
+<script src="../ext/ethereum.js/dist/ethereum.js"></script>
+
+<script>
+var web3 = require('web3');
+web3.setProvider(new web3.providers.HttpSyncProvider('http://localhost:8545'));
+var eth = web3.eth;
+
+function bomb() {
+    for (var i = 0; i < 200; i++) {
+        eth.transact({})
+    }
+}
+</script>
+</head>
+
+<body>
+<button onclick="bomb();">BOOM!</button>
+</body>
+</html>
-- 
cgit v1.2.3


From cc43ab9a810125239636143a91609389b19b49c7 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Fri, 20 Feb 2015 18:05:46 +0100
Subject: Minor updates for release

---
 cmd/mist/assets/qml/main.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cmd/mist/assets')

diff --git a/cmd/mist/assets/qml/main.qml b/cmd/mist/assets/qml/main.qml
index 937670bd2..c421d696c 100644
--- a/cmd/mist/assets/qml/main.qml
+++ b/cmd/mist/assets/qml/main.qml
@@ -964,7 +964,7 @@ ApplicationWindow {
                  anchors.top: parent.top
                  anchors.topMargin: 30
                  font.pointSize: 12
-                 text: "<h2>Mist (0.7.10)</h2><br><h3>Development</h3>Jeffrey Wilcke<br>Viktor Trón<br>Felix Lange<br>Taylor Gerring<br>Daniel Nagy<br><h3>UX</h3>Alex van de Sande<br>"
+                 text: "<h2>Mist (0.9.0)</h2><br><h3>Development</h3>Jeffrey Wilcke<br>Viktor Trón<br>Felix Lange<br>Taylor Gerring<br>Daniel Nagy<br>Gustav Simonsson<br><h3>UX/UI</h3>Alex van de Sande<br>Fabian Vogelsteller"
              }
          }
 
-- 
cgit v1.2.3


From 92337baa5a51f4d4ec39cb5004bdcc4b07d321e0 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Sat, 21 Feb 2015 00:42:57 +0100
Subject: reverted back to proper version number

---
 cmd/mist/assets/qml/main.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cmd/mist/assets')

diff --git a/cmd/mist/assets/qml/main.qml b/cmd/mist/assets/qml/main.qml
index c421d696c..ca37dbf3c 100644
--- a/cmd/mist/assets/qml/main.qml
+++ b/cmd/mist/assets/qml/main.qml
@@ -964,7 +964,7 @@ ApplicationWindow {
                  anchors.top: parent.top
                  anchors.topMargin: 30
                  font.pointSize: 12
-                 text: "<h2>Mist (0.9.0)</h2><br><h3>Development</h3>Jeffrey Wilcke<br>Viktor Trón<br>Felix Lange<br>Taylor Gerring<br>Daniel Nagy<br>Gustav Simonsson<br><h3>UX/UI</h3>Alex van de Sande<br>Fabian Vogelsteller"
+                 text: "<h2>Mist (0.8.4)</h2><br><h3>Development</h3>Jeffrey Wilcke<br>Viktor Trón<br>Felix Lange<br>Taylor Gerring<br>Daniel Nagy<br>Gustav Simonsson<br><h3>UX/UI</h3>Alex van de Sande<br>Fabian Vogelsteller"
              }
          }
 
-- 
cgit v1.2.3


From 483d96a89d68023360d211ab329400f4b960fe48 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Sun, 22 Feb 2015 13:12:01 +0100
Subject: Added eth_logs & fixed issue with manual log filtering

* Implemented `eth_logs`
* Fixed issue with `filter.Find()` where logs were appended to an
  incorrect, non-returned slice resulting in no logs found
---
 cmd/mist/assets/examples/coin.html | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'cmd/mist/assets')

diff --git a/cmd/mist/assets/examples/coin.html b/cmd/mist/assets/examples/coin.html
index cb9d471de..18a6811d7 100644
--- a/cmd/mist/assets/examples/coin.html
+++ b/cmd/mist/assets/examples/coin.html
@@ -14,8 +14,9 @@
 </div>
 
 <div>
-	<span class="amount">Amount:</span>
+	<span>Address:</span>
 	<input type="text" id="address" style="width:200px">
+	<span>Amount:</span>
 	<input type="text" id="amount" style="width:200px">
 	<button onclick="transact()">Send</button>
 </div>
@@ -58,7 +59,7 @@
 		}],
 		"outputs": []
 	}, {
-		"name":"received",
+		"name":"Changed",
 		"type":"event",
 		"inputs": [
 			{"name":"from","type":"address","indexed":true},
@@ -69,18 +70,14 @@
 	var address = localStorage.getItem("address");
 	// deploy if not exist
 	if (address == null) {
-		var code = "0x60056013565b61012b806100346000396000f35b6103e8600033600160a060020a0316600052602052604060002081905550560060e060020a6000350480637bb98a681461002b578063d0679d3414610039578063e3d670d71461004d57005b610033610126565b60006000f35b610047600435602435610062565b60006000f35b610058600435610104565b8060005260206000f35b80600033600160a060020a0316600052602052604060002054101561008657610100565b80600033600160a060020a0316600052602052604060002090815403908190555080600083600160a060020a0316600052602052604060002090815401908190555033600160a060020a0316600052806020527ff11e547d796cc64acdf758e7cee90439494fd886a19159454aa61e473fdbafef60406000a15b5050565b6000600082600160a060020a03166000526020526040600020549050919050565b5b60008156";
+		var code = "0x60056013565b61014f8061003a6000396000f35b620f42406000600033600160a060020a0316815260200190815260200160002081905550560060e060020a600035048063d0679d3414610020578063e3d670d71461003457005b61002e600435602435610049565b60006000f35b61003f600435610129565b8060005260206000f35b806000600033600160a060020a03168152602001908152602001600020541061007157610076565b610125565b806000600033600160a060020a03168152602001908152602001600020908154039081905550806000600084600160a060020a031681526020019081526020016000209081540190819055508033600160a060020a03167fb52dda022b6c1a1f40905a85f257f689aa5d69d850e49cf939d688fbe5af594660006000a38082600160a060020a03167fb52dda022b6c1a1f40905a85f257f689aa5d69d850e49cf939d688fbe5af594660006000a35b5050565b60006000600083600160a060020a0316815260200190815260200160002054905091905056";
 		address = web3.eth.transact({data: code});
         	localStorage.setItem("address", address);
 	}
-	document.querySelector("#contract_addr").innerHTML = address.toUpperCase();
+	document.querySelector("#contract_addr").innerHTML = address;
 
 	var contract = web3.eth.contract(address, desc);
-	contract.received({from: eth.coinbase}).changed(function() {
-		refresh();
-	});
-
-	eth.watch('chain').changed(function() {
+	contract.Changed({from: eth.coinbase}).changed(function() {
 		refresh();
 	});
 
@@ -93,7 +90,7 @@
 		var storage = eth.storageAt(address);
 		table.innerHTML = "";
 		for( var item in storage ) {
-			table.innerHTML += "<tr><td>"+item.toUpperCase()+"</td><td>"+web3.toDecimal(storage[item])+"</td></tr>";
+			table.innerHTML += "<tr><td>"+item+"</td><td>"+web3.toDecimal(storage[item])+"</td></tr>";
 		}
 	}
 
@@ -106,6 +103,7 @@
 		}
 
 		var value = parseInt( document.querySelector("#amount").value );
+		console.log("transact: ", to, " => ", value)
 
 		contract.send( to, value );
 	}
@@ -121,7 +119,7 @@ contract JevCoin {
         balances[msg.sender] = 1000000;
     }
  
-    event changed(address indexed from, address indexed to);
+    event Changed(address indexed from, uint indexed amount);
     function send(address to, uint value)
     {
         if( balances[msg.sender] < value ) return;
@@ -129,7 +127,8 @@ contract JevCoin {
         balances[msg.sender] -= value;
         balances[to] += value;
  
-        changed(msg.sender, to);
+        Changed(msg.sender, value);
+        Changed(to, value);
     }
  
     function balance(address who) constant returns(uint t)
-- 
cgit v1.2.3


From 321dce1f47135f673730cb86fdf1faf03dc6cbd4 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Sun, 22 Feb 2015 13:26:10 +0100
Subject: Bump

---
 cmd/mist/assets/qml/main.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cmd/mist/assets')

diff --git a/cmd/mist/assets/qml/main.qml b/cmd/mist/assets/qml/main.qml
index ca37dbf3c..e80bd87e0 100644
--- a/cmd/mist/assets/qml/main.qml
+++ b/cmd/mist/assets/qml/main.qml
@@ -964,7 +964,7 @@ ApplicationWindow {
                  anchors.top: parent.top
                  anchors.topMargin: 30
                  font.pointSize: 12
-                 text: "<h2>Mist (0.8.4)</h2><br><h3>Development</h3>Jeffrey Wilcke<br>Viktor Trón<br>Felix Lange<br>Taylor Gerring<br>Daniel Nagy<br>Gustav Simonsson<br><h3>UX/UI</h3>Alex van de Sande<br>Fabian Vogelsteller"
+                 text: "<h2>Mist (0.8.5)</h2><br><h3>Development</h3>Jeffrey Wilcke<br>Viktor Trón<br>Felix Lange<br>Taylor Gerring<br>Daniel Nagy<br>Gustav Simonsson<br><h3>UX/UI</h3>Alex van de Sande<br>Fabian Vogelsteller"
              }
          }
 
-- 
cgit v1.2.3