@hawksightco/hawk-sdk 1.3.224 → 1.3.226

package/dist/src/classes/Transactions.js

@@ -484,7 +484,8 @@ class Transactions {
                     return mainInstructions;
                 }
                 catch (error) {
-                    if (error instanceof Error && error.message.includes('No liquidity to remove')) {
+                    if (error instanceof Error &&
+                        error.message.includes('No liquidity to remove')) {
                         console.warn('No liquidity to remove, closing position instead.');
                         const { userPositions } = yield dlmmPool.getPositionsByUserAndLbPair(userPda);
                         const index = userPositions.findIndex(v => v.publicKey.equals(params.position));
@@ -634,8 +635,13 @@ class Transactions {
                 return [result];
             }
             // ≥70 bins: multi-tx chunked withdraw
-            const resolved = yield this._resolveWithdrawPoolData({ connection, lbPair });
-            const amountBps = params.shouldClaimAndClose ? new bn_js_1.default(10000) : params.amountBps;
+            const resolved = yield this._resolveWithdrawPoolData({
+                connection,
+                lbPair,
+            });
+            const amountBps = params.shouldClaimAndClose
+                ? new bn_js_1.default(10000)
+                : params.amountBps;
             // Chunk into ≤149-bin ranges
             const CHUNK_SIZE = 149;
             const chunks = [];
@@ -663,7 +669,7 @@ class Transactions {
      * Call once, then pass the result to _buildWithdrawInstructions for each chunk.
      */
     _resolveWithdrawPoolData(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ connection, lbPair }) {
+        return __awaiter(this, arguments, void 0, function* ({ connection, lbPair, }) {
             // Create DLMM pool first — this also initializes MeteoraDLMM._program
             // so we don't need a separate MeteoraDLMM.program() call (which fetches a dummy pool).
             const dlmmPool = yield meteora_1.MeteoraDLMM.create(connection, lbPair, this.ix);
@@ -671,12 +677,22 @@ class Transactions {
             const lbPairState = dlmmPool.dlmm.lbPair;
             const tokenXMint = lbPairState.tokenXMint;
             const tokenYMint = lbPairState.tokenYMint;
-            const tokenProgramMap = yield (0, functions_1.getTokenProgramMapForMints)(connection, [tokenXMint, tokenYMint]);
+            const tokenProgramMap = yield (0, functions_1.getTokenProgramMapForMints)(connection, [
+                tokenXMint,
+                tokenYMint,
+            ]);
             const tokenXProgram = tokenProgramMap[tokenXMint.toString()];
             const tokenYProgram = tokenProgramMap[tokenYMint.toString()];
             const remainingAccountsInfo = yield (0, functions_1.fetchRemainingAccountsInfo)(connection, tokenXMint, tokenYMint, tokenXProgram, tokenYProgram);
             const lbPairInfo = yield program.account.lbPair.fetch(lbPair);
-            return { tokenXMint, tokenYMint, tokenXProgram, tokenYProgram, remainingAccountsInfo, lbPairInfo };
+            return {
+                tokenXMint,
+                tokenYMint,
+                tokenXProgram,
+                tokenYProgram,
+                remainingAccountsInfo,
+                lbPairInfo,
+            };
         });
     }
     /**
@@ -689,7 +705,8 @@ class Transactions {
             const mainInstructions = [];
             let userTokenX, userTokenY;
             const userPda = (0, functions_1.generateUserPda)(params.userWallet);
-            if (params.pdaTokenType === types_1.TokenType.ATA || params.pdaTokenType === undefined) {
+            if (params.pdaTokenType === types_1.TokenType.ATA ||
+                params.pdaTokenType === undefined) {
                 userTokenX = (0, functions_1.generateAta)(userPda, params.tokenXMint, params.tokenXProgram);
                 userTokenY = (0, functions_1.generateAta)(userPda, params.tokenYMint, params.tokenYProgram);
                 mainInstructions.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(params.userWallet, userTokenX, userPda, params.tokenXMint, params.tokenXProgram));
@@ -773,6 +790,12 @@ class Transactions {
                 hasAmount: false,
             });
             mainInstructions.push(withdrawFromPdaIx);
+            // 6. Unwrap wSOL to native SOL (if either mint is wSOL)
+            const unwrapIxs = (0, functions_1.unwrapSolIfMintIsWsol)(params.userWallet, [
+                params.tokenXMint,
+                params.tokenYMint,
+            ]);
+            mainInstructions.push(...unwrapIxs);
             return mainInstructions;
         });
     }
@@ -820,6 +843,7 @@ class Transactions {
      */
     meteoraClaimLargePosition(_a) {
         return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
+            var _b;
             // Determine lbPair and bin range
             let lbPair;
             let lowerBinId;
@@ -842,11 +866,18 @@ class Transactions {
             const totalBins = upperBinId - lowerBinId + 1;
             // ≤149 bins: single-tx path
             if (totalBins <= 149) {
-                const result = yield this.meteoraClaim({ connection, params, fetch: undefined });
+                const result = yield this.meteoraClaim({
+                    connection,
+                    params,
+                    fetch: undefined,
+                });
                 return [result];
             }
             // ≥150 bins: multi-tx chunked claim
-            const resolved = yield this._resolveWithdrawPoolData({ connection, lbPair });
+            const resolved = yield this._resolveWithdrawPoolData({
+                connection,
+                lbPair,
+            });
             // Chunk into ≤149-bin ranges
             const CHUNK_SIZE = 149;
             const chunks = [];
@@ -890,6 +921,31 @@ class Transactions {
                     });
                     instructions.push(claimRewardIx);
                 }
+                // Withdraw tokens from PDA back to user wallet
+                const withdrawMints = [
+                    { mint: resolved.tokenXMint, amount: new bn_js_1.default(0) },
+                    { mint: resolved.tokenYMint, amount: new bn_js_1.default(0) },
+                ];
+                for (let rewardIndex = 0; rewardIndex < 2; rewardIndex++) {
+                    const rewardInfo = resolved.lbPairInfo.rewardInfos[rewardIndex];
+                    if (rewardInfo && !rewardInfo.mint.equals(web3.PublicKey.default)) {
+                        withdrawMints.push({ mint: rewardInfo.mint, amount: new bn_js_1.default(0) });
+                    }
+                }
+                const withdrawFromPdaIx = yield this.ix.iyfMain.withdrawMultipleTokenWithToken2022({
+                    connection,
+                    payer: params.userWallet,
+                    withdraw: withdrawMints,
+                    pdaTokenType: (_b = params.pdaTokenType) !== null && _b !== void 0 ? _b : types_1.TokenType.ATA,
+                    hasAmount: false,
+                });
+                instructions.push(withdrawFromPdaIx);
+                // Unwrap wSOL to native SOL (if either mint is wSOL)
+                const unwrapIxs = (0, functions_1.unwrapSolIfMintIsWsol)(params.userWallet, [
+                    resolved.tokenXMint,
+                    resolved.tokenYMint,
+                ]);
+                instructions.push(...unwrapIxs);
                 transactions.push(yield (0, functions_1.createTransactionMeta)({
                     payer: params.userWallet,
                     description: `Claim from large Meteora DLMM Position (chunk ${i + 1}/${chunks.length})`,
@@ -1091,7 +1147,7 @@ class Transactions {
                 // Re-deposit fees (TODO: How to re-deposit reward tokens that is not X or Y token?)
                 // Get slippage amount that returns a 10 bin slippage (meteora defaults to 3 bins if not provided)
                 const binStep = yield dlmmPool.dlmm.lbPair.binStep;
-                let slippageAmount = Math.round(10 * (binStep / 100) * 100) / 100; // 2 decimal places round
+                const slippageAmount = Math.round(10 * (binStep / 100) * 100) / 100; // 2 decimal places round
                 const addLiquidityBuilder = yield dlmmPool.addLiquidityByStrategy(connection, params.userWallet, addresses_1.HS_AUTHORITY, {
                     positionPubKey: params.position,
                     user: userPda,
@@ -1167,7 +1223,7 @@ class Transactions {
                     shouldClaimAndClose: false, // Do NOT close position
                 }, hsToMeteora_1.meteoraToHawksightAutomationIxs);
                 // Configure fee destination based on useAta
-                if (!!params.useAta) {
+                if (params.useAta) {
                     removeLiquidityBuilder.replaceClaimFeeTokenToATA();
                     removeLiquidityBuilder.replaceClaimRewardToATA();
                 }
@@ -1178,7 +1234,7 @@ class Transactions {
                 // Step 2: Add liquidity back to the SAME position with specified distribution
                 // Get slippage amount (10 bin slippage like compound)
                 const binStep = dlmmPool.dlmm.lbPair.binStep;
-                let slippageAmount = Math.round(10 * (binStep / 100) * 100) / 100;
+                const slippageAmount = Math.round(10 * (binStep / 100) * 100) / 100;
                 const addLiquidityBuilder = yield dlmmPool.addLiquidityByStrategy(connection, params.userWallet, addresses_1.HS_AUTHORITY, {
                     positionPubKey: params.position,
                     user: userPda,
@@ -1242,7 +1298,7 @@ class Transactions {
                     bps: new bn_js_1.default(10000),
                     shouldClaimAndClose: false,
                 }, hsToMeteora_1.meteoraToHawksightAutomationIxs);
-                if (!!params.useAta) {
+                if (params.useAta) {
                     removeLiquidityBuilder.replaceClaimFeeTokenToATA();
                     removeLiquidityBuilder.replaceClaimRewardToATA();
                 }
@@ -1255,7 +1311,10 @@ class Transactions {
                 const activeBinId = lbPairState.activeId;
                 const tokenXMint = lbPairState.tokenXMint;
                 const tokenYMint = lbPairState.tokenYMint;
-                const tokenProgramMap = yield (0, functions_1.getTokenProgramMapForMints)(connection, [tokenXMint, tokenYMint]);
+                const tokenProgramMap = yield (0, functions_1.getTokenProgramMapForMints)(connection, [
+                    tokenXMint,
+                    tokenYMint,
+                ]);
                 const tokenXProgram = tokenProgramMap[tokenXMint.toString()];
                 const tokenYProgram = tokenProgramMap[tokenYMint.toString()];
                 const relativeLower = position.lowerBinId - activeBinId;
@@ -1275,10 +1334,12 @@ class Transactions {
                         upperRange: relativeUpper,
                     },
                     strategyType: types_3.StrategyTypeMap[params.distribution],
-                    checkRange: params.checkRange ? {
-                        lowerRange: params.checkRange.lowerRange,
-                        upperRange: params.checkRange.upperRange,
-                    } : undefined,
+                    checkRange: params.checkRange
+                        ? {
+                            lowerRange: params.checkRange.lowerRange,
+                            upperRange: params.checkRange.upperRange,
+                        }
+                        : undefined,
                 });
                 const mainInstructions = [
                     ...removeLiquidityBuilder.createAtaIxs,
@@ -1364,13 +1425,20 @@ class Transactions {
                 const binCount = upperBinId - lowerBinId + 1;
                 // For ≤149 bins, delegate to existing single-TX claimAutomationIx
                 if (binCount <= 149) {
-                    const singleResult = yield this.claimAutomationIx({ connection, params, fetch: undefined });
+                    const singleResult = yield this.claimAutomationIx({
+                        connection,
+                        params,
+                        fetch: undefined,
+                    });
                     return [singleResult];
                 }
                 // ≥150 bins: chunked multi-TX approach
                 // Resolve pool data (tokens, programs, remaining accounts)
-                const resolved = yield this._resolveWithdrawPoolData({ connection, lbPair });
-                const { tokenXMint, tokenYMint, tokenXProgram, tokenYProgram, remainingAccountsInfo, lbPairInfo } = resolved;
+                const resolved = yield this._resolveWithdrawPoolData({
+                    connection,
+                    lbPair,
+                });
+                const { tokenXMint, tokenYMint, tokenXProgram, tokenYProgram, remainingAccountsInfo, lbPairInfo, } = resolved;
                 // Get reward infos from lbPair state
                 const rewardInfos = lbPairInfo.rewardInfos;
                 // Chunk [lowerBinId, upperBinId] into ≤149-bin pieces
@@ -1479,7 +1547,11 @@ class Transactions {
                 const binCount = upperBinId - lowerBinId + 1;
                 // For ≤70 bins, delegate to existing single-TX compoundAutomationIx
                 if (binCount <= 70) {
-                    const singleResult = yield this.compoundAutomationIx({ connection, params, fetch: undefined });
+                    const singleResult = yield this.compoundAutomationIx({
+                        connection,
+                        params,
+                        fetch: undefined,
+                    });
                     return [singleResult];
                 }
                 // ≥150 bins: chunked multi-TX approach
@@ -1499,11 +1571,14 @@ class Transactions {
                 const tokenXMint = lbPairState.tokenXMint;
                 const tokenYMint = lbPairState.tokenYMint;
                 const rewardInfos = lbPairState.rewardInfos;
-                const tokenProgramMap = yield (0, functions_1.getTokenProgramMapForMints)(connection, [tokenXMint, tokenYMint]);
+                const tokenProgramMap = yield (0, functions_1.getTokenProgramMapForMints)(connection, [
+                    tokenXMint,
+                    tokenYMint,
+                ]);
                 const tokenXProgram = tokenProgramMap[tokenXMint.toString()];
                 const tokenYProgram = tokenProgramMap[tokenYMint.toString()];
                 const remainingAccountsInfo = yield (0, functions_1.fetchRemainingAccountsInfo)(connection, tokenXMint, tokenYMint, tokenXProgram, tokenYProgram);
-                const lbPairInfo = yield (program.account.lbPair.fetch(lbPair));
+                const lbPairInfo = yield program.account.lbPair.fetch(lbPair);
                 // =========================================================================
                 // Phase 1: Chunked claim (to ATA for re-deposit)
                 // =========================================================================
@@ -1573,9 +1648,18 @@ class Transactions {
                 // Phase 2: Chunked re-deposit back into the same position
                 // =========================================================================
                 const distributionToStrategyType = {
-                    'SPOT': liquidityStrategy_1.StrategyType.SPOT, 'SPOT-IMBALANCED': liquidityStrategy_1.StrategyType.SPOT, 'SPOT-ONE-SIDE': liquidityStrategy_1.StrategyType.SPOT, 'SPOT-BALANCED': liquidityStrategy_1.StrategyType.SPOT,
-                    'CURVE': liquidityStrategy_1.StrategyType.CURVE, 'CURVE-IMBALANCED': liquidityStrategy_1.StrategyType.CURVE, 'CURVE-ONE-SIDE': liquidityStrategy_1.StrategyType.CURVE, 'CURVE-BALANCED': liquidityStrategy_1.StrategyType.CURVE,
-                    'BID-ASK': liquidityStrategy_1.StrategyType.BID_ASK, 'BID-ASK-IMBALANCED': liquidityStrategy_1.StrategyType.BID_ASK, 'BID-ASK-ONE-SIDE': liquidityStrategy_1.StrategyType.BID_ASK, 'BID-ASK-BALANCED': liquidityStrategy_1.StrategyType.BID_ASK,
+                    SPOT: liquidityStrategy_1.StrategyType.SPOT,
+                    'SPOT-IMBALANCED': liquidityStrategy_1.StrategyType.SPOT,
+                    'SPOT-ONE-SIDE': liquidityStrategy_1.StrategyType.SPOT,
+                    'SPOT-BALANCED': liquidityStrategy_1.StrategyType.SPOT,
+                    CURVE: liquidityStrategy_1.StrategyType.CURVE,
+                    'CURVE-IMBALANCED': liquidityStrategy_1.StrategyType.CURVE,
+                    'CURVE-ONE-SIDE': liquidityStrategy_1.StrategyType.CURVE,
+                    'CURVE-BALANCED': liquidityStrategy_1.StrategyType.CURVE,
+                    'BID-ASK': liquidityStrategy_1.StrategyType.BID_ASK,
+                    'BID-ASK-IMBALANCED': liquidityStrategy_1.StrategyType.BID_ASK,
+                    'BID-ASK-ONE-SIDE': liquidityStrategy_1.StrategyType.BID_ASK,
+                    'BID-ASK-BALANCED': liquidityStrategy_1.StrategyType.BID_ASK,
                 };
                 const strategyType = (_c = distributionToStrategyType[(_b = params.distribution) !== null && _b !== void 0 ? _b : 'SPOT-IMBALANCED']) !== null && _c !== void 0 ? _c : liquidityStrategy_1.StrategyType.SPOT;
                 const { binId: activeId } = yield dlmmPool.dlmm.getActiveBin();
@@ -1646,7 +1730,7 @@ class Transactions {
                 bps: new bn_js_1.default(10000),
                 shouldClaimAndClose: true,
             }, hsToMeteora_1.meteoraToHawksightAutomationIxs);
-            if (!!params.useAta) {
+            if (params.useAta) {
                 removeLiquidityBuilder.replaceClaimFeeTokenToATA();
                 removeLiquidityBuilder.replaceClaimRewardToATA();
             }
@@ -1724,7 +1808,7 @@ class Transactions {
                     bps: new bn_js_1.default(10000),
                     shouldClaimAndClose: true,
                 }, hsToMeteora_1.meteoraToHawksightAutomationIxs);
-                if (!!params.useAta) {
+                if (params.useAta) {
                     removeLiquidityBuilder.replaceClaimFeeTokenToATA();
                     removeLiquidityBuilder.replaceClaimRewardToATA();
                 }
@@ -1793,7 +1877,13 @@ class Transactions {
                 // --- Validate and normalize layers ---
                 let layers;
                 if (params.distribution && !params.layers) {
-                    layers = [{ distribution: params.distribution, percentageX: 100, percentageY: 100 }];
+                    layers = [
+                        {
+                            distribution: params.distribution,
+                            percentageX: 100,
+                            percentageY: 100,
+                        },
+                    ];
                 }
                 else if (params.layers && !params.distribution) {
                     layers = params.layers;
@@ -1827,11 +1917,16 @@ class Transactions {
                 const tokenXMint = lbPairState.tokenXMint;
                 const tokenYMint = lbPairState.tokenYMint;
                 const rewardInfos = lbPairState.rewardInfos;
-                const tokenProgramMap = yield (0, functions_1.getTokenProgramMapForMints)(connection, [tokenXMint, tokenYMint]);
+                const tokenProgramMap = yield (0, functions_1.getTokenProgramMapForMints)(connection, [
+                    tokenXMint,
+                    tokenYMint,
+                ]);
                 const tokenXProgram = tokenProgramMap[tokenXMint.toString()];
                 const tokenYProgram = tokenProgramMap[tokenYMint.toString()];
                 const remainingAccountsInfo = yield (0, functions_1.fetchRemainingAccountsInfo)(connection, tokenXMint, tokenYMint, tokenXProgram, tokenYProgram);
-                const pdaTokenTypeForClaimables = params.useAta ? types_1.TokenType.ATA : types_1.TokenType.STA;
+                const pdaTokenTypeForClaimables = params.useAta
+                    ? types_1.TokenType.ATA
+                    : types_1.TokenType.STA;
                 // Estimate total X/Y from position data (liquidity + fees)
                 const estimatedTotalX = new bn_js_1.default(userPosition.positionData.totalXAmount).add(userPosition.positionData.feeX);
                 const estimatedTotalY = new bn_js_1.default(userPosition.positionData.totalYAmount).add(userPosition.positionData.feeY);
@@ -1842,7 +1937,10 @@ class Transactions {
                     userWallet: params.userWallet,
                     lbPair,
                     position: params.currentPosition,
-                    tokenXMint, tokenYMint, tokenXProgram, tokenYProgram,
+                    tokenXMint,
+                    tokenYMint,
+                    tokenXProgram,
+                    tokenYProgram,
                     fromBinId: currentLowerBinId,
                     toBinId: currentUpperBinId,
                     bpsToRemove: 10000,
@@ -1855,9 +1953,12 @@ class Transactions {
                     userWallet: params.userWallet,
                     lbPair,
                     position: params.currentPosition,
-                    tokenMintX: tokenXMint, tokenMintY: tokenYMint,
-                    tokenProgramX: tokenXProgram, tokenProgramY: tokenYProgram,
-                    lowerBinId: currentLowerBinId, upperBinId: currentUpperBinId,
+                    tokenMintX: tokenXMint,
+                    tokenMintY: tokenYMint,
+                    tokenProgramX: tokenXProgram,
+                    tokenProgramY: tokenYProgram,
+                    lowerBinId: currentLowerBinId,
+                    upperBinId: currentUpperBinId,
                     pdaTokenType: pdaTokenTypeForClaimables,
                     remainingAccountsInfo,
                 });
@@ -1878,7 +1979,8 @@ class Transactions {
                         rewardMint: rewardInfo.mint,
                         rewardVault: rewardInfo.vault,
                         tokenProgram: rewardTokenProgram,
-                        lowerBinId: currentLowerBinId, upperBinId: currentUpperBinId,
+                        lowerBinId: currentLowerBinId,
+                        upperBinId: currentUpperBinId,
                         pdaTokenType: types_1.TokenType.STA,
                         remainingAccountsInfo: rewardRemainingAccountsInfo,
                     });
@@ -1913,7 +2015,9 @@ class Transactions {
                         optionalTokenXAmount = undefined; // sweep remaining
                     }
                     else {
-                        optionalTokenXAmount = estimatedTotalX.mul(new bn_js_1.default(layer.percentageX)).div(new bn_js_1.default(100));
+                        optionalTokenXAmount = estimatedTotalX
+                            .mul(new bn_js_1.default(layer.percentageX))
+                            .div(new bn_js_1.default(100));
                     }
                     if (layer.percentageY === 0) {
                         optionalTokenYAmount = new bn_js_1.default(0);
@@ -1922,7 +2026,9 @@ class Transactions {
                         optionalTokenYAmount = undefined; // sweep remaining
                     }
                     else {
-                        optionalTokenYAmount = estimatedTotalY.mul(new bn_js_1.default(layer.percentageY)).div(new bn_js_1.default(100));
+                        optionalTokenYAmount = estimatedTotalY
+                            .mul(new bn_js_1.default(layer.percentageY))
+                            .div(new bn_js_1.default(100));
                     }
                     return { optionalTokenXAmount, optionalTokenYAmount };
                 };
@@ -1937,7 +2043,10 @@ class Transactions {
                     relativeLowerBinId: params.relativeBinRange.lowerRange,
                     relativeUpperBinId: params.relativeBinRange.upperRange,
                     strategyType: firstStrategyType,
-                    checkRange: { minBinId: params.checkRange.lowerRange, maxBinId: params.checkRange.upperRange },
+                    checkRange: {
+                        minBinId: params.checkRange.lowerRange,
+                        maxBinId: params.checkRange.upperRange,
+                    },
                     targetActiveBin: (_b = params.targetActiveBin) !== null && _b !== void 0 ? _b : undefined,
                     userTokenXAmount: firstAmounts.optionalTokenXAmount,
                     userTokenYAmount: firstAmounts.optionalTokenYAmount,
@@ -1958,7 +2067,10 @@ class Transactions {
                         userWallet: params.userWallet,
                         lbPair,
                         position: params.newPosition,
-                        tokenXMint, tokenYMint, tokenXProgram, tokenYProgram,
+                        tokenXMint,
+                        tokenYMint,
+                        tokenXProgram,
+                        tokenYProgram,
                         activeId: effectiveActiveId,
                         maxActiveBinSlippage: 0,
                         strategyParametersMinBinId: absLower,
@@ -2014,7 +2126,10 @@ class Transactions {
                 const tokenYMint = lbPairState.tokenYMint;
                 const rewardInfos = lbPairState.rewardInfos;
                 // Get token programs for each mint
-                const tokenProgramMap = yield (0, functions_1.getTokenProgramMapForMints)(connection, [tokenXMint, tokenYMint]);
+                const tokenProgramMap = yield (0, functions_1.getTokenProgramMapForMints)(connection, [
+                    tokenXMint,
+                    tokenYMint,
+                ]);
                 const tokenXProgram = tokenProgramMap[tokenXMint.toString()];
                 const tokenYProgram = tokenProgramMap[tokenYMint.toString()];
                 // Get position width
@@ -2026,7 +2141,9 @@ class Transactions {
                 // Fetch remainingAccountsInfo for Token2022 transfer hooks (if any)
                 const remainingAccountsInfo = yield (0, functions_1.fetchRemainingAccountsInfo)(connection, tokenXMint, tokenYMint, tokenXProgram, tokenYProgram);
                 // Whether to compound during rebalance, or nope.
-                const pdaTokenTypeForClaimables = params.useAta ? types_1.TokenType.ATA : types_1.TokenType.STA;
+                const pdaTokenTypeForClaimables = params.useAta
+                    ? types_1.TokenType.ATA
+                    : types_1.TokenType.STA;
                 const transactions = [];
                 // =========================================================================
                 // Group 1 consists of remove liquidity, claim fees/rewards, close position,
@@ -2262,7 +2379,10 @@ class Transactions {
                 const currentUpperBinId = userPosition.positionData.upperBinId;
                 const tokenXMint = lbPairState.tokenXMint;
                 const tokenYMint = lbPairState.tokenYMint;
-                const tokenProgramMap = yield (0, functions_1.getTokenProgramMapForMints)(connection, [tokenXMint, tokenYMint]);
+                const tokenProgramMap = yield (0, functions_1.getTokenProgramMapForMints)(connection, [
+                    tokenXMint,
+                    tokenYMint,
+                ]);
                 const tokenXProgram = tokenProgramMap[tokenXMint.toString()];
                 const tokenYProgram = tokenProgramMap[tokenYMint.toString()];
                 const remainingAccountsInfo = yield (0, functions_1.fetchRemainingAccountsInfo)(connection, tokenXMint, tokenYMint, tokenXProgram, tokenYProgram);
@@ -2292,9 +2412,18 @@ class Transactions {
                     totalYAmount: acc.totalYAmount.add(new bn_js_1.default(bin.positionYAmount)),
                 }), { totalXAmount: new bn_js_1.default(0), totalYAmount: new bn_js_1.default(0) });
                 const distributionToStrategyType = {
-                    'SPOT': liquidityStrategy_1.StrategyType.SPOT, 'SPOT-IMBALANCED': liquidityStrategy_1.StrategyType.SPOT, 'SPOT-ONE-SIDE': liquidityStrategy_1.StrategyType.SPOT, 'SPOT-BALANCED': liquidityStrategy_1.StrategyType.SPOT,
-                    'CURVE': liquidityStrategy_1.StrategyType.CURVE, 'CURVE-IMBALANCED': liquidityStrategy_1.StrategyType.CURVE, 'CURVE-ONE-SIDE': liquidityStrategy_1.StrategyType.CURVE, 'CURVE-BALANCED': liquidityStrategy_1.StrategyType.CURVE,
-                    'BID-ASK': liquidityStrategy_1.StrategyType.BID_ASK, 'BID-ASK-IMBALANCED': liquidityStrategy_1.StrategyType.BID_ASK, 'BID-ASK-ONE-SIDE': liquidityStrategy_1.StrategyType.BID_ASK, 'BID-ASK-BALANCED': liquidityStrategy_1.StrategyType.BID_ASK,
+                    SPOT: liquidityStrategy_1.StrategyType.SPOT,
+                    'SPOT-IMBALANCED': liquidityStrategy_1.StrategyType.SPOT,
+                    'SPOT-ONE-SIDE': liquidityStrategy_1.StrategyType.SPOT,
+                    'SPOT-BALANCED': liquidityStrategy_1.StrategyType.SPOT,
+                    CURVE: liquidityStrategy_1.StrategyType.CURVE,
+                    'CURVE-IMBALANCED': liquidityStrategy_1.StrategyType.CURVE,
+                    'CURVE-ONE-SIDE': liquidityStrategy_1.StrategyType.CURVE,
+                    'CURVE-BALANCED': liquidityStrategy_1.StrategyType.CURVE,
+                    'BID-ASK': liquidityStrategy_1.StrategyType.BID_ASK,
+                    'BID-ASK-IMBALANCED': liquidityStrategy_1.StrategyType.BID_ASK,
+                    'BID-ASK-ONE-SIDE': liquidityStrategy_1.StrategyType.BID_ASK,
+                    'BID-ASK-BALANCED': liquidityStrategy_1.StrategyType.BID_ASK,
                 };
                 const strategyType = (_b = distributionToStrategyType[params.distribution]) !== null && _b !== void 0 ? _b : liquidityStrategy_1.StrategyType.SPOT;
                 // Deposit using chunked rebalanceLiquidityAutomation (handles >70 bins)
@@ -2387,16 +2516,30 @@ class Transactions {
                 const tokenXMint = lbPairState.tokenXMint;
                 const tokenYMint = lbPairState.tokenYMint;
                 const rewardInfos = lbPairState.rewardInfos;
-                const tokenProgramMap = yield (0, functions_1.getTokenProgramMapForMints)(connection, [tokenXMint, tokenYMint]);
+                const tokenProgramMap = yield (0, functions_1.getTokenProgramMapForMints)(connection, [
+                    tokenXMint,
+                    tokenYMint,
+                ]);
                 const tokenXProgram = tokenProgramMap[tokenXMint.toString()];
                 const tokenYProgram = tokenProgramMap[tokenYMint.toString()];
                 const remainingAccountsInfo = yield (0, functions_1.fetchRemainingAccountsInfo)(connection, tokenXMint, tokenYMint, tokenXProgram, tokenYProgram);
-                const pdaTokenTypeForClaimables = params.useAta ? types_1.TokenType.ATA : types_1.TokenType.STA;
+                const pdaTokenTypeForClaimables = params.useAta
+                    ? types_1.TokenType.ATA
+                    : types_1.TokenType.STA;
                 const { binId: activeId } = yield dlmmPool.dlmm.getActiveBin();
                 const distributionToStrategyType = {
-                    'SPOT': liquidityStrategy_1.StrategyType.SPOT, 'SPOT-IMBALANCED': liquidityStrategy_1.StrategyType.SPOT, 'SPOT-ONE-SIDE': liquidityStrategy_1.StrategyType.SPOT, 'SPOT-BALANCED': liquidityStrategy_1.StrategyType.SPOT,
-                    'CURVE': liquidityStrategy_1.StrategyType.CURVE, 'CURVE-IMBALANCED': liquidityStrategy_1.StrategyType.CURVE, 'CURVE-ONE-SIDE': liquidityStrategy_1.StrategyType.CURVE, 'CURVE-BALANCED': liquidityStrategy_1.StrategyType.CURVE,
-                    'BID-ASK': liquidityStrategy_1.StrategyType.BID_ASK, 'BID-ASK-IMBALANCED': liquidityStrategy_1.StrategyType.BID_ASK, 'BID-ASK-ONE-SIDE': liquidityStrategy_1.StrategyType.BID_ASK, 'BID-ASK-BALANCED': liquidityStrategy_1.StrategyType.BID_ASK,
+                    SPOT: liquidityStrategy_1.StrategyType.SPOT,
+                    'SPOT-IMBALANCED': liquidityStrategy_1.StrategyType.SPOT,
+                    'SPOT-ONE-SIDE': liquidityStrategy_1.StrategyType.SPOT,
+                    'SPOT-BALANCED': liquidityStrategy_1.StrategyType.SPOT,
+                    CURVE: liquidityStrategy_1.StrategyType.CURVE,
+                    'CURVE-IMBALANCED': liquidityStrategy_1.StrategyType.CURVE,
+                    'CURVE-ONE-SIDE': liquidityStrategy_1.StrategyType.CURVE,
+                    'CURVE-BALANCED': liquidityStrategy_1.StrategyType.CURVE,
+                    'BID-ASK': liquidityStrategy_1.StrategyType.BID_ASK,
+                    'BID-ASK-IMBALANCED': liquidityStrategy_1.StrategyType.BID_ASK,
+                    'BID-ASK-ONE-SIDE': liquidityStrategy_1.StrategyType.BID_ASK,
+                    'BID-ASK-BALANCED': liquidityStrategy_1.StrategyType.BID_ASK,
                 };
                 const strategyType = (_b = distributionToStrategyType[params.distribution]) !== null && _b !== void 0 ? _b : liquidityStrategy_1.StrategyType.SPOT;
                 // =========================================================================
@@ -2408,7 +2551,10 @@ class Transactions {
                     userWallet: params.userWallet,
                     lbPair,
                     position: params.currentPosition,
-                    tokenXMint, tokenYMint, tokenXProgram, tokenYProgram,
+                    tokenXMint,
+                    tokenYMint,
+                    tokenXProgram,
+                    tokenYProgram,
                     fromBinId: currentLowerBinId,
                     toBinId: currentUpperBinId,
                     bpsToRemove: 10000,
@@ -2420,9 +2566,12 @@ class Transactions {
                     userWallet: params.userWallet,
                     lbPair,
                     position: params.currentPosition,
-                    tokenMintX: tokenXMint, tokenMintY: tokenYMint,
-                    tokenProgramX: tokenXProgram, tokenProgramY: tokenYProgram,
-                    lowerBinId: currentLowerBinId, upperBinId: currentUpperBinId,
+                    tokenMintX: tokenXMint,
+                    tokenMintY: tokenYMint,
+                    tokenProgramX: tokenXProgram,
+                    tokenProgramY: tokenYProgram,
+                    lowerBinId: currentLowerBinId,
+                    upperBinId: currentUpperBinId,
                     pdaTokenType: pdaTokenTypeForClaimables,
                     remainingAccountsInfo,
                 });
@@ -2442,7 +2591,8 @@ class Transactions {
                         rewardMint: rewardInfo.mint,
                         rewardVault: rewardInfo.vault,
                         tokenProgram: rewardTokenProgram,
-                        lowerBinId: currentLowerBinId, upperBinId: currentUpperBinId,
+                        lowerBinId: currentLowerBinId,
+                        upperBinId: currentUpperBinId,
                         pdaTokenType: types_1.TokenType.STA,
                         remainingAccountsInfo: rewardRemainingAccountsInfo,
                     });
@@ -2503,7 +2653,10 @@ class Transactions {
                     userWallet: params.userWallet,
                     lbPair,
                     position: params.newPosition,
-                    tokenXMint, tokenYMint, tokenXProgram, tokenYProgram,
+                    tokenXMint,
+                    tokenYMint,
+                    tokenXProgram,
+                    tokenYProgram,
                     lowerBinId: newLowerBinId,
                     upperBinId: newUpperBinId,
                     strategyType,
@@ -2574,13 +2727,21 @@ class Transactions {
                 const currentBinCount = currentUpperBinId - currentLowerBinId + 1;
                 // For ≤70 bins, delegate to existing rebalanceSmallPositionAutomation
                 if (currentBinCount <= 70 && params.width <= 70) {
-                    return this.rebalanceSmallPositionAutomation({ connection, params, fetch: undefined });
+                    return this.rebalanceSmallPositionAutomation({
+                        connection,
+                        params,
+                        fetch: undefined,
+                    });
                 }
                 // For ≤149 target bins, use phased approach (separate withdraw/deposit TXs).
                 // Only the target width is constrained (deposit must fit in one 149-bin chunk).
                 // The withdraw TX handles any current position size via full-range removeLiquidity.
                 if (params.width <= 149) {
-                    return this.rebalancePhasedPositionAutomation({ connection, params, fetch: undefined });
+                    return this.rebalancePhasedPositionAutomation({
+                        connection,
+                        params,
+                        fetch: undefined,
+                    });
                 }
                 // ≥150 bins: multi-TX chunked approach
                 const dlmmPool = yield meteora_1.MeteoraDLMM.create(connection, lbPair, this.ix);
@@ -2600,21 +2761,35 @@ class Transactions {
                 const tokenXMint = lbPairState.tokenXMint;
                 const tokenYMint = lbPairState.tokenYMint;
                 const rewardInfos = lbPairState.rewardInfos;
-                const tokenProgramMap = yield (0, functions_1.getTokenProgramMapForMints)(connection, [tokenXMint, tokenYMint]);
+                const tokenProgramMap = yield (0, functions_1.getTokenProgramMapForMints)(connection, [
+                    tokenXMint,
+                    tokenYMint,
+                ]);
                 const tokenXProgram = tokenProgramMap[tokenXMint.toString()];
                 const tokenYProgram = tokenProgramMap[tokenYMint.toString()];
                 const remainingAccountsInfo = yield (0, functions_1.fetchRemainingAccountsInfo)(connection, tokenXMint, tokenYMint, tokenXProgram, tokenYProgram);
-                const lbPairInfo = yield (program.account.lbPair.fetch(lbPair));
+                const lbPairInfo = yield program.account.lbPair.fetch(lbPair);
                 // Whether to compound during rebalance, or nope.
-                const pdaTokenTypeForClaimables = params.useAta ? types_1.TokenType.ATA : types_1.TokenType.STA;
+                const pdaTokenTypeForClaimables = params.useAta
+                    ? types_1.TokenType.ATA
+                    : types_1.TokenType.STA;
                 // =========================================================================
                 // Merged approach: withdraw + init/extend + deposit per TX (~74-bins each)
                 // =========================================================================
                 const { binId: activeId } = yield dlmmPool.dlmm.getActiveBin();
                 const distributionToStrategyType = {
-                    'SPOT': liquidityStrategy_1.StrategyType.SPOT, 'SPOT-IMBALANCED': liquidityStrategy_1.StrategyType.SPOT, 'SPOT-ONE-SIDE': liquidityStrategy_1.StrategyType.SPOT, 'SPOT-BALANCED': liquidityStrategy_1.StrategyType.SPOT,
-                    'CURVE': liquidityStrategy_1.StrategyType.CURVE, 'CURVE-IMBALANCED': liquidityStrategy_1.StrategyType.CURVE, 'CURVE-ONE-SIDE': liquidityStrategy_1.StrategyType.CURVE, 'CURVE-BALANCED': liquidityStrategy_1.StrategyType.CURVE,
-                    'BID-ASK': liquidityStrategy_1.StrategyType.BID_ASK, 'BID-ASK-IMBALANCED': liquidityStrategy_1.StrategyType.BID_ASK, 'BID-ASK-ONE-SIDE': liquidityStrategy_1.StrategyType.BID_ASK, 'BID-ASK-BALANCED': liquidityStrategy_1.StrategyType.BID_ASK,
+                    SPOT: liquidityStrategy_1.StrategyType.SPOT,
+                    'SPOT-IMBALANCED': liquidityStrategy_1.StrategyType.SPOT,
+                    'SPOT-ONE-SIDE': liquidityStrategy_1.StrategyType.SPOT,
+                    'SPOT-BALANCED': liquidityStrategy_1.StrategyType.SPOT,
+                    CURVE: liquidityStrategy_1.StrategyType.CURVE,
+                    'CURVE-IMBALANCED': liquidityStrategy_1.StrategyType.CURVE,
+                    'CURVE-ONE-SIDE': liquidityStrategy_1.StrategyType.CURVE,
+                    'CURVE-BALANCED': liquidityStrategy_1.StrategyType.CURVE,
+                    'BID-ASK': liquidityStrategy_1.StrategyType.BID_ASK,
+                    'BID-ASK-IMBALANCED': liquidityStrategy_1.StrategyType.BID_ASK,
+                    'BID-ASK-ONE-SIDE': liquidityStrategy_1.StrategyType.BID_ASK,
+                    'BID-ASK-BALANCED': liquidityStrategy_1.StrategyType.BID_ASK,
                 };
                 const strategyType = (_b = distributionToStrategyType[params.distribution]) !== null && _b !== void 0 ? _b : liquidityStrategy_1.StrategyType.SPOT;
                 const binStep = new bn_js_1.default(dlmmPool.dlmm.lbPair.binStep);
@@ -2641,7 +2816,7 @@ class Transactions {
                     activeId,
                     totalXAmount,
                     totalYAmount,
-                    chunkSize: 73
+                    chunkSize: 73,
                 });
                 // Wrap each instruction array with createTransactionMeta
                 const transactions = [];
@@ -2698,7 +2873,10 @@ class Transactions {
             const lbPairState = dlmmPool.dlmm.lbPair;
             const tokenXMint = lbPairState.tokenXMint;
             const tokenYMint = lbPairState.tokenYMint;
-            const tokenProgramMap = yield (0, functions_1.getTokenProgramMapForMints)(connection, [tokenXMint, tokenYMint]);
+            const tokenProgramMap = yield (0, functions_1.getTokenProgramMapForMints)(connection, [
+                tokenXMint,
+                tokenYMint,
+            ]);
             const tokenXProgram = tokenProgramMap[tokenXMint.toString()];
             const tokenYProgram = tokenProgramMap[tokenYMint.toString()];
             // Fetch transfer hook accounts for token X and Y (Token2022 support)
@@ -2711,8 +2889,14 @@ class Transactions {
             // Always add TransferHookX and TransferHookY slices (even if length=0)
             const xSlice = baseRemainingAccountsInfo.slices.find(s => s.accountsType === types_1.RemainingAccountsType.TransferHookX);
             const ySlice = baseRemainingAccountsInfo.slices.find(s => s.accountsType === types_1.RemainingAccountsType.TransferHookY);
-            combinedSlices.push({ accountsType: types_1.RemainingAccountsType.TransferHookX, length: (_b = xSlice === null || xSlice === void 0 ? void 0 : xSlice.length) !== null && _b !== void 0 ? _b : 0 });
-            combinedSlices.push({ accountsType: types_1.RemainingAccountsType.TransferHookY, length: (_c = ySlice === null || ySlice === void 0 ? void 0 : ySlice.length) !== null && _c !== void 0 ? _c : 0 });
+            combinedSlices.push({
+                accountsType: types_1.RemainingAccountsType.TransferHookX,
+                length: (_b = xSlice === null || xSlice === void 0 ? void 0 : xSlice.length) !== null && _b !== void 0 ? _b : 0,
+            });
+            combinedSlices.push({
+                accountsType: types_1.RemainingAccountsType.TransferHookY,
+                length: (_c = ySlice === null || ySlice === void 0 ? void 0 : ySlice.length) !== null && _c !== void 0 ? _c : 0,
+            });
             // Add transfer hook accounts from base (for X and Y)
             combinedAccounts.push(...baseRemainingAccountsInfo.accounts);
             const remainingAccountsInfo = {
@@ -2720,12 +2904,16 @@ class Transactions {
                 accounts: combinedAccounts,
             };
             return {
-                instructions: [yield this.ix.meteoraDlmm.rebalanceLiquidityAutomation({
+                instructions: [
+                    yield this.ix.meteoraDlmm.rebalanceLiquidityAutomation({
                         connection,
                         userWallet: params.userWallet,
                         position: params.position,
                         lbPair: params.lbPair,
-                        tokenXMint, tokenYMint, tokenXProgram, tokenYProgram,
+                        tokenXMint,
+                        tokenYMint,
+                        tokenXProgram,
+                        tokenYProgram,
                         activeId: params.activeId,
                         pdaTokenType: types_1.TokenType.ATA,
                         maxActiveBinSlippage: 0,
@@ -2739,7 +2927,8 @@ class Transactions {
                         addLiquidityParams: params.addLiquidityParams,
                         shrinkMode: types_3.ShrinkMode.NoShrinkBoth,
                         remainingAccountsInfo,
-                    })],
+                    }),
+                ],
                 labels: ['rebalance_liquidity'],
             };
         });
@@ -2906,7 +3095,7 @@ class Transactions {
                 // Add liquidity via rebalanceLiquidityAutomation
                 // Use u64::MAX for maxDeposit amounts so they don't cap the deposit.
                 // The on-chain program uses ATA balance for actual amounts; these are just safety ceilings.
-                const U64_MAX = new bn_js_1.default("18446744073709551615");
+                const U64_MAX = new bn_js_1.default('18446744073709551615');
                 const depositIx = yield this.ix.meteoraDlmm.rebalanceLiquidityAutomation({
                     connection,
                     userWallet,
@@ -2926,7 +3115,8 @@ class Transactions {
                     minWithdrawYAmount: new bn_js_1.default(0),
                     maxDepositYAmount: U64_MAX,
                     removeLiquidityParams: [],
-                    addLiquidityParams: [{
+                    addLiquidityParams: [
+                        {
                             minDeltaId: chunk.minDeltaId.toNumber(),
                             maxDeltaId: chunk.maxDeltaId.toNumber(),
                             x0: onChainParams.x0,
@@ -2935,7 +3125,8 @@ class Transactions {
                             deltaY: onChainParams.deltaY,
                             bitFlag: onChainParams.bitFlag,
                             favorXInActiveId,
-                        }],
+                        },
+                    ],
                 });
                 instructions.push(depositIx);
                 txInstructions.push(instructions);
@@ -3036,7 +3227,7 @@ class Transactions {
                 // === Withdraw from old position ===
                 if (i < oldChunks.length) {
                     const chunk = oldChunks[i];
-                    const isLastOldChunk = (i === oldChunks.length - 1);
+                    const isLastOldChunk = i === oldChunks.length - 1;
                     const removeLiquidityIx = yield this.ix.meteoraDlmm.removeLiquidityByRange2Automation({
                         connection,
                         userWallet,
@@ -3125,7 +3316,8 @@ class Transactions {
                         minWithdrawYAmount: new bn_js_1.default(0),
                         maxDepositYAmount: chunk.maxAmountY,
                         removeLiquidityParams: [],
-                        addLiquidityParams: [{
+                        addLiquidityParams: [
+                            {
                                 minDeltaId: chunk.minDeltaId.toNumber(),
                                 maxDeltaId: chunk.maxDeltaId.toNumber(),
                                 x0: onChainParams.x0,
@@ -3134,7 +3326,8 @@ class Transactions {
                                 deltaY: onChainParams.deltaY,
                                 bitFlag: onChainParams.bitFlag,
                                 favorXInActiveId,
-                            }],
+                            },
+                        ],
                     });
                     instructions.push(depositIx);
                 }
@@ -3180,7 +3373,7 @@ class Transactions {
     }
     relativeOpenAutomationIx(_a) {
         return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
-            const { userWallet, pool, position, relativeBinRange, checkRange, distribution, targetActiveBin, fuelAccount, pdaTokenType, userTokenXAmount, userTokenYAmount } = params;
+            const { userWallet, pool, position, relativeBinRange, checkRange, distribution, targetActiveBin, fuelAccount, pdaTokenType, userTokenXAmount, userTokenYAmount, } = params;
             const openParams = {
                 userWallet,
                 lbPair: pool,
@@ -3277,8 +3470,7 @@ class Transactions {
             catch (error) {
                 throw new Error(`Failed to generate bin IDs for position (lowerBinId: ${position.lowerBinId}, upperBinId: ${position.upperBinId}): ${error}`);
             }
-            const totalLiquidity = position.liquidityShares
-                .reduce((acc, bn) => acc.add(bn), new bn_js_1.default(0));
+            const totalLiquidity = position.liquidityShares.reduce((acc, bn) => acc.add(bn), new bn_js_1.default(0));
             let mainInstructions;
             if (totalLiquidity.gt(new bn_js_1.default(0))) {
                 let removeLiquidityBuilder;
@@ -3298,9 +3490,7 @@ class Transactions {
                     throw new Error(`Failed to generate remove liquidity from position tx ${params.position}: ${error}`);
                 }
                 try {
-                    mainInstructions = [
-                        ...removeLiquidityBuilder.mainIxs,
-                    ];
+                    mainInstructions = [...removeLiquidityBuilder.mainIxs];
                 }
                 catch (error) {
                     throw new Error(`Failed to build main instructions: ${error}`);
@@ -3311,7 +3501,10 @@ class Transactions {
                 const tokenXMint = lbPairState.tokenXMint;
                 const tokenYMint = lbPairState.tokenYMint;
                 const rewardInfos = lbPairState.rewardInfos;
-                const tokenProgramMap = yield (0, functions_1.getTokenProgramMapForMints)(connection, [tokenXMint, tokenYMint]);
+                const tokenProgramMap = yield (0, functions_1.getTokenProgramMapForMints)(connection, [
+                    tokenXMint,
+                    tokenYMint,
+                ]);
                 const tokenXProgram = tokenProgramMap[tokenXMint.toString()];
                 const tokenYProgram = tokenProgramMap[tokenYMint.toString()];
                 const remainingAccountsInfo = yield (0, functions_1.fetchRemainingAccountsInfo)(connection, tokenXMint, tokenYMint, tokenXProgram, tokenYProgram);
@@ -3401,7 +3594,7 @@ class Transactions {
                 const iyfProgram = addresses_1.IYF_MAIN;
                 const hawksightAuthority = addresses_1.HS_AUTHORITY;
                 const { params: _params, data: chunkData } = this.removeLiquidityByRange2Info(ixs);
-                let { position: _position, lbPair, binArrayBitmapExtension, reserveX, reserveY, tokenXMint, tokenYMint, sender, tokenXProgram, tokenYProgram, memoProgram, eventAuthority, program: meteoraDlmmProgram, binArrays: _binArrays, } = _params;
+                const { position: _position, lbPair, binArrayBitmapExtension, reserveX, reserveY, tokenXMint, tokenYMint, sender, tokenXProgram, tokenYProgram, memoProgram, eventAuthority, program: meteoraDlmmProgram, binArrays: _binArrays, } = _params;
                 // Reconstruct param data with full position range (not just first chunk)
                 const fromBinIdBuf = Buffer.alloc(4);
                 fromBinIdBuf.writeInt32LE(position.lowerBinId, 0);
@@ -3410,7 +3603,12 @@ class Transactions {
                 const bpsBuf = Buffer.alloc(2);
                 bpsBuf.writeUInt16LE(10000, 0);
                 const remainingAccountsInfoBytes = chunkData.length > 10 ? chunkData.slice(10) : Buffer.alloc(0);
-                const data = Buffer.concat([fromBinIdBuf, toBinIdBuf, bpsBuf, remainingAccountsInfoBytes]);
+                const data = Buffer.concat([
+                    fromBinIdBuf,
+                    toBinIdBuf,
+                    bpsBuf,
+                    remainingAccountsInfoBytes,
+                ]);
                 // Derive bin arrays for the full position range
                 const binArrays = this.ix.pda.meteora.deriveBinArrays(lbPair.pubkey, position.lowerBinId, position.upperBinId);
                 let ix;
@@ -3501,7 +3699,7 @@ class Transactions {
     }
     limitCloseAutomationIx2(_a) {
         return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
-            return errors_1.UniversalErrorHandler.catchErrorsAsync(`limitCloseAutomationIx2`, () => __awaiter(this, void 0, void 0, function* () {
+            return errors_1.UniversalErrorHandler.catchErrorsAsync('limitCloseAutomationIx2', () => __awaiter(this, void 0, void 0, function* () {
                 const program = yield errors_1.AppError.handleErrorAsync(() => __awaiter(this, void 0, void 0, function* () { return yield meteora_1.MeteoraDLMM.program(connection); }));
                 const position = yield errors_1.AppError.handleErrorAsync(() => __awaiter(this, void 0, void 0, function* () { return yield program.account.positionV2.fetch(params.position); }));
                 const dlmmPool = yield errors_1.AppError.handleErrorAsync(() => __awaiter(this, void 0, void 0, function* () { return yield meteora_1.MeteoraDLMM.create(connection, position.lbPair, this.ix); }));
@@ -3524,7 +3722,7 @@ class Transactions {
                 const iyfProgram = addresses_1.IYF_MAIN;
                 const hawksightAuthority = addresses_1.HS_AUTHORITY;
                 const { params: _params, data: chunkData } = this.removeLiquidityByRange2Info(ixs);
-                let { position: _position, lbPair, binArrayBitmapExtension, reserveX, reserveY, tokenXMint, tokenYMint, sender, tokenXProgram, tokenYProgram, memoProgram, eventAuthority, program: meteoraDlmmProgram, binArrays: _binArrays, } = _params;
+                const { position: _position, lbPair, binArrayBitmapExtension, reserveX, reserveY, tokenXMint, tokenYMint, sender, tokenXProgram, tokenYProgram, memoProgram, eventAuthority, program: meteoraDlmmProgram, binArrays: _binArrays, } = _params;
                 // Reconstruct param data with full position range (not just first chunk)
                 const fromBinIdBuf = Buffer.alloc(4);
                 fromBinIdBuf.writeInt32LE(position.lowerBinId, 0);
@@ -3533,7 +3731,12 @@ class Transactions {
                 const bpsBuf = Buffer.alloc(2);
                 bpsBuf.writeUInt16LE(10000, 0);
                 const remainingAccountsInfoBytes = chunkData.length > 10 ? chunkData.slice(10) : Buffer.alloc(0);
-                const data = Buffer.concat([fromBinIdBuf, toBinIdBuf, bpsBuf, remainingAccountsInfoBytes]);
+                const data = Buffer.concat([
+                    fromBinIdBuf,
+                    toBinIdBuf,
+                    bpsBuf,
+                    remainingAccountsInfoBytes,
+                ]);
                 // Derive bin arrays for the full position range
                 const binArrays = this.ix.pda.meteora.deriveBinArrays(lbPair.pubkey, position.lowerBinId, position.upperBinId);
                 let ix;
@@ -3650,7 +3853,7 @@ class Transactions {
                 };
             }
         }
-        throw new Error(`Unexpected error: Cannot find "RemoveLiquidityByRange" or "RemoveLiquidityByRange2" instruction from instructions`);
+        throw new Error('Unexpected error: Cannot find "RemoveLiquidityByRange" or "RemoveLiquidityByRange2" instruction from instructions');
     }
     removeLiquidityByRange2Info(ixs) {
         for (const ix of ixs) {
@@ -3681,7 +3884,7 @@ class Transactions {
                 };
             }
         }
-        throw new Error(`Unexpected error: Cannot find "RemoveLiquidityByRange" or "RemoveLiquidityByRange2" instruction from instructions`);
+        throw new Error('Unexpected error: Cannot find "RemoveLiquidityByRange" or "RemoveLiquidityByRange2" instruction from instructions');
     }
     /**
      * Creates a large position with more than 69 bins.
@@ -3760,7 +3963,10 @@ class Transactions {
     }
     meteoraInitializeLargePosition(_a) {
         return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
-            const txInstructions = yield this._meteoraInitializeLargePosition({ connection, params });
+            const txInstructions = yield this._meteoraInitializeLargePosition({
+                connection,
+                params,
+            });
             const transactions = [];
             for (const instructions of txInstructions) {
                 transactions.push(yield (0, functions_1.createTransactionMeta2)({
@@ -3846,7 +4052,7 @@ class Transactions {
                 })).map(ix => {
                     return {
                         instruction: ix,
-                        label: `Initialize bin arrays for bins ${chunk.lowerBinId} to ${chunk.upperBinId}`
+                        label: `Initialize bin arrays for bins ${chunk.lowerBinId} to ${chunk.upperBinId}`,
                     };
                 });
                 instructions.push(...initBinArraysIx);
@@ -3871,7 +4077,8 @@ class Transactions {
                     minWithdrawYAmount: new bn_js_1.default(0),
                     maxDepositYAmount: chunk.maxAmountY,
                     removeLiquidityParams: [], // No removal
-                    addLiquidityParams: [{
+                    addLiquidityParams: [
+                        {
                             minDeltaId: chunk.minDeltaId.toNumber(),
                             maxDeltaId: chunk.maxDeltaId.toNumber(),
                             x0: onChainParams.x0,
@@ -3880,11 +4087,12 @@ class Transactions {
                             deltaY: onChainParams.deltaY,
                             bitFlag: onChainParams.bitFlag,
                             favorXInActiveId,
-                        }],
+                        },
+                    ],
                 });
                 instructions.push({
                     instruction: depositIx,
-                    label: `Deposit liquidity to bins ${chunk.lowerBinId} to ${chunk.upperBinId} via rebalanceLiquidity`
+                    label: `Deposit liquidity to bins ${chunk.lowerBinId} to ${chunk.upperBinId} via rebalanceLiquidity`,
                 });
                 txInstructions.push(instructions);
             }
@@ -3946,17 +4154,31 @@ class Transactions {
             const lbPairState = dlmmPool.dlmm.lbPair;
             const tokenXMint = lbPairState.tokenXMint;
             const tokenYMint = lbPairState.tokenYMint;
-            const tokenProgramMap = yield (0, functions_1.getTokenProgramMapForMints)(connection, [tokenXMint, tokenYMint]);
+            const tokenProgramMap = yield (0, functions_1.getTokenProgramMapForMints)(connection, [
+                tokenXMint,
+                tokenYMint,
+            ]);
             const tokenXProgram = tokenProgramMap[tokenXMint.toString()];
             const tokenYProgram = tokenProgramMap[tokenYMint.toString()];
             // Convert Distribution to liquidityStrategy.StrategyType
             const distributionToStrategyType = {
-                'SPOT': liquidityStrategy_1.StrategyType.SPOT, 'SPOT-IMBALANCED': liquidityStrategy_1.StrategyType.SPOT, 'SPOT-ONE-SIDE': liquidityStrategy_1.StrategyType.SPOT, 'SPOT-BALANCED': liquidityStrategy_1.StrategyType.SPOT,
-                'CURVE': liquidityStrategy_1.StrategyType.CURVE, 'CURVE-IMBALANCED': liquidityStrategy_1.StrategyType.CURVE, 'CURVE-ONE-SIDE': liquidityStrategy_1.StrategyType.CURVE, 'CURVE-BALANCED': liquidityStrategy_1.StrategyType.CURVE,
-                'BID-ASK': liquidityStrategy_1.StrategyType.BID_ASK, 'BID-ASK-IMBALANCED': liquidityStrategy_1.StrategyType.BID_ASK, 'BID-ASK-ONE-SIDE': liquidityStrategy_1.StrategyType.BID_ASK, 'BID-ASK-BALANCED': liquidityStrategy_1.StrategyType.BID_ASK,
+                SPOT: liquidityStrategy_1.StrategyType.SPOT,
+                'SPOT-IMBALANCED': liquidityStrategy_1.StrategyType.SPOT,
+                'SPOT-ONE-SIDE': liquidityStrategy_1.StrategyType.SPOT,
+                'SPOT-BALANCED': liquidityStrategy_1.StrategyType.SPOT,
+                CURVE: liquidityStrategy_1.StrategyType.CURVE,
+                'CURVE-IMBALANCED': liquidityStrategy_1.StrategyType.CURVE,
+                'CURVE-ONE-SIDE': liquidityStrategy_1.StrategyType.CURVE,
+                'CURVE-BALANCED': liquidityStrategy_1.StrategyType.CURVE,
+                'BID-ASK': liquidityStrategy_1.StrategyType.BID_ASK,
+                'BID-ASK-IMBALANCED': liquidityStrategy_1.StrategyType.BID_ASK,
+                'BID-ASK-ONE-SIDE': liquidityStrategy_1.StrategyType.BID_ASK,
+                'BID-ASK-BALANCED': liquidityStrategy_1.StrategyType.BID_ASK,
             };
             const strategyType = (_b = distributionToStrategyType[params.distribution]) !== null && _b !== void 0 ? _b : liquidityStrategy_1.StrategyType.SPOT;
-            const txInstructions = yield this._meteoraDepositToLargePosition({ connection, params: {
+            const txInstructions = yield this._meteoraDepositToLargePosition({
+                connection,
+                params: {
                     userWallet: params.userWallet,
                     lbPair,
                     position: params.position,
@@ -3970,7 +4192,8 @@ class Transactions {
                     totalYAmount: params.totalYAmount,
                     strategyType,
                     pdaTokenType: params.pdaTokenType,
-                } });
+                },
+            });
             const transactions = [];
             for (let i = 0; i < txInstructions.length; i++) {
                 transactions.push(yield (0, functions_1.createTransactionMeta2)({
@@ -4018,15 +4241,24 @@ class Transactions {
                         payer: params.userWallet,
                         addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
                         mainInstructions: [...mainInstructions],
-                    })
+                    }),
                 ];
             }
             // ≥150 bins: multi-tx path
             // Convert Distribution string to liquidityStrategy.StrategyType number for chunked deposit
             const distributionToStrategyType = {
-                'SPOT': liquidityStrategy_1.StrategyType.SPOT, 'SPOT-IMBALANCED': liquidityStrategy_1.StrategyType.SPOT, 'SPOT-ONE-SIDE': liquidityStrategy_1.StrategyType.SPOT, 'SPOT-BALANCED': liquidityStrategy_1.StrategyType.SPOT,
-                'CURVE': liquidityStrategy_1.StrategyType.CURVE, 'CURVE-IMBALANCED': liquidityStrategy_1.StrategyType.CURVE, 'CURVE-ONE-SIDE': liquidityStrategy_1.StrategyType.CURVE, 'CURVE-BALANCED': liquidityStrategy_1.StrategyType.CURVE,
-                'BID-ASK': liquidityStrategy_1.StrategyType.BID_ASK, 'BID-ASK-IMBALANCED': liquidityStrategy_1.StrategyType.BID_ASK, 'BID-ASK-ONE-SIDE': liquidityStrategy_1.StrategyType.BID_ASK, 'BID-ASK-BALANCED': liquidityStrategy_1.StrategyType.BID_ASK,
+                SPOT: liquidityStrategy_1.StrategyType.SPOT,
+                'SPOT-IMBALANCED': liquidityStrategy_1.StrategyType.SPOT,
+                'SPOT-ONE-SIDE': liquidityStrategy_1.StrategyType.SPOT,
+                'SPOT-BALANCED': liquidityStrategy_1.StrategyType.SPOT,
+                CURVE: liquidityStrategy_1.StrategyType.CURVE,
+                'CURVE-IMBALANCED': liquidityStrategy_1.StrategyType.CURVE,
+                'CURVE-ONE-SIDE': liquidityStrategy_1.StrategyType.CURVE,
+                'CURVE-BALANCED': liquidityStrategy_1.StrategyType.CURVE,
+                'BID-ASK': liquidityStrategy_1.StrategyType.BID_ASK,
+                'BID-ASK-IMBALANCED': liquidityStrategy_1.StrategyType.BID_ASK,
+                'BID-ASK-ONE-SIDE': liquidityStrategy_1.StrategyType.BID_ASK,
+                'BID-ASK-BALANCED': liquidityStrategy_1.StrategyType.BID_ASK,
             };
             const strategyType = (_b = distributionToStrategyType[params.distribution]) !== null && _b !== void 0 ? _b : liquidityStrategy_1.StrategyType.SPOT;
             // Step 1: Initialize position
@@ -4045,7 +4277,10 @@ class Transactions {
             const lbPairState = dlmmPool.dlmm.lbPair;
             const tokenXMint = lbPairState.tokenXMint;
             const tokenYMint = lbPairState.tokenYMint;
-            const tokenProgramMap = yield (0, functions_1.getTokenProgramMapForMints)(connection, [tokenXMint, tokenYMint]);
+            const tokenProgramMap = yield (0, functions_1.getTokenProgramMapForMints)(connection, [
+                tokenXMint,
+                tokenYMint,
+            ]);
             const tokenXProgram = tokenProgramMap[tokenXMint.toString()];
             const tokenYProgram = tokenProgramMap[tokenYMint.toString()];
             // Step 3: Build deposit instructions
@@ -4072,15 +4307,17 @@ class Transactions {
             const initIdempotent = (mint, label) => {
                 return {
                     instruction: (0, functions_1.createAtaIdempotentIxs)({
-                        accounts: [{
+                        accounts: [
+                            {
                                 payer: params.userWallet,
                                 mint,
                                 owner: params.userWallet,
                                 programId: tokenProgramMap[mint.toString()],
-                            }]
+                            },
+                        ],
                     })[0],
                     label: `Idempotently initialize zero-amount ATA for ${label} mint`,
-                    class: `initZeroAmountAtaLabeled`,
+                    class: 'initZeroAmountAtaLabeled',
                 };
             };
             const initAtaIxs = [];
@@ -4158,6 +4395,248 @@ class Transactions {
             return transactions;
         });
     }
+    _meteoraDepositHybridToLargePosition(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
+            const MAX_BINS_PER_TX = 149;
+            const { userWallet, lbPair, position, tokenXMint, tokenYMint, tokenXProgram, tokenYProgram, lowerBinId, upperBinId, totalXAmount, totalYAmount, layers, pdaTokenType, } = params;
+            const favorXInActiveId = totalYAmount.isZero() && !totalXAmount.isZero();
+            const dlmmPool = yield meteora_1.MeteoraDLMM.create(connection, lbPair, this.ix);
+            const { binId: activeId } = yield dlmmPool.dlmm.getActiveBin();
+            const binStep = new bn_js_1.default(dlmmPool.dlmm.lbPair.binStep);
+            const minDeltaId = new bn_js_1.default(lowerBinId - activeId);
+            const maxDeltaId = new bn_js_1.default(upperBinId - activeId);
+            const strategyResults = (0, liquidityStrategy_1.distributionToHybridStrategy)({
+                hybridDistribution: layers,
+                amountX: totalXAmount,
+                amountY: totalYAmount,
+                minDeltaId,
+                maxDeltaId,
+                binStep,
+                activeId: new bn_js_1.default(activeId),
+            });
+            const chunks = (0, liquidityStrategy_1.chunkHybridDepositParameters)(strategyResults, minDeltaId, maxDeltaId, new bn_js_1.default(activeId), binStep, MAX_BINS_PER_TX, favorXInActiveId);
+            const txInstructions = [];
+            const depositInstructions = [];
+            const deposits = [];
+            deposits.push({ mint: tokenXMint, amount: totalXAmount });
+            deposits.push({ mint: tokenYMint, amount: totalYAmount });
+            const wrapSolIx = (0, functions_1.wrapSolIfMintIsWsolLabeled)(userWallet, userWallet, deposits);
+            depositInstructions.push(...wrapSolIx);
+            if (deposits.length > 0) {
+                depositInstructions.push(yield this.ix.iyfMain.depositMultipleTokenWithToken2022WithLabel({
+                    connection,
+                    payer: userWallet,
+                    deposit: deposits,
+                    pdaTokenType,
+                }));
+            }
+            let depositIncluded = false;
+            if (wrapSolIx.length > 0) {
+                depositIncluded = true;
+                txInstructions.push(depositInstructions);
+            }
+            for (let chunkIndex = 0; chunkIndex < chunks.length; chunkIndex++) {
+                const chunk = chunks[chunkIndex];
+                const mergedLayer = chunk.layers.reduce((acc, l) => ({
+                    x0: acc.x0.add(l.params.x0),
+                    y0: acc.y0.add(l.params.y0),
+                    deltaX: acc.deltaX.add(l.params.deltaX),
+                    deltaY: acc.deltaY.add(l.params.deltaY),
+                }), { x0: new bn_js_1.default(0), y0: new bn_js_1.default(0), deltaX: new bn_js_1.default(0), deltaY: new bn_js_1.default(0) });
+                const onChainParams = (0, liquidityStrategy_1.buildBitFlagAndNegateStrategyParameters)(mergedLayer.x0, mergedLayer.y0, mergedLayer.deltaX, mergedLayer.deltaY);
+                const mergedBinsAmounts = (0, liquidityStrategy_1.toAmountIntoBins)(new bn_js_1.default(activeId), chunk.minDeltaId, chunk.maxDeltaId, mergedLayer.deltaX, mergedLayer.deltaY, mergedLayer.x0, mergedLayer.y0, binStep, favorXInActiveId);
+                const chunkMaxX = mergedBinsAmounts.reduce((s, b) => s.add(b.amountX), new bn_js_1.default(0));
+                const chunkMaxY = mergedBinsAmounts.reduce((s, b) => s.add(b.amountY), new bn_js_1.default(0));
+                const instructions = [];
+                if (!depositIncluded) {
+                    depositIncluded = true;
+                    instructions.push(...depositInstructions);
+                }
+                const initBinArraysIx = (yield this.ix.meteoraDlmm.meteoraDlmmInitializeBinArrayDefault({
+                    connection,
+                    userWallet,
+                    lbPair,
+                    lowerBinId: chunk.lowerBinId,
+                    upperBinId: chunk.upperBinId,
+                })).map(ix => ({
+                    instruction: ix,
+                    label: `Initialize bin arrays for bins ${chunk.lowerBinId} to ${chunk.upperBinId}`,
+                }));
+                instructions.push(...initBinArraysIx);
+                const depositIx = yield this.ix.meteoraDlmm.rebalanceLiquidity({
+                    connection,
+                    userWallet,
+                    position,
+                    lbPair,
+                    tokenXMint,
+                    tokenYMint,
+                    tokenXProgram,
+                    tokenYProgram,
+                    activeId,
+                    pdaTokenType,
+                    maxActiveBinSlippage: 0,
+                    shouldClaimFee: false,
+                    shouldClaimReward: false,
+                    minWithdrawXAmount: new bn_js_1.default(0),
+                    maxDepositXAmount: chunkMaxX,
+                    minWithdrawYAmount: new bn_js_1.default(0),
+                    maxDepositYAmount: chunkMaxY,
+                    removeLiquidityParams: [],
+                    addLiquidityParams: [
+                        {
+                            minDeltaId: chunk.minDeltaId.toNumber(),
+                            maxDeltaId: chunk.maxDeltaId.toNumber(),
+                            x0: onChainParams.x0,
+                            y0: onChainParams.y0,
+                            deltaX: onChainParams.deltaX,
+                            deltaY: onChainParams.deltaY,
+                            bitFlag: onChainParams.bitFlag,
+                            favorXInActiveId,
+                        },
+                    ],
+                });
+                instructions.push({
+                    instruction: depositIx,
+                    label: `Hybrid deposit to bins ${chunk.lowerBinId} to ${chunk.upperBinId} via rebalanceLiquidity`,
+                });
+                txInstructions.push(instructions);
+            }
+            return txInstructions;
+        });
+    }
+    meteoraDepositHybridToLargePosition(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
+            const txInstructions = yield this._meteoraDepositHybridToLargePosition({
+                connection,
+                params,
+            });
+            const transactions = [];
+            for (const ixGroup of txInstructions) {
+                transactions.push(yield (0, functions_1.createTransactionMeta2)({
+                    payer: params.userWallet,
+                    addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
+                    mainInstructions: ixGroup,
+                }));
+            }
+            return transactions;
+        });
+    }
+    meteoraCreatePositionAndDepositHybridToLargePosition(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
+            const lowerBinId = params.binRange.lowerRange;
+            const upperBinId = params.binRange.upperRange;
+            const initTxs = yield this._meteoraInitializeLargePosition({
+                connection,
+                params: {
+                    userWallet: params.userWallet,
+                    lbPair: params.pool,
+                    position: params.position,
+                    lowerBinId,
+                    upperBinId,
+                },
+            });
+            const dlmmPool = yield meteora_1.MeteoraDLMM.create(connection, params.pool, this.ix);
+            const lbPairState = dlmmPool.dlmm.lbPair;
+            const tokenXMint = lbPairState.tokenXMint;
+            const tokenYMint = lbPairState.tokenYMint;
+            const tokenProgramMap = yield (0, functions_1.getTokenProgramMapForMints)(connection, [
+                tokenXMint,
+                tokenYMint,
+            ]);
+            const tokenXProgram = tokenProgramMap[tokenXMint.toString()];
+            const tokenYProgram = tokenProgramMap[tokenYMint.toString()];
+            const depositTxs = yield this._meteoraDepositHybridToLargePosition({
+                connection,
+                params: {
+                    userWallet: params.userWallet,
+                    lbPair: params.pool,
+                    position: params.position,
+                    tokenXMint,
+                    tokenYMint,
+                    tokenXProgram,
+                    tokenYProgram,
+                    lowerBinId,
+                    upperBinId,
+                    totalXAmount: params.totalXAmount,
+                    totalYAmount: params.totalYAmount,
+                    layers: params.layers,
+                    pdaTokenType: params.pdaTokenType,
+                },
+            });
+            const initIdempotent = (mint, label) => ({
+                instruction: (0, functions_1.createAtaIdempotentIxs)({
+                    accounts: [
+                        {
+                            payer: params.userWallet,
+                            mint,
+                            owner: params.userWallet,
+                            programId: tokenProgramMap[mint.toString()],
+                        },
+                    ],
+                })[0],
+                label: `Idempotently initialize zero-amount ATA for ${label} mint`,
+                class: 'initZeroAmountAtaLabeled',
+            });
+            const initAtaIxs = [];
+            if (params.totalXAmount.isZero()) {
+                initAtaIxs.push(initIdempotent(tokenXMint, 'X'));
+            }
+            else if (params.totalYAmount.isZero()) {
+                initAtaIxs.push(initIdempotent(tokenYMint, 'Y'));
+            }
+            const wrapSolIxs = [];
+            const depositToPdaIxs = [];
+            // Moving wrap SOL instruction from depositTxs to initTxs
+            for (let i = 0; i < depositTxs.length; i++) {
+                for (let j = depositTxs[i].length - 1; j >= 0; j--) {
+                    const labelledIx = depositTxs[i][j];
+                    const classification = labelledIx.class;
+                    if (classification === 'wrapSolToWsolLabeled') {
+                        wrapSolIxs.push(labelledIx);
+                        depositTxs[i].splice(j, 1);
+                    }
+                    if (classification === 'depositMultipleTokenWithToken2022WithLabel') {
+                        depositToPdaIxs.push(labelledIx);
+                        depositTxs[i].splice(j, 1);
+                    }
+                    if (depositTxs[i].length === 0) {
+                        depositTxs.splice(i, 1);
+                        break;
+                    }
+                }
+            }
+            // Add wrap SOL instructions to the end of the last init transaction (correct order)
+            initTxs[initTxs.length - 1].push(...initAtaIxs, ...wrapSolIxs.reverse(), ...depositToPdaIxs.reverse());
+            // Assemble — merge init's last TX into deposit's first TX if init has >1 TX
+            const assembled = [];
+            if (initTxs.length > 1) {
+                for (let i = 0; i < initTxs.length - 1; i++) {
+                    assembled.push(initTxs[i]);
+                }
+                const lastInitTx = initTxs[initTxs.length - 1];
+                const firstDepositTx = depositTxs[0];
+                assembled.push([...lastInitTx, ...firstDepositTx]);
+                for (let i = 1; i < depositTxs.length; i++) {
+                    assembled.push(depositTxs[i]);
+                }
+            }
+            else {
+                assembled.push(initTxs[0]);
+                for (const tx of depositTxs) {
+                    assembled.push(tx);
+                }
+            }
+            const transactions = [];
+            for (const ixGroup of assembled) {
+                transactions.push(yield (0, functions_1.createTransactionMeta2)({
+                    payer: params.userWallet,
+                    addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
+                    mainInstructions: ixGroup,
+                }));
+            }
+            return transactions;
+        });
+    }
     /**
      * Deposit liquidity to a Meteora DLMM position (up to 128 bins) with optional position initialization.
      *
@@ -4192,7 +4671,7 @@ class Transactions {
             if (initializePosition) {
                 if (totalBins <= MAX_INIT_WIDTH) {
                     // Simple case: <= 70 bins - use initializePositionAndAddLiquidityByStrategy
-                    const initPositionAndAddLiquidityIxsObj = (yield dlmmPool.initializePositionAndAddLiquidityByStrategy(connection, userWallet, userWallet, {
+                    const initPositionAndAddLiquidityIxsObj = yield dlmmPool.initializePositionAndAddLiquidityByStrategy(connection, userWallet, userWallet, {
                         positionPubKey: position,
                         totalXAmount,
                         totalYAmount,
@@ -4207,7 +4686,7 @@ class Transactions {
                         opt: {
                             pdaTokenType,
                         },
-                    }, hsToMeteora_1.meteoraToHawksight));
+                    }, hsToMeteora_1.meteoraToHawksight);
                     const initPositionAndAddLiquidityIxs = [
                         // Step 1: Init wSOL token account for user wallet (if X or Y token is wSOL)
                         ...initPositionAndAddLiquidityIxsObj.wrapSolIxs.map(ix => {
@@ -4282,7 +4761,7 @@ class Transactions {
                     });
                     instructions.push({
                         instruction: initializePositionIx,
-                        label: `Initialize position for bins ${initWidth}`
+                        label: `Initialize position for bins ${initWidth}`,
                     });
                     // Step 2b: Extend position to cover all bins
                     let currentUpperBinId = lowerBinId + initWidth - 1;
@@ -4299,12 +4778,12 @@ class Transactions {
                         });
                         instructions.push({
                             instruction: extendIx,
-                            label: `Extend position by ${binsToAdd} bins to cover up to bin ${currentUpperBinId + binsToAdd}`
+                            label: `Extend position by ${binsToAdd} bins to cover up to bin ${currentUpperBinId + binsToAdd}`,
                         });
                         currentUpperBinId += binsToAdd;
                     }
                     // Step 2c: Add liquidity to the full position
-                    const addLiquidityIxsObj = (yield dlmmPool.addLiquidityByStrategy(connection, userWallet, userWallet, {
+                    const addLiquidityIxsObj = yield dlmmPool.addLiquidityByStrategy(connection, userWallet, userWallet, {
                         positionPubKey: position,
                         totalXAmount,
                         totalYAmount,
@@ -4317,7 +4796,7 @@ class Transactions {
                         slippage,
                         skipInputTokenCheck,
                         pdaTokenType,
-                    }, hsToMeteora_1.meteoraToHawksight));
+                    }, hsToMeteora_1.meteoraToHawksight);
                     const addLiquidityIxs = [
                         // Step 1: Init wSOL token account for user wallet (if X or Y token is wSOL)
                         ...addLiquidityIxsObj.wrapSolIxs.map(ix => {
@@ -4336,14 +4815,15 @@ class Transactions {
                             const initializeBinArraySighash = (0, functions_1.sighash)('initialize_bin_array');
                             const ixSighash = ix.data.subarray(0, 8);
                             const isInitBinArray = Buffer.from(ixSighash).equals(Buffer.from(initializeBinArraySighash));
-                            if (!ix.programId.equals(addresses_1.METEORA_DLMM_PROGRAM) || ix.programId.equals(addresses_1.METEORA_DLMM_PROGRAM) && isInitBinArray)
+                            if (!ix.programId.equals(addresses_1.METEORA_DLMM_PROGRAM) ||
+                                (ix.programId.equals(addresses_1.METEORA_DLMM_PROGRAM) && isInitBinArray))
                                 return {
                                     instruction: ix,
                                     label: '',
                                 };
                             return {
                                 instruction: ix,
-                                label: `Add liquidity by strategy (meteora deposit)`
+                                label: 'Add liquidity by strategy (meteora deposit)'
                             };
                         }),
                     ];
@@ -4361,7 +4841,7 @@ class Transactions {
             }
             else {
                 // Just add liquidity to existing position
-                const addLiquidityIxsObj = (yield dlmmPool.addLiquidityByStrategy(connection, userWallet, userWallet, {
+                const addLiquidityIxsObj = yield dlmmPool.addLiquidityByStrategy(connection, userWallet, userWallet, {
                     positionPubKey: position,
                     totalXAmount,
                     totalYAmount,
@@ -4374,7 +4854,7 @@ class Transactions {
                     slippage,
                     skipInputTokenCheck,
                     pdaTokenType,
-                }, hsToMeteora_1.meteoraToHawksight));
+                }, hsToMeteora_1.meteoraToHawksight);
                 const addLiquidityIxs = [
                     // Step 1: Init wSOL token account for user wallet (if X or Y token is wSOL)
                     ...addLiquidityIxsObj.wrapSolIxs.map(ix => {
@@ -4954,7 +5434,7 @@ class Transactions {
             const ownerFeeB = (0, functions_1.generateAta)(addresses_1.SITE_FEE_OWNER, mintB);
             const [oracle] = web3.PublicKey.findProgramAddressSync([anchor.utils.bytes.utf8.encode('oracle'), whirlpool.toBuffer()], addresses_1.ORCA_WHIRLPOOL_PROGRAM);
             // TODO: Derive based on amountToSwap calculation
-            let aToB = params.aToB;
+            const aToB = params.aToB;
             const tickArrays = whirlpools_sdk_1.SwapUtils.getTickArrayPublicKeys(whirlpoolData.tickCurrentIndex, whirlpoolData.tickSpacing, aToB, addresses_1.ORCA_WHIRLPOOL_PROGRAM, whirlpool);
             // Step 1: Init wSOL token account for user wallet (if X or Y token is wSOL)
             // const wrapSolIx = wrapSolIfMintIsWsol(params.userWallet, params.userWallet, [
@@ -5335,7 +5815,7 @@ class Transactions {
                     associatedTokenProgram: addresses_1.ASSOCIATED_TOKEN_PROGRAM,
                 })
                     .instruction();
-                let orcaCloseIx = yield anchor_1.Anchor.instance()
+                const orcaCloseIx = yield anchor_1.Anchor.instance()
                     .iyfMain.methods.iyfExtensionExecute(extensionIx.data)
                     .accounts({
                     farm,
@@ -5507,11 +5987,11 @@ class Transactions {
             // Get the Raydium SDK instance
             const sdk = (0, RaydiumSDK_1.raydium)();
             // Get the pool keys (for lookup table account)
-            (0, functions_1.benchmark)({ name: `raydiumOpenPosition`, msg: `sdk.clmm.getClmmPoolKeys` });
+            (0, functions_1.benchmark)({ name: 'raydiumOpenPosition', msg: 'sdk.clmm.getClmmPoolKeys' });
             const poolKeys = yield sdk.clmm.getClmmPoolKeys(params.poolState.toString());
             (0, functions_1.benchmark)({
-                name: `raydiumOpenPosition`,
-                msg: `sdk.clmm.getClmmPoolKeys`,
+                name: 'raydiumOpenPosition',
+                msg: 'sdk.clmm.getClmmPoolKeys',
                 end: true,
             });
             const addressLookupTableAddresses = [];
@@ -5587,7 +6067,7 @@ class Transactions {
             ];
             return yield (0, functions_1.createTransactionMeta)({
                 payer: params.userWallet,
-                description: `Open Raydium Position`,
+                description: 'Open Raydium Position',
                 addressLookupTableAddresses: [
                     ...addresses_1.GLOBAL_ALT,
                     ...addressLookupTableAddresses,
@@ -5615,13 +6095,13 @@ class Transactions {
             const sdk = (0, RaydiumSDK_1.raydium)();
             // Get the pool keys (for lookup table account)
             (0, functions_1.benchmark)({
-                name: `raydiumWithdrawAndClosePosition`,
-                msg: `sdk.clmm.getClmmPoolKeys`,
+                name: 'raydiumWithdrawAndClosePosition',
+                msg: 'sdk.clmm.getClmmPoolKeys',
             });
             const poolKeys = yield sdk.clmm.getClmmPoolKeys(fetch.positionInfo.poolId.toString());
             (0, functions_1.benchmark)({
-                name: `raydiumWithdrawAndClosePosition`,
-                msg: `sdk.clmm.getClmmPoolKeys`,
+                name: 'raydiumWithdrawAndClosePosition',
+                msg: 'sdk.clmm.getClmmPoolKeys',
                 end: true,
             });
             const addressLookupTableAddresses = [];
@@ -5683,7 +6163,7 @@ class Transactions {
                 ];
                 return (0, functions_1.createTransactionMeta)({
                     payer: params.userWallet,
-                    description: `Close Raydium Position`,
+                    description: 'Close Raydium Position',
                     addressLookupTableAddresses: [
                         ...addresses_1.GLOBAL_ALT,
                         ...addressLookupTableAddresses,
@@ -5702,7 +6182,7 @@ class Transactions {
                 ];
                 return (0, functions_1.createTransactionMeta)({
                     payer: params.userWallet,
-                    description: `Withdraw and close Raydium Position`,
+                    description: 'Withdraw and close Raydium Position',
                     addressLookupTableAddresses: [
                         ...addresses_1.GLOBAL_ALT,
                         ...addressLookupTableAddresses,
@@ -5735,7 +6215,7 @@ class Transactions {
             ];
             return (0, functions_1.createTransactionMeta)({
                 payer: params.userWallet,
-                description: `Close Raydium Position`,
+                description: 'Close Raydium Position',
                 addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
                 mainInstructions,
             });
@@ -5761,13 +6241,13 @@ class Transactions {
             const sdk = (0, RaydiumSDK_1.raydium)();
             // Get the pool keys (for lookup table account)
             (0, functions_1.benchmark)({
-                name: `raydiumIncreaseLiquidity`,
-                msg: `sdk.clmm.getClmmPoolKeys`,
+                name: 'raydiumIncreaseLiquidity',
+                msg: 'sdk.clmm.getClmmPoolKeys',
             });
             const poolKeys = yield sdk.clmm.getClmmPoolKeys(fetch.positionInfo.poolId.toString());
             (0, functions_1.benchmark)({
-                name: `raydiumIncreaseLiquidity`,
-                msg: `sdk.clmm.getClmmPoolKeys`,
+                name: 'raydiumIncreaseLiquidity',
+                msg: 'sdk.clmm.getClmmPoolKeys',
                 end: true,
             });
             const addressLookupTableAddresses = [];
@@ -5821,7 +6301,7 @@ class Transactions {
             ];
             return (0, functions_1.createTransactionMeta)({
                 payer: params.userWallet,
-                description: `Raydium increase liquidity`,
+                description: 'Raydium increase liquidity',
                 addressLookupTableAddresses: [
                     ...addresses_1.GLOBAL_ALT,
                     ...addressLookupTableAddresses,
@@ -5848,13 +6328,13 @@ class Transactions {
             const sdk = (0, RaydiumSDK_1.raydium)();
             // Get the pool keys (for lookup table account)
             (0, functions_1.benchmark)({
-                name: `raydiumDecreaseLiquidity`,
-                msg: `sdk.clmm.getClmmPoolKeys`,
+                name: 'raydiumDecreaseLiquidity',
+                msg: 'sdk.clmm.getClmmPoolKeys',
             });
             const poolKeys = yield sdk.clmm.getClmmPoolKeys(fetch.positionInfo.poolId.toString());
             (0, functions_1.benchmark)({
-                name: `raydiumDecreaseLiquidity`,
-                msg: `sdk.clmm.getClmmPoolKeys`,
+                name: 'raydiumDecreaseLiquidity',
+                msg: 'sdk.clmm.getClmmPoolKeys',
                 end: true,
             });
             const addressLookupTableAddresses = [];
@@ -5907,7 +6387,7 @@ class Transactions {
             ];
             return (0, functions_1.createTransactionMeta)({
                 payer: params.userWallet,
-                description: `Raydium decrease liquidity`,
+                description: 'Raydium decrease liquidity',
                 addressLookupTableAddresses: [
                     ...addresses_1.GLOBAL_ALT,
                     ...addressLookupTableAddresses,
@@ -5951,7 +6431,8 @@ class Transactions {
                     targetActiveBin: params.targetActiveBin,
                 });
                 // checkRange validation
-                if (activeId < params.checkRange.lowerRange || activeId > params.checkRange.upperRange) {
+                if (activeId < params.checkRange.lowerRange ||
+                    activeId > params.checkRange.upperRange) {
                     throw new Error(`Active bin ${activeId} outside checkRange [${params.checkRange.lowerRange}, ${params.checkRange.upperRange}]`);
                 }
                 const newLowerBinId = activeId + params.relativeBinRange.lowerRange;
@@ -5966,13 +6447,13 @@ class Transactions {
                 if (currentWidth <= MAX_BINS_PER_WITHDRAW_CHUNK) {
                     // Small/medium: single withdraw TX
                     teardownTxGroups.push([
-                        ...yield withdrawFn({
+                        ...(yield withdrawFn({
                             position: params.currentPosition,
                             minBinId: currentLowerBinId,
                             maxBinId: currentUpperBinId,
                             compound: params.compound,
                             origin: CLASS,
-                        }),
+                        })),
                         {
                             label: 'close_position',
                             class: CLASS,
@@ -5992,13 +6473,13 @@ class Transactions {
                         const chunk = withdrawChunks[i];
                         const isLast = i === withdrawChunks.length - 1;
                         const chunkIxs = [
-                            ...yield withdrawFn({
+                            ...(yield withdrawFn({
                                 position: params.currentPosition,
                                 minBinId: chunk.lowerBinId,
                                 maxBinId: chunk.upperBinId,
                                 compound: params.compound,
                                 origin: CLASS,
-                            }),
+                            })),
                         ];
                         if (isLast) {
                             chunkIxs.push({
@@ -6080,20 +6561,34 @@ class Transactions {
                         y0: acc.y0.add(l.y0),
                         deltaX: acc.deltaX.add(l.deltaX),
                         deltaY: acc.deltaY.add(l.deltaY),
-                    }), { x0: new bn_js_1.default(0), y0: new bn_js_1.default(0), deltaX: new bn_js_1.default(0), deltaY: new bn_js_1.default(0) });
+                    }), {
+                        x0: new bn_js_1.default(0),
+                        y0: new bn_js_1.default(0),
+                        deltaX: new bn_js_1.default(0),
+                        deltaY: new bn_js_1.default(0),
+                    });
                     const mergedP = (0, liquidityStrategy_1.buildBitFlagAndNegateStrategyParameters)(mergedLayer.x0, mergedLayer.y0, mergedLayer.deltaX, mergedLayer.deltaY);
-                    const allAddLiquidityParams = [{
+                    const allAddLiquidityParams = [
+                        {
                             minDeltaId,
                             maxDeltaId,
-                            x0: mergedP.x0, y0: mergedP.y0, deltaX: mergedP.deltaX, deltaY: mergedP.deltaY,
+                            x0: mergedP.x0,
+                            y0: mergedP.y0,
+                            deltaX: mergedP.deltaX,
+                            deltaY: mergedP.deltaY,
                             bitFlag: mergedP.bitFlag,
                             favorXInActiveId,
-                        }];
+                        },
+                    ];
                     const mergedBinsAmounts = (0, liquidityStrategy_1.toAmountIntoBins)(new bn_js_1.default(activeId), new bn_js_1.default(minDeltaId), new bn_js_1.default(maxDeltaId), mergedLayer.deltaX, mergedLayer.deltaY, mergedLayer.x0, mergedLayer.y0, binStep, favorXInActiveId);
                     const totalMaxX = mergedBinsAmounts.reduce((s, b) => s.add(b.amountX), new bn_js_1.default(0));
                     const totalMaxY = mergedBinsAmounts.reduce((s, b) => s.add(b.amountY), new bn_js_1.default(0));
                     const binArrayInitIxs = yield this._initBinArraysForRange(connection, lbPair, dlmmPool, newLowerBinId, newUpperBinId);
-                    const binArrayInitIxsLabeled = binArrayInitIxs.map(ix => ({ label: 'init_bin_array', class: CLASS, instruction: ix }));
+                    const binArrayInitIxsLabeled = binArrayInitIxs.map(ix => ({
+                        label: 'init_bin_array',
+                        class: CLASS,
+                        instruction: ix,
+                    }));
                     const depositIx = yield depositFn({
                         position: params.newPosition,
                         shouldClaimFee: false,
@@ -6106,7 +6601,11 @@ class Transactions {
                     });
                     if (newWidth <= MAX_INIT_WIDTH) {
                         // ≤70 bins: no extension needed, everything fits in one TX
-                        rebuildTxGroups.push([...initExtendIxs, ...binArrayInitIxsLabeled, depositIx]);
+                        rebuildTxGroups.push([
+                            ...initExtendIxs,
+                            ...binArrayInitIxsLabeled,
+                            depositIx,
+                        ]);
                     }
                     else {
                         // 71-149 bins: extension needed, split init+extend from deposit to stay within TX size limit
@@ -6125,21 +6624,35 @@ class Transactions {
                             y0: acc.y0.add(l.params.y0),
                             deltaX: acc.deltaX.add(l.params.deltaX),
                             deltaY: acc.deltaY.add(l.params.deltaY),
-                        }), { x0: new bn_js_1.default(0), y0: new bn_js_1.default(0), deltaX: new bn_js_1.default(0), deltaY: new bn_js_1.default(0) });
+                        }), {
+                            x0: new bn_js_1.default(0),
+                            y0: new bn_js_1.default(0),
+                            deltaX: new bn_js_1.default(0),
+                            deltaY: new bn_js_1.default(0),
+                        });
                         const chunkMergedP = (0, liquidityStrategy_1.buildBitFlagAndNegateStrategyParameters)(chunkMergedLayer.x0, chunkMergedLayer.y0, chunkMergedLayer.deltaX, chunkMergedLayer.deltaY);
-                        const chunkAddLiquidityParams = [{
+                        const chunkAddLiquidityParams = [
+                            {
                                 minDeltaId: chunk.minDeltaId.toNumber(),
                                 maxDeltaId: chunk.maxDeltaId.toNumber(),
-                                x0: chunkMergedP.x0, y0: chunkMergedP.y0, deltaX: chunkMergedP.deltaX, deltaY: chunkMergedP.deltaY,
+                                x0: chunkMergedP.x0,
+                                y0: chunkMergedP.y0,
+                                deltaX: chunkMergedP.deltaX,
+                                deltaY: chunkMergedP.deltaY,
                                 bitFlag: chunkMergedP.bitFlag,
                                 favorXInActiveId,
-                            }];
+                            },
+                        ];
                         const chunkMergedBinsAmounts = (0, liquidityStrategy_1.toAmountIntoBins)(new bn_js_1.default(activeId), chunk.minDeltaId, chunk.maxDeltaId, chunkMergedLayer.deltaX, chunkMergedLayer.deltaY, chunkMergedLayer.x0, chunkMergedLayer.y0, binStep, favorXInActiveId);
                         const chunkTotalMaxX = chunkMergedBinsAmounts.reduce((s, b) => s.add(b.amountX), new bn_js_1.default(0));
                         const chunkTotalMaxY = chunkMergedBinsAmounts.reduce((s, b) => s.add(b.amountY), new bn_js_1.default(0));
                         const binArrayInitIxs = yield this._initBinArraysForRange(connection, lbPair, dlmmPool, chunk.lowerBinId, chunk.upperBinId);
                         rebuildTxGroups.push([
-                            ...binArrayInitIxs.map(ix => ({ label: 'init_bin_array', class: CLASS, instruction: ix })),
+                            ...binArrayInitIxs.map(ix => ({
+                                label: 'init_bin_array',
+                                class: CLASS,
+                                instruction: ix,
+                            })),
                             yield depositFn({
                                 position: params.newPosition,
                                 shouldClaimFee: false,
@@ -6220,26 +6733,26 @@ class Transactions {
                 const withdrawTxGroups = [];
                 if (positionWidth <= MAX_BINS_PER_WITHDRAW_CHUNK) {
                     withdrawTxGroups.push([
-                        ...yield withdrawFn({
+                        ...(yield withdrawFn({
                             position: params.position,
                             minBinId: lowerBinId,
                             maxBinId: upperBinId,
                             compound: params.compound,
                             origin: CLASS,
-                        }),
+                        })),
                     ]);
                 }
                 else {
                     const withdrawChunks = (0, liquidityStrategy_1.chunkBinRange)(lowerBinId, upperBinId, MAX_BINS_PER_WITHDRAW_CHUNK);
                     for (const chunk of withdrawChunks) {
                         withdrawTxGroups.push([
-                            ...yield withdrawFn({
+                            ...(yield withdrawFn({
                                 position: params.position,
                                 minBinId: chunk.lowerBinId,
                                 maxBinId: chunk.upperBinId,
                                 compound: params.compound,
                                 origin: CLASS,
-                            }),
+                            })),
                         ]);
                     }
                 }
@@ -6267,15 +6780,25 @@ class Transactions {
                         y0: acc.y0.add(l.y0),
                         deltaX: acc.deltaX.add(l.deltaX),
                         deltaY: acc.deltaY.add(l.deltaY),
-                    }), { x0: new bn_js_1.default(0), y0: new bn_js_1.default(0), deltaX: new bn_js_1.default(0), deltaY: new bn_js_1.default(0) });
+                    }), {
+                        x0: new bn_js_1.default(0),
+                        y0: new bn_js_1.default(0),
+                        deltaX: new bn_js_1.default(0),
+                        deltaY: new bn_js_1.default(0),
+                    });
                     const mergedP = (0, liquidityStrategy_1.buildBitFlagAndNegateStrategyParameters)(mergedLayer.x0, mergedLayer.y0, mergedLayer.deltaX, mergedLayer.deltaY);
-                    const allAddLiquidityParams = [{
+                    const allAddLiquidityParams = [
+                        {
                             minDeltaId,
                             maxDeltaId,
-                            x0: mergedP.x0, y0: mergedP.y0, deltaX: mergedP.deltaX, deltaY: mergedP.deltaY,
+                            x0: mergedP.x0,
+                            y0: mergedP.y0,
+                            deltaX: mergedP.deltaX,
+                            deltaY: mergedP.deltaY,
                             bitFlag: mergedP.bitFlag,
                             favorXInActiveId,
-                        }];
+                        },
+                    ];
                     const mergedBinsAmounts = (0, liquidityStrategy_1.toAmountIntoBins)(new bn_js_1.default(activeId), new bn_js_1.default(minDeltaId), new bn_js_1.default(maxDeltaId), mergedLayer.deltaX, mergedLayer.deltaY, mergedLayer.x0, mergedLayer.y0, binStep, favorXInActiveId);
                     const totalMaxX = mergedBinsAmounts.reduce((s, b) => s.add(b.amountX), new bn_js_1.default(0));
                     const totalMaxY = mergedBinsAmounts.reduce((s, b) => s.add(b.amountY), new bn_js_1.default(0));
@@ -6302,15 +6825,25 @@ class Transactions {
                             y0: acc.y0.add(l.params.y0),
                             deltaX: acc.deltaX.add(l.params.deltaX),
                             deltaY: acc.deltaY.add(l.params.deltaY),
-                        }), { x0: new bn_js_1.default(0), y0: new bn_js_1.default(0), deltaX: new bn_js_1.default(0), deltaY: new bn_js_1.default(0) });
+                        }), {
+                            x0: new bn_js_1.default(0),
+                            y0: new bn_js_1.default(0),
+                            deltaX: new bn_js_1.default(0),
+                            deltaY: new bn_js_1.default(0),
+                        });
                         const chunkMergedP = (0, liquidityStrategy_1.buildBitFlagAndNegateStrategyParameters)(chunkMergedLayer.x0, chunkMergedLayer.y0, chunkMergedLayer.deltaX, chunkMergedLayer.deltaY);
-                        const chunkAddLiquidityParams = [{
+                        const chunkAddLiquidityParams = [
+                            {
                                 minDeltaId: chunk.minDeltaId.toNumber(),
                                 maxDeltaId: chunk.maxDeltaId.toNumber(),
-                                x0: chunkMergedP.x0, y0: chunkMergedP.y0, deltaX: chunkMergedP.deltaX, deltaY: chunkMergedP.deltaY,
+                                x0: chunkMergedP.x0,
+                                y0: chunkMergedP.y0,
+                                deltaX: chunkMergedP.deltaX,
+                                deltaY: chunkMergedP.deltaY,
                                 bitFlag: chunkMergedP.bitFlag,
                                 favorXInActiveId,
-                            }];
+                            },
+                        ];
                         const chunkMergedBinsAmounts = (0, liquidityStrategy_1.toAmountIntoBins)(new bn_js_1.default(activeId), chunk.minDeltaId, chunk.maxDeltaId, chunkMergedLayer.deltaX, chunkMergedLayer.deltaY, chunkMergedLayer.x0, chunkMergedLayer.y0, binStep, favorXInActiveId);
                         const chunkTotalMaxX = chunkMergedBinsAmounts.reduce((s, b) => s.add(b.amountX), new bn_js_1.default(0));
                         const chunkTotalMaxY = chunkMergedBinsAmounts.reduce((s, b) => s.add(b.amountY), new bn_js_1.default(0));
@@ -6429,6 +6962,7 @@ class Transactions {
             combinedAccounts.push(...baseRemainingAccountsInfo.accounts);
             for (const reward of rewardInfos) {
                 const rewardTransferHookInfo = yield (0, functions_1.fetchRemainingAccountsInfoForReward)(connection, reward.rewardMint, reward.rewardTokenProgram);
+                reward.rewardRemainingAccountsInfo = rewardTransferHookInfo;
                 const transferHookLength = rewardTransferHookInfo.slices.length > 0
                     ? rewardTransferHookInfo.slices[0].length
                     : 0;
@@ -6444,14 +6978,21 @@ class Transactions {
                 accounts: combinedAccounts,
             };
             // --- Estimate total amounts ---
+            // When compound=true, fees are claimed via claimFee2Automation which takes an 8% hawk-side
+            // cut (HARVEST_FEE_NUMERATOR=800, FEE_DENOMINATOR=10000). The net fee after cut is what's
+            // available for re-deposit.
             const positionData = userPosition.positionData;
             const feeX = positionData.feeX;
             const feeY = positionData.feeY;
+            const HAWK_FEE_BPS = 800;
+            const FEE_BPS_DENOM = 10000;
+            const netFeeX = feeX.mul(new bn_js_1.default(FEE_BPS_DENOM - HAWK_FEE_BPS)).div(new bn_js_1.default(FEE_BPS_DENOM));
+            const netFeeY = feeY.mul(new bn_js_1.default(FEE_BPS_DENOM - HAWK_FEE_BPS)).div(new bn_js_1.default(FEE_BPS_DENOM));
             const estimatedTotalX = compound
-                ? new bn_js_1.default(positionData.totalXAmount).add(feeX)
+                ? new bn_js_1.default(positionData.totalXAmount).add(netFeeX)
                 : new bn_js_1.default(positionData.totalXAmount);
             const estimatedTotalY = compound
-                ? new bn_js_1.default(positionData.totalYAmount).add(feeY)
+                ? new bn_js_1.default(positionData.totalYAmount).add(netFeeY)
                 : new bn_js_1.default(positionData.totalYAmount);
             const _rebalanceLiquidityAutomation = (_a) => __awaiter(this, [_a], void 0, function* ({ position, maxDepositXAmount, maxDepositYAmount, pdaTokenType, shrinkMode, shouldClaimFee, shouldClaimReward, removeLiquidityParams, addLiquidityParams, maxActiveBinSlippage, }) {
                 return yield this.ix.meteoraDlmm.rebalanceLiquidityAutomation({
@@ -6491,62 +7032,61 @@ class Transactions {
                 });
             });
             const withdrawFn = (_a) => __awaiter(this, [_a], void 0, function* ({ position, minBinId, maxBinId, compound, origin, }) {
-                if (compound) {
-                    // Withdraw + Claim Fee + Claim Reward
-                    return [
-                        {
-                            label: 'compound_withdraw_using_rbl',
-                            class: origin,
-                            instruction: yield _withdrawFn({
-                                position,
-                                minBinId,
-                                maxBinId,
-                                shouldClaimReward: true,
-                                shrinkMode: types_3.ShrinkMode.Default,
-                                shouldClaimFee: true,
-                                pdaTokenType: types_1.TokenType.ATA,
-                            })
-                        }
-                    ];
-                }
-                return [
-                    // Withdraw + claim reward from position
-                    {
-                        label: 'non_compound_withdraw_using_rbl',
-                        class: 'withdrawFn',
-                        instruction: yield _withdrawFn({
-                            position,
-                            minBinId,
-                            maxBinId,
-                            shouldClaimReward: true,
-                            shrinkMode: types_3.ShrinkMode.NoShrinkBoth,
-                            shouldClaimFee: false,
-                            // Note:
-                            //   User Reward Token is not affected by this parameter. It's always STA regardless.
-                            //   pdaTokenType only affects token deposits (which essentially are fees as well)
-                            pdaTokenType: types_1.TokenType.ATA,
-                        })
-                    },
-                    // Claim fees and shrink position
-                    {
-                        label: 'claim_fees_using_rbl',
-                        class: 'withdrawFn',
-                        instruction: yield _withdrawFn({
+                const pdaTokenTypeForClaimables = compound ? types_1.TokenType.ATA : types_1.TokenType.STA;
+                const ixs = [];
+                // 1. Claim fees with hawk-side cut (must happen before withdraw+shrink invalidates position)
+                ixs.push({
+                    label: 'claim_fee',
+                    class: origin,
+                    instruction: yield this.ix.meteoraDlmm.claimFee2Automation(connection, {
+                        userWallet,
+                        lbPair,
+                        position,
+                        tokenMintX: tokenXMint,
+                        tokenMintY: tokenYMint,
+                        tokenProgramX: tokenXProgram,
+                        tokenProgramY: tokenYProgram,
+                        lowerBinId: minBinId,
+                        upperBinId: maxBinId,
+                        pdaTokenType: pdaTokenTypeForClaimables,
+                        remainingAccountsInfo: baseRemainingAccountsInfo,
+                    }),
+                });
+                // 2. Claim rewards with hawk-side cut (must happen before withdraw+shrink invalidates position)
+                for (const reward of rewardInfos) {
+                    ixs.push({
+                        label: 'claim_reward',
+                        class: origin,
+                        instruction: yield this.ix.meteoraDlmm.claimReward2Automation(connection, {
+                            userWallet,
+                            lbPair,
                             position,
-                            minBinId,
-                            maxBinId,
-                            shouldClaimReward: false,
-                            // We shrink position at claim fees where we have zero deposits on given min ~ max binId
-                            // at this point
-                            shrinkMode: types_3.ShrinkMode.Default,
-                            shouldClaimFee: true,
-                            // Note (continuation):
-                            //   That is why we split it to 2 ix, because we want fees to be transfered to STA if
-                            //   compound is off
+                            rewardIndex: reward.rewardIndex,
+                            rewardMint: reward.rewardMint,
+                            rewardVault: reward.rewardVault,
+                            tokenProgram: reward.rewardTokenProgram,
+                            lowerBinId: minBinId,
+                            upperBinId: maxBinId,
                             pdaTokenType: types_1.TokenType.STA,
-                        })
-                    }
-                ];
+                            remainingAccountsInfo: reward.rewardRemainingAccountsInfo,
+                        }),
+                    });
+                }
+                // 3. Withdraw liquidity + shrink (position may be invalidated after this)
+                ixs.push({
+                    label: 'withdraw_using_rbl',
+                    class: origin,
+                    instruction: yield _withdrawFn({
+                        position,
+                        minBinId,
+                        maxBinId,
+                        shouldClaimReward: false,
+                        shouldClaimFee: false,
+                        shrinkMode: types_3.ShrinkMode.Default,
+                        pdaTokenType: types_1.TokenType.ATA,
+                    }),
+                });
+                return ixs;
             });
             const depositFn = (_a) => __awaiter(this, [_a], void 0, function* ({ position, maxDepositXAmount, maxDepositYAmount, pdaTokenType, addLiquidityParams, origin, }) {
                 return {
@@ -6563,7 +7103,7 @@ class Transactions {
                         removeLiquidityParams: [],
                         addLiquidityParams,
                         maxActiveBinSlippage: 0,
-                    })
+                    }),
                 };
             });
             return {
@@ -6580,6 +7120,7 @@ class Transactions {
                 tokenYMint,
                 tokenXProgram,
                 tokenYProgram,
+                baseRemainingAccountsInfo,
                 remainingAccountsInfo,
                 rewardInfos,
                 estimatedTotalX,