Updated dist and added donation address to readme.

Author: ricmoo

README.md

@@ -46,6 +46,14 @@ Documentation is generated using [Sphinx](http://www.sphinx-doc.org) and can be
 
 
 
+Donations
+---------
+
+I do this because I love it, but if you want to buy me a coffee, I won't say no. **:o)**
+
+Ethereum: `0xEA517D5a070e6705Cc5467858681Ed953d285Eb9`
+
+
 License
 -------
 

dist/ethers-contracts.js

@@ -148,8 +148,19 @@ function Contract(address, contractInterface, signerOrProvider) {
                     var noncePromise = null;
                     if (transaction.nonce) {
                         noncePromise = Promise.resolve(transaction.nonce)
+                    } else if (signer.getTransactionCount) {
+                        noncePromise = signer.getTransactionCount;
+                        if (!(noncePromise instanceof Promise)) {
+                            noncePromise = Promise.resolve(noncePromise);
+                        }
                     } else {
-                        noncePromise = provider.getTransactionCount(signer.address, 'pending');
+                        var addressPromise = signer.getAddress();
+                        if (!(addressPromise instanceof Promise)) {
+                            addressPromise = Promise.resolve(addressPromise);
+                        }
+                        noncePromise = addressPromise.then(function(address) {
+                            return provider.getTransactionCount(address, 'pending');
+                        });
                     }
 
                     var gasPricePromise = null;
@@ -208,7 +219,7 @@ function Contract(address, contractInterface, signerOrProvider) {
 
         function handleEvent(log) {
             try {
-                var result = eventInfo.parse(log.data);
+                var result = eventInfo.parse(log.topics, log.data);
                 eventCallback.apply(log, Array.prototype.slice.call(result));
             } catch (error) {
                 console.log(error);
@@ -245,7 +256,8 @@ function Contract(address, contractInterface, signerOrProvider) {
 }
 
 utils.defineProperty(Contract, 'getDeployTransaction', function(bytecode, contractInterface) {
-    if (typeof(contractInterface) === 'string') {
+
+    if (!(contractInterface instanceof Interface)) {
         contractInterface = new Interface(contractInterface);
     }
 
@@ -708,7 +720,6 @@ function Interface(abi) {
             case 'event':
                 var func = (function() {
                     var inputTypes = getKeys(method.inputs, 'type');
-                    var inputNames = getKeys(method.inputs, 'name', true);
                     var func = function() {
                         var signature = method.name + '(' + getKeys(method.inputs, 'type').join(',') + ')';
                         var result = {
@@ -717,12 +728,50 @@ function Interface(abi) {
                             signature: signature,
                             topics: [utils.keccak256(utils.toUtf8Bytes(signature))],
                         };
-                        result.parse = function(data) {
-                            return Interface.decodeParams(
-                                inputNames,
-                                inputTypes,
+
+                        result.parse = function(topics, data) {
+
+                            // Strip the signature off of non-anonymous topics
+                            if (!method.anonymous) { topics = topics.slice(1); }
+
+                            var inputNamesIndexed = [], inputNamesNonIndexed = [];
+                            var inputTypesIndexed = [], inputTypesNonIndexed = [];
+                            method.inputs.forEach(function(input) {
+                                if (input.indexed) {
+                                    inputNamesIndexed.push(input.name);
+                                    inputTypesIndexed.push(input.type);
+                                } else {
+                                    inputNamesNonIndexed.push(input.name);
+                                    inputTypesNonIndexed.push(input.type);
+                                }
+                            });
+
+                            var resultIndexed = Interface.decodeParams(
+                                inputNamesIndexed,
+                                inputTypesIndexed,
+                                utils.concat(topics)
+                            );
+
+                            var resultNonIndexed = Interface.decodeParams(
+                                inputNamesNonIndexed,
+                                inputTypesNonIndexed,
                                 utils.arrayify(data)
                             );
+
+                            var result = new Result();
+                            var nonIndexedIndex = 0, indexedIndex = 0;
+                            method.inputs.forEach(function(input, i) {
+                                if (input.indexed) {
+                                    result[i] = resultIndexed[indexedIndex++];
+                                } else {
+                                    result[i] = resultNonIndexed[nonIndexedIndex++];
+                                }
+                                if (input.name) { result[input.name] = result[i]; }
+                            });
+
+                            result.length = method.inputs.length;
+
+                            return result;
                         };
                         return populateDescription(new EventDescription(), result);
                     }
@@ -746,7 +795,7 @@ function Interface(abi) {
         }
     };
 
-    abi.forEach(addMethod, this);
+    this.abi.forEach(addMethod, this);
 
     // If there wasn't a constructor, create the default constructor
     if (!deploy) {

dist/ethers-contracts.min.js

@@ -88,7 +88,7 @@ function checkLogTag(blockTag) {
 utils.defineProperty(EtherscanProvider.prototype, 'perform', function(method, params) {
     if (!params) { params = {}; }
 
-    var url = this.testnet ? 'https://testnet.etherscan.io': 'https://api.etherscan.io';
+    var url = this.testnet ? 'https://ropsten.etherscan.io': 'https://api.etherscan.io';
 
     var apiKey = '';
     if (this.apiKey) { apiKey += '&apikey=' + this.apiKey; }
@@ -5123,11 +5123,21 @@ function checkString(string) {
 function checkBlockTag(blockTag) {
     if (blockTag == null) { return 'latest'; }
 
-    if (utils.isHexString(blockTag)) { return blockTag; }
+    if (blockTag === 'earliest') { return '0x0'; }
 
-    if (blockTag === 'earliest') { blockTag = 0; }
     if (typeof(blockTag) === 'number') {
-        return utils.hexlify(blockTag);
+        blockTag = utils.hexlify(blockTag);
+    }
+
+    if (utils.isHexString(blockTag)) {
+        // HACK: This seems to be a weird requirement some nodes have
+        // (e.g. INFURA on ropsten; INFURA on homestead is fine)
+        // Remove leading 0's from the hex blockTag
+        while (blockTag.length > 3 && blockTag.substring(0, 3) === '0x0') {
+            blockTag = '0x' + blockTag.substring(3);
+        }
+
+        return blockTag;
     }
 
     if (blockTag === 'latest' || blockTag === 'pending') {
@@ -5424,6 +5434,11 @@ function Provider(testnet, chainId) {
         self.doPoll();
     }
 
+    utils.defineProperty(this, 'resetEventsBlock', function(blockNumber) {
+        lastBlockNumber = blockNumber;
+        self.doPoll();
+    });
+
     var poller = null;
     Object.defineProperty(this, 'polling', {
         get: function() { return (poller != null); },
@@ -5737,7 +5752,6 @@ utils.defineProperty(Provider.prototype, 'getEtherPrice', function() {
     }
 });
 
-
 utils.defineProperty(Provider.prototype, 'doPoll', function() {
 
 });