Merge pull request #242 from MinterTeam/fix

v0.19.3
MinterTeam · Apr 20, 2019 · 3fdad93 · 3fdad93
2 parents d50fcf3 + a9927e3
commit 3fdad93
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.19.3
+
+BUG FIXES
+
+- [core] Fix set candidate remainder issue
+
 ## 0.19.2
 
 BUG FIXES

diff --git a/core/state/statedb.go b/core/state/statedb.go
@@ -1009,7 +1009,9 @@ func (s *StateDB) PayRewards() {
 				})
 			}
 
-			validator.AccumReward.Set(remainder)
+			if s.height < 41556 {
+				validator.AccumReward.Set(remainder)
+			}
 		}
 	}
 

diff --git a/version/version.go b/version/version.go
@@ -4,14 +4,14 @@ package version
 const (
 	Maj = "0"
 	Min = "19"
-	Fix = "2"
+	Fix = "3"
 
 	AppVer = 4
 )
 
 var (
 	// Must be a string because scripts like dist.sh read this file.
-	Version = "0.19.2"
+	Version = "0.19.3"
 
 	// GitCommit is the current HEAD set using ldflags.
 	GitCommit string
-Original file line number
+Diff line change
@@ Expand Up / @@ -1009,7 +1009,9 @@ func (s *StateDB) PayRewards() { @@
     				})
     			}
-    			validator.AccumReward.Set(remainder)
+    			if s.height < 41556 {
+    				validator.AccumReward.Set(remainder)
+    			}
     		}
     	}
@@ Expand Down @@