@reown/appkit-solana-react-native 2.0.0-alpha.3 → 2.0.0-alpha.5

package/lib/commonjs/connectors/SolflareConnector.js

@@ -0,0 +1,36 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.SolflareConnector = void 0;
+var _appkitCommonReactNative = require("@reown/appkit-common-react-native");
+var _DeeplinkConnector = require("./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';
+class SolflareConnector extends _DeeplinkConnector.DeeplinkConnector {
+  constructor(config) {
+    super({
+      type: 'solflare',
+      cluster: config?.cluster
+    });
+  }
+  getWalletInfo() {
+    return _appkitCommonReactNative.ConstantsUtil.SOLFLARE_CUSTOM_WALLET;
+  }
+  getBaseUrl() {
+    return SOLFLARE_BASE_URL;
+  }
+  getStorageKey() {
+    return SOLFLARE_CONNECTOR_STORAGE_KEY;
+  }
+  getDappKeypairStorageKey() {
+    return SOLFLARE_DAPP_KEYPAIR_STORAGE_KEY;
+  }
+  getEncryptionKeyFieldName() {
+    return 'solflare_encryption_public_key';
+  }
+}
+exports.SolflareConnector = SolflareConnector;
+//# sourceMappingURL=SolflareConnector.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["_appkitCommonReactNative","require","_DeeplinkConnector","SOLFLARE_BASE_URL","SOLFLARE_CONNECTOR_STORAGE_KEY","SOLFLARE_DAPP_KEYPAIR_STORAGE_KEY","SolflareConnector","DeeplinkConnector","constructor","config","type","cluster","getWalletInfo","ConstantsUtil","SOLFLARE_CUSTOM_WALLET","getBaseUrl","getStorageKey","getDappKeypairStorageKey","getEncryptionKeyFieldName","exports"],"sourceRoot":"../../../src","sources":["connectors/SolflareConnector.ts"],"mappings":";;;;;;AAAA,IAAAA,wBAAA,GAAAC,OAAA;AACA,IAAAC,kBAAA,GAAAD,OAAA;AAGA,MAAME,iBAAiB,GAAG,4BAA4B;AACtD,MAAMC,8BAA8B,GAAG,iCAAiC;AACxE,MAAMC,iCAAiC,GAAG,kCAAkC;AAErE,MAAMC,iBAAiB,SAASC,oCAAiB,CAAC;EACvDC,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,OAAOC,sCAAa,CAACC,sBAAsB;EAC7C;EAEUC,UAAUA,CAAA,EAAW;IAC7B,OAAOZ,iBAAiB;EAC1B;EAEUa,aAAaA,CAAA,EAAW;IAChC,OAAOZ,8BAA8B;EACvC;EAEUa,wBAAwBA,CAAA,EAAW;IAC3C,OAAOZ,iCAAiC;EAC1C;EAEUa,yBAAyBA,CAAA,EAAW;IAC5C,OAAO,gCAAgC;EACzC;AACF;AAACC,OAAA,CAAAb,iBAAA,GAAAA,iBAAA","ignoreList":[]}

package/lib/commonjs/index.js

@@ -15,6 +15,13 @@ Object.defineProperty(exports, "SolanaAdapter", {
     return _adapter.SolanaAdapter;
   }
 });
+Object.defineProperty(exports, "SolflareConnector", {
+  enumerable: true,
+  get: function () {
+    return _SolflareConnector.SolflareConnector;
+  }
+});
 var _adapter = require("./adapter");
 var _PhantomConnector = require("./connectors/PhantomConnector");
+var _SolflareConnector = require("./connectors/SolflareConnector");
 //# sourceMappingURL=index.js.map

package/lib/commonjs/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_adapter","require","_PhantomConnector"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":";;;;;;;;;;;;;;;;;AACA,IAAAA,QAAA,GAAAC,OAAA;AAMA,IAAAC,iBAAA,GAAAD,OAAA","ignoreList":[]}
+{"version":3,"names":["_adapter","require","_PhantomConnector","_SolflareConnector"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AACA,IAAAA,QAAA,GAAAC,OAAA;AAMA,IAAAC,iBAAA,GAAAD,OAAA;AACA,IAAAE,kBAAA,GAAAF,OAAA","ignoreList":[]}

package/lib/commonjs/providers/{PhantomProvider.js → DeeplinkProvider.js}

@@ -3,15 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SOLANA_SIGNING_METHODS = exports.PhantomProvider = void 0;
+exports.SOLANA_SIGNING_METHODS = exports.DeeplinkProvider = void 0;
 var _reactNative = require("react-native");
 var _tweetnacl = _interopRequireDefault(require("tweetnacl"));
 var _bs = _interopRequireDefault(require("bs58"));
 var _buffer = require("buffer");
 var _events = _interopRequireDefault(require("events"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const PHANTOM_BASE_URL = 'https://phantom.app/ul/v1';
-const PHANTOM_PROVIDER_STORAGE_KEY = '@appkit/phantom-provider-session';
 const SOLANA_SIGNING_METHODS = exports.SOLANA_SIGNING_METHODS = {
   SOLANA_SIGN_TRANSACTION: 'solana_signTransaction',
   SOLANA_SIGN_MESSAGE: 'solana_signMessage',
@@ -21,11 +19,11 @@ const SOLANA_SIGNING_METHODS = exports.SOLANA_SIGNING_METHODS = {
 function isValidSolanaSigningMethod(method) {
   return Object.values(SOLANA_SIGNING_METHODS).includes(method);
 }
-class PhantomProvider extends _events.default {
-  currentCluster = 'mainnet-beta';
+class DeeplinkProvider extends _events.default {
+  sharedKey = null;
   sessionToken = null;
   userPublicKey = null;
-  phantomEncryptionPublicKeyBs58 = null;
+  walletEncryptionPublicKeyBs58 = null;
 
   // Single subscription management - deep links are sequential by nature
   activeSubscription = null;
@@ -33,9 +31,13 @@ class PhantomProvider extends _events.default {
   constructor(config) {
     super();
     this.config = config;
+    this.currentCluster = config.cluster ?? 'mainnet-beta';
     this.dappEncryptionKeyPair = config.dappEncryptionKeyPair;
     this.storage = config.storage;
   }
+  getSessionStorageKey() {
+    return `@appkit/${this.config.type}-provider-session`;
+  }
 
   /**
    * Cleanup method to be called when the provider is destroyed
@@ -73,9 +75,47 @@ class PhantomProvider extends _events.default {
   isConnected() {
     return !!this.sessionToken && !!this.userPublicKey && !!this.dappEncryptionKeyPair;
   }
+  getCurrentCluster() {
+    return this.currentCluster;
+  }
   buildUrl(rpcMethod, params) {
     const query = new URLSearchParams(params).toString();
-    return `${PHANTOM_BASE_URL}/${rpcMethod}?${query}`;
+    return `${this.config.baseUrl}/${rpcMethod}?${query}`;
+  }
+
+  /**
+   * Open a deeplink URL and wait for a redirect back to the app. Handles subscription
+   * lifecycle and common error extraction from `errorCode`/`errorMessage` query params.
+   */
+  async openDeeplinkAndWait(deeplinkUrl, processParams, contextLabel) {
+    return new Promise((resolve, reject) => {
+      const handleDeepLink = async event => {
+        try {
+          this.cleanupActiveSubscription();
+          const fullUrl = event.url;
+          if (!fullUrl.startsWith(this.config.appScheme)) {
+            return reject(new Error(`${this.config.type} provider: ${contextLabel}: Unexpected redirect URI.`));
+          }
+          const params = new URLSearchParams(fullUrl.substring(fullUrl.indexOf('?') + 1));
+          const errorCode = params.get('errorCode');
+          const errorMessage = params.get('errorMessage');
+          if (errorCode) {
+            return reject(new Error(`${this.config.type} provider: ${contextLabel} Failed: ${errorMessage || 'Unknown error'} (Code: ${errorCode})`));
+          }
+          const result = await Promise.resolve(processParams(params));
+          resolve(result);
+        } catch (error) {
+          this.cleanupActiveSubscription();
+          reject(error);
+        }
+      };
+      const subscription = _reactNative.Linking.addEventListener('url', handleDeepLink);
+      this.setActiveSubscription(subscription);
+      _reactNative.Linking.openURL(deeplinkUrl).catch(err => {
+        this.cleanupActiveSubscription();
+        reject(new Error(`${this.config.type} provider: Failed to open wallet for ${contextLabel}: ${err.message}.`));
+      });
+    });
   }
   getRpcMethodName(method) {
     switch (method) {
@@ -92,73 +132,94 @@ class PhantomProvider extends _events.default {
         throw new Error(`Unsupported Solana signing method: ${method}`);
     }
   }
-  encryptPayload(payload, phantomPublicKeyBs58ToEncryptFor) {
-    if (!phantomPublicKeyBs58ToEncryptFor) {
+  encryptPayload(payload, walletPublicKeyBs58) {
+    if (!walletPublicKeyBs58) {
       return null;
     }
     try {
-      const phantomPublicKeyBytes = _bs.default.decode(phantomPublicKeyBs58ToEncryptFor);
       const nonce = _tweetnacl.default.randomBytes(_tweetnacl.default.box.nonceLength);
       const payloadBytes = _buffer.Buffer.from(JSON.stringify(payload), 'utf8');
-      const encryptedPayload = _tweetnacl.default.box(payloadBytes, nonce, phantomPublicKeyBytes, this.dappEncryptionKeyPair.secretKey);
+      let encryptedPayload;
+      if (this.sharedKey) {
+        encryptedPayload = _tweetnacl.default.box.after(payloadBytes, nonce, this.sharedKey);
+      } else {
+        const walletPublicKeyBytes = _bs.default.decode(walletPublicKeyBs58);
+        encryptedPayload = _tweetnacl.default.box(payloadBytes, nonce, walletPublicKeyBytes, this.dappEncryptionKeyPair.secretKey);
+      }
       return {
         nonce: _bs.default.encode(nonce),
         encryptedPayload: _bs.default.encode(encryptedPayload)
       };
     } catch (error) {
+      console.warn(`${this.config.type} provider: Failed to encrypt payload.`, error);
       return null;
     }
   }
-  decryptPayload(encryptedDataBs58, nonceBs58, phantomSenderPublicKeyBs58) {
+  decryptPayload(encryptedDataBs58, nonceBs58, walletSenderPublicKeyBs58) {
     try {
-      const encryptedDataBytes = _bs.default.decode(encryptedDataBs58);
+      const formattedEncryptedDataBs58 = encryptedDataBs58.replace('#', '');
+      const encryptedDataBytes = _bs.default.decode(formattedEncryptedDataBs58);
       const nonceBytes = _bs.default.decode(nonceBs58);
-      const phantomSenderPublicKeyBytes = _bs.default.decode(phantomSenderPublicKeyBs58);
-      const decryptedPayloadBytes = _tweetnacl.default.box.open(encryptedDataBytes, nonceBytes, phantomSenderPublicKeyBytes, this.dappEncryptionKeyPair.secretKey);
+      let decryptedPayloadBytes;
+      if (this.sharedKey) {
+        decryptedPayloadBytes = _tweetnacl.default.box.open.after(encryptedDataBytes, nonceBytes, this.sharedKey);
+      } else {
+        const walletSenderPublicKeyBytes = _bs.default.decode(walletSenderPublicKeyBs58);
+        decryptedPayloadBytes = _tweetnacl.default.box.open(encryptedDataBytes, nonceBytes, walletSenderPublicKeyBytes, this.dappEncryptionKeyPair.secretKey);
+      }
       if (!decryptedPayloadBytes) {
         return null;
       }
       return JSON.parse(_buffer.Buffer.from(decryptedPayloadBytes).toString('utf8'));
     } catch (error) {
+      console.warn(`${this.config.type} provider: Failed to decrypt payload.`, error);
       return null;
     }
   }
   async restoreSession() {
     try {
-      const session = await this.storage.getItem(PHANTOM_PROVIDER_STORAGE_KEY);
+      const session = await this.storage.getItem(this.getSessionStorageKey());
       if (session) {
         this.setSession(session);
+
+        // Recompute shared key on session restore
+        try {
+          const walletPublicKeyBytes = _bs.default.decode(session.walletEncryptionPublicKeyBs58);
+          this.sharedKey = _tweetnacl.default.box.before(walletPublicKeyBytes, this.dappEncryptionKeyPair.secretKey);
+        } catch (e) {
+          this.sharedKey = null;
+        }
         return true;
       }
       return false;
     } catch (error) {
-      // console.error('PhantomProvider: Failed to restore session.', error);
+      // console.error(`${this.config.type} provider: Failed to restore session.`, error);
       await this.clearSessionStorage(); // Clear potentially corrupt data
 
       return false;
     }
   }
   async saveSession() {
-    if (!this.sessionToken || !this.userPublicKey || !this.phantomEncryptionPublicKeyBs58) {
+    if (!this.sessionToken || !this.userPublicKey || !this.walletEncryptionPublicKeyBs58) {
       return; // Cannot save incomplete session
     }
     const session = {
       sessionToken: this.sessionToken,
       userPublicKey: this.userPublicKey,
-      phantomEncryptionPublicKeyBs58: this.phantomEncryptionPublicKeyBs58,
+      walletEncryptionPublicKeyBs58: this.walletEncryptionPublicKeyBs58,
       cluster: this.currentCluster
     };
     try {
-      await this.storage.setItem(PHANTOM_PROVIDER_STORAGE_KEY, session);
+      await this.storage.setItem(this.getSessionStorageKey(), session);
     } catch (error) {
-      // console.error('PhantomProvider: Failed to save session.', error);
+      // console.error(`${this.config.type} provider: Failed to save session.`, error);
     }
   }
   async clearSessionStorage() {
     try {
-      await this.storage.removeItem(PHANTOM_PROVIDER_STORAGE_KEY);
+      await this.storage.removeItem(this.getSessionStorageKey());
     } catch (error) {
-      // console.error('PhantomProvider: Failed to clear session storage.', error);
+      // console.error(`${this.config.type} provider: Failed to clear session storage.`, error);
     }
   }
   async connect(params) {
@@ -171,60 +232,43 @@ class PhantomProvider extends _events.default {
       cluster
     };
     const url = this.buildUrl('connect', connectDeeplinkParams);
-    return new Promise((resolve, reject) => {
-      const handleDeepLink = async event => {
-        try {
-          this.cleanupActiveSubscription();
-          const fullUrl = event.url;
-          if (fullUrl.startsWith(this.config.appScheme)) {
-            const responseUrlParams = new URLSearchParams(fullUrl.substring(fullUrl.indexOf('?') + 1));
-            const errorCode = responseUrlParams.get('errorCode');
-            const errorMessage = responseUrlParams.get('errorMessage');
-            if (errorCode) {
-              return reject(new Error(`Phantom Connection Failed: ${errorMessage || 'Unknown error'} (Code: ${errorCode})`));
-            }
-            const responsePayload = {
-              phantom_encryption_public_key: responseUrlParams.get('phantom_encryption_public_key'),
-              nonce: responseUrlParams.get('nonce'),
-              data: responseUrlParams.get('data')
-            };
-            if (!responsePayload.phantom_encryption_public_key || !responsePayload.nonce || !responsePayload.data) {
-              return reject(new Error('Phantom Connect: Invalid response - missing parameters.'));
-            }
-            const decryptedData = this.decryptPayload(responsePayload.data, responsePayload.nonce, responsePayload.phantom_encryption_public_key);
-            if (!decryptedData || !decryptedData.public_key || !decryptedData.session) {
-              return reject(new Error('Phantom Connect: Failed to decrypt or invalid decrypted data.'));
-            }
-            this.userPublicKey = decryptedData.public_key;
-            this.sessionToken = decryptedData.session;
-            this.phantomEncryptionPublicKeyBs58 = responsePayload.phantom_encryption_public_key;
+    return this.openDeeplinkAndWait(url, responseUrlParams => {
+      const responsePayload = {
+        wallet_encryption_public_key: responseUrlParams.get(this.config.encryptionKeyFieldName),
+        nonce: responseUrlParams.get('nonce'),
+        data: responseUrlParams.get('data')
+      };
+      if (!responsePayload.wallet_encryption_public_key || !responsePayload.nonce || !responsePayload.data) {
+        throw new Error(`${this.config.type} provider: Invalid response - missing parameters.`);
+      }
+      const decryptedData = this.decryptPayload(responsePayload.data, responsePayload.nonce, responsePayload.wallet_encryption_public_key);
+      if (!decryptedData || !decryptedData.public_key || !decryptedData.session) {
+        throw new Error(`${this.config.type} provider: Failed to decrypt or invalid decrypted data.`);
+      }
+      this.userPublicKey = decryptedData.public_key;
+      this.sessionToken = decryptedData.session;
+      this.walletEncryptionPublicKeyBs58 = responsePayload.wallet_encryption_public_key;
 
-            // Save session on successful connect
-            this.saveSession();
-            resolve({
-              userPublicKey: this.userPublicKey,
-              sessionToken: this.sessionToken,
-              phantomEncryptionPublicKeyBs58: this.phantomEncryptionPublicKeyBs58,
-              cluster
-            });
-          } else {
-            reject(new Error('Phantom Connect: Unexpected redirect URI.'));
-          }
-        } catch (error) {
-          this.cleanupActiveSubscription();
-          reject(error);
-        }
+      // Precompute shared key for subsequent communications
+      try {
+        const walletPublicKeyBytes = _bs.default.decode(this.walletEncryptionPublicKeyBs58);
+        this.sharedKey = _tweetnacl.default.box.before(walletPublicKeyBytes, this.dappEncryptionKeyPair.secretKey);
+      } catch (e) {
+        this.sharedKey = null;
+      }
+
+      // Save session on successful connect
+      this.saveSession();
+      return {
+        userPublicKey: this.userPublicKey,
+        sessionToken: this.sessionToken,
+        walletEncryptionPublicKeyBs58: this.walletEncryptionPublicKeyBs58,
+        cluster
       };
-      const subscription = _reactNative.Linking.addEventListener('url', handleDeepLink);
-      this.setActiveSubscription(subscription);
-      _reactNative.Linking.openURL(url).catch(err => {
-        this.cleanupActiveSubscription();
-        reject(new Error(`Failed to open Phantom wallet: ${err.message}. Is it installed?`));
-      });
-    });
+    }, 'Connection');
   }
   async disconnect() {
-    if (!this.sessionToken || !this.phantomEncryptionPublicKeyBs58) {
+    if (!this.sessionToken || !this.walletEncryptionPublicKeyBs58) {
       await this.clearSession();
       this.emit('disconnect');
       return Promise.resolve();
@@ -232,9 +276,9 @@ class PhantomProvider extends _events.default {
     const payloadToEncrypt = {
       session: this.sessionToken
     };
-    const encryptedDisconnectPayload = this.encryptPayload(payloadToEncrypt, this.phantomEncryptionPublicKeyBs58);
+    const encryptedDisconnectPayload = this.encryptPayload(payloadToEncrypt, this.walletEncryptionPublicKeyBs58);
     if (!encryptedDisconnectPayload) {
-      // console.warn('PhantomProvider: Failed to encrypt disconnect payload. Clearing session locally.');
+      // console.warn(`${this.config.type} provider: Failed to encrypt disconnect payload. Clearing session locally.`);
       await this.clearSession();
       this.emit('disconnect');
       return Promise.resolve(); // Or reject, depending on desired strictness
@@ -246,53 +290,35 @@ class PhantomProvider extends _events.default {
       nonce: encryptedDisconnectPayload.nonce
     };
     const url = this.buildUrl('disconnect', disconnectDeeplinkParams);
-    return new Promise((resolve, reject) => {
-      const handleDeepLink = event => {
-        try {
-          this.cleanupActiveSubscription();
-          if (event.url.startsWith(this.config.appScheme)) {
-            this.clearSession();
-            resolve();
-          } else {
-            this.clearSession();
-            reject(new Error('Phantom Disconnect: Unexpected redirect URI.'));
-          }
-        } catch (error) {
-          this.cleanupActiveSubscription();
-          this.clearSession();
-          reject(error);
-        }
-      };
-      const subscription = _reactNative.Linking.addEventListener('url', handleDeepLink);
-      this.setActiveSubscription(subscription);
-      _reactNative.Linking.openURL(url).catch(err => {
-        this.cleanupActiveSubscription();
-        this.clearSession();
-        reject(new Error(`Failed to open Phantom for disconnection: ${err.message}.`));
-      });
-    });
+    return this.openDeeplinkAndWait(url, () => {
+      this.clearSession();
+    }, 'Disconnection');
   }
   async clearSession() {
     this.sessionToken = null;
     this.userPublicKey = null;
-    this.phantomEncryptionPublicKeyBs58 = null;
+    this.walletEncryptionPublicKeyBs58 = null;
+    if (this.sharedKey) {
+      this.sharedKey.fill(0);
+    }
+    this.sharedKey = null;
     this.cleanupActiveSubscription();
     await this.clearSessionStorage();
   }
   setSession(session) {
     this.sessionToken = session.sessionToken;
     this.userPublicKey = session.userPublicKey;
-    this.phantomEncryptionPublicKeyBs58 = session.phantomEncryptionPublicKeyBs58;
+    this.walletEncryptionPublicKeyBs58 = session.walletEncryptionPublicKeyBs58;
     this.currentCluster = session.cluster;
   }
   async request(args, _chainId) {
     if (!isValidSolanaSigningMethod(args.method)) {
-      throw new Error(`PhantomProvider: Unsupported method: ${args.method}. Only Solana signing methods are supported.`);
+      throw new Error(`${this.config.type} provider: Unsupported method: ${args.method}. Only Solana signing methods are supported.`);
     }
     const signingMethod = args.method;
     const requestParams = args.params;
-    if (!this.isConnected() || !this.sessionToken || !this.phantomEncryptionPublicKeyBs58) {
-      throw new Error('PhantomProvider: Not connected or session details missing. Cannot process request.');
+    if (!this.isConnected() || !this.sessionToken || !this.walletEncryptionPublicKeyBs58) {
+      throw new Error(`${this.config.type} provider: Not connected or session details missing. Cannot process request.`);
     }
     const rpcMethodName = this.getRpcMethodName(signingMethod);
     let deeplinkUrl = '';
@@ -308,9 +334,9 @@ class PhantomProvider extends _events.default {
             session: this.sessionToken,
             transaction: typedParams.transaction
           };
-          const encryptedData = this.encryptPayload(dataToEncrypt, this.phantomEncryptionPublicKeyBs58);
+          const encryptedData = this.encryptPayload(dataToEncrypt, this.walletEncryptionPublicKeyBs58);
           if (!encryptedData) {
-            throw new Error(`PhantomProvider: Failed to encrypt payload for ${signingMethod}.`);
+            throw new Error(`${this.config.type} provider: Failed to encrypt payload for ${signingMethod}.`);
           }
           const signTxDeeplinkParams = {
             dapp_encryption_public_key: _bs.default.encode(this.dappEncryptionKeyPair.publicKey),
@@ -326,7 +352,7 @@ class PhantomProvider extends _events.default {
         {
           const typedParams = requestParams;
           if (!typedParams || typeof typedParams.message === 'undefined') {
-            throw new Error(`Missing 'message' in params for ${signingMethod}`);
+            throw new Error(`${this.config.type} provider: Missing 'message' in params for ${signingMethod}`);
           }
           let messageBs58;
           if (typedParams.message instanceof Uint8Array) {
@@ -339,16 +365,16 @@ class PhantomProvider extends _events.default {
               messageBs58 = _bs.default.encode(_buffer.Buffer.from(typedParams.message));
             }
           } else {
-            throw new Error('Invalid message format for signMessage. Expected Uint8Array or string.');
+            throw new Error(`${this.config.type} provider: Invalid message format for signMessage. Expected Uint8Array or string.`);
           }
           const dataToEncrypt = {
             message: messageBs58,
             session: this.sessionToken,
             display: typedParams.display || 'utf8'
           };
-          const encryptedPayloadData = this.encryptPayload(dataToEncrypt, this.phantomEncryptionPublicKeyBs58);
+          const encryptedPayloadData = this.encryptPayload(dataToEncrypt, this.walletEncryptionPublicKeyBs58);
           if (!encryptedPayloadData) {
-            throw new Error('PhantomProvider: Failed to encrypt payload for signMessage.');
+            throw new Error(`${this.config.type} provider: Failed to encrypt payload for signMessage.`);
           }
           const signMsgDeeplinkQueryPayload = {
             dapp_encryption_public_key: _bs.default.encode(this.dappEncryptionKeyPair.publicKey),
@@ -363,15 +389,15 @@ class PhantomProvider extends _events.default {
         {
           const typedParams = requestParams;
           if (!typedParams || !Array.isArray(typedParams.transactions) || !typedParams.transactions.every(t => typeof t === 'string')) {
-            throw new Error(`Missing or invalid 'transactions' (array of base58 strings) in params for ${signingMethod}`);
+            throw new Error(`${this.config.type} provider: Missing or invalid 'transactions' (array of base58 strings) in params for ${signingMethod}`);
           }
           const dataToEncrypt = {
             session: this.sessionToken,
             transactions: typedParams.transactions
           };
-          const encryptedData = this.encryptPayload(dataToEncrypt, this.phantomEncryptionPublicKeyBs58);
+          const encryptedData = this.encryptPayload(dataToEncrypt, this.walletEncryptionPublicKeyBs58);
           if (!encryptedData) {
-            throw new Error(`PhantomProvider: Failed to encrypt payload for ${signingMethod}.`);
+            throw new Error(`${this.config.type} provider: Failed to encrypt payload for ${signingMethod}.`);
           }
           const signAllTxDeeplinkParams = {
             dapp_encryption_public_key: _bs.default.encode(this.dappEncryptionKeyPair.publicKey),
@@ -385,47 +411,22 @@ class PhantomProvider extends _events.default {
         }
       default:
         {
-          throw new Error(`PhantomProvider: Unhandled signing method: ${signingMethod}`);
+          throw new Error(`${this.config.type} provider: Unhandled signing method: ${signingMethod}`);
         }
     }
-    return new Promise((resolve, reject) => {
-      const handleDeepLink = async event => {
-        try {
-          this.cleanupActiveSubscription();
-          const fullUrl = event.url;
-          if (fullUrl.startsWith(this.config.appScheme)) {
-            const responseUrlParams = new URLSearchParams(fullUrl.substring(fullUrl.indexOf('?') + 1));
-            const errorCode = responseUrlParams.get('errorCode');
-            const errorMessage = responseUrlParams.get('errorMessage');
-            if (errorCode) {
-              return reject(new Error(`Phantom ${signingMethod} Failed: ${errorMessage || 'Unknown error'} (Code: ${errorCode})`));
-            }
-            const responseNonce = responseUrlParams.get('nonce');
-            const responseData = responseUrlParams.get('data');
-            if (!responseNonce || !responseData) {
-              return reject(new Error(`Phantom ${signingMethod}: Invalid response - missing nonce or data.`));
-            }
-            const decryptedResult = this.decryptPayload(responseData, responseNonce, this.phantomEncryptionPublicKeyBs58);
-            if (!decryptedResult) {
-              return reject(new Error(`Phantom ${signingMethod}: Failed to decrypt response or invalid decrypted data.`));
-            }
-            resolve(decryptedResult);
-          } else {
-            reject(new Error(`Phantom ${signingMethod}: Unexpected redirect URI.`));
-          }
-        } catch (error) {
-          this.cleanupActiveSubscription();
-          reject(error);
-        }
-      };
-      const subscription = _reactNative.Linking.addEventListener('url', handleDeepLink);
-      this.setActiveSubscription(subscription);
-      _reactNative.Linking.openURL(deeplinkUrl).catch(err => {
-        this.cleanupActiveSubscription();
-        reject(new Error(`Failed to open Phantom for ${signingMethod}: ${err.message}. Is it installed?`));
-      });
-    });
+    return this.openDeeplinkAndWait(deeplinkUrl, responseUrlParams => {
+      const responseNonce = responseUrlParams.get('nonce');
+      const responseData = responseUrlParams.get('data');
+      if (!responseNonce || !responseData) {
+        throw new Error(`${this.config.type} provider: ${signingMethod}: Invalid response - missing nonce or data.`);
+      }
+      const decryptedResult = this.decryptPayload(responseData, responseNonce, this.walletEncryptionPublicKeyBs58);
+      if (!decryptedResult) {
+        throw new Error(`${this.config.type} provider: ${signingMethod}: Failed to decrypt response or invalid decrypted data.`);
+      }
+      return decryptedResult;
+    }, signingMethod);
   }
 }
-exports.PhantomProvider = PhantomProvider;
-//# sourceMappingURL=PhantomProvider.js.map
+exports.DeeplinkProvider = DeeplinkProvider;
+//# sourceMappingURL=DeeplinkProvider.js.map

package/lib/commonjs/providers/DeeplinkProvider.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_reactNative","require","_tweetnacl","_interopRequireDefault","_bs","_buffer","_events","e","__esModule","default","SOLANA_SIGNING_METHODS","exports","SOLANA_SIGN_TRANSACTION","SOLANA_SIGN_MESSAGE","SOLANA_SIGN_AND_SEND_TRANSACTION","SOLANA_SIGN_ALL_TRANSACTIONS","isValidSolanaSigningMethod","method","Object","values","includes","DeeplinkProvider","EventEmitter","sharedKey","sessionToken","userPublicKey","walletEncryptionPublicKeyBs58","activeSubscription","isOperationPending","constructor","config","currentCluster","cluster","dappEncryptionKeyPair","storage","getSessionStorageKey","type","destroy","cleanupActiveSubscription","removeAllListeners","remove","setActiveSubscription","subscription","getUserPublicKey","isConnected","getCurrentCluster","buildUrl","rpcMethod","params","query","URLSearchParams","toString","baseUrl","openDeeplinkAndWait","deeplinkUrl","processParams","contextLabel","Promise","resolve","reject","handleDeepLink","event","fullUrl","url","startsWith","appScheme","Error","substring","indexOf","errorCode","get","errorMessage","result","error","Linking","addEventListener","openURL","catch","err","message","getRpcMethodName","encryptPayload","payload","walletPublicKeyBs58","nonce","nacl","randomBytes","box","nonceLength","payloadBytes","Buffer","from","JSON","stringify","encryptedPayload","after","walletPublicKeyBytes","bs58","decode","secretKey","encode","console","warn","decryptPayload","encryptedDataBs58","nonceBs58","walletSenderPublicKeyBs58","formattedEncryptedDataBs58","replace","encryptedDataBytes","nonceBytes","decryptedPayloadBytes","open","walletSenderPublicKeyBytes","parse","restoreSession","session","getItem","setSession","before","clearSessionStorage","saveSession","setItem","removeItem","connect","connectDeeplinkParams","app_url","dappUrl","dapp_encryption_public_key","publicKey","redirect_link","responseUrlParams","responsePayload","wallet_encryption_public_key","encryptionKeyFieldName","data","decryptedData","public_key","disconnect","clearSession","emit","payloadToEncrypt","encryptedDisconnectPayload","disconnectDeeplinkParams","fill","request","args","_chainId","signingMethod","requestParams","rpcMethodName","typedParams","transaction","dataToEncrypt","encryptedData","signTxDeeplinkParams","messageBs58","Uint8Array","display","encryptedPayloadData","signMsgDeeplinkQueryPayload","Array","isArray","transactions","every","t","signAllTxDeeplinkParams","responseNonce","responseData","decryptedResult"],"sourceRoot":"../../../src","sources":["providers/DeeplinkProvider.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/adapter.js

@@ -70,7 +70,7 @@ export class SolanaAdapter extends SolanaBaseAdapter {
     if (!network) {
       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');
     }
@@ -123,7 +123,7 @@ export class SolanaAdapter extends SolanaBaseAdapter {
     if (!this.connector) {
       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');
     }
@@ -179,7 +179,7 @@ export class SolanaAdapter extends SolanaBaseAdapter {
   }
   async switchNetwork(network) {
     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 {
       await this.connector.switchNetwork(network);