@rhinestone/deposit-modal 0.1.26 → 0.1.27

package/dist/{chunk-W42B54IA.mjs → chunk-AJALMXW4.mjs}

@@ -7,10 +7,9 @@ import {
   Spinner,
   accountFromPrivateKey,
   applyTheme,
+  buildSessionDetails,
   createDepositService,
   createSessionOwnerKey,
-  createSmartAccount,
-  createViewOnlyAccount,
   currencyFormatter,
   formatUserError,
   getAssetId,
@@ -21,11 +20,9 @@ import {
   loadSessionOwnerFromStorage,
   portfolioToAssets,
   saveSessionOwnerToStorage,
-  signSessionDetails,
   tokenFormatter
-} from "./chunk-3FK5FAUL.mjs";
+} from "./chunk-YOFGP4FV.mjs";
 import {
-  CHAIN_BY_ID,
   DEFAULT_BACKEND_URL,
   DEFAULT_SIGNER_ADDRESS,
   NATIVE_TOKEN_ADDRESS,
@@ -57,7 +54,6 @@ import { useState as useState7, useCallback as useCallback3, useMemo as useMemo6
 
 // src/components/steps/SetupStep.tsx
 import { useState, useEffect, useRef, useCallback } from "react";
-import { walletClientToAccount } from "@rhinestone/sdk";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 async function resolveSessionOwner(eoaAddress) {
   const localOwner = loadSessionOwnerFromStorage(eoaAddress);
@@ -78,9 +74,7 @@ function SetupStep({
   walletClient,
   address,
   targetChain,
-  targetChainObj,
   targetToken,
-  rhinestoneApiKey,
   signerAddress,
   sessionChainIds,
   recipient,
@@ -93,7 +87,7 @@ function SetupStep({
   const [state, setState] = useState({ type: "idle" });
   const setupInitiatedRef = useRef(false);
   const runSetup = useCallback(async () => {
-    if (!address || !targetChainObj) {
+    if (!address) {
       return;
     }
     if (walletClient && !walletClient.account) {
@@ -102,15 +96,8 @@ function SetupStep({
     try {
       setState({ type: "creating-account" });
       const sessionOwner = await resolveSessionOwner(address);
-      const prepared = await service.prepareAccount({
-        ownerAddress: address,
-        sessionOwnerAddress: sessionOwner.address,
-        targetChain,
-        targetToken,
-        signerAddress,
-        sessionChainIds
-      });
-      const smartAccount = prepared.smartAccount;
+      const computed = await service.computeAddress(address, sessionOwner.address);
+      const smartAccount = computed.smartAccount;
       setState({ type: "checking" });
       const checkResult = await service.checkAccount(smartAccount);
       if (checkResult.isRegistered && !forceRegister) {
@@ -123,16 +110,27 @@ function SetupStep({
         }
       }
       setState({ type: "signing-session" });
-      const signerAccount = walletClient ? walletClientToAccount(walletClient) : createViewOnlyAccount(address);
-      const account = await createSmartAccount(
-        signerAccount,
-        sessionOwner.account,
-        rhinestoneApiKey
-      );
-      const sessionDetails = await signSessionDetails(
-        account,
+      const prepared = await service.prepareAccount({
+        ownerAddress: address,
+        sessionOwnerAddress: sessionOwner.address,
+        targetChain,
+        targetToken,
+        signerAddress,
+        sessionChainIds
+      });
+      if (!sessionOwner.account.signTypedData) {
+        throw new Error("Session owner account does not support signTypedData");
+      }
+      const typedData = prepared.sessionDetailsUnsigned.data;
+      const signature = await sessionOwner.account.signTypedData({
+        domain: typedData.domain,
+        types: typedData.types,
+        primaryType: typedData.primaryType,
+        message: typedData.message
+      });
+      const sessionDetails = buildSessionDetails(
         prepared.sessionDetailsUnsigned,
-        sessionOwner.account
+        signature
       );
       setState({ type: "registering" });
       await service.registerAccount({
@@ -161,10 +159,8 @@ function SetupStep({
   }, [
     address,
     walletClient,
-    targetChainObj,
     targetChain,
     targetToken,
-    rhinestoneApiKey,
     signerAddress,
     sessionChainIds,
     recipient,
@@ -176,11 +172,11 @@ function SetupStep({
   ]);
   useEffect(() => {
     const hasWallet = walletClient ? Boolean(walletClient.account) : true;
-    if (address && hasWallet && targetChainObj && !setupInitiatedRef.current && state.type === "idle") {
+    if (address && hasWallet && !setupInitiatedRef.current && state.type === "idle") {
       setupInitiatedRef.current = true;
       runSetup();
     }
-  }, [address, walletClient, targetChainObj, state.type, runSetup]);
+  }, [address, walletClient, state.type, runSetup]);
   const handleRetry = () => {
     setupInitiatedRef.current = false;
     setState({ type: "idle" });
@@ -1652,7 +1648,6 @@ function DepositFlow({
   sourceToken: defaultSourceToken,
   amount: defaultAmount,
   recipient,
-  rhinestoneApiKey,
   signerAddress = DEFAULT_SIGNER_ADDRESS,
   sessionChainIds,
   forceRegister = false,
@@ -1677,7 +1672,6 @@ function DepositFlow({
   const [totalBalanceUsd, setTotalBalanceUsd] = useState7(0);
   const [isConnectSelectionConfirmed, setIsConnectSelectionConfirmed] = useState7(false);
   const [selectedConnectAddress, setSelectedConnectAddress] = useState7(null);
-  const targetChainObj = useMemo6(() => CHAIN_BY_ID[targetChain], [targetChain]);
   const dappSwitchChain = useMemo6(() => {
     if (!dappWalletClient?.switchChain) return void 0;
     return async (chainId) => {
@@ -1970,14 +1964,12 @@ function DepositFlow({
   if (isDepositAddressMode) {
     if (!dappAddress || !sessionKeyAddress) return null;
     return /* @__PURE__ */ jsxs7("div", { className: "rs-modal-body", children: [
-      step.type === "setup" && targetChainObj && /* @__PURE__ */ jsx7(
+      step.type === "setup" && /* @__PURE__ */ jsx7(
         SetupStep,
         {
           address: sessionKeyAddress,
           targetChain,
-          targetChainObj,
           targetToken,
-          rhinestoneApiKey,
           signerAddress,
           sessionChainIds,
           recipient,
@@ -2032,15 +2024,13 @@ function DepositFlow({
     return getPublicClient(chainId);
   };
   return /* @__PURE__ */ jsxs7("div", { className: "rs-modal-body", children: [
-    step.type === "setup" && targetChainObj && /* @__PURE__ */ jsx7(
+    step.type === "setup" && /* @__PURE__ */ jsx7(
       SetupStep,
       {
         walletClient: signerContext.walletClient,
         address: ownerAddress,
         targetChain,
-        targetChainObj,
         targetToken,
-        rhinestoneApiKey,
         signerAddress,
         sessionChainIds,
         recipient,
@@ -2122,7 +2112,7 @@ function DepositFlow({
 // src/DepositModal.tsx
 import { jsx as jsx8, jsxs as jsxs8 } from "react/jsx-runtime";
 var ReownDepositInner = lazy(
-  () => import("./DepositModalReown-4WZF2HMJ.mjs").then((m) => ({ default: m.DepositModalReown }))
+  () => import("./DepositModalReown-PFKTSKDS.mjs").then((m) => ({ default: m.DepositModalReown }))
 );
 function DepositModal(props) {
   const needsReown = !!props.reownAppId;
@@ -2146,7 +2136,6 @@ function DepositModalInner({
   defaultAmount,
   recipient,
   backendUrl = DEFAULT_BACKEND_URL,
-  rhinestoneApiKey,
   signerAddress = DEFAULT_SIGNER_ADDRESS,
   sessionChainIds,
   forceRegister = false,
@@ -2316,7 +2305,6 @@ function DepositModalInner({
             sourceToken,
             amount: defaultAmount,
             recipient,
-            rhinestoneApiKey,
             signerAddress,
             sessionChainIds,
             forceRegister,

package/dist/{chunk-DJAUNNEW.mjs → chunk-QCRZCGAE.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-YOFGP4FV.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,46 @@ 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 computed = await service.computeAddress(
+          ownerAddress2,
+          sessionOwner.address
         );
-        const smartAccount = getAccountAddress(account);
+        const smartAccount = computed.smartAccount;
         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,
+          const prepared = await service.prepareAccount({
+            ownerAddress: ownerAddress2,
+            sessionOwnerAddress: sessionOwner.address,
+            targetChain,
             targetToken,
+            signerAddress,
             sessionChainIds
+          });
+          const typedData = prepared.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(
+            prepared.sessionDetailsUnsigned,
+            signature
           );
           await service.registerAccount({
             address: smartAccount,
             accountParams: {
-              factory: initData.factory,
-              factoryData: initData.factoryData,
+              factory: prepared.accountParams.factory,
+              factoryData: prepared.accountParams.factoryData,
               sessionDetails
             },
             eoaAddress: ownerAddress2,
@@ -1150,7 +1150,6 @@ function WithdrawFlow({
     },
     [
       signerContext,
-      targetChainObj,
       resolveSessionOwner,
       signerAddress,
       sessionChainIds,
@@ -1158,7 +1157,6 @@ function WithdrawFlow({
       targetChain,
       targetToken,
       service,
-      rhinestoneApiKey,
       handleConnected,
       asset.decimals,
       safeAddress,
@@ -1307,7 +1305,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-6AAWH35J.mjs").then((m) => ({
     default: m.WithdrawModalReown
   }))
 );
@@ -1334,7 +1332,6 @@ function WithdrawModalInner({
   onClose,
   inline,
   backendUrl = DEFAULT_BACKEND_URL,
-  rhinestoneApiKey,
   signerAddress = DEFAULT_SIGNER_ADDRESS,
   sessionChainIds,
   forceRegister = false,
@@ -1503,7 +1500,6 @@ function WithdrawModalInner({
             recipient,
             amount: defaultAmount,
             service,
-            rhinestoneApiKey,
             signerAddress,
             sessionChainIds,
             forceRegister,