aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@protonmail.com>2019-09-13 17:06:04 +0200
committerWladimir J. van der Laan <laanwj@protonmail.com>2019-09-13 17:06:46 +0200
commite149cbe5c790ceea8fa67ff5f3546f9907eed0f8 (patch)
treeba740587784f9afac0d4d5408b65e18408fa5511
parent40b47d539991e6c115c047dad7909207c9b8451e (diff)
parentfb9baded747c90662a648bbbaa957367529503b2 (diff)
Merge #16861: [0.17] doc: Remove release note fragment from #16639
fb9baded747c90662a648bbbaa957367529503b2 doc: integrate release notes from #16639 (fanquake) Pull request description: This uses the wording from the release-notes currently [in master](https://github.com/bitcoin/bitcoin/blob/master/doc/release-notes.md#wallet). ACKs for top commit: laanwj: ACK fb9baded747c90662a648bbbaa957367529503b2 Tree-SHA512: 1a8938c01cba2605ad3d8f6219499d118bf944ff354858e10e4ba55ea0dfd212f3104f38e21cb57e6dc891480775c972a4156f91a7572acc579e89fce35c912d
-rw-r--r--doc/release-notes-0.18.1-16257.md6
-rw-r--r--doc/release-notes.md5
2 files changed, 5 insertions, 6 deletions
diff --git a/doc/release-notes-0.18.1-16257.md b/doc/release-notes-0.18.1-16257.md
deleted file mode 100644
index 21867b7fb2..0000000000
--- a/doc/release-notes-0.18.1-16257.md
+++ /dev/null
@@ -1,6 +0,0 @@
-Wallet changes
---------------
-When creating a transaction with a fee above `-maxtxfee` (default 0.1 BTC),
-the RPC commands `walletcreatefundedpsbt` and `fundrawtransaction` will now fail
-instead of rounding down the fee. Beware that the `feeRate` argument is specified
-in BTC per kilobyte, not satoshi per byte.
diff --git a/doc/release-notes.md b/doc/release-notes.md
index 50da0e9a97..53ccdfa58d 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -71,6 +71,11 @@ Documentation
implementations, and many other cases where two or more programs need
to interact to generate a complete transaction.
+Wallet
+------
+
+- When creating a transaction with a fee above -maxtxfee (default 0.1 BTC), the RPC commands walletcreatefundedpsbt and fundrawtransaction will now fail instead of rounding down the fee. Be aware that the feeRate argument is specified in BTC per 1,000 vbytes, not satoshi per vbyte. (#16639)
+
0.17.2 change log
=================