fix: remove unique events logic from the ChainGetEvents API

CHANGELOG.md

@@ -49,17 +49,22 @@
 
 - [#6368](https://github.com/ChainSafe/forest/pull/6368): Migrated build and development tooling from Makefile to `mise`. Contributors should install `mise` and use `mise run` commands instead of `make` commands.
 
+- [#6286](https://github.com/ChainSafe/forest/pull/6286) `Filecoin.ChainGetEvents` now returns an error if the events are not present in the db.
+
 ### Removed
 
 ### Fixed
 
 - [#6409](https://github.com/ChainSafe/forest/pull/6409) Fixed backfill issue when null tipsets are present.
 
 - [#6327](https://github.com/ChainSafe/forest/pull/6327) Fixed: Forest returns 404 for all invalid api paths.
+
 - [#6354](https://github.com/ChainSafe/forest/pull/6354) Fixed: Correctly calculate the epoch range instead of directly using the look back limit value while searching for messages.
 
 - [#6400](https://github.com/ChainSafe/forest/issues/6400) Fixed `eth_subscribe` `newHeads` to return Ethereum block format instead of Filecoin block headers array.
 
+- [#6286](https://github.com/ChainSafe/forest/pull/6286) Fixed: `Filecoin.ChainGetEvents` API returns correct events.
+
 - [#6430](https://github.com/ChainSafe/forest/issues/6430) Fixed a panic when syncing from genesis on the calibration network.
 
 ## Forest v0.30.5 "Dulce de Leche"

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "forest-filecoin"
-version = "0.30.5"
+version = "0.31.0"
 authors = ["ChainSafe Systems <[email protected]>"]
 repository = "https://github.com/ChainSafe/forest"
 edition = "2024"

scripts/tests/api_compare/filter-list

@@ -1,6 +1,2 @@
 # This list contains potentially broken methods (or tests) that are ignored.
 # They should be considered bugged, and not used until the root cause is resolved.
-
-# Ignoring ChainGetEvents for now, as we are not sure if we should get duplicated events or not.
-# TODO(forest): https://github.com/ChainSafe/forest/issues/6271.
-!Filecoin.ChainGetEvents

scripts/tests/api_compare/filter-list-offline

@@ -27,6 +27,3 @@
 !Filecoin.EthGetBlockByNumber
 !eth_getBlockByNumber
 !Filecoin.ChainSetHead
-# Ignoring ChainGetEvents for now, as we are not sure if we should get duplicated events or not.
-# TODO(forest): https://github.com/ChainSafe/forest/issues/6271.
-!Filecoin.ChainGetEvents

src/chain/store/chain_store.rs

@@ -6,7 +6,7 @@ use super::{
     index::{ChainIndex, ResolveNullTipset},
     tipset_tracker::TipsetTracker,
 };
-use crate::db::{EthMappingsStore, EthMappingsStoreExt, IndicesStore, IndicesStoreExt};
+use crate::db::{EthMappingsStore, EthMappingsStoreExt};
 use crate::interpreter::{BlockMessages, VMTrace};
 use crate::libp2p_bitswap::{BitswapStoreRead, BitswapStoreReadWrite};
 use crate::message::{ChainMessage, Message as MessageTrait, SignedMessage};
@@ -82,9 +82,6 @@ pub struct ChainStore<DB> {
     /// Ethereum mappings store
     eth_mappings: Arc<dyn EthMappingsStore + Sync + Send>,
 
-    /// Indices store
-    indices: Arc<dyn IndicesStore + Sync + Send>,
-
     /// Needed by the Ethereum mapping.
     chain_config: Arc<ChainConfig>,
 }
@@ -121,7 +118,6 @@ where
         db: Arc<DB>,
         heaviest_tipset_key_provider: Arc<dyn HeaviestTipsetKeyProvider + Sync + Send>,
         eth_mappings: Arc<dyn EthMappingsStore + Sync + Send>,
-        indices: Arc<dyn IndicesStore + Sync + Send>,
         chain_config: Arc<ChainConfig>,
         genesis_block_header: CachingBlockHeader,
     ) -> anyhow::Result<Self> {
@@ -139,7 +135,6 @@ where
             genesis_block_header,
             validated_blocks,
             eth_mappings,
-            indices,
             chain_config,
         };
 
@@ -204,15 +199,6 @@ where
             .map(|(cid, _)| cid))
     }
 
-    pub fn put_index<V: Serialize>(&self, key: &Cid, value: &V) -> Result<(), Error> {
-        self.indices.write_obj(key, value)?;
-        Ok(())
-    }
-
-    pub fn get_tipset_key(&self, key: &Cid) -> Result<Option<TipsetKey>, Error> {
-        Ok(self.indices.read_obj(key)?)
-    }
-
     /// Expands tipset to tipset with all other headers in the same epoch using
     /// the tipset tracker.
     fn expand_tipset(&self, header: CachingBlockHeader) -> Result<Tipset, Error> {
@@ -754,15 +740,8 @@ mod tests {
             message_receipts: Cid::new_v1(DAG_CBOR, MultihashCode::Identity.digest(&[])),
             ..Default::default()
         });
-        let cs = ChainStore::new(
-            db.clone(),
-            db.clone(),
-            db.clone(),
-            db,
-            chain_config,
-            gen_block.clone(),
-        )
-        .unwrap();
+        let cs =
+            ChainStore::new(db.clone(), db.clone(), db, chain_config, gen_block.clone()).unwrap();
 
         assert_eq!(cs.genesis_block_header(), &gen_block);
     }
@@ -776,15 +755,7 @@ mod tests {
             ..Default::default()
         });
 
-        let cs = ChainStore::new(
-            db.clone(),
-            db.clone(),
-            db.clone(),
-            db,
-            chain_config,
-            gen_block,
-        )
-        .unwrap();
+        let cs = ChainStore::new(db.clone(), db.clone(), db, chain_config, gen_block).unwrap();
 
         let cid = Cid::new_v1(DAG_CBOR, MultihashCode::Blake2b256.digest(&[1, 2, 3]));
         assert!(!cs.is_block_validated(&cid));

src/chain_sync/chain_follower.rs

@@ -923,7 +923,6 @@ mod tests {
                 db.clone(),
                 db.clone(),
                 db.clone(),
-                db.clone(),
                 Default::default(),
                 genesis_header.clone().into(),
             )

src/daemon/context.rs

@@ -246,7 +246,6 @@ async fn create_state_manager(
         Arc::clone(db),
         Arc::new(db.clone()),
         eth_mappings,
-        db.writer().clone(),
         chain_config.clone(),
         genesis_header.clone(),
     )?);

src/daemon/db_util.rs

@@ -339,14 +339,9 @@ where
     let epoch = ts.epoch();
     let tsk = ts.key().clone();
 
-    let state_output = state_manager
+    state_manager
         .compute_tipset_state(ts.clone(), NO_CALLBACK, VMTrace::NotTraced)
         .await?;
-    for events_root in state_output.events_roots.iter().flatten() {
-        tracing::trace!("Indexing events root @{epoch}: {events_root}");
-
-        state_manager.chain_store().put_index(events_root, &tsk)?;
-    }
 
     delegated_messages.append(
         &mut state_manager

src/db/car/many.rs

@@ -11,8 +11,8 @@
 use super::{AnyCar, ZstdFrameCache};
 use crate::blocks::TipsetKey;
 use crate::db::{
-    BlockstoreWriteOpsSubscribable, EthMappingsStore, IndicesStore, MemoryDB, PersistentStore,
-    SettingsStore, SettingsStoreExt,
+    BlockstoreWriteOpsSubscribable, EthMappingsStore, MemoryDB, PersistentStore, SettingsStore,
+    SettingsStoreExt,
 };
 use crate::libp2p_bitswap::BitswapStoreReadWrite;
 use crate::rpc::eth::types::EthHash;
@@ -251,20 +251,6 @@ impl<WriterT: EthMappingsStore> EthMappingsStore for ManyCar<WriterT> {
     }
 }
 
-impl<WriterT: IndicesStore> IndicesStore for ManyCar<WriterT> {
-    fn read_bin(&self, key: &Cid) -> anyhow::Result<Option<Vec<u8>>> {
-        IndicesStore::read_bin(self.writer(), key)
-    }
-
-    fn write_bin(&self, key: &Cid, value: &[u8]) -> anyhow::Result<()> {
-        IndicesStore::write_bin(self.writer(), key, value)
-    }
-
-    fn exists(&self, key: &Cid) -> anyhow::Result<bool> {
-        IndicesStore::exists(self.writer(), key)
-    }
-}
-
 impl<T: Blockstore + SettingsStore> super::super::HeaviestTipsetKeyProvider for ManyCar<T> {
     fn heaviest_tipset_key(&self) -> anyhow::Result<TipsetKey> {
         match SettingsStoreExt::read_obj::<TipsetKey>(self, crate::db::setting_keys::HEAD_KEY)? {

src/db/memory.rs

@@ -3,7 +3,7 @@
 
 use super::{EthMappingsStore, SettingsStore, SettingsStoreExt};
 use crate::blocks::TipsetKey;
-use crate::db::{IndicesStore, PersistentStore};
+use crate::db::PersistentStore;
 use crate::libp2p_bitswap::{BitswapStoreRead, BitswapStoreReadWrite};
 use crate::rpc::eth::types::EthHash;
 use crate::utils::db::car_stream::CarBlock;
@@ -21,7 +21,6 @@ pub struct MemoryDB {
     blockchain_persistent_db: RwLock<HashMap<Cid, Vec<u8>>>,
     settings_db: RwLock<HashMap<String, Vec<u8>>>,
     pub eth_mappings_db: RwLock<HashMap<EthHash, Vec<u8>>>,
-    pub indices_db: RwLock<HashMap<Cid, Vec<u8>>>,
 }
 
 impl MemoryDB {
@@ -110,23 +109,6 @@ impl EthMappingsStore for MemoryDB {
     }
 }
 
-impl IndicesStore for MemoryDB {
-    fn read_bin(&self, key: &Cid) -> anyhow::Result<Option<Vec<u8>>> {
-        Ok(self.indices_db.read().get(key).cloned())
-    }
-
-    fn write_bin(&self, key: &Cid, value: &[u8]) -> anyhow::Result<()> {
-        self.indices_db
-            .write()
-            .insert(key.to_owned(), value.to_vec());
-        Ok(())
-    }
-
-    fn exists(&self, key: &Cid) -> anyhow::Result<bool> {
-        Ok(self.indices_db.read().contains_key(key))
-    }
-}
-
 impl Blockstore for MemoryDB {
     fn get(&self, k: &Cid) -> anyhow::Result<Option<Vec<u8>>> {
         Ok(self.blockchain_db.read().get(k).cloned().or(self

src/db/migration/migration_map.rs

@@ -10,6 +10,7 @@ use std::{
 use crate::Config;
 use crate::db::migration::v0_22_1::Migration0_22_0_0_22_1;
 use crate::db::migration::v0_26_0::Migration0_25_3_0_26_0;
+use crate::db::migration::v0_31_0::Migration0_30_5_0_31_0;
 use anyhow::Context as _;
 use anyhow::bail;
 use itertools::Itertools;
@@ -155,6 +156,7 @@ pub(super) static MIGRATIONS: LazyLock<MigrationsMap> = LazyLock::new(|| {
 create_migrations!(
     "0.22.0" -> "0.22.1" @ Migration0_22_0_0_22_1,
     "0.25.3" -> "0.26.0" @ Migration0_25_3_0_26_0,
+    "0.30.5" -> "0.31.0" @ Migration0_30_5_0_31_0,
 );
 
 /// Creates a migration chain from `start` to `goal`. The chain is chosen to be the shortest

src/db/migration/mod.rs

@@ -5,6 +5,7 @@ mod db_migration;
 mod migration_map;
 mod v0_22_1;
 mod v0_26_0;
+mod v0_31_0;
 mod void_migration;
 
 pub use db_migration::DbMigration;