From 93d3388739c58469c46ec81322e36035c1fa3edf Mon Sep 17 00:00:00 2001
From: Omar Abdulla <OmarAbdulla7@hotmail.com>
Date: Wed, 6 Aug 2025 19:51:36 +0300
Subject: [PATCH] Add timing information to the CLI report

---
 crates/core/src/main.rs    | 8 +++++++-
 crates/format/src/input.rs | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/crates/core/src/main.rs b/crates/core/src/main.rs
index 2cfd02a..4221b8d 100644
--- a/crates/core/src/main.rs
+++ b/crates/core/src/main.rs
@@ -2,6 +2,7 @@ use std::{
     collections::HashMap,
     path::Path,
     sync::{Arc, LazyLock},
+    time::Instant,
 };
 
 use alloy::{
@@ -189,6 +190,7 @@ where
     )));
     let status_reporter_task = {
         let metadata_case_status = metadata_case_status.clone();
+        let start = Instant::now();
         async move {
             const GREEN: &str = "\x1B[32m";
             const RED: &str = "\x1B[31m";
@@ -281,8 +283,12 @@ where
                 tokio::time::sleep(std::time::Duration::from_secs(3)).await;
             }
 
+            let elapsed = start.elapsed();
             eprintln!(
-                "{GREEN}{number_of_successes}{RESET} cases succeeded, {RED}{number_of_failures}{RESET} cases failed"
+                "{GREEN}{}{RESET} cases succeeded, {RED}{}{RESET} cases failed in {} seconds",
+                number_of_successes,
+                number_of_failures,
+                elapsed.as_secs()
             );
         }
     };
diff --git a/crates/format/src/input.rs b/crates/format/src/input.rs
index 56ee955..b1dd067 100644
--- a/crates/format/src/input.rs
+++ b/crates/format/src/input.rs
@@ -599,7 +599,7 @@ impl<T: AsRef<str>> CalldataToken<T> {
                         Some(block_number) => *block_number,
                         None => resolver.last_block_number().await?,
                     };
-                    let desired_block_number = current_block_number - offset;
+                    let desired_block_number = current_block_number.saturating_sub(offset);
 
                     let block_hash = resolver.block_hash(desired_block_number.into()).await?;
 
@@ -612,7 +612,7 @@ impl<T: AsRef<str>> CalldataToken<T> {
                     Ok(U256::from(current_block_number))
                 } else if item == Self::BLOCK_TIMESTAMP_VARIABLE {
                     resolver
-                        .block_timestamp(BlockNumberOrTag::Latest)
+                        .block_timestamp(context.resolve_block_number(BlockNumberOrTag::Latest))
                         .await
                         .map(U256::from)
                 } else if let Some(variable_name) = item.strip_prefix(Self::VARIABLE_PREFIX) {