@rhinestone/deposit-modal 0.1.26 → 0.1.28

package/dist/{chunk-4Q6QCALP.cjs → chunk-VW3QQWEL.cjs}

@@ -8,8 +8,6 @@
 
 
 
-
-
 var _chunkCEIWN53Ncjs = require('./chunk-CEIWN53N.cjs');
 
 // src/components/ui/Modal.tsx
@@ -146,6 +144,71 @@ Modal.displayName = "Modal";
 function jsonReplacer(_key, value) {
   return typeof value === "bigint" ? value.toString() : value;
 }
+function asRecord(value) {
+  return typeof value === "object" && value !== null ? value : null;
+}
+function toBigInt(value) {
+  if (typeof value === "bigint") return value;
+  if (typeof value === "number" && Number.isInteger(value)) return BigInt(value);
+  if (typeof value === "string" && value.trim() !== "") return BigInt(value);
+  throw new Error("Invalid bigint value");
+}
+function normalizeSessionTypedData(raw) {
+  const data = structuredClone(raw);
+  const domain = asRecord(data.domain);
+  if (domain && domain.chainId !== void 0 && domain.chainId !== null) {
+    domain.chainId = toBigInt(domain.chainId);
+  }
+  const message = asRecord(data.message);
+  if (!message || !Array.isArray(message.sessionsAndChainIds)) {
+    return data;
+  }
+  for (const entry of message.sessionsAndChainIds) {
+    const chainSession = asRecord(entry);
+    if (!chainSession) continue;
+    if (chainSession.chainId !== void 0 && chainSession.chainId !== null) {
+      chainSession.chainId = toBigInt(chainSession.chainId);
+    }
+    const session = asRecord(chainSession.session);
+    if (!session) continue;
+    if (session.nonce !== void 0 && session.nonce !== null) {
+      session.nonce = toBigInt(session.nonce);
+    }
+    if (session.expires !== void 0 && session.expires !== null) {
+      session.expires = toBigInt(session.expires);
+    }
+  }
+  return data;
+}
+function normalizeSetupAccountResponse(raw) {
+  const data = raw;
+  return {
+    smartAccount: data.smartAccount,
+    isRegistered: data.isRegistered,
+    targetChain: data.targetChain,
+    targetToken: data.targetToken,
+    needsRegistration: data.needsRegistration,
+    accountParams: data.accountParams,
+    sessionDetailsUnsigned: data.sessionDetailsUnsigned ? {
+      hashesAndChainIds: data.sessionDetailsUnsigned.hashesAndChainIds.map(
+        (h) => ({
+          chainId: toBigInt(h.chainId),
+          sessionDigest: h.sessionDigest
+        })
+      ),
+      data: normalizeSessionTypedData(data.sessionDetailsUnsigned.data)
+    } : void 0
+  };
+}
+function buildSessionDetails(unsigned, signature) {
+  return {
+    hashesAndChainIds: unsigned.hashesAndChainIds.map((h) => ({
+      chainId: toBigInt(h.chainId),
+      sessionDigest: h.sessionDigest
+    })),
+    signature
+  };
+}
 function createDepositService(baseUrl) {
   const normalizedBaseUrl = baseUrl.replace(/\/$/, "");
   function apiUrl(path) {
@@ -153,8 +216,8 @@ function createDepositService(baseUrl) {
     return `${normalizedBaseUrl}${normalizedPath}`;
   }
   return {
-    async prepareAccount(params) {
-      const response = await fetch(apiUrl("/prepare-account"), {
+    async setupAccount(params) {
+      const response = await fetch(apiUrl("/setup-account"), {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify(params)
@@ -162,10 +225,10 @@ function createDepositService(baseUrl) {
       if (!response.ok) {
         const error = await response.json().catch(() => ({ error: "Unknown error" }));
         throw new Error(
-          error.error || `Prepare account failed: ${response.status}`
+          error.error || `Setup account failed: ${response.status}`
         );
       }
-      return response.json();
+      return normalizeSetupAccountResponse(await response.json());
     },
     async registerAccount(params) {
       const { eoaAddress, sessionOwner, ...account } = params;
@@ -189,17 +252,6 @@ function createDepositService(baseUrl) {
       }
       return response.json();
     },
-    async checkAccount(address) {
-      const response = await fetch(apiUrl(`/check/${address}`), {
-        method: "GET",
-        headers: { "Content-Type": "application/json" }
-      });
-      if (!response.ok) {
-        const error = await response.json().catch(() => ({ error: "Unknown error" }));
-        throw new Error(error.error || `Check failed: ${response.status}`);
-      }
-      return response.json();
-    },
     async fetchPortfolio(address) {
       const response = await fetch(apiUrl(`/portfolio/${address}`), {
         method: "GET",
@@ -817,209 +869,12 @@ function ConnectStep({
 }
 ConnectStep.displayName = "ConnectStep";
 
-// src/core/account.ts
-
-
-var _sdk = require('@rhinestone/sdk');
-var _viem = require('viem');
-var _accounts = require('viem/accounts');
-function createViewOnlyAccount(address) {
-  if (!address || address === _viem.zeroAddress) {
-    throw new Error("Address is required");
-  }
-  return _accounts.toAccount.call(void 0, {
-    address,
-    signMessage: async () => {
-      throw new Error("Account is view-only");
-    },
-    signTransaction: async () => {
-      throw new Error("Account is view-only");
-    },
-    signTypedData: async () => {
-      throw new Error("Account is view-only");
-    }
-  });
-}
-function getSessionSignerAccount(signerAddress) {
-  if (!signerAddress || signerAddress === _viem.zeroAddress) {
-    throw new Error("Signer address is required");
-  }
-  return _accounts.toAccount.call(void 0, {
-    address: signerAddress,
-    signMessage: async () => {
-      throw new Error("Session signer is view-only");
-    },
-    signTransaction: async () => {
-      throw new Error("Session signer is view-only");
-    },
-    signTypedData: async () => {
-      throw new Error("Session signer is view-only");
-    }
-  });
-}
-function buildSession(chain, signerAddress) {
-  const sessionSignerAccount = getSessionSignerAccount(signerAddress);
-  return {
-    owners: {
-      type: "ecdsa",
-      accounts: [sessionSignerAccount]
-    },
-    chain
-  };
-}
-async function createSmartAccount(userSigner, sessionSigner, sdkApiKey) {
-  const rhinestone = new (0, _sdk.RhinestoneSDK)({
-    apiKey: _nullishCoalesce(sdkApiKey, () => ( ""))
-  });
-  const ownerAccounts = sessionSigner ? [userSigner, sessionSigner] : [userSigner];
-  const config = {
-    account: {
-      type: "nexus"
-    },
-    owners: {
-      type: "ecdsa",
-      accounts: ownerAccounts,
-      ...sessionSigner ? { threshold: 1 } : {}
-    },
-    experimental_sessions: {
-      enabled: true
-    }
-  };
-  const account = await rhinestone.createAccount(config);
-  return account;
-}
-function getAccountAddress(account) {
-  return account.getAddress();
-}
-function getAccountInitData(account) {
-  const { factory, factoryData } = account.getInitData();
-  if (!factory) {
-    throw new Error("Account init data is not available");
-  }
-  return {
-    factory,
-    factoryData
-  };
-}
-async function signEnableSessionWithOwner(rhinestoneAccount, sessionDetails, signer) {
-  const originalOwners = rhinestoneAccount.config.owners;
-  rhinestoneAccount.config.owners = {
-    type: "ecdsa",
-    accounts: [signer],
-    threshold: 1,
-    ..._optionalChain([originalOwners, 'optionalAccess', _41 => _41.type]) === "ecdsa" && originalOwners.module ? { module: originalOwners.module } : {}
-  };
-  try {
-    return await rhinestoneAccount.experimental_signEnableSession(
-      sessionDetails
-    );
-  } finally {
-    rhinestoneAccount.config.owners = originalOwners;
-  }
-}
-async function getSessionDetails(rhinestoneAccount, targetChain, signerAddress, sessionSigner, targetToken, sessionChainIds) {
-  const isTargetTestnet = Boolean(targetChain.testnet);
-  const chainsByNetworkType = _chunkCEIWN53Ncjs.SUPPORTED_CHAINS.filter(
-    (chain) => Boolean(chain.testnet) === isTargetTestnet
-  );
-  const chainsById = new Map(
-    chainsByNetworkType.map((chain) => [chain.id, chain])
-  );
-  let selectedChains = [...chainsByNetworkType];
-  if (sessionChainIds && sessionChainIds.length > 0) {
-    const selectedByCaller = [];
-    for (const chainId of sessionChainIds) {
-      const chain = chainsById.get(chainId);
-      if (chain) {
-        selectedByCaller.push(chain);
-      }
-    }
-    if (selectedByCaller.length > 0) {
-      selectedChains = selectedByCaller;
-    }
-  }
-  if (targetToken) {
-    const targetSymbol = _chunkCEIWN53Ncjs.getTokenSymbol.call(void 0, 
-      targetToken,
-      targetChain.id
-    ).toUpperCase();
-    if (targetSymbol && targetSymbol !== "TOKEN") {
-      const chainsForToken = selectedChains.filter(
-        (chain) => _chunkCEIWN53Ncjs.getSupportedTokenSymbolsForChain.call(void 0, chain.id).includes(targetSymbol)
-      );
-      if (chainsForToken.length > 0) {
-        selectedChains = chainsForToken;
-      }
-    }
-  }
-  if (!selectedChains.some((c) => c.id === targetChain.id)) {
-    selectedChains.push(targetChain);
-  }
-  const uniqueChains = Array.from(
-    new Map(selectedChains.map((chain) => [chain.id, chain])).values()
-  );
-  const sessions = uniqueChains.map(
-    (chain) => buildSession(chain, signerAddress)
-  );
-  const sessionDetails = await rhinestoneAccount.experimental_getSessionDetails(sessions);
-  const enableSignature = sessionSigner ? await signEnableSessionWithOwner(
-    rhinestoneAccount,
-    sessionDetails,
-    sessionSigner
-  ) : await rhinestoneAccount.experimental_signEnableSession(sessionDetails);
-  if (!_optionalChain([sessionDetails, 'access', _42 => _42.hashesAndChainIds, 'optionalAccess', _43 => _43.length])) {
-    throw new Error("Session details missing chain digests");
-  }
-  return {
-    hashesAndChainIds: sessionDetails.hashesAndChainIds,
-    signature: enableSignature
-  };
-}
-function deserializeSessionData(raw) {
-  const data = structuredClone(raw);
-  const message = data.message;
-  if (!_optionalChain([message, 'optionalAccess', _44 => _44.sessionsAndChainIds])) return data;
-  for (const entry of message.sessionsAndChainIds) {
-    const chainSession = entry;
-    chainSession.chainId = BigInt(chainSession.chainId);
-    const session = chainSession.session;
-    if (session) {
-      session.nonce = BigInt(session.nonce);
-      session.expires = BigInt(session.expires);
-    }
-  }
-  return data;
-}
-async function signSessionDetails(rhinestoneAccount, sessionDetailsUnsigned, signer) {
-  const data = deserializeSessionData(sessionDetailsUnsigned.data);
-  const hashesAndChainIds = sessionDetailsUnsigned.hashesAndChainIds.map(
-    (h) => ({
-      chainId: BigInt(h.chainId),
-      sessionDigest: h.sessionDigest
-    })
-  );
-  const sessionDetails = {
-    nonces: [],
-    hashesAndChainIds,
-    data
-  };
-  const signature = await signEnableSessionWithOwner(
-    rhinestoneAccount,
-    sessionDetails,
-    signer
-  );
-  return {
-    hashesAndChainIds,
-    signature
-  };
-}
-
 // src/core/session-owner.ts
+var _viem = require('viem');
 
 
 
-
-
+var _accounts = require('viem/accounts');
 var STORAGE_PREFIX = "rhinestone:session-owner";
 function storageKey(eoaAddress) {
   return `${STORAGE_PREFIX}:${eoaAddress.toLowerCase()}`;
@@ -1112,22 +967,22 @@ function asString(value) {
   return typeof value === "string" ? value : void 0;
 }
 function getEventTxHash(event) {
-  if (!_optionalChain([event, 'optionalAccess', _45 => _45.type])) return void 0;
+  if (!_optionalChain([event, 'optionalAccess', _41 => _41.type])) return void 0;
   if (event.type === "deposit-received") {
-    return asString(_optionalChain([event, 'access', _46 => _46.data, 'optionalAccess', _47 => _47.transactionHash]));
+    return asString(_optionalChain([event, 'access', _42 => _42.data, 'optionalAccess', _43 => _43.transactionHash]));
   }
   if (event.type === "bridge-started" || event.type === "bridge-complete") {
-    const deposit = isRecord(_optionalChain([event, 'access', _48 => _48.data, 'optionalAccess', _49 => _49.deposit])) ? event.data.deposit : void 0;
-    return asString(_optionalChain([deposit, 'optionalAccess', _50 => _50.transactionHash]));
+    const deposit = isRecord(_optionalChain([event, 'access', _44 => _44.data, 'optionalAccess', _45 => _45.deposit])) ? event.data.deposit : void 0;
+    return asString(_optionalChain([deposit, 'optionalAccess', _46 => _46.transactionHash]));
   }
   if (event.type === "bridge-failed" || event.type === "error") {
-    const deposit = isRecord(_optionalChain([event, 'access', _51 => _51.data, 'optionalAccess', _52 => _52.deposit])) ? event.data.deposit : void 0;
-    return asString(_optionalChain([deposit, 'optionalAccess', _53 => _53.transactionHash]));
+    const deposit = isRecord(_optionalChain([event, 'access', _47 => _47.data, 'optionalAccess', _48 => _48.deposit])) ? event.data.deposit : void 0;
+    return asString(_optionalChain([deposit, 'optionalAccess', _49 => _49.transactionHash]));
   }
   return void 0;
 }
 function isDepositEvent(event) {
-  return _optionalChain([event, 'optionalAccess', _54 => _54.type]) === "deposit-received" || _optionalChain([event, 'optionalAccess', _55 => _55.type]) === "bridge-started";
+  return _optionalChain([event, 'optionalAccess', _50 => _50.type]) === "deposit-received" || _optionalChain([event, 'optionalAccess', _51 => _51.type]) === "bridge-started";
 }
 
 // src/components/steps/ProcessingStep.tsx
@@ -1142,7 +997,7 @@ function isEventForTx(event, txHash) {
   return eventTxHash.toLowerCase() === txHash.toLowerCase();
 }
 function formatBridgeFailedMessage(event) {
-  const eventData = _nullishCoalesce(_optionalChain([event, 'optionalAccess', _56 => _56.data]), () => ( {}));
+  const eventData = _nullishCoalesce(_optionalChain([event, 'optionalAccess', _52 => _52.data]), () => ( {}));
   const code = typeof eventData.errorCode === "string" ? eventData.errorCode : void 0;
   const backendMessage = typeof eventData.message === "string" ? eventData.message.trim() : "";
   if (backendMessage.length > 0) {
@@ -1183,7 +1038,7 @@ function ProcessingStep({
   const intervalRef = _react.useRef.call(void 0, null);
   _react.useEffect.call(void 0, () => {
     if (directTransfer) {
-      _optionalChain([onDepositComplete, 'optionalCall', _57 => _57(txHash)]);
+      _optionalChain([onDepositComplete, 'optionalCall', _53 => _53(txHash)]);
       return;
     }
   }, [directTransfer, txHash, onDepositComplete]);
@@ -1226,40 +1081,40 @@ function ProcessingStep({
           console.log("[deposit-modal] status poll", {
             type: lastEvent2.type,
             matchesTx: eventMatchesTx,
-            intentId: _optionalChain([eventData, 'optionalAccess', _58 => _58.intentId]),
+            intentId: _optionalChain([eventData, 'optionalAccess', _54 => _54.intentId]),
             data: eventData
           });
         }
         if (!isMounted) return;
-        if (_optionalChain([eventForCurrentTx, 'optionalAccess', _59 => _59.type]) === "bridge-complete") {
+        if (_optionalChain([eventForCurrentTx, 'optionalAccess', _55 => _55.type]) === "bridge-complete") {
           setState({ type: "complete", lastEvent: eventForCurrentTx });
-          const destinationTxHash2 = _optionalChain([eventForCurrentTx, 'access', _60 => _60.data, 'optionalAccess', _61 => _61.destination, 'optionalAccess', _62 => _62.transactionHash]);
-          _optionalChain([onDepositComplete, 'optionalCall', _63 => _63(txHash, destinationTxHash2)]);
+          const destinationTxHash2 = _optionalChain([eventForCurrentTx, 'access', _56 => _56.data, 'optionalAccess', _57 => _57.destination, 'optionalAccess', _58 => _58.transactionHash]);
+          _optionalChain([onDepositComplete, 'optionalCall', _59 => _59(txHash, destinationTxHash2)]);
           return;
         }
-        if (!waitForFinalTx && _optionalChain([eventForCurrentTx, 'optionalAccess', _64 => _64.type]) === "bridge-started") {
+        if (!waitForFinalTx && _optionalChain([eventForCurrentTx, 'optionalAccess', _60 => _60.type]) === "bridge-started") {
           setState({ type: "complete", lastEvent: eventForCurrentTx });
-          _optionalChain([onDepositComplete, 'optionalCall', _65 => _65(txHash)]);
+          _optionalChain([onDepositComplete, 'optionalCall', _61 => _61(txHash)]);
           return;
         }
-        if (_optionalChain([eventForCurrentTx, 'optionalAccess', _66 => _66.type]) === "bridge-failed") {
+        if (_optionalChain([eventForCurrentTx, 'optionalAccess', _62 => _62.type]) === "bridge-failed") {
           const formatted = formatBridgeFailedMessage(eventForCurrentTx);
           setState({
             type: "failed",
             message: formatted.message,
             lastEvent: eventForCurrentTx
           });
-          _optionalChain([onDepositFailed, 'optionalCall', _67 => _67(txHash, formatted.message)]);
+          _optionalChain([onDepositFailed, 'optionalCall', _63 => _63(txHash, formatted.message)]);
           return;
         }
-        if (_optionalChain([eventForCurrentTx, 'optionalAccess', _68 => _68.type]) === "error") {
-          const errorMessage = _nullishCoalesce(_optionalChain([eventForCurrentTx, 'access', _69 => _69.data, 'optionalAccess', _70 => _70.message]), () => ( "Unknown error"));
+        if (_optionalChain([eventForCurrentTx, 'optionalAccess', _64 => _64.type]) === "error") {
+          const errorMessage = _nullishCoalesce(_optionalChain([eventForCurrentTx, 'access', _65 => _65.data, 'optionalAccess', _66 => _66.message]), () => ( "Unknown error"));
           setState({
             type: "failed",
             message: errorMessage,
             lastEvent: eventForCurrentTx
           });
-          _optionalChain([onDepositFailed, 'optionalCall', _71 => _71(txHash, errorMessage)]);
+          _optionalChain([onDepositFailed, 'optionalCall', _67 => _67(txHash, errorMessage)]);
           return;
         }
         setState({ type: "processing", lastEvent: eventForCurrentTx });
@@ -1307,7 +1162,7 @@ function ProcessingStep({
     processTimeoutRef.current = setTimeout(() => {
       const message = "We couldn't confirm your transfer. Please contact support if funds do not arrive.";
       setState({ type: "error", message });
-      _optionalChain([onError, 'optionalCall', _72 => _72(message, "PROCESS_TIMEOUT")]);
+      _optionalChain([onError, 'optionalCall', _68 => _68(message, "PROCESS_TIMEOUT")]);
     }, PROCESS_TIMEOUT_MS);
     return () => {
       if (processTimeoutRef.current) {
@@ -1320,10 +1175,10 @@ function ProcessingStep({
   const isComplete = state.type === "complete";
   const isProcessing = state.type === "processing";
   const lastEvent = state.type === "processing" || state.type === "complete" || state.type === "failed" ? state.lastEvent : void 0;
-  const isEarlyComplete = !waitForFinalTx && _optionalChain([lastEvent, 'optionalAccess', _73 => _73.type]) === "bridge-started";
+  const isEarlyComplete = !waitForFinalTx && _optionalChain([lastEvent, 'optionalAccess', _69 => _69.type]) === "bridge-started";
   const flowNoun = flowLabel === "withdraw" ? "withdrawal" : "deposit";
   const flowCapitalized = flowLabel === "withdraw" ? "Withdrawal" : "Deposit";
-  const destinationTxHash = _optionalChain([lastEvent, 'optionalAccess', _74 => _74.data, 'optionalAccess', _75 => _75.destination, 'optionalAccess', _76 => _76.transactionHash]) || null;
+  const destinationTxHash = _optionalChain([lastEvent, 'optionalAccess', _70 => _70.data, 'optionalAccess', _71 => _71.destination, 'optionalAccess', _72 => _72.transactionHash]) || null;
   const sourceExplorerUrl = _chunkCEIWN53Ncjs.getExplorerTxUrl.call(void 0, sourceChain, txHash);
   const destExplorerUrl = destinationTxHash ? _chunkCEIWN53Ncjs.getExplorerTxUrl.call(void 0, targetChain, destinationTxHash) : null;
   const truncateHash = (hash) => `${hash.slice(0, 10)}...${hash.slice(-8)}`;
@@ -1556,7 +1411,7 @@ function ProcessingStep({
         {
           className: `rs-step-description ${isError ? "rs-text-error" : "rs-text-secondary"}`,
           children: [
-            state.type === "processing" && (_optionalChain([lastEvent, 'optionalAccess', _77 => _77.type]) === "deposit-received" ? "Transfer received. Preparing bridge..." : _optionalChain([lastEvent, 'optionalAccess', _78 => _78.type]) === "bridge-started" ? "Transfer confirmed. Funds arriving shortly..." : `Bridging your ${flowNoun} to ${_chunkCEIWN53Ncjs.getChainName.call(void 0, targetChain)}.`),
+            state.type === "processing" && (_optionalChain([lastEvent, 'optionalAccess', _73 => _73.type]) === "deposit-received" ? "Transfer received. Preparing bridge..." : _optionalChain([lastEvent, 'optionalAccess', _74 => _74.type]) === "bridge-started" ? "Transfer confirmed. Funds arriving shortly..." : `Bridging your ${flowNoun} to ${_chunkCEIWN53Ncjs.getChainName.call(void 0, targetChain)}.`),
             state.type === "failed" && state.message,
             state.type === "error" && state.message
           ]
@@ -1727,9 +1582,4 @@ function getPublicClient(chainId) {
 
 
 
-
-
-
-
-
-exports.Modal = Modal; exports.Spinner = Spinner; exports.Button = Button; exports.ConnectStep = ConnectStep; exports.createViewOnlyAccount = createViewOnlyAccount; exports.createSmartAccount = createSmartAccount; exports.getAccountAddress = getAccountAddress; exports.getAccountInitData = getAccountInitData; exports.getSessionDetails = getSessionDetails; exports.signSessionDetails = signSessionDetails; exports.loadSessionOwnerFromStorage = loadSessionOwnerFromStorage; exports.saveSessionOwnerToStorage = saveSessionOwnerToStorage; exports.createSessionOwnerKey = createSessionOwnerKey; exports.accountFromPrivateKey = accountFromPrivateKey; exports.PoweredBy = PoweredBy; exports.createDepositService = createDepositService; exports.getAssetId = getAssetId; exports.portfolioToAssets = portfolioToAssets; exports.isNativeAsset = isNativeAsset; exports.currencyFormatter = currencyFormatter; exports.tokenFormatter = tokenFormatter; exports.formatUserError = formatUserError; exports.getEventTxHash = getEventTxHash; exports.isDepositEvent = isDepositEvent; exports.ProcessingStep = ProcessingStep; exports.getPublicClient = getPublicClient; exports.applyTheme = applyTheme;
+exports.Modal = Modal; exports.Spinner = Spinner; exports.Button = Button; exports.ConnectStep = ConnectStep; exports.buildSessionDetails = buildSessionDetails; exports.createDepositService = createDepositService; exports.getAssetId = getAssetId; exports.portfolioToAssets = portfolioToAssets; exports.isNativeAsset = isNativeAsset; exports.loadSessionOwnerFromStorage = loadSessionOwnerFromStorage; exports.saveSessionOwnerToStorage = saveSessionOwnerToStorage; exports.createSessionOwnerKey = createSessionOwnerKey; exports.accountFromPrivateKey = accountFromPrivateKey; exports.PoweredBy = PoweredBy; exports.currencyFormatter = currencyFormatter; exports.tokenFormatter = tokenFormatter; exports.formatUserError = formatUserError; exports.getEventTxHash = getEventTxHash; exports.isDepositEvent = isDepositEvent; exports.ProcessingStep = ProcessingStep; exports.getPublicClient = getPublicClient; exports.applyTheme = applyTheme;

package/dist/{chunk-DJAUNNEW.mjs → chunk-XF7M4TTT.mjs}

@@ -6,23 +6,18 @@ import {
   ProcessingStep,
   accountFromPrivateKey,
   applyTheme,
+  buildSessionDetails,
   createDepositService,
   createSessionOwnerKey,
-  createSmartAccount,
-  createViewOnlyAccount,
   currencyFormatter,
   formatUserError,
-  getAccountAddress,
-  getAccountInitData,
   getAssetId,
   getPublicClient,
-  getSessionDetails,
   isNativeAsset,
   loadSessionOwnerFromStorage,
   saveSessionOwnerToStorage
-} from "./chunk-3FK5FAUL.mjs";
+} from "./chunk-RQSAANC3.mjs";
 import {
-  CHAIN_BY_ID,
   DEFAULT_BACKEND_URL,
   DEFAULT_SIGNER_ADDRESS,
   NATIVE_TOKEN_ADDRESS,
@@ -559,9 +554,6 @@ function WithdrawFormStep({
 }
 WithdrawFormStep.displayName = "WithdrawFormStep";
 
-// src/WithdrawFlow.tsx
-import { walletClientToAccount } from "@rhinestone/sdk";
-
 // src/core/safe.ts
 import {
   concat,
@@ -862,7 +854,6 @@ function WithdrawFlow({
   recipient: defaultRecipient,
   amount: defaultAmount,
   service,
-  rhinestoneApiKey,
   signerAddress = DEFAULT_SIGNER_ADDRESS,
   sessionChainIds,
   forceRegister = false,
@@ -892,7 +883,6 @@ function WithdrawFlow({
     setTargetChain(targetChainProp);
     setTargetToken(targetTokenProp);
   }, [targetChainProp, targetTokenProp]);
-  const targetChainObj = useMemo2(() => CHAIN_BY_ID[targetChain], [targetChain]);
   const hasCustomSigner = Boolean(dappAddress && onSignTransaction);
   const dappSwitchChain = useMemo2(() => {
     if (!dappWalletClient?.switchChain) return void 0;
@@ -1031,36 +1021,41 @@ function WithdrawFlow({
       if (!onSignTransaction && !signerContext?.walletClient) {
         throw new Error("Wallet not connected");
       }
-      if (!targetChainObj) {
-        throw new Error("Unsupported target chain");
-      }
       setIsSubmitting(true);
       try {
-        const signerAccount = signerContext?.walletClient ? walletClientToAccount(signerContext.walletClient) : createViewOnlyAccount(ownerAddress2);
         const sessionOwner = await resolveSessionOwner(ownerAddress2);
-        const account = await createSmartAccount(
-          signerAccount,
-          sessionOwner.account,
-          rhinestoneApiKey
-        );
-        const smartAccount = getAccountAddress(account);
-        const checkResult = await service.checkAccount(smartAccount);
-        const targetMatches = checkResult.targetChain === targetChain && checkResult.targetToken?.toLowerCase() === targetToken.toLowerCase();
-        if (!checkResult.isRegistered || forceRegister || !targetMatches) {
-          const initData = getAccountInitData(account);
-          const sessionDetails = await getSessionDetails(
-            account,
-            targetChainObj,
-            signerAddress,
-            sessionOwner.account,
-            targetToken,
-            sessionChainIds
-          );
+        const setup = await service.setupAccount({
+          ownerAddress: ownerAddress2,
+          sessionOwnerAddress: sessionOwner.address,
+          targetChain,
+          targetToken,
+          signerAddress,
+          sessionChainIds,
+          forceRegister
+        });
+        const smartAccount = setup.smartAccount;
+        if (setup.needsRegistration) {
+          if (!setup.accountParams || !setup.sessionDetailsUnsigned) {
+            throw new Error("Missing registration payload from setup-account");
+          }
+          const typedData = setup.sessionDetailsUnsigned.data;
+          if (!sessionOwner.account.signTypedData) {
+            throw new Error(
+              "Session owner account does not support signTypedData"
+            );
+          }
+          const signature = await sessionOwner.account.signTypedData({
+            domain: typedData.domain,
+            types: typedData.types,
+            primaryType: typedData.primaryType,
+            message: typedData.message
+          });
+          const sessionDetails = buildSessionDetails(setup.sessionDetailsUnsigned, signature);
           await service.registerAccount({
             address: smartAccount,
             accountParams: {
-              factory: initData.factory,
-              factoryData: initData.factoryData,
+              factory: setup.accountParams.factory,
+              factoryData: setup.accountParams.factoryData,
               sessionDetails
             },
             eoaAddress: ownerAddress2,
@@ -1150,7 +1145,6 @@ function WithdrawFlow({
     },
     [
       signerContext,
-      targetChainObj,
       resolveSessionOwner,
       signerAddress,
       sessionChainIds,
@@ -1158,7 +1152,6 @@ function WithdrawFlow({
       targetChain,
       targetToken,
       service,
-      rhinestoneApiKey,
       handleConnected,
       asset.decimals,
       safeAddress,
@@ -1307,7 +1300,7 @@ function WithdrawFlow({
 // src/WithdrawModal.tsx
 import { jsx as jsx3, jsxs as jsxs3 } from "react/jsx-runtime";
 var ReownWithdrawInner = lazy(
-  () => import("./WithdrawModalReown-244RQ5FZ.mjs").then((m) => ({
+  () => import("./WithdrawModalReown-LIYQG2BW.mjs").then((m) => ({
     default: m.WithdrawModalReown
   }))
 );
@@ -1334,7 +1327,6 @@ function WithdrawModalInner({
   onClose,
   inline,
   backendUrl = DEFAULT_BACKEND_URL,
-  rhinestoneApiKey,
   signerAddress = DEFAULT_SIGNER_ADDRESS,
   sessionChainIds,
   forceRegister = false,
@@ -1503,7 +1495,6 @@ function WithdrawModalInner({
             recipient,
             amount: defaultAmount,
             service,
-            rhinestoneApiKey,
             signerAddress,
             sessionChainIds,
             forceRegister,