Skip to content

Commit 6548b44

Browse files
bfullambfullam
committed
Merge branch 'main' into swaps3309-noFee-to-fee
2 parents 596b8ea + 584a249 commit 6548b44

File tree

198 files changed

+7093
-2458
lines changed

Some content is hidden

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

198 files changed

+7093
-2458
lines changed

‎.github/CODEOWNERS‎

Lines changed: 172 additions & 183 deletions
Large diffs are not rendered by default.

‎.github/workflows/changelog-check.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@ name: Check Changelog
33
on:
44
pull_request:
55
types: [opened, synchronize, labeled, unlabeled]
6-
merge_group:
76

87
jobs:
98
check_changelog:
10-
if: github.event_name != 'merge_group'
119
uses: MetaMask/github-tools/.github/workflows/changelog-check.yml@fc6fe1a3fb591f6afa61f0dbbe7698bd50fab9c7
1210
with:
1311
action-sha: fc6fe1a3fb591f6afa61f0dbbe7698bd50fab9c7

‎.github/workflows/ensure-blocking-pr-labels-absent.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@ on:
66
- synchronize
77
- labeled
88
- unlabeled
9-
merge_group:
109

1110
jobs:
1211
ensure-blocking-pr-labels-absent:
13-
if: github.event_name != 'merge_group'
1412
runs-on: ubuntu-latest
1513
permissions:
1614
pull-requests: read

‎.github/workflows/main.yml‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
push:
55
branches: [main]
66
pull_request:
7-
merge_group:
87

98
concurrency:
109
group: ${{ github.workflow }}-${{ github.ref }}
@@ -24,17 +23,17 @@ jobs:
2423
run: ${{ steps.download-actionlint.outputs.executable }} -color
2524
shell: bash
2625

27-
# analyse-code:
28-
# name: Code scanner
29-
# needs: check-workflows
30-
# uses: ./.github/workflows/security-code-scanner.yml
31-
# permissions:
32-
# actions: read
33-
# contents: read
34-
# security-events: write
35-
# secrets:
36-
# SECURITY_SCAN_METRICS_TOKEN: ${{ secrets.SECURITY_SCAN_METRICS_TOKEN }}
37-
# APPSEC_BOT_SLACK_WEBHOOK: ${{ secrets.APPSEC_BOT_SLACK_WEBHOOK }}
26+
analyse-code:
27+
name: Code scanner
28+
needs: check-workflows
29+
uses: ./.github/workflows/security-code-scanner.yml
30+
permissions:
31+
actions: read
32+
contents: read
33+
security-events: write
34+
secrets:
35+
SECURITY_SCAN_METRICS_TOKEN: ${{ secrets.SECURITY_SCAN_METRICS_TOKEN }}
36+
APPSEC_BOT_SLACK_WEBHOOK: ${{ secrets.APPSEC_BOT_SLACK_WEBHOOK }}
3837

3938
lint-build-test:
4039
name: Lint, build, and test
@@ -77,7 +76,7 @@ jobs:
7776
name: All jobs complete
7877
runs-on: ubuntu-latest
7978
needs:
80-
# - analyse-code
79+
- analyse-code
8180
- lint-build-test
8281
outputs:
8382
passed: ${{ steps.set-output.outputs.passed }}

‎.nvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v24.7.0
1+
lts/*

‎eslint-warning-thresholds.json‎

Lines changed: 7 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,8 @@
1515
"no-shadow": 2
1616
},
1717
"packages/assets-controllers/src/CurrencyRateController.test.ts": {
18-
"import-x/order": 1,
1918
"jest/no-conditional-in-test": 1
2019
},
21-
"packages/assets-controllers/src/CurrencyRateController.ts": {
22-
"jsdoc/check-tag-names": 6
23-
},
2420
"packages/assets-controllers/src/NftController.test.ts": {
2521
"import-x/namespace": 9,
2622
"jest/no-conditional-in-test": 6
@@ -59,9 +55,6 @@
5955
"import-x/order": 2,
6056
"jest/no-conditional-in-test": 2
6157
},
62-
"packages/assets-controllers/src/TokenRatesController.test.ts": {
63-
"import-x/order": 3
64-
},
6558
"packages/assets-controllers/src/TokenRatesController.ts": {
6659
"@typescript-eslint/prefer-readonly": 1,
6760
"jsdoc/check-tag-names": 11
@@ -86,9 +79,6 @@
8679
"packages/assets-controllers/src/multicall.test.ts": {
8780
"@typescript-eslint/prefer-promise-reject-errors": 2
8881
},
89-
"packages/assets-controllers/src/token-prices-service/codefi-v2.test.ts": {
90-
"jsdoc/require-returns": 1
91-
},
9282
"packages/assets-controllers/src/token-prices-service/codefi-v2.ts": {
9383
"jsdoc/tag-lines": 2
9484
},
@@ -163,65 +153,48 @@
163153
"packages/eth-block-tracker/tests/withBlockTracker.ts": {
164154
"@typescript-eslint/no-explicit-any": 1
165155
},
166-
"packages/eth-json-rpc-middleware/src/block-cache.test.ts": {
167-
"jsdoc/require-jsdoc": 1
168-
},
169156
"packages/eth-json-rpc-middleware/src/block-cache.ts": {
170157
"@typescript-eslint/no-explicit-any": 1,
171158
"jsdoc/require-jsdoc": 1,
172159
"no-restricted-syntax": 1
173160
},
174161
"packages/eth-json-rpc-middleware/src/block-ref-rewrite.ts": {
175-
"jsdoc/require-jsdoc": 1
162+
"jsdoc/match-description": 1
176163
},
177164
"packages/eth-json-rpc-middleware/src/block-ref.test.ts": {
178-
"@typescript-eslint/no-explicit-any": 4,
179-
"jest/expect-expect": 2,
180-
"jsdoc/match-description": 1
165+
"jest/expect-expect": 2
181166
},
182167
"packages/eth-json-rpc-middleware/src/block-ref.ts": {
183168
"jsdoc/require-jsdoc": 1
184169
},
185170
"packages/eth-json-rpc-middleware/src/block-tracker-inspector.ts": {
186-
"@typescript-eslint/no-explicit-any": 1,
187171
"jsdoc/match-description": 1,
188-
"jsdoc/require-jsdoc": 2
172+
"jsdoc/require-jsdoc": 1
189173
},
190174
"packages/eth-json-rpc-middleware/src/fetch.test.ts": {
191175
"jsdoc/match-description": 1
192176
},
193177
"packages/eth-json-rpc-middleware/src/fetch.ts": {
194178
"jsdoc/match-description": 1
195179
},
196-
"packages/eth-json-rpc-middleware/src/inflight-cache.test.ts": {
197-
"jsdoc/require-jsdoc": 1
198-
},
199180
"packages/eth-json-rpc-middleware/src/inflight-cache.ts": {
200181
"@typescript-eslint/no-explicit-any": 1,
201182
"jsdoc/require-jsdoc": 4
202183
},
203-
"packages/eth-json-rpc-middleware/src/methods/wallet-request-execution-permissions.test.ts": {
204-
"jsdoc/require-jsdoc": 1
205-
},
206184
"packages/eth-json-rpc-middleware/src/methods/wallet-request-execution-permissions.ts": {
207185
"jsdoc/require-jsdoc": 1
208186
},
209-
"packages/eth-json-rpc-middleware/src/methods/wallet-revoke-execution-permission.test.ts": {
210-
"jsdoc/require-jsdoc": 1
211-
},
212187
"packages/eth-json-rpc-middleware/src/methods/wallet-revoke-execution-permission.ts": {
213188
"jsdoc/require-jsdoc": 1
214189
},
215190
"packages/eth-json-rpc-middleware/src/providerAsMiddleware.ts": {
216191
"jsdoc/require-jsdoc": 1
217192
},
218193
"packages/eth-json-rpc-middleware/src/retryOnEmpty.test.ts": {
219-
"@typescript-eslint/no-explicit-any": 4,
220-
"jest/expect-expect": 5,
221-
"jsdoc/match-description": 4
194+
"jsdoc/match-description": 3
222195
},
223196
"packages/eth-json-rpc-middleware/src/retryOnEmpty.ts": {
224-
"jsdoc/require-jsdoc": 2
197+
"jsdoc/match-description": 2
225198
},
226199
"packages/eth-json-rpc-middleware/src/utils/cache.ts": {
227200
"jsdoc/match-description": 6
@@ -232,9 +205,6 @@
232205
"packages/eth-json-rpc-middleware/src/utils/error.ts": {
233206
"jsdoc/require-jsdoc": 1
234207
},
235-
"packages/eth-json-rpc-middleware/src/utils/normalize.test.ts": {
236-
"jsdoc/require-jsdoc": 1
237-
},
238208
"packages/eth-json-rpc-middleware/src/utils/normalize.ts": {
239209
"jsdoc/match-description": 3
240210
},
@@ -244,9 +214,6 @@
244214
"packages/eth-json-rpc-middleware/src/utils/validation.ts": {
245215
"jsdoc/require-jsdoc": 4
246216
},
247-
"packages/eth-json-rpc-middleware/src/wallet.test.ts": {
248-
"jsdoc/require-jsdoc": 1
249-
},
250217
"packages/eth-json-rpc-middleware/src/wallet.ts": {
251218
"@typescript-eslint/no-explicit-any": 2,
252219
"@typescript-eslint/prefer-nullish-coalescing": 5,
@@ -257,12 +224,9 @@
257224
"@typescript-eslint/no-explicit-any": 3,
258225
"jsdoc/match-description": 2
259226
},
260-
"packages/eth-json-rpc-middleware/test/util/createHitTrackerMiddleware.ts": {
261-
"jsdoc/require-jsdoc": 1
262-
},
263227
"packages/eth-json-rpc-middleware/test/util/helpers.ts": {
264-
"@typescript-eslint/no-explicit-any": 1,
265-
"jsdoc/match-description": 9
228+
"@typescript-eslint/no-explicit-any": 5,
229+
"jsdoc/match-description": 11
266230
},
267231
"packages/eth-json-rpc-provider/src/safe-event-emitter-provider.test.ts": {
268232
"import-x/namespace": 1

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

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

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

88
## [Unreleased]
99

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

1214
- **BREAKING:** Use new `Messenger` from `@metamask/messenger` ([#6380](https://github.com/MetaMask/core/pull/6380))
1315
- Previously, `AccountTreeController` accepted a `RestrictedMessenger` instance from `@metamask/base-controller`.
16+
- **BREAKING:** Bump `@metamask/accounts-controller` from `^33.0.0` to `^34.0.0` ([#6962](https://github.com/MetaMask/core/pull/6962))
17+
- **BREAKING:** Bump `@metamask/keyring-controller` from `^23.0.0` to `^24.0.0` ([#6962](https://github.com/MetaMask/core/pull/6962))
18+
- **BREAKING:** Bump `@metamask/multichain-account-service` from `^1.0.0` to `^2.0.0` ([#6962](https://github.com/MetaMask/core/pull/6962))
19+
- **BREAKING:** Bump `@metamask/profile-sync-controller` from `^25.0.0` to `^26.0.0` ([#6962](https://github.com/MetaMask/core/pull/6962))
20+
- Bump `@metamask/base-controller` from `^8.4.2` to `^9.0.0` ([#6962](https://github.com/MetaMask/core/pull/6962))
1421

1522
## [1.6.0]
1623

@@ -386,7 +393,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
386393
- Initial release ([#5847](https://github.com/MetaMask/core/pull/5847))
387394
- Grouping accounts into 3 main categories: Entropy source, Snap ID, keyring types.
388395

389-
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
396+
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
397+
[2.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
390398
[1.6.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
391399
[1.5.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
392400
[1.4.2]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@metamask/account-tree-controller",
3-
"version": "1.6.0",
3+
"version": "2.0.0",
44
"description": "Controller to group account together based on some pre-defined rules",
55
"keywords": [
66
"MetaMask",
@@ -47,7 +47,7 @@
4747
"test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch"
4848
},
4949
"dependencies": {
50-
"@metamask/base-controller": "^8.4.2",
50+
"@metamask/base-controller": "^9.0.0",
5151
"@metamask/messenger": "^0.3.0",
5252
"@metamask/snaps-sdk": "^9.0.0",
5353
"@metamask/snaps-utils": "^11.0.0",
@@ -58,12 +58,12 @@
5858
},
5959
"devDependencies": {
6060
"@metamask/account-api": "^0.12.0",
61-
"@metamask/accounts-controller": "^33.2.0",
61+
"@metamask/accounts-controller": "^34.0.0",
6262
"@metamask/auto-changelog": "^3.4.4",
6363
"@metamask/keyring-api": "^21.0.0",
64-
"@metamask/keyring-controller": "^23.2.0",
65-
"@metamask/multichain-account-service": "^1.6.2",
66-
"@metamask/profile-sync-controller": "^25.1.2",
64+
"@metamask/keyring-controller": "^24.0.0",
65+
"@metamask/multichain-account-service": "^2.0.0",
66+
"@metamask/profile-sync-controller": "^26.0.0",
6767
"@metamask/providers": "^22.1.0",
6868
"@metamask/snaps-controllers": "^14.0.1",
6969
"@types/jest": "^27.4.1",
@@ -77,10 +77,10 @@
7777
},
7878
"peerDependencies": {
7979
"@metamask/account-api": "^0.12.0",
80-
"@metamask/accounts-controller": "^33.0.0",
81-
"@metamask/keyring-controller": "^23.0.0",
82-
"@metamask/multichain-account-service": "^1.0.0",
83-
"@metamask/profile-sync-controller": "^25.0.0",
80+
"@metamask/accounts-controller": "^34.0.0",
81+
"@metamask/keyring-controller": "^24.0.0",
82+
"@metamask/multichain-account-service": "^2.0.0",
83+
"@metamask/profile-sync-controller": "^26.0.0",
8484
"@metamask/providers": "^22.0.0",
8585
"@metamask/snaps-controllers": "^14.0.0",
8686
"webextension-polyfill": "^0.10.0 || ^0.11.0 || ^0.12.0"

‎packages/accounts-controller/CHANGELOG.md‎

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

88
## [Unreleased]
99

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

1214
- **BREAKING:** Use new `Messenger` from `@metamask/messenger` ([#6426](https://github.com/MetaMask/core/pull/6426))
1315
- Previously, `AccountsController` accepted a `RestrictedMessenger` instance from `@metamask/base-controller`.
16+
- **BREAKING:** Bump `@metamask/keyring-controller` from `^23.0.0` to `^24.0.0` ([#6962](https://github.com/MetaMask/core/pull/6962))
17+
- **BREAKING:** Bump `@metamask/network-controller` from `^24.0.0` to `^25.0.0` ([#6962](https://github.com/MetaMask/core/pull/6962))
1418
- Bump `@metamask/eth-snap-keyring` from `^17.0.0` to `^18.0.0` ([#6951](https://github.com/MetaMask/core/pull/6951))
19+
- Bump `@metamask/base-controller` from `^8.4.2` to `^9.0.0` ([#6962](https://github.com/MetaMask/core/pull/6962))
1520

1621
## [33.2.0]
1722

@@ -644,7 +649,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
644649

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

647-
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
652+
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
653+
[34.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
648654
[33.2.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
649655
[33.1.1]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
650656
[33.1.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]

0 commit comments

Comments
 (0)