Merge branch 'development' into comms-peer-manager-signed-peers

* development: feat(consensus)!: add tari script byte size limit check to validation (tari-project#3640) fix: minor improvements to available neighbouring peer search (tari-project#3598) feat: bad block list for invalid blocks after sync (tari-project#3637)
sdbondi · Dec 7, 2021 · 0b11c19 · 0b11c19
2 parents 47f2a22 + 53a5174
commit 0b11c19
Show file tree

Hide file tree

Showing 57 changed files with 1,124 additions and 654 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/applications/tari_base_node/src/builder.rs b/applications/tari_base_node/src/builder.rs
@@ -221,7 +221,7 @@ async fn build_node_context(
     let factories = CryptoFactories::default();
     let randomx_factory = RandomXFactory::new(config.max_randomx_vms);
     let validators = Validators::new(
-        BodyOnlyValidator::default(),
+        BodyOnlyValidator::new(rules.clone()),
         HeaderValidator::new(rules.clone()),
         OrphanBlockValidator::new(
             rules.clone(),

diff --git a/applications/tari_base_node/src/command_handler.rs b/applications/tari_base_node/src/command_handler.rs
@@ -494,6 +494,7 @@ impl CommandHandler {
                                 s.push(format!(
                                     "LAST_SEEN = {}",
                                     Utc::now()
+                                        .naive_utc()
                                         .signed_duration_since(dt)
                                         .to_std()
                                         .map(format_duration_basic)

diff --git a/applications/tari_base_node/src/recovery.rs b/applications/tari_base_node/src/recovery.rs
@@ -98,7 +98,7 @@ pub async fn run_recovery(node_config: &GlobalConfig) -> Result<(), anyhow::Erro
     let factories = CryptoFactories::default();
     let randomx_factory = RandomXFactory::new(node_config.max_randomx_vms);
     let validators = Validators::new(
-        BodyOnlyValidator::default(),
+        BodyOnlyValidator::new(rules.clone()),
         HeaderValidator::new(rules.clone()),
         OrphanBlockValidator::new(
             rules.clone(),

diff --git a/base_layer/core/src/base_node/state_machine_service/states/horizon_state_sync/error.rs b/base_layer/core/src/base_node/state_machine_service/states/horizon_state_sync/error.rs
@@ -70,6 +70,8 @@ pub enum HorizonSyncError {
     MerkleMountainRangeError(#[from] MerkleMountainRangeError),
     #[error("Connectivity error: {0}")]
     ConnectivityError(#[from] ConnectivityError),
+    #[error("Validation error: {0}")]
+    ValidationError(#[from] ValidationError),
 }
 
 impl From<TryFromIntError> for HorizonSyncError {

diff --git a/...ase_node/state_machine_service/states/horizon_state_sync/horizon_state_synchronization.rs b/...ase_node/state_machine_service/states/horizon_state_sync/horizon_state_synchronization.rs
@@ -43,6 +43,7 @@ use crate::{
         transaction_kernel::TransactionKernel,
         transaction_output::TransactionOutput,
     },
+    validation::helpers,
 };
 use croaring::Bitmap;
 use futures::{stream::FuturesUnordered, StreamExt};
@@ -374,6 +375,11 @@ impl<'a, B: BlockchainBackend + 'static> HorizonStateSynchronization<'a, B> {
 
         let mut output_mmr = MerkleMountainRange::<HashDigest, _>::new(output_pruned_set);
         let mut witness_mmr = MerkleMountainRange::<HashDigest, _>::new(witness_pruned_set);
+        let mut constants = self
+            .shared
+            .consensus_rules
+            .consensus_constants(current_header.height())
+            .clone();
 
         while let Some(response) = output_stream.next().await {
             let res: SyncUtxosResponse = response?;
@@ -401,6 +407,7 @@ impl<'a, B: BlockchainBackend + 'static> HorizonStateSynchronization<'a, B> {
                     );
                     height_utxo_counter += 1;
                     let output = TransactionOutput::try_from(output).map_err(HorizonSyncError::ConversionError)?;
+                    helpers::check_tari_script_byte_size(&output.script, constants.get_max_script_byte_size())?;
                     unpruned_outputs.push(output.clone());
 
                     output_mmr.push(output.hash())?;
@@ -535,6 +542,11 @@ impl<'a, B: BlockchainBackend + 'static> HorizonStateSynchronization<'a, B> {
                         break;
                     } else {
                         current_header = db.fetch_chain_header(current_header.height() + 1).await?;
+                        constants = self
+                            .shared
+                            .consensus_rules
+                            .consensus_constants(current_header.height())
+                            .clone();
                         debug!(
                             target: LOG_TARGET,
                             "Expecting to receive the next UTXO set {}-{} for header #{}",