Skip to content

vault envelope encryption #5940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 25 commits into
base: main
Choose a base branch
from
Open

vault envelope encryption #5940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
46534b9
(wip) new mock encryptor
matthiasgeihs Jun 9, 2025
09787e4
cleanup
matthiasgeihs Jun 9, 2025
d7048d2
adjust coverage threshold
matthiasgeihs Jun 10, 2025
aa34063
update changelog
matthiasgeihs Jun 10, 2025
880af0e
address review comments
matthiasgeihs Jun 11, 2025
68957f5
cleanup comment
matthiasgeihs Jun 11, 2025
72d3d75
Remove CHANGELOG entry
matthiasgeihs Jun 13, 2025
2725657
lint
matthiasgeihs Jun 5, 2025
4a8e031
keyring: add support for envelope encryption
matthiasgeihs Jun 5, 2025
fae8763
add envelope encryption tests
matthiasgeihs Jun 9, 2025
f41e10a
update eslint warning thresholds
matthiasgeihs Jun 10, 2025
2fd83d6
update CHANGELOG
matthiasgeihs Jun 10, 2025
6bcae1a
restore encrypted key on rollback
matthiasgeihs Jun 10, 2025
3485c1c
add TODO comment
matthiasgeihs Jun 11, 2025
f454afd
persistOrRollback: ensure state not changed during callback
matthiasgeihs Jun 11, 2025
5d977ce
fix envelope encryption pattern
matthiasgeihs Jun 11, 2025
18ff719
remove unreachable code
matthiasgeihs Jun 11, 2025
edffc89
remove check because of coverage issues
matthiasgeihs Jun 11, 2025
6a1df4a
add encryption key option to createNewVaultAndRestore
matthiasgeihs Jun 12, 2025
ebc0d76
add key derivation function
matthiasgeihs Jun 12, 2025
e4b08d6
fix #withRollback: restore this.#encryptionKey
matthiasgeihs Jun 13, 2025
b0df232
remove deriveKeyFromSeed in favor of encryptor.keyFromPassword
matthiasgeihs Jun 13, 2025
a073233
add comments to #updateCachedEncryptionKey
matthiasgeihs Jun 13, 2025
319a60e
rename key
matthiasgeihs Jun 13, 2025
0013a1b
add comment to why we don't store salt here
matthiasgeihs Jun 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions eslint-warning-thresholds.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,10 +215,6 @@
"import-x/namespace": 14,
"jest/no-conditional-in-test": 8
},
"packages/keyring-controller/src/KeyringController.ts": {
"@typescript-eslint/no-unsafe-enum-comparison": 4,
"@typescript-eslint/no-unused-vars": 1
},
"packages/keyring-controller/tests/mocks/mockKeyring.ts": {
"@typescript-eslint/prefer-readonly": 1
},
Expand Down
4 changes: 4 additions & 0 deletions packages/keyring-controller/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Added

- Add support for envelope encryption ([#5940](https://github.com/MetaMask/core/pull/5940))

## [22.0.2]

### Fixed
Expand Down
Loading
Loading