Merge pull request #3723 from autonomys/fix_bundle_count

fix bundle count for operators

Author: vedhavyas

crates/pallet-domains/src/lib.rs

@@ -1217,7 +1217,9 @@ mod pallet {
             let receipt_block_number = *receipt.domain_block_number();
 
             // increment the operator bundle count in the epoch.
-            OperatorBundleCountInEpoch::<T>::mutate(operator_id, |c| c.saturating_add(1));
+            OperatorBundleCountInEpoch::<T>::mutate(operator_id, |c| {
+                *c = c.saturating_add(1);
+            });
 
             #[cfg(not(feature = "runtime-benchmarks"))]
             let mut actual_weight = T::WeightInfo::submit_bundle();

crates/pallet-domains/src/tests.rs

@@ -4,16 +4,17 @@ use crate::mock::pallet_mock_version_store::MockPreviousBundleAndExecutionReceip
 use crate::mock::{
     Balance, Block, BlockNumber, BlockTreePruningDepth, DOMAIN_ID, Domains, Hash,
     MockBundleAndExecutionReceiptVersion, MockBundleVersion, MockExecutionReceiptVersion,
-    RuntimeCall, System, Test,
+    RuntimeCall, StakeEpochDuration, System, Test,
 };
+use crate::pallet::DomainStakingSummary;
 use crate::runtime_registry::ScheduledRuntimeUpgrade;
 use crate::staking_epoch::do_finalize_domain_current_epoch;
 use crate::{
     self as pallet_domains, BalanceOf, BlockTree, BlockTreeNodes, BundleError, Config,
     ConsensusBlockHash, DomainBlockNumberFor, DomainHashingFor, DomainRegistry,
     DomainRuntimeUpgradeRecords, DomainRuntimeUpgrades, ExecutionInbox, ExecutionReceiptOf,
-    FraudProofError, HeadDomainNumber, HeadReceiptNumber, NextDomainId, OperatorConfig,
-    RawOrigin as DomainOrigin, RuntimeRegistry, ScheduledRuntimeUpgrades,
+    FraudProofError, HeadDomainNumber, HeadReceiptNumber, NextDomainId, OperatorBundleCountInEpoch,
+    OperatorConfig, RawOrigin as DomainOrigin, RuntimeRegistry, ScheduledRuntimeUpgrades,
 };
 use domain_runtime_primitives::opaque::Header as DomainHeader;
 use domain_runtime_primitives::{BlockNumber as DomainBlockNumber, DEFAULT_EVM_CHAIN_ID};
@@ -635,6 +636,42 @@ fn test_basic_fraud_proof_processing() {
     }
 }
 
+#[test]
+fn test_bundle_count_increments() {
+    let creator = 0u128;
+    let operator = 0u64;
+    let epoch_duration = StakeEpochDuration::get();
+    let mut ext = new_test_ext_with_extensions();
+    ext.execute_with(|| {
+        let domain_id = register_genesis_domain(creator, 1);
+        // extend block until epoch duration
+        // Bundle count for operator must be equal to number of block extended
+        let receipt = extend_block_tree_from_zero(domain_id, operator, epoch_duration);
+        let epoch_index = DomainStakingSummary::<Test>::get(domain_id)
+            .unwrap()
+            .current_epoch_index;
+
+        assert_eq!(
+            OperatorBundleCountInEpoch::<Test>::get(operator),
+            // -1 here since first receipt is genesis and is created at the time of domain
+            // instantiation
+            epoch_duration as u64 - 1
+        );
+
+        // extend blocks to trigger epoch transition and should
+        // reset operator bundle count.
+        // + 2 here since extend block will extend one block and initialize another block.
+        extend_block_tree(domain_id, operator, epoch_duration + 2, receipt);
+        assert_eq!(OperatorBundleCountInEpoch::<Test>::get(operator), 0);
+        assert_eq!(
+            DomainStakingSummary::<Test>::get(domain_id)
+                .unwrap()
+                .current_epoch_index,
+            epoch_index + 1
+        );
+    });
+}
+
 fn schedule_domain_runtime_upgrade<T: Config>(
     runtime_id: RuntimeId,
     scheduled_at: BlockNumberFor<T>,

crates/subspace-runtime/src/lib.rs

@@ -131,7 +131,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: Cow::Borrowed("subspace"),
     impl_name: Cow::Borrowed("subspace"),
     authoring_version: 0,
-    spec_version: 7,
+    spec_version: 8,
     impl_version: 0,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 1,