Revert "feat: add isMessageWhitelisted() in MessageBuilder"

bhavidhingra · bhavidhingra · commit 493b72341734 · 2025-08-09T16:39:01.000+05:30
This reverts commit b5dbd70. TICKET: SC-2419
diff --git a/modules/account-lib/src/index.ts b/modules/account-lib/src/index.ts
@@ -206,8 +206,8 @@ export { Vet };
 import * as CosmosSharedCoin from '@bitgo/sdk-coin-cosmos';
 export { CosmosSharedCoin };
 
-import { isMessageWhitelisted, MIDNIGHT_TNC_HASH, MIDNIGHT_GLACIER_DROP_CLAIM_MESSAGE_TEMPLATE } from './utils';
-export { isMessageWhitelisted, MIDNIGHT_TNC_HASH, MIDNIGHT_GLACIER_DROP_CLAIM_MESSAGE_TEMPLATE };
+import { validateAgainstMessageTemplates, MIDNIGHT_TNC_HASH } from './utils';
+export { MIDNIGHT_TNC_HASH };
 
 const coinBuilderMap = {
   trx: Trx.WrappedBuilder,
@@ -435,7 +435,7 @@ export async function verifyMessage(
     if (!isValidMessageEncoded) {
       return false;
     }
-    return messageBuilder.isMessageWhitelisted(messageRaw);
+    return validateAgainstMessageTemplates(messageRaw);
   } catch (e) {
     console.error(`Error verifying message for coin ${coinName}:`, e);
     return false;
diff --git a/modules/account-lib/src/utils/messages/index.ts b/modules/account-lib/src/utils/messages/index.ts
@@ -5,20 +5,22 @@ export const MIDNIGHT_TNC_HASH = '31a6bab50a84b8439adcfb786bb2020f6807e6e8fda629
  * then " to addr" or " to addr_test1", followed by a 50+ character alphanumeric address,
  * and ends with the midnight TnC hash
  */
-export const MIDNIGHT_GLACIER_DROP_CLAIM_MESSAGE_TEMPLATE = `STAR \\d+ to addr(?:1|_test1)[a-z0-9]{50,} ${MIDNIGHT_TNC_HASH}`;
+const MIDNIGHT_GLACIER_DROP_CLAIM_MESSAGE_TEMPLATE = `STAR \\d+ to addr(?:1|_test1)[a-z0-9]{50,} ${MIDNIGHT_TNC_HASH}`;
+
+/**
+ * @file Utility functions for validating messages against whitelisted templates.
+ * This is used to ensure that only specific message formats are accepted.
+ */
+const whitelistedMessageTemplates = [MIDNIGHT_GLACIER_DROP_CLAIM_MESSAGE_TEMPLATE];
 
 /**
  * Validates a message against a set of whitelisted templates.
  * The templates can contain placeholders like {{variable}} which will be replaced with a wildcard in the regex.
  *
- * @param whitelistedMessageTemplates - An array of whitelisted message templates.
  * @param {string} messageRaw - The raw message to validate.
  * @returns {boolean} - Returns true if the message matches any of the whitelisted templates, false otherwise.
  */
-export function isMessageWhitelisted(whitelistedMessageTemplates: string[], messageRaw: string): boolean {
-  if (!whitelistedMessageTemplates || whitelistedMessageTemplates.length === 0) {
-    return true;
-  }
+export function validateAgainstMessageTemplates(messageRaw: string): boolean {
   return whitelistedMessageTemplates.some((template) => {
     const regex = new RegExp(`^${template}$`, 's'); // 's' flag to match newlines
     return regex.test(messageRaw);
diff --git a/modules/account-lib/test/unit/utils/messages/index.ts b/modules/account-lib/test/unit/utils/messages/index.ts
@@ -1,38 +1,32 @@
 import should from 'should';
-import {
-  MIDNIGHT_TNC_HASH,
-  isMessageWhitelisted,
-  MIDNIGHT_GLACIER_DROP_CLAIM_MESSAGE_TEMPLATE,
-} from '../../../../src/utils';
+import { MIDNIGHT_TNC_HASH, validateAgainstMessageTemplates } from '../../../../src/utils';
 
 describe('Message validation', () => {
-  describe('isMessageWhitelisted', () => {
-    const whitelistedMessageTemplates = [MIDNIGHT_GLACIER_DROP_CLAIM_MESSAGE_TEMPLATE];
-
+  describe('validateAgainstMessageTemplates', () => {
     const adaTestnetDestinationAddress = 'addr_test1vz7xs7ceu4xx9n5xn57lfe86vrwddqpp77vjwq5ptlkh49cqy3wur';
     const adaMainnetDestinationAddress =
       'addr1q9k6u7lhf467y2f8skr2dafldx2npsd8fymq0mslnj0t44nd4ealwnt4ug5j0pvx5m6n76v4xrq6wjfkqlhpl8y7httq2m9cmu';
 
     it('should validate testnet message matching the Midnight glacier drop claim template', () => {
       const messageRaw = `STAR 100 to ${adaTestnetDestinationAddress} ${MIDNIGHT_TNC_HASH}`;
 
-      const result = isMessageWhitelisted(whitelistedMessageTemplates, messageRaw);
+      const result = validateAgainstMessageTemplates(messageRaw);
 
       should.equal(result, true);
     });
 
     it('should validate mainnet message matching the Midnight glacier drop claim template', () => {
       const messageRaw = `STAR 100 to ${adaMainnetDestinationAddress} ${MIDNIGHT_TNC_HASH}`;
 
-      const result = isMessageWhitelisted(whitelistedMessageTemplates, messageRaw);
+      const result = validateAgainstMessageTemplates(messageRaw);
 
       should.equal(result, true);
     });
 
     it('should not validate message with incorrect format', () => {
       const messageRaw = `INCORRECT 100 to ${adaTestnetDestinationAddress} ${MIDNIGHT_TNC_HASH}`;
 
-      const result = isMessageWhitelisted(whitelistedMessageTemplates, messageRaw);
+      const result = validateAgainstMessageTemplates(messageRaw);
 
       should.equal(result, false);
     });
@@ -41,7 +35,7 @@ describe('Message validation', () => {
       // Missing "to addr" part
       const messageRaw = `STAR 100 ${MIDNIGHT_TNC_HASH}`;
 
-      const result = isMessageWhitelisted(whitelistedMessageTemplates, messageRaw);
+      const result = validateAgainstMessageTemplates(messageRaw);
 
       should.equal(result, false);
     });
@@ -52,21 +46,21 @@ describe('Message validation', () => {
         '5af1adf825baa496729e2eac1e895ebc77973744bce67f44276bf6006f5c21de863ed121e11828d8fc0241773191e26dc1134803a681a9a98ba0ae812553db24';
       const messageRaw = `STAR 100 to ${adaTestnetDestinationAddress} ${incorrectHash}`;
 
-      const result = isMessageWhitelisted(whitelistedMessageTemplates, messageRaw);
+      const result = validateAgainstMessageTemplates(messageRaw);
 
       should.equal(result, false);
     });
 
     it('should handle empty message', () => {
-      const result = isMessageWhitelisted(whitelistedMessageTemplates, '');
+      const result = validateAgainstMessageTemplates('');
 
       should.equal(result, false);
     });
 
     it('should not validate message with special regex characters', () => {
       const messageRaw = `STAR shade.with+special*chars to addr.with[special]chars ${MIDNIGHT_TNC_HASH}`;
 
-      const result = isMessageWhitelisted(whitelistedMessageTemplates, messageRaw);
+      const result = validateAgainstMessageTemplates(messageRaw);
 
       should.equal(result, false);
     });
diff --git a/modules/sdk-coin-ada/src/lib/messages/cip8/cip8MessageBuilder.ts b/modules/sdk-coin-ada/src/lib/messages/cip8/cip8MessageBuilder.ts
@@ -1,22 +1,25 @@
 import { Cip8Message } from './cip8Message';
 import { BaseCoin as CoinConfig } from '@bitgo/statics';
 import { BaseMessageBuilder, IMessage, MessageOptions, MessageStandardType } from '@bitgo/sdk-core';
-import { MIDNIGHT_GLACIER_DROP_CLAIM_MESSAGE_TEMPLATE } from '@bitgo/account-lib';
 
 /**
  * Builder for CIP-8 messages
  */
 export class Cip8MessageBuilder extends BaseMessageBuilder {
+  private static readonly MIDNIGHT_TNC_HASH = '31a6bab50a84b8439adcfb786bb2020f6807e6e8fda629b424110fc7bb1c6b8b';
+
+  /*
+   * matches a message that starts with "STAR ", followed by a number,
+   * then " to addr" or " to addr_test1", followed by a 50+ character alphanumeric address,
+   * and ends with the midnight TnC hash
+   */
+  private static readonly MIDNIGHT_GLACIER_DROP_CLAIM_MESSAGE_TEMPLATE = `STAR \\d+ to addr(?:1|_test1)[a-z0-9]{50,} ${Cip8MessageBuilder.MIDNIGHT_TNC_HASH}`;
   /**
    * Base constructor.
    * @param _coinConfig BaseCoin from statics library
    */
   public constructor(_coinConfig: Readonly<CoinConfig>) {
     super(_coinConfig, MessageStandardType.CIP8);
-    this.whitelistedMessageTemplates = [
-      MIDNIGHT_GLACIER_DROP_CLAIM_MESSAGE_TEMPLATE,
-      // Add more templates as needed
-    ];
   }
 
   /**
@@ -27,4 +30,15 @@ export class Cip8MessageBuilder extends BaseMessageBuilder {
   async buildMessage(options: MessageOptions): Promise<IMessage> {
     return new Cip8Message(options);
   }
+
+  /**
+   * Validates the signable payload
+   * @param message The message to validate
+   * @returns A boolean indicating whether the signable payload is valid
+   */
+  public validateSignablePayload(message: string | Buffer): boolean {
+    const messageStr = Buffer.isBuffer(message) ? message.toString('utf8') : message;
+    const regex = new RegExp(`^${Cip8MessageBuilder.MIDNIGHT_GLACIER_DROP_CLAIM_MESSAGE_TEMPLATE}$`, 's');
+    return regex.test(messageStr);
+  }
 }
diff --git a/modules/sdk-core/src/account-lib/baseCoin/messages/baseMessageBuilder.ts b/modules/sdk-core/src/account-lib/baseCoin/messages/baseMessageBuilder.ts
@@ -2,7 +2,6 @@ import { BroadcastableMessage, MessageOptions, MessagePayload, MessageStandardTy
 import { BaseCoin as CoinConfig } from '@bitgo/statics';
 import { IMessage, IMessageBuilder } from './iface';
 import { deserializeSignatures, Signature } from '../iface';
-import { isMessageWhitelisted } from '@bitgo/account-lib';
 
 /**
  * Base Message Builder
@@ -13,7 +12,6 @@ export abstract class BaseMessageBuilder implements IMessageBuilder {
   protected type: MessageStandardType;
   protected signatures: Signature[] = [];
   protected signers: string[] = [];
-  protected whitelistedMessageTemplates: string[] = [];
   protected metadata?: Record<string, unknown> = {};
   protected digest?: string;
 
@@ -120,8 +118,13 @@ export abstract class BaseMessageBuilder implements IMessageBuilder {
     return this;
   }
 
-  public isMessageWhitelisted(messageRaw: string): boolean {
-    return isMessageWhitelisted(this.whitelistedMessageTemplates, messageRaw);
+  /**
+   * Validates the signable payload
+   * @param message The message to validate
+   * @returns A boolean indicating whether the signable payload is valid
+   */
+  public validateSignablePayload(message: string | Buffer): boolean {
+    return true;
   }
 
   /**
diff --git a/modules/sdk-core/src/account-lib/baseCoin/messages/iface.ts b/modules/sdk-core/src/account-lib/baseCoin/messages/iface.ts
@@ -137,11 +137,11 @@ export interface IMessageBuilder {
   getPayload(): MessagePayload | undefined;
 
   /**
-   * Checks if the message string is whitelisted
-   * @param messageRaw The raw message string to check
-   * @return True if the message is whitelisted, false otherwise
+   * Validates the signable payload
+   * @param message The message to validate
+   * @returns A boolean indicating whether the signable payload is valid
    */
-  isMessageWhitelisted(messageRaw: string): boolean;
+  validateSignablePayload(message: string | Buffer): boolean;
 
   /**
    * Gets the current metadata
diff --git a/modules/sdk-core/src/account-lib/baseCoin/messages/simple/simpleMessageBuilder.ts b/modules/sdk-core/src/account-lib/baseCoin/messages/simple/simpleMessageBuilder.ts
@@ -3,7 +3,6 @@ import { BaseCoin as CoinConfig } from '@bitgo/statics';
 import { BaseMessageBuilder } from '../baseMessageBuilder';
 import { MessageOptions, MessageStandardType } from '../../../../bitgo';
 import { IMessage } from '../iface';
-import { MIDNIGHT_GLACIER_DROP_CLAIM_MESSAGE_TEMPLATE } from '@bitgo/account-lib';
 
 /**
  * Builder for string messages
@@ -15,10 +14,6 @@ export class SimpleMessageBuilder extends BaseMessageBuilder {
    */
   public constructor(_coinConfig: Readonly<CoinConfig>) {
     super(_coinConfig, MessageStandardType.SIMPLE);
-    this.whitelistedMessageTemplates = [
-      MIDNIGHT_GLACIER_DROP_CLAIM_MESSAGE_TEMPLATE,
-      // Add more templates as needed
-    ];
   }
 
   /**
