Wladimir J. van der Laan
0192bd0652
Merge #17369 : Refactor: Move encryption code between KeyMan and Wallet
...
7cecf10ac3 Replace LegacyScriptPubKeyMan::IsCrypted with LegacyScriptPubKeyMan::HasEncryptionKeys (Andrew Chow)
bf6417142f Remove SetCrypted() and fUseCrypto; Change IsCrypted()'s implementation (Andrew Chow)
77a777118e Rename EncryptKeys to Encrypt and pass in the encrypted batch to use (Andrew Chow)
35f962fcf0 Clear mapKeys before encrypting (Andrew Chow)
14b5efd66f Move fDecryptionThoroughlyChecked from CWallet to LegacyScriptPubKeyMan (Andrew Chow)
97c0374a46 Move Unlock implementation to LegacyScriptPubKeyMan (Andrew Chow)
e576b135d6 Replace LegacyScriptPubKeyMan::vMasterKey with GetDecryptionKey() (Andrew Chow)
fd9d6eebc1 Add 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:
ACK 7cecf10ac3
Tree-SHA512: 95a997c366ca539abba0c0a7a0015f39d27b55220683d8d86344ff2d926db4724da67700d2c8ec2d82ed75d07404318c6cb81544af8aadeefab312167257e673
2019-12-12 12:17:10 +01:00
..
2019-12-05 16:31:09 -08:00
2019-11-12 14:50:44 -08:00
2019-11-27 21:27:56 +00:00
2019-11-12 15:35:26 -08:00
2019-10-15 22:56:43 +00:00
2019-11-23 09:22:02 +13:00
2019-01-26 12:45:48 -05:00
2019-11-04 14:13:52 -05:00
2019-12-10 12:12:10 -05:00
2019-10-28 13:31:33 +01:00
2019-10-15 22:56:43 +00:00
2019-12-11 17:00:27 -05:00
2019-12-10 19:48:53 +01:00
2019-11-21 10:11:06 -05:00
2019-03-31 11:41:05 -07:00
2019-11-16 10:43:37 -08:00
2019-12-12 10:56:31 +01:00
2019-10-30 16:24:02 -04:00
2019-11-26 09:55:07 -05:00
2019-12-06 15:05:48 -05:00
2019-11-05 12:59:16 -05:00
2019-10-14 13:24:54 +03:00
2019-06-14 08:30:43 +02:00
2019-10-29 11:30:12 +02:00
2019-06-02 17:15:23 +02:00
2019-02-27 16:53:44 -05:00
2018-12-29 10:15:01 +01:00
2019-10-15 22:56:43 +00:00
2019-10-15 22:56:43 +00:00
2018-11-05 17:03:11 +01:00
2019-07-24 16:33:20 +03:00
2019-11-04 13:18:27 +01:00
2019-11-19 15:38:27 -08:00
2019-12-05 16:31:09 -08:00
2019-10-16 08:56:57 -07:00
2019-09-05 13:25:11 +12:00
2019-12-04 06:48:53 +00:00
2019-10-28 13:31:33 +01:00
2019-01-30 16:26:52 -05:00
2019-12-02 12:06:35 -05:00
2019-10-30 12:35:41 +01:00
2019-10-29 15:46:45 -04:00
2019-10-15 22:56:43 +00:00
2019-04-06 12:10:55 -07:00
2019-04-06 12:10:55 -07:00
2019-05-22 15:55:50 +01:00
2019-10-16 17:06:20 -04:00
2019-03-27 18:29:48 -04:00
2019-10-16 13:06:50 -04:00
2019-11-12 17:59:52 -06:00
2019-11-01 12:06:35 +01:00
2019-09-06 22:05:33 +02:00
2019-11-01 12:06:35 +01:00
2019-10-02 08:51:12 +02:00
2019-07-21 21:00:31 -04:00
2019-09-25 20:56:38 +02:00
2019-01-23 16:28:27 +08:00
2019-10-15 22:56:43 +00:00
2019-03-26 17:38:00 -07:00
2019-06-06 08:00:33 +02:00
2019-08-30 11:29:21 +09:00
2019-11-29 21:23:25 +02:00
2019-04-30 10:05:54 +03:00
2019-10-15 22:56:43 +00:00
2019-10-28 10:30:51 -04:00
2019-02-22 17:38:45 -08:00
2019-02-22 17:38:45 -08:00
2019-10-28 13:41:45 +01:00
2019-04-30 10:05:54 +03:00
2018-11-05 09:25:15 -08:00
2019-03-31 11:41:05 -07:00
2019-10-28 13:41:45 +01:00
2019-10-15 22:56:43 +00:00
2019-10-25 13:11:09 +00:00
2019-10-15 22:56:43 +00:00
2019-11-21 21:05:38 +01:00
2019-10-28 10:30:51 -04:00
2019-12-05 16:31:09 -08:00
2019-11-20 12:43:55 +01:00
2019-11-20 12:43:55 +01:00
2019-11-08 18:45:38 +01:00
2019-11-08 18:45:38 +01:00
2019-11-21 21:13:08 +01:00
2019-11-21 21:13:08 +01:00
2019-01-26 09:28:48 +08:00
2019-09-30 09:41:11 +02:00
2019-11-21 19:38:39 +01:00
2019-11-21 21:13:08 +01:00
2019-11-21 21:13:08 +01:00
2019-12-10 16:39:40 +00:00
2019-06-02 17:15:23 +02:00
2019-11-20 19:06:52 -05:00
2019-02-12 11:34:57 -05:00
2019-08-15 10:05:32 -04:00
2019-08-11 11:33:27 +09:00
2019-11-05 12:38:28 -05:00
2019-10-29 15:46:45 -04:00
2019-10-29 11:30:12 +02:00
2019-11-23 16:06:34 -05:00
2019-11-05 12:38:28 -05:00
2019-06-11 17:18:16 +02:00
2019-10-15 22:56:43 +00:00
2019-11-04 04:22:53 -05:00
2019-08-08 11:35:14 +09:00
2019-11-04 10:42:33 -05:00
2019-11-04 10:42:33 -05:00
2019-01-30 22:44:28 +02:00
2019-10-16 08:56:57 -07:00
2019-07-09 16:20:18 -04:00
2019-11-29 21:23:25 +02:00
2019-10-02 10:39:14 -04:00
2019-12-11 17:00:27 -05:00
2019-11-19 14:54:08 -05:00
2019-12-10 12:12:10 -05:00
2019-12-06 13:35:37 -05:00
2019-11-20 12:43:55 +01:00
2019-12-08 18:34:02 -08:00
2019-12-05 09:49:11 -08:00
2019-11-20 10:54:08 -08:00
2019-11-12 14:50:44 -08:00
2019-10-15 22:56:43 +00:00
2019-11-12 15:35:26 -08:00
2019-02-10 17:17:32 -05:00
2019-10-15 22:56:43 +00:00
2019-10-15 22:56:43 +00:00
2019-10-28 13:31:33 +01:00
2019-09-25 10:56:00 -04:00
2018-08-31 16:00:38 +02:00
2019-10-15 22:56:43 +00:00
2019-05-17 13:29:04 +02:00
2019-07-24 16:33:20 +03:00
2019-12-06 10:02:08 +01:00
2019-07-17 15:32:38 +01:00
2019-10-15 22:56:43 +00:00
2019-10-16 08:56:57 -07:00
2019-10-15 22:56:43 +00:00
2019-11-21 21:05:38 +01:00
2019-11-09 22:08:29 -08:00
2019-06-18 15:59:53 -04:00
2019-10-15 22:56:43 +00:00
2019-10-15 22:56:43 +00:00
2019-10-15 22:56:43 +00:00
2018-11-05 09:25:15 -08:00
2019-11-20 19:06:52 -05:00
2019-11-29 21:23:25 +02:00
2019-11-21 21:05:38 +01:00
2019-11-21 21:05:38 +01:00
2019-08-15 11:02:55 -04:00
2019-08-15 11:02:55 -04:00
2019-08-14 15:52:52 -04:00
2018-09-23 22:55:11 +02:00
2019-10-28 10:30:51 -04:00
2019-07-24 16:33:20 +03:00
2019-10-15 22:56:43 +00:00