highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-11 14:38:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5077

Browse Source 
2aa6329 Enable customising node policy for datacarrier data size with a -datacarriersize option (Luke Dashjr)
This commit is contained in:
Wladimir J. van der Laan
2014-10-31 11:10:10 +01:00
parent 7bb681d407 2aa632921e
commit 96012e83f1
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/init.cpp
View File

@@ -18,6 +18,7 @@
#include "miner.h"
#include "net.h"
#include "rpcserver.h"
#include "script/standard.h"
#include "txdb.h"
#include "ui_interface.h"
#include "util.h"
@@ -346,6 +347,7 @@ std::string HelpMessage(HelpMessageMode mode)
strUsage += "\n" + _("Node relay options:") + "\n";
strUsage += " -datacarrier " + strprintf(_("Relay and mine data carrier transactions (default: %u)"), 1) + "\n";
strUsage += " -datacarriersize " + strprintf(_("Maximum size of data in data carrier transactions we relay and mine (default: %u)"), MAX_OP_RETURN_RELAY) + "\n";
strUsage += "\n" + _("Block creation options:") + "\n";
strUsage += " -blockminsize=<n> " + strprintf(_("Set minimum block size in bytes (default: %u)"), 0) + "\n";
@@ -704,6 +706,7 @@ bool AppInit2(boost::thread_group& threadGroup)
#endif // ENABLE_WALLET
fIsBareMultisigStd = GetArg("-permitbaremultisig", true) != 0;
nMaxDatacarrierBytes = GetArg("-datacarriersize", nMaxDatacarrierBytes);
// ********************************************************* Step 4: application initialization: dir lock, daemonize, pidfile, debug log