From 185b55336be88ac141bbef73d6478f1cc3cea165 Mon Sep 17 00:00:00 2001 From: iStrike7 Date: Thu, 9 Mar 2023 20:43:01 +0530 Subject: [PATCH 1/2] Changed GetMaintenanceTrait source --- cumulus/pallets/dmp-queue/Cargo.toml | 3 ++- cumulus/pallets/dmp-queue/src/lib.rs | 2 +- cumulus/pallets/parachain-system/Cargo.toml | 3 ++- cumulus/pallets/parachain-system/src/lib.rs | 2 +- cumulus/pallets/xcmp-queue/Cargo.toml | 3 ++- cumulus/pallets/xcmp-queue/src/lib.rs | 2 +- cumulus/parachain-template/runtime/Cargo.toml | 3 ++- cumulus/parachain-template/runtime/src/lib.rs | 2 +- cumulus/parachains/runtimes/assets/statemine/Cargo.toml | 3 ++- cumulus/parachains/runtimes/assets/statemine/src/lib.rs | 2 +- cumulus/parachains/runtimes/assets/statemint/Cargo.toml | 3 ++- cumulus/parachains/runtimes/assets/statemint/src/lib.rs | 2 +- cumulus/parachains/runtimes/assets/westmint/Cargo.toml | 3 ++- cumulus/parachains/runtimes/assets/westmint/src/lib.rs | 2 +- .../runtimes/bridge-hubs/bridge-hub-kusama/Cargo.toml | 3 ++- .../runtimes/bridge-hubs/bridge-hub-kusama/src/lib.rs | 2 +- .../runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml | 3 ++- .../runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs | 2 +- .../runtimes/collectives/collectives-polkadot/Cargo.toml | 3 ++- .../runtimes/collectives/collectives-polkadot/src/lib.rs | 2 +- .../parachains/runtimes/contracts/contracts-rococo/Cargo.toml | 3 ++- .../parachains/runtimes/contracts/contracts-rococo/src/lib.rs | 2 +- .../runtimes/contracts/contracts-rococo/src/xcm_config.rs | 2 +- cumulus/parachains/runtimes/starters/seedling/Cargo.toml | 3 ++- cumulus/parachains/runtimes/starters/seedling/src/lib.rs | 2 +- cumulus/parachains/runtimes/starters/shell/Cargo.toml | 3 ++- cumulus/parachains/runtimes/starters/shell/src/lib.rs | 2 +- cumulus/parachains/runtimes/testing/penpal/Cargo.toml | 3 ++- cumulus/parachains/runtimes/testing/penpal/src/lib.rs | 2 +- .../parachains/runtimes/testing/rococo-parachain/Cargo.toml | 3 ++- .../parachains/runtimes/testing/rococo-parachain/src/lib.rs | 2 +- cumulus/test/runtime/Cargo.toml | 3 ++- cumulus/test/runtime/src/lib.rs | 2 +- 33 files changed, 49 insertions(+), 33 deletions(-) diff --git a/cumulus/pallets/dmp-queue/Cargo.toml b/cumulus/pallets/dmp-queue/Cargo.toml index 4a9fd1cc997f6..18e5af26647ea 100644 --- a/cumulus/pallets/dmp-queue/Cargo.toml +++ b/cumulus/pallets/dmp-queue/Cargo.toml @@ -15,7 +15,7 @@ frame-system = { git = "https://github.com/paritytech/substrate", default-featur sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } -mangata-types = { git = "https://github.com/mangata-finance/substrate", default-features = false, branch = "mangata-dev" } +mangata-support = { git = "https://github.com/mangata-finance/substrate", default-features = false, branch = "mangata-dev" } # Polkadot xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.36" } @@ -40,6 +40,7 @@ std = [ "sp-std/std", "xcm/std", "cumulus-primitives-core/std", + "mangata-support/std" ] try-runtime = [ "frame-system/try-runtime", diff --git a/cumulus/pallets/dmp-queue/src/lib.rs b/cumulus/pallets/dmp-queue/src/lib.rs index 6327953a986ed..1e0f0576972cf 100644 --- a/cumulus/pallets/dmp-queue/src/lib.rs +++ b/cumulus/pallets/dmp-queue/src/lib.rs @@ -29,7 +29,7 @@ use frame_support::{ traits::EnsureOrigin, weights::{constants::WEIGHT_REF_TIME_PER_MILLIS, Weight}, }; -use mangata_types::traits::GetMaintenanceStatusTrait; +use mangata_support::traits::GetMaintenanceStatusTrait; pub use pallet::*; use scale_info::TypeInfo; use sp_runtime::RuntimeDebug; diff --git a/cumulus/pallets/parachain-system/Cargo.toml b/cumulus/pallets/parachain-system/Cargo.toml index 769c685a0990d..51aa63a072aa7 100644 --- a/cumulus/pallets/parachain-system/Cargo.toml +++ b/cumulus/pallets/parachain-system/Cargo.toml @@ -25,7 +25,7 @@ sp-state-machine = { git = "https://github.com/paritytech/substrate", default-fe sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } sp-trie = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } -mangata-types = { git = "https://github.com/mangata-finance/substrate", default-features = false, branch = "mangata-dev" } +mangata-support = { git = "https://github.com/mangata-finance/substrate", default-features = false, branch = "mangata-dev" } # Polkadot polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, features = [ "wasm-api" ], branch = "release-v0.9.36" } @@ -68,6 +68,7 @@ std = [ "sp-state-machine/std", "sp-std/std", "sp-trie/std", + "mangata-support/std" ] runtime-benchmarks = [ diff --git a/cumulus/pallets/parachain-system/src/lib.rs b/cumulus/pallets/parachain-system/src/lib.rs index 8cf20b33dc936..f93d2b0faad2e 100644 --- a/cumulus/pallets/parachain-system/src/lib.rs +++ b/cumulus/pallets/parachain-system/src/lib.rs @@ -44,7 +44,7 @@ use frame_support::{ weights::Weight, }; use frame_system::{ensure_none, ensure_root}; -use mangata_types::traits::GetMaintenanceStatusTrait; +use mangata_support::traits::GetMaintenanceStatusTrait; use polkadot_parachain::primitives::RelayChainBlockNumber; use sp_runtime::{ traits::{Block as BlockT, BlockNumberProvider, Hash, One, Zero}, diff --git a/cumulus/pallets/xcmp-queue/Cargo.toml b/cumulus/pallets/xcmp-queue/Cargo.toml index 82c78bcdaffb3..7ca2716fde7de 100644 --- a/cumulus/pallets/xcmp-queue/Cargo.toml +++ b/cumulus/pallets/xcmp-queue/Cargo.toml @@ -15,7 +15,7 @@ frame-support = { git = "https://github.com/paritytech/substrate", default-featu frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } -mangata-types = { git = "https://github.com/mangata-finance/substrate", default-features = false, branch = "mangata-dev" } +mangata-support = { git = "https://github.com/mangata-finance/substrate", default-features = false, branch = "mangata-dev" } # Polkadot xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.36" } @@ -53,6 +53,7 @@ std = [ "sp-std/std", "xcm-executor/std", "xcm/std", + "mangata-support/std" ] runtime-benchmarks = [ diff --git a/cumulus/pallets/xcmp-queue/src/lib.rs b/cumulus/pallets/xcmp-queue/src/lib.rs index 3d19c9b8a6078..c51a234890bb0 100644 --- a/cumulus/pallets/xcmp-queue/src/lib.rs +++ b/cumulus/pallets/xcmp-queue/src/lib.rs @@ -47,7 +47,7 @@ use frame_support::{ traits::EnsureOrigin, weights::{constants::WEIGHT_REF_TIME_PER_MILLIS, Weight}, }; -use mangata_types::traits::GetMaintenanceStatusTrait; +use mangata_support::traits::GetMaintenanceStatusTrait; use rand_chacha::{ rand_core::{RngCore, SeedableRng}, ChaChaRng, diff --git a/cumulus/parachain-template/runtime/Cargo.toml b/cumulus/parachain-template/runtime/Cargo.toml index d0a7d61d2c49b..13ccb18220b2f 100644 --- a/cumulus/parachain-template/runtime/Cargo.toml +++ b/cumulus/parachain-template/runtime/Cargo.toml @@ -51,7 +51,7 @@ sp-session = { git = "https://github.com/paritytech/substrate", default-features sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } -mangata-types = { git = "https://github.com/mangata-finance/substrate", default-features = false, branch = "mangata-dev" } +mangata-support = { git = "https://github.com/mangata-finance/substrate", default-features = false, branch = "mangata-dev" } # Polkadot pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.36" } @@ -122,6 +122,7 @@ std = [ "xcm-builder/std", "xcm-executor/std", "xcm/std", + "mangata-support/std" ] runtime-benchmarks = [ diff --git a/cumulus/parachain-template/runtime/src/lib.rs b/cumulus/parachain-template/runtime/src/lib.rs index 393e67323bf9c..80e17166e9aeb 100644 --- a/cumulus/parachain-template/runtime/src/lib.rs +++ b/cumulus/parachain-template/runtime/src/lib.rs @@ -10,7 +10,7 @@ mod weights; pub mod xcm_config; use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases; -use mangata_types::traits::GetMaintenanceStatusTrait; +use mangata_support::traits::GetMaintenanceStatusTrait; use smallvec::smallvec; use sp_api::impl_runtime_apis; use sp_core::{crypto::KeyTypeId, OpaqueMetadata}; diff --git a/cumulus/parachains/runtimes/assets/statemine/Cargo.toml b/cumulus/parachains/runtimes/assets/statemine/Cargo.toml index d3c690430679a..0b3b710f50ce1 100644 --- a/cumulus/parachains/runtimes/assets/statemine/Cargo.toml +++ b/cumulus/parachains/runtimes/assets/statemine/Cargo.toml @@ -45,7 +45,7 @@ sp-std = { git = "https://github.com/paritytech/substrate", default-features = f sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } pallet-state-trie-migration = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.36" } -mangata-types = { git = "https://github.com/mangata-finance/substrate", default-features = false, branch = "mangata-dev" } +mangata-support = { git = "https://github.com/mangata-finance/substrate", default-features = false, branch = "mangata-dev" } # Polkadot kusama-runtime-constants = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.36" } @@ -189,4 +189,5 @@ std = [ "pallet-collator-selection/std", "parachain-info/std", "parachains-common/std", + "mangata-support/std" ] diff --git a/cumulus/parachains/runtimes/assets/statemine/src/lib.rs b/cumulus/parachains/runtimes/assets/statemine/src/lib.rs index 2558c105b0418..74765f0f26caa 100644 --- a/cumulus/parachains/runtimes/assets/statemine/src/lib.rs +++ b/cumulus/parachains/runtimes/assets/statemine/src/lib.rs @@ -29,7 +29,7 @@ mod weights; pub mod xcm_config; use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases; -use mangata_types::traits::GetMaintenanceStatusTrait; +use mangata_support::traits::GetMaintenanceStatusTrait; use sp_api::impl_runtime_apis; use sp_core::{crypto::KeyTypeId, OpaqueMetadata}; use sp_runtime::{ diff --git a/cumulus/parachains/runtimes/assets/statemint/Cargo.toml b/cumulus/parachains/runtimes/assets/statemint/Cargo.toml index 171fe4b37e037..fcf201fe1f0a6 100644 --- a/cumulus/parachains/runtimes/assets/statemint/Cargo.toml +++ b/cumulus/parachains/runtimes/assets/statemint/Cargo.toml @@ -44,7 +44,7 @@ sp-session = { git = "https://github.com/paritytech/substrate", default-features sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } -mangata-types = { git = "https://github.com/mangata-finance/substrate", default-features = false, branch = "mangata-dev" } +mangata-support = { git = "https://github.com/mangata-finance/substrate", default-features = false, branch = "mangata-dev" } # Polkadot pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.36" } @@ -177,4 +177,5 @@ std = [ "pallet-collator-selection/std", "parachain-info/std", "parachains-common/std", + "mangata-support/std" ] diff --git a/cumulus/parachains/runtimes/assets/statemint/src/lib.rs b/cumulus/parachains/runtimes/assets/statemint/src/lib.rs index be49d7025d252..757a183fcf13f 100644 --- a/cumulus/parachains/runtimes/assets/statemint/src/lib.rs +++ b/cumulus/parachains/runtimes/assets/statemint/src/lib.rs @@ -58,7 +58,7 @@ mod weights; pub mod xcm_config; use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases; -use mangata_types::traits::GetMaintenanceStatusTrait; +use mangata_support::traits::GetMaintenanceStatusTrait; use sp_api::impl_runtime_apis; use sp_core::{crypto::KeyTypeId, OpaqueMetadata}; use sp_runtime::{ diff --git a/cumulus/parachains/runtimes/assets/westmint/Cargo.toml b/cumulus/parachains/runtimes/assets/westmint/Cargo.toml index 0889ed20d31ce..61f3cb71fb7b0 100644 --- a/cumulus/parachains/runtimes/assets/westmint/Cargo.toml +++ b/cumulus/parachains/runtimes/assets/westmint/Cargo.toml @@ -44,7 +44,7 @@ sp-session = { git = "https://github.com/paritytech/substrate", default-features sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } -mangata-types = { git = "https://github.com/mangata-finance/substrate", default-features = false, branch = "mangata-dev" } +mangata-support = { git = "https://github.com/mangata-finance/substrate", default-features = false, branch = "mangata-dev" } # Polkadot pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.36" } @@ -177,4 +177,5 @@ std = [ "pallet-collator-selection/std", "parachain-info/std", "parachains-common/std", + "mangata-support/std" ] diff --git a/cumulus/parachains/runtimes/assets/westmint/src/lib.rs b/cumulus/parachains/runtimes/assets/westmint/src/lib.rs index 73f70f7bcdf58..b71ae6b90a861 100644 --- a/cumulus/parachains/runtimes/assets/westmint/src/lib.rs +++ b/cumulus/parachains/runtimes/assets/westmint/src/lib.rs @@ -29,7 +29,7 @@ mod weights; pub mod xcm_config; use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases; -use mangata_types::traits::GetMaintenanceStatusTrait; +use mangata_support::traits::GetMaintenanceStatusTrait; use sp_api::impl_runtime_apis; use sp_core::{crypto::KeyTypeId, OpaqueMetadata}; use sp_runtime::{ diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/Cargo.toml b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/Cargo.toml index 4e86825b51ad6..6d48ae5f4cf20 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/Cargo.toml +++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/Cargo.toml @@ -46,7 +46,7 @@ sp-session = { git = "https://github.com/paritytech/substrate", default-features sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } -mangata-types = { git = "https://github.com/mangata-finance/substrate", default-features = false, branch = "mangata-dev" } +mangata-support = { git = "https://github.com/mangata-finance/substrate", default-features = false, branch = "mangata-dev" } # Polkadot kusama-runtime-constants = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.36" } @@ -127,6 +127,7 @@ std = [ "xcm-builder/std", "xcm-executor/std", "xcm/std", + "mangata-support/std" ] runtime-benchmarks = [ diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/lib.rs index 296decf8039ac..a89f698e7cdbb 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/lib.rs +++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/lib.rs @@ -27,7 +27,7 @@ mod weights; pub mod xcm_config; use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases; -use mangata_types::traits::GetMaintenanceStatusTrait; +use mangata_support::traits::GetMaintenanceStatusTrait; use sp_api::impl_runtime_apis; use sp_core::{crypto::KeyTypeId, OpaqueMetadata}; use sp_runtime::{ diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml index 96beef3efb51f..9fcd3b2a4f9fc 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml +++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml @@ -46,7 +46,7 @@ sp-session = { git = "https://github.com/paritytech/substrate", default-features sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } -mangata-types = { git = "https://github.com/mangata-finance/substrate", default-features = false, branch = "mangata-dev" } +mangata-support = { git = "https://github.com/mangata-finance/substrate", default-features = false, branch = "mangata-dev" } # Polkadot rococo-runtime-constants = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.36" } @@ -127,6 +127,7 @@ std = [ "xcm-builder/std", "xcm-executor/std", "xcm/std", + "mangata-support/std" ] runtime-benchmarks = [ diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs index fa5279d9e97eb..2c2f5901bf56c 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs +++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs @@ -27,7 +27,7 @@ mod weights; pub mod xcm_config; use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases; -use mangata_types::traits::GetMaintenanceStatusTrait; +use mangata_support::traits::GetMaintenanceStatusTrait; use smallvec::smallvec; use sp_api::impl_runtime_apis; use sp_core::{crypto::KeyTypeId, OpaqueMetadata}; diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/Cargo.toml b/cumulus/parachains/runtimes/collectives/collectives-polkadot/Cargo.toml index 211e2a78165a9..cf4e752313b92 100644 --- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/Cargo.toml +++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/Cargo.toml @@ -43,7 +43,7 @@ sp-session = { git = "https://github.com/paritytech/substrate", default-features sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } -mangata-types = { git = "https://github.com/mangata-finance/substrate", default-features = false, branch = "mangata-dev" } +mangata-support = { git = "https://github.com/mangata-finance/substrate", default-features = false, branch = "mangata-dev" } # Polkadot pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.36" } @@ -171,4 +171,5 @@ std = [ "pallet-collator-selection/std", "parachain-info/std", "parachains-common/std", + "mangata-support/std" ] diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/lib.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/lib.rs index 9e785bbfceeb6..54589fdfc0160 100644 --- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/lib.rs +++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/lib.rs @@ -44,7 +44,7 @@ pub mod xcm_config; use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases; use impls::{AllianceProposalProvider, ToParentTreasury}; -use mangata_types::traits::GetMaintenanceStatusTrait; +use mangata_support::traits::GetMaintenanceStatusTrait; use sp_api::impl_runtime_apis; use sp_core::{crypto::KeyTypeId, OpaqueMetadata}; use sp_runtime::{ diff --git a/cumulus/parachains/runtimes/contracts/contracts-rococo/Cargo.toml b/cumulus/parachains/runtimes/contracts/contracts-rococo/Cargo.toml index 8533bab200b1e..3425b154fb0aa 100644 --- a/cumulus/parachains/runtimes/contracts/contracts-rococo/Cargo.toml +++ b/cumulus/parachains/runtimes/contracts/contracts-rococo/Cargo.toml @@ -49,7 +49,7 @@ pallet-utility = { git = "https://github.com/paritytech/substrate", default-feat pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } pallet-contracts = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } pallet-contracts-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } -mangata-types = { git = "https://github.com/mangata-finance/substrate", default-features = false, branch = "mangata-dev" } +mangata-support = { git = "https://github.com/mangata-finance/substrate", default-features = false, branch = "mangata-dev" } # Polkadot kusama-runtime-constants = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.36" } @@ -130,6 +130,7 @@ std = [ "cumulus-primitives-core/std", "cumulus-primitives-timestamp/std", "cumulus-primitives-utility/std", + "mangata-support/std" ] runtime-benchmarks = [ diff --git a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs index be6b2c914bf2a..964e973f49e94 100644 --- a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs +++ b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs @@ -31,7 +31,7 @@ mod weights; mod xcm_config; use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases; -use mangata_types::traits::GetMaintenanceStatusTrait; +use mangata_support::traits::GetMaintenanceStatusTrait; use sp_api::impl_runtime_apis; use sp_core::{crypto::KeyTypeId, OpaqueMetadata}; use sp_runtime::{ diff --git a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/xcm_config.rs b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/xcm_config.rs index d072f51c7a49d..f2dad66f5465e 100644 --- a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/xcm_config.rs +++ b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/xcm_config.rs @@ -22,7 +22,7 @@ use frame_support::{ traits::{EitherOfDiverse, Everything, Nothing}, }; use frame_system::EnsureRoot; -use mangata_types::traits::GetMaintenanceStatusTrait; +use mangata_support::traits::GetMaintenanceStatusTrait; use pallet_xcm::{EnsureXcm, IsMajorityOfBody, XcmPassthrough}; use parachains_common::xcm_config::{DenyReserveTransferToRelayChain, DenyThenTry}; use polkadot_parachain::primitives::Sibling; diff --git a/cumulus/parachains/runtimes/starters/seedling/Cargo.toml b/cumulus/parachains/runtimes/starters/seedling/Cargo.toml index 9eeffb2bec2e6..9e0ac1e3644d5 100644 --- a/cumulus/parachains/runtimes/starters/seedling/Cargo.toml +++ b/cumulus/parachains/runtimes/starters/seedling/Cargo.toml @@ -24,7 +24,7 @@ sp-session = { git = "https://github.com/paritytech/substrate", default-features sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } -mangata-types = { git = "https://github.com/mangata-finance/substrate", default-features = false, branch = "mangata-dev" } +mangata-support = { git = "https://github.com/mangata-finance/substrate", default-features = false, branch = "mangata-dev" } # Cumulus cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false } @@ -61,4 +61,5 @@ std = [ "cumulus-primitives-core/std", "parachain-info/std", "parachains-common/std", + "mangata-support/std" ] diff --git a/cumulus/parachains/runtimes/starters/seedling/src/lib.rs b/cumulus/parachains/runtimes/starters/seedling/src/lib.rs index 4a08879a2acce..e3863a3662c72 100644 --- a/cumulus/parachains/runtimes/starters/seedling/src/lib.rs +++ b/cumulus/parachains/runtimes/starters/seedling/src/lib.rs @@ -28,7 +28,7 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs")); use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases; -use mangata_types::traits::GetMaintenanceStatusTrait; +use mangata_support::traits::GetMaintenanceStatusTrait; use sp_api::impl_runtime_apis; use sp_core::OpaqueMetadata; use sp_runtime::{ diff --git a/cumulus/parachains/runtimes/starters/shell/Cargo.toml b/cumulus/parachains/runtimes/starters/shell/Cargo.toml index bf1bdc971ad2d..30793ec2fe3e8 100644 --- a/cumulus/parachains/runtimes/starters/shell/Cargo.toml +++ b/cumulus/parachains/runtimes/starters/shell/Cargo.toml @@ -23,7 +23,7 @@ sp-session = { git = "https://github.com/paritytech/substrate", default-features sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } -mangata-types = { git = "https://github.com/mangata-finance/substrate", default-features = false, branch = "mangata-dev" } +mangata-support = { git = "https://github.com/mangata-finance/substrate", default-features = false, branch = "mangata-dev" } # Polkadot xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.36" } @@ -66,6 +66,7 @@ std = [ "cumulus-primitives-core/std", "parachain-info/std", "parachains-common/std", + "mangata-support/std" ] try-runtime = [ "frame-executive/try-runtime", diff --git a/cumulus/parachains/runtimes/starters/shell/src/lib.rs b/cumulus/parachains/runtimes/starters/shell/src/lib.rs index 3bf717e6dfcbc..0e59dc9446a86 100644 --- a/cumulus/parachains/runtimes/starters/shell/src/lib.rs +++ b/cumulus/parachains/runtimes/starters/shell/src/lib.rs @@ -34,7 +34,7 @@ pub mod xcm_config; use codec::{Decode, Encode}; use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases; use frame_support::unsigned::TransactionValidityError; -use mangata_types::traits::GetMaintenanceStatusTrait; +use mangata_support::traits::GetMaintenanceStatusTrait; use scale_info::TypeInfo; use sp_api::impl_runtime_apis; use sp_core::OpaqueMetadata; diff --git a/cumulus/parachains/runtimes/testing/penpal/Cargo.toml b/cumulus/parachains/runtimes/testing/penpal/Cargo.toml index dde95c0f50a10..f398a93b18754 100644 --- a/cumulus/parachains/runtimes/testing/penpal/Cargo.toml +++ b/cumulus/parachains/runtimes/testing/penpal/Cargo.toml @@ -50,7 +50,7 @@ sp-session = { git = "https://github.com/paritytech/substrate", default-features sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } -mangata-types = { git = "https://github.com/mangata-finance/substrate", default-features = false, branch = "mangata-dev" } +mangata-support = { git = "https://github.com/mangata-finance/substrate", default-features = false, branch = "mangata-dev" } # Polkadot polkadot-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.36" } @@ -125,6 +125,7 @@ std = [ "xcm-builder/std", "xcm-executor/std", "xcm/std", + "mangata-support/std" ] runtime-benchmarks = [ diff --git a/cumulus/parachains/runtimes/testing/penpal/src/lib.rs b/cumulus/parachains/runtimes/testing/penpal/src/lib.rs index dc81626690875..459cbc62eea12 100644 --- a/cumulus/parachains/runtimes/testing/penpal/src/lib.rs +++ b/cumulus/parachains/runtimes/testing/penpal/src/lib.rs @@ -46,7 +46,7 @@ use frame_system::{ limits::{BlockLength, BlockWeights}, EnsureRoot, EnsureSigned, }; -use mangata_types::traits::GetMaintenanceStatusTrait; +use mangata_support::traits::GetMaintenanceStatusTrait; use smallvec::smallvec; use sp_api::impl_runtime_apis; pub use sp_consensus_aura::sr25519::AuthorityId as AuraId; diff --git a/cumulus/parachains/runtimes/testing/rococo-parachain/Cargo.toml b/cumulus/parachains/runtimes/testing/rococo-parachain/Cargo.toml index a33f5fcdb32d9..bdeaa9b969621 100644 --- a/cumulus/parachains/runtimes/testing/rococo-parachain/Cargo.toml +++ b/cumulus/parachains/runtimes/testing/rococo-parachain/Cargo.toml @@ -33,7 +33,7 @@ sp-session = { git = "https://github.com/paritytech/substrate", default-features sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } -mangata-types = { git = "https://github.com/mangata-finance/substrate", default-features = false, branch = "mangata-dev" } +mangata-support = { git = "https://github.com/mangata-finance/substrate", default-features = false, branch = "mangata-dev" } # Polkadot pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.36" } @@ -100,6 +100,7 @@ std = [ "cumulus-primitives-utility/std", "parachain-info/std", "parachains-common/std", + "mangata-support/std" ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", diff --git a/cumulus/parachains/runtimes/testing/rococo-parachain/src/lib.rs b/cumulus/parachains/runtimes/testing/rococo-parachain/src/lib.rs index ce9d8e4c93eaa..4adc8ea5b5ad1 100644 --- a/cumulus/parachains/runtimes/testing/rococo-parachain/src/lib.rs +++ b/cumulus/parachains/runtimes/testing/rococo-parachain/src/lib.rs @@ -23,7 +23,7 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs")); use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases; -use mangata_types::traits::GetMaintenanceStatusTrait; +use mangata_support::traits::GetMaintenanceStatusTrait; use sp_api::impl_runtime_apis; use sp_core::OpaqueMetadata; use sp_runtime::{ diff --git a/cumulus/test/runtime/Cargo.toml b/cumulus/test/runtime/Cargo.toml index 31477228a02ce..0d9d26573c419 100644 --- a/cumulus/test/runtime/Cargo.toml +++ b/cumulus/test/runtime/Cargo.toml @@ -28,7 +28,7 @@ sp-session = { git = "https://github.com/paritytech/substrate", default-features sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.36" } -mangata-types = { git = "https://github.com/mangata-finance/substrate", default-features = false, branch = "mangata-dev" } +mangata-support = { git = "https://github.com/mangata-finance/substrate", default-features = false, branch = "mangata-dev" } # Cumulus cumulus-pallet-parachain-system = { path = "../../pallets/parachain-system", default-features = false } @@ -66,5 +66,6 @@ std = [ "cumulus-pallet-parachain-system/std", "cumulus-primitives-core/std", "cumulus-primitives-timestamp/std", + "mangata-support/std" ] increment-spec-version = [] diff --git a/cumulus/test/runtime/src/lib.rs b/cumulus/test/runtime/src/lib.rs index c0d0217de3bf5..295172f6287af 100644 --- a/cumulus/test/runtime/src/lib.rs +++ b/cumulus/test/runtime/src/lib.rs @@ -30,7 +30,7 @@ pub mod wasm_spec_version_incremented { mod test_pallet; use frame_support::traits::OnRuntimeUpgrade; -use mangata_types::traits::GetMaintenanceStatusTrait; +use mangata_support::traits::GetMaintenanceStatusTrait; use sp_api::{decl_runtime_apis, impl_runtime_apis}; use sp_core::OpaqueMetadata; use sp_runtime::{ From c8b3c3034e4cb831c938fb47958193ed3a8c3e55 Mon Sep 17 00:00:00 2001 From: iStrike7 Date: Fri, 10 Mar 2023 14:57:58 +0530 Subject: [PATCH 2/2] removed mangata-node references from patches --- cumulus/Cargo.toml | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/cumulus/Cargo.toml b/cumulus/Cargo.toml index 3837c5771a807..0e08bc153437d 100644 --- a/cumulus/Cargo.toml +++ b/cumulus/Cargo.toml @@ -59,20 +59,6 @@ inherits = "release" lto = true codegen-units = 1 -[patch."https://github.com/mangata-finance/mangata-node"] -# pallet-xyk = { path = "../mangata-node/pallets/xyk" } -# pallet-issuance = {path = "../mangata-node/pallets/issuance/"} -# pallet-multipurpose-liquidity = { path = '../mangata-node/pallets/multipurpose-liquidity'} -# pallet-maintenance = { path = '../mangata-node/pallets/maintenance'} -# mp-multipurpose-liquidity = { path = '../mangata-node/primitives/multipurpose-liquidity'} -# mp-traits = { path = '../mangata-node/primitives/traits'} -pallet-xyk = { git = "https://github.com/mangata-finance//mangata-node", branch = "develop" } -pallet-issuance = { git = "https://github.com/mangata-finance//mangata-node", branch = "develop" } -pallet-multipurpose-liquidity = { git = "https://github.com/mangata-finance//mangata-node", branch = "develop" } -pallet-maintenance = { git = "https://github.com/mangata-finance//mangata-node", branch = "develop" } -mp-multipurpose-liquidity = { git = "https://github.com/mangata-finance//mangata-node", branch = "develop" } -mp-traits = { git = "https://github.com/mangata-finance//mangata-node", branch = "develop" } - # patch generated by ./scripts/dev-0.9.29_manifest.sh [patch."https://github.com/mangata-finance/open-runtime-module-library"] orml-xcm = { git = "https://github.com/mangata-finance//open-runtime-module-library", branch = "mangata-dev" } @@ -441,6 +427,7 @@ polkadot-erasure-coding = { git = "https://github.com/mangata-finance//polkadot" pallet-vesting-mangata-rpc = { git = "https://github.com/mangata-finance//substrate", branch = "mangata-dev" } mangata-types = { git = "https://github.com/mangata-finance//substrate", branch = "mangata-dev" } pallet-utility-mangata = { git = "https://github.com/mangata-finance//substrate", branch = "mangata-dev" } + mangata-support = { git = "https://github.com/mangata-finance//substrate", branch = "mangata-dev" } # patch generated by ./scripts/dev-0.9.29_manifest.sh [patch."https://github.com/paritytech/substrate"] @@ -626,7 +613,7 @@ polkadot-erasure-coding = { git = "https://github.com/mangata-finance//polkadot" pallet-vesting-mangata-rpc-runtime-api = { git = "https://github.com/mangata-finance//substrate", branch = "mangata-dev" } pallet-vesting-mangata-rpc = { git = "https://github.com/mangata-finance//substrate", branch = "mangata-dev" } pallet-utility-mangata = { git = "https://github.com/mangata-finance//substrate", branch = "mangata-dev" } - + mangata-support = { git = "https://github.com/mangata-finance//substrate", branch = "mangata-dev" } # patch generated by ./scripts/dev-0.9.29_manifest.sh [patch."https://github.com/PureStake/substrate"] mmr-rpc = { git = "https://github.com/mangata-finance//substrate", branch = "mangata-dev" } @@ -810,6 +797,7 @@ polkadot-erasure-coding = { git = "https://github.com/mangata-finance//polkadot" pallet-vesting-mangata-rpc-runtime-api = { git = "https://github.com/mangata-finance//substrate", branch = "mangata-dev" } pallet-vesting-mangata-rpc = { git = "https://github.com/mangata-finance//substrate", branch = "mangata-dev" } pallet-utility-mangata = { git = "https://github.com/mangata-finance//substrate", branch = "mangata-dev" } + mangata-support = { git = "https://github.com/mangata-finance//substrate", branch = "mangata-dev" } # patch generated by ./scripts/dev_manifest.sh [patch."https://github.com/mangata-finance/cumulus"]