@meteora-ag/dlmm 1.3.15 → 1.3.17-rc.0

package/dist/index.mjs

@@ -6,9 +6,11 @@ import {
   MintLayout,
   NATIVE_MINT as NATIVE_MINT2,
   TOKEN_PROGRAM_ID as TOKEN_PROGRAM_ID2,
+  createAssociatedTokenAccountIdempotentInstruction as createAssociatedTokenAccountIdempotentInstruction2,
   createAssociatedTokenAccountInstruction as createAssociatedTokenAccountInstruction2,
   createTransferInstruction,
-  getAssociatedTokenAddressSync as getAssociatedTokenAddressSync2
+  getAssociatedTokenAddressSync as getAssociatedTokenAddressSync2,
+  unpackAccount
 } from "@solana/spl-token";
 import {
   ComputeBudgetProgram as ComputeBudgetProgram3,
@@ -5477,6 +5479,7 @@ var CONSTANTS = Object.entries(IDL.constants);
 var MAX_BIN_ARRAY_SIZE = new BN(
   CONSTANTS.find(([k, v]) => v.name == "MAX_BIN_PER_ARRAY")?.[1].value ?? 0
 );
+console.log("CONSTANTS", CONSTANTS);
 var MAX_BIN_PER_POSITION = new BN(
   CONSTANTS.find(([k, v]) => v.name == "MAX_BIN_PER_POSITION")?.[1].value ?? 0
 );
@@ -6641,7 +6644,7 @@ function derivePosition(lbPair, base, lowerBinId, width, programId) {
       lbPair.toBuffer(),
       base.toBuffer(),
       lowerBinIdBytes,
-      new Uint8Array(width.toBuffer("le", 4))
+      new Uint8Array(width.toArrayLike(Buffer, "le", 4))
     ],
     programId
   );
@@ -11042,9 +11045,14 @@ var DLMM = class {
    *    - `minPrice`: Start price in UI format
    *    - `maxPrice`: End price in UI format
    *    - `base`: Base key
+   *    - `txPayer`: Account rental fee payer
+   *    - `feeOwner`: Fee owner key. Default to position owner
+   *    - `operator`: Operator key
+   *    - `lockReleasePoint`: Timelock. Point (slot/timestamp) the position can withdraw the liquidity,
+   *    - `shouldSeedPositionOwner` (optional): Whether to send 1 lamport amount of token X to the position owner to prove ownership.
    * @returns {Promise<SeedLiquidityResponse>}
    */
-  async seedLiquidity(owner, seedAmount, curvature, minPrice, maxPrice, base) {
+  async seedLiquidity(owner, seedAmount, curvature, minPrice, maxPrice, base, payer, feeOwner, operator, lockReleasePoint, shouldSeedPositionOwner = false) {
     const toLamportMultiplier = new Decimal5(
       10 ** (this.tokenY.decimal - this.tokenX.decimal)
     );
@@ -11089,13 +11097,56 @@ var DLMM = class {
     );
     const positionCount = getPositionCount(minBinId, maxBinId.sub(new BN10(1)));
     const seederTokenX = getAssociatedTokenAddressSync2(
+      this.lbPair.tokenXMint,
+      operator,
+      false
+    );
+    const seederTokenY = getAssociatedTokenAddressSync2(
+      this.lbPair.tokenYMint,
+      operator,
+      false
+    );
+    const ownerTokenX = getAssociatedTokenAddressSync2(
       this.lbPair.tokenXMint,
       owner,
       false
     );
+    const sendPositionOwnerTokenProveIxs = [];
     const initializeBinArraysAndPositionIxs = [];
     const addLiquidityIxs = [];
     const appendedInitBinArrayIx = /* @__PURE__ */ new Set();
+    if (shouldSeedPositionOwner) {
+      const positionOwnerTokenX = await this.program.provider.connection.getAccountInfo(ownerTokenX);
+      let requireTokenProve = false;
+      if (positionOwnerTokenX) {
+        const ownerTokenXState = unpackAccount(
+          ownerTokenX,
+          positionOwnerTokenX,
+          TOKEN_PROGRAM_ID2
+        );
+        requireTokenProve = ownerTokenXState.amount == 0n;
+      } else {
+        requireTokenProve = true;
+      }
+      if (requireTokenProve) {
+        const initPositionOwnerTokenX = createAssociatedTokenAccountIdempotentInstruction2(
+          payer,
+          ownerTokenX,
+          owner,
+          this.lbPair.tokenXMint,
+          TOKEN_PROGRAM_ID2
+        );
+        sendPositionOwnerTokenProveIxs.push(initPositionOwnerTokenX);
+        sendPositionOwnerTokenProveIxs.push(
+          createTransferInstruction(
+            seederTokenX,
+            ownerTokenX,
+            operator,
+            1n
+          )
+        );
+      }
+    }
     for (let i = 0; i < positionCount.toNumber(); i++) {
       const lowerBinId = minBinId.add(MAX_BIN_PER_POSITION.mul(new BN10(i)));
       const upperBinId = lowerBinId.add(MAX_BIN_PER_POSITION).sub(new BN10(1));
@@ -11130,7 +11181,7 @@ var DLMM = class {
           await this.program.methods.initializeBinArray(lowerBinArrayIndex).accounts({
             lbPair: this.pubkey,
             binArray: lowerBinArray,
-            funder: owner
+            funder: payer
           }).instruction()
         );
         appendedInitBinArrayIx.add(lowerBinArray.toBase58());
@@ -11141,7 +11192,7 @@ var DLMM = class {
           await this.program.methods.initializeBinArray(upperBinArrayIndex).accounts({
             lbPair: this.pubkey,
             binArray: upperBinArray,
-            funder: owner
+            funder: payer
           }).instruction()
         );
         appendedInitBinArrayIx.add(upperBinArray.toBase58());
@@ -11149,26 +11200,25 @@ var DLMM = class {
       const positionAccount = accounts[2];
       if (!positionAccount) {
         instructions.push(
-          await this.program.methods.initializePositionPda(
+          await this.program.methods.initializePositionByOperator(
             lowerBinId.toNumber(),
-            MAX_BIN_PER_POSITION.toNumber()
+            MAX_BIN_PER_POSITION.toNumber(),
+            feeOwner,
+            lockReleasePoint
           ).accounts({
             lbPair: this.pubkey,
             position: positionPda,
             base,
             owner,
-            payer: owner
+            payer,
+            operator,
+            operatorTokenX: seederTokenX,
+            ownerTokenX,
+            systemProgram: SystemProgram2.programId
           }).instruction()
         );
       }
       if (instructions.length > 1) {
-        instructions.push(
-          await getEstimatedComputeUnitIxWithBuffer(
-            this.program.provider.connection,
-            instructions,
-            owner
-          )
-        );
         initializeBinArraysAndPositionIxs.push(instructions);
         instructions = [];
       }
@@ -11198,7 +11248,7 @@ var DLMM = class {
             tokenMint: this.lbPair.tokenXMint,
             binArrayLower: lowerBinArray,
             binArrayUpper: upperBinArray,
-            sender: owner
+            sender: operator
           }).instruction()
         );
         if (i + 1 >= positionCount.toNumber() && !finalLoss.isZero()) {
@@ -11222,7 +11272,7 @@ var DLMM = class {
               tokenMint: this.lbPair.tokenXMint,
               binArrayLower: lowerBinArray,
               binArrayUpper: upperBinArray,
-              sender: owner
+              sender: operator
             }).instruction()
           );
         }
@@ -11234,7 +11284,9 @@ var DLMM = class {
         ]);
       }
     }
+    console.log("let return");
     return {
+      sendPositionOwnerTokenProveIxs,
       initializeBinArraysAndPositionIxs,
       addLiquidityIxs
     };