aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Schnelli <dev@jonasschnelli.ch>2015-10-08 10:01:29 +0200
committerJonas Schnelli <dev@jonasschnelli.ch>2015-11-27 13:26:28 +0100
commitdf661476133364956a188f892de97974e69f8d6c (patch)
treecba0d647da25f07e4acc0877b67712816f9de23a
parent68354e75e94c28bbe5aee1b1c3e4c5cb93c2c9ad (diff)
downloadbitcoin-df661476133364956a188f892de97974e69f8d6c.tar.xz
Move -blocksonly parameter interaction to the new ParameterInteraction() function
-rw-r--r--src/init.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/init.cpp b/src/init.cpp
index 1e817c18ed..a69da3d4c9 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -743,6 +743,16 @@ void InitParameterInteraction()
if (SoftSetBoolArg("-rescan", true))
LogPrintf("%s: parameter interaction: -zapwallettxes=<mode> -> setting -rescan=1\n", __func__);
}
+
+ // disable walletbroadcast and whitelistalwaysrelay in blocksonly mode
+ if (GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY)) {
+ if (SoftSetBoolArg("-whitelistalwaysrelay", false))
+ LogPrintf("%s: parameter interaction: -blocksonly=1 -> setting -whitelistalwaysrelay=0\n", __func__);
+#ifdef ENABLE_WALLET
+ if (SoftSetBoolArg("-walletbroadcast", false))
+ LogPrintf("%s: parameter interaction: -blocksonly=1 -> setting -walletbroadcast=0\n", __func__);
+#endif
+ }
}
/** Initialize bitcoin.