From 3832e4ab79333a75c201f063f6d90df324a35158 Mon Sep 17 00:00:00 2001 From: Gregory Sanders Date: Thu, 31 May 2018 15:22:41 -0400 Subject: [PATCH] allow setting parent chain address prefix in configuration file --- src/chainparams.cpp | 4 ++-- src/init.cpp | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 1f944cd304..3b58079e4f 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -206,8 +206,8 @@ class CCustomParams : public CChainParams { base58Prefixes[EXT_PUBLIC_KEY] = boost::assign::list_of(0x04)(0x35)(0x87)(0xCF).convert_to_container >(); base58Prefixes[EXT_SECRET_KEY] = boost::assign::list_of(0x04)(0x35)(0x83)(0x94).convert_to_container >(); - base58Prefixes[PARENT_PUBKEY_ADDRESS] = std::vector(1,111); - base58Prefixes[PARENT_SCRIPT_ADDRESS] = std::vector(1,196); + base58Prefixes[PARENT_PUBKEY_ADDRESS] = std::vector(1, GetArg("-parentpubkeyprefix", 111)); + base58Prefixes[PARENT_SCRIPT_ADDRESS] = std::vector(1, GetArg("-parentscriptprefix", 196)); } }; diff --git a/src/init.cpp b/src/init.cpp index c8a36f29ea..37f443505d 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -514,6 +514,9 @@ std::string HelpMessage(HelpMessageMode mode) " " + _(" 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("-initialfreecoins", strprintf(_("The amount of OP_TRUE coins created in the genesis block. Primarily for testing. (default: %d)"), 0)); + strUsage += HelpMessageOpt("-parentpubkeyprefix", strprintf(_("The byte prefix, in decimal, of the parent chain's base58 pubkey address. (default: %d)"), 111)); + strUsage += HelpMessageOpt("-parentscriptprefix", strprintf(_("The byte prefix, in decimal, of the parent chain's base58 script address. (default: %d)"), 196)); + } strUsage += HelpMessageOpt("-validatepegin", strprintf(_("Validate pegin claims. All functionaries must run this. (default: %u)"), DEFAULT_VALIDATE_PEGIN)); strUsage += HelpMessageOpt("-mainchainrpchost=", strprintf("The address which the daemon will try to connect to validate peg-ins, if enabled. (default: cookie auth)"));