@getpara/solana-wallet-connectors 1.7.1 → 2.0.0-dev.0

package/dist/index.d.ts

@@ -1,3 +1,6 @@
-export { SolanaExternalWalletProvider, SolanaExternalWalletContext } from './providers/SolanaExternalWalletContext.js';
+export { SolanaExternalWalletContext } from './providers/SolanaExternalWalletContext.js';
+export type { SolanaExternalWalletContextType } from './providers/SolanaExternalWalletContext.js';
 export { ParaSolanaProvider } from './providers/ParaSolanaProvider.js';
+export type { ParaSolanaProviderConfig, ParaSolanaProviderProps } from './providers/ParaSolanaProvider.js';
 export * from './wallets/connectors/index.js';
+export type { WalletList } from './types/Wallet.js';

package/dist/index.js

@@ -1,5 +1,7 @@
 "use client";
 var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __propIsEnum = Object.prototype.propertyIsEnumerable;
@@ -15,6 +17,7 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -37,99 +40,25 @@ var __async = (__this, __arguments, generator) => {
 };
 
 // src/providers/SolanaExternalWalletContext.tsx
-import { createContext as createContext2, useEffect as useEffect2, useMemo as useMemo2, useRef } from "react";
+import { createContext, useEffect, useMemo, useRef } from "react";
 import { useWallet } from "@solana/wallet-adapter-react";
 import { WalletReadyState } from "@solana/wallet-adapter-base";
-
-// src/providers/ParaSolanaProvider.tsx
-import { createContext, useContext, useEffect, useMemo, useState } from "react";
-import { ConnectionProvider, WalletProvider as SolanaWalletProvider } from "@solana/wallet-adapter-react";
-import { useClient, useExternalWalletProviderStore } from "@getpara/react-sdk";
-import {
-  createDefaultAddressSelector,
-  createDefaultAuthorizationResultCache,
-  createDefaultWalletNotFoundHandler,
-  SolanaMobileWalletAdapter
-} from "@solana-mobile/wallet-adapter-mobile";
-import { jsx } from "react/jsx-runtime";
-var defaultWallet = {
-  wallets: []
-};
-var ParaSolanaContext = createContext(defaultWallet);
-function ParaSolanaProvider({
-  children,
-  wallets: walletFns,
-  endpoint,
-  appIdentity,
-  chain,
-  connectionConfig,
-  para: _para
-}) {
-  const updateExternalWalletProviderState = useExternalWalletProviderStore((state) => state.updateState);
-  const SolanaProvider = useExternalWalletProviderStore((state) => state.SolanaProvider);
-  const solanaContext = useExternalWalletProviderStore((state) => state.solanaContext);
-  const [shouldAutoConnect, setShouldAutoConnect] = useState(true);
-  const para = _para != null ? _para : useClient();
-  useEffect(() => {
-    setShouldAutoConnect(false);
-  }, []);
-  useEffect(() => {
-    if (!solanaContext || !SolanaProvider) {
-      updateExternalWalletProviderState({
-        SolanaProvider: SolanaExternalWalletProvider,
-        solanaContext: SolanaExternalWalletContext
-      });
-    }
-  }, []);
-  const value = useMemo(() => ({ wallets: walletFns }), [walletFns]);
-  if (!solanaContext || !SolanaProvider) {
-    return null;
-  }
-  return /* @__PURE__ */ jsx(ConnectionProvider, { endpoint, config: connectionConfig, children: /* @__PURE__ */ jsx(
-    SolanaWalletProvider,
-    {
-      wallets: [
-        new SolanaMobileWalletAdapter({
-          addressSelector: createDefaultAddressSelector(),
-          appIdentity,
-          authorizationResultCache: createDefaultAuthorizationResultCache(),
-          chain,
-          onWalletNotFound: createDefaultWalletNotFoundHandler()
-        })
-      ],
-      localStorageKey: "paraSolanaExternal",
-      autoConnect: (adapter) => __async(this, null, function* () {
-        var _a;
-        const hasParaExternalWallet = (_a = Object.values(para.externalWallets)) == null ? void 0 : _a.find((w) => w.name === adapter.name);
-        if (shouldAutoConnect && hasParaExternalWallet) {
-          if (!para.isExternalWalletAuth) {
-            return true;
-          } else if (para.isExternalWalletAuth && (yield para.isFullyLoggedIn())) {
-            return true;
-          }
-          return false;
-        }
-        return false;
-      }),
-      children: /* @__PURE__ */ jsx(ParaSolanaContext.Provider, { value, children })
-    }
-  ) });
-}
-var useParaSolana = () => useContext(ParaSolanaContext);
-
-// src/providers/SolanaExternalWalletContext.tsx
 import { WalletType } from "@getpara/web-sdk";
-import { useExternalWalletProviderStore as useExternalWalletProviderStore2 } from "@getpara/react-sdk";
 import bs58 from "bs58";
-import { jsx as jsx2 } from "react/jsx-runtime";
+import { jsx } from "react/jsx-runtime";
 var defaultSolanaExternalWallet = {
   wallets: [],
   disconnect: () => Promise.resolve(),
   signMessage: () => Promise.resolve({}),
   signVerificationMessage: () => Promise.resolve({})
 };
-var SolanaExternalWalletContext = createContext2(defaultSolanaExternalWallet);
-function SolanaExternalWalletProvider({ children, para, onSwitchWallet }) {
+var SolanaExternalWalletContext = createContext(defaultSolanaExternalWallet);
+function SolanaExternalWalletProvider({
+  children,
+  wallets: walletFns,
+  onSwitchWallet,
+  para
+}) {
   const {
     wallets: adapters,
     select: selectWallet,
@@ -137,27 +66,17 @@ function SolanaExternalWalletProvider({ children, para, onSwitchWallet }) {
     publicKey: solanaAddress,
     wallet,
     connecting,
-    signMessage: solanaSignMessage,
-    connected
+    connected,
+    signMessage: solanaSignMessage
   } = useWallet();
-  const { wallets: walletFns } = useParaSolana();
-  const fullAuthWallets = useExternalWalletProviderStore2((state) => state.fullAuthWallets);
   const verificationMessage = useRef();
   const reset = () => __async(this, null, function* () {
     yield _disconnect();
     yield para.logout();
   });
-  const login = (address, providerName) => __async(this, null, function* () {
-    var _a, _b;
+  const login = (_0) => __async(this, [_0], function* ({ address, providerName }) {
     try {
-      return yield para.externalWalletLogin({
-        address,
-        type: WalletType.SOLANA,
-        provider: providerName,
-        withFullParaAuth: fullAuthWallets == null ? void 0 : fullAuthWallets.includes(
-          (_b = (_a = getWallet(providerName != null ? providerName : "")) == null ? void 0 : _a.id.toUpperCase()) != null ? _b : ""
-        )
-      });
+      return yield para.externalWalletLogin({ address, type: WalletType.SOLANA, provider: providerName });
     } catch (err) {
       yield reset();
       throw "Error logging you in. Please try again.";
@@ -170,26 +89,26 @@ function SolanaExternalWalletProvider({ children, para, onSwitchWallet }) {
       yield para.logout();
     } else {
       try {
-        yield login(address, (_a = wallet == null ? void 0 : wallet.adapter) == null ? void 0 : _a.name);
+        yield login({ address, providerName: (_a = wallet == null ? void 0 : wallet.adapter) == null ? void 0 : _a.name });
       } catch (err) {
         error = err;
       }
     }
     onSwitchWallet({ address, error });
   });
-  useEffect2(() => {
+  useEffect(() => {
     var _a;
     const storedExternalWallet = para.externalWallets[(_a = solanaAddress == null ? void 0 : solanaAddress.toString()) != null ? _a : ""];
     if (!!solanaAddress && !storedExternalWallet) {
       reset();
     }
   }, []);
-  useEffect2(() => {
+  useEffect(() => {
     const storedExternalWallet = Object.values(para.externalWallets || {})[0];
-    if (!connecting && (storedExternalWallet == null ? void 0 : storedExternalWallet.type) === WalletType.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) === WalletType.SOLANA && (storedExternalWallet == null ? void 0 : storedExternalWallet.address) !== (solanaAddress == null ? void 0 : solanaAddress.toString())) {
       switchWallet(solanaAddress == null ? void 0 : solanaAddress.toString());
     }
-  }, [solanaAddress, connecting]);
+  }, [solanaAddress, connecting, wallet]);
   const signMessage = (message) => __async(this, null, function* () {
     try {
       const encodedMessage = new TextEncoder().encode(message);
@@ -225,10 +144,7 @@ function SolanaExternalWalletProvider({ children, para, onSwitchWallet }) {
       address = adapter.publicKey.toString();
       if (address) {
         try {
-          const loginResp = yield login(address, adapter.name);
-          userExists = loginResp.userExists;
-          isVerified = loginResp.isVerified;
-          verificationMessage.current = loginResp.signatureVerificationMessage;
+          yield login({ address, providerName: adapter.name });
         } catch (err) {
           yield _disconnect();
           address = void 0;
@@ -266,17 +182,16 @@ function SolanaExternalWalletProvider({ children, para, onSwitchWallet }) {
       installed: adapter && ((adapter == null ? void 0 : adapter.readyState) === WalletReadyState.Installed || (adapter == null ? void 0 : adapter.readyState) === WalletReadyState.Loadable)
     }, metaData);
   });
-  const getWallet = (name) => wallets.find((w) => w.name === name);
   const disconnect = () => __async(this, null, function* () {
     yield _disconnect();
     if (connected) {
       typeof window !== void 0 && (window == null ? void 0 : window.location.reload());
     }
   });
-  return /* @__PURE__ */ jsx2(
+  return /* @__PURE__ */ jsx(
     SolanaExternalWalletContext.Provider,
     {
-      value: useMemo2(
+      value: useMemo(
         () => ({ wallets, disconnect, signMessage, signVerificationMessage }),
         [wallets, disconnect, signMessage, signVerificationMessage]
       ),
@@ -285,6 +200,41 @@ function SolanaExternalWalletProvider({ children, para, onSwitchWallet }) {
   );
 }
 
+// src/providers/ParaSolanaProvider.tsx
+import { useMemo as useMemo2 } from "react";
+import { ConnectionProvider, WalletProvider as SolanaWalletProvider } from "@solana/wallet-adapter-react";
+import {
+  createDefaultAddressSelector,
+  createDefaultAuthorizationResultCache,
+  createDefaultWalletNotFoundHandler,
+  SolanaMobileWalletAdapter
+} from "@solana-mobile/wallet-adapter-mobile";
+import { jsx as jsx2 } from "react/jsx-runtime";
+function ParaSolanaProvider({ children, config, internalConfig }) {
+  const { wallets: walletFns, endpoint, appIdentity, chain, connectionConfig } = config;
+  const solanaExternalWalletProviderProps = useMemo2(
+    () => __spreadValues({ wallets: walletFns }, internalConfig),
+    [walletFns, internalConfig]
+  );
+  return /* @__PURE__ */ jsx2(ConnectionProvider, { endpoint, config: connectionConfig, children: /* @__PURE__ */ jsx2(
+    SolanaWalletProvider,
+    {
+      wallets: [
+        new SolanaMobileWalletAdapter({
+          addressSelector: createDefaultAddressSelector(),
+          appIdentity,
+          authorizationResultCache: createDefaultAuthorizationResultCache(),
+          chain,
+          onWalletNotFound: createDefaultWalletNotFoundHandler()
+        })
+      ],
+      localStorageKey: "paraSolanaExternal",
+      autoConnect: true,
+      children: /* @__PURE__ */ jsx2(SolanaExternalWalletProvider, __spreadProps(__spreadValues({}, solanaExternalWalletProviderProps), { children }))
+    }
+  ) });
+}
+
 // src/wallets/connectors/phantom/phantomIcon.ts
 var icon = "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDI0IDI0IiBmaWxsPSJub25lIj4KICA8ZyBjbGlwLXBhdGg9InVybCgjY2xpcDBfMTAzNl85NDApIj4KICAgIDxwYXRoIGQ9Ik0xMiAyNEMxOC42Mjc0IDI0IDI0IDE4LjYyNzQgMjQgMTJDMjQgNS4zNzI1OCAxOC42Mjc0IDAgMTIgMEM1LjM3MjU4IDAgMCA1LjM3MjU4IDAgMTJDMCAxOC42Mjc0IDUuMzcyNTggMjQgMTIgMjRaIiBmaWxsPSJ1cmwoI3BhaW50MF9saW5lYXJfMTAzNl85NDApIi8+CiAgICA8cGF0aCBkPSJNMjAuODgyMyAxMS44ODk3SDE4Ljc1NUMxOC43NTUgNy41MzIyMyAxNS4yMjgyIDQgMTAuODc3MyA0QzYuNTgwMzcgNCAzLjA4Njg5IDcuNDQ1NzYgMy4wMDEzOSAxMS43Mjg2QzIuOTEyOTMgMTYuMTU1NyA3LjA2MDAxIDIwIDExLjQ4MDkgMjBIMTIuMDM3QzE1LjkzNDUgMjAgMjEuMTU4NSAxNi45NDQzIDIxLjk3NDcgMTMuMjIxMUMyMi4xMjU0IDEyLjUzNDggMjEuNTg0MSAxMS44ODk3IDIwLjg4MjMgMTEuODg5N1pNNy43MTU5NiAxMi4wODM4QzcuNzE1OTYgMTIuNjY2NSA3LjI0MDA5IDEzLjE0MzEgNi42NTgyNyAxMy4xNDMxQzYuMDc2NDQgMTMuMTQzMSA1LjYwMDYgMTIuNjY2MyA1LjYwMDYgMTIuMDgzOFYxMC4zNzAxQzUuNjAwNiA5Ljc4NzQ0IDYuMDc2NDQgOS4zMTA4NCA2LjY1ODI3IDkuMzEwODRDNy4yNDAwOSA5LjMxMDg0IDcuNzE1OTYgOS43ODc0NCA3LjcxNTk2IDEwLjM3MDFWMTIuMDgzOFpNMTEuMzg4NiAxMi4wODM4QzExLjM4ODYgMTIuNjY2NSAxMC45MTI4IDEzLjE0MzEgMTAuMzMxIDEzLjE0MzFDOS43NDkxNCAxMy4xNDMxIDkuMjczMzIgMTIuNjY2MyA5LjI3MzMyIDEyLjA4MzhWMTAuMzcwMUM5LjI3MzMyIDkuNzg3NDQgOS43NDkzNSA5LjMxMDg0IDEwLjMzMSA5LjMxMDg0QzEwLjkxMjggOS4zMTA4NCAxMS4zODg2IDkuNzg3NDQgMTEuMzg4NiAxMC4zNzAxVjEyLjA4MzhaIiBmaWxsPSJ1cmwoI3BhaW50MV9saW5lYXJfMTAzNl85NDApIi8+CiAgPC9nPgogIDxkZWZzPgogICAgPGxpbmVhckdyYWRpZW50IGlkPSJwYWludDBfbGluZWFyXzEwMzZfOTQwIiB4MT0iMTIiIHkxPSIwIiB4Mj0iMTIiIHkyPSIyNCIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPgogICAgICA8c3RvcCBzdG9wLWNvbG9yPSIjNTM0QkIxIi8+CiAgICAgIDxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzU1MUJGOSIvPgogICAgPC9saW5lYXJHcmFkaWVudD4KICAgIDxsaW5lYXJHcmFkaWVudCBpZD0icGFpbnQxX2xpbmVhcl8xMDM2Xzk0MCIgeDE9IjEyLjUiIHkxPSI0IiB4Mj0iMTIuNSIgeTI9IjIwIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+CiAgICAgIDxzdG9wIHN0b3AtY29sb3I9IndoaXRlIi8+CiAgICAgIDxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0id2hpdGUiIHN0b3Atb3BhY2l0eT0iMC44MiIvPgogICAgPC9saW5lYXJHcmFkaWVudD4KICAgIDxjbGlwUGF0aCBpZD0iY2xpcDBfMTAzNl85NDAiPgogICAgICA8cmVjdCB3aWR0aD0iMjQiIGhlaWdodD0iMjQiIGZpbGw9IndoaXRlIi8+CiAgICA8L2NsaXBQYXRoPgogIDwvZGVmcz4KPC9zdmc+";
 
@@ -332,10 +282,13 @@ var backpackWallet = () => {
     downloadUrl: "https://backpack.app/download"
   };
 };
+
+// src/wallets/connectors/index.ts
+var allWallets = [phantomWallet, glowWallet, backpackWallet];
 export {
   ParaSolanaProvider,
   SolanaExternalWalletContext,
-  SolanaExternalWalletProvider,
+  allWallets,
   backpackWallet,
   glowWallet,
   phantomWallet

package/dist/providers/ParaSolanaProvider.d.ts

@@ -1,16 +1,9 @@
-import { ReactNode } from 'react';
+import { PropsWithChildren } from 'react';
 import { WalletList } from '../types/Wallet.js';
-import ParaWeb from '@getpara/react-sdk';
+import { SolanaExternalWalletProviderConfig } from './SolanaExternalWalletContext.js';
 import { type ConnectionConfig } from '@solana/web3.js';
 import { Chain } from '@solana-mobile/mobile-wallet-adapter-protocol';
-export declare const defaultWallet: {
-    wallets: any[];
-};
-export declare const ParaSolanaContext: import("react").Context<{
-    wallets: WalletList;
-}>;
-interface ParaSolanaProviderProps {
-    children: ReactNode;
+export interface ParaSolanaProviderConfig {
     wallets: WalletList;
     /** Endpoint passed to the ConnectionProvider
      * Ref: https://solana-labs.github.io/solana-web3.js/classes/Connection.html
@@ -32,10 +25,9 @@ interface ParaSolanaProviderProps {
      * Ref: https://docs.solanamobile.com/reference/typescript/mobile-wallet-adapter#web3mobilewalletauthorize
      */
     chain: Chain;
-    para?: ParaWeb;
 }
-export declare function ParaSolanaProvider({ children, wallets: walletFns, endpoint, appIdentity, chain, connectionConfig, para: _para, }: ParaSolanaProviderProps): import("react/jsx-runtime").JSX.Element;
-export declare const useParaSolana: () => {
-    wallets: WalletList;
+export type ParaSolanaProviderProps = {
+    config: ParaSolanaProviderConfig;
+    internalConfig: SolanaExternalWalletProviderConfig;
 };
-export {};
+export declare function ParaSolanaProvider({ children, config, internalConfig }: ParaSolanaProviderProps & PropsWithChildren): import("react/jsx-runtime").JSX.Element;

package/dist/providers/SolanaExternalWalletContext.d.ts

@@ -1,13 +1,8 @@
-import { ReactNode } from 'react';
+import { PropsWithChildren } from 'react';
 import ParaWeb from '@getpara/web-sdk';
-import { CommonWallet } from '@getpara/react-sdk';
-export declare const defaultSolanaExternalWallet: {
-    wallets: any[];
-    disconnect: () => Promise<void>;
-    signMessage: () => Promise<{}>;
-    signVerificationMessage: () => Promise<{}>;
-};
-export declare const SolanaExternalWalletContext: import("react").Context<{
+import { WalletList } from '../types/Wallet.js';
+import { type CommonWallet } from '@getpara/react-common';
+export type SolanaExternalWalletContextType = {
     wallets: CommonWallet[];
     disconnect: () => Promise<void>;
     signMessage: (message: string) => Promise<{
@@ -19,14 +14,17 @@ export declare const SolanaExternalWalletContext: import("react").Context<{
         signature?: string;
         error?: string;
     }>;
-}>;
-interface SolanaExternalWalletProviderProps {
-    children: ReactNode;
-    para: ParaWeb;
-    onSwitchWallet: (args: {
+};
+export declare const SolanaExternalWalletContext: import("react").Context<SolanaExternalWalletContextType>;
+export type SolanaExternalWalletProviderConfig = {
+    onSwitchWallet?: (args: {
         address?: string;
         error?: string;
     }) => void;
-}
-export declare function SolanaExternalWalletProvider({ children, para, onSwitchWallet }: SolanaExternalWalletProviderProps): import("react/jsx-runtime").JSX.Element;
+    para: ParaWeb;
+};
+type SolanaExternalWalletProviderConfigFull = {
+    wallets: WalletList;
+} & SolanaExternalWalletProviderConfig;
+export declare function SolanaExternalWalletProvider({ children, wallets: walletFns, onSwitchWallet, para, }: SolanaExternalWalletProviderConfigFull & PropsWithChildren): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/types/Wallet.d.ts

@@ -1,4 +1,4 @@
-import { WalletMetadata } from '@getpara/react-sdk';
+import { type WalletMetadata } from '@getpara/react-common';
 export type Wallet = {
     getUri?: (uri: string) => string;
 } & WalletMetadata;

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

@@ -2,3 +2,4 @@ import { phantomWallet } from './phantom/phantom.js';
 import { glowWallet } from './glow/glow.js';
 import { backpackWallet } from './backpack/backpack.js';
 export { phantomWallet, glowWallet, backpackWallet };
+export declare const allWallets: (() => import("../../types/Wallet.js").Wallet)[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getpara/solana-wallet-connectors",
-  "version": "1.7.1",
+  "version": "2.0.0-dev.0",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -8,29 +8,26 @@
     ".": "./dist/index.js",
     "./connectors": "./dist/wallets/connectors/index.js"
   },
-  "dependencies": {
-    "@getpara/react-sdk": "1.7.1",
-    "bs58": "6.0.0"
-  },
   "scripts": {
     "build": "rm -rf dist && yarn typegen && node ./scripts/build.mjs",
     "typegen": "tsc --emitDeclarationOnly",
     "test": "vitest run --coverage"
   },
-  "devDependencies": {
+  "dependencies": {
+    "@getpara/web-sdk": "^2.0.0-dev.0",
     "@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",
+    "bs58": "6.0.0"
+  },
+  "devDependencies": {
+    "@getpara/react-common": "^2.0.0-dev.0",
     "@types/react": "^18.0.31",
     "@types/react-dom": "^18.2.7",
     "typescript": "^5.4.3"
   },
   "peerDependencies": {
-    "@solana-mobile/wallet-adapter-mobile": "2.1.x",
-    "@solana/wallet-adapter-base": "0.9.x",
-    "@solana/wallet-adapter-react": "0.15.x",
-    "@solana/wallet-adapter-walletconnect": "0.1.x",
     "react": ">=18",
     "react-dom": ">=18"
   },
@@ -38,5 +35,5 @@
     "dist",
     "package.json"
   ],
-  "gitHead": "767395af96d4a724946a092de760e9137a73369a"
+  "gitHead": "f94ef031ef0e1894f5f0800e55f6ca2904641780"
 }