neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'v0.12.0.x' of https://github.com/dashpay/dash

Browse Source
This commit is contained in:
Evan Duffield 2015-08-13 09:39:12 -07:00
commit 9ee73cd238
4 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/miner.cpp
View File

@ -20,7 +20,6 @@
#include "wallet.h" #include "wallet.h"
#endif #endif
#include "masternode-payments.h" #include "masternode-payments.h"
#include "masternode-sync.h"
#include <boost/thread.hpp> #include <boost/thread.hpp>
#include <boost/tuple/tuple.hpp> #include <boost/tuple/tuple.hpp>
@ -475,7 +474,7 @@ void static BitcoinMiner(CWallet *pwallet)
LOCK(cs_vNodes); LOCK(cs_vNodes);
fvNodesEmpty = vNodes.empty(); fvNodesEmpty = vNodes.empty();
} }
if (!fvNodesEmpty && masternodeSync.IsSynced()) if (!fvNodesEmpty && !IsInitialBlockDownload())
break; break;
MilliSleep(1000); MilliSleep(1000);
} while (true); } while (true);

8
src/rpcmining.cpp
View File

@ -19,7 +19,6 @@
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
#include "db.h" #include "db.h"
#include "wallet.h" #include "wallet.h"
#include "masternode-sync.h"
#endif #endif
#include <stdint.h> #include <stdint.h>
@ -443,11 +442,8 @@ Value getblocktemplate(const Array& params, bool fHelp)
if (vNodes.empty()) if (vNodes.empty())
throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Dash is not connected!"); throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Dash is not connected!");
if (!masternodeSync.IsBlockchainSynced()) if (IsInitialBlockDownload())
throw JSONRPCError(RPC_CLIENT_IN_BLOCKCHAIN_SYNC, "Dash is trying to sync blocks..."); throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Dash is downloading blocks...");
if (!masternodeSync.IsSynced())
throw JSONRPCError(RPC_CLIENT_IN_ADDITIONAL_SYNC, "Dash is trying to sync additional data... Use 'mnsync status' to get more info.");
static unsigned int nTransactionsUpdatedLast; static unsigned int nTransactionsUpdatedLast;

1
src/rpcmisc.cpp
View File

@ -123,7 +123,6 @@ Value mnsync(const Array& params, bool fHelp)
Object obj; Object obj;
obj.push_back(Pair("IsBlockchainSynced", masternodeSync.IsBlockchainSynced())); obj.push_back(Pair("IsBlockchainSynced", masternodeSync.IsBlockchainSynced()));
obj.push_back(Pair("IsSynced", masternodeSync.IsSynced()));
obj.push_back(Pair("lastMasternodeList", masternodeSync.lastMasternodeList)); obj.push_back(Pair("lastMasternodeList", masternodeSync.lastMasternodeList));
obj.push_back(Pair("lastMasternodeWinner", masternodeSync.lastMasternodeWinner)); obj.push_back(Pair("lastMasternodeWinner", masternodeSync.lastMasternodeWinner));
obj.push_back(Pair("lastBudgetItem", masternodeSync.lastBudgetItem)); obj.push_back(Pair("lastBudgetItem", masternodeSync.lastBudgetItem));

2
src/rpcprotocol.h
View File

@ -63,8 +63,6 @@ enum RPCErrorCode
//! P2P client errors //! P2P client errors
RPC_CLIENT_NOT_CONNECTED = -9, //! Dash is not connected RPC_CLIENT_NOT_CONNECTED = -9, //! Dash is not connected
RPC_CLIENT_IN_INITIAL_DOWNLOAD = -10, //! Still downloading initial blocks RPC_CLIENT_IN_INITIAL_DOWNLOAD = -10, //! Still downloading initial blocks
RPC_CLIENT_IN_BLOCKCHAIN_SYNC = -110,//! Syncing blocks
RPC_CLIENT_IN_ADDITIONAL_SYNC = -111,//! Syncing additional data
RPC_CLIENT_NODE_ALREADY_ADDED = -23, //! Node is already added RPC_CLIENT_NODE_ALREADY_ADDED = -23, //! Node is already added
RPC_CLIENT_NODE_NOT_ADDED = -24, //! Node has not been added before RPC_CLIENT_NODE_NOT_ADDED = -24, //! Node has not been added before