Skip to content

Commit

Permalink
chore: bumps MMI packages (#24581)
Browse files Browse the repository at this point in the history
<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

A few packages updates for MMI.

Fixes:

1. Go to this page...
2.
3.

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

<!-- [screenshots/recordings] -->

<!-- [screenshots/recordings] -->

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>
  • Loading branch information
zone-live and metamaskbot committed Jun 5, 2024
1 parent d90cb71 commit f696c34
Show file tree
Hide file tree
Showing 5 changed files with 85 additions and 92 deletions.
12 changes: 6 additions & 6 deletions app/scripts/controllers/mmi-controller.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -201,10 +201,10 @@ describe('MMIController', function () {
initState: {
custodyAccountDetails: {
[mockAccount.address]: {
custodyType: 'Custody - Jupiter',
custodyType: 'Custody - ECA3',
},
[mockAccount2.address]: {
custodyType: 'Custody - Jupiter',
custodyType: 'Custody - ECA3',
},
},
},
Expand Down Expand Up @@ -438,11 +438,11 @@ describe('MMIController', function () {
getCustodianAccounts: mockCustodialKeyring,
});

await mmiController.getCustodianAccounts('token', 'mock url', 'JUPITER');
await mmiController.getCustodianAccounts('token', 'neptune-custody', 'ECA3');

expect(selectedAccountSpy).toHaveBeenCalledTimes(0);

expect(keyringControllerSpy).toHaveBeenCalledWith('Custody - Jupiter');
expect(keyringControllerSpy).toHaveBeenCalledWith('Custody - ECA3');
expect(mockCustodialKeyring).toHaveBeenCalled();
});

Expand All @@ -454,14 +454,14 @@ describe('MMIController', function () {
getCustodianAccounts: mockCustodialKeyring,
});

await mmiController.getCustodianAccounts('token', 'mock url');
await mmiController.getCustodianAccounts('token', 'neptune-custody');

expect(selectedAccountSpy).toHaveBeenCalledWith(
'AccountsController:getSelectedAccount',
);
expect(selectedAccountSpy).toHaveReturnedWith(mockAccount);

expect(keyringControllerSpy).toHaveBeenCalledWith('Custody - Jupiter');
expect(keyringControllerSpy).toHaveBeenCalledWith('Custody - ECA3');
expect(mockCustodialKeyring).toHaveBeenCalled();
});
});
Expand Down
46 changes: 3 additions & 43 deletions lavamoat/browserify/mmi/policy.json
Original file line number Diff line number Diff line change
Expand Up @@ -765,57 +765,17 @@
"globals": {
"URLSearchParams": true,
"console.debug": true,
"console.error": true,
"console.log": true,
"console.warn": true,
"fetch": true
},
"packages": {
"@metamask-institutional/sdk>@metamask-institutional/simplecache": true,
"@metamask-institutional/sdk>jsonwebtoken": true,
"browserify>crypto-browserify": true,
"webpack>events": true
}
},
"@metamask-institutional/sdk>jsonwebtoken": {
"packages": {
"@metamask-institutional/sdk>jsonwebtoken>jws": true,
"browserify>buffer": true,
"browserify>crypto-browserify": true,
"browserify>process": true,
"lodash": true,
"mocha>ms": true,
"semver": true
}
},
"@metamask-institutional/sdk>jsonwebtoken>jws": {
"packages": {
"@metamask-institutional/sdk>jsonwebtoken>jws>jwa": true,
"browserify>buffer": true,
"browserify>process": true,
"browserify>util": true,
"koa>content-disposition>safe-buffer": true,
"stream-browserify": true
}
},
"@metamask-institutional/sdk>jsonwebtoken>jws>jwa": {
"packages": {
"@metamask-institutional/sdk>jsonwebtoken>jws>jwa>buffer-equal-constant-time": true,
"@metamask-institutional/sdk>jsonwebtoken>jws>jwa>ecdsa-sig-formatter": true,
"browserify>crypto-browserify": true,
"browserify>util": true,
"koa>content-disposition>safe-buffer": true
}
},
"@metamask-institutional/sdk>jsonwebtoken>jws>jwa>buffer-equal-constant-time": {
"packages": {
"browserify>buffer": true
}
},
"@metamask-institutional/sdk>jsonwebtoken>jws>jwa>ecdsa-sig-formatter": {
"packages": {
"koa>content-disposition>safe-buffer": true
}
},
"@metamask-institutional/transaction-update": {
"globals": {
"clearInterval": true,
Expand All @@ -824,10 +784,10 @@
"setInterval": true
},
"packages": {
"@ethereumjs/tx>@ethereumjs/util": true,
"@metamask-institutional/sdk": true,
"@metamask-institutional/transaction-update>@metamask-institutional/websocket-client": true,
"@metamask/obs-store": true,
"ethereumjs-util": true,
"@metamask-institutional/transaction-update>@metamask/obs-store": true,
"webpack>events": true
}
},
Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -270,14 +270,14 @@
"@lavamoat/lavadome-react": "0.0.17",
"@lavamoat/snow": "^2.0.1",
"@material-ui/core": "^4.11.0",
"@metamask-institutional/custody-controller": "^0.2.24",
"@metamask-institutional/custody-keyring": "^1.0.12",
"@metamask-institutional/extension": "^0.3.20",
"@metamask-institutional/institutional-features": "^1.2.15",
"@metamask-institutional/portfolio-dashboard": "^1.4.0",
"@metamask-institutional/rpc-allowlist": "1.0.3",
"@metamask-institutional/sdk": "^0.1.25",
"@metamask-institutional/transaction-update": "^0.2.0",
"@metamask-institutional/custody-controller": "^0.2.27",
"@metamask-institutional/custody-keyring": "^2.0.0",
"@metamask-institutional/extension": "^0.3.24",
"@metamask-institutional/institutional-features": "^1.3.2",
"@metamask-institutional/portfolio-dashboard": "^1.4.1",
"@metamask-institutional/rpc-allowlist": "^1.0.3",
"@metamask-institutional/sdk": "^0.1.26",
"@metamask-institutional/transaction-update": "^0.2.2",
"@metamask/abi-utils": "^2.0.2",
"@metamask/accounts-controller": "^11.0.0",
"@metamask/address-book-controller": "^3.1.7",
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/mmi/pageObjects/mmi-dummyApp-page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export class DummyAppPage {
await popup.waitForLoadState();

if (isSign) {
await popup.click('button:has-text("Sign")');
await popup.click('button:has-text("Confirm")');
} else {
// Confirm
await popup.getByTestId('page-container-footer-next').click();
Expand Down
101 changes: 67 additions & 34 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3942,64 +3942,80 @@ __metadata:
languageName: node
linkType: hard

"@metamask-institutional/custody-controller@npm:^0.2.24, @metamask-institutional/custody-controller@npm:^0.2.25":
version: 0.2.25
resolution: "@metamask-institutional/custody-controller@npm:0.2.25"
"@metamask-institutional/custody-controller@npm:^0.2.27":
version: 0.2.27
resolution: "@metamask-institutional/custody-controller@npm:0.2.27"
dependencies:
"@ethereumjs/util": "npm:^8.0.5"
"@metamask-institutional/custody-keyring": "npm:^1.1.0"
"@metamask-institutional/sdk": "npm:^0.1.26"
"@metamask-institutional/custody-keyring": "npm:^2.0.0"
"@metamask-institutional/sdk": "npm:^0.1.27"
"@metamask-institutional/types": "npm:^1.1.0"
"@metamask/obs-store": "npm:^8.0.0"
checksum: 38ad630637730180bed372f058d8fd0c7a11002b8664ce01c725d8ef8559a593761463adf09245ecda11e14d52e305b9fdba8438dae87622f833317265cd6253
checksum: b834477c4551fdbd56143742038f1b101cb72b1655380a63d6d84416af949b259109a22967d3233009d737400f656c91ba100dcb61522eb14e6715564f07e404
languageName: node
linkType: hard

<<<<<<< HEAD
"@metamask-institutional/custody-keyring@npm:^1.0.12, @metamask-institutional/custody-keyring@npm:^1.1.0":
version: 1.1.0
resolution: "@metamask-institutional/custody-keyring@npm:1.1.0"
dependencies:
"@ethereumjs/tx": "npm:^4.1.1"
=======
"@metamask-institutional/custody-keyring@npm:^2.0.0":
"@ethereumjs/util": "npm:^8.0.5"
"@metamask-institutional/configuration-client": "npm:^2.0.1"
"@metamask-institutional/sdk": "npm:^0.1.26"
"@metamask-institutional/types": "npm:^1.1.0"
"@metamask-institutional/sdk": "npm:^0.1.27"
"@metamask/obs-store": "npm:^8.0.0"
crypto: "npm:^1.0.1"
lodash.clonedeep: "npm:^4.5.0"
checksum: 26d43168f8d398c6e391b6200ad36fa7b57ad2bb735812c4a9bc2b8a8cbf19fd8f3c547f4b3c6a82e199687e787549b8c95271ea049795e82974f4df4ba0d3c7
checksum: 14563443d157d97554ab4456c69ecba52aacde9659bcdc5b20724a3cf7c626c3ef624446823ceafbf3aa25307e89f0dc09636e8db49f49f48d5d7c6b37f52bf9
languageName: node
linkType: hard

<<<<<<< HEAD
"@metamask-institutional/extension@npm:^0.3.20":
version: 0.3.21
resolution: "@metamask-institutional/extension@npm:0.3.21"
=======
"@metamask-institutional/extension@npm:^0.3.24":
version: 0.3.24
resolution: "@metamask-institutional/extension@npm:0.3.24"
>>>>>>> 4cf7e804e1 (chore: bumps MMI packages (#24581))
dependencies:
"@ethereumjs/util": "npm:^8.0.5"
"@metamask-institutional/custody-controller": "npm:^0.2.25"
"@metamask-institutional/custody-keyring": "npm:^1.1.0"
"@metamask-institutional/portfolio-dashboard": "npm:^1.4.0"
"@metamask-institutional/sdk": "npm:^0.1.26"
"@metamask-institutional/transaction-update": "npm:^0.2.0"
"@metamask-institutional/custody-controller": "npm:^0.2.27"
"@metamask-institutional/custody-keyring": "npm:^2.0.0"
"@metamask-institutional/portfolio-dashboard": "npm:^1.4.1"
"@metamask-institutional/sdk": "npm:^0.1.27"
"@metamask-institutional/transaction-update": "npm:^0.2.2"
"@metamask-institutional/types": "npm:^1.1.0"
jest-create-mock-instance: "npm:^2.0.0"
jest-fetch-mock: "npm:3.0.3"
lodash.clonedeep: "npm:^4.5.0"
checksum: 47c2ac21e47d90f6a3166fe5616c45adb785561ff0daab7f333f5b7672d13c9d0c9a7b2b1cb0fc2be656ef902d5c170fb2518cb6d662f0ba9a3f54499b780de7
checksum: 7ec773d3f98b61d4d6b877e39eec239aca3cb5accaa2211728ddbad32fb6dba5f1c2e7ac7e90e1606bf94995f78dd323cb64a06fa587fd435b7e1592515f73ab
languageName: node
linkType: hard

<<<<<<< HEAD
"@metamask-institutional/institutional-features@npm:^1.2.15":
version: 1.3.0
resolution: "@metamask-institutional/institutional-features@npm:1.3.0"
=======
"@metamask-institutional/institutional-features@npm:^1.3.2":
version: 1.3.2
resolution: "@metamask-institutional/institutional-features@npm:1.3.2"
>>>>>>> 4cf7e804e1 (chore: bumps MMI packages (#24581))
dependencies:
"@metamask-institutional/custody-keyring": "npm:^1.1.0"
"@metamask-institutional/custody-keyring": "npm:^2.0.0"
"@metamask/obs-store": "npm:^8.0.0"
checksum: 7b5bb9d7999443a8ec304891c0fde51c17111337f7aa092c08caf8f5195d56d73318f2b3e85b7cef55cd8c5c230271eb9927e73d12245cd86e696c25d2e539c5
checksum: be5e8722c1180cf7127ee4c7cab0b26a60cb56e7bf0147836b496496bc6ada4de3e0265b97118ba4229ae6a847188097ed7175d51d689c5898e381fe54707aa9
languageName: node
linkType: hard

<<<<<<< HEAD
"@metamask-institutional/portfolio-dashboard@npm:^1.4.0":
=======
"@metamask-institutional/portfolio-dashboard@npm:^1.4.1":
>>>>>>> 4cf7e804e1 (chore: bumps MMI packages (#24581))
version: 1.4.1
resolution: "@metamask-institutional/portfolio-dashboard@npm:1.4.1"
checksum: 75573d236d2dd709bcf8d0c92f69eb71f07de4ed02ef3f5122f2acf5cf29e41c9e17b14c67cea4f200e64ce2e9a6c60bc5e85508f77aa904f9bbbcf65e5efb10
Expand All @@ -4013,17 +4029,23 @@ __metadata:
languageName: node
linkType: hard

<<<<<<< HEAD
"@metamask-institutional/sdk@npm:^0.1.25, @metamask-institutional/sdk@npm:^0.1.26":
version: 0.1.26
resolution: "@metamask-institutional/sdk@npm:0.1.26"
=======
"@metamask-institutional/sdk@npm:^0.1.26, @metamask-institutional/sdk@npm:^0.1.27":
version: 0.1.27
resolution: "@metamask-institutional/sdk@npm:0.1.27"
>>>>>>> 4cf7e804e1 (chore: bumps MMI packages (#24581))
dependencies:
"@metamask-institutional/simplecache": "npm:^1.1.0"
"@metamask-institutional/types": "npm:^1.1.0"
"@types/jsonwebtoken": "npm:^9.0.1"
"@types/node": "npm:^20.11.17"
bignumber.js: "npm:^9.1.1"
jsonwebtoken: "npm:^9.0.0"
checksum: 3fda158c16ed832a30cf5157d6d33896780323f1e50755bc6d1f1a070188334dd38a276673f44b46cb824bf653fa4a1123c3d878276bd55e93491aecacb9df72
checksum: 9de0d737cab194c8f16a63f92bade1265667f2042c4449bdde60240afb09cdfb71c2b583fbd629a9c72c43530b8d6816def91601aa517c8b47b0b2d473095397
languageName: node
linkType: hard

Expand All @@ -4034,17 +4056,17 @@ __metadata:
languageName: node
linkType: hard

"@metamask-institutional/transaction-update@npm:^0.2.0":
version: 0.2.0
resolution: "@metamask-institutional/transaction-update@npm:0.2.0"
"@metamask-institutional/transaction-update@npm:^0.2.2":
version: 0.2.2
resolution: "@metamask-institutional/transaction-update@npm:0.2.2"
dependencies:
"@metamask-institutional/custody-keyring": "npm:^1.1.0"
"@metamask-institutional/sdk": "npm:^0.1.26"
"@ethereumjs/util": "npm:^8.0.5"
"@metamask-institutional/custody-keyring": "npm:^2.0.0"
"@metamask-institutional/sdk": "npm:^0.1.27"
"@metamask-institutional/types": "npm:^1.1.0"
"@metamask-institutional/websocket-client": "npm:^0.2.0"
"@metamask-institutional/websocket-client": "npm:^0.2.2"
"@metamask/obs-store": "npm:^8.0.0"
ethereumjs-util: "npm:^7.1.5"
checksum: 9f8cd7a6a79e7806c74bfe1b3e9135cfa2b0fff6d8bdcf3699a5fa6b7b23110e4402345ec297168b8210a02ba1af955c4119c1a7baadd74ddcfc0590551b509b
checksum: 31c62a2d207e8e3c2469b870eecb18ff2db450eda8b28c2d428a69cc9eee8a477142f74abebad50c62a6e0f1132dafa8db6b8bf95f43677a401a54b4d3cd5fd0
languageName: node
linkType: hard

Expand All @@ -4055,15 +4077,15 @@ __metadata:
languageName: node
linkType: hard

"@metamask-institutional/websocket-client@npm:^0.2.0":
version: 0.2.0
resolution: "@metamask-institutional/websocket-client@npm:0.2.0"
"@metamask-institutional/websocket-client@npm:^0.2.2":
version: 0.2.2
resolution: "@metamask-institutional/websocket-client@npm:0.2.2"
dependencies:
"@metamask-institutional/custody-keyring": "npm:^1.1.0"
"@metamask-institutional/sdk": "npm:^0.1.26"
"@metamask-institutional/custody-keyring": "npm:^2.0.0"
"@metamask-institutional/sdk": "npm:^0.1.27"
"@metamask-institutional/types": "npm:^1.1.0"
mock-socket: "npm:^9.2.1"
checksum: 181ddcdedc5f8e1a68ce3e325add482a3fde5506c35b5ebcb775f3338cf54640dc88c7622d890a7ad05fb694d56e25e707e56ac796c283c381cec2d79b45892b
checksum: 652ffded926f5064e543e15e01992ec37a588783bc711a6f74404c1984ac5406fa83ab19187f00ae9b81a182cb46be08b0be388f583d68d6b45500969b5b2f46
languageName: node
linkType: hard

Expand Down Expand Up @@ -25055,6 +25077,7 @@ __metadata:
"@lavamoat/snow": "npm:^2.0.1"
"@lgbot/madge": "npm:^6.2.0"
"@material-ui/core": "npm:^4.11.0"
<<<<<<< HEAD
"@metamask-institutional/custody-controller": "npm:^0.2.24"
"@metamask-institutional/custody-keyring": "npm:^1.0.12"
"@metamask-institutional/extension": "npm:^0.3.20"
Expand All @@ -25063,6 +25086,16 @@ __metadata:
"@metamask-institutional/rpc-allowlist": "npm:1.0.3"
"@metamask-institutional/sdk": "npm:^0.1.25"
"@metamask-institutional/transaction-update": "npm:^0.2.0"
=======
"@metamask-institutional/custody-controller": "npm:^0.2.27"
"@metamask-institutional/custody-keyring": "npm:^2.0.0"
"@metamask-institutional/extension": "npm:^0.3.24"
"@metamask-institutional/institutional-features": "npm:^1.3.2"
"@metamask-institutional/portfolio-dashboard": "npm:^1.4.1"
"@metamask-institutional/rpc-allowlist": "npm:^1.0.3"
"@metamask-institutional/sdk": "npm:^0.1.26"
"@metamask-institutional/transaction-update": "npm:^0.2.2"
>>>>>>> 4cf7e804e1 (chore: bumps MMI packages (#24581))
"@metamask/abi-utils": "npm:^2.0.2"
"@metamask/accounts-controller": "npm:^11.0.0"
"@metamask/address-book-controller": "npm:^3.1.7"
Expand Down

0 comments on commit f696c34

Please sign in to comment.