diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-12-20 11:28:55 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-12-20 11:29:59 +0100 |
| commit | 3097ea40d7195267bc1e525eb1707d4b8d7304a2 (patch) | |
| tree | fd39d85a4aafc9020ac65f4cdf3290399f8c1834 /src | |
| parent | 7f72568e6b15fc139323fb200591a50762f6df0b (diff) | |
| parent | faf4ca84e404fd15be2982415d5b6007bcac7a2f (diff) | |
| download | bitcoin-3097ea40d7195267bc1e525eb1707d4b8d7304a2.tar.xz | |
Merge #9316: [wallet] Disable free transactions when relay is disabled
faf4ca8 [wallet] Disable free transactions when relay is disabled (MarcoFalke)
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet/wallet.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 450da0067c..aef3922b9f 100644 --- 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; } |