Updated dist files.

CHANGELOG.md

@@ -3,10 +3,10 @@ Changelog
 
 This change log is managed by `admin/cmds/update-versions` but may be manually updated.
 
-ethers/v5.0.26 (2021-01-13 03:38)
+ethers/v5.0.26 (2021-01-13 14:47)
 ---------------------------------
 
-  - Fixed abundant UnhandledRejectErrors in provider polling. ([#1084](https://github.com/ethers-io/ethers.js/issues/1084), [#1208](https://github.com/ethers-io/ethers.js/issues/1208), [#1221](https://github.com/ethers-io/ethers.js/issues/1221), [#1235](https://github.com/ethers-io/ethers.js/issues/1235); [74470de](https://github.com/ethers-io/ethers.js/commit/74470defda5170338735bbbe676c207cdd5cc1cf))
+  - Fixed abundant UnhandledRejectErrors in provider polling. ([#1084](https://github.com/ethers-io/ethers.js/issues/1084), [#1208](https://github.com/ethers-io/ethers.js/issues/1208), [#1221](https://github.com/ethers-io/ethers.js/issues/1221), [#1235](https://github.com/ethers-io/ethers.js/issues/1235); [74470de](https://github.com/ethers-io/ethers.js/commit/74470defda5170338735bbbe676c207cdd5cc1cf), [20f6e16](https://github.com/ethers-io/ethers.js/commit/20f6e16394909a43498c1ac6c73152957bd121bd))
   - Fixed non-checksum address comparisons in abstract Signer. ([#1236](https://github.com/ethers-io/ethers.js/issues/1236); [8175c83](https://github.com/ethers-io/ethers.js/commit/8175c83026436b6335800780ca12b7257e1b490f))
 
 ethers/v5.0.25 (2021-01-08 03:31)
@@ -212,4 +212,4 @@ ethers/v5.0.0 (2020-06-12 19:58)
 --------------------------------
 
   - Preserve config canary string. ([7157816](https://github.com/ethers-io/ethers.js/commit/7157816fa53f660d750811b293e3b1d5a2f70bd4))
-  - Updated docs. ([9e4c7e6](https://github.com/ethers-io/ethers.js/commit/9e4c7e609d9eeb5f2a11d6a90bfa9d32ee696431))
+  - Updated docs. ([9e4c7e6](https://github.com/ethers-io/ethers.js/commit/9e4c7e609d9eeb5f2a11d6a90bfa9d32ee696431))

packages/ethers/dist/ethers.esm.js

@@ -18470,20 +18470,30 @@ class BaseProvider extends Provider {
     _getInternalBlockNumber(maxAge) {
         return __awaiter$8(this, void 0, void 0, function* () {
             yield this._ready();
-            const internalBlockNumber = this._internalBlockNumber;
+            // Allowing stale data up to maxAge old
-            if (maxAge > 0 && internalBlockNumber) {
+            if (maxAge > 0) {
-                try {
+                // While there are pending internal block requests...
-                    const result = yield internalBlockNumber;
+                while (this._internalBlockNumber) {
-                    if ((getTime() - result.respTime) <= maxAge) {
+                    // ..."remember" which fetch we started with
-                        return result.blockNumber;
+                    const internalBlockNumber = this._internalBlockNumber;
+                    try {
+                        // Check the result is not too stale
+                        const result = yield internalBlockNumber;
+                        if ((getTime() - result.respTime) <= maxAge) {
+                            return result.blockNumber;
+                        }
+                        // Too old; fetch a new value
+                        break;
                     }
-                }
+                    catch (error) {
-                catch (error) {
+                        // The fetch rejected; if we are the first to get the
-                    // Don't null the dead (rejected) fetch, if it has already been updated
+                        // rejection, drop through so we replace it with a new
-                    if (this._internalBlockNumber === internalBlockNumber) {
+                        // fetch; all others blocked will then get that fetch
-                        this._internalBlockNumber = null;
+                        // which won't match the one they "remembered" and loop
+                        if (this._internalBlockNumber === internalBlockNumber) {
+                            break;
+                        }
                     }
-                    throw error;
                 }
             }
             const reqTime = getTime();

packages/ethers/dist/ethers.umd.js

@@ -20699,26 +20699,34 @@
 	                    case 0: return [4 /*yield*/, this._ready()];
 	                    case 1:
 	                        _a.sent();
-	                        internalBlockNumber = this._internalBlockNumber;
+	                        if (!(maxAge > 0)) return [3 /*break*/, 7];
-	                        if (!(maxAge > 0 && internalBlockNumber)) return [3 /*break*/, 5];
 	                        _a.label = 2;
 	                    case 2:
-	                        _a.trys.push([2, 4, , 5]);
+	                        if (!this._internalBlockNumber) return [3 /*break*/, 7];
-	                        return [4 /*yield*/, internalBlockNumber];
+	                        internalBlockNumber = this._internalBlockNumber;
+	                        _a.label = 3;
 	                    case 3:
+	                        _a.trys.push([3, 5, , 6]);
+	                        return [4 /*yield*/, internalBlockNumber];
+	                    case 4:
 	                        result = _a.sent();
 	                        if ((getTime() - result.respTime) <= maxAge) {
 	                            return [2 /*return*/, result.blockNumber];
 	                        }
-	                        return [3 /*break*/, 5];
+	                        // Too old; fetch a new value
-	                    case 4:
+	                        return [3 /*break*/, 7];
-	                        error_2 = _a.sent();
-	                        // Don't null the dead (rejected) fetch, if it has already been updated
-	                        if (this._internalBlockNumber === internalBlockNumber) {
-	                            this._internalBlockNumber = null;
-	                        }
-	                        throw error_2;
 	                    case 5:
+	                        error_2 = _a.sent();
+	                        // The fetch rejected; if we are the first to get the
+	                        // rejection, drop through so we replace it with a new
+	                        // fetch; all others blocked will then get that fetch
+	                        // which won't match the one they "remembered" and loop
+	                        if (this._internalBlockNumber === internalBlockNumber) {
+	                            return [3 /*break*/, 7];
+	                        }
+	                        return [3 /*break*/, 6];
+	                    case 6: return [3 /*break*/, 2];
+	                    case 7:
 	                        reqTime = getTime();
 	                        checkInternalBlockNumber = lib$3.resolveProperties({
 	                            blockNumber: this.perform("getBlockNumber", {}),
@@ -20750,7 +20758,7 @@
 	                            }
 	                        });
 	                        return [4 /*yield*/, checkInternalBlockNumber];
-	                    case 6: return [2 /*return*/, (_a.sent()).blockNumber];
+	                    case 8: return [2 /*return*/, (_a.sent()).blockNumber];
 	                }
 	            });
 	        });

packages/ethers/package.json

@@ -62,7 +62,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "sideEffects": false,
-  "tarballHash": "0xbf1ac1f27016ee0adf01f398bda537589e9cd6c793520deadf3945014d759c3c",
+  "tarballHash": "0xb1c5e01e009427c3c17b0c045899c847414ae6085811aab984466722ce440dbf",
   "types": "./lib/index.d.ts",
   "version": "5.0.26"
 }

packages/providers/lib.esm/base-provider.js

@@ -453,20 +453,30 @@ export class BaseProvider extends Provider {
     _getInternalBlockNumber(maxAge) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this._ready();
-            const internalBlockNumber = this._internalBlockNumber;
+            // Allowing stale data up to maxAge old
-            if (maxAge > 0 && internalBlockNumber) {
+            if (maxAge > 0) {
-                try {
+                // While there are pending internal block requests...
-                    const result = yield internalBlockNumber;
+                while (this._internalBlockNumber) {
-                    if ((getTime() - result.respTime) <= maxAge) {
+                    // ..."remember" which fetch we started with
-                        return result.blockNumber;
+                    const internalBlockNumber = this._internalBlockNumber;
+                    try {
+                        // Check the result is not too stale
+                        const result = yield internalBlockNumber;
+                        if ((getTime() - result.respTime) <= maxAge) {
+                            return result.blockNumber;
+                        }
+                        // Too old; fetch a new value
+                        break;
                     }
-                }
+                    catch (error) {
-                catch (error) {
+                        // The fetch rejected; if we are the first to get the
-                    // Don't null the dead (rejected) fetch, if it has already been updated
+                        // rejection, drop through so we replace it with a new
-                    if (this._internalBlockNumber === internalBlockNumber) {
+                        // fetch; all others blocked will then get that fetch
-                        this._internalBlockNumber = null;
+                        // which won't match the one they "remembered" and loop
+                        if (this._internalBlockNumber === internalBlockNumber) {
+                            break;
+                        }
                     }
-                    throw error;
                 }
             }
             const reqTime = getTime();

packages/providers/lib/base-provider.js

@@ -569,26 +569,34 @@ var BaseProvider = /** @class */ (function (_super) {
                     case 0: return [4 /*yield*/, this._ready()];
                     case 1:
                         _a.sent();
-                        internalBlockNumber = this._internalBlockNumber;
+                        if (!(maxAge > 0)) return [3 /*break*/, 7];
-                        if (!(maxAge > 0 && internalBlockNumber)) return [3 /*break*/, 5];
                         _a.label = 2;
                     case 2:
-                        _a.trys.push([2, 4, , 5]);
+                        if (!this._internalBlockNumber) return [3 /*break*/, 7];
-                        return [4 /*yield*/, internalBlockNumber];
+                        internalBlockNumber = this._internalBlockNumber;
+                        _a.label = 3;
                     case 3:
+                        _a.trys.push([3, 5, , 6]);
+                        return [4 /*yield*/, internalBlockNumber];
+                    case 4:
                         result = _a.sent();
                         if ((getTime() - result.respTime) <= maxAge) {
                             return [2 /*return*/, result.blockNumber];
                         }
-                        return [3 /*break*/, 5];
+                        // Too old; fetch a new value
-                    case 4:
+                        return [3 /*break*/, 7];
-                        error_2 = _a.sent();
-                        // Don't null the dead (rejected) fetch, if it has already been updated
-                        if (this._internalBlockNumber === internalBlockNumber) {
-                            this._internalBlockNumber = null;
-                        }
-                        throw error_2;
                     case 5:
+                        error_2 = _a.sent();
+                        // The fetch rejected; if we are the first to get the
+                        // rejection, drop through so we replace it with a new
+                        // fetch; all others blocked will then get that fetch
+                        // which won't match the one they "remembered" and loop
+                        if (this._internalBlockNumber === internalBlockNumber) {
+                            return [3 /*break*/, 7];
+                        }
+                        return [3 /*break*/, 6];
+                    case 6: return [3 /*break*/, 2];
+                    case 7:
                         reqTime = getTime();
                         checkInternalBlockNumber = properties_1.resolveProperties({
                             blockNumber: this.perform("getBlockNumber", {}),
@@ -620,7 +628,7 @@ var BaseProvider = /** @class */ (function (_super) {
                             }
                         });
                         return [4 /*yield*/, checkInternalBlockNumber];
-                    case 6: return [2 /*return*/, (_a.sent()).blockNumber];
+                    case 8: return [2 /*return*/, (_a.sent()).blockNumber];
                 }
             });
         });

packages/providers/package.json

@@ -65,7 +65,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "sideEffects": false,
-  "tarballHash": "0xb127f7b5f31a3da9e9fb3ce15b54091992facac2cda9d17dcce8bffc63bee7b7",
+  "tarballHash": "0x36465de96f80a4a774f347200a79fdae0f7a579ed1493581cb1f1273756d9f94",
   "types": "./lib/index.d.ts",
   "version": "5.0.19"
 }