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

laanwj · laanwj · commit 3097ea40d719 · 2016-12-20T11:29:59.000+01:00
faf4ca8 [wallet] Disable free transactions when relay is disabled (MarcoFalke)
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3647,6 +3647,9 @@ bool CWallet::ParameterInteraction()`
`3647`	`3647`	`fSendFreeTransactions = GetBoolArg("-sendfreetransactions", DEFAULT_SEND_FREE_TRANSACTIONS);`
`3648`	`3648`	`fWalletRbf = GetBoolArg("-walletrbf", DEFAULT_WALLET_RBF);`
`3649`	`3649`
	`3650`	`+ if (fSendFreeTransactions && GetArg("-limitfreerelay", DEFAULT_LIMITFREERELAY) <= 0)`
	`3651`	`+ return InitError("Creation of free transactions with their relay disabled is not supported.");`
	`3652`	`+`
`3650`	`3653`	`return true;`
`3651`	`3654`	`}`
`3652`	`3655`