From 751b93816b055a559a98e89770e55389ec64f457 Mon Sep 17 00:00:00 2001 From: coolblock Date: Fri, 24 May 2019 01:00:56 -0700 Subject: [PATCH 01/13] -- --- src/main.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 2907203..99c4c7f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -5333,7 +5333,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, vRecv >> LIMITED_STRING(pfrom->strSubVer, MAX_SUBVERSION_LENGTH); pfrom->cleanSubVer = SanitizeString(pfrom->strSubVer); } - + + if (!vRecv.empty()) + vRecv >> pfrom->nStartingHeight; string remoteAddrx; remoteAddrx = ", peeraddr=" + pfrom->addr.ToString(); @@ -5389,8 +5391,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, //END MODS - if (!vRecv.empty()) - vRecv >> pfrom->nStartingHeight; + if (!vRecv.empty()) vRecv >> pfrom->fRelayTxes; // set to true after we get the first filter* message else From 28ccb6d5e5b18ab16cb1ddb71af5ba311ec4276a Mon Sep 17 00:00:00 2001 From: coolblock Date: Fri, 21 Jun 2019 14:03:57 -0700 Subject: [PATCH 02/13] -- --- configure.ac | 2 +- share/genbuild.sh | 2 +- src/governance.cpp | 7 +++++-- src/main.cpp | 20 +++++++++++++++++++- src/masternode-sync.cpp | 4 +++- src/net.cpp | 4 ++-- 6 files changed, 31 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 13f55ab..e5475ac 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, 16) +define(_CLIENT_VERSION_BUILD, 17) 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]) diff --git a/share/genbuild.sh b/share/genbuild.sh index a15cb34..86c6309 100755 --- a/share/genbuild.sh +++ b/share/genbuild.sh @@ -28,7 +28,7 @@ if [ -e "$(which git 2>/dev/null)" -a "$(git rev-parse --is-inside-work-tree 2>/ # otherwise generate suffix from git, i.e. string like "59887e8-dirty" SUFFIX=$(git rev-parse --short HEAD) - git diff-index --quiet HEAD -- || SUFFIX="$SUFFIX-dirty" + git diff-index --quiet HEAD -- || SUFFIX="$SUFFIX-Special" # get a string like "2012-04-10 16:27:19 +0200" LAST_COMMIT_DATE="$(git log -n 1 --format="%ci")" diff --git a/src/governance.cpp b/src/governance.cpp index 216acac..eb3546f 100644 --- a/src/governance.cpp +++ b/src/governance.cpp @@ -109,7 +109,8 @@ void CGovernanceManager::ProcessMessage(CNode* pfrom, std::string& strCommand, C if(pfrom->nVersion < MIN_GOVERNANCE_PEER_PROTO_VERSION) return; if(pfrom->nVersion == 70209) return; - if(pfrom->nVersion == 70208) return; + if(pfrom->nVersion == 70208) return; + //exsplit // ANOTHER USER IS ASKING US TO HELP THEM SYNC GOVERNANCE OBJECT DATA if (strCommand == NetMsgType::MNGOVERNANCESYNC) @@ -127,7 +128,8 @@ void CGovernanceManager::ProcessMessage(CNode* pfrom, std::string& strCommand, C if(pfrom->nVersion != 70209) - if(pfrom->nVersion != 70208) + if(pfrom->nVersion != 70208) + //exsplit if(pfrom->nVersion >= GOVERNANCE_FILTER_PROTO_VERSION) { vRecv >> filter; filter.UpdateEmptyFull(); @@ -1163,6 +1165,7 @@ int CGovernanceManager::RequestGovernanceObjectVotes(const std::vector& if(pnode->nVersion < MIN_GOVERNANCE_PEER_PROTO_VERSION) continue; if(pnode->nVersion == 70209) continue; if(pnode->nVersion == 70208) continue; + //exsplit // stop early to prevent setAskFor overflow size_t nProjectedSize = pnode->setAskFor.size() + nProjectedVotes; diff --git a/src/main.cpp b/src/main.cpp index 99c4c7f..bbe754d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -5305,8 +5305,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, #define SIX_WEEKS_SINCE_BLOCK 447187 #define THREE_MONTHS_SINCE_BLOCK 474067 #define FOUR_MONTHS_PLUS_TWOWEEKS_SINCE_BLOCK 500947 +#define SIX_MONTHS_PLUS_TWOWEEKS_SINCE_BLOCK 559811 - if (chainActive.Height() > FOUR_MONTHS_PLUS_TWOWEEKS_SINCE_BLOCK) { + if (chainActive.Height() > SIX_MONTHS_PLUS_TWOWEEKS_SINCE_BLOCK) { LogPrintf("YOU NEED TO GET NEW VERSION- UPGRADE VIVO\n"); StartShutdown(); } @@ -5388,6 +5389,23 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, return false; } } + + if (chainActive.Height() > FOUR_MONTHS_PLUS_TWOWEEKS_SINCE_BLOCK) { + LogPrintf("===================xxxxxxxxxx3===========================\n"); + string searchVersion ("Vivo Core:0.12.1.16"); + if (pfrom->cleanSubVer.find(searchVersion) != std::string::npos) + { + LogPrintf("******************* peer=%d using obsolete version %i %s; disconnecting\n", pfrom->id, pfrom->cleanSubVer, remoteAddrx); + //pfrom->PushMessage(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE, + // strprintf("Version must be %d or greater", MIN_PEER_PROTO_VERSION)); + pfrom->fDisconnect = true; + return false; + } + } + + + + //END MODS diff --git a/src/masternode-sync.cpp b/src/masternode-sync.cpp index 3e45316..19a2aec 100644 --- a/src/masternode-sync.cpp +++ b/src/masternode-sync.cpp @@ -489,7 +489,8 @@ void CMasternodeSync::ProcessTick() if (pnode->nVersion < MIN_GOVERNANCE_PEER_PROTO_VERSION) continue; if(pnode->nVersion == 70209) continue; if(pnode->nVersion == 70208) continue; - + //exsplit + nRequestedMasternodeAttempt++; SendGovernanceSyncRequest(pnode); @@ -507,6 +508,7 @@ void CMasternodeSync::SendGovernanceSyncRequest(CNode* pnode) { if(pnode->nVersion != 70209) if(pnode->nVersion != 70208) + //exsplit if(pnode->nVersion >= GOVERNANCE_FILTER_PROTO_VERSION) { CBloomFilter filter; diff --git a/src/net.cpp b/src/net.cpp index 39b41ec..f8fb1f5 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1581,8 +1581,8 @@ void ThreadOpenConnections() continue; // do not allow non-default ports, unless after 50 invalid addresses selected already - if (addr.GetPort() != Params().GetDefaultPort() && nTries < 50) - continue; + //if (addr.GetPort() != Params().GetDefaultPort() && nTries < 50) + // continue; addrConnect = addr; break; From c8a3973668b50d38eb995230c1c260f5964a66eb Mon Sep 17 00:00:00 2001 From: coolblock Date: Sat, 22 Jun 2019 21:26:33 -0700 Subject: [PATCH 03/13] -- --- src/governance.cpp | 7 +++++++ src/net.cpp | 9 ++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/governance.cpp b/src/governance.cpp index eb3546f..b300b53 100644 --- a/src/governance.cpp +++ b/src/governance.cpp @@ -110,6 +110,13 @@ void CGovernanceManager::ProcessMessage(CNode* pfrom, std::string& strCommand, C if(pfrom->nVersion < MIN_GOVERNANCE_PEER_PROTO_VERSION) return; if(pfrom->nVersion == 70209) return; if(pfrom->nVersion == 70208) return; + string searchVersion ("Vivo Core:0.12.1.12"); + if (pfrom->cleanSubVer.find(searchVersion) != std::string::npos) + { + LogPrintf("ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZAAAAAAAAAA\n"); + return; + } + //exsplit // ANOTHER USER IS ASKING US TO HELP THEM SYNC GOVERNANCE OBJECT DATA diff --git a/src/net.cpp b/src/net.cpp index f8fb1f5..56dba16 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -2135,10 +2135,17 @@ void RelayTransaction(const CTransaction& tx, const CDataStream& ss) void RelayInv(CInv &inv, const int minProtoVersion) { LOCK(cs_vNodes); + //exsplit BOOST_FOREACH(CNode* pnode, vNodes) - + { + string searchVersion ("Vivo Core:0.12.1.12"); + if (pfrom->cleanSubVer.find(searchVersion) != std::string::npos) + { + LogPrintf("ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ\n"); + } else if(pnode->nVersion >= 70210) pnode->PushInventory(inv); + } } void CNode::RecordBytesRecv(uint64_t bytes) From 63f8adc38bf6938ddbdd4fc98e0aebc86afbc9c3 Mon Sep 17 00:00:00 2001 From: coolblock Date: Sat, 22 Jun 2019 21:38:10 -0700 Subject: [PATCH 04/13] -- --- src/net.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/net.cpp b/src/net.cpp index 56dba16..8b67ad3 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -2139,9 +2139,9 @@ void RelayInv(CInv &inv, const int minProtoVersion) { BOOST_FOREACH(CNode* pnode, vNodes) { string searchVersion ("Vivo Core:0.12.1.12"); - if (pfrom->cleanSubVer.find(searchVersion) != std::string::npos) + if (pnode->cleanSubVer.find(searchVersion) != std::string::npos) { - LogPrintf("ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ\n"); + LogPrintf("ZZZZZZZZZZZZZZZZZZZZZ .12 ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ\n"); } else if(pnode->nVersion >= 70210) pnode->PushInventory(inv); From 1ae74caa78385e9a2e99b31d206cbc4c781385b6 Mon Sep 17 00:00:00 2001 From: coolblock Date: Sun, 23 Jun 2019 00:31:07 -0700 Subject: [PATCH 05/13] -- --- src/net.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/net.cpp b/src/net.cpp index 8b67ad3..8563848 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -2138,6 +2138,9 @@ void RelayInv(CInv &inv, const int minProtoVersion) { //exsplit BOOST_FOREACH(CNode* pnode, vNodes) { + + + LogPrintf("AAAAAA <%i> <%i> %s \n", pfrom->strSubVer, pfrom->cleanSubVer, remoteAddrx); string searchVersion ("Vivo Core:0.12.1.12"); if (pnode->cleanSubVer.find(searchVersion) != std::string::npos) { From 6b05480fb11096e68b9923add0b77438bb832ca5 Mon Sep 17 00:00:00 2001 From: coolblock Date: Sun, 23 Jun 2019 00:37:59 -0700 Subject: [PATCH 06/13] -- --- src/net.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/net.cpp b/src/net.cpp index 8563848..27339af 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -2140,7 +2140,7 @@ void RelayInv(CInv &inv, const int minProtoVersion) { { - LogPrintf("AAAAAA <%i> <%i> %s \n", pfrom->strSubVer, pfrom->cleanSubVer, remoteAddrx); + LogPrintf("AAAAAA <%i> <%i> %s \n", pnode->strSubVer, pnode->cleanSubVer, remoteAddrx); string searchVersion ("Vivo Core:0.12.1.12"); if (pnode->cleanSubVer.find(searchVersion) != std::string::npos) { From c701ca8d9cea282c7456d74a3b431ffd221495f9 Mon Sep 17 00:00:00 2001 From: coolblock Date: Sun, 23 Jun 2019 00:45:54 -0700 Subject: [PATCH 07/13] -- --- src/net.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/net.cpp b/src/net.cpp index 27339af..8b7f745 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -2140,7 +2140,7 @@ void RelayInv(CInv &inv, const int minProtoVersion) { { - LogPrintf("AAAAAA <%i> <%i> %s \n", pnode->strSubVer, pnode->cleanSubVer, remoteAddrx); + LogPrintf("AAAAAA <%i> <%i> %d \n", pnode->strSubVer, pnode->cleanSubVer, pnode->nVersion); string searchVersion ("Vivo Core:0.12.1.12"); if (pnode->cleanSubVer.find(searchVersion) != std::string::npos) { From 62f944a865918b1a42c149b6f033675f75a9dc6e Mon Sep 17 00:00:00 2001 From: coolblock Date: Sun, 23 Jun 2019 12:25:57 -0700 Subject: [PATCH 08/13] -- --- src/governance.cpp | 2 +- src/masternode-sync.cpp | 4 +++- src/net.cpp | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/governance.cpp b/src/governance.cpp index b300b53..db62454 100644 --- a/src/governance.cpp +++ b/src/governance.cpp @@ -1173,7 +1173,7 @@ int CGovernanceManager::RequestGovernanceObjectVotes(const std::vector& if(pnode->nVersion == 70209) continue; if(pnode->nVersion == 70208) continue; //exsplit - + LogPrintf("CCCCCC <%i> <%i> %d \n", pnode->strSubVer, pnode->cleanSubVer, pnode->nVersion); // 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 19a2aec..20556d8 100644 --- a/src/masternode-sync.cpp +++ b/src/masternode-sync.cpp @@ -489,7 +489,8 @@ void CMasternodeSync::ProcessTick() if (pnode->nVersion < MIN_GOVERNANCE_PEER_PROTO_VERSION) continue; if(pnode->nVersion == 70209) continue; if(pnode->nVersion == 70208) continue; - //exsplit + //exsplit + LogPrintf("BBBBBB <%i> <%i> %d \n", pnode->strSubVer, pnode->cleanSubVer, pnode->nVersion); nRequestedMasternodeAttempt++; @@ -506,6 +507,7 @@ void CMasternodeSync::ProcessTick() void CMasternodeSync::SendGovernanceSyncRequest(CNode* pnode) { + LogPrintf("AAAAAA <%i> <%i> %d \n", pnode->strSubVer, pnode->cleanSubVer, pnode->nVersion); if(pnode->nVersion != 70209) if(pnode->nVersion != 70208) //exsplit diff --git a/src/net.cpp b/src/net.cpp index 8b7f745..7c90ba6 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -2140,7 +2140,7 @@ void RelayInv(CInv &inv, const int minProtoVersion) { { - LogPrintf("AAAAAA <%i> <%i> %d \n", pnode->strSubVer, pnode->cleanSubVer, pnode->nVersion); + //LogPrintf("AAAAAA <%i> <%i> %d \n", pnode->strSubVer, pnode->cleanSubVer, pnode->nVersion); string searchVersion ("Vivo Core:0.12.1.12"); if (pnode->cleanSubVer.find(searchVersion) != std::string::npos) { From 49153021e2f5c3038796e85966c9152590136ae3 Mon Sep 17 00:00:00 2001 From: coolblock Date: Sun, 23 Jun 2019 13:42:42 -0700 Subject: [PATCH 09/13] -- --- src/governance.cpp | 8 +++++++- src/masternode-sync.cpp | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/governance.cpp b/src/governance.cpp index db62454..9d4ddfd 100644 --- a/src/governance.cpp +++ b/src/governance.cpp @@ -1060,6 +1060,8 @@ void CGovernanceManager::RequestGovernanceObject(CNode* pfrom, const uint256& nH return; } + LogPrintf("FFFFFF <%i> <%i> %d \n", pfrom->strSubVer, pfrom->cleanSubVer, pfrom->nVersion); + LogPrint("gobject", "CGovernanceObject::RequestGovernanceObject -- hash = %s (peer=%d)\n", nHash.ToString(), pfrom->GetId()); if(pfrom->nVersion < GOVERNANCE_FILTER_PROTO_VERSION) { @@ -1088,7 +1090,11 @@ void CGovernanceManager::RequestGovernanceObject(CNode* pfrom, const uint256& nH int CGovernanceManager::RequestGovernanceObjectVotes(CNode* pnode) { + LogPrintf("DDDDDD <%i> <%i> %d \n", pnode->strSubVer, pnode->cleanSubVer, pnode->nVersion); if(pnode->nVersion < MIN_GOVERNANCE_PEER_PROTO_VERSION) return -3; + //exsplit + + std::vector vNodesCopy; vNodesCopy.push_back(pnode); return RequestGovernanceObjectVotes(vNodesCopy); @@ -1173,7 +1179,7 @@ int CGovernanceManager::RequestGovernanceObjectVotes(const std::vector& if(pnode->nVersion == 70209) continue; if(pnode->nVersion == 70208) continue; //exsplit - LogPrintf("CCCCCC <%i> <%i> %d \n", pnode->strSubVer, pnode->cleanSubVer, pnode->nVersion); + //LogPrintf("CCCCCC <%i> <%i> %d \n", pnode->strSubVer, pnode->cleanSubVer, pnode->nVersion); // 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 20556d8..39f27a5 100644 --- a/src/masternode-sync.cpp +++ b/src/masternode-sync.cpp @@ -490,7 +490,7 @@ void CMasternodeSync::ProcessTick() if(pnode->nVersion == 70209) continue; if(pnode->nVersion == 70208) continue; //exsplit - LogPrintf("BBBBBB <%i> <%i> %d \n", pnode->strSubVer, pnode->cleanSubVer, pnode->nVersion); + //LogPrintf("BBBBBB <%i> <%i> %d \n", pnode->strSubVer, pnode->cleanSubVer, pnode->nVersion); nRequestedMasternodeAttempt++; @@ -507,7 +507,7 @@ void CMasternodeSync::ProcessTick() void CMasternodeSync::SendGovernanceSyncRequest(CNode* pnode) { - LogPrintf("AAAAAA <%i> <%i> %d \n", pnode->strSubVer, pnode->cleanSubVer, pnode->nVersion); + //LogPrintf("AAAAAA <%i> <%i> %d \n", pnode->strSubVer, pnode->cleanSubVer, pnode->nVersion); if(pnode->nVersion != 70209) if(pnode->nVersion != 70208) //exsplit From d417e0dec40816c04a5bb5c73b5499cf1afe5baa Mon Sep 17 00:00:00 2001 From: coolblock Date: Sun, 23 Jun 2019 21:58:11 -0700 Subject: [PATCH 10/13] -- --- src/chainparams.cpp | 5 +++-- src/governance.cpp | 9 +++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 36b1a02..e31d0bb 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -182,8 +182,9 @@ class CMainParams : public CChainParams { (308000, uint256S("0x0000000018ee47a3c93296309ce207724868232706f59a6937362581476ce462")) (349891, uint256S("0x000000000965eb7af631e8717d10b477568a699cbb5cc172f723204f699e3488")) (378129, uint256S("0x000000002f22a53a0228c6b94c960ba923df660531911392841196f641970b5f")) - (420300, uint256S("0x0000000037e291974d11f3f0c5309632db5d1b5c70162014a11e3de7920a548b")), - 1557968975, // * UNIX timestamp of last checkpoint block + (420300, uint256S("0x0000000037e291974d11f3f0c5309632db5d1b5c70162014a11e3de7920a548b")) + (444770, uint256S("0x00000000a21f0077a24e0d814dcfca41144a49d671ad2f3adb9f5fe5f509efaa")), + 1561331573, // * 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) 500 // * estimated number of transactions per day after checkpoint diff --git a/src/governance.cpp b/src/governance.cpp index 9d4ddfd..f4503cc 100644 --- a/src/governance.cpp +++ b/src/governance.cpp @@ -106,7 +106,7 @@ void CGovernanceManager::ProcessMessage(CNode* pfrom, std::string& strCommand, C // lite mode is not supported if(fLiteMode) return; if(!masternodeSync.IsBlockchainSynced()) return; - + //LogPrintf("GGGGGG <%i> <%i> %d \n", pfrom->strSubVer, pfrom->cleanSubVer, pfrom->nVersion); if(pfrom->nVersion < MIN_GOVERNANCE_PEER_PROTO_VERSION) return; if(pfrom->nVersion == 70209) return; if(pfrom->nVersion == 70208) return; @@ -1060,7 +1060,7 @@ void CGovernanceManager::RequestGovernanceObject(CNode* pfrom, const uint256& nH return; } - LogPrintf("FFFFFF <%i> <%i> %d \n", pfrom->strSubVer, pfrom->cleanSubVer, pfrom->nVersion); + //LogPrintf("FFFFFF <%i> <%i> %d \n", pfrom->strSubVer, pfrom->cleanSubVer, pfrom->nVersion); LogPrint("gobject", "CGovernanceObject::RequestGovernanceObject -- hash = %s (peer=%d)\n", nHash.ToString(), pfrom->GetId()); @@ -1090,7 +1090,7 @@ void CGovernanceManager::RequestGovernanceObject(CNode* pfrom, const uint256& nH int CGovernanceManager::RequestGovernanceObjectVotes(CNode* pnode) { - LogPrintf("DDDDDD <%i> <%i> %d \n", pnode->strSubVer, pnode->cleanSubVer, pnode->nVersion); + //LogPrintf("DDDDDD <%i> <%i> %d \n", pnode->strSubVer, pnode->cleanSubVer, pnode->nVersion); if(pnode->nVersion < MIN_GOVERNANCE_PEER_PROTO_VERSION) return -3; //exsplit @@ -1173,13 +1173,14 @@ int CGovernanceManager::RequestGovernanceObjectVotes(const std::vector& // they stay connected for a short period of time and it's possible that we won't get everything we should. // Only use outbound connections - inbound connection could be a "masternode" connection // initialted from another node, so skip it too. + LogPrintf("CCCCCC <%i> <%i> %d \n", pnode->strSubVer, pnode->cleanSubVer, pnode->nVersion); if(pnode->fMasternode || (fMasterNode && pnode->fInbound)) continue; // only use up to date peers if(pnode->nVersion < MIN_GOVERNANCE_PEER_PROTO_VERSION) continue; if(pnode->nVersion == 70209) continue; if(pnode->nVersion == 70208) continue; //exsplit - //LogPrintf("CCCCCC <%i> <%i> %d \n", pnode->strSubVer, pnode->cleanSubVer, pnode->nVersion); + // stop early to prevent setAskFor overflow size_t nProjectedSize = pnode->setAskFor.size() + nProjectedVotes; if(nProjectedSize > SETASKFOR_MAX_SZ/2) continue; From eab2aab99e1a22f1edd1c4f0f590cbc2a29ce674 Mon Sep 17 00:00:00 2001 From: coolblock Date: Tue, 25 Jun 2019 10:11:01 -0700 Subject: [PATCH 11/13] -- --- src/governance.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/governance.cpp b/src/governance.cpp index f4503cc..698376a 100644 --- a/src/governance.cpp +++ b/src/governance.cpp @@ -1173,7 +1173,7 @@ int CGovernanceManager::RequestGovernanceObjectVotes(const std::vector& // they stay connected for a short period of time and it's possible that we won't get everything we should. // Only use outbound connections - inbound connection could be a "masternode" connection // initialted from another node, so skip it too. - LogPrintf("CCCCCC <%i> <%i> %d \n", pnode->strSubVer, pnode->cleanSubVer, pnode->nVersion); + //LogPrintf("CCCCCC <%i> <%i> %d \n", pnode->strSubVer, pnode->cleanSubVer, pnode->nVersion); if(pnode->fMasternode || (fMasterNode && pnode->fInbound)) continue; // only use up to date peers if(pnode->nVersion < MIN_GOVERNANCE_PEER_PROTO_VERSION) continue; From be48218b93ead3331b557fb836ad8dea36a78c11 Mon Sep 17 00:00:00 2001 From: coolblock Date: Tue, 25 Jun 2019 11:04:13 -0700 Subject: [PATCH 12/13] -- --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index bbe754d..e230953 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -5391,7 +5391,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, } if (chainActive.Height() > FOUR_MONTHS_PLUS_TWOWEEKS_SINCE_BLOCK) { - LogPrintf("===================xxxxxxxxxx3===========================\n"); + LogPrintf("===================xxxxxxxxxx4===========================\n"); string searchVersion ("Vivo Core:0.12.1.16"); if (pfrom->cleanSubVer.find(searchVersion) != std::string::npos) { From a11e9a1cd94dacb08ea72d10bb92336f6ffc6e01 Mon Sep 17 00:00:00 2001 From: coolblock Date: Tue, 25 Jun 2019 15:42:38 -0700 Subject: [PATCH 13/13] -- --- src/main.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index e230953..3b644f6 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -5307,10 +5307,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, #define FOUR_MONTHS_PLUS_TWOWEEKS_SINCE_BLOCK 500947 #define SIX_MONTHS_PLUS_TWOWEEKS_SINCE_BLOCK 559811 - if (chainActive.Height() > SIX_MONTHS_PLUS_TWOWEEKS_SINCE_BLOCK) { - LogPrintf("YOU NEED TO GET NEW VERSION- UPGRADE VIVO\n"); - StartShutdown(); - } + //if (chainActive.Height() > SIX_MONTHS_PLUS_TWOWEEKS_SINCE_BLOCK) { + // LogPrintf("YOU NEED TO GET NEW VERSION- UPGRADE VIVO\n"); + // StartShutdown(); + //} if (pfrom->nVersion < 70210)