2024 Rust

Cargo.toml

@@ -111,15 +111,15 @@ bytes                 = { version = "1", default-features = false }
 cfg-if                = { version = "1", default-features = false }
 clap                  = { version = "4", default-features = false }
 chrono                = { version = "0.4", default-features = false }
-crypto-bigint         = { version = "0.5", default-features = false }
+crypto-bigint         = { version = "0.6", default-features = false }
 crossbeam             = { version = "0.8", default-features = false }
 const_format          = { version = "0.2", default-features = false }
 curve25519-dalek      = { version = "4", default-features = false }
 dashmap               = { version = "6", default-features = false }
-dirs                  = { version = "5", default-features = false }
+dirs                  = { version = "6", default-features = false }
 futures               = { version = "0.3", default-features = false }
 hex                   = { version = "0.4", default-features = false }
-hex-literal           = { version = "0.4", default-features = false }
+hex-literal           = { version = "1", default-features = false }
 indexmap              = { version = "2", default-features = false }
 monero-serai          = { git = "https://github.com/Cuprate/serai.git", rev = "e6ae8c2", default-features = false }
 nu-ansi-term          = { version = "0.46", default-features = false }
@@ -132,8 +132,8 @@ rayon                 = { version = "1", default-features = false }
 serde_bytes           = { version = "0.11", default-features = false }
 serde_json            = { version = "1", default-features = false }
 serde                 = { version = "1", default-features = false }
-strum                 = { version = "0.26", default-features = false }
-thiserror             = { version = "1", default-features = false }
+strum                 = { version = "0.27", default-features = false }
+thiserror             = { version = "2", default-features = false }
 thread_local          = { version = "1", default-features = false }
 tokio-util            = { version = "0.7", default-features = false }
 tokio-stream          = { version = "0.1", default-features = false }

binaries/cuprated/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "cuprated"
 version = "0.0.1"
-edition = "2021"
+edition = "2024"
 description = "The Cuprate Rust Monero node."
 license = "AGPL-3.0-only"
 authors = ["Boog900", "hinto-janai", "SyntheticBird45"]

binaries/cuprated/src/blockchain.rs

@@ -4,27 +4,29 @@
 use std::sync::Arc;
 
 use futures::FutureExt;
-use tokio::sync::{mpsc, Notify};
+use tokio::sync::{Notify, mpsc};
 use tower::{BoxError, Service, ServiceExt};
 
 use cuprate_blockchain::service::{BlockchainReadHandle, BlockchainWriteHandle};
-use cuprate_consensus::{generate_genesis_block, BlockchainContextService, ContextConfig};
+use cuprate_consensus::{BlockchainContextService, ContextConfig, generate_genesis_block};
 use cuprate_cryptonight::cryptonight_hash_v0;
-use cuprate_p2p::{block_downloader::BlockDownloaderConfig, NetworkInterface};
+use cuprate_p2p::{NetworkInterface, block_downloader::BlockDownloaderConfig};
 use cuprate_p2p_core::{ClearNet, Network};
 use cuprate_types::{
-    blockchain::{BlockchainReadRequest, BlockchainWriteRequest},
     VerifiedBlockInformation,
+    blockchain::{BlockchainReadRequest, BlockchainWriteRequest},
 };
 
 use crate::constants::PANIC_CRITICAL_SERVICE_ERROR;
 
 mod chain_service;
+mod fast_sync;
 pub mod interface;
 mod manager;
 mod syncer;
 mod types;
 
+pub use fast_sync::set_fast_sync_hashes;
 pub use manager::init_blockchain_manager;
 pub use types::ConsensusBlockchainReadHandle;
 

binaries/cuprated/src/blockchain/chain_service.rs

@@ -1,10 +1,12 @@
 use std::task::{Context, Poll};
 
-use futures::{future::BoxFuture, FutureExt, TryFutureExt};
+use futures::{FutureExt, TryFutureExt, future::BoxFuture};
 use tower::Service;
 
 use cuprate_blockchain::service::BlockchainReadHandle;
+use cuprate_fast_sync::validate_entries;
 use cuprate_p2p::block_downloader::{ChainSvcRequest, ChainSvcResponse};
+use cuprate_p2p_core::NetworkZone;
 use cuprate_types::blockchain::{BlockchainReadRequest, BlockchainResponse};
 
 /// That service that allows retrieving the chain state to give to the P2P crates, so we can figure out
@@ -14,16 +16,16 @@ use cuprate_types::blockchain::{BlockchainReadRequest, BlockchainResponse};
 #[derive(Clone)]
 pub struct ChainService(pub BlockchainReadHandle);
 
-impl Service<ChainSvcRequest> for ChainService {
-    type Response = ChainSvcResponse;
+impl<N: NetworkZone> Service<ChainSvcRequest<N>> for ChainService {
+    type Response = ChainSvcResponse<N>;
     type Error = tower::BoxError;
     type Future = BoxFuture<'static, Result<Self::Response, Self::Error>>;
 
     fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         self.0.poll_ready(cx).map_err(Into::into)
     }
 
-    fn call(&mut self, req: ChainSvcRequest) -> Self::Future {
+    fn call(&mut self, req: ChainSvcRequest<N>) -> Self::Future {
         let map_res = |res: BlockchainResponse| match res {
             BlockchainResponse::CompactChainHistory {
                 block_ids,
@@ -67,6 +69,18 @@ impl Service<ChainSvcRequest> for ChainService {
                 })
                 .map_err(Into::into)
                 .boxed(),
+            ChainSvcRequest::ValidateEntries(entries, start_height) => {
+                let mut blockchain_read_handle = self.0.clone();
+
+                async move {
+                    let (valid, unknown) =
+                        validate_entries(entries, start_height, &mut blockchain_read_handle)
+                            .await?;
+
+                    Ok(ChainSvcResponse::ValidateEntries { valid, unknown })
+                }
+                .boxed()
+            }
         }
     }
 }

binaries/cuprated/src/blockchain/fast_sync.rs

@@ -0,0 +1,24 @@
+use std::slice;
+
+use cuprate_helper::network::Network;
+
+/// The hashes of the compiled in fast sync file.
+static FAST_SYNC_HASHES: &[[u8; 32]] = unsafe {
+    let bytes = include_bytes!("./fast_sync/fast_sync_hashes.bin");
+
+    #[expect(clippy::manual_assert, reason = "assert is not const")]
+    if bytes.len() % 32 != 0 {
+        panic!()
+    }
+
+    slice::from_raw_parts(bytes.as_ptr().cast::<[u8; 32]>(), bytes.len() / 32)
+};
+
+/// Set the fast-sync hashes according to the provided values.
+pub fn set_fast_sync_hashes(fast_sync: bool, network: Network) {
+    cuprate_fast_sync::set_fast_sync_hashes(if fast_sync && network == Network::Mainnet {
+        FAST_SYNC_HASHES
+    } else {
+        &[]
+    });
+}

binaries/cuprated/src/blockchain/interface.rs

@@ -14,8 +14,8 @@ use tower::{Service, ServiceExt};
 use cuprate_blockchain::service::BlockchainReadHandle;
 use cuprate_consensus::transactions::new_tx_verification_data;
 use cuprate_txpool::service::{
-    interface::{TxpoolReadRequest, TxpoolReadResponse},
     TxpoolReadHandle,
+    interface::{TxpoolReadRequest, TxpoolReadResponse},
 };
 use cuprate_types::blockchain::{BlockchainReadRequest, BlockchainResponse};
 

binaries/cuprated/src/blockchain/manager.rs

@@ -2,7 +2,7 @@ use std::{collections::HashMap, sync::Arc};
 
 use futures::StreamExt;
 use monero_serai::block::Block;
-use tokio::sync::{mpsc, oneshot, Notify};
+use tokio::sync::{Notify, OwnedSemaphorePermit, mpsc, oneshot};
 use tower::{BoxError, Service, ServiceExt};
 use tracing::error;
 
@@ -12,14 +12,14 @@ use cuprate_consensus::{
     ExtendedConsensusError,
 };
 use cuprate_p2p::{
-    block_downloader::{BlockBatch, BlockDownloaderConfig},
     BroadcastSvc, NetworkInterface,
+    block_downloader::{BlockBatch, BlockDownloaderConfig},
 };
 use cuprate_p2p_core::ClearNet;
 use cuprate_txpool::service::TxpoolWriteHandle;
 use cuprate_types::{
-    blockchain::{BlockchainReadRequest, BlockchainResponse},
     Chain, TransactionVerificationData,
+    blockchain::{BlockchainReadRequest, BlockchainResponse},
 };
 
 use crate::{
@@ -106,15 +106,17 @@ impl BlockchainManager {
     /// The [`BlockchainManager`] task.
     pub async fn run(
         mut self,
-        mut block_batch_rx: mpsc::Receiver<BlockBatch>,
+        mut block_batch_rx: mpsc::Receiver<(BlockBatch, Arc<OwnedSemaphorePermit>)>,
         mut command_rx: mpsc::Receiver<BlockchainManagerCommand>,
     ) {
         loop {
             tokio::select! {
-                Some(batch) = block_batch_rx.recv() => {
+                Some((batch, permit)) = block_batch_rx.recv() => {
                     self.handle_incoming_block_batch(
                         batch,
                     ).await;
+
+                    drop(permit);
                 }
                 Some(incoming_command) = command_rx.recv() => {
                     self.handle_command(incoming_command).await;