Skip to content

Commit 2f927e3

Browse files
FuzzysToddFuzzysTodd
authored
Merge branch 'MetaMask:main' into main
2 parents 46a7265 + 13f811b commit 2f927e3

377 files changed

Lines changed: 22868 additions & 2661 deletions

File tree

Some content is hidden

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

‎.github/CODEOWNERS‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,10 @@
123123
/packages/eth-json-rpc-middleware/src/methods @MetaMask/confirmations @MetaMask/core-platform
124124
/packages/eth-json-rpc-middleware/src/wallet.* @MetaMask/confirmations @MetaMask/core-platform
125125
/packages/foundryup @MetaMask/mobile-platform @MetaMask/extension-platform
126+
/packages/bitcoin-regtest-up @MetaMask/mobile-platform @MetaMask/extension-platform @MetaMask/networks
127+
/packages/java-tron-up @MetaMask/mobile-platform @MetaMask/extension-platform @MetaMask/networks
128+
/packages/local-node-utils @MetaMask/mobile-platform @MetaMask/extension-platform @MetaMask/networks
129+
/packages/solana-test-validator-up @MetaMask/mobile-platform @MetaMask/extension-platform @MetaMask/networks
126130
/packages/keyring-controller @MetaMask/accounts-engineers @MetaMask/core-platform
127131
/packages/multichain-network-controller @MetaMask/core-platform @MetaMask/accounts-engineers @MetaMask/metamask-assets
128132
/packages/network-controller @MetaMask/core-platform @MetaMask/metamask-assets
@@ -226,6 +230,14 @@
226230
/packages/app-metadata-controller/CHANGELOG.md @MetaMask/mobile-platform @MetaMask/core-platform
227231
/packages/foundryup/package.json @MetaMask/mobile-platform @MetaMask/extension-platform @MetaMask/core-platform
228232
/packages/foundryup/CHANGELOG.md @MetaMask/mobile-platform @MetaMask/extension-platform @MetaMask/core-platform
233+
/packages/bitcoin-regtest-up/package.json @MetaMask/mobile-platform @MetaMask/extension-platform @MetaMask/networks @MetaMask/core-platform
234+
/packages/bitcoin-regtest-up/CHANGELOG.md @MetaMask/mobile-platform @MetaMask/extension-platform @MetaMask/networks @MetaMask/core-platform
235+
/packages/java-tron-up/package.json @MetaMask/mobile-platform @MetaMask/extension-platform @MetaMask/networks @MetaMask/core-platform
236+
/packages/java-tron-up/CHANGELOG.md @MetaMask/mobile-platform @MetaMask/extension-platform @MetaMask/networks @MetaMask/core-platform
237+
/packages/local-node-utils/package.json @MetaMask/mobile-platform @MetaMask/extension-platform @MetaMask/networks @MetaMask/core-platform
238+
/packages/local-node-utils/CHANGELOG.md @MetaMask/mobile-platform @MetaMask/extension-platform @MetaMask/networks @MetaMask/core-platform
239+
/packages/solana-test-validator-up/package.json @MetaMask/mobile-platform @MetaMask/extension-platform @MetaMask/networks @MetaMask/core-platform
240+
/packages/solana-test-validator-up/CHANGELOG.md @MetaMask/mobile-platform @MetaMask/extension-platform @MetaMask/networks @MetaMask/core-platform
229241
/packages/seedless-onboarding-controller/package.json @MetaMask/web3auth @MetaMask/core-platform
230242
/packages/seedless-onboarding-controller/CHANGELOG.md @MetaMask/web3auth @MetaMask/core-platform
231243
/packages/shield-controller/package.json @MetaMask/web3auth @MetaMask/core-platform

‎README.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ yarn skills --reset # clear saved local selection
5454
- [`@metamask/authenticated-user-storage`](packages/authenticated-user-storage)
5555
- [`@metamask/base-controller`](packages/base-controller)
5656
- [`@metamask/base-data-service`](packages/base-data-service)
57+
- [`@metamask/bitcoin-regtest-up`](packages/bitcoin-regtest-up)
5758
- [`@metamask/bridge-controller`](packages/bridge-controller)
5859
- [`@metamask/bridge-status-controller`](packages/bridge-status-controller)
5960
- [`@metamask/build-utils`](packages/build-utils)
@@ -80,9 +81,11 @@ yarn skills --reset # clear saved local selection
8081
- [`@metamask/gas-fee-controller`](packages/gas-fee-controller)
8182
- [`@metamask/gator-permissions-controller`](packages/gator-permissions-controller)
8283
- [`@metamask/geolocation-controller`](packages/geolocation-controller)
84+
- [`@metamask/java-tron-up`](packages/java-tron-up)
8385
- [`@metamask/json-rpc-engine`](packages/json-rpc-engine)
8486
- [`@metamask/json-rpc-middleware-stream`](packages/json-rpc-middleware-stream)
8587
- [`@metamask/keyring-controller`](packages/keyring-controller)
88+
- [`@metamask/local-node-utils`](packages/local-node-utils)
8689
- [`@metamask/logging-controller`](packages/logging-controller)
8790
- [`@metamask/message-manager`](packages/message-manager)
8891
- [`@metamask/messenger`](packages/messenger)
@@ -119,6 +122,7 @@ yarn skills --reset # clear saved local selection
119122
- [`@metamask/smart-transactions-controller`](packages/smart-transactions-controller)
120123
- [`@metamask/snap-account-service`](packages/snap-account-service)
121124
- [`@metamask/social-controllers`](packages/social-controllers)
125+
- [`@metamask/solana-test-validator-up`](packages/solana-test-validator-up)
122126
- [`@metamask/storage-service`](packages/storage-service)
123127
- [`@metamask/subscription-controller`](packages/subscription-controller)
124128
- [`@metamask/transaction-controller`](packages/transaction-controller)
@@ -149,6 +153,7 @@ linkStyle default opacity:0.5
149153
authenticated_user_storage(["@metamask/authenticated-user-storage"]);
150154
base_controller(["@metamask/base-controller"]);
151155
base_data_service(["@metamask/base-data-service"]);
156+
bitcoin_regtest_up(["@metamask/bitcoin-regtest-up"]);
152157
bridge_controller(["@metamask/bridge-controller"]);
153158
bridge_status_controller(["@metamask/bridge-status-controller"]);
154159
build_utils(["@metamask/build-utils"]);
@@ -175,9 +180,11 @@ linkStyle default opacity:0.5
175180
gas_fee_controller(["@metamask/gas-fee-controller"]);
176181
gator_permissions_controller(["@metamask/gator-permissions-controller"]);
177182
geolocation_controller(["@metamask/geolocation-controller"]);
183+
java_tron_up(["@metamask/java-tron-up"]);
178184
json_rpc_engine(["@metamask/json-rpc-engine"]);
179185
json_rpc_middleware_stream(["@metamask/json-rpc-middleware-stream"]);
180186
keyring_controller(["@metamask/keyring-controller"]);
187+
local_node_utils(["@metamask/local-node-utils"]);
181188
logging_controller(["@metamask/logging-controller"]);
182189
message_manager(["@metamask/message-manager"]);
183190
messenger(["@metamask/messenger"]);
@@ -214,6 +221,7 @@ linkStyle default opacity:0.5
214221
smart_transactions_controller(["@metamask/smart-transactions-controller"]);
215222
snap_account_service(["@metamask/snap-account-service"]);
216223
social_controllers(["@metamask/social-controllers"]);
224+
solana_test_validator_up(["@metamask/solana-test-validator-up"]);
217225
storage_service(["@metamask/storage-service"]);
218226
subscription_controller(["@metamask/subscription-controller"]);
219227
transaction_controller(["@metamask/transaction-controller"]);
@@ -288,6 +296,7 @@ linkStyle default opacity:0.5
288296
base_controller --> messenger;
289297
base_data_service --> controller_utils;
290298
base_data_service --> messenger;
299+
bitcoin_regtest_up --> local_node_utils;
291300
bridge_controller --> accounts_controller;
292301
bridge_controller --> assets_controller;
293302
bridge_controller --> assets_controllers;
@@ -385,6 +394,7 @@ linkStyle default opacity:0.5
385394
geolocation_controller --> base_controller;
386395
geolocation_controller --> controller_utils;
387396
geolocation_controller --> messenger;
397+
java_tron_up --> local_node_utils;
388398
json_rpc_engine --> messenger;
389399
json_rpc_middleware_stream --> json_rpc_engine;
390400
keyring_controller --> base_controller;
@@ -473,6 +483,7 @@ linkStyle default opacity:0.5
473483
perps_controller --> controller_utils;
474484
perps_controller --> messenger;
475485
perps_controller --> account_tree_controller;
486+
perps_controller --> authenticated_user_storage;
476487
perps_controller --> geolocation_controller;
477488
perps_controller --> keyring_controller;
478489
perps_controller --> network_controller;
@@ -557,6 +568,7 @@ linkStyle default opacity:0.5
557568
social_controllers --> controller_utils;
558569
social_controllers --> messenger;
559570
social_controllers --> profile_sync_controller;
571+
solana_test_validator_up --> local_node_utils;
560572
storage_service --> messenger;
561573
subscription_controller --> base_controller;
562574
subscription_controller --> controller_utils;
@@ -606,9 +618,12 @@ linkStyle default opacity:0.5
606618
wallet --> controller_utils;
607619
wallet --> keyring_controller;
608620
wallet --> messenger;
621+
wallet --> network_controller;
609622
wallet --> remote_feature_flag_controller;
610623
wallet --> storage_service;
611624
wallet_cli --> base_controller;
625+
wallet_cli --> remote_feature_flag_controller;
626+
wallet_cli --> storage_service;
612627
wallet_cli --> wallet;
613628
```
614629

‎eslint-suppressions.json‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -710,9 +710,6 @@
710710
"packages/bridge-controller/src/utils/trade-utils.ts": {
711711
"no-restricted-globals": {
712712
"count": 1
713-
},
714-
"no-restricted-syntax": {
715-
"count": 5
716713
}
717714
},
718715
"packages/bridge-controller/tests/mock-sse.ts": {
@@ -1277,6 +1274,11 @@
12771274
"count": 2
12781275
}
12791276
},
1277+
"packages/multichain-account-service/src/providers/XlmAccountProvider.ts": {
1278+
"@typescript-eslint/naming-convention": {
1279+
"count": 2
1280+
}
1281+
},
12801282
"packages/multichain-account-service/src/providers/utils.ts": {
12811283
"@typescript-eslint/naming-convention": {
12821284
"count": 2
@@ -2208,12 +2210,12 @@
22082210
},
22092211
"packages/snap-account-service/src/SnapPlatformWatcher.test.ts": {
22102212
"no-restricted-syntax": {
2211-
"count": 2
2213+
"count": 1
22122214
}
22132215
},
22142216
"packages/snap-account-service/src/SnapPlatformWatcher.ts": {
22152217
"no-restricted-syntax": {
2216-
"count": 2
2218+
"count": 1
22172219
}
22182220
},
22192221
"packages/subscription-controller/src/SubscriptionController.test.ts": {

‎knip.config.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,14 @@ const config: KnipConfig = {
8383
ignoreBinaries: ['anvil', 'sysctl'],
8484
ignoreDependencies: ['yargs-parser'],
8585
},
86+
'packages/java-tron-up': {
87+
// `sysctl` is an external system binary, not an npm package.
88+
ignoreBinaries: ['sysctl'],
89+
},
90+
'packages/local-node-utils': {
91+
// `sysctl` is an external system binary, not an npm package.
92+
ignoreBinaries: ['sysctl'],
93+
},
8694
'packages/gas-fee-controller': {
8795
ignoreDependencies: ['@metamask/ethjs-unit', 'jest-when'],
8896
},

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@metamask/core-monorepo",
3-
"version": "1058.0.0",
3+
"version": "1074.0.0",
44
"private": true,
55
"description": "Monorepo for packages shared between MetaMask clients",
66
"repository": {
@@ -25,7 +25,7 @@
2525
"lint": "yarn lint:eslint && echo && yarn lint:misc --check && yarn constraints && yarn lint:dependencies && yarn lint:teams && yarn messenger-action-types:check && yarn readme-content:check",
2626
"lint:dependencies": "knip --dependencies && yarn dedupe --check",
2727
"lint:dependencies:fix": "knip --dependencies && yarn dedupe",
28-
"lint:eslint": "yarn build:only-clean && NODE_OPTIONS='--max-old-space-size=6144' yarn eslint",
28+
"lint:eslint": "yarn build:only-clean && NODE_OPTIONS='--max-old-space-size=8192' yarn eslint",
2929
"lint:fix": "yarn lint:eslint --fix --prune-suppressions && echo && yarn lint:misc --write && yarn constraints --fix && yarn lint:dependencies:fix && yarn messenger-action-types:generate && yarn readme-content:update",
3030
"lint:misc": "oxfmt --ignore-path .gitignore",
3131
"lint:misc:check": "yarn lint:misc --check",
@@ -58,7 +58,7 @@
5858
"@metamask/eth-block-tracker": "^15.0.1",
5959
"@metamask/eth-json-rpc-provider": "^6.0.1",
6060
"@metamask/json-rpc-engine": "^10.5.0",
61-
"@metamask/network-controller": "^32.0.0",
61+
"@metamask/network-controller": "^33.0.0",
6262
"@metamask/skills": "^0.1.0",
6363
"@metamask/utils": "^11.11.0",
6464
"@ts-bridge/cli": "^0.6.4",

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
### Changed
1111

12+
- Bump `@metamask/keyring-api` from `^23.1.0` to `^23.3.0` ([#9249](https://github.com/MetaMask/core/pull/9249))
13+
- Bump `@metamask/multichain-account-service` from `^11.0.0` to `^11.1.0` ([#9264](https://github.com/MetaMask/core/pull/9264))
14+
15+
## [7.5.3]
16+
17+
### Changed
18+
1219
- Bump `@metamask/utils` from `^11.9.0` to `^11.11.0` ([#9074](https://github.com/MetaMask/core/pull/9074))
1320
- Bump `@metamask/profile-sync-controller` from `^28.1.1` to `^28.2.0` ([#9119](https://github.com/MetaMask/core/pull/9119))
1421
- Bump `@metamask/keyring-controller` from `^27.0.0` to `^27.1.0` ([#9129](https://github.com/MetaMask/core/pull/9129))
22+
- Bump `@metamask/accounts-controller` from `^39.0.1` to `^39.0.3` ([#9218](https://github.com/MetaMask/core/pull/9218), [#9231](https://github.com/MetaMask/core/pull/9231))
23+
- Bump `@metamask/multichain-account-service` from `^10.0.3` to `^11.0.0` ([#9231](https://github.com/MetaMask/core/pull/9231))
1524

1625
## [7.5.2]
1726

@@ -604,7 +613,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
604613
- Initial release ([#5847](https://github.com/MetaMask/core/pull/5847))
605614
- Grouping accounts into 3 main categories: Entropy source, Snap ID, keyring types.
606615

607-
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/account-tree-controller@7.5.2...HEAD
616+
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/account-tree-controller@7.5.3...HEAD
617+
[7.5.3]: https://github.com/MetaMask/core/compare/@metamask/account-tree-controller@7.5.2...@metamask/account-tree-controller@7.5.3
608618
[7.5.2]: https://github.com/MetaMask/core/compare/@metamask/account-tree-controller@7.5.1...@metamask/account-tree-controller@7.5.2
609619
[7.5.1]: https://github.com/MetaMask/core/compare/@metamask/account-tree-controller@7.5.0...@metamask/account-tree-controller@7.5.1
610620
[7.5.0]: https://github.com/MetaMask/core/compare/@metamask/account-tree-controller@7.4.0...@metamask/account-tree-controller@7.5.0

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@metamask/account-tree-controller",
3-
"version": "7.5.2",
3+
"version": "7.5.3",
44
"description": "Controller to group account together based on some pre-defined rules",
55
"keywords": [
66
"Ethereum",
@@ -53,12 +53,12 @@
5353
"test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch"
5454
},
5555
"dependencies": {
56-
"@metamask/accounts-controller": "^39.0.1",
56+
"@metamask/accounts-controller": "^39.0.3",
5757
"@metamask/base-controller": "^9.1.0",
58-
"@metamask/keyring-api": "^23.1.0",
58+
"@metamask/keyring-api": "^23.3.0",
5959
"@metamask/keyring-controller": "^27.1.0",
6060
"@metamask/messenger": "^1.2.0",
61-
"@metamask/multichain-account-service": "^10.0.3",
61+
"@metamask/multichain-account-service": "^11.1.0",
6262
"@metamask/profile-sync-controller": "^28.2.0",
6363
"@metamask/snaps-controllers": "^19.0.0",
6464
"@metamask/snaps-sdk": "^11.0.0",

‎packages/accounts-controller/CHANGELOG.md‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
### Changed
1111

12+
- Bump `@metamask/keyring-api` from `^23.1.0` to `^23.3.0` ([#9249](https://github.com/MetaMask/core/pull/9249))
13+
- Bump `@metamask/keyring-sdk` from `^2.1.1` to `^2.2.0` ([#9249](https://github.com/MetaMask/core/pull/9249))
14+
- Bump `@metamask/keyring-utils` from `^3.2.1` to `^3.3.1` ([#9249](https://github.com/MetaMask/core/pull/9249))
15+
16+
## [39.0.3]
17+
18+
### Changed
19+
20+
- Bump `@metamask/eth-snap-keyring` from `^22.0.1` to `^22.3.0` ([#8732](https://github.com/MetaMask/core/pull/8732))
21+
22+
## [39.0.2]
23+
24+
### Changed
25+
1226
- Bump `@metamask/utils` from `^11.9.0` to `^11.11.0` ([#9074](https://github.com/MetaMask/core/pull/9074))
1327
- Bump `@metamask/controller-utils` from `^12.1.1` to `^12.2.0` ([#9083](https://github.com/MetaMask/core/pull/9083))
14-
- The `state` option of the `AccountsController` constructor is now optional, defaulting to the controller's default state when omitted ([#8924](https://github.com/MetaMask/core/pull/8924))
1528
- Bump `@metamask/keyring-controller` from `^27.0.0` to `^27.1.0` ([#9129](https://github.com/MetaMask/core/pull/9129))
29+
- Bump `@metamask/network-controller` from `^32.0.0` to `^33.0.0` ([#9218](https://github.com/MetaMask/core/pull/9218))
30+
31+
### Fixed
32+
33+
- The `state` option of the `AccountsController` constructor is now optional, defaulting to the controller's default state when omitted ([#8924](https://github.com/MetaMask/core/pull/8924))
1634

1735
## [39.0.1]
1836

@@ -826,7 +844,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
826844

827845
- Initial release ([#1637](https://github.com/MetaMask/core/pull/1637))
828846

829-
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@39.0.1...HEAD
847+
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@39.0.3...HEAD
848+
[39.0.3]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@39.0.2...@metamask/accounts-controller@39.0.3
849+
[39.0.2]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@39.0.1...@metamask/accounts-controller@39.0.2
830850
[39.0.1]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@39.0.0...@metamask/accounts-controller@39.0.1
831851
[39.0.0]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@38.1.2...@metamask/accounts-controller@39.0.0
832852
[38.1.2]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@38.1.1...@metamask/accounts-controller@38.1.2

‎packages/accounts-controller/package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@metamask/accounts-controller",
3-
"version": "39.0.1",
3+
"version": "39.0.3",
44
"description": "Manages internal accounts",
55
"keywords": [
66
"Ethereum",
@@ -55,14 +55,14 @@
5555
"dependencies": {
5656
"@ethereumjs/util": "^9.1.0",
5757
"@metamask/base-controller": "^9.1.0",
58-
"@metamask/eth-snap-keyring": "^22.0.1",
59-
"@metamask/keyring-api": "^23.1.0",
58+
"@metamask/eth-snap-keyring": "^22.3.0",
59+
"@metamask/keyring-api": "^23.3.0",
6060
"@metamask/keyring-controller": "^27.1.0",
6161
"@metamask/keyring-internal-api": "^11.0.1",
62-
"@metamask/keyring-sdk": "^2.1.1",
63-
"@metamask/keyring-utils": "^3.2.1",
62+
"@metamask/keyring-sdk": "^2.2.0",
63+
"@metamask/keyring-utils": "^3.3.1",
6464
"@metamask/messenger": "^1.2.0",
65-
"@metamask/network-controller": "^32.0.0",
65+
"@metamask/network-controller": "^33.0.0",
6666
"@metamask/superstruct": "^3.1.0",
6767
"@metamask/utils": "^11.11.0",
6868
"deepmerge": "^4.2.2",
@@ -73,7 +73,7 @@
7373
},
7474
"devDependencies": {
7575
"@metamask/auto-changelog": "^6.1.0",
76-
"@metamask/controller-utils": "^12.2.0",
76+
"@metamask/controller-utils": "^12.3.0",
7777
"@metamask/providers": "^22.1.0",
7878
"@ts-bridge/cli": "^0.6.4",
7979
"@types/jest": "^29.5.14",

‎packages/address-book-controller/CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1010
### Changed
1111

1212
- Bump `@metamask/utils` from `^11.9.0` to `^11.11.0` ([#9074](https://github.com/MetaMask/core/pull/9074))
13-
- Bump `@metamask/controller-utils` from `^12.0.0` to `^12.2.0` ([#8774](https://github.com/MetaMask/core/pull/8774), [#9058](https://github.com/MetaMask/core/pull/9058), [#9083](https://github.com/MetaMask/core/pull/9083))
13+
- Bump `@metamask/controller-utils` from `^12.0.0` to `^12.3.0` ([#8774](https://github.com/MetaMask/core/pull/8774), [#9058](https://github.com/MetaMask/core/pull/9058), [#9083](https://github.com/MetaMask/core/pull/9083), [#9218](https://github.com/MetaMask/core/pull/9218))
1414

1515
## [7.1.2]
1616

0 commit comments

Comments
 (0)