Skip to content
This repository has been archived by the owner on Oct 30, 2024. It is now read-only.

Add final rewards+final used fee #75

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
Open

Add final rewards+final used fee #75

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
83ba6ec
add some api(claimedReward, UsedFee).
johnnyji-dev Mar 6, 2024
af8b38f
update claimedReward & usedFee param (address to extrinsicHash)
johnnyji-dev Mar 7, 2024
77dc1ce
update claimedReward(Claim_staker_rewards & Claim_bonus_reward)
johnnyji-dev May 29, 2024
3f0e8e5
fix: version change 0.2.8 => 0.3.0 on package.json
johnnyji-dev Jun 23, 2024
1c6b8db
Merge branch 'main' into add_FinalRewards+FinalUsedFee
johnnyji-dev Jul 7, 2024
b44464d
fix : yarn lint - modification
johnnyji-dev Jul 8, 2024
8b229d5
fix : remove toHuman() & commaStrToBigInt()
johnnyji-dev Jul 8, 2024
6a75c9a
fix : add DAppReward on claimedReward & update README.md
johnnyji-dev Jul 21, 2024
239e162
fix : update UsedFee() to getUsedFee()
johnnyji-dev Jul 21, 2024
e0b1ce0
fix : update UsedFee() to getUsedFee() on README.md
johnnyji-dev Jul 21, 2024
77c3d69
fix : Update claimedReward to getClaimedReward
johnnyji-dev Jul 21, 2024
29a523f
fix : update build-error(yarn polkadot-exec-tsc --build tsconfig.buil…
johnnyji-dev Jul 22, 2024
0c90c28
fix : apply <Vec<EventRecord>> on system.events & delete any
johnnyji-dev Jul 29, 2024
49820fa
fix : delete the unusing comments
johnnyji-dev Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions packages/sdk-core/src/modules/dapp-staking/pending-rewards/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { StorageKey, Struct } from '@polkadot/types';
import { Perbill } from '@polkadot/types/interfaces';
import { ApiPromise, HttpProvider } from '@polkadot/api';
import { EventRecord, Perbill } from '@polkadot/types/interfaces';
import { ApiPromise } from '@polkadot/api';
import { ethers } from 'ethers';
import { Codec } from '@polkadot/types/types';
import { commaStrToBigInt, hasProperty, truncate } from '@astar-network/astar-sdk-core';
import { hasProperty, truncate } from '@astar-network/astar-sdk-core';

export interface RewardDistributionConfig extends Struct {
readonly baseTreasuryPercent: Perbill;
Expand Down Expand Up @@ -271,7 +271,7 @@ export const getClaimedReward = async (
const blockHash = await api.rpc.chain.getBlockHash(height);
const signedBlock = await api.rpc.chain.getBlock(blockHash);
const apiAt = await api.at(signedBlock.block.header.hash);
const allRecords = (await apiAt.query.system.events()).toArray();
const allRecords: any = await apiAt.query.system.events();

// Find the extrinsic index by matching the extrinsic hash
const extrinsicIndex = signedBlock.block.extrinsics.findIndex(
Expand All @@ -283,7 +283,7 @@ export const getClaimedReward = async (
}

// Get events associated with the extrinsic
const extrinsicEvents = allRecords.filter((record) =>
const extrinsicEvents = allRecords.filter((record: EventRecord) =>
record.phase.isApplyExtrinsic &&
record.phase.asApplyExtrinsic.eq(extrinsicIndex)
);
Expand All @@ -294,10 +294,11 @@ export const getClaimedReward = async (
const section = 'dappStaking';
let claimedReward = BigInt('0');

extrinsicEvents.map((e, idx) => {
extrinsicEvents.map((e: EventRecord) => {
if ((e.event?.method === methodRwd || e.event?.method === methodBnsRwd || e.event?.method === methodDappRwd) &&
e.event?.section === section) {
claimedReward += e.event?.data?.amount;
const eData: any = e.event?.data;
claimedReward += eData?.amount;
}
});

Expand All @@ -321,7 +322,7 @@ export const getUsedFee = async (
const blockHash = await api.rpc.chain.getBlockHash(height);
const signedBlock = await api.rpc.chain.getBlock(blockHash);
const apiAt = await api.at(signedBlock.block.header.hash);
const allRecords = (await apiAt.query.system.events()).toArray();
const allRecords: any = await apiAt.query.system.events();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please don't use any Applicable to multiple locations within the code
https://www.typescriptlang.org/docs/handbook/declaration-files/do-s-and-don-ts.html

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bobo-k2
BTW, Property 'map' does not exist on type 'Codec'.
The type of 'allRecords' is Codec.
I tried to iterate the data by using 'filter' or 'map'. But that make build error(yarn polkadot-exec-tsc --build tsconfig.build.json).

How can I handle this? Can you suggest any reference docs?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Codec is a base type from which all polkadot.js types are inherited. System.events are of type Vec<FrameSystemEventRecord> so you can change your line to

const allRecords = await api.query.system.events<Vec<FrameSystemEventRecord>>();

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When '<Vec>' applied, can not import the member like below error message.
packages/sdk-core/src/modules/dapp-staking/pending-rewards/index.ts:7:10 - error TS2305: Module '"@polkadot/types/lookup"' has no exported member 'FrameSystemEventRecord'.

Alternative, I used the 'EventRecord' and got properties(actualFee, amount) by index.


// Find the extrinsic index by matching the extrinsic hash
const extrinsicIndex = signedBlock.block.extrinsics.findIndex(
Expand All @@ -333,7 +334,7 @@ export const getUsedFee = async (
}

// Get events associated with the extrinsic
const extrinsicEvents = allRecords.filter((record) =>
const extrinsicEvents = allRecords.filter((record: EventRecord) =>
record.phase.isApplyExtrinsic &&
record.phase.asApplyExtrinsic.eq(extrinsicIndex)
);
Expand All @@ -343,10 +344,10 @@ export const getUsedFee = async (

let usedFee = BigInt('0');

extrinsicEvents.map((e) => {
if (e.event?.method === method &&
e.event?.section === section) {
usedFee = e.event?.data?.actualFee;
extrinsicEvents.map((e: EventRecord) => {
if (e.event?.method === method && e.event?.section === section) {
const eData: any = e.event?.data;
usedFee += eData?.actualFee;
}
});

Expand Down
Loading