Merge pull request #256 from thanhson1085/master

call reward job only at checkpoint
BuildOnViction · Oct 29, 2018 · 893daf7 · 893daf7
2 parents 3d8b7da + 602714e
commit 893daf7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/crawl.js b/crawl.js
@@ -164,8 +164,12 @@ function watchNewBlock () {
             try {
                 let blk = await chain.eth.getBlock('latest')
                 await updateSigners(blk)
-                q.create('reward', { block: blk })
-                    .priority('high').removeOnComplete(true).save()
+                let epoch = parseInt(config.get('blockchain.epoch'))
+                let blockNumber = blk.number
+                if (blockNumber % epoch === 0) {
+                    q.create('reward', { block: blk })
+                        .priority('high').removeOnComplete(true).save()
+                }
             } catch (e) {
                 console.error(e)
             }

diff --git a/queues/reward.js b/queues/reward.js
@@ -15,11 +15,9 @@ consumer.task = async function (job, done) {
     let epoch = parseInt(config.get('blockchain.epoch'))
     let blockNumber = parseInt(block.number)
 
-    if (blockNumber % epoch !== 0) {
-        return done()
-    }
-
     try {
+        console.log('Cal reward', blockNumber, epoch)
+
         let validator = await Validator.deployed()
         let bs = await BlockSigner.deployed()
 
@@ -49,7 +47,7 @@ consumer.task = async function (job, done) {
 
         let signers = (sn || {}).signers || []
 
-        console.log('Reward masternodes', signers)
+        console.log('Reward masternodes', blockNumber, blockNumber / epoch, signers)
 
         let totalReward = config.get('blockchain.reward') // TOMO
         let mnRewardRate = config.get('blockchain.masternodeRewardRate')
@@ -146,7 +144,7 @@ consumer.task = async function (job, done) {
         await Promise.all(map)
     } catch (e) {
         console.log('ERROR Reward', e)
-        done(e)
+        done()
     }
 
     done()