git.delta.rocks / unique-network / refs/commits / 65414d643dd4

difftreelog

feat(app-promo) types for `Currency` trait support has been removed & bench fix

PraetorP2023-06-23parent: #c575769.patch.diff
in: master

8 files changed

modifiedCargo.lockdiffbeforeafterboth
after · Cargo.lock
1123 packageslockfile v3
modifiedpallets/app-promotion/CHANGELOG.mddiffbeforeafterboth
--- a/pallets/app-promotion/CHANGELOG.md
+++ b/pallets/app-promotion/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 
 <!-- bureaucrate goes here -->
+
+## [0.2.1] - 2023-06-23
+
+### Changed
+
+- Removed types associated with support for `Currency` trait.
+
+### Fixed
+
+- Benchmarks.
+  
 ## [0.2.0] - 2023-05-19
 
 ### Changed
modifiedpallets/app-promotion/Cargo.tomldiffbeforeafterboth
--- a/pallets/app-promotion/Cargo.toml
+++ b/pallets/app-promotion/Cargo.toml
@@ -9,7 +9,7 @@
 license = 'GPLv3'
 name = 'pallet-app-promotion'
 repository = 'https://github.com/UniqueNetwork/unique-chain'
-version = '0.2.0'
+version = '0.2.1'
 
 [package.metadata.docs.rs]
 targets = ['x86_64-unknown-linux-gnu']
@@ -27,7 +27,6 @@
 	'frame-benchmarking/std',
 	'frame-support/std',
 	'frame-system/std',
-	'pallet-balances/std',
 	'pallet-evm/std',
 	'sp-core/std',
 	'sp-runtime/std',
@@ -48,7 +47,7 @@
 frame-benchmarking = { workspace = true, optional = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-pallet-balances = { features = ["insecure_zero_ed"], workspace = true }
+
 pallet-evm = { workspace = true }
 sp-core = { workspace = true }
 sp-runtime = { workspace = true }
modifiedpallets/app-promotion/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/app-promotion/src/benchmarking.rs
+++ b/pallets/app-promotion/src/benchmarking.rs
@@ -18,7 +18,7 @@
 
 use super::*;
 use crate::Pallet as PromototionPallet;
-
+use frame_support::traits::fungible::Unbalanced;
 use sp_runtime::traits::Bounded;
 
 use frame_benchmarking::{benchmarks, account};
@@ -63,9 +63,9 @@
 
 		(0..b).try_for_each(|index| {
 			let staker = account::<T::AccountId>("staker", index, SEED);
-			<T as Config>::Currency::set_balance(&staker,  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
+			<T as Config>::Currency::write_balance(&staker,  Into::<BalanceOf<T>>::into(10_000u128) * T::Nominal::get())?;
 			PromototionPallet::<T>::stake(RawOrigin::Signed(staker.clone()).into(), Into::<BalanceOf<T>>::into(100u128) * T::Nominal::get())?;
-			PromototionPallet::<T>::unstake_all(RawOrigin::Signed(staker.clone()).into())?;
+			PromototionPallet::<T>::unstake_all(RawOrigin::Signed(staker).into())?;
 			Result::<(), sp_runtime::DispatchError>::Ok(())
 		})?;
 		let block_number = <frame_system::Pallet<T>>::current_block_number() + T::PendingInterval::get();
@@ -82,13 +82,14 @@
 		let pallet_admin = account::<T::AccountId>("admin", 1, SEED);
 		let share = Perbill::from_rational(1u32, 20);
 		PromototionPallet::<T>::set_admin_address(RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin.clone()))?;
-		<T as Config>::Currency::set_balance(&pallet_admin,  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
-		<T as Config>::Currency::set_balance(&<T as pallet::Config>::TreasuryAccountId::get(),  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
+		<T as Config>::Currency::write_balance(&pallet_admin,  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value())?;
+		<T as Config>::Currency::write_balance(&<T as pallet::Config>::TreasuryAccountId::get(),  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value())?;
 
 		let stakers: Vec<T::AccountId> = (0..b).map(|index| account("staker", index, SEED)).collect();
-		stakers.iter().for_each(|staker| {
-			<T as Config>::Currency::set_balance(&staker,  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
-		});
+		stakers.iter().try_for_each(|staker| {
+			<T as Config>::Currency::write_balance(staker,  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value())?;
+			Result::<(), sp_runtime::DispatchError>::Ok(())
+		})?;
 		(1..11).try_for_each(|i| {
 			<frame_system::Pallet<T>>::set_block_number(i.into());
 			T::RelayBlockNumberProvider::set_block_number((2*i).into());
@@ -102,7 +103,7 @@
 			Result::<(), sp_runtime::DispatchError>::Ok(())
 		})?;
 
-		let stakes = Staked::<T>::iter_prefix((&stakers[0],)).into_iter().collect::<Vec<_>>();
+		let stakes = Staked::<T>::iter_prefix((&stakers[0],)).collect::<Vec<_>>();
 		assert_eq!(stakes.len(), 10);
 
 		<frame_system::Pallet<T>>::set_block_number(15_000.into());
@@ -112,13 +113,13 @@
 	stake {
 		let caller = account::<T::AccountId>("caller", 0, SEED);
 		let share = Perbill::from_rational(1u32, 10);
-		let _ = <T as Config>::Currency::set_balance(&caller,  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
+		let _ = <T as Config>::Currency::write_balance(&caller,  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
 	} : _(RawOrigin::Signed(caller.clone()), share * <T as Config>::Currency::total_balance(&caller))
 
 	unstake_all {
 		let caller = account::<T::AccountId>("caller", 0, SEED);
 		let share = Perbill::from_rational(1u32, 20);
-		let _ = <T as Config>::Currency::set_balance(&caller,  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
+		let _ = <T as Config>::Currency::write_balance(&caller,  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
 		(1..11).map(|i| {
 			// used to change block number
 			<frame_system::Pallet<T>>::set_block_number(i.into());
@@ -133,7 +134,7 @@
 	unstake_partial {
 		let caller = account::<T::AccountId>("caller", 0, SEED);
 		let share = Perbill::from_rational(1u32, 20);
-		let _ = <T as Config>::Currency::set_balance(&caller,  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
+		let _ = <T as Config>::Currency::write_balance(&caller,  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
 		(1..11).map(|i| {
 			// used to change block number
 			<frame_system::Pallet<T>>::set_block_number(i.into());
@@ -148,19 +149,19 @@
 	sponsor_collection {
 		let pallet_admin = account::<T::AccountId>("admin", 0, SEED);
 		PromototionPallet::<T>::set_admin_address(RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin.clone()))?;
-		let _ = <T as Config>::Currency::set_balance(&pallet_admin,  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
+		let _ = <T as Config>::Currency::write_balance(&pallet_admin,  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
 		let caller: T::AccountId = account("caller", 0, SEED);
-		let _ = <T as Config>::Currency::set_balance(&caller,  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
-		let collection = create_nft_collection::<T>(caller.clone())?;
+		let _ = <T as Config>::Currency::write_balance(&caller,  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
+		let collection = create_nft_collection::<T>(caller)?;
 	} : _(RawOrigin::Signed(pallet_admin.clone()), collection)
 
 	stop_sponsoring_collection {
 		let pallet_admin = account::<T::AccountId>("admin", 0, SEED);
 		PromototionPallet::<T>::set_admin_address(RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin.clone()))?;
-		let _ = <T as Config>::Currency::set_balance(&pallet_admin,  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
+		let _ = <T as Config>::Currency::write_balance(&pallet_admin,  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
 		let caller: T::AccountId = account("caller", 0, SEED);
-		let _ = <T as Config>::Currency::set_balance(&caller,  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
-		let collection = create_nft_collection::<T>(caller.clone())?;
+		let _ = <T as Config>::Currency::write_balance(&caller,  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
+		let collection = create_nft_collection::<T>(caller)?;
 		PromototionPallet::<T>::sponsor_collection(RawOrigin::Signed(pallet_admin.clone()).into(), collection)?;
 	} : _(RawOrigin::Signed(pallet_admin.clone()), collection)
 
@@ -168,9 +169,9 @@
 		let pallet_admin = account::<T::AccountId>("admin", 0, SEED);
 		PromototionPallet::<T>::set_admin_address(RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin.clone()))?;
 
-		let _ = <T as Config>::Currency::set_balance(&pallet_admin,  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
+		let _ = <T as Config>::Currency::write_balance(&pallet_admin,  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
 		let address = H160::from_low_u64_be(SEED as u64);
-		let data: Vec<u8> = (0..20 as u8).collect();
+		let data: Vec<u8> = (0..20).collect();
 		<EvmMigrationPallet<T>>::begin(RawOrigin::Root.into(), address)?;
 		<EvmMigrationPallet<T>>::finish(RawOrigin::Root.into(), address, data)?;
 	} : _(RawOrigin::Signed(pallet_admin.clone()), address)
@@ -179,9 +180,9 @@
 		let pallet_admin = account::<T::AccountId>("admin", 0, SEED);
 		PromototionPallet::<T>::set_admin_address(RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin.clone()))?;
 
-		let _ = <T as Config>::Currency::set_balance(&pallet_admin,  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
+		let _ = <T as Config>::Currency::write_balance(&pallet_admin,  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
 		let address = H160::from_low_u64_be(SEED as u64);
-		let data: Vec<u8> = (0..20 as u8).collect();
+		let data: Vec<u8> = (0..20).collect();
 		<EvmMigrationPallet<T>>::begin(RawOrigin::Root.into(), address)?;
 		<EvmMigrationPallet<T>>::finish(RawOrigin::Root.into(), address, data)?;
 		PromototionPallet::<T>::sponsor_contract(RawOrigin::Signed(pallet_admin.clone()).into(), address)?;
modifiedpallets/app-promotion/src/lib.rsdiffbeforeafterboth
--- a/pallets/app-promotion/src/lib.rs
+++ b/pallets/app-promotion/src/lib.rs
@@ -53,16 +53,9 @@
 pub mod types;
 pub mod weights;
 
-use sp_std::{
-	vec::{Vec},
-	vec,
-	iter::Sum,
-	borrow::ToOwned,
-	cell::RefCell,
-};
+use sp_std::{vec::Vec, vec, iter::Sum, borrow::ToOwned, cell::RefCell};
 use sp_core::H160;
 use codec::EncodeLike;
-use pallet_balances::BalanceLock;
 pub use types::*;
 
 use up_data_structs::CollectionId;
@@ -70,7 +63,7 @@
 use frame_support::{
 	dispatch::{DispatchResult},
 	traits::{
-		Get, LockableCurrency,
+		Get,
 		tokens::Balance,
 		fungible::{Inspect, InspectFreeze, Mutate, MutateFreeze},
 	},
@@ -86,8 +79,6 @@
 	traits::{BlockNumberProvider, CheckedAdd, CheckedSub, AccountIdConversion, Zero},
 	ArithmeticError, DispatchError,
 };
-
-pub const LOCK_IDENTIFIER: [u8; 8] = *b"appstake";
 
 const PENDING_LIMIT_PER_BLOCK: u32 = 3;
 
@@ -108,12 +99,7 @@
 		frame_system::Config + pallet_evm::Config + pallet_configuration::Config
 	{
 		/// Type to interact with the native token
-		type Currency: MutateFreeze<Self::AccountId>
-			+ Mutate<Self::AccountId>
-			+ ExtendedLockableCurrency<
-				Self::AccountId,
-				Balance = <<Self as Config>::Currency as Inspect<Self::AccountId>>::Balance,
-			>;
+		type Currency: MutateFreeze<Self::AccountId> + Mutate<Self::AccountId>;
 
 		/// Type for interacting with collections
 		type CollectionHandler: CollectionHandler<
@@ -701,48 +687,7 @@
 				}
 				flush_stake()?;
 			}
-
-			Ok(())
-		}
-
-		///  Migrates lock state into freeze one
-		///
-		/// # Permissions
-		///
-		/// * Sudo
-		///
-		///   # Arguments
-		///
-		/// * `origin`: Must be `Root`.
-		/// * `stakers`: Accounts to be upgraded.
-		#[pallet::call_index(9)]
-		#[pallet::weight(T::DbWeight::get().reads_writes(2, 2) * stakers.len() as u64)]
-		pub fn upgrade_accounts(
-			origin: OriginFor<T>,
-			stakers: Vec<T::AccountId>,
-		) -> DispatchResult {
-			ensure_root(origin)?;
 
-			stakers
-				.into_iter()
-				.try_for_each(|s| -> Result<_, DispatchError> {
-					if let Some(BalanceLock { amount, .. }) = Self::get_locked_balance(&s) {
-						if Self::get_frozen_balance(&s).is_some() {
-							return Err(Error::<T>::InconsistencyState.into());
-						}
-
-						<<T as Config>::Currency as LockableCurrency<T::AccountId>>::remove_lock(
-							LOCK_IDENTIFIER,
-							&s,
-						);
-
-						Self::set_freeze_with_result(&s, amount)?;
-						Ok(())
-					} else {
-						Ok(())
-					}
-				})?;
-
 			Ok(())
 		}
 
@@ -756,7 +701,7 @@
 		///
 		/// * `origin`: Must be `Root`.
 		/// * `pending_blocks`: Block numbers that will be processed.
-		#[pallet::call_index(10)]
+		#[pallet::call_index(9)]
 		#[pallet::weight(<T as Config>::WeightInfo::on_initialize(PENDING_LIMIT_PER_BLOCK*pending_blocks.len() as u32))]
 		pub fn force_unstake(
 			origin: OriginFor<T>,
@@ -933,17 +878,6 @@
 				amount,
 			)
 		}
-	}
-
-	/// Returns the balance locked by the pallet for the staker.
-	///
-	/// - `staker`: staker account.
-	pub fn get_locked_balance(
-		staker: impl EncodeLike<T::AccountId>,
-	) -> Option<BalanceLock<BalanceOf<T>>> {
-		<<T as Config>::Currency as ExtendedLockableCurrency<T::AccountId>>::locks(staker)
-			.into_iter()
-			.find(|l| l.id == LOCK_IDENTIFIER)
 	}
 
 	/// Returns the balance frozen by the pallet for the staker.
modifiedpallets/app-promotion/src/types.rsdiffbeforeafterboth
--- a/pallets/app-promotion/src/types.rs
+++ b/pallets/app-promotion/src/types.rs
@@ -1,7 +1,5 @@
-use codec::EncodeLike;
-use frame_support::{traits::LockableCurrency, WeakBoundedVec, Parameter, dispatch::DispatchResult};
+use frame_support::{dispatch::DispatchResult};
 
-use pallet_balances::{BalanceLock, Config as BalancesConfig, Pallet as PalletBalances};
 use pallet_common::CollectionHandle;
 
 use sp_runtime::{DispatchError, Perbill};
@@ -14,25 +12,6 @@
 const MAX_NUMBER_PAYOUTS: u8 = 100;
 pub(crate) const DEFAULT_NUMBER_PAYOUTS: u8 = 20;
 
-/// This trait was defined because `LockableCurrency`
-/// has no way to know the state of the lock for an account.
-pub trait ExtendedLockableCurrency<AccountId: Parameter>: LockableCurrency<AccountId> {
-	/// Returns lock balance for an account. Allows to determine the cause of the lock.
-	fn locks<KArg>(who: KArg) -> WeakBoundedVec<BalanceLock<Self::Balance>, Self::MaxLocks>
-	where
-		KArg: EncodeLike<AccountId>;
-}
-
-impl<T: BalancesConfig<I>, I: 'static> ExtendedLockableCurrency<T::AccountId>
-	for PalletBalances<T, I>
-{
-	fn locks<KArg>(who: KArg) -> WeakBoundedVec<BalanceLock<Self::Balance>, Self::MaxLocks>
-	where
-		KArg: EncodeLike<T::AccountId>,
-	{
-		Self::locks(who)
-	}
-}
 /// Trait for interacting with collections.
 pub trait CollectionHandler {
 	type CollectionId;
modifiedpallets/nonfungible/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/benchmarking.rs
+++ b/pallets/nonfungible/src/benchmarking.rs
@@ -200,7 +200,7 @@
 			value: property_value(),
 		}).collect::<Vec<_>>();
 		let item = create_max_item(&collection, &owner, owner.clone())?;
-	}: {<Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), false, &Unlimited)?}
+	}: {<Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), SetPropertyMode::ExistingToken, &Unlimited)?}
 
 	delete_token_properties {
 		let b in 0..MAX_PROPERTIES_PER_ITEM;
@@ -222,7 +222,7 @@
 			value: property_value(),
 		}).collect::<Vec<_>>();
 		let item = create_max_item(&collection, &owner, owner.clone())?;
-		<Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), false, &Unlimited)?;
+		<Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), SetPropertyMode::ExistingToken, &Unlimited)?;
 		let to_delete = (0..b).map(|k| property_key(k as usize)).collect::<Vec<_>>();
 	}: {<Pallet<T>>::delete_token_properties(&collection, &owner, item, to_delete.into_iter(), &Unlimited)?}
modifiedpallets/refungible/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/refungible/src/benchmarking.rs
+++ b/pallets/refungible/src/benchmarking.rs
@@ -257,7 +257,7 @@
 			value: property_value(),
 		}).collect::<Vec<_>>();
 		let item = create_max_item(&collection, &owner, [(owner.clone(), 200)])?;
-	}: {<Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), false, &Unlimited)?}
+	}: {<Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), SetPropertyMode::ExistingToken, &Unlimited)?}
 
 	delete_token_properties {
 		let b in 0..MAX_PROPERTIES_PER_ITEM;
@@ -279,7 +279,7 @@
 			value: property_value(),
 		}).collect::<Vec<_>>();
 		let item = create_max_item(&collection, &owner, [(owner.clone(), 200)])?;
-		<Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), false, &Unlimited)?;
+		<Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), SetPropertyMode::ExistingToken, &Unlimited)?;
 		let to_delete = (0..b).map(|k| property_key(k as usize)).collect::<Vec<_>>();
 	}: {<Pallet<T>>::delete_token_properties(&collection, &owner, item, to_delete.into_iter(), &Unlimited)?}