diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-04-08 12:08:17 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-04-08 12:09:21 +0200 |
| commit | 7efc9cf672acd752521a79c1547d232b2ca3486b (patch) | |
| tree | c451fcaa14dd993b8dadfd6ef39c0fe573093a4e /src/init.cpp | |
| parent | eb87f84d1820292548102314796422eb6edd92a6 (diff) | |
| parent | 77650cc9f4646787e843b2922730d8cba5af36a1 (diff) | |
| download | bitcoin-7efc9cf672acd752521a79c1547d232b2ca3486b.tar.xz | |
Merge pull request #5951
77650cc add -walletbroadcast=0 rpc test (Jonas Schnelli)
6f25262 wallet: make it possible to disable transaction broadcast (Wladimir J. van der Laan)
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/init.cpp b/src/init.cpp index d6957ebdbc..53e521983f 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -337,6 +337,7 @@ std::string HelpMessage(HelpMessageMode mode) FormatMoney(maxTxFee))); strUsage += HelpMessageOpt("-upgradewallet", _("Upgrade wallet to latest format") + " " + _("on startup")); strUsage += HelpMessageOpt("-wallet=<file>", _("Specify wallet file (within data directory)") + " " + strprintf(_("(default: %s)"), "wallet.dat")); + strUsage += HelpMessageOpt("-walletbroadcast", _("Make the wallet broadcast transactions") + " " + strprintf(_("(default: %u)"), true)); strUsage += HelpMessageOpt("-walletnotify=<cmd>", _("Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)")); strUsage += HelpMessageOpt("-zapwallettxes=<mode>", _("Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup") + " " + _("(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)")); @@ -1243,6 +1244,7 @@ bool AppInit2(boost::thread_group& threadGroup) } } } + pwalletMain->SetBroadcastTransactions(GetBoolArg("-walletbroadcast", true)); } // (!fDisableWallet) #else // ENABLE_WALLET LogPrintf("No wallet compiled in!\n"); |