@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
|
@@ -6,10 +6,28 @@ const types_2 = require("../whitelists/types");
|
|
|
6
6
|
const evm_token_1 = require("../helpers/evm-token");
|
|
7
7
|
const token_permit_metadata_1 = require("../graylists/evm/token-permit-metadata");
|
|
8
8
|
const address_1 = require("../helpers/address");
|
|
9
|
+
const integer_1 = require("../helpers/integer");
|
|
10
|
+
const eip712_types_1 = require("../helpers/eip712-types");
|
|
11
|
+
const viem_1 = require("viem");
|
|
9
12
|
// =============================================
|
|
10
13
|
// Permit (EIP-2612) constraints
|
|
11
14
|
// =============================================
|
|
12
|
-
|
|
15
|
+
const EXPECTED_PERMIT_TYPES = {
|
|
16
|
+
EIP712Domain: [
|
|
17
|
+
{ name: "name", type: "string" },
|
|
18
|
+
{ name: "version", type: "string" },
|
|
19
|
+
{ name: "chainId", type: "uint256" },
|
|
20
|
+
{ name: "verifyingContract", type: "address" },
|
|
21
|
+
],
|
|
22
|
+
Permit: [
|
|
23
|
+
{ name: "owner", type: "address" },
|
|
24
|
+
{ name: "spender", type: "address" },
|
|
25
|
+
{ name: "value", type: "uint256" },
|
|
26
|
+
{ name: "nonce", type: "uint256" },
|
|
27
|
+
{ name: "deadline", type: "uint256" },
|
|
28
|
+
],
|
|
29
|
+
};
|
|
30
|
+
function validatePermitActions(actions, basePath, request, response, intentExpirationTimestamp, realChainId, quoteMode, trades, srcChainAuthorityAddress, envConfig) {
|
|
13
31
|
const violations = [];
|
|
14
32
|
for (let i = 0; i < actions.length; i++) {
|
|
15
33
|
const action = actions[i];
|
|
@@ -17,26 +35,36 @@ function validatePermitActions(actions, basePath, request, response, realChainId
|
|
|
17
35
|
continue;
|
|
18
36
|
const actionPath = `${basePath}.requiredActions[${i}]`;
|
|
19
37
|
const data = action.data;
|
|
20
|
-
// CRITICAL: Permit only allowed with
|
|
21
|
-
violations.push(...
|
|
38
|
+
// CRITICAL: Permit only allowed with permit + unlimited approval mode
|
|
39
|
+
violations.push(...validatePermitRequestMode(request, actionPath));
|
|
22
40
|
// HIGH: actions[] must contain exactly [Budget]
|
|
23
41
|
violations.push(...validatePermitActionsList(action, actionPath));
|
|
24
|
-
violations.push(...validatePermitPrimaryType(data, actionPath), ...validatePermitDomain(data, actionPath, realChainId, trades), ...validatePermitMessage(data, actionPath, response, realChainId, quoteMode, srcChainAuthorityAddress, envConfig), ...validatePermitDetails(action, data, actionPath, realChainId));
|
|
42
|
+
violations.push(...validatePermitPrimaryType(data, actionPath), ...validatePermitTypes(data, actionPath), ...validatePermitDomain(data, actionPath, realChainId, trades), ...validatePermitMessage(data, actionPath, response, intentExpirationTimestamp, realChainId, quoteMode, srcChainAuthorityAddress, envConfig), ...validatePermitDetails(action, data, actionPath, realChainId));
|
|
25
43
|
}
|
|
26
44
|
return violations;
|
|
27
45
|
}
|
|
28
|
-
// CRITICAL: Permit only allowed with
|
|
29
|
-
function
|
|
46
|
+
// CRITICAL: Permit only allowed with permit + unlimited approval mode
|
|
47
|
+
function validatePermitRequestMode(request, actionPath) {
|
|
48
|
+
const violations = [];
|
|
30
49
|
if (request.approvalMode !== types_1.ApprovalMode.Permit) {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
50
|
+
violations.push({
|
|
51
|
+
code: types_1.ViolationCode.PermitForbiddenWithoutPermitMode,
|
|
52
|
+
message: `Permit action requires approvalMode="${types_1.ApprovalMode.Permit}"`,
|
|
53
|
+
path: `${actionPath}.type`,
|
|
54
|
+
expected: types_1.ApprovalMode.Permit,
|
|
55
|
+
actual: request.approvalMode,
|
|
56
|
+
});
|
|
38
57
|
}
|
|
39
|
-
|
|
58
|
+
if (request.approveAmountFlag !== types_1.ApproveAmountFlag.Unlimited) {
|
|
59
|
+
violations.push({
|
|
60
|
+
code: types_1.ViolationCode.PermitForbiddenWithoutUnlimitedApproveAmount,
|
|
61
|
+
message: `Permit action requires approveAmountFlag="${types_1.ApproveAmountFlag.Unlimited}"`,
|
|
62
|
+
path: `${actionPath}.type`,
|
|
63
|
+
expected: types_1.ApproveAmountFlag.Unlimited,
|
|
64
|
+
actual: request.approveAmountFlag,
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
return violations;
|
|
40
68
|
}
|
|
41
69
|
// HIGH: actions[] must contain exactly [Budget]
|
|
42
70
|
function validatePermitActionsList(action, actionPath) {
|
|
@@ -52,6 +80,19 @@ function validatePermitActionsList(action, actionPath) {
|
|
|
52
80
|
}
|
|
53
81
|
return [];
|
|
54
82
|
}
|
|
83
|
+
// CRITICAL: types must match the expected EIP-2612 EIP712 structure
|
|
84
|
+
function validatePermitTypes(data, actionPath) {
|
|
85
|
+
if (!(0, eip712_types_1.eip712TypesEqual)(data.types, EXPECTED_PERMIT_TYPES)) {
|
|
86
|
+
return [{
|
|
87
|
+
code: types_1.ViolationCode.PermitTypesInvalid,
|
|
88
|
+
message: `Permit types must match the expected EIP712 structure`,
|
|
89
|
+
path: `${actionPath}.data.types`,
|
|
90
|
+
expected: EXPECTED_PERMIT_TYPES,
|
|
91
|
+
actual: data.types,
|
|
92
|
+
}];
|
|
93
|
+
}
|
|
94
|
+
return [];
|
|
95
|
+
}
|
|
55
96
|
// CRITICAL: primaryType must be "Permit"
|
|
56
97
|
function validatePermitPrimaryType(data, actionPath) {
|
|
57
98
|
if (data.primaryType !== "Permit") {
|
|
@@ -121,43 +162,103 @@ function validatePermitDomain(data, actionPath, realChainId, trades) {
|
|
|
121
162
|
}
|
|
122
163
|
// CRITICAL: message.owner = srcChainAuthorityAddress (execution mode)
|
|
123
164
|
// CRITICAL: message.spender = AllowanceHolder or preHook address
|
|
124
|
-
function validatePermitMessage(data, actionPath, response, realChainId, quoteMode, srcChainAuthorityAddress, envConfig) {
|
|
125
|
-
const violations = [];
|
|
165
|
+
function validatePermitMessage(data, actionPath, response, intentExpirationTimestamp, realChainId, quoteMode, srcChainAuthorityAddress, envConfig) {
|
|
126
166
|
const msg = data.message;
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
167
|
+
return [
|
|
168
|
+
...validatePermitOwner(msg.owner, actionPath, realChainId, quoteMode, srcChainAuthorityAddress),
|
|
169
|
+
...validatePermitSpender(msg.spender, actionPath, response, realChainId, envConfig),
|
|
170
|
+
...validatePermitValue(msg.value, actionPath),
|
|
171
|
+
...validatePermitDeadline(msg.deadline, actionPath, intentExpirationTimestamp),
|
|
172
|
+
];
|
|
173
|
+
}
|
|
174
|
+
// CRITICAL: owner must match srcChainAuthorityAddress in execution mode
|
|
175
|
+
function validatePermitOwner(owner, actionPath, realChainId, quoteMode, srcChainAuthorityAddress) {
|
|
176
|
+
if (quoteMode)
|
|
177
|
+
return [];
|
|
178
|
+
if (srcChainAuthorityAddress !== undefined &&
|
|
179
|
+
owner !== undefined &&
|
|
180
|
+
(0, address_1.addressEquals)(realChainId, owner, srcChainAuthorityAddress))
|
|
181
|
+
return [];
|
|
182
|
+
return [{
|
|
183
|
+
code: types_1.ViolationCode.PermitOwnerMismatch,
|
|
184
|
+
message: `Permit message.owner must match srcChainAuthorityAddress`,
|
|
185
|
+
path: `${actionPath}.data.message.owner`,
|
|
186
|
+
expected: srcChainAuthorityAddress,
|
|
187
|
+
actual: owner,
|
|
188
|
+
}];
|
|
189
|
+
}
|
|
190
|
+
// CRITICAL: spender must be AllowanceHolder or preHook address
|
|
191
|
+
function validatePermitSpender(spender, actionPath, response, realChainId, envConfig) {
|
|
144
192
|
if (spender === undefined) {
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
193
|
+
return [{
|
|
194
|
+
code: types_1.ViolationCode.PermitSpenderMissing,
|
|
195
|
+
message: `Permit message.spender is missing`,
|
|
196
|
+
path: `${actionPath}.data.message.spender`,
|
|
197
|
+
actual: undefined,
|
|
198
|
+
}];
|
|
151
199
|
}
|
|
152
|
-
|
|
153
|
-
|
|
200
|
+
if (isAllowedSpender(spender, response, realChainId, envConfig))
|
|
201
|
+
return [];
|
|
202
|
+
return [{
|
|
154
203
|
code: types_1.ViolationCode.PermitSpenderNotAllowed,
|
|
155
204
|
message: `Permit message.spender is not an allowed address`,
|
|
156
205
|
path: `${actionPath}.data.message.spender`,
|
|
157
206
|
actual: spender,
|
|
158
|
-
}
|
|
207
|
+
}];
|
|
208
|
+
}
|
|
209
|
+
// CRITICAL: message.value = maxUint256
|
|
210
|
+
function validatePermitValue(value, actionPath) {
|
|
211
|
+
if (value === undefined) {
|
|
212
|
+
return [permitValueViolation(value, actionPath, undefined)];
|
|
159
213
|
}
|
|
160
|
-
|
|
214
|
+
try {
|
|
215
|
+
if ((0, integer_1.parseIntegerString)(value) !== viem_1.maxUint256) {
|
|
216
|
+
return [permitValueViolation(value, actionPath, undefined)];
|
|
217
|
+
}
|
|
218
|
+
}
|
|
219
|
+
catch (error) {
|
|
220
|
+
return [permitValueViolation(value, actionPath, error)];
|
|
221
|
+
}
|
|
222
|
+
return [];
|
|
223
|
+
}
|
|
224
|
+
function permitValueViolation(value, actionPath, error) {
|
|
225
|
+
return {
|
|
226
|
+
code: types_1.ViolationCode.PermitValueNotMaxUint256,
|
|
227
|
+
message: value === undefined
|
|
228
|
+
? `Permit message.value is missing`
|
|
229
|
+
: `Permit message.value must be maxUint256`,
|
|
230
|
+
path: `${actionPath}.data.message.value`,
|
|
231
|
+
expected: viem_1.maxUint256.toString(),
|
|
232
|
+
actual: value,
|
|
233
|
+
details: error,
|
|
234
|
+
};
|
|
235
|
+
}
|
|
236
|
+
// CRITICAL: message.deadline must equal intent.expirationTimestamp
|
|
237
|
+
function validatePermitDeadline(deadline, actionPath, intentExpirationTimestamp) {
|
|
238
|
+
if (deadline === undefined) {
|
|
239
|
+
return [permitDeadlineViolation(deadline, actionPath, intentExpirationTimestamp, undefined)];
|
|
240
|
+
}
|
|
241
|
+
try {
|
|
242
|
+
if ((0, integer_1.parseIntegerString)(deadline) !== BigInt(intentExpirationTimestamp)) {
|
|
243
|
+
return [permitDeadlineViolation(deadline, actionPath, intentExpirationTimestamp, undefined)];
|
|
244
|
+
}
|
|
245
|
+
}
|
|
246
|
+
catch (error) {
|
|
247
|
+
return [permitDeadlineViolation(deadline, actionPath, intentExpirationTimestamp, error)];
|
|
248
|
+
}
|
|
249
|
+
return [];
|
|
250
|
+
}
|
|
251
|
+
function permitDeadlineViolation(deadline, actionPath, intentExpirationTimestamp, error) {
|
|
252
|
+
return {
|
|
253
|
+
code: types_1.ViolationCode.PermitDeadlineMismatch,
|
|
254
|
+
message: deadline === undefined
|
|
255
|
+
? `Permit message.deadline is missing`
|
|
256
|
+
: `Permit message.deadline must match intent.expirationTimestamp`,
|
|
257
|
+
path: `${actionPath}.data.message.deadline`,
|
|
258
|
+
expected: intentExpirationTimestamp,
|
|
259
|
+
actual: deadline,
|
|
260
|
+
details: error,
|
|
261
|
+
};
|
|
161
262
|
}
|
|
162
263
|
// CRITICAL: details must match message fields
|
|
163
264
|
function validatePermitDetails(action, data, actionPath, realChainId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evm-permit.js","sourceRoot":"","sources":["../../../src/validations/evm-permit.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"evm-permit.js","sourceRoot":"","sources":["../../../src/validations/evm-permit.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ const viem_1 = require("viem");
|
|
|
8
8
|
const evm_token_1 = require("../helpers/evm-token");
|
|
9
9
|
const address_1 = require("../helpers/address");
|
|
10
10
|
const integer_1 = require("../helpers/integer");
|
|
11
|
+
const eip712_types_1 = require("../helpers/eip712-types");
|
|
11
12
|
// =============================================
|
|
12
13
|
// Permit2 (Uniswap AllowanceTransfer) constraints
|
|
13
14
|
// =============================================
|
|
@@ -29,7 +30,7 @@ const EXPECTED_TYPES = {
|
|
|
29
30
|
{ name: "nonce", type: "uint48" },
|
|
30
31
|
],
|
|
31
32
|
};
|
|
32
|
-
function validatePermit2Actions(actions, basePath, request, response, realChainId, trades, envConfig) {
|
|
33
|
+
function validatePermit2Actions(actions, basePath, request, response, intentExpirationTimestamp, realChainId, trades, envConfig) {
|
|
33
34
|
const violations = [];
|
|
34
35
|
for (let i = 0; i < actions.length; i++) {
|
|
35
36
|
const action = actions[i];
|
|
@@ -37,26 +38,36 @@ function validatePermit2Actions(actions, basePath, request, response, realChainI
|
|
|
37
38
|
continue;
|
|
38
39
|
const actionPath = `${basePath}.requiredActions[${i}]`;
|
|
39
40
|
const data = action.data;
|
|
40
|
-
// CRITICAL: only allowed with
|
|
41
|
-
violations.push(...
|
|
41
|
+
// CRITICAL: Permit2 only allowed with permit + unlimited approval mode
|
|
42
|
+
violations.push(...validatePermit2RequestMode(request, actionPath));
|
|
42
43
|
// HIGH: actions[] must contain exactly [Budget]
|
|
43
44
|
violations.push(...validatePermit2ActionsList(action, actionPath));
|
|
44
|
-
violations.push(...validatePermit2PrimaryType(data, actionPath), ...validatePermit2Domain(data, actionPath, realChainId), ...validatePermit2Types(data, actionPath), ...validatePermit2Message(data, actionPath,
|
|
45
|
+
violations.push(...validatePermit2PrimaryType(data, actionPath), ...validatePermit2Domain(data, actionPath, realChainId), ...validatePermit2Types(data, actionPath), ...validatePermit2Message(data, actionPath, response, intentExpirationTimestamp, realChainId, trades, envConfig), ...validatePermit2Details(action, data, actionPath, realChainId));
|
|
45
46
|
}
|
|
46
47
|
return violations;
|
|
47
48
|
}
|
|
48
|
-
// CRITICAL: only allowed with
|
|
49
|
-
function
|
|
49
|
+
// CRITICAL: Permit2 only allowed with permit + unlimited approval mode
|
|
50
|
+
function validatePermit2RequestMode(request, actionPath) {
|
|
51
|
+
const violations = [];
|
|
50
52
|
if (request.approvalMode !== types_1.ApprovalMode.Permit) {
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
53
|
+
violations.push({
|
|
54
|
+
code: types_1.ViolationCode.Permit2ForbiddenWithoutPermitMode,
|
|
55
|
+
message: `Permit2 action requires approvalMode="${types_1.ApprovalMode.Permit}"`,
|
|
56
|
+
path: `${actionPath}.type`,
|
|
57
|
+
expected: types_1.ApprovalMode.Permit,
|
|
58
|
+
actual: request.approvalMode,
|
|
59
|
+
});
|
|
58
60
|
}
|
|
59
|
-
|
|
61
|
+
if (request.approveAmountFlag !== types_1.ApproveAmountFlag.Unlimited) {
|
|
62
|
+
violations.push({
|
|
63
|
+
code: types_1.ViolationCode.Permit2ForbiddenWithoutUnlimitedApproveAmount,
|
|
64
|
+
message: `Permit2 action requires approveAmountFlag="${types_1.ApproveAmountFlag.Unlimited}"`,
|
|
65
|
+
path: `${actionPath}.type`,
|
|
66
|
+
expected: types_1.ApproveAmountFlag.Unlimited,
|
|
67
|
+
actual: request.approveAmountFlag,
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
return violations;
|
|
60
71
|
}
|
|
61
72
|
// HIGH: actions[] must contain exactly [Budget]
|
|
62
73
|
function validatePermit2ActionsList(action, actionPath) {
|
|
@@ -123,41 +134,20 @@ function validatePermit2Domain(data, actionPath, realChainId) {
|
|
|
123
134
|
}
|
|
124
135
|
// CRITICAL: types must match the expected Permit2 EIP712 structure
|
|
125
136
|
function validatePermit2Types(data, actionPath) {
|
|
126
|
-
|
|
127
|
-
const expectedKeys = Object.keys(EXPECTED_TYPES).sort();
|
|
128
|
-
const actualKeys = Object.keys(types).sort();
|
|
129
|
-
if (actualKeys.length !== expectedKeys.length ||
|
|
130
|
-
!actualKeys.every((k, i) => k === expectedKeys[i]) ||
|
|
131
|
-
!allFieldsMatch(types)) {
|
|
137
|
+
if (!(0, eip712_types_1.eip712TypesEqual)(data.types, EXPECTED_TYPES)) {
|
|
132
138
|
return [{
|
|
133
139
|
code: types_1.ViolationCode.Permit2TypesInvalid,
|
|
134
140
|
message: `Permit2 types must match the expected EIP712 structure`,
|
|
135
141
|
path: `${actionPath}.data.types`,
|
|
136
142
|
expected: EXPECTED_TYPES,
|
|
137
|
-
actual: types,
|
|
143
|
+
actual: data.types,
|
|
138
144
|
}];
|
|
139
145
|
}
|
|
140
146
|
return [];
|
|
141
147
|
}
|
|
142
|
-
function allFieldsMatch(types) {
|
|
143
|
-
for (const [key, expectedFields] of Object.entries(EXPECTED_TYPES)) {
|
|
144
|
-
const actualFields = types[key];
|
|
145
|
-
if (!actualFields)
|
|
146
|
-
return false;
|
|
147
|
-
if (actualFields.length !== expectedFields.length)
|
|
148
|
-
return false;
|
|
149
|
-
for (let i = 0; i < expectedFields.length; i++) {
|
|
150
|
-
if (actualFields[i].name !== expectedFields[i].name ||
|
|
151
|
-
actualFields[i].type !== expectedFields[i].type) {
|
|
152
|
-
return false;
|
|
153
|
-
}
|
|
154
|
-
}
|
|
155
|
-
}
|
|
156
|
-
return true;
|
|
157
|
-
}
|
|
158
148
|
// CRITICAL: message.details must exist with token, amount, expiration
|
|
159
149
|
// CRITICAL: message.spender must be allowed
|
|
160
|
-
function validatePermit2Message(data, actionPath,
|
|
150
|
+
function validatePermit2Message(data, actionPath, response, intentExpirationTimestamp, realChainId, trades, envConfig) {
|
|
161
151
|
const violations = [];
|
|
162
152
|
const msg = data.message;
|
|
163
153
|
const details = msg.details;
|
|
@@ -170,7 +160,7 @@ function validatePermit2Message(data, actionPath, request, response, realChainId
|
|
|
170
160
|
});
|
|
171
161
|
}
|
|
172
162
|
else {
|
|
173
|
-
violations.push(...validatePermit2Token(details.token, actionPath, realChainId, trades), ...validatePermit2Amount(details.amount, actionPath), ...validatePermit2Expiration(details.expiration, actionPath,
|
|
163
|
+
violations.push(...validatePermit2Token(details.token, actionPath, realChainId, trades), ...validatePermit2Amount(details.amount, actionPath), ...validatePermit2Expiration(details.expiration, actionPath, intentExpirationTimestamp));
|
|
174
164
|
}
|
|
175
165
|
violations.push(...validatePermit2Spender(msg.spender, actionPath, response, realChainId, envConfig));
|
|
176
166
|
return violations;
|
|
@@ -231,24 +221,24 @@ function validatePermit2Amount(amount, actionPath) {
|
|
|
231
221
|
}
|
|
232
222
|
return [];
|
|
233
223
|
}
|
|
234
|
-
// CRITICAL: message.details.expiration
|
|
235
|
-
function validatePermit2Expiration(expiration, actionPath,
|
|
224
|
+
// CRITICAL: message.details.expiration must equal intent.expirationTimestamp
|
|
225
|
+
function validatePermit2Expiration(expiration, actionPath, intentExpirationTimestamp) {
|
|
236
226
|
if (expiration === undefined) {
|
|
237
227
|
return [{
|
|
238
228
|
code: types_1.ViolationCode.Permit2ExpirationMismatch,
|
|
239
229
|
message: `Permit2 message.details.expiration is missing`,
|
|
240
230
|
path: `${actionPath}.data.message.details.expiration`,
|
|
241
|
-
expected:
|
|
231
|
+
expected: intentExpirationTimestamp,
|
|
242
232
|
actual: undefined,
|
|
243
233
|
}];
|
|
244
234
|
}
|
|
245
235
|
try {
|
|
246
|
-
if ((0, integer_1.parseIntegerString)(expiration) !== BigInt(
|
|
236
|
+
if ((0, integer_1.parseIntegerString)(expiration) !== BigInt(intentExpirationTimestamp)) {
|
|
247
237
|
return [{
|
|
248
238
|
code: types_1.ViolationCode.Permit2ExpirationMismatch,
|
|
249
|
-
message: `Permit2 message.details.expiration must match
|
|
239
|
+
message: `Permit2 message.details.expiration must match intent.expirationTimestamp`,
|
|
250
240
|
path: `${actionPath}.data.message.details.expiration`,
|
|
251
|
-
expected:
|
|
241
|
+
expected: intentExpirationTimestamp,
|
|
252
242
|
actual: expiration,
|
|
253
243
|
}];
|
|
254
244
|
}
|
|
@@ -258,7 +248,7 @@ function validatePermit2Expiration(expiration, actionPath, request) {
|
|
|
258
248
|
code: types_1.ViolationCode.Permit2ExpirationMismatch,
|
|
259
249
|
message: `Permit2 message.details.expiration is not a valid number`,
|
|
260
250
|
path: `${actionPath}.data.message.details.expiration`,
|
|
261
|
-
expected:
|
|
251
|
+
expected: intentExpirationTimestamp,
|
|
262
252
|
actual: expiration,
|
|
263
253
|
details: error,
|
|
264
254
|
}];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evm-permit2.js","sourceRoot":"","sources":["../../../src/validations/evm-permit2.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"evm-permit2.js","sourceRoot":"","sources":["../../../src/validations/evm-permit2.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,12 +19,12 @@ function validateEvmRequiredActions(request, response, actions, basePath, realCh
|
|
|
19
19
|
return [
|
|
20
20
|
...validateUniqueActionIds(actions, basePath),
|
|
21
21
|
...validateAAConstraints(request, response, actions, basePath),
|
|
22
|
-
...(0, evm_sign7702_1.validateSign7702Actions)(actions, basePath, realChainId),
|
|
23
|
-
...(0, evm_sign712_metamask_1.validateSign712MetaMaskActions)(actions, basePath, realChainId, quoteMode,
|
|
22
|
+
...(0, evm_sign7702_1.validateSign7702Actions)(actions, basePath, realChainId, envConfig),
|
|
23
|
+
...(0, evm_sign712_metamask_1.validateSign712MetaMaskActions)(actions, basePath, realChainId, quoteMode, intent.expirationTimestamp, srcChainAuthorityAddress, expectedDelegate, envConfig),
|
|
24
24
|
// Sign712 Intent check is skipped in quote mode
|
|
25
25
|
...(quoteMode || syntheticNativeWrapMode ? [] : (0, evm_sign712_1.validateSign712IntentActions)(actions, basePath, realChainId, intent, envConfig)),
|
|
26
|
-
...(0, evm_permit_1.validatePermitActions)(actions, basePath, request, response, realChainId, quoteMode, trades, srcChainAuthorityAddress, envConfig),
|
|
27
|
-
...(0, evm_permit2_1.validatePermit2Actions)(actions, basePath, request, response, realChainId, trades, envConfig),
|
|
26
|
+
...(0, evm_permit_1.validatePermitActions)(actions, basePath, request, response, intent.expirationTimestamp, realChainId, quoteMode, trades, srcChainAuthorityAddress, envConfig),
|
|
27
|
+
...(0, evm_permit2_1.validatePermit2Actions)(actions, basePath, request, response, intent.expirationTimestamp, realChainId, trades, envConfig),
|
|
28
28
|
...(0, evm_transaction_1.validateTransactionActions)(actions, basePath),
|
|
29
29
|
...(0, evm_op_budget_1.validateBudgetOperations)(actions, basePath, request, trades, responseTrades, realChainId, envConfig),
|
|
30
30
|
...(0, evm_op_wrap_1.validateWrapOperations)(actions, basePath, trades, responseTrades, realChainId),
|
|
@@ -178,11 +178,16 @@ function classifyApprovalAction(action) {
|
|
|
178
178
|
if (action.type === types_1.EvmActionKind.Transaction &&
|
|
179
179
|
// Stricter check for action.actions to be exactly ['Budget'] is performed in another place.
|
|
180
180
|
// Here we filter Transaction actions that include 'Budget' among other operations.
|
|
181
|
-
action.actions.includes(types_1.EvmActionOperation.Budget)
|
|
182
|
-
|
|
181
|
+
action.actions.includes(types_1.EvmActionOperation.Budget)) {
|
|
182
|
+
const budgetInfo = (0, evm_op_budget_1.getBudgetApprovalInfo)(action);
|
|
183
|
+
// A zero-allowance reset is allowed only as a deterministic pair with
|
|
184
|
+
// the following main Budget action. Pairing is validated in evm-op-budget;
|
|
185
|
+
// it must not count as a competing approval in this per-token check.
|
|
186
|
+
if (!budgetInfo || budgetInfo.amount === 0n)
|
|
187
|
+
return undefined;
|
|
183
188
|
return {
|
|
184
189
|
kind: ApprovalActionKind.TransactionBudget,
|
|
185
|
-
tokenAddress:
|
|
190
|
+
tokenAddress: budgetInfo.tokenAddress,
|
|
186
191
|
};
|
|
187
192
|
}
|
|
188
193
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evm-required-actions.js","sourceRoot":"","sources":["../../../src/validations/evm-required-actions.ts"],"names":[],"mappings":";;AAyBA,
|
|
1
|
+
{"version":3,"file":"evm-required-actions.js","sourceRoot":"","sources":["../../../src/validations/evm-required-actions.ts"],"names":[],"mappings":"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"}
|