diff options
author | MarcoFalke <falke.marco@gmail.com> | 2019-08-19 08:27:55 -0400 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2019-08-19 08:28:00 -0400 |
commit | 00ffe5aca134f424351b05a85da4eef9c3e4553a (patch) | |
tree | d38a726bdfac13e1fcb3eb439fa5dc339c740f12 /doc/bips.md | |
parent | 43cf76b1939584caa565c788bf331ea9a909570d (diff) | |
parent | 576580fe8a063f21c0e903af1cf8f85cd6cb71d7 (diff) | |
download | bitcoin-00ffe5aca134f424351b05a85da4eef9c3e4553a.tar.xz |
Merge #16608: [0.18] Backport #15911: Use wallet RBF default for walletcreatefundedpsbt
576580fe8a063f21c0e903af1cf8f85cd6cb71d7 [test] walletcreatefundedpsbt: check RBF is disabled when -walletrbf=0 (Sjors Provoost)
0942a60c06ab4bde275369e7b7bd1caa3b20778e [doc] rpc: remove "fallback to" from RBF default help (Sjors Provoost)
ee950ec465b616b1f7dd14df8f77c66a817c0b64 [rpc] walletcreatefundedpsbt: use wallet default RBF (Sjors Provoost)
Pull request description:
Backport of #15911 for 0.18 branch.
The original PR changed `rawtransaction_util.cpp`, whereas the backport changes `rawtransaction.cpp` to avoid having to also backport #15638.
ACKs for top commit:
meshcollider:
re-utACK 576580fe8a063f21c0e903af1cf8f85cd6cb71d7
MarcoFalke:
ACK 576580fe8a063f21c0e903af1cf8f85cd6cb71d7
Tree-SHA512: 51c40fc4db4f8739e93e931aeac572779d5ade0bfeb3bcb0082301cf73b4f48e31d4ccbe40421dc65d0ec091d6393685c0c9b8f76584c59249f13642e80a6da5
Diffstat (limited to 'doc/bips.md')
0 files changed, 0 insertions, 0 deletions