Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into mix_blockchain

libjsqrc/ethereumjs/bower.json

@@ -1,7 +1,7 @@
 {
   "name": "ethereum.js",
   "namespace": "ethereum",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "description": "Ethereum Compatible JavaScript API",
   "main": ["./dist/ethereum.js", "./dist/ethereum.min.js"],
   "dependencies": {

libjsqrc/ethereumjs/dist/ethereum.js

@@ -210,7 +210,7 @@ module.exports = {
 };
 
 
-},{"./const":2,"./formatters":6,"./types":10,"./utils":11,"./web3":12}],2:[function(require,module,exports){
+},{"./const":2,"./formatters":6,"./types":11,"./utils":12,"./web3":13}],2:[function(require,module,exports){
 /*
     This file is part of ethereum.js.
 
@@ -238,9 +238,32 @@ if ("build" !== 'build') {/*
     var BigNumber = require('bignumber.js'); // jshint ignore:line
 */}
 
+var ETH_UNITS = [ 
+    'wei', 
+    'Kwei', 
+    'Mwei', 
+    'Gwei', 
+    'szabo', 
+    'finney', 
+    'ether', 
+    'grand', 
+    'Mether', 
+    'Gether', 
+    'Tether', 
+    'Pether', 
+    'Eether', 
+    'Zether', 
+    'Yether', 
+    'Nether', 
+    'Dether', 
+    'Vether', 
+    'Uether' 
+];
+
 module.exports = {
     ETH_PADDING: 32,
     ETH_SIGNATURE_LENGTH: 4,
+    ETH_UNITS: ETH_UNITS,
     ETH_BIGNUMBER_ROUNDING_MODE: { ROUNDING_MODE: BigNumber.ROUND_DOWN }
 };
 
@@ -368,6 +391,11 @@ var addFunctionsToContract = function (contract, desc, address) {
 
 var addEventRelatedPropertiesToContract = function (contract, desc, address) {
     contract.address = address;
+    contract._onWatchEventResult = function (data) {
+        var matchingEvent = event.getMatchingEvent(utils.filterEvents(desc));
+        var parser = eventImpl.outputParser(matchingEvent);
+        return parser(data);
+    };
     
     Object.defineProperty(contract, 'topic', {
         get: function() {
@@ -386,8 +414,12 @@ var addEventsToContract = function (contract, desc, address) {
         var impl = function () {
             var params = Array.prototype.slice.call(arguments);
             var signature = abi.eventSignatureFromAscii(e.name);
-            var event = eventImpl(address, signature, e);
+            var event = eventImpl.inputParser(address, signature, e);
             var o = event.apply(null, params);
+            o._onWatchEventResult = function (data) {
+                var parser = eventImpl.outputParser(e);
+                return parser(data);
+            };
             return web3.eth.watch(o);  
         };
         
@@ -455,7 +487,7 @@ var contract = function (address, desc) {
 module.exports = contract;
 
 
-},{"./abi":1,"./event":4,"./utils":11,"./web3":12}],4:[function(require,module,exports){
+},{"./abi":1,"./event":4,"./utils":12,"./web3":13}],4:[function(require,module,exports){
 /*
     This file is part of ethereum.js.
 
@@ -481,6 +513,16 @@ module.exports = contract;
 var abi = require('./abi');
 var utils = require('./utils');
 
+/// filter inputs array && returns only indexed (or not) inputs
+/// @param inputs array
+/// @param bool if result should be an array of indexed params on not
+/// @returns array of (not?) indexed params
+var filterInputs = function (inputs, indexed) {
+    return inputs.filter(function (current) {
+        return current.indexed === indexed;
+    });
+};
+
 var inputWithName = function (inputs, name) {
     var index = utils.findIndex(inputs, function (input) {
         return input.name === name;
@@ -496,7 +538,7 @@ var inputWithName = function (inputs, name) {
 var indexedParamsToTopics = function (event, indexed) {
     // sort keys?
     return Object.keys(indexed).map(function (key) {
-        var inputs = [inputWithName(event.inputs, key)];
+        var inputs = [inputWithName(filterInputs(event.inputs, true), key)];
 
         var value = indexed[key];
         if (value instanceof Array) {
@@ -508,7 +550,7 @@ var indexedParamsToTopics = function (event, indexed) {
     });
 };
 
-var implementationOfEvent = function (address, signature, event) {
+var inputParser = function (address, signature, event) {
     
     // valid options are 'earliest', 'latest', 'offset' and 'max', as defined for 'eth.watch'
     return function (indexed, options) {
@@ -523,10 +565,66 @@ var implementationOfEvent = function (address, signature, event) {
     };
 };
 
-module.exports = implementationOfEvent;
+var getArgumentsObject = function (inputs, indexed, notIndexed) {
+    var indexedCopy = indexed.slice();
+    var notIndexedCopy = notIndexed.slice();
+    return inputs.reduce(function (acc, current) {
+        var value;
+        if (current.indexed)
+            value = indexed.splice(0, 1)[0];
+        else
+            value = notIndexed.splice(0, 1)[0];
+
+        acc[current.name] = value;
+        return acc;
+    }, {}); 
+};
+ 
+var outputParser = function (event) {
+    
+    return function (output) {
+        var result = {
+            event: utils.extractDisplayName(event.name),
+            number: output.number,
+            args: {}
+        };
+
+        if (!output.topic) {
+            return result;
+        }
+       
+        var indexedOutputs = filterInputs(event.inputs, true);
+        var indexedData = "0x" + output.topic.slice(1, output.topic.length).map(function (topic) { return topic.slice(2); }).join("");
+        var indexedRes = abi.formatOutput(indexedOutputs, indexedData);
+
+        var notIndexedOutputs = filterInputs(event.inputs, false);
+        var notIndexedRes = abi.formatOutput(notIndexedOutputs, output.data);
+
+        result.args = getArgumentsObject(event.inputs, indexedRes, notIndexedRes);
+
+        return result;
+    };
+};
+
+var getMatchingEvent = function (events, payload) {
+    for (var i = 0; i < events.length; i++) {
+        var signature = abi.eventSignatureFromAscii(events[i].name); 
+        if (signature === payload.topic[0]) {
+            return events[i];
+        }
+    }
+    return undefined;
+};
+
+
+module.exports = {
+    inputParser: inputParser,
+    outputParser: outputParser,
+    getMatchingEvent: getMatchingEvent
+};
 
 
-},{"./abi":1,"./utils":11}],5:[function(require,module,exports){
+},{"./abi":1,"./utils":12}],5:[function(require,module,exports){
 /*
     This file is part of ethereum.js.
 
@@ -566,6 +664,8 @@ var Filter = function(options, impl) {
             console.warn('"topics" is deprecated, use "topic" instead');
         }
         
+        this._onWatchResult = options._onWatchEventResult;
+
         // evaluate lazy properties
         options = {
             to: options.to,
@@ -583,7 +683,7 @@ var Filter = function(options, impl) {
     this.callbacks = [];
 
     this.id = impl.newFilter(options);
-    web3.provider.startPolling({call: impl.changed, args: [this.id]}, this.id, this.trigger.bind(this));
+    web3.provider.startPolling({method: impl.changed, params: [this.id]}, this.id, this.trigger.bind(this));
 };
 
 /// alias for changed*
@@ -603,7 +703,8 @@ Filter.prototype.changed = function(callback) {
 Filter.prototype.trigger = function(messages) {
     for (var i = 0; i < this.callbacks.length; i++) {
         for (var j = 0; j < messages.length; j++) {
-            this.callbacks[i].call(this, messages[j]);
+            var message = this._onWatchResult ? this._onWatchResult(messages[j]) : messages[j];
+            this.callbacks[i].call(this, message);
         }
     }
 };
@@ -626,7 +727,7 @@ Filter.prototype.logs = function () {
 
 module.exports = Filter;
 
-},{"./web3":12}],6:[function(require,module,exports){
+},{"./web3":13}],6:[function(require,module,exports){
 /*
     This file is part of ethereum.js.
 
@@ -782,7 +883,7 @@ module.exports = {
 };
 
 
-},{"./const":2,"./utils":11}],7:[function(require,module,exports){
+},{"./const":2,"./utils":12}],7:[function(require,module,exports){
 /*
     This file is part of ethereum.js.
 
@@ -815,40 +916,16 @@ var HttpSyncProvider = function (host) {
     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 data = formatJsonRpcObject(payload);
     
     var request = new XMLHttpRequest();
     request.open('POST', this.host, false);
-    request.send(JSON.stringify(data));
+    request.send(JSON.stringify(payload));
     
     // check request.status
-    return request.responseText;
+    var result = request.responseText;
+    return JSON.parse(result);
 };
 
 module.exports = HttpSyncProvider;
@@ -871,6 +948,73 @@ module.exports = HttpSyncProvider;
     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 jsonrpc.js
+ * @authors:
+ *   Marek Kotewicz <marek@ethdev.com>
+ * @date 2015
+ */
+
+var messageId = 1;
+
+/// Should be called to valid json create payload object
+/// @param method of jsonrpc call, required
+/// @param params, an array of method params, optional
+/// @returns valid jsonrpc payload object
+var toPayload = function (method, params) {
+    if (!method)
+        console.error('jsonrpc method should be specified!');
+
+    return {
+        jsonrpc: '2.0',
+        method: method,
+        params: params || [],
+        id: messageId++
+    }; 
+};
+
+/// Should be called to check if jsonrpc response is valid
+/// @returns true if response is valid, otherwise false 
+var isValidResponse = function (response) {
+    return !!response &&
+        !response.error &&
+        response.jsonrpc === '2.0' &&
+        typeof response.id === 'number' &&
+        (!!response.result || typeof response.result === 'boolean');
+};
+
+/// Should be called to create batch payload object
+/// @param messages, an array of objects with method (required) and params (optional) fields
+var toBatchPayload = function (messages) {
+    return messages.map(function (message) {
+        return toPayload(message.method, message.params);
+    }); 
+};
+
+module.exports = {
+    toPayload: toPayload,
+    isValidResponse: isValidResponse,
+    toBatchPayload: toBatchPayload
+};
+
+
+
+},{}],9:[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 providermanager.js
  * @authors:
  *   Jeffrey Wilcke <jeff@ethdev.com>
@@ -880,7 +1024,9 @@ module.exports = HttpSyncProvider;
  * @date 2014
  */
 
-var web3 = require('./web3'); // jshint ignore:line
+var web3 = require('./web3'); 
+var jsonrpc = require('./jsonrpc');
+
 
 /**
  * Provider manager object prototype
@@ -894,25 +1040,35 @@ var web3 = require('./web3'); // jshint ignore:line
 var ProviderManager = function() {
     this.polls = [];
     this.provider = undefined;
-    this.id = 1;
 
     var self = this;
     var poll = function () {
         if (self.provider) {
-            self.polls.forEach(function (data) {
+            var pollsBatch = self.polls.map(function (data) {
-                data.data._id = self.id;
+                return data.data;
-                self.id++;
+            });
-                var result = self.provider.send(data.data);
 
-                result = JSON.parse(result);
+            var payload = jsonrpc.toBatchPayload(pollsBatch);
+            var results = self.provider.send(payload);
 
+            self.polls.forEach(function (data, index) {
+                var result = results[index];
+                
+                if (!jsonrpc.isValidResponse(result)) {
+                    console.log(result);
+                    return;
+                }
+
+                result = result.result;
                 // dont call the callback if result is not an array, or empty one
-                if (result.error || !(result.result instanceof Array) || result.result.length === 0) {
+                if (!(result instanceof Array) || result.length === 0) {
                     return;
                 }
 
-                data.callback(result.result);
+                data.callback(result);
+
             });
+
         }
         setTimeout(poll, 1000);
     };
@@ -920,22 +1076,19 @@ var ProviderManager = function() {
 };
 
 /// sends outgoing requests
+/// @params data - an object with at least 'method' property
 ProviderManager.prototype.send = function(data) {
-
+    var payload = jsonrpc.toPayload(data.method, data.params);
-    data.args = data.args || [];
-    data._id = this.id++;
 
     if (this.provider === undefined) {
         console.error('provider is not set');
         return null; 
     }
 
-    //TODO: handle error here? 
+    var result = this.provider.send(payload);
-    var result = this.provider.send(data);
-    result = JSON.parse(result);
 
-    if (result.error) {
+    if (!jsonrpc.isValidResponse(result)) {
-        console.log(result.error);
+        console.log(result);
         return null;
     }
 
@@ -966,7 +1119,7 @@ ProviderManager.prototype.stopPolling = function (pollId) {
 module.exports = ProviderManager;
 
 
-},{"./web3":12}],9:[function(require,module,exports){
+},{"./jsonrpc":8,"./web3":13}],10:[function(require,module,exports){
 /*
     This file is part of ethereum.js.
 
@@ -994,13 +1147,14 @@ var QtSyncProvider = function () {
 };
 
 QtSyncProvider.prototype.send = function (payload) {
-    return navigator.qt.callMethod(JSON.stringify(payload));
+    var result = navigator.qt.callMethod(JSON.stringify(payload));
+    return JSON.parse(result);
 };
 
 module.exports = QtSyncProvider;
 
 
-},{}],10:[function(require,module,exports){
+},{}],11:[function(require,module,exports){
 /*
     This file is part of ethereum.js.
 
@@ -1081,7 +1235,7 @@ module.exports = {
 };
 
 
-},{"./formatters":6}],11:[function(require,module,exports){
+},{"./formatters":6}],12:[function(require,module,exports){
 /*
     This file is part of ethereum.js.
 
@@ -1104,6 +1258,8 @@ module.exports = {
  * @date 2015
  */
 
+var c = require('./const');
+
 /// Finds first index of array element matching pattern
 /// @param array
 /// @param callback pattern
@@ -1166,7 +1322,7 @@ var extractDisplayName = function (name) {
 var extractTypeName = function (name) {
     /// TODO: make it invulnerable
     var length = name.indexOf('(');
-    return length !== -1 ? name.substr(length + 1, name.length - 1 - (length + 1)) : "";
+    return length !== -1 ? name.substr(length + 1, name.length - 1 - (length + 1)).replace(' ', '') : "";
 };
 
 /// Filters all function from input abi
@@ -1185,6 +1341,32 @@ var filterEvents = function (json) {
     });
 };
 
+/// used to transform value/string to eth string
+/// TODO: use BigNumber.js to parse int
+/// TODO: add tests for it!
+var 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 = c.ETH_UNITS;
+    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];
+};
+
 module.exports = {
     findIndex: findIndex,
     toAscii: toAscii,
@@ -1192,11 +1374,12 @@ module.exports = {
     extractDisplayName: extractDisplayName,
     extractTypeName: extractTypeName,
     filterFunctions: filterFunctions,
-    filterEvents: filterEvents
+    filterEvents: filterEvents,
+    toEth: toEth
 };
 
 
-},{}],12:[function(require,module,exports){
+},{"./const":2}],13:[function(require,module,exports){
 /*
     This file is part of ethereum.js.
 
@@ -1228,28 +1411,6 @@ if ("build" !== 'build') {/*
 
 var utils = require('./utils');
 
-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 [
@@ -1357,8 +1518,8 @@ var setupMethods = function (obj, methods) {
             var args = Array.prototype.slice.call(arguments);
             var call = typeof method.call === 'function' ? method.call(args) : method.call;
             return web3.provider.send({
-                call: call,
+                method: call,
-                args: args
+                params: args
             });
         };
     });
@@ -1371,15 +1532,15 @@ var setupProperties = function (obj, properties) {
         var proto = {};
         proto.get = function () {
             return web3.provider.send({
-                call: property.getter
+                method: property.getter
             });
         };
 
         if (property.setter) {
             proto.set = function (val) {
                 return web3.provider.send({
-                    call: property.setter,
+                    method: property.setter,
-                    args: [val]
+                    params: [val]
                 });
             };
         }
@@ -1412,29 +1573,7 @@ var web3 = {
     },
 
     /// used to transform value/string to eth string
-    /// TODO: use BigNumber.js to parse int
+    toEth: utils.toEth,
-    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 = ETH_UNITS;
-        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 object prototype
     eth: {
@@ -1470,11 +1609,6 @@ var web3 = {
             return new web3.filter(filter, shhWatch);
         }
     },
-
-    /// @returns true if provider is installed
-    haveProvider: function() {
-        return !!web3.provider.provider;
-    }
 };
 
 /// setups all api methods
@@ -1497,14 +1631,13 @@ var shhWatch = {
 setupMethods(shhWatch, shhWatchMethods());
 
 web3.setProvider = function(provider) {
-    //provider.onmessage = messageHandler; // there will be no async calls, to remove
     web3.provider.set(provider);
 };
 
 module.exports = web3;
 
 
-},{"./utils":11}],"web3":[function(require,module,exports){
+},{"./utils":12}],"web3":[function(require,module,exports){
 var web3 = require('./lib/web3');
 var ProviderManager = require('./lib/providermanager');
 web3.provider = new ProviderManager();
@@ -1517,7 +1650,7 @@ web3.abi = require('./lib/abi');
 
 module.exports = web3;
 
-},{"./lib/abi":1,"./lib/contract":3,"./lib/filter":5,"./lib/httpsync":7,"./lib/providermanager":8,"./lib/qtsync":9,"./lib/web3":12}]},{},["web3"])
+},{"./lib/abi":1,"./lib/contract":3,"./lib/filter":5,"./lib/httpsync":7,"./lib/providermanager":9,"./lib/qtsync":10,"./lib/web3":13}]},{},["web3"])
 
 
 //# sourceMappingURL=ethereum.js.map

libjsqrc/ethereumjs/example/event_inc.html

@@ -0,0 +1,66 @@
+<!doctype>
+<html>
+    <head>
+    <script type="text/javascript" src="js/bignumber.js/bignumber.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.HttpSyncProvider('http://localhost:8080'));
+
+        var source = "" + 
+        "contract Contract { " +
+        "   event Incremented(bool indexed odd, uint x); " +
+        "   function Contract() { " +
+        "        x = 69; " +
+        "    } " +
+        "    function inc() { " +
+        "        ++x; " +
+        "        Incremented(x % 2 == 1, x); " +
+        "    } " +
+        "    uint x; " +
+        "}";
+
+        var desc = [{
+            "type":"event",
+            "name":"Incremented",
+            "inputs": [{"name":"odd","type":"bool","indexed":true},{"name":"x","type":"uint","indexed":false}],
+        }, {
+            "type":"function",
+            "name":"inc",
+            "inputs": [],
+            "outputs": []
+        }];
+
+        var address;
+        var contract;
+
+        var update = function (x) {
+            document.getElementById('result').innerText = JSON.stringify(x);
+        };
+    
+        var createContract = function () {
+            address = web3.eth.transact({code: web3.eth.solidity(source)});
+            contract = web3.eth.contract(address, desc); 
+            contract.Incremented({odd: true}).changed(update);
+            
+        };
+
+        var callContract = function () {
+            contract.call().inc();
+        };
+
+
+    </script>
+    </head>
+
+    <body>
+        <div>
+            <button type="button" onClick="createContract();">create contract</button>
+        </div>
+        <div>
+            <button type="button" onClick="callContract();">test1</button>
+        </div>
+        <div id="result">
+        </div>
+    </body>
+</html>

libjsqrc/ethereumjs/lib/const.js

@@ -25,9 +25,32 @@ if (process.env.NODE_ENV !== 'build') {
     var BigNumber = require('bignumber.js'); // jshint ignore:line
 }
 
+var ETH_UNITS = [ 
+    'wei', 
+    'Kwei', 
+    'Mwei', 
+    'Gwei', 
+    'szabo', 
+    'finney', 
+    'ether', 
+    'grand', 
+    'Mether', 
+    'Gether', 
+    'Tether', 
+    'Pether', 
+    'Eether', 
+    'Zether', 
+    'Yether', 
+    'Nether', 
+    'Dether', 
+    'Vether', 
+    'Uether' 
+];
+
 module.exports = {
     ETH_PADDING: 32,
     ETH_SIGNATURE_LENGTH: 4,
+    ETH_UNITS: ETH_UNITS,
     ETH_BIGNUMBER_ROUNDING_MODE: { ROUNDING_MODE: BigNumber.ROUND_DOWN }
 };
 

libjsqrc/ethereumjs/lib/contract.js

@@ -120,6 +120,11 @@ var addFunctionsToContract = function (contract, desc, address) {
 
 var addEventRelatedPropertiesToContract = function (contract, desc, address) {
     contract.address = address;
+    contract._onWatchEventResult = function (data) {
+        var matchingEvent = event.getMatchingEvent(utils.filterEvents(desc));
+        var parser = eventImpl.outputParser(matchingEvent);
+        return parser(data);
+    };
     
     Object.defineProperty(contract, 'topic', {
         get: function() {
@@ -138,8 +143,12 @@ var addEventsToContract = function (contract, desc, address) {
         var impl = function () {
             var params = Array.prototype.slice.call(arguments);
             var signature = abi.eventSignatureFromAscii(e.name);
-            var event = eventImpl(address, signature, e);
+            var event = eventImpl.inputParser(address, signature, e);
             var o = event.apply(null, params);
+            o._onWatchEventResult = function (data) {
+                var parser = eventImpl.outputParser(e);
+                return parser(data);
+            };
             return web3.eth.watch(o);  
         };
         

libjsqrc/ethereumjs/lib/event.js

@@ -23,6 +23,16 @@
 var abi = require('./abi');
 var utils = require('./utils');
 
+/// filter inputs array && returns only indexed (or not) inputs
+/// @param inputs array
+/// @param bool if result should be an array of indexed params on not
+/// @returns array of (not?) indexed params
+var filterInputs = function (inputs, indexed) {
+    return inputs.filter(function (current) {
+        return current.indexed === indexed;
+    });
+};
+
 var inputWithName = function (inputs, name) {
     var index = utils.findIndex(inputs, function (input) {
         return input.name === name;
@@ -38,7 +48,7 @@ var inputWithName = function (inputs, name) {
 var indexedParamsToTopics = function (event, indexed) {
     // sort keys?
     return Object.keys(indexed).map(function (key) {
-        var inputs = [inputWithName(event.inputs, key)];
+        var inputs = [inputWithName(filterInputs(event.inputs, true), key)];
 
         var value = indexed[key];
         if (value instanceof Array) {
@@ -50,7 +60,7 @@ var indexedParamsToTopics = function (event, indexed) {
     });
 };
 
-var implementationOfEvent = function (address, signature, event) {
+var inputParser = function (address, signature, event) {
     
     // valid options are 'earliest', 'latest', 'offset' and 'max', as defined for 'eth.watch'
     return function (indexed, options) {
@@ -65,5 +75,61 @@ var implementationOfEvent = function (address, signature, event) {
     };
 };
 
-module.exports = implementationOfEvent;
+var getArgumentsObject = function (inputs, indexed, notIndexed) {
+    var indexedCopy = indexed.slice();
+    var notIndexedCopy = notIndexed.slice();
+    return inputs.reduce(function (acc, current) {
+        var value;
+        if (current.indexed)
+            value = indexed.splice(0, 1)[0];
+        else
+            value = notIndexed.splice(0, 1)[0];
+
+        acc[current.name] = value;
+        return acc;
+    }, {}); 
+};
+ 
+var outputParser = function (event) {
+    
+    return function (output) {
+        var result = {
+            event: utils.extractDisplayName(event.name),
+            number: output.number,
+            args: {}
+        };
+
+        if (!output.topic) {
+            return result;
+        }
+       
+        var indexedOutputs = filterInputs(event.inputs, true);
+        var indexedData = "0x" + output.topic.slice(1, output.topic.length).map(function (topic) { return topic.slice(2); }).join("");
+        var indexedRes = abi.formatOutput(indexedOutputs, indexedData);
+
+        var notIndexedOutputs = filterInputs(event.inputs, false);
+        var notIndexedRes = abi.formatOutput(notIndexedOutputs, output.data);
+
+        result.args = getArgumentsObject(event.inputs, indexedRes, notIndexedRes);
+
+        return result;
+    };
+};
+
+var getMatchingEvent = function (events, payload) {
+    for (var i = 0; i < events.length; i++) {
+        var signature = abi.eventSignatureFromAscii(events[i].name); 
+        if (signature === payload.topic[0]) {
+            return events[i];
+        }
+    }
+    return undefined;
+};
+
+
+module.exports = {
+    inputParser: inputParser,
+    outputParser: outputParser,
+    getMatchingEvent: getMatchingEvent
+};
 

libjsqrc/ethereumjs/lib/filter.js

@@ -37,6 +37,8 @@ var Filter = function(options, impl) {
             console.warn('"topics" is deprecated, use "topic" instead');
         }
         
+        this._onWatchResult = options._onWatchEventResult;
+
         // evaluate lazy properties
         options = {
             to: options.to,
@@ -54,7 +56,7 @@ var Filter = function(options, impl) {
     this.callbacks = [];
 
     this.id = impl.newFilter(options);
-    web3.provider.startPolling({call: impl.changed, args: [this.id]}, this.id, this.trigger.bind(this));
+    web3.provider.startPolling({method: impl.changed, params: [this.id]}, this.id, this.trigger.bind(this));
 };
 
 /// alias for changed*
@@ -74,7 +76,8 @@ Filter.prototype.changed = function(callback) {
 Filter.prototype.trigger = function(messages) {
     for (var i = 0; i < this.callbacks.length; i++) {
         for (var j = 0; j < messages.length; j++) {
-            this.callbacks[i].call(this, messages[j]);
+            var message = this._onWatchResult ? this._onWatchResult(messages[j]) : messages[j];
+            this.callbacks[i].call(this, message);
         }
     }
 };

libjsqrc/ethereumjs/lib/httpsync.js

@@ -30,40 +30,16 @@ var HttpSyncProvider = function (host) {
     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 data = formatJsonRpcObject(payload);
     
     var request = new XMLHttpRequest();
     request.open('POST', this.host, false);
-    request.send(JSON.stringify(data));
+    request.send(JSON.stringify(payload));
     
     // check request.status
-    return request.responseText;
+    var result = request.responseText;
+    return JSON.parse(result);
 };
 
 module.exports = HttpSyncProvider;

libjsqrc/ethereumjs/lib/jsonrpc.js

@@ -0,0 +1,65 @@
+/*
+    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 jsonrpc.js
+ * @authors:
+ *   Marek Kotewicz <marek@ethdev.com>
+ * @date 2015
+ */
+
+var messageId = 1;
+
+/// Should be called to valid json create payload object
+/// @param method of jsonrpc call, required
+/// @param params, an array of method params, optional
+/// @returns valid jsonrpc payload object
+var toPayload = function (method, params) {
+    if (!method)
+        console.error('jsonrpc method should be specified!');
+
+    return {
+        jsonrpc: '2.0',
+        method: method,
+        params: params || [],
+        id: messageId++
+    }; 
+};
+
+/// Should be called to check if jsonrpc response is valid
+/// @returns true if response is valid, otherwise false 
+var isValidResponse = function (response) {
+    return !!response &&
+        !response.error &&
+        response.jsonrpc === '2.0' &&
+        typeof response.id === 'number' &&
+        (!!response.result || typeof response.result === 'boolean');
+};
+
+/// Should be called to create batch payload object
+/// @param messages, an array of objects with method (required) and params (optional) fields
+var toBatchPayload = function (messages) {
+    return messages.map(function (message) {
+        return toPayload(message.method, message.params);
+    }); 
+};
+
+module.exports = {
+    toPayload: toPayload,
+    isValidResponse: isValidResponse,
+    toBatchPayload: toBatchPayload
+};
+
+

libjsqrc/ethereumjs/lib/providermanager.js

@@ -23,7 +23,9 @@
  * @date 2014
  */
 
-var web3 = require('./web3'); // jshint ignore:line
+var web3 = require('./web3'); 
+var jsonrpc = require('./jsonrpc');
+
 
 /**
  * Provider manager object prototype
@@ -37,25 +39,35 @@ var web3 = require('./web3'); // jshint ignore:line
 var ProviderManager = function() {
     this.polls = [];
     this.provider = undefined;
-    this.id = 1;
 
     var self = this;
     var poll = function () {
         if (self.provider) {
-            self.polls.forEach(function (data) {
+            var pollsBatch = self.polls.map(function (data) {
-                data.data._id = self.id;
+                return data.data;
-                self.id++;
+            });
-                var result = self.provider.send(data.data);
+
+            var payload = jsonrpc.toBatchPayload(pollsBatch);
+            var results = self.provider.send(payload);
 
-                result = JSON.parse(result);
+            self.polls.forEach(function (data, index) {
+                var result = results[index];
                 
+                if (!jsonrpc.isValidResponse(result)) {
+                    console.log(result);
+                    return;
+                }
+
+                result = result.result;
                 // dont call the callback if result is not an array, or empty one
-                if (result.error || !(result.result instanceof Array) || result.result.length === 0) {
+                if (!(result instanceof Array) || result.length === 0) {
                     return;
                 }
 
-                data.callback(result.result);
+                data.callback(result);
+
             });
+
         }
         setTimeout(poll, 1000);
     };
@@ -63,22 +75,19 @@ var ProviderManager = function() {
 };
 
 /// sends outgoing requests
+/// @params data - an object with at least 'method' property
 ProviderManager.prototype.send = function(data) {
-
+    var payload = jsonrpc.toPayload(data.method, data.params);
-    data.args = data.args || [];
-    data._id = this.id++;
 
     if (this.provider === undefined) {
         console.error('provider is not set');
         return null; 
     }
 
-    //TODO: handle error here? 
+    var result = this.provider.send(payload);
-    var result = this.provider.send(data);
-    result = JSON.parse(result);
 
-    if (result.error) {
+    if (!jsonrpc.isValidResponse(result)) {
-        console.log(result.error);
+        console.log(result);
         return null;
     }
 

libjsqrc/ethereumjs/lib/qtsync.js

@@ -25,7 +25,8 @@ var QtSyncProvider = function () {
 };
 
 QtSyncProvider.prototype.send = function (payload) {
-    return navigator.qt.callMethod(JSON.stringify(payload));
+    var result = navigator.qt.callMethod(JSON.stringify(payload));
+    return JSON.parse(result);
 };
 
 module.exports = QtSyncProvider;

libjsqrc/ethereumjs/lib/utils.js

@@ -20,6 +20,8 @@
  * @date 2015
  */
 
+var c = require('./const');
+
 /// Finds first index of array element matching pattern
 /// @param array
 /// @param callback pattern
@@ -82,7 +84,7 @@ var extractDisplayName = function (name) {
 var extractTypeName = function (name) {
     /// TODO: make it invulnerable
     var length = name.indexOf('(');
-    return length !== -1 ? name.substr(length + 1, name.length - 1 - (length + 1)) : "";
+    return length !== -1 ? name.substr(length + 1, name.length - 1 - (length + 1)).replace(' ', '') : "";
 };
 
 /// Filters all function from input abi
@@ -101,6 +103,32 @@ var filterEvents = function (json) {
     });
 };
 
+/// used to transform value/string to eth string
+/// TODO: use BigNumber.js to parse int
+/// TODO: add tests for it!
+var 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 = c.ETH_UNITS;
+    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];
+};
+
 module.exports = {
     findIndex: findIndex,
     toAscii: toAscii,
@@ -108,6 +136,7 @@ module.exports = {
     extractDisplayName: extractDisplayName,
     extractTypeName: extractTypeName,
     filterFunctions: filterFunctions,
-    filterEvents: filterEvents
+    filterEvents: filterEvents,
+    toEth: toEth
 };
 

libjsqrc/ethereumjs/lib/web3.js

@@ -29,28 +29,6 @@ if (process.env.NODE_ENV !== 'build') {
 
 var utils = require('./utils');
 
-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 [
@@ -158,8 +136,8 @@ var setupMethods = function (obj, methods) {
             var args = Array.prototype.slice.call(arguments);
             var call = typeof method.call === 'function' ? method.call(args) : method.call;
             return web3.provider.send({
-                call: call,
+                method: call,
-                args: args
+                params: args
             });
         };
     });
@@ -172,15 +150,15 @@ var setupProperties = function (obj, properties) {
         var proto = {};
         proto.get = function () {
             return web3.provider.send({
-                call: property.getter
+                method: property.getter
             });
         };
 
         if (property.setter) {
             proto.set = function (val) {
                 return web3.provider.send({
-                    call: property.setter,
+                    method: property.setter,
-                    args: [val]
+                    params: [val]
                 });
             };
         }
@@ -213,29 +191,7 @@ var web3 = {
     },
 
     /// used to transform value/string to eth string
-    /// TODO: use BigNumber.js to parse int
+    toEth: utils.toEth,
-    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 = ETH_UNITS;
-        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 object prototype
     eth: {
@@ -271,11 +227,6 @@ var web3 = {
             return new web3.filter(filter, shhWatch);
         }
     },
-
-    /// @returns true if provider is installed
-    haveProvider: function() {
-        return !!web3.provider.provider;
-    }
 };
 
 /// setups all api methods
@@ -298,7 +249,6 @@ var shhWatch = {
 setupMethods(shhWatch, shhWatchMethods());
 
 web3.setProvider = function(provider) {
-    //provider.onmessage = messageHandler; // there will be no async calls, to remove
     web3.provider.set(provider);
 };
 

libjsqrc/ethereumjs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ethereum.js",
   "namespace": "ethereum",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "description": "Ethereum Compatible JavaScript API",
   "main": "./index.js",
   "directories": {

libjsqrc/ethereumjs/test/abi.parsers.js → libjsqrc/ethereumjs/test/abi.inputParser.js

@@ -423,443 +423,5 @@ describe('abi', function() {
         });
 
     });
-
-    describe('outputParser', function() {
-        it('should parse output string', function() {
-
-            // given
-            var d = clone(description);
-
-            d[0].outputs = [
-                { type: "string" }
-            ];
-
-            // when
-            var parser = abi.outputParser(d);
-            
-            // then
-            assert.equal(
-                parser.test("0x" + 
-                    "0000000000000000000000000000000000000000000000000000000000000005" +
-                    "68656c6c6f000000000000000000000000000000000000000000000000000000")[0],
-                'hello'
-                );
-            assert.equal(
-                parser.test("0x" + 
-                    "0000000000000000000000000000000000000000000000000000000000000005" +
-                    "776f726c64000000000000000000000000000000000000000000000000000000")[0], 
-                'world'
-                );
-
-        });
-
-        it('should parse output uint', function() {
-
-            // given
-            var d = clone(description);
-
-            d[0].outputs = [
-                { type: 'uint' }
-            ];
-
-            // when
-            var parser = abi.outputParser(d);
-
-            // then
-            assert.equal(parser.test("0x0000000000000000000000000000000000000000000000000000000000000001")[0], 1);
-            assert.equal(parser.test("0x000000000000000000000000000000000000000000000000000000000000000a")[0], 10);
-            assert.equal(
-                parser.test("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff")[0].toString(10), 
-                new BigNumber("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", 16).toString(10)
-                );
-            assert.equal(
-                parser.test("0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0")[0].toString(10), 
-                new BigNumber("fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0", 16).toString(10)
-                );
-        });
-        
-        it('should parse output uint256', function() {
-
-            // given
-            var d = clone(description);
-
-            d[0].outputs = [
-                { type: 'uint256' }
-            ];
-
-            // when
-            var parser = abi.outputParser(d);
-
-            // then
-            assert.equal(parser.test("0x0000000000000000000000000000000000000000000000000000000000000001")[0], 1);
-            assert.equal(parser.test("0x000000000000000000000000000000000000000000000000000000000000000a")[0], 10);
-            assert.equal(
-                parser.test("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff")[0].toString(10), 
-                new BigNumber("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", 16).toString(10)
-                );
-            assert.equal(
-                parser.test("0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0")[0].toString(10), 
-                new BigNumber("fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0", 16).toString(10)
-                );
-        });
-
-        it('should parse output uint128', function() {
-
-            // given
-            var d = clone(description);
-
-            d[0].outputs = [
-                { type: 'uint128' }
-            ];
-
-            // when
-            var parser = abi.outputParser(d);
-
-            // then
-            assert.equal(parser.test("0x0000000000000000000000000000000000000000000000000000000000000001")[0], 1);
-            assert.equal(parser.test("0x000000000000000000000000000000000000000000000000000000000000000a")[0], 10);
-            assert.equal(
-                parser.test("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff")[0].toString(10), 
-                new BigNumber("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", 16).toString(10)
-                );
-            assert.equal(
-                parser.test("0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0")[0].toString(10), 
-                new BigNumber("fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0", 16).toString(10)
-                );
-        });
-
-        it('should parse output int', function() {
-
-            // given
-            var d = clone(description);
-
-            d[0].outputs = [
-                { type: 'int' }
-            ];
-
-            // when
-            var parser = abi.outputParser(d);
-
-            // then
-            assert.equal(parser.test("0x0000000000000000000000000000000000000000000000000000000000000001")[0], 1);
-            assert.equal(parser.test("0x000000000000000000000000000000000000000000000000000000000000000a")[0], 10);
-            assert.equal(parser.test("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff")[0], -1);
-            assert.equal(parser.test("0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0")[0], -16);
-        });
-        
-        it('should parse output int256', function() {
-
-            // given
-            var d = clone(description);
-
-            d[0].outputs = [
-                { type: 'int256' }
-            ];
-
-            // when
-            var parser = abi.outputParser(d);
-
-            // then
-            assert.equal(parser.test("0x0000000000000000000000000000000000000000000000000000000000000001")[0], 1);
-            assert.equal(parser.test("0x000000000000000000000000000000000000000000000000000000000000000a")[0], 10);
-            assert.equal(parser.test("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff")[0], -1);
-            assert.equal(parser.test("0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0")[0], -16);
-        });
-
-        it('should parse output int128', function() {
-
-            // given
-            var d = clone(description);
-
-            d[0].outputs = [
-                { type: 'int128' }
-            ];
-
-            // when
-            var parser = abi.outputParser(d);
-
-            // then
-            assert.equal(parser.test("0x0000000000000000000000000000000000000000000000000000000000000001")[0], 1);
-            assert.equal(parser.test("0x000000000000000000000000000000000000000000000000000000000000000a")[0], 10);
-            assert.equal(parser.test("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff")[0], -1);
-            assert.equal(parser.test("0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0")[0], -16);
-        });
-
-        it('should parse output hash', function() {
-            
-            // given
-            var d = clone(description);
-
-            d[0].outputs = [
-                { type: 'hash' }
-            ];
-
-            // when
-            var parser = abi.outputParser(d);
-
-            // then
-            assert.equal(
-                parser.test("0x000000000000000000000000407d73d8a49eeb85d32cf465507dd71d507100c1")[0],
-                "0x000000000000000000000000407d73d8a49eeb85d32cf465507dd71d507100c1"
-                );
-        });
-        
-        it('should parse output hash256', function() {
-        
-            // given
-            var d = clone(description);
-
-            d[0].outputs = [
-                { type: 'hash256' }
-            ];
-
-            // when
-            var parser = abi.outputParser(d);
-
-            // then
-            assert.equal(
-                parser.test("0x000000000000000000000000407d73d8a49eeb85d32cf465507dd71d507100c1")[0],
-                "0x000000000000000000000000407d73d8a49eeb85d32cf465507dd71d507100c1"
-                );
-        });
-
-        it('should parse output hash160', function() {
-            
-            // given
-            var d = clone(description);
-
-            d[0].outputs = [
-                { type: 'hash160' }
-            ];
-
-            // when
-            var parser = abi.outputParser(d);
-
-            // then
-            assert.equal(
-                parser.test("0x000000000000000000000000407d73d8a49eeb85d32cf465507dd71d507100c1")[0],
-                "0x000000000000000000000000407d73d8a49eeb85d32cf465507dd71d507100c1"
-                );
-            // TODO shouldnt' the expected hash be shorter?
-        });
-
-        it('should parse output address', function() {
-            
-            // given
-            var d = clone(description);
-
-            d[0].outputs = [
-                { type: 'address' }
-            ];
-
-            // when
-            var parser = abi.outputParser(d);
-
-            // then
-            assert.equal(
-                parser.test("0x000000000000000000000000407d73d8a49eeb85d32cf465507dd71d507100c1")[0],
-                "0x407d73d8a49eeb85d32cf465507dd71d507100c1"
-                );
-        });
-
-        it('should parse output bool', function() {
-            
-            // given
-            var d = clone(description);
-
-            d[0].outputs = [
-                { type: 'bool' }
-            ];
-
-            // when
-            var parser = abi.outputParser(d);
-
-            // then
-            assert.equal(parser.test("0x0000000000000000000000000000000000000000000000000000000000000001")[0], true);
-            assert.equal(parser.test("0x0000000000000000000000000000000000000000000000000000000000000000")[0], false);
-            
-
-        });
-
-        it('should parse output real', function() {
-            
-            // given
-            var d = clone(description); 
-
-            d[0].outputs = [
-                { type: 'real' }
-            ];
-
-            // when
-            var parser = abi.outputParser(d);
-
-            // then
-            assert.equal(parser.test("0x0000000000000000000000000000000100000000000000000000000000000000")[0], 1);
-            assert.equal(parser.test("0x0000000000000000000000000000000220000000000000000000000000000000")[0], 2.125); 
-            assert.equal(parser.test("0x0000000000000000000000000000000880000000000000000000000000000000")[0], 8.5); 
-            assert.equal(parser.test("0xffffffffffffffffffffffffffffffff00000000000000000000000000000000")[0], -1); 
-            
-        });
-
-        it('should parse output ureal', function() {
-
-            // given
-            var d = clone(description); 
-
-            d[0].outputs = [
-                { type: 'ureal' }
-            ];
-
-            // when
-            var parser = abi.outputParser(d);
-
-            // then
-            assert.equal(parser.test("0x0000000000000000000000000000000100000000000000000000000000000000")[0], 1);
-            assert.equal(parser.test("0x0000000000000000000000000000000220000000000000000000000000000000")[0], 2.125); 
-            assert.equal(parser.test("0x0000000000000000000000000000000880000000000000000000000000000000")[0], 8.5); 
-
-        });
-        
-
-        it('should parse multiple output strings', function() {
-
-            // given
-            var d = clone(description);
-
-            d[0].outputs = [
-                { type: "string" },
-                { type: "string" }
-            ];
-
-            // when
-            var parser = abi.outputParser(d);
-
-            // then
-            assert.equal(
-                parser.test("0x" +
-                    "0000000000000000000000000000000000000000000000000000000000000005" +
-                    "0000000000000000000000000000000000000000000000000000000000000005" +
-                    "68656c6c6f000000000000000000000000000000000000000000000000000000" + 
-                    "776f726c64000000000000000000000000000000000000000000000000000000")[0],
-                'hello'
-                );
-            assert.equal(
-                parser.test("0x" +
-                    "0000000000000000000000000000000000000000000000000000000000000005" +
-                    "0000000000000000000000000000000000000000000000000000000000000005" +
-                    "68656c6c6f000000000000000000000000000000000000000000000000000000" + 
-                    "776f726c64000000000000000000000000000000000000000000000000000000")[1],
-                'world'
-                );
-
-        });
-        
-        it('should use proper method name', function () {
-        
-            // given
-            var d = clone(description);
-            d[0].name = 'helloworld(int)';
-            d[0].outputs = [
-                { type: "int" }
-            ];
-
-            // when
-            var parser = abi.outputParser(d);
-
-            // then
-            assert.equal(parser.helloworld("0x0000000000000000000000000000000000000000000000000000000000000001")[0], 1);
-            assert.equal(parser.helloworld['int']("0x0000000000000000000000000000000000000000000000000000000000000001")[0], 1);
-
-        });
-
-
-        it('should parse multiple methods', function () {
-            
-            // given
-            var d =  [{
-                name: "test",
-                type: "function",
-                inputs: [{ type: "int" }],
-                outputs: [{ type: "int" }]
-            },{
-                name: "test2",
-                type: "function",
-                inputs: [{ type: "string" }],
-                outputs: [{ type: "string" }]
-            }];
-
-            // when
-            var parser = abi.outputParser(d);
-
-            //then
-            assert.equal(parser.test("0000000000000000000000000000000000000000000000000000000000000001")[0], 1);
-            assert.equal(parser.test2("0x" + 
-                    "0000000000000000000000000000000000000000000000000000000000000005" +
-                    "68656c6c6f000000000000000000000000000000000000000000000000000000")[0],
-                "hello"
-                );
-
-        });
-
-        it('should parse output array', function () {
-            
-            // given
-            var d = clone(description);
-            d[0].outputs = [
-                { type: 'int[]' }
-            ];
-
-            // when
-            var parser = abi.outputParser(d);
-
-            // then
-            assert.equal(parser.test("0x" +
-                    "0000000000000000000000000000000000000000000000000000000000000002" + 
-                    "0000000000000000000000000000000000000000000000000000000000000005" + 
-                    "0000000000000000000000000000000000000000000000000000000000000006")[0][0],
-                5
-                );
-            assert.equal(parser.test("0x" +
-                    "0000000000000000000000000000000000000000000000000000000000000002" + 
-                    "0000000000000000000000000000000000000000000000000000000000000005" + 
-                    "0000000000000000000000000000000000000000000000000000000000000006")[0][1],
-                6
-                );
-
-        });
-
-        it('should parse 0x value', function () {
-        
-            // given
-            var d = clone(description);
-            d[0].outputs = [
-                { type: 'int' }
-            ];
-
-            // when
-            var parser = abi.outputParser(d);
-
-            // then
-            assert.equal(parser.test("0x")[0], 0);
-
-        });
-        
-        it('should parse 0x value', function () {
-        
-            // given
-            var d = clone(description);
-            d[0].outputs = [
-                { type: 'uint' }
-            ];
-
-            // when
-            var parser = abi.outputParser(d);
-
-            // then
-            assert.equal(parser.test("0x")[0], 0);
-
-        });
-
-    });
 });
 

libjsqrc/ethereumjs/test/abi.outputParser.js

@@ -0,0 +1,461 @@
+var assert = require('assert');
+var BigNumber = require('bignumber.js');
+var abi = require('../lib/abi.js');
+var clone = function (object) { return JSON.parse(JSON.stringify(object)); };
+
+var description =  [{
+    "name": "test",
+    "type": "function",
+    "inputs": [{
+        "name": "a",
+        "type": "uint256"
+    }
+    ],
+    "outputs": [
+    {
+        "name": "d",
+        "type": "uint256"
+    }
+    ]
+}];
+
+describe('abi', function() {
+    describe('outputParser', function() {
+        it('should parse output string', function() {
+
+            // given
+            var d = clone(description);
+
+            d[0].outputs = [
+                { type: "string" }
+            ];
+
+            // when
+            var parser = abi.outputParser(d);
+            
+            // then
+            assert.equal(
+                parser.test("0x" + 
+                    "0000000000000000000000000000000000000000000000000000000000000005" +
+                    "68656c6c6f000000000000000000000000000000000000000000000000000000")[0],
+                'hello'
+                );
+            assert.equal(
+                parser.test("0x" + 
+                    "0000000000000000000000000000000000000000000000000000000000000005" +
+                    "776f726c64000000000000000000000000000000000000000000000000000000")[0], 
+                'world'
+                );
+
+        });
+
+        it('should parse output uint', function() {
+
+            // given
+            var d = clone(description);
+
+            d[0].outputs = [
+                { type: 'uint' }
+            ];
+
+            // when
+            var parser = abi.outputParser(d);
+
+            // then
+            assert.equal(parser.test("0x0000000000000000000000000000000000000000000000000000000000000001")[0], 1);
+            assert.equal(parser.test("0x000000000000000000000000000000000000000000000000000000000000000a")[0], 10);
+            assert.equal(
+                parser.test("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff")[0].toString(10), 
+                new BigNumber("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", 16).toString(10)
+                );
+            assert.equal(
+                parser.test("0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0")[0].toString(10), 
+                new BigNumber("fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0", 16).toString(10)
+                );
+        });
+        
+        it('should parse output uint256', function() {
+
+            // given
+            var d = clone(description);
+
+            d[0].outputs = [
+                { type: 'uint256' }
+            ];
+
+            // when
+            var parser = abi.outputParser(d);
+
+            // then
+            assert.equal(parser.test("0x0000000000000000000000000000000000000000000000000000000000000001")[0], 1);
+            assert.equal(parser.test("0x000000000000000000000000000000000000000000000000000000000000000a")[0], 10);
+            assert.equal(
+                parser.test("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff")[0].toString(10), 
+                new BigNumber("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", 16).toString(10)
+                );
+            assert.equal(
+                parser.test("0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0")[0].toString(10), 
+                new BigNumber("fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0", 16).toString(10)
+                );
+        });
+
+        it('should parse output uint128', function() {
+
+            // given
+            var d = clone(description);
+
+            d[0].outputs = [
+                { type: 'uint128' }
+            ];
+
+            // when
+            var parser = abi.outputParser(d);
+
+            // then
+            assert.equal(parser.test("0x0000000000000000000000000000000000000000000000000000000000000001")[0], 1);
+            assert.equal(parser.test("0x000000000000000000000000000000000000000000000000000000000000000a")[0], 10);
+            assert.equal(
+                parser.test("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff")[0].toString(10), 
+                new BigNumber("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", 16).toString(10)
+                );
+            assert.equal(
+                parser.test("0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0")[0].toString(10), 
+                new BigNumber("fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0", 16).toString(10)
+                );
+        });
+
+        it('should parse output int', function() {
+
+            // given
+            var d = clone(description);
+
+            d[0].outputs = [
+                { type: 'int' }
+            ];
+
+            // when
+            var parser = abi.outputParser(d);
+
+            // then
+            assert.equal(parser.test("0x0000000000000000000000000000000000000000000000000000000000000001")[0], 1);
+            assert.equal(parser.test("0x000000000000000000000000000000000000000000000000000000000000000a")[0], 10);
+            assert.equal(parser.test("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff")[0], -1);
+            assert.equal(parser.test("0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0")[0], -16);
+        });
+        
+        it('should parse output int256', function() {
+
+            // given
+            var d = clone(description);
+
+            d[0].outputs = [
+                { type: 'int256' }
+            ];
+
+            // when
+            var parser = abi.outputParser(d);
+
+            // then
+            assert.equal(parser.test("0x0000000000000000000000000000000000000000000000000000000000000001")[0], 1);
+            assert.equal(parser.test("0x000000000000000000000000000000000000000000000000000000000000000a")[0], 10);
+            assert.equal(parser.test("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff")[0], -1);
+            assert.equal(parser.test("0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0")[0], -16);
+        });
+
+        it('should parse output int128', function() {
+
+            // given
+            var d = clone(description);
+
+            d[0].outputs = [
+                { type: 'int128' }
+            ];
+
+            // when
+            var parser = abi.outputParser(d);
+
+            // then
+            assert.equal(parser.test("0x0000000000000000000000000000000000000000000000000000000000000001")[0], 1);
+            assert.equal(parser.test("0x000000000000000000000000000000000000000000000000000000000000000a")[0], 10);
+            assert.equal(parser.test("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff")[0], -1);
+            assert.equal(parser.test("0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0")[0], -16);
+        });
+
+        it('should parse output hash', function() {
+            
+            // given
+            var d = clone(description);
+
+            d[0].outputs = [
+                { type: 'hash' }
+            ];
+
+            // when
+            var parser = abi.outputParser(d);
+
+            // then
+            assert.equal(
+                parser.test("0x000000000000000000000000407d73d8a49eeb85d32cf465507dd71d507100c1")[0],
+                "0x000000000000000000000000407d73d8a49eeb85d32cf465507dd71d507100c1"
+                );
+        });
+        
+        it('should parse output hash256', function() {
+        
+            // given
+            var d = clone(description);
+
+            d[0].outputs = [
+                { type: 'hash256' }
+            ];
+
+            // when
+            var parser = abi.outputParser(d);
+
+            // then
+            assert.equal(
+                parser.test("0x000000000000000000000000407d73d8a49eeb85d32cf465507dd71d507100c1")[0],
+                "0x000000000000000000000000407d73d8a49eeb85d32cf465507dd71d507100c1"
+                );
+        });
+
+        it('should parse output hash160', function() {
+            
+            // given
+            var d = clone(description);
+
+            d[0].outputs = [
+                { type: 'hash160' }
+            ];
+
+            // when
+            var parser = abi.outputParser(d);
+
+            // then
+            assert.equal(
+                parser.test("0x000000000000000000000000407d73d8a49eeb85d32cf465507dd71d507100c1")[0],
+                "0x000000000000000000000000407d73d8a49eeb85d32cf465507dd71d507100c1"
+                );
+            // TODO shouldnt' the expected hash be shorter?
+        });
+
+        it('should parse output address', function() {
+            
+            // given
+            var d = clone(description);
+
+            d[0].outputs = [
+                { type: 'address' }
+            ];
+
+            // when
+            var parser = abi.outputParser(d);
+
+            // then
+            assert.equal(
+                parser.test("0x000000000000000000000000407d73d8a49eeb85d32cf465507dd71d507100c1")[0],
+                "0x407d73d8a49eeb85d32cf465507dd71d507100c1"
+                );
+        });
+
+        it('should parse output bool', function() {
+            
+            // given
+            var d = clone(description);
+
+            d[0].outputs = [
+                { type: 'bool' }
+            ];
+
+            // when
+            var parser = abi.outputParser(d);
+
+            // then
+            assert.equal(parser.test("0x0000000000000000000000000000000000000000000000000000000000000001")[0], true);
+            assert.equal(parser.test("0x0000000000000000000000000000000000000000000000000000000000000000")[0], false);
+            
+
+        });
+
+        it('should parse output real', function() {
+            
+            // given
+            var d = clone(description); 
+
+            d[0].outputs = [
+                { type: 'real' }
+            ];
+
+            // when
+            var parser = abi.outputParser(d);
+
+            // then
+            assert.equal(parser.test("0x0000000000000000000000000000000100000000000000000000000000000000")[0], 1);
+            assert.equal(parser.test("0x0000000000000000000000000000000220000000000000000000000000000000")[0], 2.125); 
+            assert.equal(parser.test("0x0000000000000000000000000000000880000000000000000000000000000000")[0], 8.5); 
+            assert.equal(parser.test("0xffffffffffffffffffffffffffffffff00000000000000000000000000000000")[0], -1); 
+            
+        });
+
+        it('should parse output ureal', function() {
+
+            // given
+            var d = clone(description); 
+
+            d[0].outputs = [
+                { type: 'ureal' }
+            ];
+
+            // when
+            var parser = abi.outputParser(d);
+
+            // then
+            assert.equal(parser.test("0x0000000000000000000000000000000100000000000000000000000000000000")[0], 1);
+            assert.equal(parser.test("0x0000000000000000000000000000000220000000000000000000000000000000")[0], 2.125); 
+            assert.equal(parser.test("0x0000000000000000000000000000000880000000000000000000000000000000")[0], 8.5); 
+
+        });
+        
+
+        it('should parse multiple output strings', function() {
+
+            // given
+            var d = clone(description);
+
+            d[0].outputs = [
+                { type: "string" },
+                { type: "string" }
+            ];
+
+            // when
+            var parser = abi.outputParser(d);
+
+            // then
+            assert.equal(
+                parser.test("0x" +
+                    "0000000000000000000000000000000000000000000000000000000000000005" +
+                    "0000000000000000000000000000000000000000000000000000000000000005" +
+                    "68656c6c6f000000000000000000000000000000000000000000000000000000" + 
+                    "776f726c64000000000000000000000000000000000000000000000000000000")[0],
+                'hello'
+                );
+            assert.equal(
+                parser.test("0x" +
+                    "0000000000000000000000000000000000000000000000000000000000000005" +
+                    "0000000000000000000000000000000000000000000000000000000000000005" +
+                    "68656c6c6f000000000000000000000000000000000000000000000000000000" + 
+                    "776f726c64000000000000000000000000000000000000000000000000000000")[1],
+                'world'
+                );
+
+        });
+        
+        it('should use proper method name', function () {
+        
+            // given
+            var d = clone(description);
+            d[0].name = 'helloworld(int)';
+            d[0].outputs = [
+                { type: "int" }
+            ];
+
+            // when
+            var parser = abi.outputParser(d);
+
+            // then
+            assert.equal(parser.helloworld("0x0000000000000000000000000000000000000000000000000000000000000001")[0], 1);
+            assert.equal(parser.helloworld['int']("0x0000000000000000000000000000000000000000000000000000000000000001")[0], 1);
+
+        });
+
+
+        it('should parse multiple methods', function () {
+            
+            // given
+            var d =  [{
+                name: "test",
+                type: "function",
+                inputs: [{ type: "int" }],
+                outputs: [{ type: "int" }]
+            },{
+                name: "test2",
+                type: "function",
+                inputs: [{ type: "string" }],
+                outputs: [{ type: "string" }]
+            }];
+
+            // when
+            var parser = abi.outputParser(d);
+
+            //then
+            assert.equal(parser.test("0000000000000000000000000000000000000000000000000000000000000001")[0], 1);
+            assert.equal(parser.test2("0x" + 
+                    "0000000000000000000000000000000000000000000000000000000000000005" +
+                    "68656c6c6f000000000000000000000000000000000000000000000000000000")[0],
+                "hello"
+                );
+
+        });
+
+        it('should parse output array', function () {
+            
+            // given
+            var d = clone(description);
+            d[0].outputs = [
+                { type: 'int[]' }
+            ];
+
+            // when
+            var parser = abi.outputParser(d);
+
+            // then
+            assert.equal(parser.test("0x" +
+                    "0000000000000000000000000000000000000000000000000000000000000002" + 
+                    "0000000000000000000000000000000000000000000000000000000000000005" + 
+                    "0000000000000000000000000000000000000000000000000000000000000006")[0][0],
+                5
+                );
+            assert.equal(parser.test("0x" +
+                    "0000000000000000000000000000000000000000000000000000000000000002" + 
+                    "0000000000000000000000000000000000000000000000000000000000000005" + 
+                    "0000000000000000000000000000000000000000000000000000000000000006")[0][1],
+                6
+                );
+
+        });
+
+        it('should parse 0x value', function () {
+        
+            // given
+            var d = clone(description);
+            d[0].outputs = [
+                { type: 'int' }
+            ];
+
+            // when
+            var parser = abi.outputParser(d);
+
+            // then
+            assert.equal(parser.test("0x")[0], 0);
+
+        });
+        
+        it('should parse 0x value', function () {
+        
+            // given
+            var d = clone(description);
+            d[0].outputs = [
+                { type: 'uint' }
+            ];
+
+            // when
+            var parser = abi.outputParser(d);
+
+            // then
+            assert.equal(parser.test("0x")[0], 0);
+
+        });
+
+    });
+});
+

libjsqrc/ethereumjs/test/db.methods.js

@@ -1,7 +1,7 @@
 
 var assert = require('assert');
 var web3 = require('../index.js');
-var u = require('./utils.js');
+var u = require('./test.utils.js');
 
 describe('web3', function() {
     describe('db', function() {

libjsqrc/ethereumjs/test/eth.methods.js

@@ -1,6 +1,6 @@
 var assert = require('assert');
 var web3 = require('../index.js');
-var u = require('./utils.js');
+var u = require('./test.utils.js');
 
 describe('web3', function() {
     describe('eth', function() {

libjsqrc/ethereumjs/test/event.inputParser.js

@@ -0,0 +1,125 @@
+var assert = require('assert');
+var event = require('../lib/event.js');
+var f = require('../lib/formatters.js');
+
+describe('event', function () {
+    describe('inputParser', function () {
+        it('should create basic filter input object', function () {
+            
+            // given
+            var address = '0x012345'; 
+            var signature = '0x987654';
+            var e = {
+                name: 'Event',
+                inputs: [{"name":"a","type":"uint256","indexed":true},{"name":"b","type":"hash256","indexed":false}]
+            };
+
+            // when
+            var impl = event.inputParser(address, signature, e);
+            var result = impl();
+
+            // then
+            assert.equal(result.address, address); 
+            assert.equal(result.topic.length, 1);
+            assert.equal(result.topic[0], signature);
+
+        });
+
+        it('should create filter input object with options', function () {
+            
+            // given
+            var address = '0x012345';
+            var signature = '0x987654';
+            var options = {
+                earliest: 1,
+                latest: 2,
+                offset: 3,
+                max: 4
+            };
+            var e = {
+                name: 'Event',
+                inputs: [{"name":"a","type":"uint256","indexed":true},{"name":"b","type":"hash256","indexed":false}]
+            };
+
+            // when
+            var impl = event.inputParser(address, signature, e); 
+            var result = impl({}, options);
+
+            // then
+            assert.equal(result.address, address);
+            assert.equal(result.topic.length, 1);
+            assert.equal(result.topic[0], signature);
+            assert.equal(result.earliest, options.earliest);
+            assert.equal(result.latest, options.latest);
+            assert.equal(result.offset, options.offset);
+            assert.equal(result.max, options.max);
+        
+        });
+
+        it('should create filter input object with indexed params', function () {
+        
+            // given
+            var address = '0x012345';
+            var signature = '0x987654';
+            var options = {
+                earliest: 1,
+                latest: 2,
+                offset: 3,
+                max: 4
+            };
+            var e = {
+                name: 'Event',
+                inputs: [{"name":"a","type":"uint256","indexed":true},{"name":"b","type":"hash256","indexed":false}]
+            };
+
+            // when
+            var impl = event.inputParser(address, signature, e); 
+            var result = impl({a: 4}, options);
+
+            // then
+            assert.equal(result.address, address);
+            assert.equal(result.topic.length, 2);
+            assert.equal(result.topic[0], signature);
+            assert.equal(result.topic[1], f.formatInputInt(4));
+            assert.equal(result.earliest, options.earliest);
+            assert.equal(result.latest, options.latest);
+            assert.equal(result.offset, options.offset);
+            assert.equal(result.max, options.max);
+
+        });
+
+        it('should create filter input object with an array of indexed params', function () {
+        
+            // given
+            var address = '0x012345';
+            var signature = '0x987654';
+            var options = {
+                earliest: 1,
+                latest: 2,
+                offset: 3,
+                max: 4
+            };
+            var e = {
+                name: 'Event',
+                inputs: [{"name":"a","type":"uint256","indexed":true},{"name":"b","type":"hash256","indexed":false}]
+            };
+
+            // when
+            var impl = event.inputParser(address, signature, e); 
+            var result = impl({a: [4, 69]}, options);
+
+            // then
+            assert.equal(result.address, address);
+            assert.equal(result.topic.length, 2);
+            assert.equal(result.topic[0], signature);
+            assert.equal(result.topic[1][0], f.formatInputInt(4));
+            assert.equal(result.topic[1][1], f.formatInputInt(69));
+            assert.equal(result.earliest, options.earliest);
+            assert.equal(result.latest, options.latest);
+            assert.equal(result.offset, options.offset);
+            assert.equal(result.max, options.max);
+
+        });
+    });
+});
+

libjsqrc/ethereumjs/test/event.js

@@ -1,124 +0,0 @@
-var assert = require('assert');
-var event = require('../lib/event.js');
-var f = require('../lib/formatters.js');
-
-describe('event', function () {
-    it('should create basic filter input object', function () {
-        
-        // given
-        var address = '0x012345'; 
-        var signature = '0x987654';
-        var e = {
-            name: 'Event',
-            inputs: [{"name":"a","type":"uint256","indexed":true},{"name":"b","type":"hash256","indexed":false}]
-        };
-
-        // when
-        var impl = event(address, signature, e);
-        var result = impl();
-
-        // then
-        assert.equal(result.address, address); 
-        assert.equal(result.topic.length, 1);
-        assert.equal(result.topic[0], signature);
-
-    });
-
-    it('should create filter input object with options', function () {
-        
-        // given
-        var address = '0x012345';
-        var signature = '0x987654';
-        var options = {
-            earliest: 1,
-            latest: 2,
-            offset: 3,
-            max: 4
-        };
-        var e = {
-            name: 'Event',
-            inputs: [{"name":"a","type":"uint256","indexed":true},{"name":"b","type":"hash256","indexed":false}]
-        };
-
-        // when
-        var impl = event(address, signature, e); 
-        var result = impl({}, options);
-
-        // then
-        assert.equal(result.address, address);
-        assert.equal(result.topic.length, 1);
-        assert.equal(result.topic[0], signature);
-        assert.equal(result.earliest, options.earliest);
-        assert.equal(result.latest, options.latest);
-        assert.equal(result.offset, options.offset);
-        assert.equal(result.max, options.max);
-    
-    });
-
-    it('should create filter input object with indexed params', function () {
-    
-        // given
-        var address = '0x012345';
-        var signature = '0x987654';
-        var options = {
-            earliest: 1,
-            latest: 2,
-            offset: 3,
-            max: 4
-        };
-        var e = {
-            name: 'Event',
-            inputs: [{"name":"a","type":"uint256","indexed":true},{"name":"b","type":"hash256","indexed":false}]
-        };
-
-        // when
-        var impl = event(address, signature, e); 
-        var result = impl({a: 4}, options);
-
-        // then
-        assert.equal(result.address, address);
-        assert.equal(result.topic.length, 2);
-        assert.equal(result.topic[0], signature);
-        assert.equal(result.topic[1], f.formatInputInt(4));
-        assert.equal(result.earliest, options.earliest);
-        assert.equal(result.latest, options.latest);
-        assert.equal(result.offset, options.offset);
-        assert.equal(result.max, options.max);
-
-    });
-
-    it('should create filter input object with an array of indexed params', function () {
-    
-        // given
-        var address = '0x012345';
-        var signature = '0x987654';
-        var options = {
-            earliest: 1,
-            latest: 2,
-            offset: 3,
-            max: 4
-        };
-        var e = {
-            name: 'Event',
-            inputs: [{"name":"a","type":"uint256","indexed":true},{"name":"b","type":"hash256","indexed":false}]
-        };
-
-        // when
-        var impl = event(address, signature, e); 
-        var result = impl({a: [4, 69]}, options);
-
-        // then
-        assert.equal(result.address, address);
-        assert.equal(result.topic.length, 2);
-        assert.equal(result.topic[0], signature);
-        assert.equal(result.topic[1][0], f.formatInputInt(4));
-        assert.equal(result.topic[1][1], f.formatInputInt(69));
-        assert.equal(result.earliest, options.earliest);
-        assert.equal(result.latest, options.latest);
-        assert.equal(result.offset, options.offset);
-        assert.equal(result.max, options.max);
-
-    });
-
-});
-

libjsqrc/ethereumjs/test/event.outputParser.js

@@ -0,0 +1,81 @@
+var assert = require('assert');
+var event = require('../lib/event.js');
+
+describe('event', function () {
+    describe('outputParser', function () {
+        it('should parse basic event output object', function () {
+            
+            // given
+            var output = {
+                "address":"0x78dfc5983baecf65f73e3de3a96cee24e6b7981e",
+                "data":"0x000000000000000000000000000000000000000000000000000000000000004b",
+                "number":2,
+                "topic":[
+                    "0x6e61ef44ac2747ff8b84d353a908eb8bd5c3fb118334d57698c5cfc7041196ad",
+                    "0x0000000000000000000000000000000000000000000000000000000000000001"
+                ]
+            };
+
+            var e = {
+                name: 'Event',
+                inputs: [{"name":"a","type":"bool","indexed":true},{"name":"b","type":"uint256","indexed":false}]
+            };
+
+            // when 
+            var impl = event.outputParser(e);
+            var result = impl(output);
+
+            // then
+            assert.equal(result.event, 'Event');
+            assert.equal(result.number, 2);
+            assert.equal(Object.keys(result.args).length, 2);
+            assert.equal(result.args.a, true);
+            assert.equal(result.args.b, 75);
+        }); 
+
+        it('should parse event output object arguments in correct order', function () {
+            
+            // given
+            var output = {
+                "address":"0x78dfc5983baecf65f73e3de3a96cee24e6b7981e",
+                "data": "0x" + 
+                    "000000000000000000000000000000000000000000000000000000000000004b" + 
+                    "000000000000000000000000000000000000000000000000000000000000004c" +
+                    "0000000000000000000000000000000000000000000000000000000000000001",
+                "number":3,
+                "topic":[
+                    "0x6e61ef44ac2747ff8b84d353a908eb8bd5c3fb118334d57698c5cfc7041196ad",
+                    "0x0000000000000000000000000000000000000000000000000000000000000001",
+                    "0x0000000000000000000000000000000000000000000000000000000000000005"
+                ]
+            };
+            
+            var e = {
+                name: 'Event2',
+                inputs: [
+                    {"name":"a","type":"bool","indexed":true},
+                    {"name":"b","type":"int","indexed":false},
+                    {"name":"c","type":"int","indexed":false},
+                    {"name":"d","type":"int","indexed":true},
+                    {"name":"e","type":"bool","indexed":false}
+                ]
+            };
+            
+            // when 
+            var impl = event.outputParser(e);
+            var result = impl(output);
+            
+            // then
+            assert.equal(result.event, 'Event2');
+            assert.equal(result.number, 3);
+            assert.equal(Object.keys(result.args).length, 5);
+            assert.equal(result.args.a, true);
+            assert.equal(result.args.b, 75);
+            assert.equal(result.args.c, 76);
+            assert.equal(result.args.d, 5);
+            assert.equal(result.args.e, true);
+
+        });
+    });
+});
+

libjsqrc/ethereumjs/test/jsonrpc.isValidResponse.js

@@ -0,0 +1,128 @@
+var assert = require('assert');
+var jsonrpc = require('../lib/jsonrpc');
+
+describe('jsonrpc', function () {
+    describe('isValidResponse', function () {
+        it('should validate basic jsonrpc response', function () {
+            
+            // given 
+            var response = {
+                jsonrpc: '2.0',
+                id: 1,
+                result: []
+            };
+
+            // when
+            var valid = jsonrpc.isValidResponse(response);
+
+            // then
+            assert.equal(valid, true);
+        });
+
+        it('should validate basic undefined response', function () {
+            
+            // given 
+            var response = undefined;
+
+            // when
+            var valid = jsonrpc.isValidResponse(response);
+
+            // then
+            assert.equal(valid, false);
+        });
+        
+        it('should validate jsonrpc response without jsonrpc field', function () {
+            
+            // given 
+            var response = {
+                id: 1,
+                result: []
+            };
+
+            // when
+            var valid = jsonrpc.isValidResponse(response);
+
+            // then
+            assert.equal(valid, false);
+        });
+        
+        it('should validate jsonrpc response with wrong jsonrpc version', function () {
+            
+            // given 
+            var response = {
+                jsonrpc: '1.0',
+                id: 1,
+                result: []
+            };
+
+            // when
+            var valid = jsonrpc.isValidResponse(response);
+
+            // then
+            assert.equal(valid, false);
+        });
+        
+        it('should validate jsonrpc response without id number', function () {
+            
+            // given 
+            var response = {
+                jsonrpc: '2.0',
+                result: []
+            };
+
+            // when
+            var valid = jsonrpc.isValidResponse(response);
+
+            // then
+            assert.equal(valid, false);
+        });
+
+        it('should validate jsonrpc response with wrong id field', function () {
+            
+            // given 
+            var response = {
+                jsonrpc: '2.0',
+                id: 'x',
+                result: []
+            };
+
+            // when
+            var valid = jsonrpc.isValidResponse(response);
+
+            // then
+            assert.equal(valid, false);
+        });
+
+        it('should validate jsonrpc response without result field', function () {
+            
+            // given 
+            var response = {
+                jsonrpc: '2.0',
+                id: 1
+            };
+
+            // when
+            var valid = jsonrpc.isValidResponse(response);
+
+            // then
+            assert.equal(valid, false);
+        });
+
+        it('should validate jsonrpc response with result field === false', function () {
+            
+            // given 
+            var response = {
+                jsonrpc: '2.0',
+                id: 1,
+                result: false 
+            };
+
+            // when
+            var valid = jsonrpc.isValidResponse(response);
+
+            // then
+            assert.equal(valid, true);
+        });
+
+    });
+});

libjsqrc/ethereumjs/test/jsonrpc.toBatchPayload.js

@@ -0,0 +1,47 @@
+var assert = require('assert');
+var jsonrpc = require('../lib/jsonrpc');
+
+describe('jsonrpc', function () {
+    describe('toBatchPayload', function () {
+        it('should create basic batch payload', function () {
+            
+            // given 
+            var messages = [{
+                method: 'helloworld'
+            }, {
+                method: 'test2',
+                params: [1]
+            }];
+
+            // when
+            var payload = jsonrpc.toBatchPayload(messages);
+
+            // then
+            assert.equal(payload instanceof Array, true);
+            assert.equal(payload.length, 2);
+            assert.equal(payload[0].jsonrpc, '2.0');
+            assert.equal(payload[1].jsonrpc, '2.0');
+            assert.equal(payload[0].method, 'helloworld');
+            assert.equal(payload[1].method, 'test2');
+            assert.equal(payload[0].params instanceof Array, true);
+            assert.equal(payload[1].params.length, 1);
+            assert.equal(payload[1].params[0], 1);
+            assert.equal(typeof payload[0].id, 'number');
+            assert.equal(typeof payload[1].id, 'number');
+            assert.equal(payload[0].id + 1, payload[1].id);
+        });
+        
+        it('should create batch payload for empty input array', function () {
+            
+            // given 
+            var messages = [];
+
+            // when
+            var payload = jsonrpc.toBatchPayload(messages);
+
+            // then
+            assert.equal(payload instanceof Array, true);
+            assert.equal(payload.length, 0);
+        });
+    });
+});

libjsqrc/ethereumjs/test/jsonrpc.toPayload.js

@@ -0,0 +1,40 @@
+var assert = require('assert');
+var jsonrpc = require('../lib/jsonrpc');
+
+describe('jsonrpc', function () {
+    describe('toPayload', function () {
+        it('should create basic payload', function () {
+            
+            // given 
+            var method = 'helloworld';
+
+            // when
+            var payload = jsonrpc.toPayload(method);
+
+            // then
+            assert.equal(payload.jsonrpc, '2.0');
+            assert.equal(payload.method, method);
+            assert.equal(payload.params instanceof Array, true);
+            assert.equal(payload.params.length, 0);
+            assert.equal(typeof payload.id, 'number');
+        });
+        
+        it('should create payload with params', function () {
+            
+            // given 
+            var method = 'helloworld1';
+            var params = [123, 'test'];
+
+            // when
+            var payload = jsonrpc.toPayload(method, params);
+
+            // then
+            assert.equal(payload.jsonrpc, '2.0');
+            assert.equal(payload.method, method);
+            assert.equal(payload.params.length, 2);
+            assert.equal(payload.params[0], params[0]);
+            assert.equal(payload.params[1], params[1]);
+            assert.equal(typeof payload.id, 'number');
+        });
+    });
+});

libjsqrc/ethereumjs/test/shh.methods.js

@@ -1,6 +1,6 @@
 var assert = require('assert');
 var web3 = require('../index.js');
-var u = require('./utils.js');
+var u = require('./test.utils.js');
 
 describe('web3', function() {
     describe('shh', function() {

libjsqrc/ethereumjs/test/utils.extractDisplayName.js

@@ -0,0 +1,42 @@
+var assert = require('assert');
+var utils = require('../lib/utils.js');
+
+describe('utils', function () {
+    describe('extractDisplayName', function () {
+        it('should extract display name from method with no params', function () {
+            
+            // given
+            var test = 'helloworld()'; 
+
+            // when
+            var displayName = utils.extractDisplayName(test);
+
+            // then
+            assert.equal(displayName, 'helloworld');
+        });
+        
+        it('should extract display name from method with one param' , function () {
+            
+            // given
+            var test = 'helloworld1(int)'; 
+
+            // when
+            var displayName = utils.extractDisplayName(test);
+
+            // then
+            assert.equal(displayName, 'helloworld1');
+        });
+        
+        it('should extract display name from method with two params' , function () {
+            
+            // given
+            var test = 'helloworld2(int,string)'; 
+
+            // when
+            var displayName = utils.extractDisplayName(test);
+
+            // then
+            assert.equal(displayName, 'helloworld2');
+        });
+    });
+});

libjsqrc/ethereumjs/test/utils.extractTypeName.js

@@ -0,0 +1,55 @@
+var assert = require('assert');
+var utils = require('../lib/utils.js');
+
+describe('utils', function () {
+    describe('extractTypeName', function () {
+        it('should extract type name from method with no params', function () {
+            
+            // given
+            var test = 'helloworld()';
+
+            // when
+            var typeName = utils.extractTypeName(test); 
+
+            // then
+            assert.equal(typeName, '');
+        });
+
+        it('should extract type name from method with one param', function () {
+            
+            // given
+            var test = 'helloworld1(int)';
+
+            // when
+            var typeName = utils.extractTypeName(test);
+
+            // then
+            assert.equal(typeName, 'int');
+        });
+        
+        it('should extract type name from method with two params', function () {
+            
+            // given
+            var test = 'helloworld2(int,string)';
+
+            // when
+            var typeName = utils.extractTypeName(test);
+
+            // then
+            assert.equal(typeName, 'int,string');
+        });
+        
+        it('should extract type name from method with spaces between params', function () {
+            
+            // given
+            var test = 'helloworld3(int, string)';
+
+            // when
+            var typeName = utils.extractTypeName(test);
+
+            // then
+            assert.equal(typeName, 'int,string');
+        });
+
+    });
+});

libjsqrc/ethereumjs/test/web3.methods.js

@@ -1,6 +1,6 @@
 var assert = require('assert');
 var web3 = require('../index.js');
-var u = require('./utils.js');
+var u = require('./test.utils.js');
 
 describe('web3', function() {
     u.methodExists(web3, 'sha3');

libqwebthree/QWebThree.cpp

@@ -41,20 +41,9 @@ void QWebThree::clientDieing()
 	this->disconnect();
 }
 
-static QString formatInput(QJsonObject const& _object)
-{
-	QJsonObject res;
-	res["jsonrpc"] = QString::fromStdString("2.0");
-	res["method"] = _object["call"];
-	res["params"] = _object["args"];
-	res["id"] = _object["_id"];
-	return QString::fromUtf8(QJsonDocument(res).toJson());
-}
-
 QString QWebThree::callMethod(QString _json)
 {
-	QJsonObject f = QJsonDocument::fromJson(_json.toUtf8()).object();
+	emit processData(_json, ""); // it's synchronous
-	emit processData(formatInput(f), ""); // it's synchronous
 	return m_response;
 }