diff options
author | Samuel Dobson <dobsonsa68@gmail.com> | 2020-04-18 21:37:20 +1200 |
---|---|---|
committer | Samuel Dobson <dobsonsa68@gmail.com> | 2020-04-18 22:00:26 +1200 |
commit | bbb1ba1814738d9d641bff69564972083013e130 (patch) | |
tree | 07326b3ed124a05b80181837f38dc34aae9a41a4 /src/test/script_p2sh_tests.cpp | |
parent | 895c71e53557ce0385181191270c660fc6c32ce1 (diff) | |
parent | 92bcd70808b9cac56b184903aa6d37baf9641b37 (diff) | |
download | bitcoin-bbb1ba1814738d9d641bff69564972083013e130.tar.xz |
Merge #17219: wallet: allow transaction without change if keypool is empty
92bcd70808b9cac56b184903aa6d37baf9641b37 [wallet] allow transaction without change if keypool is empty (Sjors Provoost)
709f8685ac37510aa145ac259753583c82280038 [wallet] CreateTransaction: simplify change address check (Sjors Provoost)
5efc25f9638866941028454cfa9bae27f1519cb4 [wallet] translate "Keypool ran out" message (Sjors Provoost)
Pull request description:
Extracted from #16944
First this PR simplifies the check when generating a change address, by dropping `CanGetAddresses` and just letting `reservedest.GetReservedDestination` do this check.
Second, when the keypool is empty, instead of immediately giving up, we create a dummy change address and pass that to coin selection. If we didn't need the change address (e.g. when spending the entire balance), then it's all good. If we did need a change address, we throw the original error.
ACKs for top commit:
fjahr:
Code review ACK 92bcd70808b9cac56b184903aa6d37baf9641b37
jonasschnelli:
utACK 92bcd70808b9cac56b184903aa6d37baf9641b37
achow101:
ACK 92bcd70808b9cac56b184903aa6d37baf9641b37
meshcollider:
Code review ACK 92bcd70808b9cac56b184903aa6d37baf9641b37
Tree-SHA512: 07b8c8251f57061c58a85ebf0359be63583c23bac7a2c4cefdc14820c0cdebcc90a2bb218e5ede0db11d1e204cda149e056dfd18614642070b3d56efe2735006
Diffstat (limited to 'src/test/script_p2sh_tests.cpp')
0 files changed, 0 insertions, 0 deletions