Merge pull request #3444 from dusk-network/neotamandua/synchronize_ar…

…chive_block_events

rusk: synchronize archive with consensus

node-data/CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Add PartialEq, Eq to `BlockState` [#3359]
+
+### Removed
+
+- Removed `ArchivalData` together with archive module [#3359]
+
 [1.0.1] - 2025-01-23
 
 ### Changed
@@ -20,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add Types used for interacting with Dusk node 
 
 <!-- Issues -->
+[#3359]: https://github.com/dusk-network/rusk/issues/3359
 [#3405]: https://github.com/dusk-network/rusk/issues/3405
 
 [Unreleased]: https://github.com/dusk-network/rusk/compare/dusk-node-data-1.0.1...HEAD

node-data/src/events/blocks.rs

@@ -19,7 +19,7 @@ use crate::ledger::{Block, Hash};
 ///
 /// - `as_str() -> &'static str` - Returns the string representation of the
 ///   block state.
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub enum BlockState {
     Confirmed,
     Finalized,

node-data/src/ledger/transaction.rs

@@ -71,8 +71,8 @@ impl Transaction {
     /// Computes the transaction ID.
     ///
     /// The transaction ID is a unique identifier for the transaction.
-    /// Unlike the [`hash()`](#method.hash) method, which is computed over the
-    /// entire transaction, the transaction ID is derived from specific
+    /// Unlike the [`digest()`](#method.digest) method, which is computed over
+    /// the entire transaction, the transaction ID is derived from specific
     /// fields of the transaction and serves as a unique identifier of the
     /// transaction itself.
     ///

node-data/src/lib.rs

@@ -7,7 +7,6 @@
 #![deny(unused_crate_dependencies)]
 #![deny(unused_extern_crates)]
 
-pub mod archive;
 pub mod bls;
 pub mod encoding;
 pub mod events;

node/CHANGELOG.md

@@ -7,10 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Change the way the archive synchronizes with the node Acceptor [#3359]
+
 ### Changed
 
 - Change deprecated `tempdir` with `tempfile` dependency [#3407]
 
+### Removed
+
+- Removed ArchivistSrv & archivist module [#3359]
+
 ## [1.0.1] - 2025-01-23
 
 ### Changed
@@ -22,6 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - First `dusk-node` release
 
 <!-- Issues -->
+[#3359]: https://github.com/dusk-network/rusk/issues/3359
 [#3407]: https://github.com/dusk-network/rusk/issues/3407
 [#3405]: https://github.com/dusk-network/rusk/issues/3405
 

node/src/archive.rs

@@ -12,12 +12,10 @@ use rocksdb::OptimisticTransactionDB;
 use sqlx::sqlite::SqlitePool;
 use tracing::debug;
 
-mod archivist;
 mod moonlight;
 mod sqlite;
 mod transformer;
 
-pub use archivist::ArchivistSrv;
 pub use moonlight::{MoonlightGroup, Order};
 
 // Archive folder containing the sqlite database and the moonlight database

node/src/archive/sqlite.rs

@@ -226,7 +226,7 @@ impl Archive {
 impl Archive {
     /// Store the list of **all** unfinalized vm events from the block of the
     /// given height.
-    pub(super) async fn store_unfinalized_events(
+    pub(crate) async fn store_unfinalized_events(
         &self,
         block_height: u64,
         block_hash: Hash,
@@ -276,7 +276,7 @@ impl Archive {
     /// This also triggers the loading of the MoonlightTxEvents into the
     /// moonlight db. This also updates the last finalized block height
     /// attribute.
-    pub(super) async fn finalize_archive_data(
+    pub(crate) async fn finalize_archive_data(
         &mut self,
         current_block_height: u64,
         hex_block_hash: &str,
@@ -375,7 +375,7 @@ impl Archive {
 
     /// Remove the unfinalized block together with the unfinalized events of the
     /// given hash from the archive.
-    pub(super) async fn remove_block_and_events(
+    pub(crate) async fn remove_block_and_events(
         &self,
         current_block_height: u64,
         hex_block_hash: &str,

node/src/chain.rs

@@ -34,6 +34,8 @@ use tracing::{debug, error, info, warn};
 
 use self::acceptor::Acceptor;
 use self::fsm::SimpleFSM;
+#[cfg(feature = "archive")]
+use crate::archive::Archive;
 use crate::database::rocksdb::MD_HASH_KEY;
 use crate::database::{Ledger, Metadata};
 use crate::{database, vm, LongLivedService, Message, Network};
@@ -59,6 +61,8 @@ pub struct ChainSrv<N: Network, DB: database::DB, VM: vm::VMExecution> {
     event_sender: Sender<Event>,
     genesis_timestamp: u64,
     dusk_key: BlsPublicKey,
+    #[cfg(feature = "archive")]
+    archive: Archive,
 }
 
 #[async_trait]
@@ -89,6 +93,8 @@ impl<N: Network, DB: database::DB, VM: vm::VMExecution>
             db,
             network,
             vm,
+            #[cfg(feature = "archive")]
+            self.archive.clone(),
             self.max_consensus_queue_size,
             self.event_sender.clone(),
             self.dusk_key,
@@ -251,6 +257,7 @@ impl<N: Network, DB: database::DB, VM: vm::VMExecution> ChainSrv<N, DB, VM> {
         event_sender: Sender<Event>,
         genesis_timestamp: u64,
         dusk_key: BlsPublicKey,
+        #[cfg(feature = "archive")] archive: Archive,
     ) -> Self {
         info!(
             "ChainSrv::new with keys_path: {}, max_inbound_size: {}",
@@ -265,6 +272,8 @@ impl<N: Network, DB: database::DB, VM: vm::VMExecution> ChainSrv<N, DB, VM> {
             event_sender,
             genesis_timestamp,
             dusk_key,
+            #[cfg(feature = "archive")]
+            archive,
         }
     }