Skip to content
This repository has been archived by the owner on Oct 7, 2024. It is now read-only.

Sync with 15.x branch #314

Merged
merged 6 commits into from
Jan 9, 2024
Merged

Sync with 15.x branch #314

merged 6 commits into from
Jan 9, 2024

Conversation

Gudahtt
Copy link
Member

@Gudahtt Gudahtt commented Nov 29, 2023

Description

This PR includes changes from the v15.x branch, which just had a backport release v15.1.0

Changes

None

References

See #313

Checklist

  • I've updated the test suite for new or updated code as appropriate
  • I've updated documentation for new or updated code as appropriate (note: this will usually be JSDoc)
  • I've highlighted breaking changes using the "BREAKING" category above as appropriate

mikesposito and others added 3 commits November 29, 2023 16:27
* Prefer cached `encryptionKey` for encryption when possible (#307)

* fix: prefer encryptionKey for encryption when possible

* refactor: add test case

* Use encryptor `isVaultUpdated` (#310)

* chore: update browser-passworder

* refactor: remove `updateVault` from `GenericEncryptor`
* 15.1.0

* edit changelog entries

* rephrase changelog entry

---------

Co-authored-by: github-actions <github-actions@github.com>
Co-authored-by: Michele Esposito <michele@esposito.codes>
* origin/main:
  Use encryptor `isVaultUpdated` (#310)
  Bump @metamask/browser-passworder from 4.2.0 to 4.3.0 (#311)
  Prefer cached `encryptionKey` for encryption when possible (#307)
  Bump @metamask/obs-store from 8.1.0 to 9.0.0 (#306)
  Bump @metamask/eth-sig-util from 7.0.0 to 7.0.1 (#302)
@Gudahtt Gudahtt requested a review from a team as a code owner November 29, 2023 22:18
Copy link

socket-security bot commented Nov 29, 2023

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

Packages Version New capabilities Transitives Size Publisher
@metamask/eth-keyring-controller 15.1.0 None +0 154 kB gudahtt

🚮 Removed packages: @metamask/eth-keyring-controller@15.0.0

@legobeat legobeat mentioned this pull request Nov 29, 2023
2 tasks
Copy link

socket-security bot commented Dec 11, 2023

👍 Dependency issues cleared. Learn more about Socket for GitHub ↗︎

This PR previously contained dependency changes with security issues that have been resolved, removed, or ignored.

Ignoring: @metamask/eth-keyring-controller@15.1.0

Next steps

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 package-name@version specifiers. e.g. @SocketSecurity ignore foo@1.0.0 bar@* or ignore all packages with @SocketSecurity ignore-all

@legobeat

This comment was marked as resolved.

* origin/main:
  chore(deps): bump @metamask/snaps-sdk from 1.3.0 to 1.3.1 (#322)
  chore(deps): bump @metamask/json-rpc-engine from 7.3.0 to 7.3.1 (#324)
  chore(deps-dev): bump @metamask/auto-changelog from 3.4.3 to 3.4.4 (#323)
  chore(deps): bump @metamask/snaps-sdk from 1.2.0 to 1.3.0 (#317)
@Gudahtt Gudahtt merged commit 820a2a2 into main Jan 9, 2024
17 checks passed
@Gudahtt Gudahtt deleted the sync-15.x branch January 9, 2024 15:35
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants