Filter by outbox address (#820)

rust/abacus-base/src/settings/mod.rs

@@ -391,6 +391,11 @@ impl Settings {
         match &self.outbox.chain {
             ChainConf::Ethereum(conn) => Ok(InterchainGasPaymasterIndexers::Ethereum(
                 InterchainGasPaymasterIndexerBuilder {
+                    outbox_address: self
+                        .outbox
+                        .addresses
+                        .outbox
+                        .parse::<ethers::types::Address>()?,
                     from_height: self.index.from(),
                     chunk_size: self.index.chunk_size(),
                     finality_blocks: self.outbox.finality_blocks(),

rust/chains/abacus-ethereum/abis/InterchainGasPaymaster.abi.json

@@ -29,6 +29,19 @@
     "name": "GasPayment",
     "type": "event"
   },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "uint8",
+        "name": "version",
+        "type": "uint8"
+      }
+    ],
+    "name": "Initialized",
+    "type": "event"
+  },
   {
     "anonymous": false,
     "inputs": [
@@ -55,6 +68,13 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
+  {
+    "inputs": [],
+    "name": "initialize",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "owner",

rust/chains/abacus-ethereum/src/interchain_gas.rs

@@ -30,6 +30,7 @@ where
 }
 
 pub struct InterchainGasPaymasterIndexerBuilder {
+    pub outbox_address: H160,
     pub from_height: u32,
     pub chunk_size: u32,
     pub finality_blocks: u32,
@@ -46,6 +47,7 @@ impl MakeableWithProvider for InterchainGasPaymasterIndexerBuilder {
         Box::new(EthereumInterchainGasPaymasterIndexer::new(
             Arc::new(provider),
             locator,
+            self.outbox_address,
             self.from_height,
             self.chunk_size,
             self.finality_blocks,
@@ -61,6 +63,7 @@ where
 {
     contract: Arc<EthereumInterchainGasPaymasterInternal<M>>,
     provider: Arc<M>,
+    outbox_address: H160,
     #[allow(unused)]
     from_height: u32,
     #[allow(unused)]
@@ -76,6 +79,7 @@ where
     pub fn new(
         provider: Arc<M>,
         locator: &ContractLocator,
+        outbox_address: H160,
         from_height: u32,
         chunk_size: u32,
         finality_blocks: u32,
@@ -86,6 +90,7 @@ where
                 provider.clone(),
             )),
             provider,
+            outbox_address,
             from_height,
             chunk_size,
             finality_blocks,
@@ -123,6 +128,7 @@ where
         let events = self
             .contract
             .gas_payment_filter()
+            .topic1(self.outbox_address)
             .from_block(from_block)
             .to_block(to_block)
             .query_with_meta()

rust/utils/run-locally/src/main.rs

@@ -456,6 +456,22 @@ fn assert_termination_invariants(num_expected_messages_processed: u32) {
         num_expected_messages_processed,
         msg_processed_count.into_iter().sum::<u32>()
     );
+
+    let gas_payment_events_count = ureq::get("http://127.0.0.1:9092/metrics")
+        .call()
+        .unwrap()
+        .into_string()
+        .unwrap()
+        .lines()
+        .filter(|l| l.starts_with("abacus_contract_sync_stored_events"))
+        .filter(|l| l.contains(r#"data_type="gas_payments""#))
+        .map(|l| l.rsplit_once(' ').unwrap().1.parse::<u32>().unwrap())
+        .next()
+        .unwrap();
+    assert!(
+        gas_payment_events_count >= num_expected_messages_processed,
+        "Synced gas payment event count is less than the number of messages"
+    );
 }
 
 /// Basically `tail -f file | grep <FILTER>` but also has to write to the file (writes to file all