difftreelog
fix appPromotion RPC diasbling, refactor benchmarks, fix `WithdrawReasons`, rename `get_sponsor` to `sponsor` in hadlers traits + change their behavior in impl's blocks
in: master
11 files changed
node/rpc/src/lib.rsdiffbeforeafterboth--- a/node/rpc/src/lib.rs
+++ b/node/rpc/src/lib.rs
@@ -234,7 +234,7 @@
io.merge(Unique::new(client.clone()).into_rpc())?;
- #[cfg(any(feature = "opal-runtime"))]
+ #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]
io.merge(AppPromotion::new(client.clone()).into_rpc())?;
#[cfg(not(feature = "unique-runtime"))]
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;23use sp_std::vec;2425use frame_benchmarking::{benchmarks, account};26use frame_support::traits::OnInitialize;27use frame_system::{Origin, RawOrigin};28use pallet_unique::benchmarking::create_nft_collection;29use pallet_evm_migration::Pallet as EvmMigrationPallet;3031const SEED: u32 = 0;3233fn set_admin<T>() -> DispatchResult34where35 T: Config + pallet_unique::Config + pallet_evm_migration::Config,36 T::BlockNumber: From<u32> + Into<u32>,37 <<T as Config>::Currency as Currency<T::AccountId>>::Balance: Sum + From<u128>,38{39 let pallet_admin = account::<T::AccountId>("admin", 0, SEED);4041 <T as Config>::Currency::make_free_balance_be(42 &pallet_admin,43 Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value(),44 );4546 PromototionPallet::<T>::set_admin_address(47 RawOrigin::Root.into(),48 T::CrossAccountId::from_sub(pallet_admin.clone()),49 )50}5152benchmarks! {53 where_clause{54 where T: Config + pallet_unique::Config + pallet_evm_migration::Config ,55 T::BlockNumber: From<u32> + Into<u32>,56 <<T as Config>::Currency as Currency<T::AccountId>>::Balance: Sum + From<u128>57 }5859 on_initialize {60 let b in 0..PENDING_LIMIT_PER_BLOCK;61 set_admin::<T>()?;6263 (0..b).try_for_each(|index| {64 let staker = account::<T::AccountId>("staker", index, SEED);65 <T as Config>::Currency::make_free_balance_be(&staker, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());66 PromototionPallet::<T>::stake(RawOrigin::Signed(staker.clone()).into(), Into::<BalanceOf<T>>::into(100u128) * T::Nominal::get())?;67 PromototionPallet::<T>::unstake(RawOrigin::Signed(staker.clone()).into()).map_err(|e| e.error)?;68 Result::<(), sp_runtime::DispatchError>::Ok(())69 })?;70 let block_number = <frame_system::Pallet<T>>::current_block_number() + T::PendingInterval::get();71 }: {PromototionPallet::<T>::on_initialize(block_number)}7273 set_admin_address {74 let pallet_admin = account::<T::AccountId>("admin", 0, SEED);75 let _ = <T as Config>::Currency::make_free_balance_be(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());76 } : {PromototionPallet::<T>::set_admin_address(RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin))?}7778 payout_stakers{79 let b in 1..101;8081 let pallet_admin = account::<T::AccountId>("admin", 0, SEED);82 let share = Perbill::from_rational(1u32, 20);83 PromototionPallet::<T>::set_admin_address(RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin.clone()))?;84 <T as Config>::Currency::make_free_balance_be(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());8586 let staker: T::AccountId = account("caller", 0, SEED);87 <T as Config>::Currency::make_free_balance_be(&staker, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());88 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::make_free_balance_be(&staker, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());91 });92 (0..10).try_for_each(|_| {93 stakers.iter()94 .map(|staker| {9596 PromototionPallet::<T>::stake(RawOrigin::Signed(staker.clone()).into(), Into::<BalanceOf<T>>::into(100u128) * T::Nominal::get())97 }).collect::<Result<Vec<_>, _>>()?;98 <frame_system::Pallet<T>>::finalize();99 Result::<(), sp_runtime::DispatchError>::Ok(())100 })?;101102 // let _ = <T as Config>::Currency::make_free_balance_be(&staker, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());103 // let _ = PromototionPallet::<T>::stake(RawOrigin::Signed(staker.clone()).into(), share * <T as Config>::Currency::total_balance(&staker))?;104 } : {PromototionPallet::<T>::payout_stakers(RawOrigin::Signed(pallet_admin.clone()).into(), Some(b as u8))?}105106 stake {107 let caller = account::<T::AccountId>("caller", 0, SEED);108 let share = Perbill::from_rational(1u32, 10);109 let _ = <T as Config>::Currency::make_free_balance_be(&caller, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());110 } : {PromototionPallet::<T>::stake(RawOrigin::Signed(caller.clone()).into(), share * <T as Config>::Currency::total_balance(&caller))?}111112 unstake {113 let caller = account::<T::AccountId>("caller", 0, SEED);114 let share = Perbill::from_rational(1u32, 20);115 let _ = <T as Config>::Currency::make_free_balance_be(&caller, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());116 (0..10).map(|_| {117 <frame_system::Pallet<T>>::finalize();118 PromototionPallet::<T>::stake(RawOrigin::Signed(caller.clone()).into(), share * <T as Config>::Currency::total_balance(&caller))119 }).collect::<Result<Vec<_>, _>>()?;120121 } : {PromototionPallet::<T>::unstake(RawOrigin::Signed(caller.clone()).into())?}122123 // recalculate_and_insert_stake{124 // let caller = account::<T::AccountId>("caller", 0, SEED);125 // let share = Perbill::from_rational(1u32, 10);126 // let _ = <T as Config>::Currency::make_free_balance_be(&caller, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());127 // let _ = PromototionPallet::<T>::stake(RawOrigin::Signed(caller.clone()).into(), share * <T as Config>::Currency::total_balance(&caller))?;128 // let block = <T::RelayBlockNumberProvider as BlockNumberProvider>::current_block_number();129 // let mut acc = <BalanceOf<T>>::default();130 // } : {PromototionPallet::<T>::recalculate_and_insert_stake(&caller, block, share * <T as Config>::Currency::total_balance(&caller), &mut acc)}131132 sponsor_collection {133 let pallet_admin = account::<T::AccountId>("admin", 0, SEED);134 PromototionPallet::<T>::set_admin_address(RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin.clone()))?;135 let _ = <T as Config>::Currency::make_free_balance_be(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());136 let caller: T::AccountId = account("caller", 0, SEED);137 let _ = <T as Config>::Currency::make_free_balance_be(&caller, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());138 let collection = create_nft_collection::<T>(caller.clone())?;139 } : {PromototionPallet::<T>::sponsor_collection(RawOrigin::Signed(pallet_admin.clone()).into(), collection)?}140141 stop_sponsoring_collection {142 let pallet_admin = account::<T::AccountId>("admin", 0, SEED);143 PromototionPallet::<T>::set_admin_address(RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin.clone()))?;144 let _ = <T as Config>::Currency::make_free_balance_be(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());145 let caller: T::AccountId = account("caller", 0, SEED);146 let _ = <T as Config>::Currency::make_free_balance_be(&caller, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());147 let collection = create_nft_collection::<T>(caller.clone())?;148 PromototionPallet::<T>::sponsor_collection(RawOrigin::Signed(pallet_admin.clone()).into(), collection)?;149 } : {PromototionPallet::<T>::stop_sponsoring_collection(RawOrigin::Signed(pallet_admin.clone()).into(), collection)?}150151 sponsor_contract {152 let pallet_admin = account::<T::AccountId>("admin", 0, SEED);153 PromototionPallet::<T>::set_admin_address(RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin.clone()))?;154155 let _ = <T as Config>::Currency::make_free_balance_be(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());156 let address = H160::from_low_u64_be(SEED as u64);157 let data: Vec<u8> = (0..20 as u8).collect();158 <EvmMigrationPallet<T>>::begin(RawOrigin::Root.into(), address)?;159 <EvmMigrationPallet<T>>::finish(RawOrigin::Root.into(), address, data)?;160 } : {PromototionPallet::<T>::sponsor_conract(RawOrigin::Signed(pallet_admin.clone()).into(), address)?}161162 stop_sponsoring_contract {163 let pallet_admin = account::<T::AccountId>("admin", 0, SEED);164 PromototionPallet::<T>::set_admin_address(RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin.clone()))?;165166 let _ = <T as Config>::Currency::make_free_balance_be(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());167 let address = H160::from_low_u64_be(SEED as u64);168 let data: Vec<u8> = (0..20 as u8).collect();169 <EvmMigrationPallet<T>>::begin(RawOrigin::Root.into(), address)?;170 <EvmMigrationPallet<T>>::finish(RawOrigin::Root.into(), address, data)?;171 PromototionPallet::<T>::sponsor_conract(RawOrigin::Signed(pallet_admin.clone()).into(), address)?;172 } : {PromototionPallet::<T>::stop_sponsoring_contract(RawOrigin::Signed(pallet_admin.clone()).into(), address)?}173}1// 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;23use sp_std::vec;2425use frame_benchmarking::{benchmarks, account};26use frame_support::traits::OnInitialize;27use frame_system::{Origin, RawOrigin};28use pallet_unique::benchmarking::create_nft_collection;29use pallet_evm_migration::Pallet as EvmMigrationPallet;3031const SEED: u32 = 0;3233fn set_admin<T>() -> Result<T::AccountId, sp_runtime::DispatchError>34where35 T: Config + pallet_unique::Config + pallet_evm_migration::Config,36 T::BlockNumber: From<u32> + Into<u32>,37 <<T as Config>::Currency as Currency<T::AccountId>>::Balance: Sum + From<u128>,38{39 let pallet_admin = account::<T::AccountId>("admin", 0, SEED);4041 <T as Config>::Currency::make_free_balance_be(42 &pallet_admin,43 Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value(),44 );4546 PromototionPallet::<T>::set_admin_address(47 RawOrigin::Root.into(),48 T::CrossAccountId::from_sub(pallet_admin.clone()),49 )?;5051 Ok(pallet_admin)52}5354benchmarks! {55 where_clause{56 where T: Config + pallet_unique::Config + pallet_evm_migration::Config ,57 T::BlockNumber: From<u32> + Into<u32>,58 <<T as Config>::Currency as Currency<T::AccountId>>::Balance: Sum + From<u128>59 }6061 on_initialize {62 let b in 0..PENDING_LIMIT_PER_BLOCK;63 set_admin::<T>()?;6465 (0..b).try_for_each(|index| {66 let staker = account::<T::AccountId>("staker", index, SEED);67 <T as Config>::Currency::make_free_balance_be(&staker, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());68 PromototionPallet::<T>::stake(RawOrigin::Signed(staker.clone()).into(), Into::<BalanceOf<T>>::into(100u128) * T::Nominal::get())?;69 PromototionPallet::<T>::unstake(RawOrigin::Signed(staker.clone()).into()).map_err(|e| e.error)?;70 Result::<(), sp_runtime::DispatchError>::Ok(())71 })?;72 let block_number = <frame_system::Pallet<T>>::current_block_number() + T::PendingInterval::get();73 }: {PromototionPallet::<T>::on_initialize(block_number)}7475 set_admin_address {76 let pallet_admin = account::<T::AccountId>("admin", 0, SEED);77 let _ = <T as Config>::Currency::make_free_balance_be(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());78 } : _(RawOrigin::Root, T::CrossAccountId::from_sub(pallet_admin))7980 payout_stakers{81 let b in 1..101;8283 let pallet_admin = account::<T::AccountId>("admin", 1, SEED);84 let share = Perbill::from_rational(1u32, 20);85 PromototionPallet::<T>::set_admin_address(RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin.clone()))?;86 <T as Config>::Currency::make_free_balance_be(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());8788 let staker: T::AccountId = account("caller", 0, SEED);89 <T as Config>::Currency::make_free_balance_be(&staker, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());90 let stakers: Vec<T::AccountId> = (0..b).map(|index| account("staker", index, SEED)).collect();91 stakers.iter().for_each(|staker| {92 <T as Config>::Currency::make_free_balance_be(&staker, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());93 });94 (0..10).try_for_each(|_| {95 stakers.iter()96 .map(|staker| {97 PromototionPallet::<T>::stake(RawOrigin::Signed(staker.clone()).into(), Into::<BalanceOf<T>>::into(100u128) * T::Nominal::get())98 }).collect::<Result<Vec<_>, _>>()?;99 <frame_system::Pallet<T>>::finalize();100 Result::<(), sp_runtime::DispatchError>::Ok(())101 })?;102 } : _(RawOrigin::Signed(pallet_admin.clone()), Some(b as u8))103104 stake {105 let caller = account::<T::AccountId>("caller", 0, SEED);106 let share = Perbill::from_rational(1u32, 10);107 let _ = <T as Config>::Currency::make_free_balance_be(&caller, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());108 } : _(RawOrigin::Signed(caller.clone()), share * <T as Config>::Currency::total_balance(&caller))109110 unstake {111 let caller = account::<T::AccountId>("caller", 0, SEED);112 let share = Perbill::from_rational(1u32, 20);113 let _ = <T as Config>::Currency::make_free_balance_be(&caller, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());114 (0..10).map(|_| {115 <frame_system::Pallet<T>>::finalize();116 PromototionPallet::<T>::stake(RawOrigin::Signed(caller.clone()).into(), share * <T as Config>::Currency::total_balance(&caller))117 }).collect::<Result<Vec<_>, _>>()?;118119 } : _(RawOrigin::Signed(caller.clone()))120121 sponsor_collection {122 let pallet_admin = account::<T::AccountId>("admin", 0, SEED);123 PromototionPallet::<T>::set_admin_address(RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin.clone()))?;124 let _ = <T as Config>::Currency::make_free_balance_be(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());125 let caller: T::AccountId = account("caller", 0, SEED);126 let _ = <T as Config>::Currency::make_free_balance_be(&caller, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());127 let collection = create_nft_collection::<T>(caller.clone())?;128 } : _(RawOrigin::Signed(pallet_admin.clone()), collection)129130 stop_sponsoring_collection {131 let pallet_admin = account::<T::AccountId>("admin", 0, SEED);132 PromototionPallet::<T>::set_admin_address(RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin.clone()))?;133 let _ = <T as Config>::Currency::make_free_balance_be(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());134 let caller: T::AccountId = account("caller", 0, SEED);135 let _ = <T as Config>::Currency::make_free_balance_be(&caller, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());136 let collection = create_nft_collection::<T>(caller.clone())?;137 PromototionPallet::<T>::sponsor_collection(RawOrigin::Signed(pallet_admin.clone()).into(), collection)?;138 } : _(RawOrigin::Signed(pallet_admin.clone()), collection)139140 sponsor_contract {141 let pallet_admin = account::<T::AccountId>("admin", 0, SEED);142 PromototionPallet::<T>::set_admin_address(RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin.clone()))?;143144 let _ = <T as Config>::Currency::make_free_balance_be(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());145 let address = H160::from_low_u64_be(SEED as u64);146 let data: Vec<u8> = (0..20 as u8).collect();147 <EvmMigrationPallet<T>>::begin(RawOrigin::Root.into(), address)?;148 <EvmMigrationPallet<T>>::finish(RawOrigin::Root.into(), address, data)?;149 } : _(RawOrigin::Signed(pallet_admin.clone()), address)150151 stop_sponsoring_contract {152 let pallet_admin = account::<T::AccountId>("admin", 0, SEED);153 PromototionPallet::<T>::set_admin_address(RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin.clone()))?;154155 let _ = <T as Config>::Currency::make_free_balance_be(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());156 let address = H160::from_low_u64_be(SEED as u64);157 let data: Vec<u8> = (0..20 as u8).collect();158 <EvmMigrationPallet<T>>::begin(RawOrigin::Root.into(), address)?;159 <EvmMigrationPallet<T>>::finish(RawOrigin::Root.into(), address, data)?;160 PromototionPallet::<T>::sponsor_contract(RawOrigin::Signed(pallet_admin.clone()).into(), address)?;161 } : _(RawOrigin::Signed(pallet_admin.clone()), address)162}pallets/app-promotion/src/lib.rsdiffbeforeafterboth--- a/pallets/app-promotion/src/lib.rs
+++ b/pallets/app-promotion/src/lib.rs
@@ -226,12 +226,6 @@
where
<T as frame_system::Config>::BlockNumber: From<u32>,
{
- // let mut consumed_weight = 0;
- // let mut add_weight = |reads, writes, weight| {
- // consumed_weight += T::DbWeight::get().reads_writes(reads, writes);
- // consumed_weight += weight;
- // };
-
let block_pending = PendingUnstake::<T>::take(current_block_number);
let counter = block_pending.len() as u32;
// add_weight(0, 1, 0);
@@ -243,7 +237,6 @@
}
T::WeightInfo::on_initialize(counter)
- // consumed_weight
}
}
@@ -286,7 +279,7 @@
<<T as Config>::Currency as Currency<T::AccountId>>::ensure_can_withdraw(
&staker_id,
amount,
- WithdrawReasons::RESERVE,
+ WithdrawReasons::all(),
balance - amount,
)?;
@@ -398,8 +391,7 @@
);
ensure!(
- T::CollectionHandler::get_sponsor(collection_id)?
- .ok_or(<Error<T>>::InvalidArgument)?
+ T::CollectionHandler::sponsor(collection_id)?.ok_or(<Error<T>>::InvalidArgument)?
== Self::account_id(),
<Error<T>>::NoPermission
);
@@ -407,7 +399,7 @@
}
#[pallet::weight(T::WeightInfo::sponsor_contract())]
- pub fn sponsor_conract(admin: OriginFor<T>, contract_id: H160) -> DispatchResult {
+ pub fn sponsor_contract(admin: OriginFor<T>, contract_id: H160) -> DispatchResult {
let admin_id = ensure_signed(admin)?;
ensure!(
@@ -431,7 +423,7 @@
);
ensure!(
- T::ContractHandler::get_sponsor(contract_id)?.ok_or(<Error<T>>::InvalidArgument)?
+ T::ContractHandler::sponsor(contract_id)?.ok_or(<Error<T>>::InvalidArgument)?
== T::CrossAccountId::from_sub(Self::account_id()),
<Error<T>>::NoPermission
);
@@ -673,7 +665,7 @@
LOCK_IDENTIFIER,
staker,
amount,
- WithdrawReasons::RESERVE,
+ WithdrawReasons::all(),
)
}
}
pallets/app-promotion/src/types.rsdiffbeforeafterboth--- a/pallets/app-promotion/src/types.rs
+++ b/pallets/app-promotion/src/types.rs
@@ -37,9 +37,8 @@
fn remove_collection_sponsor(collection_id: Self::CollectionId) -> DispatchResult;
- fn get_sponsor(
- collection_id: Self::CollectionId,
- ) -> Result<Option<Self::AccountId>, DispatchError>;
+ fn sponsor(collection_id: Self::CollectionId)
+ -> Result<Option<Self::AccountId>, DispatchError>;
}
impl<T: pallet_unique::Config> CollectionHandler for pallet_unique::Pallet<T> {
@@ -58,12 +57,12 @@
Self::force_remove_collection_sponsor(collection_id)
}
- fn get_sponsor(
+ fn sponsor(
collection_id: Self::CollectionId,
) -> Result<Option<Self::AccountId>, DispatchError> {
Ok(<CollectionHandle<T>>::try_get(collection_id)?
.sponsorship
- .pending_sponsor()
+ .sponsor()
.map(|acc| acc.to_owned()))
}
}
@@ -79,7 +78,7 @@
fn remove_contract_sponsor(contract_address: Self::ContractId) -> DispatchResult;
- fn get_sponsor(
+ fn sponsor(
contract_address: Self::ContractId,
) -> Result<Option<Self::AccountId>, DispatchError>;
}
@@ -100,7 +99,7 @@
Self::force_remove_sponsor(contract_address)
}
- fn get_sponsor(
+ fn sponsor(
contract_address: Self::ContractId,
) -> Result<Option<Self::AccountId>, DispatchError> {
Ok(Self::get_sponsor(contract_address))
pallets/app-promotion/src/weights.rsdiffbeforeafterboth--- a/pallets/app-promotion/src/weights.rs
+++ b/pallets/app-promotion/src/weights.rs
@@ -3,7 +3,7 @@
//! Autogenerated weights for pallet_app_promotion
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-09-06, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-09-07, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
// Executed Command:
@@ -51,16 +51,16 @@
// Storage: AppPromotion PendingUnstake (r:1 w:0)
// Storage: System Account (r:1 w:1)
fn on_initialize(b: u32, ) -> Weight {
- (2_461_000 as Weight)
- // Standard Error: 87_000
- .saturating_add((6_006_000 as Weight).saturating_mul(b as Weight))
+ (2_651_000 as Weight)
+ // Standard Error: 103_000
+ .saturating_add((6_024_000 as Weight).saturating_mul(b as Weight))
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(b as Weight)))
.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(b as Weight)))
}
// Storage: AppPromotion Admin (r:0 w:1)
fn set_admin_address() -> Weight {
- (5_467_000 as Weight)
+ (7_117_000 as Weight)
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: AppPromotion Admin (r:1 w:0)
@@ -68,21 +68,21 @@
// Storage: AppPromotion NextCalculatedRecord (r:1 w:1)
// Storage: AppPromotion Staked (r:2 w:0)
fn payout_stakers(b: u32, ) -> Weight {
- (4_946_000 as Weight)
- // Standard Error: 5_000
- .saturating_add((4_599_000 as Weight).saturating_mul(b as Weight))
+ (9_958_000 as Weight)
+ // Standard Error: 8_000
+ .saturating_add((4_406_000 as Weight).saturating_mul(b as Weight))
.saturating_add(T::DbWeight::get().reads(4 as Weight))
.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(b as Weight)))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
+ // Storage: AppPromotion StakesPerAccount (r:1 w:1)
// Storage: System Account (r:1 w:1)
- // Storage: AppPromotion StakesPerAccount (r:1 w:1)
// Storage: Balances Locks (r:1 w:1)
// Storage: ParachainSystem ValidationData (r:1 w:0)
// Storage: AppPromotion Staked (r:1 w:1)
// Storage: AppPromotion TotalStaked (r:1 w:1)
fn stake() -> Weight {
- (17_766_000 as Weight)
+ (20_574_000 as Weight)
.saturating_add(T::DbWeight::get().reads(6 as Weight))
.saturating_add(T::DbWeight::get().writes(5 as Weight))
}
@@ -93,35 +93,35 @@
// Storage: AppPromotion TotalStaked (r:1 w:1)
// Storage: AppPromotion StakesPerAccount (r:0 w:1)
fn unstake() -> Weight {
- (27_250_000 as Weight)
+ (31_703_000 as Weight)
.saturating_add(T::DbWeight::get().reads(6 as Weight))
.saturating_add(T::DbWeight::get().writes(6 as Weight))
}
// Storage: AppPromotion Admin (r:1 w:0)
// Storage: Common CollectionById (r:1 w:1)
fn sponsor_collection() -> Weight {
- (11_014_000 as Weight)
+ (12_932_000 as Weight)
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: AppPromotion Admin (r:1 w:0)
// Storage: Common CollectionById (r:1 w:1)
fn stop_sponsoring_collection() -> Weight {
- (10_494_000 as Weight)
+ (12_453_000 as Weight)
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: AppPromotion Admin (r:1 w:0)
// Storage: EvmContractHelpers Sponsoring (r:0 w:1)
fn sponsor_contract() -> Weight {
- (9_754_000 as Weight)
+ (11_952_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: AppPromotion Admin (r:1 w:0)
// Storage: EvmContractHelpers Sponsoring (r:1 w:1)
fn stop_sponsoring_contract() -> Weight {
- (10_063_000 as Weight)
+ (12_538_000 as Weight)
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
@@ -132,16 +132,16 @@
// Storage: AppPromotion PendingUnstake (r:1 w:0)
// Storage: System Account (r:1 w:1)
fn on_initialize(b: u32, ) -> Weight {
- (2_461_000 as Weight)
- // Standard Error: 87_000
- .saturating_add((6_006_000 as Weight).saturating_mul(b as Weight))
+ (2_651_000 as Weight)
+ // Standard Error: 103_000
+ .saturating_add((6_024_000 as Weight).saturating_mul(b as Weight))
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(b as Weight)))
.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(b as Weight)))
}
// Storage: AppPromotion Admin (r:0 w:1)
fn set_admin_address() -> Weight {
- (5_467_000 as Weight)
+ (7_117_000 as Weight)
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
// Storage: AppPromotion Admin (r:1 w:0)
@@ -149,21 +149,21 @@
// Storage: AppPromotion NextCalculatedRecord (r:1 w:1)
// Storage: AppPromotion Staked (r:2 w:0)
fn payout_stakers(b: u32, ) -> Weight {
- (4_946_000 as Weight)
- // Standard Error: 5_000
- .saturating_add((4_599_000 as Weight).saturating_mul(b as Weight))
+ (9_958_000 as Weight)
+ // Standard Error: 8_000
+ .saturating_add((4_406_000 as Weight).saturating_mul(b as Weight))
.saturating_add(RocksDbWeight::get().reads(4 as Weight))
.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(b as Weight)))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
+ // Storage: AppPromotion StakesPerAccount (r:1 w:1)
// Storage: System Account (r:1 w:1)
- // Storage: AppPromotion StakesPerAccount (r:1 w:1)
// Storage: Balances Locks (r:1 w:1)
// Storage: ParachainSystem ValidationData (r:1 w:0)
// Storage: AppPromotion Staked (r:1 w:1)
// Storage: AppPromotion TotalStaked (r:1 w:1)
fn stake() -> Weight {
- (17_766_000 as Weight)
+ (20_574_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(6 as Weight))
.saturating_add(RocksDbWeight::get().writes(5 as Weight))
}
@@ -174,35 +174,35 @@
// Storage: AppPromotion TotalStaked (r:1 w:1)
// Storage: AppPromotion StakesPerAccount (r:0 w:1)
fn unstake() -> Weight {
- (27_250_000 as Weight)
+ (31_703_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(6 as Weight))
.saturating_add(RocksDbWeight::get().writes(6 as Weight))
}
// Storage: AppPromotion Admin (r:1 w:0)
// Storage: Common CollectionById (r:1 w:1)
fn sponsor_collection() -> Weight {
- (11_014_000 as Weight)
+ (12_932_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
// Storage: AppPromotion Admin (r:1 w:0)
// Storage: Common CollectionById (r:1 w:1)
fn stop_sponsoring_collection() -> Weight {
- (10_494_000 as Weight)
+ (12_453_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
// Storage: AppPromotion Admin (r:1 w:0)
// Storage: EvmContractHelpers Sponsoring (r:0 w:1)
fn sponsor_contract() -> Weight {
- (9_754_000 as Weight)
+ (11_952_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
// Storage: AppPromotion Admin (r:1 w:0)
// Storage: EvmContractHelpers Sponsoring (r:1 w:1)
fn stop_sponsoring_contract() -> Weight {
- (10_063_000 as Weight)
+ (12_538_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
tests/src/app-promotion.test.tsdiffbeforeafterboth--- a/tests/src/app-promotion.test.ts
+++ b/tests/src/app-promotion.test.ts
@@ -460,7 +460,7 @@
const flipper = await deployFlipper(web3, contractOwner);
const contractMethods = contractHelpers(web3, contractOwner);
- await helper.signTransaction(palletAdmin, api.tx.appPromotion.sponsorConract(flipper.options.address));
+ await helper.signTransaction(palletAdmin, api.tx.appPromotion.sponsorContract(flipper.options.address));
expect(await contractMethods.methods.hasSponsor(flipper.options.address).call()).to.be.true;
expect((await api.query.evmContractHelpers.owner(flipper.options.address)).toJSON()).to.be.equal(contractOwner);
@@ -488,7 +488,7 @@
});
// set promotion sponsoring
- await helper.signTransaction(palletAdmin, api.tx.appPromotion.sponsorConract(flipper.options.address));
+ await helper.signTransaction(palletAdmin, api.tx.appPromotion.sponsorContract(flipper.options.address));
// new sponsor is pallet address
expect(await contractMethods.methods.hasSponsor(flipper.options.address).call()).to.be.true;
@@ -508,7 +508,7 @@
const contractMethods = contractHelpers(web3, contractOwner);
// contract sponsored by pallet
- await helper.signTransaction(palletAdmin, api.tx.appPromotion.sponsorConract(flipper.options.address));
+ await helper.signTransaction(palletAdmin, api.tx.appPromotion.sponsorContract(flipper.options.address));
// owner sets self sponsoring
await expect(contractMethods.methods.selfSponsoredEnable(flipper.options.address).send()).to.be.not.rejected;
@@ -532,8 +532,8 @@
await expect(contractMethods.methods.selfSponsoredEnable(flipper.options.address).send()).to.be.not.rejected;
- // nonAdmin calls sponsorConract
- await expect(helper.signTransaction(nonAdmin, api.tx.appPromotion.sponsorConract(flipper.options.address))).to.be.rejected;
+ // nonAdmin calls sponsorContract
+ await expect(helper.signTransaction(nonAdmin, api.tx.appPromotion.sponsorContract(flipper.options.address))).to.be.rejected;
// contract still self-sponsored
expect((await api.query.evmContractHelpers.sponsoring(flipper.options.address)).toJSON()).to.deep.equal({
@@ -560,7 +560,7 @@
await contractHelper.methods.setSponsoringMode(flipper.options.address, SponsoringMode.Generous).send({from: contractOwner});
await transferBalanceToEth(api, alice, flipper.options.address, 1000n);
- await helper.signTransaction(palletAdmin, api.tx.appPromotion.sponsorConract(flipper.options.address));
+ await helper.signTransaction(palletAdmin, api.tx.appPromotion.sponsorContract(flipper.options.address));
await flipper.methods.flip().send({from: caller});
expect(await flipper.methods.getValue().call()).to.be.true;
@@ -582,7 +582,7 @@
await transferBalanceToEth(api, alice, flipper.options.address);
const contractHelper = contractHelpers(web3, contractOwner);
await contractHelper.methods.setSponsoringMode(flipper.options.address, SponsoringMode.Generous).send({from: contractOwner});
- await helper.signTransaction(palletAdmin, api.tx.appPromotion.sponsorConract(flipper.options.address));
+ await helper.signTransaction(palletAdmin, api.tx.appPromotion.sponsorContract(flipper.options.address));
await helper.signTransaction(palletAdmin, api.tx.appPromotion.stopSponsoringContract(flipper.options.address));
expect(await contractHelper.methods.hasSponsor(flipper.options.address).call()).to.be.false;
@@ -609,7 +609,7 @@
const contractOwner = (await createEthAccountWithBalance(api, web3, privateKeyWrapper)).toLowerCase();
const flipper = await deployFlipper(web3, contractOwner);
- await helper.signTransaction(palletAdmin, api.tx.appPromotion.sponsorConract(flipper.options.address));
+ await helper.signTransaction(palletAdmin, api.tx.appPromotion.sponsorContract(flipper.options.address));
await expect(helper.signTransaction(nonAdmin, api.tx.appPromotion.stopSponsoringContract(flipper.options.address))).to.be.rejected;
});
});
tests/src/interfaces/augment-api-tx.tsdiffbeforeafterboth--- a/tests/src/interfaces/augment-api-tx.ts
+++ b/tests/src/interfaces/augment-api-tx.ts
@@ -21,7 +21,7 @@
payoutStakers: AugmentedSubmittable<(stakersNumber: Option<u8> | null | Uint8Array | u8 | AnyNumber) => SubmittableExtrinsic<ApiType>, [Option<u8>]>;
setAdminAddress: AugmentedSubmittable<(admin: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [PalletEvmAccountBasicCrossAccountIdRepr]>;
sponsorCollection: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>, [u32]>;
- sponsorConract: AugmentedSubmittable<(contractId: H160 | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [H160]>;
+ sponsorContract: AugmentedSubmittable<(contractId: H160 | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [H160]>;
stake: AugmentedSubmittable<(amount: u128 | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>, [u128]>;
stopSponsoringCollection: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>, [u32]>;
stopSponsoringContract: AugmentedSubmittable<(contractId: H160 | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [H160]>;
tests/src/interfaces/default/types.tsdiffbeforeafterboth--- a/tests/src/interfaces/default/types.ts
+++ b/tests/src/interfaces/default/types.ts
@@ -825,8 +825,8 @@
readonly asStopSponsoringCollection: {
readonly collectionId: u32;
} & Struct;
- readonly isSponsorConract: boolean;
- readonly asSponsorConract: {
+ readonly isSponsorContract: boolean;
+ readonly asSponsorContract: {
readonly contractId: H160;
} & Struct;
readonly isStopSponsoringContract: boolean;
@@ -837,7 +837,7 @@
readonly asPayoutStakers: {
readonly stakersNumber: Option<u8>;
} & Struct;
- readonly type: 'SetAdminAddress' | 'Stake' | 'Unstake' | 'SponsorCollection' | 'StopSponsoringCollection' | 'SponsorConract' | 'StopSponsoringContract' | 'PayoutStakers';
+ readonly type: 'SetAdminAddress' | 'Stake' | 'Unstake' | 'SponsorCollection' | 'StopSponsoringCollection' | 'SponsorContract' | 'StopSponsoringContract' | 'PayoutStakers';
}
/** @name PalletAppPromotionError */
tests/src/interfaces/lookup.tsdiffbeforeafterboth--- a/tests/src/interfaces/lookup.ts
+++ b/tests/src/interfaces/lookup.ts
@@ -2483,7 +2483,7 @@
stop_sponsoring_collection: {
collectionId: 'u32',
},
- sponsor_conract: {
+ sponsor_contract: {
contractId: 'H160',
},
stop_sponsoring_contract: {
tests/src/interfaces/types-lookup.tsdiffbeforeafterboth--- a/tests/src/interfaces/types-lookup.ts
+++ b/tests/src/interfaces/types-lookup.ts
@@ -2695,8 +2695,8 @@
readonly asStopSponsoringCollection: {
readonly collectionId: u32;
} & Struct;
- readonly isSponsorConract: boolean;
- readonly asSponsorConract: {
+ readonly isSponsorContract: boolean;
+ readonly asSponsorContract: {
readonly contractId: H160;
} & Struct;
readonly isStopSponsoringContract: boolean;
@@ -2707,7 +2707,7 @@
readonly asPayoutStakers: {
readonly stakersNumber: Option<u8>;
} & Struct;
- readonly type: 'SetAdminAddress' | 'Stake' | 'Unstake' | 'SponsorCollection' | 'StopSponsoringCollection' | 'SponsorConract' | 'StopSponsoringContract' | 'PayoutStakers';
+ readonly type: 'SetAdminAddress' | 'Stake' | 'Unstake' | 'SponsorCollection' | 'StopSponsoringCollection' | 'SponsorContract' | 'StopSponsoringContract' | 'PayoutStakers';
}
/** @name PalletEvmCall (307) */
tests/src/pallet-presence.test.tsdiffbeforeafterboth--- a/tests/src/pallet-presence.test.ts
+++ b/tests/src/pallet-presence.test.ts
@@ -68,7 +68,7 @@
const refungible = 'refungible';
const scheduler = 'scheduler';
const rmrkPallets = ['rmrkcore', 'rmrkequip'];
- const appPromotion = 'promotion';
+ const appPromotion = 'apppromotion';
if (chain.eq('OPAL by UNIQUE')) {
requiredPallets.push(refungible, scheduler, appPromotion, ...rmrkPallets);