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.rsdiffbeforeafterboth--- a/pallets/app-promotion/src/benchmarking.rs
+++ b/pallets/app-promotion/src/benchmarking.rs
@@ -30,7 +30,7 @@
const SEED: u32 = 0;
-fn set_admin<T>() -> DispatchResult
+fn set_admin<T>() -> Result<T::AccountId, sp_runtime::DispatchError>
where
T: Config + pallet_unique::Config + pallet_evm_migration::Config,
T::BlockNumber: From<u32> + Into<u32>,
@@ -46,7 +46,9 @@
PromototionPallet::<T>::set_admin_address(
RawOrigin::Root.into(),
T::CrossAccountId::from_sub(pallet_admin.clone()),
- )
+ )?;
+
+ Ok(pallet_admin)
}
benchmarks! {
@@ -73,12 +75,12 @@
set_admin_address {
let pallet_admin = account::<T::AccountId>("admin", 0, SEED);
let _ = <T as Config>::Currency::make_free_balance_be(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
- } : {PromototionPallet::<T>::set_admin_address(RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin))?}
+ } : _(RawOrigin::Root, T::CrossAccountId::from_sub(pallet_admin))
payout_stakers{
let b in 1..101;
- let pallet_admin = account::<T::AccountId>("admin", 0, SEED);
+ 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::make_free_balance_be(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
@@ -92,22 +94,18 @@
(0..10).try_for_each(|_| {
stakers.iter()
.map(|staker| {
-
PromototionPallet::<T>::stake(RawOrigin::Signed(staker.clone()).into(), Into::<BalanceOf<T>>::into(100u128) * T::Nominal::get())
}).collect::<Result<Vec<_>, _>>()?;
<frame_system::Pallet<T>>::finalize();
Result::<(), sp_runtime::DispatchError>::Ok(())
})?;
-
- // let _ = <T as Config>::Currency::make_free_balance_be(&staker, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
- // let _ = PromototionPallet::<T>::stake(RawOrigin::Signed(staker.clone()).into(), share * <T as Config>::Currency::total_balance(&staker))?;
- } : {PromototionPallet::<T>::payout_stakers(RawOrigin::Signed(pallet_admin.clone()).into(), Some(b as u8))?}
+ } : _(RawOrigin::Signed(pallet_admin.clone()), Some(b as u8))
stake {
let caller = account::<T::AccountId>("caller", 0, SEED);
let share = Perbill::from_rational(1u32, 10);
let _ = <T as Config>::Currency::make_free_balance_be(&caller, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
- } : {PromototionPallet::<T>::stake(RawOrigin::Signed(caller.clone()).into(), share * <T as Config>::Currency::total_balance(&caller))?}
+ } : _(RawOrigin::Signed(caller.clone()), share * <T as Config>::Currency::total_balance(&caller))
unstake {
let caller = account::<T::AccountId>("caller", 0, SEED);
@@ -117,17 +115,8 @@
<frame_system::Pallet<T>>::finalize();
PromototionPallet::<T>::stake(RawOrigin::Signed(caller.clone()).into(), share * <T as Config>::Currency::total_balance(&caller))
}).collect::<Result<Vec<_>, _>>()?;
-
- } : {PromototionPallet::<T>::unstake(RawOrigin::Signed(caller.clone()).into())?}
- // recalculate_and_insert_stake{
- // let caller = account::<T::AccountId>("caller", 0, SEED);
- // let share = Perbill::from_rational(1u32, 10);
- // let _ = <T as Config>::Currency::make_free_balance_be(&caller, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
- // let _ = PromototionPallet::<T>::stake(RawOrigin::Signed(caller.clone()).into(), share * <T as Config>::Currency::total_balance(&caller))?;
- // let block = <T::RelayBlockNumberProvider as BlockNumberProvider>::current_block_number();
- // let mut acc = <BalanceOf<T>>::default();
- // } : {PromototionPallet::<T>::recalculate_and_insert_stake(&caller, block, share * <T as Config>::Currency::total_balance(&caller), &mut acc)}
+ } : _(RawOrigin::Signed(caller.clone()))
sponsor_collection {
let pallet_admin = account::<T::AccountId>("admin", 0, SEED);
@@ -136,7 +125,7 @@
let caller: T::AccountId = account("caller", 0, SEED);
let _ = <T as Config>::Currency::make_free_balance_be(&caller, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
let collection = create_nft_collection::<T>(caller.clone())?;
- } : {PromototionPallet::<T>::sponsor_collection(RawOrigin::Signed(pallet_admin.clone()).into(), collection)?}
+ } : _(RawOrigin::Signed(pallet_admin.clone()), collection)
stop_sponsoring_collection {
let pallet_admin = account::<T::AccountId>("admin", 0, SEED);
@@ -146,7 +135,7 @@
let _ = <T as Config>::Currency::make_free_balance_be(&caller, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
let collection = create_nft_collection::<T>(caller.clone())?;
PromototionPallet::<T>::sponsor_collection(RawOrigin::Signed(pallet_admin.clone()).into(), collection)?;
- } : {PromototionPallet::<T>::stop_sponsoring_collection(RawOrigin::Signed(pallet_admin.clone()).into(), collection)?}
+ } : _(RawOrigin::Signed(pallet_admin.clone()), collection)
sponsor_contract {
let pallet_admin = account::<T::AccountId>("admin", 0, SEED);
@@ -157,7 +146,7 @@
let data: Vec<u8> = (0..20 as u8).collect();
<EvmMigrationPallet<T>>::begin(RawOrigin::Root.into(), address)?;
<EvmMigrationPallet<T>>::finish(RawOrigin::Root.into(), address, data)?;
- } : {PromototionPallet::<T>::sponsor_conract(RawOrigin::Signed(pallet_admin.clone()).into(), address)?}
+ } : _(RawOrigin::Signed(pallet_admin.clone()), address)
stop_sponsoring_contract {
let pallet_admin = account::<T::AccountId>("admin", 0, SEED);
@@ -168,6 +157,6 @@
let data: Vec<u8> = (0..20 as u8).collect();
<EvmMigrationPallet<T>>::begin(RawOrigin::Root.into(), address)?;
<EvmMigrationPallet<T>>::finish(RawOrigin::Root.into(), address, data)?;
- PromototionPallet::<T>::sponsor_conract(RawOrigin::Signed(pallet_admin.clone()).into(), address)?;
- } : {PromototionPallet::<T>::stop_sponsoring_contract(RawOrigin::Signed(pallet_admin.clone()).into(), address)?}
+ PromototionPallet::<T>::sponsor_contract(RawOrigin::Signed(pallet_admin.clone()).into(), address)?;
+ } : _(RawOrigin::Signed(pallet_admin.clone()), address)
}
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.tsdiffbeforeafterboth1// 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/>.1617import {IKeyringPair} from '@polkadot/types/types';18import {19 normalizeAccountId,20 getModuleNames,21 Pallets,22} from './util/helpers';2324import chai from 'chai';25import chaiAsPromised from 'chai-as-promised';26import {usingPlaygrounds} from './util/playgrounds';2728import {encodeAddress} from '@polkadot/util-crypto';29import {stringToU8a} from '@polkadot/util';30import {ApiPromise} from '@polkadot/api';31import {SponsoringMode, contractHelpers, createEthAccountWithBalance, deployFlipper, itWeb3, transferBalanceToEth} from './eth/util/helpers';32chai.use(chaiAsPromised);33const expect = chai.expect;3435let alice: IKeyringPair;36let palletAdmin: IKeyringPair;37let nominal: bigint;38const palletAddress = calculatePalleteAddress('appstake');39let accounts: IKeyringPair[] = [];4041before(async function () {42 await usingPlaygrounds(async (helper, privateKeyWrapper) => {43 if (!getModuleNames(helper.api!).includes(Pallets.AppPromotion)) this.skip();44 alice = privateKeyWrapper('//Alice');45 palletAdmin = privateKeyWrapper('//Charlie'); // TODO use custom address46 await helper.signTransaction(alice, helper.api!.tx.sudo.sudo(helper.api!.tx.appPromotion.setAdminAddress({Substrate: palletAdmin.address})));47 nominal = helper.balance.getOneTokenNominal();48 await helper.balance.transferToSubstrate(alice, palletAdmin.address, 1000n * nominal);49 await helper.balance.transferToSubstrate(alice, palletAddress, 1000n * nominal);50 accounts = await helper.arrange.createCrowd(100, 1000n, alice); // create accounts-pool to speed up tests51 });52});5354describe('app-promotions.stake extrinsic', () => {55 it('should "lock" staking balance, add it to "staked" map, and increase "totalStaked" amount', async () => {56 await usingPlaygrounds(async (helper) => {57 const [staker, recepient] = [accounts.pop()!, accounts.pop()!];58 const totalStakedBefore = await helper.staking.getTotalStaked();5960 // Minimum stake amount is 100:61 await expect(helper.staking.stake(staker, 100n * nominal - 1n)).to.be.eventually.rejected;62 await helper.staking.stake(staker, 100n * nominal);6364 // Staker balance is: miscFrozen: 100, feeFrozen: 100, reserved: 0n...65 // ...so he can not transfer 90066 expect (await helper.balance.getSubstrateFull(staker.address)).to.contain({miscFrozen: 100n * nominal, feeFrozen: 100n * nominal, reserved: 0n});67 await expect(helper.balance.transferToSubstrate(staker, recepient.address, 900n * nominal)).to.be.rejected;68 69 expect(await helper.staking.getTotalStakingLocked({Substrate: staker.address})).to.be.equal(100n * nominal);70 expect(await helper.staking.getTotalStaked({Substrate: staker.address})).to.be.equal(100n * nominal);71 expect(await helper.balance.getSubstrate(staker.address) / nominal).to.be.equal(999n);72 // it is potentially flaky test. Promotion can credited some tokens. Maybe we need to use closeTo? 73 expect(await helper.staking.getTotalStaked()).to.be.equal(totalStakedBefore + 100n * nominal); // total tokens amount staked in app-promotion increased 7475 76 await helper.staking.stake(staker, 200n * nominal);77 expect(await helper.staking.getTotalStakingLocked({Substrate: staker.address})).to.be.equal(300n * nominal);78 expect(await helper.staking.getTotalStaked({Substrate: staker.address})).to.be.equal(300n * nominal);79 expect((await helper.staking.getTotalStakedPerBlock({Substrate: staker.address})).map((x) => x[1])).to.be.deep.equal([100n * nominal, 200n * nominal]);80 });81 });8283 it('should allow to create maximum 10 stakes for account', async () => {84 await usingPlaygrounds(async (helper) => {85 const [staker] = await helper.arrange.createAccounts([2000n], alice);86 console.log(staker.address);87 for (let i = 0; i < 10; i++) {88 await helper.staking.stake(staker, 100n * nominal);89 }9091 // can have 10 stakes92 expect(await helper.staking.getTotalStaked({Substrate: staker.address})).to.be.equal(1000n * nominal);93 expect(await helper.staking.getTotalStakedPerBlock({Substrate: staker.address})).to.have.length(10);9495 await expect(helper.staking.stake(staker, 100n * nominal)).to.be.rejected;9697 // After unstake can stake again98 await helper.staking.unstake(staker);99 await helper.staking.stake(staker, 100n * nominal);100 expect(await helper.staking.getTotalStaked({Substrate: staker.address})).to.equal(100n * nominal);101 });102 });103 104 it('should reject transaction if stake amount is more than total free balance minus frozen', async () => {105 await usingPlaygrounds(async helper => { 106 const staker = accounts.pop()!;107108 // Can't stake full balance because Alice needs to pay some fee109 await expect(helper.staking.stake(staker, 1000n * nominal)).to.be.eventually.rejected;110 await helper.staking.stake(staker, 500n * nominal);111112 // Can't stake 500 tkn because Alice has Less than 500 transferable;113 await expect(helper.staking.stake(staker, 500n * nominal)).to.be.eventually.rejected; 114 expect(await helper.staking.getTotalStaked({Substrate: staker.address})).to.be.equal(500n * nominal);115 });116 });117 118 it('for different accounts in one block is possible', async () => {119 await usingPlaygrounds(async helper => {120 const crowd = [accounts.pop()!, accounts.pop()!, accounts.pop()!, accounts.pop()!];121 122 const crowdStartsToStake = crowd.map(user => helper.staking.stake(user, 100n * nominal));123 await expect(Promise.all(crowdStartsToStake)).to.be.eventually.fulfilled;124125 const crowdStakes = await Promise.all(crowd.map(address => helper.staking.getTotalStaked({Substrate: address.address})));126 expect(crowdStakes).to.deep.equal([100n * nominal, 100n * nominal, 100n * nominal, 100n * nominal]);127 });128 });129});130131describe('unstake balance extrinsic', () => { 132 it('should change balance state from "frozen" to "reserved", add it to "pendingUnstake" map, and subtract it from totalStaked', async () => {133 await usingPlaygrounds(async helper => {134 const [staker, recepient] = [accounts.pop()!, accounts.pop()!];135 const totalStakedBefore = await helper.staking.getTotalStaked();136 await helper.staking.stake(staker, 900n * nominal);137 await helper.staking.unstake(staker);138139 // Right after unstake balance is reserved140 // Staker can not transfer 141 expect(await helper.balance.getSubstrateFull(staker.address)).to.deep.contain({reserved: 900n * nominal, miscFrozen: 0n, feeFrozen: 0n});142 await expect(helper.balance.transferToSubstrate(staker, recepient.address, 100n * nominal)).to.be.rejected;143 expect(await helper.staking.getPendingUnstake({Substrate: staker.address})).to.be.equal(900n * nominal);144 expect(await helper.staking.getTotalStaked({Substrate: staker.address})).to.be.equal(0n);145 expect(await helper.staking.getTotalStaked()).to.be.equal(totalStakedBefore);146 });147 });148149 it('should unlock balance after unlocking period ends and remove it from "pendingUnstake"', async () => {150 // TODO Flaky test151 await usingPlaygrounds(async (helper) => {152 const staker = accounts.pop()!;153 await helper.staking.stake(staker, 100n * nominal);154 await helper.staking.unstake(staker);155156 // Wait for unstaking period. Balance now free ~1000; reserved, frozen, miscFrozeb: 0n157 await waitForRelayBlock(helper.api!, 20);158 expect(await helper.balance.getSubstrateFull(staker.address)).to.deep.contain({reserved: 0n, miscFrozen: 0n, feeFrozen: 0n});159 expect(await helper.balance.getSubstrate(staker.address) / nominal).to.be.equal(999n);160161 // staker can transfer:162 await helper.balance.transferToSubstrate(staker, alice.address, 998n * nominal);163 expect(await helper.balance.getSubstrate(staker.address) / nominal).to.be.equal(1n);164 });165 });166167 it('should successfully unstake multiple stakes', async () => {168 await usingPlaygrounds(async helper => {169 const staker = accounts.pop()!;170 await helper.staking.stake(staker, 100n * nominal);171 await helper.staking.stake(staker, 200n * nominal);172 await helper.staking.stake(staker, 300n * nominal);173174 // staked: [100, 200, 300]; unstaked: 0175 let pendingUnstake = await helper.staking.getPendingUnstake({Substrate: staker.address});176 let unstakedPerBlock = (await helper.staking.getPendingUnstakePerBlock({Substrate: staker.address})).map(stake => stake[1]);177 let stakedPerBlock = (await helper.staking.getTotalStakedPerBlock({Substrate: staker.address})).map(stake => stake[1]);178 expect(pendingUnstake).to.be.deep.equal(0n);179 expect(unstakedPerBlock).to.be.deep.equal([]);180 expect(stakedPerBlock).to.be.deep.equal([100n * nominal, 200n * nominal, 300n * nominal]);181 182 // Can unstake multiple stakes183 await helper.staking.unstake(staker);184 pendingUnstake = await helper.staking.getPendingUnstake({Substrate: staker.address});185 unstakedPerBlock = (await helper.staking.getPendingUnstakePerBlock({Substrate: staker.address})).map(stake => stake[1]);186 stakedPerBlock = (await helper.staking.getTotalStakedPerBlock({Substrate: staker.address})).map(stake => stake[1]);187 expect(pendingUnstake).to.be.equal(600n * nominal);188 expect(stakedPerBlock).to.be.deep.equal([]);189 expect(unstakedPerBlock).to.be.deep.equal([600n * nominal]);190191 expect (await helper.balance.getSubstrateFull(staker.address)).to.deep.contain({reserved: 600n * nominal, feeFrozen: 0n, miscFrozen: 0n});192 await waitForRelayBlock(helper.api!, 20);193 expect (await helper.balance.getSubstrateFull(staker.address)).to.deep.contain({reserved: 0n, feeFrozen: 0n, miscFrozen: 0n});194 expect (await helper.balance.getSubstrate(staker.address) / nominal).to.be.equal(999n);195 });196 });197198 it('should not have any effects if no active stakes', async () => {199 await usingPlaygrounds(async (helper) => {200 const staker = accounts.pop()!;201 202 // unstake has no effect if no stakes at all203 await helper.staking.unstake(staker);204 expect(await helper.staking.getPendingUnstake({Substrate: staker.address})).to.be.equal(0n);205 expect(await helper.staking.getTotalStakingLocked({Substrate: staker.address})).to.be.equal(0n);206 expect(await helper.balance.getSubstrate(staker.address) / nominal).to.be.equal(999n); // TODO bigint closeTo helper207208 // TODO stake() unstake() waitUnstaked() unstake();209210 // can't unstake if there are only pendingUnstakes211 await helper.staking.stake(staker, 100n * nominal);212 await helper.staking.unstake(staker);213 await helper.staking.unstake(staker);214215 expect(await helper.staking.getPendingUnstake({Substrate: staker.address})).to.be.equal(100n * nominal);216 expect(await helper.staking.getTotalStakingLocked({Substrate: staker.address})).to.be.equal(100n * nominal);217 expect(await helper.staking.getTotalStaked({Substrate: staker.address})).to.be.equal(0n);218 });219 });220221 it('should keep different unlocking block for each unlocking stake', async () => {222 await usingPlaygrounds(async (helper) => {223 const staker = accounts.pop()!;224 await helper.staking.stake(staker, 100n * nominal);225 await helper.staking.unstake(staker);226 await helper.staking.stake(staker, 120n * nominal);227 await helper.staking.unstake(staker);228229 const unstakingPerBlock = await helper.staking.getPendingUnstakePerBlock({Substrate: staker.address});230 expect(unstakingPerBlock).has.length(2);231 expect(unstakingPerBlock[0][1]).to.equal(100n * nominal);232 expect(unstakingPerBlock[1][1]).to.equal(120n * nominal);233 });234 });235236 it('should be possible for different accounts in one block', async () => {237 await usingPlaygrounds(async (helper) => {238 const stakers = [accounts.pop()!, accounts.pop()!, accounts.pop()!];239240 await Promise.all(stakers.map(staker => helper.staking.stake(staker, 100n * nominal)));241 await Promise.all(stakers.map(staker => helper.staking.unstake(staker)));242243 await Promise.all(stakers.map(async (staker) => {244 expect(await helper.staking.getPendingUnstake({Substrate: staker.address})).to.be.equal(100n * nominal);245 expect(await helper.staking.getTotalStaked({Substrate: staker.address})).to.be.equal(0n);246 }));247 });248 });249250 // TODO for different accounts in one block is possible251});252253describe('Admin adress', () => {254 it('can be set by sudo only', async () => {255 await usingPlaygrounds(async (helper) => {256 const nonAdmin = accounts.pop()!;257 // nonAdmin can not set admin not from himself nor as a sudo258 await expect(helper.signTransaction(nonAdmin, helper.api!.tx.appPromotion.setAdminAddress({Substrate: nonAdmin.address}))).to.be.eventually.rejected;259 await expect(helper.signTransaction(nonAdmin, helper.api!.tx.sudo.sudo(helper.api!.tx.appPromotion.setAdminAddress({Substrate: nonAdmin.address})))).to.be.eventually.rejected;260261 // Alice can262 await expect(helper.signTransaction(alice, helper.api!.tx.sudo.sudo(helper.api!.tx.appPromotion.setAdminAddress({Substrate: palletAdmin.address})))).to.be.eventually.fulfilled;263 });264 });265 266 it('can be any valid CrossAccountId', async () => {267 // We are not going to set an eth address as a sponsor,268 // but we do want to check, it doesn't break anything;269 await usingPlaygrounds(async (helper) => {270 const account = accounts.pop()!;271 const ethAccount = helper.address.substrateToEth(account.address); 272 // Alice sets Ethereum address as a sudo. Then Substrate address back...273 await expect(helper.signTransaction(alice, helper.api!.tx.sudo.sudo(helper.api!.tx.appPromotion.setAdminAddress({Ethereum: ethAccount})))).to.be.eventually.fulfilled;274 await expect(helper.signTransaction(alice, helper.api!.tx.sudo.sudo(helper.api!.tx.appPromotion.setAdminAddress({Substrate: palletAdmin.address})))).to.be.eventually.fulfilled;275 276 // ...It doesn't break anything;277 const collection = await helper.nft.mintCollection(account, {name: 'New', description: 'New Collection', tokenPrefix: 'Promotion'});278 await expect(helper.signTransaction(account, helper.api!.tx.appPromotion.sponsorCollection(collection.collectionId))).to.be.eventually.rejected;279 });280 });281282 it('can be reassigned', async () => {283 await usingPlaygrounds(async (helper) => {284 const [oldAdmin, newAdmin, collectionOwner] = [accounts.pop()!, accounts.pop()!, accounts.pop()!];285 const collection = await helper.nft.mintCollection(collectionOwner, {name: 'New', description: 'New Collection', tokenPrefix: 'Promotion'});286 287 await expect(helper.signTransaction(alice, helper.api!.tx.sudo.sudo(helper.api!.tx.appPromotion.setAdminAddress(normalizeAccountId(oldAdmin))))).to.be.eventually.fulfilled;288 await expect(helper.signTransaction(alice, helper.api!.tx.sudo.sudo(helper.api!.tx.appPromotion.setAdminAddress(normalizeAccountId(newAdmin))))).to.be.eventually.fulfilled;289 await expect(helper.signTransaction(oldAdmin, helper.api!.tx.appPromotion.sponsorCollection(collection.collectionId))).to.be.eventually.rejected;290 291 await expect(helper.signTransaction(newAdmin, helper.api!.tx.appPromotion.sponsorCollection(collection.collectionId))).to.be.eventually.fulfilled;292 });293 });294});295296describe('App-promotion collection sponsoring', () => {297 before(async function () {298 await usingPlaygrounds(async (helper) => {299 const tx = helper.api!.tx.sudo.sudo(helper.api!.tx.appPromotion.setAdminAddress({Substrate: palletAdmin.address}));300 await helper.signTransaction(alice, tx);301 });302 });303304 it('should actually sponsor transactions', async () => {305 await usingPlaygrounds(async (helper) => {306 const [collectionOwner, tokenSender, receiver] = [accounts.pop()!, accounts.pop()!, accounts.pop()!];307 const collection = await helper.nft.mintCollection(collectionOwner, {name: 'Name', description: 'Description', tokenPrefix: 'Prefix', limits: {sponsorTransferTimeout: 0}});308 const token = await collection.mintToken(collectionOwner, {Substrate: tokenSender.address});309 await helper.signTransaction(palletAdmin, helper.api!.tx.appPromotion.sponsorCollection(collection.collectionId));310 const palletBalanceBefore = await helper.balance.getSubstrate(palletAddress);311312 await token.transfer(tokenSender, {Substrate: receiver.address});313 expect (await token.getOwner()).to.be.deep.equal({Substrate: receiver.address});314 const palletBalanceAfter = await helper.balance.getSubstrate(palletAddress);315316 // senders balance the same, transaction has sponsored317 expect (await helper.balance.getSubstrate(tokenSender.address)).to.be.equal(1000n * nominal);318 expect (palletBalanceBefore > palletBalanceAfter).to.be.true;319 });320 });321322 it('can not be set by non admin', async () => {323 await usingPlaygrounds(async (helper) => {324 const [collectionOwner, nonAdmin] = [accounts.pop()!, accounts.pop()!];325326 const collection = await helper.nft.mintCollection(collectionOwner, {name: 'New', description: 'New Collection', tokenPrefix: 'Promotion'});327 328 await expect(helper.signTransaction(nonAdmin, helper.api!.tx.appPromotion.sponsorCollection(collection.collectionId))).to.be.eventually.rejected;329 expect((await collection.getData())?.raw.sponsorship).to.equal('Disabled');330 });331 });332333 it('should set pallet address as confirmed admin', async () => {334 await usingPlaygrounds(async (helper) => {335 const [collectionOwner, oldSponsor] = [accounts.pop()!, accounts.pop()!];336 337 // Can set sponsoring for collection without sponsor338 const collectionWithoutSponsor = await helper.nft.mintCollection(collectionOwner, {name: 'No-sponsor', description: 'New Collection', tokenPrefix: 'Promotion'});339 await expect(helper.signTransaction(palletAdmin, helper.api!.tx.appPromotion.sponsorCollection(collectionWithoutSponsor.collectionId))).to.be.eventually.fulfilled;340 expect((await collectionWithoutSponsor.getData())?.raw.sponsorship).to.be.deep.equal({Confirmed: palletAddress});341342 // Can set sponsoring for collection with unconfirmed sponsor343 const collectionWithUnconfirmedSponsor = await helper.nft.mintCollection(collectionOwner, {name: 'Unconfirmed', description: 'New Collection', tokenPrefix: 'Promotion', pendingSponsor: oldSponsor.address});344 expect((await collectionWithUnconfirmedSponsor.getData())?.raw.sponsorship).to.be.deep.equal({Unconfirmed: oldSponsor.address});345 await expect(helper.signTransaction(palletAdmin, helper.api!.tx.appPromotion.sponsorCollection(collectionWithUnconfirmedSponsor.collectionId))).to.be.eventually.fulfilled;346 expect((await collectionWithUnconfirmedSponsor.getData())?.raw.sponsorship).to.be.deep.equal({Confirmed: palletAddress});347348 // Can set sponsoring for collection with confirmed sponsor349 const collectionWithConfirmedSponsor = await helper.nft.mintCollection(collectionOwner, {name: 'Confirmed', description: 'New Collection', tokenPrefix: 'Promotion', pendingSponsor: oldSponsor.address});350 await collectionWithConfirmedSponsor.confirmSponsorship(oldSponsor);351 await expect(helper.signTransaction(palletAdmin, helper.api!.tx.appPromotion.sponsorCollection(collectionWithConfirmedSponsor.collectionId))).to.be.eventually.fulfilled;352 expect((await collectionWithConfirmedSponsor.getData())?.raw.sponsorship).to.be.deep.equal({Confirmed: palletAddress});353 });354 });355356 it('can be overwritten by collection owner', async () => { 357 await usingPlaygrounds(async (helper) => {358 const [collectionOwner, newSponsor] = [accounts.pop()!, accounts.pop()!];359 const collection = await helper.nft.mintCollection(collectionOwner, {name: 'New', description: 'New Collection', tokenPrefix: 'Promotion'});360 const collectionId = collection.collectionId;361 362 await expect(helper.signTransaction(palletAdmin, helper.api!.tx.appPromotion.sponsorCollection(collectionId))).to.be.eventually.fulfilled;363 364 // Collection limits still can be changed by the owner365 expect(await collection.setLimits(collectionOwner, {sponsorTransferTimeout: 0})).to.be.true;366 expect((await collection.getData())?.raw.limits.sponsorTransferTimeout).to.be.equal(0);367 expect((await collection.getData())?.raw.sponsorship).to.be.deep.equal({Confirmed: palletAddress});368369 // Collection sponsor can be changed too370 expect((await collection.setSponsor(collectionOwner, newSponsor.address))).to.be.true;371 expect((await collection.getData())?.raw.sponsorship).to.be.deep.equal({Unconfirmed: newSponsor.address});372 });373 });374 375 it('should not overwrite collection limits set by the owner earlier', async () => {376 await usingPlaygrounds(async (helper) => {377 const limits = {ownerCanDestroy: true, ownerCanTransfer: true, sponsorTransferTimeout: 0};378 const collectionWithLimits = await helper.nft.mintCollection(alice, {name: 'New', description: 'New Collection', tokenPrefix: 'Promotion', limits});379380 await expect(helper.signTransaction(palletAdmin, helper.api!.tx.appPromotion.sponsorCollection(collectionWithLimits.collectionId))).to.be.eventually.fulfilled;381 expect((await collectionWithLimits.getData())?.raw.limits).to.be.deep.contain(limits);382 });383 });384 385 it('should reject transaction if collection doesn\'t exist', async () => {386 await usingPlaygrounds(async (helper) => {387 const collectionOwner = accounts.pop()!;388 389 // collection has never existed390 await expect(helper.signTransaction(palletAdmin, helper.api!.tx.appPromotion.sponsorCollection(999999999))).to.be.eventually.rejected;391 // collection has been burned392 const collection = await helper.nft.mintCollection(collectionOwner, {name: 'New', description: 'New Collection', tokenPrefix: 'Promotion'});393 await collection.burn(collectionOwner);394395 await expect(helper.signTransaction(palletAdmin, helper.api!.tx.appPromotion.sponsorCollection(collection.collectionId))).to.be.eventually.rejected;396 });397 });398});399400describe('app-promotion stopSponsoringCollection', () => {401 it('can not be called by non-admin', async () => { 402 await usingPlaygrounds(async (helper) => {403 const [collectionOwner, nonAdmin] = [accounts.pop()!, accounts.pop()!];404 const collection = await helper.nft.mintCollection(collectionOwner, {name: 'New', description: 'New Collection', tokenPrefix: 'Promotion'});405 406 await expect(helper.signTransaction(palletAdmin, helper.api!.tx.appPromotion.sponsorCollection(collection.collectionId))).to.be.eventually.fulfilled;407 408 await expect(helper.signTransaction(nonAdmin, helper.api!.tx.appPromotion.stopSponsoringCollection(collection.collectionId))).to.be.eventually.rejected;409 expect((await collection.getData())?.raw.sponsorship).to.be.deep.equal({Confirmed: palletAddress});410 });411 });412413 it('should set sponsoring as disabled', async () => {414 await usingPlaygrounds(async (helper) => {415 const [collectionOwner, recepient] = [accounts.pop()!, accounts.pop()!];416 const collection = await helper.nft.mintCollection(collectionOwner, {name: 'New', description: 'New Collection', tokenPrefix: 'Promotion', limits: {sponsorTransferTimeout: 0}});417 const token = await collection.mintToken(collectionOwner, {Substrate: collectionOwner.address});418 419 await helper.signTransaction(palletAdmin, helper.api!.tx.appPromotion.sponsorCollection(collection.collectionId));420 await helper.signTransaction(palletAdmin, helper.api!.tx.appPromotion.stopSponsoringCollection(collection.collectionId));421 422 expect((await collection.getData())?.raw.sponsorship).to.be.equal('Disabled');423424 // Transactions are not sponsored anymore:425 const ownerBalanceBefore = await helper.balance.getSubstrate(collectionOwner.address);426 await token.transfer(collectionOwner, {Substrate: recepient.address});427 const ownerBalanceAfter = await helper.balance.getSubstrate(collectionOwner.address);428 expect(ownerBalanceAfter < ownerBalanceBefore).to.be.equal(true);429 });430 });431432 it('should not affect collection which is not sponsored by pallete', async () => {433 await usingPlaygrounds(async (helper) => {434 const collectionOwner = accounts.pop()!;435 const collection = await helper.nft.mintCollection(collectionOwner, {name: 'New', description: 'New Collection', tokenPrefix: 'Promotion', pendingSponsor: collectionOwner.address});436 await collection.confirmSponsorship(collectionOwner);437 438 await expect(helper.signTransaction(palletAdmin, helper.api!.tx.appPromotion.stopSponsoringCollection(collection.collectionId))).to.be.eventually.rejected;439 440 expect((await collection.getData())?.raw.sponsorship).to.be.deep.equal({Confirmed: collectionOwner.address});441 });442 });443444 it('should reject transaction if collection does not exist', async () => { 445 await usingPlaygrounds(async (helper) => {446 const collectionOwner = accounts.pop()!;447 const collection = await helper.nft.mintCollection(collectionOwner, {name: 'New', description: 'New Collection', tokenPrefix: 'Promotion'});448 449 await collection.burn(collectionOwner);450 await expect(helper.signTransaction(palletAdmin, helper.api!.tx.appPromotion.stopSponsoringCollection(collection.collectionId))).to.be.eventually.rejected;451 await expect(helper.signTransaction(palletAdmin, helper.api!.tx.appPromotion.stopSponsoringCollection(999999999))).to.be.eventually.rejected;452 });453 });454});455456describe('app-promotion contract sponsoring', () => {457 itWeb3('should set palletes address as a sponsor', async ({api, web3, privateKeyWrapper}) => {458 await usingPlaygrounds(async (helper) => {459 const contractOwner = (await createEthAccountWithBalance(api, web3, privateKeyWrapper)).toLowerCase();460 const flipper = await deployFlipper(web3, contractOwner);461 const contractMethods = contractHelpers(web3, contractOwner);462463 await helper.signTransaction(palletAdmin, api.tx.appPromotion.sponsorConract(flipper.options.address));464 465 expect(await contractMethods.methods.hasSponsor(flipper.options.address).call()).to.be.true; 466 expect((await api.query.evmContractHelpers.owner(flipper.options.address)).toJSON()).to.be.equal(contractOwner); 467 expect((await api.query.evmContractHelpers.sponsoring(flipper.options.address)).toJSON()).to.deep.equal({468 confirmed: {469 substrate: palletAddress,470 },471 });472 });473 });474475 itWeb3('should overwrite sponsoring mode and existed sponsor', async ({api, web3, privateKeyWrapper}) => {476 await usingPlaygrounds(async (helper) => {477 const contractOwner = (await createEthAccountWithBalance(api, web3, privateKeyWrapper)).toLowerCase();478 const flipper = await deployFlipper(web3, contractOwner);479 const contractMethods = contractHelpers(web3, contractOwner);480481 await expect(contractMethods.methods.selfSponsoredEnable(flipper.options.address).send()).to.be.not.rejected;482483 // Contract is self sponsored484 expect((await api.query.evmContractHelpers.sponsoring(flipper.options.address)).toJSON()).to.be.deep.equal({485 confirmed: {486 ethereum: flipper.options.address.toLowerCase(),487 },488 });489490 // set promotion sponsoring491 await helper.signTransaction(palletAdmin, api.tx.appPromotion.sponsorConract(flipper.options.address));492493 // new sponsor is pallet address494 expect(await contractMethods.methods.hasSponsor(flipper.options.address).call()).to.be.true; 495 expect((await api.query.evmContractHelpers.owner(flipper.options.address)).toJSON()).to.be.equal(contractOwner); 496 expect((await api.query.evmContractHelpers.sponsoring(flipper.options.address)).toJSON()).to.deep.equal({497 confirmed: {498 substrate: palletAddress,499 },500 });501 });502 });503504 itWeb3('can be overwritten by contract owner', async ({api, web3, privateKeyWrapper}) => {505 await usingPlaygrounds(async (helper) => { 506 const contractOwner = (await createEthAccountWithBalance(api, web3, privateKeyWrapper)).toLowerCase();507 const flipper = await deployFlipper(web3, contractOwner);508 const contractMethods = contractHelpers(web3, contractOwner);509510 // contract sponsored by pallet511 await helper.signTransaction(palletAdmin, api.tx.appPromotion.sponsorConract(flipper.options.address));512513 // owner sets self sponsoring514 await expect(contractMethods.methods.selfSponsoredEnable(flipper.options.address).send()).to.be.not.rejected;515516 expect(await contractMethods.methods.hasSponsor(flipper.options.address).call()).to.be.true; 517 expect((await api.query.evmContractHelpers.owner(flipper.options.address)).toJSON()).to.be.equal(contractOwner); 518 expect((await api.query.evmContractHelpers.sponsoring(flipper.options.address)).toJSON()).to.deep.equal({519 confirmed: {520 ethereum: flipper.options.address.toLowerCase(),521 },522 });523 });524 });525526 itWeb3('can not be set by non admin', async ({api, web3, privateKeyWrapper}) => {527 await usingPlaygrounds(async (helper) => { 528 const nonAdmin = accounts.pop()!;529 const contractOwner = (await createEthAccountWithBalance(api, web3, privateKeyWrapper)).toLowerCase();530 const flipper = await deployFlipper(web3, contractOwner);531 const contractMethods = contractHelpers(web3, contractOwner);532533 await expect(contractMethods.methods.selfSponsoredEnable(flipper.options.address).send()).to.be.not.rejected;534535 // nonAdmin calls sponsorConract536 await expect(helper.signTransaction(nonAdmin, api.tx.appPromotion.sponsorConract(flipper.options.address))).to.be.rejected;537538 // contract still self-sponsored 539 expect((await api.query.evmContractHelpers.sponsoring(flipper.options.address)).toJSON()).to.deep.equal({540 confirmed: {541 ethereum: flipper.options.address.toLowerCase(),542 },543 });544 });545546 itWeb3('should be rejected for non-contract address', async ({api, web3, privateKeyWrapper}) => {547 await usingPlaygrounds(async (helper) => {548549 });550 });551 });552553 itWeb3('should actually sponsor transactions', async ({api, web3, privateKeyWrapper}) => {554 await usingPlaygrounds(async (helper) => { 555 const caller = await createEthAccountWithBalance(api, web3, privateKeyWrapper);556 const contractOwner = (await createEthAccountWithBalance(api, web3, privateKeyWrapper)).toLowerCase();557 const flipper = await deployFlipper(web3, contractOwner);558 const contractHelper = contractHelpers(web3, contractOwner);559 await contractHelper.methods.setSponsoringRateLimit(flipper.options.address, 0).send({from: contractOwner});560 await contractHelper.methods.setSponsoringMode(flipper.options.address, SponsoringMode.Generous).send({from: contractOwner});561 await transferBalanceToEth(api, alice, flipper.options.address, 1000n);562563 await helper.signTransaction(palletAdmin, api.tx.appPromotion.sponsorConract(flipper.options.address));564 await flipper.methods.flip().send({from: caller});565 expect(await flipper.methods.getValue().call()).to.be.true;566567 const callerBalance = await helper.balance.getEthereum(caller);568 const contractBalanceAfter = await helper.balance.getEthereum(flipper.options.address);569570 expect(callerBalance).to.be.equal(1000n * nominal);571 expect(1000n * nominal > contractBalanceAfter).to.be.true;572 });573 });574});575576describe('app-promotion stopSponsoringContract', () => { 577 itWeb3('should remove pallet address from contract sponsors', async ({api, web3, privateKeyWrapper}) => {578 await usingPlaygrounds(async (helper) => { 579 const caller = await createEthAccountWithBalance(api, web3, privateKeyWrapper);580 const contractOwner = (await createEthAccountWithBalance(api, web3, privateKeyWrapper)).toLowerCase();581 const flipper = await deployFlipper(web3, contractOwner);582 await transferBalanceToEth(api, alice, flipper.options.address);583 const contractHelper = contractHelpers(web3, contractOwner);584 await contractHelper.methods.setSponsoringMode(flipper.options.address, SponsoringMode.Generous).send({from: contractOwner});585 await helper.signTransaction(palletAdmin, api.tx.appPromotion.sponsorConract(flipper.options.address));586 await helper.signTransaction(palletAdmin, api.tx.appPromotion.stopSponsoringContract(flipper.options.address));587588 expect(await contractHelper.methods.hasSponsor(flipper.options.address).call()).to.be.false; 589 expect((await api.query.evmContractHelpers.owner(flipper.options.address)).toJSON()).to.be.equal(contractOwner); 590 expect((await api.query.evmContractHelpers.sponsoring(flipper.options.address)).toJSON()).to.deep.equal({591 disabled: null,592 });593594 await flipper.methods.flip().send({from: caller});595 expect(await flipper.methods.getValue().call()).to.be.true;596597 const callerBalance = await helper.balance.getEthereum(caller);598 const contractBalanceAfter = await helper.balance.getEthereum(flipper.options.address);599600 // caller payed for call601 expect(1000n * nominal > callerBalance).to.be.true;602 expect(contractBalanceAfter).to.be.equal(1000n * nominal);603 });604 });605606 itWeb3('can not be called by non-admin', async ({api, web3, privateKeyWrapper}) => {607 await usingPlaygrounds(async (helper) => { 608 const nonAdmin = accounts.pop()!;609 const contractOwner = (await createEthAccountWithBalance(api, web3, privateKeyWrapper)).toLowerCase();610 const flipper = await deployFlipper(web3, contractOwner);611612 await helper.signTransaction(palletAdmin, api.tx.appPromotion.sponsorConract(flipper.options.address));613 await expect(helper.signTransaction(nonAdmin, api.tx.appPromotion.stopSponsoringContract(flipper.options.address))).to.be.rejected;614 });615 });616617 itWeb3('should not affect a contract which is not sponsored by pallete', async ({api, web3, privateKeyWrapper}) => {618 await usingPlaygrounds(async (helper) => { 619 const nonAdmin = accounts.pop()!;620 const contractOwner = (await createEthAccountWithBalance(api, web3, privateKeyWrapper)).toLowerCase();621 const flipper = await deployFlipper(web3, contractOwner);622 const contractHelper = contractHelpers(web3, contractOwner);623 await expect(contractHelper.methods.selfSponsoredEnable(flipper.options.address).send()).to.be.not.rejected;624625 await expect(helper.signTransaction(nonAdmin, api.tx.appPromotion.stopSponsoringContract(flipper.options.address))).to.be.rejected;626 });627 });628});629630describe('app-promotion rewards', () => {631 it('can not be called by non admin', async () => {632 await usingPlaygrounds(async (helper) => {633 const nonAdmin = accounts.pop()!;634 await expect(helper.signTransaction(nonAdmin, helper.api!.tx.appPromotion.payoutStakers(100))).to.be.rejected;635 });636 });637638 it('should credit 0.05% for staking period', async () => { 639 // TODO flaky test640 await usingPlaygrounds(async helper => {641 const staker = accounts.pop()!;642 643 await helper.staking.stake(staker, 100n * nominal);644 await helper.staking.stake(staker, 200n * nominal);645 await waitForRelayBlock(helper.api!, 30);646 await helper.signTransaction(palletAdmin, helper.api!.tx.appPromotion.payoutStakers(100));647648 const totalStakedPerBlock = (await helper.staking.getTotalStakedPerBlock({Substrate: staker.address})).map(s => s[1]);649 expect(totalStakedPerBlock).to.be.deep.equal([calculateIncome(100n * nominal, 10n), calculateIncome(200n * nominal, 10n)]);650 });651 });652653 it('shoud be paid for more than one period if payments was missed', async () => {654 // TODO flaky test655 await usingPlaygrounds(async (helper) => {656 const staker = accounts.pop()!;657658 await helper.staking.stake(staker, 100n * nominal);659 await helper.staking.stake(staker, 200n * nominal);660661 await waitForRelayBlock(helper.api!, 55);662 await helper.signTransaction(palletAdmin, helper.api!.tx.appPromotion.payoutStakers(100));663 const stakedPerBlock = await helper.staking.getTotalStakedPerBlock({Substrate: staker.address});664 expect(stakedPerBlock[0][1]).to.be.equal(calculateIncome(100n * nominal, 10n, 2));665 expect(stakedPerBlock[1][1]).to.be.equal(calculateIncome(200n * nominal, 10n, 2));666667 const stakerFullBalance = await helper.balance.getSubstrateFull(staker.address);668 const frozenBalanceShouldBe = calculateIncome(300n * nominal, 10n, 2);669670 expect(stakerFullBalance).to.contain({reserved: 0n, feeFrozen: frozenBalanceShouldBe, miscFrozen: frozenBalanceShouldBe});671 });672 });673 674 it('should not be credited for unstaked (reserved) balance', async () => {675 await usingPlaygrounds(async helper => {676 // staker unstakes before rewards has been initialized677 const staker = accounts.pop()!;678 await helper.staking.stake(staker, 100n * nominal);679 await waitForRelayBlock(helper.api!, 40);680 await helper.staking.unstake(staker);681 682 // so he did not receive any rewards683 const totalBalanceBefore = await helper.balance.getSubstrate(staker.address);684 await helper.signTransaction(palletAdmin, helper.api!.tx.appPromotion.payoutStakers(100));685 const totalBalanceAfter = await helper.balance.getSubstrate(staker.address);686687 expect(totalBalanceBefore).to.be.equal(totalBalanceAfter);688 });689 });690 691 it('should bring compound interest', async () => {692 // TODO flaky test693 await usingPlaygrounds(async helper => {694 const staker = accounts.pop()!;695 696 await helper.staking.stake(staker, 100n * nominal);697 await helper.staking.stake(staker, 200n * nominal);698 await helper.staking.stake(staker, 300n * nominal);699 700 await waitForRelayBlock(helper.api!, 34);701 await helper.signTransaction(palletAdmin, helper.api!.tx.appPromotion.payoutStakers(100));702 let totalStakedPerBlock = (await helper.staking.getTotalStakedPerBlock({Substrate: staker.address})).map(s => s[1]);703 expect(totalStakedPerBlock).to.deep.equal([calculateIncome(100n * nominal, 10n), calculateIncome(200n * nominal, 10n), calculateIncome(300n * nominal, 10n)]);704 705 await waitForRelayBlock(helper.api!, 20);706 await helper.signTransaction(palletAdmin, helper.api!.tx.appPromotion.payoutStakers(100));707 totalStakedPerBlock = (await helper.staking.getTotalStakedPerBlock({Substrate: staker.address})).map(s => s[1]);708 expect(totalStakedPerBlock).to.deep.equal([calculateIncome(100n * nominal, 10n, 2), calculateIncome(200n * nominal, 10n, 2), calculateIncome(300n * nominal, 10n, 2)]); 709 });710 });711712 it.skip('can handle 40.000 rewards', async () => {713 await usingPlaygrounds(async (helper) => {714 const [donor] = await helper.arrange.createAccounts([7_000_000n], alice);715 const crowdStakes = async () => {716 // each account in the crowd stakes 2 times717 const crowd = await helper.arrange.createCrowd(500, 300n, donor);718 await Promise.all(crowd.map(account => helper.staking.stake(account, 100n * nominal)));719 await Promise.all(crowd.map(account => helper.staking.stake(account, 100n * nominal)));720 // 721 };722723 for (let i = 0; i < 40; i++) {724 await crowdStakes();725 }726727 // TODO pay rewards for some period728 });729 });730});731732async function waitForRelayBlock(api: ApiPromise, blocks = 1): Promise<void> {733 const current_block = (await api.query.parachainSystem.lastRelayChainBlockNumber()).toNumber();734 return new Promise<void>(async (resolve, reject) => {735 const unsubscribe = await api.query.parachainSystem.validationData(async (data) => {736 // console.log(`${current_block} || ${data.value.relayParentNumber.toNumber()}`);737 if (data.value.relayParentNumber.toNumber() - current_block >= blocks) {738 unsubscribe();739 resolve();740 }741 });742 });743}744745function calculatePalleteAddress(palletId: any) {746 const address = stringToU8a(('modl' + palletId).padEnd(32, '\0'));747 return encodeAddress(address);748}749750function calculateIncome(base: bigint, calcPeriod: bigint, iter = 0): bigint {751 const DAY = 7200n;752 const ACCURACY = 1_000_000_000n;753 const income = base + base * (ACCURACY * (calcPeriod * 5n) / (10_000n * DAY)) / ACCURACY ;754 755 if (iter > 1) {756 return calculateIncome(income, calcPeriod, iter - 1);757 } else return income;758}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);