@meteora-ag/dlmm 1.6.0-rc.29 → 1.6.0-rc.30

package/dist/index.js

@@ -13901,6 +13901,28 @@ async function chunkDepositWithRebalanceEndpoint(dlmm, strategy, slippagePercent
       addLiquidityIxs.push(...wrapSOLIx);
     }
     addLiquidityIxs.push(rebalanceIx);
+    if (dlmm.tokenX.publicKey.equals(_spltoken.NATIVE_MINT) && !totalXAmount.isZero()) {
+      addLiquidityIxs.push(
+        _spltoken.createCloseAccountInstruction.call(void 0, 
+          userTokenX,
+          owner,
+          owner,
+          [],
+          _spltoken.TOKEN_PROGRAM_ID
+        )
+      );
+    }
+    if (dlmm.tokenY.publicKey.equals(_spltoken.NATIVE_MINT) && !totalYAmount.isZero()) {
+      addLiquidityIxs.push(
+        _spltoken.createCloseAccountInstruction.call(void 0, 
+          userTokenY,
+          owner,
+          owner,
+          [],
+          _spltoken.TOKEN_PROGRAM_ID
+        )
+      );
+    }
     if (simulateCU) {
       const cuIx = await getEstimatedComputeUnitIxWithBuffer(
         dlmm.program.provider.connection,
@@ -15722,8 +15744,9 @@ var DLMM = class {
     const binCount = maxBinId - minBinId + 1;
     const positionCount = Math.floor(binCount / MAX_BINS_PER_POSITION.toNumber()) + 1;
     let positionReallocCost = 0;
+    let lastUpperBinId = minBinId;
     for (let i = 0; i < positionCount; i++) {
-      const lowerBinId = minBinId;
+      const lowerBinId = lastUpperBinId;
       const upperBinId = Math.min(
         maxBinId,
         lowerBinId + DEFAULT_BIN_PER_POSITION.toNumber() - 1
@@ -15739,6 +15762,7 @@ var DLMM = class {
         new (0, _anchor.BN)(binToExpand)
       );
       positionReallocCost += positionExtendCost.toNumber();
+      lastUpperBinId = upperBinId;
     }
     const lowerBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(minBinId));
     const upperBinArrayIndex = _anchor.BN.max(
@@ -15988,7 +16012,8 @@ var DLMM = class {
     const latestBlockhashInfo = await this.program.provider.connection.getLatestBlockhash();
     return chunkedAddLiquidityIx.map((ixs) => {
       return new (0, _web3js.Transaction)({
-        ...latestBlockhashInfo
+        ...latestBlockhashInfo,
+        feePayer: user
       }).add(...ixs);
     });
   }