@scallop-io/sui-scallop-sdk 0.46.48 → 0.46.50

package/dist/index.mjs

@@ -1529,7 +1529,7 @@ var ScallopAddress = class {
 };
 
 // src/models/scallopClient.ts
-import { normalizeSuiAddress as normalizeSuiAddress3 } from "@mysten/sui.js/utils";
+import { normalizeSuiAddress as normalizeSuiAddress4 } from "@mysten/sui.js/utils";
 import { SuiKit as SuiKit4 } from "@scallop-io/sui-kit";
 
 // src/models/scallopUtils.ts
@@ -1962,7 +1962,7 @@ var calculateBorrowIncentivePoolPointData = (parsedBorrowIncentivePoolData, pars
     BigNumber(parsedBorrowIncentivePoolPointData.baseWeight).dividedBy(
       weightScale
     )
-  ).dividedBy(weightedStakedValue).isFinite() ? rewardValueForYear.multipliedBy(
+  ).dividedBy(weightedStakedValue).isFinite() && parsedBorrowIncentivePoolPointData.points > 0 ? rewardValueForYear.multipliedBy(
     BigNumber(parsedBorrowIncentivePoolPointData.baseWeight).dividedBy(
       weightScale
     )
@@ -3245,27 +3245,44 @@ var getPythPrice = async (query, assetCoinName, priceFeedObject) => {
   return 0;
 };
 var getPythPrices = async (query, assetCoinNames) => {
-  const seen = {};
-  const pythFeedObjectIds = assetCoinNames.map((assetCoinName) => {
-    const pythFeedObjectId = query.address.get(
-      `core.coins.${assetCoinName}.oracle.pyth.feedObject`
-    );
-    if (seen[pythFeedObjectId])
-      return null;
-    seen[pythFeedObjectId] = true;
-    return pythFeedObjectId;
-  }).filter((item) => !!item);
+  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(
-    pythFeedObjectIds,
-    {
-      showContent: true
-    }
+    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(
-    priceFeedObjects.map(async (priceFeedObject, idx) => ({
-      coinName: assetCoinNames[idx],
-      price: await getPythPrice(query, assetCoinNames[idx], priceFeedObject)
-    }))
+    Object.entries(assetToPriceFeedMapping).map(
+      async ([assetCoinName, priceFeedObject]) => ({
+        coinName: assetCoinName,
+        price: await getPythPrice(
+          query,
+          assetCoinName,
+          priceFeedObject
+        )
+      })
+    )
   )).reduce(
     (prev, curr) => {
       prev[curr.coinName] = curr.price;
@@ -4239,6 +4256,7 @@ var getSCoinAmount = async (query, sCoinName, ownerAddress) => {
 };
 
 // src/models/scallopQuery.ts
+import { normalizeSuiAddress as normalizeSuiAddress2 } from "@mysten/sui.js/utils";
 var ScallopQuery = class {
   constructor(params, instance) {
     this.params = params;
@@ -4258,6 +4276,9 @@ var ScallopQuery = class {
       query: this
     });
     this.indexer = new ScallopIndexer(this.params, { cache: this.cache });
+    this.walletAddress = normalizeSuiAddress2(
+      params?.walletAddress || this.suiKit.currentAddress()
+    );
   }
   /**
    * Request the scallop API to initialize data.
@@ -4336,7 +4357,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);
   }
   /**
@@ -4355,7 +4376,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);
   }
   /**
@@ -4365,7 +4386,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);
   }
   /**
@@ -4375,7 +4396,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);
   }
   /**
@@ -4385,7 +4406,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);
   }
   /**
@@ -4433,7 +4454,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);
   }
   /**
@@ -4443,7 +4464,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] ?? [];
   }
@@ -4548,7 +4569,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);
   }
   /**
@@ -4559,7 +4580,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);
   }
   /**
@@ -4572,7 +4593,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);
   }
   /**
@@ -4586,7 +4607,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,
@@ -4668,7 +4689,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);
   }
   /**
@@ -4678,7 +4699,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;
   }
@@ -5103,7 +5124,7 @@ var ScallopUtils = class {
 };
 
 // src/models/scallopBuilder.ts
-import { normalizeSuiAddress as normalizeSuiAddress2 } from "@mysten/sui.js/utils";
+import { normalizeSuiAddress as normalizeSuiAddress3 } from "@mysten/sui.js/utils";
 import { SuiKit as SuiKit3 } from "@scallop-io/sui-kit";
 
 // src/builders/coreBuilder.ts
@@ -6784,7 +6805,7 @@ var ScallopBuilder = class {
       query: this.query,
       cache: this.cache
     });
-    this.walletAddress = normalizeSuiAddress2(
+    this.walletAddress = normalizeSuiAddress3(
       params?.walletAddress || this.suiKit.currentAddress()
     );
     this.isTestnet = params.networkType ? params.networkType === "testnet" : false;
@@ -6822,7 +6843,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);
@@ -6837,7 +6858,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) => {
@@ -6859,7 +6880,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) => {
@@ -6919,7 +6940,7 @@ var ScallopClient = class {
       utils: this.utils,
       cache: this.cache
     });
-    this.walletAddress = normalizeSuiAddress3(
+    this.walletAddress = normalizeSuiAddress4(
       params?.walletAddress || this.suiKit.currentAddress()
     );
   }
@@ -7266,12 +7287,12 @@ var ScallopClient = class {
     const txBlock = this.builder.createTxBlock();
     const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
-    const marketCoin = await txBlock.unstakeQuick(
+    const sCoin = await txBlock.unstakeQuick(
       amount,
       stakeMarketCoinName,
       stakeAccountId
     );
-    txBlock.transferObjects([marketCoin], sender);
+    txBlock.transferObjects([sCoin], sender);
     if (sign) {
       return await this.suiKit.signAndSendTxn(
         txBlock
@@ -7287,12 +7308,15 @@ var ScallopClient = class {
     const stakeMarketCoin = await txBlock.unstakeQuick(
       amount,
       stakeMarketCoinName,
-      stakeAccountId
+      stakeAccountId,
+      false
     );
     const stakeCoinName = this.utils.parseCoinName(stakeMarketCoinName);
     if (stakeMarketCoin) {
       const coin = txBlock.withdraw(stakeMarketCoin, stakeCoinName);
       txBlock.transferObjects([coin], sender);
+    } else {
+      throw new Error(`No stake found for ${stakeMarketCoinName}`);
     }
     if (sign) {
       return await this.suiKit.signAndSendTxn(