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.

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

Rococo v1 #338

Draft
wants to merge 22 commits into
base: master
Choose a base branch
from
Draft
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Bump polkadot/cumulus/substrate.
shaunxw committed Jan 28, 2021
commit eb2c2d6e0a73ca0da9f2bacfcb8baba89c3393ae
582 changes: 355 additions & 227 deletions Cargo.lock

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -328,8 +328,7 @@ polkadot-cli = { git = "https://github.com/paritytech//polkadot", branch = "roco

[patch."https://github.com/paritytech/cumulus"]
cumulus-primitives = { git = "https://github.com/paritytech//cumulus", branch = "rococo-v1" }
cumulus-parachain-upgrade = { git = "https://github.com/paritytech//cumulus", branch = "rococo-v1" }
cumulus-message-broker = { git = "https://github.com/paritytech//cumulus", branch = "rococo-v1" }
cumulus-parachain-system = { git = "https://github.com/paritytech//cumulus", branch = "rococo-v1" }
parachain-info = { git = "https://github.com/paritytech//cumulus", branch = "rococo-v1" }
cumulus-network = { git = "https://github.com/paritytech//cumulus", branch = "rococo-v1" }
cumulus-service = { git = "https://github.com/paritytech//cumulus", branch = "rococo-v1" }
6 changes: 2 additions & 4 deletions runtime/dev/Cargo.toml
Original file line number Diff line number Diff line change
@@ -51,9 +51,8 @@ sp-version = { git = "https://github.com/paritytech/substrate", branch = "rococo
sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false }

cumulus-runtime = { git = "https://github.com/paritytech/cumulus", branch = "rococo-v1", default-features = false }
cumulus-parachain-upgrade = { git = "https://github.com/paritytech/cumulus", branch = "rococo-v1", default-features = false }
cumulus-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "rococo-v1", default-features = false }
cumulus-primitives = { git = "https://github.com/paritytech/cumulus", branch = "rococo-v1", default-features = false }
cumulus-message-broker = { git = "https://github.com/paritytech/cumulus", branch = "rococo-v1", default-features = false }
parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "rococo-v1", default-features = false }
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "rococo-v1", default-features = false }
xcm = { git = "https://github.com/paritytech/polkadot", branch = "rococo-v1", default-features = false }
@@ -131,9 +130,8 @@ std = [
"sp-transaction-pool/std",

"cumulus-runtime/std",
"cumulus-parachain-upgrade/std",
"cumulus-parachain-system/std",
"cumulus-primitives/std",
"cumulus-message-broker/std",
"parachain-info/std",
"polkadot-parachain/std",
"xcm/std",
17 changes: 6 additions & 11 deletions runtime/dev/src/lib.rs
Original file line number Diff line number Diff line change
@@ -832,14 +832,10 @@ impl margin_protocol::Config for Runtime {
}

#[cfg(not(feature = "standalone"))]
impl cumulus_parachain_upgrade::Config for Runtime {
impl cumulus_parachain_system::Config for Runtime {
type Event = Event;
type OnValidationData = ();
type SelfParaId = ParachainInfo;
}

#[cfg(not(feature = "standalone"))]
impl cumulus_message_broker::Config for Runtime {
type SelfParaId = parachain_info::Module<Runtime>;
type DownwardMessageHandlers = XcmHandler;
type HrmpMessageHandlers = XcmHandler;
}
@@ -924,8 +920,8 @@ impl Config for XcmConfig {
impl xcm_handler::Config for Runtime {
type Event = Event;
type XcmExecutor = XcmExecutor<XcmConfig>;
type UpwardMessageSender = MessageBroker;
type HrmpMessageSender = MessageBroker;
type UpwardMessageSender = ParachainSystem;
type HrmpMessageSender = ParachainSystem;
}

#[cfg(not(feature = "standalone"))]
@@ -1017,11 +1013,10 @@ macro_rules! construct_laminar_runtime {
#[cfg(not(feature = "standalone"))]
construct_laminar_runtime! {
// Parachain
ParachainUpgrade: cumulus_parachain_upgrade::{Module, Call, Storage, Inherent, Event},
MessageBroker: cumulus_message_broker::{Module, Storage, Call, Inherent},
ParachainSystem: cumulus_parachain_system::{Module, Call, Storage, Inherent, Event},
ParachainInfo: parachain_info::{Module, Storage, Config},
XcmHandler: xcm_handler::{Module, Event<T>, Origin},
XTokens: orml_xtokens::{Module, Storage, Call, Event<T>},
XcmHandler: xcm_handler::{Module, Call, Event<T>, Origin},
}

#[cfg(feature = "standalone")]