always store kms credentials in WalletDetails

Author: d4mr

src/server/routes/backend-wallet/import.ts

@@ -166,16 +166,11 @@ export const importBackendWallet = async (fastify: FastifyInstance) => {
           );
         }
 
-        const shouldOverrideCredentials = !!(
-          credentials?.awsAccessKeyId && credentials?.awsSecretAccessKey
-        );
-
         walletAddress = await importAwsKmsWallet({
           awsKmsArn,
           crendentials: {
             accessKeyId,
             secretAccessKey,
-            shouldStore: shouldOverrideCredentials,
           },
           label,
         });
@@ -191,12 +186,6 @@ export const importBackendWallet = async (fastify: FastifyInstance) => {
           credentials?.privateKey ??
           config.walletConfiguration.gcp?.gcpApplicationCredentialPrivateKey;
 
-        // if email and privateKey are provided in the request, then they should be stored in walletDetails
-        // they are considered to override the global configuration
-        const shouldOverrideCredentials = !!(
-          credentials?.email && credentials?.privateKey
-        );
-
         if (!(email && privateKey)) {
           throw createCustomError(
             `Please provide 'email' and 'privateKey' to import a wallet. Can be provided as configuration or as credential with the request.`,
@@ -236,7 +225,6 @@ export const importBackendWallet = async (fastify: FastifyInstance) => {
           credentials: {
             email,
             privateKey,
-            shouldStore: shouldOverrideCredentials,
           },
           label,
         });

src/server/utils/wallets/createAwsKmsWallet.ts

@@ -53,18 +53,13 @@ export const createAwsKmsWallet = async ({
     throw new Error("Failed to create AWS KMS key");
   }
 
-  const wereCredentialsOverridden = !!(
-    overrides.awsSecretAccessKey && overrides.awsAccessKeyId
-  );
-
   const awsKmsArn = res.KeyMetadata.Arn;
   return importAwsKmsWallet({
     awsKmsArn,
     label,
     crendentials: {
       accessKeyId: kmsWalletParams.awsAccessKeyId,
       secretAccessKey: kmsWalletParams.awsSecretAccessKey,
-      shouldStore: wereCredentialsOverridden,
     },
   });
 };

src/server/utils/wallets/createGcpKmsWallet.ts

@@ -93,25 +93,15 @@ export const createGcpKmsWallet = async ({
 
   const walletAddress = account.address;
 
-  // if email and privateKey are provided explicitly in the request, then they should be stored in walletDetails
-  const areCredentialsOverridden = !!(
-    overrides.gcpApplicationCredentialEmail &&
-    overrides.gcpApplicationCredentialPrivateKey
-  );
-
   await createWalletDetails({
     type: WalletType.gcpKms,
     address: walletAddress,
     label,
     gcpKmsResourcePath: resourcePath,
 
-    ...(areCredentialsOverridden
-      ? {
-          gcpApplicationCredentialEmail: params.gcpApplicationCredentialEmail,
-          gcpApplicationCredentialPrivateKey:
-            params.gcpApplicationCredentialPrivateKey,
-        }
-      : {}),
+    gcpApplicationCredentialEmail: params.gcpApplicationCredentialEmail,
+    gcpApplicationCredentialPrivateKey:
+      params.gcpApplicationCredentialPrivateKey,
   });
 
   return walletAddress;

src/server/utils/wallets/importAwsKmsWallet.ts

@@ -9,20 +9,13 @@ interface ImportAwsKmsWalletParams {
   crendentials: {
     accessKeyId: string;
     secretAccessKey: string;
-    /**
-     * If true, the AWS access key and secret access key will be stored
-     * along with the wallet details, separately from the global configuration
-     */
-    shouldStore?: boolean;
   };
   label?: string;
 }
 
 /**
  * Import an AWS KMS wallet, and store it into the database
  *
- * If credentials.shouldStore is true, the AWS access key and secret access key will be stored
- * along with the wallet details, separately from the global configuration
  */
 export const importAwsKmsWallet = async ({
   crendentials,
@@ -50,12 +43,8 @@ export const importAwsKmsWallet = async ({
     awsKmsArn,
     label,
 
-    ...(crendentials.shouldStore
-      ? {
-          awsAccessKeyId: crendentials.accessKeyId,
-          awsSecretAccessKey: crendentials.secretAccessKey,
-        }
-      : {}),
+    awsKmsAccessKeyId: crendentials.accessKeyId,
+    awsKmsSecretAccessKey: crendentials.secretAccessKey,
   });
 
   return walletAddress;

src/server/utils/wallets/importGcpKmsWallet.ts

@@ -9,7 +9,6 @@ interface ImportGcpKmsWalletParams {
   credentials: {
     email: string;
     privateKey: string;
-    shouldStore?: boolean;
   };
 }
 
@@ -43,12 +42,8 @@ export const importGcpKmsWallet = async ({
     label,
     gcpKmsResourcePath,
 
-    ...(credentials.shouldStore
-      ? {
-          gcpApplicationCredentialEmail: credentials.email,
-          gcpApplicationCredentialPrivateKey: credentials.privateKey,
-        }
-      : {}),
+    gcpApplicationCredentialEmail: credentials.email,
+    gcpApplicationCredentialPrivateKey: credentials.privateKey,
   });
 
   return walletAddress;