[FIL-361] Add a new filed client contract address for allocator (#234)

* Add a new filed client contract address for allocator
---------
Co-authored-by: Filip Lelek <[email protected]>

Author: Filip-L

fplus-database/src/database/allocators.rs

@@ -71,6 +71,7 @@ pub async fn create_or_update_allocator(
     required_sps: Option<String>,
     required_replicas: Option<String>,
     registry_file_path: Option<String>,
+    client_contract_address: Option<String>,
 ) -> Result<AllocatorModel, sea_orm::DbErr> {
     let existing_allocator = get_allocator(&owner, &repo).await?;
     if let Some(allocator_model) = existing_allocator {
@@ -124,6 +125,16 @@ pub async fn create_or_update_allocator(
             allocator_active_model.registry_file_path = Set(registry_file_path);
         }
 
+        if let Some(client_contract_address) = client_contract_address {
+            if !client_contract_address.is_empty() {
+                allocator_active_model.client_contract_address = Set(Some(client_contract_address));
+            } else {
+                allocator_active_model.client_contract_address = Set(None);
+            }
+        } else {
+            allocator_active_model.client_contract_address = Set(None);
+        }
+
         let updated_model = allocator_active_model.update(&conn).await?;
 
         Ok(updated_model)
@@ -180,6 +191,13 @@ pub async fn create_or_update_allocator(
             new_allocator.registry_file_path = Set(registry_file_path);
         }
 
+        if let Some(client_contract_address) = client_contract_address {
+            if !client_contract_address.is_empty() {
+                new_allocator.client_contract_address = Set(Some(client_contract_address));
+            } else {
+                new_allocator.client_contract_address = Set(None);
+            }
+        }
         let conn = get_database_connection()
             .await
             .expect("Failed to get DB connection");

fplus-database/src/database/autoallocations.rs

@@ -1,8 +1,8 @@
 use crate::get_database_connection;
-use crate::models::autoallocations::AddressWrapper;
 use crate::models::autoallocations::{
     Column, Entity as Autoallocations, Model as AutoallocationModel,
 };
+use crate::types::AddressWrapper;
 use alloy::primitives::Address;
 use chrono::{DateTime, FixedOffset};
 use sea_orm::{entity::*, query::*, DbBackend, DbErr};

fplus-database/src/lib.rs

@@ -124,6 +124,7 @@ mod tests {
         let required_sps = Some("5+".to_string());
         let required_replicas = Some("5+".to_string());
         let registry_file_path = Some("Allocators/123.json".to_string());
+        let client_contract_address = Some("f1owcbryeqlq3vl7kydzax7r75sbtyvgpnny7fswy".to_string());
 
         let result = database::allocators::create_or_update_allocator(
             owner,
@@ -139,6 +140,7 @@ mod tests {
             required_sps,
             required_replicas,
             registry_file_path,
+            client_contract_address,
         )
         .await;
         assert!(result.is_ok());
@@ -216,7 +218,7 @@ mod tests {
         let required_sps = Some("5+".to_string());
         let required_replicas = Some("5+".to_string());
         let registry_file_path = Some("Allocators/123.json".to_string());
-
+        let client_contract_address = Some("f1owcbryeqlq3vl7kydzax7r75sbtyvgpnny7fswy".to_string());
         let result = database::allocators::create_or_update_allocator(
             owner.clone(),
             repo.clone(),
@@ -231,6 +233,7 @@ mod tests {
             required_sps,
             required_replicas,
             registry_file_path,
+            client_contract_address,
         )
         .await;
 

fplus-database/src/models/allocators.rs

@@ -22,6 +22,7 @@ pub struct Model {
     pub required_sps: Option<String>,
     pub required_replicas: Option<String>,
     pub registry_file_path: Option<String>,
+    pub client_contract_address: Option<String>,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter)]

fplus-database/src/models/autoallocations.rs

@@ -1,9 +1,9 @@
-use alloy::primitives::{Address, AddressError};
 use chrono::{DateTime, FixedOffset};
 use sea_orm::entity::prelude::*;
-use sea_orm_newtype::DeriveNewType;
 use serde::{Deserialize, Serialize};
 
+use crate::types::AddressWrapper;
+
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
 #[sea_orm(table_name = "autoallocations")]
 pub struct Model {
@@ -16,26 +16,3 @@ pub struct Model {
 pub enum Relation {}
 
 impl ActiveModelBehavior for ActiveModel {}
-
-#[derive(Clone, Debug, PartialEq, DeriveNewType, Eq, Serialize, Deserialize)]
-#[sea_orm_newtype(try_from_into = "String", primary_key)]
-pub struct AddressWrapper(pub Address);
-
-impl TryFrom<String> for AddressWrapper {
-    type Error = AddressError;
-    fn try_from(value: String) -> Result<Self, Self::Error> {
-        Ok(AddressWrapper(Address::parse_checksummed(value, None)?))
-    }
-}
-
-impl From<AddressWrapper> for String {
-    fn from(value: AddressWrapper) -> Self {
-        value.0.to_checksum(None)
-    }
-}
-
-impl From<Address> for AddressWrapper {
-    fn from(value: Address) -> Self {
-        AddressWrapper(value)
-    }
-}

fplus-database/src/types.rs

@@ -1,4 +1,6 @@
-use serde::Deserialize;
+use alloy::primitives::{Address, AddressError};
+use sea_orm_newtype::DeriveNewType;
+use serde::{Deserialize, Serialize};
 
 #[derive(Deserialize)]
 pub(super) struct DbConnectParams {
@@ -24,3 +26,26 @@ impl DbConnectParams {
         )
     }
 }
+
+#[derive(Clone, Debug, PartialEq, DeriveNewType, Eq, Serialize, Deserialize)]
+#[sea_orm_newtype(try_from_into = "String", primary_key)]
+pub struct AddressWrapper(pub Address);
+
+impl TryFrom<String> for AddressWrapper {
+    type Error = AddressError;
+    fn try_from(value: String) -> Result<Self, Self::Error> {
+        Ok(AddressWrapper(Address::parse_checksummed(value, None)?))
+    }
+}
+
+impl From<AddressWrapper> for String {
+    fn from(value: AddressWrapper) -> Self {
+        value.0.to_checksum(None)
+    }
+}
+
+impl From<Address> for AddressWrapper {
+    fn from(value: Address) -> Self {
+        AddressWrapper(value)
+    }
+}

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

@@ -8,6 +8,7 @@ pub struct AllocatorModel {
     pub owner: Option<String>,
     pub repo: Option<String>,
     pub address: Option<String>,
+    pub client_contract_address: Option<String>,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
@@ -26,6 +27,7 @@ pub struct Application {
     pub data_types: Vec<String>,
     pub required_sps: String,
     pub required_replicas: String,
+    pub client_contract_address: Option<String>,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]

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

@@ -384,6 +384,7 @@ pub async fn update_installation_ids_in_db(installation: InstallationRepositorie
             None,
             None,
             None,
+            None,
         )
         .await;
     }
@@ -648,6 +649,7 @@ pub async fn create_allocator_from_file(files_changed: Vec<String>) -> Result<()
                     Some(model.application.required_sps),
                     Some(model.application.required_replicas),
                     Some(file_name.to_owned()),
+                    model.application.client_contract_address,
                 )
                 .await
                 .map_err(|e| LDNError::New(format!("Create or update allocator failed: {}", e)))?;

manual-migrations/2024-10-16.sql

@@ -0,0 +1,2 @@
+ALTER TABLE IF EXISTS public.allocators
+    ADD COLUMN client_contract_address text;