Skip to content

chore(kms-connector): remove check decryption already done #2030

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
eudelins-zama wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

chore(kms-connector): remove check decryption already done #2030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 1 addition & 71 deletions kms-connector/crates/kms-worker/src/core/event_processor/decryption.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,26 +67,6 @@ where
}
}

pub async fn check_decryption_not_already_done(
&self,
decryption_id: U256,
) -> Result<(), ProcessingError> {
let is_decryption_done = self
.decryption_contract
.isDecryptionDone(decryption_id)
.call()
.await
.map_err(|e| ProcessingError::Recoverable(anyhow::Error::from(e)))?;

if is_decryption_done {
return Err(ProcessingError::Irrecoverable(anyhow!(
"Decryption already done on the Gateway"
)));
}

Ok(())
}

#[tracing::instrument(skip_all)]
pub async fn check_ciphertexts_allowed_for_public_decryption(
&self,
Expand Down Expand Up @@ -407,60 +387,10 @@ mod tests {
enum ExpectedOutcome {
Ok,
Recoverable,
#[allow(unused)]
Irrecoverable,
}

enum DecryptionReadyMock {
Failure(&'static str),
Success(bool),
}

#[rstest]
#[case::transport_error(
DecryptionReadyMock::Failure("Transport Error"),
ExpectedOutcome::Recoverable
)]
#[case::not_done(DecryptionReadyMock::Success(false), ExpectedOutcome::Ok)]
#[case::already_done(DecryptionReadyMock::Success(true), ExpectedOutcome::Irrecoverable)]
#[tokio::test]
async fn check_decryption_not_already_done(
#[case] mock_response: DecryptionReadyMock,
#[case] expected: ExpectedOutcome,
) {
let asserter = Asserter::new();
let mock_provider = ProviderBuilder::new()
.disable_recommended_fillers()
.connect_mocked_client(asserter.clone());
let acl_contracts_mock = HashMap::from([(
u64::default(),
ACL::new(Address::default(), mock_provider.clone()),
)]);

let config = Config::default();
let s3_service = S3Service::new(&config, mock_provider.clone(), reqwest::Client::new());
let decryption_processor =
DecryptionProcessor::new(&config, mock_provider, acl_contracts_mock, s3_service);

match mock_response {
DecryptionReadyMock::Failure(msg) => asserter.push_failure_msg(msg),
DecryptionReadyMock::Success(val) => asserter.push_success(&val.abi_encode()),
}

let result = decryption_processor
.check_decryption_not_already_done(U256::ZERO)
.await;

match expected {
ExpectedOutcome::Ok => result.unwrap(),
ExpectedOutcome::Recoverable => {
assert!(matches!(result, Err(ProcessingError::Recoverable(_))))
}
ExpectedOutcome::Irrecoverable => {
assert!(matches!(result, Err(ProcessingError::Irrecoverable(_))))
}
}
}

enum PubDecryptACLMock {
Failure(&'static str),
Success(bool),
Expand Down
3 changes: 0 additions & 3 deletions kms-connector/crates/kms-worker/src/core/event_processor/processor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,6 @@ impl<GP: Provider, HP: Provider> DbEventProcessor<GP, HP> {
) -> Result<KmsGrpcRequest, ProcessingError> {
let request = match &event.kind {
GatewayEventKind::PublicDecryption(req) => {
self.decryption_processor
.check_decryption_not_already_done(req.decryptionId)
.await?;
self.decryption_processor
.check_ciphertexts_allowed_for_public_decryption(&req.snsCtMaterials)
.await?;
Expand Down
10 changes: 2 additions & 8 deletions kms-connector/crates/kms-worker/tests/acl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
mod common;

use crate::common::{create_mock_user_decryption_request_tx, init_kms_worker};
use alloy::{
providers::{ProviderBuilder, mock::Asserter},
sol_types::SolValue,
};
use alloy::providers::{ProviderBuilder, mock::Asserter};
use connector_utils::{
tests::{
db::requests::{
Expand Down Expand Up @@ -45,10 +42,7 @@ async fn test_decryption_acl_failure(#[case] event_type: EventType) -> anyhow::R
.with_tx_hash(tx_hash);
for _ in 0..MAX_DECRYPTION_ATTEMPTS {
match event_type {
EventType::PublicDecryptionRequest => {
// Mocking isDecryptionDone returns false
asserter.push_success(&false.abi_encode());
}
EventType::PublicDecryptionRequest => (),
EventType::UserDecryptionRequest => {
// Mocking `get_transaction_by_hash` call result
let mock_tx = create_mock_user_decryption_request_tx(tx_hash, sns_ct.ctHandle)?;
Expand Down
17 changes: 5 additions & 12 deletions kms-connector/crates/kms-worker/tests/attempt_limit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,11 @@ async fn test_request_processing(#[case] event_type: EventType) -> anyhow::Resul
.with_sns_ct_materials(vec![sns_ct.clone()])
.with_tx_hash(tx_hash);
for attempt in 0..MAX_DECRYPTION_ATTEMPTS {
match event_type {
EventType::PublicDecryptionRequest => {
// Mocking isDecryptionDone returns false
asserter.push_success(&false.abi_encode());
}
EventType::UserDecryptionRequest => {
// Mocking `get_transaction_by_hash` call result
let mock_tx = create_mock_user_decryption_request_tx(tx_hash, sns_ct.ctHandle)?;
asserter.push_success(&mock_tx);
}
_ => (),
};
if matches!(event_type, EventType::UserDecryptionRequest) {
// Mocking `get_transaction_by_hash` call result
let mock_tx = create_mock_user_decryption_request_tx(tx_hash, sns_ct.ctHandle)?;
asserter.push_success(&mock_tx);
}

// First attempt, the copro URL is not cached yet
if attempt == 0 {
Expand Down
21 changes: 7 additions & 14 deletions kms-connector/crates/kms-worker/tests/integration_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,20 +70,13 @@ async fn test_processing_request(
let mut insert_options = InsertRequestOptions::new()
.with_already_sent(already_sent)
.with_sns_ct_materials(vec![sns_ct.clone()]);
match event_type {
EventType::PublicDecryptionRequest => {
// Mocking isDecryptionDone returns false
asserter.push_success(&false.abi_encode());
}
EventType::UserDecryptionRequest => {
// Mocking `get_transaction_by_hash` call result
let tx_hash = rand_digest();
let mock_tx = create_mock_user_decryption_request_tx(tx_hash, sns_ct.ctHandle)?;
insert_options = insert_options.with_tx_hash(tx_hash);
asserter.push_success(&mock_tx);
}
_ => (),
};
if matches!(event_type, EventType::UserDecryptionRequest) {
// Mocking `get_transaction_by_hash` call result
let tx_hash = rand_digest();
let mock_tx = create_mock_user_decryption_request_tx(tx_hash, sns_ct.ctHandle)?;
insert_options = insert_options.with_tx_hash(tx_hash);
asserter.push_success(&mock_tx);
}

let get_copro_call_response = Coprocessor {
s3BucketUrl: format!("{}/ct128", test_instance.s3_url()),
Expand Down