@debridge-finance/borderless-validation-sdk 0.0.4 → 0.0.5
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-action.js +6 -4
- package/dist/cjs/helpers/evm-action.js.map +1 -1
- package/dist/cjs/helpers/expected-delegate.js +44 -0
- package/dist/cjs/helpers/expected-delegate.js.map +1 -0
- package/dist/cjs/types/validation.js +1 -0
- package/dist/cjs/types/validation.js.map +1 -1
- package/dist/cjs/validations/evm-op-hook.js +60 -4
- package/dist/cjs/validations/evm-op-hook.js.map +1 -1
- package/dist/cjs/validations/evm-required-actions.js +9 -4
- package/dist/cjs/validations/evm-required-actions.js.map +1 -1
- package/dist/cjs/validations/evm-sign712-metamask.js +46 -2
- package/dist/cjs/validations/evm-sign712-metamask.js.map +1 -1
- package/dist/cjs/validations/intent.js +44 -10
- package/dist/cjs/validations/intent.js.map +1 -1
- package/dist/cjs/validations/solana-transaction.js +29 -4
- package/dist/cjs/validations/solana-transaction.js.map +1 -1
- package/dist/cjs/whitelists/environment-config.js +21 -0
- package/dist/cjs/whitelists/environment-config.js.map +1 -1
- package/dist/cjs/whitelists/types.js.map +1 -1
- package/dist/esm/helpers/evm-action.js +6 -4
- package/dist/esm/helpers/evm-action.js.map +1 -1
- package/dist/esm/helpers/expected-delegate.js +39 -0
- package/dist/esm/helpers/expected-delegate.js.map +1 -0
- package/dist/esm/types/validation.js +1 -0
- package/dist/esm/types/validation.js.map +1 -1
- package/dist/esm/validations/evm-op-hook.js +60 -4
- package/dist/esm/validations/evm-op-hook.js.map +1 -1
- package/dist/esm/validations/evm-required-actions.js +9 -4
- package/dist/esm/validations/evm-required-actions.js.map +1 -1
- package/dist/esm/validations/evm-sign712-metamask.js +46 -2
- package/dist/esm/validations/evm-sign712-metamask.js.map +1 -1
- package/dist/esm/validations/intent.js +44 -10
- package/dist/esm/validations/intent.js.map +1 -1
- package/dist/esm/validations/solana-transaction.js +29 -4
- package/dist/esm/validations/solana-transaction.js.map +1 -1
- package/dist/esm/whitelists/environment-config.js +21 -0
- package/dist/esm/whitelists/environment-config.js.map +1 -1
- package/dist/esm/whitelists/types.js.map +1 -1
- package/dist/types/helpers/evm-action.d.ts.map +1 -1
- package/dist/types/helpers/expected-delegate.d.ts +7 -0
- package/dist/types/helpers/expected-delegate.d.ts.map +1 -0
- package/dist/types/types/validation.d.ts +1 -0
- package/dist/types/types/validation.d.ts.map +1 -1
- 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 +1 -1
- package/dist/types/validations/evm-sign712-metamask.d.ts.map +1 -1
- package/dist/types/validations/intent.d.ts.map +1 -1
- package/dist/types/validations/solana-transaction.d.ts.map +1 -1
- package/dist/types/whitelists/environment-config.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 +1 -1
|
@@ -36,6 +36,9 @@ function validateSolanaTransactionActions(actions, basePath, realChainId, quoteM
|
|
|
36
36
|
// Validates SignTransaction actions (AA=true)
|
|
37
37
|
function validateSolanaSignTransactionActions(actions, basePath, realChainId, quoteMode, srcChainAuthorityAddress, request, trades, responseTrades, envConfig) {
|
|
38
38
|
const violations = [];
|
|
39
|
+
const expectedDelegate = request.enableAccountAbstraction
|
|
40
|
+
? trades.find(t => t.srcAllowedSender !== undefined)?.srcAllowedSender
|
|
41
|
+
: undefined;
|
|
39
42
|
for (let i = 0; i < actions.length; i++) {
|
|
40
43
|
if (actions[i].type !== types_1.SolanaActionKind.SignTransaction)
|
|
41
44
|
continue;
|
|
@@ -49,7 +52,7 @@ function validateSolanaSignTransactionActions(actions, basePath, realChainId, qu
|
|
|
49
52
|
}
|
|
50
53
|
const accountKeys = getStaticAccountKeys(decoded.transaction);
|
|
51
54
|
const resolved = (0, solana_instruction_1.resolveInstructions)(decoded.transaction.message.compiledInstructions, accountKeys);
|
|
52
|
-
violations.push(...validateSignTransactionFeePayer(decoded.transaction, actionPath, realChainId, quoteMode, srcChainAuthorityAddress), ...validateAllowedInstructions(decoded.transaction, actionPath, envConfig.solanaSignTransactionAllowedPrograms, types_1.ViolationCode.SolanaSignTransactionForbiddenInstruction, "SignTransaction"), ...(0, solana_op_budget_1.validateSolanaBudgetInstructions)(action, resolved, actionPath, request, trades, responseTrades, realChainId, quoteMode, srcChainAuthorityAddress, envConfig), ...(0, solana_op_wrap_1.validateSolanaWrapInstructions)(action, resolved, actionPath, trades, responseTrades, realChainId, quoteMode, srcChainAuthorityAddress), ...validateNoUnclassifiedInstructions(resolved, actionPath, buildClassifiers(envConfig.solanaIntentProgram, solana_instruction_1.isMemo)));
|
|
55
|
+
violations.push(...validateSignTransactionFeePayer(decoded.transaction, actionPath, realChainId, quoteMode, srcChainAuthorityAddress, expectedDelegate), ...validateAllowedInstructions(decoded.transaction, actionPath, envConfig.solanaSignTransactionAllowedPrograms, types_1.ViolationCode.SolanaSignTransactionForbiddenInstruction, "SignTransaction"), ...(0, solana_op_budget_1.validateSolanaBudgetInstructions)(action, resolved, actionPath, request, trades, responseTrades, realChainId, quoteMode, srcChainAuthorityAddress, envConfig), ...(0, solana_op_wrap_1.validateSolanaWrapInstructions)(action, resolved, actionPath, trades, responseTrades, realChainId, quoteMode, srcChainAuthorityAddress), ...validateNoUnclassifiedInstructions(resolved, actionPath, buildClassifiers(envConfig.solanaIntentProgram, solana_instruction_1.isMemo)));
|
|
53
56
|
}
|
|
54
57
|
return violations;
|
|
55
58
|
}
|
|
@@ -168,24 +171,46 @@ function validateAllowedInstructions(transaction, actionPath, allowedPrograms, v
|
|
|
168
171
|
// =============================================
|
|
169
172
|
// SignTransaction-specific (AA=true)
|
|
170
173
|
// =============================================
|
|
171
|
-
//
|
|
172
|
-
|
|
174
|
+
// Two layered checks on the `SignTransaction` `feePayer`:
|
|
175
|
+
// (1) unconditional CRITICAL: `feePayer` must NOT be the user — guards
|
|
176
|
+
// against the API accidentally placing the user as gas payer.
|
|
177
|
+
// (2) scoped CRITICAL: when the request specifies `srcAllowedSender`
|
|
178
|
+
// on any trade in the group, `feePayer` must equal that delegate.
|
|
179
|
+
// When the request has no `srcAllowedSender`, the API substitutes
|
|
180
|
+
// its own per-chain delegate from config; we have no whitelist for
|
|
181
|
+
// that fallback, so the equality check is skipped.
|
|
182
|
+
function validateSignTransactionFeePayer(transaction, actionPath, realChainId, quoteMode, srcChainAuthorityAddress, expectedDelegate) {
|
|
173
183
|
// NO NEED (quote): feePayer is a placeholder
|
|
174
184
|
if (quoteMode || !srcChainAuthorityAddress)
|
|
175
185
|
return [];
|
|
176
186
|
const feePayer = getFeePayer(transaction);
|
|
177
187
|
if (!feePayer)
|
|
178
188
|
return [];
|
|
189
|
+
// (1) Unconditional: `feePayer` must not be the user.
|
|
179
190
|
if ((0, address_1.addressEquals)(realChainId, feePayer, srcChainAuthorityAddress)) {
|
|
180
191
|
return [{
|
|
181
192
|
code: types_1.ViolationCode.SolanaSignTransactionFeePayerIsUser,
|
|
182
|
-
// CRITICAL: feePayer must NOT be the user
|
|
193
|
+
// CRITICAL: `feePayer` must NOT be the user
|
|
183
194
|
message: "SignTransaction feePayer must NOT be the user"
|
|
184
195
|
+ " (request.trades[].srcChainAuthorityAddress)",
|
|
185
196
|
path: `${actionPath}.data.data`,
|
|
186
197
|
actual: feePayer,
|
|
187
198
|
}];
|
|
188
199
|
}
|
|
200
|
+
// (2) Scoped: when request explicitly pins the delegate, `feePayer`
|
|
201
|
+
// must match it exactly.
|
|
202
|
+
if (expectedDelegate !== undefined
|
|
203
|
+
&& !(0, address_1.addressEquals)(realChainId, feePayer, expectedDelegate)) {
|
|
204
|
+
return [{
|
|
205
|
+
code: types_1.ViolationCode.IntentDelegateMismatch,
|
|
206
|
+
// CRITICAL: `feePayer` must equal the user-controlled delegate
|
|
207
|
+
message: "SignTransaction feePayer must equal the delegate from"
|
|
208
|
+
+ " request.trades[].srcAllowedSender",
|
|
209
|
+
path: `${actionPath}.data.data`,
|
|
210
|
+
expected: expectedDelegate,
|
|
211
|
+
actual: feePayer,
|
|
212
|
+
}];
|
|
213
|
+
}
|
|
189
214
|
return [];
|
|
190
215
|
}
|
|
191
216
|
// Builds classifiers for validateNoUnclassifiedInstructions.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solana-transaction.js","sourceRoot":"","sources":["../../../src/validations/solana-transaction.ts"],"names":[],"mappings":";;AAsCA,4EA+EC;AAGD,
|
|
1
|
+
{"version":3,"file":"solana-transaction.js","sourceRoot":"","sources":["../../../src/validations/solana-transaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -59,6 +59,26 @@ const ALLOWANCE_HOLDER_BY_ENVIRONMENT = {
|
|
|
59
59
|
},
|
|
60
60
|
};
|
|
61
61
|
// =============================================
|
|
62
|
+
// EVM: Solver Executor
|
|
63
|
+
// =============================================
|
|
64
|
+
// Address the API uses as `intent.srcAllowedSender` on chains where its
|
|
65
|
+
// config has `solverExecutorAddress` set — independent of any request input.
|
|
66
|
+
const PROD_DEFAULT_SOLVER_EXECUTOR = "0xb7B10db9c7B978c48340994CB48829C4b3617B2F";
|
|
67
|
+
const PROD_EVM_CHAINS_WITH_SOLVER_EXECUTOR = [
|
|
68
|
+
enums_1.ChainId.Ethereum,
|
|
69
|
+
enums_1.ChainId.Optimism,
|
|
70
|
+
enums_1.ChainId.BNB,
|
|
71
|
+
enums_1.ChainId.Polygon,
|
|
72
|
+
enums_1.ChainId.Base,
|
|
73
|
+
enums_1.ChainId.Arbitrum,
|
|
74
|
+
enums_1.ChainId.Avalanche,
|
|
75
|
+
];
|
|
76
|
+
const EVM_SOLVER_EXECUTOR_BY_ENVIRONMENT = {
|
|
77
|
+
[validation_1.Environment.Prod]: (0, types_1.buildSameAddressMap)(PROD_EVM_CHAINS_WITH_SOLVER_EXECUTOR, PROD_DEFAULT_SOLVER_EXECUTOR),
|
|
78
|
+
[validation_1.Environment.Dubai]: {},
|
|
79
|
+
[validation_1.Environment.Hanoi]: {},
|
|
80
|
+
};
|
|
81
|
+
// =============================================
|
|
62
82
|
// EVM: Intent Manager
|
|
63
83
|
// =============================================
|
|
64
84
|
const PROD_DEFAULT_EVM_INTENT_MANAGER = "0xDDDDDDDdeB2E68Ee19832e356FCB5537124A9708";
|
|
@@ -126,6 +146,7 @@ function buildEnvironmentConfig(environment) {
|
|
|
126
146
|
return {
|
|
127
147
|
allowanceHolderContracts: ALLOWANCE_HOLDER_BY_ENVIRONMENT[environment],
|
|
128
148
|
intentManagerContracts: INTENT_MANAGER_BY_ENVIRONMENT[environment],
|
|
149
|
+
solverExecutorContracts: EVM_SOLVER_EXECUTOR_BY_ENVIRONMENT[environment],
|
|
129
150
|
solanaIntentProgram,
|
|
130
151
|
solanaAllowanceHolder: SOLANA_ALLOWANCE_HOLDER_BY_ENVIRONMENT[environment],
|
|
131
152
|
solanaTransactionAllowedPrograms: buildTransactionAllowedPrograms(solanaIntentProgram),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environment-config.js","sourceRoot":"","sources":["../../../src/whitelists/environment-config.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"environment-config.js","sourceRoot":"","sources":["../../../src/whitelists/environment-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/whitelists/types.ts"],"names":[],"mappings":";;AAgBA,kDASC;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/whitelists/types.ts"],"names":[],"mappings":";;AAgBA,kDASC;AAqBD,sCA6BC;AA3ED,gDAI4B;AAC5B,0CAAsD;AAStD,8EAA8E;AAC9E,gFAAgF;AAChF,SAAgB,mBAAmB,CAC/B,MAA0B,EAC1B,OAAe;IAEf,MAAM,GAAG,GAAoB,EAAE,CAAC;IAChC,KAAK,MAAM,OAAO,IAAI,MAAM,EAAE,CAAC;QAC3B,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC7B,CAAC;IACD,OAAO,GAAG,CAAC;AACf,CAAC;AAqBD,SAAgB,aAAa,CACzB,GAAoB,EACpB,OAAgB,EAChB,OAAe;IAEf,MAAM,MAAM,GAAG,IAAA,wBAAc,EAAC,OAAO,CAAC,CAAC;IAEvC,IAAI,MAAM,KAAK,mBAAW,CAAC,MAAM,EAAE,CAAC;QAChC,iEAAiE;QACjE,kFAAkF;QAClF,MAAM,IAAI,KAAK,CAAC,sEAAsE,CAAC,CAAC;IAC5F,CAAC;IAED,sCAAsC;IACtC,yGAAyG;IACzG,MAAM,aAAa,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC;IACnC,IAAI,aAAa,EAAE,CAAC;QAChB,MAAM,UAAU,GAAG,IAAA,0BAAgB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACtD,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,0BAAgB,EAAC,OAAO,EAAE,CAAC,CAAC,KAAK,UAAU,CAAC,CAAC;IAChF,CAAC;IAED,oCAAoC;IACpC,mEAAmE;IACnE,MAAM,QAAQ,GAAG,GAAG,CAAC,eAAO,CAAC,QAAQ,CAAC,CAAC;IACvC,IAAI,CAAC,QAAQ;QAAE,OAAO,KAAK,CAAC;IAE5B,MAAM,UAAU,GAAG,MAAM,KAAK,mBAAW,CAAC,IAAI,CAAC,CAAC,CAAC,IAAA,6BAAmB,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IACxF,MAAM,UAAU,GAAG,UAAU,CAAC,WAAW,EAAE,CAAC;IAC5C,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,KAAK,UAAU,CAAC,CAAC;AAC9D,CAAC"}
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
import { EvmActionKind } from "../types/index.js";
|
|
2
|
-
// Transaction and Sign712MetaMaskCaveats actions carry
|
|
3
|
-
// Sign712 (Permit/Permit2) and Sign7702Authorization do not.
|
|
2
|
+
// Transaction and Sign712MetaMaskCaveats(WithPlaceholders) actions carry
|
|
3
|
+
// transactionCalls; Sign712 (Permit/Permit2) and Sign7702Authorization do not.
|
|
4
4
|
export function actionUsesTransactionCalls(action) {
|
|
5
5
|
return action.type === EvmActionKind.Transaction
|
|
6
|
-
|| action.type === EvmActionKind.Sign712MetaMaskCaveats
|
|
6
|
+
|| action.type === EvmActionKind.Sign712MetaMaskCaveats
|
|
7
|
+
|| action.type === EvmActionKind.Sign712MetaMaskCaveatsWithPlaceholders;
|
|
7
8
|
}
|
|
8
9
|
// For Transaction-type actions (non-AA), the call is in action.data directly.
|
|
9
|
-
// For Sign712MetaMaskCaveats-type actions (AA), the calls
|
|
10
|
+
// For Sign712MetaMaskCaveats(WithPlaceholders)-type actions (AA), the calls
|
|
11
|
+
// are in details.transactionCalls.
|
|
10
12
|
export function getTransactionCalls(action) {
|
|
11
13
|
if (action.type === EvmActionKind.Transaction) {
|
|
12
14
|
return [action.data];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evm-action.js","sourceRoot":"","sources":["../../../src/helpers/evm-action.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyC,aAAa,EAAE,MAAM,UAAU,CAAC;AAEhF,yEAAyE;AACzE
|
|
1
|
+
{"version":3,"file":"evm-action.js","sourceRoot":"","sources":["../../../src/helpers/evm-action.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyC,aAAa,EAAE,MAAM,UAAU,CAAC;AAEhF,yEAAyE;AACzE,+EAA+E;AAC/E,MAAM,UAAU,0BAA0B,CAAC,MAAyB;IAChE,OAAO,MAAM,CAAC,IAAI,KAAK,aAAa,CAAC,WAAW;WACzC,MAAM,CAAC,IAAI,KAAK,aAAa,CAAC,sBAAsB;WACpD,MAAM,CAAC,IAAI,KAAK,aAAa,CAAC,sCAAsC,CAAC;AAChF,CAAC;AAED,8EAA8E;AAC9E,4EAA4E;AAC5E,mCAAmC;AACnC,MAAM,UAAU,mBAAmB,CAAC,MAAyB;IACzD,IAAI,MAAM,CAAC,IAAI,KAAK,aAAa,CAAC,WAAW,EAAE,CAAC;QAC5C,OAAO,CAAC,MAAM,CAAC,IAA0B,CAAC,CAAC;IAC/C,CAAC;IACD,OAAO,MAAM,CAAC,OAAO,EAAE,gBAAgB,IAAI,EAAE,CAAC;AAClD,CAAC"}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
// Helpers that derive the user-controlled `delegate` value for the scoped
|
|
2
|
+
// delegate validation. After the API split "solver executor" (who picks up
|
|
3
|
+
// the order) and "delegate" (who signs on the user's behalf), the user's
|
|
4
|
+
// `trade.srcAllowedSender` no longer lands in `intent.srcAllowedSender`.
|
|
5
|
+
// It surfaces in EVM `Sign712MetaMaskCaveats.data.message.delegate` and
|
|
6
|
+
// the Solana `SignTransaction` `feePayer` instead. These helpers return
|
|
7
|
+
// the value the validator should see in those fields — but only when the
|
|
8
|
+
// request itself specifies `srcAllowedSender`. Without a request-side
|
|
9
|
+
// value the API substitutes its own per-chain `delegateAddress` from
|
|
10
|
+
// config; we have no whitelist for that fallback, so the helpers return
|
|
11
|
+
// `undefined` and the caller skips the check.
|
|
12
|
+
// True when the API hardcodes `intent.srcAllowedSender` to a configured
|
|
13
|
+
// solver executor on this chain.
|
|
14
|
+
export function hasSolverExecutorOverride(solverExecutorContracts, chainId) {
|
|
15
|
+
return (solverExecutorContracts[chainId]?.length ?? 0) > 0;
|
|
16
|
+
}
|
|
17
|
+
// Expected `message.delegate` (EVM) / `feePayer` (Solana) for an
|
|
18
|
+
// intent-scope action. Returns the first `srcAllowedSender` set among
|
|
19
|
+
// the group's trades, or `undefined` when none of the trades specifies
|
|
20
|
+
// one — in that case the validator skips the check.
|
|
21
|
+
export function getExpectedIntentDelegate(trades) {
|
|
22
|
+
return trades
|
|
23
|
+
.map(t => t.srcAllowedSender)
|
|
24
|
+
.find((s) => s !== undefined);
|
|
25
|
+
}
|
|
26
|
+
// Expected `message.delegate` for a bundle-scope hook action. Returns the
|
|
27
|
+
// first `srcAllowedSender` from a trade whose `srcChainId` matches the
|
|
28
|
+
// hook's chain (the API picks the first matching-chain trade). Returns
|
|
29
|
+
// `undefined` when no such trade exists.
|
|
30
|
+
export function getExpectedBundleHookDelegate(trades, hookSubscriptionId) {
|
|
31
|
+
for (const trade of trades) {
|
|
32
|
+
if (trade.srcChainId === hookSubscriptionId
|
|
33
|
+
&& trade.srcAllowedSender !== undefined) {
|
|
34
|
+
return trade.srcAllowedSender;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
return undefined;
|
|
38
|
+
}
|
|
39
|
+
//# sourceMappingURL=expected-delegate.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"expected-delegate.js","sourceRoot":"","sources":["../../../src/helpers/expected-delegate.ts"],"names":[],"mappings":"AAAA,0EAA0E;AAC1E,2EAA2E;AAC3E,yEAAyE;AACzE,yEAAyE;AACzE,wEAAwE;AACxE,wEAAwE;AACxE,yEAAyE;AACzE,sEAAsE;AACtE,qEAAqE;AACrE,wEAAwE;AACxE,8CAA8C;AAM9C,wEAAwE;AACxE,iCAAiC;AACjC,MAAM,UAAU,yBAAyB,CACrC,uBAAwC,EACxC,OAAgB;IAEhB,OAAO,CAAC,uBAAuB,CAAC,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;AAC/D,CAAC;AAED,iEAAiE;AACjE,sEAAsE;AACtE,uEAAuE;AACvE,oDAAoD;AACpD,MAAM,UAAU,yBAAyB,CACrC,MAA+B;IAE/B,OAAO,MAAM;SACR,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC;SAC5B,IAAI,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC;AACnD,CAAC;AAED,0EAA0E;AAC1E,uEAAuE;AACvE,uEAAuE;AACvE,yCAAyC;AACzC,MAAM,UAAU,6BAA6B,CACzC,MAA+B,EAC/B,kBAA0B;IAE1B,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QACzB,IACI,KAAK,CAAC,UAAU,KAAK,kBAAkB;eACpC,KAAK,CAAC,gBAAgB,KAAK,SAAS,EACzC,CAAC;YACC,OAAO,KAAK,CAAC,gBAAgB,CAAC;QAClC,CAAC;IACL,CAAC;IACD,OAAO,SAAS,CAAC;AACrB,CAAC"}
|
|
@@ -162,6 +162,7 @@ export var ViolationCode;
|
|
|
162
162
|
ViolationCode["IntentAuthorityMismatch"] = "INTENT_AUTHORITY_MISMATCH";
|
|
163
163
|
ViolationCode["IntentAllowedCancelBeneficiaryMismatch"] = "INTENT_ALLOWED_CANCEL_BENEFICIARY_MISMATCH";
|
|
164
164
|
ViolationCode["IntentSrcAllowedSenderMismatch"] = "INTENT_SRC_ALLOWED_SENDER_MISMATCH";
|
|
165
|
+
ViolationCode["IntentDelegateMismatch"] = "INTENT_DELEGATE_MISMATCH";
|
|
165
166
|
ViolationCode["IntentInputTokenAddressMismatch"] = "INTENT_INPUT_TOKEN_ADDRESS_MISMATCH";
|
|
166
167
|
ViolationCode["IntentInputTokenMissing"] = "INTENT_INPUT_TOKEN_MISSING";
|
|
167
168
|
ViolationCode["IntentInputTokenDuplicate"] = "INTENT_INPUT_TOKEN_DUPLICATE";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../src/types/validation.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,
|
|
1
|
+
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../src/types/validation.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import { HookMode, resolveEagerPlaceholders } from "../helpers/placeholder.js";
|
|
|
3
3
|
import { extractGasCompensationGroups } from "../helpers/gas-compensation.js";
|
|
4
4
|
import { validateEvmGasCompensationTx } from "../helpers/evm-gas-compensation-tx.js";
|
|
5
5
|
import { addressEquals } from "../helpers/address.js";
|
|
6
|
+
import { getExpectedBundleHookDelegate } from "../helpers/expected-delegate.js";
|
|
6
7
|
import { validateSign7702Action } from "./evm-sign7702.js";
|
|
7
8
|
import { validateSign712DataPresent, validateSign712Domain, validateSign712Delegator, validateSign712Caveats, } from "./evm-sign712-shared.js";
|
|
8
9
|
const SIGN712_HOOK_TYPES = [
|
|
@@ -20,7 +21,13 @@ export function validateEvmHookActions(hookPayload, requestHook, basePath, mode,
|
|
|
20
21
|
violations.push(...validateDirectEvmHookActions(hookPayload, requestHook, basePath));
|
|
21
22
|
}
|
|
22
23
|
else { // BundleHookType.Delegated (default)
|
|
23
|
-
|
|
24
|
+
// Scoped delegate check: only when AA is on and a matching-chain
|
|
25
|
+
// trade specifies `srcAllowedSender`. Otherwise the API substitutes
|
|
26
|
+
// its own fallback delegate (no whitelist) → skip.
|
|
27
|
+
const expectedDelegate = request.enableAccountAbstraction
|
|
28
|
+
? getExpectedBundleHookDelegate(request.trades, hookPayload.hook.chainId)
|
|
29
|
+
: undefined;
|
|
30
|
+
violations.push(...validateDelegatedEvmHookActions(hookPayload, requestHook, basePath, realChainId, request.expirationTimestamp, expectedDelegate));
|
|
24
31
|
}
|
|
25
32
|
violations.push(...validateHookActionCalldata(hookPayload, requestHook, basePath, mode, responseTrades, realChainId));
|
|
26
33
|
violations.push(...validateHookActionTransactionCallsMatch(hookPayload, basePath));
|
|
@@ -99,7 +106,7 @@ function validateDirectAction(action, expectsTransaction, hookChainId, expectedD
|
|
|
99
106
|
// `Sign712MetaMaskCaveatsWithPlaceholders` (when at least one deferred
|
|
100
107
|
// placeholder is declared). transactionCalls form, placeholders match, and
|
|
101
108
|
// EIP-712 content checks (domain, delegator, caveats) are checked per-action below.
|
|
102
|
-
function validateDelegatedEvmHookActions(hookPayload, requestHook, basePath, realChainId, expirationTimestamp) {
|
|
109
|
+
function validateDelegatedEvmHookActions(hookPayload, requestHook, basePath, realChainId, expirationTimestamp, expectedDelegate) {
|
|
103
110
|
const violations = [];
|
|
104
111
|
const expectedDeferred = collectDeferredPlaceholders(requestHook);
|
|
105
112
|
const hasDeferred = expectedDeferred.length > 0;
|
|
@@ -111,7 +118,11 @@ function validateDelegatedEvmHookActions(hookPayload, requestHook, basePath, rea
|
|
|
111
118
|
hookFrom: hookPayload.hook.from,
|
|
112
119
|
realChainId,
|
|
113
120
|
expirationTimestamp,
|
|
121
|
+
expectedDelegate,
|
|
114
122
|
};
|
|
123
|
+
// Collected `message.delegate` values across all delegated actions in this
|
|
124
|
+
// hook — checked for cross-action consistency after the loop.
|
|
125
|
+
const observedDelegates = [];
|
|
115
126
|
for (let i = 0; i < hookPayload.requiredActions.length; i++) {
|
|
116
127
|
const action = hookPayload.requiredActions[i];
|
|
117
128
|
const actionPath = `${basePath}.requiredActions[${i}]`;
|
|
@@ -119,11 +130,29 @@ function validateDelegatedEvmHookActions(hookPayload, requestHook, basePath, rea
|
|
|
119
130
|
// `validateHookSign7702Binding`.
|
|
120
131
|
if (action.actions.includes(EvmActionOperation.Delegate))
|
|
121
132
|
continue;
|
|
122
|
-
violations.push(...validateDelegatedAction(action, actionPath, ctx));
|
|
133
|
+
violations.push(...validateDelegatedAction(action, actionPath, ctx, observedDelegates));
|
|
134
|
+
}
|
|
135
|
+
// CRITICAL: all delegated actions within one hook must share the same
|
|
136
|
+
// `message.delegate` value.
|
|
137
|
+
if (observedDelegates.length > 1) {
|
|
138
|
+
const first = observedDelegates[0];
|
|
139
|
+
for (let i = 1; i < observedDelegates.length; i++) {
|
|
140
|
+
const candidate = observedDelegates[i];
|
|
141
|
+
if (!addressEquals(realChainId, candidate.value, first.value)) {
|
|
142
|
+
violations.push({
|
|
143
|
+
code: ViolationCode.IntentDelegateMismatch,
|
|
144
|
+
message: "Sign712MetaMaskCaveats message.delegate differs between"
|
|
145
|
+
+ " actions in the same hook — all must share one delegate",
|
|
146
|
+
path: candidate.path,
|
|
147
|
+
expected: first.value,
|
|
148
|
+
actual: candidate.value,
|
|
149
|
+
});
|
|
150
|
+
}
|
|
151
|
+
}
|
|
123
152
|
}
|
|
124
153
|
return violations;
|
|
125
154
|
}
|
|
126
|
-
function validateDelegatedAction(action, actionPath, ctx) {
|
|
155
|
+
function validateDelegatedAction(action, actionPath, ctx, observedDelegates) {
|
|
127
156
|
if (action.type !== ctx.expectedType) {
|
|
128
157
|
return [{
|
|
129
158
|
code: ViolationCode.HookDelegatedActionTypeInvalid,
|
|
@@ -145,6 +174,33 @@ function validateDelegatedAction(action, actionPath, ctx) {
|
|
|
145
174
|
return violations;
|
|
146
175
|
}
|
|
147
176
|
violations.push(...validateSign712Domain(data, actionPath, ctx.realChainId), ...validateSign712Delegator(data, actionPath, ctx.realChainId, ctx.hookFrom, "hook.from"));
|
|
177
|
+
// Scoped delegate check: applies only when the request explicitly
|
|
178
|
+
// pinned a delegate via `trade.srcAllowedSender` on a matching-chain
|
|
179
|
+
// trade (caller set `ctx.expectedDelegate`). Otherwise the API
|
|
180
|
+
// substitutes its own fallback delegate, for which we have no
|
|
181
|
+
// whitelist — the check is skipped.
|
|
182
|
+
if (ctx.expectedDelegate !== undefined) {
|
|
183
|
+
const actualDelegate = data.message.delegate;
|
|
184
|
+
if (typeof actualDelegate === "string") {
|
|
185
|
+
observedDelegates.push({
|
|
186
|
+
value: actualDelegate,
|
|
187
|
+
path: `${actionPath}.data.message.delegate`,
|
|
188
|
+
});
|
|
189
|
+
if (!addressEquals(ctx.realChainId, actualDelegate, ctx.expectedDelegate)) {
|
|
190
|
+
violations.push({
|
|
191
|
+
// CRITICAL: bundle-scope hook message.delegate must equal
|
|
192
|
+
// the user-controlled delegate.
|
|
193
|
+
code: ViolationCode.IntentDelegateMismatch,
|
|
194
|
+
message: "Delegated hook Sign712MetaMaskCaveats message.delegate"
|
|
195
|
+
+ " must equal request.trades[].srcAllowedSender"
|
|
196
|
+
+ " of a matching-chain trade",
|
|
197
|
+
path: `${actionPath}.data.message.delegate`,
|
|
198
|
+
expected: ctx.expectedDelegate,
|
|
199
|
+
actual: actualDelegate,
|
|
200
|
+
});
|
|
201
|
+
}
|
|
202
|
+
}
|
|
203
|
+
}
|
|
148
204
|
const caveats = (data.message.caveats ?? []);
|
|
149
205
|
const txCalls = action.details?.transactionCalls ?? [];
|
|
150
206
|
violations.push(...validateSign712Caveats(caveats, action.actionId, txCalls, actionPath, ctx.realChainId, ctx.expirationTimestamp));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evm-op-hook.js","sourceRoot":"","sources":["../../../src/validations/evm-op-hook.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"evm-op-hook.js","sourceRoot":"","sources":["../../../src/validations/evm-op-hook.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,12 +8,16 @@ import { validateTransactionActions } from "./evm-transaction.js";
|
|
|
8
8
|
import { validateBudgetOperations } from "./evm-op-budget.js";
|
|
9
9
|
import { validateWrapOperations } from "./evm-op-wrap.js";
|
|
10
10
|
import { normalizeAddress } from "../helpers/address.js";
|
|
11
|
+
import { getExpectedIntentDelegate } from "../helpers/expected-delegate.js";
|
|
11
12
|
export function validateEvmRequiredActions(request, response, actions, basePath, realChainId, quoteMode, intent, trades, responseTrades, srcChainAuthorityAddress, envConfig) {
|
|
13
|
+
const expectedDelegate = request.enableAccountAbstraction
|
|
14
|
+
? getExpectedIntentDelegate(trades)
|
|
15
|
+
: undefined;
|
|
12
16
|
return [
|
|
13
17
|
...validateUniqueActionIds(actions, basePath),
|
|
14
18
|
...validateAAConstraints(request, response, actions, basePath),
|
|
15
19
|
...validateSign7702Actions(actions, basePath, realChainId),
|
|
16
|
-
...validateSign712MetaMaskActions(actions, basePath, realChainId, quoteMode, request.expirationTimestamp, srcChainAuthorityAddress),
|
|
20
|
+
...validateSign712MetaMaskActions(actions, basePath, realChainId, quoteMode, request.expirationTimestamp, srcChainAuthorityAddress, expectedDelegate),
|
|
17
21
|
// Sign712 Intent check is skipped in quote mode
|
|
18
22
|
...(quoteMode ? [] : validateSign712IntentActions(actions, basePath, realChainId, intent, envConfig)),
|
|
19
23
|
...validatePermitActions(actions, basePath, request, response, realChainId, quoteMode, trades, srcChainAuthorityAddress, envConfig),
|
|
@@ -85,11 +89,12 @@ function validateAADisabled(_response, actions, basePath) {
|
|
|
85
89
|
actual: action.type,
|
|
86
90
|
});
|
|
87
91
|
}
|
|
88
|
-
// CRITICAL: no Sign712MetaMaskCaveats
|
|
89
|
-
if (action.type === EvmActionKind.Sign712MetaMaskCaveats
|
|
92
|
+
// CRITICAL: no Sign712MetaMaskCaveats / Sign712MetaMaskCaveatsWithPlaceholders
|
|
93
|
+
if (action.type === EvmActionKind.Sign712MetaMaskCaveats
|
|
94
|
+
|| action.type === EvmActionKind.Sign712MetaMaskCaveatsWithPlaceholders) {
|
|
90
95
|
violations.push({
|
|
91
96
|
code: ViolationCode.ForbiddenSign712MetaMaskWithoutAA,
|
|
92
|
-
message: `${
|
|
97
|
+
message: `${action.type} action is forbidden when enableAccountAbstraction=false`,
|
|
93
98
|
path: `${actionPath}.type`,
|
|
94
99
|
actual: action.type,
|
|
95
100
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evm-required-actions.js","sourceRoot":"","sources":["../../../src/validations/evm-required-actions.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,aAAa,EAIb,aAAa,EACb,kBAAkB,GAKrB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,8BAA8B,EAAE,MAAM,wBAAwB,CAAC;AACxE,OAAO,EAAE,4BAA4B,EAAE,MAAM,eAAe,CAAC;AAC7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"evm-required-actions.js","sourceRoot":"","sources":["../../../src/validations/evm-required-actions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,21 @@
|
|
|
1
1
|
import { ViolationCode, EvmActionKind, EvmActionOperation, } from "../types/index.js";
|
|
2
2
|
import { validateSign712DataPresent, validateSign712Domain, validateSign712Delegator, validateSign712Caveats, } from "./evm-sign712-shared.js";
|
|
3
|
+
import { addressEquals } from "../helpers/address.js";
|
|
3
4
|
const SIGN712_METAMASK_ALLOWED_ACTIONS = [
|
|
4
5
|
EvmActionOperation.Budget,
|
|
5
6
|
EvmActionOperation.Wrap,
|
|
6
7
|
EvmActionOperation.Hook,
|
|
7
8
|
EvmActionOperation.GasCompensation,
|
|
8
9
|
];
|
|
9
|
-
export function validateSign712MetaMaskActions(actions, basePath, realChainId, quoteMode, expirationTimestamp, srcChainAuthorityAddress) {
|
|
10
|
+
export function validateSign712MetaMaskActions(actions, basePath, realChainId, quoteMode, expirationTimestamp, srcChainAuthorityAddress, expectedDelegate) {
|
|
10
11
|
const violations = [];
|
|
12
|
+
// Collected `message.delegate` values across all Sign712MetaMask actions
|
|
13
|
+
// within this intent — checked for cross-action consistency after the loop.
|
|
14
|
+
const observedDelegates = [];
|
|
11
15
|
for (let i = 0; i < actions.length; i++) {
|
|
12
16
|
const action = actions[i];
|
|
13
|
-
if (action.type !== EvmActionKind.Sign712MetaMaskCaveats
|
|
17
|
+
if (action.type !== EvmActionKind.Sign712MetaMaskCaveats
|
|
18
|
+
&& action.type !== EvmActionKind.Sign712MetaMaskCaveatsWithPlaceholders)
|
|
14
19
|
continue;
|
|
15
20
|
const actionPath = `${basePath}.requiredActions[${i}]`;
|
|
16
21
|
const data = action.data;
|
|
@@ -29,10 +34,49 @@ export function validateSign712MetaMaskActions(actions, basePath, realChainId, q
|
|
|
29
34
|
...(quoteMode
|
|
30
35
|
? []
|
|
31
36
|
: validateSign712Delegator(data, actionPath, realChainId, srcChainAuthorityAddress, "srcChainAuthorityAddress")));
|
|
37
|
+
// Scoped delegate check: applies only when the request pinned a
|
|
38
|
+
// delegate via `trade.srcAllowedSender`. Skipped in quote mode
|
|
39
|
+
// (delegate not derivable from placeholders) and on non-AA flows
|
|
40
|
+
// (caller passes `expectedDelegate === undefined`).
|
|
41
|
+
if (!quoteMode && expectedDelegate !== undefined) {
|
|
42
|
+
const actualDelegate = data.message.delegate;
|
|
43
|
+
if (typeof actualDelegate === "string") {
|
|
44
|
+
observedDelegates.push({ value: actualDelegate, path: `${actionPath}.data.message.delegate` });
|
|
45
|
+
if (!addressEquals(realChainId, actualDelegate, expectedDelegate)) {
|
|
46
|
+
violations.push({
|
|
47
|
+
// CRITICAL: message.delegate must equal expected delegate
|
|
48
|
+
code: ViolationCode.IntentDelegateMismatch,
|
|
49
|
+
message: "Sign712MetaMaskCaveats message.delegate must equal"
|
|
50
|
+
+ " request.trades[].srcAllowedSender",
|
|
51
|
+
path: `${actionPath}.data.message.delegate`,
|
|
52
|
+
expected: expectedDelegate,
|
|
53
|
+
actual: actualDelegate,
|
|
54
|
+
});
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
}
|
|
32
58
|
const caveats = (data.message.caveats ?? []);
|
|
33
59
|
const txCalls = action.details?.transactionCalls ?? [];
|
|
34
60
|
violations.push(...validateSign712Caveats(caveats, action.actionId, txCalls, actionPath, realChainId, expirationTimestamp));
|
|
35
61
|
}
|
|
62
|
+
// CRITICAL: all Sign712MetaMask actions within one intent must share the
|
|
63
|
+
// same `message.delegate` value.
|
|
64
|
+
if (observedDelegates.length > 1) {
|
|
65
|
+
const first = observedDelegates[0];
|
|
66
|
+
for (let i = 1; i < observedDelegates.length; i++) {
|
|
67
|
+
const candidate = observedDelegates[i];
|
|
68
|
+
if (!addressEquals(realChainId, candidate.value, first.value)) {
|
|
69
|
+
violations.push({
|
|
70
|
+
code: ViolationCode.IntentDelegateMismatch,
|
|
71
|
+
message: "Sign712MetaMaskCaveats message.delegate differs between"
|
|
72
|
+
+ " actions in the same intent — all must share one delegate",
|
|
73
|
+
path: candidate.path,
|
|
74
|
+
expected: first.value,
|
|
75
|
+
actual: candidate.value,
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
}
|
|
36
80
|
return violations;
|
|
37
81
|
}
|
|
38
82
|
// CRITICAL: transactionCalls must have at least one element
|