@hashgraph/hedera-wallet-connect 2.0.1-canary.d03f482.0 → 2.0.1-canary.d07e485.0

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

@@ -8,7 +8,6 @@ export declare class DAppSigner implements Signer {
     private readonly ledgerId;
     readonly extensionId?: string | undefined;
     private logger;
-    private publicKey;
     constructor(accountId: AccountId, signClient: ISignClient, topic: string, ledgerId?: LedgerId, extensionId?: string | undefined, logLevel?: LogLevel);
     /**
      * Sets the logging level for the DAppSigner
@@ -23,7 +22,6 @@ export declare class DAppSigner implements Signer {
     }): Promise<T>;
     getAccountId(): AccountId;
     getAccountKey(): Key;
-    getAccountKeyAsync(): Promise<Key | null>;
     getLedgerId(): LedgerId;
     getNetwork(): {
         [key: string]: string | AccountId;

package/dist/lib/dapp/DAppSigner.js

@@ -19,7 +19,7 @@
  */
 import { AccountBalance, AccountInfo, LedgerId, SignerSignature, Transaction, TransactionRecord, Client, PublicKey, TransactionId, TransactionResponse, Query, AccountRecordsQuery, AccountInfoQuery, AccountBalanceQuery, TransactionReceiptQuery, TransactionReceipt, TransactionRecordQuery, } from '@hashgraph/sdk';
 import { proto } from '@hashgraph/proto';
-import { HederaJsonRpcMethod, base64StringToSignatureMap, base64StringToUint8Array, ledgerIdToCAIPChainId, queryToBase64String, transactionBodyToBase64String, transactionToBase64String, transactionToTransactionBody, extensionOpen, Uint8ArrayToBase64String, Uint8ArrayToString, getAccountInfo, } from '../shared';
+import { HederaJsonRpcMethod, base64StringToSignatureMap, base64StringToUint8Array, ledgerIdToCAIPChainId, queryToBase64String, transactionBodyToBase64String, transactionToBase64String, transactionToTransactionBody, extensionOpen, Uint8ArrayToBase64String, Uint8ArrayToString, } from '../shared';
 import { DefaultLogger } from '../shared/logger';
 import { SessionNotFoundError } from './SessionNotFoundError';
 const clients = {};
@@ -31,11 +31,6 @@ export class DAppSigner {
         this.ledgerId = ledgerId;
         this.extensionId = extensionId;
         this.logger = new DefaultLogger(logLevel);
-        this.publicKey = null;
-        // cache public key from mirror node
-        this.getAccountKeyAsync()
-            .then((key) => (this.publicKey = key))
-            .catch((error) => this.logger.error('Error when receiving a public key:', error.message));
     }
     /**
      * Sets the logging level for the DAppSigner
@@ -84,16 +79,7 @@ export class DAppSigner {
         return this.accountId;
     }
     getAccountKey() {
-        if (this.publicKey == null) {
-            throw new Error('No key was received from the mirror node');
-        }
-        return this.publicKey;
-    }
-    async getAccountKeyAsync() {
-        const accountInfo = await getAccountInfo(this.ledgerId, this.accountId.toString());
-        if (!(accountInfo === null || accountInfo === void 0 ? void 0 : accountInfo.key))
-            return null;
-        return PublicKey.fromString(accountInfo.key.key);
+        throw new Error('Method not implemented.');
     }
     getLedgerId() {
         return this.ledgerId;

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

@@ -1,17 +1,15 @@
 import { AccountId, LedgerId, Transaction } from '@hashgraph/sdk';
-import { EngineTypes, SessionTypes, SignClientTypes } from '@walletconnect/types';
+import { SessionTypes, SignClientTypes } from '@walletconnect/types';
 import { WalletConnectModal } from '@walletconnect/modal';
 import SignClient from '@walletconnect/sign-client';
 import { LogLevel } from '../shared/logger';
 import { GetNodeAddressesResult, ExecuteTransactionParams, ExecuteTransactionResult, SignMessageParams, SignMessageResult, SignAndExecuteQueryResult, SignAndExecuteQueryParams, SignAndExecuteTransactionParams, SignAndExecuteTransactionResult, SignTransactionParams, SignTransactionResult, ExtensionData } from '../shared';
 import { DAppSigner } from './DAppSigner';
-import { JsonRpcResult } from '@walletconnect/jsonrpc-types';
 export * from './DAppSigner';
 export { SessionNotFoundError } from './SessionNotFoundError';
 type BaseLogger = 'error' | 'warn' | 'info' | 'debug' | 'trace' | 'fatal';
 export declare class DAppConnector {
     private logger;
-    readonly storagePrefix = "hedera-wc/dapp-connector/";
     dAppMetadata: SignClientTypes.Metadata;
     network: LedgerId;
     projectId: string;
@@ -108,7 +106,7 @@ export declare class DAppConnector {
     private createSigners;
     private onSessionConnected;
     private connectURI;
-    request<Req extends EngineTypes.RequestParams, Res extends JsonRpcResult>({ method, params, }: Req['request']): Promise<Res>;
+    private request;
     /**
      * Retrieves the node addresses associated with the current Hedera network.
      *
@@ -214,7 +212,5 @@ export declare class DAppConnector {
     private handleSessionUpdate;
     private handleSessionDelete;
     private handlePairingDelete;
-    private handleRelayConnected;
-    private verifyLastConnectedInstance;
 }
 export default DAppConnector;

package/dist/lib/dapp/index.js

@@ -20,8 +20,7 @@
 import { LedgerId, Transaction } from '@hashgraph/sdk';
 import { WalletConnectModal } from '@walletconnect/modal';
 import SignClient from '@walletconnect/sign-client';
-import { getSdkError, isOnline } from '@walletconnect/utils';
-import { RELAYER_EVENTS } from '@walletconnect/core';
+import { getSdkError } from '@walletconnect/utils';
 import { DefaultLogger } from '../shared/logger';
 import { HederaJsonRpcMethod, accountAndLedgerFromSession, networkNamespaces, extensionConnect, findExtensions, } from '../shared';
 import { DAppSigner } from './DAppSigner';
@@ -39,7 +38,6 @@ export class DAppConnector {
      * @param logLevel - Logging level for the DAppConnector (optional).
      */
     constructor(metadata, network, projectId, methods, events, chains, logLevel = 'debug') {
-        this.storagePrefix = 'hedera-wc/dapp-connector/';
         this.network = LedgerId.TESTNET;
         this.supportedMethods = [];
         this.supportedEvents = [];
@@ -112,9 +110,6 @@ export class DAppConnector {
                 this.signers = existingSessions.flatMap((session) => this.createSigners(session));
             else
                 this.checkIframeConnect();
-            //manual call after init before relayer connect event handler is attached
-            this.handleRelayConnected();
-            this.walletConnectClient.core.relayer.on(RELAYER_EVENTS.connect, this.handleRelayConnected.bind(this));
             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));
@@ -384,7 +379,6 @@ export class DAppConnector {
         if (!signer) {
             throw new Error('There is no active session. Connect to the wallet at first.');
         }
-        await this.verifyLastConnectedInstance();
         this.logger.debug(`Using signer: ${signer.getAccountId().toString()}: ${signer.topic} - about to request.`);
         return await signer.request({
             method: method,
@@ -582,33 +576,5 @@ export class DAppConnector {
         }
         this.logger.info('Pairing deleted by wallet');
     }
-    // Store the last connected randomSessionIdentifier
-    async handleRelayConnected() {
-        if (!this.walletConnectClient) {
-            this.logger.error('walletConnectClient not found');
-            return;
-        }
-        const core = this.walletConnectClient.core;
-        const instanceId = core.crypto.randomSessionIdentifier;
-        await core.storage.setItem(this.storagePrefix + 'last-connected-instance', instanceId);
-    }
-    // In the event of another tab being connected after the current one,
-    // the current tab will be forcibly reconnected to the relay so that
-    // a response to the request can be received.
-    // https://github.com/hashgraph/hedera-wallet-connect/issues/387
-    async verifyLastConnectedInstance() {
-        if (!this.walletConnectClient) {
-            this.logger.error('walletConnectClient not found');
-            return;
-        }
-        const core = this.walletConnectClient.core;
-        const instanceId = core.crypto.randomSessionIdentifier;
-        const isOnlineStatus = await isOnline();
-        const lastConnectedInstanceId = await core.storage.getItem(this.storagePrefix + 'last-connected-instance');
-        if (lastConnectedInstanceId != instanceId && isOnlineStatus) {
-            this.logger.info('Forced reconnecting to the relay');
-            await core.relayer.restartTransport();
-        }
-    }
 }
 export default DAppConnector;

package/dist/lib/shared/index.d.ts

@@ -5,5 +5,3 @@ export * from './methods';
 export * from './payloads';
 export * from './utils';
 export * from './extensionController';
-export * from './mirrorNode';
-export * from './accountInfo';

package/dist/lib/shared/index.js

@@ -24,5 +24,3 @@ export * from './methods';
 export * from './payloads';
 export * from './utils';
 export * from './extensionController';
-export * from './mirrorNode';
-export * from './accountInfo';

package/dist/reown/adapter.js

@@ -5,8 +5,7 @@ import { ProviderUtil } from '@reown/appkit/store';
 import { LedgerId } from '@hashgraph/sdk';
 import { BrowserProvider, Contract, formatUnits, JsonRpcSigner, parseUnits } from 'ethers';
 import { HederaConnector } from './connectors';
-import { hederaNamespace } from './utils';
-import { getAccountInfo } from '..';
+import { hederaNamespace, getAccountBalance } from './utils';
 export class HederaAdapter extends AdapterBlueprint {
     constructor(params) {
         var _a, _b;
@@ -73,10 +72,10 @@ export class HederaAdapter extends AdapterBlueprint {
                 symbol: '',
             });
         }
-        const accountInfo = await getAccountInfo(caipNetwork.testnet ? LedgerId.TESTNET : LedgerId.MAINNET, address);
+        const accountBalance = await getAccountBalance(caipNetwork.testnet ? LedgerId.TESTNET : LedgerId.MAINNET, address);
         return Promise.resolve({
-            balance: (accountInfo === null || accountInfo === void 0 ? void 0 : accountInfo.balance)
-                ? formatUnits(accountInfo.balance.balance, 8).toString()
+            balance: accountBalance
+                ? formatUnits(accountBalance.hbars.toTinybars().toString(), 8).toString()
                 : '0',
             decimals: caipNetwork.nativeCurrency.decimals,
             symbol: caipNetwork.nativeCurrency.symbol,

package/dist/reown/utils/account.d.ts

@@ -0,0 +1,2 @@
+import { AccountBalance, LedgerId } from '@hashgraph/sdk';
+export declare function getAccountBalance(ledgerId: LedgerId, address: string): Promise<AccountBalance | null>;

package/dist/reown/utils/account.js

@@ -0,0 +1,20 @@
+import { AccountBalanceQuery, AccountId, Client, LedgerId } from '@hashgraph/sdk';
+export async function getAccountBalance(ledgerId, address) {
+    const client = ledgerId === LedgerId.TESTNET ? Client.forTestnet() : Client.forMainnet();
+    let accountId;
+    try {
+        accountId = AccountId.fromString(address);
+    }
+    catch (e) {
+        accountId = AccountId.fromEvmAddress(0, 0, address);
+    }
+    if (accountId.num.isZero() && accountId.evmAddress != null) {
+        await accountId.populateAccountNum(client);
+    }
+    try {
+        return await new AccountBalanceQuery().setAccountId(accountId).execute(client);
+    }
+    catch (e) {
+        return null;
+    }
+}

package/dist/reown/utils/index.d.ts

@@ -2,3 +2,4 @@ export * from './chains';
 export * from './constants';
 export * from './types';
 export * from './helpers';
+export * from './account';

package/dist/reown/utils/index.js

@@ -2,3 +2,4 @@ export * from './chains';
 export * from './constants';
 export * from './types';
 export * from './helpers';
+export * from './account';

package/package.json

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

package/dist/lib/shared/accountInfo.d.ts

@@ -1,30 +0,0 @@
-export interface AccountInfo {
-    account: string;
-    alias: string;
-    auto_renew_period: number;
-    balance: Balance;
-    created_timestamp: string;
-    decline_reward: boolean;
-    deleted: boolean;
-    ethereum_nonce: number;
-    evm_address: string;
-    expiry_timestamp: string;
-    key: Key | null;
-    max_automatic_token_associations: number;
-    memo: string;
-    pending_reward: number;
-    receiver_sig_required: boolean;
-}
-export interface Balance {
-    balance: number;
-    timestamp: string;
-    tokens: Token[];
-}
-export interface Token {
-    token_id: string;
-    balance: number;
-}
-export interface Key {
-    _type: string;
-    key: string;
-}

package/dist/lib/shared/accountInfo.js

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

package/dist/lib/shared/mirrorNode.d.ts

@@ -1,3 +0,0 @@
-import { LedgerId } from '@hashgraph/sdk';
-import { AccountInfo } from '.';
-export declare function getAccountInfo(ledgerId: LedgerId, address: string): Promise<AccountInfo | null>;

package/dist/lib/shared/mirrorNode.js

@@ -1,17 +0,0 @@
-function getMirrorNodeUrl(ledgerId) {
-    return `https://${ledgerId.toString()}.mirrornode.hedera.com`;
-}
-export async function getAccountInfo(ledgerId, address) {
-    const mirrorNodeApiUrl = getMirrorNodeUrl(ledgerId);
-    const url = `${mirrorNodeApiUrl}/api/v1/accounts/${address}`;
-    const result = await fetch(url, {
-        headers: {
-            accept: 'application/json',
-        },
-    });
-    if (result.status !== 200) {
-        return null;
-    }
-    const response = await result.json();
-    return response;
-}