[wallet] Reopen CDBEnv after encryption instead of shutting down #2648
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
According to the BerkeleyDB docs, the DbEnv handle may not be accessed after close() has been called. This change ensures that we create a new handle after close() is called. This avoids a segfault when the first connection attempt fails and then a second connection attempt tries to call open() on the already closed DbEnv handle.
Instead of having the object destroy itself, having the caller destroy it.
Adds a ReloadDbEnv function to BerkeleyEnvironment in order to close all Db instances, closes the environment, resets it, and then reopens the BerkeleyEnvironment. Also adds a ReloadDbEnv function to BerkeleyDatabase that calls BerkeleyEnvironment's ReloadDbEnv.
Calls ReloadDbEnv after encrypting the wallet so that the database environment is flushed, closed, and reopened to prevent unencrypted keys from being saved on disk.
Since the database environment is flushed, closed, and reopened during EncryptWallet, there is no need to shut down the software anymore. Adaptation of btc@c1dde3a949b36ce9c2155777b3fa1372e7ed97d8
furszy
force-pushed
the
2021_wallet_encryption_restart
branch
from
7af11b3 to
6e03bf2
Compare
furszy
changed the title
furszy
changed the title
furszy
force-pushed
the
2021_wallet_encryption_restart
branch
from
dd111b8 to
3d8f54f
Compare
|
Took me a while to find the problem, ready now. |
furszy
force-pushed
the
2021_wallet_encryption_restart
branch
2 times, most recently
from
87e56e2 to
28d17a1
Compare
There are tests, like the ones that uses the wallet encryption, that need access to a real wallet database and not to a mock.
Fuzzbawls
approved these changes
Dec 5, 2021
There was a problem hiding this comment.
ACK c5340ec
maybe unrelated, but when doing this via the GUI with an already large wallet, the animation screen didn't fully load, so the wallet could be perceived as "frozen"/"unresponsive", but the process did eventually finish...so some follow-up may be needed. A smaller wallet did not display this issue.
|
yep, unrelated to this change. Could work on it on a follup-up work for sure. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
An improvement for the wallet UX: Stop requiring a wallet shutdown after the initial encryption. Now the process can safely continue running without any fear of leaking unencrypted keys.
PRs backported from upstream: