Refactor CWalletTx::RelayWalletTransaction() function.
This was a suggestion from the wallet-node separation PR: #15288 (review), which we deferred until after the main PR was merged.
There are also makes two minor behavior changes:
1895@@ -1896,20 +1896,25 @@ void CWallet::ReacceptWalletTransactions(interfaces::Chain::Lock& locked_chain)
1896
1897 bool CWalletTx::RelayWalletTransaction(interfaces::Chain::Lock& locked_chain)
1898 {
1899- assert(pwallet->GetBroadcastTransactions());
1900- if (!IsCoinBase() && !isAbandoned() && GetDepthInMainChain(locked_chain) == 0)
1901- {
1902- CValidationState state;
1903- /* GetDepthInMainChain already catches known conflicts. */
Don't relay conflicted or already confirmed transactions comment above the call to GetDepthInMainChain().
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
No conflicts as of last run.
340@@ -347,6 +341,7 @@ class ChainImpl : public Chain
341 CAmount maxTxFee() override { return ::maxTxFee; }
342 bool getPruneMode() override { return ::fPruneMode; }
343 bool p2pEnabled() override { return g_connman != nullptr; }
344+ bool isReadyToBroadcast() override { return !::fImporting && !::fReindex && !IsInitialBlockDownload(); };
; at end of line :-)
;. Do you mind reviewing that PR?
This refactors the CWalletTx::RelayWalletTransaction() function to be
clearer and adds comments. It also makes two minor behavior
changes:
- no longer assert if fBroadcastTransactions is false. Just return false
from the function.
- no longer print the relay message if p2pEnabled is set to false (since
the transaction is not actually relayed).
