@hawksightco/hawk-sdk 1.1.44 → 1.1.46

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (25) hide show
  1. package/dist/src/classes/CreateTxMetadata.d.ts.map +1 -1
  2. package/dist/src/classes/CreateTxMetadata.js +16 -8
  3. package/dist/src/classes/General.d.ts +1 -2
  4. package/dist/src/classes/General.d.ts.map +1 -1
  5. package/dist/src/classes/Transactions.d.ts +19 -0
  6. package/dist/src/classes/Transactions.d.ts.map +1 -1
  7. package/dist/src/classes/Transactions.js +184 -26
  8. package/dist/src/classes/TxGenerator.d.ts.map +1 -1
  9. package/dist/src/classes/TxGenerator.js +6 -5
  10. package/dist/src/classes/TxGeneratorAutomations.d.ts +11 -0
  11. package/dist/src/classes/TxGeneratorAutomations.d.ts.map +1 -1
  12. package/dist/src/classes/TxGeneratorAutomations.js +36 -0
  13. package/dist/src/hsToMeteora.js +11 -11
  14. package/dist/src/ixGenerator/MeteoraDlmmIxGenerator.d.ts +1 -1
  15. package/dist/src/ixGenerator/MeteoraDlmmIxGenerator.d.ts.map +1 -1
  16. package/dist/src/ixGenerator/MeteoraDlmmIxGenerator.js +22 -13
  17. package/dist/src/meteora.d.ts +139 -0
  18. package/dist/src/meteora.d.ts.map +1 -1
  19. package/dist/src/meteora.js +312 -1
  20. package/dist/src/types.d.ts +14 -6
  21. package/dist/src/types.d.ts.map +1 -1
  22. package/package.json +1 -1
  23. package/dist/src/classes/Transaction copy.d.ts +0 -162
  24. package/dist/src/classes/Transaction copy.d.ts.map +0 -1
  25. package/dist/src/classes/Transaction copy.js +0 -458
package/dist/src/classes/CreateTxMetadata.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"CreateTxMetadata.d.ts","sourceRoot":"","sources":["../../../src/classes/CreateTxMetadata.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAC;AAE5E,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIlD;;;GAGG;AACH,qBAAa,gBAAgB;IAE3B,OAAO;IAEP,OAAO,CAAC,UAAU,CAAC,CAAkB;IAErC;;;;OAIG;IACH,aAAa,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU;IAEzC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAmB;IAE3C;;;;OAIG;IACH,MAAM,CAAC,QAAQ,IAAI,gBAAgB;IAOnC,OAAO,CAAC,IAAI,CAaV;IAEF;;OAEG;IACG,IAAI;IAIV;;OAEG;IACG,UAAU;IAUhB;;;;;;;OAOG;IACG,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,yBAAyB,CAAC;IAcvG;;;;;OAKG;IACG,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,yBAAyB,GAAG,IAAI,CAAC;IAIzE;;;;;OAKG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,yBAAyB;IAI7D;;;;;;OAMG;IACG,WAAW,CACf,IAAI,EAAE,MAAM,EAAE,GACb,OAAO,CAAC,IAAI,CAAC,yBAAyB,EAAE,CAAC;IA4B5C;;;;;;;;;;;;;;;OAeG;IACG,gBAAgB,CACpB,cAAc,EAAE,cAAc,EAC9B,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,2BAA2B,GAChC,OAAO,CAAC,mBAAmB,CAAC;IA0DzB,iBAAiB,CACrB,cAAc,EAAE,cAAc,EAC9B,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,2BAA2B,GAChC,OAAO,CAAC,mBAAmB,EAAE,CAAC;CAuElC"}
1
+ {"version":3,"file":"CreateTxMetadata.d.ts","sourceRoot":"","sources":["../../../src/classes/CreateTxMetadata.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAC;AAE5E,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIlD;;;GAGG;AACH,qBAAa,gBAAgB;IAE3B,OAAO;IAEP,OAAO,CAAC,UAAU,CAAC,CAAkB;IAErC;;;;OAIG;IACH,aAAa,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU;IAEzC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAmB;IAE3C;;;;OAIG;IACH,MAAM,CAAC,QAAQ,IAAI,gBAAgB;IAOnC,OAAO,CAAC,IAAI,CAaV;IAEF;;OAEG;IACG,IAAI;IAIV;;OAEG;IACG,UAAU;IAUhB;;;;;;;OAOG;IACG,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,yBAAyB,CAAC;IAcvG;;;;;OAKG;IACG,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,yBAAyB,GAAG,IAAI,CAAC;IAIzE;;;;;OAKG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,yBAAyB;IAI7D;;;;;;OAMG;IACG,WAAW,CACf,IAAI,EAAE,MAAM,EAAE,GACb,OAAO,CAAC,IAAI,CAAC,yBAAyB,EAAE,CAAC;IA8B5C;;;;;;;;;;;;;;;OAeG;IACG,gBAAgB,CACpB,cAAc,EAAE,cAAc,EAC9B,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,2BAA2B,GAChC,OAAO,CAAC,mBAAmB,CAAC;IA8DzB,iBAAiB,CACrB,cAAc,EAAE,cAAc,EAC9B,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,2BAA2B,GAChC,OAAO,CAAC,mBAAmB,EAAE,CAAC;CAuElC"}
package/dist/src/classes/CreateTxMetadata.js CHANGED
@@ -152,6 +152,7 @@ class CreateTxMetadata {
152
152
  */
153
153
  stringToAlt(alts) {
154
154
  return __awaiter(this, void 0, void 0, function* () {
155
+ var _a, _b;
155
156
  const _alts = [];
156
157
  const notExist = [];
157
158
  alts.map((key, index) => {
@@ -169,13 +170,15 @@ class CreateTxMetadata {
169
170
  const pubkeys = notExist.map(index => new web3.PublicKey(alts[index]));
170
171
  const accountInfos = yield this.connection.getMultipleAccountsInfo(pubkeys);
171
172
  for (let i = 0; i < accountInfos.length; i++) {
172
- const key = pubkeys[i].toString();
173
- const alt = new web3.AddressLookupTableAccount({
174
- key: pubkeys[i],
175
- state: web3.AddressLookupTableAccount.deserialize(accountInfos[i].data)
176
- });
177
- this.alts[key] = alt;
178
- _alts.push(alt);
173
+ if (((_a = accountInfos[i]) === null || _a === void 0 ? void 0 : _a.data) && ((_b = accountInfos[i]) === null || _b === void 0 ? void 0 : _b.owner.toString()) === "AddressLookupTab1e1111111111111111111111111") {
174
+ const key = pubkeys[i].toString();
175
+ const alt = new web3.AddressLookupTableAccount({
176
+ key: pubkeys[i],
177
+ state: web3.AddressLookupTableAccount.deserialize(accountInfos[i].data)
178
+ });
179
+ this.alts[key] = alt;
180
+ _alts.push(alt);
181
+ }
179
182
  }
180
183
  return _alts;
181
184
  });
@@ -223,7 +226,12 @@ class CreateTxMetadata {
223
226
  alts.push(_alt);
224
227
  }
225
228
  else {
226
- alts.push(yield this.loadSingleAlt(alt, connection));
229
+ try {
230
+ alts.push(yield this.loadSingleAlt(alt, connection));
231
+ }
232
+ catch (_a) {
233
+ console.error(`The ALT from Jupiter: ${alt} does not exist onchain. Skipping.`);
234
+ }
227
235
  }
228
236
  }
229
237
  }
package/dist/src/classes/General.d.ts CHANGED
@@ -4,7 +4,6 @@ import * as _client from "@hawksightco/swagger-client";
4
4
  import { ResponseWithStatus, TransactionMetadata, UserPortfolioOut } from "../types";
5
5
  import { Client } from "./Client";
6
6
  import { GeneralUtility } from "./GeneralUtility";
7
- import { InlineResponse200 } from '../../../swagger-client/dist/models/inline-response200';
8
7
  /**
9
8
  * Provides general utility functions for managing and querying blockchain-related data,
10
9
  * handling transactions, and interfacing with a specific blockchain network via the client API.
@@ -40,7 +39,7 @@ export declare class General {
40
39
  */
41
40
  token(params: {
42
41
  address: string;
43
- }): Promise<ResponseWithStatus<InlineResponse200>>;
42
+ }): Promise<ResponseWithStatus<_client.InlineResponse200>>;
44
43
  /**
45
44
  * Retrieves the portfolio information for a specified wallet and optionally a pool.
46
45
  *
package/dist/src/classes/General.d.ts.map CHANGED
@@ -1 +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;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"}
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;AAGlD;;;;;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,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAQzD;;;;;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/Transactions.d.ts CHANGED
@@ -49,6 +49,15 @@ export declare class Transactions {
49
49
  * @returns A ResponseWithStatus containing either TransactionMetadataResponse.
50
50
  */
51
51
  meteoraCreatePositionAndDeposit({ connection, params, }: TxgenParams<MeteoraCreatePositionAndDeposit>): Promise<TransactionMetadataResponse>;
52
+ /**
53
+ * Creates meteora instruction that creates new position and deposit.
54
+ *
55
+ * @param connection The Solana web3 connection object for blockchain interactions.
56
+ * @param payer The public key of the payer for transaction fees.
57
+ * @param params Parameters required
58
+ * @returns A ResponseWithStatus containing either TransactionMetadataResponse.
59
+ */
60
+ meteoraCreatePositionAndDeposiPda({ connection, params, }: TxgenParams<MeteoraCreatePositionAndDeposit>): Promise<TransactionMetadataResponse>;
52
61
  /**
53
62
  * Creates meteora instruction that initializes bin arrays.
54
63
  *
@@ -76,6 +85,15 @@ export declare class Transactions {
76
85
  * @returns A ResponseWithStatus containing either TransactionMetadataResponse.
77
86
  */
78
87
  meteoraWithdraw({ connection, params, }: TxgenParams<MeteoraWithdraw>): Promise<TransactionMetadataResponse>;
88
+ /**
89
+ * Creates meteora instruction withdraws from a position.
90
+ *
91
+ * @param connection The Solana web3 connection object for blockchain interactions.
92
+ * @param payer The public key of the payer for transaction fees.
93
+ * @param params Parameters required
94
+ * @returns A ResponseWithStatus containing either TransactionMetadataResponse.
95
+ */
96
+ meteoraWithdrawPda({ connection, params, }: TxgenParams<MeteoraWithdraw>): Promise<TransactionMetadataResponse>;
79
97
  /**
80
98
  * Creates meteora instruction that claims fees and rewards.
81
99
  *
@@ -104,6 +122,7 @@ export declare class Transactions {
104
122
  */
105
123
  meteoraClosePosition({ connection, params, }: TxgenParams<MeteoraClose>): Promise<TransactionMetadataResponse>;
106
124
  compoundAutomationIx({ connection, params, }: TxgenParams<MeteoraCompound>): Promise<TransactionMetadataResponse>;
125
+ claimAutomationIx({ connection, params, }: TxgenParams<MeteoraCompound>): Promise<TransactionMetadataResponse>;
107
126
  rebalanceAutomationIx({ connection, params, }: TxgenParams<MeteoraRebalance>): Promise<TransactionMetadataResponse>;
108
127
  rebalanceAutomationIx2({ connection, params, }: TxgenParams<MeteoraRebalance2>): Promise<TransactionMetadataResponse>;
109
128
  /**
package/dist/src/classes/Transactions.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Transactions.d.ts","sourceRoot":"","sources":["../../../src/classes/Transactions.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Transactions.d.ts","sourceRoot":"","sources":["../../../src/classes/Transactions.ts"],"names":[],"mappings":"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"}
package/dist/src/classes/Transactions.js CHANGED
@@ -168,6 +168,39 @@ class Transactions {
168
168
  });
169
169
  });
170
170
  }
171
+ /**
172
+ * Creates meteora instruction that creates new position and deposit.
173
+ *
174
+ * @param connection The Solana web3 connection object for blockchain interactions.
175
+ * @param payer The public key of the payer for transaction fees.
176
+ * @param params Parameters required
177
+ * @returns A ResponseWithStatus containing either TransactionMetadataResponse.
178
+ */
179
+ meteoraCreatePositionAndDeposiPda(_a) {
180
+ return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
181
+ const dlmmPool = yield meteora_1.MeteoraDLMM.create(connection, new web3.PublicKey(params.pool));
182
+ const userPda = (0, functions_1.generateUserPda)(params.userWallet);
183
+ const mainInstructions = (yield dlmmPool.initializePositionAndAddLiquidityByStrategyPda(params.userWallet, params.userWallet, {
184
+ positionPubKey: params.position,
185
+ user: userPda,
186
+ totalXAmount: params.totalXAmount,
187
+ totalYAmount: params.totalYAmount,
188
+ strategy: {
189
+ maxBinId: params.binRange.upperRange,
190
+ minBinId: params.binRange.lowerRange,
191
+ strategyType: types_1.StrategyTypeMap[params.distribution],
192
+ },
193
+ slippage: params.slippage,
194
+ skipInputTokenCheck: params.skipInputTokenCheck,
195
+ }, hsToMeteora_1.meteoraToHawksight)).default();
196
+ return (0, functions_1.createTransactionMeta)({
197
+ payer: params.userWallet,
198
+ description: "Create position and deposit to Meteora DLMM",
199
+ addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
200
+ mainInstructions,
201
+ });
202
+ });
203
+ }
171
204
  /**
172
205
  * Creates meteora instruction that initializes bin arrays.
173
206
  *
@@ -298,6 +331,68 @@ class Transactions {
298
331
  });
299
332
  });
300
333
  }
334
+ /**
335
+ * Creates meteora instruction withdraws from a position.
336
+ *
337
+ * @param connection The Solana web3 connection object for blockchain interactions.
338
+ * @param payer The public key of the payer for transaction fees.
339
+ * @param params Parameters required
340
+ * @returns A ResponseWithStatus containing either TransactionMetadataResponse.
341
+ */
342
+ meteoraWithdrawPda(_a) {
343
+ return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
344
+ const userPda = (0, functions_1.generateUserPda)(params.userWallet);
345
+ const program = yield meteora_1.MeteoraDLMM.program(connection);
346
+ let lbPair, binIdsToRemove;
347
+ if (params.fastGeneration !== undefined) {
348
+ lbPair = params.fastGeneration.pool;
349
+ }
350
+ else {
351
+ const position = yield program.account.positionV2.fetch(params.position);
352
+ lbPair = position.lbPair;
353
+ }
354
+ const dlmmPool = yield meteora_1.MeteoraDLMM.create(connection, lbPair);
355
+ if (params.fastGeneration === undefined) {
356
+ const { userPositions } = yield dlmmPool.getPositionsByUserAndLbPair(userPda);
357
+ const userPosition = userPositions.find((userPosition) => userPosition.publicKey.toString() === params.position.toString());
358
+ if (userPosition === undefined) {
359
+ throw new Error("Position does not exist."); // this error should not happen...
360
+ }
361
+ binIdsToRemove = userPosition.positionData.positionBinData.map((bin) => bin.binId);
362
+ }
363
+ else {
364
+ binIdsToRemove = params.fastGeneration.binIdsToRemove;
365
+ }
366
+ const amountBps = params.shouldClaimAndClose
367
+ ? new bn_js_1.default(10000)
368
+ : params.amountBps;
369
+ const mainInstructions = (yield dlmmPool.removeLiquidityPda(params.userWallet, params.userWallet, {
370
+ user: userPda,
371
+ position: params.position,
372
+ binIds: binIdsToRemove,
373
+ bps: amountBps,
374
+ shouldClaimAndClose: params.shouldClaimAndClose,
375
+ }, hsToMeteora_1.meteoraToHawksight)).default();
376
+ let description;
377
+ if (params.shouldClaimAndClose) {
378
+ description =
379
+ "Full position withdrawal with claim and close instructisons from Meteora DLMM";
380
+ }
381
+ else if (amountBps.eq(new bn_js_1.default(10000))) {
382
+ description =
383
+ "Full position withdrawal without claim and close instructions from Meteora DLMM";
384
+ }
385
+ else {
386
+ description = "Partial position withdrawal from Meteora DLMM";
387
+ }
388
+ return (0, functions_1.createTransactionMeta)({
389
+ payer: params.userWallet,
390
+ description,
391
+ addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
392
+ mainInstructions,
393
+ });
394
+ });
395
+ }
301
396
  /**
302
397
  * Creates meteora instruction that claims fees and rewards.
303
398
  *
@@ -440,6 +535,41 @@ class Transactions {
440
535
  });
441
536
  });
442
537
  }
538
+ claimAutomationIx(_a) {
539
+ return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
540
+ const program = yield meteora_1.MeteoraDLMM.program(connection);
541
+ const position = yield program.account.positionV2.fetch(params.position);
542
+ const dlmmPool = yield meteora_1.MeteoraDLMM.create(connection, position.lbPair);
543
+ const userPda = (0, functions_1.generateUserPda)(params.userWallet);
544
+ const { userPositions } = yield dlmmPool.getPositionsByUserAndLbPair(userPda);
545
+ const userPosition = userPositions.find(userPosition => userPosition.publicKey.equals(params.position));
546
+ if (userPosition === undefined) {
547
+ throw new Error(`Position: ${params.position} does not exist.`);
548
+ }
549
+ // Claim fee and claim reward ixs
550
+ const fn = new meteora_1.MeteoraFunctions();
551
+ const claimBuilder = yield fn.claimAllRewardsByPosition(connection, params.userWallet, addresses_1.HS_AUTHORITY, {
552
+ owner: userPda,
553
+ position: params.position,
554
+ lbPair: position.lbPair,
555
+ }, hsToMeteora_1.meteoraToHawksightAutomationIxs);
556
+ // Change to STA because we want the tokens to be in the HawkFi wallet
557
+ claimBuilder.replaceClaimFeeTokenToSTA();
558
+ claimBuilder.replaceClaimRewardToSTA();
559
+ const mainInstructions = [
560
+ // Step 1: Initialize ATA
561
+ ...claimBuilder.createAtaIxs,
562
+ // Step 2: Claim rewards and fees
563
+ ...claimBuilder.mainIxs,
564
+ ];
565
+ return (0, functions_1.createTransactionMeta)({
566
+ payer: params.userWallet,
567
+ description: "Automation IX: Meteora Auto-claim instructions (claim fee, reward)",
568
+ addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
569
+ mainInstructions,
570
+ });
571
+ });
572
+ }
443
573
  rebalanceAutomationIx(_a) {
444
574
  return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
445
575
  const program = yield meteora_1.MeteoraDLMM.program(connection);
@@ -534,10 +664,10 @@ class Transactions {
534
664
  relativeLowerBinId: relativeBinRange.lowerRange,
535
665
  relativeUpperBinId: relativeBinRange.upperRange,
536
666
  strategyType: types_1.StrategyTypeMap[distribution],
537
- checkRange: checkRange ? {
667
+ checkRange: {
538
668
  minBinId: checkRange.lowerRange,
539
669
  maxBinId: checkRange.upperRange,
540
- } : undefined,
670
+ },
541
671
  });
542
672
  const mainInstructions = [
543
673
  // Initialize required ATA
@@ -810,8 +940,11 @@ class Transactions {
810
940
  return __awaiter(this, arguments, void 0, function* ({ connection, params }) {
811
941
  const farm = addresses_1.USDC_FARM;
812
942
  const userPda = (0, functions_1.generateUserPda)(params.userWallet, farm);
813
- const position = (0, functions_1.generateOrcaPositionPDA)(params.positionMint);
814
- const positionTokenAccount = (0, functions_1.generateAta)(userPda, params.positionMint);
943
+ const positionData = yield anchor_1.Anchor.instance().orcaProgram.account.position.fetch(params.position);
944
+ if (positionData === null) {
945
+ throw new Error(`Position: ${params.position} does not exist or already closed.`);
946
+ }
947
+ const positionTokenAccount = (0, functions_1.generateAta)(userPda, positionData.positionMint);
815
948
  const extensionIx = yield anchor_1.Anchor.instance().iyfExtension.methods
816
949
  .orcaClosePosition()
817
950
  .accounts({
@@ -819,8 +952,8 @@ class Transactions {
819
952
  userPda,
820
953
  authority: params.userWallet,
821
954
  iyfProgram: addresses_1.IYF_MAIN,
822
- positionMint: params.positionMint,
823
- position,
955
+ positionMint: positionData.positionMint,
956
+ position: params.position,
824
957
  positionTokenAccount,
825
958
  orcaWhirlpoolProgram: addresses_1.ORCA_WHIRLPOOL_PROGRAM,
826
959
  tokenProgram: addresses_1.TOKEN_PROGRAM_ID,
@@ -867,11 +1000,35 @@ class Transactions {
867
1000
  return __awaiter(this, arguments, void 0, function* ({ connection, params }) {
868
1001
  const farm = addresses_1.USDC_FARM;
869
1002
  const userPda = (0, functions_1.generateUserPda)(params.userWallet, farm);
870
- const position = (0, functions_1.generateOrcaPositionPDA)(params.positionMint);
871
- const positionTokenAccount = (0, functions_1.generateAta)(userPda, params.positionMint);
872
- const positionData = yield anchor_1.Anchor.instance().orcaProgram.account.position.fetch(position);
1003
+ let position;
1004
+ let positionMint;
1005
+ let positionData;
1006
+ if (params.mintOrPosition.position !== undefined) {
1007
+ position = params.mintOrPosition.position;
1008
+ positionData = yield anchor_1.Anchor.instance().orcaProgram.account.position.fetch(position);
1009
+ positionMint = positionData.positionMint;
1010
+ }
1011
+ else if (params.mintOrPosition.positionMint !== undefined) {
1012
+ positionMint = params.mintOrPosition.positionMint;
1013
+ position = (0, functions_1.generateOrcaPositionPDA)(positionMint);
1014
+ }
1015
+ else {
1016
+ throw new Error('Position mint or orca position needs to be provided.');
1017
+ }
1018
+ const positionTokenAccount = (0, functions_1.generateAta)(userPda, positionMint);
1019
+ if (params.newPosition) {
1020
+ positionData = {
1021
+ positionMint,
1022
+ whirlpool: params.newPosition.whirlpool,
1023
+ tickLowerIndex: params.newPosition.tickLowerIndex,
1024
+ tickUpperIndex: params.newPosition.tickUpperIndex,
1025
+ };
1026
+ }
1027
+ else {
1028
+ positionData = yield anchor_1.Anchor.instance().orcaProgram.account.position.fetch(position);
1029
+ }
873
1030
  if (positionData === null) {
874
- throw new Error(`Position: ${position} does not exist or already closed. Position mint: ${params.positionMint}`);
1031
+ throw new Error(`Position: ${position} does not exist or already closed. Position mint: ${positionMint}`);
875
1032
  }
876
1033
  const whirlpool = positionData.whirlpool;
877
1034
  const whirlpoolData = yield anchor_1.Anchor.instance().orcaProgram.account.whirlpool.fetch(whirlpool);
@@ -920,7 +1077,7 @@ class Transactions {
920
1077
  userPda,
921
1078
  authority: params.userWallet,
922
1079
  iyfProgram: addresses_1.IYF_MAIN,
923
- positionMint: params.positionMint,
1080
+ positionMint,
924
1081
  whirlpool,
925
1082
  position,
926
1083
  positionTokenAccount,
@@ -993,12 +1150,14 @@ class Transactions {
993
1150
  return __awaiter(this, arguments, void 0, function* ({ connection, params }) {
994
1151
  const farm = addresses_1.USDC_FARM;
995
1152
  const userPda = (0, functions_1.generateUserPda)(params.userWallet, farm);
996
- const position = (0, functions_1.generateOrcaPositionPDA)(params.positionMint);
997
- const positionTokenAccount = (0, functions_1.generateAta)(userPda, params.positionMint);
998
- const positionData = yield anchor_1.Anchor.instance().orcaProgram.account.position.fetch(position);
1153
+ const positionData = yield anchor_1.Anchor.instance().orcaProgram.account.position.fetch(params.position);
999
1154
  if (positionData === null) {
1000
- throw new Error(`Position: ${position} does not exist or already closed. Position mint: ${params.positionMint}`);
1155
+ throw new Error(`Position: ${params.position} does not exist or already closed.`);
1001
1156
  }
1157
+ const liquidityAmount = positionData.liquidity
1158
+ .mul(new bn_js_1.default(Math.round(params.percentage * 100)))
1159
+ .div(new bn_js_1.default(10000));
1160
+ const positionTokenAccount = (0, functions_1.generateAta)(userPda, positionData.positionMint);
1002
1161
  const whirlpool = positionData.whirlpool;
1003
1162
  const whirlpoolData = yield anchor_1.Anchor.instance().orcaProgram.account.whirlpool.fetch(whirlpool);
1004
1163
  const mintA = whirlpoolData.tokenMintA;
@@ -1010,15 +1169,15 @@ class Transactions {
1010
1169
  const ownerFeeA = (0, functions_1.generateAta)(addresses_1.SITE_FEE_OWNER, mintA);
1011
1170
  const ownerFeeB = (0, functions_1.generateAta)(addresses_1.SITE_FEE_OWNER, mintB);
1012
1171
  const extensionIx = yield anchor_1.Anchor.instance().iyfExtension.methods
1013
- .orcaWithdraw(params.liquidityAmount)
1172
+ .orcaWithdraw(liquidityAmount)
1014
1173
  .accounts({
1015
1174
  farm,
1016
1175
  userPda,
1017
1176
  authority: params.userWallet,
1018
1177
  iyfProgram: addresses_1.IYF_MAIN,
1019
- positionMint: params.positionMint,
1178
+ positionMint: positionData.positionMint,
1020
1179
  whirlpool,
1021
- position,
1180
+ position: params.position,
1022
1181
  positionTokenAccount,
1023
1182
  tokenOwnerAccountA,
1024
1183
  tokenOwnerAccountB,
@@ -1071,7 +1230,7 @@ class Transactions {
1071
1230
  const mainInstructions = [orcaIx, withdrawFromPda];
1072
1231
  return (0, functions_1.createTransactionMeta)({
1073
1232
  payer: params.userWallet,
1074
- description: `Withdraw deposits from Orca Position: ${position}`,
1233
+ description: `Withdraw deposits from Orca Position: ${params.position}`,
1075
1234
  addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
1076
1235
  mainInstructions,
1077
1236
  });
@@ -1089,12 +1248,11 @@ class Transactions {
1089
1248
  return __awaiter(this, arguments, void 0, function* ({ connection, params }) {
1090
1249
  const farm = addresses_1.USDC_FARM;
1091
1250
  const userPda = (0, functions_1.generateUserPda)(params.userWallet, farm);
1092
- const position = (0, functions_1.generateOrcaPositionPDA)(params.positionMint);
1093
- const positionTokenAccount = (0, functions_1.generateAta)(userPda, params.positionMint);
1094
- const positionData = yield anchor_1.Anchor.instance().orcaProgram.account.position.fetch(position);
1251
+ const positionData = yield anchor_1.Anchor.instance().orcaProgram.account.position.fetch(params.position);
1095
1252
  if (positionData === null) {
1096
- throw new Error(`Position: ${position} does not exist or already closed. Position mint: ${params.positionMint}`);
1253
+ throw new Error(`Position: ${params.position} does not exist or already closed.`);
1097
1254
  }
1255
+ const positionTokenAccount = (0, functions_1.generateAta)(userPda, positionData.positionMint);
1098
1256
  const whirlpool = positionData.whirlpool;
1099
1257
  const whirlpoolData = yield anchor_1.Anchor.instance().orcaProgram.account.whirlpool.fetch(whirlpool);
1100
1258
  const mintA = whirlpoolData.tokenMintA;
@@ -1125,8 +1283,8 @@ class Transactions {
1125
1283
  authority: params.userWallet,
1126
1284
  iyfProgram: addresses_1.IYF_MAIN,
1127
1285
  whirlpool,
1128
- positionMint: params.positionMint,
1129
- position,
1286
+ positionMint: positionData.positionMint,
1287
+ position: params.position,
1130
1288
  tickArrayLower,
1131
1289
  tickArrayUpper,
1132
1290
  positionTokenAccount,
@@ -1180,7 +1338,7 @@ class Transactions {
1180
1338
  const mainInstructions = [orcaIx, withdrawFromPda];
1181
1339
  return (0, functions_1.createTransactionMeta)({
1182
1340
  payer: params.userWallet,
1183
- description: `Claim rewards from Orca Position: ${position}`,
1341
+ description: `Claim rewards from Orca Position: ${params.position}`,
1184
1342
  addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
1185
1343
  mainInstructions,
1186
1344
  });
package/dist/src/classes/TxGenerator.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"TxGenerator.d.ts","sourceRoot":"","sources":["../../../src/classes/TxGenerator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"TxGenerator.d.ts","sourceRoot":"","sources":["../../../src/classes/TxGenerator.ts"],"names":[],"mappings":"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"}
package/dist/src/classes/TxGenerator.js CHANGED
@@ -391,7 +391,7 @@ class TxGenerator {
391
391
  connection,
392
392
  params: {
393
393
  userWallet: params.userWallet,
394
- positionMint: params.positionMint,
394
+ position: params.position,
395
395
  }
396
396
  });
397
397
  return {
@@ -428,9 +428,10 @@ class TxGenerator {
428
428
  connection,
429
429
  params: {
430
430
  userWallet: params.userWallet,
431
- positionMint: params.positionMint,
431
+ mintOrPosition: params.mintOrPosition,
432
432
  totalXAmount: params.totalXAmount,
433
433
  totalYAmount: params.totalYAmount,
434
+ newPosition: params.newPosition,
434
435
  }
435
436
  });
436
437
  return {
@@ -467,8 +468,8 @@ class TxGenerator {
467
468
  connection,
468
469
  params: {
469
470
  userWallet: params.userWallet,
470
- positionMint: params.positionMint,
471
- liquidityAmount: params.liquidityAmount,
471
+ position: params.position,
472
+ percentage: params.percentage,
472
473
  }
473
474
  });
474
475
  return {
@@ -505,7 +506,7 @@ class TxGenerator {
505
506
  connection,
506
507
  params: {
507
508
  userWallet: params.userWallet,
508
- positionMint: params.positionMint,
509
+ position: params.position,
509
510
  }
510
511
  });
511
512
  return {
package/dist/src/classes/TxGeneratorAutomations.d.ts CHANGED
@@ -39,6 +39,17 @@ export declare class TxGeneratorAutomations {
39
39
  * @returns A ResponseWithStatus containing either TransactionMetadataResponse or TransactionMetadata.
40
40
  */
41
41
  meteoraCompoundIxs(connection: web3.Connection, payer: string, params: MeteoraCompound): Promise<ResponseWithStatus<TransactionMetadata>>;
42
+ /**
43
+ * Creates meteora auto-claim instruction (claim fee, reward)
44
+ *
45
+ * NOTE: For hawksight devs only.
46
+ *
47
+ * @param connection The Solana web3 connection object for blockchain interactions.
48
+ * @param payer The public key of the payer for transaction fees.
49
+ * @param params Parameters required
50
+ * @returns A ResponseWithStatus containing either TransactionMetadataResponse or TransactionMetadata.
51
+ */
52
+ meteoraClaimIxs(connection: web3.Connection, payer: string, params: MeteoraCompound): Promise<ResponseWithStatus<TransactionMetadata>>;
42
53
  /**
43
54
  * Creates meteora auto-rebalance instruction
44
55
  *
package/dist/src/classes/TxGeneratorAutomations.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"TxGeneratorAutomations.d.ts","sourceRoot":"","sources":["../../../src/classes/TxGeneratorAutomations.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,KAAK,OAAO,MAAM,6BAA6B,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,2BAA2B,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,mBAAmB,EAAoD,MAAM,UAAU,CAAC;AACxM,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIlD;;;;;;GAMG;AACH,qBAAa,sBAAsB;IAkB/B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAjBjC;;OAEG;IACH,SAAS,CAAC,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC;IAE/C;;OAEG;IACH,SAAS,CAAC,cAAc,EAAE,MAAM,CAAC;IAEjC;;;;OAIG;gBAEgB,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,cAAc;IAMjD;;;;;;;;;OASG;IACG,kBAAkB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;IA6B/I;;;;;;;;;OASG;IACG,mBAAmB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;IA6BjJ;;;;;;;;;OASG;IACG,oBAAoB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;IA6BnJ;;;;;;;;;OASG;IACG,oBAAoB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,2BAA2B,GAAG,OAAO,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;CA4B9J"}
1
+ {"version":3,"file":"TxGeneratorAutomations.d.ts","sourceRoot":"","sources":["../../../src/classes/TxGeneratorAutomations.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,KAAK,OAAO,MAAM,6BAA6B,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,2BAA2B,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,mBAAmB,EAAoD,MAAM,UAAU,CAAC;AACxM,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIlD;;;;;;GAMG;AACH,qBAAa,sBAAsB;IAkB/B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAjBjC;;OAEG;IACH,SAAS,CAAC,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC;IAE/C;;OAEG;IACH,SAAS,CAAC,cAAc,EAAE,MAAM,CAAC;IAEjC;;;;OAIG;gBAEgB,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,cAAc;IAMjD;;;;;;;;;OASG;IACG,kBAAkB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;IA6B/I;;;;;;;;;OASG;IACG,eAAe,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;IA6B5I;;;;;;;;;OASG;IACG,mBAAmB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;IA6BjJ;;;;;;;;;OASG;IACG,oBAAoB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;IA6BnJ;;;;;;;;;OASG;IACG,oBAAoB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,2BAA2B,GAAG,OAAO,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;CA4B9J"}
package/dist/src/classes/TxGeneratorAutomations.js CHANGED
@@ -92,6 +92,42 @@ class TxGeneratorAutomations {
92
92
  }
93
93
  });
94
94
  }
95
+ /**
96
+ * Creates meteora auto-claim instruction (claim fee, reward)
97
+ *
98
+ * NOTE: For hawksight devs only.
99
+ *
100
+ * @param connection The Solana web3 connection object for blockchain interactions.
101
+ * @param payer The public key of the payer for transaction fees.
102
+ * @param params Parameters required
103
+ * @returns A ResponseWithStatus containing either TransactionMetadataResponse or TransactionMetadata.
104
+ */
105
+ meteoraClaimIxs(connection, payer, params) {
106
+ return __awaiter(this, void 0, void 0, function* () {
107
+ // Initialize anchor
108
+ anchor_1.Anchor.initialize(connection);
109
+ try {
110
+ const result = yield Transactions_1.txgen.claimAutomationIx({
111
+ connection,
112
+ params,
113
+ });
114
+ return {
115
+ status: 200,
116
+ data: yield (0, functions_1.createTxMetadata)(this.generalUtility, connection, payer, result),
117
+ };
118
+ }
119
+ catch (e) {
120
+ return {
121
+ status: 400,
122
+ data: {
123
+ code: "custom",
124
+ message: e,
125
+ path: [],
126
+ },
127
+ };
128
+ }
129
+ });
130
+ }
95
131
  /**
96
132
  * Creates meteora auto-rebalance instruction
97
133
  *
package/dist/src/hsToMeteora.js CHANGED
@@ -492,7 +492,7 @@ class ClaimReward extends HawksightMeteoraCpi {
492
492
  const authority = this.authority;
493
493
  const iyfProgram = addresses_1.IYF_MAIN;
494
494
  // Get token mint
495
- const rewardMint = this.ix.keys[9].pubkey;
495
+ const rewardMint = this.ix.keys[6].pubkey;
496
496
  // Generate owner fee X and Y ATA
497
497
  const ownerFee = util.generateAta(addresses_1.SITE_FEE_OWNER, rewardMint);
498
498
  // Get reward index from parameter
@@ -505,16 +505,16 @@ class ClaimReward extends HawksightMeteoraCpi {
505
505
  userPda,
506
506
  authority,
507
507
  iyfProgram,
508
- lbPair: this.ix.keys[4].pubkey,
509
- position: this.ix.keys[5].pubkey,
510
- binArrayLower: this.ix.keys[6].pubkey,
511
- binArrayUpper: this.ix.keys[7].pubkey,
512
- rewardVault: this.ix.keys[8].pubkey,
513
- rewardMint: this.ix.keys[9].pubkey,
514
- userTokenAccount: this.ix.keys[10].pubkey,
515
- tokenProgram: this.ix.keys[11].pubkey,
516
- eventAuthority: this.ix.keys[12].pubkey,
517
- meteoraDlmmProgram: this.ix.keys[13].pubkey,
508
+ lbPair: this.ix.keys[0].pubkey,
509
+ position: this.ix.keys[1].pubkey,
510
+ binArrayLower: this.ix.keys[2].pubkey,
511
+ binArrayUpper: this.ix.keys[3].pubkey,
512
+ rewardVault: this.ix.keys[5].pubkey,
513
+ rewardMint: this.ix.keys[6].pubkey,
514
+ userTokenAccount: this.ix.keys[7].pubkey,
515
+ tokenProgram: this.ix.keys[8].pubkey,
516
+ eventAuthority: this.ix.keys[9].pubkey,
517
+ meteoraDlmmProgram: this.ix.keys[10].pubkey,
518
518
  ownerFee,
519
519
  }).instruction();
520
520
  // Instruction via main hawksight contract
package/dist/src/ixGenerator/MeteoraDlmmIxGenerator.d.ts CHANGED
@@ -16,7 +16,7 @@ type OpenPositionAndDepositAutomation = {
16
16
  relativeLowerBinId: number;
17
17
  relativeUpperBinId: number;
18
18
  strategyType: StrategyType;
19
- checkRange?: {
19
+ checkRange: {
20
20
  minBinId: number;
21
21
  maxBinId: number;
22
22
  };
package/dist/src/ixGenerator/MeteoraDlmmIxGenerator.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"MeteoraDlmmIxGenerator.d.ts","sourceRoot":"","sources":["../../../src/ixGenerator/MeteoraDlmmIxGenerator.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAGxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAK1D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAYhD,KAAK,4BAA4B,GAAG;IAClC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC;IACvB,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAA;AAED,KAAK,gCAAgC,GAAG;IACtC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC;IACvB,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC;IACzB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,UAAU,CAAC,EAAE;QACX,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAA;CACF,CAAA;AAED;;GAEG;AACH,qBAAa,sBAAsB;IAG/B,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,kBAAkB;IAG/B,4BAA4B,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE,4BAA4B,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC;IAqCvL,mBAAmB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,YAAY,EAAE,UAAU,EAAE,EAAE,gCAAgC,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC;IAwE5N,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC;IAWvF,WAAW,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC;IAW1F,kBAAkB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC;IAWjG,qBAAqB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC;IAWpG,iBAAiB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC;IAWhG,cAAc,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC;IAW7F,kBAAkB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC;IAWjG,uBAAuB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC;IAWtG,oBAAoB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC;IAWzG;;;;;OAKG;YACW,OAAO;CAGtB"}
1
+ {"version":3,"file":"MeteoraDlmmIxGenerator.d.ts","sourceRoot":"","sources":["../../../src/ixGenerator/MeteoraDlmmIxGenerator.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAGxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAK1D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAYhD,KAAK,4BAA4B,GAAG;IAClC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC;IACvB,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAA;AAED,KAAK,gCAAgC,GAAG;IACtC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC;IACvB,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC;IACzB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,UAAU,EAAE;QACV,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAA;CACF,CAAA;AAED;;GAEG;AACH,qBAAa,sBAAsB;IAG/B,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,kBAAkB;IAG/B,4BAA4B,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE,4BAA4B,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC;IAqCvL,mBAAmB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,YAAY,EAAE,UAAU,EAAE,EAAE,gCAAgC,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC;IAsF5N,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC;IAWvF,WAAW,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC;IAW1F,kBAAkB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC;IAWjG,qBAAqB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC;IAWpG,iBAAiB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC;IAWhG,cAAc,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC;IAW7F,kBAAkB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC;IAWjG,uBAAuB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC;IAWtG,oBAAoB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC;IAWzG;;;;;OAKG;YACW,OAAO;CAGtB"}