@dynamic-labs/solana 4.0.0-alpha.5 → 4.0.0-alpha.51

package/src/injected/fetchInjectedWalletConnectors.js

@@ -1,58 +1,76 @@
 'use client'
-import { CoinbaseSolana } from '../CoinbaseSolana.js';
-import { Solflare } from '../Solflare.js';
-import { SolanaWalletStandardConnector } from '../SolanaWalletStandardConnector/SolanaWalletStandardConnector.js';
-import { InjectedWalletBase } from './InjectedWalletBase.js';
-import { BackpackSol } from './BackpackSol.js';
+import { sanitizeName } from '@dynamic-labs/utils';
+import { CoinbaseSolana } from '../CoinbaseSolana/CoinbaseSolana.js';
+import { Solflare } from '../Solflare/Solflare.js';
+import { logger } from '../utils/logger.js';
+import { InjectedWalletBase } from './InjectedWalletBase/InjectedWalletBase.js';
+import { BackpackSol } from './BackpackSol/BackpackSol.js';
+import { getConnectorConstructorForWalletStandardWallet } from './walletStandard/getConnectorConstructorForWalletStandardWallet/getConnectorConstructorForWalletStandardWallet.js';
+import { getWalletStandardWallets } from './walletStandard/getWalletStandardWallets/getWalletStandardWallets.js';
 
 const injectedWalletOverrides = [
     CoinbaseSolana,
     BackpackSol,
     Solflare,
 ];
-const filteredInjectedWalletKeysOverrides = [
+const walletsWithCustomConnectors = [
     'coinbasesolana',
     'phantom',
     'phantomledger',
     'backpacksol',
     'solflare',
 ];
+const shouldAddWalletStandardConnector = (wallet, walletBook) => {
+    var _a, _b, _c, _d, _e, _f;
+    const { name } = wallet;
+    const chain = 'sol';
+    const connectorKey = `${sanitizeName(name)}${chain}`;
+    logger.logVerboseTroubleshootingMessage('[SOL shouldAddWalletStandardConnector]', name, chain, connectorKey, wallet.features);
+    const existingWallet = Object.entries((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {}).find(([key, wallet]) => {
+        var _a;
+        return key === connectorKey ||
+            walletsWithCustomConnectors.includes(connectorKey) ||
+            (wallet.name === name && ((_a = wallet.injectedConfig) === null || _a === void 0 ? void 0 : _a[0].chain) === chain);
+    });
+    const hasAllFeatures = Boolean(((_b = wallet.features) === null || _b === void 0 ? void 0 : _b['standard:events']) &&
+        ((_c = wallet.features) === null || _c === void 0 ? void 0 : _c['standard:connect']) &&
+        ((_d = wallet.features) === null || _d === void 0 ? void 0 : _d['solana:signMessage']) &&
+        ((_e = wallet.features) === null || _e === void 0 ? void 0 : _e['solana:signTransaction']) &&
+        ((_f = wallet.features) === null || _f === void 0 ? void 0 : _f['solana:signAndSendTransaction']));
+    logger.logVerboseTroubleshootingMessage('[SOL shouldAddWalletStandardConnector]', {
+        existingWallet,
+        hasAllFeatures,
+        shouldAdd: !existingWallet && hasAllFeatures,
+    });
+    return !existingWallet && hasAllFeatures;
+};
 const fetchInjectedWalletConnectors = ({ walletBook, }) => {
     var _a;
-    return Object.entries((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {})
+    const walletBookConnectors = Object.entries((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {})
         .filter(([key, wallet]) => {
         var _a;
         const isSolanaWallet = Boolean((_a = wallet.injectedConfig) === null || _a === void 0 ? void 0 : _a.find((config) => config.chain === 'sol'));
-        const shouldBeFiltered = filteredInjectedWalletKeysOverrides.includes(key);
+        const shouldBeFiltered = walletsWithCustomConnectors.includes(key);
         return isSolanaWallet && !shouldBeFiltered;
     })
         .map(([key, wallet]) => {
-        var _a;
         const { shortName } = wallet;
         const name = shortName || wallet.name;
-        const hasWalletStandard = Boolean((_a = wallet.injectedConfig) === null || _a === void 0 ? void 0 : _a.find((config) => config.walletStandard));
-        if (hasWalletStandard) {
-            const isWalletStandardPresent = Boolean(SolanaWalletStandardConnector.getWallet(walletBook, key));
-            if (isWalletStandardPresent) {
-                return class extends SolanaWalletStandardConnector {
-                    constructor(props) {
-                        super(Object.assign({}, props));
-                        this.name = name;
-                        this.overrideKey = key;
-                    }
-                };
-            }
-        }
         return class extends InjectedWalletBase {
-            constructor(props) {
-                super(Object.assign({}, props));
+            constructor() {
+                super(...arguments);
                 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;
             }
         };
     });
+    const walletStandardWallets = getWalletStandardWallets();
+    const walletStandardConnectors = walletStandardWallets
+        .filter((wallet) => shouldAddWalletStandardConnector(wallet, walletBook))
+        .map((wallet) => getConnectorConstructorForWalletStandardWallet(wallet));
+    logger.logVerboseTroubleshootingMessage('[SOL fetchInjectedWalletConnectors] walletStandardConnectors', walletStandardConnectors.map((w) => w.name));
+    return [...walletBookConnectors, ...walletStandardConnectors];
 };
 
 export { fetchInjectedWalletConnectors, injectedWalletOverrides };

package/src/injected/index.d.ts

@@ -1,3 +1,2 @@
 export * from './fetchInjectedWalletConnectors';
-export * from './UnknownInjected';
 export * from './FallbackSolanaConnector';

package/src/{SolanaWalletStandardConnector/utils → injected/walletStandard}/createSolanaSignerFromWalletStandard/createSolanaSignerFromWalletStandard.cjs

@@ -5,11 +5,38 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../_virtual/_tslib.cjs');
 var web3_js = require('@solana/web3.js');
-var utils = require('../../../phantomRedirect/utils.cjs');
+var fetchCluster = require('../../../phantomRedirect/fetchCluster/fetchCluster.cjs');
+var logger = require('../../../utils/logger.cjs');
 
 const isVersionedTransaction = (transaction) => !('instructions' in transaction);
 const createSolanaSignerFromWalletStandard = (wallet, walletConnector) => {
     const features = wallet.features;
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const connect = (args) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        var _a;
+        const connectMethod = (_a = features['standard:connect']) === null || _a === void 0 ? void 0 : _a.connect;
+        if (!connectMethod) {
+            logger.logger.error('connect - Not implemented');
+            return;
+        }
+        const result = yield connectMethod({ silent: false });
+        if (!result.accounts[0]) {
+            return;
+        }
+        return {
+            address: result.accounts[0].address,
+            publicKey: result.accounts[0].publicKey,
+        };
+    });
+    const disconnect = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        var _b;
+        const disconnectMethod = (_b = features['standard:disconnect']) === null || _b === void 0 ? void 0 : _b.disconnect;
+        if (!disconnectMethod) {
+            logger.logger.debug('disconnect - Not implemented');
+            return;
+        }
+        yield disconnectMethod();
+    });
     const getCurrentAccount = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const address = yield walletConnector.getAddress();
         const account = wallet.accounts.find((account) => account.address === address);
@@ -19,9 +46,9 @@ const createSolanaSignerFromWalletStandard = (wallet, walletConnector) => {
         return account;
     });
     const getChain = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b;
-        const rpc = (_b = (_a = walletConnector.solNetworks[0].privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : walletConnector.solNetworks[0].rpcUrls[0];
-        const cluster = yield utils.fetchCluster(rpc);
+        var _c, _d;
+        const rpc = (_d = (_c = walletConnector.solNetworks[0].privateCustomerRpcUrls) === null || _c === void 0 ? void 0 : _c[0]) !== null && _d !== void 0 ? _d : walletConnector.solNetworks[0].rpcUrls[0];
+        const cluster = yield fetchCluster.fetchCluster(rpc);
         return `solana:${cluster}`;
     });
     const signTransaction = (transaction) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
@@ -57,19 +84,39 @@ const createSolanaSignerFromWalletStandard = (wallet, walletConnector) => {
         });
         return { signature: messages[0].signature };
     });
+    const on = (event, listener) => {
+        var _a;
+        const onMethod = (_a = features['standard:events']) === null || _a === void 0 ? void 0 : _a.on;
+        if (!onMethod) {
+            logger.logger.error('on - Not implemented');
+            return;
+        }
+        if (event !== 'accountChanged') {
+            logger.logger.debug(`on - Not implemented for event: ${event}`);
+            return;
+        }
+        const wrappedListener = (prop) => {
+            var _a;
+            const publicKey = (_a = prop.accounts) === null || _a === void 0 ? void 0 : _a[0].publicKey;
+            if (publicKey) {
+                listener(new TextDecoder().decode(publicKey));
+            }
+        };
+        // 'change' is the only event that is supported by the wallet standard
+        return onMethod('change', wrappedListener);
+    };
     return {
         addListener: () => {
-            throw new Error('Not implemented');
+            throw new Error('addListener - Not implemented');
         },
-        connect: () => {
-            throw new Error('Not implemented');
-        },
-        disconnect: () => walletConnector.endSession(),
+        connect,
+        disconnect,
         emit: () => {
-            throw new Error('Not implemented');
+            throw new Error('emit - Not implemented');
         },
         eventNames: () => {
-            throw new Error('Not implemented');
+            logger.logger.error('eventNames - Not implemented');
+            return [];
         },
         isBackpack: false,
         isBraveWallet: false,
@@ -80,32 +127,36 @@ const createSolanaSignerFromWalletStandard = (wallet, walletConnector) => {
         isPhantom: false,
         isSolflare: false,
         listenerCount: () => {
-            throw new Error('Not implemented');
+            logger.logger.error('listenerCount - Not implemented');
+            return 0;
         },
         listeners: () => {
-            throw new Error('Not implemented');
+            logger.logger.error('listeners - Not implemented');
+            return [];
         },
         off: () => {
-            throw new Error('Not implemented');
-        },
-        on: () => {
-            throw new Error('Not implemented');
+            throw new Error('off - Not implemented');
         },
+        on,
         once: () => {
-            throw new Error('Not implemented');
+            throw new Error('once - Not implemented');
         },
         providers: [],
         get publicKey() {
+            var _a;
+            if (!((_a = wallet.accounts) === null || _a === void 0 ? void 0 : _a[0].publicKey)) {
+                return undefined;
+            }
             return new web3_js.PublicKey(wallet.accounts[0].publicKey);
         },
         removeAllListeners: () => {
-            throw new Error('Not implemented');
+            throw new Error('removeAllListeners - Not implemented');
         },
         removeListener: () => {
-            throw new Error('Not implemented');
+            throw new Error('removeListener - Not implemented');
         },
         send: () => {
-            throw new Error('Not implemented');
+            throw new Error('send - Not implemented');
         },
         signAllTransactions,
         signAndSendTransaction,

package/src/injected/walletStandard/createSolanaSignerFromWalletStandard/createSolanaSignerFromWalletStandard.d.ts

@@ -0,0 +1,4 @@
+import { Wallet } from '@wallet-standard/base';
+import { ISolana } from '@dynamic-labs/solana-core';
+import { InjectedWalletBase } from '../../InjectedWalletBase';
+export declare const createSolanaSignerFromWalletStandard: (wallet: Wallet, walletConnector: InjectedWalletBase) => ISolana;

package/src/{SolanaWalletStandardConnector/utils → injected/walletStandard}/createSolanaSignerFromWalletStandard/createSolanaSignerFromWalletStandard.js

@@ -1,11 +1,38 @@
 'use client'
 import { __awaiter } from '../../../../_virtual/_tslib.js';
 import { PublicKey, VersionedTransaction, Transaction } from '@solana/web3.js';
-import { fetchCluster } from '../../../phantomRedirect/utils.js';
+import { fetchCluster } from '../../../phantomRedirect/fetchCluster/fetchCluster.js';
+import { logger } from '../../../utils/logger.js';
 
 const isVersionedTransaction = (transaction) => !('instructions' in transaction);
 const createSolanaSignerFromWalletStandard = (wallet, walletConnector) => {
     const features = wallet.features;
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const connect = (args) => __awaiter(void 0, void 0, void 0, function* () {
+        var _a;
+        const connectMethod = (_a = features['standard:connect']) === null || _a === void 0 ? void 0 : _a.connect;
+        if (!connectMethod) {
+            logger.error('connect - Not implemented');
+            return;
+        }
+        const result = yield connectMethod({ silent: false });
+        if (!result.accounts[0]) {
+            return;
+        }
+        return {
+            address: result.accounts[0].address,
+            publicKey: result.accounts[0].publicKey,
+        };
+    });
+    const disconnect = () => __awaiter(void 0, void 0, void 0, function* () {
+        var _b;
+        const disconnectMethod = (_b = features['standard:disconnect']) === null || _b === void 0 ? void 0 : _b.disconnect;
+        if (!disconnectMethod) {
+            logger.debug('disconnect - Not implemented');
+            return;
+        }
+        yield disconnectMethod();
+    });
     const getCurrentAccount = () => __awaiter(void 0, void 0, void 0, function* () {
         const address = yield walletConnector.getAddress();
         const account = wallet.accounts.find((account) => account.address === address);
@@ -15,8 +42,8 @@ const createSolanaSignerFromWalletStandard = (wallet, walletConnector) => {
         return account;
     });
     const getChain = () => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b;
-        const rpc = (_b = (_a = walletConnector.solNetworks[0].privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : walletConnector.solNetworks[0].rpcUrls[0];
+        var _c, _d;
+        const rpc = (_d = (_c = walletConnector.solNetworks[0].privateCustomerRpcUrls) === null || _c === void 0 ? void 0 : _c[0]) !== null && _d !== void 0 ? _d : walletConnector.solNetworks[0].rpcUrls[0];
         const cluster = yield fetchCluster(rpc);
         return `solana:${cluster}`;
     });
@@ -53,19 +80,39 @@ const createSolanaSignerFromWalletStandard = (wallet, walletConnector) => {
         });
         return { signature: messages[0].signature };
     });
+    const on = (event, listener) => {
+        var _a;
+        const onMethod = (_a = features['standard:events']) === null || _a === void 0 ? void 0 : _a.on;
+        if (!onMethod) {
+            logger.error('on - Not implemented');
+            return;
+        }
+        if (event !== 'accountChanged') {
+            logger.debug(`on - Not implemented for event: ${event}`);
+            return;
+        }
+        const wrappedListener = (prop) => {
+            var _a;
+            const publicKey = (_a = prop.accounts) === null || _a === void 0 ? void 0 : _a[0].publicKey;
+            if (publicKey) {
+                listener(new TextDecoder().decode(publicKey));
+            }
+        };
+        // 'change' is the only event that is supported by the wallet standard
+        return onMethod('change', wrappedListener);
+    };
     return {
         addListener: () => {
-            throw new Error('Not implemented');
+            throw new Error('addListener - Not implemented');
         },
-        connect: () => {
-            throw new Error('Not implemented');
-        },
-        disconnect: () => walletConnector.endSession(),
+        connect,
+        disconnect,
         emit: () => {
-            throw new Error('Not implemented');
+            throw new Error('emit - Not implemented');
         },
         eventNames: () => {
-            throw new Error('Not implemented');
+            logger.error('eventNames - Not implemented');
+            return [];
         },
         isBackpack: false,
         isBraveWallet: false,
@@ -76,32 +123,36 @@ const createSolanaSignerFromWalletStandard = (wallet, walletConnector) => {
         isPhantom: false,
         isSolflare: false,
         listenerCount: () => {
-            throw new Error('Not implemented');
+            logger.error('listenerCount - Not implemented');
+            return 0;
         },
         listeners: () => {
-            throw new Error('Not implemented');
+            logger.error('listeners - Not implemented');
+            return [];
         },
         off: () => {
-            throw new Error('Not implemented');
-        },
-        on: () => {
-            throw new Error('Not implemented');
+            throw new Error('off - Not implemented');
         },
+        on,
         once: () => {
-            throw new Error('Not implemented');
+            throw new Error('once - Not implemented');
         },
         providers: [],
         get publicKey() {
+            var _a;
+            if (!((_a = wallet.accounts) === null || _a === void 0 ? void 0 : _a[0].publicKey)) {
+                return undefined;
+            }
             return new PublicKey(wallet.accounts[0].publicKey);
         },
         removeAllListeners: () => {
-            throw new Error('Not implemented');
+            throw new Error('removeAllListeners - Not implemented');
         },
         removeListener: () => {
-            throw new Error('Not implemented');
+            throw new Error('removeListener - Not implemented');
         },
         send: () => {
-            throw new Error('Not implemented');
+            throw new Error('send - Not implemented');
         },
         signAllTransactions,
         signAndSendTransaction,

package/src/injected/walletStandard/getConnectorConstructorForWalletStandardWallet/getConnectorConstructorForWalletStandardWallet.cjs

@@ -0,0 +1,29 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var utils = require('@dynamic-labs/utils');
+var InjectedWalletBase = require('../../InjectedWalletBase/InjectedWalletBase.cjs');
+var createSolanaSignerFromWalletStandard = require('../createSolanaSignerFromWalletStandard/createSolanaSignerFromWalletStandard.cjs');
+
+const getConnectorConstructorForWalletStandardWallet = (wallet) => {
+    const sanitizedName = utils.sanitizeName(wallet.name);
+    return class extends InjectedWalletBase.InjectedWalletBase {
+        constructor(props) {
+            super(Object.assign(Object.assign({}, props), { metadata: {
+                    groupKey: sanitizedName,
+                    icon: wallet.icon,
+                    id: sanitizedName,
+                    name: wallet.name,
+                } }));
+            this.name = wallet.name;
+            this.overrideKey = `${sanitizedName}sol`;
+        }
+        findProvider() {
+            return createSolanaSignerFromWalletStandard.createSolanaSignerFromWalletStandard(wallet, this);
+        }
+    };
+};
+
+exports.getConnectorConstructorForWalletStandardWallet = getConnectorConstructorForWalletStandardWallet;

package/src/injected/walletStandard/getConnectorConstructorForWalletStandardWallet/getConnectorConstructorForWalletStandardWallet.d.ts

@@ -0,0 +1,3 @@
+import { Wallet } from '@wallet-standard/base';
+import { WalletConnectorConstructor } from '@dynamic-labs/wallet-connector-core';
+export declare const getConnectorConstructorForWalletStandardWallet: (wallet: Wallet) => WalletConnectorConstructor;

package/src/injected/walletStandard/getConnectorConstructorForWalletStandardWallet/getConnectorConstructorForWalletStandardWallet.js

@@ -0,0 +1,25 @@
+'use client'
+import { sanitizeName } from '@dynamic-labs/utils';
+import { InjectedWalletBase } from '../../InjectedWalletBase/InjectedWalletBase.js';
+import { createSolanaSignerFromWalletStandard } from '../createSolanaSignerFromWalletStandard/createSolanaSignerFromWalletStandard.js';
+
+const getConnectorConstructorForWalletStandardWallet = (wallet) => {
+    const sanitizedName = sanitizeName(wallet.name);
+    return class extends InjectedWalletBase {
+        constructor(props) {
+            super(Object.assign(Object.assign({}, props), { metadata: {
+                    groupKey: sanitizedName,
+                    icon: wallet.icon,
+                    id: sanitizedName,
+                    name: wallet.name,
+                } }));
+            this.name = wallet.name;
+            this.overrideKey = `${sanitizedName}sol`;
+        }
+        findProvider() {
+            return createSolanaSignerFromWalletStandard(wallet, this);
+        }
+    };
+};
+
+export { getConnectorConstructorForWalletStandardWallet };

package/src/injected/walletStandard/getConnectorConstructorForWalletStandardWallet/index.d.ts

@@ -0,0 +1 @@
+export { getConnectorConstructorForWalletStandardWallet } from './getConnectorConstructorForWalletStandardWallet';

package/src/injected/walletStandard/getWalletStandardWallets/getWalletStandardWallets.cjs

@@ -0,0 +1,10 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var app = require('@wallet-standard/app');
+
+const getWalletStandardWallets = () => app.getWallets().get();
+
+exports.getWalletStandardWallets = getWalletStandardWallets;

package/src/injected/walletStandard/getWalletStandardWallets/getWalletStandardWallets.d.ts

@@ -0,0 +1 @@
+export declare const getWalletStandardWallets: () => readonly import("@wallet-standard/base").Wallet[];

package/src/injected/walletStandard/getWalletStandardWallets/getWalletStandardWallets.js

@@ -0,0 +1,6 @@
+'use client'
+import { getWallets } from '@wallet-standard/app';
+
+const getWalletStandardWallets = () => getWallets().get();
+
+export { getWalletStandardWallets };

package/src/injected/walletStandard/getWalletStandardWallets/index.d.ts

@@ -0,0 +1 @@
+export { getWalletStandardWallets } from './getWalletStandardWallets';