Merge branch 'master' into publish

xlc · xlc · commit 292f0fc6deb0 · 2023-11-21T14:02:54.000+13:00
diff --git a/.config/zepter.yaml b/.config/zepter.yaml
@@ -6,7 +6,7 @@ version:
   format: 1
   # Minimum version of the binary that is expected to work. This is just for printing a nice error
   # message when someone tries to use an older version.
-  binary: 0.13.2
+  binary: 0.15.0
 
 # The examples in this file assume crate `A` to have a dependency on crate `B`.
 workflows:
@@ -18,6 +18,8 @@ workflows:
         'propagate-feature',
         # These are the features to check:
         '--features=try-runtime,runtime-benchmarks,std',
+        # Ignore the features of dependencies that are exclusively used as dev or build.
+        '--dep-kinds=normal:check,dev:ignore,build:ignore',
         # Do not try to add a new section into `[features]` of `A` only because `B` expose that feature. There are edge-cases where this is still needed, but we can add them manually.
         '--left-side-feature-missing=ignore',
         # Ignore the case that `A` it outside of the workspace. Otherwise it will report errors in external dependencies that we have no influence on.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -40,7 +40,7 @@ jobs:
     - name: Check for Wasm
       run: make dev-check
     - name: Install Zepter
-      run: cargo install zepter --version 0.14.0 --locked -q -f --no-default-features && zepter --version
+      run: cargo install zepter --version 0.15.0 --locked -q -f --no-default-features && zepter --version
     - name: Check Rust features
       run: make dev-features-check
     - name: Run tests
diff --git a/asset-registry/Cargo.toml b/asset-registry/Cargo.toml
@@ -29,6 +29,9 @@ xcm-executor = { workspace = true }
 # orml
 orml-traits = { path = "../traits", version = "0.6.1", default-features = false }
 
+# for runtime-benchmarks
+polkadot-runtime-common = { workspace = true, optional = true }
+
 [dev-dependencies]
 # substrate
 pallet-balances = { workspace = true, features = ["std"] }
@@ -53,33 +56,21 @@ xcm-simulator = { workspace = true }
 # orml
 orml-tokens = { path = "../tokens" }
 orml-xcm = { path = "../xcm" }
-orml-xcm-support = { path = "../xcm-support", default-features = false }
+orml-xcm-support = { path = "../xcm-support" }
 orml-xtokens = { path = "../xtokens" }
 
 [features]
 default = [ "std" ]
 std = [
-	"cumulus-pallet-dmp-queue/std",
-	"cumulus-pallet-parachain-system/std",
-	"cumulus-pallet-xcm/std",
-	"cumulus-pallet-xcmp-queue/std",
-	"cumulus-primitives-core/std",
 	"frame-support/std",
 	"frame-system/std",
 	"log/std",
 	"orml-traits/std",
-	"orml-xcm-support/std",
-	"pallet-balances/std",
-	"pallet-message-queue/std",
 	"pallet-xcm/std",
-	"parachain-info/std",
 	"parity-scale-codec/std",
-	"polkadot-parachain-primitives/std",
-	"polkadot-runtime-common/std",
-	"polkadot-runtime-parachains/std",
+	"polkadot-runtime-common?/std",
 	"scale-info/std",
 	"serde",
-	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
@@ -88,37 +79,18 @@ std = [
 	"xcm/std",
 ]
 runtime-benchmarks = [
-	"cumulus-pallet-parachain-system/runtime-benchmarks",
-	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"orml-tokens/runtime-benchmarks",
-	"orml-xtokens/runtime-benchmarks",
-	"pallet-balances/runtime-benchmarks",
-	"pallet-message-queue/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
-	"polkadot-parachain-primitives/runtime-benchmarks",
 	"polkadot-runtime-common/runtime-benchmarks",
-	"polkadot-runtime-parachains/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
 	"xcm-executor/runtime-benchmarks",
 ]
 try-runtime = [
-	"cumulus-pallet-dmp-queue/try-runtime",
-	"cumulus-pallet-parachain-system/try-runtime",
-	"cumulus-pallet-xcm/try-runtime",
-	"cumulus-pallet-xcmp-queue/try-runtime",
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"orml-tokens/try-runtime",
-	"orml-xcm/try-runtime",
-	"orml-xtokens/try-runtime",
-	"pallet-balances/try-runtime",
-	"pallet-message-queue/try-runtime",
 	"pallet-xcm/try-runtime",
-	"parachain-info/try-runtime",
-	"polkadot-runtime-common/try-runtime",
-	"polkadot-runtime-parachains/try-runtime",
+	"polkadot-runtime-common?/try-runtime",
 	"sp-runtime/try-runtime",
 ]
diff --git a/auction/Cargo.toml b/auction/Cargo.toml
@@ -32,8 +32,6 @@ std = [
 	"parity-scale-codec/std",
 	"scale-info/std",
 	"serde",
-	"sp-core/std",
-	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
 ]
diff --git a/authority/Cargo.toml b/authority/Cargo.toml
@@ -30,9 +30,6 @@ default = [ "std" ]
 std = [
 	"frame-support/std",
 	"frame-system/std",
-	"pallet-preimage/std",
-	"pallet-root-testing/std",
-	"pallet-scheduler/std",
 	"parity-scale-codec/std",
 	"scale-info/std",
 	"serde",
@@ -44,15 +41,10 @@ std = [
 runtime-benchmarks = [
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"pallet-preimage/runtime-benchmarks",
-	"pallet-scheduler/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"pallet-preimage/try-runtime",
-	"pallet-root-testing/try-runtime",
-	"pallet-scheduler/try-runtime",
 	"sp-runtime/try-runtime",
 ]
diff --git a/benchmarking/Cargo.toml b/benchmarking/Cargo.toml
@@ -33,7 +33,6 @@ default = [ "std" ]
 std = [
 	"frame-benchmarking/std",
 	"frame-support/std",
-	"frame-system/std",
 	"log/std",
 	"parity-scale-codec/std",
 	"scale-info/std",
diff --git a/currencies/Cargo.toml b/currencies/Cargo.toml
@@ -34,19 +34,15 @@ std = [
 	"frame-system/std",
 	"orml-traits/std",
 	"orml-utilities/std",
-	"pallet-balances/std",
 	"parity-scale-codec/std",
 	"scale-info/std",
 	"serde",
-	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"orml_tokens/try-runtime",
-	"pallet-balances/try-runtime",
 	"sp-runtime/try-runtime",
 ]
diff --git a/nft/Cargo.toml b/nft/Cargo.toml
@@ -29,8 +29,6 @@ std = [
 	"parity-scale-codec/std",
 	"scale-info/std",
 	"serde",
-	"sp-core/std",
-	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
 ]
diff --git a/oracle/Cargo.toml b/oracle/Cargo.toml
@@ -36,7 +36,6 @@ std = [
 	"scale-info/std",
 	"serde",
 	"sp-application-crypto/std",
-	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
diff --git a/parameters/Cargo.toml b/parameters/Cargo.toml
@@ -34,7 +34,6 @@ std = [
 	"scale-info/std",
 	"serde",
 	"sp-core/std",
-	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
 ]
diff --git a/payments/Cargo.toml b/payments/Cargo.toml
@@ -35,18 +35,14 @@ std = [
 	'frame-support/std',
 	'frame-system/std',
 	'log/std',
-	'orml-tokens/std',
 	'orml-traits/std',
 	'parity-scale-codec/std',
 	'scale-info/std',
-	"sp-core/std",
-	"sp-io/std",
 	'sp-runtime/std',
 	'sp-std/std',
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"orml-tokens/try-runtime",
 	"sp-runtime/try-runtime",
 ]
diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml
@@ -35,30 +35,20 @@ std = [
 	"frame-system/std",
 	"log/std",
 	"orml-traits/std",
-	"pallet-elections-phragmen/std",
-	"pallet-treasury/std",
 	"parity-scale-codec/std",
 	"scale-info/std",
 	"serde",
 	"sp-arithmetic/std",
-	"sp-core/std",
-	"sp-io/std",
 	"sp-runtime/std",
-	"sp-staking/std",
 	"sp-std/std",
 ]
 runtime-benchmarks = [
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"pallet-elections-phragmen/runtime-benchmarks",
-	"pallet-treasury/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
-	"sp-staking/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"pallet-elections-phragmen/try-runtime",
-	"pallet-treasury/try-runtime",
 	"sp-runtime/try-runtime",
 ]
diff --git a/traits/src/currency.rs b/traits/src/currency.rs
@@ -1,4 +1,5 @@
 use crate::{arithmetic, Happened};
+use frame_support::traits::tokens::Balance;
 pub use frame_support::{
 	traits::{BalanceStatus, DefensiveSaturating, LockIdentifier},
 	transactional,
@@ -27,14 +28,7 @@ pub trait MultiCurrency<AccountId> {
 		+ MaxEncodedLen;
 
 	/// The balance of an account.
-	type Balance: AtLeast32BitUnsigned
-		+ FullCodec
-		+ Copy
-		+ MaybeSerializeDeserialize
-		+ Debug
-		+ Default
-		+ scale_info::TypeInfo
-		+ MaxEncodedLen;
+	type Balance: Balance;
 
 	// Public immutables
 
diff --git a/unknown-tokens/Cargo.toml b/unknown-tokens/Cargo.toml
@@ -35,14 +35,7 @@ std = [
 	"parity-scale-codec/std",
 	"scale-info/std",
 	"serde",
-	"sp-core/std",
-	"sp-io/std",
-	"sp-runtime/std",
 	"sp-std/std",
 	"xcm/std",
 ]
-try-runtime = [
-	"frame-support/try-runtime",
-	"frame-system/try-runtime",
-	"sp-runtime/try-runtime",
-]
+try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime" ]
diff --git a/utilities/Cargo.toml b/utilities/Cargo.toml
@@ -27,7 +27,6 @@ frame-system = { workspace = true, features = ["std"] }
 default = [ "std" ]
 std = [
 	"frame-support/std",
-	"frame-system/std",
 	"parity-scale-codec/std",
 	"scale-info/std",
 	"serde",
diff --git a/vesting/Cargo.toml b/vesting/Cargo.toml
@@ -27,24 +27,20 @@ default = [ "std" ]
 std = [
 	"frame-support/std",
 	"frame-system/std",
-	"pallet-balances/std",
 	"parity-scale-codec/std",
 	"scale-info/std",
 	"serde",
-	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
 ]
 runtime-benchmarks = [
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"pallet-balances/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"pallet-balances/try-runtime",
 	"sp-runtime/try-runtime",
 ]
diff --git a/xcm/Cargo.toml b/xcm/Cargo.toml
@@ -30,7 +30,6 @@ std = [
 	"parity-scale-codec/std",
 	"scale-info/std",
 	"sp-std/std",
-	"xcm-executor/std",
 	"xcm/std",
 ]
 try-runtime = [
diff --git a/xtokens/Cargo.toml b/xtokens/Cargo.toml
@@ -60,64 +60,32 @@ orml-xcm = { path = "../xcm" }
 [features]
 default = [ "std" ]
 std = [
-	"cumulus-pallet-dmp-queue/std",
-	"cumulus-pallet-parachain-system/std",
-	"cumulus-pallet-xcm/std",
-	"cumulus-pallet-xcmp-queue/std",
 	"cumulus-primitives-core/std",
 	"frame-support/std",
 	"frame-system/std",
 	"log/std",
 	"orml-traits/std",
 	"orml-xcm-support/std",
-	"pallet-balances/std",
-	"pallet-message-queue/std",
 	"pallet-xcm/std",
-	"parachain-info/std",
 	"parity-scale-codec/std",
-	"polkadot-parachain-primitives/std",
-	"polkadot-runtime-common/std",
-	"polkadot-runtime-parachains/std",
 	"scale-info/std",
 	"serde",
-	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"xcm-builder/std",
 	"xcm-executor/std",
 	"xcm/std",
 ]
 runtime-benchmarks = [
-	"cumulus-pallet-parachain-system/runtime-benchmarks",
-	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"orml-tokens/runtime-benchmarks",
-	"pallet-balances/runtime-benchmarks",
-	"pallet-message-queue/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
-	"polkadot-parachain-primitives/runtime-benchmarks",
-	"polkadot-runtime-common/runtime-benchmarks",
-	"polkadot-runtime-parachains/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
-	"xcm-builder/runtime-benchmarks",
 	"xcm-executor/runtime-benchmarks",
 ]
 try-runtime = [
-	"cumulus-pallet-dmp-queue/try-runtime",
-	"cumulus-pallet-parachain-system/try-runtime",
-	"cumulus-pallet-xcm/try-runtime",
-	"cumulus-pallet-xcmp-queue/try-runtime",
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"orml-tokens/try-runtime",
-	"orml-xcm/try-runtime",
-	"pallet-balances/try-runtime",
-	"pallet-message-queue/try-runtime",
 	"pallet-xcm/try-runtime",
-	"parachain-info/try-runtime",
-	"polkadot-runtime-common/try-runtime",
-	"polkadot-runtime-parachains/try-runtime",
 	"sp-runtime/try-runtime",
 ]

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,6 @@ std = [`
`32`	`32`	`"parity-scale-codec/std",`
`33`	`33`	`"scale-info/std",`
`34`	`34`	`"serde",`
`35`		`- "sp-core/std",`
`36`		`- "sp-io/std",`
`37`	`35`	`"sp-runtime/std",`
`38`	`36`	`"sp-std/std",`
`39`	`37`	`]`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,6 @@ std = [`
`29`	`29`	`"parity-scale-codec/std",`
`30`	`30`	`"scale-info/std",`
`31`	`31`	`"serde",`
`32`		`- "sp-core/std",`
`33`		`- "sp-io/std",`
`34`	`32`	`"sp-runtime/std",`
`35`	`33`	`"sp-std/std",`
`36`	`34`	`]`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ std = [`
`34`	`34`	`"scale-info/std",`
`35`	`35`	`"serde",`
`36`	`36`	`"sp-core/std",`
`37`		`- "sp-io/std",`
`38`	`37`	`"sp-runtime/std",`
`39`	`38`	`"sp-std/std",`
`40`	`39`	`]`