@scallop-io/sui-scallop-sdk 0.47.0-alpha.4 → 0.47.0-alpha.6

package/dist/models/scallopQuery.d.ts

@@ -280,6 +280,7 @@ export declare class ScallopQuery {
      * @return Borrow incentive pools data.
      */
     getBorrowIncentivePools(coinNames?: SupportBorrowIncentiveCoins[], indexer?: boolean): Promise<{
+        usdc?: import("../types").BorrowIncentivePool | undefined;
         weth?: import("../types").BorrowIncentivePool | undefined;
         wusdc?: import("../types").BorrowIncentivePool | undefined;
         wusdt?: import("../types").BorrowIncentivePool | undefined;
@@ -297,6 +298,7 @@ export declare class ScallopQuery {
      * @return Borrow incentive accounts data.
      */
     getBorrowIncentiveAccounts(obligationId: string, coinNames?: SupportBorrowIncentiveCoins[]): Promise<{
+        usdc?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
         weth?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
         wusdc?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
         wusdt?: import("../types").ParsedBorrowIncentiveAccountData | undefined;

package/dist/queries/borrowIncentiveQuery.d.ts

@@ -1,14 +1,21 @@
 import type { ScallopAddress, ScallopQuery, ScallopUtils } from '../models';
-import type { SupportBorrowIncentiveCoins, BorrowIncentivePool } from '../types';
+import type { BorrowIncentivePoolsQueryInterface, SupportBorrowIncentiveCoins, BorrowIncentivePool } from '../types';
 /**
- * Query borrow incentive pools data.
+ * Query borrow incentive pools data using moveCall
+ * @param address
+ * @returns
+ */
+export declare const queryBorrowIncentivePools: (address: ScallopAddress) => Promise<BorrowIncentivePoolsQueryInterface | undefined>;
+/**
+ * Get borrow incentive pools data.
  *
  * @param query - The Scallop query instance.
  * @param borrowIncentiveCoinNames - Specific an array of support borrow incentive coin name.
  * @param indexer - Whether to use indexer.
  * @return Borrow incentive pools data.
  */
-export declare const queryBorrowIncentivePools: (query: ScallopQuery, borrowIncentiveCoinNames?: SupportBorrowIncentiveCoins[], indexer?: boolean) => Promise<{
+export declare const getBorrowIncentivePools: (query: ScallopQuery, borrowIncentiveCoinNames?: SupportBorrowIncentiveCoins[], indexer?: boolean) => Promise<{
+    usdc?: BorrowIncentivePool | undefined;
     weth?: BorrowIncentivePool | undefined;
     wusdc?: BorrowIncentivePool | undefined;
     wusdt?: BorrowIncentivePool | undefined;
@@ -28,6 +35,7 @@ export declare const queryBorrowIncentivePools: (query: ScallopQuery, borrowInce
 export declare const queryBorrowIncentiveAccounts: ({ utils, }: {
     utils: ScallopUtils;
 }, obligationId: string, borrowIncentiveCoinNames?: SupportBorrowIncentiveCoins[]) => Promise<{
+    usdc?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
     weth?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
     wusdc?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
     wusdt?: import("../types").ParsedBorrowIncentiveAccountData | undefined;

package/dist/types/query/borrowIncentive.d.ts

@@ -37,6 +37,7 @@ export type OriginBorrowIncentivePoolPointData = {
     base_weight: string;
     weighted_amount: string;
     last_update: string;
+    created_at: string;
 };
 export type OriginBorrowIncentivePoolData = {
     pool_type: {
@@ -58,6 +59,7 @@ export type ParsedBorrowIncentivePoolPointData = {
     baseWeight: number;
     weightedAmount: number;
     lastUpdate: number;
+    createdAt: number;
 };
 export type ParsedBorrowIncentivePoolData = {
     poolType: string;
@@ -65,7 +67,6 @@ export type ParsedBorrowIncentivePoolData = {
     minStakes: number;
     maxStakes: number;
     staked: number;
-    createdAt: number;
 };
 export type CalculatedBorrowIncentivePoolPointData = {
     baseWeight: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scallop-io/sui-scallop-sdk",
-  "version": "0.47.0-alpha.4",
+  "version": "0.47.0-alpha.6",
   "description": "Typescript sdk for interacting with Scallop contract on SUI",
   "keywords": [
     "sui",

package/src/builders/coreBuilder.ts

@@ -392,7 +392,7 @@ const generateCoreQuickMethod: GenerateCoreQuickMethod = ({
         (await builder.utils.getObligationCoinNames(
           obligationInfo.obligationId
         )) ?? [];
-      const updateCoinNames = [...(obligationCoinNames ?? []), poolCoinName];
+      const updateCoinNames = [...obligationCoinNames, poolCoinName];
       await updateOracles(builder, txBlock, updateCoinNames);
       return txBlock.borrow(
         obligationInfo.obligationId,

package/src/constants/common.ts

@@ -5,14 +5,11 @@ export const SDK_API_BASE_URL = 'https://sdk.api.scallop.io';
 export const IS_VE_SCA_TEST = false;
 export const USE_TEST_ADDRESS = false;
 
-// export const ADDRESSES_ID = '';
 export const ADDRESSES_ID =
   IS_VE_SCA_TEST || USE_TEST_ADDRESS
     ? ('65fb07c39c845425d71d7b18' as const)
     : ('66f8e7ed9bb9e07fdfb86bbb' as const);
 // : ('664dfe22898c36c159e28bc8' as const);
-// : ('6601955b8b0024600a917079' as const);
-// : ('6462a088a7ace142bb6d7e9b' as const);
 
 export const PROTOCOL_OBJECT_ID = IS_VE_SCA_TEST
   ? ('0xc9f859f98ca352a11b97a038c4b4162bee437b8df8caa047990fe9cb03d4f778' as const)
@@ -103,6 +100,7 @@ export const SUPPORT_BORROW_INCENTIVE_POOLS = [
   'vsui',
   'weth',
   'sca',
+  'usdc',
 ] as const;
 
 export const SUPPORT_BORROW_INCENTIVE_REWARDS = ['sui', 'sca'] as const;

package/src/constants/enum.ts

@@ -102,6 +102,7 @@ export const spoolRewardCoins: types.StakeRewardCoins = {
 };
 
 export const borrowIncentiveRewardCoins: types.BorrowIncentiveRewardCoins = {
+  usdc: ['sui', 'sca'],
   sui: ['sui', 'sca'],
   wusdc: ['sui', 'sca'],
   wusdt: ['sui', 'sca'],
@@ -145,7 +146,8 @@ export const voloCoinIds: types.VoloCoinIds = {
 
 // PROD VERSION
 export const sCoinIds: types.SCoinIds = {
-  susdc: '', // TODO: sCoin contract
+  susdc:
+    '0x854950aa624b1df59fe64e630b2ba7c550642e9342267a33061d59fb31582da5::scallop_usdc::SCALLOP_USDC',
   ssui: '0xaafc4f740de0dd0dde642a31148fb94517087052f19afb0f7bed1dc41a50c77b::scallop_sui::SCALLOP_SUI',
   scetus:
     '0xea346ce428f91ab007210443efcea5f5cdbbb3aae7e9affc0ca93f9203c31f0c::scallop_cetus::SCALLOP_CETUS',

package/src/models/scallopQuery.ts

@@ -14,7 +14,6 @@ import {
   getMarketCollateral,
   getSpools,
   getSpool,
-  queryBorrowIncentivePools,
   queryBorrowIncentiveAccounts,
   getCoinAmounts,
   getCoinAmount,
@@ -34,6 +33,7 @@ import {
   getLoyaltyProgramInformations,
   getFlashLoanFees,
   getVeSca,
+  getBorrowIncentivePools,
 } from '../queries';
 import {
   ScallopQueryParams,
@@ -462,7 +462,7 @@ export class ScallopQuery {
     coinNames?: SupportBorrowIncentiveCoins[],
     indexer: boolean = false
   ) {
-    return await queryBorrowIncentivePools(this, coinNames, indexer);
+    return await getBorrowIncentivePools(this, coinNames, indexer);
   }
 
   /**

package/src/models/scallopUtils.ts

@@ -475,13 +475,11 @@ export class ScallopUtils {
    * @param assetCoinNames - Specific an array of support asset coin name.
    * @return  Asset coin price.
    */
-  public async getCoinPrices(assetCoinNames?: SupportAssetCoins[]) {
-    assetCoinNames =
-      assetCoinNames ||
-      ([
-        ...new Set([...SUPPORT_POOLS, ...SUPPORT_COLLATERALS]),
-      ] as SupportAssetCoins[]);
-
+  public async getCoinPrices(
+    assetCoinNames: SupportAssetCoins[] = [
+      ...new Set([...SUPPORT_POOLS, ...SUPPORT_COLLATERALS]),
+    ] as SupportAssetCoins[]
+  ) {
     const coinPrices: CoinPrices = {};
     const existPricesCoinNames: SupportAssetCoins[] = [];
     const lackPricesCoinNames: SupportAssetCoins[] = [];

package/src/queries/borrowIncentiveQuery.ts

@@ -23,14 +23,35 @@ import type {
 import BigNumber from 'bignumber.js';
 
 /**
- * Query borrow incentive pools data.
+ * Query borrow incentive pools data using moveCall
+ * @param address
+ * @returns
+ */
+export const queryBorrowIncentivePools = async (address: ScallopAddress) => {
+  const queryPkgId = address.get('borrowIncentive.query');
+  const incentivePoolsId = address.get('borrowIncentive.incentivePools');
+
+  const queryTarget = `${queryPkgId}::incentive_pools_query::incentive_pools_data`;
+  const args = [incentivePoolsId];
+  const queryResult = await address.cache.queryInspectTxn({
+    queryTarget,
+    args,
+  });
+  const borrowIncentivePoolsQueryData = queryResult?.events[0].parsedJson as
+    | BorrowIncentivePoolsQueryInterface
+    | undefined;
+  return borrowIncentivePoolsQueryData;
+};
+
+/**
+ * Get borrow incentive pools data.
  *
  * @param query - The Scallop query instance.
  * @param borrowIncentiveCoinNames - Specific an array of support borrow incentive coin name.
  * @param indexer - Whether to use indexer.
  * @return Borrow incentive pools data.
  */
-export const queryBorrowIncentivePools = async (
+export const getBorrowIncentivePools = async (
   query: ScallopQuery,
   borrowIncentiveCoinNames: SupportBorrowIncentiveCoins[] = [
     ...SUPPORT_BORROW_INCENTIVE_POOLS,
@@ -39,14 +60,13 @@ export const queryBorrowIncentivePools = async (
 ) => {
   const borrowIncentivePools: BorrowIncentivePools = {};
 
-  const coinPrices = await query.utils.getCoinPrices(
-    [
+  const coinPrices =
+    (await query.utils.getCoinPrices([
       ...new Set([
         ...borrowIncentiveCoinNames,
         ...SUPPORT_BORROW_INCENTIVE_REWARDS,
       ]),
-    ] ?? []
-  );
+    ])) ?? {};
 
   if (indexer) {
     const borrowIncentivePoolsIndexer =
@@ -65,15 +85,9 @@ export const queryBorrowIncentivePools = async (
     return borrowIncentivePools;
   }
 
-  const queryPkgId = query.address.get('borrowIncentive.query');
-  const incentivePoolsId = query.address.get('borrowIncentive.incentivePools');
-
-  const queryTarget = `${queryPkgId}::incentive_pools_query::incentive_pools_data`;
-  const args = [incentivePoolsId];
-  const queryResult = await query.cache.queryInspectTxn({ queryTarget, args });
-  const borrowIncentivePoolsQueryData = queryResult?.events[0].parsedJson as
-    | BorrowIncentivePoolsQueryInterface
-    | undefined;
+  const borrowIncentivePoolsQueryData = await queryBorrowIncentivePools(
+    query.address
+  );
 
   for (const pool of borrowIncentivePoolsQueryData?.incentive_pools ?? []) {
     const borrowIncentivePoolPoints: OptionalKeys<
@@ -167,11 +181,10 @@ export const queryBorrowIncentiveAccounts = async (
     utils: ScallopUtils;
   },
   obligationId: string,
-  borrowIncentiveCoinNames?: SupportBorrowIncentiveCoins[]
-) => {
-  borrowIncentiveCoinNames = borrowIncentiveCoinNames || [
+  borrowIncentiveCoinNames: SupportBorrowIncentiveCoins[] = [
     ...SUPPORT_BORROW_INCENTIVE_POOLS,
-  ];
+  ]
+) => {
   const queryPkgId = utils.address.get('borrowIncentive.query');
   const incentiveAccountsId = utils.address.get(
     'borrowIncentive.incentiveAccounts'

package/src/queries/coreQuery.ts

@@ -233,7 +233,7 @@ export const getMarketPools = async (
   const marketObjectResponse = await query.cache.queryGetObject(marketId, {
     showContent: true,
   });
-  const coinPrices = await query.utils.getCoinPrices(poolCoinNames ?? []);
+  const coinPrices = (await query.utils.getCoinPrices(poolCoinNames)) ?? {};
 
   const marketPools: MarketPools = {};
 
@@ -518,7 +518,8 @@ export const getMarketCollaterals = async (
   indexer: boolean = false
 ) => {
   const marketId = query.address.get('core.market');
-  const coinPrices = await query.utils.getCoinPrices(collateralCoinNames ?? []);
+  const coinPrices =
+    (await query.utils.getCoinPrices(collateralCoinNames)) ?? {};
   const marketCollaterals: MarketCollaterals = {};
 
   if (indexer) {
@@ -845,10 +846,9 @@ export const queryObligation = async (
  */
 export const getCoinAmounts = async (
   query: ScallopQuery,
-  assetCoinNames?: SupportAssetCoins[],
+  assetCoinNames: SupportAssetCoins[] = [...SUPPORT_POOLS],
   ownerAddress?: string
 ) => {
-  assetCoinNames = assetCoinNames || [...SUPPORT_POOLS];
   const owner = ownerAddress || query.suiKit.currentAddress();
   const assetCoins = {} as OptionalKeys<Record<SupportAssetCoins, number>>;
 

package/src/queries/sCoinQuery.ts

@@ -60,10 +60,9 @@ export const getSCoinAmounts = async (
   }: {
     utils: ScallopUtils;
   },
-  sCoinNames?: SupportSCoin[],
+  sCoinNames: SupportSCoin[] = [...SUPPORT_SCOIN],
   ownerAddress?: string
 ) => {
-  sCoinNames = sCoinNames || [...SUPPORT_SCOIN];
   const owner = ownerAddress || utils.suiKit.currentAddress();
   const sCoins = {} as OptionalKeys<Record<SupportSCoin, number>>;
 

package/src/queries/spoolQuery.ts

@@ -42,9 +42,10 @@ export const getSpools = async (
       query.utils.getSpoolRewardCoinName(stakeMarketCoinName);
     return rewardCoinName;
   });
-  const coinPrices = await query.utils.getCoinPrices(
-    [...new Set([...stakeCoinNames, ...rewardCoinNames])] ?? []
-  );
+  const coinPrices =
+    (await query.utils.getCoinPrices([
+      ...new Set([...stakeCoinNames, ...rewardCoinNames]),
+    ])) ?? {};
 
   const marketPools = await query.getMarketPools(stakeCoinNames, indexer);
   const spools: Spools = {};

package/src/types/query/borrowIncentive.ts

@@ -56,6 +56,7 @@ export type OriginBorrowIncentivePoolPointData = {
   base_weight: string;
   weighted_amount: string;
   last_update: string;
+  created_at: string;
 };
 
 export type OriginBorrowIncentivePoolData = {
@@ -79,6 +80,7 @@ export type ParsedBorrowIncentivePoolPointData = {
   baseWeight: number;
   weightedAmount: number;
   lastUpdate: number;
+  createdAt: number;
 };
 
 export type ParsedBorrowIncentivePoolData = {
@@ -92,7 +94,6 @@ export type ParsedBorrowIncentivePoolData = {
   minStakes: number;
   maxStakes: number;
   staked: number;
-  createdAt: number;
 };
 
 export type CalculatedBorrowIncentivePoolPointData = {

package/src/utils/query.ts

@@ -412,6 +412,7 @@ export const parseOriginBorrowIncentivesPoolPointData = (
     baseWeight: Number(originBorrowIncentivePoolPointData.base_weight),
     weightedAmount: Number(originBorrowIncentivePoolPointData.weighted_amount),
     lastUpdate: Number(originBorrowIncentivePoolPointData.last_update),
+    createdAt: Number(originBorrowIncentivePoolPointData.created_at),
   };
 };
 
@@ -429,7 +430,6 @@ export const parseOriginBorrowIncentivePoolData = (
     minStakes: Number(originBorrowIncentivePoolData.min_stakes),
     maxStakes: Number(originBorrowIncentivePoolData.max_stakes),
     staked: Number(originBorrowIncentivePoolData.stakes),
-    createdAt: Number(originBorrowIncentivePoolData.created_at),
     poolPoints: originBorrowIncentivePoolData.points.reduce(
       (acc, point) => {
         const parsed = parseOriginBorrowIncentivesPoolPointData(point);