Merge pull request #79 from maxpetriev/fix_daily_reward

   Daily reward issue fixed:

Author: maxpetriev

src/pages/Index.vue

@@ -113,11 +113,13 @@
               </q-item>
               <q-separator color="vseparator" />
               <q-item>
-                <q-item-section disabled>
-                  <q-item-label>Uptime:</q-item-label>
-                </q-item-section>
-                <q-item-section avatar disabled>
-                  <q-item-label>{{ identity.uptime }} days</q-item-label>
+                <q-item-section>
+                  <div align="center" class="text-subtitle2 text-vgreen text-uppercase">
+                    <div content-style="font-size: 12px"> daily reward countdown </div>
+                    <div content-style="font-size: 24px" class="text-weight-bolder">
+                      {{ daily_reward_calculation_countdown.hours }} : {{daily_reward_calculation_countdown.minutes}} : {{daily_reward_calculation_countdown.seconds}}
+                    </div>
+                  </div>
                 </q-item-section>
               </q-item>
               <q-separator color="vseparator" />
@@ -165,6 +167,12 @@
               <q-separator color="vseparator" v-if="parseFloat(status.cpu) == 0" />
               <q-item align="center">
                 <q-item-section>
+                    <div align="center" class="text-subtitle2  text-uppercase">
+                      <div content-style="font-size: 12px"> available for retrieval </div>
+                      <div content-style="font-size: 24px" class="text-weight-bolder">
+                        {{identity.availble_for_retrieval}}
+                      </div>
+                    </div>
                   <q-btn label="Retreive reward" outline rounded color="vgreen" class="q-my-xs" @click="retreiveReward()" />
                 </q-item-section>
               </q-item>
@@ -605,7 +613,13 @@ export default {
         sortBy: 'rank',
         descending: false
       },
-      script: ''
+      script: '',
+      now: '',
+      daily_reward_calculation_countdown: {
+        hours: '',
+        minutes: '',
+        seconds: ''
+      }
     }
   },
   computed: {
@@ -623,14 +637,21 @@ export default {
     },
     registered_nodes: function () {
       return this.$store.getters.getRegisteredNodes
+    },
+    daily_reward_next_calculation: function () {
+      return this.$store.getters.getDailyRewardNextCalculation
     }
   },
   mounted () {
+    // to load countdown faster call getRewardHistoryData firstly
+    this.$configManager.getRewardHistoryData()
+    this.$configManager.getAvailbleForRetrieval(this.identity.accountName)
+    this.int1 = setInterval(() => this.updateNow(), 1000)
+    this.int2 = setInterval(() => this.updateDailyRewardCountdown(), 1000)
+    this.int3 = setInterval(() => this.$configManager.getAvailbleForRetrieval(this.identity.accountName), 15000)
     this.version = this.$utils.getVersion()
-    this.$configManager.accountAdded(this.identity.accountName)
     this.$configManager.accountRegistered(this.identity.accountName)
     this.$configManager.accountRun(this.identity.accountName)
-    this.$configManager.getUserUptime(this.identity.accountName)
     // TODO: not implemented yet
     this.$store.commit('setEarned', '0.0000')
     this.$store.state.status.time = this.$utils.getTime()
@@ -665,8 +686,30 @@ export default {
     // clearInterval(this.m4)
     clearInterval(this.m5)
     clearInterval(this.m6)
+    clearInterval(this.m7)
+    clearInterval(this.int1)
+    clearInterval(this.int2)
+    clearInterval(this.int3)
   },
   methods: {
+    updateNow () {
+      this.now = Math.round(new Date().getTime() / 1000)
+    },
+    updateDailyRewardCountdown () {
+      let timeDelta = this.daily_reward_next_calculation > this.now ? this.daily_reward_next_calculation - this.now : 0
+      let hours = Math.floor(timeDelta / (60 * 60))
+      let minutes = Math.floor((timeDelta - hours * 60 * 60) / 60)
+      let seconds = timeDelta - hours * 60 * 60 - minutes * 60
+
+      function timeUnitToStr (unit) {
+        return unit < 10 ? '0' + unit : unit.toString()
+      }
+      this.daily_reward_calculation_countdown = {
+        hours: timeUnitToStr(hours),
+        minutes: timeUnitToStr(minutes),
+        seconds: timeUnitToStr(seconds)
+      }
+    },
     getInstallScript () {
       this.script = require('../assets/install.sh').default // eslint-disable-line global-require
     },
@@ -695,6 +738,7 @@ export default {
       this.voting_list = []
       this.getInfoRare()
       this.getInfoOften()
+      this.$configManager.getRewardHistoryData()
     },
     getInfoRare () {
       this.getListOfNodes()
@@ -759,7 +803,6 @@ export default {
         .retreiveReward(this.identity.accountName)
         .then(() => {
           setTimeout(() => this.getInfoOften(), 3000)
-          setTimeout(() => this.$configManager.getUserUptime(this.identity.accountName), 3000)
         })
         .catch(error => {
           throw new Error(error)

src/store/index.js

@@ -15,7 +15,8 @@ function initialState () {
     method: '',
     identity: {
       voted_i: [],
-      voted_for: []
+      voted_for: [],
+      availble_for_retrieval: '0.0000 VTX'
     },
     status: {
       accountAdded: false,
@@ -25,7 +26,8 @@ function initialState () {
       cpu: '',
       net: ''
     },
-    registered_nodes: []
+    registered_nodes: [],
+    daily_reward_next_calculation: 0
   }
 }
 
@@ -37,7 +39,8 @@ const store = new Vuex.Store({
     getMethod: state => state.method,
     getIdentity: state => state.identity,
     getStatus: state => state.status,
-    getRegisteredNodes: state => state.registered_nodes
+    getRegisteredNodes: state => state.registered_nodes,
+    getDailyRewardNextCalculation: state => state.daily_reward_next_calculation
   },
   mutations: {
     logout: state => {
@@ -67,12 +70,15 @@ const store = new Vuex.Store({
     setTotalRanks: (state, total) => {
       state.identity.totalRanks = total
     },
-    setUptime: (state, uptime) => {
-      state.identity.uptime = uptime
+    setDailyRewardNextCalculation: (state, timestamp) => {
+      state.daily_reward_next_calculation = timestamp
     },
     setEarned: (state, earned) => {
       state.identity.earned = earned
     },
+    setAvailbleForRetrieval: (state, amount) => {
+      state.identity.availble_for_retrieval = amount
+    },
     setVotedI: (state, data) => {
       state.identity.voted_i = data
     },

src/util/configManager.js

@@ -95,22 +95,6 @@ function logout () {
   })
 }
 
-async function accountAdded (accountName) {
-  try {
-    const result = await Vue.prototype.$rpc.getTable('vdexdposvote', 'vdexdposvote', 'producers')
-    let nodeStats = result.find(row => row.account === accountName)
-    if (nodeStats) {
-      store.commit('setAccountAdded', true)
-    } else {
-      userResult('Account: ' + accountName + ' is not added to the distribution contract. Please Add it.')
-      store.commit('setAccountAdded', false)
-    }
-  } catch (error) {
-    userError(error, 'Account add status check')
-    throw error
-  }
-}
-
 async function accountRegistered (accountName) {
   try {
     const result = await Vue.prototype.$rpc.getTable('vdexdposvote', 'vdexdposvote', 'producers')
@@ -137,7 +121,7 @@ async function accountRun (accountName) {
       userResult(
         'Account: ' +
           accountName +
-          ' is not initialized for getting the reward in the distribution contract. Please Init it by clicking the Run button.'
+          ' is not initialized for getting the reward in the voting contract. Please Init it by clicking the Run button.'
       )
       store.commit('setAccountRun', false)
     }
@@ -147,17 +131,28 @@ async function accountRun (accountName) {
   }
 }
 
-async function getUserUptime (accountName) {
+async function getRewardHistoryData () {
   try {
-    const result = await Vue.prototype.$rpc.getTable('vtxdistribut', 'vtxdistribut', 'uptimes')
-    let nodeStats = result.find(row => row.account === accountName)
-    if (nodeStats) {
-      store.commit('setUptime', Math.floor((store.state.status.time - nodeStats.last_timestamp) / 86400))
-    } else {
-      store.commit('setUptime', 0)
-    }
+    const result = await Vue.prototype.$rpc.getTable('vtxdistribut', 'vtxdistribut', 'rewardhistor')
+    let dailyRewardData = result.find(row => row.reward_id === 1)
+    let dailyRewardLastCalculation = dailyRewardData.last_timestamp
+    const rewardRules = await Vue.prototype.$rpc.getTable('vtxdistribut', 'vtxdistribut', 'rewards')
+    let dailyRewardRules = rewardRules.find(row => row.reward_id === 1)
+    let dailyRewardPeriod = dailyRewardRules.reward_period
+    let dailyRewardNextCalculation = dailyRewardLastCalculation && dailyRewardPeriod ? dailyRewardLastCalculation + dailyRewardPeriod : 0
+    store.commit('setDailyRewardNextCalculation', dailyRewardNextCalculation)
+  } catch (error) {
+    userError(error, 'Get last reward calculation timestaml')
+  }
+}
+
+async function getAvailbleForRetrieval (accountName) {
+  try {
+    const result = await Vue.prototype.$rpc.getTable('vtxdistribut', accountName, 'nodereward')
+    let amount = result.map(item => parseFloat(item.amount)).reduce((a, b) => a + b, 0).toFixed(4)
+    store.commit('setAvailbleForRetrieval', `${amount} VTX`)
   } catch (error) {
-    userError(error, 'Get uptime action')
+    userError(error, 'Get availble for retrieval')
   }
 }
 
@@ -281,20 +276,17 @@ async function registerNode (accountName, options) {
   )
 }
 async function retreiveReward (accountName) {
-  var jobs = new Int32Array()
-  jobs[0] = 1
-  jobs[1] = 2
   await Vue.prototype.$eos.transaction(
     'vtxdistribut',
-    'uptime',
+    'getreward',
     accountName,
     {
-      account: accountName,
-      job_ids: jobs
+      node: accountName
     },
     "Transaction 'Retreive reward' executed successfully!",
     'Retreive reward action'
   )
+  await getAvailbleForRetrieval()
 }
 
 async function vote (votingList, accountName) {
@@ -405,10 +397,8 @@ export {
   configStore,
   hasConfig,
   logout,
-  accountAdded,
   accountRegistered,
   accountRun,
-  getUserUptime,
   getUserRank,
   getUserBalance,
   getUserResources,
@@ -418,5 +408,7 @@ export {
   registerNode,
   retreiveReward,
   vote,
-  login
+  login,
+  getRewardHistoryData,
+  getAvailbleForRetrieval
 }