@hawksightco/hawk-sdk 1.1.42-rc3 → 1.1.43

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

@@ -4,6 +4,7 @@ import * as _client from "@hawksightco/swagger-client";
 import { ResponseWithStatus, TransactionMetadata, UserPortfolioOut } from "../types";
 import { Client } from "./Client";
 import { GeneralUtility } from "./GeneralUtility";
+import { InlineResponse200 } from '../../../swagger-client/dist/models/inline-response200';
 /**
  * Provides general utility functions for managing and querying blockchain-related data,
  * handling transactions, and interfacing with a specific blockchain network via the client API.
@@ -34,6 +35,12 @@ export declare class General {
      * @param maxPriorityFee The fee in lamports.
      */
     setMaxPriorityFee(maxPriorityFee: number): void;
+    /**
+     * @returns Returns a token supported by Hawksight
+     */
+    token(params: {
+        address: string;
+    }): Promise<ResponseWithStatus<InlineResponse200>>;
     /**
      * Retrieves the portfolio information for a specified wallet and optionally a pool.
      *
@@ -53,6 +60,16 @@ export declare class General {
     pools(params: {
         hash?: string;
     }): Promise<ResponseWithStatus<_client.HawksightPool[]>>;
+    /**
+     * Fetches a single pool either from Orca or Meteora.
+     *
+     * @param params Object containing hash of the pools
+     * @returns A Promise resolving to an array of pools, including metadata such as pool addresses and statistics.
+     */
+    pool(params: {
+        pairAddress: string;
+        protocol: string;
+    }): Promise<ResponseWithStatus<_client.HawksightPool[]>>;
     /**
      * Retrieves information about the available tokens on the platform.
      *

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

@@ -1 +1 @@
-{"version":3,"file":"General.d.ts","sourceRoot":"","sources":["../../../src/classes/General.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,KAAK,OAAO,MAAM,6BAA6B,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAoD,gBAAgB,EAAE,MAAM,UAAU,CAAC;AACvI,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD;;;;;GAKG;AACH,qBAAa,OAAO;IAahB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAZjC,4GAA4G;IAC5G,SAAS,CAAC,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC;IAE/C,sGAAsG;IACtG,SAAS,CAAC,cAAc,EAAE,MAAM,CAAC;IAEjC;;;OAGG;gBAEgB,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,cAAc;IAOjD;;;;OAIG;IACH,gBAAgB,CAAC,aAAa,EAAE,OAAO,CAAC,aAAa;IAIrD;;;;OAIG;IACH,iBAAiB,CAAC,cAAc,EAAE,MAAM;IAIxC;;;;;OAKG;IACG,SAAS,CACb,MAAM,EAAE;QACN,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,GACA,OAAO,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;IAQhD;;;;;OAKG;IACG,KAAK,CACT,MAAM,EAAE;QACN,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,GACA,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;IAQvD;;;;OAIG;IACG,MAAM,IAAI,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC;IAQxE;;;;;;;OAOG;IACG,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;CAU3I"}
+{"version":3,"file":"General.d.ts","sourceRoot":"","sources":["../../../src/classes/General.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,KAAK,OAAO,MAAM,6BAA6B,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAoD,gBAAgB,EAAE,MAAM,UAAU,CAAC;AACvI,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wDAAwD,CAAC;AAG3F;;;;;GAKG;AACH,qBAAa,OAAO;IAahB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAZjC,4GAA4G;IAC5G,SAAS,CAAC,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC;IAE/C,sGAAsG;IACtG,SAAS,CAAC,cAAc,EAAE,MAAM,CAAC;IAEjC;;;OAGG;gBAEgB,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,cAAc;IAOjD;;;;OAIG;IACH,gBAAgB,CAAC,aAAa,EAAE,OAAO,CAAC,aAAa;IAIrD;;;;OAIG;IACH,iBAAiB,CAAC,cAAc,EAAE,MAAM;IAIxC;;OAEG;IACG,KAAK,CACT,MAAM,EAAE;QACN,OAAO,EAAE,MAAM,CAAC;KACjB,GACA,OAAO,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;IAQjD;;;;;OAKG;IACG,SAAS,CACb,MAAM,EAAE;QACN,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,GACA,OAAO,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;IAQhD;;;;;OAKG;IACG,KAAK,CACT,MAAM,EAAE;QACN,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,GACA,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;IAQvD;;;;;OAKG;IACG,IAAI,CACR,MAAM,EAAE;QACN,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC;KAClB,GACA,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;IAevD;;;;OAIG;IACG,MAAM,IAAI,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC;IAQxE;;;;;;;OAOG;IACG,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;CAU3I"}

package/dist/src/classes/General.js

@@ -69,6 +69,18 @@ class General {
     setMaxPriorityFee(maxPriorityFee) {
         this.maxPriorityFee = maxPriorityFee;
     }
+    /**
+     * @returns Returns a token supported by Hawksight
+     */
+    token(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const result = yield this.client.generalEndpoints.tokenGet(params.address).catch(e => e.response);
+            return {
+                status: result.status,
+                data: result.data,
+            };
+        });
+    }
     /**
      * Retrieves the portfolio information for a specified wallet and optionally a pool.
      *
@@ -99,6 +111,26 @@ class General {
             };
         });
     }
+    /**
+     * Fetches a single pool either from Orca or Meteora.
+     *
+     * @param params Object containing hash of the pools
+     * @returns A Promise resolving to an array of pools, including metadata such as pool addresses and statistics.
+     */
+    pool(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (["orca", "meteora"].includes(params.protocol)) {
+                const result = yield this.client.generalEndpoints.poolGet(params.pairAddress, params.protocol).catch(e => e.response);
+                return {
+                    status: result.status,
+                    data: result.data,
+                };
+            }
+            else {
+                throw new Error(`Protocol can only be: "orca" or "meteora". Value passed: ${params.protocol}`);
+            }
+        });
+    }
     /**
      * Retrieves information about the available tokens on the platform.
      *

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

@@ -70,5 +70,18 @@ export declare class Util {
     orcaGetPosition(params: {
         pool: string;
     }): Promise<ResponseWithStatus<any>>;
+    /**
+     * Returns orca tick current index of given whirlpool(s)
+     *
+     * @param params
+     * @returns
+     */
+    orcaGetActiveTick(params: {
+        pools: string[];
+        commitment?: string;
+    }): Promise<{
+        status: any;
+        data: any;
+    }>;
 }
 //# sourceMappingURL=Util.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Util.d.ts","sourceRoot":"","sources":["../../../src/classes/Util.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAiB,gBAAgB,EAAE,MAAM,UAAU,CAAC;AACrG,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC;;;GAGG;AACH,qBAAa,IAAI;IAOb,OAAO,CAAC,QAAQ,CAAC,MAAM;IANzB;;;;OAIG;gBAEgB,MAAM,EAAE,MAAM;IAGjC;;;;OAIG;IACG,gBAAgB,IAAI,OAAO,CAAC,kBAAkB,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC,CAAC;IAQlF;;;;;OAKG;IACG,oBAAoB,CACxB,MAAM,EAAE;QACN,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,GACA,OAAO,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;IAQhD;;;;;OAKG;IACG,oBAAoB,CAAC,MAAM,EAAE,MAAM,CAAC,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,CAAC;IAQ/G;;;;OAIG;IACG,aAAa,IAAI,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;IAQvD;;;;;OAKG;IACG,aAAa,CACjB,MAAM,EAAE;QACN,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,GACA,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;IAQnC;;;;;OAKG;IACG,mBAAmB,CACvB,MAAM,EAAE;QACN,QAAQ,EAAE,MAAM,CAAC;KAClB,GACA,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;IAQnC;;;;;OAKG;IACG,eAAe,CACnB,MAAM,EAAE;QACN,IAAI,EAAE,MAAM,CAAC;KACd,GACA,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;CAOpC"}
+{"version":3,"file":"Util.d.ts","sourceRoot":"","sources":["../../../src/classes/Util.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAiB,gBAAgB,EAAE,MAAM,UAAU,CAAC;AACrG,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC;;;GAGG;AACH,qBAAa,IAAI;IAOb,OAAO,CAAC,QAAQ,CAAC,MAAM;IANzB;;;;OAIG;gBAEgB,MAAM,EAAE,MAAM;IAGjC;;;;OAIG;IACG,gBAAgB,IAAI,OAAO,CAAC,kBAAkB,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC,CAAC;IAQlF;;;;;OAKG;IACG,oBAAoB,CACxB,MAAM,EAAE;QACN,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,GACA,OAAO,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;IAQhD;;;;;OAKG;IACG,oBAAoB,CAAC,MAAM,EAAE,MAAM,CAAC,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,CAAC;IAQ/G;;;;OAIG;IACG,aAAa,IAAI,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;IAQvD;;;;;OAKG;IACG,aAAa,CACjB,MAAM,EAAE;QACN,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,GACA,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;IAQnC;;;;;OAKG;IACG,mBAAmB,CACvB,MAAM,EAAE;QACN,QAAQ,EAAE,MAAM,CAAC;KAClB,GACA,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;IAQnC;;;;;OAKG;IACG,eAAe,CACnB,MAAM,EAAE;QACN,IAAI,EAAE,MAAM,CAAC;KACd,GACA,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;IAQnC;;;;;OAKG;IACG,iBAAiB,CACrB,MAAM,EAAE;QACN,KAAK,EAAE,MAAM,EAAE,CAAC;QAChB,UAAU,CAAC,EAAE,MAAM,CAAA;KACpB;;;;CAWJ"}

package/dist/src/classes/Util.js

@@ -119,7 +119,25 @@ class Util {
      */
     orcaGetPosition(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const result = yield this.client.orcaUtilityFunctionsApi.orcaUtilPoolGet(params.pool).catch(e => e.response);
+            const result = yield this.client.generalEndpoints.poolGet(params.pool, "orca");
+            return {
+                status: result.status,
+                data: result.data,
+            };
+        });
+    }
+    /**
+     * Returns orca tick current index of given whirlpool(s)
+     *
+     * @param params
+     * @returns
+     */
+    orcaGetActiveTick(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const result = yield this.client.orcaUtilityFunctionsApi.orcaUtilActiveTickPost({
+                pools: params.pools,
+                commitment: params.commitment,
+            }).catch(e => e.response);
             return {
                 status: result.status,
                 data: result.data,

package/dist/src/hsToMeteora.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hsToMeteora.d.ts","sourceRoot":"","sources":["../../src/hsToMeteora.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AAcnD;;;;;GAKG;AACH,wBAAsB,kBAAkB,CAAC,EAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAC,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAQpI;AAED;;;;;GAKG;AACH,wBAAsB,+BAA+B,CAAC,EAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAC,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAUjJ"}
+{"version":3,"file":"hsToMeteora.d.ts","sourceRoot":"","sources":["../../src/hsToMeteora.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AAcnD;;;;;GAKG;AACH,wBAAsB,kBAAkB,CAAC,EAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAC,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAUpI;AAED;;;;;GAKG;AACH,wBAAsB,+BAA+B,CAAC,EAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAC,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAUjJ"}

package/dist/src/hsToMeteora.js

@@ -45,13 +45,15 @@ const util = __importStar(require("./functions"));
  */
 function meteoraToHawksight(_a) {
     return __awaiter(this, arguments, void 0, function* ({ ixs, userPda, authority }) {
-        return ixs.map((ix) => {
-            ix = HawksightMeteoraCpi.factory(ix, userPda, authority).getInstruction();
+        const _ixs = [];
+        for (const ix of ixs) {
+            const _ix = yield HawksightMeteoraCpi.factory(ix, userPda, authority).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 });
             }
-            return ix;
-        });
+            _ixs.push(_ix);
+        }
+        return _ixs;
     });
 }
 exports.meteoraToHawksight = meteoraToHawksight;
@@ -141,13 +143,34 @@ class HawksightMeteoraCpi {
      * @returns The (possibly modified) transaction instruction.
      */
     getInstruction() {
-        const matchInstance = this.sighashMatch();
-        if (this.programIdMatch() && matchInstance !== undefined) {
-            matchInstance.replace();
-            matchInstance.addHawksightCpi();
+        return __awaiter(this, void 0, void 0, function* () {
+            const matchInstance = this.sighashMatch();
+            if (this.programIdMatch() && matchInstance !== undefined) {
+                matchInstance.replace();
+                yield matchInstance.addHawksightCpi();
+                return this.ix;
+            }
             return this.ix;
-        }
-        return this.ix;
+        });
+    }
+    /**
+     * Modifies the transaction instruction to include specific Hawksight CPI details.
+     * Prepares the instruction for execution by adjusting its program ID and data based on Hawksight criteria.
+     */
+    addHawksightCpi() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const METEORA_PROGRAM = addresses_1.METEORA_DLMM_PROGRAM;
+            const size = Buffer.alloc(4);
+            size.writeUint32LE(this.ix.data.length);
+            const data = Buffer.concat([util.sighash('meteora_dynamic_cpi'), size, this.ix.data]);
+            this.ix.programId = addresses_1.IYF_MAIN;
+            this.ix.data = data;
+            this.ix.keys.unshift(...[
+                { pubkey: this.userPda, isSigner: false, isWritable: false },
+                { pubkey: this.authority, isSigner: true, isWritable: true },
+                { pubkey: METEORA_PROGRAM, isSigner: false, isWritable: false },
+            ]);
+        });
     }
     /**
      * Adds a subsequent CPI to the chain.
@@ -187,23 +210,6 @@ class HawksightMeteoraCpi {
     programIdMatch() {
         return this.ix.programId.equals(addresses_1.METEORA_DLMM_PROGRAM);
     }
-    /**
-     * Modifies the transaction instruction to include specific Hawksight CPI details.
-     * Prepares the instruction for execution by adjusting its program ID and data based on Hawksight criteria.
-     */
-    addHawksightCpi() {
-        const METEORA_PROGRAM = addresses_1.METEORA_DLMM_PROGRAM;
-        const size = Buffer.alloc(4);
-        size.writeUint32LE(this.ix.data.length);
-        const data = Buffer.concat([util.sighash('meteora_dynamic_cpi'), size, this.ix.data]);
-        this.ix.programId = addresses_1.IYF_MAIN;
-        this.ix.data = data;
-        this.ix.keys.unshift(...[
-            { pubkey: this.userPda, isSigner: false, isWritable: false },
-            { pubkey: this.authority, isSigner: true, isWritable: true },
-            { pubkey: METEORA_PROGRAM, isSigner: false, isWritable: false },
-        ]);
-    }
 }
 /**
  * Handles the initialization of a position in a blockchain transaction.
@@ -379,6 +385,80 @@ class ClaimFee extends HawksightMeteoraCpi {
         this.ix.keys[4].pubkey = this.userPda;
         this.ix.keys[4].isSigner = false;
     }
+    /**
+     * Overrides default add hawksight cpi to use meteoraDlmmClaimFee instead of meteoraDynamicCpi
+     */
+    addHawksightCpi() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // Common parameters
+            const farm = addresses_1.USDC_FARM;
+            const userPda = this.userPda;
+            const authority = this.authority;
+            const iyfProgram = addresses_1.IYF_MAIN;
+            // Get token mints X and Y
+            const tokenXMint = this.ix.keys[9].pubkey;
+            const tokenYMint = this.ix.keys[10].pubkey;
+            // 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);
+            // Generate IX via extension contract
+            const claimFeeIx = yield anchor_1.Anchor.instance().iyfExtension.methods
+                .meteoraDlmmClaimFee()
+                .accounts({
+                farm,
+                userPda,
+                authority,
+                iyfProgram,
+                lbPair: this.ix.keys[0].pubkey,
+                position: this.ix.keys[1].pubkey,
+                binArrayLower: this.ix.keys[2].pubkey,
+                binArrayUpper: this.ix.keys[3].pubkey,
+                reserveX: this.ix.keys[5].pubkey,
+                reserveY: this.ix.keys[6].pubkey,
+                userTokenX: this.ix.keys[7].pubkey,
+                userTokenY: this.ix.keys[8].pubkey,
+                tokenXMint: this.ix.keys[9].pubkey,
+                tokenYMint: this.ix.keys[10].pubkey,
+                tokenProgram: this.ix.keys[11].pubkey,
+                eventAuthority: this.ix.keys[12].pubkey,
+                meteoraDlmmProgram: this.ix.keys[13].pubkey,
+                ownerFeeX,
+                ownerFeeY,
+            }).instruction();
+            // Instruction via main hawksight contract
+            const ix = yield anchor_1.Anchor.instance().iyfMain.methods
+                .iyfExtensionExecute(claimFeeIx.data)
+                .accounts({
+                farm,
+                userPda,
+                authority,
+                iyfProgram,
+                iyfExtensionProgram: addresses_1.IYF_EXTENSION,
+            })
+                .remainingAccounts([
+                claimFeeIx.keys[4],
+                claimFeeIx.keys[5],
+                claimFeeIx.keys[6],
+                claimFeeIx.keys[7],
+                claimFeeIx.keys[8],
+                claimFeeIx.keys[9],
+                claimFeeIx.keys[10],
+                claimFeeIx.keys[11],
+                claimFeeIx.keys[12],
+                claimFeeIx.keys[13],
+                claimFeeIx.keys[14],
+                claimFeeIx.keys[15],
+                claimFeeIx.keys[16],
+                claimFeeIx.keys[17],
+                claimFeeIx.keys[18],
+            ])
+                .instruction();
+            // Override the instruction
+            this.ix.programId = ix.programId;
+            this.ix.data = ix.data;
+            this.ix.keys = ix.keys;
+        });
+    }
 }
 /**
  * Manages the claiming of rewards in blockchain operations, typically associated with staking or similar activities.
@@ -401,6 +481,72 @@ class ClaimReward extends HawksightMeteoraCpi {
         this.ix.keys[4].pubkey = this.userPda;
         this.ix.keys[4].isSigner = false;
     }
+    /**
+     * Overrides default add hawksight cpi to use meteoraDlmmClaimReward instead of meteoraDynamicCpi
+     */
+    addHawksightCpi() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // Common parameters
+            const farm = addresses_1.USDC_FARM;
+            const userPda = this.userPda;
+            const authority = this.authority;
+            const iyfProgram = addresses_1.IYF_MAIN;
+            // Get token mint
+            const rewardMint = this.ix.keys[9].pubkey;
+            // 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());
+            // Generate IX via extension contract
+            const claimReward = yield anchor_1.Anchor.instance().iyfExtension.methods
+                .meteoraDlmmClaimReward(rewardIndex)
+                .accounts({
+                farm,
+                userPda,
+                authority,
+                iyfProgram,
+                lbPair: this.ix.keys[4].pubkey,
+                position: this.ix.keys[5].pubkey,
+                binArrayLower: this.ix.keys[6].pubkey,
+                binArrayUpper: this.ix.keys[7].pubkey,
+                rewardVault: this.ix.keys[8].pubkey,
+                rewardMint: this.ix.keys[9].pubkey,
+                userTokenAccount: this.ix.keys[10].pubkey,
+                tokenProgram: this.ix.keys[11].pubkey,
+                eventAuthority: this.ix.keys[12].pubkey,
+                meteoraDlmmProgram: this.ix.keys[13].pubkey,
+                ownerFee,
+            }).instruction();
+            // Instruction via main hawksight contract
+            const ix = yield anchor_1.Anchor.instance().iyfMain.methods
+                .iyfExtensionExecute(claimReward.data)
+                .accounts({
+                farm,
+                userPda,
+                authority,
+                iyfProgram,
+                iyfExtensionProgram: addresses_1.IYF_EXTENSION,
+            })
+                .remainingAccounts([
+                claimReward.keys[4],
+                claimReward.keys[5],
+                claimReward.keys[6],
+                claimReward.keys[7],
+                claimReward.keys[8],
+                claimReward.keys[9],
+                claimReward.keys[10],
+                claimReward.keys[11],
+                claimReward.keys[12],
+                claimReward.keys[13],
+                claimReward.keys[14],
+            ])
+                .instruction();
+            // Override the instruction
+            this.ix.programId = ix.programId;
+            this.ix.data = ix.data;
+            this.ix.keys = ix.keys;
+        });
+    }
 }
 /**
  * Handles the closure of a position within a blockchain transaction.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hawksightco/hawk-sdk",
-  "version": "1.1.42-rc3",
+  "version": "1.1.43",
   "description": "Hawksight v2 SDK",
   "main": "dist/src/index.js",
   "repository": "https://github.com/ghabxph/hawk-api-client.git",
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@coral-xyz/anchor": "~0.29.0",
-    "@hawksightco/swagger-client": "^0.0.33",
+    "@hawksightco/swagger-client": "^0.0.34",
     "@meteora-ag/dlmm": "^1.0.51",
     "@solana/spl-token": "^0.4.6",
     "@solana/web3.js": "^1.89.1",