evo: allow deciding NetInfoInterface impl based on object version

Author: kwvg

src/evo/deterministicmns.cpp

@@ -885,6 +885,7 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, gsl::no
             }
 
             auto newState = std::make_shared<CDeterministicMNState>(*dmn->pdmnState);
+            newState->nVersion = opt_proTx->nVersion;
             newState->netInfo = opt_proTx->netInfo;
             newState->scriptOperatorPayout = opt_proTx->scriptOperatorPayout;
             if (opt_proTx->nType == MnType::Evo) {
@@ -926,6 +927,7 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, gsl::no
                 newState->BanIfNotBanned(nHeight);
                 // we update pubKeyOperator here, make sure state version matches
                 newState->nVersion = opt_proTx->nVersion;
+                newState->netInfo = MakeNetInfo(*newState);
                 newState->pubKeyOperator = opt_proTx->pubKeyOperator;
             }
             newState->keyIDVoting = opt_proTx->keyIDVoting;

src/evo/dmnstate.h

@@ -54,7 +54,7 @@ class CDeterministicMNState
     CKeyID keyIDOwner;
     CBLSLazyPublicKey pubKeyOperator;
     CKeyID keyIDVoting;
-    std::shared_ptr<NetInfoInterface> netInfo{MakeNetInfo()};
+    std::shared_ptr<NetInfoInterface> netInfo{nullptr};
     CScript scriptPayout;
     CScript scriptOperatorPayout;
 
@@ -108,7 +108,7 @@ class CDeterministicMNState
     {
         nVersion = ProTxVersion::LegacyBLS;
         pubKeyOperator = CBLSLazyPublicKey();
-        netInfo = MakeNetInfo();
+        netInfo = MakeNetInfo(*this);
         scriptOperatorPayout = CScript();
         nRevocationReason = CProUpRevTx::REASON_NOT_SPECIFIED;
         platformNodeID = uint160();

src/evo/netinfo.h

@@ -197,8 +197,11 @@ class MnNetInfo final : public NetInfoInterface
     void Clear() override { m_addr.Clear(); }
 };
 
-inline std::shared_ptr<NetInfoInterface> MakeNetInfo()
+/* Selects NetInfoInterface implementation to use based on object version */
+template <typename T1>
+std::shared_ptr<NetInfoInterface> MakeNetInfo(const T1& obj)
 {
+    assert(obj.nVersion > 0);
     return std::make_shared<MnNetInfo>();
 }
 

src/evo/providertx.h

@@ -41,7 +41,7 @@ class CProRegTx
     MnType nType{MnType::Regular};
     uint16_t nMode{0};                                     // only 0 supported for now
     COutPoint collateralOutpoint{uint256(), (uint32_t)-1}; // if hash is null, we refer to a ProRegTx output
-    std::shared_ptr<NetInfoInterface> netInfo{MakeNetInfo()};
+    std::shared_ptr<NetInfoInterface> netInfo{nullptr};
     uint160 platformNodeID{};
     uint16_t platformP2PPort{0};
     uint16_t platformHTTPPort{0};
@@ -110,7 +110,7 @@ class CProUpServTx
     uint16_t nVersion{ProTxVersion::LegacyBLS}; // message version
     MnType nType{MnType::Regular};
     uint256 proTxHash;
-    std::shared_ptr<NetInfoInterface> netInfo{MakeNetInfo()};
+    std::shared_ptr<NetInfoInterface> netInfo{nullptr};
     uint160 platformNodeID{};
     uint16_t platformP2PPort{0};
     uint16_t platformHTTPPort{0};

src/evo/simplifiedmns.h

@@ -35,7 +35,7 @@ class CSimplifiedMNListEntry
 public:
     uint256 proRegTxHash;
     uint256 confirmedHash;
-    std::shared_ptr<NetInfoInterface> netInfo{MakeNetInfo()};
+    std::shared_ptr<NetInfoInterface> netInfo{nullptr};
     CBLSLazyPublicKey pubKeyOperator;
     CKeyID keyIDVoting;
     bool isValid{false};

src/rpc/evo.cpp

@@ -657,6 +657,7 @@ static UniValue protx_register_common_wrapper(const JSONRPCRequest& request,
     CProRegTx ptx;
     ptx.nType = mnType;
     ptx.nVersion = CProRegTx::GetMaxVersion(/*is_basic_scheme_active=*/!use_legacy);
+    ptx.netInfo = MakeNetInfo(ptx);
 
     if (action == ProTxRegisterAction::Fund) {
         CTxDestination collateralDest = DecodeDestination(request.params[paramIdx].get_str());
@@ -974,6 +975,7 @@ static UniValue protx_update_service_common_wrapper(const JSONRPCRequest& reques
     }
 
     ptx.nVersion = dmn->pdmnState->nVersion;
+    ptx.netInfo = MakeNetInfo(ptx);
 
     if (auto entryRet = ptx.netInfo->AddEntry(request.params[1].get_str()); entryRet != NetInfoStatus::Success) {
         throw std::runtime_error(strprintf("%s (%s)", NISToString(entryRet), request.params[1].get_str()));

src/test/block_reward_reallocation_tests.cpp

@@ -116,6 +116,7 @@ static CMutableTransaction CreateProRegTx(const CChain& active_chain, const CTxM
 
     CProRegTx proTx;
     proTx.nVersion = CProRegTx::GetMaxVersion(!bls::bls_legacy_scheme);
+    proTx.netInfo = MakeNetInfo(proTx);
     proTx.collateralOutpoint.n = 0;
     BOOST_CHECK_EQUAL(proTx.netInfo->AddEntry(strprintf("1.1.1.1:%d", port)), NetInfoStatus::Success);
     proTx.keyIDOwner = ownerKeyRet.GetPubKey().GetID();

src/test/evo_deterministicmns_tests.cpp

@@ -105,6 +105,7 @@ static CMutableTransaction CreateProRegTx(const CChain& active_chain, const CTxM
 
     CProRegTx proTx;
     proTx.nVersion = CProRegTx::GetMaxVersion(!bls::bls_legacy_scheme);
+    proTx.netInfo = MakeNetInfo(proTx);
     proTx.collateralOutpoint.n = 0;
     BOOST_CHECK_EQUAL(proTx.netInfo->AddEntry(strprintf("1.1.1.1:%d", port)), NetInfoStatus::Success);
     proTx.keyIDOwner = ownerKeyRet.GetPubKey().GetID();
@@ -127,6 +128,7 @@ static CMutableTransaction CreateProUpServTx(const CChain& active_chain, const C
 {
     CProUpServTx proTx;
     proTx.nVersion = CProUpServTx::GetMaxVersion(!bls::bls_legacy_scheme);
+    proTx.netInfo = MakeNetInfo(proTx);
     proTx.proTxHash = proTxHash;
     BOOST_CHECK_EQUAL(proTx.netInfo->AddEntry(strprintf("1.1.1.1:%d", port)), NetInfoStatus::Success);
     proTx.scriptOperatorPayout = scriptOperatorPayout;
@@ -637,6 +639,7 @@ void FuncTestMempoolReorg(TestChainSetup& setup)
 
     CProRegTx payload;
     payload.nVersion = CProRegTx::GetMaxVersion(!bls::bls_legacy_scheme);
+    payload.netInfo = MakeNetInfo(payload);
     BOOST_CHECK_EQUAL(payload.netInfo->AddEntry("1.1.1.1:1"), NetInfoStatus::Success);
     payload.keyIDOwner = ownerKey.GetPubKey().GetID();
     payload.pubKeyOperator.Set(operatorKey.GetPublicKey(), bls::bls_legacy_scheme.load());
@@ -711,6 +714,8 @@ void FuncTestMempoolDualProregtx(TestChainSetup& setup)
     auto scriptPayout = GetScriptForDestination(PKHash(payoutKey.GetPubKey()));
 
     CProRegTx payload;
+    payload.nVersion = CProRegTx::GetMaxVersion(!bls::bls_legacy_scheme);
+    payload.netInfo = MakeNetInfo(payload);
     BOOST_CHECK_EQUAL(payload.netInfo->AddEntry("1.1.1.1:2"), NetInfoStatus::Success);
     payload.keyIDOwner = ownerKey.GetPubKey().GetID();
     payload.pubKeyOperator.Set(operatorKey.GetPublicKey(), bls::bls_legacy_scheme.load());
@@ -779,6 +784,7 @@ void FuncVerifyDB(TestChainSetup& setup)
 
     CProRegTx payload;
     payload.nVersion = CProRegTx::GetMaxVersion(!bls::bls_legacy_scheme);
+    payload.netInfo = MakeNetInfo(payload);
     BOOST_CHECK_EQUAL(payload.netInfo->AddEntry("1.1.1.1:1"), NetInfoStatus::Success);
     payload.keyIDOwner = ownerKey.GetPubKey().GetID();
     payload.pubKeyOperator.Set(operatorKey.GetPublicKey(), bls::bls_legacy_scheme.load());

src/test/evo_simplifiedmns_tests.cpp

@@ -19,6 +19,8 @@ BOOST_AUTO_TEST_CASE(simplifiedmns_merkleroots)
     std::vector<CSimplifiedMNListEntry> entries;
     for (size_t i = 1; i < 16; i++) {
         CSimplifiedMNListEntry smle;
+        smle.nVersion = CProRegTx::GetMaxVersion(!bls::bls_legacy_scheme);
+        smle.netInfo = MakeNetInfo(smle);
         smle.proRegTxHash.SetHex(strprintf("%064x", i));
         smle.confirmedHash.SetHex(strprintf("%064x", i));