difftreelog
fix untstake
in: master
4 files changed
client/rpc/src/lib.rsdiffbeforeafterboth--- a/client/rpc/src/lib.rs
+++ b/client/rpc/src/lib.rs
@@ -418,47 +418,27 @@
}
}
-pub struct Unique<C, P> {
- client: Arc<C>,
- _marker: std::marker::PhantomData<P>,
-}
-
-impl<C, P> Unique<C, P> {
- pub fn new(client: Arc<C>) -> Self {
- Self {
- client,
- _marker: Default::default(),
+macro_rules! define_struct_for_server_api {
+ ($name:ident) => {
+ pub struct $name<C, P> {
+ client: Arc<C>,
+ _marker: std::marker::PhantomData<P>,
}
- }
-}
-
-pub struct AppPromotion<C, P> {
- client: Arc<C>,
- _marker: std::marker::PhantomData<P>,
-}
-
-impl<C, P> AppPromotion<C, P> {
- pub fn new(client: Arc<C>) -> Self {
- Self {
- client,
- _marker: Default::default(),
+
+ impl<C, P> $name<C, P> {
+ pub fn new(client: Arc<C>) -> Self {
+ Self {
+ client,
+ _marker: Default::default(),
+ }
+ }
}
- }
-}
-
-pub struct Rmrk<C, P> {
- client: Arc<C>,
- _marker: std::marker::PhantomData<P>,
+ };
}
-impl<C, P> Rmrk<C, P> {
- pub fn new(client: Arc<C>) -> Self {
- Self {
- client,
- _marker: Default::default(),
- }
- }
-}
+define_struct_for_server_api!(Unique);
+define_struct_for_server_api!(AppPromotion);
+define_struct_for_server_api!(Rmrk);
macro_rules! pass_method {
(
@@ -615,14 +595,14 @@
|v| v
.into_iter()
.map(|(b, a)| (b, a.to_string()))
- .collect::<Vec<_>>(), unique_api);
- pass_method!(total_staking_locked(staker: CrossAccountId) -> String => |v| v.to_string(), unique_api);
- pass_method!(pending_unstake(staker: Option<CrossAccountId>) -> String => |v| v.to_string(), unique_api);
+ .collect::<Vec<_>>(), app_promotion_api);
+ pass_method!(total_staking_locked(staker: CrossAccountId) -> String => |v| v.to_string(), app_promotion_api);
+ pass_method!(pending_unstake(staker: Option<CrossAccountId>) -> String => |v| v.to_string(), app_promotion_api);
pass_method!(pending_unstake_per_block(staker: CrossAccountId) -> Vec<(BlockNumber, String)> =>
|v| v
.into_iter()
.map(|(b, a)| (b, a.to_string()))
- .collect::<Vec<_>>(), unique_api);
+ .collect::<Vec<_>>(), app_promotion_api);
}
#[allow(deprecated)]
node/rpc/src/lib.rsdiffbeforeafterboth--- a/node/rpc/src/lib.rs
+++ b/node/rpc/src/lib.rs
@@ -38,7 +38,6 @@
use sp_block_builder::BlockBuilder;
use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};
use sc_service::TransactionPool;
-use uc_rpc::AppPromotion;
use std::{collections::BTreeMap, sync::Arc};
use up_common::types::opaque::{Hash, AccountId, RuntimeInstance, Index, Block, BlockNumber, Balance};
@@ -237,7 +236,7 @@
io.merge(Unique::new(client.clone()).into_rpc())?;
- // #[cfg(not(feature = "unique-runtime"))]
+ #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]
io.merge(AppPromotion::new(client.clone()).into_rpc())?;
#[cfg(not(feature = "unique-runtime"))]
tests/src/app-promotion.test.tsdiffbeforeafterboth35let alice: IKeyringPair;35let alice: IKeyringPair;36let palletAdmin: IKeyringPair;36let palletAdmin: IKeyringPair;37let nominal: bigint;37let nominal: bigint;38let promotionStartBlock: number | null = null;39const palletAddress = calculatePalleteAddress('appstake');38const palletAddress = calculatePalleteAddress('appstake');40let accounts: IKeyringPair[] = [];39let accounts: IKeyringPair[] = [];414051 if (!promotionStartBlock) {50 if (!promotionStartBlock) {52 promotionStartBlock = (await helper.api!.query.parachainSystem.lastRelayChainBlockNumber()).toNumber();51 promotionStartBlock = (await helper.api!.query.parachainSystem.lastRelayChainBlockNumber()).toNumber();53 }52 }53 await helper.signTransaction(alice, helper.api!.tx.sudo.sudo(helper.api!.tx.promotion.startAppPromotion(promotionStartBlock!)));54 accounts = await helper.arrange.createCrowd(100, 1000n, alice); // create accounts-pool to speed up tests54 accounts = await helper.arrange.createCrowd(100, 1000n, alice); // create accounts-pool to speed up tests55 });55 });56});56});89 });89 });90 });90 });919192 it('should allow to stake with nonce', async () => {92 it('should allow to create maximum 10 stakes for account', async () => {93 await usingPlaygrounds(async (helper) => {93 await usingPlaygrounds(async (helper) => {94 const staker = accounts.pop()!;94 const [staker] = await helper.arrange.createAccounts([2000n], alice);95 const transactions = [];95 console.log(staker.address);96 for (let nonce = 0; nonce < 9; nonce++) {96 for (let i = 0; i < 10; i++) {97 transactions.push(helper.signTransaction(staker, helper.api?.tx.promotion.stake(100n * nominal), 'Staker stakes with nonce', {nonce}));97 await helper.staking.stake(staker, 100n * nominal);98 }98 }99100 // can have 10 stakes101 expect(await helper.staking.getTotalStaked({Substrate: staker.address})).to.be.equal(1000n * nominal);102 expect(await helper.staking.getTotalStakedPerBlock({Substrate: staker.address})).to.have.length(10);103104 await expect(helper.staking.stake(staker, 100n * nominal)).to.be.rejected;105106 // After unstake can stake again99 await Promise.allSettled(transactions);107 await helper.staking.unstake(staker);100108 await helper.staking.stake(staker, 100n * nominal);101 expect(await helper.staking.getTotalStaked({Substrate: staker.address})).to.be.equal(900n * nominal);109 expect(await helper.staking.getTotalStaked({Substrate: staker.address})).to.equal(100n * nominal);102 });110 });103 });111 });104 112 128 });136 });129 });137 });130131 it('should allow to create maximum 10 stakes for account', async () => {132133 });134});138});135139136describe('unstake balance extrinsic', () => { 140describe('unstake balance extrinsic', () => { 151 });155 });152 });156 });153157154 it('should unlock balance after unlocking period ends and subtract it from "pendingUnstake"', async () => {158 it('should unlock balance after unlocking period ends and remove it from "pendingUnstake"', async () => {159 // TODO Flaky test155 await usingPlaygrounds(async (helper) => {160 await usingPlaygrounds(async (helper) => {156 const staker = accounts.pop()!;161 const staker = accounts.pop()!;157 await helper.staking.stake(staker, 100n * nominal);162 await helper.staking.stake(staker, 100n * nominal);158 await helper.staking.unstake(staker);163 await helper.staking.unstake(staker);159164160 // Wait for unstaking period. Balance now free ~1000; reserved, frozen, miscFrozeb: 0n165 // Wait for unstaking period. Balance now free ~1000; reserved, frozen, miscFrozeb: 0n161 await waitForRelayBlock(helper.api!, 20);166 await waitForRelayBlock(helper.api!, 20);162 expect(await helper.balance.getSubstrateFull(staker.address)).to.deep.contain({reserved: 0n * nominal, miscFrozen: 0n, feeFrozen: 0n});167 expect(await helper.balance.getSubstrateFull(staker.address)).to.deep.contain({reserved: 0n, miscFrozen: 0n, feeFrozen: 0n});163 expect(await helper.balance.getSubstrate(staker.address) / nominal).to.be.equal(999n);168 expect(await helper.balance.getSubstrate(staker.address) / nominal).to.be.equal(999n);164169165 // staker can transfer:170 // staker can transfer:192 expect(stakedPerBlock).to.be.deep.equal([]);197 expect(stakedPerBlock).to.be.deep.equal([]);193 expect(unstakedPerBlock).to.be.deep.equal([600n * nominal]);198 expect(unstakedPerBlock).to.be.deep.equal([600n * nominal]);194199195 expect (await helper.balance.getSubstrateFull(staker.address)).to.deep.contain({reserved: 0n, feeFrozen: 600n * nominal, miscFrozen: 600n * nominal});200 expect (await helper.balance.getSubstrateFull(staker.address)).to.deep.contain({reserved: 600n * nominal, feeFrozen: 0n, miscFrozen: 0n});196 await waitForRelayBlock(helper.api!, 20);201 await waitForRelayBlock(helper.api!, 20);197 expect (await helper.balance.getSubstrateFull(staker.address)).to.deep.contain({reserved: 0n, feeFrozen: 0n, miscFrozen: 0n});202 expect (await helper.balance.getSubstrateFull(staker.address)).to.deep.contain({reserved: 0n, feeFrozen: 0n, miscFrozen: 0n});198 expect (await helper.balance.getSubstrate(staker.address) / nominal).to.be.equal(999n);203 expect (await helper.balance.getSubstrate(staker.address) / nominal).to.be.equal(999n);635 it('can not be called by non admin', async () => {640 it('can not be called by non admin', async () => {636 await usingPlaygrounds(async (helper) => {641 await usingPlaygrounds(async (helper) => {637 const nonAdmin = accounts.pop()!;642 const nonAdmin = accounts.pop()!;638 await expect(helper.signTransaction(nonAdmin, helper.api!.tx.promotion.payoutStakers(50))).to.be.rejected;643 await expect(helper.signTransaction(nonAdmin, helper.api!.tx.promotion.payoutStakers(100))).to.be.rejected;639 });644 });640 });645 });641646647 await helper.staking.stake(staker, 100n * nominal);652 await helper.staking.stake(staker, 100n * nominal);648 await helper.staking.stake(staker, 200n * nominal);653 await helper.staking.stake(staker, 200n * nominal);649 await waitForRelayBlock(helper.api!, 30);654 await waitForRelayBlock(helper.api!, 30);650 await helper.signTransaction(palletAdmin, helper.api!.tx.promotion.payoutStakers(50));655 await helper.signTransaction(palletAdmin, helper.api!.tx.promotion.payoutStakers(100));651656652 const totalStakedPerBlock = (await helper.staking.getTotalStakedPerBlock({Substrate: staker.address})).map(s => s[1]);657 const totalStakedPerBlock = (await helper.staking.getTotalStakedPerBlock({Substrate: staker.address})).map(s => s[1]);653 expect(totalStakedPerBlock).to.be.deep.equal([calculateIncome(100n * nominal, 10n), calculateIncome(200n * nominal, 10n)]);658 expect(totalStakedPerBlock).to.be.deep.equal([calculateIncome(100n * nominal, 10n), calculateIncome(200n * nominal, 10n)]);654 });659 });655 });660 });656661657 it('shoud be paid for more than one period if payments was missed', async () => {662 it('shoud be paid for more than one period if payments was missed', async () => {663 // TODO flaky test658 await usingPlaygrounds(async (helper) => {664 await usingPlaygrounds(async (helper) => {659 const staker = accounts.pop()!;665 const staker = accounts.pop()!;660666661 await helper.staking.stake(staker, 100n * nominal);667 await helper.staking.stake(staker, 100n * nominal);662 await helper.staking.stake(staker, 200n * nominal);668 await helper.staking.stake(staker, 200n * nominal);663669664 await waitForRelayBlock(helper.api!, 55);670 await waitForRelayBlock(helper.api!, 55);665 await helper.signTransaction(palletAdmin, helper.api!.tx.promotion.payoutStakers(50));671 await helper.signTransaction(palletAdmin, helper.api!.tx.promotion.payoutStakers(100));666 const stakedPerBlock = await helper.staking.getTotalStakedPerBlock({Substrate: staker.address});672 const stakedPerBlock = await helper.staking.getTotalStakedPerBlock({Substrate: staker.address});667 expect(stakedPerBlock[0][1]).to.be.equal(calculateIncome(100n * nominal, 10n, 2));673 expect(stakedPerBlock[0][1]).to.be.equal(calculateIncome(100n * nominal, 10n, 2));668 expect(stakedPerBlock[1][1]).to.be.equal(calculateIncome(200n * nominal, 10n, 2));674 expect(stakedPerBlock[1][1]).to.be.equal(calculateIncome(200n * nominal, 10n, 2));675 });681 });676 682 677 it('should not be credited for unstaked (reserved) balance', async () => {683 it('should not be credited for unstaked (reserved) balance', async () => {678 expect.fail('Test not implemented');679 await usingPlaygrounds(async helper => {684 await usingPlaygrounds(async helper => {685 // staker unstakes before rewards has been initialized680 const staker = accounts.pop()!;686 const staker = accounts.pop()!;687 await helper.staking.stake(staker, 100n * nominal);688 await waitForRelayBlock(helper.api!, 40);689 await helper.staking.unstake(staker);690 691 // so he did not receive any rewards692 const totalBalanceBefore = await helper.balance.getSubstrate(staker.address);693 await helper.signTransaction(palletAdmin, helper.api!.tx.promotion.payoutStakers(100));694 const totalBalanceAfter = await helper.balance.getSubstrate(staker.address);695696 expect(totalBalanceBefore).to.be.equal(totalBalanceAfter);681 });697 });682 });698 });683 699 691 await helper.staking.stake(staker, 300n * nominal);707 await helper.staking.stake(staker, 300n * nominal);692 708 693 await waitForRelayBlock(helper.api!, 34);709 await waitForRelayBlock(helper.api!, 34);694 await helper.signTransaction(palletAdmin, helper.api!.tx.promotion.payoutStakers(50));710 await helper.signTransaction(palletAdmin, helper.api!.tx.promotion.payoutStakers(100));695 let totalStakedPerBlock = (await helper.staking.getTotalStakedPerBlock({Substrate: staker.address})).map(s => s[1]);711 let totalStakedPerBlock = (await helper.staking.getTotalStakedPerBlock({Substrate: staker.address})).map(s => s[1]);696 expect(totalStakedPerBlock).to.deep.equal([calculateIncome(100n * nominal, 10n), calculateIncome(200n * nominal, 10n), calculateIncome(300n * nominal, 10n)]);712 expect(totalStakedPerBlock).to.deep.equal([calculateIncome(100n * nominal, 10n), calculateIncome(200n * nominal, 10n), calculateIncome(300n * nominal, 10n)]);697 713 698 await waitForRelayBlock(helper.api!, 20);714 await waitForRelayBlock(helper.api!, 20);699 await helper.signTransaction(palletAdmin, helper.api!.tx.promotion.payoutStakers(50));715 await helper.signTransaction(palletAdmin, helper.api!.tx.promotion.payoutStakers(100));700 totalStakedPerBlock = (await helper.staking.getTotalStakedPerBlock({Substrate: staker.address})).map(s => s[1]);716 totalStakedPerBlock = (await helper.staking.getTotalStakedPerBlock({Substrate: staker.address})).map(s => s[1]);701 expect(totalStakedPerBlock).to.deep.equal([calculateIncome(100n * nominal, 10n, 2), calculateIncome(200n * nominal, 10n, 2), calculateIncome(300n * nominal, 10n, 2)]); 717 expect(totalStakedPerBlock).to.deep.equal([calculateIncome(100n * nominal, 10n, 2), calculateIncome(200n * nominal, 10n, 2), calculateIncome(300n * nominal, 10n, 2)]); 702 });718 });tests/src/interfaces/augment-api-query.tsdiffbeforeafterboth--- a/tests/src/interfaces/augment-api-query.ts
+++ b/tests/src/interfaces/augment-api-query.ts
@@ -6,7 +6,7 @@
import '@polkadot/api-base/types/storage';
import type { ApiTypes, AugmentedQuery, QueryableStorageEntry } from '@polkadot/api-base/types';
-import type { BTreeMap, Bytes, Option, U256, U8aFixed, Vec, bool, u128, u16, u32, u64 } from '@polkadot/types-codec';
+import type { BTreeMap, Bytes, Option, U256, U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';
import type { AnyNumber, ITuple } from '@polkadot/types-codec/types';
import type { AccountId32, H160, H256 } from '@polkadot/types/interfaces/runtime';
import type { CumulusPalletDmpQueueConfigData, CumulusPalletDmpQueuePageIndexData, CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot, CumulusPalletXcmpQueueInboundChannelDetails, CumulusPalletXcmpQueueOutboundChannelDetails, CumulusPalletXcmpQueueQueueConfigData, EthereumBlock, EthereumLog, EthereumReceiptReceiptV3, EthereumTransactionTransactionV2, FpRpcTransactionStatus, FrameSupportWeightsPerDispatchClassU64, FrameSystemAccountInfo, FrameSystemEventRecord, FrameSystemLastRuntimeUpgradeInfo, FrameSystemPhase, OrmlVestingVestingSchedule, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesReleases, PalletBalancesReserveData, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmContractHelpersSponsoringModeT, PalletNonfungibleItemData, PalletRefungibleItemData, PalletTransactionPaymentReleases, PalletTreasuryProposal, PalletUniqueSchedulerScheduledV3, PhantomTypeUpDataStructs, PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotPrimitivesV2AbridgedHostConfiguration, PolkadotPrimitivesV2PersistedValidationData, PolkadotPrimitivesV2UpgradeRestriction, SpRuntimeDigest, SpTrieStorageProof, UpDataStructsCollection, UpDataStructsCollectionStats, UpDataStructsProperties, UpDataStructsPropertiesMapPropertyPermission, UpDataStructsPropertyPermission, UpDataStructsPropertyScope, UpDataStructsSponsorshipStateBasicCrossAccountIdRepr, UpDataStructsTokenChild } from '@polkadot/types/lookup';
@@ -513,10 +513,10 @@
promotion: {
admin: AugmentedQuery<ApiType, () => Observable<Option<AccountId32>>, []> & QueryableStorageEntry<ApiType, []>;
/**
- * Stores the address of the staker for which the last revenue recalculation was performed.
+ * Stores hash a record for which the last revenue recalculation was performed.
* If `None`, then recalculation has not yet been performed or calculations have been completed for all stakers.
**/
- lastCalcucaltedStaker: AugmentedQuery<ApiType, () => Observable<Option<AccountId32>>, []> & QueryableStorageEntry<ApiType, []>;
+ nextCalculatedRecord: AugmentedQuery<ApiType, () => Observable<Option<ITuple<[AccountId32, u32]>>>, []> & QueryableStorageEntry<ApiType, []>;
/**
* Next target block when interest is recalculated
**/
@@ -530,6 +530,10 @@
**/
staked: AugmentedQuery<ApiType, (arg1: AccountId32 | string | Uint8Array, arg2: u32 | AnyNumber | Uint8Array) => Observable<ITuple<[u128, u32]>>, [AccountId32, u32]> & QueryableStorageEntry<ApiType, [AccountId32, u32]>;
/**
+ * Amount of stakes for an Account
+ **/
+ stakesPerAccount: AugmentedQuery<ApiType, (arg: AccountId32 | string | Uint8Array) => Observable<u8>, [AccountId32]> & QueryableStorageEntry<ApiType, [AccountId32]>;
+ /**
* A block when app-promotion has started .I think this is redundant, because we only need `NextInterestBlock`.
**/
startBlock: AugmentedQuery<ApiType, () => Observable<u32>, []> & QueryableStorageEntry<ApiType, []>;