@getpara/solana-wallet-connectors 2.0.0-dev.2 → 2.0.0-dev.6

package/dist/providers/SolanaExternalWalletContext.d.ts

@@ -1,8 +1,8 @@
 import { PropsWithChildren } from 'react';
 import { CreateWalletFn } from '../types/Wallet.js';
-import { ExternalWalletContextType, ExternalWalletProviderConfig, ExternalWalletProviderConfigBase } from '@getpara/react-common';
+import { ExternalWalletContextType, ExternalWalletProviderConfig, ExternalWalletProviderConfigBase, FarcasterMiniAppManagement } from '@getpara/react-common';
 import { TExternalHooks } from './externalHooks.js';
-export type SolanaExternalWalletContextType = ExternalWalletContextType & TExternalHooks;
+export type SolanaExternalWalletContextType = ExternalWalletContextType & TExternalHooks & FarcasterMiniAppManagement;
 export declare const SolanaExternalWalletContext: import("react").Context<SolanaExternalWalletContextType>;
 export type SolanaExternalWalletProviderConfig = ExternalWalletProviderConfigBase;
 type SolanaExternalWalletProviderConfigFull = ExternalWalletProviderConfig<CreateWalletFn>;

package/dist/providers/SolanaExternalWalletContext.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) => {
@@ -36,7 +39,7 @@ var __async = (__this, __arguments, generator) => {
   });
 };
 import { jsx } from "react/jsx-runtime";
-import { createContext, useEffect, useMemo, useRef } from "react";
+import { createContext, useEffect, useMemo, useRef, useState } from "react";
 import { useWallet } from "@solana/wallet-adapter-react";
 import { isIosAndRedirectable, WalletReadyState } from "@solana/wallet-adapter-base";
 import {
@@ -44,7 +47,10 @@ import {
 } from "@getpara/react-common";
 import bs58 from "bs58";
 import { externalHooks } from "./externalHooks.js";
-const SolanaExternalWalletContext = createContext(defaultSolanaExternalWallet);
+import { farcasterWallet } from "../wallets/connectors/index.js";
+const SolanaExternalWalletContext = createContext(__spreadProps(__spreadValues({}, defaultSolanaExternalWallet), {
+  farcasterStatus: void 0
+}));
 function SolanaExternalWalletProvider({
   children,
   wallets: walletFns,
@@ -67,16 +73,11 @@ function SolanaExternalWalletProvider({
   const solanaSignMessageRef = useRef(solanaSignMessage);
   const solanaAddressRef = useRef(solanaAddress);
   const verificationMessage = useRef();
+  const [isFarcasterSetup, setIsFarcasterSetup] = useState(false);
   const reset = () => __async(this, null, function* () {
     yield disconnect();
     yield para.logout();
   });
-  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,
@@ -86,6 +87,7 @@ function SolanaExternalWalletProvider({
     try {
       return yield para.loginExternalWallet({
         externalWallet: {
+          partnerId: para.partnerId,
           address,
           type: "SOLANA",
           provider: providerName,
@@ -114,7 +116,7 @@ function SolanaExternalWalletProvider({
         try {
           yield login({
             address,
-            providerId: (_c = getWallet((_b = (_a = wallet == null ? void 0 : wallet.adapter) == null ? void 0 : _a.name) != null ? _b : "")) == null ? void 0 : _c.internalId,
+            providerId: (_c = getWallet((_b = (_a = wallet == null ? void 0 : wallet.adapter) == null ? void 0 : _a.name) != null ? _b : "")) == null ? void 0 : _c.id,
             providerName: (_d = wallet == null ? void 0 : wallet.adapter) == null ? void 0 : _d.name
           });
         } catch (err) {
@@ -225,7 +227,7 @@ function SolanaExternalWalletProvider({
       address = yield connectBase(adapter, true);
       if (address) {
         try {
-          authState = yield login({ address, providerId: (_a = getWallet(adapter.name)) == null ? void 0 : _a.internalId, providerName: adapter.name });
+          authState = yield login({ address, providerId: (_a = getWallet(adapter.name)) == null ? void 0 : _a.id, providerName: adapter.name });
           verificationMessage.current = authState.stage === "verify" ? authState.signatureVerificationMessage : void 0;
         } catch (err) {
           yield disconnect();
@@ -252,15 +254,16 @@ function SolanaExternalWalletProvider({
   });
   const requestInfo = (providerId) => __async(this, null, function* () {
     var _a, _b;
-    const wallet2 = wallets.find((w) => w.internalId === providerId);
+    const wallet2 = wallets.find((w) => w.id === providerId);
     const adapter = getAdapter((_a = wallet2.name) != null ? _a : "");
     isLinkingAccount.current = true;
     try {
       const address = yield connectBase(adapter);
       const externalWallet = {
+        partnerId: para.partnerId,
         address,
         type: "SOLANA",
-        providerId: wallet2.internalId,
+        providerId: wallet2.id,
         provider: wallet2.name
       };
       return externalWallet;
@@ -271,7 +274,7 @@ function SolanaExternalWalletProvider({
   });
   const disconnectBase = (providerId) => __async(this, null, function* () {
     var _a, _b;
-    const wallet2 = wallets.find((w) => w.internalId === providerId);
+    const wallet2 = wallets.find((w) => w.id === providerId);
     const adapter = getAdapter((_a = wallet2.name) != null ? _a : "");
     if (!(adapter == null ? void 0 : adapter.connected)) {
       return;
@@ -289,22 +292,101 @@ function SolanaExternalWalletProvider({
     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 createWallet = (walletFn) => {
     const metaData = walletFn();
     const adapter = getAdapter(metaData.name);
-    return __spreadValues({
+    return __spreadProps(__spreadValues({
       connect: () => connect(adapter),
       connectMobile: () => connect(adapter),
       type: "SOLANA",
       installed: adapter && ((adapter == null ? void 0 : adapter.readyState) === WalletReadyState.Installed || (adapter == null ? void 0 : adapter.readyState) === WalletReadyState.Loadable)
-    }, metaData);
+    }, metaData), {
+      // Using name here since that's the only common id across the networks
+      id: metaData.name
+    });
+  };
+  const [wallets, setWallets] = useState(() => walletFns.map(createWallet));
+  const farcasterStatus = useMemo(() => {
+    if (!isFarcasterSetup) {
+      return void 0;
+    }
+    const farcasterAdapter = getAdapter("Farcaster");
+    if (!farcasterAdapter) {
+      return {
+        isPresent: false
+      };
+    }
+    return farcasterAdapter.connected && farcasterAdapter.publicKey ? {
+      isPresent: true,
+      isConnected: true,
+      address: farcasterAdapter.publicKey.toString()
+    } : {
+      isPresent: true,
+      isConnected: false
+    };
+  }, [isFarcasterSetup, adapters]);
+  useEffect(() => {
+    const detectFarcaster = () => __async(this, null, function* () {
+      if (para.isFarcasterMiniApp) {
+        try {
+          yield import("@farcaster/mini-app-solana");
+        } catch (e) {
+        }
+      }
+    });
+    detectFarcaster();
+  }, [para.isFarcasterMiniApp]);
+  useEffect(() => {
+    const setupFarcaster = () => __async(this, null, function* () {
+      const adapter = getAdapter("Farcaster");
+      if (para.isFarcasterMiniApp && !wallets.some((w) => w.internalId === "FARCASTER") && !!adapter) {
+        const wallet2 = createWallet(farcasterWallet);
+        setWallets((prev) => [...prev, wallet2]);
+        if (para.supportedWalletTypes.some(({ type }) => type === "SOLANA")) {
+          yield connectBase(adapter, true);
+        }
+        setIsFarcasterSetup(true);
+      }
+    });
+    setupFarcaster();
+  }, [para.isFarcasterMiniApp, wallets, adapters]);
+  const injectedWallets = adapters.filter((wallet2) => wallet2.adapter.name !== "Mobile Wallet Adapter" && !wallets.some((w) => w.name === wallet2.adapter.name)).map((wallet2) => {
+    const adapter = wallet2.adapter;
+    return {
+      connect: () => connect(adapter),
+      connectMobile: () => connect(adapter),
+      type: "SOLANA",
+      installed: adapter && ((adapter == null ? void 0 : adapter.readyState) === WalletReadyState.Installed || (adapter == null ? void 0 : adapter.readyState) === WalletReadyState.Loadable),
+      name: adapter.name,
+      iconUrl: adapter.icon,
+      // Using name here since that's the only common id across the networks
+      id: adapter.name,
+      internalId: adapter.name
+    };
   });
+  const walletsWithInjected = [...wallets, ...injectedWallets];
   return /* @__PURE__ */ jsx(
     SolanaExternalWalletContext.Provider,
     {
       value: useMemo(
-        () => __spreadValues({ wallets, disconnect, signMessage, signVerificationMessage, requestInfo, disconnectBase }, externalHooks),
-        [wallets, disconnect, signMessage, signVerificationMessage, requestInfo, disconnectBase]
+        () => __spreadValues({
+          wallets: walletsWithInjected,
+          disconnect,
+          signMessage,
+          signVerificationMessage,
+          requestInfo,
+          disconnectBase,
+          farcasterStatus
+        }, externalHooks),
+        [
+          walletsWithInjected,
+          disconnect,
+          signMessage,
+          signVerificationMessage,
+          requestInfo,
+          farcasterStatus,
+          disconnectBase
+        ]
       ),
       children
     }

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

@@ -0,0 +1,2 @@
+import { Wallet } from '../../../types/Wallet.js';
+export declare const farcasterWallet: () => Wallet;

package/dist/wallets/connectors/farcaster/farcaster.js

@@ -0,0 +1,16 @@
+"use client";
+import { icon } from "./farcasterIcon.js";
+const farcasterWallet = () => {
+  return {
+    id: "farcaster",
+    internalId: "FARCASTER",
+    name: "Farcaster",
+    iconUrl: icon,
+    isExtension: true,
+    hasIosSafariExtension: false,
+    downloadUrl: "https://farcaster.xyz"
+  };
+};
+export {
+  farcasterWallet
+};

package/dist/wallets/connectors/farcaster/farcasterIcon.d.ts

@@ -0,0 +1 @@
+export declare const icon = "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjQiIGhlaWdodD0iMjQiIHZpZXdCb3g9IjAgMCAyNCAyNCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPG1hc2sgaWQ9Im1hc2swXzEzNDFfMzQiIHN0eWxlPSJtYXNrLXR5cGU6bHVtaW5hbmNlIiBtYXNrVW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4PSI0IiB5PSIwIiB3aWR0aD0iMTciIGhlaWdodD0iMjQiPgo8cGF0aCBkPSJNMjAuNSAwSDRWMjRIMjAuNVYwWiIgZmlsbD0id2hpdGUiLz4KPC9tYXNrPgo8ZyBtYXNrPSJ1cmwoI21hc2swXzEzNDFfMzQpIj4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0xMy44MTMgMS44ODcwOEMxNC42ODUzIDEuODg3MDggMTUuNTAzNSAyLjAwNDAyIDE2LjI2MTIgMi4yMjA4OUMxNS41MTk1IDAuNDkyMjU0IDEzLjk3OTUgMCAxMi4yNjU2IDBDMTAuNTQ4MyAwIDkuMDA1NjUgMC40OTQxODggOC4yNjU2MiAyLjIzMTA3QzkuMDE3NjUgMi4wMDY1NyA5LjgzMjM2IDEuODg3MDggMTAuNzAxNyAxLjg4NzA4SDEzLjgxM1pNMTAuNTAyMiAzLjYyMjU2QzYuMzYwMDMgMy42MjI1NiA0IDYuODgxMTQgNCAxMC45MDA4VjE1LjAzQzQgMTUuNDMyIDQuMzM1NzkgMTUuNzUgNC43NSAxNS43NUgxOS43NUMyMC4xNjQyIDE1Ljc1IDIwLjUgMTUuNDMyIDIwLjUgMTUuMDNWMTAuOTAwOEMyMC41IDYuODgxMTQgMTcuNzU1NiAzLjYyMjU2IDEzLjYxMzUgMy42MjI1NkgxMC41MDIyWk0xMi4yNDQxIDEwLjkzNjVDMTMuNjkzOSAxMC45MzY1IDE0Ljg2OTIgOS43NjEyMyAxNC44NjkyIDguMzExNTNDMTQuODY5MiA2Ljg2MTc4IDEzLjY5MzkgNS42ODY1MyAxMi4yNDQxIDUuNjg2NTNDMTAuNzk0NCA1LjY4NjUzIDkuNjE5MTQgNi44NjE3OCA5LjYxOTE0IDguMzExNTNDOS42MTkxNCA5Ljc2MTIzIDEwLjc5NDQgMTAuOTM2NSAxMi4yNDQxIDEwLjkzNjVaTTQgMTguMTc3MUM0IDE3Ljc3NTEgNC4zMzU3OSAxNy40NDkyIDQuNzUgMTcuNDQ5MkgxOS43NUMyMC4xNjQyIDE3LjQ0OTIgMjAuNSAxNy43NzUxIDIwLjUgMTguMTc3MVYyMi41NDRDMjAuNSAyMy4zNDc5IDE5LjgyODQgMjMuOTk5NyAxOSAyMy45OTk3SDUuNUM0LjY3MTU3IDIzLjk5OTcgNCAyMy4zNDc5IDQgMjIuNTQ0VjE4LjE3NzFaIiBmaWxsPSIjRTMzRTNGIi8+CjwvZz4KPC9zdmc+Cg==";

package/dist/wallets/connectors/farcaster/farcasterIcon.js

@@ -0,0 +1,5 @@
+"use client";
+const icon = "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjQiIGhlaWdodD0iMjQiIHZpZXdCb3g9IjAgMCAyNCAyNCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPG1hc2sgaWQ9Im1hc2swXzEzNDFfMzQiIHN0eWxlPSJtYXNrLXR5cGU6bHVtaW5hbmNlIiBtYXNrVW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4PSI0IiB5PSIwIiB3aWR0aD0iMTciIGhlaWdodD0iMjQiPgo8cGF0aCBkPSJNMjAuNSAwSDRWMjRIMjAuNVYwWiIgZmlsbD0id2hpdGUiLz4KPC9tYXNrPgo8ZyBtYXNrPSJ1cmwoI21hc2swXzEzNDFfMzQpIj4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0xMy44MTMgMS44ODcwOEMxNC42ODUzIDEuODg3MDggMTUuNTAzNSAyLjAwNDAyIDE2LjI2MTIgMi4yMjA4OUMxNS41MTk1IDAuNDkyMjU0IDEzLjk3OTUgMCAxMi4yNjU2IDBDMTAuNTQ4MyAwIDkuMDA1NjUgMC40OTQxODggOC4yNjU2MiAyLjIzMTA3QzkuMDE3NjUgMi4wMDY1NyA5LjgzMjM2IDEuODg3MDggMTAuNzAxNyAxLjg4NzA4SDEzLjgxM1pNMTAuNTAyMiAzLjYyMjU2QzYuMzYwMDMgMy42MjI1NiA0IDYuODgxMTQgNCAxMC45MDA4VjE1LjAzQzQgMTUuNDMyIDQuMzM1NzkgMTUuNzUgNC43NSAxNS43NUgxOS43NUMyMC4xNjQyIDE1Ljc1IDIwLjUgMTUuNDMyIDIwLjUgMTUuMDNWMTAuOTAwOEMyMC41IDYuODgxMTQgMTcuNzU1NiAzLjYyMjU2IDEzLjYxMzUgMy42MjI1NkgxMC41MDIyWk0xMi4yNDQxIDEwLjkzNjVDMTMuNjkzOSAxMC45MzY1IDE0Ljg2OTIgOS43NjEyMyAxNC44NjkyIDguMzExNTNDMTQuODY5MiA2Ljg2MTc4IDEzLjY5MzkgNS42ODY1MyAxMi4yNDQxIDUuNjg2NTNDMTAuNzk0NCA1LjY4NjUzIDkuNjE5MTQgNi44NjE3OCA5LjYxOTE0IDguMzExNTNDOS42MTkxNCA5Ljc2MTIzIDEwLjc5NDQgMTAuOTM2NSAxMi4yNDQxIDEwLjkzNjVaTTQgMTguMTc3MUM0IDE3Ljc3NTEgNC4zMzU3OSAxNy40NDkyIDQuNzUgMTcuNDQ5MkgxOS43NUMyMC4xNjQyIDE3LjQ0OTIgMjAuNSAxNy43NzUxIDIwLjUgMTguMTc3MVYyMi41NDRDMjAuNSAyMy4zNDc5IDE5LjgyODQgMjMuOTk5NyAxOSAyMy45OTk3SDUuNUM0LjY3MTU3IDIzLjk5OTcgNCAyMy4zNDc5IDQgMjIuNTQ0VjE4LjE3NzFaIiBmaWxsPSIjRTMzRTNGIi8+CjwvZz4KPC9zdmc+Cg==";
+export {
+  icon
+};

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

@@ -1,6 +1,7 @@
+import { farcasterWallet } from './farcaster/farcaster.js';
 import { phantomWallet } from './phantom/phantom.js';
 import { glowWallet } from './glow/glow.js';
 import { backpackWallet } from './backpack/backpack.js';
 import { solflareWallet } from './solflare/solflare.js';
-export { phantomWallet, glowWallet, backpackWallet, solflareWallet };
+export { farcasterWallet, phantomWallet, glowWallet, backpackWallet, solflareWallet };
 export declare const allWallets: (() => import("../../types/Wallet.js").Wallet)[];

package/dist/wallets/connectors/index.js

@@ -1,4 +1,5 @@
 "use client";
+import { farcasterWallet } from "./farcaster/farcaster.js";
 import { phantomWallet } from "./phantom/phantom.js";
 import { glowWallet } from "./glow/glow.js";
 import { backpackWallet } from "./backpack/backpack.js";
@@ -7,6 +8,7 @@ const allWallets = [phantomWallet, glowWallet, backpackWallet, solflareWallet];
 export {
   allWallets,
   backpackWallet,
+  farcasterWallet,
   glowWallet,
   phantomWallet,
   solflareWallet

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@getpara/solana-wallet-connectors",
-  "version": "2.0.0-dev.2",
+  "version": "2.0.0-dev.6",
   "dependencies": {
-    "@getpara/react-common": "2.0.0-dev.2",
-    "@getpara/web-sdk": "2.0.0-dev.2",
+    "@getpara/react-common": "2.0.0-dev.6",
+    "@getpara/web-sdk": "2.0.0-dev.6",
     "bs58": "6.0.0"
   },
   "devDependencies": {
@@ -23,9 +23,10 @@
     "dist",
     "package.json"
   ],
-  "gitHead": "77d818539daa181c839a40f0ad5362af4058844e",
+  "gitHead": "c2125e37c73a19f11978031f5aa2eab39b978c56",
   "main": "dist/index.js",
   "peerDependencies": {
+    "@farcaster/mini-app-solana": "^1.0.0",
     "@solana-mobile/wallet-adapter-mobile": "2.x",
     "@solana/wallet-adapter-base": "0.x",
     "@solana/wallet-adapter-react": "0.x",
@@ -33,6 +34,11 @@
     "react": ">=18",
     "react-dom": ">=18"
   },
+  "peerDependenciesMeta": {
+    "@farcaster/mini-app-solana": {
+      "optional": true
+    }
+  },
   "scripts": {
     "build": "rm -rf dist && yarn typegen && node ./scripts/build.mjs",
     "test": "vitest run --coverage",