Merge remote-tracking branch 'origin/moneymarket' into borrowe-reward…

…s-fe

.changeset/brown-laws-switch.md

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

.changeset/poor-apricots-yell.md

@@ -0,0 +1,5 @@
+---
+"@shadeprotocol/shadejs": patch
+---
+
+Money Market Public Logs Querys

README.md

@@ -43,4 +43,9 @@ Docs will be available on a vitepress site. You can run the site locally with th
 
 ```
 $ yarn docs:dev
+```
+
+## Building new version run
+```bash
+yarn changeset
 ```

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shadeprotocol/shadejs",
   "description": "The Typescript SDK for Shade Protocol",
-  "version": "1.0.9",
+  "version": "1.5.10-beta.1",
   "author": "Secure Secrets",
   "bugs": {
     "url": "https://github.com/securesecrets/shadejs/issues"
@@ -42,7 +42,7 @@
   "dependencies": {
     "bignumber.js": "^9.1.2",
     "rxjs": "^7.8.1",
-    "secretjs": "^1.12.1",
+    "secretjs": "1.15.0-beta.0",
     "vite": "^4.5.0",
     "whatwg-fetch": "^3.6.19"
   },

src/contracts/definitions/moneyMarket.ts

@@ -181,6 +181,18 @@ function msgMoneyMarketClaimRewards() {
   return { claim_rewards: {} };
 }
 
+/**
+ * Query the Public Event Logs for momeymarket contract
+ * NOT FOR PRODUCTION USE, CONTRACT IS IN DEVELOPMENT ON TESTNET ONLY
+ */
+const msgQueryMoneyMarketPublicLogs = (
+  pagination?: Pagination,
+) => ({
+  get_public_log: {
+    pagination,
+  },
+});
+
 export {
   msgQueryMoneyMarketConfig,
   msgQueryMoneyMarketCollaterals,
@@ -193,4 +205,5 @@ export {
   msgMoneyMarketWithdrawSupply,
   msgMoneyMarketRepay,
   msgMoneyMarketClaimRewards,
+  msgQueryMoneyMarketPublicLogs,
 };

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,
@@ -572,6 +576,256 @@ async function batchQueryMoneyMarketGetCollateral({
   }));
 }
 
+// Parsing function for MoneyMarket Public Logs response
+const parseMoneyMarketPublicLogs = (response: any) => ({
+  page: response.page,
+  pageSize: response.page_size,
+  totalPages: response.total_pages,
+  totalItems: response.total_items,
+  data: response.data
+    ? response.data.map((event: any) => ({
+      timestamp: new Date(event.timestamp * 1000), // Convert UNIX timestamp to JS Date
+      action: event.action, // Pass the full action JSON object without further parsing
+    }))
+    : [],
+});
+
+/**
+ * Query the Public Logs for a single money market contract using RxJS
+ * NOT FOR PRODUCTION USE, CONTRACT IS IN DEVELOPMENT ON TESTNET ONLY
+ */
+function queryMoneyMarketPublicLogs$({
+  contractAddress,
+  codeHash,
+  lcdEndpoint,
+  chainId,
+  pagination,
+}: {
+  contractAddress: string,
+  codeHash?: string,
+  lcdEndpoint?: string,
+  chainId?: string,
+  pagination?: Pagination,
+}) {
+  return getActiveQueryClient$(lcdEndpoint, chainId).pipe(
+    switchMap(({ client }) => sendSecretClientContractQuery$({
+      queryMsg: {
+        get_public_logs: { pagination },
+      },
+      client,
+      contractAddress,
+      codeHash,
+    })),
+    map((response) => parseMoneyMarketPublicLogs(response)),
+    first(),
+  );
+}
+
+/**
+ * Query the Public Logs for a single money market contract
+ * NOT FOR PRODUCTION USE, CONTRACT IS IN DEVELOPMENT ON TESTNET ONLY
+ */
+async function queryMoneyMarketPublicLogs({
+  contractAddress,
+  codeHash,
+  lcdEndpoint,
+  chainId,
+  pageSize,
+  page,
+}: {
+  contractAddress: string,
+  codeHash?: string,
+  lcdEndpoint?: string,
+  chainId?: string,
+  pageSize?: number,
+  page?: number,
+}) {
+  return lastValueFrom(queryMoneyMarketPublicLogs$({
+    contractAddress,
+    codeHash,
+    lcdEndpoint,
+    chainId,
+    pagination: pageSize !== undefined && page !== undefined
+      ? { page_size: pageSize, page }
+      : undefined,
+  }));
+}
+
+/**
+ * Batch query the Public Logs for multiple money market contracts
+ * NOT FOR PRODUCTION USE, CONTRACT IS IN DEVELOPMENT ON TESTNET ONLY
+ */
+function batchQueryMoneyMarketPublicLogs$({
+  queryPublicLogsContractAddress,
+  queryPublicLogsCodeHash,
+  lcdEndpoint,
+  chainId,
+  moneyMarketContracts,
+  batchSize,
+  minBlockHeightValidationOptions,
+  blockHeight,
+}: {
+  queryPublicLogsContractAddress: string,
+  queryPublicLogsCodeHash?: string,
+  lcdEndpoint?: string,
+  chainId?: string,
+  moneyMarketContracts: ContractAndPagination[],
+  batchSize?: number,
+  minBlockHeightValidationOptions?: MinBlockHeightValidationOptions,
+  blockHeight?: number,
+}) {
+  const queries: BatchQueryParams[] = moneyMarketContracts.map((contract) => ({
+    id: contract.address,
+    contract: {
+      address: contract.address,
+      codeHash: contract.codeHash,
+    },
+    queryMsg: {
+      get_public_logs: {
+        pagination: contract.pageSize && contract.page
+          ? { page_size: contract.pageSize, page: contract.page } : undefined,
+      },
+    },
+  }));
+
+  return batchQuery$({
+    contractAddress: queryPublicLogsContractAddress,
+    codeHash: queryPublicLogsCodeHash,
+    lcdEndpoint,
+    chainId,
+    queries,
+    batchSize,
+    minBlockHeightValidationOptions,
+    blockHeight,
+  }).pipe(
+    map((response) => response.map((item) => ({
+      moneyMarketContractAddress: item.id as string,
+      publicLogs: parseMoneyMarketPublicLogs(item.response),
+      blockHeight: item.blockHeight,
+    }))),
+    first(),
+  );
+}
+
+async function batchQueryMoneyMarketPublicLogs({
+  queryPublicLogsContractAddress,
+  queryPublicLogsCodeHash,
+  lcdEndpoint,
+  chainId,
+  moneyMarketContracts,
+  minBlockHeightValidationOptions,
+}: {
+  queryPublicLogsContractAddress: string,
+  queryPublicLogsCodeHash?: string,
+  lcdEndpoint?: string,
+  chainId?: string,
+  moneyMarketContracts: ContractAndPagination[],
+  minBlockHeightValidationOptions?: MinBlockHeightValidationOptions,
+}) {
+  return lastValueFrom(batchQueryMoneyMarketPublicLogs$({
+    queryPublicLogsContractAddress,
+    queryPublicLogsCodeHash,
+    lcdEndpoint,
+    chainId,
+    moneyMarketContracts,
+    minBlockHeightValidationOptions,
+  }));
+}
+
+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,
@@ -582,4 +836,10 @@ export {
   batchQueryMoneyMarketConfig,
   batchQueryMoneyMarketGetMarkets,
   batchQueryMoneyMarketGetCollateral,
+  queryMoneyMarketPublicLogs$,
+  queryMoneyMarketPublicLogs,
+  batchQueryMoneyMarketPublicLogs$,
+  batchQueryMoneyMarketPublicLogs,
+  batchQueryMoneyMarketRewardPools$,
+  batchQueryMoneyMarketRewardPools,
 };