@scallop-io/sui-scallop-sdk 2.1.2-merge-split-ve-sca-alpha.1 → 2.1.2

package/package.json

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

package/src/builders/borrowIncentiveBuilder.ts

@@ -3,8 +3,8 @@ import {
   SuiTxBlock as SuiKitTxBlock,
   SUI_CLOCK_OBJECT_ID,
 } from '@scallop-io/sui-kit';
-import { getObligations, getObligationLocked } from 'src/queries';
-import { requireSender } from 'src/utils';
+import { getObligations, getObligationLocked } from '../queries';
+import { requireSender } from '../utils';
 import type { SuiObjectArg } from '@scallop-io/sui-kit';
 import type { ScallopBuilder } from 'src/models';
 import type {
@@ -14,7 +14,8 @@ import type {
   SuiTxBlockWithBorrowIncentiveNormalMethods,
   BorrowIncentiveTxBlock,
   ScallopTxBlock,
-} from 'src/types';
+  VescaIds,
+} from '../types';
 import { OLD_BORROW_INCENTIVE_PROTOCOL_ID } from 'src/constants';
 
 /**
@@ -88,7 +89,7 @@ const generateBorrowIncentiveNormalMethod: GenerateBorrowIncentiveNormalMethod =
       obligationAccessStore: builder.address.get('core.obligationAccessStore'),
     };
 
-    const veScaIds = {
+    const veScaIds: Omit<VescaIds, 'pkgId'> = {
       table: builder.address.get('vesca.table'),
       treasury: builder.address.get('vesca.treasury'),
       config: builder.address.get('vesca.config'),
@@ -119,7 +120,7 @@ const generateBorrowIncentiveNormalMethod: GenerateBorrowIncentiveNormalMethod =
       stakeObligationWithVesca: (obligationId, obligationKey, veScaKey) => {
         builder.moveCall(
           txBlock,
-          `${borrowIncentiveIds.borrowIncentivePkg}::user::stake_with_ve_sca_v2`,
+          `${borrowIncentiveIds.borrowIncentivePkg}::user::stake_with_ve_sca`,
           [
             borrowIncentiveIds.config,
             borrowIncentiveIds.incentivePools,
@@ -131,8 +132,6 @@ const generateBorrowIncentiveNormalMethod: GenerateBorrowIncentiveNormalMethod =
             veScaIds.treasury,
             veScaIds.table,
             veScaKey,
-            builder.address.get('vesca.subsTable'),
-            builder.address.get('vesca.subsWhitelist'),
             clockObjectRef,
           ],
           []
@@ -141,15 +140,13 @@ const generateBorrowIncentiveNormalMethod: GenerateBorrowIncentiveNormalMethod =
       unstakeObligation: (obligationId, obligationKey) => {
         builder.moveCall(
           txBlock,
-          `${borrowIncentiveIds.borrowIncentivePkg}::user::unstake_v2`,
+          `${borrowIncentiveIds.borrowIncentivePkg}::user::unstake`,
           [
             borrowIncentiveIds.config,
             borrowIncentiveIds.incentivePools,
             borrowIncentiveIds.incentiveAccounts,
             obligationKey,
             obligationId,
-            builder.address.get('vesca.subsTable'),
-            builder.address.get('vesca.subsWhitelist'),
             clockObjectRef,
           ]
         );
@@ -173,15 +170,13 @@ const generateBorrowIncentiveNormalMethod: GenerateBorrowIncentiveNormalMethod =
       deactivateBoost: (obligation, veScaKey) => {
         builder.moveCall(
           txBlock,
-          `${borrowIncentiveIds.borrowIncentivePkg}::user::deactivate_boost_v2`,
+          `${borrowIncentiveIds.borrowIncentivePkg}::user::deactivate_boost`,
           [
             borrowIncentiveIds.config,
             borrowIncentiveIds.incentivePools,
             borrowIncentiveIds.incentiveAccounts,
             obligation,
             veScaKey,
-            builder.address.get('vesca.subsTable'),
-            builder.address.get('vesca.subsWhitelist'),
             clockObjectRef,
           ]
         );
@@ -222,8 +217,6 @@ const generateBorrowIncentiveQuickMethod: GenerateBorrowIncentiveQuickMethod =
               txn.kind === 'MoveCall' &&
               (txn.target ===
                 `${OLD_BORROW_INCENTIVE_PROTOCOL_ID}::user::unstake` ||
-                txn.target ===
-                  `${builder.address.get('borrowIncentive.id')}::user::unstake_v2` ||
                 txn.target ===
                   `${builder.address.get('borrowIncentive.id')}::user::unstake`)
           );
@@ -254,8 +247,6 @@ const generateBorrowIncentiveQuickMethod: GenerateBorrowIncentiveQuickMethod =
               txn.kind === 'MoveCall' &&
               (txn.target ===
                 `${OLD_BORROW_INCENTIVE_PROTOCOL_ID}::user::unstake` ||
-                txn.target ===
-                  `${builder.address.get('borrowIncentive.id')}::user::unstake_v2` ||
                 txn.target ===
                   `${builder.address.get('borrowIncentive.id')}::user::unstake`)
           );

package/src/builders/coreBuilder.ts

@@ -5,7 +5,7 @@ import { getObligations } from '../queries';
 import { updateOracles } from './oracles';
 import { requireSender } from '../utils';
 import type { SuiObjectArg, TransactionResult } from '@scallop-io/sui-kit';
-import type { ScallopBuilder } from 'src/models';
+import type { ScallopBuilder } from '../models';
 import type {
   CoreIds,
   GenerateCoreNormalMethod,
@@ -15,7 +15,7 @@ import type {
   ScallopTxBlock,
   NestedResult,
   SuiTxBlockWithSpool,
-} from 'src/types';
+} from '../types';
 
 /**
  * Check and get Obligation information from transaction block.

package/src/builders/index.ts

@@ -4,8 +4,8 @@ import { newCoreTxBlock } from './coreBuilder';
 import { newSpoolTxBlock } from './spoolBuilder';
 import { newBorrowIncentiveTxBlock } from './borrowIncentiveBuilder';
 import { newVeScaTxBlock } from './vescaBuilder';
-import type { ScallopBuilder } from 'src/models';
-import type { ScallopTxBlock } from 'src/types';
+import type { ScallopBuilder } from '../models';
+import type { ScallopTxBlock } from '../types';
 import { newReferralTxBlock } from './referralBuilder';
 import { newLoyaltyProgramTxBlock } from './loyaltyProgramBuilder';
 import { newSCoinTxBlock } from './sCoinBuilder';

package/src/builders/spoolBuilder.ts

@@ -5,7 +5,7 @@ import { getStakeAccounts } from '../queries/spoolQuery';
 import { requireSender } from '../utils';
 import type { SuiAddressArg } from '@scallop-io/sui-kit';
 import type { TransactionResult } from '@mysten/sui/transactions';
-import type { ScallopBuilder } from 'src/models';
+import type { ScallopBuilder } from '../models';
 import type {
   SpoolIds,
   GenerateSpoolNormalMethod,
@@ -14,7 +14,7 @@ import type {
   SpoolTxBlock,
   ScallopTxBlock,
   SuiTxBlockWithSCoin,
-} from 'src/types';
+} from '../types';
 
 /**
  * Check and get stake account id from transaction block.

package/src/builders/vescaBuilder.ts

@@ -5,8 +5,8 @@ import {
   SuiTxBlock as SuiKitTxBlock,
 } from '@scallop-io/sui-kit';
 import { SCA_COIN_TYPE } from 'src/constants';
-import { ScallopBuilder } from 'src/models';
-import { getVeSca, getVeScas } from 'src/queries';
+import { ScallopBuilder } from '../models';
+import { getVeSca, getVeScas } from '../queries';
 import {
   requireSender,
   checkLockSca,
@@ -14,19 +14,19 @@ import {
   checkExtendLockAmount,
   checkRenewExpiredVeSca,
   checkVesca,
-} from 'src/utils';
+} from '../utils';
 import type {
   TransactionObjectArgument,
   SuiObjectArg,
 } from '@scallop-io/sui-kit';
 import type {
-  AddressesInterface,
   GenerateVeScaNormalMethod,
   GenerateVeScaQuickMethod,
-  QuickMethodReturnType,
+  RedeemScaQuickReturnType,
   ScallopTxBlock,
   SuiTxBlockWithVeScaNormalMethods,
   VeScaTxBlock,
+  VescaIds,
 } from 'src/types';
 
 /**
@@ -70,27 +70,6 @@ export const requireVeSca = async (
   return veScaKey ? veScas.find(({ keyId }) => veScaKey === keyId) : veScas[0];
 };
 
-export const isInSubsTable = async (
-  ...params: [builder: ScallopBuilder, veScaKey: string, tableId: string]
-) => {
-  const [builder, veScaKey, tableId] = params;
-  try {
-    const resp = await builder.scallopSuiKit.queryGetDynamicFieldObject({
-      parentId: tableId,
-      name: {
-        type: '0x2::object::ID',
-        value: veScaKey,
-      },
-    });
-    return !!resp?.data;
-  } catch (e) {
-    console.error(e);
-    return false;
-  }
-};
-
-type VeScaProps = 'id' | 'table' | 'treasury' | 'config' | 'subsTable';
-
 /**
  * Generate veSCA normal methods.
  *
@@ -102,14 +81,12 @@ const generateNormalVeScaMethod: GenerateVeScaNormalMethod = ({
   builder,
   txBlock,
 }) => {
-  const veScaIds: Pick<AddressesInterface['vesca'], VeScaProps> = {
-    id: builder.address.get('vesca.id'),
+  const veScaIds: VescaIds = {
+    pkgId: builder.address.get('vesca.id'),
     table: builder.address.get('vesca.table'),
     treasury: builder.address.get('vesca.treasury'),
     config: builder.address.get('vesca.config'),
-    subsTable: builder.address.get('vesca.subsTable'),
   };
-
   const clockObjectRef = txBlock.sharedObjectRef({
     objectId: SUI_CLOCK_OBJECT_ID,
     mutable: false,
@@ -120,7 +97,7 @@ const generateNormalVeScaMethod: GenerateVeScaNormalMethod = ({
     lockSca: (scaCoin, unlockAtInSecondTimestamp) => {
       return builder.moveCall(
         txBlock,
-        `${veScaIds.id}::ve_sca::mint_ve_sca_key`,
+        `${veScaIds.pkgId}::ve_sca::mint_ve_sca_key`,
         [
           veScaIds.config,
           veScaIds.table,
@@ -135,7 +112,7 @@ const generateNormalVeScaMethod: GenerateVeScaNormalMethod = ({
     extendLockPeriod: (veScaKey, newUnlockAtInSecondTimestamp) => {
       builder.moveCall(
         txBlock,
-        `${veScaIds.id}::ve_sca::extend_lock_period`,
+        `${veScaIds.pkgId}::ve_sca::extend_lock_period`,
         [
           veScaIds.config,
           veScaKey,
@@ -150,7 +127,7 @@ const generateNormalVeScaMethod: GenerateVeScaNormalMethod = ({
     extendLockAmount: (veScaKey, scaCoin) => {
       builder.moveCall(
         txBlock,
-        `${veScaIds.id}::ve_sca::lock_more_sca`,
+        `${veScaIds.pkgId}::ve_sca::lock_more_sca`,
         [
           veScaIds.config,
           veScaKey,
@@ -165,7 +142,7 @@ const generateNormalVeScaMethod: GenerateVeScaNormalMethod = ({
     renewExpiredVeSca: (veScaKey, scaCoin, newUnlockAtInSecondTimestamp) => {
       builder.moveCall(
         txBlock,
-        `${veScaIds.id}::ve_sca::renew_expired_ve_sca`,
+        `${veScaIds.pkgId}::ve_sca::renew_expired_ve_sca`,
         [
           veScaIds.config,
           veScaKey,
@@ -181,7 +158,7 @@ const generateNormalVeScaMethod: GenerateVeScaNormalMethod = ({
     redeemSca: (veScaKey) => {
       return builder.moveCall(
         txBlock,
-        `${veScaIds.id}::ve_sca::redeem`,
+        `${veScaIds.pkgId}::ve_sca::redeem`,
         [
           veScaIds.config,
           veScaKey,
@@ -195,39 +172,11 @@ const generateNormalVeScaMethod: GenerateVeScaNormalMethod = ({
     mintEmptyVeSca: () => {
       return builder.moveCall(
         txBlock,
-        `${veScaIds.id}::ve_sca::mint_ve_sca_placeholder_key`,
+        `${veScaIds.pkgId}::ve_sca::mint_ve_sca_placeholder_key`,
         [veScaIds.config, veScaIds.table],
         []
       );
     },
-    splitVeSca: (veScaKey, splitAmount) => {
-      return builder.moveCall(txBlock, `${veScaIds.id}::ve_sca::split`, [
-        veScaIds.config,
-        veScaKey,
-        veScaIds.table,
-        veScaIds.subsTable,
-        txBlock.pure.u64(splitAmount),
-      ]);
-    },
-    mergeVeSca: (targetKey, sourceKey) => {
-      return builder.moveCall(
-        txBlock,
-        `${veScaIds.id}::ve_sca::merge`,
-        [
-          veScaIds.config,
-          targetKey,
-          sourceKey,
-          veScaIds.table,
-          veScaIds.subsTable,
-          txBlock.sharedObjectRef({
-            objectId: SUI_CLOCK_OBJECT_ID,
-            mutable: false,
-            initialSharedVersion: '1',
-          }),
-        ],
-        []
-      );
-    },
   };
 };
 
@@ -413,75 +362,8 @@ const generateQuickVeScaMethod: GenerateVeScaQuickMethod = ({
           txBlock.transferObjects([sca], sender);
           return;
         }
-        return sca as QuickMethodReturnType<S>;
-      }
-    },
-    splitVeScaQuick: async <S extends boolean>(
-      splitAmount: string,
-      veScaKey: string,
-      transferVeScaKey: S = true as S
-    ) => {
-      const isKeyInSubTable = await isInSubsTable(
-        builder,
-        veScaKey,
-        builder.address.get('vesca.subsTable')
-      );
-
-      const unstakeObligationBeforeStake =
-        !!txBlock.txBlock.blockData.transactions.find(
-          (txn) =>
-            txn.kind === 'MoveCall' &&
-            txn.target ===
-              `${builder.address.get('borrowIncentive.id')}::user::unstake_v2`
-        );
-
-      if (isKeyInSubTable && !unstakeObligationBeforeStake) {
-        throw new Error(
-          'Key cannot be in the subs table, please call unsubscribe vesca or unstake obligation first'
-        );
+        return sca as RedeemScaQuickReturnType<S>;
       }
-
-      const newVeScaKey = txBlock.splitVeSca(veScaKey, splitAmount);
-      if (transferVeScaKey) {
-        txBlock.transferObjects([newVeScaKey], requireSender(txBlock));
-        return;
-      } else {
-        return newVeScaKey as QuickMethodReturnType<S>;
-      }
-    },
-    mergeVeScaQuick: async (targetKey: string, sourceKey: string) => {
-      // check targetKey and sourceKey
-      const [isTargetInSubTable, isSourceInSubTable] = await Promise.all([
-        isInSubsTable(
-          builder,
-          targetKey,
-          builder.address.get('vesca.subsTableId')
-        ),
-        isInSubsTable(
-          builder,
-          sourceKey,
-          builder.address.get('vesca.subsTableId')
-        ),
-      ]);
-
-      const unstakeObligationBeforeStake =
-        !!txBlock.txBlock.blockData.transactions.find(
-          (txn) =>
-            txn.kind === 'MoveCall' &&
-            txn.target ===
-              `${builder.address.get('borrowIncentive.id')}::user::unstake_v2`
-        );
-
-      if (
-        (isTargetInSubTable || isSourceInSubTable) &&
-        !unstakeObligationBeforeStake
-      ) {
-        throw new Error(
-          'Both target and source cannot be in the subs table. Please call unsubscribe vesca or unstake obligation first'
-        );
-      }
-
-      return txBlock.mergeVeSca(targetKey, sourceKey);
     },
   };
 };

package/src/constants/testAddress.ts

@@ -256,24 +256,18 @@ export const TEST_ADDRESSES: AddressesInterface = {
       '0x9636e7b947b806b9fe438d037f02bb24026c5b2691d2f6bad349c2e117f77cc3',
   },
   vesca: {
-    id: '0x0c7f5568dbd69488437ee95f2d9a028724e1de12432965ff8acca7c67310ba46',
+    id: '0x1158813b32962c2d22888fae257d5f2365b03631f0cd5d5b912ccdf51ff4e2f2',
     object:
-      '0x0c7f5568dbd69488437ee95f2d9a028724e1de12432965ff8acca7c67310ba46',
+      '0xcfe2d87aa5712b67cad2732edb6a2201bfdf592377e5c0968b7cb02099bd8e21',
     adminCap:
       '0x4d105b16467acca81d18c132cdd1a3cee159920a86c1ef4bdbf2e8d7878500c5',
     tableId:
-      '0x06f763060ea5da3d639fb56df70674490a8354511cfe61584062aafd83b1940d',
-    table: '0x06f763060ea5da3d639fb56df70674490a8354511cfe61584062aafd83b1940d',
+      '0x0a0b7f749baeb61e3dfee2b42245e32d0e6b484063f0a536b33e771d573d7246',
+    table: '0xd3a4632b1080f7d96e1c2487d4dabf2c1196916937c505a69954ac9f393be8d0',
     treasury:
-      '0x934919cc31fa89b67578039bb10d5518fa23c50bc8f78500f1d1a718407a0a71',
+      '0xafa4b6231e49c15a22d641ce33fda761baaf650fa21899dfa2eb1716146e7306',
     config:
-      '0x38d3f7a1fa5071226535d4d8bfca8ccab3d24871402df1be669d7d5e9e3e9cb4',
-    subsTable:
-      '0x4756b716670ff62760b22bebed73c6eb2c2cb118674a2eea3a56ebea9e27ae76',
-    subsTableId:
-      '0x924b56d383b45445984a80002185b670aa2e72cd7df496d345f45f9407a12c07',
-    subsWhitelist:
-      '0xfc72adae643da4f2fe080adc1e2cca981eadcb518facb02324eeaab169752ffb',
+      '0x7cbcb0a342179577a117dfdff974cf1ab765d3b571067bf22ddf5f9e3a667922',
   },
   referral: {
     id: '0x1bf5a8ce77050d8052549d743e16b469f15aa6b81b752b78b6ebb65179665f5a',

package/src/models/scallopAddress.ts

@@ -335,9 +335,6 @@ const EMPTY_ADDRESSES: AddressesInterface = {
     table: '',
     treasury: '',
     config: '',
-    subsTable: '',
-    subsTableId: '',
-    subsWhitelist: '',
   },
   referral: {
     id: '',

package/src/models/scallopSuiKit.ts

@@ -264,6 +264,9 @@ class ScallopSuiKit extends ScallopQueryClient {
         queryKey,
       });
       prevDatas.forEach(([key, prevData]) => {
+        if (!prevData) {
+          prevData = { data: prevData };
+        }
         this.queryClient.setQueryData(
           key,
           deepMergeObject(prevData, { data: result, error: null }),

package/src/queries/coreQuery.ts

@@ -5,7 +5,7 @@ import {
   parseOriginMarketCollateralData,
   calculateMarketCollateralData,
   parseObjectAs,
-} from 'src/utils';
+} from '../utils';
 import type {
   SuiObjectResponse,
   SuiObjectData,
@@ -32,7 +32,7 @@ import {
   BorrowFee,
   BorrowDynamic,
   OriginMarketCollateralData,
-} from 'src/types';
+} from '../types';
 import BigNumber from 'bignumber.js';
 import { getSupplyLimit } from './supplyLimitQuery';
 import { isIsolatedAsset } from './isolatedAssetQuery';

package/src/queries/portfolioQuery.ts

@@ -1,6 +1,6 @@
 import BigNumber from 'bignumber.js';
 import { minBigNumber, estimatedFactor } from 'src/utils';
-import type { ScallopQuery } from 'src/models';
+import type { ScallopQuery } from '../models';
 import type {
   Market,
   MarketPool,
@@ -16,7 +16,7 @@ import type {
   ObligationBorrowIncentiveReward,
   MarketPools,
   MarketCollaterals,
-} from 'src/types';
+} from '../types';
 import { SuiObjectRef } from '@mysten/sui/client';
 import { normalizeStructTag, SUI_TYPE_ARG } from '@scallop-io/sui-kit';
 

package/src/queries/spoolQuery.ts

@@ -5,9 +5,9 @@ import {
   parseOriginSpoolRewardPoolData,
   calculateSpoolRewardPoolData,
   parseObjectAs,
-} from 'src/utils';
+} from '../utils';
 import type { SuiObjectData, SuiObjectResponse } from '@mysten/sui/client';
-import type { ScallopQuery, ScallopUtils } from 'src/models';
+import type { ScallopQuery, ScallopUtils } from '../models';
 import type {
   Spools,
   Spool,

package/src/queries/vescaQuery.ts

@@ -1,11 +1,11 @@
 import BigNumber from 'bignumber.js';
-import { VeScaTreasuryFields, VeScaTreasuryInfo, Vesca } from 'src/types';
+import { VeScaTreasuryFields, VeScaTreasuryInfo, Vesca } from '../types';
 import {
   type SuiObjectResponse,
   type SuiObjectData,
   DevInspectResults,
 } from '@mysten/sui/client';
-import type { ScallopUtils } from 'src/models';
+import type { ScallopUtils } from '../models';
 import { MAX_LOCK_DURATION } from 'src/constants';
 import { SUI_CLOCK_OBJECT_ID, SuiTxBlock } from '@scallop-io/sui-kit';
 import { bcs } from '@mysten/sui/bcs';

package/src/types/address.ts

@@ -108,9 +108,6 @@ export interface AddressesInterface {
     table: string;
     treasury: string;
     config: string;
-    subsTable: string;
-    subsTableId: string;
-    subsWhitelist: string;
   };
   referral: {
     id: string;

package/src/types/builder/vesca.ts

@@ -2,6 +2,13 @@ import { SuiTxBlock as SuiKitTxBlock, SuiObjectArg } from '@scallop-io/sui-kit';
 import type { TransactionResult } from '@mysten/sui/transactions';
 import { ScallopBuilder } from 'src/models';
 
+export type VescaIds = {
+  pkgId: string;
+  table: string;
+  treasury: string;
+  config: string;
+};
+
 export type VeScaNormalMethods = {
   lockSca: (
     scaCoin: SuiObjectArg,
@@ -19,17 +26,9 @@ export type VeScaNormalMethods = {
   ) => void;
   redeemSca: (veScaKey: SuiObjectArg) => TransactionResult;
   mintEmptyVeSca: () => TransactionResult;
-  splitVeSca: (
-    veScaKey: SuiObjectArg,
-    splitAmount: string
-  ) => TransactionResult;
-  mergeVeSca: (
-    targetVeScaKey: SuiObjectArg,
-    sourceVeScaKey: SuiObjectArg
-  ) => void;
 };
 
-export type QuickMethodReturnType<T extends boolean> = T extends true
+export type RedeemScaQuickReturnType<T extends boolean> = T extends true
   ? void
   : TransactionResult | undefined;
 
@@ -72,18 +71,9 @@ export type VeScaQuickMethods = {
     autoCheck?: boolean
   ) => Promise<void>;
   redeemScaQuick: <T extends boolean>(
-    veScaKey?: SuiObjectArg,
+    veSCaKey?: SuiObjectArg,
     transferSca?: T
-  ) => Promise<QuickMethodReturnType<T>>;
-  splitVeScaQuick: <T extends boolean>(
-    splitAmount: string,
-    veScaKey: string,
-    transferVeScaKey?: T
-  ) => Promise<QuickMethodReturnType<T>>;
-  mergeVeScaQuick: (
-    targetVeScaKey: string,
-    sourceVeScaKey: string
-  ) => Promise<void>;
+  ) => Promise<RedeemScaQuickReturnType<T>>;
 };
 
 export type SuiTxBlockWithVeScaNormalMethods = SuiKitTxBlock &

package/src/utils/builder.ts

@@ -5,7 +5,7 @@ import {
   MAX_LOCK_ROUNDS,
   MIN_INITIAL_LOCK_AMOUNT,
   MIN_TOP_UP_AMOUNT,
-} from 'src/constants';
+} from '../constants';
 import type { SuiObjectArg } from '@scallop-io/sui-kit';
 
 /**