@scallop-io/sui-scallop-sdk 2.0.8-emerging-asset-alpha.1 → 2.0.8

package/package.json

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

package/src/models/scallopClient.ts

@@ -1001,89 +1001,80 @@ export class ScallopClient {
    */
   public async migrateAllMarketCoin<S extends boolean>(
     includeStakePool: boolean = true,
-    sign: S = true as S
+    sign: S = true as S,
+    walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
+    const sender = walletAddress ?? this.walletAddress;
     const txBlock = this.builder.createTxBlock();
-    txBlock.setSender(this.walletAddress);
+    txBlock.setSender(sender);
 
     const toTransfer: SuiObjectArg[] = [];
-    await Promise.all(
-      [...this.constants.whitelist.scoin].map(async (sCoinName) => {
-        /**
-         * First check marketCoin inside mini wallet
-         * Then check stakedMarketCoin inside spool
-         */
-        const sCoins: SuiObjectArg[] = [];
-        let toDestroyMarketCoin: SuiObjectArg | undefined;
-
-        // check market coin in mini wallet
-        try {
-          const marketCoins = await this.utils.selectCoins(
-            Number.MAX_SAFE_INTEGER,
-            this.utils.parseMarketCoinType(sCoinName as string),
-            this.walletAddress
-          ); // throw error no coins found
-
-          toDestroyMarketCoin = marketCoins[0];
-          if (marketCoins.length > 1) {
-            txBlock.mergeCoins(toDestroyMarketCoin, marketCoins.slice(1));
-          }
-        } catch (e: any) {
-          // Ignore
-          const errMsg = e.toString() as String;
-          if (!errMsg.includes('No valid coins found for the transaction'))
-            throw e;
-        }
-
-        // if market coin found, mint sCoin
-        if (toDestroyMarketCoin) {
+    for (const sCoinName of this.constants.whitelist.scoin) {
+      /**
+       * First check marketCoin inside mini wallet
+       * Then check stakedMarketCoin inside spool
+       */
+      const sCoins: SuiObjectArg[] = [];
+
+      // check market coin in mini wallet
+      try {
+        const { takeCoin } = await this.builder.selectMarketCoin(
+          txBlock,
+          sCoinName,
+          Number.MAX_SAFE_INTEGER,
+          sender
+        ); // throw error no coins found
+
+        if (takeCoin) {
           // mint new sCoin
-          const sCoin = txBlock.mintSCoin(
-            sCoinName as string,
-            toDestroyMarketCoin
-          );
-
-          const sCoinType = this.utils.parseSCoinType(sCoinName as string);
-          if (!sCoinType) throw new Error('Invalid sCoin type');
-          // Merge with existing sCoin
-          await this.utils.mergeSimilarCoins(
-            txBlock,
-            sCoin,
-            sCoinType,
-            requireSender(txBlock)
-          );
+          const sCoin = txBlock.mintSCoin(sCoinName as string, takeCoin);
           sCoins.push(sCoin);
         }
-        if (includeStakePool) {
-          // check for staked market coin in spool
-          if (this.constants.whitelist.spool.has(sCoinName as string)) {
-            try {
-              const sCoin = await txBlock.unstakeQuick(
-                Number.MAX_SAFE_INTEGER,
-                sCoinName as string
-              );
-              if (sCoin) {
-                sCoins.push(sCoin);
-              }
-            } catch (_e: any) {
-              // ignore
+      } catch (e: any) {
+        // Ignore
+        const errMsg = e.toString() as String;
+        if (!errMsg.includes('No valid coins found for the transaction'))
+          throw e;
+      }
+
+      // if market coin found, mint sCoin
+      if (includeStakePool) {
+        // check for staked market coin in spool
+        if (this.constants.whitelist.spool.has(sCoinName as string)) {
+          try {
+            const sCoin = await txBlock.unstakeQuick(
+              Number.MAX_SAFE_INTEGER,
+              sCoinName as string
+            );
+            if (sCoin) {
+              sCoins.push(sCoin);
             }
+          } catch (_e: any) {
+            // ignore
           }
         }
+      }
 
-        if (sCoins.length > 0) {
-          const mergedSCoin = sCoins[0];
-          if (sCoins.length > 1) {
-            txBlock.mergeCoins(mergedSCoin, sCoins.slice(1));
-          }
-
-          toTransfer.push(mergedSCoin);
+      if (sCoins.length > 0) {
+        const mergedSCoin = sCoins[0];
+        if (sCoins.length > 1) {
+          txBlock.mergeCoins(mergedSCoin, sCoins.slice(1));
         }
-      })
-    );
+        const sCoinType = this.utils.parseSCoinType(sCoinName as string);
+
+        // Merge with existing sCoin in wallet
+        await this.utils.mergeSimilarCoins(
+          txBlock,
+          mergedSCoin,
+          sCoinType,
+          sender
+        );
+        toTransfer.push(mergedSCoin);
+      }
+    }
 
     if (toTransfer.length > 0) {
-      txBlock.transferObjects(toTransfer, this.walletAddress);
+      txBlock.transferObjects(toTransfer, sender);
     }
 
     if (sign) {
@@ -1101,15 +1092,18 @@ export class ScallopClient {
    */
   public async claimAllUnlockedSca(): Promise<SuiTransactionBlockResponse>;
   public async claimAllUnlockedSca<S extends boolean>(
+    walletAddress?: string,
     sign?: S
   ): Promise<ScallopClientVeScaReturnType<S>>;
   public async claimAllUnlockedSca<S extends boolean>(
+    walletAddress?: string,
     sign: S = true as S
   ): Promise<ScallopClientVeScaReturnType<S>> {
+    const sender = walletAddress ?? this.walletAddress;
     // get all veSca keys
     const veScaKeys = (
       (await this.query.getVeScas({
-        walletAddress: this.walletAddress,
+        walletAddress: sender,
       })) ?? []
     ).map(({ keyObject }) => keyObject);
     if (veScaKeys.length === 0) {
@@ -1118,7 +1112,7 @@ export class ScallopClient {
 
     const scaCoins: TransactionResult[] = [];
     const tx = this.builder.createTxBlock();
-    tx.setSender(this.walletAddress);
+    tx.setSender(sender);
 
     await Promise.all(
       veScaKeys.map(async (key) => {
@@ -1139,12 +1133,7 @@ export class ScallopClient {
     if (scaCoins.length > 1) {
       tx.mergeCoins(scaCoins[0], scaCoins.slice(1));
     }
-    await this.utils.mergeSimilarCoins(
-      tx,
-      scaCoins[0],
-      'sca',
-      this.walletAddress
-    );
+    await this.utils.mergeSimilarCoins(tx, scaCoins[0], 'sca', sender);
 
     if (sign) {
       return (await this.suiKit.signAndSendTxn(

package/src/models/scallopConstants.ts

@@ -42,7 +42,6 @@ export class ScallopConstants {
     oracles: new Set(),
     pythEndpoints: new Set(),
     deprecated: new Set(),
-    emerging: new Set(),
   };
 
   private _coinDecimals: Record<string, number | undefined> = {};

package/src/queries/coreQuery.ts

@@ -230,6 +230,7 @@ const queryRequiredMarketObjects = async (
     borrowFeeKey: query.constants.poolAddresses[t]?.borrowFeeKey,
     supplyLimitKey: query.constants.poolAddresses[t]?.supplyLimitKey,
     borrowLimitKey: query.constants.poolAddresses[t]?.borrowLimitKey,
+    isolatedAssetKey: query.constants.poolAddresses[t]?.isolatedAssetKey,
   }));
 
   // Query all objects for each key in parallel
@@ -242,6 +243,7 @@ const queryRequiredMarketObjects = async (
     borrowFeeObjects,
     supplyLimitObjects,
     borrowLimitObjects,
+    isolatedAssetObjects,
   ] = await Promise.all([
     queryMultipleObjects(
       query.cache,
@@ -275,14 +277,15 @@ const queryRequiredMarketObjects = async (
       query.cache,
       tasks.map((task) => task.borrowLimitKey).filter((t): t is string => !!t)
     ),
+    queryMultipleObjects(
+      query.cache,
+      tasks.map((task) => task.isolatedAssetKey).filter((t): t is string => !!t)
+    ),
   ]);
 
   // Map the results back to poolCoinNames
   const mapObjects = (
-    tasks: {
-      poolCoinName: string;
-      [key: string]: string | undefined;
-    }[],
+    tasks: { poolCoinName: string; [key: string]: string | undefined }[],
     fetchedObjects: SuiObjectData[],
     keyValue: string
   ) => {
@@ -335,11 +338,11 @@ const queryRequiredMarketObjects = async (
     borrowLimitObjects,
     'borrowLimitKey'
   );
-  // const isolatedAssetMap = mapObjects(
-  //   tasks,
-  //   isolatedAssetObjects,
-  //   'isolatedAssetKey'
-  // );
+  const isolatedAssetMap = mapObjects(
+    tasks,
+    isolatedAssetObjects,
+    'isolatedAssetKey'
+  );
   // Construct the final requiredObjects result
   const result = poolCoinNames.reduce(
     (acc, name) => {
@@ -352,8 +355,7 @@ const queryRequiredMarketObjects = async (
         borrowFeeKey: borrowFeeMap[name],
         supplyLimitKey: supplyLimitMap[name],
         borrowLimitKey: borrowLimitMap[name],
-        isolatedAssetKey:
-          query.constants.poolAddresses[name]?.isolatedAssetKey ?? false,
+        isolatedAssetKey: isolatedAssetMap[name],
       };
       return acc;
     },
@@ -368,7 +370,7 @@ const queryRequiredMarketObjects = async (
         borrowFeeKey: SuiObjectData;
         supplyLimitKey: SuiObjectData;
         borrowLimitKey: SuiObjectData;
-        isolatedAssetKey: boolean;
+        isolatedAssetKey: SuiObjectData;
       }
     >
   );
@@ -482,7 +484,7 @@ const parseMarketPoolObjects = ({
   borrowFeeKey?: SuiObjectData;
   supplyLimitKey?: SuiObjectData;
   borrowLimitKey?: SuiObjectData;
-  isolatedAssetKey: boolean;
+  isolatedAssetKey: SuiObjectData;
 }): OriginMarketPoolData & {
   parsedOriginMarketCollateral?: OriginMarketCollateralData;
 } => {
@@ -509,7 +511,7 @@ const parseMarketPoolObjects = ({
     _riskModel && _collateralStat
       ? {
           type: _interestModel.type.fields,
-          isIsolated: isolatedAssetKey,
+          isIsolated: !!isolatedAssetKey,
           collateralFactor: _riskModel.collateral_factor.fields,
           liquidationFactor: _riskModel.liquidation_factor.fields,
           liquidationPenalty: _riskModel.liquidation_penalty.fields,
@@ -570,7 +572,7 @@ export const getMarketPool = async (
     borrowFeeKey: SuiObjectData;
     supplyLimitKey: SuiObjectData;
     borrowLimitKey: SuiObjectData;
-    isolatedAssetKey: boolean;
+    isolatedAssetKey: SuiObjectData;
   }
 ): Promise<
   { marketPool: MarketPool; collateral?: MarketCollateral } | undefined

package/src/queries/isolatedAssetQuery.ts

@@ -90,7 +90,7 @@ export const isIsolatedAsset = async (
 ): Promise<boolean> => {
   const assetInPoolAddresses = utils.constants.poolAddresses[coinName];
   if (assetInPoolAddresses) {
-    return assetInPoolAddresses.isolatedAssetKey;
+    return !!assetInPoolAddresses.isolatedAssetKey;
   }
 
   const marketObject = utils.address.get('core.market');

package/src/queries/poolAddressesQuery.ts

@@ -1,4 +1,4 @@
-import { getFullnodeUrl, SuiClient, SuiParsedData } from '@mysten/sui/client';
+import { getFullnodeUrl, SuiClient } from '@mysten/sui/client';
 import { AddressesInterface, OptionalKeys, PoolAddress } from 'src/types';
 
 const RPC_PROVIDERS = [
@@ -62,31 +62,6 @@ const queryFlashloanFeeObjectIds = async (
   return flashloanFeeObjectIds;
 };
 
-type FetchDynamicObjectReturnType<T extends boolean> = T extends true
-  ? string | undefined
-  : (SuiParsedData & { dataType: 'moveObject' }) | null | undefined;
-
-const fetchDynamicObject = async <S extends boolean>(
-  parentId: string,
-  type: string,
-  value: any,
-  returnObjId: S = true as S
-): Promise<FetchDynamicObjectReturnType<S>> => {
-  const res = (
-    await tryRequest(async (client) => {
-      return await client.getDynamicFieldObject({
-        parentId,
-        name: {
-          type,
-          value,
-        },
-      });
-    })
-  ).data;
-  if (returnObjId) return res?.objectId as FetchDynamicObjectReturnType<S>;
-  else return res?.content as FetchDynamicObjectReturnType<S>;
-};
-
 export const getPoolAddresses = async (
   addressId: string,
   poolNames: string[] = []
@@ -158,6 +133,23 @@ export const getPoolAddresses = async (
   const SUPPLY_LIMIT_TYPE = `0x6e641f0dca8aedab3101d047e96439178f16301bf0b57fe8745086ff1195eb3e::market_dynamic_keys::SupplyLimitKey`;
   const BORROW_LIMIT_TYPE = `0xe7dbb371a9595631f7964b7ece42255ad0e738cc85fe6da26c7221b220f01af6::market_dynamic_keys::BorrowLimitKey`; // prod
   const ISOLATED_ASSET_KEY = `0xe7dbb371a9595631f7964b7ece42255ad0e738cc85fe6da26c7221b220f01af6::market_dynamic_keys::IsolatedAssetKey`;
+  const fetchDynamicObject = async (
+    parentId: string,
+    type: string,
+    value: any
+  ) => {
+    return (
+      await tryRequest(async (client) => {
+        return await client.getDynamicFieldObject({
+          parentId,
+          name: {
+            type,
+            value,
+          },
+        });
+      })
+    ).data?.objectId;
+  };
 
   // query flashloan fee objects first
   const flashloanFeeObjectIds = await tryRequest(async (client) => {
@@ -171,50 +163,25 @@ export const getPoolAddresses = async (
     coinTypesPairs.map(async ([coinName, coinType]) => {
       const coinTypeKey = coinType.slice(2);
       const addresses = await Promise.all([
-        fetchDynamicObject(
-          balanceSheetParentId,
-          ADDRESS_TYPE,
-          {
-            name: coinTypeKey,
-          },
-          true
-        ),
-        fetchDynamicObject(
-          collateralStatsParentId,
-          ADDRESS_TYPE,
-          {
-            name: coinTypeKey,
-          },
-          true
-        ),
-        fetchDynamicObject(
-          borrowDynamicsParentid,
-          ADDRESS_TYPE,
-          {
-            name: coinTypeKey,
-          },
-          true
-        ),
-        fetchDynamicObject(
-          interestModelParentId,
-          ADDRESS_TYPE,
-          {
-            name: coinTypeKey,
-          },
-          true
-        ),
-        fetchDynamicObject(
-          riskModelParentId,
-          ADDRESS_TYPE,
-          {
-            name: coinTypeKey,
-          },
-          true
-        ),
-        fetchDynamicObject(marketId, BORROW_FEE_TYPE, coinTypeKey, true),
-        fetchDynamicObject(marketId, SUPPLY_LIMIT_TYPE, coinTypeKey, true),
-        fetchDynamicObject(marketId, BORROW_LIMIT_TYPE, coinTypeKey, true),
-        fetchDynamicObject(marketId, ISOLATED_ASSET_KEY, coinTypeKey, false),
+        fetchDynamicObject(balanceSheetParentId, ADDRESS_TYPE, {
+          name: coinTypeKey,
+        }),
+        fetchDynamicObject(collateralStatsParentId, ADDRESS_TYPE, {
+          name: coinTypeKey,
+        }),
+        fetchDynamicObject(borrowDynamicsParentid, ADDRESS_TYPE, {
+          name: coinTypeKey,
+        }),
+        fetchDynamicObject(interestModelParentId, ADDRESS_TYPE, {
+          name: coinTypeKey,
+        }),
+        fetchDynamicObject(riskModelParentId, ADDRESS_TYPE, {
+          name: coinTypeKey,
+        }),
+        fetchDynamicObject(marketId, BORROW_FEE_TYPE, coinTypeKey),
+        fetchDynamicObject(marketId, SUPPLY_LIMIT_TYPE, coinTypeKey),
+        fetchDynamicObject(marketId, BORROW_LIMIT_TYPE, coinTypeKey),
+        fetchDynamicObject(marketId, ISOLATED_ASSET_KEY, coinTypeKey),
       ]);
 
       // @ts-ignore
@@ -296,7 +263,7 @@ export const getPoolAddresses = async (
         borrowFeeKey: addresses[5] ?? '',
         supplyLimitKey: addresses[6] ?? '',
         borrowLimitKey: addresses[7] ?? '',
-        isolatedAssetKey: (addresses[8]?.fields as any)?.value ?? false,
+        isolatedAssetKey: addresses[8] ?? '',
         ...spoolData,
         ...sCoinData,
         sCoinName,

package/src/types/constant/common.ts

@@ -22,7 +22,7 @@ export type PoolAddress = {
   sCoinSymbol?: string;
   sCoinMetadataId?: string;
   sCoinTreasury?: string;
-  isolatedAssetKey: boolean;
+  isolatedAssetKey?: string;
   spool?: string;
   spoolReward?: string;
   spoolName?: string;
@@ -42,7 +42,6 @@ export type Whitelist = {
   rewardsAsPoint: Set<string>;
   pythEndpoints: Set<string>;
   deprecated: Set<string>;
-  emerging: Set<string>;
 };
 
 export type CoinWrappedType =