@forge-connect/react 1.0.1 → 1.0.2

package/dist/index.cjs

@@ -1,4 +1,4 @@
-"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/provider.tsx
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } 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/provider.tsx
 var _react = require('react');
 
 // src/context.ts
@@ -1233,7 +1233,7 @@ async function startAuthentication(options) {
 }
 
 // src/runtime-imports.ts
-var importSolanaWeb3 = () => new Function('return import("@solana/web3.js")')();
+var importSolanaWeb3 = () => Promise.resolve().then(() => _interopRequireWildcard(require("@solana/web3.js")));
 
 // src/components/tabs/wallet-connect.tsx
 
@@ -2144,19 +2144,33 @@ function useWallets() {
     [api, getAccessToken, fetchWallets]
   );
   const linkWallet = _react.useCallback.call(void 0, 
-    async (walletAddress, signMessage, chain = "solana") => {
+    async (walletAddress, signMessage, chain = "solana", signTransaction) => {
       const token = getAccessToken();
       if (!token) throw new Error("Please sign in to continue.");
-      const { challengeId, message: challengeMessage } = await api.walletChallenge(walletAddress, chain);
-      const encoded = new TextEncoder().encode(challengeMessage);
-      const signatureBytes = await signMessage(encoded);
-      const signature = chain === "solana" ? uint8ArrayToBase58(signatureBytes) : Array.from(signatureBytes).map((b) => b.toString(16).padStart(2, "0")).join("");
-      await api.linkAuthMethod(token, {
-        provider: `${chain}_wallet`,
-        challengeId,
-        signature,
-        walletAddress
-      });
+      if (signMessage) {
+        const { challengeId, message: challengeMessage } = await api.walletChallenge(walletAddress, chain);
+        const encoded = new TextEncoder().encode(challengeMessage);
+        const signatureBytes = await signMessage(encoded);
+        const signature = chain === "solana" ? uint8ArrayToBase58(signatureBytes) : Array.from(signatureBytes).map((b) => b.toString(16).padStart(2, "0")).join("");
+        await api.linkAuthMethod(token, {
+          provider: `${chain}_wallet`,
+          challengeId,
+          signature,
+          walletAddress
+        });
+      } else {
+        if (!signTransaction) {
+          throw new Error("Wallet does not support message signing or transaction signing.");
+        }
+        const { challengeId, transaction: txBase64 } = await api.walletChallengeTx(walletAddress, chain);
+        const signedTxBase64 = await signTransaction(txBase64);
+        await api.linkAuthMethod(token, {
+          provider: `${chain}_wallet_tx`,
+          challengeId,
+          signedTransaction: signedTxBase64,
+          walletAddress
+        });
+      }
       await fetchWallets();
     },
     [api, getAccessToken, fetchWallets]
@@ -3548,10 +3562,23 @@ function WalletLinkStep({ onBack, onSuccess, onFatalError }) {
   const [loading, setLoading] = _react.useState.call(void 0, false);
   const [error, setError] = _react.useState.call(void 0, "");
   const [showOther, setShowOther] = _react.useState.call(void 0, false);
+  const [coldWallet, setColdWallet] = _react.useState.call(void 0, false);
   const mobile = _react.useMemo.call(void 0, () => isMobile(), []);
   const walletConfig = config.walletConfig;
   const preferred = _nullishCoalesce(_optionalChain([walletConfig, 'optionalAccess', _111 => _111.preferredWallets]), () => ( []));
   const onlyPreferred = _nullishCoalesce(_optionalChain([walletConfig, 'optionalAccess', _112 => _112.onlyPreferred]), () => ( false));
+  const coldWalletRef = _react.useRef.call(void 0, coldWallet);
+  coldWalletRef.current = coldWallet;
+  const buildSignTxFnForAdapter = _react.useCallback.call(void 0, (adapter) => {
+    if (!adapter.signTransaction) return void 0;
+    return async (txBase64) => {
+      const { Transaction } = await importSolanaWeb3();
+      const bytes = Uint8Array.from(atob(txBase64), (c) => c.charCodeAt(0));
+      const tx = Transaction.from(bytes);
+      const signedTx = await adapter.signTransaction(tx);
+      return btoa(String.fromCharCode(...new Uint8Array(signedTx.serialize())));
+    };
+  }, []);
   const handleConnect = async (w) => {
     if (w.readyState !== "Installed") {
       if (mobile) {
@@ -3571,9 +3598,14 @@ function WalletLinkStep({ onBack, onSuccess, onFatalError }) {
       if (!w.adapter.connected) await w.adapter.connect();
       const pk = w.adapter.publicKey;
       if (!pk) throw new Error("Wallet did not provide a public key.");
+      const useCold = coldWalletRef.current;
       const adapterSignMessage = w.adapter.signMessage ? (msg) => w.adapter.signMessage(msg) : void 0;
-      if (!adapterSignMessage) throw new Error("This wallet does not support message signing.");
-      await linkWallet(pk.toBase58(), adapterSignMessage, "solana");
+      await linkWallet(
+        pk.toBase58(),
+        useCold ? void 0 : adapterSignMessage,
+        "solana",
+        useCold ? buildSignTxFnForAdapter(w.adapter) : void 0
+      );
       onSuccess();
     } catch (err) {
       onFatalError(err instanceof Error ? err.message : "Could not link this wallet. Please try again.");
@@ -3630,7 +3662,7 @@ function WalletLinkStep({ onBack, onSuccess, onFatalError }) {
   return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "fc-tab", children: [
     loading ? /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { style: { textAlign: "center", padding: "24px 0" }, children: [
       /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "p", { className: "fc-tab-title", children: "Connecting..." }),
-      /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "p", { className: "fc-text", children: "Approve the connection, then sign the verification request in your wallet" }),
+      /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "p", { className: "fc-text", children: coldWallet ? "Confirm the transaction on your device" : "Approve the connection, then sign the verification request in your wallet" }),
       error && /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, _jsxruntime.Fragment, { children: [
         /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "p", { className: "fc-error", children: error }),
         /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
@@ -3688,6 +3720,21 @@ function WalletLinkStep({ onBack, onSuccess, onFatalError }) {
         ] }, w.adapter.name))
       ] }),
       preferredWallets.length === 0 && otherWallets.length === 0 && mobileExtraWallets.length === 0 && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "p", { className: "fc-text", children: "No wallet found. Please install a Solana wallet (like Phantom) to continue." }),
+      /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "label", { className: "fc-cold-wallet-toggle", children: [
+        /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+          "input",
+          {
+            type: "checkbox",
+            checked: coldWallet,
+            onChange: (e) => setColdWallet(e.target.checked)
+          }
+        ),
+        /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "fc-toggle-track" }),
+        /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "span", { className: "fc-cold-wallet-label", children: [
+          /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { children: "Hardware wallet" }),
+          /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { children: "Ledger, Trezor, Keystone..." })
+        ] })
+      ] }),
       error && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "p", { className: "fc-error", children: error })
     ] }),
     !loading && onBack && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "fc-switch", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "button", { type: "button", className: "fc-link", onClick: onBack, children: "Back" }) })