@hawksightco/hawk-sdk 1.1.39 → 1.1.41-hotfix-1

package/dist/src/classes/Transactions.js

@@ -49,6 +49,8 @@ const anchor_1 = require("../anchor");
 const hawksight_1 = require("../hawksight");
 const types_2 = require("../types");
 const Logging_1 = require("./Logging");
+const TransactionBatchExecute2_1 = require("./TransactionBatchExecute2");
+const CreateTxMetadata_1 = require("./CreateTxMetadata");
 class Transactions {
     /**
      * Generate UserPDA
@@ -319,25 +321,29 @@ class Transactions {
      * @param connection The Solana web3 connection object for blockchain interactions.
      * @param payer The public key of the payer for transaction fees.
      * @param params Parameters required
-     * @returns A ResponseWithStatus containing either TransactionMetadataResponse.
+     * @returns Array of transaction instructions (simplified output)
      */
-    meteoraClaimAll(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
+    meteoraClaimAll(_a, payer_1, generalUtility_1) {
+        return __awaiter(this, arguments, void 0, function* ({ connection, params, }, payer, generalUtility) {
             const userPda = (0, functions_1.generateUserPda)(params.userWallet);
-            const txs = [];
             const fn = new meteora_1.MeteoraFunctions();
             // Step 1: Get all user position
             // This function also downloads pools needed to generate claim all transaction.
             const positions = yield fn.getAllUserPosition(connection, userPda);
             // Step 2: Generate claim fee and claim reward transactions
-            const mainInstructions = yield fn.claimFeeAndRewardIxs2(connection, positions, userPda);
-            // Step 3: Return the instructions
-            return yield (0, functions_1.createTransactionMeta)({
-                payer: params.userWallet,
-                description: "Claim all fees and rewards across all meteora positions.",
-                addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
-                mainInstructions,
+            const builder = yield fn.claimFeeAndRewardIxs2(connection, positions, params.userWallet, userPda, hsToMeteora_1.meteoraToHawksight);
+            // Step 2.5: Generate transactions
+            const mainInstructions = builder.default();
+            const latestBlockhash = yield connection.getLatestBlockhash();
+            const batchGenerator = new TransactionBatchExecute2_1.TransactionBatchExecute2(addresses_1.GLOBAL_ALT.map(p => new web3.PublicKey(p)), mainInstructions, connection, CreateTxMetadata_1.CreateTxMetadata.instance(), latestBlockhash, payer);
+            // Insert nonce advance tx at end of transaction
+            batchGenerator.insertNonceAt({
+                onlyEndOfTx: true,
             });
+            // Generate batch of transactions
+            const txs = yield batchGenerator.buildBatchWithAlts('Claim all fees / rewards from Meteora DLMM position', generalUtility);
+            // Simplified return value
+            return txs;
         });
     }
     /**

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

@@ -4,6 +4,7 @@ import * as _client from "@hawksightco/swagger-client";
 import { ResponseWithStatus, TransactionMetadata, OrcaWithdraw, OrcaDeposit, OrcaClosePosition, OrcaOpenPosition, OrcaClaimRewards, MeteoraClaimAll } from "../types";
 import { Client } from "./Client";
 import { GeneralUtility } from "./GeneralUtility";
+import { MultiTransaction } from "./MultiTransaction";
 /**
  * The `TxGenerator` class encapsulates methods to generate transactions with various trading operations
  * on decentralized market making platforms like Meteora and Orca within the Solana ecosystem. It allows
@@ -62,7 +63,7 @@ export declare class TxGenerator {
      * @param params Parameters required
      * @returns A ResponseWithStatus containing either TransactionMetadataResponse or TransactionMetadata.
      */
-    meteoraClaimAll(connection: web3.Connection, payer: string, params: MeteoraClaimAll): Promise<ResponseWithStatus<TransactionMetadata[]>>;
+    meteoraClaimAll(connection: web3.Connection, payer: string, params: MeteoraClaimAll): Promise<MultiTransaction>;
     /**
      * Creates meteora instruction that closes position.
      *

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

@@ -1 +1 @@
-{"version":3,"file":"TxGenerator.d.ts","sourceRoot":"","sources":["../../../src/classes/TxGenerator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TxGenerator.d.ts","sourceRoot":"","sources":["../../../src/classes/TxGenerator.ts"],"names":[],"mappings":"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"}

package/dist/src/classes/TxGenerator.js

@@ -247,29 +247,14 @@ class TxGenerator {
         return __awaiter(this, void 0, void 0, function* () {
             // Initialize anchor
             anchor_1.Anchor.initialize(connection);
-            try {
-                const startTime = new Date().getTime() / 1000;
-                (0, Logging_1.Log)(`meteoraClaimAll: Benchmarking txgen.meteoraClaimAll`);
-                const result = yield Transactions_1.txgen.meteoraClaimAll({
-                    connection,
-                    params,
-                });
-                (0, Logging_1.Log)(`meteoraClaim: await txgen.meteoraClaimAll elapsed time: ${new Date().getTime() / 1000 - startTime}`);
-                return {
-                    status: 200,
-                    data: yield (0, functions_1.createTxMetadata2)(this.generalUtility, connection, payer, result),
-                };
-            }
-            catch (e) {
-                return {
-                    status: 400,
-                    data: {
-                        code: "custom",
-                        message: e,
-                        path: [],
-                    },
-                };
-            }
+            const startTime = new Date().getTime() / 1000;
+            (0, Logging_1.Log)(`meteoraClaimAll: Benchmarking txgen.meteoraClaimAll`);
+            const result = yield Transactions_1.txgen.meteoraClaimAll({
+                connection,
+                params,
+            }, new web3.PublicKey(payer), this.generalUtility);
+            (0, Logging_1.Log)(`meteoraClaim: await txgen.meteoraClaimAll elapsed time: ${new Date().getTime() / 1000 - startTime}`);
+            return result;
         });
     }
     /**

package/dist/src/functions.d.ts

@@ -273,5 +273,30 @@ export declare function stringToAlt(connection: web3.Connection, alts: string[])
 export declare function getPriorityFeeEstimate(priorityLevel: string, transaction: web3.VersionedTransaction, rpcUrl: string): PriorityFeeEstimate;
 export declare function getPriorityFeeEstimate2(transaction: string, options: any, url: string): Promise<any>;
 export declare function mid(min: number, max: number): number;
+/**
+ * Find all nonce pubkey owned by given owner and index
+ *
+ * @param owner
+ */
+export declare function generateNonceAddressFromIndex(owner: web3.PublicKey, index: number): Promise<web3.PublicKey>;
+/**
+ * Find all nonce pubkey owned by given owner
+ *
+ * @param owner
+ */
+export declare function generateNonceAddressesOwnedBy(owner: web3.PublicKey, count: number): Promise<web3.PublicKey[]>;
+/**
+ * Find all nonce pubkey owned by given owner
+ *
+ * TODO: Put this into a class and the class must serve as cache of nonce accounts (so that we don't query nonce account multiple times)
+ *
+ * @param owner
+ */
+export declare function findNonceOwnedBy(connection: web3.Connection, owner: web3.PublicKey, count: number): Promise<web3.AccountInfo<web3.NonceAccount>[]>;
+export declare const benchmark: ({ end, name, msg }: {
+    name: string;
+    msg: string;
+    end?: boolean | undefined;
+}) => void;
 export {};
 //# sourceMappingURL=functions.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"functions.d.ts","sourceRoot":"","sources":["../../src/functions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"functions.d.ts","sourceRoot":"","sources":["../../src/functions.ts"],"names":[],"mappings":"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"}

package/dist/src/functions.js

@@ -35,7 +35,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mid = exports.getPriorityFeeEstimate2 = exports.getPriorityFeeEstimate = exports.stringToAlt = exports.ixStrToWeb3Ix = exports.toVersionedTransaction = exports.getJupiterRouteIxParams = exports.inputTokenExists = exports.unwrapWsolToSol = exports.unwrapSolIfMintIsWsol = exports.wrapSolToWsol = exports.wrapSolIfMintIsWsol = exports.getMintsFromInstruction = exports.createAtaIdempotentIxs = exports.parseTokenAccountData = exports.tokenAccountExists = exports.sighash = exports.sighashMatch = exports.getIxs = exports.generateUserPdaStorageAccount = exports.generateOrcaPositionPDA = exports.generateAta = exports.generateUserPda = exports.createTransactionMeta = exports.getMeteoraPool = exports.getFeeEstimate = exports.resultOrError = exports.createTxMetadata2 = exports.createTxMetadata = exports.METEORA_API_URL = void 0;
+exports.benchmark = exports.findNonceOwnedBy = exports.generateNonceAddressesOwnedBy = exports.generateNonceAddressFromIndex = exports.mid = exports.getPriorityFeeEstimate2 = exports.getPriorityFeeEstimate = exports.stringToAlt = exports.ixStrToWeb3Ix = exports.toVersionedTransaction = exports.getJupiterRouteIxParams = exports.inputTokenExists = exports.unwrapWsolToSol = exports.unwrapSolIfMintIsWsol = exports.wrapSolToWsol = exports.wrapSolIfMintIsWsol = exports.getMintsFromInstruction = exports.createAtaIdempotentIxs = exports.parseTokenAccountData = exports.tokenAccountExists = exports.sighash = exports.sighashMatch = exports.getIxs = exports.generateUserPdaStorageAccount = exports.generateOrcaPositionPDA = exports.generateAta = exports.generateUserPda = exports.createTransactionMeta = exports.getMeteoraPool = exports.getFeeEstimate = exports.resultOrError = exports.createTxMetadata2 = exports.createTxMetadata = exports.METEORA_API_URL = void 0;
 const client = __importStar(require("@hawksightco/swagger-client"));
 const web3 = __importStar(require("@solana/web3.js"));
 const axios_1 = __importDefault(require("axios"));
@@ -47,6 +47,7 @@ const js_sha256_1 = require("js-sha256");
 const bn_js_1 = __importDefault(require("bn.js"));
 const spl_token_1 = require("@solana/spl-token");
 const bs58_1 = __importDefault(require("bs58"));
+const Logging_1 = require("./classes/Logging");
 exports.METEORA_API_URL = "https://dlmm-api.meteora.ag";
 /**
  * Asynchronously creates transaction metadata based on the provided transaction parameters and network state.
@@ -691,3 +692,71 @@ function mid(min, max) {
     return min + (max - min) / 2;
 }
 exports.mid = mid;
+/**
+ * Find all nonce pubkey owned by given owner and index
+ *
+ * @param owner
+ */
+function generateNonceAddressFromIndex(owner, index) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return yield web3.PublicKey.createWithSeed(owner, `hs-nonce-${index}`, web3.SystemProgram.programId);
+    });
+}
+exports.generateNonceAddressFromIndex = generateNonceAddressFromIndex;
+/**
+ * Find all nonce pubkey owned by given owner
+ *
+ * @param owner
+ */
+function generateNonceAddressesOwnedBy(owner, count) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const nonceAddresses = [];
+        for (let i = 0; i < count; i++) {
+            nonceAddresses.push(yield generateNonceAddressFromIndex(owner, i));
+        }
+        return nonceAddresses;
+    });
+}
+exports.generateNonceAddressesOwnedBy = generateNonceAddressesOwnedBy;
+/**
+ * Find all nonce pubkey owned by given owner
+ *
+ * TODO: Put this into a class and the class must serve as cache of nonce accounts (so that we don't query nonce account multiple times)
+ *
+ * @param owner
+ */
+function findNonceOwnedBy(connection, owner, count) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const nonceAddresses = yield generateNonceAddressesOwnedBy(owner, count);
+        const infos = yield connection.getMultipleAccountsInfo(nonceAddresses);
+        const result = infos.filter(info => info !== null).map(info => {
+            const result = {
+                /** `true` if this account's data contains a loaded program */
+                executable: info.executable,
+                /** Identifier of the program that owns the account */
+                owner: info.owner,
+                /** Number of lamports assigned to the account */
+                lamports: info.lamports,
+                /** Optional data assigned to the account */
+                data: web3.NonceAccount.fromAccountData(info.data),
+                /** Optional rent epoch info for account */
+                rentEpoch: info.rentEpoch,
+            };
+            return result;
+        });
+        return result;
+    });
+}
+exports.findNonceOwnedBy = findNonceOwnedBy;
+exports.benchmark = (() => {
+    let startTime;
+    return ({ end, name, msg }) => {
+        if (end) {
+            (0, Logging_1.Log)(`${name}: ${msg} elapsed time: ${new Date().getTime() / 1000 - startTime}`);
+        }
+        else {
+            startTime = new Date().getTime() / 1000;
+            (0, Logging_1.Log)(`${name}: Benchmarking ${msg}`);
+        }
+    };
+})();

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.