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

Merge df2129a234 into merged_master (Bitcoin PR #19991)

Browse source 
I had to make up an onion service target port for Liquid and for our custom
params, so I chose 37041 and 37040 to roughly match how signet just adds
30000 to its normal port.
This commit is contained in:
Andrew Poelstra 2020-11-30 04:44:21 +00:00
commit 77c3300ae3
8 changed files with 130 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/chainparamsbase.cpp
View file

@ -70,22 +70,26 @@ const CBaseChainParams& BaseParams()
return *globalChainBaseParams;
}
/**
* Port numbers for incoming Tor connections (8334, 18334, 38334, 18445) have
* been chosen arbitrarily to keep ranges of used ports tight.
*/
std::unique_ptr<CBaseChainParams> CreateBaseChainParams(const std::string& chain)
{
if (chain == CBaseChainParams::MAIN) {
return MakeUnique<CBaseChainParams>("", 8332, 18332);
return MakeUnique<CBaseChainParams>("", 8332, 18332, 8334);
} else if (chain == CBaseChainParams::TESTNET) {
return MakeUnique<CBaseChainParams>("testnet3", 18332, 8332);
return MakeUnique<CBaseChainParams>("testnet3", 18332, 8332, 18334);
} else if (chain == CBaseChainParams::SIGNET) {
return MakeUnique<CBaseChainParams>("signet", 38332, 18332);
return MakeUnique<CBaseChainParams>("signet", 38332, 18332, 38334);
} else if (chain == CBaseChainParams::REGTEST) {
return MakeUnique<CBaseChainParams>("regtest", 18443, 18332);
return MakeUnique<CBaseChainParams>("regtest", 18443, 18332, 18445);
} else if (chain == CBaseChainParams::LIQUID1) {
return MakeUnique<CBaseChainParams>("liquidv1", 7041, 8332);
return MakeUnique<CBaseChainParams>("liquidv1", 7041, 8332, 37041);
}
// ELEMENTS:
return MakeUnique<CBaseChainParams>(chain, 7040, 18332);
return MakeUnique<CBaseChainParams>(chain, 7040, 18332, 37040);
}
void SelectBaseParams(const std::string& chain)