Skip to content

Commit 9987068

Browse files
authored
Merge branch 'main' into deps-metamask-utils-8
2 parents 48c10f6 + ff9e2b3 commit 9987068

File tree

139 files changed

+14017
-6605
lines changed

Some content is hidden

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

139 files changed

+14017
-6605
lines changed

README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ This monorepo is a collection of packages used across multiple MetaMask clients
66

77
This repository houses the following packages:
88

9+
- [`@metamask/accounts-controller`](packages/accounts-controller)
910
- [`@metamask/address-book-controller`](packages/address-book-controller)
1011
- [`@metamask/announcement-controller`](packages/announcement-controller)
1112
- [`@metamask/approval-controller`](packages/approval-controller)
@@ -35,6 +36,7 @@ Or, in graph form [^fn1]:
3536
%%{ init: { 'flowchart': { 'curve': 'bumpX' } } }%%
3637
graph LR;
3738
linkStyle default opacity:0.5
39+
accounts_controller(["@metamask/accounts-controller"]);
3840
address_book_controller(["@metamask/address-book-controller"]);
3941
announcement_controller(["@metamask/announcement-controller"]);
4042
approval_controller(["@metamask/approval-controller"]);
@@ -54,8 +56,11 @@ linkStyle default opacity:0.5
5456
phishing_controller(["@metamask/phishing-controller"]);
5557
preferences_controller(["@metamask/preferences-controller"]);
5658
rate_limit_controller(["@metamask/rate-limit-controller"]);
59+
selected_network_controller(["@metamask/selected-network-controller"]);
5760
signature_controller(["@metamask/signature-controller"]);
5861
transaction_controller(["@metamask/transaction-controller"]);
62+
accounts_controller --> base_controller;
63+
accounts_controller --> keyring_controller;
5964
address_book_controller --> base_controller;
6065
address_book_controller --> controller_utils;
6166
announcement_controller --> base_controller;
@@ -91,10 +96,13 @@ linkStyle default opacity:0.5
9196
preferences_controller --> base_controller;
9297
preferences_controller --> controller_utils;
9398
rate_limit_controller --> base_controller;
99+
selected_network_controller --> base_controller;
100+
selected_network_controller --> network_controller;
94101
signature_controller --> approval_controller;
95102
signature_controller --> base_controller;
96103
signature_controller --> controller_utils;
97104
signature_controller --> message_manager;
105+
signature_controller --> keyring_controller;
98106
transaction_controller --> approval_controller;
99107
transaction_controller --> base_controller;
100108
transaction_controller --> controller_utils;

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@metamask/core-monorepo",
3-
"version": "75.0.0",
3+
"version": "78.0.0",
44
"private": true,
55
"description": "Monorepo for packages shared between MetaMask clients",
66
"repository": {
@@ -35,7 +35,7 @@
3535
"devDependencies": {
3636
"@lavamoat/allow-scripts": "^2.3.1",
3737
"@metamask/create-release-branch": "^1.1.0",
38-
"@metamask/eslint-config": "^12.0.0",
38+
"@metamask/eslint-config": "^12.2.0",
3939
"@metamask/eslint-config-jest": "^12.0.0",
4040
"@metamask/eslint-config-nodejs": "^12.0.0",
4141
"@metamask/eslint-config-typescript": "^12.0.0",
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Changelog
2+
All notable changes to this project will be documented in this file.
3+
4+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
5+
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
6+
7+
## [Unreleased]
8+
9+
## [2.0.0]
10+
### Changed
11+
- **BREAKING:** Bump peer dependency on `@metamask/keyring-controller` to ^8.0.0
12+
13+
## [1.0.0]
14+
### Added
15+
- Initial release ([#1637](https://github.com/MetaMask/core/pull/1637))
16+
17+
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
18+
[2.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
19+
[1.0.0]: https://github.com/MetaMask/core/releases/tag/@metamask/[email protected]
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
MIT License
2+
3+
Copyright (c) 2018 MetaMask
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# `@metamask/accounts-controller`
2+
3+
Manages internal accounts used in place of regular ethereum addresses.
4+
5+
## Installation
6+
7+
`yarn add @metamask/accounts-controller`
8+
9+
or
10+
11+
`npm install @metamask/accounts-controller`
12+
13+
## Contributing
14+
15+
This package is part of a monorepo. Instructions for contributing can be found in the [monorepo README](https://github.com/MetaMask/core#readme).
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
/*
2+
* For a detailed explanation regarding each configuration property and type check, visit:
3+
* https://jestjs.io/docs/configuration
4+
*/
5+
6+
const merge = require('deepmerge');
7+
const path = require('path');
8+
9+
const baseConfig = require('../../jest.config.packages');
10+
11+
const displayName = path.basename(__dirname);
12+
13+
module.exports = merge(baseConfig, {
14+
// The display name when running multiple projects
15+
displayName,
16+
17+
// An object that configures minimum threshold enforcement for coverage results
18+
coverageThreshold: {
19+
global: {
20+
branches: 100,
21+
functions: 100,
22+
lines: 100,
23+
statements: 100,
24+
},
25+
},
26+
});
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
{
2+
"name": "@metamask/accounts-controller",
3+
"version": "2.0.0",
4+
"description": "Manages internal accounts",
5+
"keywords": [
6+
"MetaMask",
7+
"Ethereum"
8+
],
9+
"homepage": "https://github.com/MetaMask/core/tree/main/packages/accounts-controller#readme",
10+
"bugs": {
11+
"url": "https://github.com/MetaMask/core/issues"
12+
},
13+
"repository": {
14+
"type": "git",
15+
"url": "https://github.com/MetaMask/core.git"
16+
},
17+
"license": "MIT",
18+
"main": "./dist/index.js",
19+
"types": "./dist/index.d.ts",
20+
"files": [
21+
"dist/"
22+
],
23+
"scripts": {
24+
"build:docs": "typedoc",
25+
"changelog:validate": "../../scripts/validate-changelog.sh @metamask/accounts-controller",
26+
"publish:preview": "yarn npm publish --tag preview",
27+
"test": "jest",
28+
"test:watch": "jest --watch"
29+
},
30+
"dependencies": {
31+
"@metamask/base-controller": "^3.2.1",
32+
"@metamask/eth-snap-keyring": "^0.2.2",
33+
"@metamask/keyring-api": "^0.2.5",
34+
"@metamask/snaps-utils": "^1.0.1",
35+
"@metamask/utils": "^6.2.0",
36+
"deepmerge": "^4.2.2",
37+
"eth-rpc-errors": "^4.0.2",
38+
"ethereumjs-util": "^7.0.10",
39+
"immer": "^9.0.6",
40+
"nanoid": "^3.1.31",
41+
"uuid": "^8.3.2"
42+
},
43+
"devDependencies": {
44+
"@metamask/auto-changelog": "^3.1.0",
45+
"@metamask/keyring-controller": "^8.0.0",
46+
"@metamask/snaps-controllers": "^1.0.1",
47+
"@types/jest": "^27.4.1",
48+
"@types/readable-stream": "^2.3.0",
49+
"jest": "^27.5.1",
50+
"ts-jest": "^27.1.4",
51+
"typedoc": "^0.23.15",
52+
"typedoc-plugin-missing-exports": "^0.23.0",
53+
"typescript": "~4.6.3"
54+
},
55+
"peerDependencies": {
56+
"@metamask/keyring-controller": "^8.0.0"
57+
},
58+
"engines": {
59+
"node": ">=16.0.0"
60+
},
61+
"publishConfig": {
62+
"access": "public",
63+
"registry": "https://registry.npmjs.org/"
64+
}
65+
}

0 commit comments

Comments
 (0)