diff --git a/Cargo.lock b/Cargo.lock index 6d53721379..e13228c6e9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -213,6 +213,7 @@ dependencies = [ "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=8d5432c3458702a7df14b374bddde43a2a20aa43)", "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=8d5432c3458702a7df14b374bddde43a2a20aa43)", "orml-unknown-tokens", + "orml-xcm", "orml-xcm-support", "orml-xtokens", "pallet-aura", @@ -807,6 +808,7 @@ dependencies = [ "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=8d5432c3458702a7df14b374bddde43a2a20aa43)", "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=8d5432c3458702a7df14b374bddde43a2a20aa43)", "orml-unknown-tokens", + "orml-xcm", "orml-xcm-support", "orml-xtokens", "pallet-aura", @@ -2273,6 +2275,7 @@ dependencies = [ "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=8d5432c3458702a7df14b374bddde43a2a20aa43)", "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=8d5432c3458702a7df14b374bddde43a2a20aa43)", "orml-unknown-tokens", + "orml-xcm", "orml-xcm-support", "orml-xtokens", "pallet-aura", @@ -5523,6 +5526,18 @@ dependencies = [ "sp-std", ] +[[package]] +name = "orml-xcm" +version = "0.4.1-dev" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=8d5432c3458702a7df14b374bddde43a2a20aa43#8d5432c3458702a7df14b374bddde43a2a20aa43" +dependencies = [ + "frame-support", + "frame-system", + "pallet-xcm", + "parity-scale-codec", + "xcm", +] + [[package]] name = "orml-xcm-support" version = "0.4.1-dev" diff --git a/Cargo.toml b/Cargo.toml index fb426d284e..615127e98c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -198,4 +198,5 @@ orml-currencies = {git = "https://github.com/open-web3-stack/open-runtime-module orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43" } orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43" } orml-unknown-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43" } +orml-xcm = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43" } orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43" } \ No newline at end of file diff --git a/runtime/asgard/Cargo.toml b/runtime/asgard/Cargo.toml index e133534bb6..9a3fbbccee 100644 --- a/runtime/asgard/Cargo.toml +++ b/runtime/asgard/Cargo.toml @@ -101,6 +101,7 @@ orml-tokens = { version = "0.4.1-dev", default-features = false } orml-traits = { version = "0.4.1-dev", default-features = false } orml-xtokens = { version = "0.4.1-dev", default-features = false } orml-unknown-tokens = { version = "0.4.1-dev", default-features = false } +orml-xcm = { version = "0.4.1-dev", default-features = false } orml-xcm-support = { version = "0.4.1-dev", default-features = false } zenlink-protocol = { version = "*", default-features = false } @@ -184,6 +185,7 @@ std = [ "orml-tokens/std", "orml-xtokens/std", "orml-unknown-tokens/std", + "orml-xcm/std", "orml-xcm-support/std", "zenlink-protocol/std", "zenlink-protocol-runtime-api/std", diff --git a/runtime/asgard/src/lib.rs b/runtime/asgard/src/lib.rs index 4ce40a00b2..fd0cf70836 100644 --- a/runtime/asgard/src/lib.rs +++ b/runtime/asgard/src/lib.rs @@ -1272,6 +1272,11 @@ impl orml_unknown_tokens::Config for Runtime { type Event = Event; } +impl orml_xcm::Config for Runtime { + type Event = Event; + type SovereignOrigin = MoreThanHalfCouncil; +} + // orml runtime end construct_runtime! { @@ -1332,6 +1337,7 @@ construct_runtime! { Tokens: orml_tokens::{Pallet, Call, Storage, Event, Config} = 71, Currencies: orml_currencies::{Pallet, Call, Event} = 72, UnknownTokens: orml_unknown_tokens::{Pallet, Storage, Event} = 73, + OrmlXcm: orml_xcm::{Pallet, Call, Event} = 74, // Bifrost modules VtokenMint: bifrost_vtoken_mint::{Pallet, Call, Storage, Event, Config} = 101, diff --git a/runtime/bifrost/Cargo.toml b/runtime/bifrost/Cargo.toml index 29bfcf4afd..a9e14e78ff 100644 --- a/runtime/bifrost/Cargo.toml +++ b/runtime/bifrost/Cargo.toml @@ -96,6 +96,7 @@ orml-tokens = { version = "0.4.1-dev", default-features = false } orml-traits = { version = "0.4.1-dev", default-features = false } orml-xtokens = { version = "0.4.1-dev", default-features = false } orml-unknown-tokens = { version = "0.4.1-dev", default-features = false } +orml-xcm = { version = "0.4.1-dev", default-features = false } orml-xcm-support = { version = "0.4.1-dev", default-features = false } [build-dependencies] @@ -157,6 +158,7 @@ std = [ "orml-tokens/std", "orml-xtokens/std", "orml-unknown-tokens/std", + "orml-xcm/std", "orml-xcm-support/std", "bifrost-runtime-common/std", "bifrost-flexible-fee/std", diff --git a/runtime/bifrost/src/lib.rs b/runtime/bifrost/src/lib.rs index 510021951f..1b2b453718 100644 --- a/runtime/bifrost/src/lib.rs +++ b/runtime/bifrost/src/lib.rs @@ -905,6 +905,11 @@ impl orml_unknown_tokens::Config for Runtime { type Event = Event; } +impl orml_xcm::Config for Runtime { + type Event = Event; + type SovereignOrigin = MoreThanHalfCouncil; +} + // orml runtime end // Bifrost modules start @@ -1077,6 +1082,7 @@ construct_runtime! { Tokens: orml_tokens::{Pallet, Call, Storage, Event} = 71, Currencies: orml_currencies::{Pallet, Call, Event} = 72, UnknownTokens: orml_unknown_tokens::{Pallet, Storage, Event} = 73, + OrmlXcm: orml_xcm::{Pallet, Call, Event} = 74, // Bifrost modules FlexibleFee: bifrost_flexible_fee::{Pallet, Call, Storage, Event} = 100, diff --git a/runtime/dev/Cargo.toml b/runtime/dev/Cargo.toml index e1046d3bd3..ffcb5b97fe 100644 --- a/runtime/dev/Cargo.toml +++ b/runtime/dev/Cargo.toml @@ -99,6 +99,7 @@ orml-tokens = { version = "0.4.1-dev", default-features = false } orml-traits = { version = "0.4.1-dev", default-features = false } orml-xtokens = { version = "0.4.1-dev", default-features = false } orml-unknown-tokens = { version = "0.4.1-dev", default-features = false } +orml-xcm = { version = "0.4.1-dev", default-features = false } orml-xcm-support = { version = "0.4.1-dev", default-features = false } zenlink-protocol = { version = "*", default-features = false } @@ -180,6 +181,7 @@ std = [ "orml-traits/std", "orml-tokens/std", "orml-xtokens/std", + "orml-xcm/std", "orml-xcm-support/std", "zenlink-protocol/std", "zenlink-protocol-runtime-api/std", diff --git a/runtime/dev/src/lib.rs b/runtime/dev/src/lib.rs index ea69a25f12..e1d61981c6 100644 --- a/runtime/dev/src/lib.rs +++ b/runtime/dev/src/lib.rs @@ -1247,6 +1247,11 @@ impl orml_unknown_tokens::Config for Runtime { type Event = Event; } +impl orml_xcm::Config for Runtime { + type Event = Event; + type SovereignOrigin = MoreThanHalfCouncil; +} + // orml runtime end construct_runtime! { @@ -1303,6 +1308,7 @@ construct_runtime! { Tokens: orml_tokens::{Pallet, Call, Storage, Event, Config} = 71, Currencies: orml_currencies::{Pallet, Call, Event} = 72, UnknownTokens: orml_unknown_tokens::{Pallet, Storage, Event} = 73, + OrmlXcm: orml_xcm::{Pallet, Call, Event} = 74, // Bifrost modules VtokenMint: bifrost_vtoken_mint::{Pallet, Call, Storage, Event, Config} = 101,