status-im/ethers.js
2
0
Fork 0
mirror of synced 2025-02-25 04:25:16 +00:00
Code Issues Projects Releases Wiki Activity

Fix unresolved promise issues and add Promise linting.

Browse Source
This commit is contained in:
Richard Moore 2018-06-27 19:59:08 -04:00
parent 622f02c369
commit 564c5fa364
No known key found for this signature in database
GPG Key ID: 525F70A6FCABC295
19 changed files with 2065 additions and 1433 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.eslintrc.js Normal file
View File

@ -0,0 +1,18 @@
module.exports = {
"env": {
"browser": true,
"commonjs": true,
"node": true
},
"extends": [
// "eslint:recommended",
"plugin:promise/recommended"
],
"parserOptions": {
"ecmaVersion": 5
},
"plugins": [
"promise"
],
};

4
contracts/contract.js
View File

@ -269,6 +269,10 @@ function Contract(addressOrName, contractInterface, signerOrProvider) {
} catch (error) { } catch (error) {
console.log(error); console.log(error);
} }
return null;
}).catch(function(error) {
//console.log(error);
}); });
} }

6
dist/ethers-contracts.js vendored
View File

@ -1,4 +1,4 @@
(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.ethers = f()}})(function(){var define,module,exports;return (function(){function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s}return e})()({1:[function(require,module,exports){ (function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.ethers = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
'use strict'; 'use strict';
var Interface = require('./interface.js'); var Interface = require('./interface.js');
@ -270,6 +270,10 @@ function Contract(addressOrName, contractInterface, signerOrProvider) {
} catch (error) { } catch (error) {
console.log(error); console.log(error);
} }
return null;
}).catch(function(error) {
//console.log(error);
}); });
} }

6
dist/ethers-contracts.min.js vendored
View File

File diff suppressed because one or more lines are too long

46
dist/ethers-providers.js vendored
View File

@ -1,4 +1,4 @@
(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.ethers = f()}})(function(){var define,module,exports;return (function(){function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s}return e})()({1:[function(require,module,exports){ (function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.ethers = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
(function (module, exports) { (function (module, exports) {
'use strict'; 'use strict';
@ -4350,14 +4350,16 @@ utils.defineProperty(EtherscanProvider.prototype, 'perform', function(method, pa
var seq = Promise.resolve(); var seq = Promise.resolve();
logs.forEach(function(log) { logs.forEach(function(log) {
seq = seq.then(function() { seq = seq.then(function() {
if (log.blockHash != null) { return; } if (log.blockHash != null) { return null; }
log.blockHash = txs[log.transactionHash]; log.blockHash = txs[log.transactionHash];
if (log.blockHash == null) { if (log.blockHash == null) {
return self.getTransaction(log.transactionHash).then(function(tx) { return self.getTransaction(log.transactionHash).then(function(tx) {
txs[log.transactionHash] = tx.blockHash; txs[log.transactionHash] = tx.blockHash;
log.blockHash = tx.blockHash; log.blockHash = tx.blockHash;
return log;
}); });
} }
return null;
}); });
}) })
@ -4469,11 +4471,11 @@ utils.defineProperty(FallbackProvider.prototype, 'perform', function(method, par
var provider = providers.shift(); var provider = providers.shift();
provider.perform(method, params).then(function(result) { provider.perform(method, params).then(function(result) {
resolve(result); return resolve(result);
}, function (error) { }, function (error) {
if (!firstError) { firstError = error; } if (!firstError) { firstError = error; }
next(); next();
}); }).catch(function(error) { });
} }
next(); next();
}); });
@ -4712,12 +4714,16 @@ utils.defineProperty(JsonRpcSigner.prototype, 'sendTransaction', function(transa
provider.getTransaction(hash).then(function(transaction) { provider.getTransaction(hash).then(function(transaction) {
if (!transaction) { if (!transaction) {
setTimeout(check, 1000); setTimeout(check, 1000);
return; return null;
} }
transaction.wait = function() { transaction.wait = function() {
return provider.waitForTransaction(hash); return provider.waitForTransaction(hash);
}; };
resolve(transaction); resolve(transaction);
return null;
}).catch(function(error) {
setTimeout(check, 1000);
return null;
}); });
} }
check(); check();
@ -4866,6 +4872,7 @@ utils.defineProperty(JsonRpcProvider.prototype, '_startPending', function() {
seq = seq.then(function() { seq = seq.then(function() {
return self.getTransaction(hash).then(function(tx) { return self.getTransaction(hash).then(function(tx) {
self.emit('pending', tx); self.emit('pending', tx);
return null;
}); });
}); });
}); });
@ -4876,14 +4883,18 @@ utils.defineProperty(JsonRpcProvider.prototype, '_startPending', function() {
}).then(function() { }).then(function() {
if (self._pendingFilter != pendingFilter) { if (self._pendingFilter != pendingFilter) {
self.send('eth_uninstallFilter', [ filterIf ]); self.send('eth_uninstallFilter', [ filterIf ]);
return; return null;
} }
setTimeout(function() { poll(); }, 0); setTimeout(function() { poll(); }, 0);
return null;
}).catch(function(error) {
}); });
} }
poll(); poll();
return filterId; return filterId;
}).catch(function(error) {
}); });
}); });
@ -5399,10 +5410,11 @@ function Provider(network) {
if (event.type === 'transaction') { if (event.type === 'transaction') {
self.getTransaction(event.hash).then(function(transaction) { self.getTransaction(event.hash).then(function(transaction) {
if (!transaction || transaction.blockNumber == null) { return; } if (!transaction || transaction.blockNumber == null) { return null; }
self._emitted['t:' + transaction.hash.toLowerCase()] = transaction.blockNumber; self._emitted['t:' + transaction.hash.toLowerCase()] = transaction.blockNumber;
self.emit(event.hash, transaction); self.emit(event.hash, transaction);
}); return null;
}).catch(function(error) { });
} else if (event.type === 'address') { } else if (event.type === 'address') {
if (balances[event.address]) { if (balances[event.address]) {
@ -5410,10 +5422,11 @@ function Provider(network) {
} }
self.getBalance(event.address, 'latest').then(function(balance) { self.getBalance(event.address, 'latest').then(function(balance) {
var lastBalance = balances[event.address]; var lastBalance = balances[event.address];
if (lastBalance && balance.eq(lastBalance)) { return; } if (lastBalance && balance.eq(lastBalance)) { return null; }
balances[event.address] = balance; balances[event.address] = balance;
self.emit(event.address, balance); self.emit(event.address, balance);
}); return null;
}).catch(function(error) { });
} else if (event.type === 'topic') { } else if (event.type === 'topic') {
self.getLogs({ self.getLogs({
@ -5421,20 +5434,23 @@ function Provider(network) {
toBlock: blockNumber, toBlock: blockNumber,
topics: event.topic topics: event.topic
}).then(function(logs) { }).then(function(logs) {
if (logs.length === 0) { return; } if (logs.length === 0) { return null; }
logs.forEach(function(log) { logs.forEach(function(log) {
self._emitted['b:' + log.blockHash.toLowerCase()] = log.blockNumber; self._emitted['b:' + log.blockHash.toLowerCase()] = log.blockNumber;
self._emitted['t:' + log.transactionHash.toLowerCase()] = log.blockNumber; self._emitted['t:' + log.transactionHash.toLowerCase()] = log.blockNumber;
self.emit(event.topic, log); self.emit(event.topic, log);
}); });
}); return null;
}).catch(function(error) { });
} }
}); });
lastBlockNumber = blockNumber; lastBlockNumber = blockNumber;
balances = newBalances; balances = newBalances;
});
return null;
}).catch(function() { });
self.doPoll(); self.doPoll();
} }
@ -5745,9 +5761,10 @@ function stallPromise(allowNullFunc, executeFunc) {
if (timeout > 10000) { timeout = 10000; } if (timeout > 10000) { timeout = 10000; }
setTimeout(check, timeout); setTimeout(check, timeout);
} }
return null;
}, function(error) { }, function(error) {
reject(error); reject(error);
}); }).catch(function(error) { reject(error); });
} }
check(); check();
}); });
@ -5854,6 +5871,7 @@ utils.defineProperty(Provider.prototype, '_resolveNames', function(object, keys)
if (result[key] === undefined) { return; } if (result[key] === undefined) { return; }
promises.push(this.resolveName(result[key]).then(function(address) { promises.push(this.resolveName(result[key]).then(function(address) {
result[key] = address; result[key] = address;
return null;
})); }));
}, this); }, this);

8
dist/ethers-providers.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/ethers-utils.js vendored
View File

@ -1,4 +1,4 @@
(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.ethers = f()}})(function(){var define,module,exports;return (function(){function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s}return e})()({1:[function(require,module,exports){ (function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.ethers = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
(function (module, exports) { (function (module, exports) {
'use strict'; 'use strict';

2
dist/ethers-utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

148
dist/ethers-wallet.js vendored
View File

File diff suppressed because one or more lines are too long

10
dist/ethers-wallet.min.js vendored
View File

File diff suppressed because one or more lines are too long

224
dist/ethers.js vendored
View File

File diff suppressed because one or more lines are too long

12
dist/ethers.min.js vendored
View File

File diff suppressed because one or more lines are too long

2944
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

5
package.json
View File

@ -1,9 +1,10 @@
{ {
"name": "ethers", "name": "ethers",
"version": "3.0.24", "version": "3.0.25",
"description": "Ethereum wallet library.", "description": "Ethereum wallet library.",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
"eslint": "eslint index.js contracts/*.js providers/*.js utils/*.js wallet/*.js",
"test": "if [ \"$RUN_PHANTOMJS\" = \"1\" ]; then npm run-script test-phantomjs; else npm run-script test-node; fi", "test": "if [ \"$RUN_PHANTOMJS\" = \"1\" ]; then npm run-script test-phantomjs; else npm run-script test-node; fi",
"test-node": "./node_modules/.bin/mocha tests/test-*.js", "test-node": "./node_modules/.bin/mocha tests/test-*.js",
"test-phantomjs": "./node_modules/.bin/grunt dist && ./node_modules/.bin/grunt --gruntfile Gruntfile-test.js dist && phantomjs --web-security=false ./node_modules/mocha-phantomjs-core/mocha-phantomjs-core.js ./tests/test.html", "test-phantomjs": "./node_modules/.bin/grunt dist && ./node_modules/.bin/grunt --gruntfile Gruntfile-test.js dist && phantomjs --web-security=false ./node_modules/mocha-phantomjs-core/mocha-phantomjs-core.js ./tests/test.html",
@ -23,6 +24,8 @@
}, },
"devDependencies": { "devDependencies": {
"browserify-zlib": "^0.2.0", "browserify-zlib": "^0.2.0",
"eslint": "^5.0.1",
"eslint-plugin-promise": "^3.8.0",
"grunt": "^0.4.5", "grunt": "^0.4.5",
"grunt-browserify": "^5.0.0", "grunt-browserify": "^5.0.0",
"grunt-cli": "1.2.0", "grunt-cli": "1.2.0",

4
providers/etherscan-provider.js
View File

@ -218,14 +218,16 @@ utils.defineProperty(EtherscanProvider.prototype, 'perform', function(method, pa
var seq = Promise.resolve(); var seq = Promise.resolve();
logs.forEach(function(log) { logs.forEach(function(log) {
seq = seq.then(function() { seq = seq.then(function() {
if (log.blockHash != null) { return; } if (log.blockHash != null) { return null; }
log.blockHash = txs[log.transactionHash]; log.blockHash = txs[log.transactionHash];
if (log.blockHash == null) { if (log.blockHash == null) {
return self.getTransaction(log.transactionHash).then(function(tx) { return self.getTransaction(log.transactionHash).then(function(tx) {
txs[log.transactionHash] = tx.blockHash; txs[log.transactionHash] = tx.blockHash;
log.blockHash = tx.blockHash; log.blockHash = tx.blockHash;
return log;
}); });
} }
return null;
}); });
}) })

4
providers/fallback-provider.js
View File

@ -49,11 +49,11 @@ utils.defineProperty(FallbackProvider.prototype, 'perform', function(method, par
var provider = providers.shift(); var provider = providers.shift();
provider.perform(method, params).then(function(result) { provider.perform(method, params).then(function(result) {
resolve(result); return resolve(result);
}, function (error) { }, function (error) {
if (!firstError) { firstError = error; } if (!firstError) { firstError = error; }
next(); next();
}); }).catch(function(error) { });
} }
next(); next();
}); });

13
providers/json-rpc-provider.js
View File

@ -124,12 +124,16 @@ utils.defineProperty(JsonRpcSigner.prototype, 'sendTransaction', function(transa
provider.getTransaction(hash).then(function(transaction) { provider.getTransaction(hash).then(function(transaction) {
if (!transaction) { if (!transaction) {
setTimeout(check, 1000); setTimeout(check, 1000);
return; return null;
} }
transaction.wait = function() { transaction.wait = function() {
return provider.waitForTransaction(hash); return provider.waitForTransaction(hash);
}; };
resolve(transaction); resolve(transaction);
return null;
}).catch(function(error) {
setTimeout(check, 1000);
return null;
}); });
} }
check(); check();
@ -278,6 +282,7 @@ utils.defineProperty(JsonRpcProvider.prototype, '_startPending', function() {
seq = seq.then(function() { seq = seq.then(function() {
return self.getTransaction(hash).then(function(tx) { return self.getTransaction(hash).then(function(tx) {
self.emit('pending', tx); self.emit('pending', tx);
return null;
}); });
}); });
}); });
@ -288,14 +293,18 @@ utils.defineProperty(JsonRpcProvider.prototype, '_startPending', function() {
}).then(function() { }).then(function() {
if (self._pendingFilter != pendingFilter) { if (self._pendingFilter != pendingFilter) {
self.send('eth_uninstallFilter', [ filterIf ]); self.send('eth_uninstallFilter', [ filterIf ]);
return; return null;
} }
setTimeout(function() { poll(); }, 0); setTimeout(function() { poll(); }, 0);
return null;
}).catch(function(error) {
}); });
} }
poll(); poll();
return filterId; return filterId;
}).catch(function(error) {
}); });
}); });

23
providers/provider.js
View File

@ -449,10 +449,11 @@ function Provider(network) {
if (event.type === 'transaction') { if (event.type === 'transaction') {
self.getTransaction(event.hash).then(function(transaction) { self.getTransaction(event.hash).then(function(transaction) {
if (!transaction || transaction.blockNumber == null) { return; } if (!transaction || transaction.blockNumber == null) { return null; }
self._emitted['t:' + transaction.hash.toLowerCase()] = transaction.blockNumber; self._emitted['t:' + transaction.hash.toLowerCase()] = transaction.blockNumber;
self.emit(event.hash, transaction); self.emit(event.hash, transaction);
}); return null;
}).catch(function(error) { });
} else if (event.type === 'address') { } else if (event.type === 'address') {
if (balances[event.address]) { if (balances[event.address]) {
@ -460,10 +461,11 @@ function Provider(network) {
} }
self.getBalance(event.address, 'latest').then(function(balance) { self.getBalance(event.address, 'latest').then(function(balance) {
var lastBalance = balances[event.address]; var lastBalance = balances[event.address];
if (lastBalance && balance.eq(lastBalance)) { return; } if (lastBalance && balance.eq(lastBalance)) { return null; }
balances[event.address] = balance; balances[event.address] = balance;
self.emit(event.address, balance); self.emit(event.address, balance);
}); return null;
}).catch(function(error) { });
} else if (event.type === 'topic') { } else if (event.type === 'topic') {
self.getLogs({ self.getLogs({
@ -471,20 +473,23 @@ function Provider(network) {
toBlock: blockNumber, toBlock: blockNumber,
topics: event.topic topics: event.topic
}).then(function(logs) { }).then(function(logs) {
if (logs.length === 0) { return; } if (logs.length === 0) { return null; }
logs.forEach(function(log) { logs.forEach(function(log) {
self._emitted['b:' + log.blockHash.toLowerCase()] = log.blockNumber; self._emitted['b:' + log.blockHash.toLowerCase()] = log.blockNumber;
self._emitted['t:' + log.transactionHash.toLowerCase()] = log.blockNumber; self._emitted['t:' + log.transactionHash.toLowerCase()] = log.blockNumber;
self.emit(event.topic, log); self.emit(event.topic, log);
}); });
}); return null;
}).catch(function(error) { });
} }
}); });
lastBlockNumber = blockNumber; lastBlockNumber = blockNumber;
balances = newBalances; balances = newBalances;
});
return null;
}).catch(function() { });
self.doPoll(); self.doPoll();
} }
@ -795,9 +800,10 @@ function stallPromise(allowNullFunc, executeFunc) {
if (timeout > 10000) { timeout = 10000; } if (timeout > 10000) { timeout = 10000; }
setTimeout(check, timeout); setTimeout(check, timeout);
} }
return null;
}, function(error) { }, function(error) {
reject(error); reject(error);
}); }).catch(function(error) { reject(error); });
} }
check(); check();
}); });
@ -904,6 +910,7 @@ utils.defineProperty(Provider.prototype, '_resolveNames', function(object, keys)
if (result[key] === undefined) { return; } if (result[key] === undefined) { return; }
promises.push(this.resolveName(result[key]).then(function(address) { promises.push(this.resolveName(result[key]).then(function(address) {
result[key] = address; result[key] = address;
return null;
})); }));
}, this); }, this);

3
wallet/wallet.js
View File

@ -416,9 +416,10 @@ utils.defineProperty(Wallet, 'fromEncryptedWallet', function(json, password, pro
utils.defineProperty(wallet, 'path', signingKey.path); utils.defineProperty(wallet, 'path', signingKey.path);
} }
resolve(wallet); resolve(wallet);
return null;
}, function(error) { }, function(error) {
reject(error); reject(error);
}); }).catch(function(error) { reject(error); });
} else { } else {
reject('invalid wallet JSON'); reject('invalid wallet JSON');