@hashgraph/hedera-wallet-connect 1.3.8-canary.edae801.0 → 1.3.8-canary.ef457e6.0

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

@@ -31,7 +31,9 @@ export declare class DAppSigner implements Signer {
     getAccountInfo(): Promise<AccountInfo>;
     getAccountRecords(): Promise<TransactionRecord[]>;
     getMetadata(): CoreTypes.Metadata;
-    sign(data: Uint8Array[], signOptions?: Record<string, any>): Promise<SignerSignature[]>;
+    sign(data: Uint8Array[], signOptions?: {
+        encoding?: 'utf-8' | 'base64';
+    }): Promise<SignerSignature[]>;
     checkTransaction<T extends Transaction>(transaction: T): Promise<T>;
     populateTransaction<T extends Transaction>(transaction: T): Promise<T>;
     /**

package/dist/lib/dapp/DAppSigner.js

@@ -19,7 +19,7 @@
  */
 import { AccountBalance, AccountId, 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, Uint8ArrayToBase64String, base64StringToSignatureMap, base64StringToUint8Array, ledgerIdToCAIPChainId, queryToBase64String, transactionBodyToBase64String, transactionToBase64String, transactionToTransactionBody, extensionOpen, } from '../shared';
+import { HederaJsonRpcMethod, base64StringToSignatureMap, base64StringToUint8Array, ledgerIdToCAIPChainId, queryToBase64String, transactionBodyToBase64String, transactionToBase64String, transactionToTransactionBody, extensionOpen, Uint8ArrayToBase64String, Uint8ArrayToString, } from '../shared';
 import { DefaultLogger } from '../shared/logger';
 const clients = {};
 export class DAppSigner {
@@ -95,14 +95,18 @@ export class DAppSigner {
     getMetadata() {
         return this.signClient.metadata;
     }
-    async sign(data, signOptions) {
-        this.logger.debug('Signing data');
+    async sign(data, signOptions = {
+        encoding: 'utf-8',
+    }) {
         try {
+            const messageToSign = signOptions.encoding === 'base64'
+                ? Uint8ArrayToBase64String(data[0])
+                : Uint8ArrayToString(data[0]);
             const { signatureMap } = await this.request({
                 method: HederaJsonRpcMethod.SignMessage,
                 params: {
                     signerAccountId: this._signerAccountId,
-                    message: Uint8ArrayToBase64String(data[0]),
+                    message: messageToSign,
                 },
             });
             const sigmap = base64StringToSignatureMap(signatureMap);
@@ -230,9 +234,7 @@ export class DAppSigner {
                 if (!(result === null || result === void 0 ? void 0 : result.error)) {
                     return { result: result.result };
                 }
-                else {
-                    this.logger.error('Error executing free receipt query. Sending to wallet.', result.error);
-                }
+                this.logger.error('Error executing free receipt query. Sending to wallet.', result.error);
             }
             /**
              * Note, should we be converting these to specific query types?

package/dist/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`
@@ -85,6 +85,12 @@ export declare function base64StringToSignatureMap(base64string: string): proto.
  * @returns Base64-encoded string representation of the input `Uint8Array`
  */
 export declare function Uint8ArrayToBase64String(binary: Uint8Array): string;
+/**
+ * Encodes the binary data represented by the `Uint8Array` to a UTF-8 string.
+ * @param binary - The `Uint8Array` containing binary data to be converted
+ * @returns UTF-8 string representation of the input `Uint8Array`
+ */
+export declare function Uint8ArrayToString(binary: Uint8Array): string;
 /**
  * Converts a Base64-encoded string to a `Uint8Array`.
  * @param base64string - Base64-encoded string to be converted

package/dist/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
@@ -139,6 +139,14 @@ export function base64StringToSignatureMap(base64string) {
 export function Uint8ArrayToBase64String(binary) {
     return Buffer.from(binary).toString('base64');
 }
+/**
+ * Encodes the binary data represented by the `Uint8Array` to a UTF-8 string.
+ * @param binary - The `Uint8Array` containing binary data to be converted
+ * @returns UTF-8 string representation of the input `Uint8Array`
+ */
+export function Uint8ArrayToString(binary) {
+    return Buffer.from(binary).toString('utf-8');
+}
 /**
  * Converts a Base64-encoded string to a `Uint8Array`.
  * @param base64string - Base64-encoded string to be converted

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hashgraph/hedera-wallet-connect",
-  "version": "1.3.8-canary.edae801.0",
+  "version": "1.3.8-canary.ef457e6.0",
   "description": "A library to facilitate integrating Hedera with WalletConnect",
   "repository": {
     "type": "git",
@@ -55,6 +55,7 @@
     "dev:ts-demo": "rimraf dist && npm run build && concurrently --raw \"npm run watch\" \"node scripts/demos/typescript/dev.mjs\"",
     "dev:react-demo": "rimraf dist && npm run build && concurrently --raw \"npm run watch\" \"node scripts/demos/react/dev.mjs\"",
     "test": "jest",
+    "test:watch": "jest --watch",
     "test:connect": "jest --testMatch '**/DAppConnector.test.ts' --verbose",
     "test:signer": "jest --testMatch '**/DAppSigner.test.ts' --verbose",
     "prepublishOnly": "rm -Rf dist && npm run build",