refactor: pending to preconf

crates/cli/src/options.rs

@@ -127,11 +127,13 @@ pub struct IndexingOptions {
 
     /// Enable indexing pending blocks
     #[arg(
-        long = "indexing.pending",
+        long = "indexing.preconfirmed",
+        alias = "indexing.pending",
         default_value_t = true,
         help = "Whether or not to index pending blocks."
     )]
-    pub pending: bool,
+    #[serde(alias = "pending")]
+    pub preconfirmed: bool,
 
     /// Polling interval in ms
     #[arg(
@@ -229,7 +231,7 @@ impl Default for IndexingOptions {
             events_chunk_size: DEFAULT_EVENTS_CHUNK_SIZE,
             blocks_chunk_size: DEFAULT_BLOCKS_CHUNK_SIZE,
             batch_chunk_size: DEFAULT_BATCH_CHUNK_SIZE,
-            pending: true,
+            preconfirmed: true,
             polling_interval: DEFAULT_POLLING_INTERVAL,
             max_concurrent_tasks: DEFAULT_MAX_CONCURRENT_TASKS,
             transactions: false,

crates/indexer/fetcher/src/json_rpc.rs

@@ -53,24 +53,26 @@ impl<P: Provider + Send + Sync + Clone + std::fmt::Debug + 'static> Fetcher<P> {
             .record(range_start.elapsed().as_secs_f64());
         debug!(target: LOG_TARGET, duration = ?range_start.elapsed(), cursors = ?cursors, "Fetched data for range.");
 
-        let (preconfirmed_block, cursors) =
-            if self.config.flags.contains(FetchingFlags::PENDING_BLOCKS)
-                && cursors
-                    .cursors
-                    .values()
-                    .any(|c| c.head == Some(latest_block.block_number))
-            {
-                let pending_start = Instant::now();
-                let pending_result = self
-                    .fetch_preconfirmed_block(latest_block.block_number, &cursors)
-                    .await?;
-                histogram!("torii_fetcher_pending_duration_seconds")
-                    .record(pending_start.elapsed().as_secs_f64());
-
-                pending_result
-            } else {
-                (None, cursors)
-            };
+        let (preconfirmed_block, cursors) = if self
+            .config
+            .flags
+            .contains(FetchingFlags::PRECONFIRMED_BLOCK)
+            && cursors
+                .cursors
+                .values()
+                .any(|c| c.head == Some(latest_block.block_number))
+        {
+            let preconfirmed_start = Instant::now();
+            let preconfirmed_result = self
+                .fetch_preconfirmed_block(latest_block.block_number, &cursors)
+                .await?;
+            histogram!("torii_fetcher_preconfirmed_duration_seconds")
+                .record(preconfirmed_start.elapsed().as_secs_f64());
+
+            preconfirmed_result
+        } else {
+            (None, cursors)
+        };
 
         histogram!("torii_fetcher_total_duration_seconds")
             .record(fetch_start.elapsed().as_secs_f64());

crates/indexer/fetcher/src/lib.rs

@@ -18,7 +18,7 @@ bitflags! {
     #[derive(Debug, Clone)]
     pub struct FetchingFlags: u32 {
         const TRANSACTIONS = 0b00000001;
-        const PENDING_BLOCKS = 0b00000010;
+        const PRECONFIRMED_BLOCK = 0b00000010;
     }
 }
 

crates/runner/src/lib.rs

@@ -339,8 +339,8 @@ impl Runner {
         if self.args.indexing.transactions {
             fetching_flags.insert(FetchingFlags::TRANSACTIONS);
         }
-        if self.args.indexing.pending {
-            fetching_flags.insert(FetchingFlags::PENDING_BLOCKS);
+        if self.args.indexing.preconfirmed {
+            fetching_flags.insert(FetchingFlags::PRECONFIRMED_BLOCK);
         }
 
         let storage = Arc::new(db.clone());