@dynamic-labs/sui-core 4.47.3 → 4.48.1

package/src/SuiWalletConnector.js

@@ -9,6 +9,13 @@ import { SuiUiTransaction } from './utils/SuiUiTransaction/SuiUiTransaction.js';
 import { SuiWallet } from './wallet/SuiWallet.js';
 
 class SuiWalletConnector extends WalletConnectorBase {
+    /** Returns the active wallet account, may be overridden */
+    getPrimaryAccount() {
+        return this.account;
+    }
+    setPrimaryAccount(account) {
+        this.account = account;
+    }
     constructor(name, opts) {
         super(opts);
         this.name = 'Sui';
@@ -37,7 +44,7 @@ class SuiWalletConnector extends WalletConnectorBase {
     connect() {
         return __awaiter(this, arguments, void 0, function* ({ silent } = {}) {
             var _a, _b;
-            if (this.account || this.isConnecting) {
+            if (this.getPrimaryAccount() || this.isConnecting) {
                 // Account is already connected or we're already connecting
                 return;
             }
@@ -50,12 +57,12 @@ class SuiWalletConnector extends WalletConnectorBase {
             }
             // Start connecting
             this.isConnecting = true;
-            this.logger.debug('[connect] Creating new connection');
+            this.logger.debug(`[${this.name}] [connect] Creating new connection`);
             try {
                 const response = yield connectFeature.connect(silent ? { silent } : undefined);
-                this.logger.debug(`[connect] Connection returned accounts: ${response === null || response === void 0 ? void 0 : response.accounts.length}`);
-                this.account = response === null || response === void 0 ? void 0 : response.accounts[0];
-                const primaryChain = (_b = this.account) === null || _b === void 0 ? void 0 : _b.chains[0];
+                this.logger.debug(`[${this.name}] [connect] Connection returned accounts: ${response === null || response === void 0 ? void 0 : response.accounts.length}`);
+                this.setPrimaryAccount(response === null || response === void 0 ? void 0 : response.accounts[0]);
+                const primaryChain = (_b = this.getPrimaryAccount()) === null || _b === void 0 ? void 0 : _b.chains[0];
                 if (primaryChain) {
                     this.activeNetworkId = getSuiNetworkIdFromName(primaryChain, this.suiNetworks);
                 }
@@ -96,21 +103,22 @@ class SuiWalletConnector extends WalletConnectorBase {
     /** Get the wallet address by connecting to the current account */
     getAddress() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.logger.debug('[getAddress] called, attempting to obtain the account address');
+            var _a;
+            this.logger.debug(`[${this.name}] [getAddress] called, attempting to obtain the account address`);
             if (this.handleInAppBrowserGetAddress()) {
                 return;
             }
             yield this.connect();
-            if (!this.account) {
-                throw new DynamicError('No account found');
+            if (!this.getPrimaryAccount()) {
+                throw new DynamicError(`[${this.name}] [getAddress] No account found`);
             }
-            return this.account.address;
+            return (_a = this.getPrimaryAccount()) === null || _a === void 0 ? void 0 : _a.address;
         });
     }
     /** Returns the network id of the account's active chain */
     getNetwork() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this.account) {
+            if (!this.getPrimaryAccount()) {
                 yield this.connect();
             }
             return this.activeNetworkId;
@@ -119,10 +127,10 @@ class SuiWalletConnector extends WalletConnectorBase {
     getConnectedAccounts() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            if (!this.account) {
+            if (!this.getPrimaryAccount()) {
                 yield this.connect({ silent: true });
             }
-            const address = (_a = this.account) === null || _a === void 0 ? void 0 : _a.address;
+            const address = (_a = this.getPrimaryAccount()) === null || _a === void 0 ? void 0 : _a.address;
             if (address) {
                 return [address];
             }
@@ -149,29 +157,33 @@ class SuiWalletConnector extends WalletConnectorBase {
         }
         return (_e = getSuiNetworkIdFromName(suiChain, this.suiNetworks)) !== null && _e !== void 0 ? _e : '-1';
     }
+    handleAccountChange(event) {
+        var _a;
+        // If the event sets accounts but it's empty, we need to disconnect.
+        if (event.accounts.length === 0 && this.getPrimaryAccount()) {
+            this.setPrimaryAccount(undefined);
+            this.emit('disconnect');
+            return;
+        }
+        const [primaryAccount] = event.accounts;
+        if (primaryAccount.address !== ((_a = this.getPrimaryAccount()) === null || _a === void 0 ? void 0 : _a.address)) {
+            this.setPrimaryAccount(primaryAccount);
+            this.emit('accountChange', { accounts: [primaryAccount.address] });
+        }
+    }
     setupEventListeners() {
         var _a;
         if (!this.canSetEventListeners || this.eventsHandler)
             return;
         const eventsFeature = (_a = this.getFeatures()) === null || _a === void 0 ? void 0 : _a['standard:events'];
         if (!eventsFeature) {
-            this.logger.debug('[setupEventListeners] Wallet not connected or does not support standard:events');
+            this.logger.debug(`[${this.name}] [setupEventListeners] Wallet not connected or does not support standard:events`);
             return;
         }
         this.eventsHandler = (event) => __awaiter(this, void 0, void 0, function* () {
-            var _b;
             if (event.accounts) {
-                // If the event sets accounts but it's empty, we need to disconnect.
-                if (event.accounts.length === 0 && this.account) {
-                    this.account = undefined;
-                    this.emit('disconnect');
-                    return;
-                }
-                const [primaryAccount] = event.accounts;
-                if (primaryAccount.address !== ((_b = this.account) === null || _b === void 0 ? void 0 : _b.address)) {
-                    this.account = primaryAccount;
-                    this.emit('accountChange', { accounts: [primaryAccount.address] });
-                }
+                this.handleAccountChange(event);
+                return;
             }
             // Some events will leave out accounts but set the chains object, so we process those
             // with the helper.
@@ -181,7 +193,7 @@ class SuiWalletConnector extends WalletConnectorBase {
                 this.emit('chainChange', { chain: suiChainId });
             }
         });
-        this.logger.debug('[setupEventListeners] Setting up sui wallet connector event listeners');
+        this.logger.debug(`[${this.name}] [setupEventListeners] Setting up sui wallet connector event listeners`);
         this.eventsUnsubscribeHandler = eventsFeature.on('change', this.eventsHandler);
     }
     /**
@@ -193,7 +205,7 @@ class SuiWalletConnector extends WalletConnectorBase {
         return __awaiter(this, void 0, void 0, function* () {
             const clientNetworkId = networkId !== null && networkId !== void 0 ? networkId : (yield this.getNetwork());
             if (!clientNetworkId) {
-                this.logger.error('[getSuiClient] Failed to get network id');
+                this.logger.error(`[${this.name}] [getSuiClient] Failed to get network id`);
                 return undefined;
             }
             // Default to an existing client if available
@@ -203,7 +215,7 @@ class SuiWalletConnector extends WalletConnectorBase {
             const network = this.getEnabledNetworks().find((network) => network.networkId === clientNetworkId);
             const url = network ? getPreferredRpcUrl(network) : undefined;
             if (!url) {
-                this.logger.error('[getSuiClient] Failed to get network url');
+                this.logger.error(`[${this.name}] [getSuiClient] Failed to get network url`);
                 return undefined;
             }
             this.suiClients[clientNetworkId] = new SuiClient({
@@ -216,7 +228,7 @@ class SuiWalletConnector extends WalletConnectorBase {
         return __awaiter(this, void 0, void 0, function* () {
             const client = yield this.getSuiClient();
             if (!client) {
-                this.logger.error('[getBalance] Failed to get Sui client');
+                this.logger.error(`[${this.name}] [getBalance] Failed to get Sui client`);
                 return undefined;
             }
             const balanceResult = yield client.getBalance({
@@ -225,7 +237,7 @@ class SuiWalletConnector extends WalletConnectorBase {
             // Balance comes back as MIST, 1 SUI = 1e9 MIST
             const balance = Number(balanceResult === null || balanceResult === void 0 ? void 0 : balanceResult.totalBalance) / 1e9;
             if (Number.isNaN(balance)) {
-                this.logger.error(`[getBalance] Failed to get balance for address: ${address}`);
+                this.logger.error(`[${this.name}] [getBalance] Failed to get balance for address: ${address}`);
                 return undefined;
             }
             return balance.toFixed(6);
@@ -234,19 +246,18 @@ class SuiWalletConnector extends WalletConnectorBase {
     signMessage(messageToSign) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            this.logger.debug('[signMessage] called, attempting to sign a message');
+            this.logger.debug(`[${this.name}] [signMessage] called, attempting to sign a message`);
             const signFeature = (_a = this.getFeatures()) === null || _a === void 0 ? void 0 : _a['sui:signPersonalMessage'];
             if (!signFeature) {
                 throw new DynamicError('Wallet does not support sui:signPersonalMessage');
             }
-            yield this.connect();
-            if (!this.account) {
+            if (!this.getPrimaryAccount()) {
                 throw new DynamicError('[signMessage] No account found');
             }
             let output;
             try {
                 output = yield signFeature.signPersonalMessage({
-                    account: this.account,
+                    account: this.getPrimaryAccount(),
                     message: new TextEncoder().encode(messageToSign),
                 });
             }
@@ -257,13 +268,13 @@ class SuiWalletConnector extends WalletConnectorBase {
             if (!output || !output.signature) {
                 throw new DynamicError('[signMessage] Failed to sign message');
             }
-            this.logger.debug(`[signMessage] Signed message: ${output.signature}`);
+            this.logger.debug(`[${this.name}] [signMessage] Signed message: ${output.signature}`);
             return output.signature;
         });
     }
     getWalletAccount() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.account;
+            return this.getPrimaryAccount();
         });
     }
     /** Function used to create transactions in the SDK interface */
@@ -301,7 +312,7 @@ class SuiWalletConnector extends WalletConnectorBase {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
             this.teardownEventListeners();
-            this.account = undefined;
+            this.setPrimaryAccount(undefined);
             if (!this.isInstalledOnBrowser())
                 return;
             const disconnectFeature = (_a = this.getFeatures()) === null || _a === void 0 ? void 0 : _a['standard:disconnect'];
@@ -321,15 +332,16 @@ class SuiWalletConnector extends WalletConnectorBase {
     }
     signAndExecuteTransactionFeature(_a) {
         return __awaiter(this, arguments, void 0, function* ({ transaction, legacyOptions, }) {
-            if (!this.account) {
+            var _b, _c;
+            if (!this.getPrimaryAccount()) {
                 throw new DynamicError('No account found');
             }
             const features = this.getFeatures();
             const signAndExecuteTransactionFeature = features === null || features === void 0 ? void 0 : features['sui:signAndExecuteTransaction'];
             if (signAndExecuteTransactionFeature) {
                 return signAndExecuteTransactionFeature.signAndExecuteTransaction({
-                    account: this.account,
-                    chain: this.account.chains[0],
+                    account: this.getPrimaryAccount(),
+                    chain: (_b = this.getPrimaryAccount()) === null || _b === void 0 ? void 0 : _b.chains[0],
                     transaction,
                 });
             }
@@ -338,8 +350,8 @@ class SuiWalletConnector extends WalletConnectorBase {
                 throw new DynamicError('Wallet does not support sui:signAndExecuteTransaction or sui:signAndExecuteTransactionBlock');
             }
             const result = yield signAndExecuteTransactionBlockFeature.signAndExecuteTransactionBlock({
-                account: this.account,
-                chain: this.account.chains[0],
+                account: this.getPrimaryAccount(),
+                chain: (_c = this.getPrimaryAccount()) === null || _c === void 0 ? void 0 : _c.chains[0],
                 options: legacyOptions === null || legacyOptions === void 0 ? void 0 : legacyOptions.options,
                 requestType: legacyOptions === null || legacyOptions === void 0 ? void 0 : legacyOptions.requestType,
                 transactionBlock: transaction,
@@ -349,15 +361,16 @@ class SuiWalletConnector extends WalletConnectorBase {
     }
     signTransactionFeature(_a) {
         return __awaiter(this, arguments, void 0, function* ({ transaction, }) {
-            if (!this.account) {
+            var _b, _c;
+            if (!this.getPrimaryAccount()) {
                 throw new DynamicError('No account found');
             }
             const features = this.getFeatures();
             const signTransactionFeature = features === null || features === void 0 ? void 0 : features['sui:signTransaction'];
             if (signTransactionFeature) {
                 return signTransactionFeature === null || signTransactionFeature === void 0 ? void 0 : signTransactionFeature.signTransaction({
-                    account: this.account,
-                    chain: this.account.chains[0],
+                    account: this.getPrimaryAccount(),
+                    chain: (_b = this.getPrimaryAccount()) === null || _b === void 0 ? void 0 : _b.chains[0],
                     transaction,
                 });
             }
@@ -366,8 +379,8 @@ class SuiWalletConnector extends WalletConnectorBase {
                 throw new DynamicError('Wallet does not support sui:signTransaction or sui:signTransactionBlock');
             }
             const result = yield signTransactionBlockFeature.signTransactionBlock({
-                account: this.account,
-                chain: this.account.chains[0],
+                account: this.getPrimaryAccount(),
+                chain: (_c = this.getPrimaryAccount()) === null || _c === void 0 ? void 0 : _c.chains[0],
                 transactionBlock: transaction,
             });
             return result;

package/src/index.cjs

@@ -9,6 +9,7 @@ var constants = require('./utils/constants/constants.cjs');
 var SuiWalletConnector = require('./SuiWalletConnector.cjs');
 var SuiWallet = require('./wallet/SuiWallet.cjs');
 var isSuiWallet = require('./wallet/isSuiWallet/isSuiWallet.cjs');
+var Slush = require('./wallets/slush/Slush.cjs');
 var SuiUiTransaction = require('./utils/SuiUiTransaction/SuiUiTransaction.cjs');
 var fetchSuiInjectedWalletConnectors = require('./wallets/injected/fetchSuiInjectedWalletConnectors.cjs');
 
@@ -19,5 +20,6 @@ exports.MIST_PER_SUI = constants.MIST_PER_SUI;
 exports.SuiWalletConnector = SuiWalletConnector.SuiWalletConnector;
 exports.SuiWallet = SuiWallet.SuiWallet;
 exports.isSuiWallet = isSuiWallet.isSuiWallet;
+exports.Slush = Slush.Slush;
 exports.SuiUiTransaction = SuiUiTransaction.SuiUiTransaction;
 exports.fetchSuiInjectedWalletConnectors = fetchSuiInjectedWalletConnectors.fetchSuiInjectedWalletConnectors;

package/src/index.d.ts

@@ -2,6 +2,7 @@ export * from './utils/constants';
 export { SuiWalletConnector } from './SuiWalletConnector';
 export { SuiWallet } from './wallet/SuiWallet';
 export { isSuiWallet } from './wallet/isSuiWallet';
+export { Slush } from './wallets/slush';
 export type { SuiWalletConnectorProps, SuiSendBalanceProps } from './types';
 export { SuiUiTransaction } from './utils/SuiUiTransaction/SuiUiTransaction';
 export { fetchSuiInjectedWalletConnectors } from './wallets/injected/fetchSuiInjectedWalletConnectors';

package/src/index.js

@@ -5,6 +5,7 @@ export { MIST_PER_SUI } from './utils/constants/constants.js';
 export { SuiWalletConnector } from './SuiWalletConnector.js';
 export { SuiWallet } from './wallet/SuiWallet.js';
 export { isSuiWallet } from './wallet/isSuiWallet/isSuiWallet.js';
+export { Slush } from './wallets/slush/Slush.js';
 export { SuiUiTransaction } from './utils/SuiUiTransaction/SuiUiTransaction.js';
 export { fetchSuiInjectedWalletConnectors } from './wallets/injected/fetchSuiInjectedWalletConnectors.js';
 

package/src/wallets/injected/fetchSuiInjectedWalletConnectors.cjs

@@ -6,22 +6,33 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var walletStandard = require('@mysten/wallet-standard');
 var utils = require('@dynamic-labs/utils');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+var Slush = require('../slush/Slush.cjs');
 var injected = require('./injected.cjs');
 
+// Wallets with custom connectors that should not be auto-generated
+const walletsWithCustomConnectors = {
+    slush: Slush.Slush,
+};
+const getCustomConnectorForKey = (name) => {
+    var _a;
+    return (_a = Object.entries(walletsWithCustomConnectors).find(([key]) => name.toLowerCase().includes(key.toLowerCase()))) === null || _a === void 0 ? void 0 : _a[1];
+};
 const fetchSuiInjectedWalletConnectors = ({ walletBook, }) => {
     var _a;
     const walletStandardWallets = walletStandard.getWallets().get();
     const suiWalletStandardWallets = walletStandardWallets.filter((wallet) => walletStandard.isWalletWithRequiredFeatureSet(wallet, ['sui:signPersonalMessage']));
     const suiWalletsByKey = Object.fromEntries(suiWalletStandardWallets.map((wallet) => [wallet.name, wallet]));
     const walletBookConnectors = Object.entries((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {})
-        .filter(([, wallet]) => {
+        .filter(([key, wallet]) => {
         var _a, _b;
         const injectedConfig = (_a = wallet.injectedConfig) === null || _a === void 0 ? void 0 : _a.find((config) => config.chain === 'sui');
         const isSuiWallet = Boolean(injectedConfig);
         const walletStandardName = (_b = injectedConfig === null || injectedConfig === void 0 ? void 0 : injectedConfig.walletStandard) === null || _b === void 0 ? void 0 : _b.name;
         // If the wallet is injected via wallet standard, use that over the wallet book entry
         const shouldBeFiltered = walletStandardName && suiWalletsByKey[walletStandardName];
-        return isSuiWallet && !shouldBeFiltered;
+        // Filter out wallets that have custom connectors
+        const hasCustomConnector = Boolean(getCustomConnectorForKey(key));
+        return isSuiWallet && !shouldBeFiltered && !hasCustomConnector;
     })
         .map(([key, wallet]) => {
         // Currently we only support wallet standard wallets
@@ -44,7 +55,21 @@ const fetchSuiInjectedWalletConnectors = ({ walletBook, }) => {
         .filter((wallet) => { var _a; return (_a = wallet.features) === null || _a === void 0 ? void 0 : _a['sui:signPersonalMessage']; })
         .map((wallet) => {
         const sanitizedName = utils.sanitizeName(wallet.name);
+        const customConnector = getCustomConnectorForKey(sanitizedName);
         const isInstalled = true;
+        if (customConnector) {
+            return class extends customConnector {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                constructor(props) {
+                    super(wallet.name, isInstalled, Object.assign({ metadata: {
+                            groupKey: sanitizedName,
+                            icon: wallet.icon,
+                            id: wallet.name,
+                            name: wallet.name,
+                        }, name: wallet.name, overrideKey: `${sanitizedName}sui`, wallet: wallet }, props));
+                }
+            };
+        }
         return class extends injected.Injected {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             constructor(props) {

package/src/wallets/injected/fetchSuiInjectedWalletConnectors.js

@@ -2,22 +2,33 @@
 import { getWallets, isWalletWithRequiredFeatureSet } from '@mysten/wallet-standard';
 import { sanitizeName } from '@dynamic-labs/utils';
 import { getWalletMetadataFromWalletBook } from '@dynamic-labs/wallet-connector-core';
+import { Slush } from '../slush/Slush.js';
 import { Injected } from './injected.js';
 
+// Wallets with custom connectors that should not be auto-generated
+const walletsWithCustomConnectors = {
+    slush: Slush,
+};
+const getCustomConnectorForKey = (name) => {
+    var _a;
+    return (_a = Object.entries(walletsWithCustomConnectors).find(([key]) => name.toLowerCase().includes(key.toLowerCase()))) === null || _a === void 0 ? void 0 : _a[1];
+};
 const fetchSuiInjectedWalletConnectors = ({ walletBook, }) => {
     var _a;
     const walletStandardWallets = getWallets().get();
     const suiWalletStandardWallets = walletStandardWallets.filter((wallet) => isWalletWithRequiredFeatureSet(wallet, ['sui:signPersonalMessage']));
     const suiWalletsByKey = Object.fromEntries(suiWalletStandardWallets.map((wallet) => [wallet.name, wallet]));
     const walletBookConnectors = Object.entries((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {})
-        .filter(([, wallet]) => {
+        .filter(([key, wallet]) => {
         var _a, _b;
         const injectedConfig = (_a = wallet.injectedConfig) === null || _a === void 0 ? void 0 : _a.find((config) => config.chain === 'sui');
         const isSuiWallet = Boolean(injectedConfig);
         const walletStandardName = (_b = injectedConfig === null || injectedConfig === void 0 ? void 0 : injectedConfig.walletStandard) === null || _b === void 0 ? void 0 : _b.name;
         // If the wallet is injected via wallet standard, use that over the wallet book entry
         const shouldBeFiltered = walletStandardName && suiWalletsByKey[walletStandardName];
-        return isSuiWallet && !shouldBeFiltered;
+        // Filter out wallets that have custom connectors
+        const hasCustomConnector = Boolean(getCustomConnectorForKey(key));
+        return isSuiWallet && !shouldBeFiltered && !hasCustomConnector;
     })
         .map(([key, wallet]) => {
         // Currently we only support wallet standard wallets
@@ -40,7 +51,21 @@ const fetchSuiInjectedWalletConnectors = ({ walletBook, }) => {
         .filter((wallet) => { var _a; return (_a = wallet.features) === null || _a === void 0 ? void 0 : _a['sui:signPersonalMessage']; })
         .map((wallet) => {
         const sanitizedName = sanitizeName(wallet.name);
+        const customConnector = getCustomConnectorForKey(sanitizedName);
         const isInstalled = true;
+        if (customConnector) {
+            return class extends customConnector {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                constructor(props) {
+                    super(wallet.name, isInstalled, Object.assign({ metadata: {
+                            groupKey: sanitizedName,
+                            icon: wallet.icon,
+                            id: wallet.name,
+                            name: wallet.name,
+                        }, name: wallet.name, overrideKey: `${sanitizedName}sui`, wallet: wallet }, props));
+                }
+            };
+        }
         return class extends Injected {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             constructor(props) {