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

package/dist/types/builder/spool.d.ts

@@ -14,7 +14,7 @@ export type SpoolNormalMethods = {
 };
 export type SpoolQuickMethods = {
     stakeQuick(amountOrMarketCoin: SuiObjectArg | number, stakeMarketCoinName: SupportStakeMarketCoins, stakeAccountId?: SuiAddressArg): Promise<void>;
-    unstakeQuick(amount: number, stakeMarketCoinName: SupportStakeMarketCoins, stakeAccountId?: SuiAddressArg): Promise<TransactionResult | undefined>;
+    unstakeQuick(amount: number, stakeMarketCoinName: SupportStakeMarketCoins, stakeAccountId?: SuiAddressArg, returnSCoin?: boolean): Promise<TransactionResult | undefined>;
     claimQuick(stakeMarketCoinName: SupportStakeMarketCoins, stakeAccountId?: SuiAddressArg): Promise<TransactionResult[]>;
 };
 export type SuiTxBlockWithSpoolNormalMethods = SuiKitTxBlock & SuiTxBlockWithSCoin & SpoolNormalMethods;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scallop-io/sui-scallop-sdk",
-  "version": "0.46.47",
+  "version": "0.46.49",
   "description": "Typescript sdk for interacting with Scallop contract on SUI",
   "keywords": [
     "sui",

package/src/builders/spoolBuilder.ts

@@ -249,14 +249,19 @@ const generateSpoolQuickMethod: GenerateSpoolQuickMethod = ({
         );
       }
     },
-    unstakeQuick: async (amount, stakeMarketCoinName, stakeAccountId) => {
+    unstakeQuick: async (
+      amount,
+      stakeMarketCoinName,
+      stakeAccountId,
+      returnSCoin = true
+    ) => {
       const stakeAccounts = await requireStakeAccounts(
         builder,
         txBlock,
         stakeMarketCoinName,
         stakeAccountId
       );
-      const sCoins: TransactionResult[] = [];
+      const toTransfer: TransactionResult[] = [];
       for (const account of stakeAccounts) {
         if (account.staked === 0) continue;
         const amountToUnstake = Math.min(amount, account.staked);
@@ -267,33 +272,56 @@ const generateSpoolQuickMethod: GenerateSpoolQuickMethod = ({
         );
 
         // convert to new sCoin
-        const sCoin = txBlock.mintSCoin(stakeMarketCoinName, marketCoin);
-        sCoins.push(sCoin);
+        if (returnSCoin) {
+          const sCoin = txBlock.mintSCoin(stakeMarketCoinName, marketCoin);
+          toTransfer.push(sCoin);
+        } else {
+          toTransfer.push(marketCoin);
+        }
+
         amount -= amountToUnstake;
         if (amount === 0) break;
       }
 
-      if (sCoins.length > 0) {
-        const mergedSCoin = sCoins[0];
+      if (toTransfer.length > 0) {
+        const mergedCoin = toTransfer[0];
 
-        if (sCoins.length > 1) {
-          txBlock.mergeCoins(mergedSCoin, sCoins.slice(1));
+        if (toTransfer.length > 1) {
+          txBlock.mergeCoins(mergedCoin, toTransfer.slice(1));
         }
-        // check for existing sCoins
-        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) {
+          // check for existing sCoins
+          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) {
+            // ignore
+          }
+        } else {
+          // check for existing market coins
+          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) {
+            // ignore
           }
-        } catch (e) {
-          // ignore
         }
-        return mergedSCoin;
+        return mergedCoin;
       }
     },
     claimQuick: async (stakeMarketCoinName, stakeAccountId) => {

package/src/models/scallopClient.ts

@@ -742,12 +742,12 @@ export class ScallopClient {
     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(
@@ -793,13 +793,16 @@ export class ScallopClient {
     const stakeMarketCoin = await txBlock.unstakeQuick(
       amount,
       stakeMarketCoinName,
-      stakeAccountId
+      stakeAccountId,
+      false
     );
     const stakeCoinName =
       this.utils.parseCoinName<SupportStakeCoins>(stakeMarketCoinName);
     if (stakeMarketCoin) {
       const coin = txBlock.withdraw(stakeMarketCoin, stakeCoinName);
       txBlock.transferObjects([coin], sender);
+    } else {
+      throw new Error(`No stake found for ${stakeMarketCoinName}`);
     }
 
     if (sign) {

package/src/queries/priceQuery.ts

@@ -61,30 +61,11 @@ export const getPythPrices = async (
   query: ScallopQuery,
   assetCoinNames: SupportAssetCoins[]
 ) => {
-  const seen: Record<string, boolean> = {};
-  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) as string[];
-  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(

package/src/types/builder/spool.ts

@@ -42,7 +42,8 @@ export type SpoolQuickMethods = {
   unstakeQuick(
     amount: number,
     stakeMarketCoinName: SupportStakeMarketCoins,
-    stakeAccountId?: SuiAddressArg
+    stakeAccountId?: SuiAddressArg,
+    returnSCoin?: boolean
   ): Promise<TransactionResult | undefined>;
   claimQuick(
     stakeMarketCoinName: SupportStakeMarketCoins,

package/dist/test.d.ts

@@ -1 +0,0 @@
-export {};

package/src/test.ts

@@ -1,19 +0,0 @@
-import { Scallop } from './models';
-import * as dotenv from 'dotenv';
-dotenv.config();
-const scallop = new Scallop({
-  secretKey: process.env.SECRET_KEY as string,
-});
-
-const main = async () => {
-  const query = await scallop.createScallopQuery();
-
-  const res = await query.getVeScas(
-    '0xd1a70cfe7332e994a950b9c570e93def4b6d2ec53b34ff5c0cc9946226a7cf3d'
-  );
-  console.dir(res, { depth: null });
-};
-main()
-  .then()
-  .catch(console.error)
-  .finally(() => process.exit(0));