Skip to content

Commit a71aa8b

Browse files
committed
Remove CChainParams::bitcoinID
Using Bitcoin genesis mainnet hash for pegged-bitcoin asset id was a mistake in the first place.
1 parent 3d83e51 commit a71aa8b

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

src/chainparams.cpp

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,9 @@ class CElementsParams : public CChainParams {
137137
nDefaultPort = 9042;
138138
nPruneAfterHeight = 100000;
139139

140-
// SHA256 of Bitcoin genesis mainnet hash for NUMS bitcoin asset id
141-
bitcoinID = BITCOINID;
142-
143140
parentGenesisBlockHash = uint256S("000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943");
144141
CScript scriptDestination(CScript() << std::vector<unsigned char>(parentGenesisBlockHash.begin(), parentGenesisBlockHash.end()) << OP_WITHDRAWPROOFVERIFY);
145-
genesis = CreateGenesisBlock(consensus, strNetworkID, scriptDestination, 1231006505, 1, MAX_MONEY, 100, bitcoinID);
142+
genesis = CreateGenesisBlock(consensus, strNetworkID, scriptDestination, 1231006505, 1, MAX_MONEY, 100, BITCOINID);
146143
consensus.hashGenesisBlock = genesis.GetHash();
147144

148145
scriptCoinbaseDestination = CScript() << ParseHex("0229536c4c83789f59c30b93eb40d4abbd99b8dcc99ba8bd748f29e33c1d279e3c") << OP_CHECKSIG;
@@ -244,10 +241,7 @@ class CRegTestParams : public CChainParams {
244241
nDefaultPort = 7042;
245242
nPruneAfterHeight = 1000;
246243

247-
// SHA256 of Bitcoin genesis mainnet hash for NUMS bitcoin asset id
248-
bitcoinID = BITCOINID;
249-
250-
genesis = CreateGenesisBlock(consensus, strNetworkID, defaultRegtestScript, 1296688602, 1, MAX_MONEY, 100, bitcoinID);
244+
genesis = CreateGenesisBlock(consensus, strNetworkID, defaultRegtestScript, 1296688602, 1, MAX_MONEY, 100, BITCOINID);
251245
consensus.hashGenesisBlock = genesis.GetHash();
252246

253247
parentGenesisBlockHash = uint256S("0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206");

src/chainparams.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ class CChainParams
107107
std::string strNetworkID;
108108
CBlock genesis;
109109
uint256 parentGenesisBlockHash;
110-
CAsset bitcoinID;
111110
std::vector<SeedSpec6> vFixedSeeds;
112111
bool fMiningRequiresPeers;
113112
bool fDefaultConsistencyChecks;

0 commit comments

Comments
 (0)