@reown/appkit-solana-react-native 2.0.0-alpha.0 → 2.0.0-alpha.2

package/lib/typescript/types.d.ts

@@ -0,0 +1,96 @@
+import type { CaipNetworkId, Namespaces, Storage, WalletInfo } from '@reown/appkit-common-react-native';
+import type nacl from 'tweetnacl';
+export interface TokenInfo {
+    address: string;
+    symbol: string;
+    name: string;
+    decimals: number;
+    logoURI?: string;
+}
+export type PhantomCluster = 'mainnet-beta' | 'testnet' | 'devnet';
+export interface PhantomProviderConfig {
+    appScheme: string;
+    dappUrl: string;
+    storage: Storage;
+    dappEncryptionKeyPair: nacl.BoxKeyPair;
+}
+export type PhantomConnectResult = PhantomSession;
+export interface PhantomSession {
+    sessionToken: string;
+    userPublicKey: string;
+    phantomEncryptionPublicKeyBs58: string;
+    cluster: PhantomCluster;
+}
+export interface SignTransactionRequestParams {
+    transaction: string;
+}
+export interface SignMessageRequestParams {
+    message: Uint8Array | string;
+    display?: 'utf8' | 'hex';
+}
+export interface SignAllTransactionsRequestParams {
+    transactions: string[];
+}
+export interface PhantomDeeplinkResponse {
+    phantom_encryption_public_key?: string;
+    nonce: string;
+    data: string;
+}
+export interface DecryptedConnectData {
+    public_key: string;
+    session: string;
+}
+export interface PhantomProviderConfig {
+    appScheme: string;
+    dappUrl: string;
+    storage: Storage;
+    dappEncryptionKeyPair: nacl.BoxKeyPair;
+}
+export interface PhantomSession {
+    sessionToken: string;
+    userPublicKey: string;
+    phantomEncryptionPublicKeyBs58: string;
+    cluster: PhantomCluster;
+}
+export type PhantomRpcMethod = 'connect' | 'disconnect' | 'signTransaction' | 'signAndSendTransaction' | 'signAllTransactions' | 'signMessage';
+export interface PhantomSignTransactionParams {
+    dapp_encryption_public_key: string;
+    redirect_link: string;
+    payload: string;
+    nonce: string;
+    cluster?: PhantomCluster;
+}
+export interface PhantomSignAllTransactionsParams {
+    dapp_encryption_public_key: string;
+    redirect_link: string;
+    payload: string;
+    nonce: string;
+    cluster?: PhantomCluster;
+}
+export interface PhantomSignMessageParams {
+    dapp_encryption_public_key: string;
+    redirect_link: string;
+    payload: string;
+    nonce: string;
+}
+export interface PhantomConnectParams {
+    app_url: string;
+    dapp_encryption_public_key: string;
+    redirect_link: string;
+    cluster?: PhantomCluster;
+}
+export interface PhantomDisconnectParams {
+    dapp_encryption_public_key: string;
+    redirect_link: string;
+    payload: string;
+    nonce: string;
+}
+export interface PhantomConnectorConfig {
+    cluster?: PhantomCluster;
+}
+export interface PhantomConnectorSessionData {
+    namespaces: Namespaces;
+    wallet: WalletInfo;
+    currentCaipNetworkId: CaipNetworkId;
+}
+//# sourceMappingURL=types.d.ts.map

package/lib/typescript/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EACb,UAAU,EACV,OAAO,EACP,UAAU,EACX,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAIlC,MAAM,WAAW,SAAS;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAID,MAAM,MAAM,cAAc,GAAG,cAAc,GAAG,SAAS,GAAG,QAAQ,CAAC;AAEnE,MAAM,WAAW,qBAAqB;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,qBAAqB,EAAE,IAAI,CAAC,UAAU,CAAC;CACxC;AAED,MAAM,MAAM,oBAAoB,GAAG,cAAc,CAAC;AAElD,MAAM,WAAW,cAAc;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,8BAA8B,EAAE,MAAM,CAAC;IACvC,OAAO,EAAE,cAAc,CAAC;CACzB;AAED,MAAM,WAAW,4BAA4B;IAC3C,WAAW,EAAE,MAAM,CAAC;CACrB;AACD,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,UAAU,GAAG,MAAM,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;CAC1B;AACD,MAAM,WAAW,gCAAgC;IAC/C,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,uBAAuB;IACtC,6BAA6B,CAAC,EAAE,MAAM,CAAC;IACvC,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,oBAAoB;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,qBAAqB;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,qBAAqB,EAAE,IAAI,CAAC,UAAU,CAAC;CACxC;AAED,MAAM,WAAW,cAAc;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,8BAA8B,EAAE,MAAM,CAAC;IACvC,OAAO,EAAE,cAAc,CAAC;CACzB;AAGD,MAAM,MAAM,gBAAgB,GACxB,SAAS,GACT,YAAY,GACZ,iBAAiB,GACjB,wBAAwB,GACxB,qBAAqB,GACrB,aAAa,CAAC;AAElB,MAAM,WAAW,4BAA4B;IAC3C,0BAA0B,EAAE,MAAM,CAAC;IACnC,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,cAAc,CAAC;CAC1B;AAED,MAAM,WAAW,gCAAgC;IAC/C,0BAA0B,EAAE,MAAM,CAAC;IACnC,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,cAAc,CAAC;CAC1B;AAED,MAAM,WAAW,wBAAwB;IACvC,0BAA0B,EAAE,MAAM,CAAC;IACnC,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,0BAA0B,EAAE,MAAM,CAAC;IACnC,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,cAAc,CAAC;CAC1B;AAED,MAAM,WAAW,uBAAuB;IACtC,0BAA0B,EAAE,MAAM,CAAC;IACnC,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACf;AAID,MAAM,WAAW,sBAAsB;IACrC,OAAO,CAAC,EAAE,cAAc,CAAC;CAC1B;AAED,MAAM,WAAW,2BAA2B;IAC1C,UAAU,EAAE,UAAU,CAAC;IACvB,MAAM,EAAE,UAAU,CAAC;IACnB,oBAAoB,EAAE,aAAa,CAAC;CACrC"}

package/lib/typescript/utils/createSendTransaction.d.ts

@@ -0,0 +1,10 @@
+import { type Connection, Transaction } from '@solana/web3.js';
+type SendTransactionArgs = {
+    connection: Connection;
+    fromAddress: string;
+    toAddress: string;
+    value: number;
+};
+export declare function createSendTransaction({ fromAddress, toAddress, value, connection }: SendTransactionArgs): Promise<Transaction>;
+export {};
+//# sourceMappingURL=createSendTransaction.d.ts.map

package/lib/typescript/utils/createSendTransaction.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"createSendTransaction.d.ts","sourceRoot":"","sources":["../../../src/utils/createSendTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,UAAU,EAIf,WAAW,EACZ,MAAM,iBAAiB,CAAC;AAIzB,KAAK,mBAAmB,GAAG;IACzB,UAAU,EAAE,UAAU,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAWF,wBAAsB,qBAAqB,CAAC,EAC1C,WAAW,EACX,SAAS,EACT,KAAK,EACL,UAAU,EACX,EAAE,mBAAmB,GAAG,OAAO,CAAC,WAAW,CAAC,CAwB5C"}

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@reown/appkit-solana-react-native",
-  "version": "2.0.0-alpha.0",
+  "version": "2.0.0-alpha.2",
   "main": "lib/commonjs/index.js",
   "types": "lib/typescript/index.d.ts",
   "module": "lib/module/index.js",
-  "source": "src/index.tsx",
+  "react-native": "src/index.ts",
+  "source": "src/index.ts",
   "scripts": {
     "build": "bob build",
     "clean": "rm -rf lib",
@@ -27,7 +28,7 @@
     "react-native"
   ],
   "repository": "https://github.com/reown-com/appkit-react-native",
-  "author": "Reown <support@reown.com> (https://reown.com)",
+  "author": "Reown (https://discord.gg/reown)",
   "homepage": "https://reown.com/appkit",
   "license": "Apache-2.0",
   "bugs": {
@@ -38,7 +39,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@reown/appkit-common-react-native": "2.0.0-alpha.0"
+    "@reown/appkit-common-react-native": "2.0.0-alpha.2",
+    "@solana/web3.js": "1.98.2",
+    "bs58": "6.0.0",
+    "tweetnacl": "1.0.3"
   },
-  "react-native": "src/index.tsx"
+  "peerDependencies": {
+    "@walletconnect/react-native-compat": ">=2.16.1",
+    "react": ">=18",
+    "react-native": ">=0.72"
+  }
 }

package/src/adapter.ts

@@ -7,6 +7,17 @@ import {
   type GetBalanceResponse
 } from '@reown/appkit-common-react-native';
 import { getSolanaNativeBalance, getSolanaTokenBalance } from './helpers';
+import { Connection, Transaction, VersionedTransaction } from '@solana/web3.js';
+import base58 from 'bs58';
+import { createSendTransaction } from './utils/createSendTransaction';
+
+export interface SolanaTransactionData {
+  fromAddress: string;
+  toAddress: string;
+  amount: number;
+  network?: AppKitNetwork;
+  rpcUrl?: string;
+}
 
 export class SolanaAdapter extends SolanaBaseAdapter {
   private static supportedNamespace: ChainNamespace = 'solana';
@@ -14,7 +25,8 @@ export class SolanaAdapter extends SolanaBaseAdapter {
   constructor(configParams: { projectId: string }) {
     super({
       projectId: configParams.projectId,
-      supportedNamespace: SolanaAdapter.supportedNamespace
+      supportedNamespace: SolanaAdapter.supportedNamespace,
+      adapterType: 'solana'
     });
   }
 
@@ -56,11 +68,7 @@ export class SolanaAdapter extends SolanaBaseAdapter {
         };
       }
 
-      this.emit('balanceChanged', {
-        namespace: this.getSupportedNamespace(),
-        address: balanceAddress,
-        balance
-      });
+      this.emit('balanceChanged', { address: balanceAddress, balance });
 
       return balance;
     } catch (error) {
@@ -68,6 +76,144 @@ export class SolanaAdapter extends SolanaBaseAdapter {
     }
   }
 
+  async signTransaction<T extends Transaction | VersionedTransaction>(
+    transaction: T,
+    network?: AppKitNetwork
+  ): Promise<T> {
+    if (!this.connector) {
+      throw new Error('SolanaAdapter:signTransaction - no active connector');
+    }
+
+    if (!network) {
+      throw new Error('SolanaAdapter:signTransaction - network is undefined');
+    }
+
+    const provider = this.connector.getProvider();
+    if (!provider) {
+      throw new Error('SolanaAdapter:signTransaction - provider is undefined');
+    }
+
+    try {
+      // Serialize transaction to base64 (following WalletConnect standard)
+      const serializedTransaction = Buffer.from(
+        new Uint8Array(transaction.serialize({ verifySignatures: false }))
+      ).toString('base64');
+
+      const result = (await provider.request(
+        {
+          method: 'solana_signTransaction',
+          params: {
+            transaction: serializedTransaction,
+            pubkey: this.getAccounts()?.[0]?.split(':')[2] || ''
+          }
+        },
+        network.caipNetworkId
+      )) as { signature?: string; transaction?: string };
+
+      // Handle different response formats
+      if ('signature' in result && result.signature) {
+        // Old RPC response format - add signature to transaction
+        const decoded = base58.decode(result.signature);
+        if (transaction instanceof Transaction && transaction.feePayer) {
+          transaction.addSignature(
+            transaction.feePayer,
+            Buffer.from(decoded) as Buffer & Uint8Array
+          );
+        }
+
+        return transaction;
+      }
+
+      if ('transaction' in result && result.transaction) {
+        // New response format - deserialize the signed transaction
+        const decodedTransaction = Buffer.from(result.transaction, 'base64');
+
+        if (transaction instanceof VersionedTransaction) {
+          return VersionedTransaction.deserialize(new Uint8Array(decodedTransaction)) as T;
+        }
+
+        return Transaction.from(decodedTransaction) as T;
+      }
+
+      throw new Error('SolanaAdapter:signTransaction - invalid response format');
+    } catch (error) {
+      if (error instanceof Error) {
+        throw new Error(`SolanaAdapter:signTransaction - ${error.message}`);
+      }
+      throw new Error('SolanaAdapter:signTransaction - unknown error occurred');
+    }
+  }
+
+  async sendTransaction(data: SolanaTransactionData): Promise<string | null> {
+    const { fromAddress, toAddress, amount, network, rpcUrl } = data;
+
+    if (!this.connector) {
+      throw new Error('SolanaAdapter:sendTransaction - no active connector');
+    }
+
+    const provider = this.connector.getProvider();
+    if (!provider) {
+      throw new Error('SolanaAdapter:sendTransaction - provider is undefined');
+    }
+
+    if (!network) {
+      throw new Error('SolanaAdapter:sendTransaction - network is undefined');
+    }
+
+    if (!fromAddress) {
+      throw new Error('SolanaAdapter:sendTransaction - fromAddress is undefined');
+    }
+
+    if (!toAddress) {
+      throw new Error('SolanaAdapter:sendTransaction - toAddress is undefined');
+    }
+
+    if (!amount || amount <= 0) {
+      throw new Error('SolanaAdapter:sendTransaction - amount must be greater than 0');
+    }
+
+    try {
+      // Determine RPC URL
+      let connectionRpcUrl = rpcUrl;
+      if (!connectionRpcUrl && network) {
+        connectionRpcUrl = network.rpcUrls?.default?.http?.[0];
+      }
+      if (!connectionRpcUrl) {
+        throw new Error('SolanaAdapter:sendTransaction - no RPC URL available');
+      }
+
+      // Create connection
+      const connection = new Connection(connectionRpcUrl, 'confirmed');
+
+      const transaction = await createSendTransaction({
+        connection,
+        fromAddress,
+        toAddress,
+        value: amount
+      });
+
+      // Sign the transaction
+      const signedTransaction = await this.signTransaction(transaction, network);
+
+      // Send the signed transaction
+      const signature = await connection.sendRawTransaction(signedTransaction.serialize(), {
+        skipPreflight: false,
+        preflightCommitment: 'confirmed'
+      });
+
+      if (!signature) {
+        throw new Error('SolanaAdapter:sendTransaction - no signature returned');
+      }
+
+      return signature;
+    } catch (error) {
+      if (error instanceof Error) {
+        throw new Error(`SolanaAdapter:sendTransaction - ${error.message}`);
+      }
+      throw new Error('SolanaAdapter:sendTransaction - unknown error occurred');
+    }
+  }
+
   async switchNetwork(network: AppKitNetwork): Promise<void> {
     if (!this.connector) throw new Error('No active connector');
 

package/src/connectors/PhantomConnector.ts

@@ -0,0 +1,329 @@
+import {
+  WalletConnector,
+  type AppKitNetwork,
+  type CaipNetworkId,
+  type ChainNamespace,
+  type ConnectOptions,
+  type Namespaces,
+  type WalletInfo,
+  type CaipAddress,
+  type ConnectorInitOptions,
+  type Storage,
+  solana,
+  solanaDevnet,
+  solanaTestnet,
+  type ConnectionProperties,
+  ConstantsUtil
+} from '@reown/appkit-common-react-native';
+import nacl from 'tweetnacl';
+import bs58 from 'bs58';
+
+import { PhantomProvider, SOLANA_SIGNING_METHODS } from '../providers/PhantomProvider';
+import type {
+  PhantomCluster,
+  PhantomConnectorConfig,
+  PhantomConnectorSessionData,
+  PhantomProviderConfig
+} from '../types';
+
+const SOLANA_CLUSTER_TO_CHAIN_ID_PART: Record<PhantomCluster, string> = {
+  'mainnet-beta': solana.id as string,
+  'testnet': solanaTestnet.id as string,
+  'devnet': solanaDevnet.id as string
+};
+
+const PHANTOM_CONNECTOR_STORAGE_KEY = '@appkit/phantom-connector-data';
+const DAPP_KEYPAIR_STORAGE_KEY = '@appkit/phantom-dapp-secret-key';
+
+export class PhantomConnector extends WalletConnector {
+  private readonly config: PhantomConnectorConfig;
+
+  private currentCaipNetworkId: CaipNetworkId | null = null;
+  private dappEncryptionKeyPair?: nacl.BoxKeyPair;
+
+  private static readonly SUPPORTED_NAMESPACE: ChainNamespace = 'solana';
+
+  constructor(config?: PhantomConnectorConfig) {
+    super({ type: 'phantom' });
+    this.config = config ?? { cluster: 'mainnet-beta' };
+  }
+
+  override async init(ops: ConnectorInitOptions) {
+    super.init(ops);
+    this.storage = ops.storage;
+    await this.initializeKeyPair();
+
+    const appScheme = ops.metadata.redirect?.universal ?? ops.metadata.redirect?.native;
+    if (!appScheme) {
+      throw new Error(
+        'Phantom Connector: No redirect link found in metadata. Please add redirect.universal or redirect.native to the metadata.'
+      );
+    }
+
+    const providerConfig: PhantomProviderConfig = {
+      appScheme,
+      dappUrl: ops.metadata.url,
+      storage: ops.storage,
+      dappEncryptionKeyPair: this.dappEncryptionKeyPair!
+    };
+
+    this.provider = new PhantomProvider(providerConfig);
+    await this.restoreSession();
+  }
+
+  private async initializeKeyPair(): Promise<void> {
+    try {
+      const secretKeyB58 = await this.getStorage().getItem(DAPP_KEYPAIR_STORAGE_KEY);
+      if (secretKeyB58) {
+        const secretKey = bs58.decode(secretKeyB58);
+        this.dappEncryptionKeyPair = nacl.box.keyPair.fromSecretKey(secretKey);
+      } else {
+        const newKeyPair = nacl.box.keyPair();
+        this.dappEncryptionKeyPair = newKeyPair;
+        await this.getStorage().setItem(
+          DAPP_KEYPAIR_STORAGE_KEY,
+          bs58.encode(newKeyPair.secretKey)
+        );
+      }
+    } catch (error) {
+      // disconnect and clear session
+      await this.disconnect();
+      throw error;
+    }
+  }
+
+  override async connect(opts?: ConnectOptions): Promise<Namespaces | undefined> {
+    if (this.isConnected()) {
+      return this.namespaces;
+    }
+
+    const defaultChain =
+      opts?.defaultChain?.split(':')?.[0] === 'solana'
+        ? opts?.defaultChain?.split(':')[1]
+        : opts?.namespaces?.['solana']?.chains?.[0]?.split(':')[1];
+
+    const requestedCluster =
+      this.config.cluster ??
+      (Object.keys(SOLANA_CLUSTER_TO_CHAIN_ID_PART).find(
+        key =>
+          SOLANA_CLUSTER_TO_CHAIN_ID_PART[key as keyof typeof SOLANA_CLUSTER_TO_CHAIN_ID_PART] ===
+          defaultChain
+      ) as PhantomCluster | undefined);
+
+    try {
+      const connectResult = await this.getProvider().connect({ cluster: requestedCluster });
+
+      const solanaChainIdPart = SOLANA_CLUSTER_TO_CHAIN_ID_PART[connectResult.cluster];
+      if (!solanaChainIdPart) {
+        throw new Error(
+          `Phantom Connect: Internal - Unknown cluster mapping for ${connectResult.cluster}`
+        );
+      }
+      this.currentCaipNetworkId = `solana:${solanaChainIdPart}` as CaipNetworkId;
+
+      this.wallet = ConstantsUtil.PHANTOM_CUSTOM_WALLET;
+
+      const userPublicKey = this.getProvider().getUserPublicKey();
+      if (!userPublicKey) {
+        throw new Error('Phantom Connect: Provider failed to return a user public key.');
+      }
+
+      const caipAddress = `${this.currentCaipNetworkId}:${userPublicKey}` as CaipAddress;
+      this.namespaces = {
+        [PhantomConnector.SUPPORTED_NAMESPACE]: {
+          accounts: [caipAddress],
+          methods: Object.values(SOLANA_SIGNING_METHODS),
+          events: [],
+          chains: [this.currentCaipNetworkId]
+        }
+      };
+
+      await this.saveSession(); // Save connector-specific session on successful connect
+
+      return this.namespaces;
+    } catch (error: any) {
+      this.clearSession();
+      throw error;
+    }
+  }
+
+  override async disconnect(): Promise<void> {
+    try {
+      if (this.isConnected()) {
+        await super.disconnect();
+      }
+    } catch (error: any) {
+      // console.warn(`PhantomConnector: Error during provider disconnect: ${error.message}. Proceeding with local clear.`);
+    }
+    await this.clearSession();
+  }
+
+  private async clearSession(): Promise<void> {
+    this.namespaces = undefined;
+    this.wallet = undefined;
+    this.currentCaipNetworkId = null;
+    await this.clearSessionStorage();
+  }
+
+  override getProvider(): PhantomProvider {
+    if (!this.provider) {
+      throw new Error('Phantom Connector: Provider not initialized. Call init() first.');
+    }
+
+    return this.provider as PhantomProvider;
+  }
+
+  private getStorage(): Storage {
+    if (!this.storage) {
+      throw new Error('Phantom Connector: Storage not initialized. Call init() first.');
+    }
+
+    return this.storage;
+  }
+
+  override getNamespaces(): Namespaces {
+    if (!this.namespaces) {
+      throw new Error('Phantom Connector: Not connected. Call connect() first.');
+    }
+
+    return this.namespaces;
+  }
+
+  override getChainId(namespace: ChainNamespace): CaipNetworkId | undefined {
+    if (namespace === PhantomConnector.SUPPORTED_NAMESPACE) {
+      return this.currentCaipNetworkId ?? undefined;
+    }
+
+    return undefined;
+  }
+
+  override getProperties(): ConnectionProperties | undefined {
+    return this.properties;
+  }
+
+  override getWalletInfo(): WalletInfo | undefined {
+    if (!this.isConnected()) {
+      return undefined;
+    }
+
+    return this.wallet;
+  }
+
+  isConnected(): boolean {
+    // Rely solely on the provider as the source of truth for connection status.
+    return this.getProvider().isConnected() && !!this.getProvider().getUserPublicKey();
+  }
+
+  override async switchNetwork(network: AppKitNetwork): Promise<void> {
+    const targetClusterName = Object.keys(SOLANA_CLUSTER_TO_CHAIN_ID_PART).find(
+      key =>
+        SOLANA_CLUSTER_TO_CHAIN_ID_PART[key as keyof typeof SOLANA_CLUSTER_TO_CHAIN_ID_PART] ===
+        network.id
+    ) as PhantomCluster | undefined;
+
+    if (!targetClusterName) {
+      throw new Error(`Cannot switch to unsupported network ID: ${network.id}`);
+    }
+
+    const currentClusterName = Object.keys(SOLANA_CLUSTER_TO_CHAIN_ID_PART).find(
+      key =>
+        `solana:${
+          SOLANA_CLUSTER_TO_CHAIN_ID_PART[key as keyof typeof SOLANA_CLUSTER_TO_CHAIN_ID_PART]
+        }` === this.currentCaipNetworkId
+    ) as PhantomCluster | undefined;
+
+    if (targetClusterName === currentClusterName && this.isConnected()) {
+      return Promise.resolve();
+    }
+
+    // Phantom doesn't provide a way to switch network, so we need to disconnect and reconnect.
+    await this.disconnect(); // Clear current session
+
+    // Create a temporary options object to guide the new connection
+    const tempConnectOpts: ConnectOptions = {
+      defaultChain: `solana:${SOLANA_CLUSTER_TO_CHAIN_ID_PART[targetClusterName]}` as CaipNetworkId
+    };
+
+    // Attempt to connect to the new cluster
+    // The connect method will use the defaultChain from opts to determine the cluster.
+    await this.connect(tempConnectOpts);
+    this.getProvider().emit('chainChanged', network.id);
+
+    // Verify if the connection was successful and to the correct new network
+    if (
+      !this.isConnected() ||
+      this.getChainId(PhantomConnector.SUPPORTED_NAMESPACE) !== tempConnectOpts.defaultChain
+    ) {
+      throw new Error(
+        `Failed to switch network to ${targetClusterName}. Please try connecting manually.`
+      );
+    }
+  }
+
+  // Orchestrates session restoration
+  override async restoreSession(): Promise<boolean> {
+    try {
+      const providerSession = await this.getProvider().restoreSession();
+      if (!providerSession) {
+        return false;
+      }
+
+      // If provider session is restored, try to restore connector data
+      const connectorData = await this.getStorage().getItem<PhantomConnectorSessionData>(
+        PHANTOM_CONNECTOR_STORAGE_KEY
+      );
+      if (!connectorData) {
+        return false; // Provider session exists but connector data is missing
+      }
+
+      this.namespaces = connectorData.namespaces;
+      this.wallet = connectorData.wallet;
+      this.currentCaipNetworkId = connectorData.currentCaipNetworkId;
+
+      // await this.initializeKeyPair();
+
+      // Final validation
+      if (this.isConnected()) {
+        return true;
+      }
+
+      // If validation fails, something is out of sync. Clear everything.
+      await this.disconnect();
+
+      return false;
+    } catch (error) {
+      // On any error, disconnect to ensure a clean state
+      await this.disconnect();
+
+      return false;
+    }
+  }
+
+  // Saves only connector-specific data
+  private async saveSession(): Promise<void> {
+    if (!this.namespaces || !this.wallet || !this.currentCaipNetworkId) {
+      return;
+    }
+
+    const connectorData: PhantomConnectorSessionData = {
+      namespaces: this.namespaces,
+      wallet: this.wallet,
+      currentCaipNetworkId: this.currentCaipNetworkId
+    };
+
+    try {
+      await this.getStorage().setItem(PHANTOM_CONNECTOR_STORAGE_KEY, connectorData);
+    } catch (error) {
+      // console.error('PhantomConnector: Failed to save session.', error);
+    }
+  }
+
+  // Clears only connector-specific data from storage
+  private async clearSessionStorage(): Promise<void> {
+    try {
+      await this.getStorage().removeItem(PHANTOM_CONNECTOR_STORAGE_KEY);
+    } catch (error) {
+      // console.error('PhantomConnector: Failed to clear session from storage.', error);
+    }
+  }
+}