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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scallop-io/sui-scallop-sdk",
-  "version": "2.3.0-lst-x-oracle-alpha.8",
+  "version": "2.3.0",
   "description": "Typescript sdk for interacting with Scallop contract on SUI",
   "keywords": [
     "sui",
@@ -39,7 +39,7 @@
   ],
   "dependencies": {
     "@mysten/sui": "1.28.2",
-    "@pythnetwork/pyth-sui-js": "2.1.0",
+    "@pythnetwork/pyth-sui-js": "2.2.0",
     "@scallop-io/sui-kit": "1.4.1",
     "@tanstack/query-core": "5.59.16",
     "axios": "^1.9.0",
@@ -70,7 +70,7 @@
     "prettier": "^3.0.3",
     "standard-version": "^9.5.0",
     "tsconfig-paths": "^4.2.0",
-    "tsup": "^8.5.0",
+    "tsup": "^7.2.0",
     "typedoc": "^0.26.3",
     "typescript": "5.5.4",
     "valibot": "^1.1.0",
@@ -145,8 +145,11 @@
   },
   "scripts": {
     "clean": "rm -rf tsconfig.tsbuildinfo ./dist",
-    "build": "pnpm run clean && pnpm run build:tsup",
-    "build:tsup": "tsup ./src/index.ts --format esm,cjs --dts --splitting --minify --treeshake",
+    "build": "pnpm run build:tsup",
+    "build:sourcemap": "tsup ./src/index.ts --format esm,cjs --sourcemap --dts",
+    "build:tsup": "tsup ./src/index.ts --format esm,cjs --splitting --minify --treeshake --dts",
+    "watch:tsup": "tsup ./src/index.ts --format esm,cjs --clean --splitting --watch",
+    "watch:types": "tsc --watch",
     "watch": "pnpm run clean & pnpm run watch:types & pnpm run watch:tsup",
     "test": "pnpm test:typecheck && pnpm test:unit",
     "test:typecheck": "tsc -p ./test",

package/src/builders/borrowIncentiveBuilder.ts

@@ -3,7 +3,8 @@ import {
   SuiTxBlock as SuiKitTxBlock,
   SUI_CLOCK_OBJECT_ID,
 } from '@scallop-io/sui-kit';
-import { requireSender } from './utils';
+import { getObligations, getObligationLocked } from 'src/queries';
+import { requireSender } from 'src/utils';
 import type { SuiObjectArg } from '@scallop-io/sui-kit';
 import type { ScallopBuilder } from 'src/models';
 import type {
@@ -13,9 +14,8 @@ import type {
   SuiTxBlockWithBorrowIncentiveNormalMethods,
   BorrowIncentiveTxBlock,
   ScallopTxBlock,
-} from 'src/types/builder';
-import { OLD_BORROW_INCENTIVE_PROTOCOL_ID } from 'src/constants/common';
-import { getObligationLocked, getObligations } from 'src/queries/coreQuery';
+} from 'src/types';
+import { OLD_BORROW_INCENTIVE_PROTOCOL_ID } from 'src/constants';
 
 /**
  * Check and get Obligation information from transaction block.

package/src/builders/coreBuilder.ts

@@ -1,10 +1,10 @@
 import { Transaction } from '@mysten/sui/transactions';
 import { SUI_CLOCK_OBJECT_ID } from '@mysten/sui/utils';
 import { SuiTxBlock as SuiKitTxBlock } from '@scallop-io/sui-kit';
-import { getObligations } from 'src/queries/coreQuery';
+import { getObligations } from '../queries';
 import { updateOracles } from './oracles';
-import { requireSender } from './utils';
-import type { SuiObjectArg, TransactionResult } from '@scallop-io/sui-kit';
+import { requireSender } from '../utils';
+import type { SuiObjectArg } from '@scallop-io/sui-kit';
 import type { ScallopBuilder } from 'src/models';
 import type {
   CoreIds,
@@ -15,7 +15,7 @@ import type {
   ScallopTxBlock,
   NestedResult,
   SuiTxBlockWithSpool,
-} from 'src/types/builder';
+} from 'src/types';
 
 /**
  * Check and get Obligation information from transaction block.
@@ -287,7 +287,12 @@ const generateCoreQuickMethod: GenerateCoreQuickMethod = ({
   txBlock,
 }) => {
   return {
-    addCollateralQuick: async (amount, collateralCoinName, obligationId) => {
+    addCollateralQuick: async (
+      amount,
+      collateralCoinName,
+      obligationId,
+      isSponsoredTx = false
+    ) => {
       const sender = requireSender(txBlock);
       const { obligationId: obligationArg } = await requireObligationInfo(
         builder,
@@ -295,25 +300,25 @@ const generateCoreQuickMethod: GenerateCoreQuickMethod = ({
         obligationId
       );
 
-      if (collateralCoinName === 'sui') {
-        const [suiCoin] = txBlock.splitSUIFromGas([amount]);
-        txBlock.addCollateral(obligationArg, suiCoin, collateralCoinName);
-      } else {
-        const { leftCoin, takeCoin } = await builder.selectCoin(
-          txBlock,
-          collateralCoinName,
-          amount,
-          sender
-        );
-        txBlock.addCollateral(obligationArg, takeCoin, collateralCoinName);
+      const { takeCoin, leftCoin } = await builder.selectCoin(
+        txBlock,
+        collateralCoinName,
+        amount,
+        sender,
+        isSponsoredTx
+      );
+
+      if (leftCoin) {
         txBlock.transferObjects([leftCoin], sender);
       }
+      txBlock.addCollateral(obligationArg, takeCoin, collateralCoinName);
     },
     takeCollateralQuick: async (
       amount,
       collateralCoinName,
       obligationId,
-      obligationKey
+      obligationKey,
+      updateOracleOptions
     ) => {
       const obligationInfo = await requireObligationInfo(
         builder,
@@ -324,7 +329,12 @@ const generateCoreQuickMethod: GenerateCoreQuickMethod = ({
       const updateCoinNames = await builder.utils.getObligationCoinNames(
         obligationInfo.obligationId
       );
-      await updateOracles(builder, txBlock, updateCoinNames);
+      await updateOracles(
+        builder,
+        txBlock,
+        updateCoinNames,
+        updateOracleOptions
+      );
       return txBlock.takeCollateral(
         obligationInfo.obligationId,
         obligationInfo.obligationKey as SuiObjectArg,
@@ -332,22 +342,24 @@ const generateCoreQuickMethod: GenerateCoreQuickMethod = ({
         collateralCoinName
       );
     },
-    depositQuick: async (amount, poolCoinName, returnSCoin = true) => {
+    depositQuick: async (
+      amount,
+      poolCoinName,
+      returnSCoin = true,
+      isSponsoredTx = false
+    ) => {
       const sender = requireSender(txBlock);
-      let marketCoinDeposit: TransactionResult | undefined;
-      if (poolCoinName === 'sui') {
-        const [suiCoin] = txBlock.splitSUIFromGas([amount]);
-        marketCoinDeposit = txBlock.deposit(suiCoin, poolCoinName);
-      } else {
-        const { leftCoin, takeCoin } = await builder.selectCoin(
-          txBlock,
-          poolCoinName,
-          amount,
-          sender
-        );
+      const { leftCoin, takeCoin } = await builder.selectCoin(
+        txBlock,
+        poolCoinName,
+        amount,
+        sender,
+        isSponsoredTx
+      );
+      if (leftCoin) {
         txBlock.transferObjects([leftCoin], sender);
-        marketCoinDeposit = txBlock.deposit(takeCoin, poolCoinName);
       }
+      const marketCoinDeposit = txBlock.deposit(takeCoin, poolCoinName);
 
       // convert to sCoin
       return returnSCoin
@@ -382,7 +394,13 @@ const generateCoreQuickMethod: GenerateCoreQuickMethod = ({
       if (!marketCoin) throw new Error(`No market coin for ${poolCoinName}`);
       return txBlock.withdraw(marketCoin, poolCoinName);
     },
-    borrowQuick: async (amount, poolCoinName, obligationId, obligationKey) => {
+    borrowQuick: async (
+      amount,
+      poolCoinName,
+      obligationId,
+      obligationKey,
+      updateOracleOptions
+    ) => {
       const obligationInfo = await requireObligationInfo(
         builder,
         txBlock,
@@ -394,7 +412,12 @@ const generateCoreQuickMethod: GenerateCoreQuickMethod = ({
           obligationInfo.obligationId
         )) ?? [];
       const updateCoinNames = [...obligationCoinNames, poolCoinName];
-      await updateOracles(builder, txBlock, updateCoinNames);
+      await updateOracles(
+        builder,
+        txBlock,
+        updateCoinNames,
+        updateOracleOptions
+      );
       return txBlock.borrow(
         obligationInfo.obligationId,
         obligationInfo.obligationKey as SuiObjectArg,
@@ -407,7 +430,8 @@ const generateCoreQuickMethod: GenerateCoreQuickMethod = ({
       poolCoinName,
       borrowReferral,
       obligationId,
-      obligationKey
+      obligationKey,
+      updateOracleOptions
     ) => {
       const obligationInfo = await requireObligationInfo(
         builder,
@@ -420,7 +444,12 @@ const generateCoreQuickMethod: GenerateCoreQuickMethod = ({
           obligationInfo.obligationId
         )) ?? [];
       const updateCoinNames = [...obligationCoinNames, poolCoinName];
-      await updateOracles(builder, txBlock, updateCoinNames);
+      await updateOracles(
+        builder,
+        txBlock,
+        updateCoinNames,
+        updateOracleOptions
+      );
       return txBlock.borrowWithReferral(
         obligationInfo.obligationId,
         obligationInfo.obligationKey as SuiObjectArg,
@@ -429,7 +458,12 @@ const generateCoreQuickMethod: GenerateCoreQuickMethod = ({
         poolCoinName
       );
     },
-    repayQuick: async (amount, poolCoinName, obligationId) => {
+    repayQuick: async (
+      amount,
+      poolCoinName,
+      obligationId,
+      isSponsoredTx = false
+    ) => {
       const sender = requireSender(txBlock);
       const obligationInfo = await requireObligationInfo(
         builder,
@@ -437,30 +471,23 @@ const generateCoreQuickMethod: GenerateCoreQuickMethod = ({
         obligationId
       );
 
-      if (poolCoinName === 'sui') {
-        const [suiCoin] = txBlock.splitSUIFromGas([amount]);
-        return txBlock.repay(
-          obligationInfo.obligationId,
-          suiCoin,
-          poolCoinName
-        );
-      } else {
-        const { leftCoin, takeCoin } = await builder.selectCoin(
-          txBlock,
-          poolCoinName,
-          amount,
-          sender
-        );
-        txBlock.transferObjects([leftCoin], sender);
-        return txBlock.repay(
-          obligationInfo.obligationId,
-          takeCoin,
-          poolCoinName
-        );
-      }
+      const { leftCoin, takeCoin } = await builder.selectCoin(
+        txBlock,
+        poolCoinName,
+        amount,
+        sender,
+        isSponsoredTx
+      );
+      if (leftCoin) txBlock.transferObjects([leftCoin], sender);
+      return txBlock.repay(obligationInfo.obligationId, takeCoin, poolCoinName);
     },
-    updateAssetPricesQuick: async (assetCoinNames) => {
-      return await updateOracles(builder, txBlock, assetCoinNames);
+    updateAssetPricesQuick: async (assetCoinNames, updateOracleOptions) => {
+      return await updateOracles(
+        builder,
+        txBlock,
+        assetCoinNames,
+        updateOracleOptions
+      );
     },
   };
 };

package/src/builders/index.ts

@@ -4,11 +4,11 @@ import { newCoreTxBlock } from './coreBuilder';
 import { newSpoolTxBlock } from './spoolBuilder';
 import { newBorrowIncentiveTxBlock } from './borrowIncentiveBuilder';
 import { newVeScaTxBlock } from './vescaBuilder';
+import type { ScallopBuilder } from 'src/models';
+import type { ScallopTxBlock } from 'src/types';
 import { newReferralTxBlock } from './referralBuilder';
 import { newLoyaltyProgramTxBlock } from './loyaltyProgramBuilder';
 import { newSCoinTxBlock } from './sCoinBuilder';
-import { ScallopTxBlock } from 'src/types/builder';
-import type { ScallopBuilder } from 'src/models';
 
 /**
  * Create a new ScallopTxBlock instance.

package/src/builders/loyaltyProgramBuilder.ts

@@ -7,8 +7,8 @@ import {
   LoyaltyProgramTxBlock,
   ScallopTxBlock,
   SuiTxBlockWithLoyaltyProgramNormalMethods,
-} from 'src/types/builder';
-import { requireSender } from './utils';
+} from 'src/types';
+import { requireSender } from 'src/utils';
 
 const generateLoyaltyProgramNormalMethod: GenerateLoyaltyProgramNormalMethod =
   ({ builder, txBlock }) => {