refactor: simplify

TICKET: WP-7114

Author: danielzhao122

modules/abstract-substrate/src/abstractSubstrateCoin.ts

@@ -1,5 +1,4 @@
 import {
-  AddressCoinSpecific,
   AuditDecryptedKeyParams,
   BaseCoin,
   BitGoBase,
@@ -21,8 +20,8 @@ import {
   RecoveryTxRequest,
   SignedTransaction,
   TssVerifyAddressOptions,
+  UnexpectedAddressError,
   verifyEddsaTssWalletAddress,
-  VerifyAddressOptions,
   VerifyTransactionOptions,
 } from '@bitgo/sdk-core';
 import { CoinFamily, BaseCoin as StaticsBaseCoin } from '@bitgo/statics';
@@ -36,13 +35,6 @@ import { ApiPromise } from '@polkadot/api';
 
 export const DEFAULT_SCAN_FACTOR = 20;
 
-export interface SubstrateVerifyAddressOptions extends VerifyAddressOptions {
-  index?: number | string;
-  coinSpecific?: AddressCoinSpecific & {
-    index?: number | string;
-  };
-}
-
 export class SubstrateCoin extends BaseCoin {
   protected readonly _staticsCoin: Readonly<StaticsBaseCoin>;
   readonly MAX_VALIDITY_DURATION = 2400;
@@ -119,28 +111,15 @@ export class SubstrateCoin extends BaseCoin {
   }
 
   /** @inheritDoc **/
-  async isWalletAddress(params: SubstrateVerifyAddressOptions): Promise<boolean> {
-    const { address, keychains } = params;
-
-    const index = Number(params.index ?? params.coinSpecific?.index);
-    if (isNaN(index) || index < 0) {
-      throw new Error('Invalid or missing index. index must be a non-negative number.');
-    }
-
-    const tssParams: TssVerifyAddressOptions = {
-      address,
-      keychains: keychains as TssVerifyAddressOptions['keychains'],
-      index,
-    };
-
+  async isWalletAddress(params: TssVerifyAddressOptions): Promise<boolean> {
     const isValid = await verifyEddsaTssWalletAddress(
-      tssParams,
+      params,
       (addr) => this.isValidAddress(addr),
       (pubKey) => this.getAddressFromPublicKey(pubKey)
     );
 
     if (!isValid) {
-      throw new Error(`Address verification failed: address ${address} is not a wallet address at index ${index}`);
+      throw new UnexpectedAddressError();
     }
 
     return true;

modules/sdk-coin-tao/test/unit/tao.ts

@@ -74,7 +74,7 @@ describe('Tao:', function () {
           keychains,
           index: 0, // Wrong index for this address
         })
-        .should.be.rejectedWith(/Address verification failed/);
+        .should.be.rejectedWith(/address validation failure/);
     });
 
     it('should throw for missing index', async function () {
@@ -117,24 +117,6 @@ describe('Tao:', function () {
         })
         .should.be.rejectedWith(/missing required param keychains/);
     });
-
-    it('should accept index from coinSpecific', async function () {
-      const keychains = [
-        { commonKeychain: isWalletAddressTestData.commonKeychain },
-        { commonKeychain: isWalletAddressTestData.commonKeychain },
-        { commonKeychain: isWalletAddressTestData.commonKeychain },
-      ];
-
-      const result = await baseCoin.isWalletAddress({
-        address: isWalletAddressTestData.receiveAddress,
-        keychains,
-        coinSpecific: {
-          index: isWalletAddressTestData.receiveAddressIndex,
-        },
-      });
-
-      result.should.be.true();
-    });
   });
 
   describe.skip('Recover Transactions:', function () {