🔧 fix: selector resolution by using an awaited tokio::task (#165)

* 🔧 fix: selector resolution by using an awaited tokio::task

* 💫 meta: make pre-commit clippy run with `--fix`

Author: Jon-Becker

Diff for: .pre-commit-config.yaml

@@ -21,7 +21,7 @@ repos:
       pass_filenames: false
     - id: clippy
       name: clippy
-      entry: sh scripts/clippy
+      entry: sh scripts/clippy --fix
       language: system
       types: [rust]
       pass_filenames: false

Diff for: Cargo.lock

@@ -1,11 +1,11 @@
 use std::{
     collections::{HashMap, HashSet},
     sync::{Arc, Mutex},
-    thread,
     time::Duration,
 };
 
 use indicatif::ProgressBar;
+use tokio::task;
 
 use crate::{io::logging::Logger, utils::strings::decode_hex};
 
@@ -105,7 +105,7 @@ pub fn resolve_entry_point(evm: &VM, selector: &str) -> u128 {
     0
 }
 
-pub fn resolve_selectors<T>(selectors: Vec<String>) -> HashMap<String, Vec<T>>
+pub async fn resolve_selectors<T>(selectors: Vec<String>) -> HashMap<String, Vec<T>>
 where
     T: ResolveSelector + Send + Clone + 'static, {
     // get a new logger
@@ -138,7 +138,7 @@ where
         let resolve_progress = resolve_progress.clone();
 
         // create a new thread for each selector
-        threads.push(thread::spawn(move || async move {
+        threads.push(task::spawn(async move {
             if let Some(function) = T::resolve(&selector).await {
                 let mut _resolved_functions =
                     function_clone.lock().expect("Could not obtain lock on function_clone.");
@@ -153,7 +153,10 @@ where
 
     // wait for all threads to finish
     for thread in threads {
-        if thread.join().is_ok() {}
+        if let Err(e) = thread.await {
+            // Handle error
+            eprintln!("Task failed: {:?}", e);
+        }
     }
 
     resolve_progress.lock().unwrap().finish_and_clear();

Diff for: common/src/ether/selectors.rs

@@ -4,6 +4,8 @@ use serde_json::Value;
 use std::time::Duration;
 use tokio::time::sleep as async_sleep;
 
+use crate::io::logging::Logger;
+
 static APP_USER_AGENT: &str = concat!(env!("CARGO_PKG_NAME"), "/", env!("CARGO_PKG_VERSION"),);
 
 /// Make a GET request to the target URL and return the response body as JSON
@@ -25,15 +27,25 @@ async fn _get_json_from_url(
     retries_remaining: u8,
     timeout: u64,
 ) -> Result<Option<Value>, reqwest::Error> {
+    // get a new logger
+    let level = std::env::var("RUST_LOG").unwrap_or_else(|_| "INFO".into());
+    let (logger, _) = Logger::new(&level);
+
+    logger.debug_max(&format!("GET {}", &url));
+
     let client = Client::builder()
         .danger_accept_invalid_certs(true)
         .user_agent(APP_USER_AGENT)
         .timeout(Duration::from_secs(timeout))
         .build()?;
 
     let res = match client.get(url).send().await {
-        Ok(res) => res,
-        Err(_) => {
+        Ok(res) => {
+            logger.debug_max(&format!("GET {}: {:?}", &url, &res));
+            res
+        }
+        Err(e) => {
+            logger.debug_max(&format!("GET {}: {:?}", &url, &e));
             if retries_remaining == 0 {
                 return Ok(None)
             }

Diff for: common/src/utils/http.rs

@@ -237,7 +237,7 @@ pub async fn decompile(
 
     let mut resolved_selectors = HashMap::new();
     if !args.skip_resolving {
-        resolved_selectors = resolve_selectors(selectors.keys().cloned().collect());
+        resolved_selectors = resolve_selectors(selectors.keys().cloned().collect()).await;
 
         // if resolved selectors are empty, we can't perform symbolic execution
         if resolved_selectors.is_empty() {
@@ -482,7 +482,8 @@ pub async fn decompile(
                     .keys()
                     .map(|error_selector| encode_hex_reduced(*error_selector).replacen("0x", "", 1))
                     .collect(),
-            );
+            )
+            .await;
             for (error_selector, _) in analyzed_function.errors.clone() {
                 let error_selector_str = encode_hex_reduced(error_selector).replacen("0x", "", 1);
                 let mut selected_error_index: u8 = 0;
@@ -547,7 +548,8 @@ pub async fn decompile(
                     .keys()
                     .map(|event_selector| encode_hex_reduced(*event_selector).replacen("0x", "", 1))
                     .collect(),
-            );
+            )
+            .await;
             for (event_selector, (_, raw_event)) in analyzed_function.events.clone() {
                 let mut selected_event_index: u8 = 0;
                 let event_selector_str = encode_hex_reduced(event_selector).replacen("0x", "", 1);

Diff for: core/src/decompile/mod.rs

@@ -222,7 +222,7 @@ pub async fn snapshot(args: SnapshotArgs) -> Result<SnapshotResult, Box<dyn std:
     let mut resolved_selectors = HashMap::new();
     if !args.skip_resolving {
         resolved_selectors =
-            resolve_selectors::<ResolvedFunction>(selectors.keys().cloned().collect());
+            resolve_selectors::<ResolvedFunction>(selectors.keys().cloned().collect()).await;
 
         // if resolved selectors are empty, we can't perform symbolic execution
         if resolved_selectors.is_empty() {
@@ -399,7 +399,8 @@ pub async fn snapshot(args: SnapshotArgs) -> Result<SnapshotResult, Box<dyn std:
                     .keys()
                     .map(|error_selector| encode_hex_reduced(*error_selector).replacen("0x", "", 1))
                     .collect(),
-            );
+            )
+            .await;
             for (error_selector, _) in snapshot.errors.clone() {
                 let error_selector_str = encode_hex_reduced(error_selector).replacen("0x", "", 1);
                 let mut selected_error_index: u8 = 0;
@@ -464,7 +465,8 @@ pub async fn snapshot(args: SnapshotArgs) -> Result<SnapshotResult, Box<dyn std:
                     .keys()
                     .map(|event_selector| encode_hex_reduced(*event_selector).replacen("0x", "", 1))
                     .collect(),
-            );
+            )
+            .await;
             for (event_selector, (_, raw_event)) in snapshot.events.clone() {
                 let mut selected_event_index: u8 = 0;
                 let event_selector_str = encode_hex_reduced(event_selector).replacen("0x", "", 1);