@scallop-io/sui-scallop-sdk 0.46.49 → 0.46.51

package/dist/index.js

@@ -330,7 +330,7 @@ var import_sui_kit = require("@scallop-io/sui-kit");
 var DEFAULT_CACHE_OPTIONS = {
   defaultOptions: {
     queries: {
-      staleTime: 3e3
+      staleTime: 1500
     }
   }
 };
@@ -1603,11 +1603,11 @@ var ScallopAddress = class {
 };
 
 // src/models/scallopClient.ts
-var import_utils23 = require("@mysten/sui.js/utils");
+var import_utils24 = require("@mysten/sui.js/utils");
 var import_sui_kit13 = require("@scallop-io/sui-kit");
 
 // src/models/scallopUtils.ts
-var import_utils9 = require("@mysten/sui.js/utils");
+var import_utils10 = require("@mysten/sui.js/utils");
 var import_sui_kit4 = require("@scallop-io/sui-kit");
 var import_pyth_sui_js = require("@pythnetwork/pyth-sui-js");
 
@@ -2036,7 +2036,7 @@ var calculateBorrowIncentivePoolPointData = (parsedBorrowIncentivePoolData, pars
     (0, import_bignumber.default)(parsedBorrowIncentivePoolPointData.baseWeight).dividedBy(
       weightScale
     )
-  ).dividedBy(weightedStakedValue).isFinite() ? rewardValueForYear.multipliedBy(
+  ).dividedBy(weightedStakedValue).isFinite() && parsedBorrowIncentivePoolPointData.points > 0 ? rewardValueForYear.multipliedBy(
     (0, import_bignumber.default)(parsedBorrowIncentivePoolPointData.baseWeight).dividedBy(
       weightScale
     )
@@ -3319,11 +3319,44 @@ var getPythPrice = async (query, assetCoinName, priceFeedObject) => {
   return 0;
 };
 var getPythPrices = async (query, assetCoinNames) => {
+  const pythPriceFeedIds = assetCoinNames.reduce(
+    (prev, assetCoinName) => {
+      const pythPriceFeed = query.address.get(
+        `core.coins.${assetCoinName}.oracle.pyth.feedObject`
+      );
+      if (!prev[pythPriceFeed]) {
+        prev[pythPriceFeed] = [assetCoinName];
+      } else {
+        prev[pythPriceFeed].push(assetCoinName);
+      }
+      return prev;
+    },
+    {}
+  );
+  const priceFeedObjects = await query.cache.queryGetObjects(
+    Object.keys(pythPriceFeedIds),
+    { showContent: true }
+  );
+  const assetToPriceFeedMapping = priceFeedObjects.reduce(
+    (prev, priceFeedObject) => {
+      pythPriceFeedIds[priceFeedObject.objectId].forEach((assetCoinName) => {
+        prev[assetCoinName] = priceFeedObject;
+      });
+      return prev;
+    },
+    {}
+  );
   return (await Promise.all(
-    assetCoinNames.map(async (assetCoinName) => ({
-      coinName: assetCoinName,
-      price: await getPythPrice(query, assetCoinName)
-    }))
+    Object.entries(assetToPriceFeedMapping).map(
+      async ([assetCoinName, priceFeedObject]) => ({
+        coinName: assetCoinName,
+        price: await getPythPrice(
+          query,
+          assetCoinName,
+          priceFeedObject
+        )
+      })
+    )
   )).reduce(
     (prev, curr) => {
       prev[curr.coinName] = curr.price;
@@ -4297,6 +4330,7 @@ var getSCoinAmount = async (query, sCoinName, ownerAddress) => {
 };
 
 // src/models/scallopQuery.ts
+var import_utils9 = require("@mysten/sui.js/utils");
 var ScallopQuery = class {
   constructor(params, instance) {
     this.params = params;
@@ -4316,6 +4350,9 @@ var ScallopQuery = class {
       query: this
     });
     this.indexer = new ScallopIndexer(this.params, { cache: this.cache });
+    this.walletAddress = (0, import_utils9.normalizeSuiAddress)(
+      params?.walletAddress || this.suiKit.currentAddress()
+    );
   }
   /**
    * Request the scallop API to initialize data.
@@ -4394,7 +4431,7 @@ var ScallopQuery = class {
    * @param ownerAddress - The owner address.
    * @return Obligations data.
    */
-  async getObligations(ownerAddress) {
+  async getObligations(ownerAddress = this.walletAddress) {
     return await getObligations(this, ownerAddress);
   }
   /**
@@ -4413,7 +4450,7 @@ var ScallopQuery = class {
    * @param ownerAddress - The owner address.
    * @return All coin amounts.
    */
-  async getCoinAmounts(assetCoinNames, ownerAddress) {
+  async getCoinAmounts(assetCoinNames, ownerAddress = this.walletAddress) {
     return await getCoinAmounts(this, assetCoinNames, ownerAddress);
   }
   /**
@@ -4423,7 +4460,7 @@ var ScallopQuery = class {
    * @param ownerAddress - The owner address.
    * @return Coin amount.
    */
-  async getCoinAmount(assetCoinName, ownerAddress) {
+  async getCoinAmount(assetCoinName, ownerAddress = this.walletAddress) {
     return await getCoinAmount(this, assetCoinName, ownerAddress);
   }
   /**
@@ -4433,7 +4470,7 @@ var ScallopQuery = class {
    * @param ownerAddress - The owner address.
    * @return All market market coin amounts.
    */
-  async getMarketCoinAmounts(marketCoinNames, ownerAddress) {
+  async getMarketCoinAmounts(marketCoinNames, ownerAddress = this.walletAddress) {
     return await getMarketCoinAmounts(this, marketCoinNames, ownerAddress);
   }
   /**
@@ -4443,7 +4480,7 @@ var ScallopQuery = class {
    * @param ownerAddress - The owner address.
    * @return Market market coin amount.
    */
-  async getMarketCoinAmount(marketCoinName, ownerAddress) {
+  async getMarketCoinAmount(marketCoinName, ownerAddress = this.walletAddress) {
     return await getMarketCoinAmount(this, marketCoinName, ownerAddress);
   }
   /**
@@ -4491,7 +4528,7 @@ var ScallopQuery = class {
    * @param ownerAddress - The owner address.
    * @return All Stake accounts data.
    */
-  async getAllStakeAccounts(ownerAddress) {
+  async getAllStakeAccounts(ownerAddress = this.walletAddress) {
     return await getStakeAccounts(this, ownerAddress);
   }
   /**
@@ -4501,7 +4538,7 @@ var ScallopQuery = class {
    * @param ownerAddress - The owner address.
    * @return Stake accounts data.
    */
-  async getStakeAccounts(stakeMarketCoinName, ownerAddress) {
+  async getStakeAccounts(stakeMarketCoinName, ownerAddress = this.walletAddress) {
     const allStakeAccount = await this.getAllStakeAccounts(ownerAddress);
     return allStakeAccount[stakeMarketCoinName] ?? [];
   }
@@ -4606,7 +4643,7 @@ var ScallopQuery = class {
    * @param indexer - Whether to use indexer.
    * @return All lending and spool infomation.
    */
-  async getLendings(poolCoinNames, ownerAddress, indexer = false) {
+  async getLendings(poolCoinNames, ownerAddress = this.walletAddress, indexer = false) {
     return await getLendings(this, poolCoinNames, ownerAddress, indexer);
   }
   /**
@@ -4617,7 +4654,7 @@ var ScallopQuery = class {
    * @param indexer - Whether to use indexer.
    * @return Lending pool data.
    */
-  async getLending(poolCoinName, ownerAddress, indexer = false) {
+  async getLending(poolCoinName, ownerAddress = this.walletAddress, indexer = false) {
     return await getLending(this, poolCoinName, ownerAddress, indexer);
   }
   /**
@@ -4630,7 +4667,7 @@ var ScallopQuery = class {
    * @param indexer - Whether to use indexer.
    * @return All obligation accounts information.
    */
-  async getObligationAccounts(ownerAddress, indexer = false) {
+  async getObligationAccounts(ownerAddress = this.walletAddress, indexer = false) {
     return await getObligationAccounts(this, ownerAddress, indexer);
   }
   /**
@@ -4644,7 +4681,7 @@ var ScallopQuery = class {
    * @param indexer - Whether to use indexer.
    * @return Borrowing and collateral information.
    */
-  async getObligationAccount(obligationId, ownerAddress, indexer = false) {
+  async getObligationAccount(obligationId, ownerAddress = this.walletAddress, indexer = false) {
     return await getObligationAccount(
       this,
       obligationId,
@@ -4726,7 +4763,7 @@ var ScallopQuery = class {
    * @param ownerAddress - The owner address.
    * @return All market sCoin amounts.
    */
-  async getSCoinAmounts(sCoinNames, ownerAddress) {
+  async getSCoinAmounts(sCoinNames, ownerAddress = this.walletAddress) {
     return await getSCoinAmounts(this, sCoinNames, ownerAddress);
   }
   /**
@@ -4736,7 +4773,7 @@ var ScallopQuery = class {
    * @param ownerAddress - The owner address.
    * @return sCoin amount.
    */
-  async getSCoinAmount(sCoinName, ownerAddress) {
+  async getSCoinAmount(sCoinName, ownerAddress = this.walletAddress) {
     const parsedSCoinName = this.utils.parseSCoinName(sCoinName);
     return parsedSCoinName ? await getSCoinAmount(this, parsedSCoinName, ownerAddress) : 0;
   }
@@ -4841,7 +4878,7 @@ var ScallopUtils = class {
       throw Error(`Coin ${coinName} is not supported`);
     }
     if (coinName === "sui")
-      return (0, import_utils9.normalizeStructTag)(`${coinPackageId}::sui::SUI`);
+      return (0, import_utils10.normalizeStructTag)(`${coinPackageId}::sui::SUI`);
     const wormHolePckageIds = [
       this._address.get("core.coins.usdc.id") ?? wormholeCoinIds.usdc,
       this._address.get("core.coins.usdt.id") ?? wormholeCoinIds.usdt,
@@ -4916,7 +4953,7 @@ var ScallopUtils = class {
     return `${protocolObjectId}::reserve::MarketCoin<${coinType}>`;
   }
   parseCoinNameFromType(coinType) {
-    coinType = (0, import_utils9.normalizeStructTag)(coinType);
+    coinType = (0, import_utils10.normalizeStructTag)(coinType);
     const coinTypeRegex = new RegExp(`((0x[^:]+::[^:]+::[^<>]+))(?![^<>]*<)`);
     const coinTypeMatch = coinType.match(coinTypeRegex);
     const isMarketCoinType = coinType.includes("reserve::MarketCoin");
@@ -4980,7 +5017,7 @@ var ScallopUtils = class {
    * @param coinType - The coin type, default is 0x2::SUI::SUI.
    * @return The selected transaction coin arguments.
    */
-  async selectCoins(amount, coinType = import_utils9.SUI_TYPE_ARG, ownerAddress) {
+  async selectCoins(amount, coinType = import_utils10.SUI_TYPE_ARG, ownerAddress) {
     ownerAddress = ownerAddress || this._suiKit.currentAddress();
     const coins = await this._suiKit.suiInteractor.selectCoins(
       ownerAddress,
@@ -5161,16 +5198,16 @@ var ScallopUtils = class {
 };
 
 // src/models/scallopBuilder.ts
-var import_utils22 = require("@mysten/sui.js/utils");
+var import_utils23 = require("@mysten/sui.js/utils");
 var import_sui_kit12 = require("@scallop-io/sui-kit");
 
 // src/builders/coreBuilder.ts
 var import_transactions = require("@mysten/sui.js/transactions");
-var import_utils12 = require("@mysten/sui.js/utils");
+var import_utils13 = require("@mysten/sui.js/utils");
 var import_sui_kit5 = require("@scallop-io/sui-kit");
 
 // src/builders/oracle.ts
-var import_utils11 = require("@mysten/sui.js/utils");
+var import_utils12 = require("@mysten/sui.js/utils");
 var import_pyth_sui_js2 = require("@pythnetwork/pyth-sui-js");
 var updateOracles = async (builder, txBlock, assetCoinNames) => {
   assetCoinNames = assetCoinNames ?? [
@@ -5284,27 +5321,27 @@ var priceUpdateRequest = (txBlock, packageId, xOracleId, coinType) => {
 var confirmPriceUpdateRequest = (txBlock, packageId, xOracleId, request, coinType) => {
   const target = `${packageId}::x_oracle::confirm_price_update_request`;
   const typeArgs = [coinType];
-  txBlock.moveCall(target, [xOracleId, request, import_utils11.SUI_CLOCK_OBJECT_ID], typeArgs);
+  txBlock.moveCall(target, [xOracleId, request, import_utils12.SUI_CLOCK_OBJECT_ID], typeArgs);
   return txBlock;
 };
 var updateSupraPrice = (txBlock, packageId, request, holderId, registryId, coinType) => {
   txBlock.moveCall(
     `${packageId}::rule::set_price`,
-    [request, holderId, registryId, import_utils11.SUI_CLOCK_OBJECT_ID],
+    [request, holderId, registryId, import_utils12.SUI_CLOCK_OBJECT_ID],
     [coinType]
   );
 };
 var updateSwitchboardPrice = (txBlock, packageId, request, aggregatorId, registryId, coinType) => {
   txBlock.moveCall(
     `${packageId}::rule::set_price`,
-    [request, aggregatorId, registryId, import_utils11.SUI_CLOCK_OBJECT_ID],
+    [request, aggregatorId, registryId, import_utils12.SUI_CLOCK_OBJECT_ID],
     [coinType]
   );
 };
 var updatePythPrice = (txBlock, packageId, request, stateId, feedObjectId, registryId, coinType) => {
   txBlock.moveCall(
     `${packageId}::rule::set_price`,
-    [request, stateId, feedObjectId, registryId, import_utils11.SUI_CLOCK_OBJECT_ID],
+    [request, stateId, feedObjectId, registryId, import_utils12.SUI_CLOCK_OBJECT_ID],
     [coinType]
   );
 };
@@ -5375,7 +5412,7 @@ var generateCoreNormalMethod = ({
           coreIds.coinDecimalsRegistry,
           amount,
           coreIds.xOracle,
-          import_utils12.SUI_CLOCK_OBJECT_ID
+          import_utils13.SUI_CLOCK_OBJECT_ID
         ],
         [coinType]
       );
@@ -5384,7 +5421,7 @@ var generateCoreNormalMethod = ({
       const coinType = builder.utils.parseCoinType(poolCoinName);
       return txBlock.moveCall(
         `${coreIds.protocolPkg}::mint::mint`,
-        [coreIds.version, coreIds.market, coin, import_utils12.SUI_CLOCK_OBJECT_ID],
+        [coreIds.version, coreIds.market, coin, import_utils13.SUI_CLOCK_OBJECT_ID],
         [coinType]
       );
     },
@@ -5392,7 +5429,7 @@ var generateCoreNormalMethod = ({
       const coinType = builder.utils.parseCoinType(poolCoinName);
       return txBlock.moveCall(
         `${coreIds.protocolPkg}::mint::mint_entry`,
-        [coreIds.version, coreIds.market, coin, import_utils12.SUI_CLOCK_OBJECT_ID],
+        [coreIds.version, coreIds.market, coin, import_utils13.SUI_CLOCK_OBJECT_ID],
         [coinType]
       );
     },
@@ -5400,7 +5437,7 @@ var generateCoreNormalMethod = ({
       const coinType = builder.utils.parseCoinType(poolCoinName);
       return txBlock.moveCall(
         `${coreIds.protocolPkg}::redeem::redeem`,
-        [coreIds.version, coreIds.market, marketCoin, import_utils12.SUI_CLOCK_OBJECT_ID],
+        [coreIds.version, coreIds.market, marketCoin, import_utils13.SUI_CLOCK_OBJECT_ID],
         [coinType]
       );
     },
@@ -5408,7 +5445,7 @@ var generateCoreNormalMethod = ({
       const coinType = builder.utils.parseCoinType(poolCoinName);
       return txBlock.moveCall(
         `${coreIds.protocolPkg}::redeem::redeem_entry`,
-        [coreIds.version, coreIds.market, marketCoin, import_utils12.SUI_CLOCK_OBJECT_ID],
+        [coreIds.version, coreIds.market, marketCoin, import_utils13.SUI_CLOCK_OBJECT_ID],
         [coinType]
       );
     },
@@ -5424,7 +5461,7 @@ var generateCoreNormalMethod = ({
           coreIds.coinDecimalsRegistry,
           amount,
           coreIds.xOracle,
-          import_utils12.SUI_CLOCK_OBJECT_ID
+          import_utils13.SUI_CLOCK_OBJECT_ID
         ],
         [coinType]
       );
@@ -5442,7 +5479,7 @@ var generateCoreNormalMethod = ({
           borrowReferral,
           amount,
           coreIds.xOracle,
-          import_utils12.SUI_CLOCK_OBJECT_ID
+          import_utils13.SUI_CLOCK_OBJECT_ID
         ],
         [coinType, referralWitnessType]
       );
@@ -5459,7 +5496,7 @@ var generateCoreNormalMethod = ({
           coreIds.coinDecimalsRegistry,
           amount,
           coreIds.xOracle,
-          import_utils12.SUI_CLOCK_OBJECT_ID
+          import_utils13.SUI_CLOCK_OBJECT_ID
         ],
         [coinType]
       );
@@ -5473,7 +5510,7 @@ var generateCoreNormalMethod = ({
           obligation,
           coreIds.market,
           coin,
-          import_utils12.SUI_CLOCK_OBJECT_ID
+          import_utils13.SUI_CLOCK_OBJECT_ID
         ],
         [coinType]
       );
@@ -5708,7 +5745,7 @@ var newCoreTxBlock = (builder, initTxBlock) => {
 
 // src/builders/spoolBuilder.ts
 var import_transactions2 = require("@mysten/sui.js/transactions");
-var import_utils14 = require("@mysten/sui.js/utils");
+var import_utils15 = require("@mysten/sui.js/utils");
 var import_sui_kit6 = require("@scallop-io/sui-kit");
 var requireStakeAccountIds = async (...params) => {
   const [builder, txBlock, stakeMarketCoinName, stakeAccountId] = params;
@@ -5764,7 +5801,7 @@ var generateSpoolNormalMethod = ({
       );
       return txBlock.moveCall(
         `${spoolIds.spoolPkg}::user::new_spool_account`,
-        [stakePoolId, import_utils14.SUI_CLOCK_OBJECT_ID],
+        [stakePoolId, import_utils15.SUI_CLOCK_OBJECT_ID],
         [marketCoinType]
       );
     },
@@ -5775,7 +5812,7 @@ var generateSpoolNormalMethod = ({
       );
       txBlock.moveCall(
         `${spoolIds.spoolPkg}::user::stake`,
-        [stakePoolId, stakeAccount, coin, import_utils14.SUI_CLOCK_OBJECT_ID],
+        [stakePoolId, stakeAccount, coin, import_utils15.SUI_CLOCK_OBJECT_ID],
         [marketCoinType]
       );
     },
@@ -5786,7 +5823,7 @@ var generateSpoolNormalMethod = ({
       );
       return txBlock.moveCall(
         `${spoolIds.spoolPkg}::user::unstake`,
-        [stakePoolId, stakeAccount, amount, import_utils14.SUI_CLOCK_OBJECT_ID],
+        [stakePoolId, stakeAccount, amount, import_utils15.SUI_CLOCK_OBJECT_ID],
         [marketCoinType]
       );
     },
@@ -5802,7 +5839,7 @@ var generateSpoolNormalMethod = ({
       const rewardCoinType = builder.utils.parseCoinType(rewardCoinName);
       return txBlock.moveCall(
         `${spoolIds.spoolPkg}::user::redeem_rewards`,
-        [stakePoolId, rewardPoolId, stakeAccount, import_utils14.SUI_CLOCK_OBJECT_ID],
+        [stakePoolId, rewardPoolId, stakeAccount, import_utils15.SUI_CLOCK_OBJECT_ID],
         [marketCoinType, rewardCoinType]
       );
     }
@@ -5959,7 +5996,7 @@ var newSpoolTxBlock = (builder, initTxBlock) => {
 
 // src/builders/borrowIncentiveBuilder.ts
 var import_transactions3 = require("@mysten/sui.js/transactions");
-var import_utils17 = require("@mysten/sui.js/utils");
+var import_utils18 = require("@mysten/sui.js/utils");
 var import_sui_kit8 = require("@scallop-io/sui-kit");
 
 // src/builders/vescaBuilder.ts
@@ -6285,7 +6322,7 @@ var generateBorrowIncentiveNormalMethod = ({ builder, txBlock }) => {
           obligationKey,
           obligationId,
           borrowIncentiveIds.obligationAccessStore,
-          import_utils17.SUI_CLOCK_OBJECT_ID
+          import_utils18.SUI_CLOCK_OBJECT_ID
         ]
       );
     },
@@ -6303,7 +6340,7 @@ var generateBorrowIncentiveNormalMethod = ({ builder, txBlock }) => {
           veScaIds.treasury,
           veScaIds.table,
           veScaKey,
-          import_utils17.SUI_CLOCK_OBJECT_ID
+          import_utils18.SUI_CLOCK_OBJECT_ID
         ],
         []
       );
@@ -6317,7 +6354,7 @@ var generateBorrowIncentiveNormalMethod = ({ builder, txBlock }) => {
           borrowIncentiveIds.incentiveAccounts,
           obligationKey,
           obligationId,
-          import_utils17.SUI_CLOCK_OBJECT_ID
+          import_utils18.SUI_CLOCK_OBJECT_ID
         ]
       );
     },
@@ -6335,7 +6372,7 @@ var generateBorrowIncentiveNormalMethod = ({ builder, txBlock }) => {
           borrowIncentiveIds.incentiveAccounts,
           obligationKey,
           obligationId,
-          import_utils17.SUI_CLOCK_OBJECT_ID
+          import_utils18.SUI_CLOCK_OBJECT_ID
         ],
         [rewardType]
       );
@@ -6349,7 +6386,7 @@ var generateBorrowIncentiveNormalMethod = ({ builder, txBlock }) => {
           borrowIncentiveIds.incentiveAccounts,
           obligation,
           veScaKey,
-          import_utils17.SUI_CLOCK_OBJECT_ID
+          import_utils18.SUI_CLOCK_OBJECT_ID
         ]
       );
     }
@@ -6828,7 +6865,7 @@ var ScallopBuilder = class {
       query: this.query,
       cache: this.cache
     });
-    this.walletAddress = (0, import_utils22.normalizeSuiAddress)(
+    this.walletAddress = (0, import_utils23.normalizeSuiAddress)(
       params?.walletAddress || this.suiKit.currentAddress()
     );
     this.isTestnet = params.networkType ? params.networkType === "testnet" : false;
@@ -6866,7 +6903,7 @@ var ScallopBuilder = class {
    * @param sender - Sender address.
    * @return Take coin and left coin.
    */
-  async selectCoin(txBlock, assetCoinName, amount, sender) {
+  async selectCoin(txBlock, assetCoinName, amount, sender = this.walletAddress) {
     const coinType = this.utils.parseCoinType(assetCoinName);
     const coins = await this.utils.selectCoins(amount, coinType, sender);
     const [takeCoin, leftCoin] = txBlock.takeAmountFromCoins(coins, amount);
@@ -6881,7 +6918,7 @@ var ScallopBuilder = class {
    * @param sender - Sender address.
    * @return Take coin and left coin.
    */
-  async selectMarketCoin(txBlock, marketCoinName, amount, sender) {
+  async selectMarketCoin(txBlock, marketCoinName, amount, sender = this.walletAddress) {
     const marketCoinType = this.utils.parseMarketCoinType(marketCoinName);
     const coins = await this.utils.selectCoins(amount, marketCoinType, sender);
     const totalAmount = coins.reduce((prev, coin) => {
@@ -6903,7 +6940,7 @@ var ScallopBuilder = class {
    * @param sender - Sender address.
    * @return Take coin and left coin.
    */
-  async selectSCoin(txBlock, sCoinName, amount, sender) {
+  async selectSCoin(txBlock, sCoinName, amount, sender = this.walletAddress) {
     const sCoinType = this.utils.parseSCoinType(sCoinName);
     const coins = await this.utils.selectCoins(amount, sCoinType, sender);
     const totalAmount = coins.reduce((prev, coin) => {
@@ -6963,7 +7000,7 @@ var ScallopClient = class {
       utils: this.utils,
       cache: this.cache
     });
-    this.walletAddress = (0, import_utils23.normalizeSuiAddress)(
+    this.walletAddress = (0, import_utils24.normalizeSuiAddress)(
       params?.walletAddress || this.suiKit.currentAddress()
     );
   }