@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,8 +1,9 @@
|
|
|
1
1
|
import { ViolationCode, } from "../types/index.js";
|
|
2
|
+
import { isRequestHookV2, } from "../types/request.js";
|
|
2
3
|
import { BundleHookType, ChainEngine, EvmActionOperation, SolanaActionOperation, } from "../types/enums.js";
|
|
3
4
|
import { addressEquals, getChainEngine } from "../helpers/address.js";
|
|
4
5
|
import { extractGasCompensationGroups } from "../helpers/gas-compensation.js";
|
|
5
|
-
import { HookMode, PlaceholderResolutionErrorReason, resolveEagerPlaceholders, } from "../helpers/placeholder.js";
|
|
6
|
+
import { HookMode, PlaceholderResolutionErrorReason, resolveEagerPlaceholders, resolveEagerValuePlaceholders, } from "../helpers/placeholder.js";
|
|
6
7
|
import { validateSolanaHookActions } from "./solana-hook.js";
|
|
7
8
|
import { validateEvmHookActions } from "./evm-op-hook.js";
|
|
8
9
|
import { validateCompensationHookStructure } from "./compensation-hook.js";
|
|
@@ -16,17 +17,30 @@ const EVM_HOOK_OPERATIONS = [
|
|
|
16
17
|
EvmActionOperation.GasCompensation,
|
|
17
18
|
];
|
|
18
19
|
const EVM_HOOK_OPERATIONS_SET = new Set(EVM_HOOK_OPERATIONS);
|
|
20
|
+
const EVM_LEGACY_V1_HOOK_OPERATIONS = [
|
|
21
|
+
EvmActionOperation.Delegate,
|
|
22
|
+
EvmActionOperation.Budget,
|
|
23
|
+
EvmActionOperation.Hook,
|
|
24
|
+
EvmActionOperation.GasCompensation,
|
|
25
|
+
];
|
|
26
|
+
const EVM_LEGACY_V1_HOOK_OPERATIONS_SET = new Set(EVM_LEGACY_V1_HOOK_OPERATIONS);
|
|
19
27
|
const SOLANA_HOOK_OPERATIONS = [
|
|
20
28
|
SolanaActionOperation.Hook,
|
|
21
29
|
SolanaActionOperation.GasCompensation,
|
|
22
30
|
];
|
|
23
31
|
const SOLANA_HOOK_OPERATIONS_SET = new Set(SOLANA_HOOK_OPERATIONS);
|
|
24
|
-
|
|
32
|
+
const LEGACY_AMOUNT_PLACEHOLDER_REGEX = /\{amount(?:\.\d+)?\}/;
|
|
33
|
+
var HookShape;
|
|
34
|
+
(function (HookShape) {
|
|
35
|
+
HookShape[HookShape["LegacyV1"] = 1] = "LegacyV1";
|
|
36
|
+
HookShape[HookShape["CurrentV2"] = 2] = "CurrentV2";
|
|
37
|
+
})(HookShape || (HookShape = {}));
|
|
38
|
+
export function validateHooks(request, response, quoteMode, envConfig, options) {
|
|
25
39
|
return [
|
|
26
40
|
...validateHookAAConstraint(request, response),
|
|
27
41
|
...validateHookCounts(request, response),
|
|
28
|
-
...validatePreHooks(request, response, quoteMode),
|
|
29
|
-
...validatePostHooks(request, response, quoteMode),
|
|
42
|
+
...validatePreHooks(request, response, quoteMode, envConfig, options),
|
|
43
|
+
...validatePostHooks(request, response, quoteMode, envConfig, options),
|
|
30
44
|
];
|
|
31
45
|
}
|
|
32
46
|
// HIGH: hooks must be empty when AA=false
|
|
@@ -90,18 +104,18 @@ function validateHookCounts(request, response) {
|
|
|
90
104
|
}
|
|
91
105
|
return violations;
|
|
92
106
|
}
|
|
93
|
-
function validatePreHooks(request, response, quoteMode) {
|
|
107
|
+
function validatePreHooks(request, response, quoteMode, envConfig, options) {
|
|
94
108
|
const violations = [];
|
|
95
109
|
const requestHooks = request.preHooks ?? [];
|
|
96
110
|
for (let i = 0; i < response.preHooks.length; i++) {
|
|
97
111
|
const basePath = `response.preHooks[${i}]`;
|
|
98
112
|
const hookPayload = response.preHooks[i];
|
|
99
113
|
const requestHook = requestHooks[i];
|
|
100
|
-
violations.push(...validateSingleHookPayload(hookPayload, requestHook, basePath, request, response.trades, HookMode.PreHooks, quoteMode));
|
|
114
|
+
violations.push(...validateSingleHookPayload(hookPayload, requestHook, basePath, request, response.trades, HookMode.PreHooks, quoteMode, envConfig, options));
|
|
101
115
|
}
|
|
102
116
|
return violations;
|
|
103
117
|
}
|
|
104
|
-
function validatePostHooks(request, response, quoteMode) {
|
|
118
|
+
function validatePostHooks(request, response, quoteMode, envConfig, options) {
|
|
105
119
|
const violations = [];
|
|
106
120
|
const requestHooks = request.postHooks ?? [];
|
|
107
121
|
for (let i = 0; i < response.postHooks.length; i++) {
|
|
@@ -109,30 +123,58 @@ function validatePostHooks(request, response, quoteMode) {
|
|
|
109
123
|
const hookPayload = response.postHooks[i];
|
|
110
124
|
// User postHooks are matched by index; extra entries are compensation hooks
|
|
111
125
|
const requestHook = i < requestHooks.length ? requestHooks[i] : undefined;
|
|
112
|
-
violations.push(...validateSingleHookPayload(hookPayload, requestHook, basePath, request, response.trades, HookMode.PostHooks, quoteMode));
|
|
126
|
+
violations.push(...validateSingleHookPayload(hookPayload, requestHook, basePath, request, response.trades, HookMode.PostHooks, quoteMode, envConfig, options));
|
|
113
127
|
}
|
|
114
128
|
return violations;
|
|
115
129
|
}
|
|
116
|
-
function validateSingleHookPayload(hookPayload, requestHook, basePath, request, responseTrades, mode, quoteMode) {
|
|
130
|
+
function validateSingleHookPayload(hookPayload, requestHook, basePath, request, responseTrades, mode, quoteMode, envConfig, options) {
|
|
117
131
|
const isCompensationPreHook = requestHook === undefined && mode === HookMode.PreHooks;
|
|
132
|
+
const legacySupportViolations = validateLegacyHookV1Support(hookPayload, requestHook, basePath, options);
|
|
133
|
+
if (legacySupportViolations.length > 0) {
|
|
134
|
+
// Safe skip: when the caller disables legacy V1 hooks, one semantic
|
|
135
|
+
// violation is enough; continuing would emit V2-specific cascade errors.
|
|
136
|
+
return legacySupportViolations;
|
|
137
|
+
}
|
|
118
138
|
return [
|
|
119
139
|
...validateHookEcho(hookPayload, requestHook, basePath, responseTrades, mode),
|
|
120
140
|
...validateHookUniqueActionIds(hookPayload, basePath),
|
|
121
|
-
...validateHookActionsList(hookPayload, basePath),
|
|
141
|
+
...validateHookActionsList(hookPayload, basePath, requestHook, mode, quoteMode),
|
|
122
142
|
...validateHookDelegateOp(hookPayload, basePath),
|
|
123
143
|
...validateHookSolanaNotDirect(hookPayload, basePath),
|
|
124
144
|
...validateGasCompensationRequiresInfo(hookPayload, basePath, request),
|
|
125
145
|
...(isCompensationPreHook
|
|
126
|
-
? validateCompensationHookStructure(hookPayload, basePath, request)
|
|
146
|
+
? validateCompensationHookStructure(hookPayload, basePath, request, envConfig)
|
|
127
147
|
: []),
|
|
128
|
-
...dispatchChainSpecificValidation(hookPayload, requestHook, basePath, quoteMode, request, mode, responseTrades),
|
|
148
|
+
...dispatchChainSpecificValidation(hookPayload, requestHook, basePath, quoteMode, request, mode, responseTrades, envConfig),
|
|
129
149
|
];
|
|
130
150
|
}
|
|
151
|
+
// HIGH: callers can opt out of temporary legacy V1 hook tolerance.
|
|
152
|
+
function validateLegacyHookV1Support(hookPayload, requestHook, basePath, options) {
|
|
153
|
+
if (options.allowLegacyHookV1)
|
|
154
|
+
return [];
|
|
155
|
+
if (!isLegacyHookV1Pair(hookPayload, requestHook))
|
|
156
|
+
return [];
|
|
157
|
+
return [{
|
|
158
|
+
code: ViolationCode.LegacyHookV1Unsupported,
|
|
159
|
+
message: "legacy V1 hook is disabled by validator config",
|
|
160
|
+
path: `${basePath}.hook`,
|
|
161
|
+
expected: {
|
|
162
|
+
requestHookShape: requestHook === undefined ? undefined : HookShape.CurrentV2,
|
|
163
|
+
responseHookShape: HookShape.CurrentV2,
|
|
164
|
+
},
|
|
165
|
+
actual: {
|
|
166
|
+
requestHookShape: requestHook === undefined ? undefined : getHookShape(requestHook),
|
|
167
|
+
responseHookShape: getHookShape(hookPayload.hook),
|
|
168
|
+
},
|
|
169
|
+
}];
|
|
170
|
+
}
|
|
131
171
|
// MEDIUM: Solana hooks must not be of type 'direct'.
|
|
132
172
|
function validateHookSolanaNotDirect(hookPayload, basePath) {
|
|
133
173
|
const realChainId = resolveChainIdOrSelf(hookPayload.hook.chainId);
|
|
134
174
|
if (getChainEngine(realChainId) !== ChainEngine.Solana)
|
|
135
175
|
return [];
|
|
176
|
+
if (!isRequestHookV2(hookPayload.hook))
|
|
177
|
+
return [];
|
|
136
178
|
if (hookPayload.hook.type !== BundleHookType.Direct)
|
|
137
179
|
return [];
|
|
138
180
|
return [{
|
|
@@ -173,11 +215,20 @@ function validateHookEcho(hookPayload, requestHook, basePath, responseTrades, mo
|
|
|
173
215
|
}
|
|
174
216
|
return [];
|
|
175
217
|
}
|
|
218
|
+
const hookPath = `${basePath}.hook`;
|
|
219
|
+
if (!isRequestHookV2(requestHook)) {
|
|
220
|
+
if (isRequestHookV2(hookPayload.hook)) {
|
|
221
|
+
return [echoMismatch(`${hookPath}.shape`, getHookShape(requestHook), getHookShape(hookPayload.hook))];
|
|
222
|
+
}
|
|
223
|
+
return validateLegacyHookEcho(hookPayload, requestHook, basePath, responseTrades, mode);
|
|
224
|
+
}
|
|
225
|
+
if (!isRequestHookV2(hookPayload.hook)) {
|
|
226
|
+
return [echoMismatch(`${hookPath}.shape`, getHookShape(requestHook), getHookShape(hookPayload.hook))];
|
|
227
|
+
}
|
|
176
228
|
const echoed = hookPayload.hook;
|
|
177
229
|
const chainId = requestHook.chainId;
|
|
178
230
|
const realChainId = resolveChainIdOrSelf(chainId);
|
|
179
231
|
const isSolana = getChainEngine(realChainId) === ChainEngine.Solana;
|
|
180
|
-
const hookPath = `${basePath}.hook`;
|
|
181
232
|
const violations = [];
|
|
182
233
|
// chainId — strict number equality (subscriptionId on both sides)
|
|
183
234
|
if (echoed.chainId !== chainId) {
|
|
@@ -193,10 +244,11 @@ function validateHookEcho(hookPayload, requestHook, basePath, responseTrades, mo
|
|
|
193
244
|
}
|
|
194
245
|
// to, value — chain-dependent.
|
|
195
246
|
// Solana: API deletes both from the echo; skip entirely.
|
|
196
|
-
// EVM:
|
|
247
|
+
// EVM: API resolves eager markers in value and echoes the processed decimal
|
|
248
|
+
// string; deferred markers are preserved.
|
|
197
249
|
if (!isSolana) {
|
|
198
250
|
violations.push(...compareOptionalAddress(realChainId, `${hookPath}.to`, requestHook.to, echoed.to));
|
|
199
|
-
violations.push(...
|
|
251
|
+
violations.push(...compareHookValue(requestHook, echoed.value, `${hookPath}.value`, responseTrades, mode, realChainId));
|
|
200
252
|
}
|
|
201
253
|
// data — eager placeholders are resolved by the API before echoing.
|
|
202
254
|
const { resolved: expectedData, errors } = resolveEagerPlaceholders(requestHook.data, realChainId, requestHook.placeHolders, responseTrades, mode);
|
|
@@ -234,6 +286,28 @@ function validateHookEcho(hookPayload, requestHook, basePath, responseTrades, mo
|
|
|
234
286
|
}
|
|
235
287
|
return violations;
|
|
236
288
|
}
|
|
289
|
+
function validateLegacyHookEcho(hookPayload, requestHook, basePath, responseTrades, mode) {
|
|
290
|
+
const echoed = hookPayload.hook;
|
|
291
|
+
const hookPath = `${basePath}.hook`;
|
|
292
|
+
const realChainId = resolveChainIdOrSelf(requestHook.chainId);
|
|
293
|
+
const violations = [];
|
|
294
|
+
if (echoed.chainId !== requestHook.chainId) {
|
|
295
|
+
violations.push(echoMismatch(`${hookPath}.chainId`, requestHook.chainId, echoed.chainId));
|
|
296
|
+
}
|
|
297
|
+
if (!addressEquals(realChainId, echoed.from, requestHook.from)) {
|
|
298
|
+
violations.push(echoMismatch(`${hookPath}.from`, requestHook.from, echoed.from));
|
|
299
|
+
}
|
|
300
|
+
if (echoed.isAtomic !== requestHook.isAtomic) {
|
|
301
|
+
violations.push(echoMismatch(`${hookPath}.isAtomic`, requestHook.isAtomic, echoed.isAtomic));
|
|
302
|
+
}
|
|
303
|
+
violations.push(...compareOptionalAddress(realChainId, `${hookPath}.to`, requestHook.to, echoed.to));
|
|
304
|
+
violations.push(...compareLegacyHookValue(requestHook, echoed.value, `${hookPath}.value`, responseTrades, mode, realChainId));
|
|
305
|
+
violations.push(...compareLegacyHookData(requestHook, echoed.data, `${hookPath}.data`, responseTrades, mode, realChainId));
|
|
306
|
+
if (!isRequestHookV2(requestHook) && !isRequestHookV2(echoed)) {
|
|
307
|
+
violations.push(...compareOptionalAddress(realChainId, `${hookPath}.tokenAddress`, requestHook.tokenAddress, echoed.tokenAddress));
|
|
308
|
+
}
|
|
309
|
+
return violations;
|
|
310
|
+
}
|
|
237
311
|
function echoMismatch(path, expected, actual) {
|
|
238
312
|
return {
|
|
239
313
|
code: ViolationCode.HookEchoMismatch,
|
|
@@ -259,6 +333,38 @@ function compareOptionalAddress(chainId, path, expected, actual) {
|
|
|
259
333
|
}
|
|
260
334
|
return [];
|
|
261
335
|
}
|
|
336
|
+
function compareLegacyHookData(requestHook, actual, path, responseTrades, mode, realChainId) {
|
|
337
|
+
if (isRequestHookV2(requestHook) || !LEGACY_AMOUNT_PLACEHOLDER_REGEX.test(requestHook.data)) {
|
|
338
|
+
return requestHook.data === actual ? [] : [echoMismatch(path, requestHook.data, actual)];
|
|
339
|
+
}
|
|
340
|
+
const { resolved, errors } = resolveEagerPlaceholders(requestHook.data, realChainId, [createLegacyV1AmountPlaceholder(requestHook)], responseTrades, mode);
|
|
341
|
+
if (errors.length > 0) {
|
|
342
|
+
// Safe skip: legacy V1 placeholder expansion is temporary tolerance logic.
|
|
343
|
+
// Ambiguous expansion must not create a false-positive echo violation.
|
|
344
|
+
return [];
|
|
345
|
+
}
|
|
346
|
+
return resolved === actual ? [] : [echoMismatch(path, resolved, actual)];
|
|
347
|
+
}
|
|
348
|
+
function compareLegacyHookValue(requestHook, actual, path, responseTrades, mode, realChainId) {
|
|
349
|
+
if (isRequestHookV2(requestHook) || !LEGACY_AMOUNT_PLACEHOLDER_REGEX.test(requestHook.value)) {
|
|
350
|
+
return compareOptionalString(path, requestHook.value, actual);
|
|
351
|
+
}
|
|
352
|
+
const { resolved, errors } = resolveEagerValuePlaceholders(requestHook.value, realChainId, [createLegacyV1AmountPlaceholder(requestHook)], responseTrades, mode);
|
|
353
|
+
if (errors.length > 0) {
|
|
354
|
+
// Safe skip: legacy V1 placeholder expansion is temporary tolerance logic.
|
|
355
|
+
// Ambiguous expansion must not create a false-positive echo violation.
|
|
356
|
+
return [];
|
|
357
|
+
}
|
|
358
|
+
return compareOptionalString(path, resolved, actual);
|
|
359
|
+
}
|
|
360
|
+
function createLegacyV1AmountPlaceholder(hook) {
|
|
361
|
+
return {
|
|
362
|
+
nameVariable: "amount",
|
|
363
|
+
tokenAddress: hook.tokenAddress,
|
|
364
|
+
address: hook.from,
|
|
365
|
+
additionalAmount: hook.additionalAmountForPlaceholder,
|
|
366
|
+
};
|
|
367
|
+
}
|
|
262
368
|
// HIGH: unique actionIds within hook requiredActions
|
|
263
369
|
function validateHookUniqueActionIds(hookPayload, basePath) {
|
|
264
370
|
const seen = new Map();
|
|
@@ -281,12 +387,63 @@ function validateHookUniqueActionIds(hookPayload, basePath) {
|
|
|
281
387
|
}
|
|
282
388
|
return violations;
|
|
283
389
|
}
|
|
284
|
-
|
|
285
|
-
|
|
390
|
+
function compareHookValue(requestHook, actual, path, responseTrades, mode, realChainId) {
|
|
391
|
+
if (requestHook.value === undefined)
|
|
392
|
+
return compareOptionalString(path, undefined, actual);
|
|
393
|
+
const { resolved, errors } = resolveEagerValuePlaceholders(requestHook.value, realChainId, requestHook.placeHolders, responseTrades, mode);
|
|
394
|
+
const violations = placeholderResolutionViolations(errors, path);
|
|
395
|
+
if (resolved !== actual) {
|
|
396
|
+
violations.push(echoMismatch(path, resolved, actual));
|
|
397
|
+
}
|
|
398
|
+
return violations;
|
|
399
|
+
}
|
|
400
|
+
function placeholderResolutionViolations(errors, path) {
|
|
401
|
+
return errors.map(error => {
|
|
402
|
+
const reasonText = PlaceholderResolutionErrorReason[error.reason];
|
|
403
|
+
return {
|
|
404
|
+
code: ViolationCode.HookPlaceholderResolutionFailed,
|
|
405
|
+
message: `failed to resolve placeholder "${error.nameVariable}"`
|
|
406
|
+
+ ` (${reasonText})`,
|
|
407
|
+
path,
|
|
408
|
+
actual: { nameVariable: error.nameVariable, reason: reasonText },
|
|
409
|
+
details: error.details,
|
|
410
|
+
};
|
|
411
|
+
});
|
|
412
|
+
}
|
|
413
|
+
function getHookAllowedOperationsSet(isSolana, isLegacyV1UserHook) {
|
|
414
|
+
if (isSolana)
|
|
415
|
+
return SOLANA_HOOK_OPERATIONS_SET;
|
|
416
|
+
return isLegacyV1UserHook
|
|
417
|
+
? EVM_LEGACY_V1_HOOK_OPERATIONS_SET
|
|
418
|
+
: EVM_HOOK_OPERATIONS_SET;
|
|
419
|
+
}
|
|
420
|
+
function getHookAllowedOperationsList(isSolana, isLegacyV1UserHook) {
|
|
421
|
+
if (isSolana)
|
|
422
|
+
return SOLANA_HOOK_OPERATIONS;
|
|
423
|
+
return isLegacyV1UserHook ? EVM_LEGACY_V1_HOOK_OPERATIONS : EVM_HOOK_OPERATIONS;
|
|
424
|
+
}
|
|
425
|
+
function isLegacyHookV1Pair(hookPayload, requestHook) {
|
|
426
|
+
return !isRequestHookV2(hookPayload.hook)
|
|
427
|
+
|| (requestHook !== undefined && !isRequestHookV2(requestHook));
|
|
428
|
+
}
|
|
429
|
+
function isUserLegacyHookV1(hookPayload, requestHook, isSolana) {
|
|
430
|
+
if (requestHook === undefined || isSolana)
|
|
431
|
+
return false;
|
|
432
|
+
return isLegacyHookV1Pair(hookPayload, requestHook);
|
|
433
|
+
}
|
|
434
|
+
function getHookShape(hook) {
|
|
435
|
+
return isRequestHookV2(hook) ? HookShape.CurrentV2 : HookShape.LegacyV1;
|
|
436
|
+
}
|
|
437
|
+
// HIGH: hook required actions must use allowed operation names. In execution
|
|
438
|
+
// mode there must also be exactly one primary action: [Hook] for user hooks or
|
|
439
|
+
// [GasCompensation] for appended compensation hooks. EVM [Delegate] may appear
|
|
440
|
+
// as the separate first action and is checked by `validateHookDelegateOp`.
|
|
441
|
+
function validateHookActionsList(hookPayload, basePath, requestHook, mode, quoteMode) {
|
|
286
442
|
const realChainId = resolveChainIdOrSelf(hookPayload.hook.chainId);
|
|
287
443
|
const isSolana = getChainEngine(realChainId) === ChainEngine.Solana;
|
|
288
|
-
const
|
|
289
|
-
const
|
|
444
|
+
const isLegacyV1UserHook = isUserLegacyHookV1(hookPayload, requestHook, isSolana);
|
|
445
|
+
const allowedSet = getHookAllowedOperationsSet(isSolana, isLegacyV1UserHook);
|
|
446
|
+
const allowedList = getHookAllowedOperationsList(isSolana, isLegacyV1UserHook);
|
|
290
447
|
const violations = [];
|
|
291
448
|
for (let i = 0; i < hookPayload.requiredActions.length; i++) {
|
|
292
449
|
const action = hookPayload.requiredActions[i];
|
|
@@ -304,16 +461,104 @@ function validateHookActionsList(hookPayload, basePath) {
|
|
|
304
461
|
if (!allowedSet.has(action.actions[0])) {
|
|
305
462
|
violations.push({
|
|
306
463
|
code: ViolationCode.HookActionsInvalid,
|
|
307
|
-
message: "hook required action operation
|
|
308
|
-
+ " or GasCompensation",
|
|
464
|
+
message: "hook required action operation is not allowed in hook scope",
|
|
309
465
|
path: `${actionPath}.actions`,
|
|
310
466
|
expected: allowedList,
|
|
311
467
|
actual: action.actions,
|
|
312
468
|
});
|
|
313
469
|
}
|
|
314
470
|
}
|
|
471
|
+
if (!quoteMode) {
|
|
472
|
+
violations.push(...validatePrimaryHookOperation(hookPayload, basePath, requestHook, mode, isSolana, isLegacyV1UserHook));
|
|
473
|
+
}
|
|
315
474
|
return violations;
|
|
316
475
|
}
|
|
476
|
+
function validatePrimaryHookOperation(hookPayload, basePath, requestHook, mode, isSolana, isLegacyV1UserHook) {
|
|
477
|
+
if (isLegacyV1UserHook) {
|
|
478
|
+
return validateLegacyV1PrimaryHookOperation(hookPayload, basePath, requestHook);
|
|
479
|
+
}
|
|
480
|
+
const expected = requestHook === undefined && mode === HookMode.PreHooks
|
|
481
|
+
? (isSolana ? SolanaActionOperation.GasCompensation : EvmActionOperation.GasCompensation)
|
|
482
|
+
: (isSolana ? SolanaActionOperation.Hook : EvmActionOperation.Hook);
|
|
483
|
+
const delegate = EvmActionOperation.Delegate;
|
|
484
|
+
const primaryIndices = [];
|
|
485
|
+
const violations = [];
|
|
486
|
+
for (let i = 0; i < hookPayload.requiredActions.length; i++) {
|
|
487
|
+
const ops = hookPayload.requiredActions[i].actions;
|
|
488
|
+
if (ops.length !== 1)
|
|
489
|
+
continue;
|
|
490
|
+
if (ops[0] === delegate && !isSolana)
|
|
491
|
+
continue;
|
|
492
|
+
primaryIndices.push(i);
|
|
493
|
+
if (ops[0] !== expected) {
|
|
494
|
+
violations.push(hookOperationViolation(basePath, i, [expected], ops));
|
|
495
|
+
}
|
|
496
|
+
}
|
|
497
|
+
if (primaryIndices.length !== 1) {
|
|
498
|
+
violations.push({
|
|
499
|
+
code: ViolationCode.HookActionsInvalid,
|
|
500
|
+
message: "hook requiredActions must contain exactly one primary operation",
|
|
501
|
+
path: `${basePath}.requiredActions`,
|
|
502
|
+
expected: [expected],
|
|
503
|
+
actual: primaryIndices.map(i => hookPayload.requiredActions[i].actions),
|
|
504
|
+
});
|
|
505
|
+
}
|
|
506
|
+
return violations;
|
|
507
|
+
}
|
|
508
|
+
function validateLegacyV1PrimaryHookOperation(hookPayload, basePath, requestHook) {
|
|
509
|
+
const budgetAllowed = requestHook !== undefined
|
|
510
|
+
&& !isRequestHookV2(requestHook)
|
|
511
|
+
&& requestHook.preparePreRequiredActions !== false;
|
|
512
|
+
const primaryIndices = [];
|
|
513
|
+
const violations = [];
|
|
514
|
+
for (let i = 0; i < hookPayload.requiredActions.length; i++) {
|
|
515
|
+
const ops = hookPayload.requiredActions[i].actions;
|
|
516
|
+
if (ops.length !== 1)
|
|
517
|
+
continue;
|
|
518
|
+
const op = ops[0];
|
|
519
|
+
if (op === EvmActionOperation.Delegate)
|
|
520
|
+
continue;
|
|
521
|
+
if (op === EvmActionOperation.Budget && budgetAllowed)
|
|
522
|
+
continue;
|
|
523
|
+
if (op === EvmActionOperation.Budget) {
|
|
524
|
+
violations.push(legacyV1BudgetOperationViolation(basePath, i, ops));
|
|
525
|
+
continue;
|
|
526
|
+
}
|
|
527
|
+
primaryIndices.push(i);
|
|
528
|
+
if (op !== EvmActionOperation.Hook) {
|
|
529
|
+
violations.push(hookOperationViolation(basePath, i, [EvmActionOperation.Hook], ops));
|
|
530
|
+
}
|
|
531
|
+
}
|
|
532
|
+
if (primaryIndices.length !== 1) {
|
|
533
|
+
violations.push({
|
|
534
|
+
code: ViolationCode.HookActionsInvalid,
|
|
535
|
+
message: "legacy V1 hook requiredActions must contain exactly one Hook operation",
|
|
536
|
+
path: `${basePath}.requiredActions`,
|
|
537
|
+
expected: [EvmActionOperation.Hook],
|
|
538
|
+
actual: primaryIndices.map(i => hookPayload.requiredActions[i].actions),
|
|
539
|
+
});
|
|
540
|
+
}
|
|
541
|
+
return violations;
|
|
542
|
+
}
|
|
543
|
+
function legacyV1BudgetOperationViolation(basePath, index, actual) {
|
|
544
|
+
return {
|
|
545
|
+
code: ViolationCode.HookActionsInvalid,
|
|
546
|
+
message: "legacy V1 hook Budget operation is allowed only when"
|
|
547
|
+
+ " preparePreRequiredActions is enabled",
|
|
548
|
+
path: `${basePath}.requiredActions[${index}].actions`,
|
|
549
|
+
expected: [EvmActionOperation.Delegate, EvmActionOperation.Hook],
|
|
550
|
+
actual,
|
|
551
|
+
};
|
|
552
|
+
}
|
|
553
|
+
function hookOperationViolation(basePath, index, expected, actual) {
|
|
554
|
+
return {
|
|
555
|
+
code: ViolationCode.HookActionsInvalid,
|
|
556
|
+
message: "hook required action operation does not match hook purpose",
|
|
557
|
+
path: `${basePath}.requiredActions[${index}].actions`,
|
|
558
|
+
expected,
|
|
559
|
+
actual,
|
|
560
|
+
};
|
|
561
|
+
}
|
|
317
562
|
// HIGH: Delegate-op constraints for EVM hook requiredActions.
|
|
318
563
|
// * `Delegate` may appear at most once.
|
|
319
564
|
// * If present, it must be the first required action (the API emits
|
|
@@ -337,7 +582,7 @@ function validateHookDelegateOp(hookPayload, basePath) {
|
|
|
337
582
|
if (indices.length === 0)
|
|
338
583
|
return [];
|
|
339
584
|
const violations = [];
|
|
340
|
-
if (hookPayload.hook.type === BundleHookType.Direct) {
|
|
585
|
+
if (isRequestHookV2(hookPayload.hook) && hookPayload.hook.type === BundleHookType.Direct) {
|
|
341
586
|
violations.push({
|
|
342
587
|
code: ViolationCode.HookDelegateInDirect,
|
|
343
588
|
message: "Direct hook must not contain a Delegate operation"
|
|
@@ -369,7 +614,7 @@ function validateHookDelegateOp(hookPayload, basePath) {
|
|
|
369
614
|
}
|
|
370
615
|
// CRITICAL: GasCompensation must only appear when gasCompensationInfo exists
|
|
371
616
|
function validateGasCompensationRequiresInfo(hookPayload, basePath, request) {
|
|
372
|
-
const hasGasCompensationInfo = (request.preHooks ?? []).some(h => h.gasCompensationInfo !== undefined);
|
|
617
|
+
const hasGasCompensationInfo = (request.preHooks ?? []).some(h => isRequestHookV2(h) && h.gasCompensationInfo !== undefined);
|
|
373
618
|
const realChainId = resolveChainIdOrSelf(hookPayload.hook.chainId);
|
|
374
619
|
const isSolana = getChainEngine(realChainId) === ChainEngine.Solana;
|
|
375
620
|
const gasCompensationOp = isSolana
|
|
@@ -392,13 +637,22 @@ function validateGasCompensationRequiresInfo(hookPayload, basePath, request) {
|
|
|
392
637
|
}
|
|
393
638
|
return violations;
|
|
394
639
|
}
|
|
395
|
-
function dispatchChainSpecificValidation(hookPayload, requestHook, basePath, quoteMode, request, mode, responseTrades) {
|
|
640
|
+
function dispatchChainSpecificValidation(hookPayload, requestHook, basePath, quoteMode, request, mode, responseTrades, envConfig) {
|
|
396
641
|
const realChainId = resolveChainIdOrSelf(hookPayload.hook.chainId);
|
|
642
|
+
if (requestHook !== undefined && !isRequestHookV2(requestHook)) {
|
|
643
|
+
// Safe skip: legacy hooks use the old placeholder model, which is not
|
|
644
|
+
// independently reproducible by the V2 hook validators. Echo checks and
|
|
645
|
+
// generic action-shape checks above still run.
|
|
646
|
+
return [];
|
|
647
|
+
}
|
|
648
|
+
if (!isRequestHookV2(hookPayload.hook)) {
|
|
649
|
+
return [];
|
|
650
|
+
}
|
|
397
651
|
if (getChainEngine(realChainId) === ChainEngine.Solana) {
|
|
398
652
|
const srcChainAuthorityAddress = findSolanaSrcChainAuthority(request);
|
|
399
|
-
return validateSolanaHookActions(hookPayload, requestHook, basePath, quoteMode, srcChainAuthorityAddress, request, realChainId, mode, responseTrades);
|
|
653
|
+
return validateSolanaHookActions(hookPayload, requestHook, basePath, quoteMode, srcChainAuthorityAddress, request, realChainId, mode, responseTrades, envConfig);
|
|
400
654
|
}
|
|
401
|
-
return validateEvmHookActions(hookPayload, requestHook, basePath, mode, responseTrades, realChainId, request);
|
|
655
|
+
return validateEvmHookActions(hookPayload, requestHook, basePath, mode, responseTrades, realChainId, request, envConfig);
|
|
402
656
|
}
|
|
403
657
|
function findSolanaSrcChainAuthority(request) {
|
|
404
658
|
for (const trade of request.trades) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hooks-common.js","sourceRoot":"","sources":["../../../src/validations/hooks-common.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"hooks-common.js","sourceRoot":"","sources":["../../../src/validations/hooks-common.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import { detectChainEngine, getChainEngine, isNativeToken, normalizeAddress, } f
|
|
|
3
3
|
import { resolveWrappedTokenAddress } from "../helpers/evm-token.js";
|
|
4
4
|
import { resolveChainId } from "../whitelists/subscription-to-chain-id.js";
|
|
5
5
|
import { SPL_NATIVE_MINT } from "../whitelists/solana/programs.js";
|
|
6
|
+
import { parseIntegerString } from "../helpers/integer.js";
|
|
6
7
|
export function validateIntentTokens(ctx, basePath) {
|
|
7
8
|
const intent = ctx.intentPayload.intent;
|
|
8
9
|
const group = ctx.tradeGroup;
|
|
@@ -125,7 +126,7 @@ function validateConstraintBudget(inputToken, ctx, normalizedAddress, basePath)
|
|
|
125
126
|
let expectedSum = 0n;
|
|
126
127
|
for (const { response, trade } of contributingResponseTrades) {
|
|
127
128
|
try {
|
|
128
|
-
expectedSum +=
|
|
129
|
+
expectedSum += parseIntegerString(response.srcChainTokenIn.amount);
|
|
129
130
|
}
|
|
130
131
|
catch (error) {
|
|
131
132
|
// Safe skip: invalid response `srcChainTokenIn.amount` is reported
|
|
@@ -137,7 +138,7 @@ function validateConstraintBudget(inputToken, ctx, normalizedAddress, basePath)
|
|
|
137
138
|
}
|
|
138
139
|
let actualBudget;
|
|
139
140
|
try {
|
|
140
|
-
actualBudget =
|
|
141
|
+
actualBudget = parseIntegerString(inputToken.constraintBudget);
|
|
141
142
|
}
|
|
142
143
|
catch (error) {
|
|
143
144
|
return [{
|
|
@@ -237,16 +238,18 @@ function collectInputAddressesForCrossChainTrades(intent, group) {
|
|
|
237
238
|
function isCrossChain(trade) {
|
|
238
239
|
return trade.srcChainId !== trade.dstChainId;
|
|
239
240
|
}
|
|
240
|
-
// CRITICAL: intent.takeToken[] must
|
|
241
|
-
// (dstChainId, dstChainTokenOut) pairs from the group's trades.
|
|
242
|
-
//
|
|
243
|
-
//
|
|
241
|
+
// CRITICAL: intent.takeToken[] must cover the unique destination
|
|
242
|
+
// (dstChainId, dstChainTokenOut) pairs from the group's trades. The API keys
|
|
243
|
+
// actual take-token entries by source/from token plus destination token, so
|
|
244
|
+
// duplicate detection uses the full
|
|
245
|
+
// (fromTokenAddress, takeTokenChainId, takeTokenAddress) identity.
|
|
244
246
|
// CRITICAL: fromTokenAddress must be in inputToken[] (same-chain) or giveToken[]
|
|
245
247
|
// (cross-chain).
|
|
246
248
|
function validateTakeTokens(intent, group, basePath) {
|
|
247
249
|
const violations = [];
|
|
248
|
-
const
|
|
249
|
-
const actualKeys = intent.takeToken.map(takeToken =>
|
|
250
|
+
const expectedDestinations = buildExpectedTakeTokenDestinations(group);
|
|
251
|
+
const actualKeys = intent.takeToken.map(takeToken => buildTakeTokenIdentityKey(takeToken, group.realChainId));
|
|
252
|
+
const actualDestinations = new Set(intent.takeToken.map(takeToken => buildTakeTokenDestinationKey(takeToken)));
|
|
250
253
|
const firstOccurrence = new Map();
|
|
251
254
|
for (let i = 0; i < actualKeys.length; i++) {
|
|
252
255
|
const key = actualKeys[i];
|
|
@@ -255,8 +258,8 @@ function validateTakeTokens(intent, group, basePath) {
|
|
|
255
258
|
violations.push({
|
|
256
259
|
code: ViolationCode.IntentTakeTokenDuplicate,
|
|
257
260
|
message: `intent.takeToken[${i}] duplicates the entry at`
|
|
258
|
-
+ ` index ${earlier} — each (
|
|
259
|
-
+ ` takeTokenAddress)
|
|
261
|
+
+ ` index ${earlier} — each (fromTokenAddress,`
|
|
262
|
+
+ ` takeTokenChainId, takeTokenAddress) tuple must appear once`,
|
|
260
263
|
path: `${basePath}[${i}]`,
|
|
261
264
|
actual: key,
|
|
262
265
|
});
|
|
@@ -265,8 +268,8 @@ function validateTakeTokens(intent, group, basePath) {
|
|
|
265
268
|
firstOccurrence.set(key, i);
|
|
266
269
|
}
|
|
267
270
|
}
|
|
268
|
-
for (const expectedTakeToken of
|
|
269
|
-
if (!
|
|
271
|
+
for (const expectedTakeToken of expectedDestinations) {
|
|
272
|
+
if (!actualDestinations.has(expectedTakeToken)) {
|
|
270
273
|
violations.push({
|
|
271
274
|
code: ViolationCode.IntentTakeTokenMissing,
|
|
272
275
|
message: "an expected (dstChainId, dstChainTokenOut) pair is"
|
|
@@ -278,7 +281,7 @@ function validateTakeTokens(intent, group, basePath) {
|
|
|
278
281
|
}
|
|
279
282
|
// Validate each unique entry (duplicates are already reported above)
|
|
280
283
|
for (const [, i] of firstOccurrence) {
|
|
281
|
-
violations.push(...validateSingleTakeToken(intent, intent.takeToken[i], group,
|
|
284
|
+
violations.push(...validateSingleTakeToken(intent, intent.takeToken[i], group, expectedDestinations, `${basePath}[${i}]`));
|
|
282
285
|
}
|
|
283
286
|
return violations;
|
|
284
287
|
}
|
|
@@ -292,10 +295,15 @@ function buildChainTokenKey(chainId, realChainId, address) {
|
|
|
292
295
|
: address;
|
|
293
296
|
return `${chainId}:${normalized}`;
|
|
294
297
|
}
|
|
295
|
-
function
|
|
298
|
+
function buildTakeTokenDestinationKey(takeToken) {
|
|
296
299
|
return buildChainTokenKey(takeToken.takeTokenChainId, resolveChainId(takeToken.takeTokenChainId), takeToken.takeTokenAddress);
|
|
297
300
|
}
|
|
298
|
-
function
|
|
301
|
+
function buildTakeTokenIdentityKey(takeToken, sourceRealChainId) {
|
|
302
|
+
const fromKey = normalizeAddress(sourceRealChainId, takeToken.fromTokenAddress);
|
|
303
|
+
const destinationKey = buildTakeTokenDestinationKey(takeToken);
|
|
304
|
+
return `${fromKey}->${destinationKey}`;
|
|
305
|
+
}
|
|
306
|
+
function buildExpectedTakeTokenDestinations(group) {
|
|
299
307
|
const set = new Set();
|
|
300
308
|
for (const trade of group.trades) {
|
|
301
309
|
const dstRealChainId = resolveChainId(trade.dstChainId);
|