Integrating ppom update tool into mobile build (#7363)

.eslintignore

@@ -13,3 +13,4 @@ CHANGELOG.md
 wdio
 /app/util/test/testSetup.js
 /app/lib/ppom/ppom.html.js
+/ppom

.eslintrc.js

@@ -98,7 +98,7 @@ module.exports = {
     'import/no-amd': 2,
     'import/no-commonjs': 2,
     'import/no-duplicates': 2,
-    'import/no-extraneous-dependencies': 2,
+    'import/no-extraneous-dependencies': ['error', { packageDir: ['./'] }],
     'import/no-mutable-exports': 2,
     'import/no-namespace': 2,
     'import/no-nodejs-modules': 2,

.gitignore

@@ -102,3 +102,7 @@ browserstack.err
 
 # Reports generated by tests
 e2e/reports
+
+# ppom
+ppom/node_modules
+ppom/dist

app/components/UI/BlockaidBanner/BlockaidBanner.constants.ts

@@ -24,6 +24,7 @@ export const REASON_DESCRIPTION_I18N_KEY_MAP: { [Reason: string]: string } =
     [Reason.transferFarming]: 'blockaid_banner.transfer_farming_description',
     [Reason.transferFromFarming]:
       'blockaid_banner.transfer_farming_description',
+    [Reason.notApplicable]: 'blockaid_banner.not_applicable',
   });
 
 export const REASON_TITLE_I18N_KEY_MAP: Record<string, string> = Object.freeze({

app/components/UI/BlockaidBanner/BlockaidBanner.test.tsx

@@ -29,7 +29,7 @@ describe('BlockaidBanner', () => {
     const wrapper = render(
       <BlockaidBanner
         securityAlertResponse={{
-          resultType: ResultType.Warning,
+          result_type: ResultType.Warning,
           reason: Reason.approvalFarming,
           features: mockFeatures,
         }}
@@ -43,7 +43,7 @@ describe('BlockaidBanner', () => {
     const wrapper = render(
       <BlockaidBanner
         securityAlertResponse={{
-          resultType: ResultType.Malicious,
+          result_type: ResultType.Malicious,
           reason: Reason.rawSignatureFarming,
           features: mockFeatures,
         }}
@@ -66,7 +66,7 @@ describe('BlockaidBanner', () => {
     const wrapper = render(
       <BlockaidBanner
         securityAlertResponse={{
-          resultType: ResultType.Malicious,
+          result_type: ResultType.Malicious,
           reason: Reason.rawSignatureFarming,
           features: mockFeatures,
         }}
@@ -80,7 +80,7 @@ describe('BlockaidBanner', () => {
     const wrapper = render(
       <BlockaidBanner
         securityAlertResponse={{
-          resultType: ResultType.Malicious,
+          result_type: ResultType.Malicious,
           reason: Reason.approvalFarming,
           features: mockFeatures,
         }}
@@ -119,7 +119,7 @@ describe('BlockaidBanner', () => {
     const wrapper = render(
       <BlockaidBanner
         securityAlertResponse={{
-          resultType: ResultType.Malicious,
+          result_type: ResultType.Malicious,
           reason: Reason.approvalFarming,
           features: mockFeatures,
         }}
@@ -153,7 +153,7 @@ describe('BlockaidBanner', () => {
     const wrapper = render(
       <BlockaidBanner
         securityAlertResponse={{
-          resultType: ResultType.Benign,
+          result_type: ResultType.Benign,
           reason: Reason.rawSignatureFarming,
           features: mockFeatures,
         }}
@@ -169,7 +169,7 @@ describe('BlockaidBanner', () => {
     const wrapper = render(
       <BlockaidBanner
         securityAlertResponse={{
-          resultType: ResultType.Failed,
+          result_type: ResultType.Failed,
           reason: Reason.rawSignatureFarming,
           features: mockFeatures,
         }}

app/components/UI/BlockaidBanner/BlockaidBanner.tsx

@@ -61,16 +61,16 @@ const BlockaidBanner = (bannerProps: BlockaidBannerProps) => {
     return null;
   }
 
-  const { resultType, reason, features } = securityAlertResponse;
+  const { result_type, reason, features } = securityAlertResponse;
 
-  if (resultType === ResultType.Benign) {
+  if (result_type === ResultType.Benign) {
     return null;
   }
 
   const title = getTitle(reason);
   const description = getDescription(reason);
 
-  if (resultType === ResultType.Failed) {
+  if (result_type === ResultType.Failed) {
     return (
       <BannerAlert
         severity={BannerAlertSeverity.Warning}
@@ -122,7 +122,7 @@ const BlockaidBanner = (bannerProps: BlockaidBannerProps) => {
   return (
     <BannerAlert
       severity={
-        resultType === ResultType.Malicious
+        result_type === ResultType.Malicious
           ? BannerAlertSeverity.Error
           : BannerAlertSeverity.Warning
       }

app/components/UI/BlockaidBanner/BlockaidBanner.types.ts

@@ -31,7 +31,7 @@ export enum ResultType {
 export interface SecurityAlertResponse {
   reason: Reason;
   features: string[];
-  resultType: ResultType;
+  result_type: ResultType;
   providerRequestsCount?: Record<string, number>;
 }
 

app/components/UI/BlockaidBanner/__snapshots__/BlockaidBanner.test.tsx.snap

@@ -16,7 +16,7 @@ exports[`BlockaidBanner should render correctly 1`] = `
         "Operator is untrusted according to previous activity",
       ],
       "reason": "approval_farming",
-      "resultType": "Warning",
+      "result_type": "Warning",
     }
   }
   style={
@@ -256,7 +256,7 @@ exports[`BlockaidBanner should render correctly with list attack details 1`] = `
         "Operator is untrusted according to previous activity",
       ],
       "reason": "approval_farming",
-      "resultType": "Malicious",
+      "result_type": "Malicious",
     }
   }
   style={
@@ -496,7 +496,7 @@ exports[`BlockaidBanner should render correctly with reason "raw_signature_farmi
         "Operator is untrusted according to previous activity",
       ],
       "reason": "raw_signature_farming",
-      "resultType": "Malicious",
+      "result_type": "Malicious",
     }
   }
   style={
@@ -812,7 +812,7 @@ exports[`BlockaidBanner should render something does not look right with contact
         "Operator is untrusted according to previous activity",
       ],
       "reason": "approval_farming",
-      "resultType": "Malicious",
+      "result_type": "Malicious",
     }
   }
   style={

app/components/UI/TransactionReview/index.test.tsx

@@ -128,7 +128,7 @@ describe('TransactionReview', () => {
 
   it('should display blockaid banner', async () => {
     const securityAlertResponse = {
-      resultType: 'Malicious',
+      result_type: 'Malicious',
       reason: 'blur_farming',
       providerRequestsCount: {},
     };
@@ -141,8 +141,8 @@ describe('TransactionReview', () => {
 
     const blockaidMetricsParamsSpy = jest
       .spyOn(BlockaidUtils, 'getBlockaidMetricsParams')
-      .mockImplementation(({ resultType, reason, providerRequestsCount }) => ({
-        security_alert_response: resultType,
+      .mockImplementation(({ result_type, reason, providerRequestsCount }) => ({
+        security_alert_response: result_type,
         security_alert_reason: reason,
         security_alert_provider_requests_count: providerRequestsCount,
       }));

app/core/Engine.ts

@@ -681,8 +681,7 @@ class Engine {
               listener,
             ),
           onPreferencesChange: () => undefined,
-          provider: () =>
-            networkController.getProviderAndBlockTracker().provider,
+          provider: networkController.getProviderAndBlockTracker().provider,
           ppomProvider: {
             PPOM,
             ppomInit,

app/lib/ppom/PPOMView.tsx

@@ -5,6 +5,8 @@ import { WebView } from 'react-native-webview';
 
 import Logger from '../../util/Logger.js';
 import asyncInvoke from './invoke-lib';
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
 import { html } from './ppom.html.js';
 
 const styles = StyleSheet.create({
@@ -26,7 +28,7 @@ const convertFilesToBase64 = (files: any[][]) =>
   });
 
 class PPOMInner {
-  _new = invoke.bind('PPOM.new');
+  _new = invoke.bindAsync('PPOM.new');
   _free = invoke.bind('PPOM.free');
   _test = invoke.bindAsync('PPOM.test');
   _validateJsonRpc = invoke.bindAsync('PPOM.validateJsonRpc');

app/lib/ppom/invoke-lib.ts

@@ -30,7 +30,7 @@ export default (invoke: any) => {
 
     invoke.define(`${name}_trigger`, ({ id, args }: any) => {
       func(...args)
-        .then((...args1: any[]) => resolveCallback({ id, args1 }))
+        .then((...args2: any[]) => resolveCallback({ id, args: args2 }))
         .catch((e: Error) => rejectCallback({ id, error: serializeError(e) }));
     });
   };

app/util/blockaid/index.test.ts

@@ -13,7 +13,7 @@ describe('getBlockaidMetricsParams', () => {
 
   it('should return additionalParams object when securityAlertResponse defined', () => {
     const securityAlertResponse: SecurityAlertResponse = {
-      resultType: ResultType.Malicious,
+      result_type: ResultType.Malicious,
       reason: Reason.notApplicable,
       providerRequestsCount: {
         eth_call: 5,
@@ -34,7 +34,7 @@ describe('getBlockaidMetricsParams', () => {
 
   it('should not return eth call counts if providerRequestsCount is empty', () => {
     const securityAlertResponse: SecurityAlertResponse = {
-      resultType: ResultType.Malicious,
+      result_type: ResultType.Malicious,
       reason: Reason.notApplicable,
       features: [],
       providerRequestsCount: {},
@@ -50,7 +50,7 @@ describe('getBlockaidMetricsParams', () => {
 
   it('should not return eth call counts if providerRequestsCount is undefined', () => {
     const securityAlertResponse: SecurityAlertResponse = {
-      resultType: ResultType.Malicious,
+      result_type: ResultType.Malicious,
       reason: Reason.notApplicable,
       features: [],
       providerRequestsCount: undefined,

app/util/blockaid/index.ts

@@ -14,17 +14,18 @@ export const getBlockaidMetricsParams = (
   const additionalParams: Record<string, any> = {};
 
   if (securityAlertResponse && isBlockaidFeatureEnabled()) {
-    const { resultType, reason, providerRequestsCount } = securityAlertResponse;
+    const { result_type, reason, providerRequestsCount } =
+      securityAlertResponse;
 
-    if (resultType === ResultType.Malicious) {
+    if (result_type === ResultType.Malicious) {
       additionalParams.ui_customizations = ['flagged_as_malicious'];
     }
 
-    if (resultType !== ResultType.Benign) {
+    if (result_type !== ResultType.Benign) {
       additionalParams.security_alert_reason = Reason.notApplicable;
 
       if (reason) {
-        additionalParams.security_alert_response = resultType;
+        additionalParams.security_alert_response = result_type;
         additionalParams.security_alert_reason = reason;
       }
     }

app/util/test/initial-background-state.json

@@ -39,7 +39,8 @@
     "chainStatus": {
       "0x1": {
         "chainId": "0x1",
-        "dataFetched": false
+        "dataFetched": false,
+        "versionInfo": []
       }
     },
     "storageMetadata": [],

package.json

@@ -16,7 +16,7 @@
     "lint:fix": "eslint '**/*.{js,ts,tsx}' --fix",
     "lint:tsc": "tsc --project ./tsconfig.lint.json",
     "format": "prettier '**/*.{js,ts,tsx,json,feature}' --write",
-    "setup": "yarn clean && yarn pod:install && yarn allow-scripts && ./scripts/postinstall.sh",
+    "setup": "yarn clean && yarn pod:install && yarn allow-scripts && ./scripts/build_ppom.sh && ./scripts/postinstall.sh",
     "setup:node": "yarn clean:node && yarn allow-scripts && yarn patch-package",
     "setup:e2e": "cd wdio && yarn install",
     "start:ios": "./scripts/build.sh ios debug",
@@ -175,7 +175,7 @@
     "@metamask/network-controller": "^8.0.0",
     "@metamask/permission-controller": "^4.0.1",
     "@metamask/phishing-controller": "^3.0.0",
-    "@metamask/ppom-validator": "^0.5.0",
+    "@metamask/ppom-validator": "^0.7.0",
     "@metamask/preferences-controller": "^3.0.0",
     "@metamask/scure-bip39": "^2.1.0",
     "@metamask/sdk-communication-layer": "^0.7.0",

ppom/.eslintignore

@@ -0,0 +1,2 @@
+/webpack.config.html-js.js
+/webpack.config.html.js