Skip to content

Commit 92bb700

Browse files
author
MacroFake
committed
Merge bitcoin#25902: fixups for BIP125 doc cleanup
375ebad fixups for BIP125 doc cleanup (glozow) Pull request description: Followups from bitcoin#25775: - bitcoin#25775 (comment) - bitcoin#25775 (comment) - bitcoin#25775 (comment) - bitcoin#25775 (comment) ACKs for top commit: t-bast: ACK bitcoin@375ebad ariard: ACK 375ebad Tree-SHA512: 66f240a020a2f6994a3b3bcce446bc07655b5714eab18aac4a3223d35226e57902c475fc60a57e3511b2f176741d6c93d7ebfe90574793813f90ceca33d44669
2 parents c5f0cbe + 375ebad commit 92bb700

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

src/policy/rbf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
class CFeeRate;
2020
class uint256;
2121

22-
/** Maximum number of transactions that can be replaced by RBF Rule #5. This includes all
22+
/** Maximum number of transactions that can be replaced by RBF (Rule #5). This includes all
2323
* mempool conflicts and their descendants. */
2424
static constexpr uint32_t MAX_REPLACEMENT_CANDIDATES{100};
2525

src/rpc/mempool.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ static std::vector<RPCResult> MempoolEntryDescription()
255255
{RPCResult{RPCResult::Type::STR_HEX, "transactionid", "parent transaction id"}}},
256256
RPCResult{RPCResult::Type::ARR, "spentby", "unconfirmed transactions spending outputs from this transaction",
257257
{RPCResult{RPCResult::Type::STR_HEX, "transactionid", "child transaction id"}}},
258-
RPCResult{RPCResult::Type::BOOL, "bip125-replaceable", "Whether this transaction could be replaced due to BIP125 (replace-by-fee)"},
258+
RPCResult{RPCResult::Type::BOOL, "bip125-replaceable", "Whether this transaction signals BIP125 replaceability or has an unconfirmed ancestor signaling BIP125 replaceability.\n"},
259259
RPCResult{RPCResult::Type::BOOL, "unbroadcast", "Whether this transaction is currently unbroadcast (initial broadcast not yet acknowledged by any peers)"},
260260
};
261261
}

src/wallet/rpc/spend.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ RPCHelpMan sendtoaddress()
224224
"transaction, just kept in your wallet."},
225225
{"subtractfeefromamount", RPCArg::Type::BOOL, RPCArg::Default{false}, "The fee will be deducted from the amount being sent.\n"
226226
"The recipient will receive less bitcoins than you enter in the amount field."},
227-
{"replaceable", RPCArg::Type::BOOL, RPCArg::DefaultHint{"wallet default"}, "Signal that this transaction can replaced by a transaction (BIP 125)"},
227+
{"replaceable", RPCArg::Type::BOOL, RPCArg::DefaultHint{"wallet default"}, "Signal that this transaction can be replaced by a transaction (BIP 125)"},
228228
{"conf_target", RPCArg::Type::NUM, RPCArg::DefaultHint{"wallet -txconfirmtarget"}, "Confirmation target in blocks"},
229229
{"estimate_mode", RPCArg::Type::STR, RPCArg::Default{"unset"}, "The fee estimate mode, must be one of (case insensitive):\n"
230230
"\"" + FeeModes("\"\n\"") + "\""},
@@ -333,7 +333,7 @@ RPCHelpMan sendmany()
333333
{"address", RPCArg::Type::STR, RPCArg::Optional::OMITTED, "Subtract fee from this address"},
334334
},
335335
},
336-
{"replaceable", RPCArg::Type::BOOL, RPCArg::DefaultHint{"wallet default"}, "Signal that this transaction can replaced by a transaction (BIP 125)"},
336+
{"replaceable", RPCArg::Type::BOOL, RPCArg::DefaultHint{"wallet default"}, "Signal that this transaction can be replaced by a transaction (BIP 125)"},
337337
{"conf_target", RPCArg::Type::NUM, RPCArg::DefaultHint{"wallet -txconfirmtarget"}, "Confirmation target in blocks"},
338338
{"estimate_mode", RPCArg::Type::STR, RPCArg::Default{"unset"}, "The fee estimate mode, must be one of (case insensitive):\n"
339339
"\"" + FeeModes("\"\n\"") + "\""},

src/wallet/rpc/transactions.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -421,8 +421,8 @@ static const std::vector<RPCResult> TransactionDescriptionString()
421421
{RPCResult::Type::NUM_TIME, "time", "The transaction time expressed in " + UNIX_EPOCH_TIME + "."},
422422
{RPCResult::Type::NUM_TIME, "timereceived", "The time received expressed in " + UNIX_EPOCH_TIME + "."},
423423
{RPCResult::Type::STR, "comment", /*optional=*/true, "If a comment is associated with the transaction, only present if not empty."},
424-
{RPCResult::Type::STR, "bip125-replaceable", "(\"yes|no|unknown\") Whether this transaction could be replaced due to BIP125 (replace-by-fee);\n"
425-
"may be unknown for unconfirmed transactions not in the mempool."},
424+
{RPCResult::Type::STR, "bip125-replaceable", "(\"yes|no|unknown\") Whether this transaction signals BIP125 replaceability or has an unconfirmed ancestor signaling BIP125 replaceability.\n"
425+
"May be unknown for unconfirmed transactions not in the mempool because their unconfirmed ancestors are unknown."},
426426
{RPCResult::Type::ARR, "parent_descs", /*optional=*/true, "Only if 'category' is 'received'. List of parent descriptors for the scriptPubKey of this coin.", {
427427
{RPCResult::Type::STR, "desc", "The descriptor string."},
428428
}},

0 commit comments

Comments
 (0)