Add isDecodeSignatureRequestEnabled to SignatureController constructor

packages/signature-controller/src/SignatureController.test.ts

@@ -927,7 +927,10 @@ describe('SignatureController', () => {
             },
           ],
         };
-        const { controller } = createController();
+        const { controller } = createController({
+          decodingApiUrl: 'www.test.com',
+          getFeatureFlags: () => ({ disableDecodingApi: false }),
+        });
 
         jest
           .spyOn(DecodingDataUtils, 'decodeSignature')
@@ -948,8 +951,74 @@ describe('SignatureController', () => {
         ).toStrictEqual(MOCK_STATE_CHANGES);
       });
 
+      it('does not invoke decodeSignature if decodingApiUrl is not defined', async () => {
+        const { controller } = createController({
+          decodingApiUrl: undefined,
+          getFeatureFlags: () => ({ disableDecodingApi: false }),
+        });
+
+        await controller.newUnsignedTypedMessage(
+          PERMIT_PARAMS_MOCK,
+          PERMIT_REQUEST_MOCK,
+          SignTypedDataVersion.V4,
+          { parseJsonData: false },
+        );
+
+        expect(
+          controller.state.signatureRequests[ID_MOCK].decodingLoading,
+        ).toBeUndefined();
+        expect(
+          controller.state.signatureRequests[ID_MOCK].decodingData,
+        ).toBeUndefined();
+      });
+
+      it('does not invoke decodeSignature if featureFLag disableDecodingApi is true', async () => {
+        const { controller } = createController({
+          decodingApiUrl: 'www.test.com',
+          getFeatureFlags: () => ({ disableDecodingApi: true }),
+        });
+
+        await controller.newUnsignedTypedMessage(
+          PERMIT_PARAMS_MOCK,
+          PERMIT_REQUEST_MOCK,
+          SignTypedDataVersion.V4,
+          { parseJsonData: false },
+        );
+
+        expect(
+          controller.state.signatureRequests[ID_MOCK].decodingLoading,
+        ).toBeUndefined();
+        expect(
+          controller.state.signatureRequests[ID_MOCK].decodingData,
+        ).toBeUndefined();
+      });
+
+      it('does not invoke decodeSignature if getFeatureFlags is not defined', async () => {
+        const { controller } = createController({
+          decodingApiUrl: 'www.test.com',
+          getFeatureFlags: undefined,
+        });
+
+        await controller.newUnsignedTypedMessage(
+          PERMIT_PARAMS_MOCK,
+          PERMIT_REQUEST_MOCK,
+          SignTypedDataVersion.V4,
+          { parseJsonData: false },
+        );
+
+        expect(
+          controller.state.signatureRequests[ID_MOCK].decodingLoading,
+        ).toBeUndefined();
+        expect(
+          controller.state.signatureRequests[ID_MOCK].decodingData,
+        ).toBeUndefined();
+      });
+
       it('correctly set decoding data if decodeSignature fails', async () => {
-        const { controller } = createController();
+        const { controller } = createController({
+          decodingApiUrl: 'www.test.com',
+          getFeatureFlags: () => ({ disableDecodingApi: false }),
+        });
 
         jest
           .spyOn(DecodingDataUtils, 'decodeSignature')
@@ -973,7 +1042,10 @@ describe('SignatureController', () => {
       });
 
       it('set decodingLoading to true while api request is in progress', async () => {
-        const { controller } = createController();
+        const { controller } = createController({
+          decodingApiUrl: 'www.test.com',
+          getFeatureFlags: () => ({ disableDecodingApi: false }),
+        });
 
         jest
           .spyOn(DecodingDataUtils, 'decodeSignature')

packages/signature-controller/src/SignatureController.ts

@@ -140,6 +140,8 @@ export type SignatureControllerMessenger = RestrictedControllerMessenger<
   never
 >;
 
+type FeatureFlags = { disableDecodingApi: boolean };
+
 export type SignatureControllerOptions = {
   /**
    * Restricted controller messenger required by the signature controller.
@@ -161,6 +163,11 @@ export type SignatureControllerOptions = {
    */
   decodingApiUrl?: string;
 
+  /**
+   * Function to get features flag information
+   */
+  getFeatureFlags?: () => FeatureFlags;
+
   /**
    * Initial state of the controller.
    */
@@ -184,19 +191,23 @@ export class SignatureController extends BaseController<
 
   #decodingApiUrl?: string;
 
+  #getFeatureFlags?: () => { disableDecodingApi: boolean };
+
   #trace: TraceCallback;
 
   /**
    * Construct a Sign controller.
    *
    * @param options - The controller options.
+   * @param options.decodingApiUrl - Api used to get decoded data for permits.
+   * @param options.getFeatureFlags - Function to get required feature flags.
    * @param options.messenger - The restricted controller messenger for the sign controller.
    * @param options.state - Initial state to set on this controller.
    * @param options.trace - Callback to generate trace information.
-   * @param options.decodingApiUrl - Api used to get decoded data for permits.
    */
   constructor({
     decodingApiUrl,
+    getFeatureFlags,
     messenger,
     state,
     trace,
@@ -214,6 +225,7 @@ export class SignatureController extends BaseController<
     this.hub = new EventEmitter();
     this.#trace = trace ?? (((_request, fn) => fn?.()) as TraceCallback);
     this.#decodingApiUrl = decodingApiUrl;
+    this.#getFeatureFlags = getFeatureFlags;
   }
 
   /**
@@ -902,6 +914,13 @@ export class SignatureController extends BaseController<
     request: OriginalRequest,
     chainId: string,
   ) {
+    if (
+      !this.#getFeatureFlags ||
+      this.#getFeatureFlags().disableDecodingApi ||
+      !this.#decodingApiUrl
+    ) {
+      return;
+    }
     this.#updateMetadata(signatureRequestId, (draftMetadata) => {
       draftMetadata.decodingLoading = true;
     });

packages/signature-controller/src/utils/decoding-api.ts

@@ -18,11 +18,8 @@ export const DECODING_API_ERRORS = {
 export async function decodeSignature(
   request: OriginalRequest,
   chainId: string,
-  decodingApiUrl?: string,
+  decodingApiUrl: string,
 ) {
-  if (!decodingApiUrl) {
-    return undefined;
-  }
   try {
     const { method, origin, params } = request;
     if (request.method === EthMethod.SignTypedDataV4) {