Merge pull request #123 from filecoin-project/feat/add-node-to-allocator-db

changed DB, added node_address and node_token

Author: clriesco

fplus-database/src/database/mod.rs

@@ -22,6 +22,8 @@ pub async fn get_allocators() ->Result<Vec<AllocatorModel>, sea_orm::DbErr> {
  * @param installation_id: Option<i64> - The installation ID
  * @param multisig_address: Option<String> - The multisig address
  * @param verifiers_gh_handles: Option<String> - The GitHub handles of the verifiers
+ * @param node_address: Option<String> - The node address
+ * @param node_token: Option<String> - The node token
  * 
  * # Returns
  * @return Result<AllocatorModel, sea_orm::DbErr> - The result of the operation
@@ -32,6 +34,8 @@ pub async fn update_allocator(
     installation_id: Option<i64>,
     multisig_address: Option<String>,
     verifiers_gh_handles: Option<String>,
+    node_address: Option<String>,
+    node_token: Option<String>,
 ) -> Result<AllocatorModel, sea_orm::DbErr> {
     let conn = get_database_connection().await?;
 
@@ -42,6 +46,8 @@ pub async fn update_allocator(
         allocator_active_model.installation_id = Set(installation_id);
         allocator_active_model.multisig_address = Set(multisig_address);
         allocator_active_model.verifiers_gh_handles = Set(verifiers_gh_handles);
+        allocator_active_model.node_address = Set(node_address);
+        allocator_active_model.node_token = Set(node_token);
 
         let updated_model = allocator_active_model.update(&conn).await?;
 
@@ -82,6 +88,8 @@ pub async fn get_allocator(
  * @param installation_id: Option<i64> - The installation ID
  * @param multisig_address: Option<String> - The multisig address
  * @param verifiers_gh_handles: Option<String> - The GitHub handles of the verifiers
+ * @param node_address: Option<String> - The node address
+ * @param node_token: Option<String> - The node token
  * 
  * # Returns
  * @return Result<AllocatorModel, sea_orm::DbErr> - The result of the operation
@@ -92,6 +100,8 @@ pub async fn create_or_update_allocator(
     installation_id: Option<i64>,
     multisig_address: Option<String>,
     verifiers_gh_handles: Option<String>,
+    node_address: Option<String>,
+    node_token: Option<String>,
 ) -> Result<AllocatorModel, sea_orm::DbErr> {
 
     let existing_allocator = get_allocator(&owner, &repo).await?;
@@ -102,6 +112,8 @@ pub async fn create_or_update_allocator(
         allocator_active_model.installation_id = Set(installation_id);
         allocator_active_model.multisig_address = Set(multisig_address);
         allocator_active_model.verifiers_gh_handles = Set(verifiers_gh_handles);
+        allocator_active_model.node_address = Set(node_address);
+        allocator_active_model.node_token = Set(node_token);
 
         let updated_model = allocator_active_model.update(&conn).await?;
 
@@ -113,6 +125,8 @@ pub async fn create_or_update_allocator(
             installation_id: Set(installation_id),
             multisig_address: Set(multisig_address),
             verifiers_gh_handles: Set(verifiers_gh_handles),
+            node_address: Set(node_address),
+            node_token: Set(node_token),
             ..Default::default()
         };
 

fplus-database/src/lib.rs

@@ -102,13 +102,17 @@ 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 node_address = Some("wss://lotus-node-1.ngrok-free.app/rpc/v0".to_string());
+        let node_token = Some("222".to_string());
 
         let result = database::create_or_update_allocator(
             owner,
             repo,
             installation_id,
             multisig_address,
-            verifiers_gh_handles
+            verifiers_gh_handles,
+            node_address,
+            node_token
         ).await;
         assert!(result.is_ok());
     }
@@ -149,13 +153,17 @@ mod tests {
             let multisig_address = Some
             ("0x1234567890".to_string());
             let verifiers_gh_handles = Some("test_verifier_1, test_verifier_2".to_string());
+            let node_address = Some("wss://lotus-node.app/rpc/v0".to_string());
+            let node_token = Some("111".to_string());
 
             let result = database::create_or_update_allocator(
                 owner.clone(),
                 repo.clone(),
                 installation_id,
                 multisig_address,
-                verifiers_gh_handles
+                verifiers_gh_handles,
+                node_address,
+                node_token
             ).await;
             assert!(result.is_ok());
         }
@@ -165,13 +173,17 @@ mod tests {
         let installation_id = Some(1234);
         let multisig_address = Some("0x0987654321".to_string());
         let verifiers_gh_handles = Some("test_verifier_3, test_verifier_4".to_string());
+        let node_address = Some("wss://lotus-node.app/rpc/v0".to_string());
+        let node_token = Some("111".to_string());
 
         let result = database::update_allocator(
             &owner,
             &repo,
             installation_id,
             multisig_address,
-            verifiers_gh_handles
+            verifiers_gh_handles,
+            node_address,
+            node_token
         ).await;
         assert!(result.is_ok());
     }
@@ -216,13 +228,17 @@ 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 node_address = Some("wss://lotus-node-2.ngrok-free.app/rpc/v0".to_string());
+        let node_token = Some("333".to_string());
 
         let result = database::create_or_update_allocator(
             owner.clone(),
             repo.clone(),
             installation_id,
             multisig_address,
-            verifiers_gh_handles
+            verifiers_gh_handles,
+            node_address,
+            node_token
         ).await;
 
         assert!(result.is_ok());

fplus-database/src/models/allocators.rs

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

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

@@ -37,6 +37,8 @@ pub async fn create_or_update(info: web::Json<Allocator>) -> impl Responder {
         info.installation_id,
         info.multisig_address.clone(),
         info.verifiers_gh_handles.clone(),
+        info.node_address.clone(),
+        info.node_token.clone(),
     ).await {
         Ok(allocator_model) => HttpResponse::Ok().json(allocator_model),
         Err(e) => {
@@ -70,6 +72,8 @@ pub async fn update(
         info.installation_id,
         info.multisig_address.clone(),
         info.verifiers_gh_handles.clone(),
+        info.node_address.clone(),
+        info.node_token.clone(),
     ).await {
         Ok(allocator_model) => HttpResponse::Ok().json(allocator_model),
         Err(e) => {

fplus-lib/src/core/mod.rs

@@ -98,13 +98,17 @@ pub struct Allocator {
     pub installation_id: Option<i64>,
     pub multisig_address: Option<String>,
     pub verifiers_gh_handles: Option<String>,
+    pub node_address: Option<String>,
+    pub node_token: Option<String>,
 }
 
 #[derive(Deserialize)]
 pub struct AllocatorUpdateInfo {
     pub installation_id: Option<i64>,
     pub multisig_address: Option<String>,
     pub verifiers_gh_handles: Option<String>,
+    pub node_address: Option<String>,
+    pub node_token: Option<String>,
 }
 
 #[derive(Deserialize)]