From cedcaa2fa473bc4a5dfb9e6cd6171ddca569a2ba Mon Sep 17 00:00:00 2001 From: 4meta5 Date: Sat, 11 Jan 2025 23:28:42 -0500 Subject: [PATCH 1/6] upgrade to stable2412 for crates used in templates only --- Cargo.dev.toml | 62 +++++++++---------- traits/src/asset_registry.rs | 2 +- traits/src/location.rs | 2 +- traits/src/multi_asset.rs | 2 +- traits/src/xcm_transfer.rs | 2 +- xcm-support/src/currency_adapter.rs | 2 +- xcm-support/src/lib.rs | 2 +- xtokens/src/lib.rs | 2 +- xtokens/src/mock/para.rs | 2 +- xtokens/src/mock/para_relative_view.rs | 2 +- xtokens/src/mock/para_teleport.rs | 2 +- xtokens/src/mock/relay.rs | 2 +- xtokens/src/mock/teleport_currency_adapter.rs | 2 +- 13 files changed, 43 insertions(+), 43 deletions(-) diff --git a/Cargo.dev.toml b/Cargo.dev.toml index 0c7e48623..f82746dd9 100644 --- a/Cargo.dev.toml +++ b/Cargo.dev.toml @@ -37,35 +37,35 @@ scale-info = { version = "2.10.0", default-features = false, features = ["derive serde = { version = "1.0.189" } parity-scale-codec = { version = "3.6.5", default-features = false, features = ["max-encoded-len"] } -cumulus-pallet-xcm = { version = "0.17.0", default-features = false } -cumulus-primitives-core = { version = "0.16.0", default-features = false } -frame-benchmarking = { version = "38.0.0", default-features = false } -frame-support = { version = "38.0.0", default-features = false } -frame-system = { version = "38.0.0", default-features = false } -pallet-balances = { version = "39.0.0", default-features = false } -pallet-elections-phragmen = { version = "39.0.0", default-features = false } -pallet-message-queue = { version = "41.0.1", default-features = false } -pallet-preimage = { version = "38.0.0", default-features = false } -pallet-root-testing = { version = "14.0.0", default-features = false } -pallet-scheduler = { version = "39.0.0", default-features = false } -pallet-timestamp = { version = "37.0.0", default-features = false } -pallet-treasury = { version = "37.0.0", default-features = false } -pallet-xcm = { version = "17.0.0", default-features = false } -polkadot-parachain-primitives = { version = "14.0.0", default-features = false } -polkadot-runtime-common = { version = "17.0.0", default-features = false } -polkadot-runtime-parachains = { version = "17.0.1", default-features = false } -sp-api = { version = "34.0.0", default-features = false } -sp-application-crypto = { version = "38.0.0", default-features = false } -sp-arithmetic = { version = "26.0.0", default-features = false } -sp-core = { version = "34.0.0", default-features = false } -sp-io = { version = "38.0.0", default-features = false } -sp-runtime = { version = "39.0.1", default-features = false } -sp-runtime-interface = { version = "28.0.0", default-features = false } -sp-staking = { version = "36.0.0", default-features = false } -sp-std = { version = "14.0.0", default-features = false } -sp-storage = { version = "21.0.0", default-features = false } -xcm = { version = "14.2.0", package = "staging-xcm", default-features = false } -xcm-builder = { version = "17.0.1", package = "staging-xcm-builder", default-features = false } -xcm-executor = { version = "17.0.0", package = "staging-xcm-executor", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +pallet-elections-phragmen = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +pallet-message-queue = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +pallet-root-testing = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +polkadot-parachain-primitives = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +sp-api = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +sp-runtime-interface = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +sp-staking = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +sp-storage = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -xcm-simulator = { version = "17.0.0" } +xcm-simulator = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } diff --git a/traits/src/asset_registry.rs b/traits/src/asset_registry.rs index 903838cea..0ccdbc899 100644 --- a/traits/src/asset_registry.rs +++ b/traits/src/asset_registry.rs @@ -1,7 +1,7 @@ use frame_support::pallet_prelude::*; use sp_runtime::DispatchResult; use sp_std::fmt::Debug; -use xcm::v4::prelude::*; +use xcm::v5::prelude::*; use xcm::VersionedLocation; pub trait WeightToFeeConverter { diff --git a/traits/src/location.rs b/traits/src/location.rs index 761304424..cc1124b50 100644 --- a/traits/src/location.rs +++ b/traits/src/location.rs @@ -1,5 +1,5 @@ use sp_core::{bounded::BoundedVec, ConstU32}; -use xcm::v4::prelude::*; +use xcm::v5::prelude::*; pub trait Parse { /// Returns the "chain" location part. It could be parent, sibling diff --git a/traits/src/multi_asset.rs b/traits/src/multi_asset.rs index 1bb3217ad..f80088f36 100644 --- a/traits/src/multi_asset.rs +++ b/traits/src/multi_asset.rs @@ -1,5 +1,5 @@ use sp_core::{bounded::BoundedVec, ConstU32}; -use xcm::v4::prelude::*; +use xcm::v5::prelude::*; use crate::location::RelativeLocations; diff --git a/traits/src/xcm_transfer.rs b/traits/src/xcm_transfer.rs index bfc74c919..5a2ab80fb 100644 --- a/traits/src/xcm_transfer.rs +++ b/traits/src/xcm_transfer.rs @@ -1,7 +1,7 @@ use sp_runtime::DispatchError; use sp_std::vec::Vec; use xcm::{ - v4::{prelude::*, Weight}, + v5::{prelude::*, Weight}, VersionedAsset, VersionedAssets, VersionedLocation, }; pub struct Transferred { diff --git a/xcm-support/src/currency_adapter.rs b/xcm-support/src/currency_adapter.rs index 01c95ef6a..7a00cf72c 100644 --- a/xcm-support/src/currency_adapter.rs +++ b/xcm-support/src/currency_adapter.rs @@ -12,7 +12,7 @@ use sp_std::{ result, }; -use xcm::v4::{prelude::*, Asset, Error as XcmError, Location, Result}; +use xcm::v5::{prelude::*, Asset, Error as XcmError, Location, Result}; use xcm_executor::{ traits::{ConvertLocation, MatchesFungible, TransactAsset}, AssetsInHolding, diff --git a/xcm-support/src/lib.rs b/xcm-support/src/lib.rs index 19af03909..252c733be 100644 --- a/xcm-support/src/lib.rs +++ b/xcm-support/src/lib.rs @@ -16,7 +16,7 @@ use sp_runtime::{ }; use sp_std::marker::PhantomData; -use xcm::v4::prelude::*; +use xcm::v5::prelude::*; use xcm_executor::traits::MatchesFungible; use orml_traits::{location::Reserve, GetByKey}; diff --git a/xtokens/src/lib.rs b/xtokens/src/lib.rs index 17634956f..877fb7277 100644 --- a/xtokens/src/lib.rs +++ b/xtokens/src/lib.rs @@ -46,7 +46,7 @@ use sp_runtime::{ use sp_std::{prelude::*, result::Result}; use xcm::{ - v4::{prelude::*, Weight}, + v5::{prelude::*, Weight}, VersionedAsset, VersionedAssets, VersionedLocation, }; use xcm_executor::traits::WeightBounds; diff --git a/xtokens/src/mock/para.rs b/xtokens/src/mock/para.rs index 2df1f7b83..57f18da99 100644 --- a/xtokens/src/mock/para.rs +++ b/xtokens/src/mock/para.rs @@ -17,7 +17,7 @@ use sp_runtime::{ AccountId32, }; use sp_std::{cell::RefCell, marker::PhantomData}; -use xcm::v4::{prelude::*, Weight}; +use xcm::v5::{prelude::*, Weight}; use xcm_builder::{ AccountId32Aliases, EnsureXcmOrigin, FixedWeightBounds, NativeAsset, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32, diff --git a/xtokens/src/mock/para_relative_view.rs b/xtokens/src/mock/para_relative_view.rs index edc7f0bac..f28414ec2 100644 --- a/xtokens/src/mock/para_relative_view.rs +++ b/xtokens/src/mock/para_relative_view.rs @@ -13,7 +13,7 @@ use sp_runtime::{ AccountId32, BoundedVec, }; use sp_std::marker::PhantomData; -use xcm::v4::{prelude::*, Weight}; +use xcm::v5::{prelude::*, Weight}; use xcm_builder::{ AccountId32Aliases, AllowTopLevelPaidExecutionFrom, EnsureXcmOrigin, FixedWeightBounds, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, diff --git a/xtokens/src/mock/para_teleport.rs b/xtokens/src/mock/para_teleport.rs index c0a8664f4..daf075d71 100644 --- a/xtokens/src/mock/para_teleport.rs +++ b/xtokens/src/mock/para_teleport.rs @@ -12,7 +12,7 @@ use sp_runtime::{ traits::{Convert, IdentityLookup}, AccountId32, }; -use xcm::v4::{prelude::*, Weight}; +use xcm::v5::{prelude::*, Weight}; use xcm_builder::{ AccountId32Aliases, EnsureXcmOrigin, FixedWeightBounds, NativeAsset, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32, diff --git a/xtokens/src/mock/relay.rs b/xtokens/src/mock/relay.rs index 47deaae4d..fd718f2f1 100644 --- a/xtokens/src/mock/relay.rs +++ b/xtokens/src/mock/relay.rs @@ -13,7 +13,7 @@ use polkadot_runtime_parachains::{ inclusion::{AggregateMessageOrigin, UmpQueueId}, origin, shared, }; -use xcm::v4::prelude::*; +use xcm::v5::prelude::*; use xcm_builder::{ AccountId32Aliases, AllowTopLevelPaidExecutionFrom, ChildParachainAsNative, ChildParachainConvertsVia, FixedWeightBounds, FungibleAdapter, IsConcrete, SignedAccountId32AsNative, SignedToAccountId32, diff --git a/xtokens/src/mock/teleport_currency_adapter.rs b/xtokens/src/mock/teleport_currency_adapter.rs index 8a2a4030c..cebde1f8c 100644 --- a/xtokens/src/mock/teleport_currency_adapter.rs +++ b/xtokens/src/mock/teleport_currency_adapter.rs @@ -10,7 +10,7 @@ use sp_std::{ }; use orml_xcm_support::{OnDepositFail, UnknownAsset as UnknownAssetT}; -use xcm::v4::{prelude::*, Asset, Error as XcmError, Location, Result}; +use xcm::v5::{prelude::*, Asset, Error as XcmError, Location, Result}; use xcm_executor::{ traits::{ConvertLocation, MatchesFungible, TransactAsset}, AssetsInHolding, From 41f795c7df2fc48b895488aa32b635bc7c17ca84 Mon Sep 17 00:00:00 2001 From: 4meta5 Date: Sat, 11 Jan 2025 23:44:49 -0500 Subject: [PATCH 2/6] expose crates by exposing root cargo toml --- Cargo.dev.toml | 71 -------------------------------------------------- 1 file changed, 71 deletions(-) delete mode 100644 Cargo.dev.toml diff --git a/Cargo.dev.toml b/Cargo.dev.toml deleted file mode 100644 index f82746dd9..000000000 --- a/Cargo.dev.toml +++ /dev/null @@ -1,71 +0,0 @@ -[workspace] -members = [ - "asset-registry", - "auction", - "authority", - "benchmarking", - "build-script-utils", - "currencies", - "gradually-update", - "nft", - "oracle", - "oracle/runtime-api", - "parameters", - "payments", - "rate-limit", - "rewards", - "tokens", - "tokens/runtime-api", - "traits", - "unknown-tokens", - "utilities", - "vesting", - "xcm-mock-message-queue", - "xcm-support", - "xcm", - "xtokens", -] - -resolver = "2" - -[profile.dev] -split-debuginfo = "unpacked" - -[workspace.dependencies] -log = { version = "0.4.20", default-features = false } -scale-info = { version = "2.10.0", default-features = false, features = ["derive"] } -serde = { version = "1.0.189" } -parity-scale-codec = { version = "3.6.5", default-features = false, features = ["max-encoded-len"] } - -cumulus-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -frame-system = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -pallet-elections-phragmen = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -pallet-message-queue = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -pallet-root-testing = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -polkadot-parachain-primitives = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -sp-api = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -sp-arithmetic = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -sp-io = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -sp-runtime-interface = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -sp-staking = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -sp-std = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -sp-storage = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } - -xcm-simulator = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } From 4774027fa348a935cbfb20731efc7be3dbc686e6 Mon Sep 17 00:00:00 2001 From: 4meta5 Date: Sat, 11 Jan 2025 23:50:33 -0500 Subject: [PATCH 3/6] cp not rm --- Cargo.dev.toml | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 Cargo.dev.toml diff --git a/Cargo.dev.toml b/Cargo.dev.toml new file mode 100644 index 000000000..f82746dd9 --- /dev/null +++ b/Cargo.dev.toml @@ -0,0 +1,71 @@ +[workspace] +members = [ + "asset-registry", + "auction", + "authority", + "benchmarking", + "build-script-utils", + "currencies", + "gradually-update", + "nft", + "oracle", + "oracle/runtime-api", + "parameters", + "payments", + "rate-limit", + "rewards", + "tokens", + "tokens/runtime-api", + "traits", + "unknown-tokens", + "utilities", + "vesting", + "xcm-mock-message-queue", + "xcm-support", + "xcm", + "xtokens", +] + +resolver = "2" + +[profile.dev] +split-debuginfo = "unpacked" + +[workspace.dependencies] +log = { version = "0.4.20", default-features = false } +scale-info = { version = "2.10.0", default-features = false, features = ["derive"] } +serde = { version = "1.0.189" } +parity-scale-codec = { version = "3.6.5", default-features = false, features = ["max-encoded-len"] } + +cumulus-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +pallet-elections-phragmen = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +pallet-message-queue = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +pallet-root-testing = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +polkadot-parachain-primitives = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +sp-api = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +sp-runtime-interface = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +sp-staking = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +sp-storage = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } + +xcm-simulator = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } From 00658a0b7c9ba04d16be519ee25a6fc3a8284b8e Mon Sep 17 00:00:00 2001 From: 4meta5 Date: Sat, 11 Jan 2025 23:56:08 -0500 Subject: [PATCH 4/6] rm gitignore so that Cargo toml is showna dn not ignored --- .gitignore | 3 --- Cargo.toml | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 Cargo.toml diff --git a/.gitignore b/.gitignore index caa7d1159..e31f83988 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,3 @@ Cargo.lock .DS_Store .idea - -# Intentional not commiting this file to allow this repo to be added as a submodule -/Cargo.toml diff --git a/Cargo.toml b/Cargo.toml new file mode 100644 index 000000000..f82746dd9 --- /dev/null +++ b/Cargo.toml @@ -0,0 +1,71 @@ +[workspace] +members = [ + "asset-registry", + "auction", + "authority", + "benchmarking", + "build-script-utils", + "currencies", + "gradually-update", + "nft", + "oracle", + "oracle/runtime-api", + "parameters", + "payments", + "rate-limit", + "rewards", + "tokens", + "tokens/runtime-api", + "traits", + "unknown-tokens", + "utilities", + "vesting", + "xcm-mock-message-queue", + "xcm-support", + "xcm", + "xtokens", +] + +resolver = "2" + +[profile.dev] +split-debuginfo = "unpacked" + +[workspace.dependencies] +log = { version = "0.4.20", default-features = false } +scale-info = { version = "2.10.0", default-features = false, features = ["derive"] } +serde = { version = "1.0.189" } +parity-scale-codec = { version = "3.6.5", default-features = false, features = ["max-encoded-len"] } + +cumulus-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +pallet-elections-phragmen = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +pallet-message-queue = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +pallet-root-testing = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +polkadot-parachain-primitives = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +sp-api = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +sp-runtime-interface = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +sp-staking = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +sp-storage = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } + +xcm-simulator = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } From 2b1d316c934e4721e4426a834985aa9bc6615f9f Mon Sep 17 00:00:00 2001 From: Amar Singh Date: Mon, 10 Feb 2025 08:49:15 -0500 Subject: [PATCH 5/6] Update Cargo.toml --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index f82746dd9..5ff482b5d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,7 +35,7 @@ split-debuginfo = "unpacked" log = { version = "0.4.20", default-features = false } scale-info = { version = "2.10.0", default-features = false, features = ["derive"] } serde = { version = "1.0.189" } -parity-scale-codec = { version = "3.6.5", default-features = false, features = ["max-encoded-len"] } +parity-scale-codec = { version = "3.6.12", default-features = false, features = ["max-encoded-len"] } cumulus-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } From 356540a0001e04a525d8f3c95d11b1618f0e84a4 Mon Sep 17 00:00:00 2001 From: 4meta5 Date: Mon, 17 Feb 2025 10:21:06 -0500 Subject: [PATCH 6/6] update to patch commit --- Cargo.toml | 62 +++++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5ff482b5d..635465e23 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,35 +37,35 @@ scale-info = { version = "2.10.0", default-features = false, features = ["derive serde = { version = "1.0.189" } parity-scale-codec = { version = "3.6.12", default-features = false, features = ["max-encoded-len"] } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -frame-system = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -pallet-elections-phragmen = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -pallet-message-queue = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -pallet-root-testing = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -polkadot-parachain-primitives = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -sp-api = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -sp-arithmetic = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -sp-io = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -sp-runtime-interface = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -sp-staking = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -sp-std = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -sp-storage = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } -xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false } +pallet-elections-phragmen = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false } +pallet-message-queue = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false } +pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false } +pallet-root-testing = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false } +polkadot-parachain-primitives = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false } +polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false } +sp-api = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false } +sp-runtime-interface = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false } +sp-staking = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false } +sp-storage = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false } +xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false } +xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false } +xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false } -xcm-simulator = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412", default-features = false } +xcm-simulator = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }