Skip to content

[v0.16.x] More UI + PrivateSend/MN-Sync improvements #3705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
UdjinM6 merged 11 commits into from
Sep 13, 2020
Merged

[v0.16.x] More UI + PrivateSend/MN-Sync improvements #3705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ba2dcb0
qt: Update assets and colorize them theme related (#3574)
xdustinface Sep 10, 2020
9c988d5
privatesend|wallet|qt: Improve calculations in CreateDenominated/Make…
xdustinface Sep 1, 2020
dd55609
test: Implement unit tests for CWallet::CreateTransaction (#3667)
xdustinface Sep 4, 2020
ab0f789
wallet: Fix and improve CWallet::CreateTransaction (#3668)
xdustinface Sep 4, 2020
54ed089
test: Implement unit tests for CTransactionBuilder (#3677)
xdustinface Sep 4, 2020
2e92237
qt: Improved status bar (#3688)
xdustinface Sep 11, 2020
aa81a06
masternode|rpc: Remove unused code (#3689)
xdustinface Sep 8, 2020
2bb94c7
masternode|net|rpc: Improve masternode sync process (#3690)
xdustinface Sep 11, 2020
9e425d6
Partially merge #3604:
xdustinface Sep 12, 2020
16f9d94
qt: Make sure the statusbar reflects internal states correct (#3698)
xdustinface Sep 12, 2020
01a3a6c
qt: Finetune ModalOverlay (#3699)
xdustinface Sep 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 38 additions & 32 deletions src/Makefile.qt.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,18 +305,14 @@ BITCOIN_QT_CPP += $(BITCOIN_QT_WALLET_CPP)
endif

RES_IMAGES = \
qt/res/images/arrow_down_normal.png \
qt/res/images/arrow_down_hover.png \
qt/res/images/arrow_down_pressed.png \
qt/res/images/arrow_left_normal.png \
qt/res/images/arrow_left_hover.png \
qt/res/images/arrow_left_pressed.png \
qt/res/images/arrow_right_normal.png \
qt/res/images/arrow_right_hover.png \
qt/res/images/arrow_right_pressed.png \
qt/res/images/arrow_up_normal.png \
qt/res/images/arrow_up_hover.png \
qt/res/images/arrow_up_pressed.png \
qt/res/images/arrow_down_dark.png \
qt/res/images/arrow_down_light.png \
qt/res/images/arrow_left_dark.png \
qt/res/images/arrow_left_light.png \
qt/res/images/arrow_right_dark.png \
qt/res/images/arrow_right_light.png \
qt/res/images/arrow_up_dark.png \
qt/res/images/arrow_up_light.png \
qt/res/images/arrow_light_down_normal.png \
qt/res/images/arrow_light_down_hover.png \
qt/res/images/arrow_light_left_normal.png \
Expand All @@ -325,29 +321,39 @@ RES_IMAGES = \
qt/res/images/arrow_light_right_hover.png \
qt/res/images/arrow_light_up_normal.png \
qt/res/images/arrow_light_up_hover.png \
qt/res/images/checkbox_normal.png \
qt/res/images/checkbox_normal_hover.png \
qt/res/images/checkbox_normal_pressed.png \
qt/res/images/checkbox_normal_disabled.png \
qt/res/images/checkbox_checked.png \
qt/res/images/checkbox_checked_hover.png \
qt/res/images/checkbox_checked_pressed.png \
qt/res/images/checkbox_checked_disabled.png \
qt/res/images/checkbox_partly_checked.png \
qt/res/images/checkbox_partly_checked_hover.png \
qt/res/images/checkbox_partly_checked_pressed.png \
qt/res/images/checkbox_partly_checked_disabled.png \
qt/res/images/checkbox_normal_dark.png \
qt/res/images/checkbox_normal_hover_dark.png \
qt/res/images/checkbox_normal_disabled_dark.png \
qt/res/images/checkbox_checked_dark.png \
qt/res/images/checkbox_checked_hover_dark.png \
qt/res/images/checkbox_checked_disabled_dark.png \
qt/res/images/checkbox_partly_checked_dark.png \
qt/res/images/checkbox_partly_checked_hover_dark.png \
qt/res/images/checkbox_partly_checked_disabled_dark.png \
qt/res/images/checkbox_normal_light.png \
qt/res/images/checkbox_normal_hover_light.png \
qt/res/images/checkbox_normal_disabled_light.png \
qt/res/images/checkbox_checked_light.png \
qt/res/images/checkbox_checked_hover_light.png \
qt/res/images/checkbox_checked_disabled_light.png \
qt/res/images/checkbox_partly_checked_light.png \
qt/res/images/checkbox_partly_checked_hover_light.png \
qt/res/images/checkbox_partly_checked_disabled_light.png \
qt/res/images/dash_logo_horizontal.png \
qt/res/images/dash_logo_toolbar.png \
qt/res/images/dash_logo_toolbar_blue.png \
qt/res/images/radio_normal.png \
qt/res/images/radio_normal_hover.png \
qt/res/images/radio_normal_pressed.png \
qt/res/images/radio_checked.png \
qt/res/images/radio_checked_hover.png \
qt/res/images/radio_checked_pressed.png \
qt/res/images/radio_normal_disabled.png \
qt/res/images/radio_checked_disabled.png \
qt/res/images/radio_normal_dark.png \
qt/res/images/radio_normal_hover_dark.png \
qt/res/images/radio_checked_dark.png \
qt/res/images/radio_checked_hover_dark.png \
qt/res/images/radio_normal_disabled_dark.png \
qt/res/images/radio_checked_disabled_dark.png \
qt/res/images/radio_normal_light.png \
qt/res/images/radio_normal_hover_light.png \
qt/res/images/radio_checked_light.png \
qt/res/images/radio_checked_hover_light.png \
qt/res/images/radio_normal_disabled_light.png \
qt/res/images/radio_checked_disabled_light.png \
qt/res/images/splash.png

RES_CSS = \
Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.test.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ BITCOIN_TESTS =\
test/policyestimator_tests.cpp \
test/pow_tests.cpp \
test/prevector_tests.cpp \
test/privatesend_tests.cpp \
test/raii_event_tests.cpp \
test/random_tests.cpp \
test/ratecheck_tests.cpp \
Expand Down Expand Up @@ -104,6 +103,7 @@ BITCOIN_TESTS =\

if ENABLE_WALLET
BITCOIN_TESTS += \
test/privatesend_tests.cpp \
wallet/test/wallet_test_fixture.cpp \
wallet/test/wallet_test_fixture.h \
wallet/test/accounting_tests.cpp \
Expand Down
93 changes: 36 additions & 57 deletions src/masternode/masternode-sync.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,25 @@
class CMasternodeSync;
CMasternodeSync masternodeSync;

void CMasternodeSync::Reset()
void CMasternodeSync::Reset(bool fForce, bool fNotifyReset)
{
nCurrentAsset = MASTERNODE_SYNC_INITIAL;
nTriedPeerCount = 0;
nTimeAssetSyncStarted = GetTime();
nTimeLastBumped = GetTime();
nTimeLastFailure = 0;
// Avoid resetting the sync process if we just "recently" received a new block
if (fForce || (GetTime() - nTimeLastUpdateBlockTip > MASTERNODE_SYNC_RESET_SECONDS)) {
nCurrentAsset = MASTERNODE_SYNC_BLOCKCHAIN;
nTriedPeerCount = 0;
nTimeAssetSyncStarted = GetTime();
nTimeLastBumped = GetTime();
nTimeLastUpdateBlockTip = 0;
fReachedBestHeader = false;
if (fNotifyReset) {
uiInterface.NotifyAdditionalDataSyncProgressChanged(-1);
}
}
}

void CMasternodeSync::BumpAssetLastTime(const std::string& strFuncName)
{
if(IsSynced() || IsFailed()) return;
if (IsSynced()) return;
nTimeLastBumped = GetTime();
LogPrint(BCLog::MNSYNC, "CMasternodeSync::BumpAssetLastTime -- %s\n", strFuncName);
}
Expand All @@ -36,10 +43,8 @@ std::string CMasternodeSync::GetAssetName()
{
switch(nCurrentAsset)
{
case(MASTERNODE_SYNC_INITIAL): return "MASTERNODE_SYNC_INITIAL";
case(MASTERNODE_SYNC_WAITING): return "MASTERNODE_SYNC_WAITING";
case(MASTERNODE_SYNC_BLOCKCHAIN): return "MASTERNODE_SYNC_BLOCKCHAIN";
case(MASTERNODE_SYNC_GOVERNANCE): return "MASTERNODE_SYNC_GOVERNANCE";
case(MASTERNODE_SYNC_FAILED): return "MASTERNODE_SYNC_FAILED";
case MASTERNODE_SYNC_FINISHED: return "MASTERNODE_SYNC_FINISHED";
default: return "UNKNOWN";
}
Expand All @@ -49,14 +54,7 @@ void CMasternodeSync::SwitchToNextAsset(CConnman& connman)
{
switch(nCurrentAsset)
{
case(MASTERNODE_SYNC_FAILED):
throw std::runtime_error("Can't switch to next asset from failed, should use Reset() first!");
break;
case(MASTERNODE_SYNC_INITIAL):
nCurrentAsset = MASTERNODE_SYNC_WAITING;
LogPrintf("CMasternodeSync::SwitchToNextAsset -- Starting %s\n", GetAssetName());
break;
case(MASTERNODE_SYNC_WAITING):
case(MASTERNODE_SYNC_BLOCKCHAIN):
LogPrintf("CMasternodeSync::SwitchToNextAsset -- Completed %s in %llds\n", GetAssetName(), GetTime() - nTimeAssetSyncStarted);
nCurrentAsset = MASTERNODE_SYNC_GOVERNANCE;
LogPrintf("CMasternodeSync::SwitchToNextAsset -- Starting %s\n", GetAssetName());
Expand All @@ -81,10 +79,8 @@ void CMasternodeSync::SwitchToNextAsset(CConnman& connman)
std::string CMasternodeSync::GetSyncStatus()
{
switch (masternodeSync.nCurrentAsset) {
case MASTERNODE_SYNC_INITIAL: return _("Synchronizing blockchain...");
case MASTERNODE_SYNC_WAITING: return _("Synchronization pending...");
case MASTERNODE_SYNC_BLOCKCHAIN: return _("Synchronizing blockchain...");
case MASTERNODE_SYNC_GOVERNANCE: return _("Synchronizing governance objects...");
case MASTERNODE_SYNC_FAILED: return _("Synchronization failed");
case MASTERNODE_SYNC_FINISHED: return _("Synchronization finished");
default: return "";
}
Expand All @@ -94,8 +90,8 @@ void CMasternodeSync::ProcessMessage(CNode* pfrom, const std::string& strCommand
{
if (strCommand == NetMsgType::SYNCSTATUSCOUNT) { //Sync status count

//do not care about stats if sync process finished or failed
if(IsSynced() || IsFailed()) return;
//do not care about stats if sync process finished
if (IsSynced()) return;

int nItemID;
int nCount;
Expand All @@ -117,8 +113,7 @@ void CMasternodeSync::ProcessTick(CConnman& connman)
static int64_t nTimeLastProcess = GetTime();
if(GetTime() - nTimeLastProcess > 60*60 && !fMasternodeMode) {
LogPrintf("CMasternodeSync::ProcessTick -- WARNING: no actions for too long, restarting sync...\n");
Reset();
SwitchToNextAsset(connman);
Reset(true);
nTimeLastProcess = GetTime();
return;
}
Expand All @@ -130,16 +125,6 @@ void CMasternodeSync::ProcessTick(CConnman& connman)

nTimeLastProcess = GetTime();

// reset sync status in case of any other sync failure
if(IsFailed()) {
if(nTimeLastFailure + (1*60) < GetTime()) { // 1 minute cooldown after failed sync
LogPrintf("CMasternodeSync::ProcessTick -- WARNING: failed to sync, trying again...\n");
Reset();
SwitchToNextAsset(connman);
}
return;
}

// gradually request the rest of the votes after sync finished
if(IsSynced()) {
std::vector<CNode*> vNodesCopy = connman.CopyNodeVector(CConnman::FullyConnectedOnly);
Expand Down Expand Up @@ -168,7 +153,7 @@ void CMasternodeSync::ProcessTick(CConnman& connman)
// QUICK MODE (REGTEST ONLY!)
if(Params().NetworkIDString() == CBaseChainParams::REGTEST)
{
if (nCurrentAsset == MASTERNODE_SYNC_WAITING) {
if (nCurrentAsset == MASTERNODE_SYNC_BLOCKCHAIN) {
connman.PushMessage(pnode, msgMaker.Make(NetMsgType::GETSPORKS)); //get current network sporks
SwitchToNextAsset(connman);
} else if (nCurrentAsset == MASTERNODE_SYNC_GOVERNANCE) {
Expand Down Expand Up @@ -205,25 +190,26 @@ void CMasternodeSync::ProcessTick(CConnman& connman)
LogPrintf("CMasternodeSync::ProcessTick -- nTick %d nCurrentAsset %d -- requesting sporks from peer=%d\n", nTick, nCurrentAsset, pnode->GetId());
}

// INITIAL TIMEOUT

if(nCurrentAsset == MASTERNODE_SYNC_WAITING) {
if (nCurrentAsset == MASTERNODE_SYNC_BLOCKCHAIN) {
if(pnode->nVersion >= 70216 && !pnode->fInbound && gArgs.GetBoolArg("-syncmempool", DEFAULT_SYNC_MEMPOOL) && !netfulfilledman.HasFulfilledRequest(pnode->addr, "mempool-sync")) {
netfulfilledman.AddFulfilledRequest(pnode->addr, "mempool-sync");
connman.PushMessage(pnode, msgMaker.Make(NetMsgType::MEMPOOL));
LogPrintf("CMasternodeSync::ProcessTick -- nTick %d nCurrentAsset %d -- syncing mempool from peer=%d\n", nTick, nCurrentAsset, pnode->GetId());
}

if(GetTime() - nTimeLastBumped > MASTERNODE_SYNC_TIMEOUT_SECONDS) {
int64_t nTimeSyncTimeout = vNodesCopy.size() > 3 ? MASTERNODE_SYNC_TICK_SECONDS : MASTERNODE_SYNC_TIMEOUT_SECONDS;
if (fReachedBestHeader && (GetTime() - nTimeLastBumped > nTimeSyncTimeout)) {
// At this point we know that:
// a) there are peers (because we are looping on at least one of them);
// b) we waited for at least MASTERNODE_SYNC_TIMEOUT_SECONDS since we reached
// the headers tip the last time (i.e. since we switched from
// MASTERNODE_SYNC_INITIAL to MASTERNODE_SYNC_WAITING and bumped time);
// b) we waited for at least MASTERNODE_SYNC_TICK_SECONDS/MASTERNODE_SYNC_TIMEOUT_SECONDS
// (depending on the number of connected peers) since we reached the headers tip the last
// time (i.e. since fReachedBestHeader has been set to true);
// c) there were no blocks (UpdatedBlockTip, NotifyHeaderTip) or headers (AcceptedBlockHeader)
// for at least MASTERNODE_SYNC_TIMEOUT_SECONDS.
// for at least MASTERNODE_SYNC_TICK_SECONDS/MASTERNODE_SYNC_TIMEOUT_SECONDS (depending on
// the number of connected peers).
// We must be at the tip already, let's move to the next asset.
SwitchToNextAsset(connman);
uiInterface.NotifyAdditionalDataSyncProgressChanged(nSyncProgress);
}
}

Expand Down Expand Up @@ -327,7 +313,7 @@ void CMasternodeSync::NotifyHeaderTip(const CBlockIndex *pindexNew, bool fInitia
{
LogPrint(BCLog::MNSYNC, "CMasternodeSync::NotifyHeaderTip -- pindexNew->nHeight: %d fInitialDownload=%d\n", pindexNew->nHeight, fInitialDownload);

if (IsFailed() || IsSynced() || !pindexBestHeader)
if (IsSynced() || !pindexBestHeader)
return;

if (!IsBlockchainSynced()) {
Expand All @@ -340,7 +326,9 @@ void CMasternodeSync::UpdatedBlockTip(const CBlockIndex *pindexNew, bool fInitia
{
LogPrint(BCLog::MNSYNC, "CMasternodeSync::UpdatedBlockTip -- pindexNew->nHeight: %d fInitialDownload=%d\n", pindexNew->nHeight, fInitialDownload);

if (IsFailed() || IsSynced() || !pindexBestHeader)
nTimeLastUpdateBlockTip = GetAdjustedTime();

if (IsSynced() || !pindexBestHeader)
return;

if (!IsBlockchainSynced()) {
Expand All @@ -351,36 +339,27 @@ void CMasternodeSync::UpdatedBlockTip(const CBlockIndex *pindexNew, bool fInitia
if (fInitialDownload) {
// switched too early
if (IsBlockchainSynced()) {
Reset();
Reset(true);
}

// no need to check any further while still in IBD mode
return;
}

// Note: since we sync headers first, it should be ok to use this
static bool fReachedBestHeader = false;
bool fReachedBestHeaderNew = pindexNew->GetBlockHash() == pindexBestHeader->GetBlockHash();

if (fReachedBestHeader && !fReachedBestHeaderNew) {
// Switching from true to false means that we previousely stuck syncing headers for some reason,
// probably initial timeout was not enough,
// because there is no way we can update tip not having best header
Reset();
fReachedBestHeader = false;
return;
Reset(true);
}

fReachedBestHeader = fReachedBestHeaderNew;

LogPrint(BCLog::MNSYNC, "CMasternodeSync::UpdatedBlockTip -- pindexNew->nHeight: %d pindexBestHeader->nHeight: %d fInitialDownload=%d fReachedBestHeader=%d\n",
pindexNew->nHeight, pindexBestHeader->nHeight, fInitialDownload, fReachedBestHeader);

if (!IsBlockchainSynced() && fReachedBestHeader) {
// Reached best header while being in initial mode.
// We must be at the tip already, let's move to the next asset.
SwitchToNextAsset(connman);
}
}

void CMasternodeSync::DoMaintenance(CConnman &connman)
Expand Down
19 changes: 10 additions & 9 deletions src/masternode/masternode-sync.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,15 @@

class CMasternodeSync;

static const int MASTERNODE_SYNC_FAILED = -1;
static const int MASTERNODE_SYNC_INITIAL = 0; // sync just started, was reset recently or still in IDB
static const int MASTERNODE_SYNC_WAITING = 1; // waiting after initial to see if we can get more headers/blocks
static const int MASTERNODE_SYNC_BLOCKCHAIN = 1;
static const int MASTERNODE_SYNC_GOVERNANCE = 4;
static const int MASTERNODE_SYNC_GOVOBJ = 10;
static const int MASTERNODE_SYNC_GOVOBJ_VOTE = 11;
static const int MASTERNODE_SYNC_FINISHED = 999;

static const int MASTERNODE_SYNC_TICK_SECONDS = 6;
static const int MASTERNODE_SYNC_TIMEOUT_SECONDS = 30; // our blocks are 2.5 minutes so 30 seconds should be fine
static const int MASTERNODE_SYNC_RESET_SECONDS = 600; // Reset fReachedBestHeader in CMasternodeSync::Reset if UpdateBlockTip hasn't been called for this seconds

extern CMasternodeSync masternodeSync;

Expand All @@ -38,17 +37,19 @@ class CMasternodeSync
int64_t nTimeAssetSyncStarted;
// ... last bumped
int64_t nTimeLastBumped;
// ... or failed
int64_t nTimeLastFailure;

/// Set to true if best header is reached in CMasternodeSync::UpdatedBlockTip
bool fReachedBestHeader{false};
/// Last time UpdateBlockTip has been called
int64_t nTimeLastUpdateBlockTip{0};

public:
CMasternodeSync() { Reset(); }
CMasternodeSync() { Reset(true, false); }


void SendGovernanceSyncRequest(CNode* pnode, CConnman& connman);

bool IsFailed() { return nCurrentAsset == MASTERNODE_SYNC_FAILED; }
bool IsBlockchainSynced() { return nCurrentAsset > MASTERNODE_SYNC_WAITING; }
bool IsBlockchainSynced() { return nCurrentAsset > MASTERNODE_SYNC_BLOCKCHAIN; }
bool IsSynced() { return nCurrentAsset == MASTERNODE_SYNC_FINISHED; }

int GetAssetID() { return nCurrentAsset; }
Expand All @@ -58,7 +59,7 @@ class CMasternodeSync
std::string GetAssetName();
std::string GetSyncStatus();

void Reset();
void Reset(bool fForce = false, bool fNotifyReset = true);
void SwitchToNextAsset(CConnman& connman);

void ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv);
Expand Down
Loading