Merge branch 'feature-shared-BP' of https://github.com/AElfProject/AElf…

… into feature-shared-BP
AElfProject · Jan 21, 2019 · b3957c5 · b3957c5
2 parents 4a283aa + d11a134
commit b3957c5
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/AElf.Node/Consensus/DPoS.cs b/AElf.Node/Consensus/DPoS.cs
@@ -176,6 +176,7 @@ private Miners Miners
                     {
                         return _minersManager.GetMiners(0).Result;
                     }
+
                     return _helper.GetCurrentMiners();
                 }
 
@@ -187,6 +188,13 @@ private Miners Miners
                     return miners;
                 }
 
+                var basicMiners = _minersManager.GetMiners(1).Result;
+                var mainchainLatestTermNumber = basicMiners.MainchainLatestTermNumber;
+                if (mainchainLatestTermNumber != 0)
+                {
+                    return _minersManager.GetMiners(mainchainLatestTermNumber).Result;
+                }
+
                 return _minersManager.GetMiners(1).Result;
             }
         }