@scallop-io/sui-scallop-sdk 0.44.26 → 0.44.28

package/dist/builders/borrowIncentiveBuilder.d.ts

@@ -2,13 +2,6 @@ import { TransactionBlock } from '@mysten/sui.js/transactions';
 import { SuiTxBlock as SuiKitTxBlock } from '@scallop-io/sui-kit';
 import type { ScallopBuilder } from '../models';
 import type { BorrowIncentiveTxBlock, ScallopTxBlock } from '../types';
-/**
- * Check veSca bind status
- * @param query
- * @param veScaKey
- * @returns
- */
-export declare const getBindedObligationId: (builder: ScallopBuilder, veScaKey: string) => Promise<string | false>;
 /**
  * Create an enhanced transaction block instance for interaction with borrow incentive modules of the Scallop contract.
  *

package/dist/index.js

@@ -2514,6 +2514,63 @@ var queryBorrowIncentiveAccounts = async (query, obligationId, borrowIncentiveCo
   }, {});
   return borrowIncentiveAccounts;
 };
+var getBindedObligationId = async (query, veScaKeyId) => {
+  const borrowIncentiveObjectId = query.address.get("borrowIncentive.object");
+  const incentivePoolsId = query.address.get("borrowIncentive.incentivePools");
+  const veScaPkgId = IS_VE_SCA_TEST ? "0xb220d034bdf335d77ae5bfbf6daf059c2cc7a1f719b12bfed75d1736fac038c8" : query.address.get("vesca.id");
+  const client = query.suiKit.client();
+  const incentivePoolsResponse = await client.getObject({
+    id: incentivePoolsId,
+    options: {
+      showContent: true
+    }
+  });
+  if (incentivePoolsResponse.data?.content?.dataType !== "moveObject")
+    return null;
+  const incentivePoolFields = incentivePoolsResponse.data.content.fields;
+  const veScaBindTableId = incentivePoolFields.ve_sca_bind.fields.id.id;
+  const keyType = `${borrowIncentiveObjectId}::typed_id::TypedID<${veScaPkgId}::ve_sca::VeScaKey>`;
+  const veScaBindTableResponse = await client.getDynamicFieldObject({
+    parentId: veScaBindTableId,
+    name: {
+      type: keyType,
+      value: veScaKeyId
+    }
+  });
+  if (veScaBindTableResponse.data?.content?.dataType !== "moveObject")
+    return null;
+  const veScaBindTableFields = veScaBindTableResponse.data.content.fields;
+  const obligationId = veScaBindTableFields.value.fields.id;
+  return obligationId;
+};
+var getBindedVeScaKey = async (query, obliationId) => {
+  const borrowIncentiveObjectId = query.address.get("borrowIncentive.object");
+  const incentiveAccountsId = query.address.get(
+    "borrowIncentive.incentiveAccounts"
+  );
+  const corePkg = query.address.get("core.object");
+  const client = query.suiKit.client();
+  const incentiveAccountsObject = await client.getObject({
+    id: incentiveAccountsId,
+    options: {
+      showContent: true
+    }
+  });
+  if (incentiveAccountsObject.data?.content?.dataType !== "moveObject")
+    return null;
+  const incentiveAccountsTableId = incentiveAccountsObject.data.content.fields.accounts.fields.id.id;
+  const bindedIncentiveAcc = await client.getDynamicFieldObject({
+    parentId: incentiveAccountsTableId,
+    name: {
+      type: `${borrowIncentiveObjectId}::typed_id::TypedID<${corePkg}::obligation::Obligation>`,
+      value: obliationId
+    }
+  });
+  if (bindedIncentiveAcc.data?.content?.dataType !== "moveObject")
+    return null;
+  const bindedIncentiveAccFields = bindedIncentiveAcc.data.content.fields;
+  return bindedIncentiveAccFields.value.fields.binded_ve_sca_key?.fields.id ?? null;
+};
 
 // src/queries/priceQuery.ts
 var getPythPrice = async (query, assetCoinName) => {
@@ -3099,11 +3156,19 @@ var getVeSca = async (query, veScaKeyId, ownerAddress) => {
   const veScaDynamicFieldObject = veScaDynamicFieldObjectResponse.data;
   if (veScaDynamicFieldObject && veScaDynamicFieldObject.content && veScaDynamicFieldObject.content.dataType === "moveObject" && "fields" in veScaDynamicFieldObject.content) {
     const dynamicFields = veScaDynamicFieldObject.content.fields.value.fields;
+    const remainingLockPeriodInMilliseconds = Math.max(
+      +dynamicFields.unlock_at * 1e3 - Date.now(),
+      0
+    );
+    const lockedScaAmount = String(dynamicFields.locked_sca_amount);
+    const lockedScaCoin = (0, import_bignumber4.default)(dynamicFields.locked_sca_amount).shiftedBy(-9).toNumber();
+    const currentVeScaBalance = lockedScaCoin * (Math.floor(remainingLockPeriodInMilliseconds / 1e3) / MAX_LOCK_DURATION);
     vesca = {
       id: veScaDynamicFieldObject.objectId,
       keyId: veScaKeyId,
-      lockedScaAmount: (0, import_bignumber4.default)(dynamicFields.locked_sca_amount).toNumber(),
-      lockedScaCoin: (0, import_bignumber4.default)(dynamicFields.locked_sca_amount).shiftedBy(-9).toNumber(),
+      lockedScaAmount,
+      lockedScaCoin,
+      currentVeScaBalance,
       unlockAt: (0, import_bignumber4.default)(dynamicFields.unlock_at).toNumber()
     };
   }
@@ -3639,6 +3704,22 @@ var ScallopQuery = class {
   async getTvl(indexer = false) {
     return await getTotalValueLocked(this, indexer);
   }
+  /**
+   * Get binded obligationId from a veScaKey if it exists.
+   * @param veScaKey
+   * @returns obligationId
+   */
+  async getBindedObligationId(veScaKey) {
+    return await getBindedObligationId(this, veScaKey);
+  }
+  /**
+   * Get binded veSCA key from a obligationId if it exists.
+   * @param obligationId
+   * @returns veScaKey
+   */
+  async getBindedVeScaKey(obligationId) {
+    return await getBindedVeScaKey(this, obligationId);
+  }
 };
 
 // src/constants/pyth.ts
@@ -4661,7 +4742,10 @@ var requireVeSca = async (...params) => {
   if (veScas.length === 0) {
     return void 0;
   }
-  return veScas[0];
+  return veScas.reduce(
+    (prev, acc) => acc.currentVeScaBalance > prev.currentVeScaBalance ? acc : prev,
+    veScas[0]
+  );
 };
 var generateNormalVeScaMethod = ({
   builder,
@@ -4795,7 +4879,7 @@ var generateQuickVeScaMethod = ({
             const veScaKey = txBlock.lockSca(scaCoin, newUnlockAt);
             transferObjects.push(veScaKey);
           } else {
-            if (veSca.lockedScaAmount !== 0) {
+            if (veSca.lockedScaCoin !== 0) {
               const unlockedSca = txBlock.redeemSca(veSca.keyId);
               transferObjects.push(unlockedSca);
             }
@@ -4855,7 +4939,7 @@ var generateQuickVeScaMethod = ({
         checkRenewExpiredVeSca(scaAmount, lockPeriodInDays, veSca?.unlockAt);
       if (veSca) {
         const transferObjects = [];
-        if (veSca.lockedScaAmount !== 0) {
+        if (veSca.lockedScaCoin !== 0) {
           const unlockedSca = txBlock.redeemSca(veSca.keyId);
           transferObjects.push(unlockedSca);
         }
@@ -4927,43 +5011,15 @@ var requireObligationInfo2 = async (...params) => {
   if (obligations.length === 0) {
     throw new Error(`No obligation found for sender ${sender}`);
   }
+  const selectedObligation = obligations.find(
+    (obligation) => obligation.id === obligationId || obligation.keyId === obligationKey
+  ) ?? obligations[0];
   return {
-    obligationId: obligations[0].id,
-    obligationKey: obligations[0].keyId,
-    obligationLocked: obligations[0].locked
+    obligationId: selectedObligation.id,
+    obligationKey: selectedObligation.keyId,
+    obligationLocked: selectedObligation.locked
   };
 };
-var getBindedObligationId = async (builder, veScaKey) => {
-  const borrowIncentiveObjectId = builder.address.get("borrowIncentive.object");
-  const incentivePoolsId = builder.address.get(
-    "borrowIncentive.incentivePools"
-  );
-  const veScaPkgId = IS_VE_SCA_TEST ? "0xb220d034bdf335d77ae5bfbf6daf059c2cc7a1f719b12bfed75d1736fac038c8" : builder.address.get("vesca.id");
-  const client = builder.suiKit.client();
-  const incentivePoolsResponse = await client.getObject({
-    id: incentivePoolsId,
-    options: {
-      showContent: true
-    }
-  });
-  if (incentivePoolsResponse.data?.content?.dataType !== "moveObject")
-    return false;
-  const incentivePoolFields = incentivePoolsResponse.data.content.fields;
-  const veScaBindTableId = incentivePoolFields.ve_sca_bind.fields.id.id;
-  const keyType = `${borrowIncentiveObjectId}::typed_id::TypedID<${veScaPkgId}::ve_sca::VeScaKey>`;
-  const veScaBindTableResponse = await client.getDynamicFieldObject({
-    parentId: veScaBindTableId,
-    name: {
-      type: keyType,
-      value: veScaKey
-    }
-  });
-  if (veScaBindTableResponse.data?.content?.dataType !== "moveObject")
-    return false;
-  const veScaBindTableFields = veScaBindTableResponse.data.content.fields;
-  const obligationId = veScaBindTableFields.value.fields.id;
-  return obligationId;
-};
 var generateBorrowIncentiveNormalMethod = ({ builder, txBlock }) => {
   const borrowIncentiveIds = {
     borrowIncentivePkg: IS_VE_SCA_TEST ? "0x4d5a7cefa4147b4ace0ca845b20437d6ac0d32e5f2f855171f745472c2576246" : builder.address.get("borrowIncentive.id"),
@@ -5103,7 +5159,7 @@ var generateBorrowIncentiveQuickMethod = ({ builder, txBlock }) => {
         const veSca = await requireVeSca(builder, txBlock, veScaKey);
         if (veSca) {
           const bindedObligationId = await getBindedObligationId(
-            builder,
+            builder.query,
             veSca.keyId
           );
           if (!bindedObligationId || bindedObligationId === obligationArg) {