feat(network-controller): connect `NetworkController` to `ConnectivityController` #7627

cryptodev-2s · 2026-01-14T15:46:00Z

Explanation

Connects NetworkController to ConnectivityController to prevent retries and suppress RPC endpoint error events when the user is offline.

Changes

The NetworkController now depends on the ConnectivityController to prevent retries and suppress events when the user is offline.
When offline, NetworkController:rpcEndpointUnavailable and NetworkController:rpcEndpointDegraded events are suppressed since retries don't occur and circuit breakers don't trigger.

Breaking Changes

BREAKING: NetworkController now requires ConnectivityController:getState action handler to be registered on the messenger
- You must register a ConnectivityController:getState action handler on your root messenger that returns an object with a connectivityStatus property ('online' or 'offline').
- You must delegate the ConnectivityController:getState action from your root messenger to the NetworkControllerMessenger using rootMessenger.delegate({ messenger: networkControllerMessenger, actions: ['ConnectivityController:getState'] }).

References

Checklist

I've updated the test suite for new or updated code as appropriate
I've updated documentation (JSDoc, Markdown, etc.) for new or updated code as appropriate
I've communicated my changes to consumers by updating changelogs for packages I've changed
I've introduced breaking changes in this PR and have prepared draft pull requests for clients and consumer packages to resolve them

Note

Overview

Connects NetworkController to ConnectivityController so RPC retries are prevented when offline and related events are suppressed.

Adds dependency on @metamask/connectivity-controller; updates README dependency graph
Wires connectivity via messenger (ConnectivityController:getState) and propagates isOffline to RpcService/RpcServiceChain
When offline: do not retry RPC requests; suppress NetworkController:rpcEndpointUnavailable and NetworkController:rpcEndpointDegraded

Breaking change

Requires registering and delegating ConnectivityController:getState on the root messenger to the NetworkControllerMessenger

Tests

Updates and adds tests to cover offline behavior and event suppression; plumbs isOffline through existing tests

^{Written by Cursor Bugbot for commit a0ee480. This will update automatically on new commits. Configure here.}

cryptodev-2s · 2026-01-14T15:46:41Z

@metamaskbot publish-preview

packages/network-controller/src/create-network-client.ts

…CTIVITY_STATUSES - Rename ConnectivityStatus constant to CONNECTIVITY_STATUSES - Export ConnectivityStatus as a type instead of enum - Update all references to use CONNECTIVITY_STATUSES - Export CONNECTIVITY_STATUSES from index

…ity-controller

cryptodev-2s · 2026-01-14T21:34:16Z

@metamaskbot publish-preview

…ectivityAdapter

cryptodev-2s · 2026-01-14T22:00:41Z

@metamaskbot publish-preview

…ntroller - Add ConnectivityController:getState action handler requirement - Suppress rpcEndpointUnavailable and rpcEndpointDegraded events when offline - Update NetworkController to check connectivity status before publishing events - Add tests for offline event suppression

…fline - Add isOffline check to RpcService retry filter policy to prevent retries when offline - Suppress rpcEndpointUnavailable and rpcEndpointDegraded events when offline - Add tests to verify retries don't happen when offline - Add tests to verify events are suppressed when offline - Update CHANGELOG with breaking change documentation

…rk-controller-to-connectivity

cryptodev-2s · 2026-01-15T14:16:16Z

@metamaskbot publish-preview

mcmire

Had some comments, but they are minor. This looks good in general.

packages/network-controller/src/create-network-client-tests/rpc-endpoint-events.test.ts

packages/network-controller/src/rpc-service/rpc-service.test.ts

packages/network-controller/src/rpc-service/rpc-service.ts

packages/network-controller/tests/helpers.ts

packages/network-controller/CHANGELOG.md

packages/network-controller/src/rpc-service/rpc-service.test.ts

packages/assets-controllers/src/AssetsContractController.test.ts

…tivity

cryptodev-2s · 2026-01-15T16:27:16Z

@metamaskbot publish-preview

mcmire

LGTM!

cryptodev-2s added 2 commits January 14, 2026 13:24

feat: add new ConnectivityController

5e51275

feat: add initial controller implementation

9e00b40

cryptodev-2s requested a review from mcmire January 14, 2026 15:46

cryptodev-2s self-assigned this Jan 14, 2026

cryptodev-2s force-pushed the feature/connect-network-controller-to-connectivity branch from 1a810fe to b590b43 Compare January 14, 2026 15:47

cryptodev-2s changed the title ~~feat(network-controller): connect NetworkController to ConnectivityCo…~~ feat(network-controller): connect NetworkController to ConnectivityController Jan 14, 2026

cryptodev-2s marked this pull request as ready for review January 14, 2026 15:47

cryptodev-2s requested review from a team as code owners January 14, 2026 15:47

cryptodev-2s force-pushed the feature/connect-network-controller-to-connectivity branch from b590b43 to 1bdba27 Compare January 14, 2026 18:34

mcmire reviewed Jan 14, 2026

View reviewed changes

packages/network-controller/src/create-network-client.ts Outdated Show resolved Hide resolved

cryptodev-2s force-pushed the feature/connect-network-controller-to-connectivity branch from 1bdba27 to 753eb65 Compare January 14, 2026 21:07

cryptodev-2s requested a review from a team as a code owner January 14, 2026 21:07

cryptodev-2s added 3 commits January 14, 2026 22:14

Merge remote-tracking branch 'origin/main' into feature/add-connectiv…

4533f63

…ity-controller

refactor(connectivity-controller): twik jsdoc

eda16e4

cryptodev-2s force-pushed the feature/connect-network-controller-to-connectivity branch 2 times, most recently from 5c3f070 to 35be87b Compare January 14, 2026 21:26

refactor(connectivity-controller): rename ConnectivityService to Conn…

85ecacb

…ectivityAdapter

cryptodev-2s force-pushed the feature/connect-network-controller-to-connectivity branch 3 times, most recently from 3d671df to be34729 Compare January 14, 2026 21:59

cryptodev-2s added 3 commits January 15, 2026 00:13

refactor: simplify and remove useless tests

16c51b5

cryptodev-2s force-pushed the feature/connect-network-controller-to-connectivity branch from e3d5f1f to d59bf85 Compare January 14, 2026 23:14

Base automatically changed from feature/add-connectivity-controller to main January 15, 2026 14:05

Merge remote-tracking branch 'origin/main' into feature/connect-netwo…

a0a9e43

…rk-controller-to-connectivity

mcmire reviewed Jan 15, 2026

View reviewed changes

cryptodev-2s force-pushed the feature/connect-network-controller-to-connectivity branch from 0af1e4f to 46c0f95 Compare January 15, 2026 14:31

cursor bot reviewed Jan 15, 2026

View reviewed changes

packages/network-controller/src/rpc-service/rpc-service.test.ts Outdated Show resolved Hide resolved

cryptodev-2s force-pushed the feature/connect-network-controller-to-connectivity branch from 46c0f95 to b048b72 Compare January 15, 2026 15:08

fix: make isOffline mandatory

c0b3840

cryptodev-2s force-pushed the feature/connect-network-controller-to-connectivity branch from b048b72 to c0b3840 Compare January 15, 2026 15:11

cursor bot reviewed Jan 15, 2026

View reviewed changes

packages/assets-controllers/src/AssetsContractController.test.ts Show resolved Hide resolved

cryptodev-2s force-pushed the feature/connect-network-controller-to-connectivity branch 2 times, most recently from 5d44b9b to 24c8e00 Compare January 15, 2026 16:05

fix: unit tests

75b0aaa

cryptodev-2s force-pushed the feature/connect-network-controller-to-connectivity branch from 24c8e00 to 75b0aaa Compare January 15, 2026 16:12

cryptodev-2s and others added 2 commits January 15, 2026 17:25

refactor: rpc-service.test.ts offline tests

2a3b2a3

Merge branch 'main' into feature/connect-network-controller-to-connec…

a0ee480

…tivity

cryptodev-2s enabled auto-merge January 15, 2026 16:26

cryptodev-2s requested a review from mcmire January 15, 2026 16:26

mcmire approved these changes Jan 15, 2026

View reviewed changes

salimtb approved these changes Jan 15, 2026

View reviewed changes

cryptotavares approved these changes Jan 15, 2026

View reviewed changes

cryptodev-2s added this pull request to the merge queue Jan 15, 2026

Merged via the queue into main with commit 9134e8b Jan 15, 2026
294 checks passed

cryptodev-2s deleted the feature/connect-network-controller-to-connectivity branch January 15, 2026 17:10

Uh oh!

feat(network-controller): connect NetworkController to ConnectivityController #7627

feat(network-controller): connect NetworkController to ConnectivityController #7627

Conversation

cryptodev-2s commented Jan 14, 2026 • edited by cursor bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation

Changes

Breaking Changes

References

Checklist

Uh oh!

cryptodev-2s commented Jan 14, 2026

Uh oh!

Uh oh!

cryptodev-2s commented Jan 14, 2026

Uh oh!

cryptodev-2s commented Jan 14, 2026

Uh oh!

cryptodev-2s commented Jan 15, 2026

Uh oh!

mcmire left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cryptodev-2s commented Jan 15, 2026

Uh oh!

mcmire left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

feat(network-controller): connect `NetworkController` to `ConnectivityController` #7627

feat(network-controller): connect `NetworkController` to `ConnectivityController` #7627

cryptodev-2s commented Jan 14, 2026 •

edited by cursor bot

Loading