Merge pull request #57 from starknet-id/feat/add_altcoins_support

fix: pipeline if no approval values
lfglabs-dev · Mar 28, 2024 · 950e70a · 950e70a
2 parents 16c6ef2 + ce3b360
commit 950e70a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/bot/src/bot.rs b/bot/src/bot.rs
@@ -68,6 +68,10 @@ pub async fn get_domains_ready_for_renewal(
     let renewer_and_erc20: Vec<(String, String)> = results
         .iter()
         .map(|result| {
+            let test = config
+            .renewers_mapping
+            .get(&result.auto_renew_contract)
+            .unwrap();
             (
                 result.renewer_address.clone(),
                 // get the erc20 address for the given auto_renew_contract
@@ -207,7 +211,7 @@ async fn process_aggregate_result(
     }
 
     let renewer_addr = FieldElement::from_hex_be(&result.renewer_address).unwrap();
-    // map the vec of approval_values to get tha approval_value for the erc20_addr selected
+    // map the vec of approval_values to get the approval_value for the erc20_addr selected
     let erc20_allowance = if let Some(approval_value) = result
         .approval_values
         .iter()
@@ -270,7 +274,7 @@ async fn process_aggregate_result(
                 .unwrap();
             println!(
                 "[OK] Domain {}.stark can be renewed by {}",
-                domain_name, renewer_addr
+                domain_name, to_hex(renewer_addr)
             );
             Some(AggregateResult {
                 domain: domain_encoded,

diff --git a/bot/src/config.rs b/bot/src/config.rs
@@ -70,7 +70,7 @@ pub_struct!(Clone, Deserialize; Server {
     starknetid_api: String,
 });
 
-pub_struct!(Clone, Deserialize; Altcoin {
+pub_struct!(Clone, Deserialize; Renewer {
     address: FieldElement,
     renewal_contract: FieldElement,
 });
@@ -102,7 +102,7 @@ impl<'de> Deserialize<'de> for Config {
             rpc: Rpc,
             watchtower: Watchtower,
             server: Server,
-            renewers: HashMap<String, Altcoin>,
+            renewers: HashMap<String, Renewer>,
         }
 
         let OuterConfig {

diff --git a/bot/src/models.rs b/bot/src/models.rs
@@ -58,7 +58,7 @@ pub struct DomainAggregateResult {
     pub meta_hash: Option<String>,
     pub _cursor: Cursor,
     pub auto_renew_contract: FieldElement,
-    pub approval_values: Vec<AutoRenewAllowance>,
+    pub approval_values: Vec<AutoRenewAllowance>
 }
 
 pub struct AggregateResult {

diff --git a/bot/src/pipelines.rs b/bot/src/pipelines.rs
@@ -72,7 +72,7 @@ pub async fn get_auto_renewal_data(
             "auto_renew_contract": { "$first": "$auto_renew_contract" },
             "approval_values": {
                 "$push": {
-                    "approval_value": "$approval_info.allowance",
+                    "approval_value": { "$ifNull": [ "$approval_info.allowance", "0x0" ] },
                     "erc20_addr": erc20_addr
                 }
             },
@@ -163,8 +163,8 @@ pub async fn get_auto_renewal_altcoins_data(
             "auto_renew_contract": { "$first": "$auto_renew_contract" },
             "approval_values": {
                 "$push": {
-                    "approval_value": "$approval_info.allowance",
-                    "erc20_addr": "$approval_info.erc20_addr"
+                    "approval_value": { "$ifNull": [ "$approval_info.allowance", "0x0" ] },
+                    "erc20_addr": { "$ifNull": [ "$approval_info.erc20_addr", "0x0" ] },
                 }
             },
         }},
@@ -195,7 +195,5 @@ pub async fn get_auto_renewal_altcoins_data(
     // Check if the conversion was successful
     let results = results?;
 
-    println!("results: {:?}", results);
-
     Ok(results)
 }