Support Multi-SRP in SeedlessOnboardingController

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/core-monorepo",
-  "version": "412.0.0",
+  "version": "414.0.0",
   "private": true,
   "description": "Monorepo for packages shared between MetaMask clients",
   "repository": {
@@ -59,7 +59,7 @@
     "@metamask/eslint-config-jest": "^14.0.0",
     "@metamask/eslint-config-nodejs": "^14.0.0",
     "@metamask/eslint-config-typescript": "^14.0.0",
-    "@metamask/eth-block-tracker": "^11.0.3",
+    "@metamask/eth-block-tracker": "^12.0.1",
     "@metamask/eth-json-rpc-provider": "^4.1.8",
     "@metamask/json-rpc-engine": "^10.0.3",
     "@metamask/utils": "^11.2.0",

packages/assets-controllers/CHANGELOG.md

@@ -7,8 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [66.0.0]
+
 ### Added
 
+- Add optional parameter to track DeFi metrics when positions are being fetched ([#5868](https://github.com/MetaMask/core/pull/5868))
 - Add phishing protection for NFT metadata URLs in `NftController` ([#5598](https://github.com/MetaMask/core/pull/5598))
   - NFT metadata URLs are now scanned for malicious content using the `PhishingController`
   - Malicious URLs in NFT metadata fields (image, externalLink, etc.) are automatically sanitized
@@ -1674,7 +1677,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Use Ethers for AssetsContractController ([#845](https://github.com/MetaMask/core/pull/845))
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
+[66.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [65.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [64.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [63.1.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]

packages/assets-controllers/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/assets-controllers",
-  "version": "65.0.0",
+  "version": "66.0.0",
   "description": "Controllers which manage interactions involving ERC-20, ERC-721, and ERC-1155 tokens (including NFTs)",
   "keywords": [
     "MetaMask",
@@ -91,7 +91,7 @@
     "@metamask/providers": "^21.0.0",
     "@metamask/snaps-controllers": "^11.2.1",
     "@metamask/snaps-sdk": "^6.22.0",
-    "@metamask/transaction-controller": "^56.2.0",
+    "@metamask/transaction-controller": "^56.3.0",
     "@types/jest": "^27.4.1",
     "@types/lodash": "^4.14.191",
     "@types/node": "^16.18.54",

packages/bridge-controller/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [29.0.0]
+
+### Changed
+
+- **BREAKING:** Bump `@metamask/assets-controller` peer dependency to `^66.0.0` ([#5872](https://github.com/MetaMask/core/pull/5872))
+
 ## [28.0.0]
 
 ### Changed
@@ -281,7 +287,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial release ([#5317](https://github.com/MetaMask/core/pull/5317))
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
+[29.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [28.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [27.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [26.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]

packages/bridge-controller/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/bridge-controller",
-  "version": "28.0.0",
+  "version": "29.0.0",
   "description": "Manages bridge-related quote fetching functionality for MetaMask",
   "keywords": [
     "MetaMask",
@@ -65,14 +65,14 @@
   },
   "devDependencies": {
     "@metamask/accounts-controller": "^29.0.0",
-    "@metamask/assets-controllers": "^65.0.0",
+    "@metamask/assets-controllers": "^66.0.0",
     "@metamask/auto-changelog": "^3.4.4",
     "@metamask/eth-json-rpc-provider": "^4.1.8",
     "@metamask/network-controller": "^23.5.0",
     "@metamask/remote-feature-flag-controller": "^1.6.0",
     "@metamask/snaps-controllers": "^11.2.1",
     "@metamask/superstruct": "^3.1.0",
-    "@metamask/transaction-controller": "^56.2.0",
+    "@metamask/transaction-controller": "^56.3.0",
     "@types/jest": "^27.4.1",
     "deepmerge": "^4.2.2",
     "jest": "^27.5.1",
@@ -86,7 +86,7 @@
   },
   "peerDependencies": {
     "@metamask/accounts-controller": "^29.0.0",
-    "@metamask/assets-controllers": "^65.0.0",
+    "@metamask/assets-controllers": "^66.0.0",
     "@metamask/network-controller": "^23.0.0",
     "@metamask/remote-feature-flag-controller": "^1.6.0",
     "@metamask/snaps-controllers": "^11.0.0",

packages/bridge-status-controller/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [26.0.0]
+
+### Changed
+
+- **BREAKING:** Bump `@metamask/bridge-controller` peer dependency to `^29.0.0` ([#5872](https://github.com/MetaMask/core/pull/5872))
+
 ## [25.0.0]
 
 ### Changed
@@ -268,7 +274,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial release ([#5317](https://github.com/MetaMask/core/pull/5317))
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
+[26.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [25.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [24.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [23.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]

packages/bridge-status-controller/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/bridge-status-controller",
-  "version": "25.0.0",
+  "version": "26.0.0",
   "description": "Manages bridge-related status fetching functionality for MetaMask",
   "keywords": [
     "MetaMask",
@@ -60,12 +60,12 @@
   "devDependencies": {
     "@metamask/accounts-controller": "^29.0.0",
     "@metamask/auto-changelog": "^3.4.4",
-    "@metamask/bridge-controller": "^28.0.0",
+    "@metamask/bridge-controller": "^29.0.0",
     "@metamask/gas-fee-controller": "^23.0.0",
     "@metamask/multichain-transactions-controller": "^1.0.0",
     "@metamask/network-controller": "^23.5.0",
     "@metamask/snaps-controllers": "^11.2.1",
-    "@metamask/transaction-controller": "^56.2.0",
+    "@metamask/transaction-controller": "^56.3.0",
     "@types/jest": "^27.4.1",
     "deepmerge": "^4.2.2",
     "jest": "^27.5.1",
@@ -79,7 +79,7 @@
   },
   "peerDependencies": {
     "@metamask/accounts-controller": "^29.0.0",
-    "@metamask/bridge-controller": "^28.0.0",
+    "@metamask/bridge-controller": "^29.0.0",
     "@metamask/gas-fee-controller": "^23.0.0",
     "@metamask/multichain-transactions-controller": "^1.0.0",
     "@metamask/network-controller": "^23.0.0",

packages/earn-controller/package.json

@@ -56,7 +56,7 @@
     "@metamask/accounts-controller": "^29.0.0",
     "@metamask/auto-changelog": "^3.4.4",
     "@metamask/network-controller": "^23.5.0",
-    "@metamask/transaction-controller": "^56.2.0",
+    "@metamask/transaction-controller": "^56.3.0",
     "@types/jest": "^27.4.1",
     "deepmerge": "^4.2.2",
     "jest": "^27.5.1",

packages/network-controller/CHANGELOG.md

@@ -9,7 +9,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- Bump `@metamask/eth-json-rpc-infura` to `^10.2.0` ([#5867](https://github.com/MetaMask/core/pull/5867))
+- Block tracker errors will no longer be wrapped under "PollingBlockTracker - encountered an error while attempting to update latest block" ([#5860](https://github.com/MetaMask/core/pull/5860))
+- Bump dependencies ([#5867](https://github.com/MetaMask/core/pull/5867), [#5860](https://github.com/MetaMask/core/pull/5860))
+  - Bump `@metamask/eth-block-tracker` to `^12.0.1`
+  - Bump `@metamask/eth-json-rpc-infura` to `^10.2.0`
+  - Bump `@metamask/eth-json-rpc-middleware` to `^17.0.1`
 
 ### Fixed
 
@@ -20,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - Other 4xx responses now throw a generic HTTP client error
   - Invalid JSON responses now throw a "Parse" error
 - Rather than throwing an error, NetworkController now corrects an invalid initial `selectedNetworkClientId` to point to the default RPC endpoint of the first network sorted by chain ID ([#5851](https://github.com/MetaMask/core/pull/5851))
+- Fix the block tracker so that it will now reject if an error is thrown while making the request instead of hanging ([#5860](https://github.com/MetaMask/core/pull/5860))
 
 ## [23.5.0]
 

packages/network-controller/package.json

@@ -50,9 +50,9 @@
     "@metamask/base-controller": "^8.0.1",
     "@metamask/controller-utils": "^11.9.0",
     "@metamask/error-reporting-service": "^0.0.0",
-    "@metamask/eth-block-tracker": "^11.0.3",
+    "@metamask/eth-block-tracker": "^12.0.1",
     "@metamask/eth-json-rpc-infura": "^10.2.0",
-    "@metamask/eth-json-rpc-middleware": "^16.0.1",
+    "@metamask/eth-json-rpc-middleware": "^17.0.1",
     "@metamask/eth-json-rpc-provider": "^4.1.8",
     "@metamask/eth-query": "^4.0.0",
     "@metamask/json-rpc-engine": "^10.0.3",

packages/network-controller/tests/provider-api-tests/block-hash-in-response.ts

@@ -57,15 +57,11 @@ export function testsForRpcMethodsThatCheckForBlockHashInResponse(
   });
 
   it('hits the RPC endpoint and does not reuse the result of a previous request if the latest block number was updated since', async () => {
+    const pollingInterval = 1234;
     const requests = [{ method }, { method }];
     const mockResults = [{ blockHash: '0x100' }, { blockHash: '0x200' }];
 
     await withMockedCommunications({ providerType }, async (comms) => {
-      // Note that we have to mock these requests in a specific order. The
-      // first block tracker request occurs because of the first RPC
-      // request. The second block tracker request, however, does not occur
-      // because of the second RPC request, but rather because we call
-      // `clock.runAll()` below.
       comms.mockNextBlockTrackerRequest({ blockNumber: '0x1' });
       comms.mockRpcCall({
         request: requests[0],
@@ -78,13 +74,32 @@ export function testsForRpcMethodsThatCheckForBlockHashInResponse(
       });
 
       const results = await withNetworkClient(
-        { providerType },
-        async (client) => {
-          const firstResult = await client.makeRpcCall(requests[0]);
+        {
+          providerType,
+          getBlockTrackerOptions: () => ({
+            pollingInterval,
+          }),
+        },
+        async ({ blockTracker, makeRpcCall, clock }) => {
+          const waitForTwoBlocks = new Promise<void>((resolve) => {
+            let numberOfBlocks = 0;
+
+            // Start the block tracker
+            blockTracker.on('latest', () => {
+              numberOfBlocks += 1;
+              // eslint-disable-next-line jest/no-conditional-in-test
+              if (numberOfBlocks === 2) {
+                resolve();
+              }
+            });
+          });
+
+          const firstResult = await makeRpcCall(requests[0]);
           // Proceed to the next iteration of the block tracker so that a new
           // block is fetched and the current block is updated.
-          client.clock.runAll();
-          const secondResult = await client.makeRpcCall(requests[1]);
+          await clock.tickAsync(pollingInterval);
+          await waitForTwoBlocks;
+          const secondResult = await makeRpcCall(requests[1]);
           return [firstResult, secondResult];
         },
       );

packages/network-controller/tests/provider-api-tests/block-param.ts

@@ -143,18 +143,14 @@ export function testsForRpcMethodSupportingBlockParam(
     }
 
     it('hits the RPC endpoint and does not reuse the result of a previous request if the latest block number was updated since', async () => {
+      const pollingInterval = 1234;
       const requests = [
         { method, params: buildMockParams({ blockParamIndex, blockParam }) },
         { method, params: buildMockParams({ blockParamIndex, blockParam }) },
       ];
       const mockResults = ['first result', 'second result'];
 
       await withMockedCommunications({ providerType }, async (comms) => {
-        // Note that we have to mock these requests in a specific order.
-        // The first block tracker request occurs because of the first RPC
-        // request. The second block tracker request, however, does not
-        // occur because of the second RPC request, but rather because we
-        // call `clock.runAll()` below.
         comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
         // The block-ref middleware will make the request as specified
         // except that the block param is replaced with the latest block
@@ -178,13 +174,32 @@ export function testsForRpcMethodSupportingBlockParam(
         });
 
         const results = await withNetworkClient(
-          { providerType },
-          async (client) => {
-            const firstResult = await client.makeRpcCall(requests[0]);
-            // Proceed to the next iteration of the block tracker so that a
-            // new block is fetched and the current block is updated.
-            client.clock.runAll();
-            const secondResult = await client.makeRpcCall(requests[1]);
+          {
+            providerType,
+            getBlockTrackerOptions: () => ({
+              pollingInterval,
+            }),
+          },
+          async ({ blockTracker, makeRpcCall, clock }) => {
+            const waitForTwoBlocks = new Promise<void>((resolve) => {
+              let numberOfBlocks = 0;
+
+              // Start the block tracker
+              blockTracker.on('latest', () => {
+                numberOfBlocks += 1;
+                // eslint-disable-next-line jest/no-conditional-in-test
+                if (numberOfBlocks === 2) {
+                  resolve();
+                }
+              });
+            });
+
+            const firstResult = await makeRpcCall(requests[0]);
+            // Proceed to the next iteration of the block tracker so that a new
+            // block is fetched and the current block is updated.
+            await clock.tickAsync(pollingInterval);
+            await waitForTwoBlocks;
+            const secondResult = await makeRpcCall(requests[1]);
             return [firstResult, secondResult];
           },
         );

packages/network-controller/tests/provider-api-tests/helpers.ts

@@ -1,6 +1,7 @@
 import type { JSONRPCResponse } from '@json-rpc-specification/meta-schema';
 import type { InfuraNetworkType } from '@metamask/controller-utils';
 import { BUILT_IN_NETWORKS } from '@metamask/controller-utils';
+import type { BlockTracker } from '@metamask/eth-block-tracker';
 import type { SafeEventEmitterProvider } from '@metamask/eth-json-rpc-provider';
 import EthQuery from '@metamask/eth-query';
 import type { Hex } from '@metamask/utils';
@@ -388,9 +389,7 @@ export async function withMockedCommunications(
 }
 
 type MockNetworkClient = {
-  // TODO: Replace `any` with type
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  blockTracker: any;
+  blockTracker: BlockTracker;
   provider: SafeEventEmitterProvider;
   clock: sinon.SinonFakeTimers;
   // TODO: Replace `any` with type

packages/network-controller/tests/provider-api-tests/no-block-param.ts

@@ -97,15 +97,11 @@ export function testsForRpcMethodAssumingNoBlockParam(
   }
 
   it('hits the RPC endpoint and does not reuse the result of a previous request if the latest block number was updated since', async () => {
+    const pollingInterval = 1234;
     const requests = [{ method }, { method }];
     const mockResults = ['first result', 'second result'];
 
     await withMockedCommunications({ providerType }, async (comms) => {
-      // Note that we have to mock these requests in a specific order. The
-      // first block tracker request occurs because of the first RPC request.
-      // The second block tracker request, however, does not occur because of
-      // the second RPC request, but rather because we call `clock.runAll()`
-      // below.
       comms.mockNextBlockTrackerRequest({ blockNumber: '0x1' });
       comms.mockRpcCall({
         request: requests[0],
@@ -118,13 +114,32 @@ export function testsForRpcMethodAssumingNoBlockParam(
       });
 
       const results = await withNetworkClient(
-        { providerType },
-        async (client) => {
-          const firstResult = await client.makeRpcCall(requests[0]);
+        {
+          providerType,
+          getBlockTrackerOptions: () => ({
+            pollingInterval,
+          }),
+        },
+        async ({ blockTracker, makeRpcCall, clock }) => {
+          const waitForTwoBlocks = new Promise<void>((resolve) => {
+            let numberOfBlocks = 0;
+
+            // Start the block tracker
+            blockTracker.on('latest', () => {
+              numberOfBlocks += 1;
+              // eslint-disable-next-line jest/no-conditional-in-test
+              if (numberOfBlocks === 2) {
+                resolve();
+              }
+            });
+          });
+
+          const firstResult = await makeRpcCall(requests[0]);
           // Proceed to the next iteration of the block tracker so that a new
           // block is fetched and the current block is updated.
-          client.clock.runAll();
-          const secondResult = await client.makeRpcCall(requests[1]);
+          await clock.tickAsync(pollingInterval);
+          await waitForTwoBlocks;
+          const secondResult = await makeRpcCall(requests[1]);
           return [firstResult, secondResult];
         },
       );