Skip to content

Commit 06603be

Browse files
committed
chore(kms-connector): update kms_grcp + config
1 parent f0e17c1 commit 06603be

File tree

6 files changed

+39
-20
lines changed

6 files changed

+39
-20
lines changed

kms-connector/Cargo.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

kms-connector/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ kms-worker.path = "crates/kms-worker"
1919
tx-sender.path = "crates/tx-sender"
2020
connector-utils.path = "crates/utils"
2121
fhevm_gateway_bindings = { git = "https://github.com/zama-ai/fhevm.git", rev = "47cdcf2fe54b684616abe3204b794f478b485c77", default-features = false }
22-
kms-grpc = { git = "https://github.com/zama-ai/kms.git", tag = "v0.11.1", default-features = true }
23-
bc2wrap = { git = "https://github.com/zama-ai/kms.git", tag = "v0.11.1", default-features = true }
22+
kms-grpc = { git = "https://github.com/zama-ai/kms.git", rev = "bc02d569cc0c346c60e4c11678b7708cb94c84be", default-features = true }
23+
bc2wrap = { git = "https://github.com/zama-ai/kms.git", rev = "bc02d569cc0c346c60e4c11678b7708cb94c84be", default-features = true }
2424
tfhe = "=1.3.3"
2525

2626
#####################################################################

kms-connector/crates/kms-worker/tests/response_publisher.rs

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ use connector_utils::{
1010
},
1111
};
1212
use kms_grpc::kms::v1::{
13-
CrsGenResult, KeyGenPreprocResult, KeyGenResult, PublicDecryptionResponse,
13+
CrsGenResult, KeyDigest, KeyGenPreprocResult, KeyGenResult, PublicDecryptionResponse,
1414
PublicDecryptionResponsePayload, RequestId, UserDecryptionResponse,
1515
UserDecryptionResponsePayload,
1616
};
1717
use kms_worker::core::{DbKmsResponsePublisher, KmsResponsePublisher};
1818
use sqlx::Row;
19-
use std::collections::HashMap;
19+
use std::str::FromStr;
2020
use tracing::info;
2121

2222
#[tokio::test]
@@ -134,9 +134,16 @@ async fn test_publish_keygen_response() -> anyhow::Result<()> {
134134
let rand_key_id = rand_u256();
135135
let rand_prep_keygen_id = rand_u256();
136136
let rand_signature = rand_signature();
137-
let mut rand_key_digests = HashMap::new();
138-
rand_key_digests.insert(String::from("ServerKey"), rand_digest().to_vec());
139-
rand_key_digests.insert(String::from("PublicKey"), rand_digest().to_vec());
137+
let rand_key_digests = vec![
138+
KeyDigest {
139+
key_type: String::from("ServerKey"),
140+
digest: rand_digest().to_vec(),
141+
},
142+
KeyDigest {
143+
key_type: String::from("PublicKey"),
144+
digest: rand_digest().to_vec(),
145+
},
146+
];
140147

141148
let grpc_response = KmsGrpcResponse::Keygen(KeyGenResult {
142149
request_id: Some(RequestId {
@@ -162,12 +169,12 @@ async fn test_publish_keygen_response() -> anyhow::Result<()> {
162169
let key_digests = row.try_get::<Vec<KeyDigestDbItem>, _>("key_digests")?;
163170
let signature = row.try_get::<Vec<u8>, _>("signature")?;
164171
assert_eq!(key_id, rand_key_id);
165-
for kd in key_digests {
166-
let key_type_str = match kd.key_type {
167-
KeyType::Public => "PublicKey",
168-
KeyType::Server => "ServerKey",
169-
};
170-
assert_eq!(Some(&kd.digest), rand_key_digests.get(key_type_str));
172+
for (i, kd) in key_digests.iter().enumerate() {
173+
assert_eq!(
174+
kd.key_type,
175+
KeyType::from_str(&rand_key_digests[i].key_type)?
176+
);
177+
assert_eq!(kd.digest, rand_key_digests[i].digest);
171178
}
172179
assert_eq!(signature, rand_signature);
173180
info!("Response successfully stored!");

kms-connector/crates/utils/src/tests/setup/kms.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ impl KmsInstance {
9999
.with_copy_to(
100100
"/app/kms-core-client/config.toml".to_string(),
101101
PathBuf::from_str(&format!(
102-
"{}/../../../test-suite/fhevm/config/core-client/config.toml",
102+
"{}/../../tests/data/core-client-config.toml",
103103
env!("CARGO_MANIFEST_DIR"),
104104
))
105105
.unwrap(),

kms-connector/crates/utils/src/types/kms_response.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,10 +237,10 @@ impl KeygenResponse {
237237
let key_digests = grpc_response
238238
.key_digests
239239
.into_iter()
240-
.map(|(k, d)| {
240+
.map(|kd| {
241241
Ok(KeyDigestDbItem {
242-
key_type: k.parse()?,
243-
digest: d,
242+
key_type: kd.key_type.parse()?,
243+
digest: kd.digest,
244244
})
245245
})
246246
.collect::<anyhow::Result<Vec<KeyDigestDbItem>>>()?;
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
kms_type = "centralized"
2+
fhe_params = "Default"
3+
decryption_mode = "NoiseFloodSmall"
4+
num_majority = 1
5+
num_reconstruct = 1
6+
7+
[[cores]]
8+
party_id = 1
9+
address = "kms-core:50051"
10+
s3_endpoint = "http://minio:9000/kms-public"
11+
object_folder = "PUB"
12+

0 commit comments

Comments
 (0)