ensure share price is calculated for operators who had a received rewards but not in next operator set

Author: vedhavyas

crates/pallet-domains/src/benchmarking.rs

@@ -490,7 +490,7 @@ mod benchmarks {
 
         #[block]
         {
-            do_finalize_domain_epoch_staking::<T>(domain_id)
+            do_finalize_domain_epoch_staking::<T>(domain_id, Default::default())
                 .expect("finalize domain staking should success");
         }
 
@@ -676,7 +676,7 @@ mod benchmarks {
         let (operator_owner, operator_id) =
             register_helper_operator::<T>(domain_id, T::MinNominatorStake::get());
 
-        do_finalize_domain_epoch_staking::<T>(domain_id)
+        do_finalize_domain_epoch_staking::<T>(domain_id, Default::default())
             .expect("finalize domain staking should success");
 
         #[extrinsic_call]
@@ -712,7 +712,7 @@ mod benchmarks {
             operator_id,
             withdraw_amount * 3u32.into(),
         ));
-        do_finalize_domain_epoch_staking::<T>(domain_id)
+        do_finalize_domain_epoch_staking::<T>(domain_id, Default::default())
             .expect("finalize domain staking should success");
 
         // Add one more withdraw and deposit to the previous epoch
@@ -726,7 +726,7 @@ mod benchmarks {
             operator_id,
             withdraw_amount,
         ));
-        do_finalize_domain_epoch_staking::<T>(domain_id)
+        do_finalize_domain_epoch_staking::<T>(domain_id, Default::default())
             .expect("finalize domain staking should success");
 
         #[extrinsic_call]
@@ -757,7 +757,7 @@ mod benchmarks {
             operator_id,
             staking_amount,
         ));
-        do_finalize_domain_epoch_staking::<T>(domain_id)
+        do_finalize_domain_epoch_staking::<T>(domain_id, Default::default())
             .expect("finalize domain staking should success");
 
         // Request `w` withdrawals in different epochs, this removes slightly under (or exactly)
@@ -768,7 +768,7 @@ mod benchmarks {
                 operator_id,
                 (T::MinOperatorStake::get() / w.into()).into(),
             ));
-            do_finalize_domain_epoch_staking::<T>(domain_id)
+            do_finalize_domain_epoch_staking::<T>(domain_id, Default::default())
                 .expect("finalize domain staking should success");
         }
         // Withdraw all the remaining stake.
@@ -790,7 +790,7 @@ mod benchmarks {
             operator_id,
             remaining_stake,
         ));
-        do_finalize_domain_epoch_staking::<T>(domain_id)
+        do_finalize_domain_epoch_staking::<T>(domain_id, Default::default())
             .expect("finalize domain staking should success");
 
         let current_domain_epoch_index = DomainStakingSummary::<T>::get(domain_id)

crates/pallet-domains/src/nominator_position.rs

@@ -302,6 +302,7 @@ mod tests {
             setup.operator_stake,
             setup.min_nominator_stake,
             pair.public(),
+            Default::default(),
             BTreeMap::from_iter(vec![(
                 setup.nominator_account,
                 (setup.nominator_free_balance, setup.nominator_stake),

crates/pallet-domains/src/staking.rs

@@ -1442,7 +1442,7 @@ pub(crate) fn do_mark_invalid_bundle_authors<T: Config>(
     Ok(())
 }
 
-fn mark_invalid_bundle_author<T: Config>(
+pub(crate) fn mark_invalid_bundle_author<T: Config>(
     operator_id: OperatorId,
     er_hash: ReceiptHashFor<T>,
     stake_summary: &mut StakingSummary<OperatorId, BalanceOf<T>>,
@@ -1573,7 +1573,7 @@ pub(crate) mod tests {
         OperatorRewardSource,
     };
     use sp_runtime::traits::Zero;
-    use sp_runtime::{PerThing, Perquintill};
+    use sp_runtime::{PerThing, Percent, Perquintill};
     use std::collections::{BTreeMap, BTreeSet};
     use std::ops::RangeInclusive;
     use std::vec;
@@ -1592,6 +1592,7 @@ pub(crate) mod tests {
         operator_stake: BalanceOf<Test>,
         minimum_nominator_stake: BalanceOf<Test>,
         signing_key: OperatorPublicKey,
+        nomination_tax: Percent,
         mut nominators: BTreeMap<NominatorId<Test>, (BalanceOf<Test>, BalanceOf<Test>)>,
     ) -> (OperatorId, OperatorConfig<BalanceOf<Test>>) {
         nominators.insert(operator_account, (operator_free_balance, operator_stake));
@@ -1640,7 +1641,7 @@ pub(crate) mod tests {
         let operator_config = OperatorConfig {
             signing_key,
             minimum_nominator_stake,
-            nomination_tax: Default::default(),
+            nomination_tax,
         };
 
         let res = Domains::register_operator(
@@ -1741,6 +1742,7 @@ pub(crate) mod tests {
                 operator_total_stake,
                 AI3,
                 pair.public(),
+                Default::default(),
                 BTreeMap::new(),
             );
 
@@ -1826,6 +1828,7 @@ pub(crate) mod tests {
                 operator_total_stake,
                 10 * AI3,
                 pair.public(),
+                Default::default(),
                 BTreeMap::from_iter(vec![(
                     nominator_account,
                     (nominator_free_balance, nominator_total_stake),
@@ -1929,6 +1932,7 @@ pub(crate) mod tests {
                 operator_stake,
                 AI3,
                 pair.public(),
+                Default::default(),
                 BTreeMap::new(),
             );
 
@@ -2084,6 +2088,7 @@ pub(crate) mod tests {
                 operator_stake,
                 minimum_nominator_stake,
                 pair.public(),
+                Default::default(),
                 nominators,
             );
 
@@ -3244,6 +3249,7 @@ pub(crate) mod tests {
                 operator_stake,
                 10 * AI3,
                 pair.public(),
+                Default::default(),
                 BTreeMap::from_iter(nominators),
             );
 
@@ -3372,6 +3378,7 @@ pub(crate) mod tests {
                 operator_stake,
                 10 * AI3,
                 pair.public(),
+                Default::default(),
                 BTreeMap::from_iter(nominators),
             );
 
@@ -3538,6 +3545,7 @@ pub(crate) mod tests {
                 operator_stake,
                 10 * AI3,
                 pair.public(),
+                Default::default(),
                 BTreeMap::from_iter(nominators),
             );
 
@@ -3700,6 +3708,7 @@ pub(crate) mod tests {
                 10 * AI3,
                 pair_1.public(),
                 Default::default(),
+                Default::default(),
             );
 
             let (operator_id_2, _) = register_operator(
@@ -3710,6 +3719,7 @@ pub(crate) mod tests {
                 10 * AI3,
                 pair_2.public(),
                 Default::default(),
+                Default::default(),
             );
 
             let (operator_id_3, _) = register_operator(
@@ -3720,6 +3730,7 @@ pub(crate) mod tests {
                 10 * AI3,
                 pair_3.public(),
                 Default::default(),
+                Default::default(),
             );
 
             do_finalize_domain_current_epoch::<Test>(domain_id).unwrap();
@@ -3830,6 +3841,7 @@ pub(crate) mod tests {
                 operator_total_stake,
                 AI3,
                 pair.public(),
+                Default::default(),
                 BTreeMap::default(),
             );
 
@@ -3919,6 +3931,7 @@ pub(crate) mod tests {
                 operator_stake,
                 10 * AI3,
                 pair.public(),
+                Default::default(),
                 BTreeMap::from_iter(nominators),
             );
 
@@ -3978,6 +3991,7 @@ pub(crate) mod tests {
                 operator_stake,
                 10 * AI3,
                 pair.public(),
+                Default::default(),
                 BTreeMap::from_iter(nominators),
             );