@meteora-ag/cp-amm-sdk 1.0.11-rc.0 → 1.0.11-rc.2

package/dist/index.mjs

@@ -6097,10 +6097,10 @@ function getDynamicFeeNumerator(volatilityAccumulator, binStep, variableFeeContr
   return vFee.add(new BN5(99999999999)).div(new BN5(1e11));
 }
 function getFeeNumerator(currentPoint, activationPoint, numberOfPeriod, periodFrequency, feeSchedulerMode, cliffFeeNumerator, reductionFactor, dynamicFeeParams) {
-  if (Number(periodFrequency) == 0 || new BN5(currentPoint).lt(activationPoint)) {
+  if (Number(periodFrequency) == 0) {
     return cliffFeeNumerator;
   }
-  const period = BN5.min(
+  const period = new BN5(currentPoint).lt(activationPoint) ? new BN5(numberOfPeriod) : BN5.min(
     new BN5(numberOfPeriod),
     new BN5(currentPoint).sub(activationPoint).div(periodFrequency)
   );
@@ -8532,7 +8532,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,10 +8539,52 @@ var CpAmm = class {
         rewardMint,
         signer: creator,
         payer,
-        tokenProgram
+        tokenProgram: rewardMintProgram
       }).transaction();
     });
   }
+  /**
+   * Builds a transaction to initialize reward and fund reward
+   * @param {InitializeAndFundReward} params
+   * @returns Transaction builder.
+   */
+  initializeAndFundReward(params) {
+    return __async(this, null, function* () {
+      const {
+        rewardIndex,
+        rewardDuration,
+        pool,
+        creator,
+        payer,
+        rewardMint,
+        carryForward,
+        amount,
+        rewardMintProgram
+      } = params;
+      const rewardVault = deriveRewardVaultAddress(pool, rewardIndex);
+      const initializeRewardTx = yield this.initializeReward({
+        rewardIndex,
+        rewardDuration,
+        funder: payer,
+        pool,
+        creator,
+        payer,
+        rewardMint,
+        rewardMintProgram
+      });
+      const fundRewardTx = yield this.fundReward({
+        rewardIndex,
+        carryForward,
+        pool,
+        funder: payer,
+        amount,
+        rewardMint,
+        rewardVault,
+        rewardMintProgram
+      });
+      return new Transaction().add(initializeRewardTx).add(fundRewardTx);
+    });
+  }
   /**
    * Builds a transaction to update reward duration.
    * @param {UpdateRewardDurationParams} params - Parameters including pool and new duration.
@@ -8579,22 +8620,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,
@@ -8604,11 +8650,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();
     });
   }