Pallet grouping macros

evm-template/Cargo.toml

@@ -27,6 +27,9 @@ serde_derive = { version = "1.0.121", default-features = false }
 serde_json = "1.0.121"
 smallvec = "1.11.0"
 
+# TODO: update to release
+openzeppelin-polkadot-wrappers = { path = "../../polkadot-runtime-wrappers", default-features = false }
+
 # Substrate
 frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" }
 frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" }

evm-template/runtime/Cargo.toml

@@ -17,6 +17,8 @@ parity-scale-codec = { workspace = true, features = [ "derive" ] }
 scale-info = { workspace = true, features = [ "derive" ] }
 smallvec = { workspace = true }
 
+openzeppelin-polkadot-wrappers = { workspace = true }
+
 # Substrate
 frame-benchmarking = { workspace = true, optional = true }
 frame-executive = { workspace = true }
@@ -141,6 +143,7 @@ std = [
 	"frame-system/std",
 	"frame-try-runtime?/std",
 	"log/std",
+	"openzeppelin-polkadot-wrappers/std",
 	"orml-xtokens/std",
 	"pallet-asset-manager/std",
 	"pallet-assets/std",

evm-template/runtime/src/configs/asset_config.rs

@@ -1,8 +1,5 @@
-use frame_support::{
-    dispatch::GetDispatchInfo, parameter_types, traits::AsEnsureOriginWithArg, weights::Weight,
-};
-use frame_system::{EnsureRoot, EnsureSigned};
-use parity_scale_codec::{Compact, Decode, Encode};
+use frame_support::{dispatch::GetDispatchInfo, weights::Weight};
+use parity_scale_codec::{Decode, Encode};
 use scale_info::TypeInfo;
 use sp_core::{H160, H256};
 use sp_runtime::traits::Hash as THash;
@@ -13,21 +10,10 @@ use sp_std::{
 use xcm::latest::Location;
 
 use crate::{
-    constants::currency::{deposit, CENTS, MILLICENTS},
     types::{AccountId, AssetId, Balance},
-    weights, AssetManager, Assets, Balances, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin,
+    AssetManager, Assets, Runtime, RuntimeCall, RuntimeOrigin,
 };
 
-parameter_types! {
-    pub const AssetDeposit: Balance = 10 * CENTS;
-    pub const AssetAccountDeposit: Balance = deposit(1, 16);
-    pub const ApprovalDeposit: Balance = MILLICENTS;
-    pub const StringLimit: u32 = 50;
-    pub const MetadataDepositBase: Balance = deposit(1, 68);
-    pub const MetadataDepositPerByte: Balance = deposit(0, 1);
-    pub const RemoveItemsLimit: u32 = 1000;
-}
-
 // Required for runtime benchmarks
 pallet_assets::runtime_benchmarks_enabled! {
     pub struct BenchmarkHelper;
@@ -41,31 +27,6 @@ pallet_assets::runtime_benchmarks_enabled! {
     }
 }
 
-// Foreign assets
-impl pallet_assets::Config for Runtime {
-    type ApprovalDeposit = ApprovalDeposit;
-    type AssetAccountDeposit = AssetAccountDeposit;
-    type AssetDeposit = AssetDeposit;
-    type AssetId = AssetId;
-    type AssetIdParameter = Compact<AssetId>;
-    type Balance = Balance;
-    #[cfg(feature = "runtime-benchmarks")]
-    type BenchmarkHelper = BenchmarkHelper;
-    type CallbackHandle = ();
-    type CreateOrigin = AsEnsureOriginWithArg<EnsureSigned<AccountId>>;
-    type Currency = Balances;
-    type Extra = ();
-    type ForceOrigin = EnsureRoot<AccountId>;
-    type Freezer = ();
-    type MetadataDepositBase = MetadataDepositBase;
-    type MetadataDepositPerByte = MetadataDepositPerByte;
-    type RemoveItemsLimit = RemoveItemsLimit;
-    type RuntimeEvent = RuntimeEvent;
-    type StringLimit = StringLimit;
-    /// Rerun benchmarks if you are making changes to runtime configuration.
-    type WeightInfo = weights::pallet_assets::WeightInfo<Runtime>;
-}
-
 // Our AssetType. For now we only handle Xcm Assets
 #[derive(Clone, Eq, Debug, PartialEq, Ord, PartialOrd, Encode, Decode, TypeInfo)]
 pub enum AssetType {
@@ -114,6 +75,14 @@ impl From<AssetType> for AssetId {
     }
 }
 
+#[derive(Clone, Default, Eq, Debug, PartialEq, Ord, PartialOrd, Encode, Decode, TypeInfo)]
+pub struct AssetRegistrarMetadata {
+    pub name: Vec<u8>,
+    pub symbol: Vec<u8>,
+    pub decimals: u8,
+    pub is_frozen: bool,
+}
+
 // We instruct how to register the Assets
 // In this case, we tell it to Create an Asset in pallet-assets
 pub struct AssetRegistrar;
@@ -165,26 +134,6 @@ impl pallet_asset_manager::AssetRegistrar<Runtime> for AssetRegistrar {
     }
 }
 
-#[derive(Clone, Default, Eq, Debug, PartialEq, Ord, PartialOrd, Encode, Decode, TypeInfo)]
-pub struct AssetRegistrarMetadata {
-    pub name: Vec<u8>,
-    pub symbol: Vec<u8>,
-    pub decimals: u8,
-    pub is_frozen: bool,
-}
-
-impl pallet_asset_manager::Config for Runtime {
-    type AssetId = AssetId;
-    type AssetRegistrar = AssetRegistrar;
-    type AssetRegistrarMetadata = AssetRegistrarMetadata;
-    type Balance = Balance;
-    type ForeignAssetModifierOrigin = EnsureRoot<AccountId>;
-    type ForeignAssetType = AssetType;
-    type RuntimeEvent = RuntimeEvent;
-    /// Rerun benchmarks if you are making changes to runtime configuration.
-    type WeightInfo = weights::pallet_asset_manager::WeightInfo<Runtime>;
-}
-
 /// This trait ensure we can convert AccountIds to AssetIds.
 pub trait AccountIdAssetIdConversion<Account, AssetId> {
     // Get assetId and prefix from account

evm-template/runtime/src/configs/governance/mod.rs

@@ -2,80 +2,10 @@
 
 pub mod origins;
 pub use origins::{Spender, WhitelistedCaller};
-mod tracks;
-
-use frame_support::{
-    parameter_types,
-    traits::{ConstU32, EitherOf},
-};
-use frame_system::{EnsureRoot, EnsureRootWithSuccess, EnsureSigned};
+pub mod tracks;
 
 use crate::{
-    constants::{
-        currency::{CENTS, GRAND},
-        DAYS,
-    },
-    types::{AccountId, Balance, BlockNumber},
-    weights, Balances, Preimage, Referenda, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin,
-    Scheduler, Treasury,
+    constants::currency::{CENTS, GRAND},
+    types::{Balance, BlockNumber},
+    RuntimeOrigin,
 };
-
-parameter_types! {
-    pub const VoteLockingPeriod: BlockNumber = 7 * DAYS;
-}
-
-impl pallet_conviction_voting::Config for Runtime {
-    type Currency = Balances;
-    type MaxTurnout =
-        frame_support::traits::tokens::currency::ActiveIssuanceOf<Balances, Self::AccountId>;
-    type MaxVotes = ConstU32<512>;
-    type Polls = Referenda;
-    type RuntimeEvent = RuntimeEvent;
-    type VoteLockingPeriod = VoteLockingPeriod;
-    /// Rerun benchmarks if you are making changes to runtime configuration.
-    type WeightInfo = weights::pallet_conviction_voting::WeightInfo<Runtime>;
-}
-
-parameter_types! {
-    pub const MaxBalance: Balance = Balance::MAX;
-}
-pub type TreasurySpender = EitherOf<EnsureRootWithSuccess<AccountId, MaxBalance>, Spender>;
-
-impl origins::pallet_custom_origins::Config for Runtime {}
-
-impl pallet_whitelist::Config for Runtime {
-    type DispatchWhitelistedOrigin = EitherOf<EnsureRoot<Self::AccountId>, WhitelistedCaller>;
-    type Preimages = Preimage;
-    type RuntimeCall = RuntimeCall;
-    type RuntimeEvent = RuntimeEvent;
-    /// Rerun benchmarks if you are making changes to runtime configuration.
-    type WeightInfo = weights::pallet_whitelist::WeightInfo<Runtime>;
-    type WhitelistOrigin = EnsureRoot<Self::AccountId>;
-}
-
-parameter_types! {
-    pub const AlarmInterval: BlockNumber = 1;
-    pub const SubmissionDeposit: Balance = 3 * CENTS;
-    pub const UndecidingTimeout: BlockNumber = 14 * DAYS;
-}
-
-impl pallet_referenda::Config for Runtime {
-    type AlarmInterval = AlarmInterval;
-    type CancelOrigin = EnsureRoot<AccountId>;
-    type Currency = Balances;
-    type KillOrigin = EnsureRoot<AccountId>;
-    type MaxQueued = ConstU32<20>;
-    type Preimages = Preimage;
-    type RuntimeCall = RuntimeCall;
-    type RuntimeEvent = RuntimeEvent;
-    type Scheduler = Scheduler;
-    type Slash = Treasury;
-    type SubmissionDeposit = SubmissionDeposit;
-    type SubmitOrigin = EnsureSigned<AccountId>;
-    type Tally = pallet_conviction_voting::TallyOf<Runtime>;
-    type Tracks = tracks::TracksInfo;
-    type UndecidingTimeout = UndecidingTimeout;
-    type Votes = pallet_conviction_voting::VotesOf<Runtime>;
-    /// Rerun benchmarks if you are making changes to runtime configuration.
-    type WeightInfo = weights::pallet_referenda::WeightInfo<Runtime>;
-}