@hashgraph/hedera-wallet-connect 2.0.4-canary.bc834d9.0 → 2.0.4-canary.d2afdf4.0

package/README.md

@@ -226,12 +226,10 @@ refer to how to send transactions to wallets using the `hedera:(mainnet|testnet)
 While minimal, the main breaking changes are:
 
 - remove WalletConnect v1 modals
-
   - these are very old, though in the spirit of semver, we kept the dependency until this
     library's v2 release
 
 - remove setting node id's within this library for transactions
-
   - 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

package/dist/lib/dapp/DAppSigner.js

@@ -146,7 +146,15 @@ export class DAppSigner {
      * @returns transaction - `Transaction` object with signature
      */
     async signTransaction(transaction) {
-        const transactionBody = transactionToTransactionBody(transaction);
+        var _a, _b;
+        // Ensure transaction is frozen with node account IDs before signing
+        // This is required so the transaction can be executed later by any client
+        if (!transaction.isFrozen()) {
+            transaction.freezeWith(this._getHederaClient());
+        }
+        // Extract the first node account ID from the frozen transaction to preserve it in the transaction body
+        const nodeAccountId = (_b = (_a = transaction.nodeAccountIds) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : null;
+        const transactionBody = transactionToTransactionBody(transaction, nodeAccountId);
         if (!transactionBody)
             throw new Error('Failed to serialize transaction body');
         const transactionBodyBase64 = transactionBodyToBase64String(transactionBody);
@@ -158,9 +166,44 @@ export class DAppSigner {
             },
         });
         const sigMap = base64StringToSignatureMap(signatureMap);
-        const bodyBytes = base64StringToUint8Array(transactionBodyBase64);
-        const bytes = proto.Transaction.encode({ bodyBytes, sigMap }).finish();
-        return Transaction.fromBytes(bytes);
+        // Get the original transaction bytes to preserve the full transaction structure
+        // including all node account IDs
+        const originalTransactionBytes = transaction.toBytes();
+        const originalTransactionList = proto.TransactionList.decode(originalTransactionBytes);
+        // Add the signature to all transactions in the list
+        // Each transaction in the list corresponds to a different node
+        const signedTransactionList = originalTransactionList.transactionList.map((tx) => {
+            // Check if the transaction has signedTransactionBytes (frozen transactions)
+            if (tx.signedTransactionBytes) {
+                // Decode the SignedTransaction to access the bodyBytes and existing sigMap
+                const signedTx = proto.SignedTransaction.decode(tx.signedTransactionBytes);
+                const existingSigMap = signedTx.sigMap || proto.SignatureMap.create({});
+                // Merge the new signatures with existing signatures
+                const mergedSigPairs = [...(existingSigMap.sigPair || []), ...(sigMap.sigPair || [])];
+                // Create updated SignedTransaction with merged signatures
+                const updatedSignedTx = proto.SignedTransaction.encode({
+                    bodyBytes: signedTx.bodyBytes,
+                    sigMap: proto.SignatureMap.create({
+                        sigPair: mergedSigPairs,
+                    }),
+                }).finish();
+                return {
+                    signedTransactionBytes: updatedSignedTx,
+                };
+            }
+            else {
+                // Transaction has bodyBytes and sigMap at the top level (not frozen)
+                const existingSigMap = tx.sigMap || proto.SignatureMap.create({});
+                // Merge the new signatures with existing signatures
+                const mergedSigPairs = [...(existingSigMap.sigPair || []), ...(sigMap.sigPair || [])];
+                return Object.assign(Object.assign({}, tx), { sigMap: Object.assign(Object.assign({}, existingSigMap), { sigPair: mergedSigPairs }) });
+            }
+        });
+        // Encode the signed transaction list back to bytes
+        const signedBytes = proto.TransactionList.encode({
+            transactionList: signedTransactionList,
+        }).finish();
+        return Transaction.fromBytes(signedBytes);
     }
     async _tryExecuteTransactionRequest(request) {
         try {

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

@@ -1,4 +1,4 @@
-import { AccountId, PublicKey, Transaction, LedgerId, Query, SignerSignature } from '@hashgraph/sdk';
+import { AccountId, PublicKey, PrivateKey, Transaction, LedgerId, Query, SignerSignature } from '@hashgraph/sdk';
 import { ProposalTypes, SessionTypes } from '@walletconnect/types';
 import { proto } from '@hashgraph/proto';
 /**
@@ -273,3 +273,8 @@ export declare const accountAndLedgerFromSession: (session: SessionTypes.Struct)
     network: LedgerId;
     account: AccountId;
 }[];
+/**
+ * Adds an additional signature to an already-signed transaction.
+ * Uses proto-level manipulation to preserve existing signatures.
+ */
+export declare function addSignatureToTransaction<T extends Transaction>(transaction: T, privateKey: PrivateKey): Promise<T>;

package/dist/lib/shared/utils.js

@@ -418,3 +418,42 @@ export const accountAndLedgerFromSession = (session) => {
         };
     });
 };
+/**
+ * Adds an additional signature to an already-signed transaction.
+ * Uses proto-level manipulation to preserve existing signatures.
+ */
+export async function addSignatureToTransaction(transaction, privateKey) {
+    const originalBytes = transaction.toBytes();
+    const originalList = proto.TransactionList.decode(originalBytes);
+    const firstTransaction = originalList.transactionList[0];
+    let bodyBytes;
+    if (firstTransaction.signedTransactionBytes) {
+        const signedTx = proto.SignedTransaction.decode(firstTransaction.signedTransactionBytes);
+        bodyBytes = signedTx.bodyBytes;
+    }
+    else {
+        bodyBytes = firstTransaction.bodyBytes;
+    }
+    const signature = await privateKey.sign(bodyBytes);
+    const publicKey = privateKey.publicKey;
+    const signedTransactionList = originalList.transactionList.map((tx) => {
+        const newSigPair = publicKey._toProtobufSignature(signature);
+        if (tx.signedTransactionBytes) {
+            const signedTx = proto.SignedTransaction.decode(tx.signedTransactionBytes);
+            const existingSigMap = signedTx.sigMap || proto.SignatureMap.create({});
+            const mergedSigPairs = [...(existingSigMap.sigPair || []), newSigPair];
+            const updatedSignedTx = proto.SignedTransaction.encode({
+                bodyBytes: signedTx.bodyBytes,
+                sigMap: proto.SignatureMap.create({ sigPair: mergedSigPairs }),
+            }).finish();
+            return { signedTransactionBytes: updatedSignedTx };
+        }
+        else {
+            const existingSigMap = tx.sigMap || proto.SignatureMap.create({});
+            const mergedSigPairs = [...(existingSigMap.sigPair || []), newSigPair];
+            return Object.assign(Object.assign({}, tx), { sigMap: Object.assign(Object.assign({}, existingSigMap), { sigPair: mergedSigPairs }) });
+        }
+    });
+    const signedBytes = proto.TransactionList.encode({ transactionList: signedTransactionList }).finish();
+    return Transaction.fromBytes(signedBytes);
+}

package/package.json

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