aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2016-12-10 17:43:51 +0100
committerMarcoFalke <falke.marco@gmail.com>2016-12-10 17:45:23 +0100
commitfaf4ca84e404fd15be2982415d5b6007bcac7a2f (patch)
treee931417fbeb41ed43a9950b006eefba912a98b73 /src
parent72bf1b3d0962304850a3ef5fe375db4bff1d0a39 (diff)
downloadbitcoin-faf4ca84e404fd15be2982415d5b6007bcac7a2f.tar.xz
[wallet] Disable free transactions when relay is disabled
Diffstat (limited to 'src')
-rw-r--r--src/wallet/wallet.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 638fca9917..7acf2e3cc9 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3642,6 +3642,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;
}