@hashgraph/hedera-wallet-connect 1.3.7-canary.a38890b.0 → 1.3.7-canary.b4de118.0

package/dist/{src/lib → lib}/dapp/index.d.ts

@@ -211,5 +211,9 @@ export declare class DAppConnector {
      * ```
      */
     signTransaction(params: SignTransactionParams): Promise<SignTransactionResult>;
+    private handleSessionEvent;
+    private handleSessionUpdate;
+    private handleSessionDelete;
+    private handlePairingDelete;
 }
 export default DAppConnector;

package/dist/{src/lib → lib}/dapp/index.js

@@ -110,45 +110,10 @@ export class DAppConnector {
                 this.signers = existingSessions.flatMap((session) => this.createSigners(session));
             else
                 this.checkIframeConnect();
-            this.walletConnectClient.on('session_event', (event) => {
-                // Handle session events, such as "chainChanged", "accountsChanged", etc.
-                this.logger.debug('Session event received:', event);
-                this.validateAndRefreshSigners();
-            });
-            this.walletConnectClient.on('session_update', ({ topic, params }) => {
-                // Handle session update
-                const { namespaces } = params;
-                const _session = this.walletConnectClient.session.get(topic);
-                // 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.
-                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) => {
-                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) {
-                    this.logger.error('Error disconnecting session:', e);
-                }
-                this.logger.info('Session deleted by wallet');
-            });
-            this.walletConnectClient.core.pairing.events.on('pairing_delete', (pairing) => {
-                this.logger.info('Pairing deleted:', pairing);
-                this.signers = this.signers.filter((signer) => signer.topic !== pairing.topic);
-                try {
-                    this.disconnect(pairing.topic);
-                }
-                catch (e) {
-                    this.logger.error('Error disconnecting pairing:', e);
-                }
-                this.logger.info('Pairing deleted by wallet');
-            });
+            this.walletConnectClient.on('session_event', this.handleSessionEvent.bind(this));
+            this.walletConnectClient.on('session_update', this.handleSessionUpdate.bind(this));
+            this.walletConnectClient.on('session_delete', this.handleSessionDelete.bind(this));
+            this.walletConnectClient.core.pairing.events.on('pairing_delete', this.handlePairingDelete.bind(this));
         }
         catch (e) {
             this.logger.error('Error initializing DAppConnector:', e);
@@ -542,5 +507,39 @@ export class DAppConnector {
             params,
         });
     }
+    handleSessionEvent(args) {
+        this.logger.debug('Session event received:', args);
+        this.validateAndRefreshSigners();
+    }
+    handleSessionUpdate({ topic, params, }) {
+        const { namespaces } = params;
+        const _session = this.walletConnectClient.session.get(topic);
+        const updatedSession = Object.assign(Object.assign({}, _session), { namespaces });
+        this.logger.info('Session updated:', updatedSession);
+        this.signers = this.signers.filter((signer) => signer.topic !== topic);
+        this.signers.push(...this.createSigners(updatedSession));
+    }
+    handleSessionDelete(event) {
+        this.logger.info('Session deleted:', event);
+        this.signers = this.signers.filter((signer) => signer.topic !== event.topic);
+        try {
+            this.disconnect(event.topic);
+        }
+        catch (e) {
+            this.logger.error('Error disconnecting session:', e);
+        }
+        this.logger.info('Session deleted by wallet');
+    }
+    handlePairingDelete(event) {
+        this.logger.info('Pairing deleted:', event);
+        this.signers = this.signers.filter((signer) => signer.topic !== event.topic);
+        try {
+            this.disconnect(event.topic);
+        }
+        catch (e) {
+            this.logger.error('Error disconnecting pairing:', e);
+        }
+        this.logger.info('Pairing deleted by wallet');
+    }
 }
 export default DAppConnector;

package/dist/{src/lib → lib}/shared/utils.d.ts

@@ -49,8 +49,8 @@ export declare function base64StringToTransaction<T extends Transaction>(transac
  * @param transaction - a base64 encoded string of proto.TransactionBody.encode().finish()
  * @returns `string`
  * */
-export declare function transactionToTransactionBody<T extends Transaction>(transaction: T, nodeAccountId: AccountId): Uint8Array | null | undefined;
-export declare function transactionBodyToBase64String(transactionBody: Uint8Array): string;
+export declare function transactionToTransactionBody<T extends Transaction>(transaction: T, nodeAccountId: AccountId): any;
+export declare function transactionBodyToBase64String(transactionBody: proto.ITransactionBody): string;
 /**
  * @param transactionList - a proto.TransactionList object
  * @returns `string`

package/dist/{src/lib → lib}/shared/utils.js

@@ -86,10 +86,10 @@ export function base64StringToTransaction(transactionBytes) {
 export function transactionToTransactionBody(transaction, nodeAccountId) {
     // This is a private function, though provides the capabilities to construct a proto.TransactionBody
     //@ts-ignore
-    return transaction._signedTransactions.current.bodyBytes;
+    return transaction._makeTransactionBody(nodeAccountId);
 }
 export function transactionBodyToBase64String(transactionBody) {
-    return Uint8ArrayToBase64String(transactionBody);
+    return Uint8ArrayToBase64String(proto.TransactionBody.encode(transactionBody).finish());
 }
 /**
  * @param transactionList - a proto.TransactionList object

package/package.json

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

package/dist/test/_helpers.d.ts

@@ -1,38 +0,0 @@
-import { AccountId, Query, Transaction, TransactionId } from '@hashgraph/sdk';
-export declare const projectId = "ce06497abf4102004138a10edd29c921";
-export declare const walletMetadata: {
-    name: string;
-    url: string;
-    description: string;
-    icons: string[];
-};
-export declare const dAppMetadata: {
-    name: string;
-    url: string;
-    description: string;
-    icons: string[];
-};
-export declare const requestId = 1;
-export declare const requestTopic = "test-topic";
-export declare const defaultAccountNumber = 12345;
-export declare const defaultNodeId = 3;
-export declare const testUserAccountId: AccountId;
-export declare const testNodeAccountId: AccountId;
-/** Fixed to a specific timestamp */
-export declare const testTransactionId: TransactionId;
-type TransactionOptions = {
-    setNodeAccountIds?: boolean;
-    setTransactionId?: boolean;
-    freeze?: boolean;
-    operatorAccountId?: number;
-};
-export declare function prepareTestTransaction<T extends Transaction = Transaction>(transaction: T, options?: TransactionOptions): T;
-type QueryOptions = {
-    setNodeAccountIds?: boolean;
-};
-export declare function prepareTestQuery<Q extends Query<OutputT>, OutputT>(query: Q, options?: QueryOptions): Q;
-export declare const testPrivateKeyECDSA = "3030020100300706052b8104000a042204203ce31ffad30d6db47c315bbea08232aad2266d8800a12aa3d8a812486e782759";
-export declare const testPrivateKeyED25519 = "302e020100300506032b657004220420133eefea772add1f995c96bccf42b08b76daf67665f0c4c5ae308fae9275c142";
-export declare function useJsonFixture(filename: string): any;
-export declare function writeJsonFixture(filename: string, data: any): void;
-export {};

package/dist/test/_helpers.js

@@ -1,95 +0,0 @@
-/*
- *
- * Hedera Wallet Connect
- *
- * Copyright (C) 2023 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-import fs from 'fs';
-import path from 'path';
-import { AccountId, TransactionId } from '@hashgraph/sdk';
-export const projectId = 'ce06497abf4102004138a10edd29c921';
-export const walletMetadata = {
-    name: 'Wallet Test',
-    url: 'https://dapp.hedera.app',
-    description: 'Hedera Hashgraph Wallet Example.',
-    icons: [
-        'https://cdn-assets-cloud.frontify.com/s3/frontify-cloud-files-us/eyJwYXRoIjoiZnJvbnRpZnlcL2FjY291bnRzXC8xNFwvMTQzMTI3XC9wcm9qZWN0c1wvMTgwMjE1XC9hc3NldHNcL2M3XC8zNDU0ODY3XC85ZjM1NDliYmE5MGQ2NDA0OGU0NzlhZTNiMzkyYzY4Yy0xNTY2NTkxOTQ4LmpwZyJ9:frontify:v_zJvQTCjtNploUvnSpk8S5NJB4R5eei6f7ERL2KSeQ?width=800',
-    ],
-};
-export const dAppMetadata = {
-    name: 'dApp Test',
-    url: 'https://dapp.hedera.app',
-    description: 'Hedera Hashgraph dApp Example.',
-    icons: [
-        'https://cdn-assets-cloud.frontify.com/s3/frontify-cloud-files-us/eyJwYXRoIjoiZnJvbnRpZnlcL2FjY291bnRzXC8xNFwvMTQzMTI3XC9wcm9qZWN0c1wvMTgwMjE1XC9hc3NldHNcL2M3XC8zNDU0ODY3XC85ZjM1NDliYmE5MGQ2NDA0OGU0NzlhZTNiMzkyYzY4Yy0xNTY2NTkxOTQ4LmpwZyJ9:frontify:v_zJvQTCjtNploUvnSpk8S5NJB4R5eei6f7ERL2KSeQ?width=800',
-    ],
-};
-export const requestId = 1;
-export const requestTopic = 'test-topic';
-export const defaultAccountNumber = 12345;
-export const defaultNodeId = 3;
-export const testUserAccountId = new AccountId(defaultAccountNumber);
-export const testNodeAccountId = new AccountId(defaultNodeId);
-/** Fixed to a specific timestamp */
-export const testTransactionId = TransactionId.fromString(`0.0.${defaultAccountNumber}@1691705630.325343432`);
-export function prepareTestTransaction(transaction, options) {
-    const selectedOptions = Object.assign({ 
-        // defaults
-        freeze: false, setNodeAccountIds: true, setTransactionId: true, operatorAccountId: defaultAccountNumber }, options);
-    if (selectedOptions.setNodeAccountIds) {
-        transaction.setNodeAccountIds([testNodeAccountId]);
-    }
-    if (selectedOptions.setTransactionId) {
-        let transactionId = testTransactionId;
-        if (selectedOptions.operatorAccountId &&
-            selectedOptions.operatorAccountId !== defaultAccountNumber) {
-            transactionId = TransactionId.generate(new AccountId(selectedOptions.operatorAccountId));
-        }
-        transaction.setTransactionId(transactionId);
-    }
-    if (selectedOptions.freeze) {
-        transaction.freeze();
-    }
-    return transaction;
-}
-export function prepareTestQuery(query, options) {
-    const selectedOptions = Object.assign({ 
-        // defaults
-        setNodeAccountIds: true }, options);
-    if (selectedOptions.setNodeAccountIds) {
-        query.setNodeAccountIds([testNodeAccountId]);
-    }
-    return query;
-}
-// from PrivateKey.generateECDSA().toStringDer()
-export const testPrivateKeyECDSA = '3030020100300706052b8104000a042204203ce31ffad30d6db47c315bbea08232aad2266d8800a12aa3d8a812486e782759';
-// from PrivateKey.generateED25519().toStringDer()
-export const testPrivateKeyED25519 = '302e020100300506032b657004220420133eefea772add1f995c96bccf42b08b76daf67665f0c4c5ae308fae9275c142';
-/** JSON fixture helpers */
-const FIXTURES_PATH = 'test/_fixtures';
-const filenameWithJsonExtension = (filename) => {
-    const file = /\.json$/.test(filename) ? filename : filename + '.json';
-    return path.join(FIXTURES_PATH, file);
-};
-export function useJsonFixture(filename) {
-    const filepath = filenameWithJsonExtension(filename);
-    const data = fs.readFileSync(filepath).toString();
-    return JSON.parse(data);
-}
-export function writeJsonFixture(filename, data) {
-    const filepath = filenameWithJsonExtension(filename);
-    fs.writeFileSync(filepath, JSON.stringify(data, null, 2));
-}

package/dist/test/dapp/DAppConnector.test.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/test/dapp/DAppConnector.test.js

@@ -1,232 +0,0 @@
-/*
- *
- * Hedera Wallet Connect
- *
- * Copyright (C) 2023 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-import { AccountId, AccountInfoQuery, LedgerId, TopicCreateTransaction } from '@hashgraph/sdk';
-import { DAppConnector, HederaJsonRpcMethod, HederaSessionEvent, queryToBase64String, transactionToBase64String, transactionToTransactionBody, transactionBodyToBase64String, DAppSigner, } from '../../src';
-import { projectId, dAppMetadata, useJsonFixture, prepareTestTransaction, testUserAccountId, } from '../_helpers';
-import Client, { SignClient } from '@walletconnect/sign-client';
-describe('DAppConnector', () => {
-    let connector;
-    const fakeSession = useJsonFixture('fakeSession');
-    beforeEach(() => {
-        connector = new DAppConnector(dAppMetadata, LedgerId.TESTNET, projectId);
-    });
-    afterEach(() => {
-        global.gc && global.gc();
-    });
-    describe('constructor', () => {
-        it('should create a valid class object', () => {
-            const methods = ['hedera_testMethod', 'any_testMethod'];
-            const events = [HederaSessionEvent.ChainChanged, HederaSessionEvent.AccountsChanged];
-            connector = new DAppConnector(dAppMetadata, LedgerId.TESTNET, projectId, methods, events);
-            expect(connector.dAppMetadata).toBe(dAppMetadata);
-            expect(connector.network).toBe(LedgerId.TESTNET);
-            expect(connector.projectId).toBe(projectId);
-            expect(connector.supportedMethods).toEqual(methods);
-            expect(connector.supportedEvents).toEqual(events);
-        });
-        it('should create a valid class object without passing of methods and events', () => {
-            connector = new DAppConnector(dAppMetadata, LedgerId.TESTNET, projectId);
-            expect(connector.dAppMetadata).toBe(dAppMetadata);
-            expect(connector.network).toBe(LedgerId.TESTNET);
-            expect(connector.projectId).toBe(projectId);
-            expect(connector.supportedMethods).toEqual(Object.values(HederaJsonRpcMethod));
-            expect(connector.supportedEvents).toEqual([]);
-        });
-    });
-    describe('init', () => {
-        it('should init SignClient correctly', async () => {
-            var _a, _b, _c;
-            await connector.init({ logger: 'error' });
-            expect(connector.walletConnectClient).toBeInstanceOf(Client);
-            expect((_a = connector.walletConnectClient) === null || _a === void 0 ? void 0 : _a.metadata).toBe(dAppMetadata);
-            expect((_b = connector.walletConnectClient) === null || _b === void 0 ? void 0 : _b.core.projectId).toBe(projectId);
-            expect((_c = connector.walletConnectClient) === null || _c === void 0 ? void 0 : _c.core.relayUrl).toBe('wss://relay.walletconnect.com');
-        });
-        it('should create signers if there are persisted sessions', async () => {
-            const mockInit = jest.spyOn(connector, 'init');
-            const mockSignClient = new SignClient({
-                logger: 'error',
-                relayUrl: 'wss://relay.walletconnect.com',
-                projectId: projectId,
-                metadata: dAppMetadata,
-            });
-            mockInit.mockImplementation(async () => {
-                connector.signers = [
-                    new DAppSigner(testUserAccountId, mockSignClient, fakeSession.topic, LedgerId.TESTNET),
-                ];
-            });
-            await connector.init({ logger: 'error' });
-            expect(connector.signers.length).toBeGreaterThan(0);
-            mockInit.mockRestore();
-        });
-    });
-    describe('disconnect', () => {
-        it('should disconnect Client from topic', async () => {
-            connector.walletConnectClient = new SignClient({
-                logger: 'error',
-                relayUrl: 'wss://relay.walletconnect.com',
-                projectId: projectId,
-                metadata: dAppMetadata,
-            });
-            const walletConnectDisconnectSpy = jest.spyOn(connector.walletConnectClient, 'disconnect');
-            walletConnectDisconnectSpy.mockImplementation(async () => { });
-            connector.disconnect(fakeSession.topic);
-            expect(walletConnectDisconnectSpy).toHaveBeenCalled();
-            expect(walletConnectDisconnectSpy).toHaveBeenCalledTimes(1);
-            expect(walletConnectDisconnectSpy).toHaveBeenCalledWith(expect.objectContaining({ topic: fakeSession.topic }));
-            walletConnectDisconnectSpy.mockRestore();
-        });
-    });
-    describe('requests', () => {
-        let lastSignerRequestMock;
-        // @ts-ignore
-        let mockSignClient;
-        beforeEach(async () => {
-            mockSignClient = new SignClient({
-                logger: 'error',
-                relayUrl: 'wss://relay.walletconnect.com',
-                projectId: projectId,
-                metadata: dAppMetadata,
-            });
-            connector.signers = [
-                new DAppSigner(testUserAccountId, mockSignClient, fakeSession.topic, LedgerId.TESTNET),
-            ];
-            lastSignerRequestMock = jest.spyOn(connector.signers[0], 'request');
-            lastSignerRequestMock.mockImplementation(() => { });
-        });
-        afterEach(() => {
-            if (lastSignerRequestMock) {
-                lastSignerRequestMock.mockRestore();
-            }
-        });
-        describe('getNodeAddresses', () => {
-            it('should throw an error if there is no active signer', async () => {
-                connector.signers = [];
-                await expect(connector.getNodeAddresses()).rejects.toThrow('There is no active session. Connect to the wallet at first.');
-            });
-            it('should invoke last signer request with correct params', async () => {
-                await connector.getNodeAddresses();
-                expect(lastSignerRequestMock).toHaveBeenCalledWith({
-                    method: HederaJsonRpcMethod.GetNodeAddresses,
-                    params: undefined,
-                });
-            });
-        });
-        describe('signMessage', () => {
-            const params = {
-                message: 'test message',
-                signerAccountId: `hedera:testnet:${testUserAccountId.toString()}`,
-            };
-            it('should throw an error if there are no signers', async () => {
-                connector.signers = [];
-                await expect(connector.signMessage(params)).rejects.toThrow('Signer not found for account ID: hedera:testnet:0.0.12345. Did you use the correct format? e.g hedera:<network>:<address>');
-            });
-            it('should invoke last signer request with correct params', async () => {
-                await connector.signMessage(params);
-                expect(lastSignerRequestMock).toHaveBeenCalledWith({
-                    method: HederaJsonRpcMethod.SignMessage,
-                    params,
-                });
-            });
-        });
-        describe('executeTransaction', () => {
-            const transaction = prepareTestTransaction(new TopicCreateTransaction(), { freeze: true });
-            const params = {
-                transactionList: transactionToBase64String(transaction),
-            };
-            it('should throw an error if there are no signers', async () => {
-                connector.signers = [];
-                await expect(connector.executeTransaction(params)).rejects.toThrow('There is no active session. Connect to the wallet at first.');
-            });
-            it('should invoke last signer request with correct params', async () => {
-                await connector.executeTransaction(params);
-                expect(lastSignerRequestMock).toHaveBeenCalledWith({
-                    method: HederaJsonRpcMethod.ExecuteTransaction,
-                    params,
-                });
-            });
-        });
-        describe('signAndExecuteQuery', () => {
-            const query = new AccountInfoQuery().setAccountId(testUserAccountId.toString());
-            const params = {
-                signerAccountId: testUserAccountId.toString(),
-                query: queryToBase64String(query),
-            };
-            it('should throw an error if there is no any signer', async () => {
-                connector.signers = [];
-                await expect(connector.signAndExecuteQuery(params)).rejects.toThrow('Signer not found for account ID: 0.0.12345. Did you use the correct format? e.g hedera:<network>:<address>');
-            });
-            it('should invoke last signer request with correct params', async () => {
-                await connector.signAndExecuteQuery(params);
-                expect(lastSignerRequestMock).toHaveBeenCalledWith({
-                    method: HederaJsonRpcMethod.SignAndExecuteQuery,
-                    params,
-                });
-            });
-        });
-        describe('signAndExecuteTransaction', () => {
-            const transaction = prepareTestTransaction(new TopicCreateTransaction(), { freeze: true });
-            const params = {
-                signerAccountId: testUserAccountId.toString(),
-                transactionList: transactionToBase64String(transaction),
-            };
-            it('should throw an error if there is no any signer', async () => {
-                connector.signers = [];
-                await expect(connector.signAndExecuteTransaction(params)).rejects.toThrow('Signer not found for account ID: 0.0.12345. Did you use the correct format? e.g hedera:<network>:<address>');
-            });
-            it('should invoke last signer request with correct params', async () => {
-                await connector.signAndExecuteTransaction(params);
-                expect(lastSignerRequestMock).toHaveBeenCalledWith({
-                    method: HederaJsonRpcMethod.SignAndExecuteTransaction,
-                    params,
-                });
-            });
-        });
-        describe('signTransaction', () => {
-            const transaction = prepareTestTransaction(new TopicCreateTransaction(), { freeze: true });
-            const params = {
-                signerAccountId: testUserAccountId.toString(),
-                transactionBody: transactionBodyToBase64String(transactionToTransactionBody(transaction, AccountId.fromString('0.0.3'))),
-            };
-            it('should throw an error if there is no any signer', async () => {
-                connector.signers = [];
-                await expect(connector.signTransaction(params)).rejects.toThrow('Signer not found for account ID: 0.0.12345. Did you use the correct format? e.g hedera:<network>:<address>');
-            });
-            it('should invoke last signer request with correct params', async () => {
-                await connector.signTransaction(params);
-                expect(lastSignerRequestMock).toHaveBeenCalledWith({
-                    method: HederaJsonRpcMethod.SignTransaction,
-                    params,
-                });
-            });
-        });
-    });
-    // describe('connect', () => {
-    //   it('should establish connection and create session', async () => {
-    //     connector = new DAppConnector(appMetadata, LedgerId.TESTNET, PROJECT_ID)
-    //     await connector.init()
-    //     expect(connector.walletConnectClient).not.toBeNull()
-    //     await connector.connect((pairing) => {
-    //       console.log('PairingString: ', pairing)
-    //     })
-    //     expect(connector.walletConnectClient?.session.getAll()).toHaveLength(1)
-    //   }, 60_000)
-    // })
-});

package/dist/test/dapp/DAppSigner.test.d.ts

@@ -1 +0,0 @@
-export {};