@debridge-finance/borderless-validation-sdk 0.0.6 → 0.0.8
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-dln-hook-pack.js +8 -6
- package/dist/cjs/helpers/evm-dln-hook-pack.js.map +1 -1
- package/dist/cjs/helpers/evm-gas-compensation-tx.js +26 -7
- package/dist/cjs/helpers/evm-gas-compensation-tx.js.map +1 -1
- package/dist/cjs/helpers/evm-intent-id.js +6 -5
- package/dist/cjs/helpers/evm-intent-id.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/evm-trade-amounts.js +2 -1
- package/dist/cjs/helpers/evm-trade-amounts.js.map +1 -1
- package/dist/cjs/helpers/expected-delegate.js +10 -11
- package/dist/cjs/helpers/expected-delegate.js.map +1 -1
- package/dist/cjs/helpers/gas-compensation.js +3 -0
- package/dist/cjs/helpers/gas-compensation.js.map +1 -1
- package/dist/cjs/helpers/hex.js +35 -0
- package/dist/cjs/helpers/hex.js.map +1 -1
- package/dist/cjs/helpers/integer.js +10 -0
- package/dist/cjs/helpers/integer.js.map +1 -0
- package/dist/cjs/helpers/placeholder.js +99 -4
- package/dist/cjs/helpers/placeholder.js.map +1 -1
- package/dist/cjs/helpers/solana-intent-id.js +6 -5
- package/dist/cjs/helpers/solana-intent-id.js.map +1 -1
- package/dist/cjs/helpers/synthetic-native-wrap.js +56 -0
- package/dist/cjs/helpers/synthetic-native-wrap.js.map +1 -0
- package/dist/cjs/types/enums.js +2 -0
- package/dist/cjs/types/enums.js.map +1 -1
- package/dist/cjs/types/request.js +25 -5
- package/dist/cjs/types/request.js.map +1 -1
- package/dist/cjs/types/response.js +10 -3
- package/dist/cjs/types/response.js.map +1 -1
- package/dist/cjs/types/validation.js +28 -1
- package/dist/cjs/types/validation.js.map +1 -1
- package/dist/cjs/validations/accumulative-token.js +5 -4
- package/dist/cjs/validations/accumulative-token.js.map +1 -1
- package/dist/cjs/validations/compensation-hook.js +14 -4
- package/dist/cjs/validations/compensation-hook.js.map +1 -1
- package/dist/cjs/validations/dln-metadata.js +63 -0
- package/dist/cjs/validations/dln-metadata.js.map +1 -0
- package/dist/cjs/validations/evm-caveats.js +12 -11
- 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 +67 -26
- package/dist/cjs/validations/evm-op-hook.js.map +1 -1
- package/dist/cjs/validations/evm-op-wrap.js +29 -26
- package/dist/cjs/validations/evm-op-wrap.js.map +1 -1
- package/dist/cjs/validations/evm-permit.js +143 -42
- package/dist/cjs/validations/evm-permit.js.map +1 -1
- package/dist/cjs/validations/evm-permit2.js +32 -39
- package/dist/cjs/validations/evm-permit2.js.map +1 -1
- package/dist/cjs/validations/evm-required-actions.js +17 -9
- 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 +4 -5
- 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/external-call.js +330 -0
- package/dist/cjs/validations/external-call.js.map +1 -0
- package/dist/cjs/validations/hooks-common.js +279 -25
- package/dist/cjs/validations/hooks-common.js.map +1 -1
- package/dist/cjs/validations/intent-tokens.js +23 -15
- package/dist/cjs/validations/intent-tokens.js.map +1 -1
- package/dist/cjs/validations/intent.js +194 -72
- package/dist/cjs/validations/intent.js.map +1 -1
- package/dist/cjs/validations/ptp.js +7 -6
- package/dist/cjs/validations/ptp.js.map +1 -1
- package/dist/cjs/validations/required-actions.js +6 -4
- package/dist/cjs/validations/required-actions.js.map +1 -1
- package/dist/cjs/validations/solana-hook.js +74 -9
- package/dist/cjs/validations/solana-hook.js.map +1 -1
- package/dist/cjs/validations/solana-op-budget.js +71 -2
- package/dist/cjs/validations/solana-op-budget.js.map +1 -1
- package/dist/cjs/validations/solana-op-wrap.js +32 -4
- 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/validations/total-dst-amount.js +36 -22
- package/dist/cjs/validations/total-dst-amount.js.map +1 -1
- package/dist/cjs/validations/trade-grouping.js +67 -31
- package/dist/cjs/validations/trade-grouping.js.map +1 -1
- package/dist/cjs/validations/trade-matching.js +112 -0
- package/dist/cjs/validations/trade-matching.js.map +1 -0
- package/dist/cjs/validations/trades.js +53 -52
- package/dist/cjs/validations/trades.js.map +1 -1
- package/dist/cjs/validator.js +19 -7
- package/dist/cjs/validator.js.map +1 -1
- package/dist/cjs/whitelists/environment-config.js +65 -16
- 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-dln-hook-pack.js +8 -6
- package/dist/esm/helpers/evm-dln-hook-pack.js.map +1 -1
- package/dist/esm/helpers/evm-gas-compensation-tx.js +26 -7
- package/dist/esm/helpers/evm-gas-compensation-tx.js.map +1 -1
- package/dist/esm/helpers/evm-intent-id.js +6 -5
- package/dist/esm/helpers/evm-intent-id.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/evm-trade-amounts.js +2 -1
- package/dist/esm/helpers/evm-trade-amounts.js.map +1 -1
- package/dist/esm/helpers/expected-delegate.js +10 -11
- package/dist/esm/helpers/expected-delegate.js.map +1 -1
- package/dist/esm/helpers/gas-compensation.js +3 -0
- package/dist/esm/helpers/gas-compensation.js.map +1 -1
- package/dist/esm/helpers/hex.js +29 -0
- package/dist/esm/helpers/hex.js.map +1 -1
- package/dist/esm/helpers/integer.js +7 -0
- package/dist/esm/helpers/integer.js.map +1 -0
- package/dist/esm/helpers/placeholder.js +98 -4
- package/dist/esm/helpers/placeholder.js.map +1 -1
- package/dist/esm/helpers/solana-intent-id.js +6 -5
- package/dist/esm/helpers/solana-intent-id.js.map +1 -1
- package/dist/esm/helpers/synthetic-native-wrap.js +52 -0
- package/dist/esm/helpers/synthetic-native-wrap.js.map +1 -0
- package/dist/esm/types/enums.js +2 -0
- package/dist/esm/types/enums.js.map +1 -1
- package/dist/esm/types/request.js +23 -4
- package/dist/esm/types/request.js.map +1 -1
- package/dist/esm/types/response.js +10 -3
- package/dist/esm/types/response.js.map +1 -1
- package/dist/esm/types/validation.js +28 -1
- package/dist/esm/types/validation.js.map +1 -1
- package/dist/esm/validations/accumulative-token.js +5 -4
- package/dist/esm/validations/accumulative-token.js.map +1 -1
- package/dist/esm/validations/compensation-hook.js +14 -4
- package/dist/esm/validations/compensation-hook.js.map +1 -1
- package/dist/esm/validations/dln-metadata.js +56 -0
- package/dist/esm/validations/dln-metadata.js.map +1 -0
- package/dist/esm/validations/evm-caveats.js +12 -11
- 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 +68 -27
- package/dist/esm/validations/evm-op-hook.js.map +1 -1
- package/dist/esm/validations/evm-op-wrap.js +30 -27
- package/dist/esm/validations/evm-op-wrap.js.map +1 -1
- package/dist/esm/validations/evm-permit.js +144 -43
- package/dist/esm/validations/evm-permit.js.map +1 -1
- package/dist/esm/validations/evm-permit2.js +33 -40
- package/dist/esm/validations/evm-permit2.js.map +1 -1
- package/dist/esm/validations/evm-required-actions.js +18 -10
- 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 +4 -5
- 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/external-call.js +325 -0
- package/dist/esm/validations/external-call.js.map +1 -0
- package/dist/esm/validations/hooks-common.js +280 -26
- package/dist/esm/validations/hooks-common.js.map +1 -1
- package/dist/esm/validations/intent-tokens.js +23 -15
- package/dist/esm/validations/intent-tokens.js.map +1 -1
- package/dist/esm/validations/intent.js +197 -75
- package/dist/esm/validations/intent.js.map +1 -1
- package/dist/esm/validations/ptp.js +7 -6
- package/dist/esm/validations/ptp.js.map +1 -1
- package/dist/esm/validations/required-actions.js +7 -5
- package/dist/esm/validations/required-actions.js.map +1 -1
- package/dist/esm/validations/solana-hook.js +74 -9
- package/dist/esm/validations/solana-hook.js.map +1 -1
- package/dist/esm/validations/solana-op-budget.js +71 -2
- package/dist/esm/validations/solana-op-budget.js.map +1 -1
- package/dist/esm/validations/solana-op-wrap.js +32 -4
- 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/validations/total-dst-amount.js +36 -22
- package/dist/esm/validations/total-dst-amount.js.map +1 -1
- package/dist/esm/validations/trade-grouping.js +67 -31
- package/dist/esm/validations/trade-grouping.js.map +1 -1
- package/dist/esm/validations/trade-matching.js +109 -0
- package/dist/esm/validations/trade-matching.js.map +1 -0
- package/dist/esm/validations/trades.js +53 -52
- package/dist/esm/validations/trades.js.map +1 -1
- package/dist/esm/validator.js +19 -7
- package/dist/esm/validator.js.map +1 -1
- package/dist/esm/whitelists/environment-config.js +65 -16
- 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-dln-hook-pack.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-intent-id.d.ts.map +1 -1
- package/dist/types/helpers/evm-token.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/hex.d.ts +6 -0
- package/dist/types/helpers/hex.d.ts.map +1 -1
- package/dist/types/helpers/integer.d.ts +2 -0
- package/dist/types/helpers/integer.d.ts.map +1 -0
- package/dist/types/helpers/placeholder.d.ts +3 -1
- package/dist/types/helpers/placeholder.d.ts.map +1 -1
- package/dist/types/helpers/solana-intent-id.d.ts.map +1 -1
- package/dist/types/helpers/synthetic-native-wrap.d.ts +4 -0
- package/dist/types/helpers/synthetic-native-wrap.d.ts.map +1 -0
- package/dist/types/types/enums.d.ts +4 -2
- package/dist/types/types/enums.d.ts.map +1 -1
- package/dist/types/types/request.d.ts +83 -6
- package/dist/types/types/request.d.ts.map +1 -1
- package/dist/types/types/response.d.ts +95 -12
- package/dist/types/types/response.d.ts.map +1 -1
- package/dist/types/types/validation.d.ts +29 -1
- package/dist/types/types/validation.d.ts.map +1 -1
- package/dist/types/validations/accumulative-token.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/dln-metadata.d.ts +7 -0
- package/dist/types/validations/dln-metadata.d.ts.map +1 -0
- package/dist/types/validations/evm-caveats.d.ts +2 -1
- 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.map +1 -1
- package/dist/types/validations/evm-permit2.d.ts.map +1 -1
- package/dist/types/validations/evm-required-actions.d.ts +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/external-call.d.ts +15 -0
- package/dist/types/validations/external-call.d.ts.map +1 -0
- 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-tokens.d.ts.map +1 -1
- package/dist/types/validations/intent.d.ts +1 -1
- package/dist/types/validations/intent.d.ts.map +1 -1
- package/dist/types/validations/ptp.d.ts.map +1 -1
- package/dist/types/validations/required-actions.d.ts +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/validations/total-dst-amount.d.ts.map +1 -1
- package/dist/types/validations/trade-grouping.d.ts +2 -1
- package/dist/types/validations/trade-grouping.d.ts.map +1 -1
- package/dist/types/validations/trade-matching.d.ts +13 -0
- package/dist/types/validations/trade-matching.d.ts.map +1 -0
- package/dist/types/validations/trades.d.ts +2 -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.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,9 +1,11 @@
|
|
|
1
|
-
import { ViolationCode, EvmActionKind, EvmActionOperation, ApprovalMode, } from "../types/index.js";
|
|
1
|
+
import { ViolationCode, EvmActionKind, EvmActionOperation, ApprovalMode, ApproveAmountFlag, } from "../types/index.js";
|
|
2
2
|
import { isWhitelisted } from "../whitelists/types.js";
|
|
3
3
|
import { PERMIT2_CONTRACTS } from "../whitelists/evm/index.js";
|
|
4
4
|
import { maxUint160 } from "viem";
|
|
5
5
|
import { resolveWrappedTokenAddress } from "../helpers/evm-token.js";
|
|
6
6
|
import { addressEquals, normalizeAddress } from "../helpers/address.js";
|
|
7
|
+
import { parseIntegerString } from "../helpers/integer.js";
|
|
8
|
+
import { eip712TypesEqual } from "../helpers/eip712-types.js";
|
|
7
9
|
// =============================================
|
|
8
10
|
// Permit2 (Uniswap AllowanceTransfer) constraints
|
|
9
11
|
// =============================================
|
|
@@ -33,26 +35,36 @@ export function validatePermit2Actions(actions, basePath, request, response, rea
|
|
|
33
35
|
continue;
|
|
34
36
|
const actionPath = `${basePath}.requiredActions[${i}]`;
|
|
35
37
|
const data = action.data;
|
|
36
|
-
// CRITICAL: only allowed with
|
|
37
|
-
violations.push(...
|
|
38
|
+
// CRITICAL: Permit2 only allowed with permit + unlimited approval mode
|
|
39
|
+
violations.push(...validatePermit2RequestMode(request, actionPath));
|
|
38
40
|
// HIGH: actions[] must contain exactly [Budget]
|
|
39
41
|
violations.push(...validatePermit2ActionsList(action, actionPath));
|
|
40
42
|
violations.push(...validatePermit2PrimaryType(data, actionPath), ...validatePermit2Domain(data, actionPath, realChainId), ...validatePermit2Types(data, actionPath), ...validatePermit2Message(data, actionPath, request, response, realChainId, trades, envConfig), ...validatePermit2Details(action, data, actionPath, realChainId));
|
|
41
43
|
}
|
|
42
44
|
return violations;
|
|
43
45
|
}
|
|
44
|
-
// CRITICAL: only allowed with
|
|
45
|
-
function
|
|
46
|
+
// CRITICAL: Permit2 only allowed with permit + unlimited approval mode
|
|
47
|
+
function validatePermit2RequestMode(request, actionPath) {
|
|
48
|
+
const violations = [];
|
|
46
49
|
if (request.approvalMode !== ApprovalMode.Permit) {
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
50
|
+
violations.push({
|
|
51
|
+
code: ViolationCode.Permit2ForbiddenWithoutPermitMode,
|
|
52
|
+
message: `Permit2 action requires approvalMode="${ApprovalMode.Permit}"`,
|
|
53
|
+
path: `${actionPath}.type`,
|
|
54
|
+
expected: ApprovalMode.Permit,
|
|
55
|
+
actual: request.approvalMode,
|
|
56
|
+
});
|
|
54
57
|
}
|
|
55
|
-
|
|
58
|
+
if (request.approveAmountFlag !== ApproveAmountFlag.Unlimited) {
|
|
59
|
+
violations.push({
|
|
60
|
+
code: ViolationCode.Permit2ForbiddenWithoutUnlimitedApproveAmount,
|
|
61
|
+
message: `Permit2 action requires approveAmountFlag="${ApproveAmountFlag.Unlimited}"`,
|
|
62
|
+
path: `${actionPath}.type`,
|
|
63
|
+
expected: ApproveAmountFlag.Unlimited,
|
|
64
|
+
actual: request.approveAmountFlag,
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
return violations;
|
|
56
68
|
}
|
|
57
69
|
// HIGH: actions[] must contain exactly [Budget]
|
|
58
70
|
function validatePermit2ActionsList(action, actionPath) {
|
|
@@ -119,38 +131,17 @@ function validatePermit2Domain(data, actionPath, realChainId) {
|
|
|
119
131
|
}
|
|
120
132
|
// CRITICAL: types must match the expected Permit2 EIP712 structure
|
|
121
133
|
function validatePermit2Types(data, actionPath) {
|
|
122
|
-
|
|
123
|
-
const expectedKeys = Object.keys(EXPECTED_TYPES).sort();
|
|
124
|
-
const actualKeys = Object.keys(types).sort();
|
|
125
|
-
if (actualKeys.length !== expectedKeys.length ||
|
|
126
|
-
!actualKeys.every((k, i) => k === expectedKeys[i]) ||
|
|
127
|
-
!allFieldsMatch(types)) {
|
|
134
|
+
if (!eip712TypesEqual(data.types, EXPECTED_TYPES)) {
|
|
128
135
|
return [{
|
|
129
136
|
code: ViolationCode.Permit2TypesInvalid,
|
|
130
137
|
message: `Permit2 types must match the expected EIP712 structure`,
|
|
131
138
|
path: `${actionPath}.data.types`,
|
|
132
139
|
expected: EXPECTED_TYPES,
|
|
133
|
-
actual: types,
|
|
140
|
+
actual: data.types,
|
|
134
141
|
}];
|
|
135
142
|
}
|
|
136
143
|
return [];
|
|
137
144
|
}
|
|
138
|
-
function allFieldsMatch(types) {
|
|
139
|
-
for (const [key, expectedFields] of Object.entries(EXPECTED_TYPES)) {
|
|
140
|
-
const actualFields = types[key];
|
|
141
|
-
if (!actualFields)
|
|
142
|
-
return false;
|
|
143
|
-
if (actualFields.length !== expectedFields.length)
|
|
144
|
-
return false;
|
|
145
|
-
for (let i = 0; i < expectedFields.length; i++) {
|
|
146
|
-
if (actualFields[i].name !== expectedFields[i].name ||
|
|
147
|
-
actualFields[i].type !== expectedFields[i].type) {
|
|
148
|
-
return false;
|
|
149
|
-
}
|
|
150
|
-
}
|
|
151
|
-
}
|
|
152
|
-
return true;
|
|
153
|
-
}
|
|
154
145
|
// CRITICAL: message.details must exist with token, amount, expiration
|
|
155
146
|
// CRITICAL: message.spender must be allowed
|
|
156
147
|
function validatePermit2Message(data, actionPath, request, response, realChainId, trades, envConfig) {
|
|
@@ -205,7 +196,7 @@ function validatePermit2Amount(amount, actionPath) {
|
|
|
205
196
|
}];
|
|
206
197
|
}
|
|
207
198
|
try {
|
|
208
|
-
if (
|
|
199
|
+
if (parseIntegerString(amount) !== maxUint160) {
|
|
209
200
|
return [{
|
|
210
201
|
code: ViolationCode.Permit2AmountNotMaxUint160,
|
|
211
202
|
message: `Permit2 message.details.amount must be maxUint160`,
|
|
@@ -215,13 +206,14 @@ function validatePermit2Amount(amount, actionPath) {
|
|
|
215
206
|
}];
|
|
216
207
|
}
|
|
217
208
|
}
|
|
218
|
-
catch {
|
|
209
|
+
catch (error) {
|
|
219
210
|
return [{
|
|
220
211
|
code: ViolationCode.Permit2AmountNotMaxUint160,
|
|
221
212
|
message: `Permit2 message.details.amount is not a valid number`,
|
|
222
213
|
path: `${actionPath}.data.message.details.amount`,
|
|
223
214
|
expected: maxUint160.toString(),
|
|
224
215
|
actual: amount,
|
|
216
|
+
details: error,
|
|
225
217
|
}];
|
|
226
218
|
}
|
|
227
219
|
return [];
|
|
@@ -238,7 +230,7 @@ function validatePermit2Expiration(expiration, actionPath, request) {
|
|
|
238
230
|
}];
|
|
239
231
|
}
|
|
240
232
|
try {
|
|
241
|
-
if (
|
|
233
|
+
if (parseIntegerString(expiration) !== BigInt(request.expirationTimestamp)) {
|
|
242
234
|
return [{
|
|
243
235
|
code: ViolationCode.Permit2ExpirationMismatch,
|
|
244
236
|
message: `Permit2 message.details.expiration must match request.expirationTimestamp`,
|
|
@@ -248,13 +240,14 @@ function validatePermit2Expiration(expiration, actionPath, request) {
|
|
|
248
240
|
}];
|
|
249
241
|
}
|
|
250
242
|
}
|
|
251
|
-
catch {
|
|
243
|
+
catch (error) {
|
|
252
244
|
return [{
|
|
253
245
|
code: ViolationCode.Permit2ExpirationMismatch,
|
|
254
246
|
message: `Permit2 message.details.expiration is not a valid number`,
|
|
255
247
|
path: `${actionPath}.data.message.details.expiration`,
|
|
256
248
|
expected: request.expirationTimestamp,
|
|
257
249
|
actual: expiration,
|
|
250
|
+
details: error,
|
|
258
251
|
}];
|
|
259
252
|
}
|
|
260
253
|
return [];
|
|
@@ -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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"}
|
|
@@ -5,21 +5,21 @@ import { validateSign712IntentActions } from "./evm-sign712.js";
|
|
|
5
5
|
import { validatePermitActions } from "./evm-permit.js";
|
|
6
6
|
import { validatePermit2Actions } from "./evm-permit2.js";
|
|
7
7
|
import { validateTransactionActions } from "./evm-transaction.js";
|
|
8
|
-
import { validateBudgetOperations } from "./evm-op-budget.js";
|
|
8
|
+
import { getBudgetApprovalInfo, validateBudgetOperations } from "./evm-op-budget.js";
|
|
9
9
|
import { validateWrapOperations } from "./evm-op-wrap.js";
|
|
10
10
|
import { normalizeAddress } from "../helpers/address.js";
|
|
11
11
|
import { getExpectedIntentDelegate } from "../helpers/expected-delegate.js";
|
|
12
|
-
export function validateEvmRequiredActions(request, response, actions, basePath, realChainId, quoteMode, intent, trades, responseTrades, srcChainAuthorityAddress, envConfig) {
|
|
12
|
+
export function validateEvmRequiredActions(request, response, actions, basePath, realChainId, quoteMode, intent, trades, responseTrades, srcChainAuthorityAddress, envConfig, syntheticNativeWrapMode) {
|
|
13
13
|
const expectedDelegate = request.enableAccountAbstraction
|
|
14
14
|
? getExpectedIntentDelegate(trades)
|
|
15
15
|
: undefined;
|
|
16
16
|
return [
|
|
17
17
|
...validateUniqueActionIds(actions, basePath),
|
|
18
18
|
...validateAAConstraints(request, response, actions, basePath),
|
|
19
|
-
...validateSign7702Actions(actions, basePath, realChainId),
|
|
20
|
-
...validateSign712MetaMaskActions(actions, basePath, realChainId, quoteMode, request.expirationTimestamp, srcChainAuthorityAddress, expectedDelegate),
|
|
19
|
+
...validateSign7702Actions(actions, basePath, realChainId, envConfig),
|
|
20
|
+
...validateSign712MetaMaskActions(actions, basePath, realChainId, quoteMode, request.expirationTimestamp, srcChainAuthorityAddress, expectedDelegate, envConfig),
|
|
21
21
|
// Sign712 Intent check is skipped in quote mode
|
|
22
|
-
...(quoteMode ? [] : validateSign712IntentActions(actions, basePath, realChainId, intent, envConfig)),
|
|
22
|
+
...(quoteMode || syntheticNativeWrapMode ? [] : validateSign712IntentActions(actions, basePath, realChainId, intent, envConfig)),
|
|
23
23
|
...validatePermitActions(actions, basePath, request, response, realChainId, quoteMode, trades, srcChainAuthorityAddress, envConfig),
|
|
24
24
|
...validatePermit2Actions(actions, basePath, request, response, realChainId, trades, envConfig),
|
|
25
25
|
...validateTransactionActions(actions, basePath),
|
|
@@ -84,7 +84,8 @@ function validateAADisabled(_response, actions, basePath) {
|
|
|
84
84
|
if (action.type === EvmActionKind.Sign7702Authorization) {
|
|
85
85
|
violations.push({
|
|
86
86
|
code: ViolationCode.ForbiddenSign7702WithoutAA,
|
|
87
|
-
message: `${EvmActionKind.Sign7702Authorization} action is forbidden
|
|
87
|
+
message: `${EvmActionKind.Sign7702Authorization} action is forbidden`
|
|
88
|
+
+ " when enableAccountAbstraction=false",
|
|
88
89
|
path: `${actionPath}.type`,
|
|
89
90
|
actual: action.type,
|
|
90
91
|
});
|
|
@@ -145,7 +146,9 @@ function validateApprovalMutualExclusivity(actions, basePath, realChainId) {
|
|
|
145
146
|
if (existing) {
|
|
146
147
|
violations.push({
|
|
147
148
|
code: ViolationCode.ApprovalMutualExclusivity,
|
|
148
|
-
message: `${entry.kind} at index ${i} conflicts with
|
|
149
|
+
message: `${entry.kind} at index ${i} conflicts with`
|
|
150
|
+
+ ` ${existing.kind} at index ${existing.index}`
|
|
151
|
+
+ ` for token ${key}`,
|
|
149
152
|
path: `${basePath}.requiredActions[${i}]`,
|
|
150
153
|
expected: 1,
|
|
151
154
|
actual: 2,
|
|
@@ -172,11 +175,16 @@ function classifyApprovalAction(action) {
|
|
|
172
175
|
if (action.type === EvmActionKind.Transaction &&
|
|
173
176
|
// Stricter check for action.actions to be exactly ['Budget'] is performed in another place.
|
|
174
177
|
// Here we filter Transaction actions that include 'Budget' among other operations.
|
|
175
|
-
action.actions.includes(EvmActionOperation.Budget)
|
|
176
|
-
action
|
|
178
|
+
action.actions.includes(EvmActionOperation.Budget)) {
|
|
179
|
+
const budgetInfo = getBudgetApprovalInfo(action);
|
|
180
|
+
// A zero-allowance reset is allowed only as a deterministic pair with
|
|
181
|
+
// the following main Budget action. Pairing is validated in evm-op-budget;
|
|
182
|
+
// it must not count as a competing approval in this per-token check.
|
|
183
|
+
if (!budgetInfo || budgetInfo.amount === 0n)
|
|
184
|
+
return undefined;
|
|
177
185
|
return {
|
|
178
186
|
kind: ApprovalActionKind.TransactionBudget,
|
|
179
|
-
tokenAddress:
|
|
187
|
+
tokenAddress: budgetInfo.tokenAddress,
|
|
180
188
|
};
|
|
181
189
|
}
|
|
182
190
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evm-required-actions.js","sourceRoot":"","sources":["../../../src/validations/evm-required-actions.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,aAAa,EAIb,aAAa,EACb,kBAAkB,GAKrB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,8BAA8B,EAAE,MAAM,wBAAwB,CAAC;AACxE,OAAO,EAAE,4BAA4B,EAAE,MAAM,eAAe,CAAC;AAC7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"evm-required-actions.js","sourceRoot":"","sources":["../../../src/validations/evm-required-actions.ts"],"names":[],"mappings":"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"}
|
|
@@ -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, expirationTimestamp, 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, expirationTimestamp));
|
|
78
|
+
violations.push(...validateSign712Caveats(caveats, action.actionId, txCalls, actionPath, realChainId, expirationTimestamp, 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,6 +1,5 @@
|
|
|
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
4
|
import { classifyCaveats, validateExactExecutionPresence, validateExactExecutionContent, validateTimestampEnforcerValue, } from "./evm-caveats.js";
|
|
6
5
|
// Shared content-validators for `Sign712MetaMaskCaveats` /
|
|
@@ -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`,
|
|
@@ -77,9 +76,9 @@ export function validateSign712Delegator(data, actionPath, realChainId, expected
|
|
|
77
76
|
// CRITICAL: caveats must contain valid IdEnforcer (replay protection),
|
|
78
77
|
// TimestampEnforcer (with correct beforeThreshold), and ExactExecution /
|
|
79
78
|
// ExactExecutionBatch caveats whose content matches `transactionCalls[]`.
|
|
80
|
-
export function validateSign712Caveats(caveats, actionId, transactionCalls, actionPath, realChainId, expirationTimestamp) {
|
|
79
|
+
export function validateSign712Caveats(caveats, actionId, transactionCalls, actionPath, realChainId, expirationTimestamp, envConfig) {
|
|
81
80
|
const violations = [];
|
|
82
|
-
const classified = classifyCaveats(caveats, actionId, actionPath, realChainId, violations);
|
|
81
|
+
const classified = classifyCaveats(caveats, actionId, actionPath, realChainId, violations, envConfig);
|
|
83
82
|
violations.push(...validateExactExecutionPresence(classified, transactionCalls, actionPath));
|
|
84
83
|
validateExactExecutionContent(classified, transactionCalls, actionPath, violations);
|
|
85
84
|
// CRITICAL: must have at least one IdEnforcer caveat (replay protection)
|
|
@@ -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":"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"}
|
|
@@ -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;
|