@scallop-io/sui-scallop-sdk 0.47.0-alpha.1 → 0.47.0-alpha.3

package/dist/models/scallopQuery.d.ts

@@ -51,6 +51,7 @@ export declare class ScallopQuery {
      * @return Market pools data.
      */
     getMarketPools(poolCoinNames?: SupportPoolCoins[], indexer?: boolean): Promise<{
+        usdc?: import("../types").MarketPool | undefined;
         weth?: import("../types").MarketPool | undefined;
         wbtc?: import("../types").MarketPool | undefined;
         wusdc?: import("../types").MarketPool | undefined;
@@ -84,6 +85,7 @@ export declare class ScallopQuery {
      * @return Market collaterals data.
      */
     getMarketCollaterals(collateralCoinNames?: SupportCollateralCoins[], indexer?: boolean): Promise<{
+        usdc?: import("../types").MarketCollateral | undefined;
         weth?: import("../types").MarketCollateral | undefined;
         wbtc?: import("../types").MarketCollateral | undefined;
         wusdc?: import("../types").MarketCollateral | undefined;
@@ -173,6 +175,7 @@ export declare class ScallopQuery {
      * @return Spools data.
      */
     getSpools(stakeMarketCoinNames?: SupportStakeMarketCoins[], indexer?: boolean): Promise<{
+        susdc?: import("../types").Spool | undefined;
         sweth?: import("../types").Spool | undefined;
         ssui?: import("../types").Spool | undefined;
         swusdc?: import("../types").Spool | undefined;
@@ -216,6 +219,7 @@ export declare class ScallopQuery {
      * @return Stake pools data.
      */
     getStakePools(stakeMarketCoinNames?: SupportStakeMarketCoins[]): Promise<{
+        susdc?: import("../types").StakePool | undefined;
         sweth?: import("../types").StakePool | undefined;
         ssui?: import("../types").StakePool | undefined;
         swusdc?: import("../types").StakePool | undefined;
@@ -247,6 +251,7 @@ export declare class ScallopQuery {
      * @return Stake reward pools data.
      */
     getStakeRewardPools(stakeMarketCoinNames?: SupportStakeMarketCoins[]): Promise<{
+        susdc?: import("../types").StakeRewardPool | undefined;
         sweth?: import("../types").StakeRewardPool | undefined;
         ssui?: import("../types").StakeRewardPool | undefined;
         swusdc?: import("../types").StakeRewardPool | undefined;
@@ -310,6 +315,7 @@ export declare class ScallopQuery {
      * @return All lending and spool infomation.
      */
     getLendings(poolCoinNames?: SupportPoolCoins[], ownerAddress?: string, indexer?: boolean): Promise<{
+        usdc?: import("../types").Lending | undefined;
         weth?: import("../types").Lending | undefined;
         wbtc?: import("../types").Lending | undefined;
         wusdc?: import("../types").Lending | undefined;
@@ -421,7 +427,7 @@ export declare class ScallopQuery {
      * @param ownerAddress - The owner address.
      * @return All market sCoin amounts.
      */
-    getSCoinAmounts(sCoinNames?: SupportSCoin[], ownerAddress?: string): Promise<import("../types").OptionalKeys<Record<"sweth" | "ssui" | "swusdc" | "swusdt" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "swsol" | "swbtc", number>>>;
+    getSCoinAmounts(sCoinNames?: SupportSCoin[], ownerAddress?: string): Promise<import("../types").OptionalKeys<Record<"susdc" | "sweth" | "ssui" | "swusdc" | "swusdt" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "swsol" | "swbtc", number>>>;
     /**
      * Get sCoin amount.
      *
@@ -436,7 +442,7 @@ export declare class ScallopQuery {
      * @returns
      */
     getSCoinSwapRate(fromSCoin: SupportSCoin, toSCoin: SupportSCoin): Promise<number>;
-    getFlashLoanFees(assetCoinNames?: SupportAssetCoins[]): Promise<Record<"weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca", number>>;
+    getFlashLoanFees(assetCoinNames?: SupportAssetCoins[]): Promise<Record<"usdc" | "weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca", number>>;
     /**
      * Get supply limit of supply pool
      */

package/dist/queries/coreQuery.d.ts

@@ -26,6 +26,7 @@ export declare const queryMarket: (query: ScallopQuery, indexer?: boolean) => Pr
  * @return Market pools data.
  */
 export declare const getMarketPools: (query: ScallopQuery, poolCoinNames?: SupportPoolCoins[], indexer?: boolean) => Promise<{
+    usdc?: MarketPool | undefined;
     weth?: MarketPool | undefined;
     wbtc?: MarketPool | undefined;
     wusdc?: MarketPool | undefined;
@@ -63,6 +64,7 @@ export declare const getMarketPool: (query: ScallopQuery, poolCoinName: SupportP
  * @return Market collaterals data.
  */
 export declare const getMarketCollaterals: (query: ScallopQuery, collateralCoinNames?: SupportCollateralCoins[], indexer?: boolean) => Promise<{
+    usdc?: MarketCollateral | undefined;
     weth?: MarketCollateral | undefined;
     wbtc?: MarketCollateral | undefined;
     wusdc?: MarketCollateral | undefined;
@@ -101,10 +103,10 @@ export declare const getObligations: ({ address, }: {
  * Query obligation locked status.
  *
  * @param query - The Scallop query instance.
- * @param obligationId - The obligation id.
+ * @param obligation - The obligation id or the obligation object.
  * @return Obligation locked status.
  */
-export declare const getObligationLocked: (cache: ScallopCache, obligationId: string) => Promise<boolean>;
+export declare const getObligationLocked: (cache: ScallopCache, obligation: string | SuiObjectData) => Promise<boolean>;
 /**
  * Query obligation data.
  *

package/dist/queries/portfolioQuery.d.ts

@@ -10,6 +10,7 @@ import type { Market, SupportPoolCoins, MarketPool, Spool, StakeAccount, Lending
  * @return User lending infomation for specific pools.
  */
 export declare const getLendings: (query: ScallopQuery, poolCoinNames?: SupportPoolCoins[], ownerAddress?: string, indexer?: boolean) => Promise<{
+    usdc?: Lending | undefined;
     weth?: Lending | undefined;
     wbtc?: Lending | undefined;
     wusdc?: Lending | undefined;

package/dist/queries/sCoinQuery.d.ts

@@ -19,7 +19,7 @@ export declare const getSCoinTotalSupply: ({ utils, }: {
  */
 export declare const getSCoinAmounts: ({ utils, }: {
     utils: ScallopUtils;
-}, sCoinNames?: SupportSCoin[], ownerAddress?: string) => Promise<OptionalKeys<Record<"sweth" | "ssui" | "swusdc" | "swusdt" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "swsol" | "swbtc", number>>>;
+}, sCoinNames?: SupportSCoin[], ownerAddress?: string) => Promise<OptionalKeys<Record<"susdc" | "sweth" | "ssui" | "swusdc" | "swusdt" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "swsol" | "swbtc", number>>>;
 /**
  * Query owned sCoin amount.
  *

package/dist/queries/spoolQuery.d.ts

@@ -9,6 +9,7 @@ import type { MarketPool, Spool, StakePool, StakeRewardPool, StakeAccounts, Supp
  * @return Spools data.
  */
 export declare const getSpools: (query: ScallopQuery, stakeMarketCoinNames?: SupportStakeMarketCoins[], indexer?: boolean) => Promise<{
+    susdc?: Spool | undefined;
     sweth?: Spool | undefined;
     ssui?: Spool | undefined;
     swusdc?: Spool | undefined;

package/package.json

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

package/src/constants/common.ts

@@ -34,6 +34,7 @@ export const OLD_BORROW_INCENTIVE_PROTOCOL_ID =
   '0xc63072e7f5f4983a2efaf5bdba1480d5e7d74d57948e1c7cc436f8e22cbeb410' as const;
 
 export const SUPPORT_POOLS = [
+  'usdc', // native USDC
   'weth',
   'wbtc',
   'wusdc',
@@ -49,6 +50,7 @@ export const SUPPORT_POOLS = [
 ] as const;
 
 export const SUPPORT_COLLATERALS = [
+  'usdc',
   'weth',
   'wbtc',
   'wusdc',
@@ -64,6 +66,7 @@ export const SUPPORT_COLLATERALS = [
 ] as const;
 
 export const SUPPORT_SPOOLS = [
+  'susdc',
   'sweth',
   'ssui',
   'swusdc',
@@ -75,6 +78,7 @@ export const SUPPORT_SPOOLS = [
 ] as const;
 
 export const SUPPORT_SCOIN = [
+  'susdc',
   'ssui',
   'swusdc',
   'swusdt',

package/src/constants/enum.ts

@@ -2,6 +2,7 @@ import type * as types from '../types';
 import { IS_VE_SCA_TEST } from './common';
 
 export const coinDecimals: types.SupportCoinDecimals = {
+  usdc: 6,
   weth: 8,
   wbtc: 8,
   wusdc: 6,
@@ -14,6 +15,7 @@ export const coinDecimals: types.SupportCoinDecimals = {
   hasui: 9,
   vsui: 9,
   sca: 9,
+  susdc: 6,
   sweth: 8,
   swbtc: 8,
   swusdc: 6,
@@ -29,6 +31,7 @@ export const coinDecimals: types.SupportCoinDecimals = {
 };
 
 export const assetCoins: types.AssetCoins = {
+  usdc: 'usdc',
   weth: 'weth',
   wbtc: 'wbtc',
   wusdc: 'wusdc',
@@ -44,6 +47,7 @@ export const assetCoins: types.AssetCoins = {
 };
 
 export const marketCoins: types.MarketCoins = {
+  susdc: 'susdc',
   sweth: 'sweth',
   swbtc: 'swbtc',
   swusdc: 'swusdc',
@@ -59,6 +63,7 @@ export const marketCoins: types.MarketCoins = {
 };
 
 export const sCoins: types.SCoins = {
+  susdc: 'susdc',
   sweth: 'sweth',
   swusdc: 'swusdc',
   swusdt: 'swusdt',
@@ -73,6 +78,7 @@ export const sCoins: types.SCoins = {
 };
 
 export const stakeMarketCoins: types.StakeMarketCoins = {
+  susdc: 'susdc',
   sweth: 'sweth',
   ssui: 'ssui',
   swusdc: 'swusdc',
@@ -92,6 +98,7 @@ export const spoolRewardCoins: types.StakeRewardCoins = {
   safsui: 'sui',
   shasui: 'sui',
   svsui: 'sui',
+  susdc: 'sui',
 };
 
 export const borrowIncentiveRewardCoins: types.BorrowIncentiveRewardCoins = {
@@ -106,6 +113,7 @@ export const borrowIncentiveRewardCoins: types.BorrowIncentiveRewardCoins = {
 };
 
 export const coinIds: types.AssetCoinIds = {
+  usdc: '0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7',
   sui: '0x0000000000000000000000000000000000000000000000000000000000000002',
   weth: '0xaf8cd5edc19c4512f4259f0bee101a40d41ebed738ade5874359610ef8eeced5',
   wbtc: '0x027792d9fed7f9844eb4839566001bb6f6cb4804f66aa2da6fe1ee242d896881',
@@ -137,6 +145,7 @@ export const voloCoinIds: types.VoloCoinIds = {
 
 // PROD VERSION
 export const sCoinIds: types.SCoinIds = {
+  susdc: '', // TODO: sCoin contract
   ssui: '0xaafc4f740de0dd0dde642a31148fb94517087052f19afb0f7bed1dc41a50c77b::scallop_sui::SCALLOP_SUI',
   scetus:
     '0xea346ce428f91ab007210443efcea5f5cdbbb3aae7e9affc0ca93f9203c31f0c::scallop_cetus::SCALLOP_CETUS',

package/src/models/scallopClient.ts

@@ -817,7 +817,7 @@ export class ScallopClient {
       await this.utils.mergeSimilarCoins(
         txBlock,
         coin,
-        this.utils.parseCoinType(this.utils.parseCoinName(stakeCoinName)),
+        this.utils.parseCoinType(stakeCoinName),
         requireSender(txBlock)
       );
 

package/src/models/scallopIndexer.ts

@@ -72,7 +72,7 @@ export class ScallopIndexer {
         return await this._requestClient.get<{
           pools: MarketPool[];
           collaterals: MarketCollateral[];
-        }>(`/api/market`);
+        }>(`/api/market/migrate`);
       },
     });
 
@@ -149,7 +149,7 @@ export class ScallopIndexer {
       queryFn: async () => {
         return await this._requestClient.get<{
           spools: Spool[];
-        }>(`/api/spools`);
+        }>(`/api/spools/migrate`);
       },
     });
 
@@ -187,7 +187,7 @@ export class ScallopIndexer {
       queryFn: async () => {
         return await this._requestClient.get<{
           borrowIncentivePools: BorrowIncentivePool[];
-        }>(`/api/borrowIncentivePools`);
+        }>(`/api/borrowIncentivePools/migrate`);
       },
     });
 

package/src/queries/coreQuery.ts

@@ -768,24 +768,29 @@ export const getObligations = async (
  * Query obligation locked status.
  *
  * @param query - The Scallop query instance.
- * @param obligationId - The obligation id.
+ * @param obligation - The obligation id or the obligation object.
  * @return Obligation locked status.
  */
 export const getObligationLocked = async (
   cache: ScallopCache,
-  obligationId: string
+  obligation: string | SuiObjectData
 ) => {
-  const obligationObjectResponse = await cache.queryGetObject(obligationId, {
-    showContent: true,
-  });
+  const obligationObjectResponse =
+    typeof obligation === 'string'
+      ? (
+          await cache.queryGetObject(obligation, {
+            showContent: true,
+          })
+        )?.data
+      : obligation;
   let obligationLocked = false;
   if (
-    obligationObjectResponse?.data &&
-    obligationObjectResponse?.data?.content?.dataType === 'moveObject' &&
-    'lock_key' in obligationObjectResponse.data.content.fields
+    obligationObjectResponse &&
+    obligationObjectResponse?.content?.dataType === 'moveObject' &&
+    'lock_key' in obligationObjectResponse.content.fields
   ) {
     obligationLocked = Boolean(
-      obligationObjectResponse.data.content.fields.lock_key
+      obligationObjectResponse.content.fields.lock_key
     );
   }
 

package/src/queries/spoolQuery.ts

@@ -271,6 +271,7 @@ export const getStakeAccounts = async (
   } while (hasNextPage);
 
   const stakeAccounts: StakeAccounts = {
+    susdc: [],
     sweth: [],
     ssui: [],
     swusdc: [],