ox 0.14.57 → 0.14.59
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 +26 -0
- package/_cjs/core/AbiEvent.js +16 -4
- package/_cjs/core/AbiEvent.js.map +1 -1
- package/_cjs/core/Authorization.js +37 -6
- package/_cjs/core/Authorization.js.map +1 -1
- package/_cjs/core/Hex.js +5 -3
- package/_cjs/core/Hex.js.map +1 -1
- package/_cjs/core/RpcTransport.js +32 -19
- package/_cjs/core/RpcTransport.js.map +1 -1
- package/_cjs/core/Siwe.js +1 -1
- package/_cjs/core/Siwe.js.map +1 -1
- package/_cjs/core/TypedData.js +1 -1
- package/_cjs/core/TypedData.js.map +1 -1
- package/_cjs/core/internal/abiItem.js +46 -14
- package/_cjs/core/internal/abiItem.js.map +1 -1
- package/_cjs/tempo/AccountConfig.js +3 -10
- package/_cjs/tempo/AccountConfig.js.map +1 -1
- package/_cjs/tempo/index.js.map +1 -1
- package/_cjs/version.js +1 -1
- package/_esm/core/AbiEvent.js +19 -4
- package/_esm/core/AbiEvent.js.map +1 -1
- package/_esm/core/Authorization.js +47 -6
- package/_esm/core/Authorization.js.map +1 -1
- package/_esm/core/Hex.js +5 -3
- package/_esm/core/Hex.js.map +1 -1
- package/_esm/core/RpcTransport.js +38 -19
- package/_esm/core/RpcTransport.js.map +1 -1
- package/_esm/core/Siwe.js +1 -1
- package/_esm/core/Siwe.js.map +1 -1
- package/_esm/core/TypedData.js +1 -1
- package/_esm/core/TypedData.js.map +1 -1
- package/_esm/core/internal/abiItem.js +51 -17
- package/_esm/core/internal/abiItem.js.map +1 -1
- package/_esm/tempo/AccountConfig.js +8 -26
- package/_esm/tempo/AccountConfig.js.map +1 -1
- package/_esm/tempo/AccountOperation.js +1 -1
- package/_esm/tempo/index.js +1 -3
- package/_esm/tempo/index.js.map +1 -1
- package/_esm/version.js +1 -1
- package/_types/core/AbiEvent.d.ts.map +1 -1
- package/_types/core/Authorization.d.ts.map +1 -1
- package/_types/core/Hex.d.ts +13 -1
- package/_types/core/Hex.d.ts.map +1 -1
- package/_types/core/RpcTransport.d.ts.map +1 -1
- package/_types/core/Siwe.d.ts.map +1 -1
- package/_types/core/internal/abiItem.d.ts.map +1 -1
- package/_types/tempo/AccountConfig.d.ts +7 -17
- package/_types/tempo/AccountConfig.d.ts.map +1 -1
- package/_types/tempo/AccountOperation.d.ts +1 -1
- package/_types/tempo/index.d.ts +1 -3
- package/_types/tempo/index.d.ts.map +1 -1
- package/_types/version.d.ts +1 -1
- package/core/AbiEvent.ts +24 -3
- package/core/Authorization.ts +46 -6
- package/core/Hex.ts +17 -3
- package/core/RpcTransport.ts +40 -22
- package/core/Siwe.ts +1 -1
- package/core/TypedData.ts +1 -1
- package/core/internal/abiItem.ts +70 -21
- package/package.json +1 -1
- package/tempo/AccountConfig.test.ts +34 -47
- package/tempo/AccountConfig.ts +9 -37
- package/tempo/AccountOperation.test.ts +36 -37
- package/tempo/AccountOperation.ts +1 -1
- package/tempo/SignatureEnvelope.test.ts +1 -3
- package/tempo/configurableAccounts.e2e.test.ts +1 -2
- package/tempo/index.ts +1 -3
- package/version.ts +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,31 @@
|
|
|
1
1
|
# ox
|
|
2
2
|
|
|
3
|
+
## 0.14.59
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#531](https://github.com/wevm/ox/pull/531) [`b1b39ac`](https://github.com/wevm/ox/commit/b1b39acb8f2999701cde58d9ad90664a19285ca4) Thanks [@jxom](https://github.com/jxom)! - Fixed `Authorization.fromRpc`, `Authorization.fromTuple`, `Authorization.toTuple`, and `Authorization.toRpc` rejecting or rewriting an EIP-7702 authorization `yParity` above 1, which made valid transactions fail to deserialize, serialize, or hash.
|
|
8
|
+
|
|
9
|
+
- [#531](https://github.com/wevm/ox/pull/531) [`b1b39ac`](https://github.com/wevm/ox/commit/b1b39acb8f2999701cde58d9ad90664a19285ca4) Thanks [@jxom](https://github.com/jxom)! - Fixed `Siwe.createMessage` rejecting domains with a punycode (internationalized) top-level domain, such as `example.xn--p1ai`, and accepting top-level domain labels longer than 63 characters.
|
|
10
|
+
|
|
11
|
+
- [#535](https://github.com/wevm/ox/pull/535) [`94aded3`](https://github.com/wevm/ox/commit/94aded35b65cf3275cd53d436f661ac4ab39e4f2) Thanks [@jxom](https://github.com/jxom)! - `ox/tempo`: Derived configurable account addresses from the initial config hash instead of a recovery factory (tempoxyz/tempo#8595), so `AccountConfig.getAddress` no longer takes a `factory` option.
|
|
12
|
+
|
|
13
|
+
## 0.14.58
|
|
14
|
+
|
|
15
|
+
### Patch Changes
|
|
16
|
+
|
|
17
|
+
- [#527](https://github.com/wevm/ox/pull/527) [`b0588e1`](https://github.com/wevm/ox/commit/b0588e1673fc0c046265e996964ba267750e5281) Thanks [@jxom](https://github.com/jxom)! - Fixed `AbiEvent.assertArgs` not matching indexed `string` values, non-indexed `string` and `bytes` values, or `bytes` values in a different hex case.
|
|
18
|
+
|
|
19
|
+
- [#527](https://github.com/wevm/ox/pull/527) [`b0588e1`](https://github.com/wevm/ox/commit/b0588e1673fc0c046265e996964ba267750e5281) Thanks [@jxom](https://github.com/jxom)! - Fixed `AbiItem.fromAbi` overload resolution for arrays with a `0` in the element size (e.g. `uint160[]`) or the wrong fixed length, tuple objects with reordered keys, and ambiguous `address[]` overloads.
|
|
20
|
+
|
|
21
|
+
- [#527](https://github.com/wevm/ox/pull/527) [`b0588e1`](https://github.com/wevm/ox/commit/b0588e1673fc0c046265e996964ba267750e5281) Thanks [@jxom](https://github.com/jxom)! - Added an `even` option to `Hex.assert` and `Hex.validate` that rejects hex values with an odd number of hexadecimal characters.
|
|
22
|
+
|
|
23
|
+
- [#527](https://github.com/wevm/ox/pull/527) [`b0588e1`](https://github.com/wevm/ox/commit/b0588e1673fc0c046265e996964ba267750e5281) Thanks [@jxom](https://github.com/jxom)! - Fixed `AbiItem.getSignature` (and `AbiFunction.getSelector`, `AbiEvent.getSelector`) dropping the first parameter when a space directly follows an opening parenthesis.
|
|
24
|
+
|
|
25
|
+
- [#527](https://github.com/wevm/ox/pull/527) [`b0588e1`](https://github.com/wevm/ox/commit/b0588e1673fc0c046265e996964ba267750e5281) Thanks [@jxom](https://github.com/jxom)! - Fixed `RpcTransport.fromHttp` not applying `timeout` to reading the response body, or when `fetchOptions.signal` was set.
|
|
26
|
+
|
|
27
|
+
- [#527](https://github.com/wevm/ox/pull/527) [`b0588e1`](https://github.com/wevm/ox/commit/b0588e1673fc0c046265e996964ba267750e5281) Thanks [@jxom](https://github.com/jxom)! - Fixed `TypedData.extractEip712DomainTypes` (and `TypedData.encode`, `TypedData.getSignPayload`, `TypedData.hashDomain`) dropping an empty `version` from the `EIP712Domain` type.
|
|
28
|
+
|
|
3
29
|
## 0.14.57
|
|
4
30
|
|
|
5
31
|
### Patch Changes
|
package/_cjs/core/AbiEvent.js
CHANGED
|
@@ -18,6 +18,7 @@ const Hash = require("./Hash.js");
|
|
|
18
18
|
const Hex = require("./Hex.js");
|
|
19
19
|
const Cursor = require("./internal/cursor.js");
|
|
20
20
|
const errors_js_1 = require("./internal/errors.js");
|
|
21
|
+
const Solidity = require("./Solidity.js");
|
|
21
22
|
function assertArgs(abiEvent, args, matchArgs) {
|
|
22
23
|
if (!args || !matchArgs)
|
|
23
24
|
throw new ArgsMismatchError({
|
|
@@ -28,10 +29,21 @@ function assertArgs(abiEvent, args, matchArgs) {
|
|
|
28
29
|
function isEqual(input, value, arg) {
|
|
29
30
|
if (input.type === 'address')
|
|
30
31
|
return Address.isEqual(value, arg);
|
|
31
|
-
if (input.
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
32
|
+
if (input.indexed) {
|
|
33
|
+
if (input.type === 'string')
|
|
34
|
+
return (Hash.keccak256(Bytes.fromString(value), { as: 'Hex' }) ===
|
|
35
|
+
arg);
|
|
36
|
+
if (input.type === 'bytes') {
|
|
37
|
+
const hex = typeof value === 'string'
|
|
38
|
+
? value
|
|
39
|
+
: Hex.fromBytes(value);
|
|
40
|
+
return Hash.keccak256(hex, { as: 'Hex' }) === arg;
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
if (typeof value === 'string' &&
|
|
44
|
+
typeof arg === 'string' &&
|
|
45
|
+
Solidity.bytesRegex.test(input.type))
|
|
46
|
+
return value.toLowerCase() === arg.toLowerCase();
|
|
35
47
|
return value === arg;
|
|
36
48
|
}
|
|
37
49
|
if (Array.isArray(args) && Array.isArray(matchArgs)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbiEvent.js","sourceRoot":"","sources":["../../core/AbiEvent.ts"],"names":[],"mappings":";;;AAgHA,gCA8EC;AA0JD,wBAoGC;AAiLD,wBAmEC;AA0DD,wBAIC;AAyED,oBAcC;AAmFD,0BAsBC;AAoCD,kCAEC;AAp9BD,mCAAkC;AAElC,wCAAuC;AACvC,oDAAmD;AACnD,wCAAuC;AACvC,oCAAmC;AACnC,sCAAqC;AACrC,kCAAiC;AACjC,gCAA+B;AAG/B,+CAA8C;AAC9C,oDAAkD;AAoGlD,SAAgB,UAAU,CACxB,QAA6B,EAC7B,IAAa,EACb,SAOW;IAEX,IAAI,CAAC,IAAI,IAAI,CAAC,SAAS;QACrB,MAAM,IAAI,iBAAiB,CAAC;YAC1B,QAAQ;YACR,QAAQ,EAAE,IAAI;YACd,KAAK,EAAE,SAAS;SACjB,CAAC,CAAA;IAEJ,SAAS,OAAO,CACd,KAAgC,EAChC,KAAc,EACd,GAAY;QAEZ,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS;YAC1B,OAAO,OAAO,CAAC,OAAO,CAAC,KAAwB,EAAE,GAAsB,CAAC,CAAA;QAC1E,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ;YACzB,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,KAAe,CAAC,CAAC,KAAK,GAAG,CAAA;QAClE,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO;YAAE,OAAO,IAAI,CAAC,SAAS,CAAC,KAAgB,CAAC,KAAK,GAAG,CAAA;QAC3E,OAAO,KAAK,KAAK,GAAG,CAAA;IACtB,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;QACpD,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC;YACjD,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS;gBAAE,SAAQ;YACnD,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YACpC,IAAI,CAAC,KAAK;gBACR,MAAM,IAAI,kBAAkB,CAAC;oBAC3B,QAAQ;oBACR,IAAI,EAAE,GAAG,KAAK,EAAE;iBACjB,CAAC,CAAA;YACJ,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;YACrD,IAAI,KAAK,GAAG,KAAK,CAAA;YACjB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBAC3B,IAAI,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;oBAAE,KAAK,GAAG,IAAI,CAAA;YACtD,CAAC;YACD,IAAI,CAAC,KAAK;gBACR,MAAM,IAAI,iBAAiB,CAAC;oBAC1B,QAAQ;oBACR,QAAQ,EAAE,IAAI;oBACd,KAAK,EAAE,SAAS;iBACjB,CAAC,CAAA;QACN,CAAC;IACH,CAAC;IAED,IACE,OAAO,IAAI,KAAK,QAAQ;QACxB,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;QACpB,OAAO,SAAS,KAAK,QAAQ;QAC7B,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC;QAEzB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YACrD,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS;gBAAE,SAAQ;YACnD,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,CAAA;YACjE,IAAI,CAAC,KAAK;gBAAE,MAAM,IAAI,kBAAkB,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAA;YACjE,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;YACrD,IAAI,KAAK,GAAG,KAAK,CAAA;YACjB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBAC3B,IAAI,OAAO,CAAC,KAAK,EAAE,KAAK,EAAG,IAAgC,CAAC,GAAG,CAAC,CAAC;oBAC/D,KAAK,GAAG,IAAI,CAAA;YAChB,CAAC;YACD,IAAI,CAAC,KAAK;gBACR,MAAM,IAAI,iBAAiB,CAAC;oBAC1B,QAAQ;oBACR,QAAQ,EAAE,IAAI;oBACd,KAAK,EAAE,SAAS;iBACjB,CAAC,CAAA;QACN,CAAC;AACL,CAAC;AA0JD,SAAgB,MAAM,CACpB,GAAG,UAMsC;IAEzC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE;QAC5B,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACjC,MAAM,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,GAAG,UAIxB,CAAA;YACD,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,GAAG,CAAC,CAAA;QAClC,CAAC;QACD,OAAO,UAAoC,CAAA;IAC7C,CAAC,CAAC,EAAE,CAAA;IAEJ,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,GAAG,CAAA;IAE5B,MAAM,CAAC,SAAS,EAAE,GAAG,SAAS,CAAC,GAAG,MAAM,CAAA;IAExC,MAAM,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAA;IACtC,IAAI,SAAS,KAAK,QAAQ;QACxB,MAAM,IAAI,0BAA0B,CAAC;YACnC,QAAQ;YACR,MAAM,EAAE,SAAS;YACjB,QAAQ,EAAE,QAAQ;SACnB,CAAC,CAAA;IAEJ,MAAM,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAA;IAC3B,MAAM,SAAS,GAAG,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;IAEhE,IAAI,IAAI,GAAQ,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IAGnC,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAA;IACvE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC9C,MAAM,KAAK,GAAG,aAAa,CAAC,CAAC,CAAE,CAAA;QAC/B,MAAM,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,CAAA;QAC1B,IAAI,CAAC,KAAK;YACR,MAAM,IAAI,mBAAmB,CAAC;gBAC5B,QAAQ;gBACR,KAAK,EAAE,KAAoD;aAC5D,CAAC,CAAA;QACJ,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE;YAC5C,IACE,KAAK,CAAC,IAAI,KAAK,QAAQ;gBACvB,KAAK,CAAC,IAAI,KAAK,OAAO;gBACtB,KAAK,CAAC,IAAI,KAAK,OAAO;gBACtB,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC;gBAEpC,OAAO,KAAK,CAAA;YACd,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,IAAI,EAAE,CAAA;YAC1D,OAAO,OAAO,CAAC,CAAC,CAAC,CAAA;QACnB,CAAC,CAAC,EAAE,CAAA;IACN,CAAC;IAGD,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;IAC7E,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChC,IAAI,IAAI,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAC1B,IAAI,CAAC;gBACH,MAAM,WAAW,GAAG,aAAa,CAAC,MAAM,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAA;gBAChE,IAAI,WAAW,EAAE,CAAC;oBAChB,IAAI,SAAS;wBAAE,IAAI,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,WAAW,CAAC,CAAA;yBAC1C,CAAC;wBACJ,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,gBAAgB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;4BACjD,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAE,CAAC,CAAA;4BAClD,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAE,CAAC,IAAK,IAAI,KAAK,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAA;wBAC5D,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IACE,GAAG,YAAY,aAAa,CAAC,qBAAqB;oBAClD,GAAG,YAAY,MAAM,CAAC,wBAAwB;oBAE9C,MAAM,IAAI,iBAAiB,CAAC;wBAC1B,QAAQ;wBACR,IAAI,EAAE,IAAI;wBACV,UAAU,EAAE,gBAAgB;wBAC5B,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;qBACrB,CAAC,CAAA;gBACJ,MAAM,GAAG,CAAA;YACX,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,iBAAiB,CAAC;gBAC1B,QAAQ;gBACR,IAAI,EAAE,IAAI;gBACV,UAAU,EAAE,gBAAgB;gBAC5B,IAAI,EAAE,CAAC;aACR,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAA;AAC1D,CAAC;AAiLD,SAAgB,MAAM,CACpB,GAAG,UAM0E;IAE7E,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE;QAC7B,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACjC,MAAM,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,UAIzB,CAAA;YACD,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,CAAA;QACnC,CAAC;QACD,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,GAAG,UAGxB,CAAA;QACD,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;IACzB,CAAC,CAAC,EAAE,CAAA;IAEJ,IAAI,MAAM,GAAmC,EAAE,CAAA;IAC/C,IAAI,IAAI,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;QAC5B,MAAM,aAAa,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,CAC1C,CAAC,KAAK,EAAE,EAAE,CAAC,SAAS,IAAI,KAAK,IAAI,KAAK,CAAC,OAAO,CAC/C,CAAA;QACD,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;YAC/B,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC;gBAC9B,CAAC,CAAC,CAAC,aAAa,EAAE,GAAG,CACjB,CAAC,CAAM,EAAE,CAAS,EAAE,EAAE,CAAE,IAAY,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAClD,IAAI,EAAE,CAAC;gBACV,CAAC,CAAC,EAAE,CAAA;QAER,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,MAAM,MAAM,GAAG,CAAC,KAA2B,EAAE,KAAc,EAAE,EAAE;gBAC7D,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ;oBACzB,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,KAAe,CAAC,CAAC,CAAA;gBACxD,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO;oBAAE,OAAO,IAAI,CAAC,SAAS,CAAC,KAAgB,CAAC,CAAA;gBACnE,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC;oBAChE,MAAM,IAAI,2BAA2B,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;gBACnD,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAA;YAC/C,CAAC,CAAA;YAED,MAAM;gBACJ,aAAa,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;oBAC9B,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;wBACzB,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,CAAS,EAAE,EAAE,CACxC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAC3B,CAAA;oBACH,OAAO,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,WAAW,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI;wBACzD,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;wBACzB,CAAC,CAAC,IAAI,CAAA;gBACV,CAAC,CAAC,IAAI,EAAE,CAAA;QACZ,CAAC;IACH,CAAC;IAED,MAAM,QAAQ,GAAG,CAAC,GAAG,EAAE;QACrB,IAAI,QAAQ,CAAC,IAAI;YAAE,OAAO,QAAQ,CAAC,IAAI,CAAA;QACvC,OAAO,WAAW,CAAC,QAAQ,CAAC,CAAA;IAC9B,CAAC,CAAC,EAAE,CAAA;IAEJ,OAAO,EAAE,MAAM,EAAE,CAAC,QAAQ,EAAE,GAAG,MAAM,CAAC,EAAE,CAAA;AAC1C,CAAC;AA0DD,SAAgB,MAAM,CACpB,QAA6B;IAE7B,OAAO,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAU,CAAA;AACjD,CAAC;AAyED,SAAgB,IAAI,CAGlB,QAOG,EACH,UAAwB,EAAE;IAE1B,OAAO,OAAO,CAAC,IAAI,CAAC,QAAoB,EAAE,OAAO,CAAU,CAAA;AAC7D,CAAC;AAmFD,SAAgB,OAAO,CASrB,GAAuC,EACvC,IAAsD,EACtD,OAKC;IAED,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,OAAc,CAAC,CAAA;IACvD,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO;QACvB,MAAM,IAAI,OAAO,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAA;IAC1D,OAAO,IAAa,CAAA;AACtB,CAAC;AAoCD,SAAgB,WAAW,CAAC,OAA0B;IACpD,OAAO,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAA;AAC1C,CAAC;AAyED,MAAa,iBAAkB,SAAQ,MAAM,CAAC,SAAS;IAGrD,YAAY,EACV,QAAQ,EACR,QAAQ,EACR,KAAK,GAKN;QACC,KAAK,CAAC,sDAAsD,EAAE;YAC5D,YAAY,EAAE;gBACZ,UAAU,MAAM,CAAC,QAAQ,CAAC,EAAE;gBAC5B,uBAAuB,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;gBAChD,QAAQ,CAAC,CAAC,CAAC,IAAA,uBAAW,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;gBAC5C,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC1C,KAAK,CAAC,CAAC,CAAC,IAAA,uBAAW,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;aACvC;SACF,CAAC,CAAA;QAnBc;;;;mBAAO,4BAA4B;WAAA;IAoBrD,CAAC;CACF;AAtBD,8CAsBC;AA6DD,MAAa,kBAAmB,SAAQ,MAAM,CAAC,SAAS;IAGtD,YAAY,EACV,QAAQ,EACR,IAAI,GAIL;QACC,KAAK,CAAC,cAAc,IAAI,oBAAoB,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;QATlD;;;;mBAAO,6BAA6B;WAAA;IAUtD,CAAC;CACF;AAZD,gDAYC;AAiDD,MAAa,iBAAkB,SAAQ,MAAM,CAAC,SAAS;IAQrD,YAAY,EACV,QAAQ,EACR,IAAI,EACJ,UAAU,EACV,IAAI,GAML;QACC,KAAK,CACH;YACE,gBAAgB,IAAI,uDAAuD;SAC5E,CAAC,IAAI,CAAC,IAAI,CAAC,EACZ;YACE,YAAY,EAAE;gBACZ,4BAA4B,aAAa,CAAC,MAAM,CAAC,UAAiB,CAAC,GAAG;gBACtE,WAAW,IAAI,KAAK,IAAI,SAAS;aAClC;SACF,CACF,CAAA;QA5Be;;;;mBAAO,4BAA4B;WAAA;QAErD;;;;;WAAkB;QAClB;;;;;WAAa;QACb;;;;;WAA2C;QAC3C;;;;;WAAY;QAyBV,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACxB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;IAClB,CAAC;CACF;AApCD,8CAoCC;AA6CD,MAAa,mBAAoB,SAAQ,MAAM,CAAC,SAAS;IAKvD,YAAY,EACV,QAAQ,EACR,KAAK,GAIN;QACC,KAAK,CACH;YACE,+CACE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,EACpC,SAAS,MAAM,CAAC,QAAQ,CAAC,IAAI;SAC9B,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAA;QAjBe;;;;mBAAO,8BAA8B;WAAA;QAEvD;;;;;WAAkB;QAiBhB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC1B,CAAC;CACF;AAtBD,kDAsBC;AA8CD,MAAa,0BAA2B,SAAQ,MAAM,CAAC,SAAS;IAG9D,YAAY,EACV,QAAQ,EACR,MAAM,EACN,QAAQ,GAKT;QACC,KAAK,CACH,cAAc,MAAM,4CAA4C,QAAQ,IAAI,EAC5E;YACE,YAAY,EAAE,CAAC,UAAU,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,aAAa,QAAQ,EAAE,CAAC;SACtE,CACF,CAAA;QAhBe;;;;mBAAO,qCAAqC;WAAA;IAiB9D,CAAC;CACF;AAnBD,gEAmBC;AA+BD,MAAa,2BAA4B,SAAQ,MAAM,CAAC,SAAS;IAE/D,YAAY,IAAY;QACtB,KAAK,CAAC,gBAAgB,IAAI,qBAAqB,CAAC,CAAA;QAFhC;;;;mBAAO,sCAAsC;WAAA;IAG/D,CAAC;CACF;AALD,kEAKC"}
|
|
1
|
+
{"version":3,"file":"AbiEvent.js","sourceRoot":"","sources":["../../core/AbiEvent.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,9 @@ function from(authorization, options = {}) {
|
|
|
22
22
|
}
|
|
23
23
|
function fromRpc(authorization) {
|
|
24
24
|
const { address, chainId, nonce } = authorization;
|
|
25
|
-
const signature = Signature.
|
|
25
|
+
const signature = Signature.fromRpc(authorization);
|
|
26
|
+
Signature.assert({ r: signature.r, s: signature.s });
|
|
27
|
+
assertYParity(signature.yParity);
|
|
26
28
|
return {
|
|
27
29
|
address,
|
|
28
30
|
chainId: Number(chainId),
|
|
@@ -40,8 +42,16 @@ function fromTuple(tuple) {
|
|
|
40
42
|
chainId: chainId === '0x' ? 0 : Number(chainId),
|
|
41
43
|
nonce: nonce === '0x' ? 0n : BigInt(nonce),
|
|
42
44
|
};
|
|
43
|
-
if (yParity && r && s)
|
|
44
|
-
|
|
45
|
+
if (yParity && r && s) {
|
|
46
|
+
const signature = {
|
|
47
|
+
r: r === '0x' ? 0n : BigInt(r),
|
|
48
|
+
s: s === '0x' ? 0n : BigInt(s),
|
|
49
|
+
yParity: yParity === '0x' ? 0 : Number(yParity),
|
|
50
|
+
};
|
|
51
|
+
Signature.assert({ r: signature.r, s: signature.s });
|
|
52
|
+
assertYParity(signature.yParity);
|
|
53
|
+
args = { ...args, ...signature };
|
|
54
|
+
}
|
|
45
55
|
return from(args);
|
|
46
56
|
}
|
|
47
57
|
function fromTupleList(tupleList) {
|
|
@@ -65,24 +75,34 @@ function hash(authorization, options = {}) {
|
|
|
65
75
|
}
|
|
66
76
|
function toRpc(authorization) {
|
|
67
77
|
const { address, chainId, nonce, ...signature } = authorization;
|
|
78
|
+
assertYParity(signature.yParity);
|
|
68
79
|
return {
|
|
69
80
|
address,
|
|
70
81
|
chainId: Hex.fromNumber(chainId),
|
|
71
82
|
nonce: Hex.fromNumber(nonce),
|
|
72
83
|
...Signature.toRpc(signature),
|
|
84
|
+
yParity: Hex.fromNumber(signature.yParity),
|
|
73
85
|
};
|
|
74
86
|
}
|
|
75
87
|
function toRpcList(authorizationList) {
|
|
76
88
|
return authorizationList.map(toRpc);
|
|
77
89
|
}
|
|
78
90
|
function toTuple(authorization) {
|
|
79
|
-
const { address, chainId, nonce } = authorization;
|
|
80
|
-
const signature = Signature.extract(
|
|
91
|
+
const { address, chainId, nonce, r, s, yParity } = authorization;
|
|
92
|
+
const signature = Signature.extract({ r, s });
|
|
93
|
+
if (signature && typeof yParity !== 'undefined')
|
|
94
|
+
assertYParity(yParity);
|
|
81
95
|
return [
|
|
82
96
|
chainId ? Hex.fromNumber(chainId) : '0x',
|
|
83
97
|
address,
|
|
84
98
|
nonce ? Hex.fromNumber(nonce) : '0x',
|
|
85
|
-
...(signature
|
|
99
|
+
...(signature
|
|
100
|
+
? [
|
|
101
|
+
yParity ? Hex.fromNumber(yParity, { size: 1 }) : '0x',
|
|
102
|
+
signature.r === 0n ? '0x' : Hex.trimLeft(Hex.fromNumber(signature.r)),
|
|
103
|
+
signature.s === 0n ? '0x' : Hex.trimLeft(Hex.fromNumber(signature.s)),
|
|
104
|
+
]
|
|
105
|
+
: []),
|
|
86
106
|
];
|
|
87
107
|
}
|
|
88
108
|
function toTupleList(list) {
|
|
@@ -93,4 +113,15 @@ function toTupleList(list) {
|
|
|
93
113
|
tupleList.push(toTuple(authorization));
|
|
94
114
|
return tupleList;
|
|
95
115
|
}
|
|
116
|
+
function assertYParity(yParity) {
|
|
117
|
+
if (Number.isInteger(yParity) && yParity >= 0 && yParity < 256)
|
|
118
|
+
return;
|
|
119
|
+
throw new Hex.IntegerOutOfRangeError({
|
|
120
|
+
max: '255',
|
|
121
|
+
min: '0',
|
|
122
|
+
signed: false,
|
|
123
|
+
size: 1,
|
|
124
|
+
value: `${yParity}`,
|
|
125
|
+
});
|
|
126
|
+
}
|
|
96
127
|
//# sourceMappingURL=Authorization.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Authorization.js","sourceRoot":"","sources":["../../core/Authorization.ts"],"names":[],"mappings":";;AAsHA,oBAUC;AA+CD,
|
|
1
|
+
{"version":3,"file":"Authorization.js","sourceRoot":"","sources":["../../core/Authorization.ts"],"names":[],"mappings":"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"}
|
package/_cjs/core/Hex.js
CHANGED
|
@@ -31,7 +31,7 @@ const Json = require("./Json.js");
|
|
|
31
31
|
const encoder = new TextEncoder();
|
|
32
32
|
const hexes = Array.from({ length: 256 }, (_v, i) => i.toString(16).padStart(2, '0'));
|
|
33
33
|
function assert(value, options = {}) {
|
|
34
|
-
const { strict = false } = options;
|
|
34
|
+
const { even = false, strict = false } = options;
|
|
35
35
|
if (!value)
|
|
36
36
|
throw new InvalidHexTypeError(value);
|
|
37
37
|
if (typeof value !== 'string')
|
|
@@ -42,6 +42,8 @@ function assert(value, options = {}) {
|
|
|
42
42
|
}
|
|
43
43
|
if (!value.startsWith('0x'))
|
|
44
44
|
throw new InvalidHexValueError(value);
|
|
45
|
+
if (even && value.length % 2 !== 0)
|
|
46
|
+
throw new InvalidLengthError(value);
|
|
45
47
|
}
|
|
46
48
|
function concat(...values) {
|
|
47
49
|
return `0x${values.reduce((acc, x) => acc + x.replace('0x', ''), '')}`;
|
|
@@ -179,9 +181,9 @@ function toString(hex, options = {}) {
|
|
|
179
181
|
return new TextDecoder().decode(bytes);
|
|
180
182
|
}
|
|
181
183
|
function validate(value, options = {}) {
|
|
182
|
-
const { strict = false } = options;
|
|
184
|
+
const { even = false, strict = false } = options;
|
|
183
185
|
try {
|
|
184
|
-
assert(value, { strict });
|
|
186
|
+
assert(value, { even, strict });
|
|
185
187
|
return true;
|
|
186
188
|
}
|
|
187
189
|
catch {
|
package/_cjs/core/Hex.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Hex.js","sourceRoot":"","sources":["../../core/Hex.ts"],"names":[],"mappings":";;;AAgCA,
|
|
1
|
+
{"version":3,"file":"Hex.js","sourceRoot":"","sources":["../../core/Hex.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,11 @@ function fromHttp(url, options = {}) {
|
|
|
14
14
|
const fetchOptions = typeof fetchOptions_ === 'function'
|
|
15
15
|
? await fetchOptions_(body_)
|
|
16
16
|
: fetchOptions_;
|
|
17
|
-
const response = await promise.withTimeout(({ signal }) => {
|
|
17
|
+
const { data, response } = await promise.withTimeout(async ({ signal }) => {
|
|
18
|
+
const signals = [
|
|
19
|
+
fetchOptions?.signal,
|
|
20
|
+
timeout > 0 ? signal : null,
|
|
21
|
+
].filter((s) => Boolean(s));
|
|
18
22
|
const init = {
|
|
19
23
|
...fetchOptions,
|
|
20
24
|
body,
|
|
@@ -23,30 +27,39 @@ function fromHttp(url, options = {}) {
|
|
|
23
27
|
...fetchOptions?.headers,
|
|
24
28
|
},
|
|
25
29
|
method: fetchOptions?.method ?? 'POST',
|
|
26
|
-
signal:
|
|
30
|
+
signal: (() => {
|
|
31
|
+
if (signals.length < 2)
|
|
32
|
+
return signals[0] ?? null;
|
|
33
|
+
if (typeof AbortSignal.any !== 'function')
|
|
34
|
+
return signals[0];
|
|
35
|
+
return AbortSignal.any(signals);
|
|
36
|
+
})(),
|
|
27
37
|
};
|
|
28
38
|
const request = new Request(url, init);
|
|
29
|
-
|
|
39
|
+
const response = await fetchFn(request);
|
|
40
|
+
const data = await (async () => {
|
|
41
|
+
if (response.headers
|
|
42
|
+
.get('Content-Type')
|
|
43
|
+
?.startsWith('application/json'))
|
|
44
|
+
return response.json();
|
|
45
|
+
return response.text().then((data) => {
|
|
46
|
+
try {
|
|
47
|
+
return JSON.parse(data || '{}');
|
|
48
|
+
}
|
|
49
|
+
catch (_err) {
|
|
50
|
+
if (response.ok)
|
|
51
|
+
throw new MalformedResponseError({
|
|
52
|
+
response: data,
|
|
53
|
+
});
|
|
54
|
+
return { error: data };
|
|
55
|
+
}
|
|
56
|
+
});
|
|
57
|
+
})();
|
|
58
|
+
return { data, response };
|
|
30
59
|
}, {
|
|
31
60
|
timeout,
|
|
32
61
|
signal: true,
|
|
33
62
|
});
|
|
34
|
-
const data = await (async () => {
|
|
35
|
-
if (response.headers.get('Content-Type')?.startsWith('application/json'))
|
|
36
|
-
return response.json();
|
|
37
|
-
return response.text().then((data) => {
|
|
38
|
-
try {
|
|
39
|
-
return JSON.parse(data || '{}');
|
|
40
|
-
}
|
|
41
|
-
catch (_err) {
|
|
42
|
-
if (response.ok)
|
|
43
|
-
throw new MalformedResponseError({
|
|
44
|
-
response: data,
|
|
45
|
-
});
|
|
46
|
-
return { error: data };
|
|
47
|
-
}
|
|
48
|
-
});
|
|
49
|
-
})();
|
|
50
63
|
if (!response.ok)
|
|
51
64
|
throw new HttpError({
|
|
52
65
|
body,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RpcTransport.js","sourceRoot":"","sources":["../../core/RpcTransport.ts"],"names":[],"mappings":";;;AA6EA,
|
|
1
|
+
{"version":3,"file":"RpcTransport.js","sourceRoot":"","sources":["../../core/RpcTransport.ts"],"names":[],"mappings":"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"}
|
package/_cjs/core/Siwe.js
CHANGED
|
@@ -9,7 +9,7 @@ exports.validateMessage = validateMessage;
|
|
|
9
9
|
const Address = require("./Address.js");
|
|
10
10
|
const Errors = require("./Errors.js");
|
|
11
11
|
const uid_js_1 = require("./internal/uid.js");
|
|
12
|
-
exports.domainRegex = /^([a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}(:[0-9]{1,5})?$/;
|
|
12
|
+
exports.domainRegex = /^([a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+(?:[a-zA-Z]{2,63}|[xX][nN]--[a-zA-Z0-9-]{0,58}[a-zA-Z0-9])(:[0-9]{1,5})?$/;
|
|
13
13
|
exports.ipRegex = /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(:[0-9]{1,5})?$/;
|
|
14
14
|
exports.localhostRegex = /^localhost(:[0-9]{1,5})?$/;
|
|
15
15
|
exports.nonceRegex = /^[a-zA-Z0-9]{8,}$/;
|
package/_cjs/core/Siwe.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Siwe.js","sourceRoot":"","sources":["../../core/Siwe.ts"],"names":[],"mappings":";;;AA8GA,sCAsIC;AAsBD,sCAEC;AAiBD,sBAyCC;AAwCD,oCAwCC;AA4BD,0CAkBC;AApcD,wCAAuC;AACvC,sCAAqC;AAErC,8CAAuC;AAE1B,QAAA,WAAW,GACtB,
|
|
1
|
+
{"version":3,"file":"Siwe.js","sourceRoot":"","sources":["../../core/Siwe.ts"],"names":[],"mappings":"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"}
|
package/_cjs/core/TypedData.js
CHANGED
|
@@ -120,7 +120,7 @@ function encodeType(value) {
|
|
|
120
120
|
function extractEip712DomainTypes(domain) {
|
|
121
121
|
return [
|
|
122
122
|
typeof domain?.name === 'string' && { name: 'name', type: 'string' },
|
|
123
|
-
domain?.version && { name: 'version', type: 'string' },
|
|
123
|
+
typeof domain?.version === 'string' && { name: 'version', type: 'string' },
|
|
124
124
|
(typeof domain?.chainId === 'number' ||
|
|
125
125
|
typeof domain?.chainId === 'bigint') && {
|
|
126
126
|
name: 'chainId',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TypedData.js","sourceRoot":"","sources":["../../core/TypedData.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"TypedData.js","sourceRoot":"","sources":["../../core/TypedData.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ exports.isArgOfType = isArgOfType;
|
|
|
5
5
|
exports.getAmbiguousTypes = getAmbiguousTypes;
|
|
6
6
|
const Address = require("../Address.js");
|
|
7
7
|
const Errors = require("../Errors.js");
|
|
8
|
+
const abiParameters_js_1 = require("./abiParameters.js");
|
|
8
9
|
function normalizeSignature(signature) {
|
|
9
10
|
let active = true;
|
|
10
11
|
let current = '';
|
|
@@ -34,7 +35,7 @@ function normalizeSignature(signature) {
|
|
|
34
35
|
continue;
|
|
35
36
|
}
|
|
36
37
|
if (char === ' ') {
|
|
37
|
-
if (
|
|
38
|
+
if (!current.endsWith(',') && !current.endsWith('(')) {
|
|
38
39
|
current = '';
|
|
39
40
|
active = false;
|
|
40
41
|
}
|
|
@@ -62,17 +63,21 @@ function isArgOfType(arg, abiParameter) {
|
|
|
62
63
|
default: {
|
|
63
64
|
if (abiParameterType === 'tuple' && 'components' in abiParameter)
|
|
64
65
|
return Object.values(abiParameter.components).every((component, index) => {
|
|
65
|
-
return
|
|
66
|
+
return (argType === 'object' &&
|
|
67
|
+
isArgOfType(getComponentValue(arg, component, index), component));
|
|
66
68
|
});
|
|
67
69
|
if (/^u?int(8|16|24|32|40|48|56|64|72|80|88|96|104|112|120|128|136|144|152|160|168|176|184|192|200|208|216|224|232|240|248|256)?$/.test(abiParameterType))
|
|
68
70
|
return argType === 'number' || argType === 'bigint';
|
|
69
71
|
if (/^bytes([1-9]|1[0-9]|2[0-9]|3[0-2])?$/.test(abiParameterType))
|
|
70
72
|
return argType === 'string' || arg instanceof Uint8Array;
|
|
71
|
-
|
|
73
|
+
const arrayComponents = (0, abiParameters_js_1.getArrayComponents)(abiParameterType);
|
|
74
|
+
if (arrayComponents) {
|
|
75
|
+
const [length, type] = arrayComponents;
|
|
72
76
|
return (Array.isArray(arg) &&
|
|
77
|
+
(length === null || arg.length === length) &&
|
|
73
78
|
arg.every((x) => isArgOfType(x, {
|
|
74
79
|
...abiParameter,
|
|
75
|
-
type
|
|
80
|
+
type,
|
|
76
81
|
})));
|
|
77
82
|
}
|
|
78
83
|
return false;
|
|
@@ -83,23 +88,45 @@ function getAmbiguousTypes(sourceParameters, targetParameters, args) {
|
|
|
83
88
|
for (const parameterIndex in sourceParameters) {
|
|
84
89
|
const sourceParameter = sourceParameters[parameterIndex];
|
|
85
90
|
const targetParameter = targetParameters[parameterIndex];
|
|
91
|
+
if (!targetParameter)
|
|
92
|
+
continue;
|
|
86
93
|
if (sourceParameter.type === 'tuple' &&
|
|
87
94
|
targetParameter.type === 'tuple' &&
|
|
88
95
|
'components' in sourceParameter &&
|
|
89
|
-
'components' in targetParameter)
|
|
90
|
-
|
|
96
|
+
'components' in targetParameter) {
|
|
97
|
+
const value = args[parameterIndex];
|
|
98
|
+
const types = getAmbiguousTypes(sourceParameter.components, targetParameter.components, sourceParameter.components.map((component, index) => getComponentValue(value, component, index)));
|
|
99
|
+
if (types)
|
|
100
|
+
return types;
|
|
101
|
+
continue;
|
|
102
|
+
}
|
|
103
|
+
const sourceArray = (0, abiParameters_js_1.getArrayComponents)(sourceParameter.type);
|
|
104
|
+
const targetArray = (0, abiParameters_js_1.getArrayComponents)(targetParameter.type);
|
|
105
|
+
if (sourceArray && targetArray) {
|
|
106
|
+
const types = getAmbiguousTypes([
|
|
107
|
+
{
|
|
108
|
+
...sourceParameter,
|
|
109
|
+
type: sourceArray[1],
|
|
110
|
+
},
|
|
111
|
+
], [
|
|
112
|
+
{
|
|
113
|
+
...targetParameter,
|
|
114
|
+
type: targetArray[1],
|
|
115
|
+
},
|
|
116
|
+
], [args[parameterIndex]?.[0]]);
|
|
117
|
+
if (types)
|
|
118
|
+
return types;
|
|
119
|
+
continue;
|
|
120
|
+
}
|
|
91
121
|
const types = [sourceParameter.type, targetParameter.type];
|
|
122
|
+
const value = args[parameterIndex];
|
|
92
123
|
const ambiguous = (() => {
|
|
93
124
|
if (types.includes('address') && types.includes('bytes20'))
|
|
94
125
|
return true;
|
|
95
|
-
if (types.includes('address') &&
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
if (types.includes('address') && types.includes('bytes'))
|
|
100
|
-
return Address.validate(args[parameterIndex], {
|
|
101
|
-
strict: false,
|
|
102
|
-
});
|
|
126
|
+
if (types.includes('address') &&
|
|
127
|
+
(types.includes('string') || types.includes('bytes')))
|
|
128
|
+
return (value === undefined ||
|
|
129
|
+
Address.validate(value, { strict: false }));
|
|
103
130
|
return false;
|
|
104
131
|
})();
|
|
105
132
|
if (ambiguous)
|
|
@@ -107,4 +134,9 @@ function getAmbiguousTypes(sourceParameters, targetParameters, args) {
|
|
|
107
134
|
}
|
|
108
135
|
return;
|
|
109
136
|
}
|
|
137
|
+
function getComponentValue(arg, component, index) {
|
|
138
|
+
if (Array.isArray(arg))
|
|
139
|
+
return arg[index];
|
|
140
|
+
return arg?.[component.name];
|
|
141
|
+
}
|
|
110
142
|
//# sourceMappingURL=abiItem.js.map
|