From 92e31363362b563eca44385a7d9ca821b73d3342 Mon Sep 17 00:00:00 2001 From: wintercooled Date: Thu, 12 Jul 2018 18:52:23 +0100 Subject: [PATCH] Allow initial reissuance token count to be set via param --- src/chainparams.cpp | 5 +++-- src/chainparams.h | 1 + src/init.cpp | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index a4727fa8af..762bf4707f 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -133,6 +133,7 @@ protected: // bitcoin regtest is the parent chain by default parentGenesisBlockHash = uint256S(GetArg("-parentgenesisblockhash", "0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206")); initialFreeCoins = GetArg("-initialfreecoins", 0); + initial_reissuance_tokens = GetArg("-initialreissuancetokens", 0); const CScript default_script(CScript() << OP_TRUE); consensus.signblockscript = StrHexToScriptWithDefault(GetArg("-signblockscript", ""), default_script); @@ -199,8 +200,8 @@ public: CalculateAsset(consensus.pegged_asset, entropy); genesis = CreateGenesisBlock(consensus, strNetworkID, 1296688602, 1); - if (initialFreeCoins != 0) { - AppendInitialIssuance(genesis, COutPoint(uint256(commit), 0), parentGenesisBlockHash, 1, initialFreeCoins, 0, 0, CScript() << OP_TRUE); + if (initialFreeCoins != 0 || initial_reissuance_tokens != 0) { + AppendInitialIssuance(genesis, COutPoint(uint256(commit), 0), parentGenesisBlockHash, (initialFreeCoins > 0) ? 1 : 0, initialFreeCoins, (initial_reissuance_tokens > 0) ? 1 : 0, initial_reissuance_tokens, CScript() << OP_TRUE); } consensus.hashGenesisBlock = genesis.GetHash(); diff --git a/src/chainparams.h b/src/chainparams.h index 1e87481ebf..93f9a55189 100644 --- a/src/chainparams.h +++ b/src/chainparams.h @@ -105,6 +105,7 @@ protected: CBlock genesis; uint256 parentGenesisBlockHash; CAmount initialFreeCoins; + CAmount initial_reissuance_tokens; std::vector vFixedSeeds; bool fMiningRequiresPeers; bool fDefaultConsistencyChecks; diff --git a/src/init.cpp b/src/init.cpp index 086d9782f6..983d96c25c 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -513,6 +513,7 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += HelpMessageOpt("-signblockscript=", _("Change chain to be signed and validated with a different script.") + " " + _(" This creates a new chain with a different genesis block.")); strUsage += HelpMessageOpt("-peginconfirmationdepth", strprintf(_("Pegin claims must be this deep to be considered valid. (default: %d)"), DEFAULT_PEGIN_CONFIRMATION_DEPTH)); + strUsage += HelpMessageOpt("-initialreissuancetokens", strprintf(_("The amount of reissuance tokens created in the genesis block. (default: %d)"), 0)); strUsage += HelpMessageOpt("-initialfreecoins", strprintf(_("The amount of OP_TRUE coins created in the genesis block. Primarily for testing. (default: %d)"), 0)); strUsage += HelpMessageOpt("-defaultpeggedassetname", strprintf("The name of the default asset created in the genesis block. (default: bitcoin)")); strUsage += HelpMessageOpt("-parentpubkeyprefix", strprintf(_("The byte prefix, in decimal, of the parent chain's base58 pubkey address. (default: %d)"), 111));