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

package/package.json

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

package/src/builders/loyaltyProgramBuilder.ts

@@ -1,5 +1,9 @@
 import { Transaction } from '@mysten/sui/transactions';
-import { SuiTxBlock as SuiKitTxBlock } from '@scallop-io/sui-kit';
+import {
+  normalizeSuiAddress,
+  MOVE_STDLIB_ADDRESS,
+  SuiTxBlock as SuiKitTxBlock,
+} from '@scallop-io/sui-kit';
 import { ScallopBuilder } from 'src/models';
 import {
   GenerateLoyaltyProgramNormalMethod,
@@ -18,6 +22,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'),
@@ -39,7 +44,7 @@ const generateLoyaltyProgramNormalMethod: GenerateLoyaltyProgramNormalMethod =
         );
       },
       claimVeScaLoyaltyReward: (veScaKey) => {
-        return builder.moveCall(
+        const optionVeScaKey = builder.moveCall(
           txBlock,
           `${veScaLoyaltyProgramIds.pkgId}::ve_sca_reward::redeem_reward`,
           [
@@ -50,6 +55,17 @@ 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

@@ -248,9 +248,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;

package/src/constants/testAddress.ts

@@ -308,15 +308,15 @@ export const TEST_ADDRESSES: AddressesInterface = {
       '0x574a11f8a0fbaa05b8f559cb65634e8eb20f26b1ec29e7d58de9167f3cedd0f7',
   },
   veScaLoyaltyProgram: {
-    id: '0x7e95dc10fb96ffb2341f664926417b0fb261c9f3dc417344d2a3b11a2f5bb812',
+    id: '0xbee5585c16275e582ad595f0bb0c0895ea97fb3f06e7a47779c98effcf756df7',
     object:
-      '0x7e95dc10fb96ffb2341f664926417b0fb261c9f3dc417344d2a3b11a2f5bb812',
+      '0xbee5585c16275e582ad595f0bb0c0895ea97fb3f06e7a47779c98effcf756df7',
     adminCap:
-      '0x4fc52ce8aab57eaa154d9ee42e9d8ecb7add6176d19ff65ebac59bf196b12de8',
+      '0xcf17d2d40926226695cbf18ae11d792c74c0dc5419e8259bfa415c3c629a28a9',
     veScaRewardPool:
-      '0x59025ec74adfcde1e0d793ff432fa0281f47fe4239aa8811430f10307292eca4',
+      '0x8fbcc04c1dc1e0f71c6bbec61761beb2aba07e070751b3e43eeee05ccaca97d5',
     veScaRewardTableId:
-      '0xbfa64d2dcd45c9dee92b8c0e052954c05bd687b4e3b132ace9c1f6d6cf619eba',
+      '0x51a7c365d58435562a2d72de2c8b78679bc81c345222ef1d9e0fbeca1e365f14',
   },
   scoin: {
     id: '0x826a4934bee9487e558eed603cf42f30cdc4321d6f31083930791b95f903b9f9',

package/src/queries/loyaltyProgramQuery.ts

@@ -1,5 +1,6 @@
 import { SuiObjectData } from '@mysten/sui/client';
 import BigNumber from 'bignumber.js';
+import { MAX_LOCK_DURATION } from 'src/constants';
 import { ScallopQuery } from 'src/models';
 import { LoyaltyProgramInfo, VeScaLoyaltyProgramInfo } from 'src/types';
 import { z as zod } from 'zod';
@@ -121,13 +122,15 @@ export const getVeScaLoyaltyProgramInformations = async (
 
   const result: VeScaLoyaltyProgramInfo = {
     pendingVeScaReward: 0,
+    pendingScaReward: 0,
     totalPoolReward: 0,
     isClaimEnabled,
   };
 
+  let reserveVeSca;
   // calculate totalPoolreward from reserveVeScaKey
   if (reserveVeScaKey) {
-    const reserveVeSca = await query.getVeSca(reserveVeScaKey);
+    reserveVeSca = await query.getVeSca(reserveVeScaKey);
     result.totalPoolReward = reserveVeSca?.currentVeScaBalance ?? 0;
   }
 
@@ -151,8 +154,18 @@ export const getVeScaLoyaltyProgramInformations = async (
 
   if (userRewardObject?.data?.content?.dataType !== 'moveObject') return result;
   const userRewardFields = userRewardObject.data.content.fields;
-  result.pendingVeScaReward = userVeScaRewardFieldsZod.parse(
+  result.pendingScaReward = userVeScaRewardFieldsZod.parse(
     userRewardFields
   ) as UserVeScaRewardFields;
+
+  const remainingLockPeriodInMilliseconds = Math.max(
+    (reserveVeSca?.unlockAt ?? 0) - Date.now(),
+    0
+  );
+
+  result.pendingVeScaReward =
+    result.pendingScaReward *
+    (Math.floor(remainingLockPeriodInMilliseconds / 1000) / MAX_LOCK_DURATION);
+
   return result;
 };

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: (

package/src/types/query/loyaltyProgram.ts

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