@meteora-ag/cp-amm-sdk 1.0.2-rc.1 → 1.0.3

package/dist/index.js

@@ -7027,7 +7027,7 @@ var wrapSOLInstruction = (from, to, amount) => {
     })
   ];
 };
-var unwrapSOLInstruction = (owner, allowOwnerOffCurve = true) => __async(void 0, null, function* () {
+var unwrapSOLInstruction = (_0, ..._1) => __async(void 0, [_0, ..._1], function* (owner, receiver = owner, allowOwnerOffCurve = true) {
   const wSolATAAccount = _spltoken.getAssociatedTokenAddressSync.call(void 0, 
     _spltoken.NATIVE_MINT,
     owner,
@@ -7036,7 +7036,7 @@ var unwrapSOLInstruction = (owner, allowOwnerOffCurve = true) => __async(void 0,
   if (wSolATAAccount) {
     const closedWrappedSolInstruction = _spltoken.createCloseAccountInstruction.call(void 0, 
       wSolATAAccount,
-      owner,
+      receiver,
       owner,
       [],
       _spltoken.TOKEN_PROGRAM_ID
@@ -7747,8 +7747,17 @@ var CpAmm = class {
    * @returns {Promise<{tokenAAta: PublicKey, tokenBAta: PublicKey, instructions: TransactionInstruction[]}>}
    *          The token account addresses and any instructions needed to create them
    */
-  prepareTokenAccounts(owner, tokenAMint, tokenBMint, tokenAProgram, tokenBProgram) {
+  prepareTokenAccounts(params) {
     return __async(this, null, function* () {
+      const {
+        payer,
+        tokenAOwner,
+        tokenBOwner,
+        tokenAMint,
+        tokenBMint,
+        tokenAProgram,
+        tokenBProgram
+      } = params;
       const instructions = [];
       const [
         { ataPubkey: tokenAAta, ix: createInputTokenAccountIx },
@@ -7757,16 +7766,16 @@ var CpAmm = class {
         getOrCreateATAInstruction(
           this._program.provider.connection,
           tokenAMint,
-          owner,
-          owner,
+          tokenAOwner,
+          payer,
           true,
           tokenAProgram
         ),
         getOrCreateATAInstruction(
           this._program.provider.connection,
           tokenBMint,
-          owner,
-          owner,
+          tokenBOwner,
+          payer,
           true,
           tokenBProgram
         )
@@ -8081,7 +8090,7 @@ var CpAmm = class {
    * @param {PrepareCustomizablePoolParams} params - Common parameters for pool creation
    * @returns Prepared transaction data including instructions and accounts
    */
-  prepareCreateCustomizablePoolParams(params) {
+  prepareCreatePoolParams(params) {
     return __async(this, null, function* () {
       const {
         pool,
@@ -8102,13 +8111,15 @@ var CpAmm = class {
         tokenAAta: payerTokenA,
         tokenBAta: payerTokenB,
         instructions: preInstructions
-      } = yield this.prepareTokenAccounts(
+      } = yield this.prepareTokenAccounts({
         payer,
+        tokenAOwner: payer,
+        tokenBOwner: payer,
         tokenAMint,
         tokenBMint,
         tokenAProgram,
         tokenBProgram
-      );
+      });
       if (tokenAMint.equals(_spltoken.NATIVE_MINT)) {
         const wrapSOLIx = wrapSOLInstruction(
           payer,
@@ -8141,6 +8152,59 @@ var CpAmm = class {
       };
     });
   }
+  /**
+   * Sets up token accounts and instructions for fee claim operations.
+   * @private
+   * @param {SetupFeeClaimAccountsParams} params - Parameters for setting up fee claim accounts.
+   * @returns Token accounts and instructions for fee claiming.
+   */
+  setupFeeClaimAccounts(params) {
+    return __async(this, null, function* () {
+      const {
+        payer,
+        tokenAMint,
+        tokenBMint,
+        tokenAProgram,
+        tokenBProgram,
+        receiver,
+        tempWSolAccount
+      } = params;
+      const tokenAIsSOL = tokenAMint.equals(_spltoken.NATIVE_MINT);
+      const tokenBIsSOL = tokenBMint.equals(_spltoken.NATIVE_MINT);
+      const hasSolToken = tokenAIsSOL || tokenBIsSOL;
+      const preInstructions = [];
+      const postInstructions = [];
+      let tokenAAccount;
+      let tokenBAccount;
+      const tokenAOwner = tempWSolAccount && tokenAIsSOL ? tempWSolAccount : receiver;
+      const tokenBOwner = tempWSolAccount && tokenBIsSOL ? tempWSolAccount : receiver;
+      const { tokenAAta, tokenBAta, instructions } = yield this.prepareTokenAccounts({
+        payer,
+        tokenAOwner,
+        tokenBOwner,
+        tokenAMint,
+        tokenBMint,
+        tokenAProgram,
+        tokenBProgram
+      });
+      tokenAAccount = tokenAAta;
+      tokenBAccount = tokenBAta;
+      preInstructions.push(...instructions);
+      if (hasSolToken) {
+        const closeWrappedSOLIx = yield unwrapSOLInstruction(
+          tempWSolAccount != null ? tempWSolAccount : receiver,
+          receiver
+        );
+        closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
+      }
+      return {
+        tokenAAccount,
+        tokenBAccount,
+        preInstructions,
+        postInstructions
+      };
+    });
+  }
   //// ANCHOR: GETTER/FETCHER FUNCTIONS //////
   /**
    * Fetches the Config state of the program.
@@ -8665,44 +8729,40 @@ var CpAmm = class {
         tokenAAmount,
         tokenBAmount,
         tokenAProgram,
-        tokenBProgram
+        tokenBProgram,
+        isLockLiquidity
       } = params;
       const pool = derivePoolAddress(config, tokenAMint, tokenBMint);
-      const position = derivePositionAddress(positionNft);
-      const positionNftAccount = derivePositionNftAccount(positionNft);
-      const tokenAVault = deriveTokenVaultAddress(tokenAMint, pool);
-      const tokenBVault = deriveTokenVaultAddress(tokenBMint, pool);
       const {
-        tokenAAta: payerTokenA,
-        tokenBAta: payerTokenB,
-        instructions: preInstructions
-      } = yield this.prepareTokenAccounts(
-        payer,
+        position,
+        positionNftAccount,
+        tokenAVault,
+        tokenBVault,
+        payerTokenA,
+        payerTokenB,
+        preInstructions,
+        tokenBadgeAccounts
+      } = yield this.prepareCreatePoolParams({
+        pool,
         tokenAMint,
         tokenBMint,
+        tokenAAmount,
+        tokenBAmount,
+        payer,
+        positionNft,
         tokenAProgram,
         tokenBProgram
-      );
-      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 postInstruction = [];
+      if (isLockLiquidity) {
+        const permanentLockIx = yield this._program.methods.permanentLockPosition(liquidityDelta).accountsPartial({
+          position,
+          positionNftAccount,
+          pool,
+          owner: creator
+        }).instruction();
+        postInstruction.push(permanentLockIx);
       }
-      const tokenBadgeAccounts = this.getTokenBadgeAccounts(
-        tokenAMint,
-        tokenBMint
-      );
       const tx = yield this._program.methods.initializePool({
         liquidity: liquidityDelta,
         sqrtPrice: initSqrtPrice,
@@ -8726,7 +8786,7 @@ var CpAmm = class {
         tokenAProgram,
         tokenBProgram,
         systemProgram: _web3js.SystemProgram.programId
-      }).preInstructions(preInstructions).remainingAccounts(tokenBadgeAccounts).transaction();
+      }).preInstructions(preInstructions).postInstructions(postInstruction).remainingAccounts(tokenBadgeAccounts).transaction();
       return tx;
     });
   }
@@ -8755,7 +8815,8 @@ var CpAmm = class {
         activationPoint,
         activationType,
         tokenAProgram,
-        tokenBProgram
+        tokenBProgram,
+        isLockLiquidity
       } = params;
       const pool = deriveCustomizablePoolAddress(tokenAMint, tokenBMint);
       const {
@@ -8767,7 +8828,7 @@ var CpAmm = class {
         payerTokenB,
         preInstructions,
         tokenBadgeAccounts
-      } = yield this.prepareCreateCustomizablePoolParams({
+      } = yield this.prepareCreatePoolParams({
         pool,
         tokenAMint,
         tokenBMint,
@@ -8778,6 +8839,16 @@ var CpAmm = class {
         tokenAProgram,
         tokenBProgram
       });
+      const postInstruction = [];
+      if (isLockLiquidity) {
+        const permanentLockIx = yield this._program.methods.permanentLockPosition(liquidityDelta).accountsPartial({
+          position,
+          positionNftAccount,
+          pool,
+          owner: creator
+        }).instruction();
+        postInstruction.push(permanentLockIx);
+      }
       const transaction = yield this._program.methods.initializeCustomizablePool({
         poolFees,
         sqrtMinPrice,
@@ -8806,7 +8877,7 @@ var CpAmm = class {
         tokenAProgram,
         tokenBProgram,
         systemProgram: _web3js.SystemProgram.programId
-      }).preInstructions(preInstructions).remainingAccounts(tokenBadgeAccounts).transaction();
+      }).preInstructions(preInstructions).postInstructions(postInstruction).remainingAccounts(tokenBadgeAccounts).transaction();
       return { tx: transaction, pool, position };
     });
   }
@@ -8832,7 +8903,8 @@ var CpAmm = class {
         activationPoint,
         activationType,
         tokenAProgram,
-        tokenBProgram
+        tokenBProgram,
+        isLockLiquidity
       } = params;
       const pool = derivePoolAddress(config, tokenAMint, tokenBMint);
       const {
@@ -8844,7 +8916,7 @@ var CpAmm = class {
         payerTokenB,
         preInstructions,
         tokenBadgeAccounts
-      } = yield this.prepareCreateCustomizablePoolParams({
+      } = yield this.prepareCreatePoolParams({
         pool,
         tokenAMint,
         tokenBMint,
@@ -8855,6 +8927,16 @@ var CpAmm = class {
         tokenAProgram,
         tokenBProgram
       });
+      const postInstruction = [];
+      if (isLockLiquidity) {
+        const permanentLockIx = yield this._program.methods.permanentLockPosition(liquidityDelta).accountsPartial({
+          position,
+          positionNftAccount,
+          pool,
+          owner: creator
+        }).instruction();
+        postInstruction.push(permanentLockIx);
+      }
       const transaction = yield this._program.methods.initializePoolWithDynamicConfig({
         poolFees,
         sqrtMinPrice,
@@ -8885,7 +8967,7 @@ var CpAmm = class {
         tokenAProgram,
         tokenBProgram,
         systemProgram: _web3js.SystemProgram.programId
-      }).preInstructions(preInstructions).remainingAccounts(tokenBadgeAccounts).transaction();
+      }).preInstructions(preInstructions).postInstructions(postInstruction).remainingAccounts(tokenBadgeAccounts).transaction();
       return { tx: transaction, pool, position };
     });
   }
@@ -8928,13 +9010,15 @@ var CpAmm = class {
         tokenAAta: tokenAAccount,
         tokenBAta: tokenBAccount,
         instructions: preInstructions
-      } = yield this.prepareTokenAccounts(
-        owner,
+      } = yield this.prepareTokenAccounts({
+        payer: owner,
+        tokenAOwner: owner,
+        tokenBOwner: owner,
         tokenAMint,
         tokenBMint,
         tokenAProgram,
         tokenBProgram
-      );
+      });
       if (tokenAMint.equals(_spltoken.NATIVE_MINT)) {
         const wrapSOLIx = wrapSOLInstruction(
           owner,
@@ -9015,13 +9099,15 @@ var CpAmm = class {
         tokenAAta: tokenAAccount,
         tokenBAta: tokenBAccount,
         instructions: preInstructions
-      } = yield this.prepareTokenAccounts(
-        owner,
+      } = yield this.prepareTokenAccounts({
+        payer: owner,
+        tokenAOwner: owner,
+        tokenBOwner: owner,
         tokenAMint,
         tokenBMint,
         tokenAProgram,
         tokenBProgram
-      );
+      });
       if (tokenAMint.equals(_spltoken.NATIVE_MINT)) {
         const wrapSOLIx = wrapSOLInstruction(
           owner,
@@ -9109,13 +9195,15 @@ var CpAmm = class {
         tokenAAta: tokenAAccount,
         tokenBAta: tokenBAccount,
         instructions: preInstructions
-      } = yield this.prepareTokenAccounts(
-        owner,
+      } = yield this.prepareTokenAccounts({
+        payer: owner,
+        tokenAOwner: owner,
+        tokenBOwner: owner,
         tokenAMint,
         tokenBMint,
         tokenAProgram,
         tokenBProgram
-      );
+      });
       const postInstructions = [];
       if ([tokenAMint.toBase58(), tokenBMint.toBase58()].includes(
         _spltoken.NATIVE_MINT.toBase58()
@@ -9180,13 +9268,15 @@ var CpAmm = class {
         tokenAAta: tokenAAccount,
         tokenBAta: tokenBAccount,
         instructions: preInstructions
-      } = yield this.prepareTokenAccounts(
-        owner,
+      } = yield this.prepareTokenAccounts({
+        payer: owner,
+        tokenAOwner: owner,
+        tokenBOwner: owner,
         tokenAMint,
         tokenBMint,
         tokenAProgram,
         tokenBProgram
-      );
+      });
       const postInstructions = [];
       if ([tokenAMint.toBase58(), tokenBMint.toBase58()].includes(
         _spltoken.NATIVE_MINT.toBase58()
@@ -9259,13 +9349,15 @@ var CpAmm = class {
         tokenAAta: inputTokenAccount,
         tokenBAta: outputTokenAccount,
         instructions: preInstructions
-      } = yield this.prepareTokenAccounts(
+      } = yield this.prepareTokenAccounts({
         payer,
-        inputTokenMint,
-        outputTokenMint,
-        inputTokenProgram,
-        outputTokenProgram
-      );
+        tokenAOwner: payer,
+        tokenBOwner: payer,
+        tokenAMint: inputTokenMint,
+        tokenBMint: outputTokenMint,
+        tokenAProgram: inputTokenProgram,
+        tokenBProgram: outputTokenProgram
+      });
       if (inputTokenMint.equals(_spltoken.NATIVE_MINT)) {
         const wrapSOLIx = wrapSOLInstruction(
           payer,
@@ -9365,67 +9457,6 @@ var CpAmm = class {
       return new (0, _web3js.Transaction)().add(instruction);
     });
   }
-  /**
-   * Builds a transaction to claim position fee rewards.
-   * @param {ClaimPositionFeeParams} params - Parameters for claiming position fee.
-   * @returns Transaction builder.
-   */
-  claimPositionFee(params) {
-    return __async(this, null, function* () {
-      const {
-        owner,
-        pool,
-        position,
-        positionNftAccount,
-        tokenAVault,
-        tokenBVault,
-        tokenAMint,
-        tokenBMint,
-        tokenAProgram,
-        tokenBProgram
-      } = params;
-      const {
-        tokenAAta: tokenAAccount,
-        tokenBAta: tokenBAccount,
-        instructions: preInstructions
-      } = yield this.prepareTokenAccounts(
-        owner,
-        tokenAMint,
-        tokenBMint,
-        tokenAProgram,
-        tokenBProgram
-      );
-      const postInstructions = [];
-      if ([tokenAMint.toBase58(), tokenBMint.toBase58()].includes(
-        _spltoken.NATIVE_MINT.toBase58()
-      )) {
-        const closeWrappedSOLIx = yield unwrapSOLInstruction(owner);
-        closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
-      }
-      const claimPositionFeeInstruction = yield this.buildClaimPositionFeeInstruction({
-        owner,
-        poolAuthority: this.poolAuthority,
-        pool,
-        position,
-        positionNftAccount,
-        tokenAAccount,
-        tokenBAccount,
-        tokenAVault,
-        tokenBVault,
-        tokenAMint,
-        tokenBMint,
-        tokenAProgram,
-        tokenBProgram
-      });
-      const transaction = new (0, _web3js.Transaction)();
-      transaction.add(
-        ...preInstructions.length > 0 ? preInstructions : [],
-        claimPositionFeeInstruction,
-        ...postInstructions.length > 0 ? postInstructions : []
-      );
-      return transaction;
-    });
-  }
   closePosition(params) {
     return __async(this, null, function* () {
       const { owner, pool, position, positionNftMint, positionNftAccount } = params;
@@ -9480,13 +9511,15 @@ var CpAmm = class {
         tokenAAta: tokenAAccount,
         tokenBAta: tokenBAccount,
         instructions: preInstructions
-      } = yield this.prepareTokenAccounts(
-        owner,
+      } = yield this.prepareTokenAccounts({
+        payer: owner,
+        tokenAOwner: owner,
+        tokenBOwner: owner,
         tokenAMint,
         tokenBMint,
         tokenAProgram,
         tokenBProgram
-      );
+      });
       const postInstructions = [];
       if ([tokenAMint.toBase58(), tokenBMint.toBase58()].includes(
         _spltoken.NATIVE_MINT.toBase58()
@@ -9571,13 +9604,15 @@ var CpAmm = class {
         tokenAAta: tokenAAccount,
         tokenBAta: tokenBAccount,
         instructions: preInstructions
-      } = yield this.prepareTokenAccounts(
-        owner,
+      } = yield this.prepareTokenAccounts({
+        payer: owner,
+        tokenAOwner: owner,
+        tokenBOwner: owner,
         tokenAMint,
         tokenBMint,
         tokenAProgram,
         tokenBProgram
-      );
+      });
       let positionBLiquidityDelta = positionBState.unlockedLiquidity;
       if (positionBVestings.length > 0) {
         const totalAvailableVestingLiquidity = positionBVestings.reduce(
@@ -9777,7 +9812,15 @@ var CpAmm = class {
    */
   claimPartnerFee(params) {
     return __async(this, null, function* () {
-      const { partner, pool, maxAmountA, maxAmountB } = params;
+      const {
+        feePayer,
+        receiver,
+        tempWSolAccount,
+        partner,
+        pool,
+        maxAmountA,
+        maxAmountB
+      } = params;
       const poolState = yield this.fetchPoolState(pool);
       const {
         tokenAVault,
@@ -9789,25 +9832,16 @@ var CpAmm = class {
       } = poolState;
       const tokenAProgram = getTokenProgram(tokenAFlag);
       const tokenBProgram = getTokenProgram(tokenBFlag);
-      const {
-        tokenAAta: tokenAAccount,
-        tokenBAta: tokenBAccount,
-        instructions: preInstructions
-      } = yield this.prepareTokenAccounts(
-        partner,
+      const payer = feePayer != null ? feePayer : partner;
+      const { tokenAAccount, tokenBAccount, preInstructions, postInstructions } = yield this.setupFeeClaimAccounts({
+        payer,
         tokenAMint,
         tokenBMint,
         tokenAProgram,
-        tokenBProgram
-      );
-      const postInstructions = [];
-      if ([
-        poolState.tokenAMint.toBase58(),
-        poolState.tokenBMint.toBase58()
-      ].includes(_spltoken.NATIVE_MINT.toBase58())) {
-        const closeWrappedSOLIx = yield unwrapSOLInstruction(partner);
-        closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
-      }
+        tokenBProgram,
+        receiver,
+        tempWSolAccount
+      });
       return yield this._program.methods.claimPartnerFee(maxAmountA, maxAmountB).accountsPartial({
         poolAuthority: this.poolAuthority,
         pool,
@@ -9823,6 +9857,62 @@ var CpAmm = class {
       }).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
     });
   }
+  /**
+   * Builds a transaction to claim position fee rewards.
+   * @param {ClaimPositionFeeParams} params - Parameters for claiming position fee.
+   * @returns Transaction builder.
+   */
+  claimPositionFee(params) {
+    return __async(this, null, function* () {
+      const {
+        receiver,
+        tempWSolAccount,
+        feePayer,
+        owner,
+        pool,
+        position,
+        positionNftAccount,
+        tokenAVault,
+        tokenBVault,
+        tokenAMint,
+        tokenBMint,
+        tokenAProgram,
+        tokenBProgram
+      } = params;
+      const payer = feePayer != null ? feePayer : owner;
+      const { tokenAAccount, tokenBAccount, preInstructions, postInstructions } = yield this.setupFeeClaimAccounts({
+        payer,
+        tokenAMint,
+        tokenBMint,
+        tokenAProgram,
+        tokenBProgram,
+        receiver,
+        tempWSolAccount
+      });
+      const claimPositionFeeInstruction = yield this.buildClaimPositionFeeInstruction({
+        owner,
+        poolAuthority: this.poolAuthority,
+        pool,
+        position,
+        positionNftAccount,
+        tokenAAccount,
+        tokenBAccount,
+        tokenAVault,
+        tokenBVault,
+        tokenAMint,
+        tokenBMint,
+        tokenAProgram,
+        tokenBProgram
+      });
+      const transaction = new (0, _web3js.Transaction)();
+      transaction.add(
+        ...preInstructions.length > 0 ? preInstructions : [],
+        claimPositionFeeInstruction,
+        ...postInstructions.length > 0 ? postInstructions : []
+      );
+      return transaction;
+    });
+  }
   /**
    * Builds a transaction to claim reward from a position.
    * @param {ClaimRewardParams} params - Parameters for claiming reward.
@@ -9831,6 +9921,7 @@ var CpAmm = class {
   claimReward(params) {
     return __async(this, null, function* () {
       const {
+        feePayer,
         user,
         position,
         positionNftAccount,
@@ -9846,7 +9937,7 @@ var CpAmm = class {
         this._program.provider.connection,
         rewardInfo.mint,
         user,
-        user,
+        feePayer != null ? feePayer : user,
         true,
         tokenProgram
       );