viem 1.19.14 → 1.19.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +6 -0
- package/_cjs/errors/abi.js +21 -1
- package/_cjs/errors/abi.js.map +1 -1
- package/_cjs/utils/abi/getAbiItem.js +46 -3
- package/_cjs/utils/abi/getAbiItem.js.map +1 -1
- package/_esm/errors/abi.js +19 -0
- package/_esm/errors/abi.js.map +1 -1
- package/_esm/utils/abi/getAbiItem.js +46 -2
- package/_esm/utils/abi/getAbiItem.js.map +1 -1
- package/_types/errors/abi.d.ts +14 -1
- package/_types/errors/abi.d.ts.map +1 -1
- package/_types/utils/abi/getAbiItem.d.ts +2 -1
- package/_types/utils/abi/getAbiItem.d.ts.map +1 -1
- package/errors/abi.ts +22 -1
- package/package.json +1 -1
- package/utils/abi/getAbiItem.ts +77 -4
package/CHANGELOG.md
CHANGED
@@ -1,5 +1,11 @@
|
|
1
1
|
# viem
|
2
2
|
|
3
|
+
## 1.19.15
|
4
|
+
|
5
|
+
### Patch Changes
|
6
|
+
|
7
|
+
- [#1586](https://github.com/wevm/viem/pull/1586) [`f9bfa727`](https://github.com/wevm/viem/commit/f9bfa727671452c46df7db4837457d1d9296b8c8) Thanks [@jxom](https://github.com/jxom)! - Fixed an issue where Viem could extract the wrong ABI item if ambiguity is detected within overload ABI items. Now, if ambiguity is detected, an error will be thrown.
|
8
|
+
|
3
9
|
## 1.19.14
|
4
10
|
|
5
11
|
### Patch Changes
|
package/_cjs/errors/abi.js
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.UnsupportedPackedAbiType = exports.InvalidDefinitionTypeError = exports.InvalidArrayError = exports.InvalidAbiDecodingTypeError = exports.InvalidAbiEncodingTypeError = exports.DecodeLogTopicsMismatch = exports.DecodeLogDataMismatch = exports.BytesSizeMismatchError = exports.AbiFunctionSignatureNotFoundError = exports.AbiFunctionOutputsNotFoundError = exports.AbiFunctionNotFoundError = exports.AbiEventNotFoundError = exports.AbiEventSignatureNotFoundError = exports.AbiEventSignatureEmptyTopicsError = exports.AbiErrorSignatureNotFoundError = exports.AbiErrorNotFoundError = exports.AbiErrorInputsNotFoundError = exports.AbiEncodingLengthMismatchError = exports.AbiEncodingBytesSizeMismatchError = exports.AbiEncodingArrayLengthMismatchError = exports.AbiDecodingZeroDataError = exports.AbiDecodingDataSizeTooSmallError = exports.AbiDecodingDataSizeInvalidError = exports.AbiConstructorParamsNotFoundError = exports.AbiConstructorNotFoundError = void 0;
|
3
|
+
exports.UnsupportedPackedAbiType = exports.InvalidDefinitionTypeError = exports.InvalidArrayError = exports.InvalidAbiDecodingTypeError = exports.InvalidAbiEncodingTypeError = exports.DecodeLogTopicsMismatch = exports.DecodeLogDataMismatch = exports.BytesSizeMismatchError = exports.AbiItemAmbiguityError = exports.AbiFunctionSignatureNotFoundError = exports.AbiFunctionOutputsNotFoundError = exports.AbiFunctionNotFoundError = exports.AbiEventNotFoundError = exports.AbiEventSignatureNotFoundError = exports.AbiEventSignatureEmptyTopicsError = exports.AbiErrorSignatureNotFoundError = exports.AbiErrorNotFoundError = exports.AbiErrorInputsNotFoundError = exports.AbiEncodingLengthMismatchError = exports.AbiEncodingBytesSizeMismatchError = exports.AbiEncodingArrayLengthMismatchError = exports.AbiDecodingZeroDataError = exports.AbiDecodingDataSizeTooSmallError = exports.AbiDecodingDataSizeInvalidError = exports.AbiConstructorParamsNotFoundError = exports.AbiConstructorNotFoundError = void 0;
|
4
4
|
const formatAbiItem_js_1 = require("../utils/abi/formatAbiItem.js");
|
5
5
|
const size_js_1 = require("../utils/data/size.js");
|
6
6
|
const base_js_1 = require("./base.js");
|
@@ -309,6 +309,26 @@ class AbiFunctionSignatureNotFoundError extends base_js_1.BaseError {
|
|
309
309
|
}
|
310
310
|
}
|
311
311
|
exports.AbiFunctionSignatureNotFoundError = AbiFunctionSignatureNotFoundError;
|
312
|
+
class AbiItemAmbiguityError extends base_js_1.BaseError {
|
313
|
+
constructor(x, y) {
|
314
|
+
super('Found ambiguous types in overloaded ABI items.', {
|
315
|
+
metaMessages: [
|
316
|
+
`\`${x.type}\` in \`${(0, formatAbiItem_js_1.formatAbiItem)(x.abiItem)}\`, and`,
|
317
|
+
`\`${y.type}\` in \`${(0, formatAbiItem_js_1.formatAbiItem)(y.abiItem)}\``,
|
318
|
+
'',
|
319
|
+
'These types encode differently and cannot be distinguished at runtime.',
|
320
|
+
'Remove one of the ambiguous items in the ABI.',
|
321
|
+
],
|
322
|
+
});
|
323
|
+
Object.defineProperty(this, "name", {
|
324
|
+
enumerable: true,
|
325
|
+
configurable: true,
|
326
|
+
writable: true,
|
327
|
+
value: 'AbiItemAmbiguityError'
|
328
|
+
});
|
329
|
+
}
|
330
|
+
}
|
331
|
+
exports.AbiItemAmbiguityError = AbiItemAmbiguityError;
|
312
332
|
class BytesSizeMismatchError extends base_js_1.BaseError {
|
313
333
|
constructor({ expectedSize, givenSize, }) {
|
314
334
|
super(`Expected bytes${expectedSize}, got bytes${givenSize}.`);
|
package/_cjs/errors/abi.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"abi.js","sourceRoot":"","sources":["../../errors/abi.ts"],"names":[],"mappings":";;;AAGA,oEAA8E;AAC9E,mDAA4C;AAE5C,uCAAqC;AAKrC,MAAa,2BAA4B,SAAQ,mBAAS;IAExD,YAAY,EAAE,QAAQ,EAAwB;QAC5C,KAAK,CACH;YACE,yCAAyC;YACzC,gFAAgF;SACjF,CAAC,IAAI,CAAC,IAAI,CAAC,EACZ;YACE,QAAQ;SACT,CACF,CAAA;QAVM;;;;mBAAO,6BAA6B;WAAA;IAW7C,CAAC;CACF;AAbD,kEAaC;AAOD,MAAa,iCAAkC,SAAQ,mBAAS;IAE9D,YAAY,EAAE,QAAQ,EAAwB;QAC5C,KAAK,CACH;YACE,kHAAkH;YAClH,qGAAqG;SACtG,CAAC,IAAI,CAAC,IAAI,CAAC,EACZ;YACE,QAAQ;SACT,CACF,CAAA;QAVM;;;;mBAAO,mCAAmC;WAAA;IAWnD,CAAC;CACF;AAbD,8EAaC;AAMD,MAAa,+BAAgC,SAAQ,mBAAS;IAE5D,YAAY,EAAE,IAAI,EAAE,IAAI,EAA+B;QACrD,KAAK,CACH;YACE,gBAAgB,IAAI,oBAAoB;YACxC,2DAA2D;SAC5D,CAAC,IAAI,CAAC,IAAI,CAAC,EACZ,EAAE,YAAY,EAAE,CAAC,SAAS,IAAI,KAAK,IAAI,SAAS,CAAC,EAAE,CACpD,CAAA;QARM;;;;mBAAO,iCAAiC;WAAA;IASjD,CAAC;CACF;AAXD,0EAWC;AAMD,MAAa,gCAAiC,SAAQ,mBAAS;IAO7D,YAAY,EACV,IAAI,EACJ,MAAM,EACN,IAAI,GACyD;QAC7D,KAAK,CACH,CAAC,gBAAgB,IAAI,2CAA2C,CAAC,CAAC,IAAI,CACpE,IAAI,CACL,EACD;YACE,YAAY,EAAE;gBACZ,YAAY,IAAA,kCAAe,EAAC,MAAM,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,GAAG;gBAC7D,WAAW,IAAI,KAAK,IAAI,SAAS;aAClC;SACF,CACF,CAAA;QArBM;;;;mBAAO,kCAAkC;WAAA;QAElD;;;;;WAAS;QACT;;;;;WAA+B;QAC/B;;;;;WAAY;QAmBV,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;IAClB,CAAC;CACF;AA5BD,4EA4BC;AAKD,MAAa,wBAAyB,SAAQ,mBAAS;IAErD;QACE,KAAK,CAAC,qDAAqD,CAAC,CAAA;QAFrD;;;;mBAAO,0BAA0B;WAAA;IAG1C,CAAC;CACF;AALD,4DAKC;AAMD,MAAa,mCAAoC,SAAQ,mBAAS;IAEhE,YAAY,EACV,cAAc,EACd,WAAW,EACX,IAAI,GAC0D;QAC9D,KAAK,CACH;YACE,+CAA+C,IAAI,GAAG;YACtD,oBAAoB,cAAc,EAAE;YACpC,iBAAiB,WAAW,EAAE;SAC/B,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAA;QAZM;;;;mBAAO,qCAAqC;WAAA;IAarD,CAAC;CACF;AAfD,kFAeC;AAMD,MAAa,iCAAkC,SAAQ,mBAAS;IAE9D,YAAY,EAAE,YAAY,EAAE,KAAK,EAAwC;QACvE,KAAK,CACH,kBAAkB,KAAK,WAAW,IAAA,cAAI,EACpC,KAAK,CACN,wCAAwC,YAAY,IAAI,CAC1D,CAAA;QANM;;;;mBAAO,mCAAmC;WAAA;IAOnD,CAAC;CACF;AATD,8EASC;AAMD,MAAa,8BAA+B,SAAQ,mBAAS;IAE3D,YAAY,EACV,cAAc,EACd,WAAW,GACqC;QAChD,KAAK,CACH;YACE,6CAA6C;YAC7C,6BAA6B,cAAc,EAAE;YAC7C,0BAA0B,WAAW,EAAE;SACxC,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAA;QAXM;;;;mBAAO,gCAAgC;WAAA;IAYhD,CAAC;CACF;AAdD,wEAcC;AAKD,MAAa,2BAA4B,SAAQ,mBAAS;IAExD,YAAY,SAAiB,EAAE,EAAE,QAAQ,EAAwB;QAC/D,KAAK,CACH;YACE,0CAA0C,SAAS,WAAW,SAAS,4DAA4D;YACnI,0EAA0E;YAC1E,0EAA0E;SAC3E,CAAC,IAAI,CAAC,IAAI,CAAC,EACZ;YACE,QAAQ;SACT,CACF,CAAA;QAXM;;;;mBAAO,6BAA6B;WAAA;IAY7C,CAAC;CACF;AAdD,kEAcC;AAKD,MAAa,qBAAsB,SAAQ,mBAAS;IAElD,YAAY,SAAkB,EAAE,EAAE,QAAQ,KAA4B,EAAE;QACtE,KAAK,CACH;YACE,SAAS,SAAS,CAAC,CAAC,CAAC,IAAI,SAAS,IAAI,CAAC,CAAC,CAAC,EAAE,mBAAmB;YAC9D,0EAA0E;SAC3E,CAAC,IAAI,CAAC,IAAI,CAAC,EACZ;YACE,QAAQ;SACT,CACF,CAAA;QAVM;;;;mBAAO,uBAAuB;WAAA;IAWvC,CAAC;CACF;AAbD,sDAaC;AAMD,MAAa,8BAA+B,SAAQ,mBAAS;IAK3D,YAAY,SAAc,EAAE,EAAE,QAAQ,EAAwB;QAC5D,KAAK,CACH;YACE,4BAA4B,SAAS,qBAAqB;YAC1D,0EAA0E;YAC1E,sFAAsF,SAAS,GAAG;SACnG,CAAC,IAAI,CAAC,IAAI,CAAC,EACZ;YACE,QAAQ;SACT,CACF,CAAA;QAdM;;;;mBAAO,gCAAgC;WAAA;QAEhD;;;;;WAAc;QAaZ,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;IAC5B,CAAC;CACF;AAlBD,wEAkBC;AAMD,MAAa,iCAAkC,SAAQ,mBAAS;IAE9D,YAAY,EAAE,QAAQ,EAAwB;QAC5C,KAAK,CAAC,mDAAmD,EAAE;YACzD,QAAQ;SACT,CAAC,CAAA;QAJK;;;;mBAAO,mCAAmC;WAAA;IAKnD,CAAC;CACF;AAPD,8EAOC;AAMD,MAAa,8BAA+B,SAAQ,mBAAS;IAE3D,YAAY,SAAc,EAAE,EAAE,QAAQ,EAAwB;QAC5D,KAAK,CACH;YACE,4BAA4B,SAAS,qBAAqB;YAC1D,0EAA0E;YAC1E,8EAA8E,SAAS,GAAG;SAC3F,CAAC,IAAI,CAAC,IAAI,CAAC,EACZ;YACE,QAAQ;SACT,CACF,CAAA;QAXM;;;;mBAAO,gCAAgC;WAAA;IAYhD,CAAC;CACF;AAdD,wEAcC;AAKD,MAAa,qBAAsB,SAAQ,mBAAS;IAElD,YAAY,SAAkB,EAAE,EAAE,QAAQ,KAA4B,EAAE;QACtE,KAAK,CACH;YACE,SAAS,SAAS,CAAC,CAAC,CAAC,IAAI,SAAS,IAAI,CAAC,CAAC,CAAC,EAAE,mBAAmB;YAC9D,0EAA0E;SAC3E,CAAC,IAAI,CAAC,IAAI,CAAC,EACZ;YACE,QAAQ;SACT,CACF,CAAA;QAVM;;;;mBAAO,uBAAuB;WAAA;IAWvC,CAAC;CACF;AAbD,sDAaC;AAKD,MAAa,wBAAyB,SAAQ,mBAAS;IAErD,YAAY,YAAqB,EAAE,EAAE,QAAQ,KAA4B,EAAE;QACzE,KAAK,CACH;YACE,YAAY,YAAY,CAAC,CAAC,CAAC,IAAI,YAAY,IAAI,CAAC,CAAC,CAAC,EAAE,mBAAmB;YACvE,6EAA6E;SAC9E,CAAC,IAAI,CAAC,IAAI,CAAC,EACZ;YACE,QAAQ;SACT,CACF,CAAA;QAVM;;;;mBAAO,0BAA0B;WAAA;IAW1C,CAAC;CACF;AAbD,4DAaC;AAMD,MAAa,+BAAgC,SAAQ,mBAAS;IAE5D,YAAY,YAAoB,EAAE,EAAE,QAAQ,EAAwB;QAClE,KAAK,CACH;YACE,aAAa,YAAY,4CAA4C;YACrE,6EAA6E;YAC7E,6EAA6E;SAC9E,CAAC,IAAI,CAAC,IAAI,CAAC,EACZ;YACE,QAAQ;SACT,CACF,CAAA;QAXM;;;;mBAAO,iCAAiC;WAAA;IAYjD,CAAC;CACF;AAdD,0EAcC;AAMD,MAAa,iCAAkC,SAAQ,mBAAS;IAE9D,YAAY,SAAc,EAAE,EAAE,QAAQ,EAAwB;QAC5D,KAAK,CACH;YACE,+BAA+B,SAAS,qBAAqB;YAC7D,6EAA6E;YAC7E,8EAA8E,SAAS,GAAG;SAC3F,CAAC,IAAI,CAAC,IAAI,CAAC,EACZ;YACE,QAAQ;SACT,CACF,CAAA;QAXM;;;;mBAAO,mCAAmC;WAAA;IAYnD,CAAC;CACF;AAdD,8EAcC;AAKD,MAAa,sBAAuB,SAAQ,mBAAS;IAEnD,YAAY,EACV,YAAY,EACZ,SAAS,GACmC;QAC5C,KAAK,CAAC,iBAAiB,YAAY,cAAc,SAAS,GAAG,CAAC,CAAA;QALvD;;;;mBAAO,wBAAwB;WAAA;IAMxC,CAAC;CACF;AARD,wDAQC;AAKD,MAAa,qBAAsB,SAAQ,mBAAS;IAQlD,YAAY,EACV,OAAO,EACP,IAAI,EACJ,MAAM,EACN,IAAI,GAML;QACC,KAAK,CACH;YACE,gBAAgB,IAAI,uDAAuD;SAC5E,CAAC,IAAI,CAAC,IAAI,CAAC,EACZ;YACE,YAAY,EAAE;gBACZ,YAAY,IAAA,kCAAe,EAAC,MAAM,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,GAAG;gBAC7D,WAAW,IAAI,KAAK,IAAI,SAAS;aAClC;SACF,CACF,CAAA;QA5BM;;;;mBAAO,uBAAuB;WAAA;QAEvC;;;;;WAAiB;QACjB;;;;;WAAS;QACT;;;;;WAA+B;QAC/B;;;;;WAAY;QAyBV,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;IAClB,CAAC;CACF;AApCD,sDAoCC;AAKD,MAAa,uBAAwB,SAAQ,mBAAS;IAKpD,YAAY,EACV,OAAO,EACP,KAAK,GAIN;QACC,KAAK,CACH;YACE,+CACE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,EACpC,cAAc,IAAA,gCAAa,EAAC,OAAO,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,IAAI;SAChE,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAA;QAjBM;;;;mBAAO,yBAAyB;WAAA;QAEzC;;;;;WAAiB;QAiBf,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;CACF;AAtBD,0DAsBC;AAKD,MAAa,2BAA4B,SAAQ,mBAAS;IAExD,YAAY,IAAY,EAAE,EAAE,QAAQ,EAAwB;QAC1D,KAAK,CACH;YACE,SAAS,IAAI,iCAAiC;YAC9C,kCAAkC;SACnC,CAAC,IAAI,CAAC,IAAI,CAAC,EACZ,EAAE,QAAQ,EAAE,CACb,CAAA;QARM;;;;mBAAO,wBAAwB;WAAA;IASxC,CAAC;CACF;AAXD,kEAWC;AAKD,MAAa,2BAA4B,SAAQ,mBAAS;IAExD,YAAY,IAAY,EAAE,EAAE,QAAQ,EAAwB;QAC1D,KAAK,CACH;YACE,SAAS,IAAI,iCAAiC;YAC9C,kCAAkC;SACnC,CAAC,IAAI,CAAC,IAAI,CAAC,EACZ,EAAE,QAAQ,EAAE,CACb,CAAA;QARM;;;;mBAAO,wBAAwB;WAAA;IASxC,CAAC;CACF;AAXD,kEAWC;AAKD,MAAa,iBAAkB,SAAQ,mBAAS;IAE9C,YAAY,KAAc;QACxB,KAAK,CAAC,CAAC,UAAU,KAAK,yBAAyB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QAFrD;;;;mBAAO,mBAAmB;WAAA;IAGnC,CAAC;CACF;AALD,8CAKC;AAKD,MAAa,0BAA2B,SAAQ,mBAAS;IAEvD,YAAY,IAAY;QACtB,KAAK,CACH;YACE,IAAI,IAAI,mCAAmC;YAC3C,2CAA2C;SAC5C,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAA;QAPM;;;;mBAAO,4BAA4B;WAAA;IAQ5C,CAAC;CACF;AAVD,gEAUC;AAKD,MAAa,wBAAyB,SAAQ,mBAAS;IAErD,YAAY,IAAa;QACvB,KAAK,CAAC,SAAS,IAAI,yCAAyC,CAAC,CAAA;QAFtD;;;;mBAAO,0BAA0B;WAAA;IAG1C,CAAC;CACF;AALD,4DAKC"}
|
1
|
+
{"version":3,"file":"abi.js","sourceRoot":"","sources":["../../errors/abi.ts"],"names":[],"mappings":";;;AAGA,oEAA8E;AAC9E,mDAA4C;AAE5C,uCAAqC;AAKrC,MAAa,2BAA4B,SAAQ,mBAAS;IAExD,YAAY,EAAE,QAAQ,EAAwB;QAC5C,KAAK,CACH;YACE,yCAAyC;YACzC,gFAAgF;SACjF,CAAC,IAAI,CAAC,IAAI,CAAC,EACZ;YACE,QAAQ;SACT,CACF,CAAA;QAVM;;;;mBAAO,6BAA6B;WAAA;IAW7C,CAAC;CACF;AAbD,kEAaC;AAOD,MAAa,iCAAkC,SAAQ,mBAAS;IAE9D,YAAY,EAAE,QAAQ,EAAwB;QAC5C,KAAK,CACH;YACE,kHAAkH;YAClH,qGAAqG;SACtG,CAAC,IAAI,CAAC,IAAI,CAAC,EACZ;YACE,QAAQ;SACT,CACF,CAAA;QAVM;;;;mBAAO,mCAAmC;WAAA;IAWnD,CAAC;CACF;AAbD,8EAaC;AAMD,MAAa,+BAAgC,SAAQ,mBAAS;IAE5D,YAAY,EAAE,IAAI,EAAE,IAAI,EAA+B;QACrD,KAAK,CACH;YACE,gBAAgB,IAAI,oBAAoB;YACxC,2DAA2D;SAC5D,CAAC,IAAI,CAAC,IAAI,CAAC,EACZ,EAAE,YAAY,EAAE,CAAC,SAAS,IAAI,KAAK,IAAI,SAAS,CAAC,EAAE,CACpD,CAAA;QARM;;;;mBAAO,iCAAiC;WAAA;IASjD,CAAC;CACF;AAXD,0EAWC;AAMD,MAAa,gCAAiC,SAAQ,mBAAS;IAO7D,YAAY,EACV,IAAI,EACJ,MAAM,EACN,IAAI,GACyD;QAC7D,KAAK,CACH,CAAC,gBAAgB,IAAI,2CAA2C,CAAC,CAAC,IAAI,CACpE,IAAI,CACL,EACD;YACE,YAAY,EAAE;gBACZ,YAAY,IAAA,kCAAe,EAAC,MAAM,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,GAAG;gBAC7D,WAAW,IAAI,KAAK,IAAI,SAAS;aAClC;SACF,CACF,CAAA;QArBM;;;;mBAAO,kCAAkC;WAAA;QAElD;;;;;WAAS;QACT;;;;;WAA+B;QAC/B;;;;;WAAY;QAmBV,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;IAClB,CAAC;CACF;AA5BD,4EA4BC;AAKD,MAAa,wBAAyB,SAAQ,mBAAS;IAErD;QACE,KAAK,CAAC,qDAAqD,CAAC,CAAA;QAFrD;;;;mBAAO,0BAA0B;WAAA;IAG1C,CAAC;CACF;AALD,4DAKC;AAMD,MAAa,mCAAoC,SAAQ,mBAAS;IAEhE,YAAY,EACV,cAAc,EACd,WAAW,EACX,IAAI,GAC0D;QAC9D,KAAK,CACH;YACE,+CAA+C,IAAI,GAAG;YACtD,oBAAoB,cAAc,EAAE;YACpC,iBAAiB,WAAW,EAAE;SAC/B,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAA;QAZM;;;;mBAAO,qCAAqC;WAAA;IAarD,CAAC;CACF;AAfD,kFAeC;AAMD,MAAa,iCAAkC,SAAQ,mBAAS;IAE9D,YAAY,EAAE,YAAY,EAAE,KAAK,EAAwC;QACvE,KAAK,CACH,kBAAkB,KAAK,WAAW,IAAA,cAAI,EACpC,KAAK,CACN,wCAAwC,YAAY,IAAI,CAC1D,CAAA;QANM;;;;mBAAO,mCAAmC;WAAA;IAOnD,CAAC;CACF;AATD,8EASC;AAMD,MAAa,8BAA+B,SAAQ,mBAAS;IAE3D,YAAY,EACV,cAAc,EACd,WAAW,GACqC;QAChD,KAAK,CACH;YACE,6CAA6C;YAC7C,6BAA6B,cAAc,EAAE;YAC7C,0BAA0B,WAAW,EAAE;SACxC,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAA;QAXM;;;;mBAAO,gCAAgC;WAAA;IAYhD,CAAC;CACF;AAdD,wEAcC;AAKD,MAAa,2BAA4B,SAAQ,mBAAS;IAExD,YAAY,SAAiB,EAAE,EAAE,QAAQ,EAAwB;QAC/D,KAAK,CACH;YACE,0CAA0C,SAAS,WAAW,SAAS,4DAA4D;YACnI,0EAA0E;YAC1E,0EAA0E;SAC3E,CAAC,IAAI,CAAC,IAAI,CAAC,EACZ;YACE,QAAQ;SACT,CACF,CAAA;QAXM;;;;mBAAO,6BAA6B;WAAA;IAY7C,CAAC;CACF;AAdD,kEAcC;AAKD,MAAa,qBAAsB,SAAQ,mBAAS;IAElD,YAAY,SAAkB,EAAE,EAAE,QAAQ,KAA4B,EAAE;QACtE,KAAK,CACH;YACE,SAAS,SAAS,CAAC,CAAC,CAAC,IAAI,SAAS,IAAI,CAAC,CAAC,CAAC,EAAE,mBAAmB;YAC9D,0EAA0E;SAC3E,CAAC,IAAI,CAAC,IAAI,CAAC,EACZ;YACE,QAAQ;SACT,CACF,CAAA;QAVM;;;;mBAAO,uBAAuB;WAAA;IAWvC,CAAC;CACF;AAbD,sDAaC;AAMD,MAAa,8BAA+B,SAAQ,mBAAS;IAK3D,YAAY,SAAc,EAAE,EAAE,QAAQ,EAAwB;QAC5D,KAAK,CACH;YACE,4BAA4B,SAAS,qBAAqB;YAC1D,0EAA0E;YAC1E,sFAAsF,SAAS,GAAG;SACnG,CAAC,IAAI,CAAC,IAAI,CAAC,EACZ;YACE,QAAQ;SACT,CACF,CAAA;QAdM;;;;mBAAO,gCAAgC;WAAA;QAEhD;;;;;WAAc;QAaZ,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;IAC5B,CAAC;CACF;AAlBD,wEAkBC;AAMD,MAAa,iCAAkC,SAAQ,mBAAS;IAE9D,YAAY,EAAE,QAAQ,EAAwB;QAC5C,KAAK,CAAC,mDAAmD,EAAE;YACzD,QAAQ;SACT,CAAC,CAAA;QAJK;;;;mBAAO,mCAAmC;WAAA;IAKnD,CAAC;CACF;AAPD,8EAOC;AAMD,MAAa,8BAA+B,SAAQ,mBAAS;IAE3D,YAAY,SAAc,EAAE,EAAE,QAAQ,EAAwB;QAC5D,KAAK,CACH;YACE,4BAA4B,SAAS,qBAAqB;YAC1D,0EAA0E;YAC1E,8EAA8E,SAAS,GAAG;SAC3F,CAAC,IAAI,CAAC,IAAI,CAAC,EACZ;YACE,QAAQ;SACT,CACF,CAAA;QAXM;;;;mBAAO,gCAAgC;WAAA;IAYhD,CAAC;CACF;AAdD,wEAcC;AAKD,MAAa,qBAAsB,SAAQ,mBAAS;IAElD,YAAY,SAAkB,EAAE,EAAE,QAAQ,KAA4B,EAAE;QACtE,KAAK,CACH;YACE,SAAS,SAAS,CAAC,CAAC,CAAC,IAAI,SAAS,IAAI,CAAC,CAAC,CAAC,EAAE,mBAAmB;YAC9D,0EAA0E;SAC3E,CAAC,IAAI,CAAC,IAAI,CAAC,EACZ;YACE,QAAQ;SACT,CACF,CAAA;QAVM;;;;mBAAO,uBAAuB;WAAA;IAWvC,CAAC;CACF;AAbD,sDAaC;AAKD,MAAa,wBAAyB,SAAQ,mBAAS;IAErD,YAAY,YAAqB,EAAE,EAAE,QAAQ,KAA4B,EAAE;QACzE,KAAK,CACH;YACE,YAAY,YAAY,CAAC,CAAC,CAAC,IAAI,YAAY,IAAI,CAAC,CAAC,CAAC,EAAE,mBAAmB;YACvE,6EAA6E;SAC9E,CAAC,IAAI,CAAC,IAAI,CAAC,EACZ;YACE,QAAQ;SACT,CACF,CAAA;QAVM;;;;mBAAO,0BAA0B;WAAA;IAW1C,CAAC;CACF;AAbD,4DAaC;AAMD,MAAa,+BAAgC,SAAQ,mBAAS;IAE5D,YAAY,YAAoB,EAAE,EAAE,QAAQ,EAAwB;QAClE,KAAK,CACH;YACE,aAAa,YAAY,4CAA4C;YACrE,6EAA6E;YAC7E,6EAA6E;SAC9E,CAAC,IAAI,CAAC,IAAI,CAAC,EACZ;YACE,QAAQ;SACT,CACF,CAAA;QAXM;;;;mBAAO,iCAAiC;WAAA;IAYjD,CAAC;CACF;AAdD,0EAcC;AAMD,MAAa,iCAAkC,SAAQ,mBAAS;IAE9D,YAAY,SAAc,EAAE,EAAE,QAAQ,EAAwB;QAC5D,KAAK,CACH;YACE,+BAA+B,SAAS,qBAAqB;YAC7D,6EAA6E;YAC7E,8EAA8E,SAAS,GAAG;SAC3F,CAAC,IAAI,CAAC,IAAI,CAAC,EACZ;YACE,QAAQ;SACT,CACF,CAAA;QAXM;;;;mBAAO,mCAAmC;WAAA;IAYnD,CAAC;CACF;AAdD,8EAcC;AAKD,MAAa,qBAAsB,SAAQ,mBAAS;IAElD,YACE,CAAyC,EACzC,CAAyC;QAEzC,KAAK,CAAC,gDAAgD,EAAE;YACtD,YAAY,EAAE;gBACZ,KAAK,CAAC,CAAC,IAAI,WAAW,IAAA,gCAAa,EAAC,CAAC,CAAC,OAAO,CAAC,SAAS;gBACvD,KAAK,CAAC,CAAC,IAAI,WAAW,IAAA,gCAAa,EAAC,CAAC,CAAC,OAAO,CAAC,IAAI;gBAClD,EAAE;gBACF,wEAAwE;gBACxE,+CAA+C;aAChD;SACF,CAAC,CAAA;QAbK;;;;mBAAO,uBAAuB;WAAA;IAcvC,CAAC;CACF;AAhBD,sDAgBC;AAKD,MAAa,sBAAuB,SAAQ,mBAAS;IAEnD,YAAY,EACV,YAAY,EACZ,SAAS,GACmC;QAC5C,KAAK,CAAC,iBAAiB,YAAY,cAAc,SAAS,GAAG,CAAC,CAAA;QALvD;;;;mBAAO,wBAAwB;WAAA;IAMxC,CAAC;CACF;AARD,wDAQC;AAKD,MAAa,qBAAsB,SAAQ,mBAAS;IAQlD,YAAY,EACV,OAAO,EACP,IAAI,EACJ,MAAM,EACN,IAAI,GAML;QACC,KAAK,CACH;YACE,gBAAgB,IAAI,uDAAuD;SAC5E,CAAC,IAAI,CAAC,IAAI,CAAC,EACZ;YACE,YAAY,EAAE;gBACZ,YAAY,IAAA,kCAAe,EAAC,MAAM,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,GAAG;gBAC7D,WAAW,IAAI,KAAK,IAAI,SAAS;aAClC;SACF,CACF,CAAA;QA5BM;;;;mBAAO,uBAAuB;WAAA;QAEvC;;;;;WAAiB;QACjB;;;;;WAAS;QACT;;;;;WAA+B;QAC/B;;;;;WAAY;QAyBV,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;IAClB,CAAC;CACF;AApCD,sDAoCC;AAKD,MAAa,uBAAwB,SAAQ,mBAAS;IAKpD,YAAY,EACV,OAAO,EACP,KAAK,GAIN;QACC,KAAK,CACH;YACE,+CACE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,EACpC,cAAc,IAAA,gCAAa,EAAC,OAAO,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,IAAI;SAChE,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAA;QAjBM;;;;mBAAO,yBAAyB;WAAA;QAEzC;;;;;WAAiB;QAiBf,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;CACF;AAtBD,0DAsBC;AAKD,MAAa,2BAA4B,SAAQ,mBAAS;IAExD,YAAY,IAAY,EAAE,EAAE,QAAQ,EAAwB;QAC1D,KAAK,CACH;YACE,SAAS,IAAI,iCAAiC;YAC9C,kCAAkC;SACnC,CAAC,IAAI,CAAC,IAAI,CAAC,EACZ,EAAE,QAAQ,EAAE,CACb,CAAA;QARM;;;;mBAAO,wBAAwB;WAAA;IASxC,CAAC;CACF;AAXD,kEAWC;AAKD,MAAa,2BAA4B,SAAQ,mBAAS;IAExD,YAAY,IAAY,EAAE,EAAE,QAAQ,EAAwB;QAC1D,KAAK,CACH;YACE,SAAS,IAAI,iCAAiC;YAC9C,kCAAkC;SACnC,CAAC,IAAI,CAAC,IAAI,CAAC,EACZ,EAAE,QAAQ,EAAE,CACb,CAAA;QARM;;;;mBAAO,wBAAwB;WAAA;IASxC,CAAC;CACF;AAXD,kEAWC;AAKD,MAAa,iBAAkB,SAAQ,mBAAS;IAE9C,YAAY,KAAc;QACxB,KAAK,CAAC,CAAC,UAAU,KAAK,yBAAyB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QAFrD;;;;mBAAO,mBAAmB;WAAA;IAGnC,CAAC;CACF;AALD,8CAKC;AAKD,MAAa,0BAA2B,SAAQ,mBAAS;IAEvD,YAAY,IAAY;QACtB,KAAK,CACH;YACE,IAAI,IAAI,mCAAmC;YAC3C,2CAA2C;SAC5C,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAA;QAPM;;;;mBAAO,4BAA4B;WAAA;IAQ5C,CAAC;CACF;AAVD,gEAUC;AAKD,MAAa,wBAAyB,SAAQ,mBAAS;IAErD,YAAY,IAAa;QACvB,KAAK,CAAC,SAAS,IAAI,yCAAyC,CAAC,CAAA;QAFtD;;;;mBAAO,0BAA0B;WAAA;IAG1C,CAAC;CACF;AALD,4DAKC"}
|
@@ -1,6 +1,7 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.isArgOfType = exports.getAbiItem = void 0;
|
3
|
+
exports.getAmbiguousTypes = exports.isArgOfType = exports.getAbiItem = void 0;
|
4
|
+
const abi_js_1 = require("../../errors/abi.js");
|
4
5
|
const isHex_js_1 = require("../../utils/data/isHex.js");
|
5
6
|
const getEventSelector_js_1 = require("../../utils/hash/getEventSelector.js");
|
6
7
|
const getFunctionSelector_js_1 = require("../../utils/hash/getFunctionSelector.js");
|
@@ -21,6 +22,7 @@ function getAbiItem({ abi, args = [], name, }) {
|
|
21
22
|
return undefined;
|
22
23
|
if (abiItems.length === 1)
|
23
24
|
return abiItems[0];
|
25
|
+
let matchedAbiItem = undefined;
|
24
26
|
for (const abiItem of abiItems) {
|
25
27
|
if (!('inputs' in abiItem))
|
26
28
|
continue;
|
@@ -41,9 +43,25 @@ function getAbiItem({ abi, args = [], name, }) {
|
|
41
43
|
return false;
|
42
44
|
return isArgOfType(arg, abiParameter);
|
43
45
|
});
|
44
|
-
if (matched)
|
45
|
-
|
46
|
+
if (matched) {
|
47
|
+
if (matchedAbiItem &&
|
48
|
+
'inputs' in matchedAbiItem &&
|
49
|
+
matchedAbiItem.inputs) {
|
50
|
+
const ambiguousTypes = getAmbiguousTypes(abiItem.inputs, matchedAbiItem.inputs, args);
|
51
|
+
if (ambiguousTypes)
|
52
|
+
throw new abi_js_1.AbiItemAmbiguityError({
|
53
|
+
abiItem,
|
54
|
+
type: ambiguousTypes[0],
|
55
|
+
}, {
|
56
|
+
abiItem: matchedAbiItem,
|
57
|
+
type: ambiguousTypes[1],
|
58
|
+
});
|
59
|
+
}
|
60
|
+
matchedAbiItem = abiItem;
|
61
|
+
}
|
46
62
|
}
|
63
|
+
if (matchedAbiItem)
|
64
|
+
return matchedAbiItem;
|
47
65
|
return abiItems[0];
|
48
66
|
}
|
49
67
|
exports.getAbiItem = getAbiItem;
|
@@ -80,4 +98,29 @@ function isArgOfType(arg, abiParameter) {
|
|
80
98
|
}
|
81
99
|
}
|
82
100
|
exports.isArgOfType = isArgOfType;
|
101
|
+
function getAmbiguousTypes(sourceParameters, targetParameters, args) {
|
102
|
+
for (const parameterIndex in sourceParameters) {
|
103
|
+
const sourceParameter = sourceParameters[parameterIndex];
|
104
|
+
const targetParameter = targetParameters[parameterIndex];
|
105
|
+
if (sourceParameter.type === 'tuple' &&
|
106
|
+
targetParameter.type === 'tuple' &&
|
107
|
+
'components' in sourceParameter &&
|
108
|
+
'components' in targetParameter)
|
109
|
+
return getAmbiguousTypes(sourceParameter.components, targetParameter.components, args[parameterIndex]);
|
110
|
+
const types = [sourceParameter.type, targetParameter.type];
|
111
|
+
const ambiguous = (() => {
|
112
|
+
if (types.includes('address') && types.includes('bytes20'))
|
113
|
+
return true;
|
114
|
+
if (types.includes('address') && types.includes('string'))
|
115
|
+
return (0, isAddress_js_1.isAddress)(args[parameterIndex]);
|
116
|
+
if (types.includes('address') && types.includes('bytes'))
|
117
|
+
return (0, isAddress_js_1.isAddress)(args[parameterIndex]);
|
118
|
+
return false;
|
119
|
+
})();
|
120
|
+
if (ambiguous)
|
121
|
+
return types;
|
122
|
+
}
|
123
|
+
return;
|
124
|
+
}
|
125
|
+
exports.getAmbiguousTypes = getAmbiguousTypes;
|
83
126
|
//# sourceMappingURL=getAbiItem.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getAbiItem.js","sourceRoot":"","sources":["../../../utils/abi/getAbiItem.ts"],"names":[],"mappings":";;;
|
1
|
+
{"version":3,"file":"getAbiItem.js","sourceRoot":"","sources":["../../../utils/abi/getAbiItem.ts"],"names":[],"mappings":"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"}
|
package/_esm/errors/abi.js
CHANGED
@@ -289,6 +289,25 @@ export class AbiFunctionSignatureNotFoundError extends BaseError {
|
|
289
289
|
});
|
290
290
|
}
|
291
291
|
}
|
292
|
+
export class AbiItemAmbiguityError extends BaseError {
|
293
|
+
constructor(x, y) {
|
294
|
+
super('Found ambiguous types in overloaded ABI items.', {
|
295
|
+
metaMessages: [
|
296
|
+
`\`${x.type}\` in \`${formatAbiItem(x.abiItem)}\`, and`,
|
297
|
+
`\`${y.type}\` in \`${formatAbiItem(y.abiItem)}\``,
|
298
|
+
'',
|
299
|
+
'These types encode differently and cannot be distinguished at runtime.',
|
300
|
+
'Remove one of the ambiguous items in the ABI.',
|
301
|
+
],
|
302
|
+
});
|
303
|
+
Object.defineProperty(this, "name", {
|
304
|
+
enumerable: true,
|
305
|
+
configurable: true,
|
306
|
+
writable: true,
|
307
|
+
value: 'AbiItemAmbiguityError'
|
308
|
+
});
|
309
|
+
}
|
310
|
+
}
|
292
311
|
export class BytesSizeMismatchError extends BaseError {
|
293
312
|
constructor({ expectedSize, givenSize, }) {
|
294
313
|
super(`Expected bytes${expectedSize}, got bytes${givenSize}.`);
|
package/_esm/errors/abi.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"abi.js","sourceRoot":"","sources":["../../errors/abi.ts"],"names":[],"mappings":"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"}
|
1
|
+
{"version":3,"file":"abi.js","sourceRoot":"","sources":["../../errors/abi.ts"],"names":[],"mappings":"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"}
|
@@ -1,3 +1,5 @@
|
|
1
|
+
import {} from 'abitype';
|
2
|
+
import { AbiItemAmbiguityError } from '../../errors/abi.js';
|
1
3
|
import { isHex } from '../../utils/data/isHex.js';
|
2
4
|
import { getEventSelector } from '../../utils/hash/getEventSelector.js';
|
3
5
|
import { getFunctionSelector, } from '../../utils/hash/getFunctionSelector.js';
|
@@ -18,6 +20,7 @@ export function getAbiItem({ abi, args = [], name, }) {
|
|
18
20
|
return undefined;
|
19
21
|
if (abiItems.length === 1)
|
20
22
|
return abiItems[0];
|
23
|
+
let matchedAbiItem = undefined;
|
21
24
|
for (const abiItem of abiItems) {
|
22
25
|
if (!('inputs' in abiItem))
|
23
26
|
continue;
|
@@ -38,9 +41,26 @@ export function getAbiItem({ abi, args = [], name, }) {
|
|
38
41
|
return false;
|
39
42
|
return isArgOfType(arg, abiParameter);
|
40
43
|
});
|
41
|
-
if (matched)
|
42
|
-
|
44
|
+
if (matched) {
|
45
|
+
// Check for ambiguity against already matched parameters (e.g. `address` vs `bytes20`).
|
46
|
+
if (matchedAbiItem &&
|
47
|
+
'inputs' in matchedAbiItem &&
|
48
|
+
matchedAbiItem.inputs) {
|
49
|
+
const ambiguousTypes = getAmbiguousTypes(abiItem.inputs, matchedAbiItem.inputs, args);
|
50
|
+
if (ambiguousTypes)
|
51
|
+
throw new AbiItemAmbiguityError({
|
52
|
+
abiItem,
|
53
|
+
type: ambiguousTypes[0],
|
54
|
+
}, {
|
55
|
+
abiItem: matchedAbiItem,
|
56
|
+
type: ambiguousTypes[1],
|
57
|
+
});
|
58
|
+
}
|
59
|
+
matchedAbiItem = abiItem;
|
60
|
+
}
|
43
61
|
}
|
62
|
+
if (matchedAbiItem)
|
63
|
+
return matchedAbiItem;
|
44
64
|
return abiItems[0];
|
45
65
|
}
|
46
66
|
export function isArgOfType(arg, abiParameter) {
|
@@ -82,4 +102,28 @@ export function isArgOfType(arg, abiParameter) {
|
|
82
102
|
}
|
83
103
|
}
|
84
104
|
}
|
105
|
+
export function getAmbiguousTypes(sourceParameters, targetParameters, args) {
|
106
|
+
for (const parameterIndex in sourceParameters) {
|
107
|
+
const sourceParameter = sourceParameters[parameterIndex];
|
108
|
+
const targetParameter = targetParameters[parameterIndex];
|
109
|
+
if (sourceParameter.type === 'tuple' &&
|
110
|
+
targetParameter.type === 'tuple' &&
|
111
|
+
'components' in sourceParameter &&
|
112
|
+
'components' in targetParameter)
|
113
|
+
return getAmbiguousTypes(sourceParameter.components, targetParameter.components, args[parameterIndex]);
|
114
|
+
const types = [sourceParameter.type, targetParameter.type];
|
115
|
+
const ambiguous = (() => {
|
116
|
+
if (types.includes('address') && types.includes('bytes20'))
|
117
|
+
return true;
|
118
|
+
if (types.includes('address') && types.includes('string'))
|
119
|
+
return isAddress(args[parameterIndex]);
|
120
|
+
if (types.includes('address') && types.includes('bytes'))
|
121
|
+
return isAddress(args[parameterIndex]);
|
122
|
+
return false;
|
123
|
+
})();
|
124
|
+
if (ambiguous)
|
125
|
+
return types;
|
126
|
+
}
|
127
|
+
return;
|
128
|
+
}
|
85
129
|
//# sourceMappingURL=getAbiItem.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getAbiItem.js","sourceRoot":"","sources":["../../../utils/abi/getAbiItem.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"getAbiItem.js","sourceRoot":"","sources":["../../../utils/abi/getAbiItem.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6C,MAAM,SAAS,CAAA;AAEnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAQ3D,OAAO,EAAuB,KAAK,EAAE,MAAM,2BAA2B,CAAA;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAA;AACvE,OAAO,EAEL,mBAAmB,GACpB,MAAM,yCAAyC,CAAA;AAChD,OAAO,EAA2B,SAAS,EAAE,MAAM,yBAAyB,CAAA;AA0B5E,MAAM,UAAU,UAAU,CAGxB,EACA,GAAG,EACH,IAAI,GAAG,EAAE,EACT,IAAI,GACkC;IAItC,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAA;IAEjD,MAAM,QAAQ,GAAI,GAAW,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE;QAC/C,IAAI,UAAU,EAAE;YACd,IAAI,OAAO,CAAC,IAAI,KAAK,UAAU;gBAC7B,OAAO,mBAAmB,CAAC,OAAO,CAAC,KAAK,IAAI,CAAA;YAC9C,IAAI,OAAO,CAAC,IAAI,KAAK,OAAO;gBAAE,OAAO,gBAAgB,CAAC,OAAO,CAAC,KAAK,IAAI,CAAA;YACvE,OAAO,KAAK,CAAA;SACb;QACD,OAAO,MAAM,IAAI,OAAO,IAAI,OAAO,CAAC,IAAI,KAAK,IAAI,CAAA;IACnD,CAAC,CAAC,CAAA;IAEF,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAgB,CAAA;IAClD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,QAAQ,CAAC,CAAC,CAAQ,CAAA;IAEpD,IAAI,cAAc,GAAwB,SAAS,CAAA;IACnD,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;QAC9B,IAAI,CAAC,CAAC,QAAQ,IAAI,OAAO,CAAC;YAAE,SAAQ;QACpC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9B,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,OAAc,CAAA;YACzE,SAAQ;SACT;QACD,IAAI,CAAC,OAAO,CAAC,MAAM;YAAE,SAAQ;QAC7B,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC;YAAE,SAAQ;QACzC,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM;YAAE,SAAQ;QACnD,MAAM,OAAO,GAAI,IAA2B,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;YAChE,MAAM,YAAY,GAAG,QAAQ,IAAI,OAAO,IAAI,OAAO,CAAC,MAAO,CAAC,KAAK,CAAC,CAAA;YAClE,IAAI,CAAC,YAAY;gBAAE,OAAO,KAAK,CAAA;YAC/B,OAAO,WAAW,CAAC,GAAG,EAAE,YAA4B,CAAC,CAAA;QACvD,CAAC,CAAC,CAAA;QACF,IAAI,OAAO,EAAE;YACX,wFAAwF;YACxF,IACE,cAAc;gBACd,QAAQ,IAAI,cAAc;gBAC1B,cAAc,CAAC,MAAM,EACrB;gBACA,MAAM,cAAc,GAAG,iBAAiB,CACtC,OAAO,CAAC,MAAM,EACd,cAAc,CAAC,MAAM,EACrB,IAA0B,CAC3B,CAAA;gBACD,IAAI,cAAc;oBAChB,MAAM,IAAI,qBAAqB,CAC7B;wBACE,OAAO;wBACP,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;qBACxB,EACD;wBACE,OAAO,EAAE,cAAc;wBACvB,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;qBACxB,CACF,CAAA;aACJ;YAED,cAAc,GAAG,OAAO,CAAA;SACzB;KACF;IAED,IAAI,cAAc;QAChB,OAAO,cAAuD,CAAA;IAChE,OAAO,QAAQ,CAAC,CAAC,CAA0C,CAAA;AAC7D,CAAC;AAID,MAAM,UAAU,WAAW,CAAC,GAAY,EAAE,YAA0B;IAClE,MAAM,OAAO,GAAG,OAAO,GAAG,CAAA;IAC1B,MAAM,gBAAgB,GAAG,YAAY,CAAC,IAAI,CAAA;IAC1C,QAAQ,gBAAgB,EAAE;QACxB,KAAK,SAAS;YACZ,OAAO,SAAS,CAAC,GAAc,CAAC,CAAA;QAClC,KAAK,MAAM;YACT,OAAO,OAAO,KAAK,SAAS,CAAA;QAC9B,KAAK,UAAU;YACb,OAAO,OAAO,KAAK,QAAQ,CAAA;QAC7B,KAAK,QAAQ;YACX,OAAO,OAAO,KAAK,QAAQ,CAAA;QAC7B,OAAO,CAAC,CAAC;YACP,IAAI,gBAAgB,KAAK,OAAO,IAAI,YAAY,IAAI,YAAY;gBAC9D,OAAO,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,KAAK,CACjD,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE;oBACnB,OAAO,WAAW,CAChB,MAAM,CAAC,MAAM,CAAC,GAA0C,CAAC,CAAC,KAAK,CAAC,EAChE,SAAyB,CAC1B,CAAA;gBACH,CAAC,CACF,CAAA;YAEH,iFAAiF;YACjF,2BAA2B;YAC3B,IACE,8HAA8H,CAAC,IAAI,CACjI,gBAAgB,CACjB;gBAED,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,QAAQ,CAAA;YAErD,sDAAsD;YACtD,2BAA2B;YAC3B,IAAI,sCAAsC,CAAC,IAAI,CAAC,gBAAgB,CAAC;gBAC/D,OAAO,OAAO,KAAK,QAAQ,IAAI,GAAG,YAAY,UAAU,CAAA;YAE1D,6DAA6D;YAC7D,2BAA2B;YAC3B,IAAI,mCAAmC,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE;gBAC9D,OAAO,CACL,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC;oBAClB,GAAG,CAAC,KAAK,CAAC,CAAC,CAAU,EAAE,EAAE,CACvB,WAAW,CAAC,CAAC,EAAE;wBACb,GAAG,YAAY;wBACf,yCAAyC;wBACzC,IAAI,EAAE,gBAAgB,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC;qBACvC,CAAC,CACnB,CACF,CAAA;aACF;YAED,OAAO,KAAK,CAAA;SACb;KACF;AACH,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,gBAAyC,EACzC,gBAAyC,EACzC,IAAwB;IAExB,KAAK,MAAM,cAAc,IAAI,gBAAgB,EAAE;QAC7C,MAAM,eAAe,GAAG,gBAAgB,CAAC,cAAc,CAAC,CAAA;QACxD,MAAM,eAAe,GAAG,gBAAgB,CAAC,cAAc,CAAC,CAAA;QAExD,IACE,eAAe,CAAC,IAAI,KAAK,OAAO;YAChC,eAAe,CAAC,IAAI,KAAK,OAAO;YAChC,YAAY,IAAI,eAAe;YAC/B,YAAY,IAAI,eAAe;YAE/B,OAAO,iBAAiB,CACtB,eAAe,CAAC,UAAU,EAC1B,eAAe,CAAC,UAAU,EACzB,IAAY,CAAC,cAAc,CAAC,CAC9B,CAAA;QAEH,MAAM,KAAK,GAAG,CAAC,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,IAAI,CAAC,CAAA;QAE1D,MAAM,SAAS,GAAG,CAAC,GAAG,EAAE;YACtB,IAAI,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC;gBAAE,OAAO,IAAI,CAAA;YACvE,IAAI,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBACvD,OAAO,SAAS,CAAC,IAAI,CAAC,cAAc,CAAY,CAAC,CAAA;YACnD,IAAI,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC;gBACtD,OAAO,SAAS,CAAC,IAAI,CAAC,cAAc,CAAY,CAAC,CAAA;YACnD,OAAO,KAAK,CAAA;QACd,CAAC,CAAC,EAAE,CAAA;QAEJ,IAAI,SAAS;YAAE,OAAO,KAAK,CAAA;KAC5B;IAED,OAAM;AACR,CAAC"}
|
package/_types/errors/abi.d.ts
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
import type { AbiEvent, AbiParameter } from 'abitype';
|
1
|
+
import type { Abi, AbiEvent, AbiParameter } from 'abitype';
|
2
2
|
import type { Hex } from '../types/misc.js';
|
3
3
|
import { BaseError } from './base.js';
|
4
4
|
export type AbiConstructorNotFoundErrorType = AbiConstructorNotFoundError & {
|
@@ -163,6 +163,19 @@ export declare class AbiFunctionSignatureNotFoundError extends BaseError {
|
|
163
163
|
docsPath: string;
|
164
164
|
});
|
165
165
|
}
|
166
|
+
export type AbiItemAmbiguityErrorType = AbiItemAmbiguityError & {
|
167
|
+
name: 'AbiItemAmbiguityError';
|
168
|
+
};
|
169
|
+
export declare class AbiItemAmbiguityError extends BaseError {
|
170
|
+
name: string;
|
171
|
+
constructor(x: {
|
172
|
+
abiItem: Abi[number];
|
173
|
+
type: string;
|
174
|
+
}, y: {
|
175
|
+
abiItem: Abi[number];
|
176
|
+
type: string;
|
177
|
+
});
|
178
|
+
}
|
166
179
|
export type BytesSizeMismatchErrorType = BytesSizeMismatchError & {
|
167
180
|
name: 'BytesSizeMismatchError';
|
168
181
|
};
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"abi.d.ts","sourceRoot":"","sources":["../../errors/abi.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;
|
1
|
+
{"version":3,"file":"abi.d.ts","sourceRoot":"","sources":["../../errors/abi.ts"],"names":[],"mappings":"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"}
|
@@ -1,4 +1,4 @@
|
|
1
|
-
import type
|
1
|
+
import { type Abi, type AbiParameter } from 'abitype';
|
2
2
|
import type { ErrorType } from '../../errors/utils.js';
|
3
3
|
import type { GetFunctionArgs, InferItemName } from '../../types/contract.js';
|
4
4
|
import type { Hex } from '../../types/misc.js';
|
@@ -16,4 +16,5 @@ export type GetAbiItemErrorType = IsArgOfTypeErrorType | IsHexErrorType | GetFun
|
|
16
16
|
export declare function getAbiItem<const TAbi extends Abi | readonly unknown[], TItemName extends string>({ abi, args, name, }: GetAbiItemParameters<TAbi, TItemName>): GetAbiItemReturnType<TAbi, TItemName>;
|
17
17
|
export type IsArgOfTypeErrorType = IsAddressErrorType | ErrorType;
|
18
18
|
export declare function isArgOfType(arg: unknown, abiParameter: AbiParameter): boolean;
|
19
|
+
export declare function getAmbiguousTypes(sourceParameters: readonly AbiParameter[], targetParameters: readonly AbiParameter[], args: readonly unknown[]): AbiParameter['type'][] | undefined;
|
19
20
|
//# sourceMappingURL=getAbiItem.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getAbiItem.d.ts","sourceRoot":"","sources":["../../../utils/abi/getAbiItem.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
1
|
+
{"version":3,"file":"getAbiItem.d.ts","sourceRoot":"","sources":["../../../utils/abi/getAbiItem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,GAAG,EAAE,KAAK,YAAY,EAAgB,MAAM,SAAS,CAAA;AAGnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,KAAK,EAEV,eAAe,EACf,aAAa,EACd,MAAM,yBAAyB,CAAA;AAChC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAA;AAC9C,OAAO,EAAE,KAAK,cAAc,EAAS,MAAM,2BAA2B,CAAA;AAEtE,OAAO,EACL,KAAK,4BAA4B,EAElC,MAAM,yCAAyC,CAAA;AAChD,OAAO,EAAE,KAAK,kBAAkB,EAAa,MAAM,yBAAyB,CAAA;AAE5E,MAAM,MAAM,oBAAoB,CAC9B,IAAI,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,GAAG,GAAG,EAC3C,SAAS,SAAS,MAAM,GAAG,MAAM,IAC/B;IACF,GAAG,EAAE,IAAI,CAAA;IACT,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,GAAG,CAAA;CAC3C,GAAG,OAAO,CAAC,eAAe,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAA;AAE7C,MAAM,MAAM,oBAAoB,CAC9B,IAAI,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,GAAG,GAAG,EAC3C,SAAS,SAAS,MAAM,GAAG,MAAM,IAC/B,OAAO,CACT,IAAI,CAAC,MAAM,CAAC,EACZ;IACE,IAAI,EAAE,SAAS,CAAA;CAChB,CACF,CAAA;AAED,MAAM,MAAM,mBAAmB,GAC3B,oBAAoB,GACpB,cAAc,GACd,4BAA4B,GAC5B,SAAS,CAAA;AAEb,wBAAgB,UAAU,CACxB,KAAK,CAAC,IAAI,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,EAC3C,SAAS,SAAS,MAAM,EACxB,EACA,GAAG,EACH,IAAS,EACT,IAAI,GACL,EAAE,oBAAoB,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,oBAAoB,CAC7D,IAAI,EACJ,SAAS,CACV,CA+DA;AAED,MAAM,MAAM,oBAAoB,GAAG,kBAAkB,GAAG,SAAS,CAAA;AAEjE,wBAAgB,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,YAAY,GAAG,OAAO,CAuD7E;AAED,wBAAgB,iBAAiB,CAC/B,gBAAgB,EAAE,SAAS,YAAY,EAAE,EACzC,gBAAgB,EAAE,SAAS,YAAY,EAAE,EACzC,IAAI,EAAE,SAAS,OAAO,EAAE,GACvB,YAAY,CAAC,MAAM,CAAC,EAAE,GAAG,SAAS,CAgCpC"}
|
package/errors/abi.ts
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
import type { AbiEvent, AbiParameter } from 'abitype'
|
1
|
+
import type { Abi, AbiEvent, AbiParameter } from 'abitype'
|
2
2
|
|
3
3
|
import type { Hex } from '../types/misc.js'
|
4
4
|
import { formatAbiItem, formatAbiParams } from '../utils/abi/formatAbiItem.js'
|
@@ -331,6 +331,27 @@ export class AbiFunctionSignatureNotFoundError extends BaseError {
|
|
331
331
|
}
|
332
332
|
}
|
333
333
|
|
334
|
+
export type AbiItemAmbiguityErrorType = AbiItemAmbiguityError & {
|
335
|
+
name: 'AbiItemAmbiguityError'
|
336
|
+
}
|
337
|
+
export class AbiItemAmbiguityError extends BaseError {
|
338
|
+
override name = 'AbiItemAmbiguityError'
|
339
|
+
constructor(
|
340
|
+
x: { abiItem: Abi[number]; type: string },
|
341
|
+
y: { abiItem: Abi[number]; type: string },
|
342
|
+
) {
|
343
|
+
super('Found ambiguous types in overloaded ABI items.', {
|
344
|
+
metaMessages: [
|
345
|
+
`\`${x.type}\` in \`${formatAbiItem(x.abiItem)}\`, and`,
|
346
|
+
`\`${y.type}\` in \`${formatAbiItem(y.abiItem)}\``,
|
347
|
+
'',
|
348
|
+
'These types encode differently and cannot be distinguished at runtime.',
|
349
|
+
'Remove one of the ambiguous items in the ABI.',
|
350
|
+
],
|
351
|
+
})
|
352
|
+
}
|
353
|
+
}
|
354
|
+
|
334
355
|
export type BytesSizeMismatchErrorType = BytesSizeMismatchError & {
|
335
356
|
name: 'BytesSizeMismatchError'
|
336
357
|
}
|
package/package.json
CHANGED
package/utils/abi/getAbiItem.ts
CHANGED
@@ -1,7 +1,12 @@
|
|
1
|
-
import type
|
1
|
+
import { type Abi, type AbiParameter, type Address } from 'abitype'
|
2
2
|
|
3
|
+
import { AbiItemAmbiguityError } from '../../errors/abi.js'
|
3
4
|
import type { ErrorType } from '../../errors/utils.js'
|
4
|
-
import type {
|
5
|
+
import type {
|
6
|
+
AbiItem,
|
7
|
+
GetFunctionArgs,
|
8
|
+
InferItemName,
|
9
|
+
} from '../../types/contract.js'
|
5
10
|
import type { Hex } from '../../types/misc.js'
|
6
11
|
import { type IsHexErrorType, isHex } from '../../utils/data/isHex.js'
|
7
12
|
import { getEventSelector } from '../../utils/hash/getEventSelector.js'
|
@@ -61,6 +66,7 @@ export function getAbiItem<
|
|
61
66
|
if (abiItems.length === 0) return undefined as any
|
62
67
|
if (abiItems.length === 1) return abiItems[0] as any
|
63
68
|
|
69
|
+
let matchedAbiItem: AbiItem | undefined = undefined
|
64
70
|
for (const abiItem of abiItems) {
|
65
71
|
if (!('inputs' in abiItem)) continue
|
66
72
|
if (!args || args.length === 0) {
|
@@ -75,9 +81,38 @@ export function getAbiItem<
|
|
75
81
|
if (!abiParameter) return false
|
76
82
|
return isArgOfType(arg, abiParameter as AbiParameter)
|
77
83
|
})
|
78
|
-
if (matched)
|
84
|
+
if (matched) {
|
85
|
+
// Check for ambiguity against already matched parameters (e.g. `address` vs `bytes20`).
|
86
|
+
if (
|
87
|
+
matchedAbiItem &&
|
88
|
+
'inputs' in matchedAbiItem &&
|
89
|
+
matchedAbiItem.inputs
|
90
|
+
) {
|
91
|
+
const ambiguousTypes = getAmbiguousTypes(
|
92
|
+
abiItem.inputs,
|
93
|
+
matchedAbiItem.inputs,
|
94
|
+
args as readonly unknown[],
|
95
|
+
)
|
96
|
+
if (ambiguousTypes)
|
97
|
+
throw new AbiItemAmbiguityError(
|
98
|
+
{
|
99
|
+
abiItem,
|
100
|
+
type: ambiguousTypes[0],
|
101
|
+
},
|
102
|
+
{
|
103
|
+
abiItem: matchedAbiItem,
|
104
|
+
type: ambiguousTypes[1],
|
105
|
+
},
|
106
|
+
)
|
107
|
+
}
|
108
|
+
|
109
|
+
matchedAbiItem = abiItem
|
110
|
+
}
|
79
111
|
}
|
80
|
-
|
112
|
+
|
113
|
+
if (matchedAbiItem)
|
114
|
+
return matchedAbiItem as GetAbiItemReturnType<TAbi, TItemName>
|
115
|
+
return abiItems[0] as GetAbiItemReturnType<TAbi, TItemName>
|
81
116
|
}
|
82
117
|
|
83
118
|
export type IsArgOfTypeErrorType = IsAddressErrorType | ErrorType
|
@@ -138,3 +173,41 @@ export function isArgOfType(arg: unknown, abiParameter: AbiParameter): boolean {
|
|
138
173
|
}
|
139
174
|
}
|
140
175
|
}
|
176
|
+
|
177
|
+
export function getAmbiguousTypes(
|
178
|
+
sourceParameters: readonly AbiParameter[],
|
179
|
+
targetParameters: readonly AbiParameter[],
|
180
|
+
args: readonly unknown[],
|
181
|
+
): AbiParameter['type'][] | undefined {
|
182
|
+
for (const parameterIndex in sourceParameters) {
|
183
|
+
const sourceParameter = sourceParameters[parameterIndex]
|
184
|
+
const targetParameter = targetParameters[parameterIndex]
|
185
|
+
|
186
|
+
if (
|
187
|
+
sourceParameter.type === 'tuple' &&
|
188
|
+
targetParameter.type === 'tuple' &&
|
189
|
+
'components' in sourceParameter &&
|
190
|
+
'components' in targetParameter
|
191
|
+
)
|
192
|
+
return getAmbiguousTypes(
|
193
|
+
sourceParameter.components,
|
194
|
+
targetParameter.components,
|
195
|
+
(args as any)[parameterIndex],
|
196
|
+
)
|
197
|
+
|
198
|
+
const types = [sourceParameter.type, targetParameter.type]
|
199
|
+
|
200
|
+
const ambiguous = (() => {
|
201
|
+
if (types.includes('address') && types.includes('bytes20')) return true
|
202
|
+
if (types.includes('address') && types.includes('string'))
|
203
|
+
return isAddress(args[parameterIndex] as Address)
|
204
|
+
if (types.includes('address') && types.includes('bytes'))
|
205
|
+
return isAddress(args[parameterIndex] as Address)
|
206
|
+
return false
|
207
|
+
})()
|
208
|
+
|
209
|
+
if (ambiguous) return types
|
210
|
+
}
|
211
|
+
|
212
|
+
return
|
213
|
+
}
|