@hawksightco/hawk-sdk 1.2.13 → 1.2.14

package/dist/src/hsToMeteora.js

@@ -31,13 +31,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.meteoraToHawksightPdaIxs = exports.meteoraToHawksightAutomationIxs = exports.meteoraToHawksight = void 0;
 const types_1 = require("./types");
 const addresses_1 = require("./addresses");
 const anchor_1 = require("./anchor");
-const bn_js_1 = require("bn.js");
+const bn_js_1 = __importDefault(require("bn.js"));
 const util = __importStar(require("./functions"));
+// import { Log } from "./classes/Logging";
+const SimpleIxGenerator_1 = require("./classes/SimpleIxGenerator");
 /**
  * Convert listed meteora instruction to generalized hawksight meteora cpi
  *
@@ -45,10 +50,10 @@ const util = __importStar(require("./functions"));
  * @returns
  */
 function meteoraToHawksight(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ ixs, userPda, authority, pdaTokenType }) {
+    return __awaiter(this, arguments, void 0, function* ({ ixs, userPda, authority, opt }) {
         const _ixs = [];
         for (const ix of ixs) {
-            const _ix = yield HawksightMeteoraCpi.factory(ix, userPda, authority, pdaTokenType).getInstruction();
+            const _ix = yield HawksightMeteoraCpi.factory(ix, userPda, authority, opt).getInstruction();
             if (ix.programId.toString() === addresses_1.ASSOCIATED_TOKEN_PROGRAM.toString() && ix.keys.length === 6) {
                 ix.keys[0] = Object.assign(Object.assign({}, ix.keys[0]), { pubkey: authority });
             }
@@ -65,10 +70,10 @@ exports.meteoraToHawksight = meteoraToHawksight;
  * @returns
  */
 function meteoraToHawksightAutomationIxs(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ ixs, userPda, authority, pdaTokenType }) {
+    return __awaiter(this, arguments, void 0, function* ({ ixs, userPda, authority, opt }) {
         const _ixs = [];
         for (const ix of ixs) {
-            const _ix = yield HawksightMeteoraAutomationCpi.factory(ix, userPda, authority, pdaTokenType).getInstruction();
+            const _ix = yield HawksightMeteoraAutomationCpi.factory(ix, userPda, authority, opt).getInstruction();
             if (ix.programId.toString() === addresses_1.ASSOCIATED_TOKEN_PROGRAM.toString() && ix.keys.length === 6) {
                 ix.keys[0] = Object.assign(Object.assign({}, ix.keys[0]), { pubkey: addresses_1.HS_AUTHORITY });
             }
@@ -85,10 +90,10 @@ exports.meteoraToHawksightAutomationIxs = meteoraToHawksightAutomationIxs;
  * @returns
  */
 function meteoraToHawksightPdaIxs(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ ixs, userPda, authority, pdaTokenType }) {
+    return __awaiter(this, arguments, void 0, function* ({ ixs, userPda, authority, opt }) {
         const _ixs = [];
         for (const ix of ixs) {
-            const _ix = yield HawksightMeteoraPdaCpi.factory(ix, userPda, authority, pdaTokenType).getInstruction();
+            const _ix = yield HawksightMeteoraPdaCpi.factory(ix, userPda, authority, opt).getInstruction();
             if (ix.programId.toString() === addresses_1.ASSOCIATED_TOKEN_PROGRAM.toString() && ix.keys.length === 6) {
                 ix.keys[0] = Object.assign(Object.assign({}, ix.keys[0]), { pubkey: addresses_1.HS_AUTHORITY });
             }
@@ -130,11 +135,12 @@ class HawksightMeteoraCpi {
      * @param authority The authority public key that has signing capabilities over the transaction.
      * @param sighash A Buffer containing the sighash used for matching the transaction instruction.
      */
-    constructor(ix, userPda, authority, sighash) {
+    constructor(ix, userPda, authority, sighash, opt) {
         this.ix = ix;
         this.userPda = userPda;
         this.authority = authority;
         this.sighash = sighash;
+        this.opt = opt;
     }
     /**
      * Factory method to create and link a chain of CPIs starting from `InitializePosition`.
@@ -144,18 +150,18 @@ class HawksightMeteoraCpi {
      * @param authority The authority public key.
      * @returns The first CPI in the chain.
      */
-    static factory(ix, userPda, authority, pdaTokenType) {
-        const chain = new InitializePosition(ix, userPda, authority);
+    static factory(ix, userPda, authority, opt) {
+        const chain = new InitializePosition(ix, userPda, authority, opt);
         chain
-            .next(new AddLiquidityByWeight(ix, userPda, authority, pdaTokenType))
-            .next(new AddLiquidityOneSide(ix, userPda, authority, pdaTokenType))
-            .next(new AddLiquidityByStrategy(ix, userPda, authority, pdaTokenType))
-            .next(new AddLiquidityByStrategyOneSide(ix, userPda, authority, pdaTokenType))
-            .next(new RemoveLiquidity(ix, userPda, authority, util.sighash("RemoveLiquidity"), pdaTokenType))
-            .next(new RemoveLiquidityByRange(ix, userPda, authority, pdaTokenType))
-            .next(new ClaimFee(ix, userPda, authority, pdaTokenType))
-            .next(new ClaimReward(ix, userPda, authority, pdaTokenType))
-            .next(new ClosePosition(ix, userPda, authority));
+            .next(new AddLiquidityByWeight(ix, userPda, authority, opt))
+            .next(new AddLiquidityOneSide(ix, userPda, authority, opt))
+            .next(new AddLiquidityByStrategy(ix, userPda, authority, opt))
+            .next(new AddLiquidityByStrategyOneSide(ix, userPda, authority, opt))
+            .next(new RemoveLiquidity(ix, userPda, authority, util.sighash("RemoveLiquidity"), opt))
+            .next(new RemoveLiquidityByRange(ix, userPda, authority, opt))
+            .next(new ClaimFee(ix, userPda, authority, opt))
+            .next(new ClaimReward(ix, userPda, authority, opt))
+            .next(new ClosePosition(ix, userPda, authority, opt));
         return chain;
     }
     /**
@@ -248,8 +254,8 @@ class InitializePosition extends HawksightMeteoraCpi {
      * @param userPda The user's program-derived address (PDA) as a public key.
      * @param authority The authority public key that has signing capabilities over the transaction.
      */
-    constructor(ix, userPda, authority) {
-        super(ix, userPda, authority, util.sighash("InitializePosition"));
+    constructor(ix, userPda, authority, opt) {
+        super(ix, userPda, authority, util.sighash("InitializePosition"), opt);
     }
     /**
      * Modifies the transaction keys to set the correct public keys for an initial position setup.
@@ -272,22 +278,23 @@ class AddLiquidityByWeight extends HawksightMeteoraCpi {
      * @param userPda The user's program-derived address (PDA) as a public key.
      * @param authority The authority public key that has signing capabilities over the transaction.
      */
-    constructor(ix, userPda, authority, pdaTokenType) {
-        super(ix, userPda, authority, util.sighash("AddLiquidityByWeight"));
-        this.pdaTokenType = pdaTokenType;
+    constructor(ix, userPda, authority, opt) {
+        super(ix, userPda, authority, util.sighash("AddLiquidityByWeight"), opt);
     }
     /**
      * Alters the transaction keys for adding liquidity, ensuring the user's PDA is correctly configured.
      */
     replace() {
+        var _a;
         this.ix.keys[11].pubkey = this.userPda;
         this.ix.keys[11].isSigner = false;
         // Adjust by token type
-        if (this.pdaTokenType === types_1.TokenType.LTA) {
+        const pdaTokenType = (_a = this.opt) === null || _a === void 0 ? void 0 : _a.pdaTokenType;
+        if (pdaTokenType === types_1.TokenType.LTA) {
             this.ix.keys[3].pubkey = util.generateLimitToken(this.userPda, this.ix.keys[7].pubkey);
             this.ix.keys[4].pubkey = util.generateLimitToken(this.userPda, this.ix.keys[8].pubkey);
         }
-        else if (this.pdaTokenType === types_1.TokenType.STA) {
+        else if (pdaTokenType === types_1.TokenType.STA) {
             this.ix.keys[3].pubkey = util.generateUserPdaStorageAccount(this.userPda, this.ix.keys[7].pubkey);
             this.ix.keys[4].pubkey = util.generateUserPdaStorageAccount(this.userPda, this.ix.keys[8].pubkey);
         }
@@ -309,22 +316,23 @@ class AddLiquidityByStrategy extends HawksightMeteoraCpi {
      * @param userPda The user's program-derived address (PDA) as a public key.
      * @param authority The authority public key that has signing capabilities over the transaction.
      */
-    constructor(ix, userPda, authority, pdaTokenType) {
+    constructor(ix, userPda, authority, opt) {
         super(ix, userPda, authority, util.sighash("AddLiquidityByStrategy"));
-        this.pdaTokenType = pdaTokenType;
     }
     /**
      * Alters the transaction keys for adding liquidity, ensuring the user's PDA is correctly configured.
      */
     replace() {
+        var _a;
         this.ix.keys[11].pubkey = this.userPda;
         this.ix.keys[11].isSigner = false;
         // Adjust by token type
-        if (this.pdaTokenType === types_1.TokenType.LTA) {
+        const pdaTokenType = (_a = this.opt) === null || _a === void 0 ? void 0 : _a.pdaTokenType;
+        if (pdaTokenType === types_1.TokenType.LTA) {
             this.ix.keys[3].pubkey = util.generateLimitToken(this.userPda, this.ix.keys[7].pubkey);
             this.ix.keys[4].pubkey = util.generateLimitToken(this.userPda, this.ix.keys[8].pubkey);
         }
-        else if (this.pdaTokenType === types_1.TokenType.STA) {
+        else if (pdaTokenType === types_1.TokenType.STA) {
             this.ix.keys[3].pubkey = util.generateUserPdaStorageAccount(this.userPda, this.ix.keys[7].pubkey);
             this.ix.keys[4].pubkey = util.generateUserPdaStorageAccount(this.userPda, this.ix.keys[8].pubkey);
         }
@@ -346,21 +354,22 @@ class AddLiquidityOneSide extends HawksightMeteoraCpi {
      * @param userPda The user's program-derived address (PDA) as a public key.
      * @param authority The authority public key that has signing capabilities over the transaction.
      */
-    constructor(ix, userPda, authority, pdaTokenType) {
-        super(ix, userPda, authority, util.sighash("AddLiquidityOneSide"));
-        this.pdaTokenType = pdaTokenType;
+    constructor(ix, userPda, authority, opt) {
+        super(ix, userPda, authority, util.sighash("AddLiquidityOneSide"), opt);
     }
     /**
      * Alters the transaction keys for adding liquidity, ensuring the user's PDA is correctly configured.
      */
     replace() {
+        var _a;
         this.ix.keys[8].pubkey = this.userPda;
         this.ix.keys[8].isSigner = false;
         // Adjust by token type
-        if (this.pdaTokenType === types_1.TokenType.LTA) {
+        const pdaTokenType = (_a = this.opt) === null || _a === void 0 ? void 0 : _a.pdaTokenType;
+        if (pdaTokenType === types_1.TokenType.LTA) {
             this.ix.keys[3].pubkey = util.generateLimitToken(this.userPda, this.ix.keys[5].pubkey);
         }
-        else if (this.pdaTokenType === types_1.TokenType.STA) {
+        else if (pdaTokenType === types_1.TokenType.STA) {
             this.ix.keys[3].pubkey = util.generateUserPdaStorageAccount(this.userPda, this.ix.keys[5].pubkey);
         }
         else {
@@ -380,21 +389,22 @@ class AddLiquidityByStrategyOneSide extends HawksightMeteoraCpi {
      * @param userPda The user's program-derived address (PDA) as a public key.
      * @param authority The authority public key that has signing capabilities over the transaction.
      */
-    constructor(ix, userPda, authority, pdaTokenType) {
-        super(ix, userPda, authority, util.sighash("AddLiquidityByStrategyOneSide"));
-        this.pdaTokenType = pdaTokenType;
+    constructor(ix, userPda, authority, opt) {
+        super(ix, userPda, authority, util.sighash("AddLiquidityByStrategyOneSide"), opt);
     }
     /**
      * Alters the transaction keys for adding liquidity, ensuring the user's PDA is correctly configured.
      */
     replace() {
+        var _a;
         this.ix.keys[8].pubkey = this.userPda;
         this.ix.keys[8].isSigner = false;
         // Adjust by token type
-        if (this.pdaTokenType === types_1.TokenType.LTA) {
+        const pdaTokenType = (_a = this.opt) === null || _a === void 0 ? void 0 : _a.pdaTokenType;
+        if (pdaTokenType === types_1.TokenType.LTA) {
             this.ix.keys[3].pubkey = util.generateLimitToken(this.userPda, this.ix.keys[5].pubkey);
         }
-        else if (this.pdaTokenType === types_1.TokenType.STA) {
+        else if (pdaTokenType === types_1.TokenType.STA) {
             this.ix.keys[3].pubkey = util.generateUserPdaStorageAccount(this.userPda, this.ix.keys[5].pubkey);
         }
         else {
@@ -413,22 +423,23 @@ class RemoveLiquidity extends HawksightMeteoraCpi {
      * @param userPda The user's program-derived address (PDA) as a public key.
      * @param authority The authority public key that has signing capabilities over the transaction.
      */
-    constructor(ix, userPda, authority, sighash = util.sighash("RemoveLiquidity"), pdaTokenType) {
-        super(ix, userPda, authority, sighash);
-        this.pdaTokenType = pdaTokenType;
+    constructor(ix, userPda, authority, sighash = util.sighash("RemoveLiquidity"), opt) {
+        super(ix, userPda, authority, sighash, opt);
     }
     /**
      * Customizes the transaction keys to correctly handle the removal of liquidity.
      */
     replace() {
+        var _a;
         this.ix.keys[11].pubkey = this.userPda;
         this.ix.keys[11].isSigner = false;
         // Adjust by token type
-        if (this.pdaTokenType === types_1.TokenType.LTA) {
+        const pdaTokenType = (_a = this.opt) === null || _a === void 0 ? void 0 : _a.pdaTokenType;
+        if (pdaTokenType === types_1.TokenType.LTA) {
             this.ix.keys[3].pubkey = util.generateLimitToken(this.userPda, this.ix.keys[7].pubkey);
             this.ix.keys[4].pubkey = util.generateLimitToken(this.userPda, this.ix.keys[8].pubkey);
         }
-        else if (this.pdaTokenType === types_1.TokenType.STA) {
+        else if (pdaTokenType === types_1.TokenType.STA) {
             this.ix.keys[3].pubkey = util.generateUserPdaStorageAccount(this.userPda, this.ix.keys[7].pubkey);
             this.ix.keys[4].pubkey = util.generateUserPdaStorageAccount(this.userPda, this.ix.keys[8].pubkey);
         }
@@ -449,8 +460,8 @@ class RemoveLiquidityByRange extends RemoveLiquidity {
      * @param userPda The user's program-derived address (PDA) as a public key.
      * @param authority The authority public key that has signing capabilities over the transaction.
      */
-    constructor(ix, userPda, authority, pdaTokenType) {
-        super(ix, userPda, authority, util.sighash("RemoveLiquidityByRange"), pdaTokenType);
+    constructor(ix, userPda, authority, opt) {
+        super(ix, userPda, authority, util.sighash("RemoveLiquidityByRange"), opt);
     }
 }
 /**
@@ -464,22 +475,23 @@ class ClaimFee extends HawksightMeteoraCpi {
      * @param userPda The user's program-derived address (PDA) as a public key.
      * @param authority The authority public key that has signing capabilities over the transaction.
      */
-    constructor(ix, userPda, authority, pdaTokenType) {
-        super(ix, userPda, authority, util.sighash("ClaimFee"));
-        this.pdaTokenType = pdaTokenType;
+    constructor(ix, userPda, authority, opt) {
+        super(ix, userPda, authority, util.sighash("ClaimFee"), opt);
     }
     /**
      * Modifies transaction keys for the purpose of claiming transaction fees.
      */
     replace() {
+        var _a;
         this.ix.keys[4].pubkey = this.userPda;
         this.ix.keys[4].isSigner = false;
         // Adjust by token type
-        if (this.pdaTokenType === types_1.TokenType.LTA) {
+        const pdaTokenType = (_a = this.opt) === null || _a === void 0 ? void 0 : _a.pdaTokenType;
+        if (pdaTokenType === types_1.TokenType.LTA) {
             this.ix.keys[7].pubkey = util.generateLimitToken(this.userPda, this.ix.keys[9].pubkey);
             this.ix.keys[8].pubkey = util.generateLimitToken(this.userPda, this.ix.keys[10].pubkey);
         }
-        else if (this.pdaTokenType === types_1.TokenType.STA) {
+        else if (pdaTokenType === types_1.TokenType.STA) {
             this.ix.keys[7].pubkey = util.generateUserPdaStorageAccount(this.userPda, this.ix.keys[9].pubkey);
             this.ix.keys[8].pubkey = util.generateUserPdaStorageAccount(this.userPda, this.ix.keys[10].pubkey);
         }
@@ -575,21 +587,22 @@ class ClaimReward extends HawksightMeteoraCpi {
      * @param userPda The user's program-derived address (PDA) as a public key.
      * @param authority The authority public key that has signing capabilities over the transaction.
      */
-    constructor(ix, userPda, authority, pdaTokenType) {
-        super(ix, userPda, authority, util.sighash("ClaimReward"));
-        this.pdaTokenType = pdaTokenType;
+    constructor(ix, userPda, authority, opt) {
+        super(ix, userPda, authority, util.sighash("ClaimReward"), opt);
     }
     /**
      * Adjusts transaction keys to facilitate the claiming of rewards.
      */
     replace() {
+        var _a;
         this.ix.keys[4].pubkey = this.userPda;
         this.ix.keys[4].isSigner = false;
         // Adjust by token type
-        if (this.pdaTokenType === types_1.TokenType.LTA) {
+        const pdaTokenType = (_a = this.opt) === null || _a === void 0 ? void 0 : _a.pdaTokenType;
+        if (pdaTokenType === types_1.TokenType.LTA) {
             this.ix.keys[7].pubkey = util.generateLimitToken(this.userPda, this.ix.keys[6].pubkey);
         }
-        else if (this.pdaTokenType === types_1.TokenType.STA) {
+        else if (pdaTokenType === types_1.TokenType.STA) {
             this.ix.keys[7].pubkey = util.generateUserPdaStorageAccount(this.userPda, this.ix.keys[6].pubkey);
         }
         else {
@@ -611,7 +624,7 @@ class ClaimReward extends HawksightMeteoraCpi {
             // Generate owner fee X and Y ATA
             const ownerFee = util.generateAta(addresses_1.SITE_FEE_OWNER, rewardMint);
             // Get reward index from parameter
-            const rewardIndex = new bn_js_1.BN(this.ix.data.readBigInt64LE(8).toString());
+            const rewardIndex = new bn_js_1.default(this.ix.data.readBigInt64LE(8).toString());
             // Generate IX via extension contract
             // @ts-ignore
             const claimReward = yield anchor_1.Anchor.instance().iyfExtension.methods
@@ -675,8 +688,8 @@ class ClosePosition extends HawksightMeteoraCpi {
      * @param userPda The user's program-derived address (PDA) as a public key.
      * @param authority The authority public key that has signing capabilities over the transaction.
      */
-    constructor(ix, userPda, authority) {
-        super(ix, userPda, authority, util.sighash("ClosePosition"));
+    constructor(ix, userPda, authority, opt) {
+        super(ix, userPda, authority, util.sighash("ClosePosition"), opt);
     }
     /**
      * Customizes the transaction keys to properly close a position, ensuring all relevant keys are set correctly.
@@ -700,11 +713,12 @@ class HawksightMeteoraAutomationCpi {
      * @param authority The authority public key that has signing capabilities over the transaction.
      * @param sighash A Buffer containing the sighash used for matching the transaction instruction.
      */
-    constructor(_ix, userPda, authority, sighash) {
+    constructor(_ix, userPda, authority, sighash, opt) {
         this._ix = _ix;
         this.userPda = userPda;
         this.authority = authority;
         this.sighash = sighash;
+        this.opt = opt;
     }
     /**
      * Factory method to create and link a chain of CPIs starting from `InitializePosition`.
@@ -714,16 +728,17 @@ class HawksightMeteoraAutomationCpi {
      * @param authority The authority public key.
      * @returns The first CPI in the chain.
      */
-    static factory(ix, userPda, authority, pdaTokenType) {
-        const chain = new InitializePositionAutomation(ix, userPda, authority);
+    static factory(ix, userPda, authority, opt) {
+        const chain = new InitializePositionAutomation(ix, userPda, authority, opt);
         chain
-            .next(new AddLiquidityByWeightAutomation(ix, userPda, authority, pdaTokenType))
-            .next(new AddLiquidityOneSideAutomation(ix, userPda, authority, pdaTokenType))
-            .next(new RemoveLiquidityAutomation(ix, userPda, authority, util.sighash("RemoveLiquidity"), pdaTokenType))
-            .next(new RemoveLiquidityByRangeAutomation(ix, userPda, authority, pdaTokenType))
-            .next(new ClaimFeeAutomation(ix, userPda, authority, pdaTokenType))
-            .next(new ClaimRewardAutomation(ix, userPda, authority, pdaTokenType))
-            .next(new ClosePositionAutomation(ix, userPda, authority));
+            .next(new AddLiquidityByStrategyAutomation(ix, userPda, authority, opt))
+            .next(new AddLiquidityByWeightAutomation(ix, userPda, authority, opt))
+            .next(new AddLiquidityOneSideAutomation(ix, userPda, authority, opt))
+            .next(new RemoveLiquidityAutomation(ix, userPda, authority, util.sighash("RemoveLiquidity"), opt))
+            .next(new RemoveLiquidityByRangeAutomation(ix, userPda, authority, opt))
+            .next(new ClaimFeeAutomation(ix, userPda, authority, opt))
+            .next(new ClaimRewardAutomation(ix, userPda, authority, opt))
+            .next(new ClosePositionAutomation(ix, userPda, authority, opt));
         return chain;
     }
     /**
@@ -792,8 +807,8 @@ class InitializePositionAutomation extends HawksightMeteoraAutomationCpi {
      * @param userPda The user's program-derived address (PDA) as a public key.
      * @param authority The authority public key that has signing capabilities over the transaction.
      */
-    constructor(ix, userPda, authority) {
-        super(ix, userPda, authority, util.sighash("InitializePosition"));
+    constructor(ix, userPda, authority, opt) {
+        super(ix, userPda, authority, util.sighash("InitializePosition"), opt);
     }
     /**
      * Modifies the transaction keys to set the correct public keys for an initial position setup.
@@ -862,6 +877,8 @@ class InitializePositionAutomation extends HawksightMeteoraAutomationCpi {
 /**
  * Adjusts transaction instructions to add liquidity based on a specific weight in a financial application.
  * This class is designed for blockchain operations that manage liquidity pools.
+ *
+ * PS: Not used by meteora API. It uses addLiquidityByStrategy instead so it's expected that this won't be called.
  */
 class AddLiquidityByWeightAutomation extends HawksightMeteoraAutomationCpi {
     /**
@@ -871,9 +888,8 @@ class AddLiquidityByWeightAutomation extends HawksightMeteoraAutomationCpi {
      * @param userPda The user's program-derived address (PDA) as a public key.
      * @param authority The authority public key that has signing capabilities over the transaction.
      */
-    constructor(ix, userPda, authority, pdaTokenType) {
-        super(ix, userPda, authority, util.sighash("AddLiquidityByWeight"));
-        this.pdaTokenType = pdaTokenType;
+    constructor(ix, userPda, authority, opt) {
+        super(ix, userPda, authority, util.sighash("AddLiquidityByWeight"), opt);
     }
     /**
      * Alters the transaction keys for adding liquidity, ensuring the user's PDA is correctly configured.
@@ -881,25 +897,13 @@ class AddLiquidityByWeightAutomation extends HawksightMeteoraAutomationCpi {
     replace() {
         this._ix.keys[11].pubkey = this.userPda;
         this._ix.keys[11].isSigner = false;
-        // Adjust by token type
-        if (this.pdaTokenType === types_1.TokenType.LTA) {
-            this.ix.keys[3].pubkey = util.generateLimitToken(this.userPda, this.ix.keys[7].pubkey);
-            this.ix.keys[4].pubkey = util.generateLimitToken(this.userPda, this.ix.keys[8].pubkey);
-        }
-        else if (this.pdaTokenType === types_1.TokenType.STA) {
-            this.ix.keys[3].pubkey = util.generateUserPdaStorageAccount(this.userPda, this.ix.keys[7].pubkey);
-            this.ix.keys[4].pubkey = util.generateUserPdaStorageAccount(this.userPda, this.ix.keys[8].pubkey);
-        }
-        else {
-            this.ix.keys[3].pubkey = util.generateAta(this.userPda, this.ix.keys[7].pubkey);
-            this.ix.keys[4].pubkey = util.generateAta(this.userPda, this.ix.keys[8].pubkey);
-        }
     }
     /**
      * Replaces Meteora CPI with Hawksight CPI that calls the target Meteora CPI.
      */
     replaceCpi() {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             // Common parameters
             const farm = addresses_1.USDC_FARM;
             const userPda = this.userPda;
@@ -917,6 +921,20 @@ class AddLiquidityByWeightAutomation extends HawksightMeteoraAutomationCpi {
             const strategyParametersMaxBinId = data.subarray(28, 32).readInt32LE();
             const strategyParametersStrategyType = data[32];
             const strategyParametersParameters = Array.from(data.subarray(33));
+            // Adjust by token type
+            const pdaTokenType = (_a = this.opt) === null || _a === void 0 ? void 0 : _a.pdaTokenType;
+            if (pdaTokenType === types_1.TokenType.LTA) {
+                this.ix.keys[3].pubkey = util.generateLimitToken(this.userPda, this.ix.keys[7].pubkey);
+                this.ix.keys[4].pubkey = util.generateLimitToken(this.userPda, this.ix.keys[8].pubkey);
+            }
+            else if (pdaTokenType === types_1.TokenType.STA) {
+                this.ix.keys[3].pubkey = util.generateUserPdaStorageAccount(this.userPda, this.ix.keys[7].pubkey);
+                this.ix.keys[4].pubkey = util.generateUserPdaStorageAccount(this.userPda, this.ix.keys[8].pubkey);
+            }
+            else {
+                this.ix.keys[3].pubkey = util.generateAta(this.userPda, this.ix.keys[7].pubkey);
+                this.ix.keys[4].pubkey = util.generateAta(this.userPda, this.ix.keys[8].pubkey);
+            }
             // @ts-ignore
             const depositIx = yield anchor_1.Anchor.instance().iyfExtension.methods
                 .meteoraDlmmDepositAutomation(activeId, maxActiveBinSlippage, strategyParametersMinBinId, strategyParametersMaxBinId, strategyParametersStrategyType, strategyParametersParameters)
@@ -976,6 +994,123 @@ class AddLiquidityByWeightAutomation extends HawksightMeteoraAutomationCpi {
         });
     }
 }
+/**
+ * Adjusts transaction instructions to add liquidity based on a specific weight in a financial application.
+ * This class is designed for blockchain operations that manage liquidity pools.
+ */
+class AddLiquidityByStrategyAutomation extends HawksightMeteoraAutomationCpi {
+    /**
+     * Constructs an instance of InitializePosition with the necessary transaction parameters.
+     *
+     * @param ix The core transaction instruction.
+     * @param userPda The user's program-derived address (PDA) as a public key.
+     * @param authority The authority public key that has signing capabilities over the transaction.
+     */
+    constructor(ix, userPda, authority, opt) {
+        super(ix, userPda, authority, util.sighash("AddLiquidityByStrategy"), opt);
+    }
+    /**
+     * Alters the transaction keys for adding liquidity, ensuring the user's PDA is correctly configured.
+     */
+    replace() {
+        // Note: Essentially not needed due to `replaceCpi` function that overrides the instruction.
+        // Thus, commenting out the contents of `replace` function.
+        // this._ix.keys[11].pubkey = this.userPda;
+        // this._ix.keys[11].isSigner = false;
+    }
+    /**
+     * Replaces Meteora CPI with Hawksight CPI that calls the target Meteora CPI.
+     */
+    replaceCpi() {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c;
+            const generator = new SimpleIxGenerator_1.SimpleIxGenerator();
+            // Common parameters
+            const authority = this.authority;
+            // Get token mints X and Y
+            const tokenXMint = this.ix.keys[7].pubkey;
+            const tokenYMint = this.ix.keys[8].pubkey;
+            // Generate IX via extension contract
+            const data = this.ix.data.subarray(8);
+            const activeId = data.subarray(16, 20).readInt32LE();
+            const maxActiveBinSlippage = data.subarray(20, 24).readInt32LE();
+            const strategyParametersMinBinId = data.subarray(24, 28).readInt32LE();
+            const strategyParametersMaxBinId = data.subarray(28, 32).readInt32LE();
+            const strategyParametersStrategyType = data[32];
+            const strategyParametersParameters = Array.from(data.subarray(33));
+            const pdaTokenType = (_a = this.opt) === null || _a === void 0 ? void 0 : _a.pdaTokenType;
+            const withAmount = (_c = (_b = this.opt) === null || _b === void 0 ? void 0 : _b.params) === null || _c === void 0 ? void 0 : _c.withAmount;
+            if (withAmount !== undefined) {
+                const userTokenXAmount = withAmount.userTokenXAmount;
+                const userTokenYAmount = withAmount.userTokenYAmount;
+                if (userTokenXAmount === undefined) {
+                    throw new Error("opt.params.withAmount.userTokenXAmount is required");
+                }
+                if (userTokenYAmount === undefined) {
+                    throw new Error("opt.params.withAmount.userTokenYAmount is required");
+                }
+                const ix = yield generator.meteoraDlmm.depositWithAmountAutomation(anchor_1.Anchor.instance().connection, {
+                    userWallet: authority,
+                    lbPair: this.ix.keys[1].pubkey,
+                    position: this.ix.keys[0].pubkey,
+                    tokenXMint,
+                    tokenYMint,
+                    binArrayBitmapExtension: this.ix.keys[2].pubkey,
+                    binArrayLower: this.ix.keys[9].pubkey,
+                    binArrayUpper: this.ix.keys[10].pubkey,
+                    tokenXProgram: this.ix.keys[12].pubkey,
+                    tokenYProgram: this.ix.keys[13].pubkey,
+                    activeId,
+                    maxActiveBinSlippage,
+                    strategyParametersMinBinId,
+                    strategyParametersMaxBinId,
+                    strategyParametersStrategyType,
+                    strategyParametersParameters,
+                    userTokenXAmount,
+                    userTokenYAmount,
+                    tokenType: pdaTokenType,
+                });
+                // Override the instruction
+                this._ix = ix;
+                return;
+            }
+            // Adjust by token type
+            if (pdaTokenType === types_1.TokenType.LTA) {
+                this.ix.keys[3].pubkey = util.generateLimitToken(this.userPda, this.ix.keys[7].pubkey);
+                this.ix.keys[4].pubkey = util.generateLimitToken(this.userPda, this.ix.keys[8].pubkey);
+            }
+            else if (pdaTokenType === types_1.TokenType.STA) {
+                this.ix.keys[3].pubkey = util.generateUserPdaStorageAccount(this.userPda, this.ix.keys[7].pubkey);
+                this.ix.keys[4].pubkey = util.generateUserPdaStorageAccount(this.userPda, this.ix.keys[8].pubkey);
+            }
+            else {
+                this.ix.keys[3].pubkey = util.generateAta(this.userPda, this.ix.keys[7].pubkey);
+                this.ix.keys[4].pubkey = util.generateAta(this.userPda, this.ix.keys[8].pubkey);
+            }
+            const ix = yield generator.meteoraDlmm.depositAutomation(anchor_1.Anchor.instance().connection, {
+                userWallet: authority,
+                lbPair: this.ix.keys[1].pubkey,
+                position: this.ix.keys[0].pubkey,
+                tokenXMint,
+                tokenYMint,
+                binArrayBitmapExtension: this.ix.keys[2].pubkey,
+                binArrayLower: this.ix.keys[9].pubkey,
+                binArrayUpper: this.ix.keys[10].pubkey,
+                tokenXProgram: this.ix.keys[12].pubkey,
+                tokenYProgram: this.ix.keys[13].pubkey,
+                activeId,
+                maxActiveBinSlippage,
+                strategyParametersMinBinId,
+                strategyParametersMaxBinId,
+                strategyParametersStrategyType,
+                strategyParametersParameters,
+                tokenType: pdaTokenType,
+            });
+            // Override the instruction
+            this._ix = ix;
+        });
+    }
+}
 /**
  * Adjusts transaction instructions to add liquidity based on a specific weight in a financial application.
  * This class is designed for blockchain operations that manage liquidity pools.
@@ -988,9 +1123,8 @@ class AddLiquidityOneSideAutomation extends HawksightMeteoraAutomationCpi {
      * @param userPda The user's program-derived address (PDA) as a public key.
      * @param authority The authority public key that has signing capabilities over the transaction.
      */
-    constructor(ix, userPda, authority, pdaTokenType) {
-        super(ix, userPda, authority, util.sighash("AddLiquidityByStrategyOneSide"));
-        this.pdaTokenType = pdaTokenType;
+    constructor(ix, userPda, authority, opt) {
+        super(ix, userPda, authority, util.sighash("AddLiquidityByStrategyOneSide"), opt);
     }
     /**
      * Alters the transaction keys for adding liquidity, ensuring the user's PDA is correctly configured.
@@ -998,28 +1132,30 @@ class AddLiquidityOneSideAutomation extends HawksightMeteoraAutomationCpi {
     replace() {
         this._ix.keys[8].pubkey = this.userPda;
         this._ix.keys[8].isSigner = false;
-        // Adjust by token type
-        if (this.pdaTokenType === types_1.TokenType.LTA) {
-            this.ix.keys[3].pubkey = util.generateLimitToken(this.userPda, this.ix.keys[5].pubkey);
-        }
-        else if (this.pdaTokenType === types_1.TokenType.STA) {
-            this.ix.keys[3].pubkey = util.generateUserPdaStorageAccount(this.userPda, this.ix.keys[5].pubkey);
-        }
-        else {
-            this.ix.keys[3].pubkey = util.generateAta(this.userPda, this.ix.keys[5].pubkey);
-        }
     }
     /**
      * Replaces Meteora CPI with Hawksight CPI that calls the target Meteora CPI.
      */
     replaceCpi() {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             // Common parameters
             const farm = addresses_1.USDC_FARM;
             const userPda = this.userPda;
             const authority = this.authority;
             const iyfProgram = addresses_1.IYF_MAIN;
             const hawksightAuthority = addresses_1.HS_AUTHORITY;
+            // Adjust by token type
+            const pdaTokenType = (_a = this.opt) === null || _a === void 0 ? void 0 : _a.pdaTokenType;
+            if (pdaTokenType === types_1.TokenType.LTA) {
+                this.ix.keys[3].pubkey = util.generateLimitToken(this.userPda, this.ix.keys[5].pubkey);
+            }
+            else if (pdaTokenType === types_1.TokenType.STA) {
+                this.ix.keys[3].pubkey = util.generateUserPdaStorageAccount(this.userPda, this.ix.keys[5].pubkey);
+            }
+            else {
+                this.ix.keys[3].pubkey = util.generateAta(this.userPda, this.ix.keys[5].pubkey);
+            }
             // Generate IX via extension contract
             // @ts-ignore
             const depositIx = yield anchor_1.Anchor.instance().iyfExtension.methods
@@ -1083,9 +1219,8 @@ class RemoveLiquidityAutomation extends HawksightMeteoraAutomationCpi {
      * @param userPda The user's program-derived address (PDA) as a public key.
      * @param authority The authority public key that has signing capabilities over the transaction.
      */
-    constructor(ix, userPda, authority, sighash = util.sighash("RemoveLiquidity"), pdaTokenType) {
-        super(ix, userPda, authority, sighash);
-        this.pdaTokenType = pdaTokenType;
+    constructor(ix, userPda, authority, sighash = util.sighash("RemoveLiquidity"), opt) {
+        super(ix, userPda, authority, sighash, opt);
     }
     /**
      * Customizes the transaction keys to correctly handle the removal of liquidity.
@@ -1093,25 +1228,13 @@ class RemoveLiquidityAutomation extends HawksightMeteoraAutomationCpi {
     replace() {
         this._ix.keys[11].pubkey = this.userPda;
         this._ix.keys[11].isSigner = false;
-        // Adjust by token type
-        if (this.pdaTokenType === types_1.TokenType.LTA) {
-            this.ix.keys[3].pubkey = util.generateLimitToken(this.userPda, this.ix.keys[7].pubkey);
-            this.ix.keys[4].pubkey = util.generateLimitToken(this.userPda, this.ix.keys[8].pubkey);
-        }
-        else if (this.pdaTokenType === types_1.TokenType.STA) {
-            this.ix.keys[3].pubkey = util.generateUserPdaStorageAccount(this.userPda, this.ix.keys[7].pubkey);
-            this.ix.keys[4].pubkey = util.generateUserPdaStorageAccount(this.userPda, this.ix.keys[8].pubkey);
-        }
-        else {
-            this.ix.keys[3].pubkey = util.generateAta(this.userPda, this.ix.keys[7].pubkey);
-            this.ix.keys[4].pubkey = util.generateAta(this.userPda, this.ix.keys[8].pubkey);
-        }
     }
     /**
      * Replaces Meteora CPI with Hawksight CPI that calls the target Meteora CPI.
      */
     replaceCpi() {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             // Common parameters
             const farm = addresses_1.USDC_FARM;
             const userPda = this.userPda;
@@ -1121,6 +1244,20 @@ class RemoveLiquidityAutomation extends HawksightMeteoraAutomationCpi {
             // Get token mints X and Y
             const tokenXMint = this.ix.keys[7].pubkey;
             const tokenYMint = this.ix.keys[8].pubkey;
+            // Adjust by token type
+            const pdaTokenType = (_a = this.opt) === null || _a === void 0 ? void 0 : _a.pdaTokenType;
+            if (pdaTokenType === types_1.TokenType.LTA) {
+                this.ix.keys[3].pubkey = util.generateLimitToken(this.userPda, this.ix.keys[7].pubkey);
+                this.ix.keys[4].pubkey = util.generateLimitToken(this.userPda, this.ix.keys[8].pubkey);
+            }
+            else if (pdaTokenType === types_1.TokenType.STA) {
+                this.ix.keys[3].pubkey = util.generateUserPdaStorageAccount(this.userPda, this.ix.keys[7].pubkey);
+                this.ix.keys[4].pubkey = util.generateUserPdaStorageAccount(this.userPda, this.ix.keys[8].pubkey);
+            }
+            else {
+                this.ix.keys[3].pubkey = util.generateAta(this.userPda, this.ix.keys[7].pubkey);
+                this.ix.keys[4].pubkey = util.generateAta(this.userPda, this.ix.keys[8].pubkey);
+            }
             // Generate IX via extension contract
             // @ts-ignore
             const withdrawIx = yield anchor_1.Anchor.instance().iyfExtension.methods
@@ -1192,8 +1329,8 @@ class RemoveLiquidityByRangeAutomation extends RemoveLiquidityAutomation {
      * @param userPda The user's program-derived address (PDA) as a public key.
      * @param authority The authority public key that has signing capabilities over the transaction.
      */
-    constructor(ix, userPda, authority, pdaTokenType) {
-        super(ix, userPda, authority, util.sighash("RemoveLiquidityByRange"), pdaTokenType);
+    constructor(ix, userPda, authority, opt) {
+        super(ix, userPda, authority, util.sighash("RemoveLiquidityByRange"), opt);
     }
 }
 /**
@@ -1207,9 +1344,8 @@ class ClaimFeeAutomation extends HawksightMeteoraAutomationCpi {
      * @param userPda The user's program-derived address (PDA) as a public key.
      * @param authority The authority public key that has signing capabilities over the transaction.
      */
-    constructor(ix, userPda, authority, pdaTokenType) {
-        super(ix, userPda, authority, util.sighash("ClaimFee"));
-        this.pdaTokenType = pdaTokenType;
+    constructor(ix, userPda, authority, opt) {
+        super(ix, userPda, authority, util.sighash("ClaimFee"), opt);
     }
     /**
      * Modifies transaction keys for the purpose of claiming transaction fees.
@@ -1217,25 +1353,13 @@ class ClaimFeeAutomation extends HawksightMeteoraAutomationCpi {
     replace() {
         this._ix.keys[4].pubkey = this.userPda;
         this._ix.keys[4].isSigner = false;
-        // Adjust by token type
-        if (this.pdaTokenType === types_1.TokenType.LTA) {
-            this.ix.keys[7].pubkey = util.generateLimitToken(this.userPda, this.ix.keys[9].pubkey);
-            this.ix.keys[8].pubkey = util.generateLimitToken(this.userPda, this.ix.keys[10].pubkey);
-        }
-        else if (this.pdaTokenType === types_1.TokenType.STA) {
-            this.ix.keys[7].pubkey = util.generateUserPdaStorageAccount(this.userPda, this.ix.keys[9].pubkey);
-            this.ix.keys[8].pubkey = util.generateUserPdaStorageAccount(this.userPda, this.ix.keys[10].pubkey);
-        }
-        else {
-            this.ix.keys[7].pubkey = util.generateAta(this.userPda, this.ix.keys[9].pubkey);
-            this.ix.keys[8].pubkey = util.generateAta(this.userPda, this.ix.keys[10].pubkey);
-        }
     }
     /**
      * Replaces Meteora CPI with Hawksight CPI that calls the target Meteora CPI.
      */
     replaceCpi() {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             // Common parameters
             const farm = addresses_1.USDC_FARM;
             const userPda = this.userPda;
@@ -1248,6 +1372,20 @@ class ClaimFeeAutomation extends HawksightMeteoraAutomationCpi {
             // Generate owner fee X and Y ATA
             const ownerFeeX = util.generateAta(addresses_1.SITE_FEE_OWNER, tokenXMint);
             const ownerFeeY = util.generateAta(addresses_1.SITE_FEE_OWNER, tokenYMint);
+            // Adjust by token type
+            const pdaTokenType = (_a = this.opt) === null || _a === void 0 ? void 0 : _a.pdaTokenType;
+            if (pdaTokenType === types_1.TokenType.LTA) {
+                this.ix.keys[7].pubkey = util.generateLimitToken(this.userPda, this.ix.keys[9].pubkey);
+                this.ix.keys[8].pubkey = util.generateLimitToken(this.userPda, this.ix.keys[10].pubkey);
+            }
+            else if (pdaTokenType === types_1.TokenType.STA) {
+                this.ix.keys[7].pubkey = util.generateUserPdaStorageAccount(this.userPda, this.ix.keys[9].pubkey);
+                this.ix.keys[8].pubkey = util.generateUserPdaStorageAccount(this.userPda, this.ix.keys[10].pubkey);
+            }
+            else {
+                this.ix.keys[7].pubkey = util.generateAta(this.userPda, this.ix.keys[9].pubkey);
+                this.ix.keys[8].pubkey = util.generateAta(this.userPda, this.ix.keys[10].pubkey);
+            }
             // Generate IX via extension contract
             // @ts-ignore
             const claimFeeIx = yield anchor_1.Anchor.instance().iyfExtension.methods
@@ -1319,9 +1457,8 @@ class ClaimRewardAutomation extends HawksightMeteoraAutomationCpi {
      * @param userPda The user's program-derived address (PDA) as a public key.
      * @param authority The authority public key that has signing capabilities over the transaction.
      */
-    constructor(ix, userPda, authority, pdaTokenType) {
-        super(ix, userPda, authority, util.sighash("ClaimReward"));
-        this.pdaTokenType = pdaTokenType;
+    constructor(ix, userPda, authority, opt) {
+        super(ix, userPda, authority, util.sighash("ClaimReward"), opt);
     }
     /**
      * Adjusts transaction keys to facilitate the claiming of rewards.
@@ -1329,24 +1466,15 @@ class ClaimRewardAutomation extends HawksightMeteoraAutomationCpi {
     replace() {
         this._ix.keys[4].pubkey = this.userPda;
         this._ix.keys[4].isSigner = false;
-        // Adjust by token type
-        if (this.pdaTokenType === types_1.TokenType.LTA) {
-            this.ix.keys[7].pubkey = util.generateLimitToken(this.userPda, this.ix.keys[6].pubkey);
-        }
-        else if (this.pdaTokenType === types_1.TokenType.STA) {
-            this.ix.keys[7].pubkey = util.generateUserPdaStorageAccount(this.userPda, this.ix.keys[6].pubkey);
-        }
-        else {
-            this.ix.keys[7].pubkey = util.generateAta(this.userPda, this.ix.keys[6].pubkey);
-        }
     }
     /**
      * Replaces Meteora CPI with Hawksight CPI that calls the target Meteora CPI.
      */
     replaceCpi() {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             // Get reward index from parameter
-            const rewardIndex = new bn_js_1.BN(this.ix.data.readBigInt64LE(8).toString());
+            const rewardIndex = new bn_js_1.default(this.ix.data.readBigInt64LE(8).toString());
             // Common parameters
             const farm = addresses_1.USDC_FARM;
             const userPda = this.userPda;
@@ -1356,6 +1484,17 @@ class ClaimRewardAutomation extends HawksightMeteoraAutomationCpi {
             // Generate owner fee ATA
             const rewardMint = this.ix.keys[6].pubkey;
             const ownerFee = util.generateAta(addresses_1.SITE_FEE_OWNER, rewardMint);
+            // Adjust by token type
+            const pdaTokenType = (_a = this.opt) === null || _a === void 0 ? void 0 : _a.pdaTokenType;
+            if (pdaTokenType === types_1.TokenType.LTA) {
+                this.ix.keys[7].pubkey = util.generateLimitToken(this.userPda, this.ix.keys[6].pubkey);
+            }
+            else if (pdaTokenType === types_1.TokenType.STA) {
+                this.ix.keys[7].pubkey = util.generateUserPdaStorageAccount(this.userPda, this.ix.keys[6].pubkey);
+            }
+            else {
+                this.ix.keys[7].pubkey = util.generateAta(this.userPda, this.ix.keys[6].pubkey);
+            }
             // Generate IX via extension contract
             // @ts-ignore
             const claimRewardIx = yield anchor_1.Anchor.instance().iyfExtension.methods
@@ -1419,8 +1558,8 @@ class ClosePositionAutomation extends HawksightMeteoraAutomationCpi {
      * @param userPda The user's program-derived address (PDA) as a public key.
      * @param authority The authority public key that has signing capabilities over the transaction.
      */
-    constructor(ix, userPda, authority) {
-        super(ix, userPda, authority, util.sighash("ClosePosition"));
+    constructor(ix, userPda, authority, opt) {
+        super(ix, userPda, authority, util.sighash("ClosePosition"), opt);
     }
     /**
      * Customizes the transaction keys to properly close a position, ensuring all relevant keys are set correctly.
@@ -1515,11 +1654,12 @@ class HawksightMeteoraPdaCpi {
      * @param authority The authority public key that has signing capabilities over the transaction.
      * @param sighash A Buffer containing the sighash used for matching the transaction instruction.
      */
-    constructor(ix, userPda, authority, sighash) {
+    constructor(ix, userPda, authority, sighash, opt) {
         this.ix = ix;
         this.userPda = userPda;
         this.authority = authority;
         this.sighash = sighash;
+        this.opt = opt;
     }
     /**
      * Factory method to create and link a chain of CPIs starting from `InitializePosition`.
@@ -1529,11 +1669,11 @@ class HawksightMeteoraPdaCpi {
      * @param authority The authority public key.
      * @returns The first CPI in the chain.
      */
-    static factory(ix, userPda, authority, pdaTokenType) {
-        const chain = new InitializePositionPda(ix, userPda, authority);
+    static factory(ix, userPda, authority, opt) {
+        const chain = new InitializePositionPda(ix, userPda, authority, opt);
         chain
-            .next(new AddLiquidityByStrategyPda(ix, userPda, authority, pdaTokenType))
-            .next(new AddLiquidityByStrategyOneSidePda(ix, userPda, authority, pdaTokenType));
+            .next(new AddLiquidityByStrategyPda(ix, userPda, authority, opt))
+            .next(new AddLiquidityByStrategyOneSidePda(ix, userPda, authority, opt));
         return chain;
     }
     /**
@@ -1626,8 +1766,8 @@ class InitializePositionPda extends HawksightMeteoraPdaCpi {
      * @param userPda The user's program-derived address (PDA) as a public key.
      * @param authority The authority public key that has signing capabilities over the transaction.
      */
-    constructor(ix, userPda, authority) {
-        super(ix, userPda, authority, util.sighash("InitializePosition"));
+    constructor(ix, userPda, authority, opt) {
+        super(ix, userPda, authority, util.sighash("InitializePosition"), opt);
     }
     /**
      * Modifies the transaction keys to set the correct public keys for an initial position setup.
@@ -1649,22 +1789,23 @@ class AddLiquidityByStrategyPda extends HawksightMeteoraPdaCpi {
      * @param userPda The user's program-derived address (PDA) as a public key.
      * @param authority The authority public key that has signing capabilities over the transaction.
      */
-    constructor(ix, userPda, authority, pdaTokenType) {
-        super(ix, userPda, authority, util.sighash("AddLiquidityByStrategy"));
-        this.pdaTokenType = pdaTokenType;
+    constructor(ix, userPda, authority, opt) {
+        super(ix, userPda, authority, util.sighash("AddLiquidityByStrategy"), opt);
     }
     /**
      * Modifies transaction keys for the purpose of claiming transaction fees.
      */
     replace() {
+        var _a;
         this.ix.keys[11].pubkey = this.userPda;
         this.ix.keys[11].isSigner = false;
         // Adjust by token type
-        if (this.pdaTokenType === types_1.TokenType.LTA) {
+        const pdaTokenType = (_a = this.opt) === null || _a === void 0 ? void 0 : _a.pdaTokenType;
+        if (pdaTokenType === types_1.TokenType.LTA) {
             this.ix.keys[3].pubkey = util.generateLimitToken(this.userPda, this.ix.keys[7].pubkey);
             this.ix.keys[4].pubkey = util.generateLimitToken(this.userPda, this.ix.keys[8].pubkey);
         }
-        else if (this.pdaTokenType === types_1.TokenType.STA) {
+        else if (pdaTokenType === types_1.TokenType.STA) {
             this.ix.keys[3].pubkey = util.generateUserPdaStorageAccount(this.userPda, this.ix.keys[7].pubkey);
             this.ix.keys[4].pubkey = util.generateUserPdaStorageAccount(this.userPda, this.ix.keys[8].pubkey);
         }
@@ -1766,21 +1907,22 @@ class AddLiquidityByStrategyOneSidePda extends HawksightMeteoraPdaCpi {
      * @param userPda The user's program-derived address (PDA) as a public key.
      * @param authority The authority public key that has signing capabilities over the transaction.
      */
-    constructor(ix, userPda, authority, pdaTokenType) {
-        super(ix, userPda, authority, util.sighash("AddLiquidityByStrategyOneSide"));
-        this.pdaTokenType = pdaTokenType;
+    constructor(ix, userPda, authority, opt) {
+        super(ix, userPda, authority, util.sighash("AddLiquidityByStrategyOneSide"), opt);
     }
     /**
      * Alters the transaction keys for adding liquidity, ensuring the user's PDA is correctly configured.
      */
     replace() {
+        var _a;
         this.ix.keys[8].pubkey = this.userPda;
         this.ix.keys[8].isSigner = false;
         // Adjust by token type
-        if (this.pdaTokenType === types_1.TokenType.LTA) {
+        const pdaTokenType = (_a = this.opt) === null || _a === void 0 ? void 0 : _a.pdaTokenType;
+        if (pdaTokenType === types_1.TokenType.LTA) {
             this.ix.keys[3].pubkey = util.generateLimitToken(this.userPda, this.ix.keys[5].pubkey);
         }
-        else if (this.pdaTokenType === types_1.TokenType.STA) {
+        else if (pdaTokenType === types_1.TokenType.STA) {
             this.ix.keys[3].pubkey = util.generateUserPdaStorageAccount(this.userPda, this.ix.keys[5].pubkey);
         }
         else {