Replace incorrect derivation of oldest_receipt_number with LatestConfirmedDomainBlockNumber

This commit also remove the block_tree_pruning_depth runtime api, which is
unused and also unnecessary

Signed-off-by: linning <[email protected]>

Author: NingLin-P

Cargo.lock

@@ -4,7 +4,7 @@ use crate::pallet::StateRoots;
 use crate::{
     BalanceOf, BlockTree, BlockTreeNodes, Config, ConsensusBlockHash, DomainBlockNumberFor,
     DomainHashingFor, ExecutionInbox, ExecutionReceiptOf, HeadReceiptExtended, HeadReceiptNumber,
-    InboxedBundleAuthor, ReceiptHashFor,
+    InboxedBundleAuthor, LatestConfirmedDomainBlockNumber, ReceiptHashFor,
 };
 use codec::{Decode, Encode};
 use frame_support::{ensure, PalletError};
@@ -106,15 +106,15 @@ pub(crate) fn execution_receipt_type<T: Config>(
     let receipt_number = execution_receipt.domain_block_number;
     let head_receipt_number = HeadReceiptNumber::<T>::get(domain_id);
     let next_receipt_number = head_receipt_number.saturating_add(One::one());
+    let latest_confirmed_domain_block_number =
+        LatestConfirmedDomainBlockNumber::<T>::get(domain_id);
 
     match receipt_number.cmp(&next_receipt_number) {
         Ordering::Greater => ReceiptType::Rejected(RejectedReceiptType::InFuture),
         Ordering::Equal => ReceiptType::Accepted(AcceptedReceiptType::NewHead),
         Ordering::Less => {
-            // Reject receipt that already pruned/confirmed
-            let oldest_receipt_number =
-                head_receipt_number.saturating_sub(T::BlockTreePruningDepth::get());
-            if receipt_number < oldest_receipt_number {
+            // Reject receipt that already confirmed
+            if receipt_number <= latest_confirmed_domain_block_number {
                 return ReceiptType::Rejected(RejectedReceiptType::Pruned);
             }
 

crates/pallet-domains/src/block_tree.rs

@@ -59,7 +59,7 @@ use sp_domains_fraud_proof::verification::{
     verify_invalid_domain_extrinsics_root_fraud_proof, verify_invalid_state_transition_fraud_proof,
     verify_valid_bundle_fraud_proof,
 };
-use sp_runtime::traits::{CheckedSub, Hash, Header, One, Zero};
+use sp_runtime::traits::{Hash, Header, One, Zero};
 use sp_runtime::{RuntimeAppPublic, SaturatedConversion, Saturating};
 use sp_std::boxed::Box;
 use sp_std::collections::btree_map::BTreeMap;
@@ -1877,11 +1877,6 @@ impl<T: Config> Pallet<T> {
         }
     }
 
-    /// Returns the block tree pruning depth.
-    pub fn block_tree_pruning_depth() -> DomainBlockNumberFor<T> {
-        T::BlockTreePruningDepth::get()
-    }
-
     /// Returns the domain block limit of the given domain.
     pub fn domain_block_limit(domain_id: DomainId) -> Option<DomainBlockLimit> {
         DomainRegistry::<T>::get(domain_id).map(|domain_obj| DomainBlockLimit {
@@ -1897,10 +1892,10 @@ impl<T: Config> Pallet<T> {
             return true;
         }
 
+        // Start from the oldest non-confirmed ER to the head domain number
+        let mut to_check =
+            LatestConfirmedDomainBlockNumber::<T>::get(domain_id).saturating_add(One::one());
         let head_number = HeadDomainNumber::<T>::get(domain_id);
-        let mut to_check = head_number
-            .checked_sub(&T::BlockTreePruningDepth::get())
-            .unwrap_or(Zero::zero());
 
         while to_check <= head_number {
             if !ExecutionInbox::<T>::iter_prefix_values((domain_id, to_check)).all(|digests| {

crates/pallet-domains/src/lib.rs

@@ -997,9 +997,6 @@ sp_api::decl_runtime_apis! {
         /// Returns the block number of oldest execution receipt.
         fn oldest_receipt_number(domain_id: DomainId) -> Option<HeaderNumberFor<DomainHeader>>;
 
-        /// Returns the block tree pruning depth.
-        fn block_tree_pruning_depth() -> HeaderNumberFor<DomainHeader>;
-
         /// Returns the domain block limit of the given domain.
         fn domain_block_limit(domain_id: DomainId) -> Option<DomainBlockLimit>;
 

crates/sp-domains/src/lib.rs

@@ -1036,10 +1036,6 @@ impl_runtime_apis! {
             Domains::oldest_receipt_number(domain_id)
         }
 
-        fn block_tree_pruning_depth() -> DomainNumber {
-            Domains::block_tree_pruning_depth()
-        }
-
         fn domain_block_limit(domain_id: DomainId) -> Option<sp_domains::DomainBlockLimit> {
             Domains::domain_block_limit(domain_id)
         }

crates/subspace-runtime/src/lib.rs

@@ -1221,10 +1221,6 @@ impl_runtime_apis! {
             Domains::oldest_receipt_number(domain_id)
         }
 
-        fn block_tree_pruning_depth() -> DomainNumber {
-            Domains::block_tree_pruning_depth()
-        }
-
         fn domain_block_limit(domain_id: DomainId) -> Option<sp_domains::DomainBlockLimit> {
             Domains::domain_block_limit(domain_id)
         }