@debridge-finance/borderless-validation-sdk 0.0.0-dev-dee2389 → 0.0.0-dev-25d2153
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +164 -0
- package/dist/cjs/helpers/address.js +31 -18
- package/dist/cjs/helpers/address.js.map +1 -1
- package/dist/cjs/helpers/evm-action.js +3 -3
- package/dist/cjs/helpers/evm-action.js.map +1 -1
- package/dist/cjs/helpers/evm-gas-compensation-tx.js +102 -0
- package/dist/cjs/helpers/evm-gas-compensation-tx.js.map +1 -0
- package/dist/cjs/helpers/evm-intent-id.js +1 -1
- package/dist/cjs/helpers/evm-intent-id.js.map +1 -1
- package/dist/cjs/helpers/gas-compensation.js +36 -0
- package/dist/cjs/helpers/gas-compensation.js.map +1 -0
- package/dist/cjs/helpers/placeholder.js +174 -0
- package/dist/cjs/helpers/placeholder.js.map +1 -0
- package/dist/cjs/helpers/sets.js +13 -0
- package/dist/cjs/helpers/sets.js.map +1 -0
- package/dist/cjs/types/enums.js +26 -2
- package/dist/cjs/types/enums.js.map +1 -1
- package/dist/cjs/types/request.js +25 -2
- package/dist/cjs/types/request.js.map +1 -1
- package/dist/cjs/types/response.js +119 -3
- package/dist/cjs/types/response.js.map +1 -1
- package/dist/cjs/types/validation.js +72 -8
- package/dist/cjs/types/validation.js.map +1 -1
- package/dist/cjs/validations/compensation-hook.js +203 -0
- package/dist/cjs/validations/compensation-hook.js.map +1 -0
- package/dist/cjs/validations/evm-caveats.js +4 -14
- package/dist/cjs/validations/evm-caveats.js.map +1 -1
- package/dist/cjs/validations/evm-op-budget.js +3 -3
- package/dist/cjs/validations/evm-op-budget.js.map +1 -1
- package/dist/cjs/validations/evm-op-hook.js +410 -3
- package/dist/cjs/validations/evm-op-hook.js.map +1 -1
- package/dist/cjs/validations/evm-op-wrap.js +3 -3
- package/dist/cjs/validations/evm-op-wrap.js.map +1 -1
- package/dist/cjs/validations/evm-required-actions.js +4 -6
- package/dist/cjs/validations/evm-required-actions.js.map +1 -1
- package/dist/cjs/validations/evm-sign712-metamask.js +17 -94
- package/dist/cjs/validations/evm-sign712-metamask.js.map +1 -1
- package/dist/cjs/validations/evm-sign712-shared.js +116 -0
- package/dist/cjs/validations/evm-sign712-shared.js.map +1 -0
- package/dist/cjs/validations/evm-sign7702.js +34 -22
- package/dist/cjs/validations/evm-sign7702.js.map +1 -1
- package/dist/cjs/validations/hooks-common.js +247 -35
- package/dist/cjs/validations/hooks-common.js.map +1 -1
- package/dist/cjs/validations/intent-destinations.js +197 -0
- package/dist/cjs/validations/intent-destinations.js.map +1 -0
- package/dist/cjs/validations/intent-tokens.js +341 -0
- package/dist/cjs/validations/intent-tokens.js.map +1 -0
- package/dist/cjs/validations/intent.js +288 -0
- package/dist/cjs/validations/intent.js.map +1 -0
- package/dist/cjs/validations/required-actions.js +2 -5
- package/dist/cjs/validations/required-actions.js.map +1 -1
- package/dist/cjs/validations/solana-hook.js +32 -18
- package/dist/cjs/validations/solana-hook.js.map +1 -1
- package/dist/cjs/validations/trades.js +5 -0
- package/dist/cjs/validations/trades.js.map +1 -1
- package/dist/cjs/validator.js +8 -1
- package/dist/cjs/validator.js.map +1 -1
- package/dist/cjs/whitelists/environment-config.js +47 -15
- package/dist/cjs/whitelists/environment-config.js.map +1 -1
- package/dist/cjs/whitelists/evm/caveat-enforcers.js +21 -5
- package/dist/cjs/whitelists/evm/caveat-enforcers.js.map +1 -1
- package/dist/cjs/whitelists/evm/delegation-manager.js +7 -2
- package/dist/cjs/whitelists/evm/delegation-manager.js.map +1 -1
- package/dist/cjs/whitelists/evm/eip7702-delegation.js +7 -2
- package/dist/cjs/whitelists/evm/eip7702-delegation.js.map +1 -1
- package/dist/cjs/whitelists/evm/index.js +14 -1
- package/dist/cjs/whitelists/evm/index.js.map +1 -1
- package/dist/cjs/whitelists/evm/metamask-delegation-chains.js +16 -0
- package/dist/cjs/whitelists/evm/metamask-delegation-chains.js.map +1 -0
- package/dist/cjs/whitelists/evm/permit2.js +16 -12
- package/dist/cjs/whitelists/evm/permit2.js.map +1 -1
- package/dist/cjs/whitelists/evm/weth.js +16 -5
- package/dist/cjs/whitelists/evm/weth.js.map +1 -1
- package/dist/cjs/whitelists/solana/intent-signature.js +0 -1
- package/dist/cjs/whitelists/solana/intent-signature.js.map +1 -1
- package/dist/cjs/whitelists/subscription-to-chain-id.js +10 -0
- package/dist/cjs/whitelists/subscription-to-chain-id.js.map +1 -1
- package/dist/cjs/whitelists/types.js +13 -3
- package/dist/cjs/whitelists/types.js.map +1 -1
- package/dist/esm/helpers/address.js +28 -17
- package/dist/esm/helpers/address.js.map +1 -1
- package/dist/esm/helpers/evm-action.js +3 -3
- package/dist/esm/helpers/evm-action.js.map +1 -1
- package/dist/esm/helpers/evm-gas-compensation-tx.js +99 -0
- package/dist/esm/helpers/evm-gas-compensation-tx.js.map +1 -0
- package/dist/esm/helpers/evm-intent-id.js +1 -1
- package/dist/esm/helpers/evm-intent-id.js.map +1 -1
- package/dist/esm/helpers/gas-compensation.js +33 -0
- package/dist/esm/helpers/gas-compensation.js.map +1 -0
- package/dist/esm/helpers/placeholder.js +168 -0
- package/dist/esm/helpers/placeholder.js.map +1 -0
- package/dist/esm/helpers/sets.js +10 -0
- package/dist/esm/helpers/sets.js.map +1 -0
- package/dist/esm/types/enums.js +25 -1
- package/dist/esm/types/enums.js.map +1 -1
- package/dist/esm/types/request.js +26 -3
- package/dist/esm/types/request.js.map +1 -1
- package/dist/esm/types/response.js +118 -2
- package/dist/esm/types/response.js.map +1 -1
- package/dist/esm/types/validation.js +72 -8
- package/dist/esm/types/validation.js.map +1 -1
- package/dist/esm/validations/compensation-hook.js +200 -0
- package/dist/esm/validations/compensation-hook.js.map +1 -0
- package/dist/esm/validations/evm-caveats.js +4 -14
- package/dist/esm/validations/evm-caveats.js.map +1 -1
- package/dist/esm/validations/evm-op-budget.js +3 -3
- package/dist/esm/validations/evm-op-budget.js.map +1 -1
- package/dist/esm/validations/evm-op-hook.js +409 -2
- package/dist/esm/validations/evm-op-hook.js.map +1 -1
- package/dist/esm/validations/evm-op-wrap.js +3 -3
- package/dist/esm/validations/evm-op-wrap.js.map +1 -1
- package/dist/esm/validations/evm-required-actions.js +4 -6
- package/dist/esm/validations/evm-required-actions.js.map +1 -1
- package/dist/esm/validations/evm-sign712-metamask.js +17 -94
- package/dist/esm/validations/evm-sign712-metamask.js.map +1 -1
- package/dist/esm/validations/evm-sign712-shared.js +110 -0
- package/dist/esm/validations/evm-sign712-shared.js.map +1 -0
- package/dist/esm/validations/evm-sign7702.js +33 -22
- package/dist/esm/validations/evm-sign7702.js.map +1 -1
- package/dist/esm/validations/hooks-common.js +246 -36
- package/dist/esm/validations/hooks-common.js.map +1 -1
- package/dist/esm/validations/intent-destinations.js +194 -0
- package/dist/esm/validations/intent-destinations.js.map +1 -0
- package/dist/esm/validations/intent-tokens.js +338 -0
- package/dist/esm/validations/intent-tokens.js.map +1 -0
- package/dist/esm/validations/intent.js +285 -0
- package/dist/esm/validations/intent.js.map +1 -0
- package/dist/esm/validations/required-actions.js +2 -5
- package/dist/esm/validations/required-actions.js.map +1 -1
- package/dist/esm/validations/solana-hook.js +34 -20
- package/dist/esm/validations/solana-hook.js.map +1 -1
- package/dist/esm/validations/trades.js +5 -0
- package/dist/esm/validations/trades.js.map +1 -1
- package/dist/esm/validator.js +8 -1
- package/dist/esm/validator.js.map +1 -1
- package/dist/esm/whitelists/environment-config.js +47 -15
- package/dist/esm/whitelists/environment-config.js.map +1 -1
- package/dist/esm/whitelists/evm/caveat-enforcers.js +20 -4
- package/dist/esm/whitelists/evm/caveat-enforcers.js.map +1 -1
- package/dist/esm/whitelists/evm/delegation-manager.js +6 -1
- package/dist/esm/whitelists/evm/delegation-manager.js.map +1 -1
- package/dist/esm/whitelists/evm/eip7702-delegation.js +6 -1
- package/dist/esm/whitelists/evm/eip7702-delegation.js.map +1 -1
- package/dist/esm/whitelists/evm/index.js +4 -4
- package/dist/esm/whitelists/evm/index.js.map +1 -1
- package/dist/esm/whitelists/evm/metamask-delegation-chains.js +13 -0
- package/dist/esm/whitelists/evm/metamask-delegation-chains.js.map +1 -0
- package/dist/esm/whitelists/evm/permit2.js +9 -5
- package/dist/esm/whitelists/evm/permit2.js.map +1 -1
- package/dist/esm/whitelists/evm/weth.js +16 -5
- package/dist/esm/whitelists/evm/weth.js.map +1 -1
- package/dist/esm/whitelists/solana/intent-signature.js +0 -1
- package/dist/esm/whitelists/solana/intent-signature.js.map +1 -1
- package/dist/esm/whitelists/subscription-to-chain-id.js +9 -0
- package/dist/esm/whitelists/subscription-to-chain-id.js.map +1 -1
- package/dist/esm/whitelists/types.js +14 -5
- package/dist/esm/whitelists/types.js.map +1 -1
- package/dist/types/helpers/address.d.ts +5 -7
- package/dist/types/helpers/address.d.ts.map +1 -1
- package/dist/types/helpers/evm-gas-compensation-tx.d.ts +13 -0
- package/dist/types/helpers/evm-gas-compensation-tx.d.ts.map +1 -0
- package/dist/types/helpers/gas-compensation.d.ts +10 -0
- package/dist/types/helpers/gas-compensation.d.ts.map +1 -0
- package/dist/types/helpers/placeholder.d.ts +41 -0
- package/dist/types/helpers/placeholder.d.ts.map +1 -0
- package/dist/types/helpers/sets.d.ts +2 -0
- package/dist/types/helpers/sets.d.ts.map +1 -0
- package/dist/types/types/enums.d.ts +19 -1
- package/dist/types/types/enums.d.ts.map +1 -1
- package/dist/types/types/request.d.ts +19 -9
- package/dist/types/types/request.d.ts.map +1 -1
- package/dist/types/types/response.d.ts +365 -9
- package/dist/types/types/response.d.ts.map +1 -1
- package/dist/types/types/validation.d.ts +64 -8
- package/dist/types/types/validation.d.ts.map +1 -1
- package/dist/types/validations/compensation-hook.d.ts +3 -0
- package/dist/types/validations/compensation-hook.d.ts.map +1 -0
- package/dist/types/validations/evm-caveats.d.ts.map +1 -1
- package/dist/types/validations/evm-op-hook.d.ts +4 -2
- package/dist/types/validations/evm-op-hook.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.map +1 -1
- package/dist/types/validations/evm-sign712-shared.d.ts +7 -0
- package/dist/types/validations/evm-sign712-shared.d.ts.map +1 -0
- package/dist/types/validations/evm-sign7702.d.ts +2 -1
- package/dist/types/validations/evm-sign7702.d.ts.map +1 -1
- package/dist/types/validations/hooks-common.d.ts +1 -0
- package/dist/types/validations/hooks-common.d.ts.map +1 -1
- package/dist/types/validations/intent-destinations.d.ts +4 -0
- package/dist/types/validations/intent-destinations.d.ts.map +1 -0
- package/dist/types/validations/intent-tokens.d.ts +4 -0
- package/dist/types/validations/intent-tokens.d.ts.map +1 -0
- package/dist/types/validations/intent.d.ts +5 -0
- package/dist/types/validations/intent.d.ts.map +1 -0
- package/dist/types/validations/required-actions.d.ts +2 -1
- package/dist/types/validations/required-actions.d.ts.map +1 -1
- package/dist/types/validations/solana-hook.d.ts +4 -2
- package/dist/types/validations/solana-hook.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/evm/caveat-enforcers.d.ts +8 -0
- package/dist/types/whitelists/evm/caveat-enforcers.d.ts.map +1 -1
- package/dist/types/whitelists/evm/delegation-manager.d.ts +2 -0
- package/dist/types/whitelists/evm/delegation-manager.d.ts.map +1 -1
- package/dist/types/whitelists/evm/eip7702-delegation.d.ts +2 -0
- package/dist/types/whitelists/evm/eip7702-delegation.d.ts.map +1 -1
- package/dist/types/whitelists/evm/index.d.ts +4 -4
- package/dist/types/whitelists/evm/index.d.ts.map +1 -1
- package/dist/types/whitelists/evm/metamask-delegation-chains.d.ts +3 -0
- package/dist/types/whitelists/evm/metamask-delegation-chains.d.ts.map +1 -0
- package/dist/types/whitelists/evm/permit2.d.ts +1 -0
- package/dist/types/whitelists/evm/permit2.d.ts.map +1 -1
- package/dist/types/whitelists/evm/weth.d.ts.map +1 -1
- package/dist/types/whitelists/solana/intent-signature.d.ts.map +1 -1
- package/dist/types/whitelists/subscription-to-chain-id.d.ts +1 -0
- package/dist/types/whitelists/subscription-to-chain-id.d.ts.map +1 -1
- package/dist/types/whitelists/types.d.ts +1 -0
- package/dist/types/whitelists/types.d.ts.map +1 -1
- package/package.json +2 -2
- package/dist/cjs/validations/evm-op-gas-compensation.js +0 -152
- package/dist/cjs/validations/evm-op-gas-compensation.js.map +0 -1
- package/dist/esm/validations/evm-op-gas-compensation.js +0 -149
- package/dist/esm/validations/evm-op-gas-compensation.js.map +0 -1
- package/dist/types/validations/evm-op-gas-compensation.d.ts +0 -3
- package/dist/types/validations/evm-op-gas-compensation.d.ts.map +0 -1
|
@@ -0,0 +1,203 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.validateCompensationHookStructure = validateCompensationHookStructure;
|
|
4
|
+
const types_1 = require("../types");
|
|
5
|
+
const address_1 = require("../helpers/address");
|
|
6
|
+
const gas_compensation_1 = require("../helpers/gas-compensation");
|
|
7
|
+
const evm_gas_compensation_tx_1 = require("../helpers/evm-gas-compensation-tx");
|
|
8
|
+
const subscription_to_chain_id_1 = require("../whitelists/subscription-to-chain-id");
|
|
9
|
+
// Validates `response.preHooks[i].hook` for a compensation hook
|
|
10
|
+
// (i.e. `i >= request.preHooks.length`). This is the primary MITM defense for
|
|
11
|
+
// surplus preHooks — `validateHookEcho` cannot help here because there is no
|
|
12
|
+
// matching request entry to compare against.
|
|
13
|
+
function validateCompensationHookStructure(hookPayload, basePath, request) {
|
|
14
|
+
const hook = hookPayload.hook;
|
|
15
|
+
const hookPath = `${basePath}.hook`;
|
|
16
|
+
// Resolve the hook's subscriptionId into a real chainId once; every
|
|
17
|
+
// chain-aware helper downstream takes real. Fall back to the subscriptionId
|
|
18
|
+
// value for unknown chains.
|
|
19
|
+
const realHookChainId = (0, subscription_to_chain_id_1.resolveChainIdOrSelf)(hook.chainId);
|
|
20
|
+
const violations = [
|
|
21
|
+
...validateCommonFields(hook, hookPath),
|
|
22
|
+
...validateCompensationRequiredActionsOps(hookPayload, basePath, realHookChainId),
|
|
23
|
+
];
|
|
24
|
+
const allGroups = (0, gas_compensation_1.extractGasCompensationGroups)(request);
|
|
25
|
+
const matchingGroups = findGroupsMatchingFrom(hook, realHookChainId, allGroups);
|
|
26
|
+
if (matchingGroups.length === 0) {
|
|
27
|
+
violations.push({
|
|
28
|
+
code: types_1.ViolationCode.CompensationHookFromMismatch,
|
|
29
|
+
message: "compensation hook.from does not match any request"
|
|
30
|
+
+ " gasCompensationInfo.sender on the same chain",
|
|
31
|
+
path: `${hookPath}.from`,
|
|
32
|
+
expected: allGroups.map(g => ({ chainId: g.chainId, sender: g.sender })),
|
|
33
|
+
actual: { chainId: hook.chainId, from: hook.from },
|
|
34
|
+
});
|
|
35
|
+
// Without a matching group we cannot meaningfully run chain-specific
|
|
36
|
+
// structural checks (token address comparison, etc.).
|
|
37
|
+
return violations;
|
|
38
|
+
}
|
|
39
|
+
const isSolana = (0, address_1.getChainEngine)(realHookChainId) === types_1.ChainEngine.Solana;
|
|
40
|
+
violations.push(...(isSolana
|
|
41
|
+
? validateSolanaCompensationStructure(hook, matchingGroups, hookPath)
|
|
42
|
+
: validateEvmCompensationStructure(hook, matchingGroups, realHookChainId, hookPath)));
|
|
43
|
+
return violations;
|
|
44
|
+
}
|
|
45
|
+
function validateCommonFields(hook, hookPath) {
|
|
46
|
+
const violations = [];
|
|
47
|
+
// HIGH: compensation hooks always carry empty placeHolders.
|
|
48
|
+
if (hook.placeHolders.length !== 0) {
|
|
49
|
+
violations.push({
|
|
50
|
+
code: types_1.ViolationCode.CompensationHookPlaceHoldersNotEmpty,
|
|
51
|
+
message: "compensation hook must have empty placeHolders",
|
|
52
|
+
path: `${hookPath}.placeHolders`,
|
|
53
|
+
expected: [],
|
|
54
|
+
actual: hook.placeHolders,
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
// HIGH: API always emits isAtomic=false for compensation hooks.
|
|
58
|
+
if (hook.isAtomic !== false) {
|
|
59
|
+
violations.push({
|
|
60
|
+
code: types_1.ViolationCode.CompensationHookIsAtomicInvalid,
|
|
61
|
+
message: "compensation hook must have isAtomic=false",
|
|
62
|
+
path: `${hookPath}.isAtomic`,
|
|
63
|
+
expected: false,
|
|
64
|
+
actual: hook.isAtomic,
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
// MEDIUM: API never sets hook.type='direct' for compensation; delegated or
|
|
68
|
+
// omitted is allowed.
|
|
69
|
+
if (hook.type !== undefined && hook.type !== types_1.BundleHookType.Delegated) {
|
|
70
|
+
violations.push({
|
|
71
|
+
code: types_1.ViolationCode.CompensationHookTypeInvalid,
|
|
72
|
+
message: "compensation hook must have type=delegated (or omitted)",
|
|
73
|
+
path: `${hookPath}.type`,
|
|
74
|
+
expected: types_1.BundleHookType.Delegated,
|
|
75
|
+
actual: hook.type,
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
return violations;
|
|
79
|
+
}
|
|
80
|
+
function findGroupsMatchingFrom(hook, realHookChainId, groups) {
|
|
81
|
+
return groups.filter(g => g.realChainId === realHookChainId
|
|
82
|
+
&& (0, address_1.addressEquals)(realHookChainId, g.sender, hook.from));
|
|
83
|
+
}
|
|
84
|
+
// CRITICAL: a compensation hook must emit GasCompensation ops and must not
|
|
85
|
+
// emit Hook ops. `validateHookActionsList` already enforces that each action
|
|
86
|
+
// carries exactly one op from {Hook, GasCompensation}; this rule narrows further.
|
|
87
|
+
function validateCompensationRequiredActionsOps(hookPayload, basePath, realHookChainId) {
|
|
88
|
+
const isSolana = (0, address_1.getChainEngine)(realHookChainId) === types_1.ChainEngine.Solana;
|
|
89
|
+
const hookOp = isSolana
|
|
90
|
+
? types_1.SolanaActionOperation.Hook
|
|
91
|
+
: types_1.EvmActionOperation.Hook;
|
|
92
|
+
const gasCompensationOp = isSolana
|
|
93
|
+
? types_1.SolanaActionOperation.GasCompensation
|
|
94
|
+
: types_1.EvmActionOperation.GasCompensation;
|
|
95
|
+
const ops = hookPayload.requiredActions
|
|
96
|
+
.flatMap(a => a.actions);
|
|
97
|
+
const violations = [];
|
|
98
|
+
if (ops.includes(hookOp)) {
|
|
99
|
+
violations.push({
|
|
100
|
+
code: types_1.ViolationCode.CompensationHookRequiredActionsInvalid,
|
|
101
|
+
message: "compensation hook requiredActions must not contain"
|
|
102
|
+
+ " the `Hook` operation",
|
|
103
|
+
path: `${basePath}.requiredActions`,
|
|
104
|
+
actual: ops,
|
|
105
|
+
});
|
|
106
|
+
}
|
|
107
|
+
if (!ops.includes(gasCompensationOp)) {
|
|
108
|
+
violations.push({
|
|
109
|
+
code: types_1.ViolationCode.CompensationHookRequiredActionsInvalid,
|
|
110
|
+
message: "compensation hook requiredActions must contain at least one"
|
|
111
|
+
+ " `GasCompensation` operation",
|
|
112
|
+
path: `${basePath}.requiredActions`,
|
|
113
|
+
actual: ops,
|
|
114
|
+
});
|
|
115
|
+
}
|
|
116
|
+
return violations;
|
|
117
|
+
}
|
|
118
|
+
// =============================================
|
|
119
|
+
// EVM compensation hook structure
|
|
120
|
+
// =============================================
|
|
121
|
+
function validateEvmCompensationStructure(hook, groups, realHookChainId, hookPath) {
|
|
122
|
+
const violations = [];
|
|
123
|
+
// MEDIUM: API builds EVM compensation hooks without gasCompensationInfo
|
|
124
|
+
// (only Solana compensation hooks carry it for two-pass grouping).
|
|
125
|
+
if (hook.gasCompensationInfo !== undefined) {
|
|
126
|
+
violations.push({
|
|
127
|
+
code: types_1.ViolationCode.CompensationHookEvmGasCompensationInfoPresent,
|
|
128
|
+
message: "EVM compensation hook must not include gasCompensationInfo",
|
|
129
|
+
path: `${hookPath}.gasCompensationInfo`,
|
|
130
|
+
actual: hook.gasCompensationInfo,
|
|
131
|
+
});
|
|
132
|
+
}
|
|
133
|
+
// HIGH: `to` is required for EVM hooks.
|
|
134
|
+
if (hook.to === undefined) {
|
|
135
|
+
violations.push({
|
|
136
|
+
code: types_1.ViolationCode.CompensationHookEvmToMissing,
|
|
137
|
+
message: "EVM compensation hook must have `to`",
|
|
138
|
+
path: `${hookPath}.to`,
|
|
139
|
+
});
|
|
140
|
+
return violations;
|
|
141
|
+
}
|
|
142
|
+
// Native vs ERC20 classification + value/data form is shared with
|
|
143
|
+
// hook-scope `transactionCalls[0]` validation; the helper handles both.
|
|
144
|
+
violations.push(...(0, evm_gas_compensation_tx_1.validateEvmGasCompensationTx)({ to: hook.to, data: hook.data, value: hook.value ?? "0" }, groups, realHookChainId, hookPath, {
|
|
145
|
+
toMismatch: types_1.ViolationCode.CompensationHookEvmToMismatch,
|
|
146
|
+
dataInvalid: types_1.ViolationCode.CompensationHookEvmDataInvalid,
|
|
147
|
+
valueInvalid: types_1.ViolationCode.CompensationHookEvmValueInvalid,
|
|
148
|
+
}));
|
|
149
|
+
return violations;
|
|
150
|
+
}
|
|
151
|
+
// =============================================
|
|
152
|
+
// Solana compensation hook structure
|
|
153
|
+
// =============================================
|
|
154
|
+
function validateSolanaCompensationStructure(hook, groups, hookPath) {
|
|
155
|
+
const violations = [];
|
|
156
|
+
// LOW: API deletes `to` and `value` from Solana hook echoes.
|
|
157
|
+
if (hook.to !== undefined) {
|
|
158
|
+
violations.push({
|
|
159
|
+
code: types_1.ViolationCode.CompensationHookSolanaToOrValuePresent,
|
|
160
|
+
message: "Solana compensation hook must not include `to`",
|
|
161
|
+
path: `${hookPath}.to`,
|
|
162
|
+
actual: hook.to,
|
|
163
|
+
});
|
|
164
|
+
}
|
|
165
|
+
if (hook.value !== undefined) {
|
|
166
|
+
violations.push({
|
|
167
|
+
code: types_1.ViolationCode.CompensationHookSolanaToOrValuePresent,
|
|
168
|
+
message: "Solana compensation hook must not include `value`",
|
|
169
|
+
path: `${hookPath}.value`,
|
|
170
|
+
actual: hook.value,
|
|
171
|
+
});
|
|
172
|
+
}
|
|
173
|
+
// HIGH: Solana compensation hooks must carry gasCompensationInfo (API uses
|
|
174
|
+
// it for two-pass grouping to include the comp transaction's own cost).
|
|
175
|
+
const info = hook.gasCompensationInfo;
|
|
176
|
+
if (info === undefined) {
|
|
177
|
+
violations.push({
|
|
178
|
+
code: types_1.ViolationCode.CompensationHookSolanaGasCompensationInfoMissing,
|
|
179
|
+
message: "Solana compensation hook must include gasCompensationInfo",
|
|
180
|
+
path: `${hookPath}.gasCompensationInfo`,
|
|
181
|
+
});
|
|
182
|
+
return violations;
|
|
183
|
+
}
|
|
184
|
+
// CRITICAL: all three fields must match some request group.
|
|
185
|
+
const matches = groups.some(g => g.chainId === info.chainId
|
|
186
|
+
&& (0, address_1.addressEquals)(g.realChainId, g.tokenAddress, info.tokenAddress)
|
|
187
|
+
&& (0, address_1.addressEquals)(g.realChainId, g.sender, info.sender));
|
|
188
|
+
if (!matches) {
|
|
189
|
+
violations.push({
|
|
190
|
+
code: types_1.ViolationCode.CompensationHookSolanaGasCompensationInfoMismatch,
|
|
191
|
+
message: "Solana compensation hook.gasCompensationInfo does not match"
|
|
192
|
+
+ " any request group",
|
|
193
|
+
path: `${hookPath}.gasCompensationInfo`,
|
|
194
|
+
expected: groups,
|
|
195
|
+
actual: info,
|
|
196
|
+
});
|
|
197
|
+
}
|
|
198
|
+
// Note: the compensation transaction's inner bytes (programs, transfer,
|
|
199
|
+
// fee-payer, etc.) are already validated by validateSolanaGasCompensationAction
|
|
200
|
+
// running against the single [GasCompensation] required action in this hook.
|
|
201
|
+
return violations;
|
|
202
|
+
}
|
|
203
|
+
//# sourceMappingURL=compensation-hook.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compensation-hook.js","sourceRoot":"","sources":["../../../src/validations/compensation-hook.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,21 +45,11 @@ function classifyCaveats(caveats, actionId, actionPath, realChainId, violations)
|
|
|
45
45
|
// CRITICAL: IdEnforcer ID must equal Number(actionId)
|
|
46
46
|
validateIdEnforcerValue(caveat, actionId, path, violations);
|
|
47
47
|
}
|
|
48
|
-
// CRITICAL: exactly one TimestampEnforcer per action
|
|
49
48
|
if (kind === CaveatKind.Timestamp) {
|
|
50
49
|
result.timestampCount++;
|
|
51
50
|
if (result.timestampCount === 1) {
|
|
52
51
|
result.firstTimestamp = { caveat, index: i };
|
|
53
52
|
}
|
|
54
|
-
else if (result.timestampCount === 2) {
|
|
55
|
-
violations.push({
|
|
56
|
-
code: types_1.ViolationCode.Sign712MetaMaskDuplicateTimestampEnforcerCaveat,
|
|
57
|
-
message: `Sign712MetaMask must have exactly one TimestampEnforcer`,
|
|
58
|
-
path: `${path}.enforcer`,
|
|
59
|
-
expected: 1,
|
|
60
|
-
actual: result.timestampCount,
|
|
61
|
-
});
|
|
62
|
-
}
|
|
63
53
|
}
|
|
64
54
|
}
|
|
65
55
|
return result;
|
|
@@ -111,13 +101,13 @@ function validateExactExecutionTerms(caveat, txCall, caveatIndex, actionPath, vi
|
|
|
111
101
|
try {
|
|
112
102
|
decoded = (0, caveat_decoder_1.decodeExactExecution)(caveat.terms);
|
|
113
103
|
}
|
|
114
|
-
catch (
|
|
104
|
+
catch (error) {
|
|
115
105
|
violations.push({
|
|
116
106
|
code: types_1.ViolationCode.Sign712MetaMaskCaveatDecodeError,
|
|
117
107
|
message: `failed to decode ExactExecution caveat terms`,
|
|
118
108
|
path: `${caveatPath}.terms`,
|
|
119
109
|
actual: caveat.terms,
|
|
120
|
-
details:
|
|
110
|
+
details: error,
|
|
121
111
|
});
|
|
122
112
|
return;
|
|
123
113
|
}
|
|
@@ -222,13 +212,13 @@ function validateTimestampEnforcerValue(caveat, expirationTimestamp, caveatIndex
|
|
|
222
212
|
});
|
|
223
213
|
}
|
|
224
214
|
}
|
|
225
|
-
catch (
|
|
215
|
+
catch (error) {
|
|
226
216
|
violations.push({
|
|
227
217
|
code: types_1.ViolationCode.Sign712MetaMaskCaveatDecodeError,
|
|
228
218
|
message: `failed to decode TimestampEnforcer caveat terms`,
|
|
229
219
|
path: `${caveatPath}.terms`,
|
|
230
220
|
actual: caveat.terms,
|
|
231
|
-
details:
|
|
221
|
+
details: error,
|
|
232
222
|
});
|
|
233
223
|
}
|
|
234
224
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evm-caveats.js","sourceRoot":"","sources":["../../../src/validations/evm-caveats.ts"],"names":[],"mappings":";;;AAgDA,
|
|
1
|
+
{"version":3,"file":"evm-caveats.js","sourceRoot":"","sources":["../../../src/validations/evm-caveats.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,8 +19,8 @@ function validateBudgetOperations(actions, basePath, request, trades, realChainI
|
|
|
19
19
|
// Applies to ALL Budget actions regardless of type
|
|
20
20
|
violations.push(...validateBudgetApproveNone(request, actionPath));
|
|
21
21
|
// Token address and calldata checks only apply to actions that use transactionCalls
|
|
22
|
-
// (Transaction,
|
|
23
|
-
// by the permit/permit2 validators instead.
|
|
22
|
+
// (Transaction, Sign712MetaMaskCaveats). For Permit/Permit2 (Sign712), these are
|
|
23
|
+
// validated by the permit/permit2 validators instead.
|
|
24
24
|
if (!(0, evm_action_1.actionUsesTransactionCalls)(action))
|
|
25
25
|
continue;
|
|
26
26
|
violations.push(...validateBudgetTokenAddress(action, actionPath, trades, realChainId), ...validateBudgetCalldata(action, actionPath, request, trades, realChainId, envConfig));
|
|
@@ -78,7 +78,7 @@ function validateBudgetTokenAddress(action, actionPath, trades, realChainId) {
|
|
|
78
78
|
});
|
|
79
79
|
}
|
|
80
80
|
// CRITICAL: must be non-zero address
|
|
81
|
-
if ((0, evm_token_1.isNativeToken)(tokenAddress)) {
|
|
81
|
+
if ((0, evm_token_1.isNativeToken)(tokenAddress, realChainId)) {
|
|
82
82
|
violations.push({
|
|
83
83
|
code: types_1.ViolationCode.BudgetTokenAddressZero,
|
|
84
84
|
message: `Budget token address must not be the zero address`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evm-op-budget.js","sourceRoot":"","sources":["../../../src/validations/evm-op-budget.ts"],"names":[],"mappings":";;AAkBA,4DAiCC;AAnDD,oCASkB;AAClB,+CAAuE;AACvE,0DAAgF;AAChF,+BAAkC;AAClC,oDAAiF;AACjF,gDAAqE;AACrE,oEAA+D;AAC/D,sDAAwF;AAExF,SAAgB,wBAAwB,CACpC,OAA4B,EAC5B,QAAgB,EAChB,OAA8B,EAC9B,MAAsB,EACtB,WAAoB,EACpB,SAA4B;IAE5B,MAAM,UAAU,GAAgB,EAAE,CAAC;IAEnC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAC1B,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,0BAAkB,CAAC,MAAM,CAAC;YAAE,SAAS;QAElE,MAAM,UAAU,GAAG,GAAG,QAAQ,oBAAoB,CAAC,GAAG,CAAC;QAEvD,mDAAmD;QACnD,UAAU,CAAC,IAAI,CAAC,GAAG,yBAAyB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC;QAEnE,oFAAoF;QACpF,
|
|
1
|
+
{"version":3,"file":"evm-op-budget.js","sourceRoot":"","sources":["../../../src/validations/evm-op-budget.ts"],"names":[],"mappings":"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"}
|