Skip to content

[BUG] Spork signer doesn't persist new spork value to DB #2553

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
random-zebra merged 1 commit into from
Sep 15, 2021
Merged

[BUG] Spork signer doesn't persist new spork value to DB #2553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 12 additions & 8 deletions src/spork.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,11 +167,9 @@ int CSporkManager::ProcessSporkMsg(CSporkMessage& spork)
LogPrintf("%s : got %s spork %d (%s) with value %d (signed at %d)\n", __func__,
strStatus, spork.nSporkID, sporkName, spork.nValue, spork.nTimeSigned);

AddOrUpdateSporkMessage(spork);
AddOrUpdateSporkMessage(spork, true);
spork.Relay();

// PIVX: add to spork database.
pSporkDB->WriteSpork(spork.nSporkID, spork);
// All good.
return 0;
}
Expand Down Expand Up @@ -201,18 +199,24 @@ bool CSporkManager::UpdateSpork(SporkId nSporkID, int64_t nValue)

if (spork.Sign(strMasterPrivKey)) {
spork.Relay();
AddOrUpdateSporkMessage(spork);
AddOrUpdateSporkMessage(spork, true);
return true;
}

return false;
}

void CSporkManager::AddOrUpdateSporkMessage(const CSporkMessage& spork)
void CSporkManager::AddOrUpdateSporkMessage(const CSporkMessage& spork, bool flush)
{
LOCK(cs);
mapSporks[spork.GetHash()] = spork;
mapSporksActive[spork.nSporkID] = spork;
{
LOCK(cs);
mapSporks[spork.GetHash()] = spork;
mapSporksActive[spork.nSporkID] = spork;
}
if (flush) {
// add to spork database.
pSporkDB->WriteSpork(spork.nSporkID, spork);
}
}

// grab the spork value, and see if it's off
Expand Down
5 changes: 3 additions & 2 deletions src/spork.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,9 @@ class CSporkManager
int64_t GetSporkValue(SporkId nSporkID);
// Create/Sign/Relay the spork message, and update the maps
bool UpdateSpork(SporkId nSporkID, int64_t nValue);
// Add spork message to mapSporks and mapSporksActive
void AddOrUpdateSporkMessage(const CSporkMessage& spork);
// Add spork message to mapSporks and mapSporksActive.
// if flush=true, save to DB as well
void AddOrUpdateSporkMessage(const CSporkMessage& spork, bool flush = false);

bool IsSporkActive(SporkId nSporkID);
std::string GetSporkNameByID(SporkId id);
Expand Down