Merge #9316: [wallet] Disable free transactions when relay is disabled

faf4ca8 [wallet] Disable free transactions when relay is disabled (MarcoFalke)
This commit is contained in:
Wladimir J. van der Laan
2016-12-20 11:28:55 +01:00

View File

@@ -3647,6 +3647,9 @@ bool CWallet::ParameterInteraction()
fSendFreeTransactions = GetBoolArg("-sendfreetransactions", DEFAULT_SEND_FREE_TRANSACTIONS);
fWalletRbf = GetBoolArg("-walletrbf", DEFAULT_WALLET_RBF);
if (fSendFreeTransactions && GetArg("-limitfreerelay", DEFAULT_LIMITFREERELAY) <= 0)
return InitError("Creation of free transactions with their relay disabled is not supported.");
return true;
}