@hawksightco/hawk-sdk 1.3.114 → 1.3.116

package/dist/src/hsToMeteora.js

@@ -1953,8 +1953,8 @@ class ClaimRewardAutomation extends HawksightMeteoraAutomationCpi {
      * Adjusts transaction keys to facilitate the claiming of rewards.
      */
     replace() {
-        this._ix.keys[4].pubkey = this.userPda;
-        this._ix.keys[4].isSigner = false;
+        // this._ix.keys[4].pubkey = this.userPda;
+        // this._ix.keys[4].isSigner = false;
     }
     /**
      * Replaces Meteora CPI with Hawksight CPI that calls the target Meteora CPI.
@@ -1971,7 +1971,8 @@ class ClaimRewardAutomation extends HawksightMeteoraAutomationCpi {
             const iyfProgram = addresses_1.IYF_MAIN;
             const hawksightAuthority = addresses_1.HS_AUTHORITY;
             // Generate owner fee ATA
-            const rewardMint = this.ix.keys[6].pubkey;
+            const rewardMint = this.ix.keys[4].pubkey;
+            console.log(`ClaimRewardAutomation rewardMint:`, rewardMint.toString());
             const mintInfo = AccountCache_1.AccountCache.get(rewardMint);
             if (!mintInfo) {
                 throw new Error("Unexpected error: Reward mint not found in cache.");
@@ -1980,14 +1981,16 @@ class ClaimRewardAutomation extends HawksightMeteoraAutomationCpi {
             // 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);
+                this.ix.keys[5].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);
+                this.ix.keys[5].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, mintInfo.info.owner);
+                this.ix.keys[5].pubkey = util.generateAta(this.userPda, this.ix.keys[6].pubkey, mintInfo.info.owner);
             }
+            let binArrayLower = this.ix.keys[10].pubkey;
+            let binArrayUpper = this.ix.keys.length > 11 ? this.ix.keys[11].pubkey : this.ix.keys[10].pubkey;
             // Generate IX via extension contract
             // @ts-ignore
             const claimRewardIx = yield anchor_1.Anchor.instance().iyfExtension.methods
@@ -2000,14 +2003,14 @@ class ClaimRewardAutomation extends HawksightMeteoraAutomationCpi {
                 hawksightAuthority,
                 lbPair: this.ix.keys[0].pubkey,
                 position: this.ix.keys[1].pubkey,
-                binArrayLower: this.ix.keys[2].pubkey,
-                binArrayUpper: this.ix.keys[3].pubkey,
-                rewardVault: this.ix.keys[5].pubkey,
+                binArrayLower: binArrayLower,
+                binArrayUpper: binArrayUpper,
+                rewardVault: this.ix.keys[3].pubkey,
                 rewardMint,
-                userTokenAccount: this.ix.keys[7].pubkey,
-                tokenProgram: this.ix.keys[8].pubkey,
-                eventAuthority: this.ix.keys[9].pubkey,
-                meteoraDlmmProgram: this.ix.keys[10].pubkey,
+                userTokenAccount: this.ix.keys[5].pubkey,
+                tokenProgram: this.ix.keys[6].pubkey,
+                eventAuthority: this.ix.keys[8].pubkey,
+                meteoraDlmmProgram: this.ix.keys[9].pubkey,
                 ownerFee,
             }).instruction();
             // Instruction via main hawksight contract

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hawksightco/hawk-sdk",
-  "version": "1.3.114",
+  "version": "1.3.116",
   "description": "Hawksight v2 SDK",
   "main": "dist/src/index.js",
   "repository": "https://github.com/ghabxph/hawk-api-client.git",