Merge pull request #259 from everx-labs/smft_update

More fixes for SMFT
everx-labs · Jul 21, 2024 · eb07453 · eb07453
2 parents 6263baf + 7dfe575
commit eb07453
Show file tree

Hide file tree

Showing 6 changed files with 234 additions and 72 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
+## Version 0.59.10
+
+- SMFT fixes:
+1) lifetime and sync time of smft status block are separated: status lives much more than synced to avoid empty blocks syncs after deletion;
+2) messages size dump was added 
+3) broadcast hops is set to 3
+
 ## Version 0.59.9
 
 - CapUndeletableAccounts supported

diff --git a/Cargo.toml b/Cargo.toml
@@ -2,7 +2,7 @@
 build = 'common/build/build.rs'
 edition = '2021'
 name = 'ever-node'
-version = '0.59.9'
+version = '0.59.10'
 
 [workspace]
 members = [ 'storage' ]

diff --git a/src/network/catchain_client.rs b/src/network/catchain_client.rs
@@ -527,7 +527,7 @@ impl CatchainOverlay for CatchainClient {
                     Some(&local_validator_key),
                     false
                 ).await;
-                log::trace!(target: Self::TARGET, "send_broadcast_fec_ex status: {:?}", result);
+                log::debug!(target: Self::TARGET, "send_broadcast_fec_ex status: {:?}", result);
             }
         );
     }

diff --git a/src/validator/verification/verification_manager.rs b/src/validator/verification/verification_manager.rs
@@ -58,7 +58,7 @@ pub struct VerificationManagerImpl {
     workchains: Arc<SpinMutex<WorkchainMapPtr>>,                       //map of workchains
     should_stop_flag: Arc<AtomicBool>,                                 //flag to indicate manager should be stopped
     dump_thread_is_stopped_flag: Arc<AtomicBool>,                      //flag to indicate dump thread is stopped
-    metrics_receiver: MetricsHandle,                                   //metrics receiver
+    _metrics_receiver: MetricsHandle,                                  //metrics receiver
     blocks_instance_counter: Arc<InstanceCounter>,                     //instance counter for blocks
     workchains_instance_counter: Arc<InstanceCounter>,                 //instance counter for workchains
     wc_overlays_instance_counter: Arc<InstanceCounter>,                //instance counter for workchains WC overlays
@@ -248,7 +248,6 @@ impl VerificationManager for VerificationManagerImpl {
             &workchain_validators,
             mc_validators,
             listener,
-            self.metrics_receiver.clone(),
             self.workchains_instance_counter.clone(),
             self.blocks_instance_counter.clone(),
             self.wc_overlays_instance_counter.clone(),
@@ -309,7 +308,6 @@ impl VerificationManagerImpl {
         wc_validators: &Vec<ValidatorDescr>,
         mc_validators: &Vec<ValidatorDescr>,
         listener: &VerificationListenerPtr,
-        metrics_receiver: MetricsHandle,
         workchains_instance_counter: Arc<InstanceCounter>,
         blocks_instance_counter: Arc<InstanceCounter>,
         wc_overlays_instance_counter: Arc<InstanceCounter>,
@@ -340,7 +338,6 @@ impl VerificationManagerImpl {
             local_key_id,
             local_bls_key,
             listener.clone(),
-            metrics_receiver,
             workchains_instance_counter,
             blocks_instance_counter,
             wc_overlays_instance_counter,
@@ -442,7 +439,7 @@ impl VerificationManagerImpl {
 
                     *updated_loop_idx = loop_idx;
 
-                    workchain_metrics_dumper.update(&metrics_receiver);
+                    workchain_metrics_dumper.update(&workchain.get_metrics_receiver());
 
                     workchain_metrics_dumper.dump(|string| {
                         debug!(target: "verificator", "{}", string);
@@ -501,7 +498,7 @@ impl VerificationManagerImpl {
             engine,
             runtime,
             workchains: workchains.clone(),
-            metrics_receiver: metrics_receiver.clone(),
+            _metrics_receiver: metrics_receiver.clone(),
             send_new_block_candidate_counter: metrics_receiver.sink().register_counter(&"smft_candidates".into()),
             update_workchains_counter: metrics_receiver.sink().register_counter(&"smft_workchains_updates".into()),
             blocks_instance_counter: Arc::new(InstanceCounter::new(&metrics_receiver, &"smft_block".to_string())),