Merge commit 'eb4984c0d036c1420e782ca136810e851e33fb37' into natspec

10 files changed, 143 insertions, 589 deletions

diff --git a/lib/abi.js b/lib/abi.js
index c896ab28a..21580347d 100644
--- a/lib/abi.js
+++ b/lib/abi.js
@@ -32,6 +32,9 @@ BigNumber.config({ ROUNDING_MODE: BigNumber.ROUND_DOWN });
 
 var ETH_PADDING = 32;
 
+/// method signature length in bytes
+var ETH_METHOD_SIGNATURE_LENGTH = 4;
+
 /// Finds first index of array element matching pattern
 /// @param array
 /// @param callback pattern
@@ -389,11 +392,10 @@ var outputParser = function (json) {
     return parser;
 };
 
-/// @param json abi for contract
 /// @param method name for which we want to get method signature
 /// @returns (promise) contract method signature for method with given name
-var methodSignature = function (json, name) {
-    return web3.sha3(web3.fromAscii(name));
+var methodSignature = function (name) {
+    return web3.sha3(web3.fromAscii(name)).slice(0, 2 + ETH_METHOD_SIGNATURE_LENGTH * 2);
 };
 
 module.exports = {
diff --git a/lib/autoprovider.js b/lib/autoprovider.js
deleted file mode 100644
index 0501b93d8..000000000
--- a/lib/autoprovider.js
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-    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
- */
-
-var web3 = require('./web3'); // jshint ignore:line
-if (process.env.NODE_ENV !== 'build') {
-    var WebSocket = require('ws'); // jshint ignore:line
-}
-
-/**
- * AutoProvider object prototype is implementing 'provider protocol'
- * Automatically tries to setup correct provider(Qt, WebSockets or HttpRpc)
- * First it checkes if we are ethereum browser (if navigator.qt object is available)
- * if yes, we are using QtProvider
- * if no, we check if it is possible to establish websockets connection with ethereum (ws://localhost:40404/eth is default)
- * if it's not possible, we are using httprpc provider (http://localhost:8080)
- * The constructor allows you to specify uris on which we are trying to connect over http or websockets
- * You can do that by passing objects with fields httrpc and websockets
- */
-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.send(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);
-    };
-};
-
-/// Sends message forward to the provider, that is being used
-/// if provider is not yet set, enqueues the message
-AutoProvider.prototype.send = function (payload) {
-    if (this.provider) {
-        this.provider.send(payload);
-        return;
-    }
-    this.sendQueue.push(payload);
-};
-
-/// On incoming message sends the message to the provider that is currently being used
-Object.defineProperty(AutoProvider.prototype, 'onmessage', {
-    set: function (handler) {
-        if (this.provider) {
-            this.provider.onmessage = handler;
-            return;
-        }
-        this.onmessageQueue.push(handler);
-    }
-});
-
-module.exports = AutoProvider;
diff --git a/lib/contract.js b/lib/contract.js
index abd8e5bdf..aa4188d40 100644
--- a/lib/contract.js
+++ b/lib/contract.js
@@ -23,9 +23,6 @@
 var web3 = require('./web3'); // jshint ignore:line
 var abi = require('./abi');
 
-/// method signature length in bytes
-var ETH_METHOD_SIGNATURE_LENGTH = 4;
-
 /**
  * This method should be called when we want to call / transact some solidity method from javascript
  * it returns an object which has same methods available as solidity contract description
@@ -60,29 +57,29 @@ var contract = function (address, desc) {
         var impl = function () {
             var params = Array.prototype.slice.call(arguments);
             var parsed = inputParser[displayName][typeName].apply(null, params);
-
-            var onSuccess = function (result) {
-                return outputParser[displayName][typeName](result);
-            };
+            var signature = abi.methodSignature(method.name);
 
             return {
                 call: function (extra) {
                     extra = extra || {};
                     extra.to = address;
-                    return abi.methodSignature(desc, method.name).then(function (signature) {
-                        extra.data = signature.slice(0, 2 + ETH_METHOD_SIGNATURE_LENGTH * 2) + parsed;
-                        return web3.eth.call(extra).then(onSuccess);
-                    });
+                    extra.data = signature + parsed;
+
+                    var result = web3.eth.call(extra);
+                    return outputParser[displayName][typeName](result);
                 },
                 transact: function (extra) {
                     extra = extra || {};
                     extra.to = address;
-                    return abi.methodSignature(desc, method.name).then(function (signature) {
-                        extra.data = signature.slice(0, 2 + ETH_METHOD_SIGNATURE_LENGTH * 2) + parsed;
-                        web3._currentContractAbi = desc;
-                        web3._currentContractAddress = address;
-                        return web3.eth.transact(extra).then(onSuccess);
-                    });
+                    extra.data = signature + parsed;
+
+                    /// it's used by natspec.js
+                    /// TODO: figure a better way to solve this
+                    web3._currentContractAbi = desc;
+                    web3._currentContractAddress = address;
+
+                    var result = web3.eth.transact(extra);
+                    return outputParser[displayName][typeName](result);
                 }
             };
         };
diff --git a/lib/filter.js b/lib/filter.js
index 4a82babb9..76e67e9c1 100644
--- a/lib/filter.js
+++ b/lib/filter.js
@@ -31,13 +31,9 @@ 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);
-    });
+    this.id = impl.newFilter(options);
+    web3.on(impl.changed, this.id, this.trigger.bind(this));
+    web3.provider.startPolling({call: impl.changed, args: [this.id]}, this.id);
 };
 
 /// alias for changed*
@@ -47,10 +43,7 @@ Filter.prototype.arrived = function(callback) {
 
 /// gets called when there is new eth/shh message
 Filter.prototype.changed = function(callback) {
-    var self = this;
-    this.promise.then(function(id) {
-        self.callbacks.push(callback);
-    });
+    this.callbacks.push(callback);
 };
 
 /// trigger calling new message from people
@@ -62,20 +55,14 @@ Filter.prototype.trigger = function(messages) {
 
 /// should be called to uninstall current filter
 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);
-    });
+    this.impl.uninstallFilter(this.id);
+    web3.provider.stopPolling(this.id);
+    web3.off(impl.changed, this.id);
 };
 
 /// should be called to manually trigger getting latest messages from the client
 Filter.prototype.messages = function() {
-    var self = this;
-    return this.promise.then(function (id) {
-        return self.impl.getMessages(id);
-    });
+    return this.impl.getMessages(this.id);
 };
 
 /// alias for messages
diff --git a/lib/httprpc.js b/lib/httprpc.js
deleted file mode 100644
index de3ae8478..000000000
--- a/lib/httprpc.js
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-    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
-}
-
-/**
- * HttpRpcProvider object prototype is implementing 'provider protocol'
- * Should be used when we want to connect to ethereum backend over http && jsonrpc
- * It's compatible with cpp client
- * The contructor allows to specify host uri
- * This provider is using in-browser polling mechanism
- */
-var HttpRpcProvider = function (host) {
-    this.handlers = [];
-    this.host = host;
-};
-
-/// Transforms inner message to proper jsonrpc object
-/// @param inner message object
-/// @returns jsonrpc object
-function formatJsonRpcObject(object) {
-    return {
-        jsonrpc: '2.0',
-        method: object.call,
-        params: object.args,
-        id: object._id
-    };
-}
-
-/// Transforms jsonrpc object to inner message
-/// @param incoming jsonrpc message 
-/// @returns inner message object
-function formatJsonRpcMessage(message) {
-    var object = JSON.parse(message);
-
-    return {
-        _id: object.id,
-        data: object.result,
-        error: object.error
-    };
-}
-
-/// Prototype object method 
-/// Asynchronously sends request to server
-/// @param payload is inner message object
-/// @param cb is callback which is being called when response is comes back
-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);
-        }
-    };
-};
-
-/// Prototype object method
-/// Should be called when we want to send single api request to server
-/// Asynchronous
-/// On response it passes message to handlers
-/// @param payload is inner message object
-HttpRpcProvider.prototype.send = function (payload) {
-    var self = this;
-    this.sendRequest(payload, function (request) {
-        self.handlers.forEach(function (handler) {
-            handler.call(self, formatJsonRpcMessage(request.responseText));
-        });
-    });
-};
-
-/// Prototype object method
-/// Should be called only for polling requests
-/// Asynchronous
-/// On response it passege message to handlers, but only if message's result is true or not empty array
-/// Otherwise response is being silently ignored
-/// @param payload is inner message object
-/// @id is id of poll that we are calling
-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});
-        });
-    });
-};
-
-/// Prototype object property
-/// Should be used to set message handlers for this provider
-Object.defineProperty(HttpRpcProvider.prototype, "onmessage", {
-    set: function (handler) {
-        this.handlers.push(handler);
-    }
-});
-
-module.exports = HttpRpcProvider;
-
diff --git a/lib/httpsync.js b/lib/httpsync.js
new file mode 100644
index 000000000..67a3988f9
--- /dev/null
+++ b/lib/httpsync.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 httpsync.js
+ * @authors:
+ *   Marek Kotewicz <marek@ethdev.com>
+ *   Marian Oancea <marian@ethdev.com>
+ * @date 2014
+ */
+
+var HttpSyncProvider = function (host) {
+    this.handlers = [];
+    this.host = host || 'http://localhost:8080';
+};
+
+/// Transforms inner message to proper jsonrpc object
+/// @param inner message object
+/// @returns jsonrpc object
+function formatJsonRpcObject(object) {
+    return {
+        jsonrpc: '2.0',
+        method: object.call,
+        params: object.args,
+        id: object._id
+    };
+}
+
+/// Transforms jsonrpc object to inner message
+/// @param incoming jsonrpc message 
+/// @returns inner message object
+function formatJsonRpcMessage(message) {
+    var object = JSON.parse(message);
+
+    return {
+        _id: object.id,
+        data: object.result,
+        error: object.error
+    };
+}
+
+HttpSyncProvider.prototype.send = function (payload) {
+    var data = formatJsonRpcObject(payload);
+    
+    var request = new XMLHttpRequest();
+    request.open('POST', this.host, false);
+    request.send(JSON.stringify(data));
+    
+    // check request.status
+    return request.responseText;
+};
+
+module.exports = HttpSyncProvider;
+
diff --git a/lib/providermanager.js b/lib/providermanager.js
index f79a9b087..c3b121451 100644
--- a/lib/providermanager.js
+++ b/lib/providermanager.js
@@ -56,21 +56,20 @@ var ProviderManager = function() {
 };
 
 /// sends outgoing requests, if provider is not available, enqueue the request
-ProviderManager.prototype.send = function(data, cb) {
-    data._id = this.id;
-    if (cb) {
-        web3._callbacks[data._id] = cb;
-    }
+ProviderManager.prototype.send = function(data) {
 
     data.args = data.args || [];
-    this.id++;
+    data._id = this.id++;
 
-    if(this.provider !== undefined) {
-        this.provider.send(data);
-    } else {
-        console.warn("provider is not set");
-        this.queued.push(data);
+    if (this.provider === undefined) {
+        console.error('provider is not set');
+        return undefined;
     }
+
+    //TODO: handle error here? 
+    var result = this.provider.send(data);
+    result = JSON.parse(result);
+    return result.result;
 };
 
 /// setups provider, which will be used for sending messages
@@ -83,14 +82,6 @@ ProviderManager.prototype.set = function(provider) {
     this.ready = true;
 };
 
-/// resends queued messages
-ProviderManager.prototype.sendQueued = function() {
-    for(var i = 0; this.queued.length; i++) {
-        // Resend
-        this.send(this.queued[i]);
-    }
-};
-
 /// @returns true if the provider i properly set
 ProviderManager.prototype.installed = function() {
     return this.provider !== undefined;
diff --git a/lib/qt.js b/lib/qt.js
deleted file mode 100644
index 1b3a9547b..000000000
--- a/lib/qt.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-    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
- */
-
-/**
- * QtProvider object prototype is implementing 'provider protocol'
- * Should be used inside ethereum browser. It's compatible with cpp and go clients.
- * It uses navigator.qt object to pass the messages to native bindings
- */
-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));
-        });
-    };
-};
-
-/// Prototype object method
-/// Should be called when we want to send single api request to native bindings
-/// Asynchronous
-/// Response will be received by navigator.qt.onmessage method and passed to handlers
-/// @param payload is inner message object
-QtProvider.prototype.send = function(payload) {
-    navigator.qt.postMessage(JSON.stringify(payload));
-};
-
-/// Prototype object property
-/// Should be used to set message handlers for this provider
-Object.defineProperty(QtProvider.prototype, "onmessage", {
-    set: function(handler) {
-        this.handlers.push(handler);
-    }
-});
-
-module.exports = QtProvider;
diff --git a/lib/web3.js b/lib/web3.js
index f071eea49..96002a232 100644
--- a/lib/web3.js
+++ b/lib/web3.js
@@ -23,48 +23,32 @@
  * @date 2014
  */
 
-/// Recursively resolves all promises in given object and replaces the resolved values with promises
-/// @param any object/array/promise/anything else..
-/// @returns (resolves) object with replaced promises with their result 
-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);
+if (process.env.NODE_ENV !== 'build') {
+    var BigNumber = require('bignumber.js');
 }
 
+var ETH_UNITS = [ 
+    'wei', 
+    'Kwei', 
+    'Mwei', 
+    'Gwei', 
+    'szabo', 
+    'finney', 
+    'ether', 
+    'grand', 
+    'Mether', 
+    'Gether', 
+    'Tether', 
+    'Pether', 
+    'Eether', 
+    'Zether', 
+    'Yether', 
+    'Nether', 
+    'Dether', 
+    'Vether', 
+    'Uether' 
+];
+
 /// @returns an array of objects describing web3 api methods
 var web3Methods = function () {
     return [
@@ -169,21 +153,11 @@ var shhWatchMethods = function () {
 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 args = Array.prototype.slice.call(arguments);
+            var call = typeof method.call === 'function' ? method.call(args) : method.call;
+            return web3.provider.send({
+                call: call,
+                args: args
             });
         };
     });
@@ -195,30 +169,16 @@ 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);
-                });
+            return web3.provider.send({
+                call: property.getter
             });
         };
+
         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);
+                return web3.provider.send({
+                    call: property.setter,
+                    args: [val]
                 });
             };
         }
@@ -226,15 +186,6 @@ var setupProperties = function (obj, properties) {
     });
 };
 
-// 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);
-};
-
 /// setups web3 object, and it's in-browser executed methods
 var web3 = {
     _callbacks: {},
@@ -281,19 +232,20 @@ var web3 = {
 
     /// @returns decimal representaton of hex value prefixed by 0x
     toDecimal: function (val) {
-        return hexToDec(val.substring(2));
+        return (new BigNumber(val.substring(2), 16).toString(10));
     },
 
     /// @returns hex representation (prefixed by 0x) of decimal value
     fromDecimal: function (val) {
-        return "0x" + decToHex(val);
+        return "0x" + (new BigNumber(val).toString(16));
     },
 
     /// used to transform value/string to eth string
+    /// TODO: use BigNumber.js to parse int
     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' ];
+        var units = ETH_UNITS;
         while (val > 3000 && unit < units.length - 1)
         {
             val /= 1000;
@@ -330,35 +282,6 @@ var web3 = {
         }
     },
 
-    /// used by filter to register callback with given id
-    on: function(event, id, cb) {
-        if(web3._events[event] === undefined) {
-            web3._events[event] = {};
-        }
-
-        web3._events[event][id] = cb;
-        return this;
-    },
-
-    /// used by filter to unregister callback with given id
-    off: function(event, id) {
-        if(web3._events[event] !== undefined) {
-            delete web3._events[event][id];
-        }
-
-        return this;
-    },
-
-    /// used to trigger callback registered by filter
-    trigger: function(event, id, data) {
-        var callbacks = web3._events[event];
-        if (!callbacks || !callbacks[id]) {
-            return;
-        }
-        var cb = callbacks[id];
-        cb(data);
-    },
-
     /// @returns true if provider is installed
     haveProvider: function() {
         return !!web3.provider.provider;
@@ -385,26 +308,9 @@ var shhWatch = {
 setupMethods(shhWatch, shhWatchMethods());
 
 web3.setProvider = function(provider) {
-    provider.onmessage = messageHandler;
+    //provider.onmessage = messageHandler; // there will be no async calls, to remove
     web3.provider.set(provider);
-    web3.provider.sendQueued();
 };
 
-/// callled when there is new incoming message
-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;
 
diff --git a/lib/websocket.js b/lib/websocket.js
deleted file mode 100644
index e8663ecf5..000000000
--- a/lib/websocket.js
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-    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
-}
-
-/**
- * WebSocketProvider object prototype is implementing 'provider protocol'
- * Should be used when we want to connect to ethereum backend over websockets
- * It's compatible with go client
- * The constructor allows to specify host uri
- */
-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]);
-        }
-    };
-};
-
-/// Prototype object method
-/// Should be called when we want to send single api request to server
-/// Asynchronous, it's using websockets
-/// Response for the call will be received by ws.onmessage
-/// @param payload is inner message object
-WebSocketProvider.prototype.send = function(payload) {
-    if (this.ready) {
-        var data = JSON.stringify(payload);
-
-        this.ws.send(data);
-    } else {
-        this.queued.push(payload);
-    }
-};
-
-/// Prototype object method
-/// Should be called to add handlers
-WebSocketProvider.prototype.onMessage = function(handler) {
-    this.handlers.push(handler);
-};
-
-/// Prototype object method
-/// Should be called to close websockets connection
-WebSocketProvider.prototype.unload = function() {
-    this.ws.close();
-};
-
-/// Prototype object property
-/// Should be used to set message handlers for this provider
-Object.defineProperty(WebSocketProvider.prototype, "onmessage", {
-    set: function(provider) { this.onMessage(provider); }
-});
-
-if (typeof(module) !== "undefined")
-    module.exports = WebSocketProvider;