Skip to content

Commit 0025960

Browse files
matthiasgeihsmatthiasgeihs
authored
Merge branch 'main' into feat/keyring/mock-encryptor
2 parents b03e0b0 + 60e0e8d commit 0025960

File tree

121 files changed

+1680
-11506
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+1680
-11506
lines changed

‎.github/CODEOWNERS

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
## Wallet API Platform Team
5555
/packages/chain-agnostic-permission @MetaMask/wallet-api-platform-engineers
5656
/packages/eip1193-permission-middleware @MetaMask/wallet-api-platform-engineers
57-
/packages/multichain @MetaMask/wallet-api-platform-engineers
5857
/packages/multichain-api-middleware @MetaMask/wallet-api-platform-engineers
5958
/packages/queued-request-controller @MetaMask/wallet-api-platform-engineers
6059
/packages/selected-network-controller @MetaMask/wallet-api-platform-engineers
@@ -129,8 +128,6 @@
129128
/packages/phishing-controller/CHANGELOG.md @MetaMask/product-safety @MetaMask/wallet-framework-engineers
130129
/packages/profile-sync-controller/package.json @MetaMask/identity @MetaMask/wallet-framework-engineers
131130
/packages/profile-sync-controller/CHANGELOG.md @MetaMask/identity @MetaMask/wallet-framework-engineers
132-
/packages/multichain/package.json @MetaMask/wallet-api-platform-engineers @MetaMask/wallet-framework-engineers
133-
/packages/multichain/CHANGELOG.md @MetaMask/wallet-api-platform-engineers @MetaMask/wallet-framework-engineers
134131
/packages/queued-request-controller/package.json @MetaMask/wallet-api-platform-engineers @MetaMask/wallet-framework-engineers
135132
/packages/queued-request-controller/CHANGELOG.md @MetaMask/wallet-api-platform-engineers @MetaMask/wallet-framework-engineers
136133
/packages/selected-network-controller/package.json @MetaMask/wallet-api-platform-engineers @MetaMask/wallet-framework-engineers

‎README.md

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ Each package in this repository has its own README where you can find installati
4747
- [`@metamask/keyring-controller`](packages/keyring-controller)
4848
- [`@metamask/logging-controller`](packages/logging-controller)
4949
- [`@metamask/message-manager`](packages/message-manager)
50-
- [`@metamask/multichain`](packages/multichain)
5150
- [`@metamask/multichain-api-middleware`](packages/multichain-api-middleware)
5251
- [`@metamask/multichain-network-controller`](packages/multichain-network-controller)
5352
- [`@metamask/multichain-transactions-controller`](packages/multichain-transactions-controller)
@@ -79,7 +78,7 @@ Each package in this repository has its own README where you can find installati
7978
%%{ init: { 'flowchart': { 'curve': 'bumpX' } } }%%
8079
graph LR;
8180
linkStyle default opacity:0.5
82-
account_wallet_controller(["@metamask/account-tree-controller"]);
81+
account_tree_controller(["@metamask/account-tree-controller"]);
8382
accounts_controller(["@metamask/accounts-controller"]);
8483
address_book_controller(["@metamask/address-book-controller"]);
8584
announcement_controller(["@metamask/announcement-controller"]);
@@ -106,7 +105,6 @@ linkStyle default opacity:0.5
106105
keyring_controller(["@metamask/keyring-controller"]);
107106
logging_controller(["@metamask/logging-controller"]);
108107
message_manager(["@metamask/message-manager"]);
109-
multichain(["@metamask/multichain"]);
110108
multichain_api_middleware(["@metamask/multichain-api-middleware"]);
111109
multichain_network_controller(["@metamask/multichain-network-controller"]);
112110
multichain_transactions_controller(["@metamask/multichain-transactions-controller"]);
@@ -129,9 +127,9 @@ linkStyle default opacity:0.5
129127
token_search_discovery_controller(["@metamask/token-search-discovery-controller"]);
130128
transaction_controller(["@metamask/transaction-controller"]);
131129
user_operation_controller(["@metamask/user-operation-controller"]);
132-
account_wallet_controller --> base_controller;
133-
account_wallet_controller --> accounts_controller;
134-
account_wallet_controller --> keyring_controller;
130+
account_tree_controller --> base_controller;
131+
account_tree_controller --> accounts_controller;
132+
account_tree_controller --> keyring_controller;
135133
accounts_controller --> base_controller;
136134
accounts_controller --> keyring_controller;
137135
accounts_controller --> network_controller;
@@ -148,6 +146,7 @@ linkStyle default opacity:0.5
148146
assets_controllers --> keyring_controller;
149147
assets_controllers --> network_controller;
150148
assets_controllers --> permission_controller;
149+
assets_controllers --> phishing_controller;
151150
assets_controllers --> preferences_controller;
152151
assets_controllers --> transaction_controller;
153152
base_controller --> json_rpc_engine;
@@ -192,6 +191,7 @@ linkStyle default opacity:0.5
192191
ens_controller --> base_controller;
193192
ens_controller --> controller_utils;
194193
ens_controller --> network_controller;
194+
error_reporting_service --> base_controller;
195195
eth_json_rpc_provider --> json_rpc_engine;
196196
gas_fee_controller --> base_controller;
197197
gas_fee_controller --> controller_utils;
@@ -203,10 +203,6 @@ linkStyle default opacity:0.5
203203
logging_controller --> controller_utils;
204204
message_manager --> base_controller;
205205
message_manager --> controller_utils;
206-
multichain --> controller_utils;
207-
multichain --> json_rpc_engine;
208-
multichain --> network_controller;
209-
multichain --> permission_controller;
210206
multichain_api_middleware --> chain_agnostic_permission;
211207
multichain_api_middleware --> controller_utils;
212208
multichain_api_middleware --> json_rpc_engine;
@@ -226,6 +222,7 @@ linkStyle default opacity:0.5
226222
name_controller --> controller_utils;
227223
network_controller --> base_controller;
228224
network_controller --> controller_utils;
225+
network_controller --> error_reporting_service;
229226
network_controller --> eth_json_rpc_provider;
230227
network_controller --> json_rpc_engine;
231228
notification_services_controller --> base_controller;
@@ -261,6 +258,8 @@ linkStyle default opacity:0.5
261258
sample_controllers --> base_controller;
262259
sample_controllers --> controller_utils;
263260
sample_controllers --> network_controller;
261+
seedless_onboarding_controller --> base_controller;
262+
seedless_onboarding_controller --> keyring_controller;
264263
selected_network_controller --> base_controller;
265264
selected_network_controller --> json_rpc_engine;
266265
selected_network_controller --> network_controller;

‎eslint-warning-thresholds.json

Lines changed: 0 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -256,80 +256,6 @@
256256
"packages/message-manager/src/utils.ts": {
257257
"@typescript-eslint/no-unused-vars": 1
258258
},
259-
"packages/multichain/src/adapters/caip-permission-adapter-eth-accounts.test.ts": {
260-
"import-x/order": 1
261-
},
262-
"packages/multichain/src/adapters/caip-permission-adapter-eth-accounts.ts": {
263-
"@typescript-eslint/no-unsafe-enum-comparison": 1,
264-
"jsdoc/tag-lines": 5
265-
},
266-
"packages/multichain/src/adapters/caip-permission-adapter-permittedChains.test.ts": {
267-
"import-x/order": 1
268-
},
269-
"packages/multichain/src/adapters/caip-permission-adapter-permittedChains.ts": {
270-
"jsdoc/tag-lines": 5
271-
},
272-
"packages/multichain/src/adapters/caip-permission-adapter-session-scopes.test.ts": {
273-
"@typescript-eslint/no-unused-vars": 2
274-
},
275-
"packages/multichain/src/caip25Permission.test.ts": {
276-
"@typescript-eslint/no-unused-vars": 5
277-
},
278-
"packages/multichain/src/caip25Permission.ts": {
279-
"@typescript-eslint/no-unused-vars": 1
280-
},
281-
"packages/multichain/src/handlers/wallet-getSession.ts": {
282-
"@typescript-eslint/no-unused-vars": 1,
283-
"jsdoc/require-returns": 1
284-
},
285-
"packages/multichain/src/handlers/wallet-invokeMethod.ts": {
286-
"@typescript-eslint/no-unsafe-enum-comparison": 1,
287-
"@typescript-eslint/no-unused-vars": 1,
288-
"jsdoc/require-returns": 1
289-
},
290-
"packages/multichain/src/handlers/wallet-revokeSession.test.ts": {
291-
"import-x/order": 1,
292-
"prettier/prettier": 2
293-
},
294-
"packages/multichain/src/handlers/wallet-revokeSession.ts": {
295-
"@typescript-eslint/no-unused-vars": 1,
296-
"jsdoc/require-returns": 1
297-
},
298-
"packages/multichain/src/middlewares/MultichainMiddlewareManager.test.ts": {
299-
"prettier/prettier": 1
300-
},
301-
"packages/multichain/src/middlewares/MultichainSubscriptionManager.ts": {
302-
"@typescript-eslint/prefer-readonly": 2,
303-
"import-x/order": 1
304-
},
305-
"packages/multichain/src/middlewares/multichainMethodCallValidator.test.ts": {
306-
"@typescript-eslint/prefer-promise-reject-errors": 20
307-
},
308-
"packages/multichain/src/scope/assert.test.ts": {
309-
"@typescript-eslint/no-unused-vars": 3
310-
},
311-
"packages/multichain/src/scope/assert.ts": {
312-
"@typescript-eslint/no-unsafe-enum-comparison": 1
313-
},
314-
"packages/multichain/src/scope/authorization.test.ts": {
315-
"@typescript-eslint/no-unused-vars": 2
316-
},
317-
"packages/multichain/src/scope/errors.ts": {
318-
"jsdoc/tag-lines": 5
319-
},
320-
"packages/multichain/src/scope/filter.test.ts": {
321-
"jest/no-conditional-in-test": 9
322-
},
323-
"packages/multichain/src/scope/filter.ts": {
324-
"@typescript-eslint/no-unused-vars": 1,
325-
"jsdoc/require-returns": 1
326-
},
327-
"packages/multichain/src/scope/supported.ts": {
328-
"@typescript-eslint/no-unsafe-enum-comparison": 6
329-
},
330-
"packages/multichain/src/scope/validation.ts": {
331-
"jsdoc/tag-lines": 2
332-
},
333259
"packages/name-controller/src/NameController.ts": {
334260
"@typescript-eslint/no-unsafe-enum-comparison": 1,
335261
"@typescript-eslint/prefer-readonly": 2

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@metamask/core-monorepo",
3-
"version": "431.0.0",
3+
"version": "436.0.0",
44
"private": true,
55
"description": "Monorepo for packages shared between MetaMask clients",
66
"repository": {

‎packages/account-tree-controller/CHANGELOG.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [0.1.1]
11+
12+
### Fixed
13+
14+
- Fix `AccountWallet.metadata` type ([#5947](https://github.com/MetaMask/core/pull/5947))
15+
- Was using `AccountGroupMetadata` instead of `AccountWalletMetadata`.
16+
- Add `AccountTreeControllerStateChangeEvent` to `AccountTreeControllerEvents` ([#5958](https://github.com/MetaMask/core/pull/5958))
17+
1018
## [0.1.0]
1119

1220
### Added
1321

1422
- Initial release ([#5847](https://github.com/MetaMask/core/pull/5847))
1523
- Grouping accounts into 3 main categories: Entropy source, Snap ID, keyring types.
1624

17-
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
25+
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
26+
[0.1.1]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
1827
[0.1.0]: https://github.com/MetaMask/core/releases/tag/@metamask/[email protected]

‎packages/account-tree-controller/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@metamask/account-tree-controller",
3-
"version": "0.1.0",
3+
"version": "0.1.1",
44
"description": "Controller to group account together based on some pre-defined rules",
55
"keywords": [
66
"MetaMask",

‎packages/account-tree-controller/src/AccountTreeController.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export type AccountWallet = {
6868
groups: {
6969
[groupId: AccountGroupId]: AccountGroup;
7070
};
71-
metadata: AccountGroupMetadata; // Assuming Metadata is a defined type
71+
metadata: AccountWalletMetadata;
7272
};
7373

7474
export type AccountTreeControllerState = {
@@ -101,7 +101,7 @@ export type AllowedEvents =
101101
| AccountsControllerAccountAddedEvent
102102
| AccountsControllerAccountRemovedEvent;
103103

104-
export type AccountTreeControllerEvents = never;
104+
export type AccountTreeControllerEvents = AccountTreeControllerStateChangeEvent;
105105

106106
export type AccountTreeControllerMessenger = RestrictedMessenger<
107107
typeof controllerName,

‎packages/assets-controllers/CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
### Changed
11+
12+
- Bump `@metamask/controller-utils` to `^11.10.0` ([#5935](https://github.com/MetaMask/core/pull/5935))
13+
- Add `getErc20Balances` function within `TokenBalancesController` to support fetching ERC-20 token balances for a given address and token list ([#5925](https://github.com/MetaMask/core/pull/5925))
14+
- This modular service simplifies balance retrieval logic and can be reused across different parts of the controller
15+
- Bump `@metamask/transaction-controller` to `^57.3.0` ([#5954](https://github.com/MetaMask/core/pull/5954))
16+
17+
### Fixed
18+
19+
- Prevented `AccountTrackerController` from updating state with empty or unchanged account balance data during refresh ([#5942](https://github.com/MetaMask/core/pull/5942))
20+
- Added guards to skip state updates when fetched balances are empty or identical to existing state
21+
- Reduces unnecessary `stateChange` emissions and preserves previously-cached balances under network failure scenarios
22+
1023
## [68.1.0]
1124

1225
### Added
@@ -18,6 +31,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1831
### Changed
1932

2033
- Bump `@metamask/controller-utils` to `^11.10.0` ([#5935](https://github.com/MetaMask/core/pull/5935))
34+
- Add `getErc20Balances` function within `TokenBalancesController` to support fetching ERC-20 token balances for a given address and token list ([#5925](https://github.com/MetaMask/core/pull/5925))
35+
- This modular service simplifies balance retrieval logic and can be reused across different parts of the controller
2136

2237
## [68.0.0]
2338

‎packages/assets-controllers/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,12 @@
8686
"@metamask/keyring-snap-client": "^5.0.0",
8787
"@metamask/network-controller": "^23.6.0",
8888
"@metamask/permission-controller": "^11.0.6",
89-
"@metamask/phishing-controller": "^12.5.0",
89+
"@metamask/phishing-controller": "^12.6.0",
9090
"@metamask/preferences-controller": "^18.1.0",
9191
"@metamask/providers": "^22.1.0",
9292
"@metamask/snaps-controllers": "^12.3.1",
9393
"@metamask/snaps-sdk": "^7.1.0",
94-
"@metamask/transaction-controller": "^57.2.0",
94+
"@metamask/transaction-controller": "^57.3.0",
9595
"@types/jest": "^27.4.1",
9696
"@types/lodash": "^4.14.191",
9797
"@types/node": "^16.18.54",

0 commit comments

Comments
 (0)