@hashgraph/hedera-wallet-connect 1.3.6-canary.67ec2cf.0 → 1.3.7-canary.6c467f9.0

package/dist/src/lib/dapp/DAppSigner.d.ts

@@ -1,5 +1,5 @@
 import { Signer, AccountBalance, AccountId, AccountInfo, Executable, Key, LedgerId, SignerSignature, Transaction, TransactionRecord } from '@hashgraph/sdk';
-import type { ISignClient } from '@walletconnect/types';
+import type { CoreTypes, ISignClient } from '@walletconnect/types';
 export declare class DAppSigner implements Signer {
     private readonly accountId;
     private readonly signClient;
@@ -24,6 +24,7 @@ export declare class DAppSigner implements Signer {
     getAccountBalance(): Promise<AccountBalance>;
     getAccountInfo(): Promise<AccountInfo>;
     getAccountRecords(): Promise<TransactionRecord[]>;
+    getMetadata(): CoreTypes.Metadata;
     sign(data: Uint8Array[], signOptions?: Record<string, any>): Promise<SignerSignature[]>;
     checkTransaction<T extends Transaction>(transaction: T): Promise<T>;
     populateTransaction<T extends Transaction>(transaction: T): Promise<T>;

package/dist/src/lib/dapp/DAppSigner.js

@@ -49,8 +49,9 @@ export class DAppSigner {
         return allNodes.slice(0, numberOfNodes);
     }
     request(request) {
-        if (this.extensionId)
+        if (this.extensionId) {
             extensionOpen(this.extensionId);
+        }
         return this.signClient.request({
             topic: this.topic,
             request,
@@ -81,6 +82,9 @@ export class DAppSigner {
     getAccountRecords() {
         return this.call(new AccountRecordsQuery().setAccountId(this.accountId));
     }
+    getMetadata() {
+        return this.signClient.metadata;
+    }
     async sign(data, signOptions) {
         const { signatureMap } = await this.request({
             method: HederaJsonRpcMethod.SignMessage,

package/dist/src/lib/dapp/index.d.ts

@@ -7,6 +7,7 @@ import { DAppSigner } from './DAppSigner';
 export * from './DAppSigner';
 type BaseLogger = 'error' | 'warn' | 'info' | 'debug' | 'trace' | 'fatal';
 export declare class DAppConnector {
+    private logger;
     dAppMetadata: SignClientTypes.Metadata;
     network: LedgerId;
     projectId: string;
@@ -27,8 +28,14 @@ export declare class DAppConnector {
      * @param methods - Array of supported methods for the DApp (optional).
      * @param events - Array of supported events for the DApp (optional).
      * @param chains - Array of supported chains for the DApp (optional).
+     * @param logLevel - Logging level for the DAppConnector (optional).
      */
-    constructor(metadata: SignClientTypes.Metadata, network: LedgerId, projectId: string, methods?: string[], events?: string[], chains?: string[]);
+    constructor(metadata: SignClientTypes.Metadata, network: LedgerId, projectId: string, methods?: string[], events?: string[], chains?: string[], logLevel?: 'error' | 'warn' | 'info' | 'debug');
+    /**
+     * Sets the logging level for the DAppConnector
+     * @param level - The logging level to set
+     */
+    setLogLevel(level: 'error' | 'warn' | 'info' | 'debug'): void;
     /**
      * Initializes the DAppConnector instance.
      * @param logger - `BaseLogger` for logging purposes (optional).
@@ -71,6 +78,16 @@ export declare class DAppConnector {
      * @returns A Promise that resolves when the connection process is complete.
      */
     connectExtension(extensionId: string, pairingTopic?: string): Promise<SessionTypes.Struct>;
+    /**
+     * Validates the session by checking if the session exists.
+     * @param topic - The topic of the session to validate.
+     * @returns {boolean} - True if the session exists, false otherwise.
+     */
+    private validateSession;
+    /**
+     * Validates the session and refreshes the signers by removing the invalid ones.
+     */
+    private validateAndRefreshSigners;
     /**
      *  Initiates the WallecConnect connection if the wallet in iframe mode is detected.
      */
@@ -81,7 +98,7 @@ export declare class DAppConnector {
      * @param topic - The topic of the session to disconnect.
      * @returns A Promise that resolves when the session is disconnected.
      */
-    disconnect(topic: string): Promise<void>;
+    disconnect(topic: string): Promise<boolean>;
     /**
      * Disconnects all active sessions and pairings.
      *
@@ -127,7 +144,7 @@ export declare class DAppConnector {
      * @example
      * ```ts
      * const params = {
-     *  signerAccountId: '0.0.12345',
+     *  signerAccountId: 'hedera:testnet:0.0.12345',
      *  message: 'Hello World!'
      * }
      *

package/dist/src/lib/dapp/index.js

@@ -22,6 +22,7 @@ import QRCodeModal from '@walletconnect/qrcode-modal';
 import { WalletConnectModal } from '@walletconnect/modal';
 import SignClient from '@walletconnect/sign-client';
 import { getSdkError } from '@walletconnect/utils';
+import { DefaultLogger } from '../shared/logger';
 import { HederaJsonRpcMethod, accountAndLedgerFromSession, networkNamespaces, extensionConnect, findExtensions, } from '../shared';
 import { DAppSigner } from './DAppSigner';
 export * from './DAppSigner';
@@ -34,8 +35,9 @@ export class DAppConnector {
      * @param methods - Array of supported methods for the DApp (optional).
      * @param events - Array of supported events for the DApp (optional).
      * @param chains - Array of supported chains for the DApp (optional).
+     * @param logLevel - Logging level for the DAppConnector (optional).
      */
-    constructor(metadata, network, projectId, methods, events, chains) {
+    constructor(metadata, network, projectId, methods, events, chains, logLevel = 'debug') {
         this.network = LedgerId.TESTNET;
         this.supportedMethods = [];
         this.supportedEvents = [];
@@ -62,6 +64,7 @@ export class DAppConnector {
                 }
             });
         };
+        this.logger = new DefaultLogger(logLevel);
         this.dAppMetadata = metadata;
         this.network = network;
         this.projectId = projectId;
@@ -77,6 +80,15 @@ export class DAppConnector {
             this.extensions.push(Object.assign(Object.assign({}, metadata), { available: true, availableInIframe: isIframe }));
         });
     }
+    /**
+     * Sets the logging level for the DAppConnector
+     * @param level - The logging level to set
+     */
+    setLogLevel(level) {
+        if (this.logger instanceof DefaultLogger) {
+            this.logger.setLogLevel(level);
+        }
+    }
     /**
      * Initializes the DAppConnector instance.
      * @param logger - `BaseLogger` for logging purposes (optional).
@@ -87,20 +99,24 @@ export class DAppConnector {
             if (!this.projectId) {
                 throw new Error('Project ID is not defined');
             }
-            this.walletConnectClient = await SignClient.init({
+            const signClient = await SignClient.init({
                 logger,
                 relayUrl: 'wss://relay.walletconnect.com',
                 projectId: this.projectId,
                 metadata: this.dAppMetadata,
             });
+            this.walletConnectClient = signClient;
             const existingSessions = this.walletConnectClient.session.getAll();
-            if (existingSessions.length > 0)
+            if (existingSessions.length > 0) {
                 this.signers = existingSessions.flatMap((session) => this.createSigners(session));
-            else
-                this.checkIframeConnect();
+            }
+            else {
+                await this.checkIframeConnect();
+            }
             this.walletConnectClient.on('session_event', (event) => {
                 // Handle session events, such as "chainChanged", "accountsChanged", etc.
-                console.log(event);
+                this.logger.debug('Session event received:', event);
+                this.validateAndRefreshSigners();
             });
             this.walletConnectClient.on('session_update', ({ topic, params }) => {
                 // Handle session update
@@ -109,33 +125,37 @@ export class DAppConnector {
                 // Overwrite the `namespaces` of the existing session with the incoming one.
                 const updatedSession = Object.assign(Object.assign({}, _session), { namespaces });
                 // Integrate the updated session state into your dapp state.
-                console.log(updatedSession);
+                this.logger.info('Session updated:', updatedSession);
+                this.signers = this.signers.filter((signer) => signer.topic !== topic);
+                this.signers.push(...this.createSigners(updatedSession));
             });
             this.walletConnectClient.on('session_delete', (pairing) => {
-                console.log(pairing);
+                this.logger.info('Session deleted:', pairing);
                 this.signers = this.signers.filter((signer) => signer.topic !== pairing.topic);
                 // Session was deleted -> reset the dapp state, clean up from user session, etc.
                 try {
                     this.disconnect(pairing.topic);
                 }
                 catch (e) {
-                    console.error(e);
+                    this.logger.error('Error disconnecting session:', e);
                 }
-                console.log('Dapp: Session deleted by wallet!');
+                this.logger.info('Session deleted by wallet');
             });
             this.walletConnectClient.core.pairing.events.on('pairing_delete', (pairing) => {
-                console.log(pairing);
+                this.logger.info('Pairing deleted:', pairing);
                 this.signers = this.signers.filter((signer) => signer.topic !== pairing.topic);
                 try {
                     this.disconnect(pairing.topic);
                 }
                 catch (e) {
-                    console.error(e);
+                    this.logger.error('Error disconnecting pairing:', e);
                 }
-                console.log(`Dapp: Pairing deleted by wallet!`);
-                // clean up after the pairing for `topic` was deleted.
+                this.logger.info('Pairing deleted by wallet');
             });
         }
+        catch (e) {
+            this.logger.error('Error initializing DAppConnector:', e);
+        }
         finally {
             this.isInitializing = false;
         }
@@ -148,6 +168,9 @@ export class DAppConnector {
      * @throws {Error} - If no signer is found for the provided account ID.
      */
     getSigner(accountId) {
+        if (this.isInitializing) {
+            throw new Error('DAppConnector is not initialized yet. Try again later.');
+        }
         const signer = this.signers.find((signer) => signer.getAccountId().equals(accountId));
         if (!signer)
             throw new Error('Signer is not found for this accountId');
@@ -231,6 +254,32 @@ export class DAppConnector {
             extensionConnect(extension.id, extension.availableInIframe, uri);
         }, pairingTopic, extension.availableInIframe ? undefined : extensionId);
     }
+    /**
+     * Validates the session by checking if the session exists.
+     * @param topic - The topic of the session to validate.
+     * @returns {boolean} - True if the session exists, false otherwise.
+     */
+    validateSession(topic) {
+        try {
+            if (!this.walletConnectClient) {
+                return false;
+            }
+            const session = this.walletConnectClient.session.get(topic);
+            if (!session) {
+                return false;
+            }
+            return true;
+        }
+        catch (_a) {
+            return false;
+        }
+    }
+    /**
+     * Validates the session and refreshes the signers by removing the invalid ones.
+     */
+    validateAndRefreshSigners() {
+        this.signers = this.signers.filter((signer) => this.validateSession(signer.topic));
+    }
     /**
      *  Initiates the WallecConnect connection if the wallet in iframe mode is detected.
      */
@@ -248,10 +297,20 @@ export class DAppConnector {
      * @returns A Promise that resolves when the session is disconnected.
      */
     async disconnect(topic) {
-        await this.walletConnectClient.disconnect({
-            topic: topic,
-            reason: getSdkError('USER_DISCONNECTED'),
-        });
+        try {
+            if (!this.walletConnectClient) {
+                throw new Error('WalletConnect is not initialized');
+            }
+            await this.walletConnectClient.disconnect({
+                topic: topic,
+                reason: getSdkError('USER_DISCONNECTED'),
+            });
+            return true;
+        }
+        catch (e) {
+            this.logger.error('Either the session was already disconnected or the topic is invalid', e);
+            return false;
+        }
     }
     /**
      * Disconnects all active sessions and pairings.
@@ -271,7 +330,7 @@ export class DAppConnector {
         const disconnectionPromises = [];
         // disconnect sessions
         for (const session of this.walletConnectClient.session.getAll()) {
-            console.log(`Disconnecting from session: ${session}`);
+            this.logger.info(`Disconnecting from session: ${session}`);
             const promise = this.disconnect(session.topic);
             disconnectionPromises.push(promise);
         }
@@ -292,7 +351,34 @@ export class DAppConnector {
         });
     }
     async onSessionConnected(session) {
-        this.signers.push(...this.createSigners(session));
+        const newSigners = this.createSigners(session);
+        // Filter out any existing signers with duplicate AccountIds
+        for (const newSigner of newSigners) {
+            // We check if any signers have the same account, extension + metadata name.
+            const existingSigners = this.signers.filter((currentSigner) => {
+                var _a, _b;
+                const matchingAccountId = ((_a = currentSigner === null || currentSigner === void 0 ? void 0 : currentSigner.getAccountId()) === null || _a === void 0 ? void 0 : _a.toString()) === ((_b = newSigner === null || newSigner === void 0 ? void 0 : newSigner.getAccountId()) === null || _b === void 0 ? void 0 : _b.toString());
+                const matchingExtensionId = newSigner.extensionId === currentSigner.extensionId;
+                const newSignerMetadata = newSigner.getMetadata();
+                const existingSignerMetadata = currentSigner.getMetadata();
+                const metadataNameMatch = (newSignerMetadata === null || newSignerMetadata === void 0 ? void 0 : newSignerMetadata.name) === (existingSignerMetadata === null || existingSignerMetadata === void 0 ? void 0 : existingSignerMetadata.name);
+                if (currentSigner.topic === newSigner.topic) {
+                    this.logger.error('The topic was already connected. This is a weird error. Please report it.', newSigner.getAccountId().toString());
+                }
+                return matchingAccountId && matchingExtensionId && metadataNameMatch;
+            });
+            // Any dupes get disconnected + removed from the signers array.
+            for (const existingSigner of existingSigners) {
+                this.logger.debug(`Disconnecting duplicate signer for account ${existingSigner.getAccountId().toString()}`);
+                await this.disconnect(existingSigner.topic);
+                this.signers = this.signers.filter((s) => s.topic !== existingSigner.topic);
+            }
+        }
+        // Add new signers after all duplicates have been cleaned up
+        this.signers.push(...newSigners);
+        this.logger.debug(`Current signers after connection: ${this.signers
+            .map((s) => `${s.getAccountId().toString()}:${s.topic}`)
+            .join(', ')}`);
     }
     async connectURI(pairingTopic) {
         if (!this.walletConnectClient) {
@@ -304,10 +390,25 @@ export class DAppConnector {
         });
     }
     async request({ method, params, }) {
-        const signer = this.signers[this.signers.length - 1];
+        var _a, _b, _c;
+        let signer;
+        this.logger.debug(`Requesting method: ${method} with params: ${JSON.stringify(params)}`);
+        if (params === null || params === void 0 ? void 0 : params.signerAccountId) {
+            // Extract the actual account ID from the hedera:<network>:<address> format
+            const actualAccountId = (_b = (_a = params === null || params === void 0 ? void 0 : params.signerAccountId) === null || _a === void 0 ? void 0 : _a.split(':')) === null || _b === void 0 ? void 0 : _b.pop();
+            signer = this.signers.find((s) => { var _a; return ((_a = s === null || s === void 0 ? void 0 : s.getAccountId()) === null || _a === void 0 ? void 0 : _a.toString()) === actualAccountId; });
+            this.logger.debug(`Found signer: ${(_c = signer === null || signer === void 0 ? void 0 : signer.getAccountId()) === null || _c === void 0 ? void 0 : _c.toString()}`);
+            if (!signer) {
+                throw new Error(`Signer not found for account ID: ${params === null || params === void 0 ? void 0 : params.signerAccountId}. Did you use the correct format? e.g hedera:<network>:<address> `);
+            }
+        }
+        else {
+            signer = this.signers[this.signers.length - 1];
+        }
         if (!signer) {
             throw new Error('There is no active session. Connect to the wallet at first.');
         }
+        this.logger.debug(`Using signer: ${signer.getAccountId().toString()}: ${signer.topic} - about to request.`);
         return await signer.request({
             method: method,
             params: params,
@@ -357,7 +458,7 @@ export class DAppConnector {
      * @example
      * ```ts
      * const params = {
-     *  signerAccountId: '0.0.12345',
+     *  signerAccountId: 'hedera:testnet:0.0.12345',
      *  message: 'Hello World!'
      * }
      *

package/dist/src/lib/shared/logger.d.ts

@@ -0,0 +1,15 @@
+export interface ILogger {
+    error(message: string, ...args: any[]): void;
+    warn(message: string, ...args: any[]): void;
+    info(message: string, ...args: any[]): void;
+    debug(message: string, ...args: any[]): void;
+}
+export declare class DefaultLogger implements ILogger {
+    private logLevel;
+    constructor(logLevel?: 'error' | 'warn' | 'info' | 'debug');
+    setLogLevel(level: 'error' | 'warn' | 'info' | 'debug'): void;
+    error(message: string, ...args: any[]): void;
+    warn(message: string, ...args: any[]): void;
+    info(message: string, ...args: any[]): void;
+    debug(message: string, ...args: any[]): void;
+}

package/dist/src/lib/shared/logger.js

@@ -0,0 +1,29 @@
+export class DefaultLogger {
+    constructor(logLevel = 'info') {
+        this.logLevel = 'info';
+        this.logLevel = logLevel;
+    }
+    setLogLevel(level) {
+        this.logLevel = level;
+    }
+    error(message, ...args) {
+        if (['error', 'warn', 'info', 'debug'].includes(this.logLevel)) {
+            console.error(`[ERROR] ${message}`, ...args);
+        }
+    }
+    warn(message, ...args) {
+        if (['warn', 'info', 'debug'].includes(this.logLevel)) {
+            console.warn(`[WARN] ${message}`, ...args);
+        }
+    }
+    info(message, ...args) {
+        if (['info', 'debug'].includes(this.logLevel)) {
+            console.info(`[INFO] ${message}`, ...args);
+        }
+    }
+    debug(message, ...args) {
+        if (this.logLevel === 'debug') {
+            console.debug(`[DEBUG] ${message}`, ...args);
+        }
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hashgraph/hedera-wallet-connect",
-  "version": "1.3.6-canary.67ec2cf.0",
+  "version": "1.3.7-canary.6c467f9.0",
   "description": "A library to facilitate integrating Hedera with WalletConnect",
   "repository": {
     "type": "git",