Merge pull request #3144 from stacks-network/fix/microblock-fees-3140

Fix/microblock fees

Author: jcnelson

src/chainstate/stacks/db/accounts.rs

@@ -33,6 +33,8 @@ use clarity::vm::types::*;
 
 use crate::types::chainstate::{StacksAddress, StacksBlockId};
 
+use crate::core::StacksEpochId;
+
 #[derive(Debug, Clone, PartialEq)]
 pub struct MinerReward {
     pub address: StacksAddress,
@@ -873,6 +875,7 @@ impl StacksChainState {
     /// not the miner, for reporting the microblock stream fork.
     fn calculate_miner_reward(
         mainnet: bool,
+        evaluated_epoch: StacksEpochId,
         participant: &MinerPaymentSchedule,
         miner: &MinerPaymentSchedule,
         users: &Vec<MinerPaymentSchedule>,
@@ -946,7 +949,7 @@ impl StacksChainState {
                     )
                 } else {
                     // users that helped a miner that reported a poison-microblock get nothing
-                    (StacksAddress::burn_address(mainnet), coinbase_reward, false)
+                    (StacksAddress::burn_address(mainnet), 0, false)
                 }
             } else {
                 // no poison microblock reported
@@ -963,12 +966,16 @@ impl StacksChainState {
                     } else {
                         0
                     },
-                    // TODO: this is wrong, per #3140.  It should be
-                    // `participant.streamed_tx_fees_produced()`, since
-                    // `participant.tx_fees_streamed` contains the sum of the microblock
-                    // transaction fees that `participant` confirmed (and thus `participant`'s
-                    // parent produced).
-                    parent.streamed_tx_fees_produced(),
+                    if evaluated_epoch < StacksEpochId::Epoch21 {
+                        // this is wrong, per #3140.  It should be
+                        // `participant.streamed_tx_fees_produced()`, since
+                        // `participant.tx_fees_streamed` contains the sum of the microblock
+                        // transaction fees that `participant` confirmed (and thus `participant`'s
+                        // parent produced).  But we're stuck with it for earlier epochs.
+                        parent.streamed_tx_fees_produced()
+                    } else {
+                        participant.streamed_tx_fees_produced()
+                    },
                     if !punished {
                         participant.streamed_tx_fees_confirmed()
                     } else {
@@ -1016,6 +1023,7 @@ impl StacksChainState {
     /// well as an info struct about where the rewards took place on the chain.
     pub fn find_mature_miner_rewards(
         clarity_tx: &mut ClarityTx,
+        sortdb_conn: &Connection,
         tip: &StacksHeaderInfo,
         mut latest_matured_miners: Vec<MinerPaymentSchedule>,
         parent_miner: MinerPaymentSchedule,
@@ -1044,6 +1052,15 @@ impl StacksChainState {
             from_parent_block_consensus_hash: parent_miner.consensus_hash.clone(),
         };
 
+        // what epoch was the parent miner's block evaluated in?
+        let evaluated_snapshot =
+            SortitionDB::get_block_snapshot_consensus(sortdb_conn, &parent_miner.consensus_hash)?
+                .expect("FATAL: no snapshot for evaluated block");
+
+        let evaluated_epoch =
+            SortitionDB::get_stacks_epoch(sortdb_conn, evaluated_snapshot.block_height)?
+                .expect("FATAL: no epoch for evaluated block");
+
         // was this block penalized for mining a forked microblock stream?
         // If so, find the principal that detected the poison, and reward them instead.
         let poison_recipient_opt =
@@ -1063,6 +1080,7 @@ impl StacksChainState {
         // calculate miner reward
         let (parent_miner_reward, miner_reward) = StacksChainState::calculate_miner_reward(
             mainnet,
+            evaluated_epoch.epoch_id,
             &miner,
             &miner,
             &users,
@@ -1075,6 +1093,7 @@ impl StacksChainState {
         for user_reward in users.iter() {
             let (parent_reward, reward) = StacksChainState::calculate_miner_reward(
                 mainnet,
+                evaluated_epoch.epoch_id,
                 user_reward,
                 &miner,
                 &users,
@@ -1102,6 +1121,7 @@ mod test {
     use crate::chainstate::stacks::index::*;
     use crate::chainstate::stacks::Error;
     use crate::chainstate::stacks::*;
+    use crate::core::StacksEpochId;
     use clarity::vm::costs::ExecutionCost;
     use stacks_common::util::hash::*;
 
@@ -1378,6 +1398,7 @@ mod test {
 
         let (parent_reward, miner_reward) = StacksChainState::calculate_miner_reward(
             false,
+            StacksEpochId::Epoch2_05,
             &participant,
             &participant,
             &vec![],
@@ -1412,6 +1433,7 @@ mod test {
 
         let (parent_miner_1, reward_miner_1) = StacksChainState::calculate_miner_reward(
             false,
+            StacksEpochId::Epoch2_05,
             &miner,
             &miner,
             &vec![user.clone()],
@@ -1420,6 +1442,7 @@ mod test {
         );
         let (parent_user_1, reward_user_1) = StacksChainState::calculate_miner_reward(
             false,
+            StacksEpochId::Epoch2_05,
             &user,
             &miner,
             &vec![user.clone()],
@@ -1460,6 +1483,7 @@ mod test {
 
         let (parent_reward, miner_reward) = StacksChainState::calculate_miner_reward(
             false,
+            StacksEpochId::Epoch2_05,
             &participant,
             &participant,
             &vec![],

src/chainstate/stacks/db/blocks.rs

@@ -5002,7 +5002,7 @@ impl StacksChainState {
         chainstate_tx: &'b mut ChainstateTx,
         clarity_instance: &'a mut ClarityInstance,
         burn_dbconn: &'b dyn BurnStateDB,
-        conn: &Connection,
+        conn: &Connection, // connection to the sortition DB
         chain_tip: &StacksHeaderInfo,
         burn_tip: BurnchainHeaderHash,
         burn_tip_height: u32,
@@ -5077,6 +5077,7 @@ impl StacksChainState {
 
         let matured_miner_rewards_opt = match StacksChainState::find_mature_miner_rewards(
             &mut clarity_tx,
+            conn,
             &chain_tip,
             latest_matured_miners,
             matured_miner_parent,