Use verification key/beacon stores in Mithril Aggregator multi signer

mithril-aggregator/src/beacon_store.rs

@@ -31,15 +31,21 @@ pub struct MemoryBeaconStore {
     current_beacon: Option<Beacon>,
 }
 
-impl Default for MemoryBeaconStore {
+impl MemoryBeaconStore {
     /// MemoryBeaconStore factory
-    fn default() -> Self {
+    pub fn new() -> Self {
         Self {
             current_beacon: None,
         }
     }
 }
 
+impl Default for MemoryBeaconStore {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 #[async_trait]
 impl BeaconStore for MemoryBeaconStore {
     async fn get_current_beacon(&self) -> Result<Option<Beacon>, BeaconStoreError> {

mithril-aggregator/src/http_server.rs

@@ -213,12 +213,12 @@ mod handlers {
         match beacon_store.get_current_beacon().await {
             Ok(Some(beacon)) => {
                 let multi_signer = multi_signer.read().await;
-                match multi_signer.get_multi_signature() {
+                match multi_signer.get_multi_signature().await {
                     Ok(None) => {
                         let mut certificate_pending = fake_data::certificate_pending();
                         certificate_pending.beacon = beacon.clone();
 
-                        let protocol_parameters = multi_signer.get_protocol_parameters();
+                        let protocol_parameters = multi_signer.get_protocol_parameters().await;
                         if protocol_parameters.is_none() {
                             return Ok(warp::reply::with_status(
                                 warp::reply::json(&entities::Error::new(
@@ -232,7 +232,7 @@ mod handlers {
 
                         let previous_hash = certificate_pending.previous_hash;
 
-                        let signers = multi_signer.get_signers();
+                        let signers = multi_signer.get_signers().await;
                         if let Err(err) = signers {
                             return Ok(warp::reply::with_status(
                                 warp::reply::json(&entities::Error::new(
@@ -437,6 +437,7 @@ mod handlers {
             Ok(verification_key) => {
                 match multi_signer
                     .register_signer(signer.party_id as ProtocolPartyId, &verification_key)
+                    .await
                 {
                     Ok(()) => Ok(warp::reply::with_status(
                         warp::reply::json(&Null),
@@ -472,11 +473,14 @@ mod handlers {
         for signature in &signatures {
             match key_decode_hex(&signature.signature) {
                 Ok(single_signature) => {
-                    match multi_signer.register_single_signature(
-                        signature.party_id as ProtocolPartyId,
-                        &single_signature,
-                        signature.index as ProtocolLotteryIndex,
-                    ) {
+                    match multi_signer
+                        .register_single_signature(
+                            signature.party_id as ProtocolPartyId,
+                            &single_signature,
+                            signature.index as ProtocolLotteryIndex,
+                        )
+                        .await
+                    {
                         Err(multi_signer::ProtocolError::ExistingSingleSignature(_)) => {
                             return Ok(warp::reply::with_status(
                                 warp::reply::json(&Null),

mithril-aggregator/src/lib.rs

@@ -21,5 +21,5 @@ pub use snapshot_uploaders::{LocalSnapshotUploader, RemoteSnapshotUploader};
 pub use snapshotter::{SnapshotError, Snapshotter};
 pub use store::{
     AdapterError, CertificatePendingStore, CertificateStore, JsonFileStoreAdapter, MemoryAdapter,
-    StoreAdapter, VerificationKeyStore,
+    StoreAdapter, VerificationKeyStore, VerificationKeyStoreError,
 };

mithril-aggregator/src/main.rs

@@ -127,8 +127,8 @@ async fn main() -> Result<(), Box<dyn Error>> {
 
     // Init dependencies
     let snapshot_store = config.build_snapshot_store();
-    let multi_signer = Arc::new(RwLock::new(init_multi_signer()));
-    let beacon_store = Arc::new(RwLock::new(MemoryBeaconStore::default()));
+
+    let beacon_store = Arc::new(RwLock::new(MemoryBeaconStore::new()));
     let snapshot_uploader = config.build_snapshot_uploader();
     let certificate_pending_store = Arc::new(RwLock::new(CertificatePendingStore::new(Box::new(
         JsonFileStoreAdapter::new(config.pending_certificate_store_directory.clone())?,
@@ -139,6 +139,11 @@ async fn main() -> Result<(), Box<dyn Error>> {
     let verification_key_store = Arc::new(RwLock::new(VerificationKeyStore::new(Box::new(
         JsonFileStoreAdapter::new(config.verification_key_store_directory.clone())?,
     ))));
+    let multi_signer = Arc::new(RwLock::new(MultiSignerImpl::new(
+        beacon_store.clone(),
+        verification_key_store.clone(),
+    )));
+    init_multi_signer(multi_signer.clone()).await;
 
     // Init dependency manager
     let mut dependency_manager = DependencyManager::new(config.clone());
@@ -187,13 +192,15 @@ async fn main() -> Result<(), Box<dyn Error>> {
 }
 
 /// Init multi signer dependency
-fn init_multi_signer() -> impl MultiSigner {
-    let mut multi_signer = MultiSignerImpl::new();
+// TODO: remove this function when new runtime is implemented + remove protocol parameters from fake data
+async fn init_multi_signer(multi_signer: Arc<RwLock<dyn MultiSigner>>) {
+    let mut multi_signer = multi_signer.write().await;
 
     // Update protocol parameters
     let protocol_parameters = fake_data::protocol_parameters();
     multi_signer
         .update_protocol_parameters(&protocol_parameters.into())
+        .await
         .expect("update protocol parameters failed");
 
     // Update stake distribution
@@ -204,7 +211,6 @@ fn init_multi_signer() -> impl MultiSigner {
         .collect::<_>();
     multi_signer
         .update_stake_distribution(&stakes)
+        .await
         .expect("stake distribution update failed");
-
-    multi_signer
 }