Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: upgrade polkadot to v0.9.36 #446

Merged
merged 11 commits into from
Jan 20, 2023
Merged

chore: upgrade polkadot to v0.9.36 #446

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0f7ccbd
upgrade polkadot to v0.9.33.
trusch Jan 6, 2023
14bf121
fix wrong toolchain version
trusch Jan 6, 2023
920a5ca
adjust for the try-runtime revamp
trusch Jan 9, 2023
d3ce7ce
cargo fmt
trusch Jan 9, 2023
6e227c3
move futures dependency to root crate
trusch Jan 13, 2023
2a2f4f3
always log the sig_check in try_runtime on upgrades
trusch Jan 13, 2023
555ac11
Merge branch 'develop' into feature/polkadot-upgrade-v0.9.36
trusch Jan 13, 2023
cc7e242
fix copy paste errors
trusch Jan 13, 2023
34bc197
Merge branch 'feature/polkadot-upgrade-v0.9.36' of github.com:KILTpro…
trusch Jan 13, 2023
3b46eac
Merge branch 'develop' into feature/polkadot-upgrade-v0.9.36
trusch Jan 20, 2023
7e2a0c3
Merge branch 'develop' into feature/polkadot-upgrade-v0.9.36
ntn-x2 Jan 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,721 changes: 1,426 additions & 1,295 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

206 changes: 103 additions & 103 deletions Cargo.toml
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions nodes/parachain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ spiritnet-runtime = {workspace = true, features = ["std"]}
# Substrate dependencies
sc-basic-authorship.workspace = true
sc-chain-spec.workspace = true
sc-cli = {workspace = true, features = ["wasmtime"]}
sc-cli = {workspace = true}
sc-client-api.workspace = true
sc-consensus.workspace = true
sc-executor = {workspace = true, features = ["wasmtime"]}
sc-executor = {workspace = true}
sc-network.workspace = true
sc-service = {workspace = true, features = ["wasmtime"]}
sc-service = {workspace = true}
sc-sysinfo.workspace = true
sc-telemetry.workspace = true
sc-tracing.workspace = true
Expand All @@ -54,6 +54,7 @@ sp-blockchain.workspace = true
sp-consensus.workspace = true
sp-consensus-aura = {workspace = true, features = ["std"]}
sp-core = {workspace = true, features = ["std"]}
sp-io = {workspace = true, features = ["std"]}
sp-keystore = {workspace = true, features = ["std"]}
sp-offchain = {workspace = true, features = ["std"]}
sp-runtime = {workspace = true, features = ["std"]}
Expand Down
28 changes: 22 additions & 6 deletions nodes/parachain/src/command.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,8 +341,7 @@ pub fn run() -> Result<()> {
"Compile with --features=runtime-benchmarks \
to enable storage benchmarks."
.into(),
)
.into()),
)),
#[cfg(feature = "runtime-benchmarks")]
(BenchmarkCmd::Storage(cmd), "spiritnet") => runner.sync_run(|config| {
let partials = new_partial::<spiritnet_runtime::RuntimeApi, SpiritnetRuntimeExecutor, _>(
Expand Down Expand Up @@ -392,15 +391,32 @@ pub fn run() -> Result<()> {
}
#[cfg(feature = "try-runtime")]
Some(Subcommand::TryRuntime(cmd)) => {
use sc_executor::{sp_wasm_interface::ExtendedHostFunctions, NativeExecutionDispatch};
let runner = cli.create_runner(cmd)?;
let registry = &runner.config().prometheus_config.as_ref().map(|cfg| &cfg.registry);
let task_manager = TaskManager::new(runner.config().tokio_handle.clone(), *registry)
.map_err(|e| format!("Error: {:?}", e))?;

if runner.config().chain_spec.is_peregrine() {
runner.async_run(|config| Ok((cmd.run::<Block, PeregrineRuntimeExecutor>(config), task_manager)))
runner.async_run(|_| {
Ok((
cmd.run::<Block, ExtendedHostFunctions<
sp_io::SubstrateHostFunctions,
<PeregrineRuntimeExecutor as NativeExecutionDispatch>::ExtendHostFunctions,
>>(),
task_manager,
))
})
} else if runner.config().chain_spec.is_spiritnet() {
runner.async_run(|config| Ok((cmd.run::<Block, SpiritnetRuntimeExecutor>(config), task_manager)))
runner.async_run(|_| {
Ok((
cmd.run::<Block, ExtendedHostFunctions<
sp_io::SubstrateHostFunctions,
<SpiritnetRuntimeExecutor as NativeExecutionDispatch>::ExtendHostFunctions,
>>(),
task_manager,
))
})
} else {
Err("Chain doesn't support try-runtime".into())
}
Expand Down Expand Up @@ -456,8 +472,8 @@ pub fn run() -> Result<()> {
if config.role.is_authority() { "yes" } else { "no" }
);

if collator_options.relay_chain_rpc_url.is_some() && !cli.relay_chain_args.len().is_zero() {
warn!("Detected relay chain node arguments together with --relay-chain-rpc-url. This command starts a minimal Polkadot node that only uses a network-related subset of all relay chain CLI options.");
if !collator_options.relay_chain_rpc_urls.len().is_zero() && !cli.relay_chain_args.len().is_zero() {
warn!("Detected relay chain node arguments together with --relay-chain-rpc-urls. This command starts a minimal Polkadot node that only uses a network-related subset of all relay chain CLI options.");
}

if config.chain_spec.is_peregrine() {
Expand Down
Loading