Skip to content

Commit

Permalink
Merge branch 'main' into 3040-alert-for-when-interacting-with-an-addr…
Browse files Browse the repository at this point in the history
…ess-for-the-first-time
  • Loading branch information
OGPoyraz authored Nov 13, 2024
2 parents 3f52b81 + 05bd4c7 commit fefbd32
Show file tree
Hide file tree
Showing 62 changed files with 1,857 additions and 636 deletions.
24 changes: 24 additions & 0 deletions .github/workflows/add-prs-to-project.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: 'Add PR to Project Board - Wallet Framework Team'

on:
workflow_dispatch:
pull_request:
types: [opened, labeled, review_requested]

jobs:
add-to-project:
name: Add PR to Project Board
runs-on: ubuntu-latest
env:
TEAM_NAME: 'wallet-framework-engineers'
TEAM_LABEL: 'team-wallet-framework'

steps:
- name: Add PR to project board
uses: actions/add-to-project@244f685bbc3b7adfa8466e08b698b5577571133e
if: |
github.event.requested_team.name == env.TEAM_NAME ||
contains(github.event.pull_request.labels.*.name, env.TEAM_LABEL)
with:
project-url: https://github.com/orgs/MetaMask/projects/113
github-token: ${{ secrets.CORE_ADD_PRS_TO_PROJECT }}
16 changes: 5 additions & 11 deletions docs/package-migration-process-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,33 +12,27 @@ This document outlines the process for migrating a MetaMask library into the cor

- [Example PR](https://github.com/MetaMask/eth-json-rpc-provider/pull/38)

### 2. Disable `dependabot` dependency version updates and security alerts
### 2. Add the source repo to the ZenHub workspace repo filter so that its issues/PRs show up on the board

- [Disable dependabot alerts](https://docs.github.com/en/code-security/dependabot/dependabot-alerts/configuring-dependabot-alerts#enabling-or-disabling-dependabot-alerts-for-a-repository) for the repo.
- [Disable dependabot dependency version updates](https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuring-dependabot-version-updates#disabling-dependabot-version-updates) from settings, or delete the source repo's `.github/dependabot.yml` file.
- Contact a [**maintainer**](https://github.com/orgs/MetaMask/teams/engineering?query=role%3Amaintainer) to perform this step.

### 3. Add the source repo to the ZenHub workspace repo filter so that its issues/PRs show up on the board

### **[PR#2]** 4. Align dependency versions and TypeScript, ESLint, Prettier configurations with the core monorepo
### **[PR#2]** 3. Align dependency versions and TypeScript, ESLint, Prettier configurations with the core monorepo

- If the dependency versions of the migration target are ahead of core, consider updating the core dependencies first.
- Apply the configurations of the core monorepo to the source repo files.
- Preserve any TypeScript compiler flags that are enabled in the source repo but not in core.
- Resolve any errors or issues resulting from these changes.
- [Example PR](https://github.com/MetaMask/eth-json-rpc-provider/pull/28)

### **[PR#3]** 5. Review the `metamask-module-template`, and add any missing files or elements (e.g. LICENSE)
### **[PR#3]** 4. Review the `metamask-module-template`, and add any missing files or elements (e.g. LICENSE)

- [Example PR](https://github.com/MetaMask/eth-json-rpc-provider/pull/24)

### **[PR#4]** 6. Rename the migration target package so that it is prepended by the `@metamask/` namespace (skip if not applicable)
### **[PR#4]** 5. Rename the migration target package so that it is prepended by the `@metamask/` namespace (skip if not applicable)

- Modify the "name" field in `package.json`.
- Update the title of the README.md.
- Add a CHANGELOG entry for the rename.

### **[PR#5]** 7. Create a new release of the migration target from the source repo
### **[PR#5]** 6. Create a new release of the migration target from the source repo

- All subsequent releases of the migration target will be made from the core monorepo.
- [Example PR](https://github.com/MetaMask/eth-json-rpc-provider/pull/29)
Expand Down
2 changes: 1 addition & 1 deletion examples/example-controllers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
},
"devDependencies": {
"@metamask/auto-changelog": "^3.4.4",
"@metamask/controller-utils": "^11.4.2",
"@metamask/controller-utils": "^11.4.3",
"@types/jest": "^27.4.1",
"deepmerge": "^4.2.2",
"jest": "^27.5.1",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@metamask/core-monorepo",
"version": "239.0.0",
"version": "245.0.0",
"private": true,
"description": "Monorepo for packages shared between MetaMask clients",
"repository": {
Expand Down
9 changes: 8 additions & 1 deletion packages/accounts-controller/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [19.0.0]

### Changed

- **BREAKING:** Bump peer dependency `@metamask/keyring-controller` from `^17.0.0` to `^18.0.0` ([#4915](https://github.com/MetaMask/core/pull/4915))

## [18.2.3]

### Changed
Expand Down Expand Up @@ -337,7 +343,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

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

[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
[19.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
[18.2.3]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
[18.2.2]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
[18.2.1]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
Expand Down
6 changes: 3 additions & 3 deletions packages/accounts-controller/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@metamask/accounts-controller",
"version": "18.2.3",
"version": "19.0.0",
"description": "Manages internal accounts",
"keywords": [
"MetaMask",
Expand Down Expand Up @@ -61,7 +61,7 @@
},
"devDependencies": {
"@metamask/auto-changelog": "^3.4.4",
"@metamask/keyring-controller": "^17.3.1",
"@metamask/keyring-controller": "^18.0.0",
"@metamask/snaps-controllers": "^9.7.0",
"@types/jest": "^27.4.1",
"@types/readable-stream": "^2.3.0",
Expand All @@ -72,7 +72,7 @@
"typescript": "~5.2.2"
},
"peerDependencies": {
"@metamask/keyring-controller": "^17.0.0",
"@metamask/keyring-controller": "^18.0.0",
"@metamask/snaps-controllers": "^9.7.0"
},
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion packages/address-book-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
},
"dependencies": {
"@metamask/base-controller": "^7.0.2",
"@metamask/controller-utils": "^11.4.2",
"@metamask/controller-utils": "^11.4.3",
"@metamask/utils": "^10.0.0"
},
"devDependencies": {
Expand Down
18 changes: 17 additions & 1 deletion packages/assets-controllers/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [43.0.0]

### Added

- `AccountTrackerController` now tracks balances of staked ETH for each account, under the state property `stakedBalance`. ([#4879](https://github.com/MetaMask/core/pull/4879))

### Changed

- **BREAKING**: The polling input for`TokenListController` is now `{chainId: Hex}` instead of `{networkClientId: NetworkClientId}`. ([#4878](https://github.com/MetaMask/core/pull/4878))
- **BREAKING**: The polling input for`TokenDetectionController` is now `{ chainIds: Hex[]; address: string; }` instead of `{ networkClientId: NetworkClientId; address: string; }`. ([#4894](https://github.com/MetaMask/core/pull/4894))
- **BREAKING:** Bump `@metamask/keyring-controller` peer dependency from `^17.0.0` to `^18.0.0` ([#4195](https://github.com/MetaMask/core/pull/4195))
- **BREAKING:** Bump `@metamask/preferences-controller` peer dependency from `^13.2.0` to `^14.0.0` ([#4909](https://github.com/MetaMask/core/pull/4909), [#4915](https://github.com/MetaMask/core/pull/4915))
- **BREAKING:** Bump `@metamask/accounts-controller` peer dependency from `^18.0.0` to `^19.0.0` ([#4915](https://github.com/MetaMask/core/pull/4915))
- Bump `@metamask/controller-utils` from `^11.4.2` to `^11.4.3` ([#4195](https://github.com/MetaMask/core/pull/4195))

## [42.0.0]

### Added
Expand Down Expand Up @@ -1189,7 +1204,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]
[43.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
[42.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
[41.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
[40.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
Expand Down
18 changes: 9 additions & 9 deletions packages/assets-controllers/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@metamask/assets-controllers",
"version": "42.0.0",
"version": "43.0.0",
"description": "Controllers which manage interactions involving ERC-20, ERC-721, and ERC-1155 tokens (including NFTs)",
"keywords": [
"MetaMask",
Expand Down Expand Up @@ -55,7 +55,7 @@
"@metamask/abi-utils": "^2.0.3",
"@metamask/base-controller": "^7.0.2",
"@metamask/contract-metadata": "^2.4.0",
"@metamask/controller-utils": "^11.4.2",
"@metamask/controller-utils": "^11.4.3",
"@metamask/eth-query": "^4.0.0",
"@metamask/metamask-eth-abis": "^3.1.1",
"@metamask/polling-controller": "^12.0.1",
Expand All @@ -73,14 +73,14 @@
"uuid": "^8.3.2"
},
"devDependencies": {
"@metamask/accounts-controller": "^18.2.3",
"@metamask/accounts-controller": "^19.0.0",
"@metamask/approval-controller": "^7.1.1",
"@metamask/auto-changelog": "^3.4.4",
"@metamask/ethjs-provider-http": "^0.3.0",
"@metamask/keyring-api": "^8.1.3",
"@metamask/keyring-controller": "^17.3.1",
"@metamask/network-controller": "^22.0.1",
"@metamask/preferences-controller": "^13.2.0",
"@metamask/keyring-controller": "^18.0.0",
"@metamask/network-controller": "^22.0.2",
"@metamask/preferences-controller": "^14.0.0",
"@types/jest": "^27.4.1",
"@types/lodash": "^4.14.191",
"@types/node": "^16.18.54",
Expand All @@ -95,11 +95,11 @@
"typescript": "~5.2.2"
},
"peerDependencies": {
"@metamask/accounts-controller": "^18.0.0",
"@metamask/accounts-controller": "^19.0.0",
"@metamask/approval-controller": "^7.0.0",
"@metamask/keyring-controller": "^17.0.0",
"@metamask/keyring-controller": "^18.0.0",
"@metamask/network-controller": "^22.0.0",
"@metamask/preferences-controller": "^13.0.0"
"@metamask/preferences-controller": "^14.0.0"
},
"engines": {
"node": "^18.18 || >=20"
Expand Down
Loading

0 comments on commit fefbd32

Please sign in to comment.