@scallop-io/sui-scallop-sdk 0.44.17 → 0.44.19

package/src/constants/common.ts

@@ -1,14 +1,27 @@
 export const API_BASE_URL = 'https://sui.api.scallop.io';
 export const SDK_API_BASE_URL = 'https://sdk.api.scallop.io';
 
-export const ADDRESSES_ID = '6462a088a7ace142bb6d7e9b';
+export const IS_VE_SCA_TEST = false;
 
-export const PROTOCOL_OBJECT_ID =
-  '0xefe8b36d5b2e43728cc323298626b83177803521d195cfb11e15b910e892fddf';
+export const ADDRESSES_ID = IS_VE_SCA_TEST
+  ? ('65fb07c39c845425d71d7b18' as const)
+  : ('6601955b8b0024600a917079' as const);
+// : ('6462a088a7ace142bb6d7e9b' as const);
 
-export const BORROW_FEE_PROTOCOL_ID =
-  '0xc38f849e81cfe46d4e4320f508ea7dda42934a329d5a6571bb4c3cb6ea63f5da';
+export const PROTOCOL_OBJECT_ID = IS_VE_SCA_TEST
+  ? ('0xc9f859f98ca352a11b97a038c4b4162bee437b8df8caa047990fe9cb03d4f778' as const)
+  : ('0xefe8b36d5b2e43728cc323298626b83177803521d195cfb11e15b910e892fddf' as const);
 
+export const BORROW_FEE_PROTOCOL_ID = IS_VE_SCA_TEST
+  ? ('0xc9f859f98ca352a11b97a038c4b4162bee437b8df8caa047990fe9cb03d4f778' as const)
+  : ('0xc38f849e81cfe46d4e4320f508ea7dda42934a329d5a6571bb4c3cb6ea63f5da' as const); // test environment
+
+export const SCA_COIN_TYPE = IS_VE_SCA_TEST
+  ? (`0x6cd813061a3adf3602b76545f076205f0c8e7ec1d3b1eab9a1da7992c18c0524::sca::SCA` as const)
+  : ('0x7016aae72cfc67f2fadf55769c0a7dd54291a583b63051a5ed71081cce836ac6::sca::SCA' as const);
+
+export const OLD_BORROW_INCENTIVE_PROTOCOL_ID =
+  '0xc63072e7f5f4983a2efaf5bdba1480d5e7d74d57948e1c7cc436f8e22cbeb410' as const;
 export const SUPPORT_POOLS = [
   'eth',
   'btc',
@@ -52,7 +65,7 @@ export const SUPPORT_SPOOLS_REWARDS = ['sui'] as const;
 
 export const SUPPORT_BORROW_INCENTIVE_POOLS = ['sui', 'usdc', 'usdt'] as const;
 
-export const SUPPORT_BORROW_INCENTIVE_REWARDS = ['sui'] as const;
+export const SUPPORT_BORROW_INCENTIVE_REWARDS = ['sui', 'sca'] as const;
 export const SUPPORT_ORACLES = ['supra', 'switchboard', 'pyth'] as const;
 
 export const SUPPORT_PACKAGES = [

package/src/constants/enum.ts

@@ -9,6 +9,7 @@ import type {
   WormholeCoinIds,
   VoloCoinIds,
 } from '../types';
+import { IS_VE_SCA_TEST } from './common';
 
 export const coinDecimals: SupportCoinDecimals = {
   eth: 8,
@@ -33,6 +34,7 @@ export const coinDecimals: SupportCoinDecimals = {
   safsui: 9,
   shasui: 9,
   svsui: 9,
+  sca: 9,
 };
 
 export const assetCoins: AssetCoins = {
@@ -47,6 +49,7 @@ export const assetCoins: AssetCoins = {
   afsui: 'afsui',
   hasui: 'hasui',
   vsui: 'vsui',
+  sca: 'sca',
 };
 
 export const marketCoins: MarketCoins = {
@@ -86,9 +89,9 @@ export const spoolRewardCoins: StakeRewardCoins = {
 };
 
 export const borrowIncentiveRewardCoins: BorrowIncentiveRewardCoins = {
-  sui: 'sui',
-  usdc: 'sui',
-  usdt: 'sui',
+  sui: ['sui', 'sca'],
+  usdc: ['sui', 'sca'],
+  usdt: ['sui', 'sca'],
 };
 
 export const coinIds: AssetCoinIds = {
@@ -103,6 +106,9 @@ export const coinIds: AssetCoinIds = {
   afsui: '0xf325ce1300e8dac124071d3152c5c5ee6174914f8bc2161e88329cf579246efc',
   hasui: '0xbde4ba4c2e274a60ce15c1cfff9e5c42e41654ac8b6d906a57efa4bd3c29f47d',
   vsui: '0x549e8b69270defbfafd4f94e17ec44cdbdd99820b33bda2278dea3b9a32d3f55',
+  sca: IS_VE_SCA_TEST
+    ? '0x6cd813061a3adf3602b76545f076205f0c8e7ec1d3b1eab9a1da7992c18c0524'
+    : '0x7016aae72cfc67f2fadf55769c0a7dd54291a583b63051a5ed71081cce836ac6',
 };
 
 export const wormholeCoinIds: WormholeCoinIds = {

package/src/constants/index.ts

@@ -1,2 +1,3 @@
 export * from './common';
 export * from './enum';
+export * from './vesca';

package/src/constants/vesca.ts

@@ -0,0 +1,7 @@
+export const UNLOCK_ROUND_DURATION = 60 * 60 * 24; // 1 days in seconds
+export const MAX_LOCK_ROUNDS: number = 1460; // 4 years in days
+export const MAX_LOCK_DURATION: number =
+  MAX_LOCK_ROUNDS * UNLOCK_ROUND_DURATION; // 4 years in seconds
+
+export const MIN_INITIAL_LOCK_AMOUNT: number = 10_000_000_000 as const;
+export const MIN_TOP_UP_AMOUNT: number = 1_000_000_000 as const;

package/src/models/scallopAddress.ts

@@ -230,9 +230,18 @@ const EMPTY_ADDRESSES: AddressesInterface = {
     adminCap: '',
     object: '',
     query: '',
+    config: '',
     incentivePools: '',
     incentiveAccounts: '',
   },
+  vesca: {
+    id: '',
+    adminCap: '',
+    tableId: '',
+    table: '',
+    treasury: '',
+    config: '',
+  },
 };
 
 /**
@@ -452,7 +461,6 @@ export class ScallopAddress {
    */
   public async read(id?: string) {
     const addressesId = id || this._id || undefined;
-
     if (addressesId !== undefined) {
       const response = await this._requestClient.get(
         `${API_BASE_URL}/addresses/${addressesId}`,

package/src/models/scallopClient.ts

@@ -1,6 +1,10 @@
 import { normalizeSuiAddress } from '@mysten/sui.js/utils';
 import { SuiKit } from '@scallop-io/sui-kit';
-import { ADDRESSES_ID, SUPPORT_BORROW_INCENTIVE_POOLS } from '../constants';
+import {
+  ADDRESSES_ID,
+  SUPPORT_BORROW_INCENTIVE_POOLS,
+  SUPPORT_BORROW_INCENTIVE_REWARDS,
+} from '../constants';
 import { ScallopAddress } from './scallopAddress';
 import { ScallopUtils } from './scallopUtils';
 import { ScallopBuilder } from './scallopBuilder';
@@ -782,7 +786,7 @@ export class ScallopClient {
     for (const stakeMarketCoin of stakeMarketCoins) {
       const stakeCoinName =
         this.utils.parseCoinName<SupportStakeCoins>(stakeMarketCoinName);
-      const coin = await txBlock.withdraw(stakeMarketCoin, stakeCoinName);
+      const coin = txBlock.withdraw(stakeMarketCoin, stakeCoinName);
       coins.push(coin);
     }
     txBlock.transferObjects(coins, sender);
@@ -845,15 +849,15 @@ export class ScallopClient {
   /**
    * stake obligaion.
    *
-   * @param obligaionId - The obligation account object.
-   * @param obligaionKeyId - The obligation key account object.
+   * @param obligationId - The obligation account object.
+   * @param obligationKeyId - The obligation key account object.
    * @param sign - Decide to directly sign the transaction or return the transaction block.
    * @param walletAddress - The wallet address of the owner.
    * @return Transaction block response or transaction block
    */
   public async stakeObligation<S extends boolean>(
-    obligaionId: string,
-    obligaionKeyId: string,
+    obligationId: string,
+    obligationKeyId: string,
     sign: S = true as S,
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
@@ -861,7 +865,7 @@ export class ScallopClient {
     const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
 
-    await txBlock.stakeObligationQuick(obligaionId, obligaionKeyId);
+    await txBlock.stakeObligationQuick(obligationId, obligationKeyId);
 
     if (sign) {
       return (await this.suiKit.signAndSendTxn(
@@ -875,15 +879,15 @@ export class ScallopClient {
   /**
    * unstake obligaion.
    *
-   * @param obligaionId - The obligation account object.
-   * @param obligaionKeyId - The obligation key account object.
+   * @param obligationId - The obligation account object.
+   * @param obligationKeyId - The obligation key account object.
    * @param sign - Decide to directly sign the transaction or return the transaction block.
    * @param walletAddress - The wallet address of the owner.
    * @return Transaction block response or transaction block
    */
   public async unstakeObligation<S extends boolean>(
-    obligaionId: string,
-    obligaionKeyId: string,
+    obligationId: string,
+    obligationKeyId: string,
     sign: S = true as S,
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
@@ -891,7 +895,7 @@ export class ScallopClient {
     const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
 
-    await txBlock.unstakeObligationQuick(obligaionId, obligaionKeyId);
+    await txBlock.unstakeObligationQuick(obligationId, obligationKeyId);
 
     if (sign) {
       return (await this.suiKit.signAndSendTxn(
@@ -914,8 +918,8 @@ export class ScallopClient {
    */
   public async claimBorrowIncentive<S extends boolean>(
     coinName: SupportBorrowIncentiveCoins,
-    obligaionId: string,
-    obligaionKeyId: string,
+    obligationId: string,
+    obligationKeyId: string,
     sign: S = true as S,
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
@@ -923,12 +927,17 @@ export class ScallopClient {
     const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
 
-    const rewardCoin = await txBlock.claimBorrowIncentiveQuick(
-      coinName,
-      obligaionId,
-      obligaionKeyId
-    );
-    txBlock.transferObjects([rewardCoin], sender);
+    const rewardCoins = [];
+    for (const rewardCoinName of SUPPORT_BORROW_INCENTIVE_REWARDS) {
+      const rewardCoin = await txBlock.claimBorrowIncentiveQuick(
+        coinName,
+        rewardCoinName,
+        obligationId,
+        obligationKeyId
+      );
+      rewardCoins.push(rewardCoin);
+    }
+    txBlock.transferObjects(rewardCoins, sender);
 
     if (sign) {
       return (await this.suiKit.signAndSendTxn(

package/src/models/scallopUtils.ts

@@ -14,12 +14,15 @@ import {
   wormholeCoinIds,
   voloCoinIds,
   coinIds,
+  UNLOCK_ROUND_DURATION,
+  MAX_LOCK_DURATION,
 } from '../constants';
 import { queryObligation } from '../queries';
 import {
   parseDataFromPythPriceFeed,
   isMarketCoin,
   parseAssetSymbol,
+  findClosestUnlockRound,
 } from '../utils';
 import type {
   ScallopUtilsParams,
@@ -465,4 +468,46 @@ export class ScallopUtils {
   public parseApyToApr(apy: number, compoundFrequency = 365) {
     return ((1 + apy) ** (1 / compoundFrequency) - 1) * compoundFrequency;
   }
+
+  /**
+   * Give extend lock period to get unlock at in seconds timestamp.
+   *
+   * @description
+   * - When the user without remaining unlock period, If the extended unlock day is not specified,
+   *   the unlock period will be increased by one day by default.
+   * - When the given extended day plus the user's remaining unlock period exceeds the maximum
+   *    unlock period, the maximum unlock period is used as unlock period.
+   *
+   * @param extendLockPeriodInDay The extend lock period in day.
+   * @param unlockAtInSecondTimestamp The unlock timestamp from veSca object.
+   * @return New unlock at in seconds timestamp.
+   */
+  public getUnlockAt(
+    extendLockPeriodInDay?: number,
+    unlockAtInSecondTimestamp?: number
+  ) {
+    const now = Math.floor(new Date().getTime() / 1000);
+    const remainingLockPeriod = unlockAtInSecondTimestamp
+      ? Math.max(unlockAtInSecondTimestamp - now, 0)
+      : 0;
+
+    let newUnlockAtInSecondTimestamp = 0;
+
+    if (remainingLockPeriod === 0) {
+      const lockPeriod = (extendLockPeriodInDay ?? 1) * UNLOCK_ROUND_DURATION;
+      newUnlockAtInSecondTimestamp = Math.min(
+        now + lockPeriod,
+        now + MAX_LOCK_DURATION
+      );
+    } else {
+      const lockPeriod = Math.min(
+        extendLockPeriodInDay
+          ? extendLockPeriodInDay * UNLOCK_ROUND_DURATION + remainingLockPeriod
+          : remainingLockPeriod,
+        MAX_LOCK_DURATION
+      );
+      newUnlockAtInSecondTimestamp = now + lockPeriod;
+    }
+    return findClosestUnlockRound(newUnlockAtInSecondTimestamp);
+  }
 }

package/src/queries/borrowIncentiveQuery.ts

@@ -1,12 +1,13 @@
 import { normalizeStructTag } from '@mysten/sui.js/utils';
 import { SuiTxBlock as SuiKitTxBlock } from '@scallop-io/sui-kit';
-import { SUPPORT_BORROW_INCENTIVE_POOLS } from '../constants';
+import {
+  SUPPORT_BORROW_INCENTIVE_POOLS,
+  SUPPORT_BORROW_INCENTIVE_REWARDS,
+} from '../constants';
 import {
   parseOriginBorrowIncentivePoolData,
-  calculateBorrowIncentivePoolData,
-  parseOriginBorrowIncentiveRewardPoolData,
-  calculateBorrowIncentiveRewardPoolData,
   parseOriginBorrowIncentiveAccountData,
+  calculateBorrowIncentivePoolPointData,
 } from '../utils';
 import type { ScallopQuery } from '../models';
 import type {
@@ -15,7 +16,9 @@ import type {
   BorrowIncentiveAccountsQueryInterface,
   BorrowIncentiveAccounts,
   SupportBorrowIncentiveCoins,
-  SupportAssetCoins,
+  SupportBorrowIncentiveRewardCoins,
+  BorrowIncentivePoolPoints,
+  OptionalKeys,
 } from '../types';
 
 /**
@@ -36,97 +39,109 @@ export const queryBorrowIncentivePools = async (
   ];
   const queryPkgId = query.address.get('borrowIncentive.query');
   const incentivePoolsId = query.address.get('borrowIncentive.incentivePools');
+
   const txBlock = new SuiKitTxBlock();
   const queryTarget = `${queryPkgId}::incentive_pools_query::incentive_pools_data`;
-  // The reward coin type currently only support sui, so bring it in directly here.
-  txBlock.moveCall(queryTarget, [incentivePoolsId], ['0x2::sui::SUI']);
+  txBlock.moveCall(queryTarget, [incentivePoolsId]);
   const queryResult = await query.suiKit.inspectTxn(txBlock);
   const borrowIncentivePoolsQueryData = queryResult.events[0]
     .parsedJson as BorrowIncentivePoolsQueryInterface;
 
-  const parsedBorrowIncentiveRewardPoolData =
-    parseOriginBorrowIncentiveRewardPoolData(
-      borrowIncentivePoolsQueryData.reward_pool
-    );
-  const rewardCoinType = parsedBorrowIncentiveRewardPoolData.rewardType;
-  const rewardCoinName =
-    query.utils.parseCoinNameFromType<SupportAssetCoins>(rewardCoinType);
-  const coinPrices = await query.utils.getCoinPrices(
-    [...new Set([...borrowIncentiveCoinNames, rewardCoinName])] ?? []
-  );
-
   const borrowIncentivePools: BorrowIncentivePools = {};
 
   if (indexer) {
-    const borrowIncentivePoolsIndexer =
-      await query.indexer.getBorrowIncentivePools();
-    for (const borrowIncentivePool of Object.values(
-      borrowIncentivePoolsIndexer
-    )) {
-      if (!borrowIncentiveCoinNames.includes(borrowIncentivePool.coinName))
-        continue;
-      borrowIncentivePool.coinPrice =
-        coinPrices[borrowIncentivePool.coinName] ||
-        borrowIncentivePool.coinPrice;
-      borrowIncentivePool.rewardCoinPrice =
-        coinPrices[rewardCoinName] || borrowIncentivePool.rewardCoinPrice;
-      borrowIncentivePools[borrowIncentivePool.coinName] = borrowIncentivePool;
-    }
-    return borrowIncentivePools;
+    // TODO: Implement indexer query.
+    // const borrowIncentivePoolsIndexer =
+    //   await query.indexer.getBorrowIncentivePools();
+    // for (const borrowIncentivePool of Object.values(
+    //   borrowIncentivePoolsIndexer
+    // )) {
+    //   if (!borrowIncentiveCoinNames.includes(borrowIncentivePool.coinName))
+    //     continue;
+    //   borrowIncentivePool.coinPrice =
+    //     coinPrices[borrowIncentivePool.coinName] ||
+    //     borrowIncentivePool.coinPrice;
+    //   borrowIncentivePool.rewardCoinPrice =
+    //     coinPrices[rewardCoinName] || borrowIncentivePool.rewardCoinPrice;
+    //   borrowIncentivePools[borrowIncentivePool.coinName] = borrowIncentivePool;
+    // }
+    // return borrowIncentivePools;
   }
 
   for (const pool of borrowIncentivePoolsQueryData.incentive_pools) {
-    const coinType = normalizeStructTag(pool.pool_type.name);
-    const coinName =
-      query.utils.parseCoinNameFromType<SupportBorrowIncentiveCoins>(coinType);
-    const rewardCoinName =
-      query.utils.parseCoinNameFromType<SupportAssetCoins>(rewardCoinType);
-
-    // Filter pools not yet supported by the SDK.
-    if (!borrowIncentiveCoinNames.includes(coinName)) {
-      continue;
-    }
-
+    const borrowIncentivePoolPoints: OptionalKeys<
+      Record<'sui' | 'sca', BorrowIncentivePoolPoints>
+    > = {};
     const parsedBorrowIncentivePoolData =
       parseOriginBorrowIncentivePoolData(pool);
 
-    const coinPrice = coinPrices?.[coinName] ?? 0;
-    const coinDecimal = query.utils.getCoinDecimal(coinName);
-    const calculatedBorrowIncentivePoolData = calculateBorrowIncentivePoolData(
-      parsedBorrowIncentivePoolData,
-      coinPrice,
-      coinDecimal
+    const coinPrices = await query.utils.getCoinPrices(
+      [
+        ...new Set([
+          ...borrowIncentiveCoinNames,
+          ...SUPPORT_BORROW_INCENTIVE_REWARDS,
+        ]),
+      ] ?? []
     );
 
-    const rewardCoinPrice = coinPrices?.[rewardCoinName] ?? 0;
-    const rewardCoinDecimal = query.utils.getCoinDecimal(rewardCoinName);
-    const calculatedBorrowIncentiveRewardPoolData =
-      calculateBorrowIncentiveRewardPoolData(
+    const poolCoinType = normalizeStructTag(pool.pool_type.name);
+    const poolCoinName =
+      query.utils.parseCoinNameFromType<SupportBorrowIncentiveCoins>(
+        poolCoinType
+      );
+
+    const poolCoinPrice = coinPrices?.[poolCoinName] ?? 0;
+    const poolCoinDecimal = query.utils.getCoinDecimal(poolCoinName);
+
+    // Filter pools not yet supported by the SDK.
+    if (!borrowIncentiveCoinNames.includes(poolCoinName)) {
+      continue;
+    }
+    // pool points for borrow incentive reward ('sui' and 'sca')
+    for (const [coinName, poolPoint] of Object.entries(
+      parsedBorrowIncentivePoolData.poolPoints
+    )) {
+      const rewardCoinType = normalizeStructTag(poolPoint.pointType);
+      const rewardCoinName =
+        query.utils.parseCoinNameFromType<SupportBorrowIncentiveRewardCoins>(
+          rewardCoinType
+        );
+      const rewardCoinPrice = coinPrices?.[rewardCoinName] ?? 0;
+      const rewardCoinDecimal = query.utils.getCoinDecimal(rewardCoinName);
+
+      const symbol = query.utils.parseSymbol(rewardCoinName);
+      const coinDecimal = query.utils.getCoinDecimal(rewardCoinName);
+
+      const calculatedPoolPoint = calculateBorrowIncentivePoolPointData(
         parsedBorrowIncentivePoolData,
-        parsedBorrowIncentiveRewardPoolData,
-        calculatedBorrowIncentivePoolData,
+        poolPoint,
         rewardCoinPrice,
-        rewardCoinDecimal
+        rewardCoinDecimal,
+        poolCoinPrice,
+        poolCoinDecimal
       );
 
-    borrowIncentivePools[coinName] = {
-      coinName: coinName,
-      symbol: query.utils.parseSymbol(coinName),
-      coinType: coinType,
-      rewardCoinType: rewardCoinType,
-      coinDecimal: coinDecimal,
-      rewardCoinDecimal: rewardCoinDecimal,
-      coinPrice: coinPrice,
-      rewardCoinPrice: rewardCoinPrice,
-      maxPoint: parsedBorrowIncentivePoolData.maxPoint,
-      distributedPoint: parsedBorrowIncentivePoolData.distributedPoint,
-      maxStake: parsedBorrowIncentivePoolData.maxStake,
-      ...calculatedBorrowIncentivePoolData,
-      exchangeRateNumerator:
-        parsedBorrowIncentiveRewardPoolData.exchangeRateNumerator,
-      exchangeRateDenominator:
-        parsedBorrowIncentiveRewardPoolData.exchangeRateDenominator,
-      ...calculatedBorrowIncentiveRewardPoolData,
+      borrowIncentivePoolPoints[coinName as SupportBorrowIncentiveRewardCoins] =
+        {
+          symbol,
+          coinName: rewardCoinName,
+          coinType: rewardCoinType,
+          coinDecimal,
+          coinPrice: rewardCoinPrice,
+          points: poolPoint.points,
+          distributedPoint: poolPoint.distributedPoint,
+          weightedAmount: poolPoint.weightedAmount,
+          ...calculatedPoolPoint,
+        };
+    }
+
+    borrowIncentivePools[poolCoinName] = {
+      coinName: poolCoinName,
+      symbol: query.utils.parseSymbol(poolCoinName),
+      coinType: poolCoinType,
+      coinDecimal: poolCoinDecimal,
+      coinPrice: poolCoinPrice,
+      points: borrowIncentivePoolPoints,
     };
   }
 
@@ -153,6 +168,7 @@ export const queryBorrowIncentiveAccounts = async (
     'borrowIncentive.incentiveAccounts'
   );
   const queryTarget = `${queryPkgId}::incentive_account_query::incentive_account_data`;
+
   const txBlock = new SuiKitTxBlock();
   txBlock.moveCall(queryTarget, [incentiveAccountsId, obligationId]);
   const queryResult = await query.suiKit.inspectTxn(txBlock);
@@ -160,7 +176,7 @@ export const queryBorrowIncentiveAccounts = async (
     .parsedJson as BorrowIncentiveAccountsQueryInterface;
 
   const borrowIncentiveAccounts: BorrowIncentiveAccounts = Object.values(
-    borrowIncentiveAccountsQueryData.incentive_states
+    borrowIncentiveAccountsQueryData.pool_records
   ).reduce((accounts, accountData) => {
     const parsedBorrowIncentiveAccount =
       parseOriginBorrowIncentiveAccountData(accountData);
@@ -172,13 +188,7 @@ export const queryBorrowIncentiveAccounts = async (
       borrowIncentiveCoinNames &&
       borrowIncentiveCoinNames.includes(coinName)
     ) {
-      accounts[coinName] = {
-        poolType: poolType,
-        amount: parsedBorrowIncentiveAccount.amount,
-        points: parsedBorrowIncentiveAccount.points,
-        totalPoints: parsedBorrowIncentiveAccount.totalPoints,
-        index: parsedBorrowIncentiveAccount.index,
-      };
+      accounts[coinName] = parsedBorrowIncentiveAccount;
     }
 
     return accounts;

package/src/queries/coreQuery.ts

@@ -310,7 +310,7 @@ export const getMarketPool = async (
       // Get balance sheet.
       const balanceSheetParentId =
         fields.vault.fields.balance_sheets.fields.table.fields.id.id;
-      const balanceSheetDdynamicFieldObjectResponse = await query.suiKit
+      const balanceSheetDynamicFieldObjectResponse = await query.suiKit
         .client()
         .getDynamicFieldObject({
           parentId: balanceSheetParentId,
@@ -321,14 +321,14 @@ export const getMarketPool = async (
             },
           },
         });
-      const balanceSheetDdynamicFieldObject =
-        balanceSheetDdynamicFieldObjectResponse.data;
+      const balanceSheetDynamicFieldObject =
+        balanceSheetDynamicFieldObjectResponse.data;
       if (
-        balanceSheetDdynamicFieldObject &&
-        balanceSheetDdynamicFieldObject.content &&
-        'fields' in balanceSheetDdynamicFieldObject.content
+        balanceSheetDynamicFieldObject &&
+        balanceSheetDynamicFieldObject.content &&
+        'fields' in balanceSheetDynamicFieldObject.content
       ) {
-        const dynamicFields = balanceSheetDdynamicFieldObject.content
+        const dynamicFields = balanceSheetDynamicFieldObject.content
           .fields as any;
         balanceSheet = dynamicFields.value.fields;
       }
@@ -581,7 +581,7 @@ export const getMarketCollateral = async (
 
       // Get risk model.
       const riskModelParentId = fields.risk_models.fields.table.fields.id.id;
-      const riskModelDdynamicFieldObjectResponse = await query.suiKit
+      const riskModelDynamicFieldObjectResponse = await query.suiKit
         .client()
         .getDynamicFieldObject({
           parentId: riskModelParentId,
@@ -592,15 +592,14 @@ export const getMarketCollateral = async (
             },
           },
         });
-      const riskModelDdynamicFieldObject =
-        riskModelDdynamicFieldObjectResponse.data;
+      const riskModelDynamicFieldObject =
+        riskModelDynamicFieldObjectResponse.data;
       if (
-        riskModelDdynamicFieldObject &&
-        riskModelDdynamicFieldObject.content &&
-        'fields' in riskModelDdynamicFieldObject.content
+        riskModelDynamicFieldObject &&
+        riskModelDynamicFieldObject.content &&
+        'fields' in riskModelDynamicFieldObject.content
       ) {
-        const dynamicFields = riskModelDdynamicFieldObject.content
-          .fields as any;
+        const dynamicFields = riskModelDynamicFieldObject.content.fields as any;
         riskModel = dynamicFields.value.fields;
       }
 
@@ -686,7 +685,7 @@ export const getObligations = async (
     query.address.get('core.object') || PROTOCOL_OBJECT_ID;
   const keyObjectsResponse: SuiObjectResponse[] = [];
   let hasNextPage = false;
-  let nextCursor: string | null = null;
+  let nextCursor: string | null | undefined = null;
   do {
     const paginatedKeyObjectsResponse = await query.suiKit
       .client()
@@ -796,7 +795,7 @@ export const getCoinAmounts = async (
   const owner = ownerAddress || query.suiKit.currentAddress();
   const coinObjectsResponse: SuiObjectResponse[] = [];
   let hasNextPage = false;
-  let nextCursor: string | null = null;
+  let nextCursor: string | null | undefined = null;
   do {
     const paginatedCoinObjectsResponse = await query.suiKit
       .client()
@@ -868,7 +867,7 @@ export const getCoinAmount = async (
   const coinType = query.utils.parseCoinType(assetCoinName);
   const coinObjectsResponse: SuiObjectResponse[] = [];
   let hasNextPage = false;
-  let nextCursor: string | null = null;
+  let nextCursor: string | null | undefined = null;
   do {
     const paginatedCoinObjectsResponse = await query.suiKit
       .client()
@@ -931,7 +930,7 @@ export const getMarketCoinAmounts = async (
   const owner = ownerAddress || query.suiKit.currentAddress();
   const marketCoinObjectsResponse: SuiObjectResponse[] = [];
   let hasNextPage = false;
-  let nextCursor: string | null = null;
+  let nextCursor: string | null | undefined = null;
   do {
     const paginatedMarketCoinObjectsResponse = await query.suiKit
       .client()
@@ -1006,7 +1005,7 @@ export const getMarketCoinAmount = async (
   const marketCoinType = query.utils.parseMarketCoinType(marketCoinName);
   const marketCoinObjectsResponse: SuiObjectResponse[] = [];
   let hasNextPage = false;
-  let nextCursor: string | null = null;
+  let nextCursor: string | null | undefined = null;
   do {
     const paginatedMarketCoinObjectsResponse = await query.suiKit
       .client()

package/src/queries/index.ts

@@ -3,3 +3,4 @@ export * from './spoolQuery';
 export * from './borrowIncentiveQuery';
 export * from './priceQuery';
 export * from './portfolioQuery';
+export * from './vescaQuery';