From 3546c83b12386af35874edba3c75116c7f92d64b Mon Sep 17 00:00:00 2001 From: Alessandro Siniscalchi Date: Thu, 3 Oct 2024 15:21:53 +0200 Subject: [PATCH] remove staging- --- Cargo.toml | 8 +++---- node/Cargo.toml | 2 +- node/src/chain_spec/mod.rs | 2 +- runtime/laos/Cargo.toml | 22 +++++++++---------- runtime/laos/src/configs/mod.rs | 2 +- runtime/laos/src/configs/xcm_config.rs | 10 ++++----- runtime/laos/src/configs/xcm_message_queue.rs | 4 ++-- runtime/laos/src/lib.rs | 2 +- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f1c60bb59..7114892aa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -176,7 +176,7 @@ cumulus-pallet-session-benchmarking = { git = "https://github.com/paritytech/pol cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } cumulus-primitives-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } cumulus-primitives-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } -staging-parachain-info = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +parachain-info = { package = "staging-parachain-info", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } parachains-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } # (native) @@ -204,9 +204,9 @@ polkadot-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch # XCM # (wasm) cumulus-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } -staging-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } -staging-xcm-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } -staging-xcm-executor = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } # (native) polkadot-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } diff --git a/node/Cargo.toml b/node/Cargo.toml index b71170082..ed144e1ad 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -54,7 +54,7 @@ substrate-prometheus-endpoint = { workspace = true } polkadot-cli = { workspace = true, features = ["rococo-native"] } polkadot-service = { workspace = true, features = ["rococo-native"] } polkadot-primitives = { workspace = true } -staging-xcm = { workspace = true } +xcm = { workspace = true } laos-primitives = { workspace = true } # Cumulus diff --git a/node/src/chain_spec/mod.rs b/node/src/chain_spec/mod.rs index 83db9f8de..b137a46f1 100644 --- a/node/src/chain_spec/mod.rs +++ b/node/src/chain_spec/mod.rs @@ -23,7 +23,7 @@ pub mod laos; mod predefined_accounts; /// The default XCM version to set in genesis config. -const SAFE_XCM_VERSION: u32 = staging_xcm::prelude::XCM_VERSION; +const SAFE_XCM_VERSION: u32 = xcm::prelude::XCM_VERSION; /// Helper function to generate a crypto pair from seed fn get_from_seed(seed: &str) -> ::Public { diff --git a/runtime/laos/Cargo.toml b/runtime/laos/Cargo.toml index f9bd0b5eb..90c68c265 100644 --- a/runtime/laos/Cargo.toml +++ b/runtime/laos/Cargo.toml @@ -77,9 +77,9 @@ pallet-precompiles-benchmark = { workspace = true } pallet-xcm = { workspace = true } polkadot-runtime-common = { workspace = true } polkadot-parachain-primitives = { workspace = true } -staging-xcm = { workspace = true } -staging-xcm-builder = { workspace = true } -staging-xcm-executor = { workspace = true } +xcm = { workspace = true } +xcm-builder = { workspace = true } +xcm-executor = { workspace = true } # Cumulus cumulus-pallet-aura-ext = { workspace = true } @@ -90,7 +90,7 @@ cumulus-pallet-xcmp-queue = { workspace = true } cumulus-primitives-core = { workspace = true } cumulus-primitives-timestamp = { workspace = true } cumulus-primitives-utility = { workspace = true } -staging-parachain-info = { workspace = true } +parachain-info = { workspace = true } parachains-common = { workspace = true } # Frontier @@ -168,7 +168,7 @@ std = [ "pallet-precompiles-benchmark/std", "pallet-transaction-payment/std", "pallet-xcm/std", - "staging-parachain-info/std", + "parachain-info/std", "polkadot-parachain-primitives/std", "polkadot-runtime-common/std", "sp-api/std", @@ -185,9 +185,9 @@ std = [ "sp-version/std", "sp-weights/std", "sp-genesis-builder/std", - "staging-xcm-builder/std", - "staging-xcm-executor/std", - "staging-xcm/std", + "xcm-builder/std", + "xcm-executor/std", + "xcm/std", "substrate-wasm-builder", # Frontier "fp-evm/std", @@ -237,7 +237,7 @@ runtime-benchmarks = [ "pallet-elections-phragmen/runtime-benchmarks", "pallet-xcm/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "staging-xcm-builder/runtime-benchmarks", + "xcm-builder/runtime-benchmarks", "cumulus-pallet-session-benchmarking/runtime-benchmarks", "cumulus-pallet-xcmp-queue/runtime-benchmarks", "pallet-message-queue/runtime-benchmarks", @@ -247,7 +247,7 @@ runtime-benchmarks = [ "pallet-sudo/runtime-benchmarks", "polkadot-parachain-primitives/runtime-benchmarks", "polkadot-runtime-common/runtime-benchmarks", - "staging-xcm-executor/runtime-benchmarks", + "xcm-executor/runtime-benchmarks", "pallet-asset-metadata-extender/runtime-benchmarks", "pallet-vesting/runtime-benchmarks", "pallet-scheduler/runtime-benchmarks", @@ -285,7 +285,7 @@ try-runtime = [ "pallet-treasury/try-runtime", "pallet-transaction-payment/try-runtime", "pallet-xcm/try-runtime", - "staging-parachain-info/try-runtime", + "parachain-info/try-runtime", "pallet-evm/try-runtime", "pallet-evm-chain-id/try-runtime", "pallet-ethereum/try-runtime", diff --git a/runtime/laos/src/configs/mod.rs b/runtime/laos/src/configs/mod.rs index adc426cc7..8f2550feb 100644 --- a/runtime/laos/src/configs/mod.rs +++ b/runtime/laos/src/configs/mod.rs @@ -57,4 +57,4 @@ parameter_types! { impl cumulus_pallet_aura_ext::Config for Runtime {} impl pallet_evm_chain_id::Config for Runtime {} -impl staging_parachain_info::Config for Runtime {} +impl parachain_info::Config for Runtime {} diff --git a/runtime/laos/src/configs/xcm_config.rs b/runtime/laos/src/configs/xcm_config.rs index 06e9ff856..031778789 100644 --- a/runtime/laos/src/configs/xcm_config.rs +++ b/runtime/laos/src/configs/xcm_config.rs @@ -28,8 +28,8 @@ use frame_system::{EnsureRoot, RawOrigin as SystemRawOrigin}; use pallet_xcm::XcmPassthrough; use polkadot_parachain_primitives::primitives::Sibling; use sp_runtime::traits::TryConvert; -use staging_xcm::latest::prelude::*; -use staging_xcm_builder::{ +use xcm::latest::prelude::*; +use xcm_builder::{ AccountKey20Aliases, AllowExplicitUnpaidExecutionFrom, AllowTopLevelPaidExecutionFrom, DenyReserveTransferToRelayChain, DenyThenTry, EnsureXcmOrigin, FixedWeightBounds, FrameTransactionalProcessor, FungibleAdapter, IsConcrete, NativeAsset, ParentIsPreset, @@ -37,7 +37,7 @@ use staging_xcm_builder::{ SignedAccountKey20AsNative, SovereignSignedViaLocation, TakeWeightCredit, TrailingSetTopicAsId, UsingComponents, WithComputedOrigin, }; -use staging_xcm_executor::XcmExecutor; +use xcm_executor::XcmExecutor; parameter_types! { pub const RelayLocation: Location = Location::parent(); @@ -128,7 +128,7 @@ pub type Barrier = TrailingSetTopicAsId< >; pub struct XcmConfig; -impl staging_xcm_executor::Config for XcmConfig { +impl xcm_executor::Config for XcmConfig { type RuntimeCall = RuntimeCall; type XcmSender = XcmRouter; // How to withdraw and deposit an asset. @@ -171,7 +171,7 @@ pub type LocalOriginToLocation = SignedToAccountId20, // ..and XCMP to communicate with the sibling chains. diff --git a/runtime/laos/src/configs/xcm_message_queue.rs b/runtime/laos/src/configs/xcm_message_queue.rs index 02b7ed6b4..86a9a5b71 100644 --- a/runtime/laos/src/configs/xcm_message_queue.rs +++ b/runtime/laos/src/configs/xcm_message_queue.rs @@ -23,9 +23,9 @@ impl pallet_message_queue::Config for Runtime { type MessageProcessor = pallet_message_queue::mock_helpers::NoopMessageProcessor; #[cfg(not(feature = "runtime-benchmarks"))] - type MessageProcessor = staging_xcm_builder::ProcessXcmMessage< + type MessageProcessor = xcm_builder::ProcessXcmMessage< AggregateMessageOrigin, - staging_xcm_executor::XcmExecutor, + xcm_executor::XcmExecutor, crate::RuntimeCall, >; type Size = u32; diff --git a/runtime/laos/src/lib.rs b/runtime/laos/src/lib.rs index de8af9288..56ee94891 100644 --- a/runtime/laos/src/lib.rs +++ b/runtime/laos/src/lib.rs @@ -104,7 +104,7 @@ construct_runtime!( System: frame_system = 0, ParachainSystem: cumulus_pallet_parachain_system = 1, Timestamp: pallet_timestamp = 2, - ParachainInfo: staging_parachain_info = 3, + ParachainInfo: parachain_info = 3, Sudo: pallet_sudo = 4, Utility: pallet_utility = 5, Multisig: pallet_multisig = 6,