@scallop-io/sui-scallop-sdk 0.46.56 → 0.46.57

package/dist/models/scallopBuilder.d.ts

@@ -5,7 +5,7 @@ import { ScallopUtils } from './scallopUtils';
 import type { SuiTransactionBlockResponse } from '@mysten/sui.js/client';
 import type { TransactionBlock } from '@mysten/sui.js/transactions';
 import type { SuiTxBlock as SuiKitTxBlock } from '@scallop-io/sui-kit';
-import type { ScallopBuilderParams, ScallopTxBlock, SupportMarketCoins, SupportAssetCoins, SupportSCoin, ScallopBuilderInstanceParams } from '../types';
+import type { ScallopBuilderParams, ScallopTxBlock, SupportMarketCoins, SupportAssetCoins, SupportSCoin, ScallopBuilderInstanceParams, SelectCoinReturnType } from '../types';
 import { ScallopCache } from './scallopCache';
 /**
  * @description
@@ -51,10 +51,7 @@ export declare class ScallopBuilder {
      * @param sender - Sender address.
      * @return Take coin and left coin.
      */
-    selectCoin(txBlock: ScallopTxBlock | SuiKitTxBlock, assetCoinName: SupportAssetCoins, amount: number, sender?: string): Promise<{
-        takeCoin: import("@scallop-io/sui-kit").TransactionObjectArgument;
-        leftCoin: import("@scallop-io/sui-kit").TransactionObjectArgument;
-    }>;
+    selectCoin<T extends SupportAssetCoins>(txBlock: ScallopTxBlock | SuiKitTxBlock, assetCoinName: T, amount: number, sender?: string): Promise<SelectCoinReturnType<T>>;
     /**
      * Specifying the sender's amount of market coins to get coins args from transaction result.
      *

package/dist/types/builder/index.d.ts

@@ -1,10 +1,11 @@
-import type { CoreTxBlock } from './core';
+import type { CoreTxBlock, NestedResult } from './core';
 import type { SpoolTxBlock } from './spool';
 import type { BorrowIncentiveTxBlock } from './borrowIncentive';
 import type { VeScaTxBlock } from './vesca';
 import type { ReferralTxBlock } from './referral';
 import { LoyaltyProgramTxBlock } from './loyaltyProgram';
 import { SCoinTxBlock } from './sCoin';
+import { SupportAssetCoins } from '../constant';
 export type * from './core';
 export type * from './spool';
 export type * from './borrowIncentive';
@@ -15,3 +16,9 @@ export type BaseScallopTxBlock = ReferralTxBlock & LoyaltyProgramTxBlock & Borro
 export type SuiTxBlockWithSCoin = BaseScallopTxBlock & SCoinTxBlock;
 export type SuiTxBlockWithSpool = SuiTxBlockWithSCoin & SpoolTxBlock;
 export type ScallopTxBlock = SuiTxBlockWithSpool & CoreTxBlock;
+export type SelectCoinReturnType<T extends SupportAssetCoins> = T extends 'sui' ? {
+    takeCoin: NestedResult;
+} : {
+    takeCoin: NestedResult;
+    leftCoin: NestedResult;
+};

package/dist/utils/query.d.ts

@@ -53,7 +53,7 @@ export declare const parseOriginBorrowIncentiveAccountData: (originBorrowIncenti
 export declare const minBigNumber: (...args: BigNumber.Value[]) => BigNumber;
 export declare const maxBigNumber: (...args: BigNumber.Value[]) => BigNumber;
 /**
- * Dynamically adjust the decrease or increase ratio according to the amout
+ * Dynamically adjust the decrease or increase ratio according to the amount
  * @param amount - The amount required to calculate factor.
  * @param scaleStep - The scale step required to determine the factor..
  * @param type - The type of the calculation.

package/package.json

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

package/src/models/scallopBuilder.ts

@@ -15,6 +15,7 @@ import type {
   SupportAssetCoins,
   SupportSCoin,
   ScallopBuilderInstanceParams,
+  SelectCoinReturnType,
 } from '../types';
 import { ScallopCache } from './scallopCache';
 import { DEFAULT_CACHE_OPTIONS } from 'src/constants/cache';
@@ -122,16 +123,21 @@ export class ScallopBuilder {
    * @param sender - Sender address.
    * @return Take coin and left coin.
    */
-  public async selectCoin(
+  public async selectCoin<T extends SupportAssetCoins>(
     txBlock: ScallopTxBlock | SuiKitTxBlock,
-    assetCoinName: SupportAssetCoins,
+    assetCoinName: T,
     amount: number,
     sender: string = this.walletAddress
-  ) {
-    const coinType = this.utils.parseCoinType(assetCoinName);
-    const coins = await this.utils.selectCoins(amount, coinType, sender);
-    const [takeCoin, leftCoin] = txBlock.takeAmountFromCoins(coins, amount);
-    return { takeCoin, leftCoin };
+  ): Promise<SelectCoinReturnType<T>> {
+    if (assetCoinName === 'sui') {
+      const [takeCoin] = txBlock.splitSUIFromGas([amount]);
+      return { takeCoin } as SelectCoinReturnType<T>;
+    } else {
+      const coinType = this.utils.parseCoinType(assetCoinName);
+      const coins = await this.utils.selectCoins(amount, coinType, sender);
+      const [takeCoin, leftCoin] = txBlock.takeAmountFromCoins(coins, amount);
+      return { takeCoin, leftCoin } as SelectCoinReturnType<T>;
+    }
   }
 
   /**

package/src/queries/borrowIncentiveQuery.ts

@@ -183,7 +183,7 @@ export const queryBorrowIncentiveAccounts = async (
 
   const queryResult = await utils.cache.queryInspectTxn({ queryTarget, args });
   const borrowIncentiveAccountsQueryData = queryResult?.events[0]
-    .parsedJson as BorrowIncentiveAccountsQueryInterface;
+    ?.parsedJson as BorrowIncentiveAccountsQueryInterface | undefined;
 
   const borrowIncentiveAccounts: BorrowIncentiveAccounts = Object.values(
     borrowIncentiveAccountsQueryData?.pool_records ?? []

package/src/queries/coreQuery.ts

@@ -802,7 +802,7 @@ export const queryObligation = async (
     { queryTarget, args }
     // txBlock
   );
-  return queryResult?.events[0].parsedJson as
+  return queryResult?.events[0]?.parsedJson as
     | ObligationQueryInterface
     | undefined;
 };
@@ -972,7 +972,7 @@ export const getFlashLoanFees = async (
     // the balance sheet is a VecSet<0x1::type_name::TypeName
     const balanceSheetDynamicFields = await query.cache.queryGetDynamicFields({
       parentId: flashloanFeesTableId,
-      limit: 50,
+      limit: 10,
     });
 
     // get the dynamic object ids

package/src/types/builder/index.ts

@@ -1,10 +1,11 @@
-import type { CoreTxBlock } from './core';
+import type { CoreTxBlock, NestedResult } from './core';
 import type { SpoolTxBlock } from './spool';
 import type { BorrowIncentiveTxBlock } from './borrowIncentive';
 import type { VeScaTxBlock } from './vesca';
 import type { ReferralTxBlock } from './referral';
 import { LoyaltyProgramTxBlock } from './loyaltyProgram';
 import { SCoinTxBlock } from './sCoin';
+import { SupportAssetCoins } from '../constant';
 
 export type * from './core';
 export type * from './spool';
@@ -21,3 +22,12 @@ export type BaseScallopTxBlock = ReferralTxBlock &
 export type SuiTxBlockWithSCoin = BaseScallopTxBlock & SCoinTxBlock;
 export type SuiTxBlockWithSpool = SuiTxBlockWithSCoin & SpoolTxBlock;
 export type ScallopTxBlock = SuiTxBlockWithSpool & CoreTxBlock;
+
+export type SelectCoinReturnType<T extends SupportAssetCoins> = T extends 'sui'
+  ? {
+      takeCoin: NestedResult;
+    }
+  : {
+      takeCoin: NestedResult;
+      leftCoin: NestedResult;
+    };

package/src/utils/query.ts

@@ -697,7 +697,7 @@ export const maxBigNumber = (...args: BigNumber.Value[]) => {
 };
 
 /**
- * Dynamically adjust the decrease or increase ratio according to the amout
+ * Dynamically adjust the decrease or increase ratio according to the amount
  * @param amount - The amount required to calculate factor.
  * @param scaleStep - The scale step required to determine the factor..
  * @param type - The type of the calculation.