difftreelog
feat try-runtime subcommand
in: master
7 files changed
node/cli/Cargo.tomldiffbeforeafterboth--- a/node/cli/Cargo.toml
+++ b/node/cli/Cargo.toml
@@ -22,6 +22,10 @@
git = "https://github.com/paritytech/substrate"
branch = "polkadot-v0.9.20"
+[dependencies.try-runtime-cli]
+git = 'https://github.com/paritytech/substrate.git'
+branch = 'polkadot-v0.9.17'
+
[dependencies.pallet-transaction-payment-rpc]
git = "https://github.com/paritytech/substrate"
branch = "polkadot-v0.9.20"
@@ -318,3 +322,4 @@
'unique-runtime/runtime-benchmarks',
'polkadot-service/runtime-benchmarks',
]
+try-runtime = []
node/cli/src/cli.rsdiffbeforeafterboth--- a/node/cli/src/cli.rs
+++ b/node/cli/src/cli.rs
@@ -55,6 +55,9 @@
/// The custom benchmark subcommmand benchmarking runtime pallets.
#[clap(subcommand)]
Benchmark(frame_benchmarking_cli::BenchmarkCmd),
+
+ /// Try runtime
+ TryRuntime(try_runtime_cli::TryRuntimeCmd),
}
/// Command for exporting the genesis state of the parachain
node/cli/src/command.rsdiffbeforeafterboth--- a/node/cli/src/command.rs
+++ b/node/cli/src/command.rs
@@ -49,6 +49,7 @@
use codec::Encode;
use cumulus_primitives_core::ParaId;
use cumulus_client_service::genesis::generate_genesis_block;
+use std::{future::Future, pin::Pin};
use log::info;
use polkadot_parachain::primitives::AccountIdConversion;
use sc_cli::{
@@ -413,6 +414,41 @@
Some(Subcommand::Benchmark(..)) => {
Err("benchmarking is only available with unique runtime enabled".into())
}
+ Some(Subcommand::TryRuntime(cmd)) => {
+ if cfg!(feature = "try-runtime") {
+ let runner = cli.create_runner(cmd)?;
+
+ // grab the task manager.
+ let registry = &runner
+ .config()
+ .prometheus_config
+ .as_ref()
+ .map(|cfg| &cfg.registry);
+ let task_manager =
+ sc_service::TaskManager::new(runner.config().tokio_handle.clone(), *registry)
+ .map_err(|e| format!("Error: {:?}", e))?;
+
+ runner.async_run(|config| -> Result<(Pin<Box<dyn Future<Output = _>>>, _)> {
+ Ok((
+ match config.chain_spec.runtime_id() {
+ #[cfg(feature = "unique-runtime")]
+ RuntimeId::Unique => Box::pin(cmd.run::<Block, UniqueRuntimeExecutor>(config)),
+
+ #[cfg(feature = "quartz-runtime")]
+ RuntimeId::Quartz => Box::pin(cmd.run::<Block, QuartzRuntimeExecutor>(config)),
+
+ RuntimeId::Opal => {
+ Box::pin(cmd.run::<Block, OpalRuntimeExecutor>(config))
+ }
+ RuntimeId::Unknown(chain) => return Err(no_runtime_err!(chain).into()),
+ },
+ task_manager,
+ ))
+ })
+ } else {
+ Err("Try-runtime must be enabled by `--features try-runtime`.".into())
+ }
+ }
None => {
let runner = cli.create_runner(&cli.run.normalize())?;
let collator_options = cli.run.collator_options();
runtime/common/src/runtime_apis.rsdiffbeforeafterboth--- a/runtime/common/src/runtime_apis.rs
+++ b/runtime/common/src/runtime_apis.rs
@@ -425,6 +425,19 @@
Ok(batches)
}
}
+
+ #[cfg(feature = "try-runtime")]
+ impl frame_try_runtime::TryRuntime<Block> for Runtime {
+ fn on_runtime_upgrade() -> (Weight, Weight) {
+ log::info!("try-runtime::on_runtime_upgrade unique-chain.");
+ let weight = Executive::try_runtime_upgrade().unwrap();
+ (weight, RuntimeBlockWeights::get().max_block)
+ }
+
+ fn execute_block_no_check(block: Block) -> Weight {
+ Executive::execute_block_no_check(block)
+ }
+ }
}
}
}
runtime/opal/Cargo.tomldiffbeforeafterboth--- a/runtime/opal/Cargo.toml
+++ b/runtime/opal/Cargo.toml
@@ -38,6 +38,11 @@
'sp-runtime/runtime-benchmarks',
'xcm-builder/runtime-benchmarks',
]
+try-runtime = [
+ 'frame-try-runtime',
+ 'frame-executive/try-runtime',
+ 'frame-system/try-runtime',
+]
std = [
'codec/std',
'cumulus-pallet-aura-ext/std',
@@ -46,6 +51,7 @@
'cumulus-pallet-xcmp-queue/std',
'cumulus-primitives-core/std',
'cumulus-primitives-utility/std',
+ 'frame-try-runtime/std',
'frame-executive/std',
'frame-support/std',
'frame-system/std',
@@ -121,6 +127,12 @@
optional = true
branch = "polkadot-v0.9.20"
+[dependencies.frame-try-runtime]
+default-features = false
+git = 'https://github.com/paritytech/substrate.git'
+optional = true
+branch = 'polkadot-v0.9.17'
+
[dependencies.frame-executive]
default-features = false
git = "https://github.com/paritytech/substrate"
@@ -375,6 +387,7 @@
# local dependencies
[dependencies]
+log = { version = "0.4.16", default-features = false }
unique-runtime-common = { path = "../common", default-features = false }
scale-info = { version = "2.0.1", default-features = false, features = [
"derive",
runtime/quartz/Cargo.tomldiffbeforeafterboth--- a/runtime/quartz/Cargo.toml
+++ b/runtime/quartz/Cargo.toml
@@ -38,6 +38,11 @@
'sp-runtime/runtime-benchmarks',
'xcm-builder/runtime-benchmarks',
]
+try-runtime = [
+ 'frame-try-runtime',
+ 'frame-executive/try-runtime',
+ 'frame-system/try-runtime',
+]
std = [
'codec/std',
'cumulus-pallet-aura-ext/std',
@@ -46,6 +51,7 @@
'cumulus-pallet-xcmp-queue/std',
'cumulus-primitives-core/std',
'cumulus-primitives-utility/std',
+ 'frame-try-runtime/std',
'frame-executive/std',
'frame-support/std',
'frame-system/std',
@@ -121,6 +127,12 @@
optional = true
branch = "polkadot-v0.9.20"
+[dependencies.frame-try-runtime]
+default-features = false
+git = 'https://github.com/paritytech/substrate.git'
+optional = true
+branch = 'polkadot-v0.9.17'
+
[dependencies.frame-executive]
default-features = false
git = "https://github.com/paritytech/substrate"
@@ -375,6 +387,7 @@
# local dependencies
[dependencies]
+log = { version = "0.4.16", default-features = false }
unique-runtime-common = { path = "../common", default-features = false }
scale-info = { version = "2.0.1", default-features = false, features = [
"derive",
runtime/unique/Cargo.tomldiffbeforeafterboth1################################################################################2# Package34[package]5authors = ['Unique Network <support@uniquenetwork.io>']6build = 'build.rs'7description = 'Unique Runtime'8edition = '2021'9homepage = 'https://unique.network'10license = 'GPLv3'11name = 'unique-runtime'12repository = 'https://github.com/UniqueNetwork/unique-chain'13version = '0.9.18'1415[package.metadata.docs.rs]16targets = ['x86_64-unknown-linux-gnu']1718[features]19default = ['std']20runtime-benchmarks = [21 'hex-literal',22 'frame-benchmarking',23 'frame-support/runtime-benchmarks',24 'frame-system-benchmarking',25 'frame-system/runtime-benchmarks',26 'pallet-ethereum/runtime-benchmarks',27 'pallet-evm-migration/runtime-benchmarks',28 'pallet-evm-coder-substrate/runtime-benchmarks',29 'pallet-balances/runtime-benchmarks',30 'pallet-timestamp/runtime-benchmarks',31 'pallet-common/runtime-benchmarks',32 'pallet-fungible/runtime-benchmarks',33 'pallet-refungible/runtime-benchmarks',34 'pallet-nonfungible/runtime-benchmarks',35 'pallet-unique/runtime-benchmarks',36 'pallet-inflation/runtime-benchmarks',37 'pallet-xcm/runtime-benchmarks',38 'sp-runtime/runtime-benchmarks',39 'xcm-builder/runtime-benchmarks',40]41try-runtime = [42 'frame-try-runtime',43 'frame-executive/try-runtime',44 'frame-system/try-runtime',45]46std = [47 'codec/std',48 'cumulus-pallet-aura-ext/std',49 'cumulus-pallet-parachain-system/std',50 'cumulus-pallet-xcm/std',51 'cumulus-pallet-xcmp-queue/std',52 'cumulus-primitives-core/std',53 'cumulus-primitives-utility/std',54 'frame-try-runtime/std',55 'frame-executive/std',56 'frame-support/std',57 'frame-system/std',58 'frame-system-rpc-runtime-api/std',59 'pallet-aura/std',60 'pallet-balances/std',61 # 'pallet-contracts/std',62 # 'pallet-contracts-primitives/std',63 # 'pallet-contracts-rpc-runtime-api/std',64 # 'pallet-contract-helpers/std',65 'pallet-randomness-collective-flip/std',66 'pallet-sudo/std',67 'pallet-timestamp/std',68 'pallet-transaction-payment/std',69 'pallet-transaction-payment-rpc-runtime-api/std',70 'pallet-treasury/std',71 # 'pallet-vesting/std',72 'pallet-evm/std',73 'pallet-evm-migration/std',74 'pallet-evm-contract-helpers/std',75 'pallet-evm-transaction-payment/std',76 'pallet-evm-coder-substrate/std',77 'pallet-ethereum/std',78 'pallet-base-fee/std',79 'fp-rpc/std',80 'up-rpc/std',81 'fp-evm-mapping/std',82 'fp-self-contained/std',83 'parachain-info/std',84 'serde',85 'pallet-inflation/std',86 'pallet-common/std',87 'pallet-fungible/std',88 'pallet-refungible/std',89 'pallet-nonfungible/std',90 'pallet-unique/std',91 'pallet-unq-scheduler/std',92 'pallet-charge-transaction/std',93 'up-data-structs/std',94 'sp-api/std',95 'sp-block-builder/std',96 "sp-consensus-aura/std",97 'sp-core/std',98 'sp-inherents/std',99 'sp-io/std',100 'sp-offchain/std',101 'sp-runtime/std',102 'sp-session/std',103 'sp-std/std',104 'sp-transaction-pool/std',105 'sp-version/std',106 'xcm/std',107 'xcm-builder/std',108 'xcm-executor/std',109 'unique-runtime-common/std',110111 "orml-vesting/std",112]113limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing']114115################################################################################116# Substrate Dependencies117118[dependencies.codec]119default-features = false120features = ['derive']121package = 'parity-scale-codec'122version = '3.1.2'123124[dependencies.frame-benchmarking]125default-features = false126git = "https://github.com/paritytech/substrate"127optional = true128branch = "polkadot-v0.9.20"129130[dependencies.frame-try-runtime]131default-features = false132git = 'https://github.com/paritytech/substrate.git'133optional = true134branch = 'polkadot-v0.9.17'135136[dependencies.frame-executive]137default-features = false138git = "https://github.com/paritytech/substrate"139branch = "polkadot-v0.9.20"140141[dependencies.frame-support]142default-features = false143git = "https://github.com/paritytech/substrate"144branch = "polkadot-v0.9.20"145146[dependencies.frame-system]147default-features = false148git = "https://github.com/paritytech/substrate"149branch = "polkadot-v0.9.20"150151[dependencies.frame-system-benchmarking]152default-features = false153git = "https://github.com/paritytech/substrate"154optional = true155branch = "polkadot-v0.9.20"156157[dependencies.frame-system-rpc-runtime-api]158default-features = false159git = "https://github.com/paritytech/substrate"160branch = "polkadot-v0.9.20"161162[dependencies.hex-literal]163optional = true164version = '0.3.3'165166[dependencies.serde]167default-features = false168features = ['derive']169optional = true170version = '1.0.130'171172[dependencies.pallet-aura]173default-features = false174git = "https://github.com/paritytech/substrate"175branch = "polkadot-v0.9.20"176177[dependencies.pallet-balances]178default-features = false179git = "https://github.com/paritytech/substrate"180branch = "polkadot-v0.9.20"181182# Contracts specific packages183# [dependencies.pallet-contracts]184# git = 'https://github.com/paritytech/substrate'185# default-features = false186# branch = 'master'187# version = '4.0.0-dev'188189# [dependencies.pallet-contracts-primitives]190# git = 'https://github.com/paritytech/substrate'191# default-features = false192# branch = 'master'193# version = '4.0.0-dev'194195# [dependencies.pallet-contracts-rpc-runtime-api]196# git = 'https://github.com/paritytech/substrate'197# default-features = false198# branch = 'master'199# version = '4.0.0-dev'200201[dependencies.pallet-randomness-collective-flip]202default-features = false203git = "https://github.com/paritytech/substrate"204branch = "polkadot-v0.9.20"205206[dependencies.pallet-sudo]207default-features = false208git = "https://github.com/paritytech/substrate"209branch = "polkadot-v0.9.20"210211[dependencies.pallet-timestamp]212default-features = false213git = "https://github.com/paritytech/substrate"214branch = "polkadot-v0.9.20"215216[dependencies.pallet-transaction-payment]217default-features = false218git = "https://github.com/paritytech/substrate"219branch = "polkadot-v0.9.20"220221[dependencies.pallet-transaction-payment-rpc-runtime-api]222default-features = false223git = "https://github.com/paritytech/substrate"224branch = "polkadot-v0.9.20"225226[dependencies.pallet-treasury]227default-features = false228git = "https://github.com/paritytech/substrate"229branch = "polkadot-v0.9.20"230231# [dependencies.pallet-vesting]232# default-features = false233# git = 'https://github.com/paritytech/substrate'234# branch = 'master'235236[dependencies.sp-arithmetic]237default-features = false238git = "https://github.com/paritytech/substrate"239branch = "polkadot-v0.9.20"240241[dependencies.sp-api]242default-features = false243git = "https://github.com/paritytech/substrate"244branch = "polkadot-v0.9.20"245246[dependencies.sp-block-builder]247default-features = false248git = "https://github.com/paritytech/substrate"249branch = "polkadot-v0.9.20"250251[dependencies.sp-core]252default-features = false253git = "https://github.com/paritytech/substrate"254branch = "polkadot-v0.9.20"255256[dependencies.sp-consensus-aura]257default-features = false258git = "https://github.com/paritytech/substrate"259branch = "polkadot-v0.9.20"260261[dependencies.sp-inherents]262default-features = false263git = "https://github.com/paritytech/substrate"264branch = "polkadot-v0.9.20"265266[dependencies.sp-io]267default-features = false268git = "https://github.com/paritytech/substrate"269branch = "polkadot-v0.9.20"270271[dependencies.sp-offchain]272default-features = false273git = "https://github.com/paritytech/substrate"274branch = "polkadot-v0.9.20"275276[dependencies.sp-runtime]277default-features = false278git = "https://github.com/paritytech/substrate"279branch = "polkadot-v0.9.20"280281[dependencies.sp-session]282default-features = false283git = "https://github.com/paritytech/substrate"284branch = "polkadot-v0.9.20"285286[dependencies.sp-std]287default-features = false288git = "https://github.com/paritytech/substrate"289branch = "polkadot-v0.9.20"290291[dependencies.sp-transaction-pool]292default-features = false293git = "https://github.com/paritytech/substrate"294branch = "polkadot-v0.9.20"295296[dependencies.sp-version]297default-features = false298git = "https://github.com/paritytech/substrate"299branch = "polkadot-v0.9.20"300301[dependencies.smallvec]302version = '1.6.1'303304################################################################################305# Cumulus dependencies306307[dependencies.parachain-info]308default-features = false309git = "https://github.com/paritytech/cumulus"310branch = "polkadot-v0.9.20"311312[dependencies.cumulus-pallet-aura-ext]313git = "https://github.com/paritytech/cumulus"314branch = "polkadot-v0.9.20"315default-features = false316317[dependencies.cumulus-pallet-parachain-system]318git = "https://github.com/paritytech/cumulus"319branch = "polkadot-v0.9.20"320default-features = false321322[dependencies.cumulus-primitives-core]323git = "https://github.com/paritytech/cumulus"324branch = "polkadot-v0.9.20"325default-features = false326327[dependencies.cumulus-pallet-xcm]328git = "https://github.com/paritytech/cumulus"329branch = "polkadot-v0.9.20"330default-features = false331332[dependencies.cumulus-pallet-dmp-queue]333git = "https://github.com/paritytech/cumulus"334branch = "polkadot-v0.9.20"335default-features = false336337[dependencies.cumulus-pallet-xcmp-queue]338git = "https://github.com/paritytech/cumulus"339branch = "polkadot-v0.9.20"340default-features = false341342[dependencies.cumulus-primitives-utility]343git = "https://github.com/paritytech/cumulus"344branch = "polkadot-v0.9.20"345default-features = false346347[dependencies.cumulus-primitives-timestamp]348git = "https://github.com/paritytech/cumulus"349branch = "polkadot-v0.9.20"350default-features = false351352################################################################################353# Polkadot dependencies354355[dependencies.polkadot-parachain]356git = "https://github.com/paritytech/polkadot"357branch = "release-v0.9.20"358default-features = false359360[dependencies.xcm]361git = "https://github.com/paritytech/polkadot"362branch = "release-v0.9.20"363default-features = false364365[dependencies.xcm-builder]366git = "https://github.com/paritytech/polkadot"367branch = "release-v0.9.20"368default-features = false369370[dependencies.xcm-executor]371git = "https://github.com/paritytech/polkadot"372branch = "release-v0.9.20"373default-features = false374375[dependencies.pallet-xcm]376git = "https://github.com/paritytech/polkadot"377branch = "release-v0.9.20"378default-features = false379380[dependencies.orml-vesting]381git = "https://github.com/uniquenetwork/open-runtime-module-library"382branch = "unique-polkadot-v0.9.20"383version = "0.4.1-dev"384default-features = false385386################################################################################387# local dependencies388389[dependencies]390log = { version = "0.4.16", default-features = false }391unique-runtime-common = { path = "../common", default-features = false }392scale-info = { version = "2.0.1", default-features = false, features = [393 "derive",394] }395derivative = "2.2.0"396pallet-unique = { path = '../../pallets/unique', default-features = false }397up-rpc = { path = "../../primitives/rpc", default-features = false }398pallet-inflation = { path = '../../pallets/inflation', default-features = false }399up-data-structs = { path = '../../primitives/data-structs', default-features = false }400pallet-common = { default-features = false, path = "../../pallets/common" }401pallet-fungible = { default-features = false, path = "../../pallets/fungible" }402pallet-refungible = { default-features = false, path = "../../pallets/refungible" }403pallet-nonfungible = { default-features = false, path = "../../pallets/nonfungible" }404pallet-unq-scheduler = { path = '../../pallets/scheduler', default-features = false }405# pallet-contract-helpers = { path = '../pallets/contract-helpers', default-features = false, version = '0.1.0' }406pallet-charge-transaction = { git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = "polkadot-v0.9.20", package = "pallet-template-transaction-payment", default-features = false, version = "3.0.0" }407pallet-evm-migration = { path = '../../pallets/evm-migration', default-features = false }408pallet-evm-contract-helpers = { path = '../../pallets/evm-contract-helpers', default-features = false }409pallet-evm-transaction-payment = { path = '../../pallets/evm-transaction-payment', default-features = false }410pallet-evm-coder-substrate = { default-features = false, path = "../../pallets/evm-coder-substrate" }411pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.20" }412pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.20" }413pallet-base-fee = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.20" }414fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.20" }415fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.20" }416fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.20" }417418################################################################################419# Build Dependencies420421[build-dependencies.substrate-wasm-builder]422git = "https://github.com/paritytech/substrate"423branch = "polkadot-v0.9.20"