chore(coprocessor): sync on rename KMSManagement to KMSGeneration (#935)

Author: rudy-6-4

coprocessor/fhevm-engine/gw-listener/build.rs

@@ -9,7 +9,7 @@ use semver::Version;
 
 fn build_contracts() {
     println!("cargo:rerun-if-changed=../../../gateway-contracts/contracts/InputVerification.sol");
-    println!("cargo:rerun-if-changed=../../../gateway-contracts/contracts/KMSManagement.sol");
+    println!("cargo:rerun-if-changed=../../../gateway-contracts/contracts/KMSGeneration.sol");
     // Step 1: Copy ../../contracts/.env.example to ../../contracts/.env
     let env_example = Path::new("../../../gateway-contracts/.env.example");
     let env_dest = Path::new("../../../gateway-contracts/.env");

…/gw-listener/contracts/KMSManagement.sol …/gw-listener/contracts/KMSGeneration.solcoprocessor/fhevm-engine/gw-listener/contracts/KMSManagement.sol renamed to coprocessor/fhevm-engine/gw-listener/contracts/KMSGeneration.sol coprocessor/fhevm-engine/gw-listener/contracts/KMSManagement.sol renamed to coprocessor/fhevm-engine/gw-listener/contracts/KMSGeneration.sol

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: BSD-3-Clause-Clear
 pragma solidity ^0.8.28;
-import "contracts/interfaces/IKMSManagement.sol";
+import "contracts/interfaces/IKMSGeneration.sol";
 
 /// @dev This contract is a mock of the KmsManagement contract from the Gateway.
 /// source: github.com/zama-ai/fhevm/blob/main/gateway-contracts/contracts/KmsManagement.sol
-contract KMSManagement is IKMSManagement {
+contract KMSGeneration is IKMSGeneration {
     function keygen_public_key() external {
         uint256 keyId = 16;
         string[] memory urls = new string[](4);

coprocessor/fhevm-engine/gw-listener/contracts/interfaces/IKMSGeneration.sol

@@ -0,0 +1 @@
+../../../../../gateway-contracts/contracts/interfaces/IKMSGeneration.sol

coprocessor/fhevm-engine/gw-listener/contracts/interfaces/IKMSManagement.sol

@@ -32,7 +32,7 @@ struct Conf {
     input_verification_address: Address,
 
     #[arg(long)]
-    kms_management_address: Address,
+    kms_generation_address: Address,
 
     #[arg(long, default_value = "1")]
     error_sleep_initial_secs: u16,
@@ -141,7 +141,7 @@ async fn main() -> anyhow::Result<()> {
 
     let gw_listener = GatewayListener::new(
         conf.input_verification_address,
-        conf.kms_management_address,
+        conf.kms_generation_address,
         config.clone(),
         cancel_token.clone(),
         provider.clone(),

coprocessor/fhevm-engine/gw-listener/src/bin/gw_listener.rs

@@ -23,13 +23,13 @@ sol!(
 
 sol!(
     #[sol(rpc)]
-    KMSManagement,
-    "./../../../gateway-contracts/artifacts/contracts/KMSManagement.sol/KMSManagement.json"
+    KMSGeneration,
+    "./../../../gateway-contracts/artifacts/contracts/KMSGeneration.sol/KMSGeneration.json"
 );
 
 pub struct GatewayListener<P: Provider<Ethereum> + Clone + 'static, A: AwsS3Interface> {
     input_verification_address: Address,
-    kms_management_address: Address,
+    kms_generation_address: Address,
     conf: ConfigSettings,
     cancel_token: CancellationToken,
     provider: P,
@@ -39,15 +39,15 @@ pub struct GatewayListener<P: Provider<Ethereum> + Clone + 'static, A: AwsS3Inte
 impl<P: Provider<Ethereum> + Clone + 'static, A: AwsS3Interface> GatewayListener<P, A> {
     pub fn new(
         input_verification_address: Address,
-        kms_management_address: Address,
+        kms_generation_address: Address,
         conf: ConfigSettings,
         cancel_token: CancellationToken,
         provider: P,
         aws_client: A,
     ) -> Self {
         GatewayListener {
             input_verification_address,
-            kms_management_address,
+            kms_generation_address,
             conf,
             cancel_token,
             provider,
@@ -59,7 +59,7 @@ impl<P: Provider<Ethereum> + Clone + 'static, A: AwsS3Interface> GatewayListener
         info!(
             conf = ?self.conf,
             self.input_verification_address = %self.input_verification_address,
-            self.kms_management_address = %self.kms_management_address,
+            self.kms_generation_address = %self.kms_generation_address,
             "Starting Gateway Listener",
         );
         let db_pool = PgPoolOptions::new()
@@ -97,7 +97,7 @@ impl<P: Provider<Ethereum> + Clone + 'static, A: AwsS3Interface> GatewayListener
         let input_verification =
             InputVerification::new(self.input_verification_address, &self.provider);
 
-        let kms_management = KMSManagement::new(self.kms_management_address, &self.provider);
+        let kms_generation = KMSGeneration::new(self.kms_generation_address, &self.provider);
 
         let mut from_block = self.get_last_block_num(db_pool).await?;
         let host_chain_id = self.conf.host_chain_id;
@@ -118,22 +118,22 @@ impl<P: Provider<Ethereum> + Clone + 'static, A: AwsS3Interface> GatewayListener
             .into_stream()
             .fuse();
         info!("Subscribed to InputVerification.VerifyProofRequest events");
-        let mut activate_key = kms_management
+        let mut activate_key = kms_generation
             .ActivateKey_filter()
             .from_block(from_block)
             .subscribe()
             .await?
             .into_stream()
             .fuse();
-        info!("Subscribed to KMSManagement.ActivateKeyRequest events");
-        let mut activate_crs = kms_management
+        info!("Subscribed to KMSGeneration.ActivateKeyRequest events");
+        let mut activate_crs = kms_generation
             .ActivateCrs_filter()
             .from_block(from_block)
             .subscribe()
             .await?
             .into_stream()
             .fuse();
-        info!("Subscribed to KMSManagement.ActivateKeyRequest events");
+        info!("Subscribed to KMSGeneration.ActivateKeyRequest events");
         loop {
             tokio::select! {
                 _ = self.cancel_token.cancelled() => {
@@ -206,7 +206,7 @@ impl<P: Provider<Ethereum> + Clone + 'static, A: AwsS3Interface> GatewayListener
     async fn activate_key(
         &self,
         db_pool: &Pool<Postgres>,
-        request: KMSManagement::ActivateKey,
+        request: KMSGeneration::ActivateKey,
         s3_client: &A,
         host_chain_id: ChainId,
     ) -> anyhow::Result<()> {
@@ -274,7 +274,7 @@ impl<P: Provider<Ethereum> + Clone + 'static, A: AwsS3Interface> GatewayListener
     async fn activate_crs(
         &self,
         db_pool: &Pool<Postgres>,
-        request: KMSManagement::ActivateCrs,
+        request: KMSGeneration::ActivateCrs,
         s3_client: &A,
         host_chain_id: ChainId,
     ) -> anyhow::Result<()> {

coprocessor/fhevm-engine/gw-listener/src/gw_listener.rs

@@ -31,8 +31,8 @@ sol!(
 
 sol!(
     #[sol(rpc)]
-    KMSManagement,
-    "artifacts/KMSManagement.sol/KMSManagement.json"
+    KMSGeneration,
+    "artifacts/KMSGeneration.sol/KMSGeneration.json"
 );
 
 struct TestEnvironment {
@@ -107,10 +107,10 @@ async fn verify_proof_request_inserted_into_db() -> anyhow::Result<()> {
         .await?;
     let aws_s3_client = AwsS3Client {};
     let input_verification = InputVerification::deploy(&provider).await?;
-    let kms_management = KMSManagement::deploy(&provider).await?;
+    let kms_generation = KMSGeneration::deploy(&provider).await?;
     let gw_listener = GatewayListener::new(
         *input_verification.address(),
-        *kms_management.address(),
+        *kms_generation.address(),
         env.conf.clone(),
         env.cancel_token.clone(),
         provider.clone(),
@@ -255,7 +255,7 @@ async fn keygen_ok() -> anyhow::Result<()> {
     use aws_smithy_mocks::{mock, mock_client};
     use gw_listener::KeyType;
 
-    // see ../contracts/KMSManagement.sol
+    // see ../contracts/KMSGeneration.sol
     let buckets = [
         "test-bucket1/PUB-P1",
         "test-bucket2/PUB-P2",
@@ -309,10 +309,10 @@ async fn keygen_ok() -> anyhow::Result<()> {
         .await?;
     let aws_s3_client = AwsS3ClientMocked(s3);
     let input_verification = InputVerification::deploy(&provider).await?;
-    let kms_management = KMSManagement::deploy(&provider).await?;
+    let kms_generation = KMSGeneration::deploy(&provider).await?;
     let gw_listener = GatewayListener::new(
         *input_verification.address(),
-        *kms_management.address(),
+        *kms_generation.address(),
         env.conf.clone(),
         env.cancel_token.clone(),
         provider.clone(),
@@ -325,23 +325,23 @@ async fn keygen_ok() -> anyhow::Result<()> {
     assert!(!has_server_key(&env.db_pool.clone()).await?);
     assert!(!has_crs(&env.db_pool.clone()).await?);
 
-    let txn_req = kms_management
+    let txn_req = kms_generation
         .keygen_public_key()
         .into_transaction_request();
     let pending_txn = provider.send_transaction(txn_req).await?;
     let receipt = pending_txn.get_receipt().await?;
     assert!(receipt.status());
     assert!(has_public_key(&env.db_pool.clone()).await?);
 
-    let txn_req = kms_management
+    let txn_req = kms_generation
         .keygen_server_key()
         .into_transaction_request();
     let pending_txn = provider.send_transaction(txn_req).await?;
     let receipt = pending_txn.get_receipt().await?;
     assert!(receipt.status());
     assert!(has_server_key(&env.db_pool.clone()).await?);
 
-    let txn_req = kms_management.crsgen().into_transaction_request();
+    let txn_req = kms_generation.crsgen().into_transaction_request();
     let pending_txn = provider.send_transaction(txn_req).await?;
     let receipt = pending_txn.get_receipt().await?;
     assert!(receipt.status());
@@ -368,7 +368,7 @@ async fn keygen_compromised_key() -> anyhow::Result<()> {
     use aws_smithy_mocks::{mock, mock_client};
     use gw_listener::KeyType;
 
-    // see ../contracts/KMSManagement.sol
+    // see ../contracts/KMSGeneration.sol
     let buckets = [
         "test-bucket1/PUB-P1",
         "test-bucket2/PUB-P2",
@@ -409,10 +409,10 @@ async fn keygen_compromised_key() -> anyhow::Result<()> {
         .await?;
     let aws_s3_client = AwsS3ClientMocked(s3);
     let input_verification = InputVerification::deploy(&provider).await?;
-    let kms_management = KMSManagement::deploy(&provider).await?;
+    let kms_generation = KMSGeneration::deploy(&provider).await?;
     let gw_listener = GatewayListener::new(
         *input_verification.address(),
-        *kms_management.address(),
+        *kms_generation.address(),
         env.conf.clone(),
         env.cancel_token.clone(),
         provider.clone(),
@@ -427,7 +427,7 @@ async fn keygen_compromised_key() -> anyhow::Result<()> {
     assert!(!has_public_key(&env.db_pool.clone()).await?);
     assert!(!has_server_key(&env.db_pool.clone()).await?);
 
-    let txn_req = kms_management
+    let txn_req = kms_generation
         .keygen(1) // Test
         .into_transaction_request();
     let pending_txn = provider.send_transaction(txn_req).await?;
@@ -464,7 +464,7 @@ async fn keygen_bad_key_or_bucket() -> anyhow::Result<()> {
     use aws_smithy_mocks::{mock, mock_client};
     use gw_listener::KeyType;
 
-    // see ../contracts/KMSManagement.sol
+    // see ../contracts/KMSGeneration.sol
     let buckets = [
         "test-bucket1/PUB-P1",
         "test-bucket2/PUB-P2",
@@ -515,10 +515,10 @@ async fn keygen_bad_key_or_bucket() -> anyhow::Result<()> {
         .await?;
     let aws_s3_client = AwsS3ClientMocked(s3);
     let input_verification = InputVerification::deploy(&provider).await?;
-    let kms_management = KMSManagement::deploy(&provider).await?;
+    let kms_generation = KMSGeneration::deploy(&provider).await?;
     let gw_listener = GatewayListener::new(
         *input_verification.address(),
-        *kms_management.address(),
+        *kms_generation.address(),
         env.conf.clone(),
         env.cancel_token.clone(),
         provider.clone(),
@@ -530,7 +530,7 @@ async fn keygen_bad_key_or_bucket() -> anyhow::Result<()> {
     assert!(!has_public_key(&env.db_pool.clone()).await?);
     assert!(!has_server_key(&env.db_pool.clone()).await?);
 
-    let txn_req = kms_management
+    let txn_req = kms_generation
         .keygen(1) // Test
         .into_transaction_request();
     let pending_txn = provider.send_transaction(txn_req).await?;