Merge #622: con_blocksubsidy is in satoshis

48b403fe2 con_blocksubsidy is in satoshis (Gregory Sanders)

Pull request description:

Tree-SHA512: e4f0e652d129c550cbd7d1cf7707280ded5ee6aa82750edf8f2d4000a3911604afb29fa0ea375db88a731df997b12abbe1bffcd84168cb04e11efe5668e6309f
This commit is contained in:
Steven Roose 2019-05-14 21:00:46 +01:00
commit 6cf1bd5cd2
No known key found for this signature in database
GPG key ID: 2F2A88D7F8D68E87

View file

@ -25,7 +25,7 @@ void SetupChainParamsBaseOptions()
gArgs.AddArg("-vbparams=deployment:start:end", "Use given start/end times for specified version bits deployment (regtest or custom only)", true, OptionsCategory::CHAINPARAMS);
gArgs.AddArg("-seednode=<ip>", "Use specified node as seed node. This option can be specified multiple times to connect to multiple nodes. (custom only)", true, OptionsCategory::CHAINPARAMS);
gArgs.AddArg("-con_mandatorycoinbase", "All non-zero valued coinbase outputs must go to this scriptPubKey, if set.", false, OptionsCategory::ELEMENTS);
gArgs.AddArg("-con_blocksubsidy", "Defines the amount of block subsidy to start with, at genesis block.", false, OptionsCategory::ELEMENTS);
gArgs.AddArg("-con_blocksubsidy", "Defines the amount of block subsidy to start with, at genesis block, in satoshis.", false, OptionsCategory::ELEMENTS);
gArgs.AddArg("-con_connect_coinbase", "Connect outputs in genesis block to utxo database.", false, OptionsCategory::ELEMENTS);
gArgs.AddArg("-con_elementsmode", "Use Elements-like instead of Core-like witness encoding. This is required for CA/CT. (default: true)", false, OptionsCategory::ELEMENTS);
gArgs.AddArg("-con_blockheightinheader", "Whether the chain includes the block height directly in the header, for easier validation of block height in low-resource environments. (default: true)", false, OptionsCategory::CHAINPARAMS);