chore: fixed the previous version to match design proposal.

Signed-off-by: Aditya Arya <arya050411@gmail.com>

Author: Adityarya11

src/sdk/main/include/Client.h

@@ -350,42 +350,23 @@ class Client
   [[nodiscard]] bool isAutoValidateChecksumsEnabled() const;
 
   /**
-   * Set whether receipt queries may fail over to other nodes when the submitting node is unavailable.
+   * 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 query failover to other nodes.
-   * @return A reference to this Client with the newly-set receipt failover policy.
+   * @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 query node failover allowed for this Client?
+   * Is receipt/record query node failover allowed for this Client?
    *
-   * @return \c TRUE if node failover is allowed for receipt queries, otherwise \c FALSE.
+   * @return \c TRUE if node failover is allowed for receipt/record queries, otherwise \c FALSE.
    */
   [[nodiscard]] bool getAllowReceiptNodeFailover() const;
 
-  /**
-   * Set whether 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 record query failover to other nodes.
-   * @return A reference to this Client with the newly-set record failover policy.
-   */
-  Client& setAllowRecordNodeFailover(bool allow);
-
-  /**
-   * Is record query node failover allowed for this Client?
-   *
-   * @return \c TRUE if node failover is allowed for record queries, otherwise \c FALSE.
-   */
-  [[nodiscard]] bool getAllowRecordNodeFailover() const;
-
   /**
    * Replace the network being used by this Client with nodes contained in an address book.
    *

src/sdk/main/include/Query.h

@@ -180,15 +180,6 @@ class Query : public Executable<SdkRequestType, proto::Query, proto::Response, S
    */
   [[nodiscard]] bool isCostQuery() const;
 
-  /**
-   * Derived from Executable. Perform any needed actions for this Query when it is being submitted.
-   * Protected so that derived query classes (e.g. TransactionReceiptQuery) can call back into it
-   * after performing their own pre-execution setup.
-   *
-   * @param client The Client being used to submit this Query.
-   */
-  void onExecute(const Client& client) override;
-
 private:
   /**
    * Build a Query protobuf object with this Query's data, with the input QueryHeader protobuf object.
@@ -231,6 +222,13 @@ class Query : public Executable<SdkRequestType, proto::Query, proto::Response, S
    */
   [[nodiscard]] Status mapResponseStatus(const proto::Response& response) const override;
 
+  /**
+   * Derived from Executable. Perform any needed actions for this Query when it is being submitted.
+   *
+   * @param client The Client being used to submit this Query.
+   */
+  void onExecute(const Client& client) override;
+
   /**
    * Derived from Executable. Get the ID of the payment transaction for this Query.
    *

src/sdk/main/include/TransactionReceiptQuery.h

@@ -2,7 +2,6 @@
 #ifndef HIERO_SDK_CPP_TRANSACTION_RECEIPT_QUERY_H_
 #define HIERO_SDK_CPP_TRANSACTION_RECEIPT_QUERY_H_
 
-#include "AccountId.h"
 #include "Query.h"
 #include "TransactionId.h"
 
@@ -75,16 +74,6 @@ class TransactionReceiptQuery : public Query<TransactionReceiptQuery, Transactio
    */
   [[nodiscard]] inline bool getIncludeDuplicates() const { return mIncludeDuplicates; }
 
-  /**
-   * Set the account ID of the node that originally submitted the transaction. When the failover flag
-   * is enabled on the Client, this node will be tried first and others will follow in deterministic
-   * order on failure. When the flag is disabled (default), only this node will be targeted.
-   *
-   * @param nodeId The account ID of the submitting node.
-   * @return A reference to this TransactionReceiptQuery object with the newly-set submitting node ID.
-   */
-  TransactionReceiptQuery& setSubmittingNodeId(const AccountId& nodeId);
-
 private:
   /**
    * Derived from Executable. Construct a TransactionReceipt object from a Response protobuf object.
@@ -156,14 +145,6 @@ class TransactionReceiptQuery : public Query<TransactionReceiptQuery, Transactio
    */
   [[nodiscard]] inline bool isPaymentRequired() const override { return false; }
 
-  /**
-   * Derived from Query. Populate node account IDs based on the submitting node and client failover
-   * settings, then delegate the rest of pre-execution setup to the base Query.
-   *
-   * @param client The Client that will execute this query.
-   */
-  void onExecute(const Client& client) override;
-
   /**
    * The ID of the transaction of which this query should get the receipt.
    */
@@ -178,12 +159,6 @@ class TransactionReceiptQuery : public Query<TransactionReceiptQuery, Transactio
    * Should the receipts of any duplicates transactions be retrieved as well?
    */
   bool mIncludeDuplicates = false;
-
-  /**
-   * The account ID of the node that originally submitted the transaction. Used to implement
-   * submitting-node-first ordering when failover is enabled.
-   */
-  std::optional<AccountId> mSubmittingNodeId;
 };
 
 } // namespace Hiero

src/sdk/main/include/TransactionRecordQuery.h

@@ -2,7 +2,6 @@
 #ifndef HIERO_SDK_CPP_TRANSACTION_RECORD_QUERY_H_
 #define HIERO_SDK_CPP_TRANSACTION_RECORD_QUERY_H_
 
-#include "AccountId.h"
 #include "Query.h"
 #include "TransactionId.h"
 
@@ -77,16 +76,6 @@ class TransactionRecordQuery : public Query<TransactionRecordQuery, TransactionR
    */
   [[nodiscard]] inline bool getIncludeDuplicates() const { return mIncludeDuplicates; }
 
-  /**
-   * Set the account ID of the node that originally submitted the transaction. When the failover flag
-   * is enabled on the Client, this node will be tried first and others will follow in deterministic
-   * order on failure. When the flag is disabled (default), only this node will be targeted.
-   *
-   * @param nodeId The account ID of the submitting node.
-   * @return A reference to this TransactionRecordQuery object with the newly-set submitting node ID.
-   */
-  TransactionRecordQuery& setSubmittingNodeId(const AccountId& nodeId);
-
 private:
   /**
    * Derived from Executable. Construct a TransactionRecord object from a Response protobuf object.
@@ -150,14 +139,6 @@ class TransactionRecordQuery : public Query<TransactionRecordQuery, TransactionR
    */
   [[nodiscard]] proto::ResponseHeader mapResponseHeader(const proto::Response& response) const override;
 
-  /**
-   * Derived from Query. Populate node account IDs based on the submitting node and client failover
-   * settings, then delegate the rest of pre-execution setup to the base Query.
-   *
-   * @param client The Client that will execute this query.
-   */
-  void onExecute(const Client& client) override;
-
   /**
    * The ID of the transaction of which this query should get the record.
    */
@@ -172,12 +153,6 @@ class TransactionRecordQuery : public Query<TransactionRecordQuery, TransactionR
    * Should the records of any duplicates transactions be retrieved as well?
    */
   bool mIncludeDuplicates = false;
-
-  /**
-   * The account ID of the node that originally submitted the transaction. Used to implement
-   * submitting-node-first ordering when failover is enabled.
-   */
-  std::optional<AccountId> mSubmittingNodeId;
 };
 
 } // namespace Hiero

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.
@@ -373,6 +387,11 @@ class TransactionResponse
    */
   TransactionId mTransactionId;
 
+  /**
+   * The node account IDs that were configured on the transaction during execution.
+   */
+  std::vector<AccountId> mTransactionNodeAccountIds;
+
 private:
   /**
    * Did this TransactionResponse's corresponding Transaction have a successful pre-check?

src/sdk/main/src/Client.cc

@@ -96,16 +96,11 @@ struct Client::ClientImpl
   // Should this Client automatically validate entity checksums?
   bool mAutoValidateChecksums = false;
 
-  // Should this Client allow receipt 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
+  // 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;
 
-  // Should this Client allow 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 mAllowRecordNodeFailover = 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.
@@ -696,21 +691,6 @@ bool Client::getAllowReceiptNodeFailover() const
   return mImpl->mAllowReceiptNodeFailover;
 }
 
-//-----
-Client& Client::setAllowRecordNodeFailover(bool allow)
-{
-  std::unique_lock lock(mImpl->mMutex);
-  mImpl->mAllowRecordNodeFailover = allow;
-  return *this;
-}
-
-//-----
-bool Client::getAllowRecordNodeFailover() const
-{
-  std::unique_lock lock(mImpl->mMutex);
-  return mImpl->mAllowRecordNodeFailover;
-}
-
 //-----
 Client& Client::setNetworkFromAddressBook(const NodeAddressBook& addressBook)
 {

src/sdk/main/src/Transaction.cc

@@ -1262,15 +1262,15 @@ TransactionId Transaction<SdkRequestType>::getCurrentTransactionId() const
 template<typename SdkRequestType>
 TransactionResponse Transaction<SdkRequestType>::mapResponse(const proto::TransactionResponse&) const
 {
-  return TransactionResponse(
-    Executable<SdkRequestType, proto::Transaction, proto::TransactionResponse, TransactionResponse>::getNodeAccountIds()
-      .at(mImpl->mTransactionIndex %
-          Executable<SdkRequestType, proto::Transaction, proto::TransactionResponse, TransactionResponse>::
-            getNodeAccountIds()
-              .size()),
-    getCurrentTransactionId(),
-    internal::OpenSSLUtils::computeSHA384(internal::Utilities::stringToByteVector(
-      getTransactionProtobufObject(mImpl->mTransactionIndex).signedtransactionbytes())));
+  const auto& nodeAccountIds =
+    Executable<SdkRequestType, proto::Transaction, proto::TransactionResponse, TransactionResponse>::
+      getNodeAccountIds();
+
+  return TransactionResponse(nodeAccountIds.at(mImpl->mTransactionIndex % nodeAccountIds.size()),
+                             getCurrentTransactionId(),
+                             internal::OpenSSLUtils::computeSHA384(internal::Utilities::stringToByteVector(
+                               getTransactionProtobufObject(mImpl->mTransactionIndex).signedtransactionbytes())),
+                             nodeAccountIds);
 }
 
 //-----

src/sdk/main/src/TransactionReceiptQuery.cc

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
 #include "TransactionReceiptQuery.h"
-#include "Client.h"
 #include "Status.h"
 #include "TransactionReceipt.h"
 #include "impl/Node.h"
@@ -10,9 +9,6 @@
 #include <services/response.pb.h>
 #include <services/transaction_get_receipt.pb.h>
 
-#include <algorithm>
-#include <vector>
-
 namespace Hiero
 {
 //-----
@@ -22,54 +18,6 @@ TransactionReceiptQuery& TransactionReceiptQuery::setTransactionId(const Transac
   return *this;
 }
 
-//-----
-TransactionReceiptQuery& TransactionReceiptQuery::setSubmittingNodeId(const AccountId& nodeId)
-{
-  mSubmittingNodeId = nodeId;
-  return *this;
-}
-
-//-----
-void TransactionReceiptQuery::onExecute(const Client& client)
-{
-  if (getNodeAccountIds().empty() && mSubmittingNodeId.has_value())
-  {
-    if (client.getAllowReceiptNodeFailover())
-    {
-      // node list -> sorted order
-      std::vector<AccountId> otherNodes;
-      for (const auto& [url, accountId] : client.getNetwork())
-      {
-        if (!(accountId == *mSubmittingNodeId))
-        {
-          otherNodes.push_back(accountId);
-        }
-      }
-      std::sort(otherNodes.begin(),
-                otherNodes.end(),
-                [](const AccountId& a, const AccountId& b)
-                {
-                  if (a.mShardNum != b.mShardNum)
-                    return a.mShardNum < b.mShardNum;
-                  if (a.mRealmNum != b.mRealmNum)
-                    return a.mRealmNum < b.mRealmNum;
-                  return a.mAccountNum.value_or(0ULL) < b.mAccountNum.value_or(0ULL);
-                });
-
-      std::vector<AccountId> nodeIds = { *mSubmittingNodeId };
-      nodeIds.insert(nodeIds.end(), otherNodes.begin(), otherNodes.end());
-      setNodeAccountIds(nodeIds);
-    }
-    else
-    {
-      // Default: single node pinning
-      setNodeAccountIds({ *mSubmittingNodeId });
-    }
-  }
-
-  Query<TransactionReceiptQuery, TransactionReceipt>::onExecute(client);
-}
-
 //-----
 TransactionReceiptQuery& TransactionReceiptQuery::setIncludeChildren(bool children)
 {