@scallop-io/sui-scallop-sdk 0.46.63 → 0.47.0-alpha.2

package/dist/models/scallopQuery.d.ts

@@ -51,13 +51,13 @@ export declare class ScallopQuery {
      * @return Market pools data.
      */
     getMarketPools(poolCoinNames?: SupportPoolCoins[], indexer?: boolean): Promise<{
-        eth?: import("../types").MarketPool | undefined;
-        btc?: import("../types").MarketPool | undefined;
-        usdc?: import("../types").MarketPool | undefined;
-        usdt?: import("../types").MarketPool | undefined;
+        weth?: import("../types").MarketPool | undefined;
+        wbtc?: import("../types").MarketPool | undefined;
+        wusdc?: import("../types").MarketPool | undefined;
+        wusdt?: import("../types").MarketPool | undefined;
         sui?: import("../types").MarketPool | undefined;
-        apt?: import("../types").MarketPool | undefined;
-        sol?: import("../types").MarketPool | undefined;
+        wapt?: import("../types").MarketPool | undefined;
+        wsol?: import("../types").MarketPool | undefined;
         cetus?: import("../types").MarketPool | undefined;
         afsui?: import("../types").MarketPool | undefined;
         hasui?: import("../types").MarketPool | undefined;
@@ -84,13 +84,13 @@ export declare class ScallopQuery {
      * @return Market collaterals data.
      */
     getMarketCollaterals(collateralCoinNames?: SupportCollateralCoins[], indexer?: boolean): Promise<{
-        eth?: import("../types").MarketCollateral | undefined;
-        btc?: import("../types").MarketCollateral | undefined;
-        usdc?: import("../types").MarketCollateral | undefined;
-        usdt?: import("../types").MarketCollateral | undefined;
+        weth?: import("../types").MarketCollateral | undefined;
+        wbtc?: import("../types").MarketCollateral | undefined;
+        wusdc?: import("../types").MarketCollateral | undefined;
+        wusdt?: import("../types").MarketCollateral | undefined;
         sui?: import("../types").MarketCollateral | undefined;
-        apt?: import("../types").MarketCollateral | undefined;
-        sol?: import("../types").MarketCollateral | undefined;
+        wapt?: import("../types").MarketCollateral | undefined;
+        wsol?: import("../types").MarketCollateral | undefined;
         cetus?: import("../types").MarketCollateral | undefined;
         afsui?: import("../types").MarketCollateral | undefined;
         hasui?: import("../types").MarketCollateral | undefined;
@@ -173,10 +173,10 @@ export declare class ScallopQuery {
      * @return Spools data.
      */
     getSpools(stakeMarketCoinNames?: SupportStakeMarketCoins[], indexer?: boolean): Promise<{
-        seth?: import("../types").Spool | undefined;
+        sweth?: import("../types").Spool | undefined;
         ssui?: import("../types").Spool | undefined;
-        susdc?: import("../types").Spool | undefined;
-        susdt?: import("../types").Spool | undefined;
+        swusdc?: import("../types").Spool | undefined;
+        swusdt?: import("../types").Spool | undefined;
         scetus?: import("../types").Spool | undefined;
         safsui?: import("../types").Spool | undefined;
         shasui?: import("../types").Spool | undefined;
@@ -216,10 +216,10 @@ export declare class ScallopQuery {
      * @return Stake pools data.
      */
     getStakePools(stakeMarketCoinNames?: SupportStakeMarketCoins[]): Promise<{
-        seth?: import("../types").StakePool | undefined;
+        sweth?: import("../types").StakePool | undefined;
         ssui?: import("../types").StakePool | undefined;
-        susdc?: import("../types").StakePool | undefined;
-        susdt?: import("../types").StakePool | undefined;
+        swusdc?: import("../types").StakePool | undefined;
+        swusdt?: import("../types").StakePool | undefined;
         scetus?: import("../types").StakePool | undefined;
         safsui?: import("../types").StakePool | undefined;
         shasui?: import("../types").StakePool | undefined;
@@ -247,10 +247,10 @@ export declare class ScallopQuery {
      * @return Stake reward pools data.
      */
     getStakeRewardPools(stakeMarketCoinNames?: SupportStakeMarketCoins[]): Promise<{
-        seth?: import("../types").StakeRewardPool | undefined;
+        sweth?: import("../types").StakeRewardPool | undefined;
         ssui?: import("../types").StakeRewardPool | undefined;
-        susdc?: import("../types").StakeRewardPool | undefined;
-        susdt?: import("../types").StakeRewardPool | undefined;
+        swusdc?: import("../types").StakeRewardPool | undefined;
+        swusdt?: import("../types").StakeRewardPool | undefined;
         scetus?: import("../types").StakeRewardPool | undefined;
         safsui?: import("../types").StakeRewardPool | undefined;
         shasui?: import("../types").StakeRewardPool | undefined;
@@ -275,9 +275,9 @@ export declare class ScallopQuery {
      * @return Borrow incentive pools data.
      */
     getBorrowIncentivePools(coinNames?: SupportBorrowIncentiveCoins[], indexer?: boolean): Promise<{
-        eth?: import("../types").BorrowIncentivePool | undefined;
-        usdc?: import("../types").BorrowIncentivePool | undefined;
-        usdt?: import("../types").BorrowIncentivePool | undefined;
+        weth?: import("../types").BorrowIncentivePool | undefined;
+        wusdc?: import("../types").BorrowIncentivePool | undefined;
+        wusdt?: import("../types").BorrowIncentivePool | undefined;
         sui?: import("../types").BorrowIncentivePool | undefined;
         afsui?: import("../types").BorrowIncentivePool | undefined;
         hasui?: import("../types").BorrowIncentivePool | undefined;
@@ -292,9 +292,9 @@ export declare class ScallopQuery {
      * @return Borrow incentive accounts data.
      */
     getBorrowIncentiveAccounts(obligationId: string, coinNames?: SupportBorrowIncentiveCoins[]): Promise<{
-        eth?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
-        usdc?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
-        usdt?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
+        weth?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
+        wusdc?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
+        wusdt?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
         sui?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
         afsui?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
         hasui?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
@@ -310,13 +310,13 @@ export declare class ScallopQuery {
      * @return All lending and spool infomation.
      */
     getLendings(poolCoinNames?: SupportPoolCoins[], ownerAddress?: string, indexer?: boolean): Promise<{
-        eth?: import("../types").Lending | undefined;
-        btc?: import("../types").Lending | undefined;
-        usdc?: import("../types").Lending | undefined;
-        usdt?: import("../types").Lending | undefined;
+        weth?: import("../types").Lending | undefined;
+        wbtc?: import("../types").Lending | undefined;
+        wusdc?: import("../types").Lending | undefined;
+        wusdt?: import("../types").Lending | undefined;
         sui?: import("../types").Lending | undefined;
-        apt?: import("../types").Lending | undefined;
-        sol?: import("../types").Lending | undefined;
+        wapt?: import("../types").Lending | undefined;
+        wsol?: import("../types").Lending | undefined;
         cetus?: import("../types").Lending | undefined;
         afsui?: import("../types").Lending | undefined;
         hasui?: import("../types").Lending | undefined;
@@ -421,7 +421,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<"seth" | "ssui" | "susdc" | "susdt" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "ssol" | "sbtc", number>>>;
+    getSCoinAmounts(sCoinNames?: SupportSCoin[], ownerAddress?: string): Promise<import("../types").OptionalKeys<Record<"sweth" | "ssui" | "swusdc" | "swusdt" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "swsol" | "swbtc", number>>>;
     /**
      * Get sCoin amount.
      *
@@ -436,7 +436,7 @@ export declare class ScallopQuery {
      * @returns
      */
     getSCoinSwapRate(fromSCoin: SupportSCoin, toSCoin: SupportSCoin): Promise<number>;
-    getFlashLoanFees(assetCoinNames?: SupportAssetCoins[]): Promise<Record<"eth" | "btc" | "usdc" | "usdt" | "sui" | "apt" | "sol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca", number>>;
+    getFlashLoanFees(assetCoinNames?: SupportAssetCoins[]): Promise<Record<"weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca", number>>;
     /**
      * Get supply limit of supply pool
      */

package/dist/queries/borrowIncentiveQuery.d.ts

@@ -9,9 +9,9 @@ import type { SupportBorrowIncentiveCoins } from '../types';
  * @return Borrow incentive pools data.
  */
 export declare const queryBorrowIncentivePools: (query: ScallopQuery, borrowIncentiveCoinNames?: SupportBorrowIncentiveCoins[], indexer?: boolean) => Promise<{
-    eth?: import("../types").BorrowIncentivePool | undefined;
-    usdc?: import("../types").BorrowIncentivePool | undefined;
-    usdt?: import("../types").BorrowIncentivePool | undefined;
+    weth?: import("../types").BorrowIncentivePool | undefined;
+    wusdc?: import("../types").BorrowIncentivePool | undefined;
+    wusdt?: import("../types").BorrowIncentivePool | undefined;
     sui?: import("../types").BorrowIncentivePool | undefined;
     afsui?: import("../types").BorrowIncentivePool | undefined;
     hasui?: import("../types").BorrowIncentivePool | undefined;
@@ -28,9 +28,9 @@ export declare const queryBorrowIncentivePools: (query: ScallopQuery, borrowInce
 export declare const queryBorrowIncentiveAccounts: ({ utils, }: {
     utils: ScallopUtils;
 }, obligationId: string, borrowIncentiveCoinNames?: SupportBorrowIncentiveCoins[]) => Promise<{
-    eth?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
-    usdc?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
-    usdt?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
+    weth?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
+    wusdc?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
+    wusdt?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
     sui?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
     afsui?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
     hasui?: import("../types").ParsedBorrowIncentiveAccountData | undefined;

package/dist/queries/coreQuery.d.ts

@@ -26,13 +26,13 @@ export declare const queryMarket: (query: ScallopQuery, indexer?: boolean) => Pr
  * @return Market pools data.
  */
 export declare const getMarketPools: (query: ScallopQuery, poolCoinNames?: SupportPoolCoins[], indexer?: boolean) => Promise<{
-    eth?: MarketPool | undefined;
-    btc?: MarketPool | undefined;
-    usdc?: MarketPool | undefined;
-    usdt?: MarketPool | undefined;
+    weth?: MarketPool | undefined;
+    wbtc?: MarketPool | undefined;
+    wusdc?: MarketPool | undefined;
+    wusdt?: MarketPool | undefined;
     sui?: MarketPool | undefined;
-    apt?: MarketPool | undefined;
-    sol?: MarketPool | undefined;
+    wapt?: MarketPool | undefined;
+    wsol?: MarketPool | undefined;
     cetus?: MarketPool | undefined;
     afsui?: MarketPool | undefined;
     hasui?: MarketPool | undefined;
@@ -63,13 +63,13 @@ export declare const getMarketPool: (query: ScallopQuery, poolCoinName: SupportP
  * @return Market collaterals data.
  */
 export declare const getMarketCollaterals: (query: ScallopQuery, collateralCoinNames?: SupportCollateralCoins[], indexer?: boolean) => Promise<{
-    eth?: MarketCollateral | undefined;
-    btc?: MarketCollateral | undefined;
-    usdc?: MarketCollateral | undefined;
-    usdt?: MarketCollateral | undefined;
+    weth?: MarketCollateral | undefined;
+    wbtc?: MarketCollateral | undefined;
+    wusdc?: MarketCollateral | undefined;
+    wusdt?: MarketCollateral | undefined;
     sui?: MarketCollateral | undefined;
-    apt?: MarketCollateral | undefined;
-    sol?: MarketCollateral | undefined;
+    wapt?: MarketCollateral | undefined;
+    wsol?: MarketCollateral | undefined;
     cetus?: MarketCollateral | undefined;
     afsui?: MarketCollateral | undefined;
     hasui?: MarketCollateral | undefined;
@@ -101,10 +101,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,13 +10,13 @@ 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<{
-    eth?: Lending | undefined;
-    btc?: Lending | undefined;
-    usdc?: Lending | undefined;
-    usdt?: Lending | undefined;
+    weth?: Lending | undefined;
+    wbtc?: Lending | undefined;
+    wusdc?: Lending | undefined;
+    wusdt?: Lending | undefined;
     sui?: Lending | undefined;
-    apt?: Lending | undefined;
-    sol?: Lending | undefined;
+    wapt?: Lending | undefined;
+    wsol?: Lending | undefined;
     cetus?: Lending | undefined;
     afsui?: Lending | undefined;
     hasui?: 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<"seth" | "ssui" | "susdc" | "susdt" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "ssol" | "sbtc", number>>>;
+}, sCoinNames?: SupportSCoin[], ownerAddress?: string) => Promise<OptionalKeys<Record<"sweth" | "ssui" | "swusdc" | "swusdt" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "swsol" | "swbtc", number>>>;
 /**
  * Query owned sCoin amount.
  *

package/dist/queries/spoolQuery.d.ts

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

package/dist/types/constant/enum.d.ts

@@ -34,7 +34,7 @@ export type SCoinConverterTreasury = {
 };
 type PickFromUnion<T, K extends string> = K extends T ? K : never;
 export type WormholeCoinIds = {
-    [key in PickFromUnion<SupportAssetCoins, 'eth' | 'btc' | 'usdc' | 'usdt' | 'apt' | 'sol'>]: string;
+    [key in PickFromUnion<SupportAssetCoins, 'weth' | 'wbtc' | 'wusdc' | 'wusdt' | 'wapt' | 'wsol'>]: string;
 };
 export type VoloCoinIds = {
     [key in PickFromUnion<SupportAssetCoins, 'vsui'>]: string;

package/dist/utils/query.d.ts

@@ -41,7 +41,7 @@ export declare const parseOriginBorrowIncentivesPoolPointData: (originBorrowInce
  * @return Parsed borrow incentive pool data
  */
 export declare const parseOriginBorrowIncentivePoolData: (originBorrowIncentivePoolData: OriginBorrowIncentivePoolData) => ParsedBorrowIncentivePoolData;
-export declare const calculateBorrowIncentivePoolPointData: (parsedBorrowIncentivePoolData: ParsedBorrowIncentivePoolData, parsedBorrowIncentivePoolPointData: ParsedBorrowIncentivePoolPointData, rewardCoinPrice: number, rewardCoinDecimal: number, poolCoinPrice: number, poolCoinDecimal: number) => CalculatedBorrowIncentivePoolPointData;
+export declare const calculateBorrowIncentivePoolPointData: (parsedBorrowIncentivePoolPointData: ParsedBorrowIncentivePoolPointData, rewardCoinPrice: number, rewardCoinDecimal: number, poolCoinPrice: number, poolCoinDecimal: number) => CalculatedBorrowIncentivePoolPointData;
 export declare const parseOriginBorrowIncentiveAccountPoolPointData: (originBorrowIncentiveAccountPoolPointData: OriginBorrowIncentiveAccountPoolData) => ParsedBorrowIncentiveAccountPoolData;
 /**
  *  Parse origin borrow incentive account data to a more readable format.

package/package.json

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

package/src/builders/oracle.ts

@@ -175,6 +175,7 @@ const updatePrice = (
       coinType
     );
   }
+
   confirmPriceUpdateRequest(
     txBlock,
     xOraclePackageId,
@@ -231,6 +232,7 @@ const confirmPriceUpdateRequest = (
 /**
  * Construct a transaction block for update supra price.
  *
+ * @param type - The type of price rule.
  * @param txBlock - The transaction block.
  * @param packageId - The supra package id.
  * @param request - The result of the request.
@@ -257,6 +259,7 @@ const updateSupraPrice = (
 /**
  * Construct a transaction block for update switchboard price.
  *
+ * @param type - The type of price rule.
  * @param txBlock - The transaction block.
  * @param packageId - The switchboard package id.
  * @param request - The result of the request.
@@ -283,6 +286,7 @@ const updateSwitchboardPrice = (
 /**
  * Construct a transaction block for update pyth price.
  *
+ * @param type - The type of price rule.
  * @param txBlock - The transaction block.
  * @param packageId - The pyth package id.
  * @param request - The result of the request.

package/src/constants/common.ts

@@ -9,7 +9,8 @@ export const USE_TEST_ADDRESS = false;
 export const ADDRESSES_ID =
   IS_VE_SCA_TEST || USE_TEST_ADDRESS
     ? ('65fb07c39c845425d71d7b18' as const)
-    : ('664dfe22898c36c159e28bc8' as const);
+    : ('66f8e7ed9bb9e07fdfb86bbb' as const);
+// : ('664dfe22898c36c159e28bc8' as const);
 // : ('6601955b8b0024600a917079' as const);
 // : ('6462a088a7ace142bb6d7e9b' as const);
 
@@ -33,13 +34,13 @@ export const OLD_BORROW_INCENTIVE_PROTOCOL_ID =
   '0xc63072e7f5f4983a2efaf5bdba1480d5e7d74d57948e1c7cc436f8e22cbeb410' as const;
 
 export const SUPPORT_POOLS = [
-  'eth',
-  'btc',
-  'usdc',
-  'usdt',
+  'weth',
+  'wbtc',
+  'wusdc',
+  'wusdt',
   'sui',
-  'apt',
-  'sol',
+  'wapt',
+  'wsol',
   'cetus',
   'afsui',
   'hasui',
@@ -48,13 +49,13 @@ export const SUPPORT_POOLS = [
 ] as const;
 
 export const SUPPORT_COLLATERALS = [
-  'eth',
-  'btc',
-  'usdc',
-  'usdt',
+  'weth',
+  'wbtc',
+  'wusdc',
+  'wusdt',
   'sui',
-  'apt',
-  'sol',
+  'wapt',
+  'wsol',
   'cetus',
   'afsui',
   'hasui',
@@ -63,10 +64,10 @@ export const SUPPORT_COLLATERALS = [
 ] as const;
 
 export const SUPPORT_SPOOLS = [
-  'seth',
+  'sweth',
   'ssui',
-  'susdc',
-  'susdt',
+  'swusdc',
+  'swusdt',
   'scetus',
   'safsui',
   'shasui',
@@ -75,28 +76,28 @@ export const SUPPORT_SPOOLS = [
 
 export const SUPPORT_SCOIN = [
   'ssui',
-  'susdc',
-  'susdt',
+  'swusdc',
+  'swusdt',
   'safsui',
   'shasui',
   'svsui',
-  'seth',
+  'sweth',
   'ssca',
   'scetus',
-  'ssol',
-  'sbtc',
+  'swsol',
+  'swbtc',
 ] as const;
 
 export const SUPPORT_SPOOLS_REWARDS = ['sui'] as const;
 
 export const SUPPORT_BORROW_INCENTIVE_POOLS = [
   'sui',
-  'usdc',
-  'usdt',
+  'wusdc',
+  'wusdt',
   'afsui',
   'hasui',
   'vsui',
-  'eth',
+  'weth',
   'sca',
 ] as const;