diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-09-23 09:33:13 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-09-23 09:33:23 -0400 |
| commit | 3b0422118368a22f9eccb0103c15cd4010ac8d85 (patch) | |
| tree | 6da4ad0852697efc1cad16e2d64b5485cfa7e87d /src/Makefile.qt.include | |
| parent | 00ffe5aca134f424351b05a85da4eef9c3e4553a (diff) | |
| parent | d3b3bb8c9fb3a2ff1cd3a8776552c649aaf19dc2 (diff) | |
| download | bitcoin-3b0422118368a22f9eccb0103c15cd4010ac8d85.tar.xz | |
Merge #16414: 0.18: wallet: Fix -maxtxfee check by moving it to CWallet::CreateTransaction
d3b3bb8c9fb3a2ff1cd3a8776552c649aaf19dc2 0.18: test: Add test for maxtxfee option (MarcoFalke)
a11dbaa547ec01e7e11ca4dbe2433e7d987c82bb 0.18: wallet: Fix -maxtxfee check by moving it to CWallet::CreateTransaction (João Barbosa)
8f354ced6e34247477c1b1a56d34e613f6104f0e 0.18: [wallet] abort when attempting to fund a transaction above maxtxfee (Sjors Provoost)
Pull request description:
Backports #16322 and #16257.
ACKs for top commit:
Sjors:
re-ACK d3b3bb8c9fb3a2ff1cd3a8776552c649aaf19dc2
MarcoFalke:
ACK d3b3bb8c9fb3a2ff1cd3a8776552c649aaf19dc2 (did the backport myself, arrived at the same result)
Tree-SHA512: 8b0ca15fc7e893af80239afecf8ff1018d6f249f2fa530babe61ec34ede6103b9b60909259abb730ebf1d54789aceed94b136600158dc3d6c5505b07f28189e5
Diffstat (limited to 'src/Makefile.qt.include')
0 files changed, 0 insertions, 0 deletions