sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 12:02:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

merged and fixed messages

Browse Source
This commit is contained in:
Evan Duffield 2016-03-03 06:55:32 -07:00
parent a2fdef43e2
commit 89ff8a6d7e
2 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build-aux/m4/bitcoin_find_bdb48.m4
View File

@ -38,7 +38,7 @@ AC_DEFUN([BITCOIN_FIND_BDB48],[
done done
if test "x$bdbpath" = "xX"; then if test "x$bdbpath" = "xX"; then
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
AC_MSG_ERROR([libdb_cxx headers missing, Bitcoin Core requires this library for wallet functionality (--disable-wallet to disable wallet functionality)]) AC_MSG_ERROR([libdb_cxx headers missing, Dash Core requires this library for wallet functionality (--disable-wallet to disable wallet functionality)])
elif test "x$bdb48path" = "xX"; then elif test "x$bdb48path" = "xX"; then
BITCOIN_SUBDIR_TO_INCLUDE(BDB_CPPFLAGS,[${bdbpath}],db_cxx) BITCOIN_SUBDIR_TO_INCLUDE(BDB_CPPFLAGS,[${bdbpath}],db_cxx)
AC_ARG_WITH([incompatible-bdb],[AS_HELP_STRING([--with-incompatible-bdb], [allow using a bdb version other than 4.8])],[ AC_ARG_WITH([incompatible-bdb],[AS_HELP_STRING([--with-incompatible-bdb], [allow using a bdb version other than 4.8])],[
@ -60,7 +60,7 @@ AC_DEFUN([BITCOIN_FIND_BDB48],[
]) ])
done done
if test "x$BDB_LIBS" = "x"; then if test "x$BDB_LIBS" = "x"; then
AC_MSG_ERROR([libdb_cxx missing, Bitcoin Core requires this library for wallet functionality (--disable-wallet to disable wallet functionality)]) AC_MSG_ERROR([libdb_cxx missing, Dash Core requires this library for wallet functionality (--disable-wallet to disable wallet functionality)])
fi fi
AC_SUBST(BDB_LIBS) AC_SUBST(BDB_LIBS)
]) ])

17
src/masternode-sync.cpp
View File

@ -345,19 +345,11 @@ void CMasternodeSync::Process()
return; //this will cause each peer to get one request each six seconds for the various assets we need return; //this will cause each peer to get one request each six seconds for the various assets we need
} }
<<<<<<< HEAD
// MODE : MASTERNODE_SYNC_MNW // MODE : MASTERNODE_SYNC_MNW
if(RequestedMasternodeAssets == MASTERNODE_SYNC_MNW) { if(RequestedMasternodeAssets == MASTERNODE_SYNC_MNW) {
//printf("MASTERNODE_SYNC_MNW Timeout at %d\n", lastMasternodeWinner < GetTime() - MASTERNODE_SYNC_TIMEOUT); //printf("MASTERNODE_SYNC_MNW Timeout at %d\n", lastMasternodeWinner < GetTime() - MASTERNODE_SYNC_TIMEOUT);
=======
// MODE : MASTERNODE_SYNC_MNW
if(RequestedMasternodeAssets == MASTERNODE_SYNC_MNW) {
//printf("MASTERNODE_SYNC_MNW Timeout at %d\n", lastMasternodeWinner < GetTime() - MASTERNODE_SYNC_TIMEOUT);
>>>>>>> e1616160952f25d26a88002dd9448b1ad5d48202
// Shall we move onto the next asset? // Shall we move onto the next asset?
// -- // --
// This might take a lot longer than 2 minutes due to new blocks, but that's OK. It will eventually time out if needed // This might take a lot longer than 2 minutes due to new blocks, but that's OK. It will eventually time out if needed
@ -390,11 +382,7 @@ void CMasternodeSync::Process()
if(pindexPrev == NULL) return; if(pindexPrev == NULL) return;
int nMnCount = mnodeman.CountEnabled(); int nMnCount = mnodeman.CountEnabled();
<<<<<<< HEAD
pnode->PushMessage("mnget", nMnCount); //sync payees
=======
pnode->PushMessage(NetMsgType::MNWINNERSSYNC, nMnCount); //sync payees pnode->PushMessage(NetMsgType::MNWINNERSSYNC, nMnCount); //sync payees
>>>>>>> e1616160952f25d26a88002dd9448b1ad5d48202
RequestedMasternodeAttempt++; RequestedMasternodeAttempt++;
@ -437,13 +425,8 @@ void CMasternodeSync::Process()
if(pnode->HasFulfilledRequest("busync")) continue; if(pnode->HasFulfilledRequest("busync")) continue;
pnode->FulfilledRequest("busync"); pnode->FulfilledRequest("busync");
<<<<<<< HEAD
uint256 n = 0;
pnode->PushMessage("mnvs", n); //sync masternode votes
=======
uint256 n = uint256(); uint256 n = uint256();
pnode->PushMessage(NetMsgType::MNBUDGETVOTESYNC, n); //sync masternode votes pnode->PushMessage(NetMsgType::MNBUDGETVOTESYNC, n); //sync masternode votes
>>>>>>> e1616160952f25d26a88002dd9448b1ad5d48202
RequestedMasternodeAttempt++; RequestedMasternodeAttempt++;
return; //this will cause each peer to get one request each six seconds for the various assets we need return; //this will cause each peer to get one request each six seconds for the various assets we need