A lot of dependency wiring to make it feature gated.

bin/node/cli/Cargo.toml

@@ -163,4 +163,7 @@ runtime-benchmarks = [
 	"node-runtime/runtime-benchmarks",
 	"frame-benchmarking-cli",
 ]
-runtime-upgrade-dry-run = []
+runtime-upgrade-dry-run = [
+	"node-runtime/runtime-upgrade-dry-run",
+	"dry-run-runtime-upgrade-cli",
+]

bin/node/runtime/Cargo.toml

@@ -43,6 +43,7 @@ frame-support = { version = "2.0.0", default-features = false, path = "../../../
 frame-system = { version = "2.0.0", default-features = false, path = "../../../frame/system" }
 frame-system-benchmarking = { version = "2.0.0", default-features = false, path = "../../../frame/system/benchmarking", optional = true }
 frame-system-rpc-runtime-api = { version = "2.0.0", default-features = false, path = "../../../frame/system/rpc/runtime-api/" }
+frame-dry-run-runtime-upgrade = { default-features = false, path = "../../../frame/dry-run-runtime-upgrade", optional = true }
 pallet-assets = { version = "2.0.0", default-features = false, path = "../../../frame/assets" }
 pallet-authority-discovery = { version = "2.0.0", default-features = false, path = "../../../frame/authority-discovery" }
 pallet-authorship = { version = "2.0.0", default-features = false, path = "../../../frame/authorship" }
@@ -83,8 +84,6 @@ pallet-transaction-payment = { version = "2.0.0", default-features = false, path
 pallet-transaction-payment-rpc-runtime-api = { version = "2.0.0", default-features = false, path = "../../../frame/transaction-payment/rpc/runtime-api/" }
 pallet-vesting = { version = "2.0.0", default-features = false, path = "../../../frame/vesting" }
 
-frame-dry-run-runtime-upgrade = { default-features = false, path = "../../../frame/dry-run-runtime-upgrade" }
-
 [build-dependencies]
 substrate-wasm-builder = { version = "3.0.0", path = "../../../utils/wasm-builder" }
 
@@ -189,3 +188,7 @@ runtime-benchmarks = [
 	"frame-system-benchmarking",
 	"hex-literal",
 ]
+runtime-upgrade-dry-run = [
+	"frame-executive/runtime-upgrade-dry-run",
+	"frame-dry-run-runtime-upgrade",
+]

bin/node/runtime/src/lib.rs

@@ -1332,27 +1332,23 @@ impl_runtime_apis! {
 
 	#[cfg(feature = "runtime-upgrade-dry-run")]
 	impl frame_dry_run_runtime_upgrade::DryRunRuntimeUpgrade<Block> for Runtime {
-		fn dry_run_runtime_upgrade(pallet: &str) -> Weight {
+		fn dry_run_runtime_upgrade(target: frame_dry_run_runtime_upgrade::Target) -> Weight {
 			frame_support::debug::RuntimeLogger::init();
-
 			frame_support::debug::info!("!!! DRYRUN MIGRATION UP AHEAD !!!");
-			let weight = Executive::dry_run_runtime_upgrade();
-			frame_support::debug::info!("!!! DRYRUN MIGRATION DONE !!!");
 
-			weight
+			let weight = match target {
+				frame_dry_run_runtime_upgrade::Target::All => {
+					frame_support::debug::info!("Dru-running all on-runtime-upgrades.");
+					Executive::dry_run_runtime_upgrade()
+				},
+				frame_dry_run_runtime_upgrade::Target::Pallet(name) => {
+					let name = sp_std::str::from_utf8(&name).unwrap();
+					frame_support::debug::info!("Dru-running on-runtime-upgrade of {}", name);
+					todo!();
+				}
+			};
 
-			// \migration_bot pallet:staking state:polkadot
-			// pseudo code:
-			// match config.pallet {
-			// 	"System" => {
-			// 		<Pallet as OnRuntimeUpgrade>::pre_upgrade();
-			// 		<Pallet as OnRuntimeUpgrade>::on_runtime_upgrade();
-			// 		<Pallet as OnRuntimeUpgrade>::post_upgrade();
-			// 	},
-			// 	"All" => {
-			// 		Executive::dry_run_runtime_upgrade()
-			// 	}
-			// }
+			weight
 		}
 	}
 

frame/dry-run-runtime-upgrade/src/lib.rs

@@ -19,11 +19,11 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use codec::Encode;
+use codec::{Decode, Encode};
 use sp_std::prelude::*;
 
 /// Possible targets for dry-run runtime upgrade.
-#[derive(Debug, Encode)]
+#[derive(Debug, Encode, Decode)]
 pub enum Target {
 	/// All pallets.
 	All,
@@ -35,7 +35,11 @@ pub enum Target {
 impl sp_std::str::FromStr for Target {
 	type Err = &'static str;
 	fn from_str(s: &str) -> Result<Self, Self::Err> {
-		Ok(if s.to_lowercase() == "All" { Target::All } else { Target::Pallet(s.encode()) })
+		Ok(if s.to_lowercase() == "All" {
+			Target::All
+		} else {
+			Target::Pallet(s.as_bytes().to_vec())
+		})
 	}
 }
 

frame/executive/Cargo.toml

@@ -47,4 +47,6 @@ std = [
 	"sp-tracing/std",
 	"sp-std/std",
 ]
-runtime-upgrade-dry-run = []
+runtime-upgrade-dry-run = [
+	"frame-support/runtime-upgrade-dry-run"
+]

utils/frame/dry-run-runtime-upgrade/cli/src/lib.rs

@@ -88,7 +88,20 @@ impl DryRunRuntimeUpgradeCmd {
 		let heap_pages = Some(1024);
 		let executor = NativeExecutor::<ExecDispatch>::new(wasm_method, heap_pages, 2);
 
-		let ext = remote_externalities::Builder::new().inject(&[(code_key, code)]).build().await;
+		let ext = {
+			use remote_externalities::{Builder, Mode, CacheConfig, OfflineConfig, OnlineConfig};
+			let builder = match &self.state {
+				State::Snap(file_path) => Builder::new().mode(Mode::Offline(OfflineConfig {
+					cache: CacheConfig { name: file_path.into(), ..Default::default() },
+				})),
+				State::Live(http_uri) => Builder::new().mode(Mode::Online(OnlineConfig {
+					uri: http_uri.into(),
+					..Default::default()
+				})),
+			};
+
+			builder.inject(&[(code_key, code)]).build().await
+		};
 
 		let consumed_weight = StateMachine::<_, _, NumberFor<B>, _>::new(
 			&ext.backend,
@@ -105,6 +118,7 @@ impl DryRunRuntimeUpgradeCmd {
 		)
 		.execute(strategy.into())
 		.unwrap();
+		// TODO: if MethodNotFound, then it must be wrong feature.
 
 		let weight = <u64 as Decode>::decode(&mut &*consumed_weight).unwrap();
 		log::info!(

utils/frame/dry-run-runtime-upgrade/remote-externalities/src/lib.rs

@@ -166,18 +166,23 @@ pub enum Mode {
 /// A cache config must be present.
 #[derive(Clone)]
 pub struct OfflineConfig {
-	cache: CacheConfig,
+	/// The configuration of the cache file to use. It must be present.
+	pub cache: CacheConfig,
 }
 
 /// Configuration of the online execution.
 ///
 /// A cache config may be present and will be written to in that case.
 #[derive(Clone)]
 pub struct OnlineConfig {
-	uri: String,
-	at: Option<Hash>,
-	cache: Option<CacheConfig>,
-	modules: Vec<String>,
+	/// The HTTP uri to use.
+	pub uri: String,
+	/// The block number at which to connect. Will be latest finalized head if not provided.
+	pub at: Option<Hash>,
+	/// An optional cache file to WRITE to, not for reading. Not cached if set to `None`.
+	pub cache: Option<CacheConfig>,
+	/// The modules to scrape. If empty, entire chain state will be scraped.
+	pub modules: Vec<String>,
 }
 
 impl Default for OnlineConfig {
@@ -194,8 +199,12 @@ impl Default for OnlineConfig {
 /// Configuration of the cache.
 #[derive(Clone)]
 pub struct CacheConfig {
-	name: String,
-	directory: String,
+	// TODO: I could mix these two into one filed, but I think separate is better bc one can be
+	// configurable while one not.
+	/// File name.
+	pub name: String,
+	/// Base directory.
+	pub directory: String,
 }
 
 impl Default for CacheConfig {
@@ -355,6 +364,11 @@ impl Builder {
 			}
 		};
 
+		info!(
+			target: LOG_TARGET,
+			"extending externalities with {} manually injected keys",
+			self.inject.len()
+		);
 		base_kv.extend(self.inject.clone());
 		base_kv
 	}
@@ -389,7 +403,6 @@ impl Builder {
 		info!(target: LOG_TARGET, "injecting a total of {} keys", kv.len());
 		for (k, v) in kv {
 			let (k, v) = (k.0, v.0);
-			trace!(target: LOG_TARGET, "injecting {:?} -> {:?}", k.hex_display(), v.hex_display());
 			ext.insert(k, v);
 		}
 		ext