@scallop-io/sui-scallop-sdk 2.2.2-pyth-sponsored-transaction-alpha.1 → 2.2.2

package/package.json

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

package/src/builders/borrowIncentiveBuilder.ts

@@ -55,11 +55,16 @@ const requireObligationInfo = async (
     throw new Error(`No obligation found for sender ${sender}`);
   }
 
-  const selectedObligation =
-    obligations.find(
-      (obligation) =>
-        obligation.id === obligationId || obligation.keyId === obligationKey
-    ) ?? obligations[0];
+  const selectedObligation = obligations.find(
+    (obligation) =>
+      obligation.id === obligationId || obligation.keyId === obligationKey
+  );
+
+  if (!selectedObligation) {
+    throw new Error(
+      `No obligation found for sender ${sender} with id ${obligationId} or key ${obligationKey}`
+    );
+  }
 
   return {
     obligationId: selectedObligation.id,

package/src/builders/coreBuilder.ts

@@ -382,13 +382,7 @@ const generateCoreQuickMethod: GenerateCoreQuickMethod = ({
       if (!marketCoin) throw new Error(`No market coin for ${poolCoinName}`);
       return txBlock.withdraw(marketCoin, poolCoinName);
     },
-    borrowQuick: async (
-      amount,
-      poolCoinName,
-      obligationId,
-      obligationKey,
-      isSponsoredTx = false
-    ) => {
+    borrowQuick: async (amount, poolCoinName, obligationId, obligationKey) => {
       const obligationInfo = await requireObligationInfo(
         builder,
         txBlock,
@@ -400,7 +394,7 @@ const generateCoreQuickMethod: GenerateCoreQuickMethod = ({
           obligationInfo.obligationId
         )) ?? [];
       const updateCoinNames = [...obligationCoinNames, poolCoinName];
-      await updateOracles(builder, txBlock, updateCoinNames, { isSponsoredTx });
+      await updateOracles(builder, txBlock, updateCoinNames);
       return txBlock.borrow(
         obligationInfo.obligationId,
         obligationInfo.obligationKey as SuiObjectArg,
@@ -413,8 +407,7 @@ const generateCoreQuickMethod: GenerateCoreQuickMethod = ({
       poolCoinName,
       borrowReferral,
       obligationId,
-      obligationKey,
-      isSponsoredTx = false
+      obligationKey
     ) => {
       const obligationInfo = await requireObligationInfo(
         builder,
@@ -427,9 +420,7 @@ const generateCoreQuickMethod: GenerateCoreQuickMethod = ({
           obligationInfo.obligationId
         )) ?? [];
       const updateCoinNames = [...obligationCoinNames, poolCoinName];
-      await updateOracles(builder, txBlock, updateCoinNames, {
-        isSponsoredTx,
-      });
+      await updateOracles(builder, txBlock, updateCoinNames);
       return txBlock.borrowWithReferral(
         obligationInfo.obligationId,
         obligationInfo.obligationKey as SuiObjectArg,

package/src/builders/oracles/index.ts

@@ -22,21 +22,19 @@ export const updateOracles = async (
   builder: ScallopBuilder,
   txBlock: SuiKitTxBlock,
   assetCoinNames: string[] = [...builder.constants.whitelist.lending],
-  options?: {
-    usePythPullModel?: boolean;
-    useOnChainXOracleList?: boolean;
-    sponsoredFeeds?: string[];
-    isSponsoredTx?: boolean;
+  options: {
+    usePythPullModel: boolean;
+    useOnChainXOracleList: boolean;
+    sponsoredFeeds: string[];
+  } = {
+    usePythPullModel: true,
+    useOnChainXOracleList: true,
+    sponsoredFeeds: [],
   }
 ) => {
-  const usePythPullModel =
-    options?.usePythPullModel ?? builder.usePythPullModel;
-  const useOnChainXOracleList =
-    options?.useOnChainXOracleList ?? builder.useOnChainXOracleList;
   const sponsoredFeeds = new Set(
-    options?.sponsoredFeeds ?? builder.sponsoredFeeds
+    builder.sponsoredFeeds ?? options.sponsoredFeeds
   );
-  const isSponsoredTx = options?.isSponsoredTx ?? false;
 
   // Validate the sponsoredFeeds content.
   sponsoredFeeds.forEach((feed) => {
@@ -45,6 +43,10 @@ export const updateOracles = async (
     }
   });
 
+  const usePythPullModel = builder.usePythPullModel ?? options.usePythPullModel;
+  const useOnChainXOracleList =
+    builder.useOnChainXOracleList ?? options.useOnChainXOracleList;
+
   const xOracleList = useOnChainXOracleList
     ? await builder.query.getAssetOracles()
     : X_ORACLE_LIST;
@@ -90,12 +92,7 @@ export const updateOracles = async (
     }
 
     if (needToUpdatePythPriceFeeds.length > 0) {
-      await updatePythPriceFeeds(
-        builder,
-        needToUpdatePythPriceFeeds,
-        txBlock,
-        isSponsoredTx
-      );
+      await updatePythPriceFeeds(builder, needToUpdatePythPriceFeeds, txBlock);
     }
   }
 

package/src/builders/oracles/pyth.ts

@@ -8,19 +8,12 @@ import type { SuiTxBlock as SuiKitTxBlock } from '@scallop-io/sui-kit';
 export const updatePythPriceFeeds = async (
   builder: ScallopBuilder,
   assetCoinNames: string[],
-  txBlock: SuiKitTxBlock,
-  isSponsoredTx: boolean = false
+  txBlock: SuiKitTxBlock
 ) => {
   const pythClient = new SuiPythClient(
     builder.suiKit.client,
     builder.address.get('core.oracles.pyth.state'),
-    builder.address.get('core.oracles.pyth.wormholeState'),
-    {
-      defaultPackageId:
-        '0xa6f9bec2f9748656b6af8aafb5d7bc1a0d5faf25ac9645fc7f447822cd509325',
-      gasStationId:
-        '0xa8b8dcc9880166edb57b53e05f8df7364d31b5d9b7d107fd27f0b69cf338b687',
-    }
+    builder.address.get('core.oracles.pyth.wormholeState')
   );
   const priceIds = assetCoinNames.map((assetCoinName) =>
     builder.address.get(`core.coins.${assetCoinName}.oracle.pyth.feed`)
@@ -36,10 +29,9 @@ export const updatePythPriceFeeds = async (
       const priceUpdateData =
         await pythConnection.getPriceFeedsUpdateData(priceIds);
       await pythClient.updatePriceFeeds(
-        txBlock.txBlock,
+        txBlock.txBlock, // convert txBlock to TransactionBlock because pyth sdk not support new @mysten/sui yet
         priceUpdateData,
-        priceIds,
-        isSponsoredTx
+        priceIds
       );
 
       break;

package/src/types/builder/core.ts

@@ -99,16 +99,14 @@ export type CoreQuickMethods = {
     amount: number,
     poolCoinName: string,
     obligationId?: SuiObjectArg,
-    obligationKey?: SuiObjectArg,
-    isSponsoredTx?: boolean
+    obligationKey?: SuiObjectArg
   ) => Promise<TransactionResult>;
   borrowWithReferralQuick: (
     amount: number,
     poolCoinName: string,
     borrowReferral: SuiObjectArg,
     obligationId?: SuiObjectArg,
-    obligationKey?: SuiObjectArg,
-    isSponsoredTx?: boolean
+    obligationKey?: SuiObjectArg
   ) => Promise<TransactionResult>;
   depositQuick: (
     amount: number,