@hawksightco/hawk-sdk 1.1.2 → 1.1.4-8.2

package/dist/src/classes/Transactions.js

@@ -48,7 +48,28 @@ const meteora_1 = require("../meteora");
 const anchor_1 = require("../anchor");
 const hawksight_1 = require("../hawksight");
 const types_2 = require("../types");
+const Logging_1 = require("./Logging");
+const TransactionBatchExecute2_1 = require("./TransactionBatchExecute2");
+const CreateTxMetadata_1 = require("./CreateTxMetadata");
+const SimpleIxGenerator_1 = require("./SimpleIxGenerator");
 class Transactions {
+    /**
+     * Prohibit creating instance other than getInstance
+     */
+    constructor() {
+        this.ix = new SimpleIxGenerator_1.SimpleIxGenerator();
+    }
+    /**
+     * Get singleton instance
+     *
+     * @returns
+     */
+    static getInstance() {
+        if (Transactions.instance === undefined) {
+            Transactions.instance = new Transactions();
+        }
+        return Transactions.instance;
+    }
     /**
      * Generate UserPDA
      *
@@ -147,6 +168,39 @@ class Transactions {
             });
         });
     }
+    /**
+     * Creates meteora instruction that creates new position and deposit.
+     *
+     * @param connection The Solana web3 connection object for blockchain interactions.
+     * @param payer The public key of the payer for transaction fees.
+     * @param params Parameters required
+     * @returns A ResponseWithStatus containing either TransactionMetadataResponse.
+     */
+    meteoraCreatePositionAndDepositPda(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
+            const dlmmPool = yield meteora_1.MeteoraDLMM.create(connection, new web3.PublicKey(params.pool));
+            const userPda = (0, functions_1.generateUserPda)(params.userWallet);
+            const mainInstructions = (yield dlmmPool.initializePositionAndAddLiquidityByStrategyPda(params.userWallet, params.userWallet, {
+                positionPubKey: params.position,
+                user: userPda,
+                totalXAmount: params.totalXAmount,
+                totalYAmount: params.totalYAmount,
+                strategy: {
+                    maxBinId: params.binRange.upperRange,
+                    minBinId: params.binRange.lowerRange,
+                    strategyType: types_1.StrategyTypeMap[params.distribution],
+                },
+                slippage: params.slippage,
+                skipInputTokenCheck: params.skipInputTokenCheck,
+            }, hsToMeteora_1.meteoraToHawksightPdaIxs)).default();
+            return (0, functions_1.createTransactionMeta)({
+                payer: params.userWallet,
+                description: "Create position and deposit to Meteora DLMM",
+                addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
+                mainInstructions,
+            });
+        });
+    }
     /**
      * Creates meteora instruction that initializes bin arrays.
      *
@@ -277,6 +331,68 @@ class Transactions {
             });
         });
     }
+    /**
+     * Creates meteora instruction withdraws from a position.
+     *
+     * @param connection The Solana web3 connection object for blockchain interactions.
+     * @param payer The public key of the payer for transaction fees.
+     * @param params Parameters required
+     * @returns A ResponseWithStatus containing either TransactionMetadataResponse.
+     */
+    meteoraWithdrawPda(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
+            const userPda = (0, functions_1.generateUserPda)(params.userWallet);
+            const program = yield meteora_1.MeteoraDLMM.program(connection);
+            let lbPair, binIdsToRemove;
+            if (params.fastGeneration !== undefined) {
+                lbPair = params.fastGeneration.pool;
+            }
+            else {
+                const position = yield program.account.positionV2.fetch(params.position);
+                lbPair = position.lbPair;
+            }
+            const dlmmPool = yield meteora_1.MeteoraDLMM.create(connection, lbPair);
+            if (params.fastGeneration === undefined) {
+                const { userPositions } = yield dlmmPool.getPositionsByUserAndLbPair(userPda);
+                const userPosition = userPositions.find((userPosition) => userPosition.publicKey.toString() === params.position.toString());
+                if (userPosition === undefined) {
+                    throw new Error("Position does not exist."); // this error should not happen...
+                }
+                binIdsToRemove = userPosition.positionData.positionBinData.map((bin) => bin.binId);
+            }
+            else {
+                binIdsToRemove = params.fastGeneration.binIdsToRemove;
+            }
+            const amountBps = params.shouldClaimAndClose
+                ? new bn_js_1.default(10000)
+                : params.amountBps;
+            const mainInstructions = (yield dlmmPool.removeLiquidityPda(params.userWallet, params.userWallet, {
+                user: userPda,
+                position: params.position,
+                binIds: binIdsToRemove,
+                bps: amountBps,
+                shouldClaimAndClose: params.shouldClaimAndClose,
+            }, hsToMeteora_1.meteoraToHawksight)).default();
+            let description;
+            if (params.shouldClaimAndClose) {
+                description =
+                    "Full position withdrawal with claim and close instructisons from Meteora DLMM";
+            }
+            else if (amountBps.eq(new bn_js_1.default(10000))) {
+                description =
+                    "Full position withdrawal without claim and close instructions from Meteora DLMM";
+            }
+            else {
+                description = "Partial position withdrawal from Meteora DLMM";
+            }
+            return (0, functions_1.createTransactionMeta)({
+                payer: params.userWallet,
+                description,
+                addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
+                mainInstructions,
+            });
+        });
+    }
     /**
      * Creates meteora instruction that claims fees and rewards.
      *
@@ -287,29 +403,60 @@ class Transactions {
      */
     meteoraClaim(_a) {
         return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
-            const program = yield meteora_1.MeteoraDLMM.program(connection);
             let lbPair;
             if (params.fastGeneration !== undefined) {
                 lbPair = params.fastGeneration.pool;
             }
             else {
+                const program = yield meteora_1.MeteoraDLMM.program(connection);
                 const position = yield program.account.positionV2.fetch(params.position);
                 lbPair = position.lbPair;
             }
-            const dlmmPool = yield meteora_1.MeteoraDLMM.create(connection, lbPair);
             const userPda = (0, functions_1.generateUserPda)(params.userWallet);
-            const { userPositions } = yield dlmmPool.getPositionsByUserAndLbPair(userPda);
-            const index = userPositions.findIndex((v) => v.publicKey.equals(params.position));
-            const mainInstructions = (yield dlmmPool.claimAllRewardsByPosition(params.userWallet, params.userWallet, {
+            const fn = new meteora_1.MeteoraFunctions();
+            const mainInstructions = (yield fn.claimAllRewardsByPosition(connection, params.userWallet, params.userWallet, {
                 owner: userPda,
-                position: userPositions[index],
+                position: params.position,
+                lbPair,
             }, hsToMeteora_1.meteoraToHawksight)).default();
-            return (0, functions_1.createTransactionMeta)({
+            const txMeta = (0, functions_1.createTransactionMeta)({
                 payer: params.userWallet,
                 description: "Claim fees / rewards from Meteora DLMM Position",
                 addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
                 mainInstructions,
             });
+            return txMeta;
+        });
+    }
+    /**
+     * Claim all meteora fees and rewards by list of pools owned by given user
+     *
+     * @param connection The Solana web3 connection object for blockchain interactions.
+     * @param payer The public key of the payer for transaction fees.
+     * @param params Parameters required
+     * @returns Array of transaction instructions (simplified output)
+     */
+    meteoraClaimAll(_a, payer_1, generalUtility_1) {
+        return __awaiter(this, arguments, void 0, function* ({ connection, params, }, payer, generalUtility) {
+            const userPda = (0, functions_1.generateUserPda)(params.userWallet);
+            const fn = new meteora_1.MeteoraFunctions();
+            // Step 1: Get all user position
+            // This function also downloads pools needed to generate claim all transaction.
+            const positions = yield fn.getAllUserPosition(connection, userPda);
+            // Step 2: Generate claim fee and claim reward transactions
+            const builder = yield fn.claimFeeAndRewardIxs2(connection, positions, params.userWallet, userPda, hsToMeteora_1.meteoraToHawksight);
+            // Step 2.5: Generate transactions
+            const mainInstructions = builder.default();
+            const latestBlockhash = yield connection.getLatestBlockhash();
+            const batchGenerator = new TransactionBatchExecute2_1.TransactionBatchExecute2(addresses_1.GLOBAL_ALT.map(p => new web3.PublicKey(p)), mainInstructions, connection, CreateTxMetadata_1.CreateTxMetadata.instance(), latestBlockhash, payer);
+            // Insert nonce advance tx at end of transaction
+            batchGenerator.insertNonceAt({
+                onlyEndOfTx: true,
+            });
+            // Generate batch of transactions
+            const txs = yield batchGenerator.buildBatchWithAlts('Claim all fees / rewards from Meteora DLMM position', generalUtility);
+            // Simplified return value
+            return txs;
         });
     }
     /**
@@ -353,9 +500,11 @@ class Transactions {
                 throw new Error(`Position: ${params.position} does not exist.`);
             }
             // Claim fee and claim reward ixs
-            const claimBuilder = yield dlmmPool.claimAllRewardsByPosition(params.userWallet, addresses_1.HS_AUTHORITY, {
+            const fn = new meteora_1.MeteoraFunctions();
+            const claimBuilder = yield fn.claimAllRewardsByPosition(connection, params.userWallet, addresses_1.HS_AUTHORITY, {
                 owner: userPda,
-                position: userPosition,
+                position: params.position,
+                lbPair: position.lbPair,
             }, hsToMeteora_1.meteoraToHawksightAutomationIxs);
             // Re-deposit fees (TODO: How to re-deposit reward tokens that is not X or Y token?)
             const addLiquidityBuilder = yield dlmmPool.addLiquidityByStrategy(params.userWallet, addresses_1.HS_AUTHORITY, {
@@ -386,6 +535,41 @@ class Transactions {
             });
         });
     }
+    claimAutomationIx(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
+            const program = yield meteora_1.MeteoraDLMM.program(connection);
+            const position = yield program.account.positionV2.fetch(params.position);
+            const dlmmPool = yield meteora_1.MeteoraDLMM.create(connection, position.lbPair);
+            const userPda = (0, functions_1.generateUserPda)(params.userWallet);
+            const { userPositions } = yield dlmmPool.getPositionsByUserAndLbPair(userPda);
+            const userPosition = userPositions.find(userPosition => userPosition.publicKey.equals(params.position));
+            if (userPosition === undefined) {
+                throw new Error(`Position: ${params.position} does not exist.`);
+            }
+            // Claim fee and claim reward ixs
+            const fn = new meteora_1.MeteoraFunctions();
+            const claimBuilder = yield fn.claimAllRewardsByPosition(connection, params.userWallet, addresses_1.HS_AUTHORITY, {
+                owner: userPda,
+                position: params.position,
+                lbPair: position.lbPair,
+            }, hsToMeteora_1.meteoraToHawksightAutomationIxs);
+            // Change to STA because we want the tokens to be in the HawkFi wallet
+            claimBuilder.replaceClaimFeeTokenToSTA();
+            claimBuilder.replaceClaimRewardToSTA();
+            const mainInstructions = [
+                // Step 1: Initialize ATA
+                ...claimBuilder.createAtaIxs,
+                // Step 2: Claim rewards and fees
+                ...claimBuilder.mainIxs,
+            ];
+            return (0, functions_1.createTransactionMeta)({
+                payer: params.userWallet,
+                description: "Automation IX: Meteora Auto-claim instructions (claim fee, reward)",
+                addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
+                mainInstructions,
+            });
+        });
+    }
     rebalanceAutomationIx(_a) {
         return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
             const program = yield meteora_1.MeteoraDLMM.program(connection);
@@ -406,8 +590,14 @@ class Transactions {
                 bps: new bn_js_1.default(10000),
                 shouldClaimAndClose: true,
             }, hsToMeteora_1.meteoraToHawksightAutomationIxs);
-            removeLiquidityBuilder.replaceClaimFeeTokenToSTA();
-            removeLiquidityBuilder.replaceClaimRewardToSTA();
+            if (!!params.useAta) {
+                removeLiquidityBuilder.replaceClaimFeeTokenToATA();
+                removeLiquidityBuilder.replaceClaimRewardToATA();
+            }
+            else {
+                removeLiquidityBuilder.replaceClaimFeeTokenToSTA();
+                removeLiquidityBuilder.replaceClaimRewardToSTA();
+            }
             // Re-deposit fees (TODO: How to re-deposit reward tokens that is not X or Y token?)
             const initPositionAndAddLiquidityBuilder = yield dlmmPool.initializePositionAndAddLiquidityByStrategy(params.userWallet, addresses_1.HS_AUTHORITY, {
                 positionPubKey: params.newPosition,
@@ -419,29 +609,73 @@ class Transactions {
                     minBinId: params.binRange.lowerRange,
                     strategyType: types_1.StrategyTypeMap[params.distribution],
                 },
+                skipInputTokenCheck: true, // Rebalance should be independent of user wallet TA
             }, hsToMeteora_1.meteoraToHawksightAutomationIxs);
-            // Sweep dust
-            const sweepLiquidityBuilder = yield dlmmPool.addLiquidityByStrategy(params.userWallet, addresses_1.HS_AUTHORITY, {
-                positionPubKey: params.newPosition,
+            const mainInstructions = [
+                // Initialize required ATA
+                ...removeLiquidityBuilder.createAtaIxs,
+                // Remove liquidity
+                ...removeLiquidityBuilder.mainIxs,
+                // Re-deposit liquidity
+                ...initPositionAndAddLiquidityBuilder.mainIxs,
+            ];
+            return (0, functions_1.createTransactionMeta)({
+                payer: params.userWallet,
+                description: "Automation IX: Meteora Auto-rebalance instructions (Close position and deposit to new position)",
+                addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
+                mainInstructions,
+            });
+        });
+    }
+    rebalanceAutomationIx2(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
+            const program = yield meteora_1.MeteoraDLMM.program(connection);
+            const position = yield program.account.positionV2.fetch(params.currentPosition);
+            const dlmmPool = yield meteora_1.MeteoraDLMM.create(connection, position.lbPair);
+            const userPda = (0, functions_1.generateUserPda)(params.userWallet);
+            // Step 1: Claim all fees/rewards, remove all liquidity and close current position
+            const { userPositions } = yield dlmmPool.getPositionsByUserAndLbPair(userPda);
+            const userPosition = userPositions.find(userPosition => userPosition.publicKey.equals(params.currentPosition));
+            if (userPosition === undefined) {
+                throw new Error(`Position: ${params.currentPosition} does not exist.`);
+            }
+            const binIdsToRemove = userPosition.positionData.positionBinData.map((bin) => bin.binId);
+            const removeLiquidityBuilder = yield dlmmPool.removeLiquidity(params.userWallet, addresses_1.HS_AUTHORITY, {
                 user: userPda,
-                totalXAmount: new bn_js_1.default(100000), // This is overriden on-chain, so value here do not matter
-                totalYAmount: new bn_js_1.default(100000), // This is overriden on-chain, so value here do not matter
-                strategy: {
-                    maxBinId: params.binRange.upperRange,
-                    minBinId: params.binRange.lowerRange,
-                    strategyType: types_1.StrategyTypeMap["SPOT-IMBALANCED"],
-                },
-                skipInputTokenCheck: true,
+                position: params.currentPosition,
+                binIds: binIdsToRemove,
+                bps: new bn_js_1.default(10000),
+                shouldClaimAndClose: true,
             }, hsToMeteora_1.meteoraToHawksightAutomationIxs);
+            if (!!params.useAta) {
+                removeLiquidityBuilder.replaceClaimFeeTokenToATA();
+                removeLiquidityBuilder.replaceClaimRewardToATA();
+            }
+            else {
+                removeLiquidityBuilder.replaceClaimFeeTokenToSTA();
+                removeLiquidityBuilder.replaceClaimRewardToSTA();
+            }
+            // Re-deposit fees (TODO: How to re-deposit reward tokens that is not X or Y token?)
+            const { userWallet, newPosition, relativeBinRange, distribution, checkRange } = params;
+            const redepositIx = yield this.ix.meteoraDlmm.redepositAutomation(connection, {
+                userWallet,
+                lbPair: position.lbPair,
+                position: newPosition,
+                relativeLowerBinId: relativeBinRange.lowerRange,
+                relativeUpperBinId: relativeBinRange.upperRange,
+                strategyType: types_1.StrategyTypeMap[distribution],
+                checkRange: {
+                    minBinId: checkRange.lowerRange,
+                    maxBinId: checkRange.upperRange,
+                },
+            });
             const mainInstructions = [
                 // Initialize required ATA
                 ...removeLiquidityBuilder.createAtaIxs,
                 // Remove liquidity
                 ...removeLiquidityBuilder.mainIxs,
                 // Re-deposit liquidity
-                ...initPositionAndAddLiquidityBuilder.mainIxs,
-                // Sweep dust
-                ...sweepLiquidityBuilder.mainIxs,
+                redepositIx,
             ];
             return (0, functions_1.createTransactionMeta)({
                 payer: params.userWallet,
@@ -478,9 +712,9 @@ class Transactions {
             const accountsData = yield connection.getMultipleAccountsInfo(storageAddresses, "processed");
             for (let i = 0; i < accountsData.length; i++) {
                 if (!accountsData[i]) {
-                    console.log(`initializing STA: ${filteredMints[i].toBase58()}`);
+                    (0, Logging_1.Log)(`initializing STA: ${filteredMints[i].toBase58()}`);
                     mainInstructions.push(yield anchor_1.Anchor.instance().iyfMain.methods
-                        .initializeStorageTokenAccountAutomation()
+                        .initializeStorageTokenAccount()
                         .accounts({
                         userPda: userPda,
                         payer: params.userWallet,
@@ -529,6 +763,8 @@ class Transactions {
             const hawksightAuthority = addresses_1.HS_AUTHORITY;
             const { params: _params, data } = this.removeLiquidityByRangeInfo(ixs);
             const { position: _position, lbPair, binArrayBitmapExtension, reserveX, reserveY, tokenXMint, tokenYMint, tokenXProgram, tokenYProgram, binArrayLower, binArrayUpper, eventAuthority, program: meteoraDlmmProgram, } = _params;
+            let userTokenX = params.useAta ? (0, functions_1.generateAta)(userPda, tokenXMint.pubkey) : (0, functions_1.generateUserPdaStorageAccount)(userPda, tokenXMint.pubkey);
+            let userTokenY = params.useAta ? (0, functions_1.generateAta)(userPda, tokenYMint.pubkey) : (0, functions_1.generateUserPdaStorageAccount)(userPda, tokenYMint.pubkey);
             const limitCloseAutomationIx = yield anchor_1.Anchor.instance().iyfExtension.methods
                 .meteoraDlmmLimitCloseAutomation(data, params.minBinId, params.maxBinId)
                 .accounts({
@@ -540,8 +776,8 @@ class Transactions {
                 position: _position.pubkey,
                 lbPair: lbPair.pubkey,
                 binArrayBitmapExtension: binArrayBitmapExtension.pubkey,
-                userTokenX: (0, functions_1.generateUserPdaStorageAccount)(userPda, tokenXMint.pubkey),
-                userTokenY: (0, functions_1.generateUserPdaStorageAccount)(userPda, tokenYMint.pubkey),
+                userTokenX,
+                userTokenY,
                 reserveX: reserveX.pubkey,
                 reserveY: reserveY.pubkey,
                 tokenXMint: tokenXMint.pubkey,
@@ -704,8 +940,11 @@ class Transactions {
         return __awaiter(this, arguments, void 0, function* ({ connection, params }) {
             const farm = addresses_1.USDC_FARM;
             const userPda = (0, functions_1.generateUserPda)(params.userWallet, farm);
-            const position = (0, functions_1.generateOrcaPositionPDA)(params.positionMint);
-            const positionTokenAccount = (0, functions_1.generateAta)(userPda, params.positionMint);
+            const positionData = yield anchor_1.Anchor.instance().orcaProgram.account.position.fetch(params.position);
+            if (positionData === null) {
+                throw new Error(`Position: ${params.position} does not exist or already closed.`);
+            }
+            const positionTokenAccount = (0, functions_1.generateAta)(userPda, positionData.positionMint);
             const extensionIx = yield anchor_1.Anchor.instance().iyfExtension.methods
                 .orcaClosePosition()
                 .accounts({
@@ -713,8 +952,8 @@ class Transactions {
                 userPda,
                 authority: params.userWallet,
                 iyfProgram: addresses_1.IYF_MAIN,
-                positionMint: params.positionMint,
-                position,
+                positionMint: positionData.positionMint,
+                position: params.position,
                 positionTokenAccount,
                 orcaWhirlpoolProgram: addresses_1.ORCA_WHIRLPOOL_PROGRAM,
                 tokenProgram: addresses_1.TOKEN_PROGRAM_ID,
@@ -761,11 +1000,35 @@ class Transactions {
         return __awaiter(this, arguments, void 0, function* ({ connection, params }) {
             const farm = addresses_1.USDC_FARM;
             const userPda = (0, functions_1.generateUserPda)(params.userWallet, farm);
-            const position = (0, functions_1.generateOrcaPositionPDA)(params.positionMint);
-            const positionTokenAccount = (0, functions_1.generateAta)(userPda, params.positionMint);
-            const positionData = yield anchor_1.Anchor.instance().orcaProgram.account.position.fetch(position);
+            let position;
+            let positionMint;
+            let positionData;
+            if (params.mintOrPosition.position !== undefined) {
+                position = params.mintOrPosition.position;
+                positionData = yield anchor_1.Anchor.instance().orcaProgram.account.position.fetch(position);
+                positionMint = positionData.positionMint;
+            }
+            else if (params.mintOrPosition.positionMint !== undefined) {
+                positionMint = params.mintOrPosition.positionMint;
+                position = (0, functions_1.generateOrcaPositionPDA)(positionMint);
+            }
+            else {
+                throw new Error('Position mint or orca position needs to be provided.');
+            }
+            const positionTokenAccount = (0, functions_1.generateAta)(userPda, positionMint);
+            if (params.newPosition) {
+                positionData = {
+                    positionMint,
+                    whirlpool: params.newPosition.whirlpool,
+                    tickLowerIndex: params.newPosition.tickLowerIndex,
+                    tickUpperIndex: params.newPosition.tickUpperIndex,
+                };
+            }
+            else {
+                positionData = yield anchor_1.Anchor.instance().orcaProgram.account.position.fetch(position);
+            }
             if (positionData === null) {
-                throw new Error(`Position: ${position} does not exist or already closed. Position mint: ${params.positionMint}`);
+                throw new Error(`Position: ${position} does not exist or already closed. Position mint: ${positionMint}`);
             }
             const whirlpool = positionData.whirlpool;
             const whirlpoolData = yield anchor_1.Anchor.instance().orcaProgram.account.whirlpool.fetch(whirlpool);
@@ -814,7 +1077,7 @@ class Transactions {
                 userPda,
                 authority: params.userWallet,
                 iyfProgram: addresses_1.IYF_MAIN,
-                positionMint: params.positionMint,
+                positionMint,
                 whirlpool,
                 position,
                 positionTokenAccount,
@@ -887,12 +1150,14 @@ class Transactions {
         return __awaiter(this, arguments, void 0, function* ({ connection, params }) {
             const farm = addresses_1.USDC_FARM;
             const userPda = (0, functions_1.generateUserPda)(params.userWallet, farm);
-            const position = (0, functions_1.generateOrcaPositionPDA)(params.positionMint);
-            const positionTokenAccount = (0, functions_1.generateAta)(userPda, params.positionMint);
-            const positionData = yield anchor_1.Anchor.instance().orcaProgram.account.position.fetch(position);
+            const positionData = yield anchor_1.Anchor.instance().orcaProgram.account.position.fetch(params.position);
             if (positionData === null) {
-                throw new Error(`Position: ${position} does not exist or already closed. Position mint: ${params.positionMint}`);
+                throw new Error(`Position: ${params.position} does not exist or already closed.`);
             }
+            const liquidityAmount = positionData.liquidity
+                .mul(new bn_js_1.default(Math.round(params.percentage * 100)))
+                .div(new bn_js_1.default(10000));
+            const positionTokenAccount = (0, functions_1.generateAta)(userPda, positionData.positionMint);
             const whirlpool = positionData.whirlpool;
             const whirlpoolData = yield anchor_1.Anchor.instance().orcaProgram.account.whirlpool.fetch(whirlpool);
             const mintA = whirlpoolData.tokenMintA;
@@ -904,15 +1169,15 @@ class Transactions {
             const ownerFeeA = (0, functions_1.generateAta)(addresses_1.SITE_FEE_OWNER, mintA);
             const ownerFeeB = (0, functions_1.generateAta)(addresses_1.SITE_FEE_OWNER, mintB);
             const extensionIx = yield anchor_1.Anchor.instance().iyfExtension.methods
-                .orcaWithdraw(params.liquidityAmount)
+                .orcaWithdraw(liquidityAmount)
                 .accounts({
                 farm,
                 userPda,
                 authority: params.userWallet,
                 iyfProgram: addresses_1.IYF_MAIN,
-                positionMint: params.positionMint,
+                positionMint: positionData.positionMint,
                 whirlpool,
-                position,
+                position: params.position,
                 positionTokenAccount,
                 tokenOwnerAccountA,
                 tokenOwnerAccountB,
@@ -965,7 +1230,7 @@ class Transactions {
             const mainInstructions = [orcaIx, withdrawFromPda];
             return (0, functions_1.createTransactionMeta)({
                 payer: params.userWallet,
-                description: `Withdraw deposits from Orca Position: ${position}`,
+                description: `Withdraw deposits from Orca Position: ${params.position}`,
                 addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
                 mainInstructions,
             });
@@ -983,12 +1248,11 @@ class Transactions {
         return __awaiter(this, arguments, void 0, function* ({ connection, params }) {
             const farm = addresses_1.USDC_FARM;
             const userPda = (0, functions_1.generateUserPda)(params.userWallet, farm);
-            const position = (0, functions_1.generateOrcaPositionPDA)(params.positionMint);
-            const positionTokenAccount = (0, functions_1.generateAta)(userPda, params.positionMint);
-            const positionData = yield anchor_1.Anchor.instance().orcaProgram.account.position.fetch(position);
+            const positionData = yield anchor_1.Anchor.instance().orcaProgram.account.position.fetch(params.position);
             if (positionData === null) {
-                throw new Error(`Position: ${position} does not exist or already closed. Position mint: ${params.positionMint}`);
+                throw new Error(`Position: ${params.position} does not exist or already closed.`);
             }
+            const positionTokenAccount = (0, functions_1.generateAta)(userPda, positionData.positionMint);
             const whirlpool = positionData.whirlpool;
             const whirlpoolData = yield anchor_1.Anchor.instance().orcaProgram.account.whirlpool.fetch(whirlpool);
             const mintA = whirlpoolData.tokenMintA;
@@ -1019,8 +1283,8 @@ class Transactions {
                 authority: params.userWallet,
                 iyfProgram: addresses_1.IYF_MAIN,
                 whirlpool,
-                positionMint: params.positionMint,
-                position,
+                positionMint: positionData.positionMint,
+                position: params.position,
                 tickArrayLower,
                 tickArrayUpper,
                 positionTokenAccount,
@@ -1074,7 +1338,7 @@ class Transactions {
             const mainInstructions = [orcaIx, withdrawFromPda];
             return (0, functions_1.createTransactionMeta)({
                 payer: params.userWallet,
-                description: `Claim rewards from Orca Position: ${position}`,
+                description: `Claim rewards from Orca Position: ${params.position}`,
                 addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
                 mainInstructions,
             });
@@ -1082,4 +1346,4 @@ class Transactions {
     }
 }
 exports.Transactions = Transactions;
-exports.txgen = new Transactions();
+exports.txgen = Transactions.getInstance();

package/dist/src/classes/TxGenerator.d.ts

@@ -1,9 +1,10 @@
 /// <reference types="@meteora-ag/dlmm/node_modules/@solana/web3.js" />
 import * as web3 from "@solana/web3.js";
 import * as _client from "@hawksightco/swagger-client";
-import { ResponseWithStatus, TransactionMetadata, OrcaWithdraw, OrcaDeposit, OrcaClosePosition, OrcaOpenPosition, OrcaClaimRewards } from "../types";
+import { ResponseWithStatus, TransactionMetadata, OrcaWithdraw, OrcaDeposit, OrcaClosePosition, OrcaOpenPosition, OrcaClaimRewards, MeteoraClaimAll } from "../types";
 import { Client } from "./Client";
 import { GeneralUtility } from "./GeneralUtility";
+import { MultiTransaction } from "./MultiTransaction";
 /**
  * The `TxGenerator` class encapsulates methods to generate transactions with various trading operations
  * on decentralized market making platforms like Meteora and Orca within the Solana ecosystem. It allows
@@ -27,6 +28,15 @@ export declare class TxGenerator {
      * @returns A ResponseWithStatus containing either TransactionMetadataResponse or TransactionMetadata.
      */
     meteoraCreatePositionAndDeposit(connection: web3.Connection, payer: string, params: _client.TxCreatePositionAndDepositBody): Promise<ResponseWithStatus<TransactionMetadata>>;
+    /**
+     * Creates meteora instruction that creates new position and deposit.
+     *
+     * @param connection The Solana web3 connection object for blockchain interactions.
+     * @param payer The public key of the payer for transaction fees.
+     * @param params Parameters required
+     * @returns A ResponseWithStatus containing either TransactionMetadataResponse or TransactionMetadata.
+     */
+    meteoraCreatePositionAndDepositPda(connection: web3.Connection, payer: string, params: _client.TxCreatePositionAndDepositBody): Promise<ResponseWithStatus<TransactionMetadata>>;
     /**
      * Creates meteora instruction that deposits to position.
      *
@@ -45,6 +55,15 @@ export declare class TxGenerator {
      * @returns A ResponseWithStatus containing either TransactionMetadataResponse or TransactionMetadata.
      */
     meteoraWithdraw(connection: web3.Connection, payer: string, params: _client.TxWithdrawBody): Promise<ResponseWithStatus<TransactionMetadata>>;
+    /**
+     * Creates meteora instruction withdraws from a position.
+     *
+     * @param connection The Solana web3 connection object for blockchain interactions.
+     * @param payer The public key of the payer for transaction fees.
+     * @param params Parameters required
+     * @returns A ResponseWithStatus containing either TransactionMetadataResponse or TransactionMetadata.
+     */
+    meteoraWithdrawPda(connection: web3.Connection, payer: string, params: _client.TxWithdrawBody): Promise<ResponseWithStatus<TransactionMetadata>>;
     /**
      * Creates meteora instruction that claims fees and rewards.
      *
@@ -54,6 +73,15 @@ export declare class TxGenerator {
      * @returns A ResponseWithStatus containing either TransactionMetadataResponse or TransactionMetadata.
      */
     meteoraClaim(connection: web3.Connection, payer: string, params: _client.TxClaimBody): Promise<ResponseWithStatus<TransactionMetadata>>;
+    /**
+     * Creates meteora instruction that claims fees and rewards.
+     *
+     * @param connection The Solana web3 connection object for blockchain interactions.
+     * @param payer The public key of the payer for transaction fees.
+     * @param params Parameters required
+     * @returns A ResponseWithStatus containing either TransactionMetadataResponse or TransactionMetadata.
+     */
+    meteoraClaimAll(connection: web3.Connection, payer: string, params: MeteoraClaimAll): Promise<MultiTransaction>;
     /**
      * Creates meteora instruction that closes position.
      *

package/dist/src/classes/TxGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TxGenerator.d.ts","sourceRoot":"","sources":["../../../src/classes/TxGenerator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TxGenerator.d.ts","sourceRoot":"","sources":["../../../src/classes/TxGenerator.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,KAAK,OAAO,MAAM,6BAA6B,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAkE,YAAY,EAAE,WAAW,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AACtO,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAKlD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD;;;;GAIG;AACH,qBAAa,WAAW;IAQpB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc;IAPnD;;;;OAIG;gBAEgB,MAAM,EAAE,MAAM,EACZ,cAAc,EAAE,cAAc;IAGnD;;;;;;;OAOG;IACG,+BAA+B,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,8BAA8B,GAAG,OAAO,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;IAqCnL;;;;;;;OAOG;IACG,kCAAkC,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,8BAA8B,GAAG,OAAO,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;IAqCtL;;;;;;;OAOG;IACG,cAAc,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;IA2CjJ;;;;;;;OAOG;IACG,eAAe,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,cAAc,GAAG,OAAO,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;IAwCnJ;;;;;;;OAOG;IACG,kBAAkB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,cAAc,GAAG,OAAO,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;IAwCtJ;;;;;;;OAOG;IACG,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;IAwC7I;;;;;;;OAOG;IACG,eAAe,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAarH;;;;;;;OAOG;IACG,oBAAoB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,mBAAmB,GAAG,OAAO,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;IAiC7J;;;;;;;OAOG;IACK,0BAA0B,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,yBAAyB,GAAG,OAAO,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;IAkC3K;;;;;;;OAOG;IACG,gBAAgB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;IAmC9I;;;;;;;OAOG;IACG,iBAAiB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;IAgChJ;;;;;;;OAOG;IACG,WAAW,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;IAmCpI;;;;;;;OAOG;IACG,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;IAiCtI;;;;;;;OAOG;IACG,gBAAgB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;CA+B/I"}