@dynamic-labs/waas-svm 4.46.1 → 4.46.3

package/CHANGELOG.md

@@ -1,4 +1,18 @@
 
+### [4.46.3](https://github.com/dynamic-labs/dynamic-auth/compare/v4.46.2...v4.46.3) (2025-11-20)
+
+
+### Bug Fixes
+
+* ensure that phantomredirect does not render if the previous request is the same ([#9920](https://github.com/dynamic-labs/dynamic-auth/issues/9920)) ([2bb9665](https://github.com/dynamic-labs/dynamic-auth/commit/2bb96654821518bee6378c65d1353a33aea1363b))
+
+### [4.46.2](https://github.com/dynamic-labs/dynamic-auth/compare/v4.46.1...v4.46.2) (2025-11-20)
+
+
+### Bug Fixes
+
+* patch vulnerability with package @hpke/core ([#9923](https://github.com/dynamic-labs/dynamic-auth/issues/9923)) ([24133c6](https://github.com/dynamic-labs/dynamic-auth/commit/24133c6155fa36cd65cd2befabbdd9cbaa239b61))
+
 ### [4.46.1](https://github.com/dynamic-labs/dynamic-auth/compare/v4.46.0...v4.46.1) (2025-11-20)
 
 ## [4.46.0](https://github.com/dynamic-labs/dynamic-auth/compare/v4.45.3...v4.46.0) (2025-11-19)

package/package.cjs

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

package/package.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/waas-svm",
-  "version": "4.46.1",
+  "version": "4.46.3",
   "description": "A React SDK for implementing wallet web3 authentication and authorization to your website.",
   "author": "Dynamic Labs, Inc.",
   "license": "MIT",
@@ -22,14 +22,14 @@
     "@solana/web3.js": "1.98.1",
     "eventemitter3": "5.0.1",
     "bs58": "5.0.0",
-    "@dynamic-labs/assert-package-version": "4.46.1",
-    "@dynamic-labs/logger": "4.46.1",
-    "@dynamic-labs/rpc-providers": "4.46.1",
-    "@dynamic-labs/solana-core": "4.46.1",
-    "@dynamic-labs/types": "4.46.1",
-    "@dynamic-labs/utils": "4.46.1",
-    "@dynamic-labs/waas": "4.46.1",
-    "@dynamic-labs/wallet-connector-core": "4.46.1"
+    "@dynamic-labs/assert-package-version": "4.46.3",
+    "@dynamic-labs/logger": "4.46.3",
+    "@dynamic-labs/rpc-providers": "4.46.3",
+    "@dynamic-labs/solana-core": "4.46.3",
+    "@dynamic-labs/types": "4.46.3",
+    "@dynamic-labs/utils": "4.46.3",
+    "@dynamic-labs/waas": "4.46.3",
+    "@dynamic-labs/wallet-connector-core": "4.46.3"
   },
   "peerDependencies": {}
 }

package/src/connector/DynamicWaasSVMConnector.cjs

@@ -12,6 +12,7 @@ var waas = require('@dynamic-labs/waas');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var logger = require('../../utils/logger.cjs');
 var DynamicWaasSVMSigner = require('../signer/DynamicWaasSVMSigner.cjs');
+var logger$1 = require('@dynamic-labs/logger');
 
 class DynamicWaasSVMConnector extends waas.withDynamicWaas(solanaCore.SolanaWalletConnector) {
     connect() {
@@ -22,8 +23,16 @@ class DynamicWaasSVMConnector extends waas.withDynamicWaas(solanaCore.SolanaWall
         this.name = 'Dynamic Waas';
         this.overrideKey = 'dynamicwaas';
         this.isEmbeddedWallet = true;
+        this.logger = logger.logger;
         this.walletUiUtils = props.walletUiUtils;
     }
+    /**
+     * Override setEnvironmentId to ensure it's set on the global logger
+     */
+    setEnvironmentId(environmentId) {
+        super.setEnvironmentId(environmentId);
+        logger$1.Logger.setEnvironmentId(environmentId);
+    }
     setActiveAccountAddress(accountAddress) {
         this.activeAccountAddress = accountAddress;
     }
@@ -54,10 +63,17 @@ class DynamicWaasSVMConnector extends waas.withDynamicWaas(solanaCore.SolanaWall
             }
         });
     }
-    internalSignMessage(message) {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
+    internalSignMessage(message_1) {
+        return _tslib.__awaiter(this, arguments, void 0, function* (message, { parentTraceId, startTime, } = {}) {
             var _a, _b, _c;
-            const walletClient = yield this.getWaasWalletClient();
+            const traceId = parentTraceId || this.generateTraceId();
+            const effectiveStartTime = startTime || Date.now();
+            const walletClient = yield this.instrumentAsync({
+                context: { startTime: effectiveStartTime, traceId },
+                fn: () => _tslib.__awaiter(this, void 0, void 0, function* () { return this.getWaasWalletClient(); }),
+                operation: 'internalSignMessage',
+                resource: 'getWaasWalletClient',
+            });
             if (!this.activeAccountAddress) {
                 throw new Error('Active account address is required');
             }
@@ -68,12 +84,21 @@ class DynamicWaasSVMConnector extends waas.withDynamicWaas(solanaCore.SolanaWall
             const mfaToken = yield ((_b = this.getMfaToken) === null || _b === void 0 ? void 0 : _b.call(this, {
                 mfaAction: sdkApiCore.MFAAction.WalletWaasSign,
             }));
-            const signedMessage = yield walletClient.signMessage({
-                accountAddress: this.activeAccountAddress,
-                authToken: (_c = this.getAuthToken) === null || _c === void 0 ? void 0 : _c.call(this),
-                message,
-                mfaToken,
-                signedSessionId,
+            const accountAddress = this.activeAccountAddress;
+            const authToken = (_c = this.getAuthToken) === null || _c === void 0 ? void 0 : _c.call(this);
+            const signedMessage = yield this.instrumentAsync({
+                context: { startTime: effectiveStartTime, traceId },
+                fn: () => _tslib.__awaiter(this, void 0, void 0, function* () {
+                    return walletClient.signMessage({
+                        accountAddress,
+                        authToken,
+                        message,
+                        mfaToken,
+                        signedSessionId,
+                    });
+                }),
+                operation: 'internalSignMessage',
+                resource: 'walletClient.signMessage',
             });
             return signedMessage;
         });
@@ -83,17 +108,44 @@ class DynamicWaasSVMConnector extends waas.withDynamicWaas(solanaCore.SolanaWall
             if (!this.activeAccountAddress) {
                 throw new Error('Active account address is required');
             }
-            return this.walletUiUtils.signMessage({
-                handler: () => _tslib.__awaiter(this, void 0, void 0, function* () { return this.internalSignMessage(message); }),
+            const traceId = this.generateTraceId();
+            const startTime = Date.now();
+            this.instrument('[signMessage] start', {
+                key: 'signMessage-start',
+                startTime,
+                time: 0,
+                traceId,
+            });
+            const signedMessage = yield this.walletUiUtils.signMessage({
+                handler: () => _tslib.__awaiter(this, void 0, void 0, function* () {
+                    return this.internalSignMessage(message, {
+                        parentTraceId: traceId,
+                        startTime,
+                    });
+                }),
                 message,
                 walletConnector: this,
             });
+            this.instrument('[signMessage] completed', {
+                key: 'signMessage-completed',
+                startTime,
+                time: Date.now() - startTime,
+                traceId,
+            });
+            return signedMessage;
         });
     }
-    internalSignTransaction(transaction) {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
-            const walletClient = yield this.getWaasWalletClient();
+    internalSignTransaction(transaction_1) {
+        return _tslib.__awaiter(this, arguments, void 0, function* (transaction, { parentTraceId, startTime, } = {}) {
+            var _a, _b;
+            const traceId = parentTraceId || this.generateTraceId();
+            const effectiveStartTime = startTime || Date.now();
+            const walletClient = yield this.instrumentAsync({
+                context: { startTime: effectiveStartTime, traceId },
+                fn: () => _tslib.__awaiter(this, void 0, void 0, function* () { return this.getWaasWalletClient(); }),
+                operation: 'internalSignTransaction',
+                resource: 'getWaasWalletClient',
+            });
             const signedSessionId = yield ((_a = this.getSignedSessionId) === null || _a === void 0 ? void 0 : _a.call(this));
             if (!signedSessionId) {
                 throw new utils.DynamicError('Signed session ID is required');
@@ -109,13 +161,22 @@ class DynamicWaasSVMConnector extends waas.withDynamicWaas(solanaCore.SolanaWall
                 : transaction.message.serialize();
             const messageToSign = Buffer.from(messageBytes).toString('hex');
             const chainId = yield this.getNetwork(true);
-            const signature = yield walletClient.signTransaction({
-                authToken: (_c = this.getAuthToken) === null || _c === void 0 ? void 0 : _c.call(this),
-                chainId,
-                mfaToken,
-                senderAddress: this.activeAccountAddress,
-                signedSessionId,
-                transaction: messageToSign,
+            const senderAddress = this.activeAccountAddress;
+            const signature = yield this.instrumentAsync({
+                context: { startTime: effectiveStartTime, traceId },
+                fn: () => _tslib.__awaiter(this, void 0, void 0, function* () {
+                    var _c;
+                    return walletClient.signTransaction({
+                        authToken: (_c = this.getAuthToken) === null || _c === void 0 ? void 0 : _c.call(this),
+                        chainId,
+                        mfaToken,
+                        senderAddress,
+                        signedSessionId,
+                        transaction: messageToSign,
+                    });
+                }),
+                operation: 'internalSignTransaction',
+                resource: 'signTransaction',
             });
             transaction.addSignature(new web3_js.PublicKey(this.activeAccountAddress), Buffer.from(signature, 'hex'));
             try {
@@ -125,7 +186,7 @@ class DynamicWaasSVMConnector extends waas.withDynamicWaas(solanaCore.SolanaWall
                 });
             }
             catch (err) {
-                logger.logger.warn('[signTransaction] Error signing transaction', err);
+                logger.logger.warn('[internalSignTransaction] Error signing transaction', err);
             }
             return transaction;
         });
@@ -135,13 +196,33 @@ class DynamicWaasSVMConnector extends waas.withDynamicWaas(solanaCore.SolanaWall
             if (!this.activeAccountAddress) {
                 throw new Error('Active account address is required');
             }
+            const traceId = this.generateTraceId();
+            const startTime = Date.now();
+            this.instrument('[signTransaction] start', {
+                key: 'signTransaction-start',
+                startTime,
+                time: 0,
+                traceId,
+            });
             const uiTransaction = new solanaCore.SolanaUiTransaction({
                 connection: this.getWalletClient(),
                 from: this.activeAccountAddress,
                 multipleTransactions: [transaction],
-                onSubmit: () => _tslib.__awaiter(this, void 0, void 0, function* () { return this.internalSignTransaction(transaction); }),
+                onSubmit: () => _tslib.__awaiter(this, void 0, void 0, function* () {
+                    return this.internalSignTransaction(transaction, {
+                        parentTraceId: traceId,
+                        startTime,
+                    });
+                }),
             });
-            return this.walletUiUtils.signTransaction(this, uiTransaction);
+            const signedTransaction = yield this.walletUiUtils.signTransaction(this, uiTransaction);
+            this.instrument('[signTransaction] completed', {
+                key: 'signTransaction-completed',
+                startTime,
+                time: Date.now() - startTime,
+                traceId,
+            });
+            return signedTransaction;
         });
     }
     internalSignAllTransactions(transactions) {
@@ -162,40 +243,106 @@ class DynamicWaasSVMConnector extends waas.withDynamicWaas(solanaCore.SolanaWall
             if (!this.activeAccountAddress) {
                 throw new Error('Active account address is required');
             }
+            const traceId = this.generateTraceId();
+            const startTime = Date.now();
+            this.instrument('[signAllTransactions] start', {
+                key: 'signAllTransactions-start',
+                startTime,
+                time: 0,
+                traceId,
+            });
             const uiTransaction = new solanaCore.SolanaUiTransaction({
                 connection: this.getWalletClient(),
                 from: this.activeAccountAddress,
                 multipleTransactions: transactions,
                 onSubmit: () => _tslib.__awaiter(this, void 0, void 0, function* () { return this.internalSignAllTransactions(transactions); }),
             });
-            return this.walletUiUtils.signTransaction(this, uiTransaction);
+            const signedTransactions = yield this.walletUiUtils.signTransaction(this, uiTransaction);
+            this.instrument('[signAllTransactions] completed', {
+                key: 'signAllTransactions-completed',
+                startTime,
+                time: Date.now() - startTime,
+                traceId,
+            });
+            return signedTransactions;
         });
     }
-    internalSignAndSendTransaction(transaction, options) {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
+    internalSignAndSendTransaction(transaction_1, options_1) {
+        return _tslib.__awaiter(this, arguments, void 0, function* (transaction, options, { parentTraceId, startTime, } = {}) {
+            const traceId = parentTraceId || this.generateTraceId();
+            const effectiveStartTime = startTime || Date.now();
             if (!this.activeAccountAddress) {
                 throw new Error('Active account address is required');
             }
             const connection = this.getWalletClient();
-            const signedTransaction = yield this.internalSignTransaction(transaction);
-            const signature = yield connection.sendRawTransaction(signedTransaction.serialize({
-                requireAllSignatures: false,
-                verifySignatures: true,
-            }), options);
+            const signedTransaction = yield this.instrumentAsync({
+                context: { startTime: effectiveStartTime, traceId },
+                fn: () => _tslib.__awaiter(this, void 0, void 0, function* () {
+                    return this.internalSignTransaction(transaction, {
+                        parentTraceId: traceId,
+                        startTime: effectiveStartTime,
+                    });
+                }),
+                operation: 'internalSignAndSendTransaction',
+                resource: 'internalSignTransaction',
+            });
+            const signature = yield this.instrumentAsync({
+                context: {
+                    rpcUrl: connection.rpcEndpoint,
+                    startTime: effectiveStartTime,
+                    traceId,
+                },
+                fn: () => _tslib.__awaiter(this, void 0, void 0, function* () {
+                    return connection.sendRawTransaction(signedTransaction.serialize({
+                        requireAllSignatures: false,
+                        verifySignatures: true,
+                    }), options);
+                }),
+                operation: 'internalSignAndSendTransaction',
+                resource: 'sendRawTransaction',
+            });
             // Listen for transaction confirmation with timeout
+            const confirmationStartTime = Date.now();
             return new Promise((resolve, reject) => {
+                var _a;
                 const timeout = setTimeout(() => {
+                    const timeoutTotalElapsed = Date.now() - confirmationStartTime;
+                    this.instrument(`[internalSignAndSendTransaction] Transaction timed out - total: ${timeoutTotalElapsed}ms`, {
+                        key: 'internalSignAndSendTransaction-transactionTimedOut',
+                        rpcUrl: connection.rpcEndpoint,
+                        time: timeoutTotalElapsed,
+                        traceId,
+                    });
                     reject(new Error('Transaction timed out'));
                 }, 60000);
                 connection.onSignature(signature, (result) => {
                     clearTimeout(timeout);
+                    const confirmationEndTime = Date.now();
+                    const confirmationStepElapsed = confirmationEndTime - confirmationStartTime;
+                    const confirmationTotalElapsed = confirmationEndTime - effectiveStartTime;
                     if (result.err) {
+                        logger.logger.error(`[internalSignAndSendTransaction] Transaction failed - total: ${confirmationTotalElapsed}ms, step: ${confirmationStepElapsed}ms`, {
+                            accountAddress: this.activeAccountAddress,
+                            error: result.err,
+                            key: 'internalSignAndSendTransaction-transactionFailed',
+                            rpcUrl: connection.rpcEndpoint,
+                            stepTime: confirmationStepElapsed,
+                            time: confirmationTotalElapsed,
+                            traceId,
+                        });
                         reject(new Error(`Transaction failed: ${result.err}`));
                     }
                     else {
+                        this.instrument(`[internalSignAndSendTransaction] Transaction confirmed - total: ${confirmationTotalElapsed}ms, step: ${confirmationStepElapsed}ms`, {
+                            key: 'internalSignAndSendTransaction-transactionSuccess',
+                            rpcUrl: connection.rpcEndpoint,
+                            stepTime: confirmationStepElapsed,
+                            time: confirmationTotalElapsed,
+                            traceId,
+                        });
                         resolve(signature);
                     }
-                }, 'confirmed');
+                }, (_a = options === null || options === void 0 ? void 0 : options.preflightCommitment) !== null && _a !== void 0 ? _a : 'confirmed');
             });
         });
     }
@@ -204,13 +351,34 @@ class DynamicWaasSVMConnector extends waas.withDynamicWaas(solanaCore.SolanaWall
             if (!this.activeAccountAddress) {
                 throw new Error('Active account address is required');
             }
+            const traceId = this.generateTraceId();
+            const startTime = Date.now();
+            this.instrument('[signAndSendTransaction] start', {
+                key: 'signAndSendTransaction-start',
+                options,
+                startTime,
+                time: 0,
+                traceId,
+            });
             const uiTransaction = new solanaCore.SolanaUiTransaction({
                 connection: this.getWalletClient(),
                 from: this.activeAccountAddress,
                 multipleTransactions: [transaction],
-                onSubmit: () => _tslib.__awaiter(this, void 0, void 0, function* () { return this.internalSignAndSendTransaction(transaction, options); }),
+                onSubmit: () => _tslib.__awaiter(this, void 0, void 0, function* () {
+                    return this.internalSignAndSendTransaction(transaction, options, {
+                        parentTraceId: traceId,
+                        startTime,
+                    });
+                }),
+            });
+            const result = yield this.walletUiUtils.sendTransaction(this, uiTransaction);
+            this.instrument('[signAndSendTransaction] completed', {
+                key: 'signAndSendTransaction-completed',
+                startTime,
+                time: Date.now() - startTime,
+                traceId,
             });
-            return this.walletUiUtils.sendTransaction(this, uiTransaction);
+            return result;
         });
     }
     getSigner() {
@@ -234,10 +402,25 @@ class DynamicWaasSVMConnector extends waas.withDynamicWaas(solanaCore.SolanaWall
             if (!targetAccountAddress) {
                 throw new Error('Account address is required');
             }
-            return _super.exportClientKeyshares.call(this, {
+            const traceId = this.generateTraceId();
+            const startTime = Date.now();
+            this.instrument('[exportClientKeyshares] start', {
+                key: 'exportClientKeyshares-start',
+                startTime,
+                time: 0,
+                traceId,
+            });
+            const result = yield _super.exportClientKeyshares.call(this, {
                 accountAddress: targetAccountAddress,
                 password,
             });
+            this.instrument('[exportClientKeyshares] completed', {
+                key: 'exportClientKeyshares-completed',
+                startTime,
+                time: Date.now() - startTime,
+                traceId,
+            });
+            return result;
         });
     }
     createUiTransaction(from) {

package/src/connector/DynamicWaasSVMConnector.d.ts

@@ -3,6 +3,7 @@ import { MFAAction } from '@dynamic-labs/sdk-api-core';
 import { ISolanaSigner, SolanaWalletConnector, SolanaWalletConnectorOpts } from '@dynamic-labs/solana-core';
 import { IUITransaction, WalletUiUtils } from '@dynamic-labs/types';
 import { IDynamicWaasConnector, InternalWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { Logger } from '../../utils/logger';
 export type DynamicWaasSVMConnectorProps = SolanaWalletConnectorOpts & {
     walletUiUtils: WalletUiUtils<InternalWalletConnector>;
 };
@@ -22,6 +23,7 @@ declare const DynamicWaasSVMConnector_base: (abstract new (...args: any[]) => {
     dynamicWaasClient: import("@dynamic-labs-wallet/browser-wallet-client").DynamicWalletClient | undefined;
     chainName: string;
     authMode: "cookie" | "header";
+    logger: Logger;
     __exportHandler: import("@dynamic-labs/waas").WaasExportHandler;
     validateActiveWallet(expectedAddress: string): Promise<void>;
     setGetAuthTokenFunction(getAuthToken: () => string): void;
@@ -94,6 +96,14 @@ declare const DynamicWaasSVMConnector_base: (abstract new (...args: any[]) => {
     }): Promise<string>;
     endSession(): Promise<void>;
     getActiveAccountAddress(): Promise<string | undefined>;
+    generateTraceId(): string;
+    instrument(message: string, context: import("dist/packages/logger/src").InstrumentOptions & import("dist/packages/waas/utils/instrumentation").InstrumentContext & Record<string, any>): void;
+    instrumentAsync<T_1>({ operation, resource, fn, context, }: {
+        operation: string;
+        resource: string;
+        fn: (timing: import("dist/packages/waas/utils/instrumentation").InstrumentationTimer) => Promise<T_1>;
+        context?: Record<string, any> | undefined;
+    }): Promise<T_1>;
 }) & typeof SolanaWalletConnector;
 export declare class DynamicWaasSVMConnector extends DynamicWaasSVMConnector_base implements IDynamicWaasConnector {
     connect(): Promise<void>;
@@ -103,16 +113,30 @@ export declare class DynamicWaasSVMConnector extends DynamicWaasSVMConnector_bas
     activeAccountAddress: string | undefined;
     protected walletUiUtils: WalletUiUtils<InternalWalletConnector>;
     constructor(props: DynamicWaasSVMConnectorProps);
+    /**
+     * Override setEnvironmentId to ensure it's set on the global logger
+     */
+    setEnvironmentId(environmentId: string): void;
+    logger: Logger;
     private setActiveAccountAddress;
     getActiveAccountAddress(): Promise<string | undefined>;
     validateActiveWallet(expectedAddress: string): Promise<void>;
-    internalSignMessage(message: string): Promise<string>;
+    internalSignMessage(message: string, { parentTraceId, startTime, }?: {
+        parentTraceId?: string;
+        startTime?: number;
+    }): Promise<string>;
     signMessage(message: string): Promise<string>;
-    internalSignTransaction<T extends Transaction | VersionedTransaction>(transaction: T): Promise<Transaction | VersionedTransaction>;
+    internalSignTransaction<T extends Transaction | VersionedTransaction>(transaction: T, { parentTraceId, startTime, }?: {
+        parentTraceId?: string;
+        startTime?: number;
+    }): Promise<Transaction | VersionedTransaction>;
     signTransaction<T extends Transaction | VersionedTransaction>(transaction: T): Promise<Transaction | VersionedTransaction>;
     internalSignAllTransactions<T extends Transaction | VersionedTransaction>(transactions: T[]): Promise<(Transaction | VersionedTransaction)[]>;
     signAllTransactions<T extends Transaction | VersionedTransaction>(transactions: T[]): Promise<(Transaction | VersionedTransaction)[]>;
-    internalSignAndSendTransaction<T extends Transaction | VersionedTransaction>(transaction: T, options?: SendOptions): Promise<string>;
+    internalSignAndSendTransaction<T extends Transaction | VersionedTransaction>(transaction: T, options?: SendOptions, { parentTraceId, startTime, }?: {
+        parentTraceId?: string;
+        startTime?: number;
+    }): Promise<string>;
     signAndSendTransaction<T extends Transaction | VersionedTransaction>(transaction: T, options?: SendOptions): Promise<string>;
     getSigner(): Promise<ISolanaSigner>;
     getWalletClientByAddress({ accountAddress, }: {

package/src/connector/DynamicWaasSVMConnector.js

@@ -8,6 +8,7 @@ import { withDynamicWaas } from '@dynamic-labs/waas';
 import { isSameAddress } from '@dynamic-labs/wallet-connector-core';
 import { logger } from '../../utils/logger.js';
 import { DynamicWaasSVMSigner } from '../signer/DynamicWaasSVMSigner.js';
+import { Logger } from '@dynamic-labs/logger';
 
 class DynamicWaasSVMConnector extends withDynamicWaas(SolanaWalletConnector) {
     connect() {
@@ -18,8 +19,16 @@ class DynamicWaasSVMConnector extends withDynamicWaas(SolanaWalletConnector) {
         this.name = 'Dynamic Waas';
         this.overrideKey = 'dynamicwaas';
         this.isEmbeddedWallet = true;
+        this.logger = logger;
         this.walletUiUtils = props.walletUiUtils;
     }
+    /**
+     * Override setEnvironmentId to ensure it's set on the global logger
+     */
+    setEnvironmentId(environmentId) {
+        super.setEnvironmentId(environmentId);
+        Logger.setEnvironmentId(environmentId);
+    }
     setActiveAccountAddress(accountAddress) {
         this.activeAccountAddress = accountAddress;
     }
@@ -50,10 +59,17 @@ class DynamicWaasSVMConnector extends withDynamicWaas(SolanaWalletConnector) {
             }
         });
     }
-    internalSignMessage(message) {
-        return __awaiter(this, void 0, void 0, function* () {
+    internalSignMessage(message_1) {
+        return __awaiter(this, arguments, void 0, function* (message, { parentTraceId, startTime, } = {}) {
             var _a, _b, _c;
-            const walletClient = yield this.getWaasWalletClient();
+            const traceId = parentTraceId || this.generateTraceId();
+            const effectiveStartTime = startTime || Date.now();
+            const walletClient = yield this.instrumentAsync({
+                context: { startTime: effectiveStartTime, traceId },
+                fn: () => __awaiter(this, void 0, void 0, function* () { return this.getWaasWalletClient(); }),
+                operation: 'internalSignMessage',
+                resource: 'getWaasWalletClient',
+            });
             if (!this.activeAccountAddress) {
                 throw new Error('Active account address is required');
             }
@@ -64,12 +80,21 @@ class DynamicWaasSVMConnector extends withDynamicWaas(SolanaWalletConnector) {
             const mfaToken = yield ((_b = this.getMfaToken) === null || _b === void 0 ? void 0 : _b.call(this, {
                 mfaAction: MFAAction.WalletWaasSign,
             }));
-            const signedMessage = yield walletClient.signMessage({
-                accountAddress: this.activeAccountAddress,
-                authToken: (_c = this.getAuthToken) === null || _c === void 0 ? void 0 : _c.call(this),
-                message,
-                mfaToken,
-                signedSessionId,
+            const accountAddress = this.activeAccountAddress;
+            const authToken = (_c = this.getAuthToken) === null || _c === void 0 ? void 0 : _c.call(this);
+            const signedMessage = yield this.instrumentAsync({
+                context: { startTime: effectiveStartTime, traceId },
+                fn: () => __awaiter(this, void 0, void 0, function* () {
+                    return walletClient.signMessage({
+                        accountAddress,
+                        authToken,
+                        message,
+                        mfaToken,
+                        signedSessionId,
+                    });
+                }),
+                operation: 'internalSignMessage',
+                resource: 'walletClient.signMessage',
             });
             return signedMessage;
         });
@@ -79,17 +104,44 @@ class DynamicWaasSVMConnector extends withDynamicWaas(SolanaWalletConnector) {
             if (!this.activeAccountAddress) {
                 throw new Error('Active account address is required');
             }
-            return this.walletUiUtils.signMessage({
-                handler: () => __awaiter(this, void 0, void 0, function* () { return this.internalSignMessage(message); }),
+            const traceId = this.generateTraceId();
+            const startTime = Date.now();
+            this.instrument('[signMessage] start', {
+                key: 'signMessage-start',
+                startTime,
+                time: 0,
+                traceId,
+            });
+            const signedMessage = yield this.walletUiUtils.signMessage({
+                handler: () => __awaiter(this, void 0, void 0, function* () {
+                    return this.internalSignMessage(message, {
+                        parentTraceId: traceId,
+                        startTime,
+                    });
+                }),
                 message,
                 walletConnector: this,
             });
+            this.instrument('[signMessage] completed', {
+                key: 'signMessage-completed',
+                startTime,
+                time: Date.now() - startTime,
+                traceId,
+            });
+            return signedMessage;
         });
     }
-    internalSignTransaction(transaction) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
-            const walletClient = yield this.getWaasWalletClient();
+    internalSignTransaction(transaction_1) {
+        return __awaiter(this, arguments, void 0, function* (transaction, { parentTraceId, startTime, } = {}) {
+            var _a, _b;
+            const traceId = parentTraceId || this.generateTraceId();
+            const effectiveStartTime = startTime || Date.now();
+            const walletClient = yield this.instrumentAsync({
+                context: { startTime: effectiveStartTime, traceId },
+                fn: () => __awaiter(this, void 0, void 0, function* () { return this.getWaasWalletClient(); }),
+                operation: 'internalSignTransaction',
+                resource: 'getWaasWalletClient',
+            });
             const signedSessionId = yield ((_a = this.getSignedSessionId) === null || _a === void 0 ? void 0 : _a.call(this));
             if (!signedSessionId) {
                 throw new DynamicError('Signed session ID is required');
@@ -105,13 +157,22 @@ class DynamicWaasSVMConnector extends withDynamicWaas(SolanaWalletConnector) {
                 : transaction.message.serialize();
             const messageToSign = Buffer.from(messageBytes).toString('hex');
             const chainId = yield this.getNetwork(true);
-            const signature = yield walletClient.signTransaction({
-                authToken: (_c = this.getAuthToken) === null || _c === void 0 ? void 0 : _c.call(this),
-                chainId,
-                mfaToken,
-                senderAddress: this.activeAccountAddress,
-                signedSessionId,
-                transaction: messageToSign,
+            const senderAddress = this.activeAccountAddress;
+            const signature = yield this.instrumentAsync({
+                context: { startTime: effectiveStartTime, traceId },
+                fn: () => __awaiter(this, void 0, void 0, function* () {
+                    var _c;
+                    return walletClient.signTransaction({
+                        authToken: (_c = this.getAuthToken) === null || _c === void 0 ? void 0 : _c.call(this),
+                        chainId,
+                        mfaToken,
+                        senderAddress,
+                        signedSessionId,
+                        transaction: messageToSign,
+                    });
+                }),
+                operation: 'internalSignTransaction',
+                resource: 'signTransaction',
             });
             transaction.addSignature(new PublicKey(this.activeAccountAddress), Buffer.from(signature, 'hex'));
             try {
@@ -121,7 +182,7 @@ class DynamicWaasSVMConnector extends withDynamicWaas(SolanaWalletConnector) {
                 });
             }
             catch (err) {
-                logger.warn('[signTransaction] Error signing transaction', err);
+                logger.warn('[internalSignTransaction] Error signing transaction', err);
             }
             return transaction;
         });
@@ -131,13 +192,33 @@ class DynamicWaasSVMConnector extends withDynamicWaas(SolanaWalletConnector) {
             if (!this.activeAccountAddress) {
                 throw new Error('Active account address is required');
             }
+            const traceId = this.generateTraceId();
+            const startTime = Date.now();
+            this.instrument('[signTransaction] start', {
+                key: 'signTransaction-start',
+                startTime,
+                time: 0,
+                traceId,
+            });
             const uiTransaction = new SolanaUiTransaction({
                 connection: this.getWalletClient(),
                 from: this.activeAccountAddress,
                 multipleTransactions: [transaction],
-                onSubmit: () => __awaiter(this, void 0, void 0, function* () { return this.internalSignTransaction(transaction); }),
+                onSubmit: () => __awaiter(this, void 0, void 0, function* () {
+                    return this.internalSignTransaction(transaction, {
+                        parentTraceId: traceId,
+                        startTime,
+                    });
+                }),
             });
-            return this.walletUiUtils.signTransaction(this, uiTransaction);
+            const signedTransaction = yield this.walletUiUtils.signTransaction(this, uiTransaction);
+            this.instrument('[signTransaction] completed', {
+                key: 'signTransaction-completed',
+                startTime,
+                time: Date.now() - startTime,
+                traceId,
+            });
+            return signedTransaction;
         });
     }
     internalSignAllTransactions(transactions) {
@@ -158,40 +239,106 @@ class DynamicWaasSVMConnector extends withDynamicWaas(SolanaWalletConnector) {
             if (!this.activeAccountAddress) {
                 throw new Error('Active account address is required');
             }
+            const traceId = this.generateTraceId();
+            const startTime = Date.now();
+            this.instrument('[signAllTransactions] start', {
+                key: 'signAllTransactions-start',
+                startTime,
+                time: 0,
+                traceId,
+            });
             const uiTransaction = new SolanaUiTransaction({
                 connection: this.getWalletClient(),
                 from: this.activeAccountAddress,
                 multipleTransactions: transactions,
                 onSubmit: () => __awaiter(this, void 0, void 0, function* () { return this.internalSignAllTransactions(transactions); }),
             });
-            return this.walletUiUtils.signTransaction(this, uiTransaction);
+            const signedTransactions = yield this.walletUiUtils.signTransaction(this, uiTransaction);
+            this.instrument('[signAllTransactions] completed', {
+                key: 'signAllTransactions-completed',
+                startTime,
+                time: Date.now() - startTime,
+                traceId,
+            });
+            return signedTransactions;
         });
     }
-    internalSignAndSendTransaction(transaction, options) {
-        return __awaiter(this, void 0, void 0, function* () {
+    internalSignAndSendTransaction(transaction_1, options_1) {
+        return __awaiter(this, arguments, void 0, function* (transaction, options, { parentTraceId, startTime, } = {}) {
+            const traceId = parentTraceId || this.generateTraceId();
+            const effectiveStartTime = startTime || Date.now();
             if (!this.activeAccountAddress) {
                 throw new Error('Active account address is required');
             }
             const connection = this.getWalletClient();
-            const signedTransaction = yield this.internalSignTransaction(transaction);
-            const signature = yield connection.sendRawTransaction(signedTransaction.serialize({
-                requireAllSignatures: false,
-                verifySignatures: true,
-            }), options);
+            const signedTransaction = yield this.instrumentAsync({
+                context: { startTime: effectiveStartTime, traceId },
+                fn: () => __awaiter(this, void 0, void 0, function* () {
+                    return this.internalSignTransaction(transaction, {
+                        parentTraceId: traceId,
+                        startTime: effectiveStartTime,
+                    });
+                }),
+                operation: 'internalSignAndSendTransaction',
+                resource: 'internalSignTransaction',
+            });
+            const signature = yield this.instrumentAsync({
+                context: {
+                    rpcUrl: connection.rpcEndpoint,
+                    startTime: effectiveStartTime,
+                    traceId,
+                },
+                fn: () => __awaiter(this, void 0, void 0, function* () {
+                    return connection.sendRawTransaction(signedTransaction.serialize({
+                        requireAllSignatures: false,
+                        verifySignatures: true,
+                    }), options);
+                }),
+                operation: 'internalSignAndSendTransaction',
+                resource: 'sendRawTransaction',
+            });
             // Listen for transaction confirmation with timeout
+            const confirmationStartTime = Date.now();
             return new Promise((resolve, reject) => {
+                var _a;
                 const timeout = setTimeout(() => {
+                    const timeoutTotalElapsed = Date.now() - confirmationStartTime;
+                    this.instrument(`[internalSignAndSendTransaction] Transaction timed out - total: ${timeoutTotalElapsed}ms`, {
+                        key: 'internalSignAndSendTransaction-transactionTimedOut',
+                        rpcUrl: connection.rpcEndpoint,
+                        time: timeoutTotalElapsed,
+                        traceId,
+                    });
                     reject(new Error('Transaction timed out'));
                 }, 60000);
                 connection.onSignature(signature, (result) => {
                     clearTimeout(timeout);
+                    const confirmationEndTime = Date.now();
+                    const confirmationStepElapsed = confirmationEndTime - confirmationStartTime;
+                    const confirmationTotalElapsed = confirmationEndTime - effectiveStartTime;
                     if (result.err) {
+                        logger.error(`[internalSignAndSendTransaction] Transaction failed - total: ${confirmationTotalElapsed}ms, step: ${confirmationStepElapsed}ms`, {
+                            accountAddress: this.activeAccountAddress,
+                            error: result.err,
+                            key: 'internalSignAndSendTransaction-transactionFailed',
+                            rpcUrl: connection.rpcEndpoint,
+                            stepTime: confirmationStepElapsed,
+                            time: confirmationTotalElapsed,
+                            traceId,
+                        });
                         reject(new Error(`Transaction failed: ${result.err}`));
                     }
                     else {
+                        this.instrument(`[internalSignAndSendTransaction] Transaction confirmed - total: ${confirmationTotalElapsed}ms, step: ${confirmationStepElapsed}ms`, {
+                            key: 'internalSignAndSendTransaction-transactionSuccess',
+                            rpcUrl: connection.rpcEndpoint,
+                            stepTime: confirmationStepElapsed,
+                            time: confirmationTotalElapsed,
+                            traceId,
+                        });
                         resolve(signature);
                     }
-                }, 'confirmed');
+                }, (_a = options === null || options === void 0 ? void 0 : options.preflightCommitment) !== null && _a !== void 0 ? _a : 'confirmed');
             });
         });
     }
@@ -200,13 +347,34 @@ class DynamicWaasSVMConnector extends withDynamicWaas(SolanaWalletConnector) {
             if (!this.activeAccountAddress) {
                 throw new Error('Active account address is required');
             }
+            const traceId = this.generateTraceId();
+            const startTime = Date.now();
+            this.instrument('[signAndSendTransaction] start', {
+                key: 'signAndSendTransaction-start',
+                options,
+                startTime,
+                time: 0,
+                traceId,
+            });
             const uiTransaction = new SolanaUiTransaction({
                 connection: this.getWalletClient(),
                 from: this.activeAccountAddress,
                 multipleTransactions: [transaction],
-                onSubmit: () => __awaiter(this, void 0, void 0, function* () { return this.internalSignAndSendTransaction(transaction, options); }),
+                onSubmit: () => __awaiter(this, void 0, void 0, function* () {
+                    return this.internalSignAndSendTransaction(transaction, options, {
+                        parentTraceId: traceId,
+                        startTime,
+                    });
+                }),
+            });
+            const result = yield this.walletUiUtils.sendTransaction(this, uiTransaction);
+            this.instrument('[signAndSendTransaction] completed', {
+                key: 'signAndSendTransaction-completed',
+                startTime,
+                time: Date.now() - startTime,
+                traceId,
             });
-            return this.walletUiUtils.sendTransaction(this, uiTransaction);
+            return result;
         });
     }
     getSigner() {
@@ -230,10 +398,25 @@ class DynamicWaasSVMConnector extends withDynamicWaas(SolanaWalletConnector) {
             if (!targetAccountAddress) {
                 throw new Error('Account address is required');
             }
-            return _super.exportClientKeyshares.call(this, {
+            const traceId = this.generateTraceId();
+            const startTime = Date.now();
+            this.instrument('[exportClientKeyshares] start', {
+                key: 'exportClientKeyshares-start',
+                startTime,
+                time: 0,
+                traceId,
+            });
+            const result = yield _super.exportClientKeyshares.call(this, {
                 accountAddress: targetAccountAddress,
                 password,
             });
+            this.instrument('[exportClientKeyshares] completed', {
+                key: 'exportClientKeyshares-completed',
+                startTime,
+                time: Date.now() - startTime,
+                traceId,
+            });
+            return result;
         });
     }
     createUiTransaction(from) {

package/utils/logger.cjs

@@ -7,4 +7,8 @@ var logger$1 = require('@dynamic-labs/logger');
 
 const logger = new logger$1.Logger('@dynamic-labs/waas-svm');
 
+Object.defineProperty(exports, 'Logger', {
+	enumerable: true,
+	get: function () { return logger$1.Logger; }
+});
 exports.logger = logger;

package/utils/logger.d.ts

@@ -1,2 +1,3 @@
-import { Logger } from '@dynamic-labs/logger';
+import { Logger, InstrumentOptions } from '@dynamic-labs/logger';
 export declare const logger: Logger;
+export { Logger, type InstrumentOptions };

package/utils/logger.js

@@ -1,5 +1,6 @@
 'use client'
 import { Logger } from '@dynamic-labs/logger';
+export { Logger } from '@dynamic-labs/logger';
 
 const logger = new Logger('@dynamic-labs/waas-svm');