@charterlabs/rhinestone-sdk 0.3.9 → 0.4.1

package/dist/src/execution/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SignerNotSupportedError = exports.SessionChainRequiredError = exports.OrderPathRequiredForIntentsError = exports.IntentStatusTimeoutError = exports.IntentFailedError = exports.ExecutionError = exports.isExecutionError = void 0;
+exports.SignerNotSupportedError = exports.SessionChainRequiredError = exports.OrderPathRequiredForIntentsError = exports.InvalidSourceCallsError = exports.IntentStatusTimeoutError = exports.IntentFailedError = exports.ExecutionError = exports.isExecutionError = void 0;
 exports.sendTransaction = sendTransaction;
 exports.sendTransactionInternal = sendTransactionInternal;
 exports.sendUserOperation = sendUserOperation;
@@ -12,12 +12,14 @@ exports.splitIntents = splitIntents;
 const viem_1 = require("viem");
 const accounts_1 = require("../accounts");
 const utils_1 = require("../accounts/utils");
+const provider_1 = require("../auth/provider");
 const orchestrator_1 = require("../orchestrator");
 const registry_1 = require("../orchestrator/registry");
 const error_1 = require("./error");
 Object.defineProperty(exports, "ExecutionError", { enumerable: true, get: function () { return error_1.ExecutionError; } });
 Object.defineProperty(exports, "IntentFailedError", { enumerable: true, get: function () { return error_1.IntentFailedError; } });
 Object.defineProperty(exports, "IntentStatusTimeoutError", { enumerable: true, get: function () { return error_1.IntentStatusTimeoutError; } });
+Object.defineProperty(exports, "InvalidSourceCallsError", { enumerable: true, get: function () { return error_1.InvalidSourceCallsError; } });
 Object.defineProperty(exports, "isExecutionError", { enumerable: true, get: function () { return error_1.isExecutionError; } });
 Object.defineProperty(exports, "OrderPathRequiredForIntentsError", { enumerable: true, get: function () { return error_1.OrderPathRequiredForIntentsError; } });
 Object.defineProperty(exports, "SessionChainRequiredError", { enumerable: true, get: function () { return error_1.SessionChainRequiredError; } });
@@ -32,13 +34,14 @@ const POLL_ERROR_BACKOFF_MAX_MS = 10000;
 async function sendTransaction(config, transaction) {
     const sourceChains = 'chain' in transaction ? [transaction.chain] : transaction.sourceChains;
     const targetChain = 'chain' in transaction ? transaction.chain : transaction.targetChain;
-    const { calls, gasLimit, tokenRequests, recipient, signers, sponsored, eip7702InitSignature, settlementLayers, sourceAssets, feeAsset, } = transaction;
+    const { calls, sourceCalls, gasLimit, tokenRequests, recipient, signers, sponsored, eip7702InitSignature, settlementLayers, sourceAssets, feeAsset, } = transaction;
     const isUserOpSigner = signers?.type === 'guardians';
     if (isUserOpSigner) {
         throw new error_1.SignerNotSupportedError();
     }
     return await sendTransactionInternal(config, sourceChains, targetChain, {
         callInputs: calls,
+        sourceCalls,
         gasLimit,
         initialTokenRequests: tokenRequests,
         recipient,
@@ -64,7 +67,7 @@ async function sendTransactionInternal(config, sourceChains, targetChain, option
         throw new error_1.SignerNotSupportedError();
     }
     else {
-        return await sendTransactionAsIntent(config, sourceChains, targetChain, resolvedCalls, options.gasLimit, tokenRequests, options.recipient, options.signers, options.sponsored, options.eip7702InitSignature, options.settlementLayers, options.sourceAssets, options.feeAsset, options.lockFunds);
+        return await sendTransactionAsIntent(config, sourceChains, targetChain, resolvedCalls, options.gasLimit, tokenRequests, options.recipient, options.signers, options.sponsored, options.eip7702InitSignature, options.settlementLayers, options.sourceAssets, options.feeAsset, options.lockFunds, options.sourceCalls);
     }
 }
 async function sendUserOperationInternal(config, chain, callInputs, signers) {
@@ -90,17 +93,18 @@ async function sendUserOperationInternal(config, chain, callInputs, signers) {
         chain: chain.id,
     };
 }
-async function sendTransactionAsIntent(config, sourceChains, targetChain, callInputs, gasLimit, tokenRequests, recipient, signers, sponsored, eip7702InitSignature, settlementLayers, sourceAssets, feeAsset, lockFunds) {
-    const intentRoute = await (0, utils_2.prepareTransactionAsIntent)(config, sourceChains, targetChain, callInputs, gasLimit, tokenRequests, recipient, sponsored ?? false, eip7702InitSignature, settlementLayers, sourceAssets, feeAsset, lockFunds, undefined, undefined, signers);
-    if (!intentRoute) {
+async function sendTransactionAsIntent(config, sourceChains, targetChain, callInputs, gasLimit, tokenRequests, recipient, signers, sponsored, eip7702InitSignature, settlementLayers, sourceAssets, feeAsset, lockFunds, sourceCalls) {
+    const prepared = await (0, utils_2.prepareTransactionAsIntent)(config, sourceChains, targetChain, callInputs, gasLimit, tokenRequests, recipient, sponsored ?? false, eip7702InitSignature, settlementLayers, sourceAssets, feeAsset, lockFunds, undefined, undefined, signers, sourceCalls);
+    if (!prepared) {
         throw new error_1.OrderPathRequiredForIntentsError();
     }
+    const { intentRoute, intentInput } = prepared;
     const { originSignatures, destinationSignature } = await (0, utils_2.signIntent)(config, intentRoute.intentOp, targetChain, signers);
     const targetExecutionSignature = await (0, utils_2.getTargetExecutionSignature)(config, intentRoute.intentOp, targetChain, signers);
     const authorizations = config.eoa
         ? await (0, utils_2.signAuthorizationsInternal)(config, intentRoute)
         : [];
-    return await (0, utils_2.submitIntentInternal)(config, sourceChains, targetChain, intentRoute.intentOp, originSignatures, destinationSignature, targetExecutionSignature, authorizations, false);
+    return await (0, utils_2.submitIntentInternal)(config, sourceChains, targetChain, intentRoute.intentOp, originSignatures, destinationSignature, targetExecutionSignature, authorizations, false, intentInput);
 }
 async function waitForExecution(config, result, acceptsPreconfirmations) {
     const validStatuses = new Set([
@@ -126,7 +130,7 @@ async function waitForExecution(config, result, acceptsPreconfirmations) {
                         },
                     });
                 }
-                const orchestrator = (0, orchestrator_1.getOrchestrator)(config.apiKey, config.endpointUrl, config.headers);
+                const orchestrator = (0, orchestrator_1.getOrchestrator)(config._authProvider ?? (0, provider_1.createAuthProvider)(config), config.endpointUrl, config.headers);
                 try {
                     intentStatus = await orchestrator.getIntentOpStatus(result.id);
                     // reset error backoff on success
@@ -205,7 +209,7 @@ async function waitForExecution(config, result, acceptsPreconfirmations) {
 }
 async function getPortfolio(config, onTestnets) {
     const address = (0, accounts_1.getAddress)(config);
-    const orchestrator = (0, orchestrator_1.getOrchestrator)(config.apiKey, config.endpointUrl, config.headers);
+    const orchestrator = (0, orchestrator_1.getOrchestrator)(config._authProvider ?? (0, provider_1.createAuthProvider)(config), config.endpointUrl, config.headers);
     const supportedChainIds = (0, registry_1.getSupportedChainIds)();
     const filteredChainIds = supportedChainIds.filter((id) => {
         try {
@@ -217,8 +221,8 @@ async function getPortfolio(config, onTestnets) {
     });
     return orchestrator.getPortfolio(address, { chainIds: filteredChainIds });
 }
-async function getIntentStatus(apiKey, endpointUrl, intentId, headers) {
-    const orchestrator = (0, orchestrator_1.getOrchestrator)(apiKey, endpointUrl, headers);
+async function getIntentStatus(authProvider, endpointUrl, intentId, headers) {
+    const orchestrator = (0, orchestrator_1.getOrchestrator)(authProvider, endpointUrl, headers);
     const internalStatus = await orchestrator.getIntentOpStatus(intentId);
     return {
         status: internalStatus.status,
@@ -232,7 +236,7 @@ async function getIntentStatus(apiKey, endpointUrl, intentId, headers) {
         })),
     };
 }
-async function splitIntents(apiKey, endpointUrl, input, headers) {
-    const orchestrator = (0, orchestrator_1.getOrchestrator)(apiKey, endpointUrl, headers);
+async function splitIntents(authProvider, endpointUrl, input, headers) {
+    const orchestrator = (0, orchestrator_1.getOrchestrator)(authProvider, endpointUrl, headers);
     return orchestrator.splitIntents(input);
 }

package/dist/src/execution/utils.d.ts

@@ -1,8 +1,15 @@
 import { type Address, type Chain, type HashTypedDataParameters, type Hex, type PublicClient, type SignableMessage, type SignedAuthorization, type SignedAuthorizationList, type TypedData, type TypedDataDefinition, type TypedDataDomain } from 'viem';
 import { type UserOperation } from 'viem/account-abstraction';
+import type { ResolvedSessionSignerSet } from '../modules/validators/smart-sessions';
 import { type IntentOp, type IntentRoute } from '../orchestrator';
 import { type AuxiliaryFunds, type OriginSignature, type SettlementLayer } from '../orchestrator/types';
-import type { Call, CalldataInput, CallInput, RhinestoneAccountConfig, RhinestoneConfig, SignerSet, SourceAssetInput, Sponsorship, TokenRequest, TokenSymbol, Transaction, UserOperationTransaction } from '../types';
+import type { Call, CalldataInput, CallInput, RhinestoneAccountConfig, RhinestoneConfig, Session, SessionEnableData, SessionSignerSet, SignerSet, SourceAssetInput, Sponsorship, TokenRequest, TokenSymbol, Transaction, UserOperationTransaction } from '../types';
+type InternalSignerSet = Exclude<SignerSet, SessionSignerSet> | ResolvedSessionSignerSet;
+declare function resolveSessionForChain(signers: SessionSignerSet, chainId: number): {
+    session: Session;
+    enableData?: SessionEnableData;
+    verifyExecutions?: boolean;
+};
 interface UserOperationResult {
     type: 'userop';
     hash: Hex;
@@ -16,6 +23,7 @@ interface TransactionResult {
 }
 interface PreparedTransactionData {
     intentRoute: IntentRoute;
+    intentInput: unknown;
     transaction: Transaction;
 }
 interface PreparedUserOperationData {
@@ -73,13 +81,16 @@ declare function prepareTransactionAsIntent(config: RhinestoneConfig, sourceChai
         to: Address;
         data: Hex;
     }[];
-} | undefined, signers: SignerSet | undefined): Promise<IntentRoute>;
+} | undefined, signers: SignerSet | undefined, sourceCalls: Record<number, CallInput[]> | undefined): Promise<{
+    intentRoute: IntentRoute;
+    intentInput: any;
+}>;
 declare function signIntent(config: RhinestoneConfig, intentOp: IntentOp, targetChain: Chain, signers?: SignerSet, targetExecution?: boolean): Promise<{
     originSignatures: OriginSignature[];
     destinationSignature: `0x${string}`;
 }>;
-declare function submitIntentInternal(config: RhinestoneConfig, sourceChains: Chain[] | undefined, targetChain: Chain, intentOp: IntentOp, originSignatures: OriginSignature[], destinationSignature: Hex, targetExecutionSignature: Hex | undefined, authorizations: SignedAuthorizationList, dryRun: boolean): Promise<TransactionResult>;
-declare function getValidatorAccount(config: RhinestoneConfig, signers: SignerSet | undefined, publicClient: PublicClient, chain: Chain): Promise<import("viem/account-abstraction").SmartAccount<import("viem/account-abstraction").SmartAccountImplementation<import("viem").Abi, "0.7">> | null | undefined>;
+declare function submitIntentInternal(config: RhinestoneConfig, sourceChains: Chain[] | undefined, targetChain: Chain, intentOp: IntentOp, originSignatures: OriginSignature[], destinationSignature: Hex, targetExecutionSignature: Hex | undefined, authorizations: SignedAuthorizationList, dryRun: boolean, intentInput?: unknown): Promise<TransactionResult>;
+declare function getValidatorAccount(config: RhinestoneConfig, signers: SignerSet | undefined, publicClient: PublicClient, chain: Chain): Promise<import("viem/_types/account-abstraction").SmartAccount<import("viem/_types/account-abstraction").SmartAccountImplementation<import("viem").Abi, "0.7">> | null | undefined>;
 declare function parseCalls(calls: CalldataInput[], chainId: number): Call[];
 declare function hashErc7739TypedDataForSolady({ domain, types, primaryType, message, verifierDomain, }: {
     domain: TypedDataDomain;
@@ -94,6 +105,6 @@ declare function hashErc7739TypedDataForSolady({ domain, types, primaryType, mes
         salt: Hex;
     };
 }): Hex;
-export { prepareTransaction, getTransactionMessages, signTransaction, signAuthorizations, signAuthorizationsInternal, signMessage, signTypedData, submitTransaction, prepareUserOperation, signUserOperation, submitUserOperation, signIntent, prepareTransactionAsIntent, submitIntentInternal, getValidatorAccount, parseCalls, getTokenRequests, resolveCallInputs, getIntentAccount, getTargetExecutionSignature, hashErc7739TypedDataForSolady, };
-export type { IntentRoute, TransactionResult, PreparedTransactionData, PreparedUserOperationData, SignedTransactionData, SignedUserOperationData, UserOperationResult, };
+export { prepareTransaction, getTransactionMessages, signTransaction, signAuthorizations, signAuthorizationsInternal, signMessage, signTypedData, submitTransaction, prepareUserOperation, signUserOperation, submitUserOperation, signIntent, prepareTransactionAsIntent, submitIntentInternal, getValidatorAccount, parseCalls, getTokenRequests, resolveCallInputs, getIntentAccount, getTargetExecutionSignature, hashErc7739TypedDataForSolady, resolveSessionForChain, };
+export type { InternalSignerSet, IntentRoute, TransactionResult, PreparedTransactionData, PreparedUserOperationData, SignedTransactionData, SignedUserOperationData, UserOperationResult, };
 //# sourceMappingURL=utils.d.ts.map

package/dist/src/execution/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../execution/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../execution/utils.ts"],"names":[],"mappings":"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"}

package/dist/src/execution/utils.js

@@ -21,32 +21,67 @@ exports.resolveCallInputs = resolveCallInputs;
 exports.getIntentAccount = getIntentAccount;
 exports.getTargetExecutionSignature = getTargetExecutionSignature;
 exports.hashErc7739TypedDataForSolady = hashErc7739TypedDataForSolady;
+exports.resolveSessionForChain = resolveSessionForChain;
 const viem_1 = require("viem");
 const account_abstraction_1 = require("viem/account-abstraction");
 const erc7739_1 = require("viem/experimental/erc7739");
 const accounts_1 = require("../accounts");
+const common_1 = require("../accounts/signing/common");
 const startale_1 = require("../accounts/startale");
 const utils_1 = require("../accounts/utils");
+const provider_1 = require("../auth/provider");
 const modules_1 = require("../modules");
 const validators_1 = require("../modules/validators");
 const core_1 = require("../modules/validators/core");
+const permit2_1 = require("../modules/validators/policies/claim/permit2");
 const orchestrator_1 = require("../orchestrator");
 const registry_1 = require("../orchestrator/registry");
 const types_1 = require("../orchestrator/types");
+const utils_2 = require("../orchestrator/utils");
 const compact_1 = require("./compact");
 const error_1 = require("./error");
-const permit2_1 = require("./permit2");
+const permit2_2 = require("./permit2");
 const singleChainOps_1 = require("./singleChainOps");
+function isResolvedSessionSignerSet(signers) {
+    return (signers?.type === 'experimental_session' && 'verifyExecutions' in signers);
+}
+async function resolveSignersForChain(config, signers, chainId) {
+    if (signers?.type !== 'experimental_session') {
+        return signers;
+    }
+    const resolved = resolveSessionForChain(signers, chainId);
+    const enabled = await (0, validators_1.isSessionEnabled)((0, accounts_1.getAddress)(config), config.provider, resolved.session, config.useDevContracts);
+    const enableData = enabled ? undefined : resolved.enableData;
+    const hasExplicitActions = !!resolved.session.actions?.length;
+    const verifyExecutions = resolved.verifyExecutions ?? signers.verifyExecutions ?? hasExplicitActions;
+    return {
+        type: 'experimental_session',
+        session: resolved.session,
+        enableData,
+        verifyExecutions,
+    };
+}
+function resolveSessionForChain(signers, chainId) {
+    if ('sessions' in signers) {
+        const config = signers.sessions[chainId];
+        if (!config) {
+            throw new Error(`No session configured for chain ${chainId}`);
+        }
+        return config;
+    }
+    return { session: signers.session, enableData: signers.enableData };
+}
 async function prepareTransaction(config, transaction) {
-    const { sourceChains, targetChain, tokenRequests, signers, sponsored, eip7702InitSignature, settlementLayers, sourceAssets, feeAsset, lockFunds, auxiliaryFunds, account, recipient, } = getTransactionParams(transaction);
+    const { sourceChains, targetChain, tokenRequests, signers, sponsored, eip7702InitSignature, settlementLayers, sourceAssets, feeAsset, lockFunds, auxiliaryFunds, account, recipient, sourceCalls, } = getTransactionParams(transaction);
     const accountAddress = (0, accounts_1.getAddress)(config);
     const isUserOpSigner = signers?.type === 'guardians';
     if (isUserOpSigner) {
         throw new error_1.SignerNotSupportedError();
     }
-    const intentRoute = await prepareTransactionAsIntent(config, sourceChains, targetChain, await resolveCallInputs(transaction.calls, config, targetChain, accountAddress), transaction.gasLimit, tokenRequests, recipient, sponsored, eip7702InitSignature, settlementLayers, sourceAssets, feeAsset, lockFunds, auxiliaryFunds, account, signers);
+    const prepared = await prepareTransactionAsIntent(config, sourceChains, targetChain, await resolveCallInputs(transaction.calls, config, targetChain, accountAddress), transaction.gasLimit, tokenRequests, recipient, sponsored, eip7702InitSignature, settlementLayers, sourceAssets, feeAsset, lockFunds, auxiliaryFunds, account, signers, sourceCalls);
     return {
-        intentRoute,
+        intentRoute: prepared.intentRoute,
+        intentInput: prepared.intentInput,
         transaction,
     };
 }
@@ -95,6 +130,7 @@ async function signTransaction(config, preparedTransaction) {
     const targetExecutionSignature = await getTargetExecutionSignature(config, intentRoute.intentOp, targetChain, signers);
     return {
         intentRoute,
+        intentInput: preparedTransaction.intentInput,
         transaction: preparedTransaction.transaction,
         originSignatures,
         destinationSignature,
@@ -105,6 +141,16 @@ async function getTargetExecutionSignature(config, intentOp, targetChain, signer
     if (signers?.type !== 'experimental_session') {
         return undefined;
     }
+    const settlementLayers = intentOp.elements.map((e) => e.mandate.qualifier.settlementContext.settlementLayer);
+    const hasIntentExecutorOps = settlementLayers.some((l) => l === 'INTENT_EXECUTOR' || l === 'SAME_CHAIN');
+    if (!hasIntentExecutorOps) {
+        return undefined;
+    }
+    const resolvedSigners = await resolveSignersForChain(config, signers, targetChain.id);
+    if (!isResolvedSessionSignerSet(resolvedSigners) ||
+        !resolvedSigners.verifyExecutions) {
+        return undefined;
+    }
     const destination = getTargetExecutionMessage(config, intentOp);
     const validator = getValidator(config, signers);
     if (!validator) {
@@ -112,7 +158,7 @@ async function getTargetExecutionSignature(config, intentOp, targetChain, signer
     }
     const ownerValidator = (0, validators_1.getOwnerValidator)(config);
     const isRoot = validator.address === ownerValidator.address;
-    const signature = await getDestinationSignature(config, signers, validator, isRoot, targetChain, destination, [], true);
+    const signature = await getDestinationSignature(config, resolvedSigners, validator, isRoot, targetChain, destination, [], true);
     return signature;
 }
 async function signUserOperation(config, preparedUserOperation) {
@@ -153,10 +199,23 @@ async function signTypedData(config, parameters, chain, signers, options) {
     const ownerValidator = (0, validators_1.getOwnerValidator)(config);
     const isRoot = validator.address === ownerValidator.address;
     if (signers?.type === 'experimental_session') {
+        const resolved = resolveSessionForChain(signers, chain.id);
         return await signTypedDataWithSession(config, chain, {
             address: validator.address,
             isRoot,
-        }, signers, parameters);
+        }, resolved.session, parameters);
+    }
+    const account = (0, accounts_1.getAccountProvider)(config);
+    if (account.type === 'startale' && (0, core_1.supportsEip712)(validator)) {
+        const isK1 = validator.address.toLowerCase() ===
+            startale_1.K1_DEFAULT_VALIDATOR_ADDRESS.toLowerCase();
+        if (isK1) {
+            const sig = await signErc7739TypedData(config, signers, validator, isRoot, parameters, chain);
+            if (!options?.skipErc6492) {
+                return await (0, accounts_1.toErc6492Signature)(config, sig, chain);
+            }
+            return sig;
+        }
     }
     const signature = await (0, accounts_1.getTypedDataPackedSignature)(config, signers, chain, {
         address: validator.address,
@@ -167,8 +226,9 @@ async function signTypedData(config, parameters, chain, signers, options) {
     }
     return signature;
 }
-async function signTypedDataWithSession(config, chain, validator, signers, parameters) {
+async function signTypedDataWithSession(config, chain, validator, session, parameters) {
     const { name, version, chainId, verifyingContract, salt } = (0, accounts_1.getEip712Domain)(config, chain);
+    const signers = (0, common_1.convertOwnerSetToSignerSet)(session.owners);
     const signature = await (0, accounts_1.getTypedDataPackedSignature)(config, signers, chain, validator, {
         domain: parameters.domain,
         primaryType: 'TypedDataSign',
@@ -199,7 +259,7 @@ async function signTypedDataWithSession(config, chain, validator, signers, param
             message: parameters.message,
             signature,
         });
-        return (0, viem_1.encodePacked)(['bytes32', 'bytes'], [(0, validators_1.getPermissionId)(signers.session), erc7739Signature]);
+        return (0, viem_1.encodePacked)(['bytes32', 'bytes'], [(0, validators_1.getPermissionId)(session), erc7739Signature]);
     });
     return await (0, accounts_1.toErc6492Signature)(config, signature, chain);
 }
@@ -240,10 +300,10 @@ async function signAuthorizationsInternal(config, data) {
     return authorizations;
 }
 async function submitTransaction(config, signedTransaction, authorizations, dryRun = false) {
-    const { intentRoute, transaction, originSignatures, destinationSignature, targetExecutionSignature, } = signedTransaction;
+    const { intentRoute, intentInput, transaction, originSignatures, destinationSignature, targetExecutionSignature, } = signedTransaction;
     const { sourceChains, targetChain } = getTransactionParams(transaction);
     const intentOp = intentRoute.intentOp;
-    return await submitIntent(config, sourceChains, targetChain, intentOp, originSignatures, destinationSignature, targetExecutionSignature, authorizations, dryRun);
+    return await submitIntent(config, sourceChains, targetChain, intentOp, originSignatures, destinationSignature, targetExecutionSignature, authorizations, dryRun, intentInput);
 }
 async function submitUserOperation(config, signedUserOperation) {
     const chain = signedUserOperation.transaction.chain;
@@ -267,6 +327,7 @@ function getTransactionParams(transaction) {
     const auxiliaryFunds = transaction.auxiliaryFunds;
     const account = transaction.experimental_accountOverride;
     const recipient = transaction.recipient;
+    const sourceCalls = transaction.sourceCalls;
     const tokenRequests = getTokenRequests(targetChain, initialTokenRequests);
     return {
         sourceChains,
@@ -283,6 +344,7 @@ function getTransactionParams(transaction) {
         auxiliaryFunds,
         account,
         recipient,
+        sourceCalls,
     };
 }
 function getTokenRequests(targetChain, initialTokenRequests) {
@@ -336,7 +398,7 @@ function getIntentAccount(config, eip7702InitSignature, account) {
         delegations,
     };
 }
-async function prepareTransactionAsIntent(config, sourceChains, targetChain, callInputs, gasLimit, tokenRequests, recipientInput, sponsored, eip7702InitSignature, settlementLayers, sourceAssets, feeAsset, lockFunds, auxiliaryFunds, account, signers) {
+async function prepareTransactionAsIntent(config, sourceChains, targetChain, callInputs, gasLimit, tokenRequests, recipientInput, sponsored, eip7702InitSignature, settlementLayers, sourceAssets, feeAsset, lockFunds, auxiliaryFunds, account, signers, sourceCalls) {
     const calls = parseCalls(callInputs, targetChain.id);
     const accountAccessList = createAccountAccessList(sourceChains, sourceAssets);
     function getRecipient(recipient) {
@@ -357,13 +419,76 @@ async function prepareTransactionAsIntent(config, sourceChains, targetChain, cal
     const intentAccount = {
         ...getIntentAccount(config, eip7702InitSignature, account),
         ...(signers?.type === 'experimental_session' && {
-            mockSignature: (0, validators_1.buildMockSignature)(signers.session, config.useDevContracts, sourceChains?.length),
+            // Global fallback: target-chain sig for backward-compat with older orchestrators
+            mockSignature: (0, validators_1.buildMockSignature)(resolveSessionForChain(signers, targetChain.id).session, config.useDevContracts, sourceChains?.length ?? 1),
+            // Per-chain map: enables accurate per-chain session validation gas simulation
+            mockSignatures: Object.fromEntries([
+                ...new Set([
+                    ...(sourceChains ?? []).map((c) => c.id),
+                    targetChain.id,
+                ]),
+            ].map((chainId) => [
+                String(chainId),
+                (0, validators_1.buildMockSignature)(resolveSessionForChain(signers, chainId).session, config.useDevContracts, sourceChains?.length ?? 1, chainId),
+            ])),
         }),
     };
     const recipient = getRecipient(recipientInput);
     const signatureMode = signers?.type === 'experimental_session'
         ? types_1.SIG_MODE_EMISSARY_EXECUTION_ERC1271
         : types_1.SIG_MODE_ERC1271_EMISSARY;
+    // For session signers that need enabling, pass a dummy preclaimop per source chain
+    // so the orchestrator bakes it into the bundle before computing its HMAC. The filler
+    // executes the op via verifyExecution in ENABLE mode, enabling the session on-chain
+    // without a separate UserOp. Must be sent in the routing request — not injected
+    // post-facto — because the orchestrator HMAC covers preClaimOps.
+    const preClaimExecutions = {};
+    if (signers?.type === 'experimental_session' && sourceChains) {
+        const resolvedPerChain = await Promise.all(sourceChains.map(async (chain) => ({
+            chainId: chain.id,
+            resolved: await resolveSignersForChain(config, signers, chain.id),
+        })));
+        for (const { chainId, resolved } of resolvedPerChain) {
+            if (!isResolvedSessionSignerSet(resolved))
+                continue;
+            const { enableData, verifyExecutions } = resolved;
+            if (!verifyExecutions || !enableData)
+                continue;
+            preClaimExecutions[chainId] = [
+                {
+                    to: validators_1.DUMMY_PRECLAIMOP_TARGET,
+                    value: 0n,
+                    data: validators_1.DUMMY_PRECLAIMOP_SELECTOR,
+                },
+            ];
+        }
+    }
+    if (sourceCalls) {
+        const accountAddress = (0, accounts_1.getAddress)(config);
+        const allowedChainIds = new Set([
+            ...(sourceChains ?? []).map((c) => c.id),
+            targetChain.id,
+        ]);
+        for (const [chainIdStr, calls] of Object.entries(sourceCalls)) {
+            const chainId = Number(chainIdStr);
+            if (!allowedChainIds.has(chainId)) {
+                throw new error_1.InvalidSourceCallsError({ chainId });
+            }
+            const chain = sourceChains?.find((c) => c.id === chainId) ??
+                (targetChain.id === chainId ? targetChain : undefined);
+            if (!chain) {
+                throw new error_1.InvalidSourceCallsError({ chainId });
+            }
+            const resolved = await resolveCallInputs(calls, config, chain, accountAddress);
+            const userExecutions = parseCalls(resolved, chainId);
+            if (userExecutions.length === 0)
+                continue;
+            preClaimExecutions[chainId] = [
+                ...(preClaimExecutions[chainId] ?? []),
+                ...userExecutions,
+            ];
+        }
+    }
     const metaIntent = {
         destinationChainId: targetChain.id,
         tokenRequests: tokenRequests.map((tokenRequest) => ({
@@ -395,10 +520,12 @@ async function prepareTransactionAsIntent(config, sourceChains, targetChain, cal
             signatureMode,
             auxiliaryFunds,
         },
+        ...(Object.keys(preClaimExecutions).length > 0 && { preClaimExecutions }),
     };
-    const orchestrator = (0, orchestrator_1.getOrchestrator)(config.apiKey, config.endpointUrl, config.headers);
+    const serializedIntent = (0, utils_2.convertBigIntFields)(metaIntent);
+    const orchestrator = (0, orchestrator_1.getOrchestrator)(config._authProvider ?? (0, provider_1.createAuthProvider)(config), config.endpointUrl, config.headers);
     const intentRoute = await orchestrator.getIntentRoute(metaIntent);
-    return intentRoute;
+    return { intentRoute, intentInput: serializedIntent };
 }
 async function signIntent(config, intentOp, targetChain, signers, targetExecution) {
     const { origin, destination } = getIntentMessages(config, intentOp);
@@ -432,23 +559,12 @@ async function signIntent(config, intentOp, targetChain, signers, targetExecutio
     const originSignatures = [];
     for (const typedData of origin) {
         const chain = (0, registry_1.getChainById)(typedData.domain?.chainId);
-        // For same chain transactions, we need to modify the origin signers
-        // Specifically, we need to remove the enable data in this case
-        const matchesTargetChain = chain.id === targetChain.id;
-        const originSigners = signers?.type === 'experimental_session'
-            ? {
-                type: 'experimental_session',
-                session: signers.session,
-                verifyExecutions: matchesTargetChain
-                    ? signers.verifyExecutions
-                    : undefined,
-                enableData: matchesTargetChain ? signers.enableData : undefined,
-            }
-            : signers;
+        const originSigners = await resolveSignersForChain(config, signers, chain.id);
         const signature = await signIntentTypedData(config, originSigners, validator, isRoot, typedData, chain, targetExecution ?? false);
         originSignatures.push(signature);
     }
-    const destinationSignature = await getDestinationSignature(config, signers, validator, isRoot, targetChain, destination, originSignatures, targetExecution ?? false);
+    const destinationSigners = await resolveSignersForChain(config, signers, targetChain.id);
+    const destinationSignature = await getDestinationSignature(config, destinationSigners, validator, isRoot, targetChain, destination, originSignatures, targetExecution ?? false);
     return {
         originSignatures,
         destinationSignature,
@@ -493,7 +609,7 @@ function getIntentMessages(config, intentOp) {
             origin.push(typedData);
         }
         else if (withPermit2) {
-            const typedData = (0, permit2_1.getTypedData)(element, BigInt(intentOp.nonce), BigInt(intentOp.expires));
+            const typedData = (0, permit2_2.getTypedData)(element, BigInt(intentOp.nonce), BigInt(intentOp.expires));
             origin.push(typedData);
         }
         else {
@@ -519,12 +635,28 @@ function getTargetExecutionMessage(config, intentOp) {
     };
     return typedData;
 }
+/** Computes claim policy calldata when parameters are Permit2 typed data with claim policies. */
+function resolveClaimPolicyData(signers, parameters) {
+    if (parameters.primaryType !== 'PermitBatchWitnessTransferFrom' ||
+        !signers.session.claimPolicies?.length) {
+        return undefined;
+    }
+    const msg = parameters.message;
+    if (!msg.permitted ||
+        !msg.mandate ||
+        typeof msg.spender !== 'string' ||
+        typeof msg.nonce !== 'bigint' ||
+        typeof msg.deadline !== 'bigint') {
+        return undefined;
+    }
+    return (0, permit2_1.buildPermit2ClaimPolicyCalldata)(signers.session.claimPolicies[0], parameters.message);
+}
 async function signIntentTypedData(config, signers, validator, isRoot, parameters, chain, targetExecution) {
     if ((0, core_1.supportsEip712)(validator)) {
         const isK1Validator = validator.address.toLowerCase() ===
             startale_1.K1_DEFAULT_VALIDATOR_ADDRESS.toLowerCase();
         if (isK1Validator) {
-            return await signErc7739IntentTypedData(config, signers, validator, isRoot, parameters, chain);
+            return await signErc7739TypedData(config, signers, validator, isRoot, parameters, chain);
         }
         return await (0, accounts_1.getTypedDataPackedSignature)(config, signers, chain, {
             address: validator.address,
@@ -532,20 +664,27 @@ async function signIntentTypedData(config, signers, validator, isRoot, parameter
         }, parameters);
     }
     const hash = (0, viem_1.hashTypedData)(parameters);
-    if (signers?.type === 'experimental_session' && signers.verifyExecutions) {
+    if (isResolvedSessionSignerSet(signers) && signers.verifyExecutions) {
         if (targetExecution) {
-            return await (0, accounts_1.getEmissarySignature)(config, {
+            const targetSigners = {
                 type: 'experimental_session',
                 session: signers.session,
                 verifyExecutions: true,
-            }, chain, hash);
+                enableData: signers.enableData,
+            };
+            // signWithSession (called inside getEmissarySignature) already calls packSignature
+            // internally, so no transform is needed here
+            return await (0, accounts_1.getEmissarySignature)(config, targetSigners, chain, hash);
         }
-        const eip1271Signature = await (0, accounts_1.getEip1271Signature)(config, {
+        const claimPolicyData = resolveClaimPolicyData(signers, parameters);
+        const sessionSignersForEip1271 = {
             type: 'experimental_session',
             session: signers.session,
             verifyExecutions: false,
             enableData: signers.enableData,
-        }, chain, {
+            claimPolicyData,
+        };
+        const eip1271Signature = await (0, accounts_1.getEip1271Signature)(config, sessionSignersForEip1271, chain, {
             address: validator.address,
             isRoot,
         }, hash);
@@ -560,6 +699,13 @@ async function signIntentTypedData(config, signers, validator, isRoot, parameter
             notarizedClaimSig: eip1271Signature,
         };
     }
+    if (isResolvedSessionSignerSet(signers)) {
+        const claimPolicyData = resolveClaimPolicyData(signers, parameters);
+        return await (0, accounts_1.getEip1271Signature)(config, claimPolicyData !== undefined ? { ...signers, claimPolicyData } : signers, chain, {
+            address: validator.address,
+            isRoot,
+        }, hash);
+    }
     return await (0, accounts_1.getEip1271Signature)(config, signers, chain, {
         address: validator.address,
         isRoot,
@@ -619,8 +765,8 @@ async function submitUserOp(config, chain, userOp, signature) {
         chain: chain.id,
     };
 }
-async function submitIntent(config, sourceChains, targetChain, intentOp, originSignatures, destinationSignature, targetExecutionSignature, authorizations, dryRun) {
-    return submitIntentInternal(config, sourceChains, targetChain, intentOp, originSignatures, destinationSignature, targetExecutionSignature, authorizations, dryRun);
+async function submitIntent(config, sourceChains, targetChain, intentOp, originSignatures, destinationSignature, targetExecutionSignature, authorizations, dryRun, intentInput) {
+    return submitIntentInternal(config, sourceChains, targetChain, intentOp, originSignatures, destinationSignature, targetExecutionSignature, authorizations, dryRun, intentInput);
 }
 function createSignedIntentOp(intentOp, originSignatures, destinationSignature, targetExecutionSignature, authorizations) {
     return {
@@ -640,13 +786,17 @@ function createSignedIntentOp(intentOp, originSignatures, destinationSignature,
             : undefined,
     };
 }
-async function submitIntentInternal(config, sourceChains, targetChain, intentOp, originSignatures, destinationSignature, targetExecutionSignature, authorizations, dryRun) {
+async function submitIntentInternal(config, sourceChains, targetChain, intentOp, originSignatures, destinationSignature, targetExecutionSignature, authorizations, dryRun, intentInput) {
     const signedIntentOp = createSignedIntentOp(intentOp, originSignatures, destinationSignature, targetExecutionSignature, authorizations);
-    const orchestrator = (0, orchestrator_1.getOrchestrator)(config.apiKey, config.endpointUrl, config.headers);
-    const intentResults = await orchestrator.submitIntent(signedIntentOp, dryRun);
+    const isSponsored = !!intentInput?.options?.sponsorSettings;
+    const orchestrator = (0, orchestrator_1.getOrchestrator)(config._authProvider ?? (0, provider_1.createAuthProvider)(config), config.endpointUrl, config.headers);
+    const intentResults = await orchestrator.submitIntent(signedIntentOp, dryRun, intentInput ? { intentInput, isSponsored } : undefined);
+    // Some settlement paths (e.g. SAME_CHAIN) may not return a result.id — fall
+    // back to the nonce which the orchestrator also accepts as an intent identifier.
+    const intentId = intentResults.result.id ?? intentOp.nonce;
     return {
         type: 'intent',
-        id: BigInt(intentResults.result.id),
+        id: BigInt(intentId),
         sourceChains: sourceChains?.map((chain) => chain.id),
         targetChain: targetChain.id,
     };
@@ -807,10 +957,10 @@ function validateTokenSymbols(chain, tokenAddressOrSymbols) {
         }
     }
 }
-// Signs intent typed data using ERC-7739 nested EIP-712 for Startale accounts.
+// Signs typed data using ERC-7739 nested EIP-712 for Startale accounts.
 // Uses a Solady-compatible TypedDataSign hash and wraps the signature with
 // the app domain separator and contents hash for on-chain verification.
-async function signErc7739IntentTypedData(config, signers, validator, isRoot, parameters, chain) {
+async function signErc7739TypedData(config, signers, validator, isRoot, parameters, chain) {
     const verifierDomain = (0, accounts_1.getEip712Domain)(config, chain);
     const hash = hashErc7739TypedDataForSolady({
         domain: parameters.domain,