Skip to content

Commit eede76b

Browse files
matthewwalsh0matthewwalsh0
authored
Merge branch 'main' into batched-tx-types
2 parents 95253f5 + 1691d07 commit eede76b

File tree

34 files changed

+235
-120
lines changed

34 files changed

+235
-120
lines changed

‎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": "473.0.0",
3+
"version": "477.0.0",
44
"private": true,
55
"description": "Monorepo for packages shared between MetaMask clients",
66
"repository": {

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

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

88
## [Unreleased]
99

10+
## [0.6.0]
11+
12+
### Changed
13+
14+
- **BREAKING:** Bump peer dependency `@metamask/accounts-controller` from `^31.0.0` to `^32.0.0` ([#6171](https://github.com/MetaMask/core/pull/6171))
15+
1016
## [0.5.0]
1117

1218
### Changed
@@ -57,7 +63,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
5763
- Initial release ([#5847](https://github.com/MetaMask/core/pull/5847))
5864
- Grouping accounts into 3 main categories: Entropy source, Snap ID, keyring types.
5965

60-
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/account-tree-controller@0.5.0...HEAD
66+
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/account-tree-controller@0.6.0...HEAD
67+
[0.6.0]: https://github.com/MetaMask/core/compare/@metamask/account-tree-controller@0.5.0...@metamask/account-tree-controller@0.6.0
6168
[0.5.0]: https://github.com/MetaMask/core/compare/@metamask/account-tree-controller@0.4.0...@metamask/account-tree-controller@0.5.0
6269
[0.4.0]: https://github.com/MetaMask/core/compare/@metamask/account-tree-controller@0.3.0...@metamask/account-tree-controller@0.4.0
6370
[0.3.0]: https://github.com/MetaMask/core/compare/@metamask/account-tree-controller@0.2.0...@metamask/account-tree-controller@0.3.0

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@metamask/account-tree-controller",
3-
"version": "0.5.0",
3+
"version": "0.6.0",
44
"description": "Controller to group account together based on some pre-defined rules",
55
"keywords": [
66
"MetaMask",
@@ -54,7 +54,7 @@
5454
},
5555
"devDependencies": {
5656
"@metamask/account-api": "^0.2.0",
57-
"@metamask/accounts-controller": "^31.0.0",
57+
"@metamask/accounts-controller": "^32.0.0",
5858
"@metamask/auto-changelog": "^3.4.4",
5959
"@metamask/keyring-api": "^19.0.0",
6060
"@metamask/keyring-controller": "^22.1.0",
@@ -71,7 +71,7 @@
7171
},
7272
"peerDependencies": {
7373
"@metamask/account-api": "^0.2.0",
74-
"@metamask/accounts-controller": "^31.0.0",
74+
"@metamask/accounts-controller": "^32.0.0",
7575
"@metamask/keyring-controller": "^22.0.0",
7676
"@metamask/providers": "^22.0.0",
7777
"@metamask/snaps-controllers": "^14.0.0",

‎packages/accounts-controller/CHANGELOG.md

Lines changed: 4 additions & 1 deletion
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+
## [32.0.0]
11+
1012
### Added
1113

1214
- Use new typed `KeyringAccount.options` for BIP-44 compatible accounts ([#6122](https://github.com/MetaMask/core/pull/6122)), ([#6147](https://github.com/MetaMask/core/pull/6147))
@@ -570,7 +572,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
570572

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

573-
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@31.0.0...HEAD
575+
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@32.0.0...HEAD
576+
[32.0.0]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@31.0.0...@metamask/accounts-controller@32.0.0
574577
[31.0.0]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@30.0.0...@metamask/accounts-controller@31.0.0
575578
[30.0.0]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@29.0.1...@metamask/accounts-controller@30.0.0
576579
[29.0.1]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@29.0.0...@metamask/accounts-controller@29.0.1

‎packages/accounts-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/accounts-controller",
3-
"version": "31.0.0",
3+
"version": "32.0.0",
44
"description": "Manages internal accounts",
55
"keywords": [
66
"MetaMask",

‎packages/assets-controllers/CHANGELOG.md

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

88
## [Unreleased]
99

10+
## [73.0.0]
11+
1012
### Changed
1113

14+
- **BREAKING:** Bump peer dependency `@metamask/accounts-controller` to `^32.0.0` ([#6171](https://github.com/MetaMask/core/pull/6171))
15+
- **BREAKING:** Bump peer dependency `@metamask/transaction-controller` to `^59.0.0` ([#6171](https://github.com/MetaMask/core/pull/6171))
1216
- Improved `TokenDetectionController` token handling flow ([#6012](https://github.com/MetaMask/core/pull/6012))
1317
- Detected tokens are now implicitly added directly to `allTokens` instead of being added to `allDetectedTokens` first
1418
- This simplifies the token import flow and improves performance by eliminating the manual UI import step
@@ -1787,7 +1791,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
17871791
17881792
- Use Ethers for AssetsContractController ([#845](https://github.com/MetaMask/core/pull/845))
17891793
1790-
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@72.0.0...HEAD
1794+
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@73.0.0...HEAD
1795+
[73.0.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@72.0.0...@metamask/assets-controllers@73.0.0
17911796
[72.0.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@71.0.0...@metamask/assets-controllers@72.0.0
17921797
[71.0.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@70.0.1...@metamask/assets-controllers@71.0.0
17931798
[70.0.1]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@70.0.0...@metamask/assets-controllers@70.0.1

‎packages/assets-controllers/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@metamask/assets-controllers",
3-
"version": "72.0.0",
3+
"version": "73.0.0",
44
"description": "Controllers which manage interactions involving ERC-20, ERC-721, and ERC-1155 tokens (including NFTs)",
55
"keywords": [
66
"MetaMask",
@@ -78,7 +78,7 @@
7878
},
7979
"devDependencies": {
8080
"@babel/runtime": "^7.23.9",
81-
"@metamask/accounts-controller": "^31.0.0",
81+
"@metamask/accounts-controller": "^32.0.0",
8282
"@metamask/approval-controller": "^7.1.3",
8383
"@metamask/auto-changelog": "^3.4.4",
8484
"@metamask/ethjs-provider-http": "^0.3.0",
@@ -91,7 +91,7 @@
9191
"@metamask/preferences-controller": "^18.4.1",
9292
"@metamask/providers": "^22.1.0",
9393
"@metamask/snaps-controllers": "^14.0.1",
94-
"@metamask/transaction-controller": "^58.1.1",
94+
"@metamask/transaction-controller": "^59.0.0",
9595
"@types/jest": "^27.4.1",
9696
"@types/lodash": "^4.14.191",
9797
"@types/node": "^16.18.54",
@@ -107,7 +107,7 @@
107107
"webextension-polyfill": "^0.12.0"
108108
},
109109
"peerDependencies": {
110-
"@metamask/accounts-controller": "^31.0.0",
110+
"@metamask/accounts-controller": "^32.0.0",
111111
"@metamask/approval-controller": "^7.0.0",
112112
"@metamask/keyring-controller": "^22.0.0",
113113
"@metamask/network-controller": "^24.0.0",
@@ -116,7 +116,7 @@
116116
"@metamask/preferences-controller": "^18.0.0",
117117
"@metamask/providers": "^22.0.0",
118118
"@metamask/snaps-controllers": "^14.0.0",
119-
"@metamask/transaction-controller": "^58.0.0",
119+
"@metamask/transaction-controller": "^59.0.0",
120120
"webextension-polyfill": "^0.10.0 || ^0.11.0 || ^0.12.0"
121121
},
122122
"engines": {

‎packages/bridge-controller/CHANGELOG.md

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

88
## [Unreleased]
99

10+
## [37.0.0]
11+
12+
### Changed
13+
14+
- **BREAKING:** Bump peer dependency `@metamask/accounts-controller` from `^31.0.0` to `^32.0.0` ([#6171](https://github.com/MetaMask/core/pull/6171))
15+
- **BREAKING:** Bump peer dependency `@metamask/assets-controllers` from `^72.0.0` to `^73.0.0` ([#6171](https://github.com/MetaMask/core/pull/6171))
16+
- **BREAKING:** Bump peer dependency `@metamask/transaction-controller` from `^58.0.0` to `^59.0.0` ([#6171](https://github.com/MetaMask/core/pull/6171)), ([#6027](https://github.com/MetaMask/core/pull/6027))
17+
18+
## [36.2.0]
19+
1020
### Changed
1121

1222
- Bump `@metamask/keyring-api` from `^18.0.0` to `^19.0.0` ([#6146](https://github.com/MetaMask/core/pull/6146))
@@ -432,7 +442,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
432442

433443
- Initial release ([#5317](https://github.com/MetaMask/core/pull/5317))
434444

435-
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/bridge-controller@36.1.0...HEAD
445+
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/bridge-controller@37.0.0...HEAD
446+
[37.0.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-controller@36.2.0...@metamask/bridge-controller@37.0.0
447+
[36.2.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-controller@36.1.0...@metamask/bridge-controller@36.2.0
436448
[36.1.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-controller@36.0.0...@metamask/bridge-controller@36.1.0
437449
[36.0.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-controller@35.0.0...@metamask/bridge-controller@36.0.0
438450
[35.0.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-controller@34.0.0...@metamask/bridge-controller@35.0.0

‎packages/bridge-controller/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@metamask/bridge-controller",
3-
"version": "36.1.0",
3+
"version": "37.0.0",
44
"description": "Manages bridge-related quote fetching functionality for MetaMask",
55
"keywords": [
66
"MetaMask",
@@ -57,23 +57,23 @@
5757
"@metamask/gas-fee-controller": "^24.0.0",
5858
"@metamask/keyring-api": "^19.0.0",
5959
"@metamask/metamask-eth-abis": "^3.1.1",
60-
"@metamask/multichain-network-controller": "^0.10.0",
60+
"@metamask/multichain-network-controller": "^0.11.0",
6161
"@metamask/polling-controller": "^14.0.0",
6262
"@metamask/utils": "^11.4.2",
6363
"bignumber.js": "^9.1.2",
6464
"reselect": "^5.1.1",
6565
"uuid": "^8.3.2"
6666
},
6767
"devDependencies": {
68-
"@metamask/accounts-controller": "^31.0.0",
69-
"@metamask/assets-controllers": "^72.0.0",
68+
"@metamask/accounts-controller": "^32.0.0",
69+
"@metamask/assets-controllers": "^73.0.0",
7070
"@metamask/auto-changelog": "^3.4.4",
7171
"@metamask/eth-json-rpc-provider": "^4.1.8",
7272
"@metamask/network-controller": "^24.0.1",
7373
"@metamask/remote-feature-flag-controller": "^1.6.0",
7474
"@metamask/snaps-controllers": "^14.0.1",
7575
"@metamask/superstruct": "^3.1.0",
76-
"@metamask/transaction-controller": "^58.1.1",
76+
"@metamask/transaction-controller": "^59.0.0",
7777
"@types/jest": "^27.4.1",
7878
"deepmerge": "^4.2.2",
7979
"jest": "^27.5.1",
@@ -86,12 +86,12 @@
8686
"typescript": "~5.2.2"
8787
},
8888
"peerDependencies": {
89-
"@metamask/accounts-controller": "^31.0.0",
90-
"@metamask/assets-controllers": "^72.0.0",
89+
"@metamask/accounts-controller": "^32.0.0",
90+
"@metamask/assets-controllers": "^73.0.0",
9191
"@metamask/network-controller": "^24.0.0",
9292
"@metamask/remote-feature-flag-controller": "^1.6.0",
9393
"@metamask/snaps-controllers": "^14.0.0",
94-
"@metamask/transaction-controller": "^58.0.0"
94+
"@metamask/transaction-controller": "^59.0.0"
9595
},
9696
"engines": {
9797
"node": "^18.18 || >=20"

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

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

88
## [Unreleased]
99

10+
## [37.0.0]
11+
12+
### Changed
13+
14+
- **BREAKING:** Bump peer dependency `@metamask/accounts-controller` to `^32.0.0` ([#6171](https://github.com/MetaMask/core/pull/6171))
15+
- **BREAKING:** Bump peer dependency `@metamask/bridge-controller` to `^37.0.0` ([#6171](https://github.com/MetaMask/core/pull/6171))
16+
- **BREAKING:** Bump peer dependency `@metamask/transaction-controller` to `^59.0.0` ([#6171](https://github.com/MetaMask/core/pull/6171)), ([#6027](https://github.com/MetaMask/core/pull/6027))
17+
18+
## [36.1.0]
19+
20+
### Added
21+
22+
- Add `restartPollingForFailedAttempts` action to restart polling for txs that are not in a final state but have too many failed attempts ([#6149](https://github.com/MetaMask/core/pull/6149))
23+
1024
### Changed
1125

1226
- Bump `@metamask/keyring-api` from `^18.0.0` to `^19.0.0` ([#6146](https://github.com/MetaMask/core/pull/6146))
@@ -419,7 +433,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
419433

420434
- Initial release ([#5317](https://github.com/MetaMask/core/pull/5317))
421435

422-
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@36.0.0...HEAD
436+
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@37.0.0...HEAD
437+
[37.0.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@36.1.0...@metamask/bridge-status-controller@37.0.0
438+
[36.1.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@36.0.0...@metamask/bridge-status-controller@36.1.0
423439
[36.0.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@35.0.0...@metamask/bridge-status-controller@36.0.0
424440
[35.0.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@34.0.0...@metamask/bridge-status-controller@35.0.0
425441
[34.0.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@33.0.0...@metamask/bridge-status-controller@34.0.0

0 commit comments

Comments
 (0)