Skip to content

Commit 010ce45

Browse files
Merge branch 'main' into cursor/notification-controller-eslint-cleanup-27b8
2 parents 0458bc9 + 1bd1048 commit 010ce45

File tree

71 files changed

+731
-640
lines changed

Some content is hidden

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

71 files changed

+731
-640
lines changed

eslint-suppressions.json

Lines changed: 0 additions & 302 deletions
Original file line numberDiff line numberDiff line change
@@ -910,39 +910,6 @@
910910
"count": 2
911911
}
912912
},
913-
"packages/core-backend/src/AccountActivityService.test.ts": {
914-
"@typescript-eslint/explicit-function-return-type": {
915-
"count": 4
916-
}
917-
},
918-
"packages/core-backend/src/BackendWebSocketService.test.ts": {
919-
"@typescript-eslint/explicit-function-return-type": {
920-
"count": 10
921-
},
922-
"@typescript-eslint/naming-convention": {
923-
"count": 4
924-
},
925-
"no-restricted-globals": {
926-
"count": 1
927-
},
928-
"no-restricted-syntax": {
929-
"count": 4
930-
}
931-
},
932-
"packages/core-backend/src/BackendWebSocketService.ts": {
933-
"@typescript-eslint/explicit-function-return-type": {
934-
"count": 4
935-
},
936-
"@typescript-eslint/naming-convention": {
937-
"count": 2
938-
},
939-
"camelcase": {
940-
"count": 3
941-
},
942-
"no-restricted-globals": {
943-
"count": 1
944-
}
945-
},
946913
"packages/delegation-controller/src/DelegationController.test.ts": {
947914
"@typescript-eslint/explicit-function-return-type": {
948915
"count": 3
@@ -1039,31 +1006,6 @@
10391006
"count": 1
10401007
}
10411008
},
1042-
"packages/eip-7702-internal-rpc-middleware/src/utils.ts": {
1043-
"id-length": {
1044-
"count": 1
1045-
}
1046-
},
1047-
"packages/eip-7702-internal-rpc-middleware/src/wallet_getAccountUpgradeStatus.test.ts": {
1048-
"@typescript-eslint/explicit-function-return-type": {
1049-
"count": 1
1050-
}
1051-
},
1052-
"packages/eip-7702-internal-rpc-middleware/src/wallet_getAccountUpgradeStatus.ts": {
1053-
"no-negated-condition": {
1054-
"count": 1
1055-
}
1056-
},
1057-
"packages/eip-7702-internal-rpc-middleware/src/wallet_upgradeAccount.test.ts": {
1058-
"@typescript-eslint/explicit-function-return-type": {
1059-
"count": 1
1060-
}
1061-
},
1062-
"packages/eip-7702-internal-rpc-middleware/src/wallet_upgradeAccount.ts": {
1063-
"no-negated-condition": {
1064-
"count": 1
1065-
}
1066-
},
10671009
"packages/eip1193-permission-middleware/src/wallet-getPermissions.test.ts": {
10681010
"@typescript-eslint/explicit-function-return-type": {
10691011
"count": 2
@@ -1110,144 +1052,6 @@
11101052
"count": 6
11111053
}
11121054
},
1113-
"packages/error-reporting-service/src/error-reporting-service.test.ts": {
1114-
"@typescript-eslint/explicit-function-return-type": {
1115-
"count": 1
1116-
},
1117-
"no-new": {
1118-
"count": 1
1119-
}
1120-
},
1121-
"packages/eth-json-rpc-middleware/src/block-cache.test.ts": {
1122-
"@typescript-eslint/explicit-function-return-type": {
1123-
"count": 20
1124-
}
1125-
},
1126-
"packages/eth-json-rpc-middleware/src/block-cache.ts": {
1127-
"id-denylist": {
1128-
"count": 4
1129-
}
1130-
},
1131-
"packages/eth-json-rpc-middleware/src/block-ref-rewrite.test.ts": {
1132-
"@typescript-eslint/explicit-function-return-type": {
1133-
"count": 3
1134-
}
1135-
},
1136-
"packages/eth-json-rpc-middleware/src/block-tracker-inspector.test.ts": {
1137-
"@typescript-eslint/explicit-function-return-type": {
1138-
"count": 10
1139-
}
1140-
},
1141-
"packages/eth-json-rpc-middleware/src/fetch.test.ts": {
1142-
"@typescript-eslint/explicit-function-return-type": {
1143-
"count": 1
1144-
}
1145-
},
1146-
"packages/eth-json-rpc-middleware/src/inflight-cache.test.ts": {
1147-
"@typescript-eslint/explicit-function-return-type": {
1148-
"count": 1
1149-
}
1150-
},
1151-
"packages/eth-json-rpc-middleware/src/inflight-cache.ts": {
1152-
"@typescript-eslint/explicit-function-return-type": {
1153-
"count": 2
1154-
}
1155-
},
1156-
"packages/eth-json-rpc-middleware/src/methods/wallet-request-execution-permissions.test.ts": {
1157-
"@typescript-eslint/explicit-function-return-type": {
1158-
"count": 1
1159-
}
1160-
},
1161-
"packages/eth-json-rpc-middleware/src/methods/wallet-revoke-execution-permission.test.ts": {
1162-
"@typescript-eslint/explicit-function-return-type": {
1163-
"count": 1
1164-
}
1165-
},
1166-
"packages/eth-json-rpc-middleware/src/retryOnEmpty.test.ts": {
1167-
"@typescript-eslint/explicit-function-return-type": {
1168-
"count": 3
1169-
},
1170-
"@typescript-eslint/naming-convention": {
1171-
"count": 4
1172-
}
1173-
},
1174-
"packages/eth-json-rpc-middleware/src/retryOnEmpty.ts": {
1175-
"@typescript-eslint/prefer-nullish-coalescing": {
1176-
"count": 1
1177-
},
1178-
"id-denylist": {
1179-
"count": 2
1180-
}
1181-
},
1182-
"packages/eth-json-rpc-middleware/src/utils/common.ts": {
1183-
"@typescript-eslint/explicit-function-return-type": {
1184-
"count": 1
1185-
}
1186-
},
1187-
"packages/eth-json-rpc-middleware/src/utils/normalize.test.ts": {
1188-
"@typescript-eslint/explicit-function-return-type": {
1189-
"count": 1
1190-
}
1191-
},
1192-
"packages/eth-json-rpc-middleware/src/utils/normalize.ts": {
1193-
"@typescript-eslint/explicit-function-return-type": {
1194-
"count": 2
1195-
}
1196-
},
1197-
"packages/eth-json-rpc-middleware/src/utils/timeout.test.ts": {
1198-
"@typescript-eslint/explicit-function-return-type": {
1199-
"count": 4
1200-
}
1201-
},
1202-
"packages/eth-json-rpc-middleware/src/utils/validation.test.ts": {
1203-
"@typescript-eslint/explicit-function-return-type": {
1204-
"count": 1
1205-
}
1206-
},
1207-
"packages/eth-json-rpc-middleware/src/utils/validation.ts": {
1208-
"id-length": {
1209-
"count": 1
1210-
}
1211-
},
1212-
"packages/eth-json-rpc-middleware/src/wallet.test.ts": {
1213-
"@typescript-eslint/explicit-function-return-type": {
1214-
"count": 52
1215-
}
1216-
},
1217-
"packages/eth-json-rpc-middleware/src/wallet.ts": {
1218-
"@typescript-eslint/explicit-function-return-type": {
1219-
"count": 2
1220-
},
1221-
"@typescript-eslint/prefer-nullish-coalescing": {
1222-
"count": 5
1223-
}
1224-
},
1225-
"packages/eth-json-rpc-middleware/test/setupAfterEnv.ts": {
1226-
"@typescript-eslint/explicit-function-return-type": {
1227-
"count": 2
1228-
},
1229-
"id-length": {
1230-
"count": 1
1231-
}
1232-
},
1233-
"packages/eth-json-rpc-middleware/test/util/helpers.ts": {
1234-
"@typescript-eslint/explicit-function-return-type": {
1235-
"count": 3
1236-
},
1237-
"@typescript-eslint/prefer-nullish-coalescing": {
1238-
"count": 1
1239-
}
1240-
},
1241-
"packages/eth-json-rpc-provider/src/internal-provider.test.ts": {
1242-
"@typescript-eslint/explicit-function-return-type": {
1243-
"count": 3
1244-
}
1245-
},
1246-
"packages/eth-json-rpc-provider/src/internal-provider.ts": {
1247-
"@typescript-eslint/explicit-function-return-type": {
1248-
"count": 2
1249-
}
1250-
},
12511055
"packages/foundryup/src/cli.ts": {
12521056
"no-restricted-globals": {
12531057
"count": 1
@@ -1648,21 +1452,6 @@
16481452
"count": 4
16491453
}
16501454
},
1651-
"packages/multichain-network-controller/src/MultichainNetworkController/MultichainNetworkController.test.ts": {
1652-
"@typescript-eslint/explicit-function-return-type": {
1653-
"count": 2
1654-
}
1655-
},
1656-
"packages/multichain-network-controller/src/MultichainNetworkController/MultichainNetworkController.ts": {
1657-
"@typescript-eslint/explicit-function-return-type": {
1658-
"count": 3
1659-
}
1660-
},
1661-
"packages/multichain-network-controller/src/utils.ts": {
1662-
"@typescript-eslint/prefer-nullish-coalescing": {
1663-
"count": 1
1664-
}
1665-
},
16661455
"packages/multichain-transactions-controller/src/MultichainTransactionsController.test.ts": {
16671456
"jest/unbound-method": {
16681457
"count": 1
@@ -1813,33 +1602,6 @@
18131602
"count": 1
18141603
}
18151604
},
1816-
"packages/notification-services-controller/src/NotificationServicesController/processors/process-notifications.ts": {
1817-
"@typescript-eslint/explicit-function-return-type": {
1818-
"count": 2
1819-
},
1820-
"id-length": {
1821-
"count": 6
1822-
}
1823-
},
1824-
"packages/notification-services-controller/src/NotificationServicesController/services/api-notifications.ts": {
1825-
"@typescript-eslint/explicit-function-return-type": {
1826-
"count": 8
1827-
},
1828-
"id-denylist": {
1829-
"count": 1
1830-
},
1831-
"id-length": {
1832-
"count": 4
1833-
},
1834-
"no-param-reassign": {
1835-
"count": 2
1836-
}
1837-
},
1838-
"packages/notification-services-controller/src/NotificationServicesController/services/feature-announcements.test.ts": {
1839-
"@typescript-eslint/explicit-function-return-type": {
1840-
"count": 2
1841-
}
1842-
},
18431605
"packages/notification-services-controller/src/NotificationServicesController/services/feature-announcements.ts": {
18441606
"@typescript-eslint/explicit-function-return-type": {
18451607
"count": 2
@@ -1882,21 +1644,6 @@
18821644
"count": 70
18831645
}
18841646
},
1885-
"packages/notification-services-controller/src/NotificationServicesController/types/perps/schema.ts": {
1886-
"@typescript-eslint/naming-convention": {
1887-
"count": 9
1888-
}
1889-
},
1890-
"packages/notification-services-controller/src/NotificationServicesController/utils/isVersionInBounds.ts": {
1891-
"@typescript-eslint/explicit-function-return-type": {
1892-
"count": 1
1893-
}
1894-
},
1895-
"packages/notification-services-controller/src/NotificationServicesController/utils/should-auto-expire.ts": {
1896-
"@typescript-eslint/explicit-function-return-type": {
1897-
"count": 1
1898-
}
1899-
},
19001647
"packages/notification-services-controller/src/NotificationServicesPushController/NotificationServicesPushController.test.ts": {
19011648
"@typescript-eslint/explicit-function-return-type": {
19021649
"count": 4
@@ -1915,21 +1662,6 @@
19151662
"count": 1
19161663
}
19171664
},
1918-
"packages/notification-services-controller/src/NotificationServicesPushController/mocks/mockResponse.ts": {
1919-
"@typescript-eslint/explicit-function-return-type": {
1920-
"count": 3
1921-
}
1922-
},
1923-
"packages/notification-services-controller/src/NotificationServicesPushController/services/endpoints.ts": {
1924-
"@typescript-eslint/explicit-function-return-type": {
1925-
"count": 2
1926-
}
1927-
},
1928-
"packages/notification-services-controller/src/NotificationServicesPushController/services/services.test.ts": {
1929-
"@typescript-eslint/explicit-function-return-type": {
1930-
"count": 4
1931-
}
1932-
},
19331665
"packages/notification-services-controller/src/NotificationServicesPushController/web/push-utils.test.ts": {
19341666
"@typescript-eslint/explicit-function-return-type": {
19351667
"count": 10
@@ -1951,40 +1683,6 @@
19511683
"count": 1
19521684
}
19531685
},
1954-
"packages/notification-services-controller/src/shared/to-raw-notification.ts": {
1955-
"@typescript-eslint/explicit-function-return-type": {
1956-
"count": 1
1957-
}
1958-
},
1959-
"packages/permission-log-controller/src/PermissionLogController.ts": {
1960-
"@typescript-eslint/explicit-function-return-type": {
1961-
"count": 4
1962-
},
1963-
"id-denylist": {
1964-
"count": 1
1965-
}
1966-
},
1967-
"packages/permission-log-controller/src/enums.ts": {
1968-
"@typescript-eslint/naming-convention": {
1969-
"count": 3
1970-
}
1971-
},
1972-
"packages/permission-log-controller/tests/PermissionLogController.test.ts": {
1973-
"@typescript-eslint/explicit-function-return-type": {
1974-
"count": 2
1975-
},
1976-
"id-length": {
1977-
"count": 2
1978-
}
1979-
},
1980-
"packages/permission-log-controller/tests/helpers.ts": {
1981-
"@typescript-eslint/explicit-function-return-type": {
1982-
"count": 7
1983-
},
1984-
"@typescript-eslint/naming-convention": {
1985-
"count": 10
1986-
}
1987-
},
19881686
"packages/phishing-controller/src/BulkTokenScan.test.ts": {
19891687
"@typescript-eslint/explicit-function-return-type": {
19901688
"count": 2

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": "722.0.0",
3+
"version": "723.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
@@ -9,6 +9,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
### Added
1111

12+
- Export `selectAllAssets` ([#7496](https://github.com/MetaMask/core/pull/7496))
13+
14+
## [94.1.0]
15+
16+
### Added
17+
1218
- Add `excludeLabels` parameter to `getTrendingTokens` to filter out tokens by labels (e.g., 'stable_coin', 'blue_chip') ([#7466](https://github.com/MetaMask/core/pull/7466))
1319
- Add support for spot prices on multiple new chains: Apechain, Lens, Plume, Flow EVM, Berachain, xrpl-evm, Fraxtal, Lukso, xdc-network, and Plasma ([#7465](https://github.com/MetaMask/core/pull/7465))
1420
- Add `ape` to `SUPPORTED_CURRENCIES` for ApeCoin/Apechain native token ([#7465](https://github.com/MetaMask/core/pull/7465))
@@ -2437,7 +2443,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
24372443
24382444
- Use Ethers for AssetsContractController ([#845](https://github.com/MetaMask/core/pull/845))
24392445
2440-
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
2446+
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
2447+
[94.1.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
24412448
[94.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
24422449
[93.1.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
24432450
[93.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]

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": "94.0.0",
3+
"version": "94.1.0",
44
"description": "Controllers which manage interactions involving ERC-20, ERC-721, and ERC-1155 tokens (including NFTs)",
55
"keywords": [
66
"MetaMask",

0 commit comments

Comments
 (0)