@meteora-ag/cp-amm-sdk 1.0.11-rc.6 → 1.0.11-rc.8

package/dist/index.d.mts

@@ -6742,8 +6742,12 @@ declare const getUnClaimReward: (poolState: PoolState, positionState: PositionSt
 declare function getRewardInfo(poolState: PoolState, rewardIndex: number, periodTime: BN, currentTime: BN): {
     rewardPerPeriod: BN;
     rewardBalance: BN;
+    totalRewardDistributed: BN;
+};
+declare function getUserRewardPending(poolState: PoolState, positionState: PositionState, rewardIndex: number, currentTime: BN, periodTime: BN): {
+    userRewardPerPeriod: BN;
+    userPendingReward: BN;
 };
-declare function getUserRewardPending(poolState: PoolState, positionState: PositionState, rewardIndex: number, currentTime: BN): BN;
 
 declare const positionByPoolFilter: (pool: PublicKey) => GetProgramAccountsFilter;
 declare const vestingByPositionFilter: (position: PublicKey) => GetProgramAccountsFilter;

package/dist/index.d.ts

@@ -6742,8 +6742,12 @@ declare const getUnClaimReward: (poolState: PoolState, positionState: PositionSt
 declare function getRewardInfo(poolState: PoolState, rewardIndex: number, periodTime: BN, currentTime: BN): {
     rewardPerPeriod: BN;
     rewardBalance: BN;
+    totalRewardDistributed: BN;
+};
+declare function getUserRewardPending(poolState: PoolState, positionState: PositionState, rewardIndex: number, currentTime: BN, periodTime: BN): {
+    userRewardPerPeriod: BN;
+    userPendingReward: BN;
 };
-declare function getUserRewardPending(poolState: PoolState, positionState: PositionState, rewardIndex: number, currentTime: BN): BN;
 
 declare const positionByPoolFilter: (pool: PublicKey) => GetProgramAccountsFilter;
 declare const vestingByPositionFilter: (position: PublicKey) => GetProgramAccountsFilter;

package/dist/index.js

@@ -6385,27 +6385,57 @@ function getRewardPerTokenStore(poolReward, poolLiquidity, currentTime) {
   ).add(rewardPerTokenStore);
   return totalRewardPerTokenStore;
 }
+function getRewardPerPeriod(poolReward, currentTime, periodTime) {
+  const timeRewardAppicable = currentTime.add(periodTime);
+  const period = timeRewardAppicable <= poolReward.rewardDurationEnd ? periodTime : poolReward.rewardDurationEnd.sub(currentTime);
+  const rewardPerPeriod = poolReward.rewardRate.mul(period);
+  return rewardPerPeriod;
+}
 function getRewardInfo(poolState, rewardIndex, periodTime, currentTime) {
   const poolReward = poolState.rewardInfos[rewardIndex];
-  const totalRewardPerPeriod = poolReward.rewardRate.mul(periodTime);
-  const totalReward = poolReward.rewardRate.mul(poolReward.rewardDuration).shrn(64);
-  const rewardPerTokenStore = getRewardPerTokenStore(poolReward, poolState.liquidity, currentTime);
+  const rewardPerTokenStore = getRewardPerTokenStore(
+    poolReward,
+    poolState.liquidity,
+    currentTime
+  );
   const totalRewardDistributed = rewardPerTokenStore.mul(poolState.liquidity).shrn(192);
+  const rewardPerPeriod = getRewardPerPeriod(
+    poolReward,
+    currentTime,
+    periodTime
+  );
+  const remainTime = poolReward.rewardDurationEnd.sub(currentTime);
+  const rewardBalance = poolReward.rewardRate.mul(remainTime).shrn(64);
   return {
-    rewardPerPeriod: totalRewardPerPeriod.shrn(64),
-    rewardBalance: totalReward.sub(totalRewardDistributed)
+    rewardPerPeriod: rewardPerPeriod.shrn(64),
+    rewardBalance,
+    totalRewardDistributed
   };
 }
-function getUserRewardPending(poolState, positionState, rewardIndex, currentTime) {
+function getUserRewardPending(poolState, positionState, rewardIndex, currentTime, periodTime) {
   const poolReward = poolState.rewardInfos[rewardIndex];
   const userRewardInfo = positionState.rewardInfos[rewardIndex];
-  const rewardPerTokenStore = getRewardPerTokenStore(poolReward, poolState.liquidity, currentTime);
+  const rewardPerTokenStore = getRewardPerTokenStore(
+    poolReward,
+    poolState.liquidity,
+    currentTime
+  );
   const totalPositionLiquidity = positionState.unlockedLiquidity.add(positionState.vestedLiquidity).add(positionState.permanentLockedLiquidity);
   const userRewardPerTokenCheckPoint = new (0, _anchor.BN)(
     Buffer.from(userRewardInfo.rewardPerTokenCheckpoint).reverse()
   );
   const newReward = totalPositionLiquidity.mul(rewardPerTokenStore.sub(userRewardPerTokenCheckPoint)).shrn(192);
-  return userRewardInfo.rewardPendings.add(newReward);
+  const rewardPerPeriod = getRewardPerPeriod(
+    poolReward,
+    currentTime,
+    periodTime
+  );
+  const rewardPerTokenStorePerPeriod = rewardPerPeriod.shln(128).div(poolState.liquidity);
+  const userRewardPerPeriod = totalPositionLiquidity.mul(rewardPerTokenStorePerPeriod).shrn(192);
+  return {
+    userPendingReward: userRewardInfo.rewardPendings.add(newReward),
+    userRewardPerPeriod
+  };
 }
 
 // src/helpers/accountFilters.ts