@meteora-ag/cp-amm-sdk 1.0.11-rc.3 → 1.0.11-rc.4

package/dist/index.d.mts

@@ -6739,9 +6739,10 @@ declare const getUnClaimReward: (poolState: PoolState, positionState: PositionSt
     feeTokenB: BN;
     rewards: BN[];
 };
-declare function getRewardInfo(poolState: PoolState, positionState: PositionState, rewardIndex: number, periodTime: BN): {
+declare function getRewardInfo(poolState: PoolState, positionState: PositionState, rewardIndex: number, currentTime: BN, periodTime: BN): {
     rewardPendings: BN;
     totalUserRewardPerPeriod: BN;
+    totalPoolRewardPerPeriod: BN;
     rewardBalance: BN;
 };
 

package/dist/index.d.ts

@@ -6739,9 +6739,10 @@ declare const getUnClaimReward: (poolState: PoolState, positionState: PositionSt
     feeTokenB: BN;
     rewards: BN[];
 };
-declare function getRewardInfo(poolState: PoolState, positionState: PositionState, rewardIndex: number, periodTime: BN): {
+declare function getRewardInfo(poolState: PoolState, positionState: PositionState, rewardIndex: number, currentTime: BN, periodTime: BN): {
     rewardPendings: BN;
     totalUserRewardPerPeriod: BN;
+    totalPoolRewardPerPeriod: BN;
     rewardBalance: BN;
 };
 

package/dist/index.js

@@ -6372,12 +6372,13 @@ var getUnClaimReward = (poolState, positionState) => {
     rewards: positionState.rewardInfos.length > 0 ? positionState.rewardInfos.map((item) => item.rewardPendings) : []
   };
 };
-function getRewardInfo(poolState, positionState, rewardIndex, periodTime) {
+function getRewardInfo(poolState, positionState, rewardIndex, currentTime, periodTime) {
   const poolReward = poolState.rewardInfos[rewardIndex];
   const userRewardInfo = positionState.rewardInfos[rewardIndex];
-  const rewardPerTokenStore = new (0, _anchor.BN)(
-    Buffer.from(poolReward.rewardPerTokenStored).reverse()
-  );
+  const lastTimeRewardApplicable = _anchor.BN.min(currentTime, poolReward.rewardDurationEnd);
+  const timePeriod = lastTimeRewardApplicable.sub(poolReward.lastUpdateTime);
+  const currentTotalReward = timePeriod.mul(poolReward.rewardRate);
+  const rewardPerTokenStore = currentTotalReward.shln(128).div(poolState.liquidity);
   const userRewardPerTokenCheckPoint = new (0, _anchor.BN)(
     Buffer.from(userRewardInfo.rewardPerTokenCheckpoint).reverse()
   );
@@ -6388,9 +6389,12 @@ function getRewardInfo(poolState, positionState, rewardIndex, periodTime) {
   const totalUserRewardPerPeriod = totalPositionLiquidity.mul(rewardPerTokenStorePerPeriod).shrn(192);
   const totalReward = poolReward.rewardRate.mul(poolReward.rewardDuration).shrn(64);
   const totalRewardDistributed = rewardPerTokenStore.mul(poolState.liquidity).shrn(192);
+  console.log("userRewardInfo.rewardPendings: ", userRewardInfo.rewardPendings.toString());
+  console.log("newReward: ", newReward.toString());
   return {
     rewardPendings: userRewardInfo.rewardPendings.add(newReward),
     totalUserRewardPerPeriod,
+    totalPoolRewardPerPeriod: totalRewardPerPeriod,
     rewardBalance: totalReward.sub(totalRewardDistributed)
   };
 }