Added customizable log levels to quiet warnings (#379).

_version.d.ts

@@ -1 +1 @@
-export declare const version = "4.0.19";
+export declare const version = "4.0.20";

_version.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.version = "4.0.19";
+exports.version = "4.0.20";

dist/ethers.js

@@ -1,7 +1,7 @@
 (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";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.version = "4.0.19";
+exports.version = "4.0.20";
 
 },{}],2:[function(require,module,exports){
 "use strict";
@@ -11700,7 +11700,7 @@ var JsonRpcSigner = /** @class */ (function (_super) {
     JsonRpcSigner.prototype.getTransactionCount = function (blockTag) {
         return this.provider.getTransactionCount(this.getAddress(), blockTag);
     };
-    JsonRpcSigner.prototype.sendTransaction = function (transaction) {
+    JsonRpcSigner.prototype.sendUncheckedTransaction = function (transaction) {
         var _this = this;
         transaction = properties_1.shallowCopy(transaction);
         var fromAddress = this.getAddress().then(function (address) {
@@ -11725,17 +11725,7 @@ var JsonRpcSigner = /** @class */ (function (_super) {
             var hexTx = JsonRpcProvider.hexlifyTransaction(tx);
             hexTx.from = results[1];
             return _this.provider.send('eth_sendTransaction', [hexTx]).then(function (hash) {
-                return web_1.poll(function () {
-                    return _this.provider.getTransaction(hash).then(function (tx) {
-                        if (tx === null) {
-                            return undefined;
-                        }
-                        return _this.provider._wrapTransaction(tx, hash);
-                    });
-                }, { onceBlock: _this.provider }).catch(function (error) {
-                    error.transactionHash = hash;
-                    throw error;
-                });
+                return hash;
             }, function (error) {
                 if (error.responseText) {
                     // See: JsonRpcProvider.sendTransaction (@TODO: Expose a ._throwError??)
@@ -11759,6 +11749,22 @@ var JsonRpcSigner = /** @class */ (function (_super) {
             });
         });
     };
+    JsonRpcSigner.prototype.sendTransaction = function (transaction) {
+        var _this = this;
+        return this.sendUncheckedTransaction(transaction).then(function (hash) {
+            return web_1.poll(function () {
+                return _this.provider.getTransaction(hash).then(function (tx) {
+                    if (tx === null) {
+                        return undefined;
+                    }
+                    return _this.provider._wrapTransaction(tx, hash);
+                });
+            }, { onceBlock: _this.provider }).catch(function (error) {
+                error.transactionHash = hash;
+                throw error;
+            });
+        });
+    };
     JsonRpcSigner.prototype.signMessage = function (message) {
         var _this = this;
         var data = ((typeof (message) === 'string') ? utf8_1.toUtf8Bytes(message) : message);
@@ -16632,6 +16638,13 @@ var Wallet = /** @class */ (function (_super) {
     };
     Wallet.prototype.sendTransaction = function (transaction) {
         var _this = this;
+        if (!this.provider) {
+            throw new Error('missing provider');
+        }
+        if (transaction.nonce == null) {
+            transaction = properties_1.shallowCopy(transaction);
+            transaction.nonce = this.getTransactionCount("pending");
+        }
         return transaction_1.populateTransaction(transaction, this.provider, this.address).then(function (tx) {
             return _this.sign(tx).then(function (signedTransaction) {
                 return _this.provider.sendTransaction(signedTransaction);

dist/ethers.types.txt

@@ -262,7 +262,7 @@ declare module 'ethers/utils/shims' {
 }
 
 declare module 'ethers/_version' {
-    export const version = "4.0.19";
+    export const version = "4.0.20";
 }
 
 declare module 'ethers/utils/bignumber' {
@@ -833,6 +833,7 @@ declare module 'ethers/providers/json-rpc-provider' {
         getAddress(): Promise<string>;
         getBalance(blockTag?: BlockTag): Promise<BigNumber>;
         getTransactionCount(blockTag?: BlockTag): Promise<number>;
+        sendUncheckedTransaction(transaction: TransactionRequest): Promise<string>;
         sendTransaction(transaction: TransactionRequest): Promise<TransactionResponse>;
         signMessage(message: Arrayish | string): Promise<string>;
         unlock(password: string): Promise<boolean>;

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "ethers",
-  "version": "4.0.19",
+  "version": "4.0.20",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ethers",
-  "version": "4.0.19",
+  "version": "4.0.20",
   "description": "Ethereum wallet library.",
   "main": "./index.js",
   "types": "./index.d.ts",

providers/json-rpc-provider.d.ts

@@ -13,6 +13,7 @@ export declare class JsonRpcSigner extends Signer {
     getAddress(): Promise<string>;
     getBalance(blockTag?: BlockTag): Promise<BigNumber>;
     getTransactionCount(blockTag?: BlockTag): Promise<number>;
+    sendUncheckedTransaction(transaction: TransactionRequest): Promise<string>;
     sendTransaction(transaction: TransactionRequest): Promise<TransactionResponse>;
     signMessage(message: Arrayish | string): Promise<string>;
     unlock(password: string): Promise<boolean>;

providers/json-rpc-provider.js

@@ -96,7 +96,7 @@ var JsonRpcSigner = /** @class */ (function (_super) {
     JsonRpcSigner.prototype.getTransactionCount = function (blockTag) {
         return this.provider.getTransactionCount(this.getAddress(), blockTag);
     };
-    JsonRpcSigner.prototype.sendTransaction = function (transaction) {
+    JsonRpcSigner.prototype.sendUncheckedTransaction = function (transaction) {
         var _this = this;
         transaction = properties_1.shallowCopy(transaction);
         var fromAddress = this.getAddress().then(function (address) {
@@ -121,17 +121,7 @@ var JsonRpcSigner = /** @class */ (function (_super) {
             var hexTx = JsonRpcProvider.hexlifyTransaction(tx);
             hexTx.from = results[1];
             return _this.provider.send('eth_sendTransaction', [hexTx]).then(function (hash) {
-                return web_1.poll(function () {
-                    return _this.provider.getTransaction(hash).then(function (tx) {
-                        if (tx === null) {
-                            return undefined;
-                        }
-                        return _this.provider._wrapTransaction(tx, hash);
-                    });
-                }, { onceBlock: _this.provider }).catch(function (error) {
-                    error.transactionHash = hash;
-                    throw error;
-                });
+                return hash;
             }, function (error) {
                 if (error.responseText) {
                     // See: JsonRpcProvider.sendTransaction (@TODO: Expose a ._throwError??)
@@ -155,6 +145,22 @@ var JsonRpcSigner = /** @class */ (function (_super) {
             });
         });
     };
+    JsonRpcSigner.prototype.sendTransaction = function (transaction) {
+        var _this = this;
+        return this.sendUncheckedTransaction(transaction).then(function (hash) {
+            return web_1.poll(function () {
+                return _this.provider.getTransaction(hash).then(function (tx) {
+                    if (tx === null) {
+                        return undefined;
+                    }
+                    return _this.provider._wrapTransaction(tx, hash);
+                });
+            }, { onceBlock: _this.provider }).catch(function (error) {
+                error.transactionHash = hash;
+                throw error;
+            });
+        });
+    };
     JsonRpcSigner.prototype.signMessage = function (message) {
         var _this = this;
         var data = ((typeof (message) === 'string') ? utf8_1.toUtf8Bytes(message) : message);

src.ts/_version.ts

@@ -1 +1 @@
-export const version = "4.0.19";
+export const version = "4.0.20";

src.ts/contract.ts

@@ -411,7 +411,6 @@ export class Contract {
                 if (address == null) { throw new Error('name not found'); }
                 return address;
             }).catch((error: Error) => {
-                console.log('ERROR: Cannot find Contract - ' + addressOrName);
                 throw error;
             }));
         } else {
@@ -429,7 +428,7 @@ export class Contract {
             if ((<any>this)[name] == null) {
                 defineReadOnly(this, name, run);
             } else {
-                console.log('WARNING: Multiple definitions for ' + name);
+                errors.warn('WARNING: Multiple definitions for ' + name);
             }
 
             if (this.functions[name] == null) {

src.ts/errors.ts

@@ -141,3 +141,28 @@ export function checkNormalize(): void {
         throwError('platform missing String.prototype.normalize', UNSUPPORTED_OPERATION, { operation: 'String.prototype.normalize', form: error.message });
     }
 }
+
+const LogLevels: { [ name: string ]: number } = { debug: 1, "default": 2, info: 2, warn: 3, error: 4, off: 5 };
+let LogLevel = LogLevels["default"];
+
+export function setLogLevel(logLevel: string): void {
+    let level = LogLevels[logLevel];
+    if (level == null) {
+        warn("invliad log level - " + logLevel);
+        return;
+    }
+    LogLevel = level;
+}
+
+function log(logLevel: string, args: Array<any>): void {
+    if (LogLevel > LogLevels[logLevel]) { return; }
+    console.log.apply(console, args);
+}
+
+export function warn(...args: Array<any>): void {
+    log("warn", args);
+}
+
+export function info(...args: Array<any>): void {
+    log("info", args);
+}

src.ts/providers/base-provider.ts

@@ -1224,7 +1224,7 @@ export class BaseProvider extends Provider {
     }
 
     protected _startPending(): void {
-        console.log('WARNING: this provider does not support pending events');
+        errors.warn('WARNING: this provider does not support pending events');
     }
 
     protected _stopPending(): void {

src.ts/providers/infura-provider.ts

@@ -41,7 +41,7 @@ export class InfuraProvider extends JsonRpcProvider {
     }
 
     protected _startPending(): void {
-        console.log('WARNING: INFURA does not support pending filters');
+        errors.warn('WARNING: INFURA does not support pending filters');
     }
 
     getSigner(address?: string): JsonRpcSigner {

src.ts/utils/abi-coder.ts

@@ -266,7 +266,7 @@ function parseSignatureEvent(fragment: string): EventFragment {
             case '':
                 break;
             default:
-                console.log('unknown modifier: ' + modifier);
+                errors.info('unknown modifier: ' + modifier);
         }
     });
 
@@ -336,7 +336,7 @@ function parseSignatureFunction(fragment: string): FunctionFragment {
             case '':
                 break;
             default:
-                console.log('unknown modifier: ' + modifier);
+                errors.info('unknown modifier: ' + modifier);
         }
     });
 

src.ts/utils/interface.ts

@@ -325,9 +325,13 @@ function addMethod(method: any): void {
                 sighash: sighash,
             });
 
-            // Expose the first (and hopefully unique named function
-            if (method.name && this.functions[method.name] == null) {
-                defineReadOnly(this.functions, method.name, description);
+            // Expose the first (and hopefully unique named function)
+            if (method.name) {
+                if (this.functions[method.name] == null) {
+                    defineReadOnly(this.functions, method.name, description);
+                } else {
+                    errors.warn('WARNING: Multiple definitions for ' + method.name);
+                }
             }
 
             // Expose all methods by their signature, for overloaded functions
@@ -368,7 +372,7 @@ function addMethod(method: any): void {
             break;
 
         default:
-            console.log('WARNING: unsupported ABI type - ' + method.type);
+            errors.warn('WARNING: unsupported ABI type - ' + method.type);
             break;
     }
 }

src.ts/utils/transaction.ts

@@ -162,7 +162,7 @@ export function parse(rawTransaction: Arrayish): Transaction {
         tx.v = bigNumberify(transaction[6]).toNumber();
 
     } catch (error) {
-        console.log(error);
+        errors.info(error);
         return tx;
     }
 
@@ -195,7 +195,7 @@ export function parse(rawTransaction: Arrayish): Transaction {
         try {
             tx.from = recoverAddress(digest, { r: hexlify(tx.r), s: hexlify(tx.s), recoveryParam: recoveryParam });
         } catch (error) {
-            console.log(error);
+            errors.info(error);
         }
 
         tx.hash = keccak256(rawTransaction);

wallet.js

@@ -103,6 +103,13 @@ var Wallet = /** @class */ (function (_super) {
     };
     Wallet.prototype.sendTransaction = function (transaction) {
         var _this = this;
+        if (!this.provider) {
+            throw new Error('missing provider');
+        }
+        if (transaction.nonce == null) {
+            transaction = properties_1.shallowCopy(transaction);
+            transaction.nonce = this.getTransactionCount("pending");
+        }
         return transaction_1.populateTransaction(transaction, this.provider, this.address).then(function (tx) {
             return _this.sign(tx).then(function (signedTransaction) {
                 return _this.provider.sendTransaction(signedTransaction);