@hashgraph/hedera-wallet-connect 2.0.1-canary.6be69a2.0 → 2.0.1-canary.6cd5728.0

package/README.md

@@ -42,7 +42,9 @@ For more information see:
 - [Ethereum JSON-RPC Specification ](https://ethereum.github.io/execution-apis/api-documentation/)
 - [Hedera JSON-RPC relay](https://docs.hedera.com/hedera/core-concepts/smart-contracts/json-rpc-relay)
 - [Hedera Native JSON-RPC spec for WalletConnect](https://docs.reown.com/advanced/multichain/rpc-reference/hedera-rpc)
-- [@hashgraph/sdk](https://www.npmjs.com/package/@hashgraph/sdk)
+- [Hedera Javascript SDK](https://www.npmjs.com/package/@hashgraph/sdk)
+- [Reown Docs](https://docs.reown.com/overview)
+- [WalletConnect Network](https://walletconnect.network/)
 
 # Getting started
 
@@ -119,7 +121,7 @@ await dAppConnector.openModal()
 2. Add Hedera dependencies to your project:
 
 ```sh
-npm install @hashgraph/hedera-wallet-connect@2.0.0-canary.811af2f.0 @hashgraph/sdk @walletconnect/universal-provider
+npm install @hashgraph/hedera-wallet-connect@2.0.1-canary.24fffa7.0 @hashgraph/sdk @walletconnect/universal-provider
 ```
 
 3. Update `createAppKit` with adapters and a universal provider for Hedera. Note the
@@ -233,4 +235,4 @@ While minimal, the main breaking changes are:
 
   - initially, a transaction created by the Hedera Javascript SDK needed to have one or more
     consensus node ids set to be able to serialize into bytes, sent over a network, and
-    deserialized by the SDK.
+    deserialized by the SDK

package/dist/index.d.ts

@@ -1,2 +1 @@
 export * from './lib';
-export * from './reown';

package/dist/index.js

@@ -18,4 +18,3 @@
  *
  */
 export * from './lib';
-export * from './reown';

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,11 +1,10 @@
 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';
@@ -23,7 +22,6 @@ export declare class DAppConnector {
     walletConnectModal: WalletConnectModal;
     signers: DAppSigner[];
     isInitializing: boolean;
-    private storagePrefix;
     /**
      * Initializes the DAppConnector instance.
      * @param metadata - SignClientTypes.Metadata object for the DApp metadata.
@@ -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.
      *
@@ -194,7 +192,9 @@ export declare class DAppConnector {
      *
      * @param {SignTransactionParams} params - The parameters of type {@link SignTransactionParams | `SignTransactionParams`} required for `Transaction` signing.
      * @param {string} params.signerAccountId - a signer Hedera Account identifier in {@link https://hips.hedera.com/hip/hip-30 | HIP-30} (`<nework>:<shard>.<realm>.<num>`) form.
-     * @param {Transaction} params.transactionBody - a Transaction object built with the @hashgraph/sdk
+     * @param {Transaction | string} params.transactionBody - a built Transaction object, or a base64 string of a transaction body( HIP-820).
+     * HIP-820 calls for a base64 encoded proto.TransactionBody and many wallets support a serialized Transaction object generated by the Hedera Javascript SDK.
+     * Both options are supported here for backwards compatibility.
      * @returns Promise\<{@link SignTransactionResult}\>
      * @example
      * ```ts
@@ -212,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';
@@ -47,7 +46,6 @@ export class DAppConnector {
         this.onSessionIframeCreated = null;
         this.signers = [];
         this.isInitializing = false;
-        this.storagePrefix = 'hedera-wc/dapp-connector/';
         this.abortableConnect = async (callback) => {
             return new Promise(async (resolve, reject) => {
                 const pairTimeoutMs = 480000;
@@ -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,
@@ -501,7 +495,9 @@ export class DAppConnector {
      *
      * @param {SignTransactionParams} params - The parameters of type {@link SignTransactionParams | `SignTransactionParams`} required for `Transaction` signing.
      * @param {string} params.signerAccountId - a signer Hedera Account identifier in {@link https://hips.hedera.com/hip/hip-30 | HIP-30} (`<nework>:<shard>.<realm>.<num>`) form.
-     * @param {Transaction} params.transactionBody - a Transaction object built with the @hashgraph/sdk
+     * @param {Transaction | string} params.transactionBody - a built Transaction object, or a base64 string of a transaction body( HIP-820).
+     * HIP-820 calls for a base64 encoded proto.TransactionBody and many wallets support a serialized Transaction object generated by the Hedera Javascript SDK.
+     * Both options are supported here for backwards compatibility.
      * @returns Promise\<{@link SignTransactionResult}\>
      * @example
      * ```ts
@@ -580,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/lib/shared/payloads.d.ts

@@ -84,7 +84,7 @@ export interface SignAndExecuteTransactionResponse extends EngineTypes.RespondPa
 }
 export interface SignTransactionParams {
     signerAccountId: string;
-    transactionBody: Transaction;
+    transactionBody: Transaction | string;
 }
 export interface SignTransactionRequest extends EngineTypes.RequestParams {
     request: {

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

@@ -4,7 +4,7 @@ import { proto } from '@hashgraph/proto';
 /**
  * Converts `Transaction` to a Base64-string.
  *
- * Converts a transaction to bytes and then encodes it as a Base64-string. Allow uncompleted transaction (HIP-745).
+ * Converts a transaction to bytes and then encodes it as a Base64-string. Allow incomplete transaction (HIP-745).
  * @param transaction - Any instance of a class that extends `Transaction`
  * @returns Base64 encoded representation of the input `Transaction` object
  */
@@ -29,9 +29,10 @@ export declare function transactionToBase64String<T extends Transaction>(transac
 export declare function base64StringToTransaction<T extends Transaction>(transactionBytes: string): T;
 /**
  * @param transaction - a base64 encoded string of proto.TransactionBody.encode().finish()
+ * @param nodeAccountId - an optional `AccountId` to set the node account ID for the transaction
  * @returns `string`
  * */
-export declare function transactionToTransactionBody<T extends Transaction>(transaction: T): any;
+export declare function transactionToTransactionBody<T extends Transaction>(transaction: T, nodeAccountId?: AccountId | null): proto.ITransactionBody;
 export declare function transactionBodyToBase64String(transactionBody: proto.ITransactionBody): string;
 /**
  * @param transactionList - a proto.TransactionList object

package/dist/lib/shared/utils.js

@@ -23,7 +23,7 @@ import { proto } from '@hashgraph/proto';
 /**
  * Converts `Transaction` to a Base64-string.
  *
- * Converts a transaction to bytes and then encodes it as a Base64-string. Allow uncompleted transaction (HIP-745).
+ * Converts a transaction to bytes and then encodes it as a Base64-string. Allow incomplete transaction (HIP-745).
  * @param transaction - Any instance of a class that extends `Transaction`
  * @returns Base64 encoded representation of the input `Transaction` object
  */
@@ -54,12 +54,13 @@ export function base64StringToTransaction(transactionBytes) {
 }
 /**
  * @param transaction - a base64 encoded string of proto.TransactionBody.encode().finish()
+ * @param nodeAccountId - an optional `AccountId` to set the node account ID for the transaction
  * @returns `string`
  * */
-export function transactionToTransactionBody(transaction) {
+export function transactionToTransactionBody(transaction, nodeAccountId = null) {
     // This is a private function, though provides the capabilities to construct a proto.TransactionBody
     //@ts-ignore
-    return transaction._makeTransactionBody(null);
+    return transaction._makeTransactionBody(nodeAccountId);
 }
 export function transactionBodyToBase64String(transactionBody) {
     return Uint8ArrayToBase64String(proto.TransactionBody.encode(transactionBody).finish());

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hashgraph/hedera-wallet-connect",
-  "version": "2.0.1-canary.6be69a2.0",
-  "description": "A library to facilitate integrating Hedera",
+  "version": "2.0.1-canary.6cd5728.0",
+  "description": "A library to facilitate integrating Hedera with WalletConnect",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/hashgraph/hedera-wallet-connect.git"
@@ -14,30 +14,29 @@
     "walletconnect",
     "reown",
     "hashgraph",
-    "evm",
-    "ethereum",
-    "smart contracts",
     "hbar",
-    "ethers"
+    "evm",
+    "smart contracts"
   ],
   "license": "Apache-2.0",
   "scripts": {
     "build": "rimraf dist && tsc",
     "watch": "nodemon --watch src/ --ext ts --exec \"npm run build\"",
     "test": "jest",
-    "prepublishOnly": "rm -Rf dist && npm run build",
+    "prepublishOnly": "rm -Rf dist && npm run test && npm run build",
     "prettier:check": "prettier --check ./src/",
     "prettier:fix": "prettier --write ./src/"
   },
   "peerDependencies": {
-    "@hashgraph/sdk": "^2.61.0",
-    "@reown/appkit": "^1.7.1",
-    "@reown/walletkit": "^1.2.3",
+    "@hashgraph/sdk": "^2.63.0",
+    "@reown/appkit": "1.7.3",
+    "@reown/walletkit": "1.2.3",
     "@walletconnect/modal": "^2.7.0",
     "ethers": "^6.13.5"
   },
   "devDependencies": {
     "@swc/jest": "^0.2.37",
+    "@types/jest": "^29.5.14",
     "jest": "^29.7.0",
     "prettier": "^3.5.3",
     "ts-node": "^10.9.2",

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;
-}

package/dist/reown/adapter.d.ts

@@ -1,37 +0,0 @@
-import { type ChainNamespace } from '@reown/appkit-common';
-import { AdapterBlueprint } from '@reown/appkit/adapters';
-type UniversalProvider = Parameters<AdapterBlueprint['setUniversalProvider']>[0];
-export declare class HederaAdapter extends AdapterBlueprint {
-    constructor(params: AdapterBlueprint.Params);
-    setUniversalProvider(universalProvider: UniversalProvider): void;
-    connect(params: AdapterBlueprint.ConnectParams): Promise<AdapterBlueprint.ConnectResult>;
-    disconnect(): Promise<void>;
-    getAccounts({ namespace, }: AdapterBlueprint.GetAccountsParams & {
-        namespace: ChainNamespace;
-    }): Promise<AdapterBlueprint.GetAccountsResult>;
-    syncConnectors(): Promise<void>;
-    getBalance(params: AdapterBlueprint.GetBalanceParams): Promise<AdapterBlueprint.GetBalanceResult>;
-    signMessage(params: AdapterBlueprint.SignMessageParams): Promise<AdapterBlueprint.SignMessageResult>;
-    estimateGas(params: AdapterBlueprint.EstimateGasTransactionArgs): Promise<AdapterBlueprint.EstimateGasTransactionResult>;
-    sendTransaction(params: AdapterBlueprint.SendTransactionParams): Promise<AdapterBlueprint.SendTransactionResult>;
-    writeContract(params: AdapterBlueprint.WriteContractParams): Promise<AdapterBlueprint.WriteContractResult>;
-    getEnsAddress(params: AdapterBlueprint.GetEnsAddressParams): Promise<AdapterBlueprint.GetEnsAddressResult>;
-    parseUnits(params: AdapterBlueprint.ParseUnitsParams): AdapterBlueprint.ParseUnitsResult;
-    formatUnits(params: AdapterBlueprint.FormatUnitsParams): AdapterBlueprint.FormatUnitsResult;
-    getCapabilities(params: AdapterBlueprint.GetCapabilitiesParams): Promise<unknown>;
-    getProfile(): Promise<AdapterBlueprint.GetProfileResult>;
-    grantPermissions(): Promise<unknown>;
-    revokePermissions(): Promise<`0x${string}`>;
-    syncConnection(params: AdapterBlueprint.SyncConnectionParams): Promise<{
-        id: string;
-        type: "WALLET_CONNECT";
-        chainId: string | number;
-        provider: UniversalProvider;
-        address: string;
-    }>;
-    switchNetwork(params: AdapterBlueprint.SwitchNetworkParams): Promise<void>;
-    protected getWalletConnectConnector(): ReturnType<AdapterBlueprint['getWalletConnectConnector']>;
-    getWalletConnectProvider(): UniversalProvider;
-    walletGetAssets(_params: AdapterBlueprint.WalletGetAssetsParams): Promise<AdapterBlueprint.WalletGetAssetsResponse>;
-}
-export {};