-
-
Notifications
You must be signed in to change notification settings - Fork 203
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: Add multichain-network-controller package #5209
Open
tommasini
wants to merge
9
commits into
main
Choose a base branch
from
feat/multichain-networks-controller
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
47c7310
feat add multichain-network-controller package
gantunesr 7b64a8c
chore: update exports
gantunesr 37dc7c5
fix: build
gantunesr 454c3db
chore: update initial state
gantunesr 2f4d06c
add setter for update nonEvmNetwork state variable to true and setter…
tommasini 4ee7b32
merge main and solve yarn lock file conflicts
tommasini 2f8058a
added blank line between functions
tommasini 6b7b3b6
removed unused import and re order imports, to fix lint warnings
tommasini a89bff4
btc and solana chain id from keyring api, update types and added java…
tommasini File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
# Changelog | ||
|
||
All notable changes to this project will be documented in this file. | ||
|
||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), | ||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). | ||
|
||
## [Unreleased] | ||
|
||
[Unreleased]: https://github.com/MetaMask/core/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
MIT License | ||
|
||
Copyright (c) 2025 MetaMask | ||
|
||
Permission is hereby granted, free of charge, to any person obtaining a copy | ||
of this software and associated documentation files (the "Software"), to deal | ||
in the Software without restriction, including without limitation the rights | ||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
copies of the Software, and to permit persons to whom the Software is | ||
furnished to do so, subject to the following conditions: | ||
|
||
The above copyright notice and this permission notice shall be included in all | ||
copies or substantial portions of the Software. | ||
|
||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
# `@metamask/multichain-network-controller` | ||
|
||
... | ||
|
||
## Installation | ||
|
||
`yarn add @metamask/multichain-network-controller` | ||
|
||
or | ||
|
||
`npm install @metamask/multichain-network-controller` | ||
|
||
## Contributing | ||
|
||
This package is part of a monorepo. Instructions for contributing can be found in the [monorepo README](https://github.com/MetaMask/core#readme). |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
/* | ||
* For a detailed explanation regarding each configuration property and type check, visit: | ||
* https://jestjs.io/docs/configuration | ||
*/ | ||
|
||
const merge = require('deepmerge'); | ||
const path = require('path'); | ||
|
||
const baseConfig = require('../../jest.config.packages'); | ||
|
||
const displayName = path.basename(__dirname); | ||
|
||
module.exports = merge(baseConfig, { | ||
// The display name when running multiple projects | ||
displayName, | ||
|
||
// An object that configures minimum threshold enforcement for coverage results | ||
coverageThreshold: { | ||
global: { | ||
branches: 100, | ||
functions: 100, | ||
lines: 100, | ||
statements: 100, | ||
}, | ||
}, | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,73 @@ | ||
{ | ||
"name": "@metamask/multichain-network-controller", | ||
"version": "0.0.0", | ||
"private": true, | ||
"description": "Multichain network controller", | ||
"keywords": [ | ||
"MetaMask", | ||
"Ethereum" | ||
], | ||
"homepage": "https://github.com/MetaMask/core/tree/main/packages/multichain-network-controller#readme", | ||
"bugs": { | ||
"url": "https://github.com/MetaMask/core/issues" | ||
}, | ||
"repository": { | ||
"type": "git", | ||
"url": "https://github.com/MetaMask/core.git" | ||
}, | ||
"license": "MIT", | ||
"sideEffects": false, | ||
"exports": { | ||
".": { | ||
"import": { | ||
"types": "./dist/index.d.mts", | ||
"default": "./dist/index.mjs" | ||
}, | ||
"require": { | ||
"types": "./dist/index.d.cts", | ||
"default": "./dist/index.cjs" | ||
} | ||
}, | ||
"./package.json": "./package.json" | ||
}, | ||
"main": "./dist/index.cjs", | ||
"types": "./dist/index.d.cts", | ||
"files": [ | ||
"dist/" | ||
], | ||
"scripts": { | ||
"build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", | ||
"build:docs": "typedoc", | ||
"changelog:update": "../../scripts/update-changelog.sh @metamask/multichain-network-controller", | ||
"changelog:validate": "../../scripts/validate-changelog.sh @metamask/multichain-network-controller", | ||
"since-latest-release": "../../scripts/since-latest-release.sh", | ||
"test": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter", | ||
"test:clean": "NODE_OPTIONS=--experimental-vm-modules jest --clearCache", | ||
"test:verbose": "NODE_OPTIONS=--experimental-vm-modules jest --verbose", | ||
"test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch" | ||
}, | ||
"dependencies": { | ||
"@metamask/base-controller": "^7.1.1", | ||
"@metamask/keyring-api": "^16.1.0", | ||
"@metamask/utils": "^11.0.1" | ||
}, | ||
"devDependencies": { | ||
"@metamask/auto-changelog": "^3.4.4", | ||
"@types/jest": "^27.4.1", | ||
"deepmerge": "^4.2.2", | ||
"immer": "^9.0.6", | ||
"jest": "^27.5.1", | ||
"nock": "^13.3.1", | ||
"ts-jest": "^27.1.4", | ||
"typedoc": "^0.24.8", | ||
"typedoc-plugin-missing-exports": "^2.0.0", | ||
"typescript": "~5.2.2" | ||
}, | ||
"peerDependencies": { | ||
"@metamask/accounts-controller": "^21.0.1", | ||
"@metamask/network-controller": "^22.1.1" | ||
}, | ||
"engines": { | ||
"node": "^18.18 || >=20" | ||
} | ||
} |
147 changes: 147 additions & 0 deletions
147
packages/multichain-network-controller/src/MultichainNetworkController.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,147 @@ | ||
import { ControllerMessenger } from '@metamask/base-controller'; | ||
import type { | ||
AllowedActions, | ||
AllowedEvents, | ||
} from './MultichainNetworkController'; | ||
|
||
import { MultichainNetworkController } from './MultichainNetworkController'; | ||
|
||
const name = 'MultichainNetworkController'; | ||
|
||
const buildMessenger = () => { | ||
return new ControllerMessenger<AllowedActions, AllowedEvents>(); | ||
}; | ||
|
||
const buildMultichainNetworkControllerMessenger = ( | ||
messenger: ControllerMessenger<AllowedActions, AllowedEvents>, | ||
) => { | ||
return messenger.getRestricted<typeof name, 'NetworkController:setActiveNetwork', never>({ | ||
name, | ||
allowedActions: ['NetworkController:setActiveNetwork'], | ||
allowedEvents: [], | ||
}); | ||
}; | ||
|
||
describe('MultichainNetworkController', () => { | ||
let controller: MultichainNetworkController; | ||
let messenger: ControllerMessenger<AllowedActions, AllowedEvents>; | ||
|
||
beforeEach(() => { | ||
messenger = buildMessenger(); | ||
messenger.registerActionHandler( | ||
'NetworkController:setActiveNetwork', | ||
jest.fn(), | ||
); | ||
|
||
jest.spyOn(messenger, 'call'); | ||
|
||
const restrictedMessenger = buildMultichainNetworkControllerMessenger(messenger); | ||
|
||
controller = new MultichainNetworkController({ | ||
messenger: restrictedMessenger, | ||
state: { | ||
multichainNetworkConfigurationsByChainId: {}, | ||
selectedMultichainNetworkChainId: bitcoinCaip2ChainId, | ||
multichainNetworksMetadata: {}, | ||
nonEvmSelected: false, | ||
}, | ||
}); | ||
}); | ||
|
||
describe('setActiveNetwork', () => { | ||
it('should set non-EVM network when valid chainId is provided', async () => { | ||
const clientId = 'testClient'; | ||
const chainId = 'bip122:000000000019d6689c085ae165831e93'; | ||
messenger = buildMessenger(); | ||
messenger.registerActionHandler( | ||
'NetworkController:setActiveNetwork', | ||
jest.fn(), | ||
); | ||
|
||
jest.spyOn(messenger, 'call'); | ||
|
||
const restrictedMessenger = buildMultichainNetworkControllerMessenger(messenger); | ||
|
||
const multiChainController = new MultichainNetworkController({ | ||
messenger: restrictedMessenger, | ||
state: { | ||
multichainNetworkConfigurationsByChainId: { | ||
[chainId]: { | ||
chainId, | ||
name: 'Bitcoin', | ||
nativeCurrency: 'BTC', | ||
blockExplorerUrls: ['https://blockstream.info/'], | ||
}, | ||
}, | ||
selectedMultichainNetworkChainId: bitcoinCaip2ChainId, | ||
multichainNetworksMetadata: {}, | ||
nonEvmSelected: false, | ||
}, | ||
}); | ||
|
||
await multiChainController.setActiveNetwork(clientId, chainId); | ||
|
||
expect(multiChainController.state.selectedMultichainNetworkChainId).toBe(chainId); | ||
expect(multiChainController.state.nonEvmSelected).toBe(true); | ||
expect(messenger.call).not.toHaveBeenCalled(); | ||
}); | ||
|
||
it('should set EVM network when chainId is not provided', async () => { | ||
const clientId = 'testClient'; | ||
|
||
await controller.setActiveNetwork(clientId); | ||
|
||
expect(controller.state.nonEvmSelected).toBe(false); | ||
expect(messenger.call).toHaveBeenCalledWith( | ||
'NetworkController:setActiveNetwork', | ||
clientId, | ||
); | ||
}); | ||
|
||
it('should set EVM network when invalid chainId is provided', async () => { | ||
const clientId = 'testClient'; | ||
const invalidChainId = 'invalid-chain-id'; | ||
|
||
await controller.setActiveNetwork(clientId, invalidChainId); | ||
|
||
expect(controller.state.nonEvmSelected).toBe(false); | ||
expect(messenger.call).toHaveBeenCalledWith( | ||
'NetworkController:setActiveNetwork', | ||
clientId, | ||
); | ||
}); | ||
}); | ||
|
||
describe('setNonEvmSelected', () => { | ||
it('should set nonEvmSelected to true', () => { | ||
controller.setNonEvmSelected(); | ||
expect(controller.state.nonEvmSelected).toBe(true); | ||
}); | ||
}); | ||
|
||
describe('setEvmSelected', () => { | ||
it('should set nonEvmSelected to false', () => { | ||
messenger = buildMessenger(); | ||
messenger.registerActionHandler( | ||
'NetworkController:setActiveNetwork', | ||
jest.fn(), | ||
); | ||
|
||
jest.spyOn(messenger, 'call'); | ||
|
||
const restrictedMessenger = buildMultichainNetworkControllerMessenger(messenger); | ||
const multiChainController = new MultichainNetworkController({ | ||
messenger: restrictedMessenger, | ||
state: { | ||
multichainNetworkConfigurationsByChainId: {}, | ||
selectedMultichainNetworkChainId: bitcoinCaip2ChainId, | ||
multichainNetworksMetadata: {}, | ||
nonEvmSelected: true, | ||
}, | ||
}); | ||
|
||
multiChainController.setEvmSelected(); | ||
expect(multiChainController.state.nonEvmSelected).toBe(false); | ||
}); | ||
}); | ||
}); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Rather than setting up tests using
beforeEach
— which can make things complicated over time — what are your thoughts on using a helper method to set up the controller in each test? Unfortunately we don't have a great example of this incore
, butNftController
has one calledsetupController
that works pretty well:core/packages/assets-controllers/src/NftController.test.ts
Line 154 in d158e46
In your case I'm imagining something like:
Then you don't need to spy on the messenger, you can just pass in a function or mock function that lets you override the
setActiveNetwork
call.