@dynamic-labs/solana 1.1.0-alpha.9 → 1.1.0-phantom.0

package/CHANGELOG.md

@@ -1,4 +1,61 @@
 
+## [1.1.0-phantom.0](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.12...v1.1.0-phantom.0) (2024-01-22)
+
+
+### Features
+
+* add createWalletClientFromWallet helper function ([#4416](https://github.com/dynamic-labs/DynamicAuth/issues/4416)) ([b384898](https://github.com/dynamic-labs/DynamicAuth/commit/b384898061bb3f9b38b2ed670b6650cfc1d4b429))
+* add hardware wallets to wallet book ([#4445](https://github.com/dynamic-labs/DynamicAuth/issues/4445)) ([66c0f5b](https://github.com/dynamic-labs/DynamicAuth/commit/66c0f5b29a6a700099bb95a6f7622f6178e0bccf))
+* add redirect based phantom deeplinking ([c40dfd2](https://github.com/dynamic-labs/DynamicAuth/commit/c40dfd21d0692b9d33593d564ae6879ab15547e2))
+
+
+### Bug Fixes
+
+* breaking changes script ([#4440](https://github.com/dynamic-labs/DynamicAuth/issues/4440)) ([446173d](https://github.com/dynamic-labs/DynamicAuth/commit/446173d074d652d81856c6412e304b46b1565320))
+* broken help icon in create passkey view ([#4428](https://github.com/dynamic-labs/DynamicAuth/issues/4428)) ([e0ffc02](https://github.com/dynamic-labs/DynamicAuth/commit/e0ffc02ffea34b7ac3198ff6e1baf7f9907acddd))
+
+## [1.1.0-alpha.12](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.11...v1.1.0-alpha.12) (2024-01-18)
+
+
+### Features
+
+* expose setAuthMode method ([#4419](https://github.com/dynamic-labs/DynamicAuth/issues/4419)) ([7d156b3](https://github.com/dynamic-labs/DynamicAuth/commit/7d156b3e0eab9b9a80f70ff1c5201d90693ae755))
+
+
+### Bug Fixes
+
+* call onUnlinkSuccess in headless mode too ([#4412](https://github.com/dynamic-labs/DynamicAuth/issues/4412)) ([4c76af9](https://github.com/dynamic-labs/DynamicAuth/commit/4c76af9ac7c7b43883742d1289558dfcb5d612ca))
+* correctly map keplr chain ids from project settings ([#4418](https://github.com/dynamic-labs/DynamicAuth/issues/4418)) ([7046364](https://github.com/dynamic-labs/DynamicAuth/commit/7046364a316f7551f0b995eaae7afea13502eb9b))
+* logging in with an email linked to a third party wallet gets stuck on otp view ([#4407](https://github.com/dynamic-labs/DynamicAuth/issues/4407)) ([35bf142](https://github.com/dynamic-labs/DynamicAuth/commit/35bf142e74efeef866dbd7b8157a049cd36eeccb))
+
+## [1.1.0-alpha.11](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.10...v1.1.0-alpha.11) (2024-01-17)
+
+
+### Features
+
+* add Leather wallet and BtcKit connector ([#4335](https://github.com/dynamic-labs/DynamicAuth/issues/4335)) ([fe3316b](https://github.com/dynamic-labs/DynamicAuth/commit/fe3316b5be9ef17eea885e99cf925ccd0f271da7))
+* add solana injected wallet configuration to walletbook ([#4375](https://github.com/dynamic-labs/DynamicAuth/issues/4375)) ([3677ce5](https://github.com/dynamic-labs/DynamicAuth/commit/3677ce5ff40d0c00bfaf0daa0d5d67bc40706ee0))
+* add support for unisat wallet ([#4355](https://github.com/dynamic-labs/DynamicAuth/issues/4355)) ([5b7d6b0](https://github.com/dynamic-labs/DynamicAuth/commit/5b7d6b0a9ea84811a8252b3cdf30a3a8e410180c))
+* add walletbook configurations for solana injected wallets ([#4360](https://github.com/dynamic-labs/DynamicAuth/issues/4360)) ([cdc8e5f](https://github.com/dynamic-labs/DynamicAuth/commit/cdc8e5f4878cb84e26e5b33299aa8547b84b6667))
+* passkey renaming frontend ([#4331](https://github.com/dynamic-labs/DynamicAuth/issues/4331)) ([4551013](https://github.com/dynamic-labs/DynamicAuth/commit/4551013d577c914cb3aedfe458ab9eaa018aceb4))
+
+
+### Bug Fixes
+
+* correctly update wallets connected flag after wallet switch ([#4397](https://github.com/dynamic-labs/DynamicAuth/issues/4397)) ([543a830](https://github.com/dynamic-labs/DynamicAuth/commit/543a830574f0d5a78fedbb9b18233e8dfbaddd86))
+* export modal header ([#4401](https://github.com/dynamic-labs/DynamicAuth/issues/4401)) ([77cf016](https://github.com/dynamic-labs/DynamicAuth/commit/77cf016fc742458988864647870149a56e991ee4))
+* trigger onAuthSuccess before embedded wallet creation ([4aa341a](https://github.com/dynamic-labs/DynamicAuth/commit/4aa341a1d08332a121daddb7c2dcb09a804a4de7))
+* ui issues on react 17 ([#4373](https://github.com/dynamic-labs/DynamicAuth/issues/4373)) ([93096d6](https://github.com/dynamic-labs/DynamicAuth/commit/93096d6017816a4f0ed299bf618b130d90c81514))
+
+## [1.1.0-alpha.10](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.9...v1.1.0-alpha.10) (2024-01-06)
+
+
+### Bug Fixes
+
+* pass flow network to magic client ([#4322](https://github.com/dynamic-labs/DynamicAuth/issues/4322)) ([f3adccf](https://github.com/dynamic-labs/DynamicAuth/commit/f3adccf9f8d835f6b04e4767acd0fbd2ac238379))
+* prevent error message when mobile wallet app is open ([#4301](https://github.com/dynamic-labs/DynamicAuth/issues/4301)) ([2a66dcf](https://github.com/dynamic-labs/DynamicAuth/commit/2a66dcfaf8100b3d910c559d35d8b731b1cb380e))
+* turnkeyWalletConnector is not an email otp connector and uses dynamic otp ([#4313](https://github.com/dynamic-labs/DynamicAuth/issues/4313)) ([e4ea56f](https://github.com/dynamic-labs/DynamicAuth/commit/e4ea56f40fdf97b3f5440b016ebd95501089cebe))
+
 ## [1.1.0-alpha.9](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.8...v1.1.0-alpha.9) (2024-01-04)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/solana",
-  "version": "1.1.0-alpha.9",
+  "version": "1.1.0-phantom.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -27,11 +27,13 @@
   },
   "dependencies": {
     "@solana/web3.js": "1.70.1",
-    "@dynamic-labs/rpc-providers": "1.1.0-alpha.9",
-    "@dynamic-labs/types": "1.1.0-alpha.9",
-    "@dynamic-labs/utils": "1.1.0-alpha.9",
-    "@dynamic-labs/wallet-book": "1.1.0-alpha.9",
-    "@dynamic-labs/wallet-connector-core": "1.1.0-alpha.9",
+    "bs58": "^5.0.0",
+    "tweetnacl": "^1.0.3",
+    "@dynamic-labs/rpc-providers": "1.1.0-phantom.0",
+    "@dynamic-labs/types": "1.1.0-phantom.0",
+    "@dynamic-labs/utils": "1.1.0-phantom.0",
+    "@dynamic-labs/wallet-book": "1.1.0-phantom.0",
+    "@dynamic-labs/wallet-connector-core": "1.1.0-phantom.0",
     "eventemitter3": "5.0.1"
   },
   "peerDependencies": {}

package/src/CoinbaseSolana.cjs

@@ -4,43 +4,24 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../_virtual/_tslib.cjs');
 var utils = require('@dynamic-labs/utils');
-var solWalletConnector = require('./solWalletConnector.cjs');
-var solProviderHelper = require('./solProviderHelper.cjs');
+var walletBook = require('@dynamic-labs/wallet-book');
+var InjectedWalletBase = require('./injected/InjectedWalletBase.cjs');
 require('@solana/web3.js');
 require('@dynamic-labs/wallet-connector-core');
+require('@dynamic-labs/rpc-providers');
 require('./injected/PhantomLedger.cjs');
 var isSignedMessage = require('./utils/isSignedMessage.cjs');
 
-class CoinbaseSolana extends solWalletConnector.SolWalletConnector {
-    constructor() {
-        super(...arguments);
+class CoinbaseSolana extends InjectedWalletBase.InjectedWalletBase {
+    constructor(opts) {
+        super(opts);
         this.name = 'CoinbaseSolana';
-    }
-    setupEventListeners() {
-        solProviderHelper.SolProviderHelper._setupEventListeners(this, solProviderHelper.SolProviderHelper.findProvider(this.key));
-    }
-    teardownEventListeners() {
-        solProviderHelper.SolProviderHelper._teardownEventListeners(this.key);
-    }
-    connect() {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            yield solProviderHelper.SolProviderHelper.connectWithKey(this.key);
-        });
+        this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
     }
     getSigner() {
+        var _a;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return solProviderHelper.SolProviderHelper.connectWithKey(this.key);
-        });
-    }
-    isInstalledOnBrowser() {
-        return solProviderHelper.SolProviderHelper.isInstalledHelper(this.key);
-    }
-    fetchPublicAddress() {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            if (this.isInstalledOnBrowser()) {
-                return solProviderHelper.SolProviderHelper.fetchPublicAddressWithKey(this.key);
-            }
-            return;
+            return (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.connect();
         });
     }
     signMessage(messageToSign) {
@@ -61,11 +42,6 @@ class CoinbaseSolana extends solWalletConnector.SolWalletConnector {
             return utils.bufferToBase64(isSignedMessage.isSignedMessage(signedMessage) ? signedMessage.signature : signedMessage);
         });
     }
-    getConnectedAccounts() {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return solProviderHelper.SolProviderHelper.getConnectedAccountsWithKey(this.key);
-        });
-    }
 }
 
 exports.CoinbaseSolana = CoinbaseSolana;

package/src/CoinbaseSolana.d.ts

@@ -1,13 +1,8 @@
-import { SolWalletConnector } from './solWalletConnector';
-import { ICoinbaseSolanaSigner } from './types';
-export declare class CoinbaseSolana extends SolWalletConnector {
+import { SolWalletConnectorOpts } from './solWalletConnector';
+import { InjectedWalletBase } from './injected/InjectedWalletBase';
+export declare class CoinbaseSolana extends InjectedWalletBase {
     name: string;
-    setupEventListeners(): void;
-    teardownEventListeners(): void;
-    connect(): Promise<void>;
-    getSigner(): Promise<ICoinbaseSolanaSigner | undefined>;
-    isInstalledOnBrowser(): boolean;
-    fetchPublicAddress(): Promise<string | undefined>;
+    constructor(opts: SolWalletConnectorOpts);
+    getSigner<ICoinbaseSolanaSigner>(): Promise<ICoinbaseSolanaSigner | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;
-    getConnectedAccounts(): Promise<string[]>;
 }

package/src/CoinbaseSolana.js

@@ -1,42 +1,23 @@
 import { __awaiter } from '../_virtual/_tslib.js';
 import { bufferToBase64 } from '@dynamic-labs/utils';
-import { SolWalletConnector } from './solWalletConnector.js';
-import { SolProviderHelper } from './solProviderHelper.js';
+import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
+import { InjectedWalletBase } from './injected/InjectedWalletBase.js';
 import '@solana/web3.js';
 import '@dynamic-labs/wallet-connector-core';
+import '@dynamic-labs/rpc-providers';
 import './injected/PhantomLedger.js';
 import { isSignedMessage } from './utils/isSignedMessage.js';
 
-class CoinbaseSolana extends SolWalletConnector {
-    constructor() {
-        super(...arguments);
+class CoinbaseSolana extends InjectedWalletBase {
+    constructor(opts) {
+        super(opts);
         this.name = 'CoinbaseSolana';
-    }
-    setupEventListeners() {
-        SolProviderHelper._setupEventListeners(this, SolProviderHelper.findProvider(this.key));
-    }
-    teardownEventListeners() {
-        SolProviderHelper._teardownEventListeners(this.key);
-    }
-    connect() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield SolProviderHelper.connectWithKey(this.key);
-        });
+        this.wallet = findWalletBookWallet(this.walletBook, this.key);
     }
     getSigner() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            return SolProviderHelper.connectWithKey(this.key);
-        });
-    }
-    isInstalledOnBrowser() {
-        return SolProviderHelper.isInstalledHelper(this.key);
-    }
-    fetchPublicAddress() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.isInstalledOnBrowser()) {
-                return SolProviderHelper.fetchPublicAddressWithKey(this.key);
-            }
-            return;
+            return (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.connect();
         });
     }
     signMessage(messageToSign) {
@@ -57,11 +38,6 @@ class CoinbaseSolana extends SolWalletConnector {
             return bufferToBase64(isSignedMessage(signedMessage) ? signedMessage.signature : signedMessage);
         });
     }
-    getConnectedAccounts() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return SolProviderHelper.getConnectedAccountsWithKey(this.key);
-        });
-    }
 }
 
 export { CoinbaseSolana };

package/src/PhantomMobileConnector.cjs

@@ -0,0 +1,168 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../_virtual/_tslib.cjs');
+var nacl = require('tweetnacl');
+var bs58 = require('bs58');
+var web3_js = require('@solana/web3.js');
+var solWalletConnector = require('./solWalletConnector.cjs');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var nacl__default = /*#__PURE__*/_interopDefaultLegacy(nacl);
+var bs58__default = /*#__PURE__*/_interopDefaultLegacy(bs58);
+
+const buildUrl = (path, params) => `https://phantom.app/ul/v1/${path}?${params.toString()}`;
+const decryptPayload = (data, nonce, sharedSecret) => {
+    if (!sharedSecret)
+        throw new Error('missing shared secret');
+    const decryptedData = nacl__default["default"].box.open.after(bs58__default["default"].decode(data), bs58__default["default"].decode(nonce), sharedSecret);
+    if (!decryptedData) {
+        throw new Error('Unable to decrypt data');
+    }
+    return JSON.parse(Buffer.from(decryptedData).toString('utf8'));
+};
+const encryptPayload = (payload, sharedSecret) => {
+    if (!sharedSecret)
+        throw new Error('missing shared secret');
+    const nonce = nacl__default["default"].randomBytes(24);
+    const encryptedPayload = nacl__default["default"].box.after(Buffer.from(JSON.stringify(payload)), nonce, sharedSecret);
+    return [nonce, encryptedPayload];
+};
+class PhantomMobileConnector extends solWalletConnector.SolWalletConnector {
+    constructor(props) {
+        super(Object.assign({}, props));
+        this.name = 'Phantom';
+    }
+    getSigner() {
+        return Promise.resolve(undefined);
+    }
+    connect() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            // Generate a new key pair
+            const keyPair = nacl__default["default"].box.keyPair();
+            localStorage.setItem('dynamic_phantom_public_key', JSON.stringify([...keyPair.publicKey]));
+            localStorage.setItem('dynamic_phantom_secret_key', JSON.stringify([...keyPair.secretKey]));
+            const isLocalHost = window.location.href.includes('localhost') ||
+                window.location.href.includes('0.0.0.0') ||
+                window.location.href.includes('127.0.0.1');
+            const params = new URLSearchParams({
+                app_url: isLocalHost ? 'https://demo.dynamic.xyz' : window.location.href,
+                cluster: 'mainnet-beta',
+                dapp_encryption_public_key: bs58__default["default"].encode(keyPair.publicKey),
+                redirect_link: window.location.href,
+            });
+            const url = buildUrl('connect', params);
+            window.location.href = url;
+        });
+    }
+    getSession() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const params = new URLSearchParams(window.location.search);
+            const secretKey = new Uint8Array(JSON.parse(localStorage.getItem('dynamic_phantom_secret_key')));
+            const sharedSecretDapp = nacl__default["default"].box.before(bs58__default["default"].decode(params.get('phantom_encryption_public_key')), secretKey);
+            const connectData = decryptPayload(params.get('data'), params.get('nonce'), sharedSecretDapp);
+            localStorage.setItem('dynamic_phantom_shared_secret', JSON.stringify([...sharedSecretDapp]));
+            localStorage.setItem('dynamic_phantom_session', connectData.session);
+            localStorage.setItem('dynamic_phantom_wallet_address', JSON.stringify(new web3_js.PublicKey(connectData.public_key)));
+            params.delete('phantom_encryption_public_key');
+            params.delete('data');
+            params.delete('nonce');
+            history.replaceState(null, '', window.location.origin + '?' + params.toString());
+            return connectData.public_key;
+        });
+    }
+    endSession() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            // for establishing the shared secret. NOT the wallet address
+            localStorage.removeItem('dynamic_phantom_public_key');
+            localStorage.removeItem('dynamic_phantom_secret_key');
+            localStorage.removeItem('dynamic_phantom_shared_secret');
+            localStorage.removeItem('dynamic_phantom_session');
+            localStorage.removeItem('dynamic_phantom_wallet_address');
+            localStorage.removeItem('dynamic_phantom_message_to_sign');
+        });
+    }
+    signMessage(messageToSign) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const session = localStorage.getItem('dynamic_phantom_session');
+            if (!session) {
+                throw new Error('[PhantomMobileConnector] signMessage called, but missing session from localstorage');
+            }
+            const sharedSecret = new Uint8Array(JSON.parse(localStorage.getItem('dynamic_phantom_shared_secret')));
+            if (!sharedSecret) {
+                throw new Error('[PhantomMobileConnector] signMessage called, but missing shared secret from localstorage');
+            }
+            const publicKey = new Uint8Array(JSON.parse(localStorage.getItem('dynamic_phantom_public_key')));
+            if (!publicKey) {
+                throw new Error('[PhantomMobileConnector] signMessage called, but missing public key from localstorage');
+            }
+            localStorage.setItem('dynamic_phantom_message_to_sign', messageToSign);
+            const payload = {
+                message: bs58__default["default"].encode(Buffer.from(messageToSign)),
+                session,
+            };
+            const [nonce, encryptedPayload] = encryptPayload(payload, sharedSecret);
+            const params = new URLSearchParams({
+                dapp_encryption_public_key: bs58__default["default"].encode(publicKey),
+                nonce: bs58__default["default"].encode(nonce),
+                payload: bs58__default["default"].encode(encryptedPayload),
+                redirect_link: window.location.href,
+            });
+            const url = buildUrl('signMessage', params);
+            window.location.href = url;
+            // throwing this to prevent local storage from being cleared.
+            // when verifying signature, the SDK calls endSession when no
+            // signature is returned. in the case of phantom mobile, a signature
+            // is not returned from signMessage, so an error will always be thrown.
+            // this is a workaround to prevent the SDK from clearing local storage
+            // ideally we would figure out how to:
+            //   1. kick off the sign message on one tab
+            //   2. resume the process on that tab after the user signs in phantom
+            throw new Error('ignore');
+        });
+    }
+    fetchPublicAddress() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const rawAddress = localStorage.getItem('dynamic_phantom_wallet_address');
+            if (rawAddress) {
+                return JSON.parse(rawAddress);
+            }
+            yield this.connect();
+            return undefined;
+        });
+    }
+    extractSignature() {
+        const params = new URLSearchParams(window.location.search);
+        const sharedSecret = new Uint8Array(JSON.parse(localStorage.getItem('dynamic_phantom_shared_secret')));
+        if (!sharedSecret) {
+            throw new Error('[PhantomMobileConnector] extractSignature called, but missing shared secret from localstorage');
+        }
+        const signMessageData = decryptPayload(params.get('data'), params.get('nonce'), sharedSecret);
+        const message = localStorage.getItem('dynamic_phantom_message_to_sign');
+        if (!message) {
+            throw new Error('[PhantomMobileConnector] extractSignature: missing message to sign');
+        }
+        params.delete('data');
+        params.delete('nonce');
+        history.replaceState(null, '', window.location.origin + '?' + params.toString());
+        return {
+            message,
+            signature: signMessageData.signature,
+        };
+    }
+    getConnectedAccounts() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const rawAddress = localStorage.getItem('dynamic_phantom_wallet_address');
+            if (rawAddress) {
+                return [JSON.parse(rawAddress)];
+            }
+            else {
+                return [];
+            }
+        });
+    }
+}
+
+exports.PhantomMobileConnector = PhantomMobileConnector;

package/src/PhantomMobileConnector.d.ts

@@ -0,0 +1,17 @@
+import { SolWalletConnector } from './solWalletConnector';
+import { ISolana } from '.';
+export declare class PhantomMobileConnector extends SolWalletConnector {
+    name: string;
+    constructor(props: any);
+    getSigner(): Promise<ISolana | undefined>;
+    connect(): Promise<void>;
+    getSession(): Promise<string>;
+    endSession(): Promise<void>;
+    signMessage(messageToSign: string): Promise<string | undefined>;
+    fetchPublicAddress(): Promise<string | undefined>;
+    extractSignature(): {
+        signature: string;
+        message: string;
+    };
+    getConnectedAccounts(): Promise<string[]>;
+}

package/src/PhantomMobileConnector.js

@@ -0,0 +1,159 @@
+import { __awaiter } from '../_virtual/_tslib.js';
+import nacl from 'tweetnacl';
+import bs58 from 'bs58';
+import { PublicKey } from '@solana/web3.js';
+import { SolWalletConnector } from './solWalletConnector.js';
+
+const buildUrl = (path, params) => `https://phantom.app/ul/v1/${path}?${params.toString()}`;
+const decryptPayload = (data, nonce, sharedSecret) => {
+    if (!sharedSecret)
+        throw new Error('missing shared secret');
+    const decryptedData = nacl.box.open.after(bs58.decode(data), bs58.decode(nonce), sharedSecret);
+    if (!decryptedData) {
+        throw new Error('Unable to decrypt data');
+    }
+    return JSON.parse(Buffer.from(decryptedData).toString('utf8'));
+};
+const encryptPayload = (payload, sharedSecret) => {
+    if (!sharedSecret)
+        throw new Error('missing shared secret');
+    const nonce = nacl.randomBytes(24);
+    const encryptedPayload = nacl.box.after(Buffer.from(JSON.stringify(payload)), nonce, sharedSecret);
+    return [nonce, encryptedPayload];
+};
+class PhantomMobileConnector extends SolWalletConnector {
+    constructor(props) {
+        super(Object.assign({}, props));
+        this.name = 'Phantom';
+    }
+    getSigner() {
+        return Promise.resolve(undefined);
+    }
+    connect() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // Generate a new key pair
+            const keyPair = nacl.box.keyPair();
+            localStorage.setItem('dynamic_phantom_public_key', JSON.stringify([...keyPair.publicKey]));
+            localStorage.setItem('dynamic_phantom_secret_key', JSON.stringify([...keyPair.secretKey]));
+            const isLocalHost = window.location.href.includes('localhost') ||
+                window.location.href.includes('0.0.0.0') ||
+                window.location.href.includes('127.0.0.1');
+            const params = new URLSearchParams({
+                app_url: isLocalHost ? 'https://demo.dynamic.xyz' : window.location.href,
+                cluster: 'mainnet-beta',
+                dapp_encryption_public_key: bs58.encode(keyPair.publicKey),
+                redirect_link: window.location.href,
+            });
+            const url = buildUrl('connect', params);
+            window.location.href = url;
+        });
+    }
+    getSession() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const params = new URLSearchParams(window.location.search);
+            const secretKey = new Uint8Array(JSON.parse(localStorage.getItem('dynamic_phantom_secret_key')));
+            const sharedSecretDapp = nacl.box.before(bs58.decode(params.get('phantom_encryption_public_key')), secretKey);
+            const connectData = decryptPayload(params.get('data'), params.get('nonce'), sharedSecretDapp);
+            localStorage.setItem('dynamic_phantom_shared_secret', JSON.stringify([...sharedSecretDapp]));
+            localStorage.setItem('dynamic_phantom_session', connectData.session);
+            localStorage.setItem('dynamic_phantom_wallet_address', JSON.stringify(new PublicKey(connectData.public_key)));
+            params.delete('phantom_encryption_public_key');
+            params.delete('data');
+            params.delete('nonce');
+            history.replaceState(null, '', window.location.origin + '?' + params.toString());
+            return connectData.public_key;
+        });
+    }
+    endSession() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // for establishing the shared secret. NOT the wallet address
+            localStorage.removeItem('dynamic_phantom_public_key');
+            localStorage.removeItem('dynamic_phantom_secret_key');
+            localStorage.removeItem('dynamic_phantom_shared_secret');
+            localStorage.removeItem('dynamic_phantom_session');
+            localStorage.removeItem('dynamic_phantom_wallet_address');
+            localStorage.removeItem('dynamic_phantom_message_to_sign');
+        });
+    }
+    signMessage(messageToSign) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const session = localStorage.getItem('dynamic_phantom_session');
+            if (!session) {
+                throw new Error('[PhantomMobileConnector] signMessage called, but missing session from localstorage');
+            }
+            const sharedSecret = new Uint8Array(JSON.parse(localStorage.getItem('dynamic_phantom_shared_secret')));
+            if (!sharedSecret) {
+                throw new Error('[PhantomMobileConnector] signMessage called, but missing shared secret from localstorage');
+            }
+            const publicKey = new Uint8Array(JSON.parse(localStorage.getItem('dynamic_phantom_public_key')));
+            if (!publicKey) {
+                throw new Error('[PhantomMobileConnector] signMessage called, but missing public key from localstorage');
+            }
+            localStorage.setItem('dynamic_phantom_message_to_sign', messageToSign);
+            const payload = {
+                message: bs58.encode(Buffer.from(messageToSign)),
+                session,
+            };
+            const [nonce, encryptedPayload] = encryptPayload(payload, sharedSecret);
+            const params = new URLSearchParams({
+                dapp_encryption_public_key: bs58.encode(publicKey),
+                nonce: bs58.encode(nonce),
+                payload: bs58.encode(encryptedPayload),
+                redirect_link: window.location.href,
+            });
+            const url = buildUrl('signMessage', params);
+            window.location.href = url;
+            // throwing this to prevent local storage from being cleared.
+            // when verifying signature, the SDK calls endSession when no
+            // signature is returned. in the case of phantom mobile, a signature
+            // is not returned from signMessage, so an error will always be thrown.
+            // this is a workaround to prevent the SDK from clearing local storage
+            // ideally we would figure out how to:
+            //   1. kick off the sign message on one tab
+            //   2. resume the process on that tab after the user signs in phantom
+            throw new Error('ignore');
+        });
+    }
+    fetchPublicAddress() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const rawAddress = localStorage.getItem('dynamic_phantom_wallet_address');
+            if (rawAddress) {
+                return JSON.parse(rawAddress);
+            }
+            yield this.connect();
+            return undefined;
+        });
+    }
+    extractSignature() {
+        const params = new URLSearchParams(window.location.search);
+        const sharedSecret = new Uint8Array(JSON.parse(localStorage.getItem('dynamic_phantom_shared_secret')));
+        if (!sharedSecret) {
+            throw new Error('[PhantomMobileConnector] extractSignature called, but missing shared secret from localstorage');
+        }
+        const signMessageData = decryptPayload(params.get('data'), params.get('nonce'), sharedSecret);
+        const message = localStorage.getItem('dynamic_phantom_message_to_sign');
+        if (!message) {
+            throw new Error('[PhantomMobileConnector] extractSignature: missing message to sign');
+        }
+        params.delete('data');
+        params.delete('nonce');
+        history.replaceState(null, '', window.location.origin + '?' + params.toString());
+        return {
+            message,
+            signature: signMessageData.signature,
+        };
+    }
+    getConnectedAccounts() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const rawAddress = localStorage.getItem('dynamic_phantom_wallet_address');
+            if (rawAddress) {
+                return [JSON.parse(rawAddress)];
+            }
+            else {
+                return [];
+            }
+        });
+    }
+}
+
+export { PhantomMobileConnector };

package/src/Solflare.d.ts

@@ -1,13 +1,8 @@
-import { SolWalletConnector } from './solWalletConnector';
-import { ISolana } from './types';
-export declare class Solflare extends SolWalletConnector {
+import { InjectedWalletBase } from './injected/InjectedWalletBase';
+import { SolWalletConnectorOpts } from './solWalletConnector';
+export declare class Solflare extends InjectedWalletBase {
     name: string;
-    isInstalledOnBrowser(): boolean;
+    constructor(opts: SolWalletConnectorOpts);
     fetchPublicAddress(): Promise<string | undefined>;
-    connect(): Promise<void>;
-    getSigner(): Promise<ISolana | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;
-    getConnectedAccounts(): Promise<string[]>;
-    setupEventListeners(): void;
-    teardownEventListeners(): void;
 }

package/src/index.cjs

@@ -2,28 +2,15 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var CoinbaseSolana = require('./CoinbaseSolana.cjs');
-var Glow = require('./Glow.cjs');
-var Slope = require('./Slope.cjs');
-var Solflare = require('./Solflare.cjs');
-var index = require('./injected/index.cjs');
-var solWalletConnector = require('./solWalletConnector.cjs');
-var solProviderHelper = require('./solProviderHelper.cjs');
+var fetchInjectedWalletConnectors = require('./injected/fetchInjectedWalletConnectors.cjs');
 var isSignedMessage = require('./utils/isSignedMessage.cjs');
 var isBackpackSolanaSigner = require('./utils/isBackpackSolanaSigner.cjs');
 
-/* eslint-disable @typescript-eslint/no-unused-vars */
 const SolanaWalletConnectors = (props) => [
-    ...index.injectedWallets,
-    CoinbaseSolana.CoinbaseSolana,
-    Glow.Glow,
-    Slope.Slope,
-    Solflare.Solflare,
+    ...fetchInjectedWalletConnectors.injectedWalletOverrides,
+    ...fetchInjectedWalletConnectors.fetchInjectedWalletConnectors(props),
 ];
 
-exports.Solflare = Solflare.Solflare;
-exports.SolWalletConnector = solWalletConnector.SolWalletConnector;
-exports.SolProviderHelper = solProviderHelper.SolProviderHelper;
 exports.isSignedMessage = isSignedMessage.isSignedMessage;
 exports.isBackpackSolanaSigner = isBackpackSolanaSigner.isBackpackSolanaSigner;
 exports.SolanaWalletConnectors = SolanaWalletConnectors;

package/src/index.d.ts

@@ -1,7 +1,4 @@
-export * from './solWalletConnector';
-export * from './solProviderHelper';
-export * from './Solflare';
-export declare const SolanaWalletConnectors: (props: any) => typeof import("./injected/BraveSol").BraveSol[];
+export declare const SolanaWalletConnectors: (props: any) => import("dist/packages/wallet-connector-core/src").WalletConnectorConstructor[];
 export { isSignedMessage } from './utils/isSignedMessage';
 export { isBackpackSolanaSigner } from './utils/isBackpackSolanaSigner';
 export type { ISolana, IBackpackSolanaSigner, ICoinbaseSolanaSigner, SignedMessage, ISolanaSigner, } from './types';