chore(kms-connector): distinct from_block for decryption and kms (#1745)

* chore(kms-connector): distinct from_block for decryption and kms

* chore(kms-connector): rename config field

Author: eudelins-zama

kms-connector/config/gw-listener.toml

@@ -37,9 +37,13 @@ database_url = "postgres://postgres:postgres@localhost/kms-connector"
 # ENV: KMS_CONNECTOR_KMS_GENERATION_POLLING (format: https://docs.rs/humantime/latest/humantime/)
 # key_management_polling = "30s"
 
-# Block number to start processing from (optional, defaults to latest block if not set)
-# ENV: KMS_CONNECTOR_FROM_BLOCK_NUMBER
-# from_block_number = 1234
+# Block number to start processing decryption events from (optional, defaults to latest block if not set)
+# ENV: KMS_CONNECTOR_DECRYPTION_FROM_BLOCK_NUMBER
+# decryption_from_block_number = 1234
+
+# Block number to start processing KMS operation events from (optional, defaults to latest block if not set)
+# ENV: KMS_CONNECTOR_KMS_FROM_BLOCK_NUMBER
+# kms_operation_from_block_number = 1234
 
 # Configuration of the Decryption contract (required)
 [decryption_contract]

kms-connector/crates/gw-listener/src/core/config.rs

@@ -55,8 +55,10 @@ pub struct Config {
     #[serde(with = "humantime_serde", default = "default_key_management_polling")]
     pub key_management_polling: Duration,
 
-    /// Optional block number to start processing from.
-    pub from_block_number: Option<u64>,
+    /// Optional block number to start processing decryption events from.
+    pub decryption_from_block_number: Option<u64>,
+    /// Optional block number to start processing KMS operation events from.
+    pub kms_operation_from_block_number: Option<u64>,
 }
 
 impl DeserializeConfig for Config {}
@@ -89,7 +91,8 @@ impl Default for Config {
             healthcheck_timeout: default_healthcheck_timeout(),
             decryption_polling: default_decryption_polling(),
             key_management_polling: default_key_management_polling(),
-            from_block_number: None,
+            decryption_from_block_number: None,
+            kms_operation_from_block_number: None,
         }
     }
 }

kms-connector/crates/gw-listener/src/core/gw_listener.rs

@@ -298,8 +298,15 @@ where
 
     /// Get the last block polled from config or DB.
     async fn get_last_block_polled(&self, event_type: EventType) -> anyhow::Result<Option<u64>> {
-        let last_block_polled = match self.config.from_block_number {
-            // Start polling event from `from_block_number` if configured
+        let from_block_number = match event_type {
+            EventType::PublicDecryptionRequest | EventType::UserDecryptionRequest => {
+                self.config.decryption_from_block_number
+            }
+            _ => self.config.kms_operation_from_block_number,
+        };
+
+        let last_block_polled = match from_block_number {
+            // Start polling event from the configured `from_block_number` if set
             Some(from_block) => {
                 info!(
                     "Found configured `from_block_number` ({from_block}) for {event_type} subscriptions!"
@@ -460,7 +467,7 @@ mod tests {
     >;
 
     async fn test_setup(
-        from_block_number: Option<u64>,
+        kms_operation_from_block_number: Option<u64>,
     ) -> (TestInstance, Asserter, GatewayListener<MockProvider>) {
         let test_instance = TestInstanceBuilder::db_setup().await.unwrap();
 
@@ -475,7 +482,7 @@ mod tests {
         let config = Config {
             decryption_polling: Duration::from_millis(500),
             key_management_polling: Duration::from_millis(500),
-            from_block_number,
+            kms_operation_from_block_number,
             ..Default::default()
         };
         let listener = GatewayListener::new(

kms-connector/crates/gw-listener/tests/common/mod.rs

@@ -42,7 +42,8 @@ pub async fn start_test_listener(
     let mut config = Config::default();
     config.decryption_contract.address = DECRYPTION_MOCK_ADDRESS;
     config.kms_generation_contract.address = KMS_GENERATION_MOCK_ADDRESS;
-    config.from_block_number = from_block_number;
+    config.decryption_from_block_number = from_block_number;
+    config.kms_operation_from_block_number = from_block_number;
     config.decryption_polling = Duration::from_millis(300);
     config.key_management_polling = Duration::from_millis(300);
     let gw_listener = GatewayListener::new(

kms-connector/docs/architecture.md

@@ -182,8 +182,8 @@ sent.
 As we will run multiple `GatewayListener` instances, we assume that they will not crash all
 simultaneously, thus that all events emitted by the Gateway would be written in the DB.
 
-There is also a `from_block_number` option in its configuration, to be able to recover all events
-from a given block number.
+There are also `decryption_from_block_number` and `kms_operation_from_block_number` options in its configuration,
+to be able to recover decryption events and KMS operation events from given block numbers respectively.
 
 So even if we run only one `KmsWorker` that crashes, it will have access to unhandled events when
 restarted.