feat(voyager): use new evm events in block fetching

allowed us to remove an entire aggregation step since the events now contain more data
unionlabs · May 15, 2024 · 02699af · 02699af
1 parent 2288aaf
commit 02699af
Show file tree

Hide file tree

Showing 5 changed files with 168 additions and 345 deletions.
diff --git a/evm/contracts/core/03-connection/IBCConnection.sol b/evm/contracts/core/03-connection/IBCConnection.sol
@@ -14,13 +14,22 @@ library IBCConnectionLib {
         string connectionId, string clientId, string counterpartyClientId
     );
     event ConnectionOpenTry(
-        string connectionId, string clientId, string counterpartyClientId
+        string connectionId,
+        string clientId,
+        string counterpartyClientId,
+        string counterpartyConnectionId
     );
     event ConnectionOpenAck(
-        string connectionId, string clientId, string counterpartyClientId
+        string connectionId,
+        string clientId,
+        string counterpartyClientId,
+        string counterpartyConnectionId
     );
     event ConnectionOpenConfirm(
-        string connectionId, string clientId, string counterpartyClientId
+        string connectionId,
+        string clientId,
+        string counterpartyClientId,
+        string counterpartyConnectionId
     );
 
     error ErrConnectionAlreadyExists();
@@ -443,7 +452,10 @@ contract IBCConnection is IBCStore, IIBCConnectionHandshake {
         updateConnectionCommitment(connectionId);
 
         emit IBCConnectionLib.ConnectionOpenTry(
-            connectionId, msg_.clientId, msg_.counterparty.client_id
+            connectionId,
+            msg_.clientId,
+            msg_.counterparty.client_id,
+            msg_.counterparty.connection_id
         );
 
         return connectionId;
@@ -525,6 +537,7 @@ contract IBCConnection is IBCStore, IIBCConnectionHandshake {
         emit IBCConnectionLib.ConnectionOpenAck(
             msg_.connectionId,
             connection.client_id,
+            connection.counterparty.client_id,
             connection.counterparty.connection_id
         );
     }
@@ -581,6 +594,7 @@ contract IBCConnection is IBCStore, IIBCConnectionHandshake {
         emit IBCConnectionLib.ConnectionOpenConfirm(
             msg_.connectionId,
             connection.client_id,
+            connection.counterparty.client_id,
             connection.counterparty.connection_id
         );
     }

diff --git a/generated/rust/contracts/src/ibc_connection.rs b/generated/rust/contracts/src/ibc_connection.rs
diff --git a/lib/block-message/src/chain_impls/arbitrum.rs b/lib/block-message/src/chain_impls/arbitrum.rs
@@ -8,9 +8,8 @@ use unionlabs::{ethereum::config::Mainnet, traits::Chain};
 use crate::{
     aggregate::{Aggregate, AnyAggregate},
     chain_impls::ethereum::{
-        fetch_beacon_block_range, fetch_channel, fetch_connection, fetch_get_logs,
-        AggregateWithChannel, AggregateWithConnection, ChannelData, ConnectionData,
-        FetchBeaconBlockRange, FetchChannel, FetchConnection, FetchEvents, FetchGetLogs,
+        fetch_beacon_block_range, fetch_channel, fetch_get_logs, AggregateWithChannel, ChannelData,
+        ConnectionData, FetchBeaconBlockRange, FetchChannel, FetchEvents, FetchGetLogs,
     },
     data::{AnyData, ChainEvent, Data},
     fetch::{AnyFetch, DoFetch, DoFetchBlockRange, Fetch, FetchBlockRange},
@@ -66,7 +65,6 @@ where
                 fetch_beacon_block_range(c, beacon_block_range, &c.l1.beacon_api_client).await
             }
             ArbitrumFetch::FetchChannel(channel) => fetch_channel(c, channel).await,
-            ArbitrumFetch::FetchConnection(connection) => fetch_connection(c, connection).await,
         }
     }
 }
@@ -79,7 +77,6 @@ pub enum ArbitrumFetch {
     FetchBeaconBlockRange(FetchBeaconBlockRange),
 
     FetchChannel(FetchChannel<Arbitrum>),
-    FetchConnection(FetchConnection<Arbitrum>),
 }
 
 #[queue_msg]
@@ -92,7 +89,6 @@ pub struct FetchBatchIndex {
 #[derive(Enumorph)]
 pub enum ArbitrumAggregate {
     AggregateWithChannel(AggregateWithChannel<Arbitrum>),
-    AggregateWithConnection(AggregateWithConnection<Arbitrum>),
 }
 
 impl DoAggregate for Identified<Arbitrum, ArbitrumAggregate>
@@ -108,9 +104,6 @@ where
     ) -> QueueMsg<BlockMessageTypes> {
         match t {
             ArbitrumAggregate::AggregateWithChannel(msg) => do_aggregate(id(chain_id, msg), data),
-            ArbitrumAggregate::AggregateWithConnection(msg) => {
-                do_aggregate(id(chain_id, msg), data)
-            }
         }
     }
 }