Skip to content

Simplification of masternode payment code #47

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
galpHub merged 4 commits into from
Nov 6, 2020
Merged

Simplification of masternode payment code #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
17eb276
Small cleanups with masternode payee handling.
domob1812 Oct 7, 2020
c96db40
Deduplicate getMessageToSign for masternodes.
domob1812 Oct 7, 2020
ef5d8b5
Mark functions in masternode as const.
domob1812 Oct 7, 2020
d529ab1
Avoid looking up masternode by payee.
domob1812 Oct 7, 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
30 changes: 15 additions & 15 deletions divi/src/masternode-payments.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,15 +489,14 @@ bool CMasternodePayments::IsScheduled(const CMasternode& mn, int nNotBlockHeight
if (tip == nullptr)
return false;

CScript mnpayee;
mnpayee = GetScriptForDestination(mn.pubKeyCollateralAddress.GetID());
const CScript mnpayee = GetScriptForDestination(mn.pubKeyCollateralAddress.GetID());

CScript payee;
for (int64_t h = 0; h <= 8; ++h) {
if (tip->nHeight + h == nNotBlockHeight) continue;
uint256 seedHash;
if (!GetBlockHashForScoring(seedHash, tip, h)) continue;
auto* payees = GetPayeesForScoreHash(seedHash);
CScript payee;
if (payees != nullptr && payees->GetPayee(payee) && payee == mnpayee)
return true;
}
Expand Down Expand Up @@ -696,11 +695,15 @@ bool CMasternodePaymentWinner::IsValid(CNode* pnode, std::string& strError) cons

if(!masternodeSync.IsSynced()){ return true;}

std::vector<CMasternode*> mnQueue = mnodeman.GetMasternodePaymentQueue(seedHash, nBlockHeight, true);
auto it = std::find(mnQueue.begin(),mnQueue.end(), mnodeman.Find(payee));
if(it == mnQueue.end())
return false;
return (std::distance(mnQueue.begin(), it) < 2 * MNPAYMENTS_SIGNATURES_TOTAL);
/* Make sure that the payee is in our own payment queue near the top. */
const std::vector<CMasternode*> mnQueue = mnodeman.GetMasternodePaymentQueue(seedHash, nBlockHeight, true);
for (int i = 0; i < std::min<int>(2 * MNPAYMENTS_SIGNATURES_TOTAL, mnQueue.size()); ++i) {
const auto& mn = *mnQueue[i];
const CScript mnPayee = GetScriptForDestination(mn.pubKeyCollateralAddress.GetID());
if (mnPayee == payee)
return true;
}
return false;
}

bool CMasternodePayments::ProcessBlock(const CBlockIndex* pindex, const int offset)
Expand Down Expand Up @@ -740,14 +743,11 @@ bool CMasternodePayments::ProcessBlock(const CBlockIndex* pindex, const int offs
if (pmn != NULL) {
LogPrint("masternode","CMasternodePayments::ProcessBlock() Found by FindOldestNotInVec \n");

CScript payee = GetScriptForDestination(pmn->pubKeyCollateralAddress.GetID());
newWinner.AddPayee(payee);

CTxDestination address1;
ExtractDestination(payee, address1);
CBitcoinAddress address2(address1);
const CTxDestination dest(pmn->pubKeyCollateralAddress.GetID());
newWinner.AddPayee(GetScriptForDestination(dest));

LogPrint("masternode","CMasternodePayments::ProcessBlock() Winner payee %s nHeight %d. \n", address2.ToString().c_str(), newWinner.GetHeight());
const CBitcoinAddress address(dest);
LogPrint("masternode","CMasternodePayments::ProcessBlock() Winner payee %s nHeight %d. \n", address.ToString().c_str(), newWinner.GetHeight());
} else {
LogPrint("masternode","CMasternodePayments::ProcessBlock() Failed to find masternode to pay\n");
}
Expand Down
120 changes: 25 additions & 95 deletions divi/src/masternode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,12 +211,12 @@ CMasternode& CMasternode::operator=(CMasternode from)
return *this;
}

bool CMasternode::IsBroadcastedWithin(int seconds)
bool CMasternode::IsBroadcastedWithin(int seconds) const
{
return (GetAdjustedTime() - sigTime) < seconds;
}

bool CMasternode::IsPingedWithin(int seconds, int64_t now)
bool CMasternode::IsPingedWithin(int seconds, int64_t now) const
{
if (now == -1)
now = GetAdjustedTime();
Expand All @@ -238,7 +238,7 @@ bool CMasternode::IsEnabled() const
return activeState == MASTERNODE_ENABLED;
}

int CMasternode::GetMasternodeInputAge()
int CMasternode::GetMasternodeInputAge() const
{
if (chainActive.Tip() == NULL) return 0;

Expand All @@ -250,7 +250,7 @@ int CMasternode::GetMasternodeInputAge()
return cacheInputAge + (chainActive.Tip()->nHeight - cacheInputAgeBlock);
}

std::string CMasternode::Status()
std::string CMasternode::Status() const
{
std::string strStatus = "ACTIVE";

Expand Down Expand Up @@ -383,11 +383,8 @@ std::string CMasternode::TierToString(MasternodeTier tier)
return "INVALID";
}

int64_t CMasternode::SecondsSincePayment()
int64_t CMasternode::SecondsSincePayment() const
{
CScript pubkeyScript;
pubkeyScript = GetScriptForDestination(pubKeyCollateralAddress.GetID());

int64_t sec = (GetAdjustedTime() - GetLastPaid());
int64_t month = 60 * 60 * 24 * 30;
if (sec < month) return sec; //if it's less than 30 days, give seconds
Expand All @@ -401,7 +398,7 @@ int64_t CMasternode::SecondsSincePayment()
return month + hash.GetCompact(false);
}

int64_t CMasternode::GetLastPaid()
int64_t CMasternode::GetLastPaid() const
{
CBlockIndex* pindexPrev = chainActive.Tip();
if (pindexPrev == NULL) return false;
Expand Down Expand Up @@ -454,7 +451,7 @@ int64_t CMasternode::GetLastPaid()
return 0;
}

std::string CMasternode::GetStatus()
std::string CMasternode::GetStatus() const
{
switch (nActiveState) {
case CMasternode::MASTERNODE_PRE_ENABLED:
Expand All @@ -476,72 +473,27 @@ std::string CMasternode::GetStatus()
}
}

bool CMasternode::IsValidNetAddr()
bool CMasternode::IsValidNetAddr() const
{
// TODO: regtest is fine with any addresses for now,
// should probably be a bit smarter if one day we start to implement tests for this
return Params().NetworkID() == CBaseChainParams::REGTEST ||
(IsReachable(addr) && addr.IsRoutable());
}

CMasternodeBroadcast::CMasternodeBroadcast()
{
vin = CTxIn();
addr = CService();
pubKeyCollateralAddress = CPubKey();
sig = std::vector<unsigned char>();
activeState = MASTERNODE_ENABLED;
sigTime = GetAdjustedTime();
lastPing = CMasternodePing();
cacheInputAge = 0;
cacheInputAgeBlock = 0;
unitTest = false;
allowFreeTx = true;
protocolVersion = PROTOCOL_VERSION;
nScanningErrorCount = 0;
nLastScanningErrorBlockHeight = 0;
nTier = MasternodeTier::INVALID;
}

CMasternodeBroadcast::CMasternodeBroadcast(CService newAddr, CTxIn newVin, CPubKey pubKeyCollateralAddressNew, CPubKey pubKeyMasternodeNew, const MasternodeTier nMasternodeTier, int protocolVersionIn)
{
vin = newVin;
addr = newAddr;
pubKeyCollateralAddress = pubKeyCollateralAddressNew;
pubKeyMasternode = pubKeyMasternodeNew;
sig = std::vector<unsigned char>();
activeState = MASTERNODE_ENABLED;
sigTime = GetAdjustedTime();
lastPing = CMasternodePing();
cacheInputAge = 0;
cacheInputAgeBlock = 0;
unitTest = false;
allowFreeTx = true;
protocolVersion = protocolVersionIn;
nScanningErrorCount = 0;
nLastScanningErrorBlockHeight = 0;
nTier = nMasternodeTier;
}

CMasternodeBroadcast::CMasternodeBroadcast(const CMasternode& mn)
{
vin = mn.vin;
addr = mn.addr;
pubKeyCollateralAddress = mn.pubKeyCollateralAddress;
pubKeyMasternode = mn.pubKeyMasternode;
sig = mn.sig;
activeState = mn.activeState;
sigTime = mn.sigTime;
lastPing = mn.lastPing;
cacheInputAge = mn.cacheInputAge;
cacheInputAgeBlock = mn.cacheInputAgeBlock;
unitTest = mn.unitTest;
allowFreeTx = mn.allowFreeTx;
protocolVersion = mn.protocolVersion;
nScanningErrorCount = mn.nScanningErrorCount;
nLastScanningErrorBlockHeight = mn.nLastScanningErrorBlockHeight;
nTier = mn.nTier;
}
: CMasternode(mn)
{}


bool CMasternodeBroadcastFactory::checkBlockchainSync(std::string& strErrorRet, bool fOffline)
Expand Down Expand Up @@ -842,38 +794,18 @@ bool CMasternodeBroadcast::CheckAndUpdate(int& nDos)
return false;
}

std::string vchPubKey(pubKeyCollateralAddress.begin(), pubKeyCollateralAddress.end());
std::string vchPubKey2(pubKeyMasternode.begin(), pubKeyMasternode.end());
std::string strMessage = addr.ToString() + boost::lexical_cast<std::string>(sigTime) + vchPubKey + vchPubKey2 + boost::lexical_cast<std::string>(protocolVersion);

if (protocolVersion < masternodePayments.GetMinMasternodePaymentsProto()) {
LogPrint("masternode","mnb - ignoring outdated Masternode %s protocol version %d\n", vin.prevout.hash.ToString(), protocolVersion);
return false;
}

CScript pubkeyScript;
pubkeyScript = GetScriptForDestination(pubKeyCollateralAddress.GetID());

if (pubkeyScript.size() != 25) {
LogPrintf("%s : mnb - pubkey the wrong size\n", __func__);
nDos = 100;
return false;
}

CScript pubkeyScript2;
pubkeyScript2 = GetScriptForDestination(pubKeyMasternode.GetID());

if (pubkeyScript2.size() != 25) {
LogPrintf("%s : mnb - pubkey2 the wrong size\n", __func__);
nDos = 100;
return false;
}

if (!vin.scriptSig.empty()) {
LogPrint("masternode","mnb - Ignore Not Empty ScriptSig %s\n", vin.prevout.hash.ToString());
return false;
}

const std::string strMessage = getMessageToSign();

std::string errorMessage = "";
if (!CObfuScationSigner::VerifyMessage(pubKeyCollateralAddress, sig, strMessage, errorMessage)) {
LogPrintf("%s : - Got bad Masternode address signature\n", __func__);
Expand All @@ -887,16 +819,15 @@ bool CMasternodeBroadcast::CheckAndUpdate(int& nDos)
// no such masternode, nothing to update
if (pmn == NULL)
return true;
else {
// this broadcast older than we have, it's bad.
if (pmn->sigTime > sigTime) {
LogPrint("masternode","mnb - Bad sigTime %d for Masternode %s (existing broadcast is at %d)\n",
sigTime, vin.prevout.hash.ToString(), pmn->sigTime);
return false;
}
// masternode is not enabled yet/already, nothing to update
if (!pmn->IsEnabled()) return true;

// this broadcast older than we have, it's bad.
if (pmn->sigTime > sigTime) {
LogPrint("masternode","mnb - Bad sigTime %d for Masternode %s (existing broadcast is at %d)\n",
sigTime, vin.prevout.hash.ToString(), pmn->sigTime);
return false;
}
// masternode is not enabled yet/already, nothing to update
if (!pmn->IsEnabled()) return true;

// mn.pubkey = pubkey, IsVinAssociatedWithPubkey is validated once below,
// after that they just need to match
Expand Down Expand Up @@ -969,16 +900,15 @@ std::string CMasternodeBroadcast::getMessageToSign() const
std::string vchPubKey(pubKeyCollateralAddress.begin(), pubKeyCollateralAddress.end());
std::string vchPubKey2(pubKeyMasternode.begin(), pubKeyMasternode.end());

std::string strMessage = addr.ToString() + boost::lexical_cast<std::string>(sigTime) + vchPubKey + vchPubKey2 + boost::lexical_cast<std::string>(protocolVersion);
return strMessage;
return addr.ToString() + boost::lexical_cast<std::string>(sigTime) + vchPubKey + vchPubKey2 + boost::lexical_cast<std::string>(protocolVersion);
}

bool CMasternodeBroadcast::Sign(CKey& keyCollateralAddress, bool updateTimeBeforeSigning)
{
std::string errorMessage;

if(updateTimeBeforeSigning) sigTime = GetAdjustedTime();
std::string strMessage = getMessageToSign();
const std::string strMessage = getMessageToSign();

if (!CObfuScationSigner::SignMessage(strMessage, errorMessage, sig, keyCollateralAddress)) {
LogPrint("masternode","CMasternodeBroadcast::Sign() - Error: %s\n", errorMessage);
Expand Down Expand Up @@ -1033,7 +963,7 @@ bool CMasternodePing::Sign(CKey& keyMasternode, CPubKey& pubKeyMasternode, bool
std::string errorMessage;

if(updateTimeBeforeSigning) sigTime = GetAdjustedTime();
std::string strMessage = getMessageToSign();
const std::string strMessage = getMessageToSign();

if (!CObfuScationSigner::SignMessage(strMessage, errorMessage, vchSig, keyMasternode)) {
LogPrint("masternode","CMasternodePing::Sign() - Error: %s\n", errorMessage);
Expand Down Expand Up @@ -1074,7 +1004,7 @@ bool CMasternodePing::CheckAndUpdate(CMasternode& mn, int& nDos, bool fRequireEn
// update only if there is no known ping for this masternode or
// last ping was more then MASTERNODE_MIN_MNP_SECONDS-60 ago comparing to this one
if (!mn.IsPingedWithin(MASTERNODE_MIN_MNP_SECONDS - 60, sigTime)) {
std::string strMessage = vin.ToString() + blockHash.ToString() + boost::lexical_cast<std::string>(sigTime);
const std::string strMessage = getMessageToSign();

std::string errorMessage = "";
if (!CObfuScationSigner::VerifyMessage(mn.pubKeyMasternode, vchSig, strMessage, errorMessage)) {
Expand Down Expand Up @@ -1123,7 +1053,7 @@ bool CMasternodePing::CheckAndUpdate(CMasternode& mn, int& nDos, bool fRequireEn
return false;
}

void CMasternodePing::Relay()
void CMasternodePing::Relay() const
{
CInv inv(MSG_MASTERNODE_PING, GetHash());
RelayInv(inv);
Expand Down
25 changes: 13 additions & 12 deletions divi/src/masternode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class CMasternodePing
bool CheckAndUpdate(CMasternode& mn, int& nDos, bool fRequireEnabled = true) const;
std::string getMessageToSign() const;
bool Sign(CKey& keyMasternode, CPubKey& pubKeyMasternode, bool updateTimeBeforeSigning = true);
void Relay();
void Relay() const;

uint256 GetHash() const
{
Expand Down Expand Up @@ -129,6 +129,9 @@ class CMasternode
mutable CCriticalSection cs;
int64_t lastTimeChecked;

mutable int cacheInputAge;
mutable int cacheInputAgeBlock;

public:
enum state {
MASTERNODE_PRE_ENABLED,
Expand All @@ -149,8 +152,6 @@ class CMasternode
std::vector<unsigned char> sig;
int activeState;
int64_t sigTime; //mnb message time
int cacheInputAge;
int cacheInputAgeBlock;
bool unitTest;
bool allowFreeTx;
int protocolVersion;
Expand Down Expand Up @@ -214,33 +215,33 @@ class CMasternode
nTier = static_cast<MasternodeTier> (tier);
}

int64_t SecondsSincePayment();
int64_t SecondsSincePayment() const;

bool UpdateFromNewBroadcast(CMasternodeBroadcast &mnb);

void Check(bool forceCheck = false);

bool IsBroadcastedWithin(int seconds);
bool IsBroadcastedWithin(int seconds) const;

bool IsPingedWithin(int seconds, int64_t now = -1);
bool IsPingedWithin(int seconds, int64_t now = -1) const;

void Disable();

bool IsEnabled() const;

int GetMasternodeInputAge();
int GetMasternodeInputAge() const;

static CAmount GetTierCollateralAmount(MasternodeTier tier);
static MasternodeTier GetTierByCollateralAmount(CAmount nCollateral);
static bool IsTierValid(MasternodeTier tier);
static std::string TierToString(MasternodeTier tier);

std::string GetStatus();
std::string GetStatus() const;

std::string Status();
std::string Status() const;

int64_t GetLastPaid();
bool IsValidNetAddr();
int64_t GetLastPaid() const;
bool IsValidNetAddr() const;
};


Expand All @@ -251,7 +252,7 @@ class CMasternode
class CMasternodeBroadcast : public CMasternode
{
public:
CMasternodeBroadcast();
CMasternodeBroadcast() = default;
CMasternodeBroadcast(
CService newAddr,
CTxIn newVin,
Expand Down
Loading