Skip to content

Commit 098ccac

Browse files
committed
Adapt Elements default adress prefix bytes to elements-0.14 style
1 parent ec62262 commit 098ccac

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

src/chainparams.cpp

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -481,11 +481,17 @@ class CCustomParams : public CRegTestParams {
481481
fMineBlocksOnDemand = args.GetBoolArg("-fmineblocksondemand", fMineBlocksOnDemand);
482482
m_fallback_fee_enabled = args.GetBoolArg("-fallback_fee_enabled", m_fallback_fee_enabled);
483483

484-
bech32_hrp = args.GetArg("-bech32_hrp", bech32_hrp);
484+
bech32_hrp = args.GetArg("-bech32_hrp", "ert");
485485
blech32_hrp = args.GetArg("-blech32_hrp", "el");
486-
base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1, args.GetArg("-pubkeyprefix", 111));
487-
base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1, args.GetArg("-scriptprefix", 196));
486+
base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1, args.GetArg("-pubkeyprefix", 235));
487+
base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1, args.GetArg("-scriptprefix", 75));
488+
base58Prefixes[BLINDED_ADDRESS] = std::vector<unsigned char>(1, args.GetArg("-blindedprefix", 4));
488489
base58Prefixes[SECRET_KEY] = std::vector<unsigned char>(1, args.GetArg("-secretprefix", 239));
490+
base58Prefixes[PARENT_PUBKEY_ADDRESS] = std::vector<unsigned char>(1, args.GetArg("-parentpubkeyprefix", 111));
491+
base58Prefixes[PARENT_SCRIPT_ADDRESS] = std::vector<unsigned char>(1, args.GetArg("-parentscriptprefix", 196));
492+
parent_bech32_hrp = args.GetArg("-parent_bech32_hrp", "bcrt");
493+
parent_blech32_hrp = args.GetArg("-parent_blech32_hrp", "bcrt");
494+
489495

490496
std::string extpubprefix = args.GetArg("-extpubkeyprefix", "043587CF");
491497
assert(IsHex(extpubprefix) && extpubprefix.size() == 8 && "-extpubkeyprefix must be hex string of length 8");
@@ -559,13 +565,6 @@ class CCustomParams : public CRegTestParams {
559565
const CScript default_script(CScript() << OP_TRUE);
560566
consensus.fedpegScript = StrHexToScriptWithDefault(args.GetArg("-fedpegscript", ""), default_script);
561567

562-
base58Prefixes[PARENT_PUBKEY_ADDRESS] = std::vector<unsigned char>(1, args.GetArg("-parentpubkeyprefix", 111));
563-
base58Prefixes[PARENT_SCRIPT_ADDRESS] = std::vector<unsigned char>(1, args.GetArg("-parentscriptprefix", 196));
564-
parent_bech32_hrp = args.GetArg("-parent_bech32_hrp", "bcrt");
565-
parent_blech32_hrp = args.GetArg("-parent_blech32_hrp", "bcrt");
566-
567-
base58Prefixes[BLINDED_ADDRESS] = std::vector<unsigned char>(1, args.GetArg("-blindedprefix", 4));
568-
569568
// Calculate pegged Bitcoin asset
570569
std::vector<unsigned char> commit = CommitToArguments(consensus, strNetworkID);
571570
uint256 entropy;

0 commit comments

Comments
 (0)