Multisig support

Database added multisig threshold
Multisig threshold using in propose and approve

Author: kokal33

fplus-database/src/database/mod.rs

@@ -92,6 +92,7 @@ pub async fn create_or_update_allocator(
     installation_id: Option<i64>,
     multisig_address: Option<String>,
     verifiers_gh_handles: Option<String>,
+    multisig_threshold: Option<i32>
 ) -> Result<AllocatorModel, sea_orm::DbErr> {
 
     let existing_allocator = get_allocator(&owner, &repo).await?;
@@ -113,6 +114,7 @@ pub async fn create_or_update_allocator(
             installation_id: Set(installation_id),
             multisig_address: Set(multisig_address),
             verifiers_gh_handles: Set(verifiers_gh_handles),
+            multisig_threshold: Set(multisig_threshold),
             ..Default::default()
         };
 

fplus-database/src/lib.rs

@@ -102,13 +102,15 @@ mod tests {
         let installation_id = Some(1234);
         let multisig_address = Some("0x1234567890".to_string());
         let verifiers_gh_handles = Some("test_verifier_1, test_verifier_2".to_string());
+        let multisig_threshold = Some(2);
 
         let result = database::create_or_update_allocator(
             owner,
             repo,
             installation_id,
             multisig_address,
             verifiers_gh_handles,
+            multisig_threshold
         ).await;
         assert!(result.is_ok());
     }
@@ -149,13 +151,15 @@ mod tests {
             let multisig_address = Some
             ("0x1234567890".to_string());
             let verifiers_gh_handles = Some("test_verifier_1, test_verifier_2".to_string());
+            let multisig_threshold = Some(2);
 
             let result = database::create_or_update_allocator(
                 owner.clone(),
                 repo.clone(),
                 installation_id,
                 multisig_address,
                 verifiers_gh_handles,
+                multisig_threshold
             ).await;
             assert!(result.is_ok());
         }
@@ -216,13 +220,15 @@ mod tests {
         let installation_id = Some(1234);
         let multisig_address = Some("0x1234567890".to_string());
         let verifiers_gh_handles = Some("test_verifier_1, test_verifier_2".to_string());
+        let multisig_threshold = Some(2);
 
         let result = database::create_or_update_allocator(
             owner.clone(),
             repo.clone(),
             installation_id,
             multisig_address,
             verifiers_gh_handles,
+            multisig_threshold
         ).await;
 
         assert!(result.is_ok());

fplus-database/src/models/allocators.rs

@@ -14,6 +14,7 @@ pub struct Model {
     pub multisig_address: Option<String>,
     #[sea_orm(column_type = "Text", nullable)]
     pub verifiers_gh_handles: Option<String>,
+    pub multisig_threshold: Option<i32>,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]

fplus-http-server/src/router/allocator.rs

@@ -50,6 +50,7 @@ pub async fn create_from_json(file: web::Json<ChangedAllocator>) -> actix_web::R
                 Some(model.installation_id as i64), 
                 Some(model.multisig_address),      
                 verifiers_gh_handles,
+                model.multisig_threshold
             ).await {
                 Ok(allocator_model) => Ok(HttpResponse::Ok().json(allocator_model)),
                 Err(e) => Ok(HttpResponse::BadRequest().body(e.to_string())),

fplus-lib/src/core/allocator/file.rs

@@ -11,6 +11,8 @@ pub struct AllocatorModel {
     pub application: Application,
     #[serde(rename = "common_ui_install_id")]
     pub installation_id: u64, 
+    #[serde(rename = "multisig_threshold")]
+    pub multisig_threshold: Option<i32>,
 }
 
 #[derive(Serialize, Deserialize, Debug)]