github-jwinterm/myriadcoin
1
0
Fork 0
mirror of https://github.com/jwinterm/myriadcoin.git synced 2026-10-19 05:58:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4 from myriadcoin/master

Browse Source 
Merge Latest
This commit is contained in:
wlc-
2014-11-20 22:26:26 +01:00
parent 2442c3efbd c59091563f
commit 45303b442d
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/chainparams.cpp
+5 -1
View File
@@ -68,6 +68,10 @@ public:
vSeeds.push_back(CDNSSeedData("seed2.myriadcoin.org", "seed2.myriadcoin.org"));
vSeeds.push_back(CDNSSeedData("seed3.myriadcoin.org", "seed3.myriadcoin.org"));
vSeeds.push_back(CDNSSeedData("seed4.myriadcoin.org", "seed4.myriadcoin.org"));
vSeeds.push_back(CDNSSeedData("seed5.myriadcoin.org", "seed5.myriadcoin.org"));
vSeeds.push_back(CDNSSeedData("seed6.myriadcoin.org", "seed6.myriadcoin.org"));
vSeeds.push_back(CDNSSeedData("seed7.myriadcoin.org", "seed7.myriadcoin.org"));
vSeeds.push_back(CDNSSeedData("seed8.myriadcoin.org", "seed8.myriadcoin.org"));
base58Prefixes[PUBKEY_ADDRESS] = list_of(50);
base58Prefixes[SCRIPT_ADDRESS] = list_of(9);
@@ -168,7 +172,7 @@ public:
assert(hashGenesisBlock == uint256("0x63b92987ddc93808aa33dddc80b3e52948bdfffaf2420bf4cd9c5137b54ea37c"));
vSeeds.clear(); // Regtest mode doesn't have any DNS seeds.
base58Prefixes[PUBKEY_ADDRESS] = list_of(0);
base58Prefixes[SCRIPT_ADDRESS] = list_of(5);
base58Prefixes[SECRET_KEY] = list_of(128);
src/checkpoints.cpp
+3 -2
View File
@@ -52,11 +52,12 @@ namespace Checkpoints
(557719, uint256("0x0000000000000851f690d42129b34408697c88316879debd413049959517d7c6"))
(740001, uint256("0x00000000000002c7aaa3ad688eb5af7d2779f4aa1d9a1b9a5c3cfb4ccad56caa"))
(740576, uint256("0x00000000000043dc047538e724f17a388146f22dd2ecf66f3c88253799912f4d"))
(766081, uint256("0x00000000000001e604a7acc2dd539ff8bd51224a7aac8647736d1af10160427d"))
;
static const CCheckpointData data = {
&mapCheckpoints,
1414949371, // * UNIX timestamp of last checkpoint block
2215008, // * total number of transactions between genesis and last checkpoint
1415335476, // * UNIX timestamp of last checkpoint block
2302254, // * total number of transactions between genesis and last checkpoint
// (the tx=... number in the SetBestChain debug.log lines)
2880 // * estimated number of transactions per day after checkpoint
};
src/main.cpp
+2 -1
View File
@@ -3628,7 +3628,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
(pfrom->cleanSubVer == "/Satoshi:0.9.2.2/") ||
(pfrom->cleanSubVer == "/Satoshi:0.9.2.3/") ||
(pfrom->cleanSubVer == "/Satoshi:0.9.2.4/") ||
(pfrom->cleanSubVer == "/Satoshi:0.9.2.5/")
(pfrom->cleanSubVer == "/Satoshi:0.9.2.5/") ||
(pfrom->cleanSubVer == "/Satoshi:0.9.2.6/")
)
{
// disconnect from peers older than this proto version