Merge pull request #3128 from dusk-network/blocks_tip

rusk: add `last_block_pair` to non archival nodes
dusk-network · Dec 11, 2024 · 8b055ae · 8b055ae
2 parents b9606d8 + 877ee8a
commit 8b055ae
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 23 deletions.
diff --git a/node/src/chain/acceptor.rs b/node/src/chain/acceptor.rs
@@ -1146,7 +1146,7 @@ impl<DB: database::DB, VM: vm::VMExecution, N: Network> Acceptor<N, DB, VM> {
         let final_block = self.db.read().await.view(|v| {
             let prev_height = tip.inner().header().height - 1;
 
-            for height in (0..prev_height).rev() {
+            for height in (0..=prev_height).rev() {
                 if let Ok(Some((hash, Label::Final(_)))) =
                     v.block_label_by_height(height)
                 {

diff --git a/rusk/src/lib/http/chain/graphql.rs b/rusk/src/lib/http/chain/graphql.rs
@@ -15,9 +15,11 @@ use data::*;
 use tx::*;
 
 use async_graphql::{Context, FieldError, FieldResult, Object};
-use execution_core::{transfer::TRANSFER_CONTRACT, ContractId};
+use execution_core::transfer::TRANSFER_CONTRACT;
+use execution_core::ContractId;
 use node::database::rocksdb::Backend;
 use node::database::{Ledger, DB};
+use node_data::ledger::Label;
 #[cfg(feature = "archive")]
 use {
     archive::data::deserialized_archive_data::DeserializedMoonlightGroups,
@@ -145,6 +147,39 @@ impl Query {
         mempool_by_hash(ctx, hash).await
     }
 
+    /// Get a pair of two tuples containing the height and hash of the last
+    /// block and the last finalized block.
+    async fn last_block_pair(
+        &self,
+        ctx: &Context<'_>,
+    ) -> FieldResult<BlockPair> {
+        let tip = last_block(ctx).await?;
+        let tip_height = tip.header().height;
+        let last_finalized_block =
+            ctx.data::<DBContext>()?.0.read().await.view(|v| {
+                // Start from the tip to check if it is final
+                for height in (0..=tip_height).rev() {
+                    if let Ok(Some((hash, Label::Final(_)))) =
+                        v.block_label_by_height(height)
+                    {
+                        let hash = hex::encode(hash);
+                        return Ok((height, hash));
+                    }
+                }
+
+                Err(anyhow::anyhow!(
+                    "could not fetch the last final block by height"
+                ))
+            })?;
+
+        let last_block = (tip_height, hex::encode(tip.header().hash));
+
+        Ok(BlockPair {
+            last_block,
+            last_finalized_block,
+        })
+    }
+
     #[cfg(feature = "archive")]
     async fn full_moonlight_history(
         &self,
@@ -230,25 +265,4 @@ impl Query {
             check_block(ctx, height, hash).await
         }
     }
-
-    /// Get a pair of two tuples containing the height and hash of the last
-    /// block and the last finalized block.
-    #[cfg(feature = "archive")]
-    async fn last_block_pair(
-        &self,
-        ctx: &Context<'_>,
-    ) -> FieldResult<BlockPair> {
-        let last_block = last_block(ctx).await?;
-        let (blk_height, blk_hash) = (
-            last_block.header().height,
-            hex::encode(last_block.header().hash),
-        );
-
-        let last_finalized_block = last_finalized_block(ctx).await?;
-
-        Ok(BlockPair {
-            last_block: (blk_height, blk_hash),
-            last_finalized_block,
-        })
-    }
 }