Harden block handler (Versioning)

massa-bootstrap/Cargo.toml

@@ -43,6 +43,7 @@ bitvec = { version = "1.0", features = ["serde"] }
 lazy_static = "1.4"
 tempfile = "3.3"
 serial_test = "2.0.0"
+num = "0.4"
 massa_final_state = { path = "../massa-final-state", features = ["testing"] }
 massa_async_pool = { path = "../massa-async-pool", features = ["testing"] }
 massa_ledger_exports = { path = "../massa-ledger-exports" }

massa-bootstrap/src/tests/tools.rs

@@ -58,6 +58,7 @@ use massa_serialization::{DeserializeError, Deserializer, Serializer};
 use massa_signature::KeyPair;
 use massa_time::MassaTime;
 use massa_versioning::versioning::{MipStatsConfig, MipStore};
+use num::rational::Ratio;
 use rand::Rng;
 use std::collections::{HashMap, HashSet};
 use std::str::FromStr;
@@ -338,6 +339,7 @@ pub fn get_random_final_state_bootstrap(
         [],
         MipStatsConfig {
             block_count_considered: 10,
+            warn_announced_version_ratio: Ratio::new_raw(30, 100),
         },
     ))
     .unwrap();
@@ -453,7 +455,7 @@ pub fn get_boot_state() -> BootstrapableGraph {
             header: BlockHeader::new_verifiable(
                 BlockHeader {
                     current_version: 0,
-                    announced_version: 0,
+                    announced_version: None,
                     // associated slot
                     // all header endorsements are supposed to point towards this one
                     slot: Slot::new(1, 0),

massa-consensus-exports/src/export_active_block.rs

@@ -175,7 +175,7 @@ impl Deserializer<ExportActiveBlock> for ExportActiveBlockDeserializer {
     /// let orig_header = BlockHeader::new_verifiable(
     ///     BlockHeader {
     ///         current_version: 0,
-    ///         announced_version: 0,
+    ///         announced_version: None,
     ///         slot: Slot::new(1, 1),
     ///         parents,
     ///         operation_merkle_root: Hash::compute_from("mno".as_bytes()),

massa-consensus-worker/src/tests/tools.rs

@@ -147,7 +147,7 @@ pub fn create_block_with_merkle_root(
     let header = BlockHeader::new_verifiable(
         BlockHeader {
             current_version: 0,
-            announced_version: 0,
+            announced_version: None,
             denunciations: vec![],
             slot,
             parents: best_parents,

massa-consensus-worker/src/worker/init.rs

@@ -45,7 +45,7 @@ pub fn create_genesis_block(
         // VERSIONNING TODO: what to implement here in case of restart?
         BlockHeader {
             current_version: 0,
-            announced_version: 0,
+            announced_version: None,
             slot: Slot::new(cfg.last_start_period, thread_number),
             parents: Vec::new(),
             operation_merkle_root: Hash::compute_from(&Vec::new()),

massa-execution-exports/src/types.rs

@@ -211,7 +211,7 @@ pub struct ExecutedBlockInfo {
     /// Current network version (see Versioning doc)
     pub current_version: u32,
     /// Announced network version (see Versioning doc)
-    pub announced_version: u32,
+    pub announced_version: Option<u32>,
 }
 
 /// structure describing the output of a single execution

massa-execution-worker/src/interface_impl.rs

@@ -18,6 +18,8 @@ use massa_models::{
 };
 use massa_sc_runtime::RuntimeModule;
 use massa_sc_runtime::{Interface, InterfaceClone};
+#[cfg(feature = "testing")]
+use num::rational::Ratio;
 use parking_lot::Mutex;
 use rand::Rng;
 use sha2::{Digest, Sha256};
@@ -101,6 +103,7 @@ impl InterfaceImpl {
         // create an empty default store
         let mip_stats_config = MipStatsConfig {
             block_count_considered: MIP_STORE_STATS_BLOCK_CONSIDERED,
+            warn_announced_version_ratio: Ratio::new_raw(30, 100),
         };
         let mip_store =
             MipStore::try_from(([], mip_stats_config)).expect("Cannot create an empty MIP store");

massa-execution-worker/src/tests/mock.rs

@@ -24,6 +24,7 @@ use massa_pos_worker::start_selector_worker;
 use massa_signature::KeyPair;
 use massa_time::MassaTime;
 use massa_versioning::versioning::{MipStatsConfig, MipStore};
+use num::rational::Ratio;
 use parking_lot::RwLock;
 use std::str::FromStr;
 use std::{
@@ -117,6 +118,7 @@ pub fn get_sample_state(
         [],
         MipStatsConfig {
             block_count_considered: 10,
+            warn_announced_version_ratio: Ratio::new_raw(30, 100),
         },
     ))
     .unwrap();
@@ -172,7 +174,7 @@ pub fn create_block(
     let header = BlockHeader::new_verifiable(
         BlockHeader {
             current_version: 0,
-            announced_version: 0,
+            announced_version: None,
             slot,
             parents: vec![],
             operation_merkle_root,

massa-execution-worker/src/tests/scenarios_mandatories.rs

@@ -62,6 +62,7 @@ mod tests {
         // init the MIP store
         let mip_stats_config = MipStatsConfig {
             block_count_considered: MIP_STORE_STATS_BLOCK_CONSIDERED,
+            warn_announced_version_ratio: Ratio::new_raw(30, 100),
         };
         let mip_store = MipStore::try_from(([], mip_stats_config)).unwrap();
 
@@ -101,6 +102,7 @@ mod tests {
         // init the MIP store
         let mip_stats_config = MipStatsConfig {
             block_count_considered: MIP_STORE_STATS_BLOCK_CONSIDERED,
+            warn_announced_version_ratio: Ratio::new_raw(30, 100),
         };
         let mip_store = MipStore::try_from(([], mip_stats_config)).unwrap();
 
@@ -148,6 +150,7 @@ mod tests {
         // init the MIP store
         let mip_stats_config = MipStatsConfig {
             block_count_considered: MIP_STORE_STATS_BLOCK_CONSIDERED,
+            warn_announced_version_ratio: Ratio::new_raw(30, 100),
         };
         let mip_store = MipStore::try_from(([], mip_stats_config)).unwrap();
         // get a sample final state
@@ -258,6 +261,7 @@ mod tests {
         // init the MIP store
         let mip_stats_config = MipStatsConfig {
             block_count_considered: MIP_STORE_STATS_BLOCK_CONSIDERED,
+            warn_announced_version_ratio: Ratio::new_raw(30, 100),
         };
         let mip_store = MipStore::try_from(([], mip_stats_config)).unwrap();
         // get a sample final state
@@ -425,6 +429,7 @@ mod tests {
         // init the MIP store
         let mip_stats_config = MipStatsConfig {
             block_count_considered: MIP_STORE_STATS_BLOCK_CONSIDERED,
+            warn_announced_version_ratio: Ratio::new_raw(30, 100),
         };
         let mip_store = MipStore::try_from(([], mip_stats_config)).unwrap();
         // get a sample final state
@@ -587,6 +592,7 @@ mod tests {
         // init the MIP store
         let mip_stats_config = MipStatsConfig {
             block_count_considered: MIP_STORE_STATS_BLOCK_CONSIDERED,
+            warn_announced_version_ratio: Ratio::new_raw(30, 100),
         };
         let mip_store = MipStore::try_from(([], mip_stats_config)).unwrap();
 
@@ -704,6 +710,7 @@ mod tests {
         // init the MIP store
         let mip_stats_config = MipStatsConfig {
             block_count_considered: MIP_STORE_STATS_BLOCK_CONSIDERED,
+            warn_announced_version_ratio: Ratio::new_raw(30, 100),
         };
         let mip_store = MipStore::try_from(([], mip_stats_config)).unwrap();
 
@@ -812,6 +819,7 @@ mod tests {
         // init the MIP store
         let mip_stats_config = MipStatsConfig {
             block_count_considered: MIP_STORE_STATS_BLOCK_CONSIDERED,
+            warn_announced_version_ratio: Ratio::new_raw(30, 100),
         };
         let mip_store = MipStore::try_from(([], mip_stats_config)).unwrap();
 
@@ -942,6 +950,7 @@ mod tests {
         // init the MIP store
         let mip_stats_config = MipStatsConfig {
             block_count_considered: MIP_STORE_STATS_BLOCK_CONSIDERED,
+            warn_announced_version_ratio: Ratio::new_raw(30, 100),
         };
         let mip_store = MipStore::try_from(([], mip_stats_config)).unwrap();
 
@@ -1061,6 +1070,7 @@ mod tests {
         // init the MIP store
         let mip_stats_config = MipStatsConfig {
             block_count_considered: MIP_STORE_STATS_BLOCK_CONSIDERED,
+            warn_announced_version_ratio: Ratio::new_raw(30, 100),
         };
         let mip_store = MipStore::try_from(([], mip_stats_config)).unwrap();
 
@@ -1221,6 +1231,7 @@ mod tests {
         // init the MIP store
         let mip_stats_config = MipStatsConfig {
             block_count_considered: MIP_STORE_STATS_BLOCK_CONSIDERED,
+            warn_announced_version_ratio: Ratio::new_raw(30, 100),
         };
         let mip_store = MipStore::try_from(([], mip_stats_config)).unwrap();
 
@@ -1326,6 +1337,7 @@ mod tests {
         // init the MIP store
         let mip_stats_config = MipStatsConfig {
             block_count_considered: MIP_STORE_STATS_BLOCK_CONSIDERED,
+            warn_announced_version_ratio: Ratio::new_raw(30, 100),
         };
         let mip_store = MipStore::try_from(([], mip_stats_config)).unwrap();
 
@@ -1446,6 +1458,7 @@ mod tests {
         // init the MIP store
         let mip_stats_config = MipStatsConfig {
             block_count_considered: MIP_STORE_STATS_BLOCK_CONSIDERED,
+            warn_announced_version_ratio: Ratio::new_raw(30, 100),
         };
         let mip_store = MipStore::try_from(([], mip_stats_config)).unwrap();
 
@@ -1549,6 +1562,7 @@ mod tests {
         // init the MIP store
         let mip_stats_config = MipStatsConfig {
             block_count_considered: MIP_STORE_STATS_BLOCK_CONSIDERED,
+            warn_announced_version_ratio: Ratio::new_raw(30, 100),
         };
         let mip_store = MipStore::try_from(([], mip_stats_config)).unwrap();
 
@@ -1654,6 +1668,7 @@ mod tests {
         // init the MIP store
         let mip_stats_config = MipStatsConfig {
             block_count_considered: MIP_STORE_STATS_BLOCK_CONSIDERED,
+            warn_announced_version_ratio: Ratio::new_raw(30, 100),
         };
         let mip_store = MipStore::try_from(([], mip_stats_config)).unwrap();
 
@@ -1865,6 +1880,7 @@ mod tests {
         // init the MIP store
         let mip_stats_config = MipStatsConfig {
             block_count_considered: MIP_STORE_STATS_BLOCK_CONSIDERED,
+            warn_announced_version_ratio: Ratio::new_raw(30, 100),
         };
         let mip_store = MipStore::try_from(([], mip_stats_config)).unwrap();
 
@@ -2033,6 +2049,7 @@ mod tests {
         // init the MIP store
         let mip_stats_config = MipStatsConfig {
             block_count_considered: MIP_STORE_STATS_BLOCK_CONSIDERED,
+            warn_announced_version_ratio: Ratio::new_raw(30, 100),
         };
         let mip_store = MipStore::try_from(([], mip_stats_config)).unwrap();
 
@@ -2208,6 +2225,7 @@ mod tests {
         // init the MIP store
         let mip_stats_config = MipStatsConfig {
             block_count_considered: MIP_STORE_STATS_BLOCK_CONSIDERED,
+            warn_announced_version_ratio: Ratio::new_raw(30, 100),
         };
         let mip_store = MipStore::try_from(([], mip_stats_config)).unwrap();
 
@@ -2303,6 +2321,7 @@ mod tests {
         // init the MIP store
         let mip_stats_config = MipStatsConfig {
             block_count_considered: MIP_STORE_STATS_BLOCK_CONSIDERED,
+            warn_announced_version_ratio: Ratio::new_raw(30, 100),
         };
         let mip_store = MipStore::try_from(([], mip_stats_config)).unwrap();
 
@@ -2395,6 +2414,7 @@ mod tests {
         // init the MIP store
         let mip_stats_config = MipStatsConfig {
             block_count_considered: MIP_STORE_STATS_BLOCK_CONSIDERED,
+            warn_announced_version_ratio: Ratio::new_raw(30, 100),
         };
         let mip_store = MipStore::try_from(([], mip_stats_config)).unwrap();
 
@@ -2487,6 +2507,7 @@ mod tests {
         // init the MIP store
         let mip_stats_config = MipStatsConfig {
             block_count_considered: MIP_STORE_STATS_BLOCK_CONSIDERED,
+            warn_announced_version_ratio: Ratio::new_raw(30, 100),
         };
         let mip_store = MipStore::try_from(([], mip_stats_config)).unwrap();
 
@@ -2640,6 +2661,7 @@ mod tests {
         // init the MIP store
         let mip_stats_config = MipStatsConfig {
             block_count_considered: MIP_STORE_STATS_BLOCK_CONSIDERED,
+            warn_announced_version_ratio: Ratio::new_raw(30, 100),
         };
         let mip_store = MipStore::try_from(([], mip_stats_config)).unwrap();
 
@@ -2756,6 +2778,7 @@ mod tests {
         // init the MIP store
         let mip_stats_config = MipStatsConfig {
             block_count_considered: MIP_STORE_STATS_BLOCK_CONSIDERED,
+            warn_announced_version_ratio: Ratio::new_raw(30, 100),
         };
         let mip_store = MipStore::try_from(([], mip_stats_config)).unwrap();
 
@@ -2907,6 +2930,7 @@ mod tests {
         // init the MIP store
         let mip_stats_config = MipStatsConfig {
             block_count_considered: MIP_STORE_STATS_BLOCK_CONSIDERED,
+            warn_announced_version_ratio: Ratio::new_raw(30, 100),
         };
         let mip_store = MipStore::try_from(([], mip_stats_config)).unwrap();
         // init the storage
@@ -3008,6 +3032,7 @@ mod tests {
         // init the MIP store
         let mip_stats_config = MipStatsConfig {
             block_count_considered: MIP_STORE_STATS_BLOCK_CONSIDERED,
+            warn_announced_version_ratio: Ratio::new_raw(30, 100),
         };
         let mip_store = MipStore::try_from(([], mip_stats_config)).unwrap();
         // init the storage

massa-factory-exports/src/test_exports/tools.rs

@@ -12,7 +12,7 @@ pub fn create_empty_block(keypair: &KeyPair, slot: &Slot) -> SecureShareBlock {
     let header = BlockHeader::new_verifiable(
         BlockHeader {
             current_version: 0,
-            announced_version: 0,
+            announced_version: None,
             slot: *slot,
             parents: Vec::new(),
             operation_merkle_root: Hash::compute_from(&Vec::new()),

massa-factory-worker/Cargo.toml

@@ -24,6 +24,7 @@ massa_pool_exports = { path = "../massa-pool-exports" }
 massa_versioning = { path = "../massa-versioning" }
 
 [dev-dependencies]
+num = "0.4"
 massa_protocol_exports = { path = "../massa-protocol-exports", features=["testing"] }
 massa_consensus_exports = { path = "../massa-consensus-exports", features = ["testing"] }
 massa_factory_exports = { path = "../massa-factory-exports", features=["testing"]  }

massa-factory-worker/src/tests/tools.rs

@@ -5,6 +5,7 @@ use massa_consensus_exports::test_exports::{
 use massa_models::config::MIP_STORE_STATS_BLOCK_CONSIDERED;
 use massa_versioning::versioning::MipStatsConfig;
 use massa_versioning::versioning::MipStore;
+use num::rational::Ratio;
 use parking_lot::RwLock;
 use std::{sync::Arc, thread::sleep, time::Duration};
 
@@ -83,6 +84,7 @@ impl TestFactory {
         // create an empty default store
         let mip_stats_config = MipStatsConfig {
             block_count_considered: MIP_STORE_STATS_BLOCK_CONSIDERED,
+            warn_announced_version_ratio: Ratio::new_raw(30, 100),
         };
         let mip_store =
             MipStore::try_from(([], mip_stats_config)).expect("Cannot create an empty MIP store");

massa-final-state/Cargo.toml

@@ -11,6 +11,7 @@ nom = "=7.1"
 bs58 = { version = "0.4", features = ["check"] }
 thiserror = "1.0"
 tracing = "0.1"
+num = "0.4"
 
 # custom modules
 massa_ledger_exports = { path = "../massa-ledger-exports" }