feat: implement changing node account ids

Signed-off-by: venilinvasilev <[email protected]>

Author: venilinvasilev

.github/workflows/flow-rust-ci.yaml

@@ -114,7 +114,6 @@ jobs:
         uses: hiero-ledger/hiero-solo-action@6a1a77601cf3e69661fb6880530a4edf656b40d5 # v0.14.0
         with:
           installMirrorNode: true
-          hieroVersion: v0.65.0
 
       - name: Create env file
         run: |
@@ -129,4 +128,58 @@ jobs:
         run: |
           curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
           . $HOME/.cargo/env
-          cargo test --workspace
+          cargo test --workspace -- --skip node::update
+  dab-tests:
+    needs: ['check']
+    runs-on: hiero-client-sdk-linux-medium
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        with:
+          egress-policy: audit
+
+      - name: Checkout Code
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          submodules: 'recursive'
+
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@6d653acede28d24f02e3cd41383119e8b1b35921 # v1
+        with:
+          toolchain: 1.88.0
+
+      - name: Setup GCC and OpenSSL
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y --no-install-recommends gcc libc6-dev libc-dev libssl-dev pkg-config openssl
+
+      - name: Install Protoc
+        uses: step-security/setup-protoc@f6eb248a6510dbb851209febc1bd7981604a52e3 # v3.0.0
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Setup NodeJS
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+
+      - name: Prepare Hiero Solo for DAB Tests
+        id: solo-dab
+        uses: hiero-ledger/hiero-solo-action@6a1a77601cf3e69661fb6880530a4edf656b40d5 # v0.14.0
+        with:
+          installMirrorNode: true
+
+      - name: Create env file for DAB Tests
+        run: |
+            touch .env
+            echo TEST_OPERATOR_KEY="${{ steps.solo-dab.outputs.privateKey }}" >> .env
+            echo TEST_OPERATOR_ID="${{ steps.solo-dab.outputs.accountId }}" >> .env
+            echo TEST_NETWORK_NAME="localhost" >> .env
+            echo TEST_RUN_NONFREE="1" >> .env
+            cat .env
+
+      - name: Run DAB Tests
+        run: |
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+          . $HOME/.cargo/env
+          cargo test --test e2e node::update -- --nocapture

src/client/mod.rs

@@ -637,6 +637,23 @@ impl Client {
         });
     }
 
+    /// Triggers an immediate network update from the address book.
+    /// Note: This method is not part of the public API and may be changed or removed in future versions.
+    pub(crate) async fn update_network_now(&self) {
+        match NodeAddressBookQuery::new()
+            .execute_mirrornet(self.mirrornet().load().channel(), None)
+            .await
+        {
+            Ok(address_book) => {
+                log::info!("Successfully updated network address book");
+                self.set_network_from_address_book(address_book);
+            }
+            Err(e) => {
+                log::warn!("Failed to update network address book: {e:?}");
+            }
+        }
+    }
+
     /// Returns the Account ID for the operator.
     #[must_use]
     pub fn get_operator_account_id(&self) -> Option<AccountId> {

src/client/network/mod.rs

@@ -377,7 +377,7 @@ impl NetworkData {
             node_ids = self.node_ids.to_vec();
         }
 
-        let node_sample_amount = (node_ids.len() + 2) / 3;
+        let node_sample_amount = node_ids.len();
 
         let node_id_indecies =
             rand::seq::index::sample(&mut thread_rng(), node_ids.len(), node_sample_amount);

src/execute.rs

@@ -127,14 +127,16 @@ pub(crate) trait Execute: ValidateChecksums {
     fn response_pre_check_status(response: &Self::GrpcResponse) -> crate::Result<i32>;
 }
 
-struct ExecuteContext {
+struct ExecuteContext<'a> {
     // When `Some` the `transaction_id` will be regenerated when expired.
     operator_account_id: Option<AccountId>,
     network: Arc<NetworkData>,
     backoff_config: ExponentialBackoff,
     max_attempts: usize,
     // timeout for a single grpc request.
     grpc_timeout: Option<Duration>,
+    // Reference to the client for triggering network updates
+    client: &'a Client,
 }
 
 pub(crate) async fn execute<E>(
@@ -187,24 +189,29 @@ where
             operator_account_id,
             network: client.net().0.load_full(),
             grpc_timeout: backoff.grpc_timeout,
+            client,
         },
         executable,
     )
     .await
 }
 
-async fn execute_inner<E>(ctx: &ExecuteContext, executable: &E) -> crate::Result<E::Response>
+async fn execute_inner<'a, E>(
+    ctx: &ExecuteContext<'a>,
+    executable: &E,
+) -> crate::Result<E::Response>
 where
     E: Execute + Sync,
 {
-    fn recurse_ping(ctx: &ExecuteContext, index: usize) -> BoxFuture<'_, bool> {
+    fn recurse_ping<'a, 'b: 'a>(ctx: &'b ExecuteContext<'a>, index: usize) -> BoxFuture<'b, bool> {
         Box::pin(async move {
             let ctx = ExecuteContext {
                 operator_account_id: None,
                 network: Arc::clone(&ctx.network),
                 backoff_config: ctx.backoff_config.clone(),
                 max_attempts: ctx.max_attempts,
                 grpc_timeout: ctx.grpc_timeout,
+                client: ctx.client,
             };
             let ping_query = PingQuery::new(ctx.network.node_ids()[index]);
 
@@ -350,8 +357,8 @@ fn map_tonic_error(
     }
 }
 
-async fn execute_single<E: Execute + Sync>(
-    ctx: &ExecuteContext,
+async fn execute_single<'a, E: Execute + Sync>(
+    ctx: &ExecuteContext<'a>,
     executable: &E,
     node_index: usize,
     transaction_id: &mut Option<TransactionId>,
@@ -449,6 +456,26 @@ async fn execute_single<E: Execute + Sync>(
             )))
         }
 
+        Status::InvalidNodeAccountId => {
+            // The node account is invalid or doesn't match the submitted node
+            // Mark the node as unhealthy and retry with backoff
+            // This typically indicates the address book is out of date
+            ctx.network.mark_node_unhealthy(node_index);
+
+            log::warn!(
+                "Node at index {node_index} / node id {node_account_id} returned {status:?}, marking unhealthy. Updating address book before retry."
+            );
+
+            // Update the network address book before retrying
+            ctx.client.update_network_now().await;
+
+            Err(retry::Error::Transient(executable.make_error_pre_check(
+                status,
+                transaction_id.as_ref(),
+                response,
+            )))
+        }
+
         _ if executable.should_retry_pre_check(status) => {
             // conditional retry on pre-check should back-off and try again
             Err(retry::Error::Transient(executable.make_error_pre_check(

tests/e2e/common/mod.rs

@@ -193,3 +193,39 @@ pub(crate) fn setup_nonfree() -> Option<TestEnvironment> {
         }
     }
 }
+
+/// Setup test environment for non-free tests with local 2-node network.
+/// Specifically configured for node update tests with:
+/// - Node 0.0.3 at 127.0.0.1:50211
+/// - Node 0.0.4 at 127.0.0.1:51211
+/// - Mirror network at 127.0.0.1:5600
+/// Returns None if TEST_RUN_NONFREE is not set or not on local network.
+pub(crate) fn setup_nonfree_local_two_nodes() -> Option<TestEnvironment> {
+    let _ = dotenvy::dotenv();
+    let _ = env_logger::builder().parse_default_env().is_test(true).try_init();
+
+    let config = &*CONFIG;
+
+    if !config.run_nonfree_tests {
+        log::debug!("skipping non-free test");
+        return None;
+    }
+
+    if !config.is_local {
+        log::debug!("skipping test, only runs on local network");
+        return None;
+    }
+
+    let mut network = HashMap::new();
+    network.insert("127.0.0.1:50211".to_string(), AccountId::new(0, 0, 3));
+    network.insert("127.0.0.1:51211".to_string(), AccountId::new(0, 0, 4));
+
+    let client = Client::for_network(network).unwrap();
+    client.set_mirror_network(vec!["127.0.0.1:5600".to_string()]);
+
+    if let Some(op) = &config.operator {
+        client.set_operator(op.account_id, op.private_key.clone());
+    }
+
+    Some(TestEnvironment { config, client })
+}

tests/e2e/main.rs

@@ -8,6 +8,7 @@ mod ethereum_transaction;
 mod fee_schedules;
 mod file;
 mod network_version_info;
+mod node;
 mod node_address_book;
 mod prng;
 /// Resources for various tests.

tests/e2e/node/mod.rs

@@ -0,0 +1 @@
+mod update;