@dynamic-labs/solana 1.1.0-alpha.10 → 1.1.0-alpha.12

package/src/injected/PhantomLedger.d.ts

@@ -1,4 +1,5 @@
 import { PublicKey } from '@solana/web3.js';
+import { SolWalletConnectorOpts } from '../solWalletConnector';
 import { InjectedWalletBase } from './InjectedWalletBase';
 export declare const MEMO_PROGRAM_ID: PublicKey;
 export declare class PhantomLedger extends InjectedWalletBase {
@@ -7,6 +8,7 @@ export declare class PhantomLedger extends InjectedWalletBase {
      * exporting it in this way, we avoid to instantiate the whole PhantomLedger class every time.
      */
     name: string;
+    constructor(opts: SolWalletConnectorOpts);
     signMessage(): Promise<string | undefined>;
     proveOwnership(messageToSign: string): Promise<string | undefined>;
     signMessageViaTransaction(messageToSign: string): Promise<string>;

package/src/injected/PhantomLedger.js

@@ -2,13 +2,14 @@ import { __awaiter } from '../../_virtual/_tslib.js';
 import { PublicKey, Transaction, TransactionInstruction } from '@solana/web3.js';
 import { NotSupportedError, DynamicError } from '@dynamic-labs/utils';
 import { PhantomLedgerWalletName } from '@dynamic-labs/wallet-connector-core';
+import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
 import { extractNonce } from '../utils/extractNonce.js';
 import { InjectedWalletBase } from './InjectedWalletBase.js';
 
 const MEMO_PROGRAM_ID = new PublicKey('MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr');
 class PhantomLedger extends InjectedWalletBase {
-    constructor() {
-        super(...arguments);
+    constructor(opts) {
+        super(opts);
         /**
          * I'm exporting the walletName to use it for DYN-1447. As we only need the wallet name,
          * exporting it in this way, we avoid to instantiate the whole PhantomLedger class every time.
@@ -23,6 +24,7 @@ class PhantomLedger extends InjectedWalletBase {
             }));
             return transaction;
         };
+        this.wallet = findWalletBookWallet(this.walletBook, this.key);
     }
     signMessage() {
         return __awaiter(this, void 0, void 0, function* () {

package/src/injected/fetchInjectedWalletConnectors.cjs

@@ -0,0 +1,50 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var CoinbaseSolana = require('../CoinbaseSolana.cjs');
+var Slope = require('../Slope.cjs');
+var InjectedWalletBase = require('./InjectedWalletBase.cjs');
+var Phantom = require('./Phantom.cjs');
+var PhantomLedger = require('./PhantomLedger.cjs');
+var BackpackSol = require('./BackpackSol.cjs');
+
+const injectedWalletOverrides = [
+    CoinbaseSolana.CoinbaseSolana,
+    Slope.Slope,
+    Phantom.Phantom,
+    PhantomLedger.PhantomLedger,
+    BackpackSol.BackpackSol,
+];
+const filteredInjectedWalletKeysOverrides = [
+    'coinbasesolana',
+    'slope',
+    'phantom',
+    'phantomledger',
+    'backpacksol',
+];
+const fetchInjectedWalletConnectors = ({ walletBook, }) => {
+    var _a;
+    return Object.entries((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {})
+        .filter(([key, wallet]) => {
+        var _a;
+        return ((_a = wallet.injectedConfig) === null || _a === void 0 ? void 0 : _a.find((config) => config.chain === 'sol')) &&
+            !filteredInjectedWalletKeysOverrides.includes(key);
+    })
+        .map(([key, wallet]) => {
+        const { shortName } = wallet;
+        const name = shortName || wallet.name;
+        return class extends InjectedWalletBase.InjectedWalletBase {
+            constructor(props) {
+                super(Object.assign({}, props));
+                this.name = name;
+                this.wallet = wallet;
+                // this is the key from the wallet book entry so that we don't purely rely on the normalized name
+                this.overrideKey = key;
+            }
+        };
+    });
+};
+
+exports.fetchInjectedWalletConnectors = fetchInjectedWalletConnectors;
+exports.injectedWalletOverrides = injectedWalletOverrides;

package/src/injected/fetchInjectedWalletConnectors.d.ts

@@ -0,0 +1,6 @@
+import { WalletBookSchema } from '@dynamic-labs/wallet-book';
+import { WalletConnectorConstructor } from '@dynamic-labs/wallet-connector-core';
+export declare const injectedWalletOverrides: WalletConnectorConstructor[];
+export declare const fetchInjectedWalletConnectors: ({ walletBook, }: {
+    walletBook: WalletBookSchema;
+}) => WalletConnectorConstructor[];

package/src/injected/fetchInjectedWalletConnectors.js

@@ -0,0 +1,45 @@
+import { CoinbaseSolana } from '../CoinbaseSolana.js';
+import { Slope } from '../Slope.js';
+import { InjectedWalletBase } from './InjectedWalletBase.js';
+import { Phantom } from './Phantom.js';
+import { PhantomLedger } from './PhantomLedger.js';
+import { BackpackSol } from './BackpackSol.js';
+
+const injectedWalletOverrides = [
+    CoinbaseSolana,
+    Slope,
+    Phantom,
+    PhantomLedger,
+    BackpackSol,
+];
+const filteredInjectedWalletKeysOverrides = [
+    'coinbasesolana',
+    'slope',
+    'phantom',
+    'phantomledger',
+    'backpacksol',
+];
+const fetchInjectedWalletConnectors = ({ walletBook, }) => {
+    var _a;
+    return Object.entries((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {})
+        .filter(([key, wallet]) => {
+        var _a;
+        return ((_a = wallet.injectedConfig) === null || _a === void 0 ? void 0 : _a.find((config) => config.chain === 'sol')) &&
+            !filteredInjectedWalletKeysOverrides.includes(key);
+    })
+        .map(([key, wallet]) => {
+        const { shortName } = wallet;
+        const name = shortName || wallet.name;
+        return class extends InjectedWalletBase {
+            constructor(props) {
+                super(Object.assign({}, props));
+                this.name = name;
+                this.wallet = wallet;
+                // this is the key from the wallet book entry so that we don't purely rely on the normalized name
+                this.overrideKey = key;
+            }
+        };
+    });
+};
+
+export { fetchInjectedWalletConnectors, injectedWalletOverrides };

package/src/injected/index.d.ts

@@ -1,2 +1 @@
-import { BraveSol } from './BraveSol';
-export declare const injectedWallets: (typeof BraveSol)[];
+export * from './fetchInjectedWalletConnectors';

package/src/solProviderHelper.cjs

@@ -3,57 +3,81 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../_virtual/_tslib.cjs');
-var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var utils = require('@dynamic-labs/utils');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var isSignedMessage = require('./utils/isSignedMessage.cjs');
 
-var _a;
 class SolProviderHelper {
-    static installedProviderLookup(providerFlags) {
-        return walletConnectorCore.ProviderLookup(this.allInstalledProviders(), providerFlags);
+    constructor(wallet) {
+        this.wallet = wallet;
     }
-    static allInstalledProviders() {
-        var _b, _c;
-        return this.findSolanaProviders(window.solana).concat(this.findSolanaProviders(window.solflare), this.findSolanaProviders(window.glowSolana), this.findSolanaProviders(window.backpack), this.findSolanaProviders((_b = window.phantom) === null || _b === void 0 ? void 0 : _b.solana), this.findSolanaProviders((_c = window.magicEden) === null || _c === void 0 ? void 0 : _c.solana));
+    getInjectedConfig() {
+        if (!this.wallet || !this.wallet.injectedConfig)
+            return;
+        const { injectedConfig } = this.wallet;
+        return injectedConfig.find((c) => c.chain === 'sol');
+    }
+    getInstalledProvider() {
+        const config = this.getInjectedConfig();
+        if (!config || !config.extensionLocators) {
+            return undefined;
+        }
+        return this.installedProviderLookup(config.extensionLocators);
     }
-    static findSolanaProviders(solana) {
-        const solanaProviders = [];
-        if (solana && !solana.providers) {
-            solanaProviders.push(solana);
+    installedProviders() {
+        const config = this.getInjectedConfig();
+        if (!config)
+            return [];
+        const providers = [];
+        if (config.windowLocations) {
+            for (const windowLocation of config.windowLocations) {
+                const foundProviders = utils.getProvidersFromWindow(windowLocation);
+                if (foundProviders && foundProviders.length)
+                    providers.push(...foundProviders);
+            }
         }
-        else if (solana && solana.providers) {
-            solana.providers.forEach((provider) => {
-                solanaProviders.push(provider);
-            });
+        if (window.solana) {
+            if (!window.solana.providers) {
+                providers.push(window.solana);
+            }
+            else {
+                window.solana.providers.forEach((provider) => providers.push(provider));
+            }
         }
-        return solanaProviders;
+        return providers;
+    }
+    installedProviderLookup(providerFlags) {
+        const allInstalledProviders = this.installedProviders();
+        // If no provider flags are provided, return the first provider
+        // This is required for the coinbaseSolana window provider which has no locators
+        if (providerFlags.length === 0)
+            return allInstalledProviders[0];
+        return walletConnectorCore.ProviderLookup(allInstalledProviders, providerFlags);
     }
-    static isInstalledHelper(walletKey) {
-        return this.findProvider(walletKey) !== undefined;
+    findProvider() {
+        return this.getInstalledProvider();
     }
-    static findProvider(walletKey) {
-        var _b, _c;
-        return (_c = (_b = this.providers)[walletKey]) === null || _c === void 0 ? void 0 : _c.call(_b);
+    isInstalledHelper() {
+        return this.findProvider() !== undefined;
     }
-    static fetchPublicAddressWithKey(key) {
+    fetchPublicAddress() {
+        var _a;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const provider = this.findProvider(key);
+            const provider = this.findProvider();
             if (!provider) {
-                return Promise.resolve(undefined);
+                return undefined;
             }
             if (!provider.isConnected) {
                 yield provider.connect();
             }
-            const { publicKey } = provider;
-            return publicKey ? publicKey.toString() : Promise.resolve(undefined);
+            return (_a = provider.publicKey) === null || _a === void 0 ? void 0 : _a.toString();
         });
     }
-    static connectWithKey(key) {
+    connect() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const provider = this.findProvider(key);
-            if (!provider) {
-                return Promise.resolve(undefined);
-            }
+            const provider = this.findProvider();
+            if (!provider)
+                return undefined;
             try {
                 if (!provider.isConnected) {
                     yield provider.connect();
@@ -65,116 +89,77 @@ class SolProviderHelper {
             }
         });
     }
-    static signMessageWithKey(messageToSign, key) {
+    signMessage(messageToSign) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const walletAddress = yield this.fetchPublicAddressWithKey(key);
-            if (!walletAddress) {
-                return Promise.resolve(undefined);
-            }
-            const provider = this.findProvider(key);
-            if (!provider) {
-                return Promise.resolve(undefined);
-            }
+            const walletAddress = yield this.fetchPublicAddress();
+            if (!walletAddress)
+                return undefined;
+            const provider = this.findProvider();
+            if (!provider)
+                return undefined;
             if (!provider.isConnected) {
                 yield provider.connect();
             }
             const encodedMessage = new TextEncoder().encode(messageToSign);
             const signedMessage = yield provider.signMessage(encodedMessage, 'utf8');
-            if (!signedMessage) {
-                return Promise.resolve(undefined);
-            }
+            if (!signedMessage)
+                return undefined;
             return utils.bufferToBase64(isSignedMessage.isSignedMessage(signedMessage) ? signedMessage.signature : signedMessage);
         });
     }
-    static _setupEventListeners(walletConnector, web3Provider) {
-        web3Provider === null || web3Provider === void 0 ? void 0 : web3Provider.on('accountChanged', (publicKey) => this.handleAccountChange(walletConnector, web3Provider, publicKey));
-        web3Provider === null || web3Provider === void 0 ? void 0 : web3Provider.on('disconnect', () => walletConnector.emit('disconnect'));
+    handleAccountChange(walletConnector, web3Provider, address) {
+        var _a;
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            if (!address) {
+                yield (web3Provider === null || web3Provider === void 0 ? void 0 : web3Provider.connect());
+                if ((_a = web3Provider === null || web3Provider === void 0 ? void 0 : web3Provider.publicKey) === null || _a === void 0 ? void 0 : _a.toString()) {
+                    walletConnector.emit('accountChange', {
+                        accounts: [web3Provider.publicKey.toString()],
+                    });
+                }
+                return;
+            }
+            if (address.toString()) {
+                walletConnector.emit('accountChange', { accounts: [address.toString()] });
+            }
+        });
+    }
+    _setupEventListeners(walletConnector) {
+        const provider = this.findProvider();
+        provider === null || provider === void 0 ? void 0 : provider.on('accountChanged', (publicKey) => this.handleAccountChange(walletConnector, provider, publicKey));
+        provider === null || provider === void 0 ? void 0 : provider.on('disconnect', () => walletConnector.emit('disconnect'));
     }
-    static _teardownEventListeners(key) {
-        const web3Provider = this.findProvider(key);
-        if (!web3Provider) {
+    _teardownEventListeners() {
+        const provider = this.findProvider();
+        if (!provider)
             return;
-        }
-        web3Provider.removeAllListeners();
+        provider.removeAllListeners();
     }
-    static getConnectedAccountsWithKey(key) {
-        var _b, _c;
+    getConnectedAccounts() {
+        var _a, _b;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const provider = this.findProvider(key);
-            if (!provider) {
+            const provider = this.findProvider();
+            if (!provider)
                 return [];
-            }
             let connectionResult;
             try {
                 if (!provider.isConnected) {
-                    connectionResult = yield provider.connect({
-                        onlyIfTrusted: true,
-                    });
+                    connectionResult = yield provider.connect({ onlyIfTrusted: true });
                 }
             }
             catch (e) {
                 return [];
             }
             const address = connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.address;
-            // Solflare does not return the address or public key on connect
-            const publicKey = (_b = connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.publicKey) !== null && _b !== void 0 ? _b : (_c = provider.publicKey) === null || _c === void 0 ? void 0 : _c.toString();
-            if (address) {
+            const publicKey = (_a = connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.publicKey) !== null && _a !== void 0 ? _a : (_b = provider.publicKey) === null || _b === void 0 ? void 0 : _b.toString();
+            if (address)
                 return [address];
-            }
-            else if (publicKey) {
-                return [publicKey.toString()];
-            }
-            else {
+            else if (publicKey)
+                return [publicKey === null || publicKey === void 0 ? void 0 : publicKey.toString()];
+            else
                 return [];
-            }
         });
     }
 }
-_a = SolProviderHelper;
-SolProviderHelper.GlowProvider = () => _a.installedProviderLookup([{ flag: 'isGlow', value: true }]);
-SolProviderHelper.CoinbaseProvider = () => _a.findSolanaProviders(window.coinbaseSolana)[0];
-SolProviderHelper.PhantomProvider = () => _a.installedProviderLookup([
-    { flag: 'isPhantom', value: true },
-    { flag: 'isBraveWallet', value: false },
-    { flag: 'isExodus', value: false },
-    { flag: 'isMagicEden', value: false },
-]);
-SolProviderHelper.MagicEdenProvider = () => _a.installedProviderLookup([{ flag: 'isMagicEden', value: true }]);
-SolProviderHelper.SolflareProvider = () => _a.installedProviderLookup([{ flag: 'isSolflare', value: true }]);
-SolProviderHelper.BraveProvider = () => _a.installedProviderLookup([
-    { flag: 'isPhantom', value: true },
-    { flag: 'isBraveWallet', value: true },
-]);
-SolProviderHelper.ExodusProvider = () => _a.installedProviderLookup([
-    { flag: 'isPhantom', value: true },
-    { flag: 'isExodus', value: true },
-]);
-SolProviderHelper.BackpackSol = () => _a.installedProviderLookup([{ flag: 'isBackpack', value: true }]);
-SolProviderHelper.providers = {
-    backpacksol: _a.BackpackSol,
-    bravesol: _a.BraveProvider,
-    coinbasesolana: _a.CoinbaseProvider,
-    exodussol: _a.ExodusProvider,
-    glow: _a.GlowProvider,
-    magicedensol: _a.MagicEdenProvider,
-    phantom: _a.PhantomProvider,
-    phantomledger: _a.PhantomProvider,
-    solflare: _a.SolflareProvider,
-};
-SolProviderHelper.handleAccountChange = (walletConnector, web3Provider, address) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-    var _b;
-    if (!address) {
-        yield (web3Provider === null || web3Provider === void 0 ? void 0 : web3Provider.connect());
-        if ((_b = web3Provider === null || web3Provider === void 0 ? void 0 : web3Provider.publicKey) === null || _b === void 0 ? void 0 : _b.toString()) {
-            walletConnector.emit('accountChange', {
-                accounts: [web3Provider.publicKey.toString()],
-            });
-        }
-        return;
-    }
-    if (address.toString()) {
-        walletConnector.emit('accountChange', { accounts: [address.toString()] });
-    }
-});
 
 exports.SolProviderHelper = SolProviderHelper;

package/src/solProviderHelper.d.ts

@@ -1,33 +1,32 @@
+import { WalletSchema } from '@dynamic-labs/wallet-book';
 import { ProviderCondition, WalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { ISolana, ProviderFlag } from './types';
-type Provider = () => ISolana | undefined;
-export type AccountChangeEventHandler = (address: {
-    toString(): string;
-} | null) => Promise<void>;
-export type DisconnectEventHandler = () => Promise<void>;
 export declare class SolProviderHelper {
-    static GlowProvider: Provider;
-    static CoinbaseProvider: Provider;
-    static PhantomProvider: Provider;
-    static MagicEdenProvider: Provider;
-    static SolflareProvider: Provider;
-    static BraveProvider: Provider;
-    static ExodusProvider: Provider;
-    static BackpackSol: Provider;
-    static providers: {
-        [wallet: string]: Provider;
-    };
-    static installedProviderLookup(providerFlags: Array<ProviderCondition<ProviderFlag>>): ISolana | undefined;
-    static allInstalledProviders(): ISolana[];
-    static findSolanaProviders(solana?: ISolana): ISolana[];
-    static isInstalledHelper(walletKey: string): boolean;
-    static findProvider(walletKey: string): ISolana | undefined;
-    static fetchPublicAddressWithKey(key: string): Promise<string | undefined>;
-    static connectWithKey(key: string): Promise<ISolana | undefined>;
-    static signMessageWithKey(messageToSign: string, key: string): Promise<string | undefined>;
-    static handleAccountChange: (walletConnector: WalletConnector, web3Provider: ISolana, address: string) => Promise<void>;
-    static _setupEventListeners(walletConnector: WalletConnector, web3Provider?: ISolana): void;
-    static _teardownEventListeners(key: string): void;
-    static getConnectedAccountsWithKey(key: string): Promise<string[]>;
+    private wallet;
+    constructor(wallet: WalletSchema);
+    getInjectedConfig(): {
+        chain: string;
+        extensionLocators: {
+            value: boolean;
+            flag: string;
+        }[];
+        providerInterface?: string | undefined;
+        walletStandard?: {
+            features: string[];
+            name: string;
+        } | undefined;
+        windowLocations?: string[] | undefined;
+    } | undefined;
+    getInstalledProvider(): ISolana | undefined;
+    installedProviders(): (import("./types").ISolanaSigner | import("./types").ICoinbaseSolanaSigner)[];
+    installedProviderLookup(providerFlags: Array<ProviderCondition<ProviderFlag>>): ISolana | undefined;
+    findProvider(): ISolana | undefined;
+    isInstalledHelper(): boolean;
+    fetchPublicAddress(): Promise<string | undefined>;
+    connect(): Promise<ISolana | undefined>;
+    signMessage(messageToSign: string): Promise<string | undefined>;
+    handleAccountChange(walletConnector: WalletConnector, web3Provider: ISolana, address: string): Promise<void>;
+    _setupEventListeners(walletConnector: WalletConnector): void;
+    _teardownEventListeners(): void;
+    getConnectedAccounts(): Promise<string[]>;
 }
-export {};