Skip to content

Commit b0bd9ee

Browse files
ricmooricmoo
committed
Updated dist files.
1 parent 7075c8c commit b0bd9ee

File tree

6 files changed

+51
-17
lines changed

6 files changed

+51
-17
lines changed

‎dist/ethers.js

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10076,6 +10076,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
1007610076
var address_1 = require("../utils/address");
1007710077
var bignumber_1 = require("../utils/bignumber");
1007810078
var bytes_1 = require("../utils/bytes");
10079+
var constants_1 = require("../constants");
1007910080
var hash_1 = require("../utils/hash");
1008010081
var networks_1 = require("../utils/networks");
1008110082
var properties_1 = require("../utils/properties");
@@ -10754,7 +10755,7 @@ var BaseProvider = /** @class */ (function (_super) {
1075410755
return this.ready.then(function () {
1075510756
return properties_1.resolveProperties({ addressOrName: addressOrName, blockTag: blockTag }).then(function (_a) {
1075610757
var addressOrName = _a.addressOrName, blockTag = _a.blockTag;
10757-
return _this.resolveName(addressOrName).then(function (address) {
10758+
return _this._getAddress(addressOrName).then(function (address) {
1075810759
var params = { address: address, blockTag: checkBlockTag(blockTag) };
1075910760
return _this.perform('getBalance', params).then(function (result) {
1076010761
return bignumber_1.bigNumberify(result);
@@ -10768,7 +10769,7 @@ var BaseProvider = /** @class */ (function (_super) {
1076810769
return this.ready.then(function () {
1076910770
return properties_1.resolveProperties({ addressOrName: addressOrName, blockTag: blockTag }).then(function (_a) {
1077010771
var addressOrName = _a.addressOrName, blockTag = _a.blockTag;
10771-
return _this.resolveName(addressOrName).then(function (address) {
10772+
return _this._getAddress(addressOrName).then(function (address) {
1077210773
var params = { address: address, blockTag: checkBlockTag(blockTag) };
1077310774
return _this.perform('getTransactionCount', params).then(function (result) {
1077410775
return bignumber_1.bigNumberify(result).toNumber();
@@ -10782,7 +10783,7 @@ var BaseProvider = /** @class */ (function (_super) {
1078210783
return this.ready.then(function () {
1078310784
return properties_1.resolveProperties({ addressOrName: addressOrName, blockTag: blockTag }).then(function (_a) {
1078410785
var addressOrName = _a.addressOrName, blockTag = _a.blockTag;
10785-
return _this.resolveName(addressOrName).then(function (address) {
10786+
return _this._getAddress(addressOrName).then(function (address) {
1078610787
var params = { address: address, blockTag: checkBlockTag(blockTag) };
1078710788
return _this.perform('getCode', params).then(function (result) {
1078810789
return bytes_1.hexlify(result);
@@ -10796,7 +10797,7 @@ var BaseProvider = /** @class */ (function (_super) {
1079610797
return this.ready.then(function () {
1079710798
return properties_1.resolveProperties({ addressOrName: addressOrName, position: position, blockTag: blockTag }).then(function (_a) {
1079810799
var addressOrName = _a.addressOrName, position = _a.position, blockTag = _a.blockTag;
10799-
return _this.resolveName(addressOrName).then(function (address) {
10800+
return _this._getAddress(addressOrName).then(function (address) {
1080010801
var params = {
1080110802
address: address,
1080210803
blockTag: checkBlockTag(blockTag),
@@ -11039,6 +11040,14 @@ var BaseProvider = /** @class */ (function (_super) {
1103911040
});
1104011041
});
1104111042
};
11043+
BaseProvider.prototype._getAddress = function (addressOrName) {
11044+
return this.resolveName(addressOrName).then(function (address) {
11045+
if (address == null) {
11046+
errors.throwError("ENS name not configured", errors.UNSUPPORTED_OPERATION, { operation: "resolveName(" + JSON.stringify(addressOrName) + ")" });
11047+
}
11048+
return address;
11049+
});
11050+
};
1104211051
// @TODO: Could probably use resolveProperties instead?
1104311052
BaseProvider.prototype._resolveNames = function (object, keys) {
1104411053
var promises = [];
@@ -11047,7 +11056,7 @@ var BaseProvider = /** @class */ (function (_super) {
1104711056
if (result[key] == null) {
1104811057
return;
1104911058
}
11050-
promises.push(this.resolveName(result[key]).then(function (address) {
11059+
promises.push(this._getAddress(result[key]).then(function (address) {
1105111060
result[key] = address;
1105211061
return;
1105311062
}));
@@ -11070,7 +11079,11 @@ var BaseProvider = /** @class */ (function (_super) {
1107011079
if (bytes_1.hexDataLength(data) !== 32) {
1107111080
return null;
1107211081
}
11073-
return address_1.getAddress(bytes_1.hexDataSlice(data, 12));
11082+
var address = address_1.getAddress(bytes_1.hexDataSlice(data, 12));
11083+
if (address === constants_1.AddressZero) {
11084+
return null;
11085+
}
11086+
return address;
1107411087
});
1107511088
});
1107611089
};
@@ -11091,6 +11104,9 @@ var BaseProvider = /** @class */ (function (_super) {
1109111104
var nodeHash = hash_1.namehash(name);
1109211105
// Get the addr from the resovler
1109311106
return this._getResolver(name).then(function (resolverAddress) {
11107+
if (resolverAddress == null) {
11108+
return null;
11109+
}
1109411110
// keccak256('addr(bytes32)')
1109511111
var data = '0x3b3b57de' + nodeHash.substring(2);
1109611112
var transaction = { to: resolverAddress, data: data };
@@ -11101,7 +11117,7 @@ var BaseProvider = /** @class */ (function (_super) {
1110111117
return null;
1110211118
}
1110311119
var address = address_1.getAddress(bytes_1.hexDataSlice(data, 12));
11104-
if (address === '0x0000000000000000000000000000000000000000') {
11120+
if (address === constants_1.AddressZero) {
1110511121
return null;
1110611122
}
1110711123
return address;
@@ -11273,7 +11289,7 @@ var BaseProvider = /** @class */ (function (_super) {
1127311289
exports.BaseProvider = BaseProvider;
1127411290
properties_1.defineReadOnly(abstract_provider_1.Provider, 'inherits', properties_1.inheritable(abstract_provider_1.Provider));
1127511291

11276-
},{"../errors":5,"../utils/address":59,"../utils/bignumber":62,"../utils/bytes":63,"../utils/hash":64,"../utils/networks":71,"../utils/properties":73,"../utils/rlp":75,"../utils/transaction":82,"../utils/utf8":84,"../utils/web":85,"./abstract-provider":49}],51:[function(require,module,exports){
11292+
},{"../constants":3,"../errors":5,"../utils/address":59,"../utils/bignumber":62,"../utils/bytes":63,"../utils/hash":64,"../utils/networks":71,"../utils/properties":73,"../utils/rlp":75,"../utils/transaction":82,"../utils/utf8":84,"../utils/web":85,"./abstract-provider":49}],51:[function(require,module,exports){
1127711293
"use strict";
1127811294
var __extends = (this && this.__extends) || (function () {
1127911295
var extendStatics = Object.setPrototypeOf ||

‎dist/ethers.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/ethers.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/ethers.types.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -771,6 +771,7 @@ declare module 'ethers/providers/base-provider' {
771771
getTransactionReceipt(transactionHash: string): Promise<TransactionReceipt>;
772772
getLogs(filter: Filter | FilterByBlock): Promise<Array<Log>>;
773773
getEtherPrice(): Promise<number>;
774+
_getAddress(addressOrName: string): Promise<string>;
774775
resolveName(name: string | Promise<string>): Promise<string>;
775776
lookupAddress(address: string | Promise<string>): Promise<string>;
776777
static checkTransactionResponse(transaction: any): TransactionResponse;

‎providers/base-provider.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ export declare class BaseProvider extends Provider {
5353
getTransactionReceipt(transactionHash: string): Promise<TransactionReceipt>;
5454
getLogs(filter: Filter | FilterByBlock): Promise<Array<Log>>;
5555
getEtherPrice(): Promise<number>;
56+
_getAddress(addressOrName: string): Promise<string>;
5657
private _resolveNames;
5758
private _getResolver;
5859
resolveName(name: string | Promise<string>): Promise<string>;

‎providers/base-provider.js

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
2020
var address_1 = require("../utils/address");
2121
var bignumber_1 = require("../utils/bignumber");
2222
var bytes_1 = require("../utils/bytes");
23+
var constants_1 = require("../constants");
2324
var hash_1 = require("../utils/hash");
2425
var networks_1 = require("../utils/networks");
2526
var properties_1 = require("../utils/properties");
@@ -698,7 +699,7 @@ var BaseProvider = /** @class */ (function (_super) {
698699
return this.ready.then(function () {
699700
return properties_1.resolveProperties({ addressOrName: addressOrName, blockTag: blockTag }).then(function (_a) {
700701
var addressOrName = _a.addressOrName, blockTag = _a.blockTag;
701-
return _this.resolveName(addressOrName).then(function (address) {
702+
return _this._getAddress(addressOrName).then(function (address) {
702703
var params = { address: address, blockTag: checkBlockTag(blockTag) };
703704
return _this.perform('getBalance', params).then(function (result) {
704705
return bignumber_1.bigNumberify(result);
@@ -712,7 +713,7 @@ var BaseProvider = /** @class */ (function (_super) {
712713
return this.ready.then(function () {
713714
return properties_1.resolveProperties({ addressOrName: addressOrName, blockTag: blockTag }).then(function (_a) {
714715
var addressOrName = _a.addressOrName, blockTag = _a.blockTag;
715-
return _this.resolveName(addressOrName).then(function (address) {
716+
return _this._getAddress(addressOrName).then(function (address) {
716717
var params = { address: address, blockTag: checkBlockTag(blockTag) };
717718
return _this.perform('getTransactionCount', params).then(function (result) {
718719
return bignumber_1.bigNumberify(result).toNumber();
@@ -726,7 +727,7 @@ var BaseProvider = /** @class */ (function (_super) {
726727
return this.ready.then(function () {
727728
return properties_1.resolveProperties({ addressOrName: addressOrName, blockTag: blockTag }).then(function (_a) {
728729
var addressOrName = _a.addressOrName, blockTag = _a.blockTag;
729-
return _this.resolveName(addressOrName).then(function (address) {
730+
return _this._getAddress(addressOrName).then(function (address) {
730731
var params = { address: address, blockTag: checkBlockTag(blockTag) };
731732
return _this.perform('getCode', params).then(function (result) {
732733
return bytes_1.hexlify(result);
@@ -740,7 +741,7 @@ var BaseProvider = /** @class */ (function (_super) {
740741
return this.ready.then(function () {
741742
return properties_1.resolveProperties({ addressOrName: addressOrName, position: position, blockTag: blockTag }).then(function (_a) {
742743
var addressOrName = _a.addressOrName, position = _a.position, blockTag = _a.blockTag;
743-
return _this.resolveName(addressOrName).then(function (address) {
744+
return _this._getAddress(addressOrName).then(function (address) {
744745
var params = {
745746
address: address,
746747
blockTag: checkBlockTag(blockTag),
@@ -983,6 +984,14 @@ var BaseProvider = /** @class */ (function (_super) {
983984
});
984985
});
985986
};
987+
BaseProvider.prototype._getAddress = function (addressOrName) {
988+
return this.resolveName(addressOrName).then(function (address) {
989+
if (address == null) {
990+
errors.throwError("ENS name not configured", errors.UNSUPPORTED_OPERATION, { operation: "resolveName(" + JSON.stringify(addressOrName) + ")" });
991+
}
992+
return address;
993+
});
994+
};
986995
// @TODO: Could probably use resolveProperties instead?
987996
BaseProvider.prototype._resolveNames = function (object, keys) {
988997
var promises = [];
@@ -991,7 +1000,7 @@ var BaseProvider = /** @class */ (function (_super) {
9911000
if (result[key] == null) {
9921001
return;
9931002
}
994-
promises.push(this.resolveName(result[key]).then(function (address) {
1003+
promises.push(this._getAddress(result[key]).then(function (address) {
9951004
result[key] = address;
9961005
return;
9971006
}));
@@ -1014,7 +1023,11 @@ var BaseProvider = /** @class */ (function (_super) {
10141023
if (bytes_1.hexDataLength(data) !== 32) {
10151024
return null;
10161025
}
1017-
return address_1.getAddress(bytes_1.hexDataSlice(data, 12));
1026+
var address = address_1.getAddress(bytes_1.hexDataSlice(data, 12));
1027+
if (address === constants_1.AddressZero) {
1028+
return null;
1029+
}
1030+
return address;
10181031
});
10191032
});
10201033
};
@@ -1035,6 +1048,9 @@ var BaseProvider = /** @class */ (function (_super) {
10351048
var nodeHash = hash_1.namehash(name);
10361049
// Get the addr from the resovler
10371050
return this._getResolver(name).then(function (resolverAddress) {
1051+
if (resolverAddress == null) {
1052+
return null;
1053+
}
10381054
// keccak256('addr(bytes32)')
10391055
var data = '0x3b3b57de' + nodeHash.substring(2);
10401056
var transaction = { to: resolverAddress, data: data };
@@ -1045,7 +1061,7 @@ var BaseProvider = /** @class */ (function (_super) {
10451061
return null;
10461062
}
10471063
var address = address_1.getAddress(bytes_1.hexDataSlice(data, 12));
1048-
if (address === '0x0000000000000000000000000000000000000000') {
1064+
if (address === constants_1.AddressZero) {
10491065
return null;
10501066
}
10511067
return address;

0 commit comments

Comments
 (0)