@debridge-finance/borderless-validation-sdk 0.0.0-dev-25d2153 → 0.0.0-dev-3dc1a82
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/evm-trade-amounts.js +36 -1
- package/dist/cjs/helpers/evm-trade-amounts.js.map +1 -1
- package/dist/cjs/types/response.js +1 -1
- package/dist/cjs/types/response.js.map +1 -1
- package/dist/cjs/types/validation.js +0 -1
- package/dist/cjs/types/validation.js.map +1 -1
- package/dist/cjs/validations/evm-op-budget.js +10 -7
- package/dist/cjs/validations/evm-op-budget.js.map +1 -1
- package/dist/cjs/validations/evm-op-wrap.js +8 -5
- package/dist/cjs/validations/evm-op-wrap.js.map +1 -1
- package/dist/cjs/validations/evm-required-actions.js +3 -3
- package/dist/cjs/validations/evm-required-actions.js.map +1 -1
- package/dist/cjs/validations/required-actions.js +2 -2
- package/dist/cjs/validations/required-actions.js.map +1 -1
- package/dist/cjs/validations/solana-op-budget.js +56 -18
- package/dist/cjs/validations/solana-op-budget.js.map +1 -1
- package/dist/cjs/validations/solana-op-wrap.js +46 -13
- package/dist/cjs/validations/solana-op-wrap.js.map +1 -1
- package/dist/cjs/validations/solana-required-actions.js +3 -3
- package/dist/cjs/validations/solana-required-actions.js.map +1 -1
- package/dist/cjs/validations/solana-transaction.js +5 -5
- package/dist/cjs/validations/solana-transaction.js.map +1 -1
- package/dist/cjs/validations/trade-grouping.js +3 -1
- package/dist/cjs/validations/trade-grouping.js.map +1 -1
- package/dist/cjs/validations/trades.js +54 -37
- package/dist/cjs/validations/trades.js.map +1 -1
- package/dist/cjs/validator.js +4 -16
- package/dist/cjs/validator.js.map +1 -1
- package/dist/cjs/whitelists/environment-config.js +0 -13
- package/dist/cjs/whitelists/environment-config.js.map +1 -1
- package/dist/cjs/whitelists/types.js.map +1 -1
- package/dist/esm/helpers/evm-trade-amounts.js +36 -1
- package/dist/esm/helpers/evm-trade-amounts.js.map +1 -1
- package/dist/esm/types/response.js +1 -1
- package/dist/esm/types/response.js.map +1 -1
- package/dist/esm/types/validation.js +0 -1
- package/dist/esm/types/validation.js.map +1 -1
- package/dist/esm/validations/evm-op-budget.js +10 -7
- package/dist/esm/validations/evm-op-budget.js.map +1 -1
- package/dist/esm/validations/evm-op-wrap.js +8 -5
- package/dist/esm/validations/evm-op-wrap.js.map +1 -1
- package/dist/esm/validations/evm-required-actions.js +3 -3
- package/dist/esm/validations/evm-required-actions.js.map +1 -1
- package/dist/esm/validations/required-actions.js +2 -2
- package/dist/esm/validations/required-actions.js.map +1 -1
- package/dist/esm/validations/solana-op-budget.js +56 -18
- package/dist/esm/validations/solana-op-budget.js.map +1 -1
- package/dist/esm/validations/solana-op-wrap.js +47 -14
- package/dist/esm/validations/solana-op-wrap.js.map +1 -1
- package/dist/esm/validations/solana-required-actions.js +3 -3
- package/dist/esm/validations/solana-required-actions.js.map +1 -1
- package/dist/esm/validations/solana-transaction.js +7 -7
- package/dist/esm/validations/solana-transaction.js.map +1 -1
- package/dist/esm/validations/trade-grouping.js +3 -1
- package/dist/esm/validations/trade-grouping.js.map +1 -1
- package/dist/esm/validations/trades.js +54 -37
- package/dist/esm/validations/trades.js.map +1 -1
- package/dist/esm/validator.js +4 -16
- package/dist/esm/validator.js.map +1 -1
- package/dist/esm/whitelists/environment-config.js +0 -13
- package/dist/esm/whitelists/environment-config.js.map +1 -1
- package/dist/esm/whitelists/types.js.map +1 -1
- package/dist/types/helpers/evm-trade-amounts.d.ts +2 -2
- package/dist/types/helpers/evm-trade-amounts.d.ts.map +1 -1
- package/dist/types/types/response.d.ts +2 -2
- package/dist/types/types/validation.d.ts +1 -2
- package/dist/types/types/validation.d.ts.map +1 -1
- package/dist/types/validations/evm-op-budget.d.ts +2 -2
- package/dist/types/validations/evm-op-budget.d.ts.map +1 -1
- package/dist/types/validations/evm-op-wrap.d.ts +2 -2
- package/dist/types/validations/evm-op-wrap.d.ts.map +1 -1
- package/dist/types/validations/evm-required-actions.d.ts +2 -2
- package/dist/types/validations/evm-required-actions.d.ts.map +1 -1
- package/dist/types/validations/required-actions.d.ts.map +1 -1
- package/dist/types/validations/solana-op-budget.d.ts +2 -2
- package/dist/types/validations/solana-op-budget.d.ts.map +1 -1
- package/dist/types/validations/solana-op-wrap.d.ts +2 -2
- package/dist/types/validations/solana-op-wrap.d.ts.map +1 -1
- package/dist/types/validations/solana-required-actions.d.ts +2 -2
- package/dist/types/validations/solana-required-actions.d.ts.map +1 -1
- package/dist/types/validations/solana-transaction.d.ts +3 -3
- package/dist/types/validations/solana-transaction.d.ts.map +1 -1
- package/dist/types/validations/trade-grouping.d.ts +3 -2
- package/dist/types/validations/trade-grouping.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/types.d.ts +0 -1
- package/dist/types/whitelists/types.d.ts.map +1 -1
- package/package.json +1 -1
- package/dist/cjs/helpers/constants.js +0 -6
- package/dist/cjs/helpers/constants.js.map +0 -1
- package/dist/esm/helpers/constants.js +0 -3
- package/dist/esm/helpers/constants.js.map +0 -1
- package/dist/types/helpers/constants.d.ts +0 -2
- package/dist/types/helpers/constants.d.ts.map +0 -1
|
@@ -7,7 +7,13 @@ const evm_token_1 = require("./evm-token");
|
|
|
7
7
|
// Sums srcChainTokenInAmount for trades matching a given token address.
|
|
8
8
|
// Returns skip=true if any matching trade has max/auto amount.
|
|
9
9
|
// Returns violations if any matching trade has an invalid (non-numeric) amount.
|
|
10
|
-
|
|
10
|
+
//
|
|
11
|
+
// When `responseTrades` is provided, trades with `prependOperatingExpenses=true`
|
|
12
|
+
// also contribute `response.trades[i].srcChainTokenIn.approximateOperatingExpense`
|
|
13
|
+
// to the sum. This reflects how the API computes `intent.inputToken[].constraintBudget`
|
|
14
|
+
// (= mutated amount with prepended expense), which is the value used for Wrap.value
|
|
15
|
+
// and Budget approve amount on the same input token.
|
|
16
|
+
function sumTradeAmounts(trades, tokenAddress, realChainId, responseTrades) {
|
|
11
17
|
let sum = 0n;
|
|
12
18
|
// Resolve native → WETH so Budget for WETH matches trades with native input (and vice versa)
|
|
13
19
|
const resolvedToken = (0, evm_token_1.resolveWrappedTokenAddress)(tokenAddress, realChainId) ?? tokenAddress;
|
|
@@ -36,7 +42,36 @@ function sumTradeAmounts(trades, tokenAddress, realChainId) {
|
|
|
36
42
|
}],
|
|
37
43
|
};
|
|
38
44
|
}
|
|
45
|
+
if (responseTrades && (trade.prependOperatingExpenses ?? false)) {
|
|
46
|
+
const expenseResult = parsePrependedExpense(responseTrades, i);
|
|
47
|
+
if (expenseResult.violations)
|
|
48
|
+
return expenseResult;
|
|
49
|
+
sum += expenseResult.value;
|
|
50
|
+
}
|
|
39
51
|
}
|
|
40
52
|
return { sum };
|
|
41
53
|
}
|
|
54
|
+
// Reads response.trades[i].srcChainTokenIn.approximateOperatingExpense as bigint.
|
|
55
|
+
// If responseTrades has no matching index, treat as 0 — the trade-count mismatch
|
|
56
|
+
// is reported by `validateTrades` and we should not add a duplicate violation here.
|
|
57
|
+
function parsePrependedExpense(responseTrades, tradeIndex) {
|
|
58
|
+
const responseTrade = responseTrades[tradeIndex];
|
|
59
|
+
if (!responseTrade)
|
|
60
|
+
return { value: 0n };
|
|
61
|
+
const raw = responseTrade.srcChainTokenIn.approximateOperatingExpense;
|
|
62
|
+
try {
|
|
63
|
+
return { value: BigInt(raw) };
|
|
64
|
+
}
|
|
65
|
+
catch (e) {
|
|
66
|
+
return {
|
|
67
|
+
violations: [{
|
|
68
|
+
code: types_1.ViolationCode.TradeOperatingExpenseInvalid,
|
|
69
|
+
message: "approximateOperatingExpense is not a valid number",
|
|
70
|
+
path: `response.trades[${tradeIndex}].srcChainTokenIn.approximateOperatingExpense`,
|
|
71
|
+
actual: raw,
|
|
72
|
+
details: e,
|
|
73
|
+
}],
|
|
74
|
+
};
|
|
75
|
+
}
|
|
76
|
+
}
|
|
42
77
|
//# sourceMappingURL=evm-trade-amounts.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evm-trade-amounts.js","sourceRoot":"","sources":["../../../src/helpers/evm-trade-amounts.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"evm-trade-amounts.js","sourceRoot":"","sources":["../../../src/helpers/evm-trade-amounts.ts"],"names":[],"mappings":"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"}
|
|
@@ -83,7 +83,7 @@ exports.ResponseTradeSchema = zod_1.z.object({
|
|
|
83
83
|
dstChainTokenOutRecipient: zod_1.z.string().optional(),
|
|
84
84
|
dstChainAuthorityAddress: zod_1.z.string().optional(),
|
|
85
85
|
relatedIntentId: zod_1.z.string().optional(),
|
|
86
|
-
prependedOperatingExpenseCost: zod_1.z.string(),
|
|
86
|
+
prependedOperatingExpenseCost: zod_1.z.string().optional(),
|
|
87
87
|
userPoints: zod_1.z.number(),
|
|
88
88
|
integratorPoints: zod_1.z.number(),
|
|
89
89
|
actualUserPoints: zod_1.z.number().optional(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"response.js","sourceRoot":"","sources":["../../../src/types/response.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"response.js","sourceRoot":"","sources":["../../../src/types/response.ts"],"names":[],"mappings":"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"}
|
|
@@ -295,7 +295,6 @@ var ViolationCode;
|
|
|
295
295
|
ViolationCode["SolanaGasCompensationTokenMismatch"] = "SOLANA_GAS_COMPENSATION_TOKEN_MISMATCH";
|
|
296
296
|
ViolationCode["SolanaGasCompensationFeePayerIsUser"] = "SOLANA_GAS_COMPENSATION_FEE_PAYER_IS_USER";
|
|
297
297
|
ViolationCode["SolanaGasCompensationUnexpectedInstruction"] = "SOLANA_GAS_COMPENSATION_UNEXPECTED_INSTRUCTION";
|
|
298
|
-
ViolationCode["UrlNotWhitelisted"] = "URL_NOT_WHITELISTED";
|
|
299
298
|
})(ViolationCode || (exports.ViolationCode = ViolationCode = {}));
|
|
300
299
|
var Environment;
|
|
301
300
|
(function (Environment) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../src/types/validation.ts"],"names":[],"mappings":";;;AAAA,IAAY,
|
|
1
|
+
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../src/types/validation.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ const evm_token_1 = require("../helpers/evm-token");
|
|
|
9
9
|
const address_1 = require("../helpers/address");
|
|
10
10
|
const evm_trade_amounts_1 = require("../helpers/evm-trade-amounts");
|
|
11
11
|
const evm_action_1 = require("../helpers/evm-action");
|
|
12
|
-
function validateBudgetOperations(actions, basePath, request, trades, realChainId, envConfig) {
|
|
12
|
+
function validateBudgetOperations(actions, basePath, request, trades, responseTrades, realChainId, envConfig) {
|
|
13
13
|
const violations = [];
|
|
14
14
|
for (let i = 0; i < actions.length; i++) {
|
|
15
15
|
const action = actions[i];
|
|
@@ -23,7 +23,7 @@ function validateBudgetOperations(actions, basePath, request, trades, realChainI
|
|
|
23
23
|
// validated by the permit/permit2 validators instead.
|
|
24
24
|
if (!(0, evm_action_1.actionUsesTransactionCalls)(action))
|
|
25
25
|
continue;
|
|
26
|
-
violations.push(...validateBudgetTokenAddress(action, actionPath, trades, realChainId), ...validateBudgetCalldata(action, actionPath, request, trades, realChainId, envConfig));
|
|
26
|
+
violations.push(...validateBudgetTokenAddress(action, actionPath, trades, realChainId), ...validateBudgetCalldata(action, actionPath, request, trades, responseTrades, realChainId, envConfig));
|
|
27
27
|
}
|
|
28
28
|
return violations;
|
|
29
29
|
}
|
|
@@ -106,7 +106,7 @@ function validateBudgetTokenAddress(action, actionPath, trades, realChainId) {
|
|
|
106
106
|
}
|
|
107
107
|
// CRITICAL: decode approve calldata, validate spender + amount + allowanceHolder
|
|
108
108
|
// Handles two-step approve: approve(spender, 0) reset + approve(spender, amount)
|
|
109
|
-
function validateBudgetCalldata(action, actionPath, request, trades, realChainId, envConfig) {
|
|
109
|
+
function validateBudgetCalldata(action, actionPath, request, trades, responseTrades, realChainId, envConfig) {
|
|
110
110
|
const txCalls = (0, evm_action_1.getTransactionCalls)(action);
|
|
111
111
|
// Missing txCalls is reported by validateBudgetTokenAddress
|
|
112
112
|
if (txCalls.length === 0)
|
|
@@ -115,7 +115,7 @@ function validateBudgetCalldata(action, actionPath, request, trades, realChainId
|
|
|
115
115
|
if ("violations" in decoded)
|
|
116
116
|
return decoded.violations;
|
|
117
117
|
const violations = [];
|
|
118
|
-
violations.push(...validateBudgetAmount(decoded.amount, actionPath, decoded.mainApproveIndex, request, trades, action, realChainId), ...validateBudgetAllowanceHolder(decoded.spender, action, actionPath, decoded.mainApproveIndex, realChainId, envConfig));
|
|
118
|
+
violations.push(...validateBudgetAmount(decoded.amount, actionPath, decoded.mainApproveIndex, request, trades, responseTrades, action, realChainId), ...validateBudgetAllowanceHolder(decoded.spender, action, actionPath, decoded.mainApproveIndex, realChainId, envConfig));
|
|
119
119
|
return violations;
|
|
120
120
|
}
|
|
121
121
|
// Decodes one or two approve calls. Returns the "real" approve.
|
|
@@ -194,8 +194,11 @@ function validateBudgetResetCall(txCall, expectedSpender, calldataPath) {
|
|
|
194
194
|
}
|
|
195
195
|
return violations;
|
|
196
196
|
}
|
|
197
|
-
// CRITICAL: approve amount validation
|
|
198
|
-
|
|
197
|
+
// CRITICAL: approve amount validation. When `prependOperatingExpenses=true` for
|
|
198
|
+
// a trade, the API increases its contribution to the approve sum by
|
|
199
|
+
// `response.trades[i].srcChainTokenIn.approximateOperatingExpense` — same
|
|
200
|
+
// mechanism as the Wrap deposit value (the wrapped budget is the same number).
|
|
201
|
+
function validateBudgetAmount(approveAmount, actionPath, mainIndex, request, trades, responseTrades, action, realChainId) {
|
|
199
202
|
const flag = request.approveAmountFlag;
|
|
200
203
|
const dataPath = `${actionPath}.details.transactionCalls[${mainIndex}].data`;
|
|
201
204
|
// unlimited: must be maxUint256
|
|
@@ -216,7 +219,7 @@ function validateBudgetAmount(approveAmount, actionPath, mainIndex, request, tra
|
|
|
216
219
|
// Skip if tokenAddress is missing — already reported by validateBudgetTokenAddress
|
|
217
220
|
if (!tokenAddress)
|
|
218
221
|
return [];
|
|
219
|
-
const sumResult = (0, evm_trade_amounts_1.sumTradeAmounts)(trades, tokenAddress, realChainId);
|
|
222
|
+
const sumResult = (0, evm_trade_amounts_1.sumTradeAmounts)(trades, tokenAddress, realChainId, responseTrades);
|
|
220
223
|
if (sumResult.violations)
|
|
221
224
|
return sumResult.violations;
|
|
222
225
|
if (sumResult.skip)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evm-op-budget.js","sourceRoot":"","sources":["../../../src/validations/evm-op-budget.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"evm-op-budget.js","sourceRoot":"","sources":["../../../src/validations/evm-op-budget.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ const evm_calldata_1 = require("../helpers/evm-calldata");
|
|
|
9
9
|
const evm_token_1 = require("../helpers/evm-token");
|
|
10
10
|
const evm_trade_amounts_1 = require("../helpers/evm-trade-amounts");
|
|
11
11
|
const evm_action_1 = require("../helpers/evm-action");
|
|
12
|
-
function validateWrapOperations(actions, basePath, trades, realChainId) {
|
|
12
|
+
function validateWrapOperations(actions, basePath, trades, responseTrades, realChainId) {
|
|
13
13
|
const violations = [];
|
|
14
14
|
for (let i = 0; i < actions.length; i++) {
|
|
15
15
|
const action = actions[i];
|
|
@@ -37,7 +37,7 @@ function validateWrapOperations(actions, basePath, trades, realChainId) {
|
|
|
37
37
|
actual: txCalls.length,
|
|
38
38
|
});
|
|
39
39
|
}
|
|
40
|
-
violations.push(...validateWrapNativeToken(trades, actionPath, realChainId), ...validateWrapTo(txCalls[0], actionPath, realChainId), ...validateWrapCalldata(txCalls[0], actionPath), ...validateWrapAmount(txCalls[0], actionPath, trades, realChainId));
|
|
40
|
+
violations.push(...validateWrapNativeToken(trades, actionPath, realChainId), ...validateWrapTo(txCalls[0], actionPath, realChainId), ...validateWrapCalldata(txCalls[0], actionPath), ...validateWrapAmount(txCalls[0], actionPath, trades, responseTrades, realChainId));
|
|
41
41
|
}
|
|
42
42
|
return violations;
|
|
43
43
|
}
|
|
@@ -78,9 +78,12 @@ function validateWrapCalldata(txCall, actionPath) {
|
|
|
78
78
|
}
|
|
79
79
|
return [];
|
|
80
80
|
}
|
|
81
|
-
// CRITICAL: deposit amount (from value) must match sum of native trade amounts
|
|
82
|
-
|
|
83
|
-
|
|
81
|
+
// CRITICAL: deposit amount (from value) must match sum of native trade amounts.
|
|
82
|
+
// When `prependOperatingExpenses=true`, the API increases the wrapped budget by
|
|
83
|
+
// `approximateOperatingExpense`, so the expected deposit amount is the sum of
|
|
84
|
+
// `srcChainTokenInAmount + approximateOperatingExpense` over native trades.
|
|
85
|
+
function validateWrapAmount(txCall, actionPath, trades, responseTrades, realChainId) {
|
|
86
|
+
const sumResult = (0, evm_trade_amounts_1.sumTradeAmounts)(trades, viem_1.zeroAddress, realChainId, responseTrades);
|
|
84
87
|
if (sumResult.violations)
|
|
85
88
|
return sumResult.violations;
|
|
86
89
|
if (sumResult.skip)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evm-op-wrap.js","sourceRoot":"","sources":["../../../src/validations/evm-op-wrap.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"evm-op-wrap.js","sourceRoot":"","sources":["../../../src/validations/evm-op-wrap.ts"],"names":[],"mappings":";;AAkBA,wDA+CC;AAjED,oCASkB;AAClB,+BAAmC;AACnC,+CAAoD;AACpD,2CAAmD;AACnD,0DAA8E;AAC9E,oDAAqD;AACrD,oEAA+D;AAC/D,sDAA4D;AAE5D,SAAgB,sBAAsB,CAClC,OAA4B,EAC5B,QAAgB,EAChB,MAAsB,EACtB,cAA6C,EAC7C,WAAoB;IAEpB,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,IAAI,CAAC;YAAE,SAAS;QAEhE,MAAM,UAAU,GAAG,GAAG,QAAQ,oBAAoB,CAAC,GAAG,CAAC;QACvD,MAAM,OAAO,GAAG,IAAA,gCAAmB,EAAC,MAAM,CAAC,CAAC;QAE5C,6CAA6C;QAC7C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,UAAU,CAAC,IAAI,CAAC;gBACZ,IAAI,EAAE,qBAAa,CAAC,2BAA2B;gBAC/C,OAAO,EAAE,6CAA6C;gBACtD,IAAI,EAAE,GAAG,UAAU,2BAA2B;gBAC9C,MAAM,EAAE,EAAE;aACb,CAAC,CAAC;YACH,SAAS;QACb,CAAC;QAED,iEAAiE;QACjE,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,UAAU,CAAC,IAAI,CAAC;gBACZ,IAAI,EAAE,qBAAa,CAAC,2BAA2B;gBAC/C,OAAO,EAAE,0CAA0C;gBACnD,IAAI,EAAE,GAAG,UAAU,2BAA2B;gBAC9C,QAAQ,EAAE,CAAC;gBACX,MAAM,EAAE,OAAO,CAAC,MAAM;aACzB,CAAC,CAAC;QACP,CAAC;QAED,UAAU,CAAC,IAAI,CACX,GAAG,uBAAuB,CAAC,MAAM,EAAE,UAAU,EAAE,WAAW,CAAC,EAC3D,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,WAAW,CAAC,EACtD,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,EAC/C,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,cAAc,EAAE,WAAW,CAAC,CACrF,CAAC;IACN,CAAC;IAED,OAAO,UAAU,CAAC;AACtB,CAAC;AAED,mDAAmD;AACnD,SAAS,uBAAuB,CAC5B,MAAsB,EACtB,UAAkB,EAClB,WAAoB;IAEpB,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,yBAAa,EAAC,CAAC,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC,CAAC;IAClF,IAAI,CAAC,SAAS,EAAE,CAAC;QACb,OAAO,CAAC;gBACJ,IAAI,EAAE,qBAAa,CAAC,0BAA0B;gBAC9C,OAAO,EAAE,gDAAgD;gBACzD,IAAI,EAAE,GAAG,UAAU,UAAU;aAChC,CAAC,CAAC;IACP,CAAC;IACD,OAAO,EAAE,CAAC;AACd,CAAC;AAED,0DAA0D;AAC1D,SAAS,cAAc,CACnB,MAA0B,EAC1B,UAAkB,EAClB,WAAoB;IAEpB,IAAI,CAAC,IAAA,qBAAa,EAAC,oBAAc,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC;QACzD,OAAO,CAAC;gBACJ,IAAI,EAAE,qBAAa,CAAC,aAAa;gBACjC,OAAO,EAAE,qDAAqD;gBAC9D,IAAI,EAAE,GAAG,UAAU,iCAAiC;gBACpD,MAAM,EAAE,MAAM,CAAC,EAAE;aACpB,CAAC,CAAC;IACP,CAAC;IACD,OAAO,EAAE,CAAC;AACd,CAAC;AAED,gDAAgD;AAChD,SAAS,oBAAoB,CACzB,MAA0B,EAC1B,UAAkB;IAElB,IAAI,CAAC,IAAA,gCAAiB,EAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QAClC,OAAO,CAAC;gBACJ,IAAI,EAAE,qBAAa,CAAC,mBAAmB;gBACvC,OAAO,EAAE,mDAAmD;gBAC5D,IAAI,EAAE,GAAG,UAAU,mCAAmC;gBACtD,QAAQ,EAAE,+BAAgB;gBAC1B,MAAM,EAAE,MAAM,CAAC,IAAI;aACtB,CAAC,CAAC;IACP,CAAC;IACD,OAAO,EAAE,CAAC;AACd,CAAC;AAED,gFAAgF;AAChF,gFAAgF;AAChF,8EAA8E;AAC9E,4EAA4E;AAC5E,SAAS,kBAAkB,CACvB,MAA0B,EAC1B,UAAkB,EAClB,MAAsB,EACtB,cAA6C,EAC7C,WAAoB;IAEpB,MAAM,SAAS,GAAG,IAAA,mCAAe,EAAC,MAAM,EAAE,kBAAW,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;IACpF,IAAI,SAAS,CAAC,UAAU;QAAE,OAAO,SAAS,CAAC,UAAU,CAAC;IACtD,IAAI,SAAS,CAAC,IAAI;QAAE,OAAO,EAAE,CAAC;IAE9B,MAAM,GAAG,GAAG,SAAS,CAAC,GAAG,CAAC;IAC1B,IAAI,CAAC;QACD,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC3C,IAAI,aAAa,KAAK,GAAG,EAAE,CAAC;YACxB,OAAO,CAAC;oBACJ,IAAI,EAAE,qBAAa,CAAC,kBAAkB;oBACtC,OAAO,EAAE,gEAAgE;oBACzE,IAAI,EAAE,GAAG,UAAU,oCAAoC;oBACvD,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE;oBACxB,MAAM,EAAE,aAAa,CAAC,QAAQ,EAAE;iBACnC,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,CAAC;gBACJ,IAAI,EAAE,qBAAa,CAAC,kBAAkB;gBACtC,OAAO,EAAE,0CAA0C;gBACnD,IAAI,EAAE,GAAG,UAAU,oCAAoC;gBACvD,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE;gBACxB,MAAM,EAAE,MAAM,CAAC,KAAK;aACvB,CAAC,CAAC;IACP,CAAC;IAED,OAAO,EAAE,CAAC;AACd,CAAC"}
|
|
@@ -11,7 +11,7 @@ const evm_transaction_1 = require("./evm-transaction");
|
|
|
11
11
|
const evm_op_budget_1 = require("./evm-op-budget");
|
|
12
12
|
const evm_op_wrap_1 = require("./evm-op-wrap");
|
|
13
13
|
const address_1 = require("../helpers/address");
|
|
14
|
-
function validateEvmRequiredActions(request, response, actions, basePath, realChainId, quoteMode, intent, trades, srcChainAuthorityAddress, envConfig) {
|
|
14
|
+
function validateEvmRequiredActions(request, response, actions, basePath, realChainId, quoteMode, intent, trades, responseTrades, srcChainAuthorityAddress, envConfig) {
|
|
15
15
|
return [
|
|
16
16
|
...validateUniqueActionIds(actions, basePath),
|
|
17
17
|
...validateAAConstraints(request, response, actions, basePath),
|
|
@@ -22,8 +22,8 @@ function validateEvmRequiredActions(request, response, actions, basePath, realCh
|
|
|
22
22
|
...(0, evm_permit_1.validatePermitActions)(actions, basePath, request, response, realChainId, quoteMode, trades, srcChainAuthorityAddress, envConfig),
|
|
23
23
|
...(0, evm_permit2_1.validatePermit2Actions)(actions, basePath, request, response, realChainId, trades, envConfig),
|
|
24
24
|
...(0, evm_transaction_1.validateTransactionActions)(actions, basePath),
|
|
25
|
-
...(0, evm_op_budget_1.validateBudgetOperations)(actions, basePath, request, trades, realChainId, envConfig),
|
|
26
|
-
...(0, evm_op_wrap_1.validateWrapOperations)(actions, basePath, trades, realChainId),
|
|
25
|
+
...(0, evm_op_budget_1.validateBudgetOperations)(actions, basePath, request, trades, responseTrades, realChainId, envConfig),
|
|
26
|
+
...(0, evm_op_wrap_1.validateWrapOperations)(actions, basePath, trades, responseTrades, realChainId),
|
|
27
27
|
...validateApprovalMutualExclusivity(actions, basePath, realChainId),
|
|
28
28
|
];
|
|
29
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evm-required-actions.js","sourceRoot":"","sources":["../../../src/validations/evm-required-actions.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"evm-required-actions.js","sourceRoot":"","sources":["../../../src/validations/evm-required-actions.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,11 +16,11 @@ function validateRequiredActions(request, response, contexts, quoteMode, envConf
|
|
|
16
16
|
// so we must use chain context to disambiguate.
|
|
17
17
|
if (realChainId === types_1.ChainId.Solana) {
|
|
18
18
|
const solanaActions = filterSolanaActions(allActions);
|
|
19
|
-
violations.push(...(0, solana_required_actions_1.validateSolanaRequiredActions)(request, solanaActions, basePath, realChainId, quoteMode, ctx.tradeGroup.trades, ctx.tradeGroup.srcChainAuthorityAddress, ctx.intentPayload.intent, envConfig));
|
|
19
|
+
violations.push(...(0, solana_required_actions_1.validateSolanaRequiredActions)(request, solanaActions, basePath, realChainId, quoteMode, ctx.tradeGroup.trades, ctx.tradeGroup.responseTrades, ctx.tradeGroup.srcChainAuthorityAddress, ctx.intentPayload.intent, envConfig));
|
|
20
20
|
}
|
|
21
21
|
else {
|
|
22
22
|
const evmActions = filterEvmActions(allActions);
|
|
23
|
-
violations.push(...(0, evm_required_actions_1.validateEvmRequiredActions)(request, response, evmActions, basePath, realChainId, quoteMode, ctx.intentPayload.intent, ctx.tradeGroup.trades, ctx.tradeGroup.srcChainAuthorityAddress, envConfig));
|
|
23
|
+
violations.push(...(0, evm_required_actions_1.validateEvmRequiredActions)(request, response, evmActions, basePath, realChainId, quoteMode, ctx.intentPayload.intent, ctx.tradeGroup.trades, ctx.tradeGroup.responseTrades, ctx.tradeGroup.srcChainAuthorityAddress, envConfig));
|
|
24
24
|
}
|
|
25
25
|
}
|
|
26
26
|
return violations;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"required-actions.js","sourceRoot":"","sources":["../../../src/validations/required-actions.ts"],"names":[],"mappings":";;AAmBA,
|
|
1
|
+
{"version":3,"file":"required-actions.js","sourceRoot":"","sources":["../../../src/validations/required-actions.ts"],"names":[],"mappings":";;AAmBA,0DAwDC;AA3ED,oCAakB;AAClB,iEAAoE;AACpE,uEAA0E;AAI1E,SAAgB,uBAAuB,CACnC,OAA8B,EAC9B,QAAgC,EAChC,QAAyB,EACzB,SAAkB,EAClB,SAA4B;IAE5B,MAAM,UAAU,GAAgB,EAAE,CAAC;IAEnC,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QACzB,MAAM,QAAQ,GAAG,oBAAoB,GAAG,CAAC,WAAW,GAAG,CAAC;QACxD,MAAM,EAAE,WAAW,EAAE,GAAG,GAAG,CAAC,UAAU,CAAC;QACvC,MAAM,UAAU,GAAG,GAAG,CAAC,aAAa,CAAC,eAAe,CAAC;QAErD,UAAU,CAAC,IAAI,CAAC,GAAG,6BAA6B,CAAC,UAAU,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;QAErF,6DAA6D;QAC7D,mEAAmE;QACnE,gDAAgD;QAChD,IAAI,WAAW,KAAK,eAAO,CAAC,MAAM,EAAE,CAAC;YACjC,MAAM,aAAa,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAC;YACtD,UAAU,CAAC,IAAI,CACX,GAAG,IAAA,uDAA6B,EAC5B,OAAO,EACP,aAAa,EACb,QAAQ,EACR,WAAW,EACX,SAAS,EACT,GAAG,CAAC,UAAU,CAAC,MAAM,EACrB,GAAG,CAAC,UAAU,CAAC,cAAc,EAC7B,GAAG,CAAC,UAAU,CAAC,wBAAwB,EACvC,GAAG,CAAC,aAAa,CAAC,MAAM,EACxB,SAAS,CACZ,CACJ,CAAC;QACN,CAAC;aAAM,CAAC;YACJ,MAAM,UAAU,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;YAChD,UAAU,CAAC,IAAI,CACX,GAAG,IAAA,iDAA0B,EACzB,OAAO,EACP,QAAQ,EACR,UAAU,EACV,QAAQ,EACR,WAAW,EACX,SAAS,EACT,GAAG,CAAC,aAAa,CAAC,MAAM,EACxB,GAAG,CAAC,UAAU,CAAC,MAAM,EACrB,GAAG,CAAC,UAAU,CAAC,cAAc,EAC7B,GAAG,CAAC,UAAU,CAAC,wBAAwB,EACvC,SAAS,CACZ,CACJ,CAAC;QACN,CAAC;IACL,CAAC;IAED,OAAO,UAAU,CAAC;AACtB,CAAC;AAED,SAAS,WAAW,CAAC,MAA8B;IAC/C,OAAO,MAAM,CAAC,MAAM,CAAC,qBAAa,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAqB,CAAC,CAAC;AAC/E,CAAC;AAED,SAAS,gBAAgB,CAAC,OAAiC;IACvD,OAAO,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;AACvC,CAAC;AAED,SAAS,cAAc,CAAC,MAA8B;IAClD,OAAO,MAAM,CAAC,MAAM,CAAC,wBAAgB,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAwB,CAAC,CAAC;AACrF,CAAC;AAED,SAAS,mBAAmB,CAAC,OAAiC;IAC1D,OAAO,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;AAC1C,CAAC;AAED,MAAM,qBAAqB,GAAG,IAAI,GAAG,CAAS,MAAM,CAAC,MAAM,CAAC,0BAAkB,CAAC,CAAC,CAAC;AACjF,MAAM,wBAAwB,GAAG,IAAI,GAAG,CAAS,MAAM,CAAC,MAAM,CAAC,6BAAqB,CAAC,CAAC,CAAC;AAEvF,6EAA6E;AAC7E,gGAAgG;AAChG,SAAS,6BAA6B,CAClC,OAAiC,EACjC,QAAgB,EAChB,WAAoB;IAEpB,MAAM,aAAa,GAAG,WAAW,KAAK,eAAO,CAAC,MAAM,CAAC;IACrD,MAAM,WAAW,GAAG,aAAa,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,qBAAqB,CAAC;IACrF,MAAM,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC;IACpD,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,MAAM,UAAU,GAAG,GAAG,QAAQ,oBAAoB,CAAC,GAAG,CAAC;QAEvD,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QACrE,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,UAAU,CAAC,IAAI,CAAC;gBACZ,IAAI,EAAE,qBAAa,CAAC,8BAA8B;gBAClD,OAAO,EACH,GAAG,UAAU,iBAAiB,MAAM,CAAC,IAAI,aAAa,UAAU,EAAE;sBAChE,gBAAgB,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBAC7C,IAAI,EAAE,GAAG,UAAU,UAAU;gBAC7B,QAAQ,EAAE,CAAC,GAAG,WAAW,CAAC;gBAC1B,MAAM,EAAE,MAAM,CAAC,OAAO;aACzB,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAED,OAAO,UAAU,CAAC;AACtB,CAAC"}
|
|
@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.validateSolanaBudgetInstructions = validateSolanaBudgetInstructions;
|
|
4
4
|
const types_1 = require("../types");
|
|
5
5
|
const address_1 = require("../helpers/address");
|
|
6
|
-
const
|
|
6
|
+
const evm_token_1 = require("../helpers/evm-token");
|
|
7
|
+
const viem_1 = require("viem");
|
|
7
8
|
const solana_instruction_1 = require("../helpers/solana-instruction");
|
|
8
9
|
const programs_1 = require("../whitelists/solana/programs");
|
|
9
10
|
const TOKEN_PROGRAMS = new Set([programs_1.SPL_TOKEN_PROGRAM, programs_1.SPL_TOKEN_2022_PROGRAM]);
|
|
@@ -12,7 +13,7 @@ const TOKEN_PROGRAMS = new Set([programs_1.SPL_TOKEN_PROGRAM, programs_1.SPL_TOK
|
|
|
12
13
|
// =============================================
|
|
13
14
|
// Validates Budget (approve) instructions within a decoded Solana transaction.
|
|
14
15
|
// Called for both Transaction (AA=false) and SignTransaction (AA=true) actions.
|
|
15
|
-
function validateSolanaBudgetInstructions(action, resolvedInstructions, actionPath, request, trades, realChainId, quoteMode, srcChainAuthorityAddress, envConfig) {
|
|
16
|
+
function validateSolanaBudgetInstructions(action, resolvedInstructions, actionPath, request, trades, responseTrades, realChainId, quoteMode, srcChainAuthorityAddress, envConfig) {
|
|
16
17
|
const hasBudgetAction = action.actions.includes(types_1.SolanaActionOperation.Budget);
|
|
17
18
|
// CRITICAL: Budget forbidden when approveAmountFlag === "none"
|
|
18
19
|
if (hasBudgetAction && request.approveAmountFlag === types_1.ApproveAmountFlag.None) {
|
|
@@ -40,10 +41,10 @@ function validateSolanaBudgetInstructions(action, resolvedInstructions, actionPa
|
|
|
40
41
|
const approve = approveInstructions[i];
|
|
41
42
|
const ixLabel = `approve instruction #${i}`;
|
|
42
43
|
if (approve.kind === solana_instruction_1.ApproveKind.Classic) {
|
|
43
|
-
violations.push(...validateClassicApprove(approve, actionPath, ixLabel, request, trades, realChainId, quoteMode, srcChainAuthorityAddress, envConfig));
|
|
44
|
+
violations.push(...validateClassicApprove(approve, actionPath, ixLabel, request, trades, responseTrades, realChainId, quoteMode, srcChainAuthorityAddress, envConfig));
|
|
44
45
|
}
|
|
45
46
|
else {
|
|
46
|
-
violations.push(...validateCustomApprove(approve, actionPath, ixLabel, request, trades, realChainId, quoteMode, srcChainAuthorityAddress, envConfig));
|
|
47
|
+
violations.push(...validateCustomApprove(approve, actionPath, ixLabel, request, trades, responseTrades, realChainId, quoteMode, srcChainAuthorityAddress, envConfig));
|
|
47
48
|
}
|
|
48
49
|
}
|
|
49
50
|
return violations;
|
|
@@ -66,7 +67,7 @@ function collectApproveInstructions(instructions, intentProgram) {
|
|
|
66
67
|
// =============================================
|
|
67
68
|
// Classic SPL Token Approve validation
|
|
68
69
|
// =============================================
|
|
69
|
-
function validateClassicApprove(approve, actionPath, ixLabel, request, trades, realChainId, quoteMode, srcChainAuthorityAddress, envConfig) {
|
|
70
|
+
function validateClassicApprove(approve, actionPath, ixLabel, request, trades, responseTrades, realChainId, quoteMode, srcChainAuthorityAddress, envConfig) {
|
|
70
71
|
const violations = [];
|
|
71
72
|
// CRITICAL: programId (SPL Token or Token-2022) and discriminator (4 = Approve)
|
|
72
73
|
// are already verified by isClassicApprove() before this function is called.
|
|
@@ -96,20 +97,24 @@ function validateClassicApprove(approve, actionPath, ixLabel, request, trades, r
|
|
|
96
97
|
violations.push(...validateClassicAta(approve, actionPath, ixLabel, trades, realChainId, srcChainAuthorityAddress));
|
|
97
98
|
}
|
|
98
99
|
// CRITICAL: approve amount must match approveAmountFlag
|
|
99
|
-
violations.push(...validateApproveAmount(approve.amount, actionPath, ixLabel, request, trades, realChainId, types_1.ViolationCode.SolanaBudgetClassicAmountMismatch, false));
|
|
100
|
+
violations.push(...validateApproveAmount(approve.amount, actionPath, ixLabel, request, trades, responseTrades, realChainId, types_1.ViolationCode.SolanaBudgetClassicAmountMismatch, false));
|
|
100
101
|
return violations;
|
|
101
102
|
}
|
|
102
103
|
// CRITICAL: Verify ATA matches expected (mint, owner, tokenProgram)
|
|
103
104
|
function validateClassicAta(approve, actionPath, ixLabel, trades, realChainId, srcChainAuthorityAddress) {
|
|
104
|
-
// Try each trade's srcChainTokenIn as mint — if any matches, the ATA is valid
|
|
105
|
+
// Try each trade's srcChainTokenIn as mint — if any matches, the ATA is valid.
|
|
106
|
+
// For native SOL trades the API derives the ATA from wSOL mint, so resolve
|
|
107
|
+
// native → wSOL first.
|
|
105
108
|
const expectedAtas = [];
|
|
106
109
|
for (const trade of trades) {
|
|
110
|
+
const mint = (0, evm_token_1.resolveWrappedTokenAddress)(trade.srcChainTokenIn, realChainId)
|
|
111
|
+
?? trade.srcChainTokenIn;
|
|
107
112
|
try {
|
|
108
|
-
const expectedAta = (0, solana_instruction_1.deriveAta)(srcChainAuthorityAddress,
|
|
113
|
+
const expectedAta = (0, solana_instruction_1.deriveAta)(srcChainAuthorityAddress, mint, approve.tokenProgramId);
|
|
109
114
|
if ((0, address_1.addressEquals)(realChainId, approve.ataAddress, expectedAta)) {
|
|
110
115
|
return [];
|
|
111
116
|
}
|
|
112
|
-
expectedAtas.push({ mint
|
|
117
|
+
expectedAtas.push({ mint, ata: expectedAta });
|
|
113
118
|
}
|
|
114
119
|
catch {
|
|
115
120
|
// Invalid PublicKey — skip this trade, continue checking others
|
|
@@ -128,7 +133,7 @@ function validateClassicAta(approve, actionPath, ixLabel, trades, realChainId, s
|
|
|
128
133
|
// =============================================
|
|
129
134
|
// Custom approve (approveProtocolTransfers) validation
|
|
130
135
|
// =============================================
|
|
131
|
-
function validateCustomApprove(approve, actionPath, ixLabel, request, trades, realChainId, quoteMode, srcChainAuthorityAddress, envConfig) {
|
|
136
|
+
function validateCustomApprove(approve, actionPath, ixLabel, request, trades, responseTrades, realChainId, quoteMode, srcChainAuthorityAddress, envConfig) {
|
|
132
137
|
const violations = [];
|
|
133
138
|
// CRITICAL: programId (DEBRIDGE_INTENT_PROGRAM) and discriminator (8-byte Anchor hash)
|
|
134
139
|
// are already verified by isCustomApprove() before this function is called.
|
|
@@ -181,7 +186,7 @@ function validateCustomApprove(approve, actionPath, ixLabel, request, trades, re
|
|
|
181
186
|
}
|
|
182
187
|
// CRITICAL: each amount must match approveAmountFlag
|
|
183
188
|
for (let i = 0; i < approve.amounts.length; i++) {
|
|
184
|
-
violations.push(...validateApproveAmount(approve.amounts[i], actionPath, `${ixLabel} amounts[${i}]`, request, trades, realChainId, types_1.ViolationCode.SolanaBudgetCustomAmountMismatch, true));
|
|
189
|
+
violations.push(...validateApproveAmount(approve.amounts[i], actionPath, `${ixLabel} amounts[${i}]`, request, trades, responseTrades, realChainId, types_1.ViolationCode.SolanaBudgetCustomAmountMismatch, true));
|
|
185
190
|
}
|
|
186
191
|
return violations;
|
|
187
192
|
}
|
|
@@ -193,13 +198,16 @@ function validateCustomAtas(approve, actionPath, ixLabel, trades, realChainId, s
|
|
|
193
198
|
let matched = false;
|
|
194
199
|
const expectedAtas = [];
|
|
195
200
|
for (const trade of trades) {
|
|
201
|
+
// For native SOL trades, resolve to wSOL mint before deriving ATA.
|
|
202
|
+
const mint = (0, evm_token_1.resolveWrappedTokenAddress)(trade.srcChainTokenIn, realChainId)
|
|
203
|
+
?? trade.srcChainTokenIn;
|
|
196
204
|
try {
|
|
197
|
-
const expectedAta = (0, solana_instruction_1.deriveAta)(srcChainAuthorityAddress,
|
|
205
|
+
const expectedAta = (0, solana_instruction_1.deriveAta)(srcChainAuthorityAddress, mint, approve.tokenProgramId);
|
|
198
206
|
if ((0, address_1.addressEquals)(realChainId, ata, expectedAta)) {
|
|
199
207
|
matched = true;
|
|
200
208
|
break;
|
|
201
209
|
}
|
|
202
|
-
expectedAtas.push({ mint
|
|
210
|
+
expectedAtas.push({ mint, ata: expectedAta });
|
|
203
211
|
}
|
|
204
212
|
catch {
|
|
205
213
|
continue;
|
|
@@ -227,24 +235,28 @@ function validateCustomAtas(approve, actionPath, ixLabel, trades, realChainId, s
|
|
|
227
235
|
// adds the instruction amount to the existing allowance. The API may send a smaller
|
|
228
236
|
// amount if the user already has partial allowance. Classic SPL approve sets an
|
|
229
237
|
// absolute value, so it must match exactly.
|
|
230
|
-
|
|
238
|
+
//
|
|
239
|
+
// When `prependOperatingExpenses=true` for a trade, the API increases its
|
|
240
|
+
// contribution to the approve sum by `approximateOperatingExpense` — same
|
|
241
|
+
// mechanism as on EVM Wrap/Budget.
|
|
242
|
+
function validateApproveAmount(amount, actionPath, ixLabel, request, trades, responseTrades, realChainId, violationCode, allowDelta) {
|
|
231
243
|
const flag = request.approveAmountFlag;
|
|
232
244
|
// unlimited: must be max u64
|
|
233
245
|
if (flag === types_1.ApproveAmountFlag.Unlimited) {
|
|
234
|
-
if (amount !==
|
|
246
|
+
if (amount !== viem_1.maxUint64) {
|
|
235
247
|
return [{
|
|
236
248
|
code: violationCode,
|
|
237
249
|
message: `${ixLabel}: approve amount must be max u64`
|
|
238
250
|
+ " when approveAmountFlag=\"unlimited\"",
|
|
239
251
|
path: `${actionPath}.data.data`,
|
|
240
|
-
expected:
|
|
252
|
+
expected: viem_1.maxUint64.toString(),
|
|
241
253
|
actual: amount.toString(),
|
|
242
254
|
}];
|
|
243
255
|
}
|
|
244
256
|
return [];
|
|
245
257
|
}
|
|
246
258
|
// exactApproveAmount (or undefined): check against trade amounts
|
|
247
|
-
const sumResult = sumSolanaTradeAmounts(trades, realChainId);
|
|
259
|
+
const sumResult = sumSolanaTradeAmounts(trades, responseTrades, realChainId);
|
|
248
260
|
if (sumResult.skip)
|
|
249
261
|
return [];
|
|
250
262
|
if (sumResult.violations)
|
|
@@ -267,7 +279,11 @@ function validateApproveAmount(amount, actionPath, ixLabel, request, trades, rea
|
|
|
267
279
|
}
|
|
268
280
|
// Sums srcChainTokenInAmount across all matching trades.
|
|
269
281
|
// For Solana, no native→wrapped resolution is needed (unlike EVM).
|
|
270
|
-
|
|
282
|
+
//
|
|
283
|
+
// When `responseTrades[i]` is provided and the matching trade has
|
|
284
|
+
// `prependOperatingExpenses=true`, also adds
|
|
285
|
+
// `responseTrades[i].srcChainTokenIn.approximateOperatingExpense`.
|
|
286
|
+
function sumSolanaTradeAmounts(trades, responseTrades, _realChainId) {
|
|
271
287
|
let sum = 0n;
|
|
272
288
|
for (let i = 0; i < trades.length; i++) {
|
|
273
289
|
const amount = trades[i].srcChainTokenInAmount;
|
|
@@ -287,6 +303,28 @@ function sumSolanaTradeAmounts(trades, _realChainId) {
|
|
|
287
303
|
}],
|
|
288
304
|
};
|
|
289
305
|
}
|
|
306
|
+
if (trades[i].prependOperatingExpenses ?? false) {
|
|
307
|
+
const responseTrade = responseTrades[i];
|
|
308
|
+
// Safe skip: missing responseTrade means trade-count mismatch is
|
|
309
|
+
// reported by `validateTrades`.
|
|
310
|
+
if (!responseTrade)
|
|
311
|
+
continue;
|
|
312
|
+
const expense = responseTrade.srcChainTokenIn.approximateOperatingExpense;
|
|
313
|
+
try {
|
|
314
|
+
sum += BigInt(expense);
|
|
315
|
+
}
|
|
316
|
+
catch (e) {
|
|
317
|
+
return {
|
|
318
|
+
violations: [{
|
|
319
|
+
code: types_1.ViolationCode.TradeOperatingExpenseInvalid,
|
|
320
|
+
message: "approximateOperatingExpense is not a valid number",
|
|
321
|
+
path: `response.trades[${i}].srcChainTokenIn.approximateOperatingExpense`,
|
|
322
|
+
actual: expense,
|
|
323
|
+
details: e,
|
|
324
|
+
}],
|
|
325
|
+
};
|
|
326
|
+
}
|
|
327
|
+
}
|
|
290
328
|
}
|
|
291
329
|
return { sum };
|
|
292
330
|
}
|