@debridge-finance/borderless-validation-sdk 0.3.0 → 0.4.0
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/README.md +120 -11
- package/dist/cjs/graylists/evm/token-permit-metadata.js +7 -1
- package/dist/cjs/graylists/evm/token-permit-metadata.js.map +1 -1
- package/dist/cjs/helpers/address.js +152 -60
- package/dist/cjs/helpers/address.js.map +1 -1
- package/dist/cjs/helpers/amount.js +8 -0
- package/dist/cjs/helpers/amount.js.map +1 -0
- package/dist/cjs/helpers/evm-dln-hook-pack.js +16 -4
- package/dist/cjs/helpers/evm-dln-hook-pack.js.map +1 -1
- package/dist/cjs/helpers/evm-gas-compensation-tx.js +11 -26
- package/dist/cjs/helpers/evm-gas-compensation-tx.js.map +1 -1
- package/dist/cjs/helpers/evm-intent-id-abi.js +8 -1
- package/dist/cjs/helpers/evm-intent-id-abi.js.map +1 -1
- package/dist/cjs/helpers/evm-trade-amounts.js +11 -3
- package/dist/cjs/helpers/evm-trade-amounts.js.map +1 -1
- package/dist/cjs/helpers/expected-delegate.js +2 -6
- package/dist/cjs/helpers/expected-delegate.js.map +1 -1
- package/dist/cjs/helpers/gas-compensation.js +8 -4
- package/dist/cjs/helpers/gas-compensation.js.map +1 -1
- package/dist/cjs/helpers/interactions.js +4 -20
- package/dist/cjs/helpers/interactions.js.map +1 -1
- package/dist/cjs/helpers/synthetic-native-wrap.js +3 -2
- package/dist/cjs/helpers/synthetic-native-wrap.js.map +1 -1
- package/dist/cjs/types/enums.js +1 -0
- package/dist/cjs/types/enums.js.map +1 -1
- package/dist/cjs/types/request.js +15 -2
- package/dist/cjs/types/request.js.map +1 -1
- package/dist/cjs/types/response.js +2 -1
- package/dist/cjs/types/response.js.map +1 -1
- package/dist/cjs/types/validation.js +21 -3
- package/dist/cjs/types/validation.js.map +1 -1
- package/dist/cjs/validations/compensation-hook.js +4 -5
- package/dist/cjs/validations/compensation-hook.js.map +1 -1
- package/dist/cjs/validations/cost-token.js +9 -1
- package/dist/cjs/validations/cost-token.js.map +1 -1
- package/dist/cjs/validations/echo-fields.js +18 -0
- package/dist/cjs/validations/echo-fields.js.map +1 -1
- package/dist/cjs/validations/evm-caveats.js +3 -0
- package/dist/cjs/validations/evm-caveats.js.map +1 -1
- package/dist/cjs/validations/evm-on-chain-intent.js +150 -0
- package/dist/cjs/validations/evm-on-chain-intent.js.map +1 -0
- package/dist/cjs/validations/evm-op-budget.js +23 -3
- package/dist/cjs/validations/evm-op-budget.js.map +1 -1
- package/dist/cjs/validations/evm-op-hook.js +6 -6
- package/dist/cjs/validations/evm-op-hook.js.map +1 -1
- package/dist/cjs/validations/evm-permit.js +17 -6
- package/dist/cjs/validations/evm-permit.js.map +1 -1
- package/dist/cjs/validations/evm-permit2.js +14 -6
- package/dist/cjs/validations/evm-permit2.js.map +1 -1
- package/dist/cjs/validations/evm-required-actions.js +26 -7
- package/dist/cjs/validations/evm-required-actions.js.map +1 -1
- package/dist/cjs/validations/evm-sign712-metamask.js +3 -126
- package/dist/cjs/validations/evm-sign712-metamask.js.map +1 -1
- package/dist/cjs/validations/evm-sign712-shared.js +127 -0
- package/dist/cjs/validations/evm-sign712-shared.js.map +1 -1
- package/dist/cjs/validations/evm-sign712.js +18 -2
- package/dist/cjs/validations/evm-sign712.js.map +1 -1
- package/dist/cjs/validations/evm-sign7702.js +2 -0
- package/dist/cjs/validations/evm-sign7702.js.map +1 -1
- package/dist/cjs/validations/evm-transaction.js +7 -1
- package/dist/cjs/validations/evm-transaction.js.map +1 -1
- package/dist/cjs/validations/external-call.js +9 -20
- package/dist/cjs/validations/external-call.js.map +1 -1
- package/dist/cjs/validations/hook-version.js +35 -0
- package/dist/cjs/validations/hook-version.js.map +1 -0
- package/dist/cjs/validations/hooks-common.js +74 -199
- package/dist/cjs/validations/hooks-common.js.map +1 -1
- package/dist/cjs/validations/intent-destinations.js +52 -50
- package/dist/cjs/validations/intent-destinations.js.map +1 -1
- package/dist/cjs/validations/intent-tokens.js +319 -79
- package/dist/cjs/validations/intent-tokens.js.map +1 -1
- package/dist/cjs/validations/intent.js +34 -26
- package/dist/cjs/validations/intent.js.map +1 -1
- package/dist/cjs/validations/max-reserved.js +54 -0
- package/dist/cjs/validations/max-reserved.js.map +1 -0
- package/dist/cjs/validations/on-chain-intent-submission.js +70 -0
- package/dist/cjs/validations/on-chain-intent-submission.js.map +1 -0
- package/dist/cjs/validations/ptp.js +9 -6
- package/dist/cjs/validations/ptp.js.map +1 -1
- package/dist/cjs/validations/refill.js +11 -5
- package/dist/cjs/validations/refill.js.map +1 -1
- package/dist/cjs/validations/solana-hook.js +12 -54
- package/dist/cjs/validations/solana-hook.js.map +1 -1
- package/dist/cjs/validations/solana-op-budget.js +1 -1
- package/dist/cjs/validations/solana-op-budget.js.map +1 -1
- package/dist/cjs/validations/solana-op-wrap.js +29 -47
- package/dist/cjs/validations/solana-op-wrap.js.map +1 -1
- package/dist/cjs/validations/solana-required-actions.js +2 -2
- package/dist/cjs/validations/solana-required-actions.js.map +1 -1
- package/dist/cjs/validations/solana-transaction.js +4 -53
- package/dist/cjs/validations/solana-transaction.js.map +1 -1
- package/dist/cjs/validations/total-dst-amount.js +19 -3
- package/dist/cjs/validations/total-dst-amount.js.map +1 -1
- package/dist/cjs/validations/trade-grouping.js +35 -9
- package/dist/cjs/validations/trade-grouping.js.map +1 -1
- package/dist/cjs/validations/trade-matching.js +1 -1
- package/dist/cjs/validations/trade-matching.js.map +1 -1
- package/dist/cjs/validations/trades.js +29 -9
- package/dist/cjs/validations/trades.js.map +1 -1
- package/dist/cjs/validator.js +28 -17
- package/dist/cjs/validator.js.map +1 -1
- package/dist/cjs/whitelists/environment-config.js +143 -182
- package/dist/cjs/whitelists/environment-config.js.map +1 -1
- package/dist/cjs/whitelists/types.js +2 -5
- package/dist/cjs/whitelists/types.js.map +1 -1
- package/dist/esm/graylists/evm/token-permit-metadata.js +7 -1
- package/dist/esm/graylists/evm/token-permit-metadata.js.map +1 -1
- package/dist/esm/helpers/address.js +146 -59
- package/dist/esm/helpers/address.js.map +1 -1
- package/dist/esm/helpers/amount.js +5 -0
- package/dist/esm/helpers/amount.js.map +1 -0
- package/dist/esm/helpers/evm-dln-hook-pack.js +15 -4
- package/dist/esm/helpers/evm-dln-hook-pack.js.map +1 -1
- package/dist/esm/helpers/evm-gas-compensation-tx.js +12 -27
- package/dist/esm/helpers/evm-gas-compensation-tx.js.map +1 -1
- package/dist/esm/helpers/evm-intent-id-abi.js +7 -0
- package/dist/esm/helpers/evm-intent-id-abi.js.map +1 -1
- package/dist/esm/helpers/evm-trade-amounts.js +12 -4
- package/dist/esm/helpers/evm-trade-amounts.js.map +1 -1
- package/dist/esm/helpers/expected-delegate.js +2 -6
- package/dist/esm/helpers/expected-delegate.js.map +1 -1
- package/dist/esm/helpers/gas-compensation.js +9 -5
- package/dist/esm/helpers/gas-compensation.js.map +1 -1
- package/dist/esm/helpers/interactions.js +5 -21
- package/dist/esm/helpers/interactions.js.map +1 -1
- package/dist/esm/helpers/synthetic-native-wrap.js +4 -3
- package/dist/esm/helpers/synthetic-native-wrap.js.map +1 -1
- package/dist/esm/types/enums.js +1 -0
- package/dist/esm/types/enums.js.map +1 -1
- package/dist/esm/types/request.js +15 -2
- package/dist/esm/types/request.js.map +1 -1
- package/dist/esm/types/response.js +3 -2
- package/dist/esm/types/response.js.map +1 -1
- package/dist/esm/types/validation.js +21 -3
- package/dist/esm/types/validation.js.map +1 -1
- package/dist/esm/validations/compensation-hook.js +4 -5
- package/dist/esm/validations/compensation-hook.js.map +1 -1
- package/dist/esm/validations/cost-token.js +9 -1
- package/dist/esm/validations/cost-token.js.map +1 -1
- package/dist/esm/validations/echo-fields.js +18 -0
- package/dist/esm/validations/echo-fields.js.map +1 -1
- package/dist/esm/validations/evm-caveats.js +3 -0
- package/dist/esm/validations/evm-caveats.js.map +1 -1
- package/dist/esm/validations/evm-on-chain-intent.js +147 -0
- package/dist/esm/validations/evm-on-chain-intent.js.map +1 -0
- package/dist/esm/validations/evm-op-budget.js +25 -5
- package/dist/esm/validations/evm-op-budget.js.map +1 -1
- package/dist/esm/validations/evm-op-hook.js +8 -8
- package/dist/esm/validations/evm-op-hook.js.map +1 -1
- package/dist/esm/validations/evm-permit.js +18 -7
- package/dist/esm/validations/evm-permit.js.map +1 -1
- package/dist/esm/validations/evm-permit2.js +15 -7
- package/dist/esm/validations/evm-permit2.js.map +1 -1
- package/dist/esm/validations/evm-required-actions.js +28 -9
- package/dist/esm/validations/evm-required-actions.js.map +1 -1
- package/dist/esm/validations/evm-sign712-metamask.js +4 -126
- package/dist/esm/validations/evm-sign712-metamask.js.map +1 -1
- package/dist/esm/validations/evm-sign712-shared.js +126 -1
- package/dist/esm/validations/evm-sign712-shared.js.map +1 -1
- package/dist/esm/validations/evm-sign712.js +17 -2
- package/dist/esm/validations/evm-sign712.js.map +1 -1
- package/dist/esm/validations/evm-sign7702.js +2 -0
- package/dist/esm/validations/evm-sign7702.js.map +1 -1
- package/dist/esm/validations/evm-transaction.js +7 -1
- package/dist/esm/validations/evm-transaction.js.map +1 -1
- package/dist/esm/validations/external-call.js +10 -21
- package/dist/esm/validations/external-call.js.map +1 -1
- package/dist/esm/validations/hook-version.js +31 -0
- package/dist/esm/validations/hook-version.js.map +1 -0
- package/dist/esm/validations/hooks-common.js +75 -200
- package/dist/esm/validations/hooks-common.js.map +1 -1
- package/dist/esm/validations/intent-destinations.js +53 -51
- package/dist/esm/validations/intent-destinations.js.map +1 -1
- package/dist/esm/validations/intent-tokens.js +320 -80
- package/dist/esm/validations/intent-tokens.js.map +1 -1
- package/dist/esm/validations/intent.js +34 -26
- package/dist/esm/validations/intent.js.map +1 -1
- package/dist/esm/validations/max-reserved.js +51 -0
- package/dist/esm/validations/max-reserved.js.map +1 -0
- package/dist/esm/validations/on-chain-intent-submission.js +67 -0
- package/dist/esm/validations/on-chain-intent-submission.js.map +1 -0
- package/dist/esm/validations/ptp.js +9 -6
- package/dist/esm/validations/ptp.js.map +1 -1
- package/dist/esm/validations/refill.js +11 -5
- package/dist/esm/validations/refill.js.map +1 -1
- package/dist/esm/validations/solana-hook.js +12 -54
- package/dist/esm/validations/solana-hook.js.map +1 -1
- package/dist/esm/validations/solana-op-budget.js +1 -1
- package/dist/esm/validations/solana-op-budget.js.map +1 -1
- package/dist/esm/validations/solana-op-wrap.js +30 -48
- package/dist/esm/validations/solana-op-wrap.js.map +1 -1
- package/dist/esm/validations/solana-required-actions.js +2 -2
- package/dist/esm/validations/solana-required-actions.js.map +1 -1
- package/dist/esm/validations/solana-transaction.js +4 -53
- package/dist/esm/validations/solana-transaction.js.map +1 -1
- package/dist/esm/validations/total-dst-amount.js +20 -4
- package/dist/esm/validations/total-dst-amount.js.map +1 -1
- package/dist/esm/validations/trade-grouping.js +35 -10
- package/dist/esm/validations/trade-grouping.js.map +1 -1
- package/dist/esm/validations/trade-matching.js +1 -1
- package/dist/esm/validations/trade-matching.js.map +1 -1
- package/dist/esm/validations/trades.js +29 -9
- package/dist/esm/validations/trades.js.map +1 -1
- package/dist/esm/validator.js +28 -17
- package/dist/esm/validator.js.map +1 -1
- package/dist/esm/whitelists/environment-config.js +144 -183
- package/dist/esm/whitelists/environment-config.js.map +1 -1
- package/dist/esm/whitelists/types.js +3 -6
- package/dist/esm/whitelists/types.js.map +1 -1
- package/dist/types/graylists/evm/token-permit-metadata.d.ts.map +1 -1
- package/dist/types/helpers/address.d.ts +10 -5
- package/dist/types/helpers/address.d.ts.map +1 -1
- package/dist/types/helpers/amount.d.ts +2 -0
- package/dist/types/helpers/amount.d.ts.map +1 -0
- package/dist/types/helpers/evm-dln-hook-pack.d.ts +1 -0
- package/dist/types/helpers/evm-dln-hook-pack.d.ts.map +1 -1
- package/dist/types/helpers/evm-gas-compensation-tx.d.ts +1 -3
- package/dist/types/helpers/evm-gas-compensation-tx.d.ts.map +1 -1
- package/dist/types/helpers/evm-intent-id-abi.d.ts +111 -0
- package/dist/types/helpers/evm-intent-id-abi.d.ts.map +1 -1
- package/dist/types/helpers/evm-trade-amounts.d.ts.map +1 -1
- package/dist/types/helpers/expected-delegate.d.ts.map +1 -1
- package/dist/types/helpers/gas-compensation.d.ts.map +1 -1
- package/dist/types/helpers/interactions.d.ts.map +1 -1
- package/dist/types/helpers/synthetic-native-wrap.d.ts.map +1 -1
- package/dist/types/types/enums.d.ts +1 -0
- package/dist/types/types/enums.d.ts.map +1 -1
- package/dist/types/types/request.d.ts +32 -23
- package/dist/types/types/request.d.ts.map +1 -1
- package/dist/types/types/response.d.ts +10 -42
- package/dist/types/types/response.d.ts.map +1 -1
- package/dist/types/types/validation.d.ts +19 -4
- package/dist/types/types/validation.d.ts.map +1 -1
- package/dist/types/validations/compensation-hook.d.ts +1 -2
- package/dist/types/validations/compensation-hook.d.ts.map +1 -1
- package/dist/types/validations/cost-token.d.ts.map +1 -1
- package/dist/types/validations/echo-fields.d.ts.map +1 -1
- package/dist/types/validations/evm-caveats.d.ts.map +1 -1
- package/dist/types/validations/evm-on-chain-intent.d.ts +4 -0
- package/dist/types/validations/evm-on-chain-intent.d.ts.map +1 -0
- package/dist/types/validations/evm-op-budget.d.ts.map +1 -1
- package/dist/types/validations/evm-op-hook.d.ts.map +1 -1
- package/dist/types/validations/evm-permit.d.ts.map +1 -1
- package/dist/types/validations/evm-permit2.d.ts.map +1 -1
- package/dist/types/validations/evm-required-actions.d.ts.map +1 -1
- package/dist/types/validations/evm-sign712-metamask.d.ts +0 -11
- package/dist/types/validations/evm-sign712-metamask.d.ts.map +1 -1
- package/dist/types/validations/evm-sign712-shared.d.ts +12 -0
- package/dist/types/validations/evm-sign712-shared.d.ts.map +1 -1
- package/dist/types/validations/evm-sign712.d.ts +1 -0
- package/dist/types/validations/evm-sign712.d.ts.map +1 -1
- package/dist/types/validations/evm-sign7702.d.ts.map +1 -1
- package/dist/types/validations/evm-transaction.d.ts +1 -1
- package/dist/types/validations/evm-transaction.d.ts.map +1 -1
- package/dist/types/validations/external-call.d.ts.map +1 -1
- package/dist/types/validations/hook-version.d.ts +7 -0
- package/dist/types/validations/hook-version.d.ts.map +1 -0
- package/dist/types/validations/hooks-common.d.ts +1 -4
- package/dist/types/validations/hooks-common.d.ts.map +1 -1
- package/dist/types/validations/intent-destinations.d.ts.map +1 -1
- package/dist/types/validations/intent-tokens.d.ts.map +1 -1
- package/dist/types/validations/max-reserved.d.ts +3 -0
- package/dist/types/validations/max-reserved.d.ts.map +1 -0
- package/dist/types/validations/on-chain-intent-submission.d.ts +3 -0
- package/dist/types/validations/on-chain-intent-submission.d.ts.map +1 -0
- package/dist/types/validations/ptp.d.ts.map +1 -1
- package/dist/types/validations/refill.d.ts.map +1 -1
- package/dist/types/validations/solana-hook.d.ts +1 -2
- package/dist/types/validations/solana-hook.d.ts.map +1 -1
- package/dist/types/validations/solana-op-wrap.d.ts +2 -2
- package/dist/types/validations/solana-op-wrap.d.ts.map +1 -1
- package/dist/types/validations/solana-required-actions.d.ts.map +1 -1
- package/dist/types/validations/solana-transaction.d.ts +3 -3
- package/dist/types/validations/solana-transaction.d.ts.map +1 -1
- package/dist/types/validations/total-dst-amount.d.ts.map +1 -1
- package/dist/types/validations/trade-grouping.d.ts +1 -0
- package/dist/types/validations/trade-grouping.d.ts.map +1 -1
- package/dist/types/validations/trades.d.ts.map +1 -1
- package/dist/types/validator.d.ts.map +1 -1
- package/dist/types/whitelists/environment-config.d.ts +9 -4
- package/dist/types/whitelists/environment-config.d.ts.map +1 -1
- package/dist/types/whitelists/types.d.ts +0 -1
- package/dist/types/whitelists/types.d.ts.map +1 -1
- package/package.json +5 -2
|
@@ -1,16 +1,36 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ROOT_AUTHORITY = exports.EXPECTED_SIGN712_METAMASK_TYPES = void 0;
|
|
3
4
|
exports.validateSign712DataPresent = validateSign712DataPresent;
|
|
5
|
+
exports.validateSign712Envelope = validateSign712Envelope;
|
|
4
6
|
exports.validateSign712Domain = validateSign712Domain;
|
|
5
7
|
exports.validateSign712Delegator = validateSign712Delegator;
|
|
6
8
|
exports.validateSign712Caveats = validateSign712Caveats;
|
|
7
9
|
const types_1 = require("../types");
|
|
8
10
|
const types_2 = require("../whitelists/types");
|
|
9
11
|
const address_1 = require("../helpers/address");
|
|
12
|
+
const eip712_types_1 = require("../helpers/eip712-types");
|
|
13
|
+
const integer_1 = require("../helpers/integer");
|
|
10
14
|
const evm_caveats_1 = require("./evm-caveats");
|
|
11
15
|
// Shared content-validators for `Sign712MetaMaskCaveats` /
|
|
12
16
|
// `Sign712MetaMaskCaveatsWithPlaceholders` payloads. Used both in intent-scope
|
|
13
17
|
// and hook-scope.
|
|
18
|
+
exports.EXPECTED_SIGN712_METAMASK_TYPES = {
|
|
19
|
+
Caveat: [
|
|
20
|
+
{ name: "enforcer", type: "address" },
|
|
21
|
+
{ name: "terms", type: "bytes" },
|
|
22
|
+
],
|
|
23
|
+
Delegation: [
|
|
24
|
+
{ name: "delegate", type: "address" },
|
|
25
|
+
{ name: "delegator", type: "address" },
|
|
26
|
+
{ name: "authority", type: "bytes32" },
|
|
27
|
+
{ name: "caveats", type: "Caveat[]" },
|
|
28
|
+
{ name: "salt", type: "uint256" },
|
|
29
|
+
],
|
|
30
|
+
};
|
|
31
|
+
exports.ROOT_AUTHORITY = "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff";
|
|
32
|
+
const DEFAULT_SALT = 0n;
|
|
33
|
+
const EMPTY_SIGNATURE = "0x";
|
|
14
34
|
// CRITICAL: `data` must be present and contain `domain` and `message`. If this
|
|
15
35
|
// fails, downstream content-validators must not run (they assume `data.domain`
|
|
16
36
|
// and `data.message` exist).
|
|
@@ -25,6 +45,111 @@ function validateSign712DataPresent(data, actionPath) {
|
|
|
25
45
|
}
|
|
26
46
|
return [];
|
|
27
47
|
}
|
|
48
|
+
// CRITICAL: typed-data envelope fields must match the Delegation shape.
|
|
49
|
+
function validateSign712Envelope(data, actionPath) {
|
|
50
|
+
return [
|
|
51
|
+
...validateSign712PrimaryType(data, actionPath),
|
|
52
|
+
...validateSign712DomainVersion(data, actionPath),
|
|
53
|
+
...validateSign712Types(data, actionPath),
|
|
54
|
+
...validateSign712Authority(data, actionPath),
|
|
55
|
+
...validateSign712Salt(data, actionPath),
|
|
56
|
+
...validateSign712Signature(data, actionPath),
|
|
57
|
+
];
|
|
58
|
+
}
|
|
59
|
+
// CRITICAL: primaryType must be "Delegation".
|
|
60
|
+
function validateSign712PrimaryType(data, actionPath) {
|
|
61
|
+
if (data.primaryType !== "Delegation") {
|
|
62
|
+
return [{
|
|
63
|
+
code: types_1.ViolationCode.Sign712MetaMaskPrimaryTypeInvalid,
|
|
64
|
+
message: `Sign712MetaMask primaryType must be "Delegation"`,
|
|
65
|
+
path: `${actionPath}.data.primaryType`,
|
|
66
|
+
expected: "Delegation",
|
|
67
|
+
actual: data.primaryType,
|
|
68
|
+
}];
|
|
69
|
+
}
|
|
70
|
+
return [];
|
|
71
|
+
}
|
|
72
|
+
// CRITICAL: domain.version must be "1".
|
|
73
|
+
function validateSign712DomainVersion(data, actionPath) {
|
|
74
|
+
if (data.domain.version !== "1") {
|
|
75
|
+
return [{
|
|
76
|
+
code: types_1.ViolationCode.Sign712MetaMaskDomainVersionInvalid,
|
|
77
|
+
message: `Sign712MetaMask domain.version must be "1"`,
|
|
78
|
+
path: `${actionPath}.data.domain.version`,
|
|
79
|
+
expected: "1",
|
|
80
|
+
actual: data.domain.version,
|
|
81
|
+
}];
|
|
82
|
+
}
|
|
83
|
+
return [];
|
|
84
|
+
}
|
|
85
|
+
// CRITICAL: types must match the expected Delegation EIP-712 structure.
|
|
86
|
+
function validateSign712Types(data, actionPath) {
|
|
87
|
+
if (!(0, eip712_types_1.eip712TypesEqual)(data.types, exports.EXPECTED_SIGN712_METAMASK_TYPES)) {
|
|
88
|
+
return [{
|
|
89
|
+
code: types_1.ViolationCode.Sign712MetaMaskTypesInvalid,
|
|
90
|
+
message: `Sign712MetaMask types must match the expected EIP712 structure`,
|
|
91
|
+
path: `${actionPath}.data.types`,
|
|
92
|
+
expected: exports.EXPECTED_SIGN712_METAMASK_TYPES,
|
|
93
|
+
actual: data.types,
|
|
94
|
+
}];
|
|
95
|
+
}
|
|
96
|
+
return [];
|
|
97
|
+
}
|
|
98
|
+
// CRITICAL: message.authority must be the root authority sentinel.
|
|
99
|
+
function validateSign712Authority(data, actionPath) {
|
|
100
|
+
const authority = data.message.authority;
|
|
101
|
+
if (authority !== exports.ROOT_AUTHORITY) {
|
|
102
|
+
return [{
|
|
103
|
+
code: types_1.ViolationCode.Sign712MetaMaskAuthorityMismatch,
|
|
104
|
+
message: `Sign712MetaMask message.authority must be the root authority`,
|
|
105
|
+
path: `${actionPath}.data.message.authority`,
|
|
106
|
+
expected: exports.ROOT_AUTHORITY,
|
|
107
|
+
actual: authority,
|
|
108
|
+
}];
|
|
109
|
+
}
|
|
110
|
+
return [];
|
|
111
|
+
}
|
|
112
|
+
// CRITICAL: message.salt must be zero.
|
|
113
|
+
function validateSign712Salt(data, actionPath) {
|
|
114
|
+
const salt = data.message.salt;
|
|
115
|
+
if (salt === undefined)
|
|
116
|
+
return [sign712SaltViolation(salt, actionPath, undefined)];
|
|
117
|
+
try {
|
|
118
|
+
if ((0, integer_1.parseIntegerString)(salt) !== DEFAULT_SALT) {
|
|
119
|
+
return [sign712SaltViolation(salt, actionPath, undefined)];
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
catch (error) {
|
|
123
|
+
return [sign712SaltViolation(salt, actionPath, error)];
|
|
124
|
+
}
|
|
125
|
+
return [];
|
|
126
|
+
}
|
|
127
|
+
function sign712SaltViolation(salt, actionPath, error) {
|
|
128
|
+
return {
|
|
129
|
+
code: types_1.ViolationCode.Sign712MetaMaskSaltMismatch,
|
|
130
|
+
message: salt === undefined
|
|
131
|
+
? `Sign712MetaMask message.salt is missing`
|
|
132
|
+
: `Sign712MetaMask message.salt must be zero`,
|
|
133
|
+
path: `${actionPath}.data.message.salt`,
|
|
134
|
+
expected: DEFAULT_SALT.toString(),
|
|
135
|
+
actual: salt,
|
|
136
|
+
details: error,
|
|
137
|
+
};
|
|
138
|
+
}
|
|
139
|
+
// CRITICAL: message.signature must be an empty signature placeholder.
|
|
140
|
+
function validateSign712Signature(data, actionPath) {
|
|
141
|
+
const signature = data.message.signature;
|
|
142
|
+
if (signature !== EMPTY_SIGNATURE) {
|
|
143
|
+
return [{
|
|
144
|
+
code: types_1.ViolationCode.Sign712MetaMaskSignatureMismatch,
|
|
145
|
+
message: `Sign712MetaMask message.signature must be empty`,
|
|
146
|
+
path: `${actionPath}.data.message.signature`,
|
|
147
|
+
expected: EMPTY_SIGNATURE,
|
|
148
|
+
actual: signature,
|
|
149
|
+
}];
|
|
150
|
+
}
|
|
151
|
+
return [];
|
|
152
|
+
}
|
|
28
153
|
// CRITICAL: domain.name must be "DelegationManager"
|
|
29
154
|
// CRITICAL: domain.chainId must equal the real chainId
|
|
30
155
|
// CRITICAL: domain.verifyingContract must be in the DelegationManager whitelist
|
|
@@ -49,6 +174,7 @@ function validateSign712Domain(data, actionPath, realChainId, envConfig) {
|
|
|
49
174
|
});
|
|
50
175
|
}
|
|
51
176
|
if (data.domain.verifyingContract === undefined
|
|
177
|
+
|| !(0, address_1.isEvmHexAddress)(data.domain.verifyingContract)
|
|
52
178
|
|| !(0, types_2.isWhitelisted)(envConfig.delegationManagerContracts, realChainId, data.domain.verifyingContract)) {
|
|
53
179
|
violations.push({
|
|
54
180
|
code: types_1.ViolationCode.Sign712MetaMaskVerifyingContractNotWhitelisted,
|
|
@@ -68,6 +194,7 @@ function validateSign712Delegator(data, actionPath, realChainId, expectedDelegat
|
|
|
68
194
|
const delegator = data.message.delegator;
|
|
69
195
|
if (expectedDelegator === undefined
|
|
70
196
|
|| delegator === undefined
|
|
197
|
+
|| !(0, address_1.isEvmHexAddress)(delegator)
|
|
71
198
|
|| !(0, address_1.addressEquals)(realChainId, delegator, expectedDelegator)) {
|
|
72
199
|
return [{
|
|
73
200
|
code: types_1.ViolationCode.Sign712MetaMaskDelegatorMismatch,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evm-sign712-shared.js","sourceRoot":"","sources":["../../../src/validations/evm-sign712-shared.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"evm-sign712-shared.js","sourceRoot":"","sources":["../../../src/validations/evm-sign712-shared.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.validateSign712IntentActions = validateSign712IntentActions;
|
|
4
|
+
exports.validateNoSign712IntentActions = validateNoSign712IntentActions;
|
|
4
5
|
const types_1 = require("../types");
|
|
5
6
|
const types_2 = require("../whitelists/types");
|
|
6
7
|
const evm_intent_id_1 = require("../helpers/evm-intent-id");
|
|
7
8
|
const eip712_types_1 = require("../helpers/eip712-types");
|
|
9
|
+
const address_1 = require("../helpers/address");
|
|
8
10
|
// =============================================
|
|
9
11
|
// Sign712 (Intent) constraints
|
|
10
12
|
// =============================================
|
|
@@ -31,6 +33,19 @@ function validateSign712IntentActions(actions, basePath, realChainId, intent, en
|
|
|
31
33
|
}
|
|
32
34
|
return violations;
|
|
33
35
|
}
|
|
36
|
+
// HIGH: on-chain submission replaces the off-chain Sign712 Intent action.
|
|
37
|
+
function validateNoSign712IntentActions(actions, basePath) {
|
|
38
|
+
const intentActions = findSign712IntentActions(actions);
|
|
39
|
+
if (intentActions.length === 0)
|
|
40
|
+
return [];
|
|
41
|
+
return [{
|
|
42
|
+
code: types_1.ViolationCode.Sign712IntentForbiddenForOnChainSubmission,
|
|
43
|
+
message: "on-chain intent submission must not include a Sign712 Intent action",
|
|
44
|
+
path: `${basePath}.requiredActions`,
|
|
45
|
+
expected: 0,
|
|
46
|
+
actual: intentActions.length,
|
|
47
|
+
}];
|
|
48
|
+
}
|
|
34
49
|
function findSign712IntentActions(actions) {
|
|
35
50
|
const result = [];
|
|
36
51
|
for (let i = 0; i < actions.length; i++) {
|
|
@@ -129,8 +144,9 @@ function validateSign712IntentDomain(data, actionPath, realChainId, envConfig) {
|
|
|
129
144
|
});
|
|
130
145
|
}
|
|
131
146
|
// CRITICAL: domain.verifyingContract must be whitelisted
|
|
132
|
-
if (data.domain.verifyingContract === undefined
|
|
133
|
-
!(0,
|
|
147
|
+
if (data.domain.verifyingContract === undefined
|
|
148
|
+
|| !(0, address_1.isEvmHexAddress)(data.domain.verifyingContract)
|
|
149
|
+
|| !(0, types_2.isWhitelisted)(envConfig.intentManagerContracts, realChainId, data.domain.verifyingContract)) {
|
|
134
150
|
violations.push({
|
|
135
151
|
code: types_1.ViolationCode.Sign712IntentVerifyingContractNotWhitelisted,
|
|
136
152
|
message: `Sign712 Intent domain.verifyingContract is not whitelisted`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evm-sign712.js","sourceRoot":"","sources":["../../../src/validations/evm-sign712.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"evm-sign712.js","sourceRoot":"","sources":["../../../src/validations/evm-sign712.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ exports.validateSign7702Action = validateSign7702Action;
|
|
|
4
4
|
exports.validateSign7702Actions = validateSign7702Actions;
|
|
5
5
|
const types_1 = require("../types");
|
|
6
6
|
const types_2 = require("../whitelists/types");
|
|
7
|
+
const address_1 = require("../helpers/address");
|
|
7
8
|
// =============================================
|
|
8
9
|
// Sign7702Authorization constraints
|
|
9
10
|
// =============================================
|
|
@@ -29,6 +30,7 @@ function validateSign7702Action(action, actionPath, realChainId, envConfig) {
|
|
|
29
30
|
const data = action.data;
|
|
30
31
|
const contractAddress = data?.contractAddress;
|
|
31
32
|
if (!contractAddress
|
|
33
|
+
|| !(0, address_1.isEvmHexAddress)(contractAddress)
|
|
32
34
|
|| !(0, types_2.isWhitelisted)(envConfig.eip7702DelegationContracts, realChainId, contractAddress)) {
|
|
33
35
|
violations.push({
|
|
34
36
|
code: types_1.ViolationCode.Sign7702ContractAddressNotWhitelisted,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evm-sign7702.js","sourceRoot":"","sources":["../../../src/validations/evm-sign7702.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"evm-sign7702.js","sourceRoot":"","sources":["../../../src/validations/evm-sign7702.ts"],"names":[],"mappings":";;AAuBA,wDAqCC;AAED,0DAoCC;AAlGD,oCASkB;AAClB,+CAAoD;AAEpD,gDAAqD;AAErD,gDAAgD;AAChD,oCAAoC;AACpC,gDAAgD;AAEhD,oEAAoE;AACpE,yEAAyE;AACzE,4EAA4E;AAC5E,wEAAwE;AACxE,gDAAgD;AAChD,SAAgB,sBAAsB,CAClC,MAA0E,EAC1E,UAAkB,EAClB,WAAoB,EACpB,SAA4B;IAE5B,MAAM,UAAU,GAAgB,EAAE,CAAC;IAEnC,8DAA8D;IAC9D,MAAM,GAAG,GAAG,MAAM,CAAC,OAAmB,CAAC;IACvC,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,0BAAkB,CAAC,QAAQ,EAAE,CAAC;QAC7D,UAAU,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,qBAAa,CAAC,gCAAgC;YACpD,OAAO,EAAE,+DAA+D;YACxE,IAAI,EAAE,GAAG,UAAU,UAAU;YAC7B,QAAQ,EAAE,CAAC,0BAAkB,CAAC,QAAQ,CAAC;YACvC,MAAM,EAAE,MAAM,CAAC,OAAO;SACzB,CAAC,CAAC;IACP,CAAC;IAED,0DAA0D;IAC1D,MAAM,IAAI,GAAG,MAAM,CAAC,IAAgD,CAAC;IACrE,MAAM,eAAe,GAAG,IAAI,EAAE,eAAe,CAAC;IAC9C,IACI,CAAC,eAAe;WACb,CAAC,IAAA,yBAAe,EAAC,eAAe,CAAC;WACjC,CAAC,IAAA,qBAAa,EAAC,SAAS,CAAC,0BAA0B,EAAE,WAAW,EAAE,eAAe,CAAC,EACvF,CAAC;QACC,UAAU,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,qBAAa,CAAC,qCAAqC;YACzD,OAAO,EAAE,+DAA+D;YACxE,IAAI,EAAE,GAAG,UAAU,uBAAuB;YAC1C,MAAM,EAAE,eAAe;SAC1B,CAAC,CAAC;IACP,CAAC;IAED,OAAO,UAAU,CAAC;AACtB,CAAC;AAED,SAAgB,uBAAuB,CACnC,OAA4B,EAC5B,QAAgB,EAChB,WAAoB,EACpB,SAA4B;IAE5B,MAAM,UAAU,GAAgB,EAAE,CAAC;IACnC,IAAI,aAAa,GAAG,CAAC,CAAC;IACtB,IAAI,kBAAkB,GAAG,CAAC,CAAC,CAAC;IAE5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAC1B,IAAI,MAAM,CAAC,IAAI,KAAK,qBAAa,CAAC,qBAAqB;YAAE,SAAS;QAElE,MAAM,UAAU,GAAG,GAAG,QAAQ,oBAAoB,CAAC,GAAG,CAAC;QACvD,UAAU,CAAC,IAAI,CAAC,GAAG,sBAAsB,CAAC,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC;QAEvF,qDAAqD;QACrD,mFAAmF;QACnF,aAAa,EAAE,CAAC;QAChB,IAAI,aAAa,KAAK,CAAC,EAAE,CAAC;YACtB,kBAAkB,GAAG,CAAC,CAAC;QAC3B,CAAC;aAAM,IAAI,aAAa,KAAK,CAAC,EAAE,CAAC;YAC7B,UAAU,CAAC,IAAI,CAAC;gBACZ,IAAI,EAAE,qBAAa,CAAC,8BAA8B;gBAClD,OAAO,EACH,+CAA+C;sBAC7C,qBAAqB,kBAAkB,QAAQ,CAAC,EAAE;gBACxD,IAAI,EAAE,GAAG,UAAU,OAAO;gBAC1B,QAAQ,EAAE,CAAC;gBACX,MAAM,EAAE,aAAa;aACxB,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAED,OAAO,UAAU,CAAC;AACtB,CAAC"}
|
|
@@ -9,12 +9,18 @@ const TRANSACTION_ALLOWED_ACTIONS = [
|
|
|
9
9
|
types_1.EvmActionOperation.Budget,
|
|
10
10
|
types_1.EvmActionOperation.Wrap,
|
|
11
11
|
];
|
|
12
|
-
function validateTransactionActions(actions, basePath) {
|
|
12
|
+
function validateTransactionActions(actions, basePath, intentOnChainSubmission) {
|
|
13
13
|
const violations = [];
|
|
14
14
|
for (let i = 0; i < actions.length; i++) {
|
|
15
15
|
const action = actions[i];
|
|
16
16
|
if (action.type !== types_1.EvmActionKind.Transaction)
|
|
17
17
|
continue;
|
|
18
|
+
// Safe skip: on-chain Transaction[Intent] shape and calldata are validated
|
|
19
|
+
// by the dedicated intent-representation validator.
|
|
20
|
+
if (intentOnChainSubmission
|
|
21
|
+
&& action.actions.includes(types_1.EvmActionOperation.Intent)) {
|
|
22
|
+
continue;
|
|
23
|
+
}
|
|
18
24
|
const actionPath = `${basePath}.requiredActions[${i}]`;
|
|
19
25
|
// MEDIUM: actions[] must contain exactly one allowed element
|
|
20
26
|
violations.push(...validateTransactionActionsList(action, actionPath));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evm-transaction.js","sourceRoot":"","sources":["../../../src/validations/evm-transaction.ts"],"names":[],"mappings":";;AAiBA,
|
|
1
|
+
{"version":3,"file":"evm-transaction.js","sourceRoot":"","sources":["../../../src/validations/evm-transaction.ts"],"names":[],"mappings":";;AAiBA,gEA6BC;AA9CD,oCAMkB;AAElB,gDAAgD;AAChD,0BAA0B;AAC1B,gDAAgD;AAEhD,MAAM,2BAA2B,GAAkC;IAC/D,0BAAkB,CAAC,MAAM;IACzB,0BAAkB,CAAC,IAAI;CAC1B,CAAC;AAEF,SAAgB,0BAA0B,CACtC,OAA4B,EAC5B,QAAgB,EAChB,uBAAgC;IAEhC,MAAM,UAAU,GAAgB,EAAE,CAAC;IAEnC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAC1B,IAAI,MAAM,CAAC,IAAI,KAAK,qBAAa,CAAC,WAAW;YAAE,SAAS;QAExD,2EAA2E;QAC3E,oDAAoD;QACpD,IACI,uBAAuB;eACpB,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,0BAAkB,CAAC,MAAM,CAAC,EACvD,CAAC;YACC,SAAS;QACb,CAAC;QAED,MAAM,UAAU,GAAG,GAAG,QAAQ,oBAAoB,CAAC,GAAG,CAAC;QAEvD,6DAA6D;QAC7D,UAAU,CAAC,IAAI,CACX,GAAG,8BAA8B,CAAC,MAAM,EAAE,UAAU,CAAC,CACxD,CAAC;IACN,CAAC;IAED,OAAO,UAAU,CAAC;AACtB,CAAC;AAED,qEAAqE;AACrE,SAAS,8BAA8B,CACnC,MAAyB,EACzB,UAAkB;IAElB,IACI,MAAM,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;QAC3B,CAAC,2BAA2B,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAC1D,CAAC;QACC,OAAO,CAAC;gBACJ,IAAI,EAAE,qBAAa,CAAC,yBAAyB;gBAC7C,OAAO,EAAE,oEAAoE;gBAC7E,IAAI,EAAE,GAAG,UAAU,UAAU;gBAC7B,QAAQ,EAAE,2BAA2B;gBACrC,MAAM,EAAE,MAAM,CAAC,OAAO;aACzB,CAAC,CAAC;IACP,CAAC;IACD,OAAO,EAAE,CAAC;AACd,CAAC"}
|
|
@@ -118,7 +118,7 @@ function getExpectedExternalCallData(trade, path, quoteMode) {
|
|
|
118
118
|
violations: parsed.violations,
|
|
119
119
|
};
|
|
120
120
|
}
|
|
121
|
-
const chainViolation =
|
|
121
|
+
const chainViolation = validateHookFamilyCompatibility(parsed.hook, trade, path);
|
|
122
122
|
if (chainViolation !== undefined) {
|
|
123
123
|
return {
|
|
124
124
|
kind: ExternalCallExpectationKind.Invalid,
|
|
@@ -152,7 +152,7 @@ function getExpectedEvmExternalCallData(hook, trade, path, quoteMode) {
|
|
|
152
152
|
}
|
|
153
153
|
return {
|
|
154
154
|
kind: ExternalCallExpectationKind.Verifiable,
|
|
155
|
-
data: (0, evm_dln_hook_pack_1.
|
|
155
|
+
data: (0, evm_dln_hook_pack_1.packEvmTransactionCallForTrade)(hook.data, trade),
|
|
156
156
|
};
|
|
157
157
|
}
|
|
158
158
|
catch (error) {
|
|
@@ -234,36 +234,25 @@ function parseSolanaSerializedInstructions(data, path) {
|
|
|
234
234
|
hook: { type: types_1.DlnHookType.SolanaSerializedInstructions, data },
|
|
235
235
|
};
|
|
236
236
|
}
|
|
237
|
-
function
|
|
237
|
+
function validateHookFamilyCompatibility(hook, trade, path) {
|
|
238
238
|
const realDestinationChainId = (0, subscription_to_chain_id_1.resolveChainId)(trade.dstChainId);
|
|
239
239
|
if (realDestinationChainId === undefined) {
|
|
240
240
|
// Safe skip: unknown dstChainId is reported by validateTrades.
|
|
241
241
|
return undefined;
|
|
242
242
|
}
|
|
243
243
|
const actualEngine = (0, address_1.getChainEngine)(realDestinationChainId);
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
code: types_1.ViolationCode.RequestDlnHookInvalid,
|
|
249
|
-
message: "request.trades[].dlnHook is not supported for this destination chain engine",
|
|
250
|
-
path,
|
|
251
|
-
expected: { supportedDestinationEngines: [types_1.ChainEngine.EVM, types_1.ChainEngine.Solana] },
|
|
252
|
-
actual: actualEngine,
|
|
253
|
-
};
|
|
254
|
-
}
|
|
255
|
-
const expectedEngine = hook.type === types_1.DlnHookType.SolanaSerializedInstructions
|
|
256
|
-
? types_1.ChainEngine.Solana
|
|
257
|
-
: types_1.ChainEngine.EVM;
|
|
258
|
-
if (actualEngine === expectedEngine)
|
|
244
|
+
const compatibleDestinationEngines = hook.type === types_1.DlnHookType.SolanaSerializedInstructions
|
|
245
|
+
? [types_1.ChainEngine.Solana]
|
|
246
|
+
: [types_1.ChainEngine.EVM, types_1.ChainEngine.Tron];
|
|
247
|
+
if (compatibleDestinationEngines.includes(actualEngine))
|
|
259
248
|
return undefined;
|
|
260
249
|
// HIGH: request dlnHook type must match the destination chain engine.
|
|
261
250
|
return {
|
|
262
251
|
code: types_1.ViolationCode.RequestDlnHookInvalid,
|
|
263
252
|
message: "request.trades[].dlnHook type does not match dstChainId engine",
|
|
264
253
|
path,
|
|
265
|
-
expected:
|
|
266
|
-
actual:
|
|
254
|
+
expected: compatibleDestinationEngines.map(engine => types_1.ChainEngine[engine]),
|
|
255
|
+
actual: types_1.ChainEngine[actualEngine],
|
|
267
256
|
};
|
|
268
257
|
}
|
|
269
258
|
function invalidExternalCallExpectation(path, message, details) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"external-call.js","sourceRoot":"","sources":["../../../src/validations/external-call.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"external-call.js","sourceRoot":"","sources":["../../../src/validations/external-call.ts"],"names":[],"mappings":";;;AA8EA,sDAmBC;AAED,kEAiBC;AApHD,+BAAiC;AACjC,oCAOkB;AAClB,gDAAoD;AACpD,wCAAsE;AACtE,oEAGsC;AACtC,qFAAwE;AAuBxE,IAAK,2BAKJ;AALD,WAAK,2BAA2B;IAC5B,6EAAI,CAAA;IACJ,yFAAU,CAAA;IACV,yFAAU,CAAA;IACV,mFAAO,CAAA;AACX,CAAC,EALI,2BAA2B,KAA3B,2BAA2B,QAK/B;AAiBD,IAAK,sBAGJ;AAHD,WAAK,sBAAsB;IACvB,qEAAK,CAAA;IACL,yEAAO,CAAA;AACX,CAAC,EAHI,sBAAsB,KAAtB,sBAAsB,QAG1B;AAMD,IAAY,4BAGX;AAHD,WAAY,4BAA4B;IACpC,+EAAI,CAAA;IACJ,qFAAO,CAAA;AACX,CAAC,EAHW,4BAA4B,4CAA5B,4BAA4B,QAGvC;AAMD,SAAgB,qBAAqB,CACjC,SAAkB,EAClB,UAAuB;IAEvB,MAAM,UAAU,GAAgB,EAAE,CAAC;IAEnC,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;QAC5B,UAAU,CAAC,IAAI,CACX,GAAG,0BAA0B,CACzB,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,aAAa,EAClB,SAAS,CACZ,CACJ,CAAC;IACN,CAAC;IAED,OAAO,UAAU,CAAC;AACtB,CAAC;AAED,SAAgB,2BAA2B,CACvC,aAAwC;IAExC,MAAM,gBAAgB,GAAG,aAAa,EAAE,gBAAgB,CAAC;IAEzD,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;QACjC,OAAO,EAAE,IAAI,EAAE,4BAA4B,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IACxE,CAAC;IAED,IAAI,CAAC,6BAA6B,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACnD,OAAO,EAAE,IAAI,EAAE,4BAA4B,CAAC,OAAO,EAAE,CAAC;IAC1D,CAAC;IAED,OAAO;QACH,IAAI,EAAE,4BAA4B,CAAC,IAAI;QACvC,IAAI,EAAE,IAAA,gBAAS,EAAC,gBAAiC,CAAC;KACrD,CAAC;AACN,CAAC;AAED,SAAS,0BAA0B,CAC/B,YAA0B,EAC1B,aAA4B,EAC5B,YAAoB,EACpB,aAAqB,EACrB,SAAkB;IAElB,MAAM,YAAY,GAAG,mBAAmB,aAAa,oBAAoB,CAAC;IAC1E,MAAM,QAAQ,GAAG,2BAA2B,CACxC,YAAY,EACZ,kBAAkB,YAAY,WAAW,EACzC,SAAS,CACZ,CAAC;IACF,MAAM,UAAU,GAAG,sCAAsC,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;IAEvF,IAAI,QAAQ,CAAC,IAAI,KAAK,2BAA2B,CAAC,OAAO,EAAE,CAAC;QACxD,OAAO,CAAC,GAAG,UAAU,EAAE,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,UAAU,CAAC;IAE7C,OAAO;QACH,GAAG,UAAU;QACb,GAAG,qCAAqC,CAAC,QAAQ,EAAE,aAAa,CAAC,gBAAgB,EAAE,YAAY,CAAC;KACnG,CAAC;AACN,CAAC;AAED,SAAS,sCAAsC,CAC3C,aAA4B,EAC5B,IAAY;IAEZ,MAAM,gBAAgB,GAAG,aAAa,CAAC,gBAAgB,CAAC;IACxD,IAAI,gBAAgB,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IAE9C,qFAAqF;IACrF,IAAI,6BAA6B,CAAC,gBAAgB,CAAC;QAAE,OAAO,EAAE,CAAC;IAE/D,OAAO,CAAC;YACJ,IAAI,EAAE,qBAAa,CAAC,+BAA+B;YACnD,OAAO,EAAE,wEAAwE;YACjF,IAAI;YACJ,MAAM,EAAE,gBAAgB;SAC3B,CAAC,CAAC;AACP,CAAC;AAED,SAAS,qCAAqC,CAC1C,QAAyC,EACzC,MAA0B,EAC1B,IAAY;IAEZ,IAAI,QAAQ,CAAC,IAAI,KAAK,2BAA2B,CAAC,IAAI,EAAE,CAAC;QACrD,OAAO,oCAAoC,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC9D,CAAC;IAED,IAAI,QAAQ,CAAC,IAAI,KAAK,2BAA2B,CAAC,UAAU,EAAE,CAAC;QAC3D,uEAAuE;QACvE,wEAAwE;QACxE,oEAAoE;QACpE,OAAO,EAAE,CAAC;IACd,CAAC;IAED,IAAI,sBAAsB,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,EAAE,CAAC;IAE7D,4FAA4F;IAC5F,OAAO,CAAC;YACJ,IAAI,EAAE,qBAAa,CAAC,6BAA6B;YACjD,OAAO,EAAE,wEAAwE;YACjF,IAAI;YACJ,QAAQ,EAAE,QAAQ,CAAC,IAAI;YACvB,MAAM;SACT,CAAC,CAAC;AACP,CAAC;AAED,SAAS,oCAAoC,CACzC,MAA0B,EAC1B,IAAY;IAEZ,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IAEpC,4FAA4F;IAC5F,OAAO,CAAC;YACJ,IAAI,EAAE,qBAAa,CAAC,6BAA6B;YACjD,OAAO,EAAE,sFAAsF;YAC/F,IAAI;YACJ,QAAQ,EAAE,SAAS;YACnB,MAAM;SACT,CAAC,CAAC;AACP,CAAC;AAED,SAAS,2BAA2B,CAChC,KAAmB,EACnB,IAAY,EACZ,SAAkB;IAElB,IAAI,KAAK,CAAC,OAAO,KAAK,SAAS,IAAI,KAAK,CAAC,OAAO,KAAK,EAAE,EAAE,CAAC;QACtD,OAAO,EAAE,IAAI,EAAE,2BAA2B,CAAC,IAAI,EAAE,CAAC;IACtD,CAAC;IAED,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACjD,IAAI,MAAM,CAAC,IAAI,KAAK,sBAAsB,CAAC,OAAO,EAAE,CAAC;QACjD,OAAO;YACH,IAAI,EAAE,2BAA2B,CAAC,OAAO;YACzC,UAAU,EAAE,MAAM,CAAC,UAAU;SAChC,CAAC;IACN,CAAC;IAED,MAAM,cAAc,GAAG,+BAA+B,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IACjF,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;QAC/B,OAAO;YACH,IAAI,EAAE,2BAA2B,CAAC,OAAO;YACzC,UAAU,EAAE,CAAC,cAAc,CAAC;SAC/B,CAAC;IACN,CAAC;IAED,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,mBAAW,CAAC,4BAA4B;QAAE,OAAO,4BAA4B,EAAE,CAAC;IAEzG,OAAO,8BAA8B,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;AAC/E,CAAC;AAED,SAAS,4BAA4B;IACjC,2EAA2E;IAC3E,+DAA+D;IAC/D,OAAO,EAAE,IAAI,EAAE,2BAA2B,CAAC,UAAU,EAAE,CAAC;AAC5D,CAAC;AAED,SAAS,8BAA8B,CACnC,IAA4F,EAC5F,KAAmB,EACnB,IAAY,EACZ,SAAkB;IAElB,IAAI,CAAC;QACD,IAAI,IAAI,CAAC,IAAI,KAAK,mBAAW,CAAC,SAAS,EAAE,CAAC;YACtC,OAAO;gBACH,IAAI,EAAE,2BAA2B,CAAC,UAAU;gBAC5C,IAAI,EAAE,IAAA,iCAAa,EAAC,IAAI,CAAC,IAAI,CAAC;aACjC,CAAC;QACN,CAAC;QACD,IAAI,KAAK,CAAC,wBAAwB,KAAK,SAAS,EAAE,CAAC;YAC/C,IAAI,SAAS,EAAE,CAAC;gBACZ,2DAA2D;gBAC3D,+DAA+D;gBAC/D,OAAO,EAAE,IAAI,EAAE,2BAA2B,CAAC,UAAU,EAAE,CAAC;YAC5D,CAAC;YACD,OAAO,8BAA8B,CACjC,IAAI,EACJ,wDAAwD,CAC3D,CAAC;QACN,CAAC;QACD,OAAO;YACH,IAAI,EAAE,2BAA2B,CAAC,UAAU;YAC5C,IAAI,EAAE,IAAA,kDAA8B,EAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC;SACzD,CAAC;IACN,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,OAAO,8BAA8B,CACjC,IAAI,EACJ,+CAA+C,EAC/C,KAAK,CACR,CAAC;IACN,CAAC;AACL,CAAC;AAED,SAAS,YAAY,CAAC,GAAW,EAAE,IAAY;IAC3C,IAAI,MAAe,CAAC;IACpB,IAAI,CAAC;QACD,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,OAAO,yBAAyB,CAC5B,IAAI,EACJ,6CAA6C,EAC7C,KAAK,CACR,CAAC;IACN,CAAC;IAED,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QACxD,OAAO,yBAAyB,CAAC,IAAI,EAAE,2CAA2C,CAAC,CAAC;IACxF,CAAC;IAED,OAAO,iBAAiB,CAAC,MAAyD,EAAE,IAAI,CAAC,CAAC;AAC9F,CAAC;AAED,SAAS,iBAAiB,CACtB,MAAuD,EACvD,IAAY;IAEZ,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,mBAAW,CAAC,SAAS;YACtB,OAAO,cAAc,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC7C,KAAK,mBAAW,CAAC,kBAAkB;YAC/B,OAAO,uBAAuB,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACtD,KAAK,mBAAW,CAAC,4BAA4B;YACzC,OAAO,iCAAiC,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACpE,CAAC;AACL,CAAC;AAED,SAAS,cAAc,CACnB,IAAa,EACb,IAAY;IAEZ,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAClB,OAAO,yBAAyB,CAAC,IAAI,EAAE,yCAAyC,CAAC,CAAC;IACtF,CAAC;IAED,IAAI,CAAC,0BAA0B,CAAC,IAAI,EAAE,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC;WAC7D,CAAC,2BAA2B,CAAC,IAAI,EAAE,CAAC,eAAe,CAAC,CAAC,EAAE,CAAC;QAC3D,OAAO,yBAAyB,CAAC,IAAI,EAAE,8CAA8C,CAAC,CAAC;IAC3F,CAAC;IAED,IAAI,OAAO,IAAI,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QAClC,OAAO,yBAAyB,CAC5B,IAAI,EACJ,yEAAyE,CAC5E,CAAC;IACN,CAAC;IAED,IAAI,CAAC;QACD,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,CAAC;YAC3B,OAAO,yBAAyB,CAC5B,IAAI,EACJ,yEAAyE,CAC5E,CAAC;QACN,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,OAAO,yBAAyB,CAC5B,IAAI,EACJ,yEAAyE,EACzE,KAAK,CACR,CAAC;IACN,CAAC;IAED,IAAI,OAAO,IAAI,CAAC,WAAW,KAAK,SAAS,IAAI,OAAO,IAAI,CAAC,iBAAiB,KAAK,SAAS,EAAE,CAAC;QACvF,OAAO,yBAAyB,CAAC,IAAI,EAAE,wCAAwC,CAAC,CAAC;IACrF,CAAC;IAED,OAAO;QACH,IAAI,EAAE,sBAAsB,CAAC,KAAK;QAClC,IAAI,EAAE,EAAE,IAAI,EAAE,mBAAW,CAAC,SAAS,EAAE,IAAI,EAAiB;KAC7D,CAAC;AACN,CAAC;AAED,SAAS,uBAAuB,CAC5B,IAAa,EACb,IAAY;IAEZ,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAClB,OAAO,yBAAyB,CAAC,IAAI,EAAE,6CAA6C,CAAC,CAAC;IAC1F,CAAC;IAED,IAAI,CAAC,0BAA0B,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC;WACtC,CAAC,2BAA2B,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC;QACtD,OAAO,yBAAyB,CAAC,IAAI,EAAE,kDAAkD,CAAC,CAAC;IAC/F,CAAC;IAED,IAAI,IAAI,CAAC,GAAG,KAAK,SAAS,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QAChD,OAAO,yBAAyB,CAAC,IAAI,EAAE,kDAAkD,CAAC,CAAC;IAC/F,CAAC;IAED,OAAO;QACH,IAAI,EAAE,sBAAsB,CAAC,KAAK;QAClC,IAAI,EAAE,EAAE,IAAI,EAAE,mBAAW,CAAC,kBAAkB,EAAE,IAAI,EAAiB;KACtE,CAAC;AACN,CAAC;AAED,SAAS,iCAAiC,CACtC,IAAa,EACb,IAAY;IAEZ,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,8BAA8B,CAAC,IAAI,CAAC,EAAE,CAAC;QACpE,OAAO,yBAAyB,CAC5B,IAAI,EACJ,oEAAoE,CACvE,CAAC;IACN,CAAC;IAED,OAAO;QACH,IAAI,EAAE,sBAAsB,CAAC,KAAK;QAClC,IAAI,EAAE,EAAE,IAAI,EAAE,mBAAW,CAAC,4BAA4B,EAAE,IAAI,EAAE;KACjE,CAAC;AACN,CAAC;AAED,SAAS,+BAA+B,CACpC,IAAiB,EACjB,KAAmB,EACnB,IAAY;IAEZ,MAAM,sBAAsB,GAAG,IAAA,yCAAc,EAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAChE,IAAI,sBAAsB,KAAK,SAAS,EAAE,CAAC;QACvC,+DAA+D;QAC/D,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,YAAY,GAAG,IAAA,wBAAc,EAAC,sBAAsB,CAAC,CAAC;IAC5D,MAAM,4BAA4B,GAAG,IAAI,CAAC,IAAI,KAAK,mBAAW,CAAC,4BAA4B;QACvF,CAAC,CAAC,CAAC,mBAAW,CAAC,MAAM,CAAC;QACtB,CAAC,CAAC,CAAC,mBAAW,CAAC,GAAG,EAAE,mBAAW,CAAC,IAAI,CAAC,CAAC;IAE1C,IAAI,4BAA4B,CAAC,QAAQ,CAAC,YAAY,CAAC;QAAE,OAAO,SAAS,CAAC;IAE1E,sEAAsE;IACtE,OAAO;QACH,IAAI,EAAE,qBAAa,CAAC,qBAAqB;QACzC,OAAO,EAAE,gEAAgE;QACzE,IAAI;QACJ,QAAQ,EAAE,4BAA4B,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,mBAAW,CAAC,MAAM,CAAC,CAAC;QACzE,MAAM,EAAE,mBAAW,CAAC,YAAY,CAAC;KACpC,CAAC;AACN,CAAC;AAED,SAAS,8BAA8B,CACnC,IAAY,EACZ,OAAe,EACf,OAAiB;IAEjB,OAAO;QACH,IAAI,EAAE,2BAA2B,CAAC,OAAO;QACzC,UAAU,EAAE,CAAC,6BAA6B,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;KACtE,CAAC;AACN,CAAC;AAED,SAAS,yBAAyB,CAC9B,IAAY,EACZ,OAAe,EACf,OAAiB;IAEjB,OAAO;QACH,IAAI,EAAE,sBAAsB,CAAC,OAAO;QACpC,UAAU,EAAE,CAAC,6BAA6B,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;KACtE,CAAC;AACN,CAAC;AAED,SAAS,6BAA6B,CAClC,IAAY,EACZ,OAAe,EACf,OAAiB;IAEjB,uFAAuF;IACvF,OAAO;QACH,IAAI,EAAE,qBAAa,CAAC,qBAAqB;QACzC,OAAO;QACP,IAAI;QACJ,OAAO;KACV,CAAC;AACN,CAAC;AAED,SAAS,0BAA0B,CAAC,IAA6B,EAAE,MAAgB;IAC/E,OAAO,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CACzB,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,QAAQ;WAC5B,6BAA6B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAChD,CAAC,CAAC;AACP,CAAC;AAED,SAAS,2BAA2B,CAAC,IAA6B,EAAE,MAAgB;IAChF,OAAO,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CACzB,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,QAAQ;WAC5B,8BAA8B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CACjD,CAAC,CAAC;AACP,CAAC;AAED,SAAS,6BAA6B,CAAC,KAAa;IAChD,OAAO,KAAK,KAAK,IAAI,IAAI,IAAA,qBAAe,EAAC,KAAK,CAAC,CAAC;AACpD,CAAC;AAED,SAAS,8BAA8B,CAAC,KAAa;IACjD,OAAO,IAAA,yBAAmB,EAAC,KAAK,CAAC,CAAC;AACtC,CAAC;AAED,SAAS,sBAAsB,CAAC,CAAqB,EAAE,CAAS;IAC5D,OAAO,CAAC,KAAK,SAAS,IAAI,CAAC,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;AAClE,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAc;IACtC,OAAO,KAAK,KAAK,mBAAW,CAAC,SAAS;WAC/B,KAAK,KAAK,mBAAW,CAAC,kBAAkB;WACxC,KAAK,KAAK,mBAAW,CAAC,4BAA4B,CAAC;AAC9D,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IAC5B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAChF,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IAC5B,MAAM,SAAS,GAAG,UAAU,CAAC;IAC7B,OAAO,OAAO,KAAK,KAAK,QAAQ;WACzB,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC;WACvB,KAAK,IAAI,CAAC;WACV,KAAK,IAAI,SAAS,CAAC;AAC9B,CAAC"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.HookShape = void 0;
|
|
4
|
+
exports.validateSupportedRequestHookShapes = validateSupportedRequestHookShapes;
|
|
5
|
+
const types_1 = require("../types");
|
|
6
|
+
const request_1 = require("../types/request");
|
|
7
|
+
var HookShape;
|
|
8
|
+
(function (HookShape) {
|
|
9
|
+
HookShape[HookShape["LegacyV1"] = 1] = "LegacyV1";
|
|
10
|
+
HookShape[HookShape["CurrentV2"] = 2] = "CurrentV2";
|
|
11
|
+
})(HookShape || (exports.HookShape = HookShape = {}));
|
|
12
|
+
// Legacy V1 remains structurally recognizable only so the validator can reject
|
|
13
|
+
// it at the request boundary with a precise, format-specific violation.
|
|
14
|
+
function validateSupportedRequestHookShapes(request) {
|
|
15
|
+
const violations = [];
|
|
16
|
+
const hookLists = [
|
|
17
|
+
{ hooks: request.preHooks ?? [], path: "request.preHooks" },
|
|
18
|
+
{ hooks: request.postHooks ?? [], path: "request.postHooks" },
|
|
19
|
+
];
|
|
20
|
+
for (const hookList of hookLists) {
|
|
21
|
+
for (let i = 0; i < hookList.hooks.length; i++) {
|
|
22
|
+
if ((0, request_1.isRequestHookV2)(hookList.hooks[i]))
|
|
23
|
+
continue;
|
|
24
|
+
violations.push({
|
|
25
|
+
code: types_1.ViolationCode.LegacyHookV1Unsupported,
|
|
26
|
+
message: "legacy V1 hooks are not supported",
|
|
27
|
+
path: `${hookList.path}[${i}]`,
|
|
28
|
+
expected: { hookShape: HookShape[HookShape.CurrentV2] },
|
|
29
|
+
actual: { hookShape: HookShape[HookShape.LegacyV1] },
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
return violations;
|
|
34
|
+
}
|
|
35
|
+
//# sourceMappingURL=hook-version.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"hook-version.js","sourceRoot":"","sources":["../../../src/validations/hook-version.ts"],"names":[],"mappings":";;;AAcA,gFAyBC;AAvCD,oCAIkB;AAClB,8CAAmD;AAEnD,IAAY,SAGX;AAHD,WAAY,SAAS;IACjB,iDAAY,CAAA;IACZ,mDAAa,CAAA;AACjB,CAAC,EAHW,SAAS,yBAAT,SAAS,QAGpB;AAED,+EAA+E;AAC/E,wEAAwE;AACxE,SAAgB,kCAAkC,CAC9C,OAAoC;IAEpC,MAAM,UAAU,GAAgB,EAAE,CAAC;IAEnC,MAAM,SAAS,GAAG;QACd,EAAE,KAAK,EAAE,OAAO,CAAC,QAAQ,IAAI,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE;QAC3D,EAAE,KAAK,EAAE,OAAO,CAAC,SAAS,IAAI,EAAE,EAAE,IAAI,EAAE,mBAAmB,EAAE;KAChE,CAAC;IAEF,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QAC/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC7C,IAAI,IAAA,yBAAe,EAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAAE,SAAS;YAEjD,UAAU,CAAC,IAAI,CAAC;gBACZ,IAAI,EAAE,qBAAa,CAAC,uBAAuB;gBAC3C,OAAO,EAAE,mCAAmC;gBAC5C,IAAI,EAAE,GAAG,QAAQ,CAAC,IAAI,IAAI,CAAC,GAAG;gBAC9B,QAAQ,EAAE,EAAE,SAAS,EAAE,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE;gBACvD,MAAM,EAAE,EAAE,SAAS,EAAE,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE;aACvD,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAED,OAAO,UAAU,CAAC;AACtB,CAAC"}
|