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

package/dist/index.d.mts

@@ -6018,7 +6018,7 @@ type InitializeRewardParams = {
     funder: PublicKey;
     payer: PublicKey;
     creator: PublicKey;
-    rewardMintProgram?: PublicKey;
+    rewardMintProgram: PublicKey;
 };
 type InitializeAndFundReward = {
     rewardIndex: number;
@@ -6049,6 +6049,9 @@ type FundRewardParams = {
     pool: PublicKey;
     carryForward: boolean;
     amount: BN;
+    rewardMint: PublicKey;
+    rewardVault: PublicKey;
+    rewardMintProgram: PublicKey;
 };
 type WithdrawIneligibleRewardParams = {
     rewardIndex: number;

package/dist/index.d.ts

@@ -6018,7 +6018,7 @@ type InitializeRewardParams = {
     funder: PublicKey;
     payer: PublicKey;
     creator: PublicKey;
-    rewardMintProgram?: PublicKey;
+    rewardMintProgram: PublicKey;
 };
 type InitializeAndFundReward = {
     rewardIndex: number;
@@ -6049,6 +6049,9 @@ type FundRewardParams = {
     pool: PublicKey;
     carryForward: boolean;
     amount: BN;
+    rewardMint: PublicKey;
+    rewardVault: PublicKey;
+    rewardMintProgram: PublicKey;
 };
 type WithdrawIneligibleRewardParams = {
     rewardIndex: number;

package/dist/index.js

@@ -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,7 +8539,7 @@ var CpAmm = class {
         rewardMint,
         signer: creator,
         payer,
-        tokenProgram
+        tokenProgram: rewardMintProgram
       }).transaction();
     });
   }
@@ -8562,6 +8561,7 @@ var CpAmm = class {
         amount,
         rewardMintProgram
       } = params;
+      const rewardVault = deriveRewardVaultAddress(pool, rewardIndex);
       const initializeRewardTx = yield this.initializeReward({
         rewardIndex,
         rewardDuration,
@@ -8577,7 +8577,10 @@ var CpAmm = class {
         carryForward,
         pool,
         funder: payer,
-        amount
+        amount,
+        rewardMint,
+        rewardVault,
+        rewardMintProgram
       });
       return new (0, _web3js.Transaction)().add(initializeRewardTx).add(fundRewardTx);
     });
@@ -8617,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(_spltoken.NATIVE_MINT) && !amount.isZero()) {
+      if (rewardMint.equals(_spltoken.NATIVE_MINT) && !amount.isZero()) {
         const wrapSOLIx = wrapSOLInstruction(
           funder,
           funderTokenAccount,
@@ -8642,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();
     });
   }