Skip to content

Commit

Permalink
scripted-diff: Rename keyIDOperator to pubKeyOperator
Browse files Browse the repository at this point in the history 
-BEGIN VERIFY SCRIPT-
sed -i 's/keyIDOperator/pubKeyOperator/g' src/*.h src/*.cpp src/*/*.h src/*/*.cpp;
sed -i 's/operatorAddress/operatorPubKey/g' src/*.h src/*.cpp src/*/*.h src/*/*.cpp;
-END VERIFY SCRIPT-
  • Loading branch information
@random-zebra
random-zebra committed Oct 4, 2021
1 parent b0a7fa5 commit 619c0f8
Show file tree
Hide file tree
Showing 14 changed files with 92 additions and 92 deletions.
10 changes: 5 additions & 5 deletions src/activemasternode.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ OperationResult CActiveDeterministicMasternodeManager::SetOperatorKey(const std:
if (strMNOperatorPrivKey.empty()) {
return errorOut("ERROR: Masternode operator priv key cannot be empty.");
}
if (!CMessageSigner::GetKeysFromSecret(strMNOperatorPrivKey, info.keyOperator, info.keyIDOperator)) {
if (!CMessageSigner::GetKeysFromSecret(strMNOperatorPrivKey, info.keyOperator, info.pubKeyOperator)) {
return errorOut(_("Invalid mnoperatorprivatekey. Please see the documentation."));
}
return OperationResult(true);
Expand All @@ -75,12 +75,12 @@ OperationResult CActiveDeterministicMasternodeManager::GetOperatorKey(CKey& key,
if (!dmn) {
return errorOut(strprintf("Active masternode %s not registered or PoSe banned", info.proTxHash.ToString()));
}
if (info.keyIDOperator != dmn->pdmnState->keyIDOperator) {
if (info.pubKeyOperator != dmn->pdmnState->pubKeyOperator) {
return errorOut("Active masternode operator key changed or revoked");
}
// return keys
key = info.keyOperator;
keyID = info.keyIDOperator;
keyID = info.pubKeyOperator;
return OperationResult(true);
}

Expand Down Expand Up @@ -119,7 +119,7 @@ void CActiveDeterministicMasternodeManager::Init()

CDeterministicMNList mnList = deterministicMNManager->GetListAtChainTip();

CDeterministicMNCPtr dmn = mnList.GetMNByOperatorKey(info.keyIDOperator);
CDeterministicMNCPtr dmn = mnList.GetMNByOperatorKey(info.pubKeyOperator);
if (!dmn) {
// MN not appeared on the chain yet
return;
Expand Down Expand Up @@ -192,7 +192,7 @@ void CActiveDeterministicMasternodeManager::UpdatedBlockTip(const CBlockIndex* p
return;
}

if (newDmn->pdmnState->keyIDOperator != oldDmn->pdmnState->keyIDOperator) {
if (newDmn->pdmnState->pubKeyOperator != oldDmn->pdmnState->pubKeyOperator) {
// MN operator key changed or revoked
Reset(MASTERNODE_OPERATOR_KEY_CHANGED);
return;
Expand Down
2 changes: 1 addition & 1 deletion src/activemasternode.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ extern CActiveDeterministicMasternodeManager* activeMasternodeManager;
struct CActiveMasternodeInfo
{
// Keys for the active Masternode
CKeyID keyIDOperator;
CKeyID pubKeyOperator;
CKey keyOperator;
// Initialized while registering Masternode
uint256 proTxHash{UINT256_ZERO};
Expand Down
2 changes: 1 addition & 1 deletion src/budget/budgetmanager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1110,7 +1110,7 @@ bool CBudgetManager::ProcessFinalizedBudgetVote(CFinalizedBudgetVote& vote, CNod
if (dmn) {
const std::string& mn_protx_id = dmn->proTxHash.ToString();

if (!vote.CheckSignature(dmn->pdmnState->keyIDOperator)) {
if (!vote.CheckSignature(dmn->pdmnState->pubKeyOperator)) {
err = strprintf("invalid fbvote sig from dmn: %s", mn_protx_id);
return state.DoS(100, false, REJECT_INVALID, "bad-fbvote-sig", false, err);
}
Expand Down
28 changes: 14 additions & 14 deletions src/evo/deterministicmns.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ std::string CDeterministicMNState::ToString() const
operatorPayoutAddress = EncodeDestination(dest);
}

return strprintf("CDeterministicMNState(nRegisteredHeight=%d, nLastPaidHeight=%d, nPoSePenalty=%d, nPoSeRevivedHeight=%d, nPoSeBanHeight=%d, nRevocationReason=%d, ownerAddress=%s, operatorAddress=%s, votingAddress=%s, addr=%s, payoutAddress=%s, operatorPayoutAddress=%s)",
return strprintf("CDeterministicMNState(nRegisteredHeight=%d, nLastPaidHeight=%d, nPoSePenalty=%d, nPoSeRevivedHeight=%d, nPoSeBanHeight=%d, nRevocationReason=%d, ownerAddress=%s, operatorPubKey=%s, votingAddress=%s, addr=%s, payoutAddress=%s, operatorPayoutAddress=%s)",
nRegisteredHeight, nLastPaidHeight, nPoSePenalty, nPoSeRevivedHeight, nPoSeBanHeight, nRevocationReason,
EncodeDestination(keyIDOwner), EncodeDestination(keyIDOperator), EncodeDestination(keyIDVoting), addr.ToStringIPPort(), payoutAddress, operatorPayoutAddress);
EncodeDestination(keyIDOwner), EncodeDestination(pubKeyOperator), EncodeDestination(keyIDVoting), addr.ToStringIPPort(), payoutAddress, operatorPayoutAddress);
}

void CDeterministicMNState::ToJson(UniValue& obj) const
Expand All @@ -54,7 +54,7 @@ void CDeterministicMNState::ToJson(UniValue& obj) const
obj.pushKV("PoSeBanHeight", nPoSeBanHeight);
obj.pushKV("revocationReason", nRevocationReason);
obj.pushKV("ownerAddress", EncodeDestination(keyIDOwner));
obj.pushKV("operatorAddress", keyIDOperator == CKeyID() ? "" : EncodeDestination(keyIDOperator));
obj.pushKV("operatorPubKey", pubKeyOperator == CKeyID() ? "" : EncodeDestination(pubKeyOperator));
obj.pushKV("votingAddress", EncodeDestination(keyIDVoting));

CTxDestination dest1;
Expand Down Expand Up @@ -125,7 +125,7 @@ CDeterministicMNCPtr CDeterministicMNList::GetValidMN(const uint256& proTxHash)
CDeterministicMNCPtr CDeterministicMNList::GetMNByOperatorKey(const CKeyID& keyID)
{
for (const auto& p : mnMap) {
if (p.second->pdmnState->keyIDOperator == keyID) {
if (p.second->pdmnState->pubKeyOperator == keyID) {
return p.second;
}
}
Expand Down Expand Up @@ -396,8 +396,8 @@ void CDeterministicMNList::AddMN(const CDeterministicMNCPtr& dmn, bool fBumpTota
if (HasUniqueProperty(dmn->pdmnState->addr)) {
throw(std::runtime_error(strprintf("%s: can't add a masternode with a duplicate address %s", __func__, dmn->pdmnState->addr.ToStringIPPort())));
}
if (HasUniqueProperty(dmn->pdmnState->keyIDOwner) || HasUniqueProperty(dmn->pdmnState->keyIDOperator)) {
throw(std::runtime_error(strprintf("%s: can't add a masternode with a duplicate key (%s or %s)", __func__, EncodeDestination(dmn->pdmnState->keyIDOwner), EncodeDestination(dmn->pdmnState->keyIDOperator))));
if (HasUniqueProperty(dmn->pdmnState->keyIDOwner) || HasUniqueProperty(dmn->pdmnState->pubKeyOperator)) {
throw(std::runtime_error(strprintf("%s: can't add a masternode with a duplicate key (%s or %s)", __func__, EncodeDestination(dmn->pdmnState->keyIDOwner), EncodeDestination(dmn->pdmnState->pubKeyOperator))));
}

mnMap = mnMap.set(dmn->proTxHash, dmn);
Expand All @@ -407,7 +407,7 @@ void CDeterministicMNList::AddMN(const CDeterministicMNCPtr& dmn, bool fBumpTota
AddUniqueProperty(dmn, dmn->pdmnState->addr);
}
AddUniqueProperty(dmn, dmn->pdmnState->keyIDOwner);
AddUniqueProperty(dmn, dmn->pdmnState->keyIDOperator);
AddUniqueProperty(dmn, dmn->pdmnState->pubKeyOperator);

if (fBumpTotalCount) {
// nTotalRegisteredCount acts more like a checkpoint, not as a limit,
Expand All @@ -430,7 +430,7 @@ void CDeterministicMNList::UpdateMN(const CDeterministicMNCPtr& oldDmn, const CD

UpdateUniqueProperty(dmn, oldState->addr, pdmnState->addr);
UpdateUniqueProperty(dmn, oldState->keyIDOwner, pdmnState->keyIDOwner);
UpdateUniqueProperty(dmn, oldState->keyIDOperator, pdmnState->keyIDOperator);
UpdateUniqueProperty(dmn, oldState->pubKeyOperator, pdmnState->pubKeyOperator);
}

void CDeterministicMNList::UpdateMN(const uint256& proTxHash, const CDeterministicMNStateCPtr& pdmnState)
Expand Down Expand Up @@ -462,7 +462,7 @@ void CDeterministicMNList::RemoveMN(const uint256& proTxHash)
DeleteUniqueProperty(dmn, dmn->pdmnState->addr);
}
DeleteUniqueProperty(dmn, dmn->pdmnState->keyIDOwner);
DeleteUniqueProperty(dmn, dmn->pdmnState->keyIDOperator);
DeleteUniqueProperty(dmn, dmn->pdmnState->pubKeyOperator);

mnMap = mnMap.erase(proTxHash);
mnInternalIdMap = mnInternalIdMap.erase(dmn->GetInternalId());
Expand Down Expand Up @@ -657,7 +657,7 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
if (newList.HasUniqueProperty(pl.keyIDOwner)) {
return _state.DoS(100, false, REJECT_DUPLICATE, "bad-protx-dup-owner-key");
}
if (newList.HasUniqueProperty(pl.keyIDOperator)) {
if (newList.HasUniqueProperty(pl.pubKeyOperator)) {
return _state.DoS(100, false, REJECT_DUPLICATE, "bad-protx-dup-operator-key");
}

Expand Down Expand Up @@ -702,7 +702,7 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C

if (newState->nPoSeBanHeight != -1) {
// only revive when all keys are set
if (!newState->keyIDOperator.IsNull() && !newState->keyIDVoting.IsNull() && !newState->keyIDOwner.IsNull()) {
if (!newState->pubKeyOperator.IsNull() && !newState->keyIDVoting.IsNull() && !newState->keyIDOwner.IsNull()) {
newState->nPoSePenalty = 0;
newState->nPoSeBanHeight = -1;
newState->nPoSeRevivedHeight = nHeight;
Expand Down Expand Up @@ -730,16 +730,16 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
if (!dmn) {
return _state.DoS(100, false, REJECT_INVALID, "bad-protx-hash");
}
if (newList.HasUniqueProperty(pl.keyIDOperator) && newList.GetUniquePropertyMN(pl.keyIDOperator)->proTxHash != pl.proTxHash) {
if (newList.HasUniqueProperty(pl.pubKeyOperator) && newList.GetUniquePropertyMN(pl.pubKeyOperator)->proTxHash != pl.proTxHash) {
return _state.DoS(100, false, REJECT_DUPLICATE, "bad-protx-dup-operator-key");
}
auto newState = std::make_shared<CDeterministicMNState>(*dmn->pdmnState);
if (newState->keyIDOperator != pl.keyIDOperator) {
if (newState->pubKeyOperator != pl.pubKeyOperator) {
// reset all operator related fields and put MN into PoSe-banned state in case the operator key changes
newState->ResetOperatorFields();
newState->BanIfNotBanned(nHeight);
}
newState->keyIDOperator = pl.keyIDOperator;
newState->pubKeyOperator = pl.pubKeyOperator;
newState->keyIDVoting = pl.keyIDVoting;
newState->scriptPayout = pl.scriptPayout;

Expand Down
12 changes: 6 additions & 6 deletions src/evo/deterministicmns.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class CDeterministicMNState
uint256 confirmedHashWithProRegTxHash;

CKeyID keyIDOwner;
CKeyID keyIDOperator;
CKeyID pubKeyOperator;
CKeyID keyIDVoting;
CService addr;
CScript scriptPayout;
Expand All @@ -50,7 +50,7 @@ class CDeterministicMNState
explicit CDeterministicMNState(const ProRegPL& pl)
{
keyIDOwner = pl.keyIDOwner;
keyIDOperator = pl.keyIDOperator;
pubKeyOperator = pl.pubKeyOperator;
keyIDVoting = pl.keyIDVoting;
addr = pl.addr;
scriptPayout = pl.scriptPayout;
Expand All @@ -70,7 +70,7 @@ class CDeterministicMNState
READWRITE(obj.confirmedHash);
READWRITE(obj.confirmedHashWithProRegTxHash);
READWRITE(obj.keyIDOwner);
READWRITE(obj.keyIDOperator);
READWRITE(obj.pubKeyOperator);
READWRITE(obj.keyIDVoting);
READWRITE(obj.addr);
READWRITE(obj.scriptPayout);
Expand All @@ -79,7 +79,7 @@ class CDeterministicMNState

void ResetOperatorFields()
{
keyIDOperator = CKeyID();
pubKeyOperator = CKeyID();
addr = CService();
scriptOperatorPayout = CScript();
nRevocationReason = ProUpRevPL::REASON_NOT_SPECIFIED;
Expand Down Expand Up @@ -119,7 +119,7 @@ class CDeterministicMNStateDiff
Field_confirmedHash = 0x0040,
Field_confirmedHashWithProRegTxHash = 0x0080,
Field_keyIDOwner = 0x0100,
Field_keyIDOperator = 0x0200,
Field_pubKeyOperator = 0x0200,
Field_keyIDVoting = 0x0400,
Field_addr = 0x0800,
Field_scriptPayout = 0x1000,
Expand All @@ -136,7 +136,7 @@ class CDeterministicMNStateDiff
DMN_STATE_DIFF_LINE(confirmedHash) \
DMN_STATE_DIFF_LINE(confirmedHashWithProRegTxHash) \
DMN_STATE_DIFF_LINE(keyIDOwner) \
DMN_STATE_DIFF_LINE(keyIDOperator) \
DMN_STATE_DIFF_LINE(pubKeyOperator) \
DMN_STATE_DIFF_LINE(keyIDVoting) \
DMN_STATE_DIFF_LINE(addr) \
DMN_STATE_DIFF_LINE(scriptPayout) \
Expand Down
34 changes: 17 additions & 17 deletions src/evo/providertx.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ static bool CheckCollateralOut(const CTxOut& out, const ProRegPL& pl, CValidatio
// this check applies to internal and external collateral, but internal collaterals are not necessarely a P2PKH
if (collateralDestRet == CTxDestination(pl.keyIDOwner) ||
collateralDestRet == CTxDestination(pl.keyIDVoting) ||
collateralDestRet == CTxDestination(pl.keyIDOperator)) {
collateralDestRet == CTxDestination(pl.pubKeyOperator)) {
return state.DoS(10, false, REJECT_INVALID, "bad-protx-collateral-reuse");
}
// check collateral amount
Expand Down Expand Up @@ -113,7 +113,7 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
return state.DoS(100, false, REJECT_INVALID, "bad-protx-mode");
}

if (pl.keyIDOwner.IsNull() || pl.keyIDOperator.IsNull() || pl.keyIDVoting.IsNull()) {
if (pl.keyIDOwner.IsNull() || pl.pubKeyOperator.IsNull() || pl.keyIDVoting.IsNull()) {
return state.DoS(10, false, REJECT_INVALID, "bad-protx-key-null");
}
// we may support other kinds of scripts later, but restrict it for now
Expand All @@ -132,7 +132,7 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
// don't allow reuse of payout key for other keys (don't allow people to put the payee key onto an online server)
if (payoutDest == CTxDestination(pl.keyIDOwner) ||
payoutDest == CTxDestination(pl.keyIDVoting) ||
payoutDest == CTxDestination(pl.keyIDOperator)) {
payoutDest == CTxDestination(pl.pubKeyOperator)) {
return state.DoS(10, false, REJECT_INVALID, "bad-protx-payee-reuse");
}

Expand Down Expand Up @@ -202,7 +202,7 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
if (mnList.HasUniqueProperty(pl.keyIDOwner)) {
return state.DoS(10, false, REJECT_DUPLICATE, "bad-protx-dup-owner-key");
}
if (mnList.HasUniqueProperty(pl.keyIDOperator)) {
if (mnList.HasUniqueProperty(pl.pubKeyOperator)) {
return state.DoS(10, false, REJECT_DUPLICATE, "bad-protx-dup-operator-key");
}
}
Expand Down Expand Up @@ -230,8 +230,8 @@ std::string ProRegPL::ToString() const
CTxDestination dest;
std::string payee = ExtractDestination(scriptPayout, dest) ?
EncodeDestination(dest) : "unknown";
return strprintf("ProRegPL(nVersion=%d, collateralOutpoint=%s, addr=%s, nOperatorReward=%f, ownerAddress=%s, operatorAddress=%s, votingAddress=%s, scriptPayout=%s)",
nVersion, collateralOutpoint.ToStringShort(), addr.ToString(), (double)nOperatorReward / 100, EncodeDestination(keyIDOwner), EncodeDestination(keyIDOperator), EncodeDestination(keyIDVoting), payee);
return strprintf("ProRegPL(nVersion=%d, collateralOutpoint=%s, addr=%s, nOperatorReward=%f, ownerAddress=%s, operatorPubKey=%s, votingAddress=%s, scriptPayout=%s)",
nVersion, collateralOutpoint.ToStringShort(), addr.ToString(), (double)nOperatorReward / 100, EncodeDestination(keyIDOwner), EncodeDestination(pubKeyOperator), EncodeDestination(keyIDVoting), payee);
}

void ProRegPL::ToJson(UniValue& obj) const
Expand All @@ -243,7 +243,7 @@ void ProRegPL::ToJson(UniValue& obj) const
obj.pushKV("collateralIndex", (int)collateralOutpoint.n);
obj.pushKV("service", addr.ToString());
obj.pushKV("ownerAddress", EncodeDestination(keyIDOwner));
obj.pushKV("operatorAddress", EncodeDestination(keyIDOperator));
obj.pushKV("operatorPubKey", EncodeDestination(pubKeyOperator));
obj.pushKV("votingAddress", EncodeDestination(keyIDVoting));

CTxDestination dest1;
Expand Down Expand Up @@ -307,7 +307,7 @@ bool CheckProUpServTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVa
}

// we can only check the signature if pindexPrev != nullptr and the MN is known
if (!CheckHashSig(pl, mn->pdmnState->keyIDOperator, state)) {
if (!CheckHashSig(pl, mn->pdmnState->pubKeyOperator, state)) {
// pass the state returned by the function above
return false;
}
Expand Down Expand Up @@ -357,7 +357,7 @@ bool CheckProUpRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVal
return state.DoS(100, false, REJECT_INVALID, "bad-protx-mode");
}

if (pl.keyIDOperator.IsNull()) {
if (pl.pubKeyOperator.IsNull()) {
return state.DoS(10, false, REJECT_INVALID, "bad-protx-operator-key-null");
}
if (pl.keyIDVoting.IsNull()) {
Expand All @@ -375,7 +375,7 @@ bool CheckProUpRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVal
}

// don't allow reuse of payee key for other keys
if (payoutDest == CTxDestination(pl.keyIDVoting) || payoutDest == CTxDestination(pl.keyIDOperator)) {
if (payoutDest == CTxDestination(pl.keyIDVoting) || payoutDest == CTxDestination(pl.pubKeyOperator)) {
return state.DoS(10, false, REJECT_INVALID, "bad-protx-payee-reuse");
}

Expand Down Expand Up @@ -414,12 +414,12 @@ bool CheckProUpRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVal
}
if (collateralTxDest == CTxDestination(dmn->pdmnState->keyIDOwner) ||
collateralTxDest == CTxDestination(pl.keyIDVoting) ||
collateralTxDest == CTxDestination(pl.keyIDOperator)) {
collateralTxDest == CTxDestination(pl.pubKeyOperator)) {
return state.DoS(10, false, REJECT_INVALID, "bad-protx-collateral-reuse");
}

if (mnList.HasUniqueProperty(pl.keyIDOperator)) {
auto otherDmn = mnList.GetUniquePropertyMN(pl.keyIDOperator);
if (mnList.HasUniqueProperty(pl.pubKeyOperator)) {
auto otherDmn = mnList.GetUniquePropertyMN(pl.pubKeyOperator);
if (pl.proTxHash != otherDmn->proTxHash) {
return state.DoS(10, false, REJECT_DUPLICATE, "bad-protx-dup-key");
}
Expand All @@ -440,8 +440,8 @@ std::string ProUpRegPL::ToString() const
CTxDestination dest;
std::string payee = ExtractDestination(scriptPayout, dest) ?
EncodeDestination(dest) : "unknown";
return strprintf("ProUpRegPL(nVersion=%d, proTxHash=%s, operatorAddress=%s, votingAddress=%s, payoutAddress=%s)",
nVersion, proTxHash.ToString(), EncodeDestination(keyIDOperator), EncodeDestination(keyIDVoting), payee);
return strprintf("ProUpRegPL(nVersion=%d, proTxHash=%s, operatorPubKey=%s, votingAddress=%s, payoutAddress=%s)",
nVersion, proTxHash.ToString(), EncodeDestination(pubKeyOperator), EncodeDestination(keyIDVoting), payee);
}

void ProUpRegPL::ToJson(UniValue& obj) const
Expand All @@ -455,7 +455,7 @@ void ProUpRegPL::ToJson(UniValue& obj) const
if (ExtractDestination(scriptPayout, dest)) {
obj.pushKV("payoutAddress", EncodeDestination(dest));
}
obj.pushKV("operatorAddress", EncodeDestination(keyIDOperator));
obj.pushKV("operatorPubKey", EncodeDestination(pubKeyOperator));
obj.pushKV("inputsHash", inputsHash.ToString());
}

Expand Down Expand Up @@ -491,7 +491,7 @@ bool CheckProUpRevTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVal
if (!dmn)
return state.DoS(100, false, REJECT_INVALID, "bad-protx-hash");

if (!CheckHashSig(pl, dmn->pdmnState->keyIDOperator, state)) {
if (!CheckHashSig(pl, dmn->pdmnState->pubKeyOperator, state)) {
// pass the state returned by the function above
return false;
}
Expand Down
Loading

0 comments on commit 619c0f8

Please sign in to comment.