@meteora-ag/cp-amm-sdk 1.0.11-rc.5 → 1.0.11-rc.7

package/dist/index.mjs

@@ -6372,30 +6372,67 @@ var getUnClaimReward = (poolState, positionState) => {
     rewards: positionState.rewardInfos.length > 0 ? positionState.rewardInfos.map((item) => item.rewardPendings) : []
   };
 };
-function getRewardInfo(poolState, positionState, rewardIndex, currentTime, periodTime) {
-  const poolReward = poolState.rewardInfos[rewardIndex];
-  const userRewardInfo = positionState.rewardInfos[rewardIndex];
-  const lastTimeRewardApplicable = BN6.min(currentTime, poolReward.rewardDurationEnd);
+function getRewardPerTokenStore(poolReward, poolLiquidity, currentTime) {
+  const lastTimeRewardApplicable = BN6.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 rewardPerTokenStore = currentTotalReward.shln(128).div(poolLiquidity);
+  const totalRewardPerTokenStore = new BN6(
+    Buffer.from(poolReward.rewardPerTokenStored).reverse()
+  ).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 totalReward = poolReward.rewardRate.mul(poolReward.rewardDuration).shrn(64);
+  const rewardPerTokenStore = getRewardPerTokenStore(
+    poolReward,
+    poolState.liquidity,
+    currentTime
+  );
+  const totalRewardDistributed = rewardPerTokenStore.mul(poolState.liquidity).shrn(192);
+  const rewardPerPeriod = getRewardPerPeriod(
+    poolReward,
+    currentTime,
+    periodTime
+  );
+  return {
+    rewardPerPeriod: rewardPerPeriod.shrn(64),
+    rewardBalance: totalReward.sub(totalRewardDistributed)
+  };
+}
+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 totalPositionLiquidity = positionState.unlockedLiquidity.add(positionState.vestedLiquidity).add(positionState.permanentLockedLiquidity);
   const userRewardPerTokenCheckPoint = new BN6(
     Buffer.from(userRewardInfo.rewardPerTokenCheckpoint).reverse()
   );
-  const totalPositionLiquidity = positionState.unlockedLiquidity.add(positionState.vestedLiquidity).add(positionState.permanentLockedLiquidity);
   const newReward = totalPositionLiquidity.mul(rewardPerTokenStore.sub(userRewardPerTokenCheckPoint)).shrn(192);
-  const totalRewardPerPeriod = poolReward.rewardRate.mul(periodTime);
-  const rewardPerTokenStorePerPeriod = totalRewardPerPeriod.shln(128).div(poolState.liquidity);
-  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());
+  const rewardPerPeriod = getRewardPerPeriod(
+    poolReward,
+    currentTime,
+    periodTime
+  );
+  const rewardPerTokenStorePerPeriod = rewardPerPeriod.shln(128).div(poolState.liquidity);
+  const userRewardPerPeriod = totalPositionLiquidity.mul(rewardPerTokenStorePerPeriod).shrn(192);
   return {
-    rewardPendings: userRewardInfo.rewardPendings.add(newReward),
-    totalUserRewardPerPeriod,
-    totalPoolRewardPerPeriod: totalRewardPerPeriod.shrn(64),
-    rewardBalance: totalReward.sub(totalRewardDistributed)
+    userPendingReward: userRewardInfo.rewardPendings.add(newReward),
+    userRewardPerPeriod
   };
 }
 
@@ -9028,6 +9065,7 @@ export {
   getTokenProgram,
   getTotalLockedLiquidity,
   getUnClaimReward,
+  getUserRewardPending,
   isVestingComplete,
   mulDiv,
   positionByPoolFilter,