Multiple feats

fplus-lib/Cargo.toml

@@ -32,4 +32,5 @@ log = "0.4.20"
 once_cell = "1.19.0"
 fplus-database = { path = "../fplus-database", version = "1.8.3"}
 pem = "1.0"
-anyhow = "1.0"
+anyhow = "1.0"
+regex = "1.0"

fplus-lib/src/config.rs

@@ -21,6 +21,7 @@ pub fn default_env_vars() -> &'static HashMap<&'static str, &'static str> {
         m.insert("BACKEND_URL", "https://fp-core.dp04sa0tdc6pk.us-east-1.cs.amazonlightsail.com");
         m.insert("FILPLUS_ENV", "staging");
         m.insert("GLIF_NODE_URL", "http://electric-publicly-adder.ngrok-free.app/rpc/v0");
+        m.insert("ISSUE_TEMPLATE_VERSION", "1");
 
         m
     })

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

@@ -176,8 +176,6 @@ pub enum StorageProviders {
 
 #[derive(Serialize, Deserialize, Debug, Clone, Default)]
 pub struct Project {
-    #[serde(rename = "Project Id")]
-    pub project_id: String,
     #[serde(rename = "Brief history of your project and organization")]
     pub history: String,
     #[serde(rename = "Is this project associated with other projects/ecosystem stakeholders?")]
@@ -404,9 +402,6 @@ pub trait DeepCompare {
 impl DeepCompare for ApplicationFile {
     fn compare(&self, other: &Self) -> Vec<String> {
         let mut differences = Vec::new();
-        if self.version != other.version {
-            differences.push(format!("Version: {} vs {}", self.version, other.version));
-        }
         if self.id != other.id {
             differences.push(format!("ID: {} vs {}", self.id, other.id));
         }
@@ -483,9 +478,6 @@ impl DeepCompare for Datacap {
 impl DeepCompare for Project {
     fn compare(&self, other: &Self) -> Vec<String> {
         let mut differences = Vec::new();
-        if self.project_id != other.project_id {
-            differences.push(format!("Project ID: {} vs {}", self.project_id, other.project_id));
-        }
         if self.history != other.history {
             differences.push(format!("Brief history of your project and organization: {} vs {}", self.history, other.history));
         }

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

@@ -5,7 +5,6 @@ pub mod client;
 pub mod datacap;
 pub mod file;
 pub mod lifecycle;
-pub mod project;
 
 impl file::ApplicationFile {
     pub async fn new(

fplus-lib/src/core/mod.rs

@@ -15,7 +15,7 @@ use serde_json::from_str;
 
 use crate::{
     base64, config::get_env_var_or_default, core::application::file::Allocations, error::LDNError, external_services::{
-        blockchain::BlockchainData, filecoin::get_multisig_threshold_for_actor, github::{
+        blockchain::{compare_allowance_and_allocation, BlockchainData}, filecoin::get_multisig_threshold_for_actor, github::{
             github_async_new, CreateMergeRequestData, CreateRefillMergeRequestData, GithubWrapper,
         }
     }, parsers::ParsedIssue
@@ -814,13 +814,27 @@ impl LDNApplication {
             Ok(s) => match s {
                 AppState::Submitted | AppState::AdditionalInfoRequired | AppState::AdditionalInfoSubmitted => {
                     let app_file: ApplicationFile = self.file().await?;
+
+                    let db_allocator = match get_allocator(&owner, &repo).await {
+                        Ok(allocator) => allocator.unwrap(),
+                        Err(err) => {
+                            return Err(LDNError::New(format!("Database: get_allocator: {}", err)));
+                        }
+                    };
+                    let db_multisig_address = db_allocator.multisig_address.unwrap();
+                    Self::check_and_handle_allowance(
+                        &db_multisig_address.clone(),
+                        Some(allocation_amount.clone()),
+                    ).await?;
+
                     let uuid = uuidv4::uuid::v4();
                     let request = AllocationRequest::new(
                         actor.clone(),
                         uuid,
                         AllocationRequestType::First,
                         allocation_amount,
                     );
+
                     let app_file = app_file.complete_governance_review(actor.clone(), request);
                     let file_content = serde_json::to_string_pretty(&app_file).unwrap();
                     let app_path = &self.file_name.clone();
@@ -967,6 +981,11 @@ impl LDNApplication {
                         app_lifecycle,
                     );
                     if new_allocation_amount.is_some() && app_file.allocation.0.len() > 1 {
+                        Self::check_and_handle_allowance(
+                            &db_multisig_address.clone(),
+                            new_allocation_amount.clone(),
+                        ).await?;
+
                         let _ = app_file.adjust_active_allocation_amount(new_allocation_amount.unwrap().clone());
                     }
 
@@ -1107,7 +1126,16 @@ impl LDNApplication {
             ));
         }
 
+        // Check the allowance for the address
+
         if new_allocation_amount.is_some() && app_file.allocation.0.len() > 1 {
+            let db_multisig_address = db_allocator.multisig_address.unwrap();
+
+            Self::check_and_handle_allowance(
+                &db_multisig_address.clone(),
+                new_allocation_amount.clone(),
+            ).await?;
+
             let _ = app_file.adjust_active_allocation_amount(new_allocation_amount.unwrap().clone());
         }
 
@@ -2521,6 +2549,40 @@ impl LDNApplication {
         }
     }
 
+    async fn check_and_handle_allowance(
+        db_multisig_address: &str,
+        new_allocation_amount: Option<String>,
+    ) -> Result<(), LDNError> {
+        let blockchain = BlockchainData::new();
+        match blockchain.get_allowance_for_address("f24siazyti3akorqyvi33rvlq3i73j23rwohdamuy").await {
+            Ok(allowance) if allowance != "0" => {
+                log::info!("Allowance found and is not zero. Value is {}", allowance);
+                match compare_allowance_and_allocation(&allowance, new_allocation_amount) {
+                    Some(result) => {
+                        if result {
+                            println!("Allowance is sufficient.");
+                            Ok(())
+                        } else {
+                            println!("Allowance is not sufficient.");
+                            Err(LDNError::New("Multisig address has less allowance than the new allocation amount".to_string()))
+                        }
+                    },
+                    None => {
+                        println!("Error parsing sizes.");
+                        Err(LDNError::New("Error parsing sizes".to_string()))
+                    },
+                }
+            },
+            Ok(_) => {
+                Err(LDNError::New("Multisig address has no remaining allowance".to_string()))
+            },
+            Err(e) => {
+                log::error!("Failed to retrieve allowance: {:?}", e);
+                Err(LDNError::New("Failed to retrieve allowance".to_string()))
+            }
+        }
+    }
+
     pub async fn create_pr_from_issue_modification(parsed_ldn: ParsedIssue, application_model: ApplicationModel) -> Result<Self, LDNError> {
         let merged_application = ApplicationFile::from_str(&application_model.application.unwrap())
             .map_err(|e| LDNError::Load(format!("Failed to parse application file from DB: {}", e))).unwrap();
@@ -3483,9 +3545,11 @@ impl LDNPullRequest {
                 ));
             })?;
 
+        let issue_link = format!("https://github.com/{}/{}/issues/{}", owner, repo, application_id);
+
         let (_pr, file_sha) = gh
             .create_merge_request(CreateMergeRequestData {
-                application_id: application_id.clone(),
+                issue_link,
                 branch_name: app_branch_name,
                 file_name,
                 owner_name,
@@ -3526,9 +3590,12 @@ impl LDNPullRequest {
                     application_id, e
                 ));
             })?;
+
+        let issue_link = format!("https://github.com/{}/{}/issues/{}", owner, repo, application_id);
+
         let pr = match gh
             .create_refill_merge_request(CreateRefillMergeRequestData {
-                application_id: application_id.clone(),
+                issue_link,
                 owner_name,
                 file_name: file_name.clone(),
                 file_sha: file_sha.clone(),

fplus-lib/src/external_services/blockchain.rs

@@ -1,4 +1,6 @@
 const BASE_URL: &str = "https://api.filplus.d.interplanetary.one/public/api";
+extern crate regex;
+use regex::Regex;
 
 /// BlockchainData is a client for the Fil+ blockchain data API.
 pub struct BlockchainData {
@@ -94,6 +96,10 @@ impl BlockchainData {
                 let allowance = json["allowance"].as_str().unwrap_or("");
                 Ok(allowance.to_string())
             }
+            Some("verifier") => {
+                let allowance = json["allowance"].as_str().unwrap_or("");
+                Ok(allowance.to_string())
+            }
             Some("error") => {
                 let message = json["message"].as_str().unwrap_or("");
                 Err(BlockchainDataError::Err(message.to_string()))
@@ -110,3 +116,68 @@ impl BlockchainData {
         format!("{}/{}", self.base_url, path)
     }
 }
+
+
+fn parse_size_to_bytes(size: &str) -> Option<u64> {
+    let re = Regex::new(r"^(\d+)([a-zA-Z]+)$").unwrap();
+    let caps = re.captures(size.trim())?;
+
+    let number = caps.get(1)?.as_str().parse::<u64>().ok()?;
+    let unit = caps.get(2)?.as_str().to_uppercase();
+
+    // Normalize the unit by removing any trailing 'i', 's' and converting to upper case
+    let normalized_unit = unit.trim_end_matches('S');
+
+    match normalized_unit {
+        "KIB" => Some(number * 1024),                             // 2^10
+        "MIB" => Some(number * 1024 * 1024),                      // 2^20
+        "GIB" => Some(number * 1024 * 1024 * 1024),               // 2^30
+        "TIB" => Some(number * 1024 * 1024 * 1024 * 1024),        // 2^40
+        "PIB" => Some(number * 1024 * 1024 * 1024 * 1024 * 1024), // 2^50
+        "KB"  => Some(number * 1000),                             // 10^3
+        "MB"  => Some(number * 1000 * 1000),                      // 10^6
+        "GB"  => Some(number * 1000 * 1000 * 1000),               // 10^9
+        "TB"  => Some(number * 1000 * 1000 * 1000 * 1000),        // 10^12
+        "PB"  => Some(number * 1000 * 1000 * 1000 * 1000 * 1000), // 10^15
+        _ => None, // Unsupported unit
+    }
+}
+
+pub fn compare_allowance_and_allocation(allowance: &str, new_allocation_amount: Option<String>) -> Option<bool> {
+    println!("Allowance: {} bytes, Allocation: {} bytes", allowance, new_allocation_amount.clone().unwrap());
+
+    let allowance_bytes: u64 = match allowance.parse::<u64>() {
+        Ok(value) => {
+            println!("Allowance value: {}", value);
+            value
+        }
+        Err(_) => {
+            println!("Error parsing allowance value");
+            return None
+        }
+    };
+
+
+    let allocation_bytes = match new_allocation_amount {
+        Some(amount) => {
+            println!("Allowance value: {}", amount);
+            parse_size_to_bytes(&amount)?
+        },
+        None => {
+            println!("Error parsing allocation value");
+            return None
+        }, 
+    };
+
+    println!("===============================");
+    println!("===============================");
+    println!("===============================");
+    println!("Allowance end: {} bytes, Allocation end: {} bytes", allowance_bytes, allocation_bytes);
+    println!("===============================");
+    println!("===============================");
+    println!("===============================");
+
+    println!("COMPARISON: {}", allowance_bytes >= allocation_bytes);
+
+    Some(allowance_bytes >= allocation_bytes)
+}

fplus-lib/src/external_services/github.rs

@@ -45,7 +45,7 @@ struct GithubParams {
 
 #[derive(Debug)]
 pub struct CreateRefillMergeRequestData {
-    pub application_id: String,
+    pub issue_link: String,
     pub owner_name: String,
     pub ref_request: Request<String>,
     pub file_content: String,
@@ -57,7 +57,7 @@ pub struct CreateRefillMergeRequestData {
 
 #[derive(Debug)]
 pub struct CreateMergeRequestData {
-    pub application_id: String,
+    pub issue_link: String,
     pub owner_name: String,
     pub ref_request: Request<String>,
     pub file_content: String,
@@ -605,7 +605,7 @@ impl GithubWrapper {
         data: CreateRefillMergeRequestData,
     ) -> Result<(PullRequest, String), OctocrabError> {
         let CreateRefillMergeRequestData {
-            application_id: _,
+            issue_link,
             ref_request,
             owner_name,
             file_content,
@@ -621,7 +621,7 @@ impl GithubWrapper {
             .create_pull_request(
                 &format!("Datacap for {}", owner_name),
                 &branch_name,
-                &format!(""),
+                &format!("{}", issue_link),
             )
             .await?;
 
@@ -633,7 +633,7 @@ impl GithubWrapper {
         data: CreateMergeRequestData,
     ) -> Result<(PullRequest, String), OctocrabError> {
         let CreateMergeRequestData {
-            application_id: _,
+            issue_link,
             ref_request,
             owner_name,
             file_content,
@@ -650,7 +650,7 @@ impl GithubWrapper {
             .create_pull_request(
                 &format!("Datacap for {}", owner_name),
                 &branch_name,
-                &format!(""),
+                &format!("{}", issue_link),
             )
             .await?;