@scallop-io/sui-scallop-sdk 2.3.0-lst-x-oracle-alpha.9 → 2.3.1

package/src/models/rateLimiter.ts

@@ -0,0 +1,55 @@
+export class RateLimiter {
+  private tokens: number;
+  private lastRefillTime: number;
+  private readonly refillRate: number; // tokens per millisecond
+
+  constructor(private readonly capacity: number = 10) {
+    this.refillRate = this.capacity / 1000; // 10 tokens per second = 0.01 tokens/ms
+    this.tokens = this.capacity;
+    this.lastRefillTime = Date.now();
+  }
+
+  private refill() {
+    const now = Date.now();
+    const elapsed = now - this.lastRefillTime;
+    const newTokens = elapsed * this.refillRate;
+
+    this.tokens = Math.min(this.capacity, this.tokens + newTokens);
+    this.lastRefillTime = now;
+  }
+
+  private getTimeToNextToken(): number {
+    this.refill();
+
+    if (this.tokens >= 1) {
+      return 0;
+    }
+
+    // Calculate exact milliseconds needed for 1 full token
+    const deficit = 1 - this.tokens;
+    return Math.ceil(deficit / this.refillRate);
+  }
+
+  async acquireToken(): Promise<void> {
+    // eslint-disable-next-line no-constant-condition
+    while (true) {
+      const waitTime = this.getTimeToNextToken();
+
+      if (waitTime === 0) {
+        if (this.tokens >= 1) {
+          this.tokens -= 1;
+          return;
+        }
+        continue;
+      }
+
+      await new Promise((resolve) => setTimeout(resolve, waitTime));
+      this.refill();
+    }
+  }
+
+  async execute<T>(fn: () => Promise<T>): Promise<T> {
+    await this.acquireToken();
+    return await fn();
+  }
+}

package/src/models/scallop.ts

@@ -18,12 +18,12 @@ import ScallopClient, { ScallopClientParams } from './scallopClient';
  * ```
  */
 
-type ScallopParams = {
+export type ScallopParams = {
   client?: ScallopClient;
 } & ScallopClientParams;
 class Scallop {
   public readonly client: ScallopClient;
-  public constructor(params: ScallopParams) {
+  public constructor(params: ScallopParams = {}) {
     this.client = params.client ?? new ScallopClient(params);
   }
 

package/src/models/scallopAddress.ts

@@ -1,11 +1,10 @@
 import { NetworkType } from '@scallop-io/sui-kit';
-import { API_BASE_URL } from 'src/constants/api';
-import { queryKeys } from 'src/constants/queryKeys';
-import { AddressesInterface, AddressStringPath } from 'src/types/address';
+import { API_BASE_URL, queryKeys } from 'src/constants';
+import { AddressesInterface, AddressStringPath } from 'src/types';
 import ScallopAxios, { ScallopAxiosParams } from './scallopAxios';
 import { QueryKey } from '@tanstack/query-core';
 import { AxiosRequestConfig } from 'axios';
-import { parseUrl } from './utils';
+import { parseUrl } from 'src/utils';
 
 export type ScallopAddressParams = {
   addressId?: string;
@@ -13,7 +12,7 @@ export type ScallopAddressParams = {
     addresses?: string[];
   };
   auth?: string;
-  network?: NetworkType;
+  networkType?: NetworkType;
   forceAddressesInterface?: Partial<Record<NetworkType, AddressesInterface>>;
   defaultValues?: {
     addresses?: Partial<Record<NetworkType, AddressesInterface>>;
@@ -243,17 +242,6 @@ const EMPTY_ADDRESSES: AddressesInterface = {
         state: '',
         wormhole: '',
         wormholeState: '',
-        lst: {
-          afsui: {
-            safeId: '',
-            stakedSuiVaultId: '',
-            configId: '',
-          },
-          hasui: {
-            configId: '',
-            staking: '',
-          },
-        },
       },
     },
     packages: {
@@ -285,28 +273,12 @@ const EMPTY_ADDRESSES: AddressesInterface = {
         id: '',
         upgradeCap: '',
       },
-      supra: {
-        id: '',
-        upgradeCap: '',
-      },
+      supra: { id: '', upgradeCap: '' },
       pyth: {
         id: '',
         upgradeCap: '',
-        lst: {
-          afsui: {
-            id: '',
-            object: '',
-          },
-          hasui: {
-            id: '',
-            object: '',
-          },
-        },
-      },
-      switchboard: {
-        id: '',
-        upgradeCap: '',
       },
+      switchboard: { id: '', upgradeCap: '' },
       xOracle: {
         id: '',
         upgradeCap: '',
@@ -480,7 +452,7 @@ class ScallopAddress {
       ...params,
     });
 
-    this.network = params.network ?? 'mainnet';
+    this.network = params.networkType ?? 'mainnet';
     this.addressId = params.addressId ?? this.defaultParamValues.addressId;
     this.auth = params.auth ?? '';
 

package/src/models/scallopBuilder.ts

@@ -12,13 +12,13 @@ import type {
   SuiTxArg,
   SuiVecTxArg,
 } from '@scallop-io/sui-kit';
-import type { ScallopTxBlock, SelectCoinReturnType } from 'src/types/builder';
+import type { ScallopTxBlock } from '../types';
 import { ScallopBuilderInterface } from './interface';
 
 export type ScallopBuilderParams = {
   query?: ScallopQuery;
   usePythPullModel?: boolean;
-  pythSponsoredFeeds?: string[];
+  sponsoredFeeds?: string[];
   useOnChainXOracleList?: boolean;
 } & ScallopQueryParams;
 
@@ -37,13 +37,13 @@ class ScallopBuilder implements ScallopBuilderInterface {
   public readonly query: ScallopQuery;
   public readonly usePythPullModel: boolean;
   public readonly useOnChainXOracleList: boolean;
-  public readonly pythSponsoredFeeds: string[];
+  public readonly sponsoredFeeds: string[];
 
-  public constructor(params: ScallopBuilderParams) {
+  public constructor(params: ScallopBuilderParams = {}) {
     this.query = params.query ?? new ScallopQuery(params);
     this.usePythPullModel = params.usePythPullModel ?? true;
     this.useOnChainXOracleList = params.useOnChainXOracleList ?? true;
-    this.pythSponsoredFeeds = [...new Set(params.pythSponsoredFeeds ?? [])];
+    this.sponsoredFeeds = params.sponsoredFeeds ?? [];
   }
 
   get utils() {
@@ -96,22 +96,29 @@ class ScallopBuilder implements ScallopBuilderInterface {
    * @param assetCoinName - Specific support asset coin name.
    * @param amount - Amount of coins to be selected.
    * @param sender - Sender address.
+   * @param isSponsored - Whether the transaction is a sponsored transaction.
    * @return Take coin and left coin.
    */
-  async selectCoin<T extends string>(
+  async selectCoin(
     txBlock: ScallopTxBlock | SuiKitTxBlock,
-    assetCoinName: T,
+    assetCoinName: string,
     amount: number,
-    sender: string = this.walletAddress
-  ): Promise<SelectCoinReturnType<T>> {
-    if (assetCoinName === 'sui') {
+    sender: string = this.walletAddress,
+    isSponsored: boolean = false
+  ) {
+    if (assetCoinName === 'sui' && !isSponsored) {
       const [takeCoin] = txBlock.splitSUIFromGas([amount]);
-      return { takeCoin } as SelectCoinReturnType<T>;
+      return { takeCoin };
     } else {
       const coinType = this.utils.parseCoinType(assetCoinName);
       const coins = await this.utils.selectCoins(amount, coinType, sender);
+      const totalAmount = coins.reduce((prev, coin) => {
+        prev += Number(coin.balance);
+        return prev;
+      }, 0);
       const [takeCoin, leftCoin] = txBlock.takeAmountFromCoins(coins, amount);
-      return { takeCoin, leftCoin } as SelectCoinReturnType<T>;
+
+      return { takeCoin, leftCoin, totalAmount };
     }
   }
 

package/src/models/scallopClient.ts

@@ -5,10 +5,10 @@ import type {
   TransactionObjectArgument,
   TransactionResult,
 } from '@mysten/sui/transactions';
-import { requireSender } from './utils';
+import { requireSender } from 'src/utils';
 import type { NetworkType, SuiObjectArg } from '@scallop-io/sui-kit';
+import type { ScallopTxBlock } from '../types';
 import { ScallopClientInterface } from './interface';
-import { ScallopTxBlock } from 'src/types/builder';
 
 export type ScallopClientParams = {
   networkType?: NetworkType;
@@ -42,7 +42,7 @@ class ScallopClient implements ScallopClientInterface {
   public readonly builder: ScallopBuilder;
   public networkType: NetworkType;
 
-  public constructor(params: ScallopClientParams) {
+  public constructor(params: ScallopClientParams = {}) {
     this.builder = params.builder ?? new ScallopBuilder(params);
     this.networkType = params.networkType ?? 'mainnet';
   }
@@ -84,9 +84,9 @@ class ScallopClient implements ScallopClientInterface {
 
   /**
    * Query market data.
-   *
+   * @deprecated use ScallopQuery instance instead
    * @description
-   * This method might be @deprecated in the future, please use the {@link ScallopQuery} query instance instead.
+   * This method might be deprecated in the future, please use the {@link ScallopQuery} query instance instead.
    *
    * @return Market data.
    */
@@ -96,9 +96,9 @@ class ScallopClient implements ScallopClientInterface {
 
   /**
    * Get obligations data.
-   *
+   * @deprecated use ScallopQuery instance instead
    * @description
-   * This method might be @deprecated in the future, please use the {@link ScallopQuery} query instance instead.
+   * This method might be deprecated in the future, please use the {@link ScallopQuery} query instance instead.
    *
    * @param ownerAddress - The owner address.
    * @return Obligations data.
@@ -110,9 +110,9 @@ class ScallopClient implements ScallopClientInterface {
 
   /**
    * Query obligation data.
-   *
+   * @deprecated use ScallopQuery instance instead
    * @description
-   * This method might be @deprecated in the future, please use the {@link ScallopQuery} query instance instead.
+   * This method might be deprecated in the future, please use the {@link ScallopQuery} query instance instead.
    *
    * @param obligationId - The obligation id.
    * @return Obligation data.
@@ -123,9 +123,9 @@ class ScallopClient implements ScallopClientInterface {
 
   /**
    * Query all stake accounts data.
-   *
+   * @deprecated use ScallopQuery instance instead
    * @description
-   * This method might be @deprecated in the future, please use the {@link ScallopQuery} query instance instead.
+   * This method might be deprecated in the future, please use the {@link ScallopQuery} query instance instead.
    *
    * @param ownerAddress - The owner address.
    * @return All stake accounts data.
@@ -137,9 +137,9 @@ class ScallopClient implements ScallopClientInterface {
 
   /**
    * Query stake account data.
-   *
+   * @deprecated use ScallopQuery instance instead
    * @description
-   * This method might be @deprecated in the future, please use the {@link ScallopQuery} query instance instead.
+   * This method might be deprecated in the future, please use the {@link ScallopQuery} query instance instead.
    *
    * @param stakeMarketCoinName - Support stake market coin.
    * @param ownerAddress - The owner address.
@@ -152,9 +152,10 @@ class ScallopClient implements ScallopClientInterface {
 
   /**
    * Query stake pool data.
+   * @deprecated use ScallopQuery instance instead
    *
    * @description
-   * This method might be @deprecated in the future, please use the {@link ScallopQuery} query instance instead.
+   * This method might be deprecated in the future, please use the {@link ScallopQuery} query instance instead.
    *
    * @param stakeMarketCoinName - Support stake market coin.
    * @return Stake pool data.
@@ -165,9 +166,10 @@ class ScallopClient implements ScallopClientInterface {
 
   /**
    * Query reward pool data.
+   * @deprecated use ScallopQuery instance instead
    *
    * @description
-   * This method might be @deprecated in the future, please use the {@link ScallopQuery} query instance instead.
+   * This method might be deprecated in the future, please use the {@link ScallopQuery} query instance instead.
    *
    * @param stakeMarketCoinName - Support stake market coin.
    * @return Reward pool data.
@@ -210,6 +212,7 @@ class ScallopClient implements ScallopClientInterface {
    * @param sign - Decide to directly sign the transaction or return the transaction block.
    * @param obligationId - The obligation object.
    * @param walletAddress - The wallet address of the owner.
+   * @param isSponsoredTx - Whether the transaction is sponsored.
    * @return Transaction block response or transaction block.
    */
   async depositCollateral(
@@ -221,30 +224,38 @@ class ScallopClient implements ScallopClientInterface {
     amount: number,
     sign?: S,
     obligationId?: string,
-    walletAddress?: string
+    walletAddress?: string,
+    isSponsoredTx?: boolean
   ): Promise<ScallopClientFnReturnType<S>>;
   async depositCollateral<S extends boolean>(
     collateralCoinName: string,
     amount: number,
     sign: S = true as S,
     obligationId?: string,
-    walletAddress?: string
+    walletAddress?: string,
+    isSponsoredTx?: boolean
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
     const sender = walletAddress ?? this.walletAddress;
     txBlock.setSender(sender);
 
-    const obligations = await this.query.getObligations(sender);
-    const specificObligationId = obligationId ?? obligations[0]?.id;
+    const specificObligationId =
+      obligationId ?? (await this.query.getObligations(sender))[0]?.id;
     if (specificObligationId) {
       await txBlock.addCollateralQuick(
         amount,
         collateralCoinName,
-        specificObligationId
+        specificObligationId,
+        isSponsoredTx
       );
     } else {
       const [obligation, obligationKey, hotPotato] = txBlock.openObligation();
-      await txBlock.addCollateralQuick(amount, collateralCoinName, obligation);
+      await txBlock.addCollateralQuick(
+        amount,
+        collateralCoinName,
+        obligation,
+        isSponsoredTx
+      );
       txBlock.returnObligation(obligation, hotPotato);
       txBlock.transferObjects([obligationKey], sender);
     }
@@ -267,6 +278,7 @@ class ScallopClient implements ScallopClientInterface {
    * @param obligationId - The obligation object.
    * @param obligationKey - The obligation key object to verifying obligation authority.
    * @param walletAddress - The wallet address of the owner.
+   * @param isSponsoredTx - Whether the transaction is sponsored.
    * @return Transaction block response or transaction block.
    */
   async withdrawCollateral<S extends boolean>(
@@ -275,7 +287,8 @@ class ScallopClient implements ScallopClientInterface {
     sign: S = true as S,
     obligationId: string,
     obligationKey: string,
-    walletAddress?: string
+    walletAddress?: string,
+    isSponsoredTx?: boolean
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
     const sender = walletAddress ?? this.walletAddress;
@@ -285,7 +298,8 @@ class ScallopClient implements ScallopClientInterface {
       amount,
       collateralCoinName,
       obligationId,
-      obligationKey
+      obligationKey,
+      { isSponsoredTx }
     );
     txBlock.transferObjects([collateralCoin], sender);
 
@@ -449,6 +463,7 @@ class ScallopClient implements ScallopClientInterface {
    * @param obligationId - The obligation object.
    * @param obligationKey - The obligation key object to verifying obligation authority.
    * @param walletAddress - The wallet address of the owner.
+   * @param isSponsoredTx - Whether the transaction is sponsored.
    * @return Transaction block response or transaction block.
    */
   async borrow<S extends boolean>(
@@ -457,7 +472,8 @@ class ScallopClient implements ScallopClientInterface {
     sign: S = true as S,
     obligationId: string,
     obligationKey: string,
-    walletAddress?: string
+    walletAddress?: string,
+    isSponsoredTx?: boolean
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
     const sender = walletAddress ?? this.walletAddress;
@@ -471,7 +487,8 @@ class ScallopClient implements ScallopClientInterface {
       amount,
       poolCoinName,
       obligationId,
-      obligationKey
+      obligationKey,
+      { isSponsoredTx }
     );
     txBlock.transferObjects([coin], sender);
     if (sign && availableStake) {
@@ -495,6 +512,7 @@ class ScallopClient implements ScallopClientInterface {
    * @param sign - Decide to directly sign the transaction or return the transaction block.
    * @param obligationId - The obligation object.
    * @param walletAddress - The wallet address of the owner.
+   * @param isSponsoredTx - Whether the transaction is sponsored.
    * @return Transaction block response or transaction block.
    */
   async repay<S extends boolean>(
@@ -503,7 +521,8 @@ class ScallopClient implements ScallopClientInterface {
     sign: S = true as S,
     obligationId: string,
     obligationKey: string,
-    walletAddress?: string
+    walletAddress?: string,
+    isSponsoredTx?: boolean
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
     const sender = walletAddress ?? this.walletAddress;
@@ -513,7 +532,7 @@ class ScallopClient implements ScallopClientInterface {
     if (sign && availableStake) {
       await txBlock.unstakeObligationQuick(obligationId, obligationKey);
     }
-    await txBlock.repayQuick(amount, poolCoinName, obligationId);
+    await txBlock.repayQuick(amount, poolCoinName, obligationId, isSponsoredTx);
     if (sign && availableStake) {
       await txBlock.stakeObligationWithVeScaQuick(obligationId, obligationKey);
     }
@@ -713,12 +732,7 @@ class ScallopClient implements ScallopClientInterface {
         throw new Error(`Invalid sCoin type: ${stakeMarketCoinName}`);
 
       // merge to existing sCoins if exist
-      await this.utils.mergeSimilarCoins(
-        txBlock,
-        sCoin,
-        sCoinType,
-        requireSender(txBlock)
-      );
+      await this.utils.mergeSimilarCoins(txBlock, sCoin, sCoinType, sender);
     }
 
     txBlock.transferObjects([sCoin], sender);

package/src/models/scallopConstants.ts

@@ -1,8 +1,8 @@
-import { PoolAddress, Whitelist } from 'src/types/constant';
+import { PoolAddress, Whitelist } from 'src/types';
 import ScallopAddress, { ScallopAddressParams } from './scallopAddress';
 import { NetworkType, parseStructTag } from '@scallop-io/sui-kit';
-import { queryKeys } from 'src/constants/queryKeys';
-import { parseUrl } from './utils';
+import { queryKeys } from 'src/constants';
+import { parseUrl } from 'src/utils';
 
 const isEmptyObject = (obj: object) => {
   return Object.keys(obj).length === 0;

package/src/models/scallopIndexer.ts

@@ -10,10 +10,9 @@ import {
   Spool,
   Spools,
   TotalValueLocked,
-} from 'src/types/query';
+} from 'src/types';
 import ScallopAxios, { ScallopAxiosParams } from './scallopAxios';
-import { SDK_API_BASE_URL } from 'src/constants/api';
-import { queryKeys } from 'src/constants/queryKeys';
+import { queryKeys, SDK_API_BASE_URL } from 'src/constants';
 
 export type ScallopIndexerParams = {
   indexerApiUrl?: string;
@@ -135,7 +134,7 @@ class ScallopIndexer extends ScallopAxios {
       borrowIncentivePools: BorrowIncentivePool[];
     }>(
       '/api/borrowIncentivePools/migrate',
-      queryKeys.api.getBorrowIncentivePool()
+      queryKeys.api.getBorrowIncentivePools()
     );
 
     if (response.status === 200) {