Skip to content

Commit

Permalink
update cumulus (#1040)
Browse files Browse the repository at this point in the history
  • Loading branch information
@xlc
xlc authored May 23, 2021
1 parent 16accd6 commit 6bee0c2
Show file tree
Hide file tree
Showing 13 changed files with 74 additions and 54 deletions.
29 changes: 15 additions & 14 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 13 additions & 13 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -263,19 +263,19 @@ polkadot-cli = { git = "https://github.com/paritytech//polkadot", rev = "f36bb82
polkadot-node-core-pvf = { git = "https://github.com/paritytech//polkadot", rev = "f36bb820120e7ed460071acbdd512850348ae901" }

[patch."https://github.com/paritytech/cumulus"]
cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "95d81d499927e508769690fc43a480f00ddd131e" }
cumulus-pallet-parachain-system = { git = "https://github.com/paritytech//cumulus", rev = "95d81d499927e508769690fc43a480f00ddd131e" }
cumulus-pallet-aura-ext = { git = "https://github.com/paritytech//cumulus", rev = "95d81d499927e508769690fc43a480f00ddd131e" }
parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "95d81d499927e508769690fc43a480f00ddd131e" }
cumulus-client-cli = { git = "https://github.com/paritytech//cumulus", rev = "95d81d499927e508769690fc43a480f00ddd131e" }
cumulus-client-network = { git = "https://github.com/paritytech//cumulus", rev = "95d81d499927e508769690fc43a480f00ddd131e" }
cumulus-client-service = { git = "https://github.com/paritytech//cumulus", rev = "95d81d499927e508769690fc43a480f00ddd131e" }
cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech//cumulus", rev = "95d81d499927e508769690fc43a480f00ddd131e" }
cumulus-client-consensus-aura = { git = "https://github.com/paritytech//cumulus", rev = "95d81d499927e508769690fc43a480f00ddd131e" }
cumulus-client-consensus-common = { git = "https://github.com/paritytech//cumulus", rev = "95d81d499927e508769690fc43a480f00ddd131e" }
# cumulus-pallet-xcm-handler = { git = "https://github.com/paritytech//cumulus", rev = "95d81d499927e508769690fc43a480f00ddd131e" }
cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech//cumulus", rev = "95d81d499927e508769690fc43a480f00ddd131e" }
cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech//cumulus", rev = "95d81d499927e508769690fc43a480f00ddd131e" }
cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "4b7120636b9ece6c756ecaf3b26dbc23387a135f" }
cumulus-pallet-parachain-system = { git = "https://github.com/paritytech//cumulus", rev = "4b7120636b9ece6c756ecaf3b26dbc23387a135f" }
cumulus-pallet-aura-ext = { git = "https://github.com/paritytech//cumulus", rev = "4b7120636b9ece6c756ecaf3b26dbc23387a135f" }
parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "4b7120636b9ece6c756ecaf3b26dbc23387a135f" }
cumulus-client-cli = { git = "https://github.com/paritytech//cumulus", rev = "4b7120636b9ece6c756ecaf3b26dbc23387a135f" }
cumulus-client-network = { git = "https://github.com/paritytech//cumulus", rev = "4b7120636b9ece6c756ecaf3b26dbc23387a135f" }
cumulus-client-service = { git = "https://github.com/paritytech//cumulus", rev = "4b7120636b9ece6c756ecaf3b26dbc23387a135f" }
cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech//cumulus", rev = "4b7120636b9ece6c756ecaf3b26dbc23387a135f" }
cumulus-client-consensus-aura = { git = "https://github.com/paritytech//cumulus", rev = "4b7120636b9ece6c756ecaf3b26dbc23387a135f" }
cumulus-client-consensus-common = { git = "https://github.com/paritytech//cumulus", rev = "4b7120636b9ece6c756ecaf3b26dbc23387a135f" }
# cumulus-pallet-xcm-handler = { git = "https://github.com/paritytech//cumulus", rev = "4b7120636b9ece6c756ecaf3b26dbc23387a135f" }
cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech//cumulus", rev = "4b7120636b9ece6c756ecaf3b26dbc23387a135f" }
cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech//cumulus", rev = "4b7120636b9ece6c756ecaf3b26dbc23387a135f" }

[patch."https://github.com/paritytech/grandpa-bridge-gadget"]
pallet-beefy = { git = "https://github.com/paritytech//grandpa-bridge-gadget", rev = "e9231ddc7ebb5ad58ba4d8608a180a2fd10e736e" }
Expand Down
6 changes: 3 additions & 3 deletions node/cli/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polk
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", optional = true }
try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", optional = true }

cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.1" }
cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.1" }
cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.1" }
cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.2" }
cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.2" }
cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.2" }
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.2" }
polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.2" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.2" }
Expand Down
16 changes: 8 additions & 8 deletions node/service/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,14 @@ sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "pol
sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2" }
sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2" }

cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.1" }
cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.1" }
cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.1" }
cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.1" }
cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.1" }
cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.1" }
cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.1" }
cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.1" }
cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.2" }
cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.2" }
cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.2" }
cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.2" }
cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.2" }
cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.2" }
cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.2" }
cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.2" }

polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.2" }
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.2" }
Expand Down
4 changes: 3 additions & 1 deletion node/service/src/client.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ pub trait RuntimeApiCollection:
+ sp_api::Metadata<Block>
+ sp_offchain::OffchainWorkerApi<Block>
+ sp_session::SessionKeys<Block>
+ cumulus_primitives_core::CollectCollationInfo<Block>
where
<Self as sp_api::ApiExt<Block>>::StateBackend: sp_api::StateBackend<BlakeTwo256>,
{
Expand All @@ -62,7 +63,8 @@ where
+ module_evm_rpc_runtime_api::EVMRuntimeRPCApi<Block, Balance>
+ sp_api::Metadata<Block>
+ sp_offchain::OffchainWorkerApi<Block>
+ sp_session::SessionKeys<Block>,
+ sp_session::SessionKeys<Block>
+ cumulus_primitives_core::CollectCollationInfo<Block>,
<Self as sp_api::ApiExt<Block>>::StateBackend: sp_api::StateBackend<BlakeTwo256>,
{
}
Expand Down
1 change: 0 additions & 1 deletion node/service/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,6 @@ where
collator_key,
relay_chain_full_node,
spawner,
backend,
parachain_consensus,
};

Expand Down
2 changes: 1 addition & 1 deletion orml
Submodule orml updated 1 files
+3 −3 xtokens/Cargo.toml
8 changes: 4 additions & 4 deletions runtime/acala/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@ sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v
sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false }
sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false }

cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.1", default-features = false }
cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.1", default-features = false }
parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.1", default-features = false }
cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.2", default-features = false }
cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.2", default-features = false }
parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.2", default-features = false }
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.2", default-features = false }
# xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.2", default-features = false }
# xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.2", default-features = false }
# xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.2", default-features = false }
# cumulus-pallet-xcm-handler = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.1", default-features = false }
# cumulus-pallet-xcm-handler = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.2", default-features = false }

orml-auction = { path = "../../orml/auction", default-features = false }
orml-authority = { path = "../../orml/authority", default-features = false }
Expand Down
6 changes: 6 additions & 0 deletions runtime/acala/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1853,6 +1853,12 @@ impl_runtime_apis! {
}
}

impl cumulus_primitives_core::CollectCollationInfo<Block> for Runtime {
fn collect_collation_info() -> cumulus_primitives_core::CollationInfo {
ParachainSystem::collect_collation_info()
}
}

#[cfg(feature = "try-runtime")]
impl frame_try_runtime::TryRuntime<Block> for Runtime {
fn on_runtime_upgrade() -> Result<(Weight, Weight), sp_runtime::RuntimeString> {
Expand Down
10 changes: 5 additions & 5 deletions runtime/karura/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v
sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false }
sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false }

cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.1", default-features = false }
cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.1", default-features = false }
cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.1", default-features = false }
parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.1", default-features = false }
cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.2", default-features = false }
cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.2", default-features = false }
cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.2", default-features = false }
parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.2", default-features = false }
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.2", default-features = false }
# xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.2", default-features = false }
# xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.2", default-features = false }
# xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.2", default-features = false }
# cumulus-pallet-xcm-handler = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.1", default-features = false }
# cumulus-pallet-xcm-handler = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.2", default-features = false }

orml-auction = { path = "../../orml/auction", default-features = false }
orml-authority = { path = "../../orml/authority", default-features = false }
Expand Down
6 changes: 6 additions & 0 deletions runtime/karura/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1696,6 +1696,12 @@ impl_runtime_apis! {
}
}

impl cumulus_primitives_core::CollectCollationInfo<Block> for Runtime {
fn collect_collation_info() -> cumulus_primitives_core::CollationInfo {
ParachainSystem::collect_collation_info()
}
}

#[cfg(feature = "try-runtime")]
impl frame_try_runtime::TryRuntime<Block> for Runtime {
fn on_runtime_upgrade() -> Result<(Weight, Weight), sp_runtime::RuntimeString> {
Expand Down
Loading

0 comments on commit 6bee0c2

Please sign in to comment.