@meteora-ag/dlmm 1.3.1 → 1.3.3

package/dist/index.d.ts

@@ -6007,19 +6007,21 @@ declare class DLMM {
     /**
    * The `seedLiquidity` function create multiple grouped instructions. The grouped instructions will be either [initialize bin array + initialize position instructions] or [deposit instruction] combination.
    * @param
-   *    - `owner`: The public key of the positions owner.
+   *    - `payer`: The public key of the tx payer.
    *    - `base`: Base key
    *    - `seedAmount`: Token X lamport amount to be seeded to the pool.
    *    - `price`: TokenX/TokenY Price in UI format
    *    - `roundingUp`: Whether to round up the price
+   *    - `positionOwner`: The owner of the position
    *    - `feeOwner`: Position fee owner
    *    - `operator`: Operator of the position. Operator able to manage the position on behalf of the position owner. However, liquidity withdrawal issue by the operator can only send to the position owner.
    *    - `lockReleasePoint`: The lock release point of the position.
+   *    - `shouldSeedPositionOwner` (optional): Whether to send 1 lamport amount of token X to the position owner to prove ownership.
    *
    * The returned instructions need to be executed sequentially if it was separated into multiple transactions.
    * @returns {Promise<TransactionInstruction[]>}
    */
-    seedLiquiditySingleBin(owner: PublicKey, base: PublicKey, seedAmount: BN, price: number, roundingUp: boolean, feeOwner: PublicKey, operator: PublicKey, lockReleasePoint: BN): Promise<TransactionInstruction[]>;
+    seedLiquiditySingleBin(payer: PublicKey, base: PublicKey, seedAmount: BN, price: number, roundingUp: boolean, positionOwner: PublicKey, feeOwner: PublicKey, operator: PublicKey, lockReleasePoint: BN, shouldSeedPositionOwner?: boolean): Promise<TransactionInstruction[]>;
     /**
      * Initializes bin arrays for the given bin array indexes if it wasn't initialized.
      *

package/dist/index.js

@@ -7591,6 +7591,8 @@ var _bytes = require('@coral-xyz/anchor/dist/cjs/utils/bytes');
 
 
 
+
+
 // src/dlmm/error.ts
 
 var DLMMError = class extends Error {
@@ -10236,6 +10238,7 @@ var DLMM = class {
   }) {
     const { tokenXMint, tokenYMint, reserveX, reserveY, activeId, oracle } = await this.program.account.lbPair.fetch(lbPair);
     const preInstructions = [computeBudgetIx()];
+    const postInstructions = [];
     const [
       { ataPubKey: userTokenIn, ix: createInTokenAccountIx },
       { ataPubKey: userTokenOut, ix: createOutTokenAccountIx }
@@ -10260,8 +10263,9 @@ var DLMM = class {
         BigInt(maxInAmount.toString())
       );
       preInstructions.push(...wrapSOLIx);
+      const closeWrappedSOLIx = await unwrapSOLInstruction(user);
+      closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
     }
-    const postInstructions = [];
     if (outToken.equals(_spltoken.NATIVE_MINT)) {
       const closeWrappedSOLIx = await unwrapSOLInstruction(user);
       closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
@@ -10321,6 +10325,7 @@ var DLMM = class {
   }) {
     const { tokenXMint, tokenYMint, reserveX, reserveY, activeId, oracle } = await this.program.account.lbPair.fetch(lbPair);
     const preInstructions = [computeBudgetIx()];
+    const postInstructions = [];
     const [
       { ataPubKey: userTokenIn, ix: createInTokenAccountIx },
       { ataPubKey: userTokenOut, ix: createOutTokenAccountIx }
@@ -10345,8 +10350,9 @@ var DLMM = class {
         BigInt(inAmount.toString())
       );
       preInstructions.push(...wrapSOLIx);
+      const closeWrappedSOLIx = await unwrapSOLInstruction(user);
+      closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
     }
-    const postInstructions = [];
     if (outToken.equals(_spltoken.NATIVE_MINT)) {
       const closeWrappedSOLIx = await unwrapSOLInstruction(user);
       closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
@@ -10410,6 +10416,7 @@ var DLMM = class {
   }) {
     const { tokenXMint, tokenYMint, reserveX, reserveY, activeId, oracle } = await this.program.account.lbPair.fetch(lbPair);
     const preInstructions = [computeBudgetIx()];
+    const postInstructions = [];
     const [
       { ataPubKey: userTokenIn, ix: createInTokenAccountIx },
       { ataPubKey: userTokenOut, ix: createOutTokenAccountIx }
@@ -10434,8 +10441,9 @@ var DLMM = class {
         BigInt(inAmount.toString())
       );
       preInstructions.push(...wrapSOLIx);
+      const closeWrappedSOLIx = await unwrapSOLInstruction(user);
+      closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
     }
-    const postInstructions = [];
     if (outToken.equals(_spltoken.NATIVE_MINT)) {
       const closeWrappedSOLIx = await unwrapSOLInstruction(user);
       closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
@@ -10872,37 +10880,37 @@ var DLMM = class {
   /**
   * The `seedLiquidity` function create multiple grouped instructions. The grouped instructions will be either [initialize bin array + initialize position instructions] or [deposit instruction] combination.
   * @param
-  *    - `owner`: The public key of the positions owner.
+  *    - `payer`: The public key of the tx payer.
   *    - `base`: Base key
   *    - `seedAmount`: Token X lamport amount to be seeded to the pool.
   *    - `price`: TokenX/TokenY Price in UI format
   *    - `roundingUp`: Whether to round up the price
+  *    - `positionOwner`: The owner of the position
   *    - `feeOwner`: Position fee owner
   *    - `operator`: Operator of the position. Operator able to manage the position on behalf of the position owner. However, liquidity withdrawal issue by the operator can only send to the position owner.
   *    - `lockReleasePoint`: The lock release point of the position.
+  *    - `shouldSeedPositionOwner` (optional): Whether to send 1 lamport amount of token X to the position owner to prove ownership.
   * 
   * The returned instructions need to be executed sequentially if it was separated into multiple transactions.
   * @returns {Promise<TransactionInstruction[]>}
   */
-  async seedLiquiditySingleBin(owner, base, seedAmount, price, roundingUp, feeOwner, operator, lockReleasePoint) {
-    const pricePerLamport = DLMM.getPricePerLamport(this.tokenX.decimal, this.tokenY.decimal, price);
-    const binIdNumber = DLMM.getBinIdFromPrice(pricePerLamport, this.lbPair.binStep, !roundingUp);
+  async seedLiquiditySingleBin(payer, base, seedAmount, price, roundingUp, positionOwner, feeOwner, operator, lockReleasePoint, shouldSeedPositionOwner = false) {
+    const pricePerLamport = DLMM.getPricePerLamport(
+      this.tokenX.decimal,
+      this.tokenY.decimal,
+      price
+    );
+    const binIdNumber = DLMM.getBinIdFromPrice(
+      pricePerLamport,
+      this.lbPair.binStep,
+      !roundingUp
+    );
     const binId = new (0, _anchor.BN)(binIdNumber);
     const lowerBinArrayIndex = binIdToBinArrayIndex(binId);
     const upperBinArrayIndex = lowerBinArrayIndex.add(new (0, _anchor.BN)(1));
     const [lowerBinArray] = deriveBinArray(this.pubkey, lowerBinArrayIndex, this.program.programId);
     const [upperBinArray] = deriveBinArray(this.pubkey, upperBinArrayIndex, this.program.programId);
     const [positionPda] = derivePosition(this.pubkey, base, binId, new (0, _anchor.BN)(1), this.program.programId);
-    const operatorTokenX = _spltoken.getAssociatedTokenAddressSync.call(void 0, 
-      this.lbPair.tokenXMint,
-      operator,
-      true
-    );
-    const ownerTokenX = _spltoken.getAssociatedTokenAddressSync.call(void 0, 
-      this.lbPair.tokenXMint,
-      owner,
-      true
-    );
     const preInstructions = [];
     const [
       { ataPubKey: userTokenX, ix: createPayerTokenXIx },
@@ -10911,17 +10919,22 @@ var DLMM = class {
       getOrCreateATAInstruction(
         this.program.provider.connection,
         this.tokenX.publicKey,
-        owner
+        operator,
+        payer
       ),
       getOrCreateATAInstruction(
         this.program.provider.connection,
         this.tokenY.publicKey,
-        owner
+        operator,
+        payer
       )
     ]);
     createPayerTokenXIx && preInstructions.push(createPayerTokenXIx);
     createPayerTokenYIx && preInstructions.push(createPayerTokenYIx);
-    let [binArrayBitmapExtension] = deriveBinArrayBitmapExtension(this.pubkey, this.program.programId);
+    let [binArrayBitmapExtension] = deriveBinArrayBitmapExtension(
+      this.pubkey,
+      this.program.programId
+    );
     const accounts = await this.program.provider.connection.getMultipleAccountsInfo([
       lowerBinArray,
       upperBinArray,
@@ -10933,13 +10946,38 @@ var DLMM = class {
       if (!bitmapExtensionAccount) {
         preInstructions.push(await this.program.methods.initializeBinArrayBitmapExtension().accounts({
           binArrayBitmapExtension,
-          funder: owner,
+          funder: payer,
           lbPair: this.pubkey
         }).instruction());
       }
     } else {
       binArrayBitmapExtension = this.program.programId;
     }
+    const operatorTokenX = _spltoken.getAssociatedTokenAddressSync.call(void 0, 
+      this.lbPair.tokenXMint,
+      operator,
+      true
+    );
+    const positionOwnerTokenX = _spltoken.getAssociatedTokenAddressSync.call(void 0, 
+      this.lbPair.tokenXMint,
+      positionOwner,
+      true
+    );
+    if (shouldSeedPositionOwner) {
+      const positionOwnerTokenXAccount = await this.program.provider.connection.getAccountInfo(positionOwnerTokenX);
+      if (positionOwnerTokenXAccount) {
+        const account = _spltoken.AccountLayout.decode(positionOwnerTokenXAccount.data);
+        if (account.amount == BigInt(0)) {
+          const transferIx = _spltoken.createTransferInstruction.call(void 0, operatorTokenX, positionOwnerTokenX, payer, 1);
+          preInstructions.push(transferIx);
+        }
+      } else {
+        const createPositionOwnerTokenXIx = _spltoken.createAssociatedTokenAccountInstruction.call(void 0, payer, positionOwnerTokenX, positionOwner, this.lbPair.tokenXMint);
+        preInstructions.push(createPositionOwnerTokenXIx);
+        const transferIx = _spltoken.createTransferInstruction.call(void 0, operatorTokenX, positionOwnerTokenX, payer, 1);
+        preInstructions.push(transferIx);
+      }
+    }
     const lowerBinArrayAccount = accounts[0];
     const upperBinArrayAccount = accounts[1];
     const positionAccount = accounts[2];
@@ -10947,7 +10985,7 @@ var DLMM = class {
       preInstructions.push(
         await this.program.methods.initializeBinArray(lowerBinArrayIndex).accounts({
           binArray: lowerBinArray,
-          funder: owner,
+          funder: payer,
           lbPair: this.pubkey
         }).instruction()
       );
@@ -10956,22 +10994,27 @@ var DLMM = class {
       preInstructions.push(
         await this.program.methods.initializeBinArray(upperBinArrayIndex).accounts({
           binArray: upperBinArray,
-          funder: owner,
+          funder: payer,
           lbPair: this.pubkey
         }).instruction()
       );
     }
     if (!positionAccount) {
       preInstructions.push(
-        await this.program.methods.initializePositionByOperator(binId.toNumber(), 1, feeOwner, lockReleasePoint).accounts({
-          payer: owner,
+        await this.program.methods.initializePositionByOperator(
+          binId.toNumber(),
+          1,
+          feeOwner,
+          lockReleasePoint
+        ).accounts({
+          payer,
           base,
           position: positionPda,
           lbPair: this.pubkey,
-          owner,
+          owner: positionOwner,
           operator,
           operatorTokenX,
-          ownerTokenX
+          ownerTokenX: positionOwnerTokenX
         }).instruction()
       );
     }
@@ -10997,7 +11040,7 @@ var DLMM = class {
       tokenYMint: this.lbPair.tokenYMint,
       binArrayLower: lowerBinArray,
       binArrayUpper: upperBinArray,
-      sender: owner,
+      sender: operator,
       tokenXProgram: _spltoken.TOKEN_PROGRAM_ID,
       tokenYProgram: _spltoken.TOKEN_PROGRAM_ID
     }).instruction();