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

package/src/queries/vescaQuery.ts

@@ -1,11 +1,11 @@
 import BigNumber from 'bignumber.js';
-import { VeScaTreasuryFields, VeScaTreasuryInfo, Vesca } from '../types';
+import { VeScaTreasuryFields, VeScaTreasuryInfo, Vesca } from 'src/types';
 import {
   type SuiObjectResponse,
   type SuiObjectData,
   DevInspectResults,
 } from '@mysten/sui/client';
-import type { ScallopUtils } from '../models';
+import type { ScallopUtils } from 'src/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,6 +108,9 @@ export interface AddressesInterface {
     table: string;
     treasury: string;
     config: string;
+    subsTable: string;
+    subsTableId: string;
+    subsWhitelist: string;
   };
   referral: {
     id: string;
@@ -124,10 +127,18 @@ export interface AddressesInterface {
   };
   loyaltyProgram: {
     id: string;
+    adminCap?: string;
     object: string;
     rewardPool: string;
     userRewardTableId: string;
   };
+  veScaLoyaltyProgram: {
+    id: string;
+    adminCap?: string;
+    object: string;
+    veScaRewardPool: string;
+    veScaRewardTableId: string;
+  };
   scoin: {
     id: string;
     coins: Partial<

package/src/types/builder/loyaltyProgram.ts

@@ -5,18 +5,14 @@ import {
 } from '@scallop-io/sui-kit';
 import { type ScallopBuilder } from 'src/models';
 
-export type LoyaltyProgramIds = {
-  loyaltyProgramPkgId: string;
-  rewardPool: string;
-  userRewardTableId: string;
-};
-
 export type LoyaltyProgramNormalMethods = {
   claimLoyaltyRevenue: (veScaKey: SuiObjectArg) => TransactionResult;
+  claimVeScaLoyaltyReward: (veScaKey: SuiObjectArg) => TransactionResult;
 };
 
 export type LoyaltyProgramQuickMethods = {
   claimLoyaltyRevenueQuick: (veScaKey?: SuiObjectArg) => Promise<void>;
+  claimVeScaLoyaltyRewardQuick: (veScaKey?: SuiObjectArg) => Promise<void>;
 };
 
 export type SuiTxBlockWithLoyaltyProgramNormalMethods = SuiKitTxBlock &

package/src/types/builder/vesca.ts

@@ -2,13 +2,6 @@ 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,
@@ -26,9 +19,17 @@ export type VeScaNormalMethods = {
   ) => void;
   redeemSca: (veScaKey: SuiObjectArg) => TransactionResult;
   mintEmptyVeSca: () => TransactionResult;
+  splitVeSca: (
+    veScaKey: SuiObjectArg,
+    splitAmount: string
+  ) => TransactionResult;
+  mergeVeSca: (
+    targetVeScaKey: SuiObjectArg,
+    sourceVeScaKey: SuiObjectArg
+  ) => void;
 };
 
-export type RedeemScaQuickReturnType<T extends boolean> = T extends true
+export type QuickMethodReturnType<T extends boolean> = T extends true
   ? void
   : TransactionResult | undefined;
 
@@ -71,9 +72,18 @@ export type VeScaQuickMethods = {
     autoCheck?: boolean
   ) => Promise<void>;
   redeemScaQuick: <T extends boolean>(
-    veSCaKey?: SuiObjectArg,
+    veScaKey?: SuiObjectArg,
     transferSca?: T
-  ) => Promise<RedeemScaQuickReturnType<T>>;
+  ) => Promise<QuickMethodReturnType<T>>;
+  splitVeScaQuick: <T extends boolean>(
+    splitAmount: string,
+    veScaKey: string,
+    transferVeScaKey?: T
+  ) => Promise<QuickMethodReturnType<T>>;
+  mergeVeScaQuick: (
+    targetVeScaKey: string,
+    sourceVeScaKey: string
+  ) => Promise<void>;
 };
 
 export type SuiTxBlockWithVeScaNormalMethods = SuiKitTxBlock &

package/src/types/query/loyaltyProgram.ts

@@ -3,3 +3,10 @@ export type LoyaltyProgramInfo = {
   totalPoolReward: number;
   isClaimEnabled: boolean;
 };
+
+export type VeScaLoyaltyProgramInfo = {
+  pendingVeScaReward: number;
+  pendingScaReward: number;
+  totalPoolReward: number;
+  isClaimEnabled: boolean;
+};

package/src/utils/builder.ts

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