diff options
| author | Samuel Dobson <dobsonsa68@gmail.com> | 2020-01-08 10:31:23 +1300 |
|---|---|---|
| committer | Samuel Dobson <dobsonsa68@gmail.com> | 2020-01-08 10:31:51 +1300 |
| commit | bcb4cdcca321b9dd9e754c68add4cfcdf0439a70 (patch) | |
| tree | 8887bb25fed2e3fdd1856188d6605084dba7e895 /src/wallet/wallet.h | |
| parent | e8e79958a7b2a0bf1b02adcce9f4d811eac37dfc (diff) | |
| parent | 09502452bbbe21bb974f1de8cf53196373921ab9 (diff) | |
Merge #17621: IsUsedDestination should count any known single-key address
09502452bbbe21bb974f1de8cf53196373921ab9 IsUsedDestination should count any known single-key address (Gregory Sanders)
Pull request description:
This plugs the privacy leak detailed at https://github.com/bitcoin/bitcoin/issues/17605, at least for the single-key case.
ACKs for top commit:
meshcollider:
Code Review ACK 09502452bbbe21bb974f1de8cf53196373921ab9
Tree-SHA512: e1d68281675f05072b3087171cba1df9416a69c9ccf70c72e8555e55eadda2d0fd339e5a894e3a3438ff94b9e3827fb19b8b701faade70c08756b19ff157ee0c
Diffstat (limited to 'src/wallet/wallet.h')
| -rw-r--r-- | src/wallet/wallet.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index c4511601de..9dad0d780a 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -798,9 +798,8 @@ public: bool IsSpent(const uint256& hash, unsigned int n) const EXCLUSIVE_LOCKS_REQUIRED(cs_wallet); - // Whether this or any UTXO with the same CTxDestination has been spent. - bool IsUsedDestination(const CTxDestination& dst) const; - bool IsUsedDestination(const uint256& hash, unsigned int n) const; + // Whether this or any known UTXO with the same single key has been spent. + bool IsUsedDestination(const uint256& hash, unsigned int n) const EXCLUSIVE_LOCKS_REQUIRED(cs_wallet); void SetUsedDestinationState(WalletBatch& batch, const uint256& hash, unsigned int n, bool used) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet); std::vector<OutputGroup> GroupOutputs(const std::vector<COutput>& outputs, bool single_coin) const; |