Skip to content

polkadot-v0.9.27 uplift #722

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

Merged
Dinonard merged 3 commits into from
Aug 5, 2022
Merged

polkadot-v0.9.27 uplift #722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eae64db
Init commit
Dinonard Aug 4, 2022
084aaf3
Remove helper file
Dinonard Aug 4, 2022
477d74d
Update cumulus & astar-frame, remove light client
Dinonard Aug 5, 2022
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
1,013 changes: 500 additions & 513 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

154 changes: 77 additions & 77 deletions bin/collator/Cargo.toml
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions bin/collator/src/command.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,6 +585,7 @@ pub fn run() -> Result<()> {
}
}
BenchmarkCmd::Overhead(_) => Err("Benchmark overhead not supported.".into()),
BenchmarkCmd::Extrinsic(_) => Err("Benchmark extrinsic not supported.".into()),
BenchmarkCmd::Machine(cmd) => {
runner.sync_run(|config| cmd.run(&config, SUBSTRATE_REFERENCE_HARDWARE.clone()))
}
Expand Down Expand Up @@ -790,8 +791,8 @@ impl CliConfiguration<Self> for RelayChainCli {
self.base.base.role(is_dev)
}

fn transaction_pool(&self) -> Result<sc_service::config::TransactionPoolOptions> {
self.base.base.transaction_pool()
fn transaction_pool(&self, is_dev: bool) -> Result<sc_service::config::TransactionPoolOptions> {
self.base.base.transaction_pool(is_dev)
}

fn state_cache_child_ratio(&self) -> Result<Option<usize>> {
Expand Down
10 changes: 1 addition & 9 deletions bin/collator/src/parachain/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use sc_client_api::{BlockchainEvents, ExecutorProvider};
use sc_consensus::import_queue::BasicQueue;
use sc_executor::NativeElseWasmExecutor;
use sc_network::NetworkService;
use sc_service::{Configuration, PartialComponents, Role, TFullBackend, TFullClient, TaskManager};
use sc_service::{Configuration, PartialComponents, TFullBackend, TFullClient, TaskManager};
use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle};
use sp_api::ConstructRuntimeApi;
use sp_consensus_aura::sr25519::AuthorityId as AuraId;
Expand Down Expand Up @@ -326,10 +326,6 @@ where
bool,
) -> Result<Box<dyn ParachainConsensus<Block>>, sc_service::Error>,
{
if matches!(parachain_config.role, Role::Light) {
Copy link
Contributor

@shunsukew shunsukew Aug 5, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing this means we got LightClient configuration part somewhere instead?

Copy link
Contributor Author

@Dinonard Dinonard Aug 5, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know where it is, all I've found is that it was removed from substrate.
To do the uplift, I removed the enum mention.

Copy link
Contributor

@shunsukew shunsukew Aug 5, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This shouldn't impact other types of nodes. We'd like to keep up with the LightClient development situation on Substrate side I think.

It's deprecated, no need for validation anymore.
paritytech/substrate#11865

return Err("Light client not supported!".into());
}

let parachain_config = prepare_node_config(parachain_config);

let params = new_partial::<RuntimeApi, Executor, BIQ>(&parachain_config, build_import_queue)?;
Expand Down Expand Up @@ -594,10 +590,6 @@ where
bool,
) -> Result<Box<dyn ParachainConsensus<Block>>, sc_service::Error>,
{
if matches!(parachain_config.role, Role::Light) {
return Err("Light client not supported!".into());
}

let parachain_config = prepare_node_config(parachain_config);
let params = new_partial::<RuntimeApi, Executor, BIQ>(&parachain_config, build_import_queue)?;
let (mut telemetry, telemetry_worker_handle, frontier_backend) = params.other;
Expand Down
20 changes: 10 additions & 10 deletions bin/xcm-tools/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ name = "xcm-tools"
path = "src/main.rs"

[dependencies]
clap = { version = "3.2.6", features = ["derive"] }
cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" }
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" }
xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26" }
xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26" }
xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26" }
clap = { version = "3.2.15", features = ["derive"] }
cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" }
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.27" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.27" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" }
xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.27" }
xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.27" }
xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.27" }

[build-dependencies]
build-script-utils = { package = "substrate-build-script-utils", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" }
build-script-utils = { package = "substrate-build-script-utils", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" }
152 changes: 76 additions & 76 deletions runtime/astar/Cargo.toml
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions runtime/astar/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("astar"),
impl_name: create_runtime_str!("astar"),
authoring_version: 1,
spec_version: 31,
spec_version: 32,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 2,
Expand Down Expand Up @@ -157,8 +157,8 @@ impl Contains<Call> for BaseFilter {
match call {
// Filter permission-less assets creation/destroying
Call::Assets(method) => match method {
pallet_assets::Call::create { id, .. } => *id < u32::max_value().into(),
pallet_assets::Call::destroy { id, .. } => *id < u32::max_value().into(),
pallet_assets::Call::create { id, .. } => *id < u32::MAX.into(),
pallet_assets::Call::destroy { id, .. } => *id < u32::MAX.into(),
_ => true,
},
// These modules are not allowed to be called by transactions:
Expand Down Expand Up @@ -264,7 +264,7 @@ impl pallet_multisig::Config for Runtime {
}

parameter_types! {
pub const EcdsaUnsignedPriority: TransactionPriority = TransactionPriority::max_value() / 2;
pub const EcdsaUnsignedPriority: TransactionPriority = TransactionPriority::MAX / 2;
pub const CallFee: Balance = ASTR / 10;
pub const CallMagicNumber: u16 = 0x0250;
}
Expand Down
Loading