@phantom/react-sdk 0.0.5 → 0.0.7

package/README.md

@@ -12,7 +12,7 @@ npm install @phantom/react-sdk @phantom/browser-sdk
 
 ```tsx
 import React from "react";
-import { PhantomProvider, useConnect } from "@phantom/react-sdk";
+import { PhantomProvider, useConnect } from "@phantom/react-sdk/solana";
 import { createSolanaPlugin } from "@phantom/browser-sdk/solana";
 
 function App() {
@@ -64,17 +64,6 @@ The `usePhantom` hoo provides access to the phantom instance. With Phantom insta
 
 ## Solana API Reference
 
-### useProvider
-
-The `useProvider` hook provides access to the Solana provider with automatic retry logic and state management.
-
-#### Return Value
-
-The hook returns an object with the following properties:
-
-- `status: 'loading' | 'success' | 'error'` - Current status of the provider
-- `provider: NonNullable<unknown> | null` - The Solana provider instance (null when not available)
-
 ### useConnect (Solana)
 
 The `useConnect` hook provides a function to connect to the Phantom wallet for Solana.
@@ -90,7 +79,7 @@ The hook returns an object with the following property:
 - `connect: () => Promise<ConnectResponse>` - An asynchronous function that initiates the connection process. Returns a promise that resolves with the connection response (e.g., `{ publicKey: string }`) or rejects if connection fails.
 
 ```tsx
-import { useConnect } from "@phantom/react-sdk"; // Or '@phantom/react-sdk/solana' if specific
+import { useConnect } from "@phantom/react-sdk/solana"; // Or '@phantom/react-sdk/solana' if specific
 
 function MyComponent() {
   const { connect } = useConnect({ autoConnect: true });
@@ -118,7 +107,7 @@ The hook returns an object with the following property:
 - `disconnect: () => Promise<void>` - An asynchronous function that initiates the disconnection process. Returns a promise that resolves when disconnection is complete or rejects if disconnection fails.
 
 ```tsx
-import { useDisconnect } from "@phantom/react-sdk"; // Or '@phantom/react-sdk/solana' if specific
+import { useDisconnect } from "@phantom/react-sdk/solana";
 
 function MyComponent() {
   const { disconnect } = useDisconnect();
@@ -137,14 +126,13 @@ function MyComponent() {
 
 ### useAccount
 
-The `useAccount` hook provides access the currently connected account state. It is reactive and changes according to the connected account state.
+The `useAccount` hook provides access the currently connected address
 
 #### Return Value
 
-The hook returns an object with the following properties:
+The hook returns a string with the currently connected address or undefined when account is not connected.
 
-- `status: 'loading' | 'connected' | 'disconnected'` - Current account status
-- `publicKey: string | null` - Current public key of the connected account or null when account is not connected.
+````tsx
 
 ### useSignIn (Solana)
 
@@ -157,7 +145,7 @@ The hook returns an object with the following property:
 - `signIn: (signInData: SolanaSignInData) => Promise<{ address: string; signature: Uint8Array; signedMessage: Uint8Array }>` - An asynchronous function that initiates the sign-in process. `SolanaSignInData` is a type imported from `@phantom/browser-sdk/solana`. Returns a promise that resolves with the `address` (string), `signature` (Uint8Array), and `signedMessage` (Uint8Array), or rejects if the sign-in fails.
 
 ```tsx
-import { useSignIn } from "@phantom/react-sdk"; // Or '@phantom/react-sdk/solana' if specific
+import { useSignIn } from "@phantom/react-sdk/solana";
 import { SolanaSignInData } from "@phantom/browser-sdk/solana"; // This type might be needed from the browser-sdk
 
 function MyComponent() {
@@ -185,7 +173,7 @@ function MyComponent() {
 
   return <button onClick={handleSignInClick}>Sign In with Solana</button>;
 }
-```
+````
 
 ### useSignMessage (Solana)
 
@@ -198,7 +186,7 @@ The hook returns an object with the following property:
 - `signMessage: (message: Uint8Array, display?: 'utf8' | 'hex') => Promise<{ signature: Uint8Array; publicKey: string }>` - An asynchronous function that prompts the user to sign a message. The `message` must be a `Uint8Array`. The optional `display` parameter can be 'utf8' (default) or 'hex' to suggest how the wallet should display the message bytes. Returns a promise that resolves with the `signature` (Uint8Array) and `publicKey` (string) of the signer, or rejects if signing fails.
 
 ```tsx
-import { useSignMessage } from "@phantom/react-sdk"; // Or '@phantom/react-sdk/solana' if specific
+import { useSignMessage } from "@phantom/react-sdk/solana";
 
 function MyComponent() {
   const { signMessage } = useSignMessage();

package/dist/solana/index.d.ts

@@ -1,21 +1,6 @@
-import { PhantomSolanaProvider, SolanaSignInData } from '@phantom/browser-sdk/solana';
+import { SolanaSignInData } from '@phantom/browser-sdk/solana';
 import { Transaction } from '@solana/kit';
-
-type ProviderState = {
-    status: "loading";
-    provider: null;
-} | {
-    status: "success";
-    provider: PhantomSolanaProvider;
-} | {
-    status: "error";
-    provider: null;
-};
-/**
- * Retrieves the Phantom injected provider. If for some reason the provider is not available, it will retry up to 10 times with exponential backoff.
- * @returns Object containing the provider status, provider instance, and any error.
- */
-declare function useProvider(): ProviderState;
+import { VersionedTransaction } from '@solana/web3.js';
 
 type UseConnectProps = {
     autoConnect?: boolean;
@@ -38,7 +23,7 @@ interface UseSignInResult {
 declare function useSignIn(): UseSignInResult;
 
 interface UseSignAndSendTransactionResult {
-    signAndSendTransaction: (transaction: Transaction) => Promise<{
+    signAndSendTransaction: (transaction: Transaction | VersionedTransaction) => Promise<{
         signature: string;
         publicKey?: string;
     }>;
@@ -53,20 +38,13 @@ interface UseSignMessageResult {
 }
 declare function useSignMessage(): UseSignMessageResult;
 
-type UseAccountResult = {
-    status: "connected";
-    address: string;
-} | {
-    status: "disconnected" | "loading";
-    address: null;
-};
 /**
  * React hook that provides the current account connection status and public key.
  * Automatically updates when the account connects, disconnects, or changes.
  *
  * @returns Object containing status ('connected' | 'disconnected') and address (string | null)
  */
-declare function useAccount(): UseAccountResult;
+declare function useAccount(): string | undefined;
 
 type UseAccountEffectParameters = {
     onConnect?(data: {
@@ -83,4 +61,4 @@ type UseAccountEffectParameters = {
  */
 declare function useAccountEffect(parameters?: UseAccountEffectParameters): void;
 
-export { useAccount, useAccountEffect, useConnect, useDisconnect, useProvider, useSignAndSendTransaction, useSignIn, useSignMessage };
+export { useAccount, useAccountEffect, useConnect, useDisconnect, useSignAndSendTransaction, useSignIn, useSignMessage };

package/dist/solana/index.js

@@ -34,7 +34,6 @@ __export(solana_exports, {
   useAccountEffect: () => useAccountEffect,
   useConnect: () => useConnect,
   useDisconnect: () => useDisconnect,
-  useProvider: () => useProvider,
   useSignAndSendTransaction: () => useSignAndSendTransaction,
   useSignIn: () => useSignIn,
   useSignMessage: () => useSignMessage
@@ -42,7 +41,7 @@ __export(solana_exports, {
 module.exports = __toCommonJS(solana_exports);
 var import_solana = require("@phantom/browser-sdk/solana");
 
-// src/solana/useProvider.ts
+// src/solana/useConnect.ts
 var React2 = __toESM(require("react"));
 
 // src/PhantomContext.tsx
@@ -58,84 +57,16 @@ function usePhantom() {
   return context;
 }
 
-// src/solana/useProvider.ts
-var MAX_RETRIES = 10;
-var BASE_DELAY = 100;
-function useProvider() {
-  const { phantom, isReady } = usePhantom();
-  const [state, setState] = React2.useState({
-    status: "loading",
-    provider: null
-  });
-  const tryResolvingProvider = React2.useCallback(() => {
-    if (!phantom) {
-      setState({
-        status: "error",
-        provider: null
-      });
-      return false;
-    }
-    if (!phantom.solana) {
-      setState({
-        status: "error",
-        provider: null
-      });
-      return false;
-    }
-    try {
-      const provider = phantom.solana.getProvider();
-      if (provider != null) {
-        setState({ status: "success", provider });
-        return true;
-      } else {
-        return false;
-      }
-    } catch (error) {
-      return false;
-    }
-  }, [phantom]);
-  React2.useEffect(() => {
-    if (!isReady) {
-      setState({ status: "loading", provider: null });
-      return;
-    }
-    if (tryResolvingProvider()) {
-      return;
-    }
-    let retryCount = 0;
-    const scheduleRetry = () => {
-      const delay = BASE_DELAY * Math.pow(2, Math.min(retryCount, 5));
-      setTimeout(() => {
-        if (tryResolvingProvider()) {
-          return;
-        }
-        retryCount++;
-        if (retryCount >= MAX_RETRIES) {
-          setState({
-            status: "error",
-            provider: null
-          });
-        } else {
-          scheduleRetry();
-        }
-      }, delay);
-    };
-    scheduleRetry();
-  }, [isReady, tryResolvingProvider]);
-  return state;
-}
-
 // src/solana/useConnect.ts
-var React3 = __toESM(require("react"));
 function useConnect({ autoConnect = false } = {}) {
   const { phantom } = usePhantom();
-  const connect = React3.useCallback(async () => {
+  const connect = React2.useCallback(async () => {
     if (!phantom?.solana) {
       throw new Error("Phantom solana plugin not found.");
     }
     return await phantom.solana.connect();
   }, [phantom]);
-  React3.useEffect(() => {
+  React2.useEffect(() => {
     if (autoConnect && phantom?.solana) {
       connect();
     }
@@ -144,10 +75,10 @@ function useConnect({ autoConnect = false } = {}) {
 }
 
 // src/solana/useDisconnect.ts
-var React4 = __toESM(require("react"));
+var React3 = __toESM(require("react"));
 function useDisconnect() {
   const { phantom } = usePhantom();
-  const disconnect = React4.useCallback(async () => {
+  const disconnect = React3.useCallback(async () => {
     if (!phantom?.solana) {
       throw new Error("Phantom solana disconnect method not found.");
     }
@@ -208,7 +139,7 @@ function useSignMessage() {
 }
 
 // src/solana/useAccount.ts
-var React5 = __toESM(require("react"));
+var React4 = __toESM(require("react"));
 
 // src/solana/assertions.ts
 function assertSolanaConfigured(phantom) {
@@ -222,25 +153,15 @@ function assertSolanaConfigured(phantom) {
 // src/solana/useAccount.ts
 function useAccount() {
   const { phantom, isReady } = usePhantom();
-  const { status: providerStatus, provider } = useProvider();
-  const [account, setAccount] = React5.useState(() => {
-    if (!isReady)
-      return { status: "loading", address: null };
-    assertSolanaConfigured(phantom);
-    return phantom.solana.getAccount();
-  });
-  React5.useEffect(() => {
+  const [account, setAccount] = React4.useState(void 0);
+  React4.useEffect(() => {
     if (!isReady)
       return;
     assertSolanaConfigured(phantom);
-    if (providerStatus !== "success" || !provider)
-      return;
-    if (account.status === "loading") {
-      setAccount(phantom.solana.getAccount());
-    }
-    const updateAccount = () => {
-      setAccount(phantom.solana.getAccount());
+    const updateAccount = async () => {
+      setAccount(await phantom.solana.getAccount());
     };
+    updateAccount();
     phantom.solana.addEventListener("connect", updateAccount);
     phantom.solana.addEventListener("disconnect", updateAccount);
     phantom.solana.addEventListener("accountChanged", updateAccount);
@@ -249,18 +170,17 @@ function useAccount() {
       phantom.solana.removeEventListener("disconnect", updateAccount);
       phantom.solana.removeEventListener("accountChanged", updateAccount);
     };
-  }, [provider, phantom, providerStatus, isReady, account.status]);
+  }, [phantom, isReady]);
   return account;
 }
 
 // src/solana/useAccountEffect.ts
-var React6 = __toESM(require("react"));
+var React5 = __toESM(require("react"));
 function useAccountEffect(parameters = {}) {
   const { onConnect, onDisconnect, onAccountChanged } = parameters;
   const { phantom, isReady } = usePhantom();
-  const { status: providerStatus, provider } = useProvider();
-  React6.useEffect(() => {
-    if (!isReady || providerStatus !== "success" || !provider)
+  React5.useEffect(() => {
+    if (!isReady)
       return;
     assertSolanaConfigured(phantom);
     const handleConnect = (publicKey) => {
@@ -296,7 +216,7 @@ function useAccountEffect(parameters = {}) {
         phantom.solana.removeEventListener("accountChanged", handleAccountChanged);
       }
     };
-  }, [isReady, providerStatus, provider, phantom, onConnect, onDisconnect, onAccountChanged]);
+  }, [isReady, phantom, onConnect, onDisconnect, onAccountChanged]);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -304,7 +224,6 @@ function useAccountEffect(parameters = {}) {
   useAccountEffect,
   useConnect,
   useDisconnect,
-  useProvider,
   useSignAndSendTransaction,
   useSignIn,
   useSignMessage

package/dist/solana/index.mjs

@@ -5,85 +5,17 @@ import {
 // src/solana/index.ts
 import "@phantom/browser-sdk/solana";
 
-// src/solana/useProvider.ts
-import * as React from "react";
-var MAX_RETRIES = 10;
-var BASE_DELAY = 100;
-function useProvider() {
-  const { phantom, isReady } = usePhantom();
-  const [state, setState] = React.useState({
-    status: "loading",
-    provider: null
-  });
-  const tryResolvingProvider = React.useCallback(() => {
-    if (!phantom) {
-      setState({
-        status: "error",
-        provider: null
-      });
-      return false;
-    }
-    if (!phantom.solana) {
-      setState({
-        status: "error",
-        provider: null
-      });
-      return false;
-    }
-    try {
-      const provider = phantom.solana.getProvider();
-      if (provider != null) {
-        setState({ status: "success", provider });
-        return true;
-      } else {
-        return false;
-      }
-    } catch (error) {
-      return false;
-    }
-  }, [phantom]);
-  React.useEffect(() => {
-    if (!isReady) {
-      setState({ status: "loading", provider: null });
-      return;
-    }
-    if (tryResolvingProvider()) {
-      return;
-    }
-    let retryCount = 0;
-    const scheduleRetry = () => {
-      const delay = BASE_DELAY * Math.pow(2, Math.min(retryCount, 5));
-      setTimeout(() => {
-        if (tryResolvingProvider()) {
-          return;
-        }
-        retryCount++;
-        if (retryCount >= MAX_RETRIES) {
-          setState({
-            status: "error",
-            provider: null
-          });
-        } else {
-          scheduleRetry();
-        }
-      }, delay);
-    };
-    scheduleRetry();
-  }, [isReady, tryResolvingProvider]);
-  return state;
-}
-
 // src/solana/useConnect.ts
-import * as React2 from "react";
+import * as React from "react";
 function useConnect({ autoConnect = false } = {}) {
   const { phantom } = usePhantom();
-  const connect = React2.useCallback(async () => {
+  const connect = React.useCallback(async () => {
     if (!phantom?.solana) {
       throw new Error("Phantom solana plugin not found.");
     }
     return await phantom.solana.connect();
   }, [phantom]);
-  React2.useEffect(() => {
+  React.useEffect(() => {
     if (autoConnect && phantom?.solana) {
       connect();
     }
@@ -92,10 +24,10 @@ function useConnect({ autoConnect = false } = {}) {
 }
 
 // src/solana/useDisconnect.ts
-import * as React3 from "react";
+import * as React2 from "react";
 function useDisconnect() {
   const { phantom } = usePhantom();
-  const disconnect = React3.useCallback(async () => {
+  const disconnect = React2.useCallback(async () => {
     if (!phantom?.solana) {
       throw new Error("Phantom solana disconnect method not found.");
     }
@@ -105,10 +37,10 @@ function useDisconnect() {
 }
 
 // src/solana/useSignIn.ts
-import { useCallback as useCallback4 } from "react";
+import { useCallback as useCallback3 } from "react";
 function useSignIn() {
   const { phantom } = usePhantom();
-  const signIn = useCallback4(
+  const signIn = useCallback3(
     async (signInData) => {
       if (!phantom?.solana) {
         throw new Error("Phantom Solana provider not available.");
@@ -122,10 +54,10 @@ function useSignIn() {
 }
 
 // src/solana/useSignAndSendTransaction.ts
-import { useCallback as useCallback5 } from "react";
+import { useCallback as useCallback4 } from "react";
 function useSignAndSendTransaction() {
   const { phantom } = usePhantom();
-  const signAndSendTransaction = useCallback5(
+  const signAndSendTransaction = useCallback4(
     async (transaction) => {
       if (!phantom?.solana) {
         throw new Error("Phantom Solana provider not available.");
@@ -139,10 +71,10 @@ function useSignAndSendTransaction() {
 }
 
 // src/solana/useSignMessage.ts
-import { useCallback as useCallback6 } from "react";
+import { useCallback as useCallback5 } from "react";
 function useSignMessage() {
   const { phantom } = usePhantom();
-  const signMessage = useCallback6(
+  const signMessage = useCallback5(
     async (message, display) => {
       if (!phantom?.solana) {
         throw new Error("Phantom Solana provider not available.");
@@ -156,7 +88,7 @@ function useSignMessage() {
 }
 
 // src/solana/useAccount.ts
-import * as React4 from "react";
+import * as React3 from "react";
 
 // src/solana/assertions.ts
 function assertSolanaConfigured(phantom) {
@@ -170,25 +102,15 @@ function assertSolanaConfigured(phantom) {
 // src/solana/useAccount.ts
 function useAccount() {
   const { phantom, isReady } = usePhantom();
-  const { status: providerStatus, provider } = useProvider();
-  const [account, setAccount] = React4.useState(() => {
-    if (!isReady)
-      return { status: "loading", address: null };
-    assertSolanaConfigured(phantom);
-    return phantom.solana.getAccount();
-  });
-  React4.useEffect(() => {
+  const [account, setAccount] = React3.useState(void 0);
+  React3.useEffect(() => {
     if (!isReady)
       return;
     assertSolanaConfigured(phantom);
-    if (providerStatus !== "success" || !provider)
-      return;
-    if (account.status === "loading") {
-      setAccount(phantom.solana.getAccount());
-    }
-    const updateAccount = () => {
-      setAccount(phantom.solana.getAccount());
+    const updateAccount = async () => {
+      setAccount(await phantom.solana.getAccount());
     };
+    updateAccount();
     phantom.solana.addEventListener("connect", updateAccount);
     phantom.solana.addEventListener("disconnect", updateAccount);
     phantom.solana.addEventListener("accountChanged", updateAccount);
@@ -197,18 +119,17 @@ function useAccount() {
       phantom.solana.removeEventListener("disconnect", updateAccount);
       phantom.solana.removeEventListener("accountChanged", updateAccount);
     };
-  }, [provider, phantom, providerStatus, isReady, account.status]);
+  }, [phantom, isReady]);
   return account;
 }
 
 // src/solana/useAccountEffect.ts
-import * as React5 from "react";
+import * as React4 from "react";
 function useAccountEffect(parameters = {}) {
   const { onConnect, onDisconnect, onAccountChanged } = parameters;
   const { phantom, isReady } = usePhantom();
-  const { status: providerStatus, provider } = useProvider();
-  React5.useEffect(() => {
-    if (!isReady || providerStatus !== "success" || !provider)
+  React4.useEffect(() => {
+    if (!isReady)
       return;
     assertSolanaConfigured(phantom);
     const handleConnect = (publicKey) => {
@@ -244,14 +165,13 @@ function useAccountEffect(parameters = {}) {
         phantom.solana.removeEventListener("accountChanged", handleAccountChanged);
       }
     };
-  }, [isReady, providerStatus, provider, phantom, onConnect, onDisconnect, onAccountChanged]);
+  }, [isReady, phantom, onConnect, onDisconnect, onAccountChanged]);
 }
 export {
   useAccount,
   useAccountEffect,
   useConnect,
   useDisconnect,
-  useProvider,
   useSignAndSendTransaction,
   useSignIn,
   useSignMessage

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phantom/react-sdk",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
@@ -21,13 +21,15 @@
   ],
   "license": "MIT",
   "scripts": {
-    "build": "rm -rf dist && tsup src/index.ts src/solana/index.ts --format cjs,esm --dts",
-    "dev": "rm -rf dist && tsup src/index.ts src/solana/index.ts --format cjs,esm --dts --watch",
+    "build": "rimraf ./dist && tsup src/index.ts src/solana/index.ts --format cjs,esm --dts",
+    "?pack-release": "When https://github.com/changesets/changesets/issues/432 has a solution we can remove this trick",
+    "pack-release": "rimraf ./_release && yarn pack && mkdir ./_release && tar zxvf ./package.tgz --directory ./_release && rm ./package.tgz",
+    "dev": "rimraf ./dist && tsup src/index.ts src/solana/index.ts --format cjs,esm --dts --watch",
     "lint": "tsc --noEmit && eslint --cache . --ext .ts,.tsx",
     "test": "jest"
   },
   "dependencies": {
-    "@phantom/browser-sdk": "workspace:^"
+    "@phantom/browser-sdk": "^0.0.7"
   },
   "devDependencies": {
     "@testing-library/dom": "^10.4.0",
@@ -40,11 +42,15 @@
     "jest-environment-jsdom": "^29.7.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",
+    "rimraf": "^6.0.1",
     "ts-jest": "^29",
     "tsup": "^6.7.0",
     "typescript": "^5.0.4"
   },
   "peerDependencies": {
     "react": ">=18.0.0"
+  },
+  "publishConfig": {
+    "directory": "_release/package"
   }
-}
+}