Merge branch 'hiero-ledger:main' into main

freya-docs · web-flow · commit 41b9c289c381 · 2026-03-15T20:13:17.000+01:00
diff --git a/.github/workflows/flow-pull-request-checks.yaml b/.github/workflows/flow-pull-request-checks.yaml
@@ -32,7 +32,7 @@ jobs:
     runs-on: hiero-client-sdk-linux-large
     steps:
     - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0
+      uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
       with:
         egress-policy: audit
 
diff --git a/.github/workflows/on-comment.yaml b/.github/workflows/on-comment.yaml
@@ -47,7 +47,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0
+        uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/on-pr-update.yaml b/.github/workflows/on-pr-update.yaml
@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0
+        uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/on-pr.yaml b/.github/workflows/on-pr.yaml
@@ -28,7 +28,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0
+        uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/zxc-build-library.yaml b/.github/workflows/zxc-build-library.yaml
@@ -49,15 +49,15 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0
+        uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
         with:
           egress-policy: audit
 
       - name: Checkout Code
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Run Clang-Format
-        uses: jidicula/clang-format-action@6cd220de46c89139a0365edae93eee8eb30ca8fe # v4.16.0
+        uses: jidicula/clang-format-action@3a18028048f01a66653b4e3bf8d968d2e7e2cb8b # v4.17.0
         with:
           clang-format-version: "17"
           check-path: ${{ matrix.check-path }}
@@ -76,7 +76,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0
+        uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
         with:
           egress-policy: audit
 
@@ -127,7 +127,7 @@ jobs:
           submodules: true
 
       - name: Use Node.js 22
-        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+        uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
         with:
           node-version: 22
 
@@ -223,7 +223,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0
+        uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
         with:
           egress-policy: audit
 
@@ -284,7 +284,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0
+        uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/zxc-test-bot-scripts.yaml b/.github/workflows/zxc-test-bot-scripts.yaml
@@ -28,15 +28,15 @@ jobs:
     runs-on: hiero-client-sdk-linux-large
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0
+        uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
         with:
           egress-policy: audit
 
       - name: Checkout Repository
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Setup Node.js
-        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+        uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
         with:
           node-version: "20"
 
diff --git a/src/sdk/examples/AccountAllowanceSerializedExample.cpp b/src/sdk/examples/AccountAllowanceSerializedExample.cpp
@@ -21,7 +21,7 @@
  * - Attempt to exceed the remaining (1 Hbar) allowance (sending 2 Hbar) to demonstrate ledger enforcement.
  * - Modify the allowance to 3 Hbar and successfully re-attempt the (2 Hbar) transfer.
  * - Query account balances to verify the flow of funds.
- * - Clean up the ledger by resetting the allowance and deleting all generated accounts. *
+ * - Clean up the ledger by resetting the allowance and deleting all generated accounts. 
  *
  * This example highlights how transactions can be transported or stored
  * as raw bytes, reconstructed later, and still maintain correctness
diff --git a/src/sdk/main/include/Client.h b/src/sdk/main/include/Client.h
@@ -349,6 +349,24 @@ class Client
    */
   [[nodiscard]] bool isAutoValidateChecksumsEnabled() const;
 
+  /**
+   * Set whether receipt and record queries may fail over to other nodes when the submitting node is unavailable.
+   * When enabled, queries still start with the submitting node and advance
+   * to other eligible nodes in deterministic order only on failure. When
+   * disabled (default), strict single-node pinning is preserved.
+   *
+   * @param allow \c true to allow receipt/record query failover to other nodes.
+   * @return A reference to this Client with the newly-set failover policy.
+   */
+  Client& setAllowReceiptNodeFailover(bool allow);
+
+  /**
+   * Is receipt/record query node failover allowed for this Client?
+   *
+   * @return \c TRUE if node failover is allowed for receipt/record queries, otherwise \c FALSE.
+   */
+  [[nodiscard]] bool getAllowReceiptNodeFailover() const;
+
   /**
    * Replace the network being used by this Client with nodes contained in an address book.
    *
diff --git a/src/sdk/main/include/Transaction.h b/src/sdk/main/include/Transaction.h
@@ -162,6 +162,23 @@ class Transaction
   [[nodiscard]] virtual std::map<AccountId, std::map<std::shared_ptr<PublicKey>, std::vector<std::byte>>>
   getSignatures() const;
 
+  /**
+   * This method removes all signatures from the transaction based on the public key provided.
+   *
+   * @param publicKey The public key associated with the signature to remove.
+   * @return The removed signatures.
+   * @throws IllegalStateException if transaction is not frozen or the given key didn't sign it off.
+   */
+  std::vector<std::vector<std::byte>> removeSignature(const std::shared_ptr<PublicKey>& publicKey);
+
+  /**
+   * Remove all signatures from the transaction.
+   *
+   * @return The removed signatures grouped by their associated public key.
+   * @throws IllegalStateException if the transaction is not frozen.
+   */
+  std::map<std::shared_ptr<PublicKey>, std::vector<std::vector<std::byte>>> removeAllSignatures();
+
   /**
    * Freeze this Transaction.
    *
@@ -575,4 +592,4 @@ class Transaction
 
 } // namespace Hiero
 
-#endif // HIERO_SDK_CPP_TRANSACTION_H_
+#endif // HIERO_SDK_CPP_TRANSACTION_H_
diff --git a/src/sdk/main/include/TransactionResponse.h b/src/sdk/main/include/TransactionResponse.h
@@ -40,8 +40,12 @@ class TransactionResponse
    * @param nodeId The ID of the node account to which this TransactionResponse's corresponding Transaction was sent.
    * @param transactionId The ID of this TransactionResponse's corresponding Transaction.
    * @param hash The hash of this TransactionResponse's corresponding Transaction.
+   * @param transactionNodeAccountIds The list of node account IDs configured on the transaction at execution time.
    */
-  TransactionResponse(AccountId nodeId, TransactionId transactionId, std::vector<std::byte> hash);
+  TransactionResponse(AccountId nodeId,
+                      TransactionId transactionId,
+                      std::vector<std::byte> hash,
+                      std::vector<AccountId> transactionNodeAccountIds = {});
 
   /**
    * Get a TransactionReceipt for this TransactionResponse's corresponding Transaction.
@@ -74,10 +78,16 @@ class TransactionResponse
 
   /**
    * Construct a TransactionReceiptQuery for this TransactionResponse's corresponding Transaction.
+   * When a non-null Client is provided and its failover flag is
+   * enabled, the query will target the submitting node first, then
+   * other eligible nodes in deterministic order.
    *
+   * @param client Optional pointer to the Client. When null or
+   * failover is disabled, the query is pinned to the submitting
+   * node only.
    * @return The constructed TransactionReceiptQuery.
    */
-  [[nodiscard]] TransactionReceiptQuery getReceiptQuery() const;
+  [[nodiscard]] TransactionReceiptQuery getReceiptQuery(const Client* client = nullptr) const;
 
   /**
    * Get a TransactionReceipt for this TransactionResponse's corresponding Transaction asynchronously.
@@ -214,10 +224,14 @@ class TransactionResponse
 
   /**
    * Construct a TransactionRecordQuery for this TransactionResponse's corresponding Transaction.
+   * When a non-null Client is provided and its failover flag is enabled, the query will target
+   * the submitting node first, then other eligible nodes in deterministic order.
    *
+   * @param client Optional pointer to the Client. When null or failover is disabled, the query is
+   *               pinned to the submitting node only.
    * @return The constructed TransactionRecordQuery.
    */
-  [[nodiscard]] TransactionRecordQuery getRecordQuery() const;
+  [[nodiscard]] TransactionRecordQuery getRecordQuery(const Client* client = nullptr) const;
 
   /**
    * Get a TransactionRecord for this TransactionResponse's corresponding Transaction asynchronously.
@@ -374,6 +388,20 @@ class TransactionResponse
   TransactionId mTransactionId;
 
 private:
+  /**
+   * Build a deduplicated, deterministically sorted failover node list starting with the submitting
+   * node, using either the transaction's own node IDs or the client's network nodes as candidates.
+   *
+   * @param client The Client whose network is used when transaction node IDs are unavailable.
+   * @return An ordered vector of AccountId values for query node targeting.
+   */
+  [[nodiscard]] std::vector<AccountId> buildFailoverNodeList(const Client& client) const;
+
+  /**
+   * The node account IDs that were configured on the transaction during execution.
+   */
+  std::vector<AccountId> mTransactionNodeAccountIds;
+
   /**
    * Did this TransactionResponse's corresponding Transaction have a successful pre-check?
    */
diff --git a/src/sdk/main/src/Client.cc b/src/sdk/main/src/Client.cc
@@ -96,6 +96,11 @@ struct Client::ClientImpl
   // Should this Client automatically validate entity checksums?
   bool mAutoValidateChecksums = false;
 
+  // Should this Client allow receipt/record queries to fail over to other nodes when the submitting
+  // node is unavailable? When true, queries start with the submitting node and advance to others on
+  // failure. Defaults to false (strict single-node pinning).
+  bool mAllowReceiptNodeFailover = false;
+
   // Has this Client made its initial network update? This is utilized in case
   // the user updates the network update period before the initial update is
   // made, as it prevents the update period from being overwritten.
@@ -671,6 +676,21 @@ bool Client::isAutoValidateChecksumsEnabled() const
   return mImpl->mAutoValidateChecksums;
 }
 
+//-----
+Client& Client::setAllowReceiptNodeFailover(bool allow)
+{
+  std::unique_lock lock(mImpl->mMutex);
+  mImpl->mAllowReceiptNodeFailover = allow;
+  return *this;
+}
+
+//-----
+bool Client::getAllowReceiptNodeFailover() const
+{
+  std::unique_lock lock(mImpl->mMutex);
+  return mImpl->mAllowReceiptNodeFailover;
+}
+
 //-----
 Client& Client::setNetworkFromAddressBook(const NodeAddressBook& addressBook)
 {
diff --git a/src/sdk/main/src/Transaction.cc b/src/sdk/main/src/Transaction.cc
diff --git a/src/sdk/main/src/TransactionResponse.cc b/src/sdk/main/src/TransactionResponse.cc
diff --git a/src/sdk/tests/unit/ClientUnitTests.cc b/src/sdk/tests/unit/ClientUnitTests.cc
diff --git a/src/sdk/tests/unit/TransactionResponseUnitTests.cc b/src/sdk/tests/unit/TransactionResponseUnitTests.cc
diff --git a/src/sdk/tests/unit/TransactionUnitTests.cc b/src/sdk/tests/unit/TransactionUnitTests.cc

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`* - Attempt to exceed the remaining (1 Hbar) allowance (sending 2 Hbar) to demonstrate ledger enforcement.`
`22`	`22`	`* - Modify the allowance to 3 Hbar and successfully re-attempt the (2 Hbar) transfer.`
`23`	`23`	`* - Query account balances to verify the flow of funds.`
`24`		`- * - Clean up the ledger by resetting the allowance and deleting all generated accounts. *`
	`24`	`+ * - Clean up the ledger by resetting the allowance and deleting all generated accounts.`
`25`	`25`	`*`
`26`	`26`	`* This example highlights how transactions can be transported or stored`
`27`	`27`	`* as raw bytes, reconstructed later, and still maintain correctness`