@rhinestone/deposit-modal 0.1.24 → 0.1.26

package/README.md

@@ -15,14 +15,10 @@ Prefer subpath imports so apps only bundle what they use:
 ```tsx
 import { DepositModal } from "@rhinestone/deposit-modal/deposit";
 import { WithdrawModal } from "@rhinestone/deposit-modal/withdraw";
-import { DepositModal as DepositModalReown } from "@rhinestone/deposit-modal/reown";
 import { executeSafeEthTransfer } from "@rhinestone/deposit-modal/safe";
 import { getChainName } from "@rhinestone/deposit-modal/constants";
 ```
 
-If you use `reownAppId`, import modal components from
-`@rhinestone/deposit-modal/reown`.
-
 ## DepositModal
 
 Deposits tokens from any supported chain into a target chain/token via a Rhinestone smart account.
@@ -92,7 +88,7 @@ Notes:
 | `defaultAmount`      | `string`               | No       | Pre-filled amount                                                            |
 | `recipient`          | `Address`              | No       | Custom recipient address                                                     |
 | `backendUrl`         | `string`               | No       | Backend URL                                                                  |
-| `rhinestoneApiKey`   | `string`               | No       | Deprecated in client flow (server-side account preparation now owns SDK access) |
+| `rhinestoneApiKey`   | `string`               | No       | Optional SDK api key forwarded to `RhinestoneSDK` during smart-account setup |
 | `signerAddress`      | `Address`              | No       | Session signer address                                                       |
 | `waitForFinalTx`     | `boolean`              | No       | Wait for destination tx (default: true)                                      |
 | `onRequestConnect`   | `() => void`           | No       | Called when wallet connection needed                                         |

package/dist/DepositModalReown-4WZF2HMJ.mjs

@@ -0,0 +1,33 @@
+import {
+  DepositModalInner
+} from "./chunk-W42B54IA.mjs";
+import {
+  ReownWalletProvider,
+  useReownWallet
+} from "./chunk-LBEP3A2Z.mjs";
+import "./chunk-3FK5FAUL.mjs";
+import "./chunk-A6QLADED.mjs";
+
+// src/DepositModalReown.tsx
+import { useCallback } from "react";
+import { jsx } from "react/jsx-runtime";
+function DepositModalWithReown(props) {
+  const reown = useReownWallet();
+  const handleConnect = useCallback(() => {
+    reown.openConnect();
+  }, [reown.openConnect]);
+  return /* @__PURE__ */ jsx(
+    DepositModalInner,
+    {
+      ...props,
+      reownWallet: reown,
+      onConnect: handleConnect
+    }
+  );
+}
+function DepositModalReown(props) {
+  return /* @__PURE__ */ jsx(ReownWalletProvider, { projectId: props.reownAppId, theme: props.theme, children: /* @__PURE__ */ jsx(DepositModalWithReown, { ...props }) });
+}
+export {
+  DepositModalReown
+};

package/dist/DepositModalReown-NKDYLTKD.cjs

@@ -0,0 +1,33 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});
+
+var _chunk7QCFFKB5cjs = require('./chunk-7QCFFKB5.cjs');
+
+
+
+var _chunk6VJ2ZTNQcjs = require('./chunk-6VJ2ZTNQ.cjs');
+require('./chunk-4Q6QCALP.cjs');
+require('./chunk-CEIWN53N.cjs');
+
+// src/DepositModalReown.tsx
+var _react = require('react');
+var _jsxruntime = require('react/jsx-runtime');
+function DepositModalWithReown(props) {
+  const reown = _chunk6VJ2ZTNQcjs.useReownWallet.call(void 0, );
+  const handleConnect = _react.useCallback.call(void 0, () => {
+    reown.openConnect();
+  }, [reown.openConnect]);
+  return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+    _chunk7QCFFKB5cjs.DepositModalInner,
+    {
+      ...props,
+      reownWallet: reown,
+      onConnect: handleConnect
+    }
+  );
+}
+function DepositModalReown(props) {
+  return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunk6VJ2ZTNQcjs.ReownWalletProvider, { projectId: props.reownAppId, theme: props.theme, children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, DepositModalWithReown, { ...props }) });
+}
+
+
+exports.DepositModalReown = DepositModalReown;

package/dist/WithdrawModalReown-244RQ5FZ.mjs

@@ -0,0 +1,33 @@
+import {
+  WithdrawModalInner
+} from "./chunk-DJAUNNEW.mjs";
+import {
+  ReownWalletProvider,
+  useReownWallet
+} from "./chunk-LBEP3A2Z.mjs";
+import "./chunk-3FK5FAUL.mjs";
+import "./chunk-A6QLADED.mjs";
+
+// src/WithdrawModalReown.tsx
+import { useCallback } from "react";
+import { jsx } from "react/jsx-runtime";
+function WithdrawModalWithReown(props) {
+  const reown = useReownWallet();
+  const handleConnect = useCallback(() => {
+    reown.openConnect();
+  }, [reown.openConnect]);
+  return /* @__PURE__ */ jsx(
+    WithdrawModalInner,
+    {
+      ...props,
+      reownWallet: reown,
+      onConnect: handleConnect
+    }
+  );
+}
+function WithdrawModalReown(props) {
+  return /* @__PURE__ */ jsx(ReownWalletProvider, { projectId: props.reownAppId, theme: props.theme, children: /* @__PURE__ */ jsx(WithdrawModalWithReown, { ...props }) });
+}
+export {
+  WithdrawModalReown
+};

package/dist/WithdrawModalReown-GL4TM22D.cjs

@@ -0,0 +1,33 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});
+
+var _chunk4WULBRUAcjs = require('./chunk-4WULBRUA.cjs');
+
+
+
+var _chunk6VJ2ZTNQcjs = require('./chunk-6VJ2ZTNQ.cjs');
+require('./chunk-4Q6QCALP.cjs');
+require('./chunk-CEIWN53N.cjs');
+
+// src/WithdrawModalReown.tsx
+var _react = require('react');
+var _jsxruntime = require('react/jsx-runtime');
+function WithdrawModalWithReown(props) {
+  const reown = _chunk6VJ2ZTNQcjs.useReownWallet.call(void 0, );
+  const handleConnect = _react.useCallback.call(void 0, () => {
+    reown.openConnect();
+  }, [reown.openConnect]);
+  return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+    _chunk4WULBRUAcjs.WithdrawModalInner,
+    {
+      ...props,
+      reownWallet: reown,
+      onConnect: handleConnect
+    }
+  );
+}
+function WithdrawModalReown(props) {
+  return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunk6VJ2ZTNQcjs.ReownWalletProvider, { projectId: props.reownAppId, theme: props.theme, children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, WithdrawModalWithReown, { ...props }) });
+}
+
+
+exports.WithdrawModalReown = WithdrawModalReown;

package/dist/{chunk-P7SQQAAF.mjs → chunk-3FK5FAUL.mjs}

@@ -1,9 +1,11 @@
 import {
   CHAIN_BY_ID,
   NATIVE_TOKEN_ADDRESS,
+  SUPPORTED_CHAINS,
   getChainIcon,
   getChainName,
   getExplorerTxUrl,
+  getSupportedTokenSymbolsForChain,
   getTokenAddress,
   getTokenDecimalsByAddress,
   getTokenSymbol,
@@ -155,7 +157,7 @@ function createDepositService(baseUrl) {
       const response = await fetch(apiUrl("/prepare-account"), {
         method: "POST",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify(params, jsonReplacer)
+        body: JSON.stringify(params)
       });
       if (!response.ok) {
         const error = await response.json().catch(() => ({ error: "Unknown error" }));
@@ -163,8 +165,7 @@ function createDepositService(baseUrl) {
           error.error || `Prepare account failed: ${response.status}`
         );
       }
-      const payload = await response.json();
-      return normalizePrepareAccountResponse(payload);
+      return response.json();
     },
     async registerAccount(params) {
       const { eoaAddress, sessionOwner, ...account } = params;
@@ -246,58 +247,40 @@ function createDepositService(baseUrl) {
         return { lastEvent: void 0 };
       }
       return response.json();
-    }
-  };
-}
-function buildSessionDetails(sessionDetailsUnsigned, signature) {
-  return {
-    hashesAndChainIds: sessionDetailsUnsigned.hashesAndChainIds,
-    signature
-  };
-}
-function normalizePrepareAccountResponse(payload) {
-  if (!isRecord(payload)) {
-    throw new Error("Invalid prepare-account response");
-  }
-  const smartAccount = extractString(payload, "smartAccount");
-  const accountParams = isRecord(payload.accountParams) ? payload.accountParams : null;
-  const sessionDetailsUnsigned = isRecord(payload.sessionDetailsUnsigned) ? payload.sessionDetailsUnsigned : null;
-  if (!smartAccount || !accountParams || !sessionDetailsUnsigned) {
-    throw new Error("Missing prepare-account fields");
-  }
-  const factory = extractString(accountParams, "factory");
-  const factoryData = extractString(accountParams, "factoryData");
-  if (!factory || !factoryData) {
-    throw new Error("Invalid account params from prepare-account");
-  }
-  const rawHashes = Array.isArray(sessionDetailsUnsigned.hashesAndChainIds) ? sessionDetailsUnsigned.hashesAndChainIds : null;
-  if (!rawHashes) {
-    throw new Error("Missing session hashes from prepare-account");
-  }
-  const hashesAndChainIds = rawHashes.map((value) => {
-    if (!isRecord(value)) return null;
-    const sessionDigest = extractString(value, "sessionDigest");
-    const chainId = toBigInt(value.chainId);
-    if (!sessionDigest || chainId === null) return null;
-    return {
-      chainId,
-      sessionDigest
-    };
-  }).filter(
-    (item) => item !== null
-  );
-  if (hashesAndChainIds.length === 0) {
-    throw new Error("Session hashes are empty");
-  }
-  return {
-    smartAccount,
-    accountParams: {
-      factory,
-      factoryData
     },
-    sessionDetailsUnsigned: {
-      hashesAndChainIds,
-      data: sessionDetailsUnsigned.data
+    async relayWithdraw(params) {
+      const { smartAccount, chainId, safeAddress, safeTransaction, signature } = params;
+      const response = await fetch(apiUrl(`/relay-withdraw`), {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify(
+          {
+            chainId,
+            safeAddress,
+            safeTransaction: {
+              to: safeTransaction.to,
+              value: safeTransaction.value.toString(),
+              data: safeTransaction.data,
+              operation: safeTransaction.operation,
+              safeTxGas: safeTransaction.safeTxGas.toString(),
+              baseGas: safeTransaction.baseGas.toString(),
+              gasPrice: safeTransaction.gasPrice.toString(),
+              gasToken: safeTransaction.gasToken,
+              refundReceiver: safeTransaction.refundReceiver,
+              nonce: safeTransaction.nonce.toString()
+            },
+            signature
+          },
+          jsonReplacer
+        )
+      });
+      if (!response.ok) {
+        const error = await response.json().catch(() => ({ error: "Unknown error" }));
+        throw new Error(
+          error.error || `Relay withdraw failed: ${response.status}`
+        );
+      }
+      return response.json();
     }
   };
 }
@@ -386,23 +369,6 @@ function extractTokenAddress(tokenData, chainId) {
   const token = tokenData;
   return token.tokenAddress ?? token.address ?? token.addresses?.[chainId] ?? token.token?.address ?? token.token?.addresses?.[chainId];
 }
-function isRecord(value) {
-  return typeof value === "object" && value !== null;
-}
-function toBigInt(value) {
-  if (typeof value === "bigint") return value;
-  if (typeof value === "number" && Number.isInteger(value) && value >= 0) {
-    return BigInt(value);
-  }
-  if (typeof value === "string" && /^\d+$/.test(value)) {
-    try {
-      return BigInt(value);
-    } catch {
-      return null;
-    }
-  }
-  return null;
-}
 function extractArray(data, key) {
   if (!data || typeof data !== "object") return null;
   const record = data;
@@ -851,6 +817,203 @@ function ConnectStep({
 }
 ConnectStep.displayName = "ConnectStep";
 
+// src/core/account.ts
+import {
+  RhinestoneSDK
+} from "@rhinestone/sdk";
+import { zeroAddress } from "viem";
+import { toAccount } from "viem/accounts";
+function createViewOnlyAccount(address) {
+  if (!address || address === zeroAddress) {
+    throw new Error("Address is required");
+  }
+  return toAccount({
+    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 === zeroAddress) {
+    throw new Error("Signer address is required");
+  }
+  return toAccount({
+    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 RhinestoneSDK({
+    apiKey: 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,
+    ...originalOwners?.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 = 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 = getTokenSymbol(
+      targetToken,
+      targetChain.id
+    ).toUpperCase();
+    if (targetSymbol && targetSymbol !== "TOKEN") {
+      const chainsForToken = selectedChains.filter(
+        (chain) => getSupportedTokenSymbolsForChain(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 (!sessionDetails.hashesAndChainIds?.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 (!message?.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
 import { isAddress } from "viem";
 import {
@@ -942,7 +1105,7 @@ function PoweredBy() {
 }
 
 // src/core/webhook.ts
-function isRecord2(value) {
+function isRecord(value) {
   return typeof value === "object" && value !== null;
 }
 function asString(value) {
@@ -954,11 +1117,11 @@ function getEventTxHash(event) {
     return asString(event.data?.transactionHash);
   }
   if (event.type === "bridge-started" || event.type === "bridge-complete") {
-    const deposit = isRecord2(event.data?.deposit) ? event.data.deposit : void 0;
+    const deposit = isRecord(event.data?.deposit) ? event.data.deposit : void 0;
     return asString(deposit?.transactionHash);
   }
   if (event.type === "bridge-failed" || event.type === "error") {
-    const deposit = isRecord2(event.data?.deposit) ? event.data.deposit : void 0;
+    const deposit = isRecord(event.data?.deposit) ? event.data.deposit : void 0;
     return asString(deposit?.transactionHash);
   }
   return void 0;
@@ -1546,16 +1709,21 @@ export {
   Spinner,
   Button,
   ConnectStep,
+  createViewOnlyAccount,
+  createSmartAccount,
+  getAccountAddress,
+  getAccountInitData,
+  getSessionDetails,
+  signSessionDetails,
   loadSessionOwnerFromStorage,
   saveSessionOwnerToStorage,
   createSessionOwnerKey,
   accountFromPrivateKey,
+  PoweredBy,
   createDepositService,
-  buildSessionDetails,
   getAssetId,
   portfolioToAssets,
   isNativeAsset,
-  PoweredBy,
   currencyFormatter,
   tokenFormatter,
   formatUserError,