use new recursive normalizer

MetaMask · Jan 15, 2025 · 6ff387b · 6ff387b
1 parent 9bd8988
commit 6ff387b
Show file tree

Hide file tree

Showing 11 changed files with 715 additions and 639 deletions.
diff --git a/app/scripts/lib/ppom/ppom-util.test.ts b/app/scripts/lib/ppom/ppom-util.test.ts
@@ -78,6 +78,29 @@ const SIGN_TYPED_DATA_PARAMS_MOCK_2 = {
       extraField: 'should be removed',
       test: { field: 'value' },
     },
+    a: {
+      a: {
+        a: {
+          a: {
+            a: {
+              a: {
+                a: {
+                  a: {
+                    a: {
+                      a: {
+                        a: {
+                          a: {},
+                        },
+                      },
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+    },
   },
 };
 
@@ -327,14 +350,7 @@ describe('PPOM Utils', () => {
             JSON.stringify({
               ...SIGN_TYPED_DATA_PARAMS_MOCK_2,
               message: {
-                value: {
-                  root: {
-                    value:
-                      '0xbb50db86866daf83b8142fb53a50e4173c67f57330f24654ab7b110c484c8918',
-                    type: 'bytes32',
-                  },
-                },
-                type: 'Root',
+                root: '0xbb50db86866daf83b8142fb53a50e4173c67f57330f24654ab7b110c484c8918',
               },
             }),
           ],

diff --git a/app/scripts/lib/ppom/ppom-util.ts b/app/scripts/lib/ppom/ppom-util.ts
@@ -18,10 +18,7 @@ import {
 } from '../../../../shared/constants/security-provider';
 import { SIGNING_METHODS } from '../../../../shared/constants/transaction';
 import { AppStateController } from '../../controllers/app-state-controller';
-import {
-  // sanitizeMessage,
-  sanitizeMessageRecursively,
-} from '../../../../shared/modules/typed-signature';
+import { sanitizeMessageRecursively } from '../../../../shared/modules/typed-signature';
 import { parseTypedDataMessage } from '../../../../shared/modules/transaction.utils';
 import { SecurityAlertResponse, UpdateSecurityAlertResponse } from './types';
 import {
@@ -197,28 +194,22 @@ function sanitizeRequest(request: JsonRpcRequest): JsonRpcRequest {
     request.method === METHOD_SIGN_TYPED_DATA_V3
   ) {
     if (Array.isArray(request.params) && request.params[1]) {
-      // console.log('>>>>>>>> ', request.params[1].toString());
-      const typedMessage = parseTypedDataMessage(request.params[1].toString());
-      // const sanitizedMessage = sanitizeMessage(
-      //   typedMessage.message,
-      //   typedMessage.primaryType,
-      //   typedMessage.types,
-      // );
+      const typedDataMessage = parseTypedDataMessage(
+        request.params[1].toString(),
+      );
 
       const sanitizedMessageRecursively = sanitizeMessageRecursively(
-        typedMessage.message,
-        typedMessage.primaryType,
-        typedMessage.types,
+        typedDataMessage.message,
+        typedDataMessage.types,
+        typedDataMessage.primaryType,
       );
 
-      // console.log('>>>>>>>> ', sanitizedMessageRecursively);
-
       return {
         ...request,
         params: [
           request.params[0],
           JSON.stringify({
-            ...typedMessage,
+            ...typedDataMessage,
             message: sanitizedMessageRecursively,
           }),
         ],