diff --git a/Cargo.toml b/Cargo.toml index a235c19c8c3bdb1538137841494cbd03df54931f..a020bfa694a237dbef0b2133118cd2ca2ca5a925 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -301,6 +301,7 @@ members = [ "substrate/frame/alliance", "substrate/frame/asset-conversion", "substrate/frame/asset-rate", + "substrate/frame/asset-rewards", "substrate/frame/assets", "substrate/frame/atomic-swap", "substrate/frame/aura", @@ -392,7 +393,6 @@ members = [ "substrate/frame/session/benchmarking", "substrate/frame/society", "substrate/frame/staking", - "substrate/frame/asset-rewards", "substrate/frame/staking/reward-curve", "substrate/frame/staking/reward-fn", "substrate/frame/staking/runtime-api", diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/Cargo.toml b/cumulus/parachains/runtimes/assets/asset-hub-rococo/Cargo.toml index 035ca061af1f44cf20d11167fda368111223d63b..f894bba6d7fff2e588af0e6c7493d1df8335c42b 100644 --- a/cumulus/parachains/runtimes/assets/asset-hub-rococo/Cargo.toml +++ b/cumulus/parachains/runtimes/assets/asset-hub-rococo/Cargo.toml @@ -122,6 +122,7 @@ runtime-benchmarks = [ "frame-system-benchmarking/runtime-benchmarks", "frame-system/runtime-benchmarks", "pallet-asset-conversion/runtime-benchmarks", + "pallet-asset-rewards/runtime-benchmarks", "pallet-assets/runtime-benchmarks", "pallet-balances/runtime-benchmarks", "pallet-collator-selection/runtime-benchmarks", @@ -144,7 +145,6 @@ runtime-benchmarks = [ "sp-runtime/runtime-benchmarks", "xcm-builder/runtime-benchmarks", "xcm-executor/runtime-benchmarks", - "pallet-asset-rewards/runtime-benchmarks" ] try-runtime = [ "cumulus-pallet-aura-ext/try-runtime", @@ -157,6 +157,7 @@ try-runtime = [ "frame-try-runtime/try-runtime", "pallet-asset-conversion-tx-payment/try-runtime", "pallet-asset-conversion/try-runtime", + "pallet-asset-rewards/try-runtime", "pallet-assets/try-runtime", "pallet-aura/try-runtime", "pallet-authorship/try-runtime", @@ -178,7 +179,6 @@ try-runtime = [ "parachain-info/try-runtime", "polkadot-runtime-common/try-runtime", "sp-runtime/try-runtime", - "pallet-asset-rewards/try-runtime" ] std = [ "assets-common/std", @@ -206,6 +206,7 @@ std = [ "log/std", "pallet-asset-conversion-tx-payment/std", "pallet-asset-conversion/std", + "pallet-asset-rewards/std", "pallet-assets/std", "pallet-aura/std", "pallet-authorship/std", @@ -254,7 +255,6 @@ std = [ "xcm-builder/std", "xcm-executor/std", "xcm/std", - "pallet-asset-rewards/std" ] # A feature that should be enabled when the runtime should be built for on-chain diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/Cargo.toml b/cumulus/parachains/runtimes/assets/asset-hub-westend/Cargo.toml index ca3b78c707f2fd8aa111e9b43e7e8d74afff0aa0..58f7064cd4a51ee4b902146a6259ed9cf137e563 100644 --- a/cumulus/parachains/runtimes/assets/asset-hub-westend/Cargo.toml +++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/Cargo.toml @@ -113,6 +113,7 @@ runtime-benchmarks = [ "frame-system/runtime-benchmarks", "hex-literal", "pallet-asset-conversion/runtime-benchmarks", + "pallet-asset-rewards/runtime-benchmarks", "pallet-assets/runtime-benchmarks", "pallet-balances/runtime-benchmarks", "pallet-collator-selection/runtime-benchmarks", @@ -133,7 +134,6 @@ runtime-benchmarks = [ "sp-runtime/runtime-benchmarks", "xcm-builder/runtime-benchmarks", "xcm-executor/runtime-benchmarks", - "pallet-asset-rewards/runtime-benchmarks" ] try-runtime = [ "cumulus-pallet-aura-ext/try-runtime", @@ -146,6 +146,7 @@ try-runtime = [ "frame-try-runtime/try-runtime", "pallet-asset-conversion-tx-payment/try-runtime", "pallet-asset-conversion/try-runtime", + "pallet-asset-rewards/try-runtime", "pallet-assets/try-runtime", "pallet-aura/try-runtime", "pallet-authorship/try-runtime", @@ -166,7 +167,6 @@ try-runtime = [ "parachain-info/try-runtime", "polkadot-runtime-common/try-runtime", "sp-runtime/try-runtime", - "pallet-asset-rewards/try-runtime" ] std = [ "assets-common/std", @@ -194,6 +194,7 @@ std = [ "log/std", "pallet-asset-conversion-tx-payment/std", "pallet-asset-conversion/std", + "pallet-asset-rewards/std", "pallet-assets/std", "pallet-aura/std", "pallet-authorship/std", @@ -239,7 +240,6 @@ std = [ "xcm-builder/std", "xcm-executor/std", "xcm/std", - "pallet-asset-rewards/std" ] # A feature that should be enabled when the runtime should be built for on-chain diff --git a/substrate/bin/node/runtime/Cargo.toml b/substrate/bin/node/runtime/Cargo.toml index 0257f68a7bd1e4ac016e5040f6c1bdfb68514dbb..ef6fdbf1e363e89a859bd93407edc6740ae55be0 100644 --- a/substrate/bin/node/runtime/Cargo.toml +++ b/substrate/bin/node/runtime/Cargo.toml @@ -170,6 +170,7 @@ std = [ "pallet-asset-conversion-tx-payment/std", "pallet-asset-conversion/std", "pallet-asset-rate/std", + "pallet-asset-rewards/std", "pallet-asset-tx-payment/std", "pallet-assets/std", "pallet-authority-discovery/std", @@ -270,7 +271,6 @@ std = [ "sp-transaction-pool/std", "sp-version/std", "substrate-wasm-builder", - "pallet-asset-rewards/std" ] runtime-benchmarks = [ "frame-benchmarking-pallet-pov/runtime-benchmarks", @@ -282,6 +282,7 @@ runtime-benchmarks = [ "pallet-alliance/runtime-benchmarks", "pallet-asset-conversion/runtime-benchmarks", "pallet-asset-rate/runtime-benchmarks", + "pallet-asset-rewards/runtime-benchmarks", "pallet-asset-tx-payment/runtime-benchmarks", "pallet-assets/runtime-benchmarks", "pallet-babe/runtime-benchmarks", @@ -347,7 +348,6 @@ runtime-benchmarks = [ "pallet-whitelist/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "sp-staking/runtime-benchmarks", - "pallet-asset-rewards/runtime-benchmarks" ] try-runtime = [ "frame-benchmarking-pallet-pov/try-runtime", @@ -360,6 +360,7 @@ try-runtime = [ "pallet-asset-conversion-tx-payment/try-runtime", "pallet-asset-conversion/try-runtime", "pallet-asset-rate/try-runtime", + "pallet-asset-rewards/try-runtime", "pallet-asset-tx-payment/try-runtime", "pallet-assets/try-runtime", "pallet-authority-discovery/try-runtime", @@ -429,7 +430,6 @@ try-runtime = [ "pallet-vesting/try-runtime", "pallet-whitelist/try-runtime", "sp-runtime/try-runtime", - "pallet-asset-rewards/try-runtime" ] experimental = [ "frame-support/experimental",