Skip to content

Commit

Permalink
Merge branch 'main' into feat/7702-sign-authorization
Browse files Browse the repository at this point in the history
  • Loading branch information
@jeffsmale90
jeffsmale90 authored Feb 17, 2025
2 parents 21e65a0 + 6eaaf7b commit 959414e
Show file tree
Hide file tree
Showing 29 changed files with 1,980 additions and 159 deletions.
7 changes: 6 additions & 1 deletion .github/CODEOWNERS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
/packages/permission-controller @MetaMask/wallet-api-platform-engineers @MetaMask/wallet-framework-engineers @MetaMask/snaps-devs
/packages/permission-log-controller @MetaMask/wallet-api-platform-engineers @MetaMask/wallet-framework-engineers
/packages/profile-sync-controller @MetaMask/notifications @MetaMask/identity
/packages/remote-feature-flag-controller @MetaMask/extension-platform @MetaMask/mobile-platform

## Package Release related
/packages/accounts-controller/package.json @MetaMask/accounts-engineers @MetaMask/wallet-framework-engineers
Expand Down Expand Up @@ -103,6 +104,8 @@
/packages/multichain/CHANGELOG.md @MetaMask/wallet-api-platform-engineers @MetaMask/wallet-framework-engineers
/packages/queued-request-controller/package.json @MetaMask/wallet-api-platform-engineers @MetaMask/wallet-framework-engineers
/packages/queued-request-controller/CHANGELOG.md @MetaMask/wallet-api-platform-engineers @MetaMask/wallet-framework-engineers
/packages/selected-network-controller/package.json @MetaMask/wallet-api-platform-engineers @MetaMask/wallet-framework-engineers
/packages/selected-network-controller/CHANGELOG.md @MetaMask/wallet-api-platform-engineers @MetaMask/wallet-framework-engineers
/packages/signature-controller/package.json @MetaMask/confirmations @MetaMask/wallet-framework-engineers
/packages/signature-controller/CHANGELOG.md @MetaMask/confirmations @MetaMask/wallet-framework-engineers
/packages/rate-limit-controller/package.json @MetaMask/snaps-devs @MetaMask/wallet-framework-engineers
Expand All @@ -116,4 +119,6 @@
/packages/token-search-discovery-controller/package.json @MetaMask/portfolio @MetaMask/wallet-framework-engineers
/packages/token-search-discovery-controller/CHANGELOG.md @MetaMask/portfolio @MetaMask/wallet-framework-engineers
/packages/bridge-controller/package.json @MetaMask/swaps-engineers @MetaMask/wallet-framework-engineers
/packages/bridge-controller/CHANGELOG.md @MetaMask/swaps-engineers @MetaMask/wallet-framework-engineers
/packages/bridge-controller/CHANGELOG.md @MetaMask/swaps-engineers @MetaMask/wallet-framework-engineers
/packages/remote-feature-flag-controller/package.json @MetaMask/extension-platform @MetaMask/mobile-platform @MetaMask/wallet-framework-engineers
/packages/remote-feature-flag-controller/CHANGELOG.md @MetaMask/extension-platform @MetaMask/mobile-platform @MetaMask/wallet-framework-engineers
11 changes: 2 additions & 9 deletions eslint-warning-thresholds.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,13 +242,12 @@
"n/no-unsupported-features/node-builtins": 1
},
"packages/keyring-controller/src/KeyringController.test.ts": {
"import-x/namespace": 16,
"import-x/namespace": 14,
"jest/no-conditional-in-test": 8
},
"packages/keyring-controller/src/KeyringController.ts": {
"@typescript-eslint/no-unsafe-enum-comparison": 5,
"@typescript-eslint/no-unused-vars": 2,
"jsdoc/tag-lines": 1
"@typescript-eslint/no-unused-vars": 2
},
"packages/keyring-controller/tests/mocks/mockKeyring.ts": {
"@typescript-eslint/prefer-readonly": 1
Expand Down Expand Up @@ -552,18 +551,12 @@
},
"packages/transaction-controller/src/TransactionController.test.ts": {
"import-x/namespace": 1,
"import-x/order": 4,
"jsdoc/tag-lines": 1,
"promise/always-return": 2
},
"packages/transaction-controller/src/TransactionController.ts": {
"jsdoc/check-tag-names": 35,
"jsdoc/require-returns": 5
},
"packages/transaction-controller/src/TransactionControllerIntegration.test.ts": {
"import-x/order": 4,
"jsdoc/tag-lines": 1
},
"packages/transaction-controller/src/api/accounts-api.test.ts": {
"import-x/order": 1,
"jsdoc/tag-lines": 1
Expand Down
127 changes: 126 additions & 1 deletion packages/accounts-controller/src/AccountsController.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,12 @@ describe('AccountsController', () => {
accounts: [mockAccount.address],
},
],
keyringsMetadata: [
{
id: 'mock-id',
name: 'mock-name',
},
],
};

messenger.publish(
Expand All @@ -564,7 +570,7 @@ describe('AccountsController', () => {

messenger.publish(
'KeyringController:stateChange',
{ isUnlocked: true, keyrings: [] },
{ isUnlocked: true, keyrings: [], keyringsMetadata: [] },
[],
);

Expand All @@ -582,6 +588,13 @@ describe('AccountsController', () => {
{
accounts: [mockAccount.address, mockAccount2.address],
type: KeyringTypes.hd,
id: '123',
},
],
keyringsMetadata: [
{
id: 'mock-id',
name: 'mock-name',
},
],
};
Expand Down Expand Up @@ -620,6 +633,12 @@ describe('AccountsController', () => {
accounts: [mockAccount.address, mockAccount2.address],
},
],
keyringsMetadata: [
{
id: 'mock-id',
name: 'mock-name',
},
],
};
const { accountsController } = setupAccountsController({
initialState: {
Expand Down Expand Up @@ -677,6 +696,16 @@ describe('AccountsController', () => {
accounts: [mockAccount3.address, mockAccount4.address],
},
],
keyringsMetadata: [
{
id: 'mock-id',
name: 'mock-name',
},
{
id: 'mock-id2',
name: 'mock-name2',
},
],
};

const { accountsController } = setupAccountsController({
Expand Down Expand Up @@ -744,6 +773,16 @@ describe('AccountsController', () => {
accounts: [mockAccount3.address, mockAccount4.address],
},
],
keyringsMetadata: [
{
id: 'mock-id',
name: 'mock-name',
},
{
id: 'mock-id2',
name: 'mock-name2',
},
],
};

const { accountsController } = setupAccountsController({
Expand Down Expand Up @@ -790,6 +829,12 @@ describe('AccountsController', () => {
],
},
],
keyringsMetadata: [
{
id: 'mock-id',
name: 'mock-name',
},
],
};
const { accountsController } = setupAccountsController({
initialState: {
Expand Down Expand Up @@ -852,6 +897,12 @@ describe('AccountsController', () => {
],
},
],
keyringsMetadata: [
{
id: 'mock-id',
name: 'mock-name',
},
],
};
const { accountsController } = setupAccountsController({
initialState: {
Expand Down Expand Up @@ -912,6 +963,16 @@ describe('AccountsController', () => {
accounts: [mockAccount3.address],
},
],
keyringsMetadata: [
{
id: 'mock-id',
name: 'mock-name',
},
{
id: 'mock-id2',
name: 'mock-name2',
},
],
};

const { accountsController } = setupAccountsController({
Expand Down Expand Up @@ -948,6 +1009,12 @@ describe('AccountsController', () => {
accounts: [mockAccount.address, mockAccount2.address],
},
],
keyringsMetadata: [
{
id: 'mock-id',
name: 'mock-name',
},
],
};
const { accountsController } = setupAccountsController({
initialState: {
Expand Down Expand Up @@ -1003,6 +1070,12 @@ describe('AccountsController', () => {
accounts: [mockAccount.address, mockAccount2.address],
},
],
keyringsMetadata: [
{
id: 'mock-id',
name: 'mock-name',
},
],
};

messenger.publish(
Expand Down Expand Up @@ -1034,6 +1107,12 @@ describe('AccountsController', () => {
accounts: [mockAccount2.address],
},
],
keyringsMetadata: [
{
id: 'mock-id',
name: 'mock-name',
},
],
};
const { accountsController } = setupAccountsController({
initialState: {
Expand Down Expand Up @@ -1075,6 +1154,12 @@ describe('AccountsController', () => {
accounts: [mockAccount.address, mockAccount2.address],
},
],
keyringsMetadata: [
{
id: 'mock-id',
name: 'mock-name',
},
],
};
const { accountsController } = setupAccountsController({
initialState: {
Expand Down Expand Up @@ -1135,6 +1220,12 @@ describe('AccountsController', () => {
accounts: [mockAccount.address, mockAccount2.address],
},
],
keyringsMetadata: [
{
id: 'mock-id',
name: 'mock-name',
},
],
};
const { accountsController } = setupAccountsController({
initialState: {
Expand Down Expand Up @@ -1208,6 +1299,12 @@ describe('AccountsController', () => {
],
},
],
keyringsMetadata: [
{
id: 'mock-id',
name: 'mock-name',
},
],
};
const { accountsController } = setupAccountsController({
initialState: {
Expand Down Expand Up @@ -1278,6 +1375,12 @@ describe('AccountsController', () => {
accounts: [mockAccount.address, mockAccount2.address],
},
],
keyringsMetadata: [
{
id: 'mock-id',
name: 'mock-name',
},
],
};
messenger.publish(
'KeyringController:stateChange',
Expand Down Expand Up @@ -1322,6 +1425,12 @@ describe('AccountsController', () => {
accounts: [mockReinitialisedAccount.address],
},
],
keyringsMetadata: [
{
id: 'mock-id',
name: 'mock-name',
},
],
};
const { accountsController } = setupAccountsController({
initialState: {
Expand Down Expand Up @@ -1418,6 +1527,12 @@ describe('AccountsController', () => {
],
},
],
keyringsMetadata: [
{
id: 'mock-id',
name: 'mock-name',
},
],
};
messenger.publish(
'KeyringController:stateChange',
Expand Down Expand Up @@ -2694,6 +2809,16 @@ describe('AccountsController', () => {
accounts: simpleAddressess,
},
],
keyringsMetadata: [
{
id: 'mock-id',
name: 'mock-name',
},
{
id: 'mock-id2',
name: 'mock-name2',
},
],
};
};

Expand Down
6 changes: 3 additions & 3 deletions packages/keyring-controller/jest.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ module.exports = merge(baseConfig, {
// An object that configures minimum threshold enforcement for coverage results
coverageThreshold: {
global: {
branches: 94.26,
branches: 93.56,
functions: 100,
lines: 98.96,
statements: 98.98,
lines: 98.73,
statements: 98.74,
},
},

Expand Down
9 changes: 7 additions & 2 deletions packages/keyring-controller/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@
"@metamask/utils": "^11.2.0",
"async-mutex": "^0.5.0",
"ethereumjs-wallet": "^1.0.1",
"immer": "^9.0.6"
"immer": "^9.0.6",
"ulid": "^2.3.0"
},
"devDependencies": {
"@ethereumjs/common": "^3.2.0",
Expand Down Expand Up @@ -88,6 +89,10 @@
"registry": "https://registry.npmjs.org/"
},
"lavamoat": {
"allowScripts": {}
"allowScripts": {
"@lavamoat/preinstall-always-fail": false,
"ethereumjs-wallet>ethereum-cryptography>keccak": false,
"ethereumjs-wallet>ethereum-cryptography>secp256k1": false
}
}
}
Loading

0 comments on commit 959414e

Please sign in to comment.