Skip to content

Commit

Permalink
Updated dist files.
Browse files Browse the repository at this point in the history
  • Loading branch information
ricmoo committed Aug 2, 2019
1 parent 0af95f4 commit 8354c3f
Show file tree
Hide file tree
Showing 167 changed files with 1,930 additions and 1,388 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@ Changelog

This change log is managed by `scripts/cmds/update-versions` but may be manually updated.

ethers/v5.0.0-beta.149 (2019-08-02 2:07)
----------------------------------------

- Full case-folding for IDNA in namehash. ([0af95f4](https://github.com/ethers-io/ethers.js/commit/0af95f4a655106e67c2ba8f445af88c9e9e24339))
- Deprecating errors for logger. ([0b224e8](https://github.com/ethers-io/ethers.js/commit/0b224e8fb5811cd06727063c909ca1e1e5cde57e))
- More consistent debug events for Providers. ([e8f28b5](https://github.com/ethers-io/ethers.js/commit/e8f28b55d7dd62e29f03628232ffe7c75dc811b5))

ethers/v5.0.0-beta.148 (2019-07-27 18:56)
-----------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion packages/abi/_version.d.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export declare const version = "5.0.0-beta.134";
export declare const version = "5.0.0-beta.135";
2 changes: 1 addition & 1 deletion packages/abi/_version.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.version = "5.0.0-beta.134";
exports.version = "5.0.0-beta.135";
30 changes: 8 additions & 22 deletions packages/abi/abi-coder.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
"use strict";
var __importStar = (this && this.__importStar) || function (mod) {
if (mod && mod.__esModule) return mod;
var result = {};
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
result["default"] = mod;
return result;
};
Object.defineProperty(exports, "__esModule", { value: true });
// See: https://github.com/ethereum/wiki/wiki/Ethereum-Contract-ABI
var bytes_1 = require("@ethersproject/bytes");
var errors = __importStar(require("@ethersproject/errors"));
var properties_1 = require("@ethersproject/properties");
var logger_1 = require("@ethersproject/logger");
var _version_1 = require("./_version");
var logger = new logger_1.Logger(_version_1.version);
var abstract_coder_1 = require("./coders/abstract-coder");
var address_1 = require("./coders/address");
var array_1 = require("./coders/array");
Expand All @@ -27,7 +22,7 @@ var paramTypeNumber = new RegExp(/^(u?int)([0-9]*)$/);
var AbiCoder = /** @class */ (function () {
function AbiCoder(coerceFunc) {
var _newTarget = this.constructor;
errors.checkNew(_newTarget, AbiCoder);
logger.checkNew(_newTarget, AbiCoder);
properties_1.defineReadOnly(this, "coerceFunc", coerceFunc || null);
}
AbiCoder.prototype._getCoder = function (param) {
Expand Down Expand Up @@ -55,10 +50,7 @@ var AbiCoder = /** @class */ (function () {
if (match) {
var size = parseInt(match[2] || "256");
if (size === 0 || size > 256 || (size % 8) !== 0) {
errors.throwError("invalid " + match[1] + " bit length", errors.INVALID_ARGUMENT, {
arg: "param",
value: param
});
logger.throwArgumentError("invalid " + match[1] + " bit length", "param", param);
}
return new number_1.NumberCoder(size / 8, (match[1] === "int"), param.name);
}
Expand All @@ -67,17 +59,11 @@ var AbiCoder = /** @class */ (function () {
if (match) {
var size = parseInt(match[1]);
if (size === 0 || size > 32) {
errors.throwError("invalid bytes length", errors.INVALID_ARGUMENT, {
arg: "param",
value: param
});
logger.throwArgumentError("invalid bytes length", "param", param);
}
return new fixed_bytes_1.FixedBytesCoder(size, param.name);
}
return errors.throwError("invalid type", errors.INVALID_ARGUMENT, {
arg: "type",
value: param.type
});
return logger.throwError("invalid type", "type", param.type);
};
AbiCoder.prototype._getWordSize = function () { return 32; };
AbiCoder.prototype._getReader = function (data) {
Expand All @@ -89,7 +75,7 @@ var AbiCoder = /** @class */ (function () {
AbiCoder.prototype.encode = function (types, values) {
var _this = this;
if (types.length !== values.length) {
errors.throwError("types/values length mismatch", errors.INVALID_ARGUMENT, {
logger.throwError("types/values length mismatch", logger_1.Logger.errors.INVALID_ARGUMENT, {
count: { types: types.length, values: values.length },
value: { types: types, values: values }
});
Expand Down
21 changes: 6 additions & 15 deletions packages/abi/coders/abstract-coder.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
"use trict";
"use strict";
var __importStar = (this && this.__importStar) || function (mod) {
if (mod && mod.__esModule) return mod;
var result = {};
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
result["default"] = mod;
return result;
};
Object.defineProperty(exports, "__esModule", { value: true });
var bytes_1 = require("@ethersproject/bytes");
var bignumber_1 = require("@ethersproject/bignumber");
var errors = __importStar(require("@ethersproject/errors"));
var properties_1 = require("@ethersproject/properties");
var logger_1 = require("@ethersproject/logger");
var _version_1 = require("../_version");
var logger = new logger_1.Logger(_version_1.version);
var Coder = /** @class */ (function () {
function Coder(name, type, localName, dynamic) {
this.name = name;
Expand All @@ -20,11 +15,7 @@ var Coder = /** @class */ (function () {
this.dynamic = dynamic;
}
Coder.prototype._throwError = function (message, value) {
errors.throwError(message, errors.INVALID_ARGUMENT, {
argument: this.localName,
coder: this,
value: value
});
logger.throwArgumentError(message, this.localName, value);
};
return Coder;
}());
Expand Down Expand Up @@ -60,7 +51,7 @@ var Writer = /** @class */ (function () {
Writer.prototype._getValue = function (value) {
var bytes = bytes_1.arrayify(bignumber_1.BigNumber.from(value));
if (bytes.length > this.wordSize) {
errors.throwError("value out-of-bounds", errors.BUFFER_OVERRUN, {
logger.throwError("value out-of-bounds", logger_1.Logger.errors.BUFFER_OVERRUN, {
length: this.wordSize,
offset: bytes.length
});
Expand Down Expand Up @@ -119,7 +110,7 @@ var Reader = /** @class */ (function () {
Reader.prototype._peekBytes = function (offset, length) {
var alignedLength = Math.ceil(length / this.wordSize) * this.wordSize;
if (this._offset + alignedLength > this._data.length) {
errors.throwError("data out-of-bounds", errors.BUFFER_OVERRUN, {
logger.throwError("data out-of-bounds", logger_1.Logger.errors.BUFFER_OVERRUN, {
length: this._data.length,
offset: this._offset + alignedLength
});
Expand Down
23 changes: 6 additions & 17 deletions packages/abi/coders/array.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,10 @@ var __extends = (this && this.__extends) || (function () {
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
})();
var __importStar = (this && this.__importStar) || function (mod) {
if (mod && mod.__esModule) return mod;
var result = {};
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
result["default"] = mod;
return result;
};
Object.defineProperty(exports, "__esModule", { value: true });
var errors = __importStar(require("@ethersproject/errors"));
var logger_1 = require("@ethersproject/logger");
var _version_1 = require("../_version");
var logger = new logger_1.Logger(_version_1.version);
var abstract_coder_1 = require("./abstract-coder");
var anonymous_1 = require("./anonymous");
function pack(writer, coders, values) {
Expand All @@ -35,16 +30,10 @@ function pack(writer, coders, values) {
values = arrayValues_1;
}
else {
errors.throwError("invalid tuple value", errors.INVALID_ARGUMENT, {
coderType: "tuple",
value: values
});
logger.throwArgumentError("invalid tuple value", "tuple", values);
}
if (coders.length !== values.length) {
errors.throwError("types/value length mismatch", errors.INVALID_ARGUMENT, {
coderType: "tuple",
value: values
});
logger.throwArgumentError("types/value length mismatch", "tuple", values);
}
var staticWriter = new abstract_coder_1.Writer(writer.wordSize);
var dynamicWriter = new abstract_coder_1.Writer(writer.wordSize);
Expand Down Expand Up @@ -135,7 +124,7 @@ var ArrayCoder = /** @class */ (function (_super) {
count = value.length;
writer.writeValue(value.length);
}
errors.checkArgumentCount(count, value.length, " in coder array" + (this.localName ? (" " + this.localName) : ""));
logger.checkArgumentCount(count, value.length, "coder array" + (this.localName ? (" " + this.localName) : ""));
var coders = [];
for (var i = 0; i < value.length; i++) {
coders.push(this.coder);
Expand Down
27 changes: 11 additions & 16 deletions packages/abi/fragments.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,12 @@ var __extends = (this && this.__extends) || (function () {
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
})();
var __importStar = (this && this.__importStar) || function (mod) {
if (mod && mod.__esModule) return mod;
var result = {};
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
result["default"] = mod;
return result;
};
Object.defineProperty(exports, "__esModule", { value: true });
var bignumber_1 = require("@ethersproject/bignumber");
var errors = __importStar(require("@ethersproject/errors"));
var properties_1 = require("@ethersproject/properties");
var logger_1 = require("@ethersproject/logger");
var _version_1 = require("./_version");
var logger = new logger_1.Logger(_version_1.version);
;
var _constructorGuard = {};
var ModifiersBytes = { calldata: true, memory: true, storage: true };
Expand All @@ -38,7 +33,7 @@ function checkModifier(type, name) {
}
}
if (ModifiersBytes[name] || name === "payable") {
errors.throwArgumentError("invalid modifier", "name", name);
logger.throwArgumentError("invalid modifier", "name", name);
}
return false;
}
Expand Down Expand Up @@ -253,7 +248,7 @@ var ParamType = /** @class */ (function () {
format = exports.FormatTypes.sighash;
}
if (!exports.FormatTypes[format]) {
errors.throwArgumentError("invalid format type", "format", format);
logger.throwArgumentError("invalid format type", "format", format);
}
if (format === exports.FormatTypes.json) {
var result_1 = {
Expand Down Expand Up @@ -368,7 +363,7 @@ var Fragment = /** @class */ (function () {
// @TODO:
return null;
}
return errors.throwArgumentError("invalid fragment object", "value", value);
return logger.throwArgumentError("invalid fragment object", "value", value);
};
Fragment.fromString = function (value) {
// Make sure the "returns" is surrounded by a space and all whitespace is exactly one space
Expand Down Expand Up @@ -402,7 +397,7 @@ var EventFragment = /** @class */ (function (_super) {
format = exports.FormatTypes.sighash;
}
if (!exports.FormatTypes[format]) {
errors.throwArgumentError("invalid format type", "format", format);
logger.throwArgumentError("invalid format type", "format", format);
}
if (format === exports.FormatTypes.json) {
return JSON.stringify({
Expand Down Expand Up @@ -458,7 +453,7 @@ var EventFragment = /** @class */ (function (_super) {
case "":
break;
default:
errors.warn("unknown modifier: " + modifier);
logger.warn("unknown modifier: " + modifier);
}
});
return EventFragment.fromObject({
Expand Down Expand Up @@ -565,7 +560,7 @@ var ConstructorFragment = /** @class */ (function (_super) {
format = exports.FormatTypes.sighash;
}
if (!exports.FormatTypes[format]) {
errors.throwArgumentError("invalid format type", "format", format);
logger.throwArgumentError("invalid format type", "format", format);
}
if (format === exports.FormatTypes.json) {
return JSON.stringify({
Expand All @@ -577,7 +572,7 @@ var ConstructorFragment = /** @class */ (function (_super) {
});
}
if (format === exports.FormatTypes.sighash) {
errors.throwError("cannot format a constructor for sighash", errors.UNSUPPORTED_OPERATION, {
logger.throwError("cannot format a constructor for sighash", logger_1.Logger.errors.UNSUPPORTED_OPERATION, {
operation: "format(sighash)"
});
}
Expand Down Expand Up @@ -641,7 +636,7 @@ var FunctionFragment = /** @class */ (function (_super) {
format = exports.FormatTypes.sighash;
}
if (!exports.FormatTypes[format]) {
errors.throwArgumentError("invalid format type", "format", format);
logger.throwArgumentError("invalid format type", "format", format);
}
if (format === exports.FormatTypes.json) {
return JSON.stringify({
Expand Down
29 changes: 12 additions & 17 deletions packages/abi/interface.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,18 @@ var __extends = (this && this.__extends) || (function () {
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
})();
var __importStar = (this && this.__importStar) || function (mod) {
if (mod && mod.__esModule) return mod;
var result = {};
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
result["default"] = mod;
return result;
};
Object.defineProperty(exports, "__esModule", { value: true });
var address_1 = require("@ethersproject/address");
var bignumber_1 = require("@ethersproject/bignumber");
var bytes_1 = require("@ethersproject/bytes");
var hash_1 = require("@ethersproject/hash");
var keccak256_1 = require("@ethersproject/keccak256");
var errors = __importStar(require("@ethersproject/errors"));
var properties_1 = require("@ethersproject/properties");
var abi_coder_1 = require("./abi-coder");
var fragments_1 = require("./fragments");
var logger_1 = require("@ethersproject/logger");
var _version_1 = require("./_version");
var logger = new logger_1.Logger(_version_1.version);
var LogDescription = /** @class */ (function (_super) {
__extends(LogDescription, _super);
function LogDescription() {
Expand Down Expand Up @@ -66,7 +61,7 @@ var Interface = /** @class */ (function () {
function Interface(fragments) {
var _newTarget = this.constructor;
var _this = this;
errors.checkNew(_newTarget, Interface);
logger.checkNew(_newTarget, Interface);
var abi = [];
if (typeof (fragments) === "string") {
abi = JSON.parse(fragments);
Expand All @@ -88,7 +83,7 @@ var Interface = /** @class */ (function () {
switch (fragment.type) {
case "constructor":
if (_this.deploy) {
errors.warn("duplicate definition - constructor");
logger.warn("duplicate definition - constructor");
return;
}
properties_1.defineReadOnly(_this, "deploy", fragment);
Expand All @@ -104,7 +99,7 @@ var Interface = /** @class */ (function () {
}
var signature = fragment.format();
if (bucket[signature]) {
errors.warn("duplicate definition - " + signature);
logger.warn("duplicate definition - " + signature);
return;
}
bucket[signature] = fragment;
Expand All @@ -115,7 +110,7 @@ var Interface = /** @class */ (function () {
Object.keys(bucket).forEach(function (signature) {
var fragment = bucket[signature];
if (count[fragment.name] !== 1) {
errors.warn("duplicate definition - " + fragment.name);
logger.warn("duplicate definition - " + fragment.name);
return;
}
bucket[fragment.name] = fragment;
Expand Down Expand Up @@ -208,7 +203,7 @@ var Interface = /** @class */ (function () {
}
break;
}
return errors.throwError("call revert exception", errors.CALL_EXCEPTION, {
return logger.throwError("call revert exception", logger_1.Logger.errors.CALL_EXCEPTION, {
method: functionFragment.format(),
errorSignature: errorSignature,
errorArgs: [reason],
Expand All @@ -221,7 +216,7 @@ var Interface = /** @class */ (function () {
eventFragment = this.getEvent(eventFragment);
}
if (values.length > eventFragment.inputs.length) {
errors.throwError("too many arguments for " + eventFragment.format(), errors.UNEXPECTED_ARGUMENT, {
logger.throwError("too many arguments for " + eventFragment.format(), logger_1.Logger.errors.UNEXPECTED_ARGUMENT, {
argument: "values",
value: values
});
Expand All @@ -234,7 +229,7 @@ var Interface = /** @class */ (function () {
var param = eventFragment.inputs[index];
if (!param.indexed) {
if (value != null) {
errors.throwArgumentError("cannot filter non-indexed parameters; must be null", ("contract." + param.name), value);
logger.throwArgumentError("cannot filter non-indexed parameters; must be null", ("contract." + param.name), value);
}
return;
}
Expand All @@ -248,7 +243,7 @@ var Interface = /** @class */ (function () {
topics.push(keccak256_1.keccak256(bytes_1.hexlify(value)));
}
else if (param.type.indexOf("[") !== -1 || param.type.substring(0, 5) === "tuple") {
errors.throwArgumentError("filtering with tuples or arrays not supported", ("contract." + param.name), value);
logger.throwArgumentError("filtering with tuples or arrays not supported", ("contract." + param.name), value);
}
else {
// Check addresses are valid
Expand All @@ -271,7 +266,7 @@ var Interface = /** @class */ (function () {
if (topics != null && !eventFragment.anonymous) {
var topicHash = this.getEventTopic(eventFragment);
if (!bytes_1.isHexString(topics[0], 32) || topics[0].toLowerCase() !== topicHash) {
errors.throwError("fragment/topic mismatch", errors.INVALID_ARGUMENT, { argument: "topics[0]", expected: topicHash, value: topics[0] });
logger.throwError("fragment/topic mismatch", logger_1.Logger.errors.INVALID_ARGUMENT, { argument: "topics[0]", expected: topicHash, value: topics[0] });
}
topics = topics.slice(1);
}
Expand Down
Loading

0 comments on commit 8354c3f

Please sign in to comment.