@scallop-io/sui-scallop-sdk 0.47.0 → 0.47.2

package/dist/queries/borrowIncentiveQuery.d.ts

@@ -56,4 +56,4 @@ export declare const getBindedObligationId: ({ address, }: {
 }, veScaKeyId: string) => Promise<string | null>;
 export declare const getBindedVeScaKey: ({ address, }: {
     address: ScallopAddress;
-}, obliationId: string) => Promise<string | null>;
+}, obligationId: string) => Promise<string | null>;

package/package.json

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

package/src/builders/borrowIncentiveBuilder.ts

@@ -1,11 +1,7 @@
 import { TransactionBlock } from '@mysten/sui.js/transactions';
 import { SUI_CLOCK_OBJECT_ID } from '@mysten/sui.js/utils';
 import { SuiTxBlock as SuiKitTxBlock } from '@scallop-io/sui-kit';
-import {
-  getObligations,
-  getObligationLocked,
-  getBindedObligationId,
-} from '../queries';
+import { getObligations, getObligationLocked } from '../queries';
 import { requireSender } from '../utils';
 import type { SuiObjectArg } from '@scallop-io/sui-kit';
 import type { ScallopBuilder } from 'src/models';
@@ -18,7 +14,6 @@ import type {
   ScallopTxBlock,
   VescaIds,
 } from '../types';
-import { requireVeSca } from './vescaBuilder';
 import { OLD_BORROW_INCENTIVE_PROTOCOL_ID } from 'src/constants';
 
 /**
@@ -257,26 +252,20 @@ const generateBorrowIncentiveQuickMethod: GenerateBorrowIncentiveQuickMethod =
           );
 
         if (!obligationLocked || unstakeObligationBeforeStake) {
-          const veSca = await requireVeSca(builder, txBlock, veScaKey);
-          if (veSca) {
-            const bindedObligationId = await getBindedObligationId(
-              builder,
-              veSca.keyId
-            );
+          const bindedVeScaKey =
+            await builder.query.getBindedVeScaKey(obligationArg);
 
-            // if bindedObligationId is equal to obligationId, then use it again
-            if (
-              (!bindedObligationId || bindedObligationId === obligationArg) &&
-              veSca.currentVeScaBalance > 0
-            ) {
-              txBlock.stakeObligationWithVesca(
-                obligationArg,
-                obligationKeyArg,
-                veSca.keyId
-              );
-            } else {
-              txBlock.stakeObligation(obligationArg, obligationKeyArg);
-            }
+          if (veScaKey && veScaKey !== bindedVeScaKey) {
+            throw new Error(
+              'Binded veScaKey is not equal to the provided veScaKey'
+            );
+          }
+          if (bindedVeScaKey) {
+            txBlock.stakeObligationWithVesca(
+              obligationArg,
+              obligationKeyArg,
+              bindedVeScaKey
+            );
           } else {
             txBlock.stakeObligation(obligationArg, obligationKeyArg);
           }

package/src/builders/vescaBuilder.ts

@@ -66,7 +66,8 @@ export const requireVeSca = async (
     return undefined;
   }
 
-  return veScas[0]; // return veSCA with highest veSCA balance
+  // return veSCA with the same veScaKey or the highest veSCA balance
+  return veScaKey ? veScas.find(({ keyId }) => veScaKey === keyId) : veScas[0];
 };
 
 /**

package/src/queries/borrowIncentiveQuery.ts

@@ -278,7 +278,7 @@ export const getBindedVeScaKey = async (
   }: {
     address: ScallopAddress;
   },
-  obliationId: string
+  obligationId: string
 ): Promise<string | null> => {
   const borrowIncentiveObjectId = address.get('borrowIncentive.object');
   const incentiveAccountsId = address.get('borrowIncentive.incentiveAccounts');
@@ -302,7 +302,7 @@ export const getBindedVeScaKey = async (
     parentId: incentiveAccountsTableId,
     name: {
       type: `${borrowIncentiveObjectId}::typed_id::TypedID<${corePkg}::obligation::Obligation>`,
-      value: obliationId,
+      value: obligationId,
     },
   });
 

package/src/queries/spoolQuery.ts

@@ -406,6 +406,17 @@ export const getStakeAccounts = async (
           points,
           totalPoints,
         });
+      } else if (normalizeStructTag(type) === stakeMarketCoinTypes.susdc) {
+        stakeAccounts.susdc.push({
+          id,
+          type: normalizeStructTag(type),
+          stakePoolId,
+          stakeType: normalizeStructTag(stakeType),
+          staked,
+          index,
+          points,
+          totalPoints,
+        });
       }
     }
   }