diff --git a/Cargo.lock b/Cargo.lock index a9a19757b..52479a504 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3991,10 +3991,8 @@ dependencies = [ "fc-pallet-pass", "fc-pallet-payments", "fc-pallet-referenda-tracks", - "fc-traits-authn", - "fc-traits-gas-tank", - "fc-traits-memberships", "frame-benchmarking", + "frame-contrib-traits", "frame-executive", "frame-support", "frame-system", @@ -5677,8 +5675,8 @@ name = "pallet-communities" version = "0.1.0" dependencies = [ "fc-pallet-referenda-tracks", - "fc-traits-memberships", "frame-benchmarking", + "frame-contrib-traits", "frame-support", "frame-system", "log", diff --git a/Cargo.toml b/Cargo.toml index 6eff424dc..eadaa3381 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -50,10 +50,6 @@ runtime-common = { default-features = false, path = "runtime/common" } # Frame Contrib frame-contrib-traits = { git = "https://github.com/virto-network/frame-contrib", default-features = false } -fc-traits-authn = { git = "https://github.com/virto-network/frame-contrib", default-features = false } -fc-traits-gas-tank = { git = "https://github.com/virto-network/frame-contrib", default-features = false } -fc-traits-memberships = { git = "https://github.com/virto-network/frame-contrib", default-features = false } -fc-traits-tracks = { git = "https://github.com/virto-network/frame-contrib", default-features = false } pallet-gas-transaction-payment = { git = "https://github.com/virto-network/frame-contrib", default-features = false, package = "fc-pallet-gas-transaction-payment" } pallet-listings = { git = "https://github.com/virto-network/frame-contrib", default-features = false, package = "fc-pallet-listings" } diff --git a/apis/Cargo.toml b/apis/Cargo.toml index 4ea6aefdb..0fb51aafd 100644 --- a/apis/Cargo.toml +++ b/apis/Cargo.toml @@ -27,24 +27,16 @@ virto-common = { workspace = true, optional = true, features = ["scale"] } [features] default = ["std", "runtime", "contract"] std = [ - "frame-support/std", - "frame-system/std", - "ink?/std", - "ink_env?/std", - "log?/std", - "pallet-contracts?/std", - "parity-scale-codec/std", - "scale-info/std", - "virto-common?/std", - "frame-contrib-traits/std" -] -runtime = [ - "dep:frame-system", - "dep:log", - "dep:pallet-contracts", -] -contract = [ - "dep:ink", - "dep:ink_env", - "dep:virto-common" + "frame-support/std", + "frame-system/std", + "ink?/std", + "ink_env?/std", + "log?/std", + "pallet-contracts?/std", + "parity-scale-codec/std", + "scale-info/std", + "virto-common?/std", + "frame-contrib-traits/std", ] +runtime = ["dep:frame-system", "dep:log", "dep:pallet-contracts"] +contract = ["dep:ink", "dep:ink_env", "dep:virto-common"] diff --git a/chain-spec-generator/Cargo.toml b/chain-spec-generator/Cargo.toml index 6bfad4847..90e5381fb 100644 --- a/chain-spec-generator/Cargo.toml +++ b/chain-spec-generator/Cargo.toml @@ -15,9 +15,5 @@ kreivo-runtime = { workspace = true, default-features = true } sc-chain-spec.workspace = true [features] -runtime-benchmarks = [ - "kreivo-runtime/runtime-benchmarks" -] -paseo = [ - "kreivo-runtime/paseo" -] +runtime-benchmarks = ["kreivo-runtime/runtime-benchmarks"] +paseo = ["kreivo-runtime/paseo"] diff --git a/common/Cargo.toml b/common/Cargo.toml index 6866418b6..dbcc1887c 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -36,13 +36,8 @@ std = [ "sp-runtime?/std", "xcm?/std", ] -scale = [ - "dep:parity-scale-codec", - "dep:scale-info", -] -serde = [ - "dep:serde", -] +scale = ["dep:parity-scale-codec", "dep:scale-info"] +serde = ["dep:serde"] alloc = [] js = ["alloc", "wasm-bindgen"] nightly = [] diff --git a/pallets/communities/Cargo.toml b/pallets/communities/Cargo.toml index f7425bb0f..70fd81000 100644 --- a/pallets/communities/Cargo.toml +++ b/pallets/communities/Cargo.toml @@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"] frame-benchmarking = { workspace = true, optional = true } frame-support.workspace = true frame-system.workspace = true -fc-traits-memberships.workspace = true +frame-contrib-traits.workspace = true log.workspace = true @@ -42,15 +42,11 @@ virto-common = { workspace = true, default-features = false, features = [ [features] default = ["std", "xcm", "serde"] -serde = [ - "dep:serde", - "scale-info/serde", -] +serde = ["dep:serde", "scale-info/serde"] std = [ "frame-benchmarking?/std", "frame-support/std", "frame-system/std", - "fc-traits-memberships/std", "log/std", "pallet-assets/std", "pallet-assets-freezer/std", @@ -82,7 +78,7 @@ runtime-benchmarks = [ "pallet-referenda-tracks/runtime-benchmarks", "pallet-scheduler/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "fc-traits-memberships/runtime-benchmarks", + ] try-runtime = [ "frame-support/try-runtime", diff --git a/pallets/communities/src/benchmarking.rs b/pallets/communities/src/benchmarking.rs index 53cca5502..c19acae02 100644 --- a/pallets/communities/src/benchmarking.rs +++ b/pallets/communities/src/benchmarking.rs @@ -8,8 +8,8 @@ use self::{ }, CommunityDecisionMethod, DecisionMethod, Event, FreezeReason, Pallet as Communities, }; -use fc_traits_memberships::{Inspect, Rank}; use frame_benchmarking::v2::*; +use frame_contrib_traits::memberships::{Inspect, Rank}; use frame_support::traits::{ fungible::{InspectFreeze, Mutate}, fungibles::Mutate as FunsMutate, diff --git a/pallets/communities/src/functions.rs b/pallets/communities/src/functions.rs index da5700506..66dcca786 100644 --- a/pallets/communities/src/functions.rs +++ b/pallets/communities/src/functions.rs @@ -1,6 +1,6 @@ use super::*; -use fc_traits_memberships::{GenericRank, Inspect, Rank}; +use frame_contrib_traits::memberships::{GenericRank, Inspect, Rank}; use frame_support::{ dispatch::PostDispatchInfo, fail, diff --git a/pallets/communities/src/lib.rs b/pallets/communities/src/lib.rs index 8796249a4..598bf9a9b 100644 --- a/pallets/communities/src/lib.rs +++ b/pallets/communities/src/lib.rs @@ -116,7 +116,7 @@ extern crate alloc; use alloc::{boxed::Box, vec, vec::Vec}; use core::num::NonZeroU8; -use fc_traits_memberships::{self as membership, Inspect, Manager, Rank}; +use frame_contrib_traits::memberships::{self as membership, Inspect, Manager, Rank}; use frame_support::{ dispatch::{DispatchResultWithPostInfo, GetDispatchInfo, PostDispatchInfo}, pallet_prelude::*, diff --git a/pallets/communities/src/mock.rs b/pallets/communities/src/mock.rs index 0b3793b5b..adc8a5206 100644 --- a/pallets/communities/src/mock.rs +++ b/pallets/communities/src/mock.rs @@ -1,4 +1,4 @@ -use fc_traits_memberships::NonFungiblesMemberships; +use frame_contrib_traits::memberships::NonFungiblesMemberships; use frame_support::{ derive_impl, dispatch::DispatchResult, diff --git a/pallets/communities/src/origin.rs b/pallets/communities/src/origin.rs index 1746279f1..442d10306 100644 --- a/pallets/communities/src/origin.rs +++ b/pallets/communities/src/origin.rs @@ -3,7 +3,7 @@ use crate::{ AccountIdOf, CommunityIdFor, Config, Info, Pallet, }; use core::marker::PhantomData; -use fc_traits_memberships::{GenericRank, Inspect}; +use frame_contrib_traits::memberships::{GenericRank, Inspect}; use frame_support::{ pallet_prelude::*, traits::{EnsureOriginWithArg, MapSuccess, OriginTrait}, diff --git a/pallets/communities/src/tests/governance.rs b/pallets/communities/src/tests/governance.rs index fdba36fb8..4b8d609e2 100644 --- a/pallets/communities/src/tests/governance.rs +++ b/pallets/communities/src/tests/governance.rs @@ -319,7 +319,7 @@ mod vote { } mod membership { - use fc_traits_memberships::Inspect; + use frame_contrib_traits::memberships::Inspect; use super::*; diff --git a/pallets/communities/src/types.rs b/pallets/communities/src/types.rs index 3ad140ff8..cec477489 100644 --- a/pallets/communities/src/types.rs +++ b/pallets/communities/src/types.rs @@ -1,5 +1,5 @@ use crate::{CommunityDecisionMethod, Config}; -use fc_traits_memberships::{Inspect, Rank}; +use frame_contrib_traits::memberships::{Inspect, Rank}; use frame_support::pallet_prelude::*; use frame_support::traits::{ fungible::{self, Inspect as FunInspect}, diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 028e73de8..e10a0ec8b 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -76,105 +76,105 @@ parachains-common.workspace = true [features] default = ["std"] std = [ - "cumulus-pallet-aura-ext/std", - "cumulus-pallet-parachain-system/std", - "cumulus-pallet-session-benchmarking/std", - "cumulus-pallet-xcm/std", - "cumulus-pallet-xcmp-queue/std", - "cumulus-primitives-core/std", - "cumulus-primitives-timestamp/std", - "cumulus-primitives-utility/std", - "frame-benchmarking/std", - "frame-executive/std", - "frame-support/std", - "frame-system/std", - "frame-system-benchmarking/std", - "frame-system-rpc-runtime-api/std", - "frame-try-runtime/std", - "runtime-constants/std", - "log/std", - "pallet-assets/std", - "pallet-asset-tx-payment/std", - "pallet-aura/std", - "pallet-authorship/std", - "pallet-balances/std", - "pallet-collator-selection/std", - "pallet-session/std", - "pallet-sudo/std", - "pallet-timestamp/std", - "pallet-transaction-payment-rpc-runtime-api/std", - "pallet-transaction-payment/std", - "pallet-xcm/std", - "pallet-treasury/std", - "parachain-info/std", - "parachains-common/std", - "parity-scale-codec/std", - "polkadot-core-primitives/std", - "polkadot-runtime-common/std", - "scale-info/std", - "sp-api/std", - "sp-block-builder/std", - "sp-consensus-aura/std", - "sp-core/std", - "sp-inherents/std", - "sp-offchain/std", - "sp-runtime/std", - "sp-session/std", - "sp-transaction-pool/std", - "sp-version/std", - "xcm/std", - "xcm-builder/std", - "xcm-executor/std", + "cumulus-pallet-aura-ext/std", + "cumulus-pallet-parachain-system/std", + "cumulus-pallet-session-benchmarking/std", + "cumulus-pallet-xcm/std", + "cumulus-pallet-xcmp-queue/std", + "cumulus-primitives-core/std", + "cumulus-primitives-timestamp/std", + "cumulus-primitives-utility/std", + "frame-benchmarking/std", + "frame-executive/std", + "frame-support/std", + "frame-system/std", + "frame-system-benchmarking/std", + "frame-system-rpc-runtime-api/std", + "frame-try-runtime/std", + "runtime-constants/std", + "log/std", + "pallet-assets/std", + "pallet-asset-tx-payment/std", + "pallet-aura/std", + "pallet-authorship/std", + "pallet-balances/std", + "pallet-collator-selection/std", + "pallet-session/std", + "pallet-sudo/std", + "pallet-timestamp/std", + "pallet-transaction-payment-rpc-runtime-api/std", + "pallet-transaction-payment/std", + "pallet-xcm/std", + "pallet-treasury/std", + "parachain-info/std", + "parachains-common/std", + "parity-scale-codec/std", + "polkadot-core-primitives/std", + "polkadot-runtime-common/std", + "scale-info/std", + "sp-api/std", + "sp-block-builder/std", + "sp-consensus-aura/std", + "sp-core/std", + "sp-inherents/std", + "sp-offchain/std", + "sp-runtime/std", + "sp-session/std", + "sp-transaction-pool/std", + "sp-version/std", + "xcm/std", + "xcm-builder/std", + "xcm-executor/std", ] runtime-benchmarks = [ - "cumulus-pallet-parachain-system/runtime-benchmarks", - "cumulus-pallet-session-benchmarking/runtime-benchmarks", - "cumulus-pallet-xcmp-queue/runtime-benchmarks", - "cumulus-primitives-core/runtime-benchmarks", - "cumulus-primitives-utility/runtime-benchmarks", - "hex-literal", - "frame-benchmarking/runtime-benchmarks", - "frame-support/runtime-benchmarks", - "frame-system-benchmarking/runtime-benchmarks", - "frame-system/runtime-benchmarks", - "pallet-asset-tx-payment/runtime-benchmarks", - "pallet-assets/runtime-benchmarks", - "pallet-balances/runtime-benchmarks", - "pallet-collator-selection/runtime-benchmarks", - "pallet-sudo/runtime-benchmarks", - "pallet-timestamp/runtime-benchmarks", - "pallet-treasury/runtime-benchmarks", - "pallet-xcm/runtime-benchmarks", - "parachains-common/runtime-benchmarks", - "polkadot-runtime-common/runtime-benchmarks", - "sp-runtime/runtime-benchmarks", - "xcm-builder/runtime-benchmarks", - "xcm-executor/runtime-benchmarks", + "cumulus-pallet-parachain-system/runtime-benchmarks", + "cumulus-pallet-session-benchmarking/runtime-benchmarks", + "cumulus-pallet-xcmp-queue/runtime-benchmarks", + "cumulus-primitives-core/runtime-benchmarks", + "cumulus-primitives-utility/runtime-benchmarks", + "hex-literal", + "frame-benchmarking/runtime-benchmarks", + "frame-support/runtime-benchmarks", + "frame-system-benchmarking/runtime-benchmarks", + "frame-system/runtime-benchmarks", + "pallet-asset-tx-payment/runtime-benchmarks", + "pallet-assets/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", + "pallet-collator-selection/runtime-benchmarks", + "pallet-sudo/runtime-benchmarks", + "pallet-timestamp/runtime-benchmarks", + "pallet-treasury/runtime-benchmarks", + "pallet-xcm/runtime-benchmarks", + "parachains-common/runtime-benchmarks", + "polkadot-runtime-common/runtime-benchmarks", + "sp-runtime/runtime-benchmarks", + "xcm-builder/runtime-benchmarks", + "xcm-executor/runtime-benchmarks", ] try-runtime = [ - "cumulus-pallet-aura-ext/try-runtime", - "cumulus-pallet-parachain-system/try-runtime", - "cumulus-pallet-xcm/try-runtime", - "cumulus-pallet-xcmp-queue/try-runtime", - "frame-executive/try-runtime", - "frame-system/try-runtime", - "frame-support/try-runtime", - "frame-try-runtime/try-runtime", - "pallet-aura/try-runtime", - "pallet-authorship/try-runtime", - "pallet-asset-tx-payment/try-runtime", - "pallet-assets/try-runtime", - "pallet-balances/try-runtime", - "pallet-collator-selection/try-runtime", - "pallet-session/try-runtime", - "pallet-sudo/try-runtime", - "pallet-timestamp/try-runtime", - "pallet-transaction-payment/try-runtime", - "pallet-treasury/try-runtime", - "pallet-xcm/try-runtime", - "parachain-info/try-runtime", - "polkadot-runtime-common/try-runtime", - "sp-runtime/try-runtime", + "cumulus-pallet-aura-ext/try-runtime", + "cumulus-pallet-parachain-system/try-runtime", + "cumulus-pallet-xcm/try-runtime", + "cumulus-pallet-xcmp-queue/try-runtime", + "frame-executive/try-runtime", + "frame-system/try-runtime", + "frame-support/try-runtime", + "frame-try-runtime/try-runtime", + "pallet-aura/try-runtime", + "pallet-authorship/try-runtime", + "pallet-asset-tx-payment/try-runtime", + "pallet-assets/try-runtime", + "pallet-balances/try-runtime", + "pallet-collator-selection/try-runtime", + "pallet-session/try-runtime", + "pallet-sudo/try-runtime", + "pallet-timestamp/try-runtime", + "pallet-transaction-payment/try-runtime", + "pallet-treasury/try-runtime", + "pallet-xcm/try-runtime", + "parachain-info/try-runtime", + "polkadot-runtime-common/try-runtime", + "sp-runtime/try-runtime", ] diff --git a/runtime/kreivo/Cargo.toml b/runtime/kreivo/Cargo.toml index 2fd0900c7..8ffe80f17 100644 --- a/runtime/kreivo/Cargo.toml +++ b/runtime/kreivo/Cargo.toml @@ -108,9 +108,7 @@ parachain-info.workspace = true parachains-common.workspace = true # Frame Contrib -fc-traits-authn.workspace = true -fc-traits-gas-tank.workspace = true -fc-traits-memberships.workspace = true +frame-contrib-traits.workspace = true pallet-gas-transaction-payment.workspace = true pallet-listings.workspace = true pallet-orders.workspace = true @@ -123,196 +121,193 @@ pass-webauthn = { workspace = true, features = ["runtime"] } default = ["std"] paseo = ["runtime-constants/paseo"] std = [ - "assets-common/std", - "cumulus-pallet-aura-ext/std", - "cumulus-pallet-parachain-system/std", - "cumulus-pallet-session-benchmarking/std", - "cumulus-pallet-xcm/std", - "cumulus-pallet-xcmp-queue/std", - "cumulus-primitives-aura/std", - "cumulus-primitives-core/std", - "cumulus-primitives-timestamp/std", - "cumulus-primitives-utility/std", - "frame-benchmarking/std", - "frame-executive/std", - "frame-support/std", - "frame-system-benchmarking/std", - "frame-system-rpc-runtime-api/std", - "frame-try-runtime/std", - "frame-system/std", - "fc-traits-authn/std", - "fc-traits-gas-tank/std", - "fc-traits-memberships/std", - "kreivo-apis/std", - "log/std", - "runtime-constants/std", - "pallet-assets-freezer/std", - "pallet-asset-tx-payment/std", - "pallet-assets/std", - "pallet-aura/std", - "pallet-authorship/std", - "pallet-balances/std", - "pallet-contracts/std", - "pallet-communities-manager/std", - "pallet-communities/std", - "pallet-collator-selection/std", - "pallet-gas-transaction-payment/std", - "pallet-message-queue/std", - "pallet-multisig/std", - "pallet-nfts/std", - "pallet-pass/std", - "pallet-payments/std", - "pallet-preimage/std", - "pallet-proxy/std", - "pallet-ranked-collective/std", - "pallet-referenda/std", - "pallet-referenda-tracks/std", - "pallet-scheduler/std", - "pallet-session/std", - "pallet-skip-feeless-payment/std", - "pallet-sudo/std", - "pallet-timestamp/std", - "pallet-transaction-payment-rpc-runtime-api/std", - "pallet-transaction-payment/std", - "pallet-treasury/std", - "pallet-utility/std", - "pallet-xcm/std", - "pallet-xcm-benchmarks/std", - "parachain-info/std", - "parachains-common/std", - "parity-scale-codec/std", - "pass-webauthn/std", - "polkadot-core-primitives/std", - "polkadot-parachain-primitives/std", - "polkadot-runtime-common/std", - "runtime-common/std", - "scale-info/std", - "sp-api/std", - "sp-block-builder/std", - "sp-consensus-aura/std", - "sp-core/std", - "sp-genesis-builder/std", - "sp-inherents/std", - "sp-io?/std", - "sp-offchain/std", - "sp-runtime/std", - "sp-session/std", - "sp-transaction-pool/std", - "sp-version/std", - "sp-weights/std", - "virto-common/std", - "xcm-builder/std", - "xcm-executor/std", - "xcm/std", - "pallet-listings/std", - "pallet-vesting/std", - "serde_json/std", - "pallet-assets-holder/std", - "pallet-orders/std" + "assets-common/std", + "cumulus-pallet-aura-ext/std", + "cumulus-pallet-parachain-system/std", + "cumulus-pallet-session-benchmarking/std", + "cumulus-pallet-xcm/std", + "cumulus-pallet-xcmp-queue/std", + "cumulus-primitives-aura/std", + "cumulus-primitives-core/std", + "cumulus-primitives-timestamp/std", + "cumulus-primitives-utility/std", + "frame-benchmarking/std", + "frame-executive/std", + "frame-support/std", + "frame-system-benchmarking/std", + "frame-system-rpc-runtime-api/std", + "frame-try-runtime/std", + "frame-system/std", + "kreivo-apis/std", + "log/std", + "runtime-constants/std", + "pallet-assets-freezer/std", + "pallet-asset-tx-payment/std", + "pallet-assets/std", + "pallet-aura/std", + "pallet-authorship/std", + "pallet-balances/std", + "pallet-contracts/std", + "pallet-communities-manager/std", + "pallet-communities/std", + "pallet-collator-selection/std", + "pallet-gas-transaction-payment/std", + "pallet-message-queue/std", + "pallet-multisig/std", + "pallet-nfts/std", + "pallet-pass/std", + "pallet-payments/std", + "pallet-preimage/std", + "pallet-proxy/std", + "pallet-ranked-collective/std", + "pallet-referenda/std", + "pallet-referenda-tracks/std", + "pallet-scheduler/std", + "pallet-session/std", + "pallet-skip-feeless-payment/std", + "pallet-sudo/std", + "pallet-timestamp/std", + "pallet-transaction-payment-rpc-runtime-api/std", + "pallet-transaction-payment/std", + "pallet-treasury/std", + "pallet-utility/std", + "pallet-xcm/std", + "pallet-xcm-benchmarks/std", + "parachain-info/std", + "parachains-common/std", + "parity-scale-codec/std", + "pass-webauthn/std", + "polkadot-core-primitives/std", + "polkadot-parachain-primitives/std", + "polkadot-runtime-common/std", + "runtime-common/std", + "scale-info/std", + "sp-api/std", + "sp-block-builder/std", + "sp-consensus-aura/std", + "sp-core/std", + "sp-genesis-builder/std", + "sp-inherents/std", + "sp-io?/std", + "sp-offchain/std", + "sp-runtime/std", + "sp-session/std", + "sp-transaction-pool/std", + "sp-version/std", + "sp-weights/std", + "virto-common/std", + "xcm-builder/std", + "xcm-executor/std", + "xcm/std", + "pallet-listings/std", + "pallet-vesting/std", + "serde_json/std", + "pallet-assets-holder/std", + "pallet-orders/std", + "frame-contrib-traits/std", ] runtime-benchmarks = [ - "assets-common/runtime-benchmarks", - "cumulus-pallet-session-benchmarking/runtime-benchmarks", - "cumulus-pallet-parachain-system/runtime-benchmarks", - "cumulus-pallet-xcmp-queue/runtime-benchmarks", - "cumulus-primitives-core/runtime-benchmarks", - "cumulus-primitives-utility/runtime-benchmarks", - "frame-benchmarking/runtime-benchmarks", - "frame-support/runtime-benchmarks", - "frame-system-benchmarking/runtime-benchmarks", - "frame-system/runtime-benchmarks", - "hex-literal", - "pallet-assets-freezer/runtime-benchmarks", - "pallet-asset-tx-payment/runtime-benchmarks", - "pallet-assets/runtime-benchmarks", - "pallet-balances/runtime-benchmarks", - "pallet-contracts/runtime-benchmarks", - "pallet-communities-manager/runtime-benchmarks", - "pallet-communities/runtime-benchmarks", - "pallet-collator-selection/runtime-benchmarks", - "pallet-gas-transaction-payment/runtime-benchmarks", - "pallet-message-queue/runtime-benchmarks", - "pallet-multisig/runtime-benchmarks", - "pallet-nfts/runtime-benchmarks", - "pallet-payments/runtime-benchmarks", - "pallet-pass/runtime-benchmarks", - "pallet-preimage/runtime-benchmarks", - "pallet-proxy/runtime-benchmarks", - "pallet-ranked-collective/runtime-benchmarks", - "pallet-referenda/runtime-benchmarks", - "pallet-referenda-tracks/runtime-benchmarks", - "pallet-scheduler/runtime-benchmarks", - "pallet-skip-feeless-payment/runtime-benchmarks", - "pallet-sudo/runtime-benchmarks", - "pallet-timestamp/runtime-benchmarks", - "pallet-treasury/runtime-benchmarks", - "pallet-utility/runtime-benchmarks", - "pallet-xcm-benchmarks/runtime-benchmarks", - "pallet-xcm/runtime-benchmarks", - "pass-webauthn/runtime-benchmarks", - "parachains-common/runtime-benchmarks", - "polkadot-parachain-primitives/runtime-benchmarks", - "polkadot-runtime-common/runtime-benchmarks", - "runtime-common/runtime-benchmarks", - "sp-io", - "sp-runtime/runtime-benchmarks", - "xcm-builder/runtime-benchmarks", - "xcm-executor/runtime-benchmarks", - "pallet-listings/runtime-benchmarks", - "fc-traits-gas-tank/runtime-benchmarks", - "fc-traits-memberships/runtime-benchmarks", - "pallet-vesting/runtime-benchmarks", - "pallet-assets-holder/runtime-benchmarks", - "pallet-orders/runtime-benchmarks" + "assets-common/runtime-benchmarks", + "cumulus-pallet-session-benchmarking/runtime-benchmarks", + "cumulus-pallet-parachain-system/runtime-benchmarks", + "cumulus-pallet-xcmp-queue/runtime-benchmarks", + "cumulus-primitives-core/runtime-benchmarks", + "cumulus-primitives-utility/runtime-benchmarks", + "frame-benchmarking/runtime-benchmarks", + "frame-support/runtime-benchmarks", + "frame-system-benchmarking/runtime-benchmarks", + "frame-system/runtime-benchmarks", + "hex-literal", + "pallet-assets-freezer/runtime-benchmarks", + "pallet-asset-tx-payment/runtime-benchmarks", + "pallet-assets/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", + "pallet-contracts/runtime-benchmarks", + "pallet-communities-manager/runtime-benchmarks", + "pallet-communities/runtime-benchmarks", + "pallet-collator-selection/runtime-benchmarks", + "pallet-gas-transaction-payment/runtime-benchmarks", + "pallet-message-queue/runtime-benchmarks", + "pallet-multisig/runtime-benchmarks", + "pallet-nfts/runtime-benchmarks", + "pallet-payments/runtime-benchmarks", + "pallet-pass/runtime-benchmarks", + "pallet-preimage/runtime-benchmarks", + "pallet-proxy/runtime-benchmarks", + "pallet-ranked-collective/runtime-benchmarks", + "pallet-referenda/runtime-benchmarks", + "pallet-referenda-tracks/runtime-benchmarks", + "pallet-scheduler/runtime-benchmarks", + "pallet-skip-feeless-payment/runtime-benchmarks", + "pallet-sudo/runtime-benchmarks", + "pallet-timestamp/runtime-benchmarks", + "pallet-treasury/runtime-benchmarks", + "pallet-utility/runtime-benchmarks", + "pallet-xcm-benchmarks/runtime-benchmarks", + "pallet-xcm/runtime-benchmarks", + "pass-webauthn/runtime-benchmarks", + "parachains-common/runtime-benchmarks", + "polkadot-parachain-primitives/runtime-benchmarks", + "polkadot-runtime-common/runtime-benchmarks", + "runtime-common/runtime-benchmarks", + "sp-io", + "sp-runtime/runtime-benchmarks", + "xcm-builder/runtime-benchmarks", + "xcm-executor/runtime-benchmarks", + "pallet-listings/runtime-benchmarks", + "pallet-vesting/runtime-benchmarks", + "pallet-assets-holder/runtime-benchmarks", + "pallet-orders/runtime-benchmarks", + "frame-contrib-traits/runtime-benchmarks", ] try-runtime = [ - "cumulus-pallet-aura-ext/try-runtime", - "cumulus-pallet-parachain-system/try-runtime", - "cumulus-pallet-xcm/try-runtime", - "cumulus-pallet-xcmp-queue/try-runtime", - "frame-executive/try-runtime", - "frame-system/try-runtime", - "frame-support/try-runtime", - "frame-try-runtime/try-runtime", - "pallet-assets-freezer/try-runtime", - "pallet-asset-tx-payment/try-runtime", - "pallet-assets/try-runtime", - "pallet-aura/try-runtime", - "pallet-authorship/try-runtime", - "pallet-balances/try-runtime", - "pallet-contracts/try-runtime", - "pallet-communities-manager/try-runtime", - "pallet-communities/try-runtime", - "pallet-collator-selection/try-runtime", - "pallet-gas-transaction-payment/try-runtime", - "pallet-message-queue/try-runtime", - "pallet-nfts/try-runtime", - "pallet-multisig/try-runtime", - "pallet-pass/try-runtime", - "pallet-payments/try-runtime", - "pallet-preimage/try-runtime", - "pallet-proxy/try-runtime", - "pallet-ranked-collective/try-runtime", - "pallet-referenda/try-runtime", - "pallet-referenda-tracks/try-runtime", - "pallet-scheduler/try-runtime", - "pallet-session/try-runtime", - "pallet-skip-feeless-payment/try-runtime", - "pallet-sudo/try-runtime", - "pallet-timestamp/try-runtime", - "pallet-transaction-payment/try-runtime", - "pallet-treasury/try-runtime", - "pallet-utility/try-runtime", - "pallet-xcm/try-runtime", - "pass-webauthn/try-runtime", - "parachain-info/try-runtime", - "polkadot-runtime-common/try-runtime", - "runtime-common/try-runtime", - "sp-runtime/try-runtime", - "pallet-listings/try-runtime", - "pallet-vesting/try-runtime", - "pallet-assets-holder/try-runtime", - "pallet-orders/try-runtime" + "cumulus-pallet-aura-ext/try-runtime", + "cumulus-pallet-parachain-system/try-runtime", + "cumulus-pallet-xcm/try-runtime", + "cumulus-pallet-xcmp-queue/try-runtime", + "frame-executive/try-runtime", + "frame-system/try-runtime", + "frame-support/try-runtime", + "frame-try-runtime/try-runtime", + "pallet-assets-freezer/try-runtime", + "pallet-asset-tx-payment/try-runtime", + "pallet-assets/try-runtime", + "pallet-aura/try-runtime", + "pallet-authorship/try-runtime", + "pallet-balances/try-runtime", + "pallet-contracts/try-runtime", + "pallet-communities-manager/try-runtime", + "pallet-communities/try-runtime", + "pallet-collator-selection/try-runtime", + "pallet-gas-transaction-payment/try-runtime", + "pallet-message-queue/try-runtime", + "pallet-nfts/try-runtime", + "pallet-multisig/try-runtime", + "pallet-pass/try-runtime", + "pallet-payments/try-runtime", + "pallet-preimage/try-runtime", + "pallet-proxy/try-runtime", + "pallet-ranked-collective/try-runtime", + "pallet-referenda/try-runtime", + "pallet-referenda-tracks/try-runtime", + "pallet-scheduler/try-runtime", + "pallet-session/try-runtime", + "pallet-skip-feeless-payment/try-runtime", + "pallet-sudo/try-runtime", + "pallet-timestamp/try-runtime", + "pallet-transaction-payment/try-runtime", + "pallet-treasury/try-runtime", + "pallet-utility/try-runtime", + "pallet-xcm/try-runtime", + "pass-webauthn/try-runtime", + "parachain-info/try-runtime", + "polkadot-runtime-common/try-runtime", + "runtime-common/try-runtime", + "sp-runtime/try-runtime", + "pallet-listings/try-runtime", + "pallet-vesting/try-runtime", + "pallet-assets-holder/try-runtime", + "pallet-orders/try-runtime", ] diff --git a/runtime/kreivo/src/config/communities/governance.rs b/runtime/kreivo/src/config/communities/governance.rs index 354041610..a6f41a38b 100644 --- a/runtime/kreivo/src/config/communities/governance.rs +++ b/runtime/kreivo/src/config/communities/governance.rs @@ -66,7 +66,7 @@ where o: RuntimeOriginFor, track_origin: &PalletsOriginOf, ) -> Result> { - use fc_traits_memberships::Inspect; + use frame_contrib_traits::memberships::Inspect; use frame_system::RawOrigin::Signed; let community_id = T::Tracks::track_for(track_origin).map_err(|_| o.clone())?; diff --git a/runtime/kreivo/src/config/communities/memberships.rs b/runtime/kreivo/src/config/communities/memberships.rs index 7789b5995..eea4d59c0 100644 --- a/runtime/kreivo/src/config/communities/memberships.rs +++ b/runtime/kreivo/src/config/communities/memberships.rs @@ -1,6 +1,6 @@ use super::*; -use fc_traits_memberships::OnMembershipAssigned; +use frame_contrib_traits::memberships::OnMembershipAssigned; use frame_system::EnsureRootWithSuccess; use sp_runtime::traits::Verify; diff --git a/runtime/kreivo/src/config/communities/mod.rs b/runtime/kreivo/src/config/communities/mod.rs index abffc8007..75d4ccdf7 100644 --- a/runtime/kreivo/src/config/communities/mod.rs +++ b/runtime/kreivo/src/config/communities/mod.rs @@ -8,7 +8,7 @@ use pallet_communities::origin::{EnsureCommunity, EnsureSignedPays}; use sp_runtime::{morph_types, traits::AccountIdConversion}; use virto_common::{CommunityId, MembershipId}; -use fc_traits_memberships::{NonFungiblesMemberships, WithHooks}; +use frame_contrib_traits::memberships::{NonFungiblesMemberships, WithHooks}; pub mod governance; pub mod memberships; diff --git a/runtime/kreivo/src/config/currency.rs b/runtime/kreivo/src/config/currency.rs index fd4807372..2bf768e2a 100644 --- a/runtime/kreivo/src/config/currency.rs +++ b/runtime/kreivo/src/config/currency.rs @@ -8,7 +8,7 @@ use frame_support::{ use polkadot_runtime_common::SlowAdjustingFeeUpdate; use runtime_common::impls::AssetsToBlockAuthor; -use fc_traits_gas_tank::{NonFungibleGasTank, SelectNonFungibleItem}; +use frame_contrib_traits::gas_tank::{NonFungibleGasTank, SelectNonFungibleItem}; use pallet_asset_tx_payment::FungiblesAdapter; use pallet_assets::BalanceToAssetBalance; use pallet_transaction_payment::FungibleAdapter; diff --git a/runtime/kreivo/src/config/system.rs b/runtime/kreivo/src/config/system.rs index eb22798ab..50991cbb6 100644 --- a/runtime/kreivo/src/config/system.rs +++ b/runtime/kreivo/src/config/system.rs @@ -10,7 +10,7 @@ use cumulus_pallet_parachain_system::RelayNumberMonotonicallyIncreases; use parachains_common::{AVERAGE_ON_INITIALIZE_RATIO, NORMAL_DISPATCH_RATIO}; use polkadot_runtime_common::BlockHashCount; -use fc_traits_authn::{composite_authenticator, util::AuthorityFromPalletId, Challenge, Challenger}; +use frame_contrib_traits::authn::{composite_authenticator, util::AuthorityFromPalletId, Challenge, Challenger}; use pallet_communities::origin::AsSignedByCommunity; // #[runtime::pallet_index(0)] @@ -144,8 +144,9 @@ parameter_types! { pub NeverPays: Option> = None; } -/// A [`Challenger`][`fc_traits_authn::Challenger`] which verifies the -/// block hash of a block of a given block that's within the last `PAST_BLOCKS`. +/// A [`Challenger`][`frame_contrib_traits::authn::Challenger`] which verifies +/// the block hash of a block of a given block that's within the last +/// `PAST_BLOCKS`. pub struct BlockHashChallenger; impl Challenger for BlockHashChallenger { @@ -164,7 +165,7 @@ impl Challenger for BlockHashChallenger, AuthorityFromPalletId>; #[cfg(feature = "runtime-benchmarks")] -pub type Dummy = fc_traits_authn::util::dummy::Dummy>; +pub type Dummy = frame_contrib_traits::authn::util::dummy::Dummy>; #[cfg(not(feature = "runtime-benchmarks"))] composite_authenticator!( @@ -249,11 +250,11 @@ impl pallet_pass::BenchmarkHelper for PassBenchmarkHelper { RuntimeOrigin::root() } - fn device_attestation(_: fc_traits_authn::DeviceId) -> pallet_pass::DeviceAttestationOf { - PassDeviceAttestation::Dummy(fc_traits_authn::util::dummy::DummyAttestation::new(true)) + fn device_attestation(_: frame_contrib_traits::authn::DeviceId) -> pallet_pass::DeviceAttestationOf { + PassDeviceAttestation::Dummy(frame_contrib_traits::authn::util::dummy::DummyAttestation::new(true)) } fn credential(_: HashedUserId) -> pallet_pass::CredentialOf { - PassCredential::Dummy(fc_traits_authn::util::dummy::DummyCredential::new(true)) + PassCredential::Dummy(frame_contrib_traits::authn::util::dummy::DummyCredential::new(true)) } } diff --git a/runtime/runtime-constants/Cargo.toml b/runtime/runtime-constants/Cargo.toml index 64471085b..2c8a9f5f9 100644 --- a/runtime/runtime-constants/Cargo.toml +++ b/runtime/runtime-constants/Cargo.toml @@ -23,13 +23,13 @@ xcm-builder.workspace = true default = ["std"] paseo = [] std = [ - "frame-support/std", - "polkadot-primitives/std", - "polkadot-runtime-common/std", - "sp-core/std", - "sp-runtime/std", - "sp-weights/std", - "xcm-builder/std", - "parachains-common/std", - "xcm/std" + "frame-support/std", + "polkadot-primitives/std", + "polkadot-runtime-common/std", + "sp-core/std", + "sp-runtime/std", + "sp-weights/std", + "xcm-builder/std", + "parachains-common/std", + "xcm/std", ] diff --git a/zombienet/kreivo-kusama-local.toml b/zombienet/kreivo-kusama-local.toml index 1b38b25a4..a7b1615ef 100644 --- a/zombienet/kreivo-kusama-local.toml +++ b/zombienet/kreivo-kusama-local.toml @@ -13,23 +13,31 @@ max_candidate_depth = 3 allowed_ancestry_len = 2 [[relaychain.nodes]] -extra_args = ["--force-authoring -lparachain=debug --unsafe-rpc-external --rpc-cors=all"] +extra_args = [ + "--force-authoring -lparachain=debug --unsafe-rpc-external --rpc-cors=all", +] name = "alice" validator = true ws_port = 10000 [[relaychain.nodes]] -extra_args = ["--force-authoring -lparachain=debug --unsafe-rpc-external --rpc-cors=all"] +extra_args = [ + "--force-authoring -lparachain=debug --unsafe-rpc-external --rpc-cors=all", +] name = "bob" validator = true [[relaychain.nodes]] -extra_args = ["--force-authoring -lparachain=debug --unsafe-rpc-external --rpc-cors=all"] +extra_args = [ + "--force-authoring -lparachain=debug --unsafe-rpc-external --rpc-cors=all", +] name = "charlie" validator = true [[relaychain.nodes]] -extra_args = ["--force-authoring -lparachain=debug --unsafe-rpc-external --rpc-cors=all"] +extra_args = [ + "--force-authoring -lparachain=debug --unsafe-rpc-external --rpc-cors=all", +] name = "dave" validator = true diff --git a/zombienet/kreivo-paseo-local.toml b/zombienet/kreivo-paseo-local.toml index 0b313587b..c6e562a98 100644 --- a/zombienet/kreivo-paseo-local.toml +++ b/zombienet/kreivo-paseo-local.toml @@ -13,23 +13,31 @@ max_candidate_depth = 3 allowed_ancestry_len = 2 [[relaychain.nodes]] -extra_args = ["--force-authoring -lparachain=debug --unsafe-rpc-external --rpc-cors=all"] +extra_args = [ + "--force-authoring -lparachain=debug --unsafe-rpc-external --rpc-cors=all", +] name = "alice" validator = true ws_port = 10000 [[relaychain.nodes]] -extra_args = ["--force-authoring -lparachain=debug --unsafe-rpc-external --rpc-cors=all"] +extra_args = [ + "--force-authoring -lparachain=debug --unsafe-rpc-external --rpc-cors=all", +] name = "bob" validator = true [[relaychain.nodes]] -extra_args = ["--force-authoring -lparachain=debug --unsafe-rpc-external --rpc-cors=all"] +extra_args = [ + "--force-authoring -lparachain=debug --unsafe-rpc-external --rpc-cors=all", +] name = "charlie" validator = true [[relaychain.nodes]] -extra_args = ["--force-authoring -lparachain=debug --unsafe-rpc-external --rpc-cors=all"] +extra_args = [ + "--force-authoring -lparachain=debug --unsafe-rpc-external --rpc-cors=all", +] name = "dave" validator = true