@rhinestone/sdk 1.0.0-alpha.31 → 1.0.0-alpha.33

package/dist/src/execution/index.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UserOperationRequiredForSmartSessionsError = exports.SourceChainsNotAvailableForUserOpFlowError = exports.SimulationNotSupportedForUserOpFlowError = exports.SessionChainRequiredError = exports.OrderPathRequiredForIntentsError = exports.IntentFailedError = exports.ExecutionError = exports.isExecutionError = void 0;
+exports.SignerNotSupportedError = exports.SessionChainRequiredError = exports.OrderPathRequiredForIntentsError = exports.IntentFailedError = exports.ExecutionError = exports.isExecutionError = void 0;
 exports.sendTransaction = sendTransaction;
 exports.sendTransactionInternal = sendTransactionInternal;
+exports.sendUserOperation = sendUserOperation;
+exports.sendUserOperationInternal = sendUserOperationInternal;
 exports.waitForExecution = waitForExecution;
 exports.getMaxSpendableAmount = getMaxSpendableAmount;
 exports.getPortfolio = getPortfolio;
@@ -18,9 +20,7 @@ Object.defineProperty(exports, "IntentFailedError", { enumerable: true, get: fun
 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; } });
-Object.defineProperty(exports, "SimulationNotSupportedForUserOpFlowError", { enumerable: true, get: function () { return error_1.SimulationNotSupportedForUserOpFlowError; } });
-Object.defineProperty(exports, "SourceChainsNotAvailableForUserOpFlowError", { enumerable: true, get: function () { return error_1.SourceChainsNotAvailableForUserOpFlowError; } });
-Object.defineProperty(exports, "UserOperationRequiredForSmartSessionsError", { enumerable: true, get: function () { return error_1.UserOperationRequiredForSmartSessionsError; } });
+Object.defineProperty(exports, "SignerNotSupportedError", { enumerable: true, get: function () { return error_1.SignerNotSupportedError; } });
 const smart_session_1 = require("./smart-session");
 const utils_2 = require("./utils");
 const POLLING_INTERVAL = 500;
@@ -30,6 +30,10 @@ async function sendTransaction(config, transaction) {
         : transaction.sourceChains || [];
     const targetChain = 'chain' in transaction ? transaction.chain : transaction.targetChain;
     const { calls, gasLimit, tokenRequests, signers, sponsored, settlementLayers, sourceAssets, feeAsset, } = transaction;
+    const isUserOpSigner = signers?.type === 'guardians' || signers?.type === 'session';
+    if (isUserOpSigner) {
+        throw new error_1.SignerNotSupportedError();
+    }
     return await sendTransactionInternal(config, sourceChains, targetChain, calls, {
         gasLimit,
         initialTokenRequests: tokenRequests,
@@ -40,25 +44,29 @@ async function sendTransaction(config, transaction) {
         feeAsset,
     });
 }
+async function sendUserOperation(config, transaction) {
+    const accountAddress = (0, accounts_1.getAddress)(config);
+    const resolvedCalls = await (0, utils_2.resolveCallInputs)(transaction.calls, config, transaction.chain, accountAddress);
+    const userOpSigner = transaction.signers?.type === 'session' ? transaction.signers.session : null;
+    if (userOpSigner) {
+        await (0, smart_session_1.enableSmartSession)(transaction.chain, config, userOpSigner);
+    }
+    // Smart sessions require a UserOp flow
+    return await sendUserOperationInternal(config, transaction.chain, resolvedCalls, transaction.signers);
+}
 async function sendTransactionInternal(config, sourceChains, targetChain, callInputs, options) {
     const accountAddress = (0, accounts_1.getAddress)(config);
+    const resolvedCalls = await (0, utils_2.resolveCallInputs)(callInputs, config, targetChain, accountAddress);
     const tokenRequests = (0, utils_2.getTokenRequests)(sourceChains, targetChain, options.initialTokenRequests, options.settlementLayers);
-    const sendAsUserOp = options.asUserOp ||
-        options.signers?.type === 'guardians' ||
-        options.signers?.type === 'session';
+    const sendAsUserOp = options.signers?.type === 'guardians' || options.signers?.type === 'session';
     if (sendAsUserOp) {
-        const withSession = options.signers?.type === 'session' ? options.signers.session : null;
-        if (withSession) {
-            await (0, smart_session_1.enableSmartSession)(targetChain, config, withSession);
-        }
-        // Smart sessions require a UserOp flow
-        return await sendTransactionAsUserOp(config, targetChain, callInputs, options.signers);
+        throw new error_1.SignerNotSupportedError();
     }
     else {
-        return await sendTransactionAsIntent(config, sourceChains, targetChain, callInputs, options.gasLimit, tokenRequests, accountAddress, options.signers, options.sponsored, options.settlementLayers, options.sourceAssets, options.feeAsset);
+        return await sendTransactionAsIntent(config, sourceChains, targetChain, resolvedCalls, options.gasLimit, tokenRequests, accountAddress, options.signers, options.sponsored, options.settlementLayers, options.sourceAssets, options.feeAsset, options.lockFunds);
     }
 }
-async function sendTransactionAsUserOp(config, chain, callInputs, signers) {
+async function sendUserOperationInternal(config, chain, callInputs, signers) {
     // Make sure the account is deployed
     await (0, accounts_1.deploy)(config, chain);
     const withSession = signers?.type === 'session' ? signers.session : null;
@@ -85,17 +93,14 @@ async function sendTransactionAsUserOp(config, chain, callInputs, signers) {
         chain: chain.id,
     };
 }
-async function sendTransactionAsIntent(config, sourceChains, targetChain, callInputs, gasLimit, tokenRequests, accountAddress, signers, sponsored, settlementLayers, sourceAssets, feeAsset) {
-    const { intentRoute } = await (0, utils_2.prepareTransactionAsIntent)(config, sourceChains, targetChain, callInputs, gasLimit, tokenRequests, accountAddress, sponsored ?? false, undefined, settlementLayers, sourceAssets, feeAsset);
+async function sendTransactionAsIntent(config, sourceChains, targetChain, callInputs, gasLimit, tokenRequests, accountAddress, signers, sponsored, settlementLayers, sourceAssets, feeAsset, lockFunds) {
+    const intentRoute = await (0, utils_2.prepareTransactionAsIntent)(config, sourceChains, targetChain, callInputs, gasLimit, tokenRequests, accountAddress, sponsored ?? false, undefined, settlementLayers, sourceAssets, feeAsset, lockFunds);
     if (!intentRoute) {
         throw new error_1.OrderPathRequiredForIntentsError();
     }
     const signature = await (0, utils_2.signIntent)(config, targetChain, intentRoute.intentOp, signers);
     const authorizations = config.eoa
-        ? await (0, utils_2.signAuthorizationsInternal)(config, {
-            type: 'intent',
-            intentRoute,
-        })
+        ? await (0, utils_2.signAuthorizationsInternal)(config, intentRoute)
         : [];
     return await (0, utils_2.submitIntentInternal)(config, sourceChains, targetChain, intentRoute.intentOp, signature, authorizations);
 }
@@ -112,14 +117,23 @@ async function waitForExecution(config, result, acceptsPreconfirmations) {
         case 'intent': {
             let intentStatus = null;
             while (intentStatus === null || !validStatuses.has(intentStatus.status)) {
-                const orchestrator = (0, utils_2.getOrchestratorByChain)(result.targetChain, config.rhinestoneApiKey, config.orchestratorUrl);
+                const orchestrator = (0, utils_2.getOrchestratorByChain)(result.targetChain, config.apiKey, config.endpointUrl);
                 intentStatus = await orchestrator.getIntentOpStatus(result.id);
                 await new Promise((resolve) => setTimeout(resolve, POLLING_INTERVAL));
             }
             if (intentStatus.status === orchestrator_1.INTENT_STATUS_FAILED) {
                 throw new error_1.IntentFailedError();
             }
-            return intentStatus;
+            return {
+                fill: {
+                    hash: intentStatus.fillTransactionHash,
+                    chainId: result.targetChain,
+                },
+                claims: intentStatus.claims.map((claim) => ({
+                    hash: claim.claimTransactionHash,
+                    chainId: claim.chainId,
+                })),
+            };
         }
         case 'userop': {
             const targetChain = (0, registry_1.getChainById)(result.chain);
@@ -137,12 +151,12 @@ async function waitForExecution(config, result, acceptsPreconfirmations) {
 }
 async function getMaxSpendableAmount(config, chain, tokenAddress, gasUnits, sponsored = false) {
     const address = (0, accounts_1.getAddress)(config);
-    const orchestrator = (0, utils_2.getOrchestratorByChain)(chain.id, config.rhinestoneApiKey, config.orchestratorUrl);
+    const orchestrator = (0, utils_2.getOrchestratorByChain)(chain.id, config.apiKey, config.endpointUrl);
     return orchestrator.getMaxTokenAmount(address, chain.id, tokenAddress, gasUnits, sponsored);
 }
 async function getPortfolio(config, onTestnets) {
     const address = (0, accounts_1.getAddress)(config);
     const chainId = onTestnets ? chains_1.sepolia.id : chains_1.mainnet.id;
-    const orchestrator = (0, utils_2.getOrchestratorByChain)(chainId, config.rhinestoneApiKey, config.orchestratorUrl);
+    const orchestrator = (0, utils_2.getOrchestratorByChain)(chainId, config.apiKey, config.endpointUrl);
     return orchestrator.getPortfolio(address);
 }

package/dist/src/execution/smart-session.d.ts

@@ -1,15 +1,15 @@
 import { type Chain, type Hex } from 'viem';
 import { type ChainDigest, type EnableSessionData, type SmartSessionModeType } from '../modules/validators/smart-sessions';
-import type { RhinestoneAccountConfig, Session } from '../types';
+import type { RhinestoneConfig, Session } from '../types';
 interface SessionDetails {
     permissionEnableHash: Hex;
     mode: SmartSessionModeType;
     hashesAndChainIds: ChainDigest[];
     enableSessionData: EnableSessionData;
 }
-declare function getSessionDetails(config: RhinestoneAccountConfig, sessions: Session[], sessionIndex: number, signature?: Hex): Promise<SessionDetails>;
+declare function getSessionDetails(config: RhinestoneConfig, sessions: Session[], sessionIndex: number, signature?: Hex): Promise<SessionDetails>;
 declare function getMultichainDigest(chainDigests: ChainDigest[]): Hex;
-declare function enableSmartSession(chain: Chain, config: RhinestoneAccountConfig, session: Session): Promise<void>;
+declare function enableSmartSession(chain: Chain, config: RhinestoneConfig, session: Session): Promise<void>;
 export { enableSmartSession, getSessionDetails, getMultichainDigest };
 export type { SessionDetails };
 //# sourceMappingURL=smart-session.d.ts.map

package/dist/src/execution/smart-session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"smart-session.d.ts","sourceRoot":"","sources":["../../../execution/smart-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,KAAK,EAIV,KAAK,GAAG,EAGT,MAAM,MAAM,CAAA;AAmBb,OAAO,EACL,KAAK,WAAW,EAEhB,KAAK,iBAAiB,EAGtB,KAAK,oBAAoB,EAC1B,MAAM,sCAAsC,CAAA;AAC7C,OAAO,KAAK,EAGV,uBAAuB,EACvB,OAAO,EACR,MAAM,UAAU,CAAA;AAGjB,UAAU,cAAc;IACtB,oBAAoB,EAAE,GAAG,CAAA;IACzB,IAAI,EAAE,oBAAoB,CAAA;IAC1B,iBAAiB,EAAE,WAAW,EAAE,CAAA;IAChC,iBAAiB,EAAE,iBAAiB,CAAA;CACrC;AAED,iBAAe,iBAAiB,CAC9B,MAAM,EAAE,uBAAuB,EAC/B,QAAQ,EAAE,OAAO,EAAE,EACnB,YAAY,EAAE,MAAM,EACpB,SAAS,CAAC,EAAE,GAAG,GACd,OAAO,CAAC,cAAc,CAAC,CA4BzB;AAgGD,iBAAS,mBAAmB,CAAC,YAAY,EAAE,WAAW,EAAE,GAAG,GAAG,CAgC7D;AAiLD,iBAAe,kBAAkB,CAC/B,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,uBAAuB,EAC/B,OAAO,EAAE,OAAO,iBA+BjB;AAED,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,CAAA;AACrE,YAAY,EAAE,cAAc,EAAE,CAAA"}
+{"version":3,"file":"smart-session.d.ts","sourceRoot":"","sources":["../../../execution/smart-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,KAAK,EAIV,KAAK,GAAG,EAGT,MAAM,MAAM,CAAA;AAmBb,OAAO,EACL,KAAK,WAAW,EAEhB,KAAK,iBAAiB,EAGtB,KAAK,oBAAoB,EAC1B,MAAM,sCAAsC,CAAA;AAC7C,OAAO,KAAK,EAGV,gBAAgB,EAChB,OAAO,EACR,MAAM,UAAU,CAAA;AAGjB,UAAU,cAAc;IACtB,oBAAoB,EAAE,GAAG,CAAA;IACzB,IAAI,EAAE,oBAAoB,CAAA;IAC1B,iBAAiB,EAAE,WAAW,EAAE,CAAA;IAChC,iBAAiB,EAAE,iBAAiB,CAAA;CACrC;AAED,iBAAe,iBAAiB,CAC9B,MAAM,EAAE,gBAAgB,EACxB,QAAQ,EAAE,OAAO,EAAE,EACnB,YAAY,EAAE,MAAM,EACpB,SAAS,CAAC,EAAE,GAAG,GACd,OAAO,CAAC,cAAc,CAAC,CA4BzB;AAgGD,iBAAS,mBAAmB,CAAC,YAAY,EAAE,WAAW,EAAE,GAAG,GAAG,CAgC7D;AAiLD,iBAAe,kBAAkB,CAC/B,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,OAAO,iBA+BjB;AAED,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,CAAA;AACrE,YAAY,EAAE,cAAc,EAAE,CAAA"}

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

@@ -2,49 +2,53 @@ import { type Address, type Chain, type HashTypedDataParameters, type Hex, type
 import { type UserOperation } from 'viem/account-abstraction';
 import { type IntentOp, type IntentRoute } from '../orchestrator';
 import type { SettlementLayer } from '../orchestrator/types';
-import type { Call, CallInput, RhinestoneAccountConfig, SignerSet, SourceAssetInput, TokenRequest, TokenSymbol, Transaction } from '../types';
-type TransactionResult = {
+import type { Call, CalldataInput, CallInput, RhinestoneConfig, SignerSet, SourceAssetInput, TokenRequest, TokenSymbol, Transaction, UserOperationTransaction } from '../types';
+interface UserOperationResult {
     type: 'userop';
     hash: Hex;
     chain: number;
-} | {
+}
+interface TransactionResult {
     type: 'intent';
     id: bigint;
     sourceChains?: number[];
     targetChain: number;
-};
-interface IntentData {
-    type: 'intent';
-    intentRoute: IntentRoute;
-}
-interface UserOpData {
-    type: 'userop';
-    hash: Hex;
-    userOp: UserOperation;
 }
 interface PreparedTransactionData {
-    data: IntentData | UserOpData;
+    intentRoute: IntentRoute;
     transaction: Transaction;
 }
+interface PreparedUserOperationData {
+    userOperation: UserOperation;
+    hash: Hex;
+    transaction: UserOperationTransaction;
+}
 interface SignedTransactionData extends PreparedTransactionData {
     signature: Hex;
 }
-declare function prepareTransaction(config: RhinestoneAccountConfig, transaction: Transaction): Promise<PreparedTransactionData>;
-declare function signTransaction(config: RhinestoneAccountConfig, preparedTransaction: PreparedTransactionData): Promise<SignedTransactionData>;
-declare function signAuthorizations(config: RhinestoneAccountConfig, preparedTransaction: PreparedTransactionData): Promise<SignedAuthorization[]>;
-declare function signMessage(config: RhinestoneAccountConfig, message: SignableMessage, chain: Chain, signers: SignerSet | undefined): Promise<`0x${string}`>;
-declare function signTypedData<typedData extends TypedData | Record<string, unknown> = TypedData, primaryType extends keyof typedData | 'EIP712Domain' = keyof typedData>(config: RhinestoneAccountConfig, parameters: HashTypedDataParameters<typedData, primaryType>, chain: Chain, signers: SignerSet | undefined): Promise<`0x${string}`>;
-declare function signAuthorizationsInternal(config: RhinestoneAccountConfig, data: IntentData | UserOpData): Promise<SignedAuthorization[]>;
-declare function submitTransaction(config: RhinestoneAccountConfig, signedTransaction: SignedTransactionData, authorizations: SignedAuthorizationList): Promise<TransactionResult>;
-declare function simulateTransaction(config: RhinestoneAccountConfig, signedTransaction: SignedTransactionData, authorizations: SignedAuthorizationList): Promise<import("../orchestrator").IntentResult>;
+interface SignedUserOperationData extends PreparedUserOperationData {
+    signature: Hex;
+}
+declare function prepareTransaction(config: RhinestoneConfig, transaction: Transaction): Promise<PreparedTransactionData>;
+declare function prepareUserOperation(config: RhinestoneConfig, transaction: UserOperationTransaction): Promise<PreparedUserOperationData>;
+declare function resolveCallInputs(inputs: CallInput[], config: RhinestoneConfig, chain: Chain, accountAddress: Address): Promise<CalldataInput[]>;
+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[]>;
+declare function signMessage(config: RhinestoneConfig, message: SignableMessage, chain: Chain, signers: SignerSet | undefined): Promise<`0x${string}`>;
+declare function signTypedData<typedData extends TypedData | Record<string, unknown> = TypedData, primaryType extends keyof typedData | 'EIP712Domain' = keyof typedData>(config: RhinestoneConfig, parameters: HashTypedDataParameters<typedData, primaryType>, chain: Chain, signers: SignerSet | undefined): Promise<`0x${string}`>;
+declare function signAuthorizationsInternal(config: RhinestoneConfig, data: IntentRoute | UserOperation): Promise<SignedAuthorization[]>;
+declare function submitTransaction(config: RhinestoneConfig, signedTransaction: SignedTransactionData, authorizations: SignedAuthorizationList): Promise<TransactionResult>;
+declare function submitUserOperation(config: RhinestoneConfig, signedUserOperation: SignedUserOperationData): Promise<UserOperationResult>;
+declare function simulateTransaction(config: RhinestoneConfig, signedTransaction: SignedTransactionData, authorizations: SignedAuthorizationList): Promise<import("../orchestrator").IntentResult>;
 declare function getTokenRequests(sourceChains: Chain[], targetChain: Chain, initialTokenRequests: TokenRequest[] | undefined, settlementLayers: SettlementLayer[] | undefined): TokenRequest[];
-declare function prepareTransactionAsIntent(config: RhinestoneAccountConfig, sourceChains: Chain[] | undefined, targetChain: Chain, callInputs: CallInput[], gasLimit: bigint | undefined, tokenRequests: TokenRequest[], accountAddress: Address, isSponsored: boolean, eip7702InitSignature: Hex | undefined, settlementLayers: SettlementLayer[] | undefined, sourceAssets: SourceAssetInput | undefined, feeAsset: Address | TokenSymbol | undefined): Promise<IntentData>;
-declare function signIntent(config: RhinestoneAccountConfig, targetChain: Chain, intentOp: IntentOp, signers?: SignerSet): Promise<`0x${string}`>;
+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): Promise<IntentRoute>;
+declare function signIntent(config: RhinestoneConfig, targetChain: Chain, intentOp: IntentOp, signers?: SignerSet): Promise<`0x${string}`>;
 declare function getOrchestratorByChain(chainId: number, apiKey: string | undefined, orchestratorUrl?: string): import("../orchestrator").Orchestrator;
-declare function submitIntentInternal(config: RhinestoneAccountConfig, sourceChains: Chain[] | undefined, targetChain: Chain, intentOp: IntentOp, signature: Hex, authorizations: SignedAuthorizationList): Promise<TransactionResult>;
-declare function simulateIntentInternal(config: RhinestoneAccountConfig, _sourceChains: Chain[] | undefined, targetChain: Chain, intentOp: IntentOp, signature: Hex, authorizations: SignedAuthorizationList): Promise<import("../orchestrator").IntentResult>;
-declare function getValidatorAccount(config: RhinestoneAccountConfig, signers: SignerSet | undefined, publicClient: PublicClient, chain: Chain): Promise<import("viem/account-abstraction").SmartAccount<import("viem/account-abstraction").SmartAccountImplementation<import("viem").Abi, "0.7">> | null>;
-declare function parseCalls(calls: CallInput[], chainId: number): Call[];
-export { prepareTransaction, signTransaction, signAuthorizations, signAuthorizationsInternal, signMessage, signTypedData, submitTransaction, simulateTransaction, getOrchestratorByChain, signIntent, prepareTransactionAsIntent, submitIntentInternal, simulateIntentInternal, getValidatorAccount, parseCalls, getTokenRequests, };
-export type { IntentData, TransactionResult, PreparedTransactionData, SignedTransactionData, };
+declare function submitIntentInternal(config: RhinestoneConfig, sourceChains: Chain[] | undefined, targetChain: Chain, intentOp: IntentOp, signature: Hex, authorizations: SignedAuthorizationList): Promise<TransactionResult>;
+declare function simulateIntentInternal(config: RhinestoneConfig, _sourceChains: Chain[] | undefined, targetChain: Chain, intentOp: IntentOp, signature: Hex, authorizations: SignedAuthorizationList): Promise<import("../orchestrator").IntentResult>;
+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>;
+declare function parseCalls(calls: CalldataInput[], chainId: number): Call[];
+export { prepareTransaction, signTransaction, signAuthorizations, signAuthorizationsInternal, signMessage, signTypedData, submitTransaction, simulateTransaction, prepareUserOperation, signUserOperation, submitUserOperation, getOrchestratorByChain, signIntent, prepareTransactionAsIntent, submitIntentInternal, simulateIntentInternal, getValidatorAccount, parseCalls, getTokenRequests, resolveCallInputs, };
+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

@@ -8,6 +8,9 @@ exports.signMessage = signMessage;
 exports.signTypedData = signTypedData;
 exports.submitTransaction = submitTransaction;
 exports.simulateTransaction = simulateTransaction;
+exports.prepareUserOperation = prepareUserOperation;
+exports.signUserOperation = signUserOperation;
+exports.submitUserOperation = submitUserOperation;
 exports.getOrchestratorByChain = getOrchestratorByChain;
 exports.signIntent = signIntent;
 exports.prepareTransactionAsIntent = prepareTransactionAsIntent;
@@ -16,6 +19,7 @@ exports.simulateIntentInternal = simulateIntentInternal;
 exports.getValidatorAccount = getValidatorAccount;
 exports.parseCalls = parseCalls;
 exports.getTokenRequests = getTokenRequests;
+exports.resolveCallInputs = resolveCallInputs;
 const viem_1 = require("viem");
 const account_abstraction_1 = require("viem/account-abstraction");
 const accounts_1 = require("../accounts");
@@ -29,50 +33,72 @@ const compact_1 = require("./compact");
 const error_1 = require("./error");
 const permit2_1 = require("./permit2");
 async function prepareTransaction(config, transaction) {
-    const { sourceChains, targetChain, tokenRequests, signers, sponsored, eip7702InitSignature, settlementLayers, sourceAssets, feeAsset, } = getTransactionParams(transaction);
+    const { sourceChains, targetChain, tokenRequests, signers, sponsored, eip7702InitSignature, settlementLayers, sourceAssets, feeAsset, lockFunds, } = getTransactionParams(transaction);
     const accountAddress = (0, accounts_1.getAddress)(config);
-    let data;
-    const asUserOp = signers?.type === 'guardians' || signers?.type === 'session';
-    if (asUserOp) {
-        if (sourceChains && sourceChains.length > 0) {
-            throw new error_1.SourceChainsNotAvailableForUserOpFlowError();
-        }
-        // Smart sessions require a UserOp flow
-        data = await prepareTransactionAsUserOp(config, targetChain, transaction.calls, signers, transaction.gasLimit);
-    }
-    else {
-        data = await prepareTransactionAsIntent(config, sourceChains, targetChain, transaction.calls, transaction.gasLimit, tokenRequests, accountAddress, sponsored ?? false, eip7702InitSignature, settlementLayers, sourceAssets, feeAsset);
+    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);
     return {
-        data,
+        intentRoute,
         transaction,
     };
 }
-async function signTransaction(config, preparedTransaction) {
-    const { targetChain, signers } = getTransactionParams(preparedTransaction.transaction);
-    const data = preparedTransaction.data;
-    const asUserOp = data.type === 'userop';
-    let signature;
-    if (asUserOp) {
-        const chain = targetChain;
-        const userOp = data.userOp;
-        if (!userOp) {
-            throw new error_1.UserOperationRequiredForSmartSessionsError();
+async function prepareUserOperation(config, transaction) {
+    const chain = transaction.chain;
+    const signers = transaction.signers;
+    const accountAddress = (0, accounts_1.getAddress)(config);
+    const data = await prepareTransactionAsUserOp(config, chain, await resolveCallInputs(transaction.calls, config, chain, accountAddress), signers, transaction.gasLimit);
+    return {
+        userOperation: data.userOp,
+        hash: data.hash,
+        transaction,
+    };
+}
+async function resolveCallInputs(inputs, config, chain, accountAddress) {
+    const resolved = [];
+    for (const intent of inputs) {
+        if ('resolve' in intent) {
+            const result = await intent.resolve({ config, chain, accountAddress });
+            if (Array.isArray(result)) {
+                resolved.push(...result);
+            }
+            else if (result) {
+                resolved.push(result);
+            }
+        }
+        else {
+            resolved.push(intent);
         }
-        // Smart sessions require a UserOp flow
-        signature = await signUserOp(config, chain, signers, userOp);
-    }
-    else {
-        signature = await signIntent(config, targetChain, data.intentRoute.intentOp, signers);
     }
+    return resolved;
+}
+async function signTransaction(config, preparedTransaction) {
+    const { targetChain, signers } = getTransactionParams(preparedTransaction.transaction);
+    const intentRoute = preparedTransaction.intentRoute;
+    const signature = await signIntent(config, targetChain, intentRoute.intentOp, signers);
     return {
-        data,
+        intentRoute,
         transaction: preparedTransaction.transaction,
         signature,
     };
 }
+async function signUserOperation(config, preparedUserOperation) {
+    const chain = preparedUserOperation.transaction.chain;
+    const userOp = preparedUserOperation.userOperation;
+    const signers = preparedUserOperation.transaction.signers;
+    // Smart sessions require a UserOp flow
+    const signature = await signUserOp(config, chain, signers, userOp);
+    return {
+        userOperation: preparedUserOperation.userOperation,
+        hash: preparedUserOperation.hash,
+        transaction: preparedUserOperation.transaction,
+        signature,
+    };
+}
 async function signAuthorizations(config, preparedTransaction) {
-    return await signAuthorizationsInternal(config, preparedTransaction.data);
+    return await signAuthorizationsInternal(config, preparedTransaction.intentRoute);
 }
 async function signMessage(config, message, chain, signers) {
     const validator = getValidator(config, signers);
@@ -107,9 +133,8 @@ async function signAuthorizationsInternal(config, data) {
         throw new Error('EIP-7702 initialization is required for EOA accounts');
     }
     const accountAddress = (0, accounts_1.getAddress)(config);
-    const requiredDelegations = data.type === 'intent'
-        ? data.intentRoute.intentOp.signedMetadata.account.requiredDelegations ||
-            {}
+    const requiredDelegations = 'intentOp' in data
+        ? data.intentOp.signedMetadata.account.requiredDelegations || {}
         : {};
     const authorizations = [];
     for (const chainId in requiredDelegations) {
@@ -136,40 +161,26 @@ async function signAuthorizationsInternal(config, data) {
     return authorizations;
 }
 async function submitTransaction(config, signedTransaction, authorizations) {
-    const { data, transaction, signature } = signedTransaction;
+    const { intentRoute, transaction, signature } = signedTransaction;
     const { sourceChains, targetChain } = getTransactionParams(transaction);
-    const asUserOp = data.type === 'userop';
-    if (asUserOp) {
-        const chain = targetChain;
-        const userOp = data.userOp;
-        if (!userOp) {
-            throw new error_1.UserOperationRequiredForSmartSessionsError();
-        }
-        // Smart sessions require a UserOp flow
-        return await submitUserOp(config, chain, userOp, signature);
-    }
-    else {
-        const intentOp = data.intentRoute.intentOp;
-        if (!intentOp) {
-            throw new error_1.OrderPathRequiredForIntentsError();
-        }
-        return await submitIntent(config, sourceChains, targetChain, intentOp, signature, authorizations);
-    }
+    const intentOp = intentRoute.intentOp;
+    return await submitIntent(config, sourceChains, targetChain, intentOp, signature, authorizations);
+}
+async function submitUserOperation(config, signedUserOperation) {
+    const chain = signedUserOperation.transaction.chain;
+    const userOp = signedUserOperation.userOperation;
+    const signature = signedUserOperation.signature;
+    // Smart sessions require a UserOp flow
+    return await submitUserOp(config, chain, userOp, signature);
 }
 async function simulateTransaction(config, signedTransaction, authorizations) {
-    const { data, transaction, signature } = signedTransaction;
+    const { intentRoute, transaction, signature } = signedTransaction;
     const { sourceChains, targetChain } = getTransactionParams(transaction);
-    const asUserOp = data.type === 'userop';
-    if (asUserOp) {
-        throw new error_1.SimulationNotSupportedForUserOpFlowError();
-    }
-    else {
-        const intentOp = data.intentRoute.intentOp;
-        if (!intentOp) {
-            throw new error_1.OrderPathRequiredForIntentsError();
-        }
-        return await simulateIntent(config, sourceChains, targetChain, intentOp, signature, authorizations);
+    const intentOp = intentRoute.intentOp;
+    if (!intentOp) {
+        throw new error_1.OrderPathRequiredForIntentsError();
     }
+    return await simulateIntent(config, sourceChains, targetChain, intentOp, signature, authorizations);
 }
 function getTransactionParams(transaction) {
     const sourceChains = 'chain' in transaction ? [transaction.chain] : transaction.sourceChains;
@@ -182,6 +193,7 @@ function getTransactionParams(transaction) {
     const settlementLayers = transaction.settlementLayers;
     const sourceAssets = transaction.sourceAssets;
     const feeAsset = transaction.feeAsset;
+    const lockFunds = transaction.lockFunds;
     const tokenRequests = getTokenRequests(sourceChains || [], targetChain, initialTokenRequests, settlementLayers);
     return {
         sourceChains,
@@ -194,6 +206,7 @@ function getTransactionParams(transaction) {
         settlementLayers,
         sourceAssets,
         feeAsset,
+        lockFunds,
     };
 }
 function getTokenRequests(sourceChains, targetChain, initialTokenRequests, settlementLayers) {
@@ -231,7 +244,6 @@ async function prepareTransactionAsUserOp(config, chain, callInputs, signers, ga
         callGasLimit: gasLimit,
     });
     return {
-        type: 'userop',
         userOp,
         hash: (0, account_abstraction_1.getUserOperationHash)({
             userOperation: userOp,
@@ -241,7 +253,7 @@ async function prepareTransactionAsUserOp(config, chain, callInputs, signers, ga
         }),
     };
 }
-async function prepareTransactionAsIntent(config, sourceChains, targetChain, callInputs, gasLimit, tokenRequests, accountAddress, isSponsored, eip7702InitSignature, settlementLayers, sourceAssets, feeAsset) {
+async function prepareTransactionAsIntent(config, sourceChains, targetChain, callInputs, gasLimit, tokenRequests, accountAddress, isSponsored, eip7702InitSignature, settlementLayers, sourceAssets, feeAsset, lockFunds) {
     const calls = parseCalls(callInputs, targetChain.id);
     const accountAccessList = createAccountAccessList(sourceChains, sourceAssets);
     const { setupOps, delegations } = await getSetupOperationsAndDelegations(config, targetChain, accountAddress, eip7702InitSignature);
@@ -261,7 +273,7 @@ async function prepareTransactionAsIntent(config, sourceChains, targetChain, cal
         destinationGasUnits: gasLimit,
         accountAccessList,
         options: {
-            topupCompact: false,
+            topupCompact: lockFunds ?? false,
             feeToken: feeAsset,
             sponsorSettings: {
                 gasSponsored: isSponsored,
@@ -271,12 +283,9 @@ async function prepareTransactionAsIntent(config, sourceChains, targetChain, cal
             settlementLayers,
         },
     };
-    const orchestrator = getOrchestratorByChain(targetChain.id, config.rhinestoneApiKey, config.orchestratorUrl);
+    const orchestrator = getOrchestratorByChain(targetChain.id, config.apiKey, config.endpointUrl);
     const intentRoute = await orchestrator.getIntentRoute(metaIntent);
-    return {
-        type: 'intent',
-        intentRoute,
-    };
+    return intentRoute;
 }
 async function signIntent(config, targetChain, intentOp, signers) {
     const validator = getValidator(config, signers);
@@ -404,7 +413,7 @@ function createSignedIntentOp(intentOp, signature, authorizations) {
 }
 async function submitIntentInternal(config, sourceChains, targetChain, intentOp, signature, authorizations) {
     const signedIntentOp = createSignedIntentOp(intentOp, signature, authorizations);
-    const orchestrator = getOrchestratorByChain(targetChain.id, config.rhinestoneApiKey, config.orchestratorUrl);
+    const orchestrator = getOrchestratorByChain(targetChain.id, config.apiKey, config.endpointUrl);
     const intentResults = await orchestrator.submitIntent(signedIntentOp);
     return {
         type: 'intent',
@@ -415,7 +424,7 @@ async function submitIntentInternal(config, sourceChains, targetChain, intentOp,
 }
 async function simulateIntentInternal(config, _sourceChains, targetChain, intentOp, signature, authorizations) {
     const signedIntentOp = createSignedIntentOp(intentOp, signature, authorizations);
-    const orchestrator = getOrchestratorByChain(targetChain.id, config.rhinestoneApiKey, config.orchestratorUrl);
+    const orchestrator = getOrchestratorByChain(targetChain.id, config.apiKey, config.endpointUrl);
     const simulationResults = await orchestrator.simulateIntent(signedIntentOp);
     return simulationResults;
 }

package/dist/src/index.d.ts

@@ -1,13 +1,12 @@
 import type { Address, Chain, HashTypedDataParameters, Hex, SignableMessage, SignedAuthorizationList, TypedData } from 'viem';
 import type { UserOperationReceipt } from 'viem/account-abstraction';
-import { AccountConfigurationNotSupportedError, AccountError, Eip7702AccountMustHaveEoaError, Eip7702NotSupportedForAccountError, ExistingEip7702AccountsNotSupportedError, FactoryArgsNotAvailableError, isAccountError, SigningNotSupportedForAccountError, SmartSessionsNotEnabledError, WalletClientNoConnectedAccountError } from './accounts';
 import { walletClientToAccount } from './accounts/walletClient';
-import { addOwner, addPasskeyOwner, changeMultiFactorThreshold, changePasskeyThreshold, changeThreshold, disableEcdsa, disableMultiFactor, disablePasskeys, enableEcdsa, enableMultiFactor, enablePasskeys, encodeSmartSessionSignature, installModule, recover, recoverEcdsaOwnership, recoverPasskeyOwnership, removeOwner, removePasskeyOwner, removeSubValidator, setSubValidator, setUpRecovery, uninstallModule } from './actions';
-import { ExecutionError, IntentFailedError, isExecutionError, OrderPathRequiredForIntentsError, SessionChainRequiredError, SimulationNotSupportedForUserOpFlowError, SourceChainsNotAvailableForUserOpFlowError, type TransactionResult, UserOperationRequiredForSmartSessionsError } from './execution';
+import { encodeSmartSessionSignature } from './actions/smart-session';
+import { type TransactionResult, type TransactionStatus, type UserOperationResult } from './execution';
 import { type SessionDetails } from './execution/smart-session';
-import { type IntentData, type PreparedTransactionData, type SignedTransactionData } from './execution/utils';
-import { AuthenticationRequiredError, getSupportedTokens, getTokenAddress, InsufficientBalanceError, type IntentCost, type IntentInput, IntentNotFoundError, type IntentOp, type IntentOpStatus, type IntentResult, type IntentRoute, InvalidApiKeyError, InvalidIntentSignatureError, isOrchestratorError, NoPathFoundError, OnlyOneTargetTokenAmountCanBeUnsetError, OrchestratorError, type Portfolio, type SettlementSystem, type SignedIntentOp, TokenNotSupportedError, UnsupportedChainError, UnsupportedChainIdError, UnsupportedTokenError } from './orchestrator';
-import type { AccountProviderConfig, AccountType, BundlerConfig, Call, CallInput, MultiFactorValidatorConfig, OwnableValidatorConfig, OwnerSet, PaymasterConfig, Policy, ProviderConfig, Recovery, RhinestoneAccountConfig, Session, SignerSet, TokenRequest, TokenSymbol, Transaction, UniversalActionPolicyParamCondition, WebauthnValidatorConfig } from './types';
+import { type IntentRoute, type PreparedTransactionData, type PreparedUserOperationData, type SignedTransactionData, type SignedUserOperationData } from './execution/utils';
+import { getSupportedTokens, getTokenAddress, type IntentCost, type IntentInput, type IntentOp, type IntentOpStatus, type IntentResult, type Portfolio, type SettlementSystem, type SignedIntentOp } from './orchestrator';
+import type { AccountProviderConfig, AccountType, BundlerConfig, Call, CallInput, MultiFactorValidatorConfig, OwnableValidatorConfig, OwnerSet, PaymasterConfig, Policy, ProviderConfig, Recovery, RhinestoneAccountConfig, Session, SignerSet, TokenRequest, TokenSymbol, Transaction, UniversalActionPolicyParamCondition, UserOperationTransaction, WebauthnValidatorConfig } from './types';
 interface RhinestoneAccount {
     config: RhinestoneAccountConfig;
     deploy: (chain: Chain, session?: Session) => Promise<boolean>;
@@ -22,7 +21,12 @@ interface RhinestoneAccount {
     submitTransaction: (signedTransaction: SignedTransactionData, authorizations?: SignedAuthorizationList) => Promise<TransactionResult>;
     simulateTransaction: (signedTransaction: SignedTransactionData, authorizations?: SignedAuthorizationList) => Promise<IntentResult>;
     sendTransaction: (transaction: Transaction) => Promise<TransactionResult>;
-    waitForExecution: (result: TransactionResult, acceptsPreconfirmations?: boolean) => Promise<IntentOpStatus | UserOperationReceipt>;
+    prepareUserOperation: (transaction: UserOperationTransaction) => Promise<PreparedUserOperationData>;
+    signUserOperation: (preparedUserOperation: PreparedUserOperationData) => Promise<SignedUserOperationData>;
+    submitUserOperation: (signedUserOperation: SignedUserOperationData) => Promise<UserOperationResult>;
+    sendUserOperation: (transaction: UserOperationTransaction) => Promise<UserOperationResult>;
+    waitForExecution(result: TransactionResult, acceptsPreconfirmations?: boolean): Promise<TransactionStatus>;
+    waitForExecution(result: UserOperationResult, acceptsPreconfirmations?: boolean): Promise<UserOperationReceipt>;
     getAddress: () => Address;
     getPortfolio: (onTestnets?: boolean) => Promise<Portfolio>;
     getMaxSpendableAmount: (chain: Chain, tokenAddress: Address, gasUnits: bigint, sponsored?: boolean) => Promise<bigint>;
@@ -33,13 +37,21 @@ interface RhinestoneAccount {
     } | null>;
     getValidators: (chain: Chain) => Promise<Address[]>;
 }
-/**
- * Initialize a Rhinestone account
- * Note: accounts are deployed onchain only when the first transaction is sent.
- * @param config Account config (e.g. implementation vendor, owner signers, smart sessions)
- * @returns account
- */
-declare function createRhinestoneAccount(config: RhinestoneAccountConfig): Promise<RhinestoneAccount>;
-export { createRhinestoneAccount, walletClientToAccount, addOwner, addPasskeyOwner, changeMultiFactorThreshold, changeThreshold, changePasskeyThreshold, disableEcdsa, disableMultiFactor, disablePasskeys, enableEcdsa, enableMultiFactor, enablePasskeys, encodeSmartSessionSignature, installModule, recover, recoverEcdsaOwnership, recoverPasskeyOwnership, removeOwner, removePasskeyOwner, removeSubValidator, setSubValidator, setUpRecovery, uninstallModule, isAccountError, AccountError, AccountConfigurationNotSupportedError, Eip7702AccountMustHaveEoaError, ExistingEip7702AccountsNotSupportedError, FactoryArgsNotAvailableError, SmartSessionsNotEnabledError, SigningNotSupportedForAccountError, Eip7702NotSupportedForAccountError, WalletClientNoConnectedAccountError, isExecutionError, ExecutionError, IntentFailedError, OrderPathRequiredForIntentsError, SessionChainRequiredError, SimulationNotSupportedForUserOpFlowError, SourceChainsNotAvailableForUserOpFlowError, UserOperationRequiredForSmartSessionsError, isOrchestratorError, AuthenticationRequiredError, InsufficientBalanceError, InvalidApiKeyError, InvalidIntentSignatureError, NoPathFoundError, OnlyOneTargetTokenAmountCanBeUnsetError, OrchestratorError, IntentNotFoundError, TokenNotSupportedError, UnsupportedChainError, UnsupportedChainIdError, UnsupportedTokenError, getSupportedTokens, getTokenAddress, };
-export type { RhinestoneAccount, AccountType, RhinestoneAccountConfig, AccountProviderConfig, ProviderConfig, BundlerConfig, PaymasterConfig, Transaction, TokenSymbol, CallInput, Call, TokenRequest, OwnerSet, OwnableValidatorConfig, WebauthnValidatorConfig, MultiFactorValidatorConfig, SignerSet, Session, Recovery, Policy, UniversalActionPolicyParamCondition, IntentData, PreparedTransactionData, SignedTransactionData, TransactionResult, IntentCost, IntentInput, IntentOp, IntentOpStatus, IntentResult, IntentRoute, SettlementSystem, SignedIntentOp, Portfolio, };
+declare class RhinestoneSDK {
+    private apiKey?;
+    private endpointUrl?;
+    private provider?;
+    private bundler?;
+    private paymaster?;
+    constructor(options?: {
+        apiKey?: string;
+        endpointUrl?: string;
+        provider?: ProviderConfig;
+        bundler?: BundlerConfig;
+        paymaster?: PaymasterConfig;
+    });
+    createAccount(config: RhinestoneAccountConfig): Promise<RhinestoneAccount>;
+}
+export { RhinestoneSDK, walletClientToAccount, encodeSmartSessionSignature, getSupportedTokens, getTokenAddress, };
+export type { RhinestoneAccount, AccountType, RhinestoneAccountConfig, AccountProviderConfig, ProviderConfig, BundlerConfig, PaymasterConfig, Transaction, TokenSymbol, CallInput, Call, TokenRequest, OwnerSet, OwnableValidatorConfig, WebauthnValidatorConfig, MultiFactorValidatorConfig, SignerSet, Session, Recovery, Policy, UniversalActionPolicyParamCondition, PreparedTransactionData, SignedTransactionData, TransactionResult, PreparedUserOperationData, SignedUserOperationData, UserOperationResult, IntentCost, IntentInput, IntentOp, IntentOpStatus, IntentRoute, SettlementSystem, SignedIntentOp, Portfolio, };
 //# sourceMappingURL=index.d.ts.map