Build fix

[VerusCoin.git] / src / init.cpp

diff --git a/src/init.cpp b/src/init.cpp
index 414c4bf40b90b4b1742e7136a61d24fced60ee6b..b767a9fd0cd7b33a5afa2b4c22789b3b7b5c03de 100644 (file)
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1211,23 +1211,16 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
         CVerusHash::init();
         CVerusHashV2::init();
         CBlockHeader::SetVerusV2Hash();
-        if (strcmp(ASSETCHAINS_SYMBOL,"VRSC") == 0)
+        if (IsVerusMainnetActive())
         {
-            COptCCParams::AddFeeCurrency(CCrossChainRPCData::GetID("dai.eth."));
-            COptCCParams::AddFeeCurrency(CCrossChainRPCData::GetID("rbtc.eth."));
-            COptCCParams::AddFeeCurrency(CCrossChainRPCData::GetID("wbtc.eth."));
-            COptCCParams::AddFeeCurrency(CCrossChainRPCData::GetID("eth."));
             CConstVerusSolutionVector::activationHeight.SetActivationHeight(CActivationHeight::SOLUTION_VERUSV2, 310000);
             CConstVerusSolutionVector::activationHeight.SetActivationHeight(CActivationHeight::SOLUTION_VERUSV3, 800200);
             CConstVerusSolutionVector::activationHeight.SetActivationHeight(CActivationHeight::SOLUTION_VERUSV4, 800200);
             CConstVerusSolutionVector::activationHeight.SetActivationHeight(CActivationHeight::SOLUTION_VERUSV5, 1053660);
             CConstVerusSolutionVector::activationHeight.SetActivationHeight(CActivationHeight::SOLUTION_VERUSV5_1, 1053660);
         }
-        else if (strcmp(ASSETCHAINS_SYMBOL,"VRSCTEST") == 0)
+        else if (IsVerusActive())
         {
-            COptCCParams::AddFeeCurrency(CCrossChainRPCData::GetID("usd"));
-            COptCCParams::AddFeeCurrency(CCrossChainRPCData::GetID("btc"));
-            COptCCParams::AddFeeCurrency(CCrossChainRPCData::GetID("eth"));
             CConstVerusSolutionVector::activationHeight.SetActivationHeight(CActivationHeight::SOLUTION_VERUSV2, 1);
             CConstVerusSolutionVector::activationHeight.SetActivationHeight(CActivationHeight::SOLUTION_VERUSV3, 1);
             CConstVerusSolutionVector::activationHeight.SetActivationHeight(CActivationHeight::SOLUTION_VERUSV4, 1);
@@ -1237,15 +1230,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
         }
         else
         {
-            if (PBAAS_TESTMODE)
-            {
-                COptCCParams::AddFeeCurrency(CCrossChainRPCData::GetID("vrsctest"));
-            }
-            else
-            {
-                COptCCParams::AddFeeCurrency(CCrossChainRPCData::GetID("vrsc"));
-            }
-            
             CConstVerusSolutionVector::activationHeight.SetActivationHeight(CActivationHeight::SOLUTION_VERUSV2, 1);
             CConstVerusSolutionVector::activationHeight.SetActivationHeight(CActivationHeight::SOLUTION_VERUSV3, 1);
             CConstVerusSolutionVector::activationHeight.SetActivationHeight(CActivationHeight::SOLUTION_VERUSV4, 1);
@@ -1515,8 +1499,10 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
         }
     }
 
-    BOOST_FOREACH(const std::string& strDest, mapMultiArgs["-seednode"])
-        AddOneShot(strDest);
+    for (auto &oneNode : ConnectedChains.defaultPeerNodes)
+    {
+        AddOneShot(oneNode.networkAddress);
+    }
 
 #if ENABLE_ZMQ
     pzmqNotificationInterface = CZMQNotificationInterface::CreateWithArguments(mapArgs);