[Refactor] No need to get the publickey of the active masternode

random-zebra · random-zebra · commit d3843cd1d373 · 2021-10-04T14:22:29.000+02:00
Only the secret key and the collateral out are needed to vote/sign
diff --git a/src/activemasternode.cpp b/src/activemasternode.cpp
@@ -67,7 +67,7 @@ OperationResult CActiveDeterministicMasternodeManager::SetOperatorKey(const std:
     return OperationResult(true);
 }
 
-OperationResult CActiveDeterministicMasternodeManager::GetOperatorKey(CBLSSecretKey& key, CBLSPublicKey& pubKey, CDeterministicMNCPtr& dmn) const
+OperationResult CActiveDeterministicMasternodeManager::GetOperatorKey(CBLSSecretKey& key, CDeterministicMNCPtr& dmn) const
 {
     if (!IsReady()) {
         return errorOut("Active masternode not ready");
@@ -79,9 +79,8 @@ OperationResult CActiveDeterministicMasternodeManager::GetOperatorKey(CBLSSecret
     if (info.pubKeyOperator != dmn->pdmnState->pubKeyOperator.Get()) {
         return errorOut("Active masternode operator key changed or revoked");
     }
-    // return keys
+    // return key
     key = info.keyOperator;
-    pubKey = info.pubKeyOperator;
     return OperationResult(true);
 }
 
@@ -467,13 +466,13 @@ void CActiveMasternode::GetKeys(CKey& _privKeyMasternode, CPubKey& _pubKeyMaster
     _pubKeyMasternode = pubKeyMasternode;
 }
 
-bool GetActiveDMNKeys(CBLSSecretKey& key, CBLSPublicKey& pubkey, CTxIn& vin)
+bool GetActiveDMNKeys(CBLSSecretKey& key, CTxIn& vin)
 {
     if (activeMasternodeManager == nullptr) {
         return error("%s: Active Masternode not initialized", __func__);
     }
     CDeterministicMNCPtr dmn;
-    auto res = activeMasternodeManager->GetOperatorKey(key, pubkey, dmn);
+    auto res = activeMasternodeManager->GetOperatorKey(key, dmn);
     if (!res) {
         return error("%s: %s", __func__, res.getError());
     }
@@ -486,8 +485,7 @@ bool GetActiveMasternodeKeys(CTxIn& vin, Optional<CKey>& key, CBLSSecretKey& bls
     if (activeMasternodeManager != nullptr) {
         // deterministic mn
         key = nullopt;
-        CBLSPublicKey pk;
-        return GetActiveDMNKeys(blsKey, pk, vin);
+        return GetActiveDMNKeys(blsKey, vin);
     }
     // legacy mn
     if (activeMasternode.vin == nullopt) {
diff --git a/src/activemasternode.h b/src/activemasternode.h
@@ -65,7 +65,7 @@ class CActiveDeterministicMasternodeManager : public CValidationInterface
     OperationResult SetOperatorKey(const std::string& strMNOperatorPrivKey);
     // If the active masternode is ready, and the keyID matches with the registered one,
     // return private key, keyID, and pointer to dmn.
-    OperationResult GetOperatorKey(CBLSSecretKey& key, CBLSPublicKey& pubkey, CDeterministicMNCPtr& dmn) const;
+    OperationResult GetOperatorKey(CBLSSecretKey& key, CDeterministicMNCPtr& dmn) const;
     void SetNullProTx() { info.proTxHash = UINT256_ZERO; }
 
     const CActiveMasternodeInfo* GetInfo() const { return &info; }
@@ -121,6 +121,6 @@ class CActiveMasternode
 // Compatibility code: get vin and keys for either legacy or deterministic masternode
 bool GetActiveMasternodeKeys(CTxIn& vin, Optional<CKey>& key, CBLSSecretKey& blsKey);
 // Get active masternode BLS operator keys for DMN
-bool GetActiveDMNKeys(CBLSSecretKey& key, CBLSPublicKey& pubkey, CTxIn& vin);
+bool GetActiveDMNKeys(CBLSSecretKey& key, CTxIn& vin);
 
 #endif
diff --git a/src/rpc/budget.cpp b/src/rpc/budget.cpp
@@ -425,8 +425,8 @@ static mnKeyList getDMNKeysForActiveMasternode(UniValue& resultsObj)
         throw JSONRPCError(RPC_MISC_ERROR, _("This is not a deterministic masternode. 'local' option disabled."));
     }
 
-    CBLSSecretKey sk; CBLSPublicKey pk; CDeterministicMNCPtr dmn;
-    auto res = activeMasternodeManager->GetOperatorKey(sk, pk, dmn);
+    CBLSSecretKey sk; CDeterministicMNCPtr dmn;
+    auto res = activeMasternodeManager->GetOperatorKey(sk, dmn);
     if (!res) {
         resultsObj.push_back(packErrorRetStatus("local", res.getError()));
         return {};
diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
@@ -235,8 +235,8 @@ static CBLSSecretKey GetBLSSecretKey(const std::string& hexKey)
         return ParseBLSSecretKey(hexKey);
     }
     // If empty, get the active masternode key
-    CBLSSecretKey sk; CBLSPublicKey pk; CTxIn vin;
-    if (!GetActiveDMNKeys(sk, pk, vin)) {
+    CBLSSecretKey sk; CTxIn vin;
+    if (!GetActiveDMNKeys(sk, vin)) {
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Active masternode key not found. Insert DMN operator private key.");
     }
     return sk;

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ OperationResult CActiveDeterministicMasternodeManager::SetOperatorKey(const std:`
`67`	`67`	`return OperationResult(true);`
`68`	`68`	`}`
`69`	`69`
`70`		`-OperationResult CActiveDeterministicMasternodeManager::GetOperatorKey(CBLSSecretKey& key, CBLSPublicKey& pubKey, CDeterministicMNCPtr& dmn) const`
	`70`	`+OperationResult CActiveDeterministicMasternodeManager::GetOperatorKey(CBLSSecretKey& key, CDeterministicMNCPtr& dmn) const`
`71`	`71`	`{`
`72`	`72`	`if (!IsReady()) {`
`73`	`73`	`return errorOut("Active masternode not ready");`
`@@ -79,9 +79,8 @@ OperationResult CActiveDeterministicMasternodeManager::GetOperatorKey(CBLSSecret`
`79`	`79`	`if (info.pubKeyOperator != dmn->pdmnState->pubKeyOperator.Get()) {`
`80`	`80`	`return errorOut("Active masternode operator key changed or revoked");`
`81`	`81`	`}`
`82`		`- // return keys`
	`82`	`+ // return key`
`83`	`83`	`key = info.keyOperator;`
`84`		`- pubKey = info.pubKeyOperator;`
`85`	`84`	`return OperationResult(true);`
`86`	`85`	`}`
`87`	`86`
`@@ -467,13 +466,13 @@ void CActiveMasternode::GetKeys(CKey& _privKeyMasternode, CPubKey& _pubKeyMaster`
`467`	`466`	`_pubKeyMasternode = pubKeyMasternode;`
`468`	`467`	`}`
`469`	`468`
`470`		`-bool GetActiveDMNKeys(CBLSSecretKey& key, CBLSPublicKey& pubkey, CTxIn& vin)`
	`469`	`+bool GetActiveDMNKeys(CBLSSecretKey& key, CTxIn& vin)`
`471`	`470`	`{`
`472`	`471`	`if (activeMasternodeManager == nullptr) {`
`473`	`472`	`return error("%s: Active Masternode not initialized", __func__);`
`474`	`473`	`}`
`475`	`474`	`CDeterministicMNCPtr dmn;`
`476`		`- auto res = activeMasternodeManager->GetOperatorKey(key, pubkey, dmn);`
	`475`	`+ auto res = activeMasternodeManager->GetOperatorKey(key, dmn);`
`477`	`476`	`if (!res) {`
`478`	`477`	`return error("%s: %s", __func__, res.getError());`
`479`	`478`	`}`
`@@ -486,8 +485,7 @@ bool GetActiveMasternodeKeys(CTxIn& vin, Optional<CKey>& key, CBLSSecretKey& bls`
`486`	`485`	`if (activeMasternodeManager != nullptr) {`
`487`	`486`	`// deterministic mn`
`488`	`487`	`key = nullopt;`
`489`		`- CBLSPublicKey pk;`
`490`		`- return GetActiveDMNKeys(blsKey, pk, vin);`
	`488`	`+ return GetActiveDMNKeys(blsKey, vin);`
`491`	`489`	`}`
`492`	`490`	`// legacy mn`
`493`	`491`	`if (activeMasternode.vin == nullopt) {`
Original file line number	Diff line number	Diff line change
`@@ -235,8 +235,8 @@ static CBLSSecretKey GetBLSSecretKey(const std::string& hexKey)`
`235`	`235`	`return ParseBLSSecretKey(hexKey);`
`236`	`236`	`}`
`237`	`237`	`// If empty, get the active masternode key`
`238`		`- CBLSSecretKey sk; CBLSPublicKey pk; CTxIn vin;`
`239`		`- if (!GetActiveDMNKeys(sk, pk, vin)) {`
	`238`	`+ CBLSSecretKey sk; CTxIn vin;`
	`239`	`+ if (!GetActiveDMNKeys(sk, vin)) {`
`240`	`240`	`throw JSONRPCError(RPC_INVALID_PARAMETER, "Active masternode key not found. Insert DMN operator private key.");`
`241`	`241`	`}`
`242`	`242`	`return sk;`