From f7b5b53eff3732572ba125ff021c2be57df5bad5 Mon Sep 17 00:00:00 2001 From: chungquantin <56880684+chungquantin@users.noreply.github.com> Date: Wed, 14 Aug 2024 17:33:10 +0700 Subject: [PATCH 1/2] fix: remove pov reclaim from testnet --- runtime/testnet/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/runtime/testnet/src/lib.rs b/runtime/testnet/src/lib.rs index 5d38a10f..36e5f710 100644 --- a/runtime/testnet/src/lib.rs +++ b/runtime/testnet/src/lib.rs @@ -101,7 +101,6 @@ pub type SignedExtra = ( frame_system::CheckNonce, frame_system::CheckWeight, pallet_transaction_payment::ChargeTransactionPayment, - cumulus_primitives_storage_weight_reclaim::StorageWeightReclaim, ); /// Unchecked extrinsic type as expected by this runtime. From 2352a5033450e9ecfb5dfc0f0c6c6f2a18e74c92 Mon Sep 17 00:00:00 2001 From: chungquantin <56880684+chungquantin@users.noreply.github.com> Date: Thu, 15 Aug 2024 12:36:46 +0700 Subject: [PATCH 2/2] chore: revert pov reclaim feature --- Cargo.lock | 19 ------------------- Cargo.toml | 1 - node/src/command.rs | 3 +-- node/src/service.rs | 8 ++------ runtime/devnet/Cargo.toml | 2 -- runtime/devnet/src/lib.rs | 1 - 6 files changed, 3 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 526a173f..29a91410 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2694,24 +2694,6 @@ dependencies = [ "sp-trie 32.0.0", ] -[[package]] -name = "cumulus-primitives-storage-weight-reclaim" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21d52a6f23cf094b01b33330e4f8d9a4c225620646cf0ad4e21ad299dddbe193" -dependencies = [ - "cumulus-primitives-core 0.10.0", - "cumulus-primitives-proof-size-hostfunction 0.5.0", - "docify", - "frame-support 31.0.0", - "frame-system 31.0.0", - "log", - "parity-scale-codec", - "scale-info", - "sp-runtime 34.0.0", - "sp-std", -] - [[package]] name = "cumulus-primitives-utility" version = "0.8.1" @@ -11562,7 +11544,6 @@ dependencies = [ "cumulus-pallet-xcmp-queue 0.10.0", "cumulus-primitives-aura 0.10.0", "cumulus-primitives-core 0.10.0", - "cumulus-primitives-storage-weight-reclaim", "cumulus-primitives-utility 0.10.0", "enumflags2", "env_logger 0.11.3", diff --git a/Cargo.toml b/Cargo.toml index db4a9b21..80723f7b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -153,7 +153,6 @@ cumulus-pallet-xcm = { version = "0.10.0", default-features = false } cumulus-pallet-xcmp-queue = { version = "0.10.0", default-features = false } cumulus-primitives-aura = { version = "0.10.0", default-features = false } cumulus-primitives-core = { version = "0.10.0", default-features = false } -cumulus-primitives-storage-weight-reclaim = { version = "1.0.0", default-features = false } cumulus-primitives-utility = { version = "0.10.0", default-features = false } emulated-integration-tests-common = { version = "6.0.0", default-features = false } pallet-collator-selection = { version = "12.0.1", default-features = false } diff --git a/node/src/command.rs b/node/src/command.rs index 27901ef0..dcda471f 100644 --- a/node/src/command.rs +++ b/node/src/command.rs @@ -1,6 +1,5 @@ use std::{net::SocketAddr, path::PathBuf}; -use cumulus_client_service::storage_proof_size::HostFunctions as ReclaimHostFunctions; use cumulus_primitives_core::ParaId; use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE}; use log::info; @@ -271,7 +270,7 @@ pub fn run() -> Result<()> { match cmd { BenchmarkCmd::Pallet(cmd) => if cfg!(feature = "runtime-benchmarks") { - runner.sync_run(|config| cmd.run::, ReclaimHostFunctions>(config)) + runner.sync_run(|config| cmd.run::, ()>(config)) } else { Err("Benchmarking wasn't enabled when building the node. \ You can enable it with `--features runtime-benchmarks`." diff --git a/node/src/service.rs b/node/src/service.rs index 79ea908f..e79877a8 100644 --- a/node/src/service.rs +++ b/node/src/service.rs @@ -44,10 +44,7 @@ use substrate_prometheus_endpoint::Registry; pub struct DevnetRuntimeExecutor; impl NativeExecutionDispatch for DevnetRuntimeExecutor { - type ExtendHostFunctions = ( - cumulus_client_service::storage_proof_size::HostFunctions, - frame_benchmarking::benchmarking::HostFunctions, - ); + type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions; fn dispatch(method: &str, data: &[u8]) -> Option> { pop_runtime_devnet::api::dispatch(method, data) @@ -134,11 +131,10 @@ where let executor = NativeElseWasmExecutor::::new_with_wasm_executor(wasm); let (client, backend, keystore_container, task_manager) = - sc_service::new_full_parts_record_import::( + sc_service::new_full_parts::( config, telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()), executor, - true, )?; let client = Arc::new(client); diff --git a/runtime/devnet/Cargo.toml b/runtime/devnet/Cargo.toml index 35183429..a6824acb 100644 --- a/runtime/devnet/Cargo.toml +++ b/runtime/devnet/Cargo.toml @@ -83,7 +83,6 @@ cumulus-pallet-xcmp-queue.workspace = true cumulus-primitives-aura.workspace = true cumulus-primitives-core.workspace = true cumulus-primitives-utility.workspace = true -cumulus-primitives-storage-weight-reclaim.workspace = true pallet-collator-selection.workspace = true parachains-common.workspace = true parachain-info.workspace = true @@ -104,7 +103,6 @@ std = [ "cumulus-pallet-xcmp-queue/std", "cumulus-primitives-aura/std", "cumulus-primitives-core/std", - "cumulus-primitives-storage-weight-reclaim/std", "cumulus-primitives-utility/std", "frame-benchmarking/std", "frame-executive/std", diff --git a/runtime/devnet/src/lib.rs b/runtime/devnet/src/lib.rs index 667d4ebd..913c38d1 100644 --- a/runtime/devnet/src/lib.rs +++ b/runtime/devnet/src/lib.rs @@ -101,7 +101,6 @@ pub type SignedExtra = ( frame_system::CheckNonce, frame_system::CheckWeight, pallet_transaction_payment::ChargeTransactionPayment, - cumulus_primitives_storage_weight_reclaim::StorageWeightReclaim, ); /// Unchecked extrinsic type as expected by this runtime.