@hawksightco/hawk-sdk 1.2.9 → 1.2.11

package/dist/src/hsToMeteora.js

@@ -33,6 +33,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 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");
@@ -44,10 +45,10 @@ const util = __importStar(require("./functions"));
  * @returns
  */
 function meteoraToHawksight(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ ixs, userPda, authority }) {
+    return __awaiter(this, arguments, void 0, function* ({ ixs, userPda, authority, pdaTokenType }) {
         const _ixs = [];
         for (const ix of ixs) {
-            const _ix = yield HawksightMeteoraCpi.factory(ix, userPda, authority).getInstruction();
+            const _ix = yield HawksightMeteoraCpi.factory(ix, userPda, authority, pdaTokenType).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 });
             }
@@ -64,10 +65,10 @@ exports.meteoraToHawksight = meteoraToHawksight;
  * @returns
  */
 function meteoraToHawksightAutomationIxs(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ ixs, userPda, authority }) {
+    return __awaiter(this, arguments, void 0, function* ({ ixs, userPda, authority, pdaTokenType }) {
         const _ixs = [];
         for (const ix of ixs) {
-            const _ix = yield HawksightMeteoraAutomationCpi.factory(ix, userPda, authority).getInstruction();
+            const _ix = yield HawksightMeteoraAutomationCpi.factory(ix, userPda, authority, pdaTokenType).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 });
             }
@@ -84,10 +85,10 @@ exports.meteoraToHawksightAutomationIxs = meteoraToHawksightAutomationIxs;
  * @returns
  */
 function meteoraToHawksightPdaIxs(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ ixs, userPda, authority }) {
+    return __awaiter(this, arguments, void 0, function* ({ ixs, userPda, authority, pdaTokenType }) {
         const _ixs = [];
         for (const ix of ixs) {
-            const _ix = yield HawksightMeteoraPdaCpi.factory(ix, userPda, authority).getInstruction();
+            const _ix = yield HawksightMeteoraPdaCpi.factory(ix, userPda, authority, pdaTokenType).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 });
             }
@@ -143,17 +144,17 @@ class HawksightMeteoraCpi {
      * @param authority The authority public key.
      * @returns The first CPI in the chain.
      */
-    static factory(ix, userPda, authority) {
+    static factory(ix, userPda, authority, pdaTokenType) {
         const chain = new InitializePosition(ix, userPda, authority);
         chain
-            .next(new AddLiquidityByWeight(ix, userPda, authority))
-            .next(new AddLiquidityOneSide(ix, userPda, authority))
-            .next(new AddLiquidityByStrategy(ix, userPda, authority))
-            .next(new AddLiquidityByStrategyOneSide(ix, userPda, authority))
-            .next(new RemoveLiquidity(ix, userPda, authority))
-            .next(new RemoveLiquidityByRange(ix, userPda, authority))
-            .next(new ClaimFee(ix, userPda, authority))
-            .next(new ClaimReward(ix, userPda, authority))
+            .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));
         return chain;
     }
@@ -271,8 +272,9 @@ 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) {
+    constructor(ix, userPda, authority, pdaTokenType) {
         super(ix, userPda, authority, util.sighash("AddLiquidityByWeight"));
+        this.pdaTokenType = pdaTokenType;
     }
     /**
      * Alters the transaction keys for adding liquidity, ensuring the user's PDA is correctly configured.
@@ -280,6 +282,19 @@ class AddLiquidityByWeight extends HawksightMeteoraCpi {
     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);
+        }
     }
 }
 /**
@@ -294,8 +309,9 @@ 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) {
+    constructor(ix, userPda, authority, pdaTokenType) {
         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.
@@ -303,6 +319,19 @@ class AddLiquidityByStrategy extends HawksightMeteoraCpi {
     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);
+        }
     }
 }
 /**
@@ -317,8 +346,9 @@ 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) {
+    constructor(ix, userPda, authority, pdaTokenType) {
         super(ix, userPda, authority, util.sighash("AddLiquidityOneSide"));
+        this.pdaTokenType = pdaTokenType;
     }
     /**
      * Alters the transaction keys for adding liquidity, ensuring the user's PDA is correctly configured.
@@ -326,6 +356,16 @@ class AddLiquidityOneSide extends HawksightMeteoraCpi {
     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);
+        }
     }
 }
 /**
@@ -340,8 +380,9 @@ 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) {
+    constructor(ix, userPda, authority, pdaTokenType) {
         super(ix, userPda, authority, util.sighash("AddLiquidityByStrategyOneSide"));
+        this.pdaTokenType = pdaTokenType;
     }
     /**
      * Alters the transaction keys for adding liquidity, ensuring the user's PDA is correctly configured.
@@ -349,6 +390,16 @@ class AddLiquidityByStrategyOneSide extends HawksightMeteoraCpi {
     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);
+        }
     }
 }
 /**
@@ -362,8 +413,9 @@ 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")) {
+    constructor(ix, userPda, authority, sighash = util.sighash("RemoveLiquidity"), pdaTokenType) {
         super(ix, userPda, authority, sighash);
+        this.pdaTokenType = pdaTokenType;
     }
     /**
      * Customizes the transaction keys to correctly handle the removal of liquidity.
@@ -371,6 +423,19 @@ class RemoveLiquidity extends HawksightMeteoraCpi {
     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);
+        }
     }
 }
 /**
@@ -384,8 +449,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) {
-        super(ix, userPda, authority, util.sighash("RemoveLiquidityByRange"));
+    constructor(ix, userPda, authority, pdaTokenType) {
+        super(ix, userPda, authority, util.sighash("RemoveLiquidityByRange"), pdaTokenType);
     }
 }
 /**
@@ -399,8 +464,9 @@ 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) {
+    constructor(ix, userPda, authority, pdaTokenType) {
         super(ix, userPda, authority, util.sighash("ClaimFee"));
+        this.pdaTokenType = pdaTokenType;
     }
     /**
      * Modifies transaction keys for the purpose of claiming transaction fees.
@@ -408,6 +474,19 @@ class ClaimFee extends HawksightMeteoraCpi {
     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);
+        }
     }
     /**
      * Overrides default add hawksight cpi to use meteoraDlmmClaimFee instead of meteoraDynamicCpi
@@ -496,8 +575,9 @@ 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) {
+    constructor(ix, userPda, authority, pdaTokenType) {
         super(ix, userPda, authority, util.sighash("ClaimReward"));
+        this.pdaTokenType = pdaTokenType;
     }
     /**
      * Adjusts transaction keys to facilitate the claiming of rewards.
@@ -505,6 +585,16 @@ class ClaimReward extends HawksightMeteoraCpi {
     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);
+        }
     }
     /**
      * Overrides default add hawksight cpi to use meteoraDlmmClaimReward instead of meteoraDynamicCpi
@@ -624,15 +714,15 @@ class HawksightMeteoraAutomationCpi {
      * @param authority The authority public key.
      * @returns The first CPI in the chain.
      */
-    static factory(ix, userPda, authority) {
+    static factory(ix, userPda, authority, pdaTokenType) {
         const chain = new InitializePositionAutomation(ix, userPda, authority);
         chain
-            .next(new AddLiquidityByWeightAutomation(ix, userPda, authority))
-            .next(new AddLiquidityOneSideAutomation(ix, userPda, authority))
-            .next(new RemoveLiquidityAutomation(ix, userPda, authority))
-            .next(new RemoveLiquidityByRangeAutomation(ix, userPda, authority))
-            .next(new ClaimFeeAutomation(ix, userPda, authority))
-            .next(new ClaimRewardAutomation(ix, userPda, authority))
+            .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));
         return chain;
     }
@@ -781,8 +871,9 @@ 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) {
-        super(ix, userPda, authority, util.sighash("AddLiquidityByStrategy"));
+    constructor(ix, userPda, authority, pdaTokenType) {
+        super(ix, userPda, authority, util.sighash("AddLiquidityByWeight"));
+        this.pdaTokenType = pdaTokenType;
     }
     /**
      * Alters the transaction keys for adding liquidity, ensuring the user's PDA is correctly configured.
@@ -790,6 +881,19 @@ 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.
@@ -884,8 +988,9 @@ 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) {
+    constructor(ix, userPda, authority, pdaTokenType) {
         super(ix, userPda, authority, util.sighash("AddLiquidityByStrategyOneSide"));
+        this.pdaTokenType = pdaTokenType;
     }
     /**
      * Alters the transaction keys for adding liquidity, ensuring the user's PDA is correctly configured.
@@ -893,6 +998,16 @@ 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.
@@ -968,8 +1083,9 @@ 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")) {
+    constructor(ix, userPda, authority, sighash = util.sighash("RemoveLiquidity"), pdaTokenType) {
         super(ix, userPda, authority, sighash);
+        this.pdaTokenType = pdaTokenType;
     }
     /**
      * Customizes the transaction keys to correctly handle the removal of liquidity.
@@ -977,6 +1093,19 @@ 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.
@@ -1063,8 +1192,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) {
-        super(ix, userPda, authority, util.sighash("RemoveLiquidityByRange"));
+    constructor(ix, userPda, authority, pdaTokenType) {
+        super(ix, userPda, authority, util.sighash("RemoveLiquidityByRange"), pdaTokenType);
     }
 }
 /**
@@ -1078,8 +1207,9 @@ 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) {
+    constructor(ix, userPda, authority, pdaTokenType) {
         super(ix, userPda, authority, util.sighash("ClaimFee"));
+        this.pdaTokenType = pdaTokenType;
     }
     /**
      * Modifies transaction keys for the purpose of claiming transaction fees.
@@ -1087,6 +1217,19 @@ 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.
@@ -1176,8 +1319,9 @@ 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) {
+    constructor(ix, userPda, authority, pdaTokenType) {
         super(ix, userPda, authority, util.sighash("ClaimReward"));
+        this.pdaTokenType = pdaTokenType;
     }
     /**
      * Adjusts transaction keys to facilitate the claiming of rewards.
@@ -1185,6 +1329,16 @@ 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.
@@ -1375,11 +1529,11 @@ class HawksightMeteoraPdaCpi {
      * @param authority The authority public key.
      * @returns The first CPI in the chain.
      */
-    static factory(ix, userPda, authority) {
+    static factory(ix, userPda, authority, pdaTokenType) {
         const chain = new InitializePositionPda(ix, userPda, authority);
         chain
-            .next(new AddLiquidityByStrategyPda(ix, userPda, authority))
-            .next(new AddLiquidityByStrategyOneSidePda(ix, userPda, authority));
+            .next(new AddLiquidityByStrategyPda(ix, userPda, authority, pdaTokenType))
+            .next(new AddLiquidityByStrategyOneSidePda(ix, userPda, authority, pdaTokenType));
         return chain;
     }
     /**
@@ -1495,8 +1649,9 @@ 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) {
+    constructor(ix, userPda, authority, pdaTokenType) {
         super(ix, userPda, authority, util.sighash("AddLiquidityByStrategy"));
+        this.pdaTokenType = pdaTokenType;
     }
     /**
      * Modifies transaction keys for the purpose of claiming transaction fees.
@@ -1504,6 +1659,19 @@ class AddLiquidityByStrategyPda extends HawksightMeteoraPdaCpi {
     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.
@@ -1598,8 +1766,9 @@ 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) {
+    constructor(ix, userPda, authority, pdaTokenType) {
         super(ix, userPda, authority, util.sighash("AddLiquidityByStrategyOneSide"));
+        this.pdaTokenType = pdaTokenType;
     }
     /**
      * Alters the transaction keys for adding liquidity, ensuring the user's PDA is correctly configured.
@@ -1607,6 +1776,16 @@ class AddLiquidityByStrategyOneSidePda extends HawksightMeteoraPdaCpi {
     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.