@debridge-finance/borderless-validation-sdk 0.0.7 → 0.0.9
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/dist/cjs/helpers/eip712-types.js +29 -0
- package/dist/cjs/helpers/eip712-types.js.map +1 -0
- package/dist/cjs/helpers/evm-action.js +18 -2
- package/dist/cjs/helpers/evm-action.js.map +1 -1
- package/dist/cjs/helpers/evm-gas-compensation-tx.js +24 -6
- package/dist/cjs/helpers/evm-gas-compensation-tx.js.map +1 -1
- package/dist/cjs/helpers/evm-token.js +1 -1
- package/dist/cjs/helpers/evm-token.js.map +1 -1
- package/dist/cjs/helpers/placeholder.js +96 -2
- package/dist/cjs/helpers/placeholder.js.map +1 -1
- package/dist/cjs/types/request.js +1 -1
- package/dist/cjs/types/request.js.map +1 -1
- package/dist/cjs/types/response.js +1 -0
- package/dist/cjs/types/response.js.map +1 -1
- package/dist/cjs/types/validation.js +22 -1
- package/dist/cjs/types/validation.js.map +1 -1
- package/dist/cjs/validations/compensation-hook.js +5 -4
- package/dist/cjs/validations/compensation-hook.js.map +1 -1
- package/dist/cjs/validations/echo-fields.js +0 -22
- package/dist/cjs/validations/echo-fields.js.map +1 -1
- package/dist/cjs/validations/evm-caveats.js +32 -22
- package/dist/cjs/validations/evm-caveats.js.map +1 -1
- package/dist/cjs/validations/evm-op-budget.js +162 -53
- package/dist/cjs/validations/evm-op-budget.js.map +1 -1
- package/dist/cjs/validations/evm-op-hook.js +61 -26
- package/dist/cjs/validations/evm-op-hook.js.map +1 -1
- package/dist/cjs/validations/evm-op-wrap.js +28 -26
- package/dist/cjs/validations/evm-op-wrap.js.map +1 -1
- package/dist/cjs/validations/evm-permit.js +144 -43
- package/dist/cjs/validations/evm-permit.js.map +1 -1
- package/dist/cjs/validations/evm-permit2.js +36 -46
- package/dist/cjs/validations/evm-permit2.js.map +1 -1
- package/dist/cjs/validations/evm-required-actions.js +12 -7
- package/dist/cjs/validations/evm-required-actions.js.map +1 -1
- package/dist/cjs/validations/evm-sign712-metamask.js +126 -3
- package/dist/cjs/validations/evm-sign712-metamask.js.map +1 -1
- package/dist/cjs/validations/evm-sign712-shared.js +21 -8
- package/dist/cjs/validations/evm-sign712-shared.js.map +1 -1
- package/dist/cjs/validations/evm-sign712.js +3 -23
- package/dist/cjs/validations/evm-sign712.js.map +1 -1
- package/dist/cjs/validations/evm-sign7702.js +4 -5
- package/dist/cjs/validations/evm-sign7702.js.map +1 -1
- package/dist/cjs/validations/hooks-common.js +253 -29
- package/dist/cjs/validations/hooks-common.js.map +1 -1
- package/dist/cjs/validations/intent.js +2 -1
- package/dist/cjs/validations/intent.js.map +1 -1
- package/dist/cjs/validations/required-actions.js +4 -2
- package/dist/cjs/validations/required-actions.js.map +1 -1
- package/dist/cjs/validations/solana-hook.js +72 -9
- package/dist/cjs/validations/solana-hook.js.map +1 -1
- package/dist/cjs/validations/solana-op-budget.js +69 -1
- package/dist/cjs/validations/solana-op-budget.js.map +1 -1
- package/dist/cjs/validations/solana-op-wrap.js +30 -3
- package/dist/cjs/validations/solana-op-wrap.js.map +1 -1
- package/dist/cjs/validations/solana-sign.js +31 -15
- package/dist/cjs/validations/solana-sign.js.map +1 -1
- package/dist/cjs/validations/solana-transaction.js +29 -2
- package/dist/cjs/validations/solana-transaction.js.map +1 -1
- package/dist/cjs/validator.js +6 -3
- package/dist/cjs/validator.js.map +1 -1
- package/dist/cjs/whitelists/environment-config.js +61 -12
- package/dist/cjs/whitelists/environment-config.js.map +1 -1
- package/dist/cjs/whitelists/solana/intent-signature.js +7 -2
- package/dist/cjs/whitelists/solana/intent-signature.js.map +1 -1
- package/dist/cjs/whitelists/types.js.map +1 -1
- package/dist/esm/helpers/eip712-types.js +26 -0
- package/dist/esm/helpers/eip712-types.js.map +1 -0
- package/dist/esm/helpers/evm-action.js +16 -2
- package/dist/esm/helpers/evm-action.js.map +1 -1
- package/dist/esm/helpers/evm-gas-compensation-tx.js +24 -6
- package/dist/esm/helpers/evm-gas-compensation-tx.js.map +1 -1
- package/dist/esm/helpers/evm-token.js +3 -3
- package/dist/esm/helpers/evm-token.js.map +1 -1
- package/dist/esm/helpers/placeholder.js +95 -2
- package/dist/esm/helpers/placeholder.js.map +1 -1
- package/dist/esm/types/request.js +1 -1
- package/dist/esm/types/request.js.map +1 -1
- package/dist/esm/types/response.js +1 -0
- package/dist/esm/types/response.js.map +1 -1
- package/dist/esm/types/validation.js +22 -1
- package/dist/esm/types/validation.js.map +1 -1
- package/dist/esm/validations/compensation-hook.js +5 -4
- package/dist/esm/validations/compensation-hook.js.map +1 -1
- package/dist/esm/validations/echo-fields.js +0 -22
- package/dist/esm/validations/echo-fields.js.map +1 -1
- package/dist/esm/validations/evm-caveats.js +31 -22
- package/dist/esm/validations/evm-caveats.js.map +1 -1
- package/dist/esm/validations/evm-op-budget.js +162 -54
- package/dist/esm/validations/evm-op-budget.js.map +1 -1
- package/dist/esm/validations/evm-op-hook.js +62 -27
- package/dist/esm/validations/evm-op-hook.js.map +1 -1
- package/dist/esm/validations/evm-op-wrap.js +29 -27
- package/dist/esm/validations/evm-op-wrap.js.map +1 -1
- package/dist/esm/validations/evm-permit.js +145 -44
- package/dist/esm/validations/evm-permit.js.map +1 -1
- package/dist/esm/validations/evm-permit2.js +37 -47
- package/dist/esm/validations/evm-permit2.js.map +1 -1
- package/dist/esm/validations/evm-required-actions.js +13 -8
- package/dist/esm/validations/evm-required-actions.js.map +1 -1
- package/dist/esm/validations/evm-sign712-metamask.js +126 -3
- package/dist/esm/validations/evm-sign712-metamask.js.map +1 -1
- package/dist/esm/validations/evm-sign712-shared.js +22 -9
- package/dist/esm/validations/evm-sign712-shared.js.map +1 -1
- package/dist/esm/validations/evm-sign712.js +3 -23
- package/dist/esm/validations/evm-sign712.js.map +1 -1
- package/dist/esm/validations/evm-sign7702.js +4 -5
- package/dist/esm/validations/evm-sign7702.js.map +1 -1
- package/dist/esm/validations/hooks-common.js +255 -31
- package/dist/esm/validations/hooks-common.js.map +1 -1
- package/dist/esm/validations/intent.js +4 -3
- package/dist/esm/validations/intent.js.map +1 -1
- package/dist/esm/validations/required-actions.js +5 -3
- package/dist/esm/validations/required-actions.js.map +1 -1
- package/dist/esm/validations/solana-hook.js +72 -9
- package/dist/esm/validations/solana-hook.js.map +1 -1
- package/dist/esm/validations/solana-op-budget.js +69 -1
- package/dist/esm/validations/solana-op-budget.js.map +1 -1
- package/dist/esm/validations/solana-op-wrap.js +30 -3
- package/dist/esm/validations/solana-op-wrap.js.map +1 -1
- package/dist/esm/validations/solana-sign.js +31 -15
- package/dist/esm/validations/solana-sign.js.map +1 -1
- package/dist/esm/validations/solana-transaction.js +29 -2
- package/dist/esm/validations/solana-transaction.js.map +1 -1
- package/dist/esm/validator.js +6 -3
- package/dist/esm/validator.js.map +1 -1
- package/dist/esm/whitelists/environment-config.js +61 -12
- package/dist/esm/whitelists/environment-config.js.map +1 -1
- package/dist/esm/whitelists/solana/intent-signature.js +7 -2
- package/dist/esm/whitelists/solana/intent-signature.js.map +1 -1
- package/dist/esm/whitelists/types.js.map +1 -1
- package/dist/types/helpers/eip712-types.d.ts +7 -0
- package/dist/types/helpers/eip712-types.d.ts.map +1 -0
- package/dist/types/helpers/evm-action.d.ts +6 -0
- package/dist/types/helpers/evm-action.d.ts.map +1 -1
- package/dist/types/helpers/evm-gas-compensation-tx.d.ts +3 -1
- package/dist/types/helpers/evm-gas-compensation-tx.d.ts.map +1 -1
- package/dist/types/helpers/evm-token.d.ts.map +1 -1
- package/dist/types/helpers/placeholder.d.ts +3 -1
- package/dist/types/helpers/placeholder.d.ts.map +1 -1
- package/dist/types/types/request.d.ts +1 -1
- package/dist/types/types/response.d.ts +1 -0
- package/dist/types/types/response.d.ts.map +1 -1
- package/dist/types/types/validation.d.ts +23 -1
- package/dist/types/types/validation.d.ts.map +1 -1
- package/dist/types/validations/compensation-hook.d.ts +2 -1
- package/dist/types/validations/compensation-hook.d.ts.map +1 -1
- package/dist/types/validations/echo-fields.d.ts.map +1 -1
- package/dist/types/validations/evm-caveats.d.ts +4 -2
- package/dist/types/validations/evm-caveats.d.ts.map +1 -1
- package/dist/types/validations/evm-op-budget.d.ts +8 -0
- package/dist/types/validations/evm-op-budget.d.ts.map +1 -1
- package/dist/types/validations/evm-op-hook.d.ts +2 -1
- package/dist/types/validations/evm-op-hook.d.ts.map +1 -1
- package/dist/types/validations/evm-op-wrap.d.ts.map +1 -1
- package/dist/types/validations/evm-permit.d.ts +1 -1
- package/dist/types/validations/evm-permit.d.ts.map +1 -1
- package/dist/types/validations/evm-permit2.d.ts +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 +2 -1
- package/dist/types/validations/evm-sign712-metamask.d.ts.map +1 -1
- package/dist/types/validations/evm-sign712-shared.d.ts +3 -2
- package/dist/types/validations/evm-sign712-shared.d.ts.map +1 -1
- package/dist/types/validations/evm-sign712.d.ts.map +1 -1
- package/dist/types/validations/evm-sign7702.d.ts +3 -2
- package/dist/types/validations/evm-sign7702.d.ts.map +1 -1
- package/dist/types/validations/hooks-common.d.ts +5 -1
- package/dist/types/validations/hooks-common.d.ts.map +1 -1
- package/dist/types/validations/intent.d.ts.map +1 -1
- package/dist/types/validations/required-actions.d.ts.map +1 -1
- package/dist/types/validations/solana-hook.d.ts +2 -1
- package/dist/types/validations/solana-hook.d.ts.map +1 -1
- package/dist/types/validations/solana-op-budget.d.ts.map +1 -1
- package/dist/types/validations/solana-op-wrap.d.ts.map +1 -1
- package/dist/types/validations/solana-transaction.d.ts.map +1 -1
- package/dist/types/validator.d.ts.map +1 -1
- package/dist/types/whitelists/environment-config.d.ts.map +1 -1
- package/dist/types/whitelists/solana/intent-signature.d.ts +1 -0
- package/dist/types/whitelists/solana/intent-signature.d.ts.map +1 -1
- package/dist/types/whitelists/types.d.ts +9 -0
- package/dist/types/whitelists/types.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -1,13 +1,31 @@
|
|
|
1
1
|
import { ViolationCode, EvmActionKind, EvmActionOperation, } from "../types/index.js";
|
|
2
2
|
import { validateSign712DataPresent, validateSign712Domain, validateSign712Delegator, validateSign712Caveats, } from "./evm-sign712-shared.js";
|
|
3
3
|
import { addressEquals } from "../helpers/address.js";
|
|
4
|
+
import { parseIntegerString } from "../helpers/integer.js";
|
|
5
|
+
import { eip712TypesEqual } from "../helpers/eip712-types.js";
|
|
4
6
|
const SIGN712_METAMASK_ALLOWED_ACTIONS = [
|
|
5
7
|
EvmActionOperation.Budget,
|
|
6
8
|
EvmActionOperation.Wrap,
|
|
7
9
|
EvmActionOperation.Hook,
|
|
8
10
|
EvmActionOperation.GasCompensation,
|
|
9
11
|
];
|
|
10
|
-
|
|
12
|
+
const EXPECTED_SIGN712_METAMASK_TYPES = {
|
|
13
|
+
Caveat: [
|
|
14
|
+
{ name: "enforcer", type: "address" },
|
|
15
|
+
{ name: "terms", type: "bytes" },
|
|
16
|
+
],
|
|
17
|
+
Delegation: [
|
|
18
|
+
{ name: "delegate", type: "address" },
|
|
19
|
+
{ name: "delegator", type: "address" },
|
|
20
|
+
{ name: "authority", type: "bytes32" },
|
|
21
|
+
{ name: "caveats", type: "Caveat[]" },
|
|
22
|
+
{ name: "salt", type: "uint256" },
|
|
23
|
+
],
|
|
24
|
+
};
|
|
25
|
+
const ROOT_AUTHORITY = "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff";
|
|
26
|
+
const DEFAULT_SALT = 0n;
|
|
27
|
+
const EMPTY_SIGNATURE = "0x";
|
|
28
|
+
export function validateSign712MetaMaskActions(actions, basePath, realChainId, quoteMode, intentExpirationTimestamp, srcChainAuthorityAddress, expectedDelegate, envConfig) {
|
|
11
29
|
const violations = [];
|
|
12
30
|
// Collected `message.delegate` values across all Sign712MetaMask actions
|
|
13
31
|
// within this intent — checked for cross-action consistency after the loop.
|
|
@@ -26,7 +44,7 @@ export function validateSign712MetaMaskActions(actions, basePath, realChainId, q
|
|
|
26
44
|
violations.push(...presenceErrors);
|
|
27
45
|
continue;
|
|
28
46
|
}
|
|
29
|
-
violations.push(...validateSign712TransactionCalls(action, actionPath), ...validateSign712AllowedActions(action, actionPath), ...validateSign712Domain(data, actionPath, realChainId),
|
|
47
|
+
violations.push(...validateSign712TransactionCalls(action, actionPath), ...validateSign712AllowedActions(action, actionPath), ...validateSign712Envelope(data, actionPath), ...validateSign712Domain(data, actionPath, realChainId, envConfig),
|
|
30
48
|
// Delegator: in quote mode we cannot determine the trust source —
|
|
31
49
|
// skip the check entirely. In execution mode the helper compares
|
|
32
50
|
// against `srcChainAuthorityAddress` (which may itself be
|
|
@@ -57,7 +75,7 @@ export function validateSign712MetaMaskActions(actions, basePath, realChainId, q
|
|
|
57
75
|
}
|
|
58
76
|
const caveats = (data.message.caveats ?? []);
|
|
59
77
|
const txCalls = action.details?.transactionCalls ?? [];
|
|
60
|
-
violations.push(...validateSign712Caveats(caveats, action.actionId, txCalls, actionPath, realChainId,
|
|
78
|
+
violations.push(...validateSign712Caveats(caveats, action.actionId, txCalls, actionPath, realChainId, intentExpirationTimestamp, envConfig));
|
|
61
79
|
}
|
|
62
80
|
// CRITICAL: all Sign712MetaMask actions within one intent must share the
|
|
63
81
|
// same `message.delegate` value.
|
|
@@ -79,6 +97,111 @@ export function validateSign712MetaMaskActions(actions, basePath, realChainId, q
|
|
|
79
97
|
}
|
|
80
98
|
return violations;
|
|
81
99
|
}
|
|
100
|
+
// CRITICAL: typed-data envelope fields must match the Delegation shape
|
|
101
|
+
function validateSign712Envelope(data, actionPath) {
|
|
102
|
+
return [
|
|
103
|
+
...validateSign712PrimaryType(data, actionPath),
|
|
104
|
+
...validateSign712DomainVersion(data, actionPath),
|
|
105
|
+
...validateSign712Types(data, actionPath),
|
|
106
|
+
...validateSign712Authority(data, actionPath),
|
|
107
|
+
...validateSign712Salt(data, actionPath),
|
|
108
|
+
...validateSign712Signature(data, actionPath),
|
|
109
|
+
];
|
|
110
|
+
}
|
|
111
|
+
// CRITICAL: primaryType must be "Delegation"
|
|
112
|
+
function validateSign712PrimaryType(data, actionPath) {
|
|
113
|
+
if (data.primaryType !== "Delegation") {
|
|
114
|
+
return [{
|
|
115
|
+
code: ViolationCode.Sign712MetaMaskPrimaryTypeInvalid,
|
|
116
|
+
message: `Sign712MetaMask primaryType must be "Delegation"`,
|
|
117
|
+
path: `${actionPath}.data.primaryType`,
|
|
118
|
+
expected: "Delegation",
|
|
119
|
+
actual: data.primaryType,
|
|
120
|
+
}];
|
|
121
|
+
}
|
|
122
|
+
return [];
|
|
123
|
+
}
|
|
124
|
+
// CRITICAL: domain.version must be "1"
|
|
125
|
+
function validateSign712DomainVersion(data, actionPath) {
|
|
126
|
+
if (data.domain.version !== "1") {
|
|
127
|
+
return [{
|
|
128
|
+
code: ViolationCode.Sign712MetaMaskDomainVersionInvalid,
|
|
129
|
+
message: `Sign712MetaMask domain.version must be "1"`,
|
|
130
|
+
path: `${actionPath}.data.domain.version`,
|
|
131
|
+
expected: "1",
|
|
132
|
+
actual: data.domain.version,
|
|
133
|
+
}];
|
|
134
|
+
}
|
|
135
|
+
return [];
|
|
136
|
+
}
|
|
137
|
+
// CRITICAL: types must match the expected Delegation EIP712 structure
|
|
138
|
+
function validateSign712Types(data, actionPath) {
|
|
139
|
+
if (!eip712TypesEqual(data.types, EXPECTED_SIGN712_METAMASK_TYPES)) {
|
|
140
|
+
return [{
|
|
141
|
+
code: ViolationCode.Sign712MetaMaskTypesInvalid,
|
|
142
|
+
message: `Sign712MetaMask types must match the expected EIP712 structure`,
|
|
143
|
+
path: `${actionPath}.data.types`,
|
|
144
|
+
expected: EXPECTED_SIGN712_METAMASK_TYPES,
|
|
145
|
+
actual: data.types,
|
|
146
|
+
}];
|
|
147
|
+
}
|
|
148
|
+
return [];
|
|
149
|
+
}
|
|
150
|
+
// CRITICAL: message.authority must be the root authority sentinel
|
|
151
|
+
function validateSign712Authority(data, actionPath) {
|
|
152
|
+
const authority = data.message.authority;
|
|
153
|
+
if (authority !== ROOT_AUTHORITY) {
|
|
154
|
+
return [{
|
|
155
|
+
code: ViolationCode.Sign712MetaMaskAuthorityMismatch,
|
|
156
|
+
message: `Sign712MetaMask message.authority must be the root authority`,
|
|
157
|
+
path: `${actionPath}.data.message.authority`,
|
|
158
|
+
expected: ROOT_AUTHORITY,
|
|
159
|
+
actual: authority,
|
|
160
|
+
}];
|
|
161
|
+
}
|
|
162
|
+
return [];
|
|
163
|
+
}
|
|
164
|
+
// CRITICAL: message.salt must be zero
|
|
165
|
+
function validateSign712Salt(data, actionPath) {
|
|
166
|
+
const salt = data.message.salt;
|
|
167
|
+
if (salt === undefined)
|
|
168
|
+
return [sign712SaltViolation(salt, actionPath, undefined)];
|
|
169
|
+
try {
|
|
170
|
+
if (parseIntegerString(salt) !== DEFAULT_SALT) {
|
|
171
|
+
return [sign712SaltViolation(salt, actionPath, undefined)];
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
catch (error) {
|
|
175
|
+
return [sign712SaltViolation(salt, actionPath, error)];
|
|
176
|
+
}
|
|
177
|
+
return [];
|
|
178
|
+
}
|
|
179
|
+
function sign712SaltViolation(salt, actionPath, error) {
|
|
180
|
+
return {
|
|
181
|
+
code: ViolationCode.Sign712MetaMaskSaltMismatch,
|
|
182
|
+
message: salt === undefined
|
|
183
|
+
? `Sign712MetaMask message.salt is missing`
|
|
184
|
+
: `Sign712MetaMask message.salt must be zero`,
|
|
185
|
+
path: `${actionPath}.data.message.salt`,
|
|
186
|
+
expected: DEFAULT_SALT.toString(),
|
|
187
|
+
actual: salt,
|
|
188
|
+
details: error,
|
|
189
|
+
};
|
|
190
|
+
}
|
|
191
|
+
// CRITICAL: message.signature must be an empty signature placeholder
|
|
192
|
+
function validateSign712Signature(data, actionPath) {
|
|
193
|
+
const signature = data.message.signature;
|
|
194
|
+
if (signature !== EMPTY_SIGNATURE) {
|
|
195
|
+
return [{
|
|
196
|
+
code: ViolationCode.Sign712MetaMaskSignatureMismatch,
|
|
197
|
+
message: `Sign712MetaMask message.signature must be empty`,
|
|
198
|
+
path: `${actionPath}.data.message.signature`,
|
|
199
|
+
expected: EMPTY_SIGNATURE,
|
|
200
|
+
actual: signature,
|
|
201
|
+
}];
|
|
202
|
+
}
|
|
203
|
+
return [];
|
|
204
|
+
}
|
|
82
205
|
// CRITICAL: transactionCalls must have at least one element
|
|
83
206
|
function validateSign712TransactionCalls(action, actionPath) {
|
|
84
207
|
const txCalls = action.details?.transactionCalls ?? [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evm-sign712-metamask.js","sourceRoot":"","sources":["../../../src/validations/evm-sign712-metamask.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,aAAa,EAEb,aAAa,EACb,kBAAkB,GAGrB,MAAM,UAAU,CAAC;AAElB,OAAO,EACH,0BAA0B,EAC1B,qBAAqB,EACrB,wBAAwB,EACxB,sBAAsB,GACzB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"evm-sign712-metamask.js","sourceRoot":"","sources":["../../../src/validations/evm-sign712-metamask.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { ViolationCode, } from "../types/index.js";
|
|
2
2
|
import { isWhitelisted } from "../whitelists/types.js";
|
|
3
|
-
import { DELEGATION_MANAGER_CONTRACTS } from "../whitelists/evm/index.js";
|
|
4
3
|
import { addressEquals } from "../helpers/address.js";
|
|
5
|
-
import { classifyCaveats, validateExactExecutionPresence, validateExactExecutionContent, validateTimestampEnforcerValue, } from "./evm-caveats.js";
|
|
4
|
+
import { classifyCaveats, validateExactExecutionPresence, validateExactExecutionContent, validateTimestampEnforcerTerms, validateTimestampEnforcerValue, } from "./evm-caveats.js";
|
|
6
5
|
// Shared content-validators for `Sign712MetaMaskCaveats` /
|
|
7
6
|
// `Sign712MetaMaskCaveatsWithPlaceholders` payloads. Used both in intent-scope
|
|
8
7
|
// and hook-scope.
|
|
@@ -23,7 +22,7 @@ export function validateSign712DataPresent(data, actionPath) {
|
|
|
23
22
|
// CRITICAL: domain.name must be "DelegationManager"
|
|
24
23
|
// CRITICAL: domain.chainId must equal the real chainId
|
|
25
24
|
// CRITICAL: domain.verifyingContract must be in the DelegationManager whitelist
|
|
26
|
-
export function validateSign712Domain(data, actionPath, realChainId) {
|
|
25
|
+
export function validateSign712Domain(data, actionPath, realChainId, envConfig) {
|
|
27
26
|
const violations = [];
|
|
28
27
|
if (data.domain.name !== "DelegationManager") {
|
|
29
28
|
violations.push({
|
|
@@ -44,7 +43,7 @@ export function validateSign712Domain(data, actionPath, realChainId) {
|
|
|
44
43
|
});
|
|
45
44
|
}
|
|
46
45
|
if (data.domain.verifyingContract === undefined
|
|
47
|
-
|| !isWhitelisted(
|
|
46
|
+
|| !isWhitelisted(envConfig.delegationManagerContracts, realChainId, data.domain.verifyingContract)) {
|
|
48
47
|
violations.push({
|
|
49
48
|
code: ViolationCode.Sign712MetaMaskVerifyingContractNotWhitelisted,
|
|
50
49
|
message: `Sign712MetaMask domain.verifyingContract is not whitelisted`,
|
|
@@ -75,11 +74,12 @@ export function validateSign712Delegator(data, actionPath, realChainId, expected
|
|
|
75
74
|
return [];
|
|
76
75
|
}
|
|
77
76
|
// CRITICAL: caveats must contain valid IdEnforcer (replay protection),
|
|
78
|
-
// TimestampEnforcer
|
|
79
|
-
//
|
|
80
|
-
|
|
77
|
+
// TimestampEnforcer, and ExactExecution / ExactExecutionBatch caveats whose
|
|
78
|
+
// content matches `transactionCalls[]`. TimestampEnforcer.beforeThreshold is
|
|
79
|
+
// compared to intent.expirationTimestamp when the response exposes an intent.
|
|
80
|
+
export function validateSign712Caveats(caveats, actionId, transactionCalls, actionPath, realChainId, intentExpirationTimestamp, envConfig) {
|
|
81
81
|
const violations = [];
|
|
82
|
-
const classified = classifyCaveats(caveats, actionId, actionPath, realChainId, violations);
|
|
82
|
+
const classified = classifyCaveats(caveats, actionId, actionPath, realChainId, violations, envConfig);
|
|
83
83
|
violations.push(...validateExactExecutionPresence(classified, transactionCalls, actionPath));
|
|
84
84
|
validateExactExecutionContent(classified, transactionCalls, actionPath, violations);
|
|
85
85
|
// CRITICAL: must have at least one IdEnforcer caveat (replay protection)
|
|
@@ -103,7 +103,20 @@ export function validateSign712Caveats(caveats, actionId, transactionCalls, acti
|
|
|
103
103
|
});
|
|
104
104
|
}
|
|
105
105
|
if (classified.firstTimestamp) {
|
|
106
|
-
|
|
106
|
+
const beforeThreshold = validateTimestampEnforcerTerms(classified.firstTimestamp.caveat, classified.firstTimestamp.index, actionPath, violations);
|
|
107
|
+
// Safe skip: malformed TimestampEnforcer terms are already reported by
|
|
108
|
+
// `validateTimestampEnforcerTerms`.
|
|
109
|
+
if (beforeThreshold === undefined)
|
|
110
|
+
return violations;
|
|
111
|
+
if (intentExpirationTimestamp === undefined) {
|
|
112
|
+
// Safe skip: hooks-only compensation bundles legitimately have no
|
|
113
|
+
// response intents. In that shape beforeThreshold is server-generated
|
|
114
|
+
// but not exposed through an independent response field, so it is not
|
|
115
|
+
// compared. If trades exist and intents are missing, trade grouping
|
|
116
|
+
// reports `TradeGroupHasNoIntent`.
|
|
117
|
+
return violations;
|
|
118
|
+
}
|
|
119
|
+
validateTimestampEnforcerValue(beforeThreshold, intentExpirationTimestamp, classified.firstTimestamp.index, actionPath, violations);
|
|
107
120
|
}
|
|
108
121
|
return violations;
|
|
109
122
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evm-sign712-shared.js","sourceRoot":"","sources":["../../../src/validations/evm-sign712-shared.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,aAAa,GAIhB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"evm-sign712-shared.js","sourceRoot":"","sources":["../../../src/validations/evm-sign712-shared.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,aAAa,GAIhB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAEH,eAAe,EACf,8BAA8B,EAC9B,6BAA6B,EAC7B,8BAA8B,EAC9B,8BAA8B,GACjC,MAAM,eAAe,CAAC;AAEvB,2DAA2D;AAC3D,+EAA+E;AAC/E,kBAAkB;AAElB,+EAA+E;AAC/E,+EAA+E;AAC/E,6BAA6B;AAC7B,MAAM,UAAU,0BAA0B,CACtC,IAAgC,EAChC,UAAkB;IAElB,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QACzC,OAAO,CAAC;gBACJ,IAAI,EAAE,aAAa,CAAC,6CAA6C;gBACjE,OAAO,EAAE,mDAAmD;gBAC5D,IAAI,EAAE,GAAG,UAAU,OAAO;gBAC1B,MAAM,EAAE,IAAI;aACf,CAAC,CAAC;IACP,CAAC;IACD,OAAO,EAAE,CAAC;AACd,CAAC;AAED,oDAAoD;AACpD,uDAAuD;AACvD,gFAAgF;AAChF,MAAM,UAAU,qBAAqB,CACjC,IAAoB,EACpB,UAAkB,EAClB,WAAoB,EACpB,SAA4B;IAE5B,MAAM,UAAU,GAAgB,EAAE,CAAC;IAEnC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,mBAAmB,EAAE,CAAC;QAC3C,UAAU,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,aAAa,CAAC,6CAA6C;YACjE,OAAO,EAAE,yDAAyD;YAClE,IAAI,EAAE,GAAG,UAAU,mBAAmB;YACtC,QAAQ,EAAE,mBAAmB;YAC7B,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;SAC3B,CAAC,CAAC;IACP,CAAC;IAED,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,KAAK,WAAW,EAAE,CAAC;QACtC,UAAU,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,aAAa,CAAC,8BAA8B;YAClD,OAAO,EAAE,gEAAgE;YACzE,IAAI,EAAE,GAAG,UAAU,sBAAsB;YACzC,QAAQ,EAAE,WAAW;YACrB,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;SAC9B,CAAC,CAAC;IACP,CAAC;IAED,IACI,IAAI,CAAC,MAAM,CAAC,iBAAiB,KAAK,SAAS;WACxC,CAAC,aAAa,CACb,SAAS,CAAC,0BAA0B,EAAE,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,iBAAiB,CACnF,EACH,CAAC;QACC,UAAU,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,aAAa,CAAC,8CAA8C;YAClE,OAAO,EAAE,6DAA6D;YACtE,IAAI,EAAE,GAAG,UAAU,gCAAgC;YACnD,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,iBAAiB;SACxC,CAAC,CAAC;IACP,CAAC;IAED,OAAO,UAAU,CAAC;AACtB,CAAC;AAED,wEAAwE;AACxE,0EAA0E;AAC1E,+EAA+E;AAC/E,gFAAgF;AAChF,6BAA6B;AAC7B,MAAM,UAAU,wBAAwB,CACpC,IAAoB,EACpB,UAAkB,EAClB,WAAoB,EACpB,iBAAqC,EACrC,mBAA2B;IAE3B,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,SAA+B,CAAC;IAC/D,IACI,iBAAiB,KAAK,SAAS;WAC5B,SAAS,KAAK,SAAS;WACvB,CAAC,aAAa,CAAC,WAAW,EAAE,SAAS,EAAE,iBAAiB,CAAC,EAC9D,CAAC;QACC,OAAO,CAAC;gBACJ,IAAI,EAAE,aAAa,CAAC,gCAAgC;gBACpD,OAAO,EAAE,gDAAgD,mBAAmB,EAAE;gBAC9E,IAAI,EAAE,GAAG,UAAU,yBAAyB;gBAC5C,QAAQ,EAAE,iBAAiB;gBAC3B,MAAM,EAAE,SAAS;aACpB,CAAC,CAAC;IACP,CAAC;IACD,OAAO,EAAE,CAAC;AACd,CAAC;AAED,uEAAuE;AACvE,4EAA4E;AAC5E,6EAA6E;AAC7E,8EAA8E;AAC9E,MAAM,UAAU,sBAAsB,CAClC,OAAiB,EACjB,QAAgB,EAChB,gBAAsC,EACtC,UAAkB,EAClB,WAAoB,EACpB,yBAA6C,EAC7C,SAA4B;IAE5B,MAAM,UAAU,GAAgB,EAAE,CAAC;IACnC,MAAM,UAAU,GAAG,eAAe,CAC9B,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,CACpE,CAAC;IAEF,UAAU,CAAC,IAAI,CACX,GAAG,8BAA8B,CAAC,UAAU,EAAE,gBAAgB,EAAE,UAAU,CAAC,CAC9E,CAAC;IACF,6BAA6B,CAAC,UAAU,EAAE,gBAAgB,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IAEpF,yEAAyE;IACzE,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC;QAC5B,UAAU,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,aAAa,CAAC,sCAAsC;YAC1D,OAAO,EAAE,gDAAgD;YACzD,IAAI,EAAE,GAAG,UAAU,uBAAuB;SAC7C,CAAC,CAAC;IACP,CAAC;IAED,4DAA4D;IAC5D,IAAI,UAAU,CAAC,cAAc,KAAK,CAAC,EAAE,CAAC;QAClC,UAAU,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,UAAU,CAAC,cAAc,KAAK,CAAC;gBACjC,CAAC,CAAC,aAAa,CAAC,6CAA6C;gBAC7D,CAAC,CAAC,aAAa,CAAC,+CAA+C;YACnE,OAAO,EAAE,yDAAyD;YAClE,IAAI,EAAE,GAAG,UAAU,uBAAuB;YAC1C,QAAQ,EAAE,CAAC;YACX,MAAM,EAAE,UAAU,CAAC,cAAc;SACpC,CAAC,CAAC;IACP,CAAC;IAED,IAAI,UAAU,CAAC,cAAc,EAAE,CAAC;QAC5B,MAAM,eAAe,GAAG,8BAA8B,CAClD,UAAU,CAAC,cAAc,CAAC,MAAM,EAChC,UAAU,CAAC,cAAc,CAAC,KAAK,EAC/B,UAAU,EACV,UAAU,CACb,CAAC;QACF,uEAAuE;QACvE,oCAAoC;QACpC,IAAI,eAAe,KAAK,SAAS;YAAE,OAAO,UAAU,CAAC;QAErD,IAAI,yBAAyB,KAAK,SAAS,EAAE,CAAC;YAC1C,kEAAkE;YAClE,sEAAsE;YACtE,sEAAsE;YACtE,oEAAoE;YACpE,mCAAmC;YACnC,OAAO,UAAU,CAAC;QACtB,CAAC;QAED,8BAA8B,CAC1B,eAAe,EACf,yBAAyB,EACzB,UAAU,CAAC,cAAc,CAAC,KAAK,EAC/B,UAAU,EACV,UAAU,CACb,CAAC;IACN,CAAC;IAED,OAAO,UAAU,CAAC;AACtB,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { ViolationCode, EvmActionKind, EvmActionOperation, } from "../types/index.js";
|
|
2
2
|
import { isWhitelisted } from "../whitelists/types.js";
|
|
3
3
|
import { computeIntentId } from "../helpers/evm-intent-id.js";
|
|
4
|
+
import { eip712TypesEqual } from "../helpers/eip712-types.js";
|
|
4
5
|
// =============================================
|
|
5
6
|
// Sign712 (Intent) constraints
|
|
6
7
|
// =============================================
|
|
@@ -138,38 +139,17 @@ function validateSign712IntentDomain(data, actionPath, realChainId, envConfig) {
|
|
|
138
139
|
}
|
|
139
140
|
// CRITICAL: types must match the expected EIP712 structure
|
|
140
141
|
function validateSign712IntentTypes(data, actionPath) {
|
|
141
|
-
|
|
142
|
-
const keys = Object.keys(types).sort();
|
|
143
|
-
const expectedKeys = Object.keys(EXPECTED_TYPES).sort();
|
|
144
|
-
if (keys.length !== expectedKeys.length ||
|
|
145
|
-
!keys.every((k, i) => k === expectedKeys[i]) ||
|
|
146
|
-
!typesMatch(types)) {
|
|
142
|
+
if (!eip712TypesEqual(data.types, EXPECTED_TYPES)) {
|
|
147
143
|
return [{
|
|
148
144
|
code: ViolationCode.Sign712IntentTypesInvalid,
|
|
149
145
|
message: `Sign712 Intent types must match the expected EIP712 structure`,
|
|
150
146
|
path: `${actionPath}.data.types`,
|
|
151
147
|
expected: EXPECTED_TYPES,
|
|
152
|
-
actual: types,
|
|
148
|
+
actual: data.types,
|
|
153
149
|
}];
|
|
154
150
|
}
|
|
155
151
|
return [];
|
|
156
152
|
}
|
|
157
|
-
function typesMatch(types) {
|
|
158
|
-
for (const [key, expectedFields] of Object.entries(EXPECTED_TYPES)) {
|
|
159
|
-
const actualFields = types[key];
|
|
160
|
-
if (!actualFields)
|
|
161
|
-
return false;
|
|
162
|
-
if (actualFields.length !== expectedFields.length)
|
|
163
|
-
return false;
|
|
164
|
-
for (let i = 0; i < expectedFields.length; i++) {
|
|
165
|
-
if (actualFields[i].name !== expectedFields[i].name ||
|
|
166
|
-
actualFields[i].type !== expectedFields[i].type) {
|
|
167
|
-
return false;
|
|
168
|
-
}
|
|
169
|
-
}
|
|
170
|
-
}
|
|
171
|
-
return true;
|
|
172
|
-
}
|
|
173
153
|
// CRITICAL: message.intentId must equal computed intent ID
|
|
174
154
|
function validateSign712IntentId(data, actionPath, intent) {
|
|
175
155
|
const messageIntentId = data.message.intentId;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evm-sign712.js","sourceRoot":"","sources":["../../../src/validations/evm-sign712.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"evm-sign712.js","sourceRoot":"","sources":["../../../src/validations/evm-sign712.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { ViolationCode, EvmActionKind, EvmActionOperation, } from "../types/index.js";
|
|
2
2
|
import { isWhitelisted } from "../whitelists/types.js";
|
|
3
|
-
import { EIP7702_DELEGATION_CONTRACTS } from "../whitelists/evm/index.js";
|
|
4
3
|
// =============================================
|
|
5
4
|
// Sign7702Authorization constraints
|
|
6
5
|
// =============================================
|
|
@@ -9,7 +8,7 @@ import { EIP7702_DELEGATION_CONTRACTS } from "../whitelists/evm/index.js";
|
|
|
9
8
|
// (`validateHookSign7702Binding`); both wrap this with their scope-specific
|
|
10
9
|
// constraints (intent: position+duplicate; hook: type↔actions binding +
|
|
11
10
|
// `validateHookDelegateOp` for position/count).
|
|
12
|
-
export function validateSign7702Action(action, actionPath, realChainId) {
|
|
11
|
+
export function validateSign7702Action(action, actionPath, realChainId, envConfig) {
|
|
13
12
|
const violations = [];
|
|
14
13
|
// HIGH: actions[] must contain exactly one element — Delegate
|
|
15
14
|
const ops = action.actions;
|
|
@@ -26,7 +25,7 @@ export function validateSign7702Action(action, actionPath, realChainId) {
|
|
|
26
25
|
const data = action.data;
|
|
27
26
|
const contractAddress = data?.contractAddress;
|
|
28
27
|
if (!contractAddress
|
|
29
|
-
|| !isWhitelisted(
|
|
28
|
+
|| !isWhitelisted(envConfig.eip7702DelegationContracts, realChainId, contractAddress)) {
|
|
30
29
|
violations.push({
|
|
31
30
|
code: ViolationCode.Sign7702ContractAddressNotWhitelisted,
|
|
32
31
|
message: `Sign7702Authorization contractAddress is not in the whitelist`,
|
|
@@ -36,7 +35,7 @@ export function validateSign7702Action(action, actionPath, realChainId) {
|
|
|
36
35
|
}
|
|
37
36
|
return violations;
|
|
38
37
|
}
|
|
39
|
-
export function validateSign7702Actions(actions, basePath, realChainId) {
|
|
38
|
+
export function validateSign7702Actions(actions, basePath, realChainId, envConfig) {
|
|
40
39
|
const violations = [];
|
|
41
40
|
let sign7702Count = 0;
|
|
42
41
|
let firstSign7702Index = -1;
|
|
@@ -45,7 +44,7 @@ export function validateSign7702Actions(actions, basePath, realChainId) {
|
|
|
45
44
|
if (action.type !== EvmActionKind.Sign7702Authorization)
|
|
46
45
|
continue;
|
|
47
46
|
const actionPath = `${basePath}.requiredActions[${i}]`;
|
|
48
|
-
violations.push(...validateSign7702Action(action, actionPath, realChainId));
|
|
47
|
+
violations.push(...validateSign7702Action(action, actionPath, realChainId, envConfig));
|
|
49
48
|
// HIGH: at most one Sign7702Authorization per intent
|
|
50
49
|
// Note: only the first duplicate will be reported, subsequent ones will be ignored
|
|
51
50
|
sign7702Count++;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evm-sign7702.js","sourceRoot":"","sources":["../../../src/validations/evm-sign7702.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,aAAa,EAEb,aAAa,EACb,kBAAkB,GAIrB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"evm-sign7702.js","sourceRoot":"","sources":["../../../src/validations/evm-sign7702.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,aAAa,EAEb,aAAa,EACb,kBAAkB,GAIrB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGpD,gDAAgD;AAChD,oCAAoC;AACpC,gDAAgD;AAEhD,oEAAoE;AACpE,yEAAyE;AACzE,4EAA4E;AAC5E,wEAAwE;AACxE,gDAAgD;AAChD,MAAM,UAAU,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,kBAAkB,CAAC,QAAQ,EAAE,CAAC;QAC7D,UAAU,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,aAAa,CAAC,gCAAgC;YACpD,OAAO,EAAE,+DAA+D;YACxE,IAAI,EAAE,GAAG,UAAU,UAAU;YAC7B,QAAQ,EAAE,CAAC,kBAAkB,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,aAAa,CAAC,SAAS,CAAC,0BAA0B,EAAE,WAAW,EAAE,eAAe,CAAC,EACvF,CAAC;QACC,UAAU,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,aAAa,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,MAAM,UAAU,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,aAAa,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,aAAa,CAAC,8BAA8B;gBAClD,OAAO,EAAE,kEAAkE,kBAAkB,QAAQ,CAAC,EAAE;gBACxG,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"}
|