Merged in hybrid-pow-reward (pull request #11)

Set token rewards for mining during hybrid POS/POW Approved-by: Cevap
ioncoincore · Feb 12, 2020 · 9e41484 · 9e41484
2 parents ecc43c7 + 96fcd61
commit 9e41484
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/miner.cpp b/src/miner.cpp
@@ -243,7 +243,7 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
         coinbaseTx.vout[0].nValue = 0;
         pCoinstakeTx->vout[1].nValue += blockReward;
     } else if (fHybridPow) {
-        // HybridPow miner is rewarded in XELEC
+        // HybridPow miner is rewarded in ELEC
         coinbaseTx.vout[0].nValue = nFees + GetMasternodePayment(nHeight, blockReward);
     } else {
         coinbaseTx.vout[0].nValue = blockReward;
@@ -298,7 +298,7 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
     } else {
         FillBlockPayments(coinbaseTx, nHeight, blockReward, pblocktemplate->voutMasternodePayments, pblocktemplate->voutSuperblockPayments);
         if (fHybridPow) {
-            // HybridPow miner is rewarded in XELEC
+            // HybridPow miner is rewarded in ELEC
             coinbaseTx.vout[0].nValue = 0;
         }
     }

diff --git a/src/tokens/tokengroupmanager.cpp b/src/tokens/tokengroupmanager.cpp
@@ -29,7 +29,7 @@ bool CTokenGroupManager::StoreManagementTokenGroups(CTokenGroupCreation tokenGro
     } else if (!tgAtomCreation && tokenGroupCreation.tokenGroupDescription.strTicker == "ATOM") {
         this->tgAtomCreation = std::unique_ptr<CTokenGroupCreation>(new CTokenGroupCreation((tokenGroupCreation)));
         return true;
-    } else if (!tgElectronCreation && tokenGroupCreation.tokenGroupDescription.strTicker == "XELEC") {
+    } else if (!tgElectronCreation && tokenGroupCreation.tokenGroupDescription.strTicker == "ELEC") {
         this->tgElectronCreation = std::unique_ptr<CTokenGroupCreation>(new CTokenGroupCreation((tokenGroupCreation)));
         return true;
     }