fix: bump assets controller to 30.0.0

.storybook/test-data.js

@@ -470,8 +470,28 @@ const state = {
         isEns: true,
       },
     ],
-    contractExchangeRates: {
-      '0xaD6D458402F60fD3Bd25163575031ACDce07538D': 0,
+    marketData: {
+      '0xaa36a7': {
+        '0xaD6D458402F60fD3Bd25163575031ACDce07538D': {
+          price: 0,
+          contractPercentChange1d: 0.004,
+          priceChange1d: 0.00004,
+        },
+      },
+      '0x1': {
+        '0xaD6D458402F60fD3Bd25163575031ACDce07538D': {
+          price: 0,
+          contractPercentChange1d: 0.004,
+          priceChange1d: 0.00004,
+        },
+      },
+      '0x5': {
+        '0xaD6D458402F60fD3Bd25163575031ACDce07538D': {
+          price: 0,
+          contractPercentChange1d: 0.004,
+          priceChange1d: 0.00004,
+        },
+      },
     },
     tokens: [
       {

.yarn/patches/@metamask-assets-controllers-npm-30.0.0-8747c20871.patch

@@ -0,0 +1,13 @@
+diff --git a/dist/chunk-Z6TBQQE5.js b/dist/chunk-Z6TBQQE5.js
+index 2f1b66f2c39794d660553bbdc395697775f90e1d..18d7d5620d827419100c75736f6ec809161da212 100644
+--- a/dist/chunk-Z6TBQQE5.js
++++ b/dist/chunk-Z6TBQQE5.js
+@@ -295,7 +295,7 @@ var CodefiTokenPricesServiceV2 = class {
+       (obj, tokenAddress) => {
+         const lowercasedTokenAddress = tokenAddress.toLowerCase();
+         const marketData = addressCryptoDataMap[lowercasedTokenAddress];
+-        if (marketData === void 0) {
++        if (!marketData) {
+           return obj;
+         }
+         const { price } = marketData;

app/scripts/background.js

@@ -232,8 +232,7 @@ function saveTimestamp() {
  * @property {object} identities - An object matching lower-case hex addresses to Identity objects with "address" and "name" (nickname) keys.
  * @property {object} networkConfigurations - A list of network configurations, containing RPC provider details (eg chainId, rpcUrl, rpcPreferences).
  * @property {Array} addressBook - A list of previously sent to addresses.
- * @property {object} contractExchangeRatesByChainId - Info about current token prices keyed by chainId.
- * @property {object} contractExchangeRates - Info about current token prices on current chain.
+ * @property {object} marketData - A map from chain ID -> contract address -> an object containing the token's market data.
  * @property {Array} tokens - Tokens held by the current user, including their balances.
  * @property {object} send - TODO: Document
  * @property {boolean} useBlockie - Indicates preferred user identicon format. True for blockie, false for Jazzicon.

app/scripts/controllers/swaps.js

@@ -706,12 +706,14 @@ export default class SwapsController {
   }
 
   async _findTopQuoteAndCalculateSavings(quotes = {}) {
-    const { contractExchangeRates: tokenConversionRates } =
-      this.getTokenRatesState();
+    const { marketData } = this.getTokenRatesState();
+    const chainId = this._getCurrentChainId();
+
+    const tokenConversionRates = marketData[chainId];
+
     const {
       swapsState: { customGasPrice, customMaxPriorityFeePerGas },
     } = this.store.getState();
-    const chainId = this._getCurrentChainId();
 
     const numQuotes = Object.keys(quotes).length;
     if (!numQuotes) {
@@ -836,7 +838,7 @@ export default class SwapsController {
           Object.keys(tokenConversionRates).find((tokenAddress) =>
             isEqualCaseInsensitive(tokenAddress, destinationToken),
           )
-        ];
+        ]?.price;
       const conversionRateForSorting = tokenConversionRate || 1;
 
       const ethValueOfTokens = decimalAdjustedDestinationAmount.times(

app/scripts/controllers/swaps.test.js

@@ -81,9 +81,11 @@ const MOCK_FETCH_METADATA = {
 };
 
 const MOCK_TOKEN_RATES_STORE = () => ({
-  contractExchangeRates: {
-    '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48': 2,
-    '0x1111111111111111111111111111111111111111': 0.1,
+  marketData: {
+    '0x1': {
+      '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48': { price: 2 },
+      '0x1111111111111111111111111111111111111111': { price: 0.1 },
+    },
   },
 });
 
@@ -794,7 +796,9 @@ describe('SwapsController', function () {
           .resolves(BigNumber.from(1));
 
         swapsController.getTokenRatesState = () => ({
-          contractExchangeRates: {},
+          marketData: {
+            '0x1': {},
+          },
         });
 
         const [newQuotes, topAggId] = await swapsController.fetchAndSetQuotes(

app/scripts/lib/setupSentry.js

@@ -342,8 +342,7 @@ export const SENTRY_BACKGROUND_STATE = {
     },
   },
   TokenRatesController: {
-    contractExchangeRates: false,
-    contractExchangeRatesByChainId: false,
+    marketData: false,
   },
   TokensController: {
     allDetectedTokens: {

app/scripts/metamask-controller.js

@@ -657,7 +657,10 @@ export default class MetamaskController extends EventEmitter {
 
     const nftControllerMessenger = this.controllerMessenger.getRestricted({
       name: 'NftController',
-      allowedActions: [`${this.approvalController.name}:addRequest`],
+      allowedActions: [
+        `${this.approvalController.name}:addRequest`,
+        `${this.networkController.name}:getNetworkClientById`,
+      ],
     });
     this.nftController = new NftController(
       {
@@ -742,6 +745,9 @@ export default class MetamaskController extends EventEmitter {
           : !this.preferencesController.store.getState().useNftDetection,
       selectedAddress:
         this.preferencesController.store.getState().selectedAddress,
+      getNetworkClientById: this.networkController.getNetworkClientById.bind(
+        this.networkController,
+      ),
     });
 
     this.metaMetricsController = new MetaMetricsController({

app/scripts/migrations/120.test.ts

@@ -0,0 +1,42 @@
+import { migrate, version } from './120';
+
+const oldVersion = 119;
+
+describe('migration #120', () => {
+  afterEach(() => jest.resetAllMocks());
+
+  it('updates the version metadata', async () => {
+    const oldStorage = {
+      meta: { version: oldVersion },
+      data: {},
+    };
+
+    const newStorage = await migrate(oldStorage);
+    expect(newStorage.meta).toStrictEqual({ version });
+  });
+
+  it('deletes the deprecated token rates controller fields', async () => {
+    const oldStorage = {
+      meta: { version: oldVersion },
+      data: {
+        TokenRatesController: {
+          contractExchangeRates: {
+            '0x8290333ceF9e6D528dD5618Fb97a76f268f3EDD4': 0.00001142055192565137,
+            '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2': 1.000125,
+          },
+          contractExchangeRatesByChainId: {
+            '0x1': {
+              ETH: {
+                '0x8290333ceF9e6D528dD5618Fb97a76f268f3EDD4': 0.00001142055192565137,
+                '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2': 1.000125,
+              },
+            },
+          },
+        },
+      },
+    };
+
+    const newStorage = await migrate(oldStorage);
+    expect(newStorage.data.TokenRatesController).toStrictEqual({});
+  });
+});

app/scripts/migrations/120.ts

@@ -0,0 +1,37 @@
+import { cloneDeep } from 'lodash';
+import { hasProperty } from '@metamask/utils';
+
+type VersionedData = {
+  meta: { version: number };
+  data: Record<string, unknown>;
+};
+
+export const version = 120;
+
+/**
+ * This migration removes the deprecated fields `contractExchangeRates`
+ * and `contractExchangeRatesByChainId` from the TokenRatesController.
+ *
+ * @param originalVersionedData - Versioned MetaMask extension state, exactly what we persist to dist.
+ * @param originalVersionedData.meta - State metadata.
+ * @param originalVersionedData.meta.version - The current state version.
+ * @param originalVersionedData.data - The persisted MetaMask state, keyed by controller.
+ * @returns Updated versioned MetaMask extension state.
+ */
+export async function migrate(
+  originalVersionedData: VersionedData,
+): Promise<VersionedData> {
+  const versionedData = cloneDeep(originalVersionedData);
+  versionedData.meta.version = version;
+  transformState(versionedData.data);
+  return versionedData;
+}
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function transformState(state: Record<string, any>) {
+  if (hasProperty(state, 'TokenRatesController')) {
+    delete state.TokenRatesController.contractExchangeRates;
+    delete state.TokenRatesController.contractExchangeRatesByChainId;
+  }
+  return state;
+}

app/scripts/migrations/index.js

@@ -130,6 +130,7 @@ const migrations = [
   require('./117'),
   require('./118'),
   require('./119'),
+  require('./120'),
 ];
 
 export default migrations;

lavamoat/browserify/beta/policy.json

@@ -834,11 +834,11 @@
         "@ethersproject/providers": true,
         "@metamask/abi-utils": true,
         "@metamask/assets-controllers>@metamask/base-controller": true,
+        "@metamask/assets-controllers>@metamask/controller-utils": true,
         "@metamask/assets-controllers>@metamask/polling-controller": true,
         "@metamask/assets-controllers>cockatiel": true,
         "@metamask/assets-controllers>multiformats": true,
         "@metamask/contract-metadata": true,
-        "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
         "@metamask/metamask-eth-abis": true,
         "@metamask/name-controller>async-mutex": true,
@@ -859,6 +859,24 @@
         "immer": true
       }
     },
+    "@metamask/assets-controllers>@metamask/controller-utils": {
+      "globals": {
+        "URL": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/controller-utils>@spruceid/siwe-parser": true,
+        "@metamask/ethjs>@metamask/ethjs-unit": true,
+        "@metamask/utils": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "eslint>fast-deep-equal": true,
+        "eth-ens-namehash": true
+      }
+    },
     "@metamask/assets-controllers>@metamask/polling-controller": {
       "globals": {
         "clearTimeout": true,