Merge branch 'money-market-reward-pools' into borrowe-rewards-fe

securesecrets · Nov 27, 2024 · 9aa494a · 9aa494a
2 parents 878257c + 6c90022
commit 9aa494a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/contracts/services/moneyMarket.ts b/src/contracts/services/moneyMarket.ts
@@ -9,6 +9,7 @@ import {
 import {
   BatchQueryParsedResponse,
   BatchQueryParams,
+  BatchQueryParsedResponseItem,
 } from '~/types/contracts/batchQuery/model';
 import { sendSecretClientContractQuery$ } from '~/client/services/clientServices';
 import { ConfigResponse, GetCollateralResponse, GetMarketsResponse } from '~/types/contracts/moneyMarket/response';
@@ -19,6 +20,7 @@ import {
   ContractAndPagination,
   Pagination, ParsedConfigResponse, ParsedGetCollateralResponse, ParsedGetMarketsResponse,
   ParsedRewardPoolsResponse,
+  RewardPoolResponse,
 } from '~/types/contracts/moneyMarket/model';
 import { Contract } from '~/types/contracts/shared/index';
 import { MinBlockHeightValidationOptions } from '~/types';
@@ -735,10 +737,10 @@ async function batchQueryMoneyMarketPublicLogs({
 const parseBatchQueryMoneyMarketRewardPools = (
   responses: BatchQueryParsedResponse,
 ): ParsedRewardPoolsResponse[] => (
-  responses.map((response: any) => ({
-    debtMarket: response.id,
+  responses.map((response: BatchQueryParsedResponseItem) => ({
+    debtMarket: response.id.toString(),
     blockHeight: response.blockHeight,
-    rewardPools: response.response.map((pool: any) => ({
+    rewardPools: response.response.map((pool: RewardPoolResponse) => ({
       rewardPoolId: pool.id,
       amount: pool.amount,
       token: pool.token,

diff --git a/src/types/contracts/moneyMarket/model.ts b/src/types/contracts/moneyMarket/model.ts
@@ -174,6 +174,15 @@ type RewardPool = {
     rate: string,
 }
 
+type RewardPoolResponse = {
+    id: string,
+    amount: string,
+    token: string,
+    start: string,
+    end: string,
+    rate: string,
+}
+
 type ParsedRewardPoolsResponse = {
     debtMarket: string,
     blockHeight: number,
@@ -196,5 +205,6 @@ export type {
   PublicLog,
   PaginatedPublicLogs,
   RewardPool,
+  RewardPoolResponse,
   ParsedRewardPoolsResponse,
 };