From c3a7c15ea409e81f142f3bfb4581a2fe9a3a902a Mon Sep 17 00:00:00 2001 From: zjb0807 Date: Tue, 22 Nov 2022 12:11:06 +0800 Subject: [PATCH 1/2] Add try-runtime feature for orml-payments --- asset-registry/Cargo.toml | 21 ++++++++++++--------- auction/Cargo.toml | 13 +++++++------ authority/Cargo.toml | 19 +++++++++++-------- benchmarking/Cargo.toml | 25 ++++++++++++++----------- currencies/Cargo.toml | 19 ++++++++++--------- gradually-update/Cargo.toml | 13 +++++++------ nft/Cargo.toml | 15 ++++++++------- oracle/Cargo.toml | 15 ++++++++------- payments/Cargo.toml | 11 ++++++----- payments/src/types.rs | 2 +- rewards/Cargo.toml | 21 +++++++++++---------- tokens/Cargo.toml | 20 +++++++++++--------- unknown-tokens/Cargo.toml | 13 +++++++------ vesting/Cargo.toml | 18 ++++++++++-------- xcm-support/Cargo.toml | 13 +++++++------ xcm/Cargo.toml | 10 +++++----- xtokens/Cargo.toml | 36 +++++++++++++++++++++--------------- 17 files changed, 156 insertions(+), 128 deletions(-) diff --git a/asset-registry/Cargo.toml b/asset-registry/Cargo.toml index 4970ad8d3..af1115549 100644 --- a/asset-registry/Cargo.toml +++ b/asset-registry/Cargo.toml @@ -13,10 +13,10 @@ serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } # substrate -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } # polkadot pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.31" } @@ -29,9 +29,9 @@ orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = fa [dev-dependencies] # substrate -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } # cumulus cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.31" } @@ -47,30 +47,33 @@ xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "rele # orml orml-tokens = { path = "../tokens" } -orml-xtokens = { path = "../xtokens" } orml-xcm = { path = "../xcm" } orml-xcm-support = { path = "../xcm-support", default-features = false } +orml-xtokens = { path = "../xtokens" } [features] default = ["std"] std = [ "serde", + "codec/std", - "scale-info/std", - "sp-runtime/std", - "sp-std/std", "frame-support/std", "frame-system/std", "orml-traits/std", "pallet-xcm/std", - "xcm/std", + "scale-info/std", + "sp-runtime/std", + "sp-std/std", "xcm-builder/std", "xcm-executor/std", + "xcm/std", ] runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "pallet-xcm/runtime-benchmarks", + "sp-runtime/runtime-benchmarks", "xcm-builder/runtime-benchmarks", + "xcm-executor/runtime-benchmarks", ] try-runtime = ["frame-support/try-runtime"] diff --git a/auction/Cargo.toml b/auction/Cargo.toml index 004c5c905..79a403611 100644 --- a/auction/Cargo.toml +++ b/auction/Cargo.toml @@ -8,14 +8,14 @@ authors = ["Acala Developers"] edition = "2021" [dependencies] +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } @@ -27,12 +27,13 @@ sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0 default = ["std"] std = [ "serde", + "codec/std", - "scale-info/std", - "sp-runtime/std", - "sp-std/std", "frame-support/std", "frame-system/std", "orml-traits/std", + "scale-info/std", + "sp-runtime/std", + "sp-std/std", ] try-runtime = ["frame-support/try-runtime"] diff --git a/authority/Cargo.toml b/authority/Cargo.toml index 03535affb..0e2c4a33f 100644 --- a/authority/Cargo.toml +++ b/authority/Cargo.toml @@ -8,36 +8,39 @@ authors = ["Acala Developers"] edition = "2021" [dependencies] +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.145", optional = true } -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } [features] default = ["std"] std = [ "serde", + "codec/std", + "frame-support/std", + "frame-system/std", "scale-info/std", + "sp-core/std", + "sp-io/std", "sp-runtime/std", "sp-std/std", - "sp-io/std", - "frame-support/std", - "frame-system/std", ] runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "sp-runtime/runtime-benchmarks", ] try-runtime = ["frame-support/try-runtime"] diff --git a/benchmarking/Cargo.toml b/benchmarking/Cargo.toml index c0e50e798..a7fc2e3fc 100644 --- a/benchmarking/Cargo.toml +++ b/benchmarking/Cargo.toml @@ -8,20 +8,20 @@ authors = ["Laminar Developers "] edition = "2021" [dependencies] -serde = { version = "1.0.136", optional = true } -paste = "1.0.7" codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } log = { version = "0.4.17", default-features = false } +paste = "1.0.7" +scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } +serde = { version = "1.0.136", optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } -sp-runtime-interface = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } +sp-runtime-interface = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } sp-storage = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } [dev-dependencies] hex-literal = "0.3.4" @@ -32,13 +32,16 @@ frame-system = { git = "https://github.com/paritytech/substrate", branch = "polk default = [ "std" ] std = [ "serde", + "codec/std", + "frame-benchmarking/std", + "frame-support/std", + "log/std", "scale-info/std", + "sp-api/std", + "sp-io/std", "sp-runtime-interface/std", "sp-runtime/std", - "sp-api/std", "sp-std/std", - "frame-support/std", - "frame-benchmarking/std", - "log/std", + "sp-storage/std", ] diff --git a/currencies/Cargo.toml b/currencies/Cargo.toml index 68cdf1ee9..419dfcf74 100644 --- a/currencies/Cargo.toml +++ b/currencies/Cargo.toml @@ -8,22 +8,22 @@ authors = ["Laminar Developers "] edition = "2021" [dependencies] +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } orml-utilities = { path = "../utilities", version = "0.4.1-dev", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } orml_tokens = { package = "orml-tokens", path = "../tokens", version = "0.4.1-dev" } @@ -31,14 +31,15 @@ orml_tokens = { package = "orml-tokens", path = "../tokens", version = "0.4.1-de default = ["std"] std = [ "serde", + "codec/std", - "scale-info/std", - "sp-runtime/std", - "sp-std/std", - "sp-io/std", "frame-support/std", "frame-system/std", "orml-traits/std", "orml-utilities/std", + "scale-info/std", + "sp-io/std", + "sp-runtime/std", + "sp-std/std", ] try-runtime = ["frame-support/try-runtime"] diff --git a/gradually-update/Cargo.toml b/gradually-update/Cargo.toml index 93591c3e8..967661063 100644 --- a/gradually-update/Cargo.toml +++ b/gradually-update/Cargo.toml @@ -8,28 +8,29 @@ authors = ["Laminar Developers "] edition = "2021" [dependencies] +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } [features] default = ["std"] std = [ "serde", + "codec/std", - "scale-info/std", "frame-support/std", "frame-system/std", - "sp-io/std", - "sp-std/std", + "scale-info/std", "sp-core/std", + "sp-io/std", "sp-runtime/std", + "sp-std/std", ] try-runtime = ["frame-support/try-runtime"] diff --git a/nft/Cargo.toml b/nft/Cargo.toml index 8b408a4b6..afbe6a554 100644 --- a/nft/Cargo.toml +++ b/nft/Cargo.toml @@ -8,28 +8,29 @@ authors = ["Acala Developers"] edition = "2021" [dependencies] +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } [features] default = ["std"] std = [ "serde", + "codec/std", - "scale-info/std", - "sp-std/std", - "sp-runtime/std", "frame-support/std", "frame-system/std", + "scale-info/std", + "sp-runtime/std", + "sp-std/std", ] try-runtime = ["frame-support/try-runtime"] diff --git a/oracle/Cargo.toml b/oracle/Cargo.toml index a5c51f564..eb28eafed 100644 --- a/oracle/Cargo.toml +++ b/oracle/Cargo.toml @@ -8,16 +8,16 @@ authors = ["Laminar Developers "] edition = "2021" [dependencies] +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } sp-application-crypto = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } orml-utilities = { path = "../utilities", version = "0.4.1-dev", default-features = false } @@ -29,15 +29,16 @@ sp-core = { git = "https://github.com/paritytech/substrate", default-features = default = ["std"] std = [ "serde", + "codec/std", + "frame-support/std", + "frame-system/std", + "orml-traits/std", + "orml-utilities/std", "scale-info/std", "sp-application-crypto/std", "sp-io/std", "sp-runtime/std", "sp-std/std", - "frame-support/std", - "frame-system/std", - "orml-traits/std", - "orml-utilities/std", ] try-runtime = ["frame-support/try-runtime"] diff --git a/payments/Cargo.toml b/payments/Cargo.toml index 81044bc0a..78c05a27f 100644 --- a/payments/Cargo.toml +++ b/payments/Cargo.toml @@ -10,7 +10,7 @@ description = "Allows users to post escrow payment on-chain" readme = "README.md" [dependencies] -parity-scale-codec = { version = "3.1.5", default-features = false, features = ["max-encoded-len"] } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } log = { version = "0.4.17", default-features = false } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } @@ -32,13 +32,14 @@ orml-tokens = { path = "../tokens", version = "0.4.1-dev", default-features = fa [features] default = ['std'] std = [ - 'parity-scale-codec/std', + 'codec/std', 'frame-support/std', 'frame-system/std', 'log/std', + 'orml-tokens/std', + 'orml-traits/std', + 'scale-info/std', 'sp-runtime/std', 'sp-std/std', - 'scale-info/std', - 'orml-traits/std', - 'orml-tokens/std' ] +try-runtime = ["frame-support/try-runtime"] \ No newline at end of file diff --git a/payments/src/types.rs b/payments/src/types.rs index a4e5058d4..acb694db2 100644 --- a/payments/src/types.rs +++ b/payments/src/types.rs @@ -1,6 +1,6 @@ #![allow(unused_qualifications)] use crate::{pallet, AssetIdOf, BalanceOf}; -use parity_scale_codec::{Decode, Encode, HasCompact, MaxEncodedLen}; +use codec::{Decode, Encode, HasCompact, MaxEncodedLen}; use scale_info::TypeInfo; use sp_runtime::{DispatchResult, Percent}; diff --git a/rewards/Cargo.toml b/rewards/Cargo.toml index 27e15bb17..3610163f1 100644 --- a/rewards/Cargo.toml +++ b/rewards/Cargo.toml @@ -8,16 +8,16 @@ authors = ["Acala Developers"] edition = "2021" [dependencies] +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } @@ -28,14 +28,15 @@ sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot- default = ["std"] std = [ "serde", + "codec/std", - "scale-info/std", - "sp-runtime/std", - "sp-io/std", - "sp-std/std", - "sp-core/std", "frame-support/std", "frame-system/std", "orml-traits/std", + "scale-info/std", + "sp-core/std", + "sp-io/std", + "sp-runtime/std", + "sp-std/std", ] try-runtime = ["frame-support/try-runtime"] diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml index e6573be1f..af9ddf446 100644 --- a/tokens/Cargo.toml +++ b/tokens/Cargo.toml @@ -8,37 +8,39 @@ authors = ["Laminar Developers "] edition = "2021" [dependencies] +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } [features] default = ["std"] std = [ "serde", + "codec/std", - "scale-info/std", - "sp-runtime/std", - "sp-std/std", "frame-support/std", "frame-system/std", "orml-traits/std", + "scale-info/std", + "sp-runtime/std", + "sp-std/std", ] runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "sp-runtime/runtime-benchmarks", ] try-runtime = ["frame-support/try-runtime"] diff --git a/unknown-tokens/Cargo.toml b/unknown-tokens/Cargo.toml index 07c8a610e..a9f8ba7a8 100644 --- a/unknown-tokens/Cargo.toml +++ b/unknown-tokens/Cargo.toml @@ -8,33 +8,34 @@ authors = ["Acala Developers"] edition = "2021" [dependencies] +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.31" } orml-xcm-support = { path = "../xcm-support", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } [features] default = ["std"] std = [ "serde", + "codec/std", - "scale-info/std", - "sp-std/std", "frame-support/std", "frame-system/std", - "xcm/std", "orml-xcm-support/std", + "scale-info/std", + "sp-std/std", + "xcm/std", ] try-runtime = ["frame-support/try-runtime"] diff --git a/vesting/Cargo.toml b/vesting/Cargo.toml index f406347ee..8a4c1d1a1 100644 --- a/vesting/Cargo.toml +++ b/vesting/Cargo.toml @@ -8,34 +8,36 @@ authors = ["Laminar Developers "] edition = "2021" [dependencies] +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } [features] default = ["std"] std = [ "serde", + "codec/std", + "frame-support/std", + "frame-system/std", "scale-info/std", + "sp-io/std", "sp-runtime/std", "sp-std/std", - "sp-io/std", - "frame-support/std", - "frame-system/std", ] runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "sp-runtime/runtime-benchmarks", ] try-runtime = ["frame-support/try-runtime"] diff --git a/xcm-support/Cargo.toml b/xcm-support/Cargo.toml index d3e1e0b51..460b49d71 100644 --- a/xcm-support/Cargo.toml +++ b/xcm-support/Cargo.toml @@ -10,9 +10,9 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.31" } xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.31" } @@ -22,10 +22,11 @@ orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = fa [features] default = ["std"] std = [ - "sp-std/std", - "sp-runtime/std", + "codec/std", "frame-support/std", - "xcm/std", - "xcm-executor/std", "orml-traits/std", + "sp-runtime/std", + "sp-std/std", + "xcm-executor/std", + "xcm/std", ] diff --git a/xcm/Cargo.toml b/xcm/Cargo.toml index 6b75f3cee..2ad710a96 100644 --- a/xcm/Cargo.toml +++ b/xcm/Cargo.toml @@ -11,12 +11,12 @@ edition = "2021" codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.31" } pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.31" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.31" } [dev-dependencies] xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.31" } @@ -25,11 +25,11 @@ xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "rele default = ["std"] std = [ "codec/std", - "scale-info/std", - "sp-std/std", "frame-support/std", "frame-system/std", - "xcm/std", "pallet-xcm/std", + "scale-info/std", + "sp-std/std", + "xcm/std", ] try-runtime = ["frame-support/try-runtime"] diff --git a/xtokens/Cargo.toml b/xtokens/Cargo.toml index 78e660234..cad993001 100644 --- a/xtokens/Cargo.toml +++ b/xtokens/Cargo.toml @@ -8,16 +8,16 @@ authors = ["Acala Developers"] edition = "2021" [dependencies] +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } # substrate -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" } # cumulus cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false , branch = "polkadot-v0.9.31" } @@ -28,19 +28,19 @@ xcm = { git = "https://github.com/paritytech/polkadot", default-features = false xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.31" } # orml -orml-xcm-support = { path = "../xcm-support", default-features = false } orml-traits = { path = "../traits", default-features = false} +orml-xcm-support = { path = "../xcm-support", default-features = false } [dev-dependencies] # substrate -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } # cumulus -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.31" } cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.31" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.31" } cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.31" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.31" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.31" } parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.31" } # polkadot @@ -57,21 +57,27 @@ orml-xcm = { path = "../xcm" } default = ["std"] std = [ "serde", + "codec/std", + "cumulus-primitives-core/std", + "frame-support/std", + "frame-system/std", + "orml-traits/std", + "orml-xcm-support/std", + "pallet-xcm/std", "scale-info/std", + "sp-io/std", "sp-runtime/std", "sp-std/std", - "sp-io/std", - "frame-support/std", - "frame-system/std", - "cumulus-primitives-core/std", - "xcm/std", "xcm-executor/std", - "orml-xcm-support/std", - "orml-traits/std", + "xcm/std", ] runtime-benchmarks = [ + "frame-support/runtime-benchmarks", + "frame-system/runtime-benchmarks", "pallet-xcm/runtime-benchmarks", + "sp-runtime/runtime-benchmarks", "xcm-builder/runtime-benchmarks", + "xcm-executor/runtime-benchmarks", ] try-runtime = ["frame-support/try-runtime"] From 25bcbfef2fd5fa68037f1971ce964e21207ebcc7 Mon Sep 17 00:00:00 2001 From: zjb0807 Date: Tue, 22 Nov 2022 12:26:49 +0800 Subject: [PATCH 2/2] Add features --- asset-registry/Cargo.toml | 6 +++++- auction/Cargo.toml | 5 ++++- authority/Cargo.toml | 5 ++++- currencies/Cargo.toml | 5 ++++- gradually-update/Cargo.toml | 5 ++++- nft/Cargo.toml | 5 ++++- oracle/Cargo.toml | 5 ++++- payments/Cargo.toml | 5 ++++- rewards/Cargo.toml | 5 ++++- tokens/Cargo.toml | 5 ++++- unknown-tokens/Cargo.toml | 5 ++++- vesting/Cargo.toml | 5 ++++- xcm/Cargo.toml | 6 +++++- xtokens/Cargo.toml | 6 +++++- 14 files changed, 59 insertions(+), 14 deletions(-) diff --git a/asset-registry/Cargo.toml b/asset-registry/Cargo.toml index af1115549..11c3c9128 100644 --- a/asset-registry/Cargo.toml +++ b/asset-registry/Cargo.toml @@ -76,4 +76,8 @@ runtime-benchmarks = [ "xcm-builder/runtime-benchmarks", "xcm-executor/runtime-benchmarks", ] -try-runtime = ["frame-support/try-runtime"] +try-runtime = [ + "frame-support/try-runtime", + "frame-system/try-runtime", + "pallet-xcm/try-runtime", +] diff --git a/auction/Cargo.toml b/auction/Cargo.toml index 79a403611..404d0f5e1 100644 --- a/auction/Cargo.toml +++ b/auction/Cargo.toml @@ -36,4 +36,7 @@ std = [ "sp-runtime/std", "sp-std/std", ] -try-runtime = ["frame-support/try-runtime"] +try-runtime = [ + "frame-support/try-runtime", + "frame-system/try-runtime", +] \ No newline at end of file diff --git a/authority/Cargo.toml b/authority/Cargo.toml index 0e2c4a33f..0f831f2b1 100644 --- a/authority/Cargo.toml +++ b/authority/Cargo.toml @@ -43,4 +43,7 @@ runtime-benchmarks = [ "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", ] -try-runtime = ["frame-support/try-runtime"] +try-runtime = [ + "frame-support/try-runtime", + "frame-system/try-runtime", +] diff --git a/currencies/Cargo.toml b/currencies/Cargo.toml index 419dfcf74..2c54199e8 100644 --- a/currencies/Cargo.toml +++ b/currencies/Cargo.toml @@ -42,4 +42,7 @@ std = [ "sp-runtime/std", "sp-std/std", ] -try-runtime = ["frame-support/try-runtime"] +try-runtime = [ + "frame-support/try-runtime", + "frame-system/try-runtime", +] diff --git a/gradually-update/Cargo.toml b/gradually-update/Cargo.toml index 967661063..45829b0c9 100644 --- a/gradually-update/Cargo.toml +++ b/gradually-update/Cargo.toml @@ -33,4 +33,7 @@ std = [ "sp-runtime/std", "sp-std/std", ] -try-runtime = ["frame-support/try-runtime"] +try-runtime = [ + "frame-support/try-runtime", + "frame-system/try-runtime", +] diff --git a/nft/Cargo.toml b/nft/Cargo.toml index afbe6a554..43d6000cc 100644 --- a/nft/Cargo.toml +++ b/nft/Cargo.toml @@ -33,4 +33,7 @@ std = [ "sp-runtime/std", "sp-std/std", ] -try-runtime = ["frame-support/try-runtime"] +try-runtime = [ + "frame-support/try-runtime", + "frame-system/try-runtime", +] \ No newline at end of file diff --git a/oracle/Cargo.toml b/oracle/Cargo.toml index eb28eafed..68836ecd0 100644 --- a/oracle/Cargo.toml +++ b/oracle/Cargo.toml @@ -41,4 +41,7 @@ std = [ "sp-runtime/std", "sp-std/std", ] -try-runtime = ["frame-support/try-runtime"] +try-runtime = [ + "frame-support/try-runtime", + "frame-system/try-runtime", +] diff --git a/payments/Cargo.toml b/payments/Cargo.toml index 78c05a27f..6218a3dfc 100644 --- a/payments/Cargo.toml +++ b/payments/Cargo.toml @@ -42,4 +42,7 @@ std = [ 'sp-runtime/std', 'sp-std/std', ] -try-runtime = ["frame-support/try-runtime"] \ No newline at end of file +try-runtime = [ + "frame-support/try-runtime", + "frame-system/try-runtime", +] \ No newline at end of file diff --git a/rewards/Cargo.toml b/rewards/Cargo.toml index 3610163f1..b54b2c2d4 100644 --- a/rewards/Cargo.toml +++ b/rewards/Cargo.toml @@ -39,4 +39,7 @@ std = [ "sp-runtime/std", "sp-std/std", ] -try-runtime = ["frame-support/try-runtime"] +try-runtime = [ + "frame-support/try-runtime", + "frame-system/try-runtime", +] \ No newline at end of file diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml index af9ddf446..b69d4a4e0 100644 --- a/tokens/Cargo.toml +++ b/tokens/Cargo.toml @@ -43,4 +43,7 @@ runtime-benchmarks = [ "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", ] -try-runtime = ["frame-support/try-runtime"] +try-runtime = [ + "frame-support/try-runtime", + "frame-system/try-runtime", +] \ No newline at end of file diff --git a/unknown-tokens/Cargo.toml b/unknown-tokens/Cargo.toml index a9f8ba7a8..2fc720c5f 100644 --- a/unknown-tokens/Cargo.toml +++ b/unknown-tokens/Cargo.toml @@ -38,4 +38,7 @@ std = [ "sp-std/std", "xcm/std", ] -try-runtime = ["frame-support/try-runtime"] +try-runtime = [ + "frame-support/try-runtime", + "frame-system/try-runtime", +] \ No newline at end of file diff --git a/vesting/Cargo.toml b/vesting/Cargo.toml index 8a4c1d1a1..9cbf09fe5 100644 --- a/vesting/Cargo.toml +++ b/vesting/Cargo.toml @@ -40,4 +40,7 @@ runtime-benchmarks = [ "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", ] -try-runtime = ["frame-support/try-runtime"] +try-runtime = [ + "frame-support/try-runtime", + "frame-system/try-runtime", +] \ No newline at end of file diff --git a/xcm/Cargo.toml b/xcm/Cargo.toml index 2ad710a96..a72393624 100644 --- a/xcm/Cargo.toml +++ b/xcm/Cargo.toml @@ -32,4 +32,8 @@ std = [ "sp-std/std", "xcm/std", ] -try-runtime = ["frame-support/try-runtime"] +try-runtime = [ + "frame-support/try-runtime", + "frame-system/try-runtime", + "pallet-xcm/try-runtime", +] \ No newline at end of file diff --git a/xtokens/Cargo.toml b/xtokens/Cargo.toml index cad993001..6d7c8c143 100644 --- a/xtokens/Cargo.toml +++ b/xtokens/Cargo.toml @@ -80,4 +80,8 @@ runtime-benchmarks = [ "xcm-builder/runtime-benchmarks", "xcm-executor/runtime-benchmarks", ] -try-runtime = ["frame-support/try-runtime"] +try-runtime = [ + "frame-support/try-runtime", + "frame-system/try-runtime", + "pallet-xcm/try-runtime", +] \ No newline at end of file