feat: move node account ID selection to _Executable and update execution flow (#362)

Signed-off-by: Angelina <aceppaluni@gmail.com>

Author: aceppaluni

CHANGELOG.md

@@ -56,8 +56,7 @@ This changelog is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.
 - Added expiration_time, auto_renew_period, auto_renew_account, fee_schedule_key, kyc_key in `TokenCreateTransaction`, `TokenUpdateTransaction` classes
 - Added comprehensive Google-style docstrings to the `CustomFee` class and its methods in `custom_fee.py`.
 - docs: Add `docs/sdk_developers/project_structure.md` to explain repository layout and import paths.
-- Support selecting specific node account ID(s) for queries and transactions (#362)
-- Added `Network._get_node()` method and updated execution flow to use node selection (#362)
+- Support selecting specific node account ID(s) for queries and transactions and added `Network._get_node()` with updated execution flow (#362)
 
 ### Changed
 - chore: bumped solo action from 14.0 to 15.0 (#764)

src/hiero_sdk_python/executable.py

@@ -75,6 +75,26 @@ def __init__(self):
         self._grpc_deadline = DEFAULT_GRPC_DEADLINE
         self.node_account_id = None
 
+        self.node_account_ids: Optional[List[AccountId]] = None
+        self._used_node_account_id: Optional[AccountId] = None
+
+    def set_node_account_ids(self, node_account_ids: List[AccountId]):
+        """Select node account IDs for sending the request."""
+        self.node_account_ids = node_account_ids
+        return self
+
+    def set_node_account_id(self, node_account_id: AccountId):
+        """Convenience wrapper to set a single node account ID."""
+        return self.set_node_account_ids([node_account_id])
+
+    def _select_node_account_id(self) -> Optional[AccountId]:
+        """Pick the first preferred node if available, otherwise None."""
+        if self.node_account_ids:
+            selected = self.node_account_ids[0]
+            self._used_node_account_id = selected
+            return selected
+        return None
+
     @abstractmethod
     def _should_retry(self, response) -> _ExecutionState:
         """
@@ -177,13 +197,15 @@ def _execute(self, client: "Client"):
                 current_backoff *= 2
 
             # Select preferred node if provided, fallback to client's default
-            selected_node_account_id = (
-                self._select_node_account_id()
-                or client.network.current_node._account_id
-            )
-           
-            self.node_account_id = selected_node_account_id
-            node = client.network._get_node(self.node_account_id)
+            selected = self._select_node_account_id()
+
+            if selected is not None: 
+                node = client.network._get_node(selected)
+            else: 
+                node = client.network.current_node
+                
+            #Store for logging and receipts
+            self.node_account_id = node._account_id
 
             # Create a channel wrapper from the client's channel
             channel = node._get_channel()

src/hiero_sdk_python/query/query.py

@@ -382,44 +382,4 @@ def _is_payment_required(self) -> bool:
             bool: True if payment is required, False otherwise
         """
         return True
-    
-    def set_node_account_ids(self, node_account_ids: List[AccountId]): 
-        """
-        Sets the list of node account IDs the query can be sent to.
-
-        Args:
-            node_account_ids (List[AccountId]): The list of node account IDs.
-
-        Returns:
-            Self: Returns self for method chaining.
-        """
-        self.node_account_ids = node_account_ids
-        return self
-        
-    def set_node_account_id(self, node_account_id: AccountId):
-        """
-        Sets a single node account ID the query will be sent to.
-
-        Args:
-            node_account_id (AccountId): The node account ID.
-
-        Returns:
-            Self: Returns self for method chaining.
-        """
-
-        return self.set_node_account_ids([node_account_id])
-    
-    def _select_node_account_id(self) -> Optional[AccountId]:
-        """
-        Internal method to select a node account ID to send the query to.
-        Defaults to the first in the list.
-
-        Returns:
-            Optional[AccountId]: The selected node account ID.
-        """
-        if self.node_account_ids:
-            selected = self.node_account_ids[0]
-            self._used_node_account_id = selected 
-            return selected 
-        return None
 

src/hiero_sdk_python/transaction/transaction.py

@@ -61,9 +61,6 @@ def __init__(self) -> None:
         self._default_transaction_fee = 2_000_000
         self.operator_account_id = None
 
-        self.node_account_ids: Optional[List[AccountId]] = None
-        self._used_node_account_id: Optional[AccountId] = None
-
     def _make_request(self):
         """
         Implements the Executable._make_request method to build the transaction request.