@reown/appkit-solana-react-native 0.0.0-chore-solflare-20250730210452 → 0.0.0-chore-spring-effect-20250909214820

package/lib/module/connectors/{SolanaDeeplinkConnector.js → DeeplinkConnector.js}

@@ -3,18 +3,18 @@
 import { WalletConnector, solana, solanaDevnet, solanaTestnet } from '@reown/appkit-common-react-native';
 import nacl from 'tweetnacl';
 import bs58 from 'bs58';
-import { SolanaDeeplinkProvider, SOLANA_SIGNING_METHODS } from '../providers/SolanaDeeplinkProvider';
-const SOLANA_CLUSTER_TO_CHAIN_ID_PART = {
-  'mainnet-beta': solana.id,
-  'testnet': solanaTestnet.id,
-  'devnet': solanaDevnet.id
+import { DeeplinkProvider, SOLANA_SIGNING_METHODS } from '../providers/DeeplinkProvider';
+const SOLANA_CLUSTER_TO_NETWORK = {
+  'mainnet-beta': solana,
+  'testnet': solanaTestnet,
+  'devnet': solanaDevnet
 };
-export class SolanaDeeplinkConnector extends WalletConnector {
+export class DeeplinkConnector extends WalletConnector {
   currentCaipNetworkId = null;
   static SUPPORTED_NAMESPACE = 'solana';
   constructor(config) {
     super({
-      type: config.walletType
+      type: config.type
     });
     this.config = config;
   }
@@ -27,18 +27,19 @@ export class SolanaDeeplinkConnector extends WalletConnector {
     await this.initializeKeyPair();
     const appScheme = ops.metadata.redirect?.universal ?? ops.metadata.redirect?.native;
     if (!appScheme) {
-      throw new Error(`${this.config.walletType} Connector: No redirect link found in metadata. Please add redirect.universal or redirect.native to the metadata.`);
+      throw new Error(`${this.type} connector: No redirect link found in metadata. Please add redirect.universal or redirect.native to the metadata.`);
     }
     const providerConfig = {
       appScheme,
       dappUrl: ops.metadata.url,
       storage: ops.storage,
+      type: this.type,
+      cluster: this.config?.cluster ?? 'mainnet-beta',
       dappEncryptionKeyPair: this.dappEncryptionKeyPair,
-      walletType: this.config.walletType,
       baseUrl: this.getBaseUrl(),
       encryptionKeyFieldName: this.getEncryptionKeyFieldName()
     };
-    this.provider = new SolanaDeeplinkProvider(providerConfig);
+    this.provider = new DeeplinkProvider(providerConfig);
     await this.restoreSession();
   }
   async initializeKeyPair() {
@@ -53,40 +54,44 @@ export class SolanaDeeplinkConnector extends WalletConnector {
         await this.getStorage().setItem(this.getDappKeypairStorageKey(), bs58.encode(newKeyPair.secretKey));
       }
     } catch (error) {
+      // disconnect and clear session
       await this.disconnect();
       throw error;
     }
   }
   async connect(opts) {
-    if (this.isConnected()) {
+    if (this.isConnected() && this.namespaces) {
       return this.namespaces;
     }
-    const defaultChain = opts?.defaultChain?.split(':')?.[0] === 'solana' ? opts?.defaultChain?.split(':')[1] : opts?.namespaces?.['solana']?.chains?.[0]?.split(':')[1];
-    const requestedCluster = Object.keys(SOLANA_CLUSTER_TO_CHAIN_ID_PART).find(key => SOLANA_CLUSTER_TO_CHAIN_ID_PART[key] === defaultChain);
+    const defaultNetworkId = 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]?.caipNetworkId === defaultNetworkId);
     try {
       const connectResult = await this.getProvider().connect({
         cluster: requestedCluster
       });
-      const solanaChainIdPart = SOLANA_CLUSTER_TO_CHAIN_ID_PART[connectResult.cluster];
-      if (!solanaChainIdPart) {
-        throw new Error(`${this.config.walletType} Connect: Internal - Unknown cluster mapping for ${connectResult.cluster}`);
+      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 = `solana:${solanaChainIdPart}`;
-      this.wallet = this.getWalletInfo();
+      this.currentCaipNetworkId = solanaChainId;
+      this.wallet = {
+        name: this.getWalletInfo()?.name
+      };
       const userPublicKey = this.getProvider().getUserPublicKey();
       if (!userPublicKey) {
-        throw new Error(`${this.config.walletType} Connect: Provider failed to return a user public key.`);
+        throw new Error(`${this.type} Connect: Provider failed to return a user public key.`);
       }
       const caipAddress = `${this.currentCaipNetworkId}:${userPublicKey}`;
       this.namespaces = {
-        [SolanaDeeplinkConnector.SUPPORTED_NAMESPACE]: {
+        [DeeplinkConnector.SUPPORTED_NAMESPACE]: {
           accounts: [caipAddress],
           methods: Object.values(SOLANA_SIGNING_METHODS),
           events: [],
           chains: [this.currentCaipNetworkId]
         }
       };
-      await this.saveSession();
+      await this.saveSession(); // Save connector-specific session on successful connect
+
       return this.namespaces;
     } catch (error) {
       this.clearSession();
@@ -99,7 +104,12 @@ export class SolanaDeeplinkConnector extends WalletConnector {
         await super.disconnect();
       }
     } catch (error) {
-      // console.warn(`${this.config.walletType}Connector: Error during provider disconnect: ${error.message}. Proceeding with local clear.`);
+      console.warn(`${this.type} Connector: Error during provider disconnect: ${error.message}. Proceeding with local clear.`);
+    }
+
+    // Cleanup provider resources
+    if (this.provider) {
+      this.provider.destroy();
     }
     await this.clearSession();
   }
@@ -111,24 +121,24 @@ export class SolanaDeeplinkConnector extends WalletConnector {
   }
   getProvider() {
     if (!this.provider) {
-      throw new Error(`${this.config.walletType} Connector: Provider not initialized. Call init() first.`);
+      throw new Error(`${this.type} Connector: Provider not initialized. Call init() first.`);
     }
     return this.provider;
   }
   getStorage() {
     if (!this.storage) {
-      throw new Error(`${this.config.walletType} Connector: Storage not initialized. Call init() first.`);
+      throw new Error(`${this.type} Connector: Storage not initialized. Call init() first.`);
     }
     return this.storage;
   }
   getNamespaces() {
     if (!this.namespaces) {
-      throw new Error(`${this.config.walletType} Connector: Not connected. Call connect() first.`);
+      throw new Error(`${this.type} Connector: Not connected. Call connect() first.`);
     }
     return this.namespaces;
   }
   getChainId(namespace) {
-    if (namespace === SolanaDeeplinkConnector.SUPPORTED_NAMESPACE) {
+    if (namespace === DeeplinkConnector.SUPPORTED_NAMESPACE) {
       return this.currentCaipNetworkId ?? undefined;
     }
     return undefined;
@@ -136,42 +146,37 @@ export class SolanaDeeplinkConnector extends WalletConnector {
   getProperties() {
     return this.properties;
   }
-  getWalletInfo() {
-    if (!this.isConnected()) {
-      return undefined;
-    }
-    return this.wallet;
-  }
   isConnected() {
     // Rely solely on the provider as the source of truth for connection status.
-    return this.getProvider().isConnected() && !!this.getProvider().getUserPublicKey();
+    const provider = this.getProvider();
+    return provider.isConnected() && !!provider.getUserPublicKey();
   }
   async switchNetwork(network) {
-    const targetClusterName = Object.keys(SOLANA_CLUSTER_TO_CHAIN_ID_PART).find(key => SOLANA_CLUSTER_TO_CHAIN_ID_PART[key] === network.id);
+    const targetClusterName = Object.keys(SOLANA_CLUSTER_TO_NETWORK).find(key => SOLANA_CLUSTER_TO_NETWORK[key]?.caipNetworkId === network.caipNetworkId);
     if (!targetClusterName) {
-      throw new Error(`Cannot switch to unsupported network ID: ${network.id}`);
+      throw new Error(`${this.type} Connector: 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]}` === this.currentCaipNetworkId);
+    const currentClusterName = Object.keys(SOLANA_CLUSTER_TO_NETWORK).find(key => SOLANA_CLUSTER_TO_NETWORK[key]?.caipNetworkId === this.currentCaipNetworkId);
     if (targetClusterName === currentClusterName && this.isConnected()) {
       return Promise.resolve();
     }
 
-    // Solana wallets don't provide a way to switch network, so we need to disconnect and reconnect.
+    // 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 = {
-      defaultChain: `solana:${SOLANA_CLUSTER_TO_CHAIN_ID_PART[targetClusterName]}`
+      defaultNetwork: SOLANA_CLUSTER_TO_NETWORK[targetClusterName]
     };
 
     // Attempt to connect to the new cluster
-    // The connect method will use the defaultChain from opts to determine the 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(SolanaDeeplinkConnector.SUPPORTED_NAMESPACE) !== tempConnectOpts.defaultChain) {
-      throw new Error(`Failed to switch network to ${targetClusterName}. Please try connecting manually.`);
+    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.`);
     }
   }
 
@@ -186,11 +191,35 @@ export class SolanaDeeplinkConnector extends WalletConnector {
       // If provider session is restored, try to restore connector data
       const connectorData = await this.getStorage().getItem(this.getStorageKey());
       if (!connectorData) {
-        return false; // Provider session exists but connector data is missing
+        // 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}`;
+          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;
       }
-      this.namespaces = connectorData.namespaces;
-      this.wallet = connectorData.wallet;
-      this.currentCaipNetworkId = connectorData.currentCaipNetworkId;
 
       // Final validation
       if (this.isConnected()) {
@@ -220,7 +249,7 @@ export class SolanaDeeplinkConnector extends WalletConnector {
     try {
       await this.getStorage().setItem(this.getStorageKey(), connectorData);
     } catch (error) {
-      // console.error(`${this.config.walletType}Connector: Failed to save session.`, error);
+      // console.error(`${this.type} Connector: Failed to save session.`, error);
     }
   }
 
@@ -229,8 +258,8 @@ export class SolanaDeeplinkConnector extends WalletConnector {
     try {
       await this.getStorage().removeItem(this.getStorageKey());
     } catch (error) {
-      // console.error(`${this.config.walletType}Connector: Failed to clear session from storage.`, error);
+      // console.error(`${this.type} Connector: Failed to clear session from storage.`, error);
     }
   }
 }
-//# sourceMappingURL=SolanaDeeplinkConnector.js.map
+//# sourceMappingURL=DeeplinkConnector.js.map

package/lib/module/connectors/DeeplinkConnector.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["WalletConnector","solana","solanaDevnet","solanaTestnet","nacl","bs58","DeeplinkProvider","SOLANA_SIGNING_METHODS","SOLANA_CLUSTER_TO_NETWORK","DeeplinkConnector","currentCaipNetworkId","SUPPORTED_NAMESPACE","constructor","config","type","init","ops","storage","initializeKeyPair","appScheme","metadata","redirect","universal","native","Error","providerConfig","dappUrl","url","cluster","dappEncryptionKeyPair","baseUrl","getBaseUrl","encryptionKeyFieldName","getEncryptionKeyFieldName","provider","restoreSession","secretKeyB58","getStorage","getItem","getDappKeypairStorageKey","secretKey","decode","box","keyPair","fromSecretKey","newKeyPair","setItem","encode","error","disconnect","connect","opts","isConnected","namespaces","defaultNetworkId","defaultNetwork","caipNetworkId","split","chains","requestedCluster","Object","keys","find","key","connectResult","getProvider","solanaChainId","wallet","name","getWalletInfo","userPublicKey","getUserPublicKey","caipAddress","accounts","methods","values","events","saveSession","clearSession","console","warn","message","destroy","undefined","clearSessionStorage","getNamespaces","getChainId","namespace","getProperties","properties","switchNetwork","network","targetClusterName","id","currentClusterName","Promise","resolve","tempConnectOpts","emit","providerSession","connectorData","getStorageKey","getCurrentCluster","removeItem"],"sourceRoot":"../../../src","sources":["connectors/DeeplinkConnector.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/connectors/PhantomConnector.js

@@ -1,14 +1,15 @@
 "use strict";
 
 import { ConstantsUtil } from '@reown/appkit-common-react-native';
-import { SolanaDeeplinkConnector } from './SolanaDeeplinkConnector';
+import { DeeplinkConnector } from './DeeplinkConnector';
 const PHANTOM_BASE_URL = 'https://phantom.app/ul/v1';
 const PHANTOM_CONNECTOR_STORAGE_KEY = '@appkit/phantom-connector-data';
 const PHANTOM_DAPP_KEYPAIR_STORAGE_KEY = '@appkit/phantom-dapp-secret-key';
-export class PhantomConnector extends SolanaDeeplinkConnector {
-  constructor() {
+export class PhantomConnector extends DeeplinkConnector {
+  constructor(config) {
     super({
-      walletType: 'phantom'
+      type: 'phantom',
+      cluster: config?.cluster
     });
   }
   getWalletInfo() {

package/lib/module/connectors/PhantomConnector.js.map

@@ -1 +1 @@
-{"version":3,"names":["ConstantsUtil","SolanaDeeplinkConnector","PHANTOM_BASE_URL","PHANTOM_CONNECTOR_STORAGE_KEY","PHANTOM_DAPP_KEYPAIR_STORAGE_KEY","PhantomConnector","constructor","walletType","getWalletInfo","PHANTOM_CUSTOM_WALLET","getBaseUrl","getStorageKey","getDappKeypairStorageKey","getEncryptionKeyFieldName"],"sourceRoot":"../../../src","sources":["connectors/PhantomConnector.ts"],"mappings":";;AAAA,SAASA,aAAa,QAAyB,mCAAmC;AAClF,SAASC,uBAAuB,QAAQ,2BAA2B;AAEnE,MAAMC,gBAAgB,GAAG,2BAA2B;AACpD,MAAMC,6BAA6B,GAAG,gCAAgC;AACtE,MAAMC,gCAAgC,GAAG,iCAAiC;AAE1E,OAAO,MAAMC,gBAAgB,SAASJ,uBAAuB,CAAC;EAC5DK,WAAWA,CAAA,EAAG;IACZ,KAAK,CAAC;MAAEC,UAAU,EAAE;IAAU,CAAC,CAAC;EAClC;EAESC,aAAaA,CAAA,EAAe;IACnC,OAAOR,aAAa,CAACS,qBAAqB;EAC5C;EAEUC,UAAUA,CAAA,EAAW;IAC7B,OAAOR,gBAAgB;EACzB;EAEUS,aAAaA,CAAA,EAAW;IAChC,OAAOR,6BAA6B;EACtC;EAEUS,wBAAwBA,CAAA,EAAW;IAC3C,OAAOR,gCAAgC;EACzC;EAEUS,yBAAyBA,CAAA,EAAW;IAC5C,OAAO,+BAA+B;EACxC;AACF","ignoreList":[]}
+{"version":3,"names":["ConstantsUtil","DeeplinkConnector","PHANTOM_BASE_URL","PHANTOM_CONNECTOR_STORAGE_KEY","PHANTOM_DAPP_KEYPAIR_STORAGE_KEY","PhantomConnector","constructor","config","type","cluster","getWalletInfo","PHANTOM_CUSTOM_WALLET","getBaseUrl","getStorageKey","getDappKeypairStorageKey","getEncryptionKeyFieldName"],"sourceRoot":"../../../src","sources":["connectors/PhantomConnector.ts"],"mappings":";;AAAA,SAASA,aAAa,QAAyB,mCAAmC;AAClF,SAASC,iBAAiB,QAAQ,qBAAqB;AAGvD,MAAMC,gBAAgB,GAAG,2BAA2B;AACpD,MAAMC,6BAA6B,GAAG,gCAAgC;AACtE,MAAMC,gCAAgC,GAAG,iCAAiC;AAE1E,OAAO,MAAMC,gBAAgB,SAASJ,iBAAiB,CAAC;EACtDK,WAAWA,CAACC,MAA+B,EAAE;IAC3C,KAAK,CAAC;MAAEC,IAAI,EAAE,SAAS;MAAEC,OAAO,EAAEF,MAAM,EAAEE;IAAQ,CAAC,CAAC;EACtD;EAESC,aAAaA,CAAA,EAAe;IACnC,OAAOV,aAAa,CAACW,qBAAqB;EAC5C;EAEUC,UAAUA,CAAA,EAAW;IAC7B,OAAOV,gBAAgB;EACzB;EAEUW,aAAaA,CAAA,EAAW;IAChC,OAAOV,6BAA6B;EACtC;EAEUW,wBAAwBA,CAAA,EAAW;IAC3C,OAAOV,gCAAgC;EACzC;EAEUW,yBAAyBA,CAAA,EAAW;IAC5C,OAAO,+BAA+B;EACxC;AACF","ignoreList":[]}

package/lib/module/connectors/SolflareConnector.js

@@ -1,14 +1,15 @@
 "use strict";
 
 import { ConstantsUtil } from '@reown/appkit-common-react-native';
-import { SolanaDeeplinkConnector } from './SolanaDeeplinkConnector';
+import { DeeplinkConnector } from './DeeplinkConnector';
 const SOLFLARE_BASE_URL = 'https://solflare.com/ul/v1';
 const SOLFLARE_CONNECTOR_STORAGE_KEY = '@appkit/solflare-connector-data';
 const SOLFLARE_DAPP_KEYPAIR_STORAGE_KEY = '@appkit/solflare-dapp-secret-key';
-export class SolflareConnector extends SolanaDeeplinkConnector {
-  constructor() {
+export class SolflareConnector extends DeeplinkConnector {
+  constructor(config) {
     super({
-      walletType: 'solflare'
+      type: 'solflare',
+      cluster: config?.cluster
     });
   }
   getWalletInfo() {

package/lib/module/connectors/SolflareConnector.js.map

@@ -1 +1 @@
-{"version":3,"names":["ConstantsUtil","SolanaDeeplinkConnector","SOLFLARE_BASE_URL","SOLFLARE_CONNECTOR_STORAGE_KEY","SOLFLARE_DAPP_KEYPAIR_STORAGE_KEY","SolflareConnector","constructor","walletType","getWalletInfo","SOLFLARE_CUSTOM_WALLET","getBaseUrl","getStorageKey","getDappKeypairStorageKey","getEncryptionKeyFieldName"],"sourceRoot":"../../../src","sources":["connectors/SolflareConnector.ts"],"mappings":";;AAAA,SAASA,aAAa,QAAyB,mCAAmC;AAClF,SAASC,uBAAuB,QAAQ,2BAA2B;AAEnE,MAAMC,iBAAiB,GAAG,4BAA4B;AACtD,MAAMC,8BAA8B,GAAG,iCAAiC;AACxE,MAAMC,iCAAiC,GAAG,kCAAkC;AAE5E,OAAO,MAAMC,iBAAiB,SAASJ,uBAAuB,CAAC;EAC7DK,WAAWA,CAAA,EAAG;IACZ,KAAK,CAAC;MAAEC,UAAU,EAAE;IAAW,CAAC,CAAC;EACnC;EAESC,aAAaA,CAAA,EAAe;IACnC,OAAOR,aAAa,CAACS,sBAAsB;EAC7C;EAEUC,UAAUA,CAAA,EAAW;IAC7B,OAAOR,iBAAiB;EAC1B;EAEUS,aAAaA,CAAA,EAAW;IAChC,OAAOR,8BAA8B;EACvC;EAEUS,wBAAwBA,CAAA,EAAW;IAC3C,OAAOR,iCAAiC;EAC1C;EAEUS,yBAAyBA,CAAA,EAAW;IAC5C,OAAO,gCAAgC;EACzC;AACF","ignoreList":[]}
+{"version":3,"names":["ConstantsUtil","DeeplinkConnector","SOLFLARE_BASE_URL","SOLFLARE_CONNECTOR_STORAGE_KEY","SOLFLARE_DAPP_KEYPAIR_STORAGE_KEY","SolflareConnector","constructor","config","type","cluster","getWalletInfo","SOLFLARE_CUSTOM_WALLET","getBaseUrl","getStorageKey","getDappKeypairStorageKey","getEncryptionKeyFieldName"],"sourceRoot":"../../../src","sources":["connectors/SolflareConnector.ts"],"mappings":";;AAAA,SAASA,aAAa,QAAyB,mCAAmC;AAClF,SAASC,iBAAiB,QAAQ,qBAAqB;AAGvD,MAAMC,iBAAiB,GAAG,4BAA4B;AACtD,MAAMC,8BAA8B,GAAG,iCAAiC;AACxE,MAAMC,iCAAiC,GAAG,kCAAkC;AAE5E,OAAO,MAAMC,iBAAiB,SAASJ,iBAAiB,CAAC;EACvDK,WAAWA,CAACC,MAAgC,EAAE;IAC5C,KAAK,CAAC;MAAEC,IAAI,EAAE,UAAU;MAAEC,OAAO,EAAEF,MAAM,EAAEE;IAAQ,CAAC,CAAC;EACvD;EAESC,aAAaA,CAAA,EAAe;IACnC,OAAOV,aAAa,CAACW,sBAAsB;EAC7C;EAEUC,UAAUA,CAAA,EAAW;IAC7B,OAAOV,iBAAiB;EAC1B;EAEUW,aAAaA,CAAA,EAAW;IAChC,OAAOV,8BAA8B;EACvC;EAEUW,wBAAwBA,CAAA,EAAW;IAC3C,OAAOV,iCAAiC;EAC1C;EAEUW,yBAAyBA,CAAA,EAAW;IAC5C,OAAO,gCAAgC;EACzC;AACF","ignoreList":[]}

package/lib/module/index.js

@@ -3,13 +3,9 @@
 // Adapter
 export { SolanaAdapter } from './adapter';
 
-// Generic exports
-export { SolanaDeeplinkProvider, SOLANA_SIGNING_METHODS } from './providers/SolanaDeeplinkProvider';
-export { SolanaDeeplinkConnector } from './connectors/SolanaDeeplinkConnector';
+// Types
 
-// Wallet-specific exports
+// Connectors
 export { PhantomConnector } from './connectors/PhantomConnector';
 export { SolflareConnector } from './connectors/SolflareConnector';
-
-// Types
 //# sourceMappingURL=index.js.map

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["SolanaAdapter","SolanaDeeplinkProvider","SOLANA_SIGNING_METHODS","SolanaDeeplinkConnector","PhantomConnector","SolflareConnector"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":";;AAAA;AACA,SAASA,aAAa,QAAQ,WAAW;;AAEzC;AACA,SAASC,sBAAsB,EAAEC,sBAAsB,QAAQ,oCAAoC;AACnG,SAASC,uBAAuB,QAAQ,sCAAsC;;AAE9E;AACA,SAASC,gBAAgB,QAAQ,+BAA+B;AAChE,SAASC,iBAAiB,QAAQ,gCAAgC;;AAElE","ignoreList":[]}
+{"version":3,"names":["SolanaAdapter","PhantomConnector","SolflareConnector"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":";;AAAA;AACA,SAASA,aAAa,QAAQ,WAAW;;AAEzC;;AAGA;AACA,SAASC,gBAAgB,QAAQ,+BAA+B;AAChE,SAASC,iBAAiB,QAAQ,gCAAgC","ignoreList":[]}