@scallop-io/sui-scallop-sdk 0.47.0-alpha.1 → 0.47.0-alpha.2

package/dist/queries/coreQuery.d.ts

@@ -101,10 +101,10 @@ export declare const getObligations: ({ address, }: {
  * Query obligation locked status.
  *
  * @param query - The Scallop query instance.
- * @param obligationId - The obligation id.
+ * @param obligation - The obligation id or the obligation object.
  * @return Obligation locked status.
  */
-export declare const getObligationLocked: (cache: ScallopCache, obligationId: string) => Promise<boolean>;
+export declare const getObligationLocked: (cache: ScallopCache, obligation: string | SuiObjectData) => Promise<boolean>;
 /**
  * Query obligation data.
  *

package/package.json

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

package/src/models/scallopClient.ts

@@ -817,7 +817,7 @@ export class ScallopClient {
       await this.utils.mergeSimilarCoins(
         txBlock,
         coin,
-        this.utils.parseCoinType(this.utils.parseCoinName(stakeCoinName)),
+        this.utils.parseCoinType(stakeCoinName),
         requireSender(txBlock)
       );
 

package/src/models/scallopIndexer.ts

@@ -72,7 +72,7 @@ export class ScallopIndexer {
         return await this._requestClient.get<{
           pools: MarketPool[];
           collaterals: MarketCollateral[];
-        }>(`/api/market`);
+        }>(`/api/market/migrate`);
       },
     });
 
@@ -149,7 +149,7 @@ export class ScallopIndexer {
       queryFn: async () => {
         return await this._requestClient.get<{
           spools: Spool[];
-        }>(`/api/spools`);
+        }>(`/api/spools/migrate`);
       },
     });
 
@@ -187,7 +187,7 @@ export class ScallopIndexer {
       queryFn: async () => {
         return await this._requestClient.get<{
           borrowIncentivePools: BorrowIncentivePool[];
-        }>(`/api/borrowIncentivePools`);
+        }>(`/api/borrowIncentivePools/migrate`);
       },
     });
 

package/src/queries/coreQuery.ts

@@ -768,24 +768,29 @@ export const getObligations = async (
  * Query obligation locked status.
  *
  * @param query - The Scallop query instance.
- * @param obligationId - The obligation id.
+ * @param obligation - The obligation id or the obligation object.
  * @return Obligation locked status.
  */
 export const getObligationLocked = async (
   cache: ScallopCache,
-  obligationId: string
+  obligation: string | SuiObjectData
 ) => {
-  const obligationObjectResponse = await cache.queryGetObject(obligationId, {
-    showContent: true,
-  });
+  const obligationObjectResponse =
+    typeof obligation === 'string'
+      ? (
+          await cache.queryGetObject(obligation, {
+            showContent: true,
+          })
+        )?.data
+      : obligation;
   let obligationLocked = false;
   if (
-    obligationObjectResponse?.data &&
-    obligationObjectResponse?.data?.content?.dataType === 'moveObject' &&
-    'lock_key' in obligationObjectResponse.data.content.fields
+    obligationObjectResponse &&
+    obligationObjectResponse?.content?.dataType === 'moveObject' &&
+    'lock_key' in obligationObjectResponse.content.fields
   ) {
     obligationLocked = Boolean(
-      obligationObjectResponse.data.content.fields.lock_key
+      obligationObjectResponse.content.fields.lock_key
     );
   }