Send nLastDsq with MasternodeBroadcast

This commit is contained in:
Evan Duffield 2015-08-11 15:43:05 -07:00
parent be801aadea
commit 5e1a6afe7f
4 changed files with 8 additions and 7 deletions

View File

@ -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<uint256, CTransaction> mapTxLockReq;
extern map<uint256, CTransaction> mapTxLockReqRejected;

View File

@ -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;

View File

@ -301,6 +301,7 @@ public:
READWRITE(sigTime);
READWRITE(protocolVersion);
READWRITE(lastPing);
READWRITE(nLastDsq);
}
uint256 GetHash(){

View File

@ -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