--- a/Cargo.lock +++ b/Cargo.lock @@ -10160,6 +10160,7 @@ "pallet-xcm", "parity-scale-codec", "polkadot-parachain-primitives", + "polkadot-runtime-common", "precompile-utils-macro", "scale-info", "serde", @@ -15037,6 +15038,7 @@ "pallet-xcm", "parity-scale-codec", "polkadot-parachain-primitives", + "polkadot-runtime-common", "precompile-utils-macro", "scale-info", "serde", --- a/Cargo.toml +++ b/Cargo.toml @@ -131,13 +131,12 @@ pallet-transaction-payment-rpc-runtime-api = { default-features = false, version = "25.0.0" } pallet-treasury = { default-features = false, version = "24.0.0" } pallet-utility = { default-features = false, version = "25.0.0" } -pallet-xcm = { default-features = false , version = "4.0.0" } -staging-parachain-info = { default-features = false, version = "0.4.0" } +pallet-xcm = { default-features = false, version = "4.0.0" } parity-scale-codec = { version = "3.6.5", features = ["derive"], default-features = false } polkadot-cli = "4.0.0" -polkadot-parachain-primitives = { default-features = false , version = "3.0.0" } -polkadot-runtime-common = { default-features = false , version = "4.0.0" } +polkadot-parachain-primitives = { default-features = false, version = "3.0.0" } polkadot-primitives = "4.0.0" +polkadot-runtime-common = { default-features = false, version = "4.0.0" } polkadot-service = "4.0.0" sc-basic-authorship = "0.31.0" sc-chain-spec = "24.0.0" @@ -179,9 +178,10 @@ sp-trie = { default-features = false, version = "26.0.0" } sp-version = { default-features = false, version = "26.0.0" } sp-weights = { default-features = false, version = "24.0.0" } -staging-xcm = { default-features = false , version = "4.0.0" } -staging-xcm-builder = { default-features = false , version = "4.0.0" } -staging-xcm-executor = { default-features = false , version = "4.0.0" } +staging-parachain-info = { default-features = false, version = "0.4.0" } +staging-xcm = { default-features = false, version = "4.0.0" } +staging-xcm-builder = { default-features = false, version = "4.0.0" } +staging-xcm-executor = { default-features = false, version = "4.0.0" } substrate-frame-rpc-system = "25.0.0" substrate-prometheus-endpoint = "0.16.0" @@ -216,4 +216,3 @@ num_enum = { version = "0.7.0", default-features = false } serde = { default-features = false, features = ['derive'], version = "1.0.188" } smallvec = "1.11.1" - --- a/pallets/inflation/Cargo.toml +++ b/pallets/inflation/Cargo.toml @@ -16,6 +16,7 @@ [features] default = ['std'] +fast-inflation = [] runtime-benchmarks = ['frame-benchmarking'] std = [ 'frame-benchmarking/std', @@ -27,7 +28,6 @@ 'sp-std/std', ] try-runtime = ["frame-support/try-runtime"] -fast-inflation = [] [dependencies] parity-scale-codec = { workspace = true } --- a/runtime/common/config/substrate.rs +++ b/runtime/common/config/substrate.rs @@ -241,6 +241,8 @@ type Paymaster = PayFromAccount; type BalanceConverter = UnityAssetBalanceConversion; type PayoutPeriod = ConstU32<10>; + #[cfg(feature = "runtime-benchmarks")] + type BenchmarkHelper = (); } impl pallet_sudo::Config for Runtime { --- a/runtime/common/tests/xcm.rs +++ b/runtime/common/tests/xcm.rs @@ -37,7 +37,7 @@ Box::new(VersionedXcm::from(Xcm(vec![Transact { origin_kind: OriginKind::Native, require_weight_at_most: Weight::from_parts(1000, 1000), - call: RuntimeCall::Balances(pallet_balances::Call::::transfer { + call: RuntimeCall::Balances(pallet_balances::Call::::transfer_keep_alive { dest: BOB.into(), value: INITIAL_BALANCE / 2, }) --- a/runtime/opal/Cargo.toml +++ b/runtime/opal/Cargo.toml @@ -61,6 +61,7 @@ 'pallet-unique/runtime-benchmarks', 'pallet-utility/runtime-benchmarks', 'pallet-xcm/runtime-benchmarks', + 'polkadot-runtime-common/runtime-benchmarks', 'sp-runtime/runtime-benchmarks', 'staging-xcm-builder/runtime-benchmarks', ] @@ -126,7 +127,6 @@ 'pallet-treasury/std', 'pallet-unique/std', 'pallet-utility/std', - 'staging-parachain-info/std', 'polkadot-runtime-common/std', 'serde', 'sp-api/std', @@ -141,6 +141,7 @@ 'sp-storage/std', 'sp-transaction-pool/std', 'sp-version/std', + 'staging-parachain-info/std', 'staging-xcm-builder/std', 'staging-xcm-executor/std', 'staging-xcm/std', @@ -221,12 +222,13 @@ 'pallet-unique/try-runtime', 'pallet-utility/try-runtime', 'pallet-xcm/try-runtime', + 'polkadot-runtime-common/try-runtime', 'staging-parachain-info/try-runtime', - 'polkadot-runtime-common/try-runtime', ] app-promotion = [] collator-selection = [] +fast-inflation = [] foreign-assets = [] gov-test-timings = [] governance = [] @@ -234,7 +236,6 @@ preimage = [] refungible = [] session-test-timings = [] -fast-inflation = [] ################################################################################ # local dependencies @@ -271,7 +272,6 @@ pallet-treasury = { workspace = true } pallet-utility = { workspace = true } pallet-xcm = { workspace = true } -staging-parachain-info = { workspace = true } parity-scale-codec = { workspace = true } polkadot-parachain-primitives = { workspace = true } polkadot-runtime-common = { workspace = true } @@ -290,6 +290,7 @@ sp-storage = { workspace = true } sp-transaction-pool = { workspace = true } sp-version = { workspace = true } +staging-parachain-info = { workspace = true } staging-xcm = { workspace = true } staging-xcm-builder = { workspace = true } staging-xcm-executor = { workspace = true } --- a/runtime/quartz/Cargo.toml +++ b/runtime/quartz/Cargo.toml @@ -58,6 +58,7 @@ 'pallet-unique/runtime-benchmarks', 'pallet-utility/runtime-benchmarks', 'pallet-xcm/runtime-benchmarks', + 'polkadot-runtime-common/runtime-benchmarks', 'sp-runtime/runtime-benchmarks', 'staging-xcm-builder/runtime-benchmarks', ] @@ -126,7 +127,7 @@ 'pallet-treasury/std', 'pallet-unique/std', 'pallet-utility/std', - 'staging-parachain-info/std', + 'polkadot-runtime-common/std', 'serde', 'sp-api/std', 'sp-block-builder/std', @@ -139,6 +140,7 @@ 'sp-std/std', 'sp-transaction-pool/std', 'sp-version/std', + 'staging-parachain-info/std', 'staging-xcm-builder/std', 'staging-xcm-executor/std', 'staging-xcm/std', @@ -210,18 +212,19 @@ 'pallet-unique/try-runtime', 'pallet-utility/try-runtime', 'pallet-xcm/try-runtime', + 'polkadot-runtime-common/try-runtime', 'staging-parachain-info/try-runtime', ] app-promotion = [] collator-selection = [] +fast-inflation = [] foreign-assets = [] gov-test-timings = [] governance = [] preimage = [] refungible = [] session-test-timings = [] -fast-inflation = [] ################################################################################ # local dependencies @@ -257,9 +260,9 @@ pallet-treasury = { workspace = true } pallet-utility = { workspace = true } pallet-xcm = { workspace = true } -staging-parachain-info = { workspace = true } parity-scale-codec = { workspace = true } polkadot-parachain-primitives = { workspace = true } +polkadot-runtime-common = { workspace = true } smallvec = { workspace = true } sp-api = { workspace = true } sp-arithmetic = { workspace = true } @@ -275,6 +278,7 @@ sp-storage = { workspace = true } sp-transaction-pool = { workspace = true } sp-version = { workspace = true } +staging-parachain-info = { workspace = true } staging-xcm = { workspace = true } staging-xcm-builder = { workspace = true } staging-xcm-executor = { workspace = true } --- a/runtime/unique/Cargo.toml +++ b/runtime/unique/Cargo.toml @@ -55,6 +55,7 @@ 'pallet-unique/runtime-benchmarks', 'pallet-utility/runtime-benchmarks', 'pallet-xcm/runtime-benchmarks', + 'polkadot-runtime-common/runtime-benchmarks', 'sp-runtime/runtime-benchmarks', 'staging-xcm-builder/runtime-benchmarks', 'up-data-structs/runtime-benchmarks', @@ -124,7 +125,7 @@ 'pallet-treasury/std', 'pallet-unique/std', 'pallet-utility/std', - 'staging-parachain-info/std', + 'polkadot-runtime-common/std', 'sp-api/std', 'sp-block-builder/std', 'sp-core/std', @@ -136,6 +137,7 @@ 'sp-std/std', 'sp-transaction-pool/std', 'sp-version/std', + 'staging-parachain-info/std', 'staging-xcm-builder/std', 'staging-xcm-executor/std', 'staging-xcm/std', @@ -212,19 +214,20 @@ 'pallet-unique/try-runtime', 'pallet-utility/try-runtime', 'pallet-xcm/try-runtime', + 'polkadot-runtime-common/try-runtime', 'staging-parachain-info/try-runtime', ] -unique-runtime = ['app-promotion', 'foreign-assets', 'refungible', 'governance', 'preimage'] +unique-runtime = ['app-promotion', 'foreign-assets', 'governance', 'preimage', 'refungible'] app-promotion = [] collator-selection = [] +fast-inflation = [] foreign-assets = [] gov-test-timings = [] governance = [] preimage = [] refungible = [] session-test-timings = [] -fast-inflation = [] ################################################################################ # local dependencies @@ -260,9 +263,9 @@ pallet-treasury = { workspace = true } pallet-utility = { workspace = true } pallet-xcm = { workspace = true } -staging-parachain-info = { workspace = true } parity-scale-codec = { workspace = true } polkadot-parachain-primitives = { workspace = true } +polkadot-runtime-common = { workspace = true } smallvec = { workspace = true } sp-api = { workspace = true } sp-arithmetic = { workspace = true } @@ -278,6 +281,7 @@ sp-storage = { workspace = true } sp-transaction-pool = { workspace = true } sp-version = { workspace = true } +staging-parachain-info = { workspace = true } staging-xcm = { workspace = true } staging-xcm-builder = { workspace = true } staging-xcm-executor = { workspace = true }