Skip to content

chore: Merge main into 7.17.1#8962

Merged
sethkfman merged 2 commits into
release/7.17.1from
chore/7.17.1-merge-from-main
Mar 15, 2024
Merged

chore: Merge main into 7.17.1#8962
sethkfman merged 2 commits into
release/7.17.1from
chore/7.17.1-merge-from-main

Conversation

@Cal-L

@Cal-L Cal-L commented Mar 15, 2024

Copy link
Copy Markdown
Contributor

Description

Merge main into 7.17.1

Related issues

Fixes:

Manual testing steps

  1. Go to this page...

Screenshots/Recordings

Before

After

Pre-merge author checklist

  • I’ve followed MetaMask Coding Standards.
  • I've clearly explained what problem this PR is solving and how it is solved.
  • I've linked related issues
  • I've included manual testing steps
  • I've included screenshots/recordings if applicable
  • I’ve included tests if applicable
  • I’ve documented my code using JSDoc format if applicable
  • I’ve applied the right labels on the PR (see labeling guidelines). Not required for external contributors.
  • I’ve properly set the pull request status:
    • In case it's not yet "ready for review", I've set it to "draft".
    • In case it's "ready for review", I've changed it from "draft" to "non-draft".

Pre-merge reviewer checklist

  • 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.

@Cal-L Cal-L requested review from a team as code owners March 15, 2024 18:04
@github-actions

Copy link
Copy Markdown
Contributor

CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes.

@Cal-L

Cal-L commented Mar 15, 2024

Copy link
Copy Markdown
Contributor Author

Will run E2E smoke on release branch

@socket-security

Copy link
Copy Markdown

New and removed dependencies detected. Learn more about Socket for GitHub ↗︎

Package New capabilities Transitives Size Publisher
npm/@lavamoat/allow-scripts@2.5.1 environment, filesystem, shell Transitive: network +132 6.24 MB boneskull
npm/@lavamoat/preinstall-always-fail@2.0.0 None 0 3.25 kB naugtur
npm/@metamask/approval-controller@3.5.0 Transitive: environment, network +24 6.2 MB metamaskbot
npm/@metamask/assets-controllers@11.0.1 Transitive: environment, filesystem, network +137 33.2 MB metamaskbot
npm/@metamask/base-controller@4.1.1 Transitive: environment, network +16 4.22 MB metamaskbot
npm/@metamask/gas-fee-controller@6.1.0 Transitive: environment, filesystem, network +92 17 MB metamaskbot
npm/@metamask/json-rpc-engine@7.3.2 Transitive: network +18 3.46 MB metamaskbot
npm/@metamask/message-manager@7.3.8 Transitive: environment, filesystem, network +70 14 MB metamaskbot
npm/@metamask/network-controller@11.0.0 environment Transitive: filesystem, network +91 16.8 MB metamaskbot
npm/@metamask/oss-attribution-generator@2.0.2 filesystem Transitive: environment, eval, shell +113 2.97 MB lgbot
npm/@metamask/permission-controller@7.1.0 Transitive: environment, filesystem, network +71 13.6 MB metamaskbot
npm/@metamask/phishing-controller@6.0.0 network Transitive: environment, filesystem +67 14.1 MB metamaskbot
npm/@metamask/post-message-stream@8.0.0 Transitive: network +15 3.26 MB lgbot
npm/@metamask/signature-controller@5.3.0 Transitive: environment, filesystem, network +84 18.6 MB metamaskbot
npm/@metamask/snaps-controllers@5.0.0 shell Transitive: environment, filesystem, network, unsafe +162 41 MB metamaskbot
npm/@metamask/snaps-rpc-methods@6.0.0 Transitive: environment, filesystem, network, shell, unsafe +140 37.2 MB metamaskbot
npm/@metamask/snaps-sdk@2.0.0 network +32 5.67 MB metamaskbot
npm/@metamask/snaps-utils@6.0.0 filesystem, network, shell Transitive: environment, unsafe +139 36.3 MB metamaskbot
npm/@metamask/transaction-controller@8.0.1 Transitive: environment, eval, filesystem, network +125 24.4 MB metamaskbot
npm/@noble/hashes@1.3.3 None 0 761 kB paulmillr
npm/@segment/analytics-react-native@2.17.0 network Transitive: environment, eval, filesystem, shell, unsafe +582 160 MB oscb
npm/@segment/sovran-react-native@1.0.4 Transitive: environment, eval, filesystem, network, shell, unsafe +475 155 MB oscb
npm/@stdlib/complex-float32@0.0.7 Transitive: environment, filesystem, network +58 2.3 MB stdlib-bot
npm/@stdlib/complex-float64@0.0.8 Transitive: environment, filesystem, network +59 2.37 MB stdlib-bot
npm/@stdlib/complex-reim@0.0.6 Transitive: environment, filesystem, network +63 2.58 MB stdlib-bot
npm/@stdlib/complex-reimf@0.0.1 Transitive: environment, filesystem, network +59 2.34 MB stdlib-bot
npm/@stdlib/utils-library-manifest@0.0.8 Transitive: environment, filesystem, network +50 1.94 MB stdlib-bot
npm/cross-fetch@3.1.8 network +4 558 kB lquixada
npm/define-data-property@1.1.4 Transitive: eval +8 179 kB ljharb
npm/get-intrinsic@1.2.4 eval +5 129 kB ljharb
npm/has-property-descriptors@1.0.2 Transitive: eval +7 152 kB ljharb
npm/immer@9.0.21 environment 0 872 kB mweststrate
npm/jackspeak@2.3.6 environment +9 512 kB isaacs
npm/minimatch@5.1.6 None +2 57.3 kB isaacs
npm/minipass@3.3.6 None +1 62.8 kB isaacs
npm/nanoid@3.3.7 None 0 24.4 kB ai
npm/plist@3.1.0 None +3 1.2 MB mreinstein
npm/semver@7.6.0 None +2 125 kB npm-cli-ops
npm/shell-quote@1.8.0 None 0 42.6 kB ljharb
npm/simple-get@3.1.1 network +3 28.2 kB linusu
npm/spdx-correct@3.2.0 None +3 51.4 kB kemitchell

🚮 Removed packages: npm/@metamask/approval-controller@3.4.0, npm/@metamask/assets-controllers@9.2.0, npm/@metamask/gas-fee-controller@6.0.0, npm/@metamask/json-rpc-engine@7.3.0, npm/@metamask/message-manager@7.3.7, npm/@metamask/network-controller@10.3.1, npm/@metamask/permission-controller@4.1.2, npm/@metamask/phishing-controller@5.0.0, npm/@metamask/post-message-stream@7.0.0, npm/@metamask/signature-controller@4.0.1, npm/@metamask/snaps-controllers@3.2.0, npm/@metamask/snaps-rpc-methods@3.2.1, npm/@metamask/snaps-utils@3.2.0, npm/@metamask/transaction-controller@6.1.0, npm/@metamask/utils@8.2.1, npm/@noble/hashes@1.3.2, npm/@segment/analytics-react-native@2.13.0, npm/@segment/sovran-react-native@0.4.5, npm/@types/readable-stream@4.0.9, npm/cross-fetch@2.2.6, npm/follow-redirects@1.15.4, npm/is-primitive@3.0.1, npm/nanoid@3.2.0, npm/pac-resolver@5.0.1, npm/plist@3.0.5, npm/shell-quote@1.7.3, npm/vm2@3.9.19, npm/zxcvbn@4.4.2

View full report↗︎

@socket-security

Copy link
Copy Markdown

🚨 Potential security issues detected. Learn more about Socket for GitHub ↗︎

To accept the risk, merge this PR and you will not be notified again.

Alert Package NoteSource
New author npm/ansi-regex@2.1.1
New author npm/dezalgo@1.0.4
Shell access npm/foreground-child@3.1.1
New author npm/simple-get@3.1.1
New author npm/@npmcli/fs@2.1.2
Deprecated npm/@npmcli/move-file@2.0.1
  • Reason: This functionality has been moved to @npmcli/fs
New author npm/unique-slug@3.0.0
New author npm/@stdlib/assert-has-tostringtag-support@0.0.9
New author npm/@stdlib/assert-is-object-like@0.0.8
New author npm/@stdlib/assert-is-regexp-string@0.0.9
New author npm/@stdlib/assert-is-string@0.0.8
New author npm/@stdlib/buffer-from-string@0.0.8
New author npm/@stdlib/constants-float64-exponent-bias@0.0.8
New author npm/@stdlib/constants-float64-high-word-exponent-mask@0.0.8
New author npm/@stdlib/constants-float64-max-base2-exponent@0.0.8
New author npm/@stdlib/constants-float64-max-base2-exponent-subnormal@0.0.8
New author npm/@stdlib/constants-float64-min-base2-exponent-subnormal@0.0.8
New author npm/@stdlib/constants-float64-ninf@0.0.8
New author npm/@stdlib/constants-float64-pinf@0.0.8
New author npm/@stdlib/constants-float64-smallest-normal@0.0.8
New author npm/@stdlib/math-base-napi-unary@0.0.9
New author npm/@stdlib/math-base-special-copysign@0.0.7
New author npm/@stdlib/number-float64-base-to-float32@0.0.7
New author npm/@stdlib/number-float64-base-to-words@0.0.7
New author npm/@stdlib/regexp-regexp@0.0.8
New author npm/@stdlib/string-lowercase@0.0.9
New author npm/@stdlib/string-replace@0.0.11
New author npm/@stdlib/utils-escape-regexp-string@0.0.9
New author npm/@stdlib/utils-regexp-from-string@0.0.9
New author npm/@segment/tsub@2.0.0
New author npm/@lavamoat/aa@3.1.5
New author npm/cmd-shim@6.0.2
Deprecated npm/@segment/analytics-react-native@2.17.0
  • Reason: Version causing issues with RN 0.71+
New author npm/node-gyp@9.4.1
New author npm/extension-port-stream@3.0.0
Install scripts npm/@lavamoat/preinstall-always-fail@2.0.0
  • Install script: preinstall
  • Source: echo "Don't run npm lifecycle scripts by default! Create a .yarnrc or .npmrc and set enableScripts: false. Then, whitelist them with @lavamoat/allow-scripts" && exit 1
New author npm/json-parse-even-better-errors@3.0.1
New author npm/@lavamoat/allow-scripts@2.5.1
New author npm/@metamask/post-message-stream@8.0.0
Network access npm/@metamask/snaps-sdk@2.0.0
Network access npm/@metamask/snaps-utils@6.0.0

View full report↗︎

Next steps

What is new author?

A new npm collaborator published a version of the package for the first time. New collaborators are usually benign additions to a project, but do indicate a change to the security surface area of a package.

Scrutinize new collaborator additions to packages because they now have the ability to publish code into your dependency tree. Packages should avoid frequent or unnecessary additions or changes to publishing rights.

What is shell access?

This module accesses the system shell. Accessing the system shell increases the risk of executing arbitrary code.

Packages should avoid accessing the shell which can reduce portability, and make it easier for malicious shell access to be introduced.

What is a deprecated package?

The maintainer of the package marked it as deprecated. This could indicate that a single version should not be used, or that the package is no longer maintained and any new vulnerabilities will not be fixed.

Research the state of the package and determine if there are non-deprecated versions that can be used, or if it should be replaced with a new, supported solution.

What is an install script?

Install scripts are run when the package is installed. The majority of malware in npm is hidden in install scripts.

Packages should not be running non-essential scripts during install and there are often solutions to problems people solve with install scripts that can be run at publish time instead.

What is network access?

This module accesses the network.

Packages should remove all network access that is functionally unnecessary. Consumers should audit network access to ensure legitimate use.

Take a deeper look at the dependency

Take a moment to review the security alert above. Review the linked package source code to understand the potential risk. Ensure the package is not malicious before proceeding. If you're unsure how to proceed, reach out to your security team or ask the Socket team for help at support [AT] socket [DOT] dev.

Remove the package

If you happen to install a dependency that Socket reports as Known Malware you should immediately remove it and select a different dependency. For other alert types, you may may wish to investigate alternative packages or consider if there are other ways to mitigate the specific risk posed by the dependency.

Mark a package as acceptable risk

To ignore an alert, reply with a comment starting with @SocketSecurity ignore followed by a space separated list of ecosystem/package-name@version specifiers. e.g. @SocketSecurity ignore npm/foo@1.0.0 or ignore all packages with @SocketSecurity ignore-all

  • @SocketSecurity ignore npm/ansi-regex@2.1.1
  • @SocketSecurity ignore npm/dezalgo@1.0.4
  • @SocketSecurity ignore npm/foreground-child@3.1.1
  • @SocketSecurity ignore npm/simple-get@3.1.1
  • @SocketSecurity ignore npm/@npmcli/fs@2.1.2
  • @SocketSecurity ignore npm/@npmcli/move-file@2.0.1
  • @SocketSecurity ignore npm/unique-slug@3.0.0
  • @SocketSecurity ignore npm/@stdlib/assert-has-tostringtag-support@0.0.9
  • @SocketSecurity ignore npm/@stdlib/assert-is-object-like@0.0.8
  • @SocketSecurity ignore npm/@stdlib/assert-is-regexp-string@0.0.9
  • @SocketSecurity ignore npm/@stdlib/assert-is-string@0.0.8
  • @SocketSecurity ignore npm/@stdlib/buffer-from-string@0.0.8
  • @SocketSecurity ignore npm/@stdlib/constants-float64-exponent-bias@0.0.8
  • @SocketSecurity ignore npm/@stdlib/constants-float64-high-word-exponent-mask@0.0.8
  • @SocketSecurity ignore npm/@stdlib/constants-float64-max-base2-exponent@0.0.8
  • @SocketSecurity ignore npm/@stdlib/constants-float64-max-base2-exponent-subnormal@0.0.8
  • @SocketSecurity ignore npm/@stdlib/constants-float64-min-base2-exponent-subnormal@0.0.8
  • @SocketSecurity ignore npm/@stdlib/constants-float64-ninf@0.0.8
  • @SocketSecurity ignore npm/@stdlib/constants-float64-pinf@0.0.8
  • @SocketSecurity ignore npm/@stdlib/constants-float64-smallest-normal@0.0.8
  • @SocketSecurity ignore npm/@stdlib/math-base-napi-unary@0.0.9
  • @SocketSecurity ignore npm/@stdlib/math-base-special-copysign@0.0.7
  • @SocketSecurity ignore npm/@stdlib/number-float64-base-to-float32@0.0.7
  • @SocketSecurity ignore npm/@stdlib/number-float64-base-to-words@0.0.7
  • @SocketSecurity ignore npm/@stdlib/regexp-regexp@0.0.8
  • @SocketSecurity ignore npm/@stdlib/string-lowercase@0.0.9
  • @SocketSecurity ignore npm/@stdlib/string-replace@0.0.11
  • @SocketSecurity ignore npm/@stdlib/utils-escape-regexp-string@0.0.9
  • @SocketSecurity ignore npm/@stdlib/utils-regexp-from-string@0.0.9
  • @SocketSecurity ignore npm/@segment/tsub@2.0.0
  • @SocketSecurity ignore npm/@lavamoat/aa@3.1.5
  • @SocketSecurity ignore npm/cmd-shim@6.0.2
  • @SocketSecurity ignore npm/@segment/analytics-react-native@2.17.0
  • @SocketSecurity ignore npm/node-gyp@9.4.1
  • @SocketSecurity ignore npm/extension-port-stream@3.0.0
  • @SocketSecurity ignore npm/@lavamoat/preinstall-always-fail@2.0.0
  • @SocketSecurity ignore npm/json-parse-even-better-errors@3.0.1
  • @SocketSecurity ignore npm/@lavamoat/allow-scripts@2.5.1
  • @SocketSecurity ignore npm/@metamask/post-message-stream@8.0.0
  • @SocketSecurity ignore npm/@metamask/snaps-sdk@2.0.0
  • @SocketSecurity ignore npm/@metamask/snaps-utils@6.0.0

@sethkfman sethkfman left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@codecov-commenter

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 34.53815% with 326 lines in your changes are missing coverage. Please review.

❗ No coverage uploaded for pull request base (release/7.17.1@9c03603). Click here to learn what that means.

Files Patch % Lines
app/components/UI/Ramp/Views/Quotes/Quotes.tsx 50.68% 26 Missing and 10 partials ⚠️
...components/Views/AccountConnect/AccountConnect.tsx 0.00% 29 Missing ⚠️
app/components/UI/Swaps/QuotesView.js 0.00% 19 Missing ⚠️
app/components/Views/BrowserTab/index.js 0.00% 17 Missing ⚠️
app/components/UI/Tokens/index.tsx 57.89% 13 Missing and 3 partials ⚠️
app/components/UI/OptinMetrics/index.js 0.00% 15 Missing ⚠️
.../DeprecatedNetworkModal/DeprecatedNetworkModal.tsx 9.09% 10 Missing ⚠️
app/components/Nav/Main/index.js 0.00% 8 Missing ⚠️
app/components/Nav/App/index.js 0.00% 7 Missing ⚠️
...ts/Views/AccountPermissions/AccountPermissions.tsx 0.00% 7 Missing ⚠️
... and 64 more
Additional details and impacted files
@@                Coverage Diff                @@
##             release/7.17.1    #8962   +/-   ##
=================================================
  Coverage                  ?   43.75%           
=================================================
  Files                     ?     1271           
  Lines                     ?    31055           
  Branches                  ?     3148           
=================================================
  Hits                      ?    13587           
  Misses                    ?    16657           
  Partials                  ?      811           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@sonarqubecloud

Copy link
Copy Markdown

@tommasini tommasini left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but we have an file that it's not following the name pattern on 7.17.1, it's not harmfull but we should remove it: https://github.com/MetaMask/metamask-mobile/blob/v7.17.1/app/store/migrations/031.ts.test.ts

That's why merging main into 7.17.1 is showing that it's adding a 031 new test file

@sethkfman sethkfman merged commit 5f451e3 into release/7.17.1 Mar 15, 2024
@sethkfman sethkfman deleted the chore/7.17.1-merge-from-main branch March 15, 2024 20:03
@github-actions github-actions Bot locked and limited conversation to collaborators Mar 15, 2024
@metamaskbot metamaskbot added the release-7.17.1 Issue or pull request that will be included in release 7.17.1 label Mar 15, 2024
@metamaskbot

Copy link
Copy Markdown
Collaborator

No release label on PR. Adding release label release-7.17.1 on PR, as PR was added to branch 7.17.1 when release was cut.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

release-7.17.1 Issue or pull request that will be included in release 7.17.1 team-mobile-platform Mobile Platform team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants