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

package/lib/typescript/providers/DeeplinkProvider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"DeeplinkProvider.d.ts","sourceRoot":"","sources":["../../../src/providers/DeeplinkProvider.ts"],"names":[],"mappings":";AAIA,OAAO,KAAK,EACV,QAAQ,EACR,gBAAgB,EAChB,aAAa,EAEd,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EACV,sBAAsB,EACtB,qBAAqB,EACrB,eAAe,EAYf,OAAO,EACR,MAAM,UAAU,CAAC;AAClB,OAAO,YAAY,MAAM,QAAQ,CAAC;AAElC,eAAO,MAAM,sBAAsB;;;;;CAKzB,CAAC;AAQX,qBAAa,gBAAiB,SAAQ,YAAa,YAAW,QAAQ;IACpE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAyB;IAChD,OAAO,CAAC,qBAAqB,CAAkB;IAC/C,OAAO,CAAC,cAAc,CAAU;IAChC,OAAO,CAAC,SAAS,CAA2B;IAE5C,OAAO,CAAC,OAAO,CAAU;IAEzB,OAAO,CAAC,YAAY,CAAuB;IAC3C,OAAO,CAAC,aAAa,CAAuB;IAC5C,OAAO,CAAC,6BAA6B,CAAuB;IAG5D,OAAO,CAAC,kBAAkB,CAAuC;IACjE,OAAO,CAAC,kBAAkB,CAAS;gBAEvB,MAAM,EAAE,sBAAsB;IAQ1C,OAAO,CAAC,oBAAoB;IAI5B;;OAEG;IACI,OAAO,IAAI,IAAI;IAKtB;;OAEG;IACH,OAAO,CAAC,yBAAyB;IAQjC;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAS7B,gBAAgB,IAAI,MAAM,GAAG,IAAI;IAIjC,WAAW,IAAI,OAAO;IAIf,iBAAiB,IAAI,OAAO;IAInC,OAAO,CAAC,QAAQ;IAMhB;;;OAGG;YACW,mBAAmB;IAiDjC,OAAO,CAAC,gBAAgB;IAgBxB,OAAO,CAAC,cAAc;IAkCtB,OAAO,CAAC,cAAc;IAiCT,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;YA6BjC,WAAW;YAiBX,mBAAmB;IAQpB,OAAO,CAAC,CAAC,GAAG,qBAAqB,EAAE,MAAM,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,CAAC,CAAC;IAkE9E,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAuC3B,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAYnC,UAAU,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI;IAOpC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,QAAQ,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,CAAC,CAAC;CAyKtF"}

package/lib/typescript/types.d.ts

@@ -7,19 +7,13 @@ export interface TokenInfo {
     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 {
+export type Cluster = 'mainnet-beta' | 'testnet' | 'devnet';
+export type DeeplinkConnectResult = DeeplinkSession;
+export interface DeeplinkSession {
     sessionToken: string;
     userPublicKey: string;
-    phantomEncryptionPublicKeyBs58: string;
-    cluster: PhantomCluster;
+    walletEncryptionPublicKeyBs58: string;
+    cluster: Cluster;
 }
 export interface SignTransactionRequestParams {
     transaction: string;
@@ -31,8 +25,8 @@ export interface SignMessageRequestParams {
 export interface SignAllTransactionsRequestParams {
     transactions: string[];
 }
-export interface PhantomDeeplinkResponse {
-    phantom_encryption_public_key?: string;
+export interface DeeplinkResponse {
+    wallet_encryption_public_key?: string;
     nonce: string;
     data: string;
 }
@@ -40,57 +34,58 @@ export interface DecryptedConnectData {
     public_key: string;
     session: string;
 }
-export interface PhantomProviderConfig {
+export interface DeeplinkProviderConfig {
     appScheme: string;
     dappUrl: string;
     storage: Storage;
+    cluster?: Cluster;
     dappEncryptionKeyPair: nacl.BoxKeyPair;
+    type: 'phantom' | 'solflare';
+    baseUrl: string;
+    encryptionKeyFieldName: string;
 }
-export interface PhantomSession {
-    sessionToken: string;
-    userPublicKey: string;
-    phantomEncryptionPublicKeyBs58: string;
-    cluster: PhantomCluster;
-}
-export type PhantomRpcMethod = 'connect' | 'disconnect' | 'signTransaction' | 'signAndSendTransaction' | 'signAllTransactions' | 'signMessage';
-export interface PhantomSignTransactionParams {
+export type DeeplinkRpcMethod = 'connect' | 'disconnect' | 'signTransaction' | 'signAndSendTransaction' | 'signAllTransactions' | 'signMessage';
+export interface DeeplinkSignTransactionParams {
     dapp_encryption_public_key: string;
     redirect_link: string;
     payload: string;
     nonce: string;
-    cluster?: PhantomCluster;
+    cluster?: Cluster;
 }
-export interface PhantomSignAllTransactionsParams {
+export interface DeeplinkSignAllTransactionsParams {
     dapp_encryption_public_key: string;
     redirect_link: string;
     payload: string;
     nonce: string;
-    cluster?: PhantomCluster;
+    cluster?: Cluster;
 }
-export interface PhantomSignMessageParams {
+export interface DeeplinkSignMessageParams {
     dapp_encryption_public_key: string;
     redirect_link: string;
     payload: string;
     nonce: string;
 }
-export interface PhantomConnectParams {
+export interface DeeplinkConnectParams {
     app_url: string;
     dapp_encryption_public_key: string;
     redirect_link: string;
-    cluster?: PhantomCluster;
+    cluster?: Cluster;
 }
-export interface PhantomDisconnectParams {
+export interface DeeplinkDisconnectParams {
     dapp_encryption_public_key: string;
     redirect_link: string;
     payload: string;
     nonce: string;
 }
-export interface PhantomConnectorConfig {
-    cluster?: PhantomCluster;
+export interface DeeplinkConnectorConfig {
+    type: 'phantom' | 'solflare';
+    cluster?: Cluster;
 }
-export interface PhantomConnectorSessionData {
+export interface DeeplinkConnectorSessionData {
     namespaces: Namespaces;
     wallet: WalletInfo;
     currentCaipNetworkId: CaipNetworkId;
 }
+export type PhantomConnectorConfig = Pick<DeeplinkConnectorConfig, 'cluster'>;
+export type SolflareConnectorConfig = Pick<DeeplinkConnectorConfig, 'cluster'>;
 //# sourceMappingURL=types.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reown/appkit-solana-react-native",
-  "version": "2.0.0-alpha.2",
+  "version": "2.0.0-alpha.4",
   "main": "lib/commonjs/index.js",
   "types": "lib/typescript/index.d.ts",
   "module": "lib/module/index.js",
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@reown/appkit-common-react-native": "2.0.0-alpha.2",
+    "@reown/appkit-common-react-native": "2.0.0-alpha.4",
     "@solana/web3.js": "1.98.2",
     "bs58": "6.0.0",
     "tweetnacl": "1.0.3"

package/src/adapter.ts

@@ -22,9 +22,8 @@ export interface SolanaTransactionData {
 export class SolanaAdapter extends SolanaBaseAdapter {
   private static supportedNamespace: ChainNamespace = 'solana';
 
-  constructor(configParams: { projectId: string }) {
+  constructor() {
     super({
-      projectId: configParams.projectId,
       supportedNamespace: SolanaAdapter.supportedNamespace,
       adapterType: 'solana'
     });
@@ -88,7 +87,7 @@ export class SolanaAdapter extends SolanaBaseAdapter {
       throw new Error('SolanaAdapter:signTransaction - network is undefined');
     }
 
-    const provider = this.connector.getProvider();
+    const provider = this.connector.getProvider('solana');
     if (!provider) {
       throw new Error('SolanaAdapter:signTransaction - provider is undefined');
     }
@@ -151,7 +150,7 @@ export class SolanaAdapter extends SolanaBaseAdapter {
       throw new Error('SolanaAdapter:sendTransaction - no active connector');
     }
 
-    const provider = this.connector.getProvider();
+    const provider = this.connector.getProvider('solana');
     if (!provider) {
       throw new Error('SolanaAdapter:sendTransaction - provider is undefined');
     }
@@ -217,7 +216,7 @@ export class SolanaAdapter extends SolanaBaseAdapter {
   async switchNetwork(network: AppKitNetwork): Promise<void> {
     if (!this.connector) throw new Error('No active connector');
 
-    const provider = this.connector.getProvider();
+    const provider = this.connector.getProvider('solana');
     if (!provider) throw new Error('No active provider');
 
     try {

package/src/connectors/DeeplinkConnector.ts

@@ -0,0 +1,353 @@
+import {
+  WalletConnector,
+  type AppKitNetwork,
+  type CaipNetworkId,
+  type ChainNamespace,
+  type ConnectOptions,
+  type Namespaces,
+  type CaipAddress,
+  type ConnectorInitOptions,
+  type Storage,
+  solana,
+  solanaDevnet,
+  solanaTestnet,
+  type ConnectionProperties
+} from '@reown/appkit-common-react-native';
+import nacl from 'tweetnacl';
+import bs58 from 'bs58';
+
+import { DeeplinkProvider, SOLANA_SIGNING_METHODS } from '../providers/DeeplinkProvider';
+import type {
+  Cluster,
+  DeeplinkConnectorConfig,
+  DeeplinkConnectorSessionData,
+  DeeplinkProviderConfig
+} from '../types';
+
+const SOLANA_CLUSTER_TO_NETWORK: Record<Cluster, AppKitNetwork> = {
+  'mainnet-beta': solana,
+  'testnet': solanaTestnet,
+  'devnet': solanaDevnet
+};
+
+export abstract class DeeplinkConnector extends WalletConnector {
+  private readonly config: DeeplinkConnectorConfig;
+  private currentCaipNetworkId: CaipNetworkId | null = null;
+  private dappEncryptionKeyPair?: nacl.BoxKeyPair;
+
+  private static readonly SUPPORTED_NAMESPACE: ChainNamespace = 'solana';
+
+  constructor(config: DeeplinkConnectorConfig) {
+    super({ type: config.type });
+    this.config = config;
+  }
+
+  // Abstract methods that wallet-specific connectors must implement
+  protected abstract getBaseUrl(): string;
+  protected abstract getStorageKey(): string;
+  protected abstract getDappKeypairStorageKey(): string;
+  protected abstract getEncryptionKeyFieldName(): string;
+
+  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(
+        `${this.type} connector: No redirect link found in metadata. Please add redirect.universal or redirect.native to the metadata.`
+      );
+    }
+
+    const providerConfig: DeeplinkProviderConfig = {
+      appScheme,
+      dappUrl: ops.metadata.url,
+      storage: ops.storage,
+      type: this.type as 'phantom' | 'solflare',
+      cluster: this.config?.cluster ?? 'mainnet-beta',
+      dappEncryptionKeyPair: this.dappEncryptionKeyPair!,
+      baseUrl: this.getBaseUrl(),
+      encryptionKeyFieldName: this.getEncryptionKeyFieldName()
+    };
+
+    this.provider = new DeeplinkProvider(providerConfig);
+    await this.restoreSession();
+  }
+
+  private async initializeKeyPair(): Promise<void> {
+    try {
+      const secretKeyB58 = await this.getStorage().getItem(this.getDappKeypairStorageKey());
+      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(
+          this.getDappKeypairStorageKey(),
+          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() && this.namespaces) {
+      return this.namespaces;
+    }
+
+    const defaultNetworkId: CaipNetworkId | undefined =
+      opts?.defaultNetwork?.caipNetworkId?.split(':')?.[0] === 'solana'
+        ? opts?.defaultNetwork?.caipNetworkId
+        : opts?.namespaces?.['solana']?.chains?.[0];
+
+    const requestedCluster =
+      this.config?.cluster ??
+      (Object.keys(SOLANA_CLUSTER_TO_NETWORK).find(
+        key => SOLANA_CLUSTER_TO_NETWORK[key as Cluster]?.caipNetworkId === defaultNetworkId
+      ) as Cluster | undefined);
+
+    try {
+      const connectResult = await this.getProvider().connect({ cluster: requestedCluster });
+
+      const solanaChainId = SOLANA_CLUSTER_TO_NETWORK[connectResult.cluster]?.caipNetworkId;
+      if (!solanaChainId) {
+        throw new Error(
+          `${this.type} Connect: Internal - Unknown cluster mapping for ${connectResult.cluster}`
+        );
+      }
+      this.currentCaipNetworkId = solanaChainId;
+
+      this.wallet = {
+        name: this.getWalletInfo()?.name
+      };
+
+      const userPublicKey = this.getProvider().getUserPublicKey();
+      if (!userPublicKey) {
+        throw new Error(`${this.type} Connect: Provider failed to return a user public key.`);
+      }
+
+      const caipAddress = `${this.currentCaipNetworkId}:${userPublicKey}` as CaipAddress;
+      this.namespaces = {
+        [DeeplinkConnector.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(
+        `${this.type} Connector: Error during provider disconnect: ${error.message}. Proceeding with local clear.`
+      );
+    }
+
+    // Cleanup provider resources
+    if (this.provider) {
+      (this.provider as DeeplinkProvider).destroy();
+    }
+
+    await this.clearSession();
+  }
+
+  private async clearSession(): Promise<void> {
+    this.namespaces = undefined;
+    this.wallet = undefined;
+    this.currentCaipNetworkId = null;
+    await this.clearSessionStorage();
+  }
+
+  override getProvider(): DeeplinkProvider {
+    if (!this.provider) {
+      throw new Error(`${this.type} Connector: Provider not initialized. Call init() first.`);
+    }
+
+    return this.provider as DeeplinkProvider;
+  }
+
+  private getStorage(): Storage {
+    if (!this.storage) {
+      throw new Error(`${this.type} Connector: Storage not initialized. Call init() first.`);
+    }
+
+    return this.storage;
+  }
+
+  override getNamespaces(): Namespaces {
+    if (!this.namespaces) {
+      throw new Error(`${this.type} Connector: Not connected. Call connect() first.`);
+    }
+
+    return this.namespaces;
+  }
+
+  override getChainId(namespace: ChainNamespace): CaipNetworkId | undefined {
+    if (namespace === DeeplinkConnector.SUPPORTED_NAMESPACE) {
+      return this.currentCaipNetworkId ?? undefined;
+    }
+
+    return undefined;
+  }
+
+  override getProperties(): ConnectionProperties | undefined {
+    return this.properties;
+  }
+
+  isConnected(): boolean {
+    // Rely solely on the provider as the source of truth for connection status.
+    const provider = this.getProvider();
+
+    return provider.isConnected() && !!provider.getUserPublicKey();
+  }
+
+  override async switchNetwork(network: AppKitNetwork): Promise<void> {
+    const targetClusterName = Object.keys(SOLANA_CLUSTER_TO_NETWORK).find(
+      key => SOLANA_CLUSTER_TO_NETWORK[key as Cluster]?.caipNetworkId === network.caipNetworkId
+    ) as Cluster | undefined;
+
+    if (!targetClusterName) {
+      throw new Error(
+        `${this.type} Connector: Cannot switch to unsupported network ID: ${network.id}`
+      );
+    }
+
+    const currentClusterName = Object.keys(SOLANA_CLUSTER_TO_NETWORK).find(
+      key => SOLANA_CLUSTER_TO_NETWORK[key as Cluster]?.caipNetworkId === this.currentCaipNetworkId
+    ) as Cluster | undefined;
+
+    if (targetClusterName === currentClusterName && this.isConnected()) {
+      return Promise.resolve();
+    }
+
+    // Phantom/Solflare don'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 = {
+      defaultNetwork: SOLANA_CLUSTER_TO_NETWORK[targetClusterName]
+    };
+
+    // Attempt to connect to the new cluster
+    // The connect method will use the defaultNetwork 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(DeeplinkConnector.SUPPORTED_NAMESPACE) !==
+        tempConnectOpts.defaultNetwork?.caipNetworkId
+    ) {
+      throw new Error(
+        `${this.type} Connector: 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<DeeplinkConnectorSessionData>(
+        this.getStorageKey()
+      );
+      if (!connectorData) {
+        // Self-heal: reconstruct connector state from provider session
+        const userPublicKey = this.getProvider().getUserPublicKey();
+        const cluster = this.getProvider().getCurrentCluster();
+        const caipNetworkId = SOLANA_CLUSTER_TO_NETWORK[cluster]?.caipNetworkId;
+        if (userPublicKey && caipNetworkId) {
+          this.currentCaipNetworkId = caipNetworkId;
+          this.wallet = { name: this.getWalletInfo()?.name };
+          const caipAddress = `${caipNetworkId}:${userPublicKey}` as CaipAddress;
+          this.namespaces = {
+            [DeeplinkConnector.SUPPORTED_NAMESPACE]: {
+              accounts: [caipAddress],
+              methods: Object.values(SOLANA_SIGNING_METHODS),
+              events: [],
+              chains: [caipNetworkId]
+            }
+          };
+          await this.saveSession();
+        } else {
+          // Provider looks connected but we can't reconstruct state → clear everything
+          await this.disconnect();
+
+          return false;
+        }
+      } else {
+        this.namespaces = connectorData.namespaces;
+        this.wallet = connectorData.wallet;
+        this.currentCaipNetworkId = connectorData.currentCaipNetworkId;
+      }
+
+      // 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: DeeplinkConnectorSessionData = {
+      namespaces: this.namespaces,
+      wallet: this.wallet,
+      currentCaipNetworkId: this.currentCaipNetworkId
+    };
+
+    try {
+      await this.getStorage().setItem(this.getStorageKey(), connectorData);
+    } catch (error) {
+      // console.error(`${this.type} Connector: Failed to save session.`, error);
+    }
+  }
+
+  // Clears only connector-specific data from storage
+  private async clearSessionStorage(): Promise<void> {
+    try {
+      await this.getStorage().removeItem(this.getStorageKey());
+    } catch (error) {
+      // console.error(`${this.type} Connector: Failed to clear session from storage.`, error);
+    }
+  }
+}