@meteora-ag/cp-amm-sdk 1.0.1-rc.0 → 1.0.1-rc.10

package/dist/index.js

@@ -21,6 +21,9 @@
 
 // src/CpAmm.ts
 var _anchor = require('@coral-xyz/anchor');
+
+
+
 var _spltoken = require('@solana/spl-token');
 var _invariant = require('invariant'); var _invariant2 = _interopRequireDefault(_invariant);
 var _decimaljs = require('decimal.js'); var _decimaljs2 = _interopRequireDefault(_decimaljs);
@@ -6170,9 +6173,14 @@ var cp_amm_default = {
   ]
 };
 
-// src/constants.ts
+// src/CpAmm.ts
+
 
 var _web3js = require('@solana/web3.js');
+
+// src/constants.ts
+
+
 var CP_AMM_PROGRAM_ID = new (0, _web3js.PublicKey)(
   "cpamdpZCGKUy5JxQXB4dcpGPiikHawvSWAd6mEn1sGG"
 );
@@ -6272,6 +6280,12 @@ function derivePositionNftAccount(positionNftMint, programId) {
     programId
   )[0];
 }
+function deriveEventAuthority(programId) {
+  return _web3js.PublicKey.findProgramAddressSync(
+    [Buffer.from("__event_authority")],
+    programId
+  );
+}
 
 // src/math/index.ts
 
@@ -6310,6 +6324,10 @@ var ActivationType = /* @__PURE__ */ ((ActivationType2) => {
 })(ActivationType || {});
 
 // src/math/index.ts
+function shlDiv(x, y, offset, rounding) {
+  const scale = new (0, _anchor.BN)(1).shln(offset);
+  return mulDiv(x, scale, y, rounding);
+}
 function mulDiv(x, y, denominator, rounding) {
   const { div, mod } = x.mul(y).divmod(denominator);
   if (rounding == 0 /* Up */ && !mod.isZero()) {
@@ -6350,6 +6368,7 @@ function priceToSqrtPrice(initPrice, tokenADecimal, tokenBDecimal) {
 
 
 
+
 function getTokenProgram(flag) {
   return flag == 0 ? _spltoken.TOKEN_PROGRAM_ID : _spltoken.TOKEN_2022_PROGRAM_ID;
 }
@@ -6420,6 +6439,16 @@ var unwrapSOLInstruction = (owner, allowOwnerOffCurve = true) => __async(void 0,
   }
   return null;
 });
+function getNftOwner(connection, nftMint) {
+  return __async(this, null, function* () {
+    const largesTokenAccount = yield connection.getTokenLargestAccounts(nftMint);
+    const accountInfo = yield connection.getParsedAccountInfo(
+      largesTokenAccount.value[0].address
+    );
+    const owner = new (0, _web3js.PublicKey)(accountInfo.value.data.parsed.info.owner);
+    return new (0, _web3js.PublicKey)(owner);
+  });
+}
 
 // src/utils/fee.ts
 
@@ -6588,8 +6617,10 @@ function getNextSqrtPrice(amount, sqrtPrice, liquidity, aToB) {
 }
 function getDeltaAmountA(lowerSqrtPrice, upperSqrtPrice, liquidity, rounding) {
   const deltaSqrtPrice = upperSqrtPrice.sub(lowerSqrtPrice);
+  const prod = liquidity.mul(deltaSqrtPrice);
   const denominator = lowerSqrtPrice.mul(upperSqrtPrice);
-  return mulDiv(liquidity, deltaSqrtPrice, denominator, rounding);
+  const result = shlDiv(prod, denominator, SCALE_OFFSET, rounding);
+  return result.shrn(SCALE_OFFSET);
 }
 function getDeltaAmountB(lowerSqrtPrice, upperSqrtPrice, liquidity, rounding) {
   const deltaSqrtPrice = upperSqrtPrice.sub(lowerSqrtPrice);
@@ -6787,6 +6818,16 @@ var getPriceImpact = (amount, amountWithoutSlippage) => {
   return new (0, _decimaljs2.default)(diff.toString()).div(new (0, _decimaljs2.default)(amountWithoutSlippage.toString())).mul(100).toNumber();
 };
 
+// src/utils/accountFilters.ts
+var positionByPoolFilter = (pool) => {
+  return {
+    memcmp: {
+      bytes: pool.toBase58(),
+      offset: 8
+    }
+  };
+};
+
 // src/CpAmm.ts
 var CpAmm = class {
   constructor(connection) {
@@ -6864,6 +6905,58 @@ var CpAmm = class {
       return positionState;
     });
   }
+  getAllConfigs() {
+    return __async(this, null, function* () {
+      const configAccounts = yield this._program.account.config.all();
+      return configAccounts;
+    });
+  }
+  getAllPools() {
+    return __async(this, null, function* () {
+      const poolAccounts = yield this._program.account.pool.all();
+      return poolAccounts;
+    });
+  }
+  getAllPositions() {
+    return __async(this, null, function* () {
+      const poolAccounts = yield this._program.account.position.all();
+      return poolAccounts;
+    });
+  }
+  getUserPositionByPool(pool, user) {
+    return __async(this, null, function* () {
+      const positions = yield this._program.account.position.all([
+        positionByPoolFilter(pool)
+      ]);
+      const result = [];
+      for (const position of positions) {
+        const owner = yield getNftOwner(
+          this._program.provider.connection,
+          position.account.nftMint
+        );
+        if (owner.equals(user)) {
+          result.push(position);
+        }
+      }
+      return result;
+    });
+  }
+  getPositionsByUser(user) {
+    return __async(this, null, function* () {
+      const positions = yield this._program.account.position.all();
+      const result = [];
+      for (const position of positions) {
+        const owner = yield getNftOwner(
+          this._program.provider.connection,
+          position.account.nftMint
+        );
+        if (owner.equals(user)) {
+          result.push(position);
+        }
+      }
+      return result;
+    });
+  }
   getQuote(params) {
     return __async(this, null, function* () {
       var _a;
@@ -6963,7 +7056,6 @@ var CpAmm = class {
   }
   createPool(params) {
     return __async(this, null, function* () {
-      var _a, _b, _c, _d;
       const {
         payer,
         creator,
@@ -6975,7 +7067,9 @@ var CpAmm = class {
         tokenAAmount,
         tokenBAmount,
         tokenADecimal,
-        tokenBDecimal
+        tokenBDecimal,
+        tokenAProgram,
+        tokenBProgram
       } = params;
       const { sqrtPriceQ64, liquidityQ64 } = yield this.preparePoolCreationParams(
         {
@@ -6985,43 +7079,97 @@ var CpAmm = class {
           tokenBDecimal
         }
       );
+      const poolAuthority = derivePoolAuthority(this._program.programId);
       const pool = derivePoolAddress(
         config,
         tokenAMint,
         tokenBMint,
         this._program.programId
       );
-      const tokenAProgram = (_b = (_a = yield this._program.provider.connection.getParsedAccountInfo(tokenAMint)) == null ? void 0 : _a.value) == null ? void 0 : _b.owner;
-      const tokenBProgram = (_d = (_c = yield this._program.provider.connection.getParsedAccountInfo(tokenBMint)) == null ? void 0 : _c.value) == null ? void 0 : _d.owner;
-      const payerTokenA = _spltoken.getAssociatedTokenAddressSync.call(void 0, 
+      const position = derivePositionAddress(
+        positionNft,
+        this._program.programId
+      );
+      const positionNftAccount = derivePositionNftAccount(
+        positionNft,
+        this._program.programId
+      );
+      const tokenAVault = deriveTokenVaultAddress(
         tokenAMint,
-        payer,
-        true,
-        tokenAProgram
+        pool,
+        this._program.programId
       );
-      const payerTokenB = _spltoken.getAssociatedTokenAddressSync.call(void 0, 
+      const tokenBVault = deriveTokenVaultAddress(
         tokenBMint,
-        payer,
-        true,
-        tokenBProgram
+        pool,
+        this._program.programId
       );
+      const preInstructions = [];
+      const [
+        { ataPubkey: payerTokenA, ix: createTokenATokenAccountIx },
+        { ataPubkey: payerTokenB, ix: createTokenBTokenAccountIx }
+      ] = yield Promise.all([
+        getOrCreateATAInstruction(
+          this._program.provider.connection,
+          tokenAMint,
+          payer,
+          payer,
+          true,
+          tokenAProgram
+        ),
+        getOrCreateATAInstruction(
+          this._program.provider.connection,
+          tokenBMint,
+          payer,
+          payer,
+          true,
+          tokenBProgram
+        )
+      ]);
+      createTokenATokenAccountIx && preInstructions.push(createTokenATokenAccountIx);
+      createTokenBTokenAccountIx && preInstructions.push(createTokenBTokenAccountIx);
+      if (tokenAMint.equals(_spltoken.NATIVE_MINT)) {
+        const wrapSOLIx = wrapSOLInstruction(
+          payer,
+          payerTokenA,
+          BigInt(tokenAAmount.toString())
+        );
+        preInstructions.push(...wrapSOLIx);
+      }
+      if (tokenBMint.equals(_spltoken.NATIVE_MINT)) {
+        const wrapSOLIx = wrapSOLInstruction(
+          payer,
+          payerTokenB,
+          BigInt(tokenBAmount.toString())
+        );
+        preInstructions.push(...wrapSOLIx);
+      }
       const tx = yield this._program.methods.initializePool({
         liquidity: liquidityQ64,
         sqrtPrice: sqrtPriceQ64,
         activationPoint
-      }).accounts({
+      }).accountsStrict({
         creator,
+        positionNftAccount,
         positionNftMint: positionNft,
         payer,
         config,
+        poolAuthority,
         pool,
+        position,
         tokenAMint,
         tokenBMint,
+        tokenAVault,
+        tokenBVault,
         payerTokenA,
         payerTokenB,
+        token2022Program: _spltoken.TOKEN_2022_PROGRAM_ID,
         tokenAProgram,
-        tokenBProgram
-      }).transaction();
+        tokenBProgram,
+        systemProgram: _web3js.SystemProgram.programId,
+        eventAuthority: deriveEventAuthority(this._program.programId)[0],
+        program: this._program.programId
+      }).preInstructions(preInstructions).transaction();
       return tx;
     });
   }
@@ -7041,7 +7189,9 @@ var CpAmm = class {
         hasAlphaVault,
         collectFeeMode,
         activationPoint,
-        activationType
+        activationType,
+        tokenAProgram,
+        tokenBProgram
       } = params;
       const { sqrtPriceQ64, liquidityQ64 } = yield this.preparePoolCreationParams(
         {
@@ -7051,6 +7201,7 @@ var CpAmm = class {
           tokenBDecimal
         }
       );
+      const poolAuthority = derivePoolAuthority(this._program.programId);
       const pool = deriveCustomizablePoolAddress(
         tokenAMint,
         tokenBMint,
@@ -7060,8 +7211,20 @@ var CpAmm = class {
         positionNft,
         this._program.programId
       );
-      const tokenAProgram = (yield this._program.provider.connection.getAccountInfo(tokenAMint)).owner;
-      const tokenBProgram = (yield this._program.provider.connection.getAccountInfo(tokenBMint)).owner;
+      const positionNftAccount = derivePositionNftAccount(
+        positionNft,
+        this._program.programId
+      );
+      const tokenAVault = deriveTokenVaultAddress(
+        tokenAMint,
+        pool,
+        this._program.programId
+      );
+      const tokenBVault = deriveTokenVaultAddress(
+        tokenBMint,
+        pool,
+        this._program.programId
+      );
       const preInstructions = [];
       const [
         { ataPubkey: payerTokenA, ix: createTokenATokenAccountIx },
@@ -7112,17 +7275,26 @@ var CpAmm = class {
         activationType,
         collectFeeMode,
         activationPoint
-      }).accounts({
+      }).accountsStrict({
         creator,
+        positionNftAccount,
         positionNftMint: positionNft,
         payer,
+        poolAuthority,
         pool,
+        position,
         tokenAMint,
         tokenBMint,
+        tokenAVault,
+        tokenBVault,
         payerTokenA,
         payerTokenB,
+        token2022Program: _spltoken.TOKEN_2022_PROGRAM_ID,
         tokenAProgram,
-        tokenBProgram
+        tokenBProgram,
+        systemProgram: _web3js.SystemProgram.programId,
+        eventAuthority: deriveEventAuthority(this._program.programId)[0],
+        program: this._program.programId
       }).preInstructions(preInstructions).transaction();
       return { tx: transaction, pool, position };
     });
@@ -7130,11 +7302,27 @@ var CpAmm = class {
   createPosition(params) {
     return __async(this, null, function* () {
       const { owner, payer, pool, positionNft } = params;
-      return yield this._program.methods.createPosition().accounts({
+      const poolAuthority = derivePoolAuthority(this._program.programId);
+      const position = derivePositionAddress(
+        positionNft,
+        this._program.programId
+      );
+      const positionNftAccount = derivePositionNftAccount(
+        positionNft,
+        this._program.programId
+      );
+      return yield this._program.methods.createPosition().accountsStrict({
         owner,
         positionNftMint: positionNft,
+        poolAuthority,
+        positionNftAccount,
         payer,
-        pool
+        pool,
+        position,
+        tokenProgram: _spltoken.TOKEN_2022_PROGRAM_ID,
+        systemProgram: _web3js.SystemProgram.programId,
+        eventAuthority: deriveEventAuthority(this._program.programId)[0],
+        program: this._program.programId
       }).transaction();
     });
   }
@@ -7142,6 +7330,7 @@ var CpAmm = class {
     return __async(this, null, function* () {
       const {
         owner,
+        pool,
         position,
         positionNftMint,
         liquidityDeltaQ64,
@@ -7151,6 +7340,8 @@ var CpAmm = class {
         tokenBAmountThreshold,
         tokenAMint,
         tokenBMint,
+        tokenAVault,
+        tokenBVault,
         tokenAProgram,
         tokenBProgram
       } = params;
@@ -7209,14 +7400,21 @@ var CpAmm = class {
         liquidityDelta: liquidityDeltaQ64,
         tokenAAmountThreshold,
         tokenBAmountThreshold
-      }).accounts({
+      }).accountsStrict({
+        pool,
         position,
         positionNftAccount,
         owner,
         tokenAAccount,
         tokenBAccount,
+        tokenAMint,
+        tokenBMint,
+        tokenAVault,
+        tokenBVault,
         tokenAProgram,
-        tokenBProgram
+        tokenBProgram,
+        eventAuthority: deriveEventAuthority(this._program.programId)[0],
+        program: this._program.programId
       }).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
     });
   }
@@ -7224,6 +7422,7 @@ var CpAmm = class {
     return __async(this, null, function* () {
       const {
         owner,
+        pool,
         position,
         positionNftMint,
         liquidityDeltaQ64,
@@ -7231,6 +7430,8 @@ var CpAmm = class {
         tokenBAmountThreshold,
         tokenAMint,
         tokenBMint,
+        tokenAVault,
+        tokenBVault,
         tokenAProgram,
         tokenBProgram
       } = params;
@@ -7238,6 +7439,7 @@ var CpAmm = class {
         positionNftMint,
         this._program.programId
       );
+      const poolAuthority = derivePoolAuthority(this._program.programId);
       const preInstructions = [];
       const [
         { ataPubkey: tokenAAccount, ix: createTokenAAccountIx },
@@ -7273,14 +7475,22 @@ var CpAmm = class {
         liquidityDelta: liquidityDeltaQ64,
         tokenAAmountThreshold,
         tokenBAmountThreshold
-      }).accounts({
+      }).accountsStrict({
+        poolAuthority,
+        pool,
         position,
         positionNftAccount,
         owner,
         tokenAAccount,
         tokenBAccount,
+        tokenAMint,
+        tokenBMint,
+        tokenAVault,
+        tokenBVault,
         tokenAProgram,
-        tokenBProgram
+        tokenBProgram,
+        eventAuthority: deriveEventAuthority(this._program.programId)[0],
+        program: this._program.programId
       }).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
     });
   }
@@ -7293,12 +7503,15 @@ var CpAmm = class {
         outputTokenMint,
         amountIn,
         minimumAmountOut,
+        tokenAVault,
+        tokenBVault,
         tokenAMint,
         tokenBMint,
         tokenAProgram,
         tokenBProgram,
         referralTokenAccount
       } = params;
+      const poolAuthority = derivePoolAuthority(this._program.programId);
       const preInstructions = [];
       const [
         { ataPubkey: inputTokenAccount, ix: createInputTokenAccountIx },
@@ -7341,16 +7554,21 @@ var CpAmm = class {
       return yield this._program.methods.swap({
         amountIn,
         minimumAmountOut
-      }).accounts({
+      }).accountsStrict({
+        poolAuthority,
         pool,
         payer,
         inputTokenAccount,
         outputTokenAccount,
+        tokenAVault,
+        tokenBVault,
         tokenAMint,
         tokenBMint,
         tokenAProgram,
         tokenBProgram,
-        referralTokenAccount
+        referralTokenAccount,
+        eventAuthority: deriveEventAuthority(this._program.programId)[0],
+        program: this._program.programId
       }).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
     });
   }
@@ -7358,6 +7576,7 @@ var CpAmm = class {
     return __async(this, null, function* () {
       const {
         owner,
+        pool,
         payer,
         vestingAccount,
         position,
@@ -7381,12 +7600,16 @@ var CpAmm = class {
         numberOfPeriod,
         index: vestings.length
       };
-      return yield this._program.methods.lockPosition(lockPositionParams).accounts({
+      return yield this._program.methods.lockPosition(lockPositionParams).accountsStrict({
         position,
         positionNftAccount,
         vesting: vestingAccount,
+        pool,
         owner,
-        payer
+        payer,
+        systemProgram: _web3js.SystemProgram.programId,
+        eventAuthority: deriveEventAuthority(this._program.programId)[0],
+        program: this._program.programId
       }).transaction();
     });
   }
@@ -7397,10 +7620,13 @@ var CpAmm = class {
         positionNftMint,
         this._program.programId
       );
-      return yield this._program.methods.permanentLockPosition(unlockedLiquidity).accounts({
+      return yield this._program.methods.permanentLockPosition(unlockedLiquidity).accountsStrict({
         position,
         positionNftAccount,
-        owner
+        pool,
+        owner,
+        eventAuthority: deriveEventAuthority(this._program.programId)[0],
+        program: this._program.programId
       }).transaction();
     });
   }
@@ -7411,9 +7637,10 @@ var CpAmm = class {
         positionNftMint,
         this._program.programId
       );
-      return yield this._program.methods.refreshVesting().accounts({
+      return yield this._program.methods.refreshVesting().accountsStrict({
         position,
         positionNftAccount,
+        pool,
         owner
       }).remainingAccounts(
         vestings.map((pubkey) => {
@@ -7430,8 +7657,11 @@ var CpAmm = class {
     return __async(this, null, function* () {
       const {
         owner,
+        pool,
         position,
         nftPositionMint,
+        tokenAVault,
+        tokenBVault,
         tokenAMint,
         tokenBMint,
         tokenAProgram,
@@ -7441,6 +7671,7 @@ var CpAmm = class {
         nftPositionMint,
         this._program.programId
       );
+      const poolAuthority = derivePoolAuthority(this._program.programId);
       const preInstructions = [];
       const [
         { ataPubkey: tokenAAccount, ix: createTokenAAccountIx },
@@ -7472,32 +7703,44 @@ var CpAmm = class {
         const closeWrappedSOLIx = yield unwrapSOLInstruction(owner);
         closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
       }
-      return yield this._program.methods.claimPositionFee().accounts({
+      return yield this._program.methods.claimPositionFee().accountsStrict({
+        poolAuthority,
         owner,
+        pool,
         position,
         positionNftAccount,
         tokenAAccount,
         tokenBAccount,
+        tokenAVault,
+        tokenBVault,
+        tokenAMint,
+        tokenBMint,
         tokenAProgram,
-        tokenBProgram
+        tokenBProgram,
+        eventAuthority: deriveEventAuthority(this._program.programId)[0],
+        program: this._program.programId
       }).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
     });
   }
   updateRewardDuration(params) {
     return __async(this, null, function* () {
       const { pool, admin, rewardIndex, newDuration } = params;
-      return yield this._program.methods.updateRewardDuration(rewardIndex, newDuration).accounts({
+      return yield this._program.methods.updateRewardDuration(rewardIndex, newDuration).accountsStrict({
         pool,
-        admin
+        admin,
+        eventAuthority: deriveEventAuthority(this._program.programId)[0],
+        program: this._program.programId
       }).transaction();
     });
   }
   updateRewardFunder(params) {
     return __async(this, null, function* () {
       const { pool, admin, rewardIndex, newFunder } = params;
-      return yield this._program.methods.updateRewardFunder(rewardIndex, newFunder).accounts({
+      return yield this._program.methods.updateRewardFunder(rewardIndex, newFunder).accountsStrict({
         pool,
-        admin
+        admin,
+        eventAuthority: deriveEventAuthority(this._program.programId)[0],
+        program: this._program.programId
       }).transaction();
     });
   }
@@ -7526,19 +7769,22 @@ var CpAmm = class {
         );
         preInstructions.push(...wrapSOLIx);
       }
-      return yield this._program.methods.fundReward(rewardIndex, amount, carryForward).accounts({
+      return yield this._program.methods.fundReward(rewardIndex, amount, carryForward).accountsStrict({
         pool,
         rewardVault: vault,
         rewardMint: mint,
         funderTokenAccount,
         funder,
-        tokenProgram
+        tokenProgram,
+        eventAuthority: deriveEventAuthority(this._program.programId)[0],
+        program: this._program.programId
       }).transaction();
     });
   }
   withdrawIneligibleReward(params) {
     return __async(this, null, function* () {
       const { rewardIndex, pool, funder } = params;
+      const poolAuthority = derivePoolAuthority(this._program.programId);
       const poolState = yield this.fetchPoolState(pool);
       const rewardInfo = poolState.rewardInfos[rewardIndex];
       const { mint, vault, rewardTokenFlag } = rewardInfo;
@@ -7558,13 +7804,16 @@ var CpAmm = class {
         const closeWrappedSOLIx = yield unwrapSOLInstruction(funder);
         closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
       }
-      return yield this._program.methods.withdrawIneligibleReward(rewardIndex).accounts({
+      return yield this._program.methods.withdrawIneligibleReward(rewardIndex).accountsStrict({
         pool,
         rewardVault: vault,
         rewardMint: mint,
+        poolAuthority,
         funderTokenAccount,
         funder,
-        tokenProgram
+        tokenProgram,
+        eventAuthority: deriveEventAuthority(this._program.programId)[0],
+        program: this._program.programId
       }).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
     });
   }
@@ -7572,7 +7821,15 @@ var CpAmm = class {
     return __async(this, null, function* () {
       const { partner, pool, maxAmountA, maxAmountB } = params;
       const poolState = yield this.fetchPoolState(pool);
-      const { tokenAFlag, tokenBFlag } = poolState;
+      const {
+        tokenAVault,
+        tokenBVault,
+        tokenAMint,
+        tokenBMint,
+        tokenAFlag,
+        tokenBFlag
+      } = poolState;
+      const poolAuthority = derivePoolAuthority(this._program.programId);
       const tokenAProgram = getTokenProgram(tokenAFlag);
       const tokenBProgram = getTokenProgram(tokenBFlag);
       const preInstructions = [];
@@ -7607,18 +7864,27 @@ var CpAmm = class {
         const closeWrappedSOLIx = yield unwrapSOLInstruction(partner);
         closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
       }
-      return yield this._program.methods.claimPartnerFee(maxAmountA, maxAmountB).accounts({
+      return yield this._program.methods.claimPartnerFee(maxAmountA, maxAmountB).accountsStrict({
+        poolAuthority,
         pool,
         tokenAAccount,
         tokenBAccount,
+        tokenAVault,
+        tokenBVault,
+        tokenAMint,
+        tokenBMint,
+        partner,
         tokenAProgram,
-        tokenBProgram
+        tokenBProgram,
+        eventAuthority: deriveEventAuthority(this._program.programId)[0],
+        program: this._program.programId
       }).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
     });
   }
   claimReward(params) {
     return __async(this, null, function* () {
       const { user, position, rewardIndex } = params;
+      const poolAuthority = derivePoolAuthority(this._program.programId);
       const positionState = yield this.fetchPositionState(position);
       const poolState = yield this.fetchPoolState(positionState.pool);
       const positionNftAccount = derivePositionNftAccount(
@@ -7642,19 +7908,29 @@ var CpAmm = class {
         const closeWrappedSOLIx = yield unwrapSOLInstruction(user);
         closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
       }
-      return yield this._program.methods.claimReward(rewardIndex).accounts({
+      return yield this._program.methods.claimReward(rewardIndex).accountsStrict({
+        pool: positionState.pool,
         positionNftAccount,
         rewardVault: rewardInfo.vault,
         rewardMint: rewardInfo.mint,
+        poolAuthority,
         position,
         userTokenAccount,
         owner: user,
-        tokenProgram
+        tokenProgram,
+        eventAuthority: deriveEventAuthority(this._program.programId)[0],
+        program: this._program.programId
       }).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
     });
   }
 };
 
+// src/index.ts
+var index_default = cp_amm_default;
+
+
+
+
 
 
 
@@ -7700,5 +7976,5 @@ var CpAmm = class {
 
 
 
-exports.ActivationPoint = ActivationPoint; exports.ActivationType = ActivationType; exports.BASIS_POINT_MAX = BASIS_POINT_MAX; exports.CP_AMM_PROGRAM_ID = CP_AMM_PROGRAM_ID; exports.CollectFeeMode = CollectFeeMode; exports.CpAmm = CpAmm; exports.FEE_DENOMINATOR = FEE_DENOMINATOR; exports.FeeSchedulerMode = FeeSchedulerMode; exports.MAX_CU_BUFFER = MAX_CU_BUFFER; exports.MAX_FEE_NUMERATOR = MAX_FEE_NUMERATOR; exports.MAX_SQRT_PRICE = MAX_SQRT_PRICE; exports.MIN_CU_BUFFER = MIN_CU_BUFFER; exports.MIN_SQRT_PRICE = MIN_SQRT_PRICE; exports.Rounding = Rounding; exports.SCALE_OFFSET = SCALE_OFFSET; exports.TradeDirection = TradeDirection; exports.calculateSwap = calculateSwap; exports.deriveClaimFeeOperatorAddress = deriveClaimFeeOperatorAddress; exports.deriveConfigAddress = deriveConfigAddress; exports.deriveCustomizablePoolAddress = deriveCustomizablePoolAddress; exports.derivePoolAddress = derivePoolAddress; exports.derivePoolAuthority = derivePoolAuthority; exports.derivePositionAddress = derivePositionAddress; exports.derivePositionNftAccount = derivePositionNftAccount; exports.deriveRewardVaultAddress = deriveRewardVaultAddress; exports.deriveTokenBadgeAddress = deriveTokenBadgeAddress; exports.deriveTokenVaultAddress = deriveTokenVaultAddress; exports.getBaseFeeNumerator = getBaseFeeNumerator; exports.getDeltaAmountA = getDeltaAmountA; exports.getDeltaAmountB = getDeltaAmountB; exports.getDynamicFeeNumerator = getDynamicFeeNumerator; exports.getEstimatedComputeUnitIxWithBuffer = getEstimatedComputeUnitIxWithBuffer; exports.getEstimatedComputeUnitUsageWithBuffer = getEstimatedComputeUnitUsageWithBuffer; exports.getFeeNumerator = getFeeNumerator; exports.getFirstKey = getFirstKey; exports.getLiquidityDeltaFromAmountA = getLiquidityDeltaFromAmountA; exports.getLiquidityDeltaFromAmountB = getLiquidityDeltaFromAmountB; exports.getNextSqrtPrice = getNextSqrtPrice; exports.getOrCreateATAInstruction = getOrCreateATAInstruction; exports.getSecondKey = getSecondKey; exports.getSimulationComputeUnits = getSimulationComputeUnits; exports.getTokenDecimals = getTokenDecimals; exports.getTokenProgram = getTokenProgram; exports.unwrapSOLInstruction = unwrapSOLInstruction; exports.wrapSOLInstruction = wrapSOLInstruction;
+exports.ActivationPoint = ActivationPoint; exports.ActivationType = ActivationType; exports.BASIS_POINT_MAX = BASIS_POINT_MAX; exports.CP_AMM_PROGRAM_ID = CP_AMM_PROGRAM_ID; exports.CollectFeeMode = CollectFeeMode; exports.CpAmm = CpAmm; exports.FEE_DENOMINATOR = FEE_DENOMINATOR; exports.FeeSchedulerMode = FeeSchedulerMode; exports.MAX_CU_BUFFER = MAX_CU_BUFFER; exports.MAX_FEE_NUMERATOR = MAX_FEE_NUMERATOR; exports.MAX_SQRT_PRICE = MAX_SQRT_PRICE; exports.MIN_CU_BUFFER = MIN_CU_BUFFER; exports.MIN_SQRT_PRICE = MIN_SQRT_PRICE; exports.Rounding = Rounding; exports.SCALE_OFFSET = SCALE_OFFSET; exports.TradeDirection = TradeDirection; exports.calculateSwap = calculateSwap; exports.default = index_default; exports.deriveClaimFeeOperatorAddress = deriveClaimFeeOperatorAddress; exports.deriveConfigAddress = deriveConfigAddress; exports.deriveCustomizablePoolAddress = deriveCustomizablePoolAddress; exports.deriveEventAuthority = deriveEventAuthority; exports.derivePoolAddress = derivePoolAddress; exports.derivePoolAuthority = derivePoolAuthority; exports.derivePositionAddress = derivePositionAddress; exports.derivePositionNftAccount = derivePositionNftAccount; exports.deriveRewardVaultAddress = deriveRewardVaultAddress; exports.deriveTokenBadgeAddress = deriveTokenBadgeAddress; exports.deriveTokenVaultAddress = deriveTokenVaultAddress; exports.getBaseFeeNumerator = getBaseFeeNumerator; exports.getDeltaAmountA = getDeltaAmountA; exports.getDeltaAmountB = getDeltaAmountB; exports.getDynamicFeeNumerator = getDynamicFeeNumerator; exports.getEstimatedComputeUnitIxWithBuffer = getEstimatedComputeUnitIxWithBuffer; exports.getEstimatedComputeUnitUsageWithBuffer = getEstimatedComputeUnitUsageWithBuffer; exports.getFeeNumerator = getFeeNumerator; exports.getFirstKey = getFirstKey; exports.getLiquidityDeltaFromAmountA = getLiquidityDeltaFromAmountA; exports.getLiquidityDeltaFromAmountB = getLiquidityDeltaFromAmountB; exports.getNextSqrtPrice = getNextSqrtPrice; exports.getNftOwner = getNftOwner; exports.getOrCreateATAInstruction = getOrCreateATAInstruction; exports.getSecondKey = getSecondKey; exports.getSimulationComputeUnits = getSimulationComputeUnits; exports.getTokenDecimals = getTokenDecimals; exports.getTokenProgram = getTokenProgram; exports.unwrapSOLInstruction = unwrapSOLInstruction; exports.wrapSOLInstruction = wrapSOLInstruction;
 //# sourceMappingURL=index.js.map