@debridge-finance/borderless-validation-sdk 0.3.0 → 0.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +120 -11
- package/dist/cjs/graylists/evm/token-permit-metadata.js +7 -1
- package/dist/cjs/graylists/evm/token-permit-metadata.js.map +1 -1
- package/dist/cjs/helpers/address.js +152 -60
- package/dist/cjs/helpers/address.js.map +1 -1
- package/dist/cjs/helpers/amount.js +8 -0
- package/dist/cjs/helpers/amount.js.map +1 -0
- package/dist/cjs/helpers/evm-dln-hook-pack.js +16 -4
- package/dist/cjs/helpers/evm-dln-hook-pack.js.map +1 -1
- package/dist/cjs/helpers/evm-gas-compensation-tx.js +11 -26
- package/dist/cjs/helpers/evm-gas-compensation-tx.js.map +1 -1
- package/dist/cjs/helpers/evm-intent-id-abi.js +8 -1
- package/dist/cjs/helpers/evm-intent-id-abi.js.map +1 -1
- package/dist/cjs/helpers/evm-trade-amounts.js +11 -3
- package/dist/cjs/helpers/evm-trade-amounts.js.map +1 -1
- package/dist/cjs/helpers/expected-delegate.js +2 -6
- package/dist/cjs/helpers/expected-delegate.js.map +1 -1
- package/dist/cjs/helpers/gas-compensation.js +8 -4
- package/dist/cjs/helpers/gas-compensation.js.map +1 -1
- package/dist/cjs/helpers/interactions.js +4 -20
- package/dist/cjs/helpers/interactions.js.map +1 -1
- package/dist/cjs/helpers/synthetic-native-wrap.js +3 -2
- package/dist/cjs/helpers/synthetic-native-wrap.js.map +1 -1
- package/dist/cjs/types/enums.js +1 -0
- package/dist/cjs/types/enums.js.map +1 -1
- package/dist/cjs/types/request.js +15 -2
- package/dist/cjs/types/request.js.map +1 -1
- package/dist/cjs/types/response.js +2 -1
- package/dist/cjs/types/response.js.map +1 -1
- package/dist/cjs/types/validation.js +21 -3
- package/dist/cjs/types/validation.js.map +1 -1
- package/dist/cjs/validations/compensation-hook.js +4 -5
- package/dist/cjs/validations/compensation-hook.js.map +1 -1
- package/dist/cjs/validations/cost-token.js +9 -1
- package/dist/cjs/validations/cost-token.js.map +1 -1
- package/dist/cjs/validations/echo-fields.js +18 -0
- package/dist/cjs/validations/echo-fields.js.map +1 -1
- package/dist/cjs/validations/evm-caveats.js +3 -0
- package/dist/cjs/validations/evm-caveats.js.map +1 -1
- package/dist/cjs/validations/evm-on-chain-intent.js +150 -0
- package/dist/cjs/validations/evm-on-chain-intent.js.map +1 -0
- package/dist/cjs/validations/evm-op-budget.js +23 -3
- package/dist/cjs/validations/evm-op-budget.js.map +1 -1
- package/dist/cjs/validations/evm-op-hook.js +6 -6
- package/dist/cjs/validations/evm-op-hook.js.map +1 -1
- package/dist/cjs/validations/evm-permit.js +17 -6
- package/dist/cjs/validations/evm-permit.js.map +1 -1
- package/dist/cjs/validations/evm-permit2.js +14 -6
- package/dist/cjs/validations/evm-permit2.js.map +1 -1
- package/dist/cjs/validations/evm-required-actions.js +26 -7
- package/dist/cjs/validations/evm-required-actions.js.map +1 -1
- package/dist/cjs/validations/evm-sign712-metamask.js +3 -126
- package/dist/cjs/validations/evm-sign712-metamask.js.map +1 -1
- package/dist/cjs/validations/evm-sign712-shared.js +127 -0
- package/dist/cjs/validations/evm-sign712-shared.js.map +1 -1
- package/dist/cjs/validations/evm-sign712.js +18 -2
- package/dist/cjs/validations/evm-sign712.js.map +1 -1
- package/dist/cjs/validations/evm-sign7702.js +2 -0
- package/dist/cjs/validations/evm-sign7702.js.map +1 -1
- package/dist/cjs/validations/evm-transaction.js +7 -1
- package/dist/cjs/validations/evm-transaction.js.map +1 -1
- package/dist/cjs/validations/external-call.js +9 -20
- package/dist/cjs/validations/external-call.js.map +1 -1
- package/dist/cjs/validations/hook-version.js +35 -0
- package/dist/cjs/validations/hook-version.js.map +1 -0
- package/dist/cjs/validations/hooks-common.js +74 -199
- package/dist/cjs/validations/hooks-common.js.map +1 -1
- package/dist/cjs/validations/intent-destinations.js +52 -50
- package/dist/cjs/validations/intent-destinations.js.map +1 -1
- package/dist/cjs/validations/intent-tokens.js +319 -79
- package/dist/cjs/validations/intent-tokens.js.map +1 -1
- package/dist/cjs/validations/intent.js +34 -26
- package/dist/cjs/validations/intent.js.map +1 -1
- package/dist/cjs/validations/max-reserved.js +54 -0
- package/dist/cjs/validations/max-reserved.js.map +1 -0
- package/dist/cjs/validations/on-chain-intent-submission.js +70 -0
- package/dist/cjs/validations/on-chain-intent-submission.js.map +1 -0
- package/dist/cjs/validations/ptp.js +9 -6
- package/dist/cjs/validations/ptp.js.map +1 -1
- package/dist/cjs/validations/refill.js +11 -5
- package/dist/cjs/validations/refill.js.map +1 -1
- package/dist/cjs/validations/solana-hook.js +12 -54
- package/dist/cjs/validations/solana-hook.js.map +1 -1
- package/dist/cjs/validations/solana-op-budget.js +1 -1
- package/dist/cjs/validations/solana-op-budget.js.map +1 -1
- package/dist/cjs/validations/solana-op-wrap.js +29 -47
- package/dist/cjs/validations/solana-op-wrap.js.map +1 -1
- package/dist/cjs/validations/solana-required-actions.js +2 -2
- package/dist/cjs/validations/solana-required-actions.js.map +1 -1
- package/dist/cjs/validations/solana-transaction.js +4 -53
- package/dist/cjs/validations/solana-transaction.js.map +1 -1
- package/dist/cjs/validations/total-dst-amount.js +19 -3
- package/dist/cjs/validations/total-dst-amount.js.map +1 -1
- package/dist/cjs/validations/trade-grouping.js +35 -9
- package/dist/cjs/validations/trade-grouping.js.map +1 -1
- package/dist/cjs/validations/trade-matching.js +1 -1
- package/dist/cjs/validations/trade-matching.js.map +1 -1
- package/dist/cjs/validations/trades.js +29 -9
- package/dist/cjs/validations/trades.js.map +1 -1
- package/dist/cjs/validator.js +28 -17
- package/dist/cjs/validator.js.map +1 -1
- package/dist/cjs/whitelists/environment-config.js +143 -182
- package/dist/cjs/whitelists/environment-config.js.map +1 -1
- package/dist/cjs/whitelists/types.js +2 -5
- package/dist/cjs/whitelists/types.js.map +1 -1
- package/dist/esm/graylists/evm/token-permit-metadata.js +7 -1
- package/dist/esm/graylists/evm/token-permit-metadata.js.map +1 -1
- package/dist/esm/helpers/address.js +146 -59
- package/dist/esm/helpers/address.js.map +1 -1
- package/dist/esm/helpers/amount.js +5 -0
- package/dist/esm/helpers/amount.js.map +1 -0
- package/dist/esm/helpers/evm-dln-hook-pack.js +15 -4
- package/dist/esm/helpers/evm-dln-hook-pack.js.map +1 -1
- package/dist/esm/helpers/evm-gas-compensation-tx.js +12 -27
- package/dist/esm/helpers/evm-gas-compensation-tx.js.map +1 -1
- package/dist/esm/helpers/evm-intent-id-abi.js +7 -0
- package/dist/esm/helpers/evm-intent-id-abi.js.map +1 -1
- package/dist/esm/helpers/evm-trade-amounts.js +12 -4
- package/dist/esm/helpers/evm-trade-amounts.js.map +1 -1
- package/dist/esm/helpers/expected-delegate.js +2 -6
- package/dist/esm/helpers/expected-delegate.js.map +1 -1
- package/dist/esm/helpers/gas-compensation.js +9 -5
- package/dist/esm/helpers/gas-compensation.js.map +1 -1
- package/dist/esm/helpers/interactions.js +5 -21
- package/dist/esm/helpers/interactions.js.map +1 -1
- package/dist/esm/helpers/synthetic-native-wrap.js +4 -3
- package/dist/esm/helpers/synthetic-native-wrap.js.map +1 -1
- package/dist/esm/types/enums.js +1 -0
- package/dist/esm/types/enums.js.map +1 -1
- package/dist/esm/types/request.js +15 -2
- package/dist/esm/types/request.js.map +1 -1
- package/dist/esm/types/response.js +3 -2
- package/dist/esm/types/response.js.map +1 -1
- package/dist/esm/types/validation.js +21 -3
- package/dist/esm/types/validation.js.map +1 -1
- package/dist/esm/validations/compensation-hook.js +4 -5
- package/dist/esm/validations/compensation-hook.js.map +1 -1
- package/dist/esm/validations/cost-token.js +9 -1
- package/dist/esm/validations/cost-token.js.map +1 -1
- package/dist/esm/validations/echo-fields.js +18 -0
- package/dist/esm/validations/echo-fields.js.map +1 -1
- package/dist/esm/validations/evm-caveats.js +3 -0
- package/dist/esm/validations/evm-caveats.js.map +1 -1
- package/dist/esm/validations/evm-on-chain-intent.js +147 -0
- package/dist/esm/validations/evm-on-chain-intent.js.map +1 -0
- package/dist/esm/validations/evm-op-budget.js +25 -5
- package/dist/esm/validations/evm-op-budget.js.map +1 -1
- package/dist/esm/validations/evm-op-hook.js +8 -8
- package/dist/esm/validations/evm-op-hook.js.map +1 -1
- package/dist/esm/validations/evm-permit.js +18 -7
- package/dist/esm/validations/evm-permit.js.map +1 -1
- package/dist/esm/validations/evm-permit2.js +15 -7
- package/dist/esm/validations/evm-permit2.js.map +1 -1
- package/dist/esm/validations/evm-required-actions.js +28 -9
- package/dist/esm/validations/evm-required-actions.js.map +1 -1
- package/dist/esm/validations/evm-sign712-metamask.js +4 -126
- package/dist/esm/validations/evm-sign712-metamask.js.map +1 -1
- package/dist/esm/validations/evm-sign712-shared.js +126 -1
- package/dist/esm/validations/evm-sign712-shared.js.map +1 -1
- package/dist/esm/validations/evm-sign712.js +17 -2
- package/dist/esm/validations/evm-sign712.js.map +1 -1
- package/dist/esm/validations/evm-sign7702.js +2 -0
- package/dist/esm/validations/evm-sign7702.js.map +1 -1
- package/dist/esm/validations/evm-transaction.js +7 -1
- package/dist/esm/validations/evm-transaction.js.map +1 -1
- package/dist/esm/validations/external-call.js +10 -21
- package/dist/esm/validations/external-call.js.map +1 -1
- package/dist/esm/validations/hook-version.js +31 -0
- package/dist/esm/validations/hook-version.js.map +1 -0
- package/dist/esm/validations/hooks-common.js +75 -200
- package/dist/esm/validations/hooks-common.js.map +1 -1
- package/dist/esm/validations/intent-destinations.js +53 -51
- package/dist/esm/validations/intent-destinations.js.map +1 -1
- package/dist/esm/validations/intent-tokens.js +320 -80
- package/dist/esm/validations/intent-tokens.js.map +1 -1
- package/dist/esm/validations/intent.js +34 -26
- package/dist/esm/validations/intent.js.map +1 -1
- package/dist/esm/validations/max-reserved.js +51 -0
- package/dist/esm/validations/max-reserved.js.map +1 -0
- package/dist/esm/validations/on-chain-intent-submission.js +67 -0
- package/dist/esm/validations/on-chain-intent-submission.js.map +1 -0
- package/dist/esm/validations/ptp.js +9 -6
- package/dist/esm/validations/ptp.js.map +1 -1
- package/dist/esm/validations/refill.js +11 -5
- package/dist/esm/validations/refill.js.map +1 -1
- package/dist/esm/validations/solana-hook.js +12 -54
- package/dist/esm/validations/solana-hook.js.map +1 -1
- package/dist/esm/validations/solana-op-budget.js +1 -1
- package/dist/esm/validations/solana-op-budget.js.map +1 -1
- package/dist/esm/validations/solana-op-wrap.js +30 -48
- package/dist/esm/validations/solana-op-wrap.js.map +1 -1
- package/dist/esm/validations/solana-required-actions.js +2 -2
- package/dist/esm/validations/solana-required-actions.js.map +1 -1
- package/dist/esm/validations/solana-transaction.js +4 -53
- package/dist/esm/validations/solana-transaction.js.map +1 -1
- package/dist/esm/validations/total-dst-amount.js +20 -4
- package/dist/esm/validations/total-dst-amount.js.map +1 -1
- package/dist/esm/validations/trade-grouping.js +35 -10
- package/dist/esm/validations/trade-grouping.js.map +1 -1
- package/dist/esm/validations/trade-matching.js +1 -1
- package/dist/esm/validations/trade-matching.js.map +1 -1
- package/dist/esm/validations/trades.js +29 -9
- package/dist/esm/validations/trades.js.map +1 -1
- package/dist/esm/validator.js +28 -17
- package/dist/esm/validator.js.map +1 -1
- package/dist/esm/whitelists/environment-config.js +144 -183
- package/dist/esm/whitelists/environment-config.js.map +1 -1
- package/dist/esm/whitelists/types.js +3 -6
- package/dist/esm/whitelists/types.js.map +1 -1
- package/dist/types/graylists/evm/token-permit-metadata.d.ts.map +1 -1
- package/dist/types/helpers/address.d.ts +10 -5
- package/dist/types/helpers/address.d.ts.map +1 -1
- package/dist/types/helpers/amount.d.ts +2 -0
- package/dist/types/helpers/amount.d.ts.map +1 -0
- package/dist/types/helpers/evm-dln-hook-pack.d.ts +1 -0
- package/dist/types/helpers/evm-dln-hook-pack.d.ts.map +1 -1
- package/dist/types/helpers/evm-gas-compensation-tx.d.ts +1 -3
- package/dist/types/helpers/evm-gas-compensation-tx.d.ts.map +1 -1
- package/dist/types/helpers/evm-intent-id-abi.d.ts +111 -0
- package/dist/types/helpers/evm-intent-id-abi.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/interactions.d.ts.map +1 -1
- package/dist/types/helpers/synthetic-native-wrap.d.ts.map +1 -1
- package/dist/types/types/enums.d.ts +1 -0
- package/dist/types/types/enums.d.ts.map +1 -1
- package/dist/types/types/request.d.ts +32 -23
- package/dist/types/types/request.d.ts.map +1 -1
- package/dist/types/types/response.d.ts +10 -42
- package/dist/types/types/response.d.ts.map +1 -1
- package/dist/types/types/validation.d.ts +19 -4
- package/dist/types/types/validation.d.ts.map +1 -1
- package/dist/types/validations/compensation-hook.d.ts +1 -2
- package/dist/types/validations/compensation-hook.d.ts.map +1 -1
- package/dist/types/validations/cost-token.d.ts.map +1 -1
- package/dist/types/validations/echo-fields.d.ts.map +1 -1
- package/dist/types/validations/evm-caveats.d.ts.map +1 -1
- package/dist/types/validations/evm-on-chain-intent.d.ts +4 -0
- package/dist/types/validations/evm-on-chain-intent.d.ts.map +1 -0
- package/dist/types/validations/evm-op-budget.d.ts.map +1 -1
- package/dist/types/validations/evm-op-hook.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.map +1 -1
- package/dist/types/validations/evm-sign712-metamask.d.ts +0 -11
- package/dist/types/validations/evm-sign712-metamask.d.ts.map +1 -1
- package/dist/types/validations/evm-sign712-shared.d.ts +12 -0
- package/dist/types/validations/evm-sign712-shared.d.ts.map +1 -1
- package/dist/types/validations/evm-sign712.d.ts +1 -0
- package/dist/types/validations/evm-sign712.d.ts.map +1 -1
- package/dist/types/validations/evm-sign7702.d.ts.map +1 -1
- package/dist/types/validations/evm-transaction.d.ts +1 -1
- package/dist/types/validations/evm-transaction.d.ts.map +1 -1
- package/dist/types/validations/external-call.d.ts.map +1 -1
- package/dist/types/validations/hook-version.d.ts +7 -0
- package/dist/types/validations/hook-version.d.ts.map +1 -0
- package/dist/types/validations/hooks-common.d.ts +1 -4
- package/dist/types/validations/hooks-common.d.ts.map +1 -1
- package/dist/types/validations/intent-destinations.d.ts.map +1 -1
- package/dist/types/validations/intent-tokens.d.ts.map +1 -1
- package/dist/types/validations/max-reserved.d.ts +3 -0
- package/dist/types/validations/max-reserved.d.ts.map +1 -0
- package/dist/types/validations/on-chain-intent-submission.d.ts +3 -0
- package/dist/types/validations/on-chain-intent-submission.d.ts.map +1 -0
- package/dist/types/validations/ptp.d.ts.map +1 -1
- package/dist/types/validations/refill.d.ts.map +1 -1
- package/dist/types/validations/solana-hook.d.ts +1 -2
- package/dist/types/validations/solana-hook.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.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/total-dst-amount.d.ts.map +1 -1
- package/dist/types/validations/trade-grouping.d.ts +1 -0
- package/dist/types/validations/trade-grouping.d.ts.map +1 -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 +9 -4
- 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 +5 -2
package/dist/esm/validator.js
CHANGED
|
@@ -9,6 +9,7 @@ import { groupTrades, matchIntentsToGroups, } from "./validations/trade-grouping
|
|
|
9
9
|
import { validateAccumulativeTokens } from "./validations/accumulative-token.js";
|
|
10
10
|
import { validateCostToken } from "./validations/cost-token.js";
|
|
11
11
|
import { validatePtp } from "./validations/ptp.js";
|
|
12
|
+
import { validateMaxReservedRequest } from "./validations/max-reserved.js";
|
|
12
13
|
import { validateTotalDstAmount } from "./validations/total-dst-amount.js";
|
|
13
14
|
import { validateRequestDlnMetadataFormat } from "./validations/dln-metadata.js";
|
|
14
15
|
import { validateExternalCalls } from "./validations/external-call.js";
|
|
@@ -18,17 +19,16 @@ import { validateIntentInteractions, validateRequestInteractions } from "./valid
|
|
|
18
19
|
import { buildEnvironmentConfig } from "./whitelists/environment-config.js";
|
|
19
20
|
import { isSyntheticNativeWrapBundle } from "./helpers/synthetic-native-wrap.js";
|
|
20
21
|
import { hasUnverifiableQuoteGrouping, isQuoteModeRequest } from "./helpers/quote-mode.js";
|
|
22
|
+
import { validateOnChainIntentSubmission } from "./validations/on-chain-intent-submission.js";
|
|
23
|
+
import { validateSupportedRequestHookShapes } from "./validations/hook-version.js";
|
|
21
24
|
const SUPPORTED_VALIDATION_VERSION = 1n;
|
|
22
25
|
const COMPATIBLE_VALIDATION_VERSION_ALIASES = new Set(["2"]);
|
|
23
26
|
export function createValidator(config) {
|
|
24
27
|
const envConfig = buildEnvironmentConfig(config.environment);
|
|
25
|
-
const options = {
|
|
26
|
-
allowLegacyHookV1: config.allowLegacyHookV1 ?? true,
|
|
27
|
-
};
|
|
28
28
|
return {
|
|
29
29
|
validate(url, request, response) {
|
|
30
30
|
try {
|
|
31
|
-
return validateInternal(url, request, response, envConfig
|
|
31
|
+
return validateInternal(url, request, response, envConfig);
|
|
32
32
|
}
|
|
33
33
|
catch (error) {
|
|
34
34
|
return createUnexpectedValidationError(error);
|
|
@@ -37,7 +37,7 @@ export function createValidator(config) {
|
|
|
37
37
|
};
|
|
38
38
|
}
|
|
39
39
|
function validateInternal(_url, // TODO: not validated now, enable in the future
|
|
40
|
-
request, response, envConfig
|
|
40
|
+
request, response, envConfig) {
|
|
41
41
|
const higherVersionViolation = validateSupportedValidationVersion(response);
|
|
42
42
|
if (higherVersionViolation !== undefined) {
|
|
43
43
|
return { ok: false, violations: [higherVersionViolation] };
|
|
@@ -46,15 +46,25 @@ request, response, envConfig, options) {
|
|
|
46
46
|
// TODO: uncomment in the future to enable url validation
|
|
47
47
|
// violations.push(...validateUrl(url));
|
|
48
48
|
const reqResult = BundleCreationRequestSchema.safeParse(request);
|
|
49
|
+
if (!reqResult.success) {
|
|
50
|
+
const resResult = BundleCreationResponseSchema.safeParse(response);
|
|
51
|
+
violations.push(...buildStructureViolations(reqResult, resResult));
|
|
52
|
+
return { ok: false, violations };
|
|
53
|
+
}
|
|
54
|
+
const unsupportedHookViolations = validateSupportedRequestHookShapes(reqResult.data);
|
|
55
|
+
if (unsupportedHookViolations.length > 0) {
|
|
56
|
+
// Reject unsupported request semantics before parsing the response so a
|
|
57
|
+
// transformed V1 echo cannot hide the real cause behind a response-side
|
|
58
|
+
// structural violation.
|
|
59
|
+
return { ok: false, violations: unsupportedHookViolations };
|
|
60
|
+
}
|
|
61
|
+
const supportedRequest = reqResult.data;
|
|
49
62
|
const resResult = BundleCreationResponseSchema.safeParse(response);
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
// If the structure is invalid, we can't do any meaningful validation,
|
|
53
|
-
// so we do not continue with field validations and just report
|
|
54
|
-
// the structure issues.
|
|
63
|
+
if (!resResult.success) {
|
|
64
|
+
violations.push(...buildStructureViolations(reqResult, resResult));
|
|
55
65
|
return { ok: false, violations };
|
|
56
66
|
}
|
|
57
|
-
violations.push(...validateBundleCreation(
|
|
67
|
+
violations.push(...validateBundleCreation(supportedRequest, resResult.data, envConfig));
|
|
58
68
|
return {
|
|
59
69
|
ok: violations.length === 0,
|
|
60
70
|
violations,
|
|
@@ -126,11 +136,11 @@ function createUnexpectedValidationError(error) {
|
|
|
126
136
|
}],
|
|
127
137
|
};
|
|
128
138
|
}
|
|
129
|
-
function validateBundleCreation(request, response, envConfig
|
|
130
|
-
const context = buildBundleValidationContext(request, response, envConfig
|
|
139
|
+
function validateBundleCreation(request, response, envConfig) {
|
|
140
|
+
const context = buildBundleValidationContext(request, response, envConfig);
|
|
131
141
|
return runBundleValidations(context);
|
|
132
142
|
}
|
|
133
|
-
function buildBundleValidationContext(request, response, envConfig
|
|
143
|
+
function buildBundleValidationContext(request, response, envConfig) {
|
|
134
144
|
const modes = detectBundleModes(request, response);
|
|
135
145
|
const tradeMatch = matchTrades(request.trades, response.trades, modes.quoteMode, modes.consolidationMode);
|
|
136
146
|
const groupResult = groupTrades(request.trades, response.trades, modes.quoteMode, modes.consolidationMode, tradeMatch.pairs);
|
|
@@ -139,7 +149,6 @@ function buildBundleValidationContext(request, response, envConfig, options) {
|
|
|
139
149
|
request,
|
|
140
150
|
response,
|
|
141
151
|
envConfig,
|
|
142
|
-
options,
|
|
143
152
|
modes,
|
|
144
153
|
tradeMatch,
|
|
145
154
|
groups: groupResult.groups,
|
|
@@ -157,12 +166,14 @@ function detectBundleModes(request, response) {
|
|
|
157
166
|
};
|
|
158
167
|
}
|
|
159
168
|
function runBundleValidations(context) {
|
|
160
|
-
const { request, response, envConfig,
|
|
169
|
+
const { request, response, envConfig, modes } = context;
|
|
161
170
|
return [
|
|
162
171
|
...validateEchoFields(request, response),
|
|
172
|
+
...validateOnChainIntentSubmission(request),
|
|
163
173
|
...context.tradeMatch.violations,
|
|
164
174
|
...validateTrades(request, response, modes.quoteMode, context.tradeMatch.pairs),
|
|
165
175
|
...validateAccumulativeTokens(response, modes.quoteMode, modes.quoteGroupingUnverifiable),
|
|
176
|
+
...validateMaxReservedRequest(request),
|
|
166
177
|
...validateTotalDstAmount(request, response),
|
|
167
178
|
...validateCostToken(request, response),
|
|
168
179
|
...validatePtp(request, response),
|
|
@@ -175,7 +186,7 @@ function runBundleValidations(context) {
|
|
|
175
186
|
...validateIntentInteractions(context.intentContexts),
|
|
176
187
|
...validateIntents(context.intentContexts, modes.quoteMode, envConfig, modes.syntheticNativeWrapMode),
|
|
177
188
|
...validateRequiredActions(request, response, context.intentContexts, modes.quoteMode, envConfig, modes.syntheticNativeWrapMode),
|
|
178
|
-
...validateHooks(request, response, modes.quoteMode, envConfig
|
|
189
|
+
...validateHooks(request, response, modes.quoteMode, envConfig),
|
|
179
190
|
];
|
|
180
191
|
}
|
|
181
192
|
// TODO: enable in the future
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../src/validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAKH,aAAa,EAEb,2BAA2B,EAE3B,4BAA4B,GAC/B,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EACH,WAAW,EAEX,oBAAoB,GAEvB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,gCAAgC,EAAE,MAAM,4BAA4B,CAAC;AAC9E,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,WAAW,EAAoB,MAAM,8BAA8B,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,0BAA0B,EAAE,2BAA2B,EAAE,MAAM,4BAA4B,CAAC;AACrG,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAGzE,OAAO,EAAE,2BAA2B,EAAE,MAAM,iCAAiC,CAAC;AAC9E,OAAO,EAAE,4BAA4B,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../src/validator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,33 +1,57 @@
|
|
|
1
1
|
import { PublicKey } from "@solana/web3.js";
|
|
2
2
|
import { ChainId } from "../types/enums.js";
|
|
3
3
|
import { Environment } from "../types/validation.js";
|
|
4
|
-
import {
|
|
4
|
+
import { evmHexToTronAddress } from "../helpers/address.js";
|
|
5
|
+
import { buildSameAddressMap, buildSameAddressesMap, } from "./types.js";
|
|
5
6
|
import { getIntentSignatureConfig } from "./solana/intent-signature.js";
|
|
6
|
-
import { DELEGATION_MANAGER_CONTRACTS, EIP7702_DELEGATION_CONTRACTS, EXACT_EXECUTION_BATCH_ENFORCER_CONTRACTS, EXACT_EXECUTION_ENFORCER_CONTRACTS, ID_ENFORCER_CONTRACTS, TIMESTAMP_ENFORCER_CONTRACTS, } from "./evm/index.js";
|
|
7
|
+
import { DELEGATION_MANAGER_CONTRACTS, EIP7702_DELEGATION_CONTRACTS, EXACT_EXECUTION_BATCH_ENFORCER_CONTRACTS, EXACT_EXECUTION_ENFORCER_CONTRACTS, ID_ENFORCER_CONTRACTS, METAMASK_DEFAULT_EVM_CHAINS, TIMESTAMP_ENFORCER_CONTRACTS, } from "./evm/index.js";
|
|
7
8
|
import { COMPUTE_BUDGET_PROGRAM, MEMO_PROGRAM, SPL_TOKEN_PROGRAM, SPL_TOKEN_2022_PROGRAM, SYSTEM_PROGRAM, ASSOCIATED_TOKEN_PROGRAM, } from "./solana/programs.js";
|
|
8
9
|
// =============================================
|
|
9
|
-
//
|
|
10
|
+
// Allowance Holders
|
|
10
11
|
// =============================================
|
|
11
|
-
const
|
|
12
|
-
const PROD_TRON_ALLOWANCE_HOLDER = "0x873a84BfBd83f9986cb07927ac3E587979D57775";
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
12
|
+
const PROD_EVM_ALLOWANCE_HOLDER = "0xddddddddd4B6472c5002F95610b194D1161223d0";
|
|
13
|
+
const PROD_TRON_ALLOWANCE_HOLDER = evmHexToTronAddress("0x873a84BfBd83f9986cb07927ac3E587979D57775");
|
|
14
|
+
const PROD_SOLANA_ALLOWANCE_HOLDER = "73dUbDAWUDZRfXM3DcuRgR4q74nr97MyuBt95738JnMz";
|
|
15
|
+
// =============================================
|
|
16
|
+
// Intent Managers
|
|
17
|
+
// =============================================
|
|
18
|
+
const PROD_EVM_INTENT_MANAGER = "0xDDDDDDDdeB2E68Ee19832e356FCB5537124A9708";
|
|
19
|
+
const PROD_TRON_INTENT_MANAGER = evmHexToTronAddress("0x3ACFa1FA93916C60c9e8B7C5d59b50681b705e4e");
|
|
20
|
+
const PROD_SOLANA_INTENT_MANAGER = "DeintXmrdZFgSKzEWcJWhK793HuqnfDydAPvHmayY5Xz";
|
|
21
|
+
// =============================================
|
|
22
|
+
// SolverExecutor contracts
|
|
23
|
+
// =============================================
|
|
24
|
+
// EVM SolverExecutor contracts.
|
|
25
|
+
export const TEST_EVM_SOLVER_EXECUTOR = "0xb7B10db9c7B978c48340994CB48829C4b3617B2F";
|
|
26
|
+
export const PROD_EVM_SOLVER_EXECUTOR = "0x23e17e9c79a0ecDe25FB76869Ce215d39bA6e33d";
|
|
27
|
+
export const GASLESS_EVM_SOLVER_EXECUTOR = "0x4F01251B0A11cA9bcC01AC3726eE779Cff9298f5";
|
|
28
|
+
// Tron SolverExecutor contracts.
|
|
29
|
+
export const TEST_TRON_SOLVER_EXECUTOR = "TASN3NeKr37xpTJHMMkeFPGaajuUyokrX7";
|
|
30
|
+
export const PROD_TRON_SOLVER_EXECUTOR = "TTgvmLtDgtWs2JkacnKhh8cRVEUeabhVKi";
|
|
31
|
+
// =============================================
|
|
32
|
+
// Delegates
|
|
33
|
+
// =============================================
|
|
34
|
+
// EVM delegates
|
|
35
|
+
const PROD_EVM_EOA_DELEGATE = "0x11339397e4aa00814799197aa28438096d34c266";
|
|
36
|
+
const DEV_EVM_EOA_DELEGATE_ONE = "0x555ce236c0220695b68341bc48c68d52210cc35b";
|
|
37
|
+
const DEV_EVM_EOA_DELEGATE_TWO = "0xDDd405336C13db1ccBf577f64B43890d9c386F7D";
|
|
38
|
+
const DEV_EVM_EOA_DELEGATE_THREE = "0xE547d2EeD6DD60796013b485D284C17Da1194C82";
|
|
39
|
+
// Solana delegates
|
|
40
|
+
const PROD_SOLANA_DELEGATE = "DbjXAFabS9ymdbaGxuFBQAWuLB2MUGEFtpu3173aP3LR";
|
|
41
|
+
const GASLESS_SOLANA_DELEGATE = "RevS7rhyy3XSXTyRXBj8Hd35wmzMwFJHGZDsA6d1k64";
|
|
42
|
+
const DEV_SOLANA_DELEGATE_ONE = "2snHHreXbpJ7UwZxPe37gnUNf7Wx7wv6UKDSR2JckKuS";
|
|
43
|
+
const DEV_SOLANA_DELEGATE_TWO = "bud6cbDe3kpPaEWcRdnTnHEKZKg8YR9GaURKS9sXRGD";
|
|
44
|
+
const DEV_SOLANA_DELEGATE_THREE = "7FfB2zQRYUQwpPzkRxAeg2mCBGeCRKp4PCEeULJA9xTo";
|
|
45
|
+
// =============================================
|
|
46
|
+
// Protocol-defined magic addresses
|
|
47
|
+
// =============================================
|
|
48
|
+
export const EVM_MAGIC_ANY_TRUSTED_SOLVER_ADDRESS = "0xDDdDddDdDdddDDddDDddDDDDdDdDDdDDdDDDDDDd";
|
|
49
|
+
export const TRON_MAGIC_ANY_TRUSTED_SOLVER_ADDRESS = evmHexToTronAddress(EVM_MAGIC_ANY_TRUSTED_SOLVER_ADDRESS);
|
|
50
|
+
export const SOLANA_MAGIC_ANY_TRUSTED_SOLVER_ADDRESS = "UseDeBridgeTrustedSender1111111111111111111";
|
|
51
|
+
// =============================================
|
|
52
|
+
// EVM chain lists
|
|
53
|
+
// =============================================
|
|
54
|
+
export const EVM_CHAINS_ENABLED_FOR_INTENTS = [
|
|
31
55
|
ChainId.Ethereum,
|
|
32
56
|
ChainId.Optimism,
|
|
33
57
|
ChainId.BNB,
|
|
@@ -37,7 +61,7 @@ export const PROD_EVM_CHAINS_ENABLED_FOR_INTENTS = [
|
|
|
37
61
|
ChainId.HyperEVM,
|
|
38
62
|
ChainId.Sei,
|
|
39
63
|
ChainId.Story,
|
|
40
|
-
ChainId.
|
|
64
|
+
ChainId.Injective,
|
|
41
65
|
ChainId.MegaETH,
|
|
42
66
|
ChainId.Robinhood,
|
|
43
67
|
ChainId.Cronos,
|
|
@@ -46,173 +70,115 @@ export const PROD_EVM_CHAINS_ENABLED_FOR_INTENTS = [
|
|
|
46
70
|
ChainId.Arbitrum,
|
|
47
71
|
ChainId.Linea,
|
|
48
72
|
];
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
ChainId.Optimism,
|
|
52
|
-
ChainId.BNB,
|
|
53
|
-
ChainId.Polygon,
|
|
54
|
-
ChainId.Monad,
|
|
55
|
-
ChainId.Flow,
|
|
56
|
-
ChainId.HyperEVM,
|
|
57
|
-
ChainId.Sei,
|
|
58
|
-
ChainId.Story,
|
|
59
|
-
ChainId.Mantle,
|
|
60
|
-
ChainId.Robinhood,
|
|
61
|
-
ChainId.Avalanche,
|
|
62
|
-
ChainId.Base,
|
|
63
|
-
ChainId.Arbitrum,
|
|
64
|
-
ChainId.Linea,
|
|
65
|
-
];
|
|
66
|
-
const ALLOWANCE_HOLDER_BY_ENVIRONMENT = {
|
|
67
|
-
[Environment.Dev]: {
|
|
68
|
-
...buildSameAddressMap(DEV_EVM_CHAINS_ENABLED_FOR_GASLESS_INTENTS, PROD_DEFAULT_EVM_ALLOWANCE_HOLDER),
|
|
69
|
-
[ChainId.Tron]: [PROD_TRON_ALLOWANCE_HOLDER],
|
|
70
|
-
},
|
|
71
|
-
[Environment.Prod]: buildSameAddressMap(PROD_EVM_CHAINS_ENABLED_FOR_INTENTS, PROD_DEFAULT_EVM_ALLOWANCE_HOLDER),
|
|
72
|
-
[Environment.Gasless]: buildSameAddressMap(GASLESS_EVM_CHAINS_ENABLED_FOR_INTENTS, PROD_DEFAULT_EVM_ALLOWANCE_HOLDER),
|
|
73
|
-
};
|
|
74
|
-
// Solver Executor deployments
|
|
75
|
-
const SHARED_EVM_SOLVER_EXECUTOR_ADDRESS = "0xb7B10db9c7B978c48340994CB48829C4b3617B2F";
|
|
76
|
-
const TRON_SOLVER_EXECUTOR_ADDRESS = "TASN3NeKr37xpTJHMMkeFPGaajuUyokrX7";
|
|
77
|
-
// Protocol-defined sentinels that allow any solver trusted by deBridge.
|
|
78
|
-
const EVM_ANY_TRUSTED_SOLVER_ADDRESS = "0xDDdDddDdDdddDDddDDddDDDDdDdDDdDDdDDDDDDd";
|
|
79
|
-
const SOLANA_ANY_TRUSTED_SOLVER_ADDRESS = "UseDeBridgeTrustedSender1111111111111111111";
|
|
73
|
+
// EVM chains with enabled MetaMask Delegation contracts.
|
|
74
|
+
export const METAMASK_CHAINS = METAMASK_DEFAULT_EVM_CHAINS;
|
|
80
75
|
// =============================================
|
|
81
|
-
//
|
|
76
|
+
// Whitelists
|
|
82
77
|
// =============================================
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
[Environment.
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
78
|
+
const EVM_AND_TRON_ALLOWANCE_HOLDERS = {
|
|
79
|
+
...buildSameAddressMap(EVM_CHAINS_ENABLED_FOR_INTENTS, PROD_EVM_ALLOWANCE_HOLDER),
|
|
80
|
+
[ChainId.Tron]: [PROD_TRON_ALLOWANCE_HOLDER],
|
|
81
|
+
};
|
|
82
|
+
const EVM_AND_TRON_ALLOWANCE_HOLDERS_BY_ENVIRONMENT = {
|
|
83
|
+
[Environment.Dev]: EVM_AND_TRON_ALLOWANCE_HOLDERS,
|
|
84
|
+
[Environment.Prod]: EVM_AND_TRON_ALLOWANCE_HOLDERS,
|
|
85
|
+
[Environment.Gasless]: EVM_AND_TRON_ALLOWANCE_HOLDERS,
|
|
86
|
+
};
|
|
87
|
+
const EVM_AND_TRON_DELEGATES_BY_ENVIRONMENT = {
|
|
88
|
+
[Environment.Dev]: {
|
|
89
|
+
...buildSameAddressesMap(EVM_CHAINS_ENABLED_FOR_INTENTS, [
|
|
90
|
+
TEST_EVM_SOLVER_EXECUTOR,
|
|
91
|
+
PROD_EVM_SOLVER_EXECUTOR,
|
|
92
|
+
GASLESS_EVM_SOLVER_EXECUTOR,
|
|
93
|
+
PROD_EVM_EOA_DELEGATE,
|
|
94
|
+
DEV_EVM_EOA_DELEGATE_ONE,
|
|
95
|
+
DEV_EVM_EOA_DELEGATE_TWO,
|
|
96
|
+
DEV_EVM_EOA_DELEGATE_THREE,
|
|
97
|
+
]),
|
|
98
|
+
[ChainId.Tron]: [
|
|
99
|
+
TEST_TRON_SOLVER_EXECUTOR,
|
|
100
|
+
PROD_TRON_SOLVER_EXECUTOR,
|
|
101
|
+
evmHexToTronAddress(PROD_EVM_EOA_DELEGATE),
|
|
102
|
+
evmHexToTronAddress(DEV_EVM_EOA_DELEGATE_ONE),
|
|
103
|
+
evmHexToTronAddress(DEV_EVM_EOA_DELEGATE_TWO),
|
|
104
|
+
evmHexToTronAddress(DEV_EVM_EOA_DELEGATE_THREE),
|
|
105
|
+
],
|
|
106
|
+
},
|
|
107
|
+
[Environment.Prod]: {
|
|
108
|
+
...buildSameAddressesMap(EVM_CHAINS_ENABLED_FOR_INTENTS, [PROD_EVM_SOLVER_EXECUTOR]),
|
|
109
|
+
[ChainId.Tron]: [PROD_TRON_SOLVER_EXECUTOR],
|
|
110
|
+
},
|
|
111
|
+
[Environment.Gasless]: buildSameAddressesMap(EVM_CHAINS_ENABLED_FOR_INTENTS, [GASLESS_EVM_SOLVER_EXECUTOR]),
|
|
110
112
|
};
|
|
111
|
-
export const METAMASK_CHAINS = [
|
|
112
|
-
ChainId.Ethereum,
|
|
113
|
-
ChainId.Optimism,
|
|
114
|
-
ChainId.BNB,
|
|
115
|
-
ChainId.Polygon,
|
|
116
|
-
ChainId.Base,
|
|
117
|
-
ChainId.Arbitrum,
|
|
118
|
-
];
|
|
119
113
|
const METAMASK_CHAINS_BY_ENVIRONMENT = {
|
|
120
114
|
[Environment.Dev]: METAMASK_CHAINS,
|
|
121
115
|
[Environment.Prod]: METAMASK_CHAINS,
|
|
122
116
|
[Environment.Gasless]: METAMASK_CHAINS,
|
|
123
117
|
};
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
const
|
|
129
|
-
|
|
130
|
-
[Environment.
|
|
131
|
-
|
|
132
|
-
[ChainId.Tron]: [PROD_TRON_INTENT_MANAGER],
|
|
133
|
-
},
|
|
134
|
-
[Environment.Prod]: buildSameAddressMap(PROD_EVM_CHAINS_ENABLED_FOR_INTENTS, PROD_DEFAULT_EVM_INTENT_MANAGER),
|
|
135
|
-
[Environment.Gasless]: buildSameAddressMap(GASLESS_EVM_CHAINS_ENABLED_FOR_INTENTS, PROD_DEFAULT_EVM_INTENT_MANAGER),
|
|
118
|
+
const EVM_AND_TRON_INTENT_MANAGERS = {
|
|
119
|
+
...buildSameAddressMap(EVM_CHAINS_ENABLED_FOR_INTENTS, PROD_EVM_INTENT_MANAGER),
|
|
120
|
+
[ChainId.Tron]: [PROD_TRON_INTENT_MANAGER],
|
|
121
|
+
};
|
|
122
|
+
const EVM_AND_TRON_INTENT_MANAGERS_BY_ENVIRONMENT = {
|
|
123
|
+
[Environment.Dev]: EVM_AND_TRON_INTENT_MANAGERS,
|
|
124
|
+
[Environment.Prod]: EVM_AND_TRON_INTENT_MANAGERS,
|
|
125
|
+
[Environment.Gasless]: EVM_AND_TRON_INTENT_MANAGERS,
|
|
136
126
|
};
|
|
137
|
-
// =============================================
|
|
138
|
-
// Solana: Intent Program
|
|
139
|
-
// =============================================
|
|
140
127
|
export const SOLANA_INTENT_PROGRAM_BY_ENVIRONMENT = {
|
|
141
|
-
[Environment.
|
|
142
|
-
[Environment.
|
|
143
|
-
[Environment.
|
|
128
|
+
[Environment.Dev]: PROD_SOLANA_INTENT_MANAGER,
|
|
129
|
+
[Environment.Prod]: PROD_SOLANA_INTENT_MANAGER,
|
|
130
|
+
[Environment.Gasless]: PROD_SOLANA_INTENT_MANAGER,
|
|
144
131
|
};
|
|
145
|
-
// =============================================
|
|
146
|
-
// Solana: Allowance Holder
|
|
147
|
-
// =============================================
|
|
148
|
-
const DEFAULT_PROD_SOLANA_ALLOWANCE_HOLDER_ADDRESS = "73dUbDAWUDZRfXM3DcuRgR4q74nr97MyuBt95738JnMz";
|
|
149
|
-
const PROD_SOLANA_DELEGATE_ADDRESS = "DbjXAFabS9ymdbaGxuFBQAWuLB2MUGEFtpu3173aP3LR";
|
|
150
|
-
const GASLESS_SOLANA_DELEGATE_ADDRESS = "bud6cbDe3kpPaEWcRdnTnHEKZKg8YR9GaURKS9sXRGD";
|
|
151
|
-
// API's configured taker and executor addresses.
|
|
152
|
-
const SHARED_SOLANA_TAKER_ADDRESS = "2snHHreXbpJ7UwZxPe37gnUNf7Wx7wv6UKDSR2JckKuS";
|
|
153
|
-
const DEV_SOLANA_TAKER_ADDRESS = "7FfB2zQRYUQwpPzkRxAeg2mCBGeCRKp4PCEeULJA9xTo";
|
|
154
132
|
export const SOLANA_ALLOWANCE_HOLDER_BY_ENVIRONMENT = {
|
|
155
|
-
[Environment.
|
|
156
|
-
[Environment.
|
|
157
|
-
[Environment.
|
|
133
|
+
[Environment.Dev]: PROD_SOLANA_ALLOWANCE_HOLDER,
|
|
134
|
+
[Environment.Prod]: PROD_SOLANA_ALLOWANCE_HOLDER,
|
|
135
|
+
[Environment.Gasless]: PROD_SOLANA_ALLOWANCE_HOLDER,
|
|
158
136
|
};
|
|
159
137
|
export const SOLANA_ALLOWANCE_HOLDER_ENABLED_BY_ENVIRONMENT = {
|
|
138
|
+
[Environment.Dev]: true,
|
|
160
139
|
[Environment.Prod]: true,
|
|
161
140
|
[Environment.Gasless]: true,
|
|
162
|
-
[Environment.Dev]: true,
|
|
163
|
-
};
|
|
164
|
-
export const SOLANA_DELEGATE_BY_ENVIRONMENT = {
|
|
165
|
-
[Environment.Prod]: PROD_SOLANA_DELEGATE_ADDRESS,
|
|
166
|
-
[Environment.Gasless]: GASLESS_SOLANA_DELEGATE_ADDRESS,
|
|
167
|
-
[Environment.Dev]: GASLESS_SOLANA_DELEGATE_ADDRESS,
|
|
168
141
|
};
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
...
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
]),
|
|
210
|
-
[Environment.Gasless]: buildSrcAllowedSenderBase(GASLESS_EVM_CHAINS_ENABLED_FOR_INTENTS, GASLESS_EVM_DELEGATE_ADDRESS, [
|
|
211
|
-
SOLANA_ANY_TRUSTED_SOLVER_ADDRESS,
|
|
212
|
-
SHARED_SOLANA_TAKER_ADDRESS,
|
|
213
|
-
PROD_SOLANA_DELEGATE_ADDRESS,
|
|
214
|
-
GASLESS_SOLANA_DELEGATE_ADDRESS,
|
|
215
|
-
]),
|
|
142
|
+
const SRC_ALLOWED_SENDERS_BY_ENVIRONMENT = {
|
|
143
|
+
[Environment.Dev]: {
|
|
144
|
+
...buildSameAddressesMap(EVM_CHAINS_ENABLED_FOR_INTENTS, [
|
|
145
|
+
TEST_EVM_SOLVER_EXECUTOR,
|
|
146
|
+
PROD_EVM_SOLVER_EXECUTOR,
|
|
147
|
+
GASLESS_EVM_SOLVER_EXECUTOR,
|
|
148
|
+
EVM_MAGIC_ANY_TRUSTED_SOLVER_ADDRESS,
|
|
149
|
+
]),
|
|
150
|
+
[ChainId.Tron]: [
|
|
151
|
+
TEST_TRON_SOLVER_EXECUTOR,
|
|
152
|
+
PROD_TRON_SOLVER_EXECUTOR,
|
|
153
|
+
TRON_MAGIC_ANY_TRUSTED_SOLVER_ADDRESS,
|
|
154
|
+
],
|
|
155
|
+
[ChainId.Solana]: [
|
|
156
|
+
PROD_SOLANA_DELEGATE,
|
|
157
|
+
GASLESS_SOLANA_DELEGATE,
|
|
158
|
+
DEV_SOLANA_DELEGATE_ONE,
|
|
159
|
+
DEV_SOLANA_DELEGATE_TWO,
|
|
160
|
+
DEV_SOLANA_DELEGATE_THREE,
|
|
161
|
+
SOLANA_MAGIC_ANY_TRUSTED_SOLVER_ADDRESS,
|
|
162
|
+
],
|
|
163
|
+
},
|
|
164
|
+
[Environment.Prod]: {
|
|
165
|
+
...buildSameAddressesMap(EVM_CHAINS_ENABLED_FOR_INTENTS, [
|
|
166
|
+
PROD_EVM_SOLVER_EXECUTOR,
|
|
167
|
+
EVM_MAGIC_ANY_TRUSTED_SOLVER_ADDRESS,
|
|
168
|
+
]),
|
|
169
|
+
[ChainId.Tron]: [
|
|
170
|
+
PROD_TRON_SOLVER_EXECUTOR,
|
|
171
|
+
TRON_MAGIC_ANY_TRUSTED_SOLVER_ADDRESS,
|
|
172
|
+
],
|
|
173
|
+
[ChainId.Solana]: [SOLANA_MAGIC_ANY_TRUSTED_SOLVER_ADDRESS],
|
|
174
|
+
},
|
|
175
|
+
[Environment.Gasless]: {
|
|
176
|
+
...buildSameAddressesMap(EVM_CHAINS_ENABLED_FOR_INTENTS, [
|
|
177
|
+
GASLESS_EVM_SOLVER_EXECUTOR,
|
|
178
|
+
EVM_MAGIC_ANY_TRUSTED_SOLVER_ADDRESS,
|
|
179
|
+
]),
|
|
180
|
+
[ChainId.Solana]: [SOLANA_MAGIC_ANY_TRUSTED_SOLVER_ADDRESS],
|
|
181
|
+
},
|
|
216
182
|
};
|
|
217
183
|
// =============================================
|
|
218
184
|
// Builder
|
|
@@ -246,15 +212,11 @@ function buildSignTransactionAllowedPrograms(intentProgram) {
|
|
|
246
212
|
export function buildEnvironmentConfig(environment) {
|
|
247
213
|
const solanaIntentProgram = SOLANA_INTENT_PROGRAM_BY_ENVIRONMENT[environment];
|
|
248
214
|
const metamaskChains = METAMASK_CHAINS_BY_ENVIRONMENT[environment];
|
|
249
|
-
const solanaDelegateAddresses = {
|
|
250
|
-
[ChainId.Solana]: [SOLANA_DELEGATE_BY_ENVIRONMENT[environment]],
|
|
251
|
-
};
|
|
252
|
-
const srcAllowedSenderAddresses = mergeChainAddressMaps(SRC_ALLOWED_SENDER_BASE_BY_ENVIRONMENT[environment], EVM_DELEGATE_BY_ENVIRONMENT[environment], solanaDelegateAddresses);
|
|
253
215
|
return {
|
|
254
|
-
allowanceHolderContracts:
|
|
255
|
-
intentManagerContracts:
|
|
256
|
-
srcAllowedSenderAddresses,
|
|
257
|
-
evmDelegateAddresses:
|
|
216
|
+
allowanceHolderContracts: EVM_AND_TRON_ALLOWANCE_HOLDERS_BY_ENVIRONMENT[environment],
|
|
217
|
+
intentManagerContracts: EVM_AND_TRON_INTENT_MANAGERS_BY_ENVIRONMENT[environment],
|
|
218
|
+
srcAllowedSenderAddresses: SRC_ALLOWED_SENDERS_BY_ENVIRONMENT[environment],
|
|
219
|
+
evmDelegateAddresses: EVM_AND_TRON_DELEGATES_BY_ENVIRONMENT[environment],
|
|
258
220
|
eip7702DelegationContracts: filterChainAddressMap(EIP7702_DELEGATION_CONTRACTS, metamaskChains),
|
|
259
221
|
delegationManagerContracts: filterChainAddressMap(DELEGATION_MANAGER_CONTRACTS, metamaskChains),
|
|
260
222
|
exactExecutionEnforcerContracts: filterChainAddressMap(EXACT_EXECUTION_ENFORCER_CONTRACTS, metamaskChains),
|
|
@@ -264,7 +226,6 @@ export function buildEnvironmentConfig(environment) {
|
|
|
264
226
|
solanaIntentProgram,
|
|
265
227
|
solanaAllowanceHolder: SOLANA_ALLOWANCE_HOLDER_BY_ENVIRONMENT[environment],
|
|
266
228
|
solanaAllowanceHolderEnabled: SOLANA_ALLOWANCE_HOLDER_ENABLED_BY_ENVIRONMENT[environment],
|
|
267
|
-
solanaDelegateAddress: SOLANA_DELEGATE_BY_ENVIRONMENT[environment],
|
|
268
229
|
solanaTransactionAllowedPrograms: buildTransactionAllowedPrograms(solanaIntentProgram),
|
|
269
230
|
solanaSignTransactionAllowedPrograms: buildSignTransactionAllowedPrograms(solanaIntentProgram),
|
|
270
231
|
solanaExpectedStatePdaBase58: computeStatePdaBase58(solanaIntentProgram),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environment-config.js","sourceRoot":"","sources":["../../../src/whitelists/environment-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAGH,mBAAmB,EACnB,qBAAqB,
|
|
1
|
+
{"version":3,"file":"environment-config.js","sourceRoot":"","sources":["../../../src/whitelists/environment-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { addressEquals, getChainEngine,
|
|
1
|
+
import { addressEquals, getChainEngine, isEvmHexAddress, } from "../helpers/address.js";
|
|
2
2
|
import { ChainEngine, ChainId } from "../types/enums.js";
|
|
3
3
|
// Builds a ChainAddressMap with the same address for every chain in the list.
|
|
4
4
|
// Useful for whitelists where one canonical address is deployed on many chains.
|
|
@@ -44,16 +44,13 @@ export function isWhitelisted(map, chainId, address) {
|
|
|
44
44
|
// Different chains have different address formats, so we must check chain-specific list before wildcard.
|
|
45
45
|
const chainSpecific = map[chainId];
|
|
46
46
|
if (chainSpecific) {
|
|
47
|
-
|
|
48
|
-
return chainSpecific.some(a => normalizeAddress(chainId, a) === normalized);
|
|
47
|
+
return chainSpecific.some(allowed => addressEquals(chainId, allowed, address));
|
|
49
48
|
}
|
|
50
49
|
// Fallback to wildcard (chainId 0).
|
|
51
50
|
// Wildcard always uses EVM hex format — convert non-EVM addresses.
|
|
52
51
|
const wildcard = map[ChainId.Wildcard];
|
|
53
52
|
if (!wildcard)
|
|
54
53
|
return false;
|
|
55
|
-
|
|
56
|
-
const normalized = evmAddress.toLowerCase();
|
|
57
|
-
return wildcard.some(a => a.toLowerCase() === normalized);
|
|
54
|
+
return wildcard.some(allowed => isEvmHexAddress(allowed) && addressEquals(chainId, allowed, address));
|
|
58
55
|
}
|
|
59
56
|
//# sourceMappingURL=types.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/whitelists/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,aAAa,EACb,cAAc,EACd,
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/whitelists/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,aAAa,EACb,cAAc,EACd,eAAe,GAClB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAStD,8EAA8E;AAC9E,gFAAgF;AAChF,MAAM,UAAU,mBAAmB,CAC/B,MAA0B,EAC1B,OAAe;IAEf,OAAO,qBAAqB,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;AACpD,CAAC;AAED,uEAAuE;AACvE,MAAM,UAAU,qBAAqB,CACjC,MAA0B,EAC1B,SAA4B;IAE5B,MAAM,GAAG,GAAoB,EAAE,CAAC;IAChC,KAAK,MAAM,OAAO,IAAI,MAAM,EAAE,CAAC;QAC3B,GAAG,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC;IAC7B,CAAC;IACD,OAAO,GAAG,CAAC;AACf,CAAC;AAED,+EAA+E;AAC/E,8CAA8C;AAC9C,MAAM,UAAU,qBAAqB,CAAC,GAAG,IAAgC;IACrE,MAAM,MAAM,GAAoB,EAAE,CAAC;IAEnC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACrB,KAAK,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YACxD,IAAI,SAAS,KAAK,SAAS;gBAAE,SAAS;YAEtC,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,CAAY,CAAC;YAC9C,MAAM,MAAM,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;YAC5C,KAAK,MAAM,OAAO,IAAI,SAAS,EAAE,CAAC;gBAC9B,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;oBAAE,SAAS;gBACjF,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACzB,CAAC;YACD,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC;QAC7B,CAAC;IACL,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC;AA6BD,MAAM,UAAU,aAAa,CACzB,GAAoB,EACpB,OAAgB,EAChB,OAAe;IAEf,MAAM,MAAM,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;IAEvC,IAAI,MAAM,KAAK,WAAW,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,OAAO,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IACnF,CAAC;IAED,oCAAoC;IACpC,mEAAmE;IACnE,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACvC,IAAI,CAAC,QAAQ;QAAE,OAAO,KAAK,CAAC;IAE5B,OAAO,QAAQ,CAAC,IAAI,CAChB,OAAO,CAAC,EAAE,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAClF,CAAC;AACN,CAAC"}
|