don't inject cache into credential in signer abstraction

Author: d4mr

core/src/signer.rs

@@ -15,7 +15,7 @@ use vault_sdk::VaultClient;
 use vault_types::enclave::encrypted::eoa::MessageFormat;
 
 use crate::{
-    credentials::{SigningCredential, KmsClientCache},
+    credentials::SigningCredential,
     defs::AddressDef,
     error::{EngineError, SerialisableAwsSdkError, SerialisableAwsSignerError},
     execution_options::aa::{EntrypointAndFactoryDetails, EntrypointAndFactoryDetailsDeserHelper},
@@ -204,16 +204,14 @@ pub trait AccountSigner {
 pub struct EoaSigner {
     pub vault_client: VaultClient,
     pub iaw_client: IAWClient,
-    pub kms_client_cache: KmsClientCache,
 }
 
 impl EoaSigner {
     /// Create a new EOA signer
-    pub fn new(vault_client: VaultClient, iaw_client: IAWClient, kms_client_cache: KmsClientCache) -> Self {
+    pub fn new(vault_client: VaultClient, iaw_client: IAWClient) -> Self {
         Self {
             vault_client,
             iaw_client,
-            kms_client_cache,
         }
     }
 }
@@ -274,10 +272,7 @@ impl AccountSigner for EoaSigner {
                 Ok(iaw_result.signature)
             }
             SigningCredential::AwsKms(creds) => {
-                // Clone and inject the cache into the credentials
-                let mut creds_with_cache = creds.clone();
-                creds_with_cache.kms_client_cache = Some(self.kms_client_cache.clone());
-                let signer = creds_with_cache.get_signer(options.chain_id).await?;
+                let signer = creds.get_signer(options.chain_id).await?;
                 let message = match format {
                     MessageFormat::Text => message.to_string().into_bytes(),
                     MessageFormat::Hex => {
@@ -357,10 +352,7 @@ impl AccountSigner for EoaSigner {
             }
 
             SigningCredential::AwsKms(creds) => {
-                // Clone and inject the cache into the credentials
-                let mut creds_with_cache = creds.clone();
-                creds_with_cache.kms_client_cache = Some(self.kms_client_cache.clone());
-                let signer = creds_with_cache.get_signer(options.chain_id).await?;
+                let signer = creds.get_signer(options.chain_id).await?;
 
                 // TODO: create serialisable error for @alloy-signer::error::Error
                 let signature = signer
@@ -428,10 +420,7 @@ impl AccountSigner for EoaSigner {
                 Ok(iaw_result.signature)
             }
             SigningCredential::AwsKms(creds) => {
-                // Clone and inject the cache into the credentials
-                let mut creds_with_cache = creds.clone();
-                creds_with_cache.kms_client_cache = Some(self.kms_client_cache.clone());
-                let signer = creds_with_cache.get_signer(options.chain_id).await?;
+                let signer = creds.get_signer(options.chain_id).await?;
                 let mut transaction = transaction.clone();
 
                 // TODO: create serialisable error for @alloy-signer::error::Error
@@ -511,10 +500,7 @@ impl AccountSigner for EoaSigner {
                 Ok(iaw_result.signed_authorization)
             }
             SigningCredential::AwsKms(creds) => {
-                // Clone and inject the cache into the credentials
-                let mut creds_with_cache = creds.clone();
-                creds_with_cache.kms_client_cache = Some(self.kms_client_cache.clone());
-                let signer = creds_with_cache.get_signer(options.chain_id).await?;
+                let signer = creds.get_signer(options.chain_id).await?;
                 let authorization_hash = authorization.signature_hash();
 
                 let signature = signer.sign_hash(&authorization_hash).await.map_err(|e| {

server/src/main.rs

@@ -59,7 +59,7 @@ async fn main() -> anyhow::Result<()> {
         vault_client: vault_client.clone(),
         iaw_client: iaw_client.clone(),
     });
-    let eoa_signer = Arc::new(EoaSigner::new(vault_client.clone(), iaw_client, kms_client_cache.clone()));
+    let eoa_signer = Arc::new(EoaSigner::new(vault_client.clone(), iaw_client));
     let redis_client = twmq::redis::Client::open(config.redis.url.as_str())?;
 
     let authorization_cache = EoaAuthorizationCache::new(