Merge pull request #241 from MinterTeam/dev

Rollback changes
MinterTeam · Apr 18, 2019 · d50fcf3 · d50fcf3
2 parents 3219bcb + 47ef7e8
commit d50fcf3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/core/minter/minter.go b/core/minter/minter.go
@@ -266,8 +266,9 @@ func (app *Blockchain) EndBlock(req abciTypes.RequestEndBlock) abciTypes.Respons
 		vals[i].AccumReward.Add(vals[i].AccumReward, r)
 	}
 
-	// add remainder to total slashed
-	app.stateDeliver.AddTotalSlashed(remainder)
+	// add remainder to last validator
+	lastValidator := vals[len(vals)-1]
+	lastValidator.AccumReward.Add(lastValidator.AccumReward, remainder)
 
 	stateValidators.SetData(vals)
 	app.stateDeliver.SetStateValidators(stateValidators)

diff --git a/core/state/statedb.go b/core/state/statedb.go
@@ -1009,7 +1009,7 @@ func (s *StateDB) PayRewards() {
 				})
 			}
 
-			s.AddTotalSlashed(remainder)
+			validator.AccumReward.Set(remainder)
 		}
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -1009,7 +1009,7 @@ func (s *StateDB) PayRewards() { @@
     				})
     			}
-    			s.AddTotalSlashed(remainder)
+    			validator.AccumReward.Set(remainder)
     		}
     	}
@@ Expand Down @@