add empty check while fetching events and small fixes

Author: akaladarshi

src/rpc/methods/eth/filter/mod.rs

@@ -285,7 +285,9 @@ impl EthEventHandler {
 
         ensure!(
             messages.len() == events.len(),
-            "Length of messages and events do not match"
+            "Length of messages ({}) and events ({}) do not match",
+            messages.len(),
+            events.len(),
         );
 
         let mut event_count = 0;
@@ -374,7 +376,12 @@ impl EthEventHandler {
             .tipset_state_events(tipset, Some(events_root))
             .await?;
 
-        ensure!(state_events.roots.len() == state_events.events.len());
+        ensure!(
+            state_events.roots.len() == state_events.events.len(),
+            "State events roots ({}) and events length ({}) mismatch ",
+            state_events.roots.len(),
+            state_events.events.len(),
+        );
 
         let filtered_events = state_events
             .roots

src/state_manager/mod.rs

@@ -91,7 +91,7 @@ use tracing::{error, info, instrument, trace, warn};
 pub use utils::is_valid_for_sending;
 
 const DEFAULT_TIPSET_CACHE_SIZE: NonZeroUsize = nonzero!(1024usize);
-const EVENTS_AMT_BITWIDTH: u32 = 5;
+pub const EVENTS_AMT_BITWIDTH: u32 = 5;
 
 /// Intermediary for retrieving state objects and updating actor states.
 type CidPair = (Cid, Cid);
@@ -567,18 +567,19 @@ where
                 key,
                 Box::new(move || {
                     Box::pin(async move {
-                        // If the events are not in the cache, try to load them from the blockstore
-                        if let Some(events_root) = events_root
-                            && let Ok(stamped_events) =
-                                StampedEvent::get_events(this.blockstore(), &events_root)
+                        // Try to load events directly from the blockstore
+                        if let Some(stamped_events) = events_root
+                            .as_ref()
+                            .and_then(|root| StampedEvent::get_events(this.blockstore(), root).ok())
+                            .filter(|events| !events.is_empty())
                         {
                             return Ok(StateEvents {
                                 events: vec![stamped_events],
-                                roots: vec![Some(events_root)],
+                                roots: vec![events_root],
                             });
                         }
 
-                        // If the events are neither in the cache nor in the blockstore, compute them.
+                        // Fallback: compute the tipset state if events not found in the blockstore
                         let state_out = this
                             .compute_tipset_state(ts, NO_CALLBACK, VMTrace::NotTraced)
                             .await?;