Merge branch 'develop' into jsonrpc

57 files changed, 4016 insertions, 1715 deletions

diff --git a/cmd/ethereum/cmd.go b/cmd/ethereum/cmd.go
index d8b9ea487..8ffd868ed 100644
--- a/cmd/ethereum/cmd.go
+++ b/cmd/ethereum/cmd.go
@@ -1,20 +1,23 @@
-// Copyright (c) 2013-2014, Jeffrey Wilcke. All rights reserved.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-// MA 02110-1301  USA
+/*
+	This file is part of go-ethereum
 
+	go-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	go-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with go-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/**
+ * @authors
+ * 	Jeffrey Wilcke <i@jev.io>
+ */
 package main
 
 import (
diff --git a/cmd/ethereum/flags.go b/cmd/ethereum/flags.go
index 275fcf248..f829744dc 100644
--- a/cmd/ethereum/flags.go
+++ b/cmd/ethereum/flags.go
@@ -1,20 +1,23 @@
-// Copyright (c) 2013-2014, Jeffrey Wilcke. All rights reserved.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-// MA 02110-1301  USA
+/*
+	This file is part of go-ethereum
 
+	go-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	go-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with go-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/**
+ * @authors
+ * 	Jeffrey Wilcke <i@jev.io>
+ */
 package main
 
 import (
@@ -61,6 +64,7 @@ var (
 	ImportChain     string
 	SHH             bool
 	Dial            bool
+	PrintVersion    bool
 )
 
 // flags specific to cli client
@@ -117,6 +121,7 @@ func Init() {
 
 	flag.BoolVar(&StartMining, "mine", false, "start dagger mining")
 	flag.BoolVar(&StartJsConsole, "js", false, "launches javascript console")
+	flag.BoolVar(&PrintVersion, "version", false, "prints version number")
 
 	flag.Parse()
 
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
index 3c143aca1..b816c678e 100644
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -1,20 +1,23 @@
-// Copyright (c) 2013-2014, Jeffrey Wilcke. All rights reserved.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-// MA 02110-1301  USA
-
+/*
+	This file is part of go-ethereum
+
+	go-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	go-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with go-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/**
+ * @authors
+ * 	Jeffrey Wilcke <i@jev.io>
+ */
 package main
 
 import (
@@ -28,6 +31,7 @@ import (
 	"github.com/ethereum/go-ethereum/eth"
 	"github.com/ethereum/go-ethereum/ethutil"
 	"github.com/ethereum/go-ethereum/logger"
+	"github.com/ethereum/go-ethereum/state"
 )
 
 const (
@@ -49,6 +53,11 @@ func main() {
 	// precedence: code-internal flag default < config file < environment variables < command line
 	Init() // parsing command line
 
+	if PrintVersion {
+		printVersion()
+		return
+	}
+
 	utils.InitConfig(VmType, ConfigFile, Datadir, "ETH")
 
 	ethereum, err := eth.New(&eth.Config{
@@ -95,7 +104,8 @@ func main() {
 		}
 
 		// Leave the Println. This needs clean output for piping
-		fmt.Printf("%s\n", block.State().Dump())
+		statedb := state.New(block.Root(), ethereum.Db())
+		fmt.Printf("%s\n", statedb.Dump())
 
 		fmt.Println(block)
 
@@ -134,3 +144,13 @@ func main() {
 	// this blocks the thread
 	ethereum.WaitForShutdown()
 }
+
+func printVersion() {
+	fmt.Printf(`%v %v
+PV=%d
+GOOS=%s
+GO=%s
+GOPATH=%s
+GOROOT=%s
+`, ClientIdentifier, Version, eth.ProtocolVersion, runtime.GOOS, runtime.Version(), os.Getenv("GOPATH"), runtime.GOROOT())
+}
diff --git a/cmd/ethereum/repl/repl.go b/cmd/ethereum/repl/repl.go
index 78bb19cec..4a7880ff4 100644
--- a/cmd/ethereum/repl/repl.go
+++ b/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 {
diff --git a/cmd/ethtest/main.go b/cmd/ethtest/main.go
index 96ef94e40..e1c4806ad 100644
--- a/cmd/ethtest/main.go
+++ b/cmd/ethtest/main.go
@@ -17,8 +17,6 @@
 /**
  * @authors:
  * 	Jeffrey Wilcke <i@jev.io>
- * @date 2014
- *
  */
 
 package main
@@ -26,12 +24,15 @@ package main
 import (
 	"bytes"
 	"encoding/json"
+	"io"
 	"io/ioutil"
 	"log"
 	"os"
 	"strings"
 
+	"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"
 )
@@ -43,8 +44,8 @@ type Account struct {
 	Storage map[string]string
 }
 
-func StateObjectFromAccount(addr string, account Account) *state.StateObject {
-	obj := state.NewStateObject(ethutil.Hex2Bytes(addr))
+func StateObjectFromAccount(db ethutil.Database, addr string, account Account) *state.StateObject {
+	obj := state.NewStateObject(ethutil.Hex2Bytes(addr), db)
 	obj.SetBalance(ethutil.Big(account.Balance))
 
 	if ethutil.IsHex(account.Code) {
@@ -66,19 +67,20 @@ type VmTest struct {
 	Pre         map[string]Account
 }
 
-func RunVmTest(js string) (failed int) {
+func RunVmTest(r io.Reader) (failed int) {
 	tests := make(map[string]VmTest)
 
-	data, _ := ioutil.ReadAll(strings.NewReader(js))
+	data, _ := ioutil.ReadAll(r)
 	err := json.Unmarshal(data, &tests)
 	if err != nil {
 		log.Fatalln(err)
 	}
 
 	for name, test := range tests {
-		state := state.New(helper.NewTrie())
+		db, _ := ethdb.NewMemDatabase()
+		state := state.New(nil, db)
 		for addr, account := range test.Pre {
-			obj := StateObjectFromAccount(addr, account)
+			obj := StateObjectFromAccount(db, addr, account)
 			state.SetStateObject(obj)
 		}
 
@@ -118,6 +120,8 @@ func RunVmTest(js string) (failed int) {
 				}
 			}
 		}
+
+		logger.Flush()
 	}
 
 	return
@@ -125,9 +129,10 @@ func RunVmTest(js string) (failed int) {
 
 func main() {
 	helper.Logger.SetLogLevel(5)
-	if len(os.Args) == 1 {
-		log.Fatalln("no json supplied")
-	}
 
-	os.Exit(RunVmTest(os.Args[1]))
+	if len(os.Args) > 1 {
+		os.Exit(RunVmTest(strings.NewReader(os.Args[1])))
+	} else {
+		os.Exit(RunVmTest(os.Stdin))
+	}
 }
diff --git a/cmd/evm/main.go b/cmd/evm/main.go
index 31b7da3c8..f819386fe 100644
--- a/cmd/evm/main.go
+++ b/cmd/evm/main.go
@@ -17,8 +17,6 @@
 /**
  * @authors
  * 	Jeffrey Wilcke <i@jev.io>
- * @date 2014
- *
  */
 
 package main
@@ -37,7 +35,6 @@ import (
 	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/ethutil"
 	"github.com/ethereum/go-ethereum/logger"
-	"github.com/ethereum/go-ethereum/ptrie"
 	"github.com/ethereum/go-ethereum/state"
 	"github.com/ethereum/go-ethereum/vm"
 )
@@ -65,7 +62,7 @@ func main() {
 	ethutil.ReadConfig("/tmp/evmtest", "/tmp/evm", "")
 
 	db, _ := ethdb.NewMemDatabase()
-	statedb := state.New(ptrie.New(nil, db))
+	statedb := state.New(nil, db)
 	sender := statedb.NewStateObject([]byte("sender"))
 	receiver := statedb.NewStateObject([]byte("receiver"))
 	//receiver.SetCode([]byte(*code))
@@ -133,6 +130,12 @@ func (self *VMEnv) Value() *big.Int       { return self.value }
 func (self *VMEnv) GasLimit() *big.Int    { return big.NewInt(1000000000) }
 func (self *VMEnv) Depth() int            { return 0 }
 func (self *VMEnv) SetDepth(i int)        { self.depth = i }
+func (self *VMEnv) GetHash(n uint64) []byte {
+	if self.block.Number().Cmp(big.NewInt(int64(n))) == 0 {
+		return self.block.Hash()
+	}
+	return nil
+}
 func (self *VMEnv) AddLog(log state.Log) {
 	self.state.AddLog(log)
 }
diff --git a/cmd/mist/assets/debugger/debugger.qml b/cmd/mist/assets/debugger/debugger.qml
index b30d20e6b..5566e8fca 100644
--- a/cmd/mist/assets/debugger/debugger.qml
+++ b/cmd/mist/assets/debugger/debugger.qml
@@ -19,7 +19,7 @@ ApplicationWindow {
     property alias dataText: rawDataField.text
 
     onClosing: {
-        dbg.Stop()
+        //dbg.Stop()
     }
 
     menuBar: MenuBar {
@@ -353,6 +353,7 @@ ApplicationWindow {
 
 
         ComboBox {
+		visible: false
             id: snippets
             anchors.right: parent.right
             model: ListModel {
diff --git a/cmd/mist/assets/ext/eth.js/README.md b/cmd/mist/assets/ext/eth.js/README.md
deleted file mode 100644
index 86e2969be..000000000
--- a/cmd/mist/assets/ext/eth.js/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# Ethereum JavaScript API
-
-This is the Ethereum compatible JavaScript API using `Promise`s
-which implements the [Generic JSON RPC](https://github.com/ethereum/wiki/wiki/Generic-JSON-RPC) spec.
-
-For an example see `index.html`.
-
-**Please note this repo is in it's early stage.**
-
-If you'd like to run a WebSocket ethereum node check out
-[go-ethereum](https://github.com/ethereum/go-ethereum).
-
-To install ethereum and spawn a node:
-
-```
-go get github.com/ethereum/go-ethereum/ethereum
-ethereum -ws -loglevel=4
-```
diff --git a/cmd/mist/assets/ext/eth.js/httprpc.js b/cmd/mist/assets/ext/eth.js/httprpc.js
deleted file mode 100644
index 085b4693d..000000000
--- a/cmd/mist/assets/ext/eth.js/httprpc.js
+++ /dev/null
@@ -1,70 +0,0 @@
-(function () {
-    var HttpRpcProvider = function (host) {
-        this.handlers = [];
-        this.host = host;
-    };
-
-    function formatJsonRpcObject(object) {
-        return {
-            jsonrpc: '2.0',
-            method: object.call,
-            params: object.args,
-            id: object._id
-        }
-    };
-
-    function formatJsonRpcMessage(message) {    
-        var object = JSON.parse(message);
-       
-        return {
-            _id: object.id,
-            data: object.result
-        };
-    };
-
-    HttpRpcProvider.prototype.sendRequest = function (payload, cb) {
-        var data = formatJsonRpcObject(payload);
-
-        var request = new XMLHttpRequest();
-        request.open("POST", this.host, true);
-        request.send(JSON.stringify(data));
-        request.onreadystatechange = function () {
-            if (request.readyState === 4 && cb) {
-                cb(request);
-            }
-        }
-    };
-
-    HttpRpcProvider.prototype.send = function (payload) {
-        var self = this;
-        this.sendRequest(payload, function (request) {
-            self.handlers.forEach(function (handler) {
-                handler.call(self, formatJsonRpcMessage(request.responseText));
-            });
-        });
-    };
-
-    HttpRpcProvider.prototype.poll = function (payload, id) {
-        var self = this;
-        this.sendRequest(payload, function (request) {
-            var parsed = JSON.parse(request.responseText);
-            if (parsed.result instanceof Array ? parsed.result.length === 0 : !parsed.result) {
-                return;
-            }
-            self.handlers.forEach(function (handler) {
-                handler.call(self, {_event: payload.call, _id: id, data: parsed.result});
-            });
-        });
-    };
-
-    Object.defineProperty(HttpRpcProvider.prototype, "onmessage", {
-        set: function (handler) {
-            this.handlers.push(handler);
-        }
-    });
-
-    if (typeof(web3) !== "undefined" && web3.providers !== undefined) {
-        web3.providers.HttpRpcProvider = HttpRpcProvider;
-    }
-})();
-
diff --git a/cmd/mist/assets/ext/eth.js/index.html b/cmd/mist/assets/ext/eth.js/index.html
deleted file mode 100644
index 2b3f50a14..000000000
--- a/cmd/mist/assets/ext/eth.js/index.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!doctype>
-<html>
-
-<head>
-<script type="text/javascript" src="main.js"></script>
-<script type="text/javascript" src="websocket.js"></script>
-<script type="text/javascript" src="qt.js"></script>
-<script type="text/javascript" src="httprpc.js"></script>
-<script type="text/javascript">
-function registerName() {
-    var name = document.querySelector("#name").value;
-    name = web3.fromAscii(name);
-
-    var eth = web3.eth;
-    eth.transact({to: "NameReg", gas: "10000", gasPrice: eth.gasPrice, data: [web3.fromAscii("register"), name]}).then(function(tx) {
-        document.querySelector("#result").innerHTML = "Registered name. Please wait for the next block to come through.";
-    }, function(err) {
-        console.log(err); 
-    });
-}
-</script>
-</head>
-
-<body>
-
-<h1>std::name_reg</h1>
-<input type="text" id="name"></input>
-<input type="submit" onClick="registerName();"></input>
-<div id="result"></div>
-
-</body>
-
-</html>
diff --git a/cmd/mist/assets/ext/eth.js/main.js b/cmd/mist/assets/ext/eth.js/main.js
deleted file mode 100644
index 5c7ca0603..000000000
--- a/cmd/mist/assets/ext/eth.js/main.js
+++ /dev/null
@@ -1,432 +0,0 @@
-(function(window) {
-    function isPromise(o) {
-        return o instanceof Promise
-    }
-
-    function flattenPromise (obj) {
-        if (obj instanceof Promise) {
-            return Promise.resolve(obj);
-        }
-
-        if (obj instanceof Array) {
-            return new Promise(function (resolve) {
-                var promises = obj.map(function (o) {
-                    return flattenPromise(o);
-                });
-
-                return Promise.all(promises).then(function (res) {
-                    for (var i = 0; i < obj.length; i++) {
-                        obj[i] = res[i];
-                    }
-                    resolve(obj);
-                });
-            });
-        }
-        
-        if (obj instanceof Object) {
-            return new Promise(function (resolve) {
-                var keys = Object.keys(obj);
-                var promises = keys.map(function (key) {
-                    return flattenPromise(obj[key]);
-                });
-
-                return Promise.all(promises).then(function (res) {
-                    for (var i = 0; i < keys.length; i++) {
-                        obj[keys[i]] = res[i];
-                    }
-                    resolve(obj);
-                });
-            });
-        }
-
-        return Promise.resolve(obj);
-    };
-
-    var ethMethods = function () {
-        var blockCall = function (args) {
-            return typeof args[0] === "string" ? "blockByHash" : "blockByNumber";
-        };
-
-        var transactionCall = function (args) {
-            return typeof args[0] === "string" ? 'transactionByHash' : 'transactionByNumber';   
-        };
-
-        var uncleCall = function (args) {
-            return typeof args[0] === "string" ? 'uncleByHash' : 'uncleByNumber';       
-        };
-
-        var methods = [
-        { name: 'balanceAt', call: 'balanceAt' },
-        { name: 'stateAt', call: 'stateAt' },
-        { name: 'countAt', call: 'countAt'},
-        { name: 'codeAt', call: 'codeAt' },
-        { name: 'transact', call: 'transact' },
-        { name: 'call', call: 'call' },
-        { name: 'block', call: blockCall },
-        { name: 'transaction', call: transactionCall },
-        { name: 'uncle', call: uncleCall },
-        { name: 'compile', call: 'compile' }
-        ];
-        return methods;
-    };
-
-    var ethProperties = function () {
-        return [
-        { name: 'coinbase', getter: 'coinbase', setter: 'setCoinbase' },
-        { name: 'listening', getter: 'listening', setter: 'setListening' },
-        { name: 'mining', getter: 'mining', setter: 'setMining' },
-        { name: 'gasPrice', getter: 'gasPrice' },
-        { name: 'account', getter: 'account' },
-        { name: 'accounts', getter: 'accounts' },
-        { name: 'peerCount', getter: 'peerCount' },
-        { name: 'defaultBlock', getter: 'defaultBlock', setter: 'setDefaultBlock' },
-        { name: 'number', getter: 'number'}
-        ];
-    };
-
-    var dbMethods = function () {
-        return [
-        { name: 'put', call: 'put' },
-        { name: 'get', call: 'get' },
-        { name: 'putString', call: 'putString' },
-        { name: 'getString', call: 'getString' }
-        ];
-    };
-
-    var shhMethods = function () {
-        return [
-        { name: 'post', call: 'post' },
-        { name: 'newIdentity', call: 'newIdentity' },
-        { name: 'haveIdentity', call: 'haveIdentity' },
-        { name: 'newGroup', call: 'newGroup' },
-        { name: 'addToGroup', call: 'addToGroup' }
-        ];
-    };
-
-    var ethWatchMethods = function () {
-        var newFilter = function (args) {
-            return typeof args[0] === 'string' ? 'newFilterString' : 'newFilter';
-        };
-
-        return [
-        { name: 'newFilter', call: newFilter },
-        { name: 'uninstallFilter', call: 'uninstallFilter' },
-        { name: 'getMessages', call: 'getMessages' }
-        ];
-    };
-
-    var shhWatchMethods = function () {
-        return [
-        { name: 'newFilter', call: 'shhNewFilter' },
-        { name: 'uninstallFilter', call: 'shhUninstallFilter' },
-        { name: 'getMessage', call: 'shhGetMessages' }
-        ];
-    };
-
-    var setupMethods = function (obj, methods) {
-        methods.forEach(function (method) {
-            obj[method.name] = function () {
-                return flattenPromise(Array.prototype.slice.call(arguments)).then(function (args) {
-                    var call = typeof method.call === "function" ? method.call(args) : method.call; 
-                    return {call: call, args: args};
-                }).then(function (request) {
-                    return new Promise(function (resolve, reject) {
-                        web3.provider.send(request, function (result) {
-                            //if (result || typeof result === "boolean") {
-                                resolve(result);
-                                return;
-                            //} 
-                            //reject(result);
-                        });
-                    });
-                }).catch(function( err) {
-                    console.error(err);
-                });
-            };
-        });
-    };
-
-    var setupProperties = function (obj, properties) {
-        properties.forEach(function (property) {
-            var proto = {};
-            proto.get = function () {
-                return new Promise(function(resolve, reject) {
-                    web3.provider.send({call: property.getter}, function(result) {
-                        resolve(result);
-                    });
-                });
-            };
-            if (property.setter) {
-                proto.set = function (val) {
-                    return flattenPromise([val]).then(function (args) {
-                        return new Promise(function (resolve) {
-                            web3.provider.send({call: property.setter, args: args}, function (result) {
-                                resolve(result);
-                            });
-                        });
-                    }).catch(function (err) {
-                        console.error(err);
-                    });
-                }
-            }
-            Object.defineProperty(obj, property.name, proto);
-        });
-    };
-    
-    var web3 = {
-        _callbacks: {},
-        _events: {},
-        providers: {},
-        toHex: function(str) {
-            var hex = "";
-            for(var i = 0; i < str.length; i++) {
-                var n = str.charCodeAt(i).toString(16);
-                hex += n.length < 2 ? '0' + n : n;
-            }
-
-            return hex;
-        },
-
-        toAscii: function(hex) {
-            // Find termination
-            var str = "";
-            var i = 0, l = hex.length;
-            for(; i < l; i+=2) {
-                var code = hex.charCodeAt(i)
-                if(code == 0) {
-                    break;
-                }
-
-                str += String.fromCharCode(parseInt(hex.substr(i, 2), 16));
-            }
-
-            return str;
-        },
-
-        toDecimal: function (val) {
-            return parseInt(val, 16);         
-        },
-
-        fromAscii: function(str, pad) {
-            pad = pad === undefined ? 32 : pad;
-            var hex = this.toHex(str);
-            while(hex.length < pad*2)
-                hex += "00";
-            return hex
-        },
-
-        eth: {
-            prototype: Object(),
-            watch: function (params) {
-                return new Filter(params, ethWatch);
-            },
-        },
-
-        db: {
-            prototype: Object()
-        },
-
-        shh: {
-            prototype: Object(),
-            watch: function (params) {
-                return new Filter(params, shhWatch);
-            }
-        },
-
-        on: function(event, id, cb) {
-            if(web3._events[event] === undefined) {
-                web3._events[event] = {};
-            }
-
-            web3._events[event][id] = cb;
-            return this
-        },
-
-        off: function(event, id) {
-            if(web3._events[event] !== undefined) {
-                delete web3._events[event][id];
-            }
-
-            return this
-        },
-
-        trigger: function(event, id, data) {
-            var callbacks = web3._events[event];
-            if (!callbacks || !callbacks[id]) {
-                return;
-            }
-            var cb = callbacks[id];
-            cb(data);
-        },
-    };
-
-    var eth = web3.eth;
-    setupMethods(eth, ethMethods());
-    setupProperties(eth, ethProperties());
-    setupMethods(web3.db, dbMethods());
-    setupMethods(web3.shh, shhMethods());
-
-    var ethWatch = {
-        changed: 'changed'
-    };
-    setupMethods(ethWatch, ethWatchMethods());
-    var shhWatch = {
-        changed: 'shhChanged'
-    };
-    setupMethods(shhWatch, shhWatchMethods());
-
-    var ProviderManager = function() {
-        this.queued = [];
-        this.polls = [];
-        this.ready = false;
-        this.provider = undefined;
-        this.id = 1;
-
-        var self = this;
-        var poll = function () {
-            if (self.provider && self.provider.poll) {
-                self.polls.forEach(function (data) {
-                    data.data._id = self.id; 
-                    self.id++;
-                    self.provider.poll(data.data, data.id);
-                });
-            }
-            setTimeout(poll, 12000);
-        };
-        poll();
-    };
-
-    ProviderManager.prototype.send = function(data, cb) {
-        data._id = this.id;
-        if (cb) {
-            web3._callbacks[data._id] = cb;
-        }
-
-        data.args = data.args || [];
-        this.id++;
-
-        if(this.provider !== undefined) {
-            this.provider.send(data);
-        } else {
-            console.warn("provider is not set");
-            this.queued.push(data);
-        }
-    };
-
-    ProviderManager.prototype.set = function(provider) {
-        if(this.provider !== undefined && this.provider.unload !== undefined) {
-            this.provider.unload();
-        }
-
-        this.provider = provider;
-        this.ready = true;
-    };
-
-    ProviderManager.prototype.sendQueued = function() {
-        for(var i = 0; this.queued.length; i++) {
-            // Resend
-            this.send(this.queued[i]);
-        }
-    };
-
-    ProviderManager.prototype.installed = function() {
-        return this.provider !== undefined;
-    };
-
-    ProviderManager.prototype.startPolling = function (data, pollId) {
-        if (!this.provider || !this.provider.poll) {
-            return;
-        }
-        this.polls.push({data: data, id: pollId});
-    };
-
-    ProviderManager.prototype.stopPolling = function (pollId) {
-        for (var i = this.polls.length; i--;) {
-            var poll = this.polls[i];
-            if (poll.id === pollId) {
-                this.polls.splice(i, 1);
-            }
-        }
-    };
-
-    web3.provider = new ProviderManager();
-
-    web3.setProvider = function(provider) {
-        provider.onmessage = messageHandler;
-        web3.provider.set(provider);
-        web3.provider.sendQueued();
-    };
-
-    var Filter = function(options, impl) {
-        this.impl = impl;
-        this.callbacks = [];
-
-        var self = this; 
-        this.promise = impl.newFilter(options); 
-        this.promise.then(function (id) {
-            self.id = id;
-            web3.on(impl.changed, id, self.trigger.bind(self));
-            web3.provider.startPolling({call: impl.changed, args: [id]}, id);
-        });
-    };
-
-    Filter.prototype.arrived = function(callback) {
-        this.changed(callback);
-    }
-
-    Filter.prototype.changed = function(callback) {
-        var self = this;
-        this.promise.then(function(id) {
-            self.callbacks.push(callback);
-        });
-    };
-
-    Filter.prototype.trigger = function(messages) {
-        for(var i = 0; i < this.callbacks.length; i++) {
-            this.callbacks[i].call(this, messages);
-        }
-    };
-
-    Filter.prototype.uninstall = function() {
-        var self = this;
-        this.promise.then(function (id) {
-            self.impl.uninstallFilter(id);
-            web3.provider.stopPolling(id);
-            web3.off(impl.changed, id);
-        });
-    };
-
-    Filter.prototype.messages = function() {
-        var self = this;    
-        return this.promise.then(function (id) {
-            return self.impl.getMessages(id);
-        });
-    };
-
-    function messageHandler(data) {
-        if(data._event !== undefined) {
-            web3.trigger(data._event, data._id, data.data);
-            return;
-        }
-        
-        if(data._id) {
-            var cb = web3._callbacks[data._id];
-            if (cb) {
-                cb.call(this, data.data)
-                delete web3._callbacks[data._id];
-            }
-        }
-    }
-
-    /*
-    // Install default provider
-    if(!web3.provider.installed()) {
-        var sock = new web3.WebSocket("ws://localhost:40404/eth");
-
-        web3.setProvider(sock);
-    }
-    */
-
-    window.web3 = web3;
-
-})(this);
diff --git a/cmd/mist/assets/ext/eth.js/qt.js b/cmd/mist/assets/ext/eth.js/qt.js
deleted file mode 100644
index 644c37737..000000000
--- a/cmd/mist/assets/ext/eth.js/qt.js
+++ /dev/null
@@ -1,27 +0,0 @@
-(function() {
-    var QtProvider = function() {
-        this.handlers = [];
-        
-        var self = this;
-        navigator.qt.onmessage = function (message) {
-            self.handlers.forEach(function (handler) {
-                handler.call(self, JSON.parse(message.data));
-            });
-        }
-    };
-
-    QtProvider.prototype.send = function(payload) {
-        navigator.qt.postMessage(JSON.stringify(payload));
-    };
-
-    Object.defineProperty(QtProvider.prototype, "onmessage", {
-        set: function(handler) {
-            this.handlers.push(handler);
-        },
-    }); 
-
-    if(typeof(web3) !== "undefined" && web3.providers !== undefined) {
-        web3.providers.QtProvider = QtProvider;
-    }
-})();
-
diff --git a/cmd/mist/assets/ext/eth.js/websocket.js b/cmd/mist/assets/ext/eth.js/websocket.js
deleted file mode 100644
index 732a086f2..000000000
--- a/cmd/mist/assets/ext/eth.js/websocket.js
+++ /dev/null
@@ -1,51 +0,0 @@
-(function() {
-    var WebSocketProvider = function(host) {
-        // onmessage handlers
-        this.handlers = [];
-        // queue will be filled with messages if send is invoked before the ws is ready
-        this.queued = [];
-        this.ready = false;
-
-        this.ws = new WebSocket(host);
-
-        var self = this;
-        this.ws.onmessage = function(event) {
-            for(var i = 0; i < self.handlers.length; i++) {
-                self.handlers[i].call(self, JSON.parse(event.data), event)
-            }
-        };
-
-        this.ws.onopen = function() {
-            self.ready = true;
-
-            for(var i = 0; i < self.queued.length; i++) {
-                // Resend
-                self.send(self.queued[i]);
-            }
-        };
-    };
-    WebSocketProvider.prototype.send = function(payload) {
-        if(this.ready) {
-            var data = JSON.stringify(payload);
-
-            this.ws.send(data);
-        } else {
-            this.queued.push(payload);
-        }
-    };
-
-    WebSocketProvider.prototype.onMessage = function(handler) {
-        this.handlers.push(handler);
-    };
-
-    WebSocketProvider.prototype.unload = function() {
-        this.ws.close();
-    };
-    Object.defineProperty(WebSocketProvider.prototype, "onmessage", {
-        set: function(provider) { this.onMessage(provider); }
-    });
-
-    if(typeof(web3) !== "undefined" && web3.providers !== undefined) {
-        web3.providers.WebSocketProvider = WebSocketProvider;
-    }
-})();
diff --git a/cmd/mist/assets/ext/ethereum.js b/cmd/mist/assets/ext/ethereum.js
deleted file mode 100644
index aeb79e488..000000000
--- a/cmd/mist/assets/ext/ethereum.js
+++ /dev/null
@@ -1,312 +0,0 @@
-// Copyright (c) 2013-2014, Jeffrey Wilcke. All rights reserved.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-// MA 02110-1301  USA
-
-// Main Ethereum library
-window.eth = {
-	prototype: Object(),
-	_callbacks: {},
-	_onCallbacks: {},
-
-    test: function() {
-        var t = undefined;
-	postData({call: "test"})
-        navigator.qt.onmessage = function(d) {console.log("onmessage called"); t = d; }
-        for(;;) {
-            if(t !== undefined) {
-                return t
-            }
-        }
-    },
-
-	mutan: function(code, cb) {
-		postData({call: "mutan", args: [code]}, cb)
-	},
-
-	toHex: function(str) {
-		var hex = "";
-		for(var i = 0; i < str.length; i++) {
-			var n = str.charCodeAt(i).toString(16);
-			hex += n.length < 2 ? '0' + n : n;
-		}
-
-		return hex;
-	},
-
-	toAscii: function(hex) {
-		// Find termination
-		var str = "";
-		var i = 0, l = hex.length;
-		for(; i < l; i+=2) {
-			var code = hex.charCodeAt(i)
-			if(code == 0) {
-				break;
-			}
-
-			str += String.fromCharCode(parseInt(hex.substr(i, 2), 16));
-		}
-
-		return str;
-	},
-
-	fromAscii: function(str, pad) {
-		if(pad === undefined) {
-			pad = 32
-		}
-
-		var hex = this.toHex(str);
-
-		while(hex.length < pad*2)
-			hex += "00";
-
-		return hex
-	},
-
-
-	// Retrieve block
-	//
-	// Either supply a number or a string. Type is determent for the lookup method
-	// string - Retrieves the block by looking up the hash
-	// number - Retrieves the block by looking up the block number
-	getBlock: function(numberOrHash, cb) {
-		var func;
-		if(typeof numberOrHash == "string") {
-			func =  "getBlockByHash";
-		} else {
-			func =  "getBlockByNumber";
-		}
-		postData({call: func, args: [numberOrHash]}, cb);
-	},
-
-	// Create transaction
-	//
-	// Transact between two state objects
-	transact: function(params, cb) {
-		if(params === undefined) {
-			params = {};
-		}
-
-		if(params.endowment !== undefined)
-			params.value = params.endowment;
-		if(params.code !== undefined)
-			params.data = params.code;
-
-		// Make sure everything is string
-		var fields = ["to", "from", "value", "gas", "gasPrice"];
-		for(var i = 0; i < fields.length; i++) {
-			if(params[fields[i]] === undefined) {
-				params[fields[i]] = "";
-			}
-			params[fields[i]] = params[fields[i]].toString();
-		}
-
-		var data;
-		if(typeof params.data === "object") {
-			data = "";
-			for(var i = 0; i < params.data.length; i++) {
-				data += params.data[i]
-			}
-		} else {
-			data = params.data;
-		}
-
-		postData({call: "transact", args: [params.from, params.to, params.value, params.gas, params.gasPrice, "0x"+data]}, cb);
-	},
-
-	getMessages: function(filter, cb) {
-		postData({call: "messages", args: [filter]}, cb);
-	},
-
-	getStorageAt: function(address, storageAddress, cb) {
-		postData({call: "getStorage", args: [address, storageAddress]}, cb);
-	},
-
-	getEachStorageAt: function(address, cb){
-		postData({call: "getEachStorage", args: [address]}, cb);
-	},
-
-	getKey: function(cb) {
-		postData({call: "getKey"}, cb);
-	},
-
-	getTxCountAt: function(address, cb) {
-		postData({call: "getTxCountAt", args: [address]}, cb);
-	},
-	getIsMining: function(cb){
-		postData({call: "getIsMining"}, cb)
-	},
-	getIsListening: function(cb){
-		postData({call: "getIsListening"}, cb)
-	},
-	getCoinBase: function(cb){
-		postData({call: "getCoinBase"}, cb);
-	},
-	getPeerCount: function(cb){
-		postData({call: "getPeerCount"}, cb);
-	},
-	getBalanceAt: function(address, cb) {
-		postData({call: "getBalance", args: [address]}, cb);
-	},
-	getTransactionsFor: function(address, cb) {
-		postData({call: "getTransactionsFor", args: [address]}, cb);
-	},
-
-	getSecretToAddress: function(sec, cb) {
-		postData({call: "getSecretToAddress", args: [sec]}, cb);
-	},
-
-	/*
-	watch: function(address, storageAddrOrCb, cb) {
-		var ev;
-		if(cb === undefined) {
-			cb = storageAddrOrCb;
-			storageAddrOrCb = "";
-			ev = "object:"+address;
-		} else {
-			ev = "storage:"+address+":"+storageAddrOrCb;
-		}
-
-		eth.on(ev, cb)
-
-		postData({call: "watch", args: [address, storageAddrOrCb]});
-	},
-
-	disconnect: function(address, storageAddrOrCb, cb) {
-		var ev;
-		if(cb === undefined) {
-			cb = storageAddrOrCb;
-			storageAddrOrCb = "";
-			ev = "object:"+address;
-		} else {
-			ev = "storage:"+address+":"+storageAddrOrCb;
-		}
-
-		eth.off(ev, cb)
-
-		postData({call: "disconnect", args: [address, storageAddrOrCb]});
-	},
-	*/
-
-       watch: function(options) {
-	       var filter = new Filter(options);
-	       filter.number = newWatchNum().toString()
-
-	       postData({call: "watch", args: [options, filter.number]})
-
-	       return filter;
-       },
-
-	set: function(props) {
-		postData({call: "set", args: props});
-	},
-
-	on: function(event, cb) {
-		if(eth._onCallbacks[event] === undefined) {
-			eth._onCallbacks[event] = [];
-		}
-
-		eth._onCallbacks[event].push(cb);
-
-		return this
-	},
-
-	off: function(event, cb) {
-		if(eth._onCallbacks[event] !== undefined) {
-			var callbacks = eth._onCallbacks[event];
-			for(var i = 0; i < callbacks.length; i++) {
-				if(callbacks[i] === cb) {
-					delete callbacks[i];
-				}
-			}
-		}
-
-		return this
-	},
-
-	trigger: function(event, data) {
-		var callbacks = eth._onCallbacks[event];
-		if(callbacks !== undefined) {
-			for(var i = 0; i < callbacks.length; i++) {
-				// Figure out whether the returned data was an array
-				// array means multiple return arguments (multiple params)
-				if(data instanceof Array) {
-					callbacks[i].apply(this, data);
-				} else {
-					callbacks[i].call(this, data);
-				}
-			}
-		}
-	},
-}
-
-
-var Filter = function(options) {
-	this.options = options;
-};
-Filter.prototype.changed = function(callback) {
-	// Register the watched:<number>. Qml will call the appropriate event if anything
-	// interesting happens in the land of Go.
-	eth.on("watched:"+this.number, callback)
-}
-Filter.prototype.getMessages = function(cb) {
-	return eth.getMessages(this.options, cb)
-}
-
-var watchNum = 0;
-function newWatchNum() {
-	return watchNum++;
-}
-
-function postData(data, cb) {
-	data._seed = Math.floor(Math.random() * 1000000)
-	if(cb) {
-		eth._callbacks[data._seed] = cb;
-	}
-
-	if(data.args === undefined) {
-		data.args = [];
-	}
-
-	navigator.qt.postMessage(JSON.stringify(data));
-}
-
-navigator.qt.onmessage = function(ev) {
-	var data = JSON.parse(ev.data)
-
-	if(data._event !== undefined) {
-		eth.trigger(data._event, data.data);
-	} else {
-		if(data._seed) {
-			var cb = eth._callbacks[data._seed];
-			if(cb) {
-				cb.call(this, data.data)
-
-				// Remove the "trigger" callback
-				delete eth._callbacks[ev._seed];
-			}
-		}
-	}
-}
-
-eth.on("chain:changed", function() {
-})
-
-eth.on("messages", { /* filters */}, function(messages){
-})
-
-eth.on("pending:changed", function() {
-})
-
diff --git a/cmd/mist/assets/ext/ethereum.js/.bowerrc b/cmd/mist/assets/ext/ethereum.js/.bowerrc
new file mode 100644
index 000000000..c3a8813e8
--- /dev/null
+++ b/cmd/mist/assets/ext/ethereum.js/.bowerrc
@@ -0,0 +1,5 @@
+{
+  "directory": "example/js/",
+  "cwd": "./",
+  "analytics": false
+}
\ No newline at end of file
diff --git a/cmd/mist/assets/ext/ethereum.js/.editorconfig b/cmd/mist/assets/ext/ethereum.js/.editorconfig
new file mode 100644
index 000000000..60a2751d3
--- /dev/null
+++ b/cmd/mist/assets/ext/ethereum.js/.editorconfig
@@ -0,0 +1,12 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
\ No newline at end of file
diff --git a/cmd/mist/assets/ext/eth.js/.gitignore b/cmd/mist/assets/ext/ethereum.js/.gitignore
index de3a847ac..399b6dc88 100644
--- a/cmd/mist/assets/ext/eth.js/.gitignore
+++ b/cmd/mist/assets/ext/ethereum.js/.gitignore
@@ -4,6 +4,7 @@
 # or operating system, you probably want to add a global ignore instead:
 #   git config --global core.excludesfile ~/.gitignore_global
 
+*.swp
 /tmp
 */**/*un~
 *un~
@@ -11,4 +12,7 @@
 */**/.DS_Store
 ethereum/ethereum
 ethereal/ethereal
-
+example/js
+node_modules
+bower_components
+npm-debug.log
diff --git a/cmd/mist/assets/ext/ethereum.js/.jshintrc b/cmd/mist/assets/ext/ethereum.js/.jshintrc
new file mode 100644
index 000000000..c0ec5f89d
--- /dev/null
+++ b/cmd/mist/assets/ext/ethereum.js/.jshintrc
@@ -0,0 +1,50 @@
+{
+    "predef": [
+        "console",
+        "require",
+        "equal",
+        "test",
+        "testBoth",
+        "testWithDefault",
+        "raises",
+        "deepEqual",
+        "start",
+        "stop",
+        "ok",
+        "strictEqual",
+        "module",
+        "expect",
+        "reject",
+        "impl"
+    ],
+
+    "esnext": true,
+    "proto": true,
+    "node" : true,
+    "browser" : true,
+    "browserify" : true,
+
+    "boss" : true,
+    "curly": false,
+    "debug": true,
+    "devel": true,
+    "eqeqeq": true,
+    "evil": true,
+    "forin": false,
+    "immed": false,
+    "laxbreak": false,
+    "newcap": true,
+    "noarg": true,
+    "noempty": false,
+    "nonew": false,
+    "nomen": false,
+    "onevar": false,
+    "plusplus": false,
+    "regexp": false,
+    "undef": true,
+    "sub": true,
+    "strict": false,
+    "white": false,
+    "shadow": true,
+    "eqnull": true
+}
\ No newline at end of file
diff --git a/cmd/mist/assets/ext/ethereum.js/.npmignore b/cmd/mist/assets/ext/ethereum.js/.npmignore
new file mode 100644
index 000000000..5bbffe4fd
--- /dev/null
+++ b/cmd/mist/assets/ext/ethereum.js/.npmignore
@@ -0,0 +1,9 @@
+example/js
+node_modules
+test
+.gitignore
+.editorconfig
+.travis.yml
+.npmignore
+component.json
+testling.html
\ No newline at end of file
diff --git a/cmd/mist/assets/ext/ethereum.js/.travis.yml b/cmd/mist/assets/ext/ethereum.js/.travis.yml
new file mode 100644
index 000000000..fafacbd5a
--- /dev/null
+++ b/cmd/mist/assets/ext/ethereum.js/.travis.yml
@@ -0,0 +1,11 @@
+language: node_js
+node_js:
+  - "0.11"
+  - "0.10"
+before_script:
+  - npm install
+  - npm install jshint
+script:
+   - "jshint *.js lib"
+after_script:
+  - npm run-script gulp
diff --git a/cmd/mist/assets/ext/ethereum.js/LICENSE b/cmd/mist/assets/ext/ethereum.js/LICENSE
new file mode 100644
index 000000000..0f187b873
--- /dev/null
+++ b/cmd/mist/assets/ext/ethereum.js/LICENSE
@@ -0,0 +1,14 @@
+This file is part of ethereum.js.
+
+ethereum.js is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+ethereum.js is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
\ No newline at end of file
diff --git a/cmd/mist/assets/ext/ethereum.js/README.md b/cmd/mist/assets/ext/ethereum.js/README.md
new file mode 100644
index 000000000..865b62c6b
--- /dev/null
+++ b/cmd/mist/assets/ext/ethereum.js/README.md
@@ -0,0 +1,79 @@
+# Ethereum JavaScript API
+
+This is the Ethereum compatible JavaScript API using `Promise`s
+which implements the [Generic JSON RPC](https://github.com/ethereum/wiki/wiki/Generic-JSON-RPC) spec. It's available on npm as a node module and also for bower and component as an embeddable js
+
+[![NPM version][npm-image]][npm-url] [![Build Status][travis-image]][travis-url] [![dependency status][dep-image]][dep-url] [![dev dependency status][dep-dev-image]][dep-dev-url]
+
+<!-- [![browser support](https://ci.testling.com/ethereum/ethereum.js.png)](https://ci.testling.com/ethereum/ethereum.js) -->
+
+## Installation
+
+### Node.js
+
+    npm install ethereum.js
+
+### For browser
+Bower
+
+	bower install ethereum.js
+
+Component
+
+	component install ethereum/ethereum.js
+
+* Include `ethereum.min.js` in your html file.
+* Include [es6-promise](https://github.com/jakearchibald/es6-promise) or another ES6-Shim if your browser doesn't support ECMAScript 6.
+
+## Usage
+Require the library:
+
+	var web3 = require('web3');
+
+Set a provider (QtProvider, WebSocketProvider, HttpRpcProvider)
+
+	var web3.setProvider(new web3.providers.WebSocketProvider('ws://localhost:40404/eth'));
+
+There you go, now you can use it:
+
+```
+web3.eth.coinbase.then(function(result){
+  console.log(result);
+  return web3.eth.balanceAt(result);
+}).then(function(balance){
+  console.log(web3.toDecimal(balance));
+}).catch(function(err){
+  console.log(err);
+});
+```
+
+
+For another example see `example/index.html`.
+
+## Building
+
+* `gulp build`
+
+
+### Testing
+
+**Please note this repo is in it's early stage.**
+
+If you'd like to run a WebSocket ethereum node check out
+[go-ethereum](https://github.com/ethereum/go-ethereum).
+
+To install ethereum and spawn a node:
+
+```
+go get github.com/ethereum/go-ethereum/ethereum
+ethereum -ws -loglevel=4
+```
+
+[npm-image]: https://badge.fury.io/js/ethereum.js.png
+[npm-url]: https://npmjs.org/package/ethereum.js
+[travis-image]: https://travis-ci.org/ethereum/ethereum.js.svg
+[travis-url]: https://travis-ci.org/ethereum/ethereum.js
+[dep-image]: https://david-dm.org/ethereum/ethereum.js.svg
+[dep-url]: https://david-dm.org/ethereum/ethereum.js
+[dep-dev-image]: https://david-dm.org/ethereum/ethereum.js/dev-status.svg
+[dep-dev-url]: https://david-dm.org/ethereum/ethereum.js#info=devDependencies
\ No newline at end of file
diff --git a/cmd/mist/assets/ext/ethereum.js/bower.json b/cmd/mist/assets/ext/ethereum.js/bower.json
new file mode 100644
index 000000000..cedae9023
--- /dev/null
+++ b/cmd/mist/assets/ext/ethereum.js/bower.json
@@ -0,0 +1,51 @@
+{
+  "name": "ethereum.js",
+  "namespace": "ethereum",
+  "version": "0.0.3",
+  "description": "Ethereum Compatible JavaScript API",
+  "main": ["./dist/ethereum.js", "./dist/ethereum.min.js"],
+  "dependencies": {
+    "es6-promise": "#master"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/ethereum/ethereum.js.git"
+  },
+  "homepage": "https://github.com/ethereum/ethereum.js",
+  "bugs": {
+    "url": "https://github.com/ethereum/ethereum.js/issues"
+  },
+  "keywords": [
+    "ethereum",
+    "javascript",
+    "API"
+  ],
+  "authors": [
+    {
+      "name": "Marek Kotewicz",
+      "email": "marek@ethdev.com",
+      "homepage": "https://github.com/debris"
+    },
+    {
+      "name": "Marian Oancea",
+      "email": "marian@ethdev.com",
+      "homepage": "https://github.com/cubedro"
+    }
+  ],
+  "license": "LGPL-3.0",
+  "ignore": [
+    "example",
+    "lib",
+    "node_modules",
+    "package.json",
+    ".bowerrc",
+    ".editorconfig",
+    ".gitignore",
+    ".jshintrc",
+    ".npmignore",
+    ".travis.yml",
+    "gulpfile.js",
+    "index.js",
+    "**/*.txt"
+  ]
+}
\ No newline at end of file
diff --git a/cmd/mist/assets/ext/ethereum.js/dist/ethereum.js b/cmd/mist/assets/ext/ethereum.js/dist/ethereum.js
new file mode 100644
index 000000000..4f4b5d326
--- /dev/null
+++ b/cmd/mist/assets/ext/ethereum.js/dist/ethereum.js
@@ -0,0 +1,1184 @@
+require=(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+/*
+    This file is part of ethereum.js.
+
+    ethereum.js is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ethereum.js is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file abi.js
+ * @authors:
+ *   Marek Kotewicz <marek@ethdev.com>
+ *   Gav Wood <g@ethdev.com>
+ * @date 2014
+ */
+
+// TODO: is these line is supposed to be here? 
+if ("build" !== 'build') {/*
+    var web3 = require('./web3'); // jshint ignore:line
+*/}
+
+// TODO: make these be actually accurate instead of falling back onto JS's doubles.
+var hexToDec = function (hex) {
+    return parseInt(hex, 16).toString();
+};
+
+var decToHex = function (dec) {
+    return parseInt(dec).toString(16);
+};
+
+var findIndex = function (array, callback) {
+    var end = false;
+    var i = 0;
+    for (; i < array.length && !end; i++) {
+        end = callback(array[i]);
+    }
+    return end ? i - 1 : -1;
+};
+
+var findMethodIndex = function (json, methodName) {
+    return findIndex(json, function (method) {
+        return method.name === methodName;
+    });
+};
+
+var padLeft = function (string, chars) {
+    return new Array(chars - string.length + 1).join("0") + string;
+};
+
+var calcBitPadding = function (type, expected) {
+    var value = type.slice(expected.length);
+    if (value === "") {
+        return 32;
+    }
+    return parseInt(value) / 8;
+};
+
+var calcBytePadding = function (type, expected) {
+    var value = type.slice(expected.length);
+    if (value === "") {
+        return 32;
+    }
+    return parseInt(value);
+};
+
+var calcRealPadding = function (type, expected) {
+    var value = type.slice(expected.length);
+    if (value === "") {
+        return 32;
+    }
+    var sizes = value.split('x');
+    for (var padding = 0, i = 0; i < sizes; i++) {
+        padding += (sizes[i] / 8);
+    }
+    return padding;
+};
+
+var setupInputTypes = function () {
+    
+    var prefixedType = function (prefix, calcPadding) {
+        return function (type, value) {
+            var expected = prefix;
+            if (type.indexOf(expected) !== 0) {
+                return false;
+            }
+
+            var padding = calcPadding(type, expected);
+            if (typeof value === "number")
+                value = value.toString(16);
+            else if (typeof value === "string")
+                value = web3.toHex(value); 
+            else if (value.indexOf('0x') === 0)
+                value = value.substr(2);
+            else
+                value = (+value).toString(16);
+            return padLeft(value, padding * 2);
+        };
+    };
+
+    var namedType = function (name, padding, formatter) {
+        return function (type, value) {
+            if (type !== name) {
+                return false;
+            }
+
+            return padLeft(formatter ? formatter(value) : value, padding * 2);
+        };
+    };
+
+    var formatBool = function (value) {
+        return value ? '0x1' : '0x0';
+    };
+
+    return [
+        prefixedType('uint', calcBitPadding),
+        prefixedType('int', calcBitPadding),
+        prefixedType('hash', calcBitPadding),
+        prefixedType('string', calcBytePadding),
+        prefixedType('real', calcRealPadding),
+        prefixedType('ureal', calcRealPadding),
+        namedType('address', 20),
+        namedType('bool', 1, formatBool),
+    ];
+};
+
+var inputTypes = setupInputTypes();
+
+var toAbiInput = function (json, methodName, params) {
+    var bytes = "";
+    var index = findMethodIndex(json, methodName);
+
+    if (index === -1) {
+        return;
+    }
+
+    bytes = "0x" + padLeft(index.toString(16), 2);
+    var method = json[index];
+
+    for (var i = 0; i < method.inputs.length; i++) {
+        var found = false;
+        for (var j = 0; j < inputTypes.length && !found; j++) {
+            found = inputTypes[j](method.inputs[i].type, params[i]);
+        }
+        if (!found) {
+            console.error('unsupported json type: ' + method.inputs[i].type);
+        }
+        bytes += found;
+    }
+    return bytes;
+};
+
+var setupOutputTypes = function () {
+
+    var prefixedType = function (prefix, calcPadding) {
+        return function (type) {
+            var expected = prefix;
+            if (type.indexOf(expected) !== 0) {
+                return -1;
+            }
+
+            var padding = calcPadding(type, expected);
+            return padding * 2;
+        };
+    };
+
+    var namedType = function (name, padding) {
+        return function (type) {
+            return name === type ? padding * 2 : -1;
+        };
+    };
+
+    var formatInt = function (value) {
+        return value.length <= 8 ? +parseInt(value, 16) : hexToDec(value);
+    };
+
+    var formatHash = function (value) {
+        return "0x" + value;
+    };
+
+    var formatBool = function (value) {
+        return value === '1' ? true : false;
+    };
+
+    var formatString = function (value) {
+        return web3.toAscii(value);
+    };
+
+    return [
+    { padding: prefixedType('uint', calcBitPadding), format: formatInt },
+    { padding: prefixedType('int', calcBitPadding), format: formatInt },
+    { padding: prefixedType('hash', calcBitPadding), format: formatHash },
+    { padding: prefixedType('string', calcBytePadding), format: formatString },
+    { padding: prefixedType('real', calcRealPadding), format: formatInt },
+    { padding: prefixedType('ureal', calcRealPadding), format: formatInt },
+    { padding: namedType('address', 20) },
+    { padding: namedType('bool', 1), format: formatBool }
+    ];
+};
+
+var outputTypes = setupOutputTypes();
+
+var fromAbiOutput = function (json, methodName, output) {
+    var index = findMethodIndex(json, methodName);
+
+    if (index === -1) {
+        return;
+    }
+
+    output = output.slice(2);
+
+    var result = [];
+    var method = json[index];
+    for (var i = 0; i < method.outputs.length; i++) {
+        var padding = -1;
+        for (var j = 0; j < outputTypes.length && padding === -1; j++) {
+            padding = outputTypes[j].padding(method.outputs[i].type);
+        }
+
+        if (padding === -1) {
+            // not found output parsing
+            continue;
+        }
+        var res = output.slice(0, padding);
+        var formatter = outputTypes[j - 1].format;
+        result.push(formatter ? formatter(res) : ("0x" + res));
+        output = output.slice(padding);
+    }
+
+    return result;
+};
+
+var inputParser = function (json) {
+    var parser = {};
+    json.forEach(function (method) {
+        parser[method.name] = function () {
+            var params = Array.prototype.slice.call(arguments);
+            return toAbiInput(json, method.name, params);
+        };
+    });
+
+    return parser;
+};
+
+var outputParser = function (json) {
+    var parser = {};
+    json.forEach(function (method) {
+        parser[method.name] = function (output) {
+            return fromAbiOutput(json, method.name, output);
+        };
+    });
+
+    return parser;
+};
+
+module.exports = {
+    inputParser: inputParser,
+    outputParser: outputParser
+};
+
+},{}],2:[function(require,module,exports){
+/*
+    This file is part of ethereum.js.
+
+    ethereum.js is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ethereum.js is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file autoprovider.js
+ * @authors:
+ *   Marek Kotewicz <marek@ethdev.com>
+ *   Marian Oancea <marian@ethdev.com>
+ * @date 2014
+ */
+
+/*
+ * @brief if qt object is available, uses QtProvider,
+ * if not tries to connect over websockets
+ * if it fails, it uses HttpRpcProvider
+ */
+
+// TODO: is these line is supposed to be here? 
+if ("build" !== 'build') {/*
+    var WebSocket = require('ws'); // jshint ignore:line
+    var web3 = require('./web3'); // jshint ignore:line
+*/}
+
+var AutoProvider = function (userOptions) {
+    if (web3.haveProvider()) {
+        return;
+    }
+
+    // before we determine what provider we are, we have to cache request
+    this.sendQueue = [];
+    this.onmessageQueue = [];
+
+    if (navigator.qt) {
+        this.provider = new web3.providers.QtProvider();
+        return;
+    }
+
+    userOptions = userOptions || {};
+    var options = {
+        httprpc: userOptions.httprpc || 'http://localhost:8080',
+        websockets: userOptions.websockets || 'ws://localhost:40404/eth'
+    };
+
+    var self = this;
+    var closeWithSuccess = function (success) {
+        ws.close();
+        if (success) {
+            self.provider = new web3.providers.WebSocketProvider(options.websockets);
+        } else {
+            self.provider = new web3.providers.HttpRpcProvider(options.httprpc);
+            self.poll = self.provider.poll.bind(self.provider);
+        }
+        self.sendQueue.forEach(function (payload) {
+            self.provider(payload);
+        });
+        self.onmessageQueue.forEach(function (handler) {
+            self.provider.onmessage = handler;
+        });
+    };
+
+    var ws = new WebSocket(options.websockets);
+
+    ws.onopen = function() {
+        closeWithSuccess(true);
+    };
+
+    ws.onerror = function() {
+        closeWithSuccess(false);
+    };
+};
+
+AutoProvider.prototype.send = function (payload) {
+    if (this.provider) {
+        this.provider.send(payload);
+        return;
+    }
+    this.sendQueue.push(payload);
+};
+
+Object.defineProperty(AutoProvider.prototype, 'onmessage', {
+    set: function (handler) {
+        if (this.provider) {
+            this.provider.onmessage = handler;
+            return;
+        }
+        this.onmessageQueue.push(handler);
+    }
+});
+
+module.exports = AutoProvider;
+
+},{}],3:[function(require,module,exports){
+/*
+    This file is part of ethereum.js.
+
+    ethereum.js is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ethereum.js is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file contract.js
+ * @authors:
+ *   Marek Kotewicz <marek@ethdev.com>
+ * @date 2014
+ */
+
+// TODO: is these line is supposed to be here? 
+if ("build" !== 'build') {/*
+    var web3 = require('./web3'); // jshint ignore:line
+*/}
+
+var abi = require('./abi');
+
+var contract = function (address, desc) {
+    var inputParser = abi.inputParser(desc);
+    var outputParser = abi.outputParser(desc);
+
+    var contract = {};
+
+    desc.forEach(function (method) {
+        contract[method.name] = function () {
+            var params = Array.prototype.slice.call(arguments);
+            var parsed = inputParser[method.name].apply(null, params);
+
+            var onSuccess = function (result) {
+                return outputParser[method.name](result);
+            };
+
+            return {
+                call: function (extra) {
+                    extra = extra || {};
+                    extra.to = address;
+                    extra.data = parsed;
+                    return web3.eth.call(extra).then(onSuccess);
+                },
+                transact: function (extra) {
+                    extra = extra || {};
+                    extra.to = address;
+                    extra.data = parsed;
+                    return web3.eth.transact(extra).then(onSuccess);
+                }
+            };
+        };
+    });
+
+    return contract;
+};
+
+module.exports = contract;
+
+},{"./abi":1}],4:[function(require,module,exports){
+/*
+    This file is part of ethereum.js.
+
+    ethereum.js is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ethereum.js is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file httprpc.js
+ * @authors:
+ *   Marek Kotewicz <marek@ethdev.com>
+ *   Marian Oancea <marian@ethdev.com>
+ * @date 2014
+ */
+
+// TODO: is these line is supposed to be here? 
+if ("build" !== 'build') {/*
+    var XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest; // jshint ignore:line
+*/}
+
+var HttpRpcProvider = function (host) {
+    this.handlers = [];
+    this.host = host;
+};
+
+function formatJsonRpcObject(object) {
+    return {
+        jsonrpc: '2.0',
+        method: object.call,
+        params: object.args,
+        id: object._id
+    };
+}
+
+function formatJsonRpcMessage(message) {
+    var object = JSON.parse(message);
+
+    return {
+        _id: object.id,
+        data: object.result,
+        error: object.error
+    };
+}
+
+HttpRpcProvider.prototype.sendRequest = function (payload, cb) {
+    var data = formatJsonRpcObject(payload);
+
+    var request = new XMLHttpRequest();
+    request.open("POST", this.host, true);
+    request.send(JSON.stringify(data));
+    request.onreadystatechange = function () {
+        if (request.readyState === 4 && cb) {
+            cb(request);
+        }
+    };
+};
+
+HttpRpcProvider.prototype.send = function (payload) {
+    var self = this;
+    this.sendRequest(payload, function (request) {
+        self.handlers.forEach(function (handler) {
+            handler.call(self, formatJsonRpcMessage(request.responseText));
+        });
+    });
+};
+
+HttpRpcProvider.prototype.poll = function (payload, id) {
+    var self = this;
+    this.sendRequest(payload, function (request) {
+        var parsed = JSON.parse(request.responseText);
+        if (parsed.error || (parsed.result instanceof Array ? parsed.result.length === 0 : !parsed.result)) {
+            return;
+        }
+        self.handlers.forEach(function (handler) {
+            handler.call(self, {_event: payload.call, _id: id, data: parsed.result});
+        });
+    });
+};
+
+Object.defineProperty(HttpRpcProvider.prototype, "onmessage", {
+    set: function (handler) {
+        this.handlers.push(handler);
+    }
+});
+
+module.exports = HttpRpcProvider;
+
+},{}],5:[function(require,module,exports){
+/*
+    This file is part of ethereum.js.
+
+    ethereum.js is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ethereum.js is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file qt.js
+ * @authors:
+ *   Jeffrey Wilcke <jeff@ethdev.com>
+ *   Marek Kotewicz <marek@ethdev.com>
+ * @date 2014
+ */
+
+var QtProvider = function() {
+    this.handlers = [];
+
+    var self = this;
+    navigator.qt.onmessage = function (message) {
+        self.handlers.forEach(function (handler) {
+            handler.call(self, JSON.parse(message.data));
+        });
+    };
+};
+
+QtProvider.prototype.send = function(payload) {
+    navigator.qt.postMessage(JSON.stringify(payload));
+};
+
+Object.defineProperty(QtProvider.prototype, "onmessage", {
+    set: function(handler) {
+        this.handlers.push(handler);
+    }
+});
+
+module.exports = QtProvider;
+
+},{}],6:[function(require,module,exports){
+/*
+    This file is part of ethereum.js.
+
+    ethereum.js is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ethereum.js is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file main.js
+ * @authors:
+ *   Jeffrey Wilcke <jeff@ethdev.com>
+ *   Marek Kotewicz <marek@ethdev.com>
+ *   Marian Oancea <marian@ethdev.com>
+ *   Gav Wood <g@ethdev.com>
+ * @date 2014
+ */
+
+function flattenPromise (obj) {
+    if (obj instanceof Promise) {
+        return Promise.resolve(obj);
+    }
+
+    if (obj instanceof Array) {
+        return new Promise(function (resolve) {
+            var promises = obj.map(function (o) {
+                return flattenPromise(o);
+            });
+
+            return Promise.all(promises).then(function (res) {
+                for (var i = 0; i < obj.length; i++) {
+                    obj[i] = res[i];
+                }
+                resolve(obj);
+            });
+        });
+    }
+
+    if (obj instanceof Object) {
+        return new Promise(function (resolve) {
+            var keys = Object.keys(obj);
+            var promises = keys.map(function (key) {
+                return flattenPromise(obj[key]);
+            });
+
+            return Promise.all(promises).then(function (res) {
+                for (var i = 0; i < keys.length; i++) {
+                    obj[keys[i]] = res[i];
+                }
+                resolve(obj);
+            });
+        });
+    }
+
+    return Promise.resolve(obj);
+}
+
+var web3Methods = function () {
+    return [
+    { name: 'sha3', call: 'web3_sha3' }
+    ];
+};
+
+var ethMethods = function () {
+    var blockCall = function (args) {
+        return typeof args[0] === "string" ? "eth_blockByHash" : "eth_blockByNumber";
+    };
+
+    var transactionCall = function (args) {
+        return typeof args[0] === "string" ? 'eth_transactionByHash' : 'eth_transactionByNumber';
+    };
+
+    var uncleCall = function (args) {
+        return typeof args[0] === "string" ? 'eth_uncleByHash' : 'eth_uncleByNumber';
+    };
+
+    var methods = [
+    { name: 'balanceAt', call: 'eth_balanceAt' },
+    { name: 'stateAt', call: 'eth_stateAt' },
+    { name: 'storageAt', call: 'eth_storageAt' },
+    { name: 'countAt', call: 'eth_countAt'},
+    { name: 'codeAt', call: 'eth_codeAt' },
+    { name: 'transact', call: 'eth_transact' },
+    { name: 'call', call: 'eth_call' },
+    { name: 'block', call: blockCall },
+    { name: 'transaction', call: transactionCall },
+    { name: 'uncle', call: uncleCall },
+    { name: 'compilers', call: 'eth_compilers' },
+    { name: 'lll', call: 'eth_lll' },
+    { name: 'solidity', call: 'eth_solidity' },
+    { name: 'serpent', call: 'eth_serpent' },
+    { name: 'logs', call: 'eth_logs' }
+    ];
+    return methods;
+};
+
+var ethProperties = function () {
+    return [
+    { name: 'coinbase', getter: 'eth_coinbase', setter: 'eth_setCoinbase' },
+    { name: 'listening', getter: 'eth_listening', setter: 'eth_setListening' },
+    { name: 'mining', getter: 'eth_mining', setter: 'eth_setMining' },
+    { name: 'gasPrice', getter: 'eth_gasPrice' },
+    { name: 'account', getter: 'eth_account' },
+    { name: 'accounts', getter: 'eth_accounts' },
+    { name: 'peerCount', getter: 'eth_peerCount' },
+    { name: 'defaultBlock', getter: 'eth_defaultBlock', setter: 'eth_setDefaultBlock' },
+    { name: 'number', getter: 'eth_number'}
+    ];
+};
+
+var dbMethods = function () {
+    return [
+    { name: 'put', call: 'db_put' },
+    { name: 'get', call: 'db_get' },
+    { name: 'putString', call: 'db_putString' },
+    { name: 'getString', call: 'db_getString' }
+    ];
+};
+
+var shhMethods = function () {
+    return [
+    { name: 'post', call: 'shh_post' },
+    { name: 'newIdentity', call: 'shh_newIdentity' },
+    { name: 'haveIdentity', call: 'shh_haveIdentity' },
+    { name: 'newGroup', call: 'shh_newGroup' },
+    { name: 'addToGroup', call: 'shh_addToGroup' }
+    ];
+};
+
+var ethWatchMethods = function () {
+    var newFilter = function (args) {
+        return typeof args[0] === 'string' ? 'eth_newFilterString' : 'eth_newFilter';
+    };
+
+    return [
+    { name: 'newFilter', call: newFilter },
+    { name: 'uninstallFilter', call: 'eth_uninstallFilter' },
+    { name: 'getMessages', call: 'eth_filterLogs' }
+    ];
+};
+
+var shhWatchMethods = function () {
+    return [
+    { name: 'newFilter', call: 'shh_newFilter' },
+    { name: 'uninstallFilter', call: 'shh_uninstallFilter' },
+    { name: 'getMessage', call: 'shh_getMessages' }
+    ];
+};
+
+var setupMethods = function (obj, methods) {
+    methods.forEach(function (method) {
+        obj[method.name] = function () {
+            return flattenPromise(Array.prototype.slice.call(arguments)).then(function (args) {
+                var call = typeof method.call === "function" ? method.call(args) : method.call;
+                return {call: call, args: args};
+            }).then(function (request) {
+                return new Promise(function (resolve, reject) {
+                    web3.provider.send(request, function (err, result) {
+                        if (!err) {
+                            resolve(result);
+                            return;
+                        }
+                        reject(err);
+                    });
+                });
+            }).catch(function(err) {
+                console.error(err);
+            });
+        };
+    });
+};
+
+var setupProperties = function (obj, properties) {
+    properties.forEach(function (property) {
+        var proto = {};
+        proto.get = function () {
+            return new Promise(function(resolve, reject) {
+                web3.provider.send({call: property.getter}, function(err, result) {
+                    if (!err) {
+                        resolve(result);
+                        return;
+                    }
+                    reject(err);
+                });
+            });
+        };
+        if (property.setter) {
+            proto.set = function (val) {
+                return flattenPromise([val]).then(function (args) {
+                    return new Promise(function (resolve) {
+                        web3.provider.send({call: property.setter, args: args}, function (err, result) {
+                            if (!err) {
+                                resolve(result);
+                                return;
+                            }
+                            reject(err);
+                        });
+                    });
+                }).catch(function (err) {
+                    console.error(err);
+                });
+            };
+        }
+        Object.defineProperty(obj, property.name, proto);
+    });
+};
+
+// TODO: import from a dependency, don't duplicate.
+var hexToDec = function (hex) {
+    return parseInt(hex, 16).toString();
+};
+
+var decToHex = function (dec) {
+    return parseInt(dec).toString(16);
+};
+
+
+var web3 = {
+    _callbacks: {},
+    _events: {},
+    providers: {},
+
+    toHex: function(str) {
+        var hex = "";
+        for(var i = 0; i < str.length; i++) {
+            var n = str.charCodeAt(i).toString(16);
+            hex += n.length < 2 ? '0' + n : n;
+        }
+
+        return hex;
+    },
+
+    toAscii: function(hex) {
+        // Find termination
+        var str = "";
+        var i = 0, l = hex.length;
+        if (hex.substring(0, 2) === '0x')
+            i = 2;
+        for(; i < l; i+=2) {
+            var code = hex.charCodeAt(i);
+            if(code === 0) {
+                break;
+            }
+
+            str += String.fromCharCode(parseInt(hex.substr(i, 2), 16));
+        }
+
+        return str;
+    },
+
+    fromAscii: function(str, pad) {
+        pad = pad === undefined ? 32 : pad;
+        var hex = this.toHex(str);
+        while(hex.length < pad*2)
+            hex += "00";
+        return "0x" + hex;
+    },
+
+    toDecimal: function (val) {
+        return hexToDec(val.substring(2));
+    },
+
+    fromDecimal: function (val) {
+        return "0x" + decToHex(val);
+    },
+
+    toEth: function(str) {
+        var val = typeof str === "string" ? str.indexOf('0x') === 0 ? parseInt(str.substr(2), 16) : parseInt(str) : str;
+        var unit = 0;
+        var units = [ 'wei', 'Kwei', 'Mwei', 'Gwei', 'szabo', 'finney', 'ether', 'grand', 'Mether', 'Gether', 'Tether', 'Pether', 'Eether', 'Zether', 'Yether', 'Nether', 'Dether', 'Vether', 'Uether' ];
+        while (val > 3000 && unit < units.length - 1)
+        {
+            val /= 1000;
+            unit++;
+        }
+        var s = val.toString().length < val.toFixed(2).length ? val.toString() : val.toFixed(2);
+        var replaceFunction = function($0, $1, $2) {
+            return $1 + ',' + $2;
+        };
+
+        while (true) {
+            var o = s;
+            s = s.replace(/(\d)(\d\d\d[\.\,])/, replaceFunction);
+            if (o === s)
+                break;
+        }
+        return s + ' ' + units[unit];
+    },
+
+    eth: {
+        prototype: Object(), // jshint ignore:line
+        watch: function (params) {
+            return new Filter(params, ethWatch);
+        }
+    },
+
+    db: {
+        prototype: Object() // jshint ignore:line
+    },
+
+    shh: {
+        prototype: Object(), // jshint ignore:line
+        watch: function (params) {
+            return new Filter(params, shhWatch);
+        }
+    },
+
+    on: function(event, id, cb) {
+        if(web3._events[event] === undefined) {
+            web3._events[event] = {};
+        }
+
+        web3._events[event][id] = cb;
+        return this;
+    },
+
+    off: function(event, id) {
+        if(web3._events[event] !== undefined) {
+            delete web3._events[event][id];
+        }
+
+        return this;
+    },
+
+    trigger: function(event, id, data) {
+        var callbacks = web3._events[event];
+        if (!callbacks || !callbacks[id]) {
+            return;
+        }
+        var cb = callbacks[id];
+        cb(data);
+    }
+};
+
+setupMethods(web3, web3Methods());
+setupMethods(web3.eth, ethMethods());
+setupProperties(web3.eth, ethProperties());
+setupMethods(web3.db, dbMethods());
+setupMethods(web3.shh, shhMethods());
+
+var ethWatch = {
+    changed: 'eth_changed'
+};
+setupMethods(ethWatch, ethWatchMethods());
+var shhWatch = {
+    changed: 'shh_changed'
+};
+setupMethods(shhWatch, shhWatchMethods());
+
+var ProviderManager = function() {
+    this.queued = [];
+    this.polls = [];
+    this.ready = false;
+    this.provider = undefined;
+    this.id = 1;
+
+    var self = this;
+    var poll = function () {
+        if (self.provider && self.provider.poll) {
+            self.polls.forEach(function (data) {
+                data.data._id = self.id;
+                self.id++;
+                self.provider.poll(data.data, data.id);
+            });
+        }
+        setTimeout(poll, 12000);
+    };
+    poll();
+};
+
+ProviderManager.prototype.send = function(data, cb) {
+    data._id = this.id;
+    if (cb) {
+        web3._callbacks[data._id] = cb;
+    }
+
+    data.args = data.args || [];
+    this.id++;
+
+    if(this.provider !== undefined) {
+        this.provider.send(data);
+    } else {
+        console.warn("provider is not set");
+        this.queued.push(data);
+    }
+};
+
+ProviderManager.prototype.set = function(provider) {
+    if(this.provider !== undefined && this.provider.unload !== undefined) {
+        this.provider.unload();
+    }
+
+    this.provider = provider;
+    this.ready = true;
+};
+
+ProviderManager.prototype.sendQueued = function() {
+    for(var i = 0; this.queued.length; i++) {
+        // Resend
+        this.send(this.queued[i]);
+    }
+};
+
+ProviderManager.prototype.installed = function() {
+    return this.provider !== undefined;
+};
+
+ProviderManager.prototype.startPolling = function (data, pollId) {
+    if (!this.provider || !this.provider.poll) {
+        return;
+    }
+    this.polls.push({data: data, id: pollId});
+};
+
+ProviderManager.prototype.stopPolling = function (pollId) {
+    for (var i = this.polls.length; i--;) {
+        var poll = this.polls[i];
+        if (poll.id === pollId) {
+            this.polls.splice(i, 1);
+        }
+    }
+};
+
+web3.provider = new ProviderManager();
+
+web3.setProvider = function(provider) {
+    provider.onmessage = messageHandler;
+    web3.provider.set(provider);
+    web3.provider.sendQueued();
+};
+
+web3.haveProvider = function() {
+    return !!web3.provider.provider;
+};
+
+var Filter = function(options, impl) {
+    this.impl = impl;
+    this.callbacks = [];
+
+    var self = this;
+    this.promise = impl.newFilter(options);
+    this.promise.then(function (id) {
+        self.id = id;
+        web3.on(impl.changed, id, self.trigger.bind(self));
+        web3.provider.startPolling({call: impl.changed, args: [id]}, id);
+    });
+};
+
+Filter.prototype.arrived = function(callback) {
+    this.changed(callback);
+};
+
+Filter.prototype.changed = function(callback) {
+    var self = this;
+    this.promise.then(function(id) {
+        self.callbacks.push(callback);
+    });
+};
+
+Filter.prototype.trigger = function(messages) {
+    for(var i = 0; i < this.callbacks.length; i++) {
+        this.callbacks[i].call(this, messages);
+    }
+};
+
+Filter.prototype.uninstall = function() {
+    var self = this;
+    this.promise.then(function (id) {
+        self.impl.uninstallFilter(id);
+        web3.provider.stopPolling(id);
+        web3.off(impl.changed, id);
+    });
+};
+
+Filter.prototype.messages = function() {
+    var self = this;
+    return this.promise.then(function (id) {
+        return self.impl.getMessages(id);
+    });
+};
+
+Filter.prototype.logs = function () {
+    return this.messages();
+};
+
+function messageHandler(data) {
+    if(data._event !== undefined) {
+        web3.trigger(data._event, data._id, data.data);
+        return;
+    }
+
+    if(data._id) {
+        var cb = web3._callbacks[data._id];
+        if (cb) {
+            cb.call(this, data.error, data.data);
+            delete web3._callbacks[data._id];
+        }
+    }
+}
+
+module.exports = web3;
+
+},{}],7:[function(require,module,exports){
+/*
+    This file is part of ethereum.js.
+
+    ethereum.js is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ethereum.js is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file websocket.js
+ * @authors:
+ *   Jeffrey Wilcke <jeff@ethdev.com>
+ *   Marek Kotewicz <marek@ethdev.com>
+ *   Marian Oancea <marian@ethdev.com>
+ * @date 2014
+ */
+
+// TODO: is these line is supposed to be here? 
+if ("build" !== 'build') {/*
+    var WebSocket = require('ws'); // jshint ignore:line
+*/}
+
+var WebSocketProvider = function(host) {
+    // onmessage handlers
+    this.handlers = [];
+    // queue will be filled with messages if send is invoked before the ws is ready
+    this.queued = [];
+    this.ready = false;
+
+    this.ws = new WebSocket(host);
+
+    var self = this;
+    this.ws.onmessage = function(event) {
+        for(var i = 0; i < self.handlers.length; i++) {
+            self.handlers[i].call(self, JSON.parse(event.data), event);
+        }
+    };
+
+    this.ws.onopen = function() {
+        self.ready = true;
+
+        for(var i = 0; i < self.queued.length; i++) {
+            // Resend
+            self.send(self.queued[i]);
+        }
+    };
+};
+
+WebSocketProvider.prototype.send = function(payload) {
+    if(this.ready) {
+        var data = JSON.stringify(payload);
+
+        this.ws.send(data);
+    } else {
+        this.queued.push(payload);
+    }
+};
+
+WebSocketProvider.prototype.onMessage = function(handler) {
+    this.handlers.push(handler);
+};
+
+WebSocketProvider.prototype.unload = function() {
+    this.ws.close();
+};
+Object.defineProperty(WebSocketProvider.prototype, "onmessage", {
+    set: function(provider) { this.onMessage(provider); }
+});
+
+module.exports = WebSocketProvider;
+
+},{}],"web3":[function(require,module,exports){
+var web3 = require('./lib/web3');
+web3.providers.WebSocketProvider = require('./lib/websocket');
+web3.providers.HttpRpcProvider = require('./lib/httprpc');
+web3.providers.QtProvider = require('./lib/qt');
+web3.providers.AutoProvider = require('./lib/autoprovider');
+web3.contract = require('./lib/contract');
+
+module.exports = web3;
+
+},{"./lib/autoprovider":2,"./lib/contract":3,"./lib/httprpc":4,"./lib/qt":5,"./lib/web3":6,"./lib/websocket":7}]},{},["web3"])
+
+
+//# sourceMappingURL=ethereum.js.map
\ No newline at end of file
diff --git a/cmd/mist/assets/ext/ethereum.js/dist/ethereum.js.map b/cmd/mist/assets/ext/ethereum.js/dist/ethereum.js.map
new file mode 100644
index 000000000..9886b70ce
--- /dev/null
+++ b/cmd/mist/assets/ext/ethereum.js/dist/ethereum.js.map
@@ -0,0 +1,29 @@
+{
+  "version": 3,
+  "sources": [
+    "node_modules/browserify/node_modules/browser-pack/_prelude.js",
+    "lib/abi.js",
+    "lib/autoprovider.js",
+    "lib/contract.js",
+    "lib/httprpc.js",
+    "lib/qt.js",
+    "lib/web3.js",
+    "lib/websocket.js",
+    "index.js"
+  ],
+  "names": [],
+  "mappings": "AAAA;ACAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzQA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACtGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC9FA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5fA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7EA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA",
+  "file": "generated.js",
+  "sourceRoot": "",
+  "sourcesContent": [
+    "(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require==\"function\"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error(\"Cannot find module '\"+o+\"'\");throw f.code=\"MODULE_NOT_FOUND\",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require==\"function\"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})",
+    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file abi.js\n * @authors:\n *   Marek Kotewicz <marek@ethdev.com>\n *   Gav Wood <g@ethdev.com>\n * @date 2014\n */\n\n// TODO: is these line is supposed to be here? \nif (\"build\" !== 'build') {/*\n    var web3 = require('./web3'); // jshint ignore:line\n*/}\n\n// TODO: make these be actually accurate instead of falling back onto JS's doubles.\nvar hexToDec = function (hex) {\n    return parseInt(hex, 16).toString();\n};\n\nvar decToHex = function (dec) {\n    return parseInt(dec).toString(16);\n};\n\nvar findIndex = function (array, callback) {\n    var end = false;\n    var i = 0;\n    for (; i < array.length && !end; i++) {\n        end = callback(array[i]);\n    }\n    return end ? i - 1 : -1;\n};\n\nvar findMethodIndex = function (json, methodName) {\n    return findIndex(json, function (method) {\n        return method.name === methodName;\n    });\n};\n\nvar padLeft = function (string, chars) {\n    return new Array(chars - string.length + 1).join(\"0\") + string;\n};\n\nvar calcBitPadding = function (type, expected) {\n    var value = type.slice(expected.length);\n    if (value === \"\") {\n        return 32;\n    }\n    return parseInt(value) / 8;\n};\n\nvar calcBytePadding = function (type, expected) {\n    var value = type.slice(expected.length);\n    if (value === \"\") {\n        return 32;\n    }\n    return parseInt(value);\n};\n\nvar calcRealPadding = function (type, expected) {\n    var value = type.slice(expected.length);\n    if (value === \"\") {\n        return 32;\n    }\n    var sizes = value.split('x');\n    for (var padding = 0, i = 0; i < sizes; i++) {\n        padding += (sizes[i] / 8);\n    }\n    return padding;\n};\n\nvar setupInputTypes = function () {\n    \n    var prefixedType = function (prefix, calcPadding) {\n        return function (type, value) {\n            var expected = prefix;\n            if (type.indexOf(expected) !== 0) {\n                return false;\n            }\n\n            var padding = calcPadding(type, expected);\n            if (typeof value === \"number\")\n                value = value.toString(16);\n            else if (typeof value === \"string\")\n                value = web3.toHex(value); \n            else if (value.indexOf('0x') === 0)\n                value = value.substr(2);\n            else\n                value = (+value).toString(16);\n            return padLeft(value, padding * 2);\n        };\n    };\n\n    var namedType = function (name, padding, formatter) {\n        return function (type, value) {\n            if (type !== name) {\n                return false;\n            }\n\n            return padLeft(formatter ? formatter(value) : value, padding * 2);\n        };\n    };\n\n    var formatBool = function (value) {\n        return value ? '0x1' : '0x0';\n    };\n\n    return [\n        prefixedType('uint', calcBitPadding),\n        prefixedType('int', calcBitPadding),\n        prefixedType('hash', calcBitPadding),\n        prefixedType('string', calcBytePadding),\n        prefixedType('real', calcRealPadding),\n        prefixedType('ureal', calcRealPadding),\n        namedType('address', 20),\n        namedType('bool', 1, formatBool),\n    ];\n};\n\nvar inputTypes = setupInputTypes();\n\nvar toAbiInput = function (json, methodName, params) {\n    var bytes = \"\";\n    var index = findMethodIndex(json, methodName);\n\n    if (index === -1) {\n        return;\n    }\n\n    bytes = \"0x\" + padLeft(index.toString(16), 2);\n    var method = json[index];\n\n    for (var i = 0; i < method.inputs.length; i++) {\n        var found = false;\n        for (var j = 0; j < inputTypes.length && !found; j++) {\n            found = inputTypes[j](method.inputs[i].type, params[i]);\n        }\n        if (!found) {\n            console.error('unsupported json type: ' + method.inputs[i].type);\n        }\n        bytes += found;\n    }\n    return bytes;\n};\n\nvar setupOutputTypes = function () {\n\n    var prefixedType = function (prefix, calcPadding) {\n        return function (type) {\n            var expected = prefix;\n            if (type.indexOf(expected) !== 0) {\n                return -1;\n            }\n\n            var padding = calcPadding(type, expected);\n            return padding * 2;\n        };\n    };\n\n    var namedType = function (name, padding) {\n        return function (type) {\n            return name === type ? padding * 2 : -1;\n        };\n    };\n\n    var formatInt = function (value) {\n        return value.length <= 8 ? +parseInt(value, 16) : hexToDec(value);\n    };\n\n    var formatHash = function (value) {\n        return \"0x\" + value;\n    };\n\n    var formatBool = function (value) {\n        return value === '1' ? true : false;\n    };\n\n    var formatString = function (value) {\n        return web3.toAscii(value);\n    };\n\n    return [\n    { padding: prefixedType('uint', calcBitPadding), format: formatInt },\n    { padding: prefixedType('int', calcBitPadding), format: formatInt },\n    { padding: prefixedType('hash', calcBitPadding), format: formatHash },\n    { padding: prefixedType('string', calcBytePadding), format: formatString },\n    { padding: prefixedType('real', calcRealPadding), format: formatInt },\n    { padding: prefixedType('ureal', calcRealPadding), format: formatInt },\n    { padding: namedType('address', 20) },\n    { padding: namedType('bool', 1), format: formatBool }\n    ];\n};\n\nvar outputTypes = setupOutputTypes();\n\nvar fromAbiOutput = function (json, methodName, output) {\n    var index = findMethodIndex(json, methodName);\n\n    if (index === -1) {\n        return;\n    }\n\n    output = output.slice(2);\n\n    var result = [];\n    var method = json[index];\n    for (var i = 0; i < method.outputs.length; i++) {\n        var padding = -1;\n        for (var j = 0; j < outputTypes.length && padding === -1; j++) {\n            padding = outputTypes[j].padding(method.outputs[i].type);\n        }\n\n        if (padding === -1) {\n            // not found output parsing\n            continue;\n        }\n        var res = output.slice(0, padding);\n        var formatter = outputTypes[j - 1].format;\n        result.push(formatter ? formatter(res) : (\"0x\" + res));\n        output = output.slice(padding);\n    }\n\n    return result;\n};\n\nvar inputParser = function (json) {\n    var parser = {};\n    json.forEach(function (method) {\n        parser[method.name] = function () {\n            var params = Array.prototype.slice.call(arguments);\n            return toAbiInput(json, method.name, params);\n        };\n    });\n\n    return parser;\n};\n\nvar outputParser = function (json) {\n    var parser = {};\n    json.forEach(function (method) {\n        parser[method.name] = function (output) {\n            return fromAbiOutput(json, method.name, output);\n        };\n    });\n\n    return parser;\n};\n\nmodule.exports = {\n    inputParser: inputParser,\n    outputParser: outputParser\n};\n",
+    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file autoprovider.js\n * @authors:\n *   Marek Kotewicz <marek@ethdev.com>\n *   Marian Oancea <marian@ethdev.com>\n * @date 2014\n */\n\n/*\n * @brief if qt object is available, uses QtProvider,\n * if not tries to connect over websockets\n * if it fails, it uses HttpRpcProvider\n */\n\n// TODO: is these line is supposed to be here? \nif (\"build\" !== 'build') {/*\n    var WebSocket = require('ws'); // jshint ignore:line\n    var web3 = require('./web3'); // jshint ignore:line\n*/}\n\nvar AutoProvider = function (userOptions) {\n    if (web3.haveProvider()) {\n        return;\n    }\n\n    // before we determine what provider we are, we have to cache request\n    this.sendQueue = [];\n    this.onmessageQueue = [];\n\n    if (navigator.qt) {\n        this.provider = new web3.providers.QtProvider();\n        return;\n    }\n\n    userOptions = userOptions || {};\n    var options = {\n        httprpc: userOptions.httprpc || 'http://localhost:8080',\n        websockets: userOptions.websockets || 'ws://localhost:40404/eth'\n    };\n\n    var self = this;\n    var closeWithSuccess = function (success) {\n        ws.close();\n        if (success) {\n            self.provider = new web3.providers.WebSocketProvider(options.websockets);\n        } else {\n            self.provider = new web3.providers.HttpRpcProvider(options.httprpc);\n            self.poll = self.provider.poll.bind(self.provider);\n        }\n        self.sendQueue.forEach(function (payload) {\n            self.provider(payload);\n        });\n        self.onmessageQueue.forEach(function (handler) {\n            self.provider.onmessage = handler;\n        });\n    };\n\n    var ws = new WebSocket(options.websockets);\n\n    ws.onopen = function() {\n        closeWithSuccess(true);\n    };\n\n    ws.onerror = function() {\n        closeWithSuccess(false);\n    };\n};\n\nAutoProvider.prototype.send = function (payload) {\n    if (this.provider) {\n        this.provider.send(payload);\n        return;\n    }\n    this.sendQueue.push(payload);\n};\n\nObject.defineProperty(AutoProvider.prototype, 'onmessage', {\n    set: function (handler) {\n        if (this.provider) {\n            this.provider.onmessage = handler;\n            return;\n        }\n        this.onmessageQueue.push(handler);\n    }\n});\n\nmodule.exports = AutoProvider;\n",
+    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file contract.js\n * @authors:\n *   Marek Kotewicz <marek@ethdev.com>\n * @date 2014\n */\n\n// TODO: is these line is supposed to be here? \nif (\"build\" !== 'build') {/*\n    var web3 = require('./web3'); // jshint ignore:line\n*/}\n\nvar abi = require('./abi');\n\nvar contract = function (address, desc) {\n    var inputParser = abi.inputParser(desc);\n    var outputParser = abi.outputParser(desc);\n\n    var contract = {};\n\n    desc.forEach(function (method) {\n        contract[method.name] = function () {\n            var params = Array.prototype.slice.call(arguments);\n            var parsed = inputParser[method.name].apply(null, params);\n\n            var onSuccess = function (result) {\n                return outputParser[method.name](result);\n            };\n\n            return {\n                call: function (extra) {\n                    extra = extra || {};\n                    extra.to = address;\n                    extra.data = parsed;\n                    return web3.eth.call(extra).then(onSuccess);\n                },\n                transact: function (extra) {\n                    extra = extra || {};\n                    extra.to = address;\n                    extra.data = parsed;\n                    return web3.eth.transact(extra).then(onSuccess);\n                }\n            };\n        };\n    });\n\n    return contract;\n};\n\nmodule.exports = contract;\n",
+    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file httprpc.js\n * @authors:\n *   Marek Kotewicz <marek@ethdev.com>\n *   Marian Oancea <marian@ethdev.com>\n * @date 2014\n */\n\n// TODO: is these line is supposed to be here? \nif (\"build\" !== 'build') {/*\n    var XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest; // jshint ignore:line\n*/}\n\nvar HttpRpcProvider = function (host) {\n    this.handlers = [];\n    this.host = host;\n};\n\nfunction formatJsonRpcObject(object) {\n    return {\n        jsonrpc: '2.0',\n        method: object.call,\n        params: object.args,\n        id: object._id\n    };\n}\n\nfunction formatJsonRpcMessage(message) {\n    var object = JSON.parse(message);\n\n    return {\n        _id: object.id,\n        data: object.result,\n        error: object.error\n    };\n}\n\nHttpRpcProvider.prototype.sendRequest = function (payload, cb) {\n    var data = formatJsonRpcObject(payload);\n\n    var request = new XMLHttpRequest();\n    request.open(\"POST\", this.host, true);\n    request.send(JSON.stringify(data));\n    request.onreadystatechange = function () {\n        if (request.readyState === 4 && cb) {\n            cb(request);\n        }\n    };\n};\n\nHttpRpcProvider.prototype.send = function (payload) {\n    var self = this;\n    this.sendRequest(payload, function (request) {\n        self.handlers.forEach(function (handler) {\n            handler.call(self, formatJsonRpcMessage(request.responseText));\n        });\n    });\n};\n\nHttpRpcProvider.prototype.poll = function (payload, id) {\n    var self = this;\n    this.sendRequest(payload, function (request) {\n        var parsed = JSON.parse(request.responseText);\n        if (parsed.error || (parsed.result instanceof Array ? parsed.result.length === 0 : !parsed.result)) {\n            return;\n        }\n        self.handlers.forEach(function (handler) {\n            handler.call(self, {_event: payload.call, _id: id, data: parsed.result});\n        });\n    });\n};\n\nObject.defineProperty(HttpRpcProvider.prototype, \"onmessage\", {\n    set: function (handler) {\n        this.handlers.push(handler);\n    }\n});\n\nmodule.exports = HttpRpcProvider;\n",
+    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file qt.js\n * @authors:\n *   Jeffrey Wilcke <jeff@ethdev.com>\n *   Marek Kotewicz <marek@ethdev.com>\n * @date 2014\n */\n\nvar QtProvider = function() {\n    this.handlers = [];\n\n    var self = this;\n    navigator.qt.onmessage = function (message) {\n        self.handlers.forEach(function (handler) {\n            handler.call(self, JSON.parse(message.data));\n        });\n    };\n};\n\nQtProvider.prototype.send = function(payload) {\n    navigator.qt.postMessage(JSON.stringify(payload));\n};\n\nObject.defineProperty(QtProvider.prototype, \"onmessage\", {\n    set: function(handler) {\n        this.handlers.push(handler);\n    }\n});\n\nmodule.exports = QtProvider;\n",
+    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file main.js\n * @authors:\n *   Jeffrey Wilcke <jeff@ethdev.com>\n *   Marek Kotewicz <marek@ethdev.com>\n *   Marian Oancea <marian@ethdev.com>\n *   Gav Wood <g@ethdev.com>\n * @date 2014\n */\n\nfunction flattenPromise (obj) {\n    if (obj instanceof Promise) {\n        return Promise.resolve(obj);\n    }\n\n    if (obj instanceof Array) {\n        return new Promise(function (resolve) {\n            var promises = obj.map(function (o) {\n                return flattenPromise(o);\n            });\n\n            return Promise.all(promises).then(function (res) {\n                for (var i = 0; i < obj.length; i++) {\n                    obj[i] = res[i];\n                }\n                resolve(obj);\n            });\n        });\n    }\n\n    if (obj instanceof Object) {\n        return new Promise(function (resolve) {\n            var keys = Object.keys(obj);\n            var promises = keys.map(function (key) {\n                return flattenPromise(obj[key]);\n            });\n\n            return Promise.all(promises).then(function (res) {\n                for (var i = 0; i < keys.length; i++) {\n                    obj[keys[i]] = res[i];\n                }\n                resolve(obj);\n            });\n        });\n    }\n\n    return Promise.resolve(obj);\n}\n\nvar web3Methods = function () {\n    return [\n    { name: 'sha3', call: 'web3_sha3' }\n    ];\n};\n\nvar ethMethods = function () {\n    var blockCall = function (args) {\n        return typeof args[0] === \"string\" ? \"eth_blockByHash\" : \"eth_blockByNumber\";\n    };\n\n    var transactionCall = function (args) {\n        return typeof args[0] === \"string\" ? 'eth_transactionByHash' : 'eth_transactionByNumber';\n    };\n\n    var uncleCall = function (args) {\n        return typeof args[0] === \"string\" ? 'eth_uncleByHash' : 'eth_uncleByNumber';\n    };\n\n    var methods = [\n    { name: 'balanceAt', call: 'eth_balanceAt' },\n    { name: 'stateAt', call: 'eth_stateAt' },\n    { name: 'storageAt', call: 'eth_storageAt' },\n    { name: 'countAt', call: 'eth_countAt'},\n    { name: 'codeAt', call: 'eth_codeAt' },\n    { name: 'transact', call: 'eth_transact' },\n    { name: 'call', call: 'eth_call' },\n    { name: 'block', call: blockCall },\n    { name: 'transaction', call: transactionCall },\n    { name: 'uncle', call: uncleCall },\n    { name: 'compilers', call: 'eth_compilers' },\n    { name: 'lll', call: 'eth_lll' },\n    { name: 'solidity', call: 'eth_solidity' },\n    { name: 'serpent', call: 'eth_serpent' },\n    { name: 'logs', call: 'eth_logs' }\n    ];\n    return methods;\n};\n\nvar ethProperties = function () {\n    return [\n    { name: 'coinbase', getter: 'eth_coinbase', setter: 'eth_setCoinbase' },\n    { name: 'listening', getter: 'eth_listening', setter: 'eth_setListening' },\n    { name: 'mining', getter: 'eth_mining', setter: 'eth_setMining' },\n    { name: 'gasPrice', getter: 'eth_gasPrice' },\n    { name: 'account', getter: 'eth_account' },\n    { name: 'accounts', getter: 'eth_accounts' },\n    { name: 'peerCount', getter: 'eth_peerCount' },\n    { name: 'defaultBlock', getter: 'eth_defaultBlock', setter: 'eth_setDefaultBlock' },\n    { name: 'number', getter: 'eth_number'}\n    ];\n};\n\nvar dbMethods = function () {\n    return [\n    { name: 'put', call: 'db_put' },\n    { name: 'get', call: 'db_get' },\n    { name: 'putString', call: 'db_putString' },\n    { name: 'getString', call: 'db_getString' }\n    ];\n};\n\nvar shhMethods = function () {\n    return [\n    { name: 'post', call: 'shh_post' },\n    { name: 'newIdentity', call: 'shh_newIdentity' },\n    { name: 'haveIdentity', call: 'shh_haveIdentity' },\n    { name: 'newGroup', call: 'shh_newGroup' },\n    { name: 'addToGroup', call: 'shh_addToGroup' }\n    ];\n};\n\nvar ethWatchMethods = function () {\n    var newFilter = function (args) {\n        return typeof args[0] === 'string' ? 'eth_newFilterString' : 'eth_newFilter';\n    };\n\n    return [\n    { name: 'newFilter', call: newFilter },\n    { name: 'uninstallFilter', call: 'eth_uninstallFilter' },\n    { name: 'getMessages', call: 'eth_filterLogs' }\n    ];\n};\n\nvar shhWatchMethods = function () {\n    return [\n    { name: 'newFilter', call: 'shh_newFilter' },\n    { name: 'uninstallFilter', call: 'shh_uninstallFilter' },\n    { name: 'getMessage', call: 'shh_getMessages' }\n    ];\n};\n\nvar setupMethods = function (obj, methods) {\n    methods.forEach(function (method) {\n        obj[method.name] = function () {\n            return flattenPromise(Array.prototype.slice.call(arguments)).then(function (args) {\n                var call = typeof method.call === \"function\" ? method.call(args) : method.call;\n                return {call: call, args: args};\n            }).then(function (request) {\n                return new Promise(function (resolve, reject) {\n                    web3.provider.send(request, function (err, result) {\n                        if (!err) {\n                            resolve(result);\n                            return;\n                        }\n                        reject(err);\n                    });\n                });\n            }).catch(function(err) {\n                console.error(err);\n            });\n        };\n    });\n};\n\nvar setupProperties = function (obj, properties) {\n    properties.forEach(function (property) {\n        var proto = {};\n        proto.get = function () {\n            return new Promise(function(resolve, reject) {\n                web3.provider.send({call: property.getter}, function(err, result) {\n                    if (!err) {\n                        resolve(result);\n                        return;\n                    }\n                    reject(err);\n                });\n            });\n        };\n        if (property.setter) {\n            proto.set = function (val) {\n                return flattenPromise([val]).then(function (args) {\n                    return new Promise(function (resolve) {\n                        web3.provider.send({call: property.setter, args: args}, function (err, result) {\n                            if (!err) {\n                                resolve(result);\n                                return;\n                            }\n                            reject(err);\n                        });\n                    });\n                }).catch(function (err) {\n                    console.error(err);\n                });\n            };\n        }\n        Object.defineProperty(obj, property.name, proto);\n    });\n};\n\n// TODO: import from a dependency, don't duplicate.\nvar hexToDec = function (hex) {\n    return parseInt(hex, 16).toString();\n};\n\nvar decToHex = function (dec) {\n    return parseInt(dec).toString(16);\n};\n\n\nvar web3 = {\n    _callbacks: {},\n    _events: {},\n    providers: {},\n\n    toHex: function(str) {\n        var hex = \"\";\n        for(var i = 0; i < str.length; i++) {\n            var n = str.charCodeAt(i).toString(16);\n            hex += n.length < 2 ? '0' + n : n;\n        }\n\n        return hex;\n    },\n\n    toAscii: function(hex) {\n        // Find termination\n        var str = \"\";\n        var i = 0, l = hex.length;\n        if (hex.substring(0, 2) === '0x')\n            i = 2;\n        for(; i < l; i+=2) {\n            var code = hex.charCodeAt(i);\n            if(code === 0) {\n                break;\n            }\n\n            str += String.fromCharCode(parseInt(hex.substr(i, 2), 16));\n        }\n\n        return str;\n    },\n\n    fromAscii: function(str, pad) {\n        pad = pad === undefined ? 32 : pad;\n        var hex = this.toHex(str);\n        while(hex.length < pad*2)\n            hex += \"00\";\n        return \"0x\" + hex;\n    },\n\n    toDecimal: function (val) {\n        return hexToDec(val.substring(2));\n    },\n\n    fromDecimal: function (val) {\n        return \"0x\" + decToHex(val);\n    },\n\n    toEth: function(str) {\n        var val = typeof str === \"string\" ? str.indexOf('0x') === 0 ? parseInt(str.substr(2), 16) : parseInt(str) : str;\n        var unit = 0;\n        var units = [ 'wei', 'Kwei', 'Mwei', 'Gwei', 'szabo', 'finney', 'ether', 'grand', 'Mether', 'Gether', 'Tether', 'Pether', 'Eether', 'Zether', 'Yether', 'Nether', 'Dether', 'Vether', 'Uether' ];\n        while (val > 3000 && unit < units.length - 1)\n        {\n            val /= 1000;\n            unit++;\n        }\n        var s = val.toString().length < val.toFixed(2).length ? val.toString() : val.toFixed(2);\n        var replaceFunction = function($0, $1, $2) {\n            return $1 + ',' + $2;\n        };\n\n        while (true) {\n            var o = s;\n            s = s.replace(/(\\d)(\\d\\d\\d[\\.\\,])/, replaceFunction);\n            if (o === s)\n                break;\n        }\n        return s + ' ' + units[unit];\n    },\n\n    eth: {\n        prototype: Object(), // jshint ignore:line\n        watch: function (params) {\n            return new Filter(params, ethWatch);\n        }\n    },\n\n    db: {\n        prototype: Object() // jshint ignore:line\n    },\n\n    shh: {\n        prototype: Object(), // jshint ignore:line\n        watch: function (params) {\n            return new Filter(params, shhWatch);\n        }\n    },\n\n    on: function(event, id, cb) {\n        if(web3._events[event] === undefined) {\n            web3._events[event] = {};\n        }\n\n        web3._events[event][id] = cb;\n        return this;\n    },\n\n    off: function(event, id) {\n        if(web3._events[event] !== undefined) {\n            delete web3._events[event][id];\n        }\n\n        return this;\n    },\n\n    trigger: function(event, id, data) {\n        var callbacks = web3._events[event];\n        if (!callbacks || !callbacks[id]) {\n            return;\n        }\n        var cb = callbacks[id];\n        cb(data);\n    }\n};\n\nsetupMethods(web3, web3Methods());\nsetupMethods(web3.eth, ethMethods());\nsetupProperties(web3.eth, ethProperties());\nsetupMethods(web3.db, dbMethods());\nsetupMethods(web3.shh, shhMethods());\n\nvar ethWatch = {\n    changed: 'eth_changed'\n};\nsetupMethods(ethWatch, ethWatchMethods());\nvar shhWatch = {\n    changed: 'shh_changed'\n};\nsetupMethods(shhWatch, shhWatchMethods());\n\nvar ProviderManager = function() {\n    this.queued = [];\n    this.polls = [];\n    this.ready = false;\n    this.provider = undefined;\n    this.id = 1;\n\n    var self = this;\n    var poll = function () {\n        if (self.provider && self.provider.poll) {\n            self.polls.forEach(function (data) {\n                data.data._id = self.id;\n                self.id++;\n                self.provider.poll(data.data, data.id);\n            });\n        }\n        setTimeout(poll, 12000);\n    };\n    poll();\n};\n\nProviderManager.prototype.send = function(data, cb) {\n    data._id = this.id;\n    if (cb) {\n        web3._callbacks[data._id] = cb;\n    }\n\n    data.args = data.args || [];\n    this.id++;\n\n    if(this.provider !== undefined) {\n        this.provider.send(data);\n    } else {\n        console.warn(\"provider is not set\");\n        this.queued.push(data);\n    }\n};\n\nProviderManager.prototype.set = function(provider) {\n    if(this.provider !== undefined && this.provider.unload !== undefined) {\n        this.provider.unload();\n    }\n\n    this.provider = provider;\n    this.ready = true;\n};\n\nProviderManager.prototype.sendQueued = function() {\n    for(var i = 0; this.queued.length; i++) {\n        // Resend\n        this.send(this.queued[i]);\n    }\n};\n\nProviderManager.prototype.installed = function() {\n    return this.provider !== undefined;\n};\n\nProviderManager.prototype.startPolling = function (data, pollId) {\n    if (!this.provider || !this.provider.poll) {\n        return;\n    }\n    this.polls.push({data: data, id: pollId});\n};\n\nProviderManager.prototype.stopPolling = function (pollId) {\n    for (var i = this.polls.length; i--;) {\n        var poll = this.polls[i];\n        if (poll.id === pollId) {\n            this.polls.splice(i, 1);\n        }\n    }\n};\n\nweb3.provider = new ProviderManager();\n\nweb3.setProvider = function(provider) {\n    provider.onmessage = messageHandler;\n    web3.provider.set(provider);\n    web3.provider.sendQueued();\n};\n\nweb3.haveProvider = function() {\n    return !!web3.provider.provider;\n};\n\nvar Filter = function(options, impl) {\n    this.impl = impl;\n    this.callbacks = [];\n\n    var self = this;\n    this.promise = impl.newFilter(options);\n    this.promise.then(function (id) {\n        self.id = id;\n        web3.on(impl.changed, id, self.trigger.bind(self));\n        web3.provider.startPolling({call: impl.changed, args: [id]}, id);\n    });\n};\n\nFilter.prototype.arrived = function(callback) {\n    this.changed(callback);\n};\n\nFilter.prototype.changed = function(callback) {\n    var self = this;\n    this.promise.then(function(id) {\n        self.callbacks.push(callback);\n    });\n};\n\nFilter.prototype.trigger = function(messages) {\n    for(var i = 0; i < this.callbacks.length; i++) {\n        this.callbacks[i].call(this, messages);\n    }\n};\n\nFilter.prototype.uninstall = function() {\n    var self = this;\n    this.promise.then(function (id) {\n        self.impl.uninstallFilter(id);\n        web3.provider.stopPolling(id);\n        web3.off(impl.changed, id);\n    });\n};\n\nFilter.prototype.messages = function() {\n    var self = this;\n    return this.promise.then(function (id) {\n        return self.impl.getMessages(id);\n    });\n};\n\nFilter.prototype.logs = function () {\n    return this.messages();\n};\n\nfunction messageHandler(data) {\n    if(data._event !== undefined) {\n        web3.trigger(data._event, data._id, data.data);\n        return;\n    }\n\n    if(data._id) {\n        var cb = web3._callbacks[data._id];\n        if (cb) {\n            cb.call(this, data.error, data.data);\n            delete web3._callbacks[data._id];\n        }\n    }\n}\n\nmodule.exports = web3;\n",
+    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file websocket.js\n * @authors:\n *   Jeffrey Wilcke <jeff@ethdev.com>\n *   Marek Kotewicz <marek@ethdev.com>\n *   Marian Oancea <marian@ethdev.com>\n * @date 2014\n */\n\n// TODO: is these line is supposed to be here? \nif (\"build\" !== 'build') {/*\n    var WebSocket = require('ws'); // jshint ignore:line\n*/}\n\nvar WebSocketProvider = function(host) {\n    // onmessage handlers\n    this.handlers = [];\n    // queue will be filled with messages if send is invoked before the ws is ready\n    this.queued = [];\n    this.ready = false;\n\n    this.ws = new WebSocket(host);\n\n    var self = this;\n    this.ws.onmessage = function(event) {\n        for(var i = 0; i < self.handlers.length; i++) {\n            self.handlers[i].call(self, JSON.parse(event.data), event);\n        }\n    };\n\n    this.ws.onopen = function() {\n        self.ready = true;\n\n        for(var i = 0; i < self.queued.length; i++) {\n            // Resend\n            self.send(self.queued[i]);\n        }\n    };\n};\n\nWebSocketProvider.prototype.send = function(payload) {\n    if(this.ready) {\n        var data = JSON.stringify(payload);\n\n        this.ws.send(data);\n    } else {\n        this.queued.push(payload);\n    }\n};\n\nWebSocketProvider.prototype.onMessage = function(handler) {\n    this.handlers.push(handler);\n};\n\nWebSocketProvider.prototype.unload = function() {\n    this.ws.close();\n};\nObject.defineProperty(WebSocketProvider.prototype, \"onmessage\", {\n    set: function(provider) { this.onMessage(provider); }\n});\n\nmodule.exports = WebSocketProvider;\n",
+    "var web3 = require('./lib/web3');\nweb3.providers.WebSocketProvider = require('./lib/websocket');\nweb3.providers.HttpRpcProvider = require('./lib/httprpc');\nweb3.providers.QtProvider = require('./lib/qt');\nweb3.providers.AutoProvider = require('./lib/autoprovider');\nweb3.contract = require('./lib/contract');\n\nmodule.exports = web3;\n"
+  ]
+}
\ No newline at end of file
diff --git a/cmd/mist/assets/ext/ethereum.js/dist/ethereum.min.js b/cmd/mist/assets/ext/ethereum.js/dist/ethereum.min.js
new file mode 100644
index 000000000..0ae9610fc
--- /dev/null
+++ b/cmd/mist/assets/ext/ethereum.js/dist/ethereum.min.js
@@ -0,0 +1 @@
+require=function t(e,n,r){function o(a,s){if(!n[a]){if(!e[a]){var u="function"==typeof require&&require;if(!s&&u)return u(a,!0);if(i)return i(a,!0);var c=new Error("Cannot find module '"+a+"'");throw c.code="MODULE_NOT_FOUND",c}var l=n[a]={exports:{}};e[a][0].call(l.exports,function(t){var n=e[a][1][t];return o(n?n:t)},l,l.exports,t,e,n,r)}return n[a].exports}for(var i="function"==typeof require&&require,a=0;a<r.length;a++)o(r[a]);return o}({1:[function(t,e){var n=function(t){return parseInt(t,16).toString()},r=function(t,e){for(var n=!1,r=0;r<t.length&&!n;r++)n=e(t[r]);return n?r-1:-1},o=function(t,e){return r(t,function(t){return t.name===e})},i=function(t,e){return new Array(e-t.length+1).join("0")+t},a=function(t,e){var n=t.slice(e.length);return""===n?32:parseInt(n)/8},s=function(t,e){var n=t.slice(e.length);return""===n?32:parseInt(n)},u=function(t,e){var n=t.slice(e.length);if(""===n)return 32;for(var r=n.split("x"),o=0,i=0;r>i;i++)o+=r[i]/8;return o},c=function(){var t=function(t,e){return function(n,r){var o=t;if(0!==n.indexOf(o))return!1;var a=e(n,o);return r="number"==typeof r?r.toString(16):"string"==typeof r?web3.toHex(r):0===r.indexOf("0x")?r.substr(2):(+r).toString(16),i(r,2*a)}},e=function(t,e,n){return function(r,o){return r!==t?!1:i(n?n(o):o,2*e)}},n=function(t){return t?"0x1":"0x0"};return[t("uint",a),t("int",a),t("hash",a),t("string",s),t("real",u),t("ureal",u),e("address",20),e("bool",1,n)]},l=c(),h=function(t,e,n){var r="",a=o(t,e);if(-1!==a){r="0x"+i(a.toString(16),2);for(var s=t[a],u=0;u<s.inputs.length;u++){for(var c=!1,h=0;h<l.length&&!c;h++)c=l[h](s.inputs[u].type,n[u]);c||console.error("unsupported json type: "+s.inputs[u].type),r+=c}return r}},f=function(){var t=function(t,e){return function(n){var r=t;if(0!==n.indexOf(r))return-1;var o=e(n,r);return 2*o}},e=function(t,e){return function(n){return t===n?2*e:-1}},r=function(t){return t.length<=8?+parseInt(t,16):n(t)},o=function(t){return"0x"+t},i=function(t){return"1"===t?!0:!1},c=function(t){return web3.toAscii(t)};return[{padding:t("uint",a),format:r},{padding:t("int",a),format:r},{padding:t("hash",a),format:o},{padding:t("string",s),format:c},{padding:t("real",u),format:r},{padding:t("ureal",u),format:r},{padding:e("address",20)},{padding:e("bool",1),format:i}]},p=f(),d=function(t,e,n){var r=o(t,e);if(-1!==r){n=n.slice(2);for(var i=[],a=t[r],s=0;s<a.outputs.length;s++){for(var u=-1,c=0;c<p.length&&-1===u;c++)u=p[c].padding(a.outputs[s].type);if(-1!==u){var l=n.slice(0,u),h=p[c-1].format;i.push(h?h(l):"0x"+l),n=n.slice(u)}}return i}},v=function(t){var e={};return t.forEach(function(n){e[n.name]=function(){var e=Array.prototype.slice.call(arguments);return h(t,n.name,e)}}),e},g=function(t){var e={};return t.forEach(function(n){e[n.name]=function(e){return d(t,n.name,e)}}),e};e.exports={inputParser:v,outputParser:g}},{}],2:[function(t,e){var n=function(t){if(!web3.haveProvider()){if(this.sendQueue=[],this.onmessageQueue=[],navigator.qt)return void(this.provider=new web3.providers.QtProvider);t=t||{};var e={httprpc:t.httprpc||"http://localhost:8080",websockets:t.websockets||"ws://localhost:40404/eth"},n=this,r=function(t){o.close(),t?n.provider=new web3.providers.WebSocketProvider(e.websockets):(n.provider=new web3.providers.HttpRpcProvider(e.httprpc),n.poll=n.provider.poll.bind(n.provider)),n.sendQueue.forEach(function(t){n.provider(t)}),n.onmessageQueue.forEach(function(t){n.provider.onmessage=t})},o=new WebSocket(e.websockets);o.onopen=function(){r(!0)},o.onerror=function(){r(!1)}}};n.prototype.send=function(t){return this.provider?void this.provider.send(t):void this.sendQueue.push(t)},Object.defineProperty(n.prototype,"onmessage",{set:function(t){return this.provider?void(this.provider.onmessage=t):void this.onmessageQueue.push(t)}}),e.exports=n},{}],3:[function(t,e){var n=t("./abi"),r=function(t,e){var r=n.inputParser(e),o=n.outputParser(e),i={};return e.forEach(function(e){i[e.name]=function(){var n=Array.prototype.slice.call(arguments),i=r[e.name].apply(null,n),a=function(t){return o[e.name](t)};return{call:function(e){return e=e||{},e.to=t,e.data=i,web3.eth.call(e).then(a)},transact:function(e){return e=e||{},e.to=t,e.data=i,web3.eth.transact(e).then(a)}}}}),i};e.exports=r},{"./abi":1}],4:[function(t,e){function n(t){return{jsonrpc:"2.0",method:t.call,params:t.args,id:t._id}}function r(t){var e=JSON.parse(t);return{_id:e.id,data:e.result,error:e.error}}var o=function(t){this.handlers=[],this.host=t};o.prototype.sendRequest=function(t,e){var r=n(t),o=new XMLHttpRequest;o.open("POST",this.host,!0),o.send(JSON.stringify(r)),o.onreadystatechange=function(){4===o.readyState&&e&&e(o)}},o.prototype.send=function(t){var e=this;this.sendRequest(t,function(t){e.handlers.forEach(function(n){n.call(e,r(t.responseText))})})},o.prototype.poll=function(t,e){var n=this;this.sendRequest(t,function(r){var o=JSON.parse(r.responseText);!o.error&&(o.result instanceof Array?0!==o.result.length:o.result)&&n.handlers.forEach(function(r){r.call(n,{_event:t.call,_id:e,data:o.result})})})},Object.defineProperty(o.prototype,"onmessage",{set:function(t){this.handlers.push(t)}}),e.exports=o},{}],5:[function(t,e){var n=function(){this.handlers=[];var t=this;navigator.qt.onmessage=function(e){t.handlers.forEach(function(n){n.call(t,JSON.parse(e.data))})}};n.prototype.send=function(t){navigator.qt.postMessage(JSON.stringify(t))},Object.defineProperty(n.prototype,"onmessage",{set:function(t){this.handlers.push(t)}}),e.exports=n},{}],6:[function(t,e){function n(t){return t instanceof Promise?Promise.resolve(t):t instanceof Array?new Promise(function(e){var r=t.map(function(t){return n(t)});return Promise.all(r).then(function(n){for(var r=0;r<t.length;r++)t[r]=n[r];e(t)})}):t instanceof Object?new Promise(function(e){var r=Object.keys(t),o=r.map(function(e){return n(t[e])});return Promise.all(o).then(function(n){for(var o=0;o<r.length;o++)t[r[o]]=n[o];e(t)})}):Promise.resolve(t)}function r(t){if(void 0!==t._event)return void v.trigger(t._event,t._id,t.data);if(t._id){var e=v._callbacks[t._id];e&&(e.call(this,t.error,t.data),delete v._callbacks[t._id])}}var o=function(){return[{name:"sha3",call:"web3_sha3"}]},i=function(){var t=function(t){return"string"==typeof t[0]?"eth_blockByHash":"eth_blockByNumber"},e=function(t){return"string"==typeof t[0]?"eth_transactionByHash":"eth_transactionByNumber"},n=function(t){return"string"==typeof t[0]?"eth_uncleByHash":"eth_uncleByNumber"},r=[{name:"balanceAt",call:"eth_balanceAt"},{name:"stateAt",call:"eth_stateAt"},{name:"storageAt",call:"eth_storageAt"},{name:"countAt",call:"eth_countAt"},{name:"codeAt",call:"eth_codeAt"},{name:"transact",call:"eth_transact"},{name:"call",call:"eth_call"},{name:"block",call:t},{name:"transaction",call:e},{name:"uncle",call:n},{name:"compilers",call:"eth_compilers"},{name:"lll",call:"eth_lll"},{name:"solidity",call:"eth_solidity"},{name:"serpent",call:"eth_serpent"},{name:"logs",call:"eth_logs"}];return r},a=function(){return[{name:"coinbase",getter:"eth_coinbase",setter:"eth_setCoinbase"},{name:"listening",getter:"eth_listening",setter:"eth_setListening"},{name:"mining",getter:"eth_mining",setter:"eth_setMining"},{name:"gasPrice",getter:"eth_gasPrice"},{name:"account",getter:"eth_account"},{name:"accounts",getter:"eth_accounts"},{name:"peerCount",getter:"eth_peerCount"},{name:"defaultBlock",getter:"eth_defaultBlock",setter:"eth_setDefaultBlock"},{name:"number",getter:"eth_number"}]},s=function(){return[{name:"put",call:"db_put"},{name:"get",call:"db_get"},{name:"putString",call:"db_putString"},{name:"getString",call:"db_getString"}]},u=function(){return[{name:"post",call:"shh_post"},{name:"newIdentity",call:"shh_newIdentity"},{name:"haveIdentity",call:"shh_haveIdentity"},{name:"newGroup",call:"shh_newGroup"},{name:"addToGroup",call:"shh_addToGroup"}]},c=function(){var t=function(t){return"string"==typeof t[0]?"eth_newFilterString":"eth_newFilter"};return[{name:"newFilter",call:t},{name:"uninstallFilter",call:"eth_uninstallFilter"},{name:"getMessages",call:"eth_filterLogs"}]},l=function(){return[{name:"newFilter",call:"shh_newFilter"},{name:"uninstallFilter",call:"shh_uninstallFilter"},{name:"getMessage",call:"shh_getMessages"}]},h=function(t,e){e.forEach(function(e){t[e.name]=function(){return n(Array.prototype.slice.call(arguments)).then(function(t){var n="function"==typeof e.call?e.call(t):e.call;return{call:n,args:t}}).then(function(t){return new Promise(function(e,n){v.provider.send(t,function(t,r){return t?void n(t):void e(r)})})}).catch(function(t){console.error(t)})}})},f=function(t,e){e.forEach(function(e){var r={};r.get=function(){return new Promise(function(t,n){v.provider.send({call:e.getter},function(e,r){return e?void n(e):void t(r)})})},e.setter&&(r.set=function(t){return n([t]).then(function(t){return new Promise(function(n){v.provider.send({call:e.setter,args:t},function(t,e){return t?void reject(t):void n(e)})})}).catch(function(t){console.error(t)})}),Object.defineProperty(t,e.name,r)})},p=function(t){return parseInt(t,16).toString()},d=function(t){return parseInt(t).toString(16)},v={_callbacks:{},_events:{},providers:{},toHex:function(t){for(var e="",n=0;n<t.length;n++){var r=t.charCodeAt(n).toString(16);e+=r.length<2?"0"+r:r}return e},toAscii:function(t){var e="",n=0,r=t.length;for("0x"===t.substring(0,2)&&(n=2);r>n;n+=2){var o=t.charCodeAt(n);if(0===o)break;e+=String.fromCharCode(parseInt(t.substr(n,2),16))}return e},fromAscii:function(t,e){e=void 0===e?32:e;for(var n=this.toHex(t);n.length<2*e;)n+="00";return"0x"+n},toDecimal:function(t){return p(t.substring(2))},fromDecimal:function(t){return"0x"+d(t)},toEth:function(t){for(var e="string"==typeof t?0===t.indexOf("0x")?parseInt(t.substr(2),16):parseInt(t):t,n=0,r=["wei","Kwei","Mwei","Gwei","szabo","finney","ether","grand","Mether","Gether","Tether","Pether","Eether","Zether","Yether","Nether","Dether","Vether","Uether"];e>3e3&&n<r.length-1;)e/=1e3,n++;for(var o=e.toString().length<e.toFixed(2).length?e.toString():e.toFixed(2),i=function(t,e,n){return e+","+n};;){var a=o;if(o=o.replace(/(\d)(\d\d\d[\.\,])/,i),a===o)break}return o+" "+r[n]},eth:{prototype:Object(),watch:function(t){return new y(t,g)}},db:{prototype:Object()},shh:{prototype:Object(),watch:function(t){return new y(t,m)}},on:function(t,e,n){return void 0===v._events[t]&&(v._events[t]={}),v._events[t][e]=n,this},off:function(t,e){return void 0!==v._events[t]&&delete v._events[t][e],this},trigger:function(t,e,n){var r=v._events[t];if(r&&r[e]){var o=r[e];o(n)}}};h(v,o()),h(v.eth,i()),f(v.eth,a()),h(v.db,s()),h(v.shh,u());var g={changed:"eth_changed"};h(g,c());var m={changed:"shh_changed"};h(m,l());var b=function(){this.queued=[],this.polls=[],this.ready=!1,this.provider=void 0,this.id=1;var t=this,e=function(){t.provider&&t.provider.poll&&t.polls.forEach(function(e){e.data._id=t.id,t.id++,t.provider.poll(e.data,e.id)}),setTimeout(e,12e3)};e()};b.prototype.send=function(t,e){t._id=this.id,e&&(v._callbacks[t._id]=e),t.args=t.args||[],this.id++,void 0!==this.provider?this.provider.send(t):(console.warn("provider is not set"),this.queued.push(t))},b.prototype.set=function(t){void 0!==this.provider&&void 0!==this.provider.unload&&this.provider.unload(),this.provider=t,this.ready=!0},b.prototype.sendQueued=function(){for(var t=0;this.queued.length;t++)this.send(this.queued[t])},b.prototype.installed=function(){return void 0!==this.provider},b.prototype.startPolling=function(t,e){this.provider&&this.provider.poll&&this.polls.push({data:t,id:e})},b.prototype.stopPolling=function(t){for(var e=this.polls.length;e--;){var n=this.polls[e];n.id===t&&this.polls.splice(e,1)}},v.provider=new b,v.setProvider=function(t){t.onmessage=r,v.provider.set(t),v.provider.sendQueued()},v.haveProvider=function(){return!!v.provider.provider};var y=function(t,e){this.impl=e,this.callbacks=[];var n=this;this.promise=e.newFilter(t),this.promise.then(function(t){n.id=t,v.on(e.changed,t,n.trigger.bind(n)),v.provider.startPolling({call:e.changed,args:[t]},t)})};y.prototype.arrived=function(t){this.changed(t)},y.prototype.changed=function(t){var e=this;this.promise.then(function(){e.callbacks.push(t)})},y.prototype.trigger=function(t){for(var e=0;e<this.callbacks.length;e++)this.callbacks[e].call(this,t)},y.prototype.uninstall=function(){var t=this;this.promise.then(function(e){t.impl.uninstallFilter(e),v.provider.stopPolling(e),v.off(impl.changed,e)})},y.prototype.messages=function(){var t=this;return this.promise.then(function(e){return t.impl.getMessages(e)})},y.prototype.logs=function(){return this.messages()},e.exports=v},{}],7:[function(t,e){var n=function(t){this.handlers=[],this.queued=[],this.ready=!1,this.ws=new WebSocket(t);var e=this;this.ws.onmessage=function(t){for(var n=0;n<e.handlers.length;n++)e.handlers[n].call(e,JSON.parse(t.data),t)},this.ws.onopen=function(){e.ready=!0;for(var t=0;t<e.queued.length;t++)e.send(e.queued[t])}};n.prototype.send=function(t){if(this.ready){var e=JSON.stringify(t);this.ws.send(e)}else this.queued.push(t)},n.prototype.onMessage=function(t){this.handlers.push(t)},n.prototype.unload=function(){this.ws.close()},Object.defineProperty(n.prototype,"onmessage",{set:function(t){this.onMessage(t)}}),e.exports=n},{}],web3:[function(t,e){var n=t("./lib/web3");n.providers.WebSocketProvider=t("./lib/websocket"),n.providers.HttpRpcProvider=t("./lib/httprpc"),n.providers.QtProvider=t("./lib/qt"),n.providers.AutoProvider=t("./lib/autoprovider"),n.contract=t("./lib/contract"),e.exports=n},{"./lib/autoprovider":2,"./lib/contract":3,"./lib/httprpc":4,"./lib/qt":5,"./lib/web3":6,"./lib/websocket":7}]},{},["web3"]);
\ No newline at end of file
diff --git a/cmd/mist/assets/ext/ethereum.js/example/balance.html b/cmd/mist/assets/ext/ethereum.js/example/balance.html
new file mode 100644
index 000000000..d0bf094ef
--- /dev/null
+++ b/cmd/mist/assets/ext/ethereum.js/example/balance.html
@@ -0,0 +1,41 @@
+<!doctype>
+<html>
+
+<head>
+<script type="text/javascript" src="js/es6-promise/promise.min.js"></script>
+<script type="text/javascript" src="../dist/ethereum.js"></script>
+<script type="text/javascript">
+   
+    var web3 = require('web3');
+    web3.setProvider(new web3.providers.AutoProvider());
+
+    function watchBalance() {
+        var coinbase = web3.eth.coinbase;
+        var originalBalance = 0;
+
+        web3.eth.balanceAt(coinbase).then(function (balance) {
+            originalBalance = web3.toDecimal(balance);
+            document.getElementById('original').innerText = 'original balance: ' + originalBalance + '    watching...';
+        });
+
+        web3.eth.watch({altered: coinbase}).changed(function() {
+            web3.eth.balanceAt(coinbase).then(function (balance) {
+                var currentBalance = web3.toDecimal(balance);
+                document.getElementById("current").innerText = 'current: ' + currentBalance;
+                document.getElementById("diff").innerText = 'diff:    ' + (currentBalance - originalBalance);
+            });
+        });
+    }
+
+</script>
+</head>
+<body>
+    <h1>coinbase balance</h1>
+    <button type="button" onClick="watchBalance();">watch balance</button>
+    <div></div>
+    <div id="original"></div>
+    <div id="current"></div>
+    <div id="diff"></div>
+</body>
+</html>
+
diff --git a/cmd/mist/assets/ext/ethereum.js/example/contract.html b/cmd/mist/assets/ext/ethereum.js/example/contract.html
new file mode 100644
index 000000000..403d8c9d1
--- /dev/null
+++ b/cmd/mist/assets/ext/ethereum.js/example/contract.html
@@ -0,0 +1,75 @@
+<!doctype>
+<html>
+
+<head>
+<script type="text/javascript" src="js/es6-promise/promise.min.js"></script>
+<script type="text/javascript" src="../dist/ethereum.js"></script>
+<script type="text/javascript">
+
+    var web3 = require('web3');
+    web3.setProvider(new web3.providers.AutoProvider());
+
+    // solidity source code
+    var source = "" + 
+    "contract test {\n" +
+    "   function multiply(uint a) returns(uint d) {\n" +
+    "       return a * 7;\n" +
+    "   }\n" +
+    "}\n";
+
+    // contract description, this will be autogenerated somehow
+    var desc =  [{
+        "name": "multiply",
+        "inputs": [
+        {
+            "name": "a",
+            "type": "uint256"
+        }
+        ],
+        "outputs": [
+        {
+            "name": "d",
+            "type": "uint256"
+        }
+        ]
+    }];
+
+    var contract;
+
+    function createExampleContract() {
+        // hide create button
+        document.getElementById('create').style.visibility = 'hidden'; 
+        document.getElementById('source').innerText = source;
+
+        // create contract
+        web3.eth.transact({code: web3.eth.solidity(source)}).then(function (address) {
+            contract = web3.contract(address, desc);
+            document.getElementById('call').style.visibility = 'visible';
+        });
+    }
+
+    function callExampleContract() {
+        // this should be generated by ethereum
+        var param = parseInt(document.getElementById('value').value);
+
+        // call the contract
+        contract.multiply(param).call().then(function(res) {
+            document.getElementById('result').innerText = res[0];
+        });
+    }
+
+</script>
+</head>
+<body>
+    <h1>contract</h1>
+    <div id="source"></div> 
+    <div id='create'>
+        <button type="button" onClick="createExampleContract();">create example contract</button>
+    </div>
+    <div id='call' style='visibility: hidden;'>
+        <input type="number" id="value" onkeyup='callExampleContract()'></input>
+    </div>
+    <div id="result"></div>
+</body>
+</html>
+
diff --git a/cmd/mist/assets/ext/ethereum.js/example/node-app.js b/cmd/mist/assets/ext/ethereum.js/example/node-app.js
new file mode 100644
index 000000000..f63fa9115
--- /dev/null
+++ b/cmd/mist/assets/ext/ethereum.js/example/node-app.js
@@ -0,0 +1,16 @@
+#!/usr/bin/env node
+
+require('es6-promise').polyfill();
+
+var web3 = require("../index.js");
+
+web3.setProvider(new web3.providers.HttpRpcProvider('http://localhost:8080'));
+
+web3.eth.coinbase.then(function(result){
+  console.log(result);
+  return web3.eth.balanceAt(result);
+}).then(function(balance){
+  console.log(web3.toDecimal(balance));
+}).catch(function(err){
+  console.log(err);
+});
\ No newline at end of file
diff --git a/cmd/mist/assets/ext/ethereum.js/gulpfile.js b/cmd/mist/assets/ext/ethereum.js/gulpfile.js
new file mode 100644
index 000000000..b17e50c39
--- /dev/null
+++ b/cmd/mist/assets/ext/ethereum.js/gulpfile.js
@@ -0,0 +1,104 @@
+#!/usr/bin/env node
+
+'use strict';
+
+var path = require('path');
+
+var del = require('del');
+var gulp = require('gulp');
+var browserify = require('browserify');
+var jshint = require('gulp-jshint');
+var uglify = require('gulp-uglify');
+var rename = require('gulp-rename');
+var envify = require('envify/custom');
+var unreach = require('unreachable-branch-transform');
+var source = require('vinyl-source-stream');
+var exorcist = require('exorcist');
+var bower = require('bower');
+
+var DEST = './dist/';
+
+var build = function(src, dst, ugly) {
+  var result = browserify({
+      debug: true,
+      insert_global_vars: false,
+      detectGlobals: false,
+      bundleExternal: false
+    })
+    .require('./' + src + '.js', {expose: 'web3'})
+    .add('./' + src + '.js')
+    .transform('envify', {
+      NODE_ENV: 'build'
+    })
+    .transform('unreachable-branch-transform');
+
+    if (ugly) {
+      result = result.transform('uglifyify', {
+        mangle: false,
+        compress: {
+          dead_code: false,
+          conditionals: true,
+          unused: false,
+          hoist_funs: true,
+          hoist_vars: true,
+          negate_iife: false
+        },
+        beautify: true,
+        warnings: true
+      });
+    }
+
+    return result.bundle()
+    .pipe(exorcist(path.join( DEST, dst + '.js.map')))
+    .pipe(source(dst + '.js'))
+    .pipe(gulp.dest( DEST ));
+};
+
+var uglifyFile = function(file) {
+  return gulp.src( DEST + file + '.js')
+    .pipe(uglify())
+    .pipe(rename(file + '.min.js'))
+    .pipe(gulp.dest( DEST ));
+};
+
+gulp.task('bower', function(cb){
+  bower.commands.install().on('end', function (installed){
+    console.log(installed);
+    cb();
+  });
+});
+
+gulp.task('clean', ['lint'], function(cb) {
+  del([ DEST ], cb);
+});
+
+gulp.task('lint', function(){
+  return gulp.src(['./*.js', './lib/*.js'])
+    .pipe(jshint())
+    .pipe(jshint.reporter('default'));
+});
+
+gulp.task('build', ['clean'], function () {
+    return build('index', 'ethereum', true);
+});
+
+gulp.task('buildDev', ['clean'], function () {
+    return build('index', 'ethereum', false);
+});
+
+gulp.task('uglify', ['build'], function(){
+    return uglifyFile('ethereum');
+});
+
+gulp.task('uglify', ['buildDev'], function(){
+    return uglifyFile('ethereum');
+});
+
+gulp.task('watch', function() {
+  gulp.watch(['./lib/*.js'], ['lint', 'prepare', 'build']);
+});
+
+gulp.task('release', ['bower', 'lint', 'build', 'uglify']);
+gulp.task('dev', ['bower', 'lint', 'buildDev', 'uglify']);
+gulp.task('default', ['dev']);
+
diff --git a/cmd/mist/assets/ext/ethereum.js/index.js b/cmd/mist/assets/ext/ethereum.js/index.js
new file mode 100644
index 000000000..99ce66fad
--- /dev/null
+++ b/cmd/mist/assets/ext/ethereum.js/index.js
@@ -0,0 +1,8 @@
+var web3 = require('./lib/web3');
+web3.providers.WebSocketProvider = require('./lib/websocket');
+web3.providers.HttpRpcProvider = require('./lib/httprpc');
+web3.providers.QtProvider = require('./lib/qt');
+web3.providers.AutoProvider = require('./lib/autoprovider');
+web3.contract = require('./lib/contract');
+
+module.exports = web3;
diff --git a/cmd/mist/assets/ext/ethereum.js/lib/abi.js b/cmd/mist/assets/ext/ethereum.js/lib/abi.js
new file mode 100644
index 000000000..1912fff32
--- /dev/null
+++ b/cmd/mist/assets/ext/ethereum.js/lib/abi.js
@@ -0,0 +1,267 @@
+/*
+    This file is part of ethereum.js.
+
+    ethereum.js is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ethereum.js is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file abi.js
+ * @authors:
+ *   Marek Kotewicz <marek@ethdev.com>
+ *   Gav Wood <g@ethdev.com>
+ * @date 2014
+ */
+
+// TODO: is these line is supposed to be here? 
+if (process.env.NODE_ENV !== 'build') {
+    var web3 = require('./web3'); // jshint ignore:line
+}
+
+// TODO: make these be actually accurate instead of falling back onto JS's doubles.
+var hexToDec = function (hex) {
+    return parseInt(hex, 16).toString();
+};
+
+var decToHex = function (dec) {
+    return parseInt(dec).toString(16);
+};
+
+var findIndex = function (array, callback) {
+    var end = false;
+    var i = 0;
+    for (; i < array.length && !end; i++) {
+        end = callback(array[i]);
+    }
+    return end ? i - 1 : -1;
+};
+
+var findMethodIndex = function (json, methodName) {
+    return findIndex(json, function (method) {
+        return method.name === methodName;
+    });
+};
+
+var padLeft = function (string, chars) {
+    return new Array(chars - string.length + 1).join("0") + string;
+};
+
+var calcBitPadding = function (type, expected) {
+    var value = type.slice(expected.length);
+    if (value === "") {
+        return 32;
+    }
+    return parseInt(value) / 8;
+};
+
+var calcBytePadding = function (type, expected) {
+    var value = type.slice(expected.length);
+    if (value === "") {
+        return 32;
+    }
+    return parseInt(value);
+};
+
+var calcRealPadding = function (type, expected) {
+    var value = type.slice(expected.length);
+    if (value === "") {
+        return 32;
+    }
+    var sizes = value.split('x');
+    for (var padding = 0, i = 0; i < sizes; i++) {
+        padding += (sizes[i] / 8);
+    }
+    return padding;
+};
+
+var setupInputTypes = function () {
+    
+    var prefixedType = function (prefix, calcPadding) {
+        return function (type, value) {
+            var expected = prefix;
+            if (type.indexOf(expected) !== 0) {
+                return false;
+            }
+
+            var padding = calcPadding(type, expected);
+            if (typeof value === "number")
+                value = value.toString(16);
+            else if (typeof value === "string")
+                value = web3.toHex(value); 
+            else if (value.indexOf('0x') === 0)
+                value = value.substr(2);
+            else
+                value = (+value).toString(16);
+            return padLeft(value, padding * 2);
+        };
+    };
+
+    var namedType = function (name, padding, formatter) {
+        return function (type, value) {
+            if (type !== name) {
+                return false;
+            }
+
+            return padLeft(formatter ? formatter(value) : value, padding * 2);
+        };
+    };
+
+    var formatBool = function (value) {
+        return value ? '0x1' : '0x0';
+    };
+
+    return [
+        prefixedType('uint', calcBitPadding),
+        prefixedType('int', calcBitPadding),
+        prefixedType('hash', calcBitPadding),
+        prefixedType('string', calcBytePadding),
+        prefixedType('real', calcRealPadding),
+        prefixedType('ureal', calcRealPadding),
+        namedType('address', 20),
+        namedType('bool', 1, formatBool),
+    ];
+};
+
+var inputTypes = setupInputTypes();
+
+var toAbiInput = function (json, methodName, params) {
+    var bytes = "";
+    var index = findMethodIndex(json, methodName);
+
+    if (index === -1) {
+        return;
+    }
+
+    bytes = "0x" + padLeft(index.toString(16), 2);
+    var method = json[index];
+
+    for (var i = 0; i < method.inputs.length; i++) {
+        var found = false;
+        for (var j = 0; j < inputTypes.length && !found; j++) {
+            found = inputTypes[j](method.inputs[i].type, params[i]);
+        }
+        if (!found) {
+            console.error('unsupported json type: ' + method.inputs[i].type);
+        }
+        bytes += found;
+    }
+    return bytes;
+};
+
+var setupOutputTypes = function () {
+
+    var prefixedType = function (prefix, calcPadding) {
+        return function (type) {
+            var expected = prefix;
+            if (type.indexOf(expected) !== 0) {
+                return -1;
+            }
+
+            var padding = calcPadding(type, expected);
+            return padding * 2;
+        };
+    };
+
+    var namedType = function (name, padding) {
+        return function (type) {
+            return name === type ? padding * 2 : -1;
+        };
+    };
+
+    var formatInt = function (value) {
+        return value.length <= 8 ? +parseInt(value, 16) : hexToDec(value);
+    };
+
+    var formatHash = function (value) {
+        return "0x" + value;
+    };
+
+    var formatBool = function (value) {
+        return value === '1' ? true : false;
+    };
+
+    var formatString = function (value) {
+        return web3.toAscii(value);
+    };
+
+    return [
+    { padding: prefixedType('uint', calcBitPadding), format: formatInt },
+    { padding: prefixedType('int', calcBitPadding), format: formatInt },
+    { padding: prefixedType('hash', calcBitPadding), format: formatHash },
+    { padding: prefixedType('string', calcBytePadding), format: formatString },
+    { padding: prefixedType('real', calcRealPadding), format: formatInt },
+    { padding: prefixedType('ureal', calcRealPadding), format: formatInt },
+    { padding: namedType('address', 20) },
+    { padding: namedType('bool', 1), format: formatBool }
+    ];
+};
+
+var outputTypes = setupOutputTypes();
+
+var fromAbiOutput = function (json, methodName, output) {
+    var index = findMethodIndex(json, methodName);
+
+    if (index === -1) {
+        return;
+    }
+
+    output = output.slice(2);
+
+    var result = [];
+    var method = json[index];
+    for (var i = 0; i < method.outputs.length; i++) {
+        var padding = -1;
+        for (var j = 0; j < outputTypes.length && padding === -1; j++) {
+            padding = outputTypes[j].padding(method.outputs[i].type);
+        }
+
+        if (padding === -1) {
+            // not found output parsing
+            continue;
+        }
+        var res = output.slice(0, padding);
+        var formatter = outputTypes[j - 1].format;
+        result.push(formatter ? formatter(res) : ("0x" + res));
+        output = output.slice(padding);
+    }
+
+    return result;
+};
+
+var inputParser = function (json) {
+    var parser = {};
+    json.forEach(function (method) {
+        parser[method.name] = function () {
+            var params = Array.prototype.slice.call(arguments);
+            return toAbiInput(json, method.name, params);
+        };
+    });
+
+    return parser;
+};
+
+var outputParser = function (json) {
+    var parser = {};
+    json.forEach(function (method) {
+        parser[method.name] = function (output) {
+            return fromAbiOutput(json, method.name, output);
+        };
+    });
+
+    return parser;
+};
+
+if (typeof(module) !== "undefined") {
+	module.exports = {
+		inputParser: inputParser,
+		outputParser: outputParser
+	};
+}
diff --git a/cmd/mist/assets/ext/ethereum.js/lib/autoprovider.js b/cmd/mist/assets/ext/ethereum.js/lib/autoprovider.js
new file mode 100644
index 000000000..3cb83d4a0
--- /dev/null
+++ b/cmd/mist/assets/ext/ethereum.js/lib/autoprovider.js
@@ -0,0 +1,103 @@
+/*
+    This file is part of ethereum.js.
+
+    ethereum.js is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ethereum.js is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file autoprovider.js
+ * @authors:
+ *   Marek Kotewicz <marek@ethdev.com>
+ *   Marian Oancea <marian@ethdev.com>
+ * @date 2014
+ */
+
+/*
+ * @brief if qt object is available, uses QtProvider,
+ * if not tries to connect over websockets
+ * if it fails, it uses HttpRpcProvider
+ */
+
+// TODO: is these line is supposed to be here? 
+if (process.env.NODE_ENV !== 'build') {
+    var WebSocket = require('ws'); // jshint ignore:line
+    var web3 = require('./web3'); // jshint ignore:line
+}
+
+var AutoProvider = function (userOptions) {
+    if (web3.haveProvider()) {
+        return;
+    }
+
+    // before we determine what provider we are, we have to cache request
+    this.sendQueue = [];
+    this.onmessageQueue = [];
+
+    if (navigator.qt) {
+        this.provider = new web3.providers.QtProvider();
+        return;
+    }
+
+    userOptions = userOptions || {};
+    var options = {
+        httprpc: userOptions.httprpc || 'http://localhost:8080',
+        websockets: userOptions.websockets || 'ws://localhost:40404/eth'
+    };
+
+    var self = this;
+    var closeWithSuccess = function (success) {
+        ws.close();
+        if (success) {
+            self.provider = new web3.providers.WebSocketProvider(options.websockets);
+        } else {
+            self.provider = new web3.providers.HttpRpcProvider(options.httprpc);
+            self.poll = self.provider.poll.bind(self.provider);
+        }
+        self.sendQueue.forEach(function (payload) {
+            self.provider(payload);
+        });
+        self.onmessageQueue.forEach(function (handler) {
+            self.provider.onmessage = handler;
+        });
+    };
+
+    var ws = new WebSocket(options.websockets);
+
+    ws.onopen = function() {
+        closeWithSuccess(true);
+    };
+
+    ws.onerror = function() {
+        closeWithSuccess(false);
+    };
+};
+
+AutoProvider.prototype.send = function (payload) {
+    if (this.provider) {
+        this.provider.send(payload);
+        return;
+    }
+    this.sendQueue.push(payload);
+};
+
+Object.defineProperty(AutoProvider.prototype, 'onmessage', {
+    set: function (handler) {
+        if (this.provider) {
+            this.provider.onmessage = handler;
+            return;
+        }
+        this.onmessageQueue.push(handler);
+    }
+});
+
+if (typeof(module) !== "undefined")
+	module.exports = AutoProvider;
diff --git a/cmd/mist/assets/ext/ethereum.js/lib/contract.js b/cmd/mist/assets/ext/ethereum.js/lib/contract.js
new file mode 100644
index 000000000..dc84eb996
--- /dev/null
+++ b/cmd/mist/assets/ext/ethereum.js/lib/contract.js
@@ -0,0 +1,66 @@
+/*
+    This file is part of ethereum.js.
+
+    ethereum.js is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ethereum.js is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file contract.js
+ * @authors:
+ *   Marek Kotewicz <marek@ethdev.com>
+ * @date 2014
+ */
+
+// TODO: is these line is supposed to be here? 
+if (process.env.NODE_ENV !== 'build') {
+    var web3 = require('./web3'); // jshint ignore:line
+}
+
+var abi = require('./abi');
+
+var contract = function (address, desc) {
+    var inputParser = abi.inputParser(desc);
+    var outputParser = abi.outputParser(desc);
+
+    var contract = {};
+
+    desc.forEach(function (method) {
+        contract[method.name] = function () {
+            var params = Array.prototype.slice.call(arguments);
+            var parsed = inputParser[method.name].apply(null, params);
+
+            var onSuccess = function (result) {
+                return outputParser[method.name](result);
+            };
+
+            return {
+                call: function (extra) {
+                    extra = extra || {};
+                    extra.to = address;
+                    extra.data = parsed;
+                    return web3.eth.call(extra).then(onSuccess);
+                },
+                transact: function (extra) {
+                    extra = extra || {};
+                    extra.to = address;
+                    extra.data = parsed;
+                    return web3.eth.transact(extra).then(onSuccess);
+                }
+            };
+        };
+    });
+
+    return contract;
+};
+
+if (typeof(module) !== "undefined")
+	module.exports = contract;
diff --git a/cmd/mist/assets/ext/ethereum.js/lib/httprpc.js b/cmd/mist/assets/ext/ethereum.js/lib/httprpc.js
new file mode 100644
index 000000000..6823b96b4
--- /dev/null
+++ b/cmd/mist/assets/ext/ethereum.js/lib/httprpc.js
@@ -0,0 +1,95 @@
+/*
+    This file is part of ethereum.js.
+
+    ethereum.js is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ethereum.js is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file httprpc.js
+ * @authors:
+ *   Marek Kotewicz <marek@ethdev.com>
+ *   Marian Oancea <marian@ethdev.com>
+ * @date 2014
+ */
+
+// TODO: is these line is supposed to be here? 
+if (process.env.NODE_ENV !== 'build') {
+    var XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest; // jshint ignore:line
+}
+
+var HttpRpcProvider = function (host) {
+    this.handlers = [];
+    this.host = host;
+};
+
+function formatJsonRpcObject(object) {
+    return {
+        jsonrpc: '2.0',
+        method: object.call,
+        params: object.args,
+        id: object._id
+    };
+}
+
+function formatJsonRpcMessage(message) {
+    var object = JSON.parse(message);
+
+    return {
+        _id: object.id,
+        data: object.result,
+        error: object.error
+    };
+}
+
+HttpRpcProvider.prototype.sendRequest = function (payload, cb) {
+    var data = formatJsonRpcObject(payload);
+
+    var request = new XMLHttpRequest();
+    request.open("POST", this.host, true);
+    request.send(JSON.stringify(data));
+    request.onreadystatechange = function () {
+        if (request.readyState === 4 && cb) {
+            cb(request);
+        }
+    };
+};
+
+HttpRpcProvider.prototype.send = function (payload) {
+    var self = this;
+    this.sendRequest(payload, function (request) {
+        self.handlers.forEach(function (handler) {
+            handler.call(self, formatJsonRpcMessage(request.responseText));
+        });
+    });
+};
+
+HttpRpcProvider.prototype.poll = function (payload, id) {
+    var self = this;
+    this.sendRequest(payload, function (request) {
+        var parsed = JSON.parse(request.responseText);
+        if (parsed.error || (parsed.result instanceof Array ? parsed.result.length === 0 : !parsed.result)) {
+            return;
+        }
+        self.handlers.forEach(function (handler) {
+            handler.call(self, {_event: payload.call, _id: id, data: parsed.result});
+        });
+    });
+};
+
+Object.defineProperty(HttpRpcProvider.prototype, "onmessage", {
+    set: function (handler) {
+        this.handlers.push(handler);
+    }
+});
+
+if (typeof(module) !== "undefined")
+	module.exports = HttpRpcProvider;
diff --git a/cmd/mist/assets/ext/ethereum.js/lib/qt.js b/cmd/mist/assets/ext/ethereum.js/lib/qt.js
new file mode 100644
index 000000000..f51e65da4
--- /dev/null
+++ b/cmd/mist/assets/ext/ethereum.js/lib/qt.js
@@ -0,0 +1,46 @@
+/*
+    This file is part of ethereum.js.
+
+    ethereum.js is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ethereum.js is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file qt.js
+ * @authors:
+ *   Jeffrey Wilcke <jeff@ethdev.com>
+ *   Marek Kotewicz <marek@ethdev.com>
+ * @date 2014
+ */
+
+var QtProvider = function() {
+    this.handlers = [];
+
+    var self = this;
+    navigator.qt.onmessage = function (message) {
+        self.handlers.forEach(function (handler) {
+            handler.call(self, JSON.parse(message.data));
+        });
+    };
+};
+
+QtProvider.prototype.send = function(payload) {
+    navigator.qt.postMessage(JSON.stringify(payload));
+};
+
+Object.defineProperty(QtProvider.prototype, "onmessage", {
+    set: function(handler) {
+        this.handlers.push(handler);
+    }
+});
+
+if (typeof(module) !== "undefined")
+	module.exports = QtProvider;
diff --git a/cmd/mist/assets/ext/ethereum.js/lib/web3.js b/cmd/mist/assets/ext/ethereum.js/lib/web3.js
new file mode 100644
index 000000000..2fe414259
--- /dev/null
+++ b/cmd/mist/assets/ext/ethereum.js/lib/web3.js
@@ -0,0 +1,509 @@
+/*
+    This file is part of ethereum.js.
+
+    ethereum.js is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ethereum.js is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file main.js
+ * @authors:
+ *   Jeffrey Wilcke <jeff@ethdev.com>
+ *   Marek Kotewicz <marek@ethdev.com>
+ *   Marian Oancea <marian@ethdev.com>
+ *   Gav Wood <g@ethdev.com>
+ * @date 2014
+ */
+
+function flattenPromise (obj) {
+    if (obj instanceof Promise) {
+        return Promise.resolve(obj);
+    }
+
+    if (obj instanceof Array) {
+        return new Promise(function (resolve) {
+            var promises = obj.map(function (o) {
+                return flattenPromise(o);
+            });
+
+            return Promise.all(promises).then(function (res) {
+                for (var i = 0; i < obj.length; i++) {
+                    obj[i] = res[i];
+                }
+                resolve(obj);
+            });
+        });
+    }
+
+    if (obj instanceof Object) {
+        return new Promise(function (resolve) {
+            var keys = Object.keys(obj);
+            var promises = keys.map(function (key) {
+                return flattenPromise(obj[key]);
+            });
+
+            return Promise.all(promises).then(function (res) {
+                for (var i = 0; i < keys.length; i++) {
+                    obj[keys[i]] = res[i];
+                }
+                resolve(obj);
+            });
+        });
+    }
+
+    return Promise.resolve(obj);
+}
+
+var web3Methods = function () {
+    return [
+    { name: 'sha3', call: 'web3_sha3' }
+    ];
+};
+
+var ethMethods = function () {
+    var blockCall = function (args) {
+        return typeof args[0] === "string" ? "eth_blockByHash" : "eth_blockByNumber";
+    };
+
+    var transactionCall = function (args) {
+        return typeof args[0] === "string" ? 'eth_transactionByHash' : 'eth_transactionByNumber';
+    };
+
+    var uncleCall = function (args) {
+        return typeof args[0] === "string" ? 'eth_uncleByHash' : 'eth_uncleByNumber';
+    };
+
+    var methods = [
+    { name: 'balanceAt', call: 'eth_balanceAt' },
+    { name: 'stateAt', call: 'eth_stateAt' },
+    { name: 'storageAt', call: 'eth_storageAt' },
+    { name: 'countAt', call: 'eth_countAt'},
+    { name: 'codeAt', call: 'eth_codeAt' },
+    { name: 'transact', call: 'eth_transact' },
+    { name: 'call', call: 'eth_call' },
+    { name: 'block', call: blockCall },
+    { name: 'transaction', call: transactionCall },
+    { name: 'uncle', call: uncleCall },
+    { name: 'compilers', call: 'eth_compilers' },
+    { name: 'lll', call: 'eth_lll' },
+    { name: 'solidity', call: 'eth_solidity' },
+    { name: 'serpent', call: 'eth_serpent' },
+    { name: 'logs', call: 'eth_logs' }
+    ];
+    return methods;
+};
+
+var ethProperties = function () {
+    return [
+    { name: 'coinbase', getter: 'eth_coinbase', setter: 'eth_setCoinbase' },
+    { name: 'listening', getter: 'eth_listening', setter: 'eth_setListening' },
+    { name: 'mining', getter: 'eth_mining', setter: 'eth_setMining' },
+    { name: 'gasPrice', getter: 'eth_gasPrice' },
+    { name: 'account', getter: 'eth_account' },
+    { name: 'accounts', getter: 'eth_accounts' },
+    { name: 'peerCount', getter: 'eth_peerCount' },
+    { name: 'defaultBlock', getter: 'eth_defaultBlock', setter: 'eth_setDefaultBlock' },
+    { name: 'number', getter: 'eth_number'}
+    ];
+};
+
+var dbMethods = function () {
+    return [
+    { name: 'put', call: 'db_put' },
+    { name: 'get', call: 'db_get' },
+    { name: 'putString', call: 'db_putString' },
+    { name: 'getString', call: 'db_getString' }
+    ];
+};
+
+var shhMethods = function () {
+    return [
+    { name: 'post', call: 'shh_post' },
+    { name: 'newIdentity', call: 'shh_newIdentity' },
+    { name: 'haveIdentity', call: 'shh_haveIdentity' },
+    { name: 'newGroup', call: 'shh_newGroup' },
+    { name: 'addToGroup', call: 'shh_addToGroup' }
+    ];
+};
+
+var ethWatchMethods = function () {
+    var newFilter = function (args) {
+        return typeof args[0] === 'string' ? 'eth_newFilterString' : 'eth_newFilter';
+    };
+
+    return [
+    { name: 'newFilter', call: newFilter },
+    { name: 'uninstallFilter', call: 'eth_uninstallFilter' },
+    { name: 'getMessages', call: 'eth_filterLogs' }
+    ];
+};
+
+var shhWatchMethods = function () {
+    return [
+    { name: 'newFilter', call: 'shh_newFilter' },
+    { name: 'uninstallFilter', call: 'shh_uninstallFilter' },
+    { name: 'getMessages', call: 'shh_getMessages' }
+    ];
+};
+
+var setupMethods = function (obj, methods) {
+    methods.forEach(function (method) {
+        obj[method.name] = function () {
+            return flattenPromise(Array.prototype.slice.call(arguments)).then(function (args) {
+                var call = typeof method.call === "function" ? method.call(args) : method.call;
+                return {call: call, args: args};
+            }).then(function (request) {
+                return new Promise(function (resolve, reject) {
+                    web3.provider.send(request, function (err, result) {
+                        if (!err) {
+                            resolve(result);
+                            return;
+                        }
+                        reject(err);
+                    });
+                });
+            }).catch(function(err) {
+                console.error(err);
+            });
+        };
+    });
+};
+
+var setupProperties = function (obj, properties) {
+    properties.forEach(function (property) {
+        var proto = {};
+        proto.get = function () {
+            return new Promise(function(resolve, reject) {
+                web3.provider.send({call: property.getter}, function(err, result) {
+                    if (!err) {
+                        resolve(result);
+                        return;
+                    }
+                    reject(err);
+                });
+            });
+        };
+        if (property.setter) {
+            proto.set = function (val) {
+                return flattenPromise([val]).then(function (args) {
+                    return new Promise(function (resolve) {
+                        web3.provider.send({call: property.setter, args: args}, function (err, result) {
+                            if (!err) {
+                                resolve(result);
+                                return;
+                            }
+                            reject(err);
+                        });
+                    });
+                }).catch(function (err) {
+                    console.error(err);
+                });
+            };
+        }
+        Object.defineProperty(obj, property.name, proto);
+    });
+};
+
+// TODO: import from a dependency, don't duplicate.
+var hexToDec = function (hex) {
+    return parseInt(hex, 16).toString();
+};
+
+var decToHex = function (dec) {
+    return parseInt(dec).toString(16);
+};
+
+
+var web3 = {
+    _callbacks: {},
+    _events: {},
+    providers: {},
+
+    toHex: function(str) {
+        var hex = "";
+        for(var i = 0; i < str.length; i++) {
+            var n = str.charCodeAt(i).toString(16);
+            hex += n.length < 2 ? '0' + n : n;
+        }
+
+        return hex;
+    },
+
+    toAscii: function(hex) {
+        // Find termination
+        var str = "";
+        var i = 0, l = hex.length;
+        if (hex.substring(0, 2) === '0x')
+            i = 2;
+        for(; i < l; i+=2) {
+            var code = hex.charCodeAt(i);
+            if(code === 0) {
+                break;
+            }
+
+            str += String.fromCharCode(parseInt(hex.substr(i, 2), 16));
+        }
+
+        return str;
+    },
+
+    fromAscii: function(str, pad) {
+        pad = pad === undefined ? 32 : pad;
+        var hex = this.toHex(str);
+        while(hex.length < pad*2)
+            hex += "00";
+        return "0x" + hex;
+    },
+
+    toDecimal: function (val) {
+        return hexToDec(val.substring(2));
+    },
+
+    fromDecimal: function (val) {
+        return "0x" + decToHex(val);
+    },
+
+    toEth: function(str) {
+        var val = typeof str === "string" ? str.indexOf('0x') === 0 ? parseInt(str.substr(2), 16) : parseInt(str) : str;
+        var unit = 0;
+        var units = [ 'wei', 'Kwei', 'Mwei', 'Gwei', 'szabo', 'finney', 'ether', 'grand', 'Mether', 'Gether', 'Tether', 'Pether', 'Eether', 'Zether', 'Yether', 'Nether', 'Dether', 'Vether', 'Uether' ];
+        while (val > 3000 && unit < units.length - 1)
+        {
+            val /= 1000;
+            unit++;
+        }
+        var s = val.toString().length < val.toFixed(2).length ? val.toString() : val.toFixed(2);
+        var replaceFunction = function($0, $1, $2) {
+            return $1 + ',' + $2;
+        };
+
+        while (true) {
+            var o = s;
+            s = s.replace(/(\d)(\d\d\d[\.\,])/, replaceFunction);
+            if (o === s)
+                break;
+        }
+        return s + ' ' + units[unit];
+    },
+
+    eth: {
+        prototype: Object(), // jshint ignore:line
+        watch: function (params) {
+            return new Filter(params, ethWatch);
+        }
+    },
+
+    db: {
+        prototype: Object() // jshint ignore:line
+    },
+
+    shh: {
+        prototype: Object(), // jshint ignore:line
+        watch: function (params) {
+            return new Filter(params, shhWatch);
+        }
+    },
+
+    on: function(event, id, cb) {
+        if(web3._events[event] === undefined) {
+            web3._events[event] = {};
+        }
+
+        web3._events[event][id] = cb;
+        return this;
+    },
+
+    off: function(event, id) {
+        if(web3._events[event] !== undefined) {
+            delete web3._events[event][id];
+        }
+
+        return this;
+    },
+
+    trigger: function(event, id, data) {
+        var callbacks = web3._events[event];
+        if (!callbacks || !callbacks[id]) {
+            return;
+        }
+        var cb = callbacks[id];
+        cb(data);
+    }
+};
+
+setupMethods(web3, web3Methods());
+setupMethods(web3.eth, ethMethods());
+setupProperties(web3.eth, ethProperties());
+setupMethods(web3.db, dbMethods());
+setupMethods(web3.shh, shhMethods());
+
+var ethWatch = {
+    changed: 'eth_changed'
+};
+setupMethods(ethWatch, ethWatchMethods());
+var shhWatch = {
+    changed: 'shh_changed'
+};
+setupMethods(shhWatch, shhWatchMethods());
+
+var ProviderManager = function() {
+    this.queued = [];
+    this.polls = [];
+    this.ready = false;
+    this.provider = undefined;
+    this.id = 1;
+
+    var self = this;
+    var poll = function () {
+        if (self.provider && self.provider.poll) {
+            self.polls.forEach(function (data) {
+                data.data._id = self.id;
+                self.id++;
+                self.provider.poll(data.data, data.id);
+            });
+        }
+        setTimeout(poll, 12000);
+    };
+    poll();
+};
+
+ProviderManager.prototype.send = function(data, cb) {
+    data._id = this.id;
+    if (cb) {
+        web3._callbacks[data._id] = cb;
+    }
+
+    data.args = data.args || [];
+    this.id++;
+
+    if(this.provider !== undefined) {
+        this.provider.send(data);
+    } else {
+        console.warn("provider is not set");
+        this.queued.push(data);
+    }
+};
+
+ProviderManager.prototype.set = function(provider) {
+    if(this.provider !== undefined && this.provider.unload !== undefined) {
+        this.provider.unload();
+    }
+
+    this.provider = provider;
+    this.ready = true;
+};
+
+ProviderManager.prototype.sendQueued = function() {
+    for(var i = 0; this.queued.length; i++) {
+        // Resend
+        this.send(this.queued[i]);
+    }
+};
+
+ProviderManager.prototype.installed = function() {
+    return this.provider !== undefined;
+};
+
+ProviderManager.prototype.startPolling = function (data, pollId) {
+    if (!this.provider || !this.provider.poll) {
+        return;
+    }
+    this.polls.push({data: data, id: pollId});
+};
+
+ProviderManager.prototype.stopPolling = function (pollId) {
+    for (var i = this.polls.length; i--;) {
+        var poll = this.polls[i];
+        if (poll.id === pollId) {
+            this.polls.splice(i, 1);
+        }
+    }
+};
+
+web3.provider = new ProviderManager();
+
+web3.setProvider = function(provider) {
+    provider.onmessage = messageHandler;
+    web3.provider.set(provider);
+    web3.provider.sendQueued();
+};
+
+web3.haveProvider = function() {
+    return !!web3.provider.provider;
+};
+
+var Filter = function(options, impl) {
+    this.impl = impl;
+    this.callbacks = [];
+
+    var self = this;
+    this.promise = impl.newFilter(options);
+    this.promise.then(function (id) {
+        self.id = id;
+        web3.on(impl.changed, id, self.trigger.bind(self));
+        web3.provider.startPolling({call: impl.changed, args: [id]}, id);
+    });
+};
+
+Filter.prototype.arrived = function(callback) {
+    this.changed(callback);
+};
+
+Filter.prototype.changed = function(callback) {
+    var self = this;
+    this.promise.then(function(id) {
+        self.callbacks.push(callback);
+    });
+};
+
+Filter.prototype.trigger = function(messages) {
+    for(var i = 0; i < this.callbacks.length; i++) {
+        this.callbacks[i].call(this, messages);
+    }
+};
+
+Filter.prototype.uninstall = function() {
+    var self = this;
+    this.promise.then(function (id) {
+        self.impl.uninstallFilter(id);
+        web3.provider.stopPolling(id);
+        web3.off(impl.changed, id);
+    });
+};
+
+Filter.prototype.messages = function() {
+    var self = this;
+    return this.promise.then(function (id) {
+        return self.impl.getMessages(id);
+    });
+};
+
+Filter.prototype.logs = function () {
+    return this.messages();
+};
+
+function messageHandler(data) {
+    if(data._event !== undefined) {
+        web3.trigger(data._event, data._id, data.data);
+        return;
+    }
+
+    if(data._id) {
+        var cb = web3._callbacks[data._id];
+        if (cb) {
+            cb.call(this, data.error, data.data);
+            delete web3._callbacks[data._id];
+        }
+    }
+}
+
+if (typeof(module) !== "undefined")
+    module.exports = web3;
diff --git a/cmd/mist/assets/ext/ethereum.js/lib/websocket.js b/cmd/mist/assets/ext/ethereum.js/lib/websocket.js
new file mode 100644
index 000000000..5b40075e4
--- /dev/null
+++ b/cmd/mist/assets/ext/ethereum.js/lib/websocket.js
@@ -0,0 +1,78 @@
+/*
+    This file is part of ethereum.js.
+
+    ethereum.js is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ethereum.js is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file websocket.js
+ * @authors:
+ *   Jeffrey Wilcke <jeff@ethdev.com>
+ *   Marek Kotewicz <marek@ethdev.com>
+ *   Marian Oancea <marian@ethdev.com>
+ * @date 2014
+ */
+
+// TODO: is these line is supposed to be here? 
+if (process.env.NODE_ENV !== 'build') {
+    var WebSocket = require('ws'); // jshint ignore:line
+}
+
+var WebSocketProvider = function(host) {
+    // onmessage handlers
+    this.handlers = [];
+    // queue will be filled with messages if send is invoked before the ws is ready
+    this.queued = [];
+    this.ready = false;
+
+    this.ws = new WebSocket(host);
+
+    var self = this;
+    this.ws.onmessage = function(event) {
+        for(var i = 0; i < self.handlers.length; i++) {
+            self.handlers[i].call(self, JSON.parse(event.data), event);
+        }
+    };
+
+    this.ws.onopen = function() {
+        self.ready = true;
+
+        for(var i = 0; i < self.queued.length; i++) {
+            // Resend
+            self.send(self.queued[i]);
+        }
+    };
+};
+
+WebSocketProvider.prototype.send = function(payload) {
+    if(this.ready) {
+        var data = JSON.stringify(payload);
+
+        this.ws.send(data);
+    } else {
+        this.queued.push(payload);
+    }
+};
+
+WebSocketProvider.prototype.onMessage = function(handler) {
+    this.handlers.push(handler);
+};
+
+WebSocketProvider.prototype.unload = function() {
+    this.ws.close();
+};
+Object.defineProperty(WebSocketProvider.prototype, "onmessage", {
+    set: function(provider) { this.onMessage(provider); }
+});
+
+if (typeof(module) !== "undefined")
+    module.exports = WebSocketProvider;
diff --git a/cmd/mist/assets/ext/ethereum.js/package.json b/cmd/mist/assets/ext/ethereum.js/package.json
new file mode 100644
index 000000000..8f5ba2255
--- /dev/null
+++ b/cmd/mist/assets/ext/ethereum.js/package.json
@@ -0,0 +1,67 @@
+{
+  "name": "ethereum.js",
+  "namespace": "ethereum",
+  "version": "0.0.6",
+  "description": "Ethereum Compatible JavaScript API",
+  "main": "./index.js",
+  "directories": {
+    "lib": "./lib"
+  },
+  "dependencies": {
+    "es6-promise": "*",
+    "ws": "*",
+    "xmlhttprequest": "*"
+  },
+  "devDependencies": {
+    "bower": ">=1.3.0",
+    "browserify": ">=6.0",
+    "del": ">=0.1.1",
+    "envify": "^3.0.0",
+    "exorcist": "^0.1.6",
+    "gulp": ">=3.4.0",
+    "gulp-jshint": ">=1.5.0",
+    "gulp-rename": ">=1.2.0",
+    "gulp-uglify": ">=1.0.0",
+    "jshint": ">=2.5.0",
+    "uglifyify": "^2.6.0",
+    "unreachable-branch-transform": "^0.1.0",
+    "vinyl-source-stream": "^1.0.0"
+  },
+  "scripts": {
+    "build": "gulp",
+    "watch": "gulp watch",
+    "lint": "gulp lint"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/ethereum/ethereum.js.git"
+  },
+  "homepage": "https://github.com/ethereum/ethereum.js",
+  "bugs": {
+    "url": "https://github.com/ethereum/ethereum.js/issues"
+  },
+  "keywords": [
+    "ethereum",
+    "javascript",
+    "API"
+  ],
+  "author": "ethdev.com",
+  "authors": [
+    {
+      "name": "Jeffery Wilcke",
+      "email": "jeff@ethdev.com",
+      "url": "https://github.com/obscuren"
+    },
+    {
+      "name": "Marek Kotewicz",
+      "email": "marek@ethdev.com",
+      "url": "https://github.com/debris"
+    },
+    {
+      "name": "Marian Oancea",
+      "email": "marian@ethdev.com",
+      "url": "https://github.com/cubedro"
+    }
+  ],
+  "license": "LGPL-3.0"
+}
diff --git a/cmd/mist/assets/qml/browser.qml b/cmd/mist/assets/qml/browser.qml
index abaab4f15..a89c3c97d 100644
--- a/cmd/mist/assets/qml/browser.qml
+++ b/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,437 +8,484 @@ import QtQuick.Window 2.1;
 import Ethereum 1.0
 
 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 var cleanPath: false
-    property var open: function(url) {
-        if(!window.cleanPath) {
-            var uri = url;
-            if(!/.*\:\/\/.*/.test(uri)) {
-                uri = "http://" + uri;
-            }
+	id: window
+    objectName: "browserView"
+    anchors.fill: parent
+    color: "#00000000"
+
+	property var title: "Browser"
+	property var iconSource: "../browser.png"
+	property var menuItem
+
+	property alias url: webview.url
+	property alias webView: webview
+
+	property var cleanPath: false
+	property var open: function(url) {
+		if(!window.cleanPath) {
+			var uri = url;
+			if(!/.*\:\/\/.*/.test(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)) {
-                uri.replace(reg, function(match, pre, domain, path) {
-                    uri = pre;
+			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))
-                    }
+					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;
-                    }
+					if(ip.length != 0) {
+						uri += lookup;
+					} else {
+						uri += domain;
+					}
 
-                    uri += path;
-                });
-            }
+					uri += path;
+				});
+			}
 
-            window.cleanPath = true;
+			window.cleanPath = true;
+
+			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;
+		} else {
+			// Prevent inf loop.
+			window.cleanPath = false;
+		}
+	}
+
+	Component.onCompleted: {
+		webview.url = "http://etherian.io"
+	}
+
+	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("eth_changed", id, m);
+	}
+
+	function onShhMessage(message, id) {
+		webview.postEvent("shh_changed", id, message)
+	}
+
+	Item {
+		objectName: "root"
+		id: root
+		anchors.fill: parent
+		state: "inspectorShown"
+
+		RowLayout {
+			id: navBar
+			height: 40
+			anchors {
+				left: parent.left
+				right: parent.right
+				leftMargin: 7
+			}
 
-            webview.url = uri;
+			Button {
+				id: back
+				onClicked: {
+					webview.goBack()
+				}
+				style: ButtonStyle {
+					background: Image {
+						source: "../back.png"
+						width: 30
+						height: 30
+					}
+				}
+			}
 
-            //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;
-        } else {
-            // Prevent inf loop.
-            window.cleanPath = false;
-        }
-    }
-
-    Component.onCompleted: {
-        webview.url = "http://etherian.io"
-    }
-
-    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", id, m);
-    }
-
-    function onShhMessage(message, id) {
-	    webview.postEvent("shhChanged", id, message)
-    }
-
-    Item {
-        objectName: "root"
-        id: root
-        anchors.fill: parent
-        state: "inspectorShown"
-
-        RowLayout {
-            id: navBar
-            height: 40
+			TextField {
+				anchors {
+					left: back.right
+					right: toggleInspector.left
+					leftMargin: 10
+					rightMargin: 10
+				}
+				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
+					}
+				}
+			}
+		}
+
+        // Border
+        Rectangle {
+            id: divider
             anchors {
                 left: parent.left
                 right: parent.right
-                leftMargin: 7
-            }
-
-            Button {
-                id: back
-                onClicked: {
-                    webview.goBack()
-                }
-                style: ButtonStyle {
-                    background: Image {
-                        source: "../back.png"
-                        width: 30
-                        height: 30
-                    }
-                }
+                top: navBar.bottom
             }
+            z: -1
+            height: 1
+            color: "#CCCCCC"
+        }
 
-            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;
-                }
-            }
+		WebView {
+			objectName: "webView"
+			id: webview
+			anchors {
+				left: parent.left
+				right: parent.right
+				bottom: parent.bottom
+				top: divider.bottom
+			}
 
-            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
-                    }
-                }
-            }
-        }
+			function injectJs(js) {
+				webview.experimental.navigatorQtObjectEnabled = true;
+				webview.experimental.evaluateJavaScript(js)
+				webview.experimental.javascriptEnabled = true;
+			}
 
+			function sendMessage(data) {
+				webview.experimental.postMessage(JSON.stringify(data))
+			}
 
-        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());					
-            }
+			experimental.preferences.javascriptEnabled: true
+			experimental.preferences.webGLEnabled: true
+			experimental.itemSelector:  MouseArea {
+				// To avoid conflicting with ListView.model when inside Initiator context.
+				property QtObject selectorModel: model
+				anchors.fill: parent
+				onClicked: selectorModel.reject()
+
+				Menu {
+					visible: true
+					id: itemSelector
+
+					Instantiator {
+						model: selectorModel.items
+						delegate: MenuItem {
+							text: model.text
+							onTriggered: {
+								selectorModel.accept(index)
+							}
+						}
+						onObjectAdded: itemSelector.insertItem(index, object)
+						onObjectRemoved: itemSelector.removeItem(object)
+					}
+				}
+
+				Component.onCompleted: {
+					itemSelector.popup()
+				}
+			}
+			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)
 
-            function sendMessage(data) {
-                webview.experimental.postMessage(JSON.stringify(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())
 
-            experimental.preferences.javascriptEnabled: true
-            experimental.preferences.navigatorQtObjectEnabled: true
-            experimental.preferences.developerExtrasEnabled: true
-            //experimental.userScripts: ["../ext/qt_messaging_adapter.js", "../ext/q.js", "../ext/big.js", "../ext/string.js", "../ext/html_messaging.js"]
-            experimental.userScripts: ["../ext/q.js", "../ext/eth.js/main.js", "../ext/eth.js/qt.js", "../ext/setup.js"]
-            experimental.onMessageReceived: {
-                console.log("[onMessageReceived]: ", message.data)
-                // TODO move to messaging.js
-                var data = JSON.parse(message.data)
+						case "eth_account":
+						postData(data._id, eth.key().address);
 
-                try {
-                    switch(data.call) {
-                        case "compile":
-                        postData(data._id, eth.compile(data.args[0]))
-                        break
+						case "eth_istening":
+						postData(data._id, eth.isListening())
 
-                        case "coinbase":
-                        postData(data._id, eth.coinBase())
+						break
 
-                        case "account":
-                        postData(data._id, eth.key().address);
+						case "eth_mining":
+						postData(data._id, eth.isMining())
 
-                        case "isListening":
-                        postData(data._id, eth.isListening())
+						break
 
-                        break
+						case "eth_peerCount":
+						postData(data._id, eth.peerCount())
 
-                        case "isMining":
-                        postData(data._id, eth.isMining())
+						break
 
-                        break
+						case "eth_countAt":
+						require(1)
+						postData(data._id, eth.txCountAt(data.args[0]))
 
-                        case "peerCount":
-                        postData(data._id, eth.peerCount())
+						break
 
-                        break
+						case "eth_codeAt":
+						require(1)
+						var code = eth.codeAt(data.args[0])
+						postData(data._id, code);
 
-                        case "countAt":
-                        require(1)
-                        postData(data._id, eth.txCountAt(data.args[0]))
+						break
 
-                        break
+						case "eth_blockByNumber":
+						require(1)
+						var block = eth.blockByNumber(data.args[0])
+						postData(data._id, block)
+						break
 
-                        case "codeAt":
-                        require(1)
-                        var code = eth.codeAt(data.args[0])
-                        postData(data._id, code);
+						case "eth_blockByHash":
+						require(1)
+						var block = eth.blockByHash(data.args[0])
+						postData(data._id, block)
+						break
 
-                        break
+						require(2)
+						var block = eth.blockByHash(data.args[0])
+						postData(data._id, block.transactions[data.args[1]])
+						break
 
-                        case "blockByNumber":
-                        require(1)
-                        var block = eth.blockByNumber(data.args[0])
-                        postData(data._id, block)
-                        break
+						case "eth_transactionByHash":
+						case "eth_transactionByNumber":
+						require(2)
 
-                        case "blockByHash":
-                        require(1)
-                        var block = eth.blockByHash(data.args[0])
-                        postData(data._id, block)
-                        break
+						var block;
+						if (data.call === "transactionByHash")
+						block = eth.blockByHash(data.args[0])
+						else
+						block = eth.blockByNumber(data.args[0])
 
-                        require(2)
-                        var block = eth.blockByHash(data.args[0])
-                        postData(data._id, block.transactions[data.args[1]])
-                        break
+						var tx = block.transactions.get(data.args[1])
 
-                        case "transactionByHash":
-                        case "transactionByNumber":
-                        require(2)
+						postData(data._id, tx)
+						break
 
-                        var block;
-                        if (data.call === "transactionByHash")
-                            block = eth.blockByHash(data.args[0])
-                        else
-                            block = eth.blockByNumber(data.args[0])
+						case "eth_uncleByHash":
+						case "eth_uncleByNumber":
+						require(2)
 
-                        var tx = block.transactions.get(data.args[1])
+						var block;
+						if (data.call === "uncleByHash")
+						block = eth.blockByHash(data.args[0])
+						else
+						block = eth.blockByNumber(data.args[0])
 
-                        postData(data._id, tx)
-                        break
+						var uncle = block.uncles.get(data.args[1])
 
-                        case "uncleByHash":
-                        case "uncleByNumber":
-                        require(2)
+						postData(data._id, uncle)
 
-                        var block;
-                        if (data.call === "uncleByHash")
-                            block = eth.blockByHash(data.args[0])
-                        else
-                            block = eth.blockByNumber(data.args[0])
+						break
 
-                        var uncle = block.uncles.get(data.args[1])
+						case "transact":
+						require(5)
 
-                        postData(data._id, uncle)
+						var tx = eth.transact(data.args)
+						postData(data._id, tx)
 
-                        break
+						break
 
-                        case "transact":
-                        require(5)
+						case "eth_stateAt":
+						require(2);
 
-                        var tx = eth.transact(data.args)
-                        postData(data._id, tx)
+						var storage = eth.storageAt(data.args[0], data.args[1]);
+						postData(data._id, storage)
 
-                        break
+						break
 
-                        case "stateAt":
-                        require(2);
+						case "eth_call":
+						require(1);
+						var ret = eth.call(data.args)
+						postData(data._id, ret)
+						break
 
-                        var storage = eth.storageAt(data.args[0], data.args[1]);
-                        postData(data._id, storage)
+						case "eth_balanceAt":
+						require(1);
 
-                        break
+						postData(data._id, eth.balanceAt(data.args[0]));
+						break
 
-                        case "call":
-                        require(1);
-                        var ret = eth.call(data.args)
-                        postData(data._id, ret)
-                        break
+						case "eth_watch":
+						require(2)
+						eth.watch(data.args[0], data.args[1])
 
-                        case "balanceAt":
-                        require(1);
+						case "eth_disconnect":
+						require(1)
+						postData(data._id, null)
+						break;
 
-                        postData(data._id, eth.balanceAt(data.args[0]));
-                        break
+						case "eth_newFilterString":
+						require(1)
+						var id = eth.newFilterString(data.args[0])
+						postData(data._id, id);
+						break;
 
-                        case "watch":
-                        require(2)
-                        eth.watch(data.args[0], data.args[1])
+						case "eth_newFilter":
+						require(1)
+						var id = eth.newFilter(data.args[0])
 
-                        case "disconnect":
-                        require(1)
-                        postData(data._id, null)
-                        break;
+						postData(data._id, id);
+						break;
 
-                        case "messages":
-                        require(1);
+						case "eth_filterLogs":
+						require(1);
 
-                        var messages = JSON.parse(eth.getMessages(data.args[0]))
-                        postData(data._id, messages)
-                        break
+						var messages = eth.messages(data.args[0]);
+						var m = JSON.parse(JSON.parse(JSON.stringify(messages)))
+						postData(data._id, m);
 
-                        case "mutan":
-                        require(1)
+						break;
 
-                        var code = eth.compileMutan(data.args[0])
-                        postData(data._id, "0x"+code)
-                        break;
+						case "eth_deleteFilter":
+						require(1);
+						eth.uninstallFilter(data.args[0])
+						break;
 
-                        case "newFilterString":
-                        require(1)
-                        var id = eth.newFilterString(data.args[0])
-                        postData(data._id, id);
-                        break;
 
-                        case "newFilter":
-                        require(1)
-                        var id = eth.newFilter(data.args[0])
+						case "shh_newFilter":
+						require(1);
+						var id = shh.watch(data.args[0], window);
+						postData(data._id, id);
+						break;
 
-                        postData(data._id, id);
-                        break;
+						case "shh_newIdentity":
+						var id = shh.newIdentity()
+						postData(data._id, id)
 
-                        case "getMessages":
-                        require(1);
+						break
 
-                        var messages = eth.messages(data.args[0]);
-                        var m = JSON.parse(JSON.parse(JSON.stringify(messages)))
-                        postData(data._id, m);
+						case "shh_post":
+						require(1);
 
-                        break;
+						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;
 
-                        case "deleteFilter":
-                        require(1);
-                        eth.uninstallFilter(data.args[0])
-                        break;
+						shh.post(params.payload, params.to, params.from, params.topics, params.priority, params.ttl);
 
+						break;
 
-			case "shhNewFilter":
-			require(1);
-			var id = shh.watch(data.args[0], window);
-			postData(data._id, id);
-			break;
+						case "shh_getMessages":
+						require(1);
 
-			case "newIdentity":
-			postData(data._id, shh.newIdentity())
-			break
+						var m = shh.messages(data.args[0]);
+						var messages = JSON.parse(JSON.parse(JSON.stringify(m)));
+						postData(data._id, messages);
 
-			case "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;
-
-			console.log(JSON.stringify(params))
-			shh.post(params.payload, params.to, params.from, params.topics, params.priority, params.ttl);
-			break;
-                    }
-                } catch(e) {
-                    console.log(data.call + ": " + e)
-
-                    postData(data._id, null);
-                }
-            }
+						break;
 
+						case "ssh_newGroup":
+						postData(data._id, "");
+						break;
+					}
+				} catch(e) {
+					console.log(data.call + ": " + e)
 
-            function post(seed, data) {
-                postData(data._id, data)
-            }
+					postData(data._id, null);
+				}
+			}
 
-            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 post(seed, data) {
+				postData(data._id, data)
+			}
 
-            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 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)
+			}
 
-        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
-            }
-        }
+			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])
+			}
+		}
 
-        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
-                }
-            }
-        ]
-    }
+		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
+				}
+			}
+		]
+	}
 }
diff --git a/cmd/mist/assets/qml/main.qml b/cmd/mist/assets/qml/main.qml
index 111bef8bb..7b207cbcc 100644
--- a/cmd/mist/assets/qml/main.qml
+++ b/cmd/mist/assets/qml/main.qml
@@ -59,8 +59,19 @@ ApplicationWindow {
 
 		mainSplit.setView(wallet.view, wallet.menuItem);
 
-		// Call the ready handler
-		gui.done();
+		// Command setup
+		gui.sendCommand(0)
+	}
+
+	function activeView(view, menuItem) {
+		mainSplit.setView(view, menuItem)
+		if (view.objectName === "browserView") {
+			urlPane.visible = false;
+			mainView.anchors.top = rootView.top
+		} else {
+			urlPane.visible = true;
+			mainView.anchors.top = divider.bottom
+		}
 	}
 
 	function addViews(view, path, options) {
@@ -284,6 +295,7 @@ ApplicationWindow {
 		}
 
 		ProgressBar {
+			visible: false
 			id: downloadIndicator
 			value: 0
 			objectName: "downloadIndicator"
@@ -293,6 +305,7 @@ ApplicationWindow {
 		}
 
 		Label {
+			visible: false
 			objectName: "downloadLabel"
 			//y: 7
 			anchors.left: downloadIndicator.right
@@ -445,7 +458,7 @@ ApplicationWindow {
 					 MouseArea {
 						 anchors.fill: parent
 						 onClicked: {
-							 mainSplit.setView(view, menuItem)
+							 activeView(view, menuItem);
 						 }
 					 }
 
@@ -512,14 +525,14 @@ ApplicationWindow {
 				 var section;
 				 switch(options.section) {
 					 case "ethereum":
-						section = menuDefault;
-						break;
+					 section = menuDefault;
+					 break;
 					 case "legacy":
-						section = menuLegacy;
-						break;
+					 section = menuLegacy;
+					 break;
 					 default:
-						section = menuApps;
-						break;
+					 section = menuApps;
+					 break;
 				 }
 
 				 var comp = menuItemTemplate.createObject(section)
@@ -606,6 +619,7 @@ ApplicationWindow {
 		  * Main view
 		  ********************/
 		  Rectangle {
+			  id: rootView
 			  anchors.right: parent.right
 			  anchors.left: menu.right
 			  anchors.bottom: parent.bottom
@@ -639,8 +653,7 @@ ApplicationWindow {
 
 					  Keys.onReturnPressed: {
 						  if(/^https?/.test(this.text)) {
-							  root.browser.view.open(this.text);
-							  mainSplit.setView(root.browser.view, root.browser.menuItem);
+							  activeView(root.browser.view, root.browser.menuItem);
 						  } else {
 							  addPlugin(this.text, {close: true, section: "apps"})
 						  }
@@ -864,13 +877,13 @@ ApplicationWindow {
 			     Component.onCompleted: {
 				     pastPeers.insert(0, {text: "poc-8.ethdev.com:30303"})
 				     /*
-				     var ips = eth.pastPeers()
-				     for(var i = 0; i < ips.length; i++) {
-					     pastPeers.append({text: ips.get(i)})
-				     }
+				      var ips = eth.pastPeers()
+				      for(var i = 0; i < ips.length; i++) {
+					      pastPeers.append({text: ips.get(i)})
+				      }
 
-				     pastPeers.insert(0, {text: "poc-7.ethdev.com:30303"})
-				     */
+				      pastPeers.insert(0, {text: "poc-7.ethdev.com:30303"})
+				      */
 			     }
 		     }
 
diff --git a/cmd/mist/assets/qml/views/miner.qml b/cmd/mist/assets/qml/views/miner.qml
index e0182649f..193ce37be 100644
--- a/cmd/mist/assets/qml/views/miner.qml
+++ b/cmd/mist/assets/qml/views/miner.qml
@@ -46,6 +46,7 @@ Rectangle {
 						text: "Start"
 						onClicked: {
 							eth.setGasPrice(minGasPrice.text || "10000000000000");
+							eth.setExtra(blockExtra.text)
 							if (eth.toggleMining()) {
 								this.text = "Stop";
 							} else {
@@ -55,6 +56,7 @@ Rectangle {
 					}
 
 					Rectangle {
+						id: minGasPriceRect
 						anchors.top: parent.top
 						anchors.topMargin: 2
 						width: 200
@@ -65,6 +67,23 @@ Rectangle {
 							validator: RegExpValidator { regExp: /\d*/ }
 						}
 					}
+
+					Rectangle {
+						width: 300
+						anchors {
+							left: minGasPriceRect.right
+							leftMargin: 5
+							top: parent.top
+							topMargin: 2
+						}
+
+						TextField {
+							id: blockExtra
+							placeholderText: "Extra"
+							width: parent.width
+							maximumLength: 1024
+						}
+					}
 				}
 			}
 
diff --git a/cmd/mist/bindings.go b/cmd/mist/bindings.go
index 9e55592e6..f6d1c40da 100644
--- a/cmd/mist/bindings.go
+++ b/cmd/mist/bindings.go
@@ -1,20 +1,23 @@
-// Copyright (c) 2013-2014, Jeffrey Wilcke. All rights reserved.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-// MA 02110-1301  USA
-
+/*
+	This file is part of go-ethereum
+
+	go-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	go-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with go-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/**
+ * @authors
+ * 	Jeffrey Wilcke <i@jev.io>
+ */
 package main
 
 import (
@@ -26,6 +29,7 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/ethutil"
 	"github.com/ethereum/go-ethereum/logger"
+	"github.com/ethereum/go-ethereum/state"
 )
 
 type plugin struct {
@@ -118,7 +122,7 @@ func (self *Gui) DumpState(hash, path string) {
 			return
 		}
 
-		stateDump = block.State().Dump()
+		stateDump = state.New(block.Root(), self.eth.Db()).Dump()
 	}
 
 	file, err := os.OpenFile(path[7:], os.O_CREATE|os.O_RDWR, os.ModePerm)
diff --git a/cmd/mist/debugger.go b/cmd/mist/debugger.go
index 618e31f4e..58d8da7b2 100644
--- a/cmd/mist/debugger.go
+++ b/cmd/mist/debugger.go
@@ -1,20 +1,23 @@
-// Copyright (c) 2013-2014, Jeffrey Wilcke. All rights reserved.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-// MA 02110-1301  USA
-
+/*
+	This file is part of go-ethereum
+
+	go-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	go-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with go-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/**
+ * @authors
+ * 	Jeffrey Wilcke <i@jev.io>
+ */
 package main
 
 import (
@@ -37,7 +40,7 @@ type DebuggerWindow struct {
 	engine *qml.Engine
 	lib    *UiLib
 
-	vm *vm.DebugVm
+	vm *vm.Vm
 	Db *Debugger
 
 	state *state.StateDB
@@ -54,7 +57,7 @@ func NewDebuggerWindow(lib *UiLib) *DebuggerWindow {
 
 	win := component.CreateWindow(nil)
 
-	w := &DebuggerWindow{engine: engine, win: win, lib: lib, vm: &vm.DebugVm{}}
+	w := &DebuggerWindow{engine: engine, win: win, lib: lib, vm: &vm.Vm{}}
 	w.Db = NewDebugger(w)
 
 	return w
@@ -264,6 +267,9 @@ type storeVal struct {
 	Key, Value string
 }
 
+func (self *Debugger) Step(evm vm.VirtualMachine, op vm.OpCode, mem *vm.Memory, stack *vm.Stack, context *vm.Context) {
+}
+
 func (self *Debugger) BreakHook(pc int, op vm.OpCode, mem *vm.Memory, stack *vm.Stack, stateObject *state.StateObject) bool {
 	self.main.Logln("break on instr:", pc)
 
diff --git a/cmd/mist/errors.go b/cmd/mist/errors.go
index 2069bf26d..26a172ce9 100644
--- a/cmd/mist/errors.go
+++ b/cmd/mist/errors.go
@@ -1,20 +1,23 @@
-// Copyright (c) 2013-2014, Jeffrey Wilcke. All rights reserved.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-// MA 02110-1301  USA
+/*
+	This file is part of go-ethereum
 
+	go-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	go-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with go-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/**
+ * @authors
+ * 	Jeffrey Wilcke <i@jev.io>
+ */
 package main
 
 import (
diff --git a/cmd/mist/ext_app.go b/cmd/mist/ext_app.go
index 33c420a7a..012c94923 100644
--- a/cmd/mist/ext_app.go
+++ b/cmd/mist/ext_app.go
@@ -1,20 +1,23 @@
-// Copyright (c) 2013-2014, Jeffrey Wilcke. All rights reserved.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-// MA 02110-1301  USA
-
+/*
+	This file is part of go-ethereum
+
+	go-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	go-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with go-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/**
+ * @authors
+ * 	Jeffrey Wilcke <i@jev.io>
+ */
 package main
 
 import (
diff --git a/cmd/mist/flags.go b/cmd/mist/flags.go
index fcee28f19..8a67cdd0a 100644
--- a/cmd/mist/flags.go
+++ b/cmd/mist/flags.go
@@ -1,20 +1,23 @@
-// Copyright (c) 2013-2014, Jeffrey Wilcke. All rights reserved.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-// MA 02110-1301  USA
+/*
+	This file is part of go-ethereum
 
+	go-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	go-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with go-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/**
+ * @authors
+ * 	Jeffrey Wilcke <i@jev.io>
+ */
 package main
 
 import (
@@ -89,7 +92,7 @@ func defaultAssetPath() string {
 }
 func defaultDataDir() string {
 	usr, _ := user.Current()
-	return path.Join(usr.HomeDir, ".mist")
+	return path.Join(usr.HomeDir, ".ethereum")
 }
 
 var defaultConfigFile = path.Join(defaultDataDir(), "conf.ini")
diff --git a/cmd/mist/gui.go b/cmd/mist/gui.go
index 2c31bb3cd..fd2ad5a11 100644
--- a/cmd/mist/gui.go
+++ b/cmd/mist/gui.go
@@ -1,20 +1,23 @@
-// Copyright (c) 2013-2014, Jeffrey Wilcke. All rights reserved.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-// MA 02110-1301  USA
+/*
+	This file is part of go-ethereum
+
+	go-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
 
+	go-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with go-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/**
+ * @authors
+ * 	Jeffrey Wilcke <i@jev.io>
+ */
 package main
 
 import "C"
@@ -23,7 +26,9 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"io/ioutil"
 	"math/big"
+	"os"
 	"path"
 	"runtime"
 	"strconv"
@@ -45,15 +50,22 @@ import (
 
 var guilogger = logger.NewLogger("GUI")
 
+type ServEv byte
+
+const (
+	setup ServEv = iota
+	update
+)
+
 type Gui struct {
 	// The main application window
 	win *qml.Window
 	// QML Engine
 	engine    *qml.Engine
 	component *qml.Common
-	qmlDone   bool
 	// The ethereum interface
-	eth *eth.Ethereum
+	eth           *eth.Ethereum
+	serviceEvents chan ServEv
 
 	// The public Ethereum library
 	uiLib   *UiLib
@@ -83,7 +95,17 @@ func NewWindow(ethereum *eth.Ethereum, config *ethutil.ConfigManager, clientIden
 	}
 
 	xeth := xeth.NewJSXEth(ethereum)
-	gui := &Gui{eth: ethereum, txDb: db, xeth: xeth, logLevel: logger.LogLevel(logLevel), Session: session, open: false, clientIdentity: clientIdentity, config: config, plugins: make(map[string]plugin)}
+	gui := &Gui{eth: ethereum,
+		txDb:           db,
+		xeth:           xeth,
+		logLevel:       logger.LogLevel(logLevel),
+		Session:        session,
+		open:           false,
+		clientIdentity: clientIdentity,
+		config:         config,
+		plugins:        make(map[string]plugin),
+		serviceEvents:  make(chan ServEv, 1),
+	}
 	data, _ := ethutil.ReadAllFile(path.Join(ethutil.Config.ExecPath, "plugins.json"))
 	json.Unmarshal([]byte(data), &gui.plugins)
 
@@ -95,6 +117,8 @@ func (gui *Gui) Start(assetPath string) {
 
 	guilogger.Infoln("Starting GUI")
 
+	go gui.service()
+
 	// Register ethereum functions
 	qml.RegisterTypes("Ethereum", 1, 0, []qml.TypeSpec{{
 		Init: func(p *xeth.JSBlock, obj qml.Object) { p.Number = 0; p.Hash = "" },
@@ -114,18 +138,7 @@ func (gui *Gui) Start(assetPath string) {
 	context.SetVar("eth", gui.uiLib)
 	context.SetVar("shh", gui.whisper)
 
-	// Load the main QML interface
-	data, _ := ethutil.Config.Db.Get([]byte("KeyRing"))
-
-	var win *qml.Window
-	var err error
-	var addlog = false
-	if len(data) == 0 {
-		win, err = gui.showKeyImport(context)
-	} else {
-		win, err = gui.showWallet(context)
-		addlog = true
-	}
+	win, err := gui.showWallet(context)
 	if err != nil {
 		guilogger.Errorln("asset not found: you can set an alternative asset path on the command line using option 'asset_path'", err)
 
@@ -136,9 +149,7 @@ func (gui *Gui) Start(assetPath string) {
 	win.Show()
 
 	// only add the gui guilogger after window is shown otherwise slider wont be shown
-	if addlog {
-		logger.AddLogSystem(gui)
-	}
+	logger.AddLogSystem(gui)
 	win.Wait()
 
 	// need to silence gui guilogger after window closed otherwise logsystem hangs (but do not save loglevel)
@@ -164,18 +175,11 @@ func (gui *Gui) showWallet(context *qml.Context) (*qml.Window, error) {
 		return nil, err
 	}
 
-	gui.win = gui.createWindow(component)
-
-	gui.update()
+	gui.createWindow(component)
 
 	return gui.win, nil
 }
 
-// The done handler will be called by QML when all views have been loaded
-func (gui *Gui) Done() {
-	gui.qmlDone = true
-}
-
 func (gui *Gui) ImportKey(filePath string) {
 }
 
@@ -189,10 +193,8 @@ func (gui *Gui) showKeyImport(context *qml.Context) (*qml.Window, error) {
 }
 
 func (gui *Gui) createWindow(comp qml.Object) *qml.Window {
-	win := comp.CreateWindow(nil)
-
-	gui.win = win
-	gui.uiLib.win = win
+	gui.win = comp.CreateWindow(nil)
+	gui.uiLib.win = gui.win
 
 	return gui.win
 }
@@ -272,7 +274,7 @@ func (gui *Gui) insertTransaction(window string, tx *types.Transaction) {
 	}
 
 	var (
-		ptx  = xeth.NewJSTx(tx, gui.xeth.World().State())
+		ptx  = xeth.NewJSTx(tx)
 		send = nameReg.Storage(tx.From())
 		rec  = nameReg.Storage(tx.To())
 		s, r string
@@ -345,11 +347,48 @@ func (self *Gui) getObjectByName(objectName string) qml.Object {
 	return self.win.Root().ObjectByName(objectName)
 }
 
-// Simple go routine function that updates the list of peers in the GUI
-func (gui *Gui) update() {
-	// We have to wait for qml to be done loading all the windows.
-	for !gui.qmlDone {
-		time.Sleep(300 * time.Millisecond)
+func loadJavascriptAssets(gui *Gui) (jsfiles string) {
+	for _, fn := range []string{"ext/q.js", "ext/eth.js/main.js", "ext/eth.js/qt.js", "ext/setup.js"} {
+		f, err := os.Open(gui.uiLib.AssetPath(fn))
+		if err != nil {
+			fmt.Println(err)
+			continue
+		}
+
+		content, err := ioutil.ReadAll(f)
+		if err != nil {
+			fmt.Println(err)
+			continue
+		}
+		jsfiles += string(content)
+	}
+
+	return
+}
+
+func (gui *Gui) SendCommand(cmd ServEv) {
+	gui.serviceEvents <- cmd
+}
+
+func (gui *Gui) service() {
+	for ev := range gui.serviceEvents {
+		switch ev {
+		case setup:
+			go gui.setup()
+		case update:
+			go gui.update()
+		}
+	}
+}
+
+func (gui *Gui) setup() {
+	for gui.win == nil {
+		time.Sleep(time.Millisecond * 200)
+	}
+
+	for _, plugin := range gui.plugins {
+		guilogger.Infoln("Loading plugin ", plugin.Name)
+		gui.win.Root().Call("addPlugin", plugin.Path, "")
 	}
 
 	go func() {
@@ -359,14 +398,21 @@ func (gui *Gui) update() {
 		gui.setPeerInfo()
 	}()
 
-	gui.whisper.SetView(gui.win.Root().ObjectByName("whisperView"))
+	// Inject javascript files each time navigation is requested.
+	// Unfortunately webview.experimental.userScripts injects _after_
+	// the page has loaded which kind of renders it useless...
+	//jsfiles := loadJavascriptAssets(gui)
+	gui.getObjectByName("webView").On("navigationRequested", func() {
+		//gui.getObjectByName("webView").Call("injectJs", jsfiles)
+	})
 
-	for _, plugin := range gui.plugins {
-		guilogger.Infoln("Loading plugin ", plugin.Name)
+	gui.whisper.SetView(gui.getObjectByName("whisperView"))
 
-		gui.win.Root().Call("addPlugin", plugin.Path, "")
-	}
+	gui.SendCommand(update)
+}
 
+// Simple go routine function that updates the list of peers in the GUI
+func (gui *Gui) update() {
 	peerUpdateTicker := time.NewTicker(5 * time.Second)
 	generalUpdateTicker := time.NewTicker(500 * time.Millisecond)
 	statsUpdateTicker := time.NewTicker(5 * time.Second)
@@ -385,77 +431,75 @@ func (gui *Gui) update() {
 		core.TxPostEvent{},
 	)
 
-	go func() {
-		defer events.Unsubscribe()
-		for {
-			select {
-			case ev, isopen := <-events.Chan():
-				if !isopen {
-					return
+	defer events.Unsubscribe()
+	for {
+		select {
+		case ev, isopen := <-events.Chan():
+			if !isopen {
+				return
+			}
+			switch ev := ev.(type) {
+			case core.NewBlockEvent:
+				gui.processBlock(ev.Block, false)
+				if bytes.Compare(ev.Block.Coinbase(), gui.address()) == 0 {
+					gui.setWalletValue(gui.eth.ChainManager().State().GetBalance(gui.address()), nil)
 				}
-				switch ev := ev.(type) {
-				case core.NewBlockEvent:
-					gui.processBlock(ev.Block, false)
-					if bytes.Compare(ev.Block.Coinbase(), gui.address()) == 0 {
-						gui.setWalletValue(gui.eth.ChainManager().State().GetBalance(gui.address()), nil)
-					}
-
-				case core.TxPreEvent:
-					tx := ev.Tx
 
-					tstate := gui.eth.ChainManager().TransState()
-					cstate := gui.eth.ChainManager().State()
+			case core.TxPreEvent:
+				tx := ev.Tx
 
-					taccount := tstate.GetAccount(gui.address())
-					caccount := cstate.GetAccount(gui.address())
-					unconfirmedFunds := new(big.Int).Sub(taccount.Balance(), caccount.Balance())
+				tstate := gui.eth.ChainManager().TransState()
+				cstate := gui.eth.ChainManager().State()
 
-					gui.setWalletValue(taccount.Balance(), unconfirmedFunds)
-					gui.insertTransaction("pre", tx)
+				taccount := tstate.GetAccount(gui.address())
+				caccount := cstate.GetAccount(gui.address())
+				unconfirmedFunds := new(big.Int).Sub(taccount.Balance(), caccount.Balance())
 
-				case core.TxPostEvent:
-					tx := ev.Tx
-					object := state.GetAccount(gui.address())
+				gui.setWalletValue(taccount.Balance(), unconfirmedFunds)
+				gui.insertTransaction("pre", tx)
 
-					if bytes.Compare(tx.From(), gui.address()) == 0 {
-						object.SubAmount(tx.Value())
+			case core.TxPostEvent:
+				tx := ev.Tx
+				object := state.GetAccount(gui.address())
 
-						gui.txDb.Put(tx.Hash(), tx.RlpEncode())
-					} else if bytes.Compare(tx.To(), gui.address()) == 0 {
-						object.AddAmount(tx.Value())
+				if bytes.Compare(tx.From(), gui.address()) == 0 {
+					object.SubAmount(tx.Value())
 
-						gui.txDb.Put(tx.Hash(), tx.RlpEncode())
-					}
+					gui.txDb.Put(tx.Hash(), tx.RlpEncode())
+				} else if bytes.Compare(tx.To(), gui.address()) == 0 {
+					object.AddAmount(tx.Value())
 
-					gui.setWalletValue(object.Balance(), nil)
-					state.UpdateStateObject(object)
+					gui.txDb.Put(tx.Hash(), tx.RlpEncode())
 				}
 
-			case <-peerUpdateTicker.C:
-				gui.setPeerInfo()
-			case <-generalUpdateTicker.C:
-				statusText := "#" + gui.eth.ChainManager().CurrentBlock().Number().String()
-				lastBlockLabel.Set("text", statusText)
-				miningLabel.Set("text", "Mining @ "+strconv.FormatInt(gui.uiLib.miner.GetPow().GetHashrate(), 10)+"Khash")
-
-				/*
-					blockLength := gui.eth.BlockPool().BlocksProcessed
-					chainLength := gui.eth.BlockPool().ChainLength
-
-					var (
-						pct      float64 = 1.0 / float64(chainLength) * float64(blockLength)
-						dlWidget         = gui.win.Root().ObjectByName("downloadIndicator")
-						dlLabel          = gui.win.Root().ObjectByName("downloadLabel")
-					)
-					dlWidget.Set("value", pct)
-					dlLabel.Set("text", fmt.Sprintf("%d / %d", blockLength, chainLength))
-				*/
-
-			case <-statsUpdateTicker.C:
-				gui.setStatsPane()
+				gui.setWalletValue(object.Balance(), nil)
+				state.UpdateStateObject(object)
 			}
+
+		case <-peerUpdateTicker.C:
+			gui.setPeerInfo()
+		case <-generalUpdateTicker.C:
+			statusText := "#" + gui.eth.ChainManager().CurrentBlock().Number().String()
+			lastBlockLabel.Set("text", statusText)
+			miningLabel.Set("text", "Mining @ "+strconv.FormatInt(gui.uiLib.miner.GetPow().GetHashrate(), 10)+"Khash")
+
+			/*
+				blockLength := gui.eth.BlockPool().BlocksProcessed
+				chainLength := gui.eth.BlockPool().ChainLength
+
+				var (
+					pct      float64 = 1.0 / float64(chainLength) * float64(blockLength)
+					dlWidget         = gui.win.Root().ObjectByName("downloadIndicator")
+					dlLabel          = gui.win.Root().ObjectByName("downloadLabel")
+				)
+				dlWidget.Set("value", pct)
+				dlLabel.Set("text", fmt.Sprintf("%d / %d", blockLength, chainLength))
+			*/
+
+		case <-statsUpdateTicker.C:
+			gui.setStatsPane()
 		}
-	}()
+	}
 }
 
 func (gui *Gui) setStatsPane() {
diff --git a/cmd/mist/html_container.go b/cmd/mist/html_container.go
index bd11ccd57..f2ba6fbe2 100644
--- a/cmd/mist/html_container.go
+++ b/cmd/mist/html_container.go
@@ -1,20 +1,23 @@
-// Copyright (c) 2013-2014, Jeffrey Wilcke. All rights reserved.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-// MA 02110-1301  USA
-
+/*
+	This file is part of go-ethereum
+
+	go-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	go-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with go-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/**
+ * @authors
+ * 	Jeffrey Wilcke <i@jev.io>
+ */
 package main
 
 import (
diff --git a/cmd/mist/main.go b/cmd/mist/main.go
index b8b58a36a..eb0a80add 100644
--- a/cmd/mist/main.go
+++ b/cmd/mist/main.go
@@ -1,20 +1,23 @@
-// Copyright (c) 2013-2014, Jeffrey Wilcke. All rights reserved.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-// MA 02110-1301  USA
-
+/*
+	This file is part of go-ethereum
+
+	go-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	go-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with go-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/**
+ * @authors
+ * 	Jeffrey Wilcke <i@jev.io>
+ */
 package main
 
 import (
diff --git a/cmd/mist/qml_container.go b/cmd/mist/qml_container.go
index ed24737d0..7f5d97bec 100644
--- a/cmd/mist/qml_container.go
+++ b/cmd/mist/qml_container.go
@@ -1,19 +1,23 @@
-// Copyright (c) 2013-2014, Jeffrey Wilcke. All rights reserved.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-// MA 02110-1301  USA
+/*
+	This file is part of go-ethereum
+
+	go-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	go-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with go-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/**
+ * @authors
+ * 	Jeffrey Wilcke <i@jev.io>
+ */
 
 package main
 
diff --git a/cmd/mist/ui_lib.go b/cmd/mist/ui_lib.go
index 0aabb87d0..c88c4dab6 100644
--- a/cmd/mist/ui_lib.go
+++ b/cmd/mist/ui_lib.go
@@ -1,20 +1,23 @@
-// Copyright (c) 2013-2014, Jeffrey Wilcke. All rights reserved.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-// MA 02110-1301  USA
-
+/*
+	This file is part of go-ethereum
+
+	go-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	go-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with go-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/**
+ * @authors
+ * 	Jeffrey Wilcke <i@jev.io>
+ */
 package main
 
 import (
@@ -67,6 +70,7 @@ func NewUiLib(engine *qml.Engine, eth *eth.Ethereum, assetPath string) *UiLib {
 	lib := &UiLib{JSXEth: xeth.NewJSXEth(eth), engine: engine, eth: eth, assetPath: assetPath, jsEngine: javascript.NewJSRE(eth), filterCallbacks: make(map[int][]int)} //, filters: make(map[int]*xeth.JSFilter)}
 	lib.miner = miner.New(eth.KeyManager().Address(), eth)
 	lib.filterManager = filter.NewFilterManager(eth.EventMux())
+	go lib.filterManager.Start()
 
 	return lib
 }
@@ -208,16 +212,16 @@ func (self *UiLib) StartDbWithContractAndData(contractHash, data string) {
 	dbWindow := NewDebuggerWindow(self)
 	object := self.eth.ChainManager().State().GetStateObject(ethutil.Hex2Bytes(contractHash))
 	if len(object.Code) > 0 {
-		dbWindow.SetCode("0x" + ethutil.Bytes2Hex(object.Code))
+		dbWindow.SetCode(ethutil.Bytes2Hex(object.Code))
 	}
-	dbWindow.SetData("0x" + data)
+	dbWindow.SetData(data)
 
 	dbWindow.Show()
 }
 
 func (self *UiLib) StartDbWithCode(code string) {
 	dbWindow := NewDebuggerWindow(self)
-	dbWindow.SetCode("0x" + code)
+	dbWindow.SetCode(code)
 	dbWindow.Show()
 }
 
@@ -279,6 +283,10 @@ func (self *UiLib) SetGasPrice(price string) {
 	self.miner.MinAcceptedGasPrice = ethutil.Big(price)
 }
 
+func (self *UiLib) SetExtra(extra string) {
+	self.miner.Extra = extra
+}
+
 func (self *UiLib) ToggleMining() bool {
 	if !self.miner.Mining() {
 		self.miner.Start()
diff --git a/cmd/peerserver/main.go b/cmd/peerserver/main.go
index 18d183f0b..341c4dbb9 100644
--- a/cmd/peerserver/main.go
+++ b/cmd/peerserver/main.go
@@ -1,10 +1,25 @@
+/*
+	This file is part of go-ethereum
+
+	go-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	go-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with go-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
 package main
 
 import (
 	"crypto/elliptic"
-	"fmt"
+	"flag"
 	"log"
-	"net"
 	"os"
 
 	"github.com/ethereum/go-ethereum/crypto"
@@ -12,29 +27,32 @@ import (
 	"github.com/ethereum/go-ethereum/p2p"
 )
 
+var (
+	natType    = flag.String("nat", "", "NAT traversal implementation")
+	pmpGateway = flag.String("gateway", "", "gateway address for NAT-PMP")
+	listenAddr = flag.String("addr", ":30301", "listen address")
+)
+
 func main() {
+	flag.Parse()
+	nat, err := p2p.ParseNAT(*natType, *pmpGateway)
+	if err != nil {
+		log.Fatal("invalid nat:", err)
+	}
+
 	logger.AddLogSystem(logger.NewStdLogSystem(os.Stdout, log.LstdFlags, logger.InfoLevel))
 	key, _ := crypto.GenerateKey()
 	marshaled := elliptic.Marshal(crypto.S256(), key.PublicKey.X, key.PublicKey.Y)
 
 	srv := p2p.Server{
 		MaxPeers:   100,
-		Identity:   p2p.NewSimpleClientIdentity("Ethereum(G)", "0.1", "Peer Server Two", string(marshaled)),
-		ListenAddr: ":30301",
-		NAT:        p2p.UPNP(),
+		Identity:   p2p.NewSimpleClientIdentity("Ethereum(G)", "0.1", "Peer Server Two", marshaled),
+		ListenAddr: *listenAddr,
+		NAT:        nat,
+		NoDial:     true,
 	}
 	if err := srv.Start(); err != nil {
-		fmt.Println("could not start server:", err)
-		os.Exit(1)
-	}
-
-	// add seed peers
-	seed, err := net.ResolveTCPAddr("tcp", "poc-8.ethdev.com:30303")
-	if err != nil {
-		fmt.Println("couldn't resolve:", err)
-	} else {
-		srv.SuggestPeer(seed.IP, seed.Port, nil)
+		log.Fatal("could not start server:", err)
 	}
-
 	select {}
 }
diff --git a/cmd/rlpdump/main.go b/cmd/rlpdump/main.go
index 4c188e179..8567dcff8 100644
--- a/cmd/rlpdump/main.go
+++ b/cmd/rlpdump/main.go
@@ -14,6 +14,10 @@
 	You should have received a copy of the GNU General Public License
 	along with go-ethereum.  If not, see <http://www.gnu.org/licenses/>.
 */
+/**
+ * @authors
+ * 	Felix Lange <felix@ethdev.com>
+ */
 
 // rlpdump is a pretty-printer for RLP data.
 package main
@@ -106,8 +110,7 @@ func dump(s *rlp.Stream, depth int) error {
 		s.List()
 		defer s.ListEnd()
 		if size == 0 {
-			fmt.Printf(ws(depth) + "[]")
-			return nil
+			fmt.Print(ws(depth) + "[]")
 		} else {
 			fmt.Println(ws(depth) + "[")
 			for i := 0; ; i++ {
diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go
index d01d9da9f..a57d3266f 100644
--- a/cmd/utils/cmd.go
+++ b/cmd/utils/cmd.go
@@ -1,3 +1,24 @@
+/*
+	This file is part of go-ethereum
+
+	go-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	go-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with go-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/**
+ * @authors
+ * 	Jeffrey Wilcke <i@jev.io>
+ * 	Viktor Tron <viktor@ethdev.com>
+ */
 package utils
 
 import (
@@ -18,6 +39,7 @@ import (
 	"github.com/ethereum/go-ethereum/miner"
 	"github.com/ethereum/go-ethereum/rlp"
 	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/ethereum/go-ethereum/state"
 	"github.com/ethereum/go-ethereum/xeth"
 )
 
@@ -238,7 +260,8 @@ func BlockDo(ethereum *eth.Ethereum, hash []byte) error {
 
 	parent := ethereum.ChainManager().GetBlock(block.ParentHash())
 
-	_, err := ethereum.BlockProcessor().TransitionState(parent.State(), parent, block)
+	statedb := state.New(parent.Root(), ethereum.Db())
+	_, err := ethereum.BlockProcessor().TransitionState(statedb, parent, block)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/utils/vm_env.go b/cmd/utils/vm_env.go
index acc2ffad9..5eaf63b65 100644
--- a/cmd/utils/vm_env.go
+++ b/cmd/utils/vm_env.go
@@ -1,3 +1,23 @@
+/*
+	This file is part of go-ethereum
+
+	go-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	go-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with go-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/**
+ * @authors
+ * 	Jeffrey Wilcke <i@jev.io>
+ */
 package utils
 
 import (
diff --git a/cmd/utils/websockets.go b/cmd/utils/websockets.go
index e4bc1b185..48ea4014b 100644
--- a/cmd/utils/websockets.go
+++ b/cmd/utils/websockets.go
@@ -1,9 +1,34 @@
+/*
+	This file is part of go-ethereum
+
+	go-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	go-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with go-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/**
+ * @authors
+ * 	Jeffrey Wilcke <i@jev.io>
+ */
 package utils
 
 import (
+	"github.com/ethereum/go-ethereum/core"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/eth"
 	"github.com/ethereum/go-ethereum/ethutil"
+	"github.com/ethereum/go-ethereum/event/filter"
 	"github.com/ethereum/go-ethereum/logger"
+	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/ui"
 	"github.com/ethereum/go-ethereum/websocket"
 	"github.com/ethereum/go-ethereum/xeth"
 )
@@ -15,16 +40,19 @@ func args(v ...interface{}) []interface{} {
 }
 
 type WebSocketServer struct {
-	ethereum        *eth.Ethereum
-	filterCallbacks map[int][]int
+	eth           *eth.Ethereum
+	filterManager *filter.FilterManager
 }
 
 func NewWebSocketServer(eth *eth.Ethereum) *WebSocketServer {
-	return &WebSocketServer{eth, make(map[int][]int)}
+	filterManager := filter.NewFilterManager(eth.EventMux())
+	go filterManager.Start()
+
+	return &WebSocketServer{eth, filterManager}
 }
 
 func (self *WebSocketServer) Serv() {
-	pipe := xeth.NewJSXEth(self.ethereum)
+	pipe := xeth.NewJSXEth(self.eth)
 
 	wsServ := websocket.NewServer("/eth", ":40404")
 	wsServ.MessageFunc(func(c *websocket.Client, msg *websocket.Message) {
@@ -33,74 +61,91 @@ func (self *WebSocketServer) Serv() {
 			data := ethutil.NewValue(msg.Args)
 			bcode, err := ethutil.Compile(data.Get(0).Str(), false)
 			if err != nil {
-				c.Write(args(nil, err.Error()), msg.Seed)
+				c.Write(args(nil, err.Error()), msg.Id)
 			}
 
 			code := ethutil.Bytes2Hex(bcode)
-			c.Write(args(code, nil), msg.Seed)
-		case "getBlockByNumber":
+			c.Write(args(code, nil), msg.Id)
+		case "eth_blockByNumber":
 			args := msg.Arguments()
 
 			block := pipe.BlockByNumber(int32(args.Get(0).Uint()))
-			c.Write(block, msg.Seed)
+			c.Write(block, msg.Id)
+
+		case "eth_blockByHash":
+			args := msg.Arguments()
 
-		case "getKey":
-			c.Write(pipe.Key().PrivateKey, msg.Seed)
-		case "transact":
+			c.Write(pipe.BlockByHash(args.Get(0).Str()), msg.Id)
+
+		case "eth_transact":
 			if mp, ok := msg.Args[0].(map[string]interface{}); ok {
 				object := mapToTxParams(mp)
 				c.Write(
-					args(pipe.Transact(object["from"], object["to"], object["value"], object["gas"], object["gasPrice"], object["data"])),
-					msg.Seed,
+					args(pipe.Transact(pipe.Key().PrivateKey, object["to"], object["value"], object["gas"], object["gasPrice"], object["data"])),
+					msg.Id,
 				)
 
 			}
-		case "getCoinBase":
-			c.Write(pipe.CoinBase(), msg.Seed)
+		case "eth_gasPrice":
+			c.Write("10000000000000", msg.Id)
+		case "eth_coinbase":
+			c.Write(pipe.CoinBase(), msg.Id)
 
-		case "getIsListening":
-			c.Write(pipe.IsListening(), msg.Seed)
+		case "eth_listening":
+			c.Write(pipe.IsListening(), msg.Id)
 
-		case "getIsMining":
-			c.Write(pipe.IsMining(), msg.Seed)
+		case "eth_mining":
+			c.Write(pipe.IsMining(), msg.Id)
 
-		case "getPeerCoint":
-			c.Write(pipe.PeerCount(), msg.Seed)
+		case "eth_peerCount":
+			c.Write(pipe.PeerCount(), msg.Id)
 
-		case "getCountAt":
+		case "eth_countAt":
 			args := msg.Arguments()
 
-			c.Write(pipe.TxCountAt(args.Get(0).Str()), msg.Seed)
+			c.Write(pipe.TxCountAt(args.Get(0).Str()), msg.Id)
 
-		case "getCodeAt":
+		case "eth_codeAt":
 			args := msg.Arguments()
 
-			c.Write(len(pipe.CodeAt(args.Get(0).Str())), msg.Seed)
+			c.Write(len(pipe.CodeAt(args.Get(0).Str())), msg.Id)
 
-		case "getBlockByHash":
+		case "eth_storageAt":
 			args := msg.Arguments()
 
-			c.Write(pipe.BlockByHash(args.Get(0).Str()), msg.Seed)
+			c.Write(pipe.StorageAt(args.Get(0).Str(), args.Get(1).Str()), msg.Id)
 
-		case "getStorageAt":
+		case "eth_balanceAt":
 			args := msg.Arguments()
 
-			c.Write(pipe.StorageAt(args.Get(0).Str(), args.Get(1).Str()), msg.Seed)
-
-		case "getBalanceAt":
-			args := msg.Arguments()
-
-			c.Write(pipe.BalanceAt(args.Get(0).Str()), msg.Seed)
-
-		case "getSecretToAddress":
-			args := msg.Arguments()
+			c.Write(pipe.BalanceAt(args.Get(0).Str()), msg.Id)
 
-			c.Write(pipe.SecretToAddress(args.Get(0).Str()), msg.Seed)
+		case "eth_accounts":
+			c.Write(pipe.Accounts(), msg.Id)
 
-		case "newFilter":
-		case "newFilterString":
-		case "messages":
-			// TODO
+		case "eth_newFilter":
+			if mp, ok := msg.Args[0].(map[string]interface{}); ok {
+				var id int
+				filter := ui.NewFilterFromMap(mp, self.eth)
+				filter.MessageCallback = func(messages state.Messages) {
+					c.Event(toMessages(messages), "eth_changed", id)
+				}
+				id = self.filterManager.InstallFilter(filter)
+				c.Write(id, msg.Id)
+			}
+		case "eth_newFilterString":
+			var id int
+			filter := core.NewFilter(self.eth)
+			filter.BlockCallback = func(block *types.Block) {
+				c.Event(nil, "eth_changed", id)
+			}
+			id = self.filterManager.InstallFilter(filter)
+			c.Write(id, msg.Id)
+		case "eth_filterLogs":
+			filter := self.filterManager.GetFilter(int(msg.Arguments().Get(0).Uint()))
+			if filter != nil {
+				c.Write(toMessages(filter.Find()), msg.Id)
+			}
 		}
 
 	})
@@ -108,6 +153,15 @@ func (self *WebSocketServer) Serv() {
 	wsServ.Listen()
 }
 
+func toMessages(messages state.Messages) (msgs []xeth.JSMessage) {
+	msgs = make([]xeth.JSMessage, len(messages))
+	for i, msg := range messages {
+		msgs[i] = xeth.NewJSMessage(msg)
+	}
+
+	return
+}
+
 func StartWebSockets(eth *eth.Ethereum) {
 	wslogger.Infoln("Starting WebSockets")