@charterlabs/rhinestone-sdk 0.3.0 → 0.3.1

package/dist/src/execution/permit2.js

@@ -47,17 +47,20 @@ function getTypedData(element, nonce, expires) {
                 { name: 'targetChain', type: 'uint256' },
                 { name: 'fillExpiry', type: 'uint256' },
             ],
-            Op: [
+            Ops: [
                 { name: 'to', type: 'address' },
                 { name: 'value', type: 'uint256' },
                 { name: 'data', type: 'bytes' },
             ],
+            Op: [
+                { name: 'vt', type: 'bytes32' },
+                { name: 'ops', type: 'Ops[]' },
+            ],
             Mandate: [
                 { name: 'target', type: 'Target' },
-                { name: 'v', type: 'uint8' },
                 { name: 'minGas', type: 'uint128' },
-                { name: 'originOps', type: 'Op[]' },
-                { name: 'destOps', type: 'Op[]' },
+                { name: 'originOps', type: 'Op' },
+                { name: 'destOps', type: 'Op' },
                 { name: 'q', type: 'bytes32' },
             ],
             PermitBatchWitnessTransferFrom: [
@@ -84,18 +87,9 @@ function getTypedData(element, nonce, expires) {
                     targetChain: BigInt(mandate.destinationChainId),
                     fillExpiry: BigInt(mandate.fillDeadline),
                 },
-                v: mandate.v || 0,
-                minGas: BigInt(mandate.minGas || '0'),
-                originOps: mandate.preClaimOps.map((op) => ({
-                    to: op.to,
-                    value: BigInt(op.value),
-                    data: op.data,
-                })),
-                destOps: mandate.destinationOps.map((op) => ({
-                    to: op.to,
-                    value: BigInt(op.value),
-                    data: op.data,
-                })),
+                minGas: BigInt(mandate.minGas),
+                originOps: mandate.preClaimOps,
+                destOps: mandate.destinationOps,
                 q: (0, viem_1.keccak256)(mandate.qualifier.encodedVal),
             },
         },

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

@@ -1,5 +1,5 @@
-import type { Address } from 'viem';
-import type { Execution, IntentOpElement } from '../orchestrator/types';
+import { type Address } from 'viem';
+import type { IntentOpElement } from '../orchestrator/types';
 declare function getTypedData(account: Address, intentExecutorAddress: Address, element: IntentOpElement, nonce: bigint): {
     domain: {
         name: string;
@@ -16,12 +16,24 @@ declare function getTypedData(account: Address, intentExecutorAddress: Address,
             name: string;
             type: string;
         }[];
+        GasRefund: {
+            name: string;
+            type: string;
+        }[];
+        Ops: {
+            name: string;
+            type: string;
+        }[];
     };
     primaryType: "SingleChainOps";
     message: {
         account: `0x${string}`;
         nonce: bigint;
-        ops: Execution[];
+        op: import("../orchestrator/types").Op;
+        gasRefund: {
+            token: "0x0000000000000000000000000000000000000000";
+            exchangeRate: bigint;
+        };
     };
 };
 export { getTypedData };

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

@@ -1 +1 @@
-{"version":3,"file":"singleChainOps.d.ts","sourceRoot":"","sources":["../../../execution/singleChainOps.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AACnC,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAEvE,iBAAS,YAAY,CACnB,OAAO,EAAE,OAAO,EAChB,qBAAqB,EAAE,OAAO,EAC9B,OAAO,EAAE,eAAe,EACxB,KAAK,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;EA8Bd;AACD,OAAO,EAAE,YAAY,EAAE,CAAA"}
+{"version":3,"file":"singleChainOps.d.ts","sourceRoot":"","sources":["../../../execution/singleChainOps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAe,MAAM,MAAM,CAAA;AAChD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAE5D,iBAAS,YAAY,CACnB,OAAO,EAAE,OAAO,EAChB,qBAAqB,EAAE,OAAO,EAC9B,OAAO,EAAE,eAAe,EACxB,KAAK,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0Cd;AACD,OAAO,EAAE,YAAY,EAAE,CAAA"}

package/dist/src/execution/singleChainOps.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTypedData = getTypedData;
+const viem_1 = require("viem");
 function getTypedData(account, intentExecutorAddress, element, nonce) {
-    const ops = element.mandate.destinationOps;
     return {
         domain: {
             name: 'IntentExecutor',
@@ -14,9 +14,18 @@ function getTypedData(account, intentExecutorAddress, element, nonce) {
             SingleChainOps: [
                 { name: 'account', type: 'address' },
                 { name: 'nonce', type: 'uint256' },
-                { name: 'ops', type: 'Op[]' },
+                { name: 'op', type: 'Op' },
+                { name: 'gasRefund', type: 'GasRefund' },
             ],
             Op: [
+                { name: 'vt', type: 'bytes32' },
+                { name: 'ops', type: 'Ops[]' },
+            ],
+            GasRefund: [
+                { name: 'token', type: 'address' },
+                { name: 'exchangeRate', type: 'uint256' },
+            ],
+            Ops: [
                 { name: 'to', type: 'address' },
                 { name: 'value', type: 'uint256' },
                 { name: 'data', type: 'bytes' },
@@ -26,7 +35,12 @@ function getTypedData(account, intentExecutorAddress, element, nonce) {
         message: {
             account,
             nonce,
-            ops,
+            op: element.mandate.destinationOps,
+            // todo
+            gasRefund: {
+                token: viem_1.zeroAddress,
+                exchangeRate: 0n,
+            },
         },
     };
 }

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

@@ -1,8 +1,8 @@
-import { type Address, type Chain, type HashTypedDataParameters, type Hex, type PublicClient, type SignableMessage, type SignedAuthorization, type SignedAuthorizationList, type TypedData } from 'viem';
+import { type Address, type Chain, type HashTypedDataParameters, type Hex, type PublicClient, type SignableMessage, type SignedAuthorization, type SignedAuthorizationList, type TypedData, type TypedDataDefinition } from 'viem';
 import { type UserOperation } from 'viem/account-abstraction';
 import { type IntentOp, type IntentRoute } from '../orchestrator';
 import type { SettlementLayer } from '../orchestrator/types';
-import type { Call, CalldataInput, CallInput, RhinestoneAccountConfig, RhinestoneConfig, SignerSet, SourceAssetInput, TokenRequest, TokenSymbol, Transaction, UserOperationTransaction } from '../types';
+import type { Call, CalldataInput, CallInput, RhinestoneAccountConfig, RhinestoneConfig, SignerSet, SourceAssetInput, Sponsorship, TokenRequest, TokenSymbol, Transaction, UserOperationTransaction } from '../types';
 interface UserOperationResult {
     type: 'userop';
     hash: Hex;
@@ -33,6 +33,10 @@ interface SignedUserOperationData extends PreparedUserOperationData {
 declare function prepareTransaction(config: RhinestoneConfig, transaction: Transaction): Promise<PreparedTransactionData>;
 declare function prepareUserOperation(config: RhinestoneConfig, transaction: UserOperationTransaction): Promise<PreparedUserOperationData>;
 declare function resolveCallInputs(inputs: CallInput[] | undefined, config: RhinestoneConfig, chain: Chain, accountAddress: Address): Promise<CalldataInput[]>;
+declare function getTransactionMessages(config: RhinestoneConfig, preparedTransaction: PreparedTransactionData): {
+    origin: TypedDataDefinition[];
+    destination: TypedDataDefinition;
+};
 declare function signTransaction(config: RhinestoneConfig, preparedTransaction: PreparedTransactionData): Promise<SignedTransactionData>;
 declare function signUserOperation(config: RhinestoneConfig, preparedUserOperation: PreparedUserOperationData): Promise<SignedUserOperationData>;
 declare function signAuthorizations(config: RhinestoneConfig, preparedTransaction: PreparedTransactionData): Promise<SignedAuthorization[]>;
@@ -41,21 +45,39 @@ declare function signTypedData<typedData extends TypedData | Record<string, unkn
 declare function signAuthorizationsInternal(config: RhinestoneConfig, data: IntentRoute | UserOperation): Promise<SignedAuthorization[]>;
 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[], recipientInput: RhinestoneAccountConfig | Address | undefined, accountAddress: Address, isSponsored: boolean, eip7702InitSignature: Hex | undefined, settlementLayers: SettlementLayer[] | undefined, sourceAssets: SourceAssetInput | undefined, feeAsset: Address | TokenSymbol | undefined, lockFunds: boolean | undefined, account: {
+declare function getTokenRequests(sourceChains: Chain[] | undefined, targetChain: Chain, initialTokenRequests: TokenRequest[] | undefined, settlementLayers: SettlementLayer[] | undefined): TokenRequest[];
+declare function getIntentAccount(config: RhinestoneConfig, eip7702InitSignature: Hex | undefined, account: {
+    setupOps?: {
+        to: Address;
+        data: Hex;
+    }[];
+} | undefined): {
+    address: `0x${string}`;
+    accountType: "ERC7579" | "EOA";
+    setupOps: {
+        to: Address;
+        data: Hex;
+    }[];
+    delegations: {
+        0: {
+            contract: `0x${string}`;
+        };
+    } | undefined;
+};
+declare function prepareTransactionAsIntent(config: RhinestoneConfig, sourceChains: Chain[] | undefined, targetChain: Chain, callInputs: CalldataInput[], gasLimit: bigint | undefined, tokenRequests: TokenRequest[], recipientInput: RhinestoneAccountConfig | Address | undefined, sponsored: Sponsorship | undefined, eip7702InitSignature: Hex | undefined, settlementLayers: SettlementLayer[] | undefined, sourceAssets: SourceAssetInput | undefined, feeAsset: Address | TokenSymbol | undefined, lockFunds: boolean | undefined, account: {
     setupOps?: {
         to: Address;
         data: Hex;
     }[];
 } | undefined): Promise<IntentRoute>;
-declare function signIntent(config: RhinestoneConfig, targetChain: Chain, intentOp: IntentOp, signers?: SignerSet): Promise<{
-    originSignatures: any[];
+declare function signIntent(config: RhinestoneConfig, intentOp: IntentOp, signers?: SignerSet): Promise<{
+    originSignatures: `0x${string}`[];
     destinationSignature: `0x${string}`;
 }>;
 declare function getOrchestratorByChain(chainId: number, apiKey: string | undefined, orchestratorUrl?: string): import("../orchestrator").Orchestrator;
 declare function submitIntentInternal(config: RhinestoneConfig, sourceChains: Chain[] | undefined, targetChain: Chain, intentOp: IntentOp, originSignatures: Hex[], destinationSignature: Hex, 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 parseCalls(calls: CalldataInput[], chainId: number): Call[];
-export { prepareTransaction, signTransaction, signAuthorizations, signAuthorizationsInternal, signMessage, signTypedData, submitTransaction, prepareUserOperation, signUserOperation, submitUserOperation, getOrchestratorByChain, signIntent, prepareTransactionAsIntent, submitIntentInternal, getValidatorAccount, parseCalls, getTokenRequests, resolveCallInputs, };
+export { prepareTransaction, getTransactionMessages, signTransaction, signAuthorizations, signAuthorizationsInternal, signMessage, signTypedData, submitTransaction, prepareUserOperation, signUserOperation, submitUserOperation, getOrchestratorByChain, signIntent, prepareTransactionAsIntent, submitIntentInternal, getValidatorAccount, parseCalls, getTokenRequests, resolveCallInputs, getIntentAccount, };
 export type { 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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prepareTransaction = prepareTransaction;
+exports.getTransactionMessages = getTransactionMessages;
 exports.signTransaction = signTransaction;
 exports.signAuthorizations = signAuthorizations;
 exports.signAuthorizationsInternal = signAuthorizationsInternal;
@@ -18,6 +19,7 @@ exports.getValidatorAccount = getValidatorAccount;
 exports.parseCalls = parseCalls;
 exports.getTokenRequests = getTokenRequests;
 exports.resolveCallInputs = resolveCallInputs;
+exports.getIntentAccount = getIntentAccount;
 const viem_1 = require("viem");
 const account_abstraction_1 = require("viem/account-abstraction");
 const erc7739_1 = require("viem/experimental/erc7739");
@@ -36,11 +38,11 @@ const singleChainOps_1 = require("./singleChainOps");
 async function prepareTransaction(config, 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';
+    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, 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, sponsored, eip7702InitSignature, settlementLayers, sourceAssets, feeAsset, lockFunds, account);
     return {
         intentRoute,
         transaction,
@@ -78,10 +80,13 @@ async function resolveCallInputs(inputs, config, chain, accountAddress) {
     }
     return resolved;
 }
+function getTransactionMessages(config, preparedTransaction) {
+    return getIntentMessages(config, preparedTransaction.intentRoute.intentOp);
+}
 async function signTransaction(config, preparedTransaction) {
-    const { targetChain, signers } = getTransactionParams(preparedTransaction.transaction);
+    const { signers } = getTransactionParams(preparedTransaction.transaction);
     const intentRoute = preparedTransaction.intentRoute;
-    const { originSignatures, destinationSignature } = await signIntent(config, targetChain, intentRoute.intentOp, signers);
+    const { originSignatures, destinationSignature } = await signIntent(config, intentRoute.intentOp, signers);
     return {
         intentRoute,
         transaction: preparedTransaction.transaction,
@@ -126,7 +131,7 @@ async function signTypedData(config, parameters, chain, signers) {
     }
     const ownerValidator = (0, validators_1.getOwnerValidator)(config);
     const isRoot = validator.address === ownerValidator.address;
-    if (signers?.type === 'session') {
+    if (signers?.type === 'experimental_session') {
         return await signTypedDataWithSession(config, chain, {
             address: validator.address,
             isRoot,
@@ -264,7 +269,9 @@ function getTokenRequests(sourceChains, targetChain, initialTokenRequests, settl
         amount: 1n,
     };
     const isSameChain = (settlementLayers?.length === 1 && settlementLayers[0] === 'SAME_CHAIN') ||
-        (sourceChains.length === 1 && sourceChains[0].id === targetChain.id);
+        (sourceChains &&
+            sourceChains.length === 1 &&
+            sourceChains[0].id === targetChain.id);
     const tokenRequests = !initialTokenRequests || initialTokenRequests.length === 0
         ? isSameChain
             ? []
@@ -298,23 +305,28 @@ async function prepareTransactionAsUserOp(config, chain, callInputs, signers, ga
         }),
     };
 }
-async function prepareTransactionAsIntent(config, sourceChains, targetChain, callInputs, gasLimit, tokenRequests, recipientInput, accountAddress, isSponsored, eip7702InitSignature, settlementLayers, sourceAssets, feeAsset, lockFunds, account) {
-    if (config.account?.type === 'eoa') {
-        if (callInputs.length > 0) {
-            throw new error_1.CallsNotSupportedError();
-        }
+function getAccountType(accountConfig) {
+    if (accountConfig?.type === 'eoa') {
+        return 'EOA';
+    }
+    else {
+        return 'ERC7579';
     }
+}
+function getIntentAccount(config, eip7702InitSignature, account) {
+    const accountAddress = (0, accounts_1.getAddress)(config);
+    const accountType = getAccountType(config.account);
+    const { setupOps, delegations } = getSetupOperationsAndDelegations(config, accountAddress, eip7702InitSignature);
+    return {
+        address: accountAddress,
+        accountType: accountType,
+        setupOps: account?.setupOps ?? setupOps,
+        delegations,
+    };
+}
+async function prepareTransactionAsIntent(config, sourceChains, targetChain, callInputs, gasLimit, tokenRequests, recipientInput, sponsored, eip7702InitSignature, settlementLayers, sourceAssets, feeAsset, lockFunds, account) {
     const calls = parseCalls(callInputs, targetChain.id);
     const accountAccessList = createAccountAccessList(sourceChains, sourceAssets);
-    const { setupOps, delegations } = getSetupOperationsAndDelegations(config, accountAddress, eip7702InitSignature);
-    function getAccountType(accountConfig) {
-        if (accountConfig?.type === 'eoa') {
-            return 'EOA';
-        }
-        else {
-            return 'ERC7579';
-        }
-    }
     function getRecipient(recipient) {
         if (typeof recipient === 'string') {
             // Passed as an address, assume it's an EOA
@@ -325,27 +337,12 @@ async function prepareTransactionAsIntent(config, sourceChains, targetChain, cal
                 delegations: undefined,
             };
         }
-        const recipientAddress = recipient ? (0, accounts_1.getAddress)(recipient) : undefined;
-        const recipientAccountType = recipient
-            ? getAccountType(recipient.account)
-            : undefined;
-        const { setupOps: recipientSetupOps, delegations: recipientDelegations } = recipient && recipientAddress
-            ? getSetupOperationsAndDelegations(recipient, recipientAddress, eip7702InitSignature)
-            : {
-                setupOps: [],
-                delegations: {},
-            };
-        if (!recipientAddress || !recipientAccountType) {
+        if (!recipient) {
             return undefined;
         }
-        return {
-            address: recipientAddress,
-            accountType: recipientAccountType,
-            setupOps: recipientSetupOps,
-            delegations: recipientDelegations,
-        };
+        return getIntentAccount(recipient, eip7702InitSignature, account);
     }
-    const accountType = getAccountType(config.account);
+    const intentAccount = getIntentAccount(config, eip7702InitSignature, account);
     const recipient = getRecipient(recipientInput);
     const metaIntent = {
         destinationChainId: targetChain.id,
@@ -354,27 +351,26 @@ async function prepareTransactionAsIntent(config, sourceChains, targetChain, cal
             amount: tokenRequest.amount,
         })),
         recipient,
-        account: {
-            address: accountAddress,
-            accountType: accountType,
-            setupOps: account?.setupOps ?? setupOps,
-            delegations,
-        },
-        destinationExecutions: calls.map((call) => ({
-            to: call.to,
-            value: call.value.toString(),
-            data: call.data,
-        })),
+        account: intentAccount,
+        destinationExecutions: calls,
         destinationGasUnits: gasLimit,
         accountAccessList,
         options: {
             topupCompact: lockFunds ?? false,
             feeToken: feeAsset,
-            sponsorSettings: {
-                gasSponsored: isSponsored,
-                bridgeFeesSponsored: isSponsored,
-                swapFeesSponsored: isSponsored,
-            },
+            sponsorSettings: sponsored
+                ? typeof sponsored === 'object'
+                    ? {
+                        gasSponsored: sponsored.gas,
+                        bridgeFeesSponsored: sponsored.bridging,
+                        swapFeesSponsored: sponsored.swaps,
+                    }
+                    : {
+                        gasSponsored: sponsored,
+                        bridgeFeesSponsored: sponsored,
+                        swapFeesSponsored: sponsored,
+                    }
+                : undefined,
             settlementLayers,
         },
     };
@@ -382,27 +378,21 @@ async function prepareTransactionAsIntent(config, sourceChains, targetChain, cal
     const intentRoute = await orchestrator.getIntentRoute(metaIntent);
     return intentRoute;
 }
-async function signIntent(config, targetChain, intentOp, signers) {
+async function signIntent(config, intentOp, signers) {
+    const { origin } = getIntentMessages(config, intentOp);
     if (config.account?.type === 'eoa') {
+        const eoa = config.eoa;
+        if (!eoa) {
+            throw new accounts_1.EoaAccountMustHaveAccountError();
+        }
         const originSignatures = [];
-        for (const element of intentOp.elements) {
-            let digest;
-            if (config.eoa?.signTypedData) {
-                const typedData = (0, permit2_1.getTypedData)(element, BigInt(intentOp.nonce), BigInt(intentOp.expires));
-                originSignatures.push(await config.eoa.signTypedData(typedData));
-            }
-            else if (config.eoa?.sign) {
-                digest = (0, compact_1.getPermit2Digest)(element, BigInt(intentOp.nonce), BigInt(intentOp.expires));
-                originSignatures.push(await config.eoa.sign({ hash: digest }));
-            }
-            else if (config.eoa?.signMessage) {
-                digest = (0, compact_1.getPermit2Digest)(element, BigInt(intentOp.nonce), BigInt(intentOp.expires));
-                originSignatures.push(await config.eoa.signMessage({
-                    message: { raw: digest },
-                }));
+        for (const typedData of origin) {
+            if (eoa.signTypedData) {
+                const signature = await eoa.signTypedData(typedData);
+                originSignatures.push(signature);
             }
             else {
-                throw new accounts_1.EoaSigningMethodNotConfiguredError('signTypedData, sign, or signMessage');
+                throw new accounts_1.EoaSigningMethodNotConfiguredError('signTypedData');
             }
         }
         const destinationSignature = originSignatures.at(-1);
@@ -417,36 +407,10 @@ 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 {
-        originSignatures: signatures.originSignatures,
-        destinationSignature: signatures.destinationSignature,
-    };
-}
-async function getIntentSignature(config, intentOp, signers, targetChain, validator, isRoot) {
-    const withPermit2 = intentOp.elements.some((element) => element.mandate.qualifier.settlementContext?.fundingMethod === 'PERMIT2');
-    const withIntentExecutorOps = intentOp.elements.some((element) => element.mandate.qualifier.settlementContext.settlementLayer ===
-        'INTENT_EXECUTOR');
-    if (withIntentExecutorOps) {
-        const signature = await getSingleChainOpsSignature(config, intentOp, signers, targetChain, validator, isRoot);
-        return signature;
-    }
-    if (withPermit2) {
-        return await getPermit2Signatures(config, intentOp, signers, targetChain, validator, isRoot);
-    }
-    const signature = await getCompactSignature(config, intentOp, signers, targetChain, validator, isRoot);
-    return {
-        originSignatures: Array(intentOp.elements.length).fill(signature),
-        destinationSignature: signature,
-    };
-}
-async function getSingleChainOpsSignature(config, intentOp, signers, targetChain, validator, isRoot) {
-    const address = (0, accounts_1.getAddress)(config);
-    const intentExecutor = (0, modules_1.getIntentExecutor)(config);
     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);
+    for (const typedData of origin) {
+        const chain = (0, registry_1.getChainById)(typedData.domain?.chainId);
+        const signature = await signIntentTypedData(config, signers, validator, isRoot, typedData, chain);
         originSignatures.push(signature);
     }
     const destinationSignature = originSignatures.at(-1);
@@ -455,32 +419,42 @@ async function getSingleChainOpsSignature(config, intentOp, signers, targetChain
         destinationSignature,
     };
 }
-async function getPermit2Signatures(config, intentOp, signers, targetChain, validator, isRoot) {
-    const originSignatures = [];
+function getIntentMessages(config, intentOp) {
+    const address = (0, accounts_1.getAddress)(config);
+    const intentExecutor = (0, modules_1.getIntentExecutor)(config);
+    const withPermit2 = intentOp.elements.some((element) => element.mandate.qualifier.settlementContext.fundingMethod === 'PERMIT2');
+    const withIntentExecutorOps = intentOp.elements.some((element) => element.mandate.qualifier.settlementContext.settlementLayer ===
+        'INTENT_EXECUTOR');
+    const origin = [];
     for (const element of intentOp.elements) {
-        const typedData = (0, permit2_1.getTypedData)(element, BigInt(intentOp.nonce), BigInt(intentOp.expires));
-        const signature = await signIntentTypedData(config, signers, targetChain, validator, isRoot, typedData);
-        originSignatures.push(signature);
+        if (withIntentExecutorOps) {
+            const typedData = (0, singleChainOps_1.getTypedData)(address, intentExecutor.address, element, BigInt(intentOp.nonce));
+            origin.push(typedData);
+        }
+        else if (withPermit2) {
+            const typedData = (0, permit2_1.getTypedData)(element, BigInt(intentOp.nonce), BigInt(intentOp.expires));
+            origin.push(typedData);
+        }
+        else {
+            const typedData = (0, compact_1.getCompactTypedData)(intentOp);
+            origin.push(typedData);
+        }
     }
-    const destinationSignature = originSignatures.at(-1);
+    const destination = origin.at(-1);
     return {
-        originSignatures,
-        destinationSignature,
+        origin,
+        destination,
     };
 }
-async function getCompactSignature(config, intentOp, signers, targetChain, validator, isRoot) {
-    const typedData = (0, compact_1.getCompactTypedData)(intentOp);
-    return await signIntentTypedData(config, signers, targetChain, validator, isRoot, typedData);
-}
-async function signIntentTypedData(config, signers, targetChain, validator, isRoot, parameters) {
+async function signIntentTypedData(config, signers, validator, isRoot, parameters, chain) {
     if ((0, core_1.supportsEip712)(validator)) {
-        return await (0, accounts_1.getTypedDataPackedSignature)(config, signers, targetChain, {
+        return await (0, accounts_1.getTypedDataPackedSignature)(config, signers, chain, {
             address: validator.address,
             isRoot,
         }, parameters);
     }
     const hash = (0, viem_1.hashTypedData)(parameters);
-    return await (0, accounts_1.getPackedSignature)(config, signers, targetChain, {
+    return await (0, accounts_1.getPackedSignature)(config, signers, chain, {
         address: validator.address,
         isRoot,
     }, hash);
@@ -588,16 +562,13 @@ async function getValidatorAccount(config, signers, publicClient, chain) {
     if (withOwner) {
         return (0, accounts_1.getSmartAccount)(config, publicClient, chain);
     }
-    const withSession = signers.type === 'session' ? signers : null;
     const withGuardians = signers.type === 'guardians' ? signers : null;
-    return withSession
-        ? await (0, accounts_1.getSmartSessionSmartAccount)(config, publicClient, chain, withSession.session, withSession.enableData || null)
-        : withGuardians
-            ? await (0, accounts_1.getGuardianSmartAccount)(config, publicClient, chain, {
-                type: 'ecdsa',
-                accounts: withGuardians.guardians,
-            })
-            : null;
+    return withGuardians
+        ? await (0, accounts_1.getGuardianSmartAccount)(config, publicClient, chain, {
+            type: 'ecdsa',
+            accounts: withGuardians.guardians,
+        })
+        : null;
 }
 function getValidator(config, signers) {
     if (!signers) {
@@ -624,7 +595,7 @@ function getValidator(config, signers) {
         }
     }
     // Smart sessions
-    const withSession = signers.type === 'session' ? signers.session : null;
+    const withSession = signers.type === 'experimental_session' ? signers.session : null;
     if (withSession) {
         return (0, validators_1.getSmartSessionValidator)(config);
     }
@@ -685,12 +656,17 @@ function getSetupOperationsAndDelegations(config, accountAddress, eip7702InitSig
         };
     }
     else if (initCode) {
+        const to = 'factory' in initCode ? initCode.factory : undefined;
+        const data = 'factory' in initCode ? initCode.factoryData : undefined;
+        if (!to || !data) {
+            throw new accounts_1.FactoryArgsNotAvailableError();
+        }
         // Contract account with init code
         return {
             setupOps: [
                 {
-                    to: initCode.factory,
-                    data: initCode.factoryData,
+                    to,
+                    data,
                 },
             ],
         };