chore: installing modules

Author: dpc

Cargo.lock

@@ -1,56 +1,5 @@
-use std::fmt;
-use std::io::Write as _;
-use std::sync::Arc;
-
 use bfte_util_array_type::array_type_define;
-use bincode::{Decode, Encode};
-
-use crate::signed::Hashable;
-
-#[derive(Clone, PartialEq, Eq, Encode, Decode)]
-pub struct ModuleParamsRaw(Arc<[u8]>);
-
-impl From<Vec<u8>> for ModuleParamsRaw {
-    fn from(value: Vec<u8>) -> Self {
-        Self(value.into())
-    }
-}
-impl From<Arc<[u8]>> for ModuleParamsRaw {
-    fn from(value: Arc<[u8]>) -> Self {
-        Self(value)
-    }
-}
-impl fmt::Debug for ModuleParamsRaw {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("ModuleConfigRaw")
-            .field("len", &self.0.len())
-            .finish_non_exhaustive()
-    }
-}
-
-impl Hashable for ModuleParamsRaw {
-    fn hash(&self) -> blake3::Hash {
-        let mut hasher = blake3::Hasher::new();
-
-        hasher
-            .write_all(&self.0)
-            .expect("Can't fail to write to hasher");
-
-        hasher.finalize()
-    }
-}
 
 array_type_define! {
     pub struct ModuleConfigHash[32];
 }
-// framed_payload_define! {
-//     /// Raw, undecoded module config
-//     pub struct ModuleConfigRaw;
-
-//     ModuleConfigHash;
-//     ModuleConfigLen;
-
-//     pub struct ModuleConfigSlice;
-
-//     TAG = *b"moco";
-// }

crates/consensus-core/src/module/config.rs

@@ -52,11 +52,11 @@ impl Consensus {
         let cur_round = self.current_round_with_timeout_rx.borrow().0;
         let num_peers = self.get_consensus_params(cur_round).await.num_peers();
 
-        let finality_lag = cur_round
+        let finality_lag = dbg!(cur_round)
             .to_number()
-            .checked_sub(
-                finality.to_number() + u64::try_from(num_peers.total()).expect("Can't overfolow"),
-            )
+            .checked_sub(dbg!(
+                finality.to_number() + u64::try_from(num_peers.total()).expect("Can't overfolow")
+            ))
             .unwrap_or_default();
 
         let multiplier = 1 << finality_lag.min(32);

crates/consensus/src/consensus/getters.rs

@@ -103,8 +103,11 @@ impl Consensus {
             votes.push(ctx.get_finality_vote(*peer_pubkey)?.unwrap_or_default());
         }
 
+        dbg!(&votes);
         votes.sort();
 
+        dbg!(&votes);
+
         let num_peers = cur_round_consensus_params.peers.to_num_peers();
 
         let finality_cons = votes[num_peers.max_faulty()];

crates/consensus/src/consensus/handle_finality_vote.rs

@@ -8,7 +8,6 @@ use std::sync::Arc;
 use async_trait::async_trait;
 use bfte_consensus_core::block::BlockRound;
 use bfte_consensus_core::citem::{CItemRaw, InputRaw, OutputRaw};
-use bfte_consensus_core::module::config::ModuleParamsRaw;
 use bfte_consensus_core::module::{ModuleId, ModuleKind};
 use bfte_consensus_core::peer::PeerPubkey;
 use bfte_consensus_core::peer_set::PeerSet;
@@ -35,8 +34,10 @@ pub struct DynModuleWithConfig {
 pub struct ModuleInitArgs {
     pub db: ModuleDatabase,
     pub module_consensus_version: ConsensusVersion,
-    pub config: ModuleParamsRaw,
     pub peer_pubkey: Option<PeerPubkey>,
+    /// Only AppConsensus module should use this
+    #[doc(hidden)]
+    pub modules_inits: BTreeMap<ModuleKind, DynModuleInit>,
 }
 
 pub type DynModuleInit = Arc<dyn IModuleInit + Send + Sync>;
@@ -46,14 +47,14 @@ impl ModuleInitArgs {
         module_id: ModuleId,
         db: Arc<Database>,
         module_consensus_version: ConsensusVersion,
-        config: ModuleParamsRaw,
+        modules_inits: BTreeMap<ModuleKind, DynModuleInit>,
         peer_pubkey: Option<PeerPubkey>,
     ) -> Self {
         Self {
             db: ModuleDatabase::new(module_id, db),
             module_consensus_version,
-            config,
             peer_pubkey,
+            modules_inits,
         }
     }
 }
@@ -78,6 +79,9 @@ pub type ModuleSupportedConsensusVersions = BTreeMap<ConsensusVersionMajor, Cons
 pub trait IModuleInit: Any {
     fn kind(&self) -> ModuleKind;
 
+    /// If true, this module kind can be installed only once in the federation
+    fn singleton(&self) -> bool;
+
     fn display_name(&self) -> &'static str;
 
     /// All major consensus version supported by the module, with latest

crates/module/src/module.rs

@@ -1,11 +1,9 @@
 use bfte_consensus_core::module::ModuleKind;
-use bfte_consensus_core::module::config::ModuleParamsRaw;
 use bfte_consensus_core::ver::ConsensusVersion;
 use bincode::{Decode, Encode};
 
 #[derive(Debug, PartialEq, Eq, Encode, Decode, Clone)]
 pub struct ModuleConfig {
     pub kind: ModuleKind,
     pub version: ConsensusVersion,
-    pub params: ModuleParamsRaw,
 }

crates/module/src/module/config.rs

@@ -1,8 +1,8 @@
 use bfte_consensus_core::bincode::CONSENSUS_BINCODE_CONFIG;
 use bfte_consensus_core::citem::CItemRaw;
-use bfte_consensus_core::module::ModuleId;
+use bfte_consensus_core::module::{ModuleId, ModuleKind};
 use bfte_consensus_core::peer::PeerPubkey;
-use bfte_consensus_core::ver::ConsensusVersionMinor;
+use bfte_consensus_core::ver::{ConsensusVersion, ConsensusVersionMinor};
 use bfte_util_bincode::decode_whole;
 use bfte_util_error::WhateverResult;
 use bincode::{Decode, Encode};
@@ -13,6 +13,10 @@ use snafu::ResultExt as _;
 pub enum AppConsensusCitem {
     VoteAddPeer(PeerPubkey),
     VoteRemovePeer(PeerPubkey),
+    VoteAddModule {
+        module_kind: ModuleKind,
+        consensus_version: ConsensusVersion,
+    },
     VoteModuleVersion {
         module_id: ModuleId,
         minor_consensus_version: ConsensusVersionMinor,

crates/modules/app-consensus/src/citem.rs

@@ -47,3 +47,15 @@ impl EffectKind for ModuleVersionUpgrade {
     const MODULE_KIND: ModuleKind = crate::KIND;
     const EFFECT_ID: EffectId = EffectId::new(3);
 }
+
+#[derive(Debug, Clone, Encode, Decode, Serialize, Deserialize)]
+pub struct AddModuleEffect {
+    pub module_kind: ModuleKind,
+    pub module_id: ModuleId,
+    pub consensus_version: ConsensusVersion,
+}
+
+impl EffectKind for AddModuleEffect {
+    const MODULE_KIND: ModuleKind = crate::KIND;
+    const EFFECT_ID: EffectId = EffectId::new(4);
+}

crates/modules/app-consensus/src/effects.rs

@@ -2,7 +2,6 @@ use std::collections::BTreeMap;
 use std::sync::Arc;
 
 use async_trait::async_trait;
-use bfte_consensus_core::bincode::CONSENSUS_BINCODE_CONFIG;
 use bfte_consensus_core::module::{ModuleId, ModuleKind};
 use bfte_consensus_core::peer_set::PeerSet;
 use bfte_consensus_core::ver::{ConsensusVersion, ConsensusVersionMajor, ConsensusVersionMinor};
@@ -35,12 +34,6 @@ impl AppConsensusModuleInit {
         let config = ModuleConfig {
             kind: KIND,
             version,
-            params: bincode::encode_to_vec(
-                &super::params::CoreConsensusModuleParams {},
-                CONSENSUS_BINCODE_CONFIG,
-            )
-            .expect("Can't fail")
-            .into(),
         };
 
         {
@@ -82,6 +75,10 @@ impl IModuleInit for AppConsensusModuleInit {
         crate::KIND
     }
 
+    fn singleton(&self) -> bool {
+        true
+    }
+
     fn display_name(&self) -> &'static str {
         "App Consensus"
     }
@@ -124,6 +121,7 @@ impl IModuleInit for AppConsensusModuleInit {
             peer_pubkey: args.peer_pubkey,
             propose_citems_rx,
             propose_citems_tx,
+            modules_inits: args.modules_inits,
         };
 
         module.refresh_consensus_proposals().await;