Skip to content

Commit 6f7c54c

Browse files
mathieuartumathieuartu
committed
Merge branch 'main' into feat/replace-profile-sync-backup-and-sync
2 parents 36565d8 + 8dd27f0 commit 6f7c54c

File tree

65 files changed

+376
-169
lines changed

Some content is hidden

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

65 files changed

+376
-169
lines changed

‎package.json

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

‎packages/accounts-controller/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"devDependencies": {
6565
"@metamask/auto-changelog": "^3.4.4",
6666
"@metamask/keyring-controller": "^21.0.6",
67-
"@metamask/network-controller": "^23.3.0",
67+
"@metamask/network-controller": "^23.4.0",
6868
"@metamask/providers": "^21.0.0",
6969
"@metamask/snaps-controllers": "^11.2.1",
7070
"@types/jest": "^27.4.1",

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

+1-1
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/base-controller` from ^8.0.0 to ^8.0.1 ([#5722](https://github.com/MetaMask/core/pull/5722))
13-
- Bump `@metamask/controller-utils` to `^11.7.0` ([#5583](https://github.com/MetaMask/core/pull/5583))
13+
- Bump `@metamask/controller-utils` to `^11.8.0` ([#5583](https://github.com/MetaMask/core/pull/5583), [#5765](https://github.com/MetaMask/core/pull/5765))
1414

1515
## [6.0.3]
1616

‎packages/address-book-controller/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
},
4949
"dependencies": {
5050
"@metamask/base-controller": "^8.0.1",
51-
"@metamask/controller-utils": "^11.7.0",
51+
"@metamask/controller-utils": "^11.8.0",
5252
"@metamask/utils": "^11.2.0"
5353
},
5454
"devDependencies": {

‎packages/assets-controllers/CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ 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.8.0` ([#5765](https://github.com/MetaMask/core/pull/5765))
13+
- Update `DEFI_POSITIONS_API_URL` to use the production endpoint ([#5769](https://github.com/MetaMask/core/pull/5769))
14+
1015
## [61.0.0]
1116

1217
### Changed

‎packages/assets-controllers/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"@metamask/abi-utils": "^2.0.3",
5757
"@metamask/base-controller": "^8.0.1",
5858
"@metamask/contract-metadata": "^2.4.0",
59-
"@metamask/controller-utils": "^11.7.0",
59+
"@metamask/controller-utils": "^11.8.0",
6060
"@metamask/eth-query": "^4.0.0",
6161
"@metamask/keyring-api": "^17.4.0",
6262
"@metamask/metamask-eth-abis": "^3.1.1",
@@ -84,7 +84,7 @@
8484
"@metamask/keyring-controller": "^21.0.6",
8585
"@metamask/keyring-internal-api": "^6.0.1",
8686
"@metamask/keyring-snap-client": "^4.1.0",
87-
"@metamask/network-controller": "^23.3.0",
87+
"@metamask/network-controller": "^23.4.0",
8888
"@metamask/permission-controller": "^11.0.6",
8989
"@metamask/preferences-controller": "^17.0.0",
9090
"@metamask/providers": "^21.0.0",

‎packages/assets-controllers/src/DeFiPositionsController/fetch-positions.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ export type Balance = {
5656
};
5757

5858
// TODO: Update with prod API URL when available
59-
export const DEFI_POSITIONS_API_URL =
60-
'https://defiadapters.dev-api.cx.metamask.io';
59+
export const DEFI_POSITIONS_API_URL = 'https://defiadapters.api.cx.metamask.io';
6160

6261
/**
6362
* Builds a function that fetches DeFi positions for a given account address

‎packages/bridge-controller/CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ 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.8.0` ([#5765](https://github.com/MetaMask/core/pull/5765))
13+
1014
## [21.0.0]
1115

1216
### Changed

‎packages/bridge-controller/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"@ethersproject/contracts": "^5.7.0",
5454
"@ethersproject/providers": "^5.7.0",
5555
"@metamask/base-controller": "^8.0.1",
56-
"@metamask/controller-utils": "^11.7.0",
56+
"@metamask/controller-utils": "^11.8.0",
5757
"@metamask/gas-fee-controller": "^23.0.0",
5858
"@metamask/keyring-api": "^17.4.0",
5959
"@metamask/metamask-eth-abis": "^3.1.1",
@@ -68,7 +68,7 @@
6868
"@metamask/assets-controllers": "^61.0.0",
6969
"@metamask/auto-changelog": "^3.4.4",
7070
"@metamask/eth-json-rpc-provider": "^4.1.8",
71-
"@metamask/network-controller": "^23.3.0",
71+
"@metamask/network-controller": "^23.4.0",
7272
"@metamask/remote-feature-flag-controller": "^1.6.0",
7373
"@metamask/snaps-controllers": "^11.2.1",
7474
"@metamask/superstruct": "^3.1.0",

‎packages/bridge-status-controller/CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ 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.8.0` ([#5765](https://github.com/MetaMask/core/pull/5765))
13+
1014
## [18.0.0]
1115

1216
### Changed

‎packages/bridge-status-controller/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
},
4949
"dependencies": {
5050
"@metamask/base-controller": "^8.0.1",
51-
"@metamask/controller-utils": "^11.7.0",
51+
"@metamask/controller-utils": "^11.8.0",
5252
"@metamask/keyring-api": "^17.4.0",
5353
"@metamask/polling-controller": "^13.0.0",
5454
"@metamask/superstruct": "^3.1.0",
@@ -62,7 +62,7 @@
6262
"@metamask/auto-changelog": "^3.4.4",
6363
"@metamask/bridge-controller": "^21.0.0",
6464
"@metamask/gas-fee-controller": "^23.0.0",
65-
"@metamask/network-controller": "^23.3.0",
65+
"@metamask/network-controller": "^23.4.0",
6666
"@metamask/snaps-controllers": "^11.2.1",
6767
"@metamask/transaction-controller": "^55.0.0",
6868
"@types/jest": "^27.4.1",

‎packages/chain-agnostic-permission/CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
### Changed
11+
12+
- Bump `@metamask/network-controller` to `^23.4.0` ([#5765](https://github.com/MetaMask/core/pull/5765))
13+
- Bump `@metamask/controller-utils` to `^11.8.0` ([#5765](https://github.com/MetaMask/core/pull/5765))
14+
1015
## [0.6.0]
1116

1217
### Changed

‎packages/chain-agnostic-permission/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
},
4949
"dependencies": {
5050
"@metamask/api-specs": "^0.10.12",
51-
"@metamask/controller-utils": "^11.7.0",
52-
"@metamask/network-controller": "^23.3.0",
51+
"@metamask/controller-utils": "^11.8.0",
52+
"@metamask/network-controller": "^23.4.0",
5353
"@metamask/permission-controller": "^11.0.6",
5454
"@metamask/rpc-errors": "^7.0.2",
5555
"@metamask/utils": "^11.2.0",

‎packages/controller-utils/CHANGELOG.md

+4-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [11.8.0]
11+
1012
### Added
1113

1214
- Add Monad Testnet to various constants, enums, and types ([#5724](https://github.com/MetaMask/core/pull/5724))
@@ -501,7 +503,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
501503

502504
All changes listed after this point were applied to this package following the monorepo conversion.
503505

504-
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
506+
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
507+
[11.8.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
505508
[11.7.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
506509
[11.6.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
507510
[11.5.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]

‎packages/controller-utils/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@metamask/controller-utils",
3-
"version": "11.7.0",
3+
"version": "11.8.0",
44
"description": "Data and convenience functions shared by multiple packages",
55
"keywords": [
66
"MetaMask",

‎packages/earn-controller/CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ 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.8.0` ([#5765](https://github.com/MetaMask/core/pull/5765))
13+
1014
## [0.13.0]
1115

1216
### Changed

‎packages/earn-controller/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@
4949
"dependencies": {
5050
"@ethersproject/providers": "^5.7.0",
5151
"@metamask/base-controller": "^8.0.1",
52-
"@metamask/controller-utils": "^11.7.0",
52+
"@metamask/controller-utils": "^11.8.0",
5353
"@metamask/stake-sdk": "^1.0.0"
5454
},
5555
"devDependencies": {
5656
"@metamask/accounts-controller": "^28.0.0",
5757
"@metamask/auto-changelog": "^3.4.4",
58-
"@metamask/network-controller": "^23.3.0",
58+
"@metamask/network-controller": "^23.4.0",
5959
"@metamask/transaction-controller": "^55.0.0",
6060
"@types/jest": "^27.4.1",
6161
"deepmerge": "^4.2.2",

‎packages/eip1193-permission-middleware/CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111

1212
- Bump `@metamask/chain-agnostic-permission` to `^0.4.0` ([#5674](https://github.com/MetaMask/core/pull/5674))
1313
- Bump `@metamask/chain-agnostic-permission` to `^0.2.0` ([#5518](https://github.com/MetaMask/core/pull/5518))
14-
- Bump `@metamask/controller-utils` to `^11.7.0` ([#5583](https://github.com/MetaMask/core/pull/5583))
14+
- Bump `@metamask/controller-utils` to `^11.8.0` ([#5583](https://github.com/MetaMask/core/pull/5583), [#5765](https://github.com/MetaMask/core/pull/5765))
1515

1616
## [0.1.0]
1717

‎packages/eip1193-permission-middleware/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
},
4949
"dependencies": {
5050
"@metamask/chain-agnostic-permission": "^0.6.0",
51-
"@metamask/controller-utils": "^11.7.0",
51+
"@metamask/controller-utils": "^11.8.0",
5252
"@metamask/json-rpc-engine": "^10.0.3",
5353
"@metamask/permission-controller": "^11.0.6",
5454
"@metamask/utils": "^11.2.0",

‎packages/ens-controller/CHANGELOG.md

+1-1
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/base-controller` from ^8.0.0 to ^8.0.1 ([#5722](https://github.com/MetaMask/core/pull/5722))
13-
- Bump `@metamask/controller-utils` to `^11.7.0` ([#5583](https://github.com/MetaMask/core/pull/5583))
13+
- Bump `@metamask/controller-utils` to `^11.8.0` ([#5583](https://github.com/MetaMask/core/pull/5583), [#5765](https://github.com/MetaMask/core/pull/5765))
1414

1515
## [16.0.0]
1616

‎packages/ens-controller/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@
4949
"dependencies": {
5050
"@ethersproject/providers": "^5.7.0",
5151
"@metamask/base-controller": "^8.0.1",
52-
"@metamask/controller-utils": "^11.7.0",
52+
"@metamask/controller-utils": "^11.8.0",
5353
"@metamask/utils": "^11.2.0",
5454
"punycode": "^2.1.1"
5555
},
5656
"devDependencies": {
5757
"@metamask/auto-changelog": "^3.4.4",
58-
"@metamask/network-controller": "^23.3.0",
58+
"@metamask/network-controller": "^23.4.0",
5959
"@types/jest": "^27.4.1",
6060
"deepmerge": "^4.2.2",
6161
"jest": "^27.5.1",

‎packages/gas-fee-controller/CHANGELOG.md

+1-1
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/base-controller` from ^8.0.0 to ^8.0.1 ([#5722](https://github.com/MetaMask/core/pull/5722))
13-
- Bump `@metamask/controller-utils` to `^11.7.0` ([#5583](https://github.com/MetaMask/core/pull/5583))
13+
- Bump `@metamask/controller-utils` to `^11.8.0` ([#5583](https://github.com/MetaMask/core/pull/5583), [#5765](https://github.com/MetaMask/core/pull/5765))
1414

1515
## [23.0.0]
1616

‎packages/gas-fee-controller/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
},
4949
"dependencies": {
5050
"@metamask/base-controller": "^8.0.1",
51-
"@metamask/controller-utils": "^11.7.0",
51+
"@metamask/controller-utils": "^11.8.0",
5252
"@metamask/eth-query": "^4.0.0",
5353
"@metamask/ethjs-unit": "^0.3.0",
5454
"@metamask/polling-controller": "^13.0.0",
@@ -61,7 +61,7 @@
6161
"devDependencies": {
6262
"@babel/runtime": "^7.23.9",
6363
"@metamask/auto-changelog": "^3.4.4",
64-
"@metamask/network-controller": "^23.3.0",
64+
"@metamask/network-controller": "^23.4.0",
6565
"@types/jest": "^27.4.1",
6666
"@types/jest-when": "^2.7.3",
6767
"deepmerge": "^4.2.2",

‎packages/logging-controller/CHANGELOG.md

+1-1
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/base-controller` from ^8.0.0 to ^8.0.1 ([#5722](https://github.com/MetaMask/core/pull/5722))
13-
- Bump `@metamask/controller-utils` to `^11.7.0` ([#5583](https://github.com/MetaMask/core/pull/5583))
13+
- Bump `@metamask/controller-utils` to `^11.8.0` ([#5583](https://github.com/MetaMask/core/pull/5583), [#5765](https://github.com/MetaMask/core/pull/5765))
1414

1515
## [6.0.4]
1616

‎packages/logging-controller/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
},
4949
"dependencies": {
5050
"@metamask/base-controller": "^8.0.1",
51-
"@metamask/controller-utils": "^11.7.0",
51+
"@metamask/controller-utils": "^11.8.0",
5252
"uuid": "^8.3.2"
5353
},
5454
"devDependencies": {

‎packages/message-manager/CHANGELOG.md

+1-1
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/base-controller` from ^8.0.0 to ^8.0.1 ([#5722](https://github.com/MetaMask/core/pull/5722))
13-
- Bump `@metamask/controller-utils` to `^11.7.0` ([#5583](https://github.com/MetaMask/core/pull/5583))
13+
- Bump `@metamask/controller-utils` to `^11.8.0` ([#5583](https://github.com/MetaMask/core/pull/5583), [#5765](https://github.com/MetaMask/core/pull/5765))
1414

1515
## [12.0.1]
1616

‎packages/message-manager/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
},
4949
"dependencies": {
5050
"@metamask/base-controller": "^8.0.1",
51-
"@metamask/controller-utils": "^11.7.0",
51+
"@metamask/controller-utils": "^11.8.0",
5252
"@metamask/eth-sig-util": "^8.2.0",
5353
"@metamask/utils": "^11.2.0",
5454
"@types/uuid": "^8.3.0",

‎packages/multichain-api-middleware/CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
### Changed
1111

12-
- Bump `@metamask/network-controller` to `^23.3.0` ([#5789](https://github.com/MetaMask/core/pull/5789))
12+
- Bump `@metamask/controller-utils` to `^11.8.0` ([#5765](https://github.com/MetaMask/core/pull/5765))
13+
- Bump `@metamask/network-controller` to `^23.4.0` ([#5765](https://github.com/MetaMask/core/pull/5765))
1314

1415
## [0.2.0]
1516

‎packages/multichain-api-middleware/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@
4949
"dependencies": {
5050
"@metamask/api-specs": "^0.10.12",
5151
"@metamask/chain-agnostic-permission": "^0.6.0",
52-
"@metamask/controller-utils": "^11.7.0",
52+
"@metamask/controller-utils": "^11.8.0",
5353
"@metamask/json-rpc-engine": "^10.0.3",
54-
"@metamask/network-controller": "^23.3.0",
54+
"@metamask/network-controller": "^23.4.0",
5555
"@metamask/permission-controller": "^11.0.6",
5656
"@metamask/rpc-errors": "^7.0.2",
5757
"@metamask/utils": "^11.2.0",

‎packages/multichain-network-controller/CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ 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.8.0` ([#5765](https://github.com/MetaMask/core/pull/5765))
13+
1014
## [0.6.0]
1115

1216
### Changed
@@ -19,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1923
### Changed
2024

2125
- Updated to restrict `getNetworksWithTransactionActivityByAccounts` to EVM networks only while non-EVM network endpoint support is being completed. Full multi-chain support will be restored in the coming weeks ([#5677](https://github.com/MetaMask/core/pull/5677))
26+
- Updated network activity API requests to have batching support to handle URL length limitations, allowing the controller to fetch network activity for any number of accounts ([#5752](https://github.com/MetaMask/core/pull/5752))
2227

2328
## [0.5.0]
2429

‎packages/multichain-network-controller/package.json

+5-3
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,21 @@
4848
},
4949
"dependencies": {
5050
"@metamask/base-controller": "^8.0.1",
51-
"@metamask/controller-utils": "^11.7.0",
51+
"@metamask/controller-utils": "^11.8.0",
5252
"@metamask/keyring-api": "^17.4.0",
5353
"@metamask/keyring-internal-api": "^6.0.1",
5454
"@metamask/superstruct": "^3.1.0",
5555
"@metamask/utils": "^11.2.0",
56-
"@solana/addresses": "^2.0.0"
56+
"@solana/addresses": "^2.0.0",
57+
"lodash": "^4.17.21"
5758
},
5859
"devDependencies": {
5960
"@metamask/accounts-controller": "^28.0.0",
6061
"@metamask/auto-changelog": "^3.4.4",
6162
"@metamask/keyring-controller": "^21.0.6",
62-
"@metamask/network-controller": "^23.3.0",
63+
"@metamask/network-controller": "^23.4.0",
6364
"@types/jest": "^27.4.1",
65+
"@types/lodash": "^4.14.191",
6466
"@types/uuid": "^8.3.0",
6567
"deepmerge": "^4.2.2",
6668
"immer": "^9.0.6",

0 commit comments

Comments
 (0)