@phantom/react-native-sdk 1.0.0-beta.1 → 1.0.0-beta.11

package/README.md

@@ -89,12 +89,9 @@ export default function App() {
   return (
     <PhantomProvider
       config={{
-        appId: "your-app-id",
+        appId: "your-app-id", // Get your app ID from phantom.com/portal
         scheme: "mywalletapp", // Must match app.json scheme
-        embeddedWalletType: "user-wallet",
         addressTypes: [AddressType.solana],
-        apiBaseUrl: "https://api.phantom.app/v1/wallets",
-        solanaProvider: "web3js",
         authOptions: {
           redirectUrl: "mywalletapp://phantom-auth-callback",
         },
@@ -117,8 +114,8 @@ import { useConnect, useAccounts, useSolana, useEthereum, useDisconnect } from "
 export function WalletScreen() {
   const { connect, isConnecting, error: connectError } = useConnect();
   const { addresses, isConnected } = useAccounts();
-  const solana = useSolana();
-  const ethereum = useEthereum();
+  const { solana } = useSolana();
+  const { ethereum } = useEthereum();
   const { disconnect } = useDisconnect();
 
   const handleConnect = async () => {
@@ -132,8 +129,10 @@ export function WalletScreen() {
 
   const handleSignSolanaMessage = async () => {
     try {
-      const signature = await solana.signMessage("Hello from Solana!");
-      Alert.alert("Solana Signed!", `Signature: ${signature.signature.slice(0, 10)}...`);
+      if (solana.isAvailable) {
+        const signature = await solana.solana.signMessage("Hello from Solana!");
+        Alert.alert("Solana Signed!", `Signature: ${signature.signature.slice(0, 10)}...`);
+      }
     } catch (error) {
       Alert.alert("Error", `Failed to sign: ${error.message}`);
     }
@@ -141,9 +140,11 @@ export function WalletScreen() {
 
   const handleSignEthereumMessage = async () => {
     try {
-      const accounts = await ethereum.getAccounts();
-      const signature = await ethereum.signPersonalMessage("Hello from Ethereum!", accounts[0]);
-      Alert.alert("Ethereum Signed!", `Signature: ${signature.signature.slice(0, 10)}...`);
+      if (ethereum.isAvailable) {
+        const accounts = await ethereum.ethereum.getAccounts();
+        const signature = await ethereum.ethereum.signPersonalMessage("Hello from Ethereum!", accounts[0]);
+        Alert.alert("Ethereum Signed!", `Signature: ${signature.slice(0, 10)}...`);
+      }
     } catch (error) {
       Alert.alert("Error", `Failed to sign: ${error.message}`);
     }
@@ -198,15 +199,17 @@ The main provider component that initializes the SDK and provides context to all
 ```typescript
 interface PhantomSDKConfig {
   scheme: string; // Custom URL scheme for your app
-  embeddedWalletType: "user-wallet" | "app-wallet";
+  appId: string; // Your app ID from phantom.com/portal (required)
   addressTypes: [AddressType, ...AddressType[]]; // e.g., [AddressType.solana]
-  apiBaseUrl: string; // e.g., "https://api.phantom.app/v1/wallets"
-  solanaProvider: "web3js" | "kit"; // Solana provider to use
+  
+  // Optional configuration
+  embeddedWalletType?: "user-wallet"; // optional, defaults to "user-wallet", currently the only supported type
+  apiBaseUrl?: string; // e.g., "https://api.phantom.app/v1/wallets" (optional, has default)
   authOptions?: {
     authUrl?: string; // Custom auth URL (optional)
     redirectUrl?: string; // Custom redirect URL (optional)
   };
-  autoConnect?: boolean; // Auto-connect to existing session on SDK instantiation (default: true)
+  autoConnect?: boolean; // Auto-connect to existing session on SDK instantiation (optional, defaults to true)
 }
 ```
 
@@ -242,13 +245,18 @@ const {
 Provides access to Solana-specific operations.
 
 ```typescript
-const solana = useSolana();
+const { solana, isAvailable } = useSolana();
 
-// Sign a message
-const signature = await solana.signMessage("Hello Solana!");
+if (isAvailable) {
+  // Sign a message
+  const signature = await solana.signMessage("Hello Solana!");
 
-// Sign and send a transaction
-const result = await solana.signAndSendTransaction(transaction);
+  // Sign a transaction (without sending)
+  const signedTx = await solana.signTransaction(transaction);
+
+  // Sign and send a transaction
+  const result = await solana.signAndSendTransaction(transaction);
+}
 ```
 
 #### useEthereum
@@ -256,19 +264,24 @@ const result = await solana.signAndSendTransaction(transaction);
 Provides access to Ethereum-specific operations.
 
 ```typescript
-const ethereum = useEthereum();
+const { ethereum, isAvailable } = useEthereum();
+
+if (isAvailable) {
+  // Get accounts
+  const accounts = await ethereum.getAccounts();
 
-// Get accounts
-const accounts = await ethereum.getAccounts();
+  // Sign a personal message
+  const signature = await ethereum.signPersonalMessage("Hello Ethereum!", accounts[0]);
 
-// Sign a personal message
-const signature = await ethereum.signPersonalMessage("Hello Ethereum!", accounts[0]);
+  // Sign a transaction (without sending)
+  const signedTx = await ethereum.signTransaction(transactionData);
 
-// Send a transaction
-const result = await ethereum.sendTransaction(transactionData);
+  // Sign and send a transaction  
+  const result = await ethereum.sendTransaction(transactionData);
 
-// Get current chain ID
-const chainId = await ethereum.getChainId();
+  // Get current chain ID
+  const chainId = await ethereum.getChainId();
+}
 ```
 
 #### useDisconnect
@@ -330,11 +343,9 @@ import { PhantomProvider, AddressType } from "@phantom/react-native-sdk";
 
 <PhantomProvider
   config={{
-    appId: "app_123456789",
+    appId: "your-app-id",
     scheme: "myapp",
-    embeddedWalletType: "user-wallet",
     addressTypes: [AddressType.solana],
-    apiBaseUrl: "https://api.phantom.app/v1/wallets",
   }}
 >
   <App />
@@ -348,14 +359,10 @@ import { PhantomProvider, AddressType } from "@phantom/react-native-sdk";
 
 <PhantomProvider
   config={{
-    appId: "app_123456789",
+    appId: "your-app-id",
     scheme: "mycompany-wallet",
-    embeddedWalletType: "user-wallet",
     addressTypes: [AddressType.solana, AddressType.ethereum],
-    apiBaseUrl: "https://api.phantom.app/v1/wallets",
-    solanaProvider: "web3js",
     authOptions: {
-      authUrl: "https://connect.phantom.app",
       redirectUrl: "mycompany-wallet://auth/success",
     },
   }}
@@ -389,13 +396,9 @@ import { PhantomProvider, AddressType } from '@phantom/react-native-sdk';
 const testConfig = {
   appId: "test-app",
   scheme: "testapp",
-  embeddedWalletType: "app-wallet" as const,
   addressTypes: [AddressType.solana],
-  apiBaseUrl: "https://api.phantom.app/v1/wallets",
-
 };
 
-// Use app-wallet for testing (no OAuth required)
 <PhantomProvider config={testConfig}>
   <TestApp />
 </PhantomProvider>
@@ -420,7 +423,7 @@ adb shell am start -W -a android.intent.action.VIEW -d "myapp://phantom-auth-cal
    - Check `app.json` (Expo) or platform-specific configuration
 
 2. **"Authentication failed"**
-   - Verify your organization ID is correct
+   - Verify your app ID is correct
    - Check network connectivity
    - Ensure redirect URL matches your scheme
 
@@ -444,6 +447,7 @@ import { PhantomProvider, type PhantomSDKConfig, type PhantomDebugConfig } from
 function App() {
   // SDK configuration - static, won't change when debug settings change
   const config: PhantomSDKConfig = {
+    appId: "your-app-id",
     scheme: "mywalletapp",
     // ... other config
   };

package/dist/index.d.ts

@@ -3,7 +3,7 @@ import { ReactNode } from 'react';
 import * as _phantom_embedded_provider_core from '@phantom/embedded-provider-core';
 import { EmbeddedProviderConfig, EmbeddedProvider, WalletAddress, ConnectResult } from '@phantom/embedded-provider-core';
 export { ConnectResult, SignAndSendTransactionParams, SignMessageParams, SignMessageResult, SignedTransaction, WalletAddress } from '@phantom/embedded-provider-core';
-import { ISolanaChain, IEthereumChain, EthTransactionRequest } from '@phantom/chains';
+import { ISolanaChain, IEthereumChain } from '@phantom/chain-interfaces';
 export { AddressType } from '@phantom/client';
 export { NetworkId } from '@phantom/constants';
 
@@ -11,11 +11,19 @@ interface PhantomDebugConfig {
     /** Enable debug logging */
     enabled?: boolean;
 }
-interface PhantomSDKConfig extends EmbeddedProviderConfig {
+interface PhantomSDKConfig extends Omit<EmbeddedProviderConfig, "apiBaseUrl" | "embeddedWalletType" | "authOptions"> {
     /** Custom URL scheme for your app (e.g., "myapp") */
     scheme: string;
     /** Enable auto-connect to existing sessions (default: true) */
     autoConnect?: boolean;
+    /** Base URL for Phantom API (default: "https://api.phantom.app/v1/wallets") */
+    apiBaseUrl?: string;
+    /** Authentication options */
+    embeddedWalletType?: "app-wallet" | "user-wallet";
+    authOptions?: {
+        authUrl?: string;
+        redirectUrl?: string;
+    };
 }
 interface ConnectOptions {
     /** OAuth provider to use */
@@ -27,7 +35,7 @@ interface ConnectOptions {
 }
 
 interface PhantomContextValue {
-    sdk: EmbeddedProvider | null;
+    sdk: EmbeddedProvider;
     isConnected: boolean;
     isConnecting: boolean;
     connectError: Error | null;
@@ -64,50 +72,21 @@ declare function useAccounts(): {
 /**
  * Hook for Solana chain operations in React Native
  *
- * @returns Solana chain interface and convenient methods
+ * @returns Solana chain interface with connection enforcement
  */
 declare function useSolana(): {
-    solana: ISolanaChain | null;
-    signMessage: (message: string | Uint8Array) => Promise<{
-        signature: Uint8Array;
-        publicKey: string;
-    }>;
-    signTransaction: <T>(transaction: T) => Promise<T>;
-    signAndSendTransaction: <T>(transaction: T) => Promise<{
-        signature: string;
-    }>;
-    connect: (options?: {
-        onlyIfTrusted?: boolean;
-    }) => Promise<{
-        publicKey: string;
-    }>;
-    disconnect: () => Promise<void>;
-    switchNetwork: (network: "mainnet" | "devnet") => Promise<void | undefined>;
-    getPublicKey: () => Promise<string | null>;
+    solana: ISolanaChain;
     isAvailable: boolean;
-    isConnected: boolean;
 };
 
 /**
  * Hook for Ethereum chain operations in React Native
  *
- * @returns Ethereum chain interface and convenient methods
+ * @returns Ethereum chain interface with connection enforcement
  */
 declare function useEthereum(): {
-    ethereum: IEthereumChain | null;
-    request: <T = any>(args: {
-        method: string;
-        params?: unknown[];
-    }) => Promise<T>;
-    signPersonalMessage: (message: string, address: string) => Promise<string>;
-    signMessage: (message: string) => Promise<string>;
-    signTypedData: (typedData: any) => Promise<string>;
-    sendTransaction: (transaction: EthTransactionRequest) => Promise<string>;
-    switchChain: (chainId: number) => Promise<void>;
-    getChainId: () => Promise<number>;
-    getAccounts: () => Promise<string[]>;
+    ethereum: IEthereumChain;
     isAvailable: boolean;
-    isConnected: boolean;
 };
 
 export { ConnectOptions, PhantomDebugConfig, PhantomProvider, PhantomSDKConfig, useAccounts, useConnect, useDisconnect, useEthereum, usePhantom, useSolana };

package/dist/index.js

@@ -31,7 +31,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var src_exports = {};
 __export(src_exports, {
   AddressType: () => import_client.AddressType,
-  NetworkId: () => import_constants.NetworkId,
+  NetworkId: () => import_constants3.NetworkId,
   PhantomProvider: () => PhantomProvider,
   useAccounts: () => useAccounts,
   useConnect: () => useConnect,
@@ -45,6 +45,7 @@ module.exports = __toCommonJS(src_exports);
 // src/PhantomProvider.tsx
 var import_react = require("react");
 var import_embedded_provider_core = require("@phantom/embedded-provider-core");
+var import_constants2 = require("@phantom/constants");
 
 // src/providers/embedded/storage.ts
 var SecureStore = __toESM(require("expo-secure-store"));
@@ -96,29 +97,29 @@ var ExpoSecureStorage = class {
 
 // src/providers/embedded/auth.ts
 var WebBrowser = __toESM(require("expo-web-browser"));
-var DEFAULT_AUTH_URL = "https://auth.phantom.app";
+var import_constants = require("@phantom/constants");
 var ExpoAuthProvider = class {
   async authenticate(options) {
     if ("jwtToken" in options) {
       return;
     }
     const phantomOptions = options;
-    const { authUrl, redirectUrl, organizationId, parentOrganizationId, sessionId, provider, customAuthData, appId } = phantomOptions;
+    const { authUrl, redirectUrl, publicKey, sessionId, provider, customAuthData, appId } = phantomOptions;
     if (!redirectUrl) {
       throw new Error("redirectUrl is required for web browser authentication");
     }
-    if (!organizationId || !sessionId || !appId) {
-      throw new Error("organizationId, sessionId and appId are required for authentication");
+    if (!publicKey || !sessionId || !appId) {
+      throw new Error("publicKey, sessionId and appId are required for authentication");
     }
     try {
-      const baseUrl = authUrl || DEFAULT_AUTH_URL;
+      const baseUrl = authUrl || import_constants.DEFAULT_AUTH_URL;
       const params = new URLSearchParams({
-        organization_id: organizationId,
-        parent_organization_id: parentOrganizationId,
+        public_key: publicKey,
         app_id: appId,
         redirect_uri: redirectUrl,
         session_id: sessionId,
-        clear_previous_session: "true"
+        clear_previous_session: "true",
+        sdk_version: "1.0.0-beta.11"
       });
       if (provider) {
         console.log("[ExpoAuthProvider] Provider specified, will skip selection", { provider });
@@ -135,8 +136,7 @@ var ExpoAuthProvider = class {
       console.log("[ExpoAuthProvider] Starting authentication", {
         baseUrl,
         redirectUrl,
-        organizationId,
-        parentOrganizationId,
+        publicKey,
         sessionId,
         provider,
         hasCustomData: !!customAuthData
@@ -153,15 +153,30 @@ var ExpoAuthProvider = class {
       if (result.type === "success" && result.url) {
         const url = new URL(result.url);
         const walletId = url.searchParams.get("wallet_id");
+        const organizationId = url.searchParams.get("organization_id");
         const provider2 = url.searchParams.get("provider");
         const accountDerivationIndex = url.searchParams.get("selected_account_index");
+        const expiresInMs = url.searchParams.get("expires_in_ms");
         if (!walletId) {
           throw new Error("Authentication failed: no walletId in redirect URL");
         }
+        if (!organizationId) {
+          console.error("[ExpoAuthProvider] Missing organizationId in redirect URL", { url: result.url });
+          throw new Error("Authentication failed: no organizationId in redirect URL");
+        }
+        console.log("[ExpoAuthProvider] Auth redirect parameters", {
+          walletId,
+          organizationId,
+          provider: provider2,
+          accountDerivationIndex,
+          expiresInMs
+        });
         return {
           walletId,
+          organizationId,
           provider: provider2 || void 0,
-          accountDerivationIndex: accountDerivationIndex ? parseInt(accountDerivationIndex) : void 0
+          accountDerivationIndex: accountDerivationIndex ? parseInt(accountDerivationIndex) : 0,
+          expiresInMs: expiresInMs ? parseInt(expiresInMs) : 0
         };
       } else if (result.type === "cancel") {
         throw new Error("User cancelled authentication");
@@ -262,7 +277,7 @@ var ReactNativeStamper = class {
     this.algorithm = import_sdk_types.Algorithm.ed25519;
     this.type = "PKI";
     this.keyPrefix = config.keyPrefix || "phantom-rn-stamper";
-    this.organizationId = config.organizationId || "default";
+    this.appId = config.appId || "default";
   }
   /**
    * Initialize the stamper and generate/load cryptographic keys
@@ -415,10 +430,10 @@ var ReactNativeStamper = class {
     return null;
   }
   getActiveKeyName() {
-    return `${this.keyPrefix}-${this.organizationId}-active`;
+    return `${this.keyPrefix}-${this.appId}-active`;
   }
   getPendingKeyName() {
-    return `${this.keyPrefix}-${this.organizationId}-pending`;
+    return `${this.keyPrefix}-${this.appId}-pending`;
   }
 };
 
@@ -459,34 +474,48 @@ function PhantomProvider({ children, config, debugConfig }) {
   const [connectError, setConnectError] = (0, import_react.useState)(null);
   const [addresses, setAddresses] = (0, import_react.useState)([]);
   const [walletId, setWalletId] = (0, import_react.useState)(null);
-  const [sdk, setSdk] = (0, import_react.useState)(null);
   const memoizedConfig = (0, import_react.useMemo)(() => {
     const redirectUrl = config.authOptions?.redirectUrl || `${config.scheme}://phantom-auth-callback`;
     return {
       ...config,
+      apiBaseUrl: config.apiBaseUrl || import_constants2.DEFAULT_WALLET_API_URL,
+      embeddedWalletType: config.embeddedWalletType || import_constants2.DEFAULT_EMBEDDED_WALLET_TYPE,
       authOptions: {
         ...config.authOptions || {},
-        redirectUrl
+        redirectUrl,
+        authUrl: config.authOptions?.authUrl || import_constants2.DEFAULT_AUTH_URL
       }
     };
   }, [config]);
-  (0, import_react.useEffect)(() => {
+  const sdk = (0, import_react.useMemo)(() => {
     const storage = new ExpoSecureStorage();
     const authProvider = new ExpoAuthProvider();
     const urlParamsAccessor = new ExpoURLParamsAccessor();
     const logger = new ExpoLogger(debugConfig?.enabled || false);
     const stamper = new ReactNativeStamper({
-      keyPrefix: `phantom-rn-${memoizedConfig.organizationId}`,
-      organizationId: memoizedConfig.organizationId
+      keyPrefix: `phantom-rn-${memoizedConfig.appId}`,
+      appId: memoizedConfig.appId
     });
+    const platformName = `${import_react_native2.Platform.OS}-${import_react_native2.Platform.Version}`;
     const platform = {
       storage,
       authProvider,
       urlParamsAccessor,
       stamper,
-      name: `${import_react_native2.Platform.OS}-${import_react_native2.Platform.Version}`
+      name: platformName,
+      analyticsHeaders: {
+        [import_constants2.ANALYTICS_HEADERS.SDK_TYPE]: "react-native",
+        [import_constants2.ANALYTICS_HEADERS.PLATFORM]: import_react_native2.Platform.OS,
+        [import_constants2.ANALYTICS_HEADERS.PLATFORM_VERSION]: `${import_react_native2.Platform.Version}`,
+        [import_constants2.ANALYTICS_HEADERS.APP_ID]: config.appId,
+        [import_constants2.ANALYTICS_HEADERS.WALLET_TYPE]: config.embeddedWalletType,
+        [import_constants2.ANALYTICS_HEADERS.SDK_VERSION]: "1.0.0-beta.11"
+        // Replaced at build time
+      }
     };
-    const sdkInstance = new import_embedded_provider_core.EmbeddedProvider(memoizedConfig, platform, logger);
+    return new import_embedded_provider_core.EmbeddedProvider(memoizedConfig, platform, logger);
+  }, [memoizedConfig, debugConfig, config.appId, config.embeddedWalletType]);
+  (0, import_react.useEffect)(() => {
     const handleConnectStart = () => {
       setIsConnecting(true);
       setConnectError(null);
@@ -495,12 +524,12 @@ function PhantomProvider({ children, config, debugConfig }) {
       try {
         setIsConnected(true);
         setIsConnecting(false);
-        const addrs = await sdkInstance.getAddresses();
+        const addrs = await sdk.getAddresses();
         setAddresses(addrs);
       } catch (err) {
         console.error("Error connecting:", err);
         try {
-          await sdkInstance.disconnect();
+          await sdk.disconnect();
         } catch (err2) {
           console.error("Error disconnecting:", err2);
         }
@@ -517,21 +546,18 @@ function PhantomProvider({ children, config, debugConfig }) {
       setAddresses([]);
       setWalletId(null);
     };
-    sdkInstance.on("connect_start", handleConnectStart);
-    sdkInstance.on("connect", handleConnect);
-    sdkInstance.on("connect_error", handleConnectError);
-    sdkInstance.on("disconnect", handleDisconnect);
-    setSdk(sdkInstance);
+    sdk.on("connect_start", handleConnectStart);
+    sdk.on("connect", handleConnect);
+    sdk.on("connect_error", handleConnectError);
+    sdk.on("disconnect", handleDisconnect);
     return () => {
-      sdkInstance.off("connect_start", handleConnectStart);
-      sdkInstance.off("connect", handleConnect);
-      sdkInstance.off("connect_error", handleConnectError);
-      sdkInstance.off("disconnect", handleDisconnect);
+      sdk.off("connect_start", handleConnectStart);
+      sdk.off("connect", handleConnect);
+      sdk.off("connect_error", handleConnectError);
+      sdk.off("disconnect", handleDisconnect);
     };
-  }, [memoizedConfig, debugConfig]);
+  }, [sdk]);
   (0, import_react.useEffect)(() => {
-    if (!sdk)
-      return;
     if (config.autoConnect !== false) {
       sdk.autoConnect().catch(() => {
       });
@@ -628,181 +654,30 @@ function useAccounts() {
 }
 
 // src/hooks/useSolana.ts
-var import_react4 = require("react");
 function useSolana() {
   const { sdk, isConnected } = usePhantom();
-  const solanaChain = (0, import_react4.useMemo)(() => {
-    if (!sdk || !isConnected)
-      return null;
-    try {
-      return sdk.solana;
-    } catch {
-      return null;
-    }
-  }, [sdk, isConnected]);
-  const signMessage = (0, import_react4.useCallback)(
-    async (message) => {
-      if (!solanaChain)
-        throw new Error("Solana chain not available. Ensure SDK is connected.");
-      return await solanaChain.signMessage(message);
-    },
-    [solanaChain]
-  );
-  const signTransaction = (0, import_react4.useCallback)(
-    async (transaction) => {
-      if (!solanaChain)
-        throw new Error("Solana chain not available. Ensure SDK is connected.");
-      return await solanaChain.signTransaction(transaction);
-    },
-    [solanaChain]
-  );
-  const signAndSendTransaction = (0, import_react4.useCallback)(
-    async (transaction) => {
-      if (!solanaChain)
-        throw new Error("Solana chain not available. Ensure SDK is connected.");
-      return await solanaChain.signAndSendTransaction(transaction);
-    },
-    [solanaChain]
-  );
-  const connect = (0, import_react4.useCallback)(
-    async (options) => {
-      if (!solanaChain)
-        throw new Error("Solana chain not available. Ensure SDK is connected.");
-      return await solanaChain.connect(options);
-    },
-    [solanaChain]
-  );
-  const disconnect = (0, import_react4.useCallback)(async () => {
-    if (!solanaChain)
-      throw new Error("Solana chain not available. Ensure SDK is connected.");
-    return await solanaChain.disconnect();
-  }, [solanaChain]);
-  const switchNetwork = (0, import_react4.useCallback)(
-    async (network) => {
-      if (!solanaChain)
-        throw new Error("Solana chain not available. Ensure SDK is connected.");
-      return await solanaChain.switchNetwork?.(network);
-    },
-    [solanaChain]
-  );
-  const getPublicKey = (0, import_react4.useCallback)(async () => {
-    if (!solanaChain)
-      return null;
-    return await solanaChain.getPublicKey();
-  }, [solanaChain]);
   return {
-    // Chain instance for advanced usage
-    solana: solanaChain,
-    // Convenient methods
-    signMessage,
-    signTransaction,
-    signAndSendTransaction,
-    connect,
-    disconnect,
-    switchNetwork,
-    getPublicKey,
+    // Chain instance with connection enforcement for signing methods
+    solana: sdk.solana,
     // State
-    isAvailable: !!solanaChain,
-    isConnected: solanaChain?.isConnected() ?? false
+    isAvailable: !!isConnected
   };
 }
 
 // src/hooks/useEthereum.ts
-var import_react5 = require("react");
 function useEthereum() {
   const { sdk, isConnected } = usePhantom();
-  const ethereumChain = (0, import_react5.useMemo)(() => {
-    if (!sdk || !isConnected)
-      return null;
-    try {
-      return sdk.ethereum;
-    } catch {
-      return null;
-    }
-  }, [sdk, isConnected]);
-  const request = (0, import_react5.useCallback)(
-    async (args) => {
-      if (!ethereumChain)
-        throw new Error("Ethereum chain not available. Ensure SDK is connected.");
-      return await ethereumChain.request(args);
-    },
-    [ethereumChain]
-  );
-  const signPersonalMessage = (0, import_react5.useCallback)(
-    async (message, address) => {
-      if (!ethereumChain)
-        throw new Error("Ethereum chain not available. Ensure SDK is connected.");
-      return await ethereumChain.signPersonalMessage(message, address);
-    },
-    [ethereumChain]
-  );
-  const sendTransaction = (0, import_react5.useCallback)(
-    async (transaction) => {
-      if (!ethereumChain)
-        throw new Error("Ethereum chain not available. Ensure SDK is connected.");
-      return await ethereumChain.sendTransaction(transaction);
-    },
-    [ethereumChain]
-  );
-  const switchChain = (0, import_react5.useCallback)(
-    async (chainId) => {
-      if (!ethereumChain)
-        throw new Error("Ethereum chain not available. Ensure SDK is connected.");
-      return await ethereumChain.switchChain(chainId);
-    },
-    [ethereumChain]
-  );
-  const getChainId = (0, import_react5.useCallback)(async () => {
-    if (!ethereumChain)
-      throw new Error("Ethereum chain not available. Ensure SDK is connected.");
-    return await ethereumChain.getChainId();
-  }, [ethereumChain]);
-  const getAccounts = (0, import_react5.useCallback)(async () => {
-    if (!ethereumChain)
-      throw new Error("Ethereum chain not available. Ensure SDK is connected.");
-    return await ethereumChain.getAccounts();
-  }, [ethereumChain]);
-  const signMessage = (0, import_react5.useCallback)(
-    async (message) => {
-      const accounts = await getAccounts();
-      return await request({
-        method: "eth_sign",
-        params: [accounts[0], message]
-      });
-    },
-    [request, getAccounts]
-  );
-  const signTypedData = (0, import_react5.useCallback)(
-    async (typedData) => {
-      if (!ethereumChain)
-        throw new Error("Ethereum chain not available. Ensure SDK is connected.");
-      const accounts = await getAccounts();
-      return await ethereumChain.signTypedData(typedData, accounts[0]);
-    },
-    [ethereumChain, getAccounts]
-  );
   return {
-    // Chain instance for advanced usage
-    ethereum: ethereumChain,
-    // Standard EIP-1193 interface
-    request,
-    // Convenient methods
-    signPersonalMessage,
-    signMessage,
-    signTypedData,
-    sendTransaction,
-    switchChain,
-    getChainId,
-    getAccounts,
+    // Chain instance with connection enforcement for signing methods
+    ethereum: sdk.ethereum,
     // State
-    isAvailable: !!ethereumChain,
-    isConnected: ethereumChain?.isConnected() ?? false
+    isAvailable: !!isConnected
   };
 }
 
 // src/index.ts
 var import_client = require("@phantom/client");
-var import_constants = require("@phantom/constants");
+var import_constants3 = require("@phantom/constants");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AddressType,

package/dist/index.mjs

@@ -1,6 +1,7 @@
 // src/PhantomProvider.tsx
 import { createContext, useContext, useState, useEffect, useMemo } from "react";
 import { EmbeddedProvider } from "@phantom/embedded-provider-core";
+import { ANALYTICS_HEADERS, DEFAULT_WALLET_API_URL, DEFAULT_EMBEDDED_WALLET_TYPE, DEFAULT_AUTH_URL as DEFAULT_AUTH_URL2 } from "@phantom/constants";
 
 // src/providers/embedded/storage.ts
 import * as SecureStore from "expo-secure-store";
@@ -52,29 +53,29 @@ var ExpoSecureStorage = class {
 
 // src/providers/embedded/auth.ts
 import * as WebBrowser from "expo-web-browser";
-var DEFAULT_AUTH_URL = "https://auth.phantom.app";
+import { DEFAULT_AUTH_URL } from "@phantom/constants";
 var ExpoAuthProvider = class {
   async authenticate(options) {
     if ("jwtToken" in options) {
       return;
     }
     const phantomOptions = options;
-    const { authUrl, redirectUrl, organizationId, parentOrganizationId, sessionId, provider, customAuthData, appId } = phantomOptions;
+    const { authUrl, redirectUrl, publicKey, sessionId, provider, customAuthData, appId } = phantomOptions;
     if (!redirectUrl) {
       throw new Error("redirectUrl is required for web browser authentication");
     }
-    if (!organizationId || !sessionId || !appId) {
-      throw new Error("organizationId, sessionId and appId are required for authentication");
+    if (!publicKey || !sessionId || !appId) {
+      throw new Error("publicKey, sessionId and appId are required for authentication");
     }
     try {
       const baseUrl = authUrl || DEFAULT_AUTH_URL;
       const params = new URLSearchParams({
-        organization_id: organizationId,
-        parent_organization_id: parentOrganizationId,
+        public_key: publicKey,
         app_id: appId,
         redirect_uri: redirectUrl,
         session_id: sessionId,
-        clear_previous_session: "true"
+        clear_previous_session: "true",
+        sdk_version: "1.0.0-beta.11"
       });
       if (provider) {
         console.log("[ExpoAuthProvider] Provider specified, will skip selection", { provider });
@@ -91,8 +92,7 @@ var ExpoAuthProvider = class {
       console.log("[ExpoAuthProvider] Starting authentication", {
         baseUrl,
         redirectUrl,
-        organizationId,
-        parentOrganizationId,
+        publicKey,
         sessionId,
         provider,
         hasCustomData: !!customAuthData
@@ -109,15 +109,30 @@ var ExpoAuthProvider = class {
       if (result.type === "success" && result.url) {
         const url = new URL(result.url);
         const walletId = url.searchParams.get("wallet_id");
+        const organizationId = url.searchParams.get("organization_id");
         const provider2 = url.searchParams.get("provider");
         const accountDerivationIndex = url.searchParams.get("selected_account_index");
+        const expiresInMs = url.searchParams.get("expires_in_ms");
         if (!walletId) {
           throw new Error("Authentication failed: no walletId in redirect URL");
         }
+        if (!organizationId) {
+          console.error("[ExpoAuthProvider] Missing organizationId in redirect URL", { url: result.url });
+          throw new Error("Authentication failed: no organizationId in redirect URL");
+        }
+        console.log("[ExpoAuthProvider] Auth redirect parameters", {
+          walletId,
+          organizationId,
+          provider: provider2,
+          accountDerivationIndex,
+          expiresInMs
+        });
         return {
           walletId,
+          organizationId,
           provider: provider2 || void 0,
-          accountDerivationIndex: accountDerivationIndex ? parseInt(accountDerivationIndex) : void 0
+          accountDerivationIndex: accountDerivationIndex ? parseInt(accountDerivationIndex) : 0,
+          expiresInMs: expiresInMs ? parseInt(expiresInMs) : 0
         };
       } else if (result.type === "cancel") {
         throw new Error("User cancelled authentication");
@@ -218,7 +233,7 @@ var ReactNativeStamper = class {
     this.algorithm = Algorithm.ed25519;
     this.type = "PKI";
     this.keyPrefix = config.keyPrefix || "phantom-rn-stamper";
-    this.organizationId = config.organizationId || "default";
+    this.appId = config.appId || "default";
   }
   /**
    * Initialize the stamper and generate/load cryptographic keys
@@ -371,10 +386,10 @@ var ReactNativeStamper = class {
     return null;
   }
   getActiveKeyName() {
-    return `${this.keyPrefix}-${this.organizationId}-active`;
+    return `${this.keyPrefix}-${this.appId}-active`;
   }
   getPendingKeyName() {
-    return `${this.keyPrefix}-${this.organizationId}-pending`;
+    return `${this.keyPrefix}-${this.appId}-pending`;
   }
 };
 
@@ -415,34 +430,48 @@ function PhantomProvider({ children, config, debugConfig }) {
   const [connectError, setConnectError] = useState(null);
   const [addresses, setAddresses] = useState([]);
   const [walletId, setWalletId] = useState(null);
-  const [sdk, setSdk] = useState(null);
   const memoizedConfig = useMemo(() => {
     const redirectUrl = config.authOptions?.redirectUrl || `${config.scheme}://phantom-auth-callback`;
     return {
       ...config,
+      apiBaseUrl: config.apiBaseUrl || DEFAULT_WALLET_API_URL,
+      embeddedWalletType: config.embeddedWalletType || DEFAULT_EMBEDDED_WALLET_TYPE,
       authOptions: {
         ...config.authOptions || {},
-        redirectUrl
+        redirectUrl,
+        authUrl: config.authOptions?.authUrl || DEFAULT_AUTH_URL2
       }
     };
   }, [config]);
-  useEffect(() => {
+  const sdk = useMemo(() => {
     const storage = new ExpoSecureStorage();
     const authProvider = new ExpoAuthProvider();
     const urlParamsAccessor = new ExpoURLParamsAccessor();
     const logger = new ExpoLogger(debugConfig?.enabled || false);
     const stamper = new ReactNativeStamper({
-      keyPrefix: `phantom-rn-${memoizedConfig.organizationId}`,
-      organizationId: memoizedConfig.organizationId
+      keyPrefix: `phantom-rn-${memoizedConfig.appId}`,
+      appId: memoizedConfig.appId
     });
+    const platformName = `${Platform.OS}-${Platform.Version}`;
     const platform = {
       storage,
       authProvider,
       urlParamsAccessor,
       stamper,
-      name: `${Platform.OS}-${Platform.Version}`
+      name: platformName,
+      analyticsHeaders: {
+        [ANALYTICS_HEADERS.SDK_TYPE]: "react-native",
+        [ANALYTICS_HEADERS.PLATFORM]: Platform.OS,
+        [ANALYTICS_HEADERS.PLATFORM_VERSION]: `${Platform.Version}`,
+        [ANALYTICS_HEADERS.APP_ID]: config.appId,
+        [ANALYTICS_HEADERS.WALLET_TYPE]: config.embeddedWalletType,
+        [ANALYTICS_HEADERS.SDK_VERSION]: "1.0.0-beta.11"
+        // Replaced at build time
+      }
     };
-    const sdkInstance = new EmbeddedProvider(memoizedConfig, platform, logger);
+    return new EmbeddedProvider(memoizedConfig, platform, logger);
+  }, [memoizedConfig, debugConfig, config.appId, config.embeddedWalletType]);
+  useEffect(() => {
     const handleConnectStart = () => {
       setIsConnecting(true);
       setConnectError(null);
@@ -451,12 +480,12 @@ function PhantomProvider({ children, config, debugConfig }) {
       try {
         setIsConnected(true);
         setIsConnecting(false);
-        const addrs = await sdkInstance.getAddresses();
+        const addrs = await sdk.getAddresses();
         setAddresses(addrs);
       } catch (err) {
         console.error("Error connecting:", err);
         try {
-          await sdkInstance.disconnect();
+          await sdk.disconnect();
         } catch (err2) {
           console.error("Error disconnecting:", err2);
         }
@@ -473,21 +502,18 @@ function PhantomProvider({ children, config, debugConfig }) {
       setAddresses([]);
       setWalletId(null);
     };
-    sdkInstance.on("connect_start", handleConnectStart);
-    sdkInstance.on("connect", handleConnect);
-    sdkInstance.on("connect_error", handleConnectError);
-    sdkInstance.on("disconnect", handleDisconnect);
-    setSdk(sdkInstance);
+    sdk.on("connect_start", handleConnectStart);
+    sdk.on("connect", handleConnect);
+    sdk.on("connect_error", handleConnectError);
+    sdk.on("disconnect", handleDisconnect);
     return () => {
-      sdkInstance.off("connect_start", handleConnectStart);
-      sdkInstance.off("connect", handleConnect);
-      sdkInstance.off("connect_error", handleConnectError);
-      sdkInstance.off("disconnect", handleDisconnect);
+      sdk.off("connect_start", handleConnectStart);
+      sdk.off("connect", handleConnect);
+      sdk.off("connect_error", handleConnectError);
+      sdk.off("disconnect", handleDisconnect);
     };
-  }, [memoizedConfig, debugConfig]);
+  }, [sdk]);
   useEffect(() => {
-    if (!sdk)
-      return;
     if (config.autoConnect !== false) {
       sdk.autoConnect().catch(() => {
       });
@@ -584,175 +610,24 @@ function useAccounts() {
 }
 
 // src/hooks/useSolana.ts
-import { useCallback as useCallback3, useMemo as useMemo2 } from "react";
 function useSolana() {
   const { sdk, isConnected } = usePhantom();
-  const solanaChain = useMemo2(() => {
-    if (!sdk || !isConnected)
-      return null;
-    try {
-      return sdk.solana;
-    } catch {
-      return null;
-    }
-  }, [sdk, isConnected]);
-  const signMessage = useCallback3(
-    async (message) => {
-      if (!solanaChain)
-        throw new Error("Solana chain not available. Ensure SDK is connected.");
-      return await solanaChain.signMessage(message);
-    },
-    [solanaChain]
-  );
-  const signTransaction = useCallback3(
-    async (transaction) => {
-      if (!solanaChain)
-        throw new Error("Solana chain not available. Ensure SDK is connected.");
-      return await solanaChain.signTransaction(transaction);
-    },
-    [solanaChain]
-  );
-  const signAndSendTransaction = useCallback3(
-    async (transaction) => {
-      if (!solanaChain)
-        throw new Error("Solana chain not available. Ensure SDK is connected.");
-      return await solanaChain.signAndSendTransaction(transaction);
-    },
-    [solanaChain]
-  );
-  const connect = useCallback3(
-    async (options) => {
-      if (!solanaChain)
-        throw new Error("Solana chain not available. Ensure SDK is connected.");
-      return await solanaChain.connect(options);
-    },
-    [solanaChain]
-  );
-  const disconnect = useCallback3(async () => {
-    if (!solanaChain)
-      throw new Error("Solana chain not available. Ensure SDK is connected.");
-    return await solanaChain.disconnect();
-  }, [solanaChain]);
-  const switchNetwork = useCallback3(
-    async (network) => {
-      if (!solanaChain)
-        throw new Error("Solana chain not available. Ensure SDK is connected.");
-      return await solanaChain.switchNetwork?.(network);
-    },
-    [solanaChain]
-  );
-  const getPublicKey = useCallback3(async () => {
-    if (!solanaChain)
-      return null;
-    return await solanaChain.getPublicKey();
-  }, [solanaChain]);
   return {
-    // Chain instance for advanced usage
-    solana: solanaChain,
-    // Convenient methods
-    signMessage,
-    signTransaction,
-    signAndSendTransaction,
-    connect,
-    disconnect,
-    switchNetwork,
-    getPublicKey,
+    // Chain instance with connection enforcement for signing methods
+    solana: sdk.solana,
     // State
-    isAvailable: !!solanaChain,
-    isConnected: solanaChain?.isConnected() ?? false
+    isAvailable: !!isConnected
   };
 }
 
 // src/hooks/useEthereum.ts
-import { useCallback as useCallback4, useMemo as useMemo3 } from "react";
 function useEthereum() {
   const { sdk, isConnected } = usePhantom();
-  const ethereumChain = useMemo3(() => {
-    if (!sdk || !isConnected)
-      return null;
-    try {
-      return sdk.ethereum;
-    } catch {
-      return null;
-    }
-  }, [sdk, isConnected]);
-  const request = useCallback4(
-    async (args) => {
-      if (!ethereumChain)
-        throw new Error("Ethereum chain not available. Ensure SDK is connected.");
-      return await ethereumChain.request(args);
-    },
-    [ethereumChain]
-  );
-  const signPersonalMessage = useCallback4(
-    async (message, address) => {
-      if (!ethereumChain)
-        throw new Error("Ethereum chain not available. Ensure SDK is connected.");
-      return await ethereumChain.signPersonalMessage(message, address);
-    },
-    [ethereumChain]
-  );
-  const sendTransaction = useCallback4(
-    async (transaction) => {
-      if (!ethereumChain)
-        throw new Error("Ethereum chain not available. Ensure SDK is connected.");
-      return await ethereumChain.sendTransaction(transaction);
-    },
-    [ethereumChain]
-  );
-  const switchChain = useCallback4(
-    async (chainId) => {
-      if (!ethereumChain)
-        throw new Error("Ethereum chain not available. Ensure SDK is connected.");
-      return await ethereumChain.switchChain(chainId);
-    },
-    [ethereumChain]
-  );
-  const getChainId = useCallback4(async () => {
-    if (!ethereumChain)
-      throw new Error("Ethereum chain not available. Ensure SDK is connected.");
-    return await ethereumChain.getChainId();
-  }, [ethereumChain]);
-  const getAccounts = useCallback4(async () => {
-    if (!ethereumChain)
-      throw new Error("Ethereum chain not available. Ensure SDK is connected.");
-    return await ethereumChain.getAccounts();
-  }, [ethereumChain]);
-  const signMessage = useCallback4(
-    async (message) => {
-      const accounts = await getAccounts();
-      return await request({
-        method: "eth_sign",
-        params: [accounts[0], message]
-      });
-    },
-    [request, getAccounts]
-  );
-  const signTypedData = useCallback4(
-    async (typedData) => {
-      if (!ethereumChain)
-        throw new Error("Ethereum chain not available. Ensure SDK is connected.");
-      const accounts = await getAccounts();
-      return await ethereumChain.signTypedData(typedData, accounts[0]);
-    },
-    [ethereumChain, getAccounts]
-  );
   return {
-    // Chain instance for advanced usage
-    ethereum: ethereumChain,
-    // Standard EIP-1193 interface
-    request,
-    // Convenient methods
-    signPersonalMessage,
-    signMessage,
-    signTypedData,
-    sendTransaction,
-    switchChain,
-    getChainId,
-    getAccounts,
+    // Chain instance with connection enforcement for signing methods
+    ethereum: sdk.ethereum,
     // State
-    isAvailable: !!ethereumChain,
-    isConnected: ethereumChain?.isConnected() ?? false
+    isAvailable: !!isConnected
   };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phantom/react-native-sdk",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.11",
   "description": "Phantom Wallet SDK for React Native and Expo applications",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -45,14 +45,14 @@
     "directory": "packages/react-native-sdk"
   },
   "dependencies": {
-    "@phantom/api-key-stamper": "^1.0.0-beta.1",
-    "@phantom/base64url": "^1.0.0-beta.1",
-    "@phantom/chains": "^1.0.0-beta.1",
-    "@phantom/client": "^1.0.0-beta.1",
-    "@phantom/constants": "^1.0.0-beta.1",
-    "@phantom/crypto": "^1.0.0-beta.1",
-    "@phantom/embedded-provider-core": "^1.0.0-beta.1",
-    "@phantom/sdk-types": "^1.0.0-beta.1",
+    "@phantom/api-key-stamper": "^1.0.0-beta.6",
+    "@phantom/base64url": "^1.0.0-beta.6",
+    "@phantom/chain-interfaces": "^1.0.0-beta.6",
+    "@phantom/client": "^1.0.0-beta.11",
+    "@phantom/constants": "^1.0.0-beta.6",
+    "@phantom/crypto": "^1.0.0-beta.6",
+    "@phantom/embedded-provider-core": "^1.0.0-beta.11",
+    "@phantom/sdk-types": "^1.0.0-beta.6",
     "@types/bs58": "^5.0.0",
     "bs58": "^6.0.0",
     "buffer": "^6.0.3"