Fetch rewards for evm account

AstarNetwork · Dec 22, 2023 · ca11ac7 · ca11ac7
1 parent 0bda4ed
commit ca11ac7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/src/staking-v3/hooks/useDappStaking.ts b/src/staking-v3/hooks/useDappStaking.ts
@@ -272,7 +272,9 @@ export function useDappStaking() {
   };
 
   const getAllRewards = async (): Promise<void> => {
-    const stakingV3service = container.get<IDappStakingService>(Symbols.DappStakingServiceV3);
+    const stakingV3service = container.get<() => IDappStakingService>(
+      Symbols.DappStakingServiceFactoryV3
+    )();
     const ownedContractAddress = getOwnedDappAddress();
 
     let staker = BigInt(0);

diff --git a/src/staking-v3/logic/services/DappStakingServiceEvm.ts b/src/staking-v3/logic/services/DappStakingServiceEvm.ts
@@ -53,6 +53,7 @@ export class DappStakingServiceEvm extends DappStakingService implements IDappSt
     });
   }
 
+  // @inheritdoc
   public async getStakerInfo(
     address: string,
     includePreviousPeriods: boolean
@@ -61,6 +62,18 @@ export class DappStakingServiceEvm extends DappStakingService implements IDappSt
     return await super.getStakerInfo(ss58Address, includePreviousPeriods);
   }
 
+  // @inheritdoc
+  public async getStakerRewards(senderAddress: string): Promise<bigint> {
+    const ss58Address = await this.getSS58Address(senderAddress);
+    return await super.getStakerRewards(ss58Address);
+  }
+
+  // @inheritdoc
+  public async getBonusRewards(senderAddress: string): Promise<bigint> {
+    const ss58Address = await this.getSS58Address(senderAddress);
+    return await super.getBonusRewards(ss58Address);
+  }
+
   private async getSS58Address(evmAddress: string): Promise<string> {
     return await this.accountUnificationRepository.getConvertedNativeAddress(evmAddress);
   }

diff --git a/src/v2/repositories/implementations/AccountUnificationRepository.ts b/src/v2/repositories/implementations/AccountUnificationRepository.ts
@@ -36,7 +36,7 @@ export class AccountUnificationRepository implements IAccountUnificationReposito
     Guard.ThrowIfUndefined('evmAddress', evmAddress);
 
     const api = await this.api.getApi();
-    const nativeAddress = api.query.hasOwnProperty('unifiedAccounts') // hasProperty(api.query, 'unifiedAccounts')
+    const nativeAddress = hasProperty(api.query, 'unifiedAccounts')
       ? await api.query.unifiedAccounts.evmToNative<AccountId32>(evmAddress)
       : '';