From c159c7a0ad767142ab834a178d5e2a06edd3c481 Mon Sep 17 00:00:00 2001 From: coolblock Date: Sat, 5 Jan 2019 15:16:34 -0700 Subject: [PATCH 01/21] -- --- src/masternode.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/masternode.cpp b/src/masternode.cpp index 4b5865e..13881a8 100644 --- a/src/masternode.cpp +++ b/src/masternode.cpp @@ -282,6 +282,7 @@ void CMasternode::Check(bool fForce) } } + bool CMasternode::IsValidNetAddr() { return IsValidNetAddr(addr); @@ -292,7 +293,7 @@ bool CMasternode::IsValidNetAddr(CService addrIn) // TODO: regtest is fine with any addresses for now, // should probably be a bit smarter if one day we start to implement tests for this return Params().NetworkIDString() == CBaseChainParams::REGTEST || - (addrIn.IsIPv4() && IsReachable(addrIn) && addrIn.IsRoutable()); + (IsReachable(addrIn) && addrIn.IsRoutable()); } masternode_info_t CMasternode::GetInfo() From 2d890805acbeb3cfcb88b2b4b6020207d648e079 Mon Sep 17 00:00:00 2001 From: coolblock Date: Sun, 6 Jan 2019 11:27:08 -0700 Subject: [PATCH 02/21] -- --- src/activemasternode.cpp | 4 ++-- src/masternodeconfig.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/activemasternode.cpp b/src/activemasternode.cpp index 5950f24..5557960 100644 --- a/src/activemasternode.cpp +++ b/src/activemasternode.cpp @@ -170,7 +170,7 @@ void CActiveMasternode::ManageStateInitial() LogPrintf("CActiveMasternode::ManageStateInitial -- %s: %s\n", GetStateString(), strNotCapableReason); return; } - + /* int mainnetDefaultPort = Params(CBaseChainParams::MAIN).GetDefaultPort(); if(Params().NetworkIDString() == CBaseChainParams::MAIN) { if(service.GetPort() != mainnetDefaultPort) { @@ -185,7 +185,7 @@ void CActiveMasternode::ManageStateInitial() LogPrintf("CActiveMasternode::ManageStateInitial -- %s: %s\n", GetStateString(), strNotCapableReason); return; } - + */ LogPrintf("CActiveMasternode::ManageStateInitial -- Checking inbound connection to '%s'\n", service.ToString()); if(!ConnectNode((CAddress)service, NULL, true)) { diff --git a/src/masternodeconfig.cpp b/src/masternodeconfig.cpp index 5813109..2c0bdb4 100644 --- a/src/masternodeconfig.cpp +++ b/src/masternodeconfig.cpp @@ -65,7 +65,7 @@ bool CMasternodeConfig::read(std::string& strErr) { return false; } int mainnetDefaultPort = Params(CBaseChainParams::MAIN).GetDefaultPort(); - if(Params().NetworkIDString() == CBaseChainParams::MAIN) { + /*if(Params().NetworkIDString() == CBaseChainParams::MAIN) { if(port != mainnetDefaultPort) { strErr = _("Invalid port detected in masternode.conf") + "\n" + strprintf(_("Port: %d"), port) + "\n" + @@ -81,7 +81,7 @@ bool CMasternodeConfig::read(std::string& strErr) { streamConfig.close(); return false; } - + */ add(alias, ip, privKey, txHash, outputIndex); } From 1759ee70ab3e6b119942da998b5eafde308940d4 Mon Sep 17 00:00:00 2001 From: coolblock Date: Sun, 6 Jan 2019 11:56:36 -0700 Subject: [PATCH 03/21] -- --- src/masternode.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/masternode.cpp b/src/masternode.cpp index 13881a8..d4649ea 100644 --- a/src/masternode.cpp +++ b/src/masternode.cpp @@ -429,7 +429,7 @@ bool CMasternodeBroadcast::Create(std::string strService, std::string strKeyMast } CService service = CService(strService); - int mainnetDefaultPort = Params(CBaseChainParams::MAIN).GetDefaultPort(); + /*int mainnetDefaultPort = Params(CBaseChainParams::MAIN).GetDefaultPort(); if(Params().NetworkIDString() == CBaseChainParams::MAIN) { if(service.GetPort() != mainnetDefaultPort) { strErrorRet = strprintf("Invalid port %u for masternode %s, only %d is supported on mainnet.", service.GetPort(), strService, mainnetDefaultPort); @@ -441,7 +441,7 @@ bool CMasternodeBroadcast::Create(std::string strService, std::string strKeyMast LogPrintf("CMasternodeBroadcast::Create -- %s\n", strErrorRet); return false; } - + */ return Create(txin, CService(strService), keyCollateralAddressNew, pubKeyCollateralAddressNew, keyMasternodeNew, pubKeyMasternodeNew, strErrorRet, mnbRet); } @@ -537,10 +537,10 @@ bool CMasternodeBroadcast::SimpleCheck(int& nDos) } int mainnetDefaultPort = Params(CBaseChainParams::MAIN).GetDefaultPort(); - if(Params().NetworkIDString() == CBaseChainParams::MAIN) { + /*if(Params().NetworkIDString() == CBaseChainParams::MAIN) { if(addr.GetPort() != mainnetDefaultPort) return false; } else if(addr.GetPort() == mainnetDefaultPort) return false; - + */ return true; } From 8d23302ee04d45d615d6635c3182a2e82d488337 Mon Sep 17 00:00:00 2001 From: coolblock Date: Sat, 12 Jan 2019 16:06:23 -0700 Subject: [PATCH 04/21] checkpoints and seednodes --- src/chainparams.cpp | 17 +++++++++++++---- src/chainparamsseeds.h | 25 +++++++++---------------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index afd6f09..0cb32b7 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -133,6 +133,7 @@ class CMainParams : public CChainParams { vSeeds.push_back(CDNSSeedData("seed.vivocoinseed.dynu.net", "seednode.vivocoinseed.dynu.net")); vSeeds.push_back(CDNSSeedData("seeds.vivocoin.net", "seed.seeds.vivocoin.net")); + // Vivo addresses start with 'V' base58Prefixes[PUBKEY_ADDRESS] = std::vector(1,70); @@ -169,11 +170,19 @@ class CMainParams : public CChainParams { ( 0, uint256S("0x00000f6be3e151f9082a2b82c2916192a791090015b80979934a45d625460d62")) ( 5290, uint256S("0x000000000346e7d6b167a7aeccf6e521d9d78a7e0fe95f5b47d854b0bfc23654")) (161000, uint256S("0x0000000000f55b8708a236b2c8057d8396023d5d56ec2d1b120af40e3073755e")) - (304500, uint256S("0x000000001791f3f7d83ddb62333dbeeedcb61403b8931cafe66835edfad20090")), - 1542999374, // * UNIX timestamp of last checkpoint block - 600000, // * total number of transactions between genesis and last checkpoint + (304500, uint256S("0x000000001791f3f7d83ddb62333dbeeedcb61403b8931cafe66835edfad20090")) + (305000, uint256S("000000000fe61fa890e38551a6b09c885cd654f41929826f5c949c737a62830d"))// 1543060261 + (305500 uint256S("000000001357f8392867ce9194e6bf27ab36cf720ca321090a9ba3397852a231"))// 1543125036, + (306000 uint256S("000000000a0ceb4c9681b411a39c922bc57717aefe3e621cceb3ff5022e831b4"))// 1543188058 + (306500 uint256S("0000000001473705e8838c283bc18bcbecb28d4de047ce7810f89dc15c8f0b85"))// 1543251527 + (307000 uint256S("000000000525621400e9d10a79b02237194e34667b73898cd5f9fc99ea58ec7a"))// 1543314442 + (307500 uint256S("0000000021ba9398d0458721e41a362396c31abcb751cf4520ce973b5f2d96d6"))// 1543378351 + (308000 uint256S("0000000018ee47a3c93296309ce207724868232706f59a6937362581476ce462")),// 1543442279 + + 1543442279, // * UNIX timestamp of last checkpoint block + 5000, // * total number of transactions between genesis and last checkpoint // (the tx=... number in the SetBestChain debug.log lines) - 1000 // * estimated number of transactions per day after checkpoint + 500 // * estimated number of transactions per day after checkpoint }; } }; diff --git a/src/chainparamsseeds.h b/src/chainparamsseeds.h index a1e1fe5..1139eee 100644 --- a/src/chainparamsseeds.h +++ b/src/chainparamsseeds.h @@ -8,22 +8,15 @@ * IPv4 as well as onion addresses are wrapped inside a IPv6 address accordingly. */ static SeedSpec6 pnSeed6_main[] = { - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0x83,0xa0,0xd5}, 12845}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xc8,0x43,0x69}, 12845}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0x4d,0x62,0x89}, 12845}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x20,0x46,0xad}, 12845}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0xac,0xa5,0xbd}, 12845}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0xac,0x19,0x62}, 12845}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x24,0x24,0xaf}, 12845}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0xac,0x19,0x63}, 12845}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xd0,0xe1,0x7f}, 12845}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0xb2,0x18,0xab}, 12845}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x0d,0x50,0x40,0x64}, 12845}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x0d,0x51,0xcb,0xe0}, 12845}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xd0,0xe5,0xaa}, 12845}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0x78,0xf8,0x80}, 12845}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x23,0xc5,0x56,0xd3}, 12845}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0xc4,0x01,0x32}, 12845} + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x4c,0xa9,0xd6}, 12845}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x95,0xf8,0x06,0x4d}, 12845}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x90,0xca,0x57,0x8c}, 12845}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x90,0xca,0x75,0x8f}, 12845}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcf,0xf6,0x65,0x76}, 12845}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x20,0x54,0x4f}, 12845}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcf,0xf6,0x6f,0x75}, 12845}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x95,0x1c,0x53,0x01}, 12845}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8c,0x52,0x20,0xde}, 12845} }; static SeedSpec6 pnSeed6_test[] = { From 3ee39bc64782c8f9be9549ae29abb57f0834b67e Mon Sep 17 00:00:00 2001 From: coolblock Date: Sat, 12 Jan 2019 16:52:21 -0700 Subject: [PATCH 05/21] -- --- src/chainparams.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 0cb32b7..277de47 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -178,7 +178,6 @@ class CMainParams : public CChainParams { (307000 uint256S("000000000525621400e9d10a79b02237194e34667b73898cd5f9fc99ea58ec7a"))// 1543314442 (307500 uint256S("0000000021ba9398d0458721e41a362396c31abcb751cf4520ce973b5f2d96d6"))// 1543378351 (308000 uint256S("0000000018ee47a3c93296309ce207724868232706f59a6937362581476ce462")),// 1543442279 - 1543442279, // * UNIX timestamp of last checkpoint block 5000, // * total number of transactions between genesis and last checkpoint // (the tx=... number in the SetBestChain debug.log lines) From e4c7467e278ed4dab2ce5402dcd75b8f848ec159 Mon Sep 17 00:00:00 2001 From: coolblock Date: Sat, 12 Jan 2019 17:02:04 -0700 Subject: [PATCH 06/21] -- --- src/chainparams.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 277de47..09ca566 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -171,13 +171,13 @@ class CMainParams : public CChainParams { ( 5290, uint256S("0x000000000346e7d6b167a7aeccf6e521d9d78a7e0fe95f5b47d854b0bfc23654")) (161000, uint256S("0x0000000000f55b8708a236b2c8057d8396023d5d56ec2d1b120af40e3073755e")) (304500, uint256S("0x000000001791f3f7d83ddb62333dbeeedcb61403b8931cafe66835edfad20090")) - (305000, uint256S("000000000fe61fa890e38551a6b09c885cd654f41929826f5c949c737a62830d"))// 1543060261 - (305500 uint256S("000000001357f8392867ce9194e6bf27ab36cf720ca321090a9ba3397852a231"))// 1543125036, - (306000 uint256S("000000000a0ceb4c9681b411a39c922bc57717aefe3e621cceb3ff5022e831b4"))// 1543188058 - (306500 uint256S("0000000001473705e8838c283bc18bcbecb28d4de047ce7810f89dc15c8f0b85"))// 1543251527 - (307000 uint256S("000000000525621400e9d10a79b02237194e34667b73898cd5f9fc99ea58ec7a"))// 1543314442 - (307500 uint256S("0000000021ba9398d0458721e41a362396c31abcb751cf4520ce973b5f2d96d6"))// 1543378351 - (308000 uint256S("0000000018ee47a3c93296309ce207724868232706f59a6937362581476ce462")),// 1543442279 + (305000, uint256S("000000000fe61fa890e38551a6b09c885cd654f41929826f5c949c737a62830d")) + (305500 uint256S("000000001357f8392867ce9194e6bf27ab36cf720ca321090a9ba3397852a231")) + (306000 uint256S("000000000a0ceb4c9681b411a39c922bc57717aefe3e621cceb3ff5022e831b4")) + (306500 uint256S("0000000001473705e8838c283bc18bcbecb28d4de047ce7810f89dc15c8f0b85")) + (307000 uint256S("000000000525621400e9d10a79b02237194e34667b73898cd5f9fc99ea58ec7a")) + (307500 uint256S("0000000021ba9398d0458721e41a362396c31abcb751cf4520ce973b5f2d96d6")) + (308000 uint256S("0000000018ee47a3c93296309ce207724868232706f59a6937362581476ce462")), 1543442279, // * UNIX timestamp of last checkpoint block 5000, // * total number of transactions between genesis and last checkpoint // (the tx=... number in the SetBestChain debug.log lines) From 9b0428c3265b3d833538153d69e9698cc3bd4fc3 Mon Sep 17 00:00:00 2001 From: coolblock Date: Sat, 12 Jan 2019 17:05:16 -0700 Subject: [PATCH 07/21] -- --- src/chainparams.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 09ca566..9116a62 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -172,12 +172,12 @@ class CMainParams : public CChainParams { (161000, uint256S("0x0000000000f55b8708a236b2c8057d8396023d5d56ec2d1b120af40e3073755e")) (304500, uint256S("0x000000001791f3f7d83ddb62333dbeeedcb61403b8931cafe66835edfad20090")) (305000, uint256S("000000000fe61fa890e38551a6b09c885cd654f41929826f5c949c737a62830d")) - (305500 uint256S("000000001357f8392867ce9194e6bf27ab36cf720ca321090a9ba3397852a231")) - (306000 uint256S("000000000a0ceb4c9681b411a39c922bc57717aefe3e621cceb3ff5022e831b4")) - (306500 uint256S("0000000001473705e8838c283bc18bcbecb28d4de047ce7810f89dc15c8f0b85")) - (307000 uint256S("000000000525621400e9d10a79b02237194e34667b73898cd5f9fc99ea58ec7a")) - (307500 uint256S("0000000021ba9398d0458721e41a362396c31abcb751cf4520ce973b5f2d96d6")) - (308000 uint256S("0000000018ee47a3c93296309ce207724868232706f59a6937362581476ce462")), + (305500, uint256S("000000001357f8392867ce9194e6bf27ab36cf720ca321090a9ba3397852a231")) + (306000, uint256S("000000000a0ceb4c9681b411a39c922bc57717aefe3e621cceb3ff5022e831b4")) + (306500, uint256S("0000000001473705e8838c283bc18bcbecb28d4de047ce7810f89dc15c8f0b85")) + (307000, uint256S("000000000525621400e9d10a79b02237194e34667b73898cd5f9fc99ea58ec7a")) + (307500, uint256S("0000000021ba9398d0458721e41a362396c31abcb751cf4520ce973b5f2d96d6")) + (308000, uint256S("0000000018ee47a3c93296309ce207724868232706f59a6937362581476ce462")), 1543442279, // * UNIX timestamp of last checkpoint block 5000, // * total number of transactions between genesis and last checkpoint // (the tx=... number in the SetBestChain debug.log lines) From e9248b756fb60b574796e04144f78677539bac42 Mon Sep 17 00:00:00 2001 From: coolblock Date: Tue, 15 Jan 2019 00:58:45 -0700 Subject: [PATCH 08/21] -- --- src/chainparams.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 9116a62..9b078af 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -130,10 +130,12 @@ class CMainParams : public CChainParams { assert(consensus.hashGenesisBlock == uint256S("0x00000f6be3e151f9082a2b82c2916192a791090015b80979934a45d625460d62")); assert(genesis.hashMerkleRoot == uint256S("0x35d3553e7bdc0568c8c37074cb7cc4bd930bd57ceff0799ddb0279487d3fd8df")); - - vSeeds.push_back(CDNSSeedData("seed.vivocoinseed.dynu.net", "seednode.vivocoinseed.dynu.net")); - vSeeds.push_back(CDNSSeedData("seeds.vivocoin.net", "seed.seeds.vivocoin.net")); - + vSeeds.push_back(CDNSSeedData("seed.vivocoinseed.dynu.net", "seed.vivocoinseed.dynu.net")); + vSeeds.push_back(CDNSSeedData("seednode.vivocoinseed.dynu.net", "seednode.vivocoinseed.dynu.net")); + vSeeds.push_back(CDNSSeedData("seeds.vivocoin.net", "seeds.vivocoin.net")); + vSeeds.push_back(CDNSSeedData("seed.seeds.vivocoin.net", "seed.seeds.vivocoin.net")); + vSeeds.push_back(CDNSSeedData("vivoseed.hashcube.com", "vivoseed.hashcube.com")); + vSeeds.push_back(CDNSSeedData("vivoseed.mm.my", "vivoseed.mm.my")); // Vivo addresses start with 'V' base58Prefixes[PUBKEY_ADDRESS] = std::vector(1,70); From e010b8f352e9a2cc2eca74a9aeae8f5e8d2e0358 Mon Sep 17 00:00:00 2001 From: coolblock Date: Tue, 15 Jan 2019 01:18:06 -0700 Subject: [PATCH 09/21] -- --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 084c040..ee80cf8 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 0) define(_CLIENT_VERSION_MINOR, 12) define(_CLIENT_VERSION_REVISION, 1) -define(_CLIENT_VERSION_BUILD, 8) +define(_CLIENT_VERSION_BUILD, 10) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2018) AC_INIT([Vivo Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/vivocoin/vivo/issues],[vivocore]) From cbbb655d18c7e62faee09ba24ae7747127789563 Mon Sep 17 00:00:00 2001 From: coolblock Date: Tue, 15 Jan 2019 20:25:20 -0700 Subject: [PATCH 10/21] -- --- src/chainparams.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 9b078af..2eb3252 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -178,6 +178,7 @@ class CMainParams : public CChainParams { (306000, uint256S("000000000a0ceb4c9681b411a39c922bc57717aefe3e621cceb3ff5022e831b4")) (306500, uint256S("0000000001473705e8838c283bc18bcbecb28d4de047ce7810f89dc15c8f0b85")) (307000, uint256S("000000000525621400e9d10a79b02237194e34667b73898cd5f9fc99ea58ec7a")) + (337418, uint256S("000000001d8e498bbd22dca1ac0d6e5e234e2cc4e090130299a9a640f6d0a105")) (307500, uint256S("0000000021ba9398d0458721e41a362396c31abcb751cf4520ce973b5f2d96d6")) (308000, uint256S("0000000018ee47a3c93296309ce207724868232706f59a6937362581476ce462")), 1543442279, // * UNIX timestamp of last checkpoint block From cbb5122c85b72d2fb4cf7e5c3d1c6f337d74b6d9 Mon Sep 17 00:00:00 2001 From: coolblock Date: Fri, 18 Jan 2019 08:53:30 -0700 Subject: [PATCH 11/21] dns seeding by default --- src/net.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/net.cpp b/src/net.cpp index fce7cea..416c6ae 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1407,11 +1407,13 @@ void ThreadDNSAddressSeed() (!GetBoolArg("-forcednsseed", DEFAULT_FORCEDNSSEED))) { MilliSleep(11 * 1000); + /* LOCK(cs_vNodes); if (vNodes.size() >= 2) { LogPrintf("P2P peers available. Skipped DNS seeding.\n"); return; } + */ } const vector &vSeeds = Params().DNSSeeds(); @@ -1440,7 +1442,7 @@ void ThreadDNSAddressSeed() } } - LogPrintf("%d addresses found from DNS seeds\n", found); + LogPrintf("%d "\n", found); } From 6193fa9c94a58e5ac2d9f7c9f66ea6e366441b3d Mon Sep 17 00:00:00 2001 From: coolblock Date: Fri, 18 Jan 2019 08:59:20 -0700 Subject: [PATCH 12/21] dns seeding by default fix --- src/net.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/net.cpp b/src/net.cpp index 416c6ae..056a563 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1403,19 +1403,20 @@ void MapPort(bool) void ThreadDNSAddressSeed() { // goal: only query DNS seeds if address need is acute +//SMRK +/* if ((addrman.size() > 0) && (!GetBoolArg("-forcednsseed", DEFAULT_FORCEDNSSEED))) { MilliSleep(11 * 1000); - - /* + LOCK(cs_vNodes); if (vNodes.size() >= 2) { LogPrintf("P2P peers available. Skipped DNS seeding.\n"); return; } - */ + } - +*/ const vector &vSeeds = Params().DNSSeeds(); int found = 0; From f6089e429a07953a19749459ee2c88c0bf033652 Mon Sep 17 00:00:00 2001 From: coolblock Date: Fri, 18 Jan 2019 09:13:55 -0700 Subject: [PATCH 13/21] dns seeding by default fix --- src/net.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/net.cpp b/src/net.cpp index 056a563..b69dd0b 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1403,8 +1403,8 @@ void MapPort(bool) void ThreadDNSAddressSeed() { // goal: only query DNS seeds if address need is acute -//SMRK -/* + + if ((addrman.size() > 0) && (!GetBoolArg("-forcednsseed", DEFAULT_FORCEDNSSEED))) { MilliSleep(11 * 1000); @@ -1412,11 +1412,11 @@ void ThreadDNSAddressSeed() LOCK(cs_vNodes); if (vNodes.size() >= 2) { LogPrintf("P2P peers available. Skipped DNS seeding.\n"); - return; + //return; } } -*/ + const vector &vSeeds = Params().DNSSeeds(); int found = 0; From f16f9751a70b3e421fdc6a24c0a893750c7e9e30 Mon Sep 17 00:00:00 2001 From: coolblock Date: Fri, 18 Jan 2019 09:34:13 -0700 Subject: [PATCH 14/21] dns seeding by default fix again --- src/net.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/net.cpp b/src/net.cpp index b69dd0b..430b6db 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1403,18 +1403,15 @@ void MapPort(bool) void ThreadDNSAddressSeed() { // goal: only query DNS seeds if address need is acute - - if ((addrman.size() > 0) && (!GetBoolArg("-forcednsseed", DEFAULT_FORCEDNSSEED))) { MilliSleep(11 * 1000); - + LOCK(cs_vNodes); - if (vNodes.size() >= 2) { + if (vNodes.size() >= 500) { LogPrintf("P2P peers available. Skipped DNS seeding.\n"); - //return; + return; } - } const vector &vSeeds = Params().DNSSeeds(); @@ -1443,7 +1440,7 @@ void ThreadDNSAddressSeed() } } - LogPrintf("%d "\n", found); + LogPrintf("%d addresses found from DNS seeds\n", found); } From 1d40dbf2e2f5fc05d06b82632040b30ab79791c4 Mon Sep 17 00:00:00 2001 From: coolblock Date: Mon, 21 Jan 2019 22:52:14 -0700 Subject: [PATCH 15/21] ignore bad version --- src/governance.cpp | 10 +++++++++- src/masternode-sync.cpp | 6 ++++++ src/masternode.h | 4 ++-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/governance.cpp b/src/governance.cpp index 05e082b..e22c8d6 100644 --- a/src/governance.cpp +++ b/src/governance.cpp @@ -108,7 +108,9 @@ void CGovernanceManager::ProcessMessage(CNode* pfrom, std::string& strCommand, C if(!masternodeSync.IsBlockchainSynced()) return; if(pfrom->nVersion < MIN_GOVERNANCE_PEER_PROTO_VERSION) return; - + if(pfrom->nVersion == 70209) return; + if(pfrom->nVersion == 70208) return; + // ANOTHER USER IS ASKING US TO HELP THEM SYNC GOVERNANCE OBJECT DATA if (strCommand == NetMsgType::MNGOVERNANCESYNC) { @@ -123,6 +125,9 @@ void CGovernanceManager::ProcessMessage(CNode* pfrom, std::string& strCommand, C vRecv >> nProp; + + if(pfrom->nVersion != 70209) + if(pfrom->nVersion != 70208) if(pfrom->nVersion >= GOVERNANCE_FILTER_PROTO_VERSION) { vRecv >> filter; filter.UpdateEmptyFull(); @@ -1156,6 +1161,9 @@ int CGovernanceManager::RequestGovernanceObjectVotes(const std::vector& if(pnode->fMasternode || (fMasterNode && pnode->fInbound)) continue; // only use up to date peers if(pnode->nVersion < MIN_GOVERNANCE_PEER_PROTO_VERSION) continue; + if(pfrom->nVersion == 70209) continue; + if(pfrom->nVersion == 70208) continue; + // stop early to prevent setAskFor overflow size_t nProjectedSize = pnode->setAskFor.size() + nProjectedVotes; if(nProjectedSize > SETASKFOR_MAX_SZ/2) continue; diff --git a/src/masternode-sync.cpp b/src/masternode-sync.cpp index f32d87e..58bed1c 100644 --- a/src/masternode-sync.cpp +++ b/src/masternode-sync.cpp @@ -487,6 +487,9 @@ void CMasternodeSync::ProcessTick() netfulfilledman.AddFulfilledRequest(pnode->addr, "governance-sync"); if (pnode->nVersion < MIN_GOVERNANCE_PEER_PROTO_VERSION) continue; + if(pfrom->nVersion == 70209) continue; + if(pfrom->nVersion == 70208) continue; + nRequestedMasternodeAttempt++; SendGovernanceSyncRequest(pnode); @@ -502,6 +505,9 @@ void CMasternodeSync::ProcessTick() void CMasternodeSync::SendGovernanceSyncRequest(CNode* pnode) { + if(pfrom->nVersion != 70209) + if(pfrom->nVersion != 70208) + if(pnode->nVersion >= GOVERNANCE_FILTER_PROTO_VERSION) { CBloomFilter filter; filter.clear(); diff --git a/src/masternode.h b/src/masternode.h index 61ecaf9..ae8fa33 100644 --- a/src/masternode.h +++ b/src/masternode.h @@ -18,8 +18,8 @@ class CMasternodePing; static const int MASTERNODE_CHECK_SECONDS = 5; static const int MASTERNODE_MIN_MNB_SECONDS = 5 * 60; static const int MASTERNODE_MIN_MNP_SECONDS = 10 * 60; -static const int MASTERNODE_EXPIRATION_SECONDS = 65 * 60; -static const int MASTERNODE_WATCHDOG_MAX_SECONDS = 120 * 60; +static const int MASTERNODE_EXPIRATION_SECONDS = 120 * 60; // added hour +static const int MASTERNODE_WATCHDOG_MAX_SECONDS = 150 * 60; //added 30 minutes static const int MASTERNODE_NEW_START_REQUIRED_SECONDS = 180 * 60; static const int MASTERNODE_POSE_BAN_MAX_SCORE = 5; From ae5411a62035527da4bdb5cea6f8cc13d287e5e4 Mon Sep 17 00:00:00 2001 From: coolblock Date: Mon, 21 Jan 2019 22:57:56 -0700 Subject: [PATCH 16/21] ignore bad version --- src/masternode-sync.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/masternode-sync.cpp b/src/masternode-sync.cpp index 58bed1c..7312fe3 100644 --- a/src/masternode-sync.cpp +++ b/src/masternode-sync.cpp @@ -505,8 +505,8 @@ void CMasternodeSync::ProcessTick() void CMasternodeSync::SendGovernanceSyncRequest(CNode* pnode) { - if(pfrom->nVersion != 70209) - if(pfrom->nVersion != 70208) + if(pnode->nVersion != 70209) + if(pnode->nVersion != 70208) if(pnode->nVersion >= GOVERNANCE_FILTER_PROTO_VERSION) { CBloomFilter filter; From aeb81612af0264656eef5631ca0aed4fa246c28c Mon Sep 17 00:00:00 2001 From: coolblock Date: Mon, 21 Jan 2019 23:00:23 -0700 Subject: [PATCH 17/21] ignore bad version --- src/governance.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/governance.cpp b/src/governance.cpp index e22c8d6..216acac 100644 --- a/src/governance.cpp +++ b/src/governance.cpp @@ -1161,8 +1161,8 @@ int CGovernanceManager::RequestGovernanceObjectVotes(const std::vector& if(pnode->fMasternode || (fMasterNode && pnode->fInbound)) continue; // only use up to date peers if(pnode->nVersion < MIN_GOVERNANCE_PEER_PROTO_VERSION) continue; - if(pfrom->nVersion == 70209) continue; - if(pfrom->nVersion == 70208) continue; + if(pnode->nVersion == 70209) continue; + if(pnode->nVersion == 70208) continue; // stop early to prevent setAskFor overflow size_t nProjectedSize = pnode->setAskFor.size() + nProjectedVotes; From e913743382f120e410c6d043103ec66ee7d8b1cf Mon Sep 17 00:00:00 2001 From: coolblock Date: Mon, 21 Jan 2019 23:10:19 -0700 Subject: [PATCH 18/21] ignore bad version --- src/masternode-sync.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/masternode-sync.cpp b/src/masternode-sync.cpp index 7312fe3..3e45316 100644 --- a/src/masternode-sync.cpp +++ b/src/masternode-sync.cpp @@ -487,8 +487,8 @@ void CMasternodeSync::ProcessTick() netfulfilledman.AddFulfilledRequest(pnode->addr, "governance-sync"); if (pnode->nVersion < MIN_GOVERNANCE_PEER_PROTO_VERSION) continue; - if(pfrom->nVersion == 70209) continue; - if(pfrom->nVersion == 70208) continue; + if(pnode->nVersion == 70209) continue; + if(pnode->nVersion == 70208) continue; nRequestedMasternodeAttempt++; From 3af93b339d09640512ededf1aa961b8ae6312d69 Mon Sep 17 00:00:00 2001 From: coolblock Date: Tue, 22 Jan 2019 00:26:08 -0700 Subject: [PATCH 19/21] ignore bad version --- src/chainparams.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 2eb3252..5dd35f7 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -130,10 +130,9 @@ class CMainParams : public CChainParams { assert(consensus.hashGenesisBlock == uint256S("0x00000f6be3e151f9082a2b82c2916192a791090015b80979934a45d625460d62")); assert(genesis.hashMerkleRoot == uint256S("0x35d3553e7bdc0568c8c37074cb7cc4bd930bd57ceff0799ddb0279487d3fd8df")); - vSeeds.push_back(CDNSSeedData("seed.vivocoinseed.dynu.net", "seed.vivocoinseed.dynu.net")); - vSeeds.push_back(CDNSSeedData("seednode.vivocoinseed.dynu.net", "seednode.vivocoinseed.dynu.net")); vSeeds.push_back(CDNSSeedData("seeds.vivocoin.net", "seeds.vivocoin.net")); vSeeds.push_back(CDNSSeedData("seed.seeds.vivocoin.net", "seed.seeds.vivocoin.net")); + vSeeds.push_back(CDNSSeedData("seed.vivocoinseed.dynu.net", "seed.vivocoinseed.dynu.net")); vSeeds.push_back(CDNSSeedData("vivoseed.hashcube.com", "vivoseed.hashcube.com")); vSeeds.push_back(CDNSSeedData("vivoseed.mm.my", "vivoseed.mm.my")); From f773bad19197570ae4ec2c1aeff93977b3fb5ac7 Mon Sep 17 00:00:00 2001 From: coolblock Date: Tue, 22 Jan 2019 02:02:40 -0700 Subject: [PATCH 20/21] ignore bad version --- src/main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index d3eef7f..71d0df3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -5267,7 +5267,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, CAddress addrFrom; uint64_t nNonce = 1; vRecv >> pfrom->nVersion >> pfrom->nServices >> nTime >> addrMe; - if (pfrom->nVersion < MIN_PEER_PROTO_VERSION) + + if (pfrom->nVersion < MIN_PEER_PROTO_VERSION | (pfrom->nVersion == 70209) | (pfrom->nVersion == 70208) ) { // disconnect from peers older than this proto version LogPrintf("peer=%d using obsolete version %i; disconnecting\n", pfrom->id, pfrom->nVersion); From 5d197752295717e93b0753aaaa8cca4270d4d91d Mon Sep 17 00:00:00 2001 From: coolblock Date: Tue, 22 Jan 2019 03:01:18 -0700 Subject: [PATCH 21/21] ignore bad version --- src/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h b/src/version.h index 4a0e10b..e7a65b7 100644 --- a/src/version.h +++ b/src/version.h @@ -10,7 +10,7 @@ * network protocol versioning */ -static const int PROTOCOL_VERSION = 70206; +static const int PROTOCOL_VERSION = 70210; //! initial proto version, to be increased after version/verack negotiation static const int INIT_PROTO_VERSION = 209;