Feat/cap discount mining

.github/workflows/bitcoin-tests.yml

@@ -72,6 +72,9 @@ jobs:
           - tests::epoch_205::test_cost_limit_switch_version205
           - tests::epoch_205::test_exact_block_costs
           - tests::epoch_205::bigger_microblock_streams_in_2_05
+          - tests::epoch_21::transition_fixes_utxo_chaining
+          - tests::epoch_21::transition_adds_burn_block_height
+          - tests::epoch_21::transition_caps_discount_mining_upside
     steps:
       - uses: actions/checkout@v2
       - name: Download docker image

src/burnchains/burnchain.rs

@@ -120,6 +120,11 @@ impl BurnchainStateTransition {
         let mut block_commits: Vec<LeaderBlockCommitOp> = vec![];
         let mut user_burns: Vec<UserBurnSupportOp> = vec![];
         let mut accepted_ops = Vec::with_capacity(block_ops.len());
+        let epoch = SortitionDB::get_stacks_epoch(sort_tx, parent_snapshot.block_height + 1)?
+            .expect(&format!(
+                "FATAL: no epoch known at burn height {}",
+                parent_snapshot.block_height + 1
+            ));
 
         assert!(Burnchain::ops_are_sorted(block_ops));
 
@@ -240,6 +245,7 @@ impl BurnchainStateTransition {
         // calculate the burn distribution from these operations.
         // The resulting distribution will contain the user burns that match block commits
         let burn_dist = BurnSamplePoint::make_min_median_distribution(
+            epoch.epoch_id,
             windowed_block_commits,
             windowed_missed_commits,
             burn_blocks,
@@ -461,10 +467,22 @@ impl Burnchain {
         (effective_height % (self.pox_constants.reward_cycle_length as u64)) == 1
     }
 
-    pub fn reward_cycle_to_block_height(&self, reward_cycle: u64) -> u64 {
+    pub fn static_reward_cycle_to_block_height(
+        reward_cycle: u64,
+        first_block_ht: u64,
+        reward_cycle_len: u64,
+    ) -> u64 {
         // NOTE: the `+ 1` is because the height of the first block of a reward cycle is mod 1, not
         // mod 0.
-        self.first_block_height + reward_cycle * (self.pox_constants.reward_cycle_length as u64) + 1
+        first_block_ht + reward_cycle * reward_cycle_len + 1
+    }
+
+    pub fn reward_cycle_to_block_height(&self, reward_cycle: u64) -> u64 {
+        Self::static_reward_cycle_to_block_height(
+            reward_cycle,
+            self.first_block_height,
+            self.pox_constants.reward_cycle_length.into(),
+        )
     }
 
     /// Returns the active reward cycle at the given burn block height
@@ -1834,6 +1852,7 @@ pub mod tests {
             memo: vec![0x80],
 
             burn_fee: 12345,
+            destroyed: 0,
             input: (Txid([0; 32]), 0),
             apparent_sender: BurnchainSigner {
                 public_keys: vec![StacksPublicKey::from_hex(
@@ -1874,6 +1893,7 @@ pub mod tests {
             memo: vec![0x80],
 
             burn_fee: 12345,
+            destroyed: 0,
             input: (Txid([0; 32]), 0),
             apparent_sender: BurnchainSigner {
                 public_keys: vec![StacksPublicKey::from_hex(
@@ -1914,6 +1934,7 @@ pub mod tests {
             memo: vec![0x80],
 
             burn_fee: 23456,
+            destroyed: 0,
             input: (Txid([0; 32]), 0),
             apparent_sender: BurnchainSigner {
                 public_keys: vec![StacksPublicKey::from_hex(
@@ -2232,7 +2253,7 @@ pub mod tests {
 
             let burn_total = block_ops_124.iter().fold(0u64, |mut acc, op| {
                 let bf = match op {
-                    BlockstackOperationType::LeaderBlockCommit(ref op) => op.burn_fee,
+                    BlockstackOperationType::LeaderBlockCommit(ref op) => op.total_spend(),
                     BlockstackOperationType::UserBurnSupport(ref op) => 0,
                     _ => 0,
                 };
@@ -2480,6 +2501,7 @@ pub mod tests {
                     memo: vec![i],
 
                     burn_fee: i as u64,
+                    destroyed: 0,
                     input: (Txid([0; 32]), 0),
                     apparent_sender: BurnchainSigner {
                         public_keys: vec![StacksPublicKey::from_hex(

src/chainstate/burn/db/processing.rs

@@ -20,6 +20,7 @@
 use crate::burnchains::{
     Burnchain, BurnchainBlockHeader, BurnchainStateTransition, Error as BurnchainError,
 };
+use crate::chainstate::burn::db::sortdb::SortitionDB;
 use crate::chainstate::burn::db::sortdb::{InitialMiningBonus, SortitionHandleTx};
 use crate::chainstate::burn::operations::{
     leader_block_commit::{MissedBlockCommit, RewardSetInfo},
@@ -114,6 +115,12 @@ impl<'a> SortitionHandleTx<'a> {
     ) -> Result<(BlockSnapshot, BurnchainStateTransition), BurnchainError> {
         let this_block_height = block_header.block_height;
         let this_block_hash = block_header.block_hash.clone();
+        let epoch = SortitionDB::get_stacks_epoch(self, parent_snapshot.block_height + 1)?.expect(
+            &format!(
+                "FATAL: no epoch known at burn height {}",
+                parent_snapshot.block_height + 1
+            ),
+        );
 
         // make the burn distribution, and in doing so, identify the user burns that we'll keep
         let state_transition = BurnchainStateTransition::from_block_ops(self, burnchain, parent_snapshot, this_block_ops, missed_commits)
@@ -128,7 +135,9 @@ impl<'a> SortitionHandleTx<'a> {
             .fold(Some(0u64), |acc, op| {
                 if let Some(acc) = acc {
                     let bf = match op {
-                        BlockstackOperationType::LeaderBlockCommit(ref op) => op.burn_fee,
+                        BlockstackOperationType::LeaderBlockCommit(ref op) => {
+                            op.sortition_spend(epoch.epoch_id)
+                        }
                         BlockstackOperationType::UserBurnSupport(ref op) => op.burn_fee,
                         _ => 0,
                     };
@@ -425,6 +434,7 @@ mod tests {
 
             commit_outs: vec![],
             burn_fee: 12345,
+            destroyed: 0,
             input: (Txid([0; 32]), 0),
             apparent_sender: BurnchainSigner {
                 public_keys: vec![StacksPublicKey::from_hex(