@meteora-ag/dlmm 1.4.3-rc.0 → 1.4.3-rc.1

package/dist/index.d.ts

@@ -5815,12 +5815,12 @@ declare class DLMM {
     static getPricePerLamport(tokenXDecimal: number, tokenYDecimal: number, price: number): string;
     static getBinIdFromPrice(price: string | number | Decimal, binStep: number, min: boolean): number;
     /**
-    * The function `getLbPairLockInfo` retrieves all pair positions that has locked liquidity.
-    * @param {number} [lockDurationOpt] - An optional value indicating the minimum position lock duration that the function should return.
-    * Depending on the lbPair activationType, the param should be a number of seconds or a number of slots.
-    * @returns The function `getLbPairLockInfo` returns a `Promise` that resolves to a `PairLockInfo`
-    * object. The `PairLockInfo` object contains an array of `PositionLockInfo` objects.
-    */
+     * The function `getLbPairLockInfo` retrieves all pair positions that has locked liquidity.
+     * @param {number} [lockDurationOpt] - An optional value indicating the minimum position lock duration that the function should return.
+     * Depending on the lbPair activationType, the param should be a number of seconds or a number of slots.
+     * @returns The function `getLbPairLockInfo` returns a `Promise` that resolves to a `PairLockInfo`
+     * object. The `PairLockInfo` object contains an array of `PositionLockInfo` objects.
+     */
     getLbPairLockInfo(lockDurationOpt?: number): Promise<PairLockInfo>;
     /** Public methods */
     static createPermissionLbPair(connection: Connection, binStep: BN, tokenX: PublicKey, tokenY: PublicKey, activeId: BN, baseKey: PublicKey, creatorKey: PublicKey, feeBps: BN, activationType: ActivationType, opt?: Opt): Promise<Transaction>;
@@ -6217,22 +6217,22 @@ declare class DLMM {
      */
     seedLiquidity(owner: PublicKey, seedAmount: BN, curvature: number, minPrice: number, maxPrice: number, base: PublicKey, payer: PublicKey, feeOwner: PublicKey, operator: PublicKey, lockReleasePoint: BN, shouldSeedPositionOwner?: boolean): Promise<SeedLiquidityResponse>;
     /**
-   * The `seedLiquidity` function create multiple grouped instructions. The grouped instructions will be either [initialize bin array + initialize position instructions] or [deposit instruction] combination.
-   * @param
-   *    - `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[]>}
-   */
+     * The `seedLiquidity` function create multiple grouped instructions. The grouped instructions will be either [initialize bin array + initialize position instructions] or [deposit instruction] combination.
+     * @param
+     *    - `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(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

@@ -8381,12 +8381,12 @@ var DLMM = class {
     return (min ? binId.floor() : binId.ceil()).toNumber();
   }
   /**
-  * The function `getLbPairLockInfo` retrieves all pair positions that has locked liquidity.
-  * @param {number} [lockDurationOpt] - An optional value indicating the minimum position lock duration that the function should return. 
-  * Depending on the lbPair activationType, the param should be a number of seconds or a number of slots.
-  * @returns The function `getLbPairLockInfo` returns a `Promise` that resolves to a `PairLockInfo`
-  * object. The `PairLockInfo` object contains an array of `PositionLockInfo` objects.
-  */
+   * The function `getLbPairLockInfo` retrieves all pair positions that has locked liquidity.
+   * @param {number} [lockDurationOpt] - An optional value indicating the minimum position lock duration that the function should return.
+   * Depending on the lbPair activationType, the param should be a number of seconds or a number of slots.
+   * @returns The function `getLbPairLockInfo` returns a `Promise` that resolves to a `PairLockInfo`
+   * object. The `PairLockInfo` object contains an array of `PositionLockInfo` objects.
+   */
   async getLbPairLockInfo(lockDurationOpt) {
     const lockDuration = lockDurationOpt | 0;
     const lbPairPositions = await this.program.account.positionV2.all([
@@ -8397,33 +8397,39 @@ var DLMM = class {
         }
       }
     ]);
-    const clockAccInfo = await this.program.provider.connection.getAccountInfo(_web3js.SYSVAR_CLOCK_PUBKEY);
+    const clockAccInfo = await this.program.provider.connection.getAccountInfo(
+      _web3js.SYSVAR_CLOCK_PUBKEY
+    );
     const clock = ClockLayout.decode(clockAccInfo.data);
     const currentPoint = this.lbPair.activationType == 0 /* Slot */ ? clock.slot : clock.unixTimestamp;
     const minLockReleasePoint = currentPoint.add(new (0, _anchor.BN)(lockDuration));
-    const positionsWithLock = lbPairPositions.filter((p) => p.account.lockReleasePoint.gt(minLockReleasePoint));
+    const positionsWithLock = lbPairPositions.filter(
+      (p) => p.account.lockReleasePoint.gt(minLockReleasePoint)
+    );
     if (positionsWithLock.length == 0) {
       return {
         positions: []
       };
     }
     const binArrayPubkeySetV2 = /* @__PURE__ */ new Set();
-    positionsWithLock.forEach(({ account: { upperBinId, lowerBinId, lbPair } }) => {
-      const lowerBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(lowerBinId));
-      const upperBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(upperBinId));
-      const [lowerBinArrayPubKey] = deriveBinArray(
-        this.pubkey,
-        lowerBinArrayIndex,
-        this.program.programId
-      );
-      const [upperBinArrayPubKey] = deriveBinArray(
-        this.pubkey,
-        upperBinArrayIndex,
-        this.program.programId
-      );
-      binArrayPubkeySetV2.add(lowerBinArrayPubKey.toBase58());
-      binArrayPubkeySetV2.add(upperBinArrayPubKey.toBase58());
-    });
+    positionsWithLock.forEach(
+      ({ account: { upperBinId, lowerBinId, lbPair } }) => {
+        const lowerBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(lowerBinId));
+        const upperBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(upperBinId));
+        const [lowerBinArrayPubKey] = deriveBinArray(
+          this.pubkey,
+          lowerBinArrayIndex,
+          this.program.programId
+        );
+        const [upperBinArrayPubKey] = deriveBinArray(
+          this.pubkey,
+          upperBinArrayIndex,
+          this.program.programId
+        );
+        binArrayPubkeySetV2.add(lowerBinArrayPubKey.toBase58());
+        binArrayPubkeySetV2.add(upperBinArrayPubKey.toBase58());
+      }
+    );
     const binArrayPubkeyArrayV2 = Array.from(binArrayPubkeySetV2).map(
       (pubkey) => new (0, _web3js.PublicKey)(pubkey)
     );
@@ -8576,6 +8582,7 @@ var DLMM = class {
     };
     const userTokenX = _spltoken.getAssociatedTokenAddressSync.call(void 0, tokenX, creatorKey);
     const userTokenY = _spltoken.getAssociatedTokenAddressSync.call(void 0, tokenY, creatorKey);
+    console.log(program.methods);
     return program.methods.initializeCustomizablePermissionlessLbPair(ixData).accounts({
       lbPair,
       reserveX,
@@ -9047,11 +9054,7 @@ var DLMM = class {
     );
     const lbPairAndBinArrays = await chunkedGetMultipleAccountInfos(
       this.program.provider.connection,
-      [
-        this.pubkey,
-        _web3js.SYSVAR_CLOCK_PUBKEY,
-        ...binArrayPubkeyArrayV2
-      ]
+      [this.pubkey, _web3js.SYSVAR_CLOCK_PUBKEY, ...binArrayPubkeyArrayV2]
     );
     const [lbPairAccInfo, clockAccInfo, ...binArraysAccInfo] = lbPairAndBinArrays;
     const positionBinArraysMapV2 = /* @__PURE__ */ new Map();
@@ -9188,9 +9191,13 @@ var DLMM = class {
    * - `version`: The version of the position (in this case, `Position.V2`)
    */
   async getPosition(positionPubKey) {
-    const positionAccountInfo = await this.program.account.positionV2.fetch(positionPubKey);
+    const positionAccountInfo = await this.program.account.positionV2.fetch(
+      positionPubKey
+    );
     if (!positionAccountInfo) {
-      throw new Error(`Position account ${positionPubKey.toBase58()} not found`);
+      throw new Error(
+        `Position account ${positionPubKey.toBase58()} not found`
+      );
     }
     const { lowerBinId, upperBinId, feeOwner } = positionAccountInfo;
     const lowerBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(lowerBinId));
@@ -9205,14 +9212,11 @@ var DLMM = class {
       upperBinArrayIndex,
       this.program.programId
     );
-    const [clockAccInfo, lowerBinArrayAccInfo, upperBinArrayAccInfo] = await chunkedGetMultipleAccountInfos(
-      this.program.provider.connection,
-      [
-        _web3js.SYSVAR_CLOCK_PUBKEY,
-        lowerBinArrayPubKey,
-        upperBinArrayPubKey
-      ]
-    );
+    const [clockAccInfo, lowerBinArrayAccInfo, upperBinArrayAccInfo] = await chunkedGetMultipleAccountInfos(this.program.provider.connection, [
+      _web3js.SYSVAR_CLOCK_PUBKEY,
+      lowerBinArrayPubKey,
+      upperBinArrayPubKey
+    ]);
     if (!lowerBinArrayAccInfo || !upperBinArrayAccInfo) {
       return {
         publicKey: positionPubKey,
@@ -9987,7 +9991,13 @@ var DLMM = class {
   }) {
     const lowerBinIdToRemove = Math.min(...binIds);
     const upperBinIdToRemove = Math.max(...binIds);
-    const { lbPair, owner, feeOwner, lowerBinId: positionLowerBinId, liquidityShares } = await this.program.account.positionV2.fetch(position);
+    const {
+      lbPair,
+      owner,
+      feeOwner,
+      lowerBinId: positionLowerBinId,
+      liquidityShares
+    } = await this.program.account.positionV2.fetch(position);
     if (liquidityShares.every((share) => share.isZero())) {
       throw new Error("No liquidity to remove");
     }
@@ -10109,7 +10119,11 @@ var DLMM = class {
     const maxBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(upperBinIdToRemove));
     const useExtension = isOverflowDefaultBinArrayBitmap(minBinArrayIndex) || isOverflowDefaultBinArrayBitmap(maxBinArrayIndex);
     const binArrayBitmapExtension = useExtension ? deriveBinArrayBitmapExtension(this.pubkey, this.program.programId)[0] : null;
-    const removeLiquidityTx = await this.program.methods.removeLiquidityByRange(lowerBinIdToRemove, upperBinIdToRemove, bps.toNumber()).accounts({
+    const removeLiquidityTx = await this.program.methods.removeLiquidityByRange(
+      lowerBinIdToRemove,
+      upperBinIdToRemove,
+      bps.toNumber()
+    ).accounts({
       position,
       lbPair,
       userTokenX,
@@ -10225,7 +10239,10 @@ var DLMM = class {
     const currentTimestamp = Date.now() / 1e3;
     let outAmountLeft = outAmount;
     if (maxExtraBinArrays < 0 || maxExtraBinArrays > MAX_EXTRA_BIN_ARRAYS) {
-      throw new DlmmSdkError("INVALID_MAX_EXTRA_BIN_ARRAYS", `maxExtraBinArrays must be a value between 0 and ${MAX_EXTRA_BIN_ARRAYS}`);
+      throw new DlmmSdkError(
+        "INVALID_MAX_EXTRA_BIN_ARRAYS",
+        `maxExtraBinArrays must be a value between 0 and ${MAX_EXTRA_BIN_ARRAYS}`
+      );
     }
     let vParameterClone = Object.assign({}, this.lbPair.vParameters);
     let activeId = new (0, _anchor.BN)(this.lbPair.activeId);
@@ -10313,7 +10330,9 @@ var DLMM = class {
         if (binArrayAccountToSwap == null) {
           break;
         }
-        const binArrayAccountToSwapExisted = binArraysForSwap.has(binArrayAccountToSwap.publicKey);
+        const binArrayAccountToSwapExisted = binArraysForSwap.has(
+          binArrayAccountToSwap.publicKey
+        );
         if (binArrayAccountToSwapExisted) {
           if (swapForY) {
             activeId = activeId.sub(new (0, _anchor.BN)(1));
@@ -10322,7 +10341,9 @@ var DLMM = class {
           }
         } else {
           extraBinArrays.push(binArrayAccountToSwap.publicKey);
-          const [lowerBinId, upperBinId] = getBinArrayLowerUpperBinId(binArrayAccountToSwap.account.index);
+          const [lowerBinId, upperBinId] = getBinArrayLowerUpperBinId(
+            binArrayAccountToSwap.account.index
+          );
           if (swapForY) {
             activeId = lowerBinId.sub(new (0, _anchor.BN)(1));
           } else {
@@ -10368,7 +10389,10 @@ var DLMM = class {
     const currentTimestamp = Date.now() / 1e3;
     let inAmountLeft = inAmount;
     if (maxExtraBinArrays < 0 || maxExtraBinArrays > MAX_EXTRA_BIN_ARRAYS) {
-      throw new DlmmSdkError("INVALID_MAX_EXTRA_BIN_ARRAYS", `maxExtraBinArrays must be a value between 0 and ${MAX_EXTRA_BIN_ARRAYS}`);
+      throw new DlmmSdkError(
+        "INVALID_MAX_EXTRA_BIN_ARRAYS",
+        `maxExtraBinArrays must be a value between 0 and ${MAX_EXTRA_BIN_ARRAYS}`
+      );
     }
     let vParameterClone = Object.assign({}, this.lbPair.vParameters);
     let activeId = new (0, _anchor.BN)(this.lbPair.activeId);
@@ -10475,7 +10499,9 @@ var DLMM = class {
         if (binArrayAccountToSwap == null) {
           break;
         }
-        const binArrayAccountToSwapExisted = binArraysForSwap.has(binArrayAccountToSwap.publicKey);
+        const binArrayAccountToSwapExisted = binArraysForSwap.has(
+          binArrayAccountToSwap.publicKey
+        );
         if (binArrayAccountToSwapExisted) {
           if (swapForY) {
             activeId = activeId.sub(new (0, _anchor.BN)(1));
@@ -10484,7 +10510,9 @@ var DLMM = class {
           }
         } else {
           extraBinArrays.push(binArrayAccountToSwap.publicKey);
-          const [lowerBinId, upperBinId] = getBinArrayLowerUpperBinId(binArrayAccountToSwap.account.index);
+          const [lowerBinId, upperBinId] = getBinArrayLowerUpperBinId(
+            binArrayAccountToSwap.account.index
+          );
           if (swapForY) {
             activeId = lowerBinId.sub(new (0, _anchor.BN)(1));
           } else {
@@ -10863,12 +10891,10 @@ var DLMM = class {
   }
   async setPairStatus(enabled) {
     const pairStatus = enabled ? 0 : 1;
-    const tx = await this.program.methods.setPairStatus(pairStatus).accounts(
-      {
-        lbPair: this.pubkey,
-        admin: this.lbPair.creator
-      }
-    ).transaction();
+    const tx = await this.program.methods.setPairStatus(pairStatus).accounts({
+      lbPair: this.pubkey,
+      admin: this.lbPair.creator
+    }).transaction();
     const { blockhash, lastValidBlockHeight } = await this.program.provider.connection.getLatestBlockhash("confirmed");
     return new (0, _web3js.Transaction)({
       feePayer: this.lbPair.creator,
@@ -11127,12 +11153,7 @@ var DLMM = class {
         );
         sendPositionOwnerTokenProveIxs.push(initPositionOwnerTokenX);
         sendPositionOwnerTokenProveIxs.push(
-          _spltoken.createTransferInstruction.call(void 0, 
-            seederTokenX,
-            ownerTokenX,
-            operator,
-            1n
-          )
+          _spltoken.createTransferInstruction.call(void 0, seederTokenX, ownerTokenX, operator, 1n)
         );
       }
     }
@@ -11280,22 +11301,22 @@ 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
-  *    - `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[]>}
-  */
+   * The `seedLiquidity` function create multiple grouped instructions. The grouped instructions will be either [initialize bin array + initialize position instructions] or [deposit instruction] combination.
+   * @param
+   *    - `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(payer, base, seedAmount, price, roundingUp, positionOwner, feeOwner, operator, lockReleasePoint, shouldSeedPositionOwner = false) {
     const pricePerLamport = DLMM.getPricePerLamport(
       this.tokenX.decimal,
@@ -11310,9 +11331,23 @@ var DLMM = class {
     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 [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 preInstructions = [];
     const [
       { ataPubKey: userTokenX, ix: createPayerTokenXIx },
@@ -11346,11 +11381,13 @@ var DLMM = class {
     if (isOverflowDefaultBinArrayBitmap(lowerBinArrayIndex)) {
       const bitmapExtensionAccount = accounts[3];
       if (!bitmapExtensionAccount) {
-        preInstructions.push(await this.program.methods.initializeBinArrayBitmapExtension().accounts({
-          binArrayBitmapExtension,
-          funder: payer,
-          lbPair: this.pubkey
-        }).instruction());
+        preInstructions.push(
+          await this.program.methods.initializeBinArrayBitmapExtension().accounts({
+            binArrayBitmapExtension,
+            funder: payer,
+            lbPair: this.pubkey
+          }).instruction()
+        );
       }
     } else {
       binArrayBitmapExtension = this.program.programId;
@@ -11366,17 +11403,34 @@ var DLMM = class {
       true
     );
     if (shouldSeedPositionOwner) {
-      const positionOwnerTokenXAccount = await this.program.provider.connection.getAccountInfo(positionOwnerTokenX);
+      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);
+          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);
+        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);
+        const transferIx = _spltoken.createTransferInstruction.call(void 0, 
+          operatorTokenX,
+          positionOwnerTokenX,
+          payer,
+          1
+        );
         preInstructions.push(transferIx);
       }
     }
@@ -12214,20 +12268,26 @@ var DLMM = class {
       ...fetchedBinArrays,
       ...hasCachedUpperBinArray && !isSingleBinArray ? [upperBinArray] : []
     ];
-    const binsById = new Map(binArrays.filter((x) => x != null).flatMap(({ bins, index }) => {
-      const [lowerBinId2] = getBinArrayLowerUpperBinId(index);
-      return bins.map((b, i) => [lowerBinId2.toNumber() + i, b]);
-    }));
+    const binsById = new Map(
+      binArrays.filter((x) => x != null).flatMap(({ bins, index }) => {
+        const [lowerBinId2] = getBinArrayLowerUpperBinId(index);
+        return bins.map(
+          (b, i) => [lowerBinId2.toNumber() + i, b]
+        );
+      })
+    );
     const version = _nullishCoalesce(_optionalChain([binArrays, 'access', _86 => _86.find, 'call', _87 => _87((binArray) => binArray != null), 'optionalAccess', _88 => _88.version]), () => ( 1));
-    return Array.from(enumerateBins(
-      binsById,
-      lowerBinId,
-      upperBinId,
-      this.lbPair.binStep,
-      baseTokenDecimal,
-      quoteTokenDecimal,
-      version
-    ));
+    return Array.from(
+      enumerateBins(
+        binsById,
+        lowerBinId,
+        upperBinId,
+        this.lbPair.binStep,
+        baseTokenDecimal,
+        quoteTokenDecimal,
+        version
+      )
+    );
   }
   async binArraysToBeCreate(lowerBinArrayIndex, upperBinArrayIndex) {
     const binArrayIndexes = Array.from(