@rhinestone/deposit-modal 0.1.24 → 0.1.25

package/dist/chunk-6VJ2ZTNQ.cjs

@@ -0,0 +1,90 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }// src/core/reown.tsx
+var _react = require('react');
+var _reactquery = require('@tanstack/react-query');
+var _appkitadapterwagmi = require('@reown/appkit-adapter-wagmi');
+var _wagmi = require('wagmi');
+var _react3 = require('@reown/appkit/react');
+
+
+
+
+
+
+
+var _networks = require('@reown/appkit/networks');
+
+var _jsxruntime = require('react/jsx-runtime');
+var NETWORKS = [
+  _networks.mainnet,
+  _networks.base,
+  _networks.arbitrum,
+  _networks.optimism,
+  _networks.polygon,
+  _networks.bsc
+];
+var cachedAdapter = null;
+var cachedProjectId = null;
+function mapTheme(theme) {
+  const themeMode = _optionalChain([theme, 'optionalAccess', _ => _.mode]) === "light" ? "light" : "dark";
+  const themeVariables = {};
+  if (_optionalChain([theme, 'optionalAccess', _2 => _2.ctaColor])) {
+    themeVariables["--apkt-accent"] = theme.ctaColor;
+  }
+  return { themeMode, themeVariables };
+}
+function getOrCreateAdapter(projectId, theme) {
+  if (cachedAdapter && cachedProjectId === projectId) return cachedAdapter;
+  cachedAdapter = new (0, _appkitadapterwagmi.WagmiAdapter)({
+    networks: NETWORKS,
+    projectId
+  });
+  cachedProjectId = projectId;
+  const { themeMode, themeVariables } = mapTheme(theme);
+  _react3.createAppKit.call(void 0, {
+    adapters: [cachedAdapter],
+    networks: NETWORKS,
+    projectId,
+    themeMode,
+    themeVariables,
+    features: {
+      connectMethodsOrder: ["wallet"],
+      email: false,
+      socials: false
+    }
+  });
+  return cachedAdapter;
+}
+function ReownWalletProvider({
+  projectId,
+  theme,
+  children
+}) {
+  const [queryClient] = _react.useState.call(void 0, () => new (0, _reactquery.QueryClient)());
+  const adapter = getOrCreateAdapter(projectId, theme);
+  const config = adapter.wagmiConfig;
+  return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _wagmi.WagmiProvider, { config, children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _reactquery.QueryClientProvider, { client: queryClient, children }) });
+}
+function useReownWallet() {
+  const { open } = _react3.useAppKit.call(void 0, );
+  const { address, isConnected } = _react3.useAppKitAccount.call(void 0, );
+  const { data: walletClient } = _wagmi.useWalletClient.call(void 0, );
+  const publicClient = _wagmi.usePublicClient.call(void 0, );
+  const { switchChainAsync } = _wagmi.useSwitchChain.call(void 0, );
+  return {
+    walletClient: _nullishCoalesce(walletClient, () => ( void 0)),
+    publicClient: _nullishCoalesce(publicClient, () => ( void 0)),
+    address,
+    isConnected,
+    openConnect: () => {
+      void open({ view: isConnected ? "Account" : "Connect" });
+    },
+    switchChain: async (chainId) => {
+      await switchChainAsync({ chainId });
+    }
+  };
+}
+
+
+
+
+exports.ReownWalletProvider = ReownWalletProvider; exports.useReownWallet = useReownWallet;

package/dist/{chunk-35DWLO33.mjs → chunk-B3HMNWR4.mjs}

@@ -6,17 +6,21 @@ import {
   ProcessingStep,
   accountFromPrivateKey,
   applyTheme,
-  buildSessionDetails,
   createDepositService,
   createSessionOwnerKey,
+  createSmartAccount,
+  createViewOnlyAccount,
   currencyFormatter,
   formatUserError,
+  getAccountAddress,
+  getAccountInitData,
   getAssetId,
   getPublicClient,
+  getSessionDetails,
   isNativeAsset,
   loadSessionOwnerFromStorage,
   saveSessionOwnerToStorage
-} from "./chunk-P7SQQAAF.mjs";
+} from "./chunk-GAFLOODV.mjs";
 import {
   CHAIN_BY_ID,
   DEFAULT_BACKEND_URL,
@@ -38,7 +42,9 @@ import {
   useEffect as useEffect3,
   useMemo as useMemo3,
   useRef as useRef2,
-  useState as useState3
+  useState as useState3,
+  lazy,
+  Suspense
 } from "react";
 
 // src/WithdrawFlow.tsx
@@ -553,6 +559,9 @@ function WithdrawFormStep({
 }
 WithdrawFormStep.displayName = "WithdrawFormStep";
 
+// src/WithdrawFlow.tsx
+import { walletClientToAccount } from "@rhinestone/sdk";
+
 // src/core/safe.ts
 import {
   concat,
@@ -853,13 +862,14 @@ function WithdrawFlow({
   recipient: defaultRecipient,
   amount: defaultAmount,
   service,
+  rhinestoneApiKey,
   signerAddress = DEFAULT_SIGNER_ADDRESS,
   sessionChainIds,
   forceRegister = false,
   waitForFinalTx = true,
   reownWallet,
   onConnect,
-  onRelayTransaction,
+  onSignTransaction,
   onRequestConnect,
   connectButtonLabel,
   onStepChange,
@@ -883,7 +893,7 @@ function WithdrawFlow({
     setTargetToken(targetTokenProp);
   }, [targetChainProp, targetTokenProp]);
   const targetChainObj = useMemo2(() => CHAIN_BY_ID[targetChain], [targetChain]);
-  const hasCustomSigner = Boolean(dappAddress && onRelayTransaction);
+  const hasCustomSigner = Boolean(dappAddress && onSignTransaction);
   const dappSwitchChain = useMemo2(() => {
     if (!dappWalletClient?.switchChain) return void 0;
     return async (chainId) => {
@@ -1012,23 +1022,13 @@ function WithdrawFlow({
       address: created.address
     };
   }, []);
-  const signSessionDetails = useCallback2(
-    async (sessionOwnerAccount, typedData) => {
-      const signer = sessionOwnerAccount;
-      if (!signer.signTypedData) {
-        throw new Error("Session owner cannot sign typed data");
-      }
-      return await signer.signTypedData(typedData);
-    },
-    []
-  );
   const handleFormSubmit = useCallback2(
     async (recipient, amountValue) => {
       const ownerAddress2 = signerContext?.ownerAddress;
       if (!ownerAddress2) {
         throw new Error("Wallet not connected");
       }
-      if (!onRelayTransaction && !signerContext?.walletClient) {
+      if (!onSignTransaction && !signerContext?.walletClient) {
         throw new Error("Wallet not connected");
       }
       if (!targetChainObj) {
@@ -1036,32 +1036,31 @@ function WithdrawFlow({
       }
       setIsSubmitting(true);
       try {
+        const signerAccount = signerContext?.walletClient ? walletClientToAccount(signerContext.walletClient) : createViewOnlyAccount(ownerAddress2);
         const sessionOwner = await resolveSessionOwner(ownerAddress2);
-        const prepared = await service.prepareAccount({
-          ownerAddress: ownerAddress2,
-          sessionOwnerAddress: sessionOwner.address,
-          targetChain,
-          targetToken,
-          signerAddress,
-          sessionChainIds
-        });
-        const smartAccount = prepared.smartAccount;
+        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 signature = await signSessionDetails(
+          const initData = getAccountInitData(account);
+          const sessionDetails = await getSessionDetails(
+            account,
+            targetChainObj,
+            signerAddress,
             sessionOwner.account,
-            prepared.sessionDetailsUnsigned.data
-          );
-          const sessionDetails = buildSessionDetails(
-            prepared.sessionDetailsUnsigned,
-            signature
+            targetToken,
+            sessionChainIds
           );
           await service.registerAccount({
             address: smartAccount,
             accountParams: {
-              factory: prepared.accountParams.factory,
-              factoryData: prepared.accountParams.factoryData,
+              factory: initData.factory,
+              factoryData: initData.factoryData,
               sessionDetails
             },
             eoaAddress: ownerAddress2,
@@ -1077,7 +1076,7 @@ function WithdrawFlow({
         const amountUnits = parseUnits2(amountValue, asset.decimals);
         const pc = signerContext?.publicClient ?? getPublicClient(sourceChain);
         let result;
-        if (onRelayTransaction) {
+        if (onSignTransaction) {
           const transferData = isSourceNative ? { to: smartAccount, value: amountUnits, data: "0x" } : {
             to: sourceToken,
             value: 0n,
@@ -1095,7 +1094,18 @@ function WithdrawFlow({
             data: transferData.data,
             chainId: sourceChain
           });
-          result = await onRelayTransaction(request);
+          const { signature } = await onSignTransaction(request);
+          const relayResult = await service.relayWithdraw({
+            smartAccount,
+            chainId: sourceChain,
+            safeAddress,
+            safeTransaction: request.typedData.message,
+            signature
+          });
+          if (!relayResult.txHash) {
+            throw new Error("Relay succeeded but no txHash returned");
+          }
+          result = { txHash: relayResult.txHash };
         } else if (isSourceNative) {
           result = await executeSafeEthTransfer({
             walletClient: signerContext.walletClient,
@@ -1148,16 +1158,16 @@ function WithdrawFlow({
       targetChain,
       targetToken,
       service,
+      rhinestoneApiKey,
       handleConnected,
       asset.decimals,
       safeAddress,
       sourceToken,
       sourceChain,
       onWithdrawSubmitted,
-      onRelayTransaction,
+      onSignTransaction,
       isSourceNative,
-      handleError,
-      signSessionDetails
+      handleError
     ]
   );
   const handleWithdrawComplete = useCallback2(
@@ -1244,7 +1254,7 @@ function WithdrawFlow({
     ) });
   }
   if (!signerContext) return null;
-  if (!onRelayTransaction && !signerContext.walletClient) return null;
+  if (!onSignTransaction && !signerContext.walletClient) return null;
   const ownerAddress = signerContext.ownerAddress;
   const formPublicClient = signerContext.publicClient ?? getPublicClient(sourceChain);
   return /* @__PURE__ */ jsxs2("div", { className: "rs-modal-body", children: [
@@ -1296,11 +1306,15 @@ function WithdrawFlow({
 
 // src/WithdrawModal.tsx
 import { jsx as jsx3, jsxs as jsxs3 } from "react/jsx-runtime";
+var ReownWithdrawInner = lazy(
+  () => import("./WithdrawModalReown-HBORIX2O.mjs").then((m) => ({
+    default: m.WithdrawModalReown
+  }))
+);
 function WithdrawModal(props) {
-  if (props.reownAppId) {
-    throw new Error(
-      'Reown support moved to "@rhinestone/deposit-modal/reown". Use that entrypoint when passing reownAppId.'
-    );
+  const needsReown = !!props.reownAppId;
+  if (needsReown) {
+    return /* @__PURE__ */ jsx3(Suspense, { fallback: null, children: /* @__PURE__ */ jsx3(ReownWithdrawInner, { ...props }) });
   }
   return /* @__PURE__ */ jsx3(WithdrawModalInner, { ...props });
 }
@@ -1320,13 +1334,14 @@ function WithdrawModalInner({
   onClose,
   inline,
   backendUrl = DEFAULT_BACKEND_URL,
+  rhinestoneApiKey,
   signerAddress = DEFAULT_SIGNER_ADDRESS,
   sessionChainIds,
   forceRegister = false,
   waitForFinalTx = true,
   reownWallet,
   onConnect,
-  onRelayTransaction,
+  onSignTransaction,
   onRequestConnect,
   connectButtonLabel,
   theme,
@@ -1488,13 +1503,14 @@ function WithdrawModalInner({
             recipient,
             amount: defaultAmount,
             service,
+            rhinestoneApiKey,
             signerAddress,
             sessionChainIds,
             forceRegister,
             waitForFinalTx,
             reownWallet,
             onConnect,
-            onRelayTransaction,
+            onSignTransaction,
             onRequestConnect,
             connectButtonLabel,
             onStepChange: handleStepChange,