Merge pull request #4227 from zhangsoledad/zhangsoledad/fix-dummy-blo…

…ck-reward fix: dummy block reward
nervosnetwork · Nov 13, 2023 · d07b58a · d07b58a
2 parents 1bebc3d + ce66490
commit d07b58a
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/spec/src/consensus.rs b/spec/src/consensus.rs
@@ -824,16 +824,15 @@ impl Consensus {
                     epoch_duration_in_milliseconds,
                 } => {
                     if self.permanent_difficulty() {
+                        let next_epoch_length = (self.epoch_duration_target() + MIN_BLOCK_INTERVAL
+                            - 1)
+                            / MIN_BLOCK_INTERVAL;
                         let primary_epoch_reward =
                             self.primary_epoch_reward_of_next_epoch(&epoch).as_u64();
                         let block_reward =
-                            Capacity::shannons(primary_epoch_reward / epoch.length());
+                            Capacity::shannons(primary_epoch_reward / next_epoch_length);
                         let remainder_reward =
-                            Capacity::shannons(primary_epoch_reward % epoch.length());
-
-                        let next_epoch_length = (self.epoch_duration_target() + MIN_BLOCK_INTERVAL
-                            - 1)
-                            / MIN_BLOCK_INTERVAL;
+                            Capacity::shannons(primary_epoch_reward % next_epoch_length);
 
                         let dummy_epoch_ext = epoch
                             .clone()