Money market reward pools

.changeset/brown-laws-switch.md

@@ -0,0 +1,5 @@
+---
+"@shadeprotocol/shadejs": patch
+---
+
+Money Market Reward Pools

src/contracts/services/moneyMarket.ts

@@ -5,6 +5,11 @@ import {
   map,
   lastValueFrom,
 } from 'rxjs';
+
+import {
+  BatchQueryParsedResponse,
+  BatchQueryParams,
+} from '~/types/contracts/batchQuery/model';
 import { sendSecretClientContractQuery$ } from '~/client/services/clientServices';
 import { ConfigResponse, GetCollateralResponse, GetMarketsResponse } from '~/types/contracts/moneyMarket/response';
 import {
@@ -13,11 +18,9 @@ import {
   BatchMoneyMarketGetMarkets,
   ContractAndPagination,
   Pagination, ParsedConfigResponse, ParsedGetCollateralResponse, ParsedGetMarketsResponse,
+  ParsedRewardPoolsResponse,
 } from '~/types/contracts/moneyMarket/model';
 import { Contract } from '~/types/contracts/shared/index';
-import {
-  BatchQueryParams, BatchQueryParsedResponse,
-} from '~/types/contracts/batchQuery/model';
 import { MinBlockHeightValidationOptions } from '~/types';
 import { batchQuery$ } from './batchQuery';
 import { msgQueryMoneyMarketCollaterals, msgQueryMoneyMarketConfig, msgQueryMoneyMarketMarkets } from '../definitions/moneyMarket';
@@ -123,7 +126,8 @@ const parseMoneyMarketGetCollateral = (
       collateralAmount: cur.amount,
       decimals: cur.decimals,
       maxInitialLtv: cur.max_initial_ltv,
-      liquidationThreshold: cur.liquidation_threshold,
+      publicLiquidationThreshold: cur.public_liquidation_threshold,
+      privateLiquidationThreshold: cur.private_liquidation_threshold,
       liquidationDiscount: cur.liquidation_discount,
       oracleKey: cur.oracle_key,
       depositEnabled: cur.status.deposit_enabled,
@@ -598,7 +602,7 @@ function queryMoneyMarketPublicLogs$({
   pagination,
 }: {
   contractAddress: string,
-  codeHash: string,
+  codeHash?: string,
   lcdEndpoint?: string,
   chainId?: string,
   pagination?: Pagination,
@@ -630,7 +634,7 @@ async function queryMoneyMarketPublicLogs({
   page,
 }: {
   contractAddress: string,
-  codeHash: string,
+  codeHash?: string,
   lcdEndpoint?: string,
   chainId?: string,
   pageSize?: number,
@@ -728,6 +732,100 @@ async function batchQueryMoneyMarketPublicLogs({
   }));
 }
 
+const parseBatchQueryMoneyMarketRewardPools = (
+  responses: BatchQueryParsedResponse,
+): ParsedRewardPoolsResponse[] => (
+  responses.map((response: any) => ({
+    debtMarket: response.id,
+    blockHeight: response.blockHeight,
+    rewardPools: response.response.map((pool: any) => ({
+      rewardPoolId: pool.id,
+      amount: pool.amount,
+      token: pool.token,
+      start: pool.start,
+      end: pool.end,
+      rate: pool.rate,
+    })),
+  }))
+);
+
+function batchQueryMoneyMarketRewardPools$({
+  queryRouterContractAddress,
+  queryRouterCodeHash,
+  lcdEndpoint,
+  chainId,
+  moneyMarket,
+  debtMarkets,
+  batchSize,
+  minBlockHeightValidationOptions,
+  blockHeight,
+}: {
+  queryRouterContractAddress: string,
+  queryRouterCodeHash?: string,
+  lcdEndpoint?: string,
+  chainId?: string,
+  moneyMarket: Contract,
+  debtMarkets: string[],
+  batchSize?: number,
+  minBlockHeightValidationOptions?: MinBlockHeightValidationOptions,
+  blockHeight?: number,
+}) {
+  const queries = debtMarkets.map((debtMarket) => ({
+    id: debtMarket,
+    contract: {
+      address: moneyMarket.address,
+      codeHash: moneyMarket.codeHash,
+    },
+    queryMsg: {
+      reward_pools: {
+        market: debtMarket,
+      },
+    },
+  }));
+
+  return batchQuery$({
+    contractAddress: queryRouterContractAddress,
+    codeHash: queryRouterCodeHash,
+    lcdEndpoint,
+    chainId,
+    queries,
+    batchSize,
+    minBlockHeightValidationOptions,
+    blockHeight,
+  }).pipe(
+    map((response) => parseBatchQueryMoneyMarketRewardPools(response)),
+    first(),
+  );
+}
+
+async function batchQueryMoneyMarketRewardPools({
+  queryRouterContractAddress,
+  queryRouterCodeHash,
+  lcdEndpoint,
+  chainId,
+  moneyMarket,
+  debtMarkets,
+  minBlockHeightValidationOptions,
+}: {
+  queryRouterContractAddress: string,
+  queryRouterCodeHash?: string,
+  lcdEndpoint?: string,
+  chainId?: string,
+  moneyMarket: Contract,
+  debtMarkets: string[],
+  minBlockHeightValidationOptions?: MinBlockHeightValidationOptions,
+}) {
+  return lastValueFrom(batchQueryMoneyMarketRewardPools$({
+    queryRouterContractAddress,
+    queryRouterCodeHash,
+    lcdEndpoint,
+    chainId,
+    moneyMarket,
+    debtMarkets,
+    minBlockHeightValidationOptions,
+  }));
+}
+
 export {
   queryMoneyMarketConfig,
   queryMoneyMarketGetMarkets,
@@ -742,4 +840,6 @@ export {
   queryMoneyMarketPublicLogs,
   batchQueryMoneyMarketPublicLogs$,
   batchQueryMoneyMarketPublicLogs,
+  batchQueryMoneyMarketRewardPools$,
+  batchQueryMoneyMarketRewardPools,
 };

src/types/contracts/moneyMarket/model.ts

@@ -102,7 +102,8 @@ type ParsedCollateralReponse = {
   collateralAmount: string,
   decimals: number,
   maxInitialLtv: string,
-  liquidationThreshold: string,
+  publicLiquidationThreshold: string,
+  privateLiquidationThreshold: string,
   liquidationDiscount: string,
   oracleKey: string,
   depositEnabled: boolean,
@@ -164,6 +165,21 @@ type PaginatedPublicLogs = {
   data: PublicLog[],
 }
 
+type RewardPool = {
+    rewardPoolId: string,
+    amount: string,
+    token: string,
+    start: string,
+    end: string,
+    rate: string,
+}
+
+type ParsedRewardPoolsResponse = {
+    debtMarket: string,
+    blockHeight: string,
+    rewardPools: RewardPool[],
+}
+
 export type {
   Pagination,
   ContractAndPagination,
@@ -179,4 +195,6 @@ export type {
   BatchMoneyMarketGetCollaterals,
   PublicLog,
   PaginatedPublicLogs,
+  RewardPool,
+  ParsedRewardPoolsResponse,
 };

src/types/contracts/moneyMarket/response.ts

@@ -78,7 +78,8 @@ type CollateralReponse = {
   amount: string,
   decimals: number,
   max_initial_ltv: string,
-  liquidation_threshold: string,
+  public_liquidation_threshold: string,
+  private_liquidation_threshold: string,
   liquidation_discount: string,
   oracle_key: string,
   status: {