Merge branch 'main' into chore/make-networkClientId-mandatory-in-assets-contract-controller

Author: sahar-fehri

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/core-monorepo",
-  "version": "427.0.0",
+  "version": "430.0.0",
   "private": true,
   "description": "Monorepo for packages shared between MetaMask clients",
   "repository": {

packages/account-tree-controller/CHANGELOG.md

@@ -7,4 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-[Unreleased]: https://github.com/MetaMask/core/
+## [0.1.0]
+
+### Added
+
+- Initial release ([#5847](https://github.com/MetaMask/core/pull/5847))
+  - Grouping accounts into 3 main categories: Entropy source, Snap ID, keyring types.
+
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
+[0.1.0]: https://github.com/MetaMask/core/releases/tag/@metamask/[email protected]

packages/account-tree-controller/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/account-tree-controller",
-  "version": "0.0.0",
+  "version": "0.1.0",
   "description": "Controller to group account together based on some pre-defined rules",
   "keywords": [
     "MetaMask",
@@ -56,7 +56,7 @@
     "@metamask/accounts-controller": "^30.0.0",
     "@metamask/auto-changelog": "^3.4.4",
     "@metamask/keyring-api": "^18.0.0",
-    "@metamask/keyring-controller": "^22.0.1",
+    "@metamask/keyring-controller": "^22.0.2",
     "@metamask/providers": "^22.1.0",
     "@metamask/snaps-controllers": "^12.3.1",
     "@types/jest": "^27.4.1",

packages/accounts-controller/package.json

@@ -63,8 +63,8 @@
   },
   "devDependencies": {
     "@metamask/auto-changelog": "^3.4.4",
-    "@metamask/keyring-controller": "^22.0.1",
-    "@metamask/network-controller": "^23.5.1",
+    "@metamask/keyring-controller": "^22.0.2",
+    "@metamask/network-controller": "^23.6.0",
     "@metamask/providers": "^22.1.0",
     "@metamask/snaps-controllers": "^12.3.1",
     "@types/jest": "^27.4.1",

packages/address-book-controller/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Bump `@metamask/controller-utils` to `^11.10.0` ([#5935](https://github.com/MetaMask/core/pull/5935))
+
 ## [6.1.0]
 
 ### Added

packages/address-book-controller/package.json

@@ -48,7 +48,7 @@
   },
   "dependencies": {
     "@metamask/base-controller": "^8.0.1",
-    "@metamask/controller-utils": "^11.9.0",
+    "@metamask/controller-utils": "^11.10.0",
     "@metamask/utils": "^11.2.0"
   },
   "devDependencies": {

packages/assets-controllers/CHANGELOG.md

@@ -13,10 +13,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Removed `chainId` in constructor in `AssetsContractController`  ([#5941](https://github.com/MetaMask/core/pull/5941))
 - Make `networkClientId` mandatory field in all functions in  `AssetsContractController`  ([#5941](https://github.com/MetaMask/core/pull/5941))
 
+## [68.1.0]
+
 ### Added
 
 - Added Base Network for networks to track in `TokenDetectionController` ([#5902](https://github.com/MetaMask/core/pull/5902))
   - Network changes were added in `@metamask/controller-utils`
+- Added Metamask pooled staking token for Ethereum Hoodi testnet ([#5855](https://github.com/MetaMask/core/pull/5855))
+
+### Changed
+
+- Bump `@metamask/controller-utils` to `^11.10.0` ([#5935](https://github.com/MetaMask/core/pull/5935))
 
 ## [68.0.0]
 
@@ -1707,7 +1714,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Use Ethers for AssetsContractController ([#845](https://github.com/MetaMask/core/pull/845))
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
+[68.1.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [68.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [67.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [66.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]

packages/assets-controllers/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/assets-controllers",
-  "version": "68.0.0",
+  "version": "68.1.0",
   "description": "Controllers which manage interactions involving ERC-20, ERC-721, and ERC-1155 tokens (including NFTs)",
   "keywords": [
     "MetaMask",
@@ -56,7 +56,7 @@
     "@metamask/abi-utils": "^2.0.3",
     "@metamask/base-controller": "^8.0.1",
     "@metamask/contract-metadata": "^2.4.0",
-    "@metamask/controller-utils": "^11.9.0",
+    "@metamask/controller-utils": "^11.10.0",
     "@metamask/eth-query": "^4.0.0",
     "@metamask/keyring-api": "^18.0.0",
     "@metamask/metamask-eth-abis": "^3.1.1",
@@ -81,17 +81,17 @@
     "@metamask/approval-controller": "^7.1.3",
     "@metamask/auto-changelog": "^3.4.4",
     "@metamask/ethjs-provider-http": "^0.3.0",
-    "@metamask/keyring-controller": "^22.0.1",
+    "@metamask/keyring-controller": "^22.0.2",
     "@metamask/keyring-internal-api": "^6.2.0",
     "@metamask/keyring-snap-client": "^5.0.0",
-    "@metamask/network-controller": "^23.5.1",
+    "@metamask/network-controller": "^23.6.0",
     "@metamask/permission-controller": "^11.0.6",
     "@metamask/phishing-controller": "^12.5.0",
     "@metamask/preferences-controller": "^18.1.0",
     "@metamask/providers": "^22.1.0",
     "@metamask/snaps-controllers": "^12.3.1",
     "@metamask/snaps-sdk": "^7.1.0",
-    "@metamask/transaction-controller": "^57.1.0",
+    "@metamask/transaction-controller": "^57.2.0",
     "@types/jest": "^27.4.1",
     "@types/lodash": "^4.14.191",
     "@types/node": "^16.18.54",

packages/assets-controllers/src/AssetsContractController.ts

@@ -76,8 +76,8 @@ export const SINGLE_CALL_BALANCES_ADDRESS_BY_CHAINID = {
 export const STAKING_CONTRACT_ADDRESS_BY_CHAINID = {
   [SupportedStakedBalanceNetworks.mainnet]:
     '0x4fef9d741011476750a243ac70b9789a63dd47df',
-  [SupportedStakedBalanceNetworks.holesky]:
-    '0x37bf0883c27365cffcd0c4202918df930989891f',
+  [SupportedStakedBalanceNetworks.hoodi]:
+    '0xe96ac18cfe5a7af8fe1fe7bc37ff110d88bc67ff',
 } as const satisfies Record<Hex, string>;
 
 export const MISSING_PROVIDER_ERROR =
@@ -683,7 +683,7 @@ export class AssetsContractController {
     if (
       ![
         SupportedStakedBalanceNetworks.mainnet,
-        SupportedStakedBalanceNetworks.holesky,
+        SupportedStakedBalanceNetworks.hoodi,
       ].includes(chainId as SupportedStakedBalanceNetworks)
     ) {
       return undefined as StakedBalance;

packages/assets-controllers/src/assetsUtil.ts

@@ -200,7 +200,7 @@ export enum SupportedStakedBalanceNetworks {
   mainnet = '0x1', // decimal: 1
   // TODO: Either fix this lint violation or explain why it's necessary to ignore.
   // eslint-disable-next-line @typescript-eslint/naming-convention
-  holesky = '0x4268', // decimal: 17000
+  hoodi = '0x88bb0', // decimal: 560048
 }
 
 /**

packages/bridge-controller/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Bump `@metamask/controller-utils` to `^11.10.0` ([#5935](https://github.com/MetaMask/core/pull/5935))
+
 ## [32.1.1]
 
 ### Fixed

packages/bridge-controller/package.json

@@ -53,7 +53,7 @@
     "@ethersproject/contracts": "^5.7.0",
     "@ethersproject/providers": "^5.7.0",
     "@metamask/base-controller": "^8.0.1",
-    "@metamask/controller-utils": "^11.9.0",
+    "@metamask/controller-utils": "^11.10.0",
     "@metamask/gas-fee-controller": "^23.0.0",
     "@metamask/keyring-api": "^18.0.0",
     "@metamask/metamask-eth-abis": "^3.1.1",
@@ -66,14 +66,14 @@
   },
   "devDependencies": {
     "@metamask/accounts-controller": "^30.0.0",
-    "@metamask/assets-controllers": "^68.0.0",
+    "@metamask/assets-controllers": "^68.1.0",
     "@metamask/auto-changelog": "^3.4.4",
     "@metamask/eth-json-rpc-provider": "^4.1.8",
-    "@metamask/network-controller": "^23.5.1",
+    "@metamask/network-controller": "^23.6.0",
     "@metamask/remote-feature-flag-controller": "^1.6.0",
     "@metamask/snaps-controllers": "^12.3.1",
     "@metamask/superstruct": "^3.1.0",
-    "@metamask/transaction-controller": "^57.1.0",
+    "@metamask/transaction-controller": "^57.2.0",
     "@types/jest": "^27.4.1",
     "deepmerge": "^4.2.2",
     "jest": "^27.5.1",

packages/bridge-status-controller/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Bump `@metamask/controller-utils` to `^11.10.0` ([#5935](https://github.com/MetaMask/core/pull/5935))
+
 ## [29.1.0]
 
 ### Added

packages/bridge-status-controller/package.json

@@ -48,7 +48,7 @@
   },
   "dependencies": {
     "@metamask/base-controller": "^8.0.1",
-    "@metamask/controller-utils": "^11.9.0",
+    "@metamask/controller-utils": "^11.10.0",
     "@metamask/keyring-api": "^18.0.0",
     "@metamask/polling-controller": "^13.0.0",
     "@metamask/superstruct": "^3.1.0",
@@ -63,9 +63,9 @@
     "@metamask/bridge-controller": "^32.1.1",
     "@metamask/gas-fee-controller": "^23.0.0",
     "@metamask/multichain-transactions-controller": "^2.0.0",
-    "@metamask/network-controller": "^23.5.1",
+    "@metamask/network-controller": "^23.6.0",
     "@metamask/snaps-controllers": "^12.3.1",
-    "@metamask/transaction-controller": "^57.1.0",
+    "@metamask/transaction-controller": "^57.2.0",
     "@types/jest": "^27.4.1",
     "deepmerge": "^4.2.2",
     "jest": "^27.5.1",

packages/chain-agnostic-permission/CHANGELOG.md

@@ -9,7 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- Bump `@metamask/network-controller` to `^23.5.1` ([#5882](https://github.com/MetaMask/core/pull/5882))
+- Bump `@metamask/controller-utils` to `^11.10.0` ([#5935](https://github.com/MetaMask/core/pull/5935))
+- Bump `@metamask/network-controller` to `^23.6.0` ([#5935](https://github.com/MetaMask/core/pull/5935),[#5882](https://github.com/MetaMask/core/pull/5882))
 
 ## [0.7.0]
 

packages/chain-agnostic-permission/package.json

@@ -48,8 +48,8 @@
   },
   "dependencies": {
     "@metamask/api-specs": "^0.14.0",
-    "@metamask/controller-utils": "^11.9.0",
-    "@metamask/network-controller": "^23.5.1",
+    "@metamask/controller-utils": "^11.10.0",
+    "@metamask/network-controller": "^23.6.0",
     "@metamask/permission-controller": "^11.0.6",
     "@metamask/rpc-errors": "^7.0.2",
     "@metamask/utils": "^11.2.0",

packages/controller-utils/CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [11.10.0]
+
 ### Added
 
 - Add `TransactionBatch` in approval types enum ([#5793](https://github.com/MetaMask/core/pull/5793))
@@ -527,7 +529,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
     All changes listed after this point were applied to this package following the monorepo conversion.
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
+[11.10.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [11.9.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [11.8.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [11.7.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]

packages/controller-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/controller-utils",
-  "version": "11.9.0",
+  "version": "11.10.0",
   "description": "Data and convenience functions shared by multiple packages",
   "keywords": [
     "MetaMask",

packages/delegation-controller/package.json

@@ -53,7 +53,7 @@
   "devDependencies": {
     "@metamask/accounts-controller": "^30.0.0",
     "@metamask/auto-changelog": "^3.4.4",
-    "@metamask/keyring-controller": "^22.0.1",
+    "@metamask/keyring-controller": "^22.0.2",
     "@ts-bridge/cli": "^0.6.1",
     "@types/jest": "^27.4.1",
     "deepmerge": "^4.2.2",

packages/earn-controller/CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.1.0]
+
+### Changed
+
+- Replace hardcoded `"lendingWithdraw"` in `LendingTransactionTypes` with `TransactionType.lendingWithdraw` ([#5936](https://github.com/MetaMask/core/pull/5936))
+- Bump `@metamask/controller-utils` to `^11.10.0` ([#5935](https://github.com/MetaMask/core/pull/5935))
+
 ## [1.0.0]
 
 ### Added
@@ -189,7 +196,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial release ([#5271](https://github.com/MetaMask/core/pull/5271))
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
+[1.1.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [1.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [0.15.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [0.14.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]

packages/earn-controller/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/earn-controller",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Manages state for earning features and coordinates interactions between staking services, SDK integrations, and other controllers to enable users to participate in various earning opportunities",
   "keywords": [
     "MetaMask",
@@ -50,15 +50,15 @@
     "@ethersproject/bignumber": "^5.7.0",
     "@ethersproject/providers": "^5.7.0",
     "@metamask/base-controller": "^8.0.1",
-    "@metamask/controller-utils": "^11.9.0",
+    "@metamask/controller-utils": "^11.10.0",
     "@metamask/stake-sdk": "^3.2.0",
     "reselect": "^5.1.1"
   },
   "devDependencies": {
     "@metamask/accounts-controller": "^30.0.0",
     "@metamask/auto-changelog": "^3.4.4",
-    "@metamask/network-controller": "^23.5.1",
-    "@metamask/transaction-controller": "^57.1.0",
+    "@metamask/network-controller": "^23.6.0",
+    "@metamask/transaction-controller": "^57.2.0",
     "@types/jest": "^27.4.1",
     "deepmerge": "^4.2.2",
     "jest": "^27.5.1",

packages/earn-controller/src/EarnController.ts

@@ -98,11 +98,11 @@ const stakingTransactionTypes = new Set<StakingTransactionTypes>([
 
 type LendingTransactionTypes =
   | TransactionType.lendingDeposit
-  | 'lendingWithdraw';
+  | TransactionType.lendingWithdraw;
 
 const lendingTransactionTypes = new Set<LendingTransactionTypes>([
   TransactionType.lendingDeposit,
-  'lendingWithdraw',
+  TransactionType.lendingWithdraw,
 ]);
 
 /**

packages/eip1193-permission-middleware/CHANGELOG.md

@@ -10,7 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Bump `@metamask/chain-agnostic-permission` to `^0.7.0` ([#5518](https://github.com/MetaMask/core/pull/5518), [#5674](https://github.com/MetaMask/core/pull/5674), [#5818](https://github.com/MetaMask/core/pull/5818)[#5583](https://github.com/MetaMask/core/pull/5583))
-- Bump `@metamask/controller-utils` to `^11.9.0` ([#5583](https://github.com/MetaMask/core/pull/5583), [#5765](https://github.com/MetaMask/core/pull/5765), [#5812](https://github.com/MetaMask/core/pull/5812))
+- Bump `@metamask/controller-utils` to `^11.10.0` ([#5935](https://github.com/MetaMask/core/pull/5935), [#5583](https://github.com/MetaMask/core/pull/5583), [#5765](https://github.com/MetaMask/core/pull/5765), [#5812](https://github.com/MetaMask/core/pull/5812))
 
 ## [0.1.0]
 

packages/eip1193-permission-middleware/package.json

@@ -48,7 +48,7 @@
   },
   "dependencies": {
     "@metamask/chain-agnostic-permission": "^0.7.0",
-    "@metamask/controller-utils": "^11.9.0",
+    "@metamask/controller-utils": "^11.10.0",
     "@metamask/json-rpc-engine": "^10.0.3",
     "@metamask/permission-controller": "^11.0.6",
     "@metamask/utils": "^11.2.0",

packages/ens-controller/CHANGELOG.md

@@ -10,7 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Bump `@metamask/base-controller` from ^8.0.0 to ^8.0.1 ([#5722](https://github.com/MetaMask/core/pull/5722))
-- Bump `@metamask/controller-utils` to `^11.9.0` ([#5583](https://github.com/MetaMask/core/pull/5583), [#5765](https://github.com/MetaMask/core/pull/5765), [#5812](https://github.com/MetaMask/core/pull/5812))
+- Bump `@metamask/controller-utils` to `^11.10.0` ([#5935](https://github.com/MetaMask/core/pull/5935), [#5583](https://github.com/MetaMask/core/pull/5583), [#5765](https://github.com/MetaMask/core/pull/5765), [#5812](https://github.com/MetaMask/core/pull/5812))
 
 ## [16.0.0]
 

packages/ens-controller/package.json

@@ -49,13 +49,13 @@
   "dependencies": {
     "@ethersproject/providers": "^5.7.0",
     "@metamask/base-controller": "^8.0.1",
-    "@metamask/controller-utils": "^11.9.0",
+    "@metamask/controller-utils": "^11.10.0",
     "@metamask/utils": "^11.2.0",
     "punycode": "^2.1.1"
   },
   "devDependencies": {
     "@metamask/auto-changelog": "^3.4.4",
-    "@metamask/network-controller": "^23.5.1",
+    "@metamask/network-controller": "^23.6.0",
     "@types/jest": "^27.4.1",
     "deepmerge": "^4.2.2",
     "jest": "^27.5.1",