fix: use contract addresses to filter events (#469)

Author: Rano | Ranadeep

relayer/crates/starknet-chain-components/src/components/encoding/event.rs

@@ -86,9 +86,10 @@ mod preset {
             ]:
                 DecodeClientRelayEvents,
             (ViaCairo, Option<Erc20Event>):
+                // Only used in erc20 e2e test
                 DecodeOptionalByClassHash<symbol!("erc20_hashes")>,
             (ViaCairo, Option<IbcTransferEvent>):
-                DecodeOptionalByClassHash<symbol!("ics20_hashes")>,
+                DecodeOptionalByContractAddress<symbol!("ics20_contract_addresses")>,
             [
                 (ViaCairo, Option<ConnectionHandshakeEvents>),
                 (ViaCairo, Option<ChannelHandshakeEvents>),

relayer/crates/starknet-chain-context/src/contexts/encoding/event.rs

@@ -26,8 +26,8 @@ use crate::impls::HandleStarknetChainError;
 #[derive(HasField, Default, Clone)]
 pub struct StarknetEventEncoding {
     pub erc20_hashes: OnceLock<HashSet<Felt>>,
-    pub ics20_hashes: OnceLock<HashSet<Felt>>,
-    pub ibc_client_hashes: OnceLock<HashSet<Felt>>,
+    pub ics20_contract_addresses: OnceLock<HashSet<StarknetAddress>>,
+    pub ibc_client_contract_addresses: OnceLock<HashSet<StarknetAddress>>,
     pub ibc_core_contract_addresses: OnceLock<HashSet<StarknetAddress>>,
 }
 

relayer/crates/starknet-cli/src/contexts/app.rs

@@ -243,14 +243,8 @@ impl ConfigUpdater<StarknetChainDriver, StarknetRelayerConfig> for UpdateStarkne
                 .erc20_hashes
                 .get()
                 .and_then(|hashes| hashes.iter().cloned().next()),
-            ics20: event_encoding
-                .ics20_hashes
-                .get()
-                .and_then(|hashes| hashes.iter().cloned().next()),
-            ibc_client: event_encoding
-                .ibc_client_hashes
-                .get()
-                .and_then(|hashes| hashes.iter().cloned().next()),
+            ics20: None,
+            ibc_client: None,
         };
 
         let relayer_wallet_path_1 = chain_driver

relayer/crates/starknet-relayer/src/contexts/builder.rs

@@ -399,12 +399,12 @@ impl StarknetBuilder {
             .set(HashSet::from_iter(contract_classes.erc20))
             .unwrap();
         event_encoding
-            .ics20_hashes
-            .set(HashSet::from_iter(contract_classes.ics20))
+            .ics20_contract_addresses
+            .set(HashSet::from_iter(contract_addresses.ibc_ics20))
             .unwrap();
         event_encoding
-            .ibc_client_hashes
-            .set(HashSet::from_iter(contract_classes.ibc_client))
+            .ibc_client_contract_addresses
+            .set(HashSet::from_iter(contract_addresses.ibc_client))
             .unwrap();
         event_encoding
             .ibc_core_contract_addresses

relayer/crates/starknet-test-components/src/impls/bootstrap/deploy_contracts.rs

@@ -67,9 +67,9 @@ where
 {
     fn erc20_hashes(&self) -> &OnceLock<HashSet<Chain::ContractClassHash>>;
 
-    fn ics20_hashes(&self) -> &OnceLock<HashSet<Chain::ContractClassHash>>;
+    fn ics20_contract_addresses(&self) -> &OnceLock<HashSet<Chain::Address>>;
 
-    fn ibc_client_hashes(&self) -> &OnceLock<HashSet<Chain::ContractClassHash>>;
+    fn ibc_client_contract_addresses(&self) -> &OnceLock<HashSet<Chain::Address>>;
 
     fn ibc_core_contract_addresses(&self) -> &OnceLock<HashSet<Chain::Address>>;
 }
@@ -344,17 +344,17 @@ where
             })?;
 
         event_encoding
-            .ics20_hashes()
-            .set([ics20_class_hash].into())
+            .ics20_contract_addresses()
+            .set([ics20_contract_address].into())
             .map_err(|_| {
-                Bootstrap::raise_error("failed to set ics20_class_hash on event encoding")
+                Bootstrap::raise_error("failed to set ics20_contract_address on event encoding")
             })?;
 
         event_encoding
-            .ibc_client_hashes()
-            .set([comet_client_class_hash].into())
+            .ibc_client_contract_addresses()
+            .set([comet_client_address].into())
             .map_err(|_| {
-                Bootstrap::raise_error("failed to set comet_client_class_hash on event encoding")
+                Bootstrap::raise_error("failed to set comet_client_address on event encoding")
             })?;
 
         event_encoding