@getpara/solana-wallet-connectors 1.6.0 → 1.7.0

package/dist/index.js

@@ -37,14 +37,14 @@ var __async = (__this, __arguments, generator) => {
 };
 
 // src/providers/SolanaExternalWalletContext.tsx
-import { createContext as createContext2, useEffect as useEffect2, useMemo as useMemo2 } from "react";
+import { createContext as createContext2, useEffect as useEffect2, useMemo as useMemo2, 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 { useExternalWalletProviderStore } from "@getpara/react-sdk";
+import { useClient, useExternalWalletProviderStore } from "@getpara/react-sdk";
 import {
   createDefaultAddressSelector,
   createDefaultAuthorizationResultCache,
@@ -62,12 +62,14 @@ function ParaSolanaProvider({
   endpoint,
   appIdentity,
   chain,
-  connectionConfig
+  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);
   }, []);
@@ -96,7 +98,19 @@ function ParaSolanaProvider({
         })
       ],
       localStorageKey: "paraSolanaExternal",
-      autoConnect: shouldAutoConnect,
+      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 })
     }
   ) });
@@ -105,10 +119,14 @@ 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";
 var defaultSolanaExternalWallet = {
   wallets: [],
-  disconnect: () => Promise.resolve()
+  disconnect: () => Promise.resolve(),
+  signMessage: () => Promise.resolve({}),
+  signVerificationMessage: () => Promise.resolve({})
 };
 var SolanaExternalWalletContext = createContext2(defaultSolanaExternalWallet);
 function SolanaExternalWalletProvider({ children, para, onSwitchWallet }) {
@@ -118,16 +136,28 @@ function SolanaExternalWalletProvider({ children, para, onSwitchWallet }) {
     disconnect: _disconnect,
     publicKey: solanaAddress,
     wallet,
-    connecting
+    connecting,
+    signMessage: solanaSignMessage,
+    connected
   } = 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;
     try {
-      yield para.externalWalletLogin({ address, type: WalletType.SOLANA, provider: providerName });
+      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 : ""
+        )
+      });
     } catch (err) {
       yield reset();
       throw "Error logging you in. Please try again.";
@@ -160,21 +190,45 @@ function SolanaExternalWalletProvider({ children, para, onSwitchWallet }) {
       switchWallet(solanaAddress == null ? void 0 : solanaAddress.toString());
     }
   }, [solanaAddress, connecting]);
+  const signMessage = (message) => __async(this, null, function* () {
+    try {
+      const encodedMessage = new TextEncoder().encode(message);
+      const signature = yield solanaSignMessage(encodedMessage);
+      return {
+        address: solanaAddress.toString(),
+        signature: bs58.encode(signature)
+      };
+    } catch (e) {
+      if (e.message.includes("User rejected the request")) {
+        return { error: "Signature request rejected" };
+      }
+      return { error: "An unknown error occurred" };
+    }
+  });
+  const signVerificationMessage = () => __async(this, null, function* () {
+    const signature = yield signMessage(verificationMessage.current);
+    return signature;
+  });
   const connect = (adapter) => __async(this, null, function* () {
     yield _disconnect();
     if (!adapter) {
-      return { address: void 0, error: "Adapter not found." };
+      return { address: void 0, error: "Adapter not found.", userExists: false, isVerified: false };
     }
     selectWallet(adapter.name);
     yield new Promise((resolve) => setTimeout(resolve, 100));
     let address;
     let error;
+    let userExists = false;
+    let isVerified = false;
     try {
       yield adapter.connect();
       address = adapter.publicKey.toString();
       if (address) {
         try {
-          yield login(address, adapter.name);
+          const loginResp = yield login(address, adapter.name);
+          userExists = loginResp.userExists;
+          isVerified = loginResp.isVerified;
+          verificationMessage.current = loginResp.signatureVerificationMessage;
         } catch (err) {
           yield _disconnect();
           address = void 0;
@@ -195,7 +249,7 @@ function SolanaExternalWalletProvider({ children, para, onSwitchWallet }) {
         }
       }
     }
-    return { address, error };
+    return { address, error, userExists, isVerified };
   });
   const getAdapter = (name) => {
     var _a;
@@ -212,11 +266,23 @@ 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();
-    typeof window !== void 0 && (window == null ? void 0 : window.location.reload());
+    if (connected) {
+      typeof window !== void 0 && (window == null ? void 0 : window.location.reload());
+    }
   });
-  return /* @__PURE__ */ jsx2(SolanaExternalWalletContext.Provider, { value: useMemo2(() => ({ wallets, disconnect }), [wallets, disconnect]), children });
+  return /* @__PURE__ */ jsx2(
+    SolanaExternalWalletContext.Provider,
+    {
+      value: useMemo2(
+        () => ({ wallets, disconnect, signMessage, signVerificationMessage }),
+        [wallets, disconnect, signMessage, signVerificationMessage]
+      ),
+      children
+    }
+  );
 }
 
 // src/wallets/connectors/phantom/phantomIcon.ts

package/dist/providers/ParaSolanaProvider.d.ts

@@ -1,5 +1,6 @@
 import { ReactNode } from 'react';
 import { WalletList } from '../types/Wallet.js';
+import ParaWeb from '@getpara/react-sdk';
 import { type ConnectionConfig } from '@solana/web3.js';
 import { Chain } from '@solana-mobile/mobile-wallet-adapter-protocol';
 export declare const defaultWallet: {
@@ -31,8 +32,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, }: ParaSolanaProviderProps): import("react/jsx-runtime").JSX.Element;
+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;
 };

package/dist/providers/SolanaExternalWalletContext.d.ts

@@ -1,13 +1,24 @@
 import { ReactNode } from 'react';
-import { CommonWallet } from '../types/CommonTypes.js';
 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<{
     wallets: CommonWallet[];
     disconnect: () => Promise<void>;
+    signMessage: (message: string) => Promise<{
+        signature?: string;
+        error?: string;
+    }>;
+    signVerificationMessage: () => Promise<{
+        address?: string;
+        signature?: string;
+        error?: string;
+    }>;
 }>;
 interface SolanaExternalWalletProviderProps {
     children: ReactNode;

package/dist/types/Wallet.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getpara/solana-wallet-connectors",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -9,7 +9,8 @@
     "./connectors": "./dist/wallets/connectors/index.js"
   },
   "dependencies": {
-    "@getpara/react-sdk": "1.6.0"
+    "@getpara/react-sdk": "1.7.0",
+    "bs58": "6.0.0"
   },
   "scripts": {
     "build": "rm -rf dist && yarn typegen && node ./scripts/build.mjs",
@@ -37,5 +38,5 @@
     "dist",
     "package.json"
   ],
-  "gitHead": "2dd6c8ea893d72d693804e5c5b0856d2ea6c3a7a"
+  "gitHead": "241b03ee3d3502af3b8d702dabd615b266da10ae"
 }

package/dist/types/CommonTypes.d.ts

@@ -1,22 +0,0 @@
-export type WalletMetadata = {
-    id: string;
-    name: string;
-    iconUrl: string;
-    installed?: boolean;
-    isExtension?: boolean;
-    isMobile?: boolean;
-    isWeb?: boolean;
-    downloadUrl?: string;
-    getQrUri?: () => Promise<string>;
-};
-export type CommonWallet = {
-    connect: () => Promise<{
-        address?: string;
-        error?: string;
-    }>;
-    connectMobile: (isManualWalletConnect?: boolean) => Promise<{
-        address?: string;
-        error?: string;
-    }>;
-    type: 'EVM' | 'SOLANA' | 'COSMOS';
-} & WalletMetadata;