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

package/dist/index.mjs

@@ -6372,6 +6372,28 @@ var getUnClaimReward = (poolState, positionState) => {
     rewards: positionState.rewardInfos.length > 0 ? positionState.rewardInfos.map((item) => item.rewardPendings) : []
   };
 };
+function getRewardInfo(poolState, positionState, rewardIndex, periodTime) {
+  const poolReward = poolState.rewardInfos[rewardIndex];
+  const userRewardInfo = positionState.rewardInfos[rewardIndex];
+  const rewardPerTokenStore = new BN6(
+    Buffer.from(poolReward.rewardPerTokenStored).reverse()
+  );
+  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);
+  return {
+    rewardPendings: userRewardInfo.rewardPendings.add(newReward),
+    totalUserRewardPerPeriod,
+    rewardBalance: totalReward.sub(totalRewardDistributed)
+  };
+}
 
 // src/helpers/accountFilters.ts
 var positionByPoolFilter = (pool) => {
@@ -8532,7 +8554,6 @@ var CpAmm = class {
         rewardMintProgram
       } = params;
       const rewardVault = deriveRewardVaultAddress(pool, rewardIndex);
-      const tokenProgram = rewardMintProgram ? rewardMintProgram : (yield this._program.provider.connection.getAccountInfo(rewardMint)).owner;
       return yield this._program.methods.initializeReward(rewardIndex, rewardDuration, funder).accountsPartial({
         poolAuthority: this.poolAuthority,
         pool,
@@ -8540,7 +8561,7 @@ var CpAmm = class {
         rewardMint,
         signer: creator,
         payer,
-        tokenProgram
+        tokenProgram: rewardMintProgram
       }).transaction();
     });
   }
@@ -8562,6 +8583,7 @@ var CpAmm = class {
         amount,
         rewardMintProgram
       } = params;
+      const rewardVault = deriveRewardVaultAddress(pool, rewardIndex);
       const initializeRewardTx = yield this.initializeReward({
         rewardIndex,
         rewardDuration,
@@ -8577,7 +8599,10 @@ var CpAmm = class {
         carryForward,
         pool,
         funder: payer,
-        amount
+        amount,
+        rewardMint,
+        rewardVault,
+        rewardMintProgram
       });
       return new Transaction().add(initializeRewardTx).add(fundRewardTx);
     });
@@ -8617,22 +8642,27 @@ var CpAmm = class {
    */
   fundReward(params) {
     return __async(this, null, function* () {
-      const { rewardIndex, carryForward, pool, funder, amount } = params;
-      const poolState = yield this.fetchPoolState(pool);
-      const rewardInfo = poolState.rewardInfos[rewardIndex];
-      const { vault, mint } = rewardInfo;
-      const tokenProgram = getTokenProgram(rewardIndex);
+      const {
+        rewardIndex,
+        carryForward,
+        pool,
+        funder,
+        amount,
+        rewardMint,
+        rewardVault,
+        rewardMintProgram
+      } = params;
       const preInstructions = [];
       const { ataPubkey: funderTokenAccount, ix: createFunderTokenAccountIx } = yield getOrCreateATAInstruction(
         this._program.provider.connection,
-        mint,
+        rewardMint,
         funder,
         funder,
         true,
-        tokenProgram
+        rewardMintProgram
       );
       createFunderTokenAccountIx && preInstructions.push(createFunderTokenAccountIx);
-      if (mint.equals(NATIVE_MINT2) && !amount.isZero()) {
+      if (rewardMint.equals(NATIVE_MINT2) && !amount.isZero()) {
         const wrapSOLIx = wrapSOLInstruction(
           funder,
           funderTokenAccount,
@@ -8642,11 +8672,11 @@ var CpAmm = class {
       }
       return yield this._program.methods.fundReward(rewardIndex, amount, carryForward).accountsPartial({
         pool,
-        rewardVault: vault,
-        rewardMint: mint,
+        rewardVault,
+        rewardMint,
         funderTokenAccount,
         funder,
-        tokenProgram
+        tokenProgram: rewardMintProgram
       }).transaction();
     });
   }
@@ -8985,6 +9015,7 @@ export {
   getOrCreateATAInstruction,
   getPriceFromSqrtPrice,
   getPriceImpact,
+  getRewardInfo,
   getSecondKey,
   getSimulationComputeUnits,
   getSqrtPriceFromPrice,