No Exit Run Loop (#189)

Author: bh2smith

event-handler/src/cli.rs

@@ -30,7 +30,7 @@ pub struct Args {
     pub chain_source: ChainDataSource,
 
     /// BlockRange width for run-loop processing.
-    #[clap(long, env, default_value = "1000")]
+    #[clap(long, env, default_value = "25")]
     pub page_size: i64,
 
     /// TokenUri retry blocks
@@ -48,4 +48,8 @@ pub struct Args {
     /// List of Token Contract addresses to avoid making tokenUri requests for.
     #[clap(long, env, use_value_delimiter = true)]
     pub token_avoid_list: Vec<Address>,
+
+    /// Wait time for new finalized blocks
+    #[clap(long, env, default_value = "180")]
+    pub arak_poll_frequency: u64,
 }

event-handler/src/main.rs

@@ -36,5 +36,5 @@ async fn main() -> Result<()> {
 
     let start_from = handler.store.get_processed_block() + 1;
     tracing::info!("beginning event processor from {start_from}");
-    handler.run(start_from).await
+    handler.run(start_from, args.arak_poll_frequency).await
 }

event-handler/src/processor.rs

@@ -14,6 +14,7 @@ use event_retriever::db_reader::{
     diesel::{BlockRange, EventSource},
     models::*,
 };
+use std::time::Duration;
 use std::{collections::HashMap, sync::Arc};
 
 pub struct EventProcessor {
@@ -52,15 +53,27 @@ impl EventProcessor {
             metadata_client,
         })
     }
+    pub async fn run(&mut self, start_from: i64, wait_secs: u64) -> Result<()> {
+        let mut current_block = start_from;
+        loop {
+            current_block = self.run_inner(current_block).await?;
+            // Sleep for a bit and reenter the loop.
+            tracing::info!(
+                "Reached the last finalized block. Waiting for {} for more...",
+                wait_secs
+            );
+            tokio::time::sleep(Duration::from_secs(wait_secs)).await;
+        }
+    }
 
-    pub async fn run(&mut self, start_from: i64) -> Result<()> {
+    pub async fn run_inner(&mut self, start_from: i64) -> Result<i64> {
         let mut current_block = start_from;
         loop {
             // TODO - (after reorg handling) Replace with get_indexed_block (finalized is safe)
             //  https://github.com/Mintbase/evm-indexer/issues/104
             let max_block = self.source.get_finalized_block();
 
-            if current_block > max_block {
+            if current_block >= max_block {
                 // Exit when reached or exceeded the max_block
                 break;
             }
@@ -76,8 +89,7 @@ impl EventProcessor {
             // Update current_block for the next iteration
             current_block = block_range.end;
         }
-
-        Ok(())
+        Ok(current_block)
     }
 
     fn check_for_contract(&mut self, event: &EventBase) {
@@ -293,7 +305,7 @@ mod tests {
     async fn test_run() {
         let mut handler = test_processor().await;
         let start_from = std::cmp::max(handler.store.get_processed_block() + 1, 15_000_000);
-        let result = handler.run(start_from).await;
+        let result = handler.run(start_from, 5).await;
         assert!(result.is_ok());
     }
 }

metadata-retriever/src/routes/token/metadata/homebrew.rs

@@ -136,6 +136,7 @@ mod tests {
     }
 
     #[tokio::test]
+    #[ignore = "unreliable responses - for local testing only"]
     async fn url_request_certificate_errors() {
         // Untrusted Certificate
         let urls = [
@@ -166,7 +167,7 @@ mod tests {
         // assert_eq!(error_set.len(), 1);
     }
     #[tokio::test]
-    #[ignore = "unreliable responses"]
+    #[ignore = "unreliable responses - for local testing only"]
     async fn url_request_error_trying_to_connect() {
         // DNS Error
         // There are several variants of DNS error:
@@ -296,7 +297,7 @@ mod tests {
     }
 
     #[tokio::test]
-    #[ignore = "unreliable responses"]
+    #[ignore = "unreliable responses - for local testing only"]
     async fn url_request_500_status_errors() {
         // 500 Internal Server Error
         assert!(
@@ -382,6 +383,7 @@ mod tests {
     }
 
     #[tokio::test]
+    #[ignore = "ENS metadata domain is down: https://metadata.ens.domains"]
     async fn ens_override() {
         let token_id =
             "31913142322058250240866303485500832898255309823098443696464130050119537886147";