@hawksightco/hawk-sdk 1.2.58 → 1.2.59

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 (8) hide show
  1. package/dist/src/classes/Transactions.d.ts.map +1 -1
  2. package/dist/src/classes/Transactions.js +28 -0
  3. package/dist/src/ixGenerator/IyfExtensionIxGenerator.d.ts +6 -2
  4. package/dist/src/ixGenerator/IyfExtensionIxGenerator.d.ts.map +1 -1
  5. package/dist/src/ixGenerator/IyfExtensionIxGenerator.js +187 -96
  6. package/dist/src/ixGenerator/RaydiumIxGenerator.d.ts.map +1 -1
  7. package/dist/src/ixGenerator/RaydiumIxGenerator.js +2 -0
  8. package/package.json +1 -1
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
@@ -2219,6 +2219,19 @@ class Transactions {
2219
2219
  }),
2220
2220
  ],
2221
2221
  });
2222
+ const rewards = fetch.poolStateInfo.rewardInfos.map((v) => v.tokenMint.toString()).filter((v) => v !== web3.SystemProgram.programId.toString());
2223
+ const mints = [...new Set([
2224
+ ...rewards,
2225
+ fetch.poolStateInfo.tokenMint0.toString(),
2226
+ fetch.poolStateInfo.tokenMint1.toString(),
2227
+ ])].map((v) => new web3.PublicKey(v));
2228
+ const nftOwner = (0, functions_1.generateUserPdaLamport)(params.userWallet);
2229
+ const initAtaIxs = mints.map(v => {
2230
+ const payer = params.userWallet;
2231
+ const associatedToken = (0, functions_1.generateAta)(nftOwner, v);
2232
+ const mint = v;
2233
+ return (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(payer, associatedToken, nftOwner, mint);
2234
+ });
2222
2235
  const unwrapSolIx = (0, functions_1.unwrapSolIfMintIsWsol)(params.userWallet, [
2223
2236
  fetch.poolStateInfo.tokenMint0,
2224
2237
  fetch.poolStateInfo.tokenMint1
@@ -2252,6 +2265,7 @@ class Transactions {
2252
2265
  }
2253
2266
  else {
2254
2267
  const mainInstructions = [
2268
+ ...initAtaIxs,
2255
2269
  raydiumDecreaseLiquidityIxViaHawksight,
2256
2270
  raydiumClosePositionIxViaHawksight,
2257
2271
  withdrawLamportsFromPdaIx,
@@ -2374,6 +2388,19 @@ class Transactions {
2374
2388
  }),
2375
2389
  ],
2376
2390
  });
2391
+ const rewards = fetch.poolStateInfo.rewardInfos.map((v) => v.tokenMint.toString()).filter((v) => v !== web3.SystemProgram.programId.toString());
2392
+ const mints = [...new Set([
2393
+ ...rewards,
2394
+ fetch.poolStateInfo.tokenMint0.toString(),
2395
+ fetch.poolStateInfo.tokenMint1.toString(),
2396
+ ])].map((v) => new web3.PublicKey(v));
2397
+ const nftOwner = (0, functions_1.generateUserPdaLamport)(params.userWallet);
2398
+ const initAtaIxs = mints.map(v => {
2399
+ const payer = params.userWallet;
2400
+ const associatedToken = (0, functions_1.generateAta)(nftOwner, v);
2401
+ const mint = v;
2402
+ return (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(payer, associatedToken, nftOwner, mint);
2403
+ });
2377
2404
  const unwrapSolIx = (0, functions_1.unwrapSolIfMintIsWsol)(params.userWallet, [
2378
2405
  fetch.poolStateInfo.tokenMint0,
2379
2406
  fetch.poolStateInfo.tokenMint1
@@ -2384,6 +2411,7 @@ class Transactions {
2384
2411
  fetch,
2385
2412
  });
2386
2413
  const mainInstructions = [
2414
+ ...initAtaIxs,
2387
2415
  raydiumDecreaseLiquidityIxViaHawksight,
2388
2416
  withdrawIx,
2389
2417
  ...unwrapSolIx,
package/dist/src/ixGenerator/IyfExtensionIxGenerator.d.ts CHANGED
@@ -46,6 +46,10 @@ type RaydiumDecreaseLiquidity = {
46
46
  liquidity: BN;
47
47
  amount0Min: BN;
48
48
  amount1Min: BN;
49
+ rewardInfos: {
50
+ tokenMint: web3.PublicKey;
51
+ tokenVault: web3.PublicKey;
52
+ }[];
49
53
  };
50
54
  type RaydiumIncreaseLiquidityAutomation = {
51
55
  connection: web3.Connection;
@@ -96,8 +100,8 @@ export declare class IyfExtensionIxGenerator {
96
100
  moveTokenIx({ connection, userWallet, mint, useSourceAmount, amount, }: MoveTokenIx): Promise<web3.TransactionInstruction>;
97
101
  raydiumOpenPositionAutomation({ connection, userWallet, nftMint, poolState, tokenVault0, tokenVault1, vault0Mint, vault1Mint, tickSpacing, tickLowerIndex, tickUpperIndex, liquidity, amount0Max, amount1Max, }: RaydiumOpenPositionAutomation): Promise<web3.TransactionInstruction>;
98
102
  raydiumClosePositionAutomation({ connection, userWallet, positionNftMint, }: RaydiumClosePositionAutomation): Promise<web3.TransactionInstruction>;
99
- raydiumDecreaseLiquidity({ connection, userWallet, nftMint, poolState, personalPosition, tokenVault0, tokenVault1, vault0Mint, vault1Mint, tickSpacing, tickLowerIndex, tickUpperIndex, liquidity, amount0Min, amount1Min, }: RaydiumDecreaseLiquidity): Promise<web3.TransactionInstruction>;
100
- raydiumDecreaseLiquidityAutomation({ connection, userWallet, nftMint, poolState, personalPosition, tokenVault0, tokenVault1, vault0Mint, vault1Mint, tickSpacing, tickLowerIndex, tickUpperIndex, liquidity, amount0Min, amount1Min, }: RaydiumDecreaseLiquidity): Promise<web3.TransactionInstruction>;
103
+ raydiumDecreaseLiquidity({ connection, userWallet, nftMint, poolState, personalPosition, tokenVault0, tokenVault1, vault0Mint, vault1Mint, tickSpacing, tickLowerIndex, tickUpperIndex, liquidity, amount0Min, amount1Min, rewardInfos, }: RaydiumDecreaseLiquidity): Promise<web3.TransactionInstruction>;
104
+ raydiumDecreaseLiquidityAutomation({ connection, userWallet, nftMint, poolState, personalPosition, tokenVault0, tokenVault1, vault0Mint, vault1Mint, tickSpacing, tickLowerIndex, tickUpperIndex, liquidity, amount0Min, amount1Min, rewardInfos, }: RaydiumDecreaseLiquidity): Promise<web3.TransactionInstruction>;
101
105
  raydiumIncreaseLiquidityAutomation({ connection, userWallet, nftMint, poolState, tokenVault0, tokenVault1, vault0Mint, vault1Mint, tickSpacing, tickLowerIndex, tickUpperIndex, liquidity, amount0Max, amount1Max, }: RaydiumIncreaseLiquidityAutomation): Promise<web3.TransactionInstruction>;
102
106
  raydiumSweepDust({ connection, userWallet, nftMint, poolState, tokenVault0, tokenVault1, vault0Mint, vault1Mint, ammConfig, observationKey, tickCurrent, tickSpacing, tickLowerIndex, tickUpperIndex, slippage, }: RaydiumSweepDust): Promise<web3.TransactionInstruction>;
103
107
  }
package/dist/src/ixGenerator/IyfExtensionIxGenerator.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"IyfExtensionIxGenerator.d.ts","sourceRoot":"","sources":["../../../src/ixGenerator/IyfExtensionIxGenerator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"IyfExtensionIxGenerator.d.ts","sourceRoot":"","sources":["../../../src/ixGenerator/IyfExtensionIxGenerator.ts"],"names":[],"mappings":"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"}
package/dist/src/ixGenerator/IyfExtensionIxGenerator.js CHANGED
@@ -106,36 +106,38 @@ class IyfExtensionIxGenerator {
106
106
  const tokenAccount1 = (0, functions_1.generateAta)(nftOwner, vault1Mint);
107
107
  const tickArrayLower = this.pda.raydium.generateRaydiumTickArrayPda(poolState, tickArrayLowerStartIndex);
108
108
  const tickArrayUpper = this.pda.raydium.generateRaydiumTickArrayPda(poolState, tickArrayUpperStartIndex);
109
+ //@ts-ignore
110
+ const ix = yield anchor_1.Anchor.instance().iyfExtension.methods
111
+ .raydiumOpenPositionAutomation(tickLowerIndex, tickUpperIndex, tickArrayLowerStartIndex, tickArrayUpperStartIndex, liquidity, amount0Max, amount1Max, false, null)
112
+ .accounts({
113
+ raydiumProgram: addresses_1.RAYDIUM_PROGRAM,
114
+ userPda,
115
+ hawksightAuthority: addresses_1.HS_AUTHORITY,
116
+ nftOwner,
117
+ nftMint,
118
+ nftAccount,
119
+ poolState,
120
+ protocolPosition,
121
+ tickArrayLower,
122
+ tickArrayUpper,
123
+ personalPosition,
124
+ tokenAccount0,
125
+ tokenAccount1,
126
+ tokenVault0,
127
+ tokenVault1,
128
+ rent: web3.SYSVAR_RENT_PUBKEY,
129
+ systemProgram: web3.SystemProgram.programId,
130
+ tokenProgram: addresses_1.TOKEN_PROGRAM_ID,
131
+ associatedTokenProgram: addresses_1.ASSOCIATED_TOKEN_PROGRAM,
132
+ tokenProgram2022: addresses_1.TOKEN_2022,
133
+ vault0Mint,
134
+ vault1Mint,
135
+ })
136
+ .instruction();
137
+ ix.keys[3].isSigner = false;
109
138
  return yield this.iyfMain.iyfExtensionExecuteV2(connection, {
110
139
  userWallet,
111
- //@ts-ignore
112
- ix: yield anchor_1.Anchor.instance().iyfExtension.methods
113
- .raydiumOpenPositionAutomation(tickLowerIndex, tickUpperIndex, tickArrayLowerStartIndex, tickArrayUpperStartIndex, liquidity, amount0Max, amount1Max, false, null)
114
- .accounts({
115
- raydiumProgram: addresses_1.RAYDIUM_PROGRAM,
116
- userPda,
117
- hawksightAuthority: addresses_1.HS_AUTHORITY,
118
- nftOwner,
119
- nftMint,
120
- nftAccount,
121
- poolState,
122
- protocolPosition,
123
- tickArrayLower,
124
- tickArrayUpper,
125
- personalPosition,
126
- tokenAccount0,
127
- tokenAccount1,
128
- tokenVault0,
129
- tokenVault1,
130
- rent: web3.SYSVAR_RENT_PUBKEY,
131
- systemProgram: web3.SystemProgram.programId,
132
- tokenProgram: addresses_1.TOKEN_PROGRAM_ID,
133
- associatedTokenProgram: addresses_1.ASSOCIATED_TOKEN_PROGRAM,
134
- tokenProgram2022: addresses_1.TOKEN_2022,
135
- vault0Mint,
136
- vault1Mint,
137
- })
138
- .instruction()
140
+ ix
139
141
  });
140
142
  });
141
143
  }
@@ -145,27 +147,30 @@ class IyfExtensionIxGenerator {
145
147
  const nftOwner = (0, functions_1.generateUserPdaLamport)(userWallet);
146
148
  const positionNftAccount = (0, functions_1.generateAta2022)(nftOwner, positionNftMint);
147
149
  const personalPosition = this.pda.raydium.generateRaydiumPersonalPosition(positionNftMint);
150
+ // @ts-ignore
151
+ const ix = yield anchor_1.Anchor.instance().iyfExtension.methods
152
+ .raydiumClosePositionAutomation()
153
+ .accounts({
154
+ raydiumProgram: addresses_1.RAYDIUM_PROGRAM,
155
+ userPda,
156
+ hawksightAuthority: addresses_1.HS_AUTHORITY,
157
+ nftOwner,
158
+ positionNftMint,
159
+ positionNftAccount,
160
+ personalPosition,
161
+ systemProgram: web3.SystemProgram.programId,
162
+ tokenProgram: addresses_1.TOKEN_2022,
163
+ })
164
+ .instruction();
165
+ ix.keys[3].isSigner = false;
148
166
  return yield this.iyfMain.iyfExtensionExecuteV2(connection, {
149
167
  userWallet,
150
- ix: yield anchor_1.Anchor.instance().iyfExtension.methods
151
- .raydiumClosePositionAutomation()
152
- .accounts({
153
- raydiumProgram: addresses_1.RAYDIUM_PROGRAM,
154
- userPda,
155
- hawksightAuthority: addresses_1.HS_AUTHORITY,
156
- nftOwner,
157
- positionNftMint,
158
- positionNftAccount,
159
- personalPosition,
160
- systemProgram: web3.SystemProgram.programId,
161
- tokenProgram: addresses_1.TOKEN_2022,
162
- })
163
- .instruction()
168
+ ix
164
169
  });
165
170
  });
166
171
  }
167
172
  raydiumDecreaseLiquidity(_a) {
168
- return __awaiter(this, arguments, void 0, function* ({ connection, userWallet, nftMint, poolState, personalPosition, tokenVault0, tokenVault1, vault0Mint, vault1Mint, tickSpacing, tickLowerIndex, tickUpperIndex, liquidity, amount0Min, amount1Min, }) {
173
+ return __awaiter(this, arguments, void 0, function* ({ connection, userWallet, nftMint, poolState, personalPosition, tokenVault0, tokenVault1, vault0Mint, vault1Mint, tickSpacing, tickLowerIndex, tickUpperIndex, liquidity, amount0Min, amount1Min, rewardInfos, }) {
169
174
  const userPda = (0, functions_1.generateUserPda)(userWallet);
170
175
  const nftOwner = (0, functions_1.generateUserPdaLamport)(userWallet);
171
176
  const tickArrayLowerStartIndex = (0, functions_1.raydiumStartTickIndex)(tickLowerIndex, tickSpacing);
@@ -178,39 +183,82 @@ class IyfExtensionIxGenerator {
178
183
  const ownerFee1 = (0, functions_1.generateAta)(addresses_1.SITE_FEE_OWNER, vault1Mint);
179
184
  const tickArrayLower = this.pda.raydium.generateRaydiumTickArrayPda(poolState, tickArrayLowerStartIndex);
180
185
  const tickArrayUpper = this.pda.raydium.generateRaydiumTickArrayPda(poolState, tickArrayUpperStartIndex);
186
+ // @ts-ignore
187
+ const ix = yield anchor_1.Anchor.instance().iyfExtension.methods
188
+ .raydiumDecreaseLiquidity(liquidity, amount0Min, amount1Min)
189
+ .accounts({
190
+ raydiumProgram: addresses_1.RAYDIUM_PROGRAM,
191
+ userPda,
192
+ authority: userWallet,
193
+ nftOwner,
194
+ nftAccount,
195
+ personalPosition,
196
+ poolState,
197
+ protocolPosition,
198
+ tokenVault0,
199
+ tokenVault1,
200
+ tickArrayLower,
201
+ tickArrayUpper,
202
+ recipientTokenAccount0,
203
+ recipientTokenAccount1,
204
+ tokenProgram: addresses_1.TOKEN_PROGRAM_ID,
205
+ tokenProgram2022: addresses_1.TOKEN_2022,
206
+ memoProgram: addresses_1.MEMO_PROGRAM,
207
+ vault0Mint,
208
+ vault1Mint,
209
+ ownerFee0,
210
+ ownerFee1,
211
+ })
212
+ .remainingAccounts([
213
+ ...rewardInfos.map((v) => {
214
+ if (v.tokenVault.equals(web3.PublicKey.default)) {
215
+ return [];
216
+ }
217
+ const rewardFee = (0, functions_1.generateAta)(addresses_1.SITE_FEE_OWNER, v.tokenMint);
218
+ return [
219
+ {
220
+ pubkey: rewardFee,
221
+ isSigner: false,
222
+ isWritable: true,
223
+ },
224
+ ];
225
+ }).flat(),
226
+ ...rewardInfos.map((v) => {
227
+ if (v.tokenVault.equals(web3.PublicKey.default)) {
228
+ return [];
229
+ }
230
+ const rewardVault = v.tokenVault;
231
+ const rewardMint = v.tokenMint;
232
+ const rewardAccount = (0, functions_1.generateAta)(nftOwner, rewardMint); // TODO: allow sta / lta
233
+ return [
234
+ {
235
+ pubkey: rewardVault,
236
+ isSigner: false,
237
+ isWritable: true,
238
+ },
239
+ {
240
+ pubkey: rewardAccount,
241
+ isSigner: false,
242
+ isWritable: true,
243
+ },
244
+ {
245
+ pubkey: rewardMint,
246
+ isSigner: false,
247
+ isWritable: true,
248
+ },
249
+ ];
250
+ }).flat()
251
+ ])
252
+ .instruction();
253
+ ix.keys[3].isSigner = false;
181
254
  return yield this.iyfMain.iyfExtensionExecuteV2(connection, {
182
255
  userWallet,
183
- ix: yield anchor_1.Anchor.instance().iyfExtension.methods
184
- .raydiumDecreaseLiquidity(liquidity, amount0Min, amount1Min)
185
- .accounts({
186
- raydiumProgram: addresses_1.RAYDIUM_PROGRAM,
187
- userPda,
188
- authority: userWallet,
189
- nftOwner,
190
- nftAccount,
191
- personalPosition,
192
- poolState,
193
- protocolPosition,
194
- tokenVault0,
195
- tokenVault1,
196
- tickArrayLower,
197
- tickArrayUpper,
198
- recipientTokenAccount0,
199
- recipientTokenAccount1,
200
- tokenProgram: addresses_1.TOKEN_PROGRAM_ID,
201
- tokenProgram2022: addresses_1.TOKEN_2022,
202
- memoProgram: addresses_1.MEMO_PROGRAM,
203
- vault0Mint,
204
- vault1Mint,
205
- ownerFee0,
206
- ownerFee1,
207
- })
208
- .instruction()
256
+ ix
209
257
  });
210
258
  });
211
259
  }
212
260
  raydiumDecreaseLiquidityAutomation(_a) {
213
- return __awaiter(this, arguments, void 0, function* ({ connection, userWallet, nftMint, poolState, personalPosition, tokenVault0, tokenVault1, vault0Mint, vault1Mint, tickSpacing, tickLowerIndex, tickUpperIndex, liquidity, amount0Min, amount1Min, }) {
261
+ return __awaiter(this, arguments, void 0, function* ({ connection, userWallet, nftMint, poolState, personalPosition, tokenVault0, tokenVault1, vault0Mint, vault1Mint, tickSpacing, tickLowerIndex, tickUpperIndex, liquidity, amount0Min, amount1Min, rewardInfos, }) {
214
262
  const userPda = (0, functions_1.generateUserPda)(userWallet);
215
263
  const nftOwner = (0, functions_1.generateUserPdaLamport)(userWallet);
216
264
  const tickArrayLowerStartIndex = (0, functions_1.raydiumStartTickIndex)(tickLowerIndex, tickSpacing);
@@ -223,34 +271,77 @@ class IyfExtensionIxGenerator {
223
271
  const ownerFee1 = (0, functions_1.generateAta)(addresses_1.SITE_FEE_OWNER, vault1Mint);
224
272
  const tickArrayLower = this.pda.raydium.generateRaydiumTickArrayPda(poolState, tickArrayLowerStartIndex);
225
273
  const tickArrayUpper = this.pda.raydium.generateRaydiumTickArrayPda(poolState, tickArrayUpperStartIndex);
274
+ // @ts-ignore
275
+ const ix = yield anchor_1.Anchor.instance().iyfExtension.methods
276
+ .raydiumDecreaseLiquidityAutomation(liquidity, amount0Min, amount1Min)
277
+ .accounts({
278
+ raydiumProgram: addresses_1.RAYDIUM_PROGRAM,
279
+ userPda,
280
+ hawksightAuthority: addresses_1.HS_AUTHORITY,
281
+ nftOwner,
282
+ nftAccount,
283
+ personalPosition,
284
+ poolState,
285
+ protocolPosition,
286
+ tokenVault0,
287
+ tokenVault1,
288
+ tickArrayLower,
289
+ tickArrayUpper,
290
+ recipientTokenAccount0,
291
+ recipientTokenAccount1,
292
+ tokenProgram: addresses_1.TOKEN_PROGRAM_ID,
293
+ tokenProgram2022: addresses_1.TOKEN_2022,
294
+ memoProgram: addresses_1.MEMO_PROGRAM,
295
+ vault0Mint,
296
+ vault1Mint,
297
+ ownerFee0,
298
+ ownerFee1,
299
+ })
300
+ .remainingAccounts([
301
+ ...rewardInfos.map((v) => {
302
+ if (v.tokenVault.equals(web3.PublicKey.default)) {
303
+ return [];
304
+ }
305
+ const rewardFee = (0, functions_1.generateAta)(addresses_1.SITE_FEE_OWNER, v.tokenMint);
306
+ return [
307
+ {
308
+ pubkey: rewardFee,
309
+ isSigner: false,
310
+ isWritable: true,
311
+ },
312
+ ];
313
+ }).flat(),
314
+ ...rewardInfos.map((v) => {
315
+ if (v.tokenVault.equals(web3.PublicKey.default)) {
316
+ return [];
317
+ }
318
+ const rewardVault = v.tokenVault;
319
+ const rewardMint = v.tokenMint;
320
+ const rewardAccount = (0, functions_1.generateAta)(nftOwner, rewardMint); // TODO: allow sta / lta
321
+ return [
322
+ {
323
+ pubkey: rewardVault,
324
+ isSigner: false,
325
+ isWritable: true,
326
+ },
327
+ {
328
+ pubkey: rewardAccount,
329
+ isSigner: false,
330
+ isWritable: true,
331
+ },
332
+ {
333
+ pubkey: rewardMint,
334
+ isSigner: false,
335
+ isWritable: true,
336
+ },
337
+ ];
338
+ }).flat()
339
+ ])
340
+ .instruction();
341
+ ix.keys[3].isSigner = false;
226
342
  return yield this.iyfMain.iyfExtensionExecuteV2(connection, {
227
343
  userWallet,
228
- ix: yield anchor_1.Anchor.instance().iyfExtension.methods
229
- .raydiumDecreaseLiquidityAutomation(liquidity, amount0Min, amount1Min)
230
- .accounts({
231
- raydiumProgram: addresses_1.RAYDIUM_PROGRAM,
232
- userPda,
233
- hawksightAuthority: addresses_1.HS_AUTHORITY,
234
- nftOwner,
235
- nftAccount,
236
- personalPosition,
237
- poolState,
238
- protocolPosition,
239
- tokenVault0,
240
- tokenVault1,
241
- tickArrayLower,
242
- tickArrayUpper,
243
- recipientTokenAccount0,
244
- recipientTokenAccount1,
245
- tokenProgram: addresses_1.TOKEN_PROGRAM_ID,
246
- tokenProgram2022: addresses_1.TOKEN_2022,
247
- memoProgram: addresses_1.MEMO_PROGRAM,
248
- vault0Mint,
249
- vault1Mint,
250
- ownerFee0,
251
- ownerFee1,
252
- })
253
- .instruction()
344
+ ix
254
345
  });
255
346
  });
256
347
  }
package/dist/src/ixGenerator/RaydiumIxGenerator.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"RaydiumIxGenerator.d.ts","sourceRoot":"","sources":["../../../src/ixGenerator/RaydiumIxGenerator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"RaydiumIxGenerator.d.ts","sourceRoot":"","sources":["../../../src/ixGenerator/RaydiumIxGenerator.ts"],"names":[],"mappings":"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"}
package/dist/src/ixGenerator/RaydiumIxGenerator.js CHANGED
@@ -340,6 +340,7 @@ class RaydiumIxGenerator {
340
340
  tickSpacing: fetch.poolStateInfo.tickSpacing,
341
341
  tickLowerIndex: fetch.positionInfo.tickLowerIndex,
342
342
  tickUpperIndex: fetch.positionInfo.tickUpperIndex,
343
+ rewardInfos: fetch.poolStateInfo.rewardInfos,
343
344
  });
344
345
  });
345
346
  }
@@ -376,6 +377,7 @@ class RaydiumIxGenerator {
376
377
  tickSpacing: fetch.poolStateInfo.tickSpacing,
377
378
  tickLowerIndex: fetch.positionInfo.tickLowerIndex,
378
379
  tickUpperIndex: fetch.positionInfo.tickUpperIndex,
380
+ rewardInfos: fetch.poolStateInfo.rewardInfos,
379
381
  });
380
382
  });
381
383
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hawksightco/hawk-sdk",
3
- "version": "1.2.58",
3
+ "version": "1.2.59",
4
4
  "description": "Hawksight v2 SDK",
5
5
  "main": "dist/src/index.js",
6
6
  "repository": "https://github.com/ghabxph/hawk-api-client.git",