Merge pull request #675 from pqv199x/reward-calculator

Not display staking ROI if MN is out of top 150
BuildOnViction · Jun 27, 2019 · efb7f33 · efb7f33
2 parents 1311322 + 82a9c91
commit efb7f33
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 53 deletions.
diff --git a/apis/voters.js b/apis/voters.js
@@ -458,59 +458,61 @@ router.get('/annualReward', [
         if (!candidateData) {
             return next(new Error('Candidate not found'))
         }
-        const capacity = new BigNumber(candidateData.capacityNumber)
-        const latestBlock = await web3.eth.getBlockNumber()
-        const latestCheckpoint = latestBlock - (latestBlock % parseInt(config.get('blockchain.epoch')))
-        const lastEpoch = (parseInt(latestCheckpoint / config.get('blockchain.epoch'))).toString()
-
-        const promises = await Promise.all([
-            web3.eth.getBlock(latestCheckpoint - 899),
-            web3.eth.getBlock(latestCheckpoint),
-            db.Status.find({
-                epoch: lastEpoch,
-                status: 'MASTERNODE'
+        if (candidateData.rank) {
+            const capacity = new BigNumber(candidateData.capacityNumber)
+            const latestBlock = await web3.eth.getBlockNumber()
+            const latestCheckpoint = latestBlock - (latestBlock % parseInt(config.get('blockchain.epoch')))
+            const lastEpoch = (parseInt(latestCheckpoint / config.get('blockchain.epoch'))).toString()
+
+            const promises = await Promise.all([
+                web3.eth.getBlock(latestCheckpoint - 899),
+                web3.eth.getBlock(latestCheckpoint),
+                db.Status.find({
+                    epoch: lastEpoch,
+                    status: 'MASTERNODE'
+                })
+            ])
+            const numberOfMN = promises[2]
+            const epochDuration = ((new Date(promises[1].timestamp * 1000) -
+                new Date(promises[0].timestamp * 1000)) / 1000) / 60 // minutes
+            // number of epochs in a year
+            const minPerDay = 60 * 24
+            const epochYear = (minPerDay * 365) / epochDuration
+
+            const totalReward = new BigNumber(config.get('blockchain.reward'))
+            let voterAmount = 1000
+            let voterRW1Year
+            let mnRW1Year
+            let mnStakingYear
+            let masternodeReward
+            // Reward divided to masternode
+            masternodeReward = totalReward.dividedBy(numberOfMN.length)
+
+            // 50% for voter
+            const voterRWEpoch = masternodeReward.multipliedBy(0.5)
+                .multipliedBy(voterAmount).dividedBy(capacity)
+            // 40% for masternode
+            const mnRWEpoch = masternodeReward.multipliedBy(0.4)
+            // master staking reward
+            const mnStakingEpoch = masternodeReward.multipliedBy(0.5)
+                .multipliedBy(50000).dividedBy(capacity)
+
+            // calculate reward 1 year
+            voterRW1Year = voterRWEpoch.multipliedBy(epochYear)
+            mnRW1Year = mnRWEpoch.multipliedBy(epochYear)
+            mnStakingYear = mnStakingEpoch.multipliedBy(epochYear)
+            const voterROI = voterRW1Year.div(voterAmount).multipliedBy(100).toNumber()
+            const mnROI = (mnRW1Year.plus(mnStakingYear)).dividedBy(50000).multipliedBy(100).toNumber()
+
+            return res.json({
+                epochDuration,
+                lastEpoch,
+                numberOfMN: numberOfMN.length,
+                capacity: capacity,
+                voterROI,
+                mnROI
             })
-        ])
-        const numberOfMN = promises[2]
-        const epochDuration = ((new Date(promises[1].timestamp * 1000) -
-            new Date(promises[0].timestamp * 1000)) / 1000) / 60 // minutes
-        // number of epochs in a year
-        const minPerDay = 60 * 24
-        const epochYear = (minPerDay * 365) / epochDuration
-
-        const totalReward = new BigNumber(config.get('blockchain.reward'))
-        let voterAmount = 1000
-        let voterRW1Year
-        let mnRW1Year
-        let mnStakingYear
-        let masternodeReward
-        // Reward divided to masternode
-        masternodeReward = totalReward.dividedBy(numberOfMN.length)
-
-        // 50% for voter
-        const voterRWEpoch = masternodeReward.multipliedBy(0.5)
-            .multipliedBy(voterAmount).dividedBy(capacity)
-        // 40% for masternode
-        const mnRWEpoch = masternodeReward.multipliedBy(0.4)
-        // master staking reward
-        const mnStakingEpoch = masternodeReward.multipliedBy(0.5)
-            .multipliedBy(50000).dividedBy(capacity)
-
-        // calculate reward 1 year
-        voterRW1Year = voterRWEpoch.multipliedBy(epochYear)
-        mnRW1Year = mnRWEpoch.multipliedBy(epochYear)
-        mnStakingYear = mnStakingEpoch.multipliedBy(epochYear)
-        const voterROI = voterRW1Year.div(voterAmount).multipliedBy(100).toNumber()
-        const mnROI = (mnRW1Year.plus(mnStakingYear)).dividedBy(50000).multipliedBy(100).toNumber()
-
-        return res.json({
-            epochDuration,
-            lastEpoch,
-            numberOfMN: numberOfMN.length,
-            capacity: capacity,
-            voterROI,
-            mnROI
-        })
+        }
     } catch (error) {
         return next(error)
     }

diff --git a/app/components/candidates/View.vue b/app/components/candidates/View.vue
@@ -658,7 +658,9 @@ export default {
         self.getCandidateVoters()
         self.getCandidateTransactions()
         self.getCandidateRewards()
-        self.getAnnualReward()
+        if (self.candidate.rank) {
+            self.getAnnualReward()
+        }
     },
     mounted () {},
     methods: {