@getpara/solana-wallet-connectors 2.24.0 → 2.26.0

package/dist/providers/SolanaExternalWalletContext.js

@@ -50,6 +50,7 @@ import bs58 from "bs58";
 import { externalHooks } from "./externalHooks.js";
 import { farcasterWallet } from "../wallets/connectors/index.js";
 const CONNECT_EVENT_TIMEOUT_MS = 3e4;
+const SIGN_MESSAGE_REF_WAIT_MS = 5e3;
 const isInSolanaWalletDappBrowser = () => {
   var _a, _b;
   if (typeof window === "undefined") return false;
@@ -85,6 +86,15 @@ function SolanaExternalWalletProvider({
   useEffect(() => {
     walletRef.current = wallet;
   }, [wallet]);
+  useEffect(() => {
+    disconnectRef.current = disconnect;
+  }, [disconnect]);
+  useEffect(() => {
+    solanaSignMessageRef.current = solanaSignMessage;
+  }, [solanaSignMessage]);
+  useEffect(() => {
+    solanaAddressRef.current = solanaAddress == null ? void 0 : solanaAddress.toString();
+  }, [solanaAddress]);
   const [isFarcasterSetup, setIsFarcasterSetup] = useState(false);
   useEffect(() => {
     if (!para.isSetup) {
@@ -102,19 +112,29 @@ function SolanaExternalWalletProvider({
             return (_a = solanaAddressRef.current) == null ? void 0 : _a.toString();
           }),
           signMessage: (_0) => __async(this, [_0], function* ({ message }) {
+            var _a, _b, _c, _d;
             try {
+              const start = Date.now();
+              let fn = (_a = solanaSignMessageRef.current) != null ? _a : solanaSignMessage;
+              while (!fn) {
+                if (Date.now() - start > SIGN_MESSAGE_REF_WAIT_MS) {
+                  throw new Error("Solana signMessage unavailable");
+                }
+                yield new Promise((resolve) => setTimeout(resolve, 100));
+                fn = (_b = solanaSignMessageRef.current) != null ? _b : solanaSignMessage;
+              }
               const encodedMessage = new TextEncoder().encode(message);
-              const signature = yield solanaSignMessageRef.current(encodedMessage);
+              const signature = yield fn(encodedMessage);
               return {
                 signature: bs58.encode(signature)
               };
             } catch (e) {
               console.error(e);
-              if (e.message.includes("User rejected the request")) {
+              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.message);
-              throw new Error("An unknown error occurred");
+              console.error("Solana signature error:", e == null ? void 0 : e.message);
+              throw new Error(`Solana signMessage failed: ${(_d = e == null ? void 0 : e.message) != null ? _d : "unknown"}`);
             }
           }),
           watchDisconnection: (callback) => {
@@ -171,12 +191,6 @@ function SolanaExternalWalletProvider({
     });
     initializeConfig();
   }, [para.isSetup]);
-  useEffect(() => {
-    solanaSignMessageRef.current = solanaSignMessage;
-  }, [solanaSignMessage]);
-  useEffect(() => {
-    solanaAddressRef.current = solanaAddress == null ? void 0 : solanaAddress.toString();
-  }, [solanaAddress]);
   const signMessage = (_0) => __async(this, [_0], function* ({ message }) {
     var _a, _b, _c, _d;
     try {
@@ -287,7 +301,11 @@ function SolanaExternalWalletProvider({
     if (isAndroid() && (adapter == null ? void 0 : adapter.name) === "Mobile Wallet Adapter") {
       return;
     }
-    yield disconnect();
+    if (adapter && (wallet == null ? void 0 : wallet.adapter) && wallet.adapter.name !== adapter.name) {
+      yield disconnect();
+    } else if ((wallet == null ? void 0 : wallet.adapter) && !wallet.adapter.connected && wallet.adapter.publicKey) {
+      yield disconnect();
+    }
     let address;
     let error;
     let authState;

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@getpara/solana-wallet-connectors",
-  "version": "2.24.0",
+  "version": "2.26.0",
   "dependencies": {
-    "@getpara/react-common": "2.24.0",
-    "@getpara/web-sdk": "2.24.0",
+    "@getpara/react-common": "2.26.0",
+    "@getpara/web-sdk": "2.26.0",
     "bs58": "^6.0.0"
   },
   "devDependencies": {
@@ -23,7 +23,7 @@
     "dist",
     "package.json"
   ],
-  "gitHead": "3ea729c9a5e550c2053c5fff07d1ca7d8a8f9ce9",
+  "gitHead": "02eb43f55b1c5f8bed6685940b6344551610f42a",
   "main": "dist/index.js",
   "peerDependencies": {
     "@farcaster/mini-app-solana": "^1.0.5",