aboutsummaryrefslogtreecommitdiff
path: root/src/wallet
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2016-09-19 15:52:48 +0200
committerMarcoFalke <falke.marco@gmail.com>2016-09-19 16:14:18 +0200
commitfaddd62518c7b81c56ea2c9936cf850878c03e0b (patch)
tree94206c8a040ba87fcffbd95c0de311ad54e78bc9 /src/wallet
parent9ac01301f5c45698a5db356da9e8dbc1500f7c31 (diff)
downloadbitcoin-faddd62518c7b81c56ea2c9936cf850878c03e0b.tar.xz
init: Get rid of some ENABLE_WALLET
Diffstat (limited to 'src/wallet')
-rw-r--r--src/wallet/wallet.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 4c10ea0edb..5638cec6a6 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3446,6 +3446,15 @@ bool CWallet::InitLoadWallet()
bool CWallet::ParameterInteraction()
{
+ if (GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY) && SoftSetBoolArg("-walletbroadcast", false)) {
+ LogPrintf("%s: parameter interaction: -blocksonly=1 -> setting -walletbroadcast=0\n", __func__);
+ }
+
+ if (GetBoolArg("-sysperms", false))
+ return InitError("-sysperms is not allowed in combination with enabled wallet functionality");
+ if (GetArg("-prune", 0) && GetBoolArg("-rescan", false))
+ return InitError(_("Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again."));
+
if (mapArgs.count("-mintxfee"))
{
CAmount n = 0;