diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-07-10 11:45:32 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-07-10 11:45:55 +0200 |
| commit | 8d1286014c61264440291f73997e60920dbc12ce (patch) | |
| tree | 2f8df5cefb15fbca125f19441450c25606edc49b /src/interfaces/wallet.h | |
| parent | 357488f660a570dc97d969ae92e026854d167142 (diff) | |
| parent | 8e7f930828a9f8f9be1c90ff45e3fdfef1980eaf (diff) | |
| download | bitcoin-8d1286014c61264440291f73997e60920dbc12ce.tar.xz | |
Merge #16237: Have the wallet give out destinations instead of keys
8e7f930828a9f8f9be1c90ff45e3fdfef1980eaf Add GetNewChangeDestination for getting new change Destinations (Andrew Chow)
33d13edd2bda0af90660e275ea4fa96ca9896f2a Replace CReserveKey with ReserveDestinatoin (Andrew Chow)
172213be5b174243dc501c1103ad5fe2fee67a16 Add GetNewDestination to CWallet to fetch new destinations (Andrew Chow)
Pull request description:
The wallet should give out destinations instead of keys. It should be the one that handles the conversion from key to destination and the setting of the label, not the caller. In order to do this, two new member functions are introduced `GetNewDestination()` and `GetNewChangeDestination()`. Additionally, `CReserveKey` is changed to be `ReserveDestination` and represents destinations whose keys can be returned to the keypool.
ACKs for top commit:
instagibbs:
re-utACK https://github.com/bitcoin/bitcoin/pull/16237/commits/8e7f930828a9f8f9be1c90ff45e3fdfef1980eaf
sipa:
ACK 8e7f930828a9f8f9be1c90ff45e3fdfef1980eaf. Concept ACK as this gives a much cleaner abstraction to work with, and light code review ACK.
laanwj:
ACK 8e7f930828a9f8f9be1c90ff45e3fdfef1980eaf
Tree-SHA512: 5be7051409232b71e0ef2c1fd1a3e76964ed2f5b14d47d06edc2ad3b3687abd0be2803a1adc45c0433aa2c3bed172e14f8a7e9f4a23bff70f86260b5a0497500
Diffstat (limited to 'src/interfaces/wallet.h')
| -rw-r--r-- | src/interfaces/wallet.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/interfaces/wallet.h b/src/interfaces/wallet.h index 9c9b29a813..db47dbafaf 100644 --- a/src/interfaces/wallet.h +++ b/src/interfaces/wallet.h @@ -78,8 +78,8 @@ public: //! Get wallet name. virtual std::string getWalletName() = 0; - // Get key from pool. - virtual bool getKeyFromPool(bool internal, CPubKey& pub_key) = 0; + // Get a new address. + virtual bool getNewDestination(const OutputType type, const std::string label, CTxDestination& dest) = 0; //! Get public key. virtual bool getPubKey(const CKeyID& address, CPubKey& pub_key) = 0; |