Skip to content

Commit 6670c5b

Browse files
authored
Merge branch 'main' into feature/core-backend-platform
2 parents 945efcb + 6e97eef commit 6670c5b

File tree

8 files changed

+24
-10
lines changed

8 files changed

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

packages/assets-controllers/CHANGELOG.md

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

88
## [Unreleased]
99

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

1214
- Bump `@metamask/multichain-account-service` from `^1.5.0` to `^1.6.0` ([#6786](https://github.com/MetaMask/core/pull/6786))
1315

16+
### Fixed
17+
18+
- Fix duplicate native token entries in `AccountsApiBalanceFetcher` by ensuring consistent address checksumming ([#6794](https://github.com/MetaMask/core/pull/6794))
19+
1420
## [78.0.0]
1521

1622
### Added
@@ -2067,7 +2073,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
20672073
20682074
- Use Ethers for AssetsContractController ([#845](https://github.com/MetaMask/core/pull/845))
20692075
2070-
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@78.0.0...HEAD
2076+
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@78.0.1...HEAD
2077+
[78.0.1]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@78.0.0...@metamask/assets-controllers@78.0.1
20712078
[78.0.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@77.0.2...@metamask/assets-controllers@78.0.0
20722079
[77.0.2]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@77.0.1...@metamask/assets-controllers@77.0.2
20732080
[77.0.1]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@77.0.0...@metamask/assets-controllers@77.0.1

packages/assets-controllers/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@metamask/assets-controllers",
3-
"version": "78.0.0",
3+
"version": "78.0.1",
44
"description": "Controllers which manage interactions involving ERC-20, ERC-721, and ERC-1155 tokens (including NFTs)",
55
"keywords": [
66
"MetaMask",

packages/assets-controllers/src/multi-chain-accounts-service/api-balance-fetcher.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,10 +296,11 @@ export class AccountsApiBalanceFetcher implements BalanceFetcher {
296296
// Process regular API balances
297297
if (balances) {
298298
const apiBalances = balances.flatMap((b) => {
299-
const account = b.accountAddress?.split(':')[2] as ChecksumAddress;
300-
if (!account) {
299+
const addressPart = b.accountAddress?.split(':')[2];
300+
if (!addressPart) {
301301
return [];
302302
}
303+
const account = checksum(addressPart);
303304
const token = checksum(b.address);
304305
const chainId = toHex(b.chainId) as ChainIdHex;
305306

packages/bridge-controller/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
},
6767
"devDependencies": {
6868
"@metamask/accounts-controller": "^33.1.0",
69-
"@metamask/assets-controllers": "^78.0.0",
69+
"@metamask/assets-controllers": "^78.0.1",
7070
"@metamask/auto-changelog": "^3.4.4",
7171
"@metamask/eth-json-rpc-provider": "^5.0.0",
7272
"@metamask/network-controller": "^24.2.0",

packages/subscription-controller/CHANGELOG.md

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

88
## [Unreleased]
99

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

1214
- Added new public method, `getSubscriptionByProduct` which accepts `product` name as parameter and return the relevant subscription. ([#6770](https://github.com/MetaMask/core/pull/6770))
1315

1416
### Changed
1517

18+
- Updated controller exports. ([#6785](https://github.com/MetaMask/core/pull/6785))
19+
- PaymentMethod types (`CryptoPaymentMethodError`, `UpdatePaymentMethodCryptoRequest`, `UpdatePaymentMethodCardRequest`, `UpdatePaymentMethodCardResponse`).
20+
- PaymentMethod error constants, `CRYPTO_PAYMENT_METHOD_ERRORS`.
1621
- **BREAKING**: The `SubscriptionController` now extends `StaticIntervalPollingController`, and the new polling API `startPolling` must be used to initiate polling (`startPolling`, `stopPollingByPollingToken`). ([#6770](https://github.com/MetaMask/core/pull/6770))
1722
- **BREAKING**: The `SubscriptionController` now accepts an optional `pollingInterval` property in the constructor argument, to enable the configurable polling interval. ([#6770](https://github.com/MetaMask/core/pull/6770))
1823
- Prevent unnecessary state updates to avoid emitting `:stateChange` in `getSubscriptions` method. ([#6770](https://github.com/MetaMask/core/pull/6770))
@@ -69,7 +74,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
6974
- Bump `@metamask/controller-utils` from `^11.12.0` to `^11.14.0` ([#6620](https://github.com/MetaMask/core/pull/6620), [#6629](https://github.com/MetaMask/core/pull/6629))
7075
- Bump `@metamask/utils` from `^11.4.2` to `^11.8.0` ([#6588](https://github.com/MetaMask/core/pull/6588))
7176

72-
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/subscription-controller@0.5.0...HEAD
77+
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/subscription-controller@1.0.0...HEAD
78+
[1.0.0]: https://github.com/MetaMask/core/compare/@metamask/subscription-controller@0.5.0...@metamask/subscription-controller@1.0.0
7379
[0.5.0]: https://github.com/MetaMask/core/compare/@metamask/subscription-controller@0.4.0...@metamask/subscription-controller@0.5.0
7480
[0.4.0]: https://github.com/MetaMask/core/compare/@metamask/subscription-controller@0.3.0...@metamask/subscription-controller@0.4.0
7581
[0.3.0]: https://github.com/MetaMask/core/compare/@metamask/subscription-controller@0.2.0...@metamask/subscription-controller@0.3.0

packages/subscription-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/subscription-controller",
3-
"version": "0.5.0",
3+
"version": "1.0.0",
44
"description": "Handle user subscription",
55
"keywords": [
66
"MetaMask",

yarn.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2574,7 +2574,7 @@ __metadata:
25742574
languageName: unknown
25752575
linkType: soft
25762576

2577-
"@metamask/assets-controllers@npm:^78.0.0, @metamask/assets-controllers@workspace:packages/assets-controllers":
2577+
"@metamask/assets-controllers@npm:^78.0.1, @metamask/assets-controllers@workspace:packages/assets-controllers":
25782578
version: 0.0.0-use.local
25792579
resolution: "@metamask/assets-controllers@workspace:packages/assets-controllers"
25802580
dependencies:
@@ -2733,7 +2733,7 @@ __metadata:
27332733
"@ethersproject/contracts": "npm:^5.7.0"
27342734
"@ethersproject/providers": "npm:^5.7.0"
27352735
"@metamask/accounts-controller": "npm:^33.1.0"
2736-
"@metamask/assets-controllers": "npm:^78.0.0"
2736+
"@metamask/assets-controllers": "npm:^78.0.1"
27372737
"@metamask/auto-changelog": "npm:^3.4.4"
27382738
"@metamask/base-controller": "npm:^8.4.0"
27392739
"@metamask/controller-utils": "npm:^11.14.0"

0 commit comments

Comments
 (0)