chore(mbe): check for required params instead of other coin params

Ticket: WP-5454

Author: pranavjain97

src/__tests__/api/master/recoveryWallet.test.ts

@@ -232,7 +232,9 @@ describe('Recovery Tests', () => {
       response.status.should.equal(422);
       response.body.should.have.property('error');
       response.body.should.have.property('details');
-      response.body.details.should.containEql('Invalid parameters provided for UTXO coin recovery');
+      response.body.details.should.containEql(
+        'UTXO recovery options are required for UTXO coin recovery',
+      );
     });
 
     it('should reject incorrect Solana parameters for a UTXO coin', async () => {
@@ -267,7 +269,9 @@ describe('Recovery Tests', () => {
       response.status.should.equal(422);
       response.body.should.have.property('error');
       response.body.should.have.property('details');
-      response.body.details.should.containEql('Invalid parameters provided for UTXO coin recovery');
+      response.body.details.should.containEql(
+        'UTXO recovery options are required for UTXO coin recovery',
+      );
     });
 
     it('should reject using legacy coinSpecificParams format', async () => {
@@ -294,9 +298,12 @@ describe('Recovery Tests', () => {
           },
         });
 
-      response.status.should.equal(500);
-      // Since we test that the incorrect format doesn't work anymore
+      response.status.should.equal(422);
       response.body.should.have.property('error');
+      response.body.should.have.property('details');
+      response.body.details.should.containEql(
+        'UTXO recovery options are required for UTXO coin recovery',
+      );
     });
   });
 
@@ -355,7 +362,7 @@ describe('Recovery Tests', () => {
       response.body.should.have.property('error');
       response.body.should.have.property('details');
       response.body.details.should.containEql(
-        'Invalid parameters provided for ETH-like coin recovery',
+        'EVM recovery options are required for ETH-like coin recovery',
       );
     });
 
@@ -393,7 +400,7 @@ describe('Recovery Tests', () => {
       response.body.should.have.property('error');
       response.body.should.have.property('details');
       response.body.details.should.containEql(
-        'Invalid parameters provided for ETH-like coin recovery',
+        'EVM recovery options are required for ETH-like coin recovery',
       );
     });
   });
@@ -448,7 +455,7 @@ describe('Recovery Tests', () => {
       response.body.should.have.property('error');
       response.body.should.have.property('details');
       response.body.details.should.containEql(
-        'Invalid parameters provided for Solana coin recovery',
+        'Solana recovery options are required for EdDSA coin recovery',
       );
     });
 
@@ -479,7 +486,7 @@ describe('Recovery Tests', () => {
       response.body.should.have.property('error');
       response.body.should.have.property('details');
       response.body.details.should.containEql(
-        'Invalid parameters provided for Solana coin recovery',
+        'Solana recovery options are required for EdDSA coin recovery',
       );
     });
   });

src/api/master/handlers/recoveryWallet.ts

@@ -63,52 +63,48 @@ function validateRecoveryParams(
   }
 
   if (isUtxoCoin(sdkCoin)) {
-    if (params.solanaRecoveryOptions || params.evmRecoveryOptions) {
-      throw new ValidationError('Invalid parameters provided for UTXO coin recovery');
-    }
-    return;
-  }
-
-  if (!isMpcRecovery && isEthLikeCoin(sdkCoin)) {
-    if (params.solanaRecoveryOptions || params.utxoRecoveryOptions) {
-      throw new ValidationError('Invalid parameters provided for ETH-like coin recovery');
+    // UTXO coins need utxoRecoveryOptions for standard recovery
+    if (!isMpcRecovery && !params.utxoRecoveryOptions) {
+      throw new ValidationError('UTXO recovery options are required for UTXO coin recovery');
     }
     return;
   }
 
   if (isEddsaCoin(sdkCoin)) {
-    if (params.evmRecoveryOptions || params.utxoRecoveryOptions) {
-      throw new ValidationError('Invalid parameters provided for Solana coin recovery');
+    // EdDSA coins (like Solana) need solanaRecoveryOptions for standard recovery
+    if (!params.solanaRecoveryOptions) {
+      throw new ValidationError('Solana recovery options are required for EdDSA coin recovery');
     }
     return;
   }
 
-  if (isEcdsaCoin(sdkCoin)) {
+  if (isEcdsaCoin(sdkCoin) && isMpcRecovery) {
     if (isEthLikeCoin(sdkCoin)) {
-      if (isMpcRecovery) {
-        if (!params.ecdsaEthLikeRecoverySpecificParams) {
-          throw new ValidationError(
-            'Invalid parameters provided for ETH-like MPC V2 coin recovery',
-          );
-        }
+      if (!params.ecdsaEthLikeRecoverySpecificParams) {
+        throw new ValidationError(
+          'ECDSA ETH-like recovery specific parameters are required for MPC recovery',
+        );
       }
-      return;
     } else if (isCosmosLikeCoin(sdkCoin)) {
-      if (isMpcRecovery) {
-        if (!params.ecdsaCosmosLikeRecoverySpecificParams) {
-          throw new ValidationError(
-            'Invalid parameters provided for Cosmos-like MPC V2 coin recovery',
-          );
-        }
+      // ECDSA Cosmos-like MPC recovery needs ecdsaCosmosLikeRecoverySpecificParams
+      if (!params.ecdsaCosmosLikeRecoverySpecificParams) {
+        throw new ValidationError(
+          'ECDSA Cosmos-like recovery specific parameters are required for MPC recovery',
+        );
       }
     } else {
       throw new NotImplementedError(
         `MPC V2 recovery is not supported for coin family: ${sdkCoin.getFamily()}`,
       );
     }
+  }
+  if (!isMpcRecovery && isEthLikeCoin(sdkCoin)) {
+    // Non-ECDSA ETH-like coins need evmRecoveryOptions for standard recovery
+    if (!params.evmRecoveryOptions) {
+      throw new ValidationError('EVM recovery options are required for ETH-like coin recovery');
+    }
     return;
   }
-  throw new ValidationError('Recovery parameters are not valid');
 }
 
 async function handleEthLikeRecovery(