db: Add delayed blocks pruning

bin/node/cli/benches/block_production.rs

@@ -75,6 +75,7 @@ fn new_node(tokio_handle: Handle) -> node_cli::service::NewFullBase {
 		trie_cache_maximum_size: Some(64 * 1024 * 1024),
 		state_pruning: Some(PruningMode::ArchiveAll),
 		blocks_pruning: BlocksPruning::KeepAll,
+		delayed_canonicalization: Some(32),
 		chain_spec: spec,
 		wasm_method: WasmExecutionMethod::Compiled {
 			instantiation_strategy: WasmtimeInstantiationStrategy::PoolingCopyOnWrite,

bin/node/cli/benches/transaction_pool.rs

@@ -69,6 +69,7 @@ fn new_node(tokio_handle: Handle) -> node_cli::service::NewFullBase {
 		trie_cache_maximum_size: Some(64 * 1024 * 1024),
 		state_pruning: Some(PruningMode::ArchiveAll),
 		blocks_pruning: BlocksPruning::KeepAll,
+		delayed_canonicalization: Some(32),
 		chain_spec: spec,
 		wasm_method: WasmExecutionMethod::Interpreted,
 		// NOTE: we enforce the use of the native runtime to make the errors more debuggable

bin/node/testing/src/bench.rs

@@ -393,6 +393,7 @@ impl BenchDb {
 			state_pruning: Some(PruningMode::ArchiveAll),
 			source: database_type.into_settings(dir.into()),
 			blocks_pruning: sc_client_db::BlocksPruning::KeepAll,
+			delayed_canonicalization: None,
 		};
 		let task_executor = TaskExecutor::new();
 

client/cli/src/commands/chain_info_cmd.rs

@@ -77,6 +77,7 @@ impl ChainInfoCmd {
 			state_pruning: config.state_pruning.clone(),
 			source: config.database.clone(),
 			blocks_pruning: config.blocks_pruning,
+			delayed_canonicalization: config.delayed_canonicalization,
 		};
 		let backend = sc_service::new_db_backend::<B>(db_config)?;
 		let info: ChainInfo<B> = backend.blockchain().info().into();

client/cli/src/config.rs

@@ -42,6 +42,10 @@ pub(crate) const NODE_NAME_MAX_LENGTH: usize = 64;
 /// Default sub directory to store network config.
 pub(crate) const DEFAULT_NETWORK_CONFIG_PATH: &str = "network";
 
+/// The blocks that were supposed to get pruned at the finalization N
+/// will get pruned at N + 32.
+pub(crate) const DELAYED_CANONICALIZATION: u32 = 32;
+
 /// The recommended open file descriptor limit to be configured for the process.
 const RECOMMENDED_OPEN_FILE_DESCRIPTOR_LIMIT: u64 = 10_000;
 
@@ -248,6 +252,17 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 			.unwrap_or_else(|| Ok(Default::default()))
 	}
 
+	/// Get the delayed canonicalization mode.
+	///
+	/// By default this is retrieved from `delayed_canonicalization` if it is available.
+	/// Otherwise the mode is active.
+	fn delayed_canonicalization(&self) -> Result<Option<u32>> {
+		Ok(self
+			.pruning_params()
+			.map(|x| x.delayed_canonicalization())
+			.unwrap_or(Some(DELAYED_CANONICALIZATION)))
+	}
+
 	/// Get the block pruning mode.
 	///
 	/// By default this is retrieved from `block_pruning` if it is available. Otherwise its
@@ -530,6 +545,7 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 			trie_cache_maximum_size: self.trie_cache_maximum_size()?,
 			state_pruning: self.state_pruning()?,
 			blocks_pruning: self.blocks_pruning()?,
+			delayed_canonicalization: self.delayed_canonicalization()?,
 			wasm_method: self.wasm_method()?,
 			wasm_runtime_overrides: self.wasm_runtime_overrides(),
 			execution_strategies: self.execution_strategies(is_dev, is_validator)?,

client/cli/src/params/pruning_params.rs

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::error;
+use crate::{config::DELAYED_CANONICALIZATION, error};
 use clap::Args;
 use sc_service::{BlocksPruning, PruningMode};
 
@@ -40,6 +40,14 @@ pub struct PruningParams {
 	/// NOTE: only finalized blocks are subject for removal!
 	#[arg(alias = "keep-blocks", long, value_name = "COUNT")]
 	pub blocks_pruning: Option<String>,
+	/// Specify the delayed canonicalization of blocks.
+	///
+	/// The blocks that were supposed to get pruned at the finalization N
+	/// will get pruned after a number of finalizations.
+	///
+	/// This option is enabled by default.
+	#[clap(alias = "delayed-pruning", long)]
+	pub delayed_canonicalization: Option<bool>,
 }
 
 impl PruningParams {
@@ -76,4 +84,13 @@ impl PruningParams {
 			None => Ok(BlocksPruning::KeepFinalized),
 		}
 	}
+
+	/// Get the block delayed canonicalization value from the parameters.
+	pub fn delayed_canonicalization(&self) -> Option<u32> {
+		if self.delayed_canonicalization.unwrap_or(true) {
+			Some(DELAYED_CANONICALIZATION)
+		} else {
+			None
+		}
+	}
 }

client/db/benches/state_access.rs

@@ -122,6 +122,7 @@ fn create_backend(config: BenchmarkConfig, temp_dir: &TempDir) -> Backend<Block>
 		state_pruning: Some(PruningMode::ArchiveAll),
 		source: DatabaseSource::ParityDb { path },
 		blocks_pruning: BlocksPruning::KeepAll,
+		delayed_canonicalization: None,
 	};
 
 	Backend::new(settings, 100).expect("Creates backend")