From 5e1a6afe7f42bb8aac55417f0ab37681ecbb6a91 Mon Sep 17 00:00:00 2001 From: Evan Duffield Date: Tue, 11 Aug 2015 15:43:05 -0700 Subject: [PATCH] Send nLastDsq with MasternodeBroadcast --- src/instantx.h | 2 +- src/masternode.cpp | 2 +- src/masternode.h | 1 + src/version.h | 10 +++++----- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/instantx.h b/src/instantx.h index 3e725f723..4c93d6509 100644 --- a/src/instantx.h +++ b/src/instantx.h @@ -32,7 +32,7 @@ class CConsensusVote; class CTransaction; class CTransactionLock; -static const int MIN_INSTANTX_PROTO_VERSION = 70101; +static const int MIN_INSTANTX_PROTO_VERSION = 70102; extern map mapTxLockReq; extern map mapTxLockReqRejected; diff --git a/src/masternode.cpp b/src/masternode.cpp index 3c5de7b90..6a9592ca5 100644 --- a/src/masternode.cpp +++ b/src/masternode.cpp @@ -113,7 +113,7 @@ CMasternode::CMasternode(const CMasternodeBroadcast& mnb) unitTest = false; allowFreeTx = true; protocolVersion = mnb.protocolVersion; - nLastDsq = 0; + nLastDsq = mn.nLastDsq; nScanningErrorCount = 0; nLastScanningErrorBlockHeight = 0; lastTimeChecked = 0; diff --git a/src/masternode.h b/src/masternode.h index 2bea42ec5..cb1d1db2e 100644 --- a/src/masternode.h +++ b/src/masternode.h @@ -301,6 +301,7 @@ public: READWRITE(sigTime); READWRITE(protocolVersion); READWRITE(lastPing); + READWRITE(nLastDsq); } uint256 GetHash(){ diff --git a/src/version.h b/src/version.h index 47839697a..603e682f3 100644 --- a/src/version.h +++ b/src/version.h @@ -10,7 +10,7 @@ * network protocol versioning */ -static const int PROTOCOL_VERSION = 70101; +static const int PROTOCOL_VERSION = 70102; //! initial proto version, to be increased after version/verack negotiation static const int INIT_PROTO_VERSION = 209; @@ -22,19 +22,19 @@ static const int GETHEADERS_VERSION = 70077; static const int MIN_PEER_PROTO_VERSION = 70066; //! minimum peer version accepted by DarksendPool -static const int MIN_POOL_PEER_PROTO_VERSION = 70101; +static const int MIN_POOL_PEER_PROTO_VERSION = 70102; //! minimum peer version for masternode budgets -static const int MIN_BUDGET_PEER_PROTO_VERSION = 70101; +static const int MIN_BUDGET_PEER_PROTO_VERSION = 70102; //! minimum peer version for masternode winner broadcasts -static const int MIN_MNW_PEER_PROTO_VERSION = 70101; +static const int MIN_MNW_PEER_PROTO_VERSION = 70102; //! minimum peer version that can receive masternode payments // V1 - Last protocol version before update // V2 - Newest protocol version static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_1 = 70066; -static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_2 = 70101; +static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_2 = 70102; //! nTime field added to CAddress, starting with this version; //! if possible, avoid requesting addresses nodes older than this