Skip to content

Commit ed9ece0

Browse files
Merge branch 'main' into cursor/notification-controller-eslint-cleanup-ba8d
2 parents 0717517 + cec1249 commit ed9ece0

File tree

69 files changed

+722
-638
lines changed

Some content is hidden

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

69 files changed

+722
-638
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
@@ -1798,33 +1587,6 @@
17981587
"count": 6
17991588
}
18001589
},
1801-
"packages/notification-services-controller/src/NotificationServicesController/processors/process-notifications.ts": {
1802-
"@typescript-eslint/explicit-function-return-type": {
1803-
"count": 2
1804-
},
1805-
"id-length": {
1806-
"count": 6
1807-
}
1808-
},
1809-
"packages/notification-services-controller/src/NotificationServicesController/services/api-notifications.ts": {
1810-
"@typescript-eslint/explicit-function-return-type": {
1811-
"count": 8
1812-
},
1813-
"id-denylist": {
1814-
"count": 1
1815-
},
1816-
"id-length": {
1817-
"count": 4
1818-
},
1819-
"no-param-reassign": {
1820-
"count": 2
1821-
}
1822-
},
1823-
"packages/notification-services-controller/src/NotificationServicesController/services/feature-announcements.test.ts": {
1824-
"@typescript-eslint/explicit-function-return-type": {
1825-
"count": 2
1826-
}
1827-
},
18281590
"packages/notification-services-controller/src/NotificationServicesController/services/feature-announcements.ts": {
18291591
"@typescript-eslint/explicit-function-return-type": {
18301592
"count": 2
@@ -1867,21 +1629,6 @@
18671629
"count": 70
18681630
}
18691631
},
1870-
"packages/notification-services-controller/src/NotificationServicesController/types/perps/schema.ts": {
1871-
"@typescript-eslint/naming-convention": {
1872-
"count": 9
1873-
}
1874-
},
1875-
"packages/notification-services-controller/src/NotificationServicesController/utils/isVersionInBounds.ts": {
1876-
"@typescript-eslint/explicit-function-return-type": {
1877-
"count": 1
1878-
}
1879-
},
1880-
"packages/notification-services-controller/src/NotificationServicesController/utils/should-auto-expire.ts": {
1881-
"@typescript-eslint/explicit-function-return-type": {
1882-
"count": 1
1883-
}
1884-
},
18851632
"packages/notification-services-controller/src/NotificationServicesPushController/NotificationServicesPushController.test.ts": {
18861633
"@typescript-eslint/explicit-function-return-type": {
18871634
"count": 4
@@ -1900,21 +1647,6 @@
19001647
"count": 1
19011648
}
19021649
},
1903-
"packages/notification-services-controller/src/NotificationServicesPushController/mocks/mockResponse.ts": {
1904-
"@typescript-eslint/explicit-function-return-type": {
1905-
"count": 3
1906-
}
1907-
},
1908-
"packages/notification-services-controller/src/NotificationServicesPushController/services/endpoints.ts": {
1909-
"@typescript-eslint/explicit-function-return-type": {
1910-
"count": 2
1911-
}
1912-
},
1913-
"packages/notification-services-controller/src/NotificationServicesPushController/services/services.test.ts": {
1914-
"@typescript-eslint/explicit-function-return-type": {
1915-
"count": 4
1916-
}
1917-
},
19181650
"packages/notification-services-controller/src/NotificationServicesPushController/services/services.ts": {
19191651
"@typescript-eslint/naming-convention": {
19201652
"count": 1
@@ -1963,40 +1695,6 @@
19631695
"count": 1
19641696
}
19651697
},
1966-
"packages/notification-services-controller/src/shared/to-raw-notification.ts": {
1967-
"@typescript-eslint/explicit-function-return-type": {
1968-
"count": 1
1969-
}
1970-
},
1971-
"packages/permission-log-controller/src/PermissionLogController.ts": {
1972-
"@typescript-eslint/explicit-function-return-type": {
1973-
"count": 4
1974-
},
1975-
"id-denylist": {
1976-
"count": 1
1977-
}
1978-
},
1979-
"packages/permission-log-controller/src/enums.ts": {
1980-
"@typescript-eslint/naming-convention": {
1981-
"count": 3
1982-
}
1983-
},
1984-
"packages/permission-log-controller/tests/PermissionLogController.test.ts": {
1985-
"@typescript-eslint/explicit-function-return-type": {
1986-
"count": 2
1987-
},
1988-
"id-length": {
1989-
"count": 2
1990-
}
1991-
},
1992-
"packages/permission-log-controller/tests/helpers.ts": {
1993-
"@typescript-eslint/explicit-function-return-type": {
1994-
"count": 7
1995-
},
1996-
"@typescript-eslint/naming-convention": {
1997-
"count": 10
1998-
}
1999-
},
20001698
"packages/phishing-controller/src/BulkTokenScan.test.ts": {
20011699
"@typescript-eslint/explicit-function-return-type": {
20021700
"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: 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+
## [94.1.0]
11+
1012
### Added
1113

1214
- 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))
@@ -2437,7 +2439,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
24372439
24382440
- Use Ethers for AssetsContractController ([#845](https://github.com/MetaMask/core/pull/845))
24392441
2440-
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
2442+
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
2443+
[94.1.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
24412444
[94.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
24422445
[93.1.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
24432446
[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)