Skip to content

Commit 619c0f8

Browse files
random-zebrarandom-zebra
committed
scripted-diff: Rename keyIDOperator to pubKeyOperator
-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-
1 parent b0a7fa5 commit 619c0f8

14 files changed

+92
-92
lines changed

‎src/activemasternode.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ OperationResult CActiveDeterministicMasternodeManager::SetOperatorKey(const std:
6060
if (strMNOperatorPrivKey.empty()) {
6161
return errorOut("ERROR: Masternode operator priv key cannot be empty.");
6262
}
63-
if (!CMessageSigner::GetKeysFromSecret(strMNOperatorPrivKey, info.keyOperator, info.keyIDOperator)) {
63+
if (!CMessageSigner::GetKeysFromSecret(strMNOperatorPrivKey, info.keyOperator, info.pubKeyOperator)) {
6464
return errorOut(_("Invalid mnoperatorprivatekey. Please see the documentation."));
6565
}
6666
return OperationResult(true);
@@ -75,12 +75,12 @@ OperationResult CActiveDeterministicMasternodeManager::GetOperatorKey(CKey& key,
7575
if (!dmn) {
7676
return errorOut(strprintf("Active masternode %s not registered or PoSe banned", info.proTxHash.ToString()));
7777
}
78-
if (info.keyIDOperator != dmn->pdmnState->keyIDOperator) {
78+
if (info.pubKeyOperator != dmn->pdmnState->pubKeyOperator) {
7979
return errorOut("Active masternode operator key changed or revoked");
8080
}
8181
// return keys
8282
key = info.keyOperator;
83-
keyID = info.keyIDOperator;
83+
keyID = info.pubKeyOperator;
8484
return OperationResult(true);
8585
}
8686

@@ -119,7 +119,7 @@ void CActiveDeterministicMasternodeManager::Init()
119119

120120
CDeterministicMNList mnList = deterministicMNManager->GetListAtChainTip();
121121

122-
CDeterministicMNCPtr dmn = mnList.GetMNByOperatorKey(info.keyIDOperator);
122+
CDeterministicMNCPtr dmn = mnList.GetMNByOperatorKey(info.pubKeyOperator);
123123
if (!dmn) {
124124
// MN not appeared on the chain yet
125125
return;
@@ -192,7 +192,7 @@ void CActiveDeterministicMasternodeManager::UpdatedBlockTip(const CBlockIndex* p
192192
return;
193193
}
194194

195-
if (newDmn->pdmnState->keyIDOperator != oldDmn->pdmnState->keyIDOperator) {
195+
if (newDmn->pdmnState->pubKeyOperator != oldDmn->pdmnState->pubKeyOperator) {
196196
// MN operator key changed or revoked
197197
Reset(MASTERNODE_OPERATOR_KEY_CHANGED);
198198
return;

‎src/activemasternode.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ extern CActiveDeterministicMasternodeManager* activeMasternodeManager;
2828
struct CActiveMasternodeInfo
2929
{
3030
// Keys for the active Masternode
31-
CKeyID keyIDOperator;
31+
CKeyID pubKeyOperator;
3232
CKey keyOperator;
3333
// Initialized while registering Masternode
3434
uint256 proTxHash{UINT256_ZERO};

‎src/budget/budgetmanager.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1110,7 +1110,7 @@ bool CBudgetManager::ProcessFinalizedBudgetVote(CFinalizedBudgetVote& vote, CNod
11101110
if (dmn) {
11111111
const std::string& mn_protx_id = dmn->proTxHash.ToString();
11121112

1113-
if (!vote.CheckSignature(dmn->pdmnState->keyIDOperator)) {
1113+
if (!vote.CheckSignature(dmn->pdmnState->pubKeyOperator)) {
11141114
err = strprintf("invalid fbvote sig from dmn: %s", mn_protx_id);
11151115
return state.DoS(100, false, REJECT_INVALID, "bad-fbvote-sig", false, err);
11161116
}

‎src/evo/deterministicmns.cpp‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ std::string CDeterministicMNState::ToString() const
3737
operatorPayoutAddress = EncodeDestination(dest);
3838
}
3939

40-
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)",
40+
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)",
4141
nRegisteredHeight, nLastPaidHeight, nPoSePenalty, nPoSeRevivedHeight, nPoSeBanHeight, nRevocationReason,
42-
EncodeDestination(keyIDOwner), EncodeDestination(keyIDOperator), EncodeDestination(keyIDVoting), addr.ToStringIPPort(), payoutAddress, operatorPayoutAddress);
42+
EncodeDestination(keyIDOwner), EncodeDestination(pubKeyOperator), EncodeDestination(keyIDVoting), addr.ToStringIPPort(), payoutAddress, operatorPayoutAddress);
4343
}
4444

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

6060
CTxDestination dest1;
@@ -125,7 +125,7 @@ CDeterministicMNCPtr CDeterministicMNList::GetValidMN(const uint256& proTxHash)
125125
CDeterministicMNCPtr CDeterministicMNList::GetMNByOperatorKey(const CKeyID& keyID)
126126
{
127127
for (const auto& p : mnMap) {
128-
if (p.second->pdmnState->keyIDOperator == keyID) {
128+
if (p.second->pdmnState->pubKeyOperator == keyID) {
129129
return p.second;
130130
}
131131
}
@@ -396,8 +396,8 @@ void CDeterministicMNList::AddMN(const CDeterministicMNCPtr& dmn, bool fBumpTota
396396
if (HasUniqueProperty(dmn->pdmnState->addr)) {
397397
throw(std::runtime_error(strprintf("%s: can't add a masternode with a duplicate address %s", __func__, dmn->pdmnState->addr.ToStringIPPort())));
398398
}
399-
if (HasUniqueProperty(dmn->pdmnState->keyIDOwner) || HasUniqueProperty(dmn->pdmnState->keyIDOperator)) {
400-
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))));
399+
if (HasUniqueProperty(dmn->pdmnState->keyIDOwner) || HasUniqueProperty(dmn->pdmnState->pubKeyOperator)) {
400+
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))));
401401
}
402402

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

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

431431
UpdateUniqueProperty(dmn, oldState->addr, pdmnState->addr);
432432
UpdateUniqueProperty(dmn, oldState->keyIDOwner, pdmnState->keyIDOwner);
433-
UpdateUniqueProperty(dmn, oldState->keyIDOperator, pdmnState->keyIDOperator);
433+
UpdateUniqueProperty(dmn, oldState->pubKeyOperator, pdmnState->pubKeyOperator);
434434
}
435435

436436
void CDeterministicMNList::UpdateMN(const uint256& proTxHash, const CDeterministicMNStateCPtr& pdmnState)
@@ -462,7 +462,7 @@ void CDeterministicMNList::RemoveMN(const uint256& proTxHash)
462462
DeleteUniqueProperty(dmn, dmn->pdmnState->addr);
463463
}
464464
DeleteUniqueProperty(dmn, dmn->pdmnState->keyIDOwner);
465-
DeleteUniqueProperty(dmn, dmn->pdmnState->keyIDOperator);
465+
DeleteUniqueProperty(dmn, dmn->pdmnState->pubKeyOperator);
466466

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

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

703703
if (newState->nPoSeBanHeight != -1) {
704704
// only revive when all keys are set
705-
if (!newState->keyIDOperator.IsNull() && !newState->keyIDVoting.IsNull() && !newState->keyIDOwner.IsNull()) {
705+
if (!newState->pubKeyOperator.IsNull() && !newState->keyIDVoting.IsNull() && !newState->keyIDOwner.IsNull()) {
706706
newState->nPoSePenalty = 0;
707707
newState->nPoSeBanHeight = -1;
708708
newState->nPoSeRevivedHeight = nHeight;
@@ -730,16 +730,16 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
730730
if (!dmn) {
731731
return _state.DoS(100, false, REJECT_INVALID, "bad-protx-hash");
732732
}
733-
if (newList.HasUniqueProperty(pl.keyIDOperator) && newList.GetUniquePropertyMN(pl.keyIDOperator)->proTxHash != pl.proTxHash) {
733+
if (newList.HasUniqueProperty(pl.pubKeyOperator) && newList.GetUniquePropertyMN(pl.pubKeyOperator)->proTxHash != pl.proTxHash) {
734734
return _state.DoS(100, false, REJECT_DUPLICATE, "bad-protx-dup-operator-key");
735735
}
736736
auto newState = std::make_shared<CDeterministicMNState>(*dmn->pdmnState);
737-
if (newState->keyIDOperator != pl.keyIDOperator) {
737+
if (newState->pubKeyOperator != pl.pubKeyOperator) {
738738
// reset all operator related fields and put MN into PoSe-banned state in case the operator key changes
739739
newState->ResetOperatorFields();
740740
newState->BanIfNotBanned(nHeight);
741741
}
742-
newState->keyIDOperator = pl.keyIDOperator;
742+
newState->pubKeyOperator = pl.pubKeyOperator;
743743
newState->keyIDVoting = pl.keyIDVoting;
744744
newState->scriptPayout = pl.scriptPayout;
745745

‎src/evo/deterministicmns.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class CDeterministicMNState
3939
uint256 confirmedHashWithProRegTxHash;
4040

4141
CKeyID keyIDOwner;
42-
CKeyID keyIDOperator;
42+
CKeyID pubKeyOperator;
4343
CKeyID keyIDVoting;
4444
CService addr;
4545
CScript scriptPayout;
@@ -50,7 +50,7 @@ class CDeterministicMNState
5050
explicit CDeterministicMNState(const ProRegPL& pl)
5151
{
5252
keyIDOwner = pl.keyIDOwner;
53-
keyIDOperator = pl.keyIDOperator;
53+
pubKeyOperator = pl.pubKeyOperator;
5454
keyIDVoting = pl.keyIDVoting;
5555
addr = pl.addr;
5656
scriptPayout = pl.scriptPayout;
@@ -70,7 +70,7 @@ class CDeterministicMNState
7070
READWRITE(obj.confirmedHash);
7171
READWRITE(obj.confirmedHashWithProRegTxHash);
7272
READWRITE(obj.keyIDOwner);
73-
READWRITE(obj.keyIDOperator);
73+
READWRITE(obj.pubKeyOperator);
7474
READWRITE(obj.keyIDVoting);
7575
READWRITE(obj.addr);
7676
READWRITE(obj.scriptPayout);
@@ -79,7 +79,7 @@ class CDeterministicMNState
7979

8080
void ResetOperatorFields()
8181
{
82-
keyIDOperator = CKeyID();
82+
pubKeyOperator = CKeyID();
8383
addr = CService();
8484
scriptOperatorPayout = CScript();
8585
nRevocationReason = ProUpRevPL::REASON_NOT_SPECIFIED;
@@ -119,7 +119,7 @@ class CDeterministicMNStateDiff
119119
Field_confirmedHash = 0x0040,
120120
Field_confirmedHashWithProRegTxHash = 0x0080,
121121
Field_keyIDOwner = 0x0100,
122-
Field_keyIDOperator = 0x0200,
122+
Field_pubKeyOperator = 0x0200,
123123
Field_keyIDVoting = 0x0400,
124124
Field_addr = 0x0800,
125125
Field_scriptPayout = 0x1000,
@@ -136,7 +136,7 @@ class CDeterministicMNStateDiff
136136
DMN_STATE_DIFF_LINE(confirmedHash) \
137137
DMN_STATE_DIFF_LINE(confirmedHashWithProRegTxHash) \
138138
DMN_STATE_DIFF_LINE(keyIDOwner) \
139-
DMN_STATE_DIFF_LINE(keyIDOperator) \
139+
DMN_STATE_DIFF_LINE(pubKeyOperator) \
140140
DMN_STATE_DIFF_LINE(keyIDVoting) \
141141
DMN_STATE_DIFF_LINE(addr) \
142142
DMN_STATE_DIFF_LINE(scriptPayout) \

‎src/evo/providertx.cpp‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ static bool CheckCollateralOut(const CTxOut& out, const ProRegPL& pl, CValidatio
8484
// this check applies to internal and external collateral, but internal collaterals are not necessarely a P2PKH
8585
if (collateralDestRet == CTxDestination(pl.keyIDOwner) ||
8686
collateralDestRet == CTxDestination(pl.keyIDVoting) ||
87-
collateralDestRet == CTxDestination(pl.keyIDOperator)) {
87+
collateralDestRet == CTxDestination(pl.pubKeyOperator)) {
8888
return state.DoS(10, false, REJECT_INVALID, "bad-protx-collateral-reuse");
8989
}
9090
// check collateral amount
@@ -113,7 +113,7 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
113113
return state.DoS(100, false, REJECT_INVALID, "bad-protx-mode");
114114
}
115115

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

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

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

249249
CTxDestination dest1;
@@ -307,7 +307,7 @@ bool CheckProUpServTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVa
307307
}
308308

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

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

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

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

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

447447
void ProUpRegPL::ToJson(UniValue& obj) const
@@ -455,7 +455,7 @@ void ProUpRegPL::ToJson(UniValue& obj) const
455455
if (ExtractDestination(scriptPayout, dest)) {
456456
obj.pushKV("payoutAddress", EncodeDestination(dest));
457457
}
458-
obj.pushKV("operatorAddress", EncodeDestination(keyIDOperator));
458+
obj.pushKV("operatorPubKey", EncodeDestination(pubKeyOperator));
459459
obj.pushKV("inputsHash", inputsHash.ToString());
460460
}
461461

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

494-
if (!CheckHashSig(pl, dmn->pdmnState->keyIDOperator, state)) {
494+
if (!CheckHashSig(pl, dmn->pdmnState->pubKeyOperator, state)) {
495495
// pass the state returned by the function above
496496
return false;
497497
}

0 commit comments

Comments
 (0)