diff options
author | MarcoFalke <falke.marco@gmail.com> | 2020-12-04 18:13:48 +0100 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2020-12-04 18:14:15 +0100 |
commit | aa4b8ebfecddc7795200904009fea84b2c644141 (patch) | |
tree | 887a8343ab0575a1a63cba28d60d56c65f19f6ae /src/flatfile.h | |
parent | 68bd88597a79eea5e329e2f1ebcd54df2da29a45 (diff) | |
parent | 6313362553d91bddb75a43f62dffbec16065e4d6 (diff) |
Merge #20510: [backport] wallet: allow zero-fee fundrawtransaction/walletcreatefundedpsbt and other fixes
6313362553d91bddb75a43f62dffbec16065e4d6 Use the correct incremental fee constant in bumpfee help (Jon Atack)
6e4969f76f58518d47ce2f2cdfc4e3ef1f2228bd Update feeRate (BTC/kvB) to fee_rate (sat/vB) in wallet_bumpfee (Jon Atack)
54e1edcc2bca76f783170768e65bf0850b036b81 Allow zero-fee fundrawtxn and walletcreatefundedpsbt calls (Jon Atack)
Pull request description:
Github-Pull: #20426
Rebased-From: 1b3d7009280595108eb22ac1188bc4367804fc5d
Github-Pull: #20426
Rebased-From: 3f1e10b2b1cd11f7112fbad6355464bd4adbbc5c
Github-Pull: #20426
Rebased-From: 9f08780dd7946b63476e9736745131db8e7f4e93
Top commit has no ACKs.
Tree-SHA512: 89556f69ca4a36d86d6ab5df740b6d5de809f13d45b03450fb526362b1eabd3d2d5285f97c552dc0bcb07e17ac2e6c557ff46335962e6bcf366d36ad412f257c
Diffstat (limited to 'src/flatfile.h')
0 files changed, 0 insertions, 0 deletions