@meteora-ag/dlmm 1.0.28-rc.0 → 1.0.28

package/README.md

@@ -231,7 +231,6 @@ try {
 | `claimSwapFee`                                | Claim swap fees for a specific position owned by a specific owner                                                             | `Promise<Transaction>`                                                                   |
 | `claimAllSwapFee`                             | Claim swap fees for multiple positions owned by a specific owner                                                              | `Promise<Transaction>`                                                                   |
 | `claimAllRewards`                             | Claim swap fees and LM rewards for multiple positions owned by a specific owner                                               | `Promise<Transaction[]>`                                                                 |
-| `syncWithMarketPrice`                         | Sync the pool current active bin to match nearest market price bin                                                            | `Promise<Transaction>`                                                                   |
 
 ```
 

package/dist/index.d.ts

@@ -5,7 +5,7 @@ import { PublicKey, TransactionInstruction, Connection, Transaction, Cluster } f
 import Decimal from 'decimal.js';
 
 type LbClmm = {
-    version: "0.5.1";
+    version: "0.5.0";
     name: "lb_clmm";
     constants: [
         {
@@ -2285,124 +2285,6 @@ type LbClmm = {
                     type: "u16";
                 }
             ];
-        },
-        {
-            name: "addLiquidityOneSidePrecise";
-            accounts: [
-                {
-                    name: "position";
-                    isMut: true;
-                    isSigner: false;
-                },
-                {
-                    name: "lbPair";
-                    isMut: true;
-                    isSigner: false;
-                },
-                {
-                    name: "binArrayBitmapExtension";
-                    isMut: true;
-                    isSigner: false;
-                    isOptional: true;
-                },
-                {
-                    name: "userToken";
-                    isMut: true;
-                    isSigner: false;
-                },
-                {
-                    name: "reserve";
-                    isMut: true;
-                    isSigner: false;
-                },
-                {
-                    name: "tokenMint";
-                    isMut: false;
-                    isSigner: false;
-                },
-                {
-                    name: "binArrayLower";
-                    isMut: true;
-                    isSigner: false;
-                },
-                {
-                    name: "binArrayUpper";
-                    isMut: true;
-                    isSigner: false;
-                },
-                {
-                    name: "sender";
-                    isMut: false;
-                    isSigner: true;
-                },
-                {
-                    name: "tokenProgram";
-                    isMut: false;
-                    isSigner: false;
-                },
-                {
-                    name: "eventAuthority";
-                    isMut: false;
-                    isSigner: false;
-                },
-                {
-                    name: "program";
-                    isMut: false;
-                    isSigner: false;
-                }
-            ];
-            args: [
-                {
-                    name: "parameter";
-                    type: {
-                        defined: "AddLiquiditySingleSidePreciseParameter";
-                    };
-                }
-            ];
-        },
-        {
-            name: "goToABin";
-            accounts: [
-                {
-                    name: "lbPair";
-                    isMut: true;
-                    isSigner: false;
-                },
-                {
-                    name: "binArrayBitmapExtension";
-                    isMut: false;
-                    isSigner: false;
-                    isOptional: true;
-                },
-                {
-                    name: "fromBinArray";
-                    isMut: false;
-                    isSigner: false;
-                    isOptional: true;
-                },
-                {
-                    name: "toBinArray";
-                    isMut: false;
-                    isSigner: false;
-                    isOptional: true;
-                },
-                {
-                    name: "eventAuthority";
-                    isMut: false;
-                    isSigner: false;
-                },
-                {
-                    name: "program";
-                    isMut: false;
-                    isSigner: false;
-                }
-            ];
-            args: [
-                {
-                    name: "binId";
-                    type: "i32";
-                }
-            ];
         }
     ];
     accounts: [
@@ -3155,42 +3037,6 @@ type LbClmm = {
                 ];
             };
         },
-        {
-            name: "AddLiquiditySingleSidePreciseParameter";
-            type: {
-                kind: "struct";
-                fields: [
-                    {
-                        name: "bins";
-                        type: {
-                            vec: {
-                                defined: "CompressedBinDepositAmount";
-                            };
-                        };
-                    },
-                    {
-                        name: "decompressMultiplier";
-                        type: "u64";
-                    }
-                ];
-            };
-        },
-        {
-            name: "CompressedBinDepositAmount";
-            type: {
-                kind: "struct";
-                fields: [
-                    {
-                        name: "binId";
-                        type: "i32";
-                    },
-                    {
-                        name: "amount";
-                        type: "u32";
-                    }
-                ];
-            };
-        },
         {
             name: "BinLiquidityDistribution";
             type: {
@@ -4303,26 +4149,6 @@ type LbClmm = {
                     index: false;
                 }
             ];
-        },
-        {
-            name: "GoToABin";
-            fields: [
-                {
-                    name: "lbPair";
-                    type: "publicKey";
-                    index: false;
-                },
-                {
-                    name: "fromBinId";
-                    type: "i32";
-                    index: false;
-                },
-                {
-                    name: "toBinId";
-                    type: "i32";
-                    index: false;
-                }
-            ];
         }
     ];
     errors: [
@@ -4615,11 +4441,6 @@ type LbClmm = {
             code: 6057;
             name: "InvalidLockReleaseSlot";
             msg: "Invalid lock release slot";
-        },
-        {
-            code: 6058;
-            name: "BinRangeIsNotEmpty";
-            msg: "Bin range is not empty";
         }
     ];
 };
@@ -5266,7 +5087,6 @@ declare class DLMM {
         owner: PublicKey;
         positions: LbPosition[];
     }): Promise<Transaction[]>;
-    syncWithMarketPrice(marketPrice: number, owner: PublicKey): Promise<Transaction>;
     /** Private static method */
     private static getBinArrays;
     private static getClaimableLMReward;

package/dist/index.js

@@ -9,7 +9,7 @@ var _web3js = require('@solana/web3.js');
 
 // src/dlmm/idl.ts
 var IDL = {
-  version: "0.5.1",
+  version: "0.5.0",
   name: "lb_clmm",
   constants: [
     {
@@ -2289,124 +2289,6 @@ var IDL = {
           type: "u16"
         }
       ]
-    },
-    {
-      name: "addLiquidityOneSidePrecise",
-      accounts: [
-        {
-          name: "position",
-          isMut: true,
-          isSigner: false
-        },
-        {
-          name: "lbPair",
-          isMut: true,
-          isSigner: false
-        },
-        {
-          name: "binArrayBitmapExtension",
-          isMut: true,
-          isSigner: false,
-          isOptional: true
-        },
-        {
-          name: "userToken",
-          isMut: true,
-          isSigner: false
-        },
-        {
-          name: "reserve",
-          isMut: true,
-          isSigner: false
-        },
-        {
-          name: "tokenMint",
-          isMut: false,
-          isSigner: false
-        },
-        {
-          name: "binArrayLower",
-          isMut: true,
-          isSigner: false
-        },
-        {
-          name: "binArrayUpper",
-          isMut: true,
-          isSigner: false
-        },
-        {
-          name: "sender",
-          isMut: false,
-          isSigner: true
-        },
-        {
-          name: "tokenProgram",
-          isMut: false,
-          isSigner: false
-        },
-        {
-          name: "eventAuthority",
-          isMut: false,
-          isSigner: false
-        },
-        {
-          name: "program",
-          isMut: false,
-          isSigner: false
-        }
-      ],
-      args: [
-        {
-          name: "parameter",
-          type: {
-            defined: "AddLiquiditySingleSidePreciseParameter"
-          }
-        }
-      ]
-    },
-    {
-      name: "goToABin",
-      accounts: [
-        {
-          name: "lbPair",
-          isMut: true,
-          isSigner: false
-        },
-        {
-          name: "binArrayBitmapExtension",
-          isMut: false,
-          isSigner: false,
-          isOptional: true
-        },
-        {
-          name: "fromBinArray",
-          isMut: false,
-          isSigner: false,
-          isOptional: true
-        },
-        {
-          name: "toBinArray",
-          isMut: false,
-          isSigner: false,
-          isOptional: true
-        },
-        {
-          name: "eventAuthority",
-          isMut: false,
-          isSigner: false
-        },
-        {
-          name: "program",
-          isMut: false,
-          isSigner: false
-        }
-      ],
-      args: [
-        {
-          name: "binId",
-          type: "i32"
-        }
-      ]
     }
   ],
   accounts: [
@@ -3159,42 +3041,6 @@ var IDL = {
         ]
       }
     },
-    {
-      name: "AddLiquiditySingleSidePreciseParameter",
-      type: {
-        kind: "struct",
-        fields: [
-          {
-            name: "bins",
-            type: {
-              vec: {
-                defined: "CompressedBinDepositAmount"
-              }
-            }
-          },
-          {
-            name: "decompressMultiplier",
-            type: "u64"
-          }
-        ]
-      }
-    },
-    {
-      name: "CompressedBinDepositAmount",
-      type: {
-        kind: "struct",
-        fields: [
-          {
-            name: "binId",
-            type: "i32"
-          },
-          {
-            name: "amount",
-            type: "u32"
-          }
-        ]
-      }
-    },
     {
       name: "BinLiquidityDistribution",
       type: {
@@ -4307,26 +4153,6 @@ var IDL = {
           index: false
         }
       ]
-    },
-    {
-      name: "GoToABin",
-      fields: [
-        {
-          name: "lbPair",
-          type: "publicKey",
-          index: false
-        },
-        {
-          name: "fromBinId",
-          type: "i32",
-          index: false
-        },
-        {
-          name: "toBinId",
-          type: "i32",
-          index: false
-        }
-      ]
     }
   ],
   errors: [
@@ -4619,11 +4445,6 @@ var IDL = {
       code: 6057,
       name: "InvalidLockReleaseSlot",
       msg: "Invalid lock release slot"
-    },
-    {
-      code: 6058,
-      name: "BinRangeIsNotEmpty",
-      msg: "Bin range is not empty"
     }
   ]
 };
@@ -5165,7 +4986,7 @@ function findNextBinArrayIndexWithLiquidity(swapForY, activeId, lbPairState, bin
             maxBinArrayIndex.toNumber(),
             binArrayBitmapExtension
           );
-          if (binArrayIndex !== null) {
+          if (binArrayIndex != null) {
             return new (0, _anchor.BN)(binArrayIndex);
           } else {
             return null;
@@ -7794,7 +7615,7 @@ var DLMM = class {
       { length: upperBinArrayIndex.sub(lowerBinArrayIndex).toNumber() + 1 },
       (_, index) => index + lowerBinArrayIndex.toNumber()
     ).map((idx) => new (0, _anchor.BN)(idx));
-    const binArraysCount = (await this.binArraysToBeCreate(binArraysNeeded)).length;
+    const binArraysCount = (await this.binArraysToBeCreate(lowerBinArrayIndex, upperBinArrayIndex)).length;
     const positionCount = Math.ceil((maxBinId - minBinId) / MAX_BIN_PER_TX);
     const binArrayCost = binArraysCount * BIN_ARRAY_FEE;
     const positionCost = positionCount * POSITION_FEE;
@@ -7842,18 +7663,18 @@ var DLMM = class {
       lowerBinArrayIndex,
       this.program.programId
     );
-    const upperBinArrayIndex = lowerBinArrayIndex.add(new (0, _anchor.BN)(1));
+    const upperBinArrayIndex = _anchor.BN.max(
+      lowerBinArrayIndex.add(new (0, _anchor.BN)(1)),
+      binIdToBinArrayIndex(new (0, _anchor.BN)(maxBinId))
+    );
     const [binArrayUpper] = deriveBinArray(
       this.pubkey,
       upperBinArrayIndex,
       this.program.programId
     );
-    const binArraysNeeded = Array.from(
-      { length: upperBinArrayIndex.sub(lowerBinArrayIndex).toNumber() + 4 },
-      (_, index) => index - 2 + lowerBinArrayIndex.toNumber()
-    ).map((idx) => new (0, _anchor.BN)(idx));
     const createBinArrayIxs = await this.createBinArraysIfNeeded(
-      binArraysNeeded,
+      upperBinArrayIndex,
+      lowerBinArrayIndex,
       user
     );
     preInstructions.push(...createBinArrayIxs);
@@ -8000,18 +7821,18 @@ var DLMM = class {
       lowerBinArrayIndex,
       this.program.programId
     );
-    const upperBinArrayIndex = lowerBinArrayIndex.add(new (0, _anchor.BN)(1));
+    const upperBinArrayIndex = _anchor.BN.max(
+      lowerBinArrayIndex.add(new (0, _anchor.BN)(1)),
+      binIdToBinArrayIndex(new (0, _anchor.BN)(upperBinId))
+    );
     const [binArrayUpper] = deriveBinArray(
       this.pubkey,
       upperBinArrayIndex,
       this.program.programId
     );
-    const binArraysNeeded = Array.from(
-      { length: upperBinArrayIndex.sub(lowerBinArrayIndex).toNumber() + 4 },
-      (_, index) => index - 2 + lowerBinArrayIndex.toNumber()
-    ).map((idx) => new (0, _anchor.BN)(idx));
     const createBinArrayIxs = await this.createBinArraysIfNeeded(
-      binArraysNeeded,
+      upperBinArrayIndex,
+      lowerBinArrayIndex,
       user
     );
     preInstructions.push(...createBinArrayIxs);
@@ -8197,18 +8018,18 @@ var DLMM = class {
       lowerBinArrayIndex,
       this.program.programId
     );
-    const upperBinArrayIndex = lowerBinArrayIndex.add(new (0, _anchor.BN)(1));
+    const upperBinArrayIndex = _anchor.BN.max(
+      lowerBinArrayIndex.add(new (0, _anchor.BN)(1)),
+      binIdToBinArrayIndex(new (0, _anchor.BN)(maxBinId))
+    );
     const [binArrayUpper] = deriveBinArray(
       this.pubkey,
       upperBinArrayIndex,
       this.program.programId
     );
-    const binArraysNeeded = Array.from(
-      { length: upperBinArrayIndex.sub(lowerBinArrayIndex).toNumber() + 4 },
-      (_, index) => index - 2 + lowerBinArrayIndex.toNumber()
-    ).map((idx) => new (0, _anchor.BN)(idx));
     const createBinArrayIxs = await this.createBinArraysIfNeeded(
-      binArraysNeeded,
+      upperBinArrayIndex,
+      lowerBinArrayIndex,
       user
     );
     preInstructions.push(...createBinArrayIxs);
@@ -8369,19 +8190,19 @@ var DLMM = class {
       lowerBinArrayIndex,
       this.program.programId
     );
-    const upperBinArrayIndex = lowerBinArrayIndex.add(new (0, _anchor.BN)(1));
+    const upperBinArrayIndex = _anchor.BN.max(
+      lowerBinArrayIndex.add(new (0, _anchor.BN)(1)),
+      binIdToBinArrayIndex(new (0, _anchor.BN)(positionAccount.upperBinId))
+    );
     const [binArrayUpper] = deriveBinArray(
       this.pubkey,
       upperBinArrayIndex,
       this.program.programId
     );
-    const binArraysNeeded = Array.from(
-      { length: upperBinArrayIndex.sub(lowerBinArrayIndex).toNumber() + 4 },
-      (_, index) => index - 2 + lowerBinArrayIndex.toNumber()
-    ).map((idx) => new (0, _anchor.BN)(idx));
     const preInstructions = [];
     const createBinArrayIxs = await this.createBinArraysIfNeeded(
-      binArraysNeeded,
+      upperBinArrayIndex,
+      lowerBinArrayIndex,
       user
     );
     preInstructions.push(...createBinArrayIxs);
@@ -9327,48 +9148,6 @@ var DLMM = class {
       })
     );
   }
-  async syncWithMarketPrice(marketPrice, owner) {
-    const marketPriceBinId = this.getBinIdFromPrice(marketPrice, false);
-    const activeBin = await this.getActiveBin();
-    const activeBinId = activeBin.binId;
-    const fromBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(activeBinId));
-    const swapForY = marketPriceBinId < activeBinId;
-    const toBinArrayIndex = findNextBinArrayIndexWithLiquidity(
-      swapForY,
-      new (0, _anchor.BN)(activeBinId),
-      this.lbPair,
-      this.binArrayBitmapExtension.account
-    );
-    const [lowerBinId, upperBinId] = getBinArrayLowerUpperBinId(toBinArrayIndex);
-    const toBinArrayBins = await this.getBins(
-      this.pubkey,
-      lowerBinId.toNumber(),
-      upperBinId.toNumber(),
-      this.tokenX.decimal,
-      this.tokenY.decimal
-    );
-    const toBinId = swapForY ? toBinArrayBins.findLast(({ yAmount }) => !yAmount.isZero()) : toBinArrayBins.find(({ xAmount }) => !xAmount.isZero());
-    const { blockhash, lastValidBlockHeight } = await this.program.provider.connection.getLatestBlockhash("confirmed");
-    const syncWithMarketPriceTx = await this.program.methods.goToABin(toBinId.binId).accounts({
-      lbPair: this.pubkey,
-      binArrayBitmapExtension: this.binArrayBitmapExtension.publicKey,
-      fromBinArray: deriveBinArray(
-        this.pubkey,
-        fromBinArrayIndex,
-        this.program.programId
-      )[0],
-      toBinArray: deriveBinArray(
-        this.pubkey,
-        toBinArrayIndex,
-        this.program.programId
-      )[0]
-    }).transaction();
-    return new (0, _web3js.Transaction)({
-      feePayer: owner,
-      blockhash,
-      lastValidBlockHeight
-    }).add(syncWithMarketPriceTx);
-  }
   /** Private static method */
   static async getBinArrays(program, lbPairPubkey) {
     return program.account.binArray.all([
@@ -9763,7 +9542,11 @@ var DLMM = class {
     }
     return bins;
   }
-  async binArraysToBeCreate(binArrayIndexes) {
+  async binArraysToBeCreate(lowerBinArrayIndex, upperBinArrayIndex) {
+    const binArrayIndexes = Array.from(
+      { length: upperBinArrayIndex.sub(lowerBinArrayIndex).toNumber() + 1 },
+      (_, index) => index + lowerBinArrayIndex.toNumber()
+    ).map((idx) => new (0, _anchor.BN)(idx));
     const binArrays = [];
     for (const idx of binArrayIndexes) {
       const [binArray] = deriveBinArray(
@@ -9778,8 +9561,12 @@ var DLMM = class {
     }
     return binArrays;
   }
-  async createBinArraysIfNeeded(binArrayIndexes, funder) {
+  async createBinArraysIfNeeded(upperBinArrayIndex, lowerBinArrayIndex, funder) {
     const ixs = [];
+    const binArrayIndexes = Array.from(
+      { length: upperBinArrayIndex.sub(lowerBinArrayIndex).toNumber() + 1 },
+      (_, index) => index + lowerBinArrayIndex.toNumber()
+    ).map((idx) => new (0, _anchor.BN)(idx));
     for (const idx of binArrayIndexes) {
       const [binArray] = deriveBinArray(
         this.pubkey,