mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-05-13 07:23:21 +02:00
0192bd0652
7cecf10ac3Replace LegacyScriptPubKeyMan::IsCrypted with LegacyScriptPubKeyMan::HasEncryptionKeys (Andrew Chow)bf6417142fRemove SetCrypted() and fUseCrypto; Change IsCrypted()'s implementation (Andrew Chow)77a777118eRename EncryptKeys to Encrypt and pass in the encrypted batch to use (Andrew Chow)35f962fcf0Clear mapKeys before encrypting (Andrew Chow)14b5efd66fMove fDecryptionThoroughlyChecked from CWallet to LegacyScriptPubKeyMan (Andrew Chow)97c0374a46Move Unlock implementation to LegacyScriptPubKeyMan (Andrew Chow)e576b135d6Replace LegacyScriptPubKeyMan::vMasterKey with GetDecryptionKey() (Andrew Chow)fd9d6eebc1Add GetEncryptionKey() and HasEncryptionKeys() to WalletStorage (Andrew Chow) Pull request description: Let wallet class handle locked/unlocked status and master key, and let keyman handle encrypting its data and determining whether there is encrypted data. There should be no change in behavior, but state is tracked differently. The fUseCrypto atomic bool is eliminated and replaced with equivalent HasEncryptionKeys checks. Split from #17261 ACKs for top commit: laanwj: ACK7cecf10ac3Tree-SHA512: 95a997c366ca539abba0c0a7a0015f39d27b55220683d8d86344ff2d926db4724da67700d2c8ec2d82ed75d07404318c6cb81544af8aadeefab312167257e673