@getpara/solana-wallet-connectors 1.12.0 → 2.0.0-alpha.10

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,9 +1,8 @@
 "use client";
-import { SolanaExternalWalletProvider, SolanaExternalWalletContext } from "./providers/SolanaExternalWalletContext.js";
+import { SolanaExternalWalletContext } from "./providers/SolanaExternalWalletContext.js";
 import { ParaSolanaProvider } from "./providers/ParaSolanaProvider.js";
 export * from "./wallets/connectors/index.js";
 export {
   ParaSolanaProvider,
-  SolanaExternalWalletContext,
-  SolanaExternalWalletProvider
+  SolanaExternalWalletContext
 };

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/ParaSolanaProvider.js

@@ -1,68 +1,39 @@
 "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());
-  });
+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;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
 };
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import { jsx } from "react/jsx-runtime";
-import { createContext, useContext, useEffect, useMemo, useState } from "react";
+import { useMemo } from "react";
 import { ConnectionProvider, WalletProvider as SolanaWalletProvider } from "@solana/wallet-adapter-react";
-import { useClient, useExternalWalletProviderStore } from "@getpara/react-sdk";
-import { SolanaExternalWalletContext, SolanaExternalWalletProvider } from "./SolanaExternalWalletContext.js";
+import { SolanaExternalWalletProvider } from "./SolanaExternalWalletContext.js";
 import {
   createDefaultAddressSelector,
   createDefaultAuthorizationResultCache,
   createDefaultWalletNotFoundHandler,
   SolanaMobileWalletAdapter
 } from "@solana-mobile/wallet-adapter-mobile";
-const defaultWallet = {
-  wallets: []
-};
-const 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;
-  }
+function ParaSolanaProvider({ children, config, internalConfig }) {
+  const { wallets: walletFns, endpoint, appIdentity, chain, connectionConfig } = config;
+  const solanaExternalWalletProviderProps = useMemo(
+    () => __spreadValues({ wallets: walletFns }, internalConfig),
+    [walletFns, internalConfig]
+  );
   return /* @__PURE__ */ jsx(ConnectionProvider, { endpoint, config: connectionConfig, children: /* @__PURE__ */ jsx(
     SolanaWalletProvider,
     {
@@ -76,27 +47,11 @@ function ParaSolanaProvider({
         })
       ],
       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 })
+      autoConnect: true,
+      children: /* @__PURE__ */ jsx(SolanaExternalWalletProvider, __spreadProps(__spreadValues({}, solanaExternalWalletProviderProps), { children }))
     }
   ) });
 }
-const useParaSolana = () => useContext(ParaSolanaContext);
 export {
-  ParaSolanaContext,
-  ParaSolanaProvider,
-  defaultWallet,
-  useParaSolana
+  ParaSolanaProvider
 };

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 { TExternalWallet, type CommonWallet } from '@getpara/react-common';
+export type SolanaExternalWalletContextType = {
     wallets: CommonWallet[];
     disconnect: () => Promise<void>;
     signMessage: (message: string) => Promise<{
@@ -19,14 +14,18 @@ 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;
+    walletsWithFullAuth: TExternalWallet[];
+};
+type SolanaExternalWalletProviderConfigFull = {
+    wallets: WalletList;
+} & SolanaExternalWalletProviderConfig;
+export declare function SolanaExternalWalletProvider({ children, wallets: walletFns, onSwitchWallet, para, walletsWithFullAuth, }: SolanaExternalWalletProviderConfigFull & PropsWithChildren): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/providers/SolanaExternalWalletContext.js

@@ -39,9 +39,6 @@ import { jsx } from "react/jsx-runtime";
 import { createContext, useEffect, useMemo, useRef } from "react";
 import { useWallet } from "@solana/wallet-adapter-react";
 import { WalletReadyState } from "@solana/wallet-adapter-base";
-import { useParaSolana } from "./ParaSolanaProvider.js";
-import { WalletType } from "@getpara/web-sdk";
-import { useExternalWalletProviderStore } from "@getpara/react-sdk";
 import bs58 from "bs58";
 const defaultSolanaExternalWallet = {
   wallets: [],
@@ -50,7 +47,13 @@ const defaultSolanaExternalWallet = {
   signVerificationMessage: () => Promise.resolve({})
 };
 const SolanaExternalWalletContext = createContext(defaultSolanaExternalWallet);
-function SolanaExternalWalletProvider({ children, para, onSwitchWallet }) {
+function SolanaExternalWalletProvider({
+  children,
+  wallets: walletFns,
+  onSwitchWallet,
+  para,
+  walletsWithFullAuth
+}) {
   const {
     wallets: adapters,
     select: selectWallet,
@@ -58,26 +61,26 @@ function SolanaExternalWalletProvider({ children, para, onSwitchWallet }) {
     publicKey: solanaAddress,
     wallet,
     connecting,
-    signMessage: solanaSignMessage,
-    connected
+    connected,
+    signMessage: solanaSignMessage
   } = useWallet();
-  const { wallets: walletFns } = useParaSolana();
-  const fullAuthWallets = useExternalWalletProviderStore((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* () {
+  const login = (_0) => __async(this, [_0], function* ({ address, providerName }) {
     var _a, _b;
     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.loginExternalWallet({
+        externalWallet: {
+          address,
+          type: "SOLANA",
+          provider: providerName,
+          withFullParaAuth: walletsWithFullAuth == null ? void 0 : walletsWithFullAuth.includes(
+            (_b = (_a = getWallet(providerName != null ? providerName : "")) == null ? void 0 : _a.id.toUpperCase()) != null ? _b : ""
+          )
+        }
       });
     } catch (err) {
       yield reset();
@@ -91,7 +94,7 @@ 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;
       }
@@ -107,16 +110,21 @@ function SolanaExternalWalletProvider({ children, para, onSwitchWallet }) {
   }, []);
   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) === "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* () {
+    var _a;
     try {
       const encodedMessage = new TextEncoder().encode(message);
       const signature = yield solanaSignMessage(encodedMessage);
       return {
-        address: solanaAddress.toString(),
+        externalWallet: {
+          address: solanaAddress.toString(),
+          type: "SOLANA",
+          provider: (_a = wallet == null ? void 0 : wallet.adapter) == null ? void 0 : _a.name
+        },
         signature: bs58.encode(signature)
       };
     } catch (e) {
@@ -133,23 +141,20 @@ function SolanaExternalWalletProvider({ children, para, onSwitchWallet }) {
   const connect = (adapter) => __async(this, null, function* () {
     yield _disconnect();
     if (!adapter) {
-      return { address: void 0, error: "Adapter not found.", userExists: false, isVerified: false };
+      return { error: "Adapter not found." };
     }
     selectWallet(adapter.name);
     yield new Promise((resolve) => setTimeout(resolve, 100));
     let address;
     let error;
-    let userExists = false;
-    let isVerified = false;
+    let authState;
     try {
       yield adapter.connect();
       address = adapter.publicKey.toString();
       if (address) {
         try {
-          const loginResp = yield login(address, adapter.name);
-          userExists = loginResp.userExists;
-          isVerified = loginResp.isVerified;
-          verificationMessage.current = loginResp.signatureVerificationMessage;
+          authState = yield login({ address, providerName: adapter.name });
+          verificationMessage.current = authState.stage === "verify" ? authState.signatureVerificationMessage : void 0;
         } catch (err) {
           yield _disconnect();
           address = void 0;
@@ -170,12 +175,13 @@ function SolanaExternalWalletProvider({ children, para, onSwitchWallet }) {
         }
       }
     }
-    return { address, error, userExists, isVerified };
+    return { address, error, authState };
   });
   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;
   };
+  const getWallet = (name) => wallets.find((w) => w.name === name);
   const wallets = walletFns.map((walletFn) => {
     const metaData = walletFn();
     const adapter = getAdapter(metaData.name);
@@ -183,11 +189,10 @@ function SolanaExternalWalletProvider({ children, para, onSwitchWallet }) {
       connect: () => connect(adapter),
       connectMobile: () => connect(adapter),
       getQrUri: () => "",
-      type: WalletType.SOLANA,
+      type: "SOLANA",
       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) {
@@ -207,6 +212,5 @@ function SolanaExternalWalletProvider({ children, para, onSwitchWallet }) {
 }
 export {
   SolanaExternalWalletContext,
-  SolanaExternalWalletProvider,
-  defaultSolanaExternalWallet
+  SolanaExternalWalletProvider
 };

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/dist/wallets/connectors/index.js

@@ -2,7 +2,9 @@
 import { phantomWallet } from "./phantom/phantom.js";
 import { glowWallet } from "./glow/glow.js";
 import { backpackWallet } from "./backpack/backpack.js";
+const allWallets = [phantomWallet, glowWallet, backpackWallet];
 export {
+  allWallets,
   backpackWallet,
   glowWallet,
   phantomWallet

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getpara/solana-wallet-connectors",
-  "version": "1.12.0",
+  "version": "2.0.0-alpha.10",
   "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.12.0",
-    "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-alpha.10",
     "@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-alpha.10",
     "@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": "748afcf08c9d307a2d3eaf0716f73132f3eb8529"
+  "gitHead": "92904c321f1dd8101046d8d2d70aa341bac99842"
 }