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

package/dist/index.js

@@ -3319,26 +3319,10 @@ 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 priceFeedObjects = await query.cache.queryGetObjects(
-    pythFeedObjectIds,
-    {
-      showContent: true
-    }
-  );
   return (await Promise.all(
-    priceFeedObjects.map(async (priceFeedObject, idx) => ({
-      coinName: assetCoinNames[idx],
-      price: await getPythPrice(query, assetCoinNames[idx], priceFeedObject)
+    assetCoinNames.map(async (assetCoinName) => ({
+      coinName: assetCoinName,
+      price: await getPythPrice(query, assetCoinName)
     }))
   )).reduce(
     (prev, curr) => {
@@ -5869,14 +5853,14 @@ var generateSpoolQuickMethod = ({
         );
       }
     },
-    unstakeQuick: async (amount, stakeMarketCoinName, stakeAccountId) => {
+    unstakeQuick: async (amount, stakeMarketCoinName, stakeAccountId, returnSCoin = true) => {
       const stakeAccounts = await requireStakeAccounts(
         builder,
         txBlock,
         stakeMarketCoinName,
         stakeAccountId
       );
-      const sCoins2 = [];
+      const toTransfer = [];
       for (const account of stakeAccounts) {
         if (account.staked === 0)
           continue;
@@ -5886,29 +5870,47 @@ var generateSpoolQuickMethod = ({
           amountToUnstake,
           stakeMarketCoinName
         );
-        const sCoin = txBlock.mintSCoin(stakeMarketCoinName, marketCoin);
-        sCoins2.push(sCoin);
+        if (returnSCoin) {
+          const sCoin = txBlock.mintSCoin(stakeMarketCoinName, marketCoin);
+          toTransfer.push(sCoin);
+        } else {
+          toTransfer.push(marketCoin);
+        }
         amount -= amountToUnstake;
         if (amount === 0)
           break;
       }
-      if (sCoins2.length > 0) {
-        const mergedSCoin = sCoins2[0];
-        if (sCoins2.length > 1) {
-          txBlock.mergeCoins(mergedSCoin, sCoins2.slice(1));
+      if (toTransfer.length > 0) {
+        const mergedCoin = toTransfer[0];
+        if (toTransfer.length > 1) {
+          txBlock.mergeCoins(mergedCoin, toTransfer.slice(1));
         }
-        try {
-          const existingCoins = await builder.utils.selectCoins(
-            Number.MAX_SAFE_INTEGER,
-            builder.utils.parseSCoinType(stakeMarketCoinName),
-            requireSender(txBlock)
-          );
-          if (existingCoins.length > 0) {
-            txBlock.mergeCoins(mergedSCoin, existingCoins);
+        if (returnSCoin) {
+          try {
+            const existingCoins = await builder.utils.selectCoins(
+              Number.MAX_SAFE_INTEGER,
+              builder.utils.parseSCoinType(stakeMarketCoinName),
+              requireSender(txBlock)
+            );
+            if (existingCoins.length > 0) {
+              txBlock.mergeCoins(mergedCoin, existingCoins);
+            }
+          } catch (e) {
+          }
+        } else {
+          try {
+            const existingCoins = await builder.utils.selectCoins(
+              Number.MAX_SAFE_INTEGER,
+              builder.utils.parseMarketCoinType(stakeMarketCoinName),
+              requireSender(txBlock)
+            );
+            if (existingCoins.length > 0) {
+              txBlock.mergeCoins(mergedCoin, existingCoins);
+            }
+          } catch (e) {
           }
-        } catch (e) {
         }
-        return mergedSCoin;
+        return mergedCoin;
       }
     },
     claimQuick: async (stakeMarketCoinName, stakeAccountId) => {
@@ -7308,12 +7310,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
@@ -7329,12 +7331,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(