fix reviews

src/endpoints/admin/balance/create_balance.rs

@@ -74,6 +74,7 @@ pub async fn handler(
         contracts: Some(parsed_contracts),
         api_url: None,
         regex: None,
+        calls: None,
     };
 
     // insert document to boost collection

src/endpoints/admin/custom/create_custom.rs

@@ -65,6 +65,7 @@ pub async fn handler(
         contracts: None,
         api_url: None,
         regex: None,
+        calls: None,
     };
 
     // insert document to boost collection

src/endpoints/admin/discord/create_discord.rs

@@ -64,6 +64,7 @@ pub async fn handler(
         contracts: None,
         api_url: None,
         regex: None,
+        calls: None,
     };
 
     // insert document to boost collection

src/endpoints/admin/domain/create_domain.rs

@@ -61,6 +61,7 @@ pub async fn handler(
         contracts: None,
         api_url: None,
         regex: None,
+        calls: None,
     };
 
     // insert document to boost collection

src/endpoints/admin/quiz/create_quiz.rs

@@ -92,6 +92,7 @@ pub async fn handler(
         contracts: None,
         api_url: None,
         regex: None,
+        calls: None,
     };
 
     return match tasks_collection.insert_one(new_document, None).await {

src/endpoints/admin/twitter/create_twitter_fw.rs

@@ -65,6 +65,7 @@ pub async fn handler(
         contracts: None,
         api_url: None,
         regex: None,
+        calls: None,
     };
 
     // insert document to boost collection

src/endpoints/admin/twitter/create_twitter_rw.rs

@@ -63,6 +63,7 @@ pub async fn handler(
         contracts: None,
         api_url: None,
         regex: None,
+        calls: None,
     };
 
     // insert document to boost collection

src/endpoints/quests/mod.rs

@@ -14,3 +14,4 @@ pub mod verify_custom_api;
 pub mod verify_quiz;
 pub mod verify_twitter_fw;
 pub mod verify_twitter_rw;
+pub mod verify_contract;

src/endpoints/quests/verify_contract.rs

@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use crate::{
-    models::{AppState, QuestTaskDocument, Call},
+    models::{AppState, QuestTaskDocument},
     utils::{get_error, CompletedTasksTrait},
 };
 use axum::{
@@ -33,12 +33,12 @@ pub async fn handler(
 ) -> impl IntoResponse {
     let task_id = query.task_id;
     // Get task from db
-    let task_collection = state.db.collection("tasks");
-    let task: QuestTaskDocument = task_collection
-        .find_one(doc! {"id": task_id}, None)
-        .await
-        .unwrap()
-        .unwrap();
+    let task_collection = state.db.collection::<QuestTaskDocument>("tasks");
+    let task = match task_collection.find_one(doc! {"id": task_id}, None).await {
+        Ok(Some(task)) => task,
+        Ok(None) => return get_error("Task not found".to_string()),
+        Err(e) => return get_error(format!("Database error: {}", e)),
+    };
 
     if task.task_type != Some("contract".to_string()) {
         return get_error("Invalid task type.".to_string());
@@ -48,20 +48,31 @@ pub async fn handler(
 
     if let Some(calls) = task.calls {
         for call in calls {
-            let contract_address = FieldElement::from_hex_be(&call.contract).map_err(|e| get_error(format!("Invalid contract address: {}", e)))?;
+            let contract_address = match FieldElement::from_hex_be(&call.contract) {
+                Ok(address) => address,
+                Err(e) => return get_error(format!("Invalid contract address: {}", e)),
+            };
 
-            let calldata: Vec<FieldElement> = call.call_data
+            let calldata: Vec<FieldElement> = match call.call_data
                 .iter()
                 .map(|s| FieldElement::from_hex_be(s))
                 .collect::<Result<Vec<FieldElement>, _>>()
-                .map_err(|e| get_error(format!("Invalid calldata: {}", e)))?;
+            {
+                Ok(data) => data,
+                Err(e) => return get_error(format!("Invalid calldata: {}", e)),
+            };
+
+            let entry_point_selector = match FieldElement::from_hex_be(&call.entry_point) {
+                Ok(selector) => selector,
+                Err(e) => return get_error(format!("Invalid entry point: {}", e)),
+            };
 
             let call_result = state
                 .provider
                 .call(
                     FunctionCall {
                         contract_address,
-                        entry_point_selector: call.entry_point.into(),
+                        entry_point_selector,
                         calldata,
                     },
                     BlockId::Tag(BlockTag::Latest),
@@ -70,7 +81,10 @@ pub async fn handler(
 
             match call_result {
                 Ok(result) => {
-                    let regex = Regex::new(&call.regex).map_err(|e| get_error(format!("Invalid regex: {}", e)))?;
+                    let regex = match Regex::new(&call.regex) {
+                        Ok(re) => re,
+                        Err(e) => return get_error(format!("Invalid regex: {}", e)),
+                    };
                     let result_str = result.iter().map(|&r| r.to_string()).collect::<Vec<String>>().join(",");
 
                     if !regex.is_match(&result_str) {

src/models.rs

@@ -107,6 +107,14 @@ pub struct CompletedTaskDocument {
     timestamp: i64,
 }
 
+#[derive(Debug, Serialize, Deserialize)]
+pub struct Call {
+    pub contract: String,
+    pub call_data: Vec<String>,
+    pub entry_point: String,
+    pub regex: String,
+}
+
 #[derive(Debug, Serialize, Deserialize, Default)]
 pub struct QuestTaskDocument {
     pub(crate) id: i32,
@@ -120,6 +128,7 @@ pub struct QuestTaskDocument {
     pub verify_endpoint_type: String,
     pub api_url: Option<String>,
     pub regex: Option<String>,
+    pub calls: Option<Vec<Call>>,
     #[serde(default)]
     pub verify_redirect: Option<String>,
     #[serde(default)]