@dynamic-labs/solana 4.40.2 → 4.41.1

package/CHANGELOG.md

@@ -1,4 +1,24 @@
 
+### [4.41.1](https://github.com/dynamic-labs/dynamic-auth/compare/v4.41.0...v4.41.1) (2025-10-30)
+
+
+### Bug Fixes
+
+* aptos login with petra keyless accounts ([#9795](https://github.com/dynamic-labs/dynamic-auth/issues/9795)) ([99dc34b](https://github.com/dynamic-labs/dynamic-auth/commit/99dc34b95d1ec23d168c9e092e2d735b1d50a71d))
+* backpack aptos login due to invalid public key ([#9806](https://github.com/dynamic-labs/dynamic-auth/issues/9806)) ([ec8b761](https://github.com/dynamic-labs/dynamic-auth/commit/ec8b76181acff7906fd92c77c2fca42ce52010ae))
+
+## [4.41.0](https://github.com/dynamic-labs/dynamic-auth/compare/v4.40.2...v4.41.0) (2025-10-29)
+
+
+### Features
+
+* **react-native:** add MFA recovery methods ([#9788](https://github.com/dynamic-labs/dynamic-auth/issues/9788)) ([664e0d5](https://github.com/dynamic-labs/dynamic-auth/commit/664e0d5878530abc9e645c8801a87f3109cfd8f9))
+
+
+### Bug Fixes
+
+* crypto.com link opening on mobile ([#9779](https://github.com/dynamic-labs/dynamic-auth/issues/9779)) ([3439ac9](https://github.com/dynamic-labs/dynamic-auth/commit/3439ac9e2610360c6204f6195433ae3e05e26c30))
+
 ### [4.40.2](https://github.com/dynamic-labs/dynamic-auth/compare/v4.40.1...v4.40.2) (2025-10-28)
 
 

package/package.cjs

@@ -3,6 +3,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "4.40.2";
+var version = "4.41.1";
 
 exports.version = version;

package/package.js

@@ -1,4 +1,4 @@
 'use client'
-var version = "4.40.2";
+var version = "4.41.1";
 
 export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/solana",
-  "version": "4.40.2",
+  "version": "4.41.1",
   "description": "A React SDK for implementing wallet web3 authentication and authorization to your website.",
   "author": "Dynamic Labs, Inc.",
   "license": "MIT",
@@ -18,7 +18,7 @@
   },
   "homepage": "https://www.dynamic.xyz/",
   "dependencies": {
-    "@dynamic-labs/wallet-connect": "4.40.2",
+    "@dynamic-labs/wallet-connect": "4.41.1",
     "@solana/web3.js": "1.98.1",
     "@wallet-standard/app": "1.0.1",
     "@wallet-standard/base": "1.0.1",
@@ -29,17 +29,17 @@
     "@walletconnect/sign-client": "2.21.5",
     "@walletconnect/utils": "2.21.5",
     "@walletconnect/types": "2.21.5",
-    "@dynamic-labs/assert-package-version": "4.40.2",
-    "@dynamic-labs/embedded-wallet-solana": "4.40.2",
-    "@dynamic-labs/logger": "4.40.2",
-    "@dynamic-labs/rpc-providers": "4.40.2",
+    "@dynamic-labs/assert-package-version": "4.41.1",
+    "@dynamic-labs/embedded-wallet-solana": "4.41.1",
+    "@dynamic-labs/logger": "4.41.1",
+    "@dynamic-labs/rpc-providers": "4.41.1",
     "@dynamic-labs/sdk-api-core": "0.0.813",
-    "@dynamic-labs/solana-core": "4.40.2",
-    "@dynamic-labs/types": "4.40.2",
-    "@dynamic-labs/utils": "4.40.2",
-    "@dynamic-labs/waas-svm": "4.40.2",
-    "@dynamic-labs/wallet-book": "4.40.2",
-    "@dynamic-labs/wallet-connector-core": "4.40.2",
+    "@dynamic-labs/solana-core": "4.41.1",
+    "@dynamic-labs/types": "4.41.1",
+    "@dynamic-labs/utils": "4.41.1",
+    "@dynamic-labs/waas-svm": "4.41.1",
+    "@dynamic-labs/wallet-book": "4.41.1",
+    "@dynamic-labs/wallet-connector-core": "4.41.1",
     "eventemitter3": "5.0.1"
   },
   "peerDependencies": {}

package/src/walletConnect/SolanaWalletConnectConnector/SolanaWalletConnectConnector.cjs

@@ -55,11 +55,18 @@ class SolanaWalletConnectConnector extends solanaCore.SolanaWalletConnector {
         }
         return SolanaWalletConnectConnector.signClientReference;
     }
+    getAvailableMethods() {
+        var _a, _b;
+        if (!this.session) {
+            return [];
+        }
+        return (_b = (_a = this.session.namespaces.solana) === null || _a === void 0 ? void 0 : _a.methods) !== null && _b !== void 0 ? _b : [];
+    }
     getSupportedNetworks() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             var _a, _b;
             if (!this.session) {
-                return [];
+                return this.solNetworks.map((network) => network.chainId.toString());
             }
             const sessionChains = (_b = (_a = this.session.namespaces.solana) === null || _a === void 0 ? void 0 : _a.chains) !== null && _b !== void 0 ? _b : [];
             return this.solNetworks
@@ -80,6 +87,46 @@ class SolanaWalletConnectConnector extends solanaCore.SolanaWalletConnector {
             this.activeAccountEmitter.off('activeAccountDidChange', listener);
         };
     }
+    isSendBalanceUnsupported() {
+        // If there is no session, we assume the wallet supports send balance
+        // If we didn't, the send TX button would turn disabled on a refresh
+        if (!this.session) {
+            return false;
+        }
+        const supportedMethods = this.getAvailableMethods();
+        return (!supportedMethods.includes('solana_signAndSendTransaction') &&
+            !supportedMethods.includes('solana_signTransaction'));
+    }
+    createUiTransaction(from) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            yield this.validateActiveWallet(from);
+            if (this.isSendBalanceUnsupported()) {
+                throw new utils.DynamicError('Wallet does not support signing transactions. Please connect to a wallet that supports signing transactions.');
+            }
+            const transaction = new solanaCore.SolanaUiTransaction({
+                connection: this.getWalletClient(),
+                from,
+                onSubmit: (transaction) => _tslib.__awaiter(this, void 0, void 0, function* () {
+                    var _a;
+                    if (!transaction)
+                        return;
+                    const blockhash = yield this.getWalletClient().getLatestBlockhash();
+                    if ('version' in transaction) {
+                        transaction.message.recentBlockhash =
+                            blockhash.blockhash;
+                    }
+                    else {
+                        // Use the 'from' parameter which is the validated active wallet address
+                        transaction.recentBlockhash = blockhash.blockhash;
+                        transaction.feePayer =
+                            (_a = transaction.feePayer) !== null && _a !== void 0 ? _a : new web3_js.PublicKey(from);
+                    }
+                    return yield this.signAndSendTransaction(transaction);
+                }),
+            });
+            return transaction;
+        });
+    }
     getSigner() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             return createSolanaSignerForWalletConnect.createSolanaSignerForWalletConnect({ walletConnector: this });
@@ -90,6 +137,23 @@ class SolanaWalletConnectConnector extends solanaCore.SolanaWalletConnector {
             throw new Error('Connect method not implemented.');
         });
     }
+    static globalInit(args) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            SolanaWalletConnectConnector.signClientPromise = walletConnect.getSignClientSingleton({
+                appIcon: (_a = args.appLogoUrl) !== null && _a !== void 0 ? _a : '',
+                appName: (_b = args.appName) !== null && _b !== void 0 ? _b : '',
+                projectId: args.projectId,
+            });
+            SolanaWalletConnectConnector.signClientReference =
+                yield SolanaWalletConnectConnector.signClientPromise;
+            SolanaWalletConnectConnector.signClientReference.on('session_event', (event) => {
+                SolanaWalletConnectConnector.sessionEventListeners.forEach((listener) => {
+                    listener(event);
+                });
+            });
+        });
+    }
     init() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             if (this.isInitialized) {
@@ -102,64 +166,58 @@ class SolanaWalletConnectConnector extends solanaCore.SolanaWalletConnector {
                 this.setupWCEventListeners();
                 return;
             }
-            const { appLogoUrl, appName, projectId } = this.constructorProps;
-            SolanaWalletConnectConnector.signClientPromise = walletConnect.getSignClientSingleton({
-                appIcon: appLogoUrl !== null && appLogoUrl !== void 0 ? appLogoUrl : '',
-                appName: appName !== null && appName !== void 0 ? appName : '',
-                projectId,
-            });
-            SolanaWalletConnectConnector.signClientReference =
-                yield SolanaWalletConnectConnector.signClientPromise;
+            yield SolanaWalletConnectConnector.globalInit(this.constructorProps);
             this.setupWCEventListeners();
         });
     }
-    setupWCEventListeners() {
-        logger.logger.debug('[SolanaWalletConnect] setupWCEventListeners');
-        this.signClient.on('session_event', ({ params: { event }, topic }) => {
-            var _a, _b;
-            // Ignore events for wallets other than the one we are connected to
-            if (!this.session || topic !== this.session.topic) {
-                return;
-            }
-            if (event.name === 'chainChanged') {
-                const chainParam = event.data;
-                let chainId = chainParam;
-                // Handle potentially CAIP-2 format
-                if (chainParam.startsWith('solana:')) {
-                    const chainHash = chainParam.split(':')[1];
-                    chainId =
-                        (_b = (_a = this.solNetworks
-                            .find((network) => network.genesisHash === chainHash)) === null || _a === void 0 ? void 0 : _a.networkId.toString()) !== null && _b !== void 0 ? _b : chainParam;
-                }
-                logger.logger.debug('[SolanaWalletConnect] onChainChange', { chainId });
-                if (chainId === this.getNetworkId()) {
-                    logger.logger.debug(`[SolanaWalletConnect] onChainChange - ignoring chainChanged event with same chain id as current chain id: ${chainId}`);
-                    return;
-                }
-                // This will already emit an event so no need to call this.emit('chainChange', { chain: chainId });
-                this.switchNetwork({ networkChainId: parseInt(chainId) });
-                return;
-            }
-            if (event.name === 'accountsChanged') {
-                const accountsParam = event.data;
-                const accounts = utils.filterDuplicates(accountsParam.map((account) => {
-                    // Handle potentially CAIP-10 format
-                    if (account.startsWith('solana:')) {
-                        return account.split(':')[2];
-                    }
-                    return account;
-                }));
-                logger.logger.debug('[SolanaWalletConnect] onAccountChanged', { accounts });
-                this.emit('accountChange', { accounts });
-                return;
+    handleSessionEvent({ params: { event }, topic }) {
+        var _a, _b;
+        // Ignore events for wallets other than the one we are connected to
+        if (!this.session || topic !== this.session.topic) {
+            return;
+        }
+        if (event.name === 'chainChanged') {
+            const chainParam = event.data;
+            let chainId = chainParam;
+            // Handle potentially CAIP-2 format
+            if (typeof chainParam === 'string' && chainParam.startsWith('solana:')) {
+                const chainHash = chainParam.split(':')[1];
+                chainId =
+                    (_b = (_a = this.solNetworks
+                        .find((network) => network.genesisHash === chainHash)) === null || _a === void 0 ? void 0 : _a.networkId.toString()) !== null && _b !== void 0 ? _b : chainParam;
             }
-            if (event.name === 'disconnected') {
-                logger.logger.debug('[SolanaWalletConnect] onDisconnect');
-                this.emit('disconnect');
-                this.endSession();
+            logger.logger.debug('[SolanaWalletConnect] onChainChange', { chainId });
+            if (chainId === this.getNetworkId()) {
+                logger.logger.debug(`[SolanaWalletConnect] onChainChange - ignoring chainChanged event with same chain id as current chain id: ${chainId}`);
                 return;
             }
-        });
+            // This will already emit an event so no need to call this.emit('chainChange', { chain: chainId });
+            this.switchNetwork({ networkChainId: parseInt(String(chainId)) });
+            return;
+        }
+        if (event.name === 'accountsChanged') {
+            const accountsParam = event.data;
+            const accounts = utils.filterDuplicates(accountsParam.map((account) => {
+                // Handle potentially CAIP-10 format
+                if (account.startsWith('solana:')) {
+                    return account.split(':')[2];
+                }
+                return account;
+            }));
+            logger.logger.debug('[SolanaWalletConnect] onAccountChanged', { accounts });
+            this.emit('accountChange', { accounts });
+            return;
+        }
+        if (event.name === 'disconnected') {
+            logger.logger.debug('[SolanaWalletConnect] onDisconnect');
+            this.emit('disconnect');
+            this.endSession();
+            return;
+        }
+    }
+    setupWCEventListeners() {
+        logger.logger.debug('[SolanaWalletConnect] setupWCEventListeners');
+        SolanaWalletConnectConnector.sessionEventListeners.push((event) => this.handleSessionEvent(event));
     }
     endSession() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
@@ -212,8 +270,14 @@ class SolanaWalletConnectConnector extends solanaCore.SolanaWalletConnector {
             }
             logger.logger.debug('[SolanaWalletConnect] getAddress - connecting to WalletConnect');
             const chains = this.solNetworks.map((network) => `solana:${network.genesisHash}`);
+            // Await for the promise in case this gets called right as the window is loaded
+            // and the sign client is still initializing
+            const signClient = yield SolanaWalletConnectConnector.signClientPromise;
+            if (!signClient) {
+                throw new utils.DynamicError('Failed to access sign client for Wallet Connect Solana: Sign client not initialized');
+            }
             try {
-                const { approval, uri } = yield this.signClient.connect({
+                const { approval, uri } = yield signClient.connect({
                     optionalNamespaces: {
                         solana: {
                             chains,
@@ -330,12 +394,27 @@ class SolanaWalletConnectConnector extends solanaCore.SolanaWalletConnector {
             if (!activeAddress) {
                 throw new utils.DynamicError('Active account address is required');
             }
+            logger.logger.debug('[SolanaWalletConnect] Signing transaction', {
+                activeAddress,
+                isVersioned: 'version' in transaction,
+                transaction,
+            });
             const serializedTransaction = this.serializeTransaction(transaction);
+            logger.logger.debug('[SolanaWalletConnect] Sending to wallet for signing', {
+                serializedLength: serializedTransaction.length,
+            });
             const { transaction: signedTransaction } = yield this.signClientRequest({
                 method: 'solana_signTransaction',
                 params: { transaction: serializedTransaction },
             });
+            logger.logger.debug('[SolanaWalletConnect] Received signed transaction from wallet', {
+                signedTransactionLength: signedTransaction.length,
+                signedTransactionPreview: signedTransaction.substring(0, 50),
+            });
             const decodedTransaction = bs58__default["default"].decode(signedTransaction);
+            logger.logger.debug('[SolanaWalletConnect] Decoded signed transaction', {
+                decodedLength: decodedTransaction.length,
+            });
             if (solanaCore.isVersionedTransaction(transaction)) {
                 return web3_js.VersionedTransaction.deserialize(decodedTransaction);
             }
@@ -361,12 +440,45 @@ class SolanaWalletConnectConnector extends solanaCore.SolanaWalletConnector {
     }
     signAndSendTransaction(transaction, options) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const serializedTransaction = this.serializeTransaction(transaction);
-            const { signature } = yield this.signClientRequest({
-                method: 'solana_signAndSendTransaction',
-                params: { options, transaction: serializedTransaction },
-            });
-            return signature;
+            const supportedMethods = this.getAvailableMethods();
+            // Try to use signAndSendTransaction if supported
+            if (supportedMethods.includes('solana_signAndSendTransaction')) {
+                const serializedTransaction = this.serializeTransaction(transaction);
+                const { signature } = yield this.signClientRequest({
+                    method: 'solana_signAndSendTransaction',
+                    params: { options, transaction: serializedTransaction },
+                });
+                return signature;
+            }
+            // Fallback: use signTransaction + sendRawTransaction
+            if (supportedMethods.includes('solana_signTransaction')) {
+                logger.logger.debug('[SolanaWalletConnect] Using fallback: signTransaction + sendRawTransaction');
+                const signedTransaction = yield this.signTransaction(transaction);
+                const isSigned = solanaCore.isTxAlreadySigned(signedTransaction);
+                logger.logger.debug('[SolanaWalletConnect] Transaction signed, checking signatures', {
+                    hasSignatures: 'signatures' in signedTransaction &&
+                        signedTransaction.signatures.length > 0,
+                    isSigned,
+                    signaturesLength: 'signatures' in signedTransaction
+                        ? signedTransaction.signatures.length
+                        : 'N/A',
+                });
+                if (!isSigned) {
+                    throw new utils.DynamicError('Transaction returned from wallet was not properly signed. The wallet may have rejected the signing request.');
+                }
+                // When sending a signed transaction, serialize it without flags
+                // (requireAllSignatures and verifySignatures are only for unsigned transactions)
+                const serialized = signedTransaction.serialize();
+                logger.logger.debug('[SolanaWalletConnect] Transaction serialized', {
+                    serializedLength: serialized.length,
+                });
+                const signature = yield this.getWalletClient().sendRawTransaction(serialized, options);
+                logger.logger.debug('[SolanaWalletConnect] Transaction sent successfully', {
+                    signature,
+                });
+                return signature;
+            }
+            throw new utils.DynamicError('Wallet does not support signing and sending transactions. Please connect to a wallet that supports at least solana_signTransaction.');
         });
     }
     getDeepLink() {
@@ -374,8 +486,6 @@ class SolanaWalletConnectConnector extends solanaCore.SolanaWalletConnector {
             deepLinks: this.metadata.deepLinks,
             mode: 'regular',
             preference: this.deepLinkPreference,
-            // TODO: verify whether we need the uri
-            // uri: provider.signer.uri,
         });
         logger.logger.logVerboseTroubleshootingMessage('[SolanaWalletConnect] getDeepLink - deepLink', deepLink);
         if (!deepLink) {
@@ -421,5 +531,6 @@ class SolanaWalletConnectConnector extends solanaCore.SolanaWalletConnector {
         });
     }
 }
+SolanaWalletConnectConnector.sessionEventListeners = [];
 
 exports.SolanaWalletConnectConnector = SolanaWalletConnectConnector;

package/src/walletConnect/SolanaWalletConnectConnector/SolanaWalletConnectConnector.d.ts

@@ -1,8 +1,9 @@
 import { SendOptions, Transaction, VersionedTransaction } from '@solana/web3.js';
 import SignClient from '@walletconnect/sign-client';
-import type { SessionTypes } from '@walletconnect/types';
+import type { SessionTypes, SignClientTypes } from '@walletconnect/types';
 import { ISolanaSigner, SolanaWalletConnector, SolanaWalletConnectorOpts } from '@dynamic-labs/solana-core';
-import { DeepLinkVariant, GetAddressOpts, IWalletConnectConnector } from '@dynamic-labs/wallet-connector-core';
+import { DeepLinkVariant, GetAddressOpts, ISendBalanceWalletConnector, IWalletConnectConnector } from '@dynamic-labs/wallet-connector-core';
+import { IUITransaction } from '@dynamic-labs/types';
 export type SolanaWalletConnectConnectorOpts = SolanaWalletConnectorOpts & {
     projectId?: string;
     walletName: string;
@@ -11,10 +12,18 @@ export type SolanaWalletConnectConnectorOpts = SolanaWalletConnectorOpts & {
     appName?: string;
     overrideKey?: string;
 };
-export declare class SolanaWalletConnectConnector extends SolanaWalletConnector implements IWalletConnectConnector {
+type SessionEventArgs = SignClientTypes.BaseEventArgs<{
+    event: {
+        name: string;
+        data: any;
+    };
+    chainId: string;
+}>;
+export declare class SolanaWalletConnectConnector extends SolanaWalletConnector implements IWalletConnectConnector, ISendBalanceWalletConnector {
     name: string;
     static signClientReference: SignClient | undefined;
     static signClientPromise: Promise<SignClient> | undefined;
+    static sessionEventListeners: ((args: SessionEventArgs) => void)[];
     /**
      * When a WalletConnect connection is initiated, we store the connection URI
      * so we can use it to handle the URI for wallet app connection and still have
@@ -35,12 +44,21 @@ export declare class SolanaWalletConnectConnector extends SolanaWalletConnector
      * immediately available.
      */
     get signClient(): SignClient;
+    getAvailableMethods(): string[];
     getSupportedNetworks(): Promise<string[]>;
     getActiveAddress(): string | undefined;
     listenToActiveAccountChange(listener: (account: string) => void): VoidFunction;
+    isSendBalanceUnsupported(): boolean;
+    createUiTransaction(from: string): Promise<IUITransaction>;
     getSigner(): Promise<ISolanaSigner>;
     connect(): Promise<void>;
+    static globalInit(args: {
+        appLogoUrl: string;
+        appName: string;
+        projectId: string;
+    }): Promise<void>;
     init(): Promise<void>;
+    handleSessionEvent({ params: { event }, topic }: SessionEventArgs): void;
     private setupWCEventListeners;
     endSession(): Promise<void>;
     private displayUri;
@@ -62,3 +80,4 @@ export declare class SolanaWalletConnectConnector extends SolanaWalletConnector
     getConnectionUri(): string | undefined;
     validateActiveWallet(expectedAddress: string): Promise<void>;
 }
+export {};

package/src/walletConnect/SolanaWalletConnectConnector/SolanaWalletConnectConnector.js

@@ -4,7 +4,7 @@ import { PublicKey, VersionedTransaction, Transaction } from '@solana/web3.js';
 import { SDK_ERRORS } from '@walletconnect/utils';
 import bs58 from 'bs58';
 import EventEmitter from 'eventemitter3';
-import { SolanaWalletConnector, isVersionedTransaction } from '@dynamic-labs/solana-core';
+import { SolanaWalletConnector, SolanaUiTransaction, isVersionedTransaction, isTxAlreadySigned } from '@dynamic-labs/solana-core';
 import { StorageService, DynamicError, filterDuplicates, isMobile, PlatformService, bufferToBase64 } from '@dynamic-labs/utils';
 import { getSignClientSingleton } from '@dynamic-labs/wallet-connect';
 import { performPlatformSpecificConnectionMethod, getDeepLink, isSameAddress } from '@dynamic-labs/wallet-connector-core';
@@ -46,11 +46,18 @@ class SolanaWalletConnectConnector extends SolanaWalletConnector {
         }
         return SolanaWalletConnectConnector.signClientReference;
     }
+    getAvailableMethods() {
+        var _a, _b;
+        if (!this.session) {
+            return [];
+        }
+        return (_b = (_a = this.session.namespaces.solana) === null || _a === void 0 ? void 0 : _a.methods) !== null && _b !== void 0 ? _b : [];
+    }
     getSupportedNetworks() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
             if (!this.session) {
-                return [];
+                return this.solNetworks.map((network) => network.chainId.toString());
             }
             const sessionChains = (_b = (_a = this.session.namespaces.solana) === null || _a === void 0 ? void 0 : _a.chains) !== null && _b !== void 0 ? _b : [];
             return this.solNetworks
@@ -71,6 +78,46 @@ class SolanaWalletConnectConnector extends SolanaWalletConnector {
             this.activeAccountEmitter.off('activeAccountDidChange', listener);
         };
     }
+    isSendBalanceUnsupported() {
+        // If there is no session, we assume the wallet supports send balance
+        // If we didn't, the send TX button would turn disabled on a refresh
+        if (!this.session) {
+            return false;
+        }
+        const supportedMethods = this.getAvailableMethods();
+        return (!supportedMethods.includes('solana_signAndSendTransaction') &&
+            !supportedMethods.includes('solana_signTransaction'));
+    }
+    createUiTransaction(from) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.validateActiveWallet(from);
+            if (this.isSendBalanceUnsupported()) {
+                throw new DynamicError('Wallet does not support signing transactions. Please connect to a wallet that supports signing transactions.');
+            }
+            const transaction = new SolanaUiTransaction({
+                connection: this.getWalletClient(),
+                from,
+                onSubmit: (transaction) => __awaiter(this, void 0, void 0, function* () {
+                    var _a;
+                    if (!transaction)
+                        return;
+                    const blockhash = yield this.getWalletClient().getLatestBlockhash();
+                    if ('version' in transaction) {
+                        transaction.message.recentBlockhash =
+                            blockhash.blockhash;
+                    }
+                    else {
+                        // Use the 'from' parameter which is the validated active wallet address
+                        transaction.recentBlockhash = blockhash.blockhash;
+                        transaction.feePayer =
+                            (_a = transaction.feePayer) !== null && _a !== void 0 ? _a : new PublicKey(from);
+                    }
+                    return yield this.signAndSendTransaction(transaction);
+                }),
+            });
+            return transaction;
+        });
+    }
     getSigner() {
         return __awaiter(this, void 0, void 0, function* () {
             return createSolanaSignerForWalletConnect({ walletConnector: this });
@@ -81,6 +128,23 @@ class SolanaWalletConnectConnector extends SolanaWalletConnector {
             throw new Error('Connect method not implemented.');
         });
     }
+    static globalInit(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            SolanaWalletConnectConnector.signClientPromise = getSignClientSingleton({
+                appIcon: (_a = args.appLogoUrl) !== null && _a !== void 0 ? _a : '',
+                appName: (_b = args.appName) !== null && _b !== void 0 ? _b : '',
+                projectId: args.projectId,
+            });
+            SolanaWalletConnectConnector.signClientReference =
+                yield SolanaWalletConnectConnector.signClientPromise;
+            SolanaWalletConnectConnector.signClientReference.on('session_event', (event) => {
+                SolanaWalletConnectConnector.sessionEventListeners.forEach((listener) => {
+                    listener(event);
+                });
+            });
+        });
+    }
     init() {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.isInitialized) {
@@ -93,64 +157,58 @@ class SolanaWalletConnectConnector extends SolanaWalletConnector {
                 this.setupWCEventListeners();
                 return;
             }
-            const { appLogoUrl, appName, projectId } = this.constructorProps;
-            SolanaWalletConnectConnector.signClientPromise = getSignClientSingleton({
-                appIcon: appLogoUrl !== null && appLogoUrl !== void 0 ? appLogoUrl : '',
-                appName: appName !== null && appName !== void 0 ? appName : '',
-                projectId,
-            });
-            SolanaWalletConnectConnector.signClientReference =
-                yield SolanaWalletConnectConnector.signClientPromise;
+            yield SolanaWalletConnectConnector.globalInit(this.constructorProps);
             this.setupWCEventListeners();
         });
     }
-    setupWCEventListeners() {
-        logger.debug('[SolanaWalletConnect] setupWCEventListeners');
-        this.signClient.on('session_event', ({ params: { event }, topic }) => {
-            var _a, _b;
-            // Ignore events for wallets other than the one we are connected to
-            if (!this.session || topic !== this.session.topic) {
-                return;
-            }
-            if (event.name === 'chainChanged') {
-                const chainParam = event.data;
-                let chainId = chainParam;
-                // Handle potentially CAIP-2 format
-                if (chainParam.startsWith('solana:')) {
-                    const chainHash = chainParam.split(':')[1];
-                    chainId =
-                        (_b = (_a = this.solNetworks
-                            .find((network) => network.genesisHash === chainHash)) === null || _a === void 0 ? void 0 : _a.networkId.toString()) !== null && _b !== void 0 ? _b : chainParam;
-                }
-                logger.debug('[SolanaWalletConnect] onChainChange', { chainId });
-                if (chainId === this.getNetworkId()) {
-                    logger.debug(`[SolanaWalletConnect] onChainChange - ignoring chainChanged event with same chain id as current chain id: ${chainId}`);
-                    return;
-                }
-                // This will already emit an event so no need to call this.emit('chainChange', { chain: chainId });
-                this.switchNetwork({ networkChainId: parseInt(chainId) });
-                return;
-            }
-            if (event.name === 'accountsChanged') {
-                const accountsParam = event.data;
-                const accounts = filterDuplicates(accountsParam.map((account) => {
-                    // Handle potentially CAIP-10 format
-                    if (account.startsWith('solana:')) {
-                        return account.split(':')[2];
-                    }
-                    return account;
-                }));
-                logger.debug('[SolanaWalletConnect] onAccountChanged', { accounts });
-                this.emit('accountChange', { accounts });
-                return;
+    handleSessionEvent({ params: { event }, topic }) {
+        var _a, _b;
+        // Ignore events for wallets other than the one we are connected to
+        if (!this.session || topic !== this.session.topic) {
+            return;
+        }
+        if (event.name === 'chainChanged') {
+            const chainParam = event.data;
+            let chainId = chainParam;
+            // Handle potentially CAIP-2 format
+            if (typeof chainParam === 'string' && chainParam.startsWith('solana:')) {
+                const chainHash = chainParam.split(':')[1];
+                chainId =
+                    (_b = (_a = this.solNetworks
+                        .find((network) => network.genesisHash === chainHash)) === null || _a === void 0 ? void 0 : _a.networkId.toString()) !== null && _b !== void 0 ? _b : chainParam;
             }
-            if (event.name === 'disconnected') {
-                logger.debug('[SolanaWalletConnect] onDisconnect');
-                this.emit('disconnect');
-                this.endSession();
+            logger.debug('[SolanaWalletConnect] onChainChange', { chainId });
+            if (chainId === this.getNetworkId()) {
+                logger.debug(`[SolanaWalletConnect] onChainChange - ignoring chainChanged event with same chain id as current chain id: ${chainId}`);
                 return;
             }
-        });
+            // This will already emit an event so no need to call this.emit('chainChange', { chain: chainId });
+            this.switchNetwork({ networkChainId: parseInt(String(chainId)) });
+            return;
+        }
+        if (event.name === 'accountsChanged') {
+            const accountsParam = event.data;
+            const accounts = filterDuplicates(accountsParam.map((account) => {
+                // Handle potentially CAIP-10 format
+                if (account.startsWith('solana:')) {
+                    return account.split(':')[2];
+                }
+                return account;
+            }));
+            logger.debug('[SolanaWalletConnect] onAccountChanged', { accounts });
+            this.emit('accountChange', { accounts });
+            return;
+        }
+        if (event.name === 'disconnected') {
+            logger.debug('[SolanaWalletConnect] onDisconnect');
+            this.emit('disconnect');
+            this.endSession();
+            return;
+        }
+    }
+    setupWCEventListeners() {
+        logger.debug('[SolanaWalletConnect] setupWCEventListeners');
+        SolanaWalletConnectConnector.sessionEventListeners.push((event) => this.handleSessionEvent(event));
     }
     endSession() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -203,8 +261,14 @@ class SolanaWalletConnectConnector extends SolanaWalletConnector {
             }
             logger.debug('[SolanaWalletConnect] getAddress - connecting to WalletConnect');
             const chains = this.solNetworks.map((network) => `solana:${network.genesisHash}`);
+            // Await for the promise in case this gets called right as the window is loaded
+            // and the sign client is still initializing
+            const signClient = yield SolanaWalletConnectConnector.signClientPromise;
+            if (!signClient) {
+                throw new DynamicError('Failed to access sign client for Wallet Connect Solana: Sign client not initialized');
+            }
             try {
-                const { approval, uri } = yield this.signClient.connect({
+                const { approval, uri } = yield signClient.connect({
                     optionalNamespaces: {
                         solana: {
                             chains,
@@ -321,12 +385,27 @@ class SolanaWalletConnectConnector extends SolanaWalletConnector {
             if (!activeAddress) {
                 throw new DynamicError('Active account address is required');
             }
+            logger.debug('[SolanaWalletConnect] Signing transaction', {
+                activeAddress,
+                isVersioned: 'version' in transaction,
+                transaction,
+            });
             const serializedTransaction = this.serializeTransaction(transaction);
+            logger.debug('[SolanaWalletConnect] Sending to wallet for signing', {
+                serializedLength: serializedTransaction.length,
+            });
             const { transaction: signedTransaction } = yield this.signClientRequest({
                 method: 'solana_signTransaction',
                 params: { transaction: serializedTransaction },
             });
+            logger.debug('[SolanaWalletConnect] Received signed transaction from wallet', {
+                signedTransactionLength: signedTransaction.length,
+                signedTransactionPreview: signedTransaction.substring(0, 50),
+            });
             const decodedTransaction = bs58.decode(signedTransaction);
+            logger.debug('[SolanaWalletConnect] Decoded signed transaction', {
+                decodedLength: decodedTransaction.length,
+            });
             if (isVersionedTransaction(transaction)) {
                 return VersionedTransaction.deserialize(decodedTransaction);
             }
@@ -352,12 +431,45 @@ class SolanaWalletConnectConnector extends SolanaWalletConnector {
     }
     signAndSendTransaction(transaction, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const serializedTransaction = this.serializeTransaction(transaction);
-            const { signature } = yield this.signClientRequest({
-                method: 'solana_signAndSendTransaction',
-                params: { options, transaction: serializedTransaction },
-            });
-            return signature;
+            const supportedMethods = this.getAvailableMethods();
+            // Try to use signAndSendTransaction if supported
+            if (supportedMethods.includes('solana_signAndSendTransaction')) {
+                const serializedTransaction = this.serializeTransaction(transaction);
+                const { signature } = yield this.signClientRequest({
+                    method: 'solana_signAndSendTransaction',
+                    params: { options, transaction: serializedTransaction },
+                });
+                return signature;
+            }
+            // Fallback: use signTransaction + sendRawTransaction
+            if (supportedMethods.includes('solana_signTransaction')) {
+                logger.debug('[SolanaWalletConnect] Using fallback: signTransaction + sendRawTransaction');
+                const signedTransaction = yield this.signTransaction(transaction);
+                const isSigned = isTxAlreadySigned(signedTransaction);
+                logger.debug('[SolanaWalletConnect] Transaction signed, checking signatures', {
+                    hasSignatures: 'signatures' in signedTransaction &&
+                        signedTransaction.signatures.length > 0,
+                    isSigned,
+                    signaturesLength: 'signatures' in signedTransaction
+                        ? signedTransaction.signatures.length
+                        : 'N/A',
+                });
+                if (!isSigned) {
+                    throw new DynamicError('Transaction returned from wallet was not properly signed. The wallet may have rejected the signing request.');
+                }
+                // When sending a signed transaction, serialize it without flags
+                // (requireAllSignatures and verifySignatures are only for unsigned transactions)
+                const serialized = signedTransaction.serialize();
+                logger.debug('[SolanaWalletConnect] Transaction serialized', {
+                    serializedLength: serialized.length,
+                });
+                const signature = yield this.getWalletClient().sendRawTransaction(serialized, options);
+                logger.debug('[SolanaWalletConnect] Transaction sent successfully', {
+                    signature,
+                });
+                return signature;
+            }
+            throw new DynamicError('Wallet does not support signing and sending transactions. Please connect to a wallet that supports at least solana_signTransaction.');
         });
     }
     getDeepLink() {
@@ -365,8 +477,6 @@ class SolanaWalletConnectConnector extends SolanaWalletConnector {
             deepLinks: this.metadata.deepLinks,
             mode: 'regular',
             preference: this.deepLinkPreference,
-            // TODO: verify whether we need the uri
-            // uri: provider.signer.uri,
         });
         logger.logVerboseTroubleshootingMessage('[SolanaWalletConnect] getDeepLink - deepLink', deepLink);
         if (!deepLink) {
@@ -412,5 +522,6 @@ class SolanaWalletConnectConnector extends SolanaWalletConnector {
         });
     }
 }
+SolanaWalletConnectConnector.sessionEventListeners = [];
 
 export { SolanaWalletConnectConnector };