Baseline bug fix (FIP-0081)

actors/miner/src/ext.rs

@@ -101,6 +101,8 @@ pub mod power {
         pub quality_adj_power: StoragePower,
         pub pledge_collateral: TokenAmount,
         pub quality_adj_power_smoothed: FilterEstimate,
+        pub epochs_since_ramp_start: i64,
+        pub ramp_duration_epochs: u64,
     }
     #[derive(Serialize_tuple, Deserialize_tuple)]
     pub struct EnrollCronEventParams {

actors/miner/src/lib.rs

@@ -816,6 +816,8 @@ impl Actor {
             network_baseline: rew.this_epoch_baseline_power,
             circulating_supply,
             epoch_reward: rew.this_epoch_reward_smoothed,
+            epochs_since_ramp_start: pwr.ramp_start_epoch - rt.curr_epoch(),
+            ramp_duration_epochs: pwr.ramp_duration_epochs,
         };
 
         /*
@@ -1913,6 +1915,8 @@ impl Actor {
             network_baseline: rew.this_epoch_baseline_power,
             circulating_supply,
             epoch_reward: rew.this_epoch_reward_smoothed,
+            epochs_since_ramp_start: pwr.ramp_start_epoch - rt.curr_epoch(),
+            ramp_duration_epochs: pwr.ramp_duration_epochs,
         };
         activate_new_sector_infos(
             rt,
@@ -1981,11 +1985,14 @@ impl Actor {
             activate_sectors_deals(rt, &data_activations, compute_commd)?;
         let successful_activations = batch_return.successes(&precommited_sectors);
 
+        // TODO: total_power is not requested here, so how can we get ramp_start_epoch & ramp_duration_epochs ?
         let pledge_inputs = NetworkPledgeInputs {
             network_qap: params.quality_adj_power_smoothed,
             network_baseline: params.reward_baseline_power,
             circulating_supply: rt.total_fil_circ_supply(),
             epoch_reward: params.reward_smoothed,
+            // TODO: set ramp_start_epoch
+            // TODO: set ramp_duration_epochs
         };
         activate_new_sector_infos(
             rt,
@@ -3902,6 +3909,8 @@ where
         network_baseline: rew.this_epoch_baseline_power,
         circulating_supply,
         epoch_reward: rew.this_epoch_reward_smoothed,
+        epochs_since_ramp_start: pwr.ramp_start_epoch - rt.curr_epoch(),
+        ramp_duration_epochs: pwr.ramp_duration_epochs,
     };
     let mut power_delta = PowerPair::zero();
     let mut pledge_delta = TokenAmount::zero();
@@ -4098,6 +4107,7 @@ fn update_existing_sector_info(
             &pledge_inputs.epoch_reward,
             &pledge_inputs.network_qap,
             &pledge_inputs.circulating_supply,
+            &pledge_inputs.ramp_duration_epochs,
         ),
     );
     new_sector_info
@@ -5219,6 +5229,7 @@ fn activate_new_sector_infos(
                 &pledge_inputs.epoch_reward,
                 &pledge_inputs.network_qap,
                 &pledge_inputs.circulating_supply,
+                &pledge_inputs.ramp_duration_epochs,
             );
 
             deposit_to_unlock += pci.pre_commit_deposit.clone();
@@ -5631,6 +5642,8 @@ struct NetworkPledgeInputs {
     pub network_baseline: StoragePower,
     pub circulating_supply: TokenAmount,
     pub epoch_reward: FilterEstimate,
+    pub epochs_since_ramp_start: i64,
+    pub ramp_duration_epochs: u64,
 }
 
 // Note: probably better to push this one level down into state

actors/miner/src/monies.rs

@@ -75,6 +75,8 @@ pub const TERMINATION_LIFETIME_CAP: ChainEpoch = 140;
 // Multiplier of whole per-winner rewards for a consensus fault penalty.
 const CONSENSUS_FAULT_FACTOR: u64 = 5;
 
+const FIXED_POINT_FACTOR: i64 = 1000; // 3 decimal places
+
 /// The projected block reward a sector would earn over some period.
 /// Also known as "BR(t)".
 /// BR(t) = ProjectedRewardFraction(t) * SectorQualityAdjustedPower
@@ -255,6 +257,8 @@ pub fn initial_pledge_for_power(
     reward_estimate: &FilterEstimate,
     network_qa_power_estimate: &FilterEstimate,
     circulating_supply: &TokenAmount,
+    epochs_since_ramp_start: i64,
+    ramp_duration_epochs: u64
 ) -> TokenAmount {
     let ip_base = expected_reward_for_power_clamped_at_atto_fil(
         reward_estimate,
@@ -267,10 +271,30 @@ pub fn initial_pledge_for_power(
     let lock_target_denom = LOCK_TARGET_FACTOR_DENOM;
     let pledge_share_num = qa_power;
     let network_qa_power = network_qa_power_estimate.estimate();
-    let pledge_share_denom = cmp::max(cmp::max(&network_qa_power, baseline_power), qa_power);
+
+    // Compute gamma based on current_epoch
+    let mut gamma = FIXED_POINT_FACTOR; // Initialize as 1000
+    if epochs_since_ramp_start > 0 {
+        if epochs_since_ramp_start as u64 < ramp_duration_epochs {
+            let reduction = (300 * FIXED_POINT_FACTOR) / ramp_duration_epochs; // 0.3 as fixed-point
+            gamma -= reduction;
+        } else {
+            gamma = 700; // 0.7 as fixed-point
+        }
+    }
+
     let additional_ip_num = lock_target_num * pledge_share_num;
-    let additional_ip_denom = pledge_share_denom * lock_target_denom;
-    let additional_ip = additional_ip_num.div_floor(&additional_ip_denom);
+
+    let pledge_share_denom_baseline = cmp::max(cmp::max(&network_qa_power, baseline_power), qa_power);
+    let pledge_share_denom_simple = cmp::max(network_qa_power, qa_power);
+
+    let additional_ip_denom_baseline = pledge_share_denom_baseline * lock_target_denom;
+    let additional_ip_baseline = additional_ip_num.div_floor(&additional_ip_denom_baseline);
+    let additional_ip_denom_simple = pledge_share_denom_simple * lock_target_denom;
+    let additional_ip_simple = additional_ip_num.div_floor(&additional_ip_denom_simple);
+
+    // convex combination of simple and baseline pledge
+    let additional_ip = (additional_ip_baseline * gamma + additional_ip_simple * (FIXED_POINT_FACTOR - gamma)) / FIXED_POINT_FACTOR;
 
     let nominal_pledge = ip_base + TokenAmount::from_atto(additional_ip);
     let pledge_cap = TokenAmount::from_atto(INITIAL_PLEDGE_MAX_PER_BYTE.atto() * qa_power);

actors/power/src/lib.rs

@@ -267,6 +267,7 @@ impl Actor {
             quality_adj_power: st.this_epoch_quality_adj_power,
             pledge_collateral: st.this_epoch_pledge_collateral,
             quality_adj_power_smoothed: st.this_epoch_qa_power_smoothed,
+            epochs_since_ramp_start: st.epochs_since_ramp_start,
         })
     }
 

actors/power/src/state.rs

@@ -68,6 +68,9 @@ pub struct State {
     /// Number of miners having proven the minimum consensus power.
     pub miner_above_min_power_count: i64,
 
+    pub ramp_start_epoch: i64,
+    pub ramp_duration_epochs: u64,
+
     /// A queue of events to be triggered by cron, indexed by epoch.
     pub cron_event_queue: Cid, // Multimap, (HAMT[ChainEpoch]AMT[CronEvent]