difftreelog
feat(app-promo) types for `Currency` trait support has been removed & bench fix
in: master
8 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6129,13 +6129,12 @@
[[package]]
name = "pallet-app-promotion"
-version = "0.2.0"
+version = "0.2.1"
dependencies = [
"frame-benchmarking",
"frame-support",
"frame-system",
"log",
- "pallet-balances",
"pallet-common",
"pallet-configuration",
"pallet-evm",
pallets/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
pallets/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 }
pallets/app-promotion/src/benchmarking.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617#![cfg(feature = "runtime-benchmarks")]1819use super::*;20use crate::Pallet as PromototionPallet;2122use sp_runtime::traits::Bounded;2324use frame_benchmarking::{benchmarks, account};25use frame_support::traits::OnInitialize;26use frame_system::RawOrigin;27use pallet_unique::benchmarking::create_nft_collection;28use pallet_evm_migration::Pallet as EvmMigrationPallet;2930const SEED: u32 = 0;3132fn set_admin<T>() -> Result<T::AccountId, sp_runtime::DispatchError>33where34 T: Config + pallet_unique::Config + pallet_evm_migration::Config,35 T::BlockNumber: From<u32> + Into<u32>,36 BalanceOf<T>: Sum + From<u128>,37{38 let pallet_admin = account::<T::AccountId>("admin", 0, SEED);3940 <T as Config>::Currency::set_balance(41 &pallet_admin,42 Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value(),43 );4445 PromototionPallet::<T>::set_admin_address(46 RawOrigin::Root.into(),47 T::CrossAccountId::from_sub(pallet_admin.clone()),48 )?;4950 Ok(pallet_admin)51}5253benchmarks! {54 where_clause{55 where T: Config + pallet_unique::Config + pallet_evm_migration::Config ,56 T::BlockNumber: From<u32> + Into<u32>,57 BalanceOf<T>: Sum + From<u128>58 }5960 on_initialize {61 let b in 0..PENDING_LIMIT_PER_BLOCK;62 set_admin::<T>()?;6364 (0..b).try_for_each(|index| {65 let staker = account::<T::AccountId>("staker", index, SEED);66 <T as Config>::Currency::set_balance(&staker, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());67 PromototionPallet::<T>::stake(RawOrigin::Signed(staker.clone()).into(), Into::<BalanceOf<T>>::into(100u128) * T::Nominal::get())?;68 PromototionPallet::<T>::unstake_all(RawOrigin::Signed(staker.clone()).into())?;69 Result::<(), sp_runtime::DispatchError>::Ok(())70 })?;71 let block_number = <frame_system::Pallet<T>>::current_block_number() + T::PendingInterval::get();72 }: {PromototionPallet::<T>::on_initialize(block_number)}7374 set_admin_address {75 let pallet_admin = account::<T::AccountId>("admin", 0, SEED);76 let _ = <T as Config>::Currency::set_balance(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());77 } : _(RawOrigin::Root, T::CrossAccountId::from_sub(pallet_admin))7879 payout_stakers{80 let b in 1..100;8182 let pallet_admin = account::<T::AccountId>("admin", 1, SEED);83 let share = Perbill::from_rational(1u32, 20);84 PromototionPallet::<T>::set_admin_address(RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin.clone()))?;85 <T as Config>::Currency::set_balance(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());86 <T as Config>::Currency::set_balance(&<T as pallet::Config>::TreasuryAccountId::get(), Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());8788 let stakers: Vec<T::AccountId> = (0..b).map(|index| account("staker", index, SEED)).collect();89 stakers.iter().for_each(|staker| {90 <T as Config>::Currency::set_balance(&staker, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());91 });92 (1..11).try_for_each(|i| {93 <frame_system::Pallet<T>>::set_block_number(i.into());94 T::RelayBlockNumberProvider::set_block_number((2*i).into());95 assert_eq!(<frame_system::Pallet<T>>::block_number(), i.into());96 assert_eq!(T::RelayBlockNumberProvider::current_block_number(), (2*i).into());97 stakers.iter()98 .map(|staker| {99 PromototionPallet::<T>::stake(RawOrigin::Signed(staker.clone()).into(), Into::<BalanceOf<T>>::into(100u128) * T::Nominal::get())100 }).collect::<Result<Vec<_>, _>>()?;101102 Result::<(), sp_runtime::DispatchError>::Ok(())103 })?;104105 let stakes = Staked::<T>::iter_prefix((&stakers[0],)).into_iter().collect::<Vec<_>>();106 assert_eq!(stakes.len(), 10);107108 <frame_system::Pallet<T>>::set_block_number(15_000.into());109 T::RelayBlockNumberProvider::set_block_number(30_000.into());110 } : _(RawOrigin::Signed(pallet_admin.clone()), Some(b as u8))111112 stake {113 let caller = account::<T::AccountId>("caller", 0, SEED);114 let share = Perbill::from_rational(1u32, 10);115 let _ = <T as Config>::Currency::set_balance(&caller, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());116 } : _(RawOrigin::Signed(caller.clone()), share * <T as Config>::Currency::total_balance(&caller))117118 unstake_all {119 let caller = account::<T::AccountId>("caller", 0, SEED);120 let share = Perbill::from_rational(1u32, 20);121 let _ = <T as Config>::Currency::set_balance(&caller, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());122 (1..11).map(|i| {123 // used to change block number124 <frame_system::Pallet<T>>::set_block_number(i.into());125 T::RelayBlockNumberProvider::set_block_number((2*i).into());126 assert_eq!(<frame_system::Pallet<T>>::block_number(), i.into());127 assert_eq!(T::RelayBlockNumberProvider::current_block_number(), (2*i).into());128 PromototionPallet::<T>::stake(RawOrigin::Signed(caller.clone()).into(), share * <T as Config>::Currency::total_balance(&caller))129 }).collect::<Result<Vec<_>, _>>()?;130131 } : _(RawOrigin::Signed(caller.clone()))132133 unstake_partial {134 let caller = account::<T::AccountId>("caller", 0, SEED);135 let share = Perbill::from_rational(1u32, 20);136 let _ = <T as Config>::Currency::set_balance(&caller, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());137 (1..11).map(|i| {138 // used to change block number139 <frame_system::Pallet<T>>::set_block_number(i.into());140 T::RelayBlockNumberProvider::set_block_number((2*i).into());141 assert_eq!(<frame_system::Pallet<T>>::block_number(), i.into());142 assert_eq!(T::RelayBlockNumberProvider::current_block_number(), (2*i).into());143 PromototionPallet::<T>::stake(RawOrigin::Signed(caller.clone()).into(), Into::<BalanceOf<T>>::into(100u128) * T::Nominal::get())144 }).collect::<Result<Vec<_>, _>>()?;145146 } : _(RawOrigin::Signed(caller.clone()), Into::<BalanceOf<T>>::into(1000u128) * T::Nominal::get())147148 sponsor_collection {149 let pallet_admin = account::<T::AccountId>("admin", 0, SEED);150 PromototionPallet::<T>::set_admin_address(RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin.clone()))?;151 let _ = <T as Config>::Currency::set_balance(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());152 let caller: T::AccountId = account("caller", 0, SEED);153 let _ = <T as Config>::Currency::set_balance(&caller, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());154 let collection = create_nft_collection::<T>(caller.clone())?;155 } : _(RawOrigin::Signed(pallet_admin.clone()), collection)156157 stop_sponsoring_collection {158 let pallet_admin = account::<T::AccountId>("admin", 0, SEED);159 PromototionPallet::<T>::set_admin_address(RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin.clone()))?;160 let _ = <T as Config>::Currency::set_balance(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());161 let caller: T::AccountId = account("caller", 0, SEED);162 let _ = <T as Config>::Currency::set_balance(&caller, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());163 let collection = create_nft_collection::<T>(caller.clone())?;164 PromototionPallet::<T>::sponsor_collection(RawOrigin::Signed(pallet_admin.clone()).into(), collection)?;165 } : _(RawOrigin::Signed(pallet_admin.clone()), collection)166167 sponsor_contract {168 let pallet_admin = account::<T::AccountId>("admin", 0, SEED);169 PromototionPallet::<T>::set_admin_address(RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin.clone()))?;170171 let _ = <T as Config>::Currency::set_balance(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());172 let address = H160::from_low_u64_be(SEED as u64);173 let data: Vec<u8> = (0..20 as u8).collect();174 <EvmMigrationPallet<T>>::begin(RawOrigin::Root.into(), address)?;175 <EvmMigrationPallet<T>>::finish(RawOrigin::Root.into(), address, data)?;176 } : _(RawOrigin::Signed(pallet_admin.clone()), address)177178 stop_sponsoring_contract {179 let pallet_admin = account::<T::AccountId>("admin", 0, SEED);180 PromototionPallet::<T>::set_admin_address(RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin.clone()))?;181182 let _ = <T as Config>::Currency::set_balance(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());183 let address = H160::from_low_u64_be(SEED as u64);184 let data: Vec<u8> = (0..20 as u8).collect();185 <EvmMigrationPallet<T>>::begin(RawOrigin::Root.into(), address)?;186 <EvmMigrationPallet<T>>::finish(RawOrigin::Root.into(), address, data)?;187 PromototionPallet::<T>::sponsor_contract(RawOrigin::Signed(pallet_admin.clone()).into(), address)?;188 } : _(RawOrigin::Signed(pallet_admin.clone()), address)189}pallets/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.
pallets/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;
pallets/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)?}
pallets/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)?}