diff --git a/Cargo.lock b/Cargo.lock index a0ae88f..02954ad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1329,6 +1329,7 @@ dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", + "cumulus-pallet-solo-to-para", "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", "cumulus-primitives-core", @@ -1888,6 +1889,23 @@ dependencies = [ "syn", ] +[[package]] +name = "cumulus-pallet-solo-to-para" +version = "0.1.0" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.27#b86cd207fc77af888f223c10363ae4d18a4b63b4" +dependencies = [ + "cumulus-pallet-parachain-system", + "cumulus-primitives-core", + "frame-support", + "frame-system", + "pallet-sudo", + "parity-scale-codec", + "polkadot-primitives", + "scale-info", + "sp-runtime", + "sp-std", +] + [[package]] name = "cumulus-pallet-xcm" version = "0.1.0" @@ -2254,6 +2272,7 @@ dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", + "cumulus-pallet-solo-to-para", "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", "cumulus-primitives-core", @@ -6517,6 +6536,7 @@ dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", + "cumulus-pallet-solo-to-para", "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", "cumulus-primitives-core", @@ -11689,7 +11709,7 @@ version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "digest 0.10.5", "rand 0.8.5", "static_assertions", diff --git a/runtime/crab-parachain/Cargo.toml b/runtime/crab-parachain/Cargo.toml index 56a9097..1367ea5 100644 --- a/runtime/crab-parachain/Cargo.toml +++ b/runtime/crab-parachain/Cargo.toml @@ -20,6 +20,7 @@ smallvec = { version = "1.9" } cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" } cumulus-pallet-dmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" } cumulus-pallet-parachain-system = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" } +cumulus-pallet-solo-to-para = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27"} cumulus-pallet-xcm = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" } cumulus-pallet-xcmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" } cumulus-primitives-core = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" } @@ -94,6 +95,7 @@ std = [ "cumulus-pallet-aura-ext/std", "cumulus-pallet-dmp-queue/std", "cumulus-pallet-parachain-system/std", + "cumulus-pallet-solo-to-para/std", "cumulus-pallet-xcm/std", "cumulus-pallet-xcmp-queue/std", "cumulus-primitives-core/std", diff --git a/runtime/crab-parachain/src/lib.rs b/runtime/crab-parachain/src/lib.rs index 2b4891b..5215044 100644 --- a/runtime/crab-parachain/src/lib.rs +++ b/runtime/crab-parachain/src/lib.rs @@ -176,6 +176,7 @@ frame_support::construct_runtime! { FromCrabIssuing: dp_common_runtime::helixbridge::{Pallet, Call, Storage, Event} = 24, MessageRouter: dp_common_runtime::message_router::{Pallet, Call, Storage, Event} = 26, + SoloToPara: cumulus_pallet_solo_to_para::{Pallet, Call, Storage, Event} = 27, } } diff --git a/runtime/crab-parachain/src/pallets/mod.rs b/runtime/crab-parachain/src/pallets/mod.rs index d222740..5592888 100644 --- a/runtime/crab-parachain/src/pallets/mod.rs +++ b/runtime/crab-parachain/src/pallets/mod.rs @@ -75,3 +75,6 @@ pub use helixbridge::*; pub mod message_router; pub use message_router::*; + +pub mod solo_to_para; +pub use solo_to_para::*; diff --git a/runtime/crab-parachain/src/pallets/parachain_system.rs b/runtime/crab-parachain/src/pallets/parachain_system.rs index 2b23a55..9314ecb 100644 --- a/runtime/crab-parachain/src/pallets/parachain_system.rs +++ b/runtime/crab-parachain/src/pallets/parachain_system.rs @@ -14,7 +14,7 @@ impl Config for Runtime { type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases; type DmpMessageHandler = DmpQueue; type Event = Event; - type OnSystemEvent = (); + type OnSystemEvent = cumulus_pallet_solo_to_para::Pallet; type OutboundXcmpMessageSource = XcmpQueue; type ReservedDmpWeight = ReservedDmpWeight; type ReservedXcmpWeight = ReservedXcmpWeight; diff --git a/runtime/crab-parachain/src/pallets/solo_to_para.rs b/runtime/crab-parachain/src/pallets/solo_to_para.rs new file mode 100644 index 0000000..68b3fa1 --- /dev/null +++ b/runtime/crab-parachain/src/pallets/solo_to_para.rs @@ -0,0 +1,6 @@ +// --- darwinia-network --- +use crate::*; + +impl cumulus_pallet_solo_to_para::Config for Runtime { + type Event = Event; +} diff --git a/runtime/darwinia-parachain/Cargo.toml b/runtime/darwinia-parachain/Cargo.toml index 8fd4669..9637e16 100644 --- a/runtime/darwinia-parachain/Cargo.toml +++ b/runtime/darwinia-parachain/Cargo.toml @@ -20,6 +20,7 @@ smallvec = { version = "1.9" } cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" } cumulus-pallet-dmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" } cumulus-pallet-parachain-system = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" } +cumulus-pallet-solo-to-para = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27"} cumulus-pallet-xcm = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" } cumulus-pallet-xcmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" } cumulus-primitives-core = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" } @@ -91,6 +92,7 @@ std = [ "cumulus-pallet-aura-ext/std", "cumulus-pallet-dmp-queue/std", "cumulus-pallet-parachain-system/std", + "cumulus-pallet-solo-to-para/std", "cumulus-pallet-xcm/std", "cumulus-pallet-xcmp-queue/std", "cumulus-primitives-core/std", diff --git a/runtime/darwinia-parachain/src/lib.rs b/runtime/darwinia-parachain/src/lib.rs index a262126..66323b5 100644 --- a/runtime/darwinia-parachain/src/lib.rs +++ b/runtime/darwinia-parachain/src/lib.rs @@ -171,7 +171,9 @@ frame_support::construct_runtime! { DarwiniaFeeMarket: pallet_fee_market::::{Pallet, Call, Storage, Event} = 23, FromDarwiniaIssuing: dp_common_runtime::helixbridge::{Pallet, Call, Storage, Event} = 24, + MessageRouter: dp_common_runtime::message_router::{Pallet, Call, Storage, Event} = 26, + SoloToPara: cumulus_pallet_solo_to_para::{Pallet, Call, Storage, Event} = 27, } } diff --git a/runtime/darwinia-parachain/src/pallets/mod.rs b/runtime/darwinia-parachain/src/pallets/mod.rs index d222740..5592888 100644 --- a/runtime/darwinia-parachain/src/pallets/mod.rs +++ b/runtime/darwinia-parachain/src/pallets/mod.rs @@ -75,3 +75,6 @@ pub use helixbridge::*; pub mod message_router; pub use message_router::*; + +pub mod solo_to_para; +pub use solo_to_para::*; diff --git a/runtime/darwinia-parachain/src/pallets/parachain_system.rs b/runtime/darwinia-parachain/src/pallets/parachain_system.rs index 2b23a55..9314ecb 100644 --- a/runtime/darwinia-parachain/src/pallets/parachain_system.rs +++ b/runtime/darwinia-parachain/src/pallets/parachain_system.rs @@ -14,7 +14,7 @@ impl Config for Runtime { type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases; type DmpMessageHandler = DmpQueue; type Event = Event; - type OnSystemEvent = (); + type OnSystemEvent = cumulus_pallet_solo_to_para::Pallet; type OutboundXcmpMessageSource = XcmpQueue; type ReservedDmpWeight = ReservedDmpWeight; type ReservedXcmpWeight = ReservedXcmpWeight; diff --git a/runtime/darwinia-parachain/src/pallets/solo_to_para.rs b/runtime/darwinia-parachain/src/pallets/solo_to_para.rs new file mode 100644 index 0000000..68b3fa1 --- /dev/null +++ b/runtime/darwinia-parachain/src/pallets/solo_to_para.rs @@ -0,0 +1,6 @@ +// --- darwinia-network --- +use crate::*; + +impl cumulus_pallet_solo_to_para::Config for Runtime { + type Event = Event; +} diff --git a/runtime/pangolin-parachain/Cargo.toml b/runtime/pangolin-parachain/Cargo.toml index fe3c21b..b9c3445 100644 --- a/runtime/pangolin-parachain/Cargo.toml +++ b/runtime/pangolin-parachain/Cargo.toml @@ -20,6 +20,7 @@ smallvec = { version = "1.9" } cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" } cumulus-pallet-dmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" } cumulus-pallet-parachain-system = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" } +cumulus-pallet-solo-to-para = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27"} cumulus-pallet-xcm = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" } cumulus-pallet-xcmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" } cumulus-primitives-core = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" } @@ -95,6 +96,7 @@ std = [ "cumulus-pallet-aura-ext/std", "cumulus-pallet-dmp-queue/std", "cumulus-pallet-parachain-system/std", + "cumulus-pallet-solo-to-para/std", "cumulus-pallet-xcm/std", "cumulus-pallet-xcmp-queue/std", "cumulus-primitives-core/std", diff --git a/runtime/pangolin-parachain/src/lib.rs b/runtime/pangolin-parachain/src/lib.rs index 68d7147..fda313f 100644 --- a/runtime/pangolin-parachain/src/lib.rs +++ b/runtime/pangolin-parachain/src/lib.rs @@ -188,6 +188,7 @@ frame_support::construct_runtime! { FromPangolinIssuing: dp_common_runtime::helixbridge::{Pallet, Call, Storage, Event} = 24, MessageRouter: dp_common_runtime::message_router::{Pallet, Call, Storage, Event} = 26, + SoloToPara: cumulus_pallet_solo_to_para::{Pallet, Call, Storage, Event} = 27, } } diff --git a/runtime/pangolin-parachain/src/pallets/mod.rs b/runtime/pangolin-parachain/src/pallets/mod.rs index 20d10f3..f058663 100644 --- a/runtime/pangolin-parachain/src/pallets/mod.rs +++ b/runtime/pangolin-parachain/src/pallets/mod.rs @@ -75,3 +75,6 @@ pub use helixbridge::*; pub mod message_router; pub use message_router::*; + +pub mod solo_to_para; +pub use solo_to_para::*; diff --git a/runtime/pangolin-parachain/src/pallets/parachain_system.rs b/runtime/pangolin-parachain/src/pallets/parachain_system.rs index 2b23a55..9314ecb 100644 --- a/runtime/pangolin-parachain/src/pallets/parachain_system.rs +++ b/runtime/pangolin-parachain/src/pallets/parachain_system.rs @@ -14,7 +14,7 @@ impl Config for Runtime { type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases; type DmpMessageHandler = DmpQueue; type Event = Event; - type OnSystemEvent = (); + type OnSystemEvent = cumulus_pallet_solo_to_para::Pallet; type OutboundXcmpMessageSource = XcmpQueue; type ReservedDmpWeight = ReservedDmpWeight; type ReservedXcmpWeight = ReservedXcmpWeight; diff --git a/runtime/pangolin-parachain/src/pallets/solo_to_para.rs b/runtime/pangolin-parachain/src/pallets/solo_to_para.rs new file mode 100644 index 0000000..68b3fa1 --- /dev/null +++ b/runtime/pangolin-parachain/src/pallets/solo_to_para.rs @@ -0,0 +1,6 @@ +// --- darwinia-network --- +use crate::*; + +impl cumulus_pallet_solo_to_para::Config for Runtime { + type Event = Event; +}