@getpara/solana-wallet-connectors 3.0.0-alpha.1 → 3.1.0

package/dist/providers/SolanaExternalWalletContext.js

@@ -42,7 +42,10 @@ import { jsx } from "react/jsx-runtime";
 import { createContext, useEffect, useMemo, useRef, useState } from "react";
 import { useWallet } from "@solana/wallet-adapter-react";
 import { isIosAndRedirectable, WalletReadyState } from "@solana/wallet-adapter-base";
-import { isAndroid } from "@getpara/web-sdk";
+import {
+  isAndroid,
+  isAndroidChrome
+} from "@getpara/web-sdk";
 import {
   defaultSolanaExternalWallet
 } from "@getpara/react-common";
@@ -83,6 +86,7 @@ function SolanaExternalWalletProvider({
   const solanaAddressRef = useRef(solanaAddress == null ? void 0 : solanaAddress.toString());
   const disconnectRef = useRef(disconnect);
   const walletRef = useRef(wallet);
+  const lastConnectedAdapterRef = useRef(void 0);
   useEffect(() => {
     walletRef.current = wallet;
   }, [wallet]);
@@ -106,6 +110,7 @@ function SolanaExternalWalletProvider({
         interface: {
           disconnect: () => __async(this, null, function* () {
             yield disconnectRef.current();
+            lastConnectedAdapterRef.current = void 0;
           }),
           getAddress: () => __async(this, null, function* () {
             var _a;
@@ -113,15 +118,69 @@ function SolanaExternalWalletProvider({
           }),
           signMessage: (_0) => __async(this, [_0], function* ({ message }) {
             var _a, _b, _c, _d;
-            try {
+            const resolveSignFn = () => {
+              var _a2;
+              if (solanaSignMessageRef.current) return solanaSignMessageRef.current;
+              if (solanaSignMessage) return solanaSignMessage;
+              const adapter = (_a2 = walletRef.current) == null ? void 0 : _a2.adapter;
+              if (adapter && typeof adapter.signMessage === "function") {
+                return adapter.signMessage.bind(adapter);
+              }
+              const lastConnected = lastConnectedAdapterRef.current;
+              if (lastConnected && typeof lastConnected.signMessage === "function") {
+                return lastConnected.signMessage.bind(lastConnected);
+              }
+              return void 0;
+            };
+            const snapshotState = () => {
+              var _a2, _b2, _c2, _d2, _e, _f, _g, _h, _i, _j, _k;
+              return {
+                adapterName: (_b2 = (_a2 = walletRef.current) == null ? void 0 : _a2.adapter) == null ? void 0 : _b2.name,
+                adapterConnected: (_d2 = (_c2 = walletRef.current) == null ? void 0 : _c2.adapter) == null ? void 0 : _d2.connected,
+                adapterHasPublicKey: !!((_f = (_e = walletRef.current) == null ? void 0 : _e.adapter) == null ? void 0 : _f.publicKey),
+                hasRefSignMessage: !!solanaSignMessageRef.current,
+                hasClosureSignMessage: !!solanaSignMessage,
+                hasAdapterSignMessage: typeof ((_h = (_g = walletRef.current) == null ? void 0 : _g.adapter) == null ? void 0 : _h.signMessage) === "function",
+                lastConnectedAdapterName: (_i = lastConnectedAdapterRef.current) == null ? void 0 : _i.name,
+                lastConnectedAdapterConnected: (_j = lastConnectedAdapterRef.current) == null ? void 0 : _j.connected,
+                hasLastConnectedAdapterSignMessage: typeof ((_k = lastConnectedAdapterRef.current) == null ? void 0 : _k.signMessage) === "function"
+              };
+            };
+            const waitForSignFn = () => __async(this, null, function* () {
               const start = Date.now();
-              let fn = (_a = solanaSignMessageRef.current) != null ? _a : solanaSignMessage;
+              let fn = resolveSignFn();
               while (!fn) {
                 if (Date.now() - start > SIGN_MESSAGE_REF_WAIT_MS) {
-                  throw new Error("Solana signMessage unavailable");
+                  return void 0;
                 }
                 yield new Promise((resolve) => setTimeout(resolve, 100));
-                fn = (_b = solanaSignMessageRef.current) != null ? _b : solanaSignMessage;
+                fn = resolveSignFn();
+              }
+              return fn;
+            });
+            try {
+              let fn = yield waitForSignFn();
+              if (!fn) {
+                const adapter = (_b = (_a = walletRef.current) == null ? void 0 : _a.adapter) != null ? _b : lastConnectedAdapterRef.current;
+                if (adapter) {
+                  const stateBefore = snapshotState();
+                  console.warn(
+                    "[Solana signMessage] sign fn unavailable after wait; attempting adapter.connect() recovery",
+                    stateBefore
+                  );
+                  try {
+                    if (!adapter.connected) {
+                      yield adapter.connect();
+                    }
+                    fn = yield waitForSignFn();
+                  } catch (reconnectErr) {
+                    console.error("[Solana signMessage] reconnect attempt failed", reconnectErr, snapshotState());
+                  }
+                }
+              }
+              if (!fn) {
+                console.error("[Solana signMessage] sign fn unavailable after recovery", snapshotState());
+                throw new Error("Solana signMessage unavailable");
               }
               const encodedMessage = new TextEncoder().encode(message);
               const signature = yield fn(encodedMessage);
@@ -133,7 +192,7 @@ function SolanaExternalWalletProvider({
               if ((_c = e == null ? void 0 : e.message) == null ? void 0 : _c.includes("User rejected the request")) {
                 throw new Error("Signature request rejected");
               }
-              console.error("Solana signature error:", e == null ? void 0 : e.message);
+              console.error("Solana signature error:", e == null ? void 0 : e.message, snapshotState());
               throw new Error(`Solana signMessage failed: ${(_d = e == null ? void 0 : e.message) != null ? _d : "unknown"}`);
             }
           }),
@@ -259,6 +318,7 @@ function SolanaExternalWalletProvider({
           )
         ]);
       }
+      lastConnectedAdapterRef.current = adapter;
       return address;
     } catch (e) {
       console.error(e);
@@ -266,7 +326,7 @@ function SolanaExternalWalletProvider({
       throw e;
     }
   });
-  const connectCallback = (adapter) => {
+  const connectCallback = (adapter, walletName) => {
     return () => __async(this, null, function* () {
       var _a, _b, _c, _d;
       let address;
@@ -275,7 +335,7 @@ function SolanaExternalWalletProvider({
       } catch (e) {
         throw e;
       }
-      const providerName = adapter.name;
+      const providerName = walletName != null ? walletName : adapter.name;
       const providerId = (_b = (_a = getWallet(providerName != null ? providerName : "")) == null ? void 0 : _a.id) != null ? _b : "";
       solanaAddressRef.current = address;
       return {
@@ -293,13 +353,15 @@ function SolanaExternalWalletProvider({
       };
     });
   };
-  const connect = (adapter) => __async(this, null, function* () {
+  const connect = (adapter, walletName) => __async(this, null, function* () {
     var _a;
     if (isIosAndRedirectable() && !isInSolanaWalletDappBrowser()) {
       return;
     }
     if (isAndroid() && (adapter == null ? void 0 : adapter.name) === "Mobile Wallet Adapter") {
-      return;
+      if (!isAndroidChrome()) return;
+      const tappedWallet = getWallet(walletName != null ? walletName : "");
+      if (!(tappedWallet == null ? void 0 : tappedWallet.mwaSupported)) return;
     }
     if (adapter && (wallet == null ? void 0 : wallet.adapter) && wallet.adapter.name !== adapter.name) {
       yield disconnect();
@@ -310,7 +372,7 @@ function SolanaExternalWalletProvider({
     let error;
     let authState;
     try {
-      authState = yield para.connectExternalWallet({ connect: connectCallback(adapter) });
+      authState = yield para.connectExternalWallet({ connect: connectCallback(adapter, walletName) });
       address = (_a = authState.externalWallet) == null ? void 0 : _a.address;
     } catch (err) {
       switch (err.message) {
@@ -383,23 +445,29 @@ function SolanaExternalWalletProvider({
   const createWallet = (walletFn) => {
     const metaData = walletFn();
     const adapter = getAdapter(metaData.name);
+    const isMwaOnAndroidChrome = !!metaData.mwaSupported && isAndroidChrome();
     return __spreadProps(__spreadValues({
-      connect: () => connect(adapter),
-      connectMobile: () => connect(adapter),
+      connect: () => connect(adapter, metaData.name),
+      connectMobile: () => connect(adapter, metaData.name),
       type: "SOLANA",
-      installed: adapter && ((adapter == null ? void 0 : adapter.readyState) === WalletReadyState.Installed || (adapter == null ? void 0 : adapter.readyState) === WalletReadyState.Loadable)
+      installed: isMwaOnAndroidChrome || adapter && ((adapter == null ? void 0 : adapter.readyState) === WalletReadyState.Installed || (adapter == null ? void 0 : adapter.readyState) === WalletReadyState.Loadable)
     }, metaData), {
       // Using name here since that's the only common id across the networks
       id: metaData.name
     });
   };
-  const [wallets, setWallets] = useState(() => walletFns.map(createWallet));
+  const [wallets, setWallets] = useState(() => {
+    const created = walletFns.map(createWallet);
+    if (isAndroidChrome()) return created;
+    return created.filter((w) => w.internalId !== "SEED_VAULT_WALLET");
+  });
   useEffect(() => {
     setWallets(
       (prev) => prev.map((wallet2) => {
         var _a;
         const adapter = getAdapter((_a = wallet2.name) != null ? _a : "");
-        const installed = !!adapter && (adapter.readyState === WalletReadyState.Installed || adapter.readyState === WalletReadyState.Loadable);
+        const isMwaOnAndroidChrome = !!wallet2.mwaSupported && isAndroidChrome();
+        const installed = isMwaOnAndroidChrome || !!adapter && (adapter.readyState === WalletReadyState.Installed || adapter.readyState === WalletReadyState.Loadable);
         if (wallet2.installed !== installed) {
           return __spreadProps(__spreadValues({}, wallet2), { installed });
         }

package/dist/wallets/connectors/index.d.ts

@@ -4,5 +4,6 @@ import { glowWallet } from './glow/glow.js';
 import { backpackWallet } from './backpack/backpack.js';
 import { solflareWallet } from './solflare/solflare.js';
 import { metaMaskWallet } from './metaMask/metaMask.js';
-export { farcasterWallet, phantomWallet, glowWallet, backpackWallet, solflareWallet, metaMaskWallet };
+import { seedVaultWallet } from './seedVault/seedVault.js';
+export { farcasterWallet, phantomWallet, glowWallet, backpackWallet, solflareWallet, metaMaskWallet, seedVaultWallet };
 export declare const allWallets: (() => import("../../types/Wallet.js").Wallet)[];

package/dist/wallets/connectors/index.js

@@ -5,7 +5,8 @@ import { glowWallet } from "./glow/glow.js";
 import { backpackWallet } from "./backpack/backpack.js";
 import { solflareWallet } from "./solflare/solflare.js";
 import { metaMaskWallet } from "./metaMask/metaMask.js";
-const allWallets = [phantomWallet, glowWallet, backpackWallet, solflareWallet, metaMaskWallet];
+import { seedVaultWallet } from "./seedVault/seedVault.js";
+const allWallets = [phantomWallet, glowWallet, backpackWallet, solflareWallet, metaMaskWallet, seedVaultWallet];
 export {
   allWallets,
   backpackWallet,
@@ -13,5 +14,6 @@ export {
   glowWallet,
   metaMaskWallet,
   phantomWallet,
+  seedVaultWallet,
   solflareWallet
 };

package/dist/wallets/connectors/seedVault/seedVault.d.ts

@@ -0,0 +1,2 @@
+import { Wallet } from '../../../types/Wallet.js';
+export declare const seedVaultWallet: () => Wallet;

package/dist/wallets/connectors/seedVault/seedVault.js

@@ -0,0 +1,43 @@
+"use client";
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import { icon } from "./seedVaultIcon.js";
+const seedVaultWallet = () => {
+  return {
+    id: "seed_vault_wallet",
+    internalId: "SEED_VAULT_WALLET",
+    name: "Seed Vault Wallet",
+    iconUrl: icon,
+    isExtension: false,
+    isMobile: true,
+    hasIosSafariExtension: false,
+    mwaSupported: true,
+    // No QR / universal-link path: Seed Vault Wallet has no in-app browser and
+    // no `window.solana` injection. MWA is the only entry point.
+    getQrUri: () => __async(void 0, null, function* () {
+      return "";
+    }),
+    downloadUrl: "https://solanamobile.com/seeker"
+  };
+};
+export {
+  seedVaultWallet
+};

package/dist/wallets/connectors/seedVault/seedVaultIcon.d.ts

@@ -0,0 +1 @@
+export declare const icon = "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAyNDUgMjQ1IiBmaWxsPSJub25lIj48Y2lyY2xlIGN4PSIxMjIuNSIgY3k9IjEyMi41IiByPSIxMjIuNSIgZmlsbD0iIzAwMDAwMCIvPjxwYXRoIGQ9Ik0xMjIuNSAwQzE5MC4xNTUgMCAyNDUgNTQuODQ1MSAyNDUgMTIyLjVDMjQ1IDE5MC4xNTUgMTkwLjE1NSAyNDUgMTIyLjUgMjQ1QzU1LjAxMTkgMjQ1IDAuMjcyMzYgMTkwLjQyNSAwLjAwMjkyOTY5IDEyM0gwQzAgMTIyLjkzNiAwLjAwMDcyMDUyIDEyMi44NzIgMC4wMDA5NzY1NjIgMTIyLjgwOEMwLjAwMDcyNDU4OCAxMjIuNzA1IDAgMTIyLjYwMyAwIDEyMi41QzAgNTQuODQ1MSA1NC44NDUxIDAgMTIyLjUgMFpNMTIyLjUgMjBDODQuOTY4MiAyMCA1Mi4xNDc2IDQwLjE3MTkgMzQuMjg5MSA3MC4yNjU2QzU2LjU3MTEgNTUuOTIyOCA4Ny44NTU5IDQ3IDEyMi41IDQ3QzEzNy4zNjQgNDcgMTUwLjY3IDQ5LjQ5NjEgMTY0IDU1QzE3Ny4zMyA2MC41MDM5IDE4OC43MTggNzAuOTQxIDE5NS43OTMgODQuNTkyOEMxNzcuNDEgNzQuMDIwMiAxNTEuNzAxIDY3IDEyMi41IDY3QzkxLjc5NDEgNjcgNjQuOTQ3OSA3NC43NjE4IDQ2LjQyMjkgODYuMjU0OUMzMi44MzEzIDk0LjY4NzIgMjUuMDkzNSAxMDQuMDg2IDIxLjg0MDggMTEzSDY2VjEzM0gyMC41MzEyQzI1Ljc4OTUgMTg0LjY3NyA2OS40MzU3IDIyNSAxMjIuNSAyMjVDMTU5LjQ0IDIyNSAxOTEuODE0IDIwNS40NTkgMjA5Ljg1MyAxNzYuMTVDMTg3LjYxNCAxOTAuMjQ5IDE1Ni42MDEgMTk5IDEyMi4yOTMgMTk5QzEwNy40MjkgMTk5IDk0LjEyMzQgMTk2LjUwNCA4MC43OTMgMTkxQzY3LjQ2MjUgMTg1LjQ5NiA1Ni4wNzUyIDE3NS4wNTkgNDkgMTYxLjQwN0M2Ny4zODI2IDE3MS45OCA5My4wOTIzIDE3OSAxMjIuMjkzIDE3OUMxNTIuOTk5IDE3OSAxNzkuODQ1IDE3MS4yMzggMTk4LjM3IDE1OS43NDVDMjExLjk2MiAxNTEuMzEzIDIxOS42OTkgMTQxLjkxNCAyMjIuOTUyIDEzM0gxNzlWMTEzSDIyNC41NjNDMjE5Ljc3IDYwLjg0NDYgMTc1LjkwNiAyMCAxMjIuNSAyMFpNMTIyLjUgODZDMTQyLjY1OCA4NiAxNTkgMTAyLjM0MiAxNTkgMTIyLjVDMTU5IDE0Mi42NTggMTQyLjY1OCAxNTkgMTIyLjUgMTU5QzEwMi4zNDIgMTU5IDg2IDE0Mi42NTggODYgMTIyLjVDODYgMTAyLjM0MiAxMDIuMzQyIDg2IDEyMi41IDg2Wk0xMjIuNSAxMDZDMTEzLjM4NyAxMDYgMTA2IDExMy4zODcgMTA2IDEyMi41QzEwNiAxMzEuNjEzIDExMy4zODcgMTM5IDEyMi41IDEzOUMxMzEuNjEzIDEzOSAxMzkgMTMxLjYxMyAxMzkgMTIyLjVDMTM5IDExMy4zODcgMTMxLjYxMyAxMDYgMTIyLjUgMTA2WiIgZmlsbD0iI0ZGRkZGRiIvPjwvc3ZnPgo=";

package/dist/wallets/connectors/seedVault/seedVaultIcon.js

@@ -0,0 +1,5 @@
+"use client";
+const icon = "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAyNDUgMjQ1IiBmaWxsPSJub25lIj48Y2lyY2xlIGN4PSIxMjIuNSIgY3k9IjEyMi41IiByPSIxMjIuNSIgZmlsbD0iIzAwMDAwMCIvPjxwYXRoIGQ9Ik0xMjIuNSAwQzE5MC4xNTUgMCAyNDUgNTQuODQ1MSAyNDUgMTIyLjVDMjQ1IDE5MC4xNTUgMTkwLjE1NSAyNDUgMTIyLjUgMjQ1QzU1LjAxMTkgMjQ1IDAuMjcyMzYgMTkwLjQyNSAwLjAwMjkyOTY5IDEyM0gwQzAgMTIyLjkzNiAwLjAwMDcyMDUyIDEyMi44NzIgMC4wMDA5NzY1NjIgMTIyLjgwOEMwLjAwMDcyNDU4OCAxMjIuNzA1IDAgMTIyLjYwMyAwIDEyMi41QzAgNTQuODQ1MSA1NC44NDUxIDAgMTIyLjUgMFpNMTIyLjUgMjBDODQuOTY4MiAyMCA1Mi4xNDc2IDQwLjE3MTkgMzQuMjg5MSA3MC4yNjU2QzU2LjU3MTEgNTUuOTIyOCA4Ny44NTU5IDQ3IDEyMi41IDQ3QzEzNy4zNjQgNDcgMTUwLjY3IDQ5LjQ5NjEgMTY0IDU1QzE3Ny4zMyA2MC41MDM5IDE4OC43MTggNzAuOTQxIDE5NS43OTMgODQuNTkyOEMxNzcuNDEgNzQuMDIwMiAxNTEuNzAxIDY3IDEyMi41IDY3QzkxLjc5NDEgNjcgNjQuOTQ3OSA3NC43NjE4IDQ2LjQyMjkgODYuMjU0OUMzMi44MzEzIDk0LjY4NzIgMjUuMDkzNSAxMDQuMDg2IDIxLjg0MDggMTEzSDY2VjEzM0gyMC41MzEyQzI1Ljc4OTUgMTg0LjY3NyA2OS40MzU3IDIyNSAxMjIuNSAyMjVDMTU5LjQ0IDIyNSAxOTEuODE0IDIwNS40NTkgMjA5Ljg1MyAxNzYuMTVDMTg3LjYxNCAxOTAuMjQ5IDE1Ni42MDEgMTk5IDEyMi4yOTMgMTk5QzEwNy40MjkgMTk5IDk0LjEyMzQgMTk2LjUwNCA4MC43OTMgMTkxQzY3LjQ2MjUgMTg1LjQ5NiA1Ni4wNzUyIDE3NS4wNTkgNDkgMTYxLjQwN0M2Ny4zODI2IDE3MS45OCA5My4wOTIzIDE3OSAxMjIuMjkzIDE3OUMxNTIuOTk5IDE3OSAxNzkuODQ1IDE3MS4yMzggMTk4LjM3IDE1OS43NDVDMjExLjk2MiAxNTEuMzEzIDIxOS42OTkgMTQxLjkxNCAyMjIuOTUyIDEzM0gxNzlWMTEzSDIyNC41NjNDMjE5Ljc3IDYwLjg0NDYgMTc1LjkwNiAyMCAxMjIuNSAyMFpNMTIyLjUgODZDMTQyLjY1OCA4NiAxNTkgMTAyLjM0MiAxNTkgMTIyLjVDMTU5IDE0Mi42NTggMTQyLjY1OCAxNTkgMTIyLjUgMTU5QzEwMi4zNDIgMTU5IDg2IDE0Mi42NTggODYgMTIyLjVDODYgMTAyLjM0MiAxMDIuMzQyIDg2IDEyMi41IDg2Wk0xMjIuNSAxMDZDMTEzLjM4NyAxMDYgMTA2IDExMy4zODcgMTA2IDEyMi41QzEwNiAxMzEuNjEzIDExMy4zODcgMTM5IDEyMi41IDEzOUMxMzEuNjEzIDEzOSAxMzkgMTMxLjYxMyAxMzkgMTIyLjVDMTM5IDExMy4zODcgMTMxLjYxMyAxMDYgMTIyLjUgMTA2WiIgZmlsbD0iI0ZGRkZGRiIvPjwvc3ZnPgo=";
+export {
+  icon
+};

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@getpara/solana-wallet-connectors",
-  "version": "3.0.0-alpha.1",
+  "version": "3.1.0",
   "dependencies": {
-    "@getpara/react-common": "3.0.0-alpha.1",
-    "@getpara/web-sdk": "3.0.0-alpha.1",
+    "@getpara/react-common": "3.1.0",
+    "@getpara/web-sdk": "3.1.0",
     "bs58": "^6.0.0"
   },
   "devDependencies": {
@@ -23,7 +23,7 @@
     "dist",
     "package.json"
   ],
-  "gitHead": "839d225579de67feb5be4da225d232290b2a2a04",
+  "gitHead": "e73f17cd7960fdfe62ff68a972b3461e47b21eb0",
   "main": "dist/index.js",
   "peerDependencies": {
     "@farcaster/mini-app-solana": "^1.0.5",