Merge branch 'develop' into feat/mmassets-432_network-filter-extension

Author: salimtb

.github/CODEOWNERS

@@ -52,7 +52,12 @@ privacy-snapshot.json                @MetaMask/extension-privacy-reviewers
 .devcontainer/                       @MetaMask/library-admins @HowardBraham @plasmacorral
 
 # Confirmations team to own code for confirmations on UI.
-ui/pages/confirmations               @MetaMask/confirmations
+app/scripts/lib/ppom                    @MetaMask/confirmations
+app/scripts/lib/signature               @MetaMask/confirmations
+app/scripts/lib/transaction/decode      @MetaMask/confirmations
+app/scripts/lib/transaction/metrics.*   @MetaMask/confirmations
+app/scripts/lib/transaction/util.*      @MetaMask/confirmations
+ui/pages/confirmations                  @MetaMask/confirmations
 
 # MMI team is responsible for code related with Institutioanl version of MetaMask
 ui/pages/institutional               @MetaMask/mmi

.storybook/main.js

@@ -52,6 +52,9 @@ module.exports = {
     config.resolve.alias['../../../../../../store/actions'] = require.resolve(
       '../ui/__mocks__/actions.js',
     );
+    config.resolve.alias['../../../store/actions'] = require.resolve(
+      '../ui/__mocks__/actions.js',
+    );
     // Import within controller-utils crashes storybook.
     config.resolve.alias['@ethereumjs/util'] = require.resolve(
       '../ui/__mocks__/ethereumjs-util.js',

.yarn/patches/@metamask-assets-controllers-npm-38.3.0-57b3d695bb.patch renamed to .yarn/patches/@metamask-assets-controllers-npm-39.0.0-57b3d695bb.patch

@@ -117,7 +117,8 @@ npmAuditIgnoreAdvisories:
   # Currently in use for the network list drag and drop functionality.
   # Maintenance has stopped and the project will be archived in 2025.
   - 'react-beautiful-dnd (deprecation)'
-
+  # New package name format for new versions: @ethereumjs/wallet.
+  - 'ethereumjs-wallet (deprecation)'
 npmRegistries:
   'https://npm.pkg.github.com':
     npmAlwaysAuth: true

.yarnrc.yml

@@ -98,6 +98,7 @@ export const SENTRY_BACKGROUND_STATE = {
   BridgeController: {
     bridgeState: {
       bridgeFeatureFlags: {
+        extensionConfig: false,
         extensionSupport: false,
         destNetworkAllowlist: [],
         srcNetworkAllowlist: [],
@@ -106,6 +107,15 @@ export const SENTRY_BACKGROUND_STATE = {
       destTopAssets: [],
       srcTokens: {},
       srcTopAssets: [],
+      quoteRequest: {
+        walletAddress: false,
+        srcTokenAddress: true,
+        slippage: true,
+        srcChainId: true,
+        destChainId: true,
+        destTokenAddress: true,
+        srcTokenAmount: true,
+      },
     },
   },
   CronjobController: {
@@ -233,6 +243,7 @@ export const SENTRY_BACKGROUND_STATE = {
       showNativeTokenAsMainBalance: true,
       petnamesEnabled: true,
       showConfirmationAdvancedDetails: true,
+      privacyMode: false,
     },
     useExternalServices: false,
     selectedAddress: false,

app/_locales/en/messages.json

@@ -29,6 +29,10 @@ describe('BridgeController', function () {
     nock(BRIDGE_API_BASE_URL)
       .get('/getAllFeatureFlags')
       .reply(200, {
+        'extension-config': {
+          refreshRate: 3,
+          maxRefreshCount: 1,
+        },
         'extension-support': true,
         'src-network-allowlist': [10, 534352],
         'dest-network-allowlist': [137, 42161],
@@ -55,6 +59,7 @@ describe('BridgeController', function () {
           symbol: 'ABC',
         },
       ]);
+    bridgeController.resetState();
   });
 
   it('constructor should setup correctly', function () {
@@ -66,6 +71,10 @@ describe('BridgeController', function () {
       extensionSupport: true,
       destNetworkAllowlist: [CHAIN_IDS.POLYGON, CHAIN_IDS.ARBITRUM],
       srcNetworkAllowlist: [CHAIN_IDS.OPTIMISM, CHAIN_IDS.SCROLL],
+      extensionConfig: {
+        maxRefreshCount: 1,
+        refreshRate: 3,
+      },
     };
     expect(bridgeController.state).toStrictEqual(EMPTY_INIT_STATE);
 
@@ -94,6 +103,11 @@ describe('BridgeController', function () {
     expect(bridgeController.state.bridgeState.destTopAssets).toStrictEqual([
       { address: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984', symbol: 'ABC' },
     ]);
+    expect(bridgeController.state.bridgeState.quoteRequest).toStrictEqual({
+      slippage: 0.5,
+      srcTokenAddress: '0x0000000000000000000000000000000000000000',
+      walletAddress: undefined,
+    });
   });
 
   it('selectSrcNetwork should set the bridge src tokens and top assets', async function () {
@@ -118,5 +132,76 @@ describe('BridgeController', function () {
         symbol: 'ABC',
       },
     ]);
+    expect(bridgeController.state.bridgeState.quoteRequest).toStrictEqual({
+      slippage: 0.5,
+      srcTokenAddress: '0x0000000000000000000000000000000000000000',
+      walletAddress: undefined,
+    });
+  });
+
+  it('updateBridgeQuoteRequestParams should update the quoteRequest state', function () {
+    bridgeController.updateBridgeQuoteRequestParams({ srcChainId: 1 });
+    expect(bridgeController.state.bridgeState.quoteRequest).toStrictEqual({
+      srcChainId: 1,
+      slippage: 0.5,
+      srcTokenAddress: '0x0000000000000000000000000000000000000000',
+      walletAddress: undefined,
+    });
+
+    bridgeController.updateBridgeQuoteRequestParams({ destChainId: 10 });
+    expect(bridgeController.state.bridgeState.quoteRequest).toStrictEqual({
+      destChainId: 10,
+      slippage: 0.5,
+      srcTokenAddress: '0x0000000000000000000000000000000000000000',
+      walletAddress: undefined,
+    });
+
+    bridgeController.updateBridgeQuoteRequestParams({ destChainId: undefined });
+    expect(bridgeController.state.bridgeState.quoteRequest).toStrictEqual({
+      destChainId: undefined,
+      slippage: 0.5,
+      srcTokenAddress: '0x0000000000000000000000000000000000000000',
+      walletAddress: undefined,
+    });
+
+    bridgeController.updateBridgeQuoteRequestParams({
+      srcTokenAddress: undefined,
+    });
+    expect(bridgeController.state.bridgeState.quoteRequest).toStrictEqual({
+      slippage: 0.5,
+      srcTokenAddress: undefined,
+      walletAddress: undefined,
+    });
+
+    bridgeController.updateBridgeQuoteRequestParams({
+      srcTokenAmount: '100000',
+      destTokenAddress: '0x123',
+      slippage: 0.5,
+      srcTokenAddress: '0x0000000000000000000000000000000000000000',
+      walletAddress: undefined,
+    });
+    expect(bridgeController.state.bridgeState.quoteRequest).toStrictEqual({
+      srcTokenAmount: '100000',
+      destTokenAddress: '0x123',
+      slippage: 0.5,
+      srcTokenAddress: '0x0000000000000000000000000000000000000000',
+      walletAddress: undefined,
+    });
+
+    bridgeController.updateBridgeQuoteRequestParams({
+      srcTokenAddress: '0x2ABC',
+    });
+    expect(bridgeController.state.bridgeState.quoteRequest).toStrictEqual({
+      slippage: 0.5,
+      srcTokenAddress: '0x2ABC',
+      walletAddress: undefined,
+    });
+
+    bridgeController.resetState();
+    expect(bridgeController.state.bridgeState.quoteRequest).toStrictEqual({
+      slippage: 0.5,
+      srcTokenAddress: '0x0000000000000000000000000000000000000000',
+      walletAddress: undefined,
+    });
   });
 });

app/scripts/constants/sentry-state.ts

@@ -9,6 +9,9 @@ import {
 // TODO: Remove restricted import
 // eslint-disable-next-line import/no-restricted-paths
 import { fetchTopAssetsList } from '../../../../ui/pages/swaps/swaps.util';
+// TODO: Remove restricted import
+// eslint-disable-next-line import/no-restricted-paths
+import { QuoteRequest } from '../../../../ui/pages/bridge/types';
 import {
   BRIDGE_CONTROLLER_NAME,
   DEFAULT_BRIDGE_CONTROLLER_STATE,
@@ -47,8 +50,29 @@ export default class BridgeController extends BaseController<
       `${BRIDGE_CONTROLLER_NAME}:selectDestNetwork`,
       this.selectDestNetwork.bind(this),
     );
+    this.messagingSystem.registerActionHandler(
+      `${BRIDGE_CONTROLLER_NAME}:updateBridgeQuoteRequestParams`,
+      this.updateBridgeQuoteRequestParams.bind(this),
+    );
   }
 
+  updateBridgeQuoteRequestParams = (paramsToUpdate: Partial<QuoteRequest>) => {
+    const { bridgeState } = this.state;
+    const updatedQuoteRequest = {
+      ...DEFAULT_BRIDGE_CONTROLLER_STATE.quoteRequest,
+      ...paramsToUpdate,
+    };
+
+    this.update((_state) => {
+      _state.bridgeState = {
+        ...bridgeState,
+        quoteRequest: {
+          ...updatedQuoteRequest,
+        },
+      };
+    });
+  };
+
   resetState = () => {
     this.update((_state) => {
       _state.bridgeState = {

app/scripts/controllers/bridge/bridge-controller.test.ts

@@ -1,9 +1,17 @@
+import { zeroAddress } from 'ethereumjs-util';
 import { BridgeControllerState, BridgeFeatureFlagsKey } from './types';
 
 export const BRIDGE_CONTROLLER_NAME = 'BridgeController';
+export const REFRESH_INTERVAL_MS = 30 * 1000;
+const DEFAULT_MAX_REFRESH_COUNT = 5;
+const DEFAULT_SLIPPAGE = 0.5;
 
 export const DEFAULT_BRIDGE_CONTROLLER_STATE: BridgeControllerState = {
   bridgeFeatureFlags: {
+    [BridgeFeatureFlagsKey.EXTENSION_CONFIG]: {
+      refreshRate: REFRESH_INTERVAL_MS,
+      maxRefreshCount: DEFAULT_MAX_REFRESH_COUNT,
+    },
     [BridgeFeatureFlagsKey.EXTENSION_SUPPORT]: false,
     [BridgeFeatureFlagsKey.NETWORK_SRC_ALLOWLIST]: [],
     [BridgeFeatureFlagsKey.NETWORK_DEST_ALLOWLIST]: [],
@@ -12,4 +20,9 @@ export const DEFAULT_BRIDGE_CONTROLLER_STATE: BridgeControllerState = {
   srcTopAssets: [],
   destTokens: {},
   destTopAssets: [],
+  quoteRequest: {
+    walletAddress: undefined,
+    srcTokenAddress: zeroAddress(),
+    slippage: DEFAULT_SLIPPAGE,
+  },
 };

app/scripts/controllers/bridge/bridge-controller.ts

@@ -4,16 +4,24 @@ import {
 } from '@metamask/base-controller';
 import { Hex } from '@metamask/utils';
 import { SwapsTokenObject } from '../../../../shared/constants/swaps';
+// TODO: Remove restricted import
+// eslint-disable-next-line import/no-restricted-paths
+import { QuoteRequest } from '../../../../ui/pages/bridge/types';
 import BridgeController from './bridge-controller';
 import { BRIDGE_CONTROLLER_NAME } from './constants';
 
 export enum BridgeFeatureFlagsKey {
+  EXTENSION_CONFIG = 'extensionConfig',
   EXTENSION_SUPPORT = 'extensionSupport',
   NETWORK_SRC_ALLOWLIST = 'srcNetworkAllowlist',
   NETWORK_DEST_ALLOWLIST = 'destNetworkAllowlist',
 }
 
 export type BridgeFeatureFlags = {
+  [BridgeFeatureFlagsKey.EXTENSION_CONFIG]: {
+    refreshRate: number;
+    maxRefreshCount: number;
+  };
   [BridgeFeatureFlagsKey.EXTENSION_SUPPORT]: boolean;
   [BridgeFeatureFlagsKey.NETWORK_SRC_ALLOWLIST]: Hex[];
   [BridgeFeatureFlagsKey.NETWORK_DEST_ALLOWLIST]: Hex[];
@@ -25,11 +33,13 @@ export type BridgeControllerState = {
   srcTopAssets: { address: string }[];
   destTokens: Record<string, SwapsTokenObject>;
   destTopAssets: { address: string }[];
+  quoteRequest: Partial<QuoteRequest>;
 };
 
 export enum BridgeUserAction {
   SELECT_SRC_NETWORK = 'selectSrcNetwork',
   SELECT_DEST_NETWORK = 'selectDestNetwork',
+  UPDATE_QUOTE_PARAMS = 'updateBridgeQuoteRequestParams',
 }
 export enum BridgeBackgroundAction {
   SET_FEATURE_FLAGS = 'setBridgeFeatureFlags',
@@ -44,7 +54,8 @@ type BridgeControllerAction<FunctionName extends keyof BridgeController> = {
 type BridgeControllerActions =
   | BridgeControllerAction<BridgeBackgroundAction.SET_FEATURE_FLAGS>
   | BridgeControllerAction<BridgeUserAction.SELECT_SRC_NETWORK>
-  | BridgeControllerAction<BridgeUserAction.SELECT_DEST_NETWORK>;
+  | BridgeControllerAction<BridgeUserAction.SELECT_DEST_NETWORK>
+  | BridgeControllerAction<BridgeUserAction.UPDATE_QUOTE_PARAMS>;
 
 type BridgeControllerEvents = ControllerStateChangeEvent<
   typeof BRIDGE_CONTROLLER_NAME,

app/scripts/controllers/bridge/constants.ts

@@ -237,8 +237,6 @@ describe('MMIController', function () {
           messenger: mockMessenger,
         }),
         isEthSignEnabled: jest.fn(),
-        getAllState: jest.fn(),
-        getCurrentChainId: jest.fn(),
       }),
       appStateController: new AppStateController({
         addUnlockListener: jest.fn(),

app/scripts/controllers/bridge/types.ts

@@ -730,6 +730,7 @@ describe('preferences controller', () => {
       expect(controller.state.preferences).toStrictEqual({
         autoLockTimeLimit: undefined,
         showExtensionInFullSizeView: false,
+        privacyMode: false,
         showFiatInTestnets: false,
         showTestNetworks: false,
         smartTransactionsOptInStatus: null,
@@ -765,6 +766,7 @@ describe('preferences controller', () => {
         useNativeCurrencyAsPrimaryCurrency: true,
         hideZeroBalanceTokens: false,
         petnamesEnabled: true,
+        privacyMode: false,
         redesignedConfirmationsEnabled: true,
         redesignedTransactionsEnabled: true,
         shouldShowAggregatedBalancePopover: true,

app/scripts/controllers/mmi-controller.test.ts

@@ -112,6 +112,7 @@ export type Preferences = {
   redesignedTransactionsEnabled: boolean;
   featureNotificationsEnabled: boolean;
   showMultiRpcModal: boolean;
+  privacyMode: boolean;
   isRedesignedConfirmationsDeveloperEnabled: boolean;
   showConfirmationAdvancedDetails: boolean;
   tokenSortConfig: {
@@ -215,6 +216,7 @@ export const getDefaultPreferencesControllerState =
       isRedesignedConfirmationsDeveloperEnabled: false,
       showConfirmationAdvancedDetails: false,
       showMultiRpcModal: false,
+      privacyMode: false,
       shouldShowAggregatedBalancePopover: true, // by default user should see popover;
       tokenSortConfig: {
         key: 'tokenFiatAmount',

app/scripts/controllers/preferences-controller.test.ts

@@ -13,6 +13,7 @@ export const FIXTURES_PREFERENCES = {
     showNftAutodetectModal: false,
     isRedesignedConfirmationsDeveloperEnabled: false,
     showConfirmationAdvancedDetails: false,
+    privacyMode: false,
   },
   featureFlags: {
     sendHexData: true,