Skip to content

Commit

Permalink
[Net] Change seed servers, and magic strings so as to avoid contact w…
Browse files Browse the repository at this point in the history
…ith the Bitcoin network.
  • Loading branch information
maaku committed Mar 19, 2019
1 parent e5db896 commit bb25cd5
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 915 deletions.
4 changes: 2 additions & 2 deletions contrib/linearize/example-linearize.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ max_height=241920
# bootstrap.dat input/output settings (linearize-data)

# mainnet
netmagic=f9beb4d9
netmagic=2cfe7e6d
genesis=000000005b1e3d23ecfd2dd4a6e1a35238aa0392c0a8528c40df52376d7efe2c
input=/home/example/.freicoin/blocks

# testnet
#netmagic=0b110907
#netmagic=5ed67cf3
#genesis=00000000a52504ffe3420a43bd385ef24f81838921a903460b235d95f37cd65e
#input=/home/example/.freicoin/testnet/blocks

Expand Down
2 changes: 1 addition & 1 deletion contrib/linearize/linearize-data.py
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ def run(self):
f.close()

if 'netmagic' not in settings:
settings['netmagic'] = 'f9beb4d9'
settings['netmagic'] = '2cfe7e6d'
if 'genesis' not in settings:
settings['genesis'] = '000000005b1e3d23ecfd2dd4a6e1a35238aa0392c0a8528c40df52376d7efe2c'
if 'input' not in settings:
Expand Down
2 changes: 1 addition & 1 deletion contrib/seeds/makeseeds.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
PATTERN_IPV4 = re.compile(r"^((\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})):(\d+)$")
PATTERN_IPV6 = re.compile(r"^\[([0-9a-z:]+)\]:(\d+)$")
PATTERN_ONION = re.compile(r"^([abcdefghijklmnopqrstuvwxyz234567]{16}\.onion):(\d+)$")
PATTERN_AGENT = re.compile(r"^(\/Satoshi:0\.8\.6\/|\/Satoshi:0\.9\.(2|3|4|5)\/|\/Satoshi:0\.10\.\d{1,2}\/|\/Satoshi:0\.11\.\d{1,2}\/)$")
PATTERN_AGENT = re.compile(r"^(\/Satoshi:0\.8\.6\/|\/Satoshi:0\.9\.5\/|\/Satoshi:10\.4\/|\/Satoshi:10\.4\.(1|2)\/)$")

def parseline(line):
sline = line.split()
Expand Down
6 changes: 3 additions & 3 deletions qa/rpc-tests/test_framework/mininode.py
Original file line number Diff line number Diff line change
Expand Up @@ -1093,9 +1093,9 @@ class NodeConn(asyncore.dispatcher):
"mempool": msg_mempool
}
MAGIC_BYTES = {
"mainnet": "\xf9\xbe\xb4\xd9", # mainnet
"testnet": "\x0b\x11\x09\x07", # testnet
"regtest": "\xfa\xbf\xb5\xda" # regtest
"mainnet": "\x2c\xfe\x7e\x6d", # mainnet
"testnet": "\x5e\xd6\x7c\xf3", # testnet
"regtest": "\xed\x99\x9c\xf6" # regtest
}

def __init__(self, dstaddr, dstport, rpc, callback, net="regtest"):
Expand Down
37 changes: 15 additions & 22 deletions src/chainparams.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ class CMainParams : public CChainParams {
* The characters are rarely used upper ASCII, not valid as UTF-8, and produce
* a large 32-bit integer with any alignment.
*/
pchMessageStart[0] = 0xf9;
pchMessageStart[1] = 0xbe;
pchMessageStart[2] = 0xb4;
pchMessageStart[3] = 0xd9;
pchMessageStart[0] = 0x2c;
pchMessageStart[1] = 0xfe;
pchMessageStart[2] = 0x7e;
pchMessageStart[3] = 0x6d;
vAlertPubKey = ParseHex("04fc9702847840aaf195de8442ebecedf5b095cdbb9bc716bda9110971b28a49e0ead8564ff0db22209e0374782c093bb899692d524e9d6a6956e7c5ecbcd68284");
nDefaultPort = 8639;
nMinerThreads = 0;
Expand Down Expand Up @@ -101,12 +101,9 @@ class CMainParams : public CChainParams {
assert(consensus.hashGenesisBlock == uint256S("0x000000005b1e3d23ecfd2dd4a6e1a35238aa0392c0a8528c40df52376d7efe2c"));
assert(genesis.hashMerkleRoot == uint256S("0xf53b1baa971ea40be88cf51288aabd700dfec96c486bf7155a53a4919af4c8bd"));

vSeeds.push_back(CDNSSeedData("bitcoin.sipa.be", "seed.bitcoin.sipa.be")); // Pieter Wuille
vSeeds.push_back(CDNSSeedData("bluematt.me", "dnsseed.bluematt.me")); // Matt Corallo
vSeeds.push_back(CDNSSeedData("dashjr.org", "dnsseed.freicoin.dashjr.org")); // Luke Dashjr
vSeeds.push_back(CDNSSeedData("freicoinstats.com", "seed.freicoinstats.com")); // Christian Decker
vSeeds.push_back(CDNSSeedData("xf2.org", "bitseed.xf2.org")); // Jeff Garzik
vSeeds.push_back(CDNSSeedData("freicoin.jonasschnelli.ch", "seed.freicoin.jonasschnelli.ch")); // Jonas Schnelli
vSeeds.push_back(CDNSSeedData("node.freico.in", "seed.freico.in"));
vSeeds.push_back(CDNSSeedData("abacus.freico.in", "fledge.freico.in"));
vSeeds.push_back(CDNSSeedData("seed.sicanet.net", "dnsseed.sicanet.net"));

base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,0);
base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,5);
Expand Down Expand Up @@ -172,10 +169,10 @@ class CTestNetParams : public CMainParams {
consensus.nMajorityWindow = 100;
consensus.fPowAllowMinDifficultyBlocks = true;
consensus.diff_adjust_threshold = 2016;
pchMessageStart[0] = 0x0b;
pchMessageStart[1] = 0x11;
pchMessageStart[2] = 0x09;
pchMessageStart[3] = 0x07;
pchMessageStart[0] = 0x5e;
pchMessageStart[1] = 0xd6;
pchMessageStart[2] = 0x7c;
pchMessageStart[3] = 0xf3;
vAlertPubKey = ParseHex("04302390343f91cc401d56d68b123028bf52e5fca1939df127f63c6467cdf9c8e2c14b61104cf817d0b780da337893ecc4aaff1309e536162dabbdb45200ca2b0a");
nDefaultPort = 18639;
nMinerThreads = 0;
Expand All @@ -190,10 +187,6 @@ class CTestNetParams : public CMainParams {

vFixedSeeds.clear();
vSeeds.clear();
vSeeds.push_back(CDNSSeedData("alexykot.me", "testnet-seed.alexykot.me"));
vSeeds.push_back(CDNSSeedData("freicoin.petertodd.org", "testnet-seed.freicoin.petertodd.org"));
vSeeds.push_back(CDNSSeedData("bluematt.me", "testnet-seed.bluematt.me"));
vSeeds.push_back(CDNSSeedData("freicoin.schildbach.de", "testnet-seed.freicoin.schildbach.de"));

base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,111);
base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,196);
Expand Down Expand Up @@ -235,10 +228,10 @@ class CRegTestParams : public CTestNetParams {
consensus.nMajorityWindow = 1000;
consensus.powLimit = uint256S("7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
consensus.diff_adjust_threshold = 150;
pchMessageStart[0] = 0xfa;
pchMessageStart[1] = 0xbf;
pchMessageStart[2] = 0xb5;
pchMessageStart[3] = 0xda;
pchMessageStart[0] = 0xed;
pchMessageStart[1] = 0x99;
pchMessageStart[2] = 0x9c;
pchMessageStart[3] = 0xf6;
nMinerThreads = 1;
nMaxTipAge = 24 * 60 * 60;
genesis.nTime = 1296688602;
Expand Down
Loading

0 comments on commit bb25cd5

Please sign in to comment.