@charterlabs/rhinestone-sdk 0.2.8 → 0.2.9

package/dist/src/execution/smart-session.js

@@ -2,113 +2,137 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.enableSmartSession = enableSmartSession;
 exports.getSessionDetails = getSessionDetails;
-exports.getMultichainDigest = getMultichainDigest;
 const viem_1 = require("viem");
 const accounts_1 = require("../accounts");
 const utils_1 = require("../accounts/utils");
 const validators_1 = require("../modules/validators");
 const smart_sessions_1 = require("../modules/validators/smart-sessions");
 const error_1 = require("./error");
-async function getSessionDetails(config, sessions, sessionIndex, signature) {
-    const account = (0, accounts_1.getAccountProvider)(config);
+const smartSessionTypes = {
+    PolicyData: [
+        { name: 'policy', type: 'address' },
+        { name: 'initData', type: 'bytes' },
+    ],
+    ActionData: [
+        { name: 'actionTargetSelector', type: 'bytes4' },
+        { name: 'actionTarget', type: 'address' },
+        { name: 'actionPolicies', type: 'PolicyData[]' },
+    ],
+    ERC7739Context: [
+        { name: 'appDomainSeparator', type: 'bytes32' },
+        { name: 'contentName', type: 'string[]' },
+    ],
+    ERC7739Data: [
+        { name: 'allowedERC7739Content', type: 'ERC7739Context[]' },
+        { name: 'erc1271Policies', type: 'PolicyData[]' },
+    ],
+    SignedPermissions: [
+        { name: 'permitGenericPolicy', type: 'bool' },
+        { name: 'permitAdminAccess', type: 'bool' },
+        { name: 'ignoreSecurityAttestations', type: 'bool' },
+        { name: 'permitERC4337Paymaster', type: 'bool' },
+        { name: 'userOpPolicies', type: 'PolicyData[]' },
+        { name: 'erc7739Policies', type: 'ERC7739Data' },
+        { name: 'actions', type: 'ActionData[]' },
+    ],
+    SignedSession: [
+        { name: 'account', type: 'address' },
+        { name: 'permissions', type: 'SignedPermissions' },
+        { name: 'sessionValidator', type: 'address' },
+        { name: 'sessionValidatorInitData', type: 'bytes' },
+        { name: 'salt', type: 'bytes32' },
+        { name: 'smartSession', type: 'address' },
+        { name: 'nonce', type: 'uint256' },
+    ],
+    ChainSession: [
+        { name: 'chainId', type: 'uint64' },
+        { name: 'session', type: 'SignedSession' },
+    ],
+    MultiChainSession: [{ name: 'sessionsAndChainIds', type: 'ChainSession[]' }],
+};
+async function getSessionDetails(config, sessions, sessionIndex, initialNonces, signature) {
+    const chains = sessions
+        .map((session) => session.chain)
+        .filter((chain) => !!chain);
+    if (chains.length !== sessions.length) {
+        throw new error_1.SessionChainRequiredError();
+    }
     const accountAddress = (0, accounts_1.getAddress)(config);
-    const sessionDetails = await getEnableSessionDetails(account.type, sessions, sessionIndex, accountAddress, config.provider);
+    const publicClients = chains.map((chain) => (0, viem_1.createPublicClient)({
+        chain,
+        transport: (0, utils_1.createTransport)(chain, config.provider),
+    }));
+    const sessionDatas = sessions.map((session) => (0, smart_sessions_1.getSmartSessionData)(session));
+    const sessionNonces = await Promise.all(sessions.map((session, index) => initialNonces?.[index] ??
+        getSessionNonce(publicClients[index], accountAddress, (0, validators_1.getPermissionId)(session))));
+    const signedSessions = sessionDatas.map((session, index) => ({
+        account: accountAddress,
+        permissions: {
+            permitGenericPolicy: session.actions.some((action) => action.actionTarget === smart_sessions_1.SMART_SESSIONS_FALLBACK_TARGET_FLAG &&
+                action.actionTargetSelector ===
+                    smart_sessions_1.SMART_SESSIONS_FALLBACK_TARGET_SELECTOR_FLAG),
+            permitAdminAccess: session.actions.some((action) => action.actionTargetSelector ===
+                smart_sessions_1.SMART_SESSIONS_FALLBACK_TARGET_SELECTOR_FLAG_PERMITTED_TO_CALL_SMARTSESSION),
+            ignoreSecurityAttestations: false,
+            permitERC4337Paymaster: session.permitERC4337Paymaster,
+            userOpPolicies: session.userOpPolicies,
+            erc7739Policies: session.erc7739Policies,
+            actions: session.actions,
+        },
+        sessionValidator: session.sessionValidator,
+        sessionValidatorInitData: session.sessionValidatorInitData,
+        salt: session.salt,
+        smartSession: validators_1.SMART_SESSIONS_VALIDATOR_ADDRESS,
+        nonce: sessionNonces[index],
+    }));
+    const chainDigests = signedSessions.map((session, index) => ({
+        chainId: BigInt(chains[index].id),
+        sessionDigest: (0, viem_1.hashStruct)({
+            types: smartSessionTypes,
+            primaryType: 'SignedSession',
+            data: session,
+        }),
+    }));
+    const typedData = {
+        domain: {
+            name: 'SmartSession',
+            version: '1',
+        },
+        types: smartSessionTypes,
+        primaryType: 'MultiChainSession',
+        message: {
+            sessionsAndChainIds: signedSessions.map((session, index) => ({
+                chainId: BigInt(chains[index].id),
+                session,
+            })),
+        },
+    };
     const chain = sessions[sessionIndex].chain;
     if (!chain) {
         throw new error_1.SessionChainRequiredError();
     }
     const validator = {
-        address: sessionDetails.enableSessionData.validator,
-        isRoot: true,
+        address: sessionDatas[sessionIndex].sessionValidator,
+        isRoot: false,
     };
-    sessionDetails.enableSessionData.signature =
-        signature ??
-            (await (0, accounts_1.getPackedSignature)(config, undefined, chain, validator, sessionDetails.permissionEnableHash));
-    return sessionDetails;
-}
-async function getEnableSessionDetails(accountType, sessions, sessionIndex, accountAddress, provider) {
-    const chainDigests = [];
-    const chainSessions = [];
-    for (const session of sessions) {
-        const permissionId = (0, validators_1.getPermissionId)(session);
-        const sessionChain = session.chain;
-        if (!sessionChain) {
-            throw new error_1.SessionChainRequiredError();
-        }
-        const publicClient = (0, viem_1.createPublicClient)({
-            chain: sessionChain,
-            transport: (0, utils_1.createTransport)(sessionChain, provider),
-        });
-        const sessionNonce = await getSessionNonce(publicClient, accountAddress, permissionId);
-        const sessionData = await (0, smart_sessions_1.getSessionData)(session);
-        const sessionDigest = await getSessionDigest(publicClient, accountAddress, sessionData, permissionId, validators_1.SMART_SESSION_MODE_ENABLE);
-        chainDigests.push({
-            chainId: BigInt(sessionChain.id),
-            sessionDigest,
-        });
-        chainSessions.push({
-            chainId: BigInt(sessionChain.id),
-            session: {
-                permissions: {
-                    permitGenericPolicy: false,
-                    permitAdminAccess: false,
-                    ignoreSecurityAttestations: false,
-                    permitERC4337Paymaster: sessionData.permitERC4337Paymaster,
-                    userOpPolicies: sessionData.userOpPolicies,
-                    erc7739Policies: sessionData.erc7739Policies,
-                    actions: sessionData.actions,
-                },
-                salt: sessionData.salt,
-                sessionValidator: sessionData.sessionValidator,
-                sessionValidatorInitData: sessionData.sessionValidatorInitData,
-                account: accountAddress,
-                smartSession: validators_1.SMART_SESSIONS_VALIDATOR_ADDRESS,
-                nonce: sessionNonce,
-            },
-        });
-    }
-    const permissionEnableHash = getMultichainDigest(chainDigests);
-    const sessionToEnable = sessions[sessionIndex || 0];
-    const sessionChain = sessionToEnable.chain;
-    if (!sessionChain) {
-        throw new error_1.SessionChainRequiredError();
-    }
-    const sessionData = await (0, smart_sessions_1.getSessionData)(sessionToEnable);
+    const sessionSignature = signature ??
+        (await (0, accounts_1.getTypedDataPackedSignature)(config, undefined, chain, validator, typedData));
     return {
-        permissionEnableHash,
-        mode: validators_1.SMART_SESSION_MODE_ENABLE,
-        hashesAndChainIds: chainDigests,
+        nonces: sessionNonces,
+        signature: sessionSignature,
         enableSessionData: {
-            permissionId: (0, validators_1.getPermissionId)(sessionToEnable),
-            validator: sessionData.sessionValidator,
-            accountType,
             chainDigestIndex: sessionIndex,
-            hashesAndChainIds: chainDigests,
-            sessionToEnable: sessionData,
-            signature: '0x',
+            hashesAndChainIds: chainDigests.map((chainDigest) => ({
+                chainId: BigInt(chainDigest.chainId),
+                sessionDigest: chainDigest.sessionDigest,
+            })),
+            sessionToEnable: sessionDatas[sessionIndex],
+            signature: sessionSignature,
         },
     };
 }
-function getMultichainDigest(chainDigests) {
-    function hashChainDigestMimicRPC(chainDigest) {
-        const CHAIN_SESSION_TYPEHASH = '0x1ea7e4bc398fa0ccd68d92b5d8931a3fd93eebe1cf0391b4ba28935801af7c80';
-        return (0, viem_1.keccak256)((0, viem_1.encodePacked)(['bytes32', 'uint256', 'bytes32'], [
-            CHAIN_SESSION_TYPEHASH,
-            chainDigest.chainId,
-            chainDigest.sessionDigest,
-        ]));
-    }
-    function hashChainDigestArray(chainDigests) {
-        const hashes = chainDigests.map((digest) => hashChainDigestMimicRPC(digest));
-        return (0, viem_1.keccak256)((0, viem_1.concat)(hashes));
-    }
-    const MULTICHAIN_SESSION_TYPEHASH = '0x0c9d02fb89a1da34d66ea2088dc9ee6a58efee71cef6f1bb849ed74fc6003d98';
-    const MULTICHAIN_DOMAIN_SEPARATOR = '0x057501e891776d1482927e5f094ae44049a4d893ba2d7b334dd7db8d38d3a0e1';
-    const structHash = (0, viem_1.keccak256)((0, viem_1.encodePacked)(['bytes32', 'bytes32'], [MULTICHAIN_SESSION_TYPEHASH, hashChainDigestArray(chainDigests)]));
-    return (0, viem_1.keccak256)((0, viem_1.concat)(['0x1901', MULTICHAIN_DOMAIN_SEPARATOR, structHash]));
-}
 async function getSessionNonce(client, account, permissionId) {
-    return (await client.readContract({
+    const nonce = await client.readContract({
         address: validators_1.SMART_SESSIONS_VALIDATOR_ADDRESS,
         abi: [
             {
@@ -128,147 +152,8 @@ async function getSessionNonce(client, account, permissionId) {
         ],
         functionName: 'getNonce',
         args: [permissionId, account],
-    }));
-}
-async function getSessionDigest(client, account, session, permissionId, mode) {
-    return (await client.readContract({
-        address: validators_1.SMART_SESSIONS_VALIDATOR_ADDRESS,
-        abi: [
-            {
-                type: 'function',
-                name: 'getSessionDigest',
-                inputs: [
-                    {
-                        name: 'permissionId',
-                        type: 'bytes32',
-                        internalType: 'PermissionId',
-                    },
-                    { name: 'account', type: 'address', internalType: 'address' },
-                    {
-                        name: 'data',
-                        type: 'tuple',
-                        internalType: 'struct Session',
-                        components: [
-                            {
-                                name: 'sessionValidator',
-                                type: 'address',
-                                internalType: 'contract ISessionValidator',
-                            },
-                            {
-                                name: 'sessionValidatorInitData',
-                                type: 'bytes',
-                                internalType: 'bytes',
-                            },
-                            { name: 'salt', type: 'bytes32', internalType: 'bytes32' },
-                            {
-                                name: 'userOpPolicies',
-                                type: 'tuple[]',
-                                internalType: 'struct PolicyData[]',
-                                components: [
-                                    {
-                                        name: 'policy',
-                                        type: 'address',
-                                        internalType: 'address',
-                                    },
-                                    { name: 'initData', type: 'bytes', internalType: 'bytes' },
-                                ],
-                            },
-                            {
-                                name: 'erc7739Policies',
-                                type: 'tuple',
-                                internalType: 'struct ERC7739Data',
-                                components: [
-                                    {
-                                        name: 'allowedERC7739Content',
-                                        type: 'tuple[]',
-                                        internalType: 'struct ERC7739Context[]',
-                                        components: [
-                                            {
-                                                name: 'appDomainSeparator',
-                                                type: 'bytes32',
-                                                internalType: 'bytes32',
-                                            },
-                                            {
-                                                name: 'contentName',
-                                                type: 'string[]',
-                                                internalType: 'string[]',
-                                            },
-                                        ],
-                                    },
-                                    {
-                                        name: 'erc1271Policies',
-                                        type: 'tuple[]',
-                                        internalType: 'struct PolicyData[]',
-                                        components: [
-                                            {
-                                                name: 'policy',
-                                                type: 'address',
-                                                internalType: 'address',
-                                            },
-                                            {
-                                                name: 'initData',
-                                                type: 'bytes',
-                                                internalType: 'bytes',
-                                            },
-                                        ],
-                                    },
-                                ],
-                            },
-                            {
-                                name: 'actions',
-                                type: 'tuple[]',
-                                internalType: 'struct ActionData[]',
-                                components: [
-                                    {
-                                        name: 'actionTargetSelector',
-                                        type: 'bytes4',
-                                        internalType: 'bytes4',
-                                    },
-                                    {
-                                        name: 'actionTarget',
-                                        type: 'address',
-                                        internalType: 'address',
-                                    },
-                                    {
-                                        name: 'actionPolicies',
-                                        type: 'tuple[]',
-                                        internalType: 'struct PolicyData[]',
-                                        components: [
-                                            {
-                                                name: 'policy',
-                                                type: 'address',
-                                                internalType: 'address',
-                                            },
-                                            {
-                                                name: 'initData',
-                                                type: 'bytes',
-                                                internalType: 'bytes',
-                                            },
-                                        ],
-                                    },
-                                ],
-                            },
-                            {
-                                name: 'permitERC4337Paymaster',
-                                type: 'bool',
-                                internalType: 'bool',
-                            },
-                        ],
-                    },
-                    {
-                        name: 'mode',
-                        type: 'uint8',
-                        internalType: 'enum SmartSessionMode',
-                    },
-                ],
-                outputs: [{ name: '', type: 'bytes32', internalType: 'bytes32' }],
-                stateMutability: 'view',
-            },
-        ],
-        functionName: 'getSessionDigest',
-        // @ts-ignore Viem fails to infer the type of "session"
-        args: [permissionId, account, session, Number(mode)],
-    }));
+    });
+    return nonce;
 }
 async function enableSmartSession(chain, config, session) {
     const publicClient = (0, viem_1.createPublicClient)({

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

@@ -1,7 +1,7 @@
 import { type Address, type Chain, type HashTypedDataParameters, type Hex, type PublicClient, type SignableMessage, type SignedAuthorization, type SignedAuthorizationList, type TypedData } from 'viem';
 import { type UserOperation } from 'viem/account-abstraction';
 import { type IntentOp, type IntentRoute } from '../orchestrator';
-import type { SettlementLayer } from '../orchestrator/types';
+import { type Account, type SettlementLayer } from '../orchestrator/types';
 import type { Call, CalldataInput, CallInput, RhinestoneConfig, SignerSet, SourceAssetInput, TokenRequest, TokenSymbol, Transaction, UserOperationTransaction } from '../types';
 interface UserOperationResult {
     type: 'userop';
@@ -42,7 +42,7 @@ declare function signAuthorizationsInternal(config: RhinestoneConfig, data: Inte
 declare function submitTransaction(config: RhinestoneConfig, signedTransaction: SignedTransactionData, authorizations: SignedAuthorizationList, dryRun?: boolean): Promise<TransactionResult>;
 declare function submitUserOperation(config: RhinestoneConfig, signedUserOperation: SignedUserOperationData): Promise<UserOperationResult>;
 declare function getTokenRequests(sourceChains: Chain[], targetChain: Chain, initialTokenRequests: TokenRequest[] | undefined, settlementLayers: SettlementLayer[] | undefined): TokenRequest[];
-declare function prepareTransactionAsIntent(config: RhinestoneConfig, sourceChains: Chain[] | undefined, targetChain: Chain, callInputs: CalldataInput[], gasLimit: bigint | undefined, tokenRequests: TokenRequest[], accountAddress: Address, isSponsored: boolean, eip7702InitSignature: Hex | undefined, settlementLayers: SettlementLayer[] | undefined, sourceAssets: SourceAssetInput | undefined, feeAsset: Address | TokenSymbol | undefined, lockFunds?: boolean, account?: {
+declare function prepareTransactionAsIntent(config: RhinestoneConfig, sourceChains: Chain[] | undefined, targetChain: Chain, callInputs: CalldataInput[], gasLimit: bigint | undefined, tokenRequests: TokenRequest[], recipient: Account | undefined, accountAddress: Address, isSponsored: boolean, eip7702InitSignature: Hex | undefined, settlementLayers: SettlementLayer[] | undefined, sourceAssets: SourceAssetInput | undefined, feeAsset: Address | TokenSymbol | undefined, lockFunds?: boolean, account?: {
     setupOps?: {
         to: Address;
         data: Hex;

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

@@ -20,6 +20,7 @@ exports.getTokenRequests = getTokenRequests;
 exports.resolveCallInputs = resolveCallInputs;
 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 utils_1 = require("../accounts/utils");
 const modules_1 = require("../modules");
@@ -28,18 +29,19 @@ const core_1 = require("../modules/validators/core");
 const orchestrator_1 = require("../orchestrator");
 const consts_1 = require("../orchestrator/consts");
 const registry_1 = require("../orchestrator/registry");
+const types_1 = require("../orchestrator/types");
 const compact_1 = require("./compact");
 const error_1 = require("./error");
-const multiChainOps_1 = require("./multiChainOps");
 const permit2_1 = require("./permit2");
+const singleChainOps_1 = require("./singleChainOps");
 async function prepareTransaction(config, transaction) {
-    const { sourceChains, targetChain, tokenRequests, signers, sponsored, eip7702InitSignature, settlementLayers, sourceAssets, feeAsset, lockFunds, account, } = getTransactionParams(transaction);
+    const { sourceChains, targetChain, tokenRequests, signers, sponsored, eip7702InitSignature, settlementLayers, sourceAssets, feeAsset, lockFunds, account, recipient, } = getTransactionParams(transaction);
     const accountAddress = (0, accounts_1.getAddress)(config);
     const isUserOpSigner = signers?.type === 'guardians' || signers?.type === 'session';
     if (isUserOpSigner) {
         throw new error_1.SignerNotSupportedError();
     }
-    const intentRoute = await prepareTransactionAsIntent(config, sourceChains, targetChain, await resolveCallInputs(transaction.calls, config, targetChain, accountAddress), transaction.gasLimit, tokenRequests, accountAddress, sponsored ?? false, eip7702InitSignature, settlementLayers, sourceAssets, feeAsset, lockFunds, account);
+    const intentRoute = await prepareTransactionAsIntent(config, sourceChains, targetChain, await resolveCallInputs(transaction.calls, config, targetChain, accountAddress), transaction.gasLimit, tokenRequests, recipient, accountAddress, sponsored ?? false, eip7702InitSignature, settlementLayers, sourceAssets, feeAsset, lockFunds, account);
     return {
         intentRoute,
         transaction,
@@ -122,12 +124,54 @@ async function signTypedData(config, parameters, chain, signers) {
     }
     const ownerValidator = (0, validators_1.getOwnerValidator)(config);
     const isRoot = validator.address === ownerValidator.address;
+    if (signers?.type === 'session') {
+        return await signTypedDataWithSession(config, chain, {
+            address: validator.address,
+            isRoot,
+        }, signers, parameters);
+    }
     const signature = await (0, accounts_1.getTypedDataPackedSignature)(config, signers, chain, {
         address: validator.address,
         isRoot,
     }, parameters);
     return await (0, accounts_1.toErc6492Signature)(config, signature, chain);
 }
+async function signTypedDataWithSession(config, chain, validator, signers, parameters) {
+    const { name, version, chainId, verifyingContract, salt } = (0, accounts_1.getEip712Domain)(config, chain);
+    const signature = await (0, accounts_1.getTypedDataPackedSignature)(config, signers, chain, validator, {
+        domain: parameters.domain,
+        primaryType: 'TypedDataSign',
+        types: {
+            ...parameters.types,
+            TypedDataSign: [
+                { name: 'contents', type: parameters.primaryType },
+                { name: 'name', type: 'string' },
+                { name: 'version', type: 'string' },
+                { name: 'chainId', type: 'uint256' },
+                { name: 'verifyingContract', type: 'address' },
+                { name: 'salt', type: 'bytes32' },
+            ],
+        },
+        message: {
+            contents: parameters.message,
+            name,
+            version,
+            chainId,
+            verifyingContract,
+            salt,
+        },
+    }, (signature) => {
+        const erc7739Signature = (0, erc7739_1.wrapTypedDataSignature)({
+            domain: parameters.domain,
+            primaryType: parameters.primaryType,
+            types: parameters.types,
+            message: parameters.message,
+            signature,
+        });
+        return (0, viem_1.encodePacked)(['bytes32', 'bytes'], [(0, validators_1.getPermissionId)(signers.session), erc7739Signature]);
+    });
+    return await (0, accounts_1.toErc6492Signature)(config, signature, chain);
+}
 async function signAuthorizationsInternal(config, data) {
     const eoa = config.eoa;
     if (!eoa) {
@@ -190,6 +234,7 @@ function getTransactionParams(transaction) {
     const feeAsset = transaction.feeAsset;
     const lockFunds = transaction.lockFunds;
     const account = transaction.experimental_accountOverride;
+    const recipient = transaction.recipient;
     const tokenRequests = getTokenRequests(sourceChains || [], targetChain, initialTokenRequests, settlementLayers);
     return {
         sourceChains,
@@ -204,6 +249,7 @@ function getTransactionParams(transaction) {
         feeAsset,
         lockFunds,
         account,
+        recipient,
     };
 }
 function getTokenRequests(sourceChains, targetChain, initialTokenRequests, settlementLayers) {
@@ -250,7 +296,7 @@ async function prepareTransactionAsUserOp(config, chain, callInputs, signers, ga
         }),
     };
 }
-async function prepareTransactionAsIntent(config, sourceChains, targetChain, callInputs, gasLimit, tokenRequests, accountAddress, isSponsored, eip7702InitSignature, settlementLayers, sourceAssets, feeAsset, lockFunds, account) {
+async function prepareTransactionAsIntent(config, sourceChains, targetChain, callInputs, gasLimit, tokenRequests, recipient, accountAddress, isSponsored, eip7702InitSignature, settlementLayers, sourceAssets, feeAsset, lockFunds, account) {
     const calls = parseCalls(callInputs, targetChain.id);
     const accountAccessList = createAccountAccessList(sourceChains, sourceAssets);
     const { setupOps, delegations } = await getSetupOperationsAndDelegations(config, accountAddress, eip7702InitSignature);
@@ -265,10 +311,11 @@ async function prepareTransactionAsIntent(config, sourceChains, targetChain, cal
     const accountType = getAccountType(config);
     const metaIntent = {
         destinationChainId: targetChain.id,
-        tokenTransfers: tokenRequests.map((tokenRequest) => ({
+        tokenRequests: tokenRequests.map((tokenRequest) => ({
             tokenAddress: (0, registry_1.resolveTokenAddress)(tokenRequest.address, targetChain.id),
             amount: tokenRequest.amount,
         })),
+        recipient,
         account: {
             address: accountAddress,
             accountType: accountType,
@@ -320,9 +367,10 @@ async function signIntent(config, targetChain, intentOp, signers) {
                 throw new accounts_1.EoaSigningMethodNotConfiguredError('signTypedData, sign, or signMessage');
             }
         }
+        const destinationSignature = originSignatures.at(-1);
         return {
             originSignatures,
-            destinationSignature: originSignatures[0],
+            destinationSignature,
         };
     }
     const validator = getValidator(config, signers);
@@ -332,20 +380,21 @@ async function signIntent(config, targetChain, intentOp, signers) {
     const ownerValidator = (0, validators_1.getOwnerValidator)(config);
     const isRoot = validator.address === ownerValidator.address;
     const signatures = await getIntentSignature(config, intentOp, signers, targetChain, validator, isRoot);
-    return signatures;
+    return {
+        originSignatures: signatures.originSignatures,
+        destinationSignature: signatures.destinationSignature,
+    };
 }
 async function getIntentSignature(config, intentOp, signers, targetChain, validator, isRoot) {
-    const withJitFlow = intentOp.elements.some((element) => element.mandate.qualifier.settlementContext?.usingJIT);
-    const withMultiChainOps = intentOp.elements.some((element) => element.mandate.qualifier.settlementContext.settlementLayer ===
+    const withPermit2 = intentOp.elements.some((element) => element.mandate.qualifier.settlementContext?.fundingMethod ===
+        types_1.FundingMethod.PERMIT2);
+    const withIntentExecutorOps = intentOp.elements.some((element) => element.mandate.qualifier.settlementContext.settlementLayer ===
         'INTENT_EXECUTOR');
-    if (withMultiChainOps) {
-        const signature = await getMultiChainOpsSignature(config, intentOp, signers, targetChain, validator, isRoot);
-        return {
-            originSignatures: Array(intentOp.elements.length).fill(signature),
-            destinationSignature: signature,
-        };
+    if (withIntentExecutorOps) {
+        const signature = await getSingleChainOpsSignature(config, intentOp, signers, targetChain, validator, isRoot);
+        return signature;
     }
-    if (withJitFlow) {
+    if (withPermit2) {
         return await getPermit2Signatures(config, intentOp, signers, targetChain, validator, isRoot);
     }
     const signature = await getCompactSignature(config, intentOp, signers, targetChain, validator, isRoot);
@@ -354,12 +403,20 @@ async function getIntentSignature(config, intentOp, signers, targetChain, valida
         destinationSignature: signature,
     };
 }
-async function getMultiChainOpsSignature(config, intentOp, signers, targetChain, validator, isRoot) {
+async function getSingleChainOpsSignature(config, intentOp, signers, targetChain, validator, isRoot) {
     const address = (0, accounts_1.getAddress)(config);
     const intentExecutor = (0, modules_1.getIntentExecutor)(config);
-    const typedData = (0, multiChainOps_1.getTypedData)(address, intentExecutor.address, intentOp);
-    const signature = await signIntentTypedData(config, signers, targetChain, validator, isRoot, typedData);
-    return signature;
+    const originSignatures = [];
+    for (const element of intentOp.elements) {
+        const typedData = (0, singleChainOps_1.getTypedData)(address, intentExecutor.address, element, BigInt(intentOp.nonce));
+        const signature = await signIntentTypedData(config, signers, targetChain, validator, isRoot, typedData);
+        originSignatures.push(signature);
+    }
+    const destinationSignature = originSignatures.at(-1);
+    return {
+        originSignatures,
+        destinationSignature,
+    };
 }
 async function getPermit2Signatures(config, intentOp, signers, targetChain, validator, isRoot) {
     const originSignatures = [];
@@ -368,9 +425,10 @@ async function getPermit2Signatures(config, intentOp, signers, targetChain, vali
         const signature = await signIntentTypedData(config, signers, targetChain, validator, isRoot, typedData);
         originSignatures.push(signature);
     }
+    const destinationSignature = originSignatures.at(-1);
     return {
         originSignatures,
-        destinationSignature: originSignatures[0],
+        destinationSignature,
     };
 }
 async function getCompactSignature(config, intentOp, signers, targetChain, validator, isRoot) {
@@ -513,7 +571,8 @@ function getValidator(config, signers) {
     if (withOwner) {
         // ECDSA
         if (withOwner.kind === 'ecdsa') {
-            return (0, core_1.getOwnableValidator)(1, withOwner.accounts.map((account) => account.address));
+            // Use the configured owner validator (e.g., ENS) rather than forcing Ownable
+            return (0, validators_1.getOwnerValidator)(config);
         }
         // Passkeys (WebAuthn)
         if (withOwner.kind === 'passkey') {