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

package/package.json

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

package/src/builders/loyaltyProgramBuilder.ts

@@ -18,6 +18,7 @@ const generateLoyaltyProgramNormalMethod: GenerateLoyaltyProgramNormalMethod =
     };
 
     const veScaProgramIds = {
+      object: builder.address.get('vesca.object'),
       protocolConfig: builder.address.get('vesca.config'),
       veScaTable: builder.address.get('vesca.table'),
       subsTable: builder.address.get('vesca.subsTable'),

package/src/builders/vescaBuilder.ts

@@ -28,6 +28,7 @@ import type {
   SuiTxBlockWithVeScaNormalMethods,
   VeScaTxBlock,
 } from 'src/types';
+import { SuiObjectData } from '@mysten/sui/client';
 
 /**
  * Check and get veSCA data from transaction block.
@@ -46,11 +47,11 @@ export const requireVeSca = async (
   ...params: [
     builder: ScallopBuilder,
     SuiTxBlock: SuiTxBlock,
-    veScaKey?: SuiObjectArg,
+    veScaKey?: SuiObjectData,
   ]
 ) => {
   const [builder, txBlock, veScaKey] = params;
-  if (params.length === 3 && veScaKey && typeof veScaKey === 'string') {
+  if (params.length === 3 && veScaKey && typeof veScaKey !== 'undefined') {
     const veSca = await getVeSca(builder.utils, veScaKey);
 
     if (!veSca) {
@@ -67,7 +68,13 @@ export const requireVeSca = async (
   }
 
   // return veSCA with the same veScaKey or the highest veSCA balance
-  return veScaKey ? veScas.find(({ keyId }) => veScaKey === keyId) : veScas[0];
+  return veScaKey
+    ? veScas.find(
+        ({ keyId }) =>
+          (typeof veScaKey === 'string' ? veScaKey : veScaKey.objectId) ===
+          keyId
+      )
+    : veScas[0];
 };
 
 export const isInSubsTable = async (
@@ -248,9 +255,14 @@ const generateQuickVeScaMethod: GenerateVeScaQuickMethod = ({
   txBlock,
 }) => {
   return {
-    lockScaQuick: async (amountOrCoin, lockPeriodInDays, autoCheck = true) => {
+    lockScaQuick: async (
+      amountOrCoin,
+      lockPeriodInDays,
+      veScaKey,
+      autoCheck = true
+    ) => {
       const sender = requireSender(txBlock);
-      const veSca = await requireVeSca(builder, txBlock);
+      const veSca = await requireVeSca(builder, txBlock, veScaKey);
 
       let scaCoin: TransactionObjectArgument | SuiObjectArg | undefined =
         undefined;
@@ -285,9 +297,9 @@ const generateQuickVeScaMethod: GenerateVeScaQuickMethod = ({
           veSca?.unlockAt
         );
 
-      const isInitialLock = !veSca?.unlockAt;
+      const isInitialLock = !veSca;
       const isLockExpired =
-        !isInitialLock && veSca.unlockAt * 1000 <= new Date().getTime();
+        !isInitialLock && veSca.unlockAt <= new Date().getTime();
       if (isInitialLock || isLockExpired) {
         if (scaCoin) {
           if (isInitialLock) {

package/src/constants/testAddress.ts

@@ -308,15 +308,15 @@ export const TEST_ADDRESSES: AddressesInterface = {
       '0x574a11f8a0fbaa05b8f559cb65634e8eb20f26b1ec29e7d58de9167f3cedd0f7',
   },
   veScaLoyaltyProgram: {
-    id: '0x7e95dc10fb96ffb2341f664926417b0fb261c9f3dc417344d2a3b11a2f5bb812',
+    id: '0x51bd8c455caedad9d7fd47f9ee75876668c4d6bbede95af39c0aebde46043f00',
     object:
-      '0x7e95dc10fb96ffb2341f664926417b0fb261c9f3dc417344d2a3b11a2f5bb812',
+      '0x51bd8c455caedad9d7fd47f9ee75876668c4d6bbede95af39c0aebde46043f00',
     adminCap:
-      '0x4fc52ce8aab57eaa154d9ee42e9d8ecb7add6176d19ff65ebac59bf196b12de8',
+      '0xb2d52e0ebb260cb42699be6a9804e12d6fa17b79ef1e43f9996df5ca71bac0ae',
     veScaRewardPool:
-      '0x59025ec74adfcde1e0d793ff432fa0281f47fe4239aa8811430f10307292eca4',
+      '0x4fe34992bf2261c3c6c14b2dbf9606ce65a505c45ff778ac129ce7dea9b0cadf',
     veScaRewardTableId:
-      '0xbfa64d2dcd45c9dee92b8c0e052954c05bd687b4e3b132ace9c1f6d6cf619eba',
+      '0x85d3e557d9bbed617b9cbc09982a0c9a6f6f4fc9ecce49b59124206c409c4774',
   },
   scoin: {
     id: '0x826a4934bee9487e558eed603cf42f30cdc4321d6f31083930791b95f903b9f9',

package/src/types/builder/vesca.ts

@@ -53,6 +53,7 @@ export type VeScaQuickMethods = {
   lockScaQuick(
     amountOrCoin?: SuiObjectArg | number,
     lockPeriodInDays?: number,
+    veScaKey?: SuiObjectArg,
     autoCheck?: boolean
   ): Promise<void>;
   extendLockPeriodQuick: (