@scallop-io/sui-scallop-sdk 2.1.3-merge-split-ve-sca-alpha.3 → 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.3",
+  "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

@@ -1,9 +1,5 @@
 import { Transaction } from '@mysten/sui/transactions';
-import {
-  normalizeSuiAddress,
-  MOVE_STDLIB_ADDRESS,
-  SuiTxBlock as SuiKitTxBlock,
-} from '@scallop-io/sui-kit';
+import { SuiTxBlock as SuiKitTxBlock } from '@scallop-io/sui-kit';
 import { ScallopBuilder } from 'src/models';
 import {
   GenerateLoyaltyProgramNormalMethod,
@@ -44,7 +40,7 @@ const generateLoyaltyProgramNormalMethod: GenerateLoyaltyProgramNormalMethod =
         );
       },
       claimVeScaLoyaltyReward: (veScaKey) => {
-        const optionVeScaKey = builder.moveCall(
+        return builder.moveCall(
           txBlock,
           `${veScaLoyaltyProgramIds.pkgId}::ve_sca_reward::redeem_reward`,
           [
@@ -55,17 +51,6 @@ const generateLoyaltyProgramNormalMethod: GenerateLoyaltyProgramNormalMethod =
             veScaProgramIds.subsTable,
           ]
         );
-
-        // Extract from option
-        const veScaKeyType = `${veScaProgramIds.object}::ve_sca::VeScaKey`;
-        const rewardVeScaKey = builder.moveCall(
-          txBlock,
-          `${normalizeSuiAddress(MOVE_STDLIB_ADDRESS)}::option::destroy_some`,
-          [optionVeScaKey],
-          [veScaKeyType]
-        );
-
-        return rewardVeScaKey;
       },
     };
   };

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 (
@@ -290,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: '0xbee5585c16275e582ad595f0bb0c0895ea97fb3f06e7a47779c98effcf756df7',
+    id: '0x51bd8c455caedad9d7fd47f9ee75876668c4d6bbede95af39c0aebde46043f00',
     object:
-      '0xbee5585c16275e582ad595f0bb0c0895ea97fb3f06e7a47779c98effcf756df7',
+      '0x51bd8c455caedad9d7fd47f9ee75876668c4d6bbede95af39c0aebde46043f00',
     adminCap:
-      '0xcf17d2d40926226695cbf18ae11d792c74c0dc5419e8259bfa415c3c629a28a9',
+      '0xb2d52e0ebb260cb42699be6a9804e12d6fa17b79ef1e43f9996df5ca71bac0ae',
     veScaRewardPool:
-      '0x8fbcc04c1dc1e0f71c6bbec61761beb2aba07e070751b3e43eeee05ccaca97d5',
+      '0x4fe34992bf2261c3c6c14b2dbf9606ce65a505c45ff778ac129ce7dea9b0cadf',
     veScaRewardTableId:
-      '0x51a7c365d58435562a2d72de2c8b78679bc81c345222ef1d9e0fbeca1e365f14',
+      '0x85d3e557d9bbed617b9cbc09982a0c9a6f6f4fc9ecce49b59124206c409c4774',
   },
   scoin: {
     id: '0x826a4934bee9487e558eed603cf42f30cdc4321d6f31083930791b95f903b9f9',