Optimize NextConsensus (neo-project#2015)

ShawnYun · Jan 8, 2021 · aba20e0 · aba20e0
1 parent edbf999
commit aba20e0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/neo/Consensus/ConsensusContext.cs b/src/neo/Consensus/ConsensusContext.cs
@@ -377,7 +377,10 @@ public void Reset(byte viewNumber)
                 {
                     PrevHash = Snapshot.CurrentBlockHash,
                     Index = Snapshot.Height + 1,
-                    NextConsensus = Blockchain.GetConsensusAddress(NativeContract.NEO.ComputeNextBlockValidators(Snapshot))
+                    NextConsensus = Blockchain.GetConsensusAddress(
+                        NativeContract.NEO.ShouldRefreshCommittee(Snapshot.Height + 1) ?
+                        NativeContract.NEO.ComputeNextBlockValidators(Snapshot) :
+                        NativeContract.NEO.GetNextBlockValidators(Snapshot))
                 };
                 var pv = Validators;
                 Validators = NativeContract.NEO.GetNextBlockValidators(Snapshot);

diff --git a/src/neo/SmartContract/Native/Tokens/NeoToken.cs b/src/neo/SmartContract/Native/Tokens/NeoToken.cs
@@ -94,7 +94,7 @@ private static void CheckCandidate(StoreView snapshot, StorageKey key, Candidate
                 snapshot.Storages.Delete(key);
         }
 
-        private bool ShouldRefreshCommittee(uint height) => height % (ProtocolSettings.Default.CommitteeMembersCount + ProtocolSettings.Default.ValidatorsCount) == 0;
+        public bool ShouldRefreshCommittee(uint height) => height % (ProtocolSettings.Default.CommitteeMembersCount + ProtocolSettings.Default.ValidatorsCount) == 0;
 
         internal override void Initialize(ApplicationEngine engine)
         {