@getpara/solana-wallet-connectors 2.0.0-alpha.20 → 2.0.0-alpha.22

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export { SolanaExternalWalletContext } from './providers/SolanaExternalWalletContext.js';
-export type { SolanaExternalWalletContextType } from './providers/SolanaExternalWalletContext.js';
+export { type SolanaExternalWalletContextType, defaultSolanaExternalWallet, } from './providers/SolanaExternalWalletContext.js';
 export { ParaSolanaProvider } from './providers/ParaSolanaProvider.js';
 export type { ParaSolanaProviderConfig, ParaSolanaProviderProps } from './providers/ParaSolanaProvider.js';
 export * from './wallets/connectors/index.js';

package/dist/index.js

@@ -1,8 +1,12 @@
 "use client";
 import { SolanaExternalWalletContext } from "./providers/SolanaExternalWalletContext.js";
+import {
+  defaultSolanaExternalWallet
+} from "./providers/SolanaExternalWalletContext.js";
 import { ParaSolanaProvider } from "./providers/ParaSolanaProvider.js";
 export * from "./wallets/connectors/index.js";
 export {
   ParaSolanaProvider,
-  SolanaExternalWalletContext
+  SolanaExternalWalletContext,
+  defaultSolanaExternalWallet
 };

package/dist/providers/SolanaExternalWalletContext.d.ts

@@ -1,33 +1,18 @@
 import { PropsWithChildren } from 'react';
-import ParaWeb from '@getpara/web-sdk';
-import { WalletList } from '../types/Wallet.js';
-import { TExternalWallet, type CommonWallet } from '@getpara/react-common';
-export type SolanaExternalWalletContextType = {
-    wallets: CommonWallet[];
+import { ExternalWalletInfo } from '@getpara/web-sdk';
+import { CreateWalletFn } from '../types/Wallet.js';
+import { ExternalWalletContextType, ExternalWalletProviderConfig, ExternalWalletProviderConfigBase } from '@getpara/react-common';
+export declare const defaultSolanaExternalWallet: {
+    wallets: any[];
     disconnect: () => Promise<void>;
-    signMessage: (message: string) => Promise<{
-        signature?: string;
-        error?: string;
-    }>;
-    signVerificationMessage: () => Promise<{
-        address?: string;
-        signature?: string;
-        error?: string;
-    }>;
+    signMessage: () => Promise<{}>;
+    signVerificationMessage: () => Promise<{}>;
+    requestInfo: () => Promise<ExternalWalletInfo>;
+    disconnectBase: () => Promise<void>;
 };
+export type SolanaExternalWalletContextType = ExternalWalletContextType;
 export declare const SolanaExternalWalletContext: import("react").Context<SolanaExternalWalletContextType>;
-export type SolanaExternalWalletProviderConfig = {
-    onSwitchWallet?: (args: {
-        address?: string;
-        error?: string;
-    }) => void;
-    para: ParaWeb;
-    walletsWithFullAuth: TExternalWallet[];
-    includeWalletVerification?: boolean;
-    connectionOnly?: boolean;
-};
-type SolanaExternalWalletProviderConfigFull = {
-    wallets: WalletList;
-} & SolanaExternalWalletProviderConfig;
+export type SolanaExternalWalletProviderConfig = ExternalWalletProviderConfigBase;
+type SolanaExternalWalletProviderConfigFull = ExternalWalletProviderConfig<CreateWalletFn>;
 export declare function SolanaExternalWalletProvider({ children, wallets: walletFns, onSwitchWallet, para, walletsWithFullAuth, includeWalletVerification, connectionOnly, }: SolanaExternalWalletProviderConfigFull & PropsWithChildren): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/providers/SolanaExternalWalletContext.js

@@ -44,7 +44,9 @@ const defaultSolanaExternalWallet = {
   wallets: [],
   disconnect: () => Promise.resolve(),
   signMessage: () => Promise.resolve({}),
-  signVerificationMessage: () => Promise.resolve({})
+  signVerificationMessage: () => Promise.resolve({}),
+  requestInfo: () => Promise.resolve({}),
+  disconnectBase: () => Promise.resolve()
 };
 const SolanaExternalWalletContext = createContext(defaultSolanaExternalWallet);
 function SolanaExternalWalletProvider({
@@ -59,18 +61,31 @@ function SolanaExternalWalletProvider({
   const {
     wallets: adapters,
     select: selectWallet,
-    disconnect: _disconnect,
+    disconnect,
     publicKey: solanaAddress,
     wallet,
     connecting,
     signMessage: solanaSignMessage
   } = useWallet();
+  const isLinkingAccount = useRef(false);
+  const solanaSignMessageRef = useRef(solanaSignMessage);
+  const solanaAddressRef = useRef(solanaAddress);
   const verificationMessage = useRef();
   const reset = () => __async(this, null, function* () {
-    yield _disconnect();
+    yield disconnect();
     yield para.logout();
   });
-  const login = (_0) => __async(this, [_0], function* ({ address, providerName }) {
+  const _reset = (..._0) => __async(this, [..._0], function* ({ logout = false } = {}) {
+    yield disconnect();
+    if (logout) {
+      yield para.logout();
+    }
+  });
+  const login = (_0) => __async(this, [_0], function* ({
+    address,
+    providerId,
+    providerName
+  }) {
     var _a, _b;
     try {
       return yield para.loginExternalWallet({
@@ -78,6 +93,7 @@ function SolanaExternalWalletProvider({
           address,
           type: "SOLANA",
           provider: providerName,
+          providerId,
           withFullParaAuth: walletsWithFullAuth == null ? void 0 : walletsWithFullAuth.includes(
             (_b = (_a = getWallet(providerName != null ? providerName : "")) == null ? void 0 : _a.id.toUpperCase()) != null ? _b : ""
           ),
@@ -91,7 +107,7 @@ function SolanaExternalWalletProvider({
     }
   });
   const switchWallet = (address) => __async(this, null, function* () {
-    var _a;
+    var _a, _b, _c, _d;
     let error;
     if (!address) {
       yield para.logout();
@@ -102,7 +118,8 @@ function SolanaExternalWalletProvider({
         try {
           yield login({
             address,
-            providerName: (_a = wallet == null ? void 0 : wallet.adapter) == null ? void 0 : _a.name
+            providerId: (_c = getWallet((_b = (_a = wallet == null ? void 0 : wallet.adapter) == null ? void 0 : _a.name) != null ? _b : "")) == null ? void 0 : _c.internalId,
+            providerName: (_d = wallet == null ? void 0 : wallet.adapter) == null ? void 0 : _d.name
           });
         } catch (err) {
           error = err;
@@ -114,57 +131,108 @@ function SolanaExternalWalletProvider({
   useEffect(() => {
     var _a;
     const storedExternalWallet = para.externalWallets[(_a = solanaAddress == null ? void 0 : solanaAddress.toString()) != null ? _a : ""];
-    if (!!solanaAddress && !storedExternalWallet) {
+    if (!!solanaAddress && !storedExternalWallet && !isLinkingAccount.current) {
       reset();
     }
   }, []);
+  useEffect(() => {
+    solanaSignMessageRef.current = solanaSignMessage;
+  }, [solanaSignMessage]);
+  useEffect(() => {
+    solanaAddressRef.current = solanaAddress;
+  }, [solanaAddress]);
   useEffect(() => {
     const storedExternalWallet = Object.values(para.externalWallets || {})[0];
-    if (!connecting && (!wallet || (wallet == null ? void 0 : wallet.adapter.connected)) && (storedExternalWallet == null ? void 0 : storedExternalWallet.type) === "SOLANA" && (storedExternalWallet == null ? void 0 : storedExternalWallet.address) !== (solanaAddress == null ? void 0 : solanaAddress.toString())) {
+    if (!connecting && (!wallet || (wallet == null ? void 0 : wallet.adapter.connected)) && (storedExternalWallet == null ? void 0 : storedExternalWallet.type) === "SOLANA" && (storedExternalWallet == null ? void 0 : storedExternalWallet.address) !== (solanaAddress == null ? void 0 : solanaAddress.toString()) && !isLinkingAccount.current) {
       switchWallet(solanaAddress == null ? void 0 : solanaAddress.toString());
     }
   }, [solanaAddress, connecting, wallet]);
-  const signMessage = (message) => __async(this, null, function* () {
+  const signMessage = (_0) => __async(this, [_0], function* ({ message }) {
+    var _a, _b, _c, _d;
     try {
+      let solanaAddressNow = (_a = solanaAddressRef.current) != null ? _a : solanaAddress, solanaSignMessageNow = (_b = solanaSignMessageRef.current) != null ? _b : solanaSignMessage;
+      while (!solanaAddressNow || !solanaSignMessageNow) {
+        yield new Promise((resolve) => setTimeout(resolve, 100));
+        solanaAddressNow = (_c = solanaAddressRef.current) != null ? _c : solanaAddress;
+        solanaSignMessageNow = (_d = solanaSignMessageRef.current) != null ? _d : solanaSignMessage;
+      }
       const encodedMessage = new TextEncoder().encode(message);
-      const signature = yield solanaSignMessage(encodedMessage);
+      const signature = yield solanaSignMessageNow(encodedMessage);
+      solanaAddressRef.current = void 0;
+      solanaSignMessageRef.current = void 0;
       return {
-        address: solanaAddress.toString(),
+        address: solanaAddressNow.toString(),
         signature: bs58.encode(signature)
       };
     } catch (e) {
+      console.error(e);
       if (e.message.includes("User rejected the request")) {
         return { error: "Signature request rejected" };
       }
+      console.error("Solana signature error:", e.message);
       return { error: "An unknown error occurred" };
     }
   });
   const signVerificationMessage = () => __async(this, null, function* () {
-    const signature = yield signMessage(verificationMessage.current);
+    const signature = yield signMessage({ message: verificationMessage.current });
     return signature;
   });
-  const connect = (adapter) => __async(this, null, function* () {
-    if (isIosAndRedirectable()) {
-      return;
-    }
-    yield _disconnect();
+  const connectBase = (adapter, _switchWallet = false) => __async(this, null, function* () {
     if (!adapter) {
-      return { error: "Adapter not found." };
+      throw new Error("Adapter not found.");
     }
     selectWallet(adapter.name);
     yield new Promise((resolve) => setTimeout(resolve, 100));
     let address;
     let error;
-    let authState;
     try {
       yield adapter.connect();
-      address = adapter.publicKey.toString();
+      if (adapter.publicKey) {
+        address = adapter.publicKey.toString();
+      } else {
+        yield new Promise((resolve, reject) => {
+          adapter.once("connect", () => __async(this, null, function* () {
+            try {
+              address = adapter.publicKey.toString();
+              resolve();
+            } catch (err) {
+              reject(err);
+            }
+          }));
+          adapter.once("error", (err) => {
+            error = (err == null ? void 0 : err.message) || "An unknown error occurred";
+            reject(err);
+          });
+          adapter.once("disconnect", () => {
+            error = "Disconnected before connect event";
+            reject(new Error(error));
+          });
+        });
+      }
+      return address;
+    } catch (e) {
+      console.error(e);
+      yield adapter.disconnect();
+      throw e;
+    }
+  });
+  const connect = (adapter) => __async(this, null, function* () {
+    var _a;
+    if (isIosAndRedirectable()) {
+      return;
+    }
+    yield disconnect();
+    let address;
+    let error;
+    let authState;
+    try {
+      address = yield connectBase(adapter, true);
       if (address) {
         try {
-          authState = yield login({ address, providerName: adapter.name });
+          authState = yield login({ address, providerId: (_a = getWallet(adapter.name)) == null ? void 0 : _a.internalId, providerName: adapter.name });
           verificationMessage.current = authState.stage === "verify" ? authState.signatureVerificationMessage : void 0;
         } catch (err) {
-          yield _disconnect();
+          yield disconnect();
           address = void 0;
           error = err;
         }
@@ -178,6 +246,7 @@ function SolanaExternalWalletProvider({
           break;
         }
         default: {
+          console.error("Solana connection error:", err.message);
           error = "An unknown error occurred";
           break;
         }
@@ -185,6 +254,40 @@ function SolanaExternalWalletProvider({
     }
     return { address, error, authState };
   });
+  const requestInfo = (providerId) => __async(this, null, function* () {
+    var _a, _b;
+    const wallet2 = wallets.find((w) => w.internalId === providerId);
+    const adapter = getAdapter((_a = wallet2.name) != null ? _a : "");
+    isLinkingAccount.current = true;
+    try {
+      const address = yield connectBase(adapter);
+      const externalWallet = {
+        address,
+        type: "SOLANA",
+        providerId: wallet2.internalId,
+        provider: wallet2.name
+      };
+      return externalWallet;
+    } catch (e) {
+      console.error("Error linking account:", e);
+      throw new Error((_b = e == null ? void 0 : e.message) != null ? _b : e);
+    }
+  });
+  const disconnectBase = (providerId) => __async(this, null, function* () {
+    var _a, _b;
+    const wallet2 = wallets.find((w) => w.internalId === providerId);
+    const adapter = getAdapter((_a = wallet2.name) != null ? _a : "");
+    if (!(adapter == null ? void 0 : adapter.connected)) {
+      return;
+    }
+    isLinkingAccount.current = true;
+    try {
+      yield adapter.disconnect();
+    } catch (e) {
+      console.error("Error disconnecting wallet:", e);
+      throw new Error((_b = e == null ? void 0 : e.message) != null ? _b : e);
+    }
+  });
   const getAdapter = (name) => {
     var _a;
     return (_a = adapters.find((a) => a.adapter.name === "Mobile Wallet Adapter" ? a : a.adapter.name === name ? a : false)) == null ? void 0 : _a.adapter;
@@ -200,15 +303,12 @@ function SolanaExternalWalletProvider({
       installed: adapter && ((adapter == null ? void 0 : adapter.readyState) === WalletReadyState.Installed || (adapter == null ? void 0 : adapter.readyState) === WalletReadyState.Loadable)
     }, metaData);
   });
-  const disconnect = () => __async(this, null, function* () {
-    yield _disconnect();
-  });
   return /* @__PURE__ */ jsx(
     SolanaExternalWalletContext.Provider,
     {
       value: useMemo(
-        () => ({ wallets, disconnect, signMessage, signVerificationMessage }),
-        [wallets, disconnect, signMessage, signVerificationMessage]
+        () => ({ wallets, disconnect, signMessage, signVerificationMessage, requestInfo, disconnectBase }),
+        [wallets, disconnect, signMessage, signVerificationMessage, requestInfo, disconnectBase]
       ),
       children
     }
@@ -216,5 +316,6 @@ function SolanaExternalWalletProvider({
 }
 export {
   SolanaExternalWalletContext,
-  SolanaExternalWalletProvider
+  SolanaExternalWalletProvider,
+  defaultSolanaExternalWallet
 };

package/dist/wallets/connectors/backpack/backpack.js

@@ -24,6 +24,7 @@ import { icon } from "./backpackIcon.js";
 const backpackWallet = () => {
   return {
     id: "backpack",
+    internalId: "BACKPACK",
     name: "Backpack",
     iconUrl: icon,
     isExtension: true,

package/dist/wallets/connectors/glow/glow.js

@@ -4,6 +4,7 @@ import { isIosAndRedirectable } from "@solana/wallet-adapter-base";
 const glowWallet = () => {
   return {
     id: "glow",
+    internalId: "GLOW",
     name: "Glow",
     iconUrl: icon,
     isExtension: true,

package/dist/wallets/connectors/phantom/phantom.js

@@ -24,6 +24,7 @@ import { icon } from "./phantomIcon.js";
 const phantomWallet = () => {
   return {
     id: "phantom",
+    internalId: "PHANTOM",
     name: "Phantom",
     iconUrl: icon,
     isExtension: true,

package/dist/wallets/connectors/solflare/solflare.js

@@ -24,6 +24,7 @@ import { icon } from "./solflareIcon.js";
 const solflareWallet = () => {
   return {
     id: "solflare",
+    internalId: "SOLFLARE",
     name: "Solflare",
     iconUrl: icon,
     isExtension: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getpara/solana-wallet-connectors",
-  "version": "2.0.0-alpha.20",
+  "version": "2.0.0-alpha.22",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -14,15 +14,15 @@
     "test": "vitest run --coverage"
   },
   "dependencies": {
-    "@getpara/web-sdk": "2.0.0-alpha.20",
-    "@solana-mobile/wallet-adapter-mobile": "2.1.3",
-    "@solana/wallet-adapter-base": "0.9.23",
-    "@solana/wallet-adapter-react": "0.15.35",
-    "@solana/wallet-adapter-walletconnect": "0.1.16",
+    "@getpara/web-sdk": "2.0.0-alpha.22",
+    "@solana-mobile/wallet-adapter-mobile": "2.2.0",
+    "@solana/wallet-adapter-base": "0.9.27",
+    "@solana/wallet-adapter-react": "0.15.39",
+    "@solana/wallet-adapter-walletconnect": "0.1.21",
     "bs58": "6.0.0"
   },
   "devDependencies": {
-    "@getpara/react-common": "2.0.0-alpha.20",
+    "@getpara/react-common": "2.0.0-alpha.22",
     "@types/react": "^18.0.31",
     "@types/react-dom": "^18.2.7",
     "typescript": "^5.4.3"
@@ -35,5 +35,5 @@
     "dist",
     "package.json"
   ],
-  "gitHead": "4c8d918b9fc387476968bfc08524fe1a8b6ec83b"
+  "gitHead": "e23258f6af4d3445bf4717a9e524c63e0088e159"
 }