Merge pull request #777 from MinterTeam/dev

hot-fix
MinterTeam · Apr 12, 2022 · d6a917c · d6a917c
2 parents 48c921b + 99aac78
commit d6a917c
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/coreV2/minter/blockchain.go b/coreV2/minter/blockchain.go
@@ -432,10 +432,13 @@ func (blockchain *Blockchain) EndBlock(req abciTypes.RequestEndBlock) abciTypes.
 		emission := blockchain.appDB.Emission()
 		if emission == nil {
 			blockchain.appDB.SetEmission(blockchain.rewardsCounter.GetBeforeBlock(height - 1))
-			reward = blockchain.rewardsCounter.GetRewardForBlock(height)
 		} else if emission.Cmp(blockchain.rewardsCounter.TotalEmissionBig()) == -1 {
 			reward, _ = blockchain.stateDeliver.App.Reward()
-			heightIsMaxIfIssueIsOverOrNotDynamic = height
+			if reward == nil {
+				reward = blockchain.rewardsCounter.GetRewardForBlock(height)
+			} else {
+				heightIsMaxIfIssueIsOverOrNotDynamic = height
+			}
 		}
 
 	} else if h == height {