GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-16 13:01:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge cd66d8b1d8 into merged_master (Bitcoin PR #20429)

Browse source
This commit is contained in:
Andrew Poelstra 2021-06-24 02:44:14 +00:00
commit 89db5e68a5
15 changed files with 45 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/chainparams.cpp
View file

@ -11,7 +11,6 @@
#include <issuance.h>
#include <primitives/transaction.h>
#include <util/system.h>
#include <util/strencodings.h>
#include <crypto/sha256.h>
#include <versionbitsinfo.h>
@ -181,7 +180,7 @@ public:
bech32_hrp = "bc";
blech32_hrp = bech32_hrp;
vFixedSeeds = std::vector<SeedSpec6>(pnSeed6_main, pnSeed6_main + ARRAYLEN(pnSeed6_main));
vFixedSeeds = std::vector<SeedSpec6>(std::begin(pnSeed6_main), std::end(pnSeed6_main));
fDefaultConsistencyChecks = false;
fRequireStandard = true;
@ -300,7 +299,7 @@ public:
bech32_hrp = "tb";
blech32_hrp = bech32_hrp;
vFixedSeeds = std::vector<SeedSpec6>(pnSeed6_test, pnSeed6_test + ARRAYLEN(pnSeed6_test));
vFixedSeeds = std::vector<SeedSpec6>(std::begin(pnSeed6_test), std::end(pnSeed6_test));
fDefaultConsistencyChecks = false;
fRequireStandard = false;
@ -862,7 +861,7 @@ public:
vSeeds.clear();
vSeeds.emplace_back("seed.liquidnetwork.io");
vFixedSeeds = std::vector<SeedSpec6>(pnSeed6_liquidv1, pnSeed6_liquidv1 + ARRAYLEN(pnSeed6_liquidv1));
vFixedSeeds = std::vector<SeedSpec6>(std::begin(pnSeed6_liquidv1), std::end(pnSeed6_liquidv1));
//
// ELEMENTS fields