@meteora-ag/cp-amm-sdk 1.0.5 → 1.0.6

package/dist/index.d.mts

@@ -5692,8 +5692,6 @@ type CreatePositionAndAddLiquidity = {
     tokenBAmountThreshold: BN;
     tokenAMint: PublicKey;
     tokenBMint: PublicKey;
-    tokenAVault: PublicKey;
-    tokenBVault: PublicKey;
     tokenAProgram: PublicKey;
     tokenBProgram: PublicKey;
 };
@@ -5868,11 +5866,12 @@ type LockPositionParams = {
 };
 type SetupFeeClaimAccountsParams = {
     payer: PublicKey;
+    owner: PublicKey;
     tokenAMint: PublicKey;
     tokenBMint: PublicKey;
     tokenAProgram: PublicKey;
     tokenBProgram: PublicKey;
-    receiver: PublicKey;
+    receiver?: PublicKey;
     tempWSolAccount?: PublicKey;
 };
 type ClaimPositionFeeInstructionParams = {
@@ -5901,7 +5900,7 @@ type ClaimPositionFeeParams = {
     tokenBVault: PublicKey;
     tokenAProgram: PublicKey;
     tokenBProgram: PublicKey;
-    receiver: PublicKey;
+    receiver?: PublicKey;
     feePayer?: PublicKey;
     tempWSolAccount?: PublicKey;
 };
@@ -5949,7 +5948,7 @@ type ClaimPartnerFeeParams = {
     pool: PublicKey;
     maxAmountA: BN;
     maxAmountB: BN;
-    receiver: PublicKey;
+    receiver?: PublicKey;
     feePayer?: PublicKey;
     tempWSolAccount?: PublicKey;
 };

package/dist/index.d.ts

@@ -5692,8 +5692,6 @@ type CreatePositionAndAddLiquidity = {
     tokenBAmountThreshold: BN;
     tokenAMint: PublicKey;
     tokenBMint: PublicKey;
-    tokenAVault: PublicKey;
-    tokenBVault: PublicKey;
     tokenAProgram: PublicKey;
     tokenBProgram: PublicKey;
 };
@@ -5868,11 +5866,12 @@ type LockPositionParams = {
 };
 type SetupFeeClaimAccountsParams = {
     payer: PublicKey;
+    owner: PublicKey;
     tokenAMint: PublicKey;
     tokenBMint: PublicKey;
     tokenAProgram: PublicKey;
     tokenBProgram: PublicKey;
-    receiver: PublicKey;
+    receiver?: PublicKey;
     tempWSolAccount?: PublicKey;
 };
 type ClaimPositionFeeInstructionParams = {
@@ -5901,7 +5900,7 @@ type ClaimPositionFeeParams = {
     tokenBVault: PublicKey;
     tokenAProgram: PublicKey;
     tokenBProgram: PublicKey;
-    receiver: PublicKey;
+    receiver?: PublicKey;
     feePayer?: PublicKey;
     tempWSolAccount?: PublicKey;
 };
@@ -5949,7 +5948,7 @@ type ClaimPartnerFeeParams = {
     pool: PublicKey;
     maxAmountA: BN;
     maxAmountB: BN;
-    receiver: PublicKey;
+    receiver?: PublicKey;
     feePayer?: PublicKey;
     tempWSolAccount?: PublicKey;
 };

package/dist/index.js

@@ -7288,10 +7288,10 @@ function getDynamicFeeNumerator(volatilityAccumulator, binStep, variableFeeContr
   return vFee.add(new (0, _anchor.BN)(99999999999)).div(new (0, _anchor.BN)(1e11));
 }
 function getFeeNumerator(currentPoint, activationPoint, numberOfPeriod, periodFrequency, feeSchedulerMode, cliffFeeNumerator, reductionFactor, dynamicFeeParams) {
-  if (Number(periodFrequency) == 0) {
+  if (Number(periodFrequency) == 0 || new (0, _anchor.BN)(currentPoint).lt(activationPoint)) {
     return cliffFeeNumerator;
   }
-  const period = new (0, _anchor.BN)(currentPoint).lt(activationPoint) ? new (0, _anchor.BN)(numberOfPeriod) : _anchor.BN.min(
+  const period = _anchor.BN.min(
     new (0, _anchor.BN)(numberOfPeriod),
     new (0, _anchor.BN)(currentPoint).sub(activationPoint).div(periodFrequency)
   );
@@ -8162,6 +8162,7 @@ var CpAmm = class {
     return __async(this, null, function* () {
       const {
         payer,
+        owner,
         tokenAMint,
         tokenBMint,
         tokenAProgram,
@@ -8176,8 +8177,12 @@ var CpAmm = class {
       const postInstructions = [];
       let tokenAAccount;
       let tokenBAccount;
-      const tokenAOwner = tempWSolAccount && tokenAIsSOL ? tempWSolAccount : receiver;
-      const tokenBOwner = tempWSolAccount && tokenBIsSOL ? tempWSolAccount : receiver;
+      let tokenAOwner = owner;
+      let tokenBOwner = owner;
+      if (receiver) {
+        tokenAOwner = tokenAIsSOL ? tempWSolAccount : receiver;
+        tokenBOwner = tokenBIsSOL ? tempWSolAccount : receiver;
+      }
       const { tokenAAta, tokenBAta, instructions } = yield this.prepareTokenAccounts({
         payer,
         tokenAOwner,
@@ -8192,8 +8197,8 @@ var CpAmm = class {
       preInstructions.push(...instructions);
       if (hasSolToken) {
         const closeWrappedSOLIx = yield unwrapSOLInstruction(
-          tempWSolAccount != null ? tempWSolAccount : receiver,
-          receiver
+          tempWSolAccount != null ? tempWSolAccount : owner,
+          receiver != null ? receiver : owner
         );
         closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
       }
@@ -9090,8 +9095,6 @@ var CpAmm = class {
         tokenBAmountThreshold,
         tokenAMint,
         tokenBMint,
-        tokenAVault,
-        tokenBVault,
         tokenAProgram,
         tokenBProgram
       } = params;
@@ -9108,6 +9111,8 @@ var CpAmm = class {
         tokenAProgram,
         tokenBProgram
       });
+      const tokenAVault = deriveTokenVaultAddress(tokenAMint, pool);
+      const tokenBVault = deriveTokenVaultAddress(tokenBMint, pool);
       if (tokenAMint.equals(_spltoken.NATIVE_MINT)) {
         const wrapSOLIx = wrapSOLInstruction(
           owner,
@@ -9835,6 +9840,7 @@ var CpAmm = class {
       const payer = feePayer != null ? feePayer : partner;
       const { tokenAAccount, tokenBAccount, preInstructions, postInstructions } = yield this.setupFeeClaimAccounts({
         payer,
+        owner: partner,
         tokenAMint,
         tokenBMint,
         tokenAProgram,
@@ -9882,6 +9888,7 @@ var CpAmm = class {
       const payer = feePayer != null ? feePayer : owner;
       const { tokenAAccount, tokenBAccount, preInstructions, postInstructions } = yield this.setupFeeClaimAccounts({
         payer,
+        owner,
         tokenAMint,
         tokenBMint,
         tokenAProgram,