ox 0.14.59 → 0.14.61
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 +20 -0
- package/_cjs/core/TxEnvelope.js +5 -3
- package/_cjs/core/TxEnvelope.js.map +1 -1
- package/_cjs/core/TxEnvelopeEip1559.js +5 -2
- package/_cjs/core/TxEnvelopeEip1559.js.map +1 -1
- package/_cjs/core/TxEnvelopeEip4844.js +3 -0
- package/_cjs/core/TxEnvelopeEip4844.js.map +1 -1
- package/_cjs/core/TxEnvelopeEip7702.js +3 -0
- package/_cjs/core/TxEnvelopeEip7702.js.map +1 -1
- package/_cjs/core/TypedData.js +46 -13
- package/_cjs/core/TypedData.js.map +1 -1
- package/_cjs/core/internal/abiItem.js +28 -7
- package/_cjs/core/internal/abiItem.js.map +1 -1
- package/_cjs/core/internal/abiParameters.js +20 -7
- package/_cjs/core/internal/abiParameters.js.map +1 -1
- package/_cjs/tempo/KeyAuthorization.js.map +1 -1
- package/_cjs/tempo/TxEnvelopeTempo.js +5 -2
- package/_cjs/tempo/TxEnvelopeTempo.js.map +1 -1
- package/_cjs/version.js +1 -1
- package/_esm/core/TxEnvelope.js +5 -3
- package/_esm/core/TxEnvelope.js.map +1 -1
- package/_esm/core/TxEnvelopeEip1559.js +6 -2
- package/_esm/core/TxEnvelopeEip1559.js.map +1 -1
- package/_esm/core/TxEnvelopeEip4844.js +4 -0
- package/_esm/core/TxEnvelopeEip4844.js.map +1 -1
- package/_esm/core/TxEnvelopeEip7702.js +4 -0
- package/_esm/core/TxEnvelopeEip7702.js.map +1 -1
- package/_esm/core/TypedData.js +56 -13
- package/_esm/core/TypedData.js.map +1 -1
- package/_esm/core/internal/abiItem.js +37 -7
- package/_esm/core/internal/abiItem.js.map +1 -1
- package/_esm/core/internal/abiParameters.js +24 -7
- package/_esm/core/internal/abiParameters.js.map +1 -1
- package/_esm/tempo/KeyAuthorization.js +7 -4
- package/_esm/tempo/KeyAuthorization.js.map +1 -1
- package/_esm/tempo/TxEnvelopeTempo.js +6 -2
- package/_esm/tempo/TxEnvelopeTempo.js.map +1 -1
- package/_esm/version.js +1 -1
- package/_types/core/TxEnvelope.d.ts.map +1 -1
- package/_types/core/TxEnvelopeEip1559.d.ts.map +1 -1
- package/_types/core/TxEnvelopeEip4844.d.ts.map +1 -1
- package/_types/core/TxEnvelopeEip7702.d.ts.map +1 -1
- package/_types/core/TypedData.d.ts +8 -1
- package/_types/core/TypedData.d.ts.map +1 -1
- package/_types/core/internal/abiItem.d.ts.map +1 -1
- package/_types/core/internal/abiParameters.d.ts +2 -2
- package/_types/core/internal/abiParameters.d.ts.map +1 -1
- package/_types/core/internal/rpcSchemas/eth.d.ts +3 -2
- package/_types/core/internal/rpcSchemas/eth.d.ts.map +1 -1
- package/_types/tempo/KeyAuthorization.d.ts +26 -8
- package/_types/tempo/KeyAuthorization.d.ts.map +1 -1
- package/_types/tempo/TxEnvelopeTempo.d.ts.map +1 -1
- package/_types/version.d.ts +1 -1
- package/core/TxEnvelope.ts +5 -3
- package/core/TxEnvelopeEip1559.ts +8 -2
- package/core/TxEnvelopeEip4844.ts +6 -0
- package/core/TxEnvelopeEip7702.ts +6 -0
- package/core/TypedData.ts +57 -12
- package/core/internal/abiItem.ts +39 -6
- package/core/internal/abiParameters.ts +26 -8
- package/core/internal/rpcSchemas/eth.ts +11 -8
- package/package.json +1 -1
- package/tempo/KeyAuthorization.test.ts +6 -4
- package/tempo/KeyAuthorization.ts +31 -10
- package/tempo/TxEnvelopeTempo.test.ts +51 -0
- package/tempo/TxEnvelopeTempo.ts +8 -2
- package/tempo/e2e.test.ts +73 -17
- package/version.ts +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,25 @@
|
|
|
1
1
|
# ox
|
|
2
2
|
|
|
3
|
+
## 0.14.61
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#561](https://github.com/wevm/ox/pull/561) [`f9e8a6e`](https://github.com/wevm/ox/commit/f9e8a6e1ea057f1c597dc809266cd9ae1382f3e2) Thanks [@jxom](https://github.com/jxom)! - Fixed `AbiItem.fromAbi` resolving indistinguishable overloads, such as `bytes32` and `bytes`, `uint256` and `int256`, or `uint256[]` and `uint256[2]`, to the last match. It now throws `AbiItem.AmbiguityError`, and a selector selects the overload. An overload matches only an integer in its range or fixed bytes of its size.
|
|
8
|
+
|
|
9
|
+
- [#559](https://github.com/wevm/ox/pull/559) [`4f5a87a`](https://github.com/wevm/ox/commit/4f5a87ae99e0f34e29da0e81f13bb8ac2aade921) Thanks [@jxom](https://github.com/jxom)! - Fixed `AbiParameters.decode` accepting `intN`/`uintN` words outside the declared type's range and `address` words with non-zero padding; it now throws `Hex.IntegerOutOfRangeError` or `Address.InvalidAddressError`, matching Solidity's `abi.decode`.
|
|
10
|
+
|
|
11
|
+
- [#555](https://github.com/wevm/ox/pull/555) [`c18169b`](https://github.com/wevm/ox/commit/c18169b8a7edcd774d7545ba008f6a702e87d816) Thanks [@jxom](https://github.com/jxom)! - Deprecated `KeyAuthorization` `isAdmin` and updated `account` docs for TIP-1137, which removes admin access keys at T14 while keeping their wire encoding decodable.
|
|
12
|
+
|
|
13
|
+
- [#561](https://github.com/wevm/ox/pull/561) [`f9e8a6e`](https://github.com/wevm/ox/commit/f9e8a6e1ea057f1c597dc809266cd9ae1382f3e2) Thanks [@jxom](https://github.com/jxom)! - Fixed `TxEnvelopeEip1559.assert`, `TxEnvelopeEip4844.assert`, `TxEnvelopeEip7702.assert`, and `TxEnvelopeTempo.assert` accepting a `maxPriorityFeePerGas` above a zero `maxFeePerGas`. Their `deserialize` functions now read an empty `maxFeePerGas` as zero when a tip is set, so such a transaction throws `TransactionEnvelope.TipAboveFeeCapError`. Zero fees now show in the error messages.
|
|
14
|
+
|
|
15
|
+
- [#561](https://github.com/wevm/ox/pull/561) [`f9e8a6e`](https://github.com/wevm/ox/commit/f9e8a6e1ea057f1c597dc809266cd9ae1382f3e2) Thanks [@jxom](https://github.com/jxom)! - Fixed `TypedData.assert` and `TypedData.validate` accepting invalid struct names, such as `uint7`, `bytes32` or `Foo.Bar`, and invalid field types, such as `uint`, `uint7`, `bytes0` or an undefined struct, including in structs referenced only as array elements. They now throw `TypedData.InvalidStructTypeError` and the new `TypedData.InvalidTypeError`. `TypedData.encodeType` now includes struct names that contain `# ox.
|
|
16
|
+
|
|
17
|
+
## 0.14.60
|
|
18
|
+
|
|
19
|
+
### Patch Changes
|
|
20
|
+
|
|
21
|
+
- [#540](https://github.com/wevm/ox/pull/540) [`1c17b2d`](https://github.com/wevm/ox/commit/1c17b2dbb1d24792c2513e1dcb61edcb32d1b3c7) Thanks [@jxom](https://github.com/jxom)! - Typed the `eth_fillTransaction` result `tx` as a `OneOf` union so common fields like `gas` are readable as optional across all envelope types.
|
|
22
|
+
|
|
3
23
|
## 0.14.59
|
|
4
24
|
|
|
5
25
|
### Patch Changes
|
package/_cjs/core/TxEnvelope.js
CHANGED
|
@@ -5,7 +5,7 @@ const Errors = require("./Errors.js");
|
|
|
5
5
|
const Value = require("./Value.js");
|
|
6
6
|
class FeeCapTooHighError extends Errors.BaseError {
|
|
7
7
|
constructor({ feeCap, } = {}) {
|
|
8
|
-
super(`The fee cap (\`maxFeePerGas\`/\`maxPriorityFeePerGas\`${feeCap ? ` = ${Value.formatGwei(feeCap)} gwei` : ''}) cannot be higher than the maximum allowed value (2^256-1).`);
|
|
8
|
+
super(`The fee cap (\`maxFeePerGas\`/\`maxPriorityFeePerGas\`${typeof feeCap === 'bigint' ? ` = ${Value.formatGwei(feeCap)} gwei` : ''}) cannot be higher than the maximum allowed value (2^256-1).`);
|
|
9
9
|
Object.defineProperty(this, "name", {
|
|
10
10
|
enumerable: true,
|
|
11
11
|
configurable: true,
|
|
@@ -64,9 +64,11 @@ exports.InvalidSerializedError = InvalidSerializedError;
|
|
|
64
64
|
class TipAboveFeeCapError extends Errors.BaseError {
|
|
65
65
|
constructor({ maxPriorityFeePerGas, maxFeePerGas, } = {}) {
|
|
66
66
|
super([
|
|
67
|
-
`The provided tip (\`maxPriorityFeePerGas\`${maxPriorityFeePerGas
|
|
67
|
+
`The provided tip (\`maxPriorityFeePerGas\`${typeof maxPriorityFeePerGas === 'bigint'
|
|
68
68
|
? ` = ${Value.formatGwei(maxPriorityFeePerGas)} gwei`
|
|
69
|
-
: ''}) cannot be higher than the fee cap (\`maxFeePerGas\`${
|
|
69
|
+
: ''}) cannot be higher than the fee cap (\`maxFeePerGas\`${typeof maxFeePerGas === 'bigint'
|
|
70
|
+
? ` = ${Value.formatGwei(maxFeePerGas)} gwei`
|
|
71
|
+
: ''}).`,
|
|
70
72
|
].join('\n'));
|
|
71
73
|
Object.defineProperty(this, "name", {
|
|
72
74
|
enumerable: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TxEnvelope.js","sourceRoot":"","sources":["../../core/TxEnvelope.ts"],"names":[],"mappings":";;;AACA,sCAAqC;AAGrC,oCAAmC;AA8DnC,MAAa,kBAAmB,SAAQ,MAAM,CAAC,SAAS;IAEtD,YAAY,EACV,MAAM,MAGJ,EAAE;QACJ,KAAK,CACH,yDACE,MAAM,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"TxEnvelope.js","sourceRoot":"","sources":["../../core/TxEnvelope.ts"],"names":[],"mappings":";;;AACA,sCAAqC;AAGrC,oCAAmC;AA8DnC,MAAa,kBAAmB,SAAQ,MAAM,CAAC,SAAS;IAEtD,YAAY,EACV,MAAM,MAGJ,EAAE;QACJ,KAAK,CACH,yDACE,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EACvE,8DAA8D,CAC/D,CAAA;QAVe;;;;mBAAO,wCAAwC;WAAA;IAWjE,CAAC;CACF;AAbD,gDAaC;AAgBD,MAAa,oBAAqB,SAAQ,MAAM,CAAC,SAAS;IAExD,YAAY,EACV,QAAQ,MAGN,EAAE;QACJ,KAAK,CACH,8BACE,QAAQ,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EACvD,8DAA8D,CAC/D,CAAA;QAVe;;;;mBAAO,0CAA0C;WAAA;IAWnE,CAAC;CACF;AAbD,oDAaC;AAaD,MAAa,mBAAoB,SAAQ,MAAM,CAAC,SAAS;IAEvD,YAAY,EAAE,OAAO,EAAoC;QACvD,KAAK,CACH,OAAO,OAAO,KAAK,WAAW;YAC5B,CAAC,CAAC,aAAa,OAAO,eAAe;YACrC,CAAC,CAAC,sBAAsB,CAC3B,CAAA;QANe;;;;mBAAO,yCAAyC;WAAA;IAOlE,CAAC;CACF;AATD,kDASC;AAeD,MAAa,sBAAuB,SAAQ,MAAM,CAAC,SAAS;IAE1D,YAAY,EACV,UAAU,EACV,UAAU,EACV,IAAI,GAKL;QACC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC;aACvC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,KAAK,KAAK,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;aACvE,MAAM,CAAC,OAAO,CAAC,CAAA;QAClB,KAAK,CAAC,2CAA2C,IAAI,iBAAiB,EAAE;YACtE,YAAY,EAAE;gBACZ,4BAA4B,UAAU,GAAG;gBACzC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,uBAAuB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE;aACtE,CAAC,MAAM,CAAC,OAAO,CAAC;SAClB,CAAC,CAAA;QAlBc;;;;mBAAO,4CAA4C;WAAA;IAmBrE,CAAC;CACF;AArBD,wDAqBC;AAiBD,MAAa,mBAAoB,SAAQ,MAAM,CAAC,SAAS;IAEvD,YAAY,EACV,oBAAoB,EACpB,YAAY,MAIV,EAAE;QACJ,KAAK,CACH;YACE,6CACE,OAAO,oBAAoB,KAAK,QAAQ;gBACtC,CAAC,CAAC,MAAM,KAAK,CAAC,UAAU,CAAC,oBAAoB,CAAC,OAAO;gBACrD,CAAC,CAAC,EACN,wDACE,OAAO,YAAY,KAAK,QAAQ;gBAC9B,CAAC,CAAC,MAAM,KAAK,CAAC,UAAU,CAAC,YAAY,CAAC,OAAO;gBAC7C,CAAC,CAAC,EACN,IAAI;SACL,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAA;QApBe;;;;mBAAO,yCAAyC;WAAA;IAqBlE,CAAC;CACF;AAvBD,kDAuBC"}
|
|
@@ -26,8 +26,8 @@ function assert(envelope) {
|
|
|
26
26
|
Address.assert(to, { strict: false });
|
|
27
27
|
if (maxFeePerGas && BigInt(maxFeePerGas) > 2n ** 256n - 1n)
|
|
28
28
|
throw new TransactionEnvelope.FeeCapTooHighError({ feeCap: maxFeePerGas });
|
|
29
|
-
if (maxPriorityFeePerGas &&
|
|
30
|
-
maxFeePerGas &&
|
|
29
|
+
if (typeof maxPriorityFeePerGas === 'bigint' &&
|
|
30
|
+
typeof maxFeePerGas === 'bigint' &&
|
|
31
31
|
maxPriorityFeePerGas > maxFeePerGas)
|
|
32
32
|
throw new TransactionEnvelope.TipAboveFeeCapError({
|
|
33
33
|
maxFeePerGas,
|
|
@@ -78,6 +78,9 @@ function deserialize(serialized) {
|
|
|
78
78
|
transaction.maxFeePerGas = BigInt(maxFeePerGas);
|
|
79
79
|
if (Hex.validate(maxPriorityFeePerGas) && maxPriorityFeePerGas !== '0x')
|
|
80
80
|
transaction.maxPriorityFeePerGas = BigInt(maxPriorityFeePerGas);
|
|
81
|
+
if (transaction.maxPriorityFeePerGas &&
|
|
82
|
+
typeof transaction.maxFeePerGas === 'undefined')
|
|
83
|
+
transaction.maxFeePerGas = 0n;
|
|
81
84
|
if (accessList.length !== 0 && accessList !== '0x')
|
|
82
85
|
transaction.accessList = AccessList.fromTupleList(accessList);
|
|
83
86
|
const signature = r && s && yParity ? Signature.fromTuple([yParity, r, s]) : undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TxEnvelopeEip1559.js","sourceRoot":"","sources":["../../core/TxEnvelopeEip1559.ts"],"names":[],"mappings":";;;AAoEA,wBAgBC;AAgCD,
|
|
1
|
+
{"version":3,"file":"TxEnvelopeEip1559.js","sourceRoot":"","sources":["../../core/TxEnvelopeEip1559.ts"],"names":[],"mappings":"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"}
|
|
@@ -94,6 +94,9 @@ function deserialize(serialized) {
|
|
|
94
94
|
transaction.maxFeePerGas = BigInt(maxFeePerGas);
|
|
95
95
|
if (Hex.validate(maxPriorityFeePerGas) && maxPriorityFeePerGas !== '0x')
|
|
96
96
|
transaction.maxPriorityFeePerGas = BigInt(maxPriorityFeePerGas);
|
|
97
|
+
if (transaction.maxPriorityFeePerGas &&
|
|
98
|
+
typeof transaction.maxFeePerGas === 'undefined')
|
|
99
|
+
transaction.maxFeePerGas = 0n;
|
|
97
100
|
if (accessList?.length !== 0 && accessList !== '0x')
|
|
98
101
|
transaction.accessList = AccessList.fromTupleList(accessList);
|
|
99
102
|
if (blobs && commitments && proofs)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TxEnvelopeEip4844.js","sourceRoot":"","sources":["../../core/TxEnvelopeEip4844.ts"],"names":[],"mappings":";;;AA0EA,wBAoBC;AAoCD,
|
|
1
|
+
{"version":3,"file":"TxEnvelopeEip4844.js","sourceRoot":"","sources":["../../core/TxEnvelopeEip4844.ts"],"names":[],"mappings":"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"}
|
|
@@ -77,6 +77,9 @@ function deserialize(serialized) {
|
|
|
77
77
|
transaction.maxFeePerGas = BigInt(maxFeePerGas);
|
|
78
78
|
if (Hex.validate(maxPriorityFeePerGas) && maxPriorityFeePerGas !== '0x')
|
|
79
79
|
transaction.maxPriorityFeePerGas = BigInt(maxPriorityFeePerGas);
|
|
80
|
+
if (transaction.maxPriorityFeePerGas &&
|
|
81
|
+
typeof transaction.maxFeePerGas === 'undefined')
|
|
82
|
+
transaction.maxFeePerGas = 0n;
|
|
80
83
|
if (accessList.length !== 0 && accessList !== '0x')
|
|
81
84
|
transaction.accessList = AccessList.fromTupleList(accessList);
|
|
82
85
|
if (authorizationList !== '0x')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TxEnvelopeEip7702.js","sourceRoot":"","sources":["../../core/TxEnvelopeEip7702.ts"],"names":[],"mappings":";;;AAyEA,wBAaC;AA+BD,
|
|
1
|
+
{"version":3,"file":"TxEnvelopeEip7702.js","sourceRoot":"","sources":["../../core/TxEnvelopeEip7702.ts"],"names":[],"mappings":"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"}
|
package/_cjs/core/TypedData.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.InvalidStructTypeError = exports.InvalidPrimaryTypeError = exports.InvalidDomainError = exports.BytesSizeMismatchError = void 0;
|
|
3
|
+
exports.InvalidTypeError = exports.InvalidStructTypeError = exports.InvalidPrimaryTypeError = exports.InvalidDomainError = exports.BytesSizeMismatchError = void 0;
|
|
4
4
|
exports.assert = assert;
|
|
5
5
|
exports.domainSeparator = domainSeparator;
|
|
6
6
|
exports.encode = encode;
|
|
@@ -54,13 +54,15 @@ function assert(value) {
|
|
|
54
54
|
givenSize: Hex.size(value),
|
|
55
55
|
});
|
|
56
56
|
}
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
validateReference(type);
|
|
60
|
-
validateData(struct, value);
|
|
61
|
-
}
|
|
57
|
+
if (Object.hasOwn(types, type))
|
|
58
|
+
validateData(types[type], value);
|
|
62
59
|
}
|
|
63
60
|
};
|
|
61
|
+
for (const type of Object.keys(types))
|
|
62
|
+
validateReference(type);
|
|
63
|
+
for (const struct of Object.values(types))
|
|
64
|
+
for (const field of struct ?? [])
|
|
65
|
+
validateField(field.type, types);
|
|
64
66
|
if (types.EIP712Domain && domain) {
|
|
65
67
|
if (typeof domain !== 'object')
|
|
66
68
|
throw new InvalidDomainError({ domain });
|
|
@@ -238,7 +240,9 @@ exports.InvalidPrimaryTypeError = InvalidPrimaryTypeError;
|
|
|
238
240
|
class InvalidStructTypeError extends Errors.BaseError {
|
|
239
241
|
constructor({ type }) {
|
|
240
242
|
super(`Struct type "${type}" is invalid.`, {
|
|
241
|
-
metaMessages: [
|
|
243
|
+
metaMessages: [
|
|
244
|
+
'Struct type must contain only letters, digits, "_" and "$", and must not be a Solidity type.',
|
|
245
|
+
],
|
|
242
246
|
});
|
|
243
247
|
Object.defineProperty(this, "name", {
|
|
244
248
|
enumerable: true,
|
|
@@ -249,6 +253,23 @@ class InvalidStructTypeError extends Errors.BaseError {
|
|
|
249
253
|
}
|
|
250
254
|
}
|
|
251
255
|
exports.InvalidStructTypeError = InvalidStructTypeError;
|
|
256
|
+
class InvalidTypeError extends Errors.BaseError {
|
|
257
|
+
constructor({ type }) {
|
|
258
|
+
const isAlias = /^u?int(\[[0-9]*\])*$/.test(type);
|
|
259
|
+
super(`Type "${type}" is not a valid EIP-712 type.`, {
|
|
260
|
+
metaMessages: isAlias
|
|
261
|
+
? [`Use "${type.replace(/^(u?int)/, '$&256')}" instead.`]
|
|
262
|
+
: undefined,
|
|
263
|
+
});
|
|
264
|
+
Object.defineProperty(this, "name", {
|
|
265
|
+
enumerable: true,
|
|
266
|
+
configurable: true,
|
|
267
|
+
writable: true,
|
|
268
|
+
value: 'TypedData.InvalidTypeError'
|
|
269
|
+
});
|
|
270
|
+
}
|
|
271
|
+
}
|
|
272
|
+
exports.InvalidTypeError = InvalidTypeError;
|
|
252
273
|
function encodeData(value) {
|
|
253
274
|
const { data, primaryType, types } = value;
|
|
254
275
|
const encodedTypes = [{ type: 'bytes32' }];
|
|
@@ -304,8 +325,7 @@ function encodeField(properties) {
|
|
|
304
325
|
}
|
|
305
326
|
function findTypeDependencies(value, results = new Set()) {
|
|
306
327
|
const { primaryType: primaryType_, types } = value;
|
|
307
|
-
const
|
|
308
|
-
const primaryType = match?.[0];
|
|
328
|
+
const primaryType = primaryType_.replace(/(\[[0-9]*\])+$/, '');
|
|
309
329
|
if (results.has(primaryType) || types[primaryType] === undefined)
|
|
310
330
|
return results;
|
|
311
331
|
results.add(primaryType);
|
|
@@ -313,13 +333,26 @@ function findTypeDependencies(value, results = new Set()) {
|
|
|
313
333
|
findTypeDependencies({ primaryType: field.type, types }, results);
|
|
314
334
|
return results;
|
|
315
335
|
}
|
|
336
|
+
function validateField(type, types) {
|
|
337
|
+
const baseType = type.replace(/(\[[0-9]*\])+$/, '');
|
|
338
|
+
if (baseType === 'int' || baseType === 'uint')
|
|
339
|
+
throw new InvalidTypeError({ type });
|
|
340
|
+
if (!Object.hasOwn(types, baseType) && !isSolidityType(baseType))
|
|
341
|
+
throw new InvalidTypeError({ type });
|
|
342
|
+
}
|
|
343
|
+
function isSolidityType(type) {
|
|
344
|
+
return (type === 'address' ||
|
|
345
|
+
type === 'bool' ||
|
|
346
|
+
type === 'string' ||
|
|
347
|
+
Solidity.bytesRegex.test(type) ||
|
|
348
|
+
Solidity.integerRegex.test(type));
|
|
349
|
+
}
|
|
316
350
|
function validateReference(type) {
|
|
317
|
-
if (type
|
|
351
|
+
if (!/^[A-Za-z0-9_$]+$/.test(type) ||
|
|
352
|
+
type === 'address' ||
|
|
318
353
|
type === 'bool' ||
|
|
319
354
|
type === 'string' ||
|
|
320
|
-
|
|
321
|
-
type.startsWith('uint') ||
|
|
322
|
-
type.startsWith('int'))
|
|
355
|
+
/^(u?int|bytes)[0-9]*$/.test(type))
|
|
323
356
|
throw new InvalidStructTypeError({ type });
|
|
324
357
|
}
|
|
325
358
|
//# sourceMappingURL=TypedData.js.map
|
|
@@ -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 Hex = require("../Hex.js");
|
|
8
9
|
const abiParameters_js_1 = require("./abiParameters.js");
|
|
9
10
|
function normalizeSignature(signature) {
|
|
10
11
|
let active = true;
|
|
@@ -66,10 +67,29 @@ function isArgOfType(arg, abiParameter) {
|
|
|
66
67
|
return (argType === 'object' &&
|
|
67
68
|
isArgOfType(getComponentValue(arg, component, index), component));
|
|
68
69
|
});
|
|
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))
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
70
|
+
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)) {
|
|
71
|
+
if (typeof arg !== 'bigint' && typeof arg !== 'number')
|
|
72
|
+
return false;
|
|
73
|
+
if (typeof arg === 'number' && !Number.isInteger(arg))
|
|
74
|
+
return false;
|
|
75
|
+
const signed = abiParameterType.startsWith('int');
|
|
76
|
+
const bits = Number.parseInt(abiParameterType.replace(/^u?int/, '') || '256', 10);
|
|
77
|
+
const max = 2n ** (BigInt(bits) - (signed ? 1n : 0n)) - 1n;
|
|
78
|
+
const min = signed ? -max - 1n : 0n;
|
|
79
|
+
return arg >= min && arg <= max;
|
|
80
|
+
}
|
|
81
|
+
if (/^bytes([1-9]|1[0-9]|2[0-9]|3[0-2])?$/.test(abiParameterType)) {
|
|
82
|
+
if (typeof arg !== 'string' && !(arg instanceof Uint8Array))
|
|
83
|
+
return false;
|
|
84
|
+
const bytes = abiParameterType.slice(5);
|
|
85
|
+
if (!bytes)
|
|
86
|
+
return true;
|
|
87
|
+
if (arg instanceof Uint8Array)
|
|
88
|
+
return arg.length === Number.parseInt(bytes, 10);
|
|
89
|
+
if (!Hex.validate(arg))
|
|
90
|
+
return false;
|
|
91
|
+
return Hex.size(arg) === Number.parseInt(bytes, 10);
|
|
92
|
+
}
|
|
73
93
|
const arrayComponents = (0, abiParameters_js_1.getArrayComponents)(abiParameterType);
|
|
74
94
|
if (arrayComponents) {
|
|
75
95
|
const [length, type] = arrayComponents;
|
|
@@ -116,18 +136,19 @@ function getAmbiguousTypes(sourceParameters, targetParameters, args) {
|
|
|
116
136
|
], [args[parameterIndex]?.[0]]);
|
|
117
137
|
if (types)
|
|
118
138
|
return types;
|
|
139
|
+
if (sourceArray[1] === targetArray[1] &&
|
|
140
|
+
sourceParameter.type !== targetParameter.type)
|
|
141
|
+
return [sourceParameter.type, targetParameter.type];
|
|
119
142
|
continue;
|
|
120
143
|
}
|
|
121
144
|
const types = [sourceParameter.type, targetParameter.type];
|
|
122
145
|
const value = args[parameterIndex];
|
|
123
146
|
const ambiguous = (() => {
|
|
124
|
-
if (types.includes('address') && types.includes('bytes20'))
|
|
125
|
-
return true;
|
|
126
147
|
if (types.includes('address') &&
|
|
127
148
|
(types.includes('string') || types.includes('bytes')))
|
|
128
149
|
return (value === undefined ||
|
|
129
150
|
Address.validate(value, { strict: false }));
|
|
130
|
-
return
|
|
151
|
+
return sourceParameter.type !== targetParameter.type;
|
|
131
152
|
})();
|
|
132
153
|
if (ambiguous)
|
|
133
154
|
return types;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abiItem.js","sourceRoot":"","sources":["../../../core/internal/abiItem.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"abiItem.js","sourceRoot":"","sources":["../../../core/internal/abiItem.ts"],"names":[],"mappings":"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"}
|
|
@@ -55,6 +55,12 @@ const sizeOfOffset = 32;
|
|
|
55
55
|
function decodeAddress(cursor, options = {}) {
|
|
56
56
|
const { checksum = false } = options;
|
|
57
57
|
const value = cursor.readBytes(32);
|
|
58
|
+
for (let i = 0; i < 12; i++)
|
|
59
|
+
if (value[i] !== 0)
|
|
60
|
+
throw new Address.InvalidAddressError({
|
|
61
|
+
address: Hex.fromBytes(value),
|
|
62
|
+
cause: new Address.InvalidInputError(),
|
|
63
|
+
});
|
|
58
64
|
const wrap = (address) => checksum ? Address.checksum(address) : address;
|
|
59
65
|
return [wrap(Hex.fromBytes(Bytes.slice(value, -20))), 32];
|
|
60
66
|
}
|
|
@@ -139,13 +145,20 @@ function decodeBytes(cursor, param, { staticPosition }) {
|
|
|
139
145
|
function decodeNumber(cursor, param) {
|
|
140
146
|
const signed = param.type.startsWith('int');
|
|
141
147
|
const size = Number.parseInt(param.type.split('int')[1] || '256', 10);
|
|
142
|
-
const value = cursor.readBytes(32);
|
|
143
|
-
|
|
144
|
-
size
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
148
|
+
const value = Bytes.toBigInt(cursor.readBytes(32), { signed });
|
|
149
|
+
if (size < 256) {
|
|
150
|
+
const max = (1n << BigInt(signed ? size - 1 : size)) - 1n;
|
|
151
|
+
const min = signed ? -max - 1n : 0n;
|
|
152
|
+
if (value > max || value < min)
|
|
153
|
+
throw new Hex.IntegerOutOfRangeError({
|
|
154
|
+
max: max.toString(),
|
|
155
|
+
min: min.toString(),
|
|
156
|
+
signed,
|
|
157
|
+
size: size / 8,
|
|
158
|
+
value: value.toString(),
|
|
159
|
+
});
|
|
160
|
+
}
|
|
161
|
+
return [size > 48 ? value : Number(value), 32];
|
|
149
162
|
}
|
|
150
163
|
function decodeTuple(cursor, param, options) {
|
|
151
164
|
const { checksumAddress, staticPosition } = options;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abiParameters.js","sourceRoot":"","sources":["../../../core/internal/abiParameters.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"abiParameters.js","sourceRoot":"","sources":["../../../core/internal/abiParameters.ts"],"names":[],"mappings":";;AA8DA,0CA6BC;AAmBD,sCAiBC;AAWD,kCAmGC;AAOD,gCAEC;AAOD,kCA+BC;AAUD,oCAsBC;AAeD,kCAwDC;AAOD,oCA0BC;AAWD,8CAwBC;AAQD,4CAwDC;AAgBD,wBA4BC;AAYD,sCAUC;AAWD,kCAkDC;AAaD,kCA0BC;AAaD,sCAMC;AAWD,oCAuBC;AAQD,oCAcC;AAaD,kCAgCC;AAQD,gDAQC;AAGD,0CAmBC;AAr0BD,qDAAoD;AACpD,yCAAwC;AACxC,qCAAoC;AACpC,uCAAsC;AACtC,iCAAgC;AAChC,gDAA6C;AAmD7C,SAAgB,eAAe,CAC7B,MAAqB,EACrB,KAA8B,EAC9B,OAA0E;IAE1E,MAAM,EAAE,eAAe,EAAE,cAAc,EAAE,GAAG,OAAO,CAAA;IACnD,MAAM,eAAe,GAAG,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACtD,IAAI,eAAe,EAAE,CAAC;QACpB,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,eAAe,CAAA;QACtC,OAAO,WAAW,CAChB,MAAM,EACN,EAAE,GAAG,KAAK,EAAE,IAAI,EAAE,EAClB,EAAE,eAAe,EAAE,MAAM,EAAE,cAAc,EAAE,CAC5C,CAAA;IACH,CAAC;IACD,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO;QACxB,OAAO,WAAW,CAAC,MAAM,EAAE,KAA0B,EAAE;YACrD,eAAe;YACf,cAAc;SACf,CAAC,CAAA;IACJ,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS;QAC1B,OAAO,aAAa,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC,CAAA;IAC7D,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM;QAAE,OAAO,UAAU,CAAC,MAAM,CAAC,CAAA;IACpD,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;QAChC,OAAO,WAAW,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,cAAc,EAAE,CAAC,CAAA;IACvD,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;QAC/D,OAAO,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IACpC,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ;QAAE,OAAO,YAAY,CAAC,MAAM,EAAE,EAAE,cAAc,EAAE,CAAC,CAAA;IAC5E,MAAM,IAAI,aAAa,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;AACtD,CAAC;AAeD,MAAM,YAAY,GAAG,EAAE,CAAA;AACvB,MAAM,YAAY,GAAG,EAAE,CAAA;AAGvB,SAAgB,aAAa,CAC3B,MAAqB,EACrB,UAA8C,EAAE;IAEhD,MAAM,EAAE,QAAQ,GAAG,KAAK,EAAE,GAAG,OAAO,CAAA;IACpC,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;IAGlC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE;QACzB,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;YAChB,MAAM,IAAI,OAAO,CAAC,mBAAmB,CAAC;gBACpC,OAAO,EAAE,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC;gBAC7B,KAAK,EAAE,IAAI,OAAO,CAAC,iBAAiB,EAAE;aACvC,CAAC,CAAA;IACN,MAAM,IAAI,GAAG,CAAC,OAAgB,EAAE,EAAE,CAChC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAA;IAChD,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;AAC3D,CAAC;AAWD,SAAgB,WAAW,CACzB,MAAqB,EACrB,KAA8B,EAC9B,OAIC;IAED,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,OAAO,CAAA;IAK3D,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QAEpB,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAA;QAG7D,MAAM,KAAK,GAAG,cAAc,GAAG,MAAM,CAAA;QACrC,MAAM,WAAW,GAAG,KAAK,GAAG,YAAY,CAAA;QAGxC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;QACzB,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAA;QAG7D,MAAM,YAAY,GAAG,eAAe,CAAC,KAAK,CAAC,CAAA;QAE3C,IAAI,QAAQ,GAAG,CAAC,CAAA;QAChB,MAAM,KAAK,GAAc,EAAE,CAAA;QAC3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;YAGhC,MAAM,CAAC,WAAW,CAAC,WAAW,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAA;YACpE,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,KAAK,EAAE;gBACvD,eAAe;gBACf,cAAc,EAAE,WAAW;aAC5B,CAAC,CAAA;YACF,QAAQ,IAAI,SAAS,CAAA;YACrB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAGhB,IAAI,SAAS,KAAK,CAAC,EAAE,CAAC;gBACpB,MAAM,CAAC,eAAe,EAAE,CAAA;gBACxB,MAAM,CAAC,MAAM,EAAE,CAAA;YACjB,CAAC;QACH,CAAC;QAGD,MAAM,CAAC,WAAW,CAAC,cAAc,GAAG,EAAE,CAAC,CAAA;QACvC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;IACpB,CAAC;IAKD,IAAI,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC;QAE3B,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAA;QAG7D,MAAM,KAAK,GAAG,cAAc,GAAG,MAAM,CAAA;QAErC,MAAM,KAAK,GAAc,EAAE,CAAA;QAC3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;YAEhC,MAAM,CAAC,WAAW,CAAC,KAAK,GAAG,CAAC,GAAG,EAAE,CAAC,CAAA;YAClC,MAAM,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,KAAK,EAAE;gBAC5C,eAAe;gBACf,cAAc,EAAE,KAAK;aACtB,CAAC,CAAA;YACF,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAClB,CAAC;QAGD,MAAM,CAAC,WAAW,CAAC,cAAc,GAAG,EAAE,CAAC,CAAA;QACvC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;IACpB,CAAC;IAID,IAAI,QAAQ,GAAG,CAAC,CAAA;IAChB,MAAM,KAAK,GAAc,EAAE,CAAA;IAC3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;QAChC,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,KAAK,EAAE;YACvD,eAAe;YACf,cAAc,EAAE,cAAc,GAAG,QAAQ;SAC1C,CAAC,CAAA;QACF,QAAQ,IAAI,SAAS,CAAA;QACrB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAGhB,IAAI,SAAS,KAAK,CAAC,EAAE,CAAC;YACpB,MAAM,CAAC,eAAe,EAAE,CAAA;YACxB,MAAM,CAAC,MAAM,EAAE,CAAA;QACjB,CAAC;IACH,CAAC;IACD,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;AAC1B,CAAC;AAOD,SAAgB,UAAU,CAAC,MAAqB;IAC9C,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;AAClE,CAAC;AAOD,SAAgB,WAAW,CACzB,MAAqB,EACrB,KAA8B,EAC9B,EAAE,cAAc,EAA8B;IAE9C,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IAC3C,IAAI,CAAC,IAAI,EAAE,CAAC;QAEV,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAA;QAGnD,MAAM,CAAC,WAAW,CAAC,cAAc,GAAG,MAAM,CAAC,CAAA;QAE3C,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAA;QAGnD,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC;YAEjB,MAAM,CAAC,WAAW,CAAC,cAAc,GAAG,EAAE,CAAC,CAAA;YACvC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;QACnB,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;QAGrC,MAAM,CAAC,WAAW,CAAC,cAAc,GAAG,EAAE,CAAC,CAAA;QACvC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAA;IAClC,CAAC;IAED,MAAM,KAAK,GAAG,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;IAC5E,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;AACpB,CAAC;AAUD,SAAgB,YAAY,CAC1B,MAAqB,EACrB,KAA8B;IAE9B,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;IAC3C,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,EAAE,CAAC,CAAA;IACrE,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;IAG9D,IAAI,IAAI,GAAG,GAAG,EAAE,CAAC;QACf,MAAM,GAAG,GAAG,CAAC,EAAE,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,CAAA;QACzD,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QACnC,IAAI,KAAK,GAAG,GAAG,IAAI,KAAK,GAAG,GAAG;YAC5B,MAAM,IAAI,GAAG,CAAC,sBAAsB,CAAC;gBACnC,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE;gBACnB,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE;gBACnB,MAAM;gBACN,IAAI,EAAE,IAAI,GAAG,CAAC;gBACd,KAAK,EAAE,KAAK,CAAC,QAAQ,EAAE;aACxB,CAAC,CAAA;IACN,CAAC;IACD,OAAO,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAA;AAChD,CAAC;AAeD,SAAgB,WAAW,CACzB,MAAqB,EACrB,KAAwB,EACxB,OAA0E;IAE1E,MAAM,EAAE,eAAe,EAAE,cAAc,EAAE,GAAG,OAAO,CAAA;IAMnD,MAAM,eAAe,GACnB,KAAK,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAA;IAI7E,MAAM,KAAK,GAAQ,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IAC5C,IAAI,QAAQ,GAAG,CAAC,CAAA;IAIhB,IAAI,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC;QAE3B,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAA;QAG7D,MAAM,KAAK,GAAG,cAAc,GAAG,MAAM,CAAA;QAErC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;YACjD,MAAM,SAAS,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC,CAAE,CAAA;YACtC,MAAM,CAAC,WAAW,CAAC,KAAK,GAAG,QAAQ,CAAC,CAAA;YACpC,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,SAAS,EAAE;gBAC3D,eAAe;gBACf,cAAc,EAAE,KAAK;aACtB,CAAC,CAAA;YACF,QAAQ,IAAI,SAAS,CAAA;YACrB,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,IAAK,CAAC,GAAG,IAAI,CAAA;QACtD,CAAC;QAGD,MAAM,CAAC,WAAW,CAAC,cAAc,GAAG,EAAE,CAAC,CAAA;QACvC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;IACpB,CAAC;IAID,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;QACjD,MAAM,SAAS,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC,CAAE,CAAA;QACtC,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,SAAS,EAAE;YAC3D,eAAe;YACf,cAAc;SACf,CAAC,CAAA;QACF,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,IAAK,CAAC,GAAG,IAAI,CAAA;QACpD,QAAQ,IAAI,SAAS,CAAA;IACvB,CAAC;IACD,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;AAC1B,CAAC;AAOD,SAAgB,YAAY,CAC1B,MAAqB,EACrB,EAAE,cAAc,EAA8B;IAG9C,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAA;IAGnD,MAAM,KAAK,GAAG,cAAc,GAAG,MAAM,CAAA;IACrC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;IAEzB,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAA;IAGnD,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC;QACjB,MAAM,CAAC,WAAW,CAAC,cAAc,GAAG,EAAE,CAAC,CAAA;QACvC,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,CAAA;IACjB,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IACzC,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAA;IAGlD,MAAM,CAAC,WAAW,CAAC,cAAc,GAAG,EAAE,CAAC,CAAA;IAEvC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;AACpB,CAAC;AAWD,SAAgB,iBAAiB,CAE/B,EACA,eAAe,EACf,UAAU,EACV,MAAM,GAOP;IACC,MAAM,kBAAkB,GAAwB,EAAE,CAAA;IAClD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3C,kBAAkB,CAAC,IAAI,CACrB,gBAAgB,CAAC;YACf,eAAe;YACf,SAAS,EAAE,UAAU,CAAC,CAAC,CAAE;YACzB,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;SACjB,CAAC,CACH,CAAA;IACH,CAAC;IACD,OAAO,kBAAkB,CAAA;AAC3B,CAAC;AAQD,SAAgB,gBAAgB,CAE9B,EACA,eAAe,GAAG,KAAK,EACvB,SAAS,EAAE,UAAU,EACrB,KAAK,GAON;IACC,MAAM,SAAS,GAAG,UAAqC,CAAA;IAEvD,MAAM,eAAe,GAAG,kBAAkB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IAC1D,IAAI,eAAe,EAAE,CAAC;QACpB,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,eAAe,CAAA;QACtC,OAAO,WAAW,CAAC,KAAK,EAAE;YACxB,eAAe;YACf,MAAM;YACN,SAAS,EAAE;gBACT,GAAG,SAAS;gBACZ,IAAI;aACL;SACF,CAAC,CAAA;IACJ,CAAC;IACD,IAAI,SAAS,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC/B,OAAO,WAAW,CAAC,KAAyB,EAAE;YAC5C,eAAe;YACf,SAAS,EAAE,SAA8B;SAC1C,CAAC,CAAA;IACJ,CAAC;IACD,IAAI,SAAS,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACjC,OAAO,aAAa,CAAC,KAA2B,EAAE;YAChD,QAAQ,EAAE,eAAe;SAC1B,CAAC,CAAA;IACJ,CAAC;IACD,IAAI,SAAS,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC9B,OAAO,aAAa,CAAC,KAA2B,CAAC,CAAA;IACnD,CAAC;IACD,IAAI,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1E,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;QAC/C,MAAM,CAAC,EAAE,AAAD,EAAG,IAAI,GAAG,KAAK,CAAC,GAAG,0BAAY,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,CAAA;QAClE,OAAO,YAAY,CAAC,KAA0B,EAAE;YAC9C,MAAM;YACN,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC;SACnB,CAAC,CAAA;IACJ,CAAC;IACD,IAAI,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QACvC,OAAO,WAAW,CAAC,KAA2B,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,CAAC,CAAA;IAC3E,CAAC;IACD,IAAI,SAAS,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAChC,OAAO,YAAY,CAAC,KAA0B,CAAC,CAAA;IACjD,CAAC;IACD,MAAM,IAAI,aAAa,CAAC,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;AAC1D,CAAC;AAgBD,SAAgB,MAAM,CAAC,kBAAuC;IAE5D,IAAI,UAAU,GAAG,CAAC,CAAA;IAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,kBAAkB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACnD,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,kBAAkB,CAAC,CAAC,CAAE,CAAA;QACnD,IAAI,OAAO;YAAE,UAAU,IAAI,EAAE,CAAA;;YACxB,UAAU,IAAI,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACtC,CAAC;IAGD,MAAM,gBAAgB,GAAc,EAAE,CAAA;IACtC,MAAM,iBAAiB,GAAc,EAAE,CAAA;IACvC,IAAI,WAAW,GAAG,CAAC,CAAA;IACnB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,kBAAkB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACnD,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,kBAAkB,CAAC,CAAC,CAAE,CAAA;QACnD,IAAI,OAAO,EAAE,CAAC;YACZ,gBAAgB,CAAC,IAAI,CACnB,GAAG,CAAC,UAAU,CAAC,UAAU,GAAG,WAAW,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CACvD,CAAA;YACD,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YAC/B,WAAW,IAAI,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAClC,CAAC;aAAM,CAAC;YACN,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAChC,CAAC;IACH,CAAC;IAGD,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,gBAAgB,EAAE,GAAG,iBAAiB,CAAC,CAAA;AAC9D,CAAC;AAYD,SAAgB,aAAa,CAC3B,KAAc,EACd,OAA8B;IAE9B,MAAM,EAAE,QAAQ,GAAG,KAAK,EAAE,GAAG,OAAO,CAAA;IACpC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAA;IAC3C,OAAO;QACL,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,EAAa,CAAC;KACrD,CAAA;AACH,CAAC;AAWD,SAAgB,WAAW,CACzB,KAA0C,EAC1C,OAIC;IAED,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAA;IAEtD,MAAM,OAAO,GAAG,MAAM,KAAK,IAAI,CAAA;IAE/B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,aAAa,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAA;IAC3E,IAAI,CAAC,OAAO,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM;QACrC,MAAM,IAAI,aAAa,CAAC,wBAAwB,CAAC;YAC/C,cAAc,EAAE,MAAO;YACvB,WAAW,EAAE,KAAK,CAAC,MAAM;YACzB,IAAI,EAAE,GAAG,SAAS,CAAC,IAAI,IAAI,MAAM,GAAG;SACrC,CAAC,CAAA;IAIJ,IAAI,YAAY,GAAG,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,eAAe,CAAC,SAAS,CAAC,CAAA;IACnE,MAAM,kBAAkB,GAAwB,EAAE,CAAA;IAClD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,MAAM,aAAa,GAAG,gBAAgB,CAAC;YACrC,eAAe;YACf,SAAS;YACT,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;SAChB,CAAC,CAAA;QACF,IAAI,aAAa,CAAC,OAAO;YAAE,YAAY,GAAG,IAAI,CAAA;QAC9C,kBAAkB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;IACxC,CAAC;IAED,IAAI,OAAO,IAAI,YAAY,EAAE,CAAC;QAC5B,MAAM,IAAI,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAA;QACvC,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,MAAM,GAAG,GAAG,CAAC,UAAU,CAAC,kBAAkB,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAA;YACtE,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,OAAO,EACL,kBAAkB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM;aACpE,CAAA;QACH,CAAC;QACD,IAAI,YAAY;YAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;IAC3D,CAAC;IACD,OAAO;QACL,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC;KACzE,CAAA;AACH,CAAC;AAaD,SAAgB,WAAW,CACzB,KAAc,EACd,EAAE,IAAI,EAAoB;IAE1B,MAAM,CAAC,EAAE,aAAa,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IAC7C,MAAM,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IACjC,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,IAAI,MAAM,GAAG,KAAK,CAAA;QAGlB,IAAI,SAAS,GAAG,EAAE,KAAK,CAAC;YACtB,MAAM,GAAG,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,CAAA;QAC5E,OAAO;YACL,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,GAAG,CAAC,MAAM,CACjB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,EACpD,MAAM,CACP;SACF,CAAA;IACH,CAAC;IACD,IAAI,SAAS,KAAK,MAAM,CAAC,QAAQ,CAAC,aAAa,EAAE,EAAE,CAAC;QAClD,MAAM,IAAI,aAAa,CAAC,sBAAsB,CAAC;YAC7C,YAAY,EAAE,MAAM,CAAC,QAAQ,CAAC,aAAa,EAAE,EAAE,CAAC;YAChD,KAAK;SACN,CAAC,CAAA;IACJ,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAA;AACzD,CAAC;AAaD,SAAgB,aAAa,CAAC,KAAc;IAC1C,IAAI,OAAO,KAAK,KAAK,SAAS;QAC5B,MAAM,IAAI,MAAM,CAAC,SAAS,CACxB,2BAA2B,KAAK,YAAY,OAAO,KAAK,qCAAqC,CAC9F,CAAA;IACH,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,CAAA;AACzE,CAAC;AAWD,SAAgB,YAAY,CAC1B,KAAa,EACb,EAAE,MAAM,EAAE,IAAI,EAAqC;IAEnD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,MAAM,GAAG,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,CAAA;QAC1D,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QACnC,IAAI,KAAK,GAAG,GAAG,IAAI,KAAK,GAAG,GAAG;YAC5B,MAAM,IAAI,GAAG,CAAC,sBAAsB,CAAC;gBACnC,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE;gBACnB,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE;gBACnB,MAAM;gBACN,IAAI,EAAE,IAAI,GAAG,CAAC;gBACd,KAAK,EAAE,KAAK,CAAC,QAAQ,EAAE;aACxB,CAAC,CAAA;IACN,CAAC;IACD,OAAO;QACL,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,GAAG,CAAC,UAAU,CAAC,KAAK,EAAE;YAC7B,IAAI,EAAE,EAAE;YACR,MAAM;SACP,CAAC;KACH,CAAA;AACH,CAAC;AAQD,SAAgB,YAAY,CAAC,KAAa;IACxC,MAAM,QAAQ,GAAG,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;IACtC,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAA;IACtD,MAAM,KAAK,GAAc,EAAE,CAAA;IAC3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,EAAE,CAAC;QACrC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAA;IACrE,CAAC;IACD,OAAO;QACL,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,GAAG,CAAC,MAAM,CACjB,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,EAC9D,GAAG,KAAK,CACT;KACF,CAAA;AACH,CAAC;AAaD,SAAgB,WAAW,CAKzB,KAA0C,EAC1C,OAGC;IAED,MAAM,EAAE,eAAe,EAAE,SAAS,EAAE,GAAG,OAAO,CAAA;IAE9C,IAAI,OAAO,GAAG,KAAK,CAAA;IACnB,MAAM,kBAAkB,GAAwB,EAAE,CAAA;IAClD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACrD,MAAM,MAAM,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC,CAAE,CAAA;QACvC,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAA;QACpD,MAAM,aAAa,GAAG,gBAAgB,CAAC;YACrC,eAAe;YACf,SAAS,EAAE,MAAM;YACjB,KAAK,EAAG,KAAa,CAAC,KAAM,CAAuB;SACpD,CAAC,CAAA;QACF,kBAAkB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;QACtC,IAAI,aAAa,CAAC,OAAO;YAAE,OAAO,GAAG,IAAI,CAAA;IAC3C,CAAC;IACD,OAAO;QACL,OAAO;QACP,OAAO,EAAE,OAAO;YACd,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC;YAC5B,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC;KACpE,CAAA;AACH,CAAC;AAQD,SAAgB,kBAAkB,CAChC,IAAY;IAEZ,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAA;IAC9C,OAAO,OAAO;QACZ,CAAC;YACC,CAAC,OAAO,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAE,CAAC;QACzD,CAAC,CAAC,SAAS,CAAA;AACf,CAAC;AAGD,SAAgB,eAAe,CAAC,KAA8B;IAC5D,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAA;IACtB,IAAI,IAAI,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAA;IAClC,IAAI,IAAI,KAAK,OAAO;QAAE,OAAO,IAAI,CAAA;IACjC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAA;IAEpC,IAAI,IAAI,KAAK,OAAO;QAAE,OAAQ,KAAa,CAAC,UAAU,EAAE,IAAI,CAAC,eAAe,CAAC,CAAA;IAE7E,MAAM,eAAe,GAAG,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACtD,IACE,eAAe;QACf,eAAe,CAAC;YACd,GAAG,KAAK;YACR,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;SACE,CAAC;QAE7B,OAAO,IAAI,CAAA;IAEb,OAAO,KAAK,CAAA;AACd,CAAC"}
|