@scallop-io/sui-scallop-sdk 1.3.41 → 1.4.0

package/dist/models/scallopQuery.d.ts

@@ -38,8 +38,9 @@ export declare class ScallopQuery {
      * @param indexer - Whether to use indexer.
      * @return Market data.
      */
-    queryMarket(indexer?: boolean, args?: {
-        coinPrices: CoinPrices;
+    queryMarket(args?: {
+        coinPrices?: CoinPrices;
+        indexer?: boolean;
     }): Promise<import("../types").Market>;
     /**
      * Get market pools.
@@ -52,8 +53,9 @@ export declare class ScallopQuery {
      * @param indexer - Whether to use indexer.
      * @return Market pools data.
      */
-    getMarketPools(poolCoinNames?: SupportPoolCoins[], indexer?: boolean, args?: {
+    getMarketPools(poolCoinNames?: SupportPoolCoins[], args?: {
         coinPrices?: CoinPrices;
+        indexer?: boolean;
     }): Promise<{
         usdc?: MarketPool | undefined;
         sbeth?: MarketPool | undefined;
@@ -79,9 +81,10 @@ export declare class ScallopQuery {
      * @param indexer - Whether to use indexer.
      * @return Market pool data.
      */
-    getMarketPool(poolCoinName: SupportPoolCoins, indexer?: boolean, args?: {
+    getMarketPool(poolCoinName: SupportPoolCoins, args?: {
         marketObject?: SuiObjectData | null;
         coinPrice?: number;
+        indexer?: boolean;
     }): Promise<MarketPool | undefined>;
     /**
      * Get market collaterals.
@@ -94,7 +97,9 @@ export declare class ScallopQuery {
      * @param indexer - Whether to use indexer.
      * @return Market collaterals data.
      */
-    getMarketCollaterals(collateralCoinNames?: SupportCollateralCoins[], indexer?: boolean): Promise<{
+    getMarketCollaterals(collateralCoinNames?: SupportCollateralCoins[], args?: {
+        indexer?: boolean;
+    }): Promise<{
         usdc?: import("../types").MarketCollateral | undefined;
         sbeth?: import("../types").MarketCollateral | undefined;
         weth?: import("../types").MarketCollateral | undefined;
@@ -117,7 +122,9 @@ export declare class ScallopQuery {
      * @param indexer - Whether to use indexer.
      * @return Market collateral data.
      */
-    getMarketCollateral(collateralCoinName: SupportCollateralCoins, indexer?: boolean): Promise<import("../types").MarketCollateral | undefined>;
+    getMarketCollateral(collateralCoinName: SupportCollateralCoins, args?: {
+        indexer?: boolean;
+    }): Promise<import("../types").MarketCollateral | undefined>;
     /**
      * Get obligations data.
      *
@@ -185,9 +192,10 @@ export declare class ScallopQuery {
      * @param indexer - Whether to use indexer.
      * @return Spools data.
      */
-    getSpools(stakeMarketCoinNames?: SupportStakeMarketCoins[], indexer?: boolean, args?: {
+    getSpools(stakeMarketCoinNames?: SupportStakeMarketCoins[], args?: {
         marketPools?: MarketPools;
         coinPrices?: CoinPrices;
+        indexer?: boolean;
     }): Promise<{
         susdc?: import("../types").Spool | undefined;
         sweth?: import("../types").Spool | undefined;
@@ -206,9 +214,10 @@ export declare class ScallopQuery {
      * @param indexer - Whether to use indexer.
      * @return Spool data.
      */
-    getSpool(stakeMarketCoinName: SupportStakeMarketCoins, indexer?: boolean, args?: {
+    getSpool(stakeMarketCoinName: SupportStakeMarketCoins, args?: {
         marketPool?: MarketPool;
         coinPrices?: CoinPrices;
+        indexer?: boolean;
     }): Promise<import("../types").Spool | undefined>;
     /**
      * Get stake accounts data for all stake pools (spools).
@@ -296,8 +305,9 @@ export declare class ScallopQuery {
      * @param indexer - Whether to use indexer.
      * @return Borrow incentive pools data.
      */
-    getBorrowIncentivePools(coinNames?: SupportBorrowIncentiveCoins[], indexer?: boolean, args?: {
+    getBorrowIncentivePools(coinNames?: SupportBorrowIncentiveCoins[], args?: {
         coinPrices: CoinPrices;
+        indexer?: boolean;
     }): Promise<{
         usdc?: import("../types").BorrowIncentivePool | undefined;
         sbeth?: import("../types").BorrowIncentivePool | undefined;
@@ -337,7 +347,9 @@ export declare class ScallopQuery {
      * @param indexer - Whether to use indexer.
      * @return All lending and spool infomation.
      */
-    getLendings(poolCoinNames?: SupportPoolCoins[], ownerAddress?: string, indexer?: boolean): Promise<{
+    getLendings(poolCoinNames?: SupportPoolCoins[], ownerAddress?: string, args?: {
+        indexer?: boolean;
+    }): Promise<{
         usdc?: import("../types").Lending | undefined;
         sbeth?: import("../types").Lending | undefined;
         weth?: import("../types").Lending | undefined;
@@ -363,7 +375,9 @@ export declare class ScallopQuery {
      * @param indexer - Whether to use indexer.
      * @return Lending pool data.
      */
-    getLending(poolCoinName: SupportPoolCoins, ownerAddress?: string, indexer?: boolean): Promise<import("../types").Lending>;
+    getLending(poolCoinName: SupportPoolCoins, ownerAddress?: string, args?: {
+        indexer?: boolean;
+    }): Promise<import("../types").Lending>;
     /**
      * Get user all obligation accounts information.
      *
@@ -374,7 +388,9 @@ export declare class ScallopQuery {
      * @param indexer - Whether to use indexer.
      * @return All obligation accounts information.
      */
-    getObligationAccounts(ownerAddress?: string, indexer?: boolean): Promise<{
+    getObligationAccounts(ownerAddress?: string, args?: {
+        indexer: boolean;
+    }): Promise<{
         [x: string]: import("../types").ObligationAccount | undefined;
     }>;
     /**
@@ -388,7 +404,9 @@ export declare class ScallopQuery {
      * @param indexer - Whether to use indexer.
      * @return Borrowing and collateral information.
      */
-    getObligationAccount(obligationId: string, ownerAddress?: string, indexer?: boolean): Promise<import("../types").ObligationAccount>;
+    getObligationAccount(obligationId: string, ownerAddress?: string, args?: {
+        indexer?: boolean;
+    }): Promise<import("../types").ObligationAccount>;
     /**
      * Get total value locked.
      *
@@ -398,7 +416,9 @@ export declare class ScallopQuery {
      *
      * @return Total value locked.
      */
-    getTvl(indexer?: boolean): Promise<import("../types").TotalValueLocked>;
+    getTvl(args?: {
+        indexer?: boolean;
+    }): Promise<import("../types").TotalValueLocked>;
     /**
      * Get veSca data.
      * @param veScaKey

package/package.json

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

package/src/constants/tokenBucket.ts

@@ -1,2 +1,2 @@
 export const DEFAULT_TOKENS_PER_INTERVAL = 50;
-export const DEFAULT_INTERVAL_IN_MS = 300;
+export const DEFAULT_INTERVAL_IN_MS = 100;

package/src/models/scallopQuery.ts

@@ -191,11 +191,11 @@ export class ScallopQuery {
    * @param indexer - Whether to use indexer.
    * @return Market data.
    */
-  public async queryMarket(
-    indexer: boolean = false,
-    args?: { coinPrices: CoinPrices }
-  ) {
-    return await queryMarket(this, indexer, args?.coinPrices);
+  public async queryMarket(args?: {
+    coinPrices?: CoinPrices;
+    indexer?: boolean;
+  }) {
+    return await queryMarket(this, args?.indexer, args?.coinPrices);
   }
 
   /**
@@ -211,12 +211,17 @@ export class ScallopQuery {
    */
   public async getMarketPools(
     poolCoinNames?: SupportPoolCoins[],
-    indexer: boolean = false,
     args?: {
       coinPrices?: CoinPrices;
+      indexer?: boolean;
     }
   ) {
-    return await getMarketPools(this, poolCoinNames, indexer, args?.coinPrices);
+    return await getMarketPools(
+      this,
+      poolCoinNames,
+      args?.indexer,
+      args?.coinPrices
+    );
   }
 
   /**
@@ -228,16 +233,16 @@ export class ScallopQuery {
    */
   public async getMarketPool(
     poolCoinName: SupportPoolCoins,
-    indexer: boolean = false,
     args?: {
       marketObject?: SuiObjectData | null;
       coinPrice?: number;
+      indexer?: boolean;
     }
   ) {
     return await getMarketPool(
       this,
       poolCoinName,
-      indexer,
+      args?.indexer,
       args?.marketObject,
       args?.coinPrice
     );
@@ -256,9 +261,9 @@ export class ScallopQuery {
    */
   public async getMarketCollaterals(
     collateralCoinNames?: SupportCollateralCoins[],
-    indexer: boolean = false
+    args?: { indexer?: boolean }
   ) {
-    return await getMarketCollaterals(this, collateralCoinNames, indexer);
+    return await getMarketCollaterals(this, collateralCoinNames, args?.indexer);
   }
 
   /**
@@ -270,9 +275,9 @@ export class ScallopQuery {
    */
   public async getMarketCollateral(
     collateralCoinName: SupportCollateralCoins,
-    indexer: boolean = false
+    args?: { indexer?: boolean }
   ) {
-    return await getMarketCollateral(this, collateralCoinName, indexer);
+    return await getMarketCollateral(this, collateralCoinName, args?.indexer);
   }
 
   /**
@@ -382,16 +387,16 @@ export class ScallopQuery {
    */
   public async getSpools(
     stakeMarketCoinNames?: SupportStakeMarketCoins[],
-    indexer: boolean = false,
     args?: {
       marketPools?: MarketPools;
       coinPrices?: CoinPrices;
+      indexer?: boolean;
     }
   ) {
     return await getSpools(
       this,
       stakeMarketCoinNames,
-      indexer,
+      args?.indexer,
       args?.marketPools,
       args?.coinPrices
     );
@@ -406,13 +411,16 @@ export class ScallopQuery {
    */
   public async getSpool(
     stakeMarketCoinName: SupportStakeMarketCoins,
-    indexer: boolean = false,
-    args?: { marketPool?: MarketPool; coinPrices?: CoinPrices }
+    args?: {
+      marketPool?: MarketPool;
+      coinPrices?: CoinPrices;
+      indexer?: boolean;
+    }
   ) {
     return await getSpool(
       this,
       stakeMarketCoinName,
-      indexer,
+      args?.indexer,
       args?.marketPool,
       args?.coinPrices
     );
@@ -536,13 +544,12 @@ export class ScallopQuery {
    */
   public async getBorrowIncentivePools(
     coinNames?: SupportBorrowIncentiveCoins[],
-    indexer: boolean = false,
-    args?: { coinPrices: CoinPrices }
+    args?: { coinPrices: CoinPrices; indexer?: boolean }
   ) {
     return await getBorrowIncentivePools(
       this,
       coinNames,
-      indexer,
+      args?.indexer,
       args?.coinPrices
     );
   }
@@ -572,9 +579,9 @@ export class ScallopQuery {
   public async getLendings(
     poolCoinNames?: SupportPoolCoins[],
     ownerAddress: string = this.walletAddress,
-    indexer: boolean = false
+    args?: { indexer?: boolean }
   ) {
-    return await getLendings(this, poolCoinNames, ownerAddress, indexer);
+    return await getLendings(this, poolCoinNames, ownerAddress, args?.indexer);
   }
 
   /**
@@ -588,9 +595,9 @@ export class ScallopQuery {
   public async getLending(
     poolCoinName: SupportPoolCoins,
     ownerAddress: string = this.walletAddress,
-    indexer: boolean = false
+    args?: { indexer?: boolean }
   ) {
-    return await getLending(this, poolCoinName, ownerAddress, indexer);
+    return await getLending(this, poolCoinName, ownerAddress, args?.indexer);
   }
 
   /**
@@ -605,9 +612,9 @@ export class ScallopQuery {
    */
   public async getObligationAccounts(
     ownerAddress: string = this.walletAddress,
-    indexer: boolean = false
+    args?: { indexer: boolean }
   ) {
-    return await getObligationAccounts(this, ownerAddress, indexer);
+    return await getObligationAccounts(this, ownerAddress, args?.indexer);
   }
 
   /**
@@ -624,13 +631,13 @@ export class ScallopQuery {
   public async getObligationAccount(
     obligationId: string,
     ownerAddress: string = this.walletAddress,
-    indexer: boolean = false
+    args?: { indexer?: boolean }
   ) {
     return await getObligationAccount(
       this,
       obligationId,
       ownerAddress,
-      indexer
+      args?.indexer
     );
   }
 
@@ -643,8 +650,8 @@ export class ScallopQuery {
    *
    * @return Total value locked.
    */
-  public async getTvl(indexer: boolean = false) {
-    return await getTotalValueLocked(this, indexer);
+  public async getTvl(args?: { indexer?: boolean }) {
+    return await getTotalValueLocked(this, args?.indexer);
   }
 
   /**