@hawksightco/hawk-sdk 1.0.1 → 1.0.3

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 (12) hide show
  1. package/dist/src/anchor.d.ts +2 -2
  2. package/dist/src/anchor.d.ts.map +1 -1
  3. package/dist/src/anchor.js +2 -2
  4. package/dist/src/classes/Transactions.d.ts.map +1 -1
  5. package/dist/src/classes/Transactions.js +78 -80
  6. package/dist/src/idl/orca-idl.d.ts +3833 -0
  7. package/dist/src/idl/orca-idl.d.ts.map +1 -0
  8. package/dist/src/idl/orca-idl.js +2 -0
  9. package/dist/src/orca.d.ts +42 -0
  10. package/dist/src/orca.d.ts.map +1 -0
  11. package/dist/src/orca.js +85 -0
  12. package/package.json +3 -3
package/dist/src/anchor.d.ts CHANGED
@@ -3,14 +3,14 @@ import * as web3 from "@solana/web3.js";
3
3
  import * as anchor from "@coral-xyz/anchor";
4
4
  import { IndexYieldFarming } from "./idl/iyf-main-idl";
5
5
  import { IyfExtension } from "./idl/iyf-extension-idl";
6
- import { WhirlpoolContext } from "@orca-so/whirlpools-sdk";
6
+ import { Whirlpool } from "./idl/orca-idl";
7
7
  export declare class Anchor {
8
8
  connection: web3.Connection;
9
9
  private static _instance;
10
10
  provider: anchor.AnchorProvider;
11
11
  iyfMain: anchor.Program<IndexYieldFarming>;
12
12
  iyfExtension: anchor.Program<IyfExtension>;
13
- whirlpoolCtx: WhirlpoolContext;
13
+ orcaProgram: anchor.Program<Whirlpool>;
14
14
  private constructor();
15
15
  static initialize(connection: web3.Connection): void;
16
16
  static instance(): Anchor;
package/dist/src/anchor.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"anchor.d.ts","sourceRoot":"","sources":["../../src/anchor.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAmB,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACxE,OAAO,EAAwB,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAO7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE3D,qBAAa,MAAM;IASR,UAAU,EAAE,IAAI,CAAC,UAAU;IAPpC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAS;IACjC,QAAQ,EAAE,MAAM,CAAC,cAAc,CAAC;IAChC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAC3C,YAAY,EAAE,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAC3C,YAAY,EAAE,gBAAgB,CAAA;IAE9B,OAAO;IASP,MAAM,CAAC,UAAU,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU;IAI7C,MAAM,CAAC,QAAQ,IAAI,MAAM;CAO1B"}
1
+ {"version":3,"file":"anchor.d.ts","sourceRoot":"","sources":["../../src/anchor.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAmB,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACxE,OAAO,EAAwB,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC7E,OAAO,EAAqB,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAQ9D,qBAAa,MAAM;IASR,UAAU,EAAE,IAAI,CAAC,UAAU;IAPpC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAS;IACjC,QAAQ,EAAE,MAAM,CAAC,cAAc,CAAC;IAChC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAC3C,YAAY,EAAE,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAC3C,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAEvC,OAAO;IASP,MAAM,CAAC,UAAU,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU;IAI7C,MAAM,CAAC,QAAQ,IAAI,MAAM;CAO1B"}
package/dist/src/anchor.js CHANGED
@@ -31,16 +31,16 @@ const web3 = __importStar(require("@solana/web3.js"));
31
31
  const anchor = __importStar(require("@coral-xyz/anchor"));
32
32
  const iyf_main_idl_1 = require("./idl/iyf-main-idl");
33
33
  const iyf_extension_idl_1 = require("./idl/iyf-extension-idl");
34
+ const orca_idl_1 = require("./idl/orca-idl");
34
35
  const nodewallet_1 = __importDefault(require("@coral-xyz/anchor/dist/cjs/nodewallet"));
35
36
  const addresses_1 = require("./addresses");
36
- const whirlpools_sdk_1 = require("@orca-so/whirlpools-sdk");
37
37
  class Anchor {
38
38
  constructor(connection) {
39
39
  this.connection = connection;
40
40
  this.provider = new anchor.AnchorProvider(connection, new nodewallet_1.default(web3.Keypair.generate()), {});
41
41
  this.iyfMain = new anchor.Program(iyf_main_idl_1.IDL, addresses_1.IYF_MAIN, this.provider);
42
42
  this.iyfExtension = new anchor.Program(iyf_extension_idl_1.IDL, addresses_1.IYF_EXTENSION, this.provider);
43
- this.whirlpoolCtx = whirlpools_sdk_1.WhirlpoolContext.withProvider(this.provider, addresses_1.ORCA_WHIRLPOOL_PROGRAM);
43
+ this.orcaProgram = new anchor.Program(orca_idl_1.IDL, addresses_1.ORCA_WHIRLPOOL_PROGRAM, this.provider);
44
44
  }
45
45
  static initialize(connection) {
46
46
  Anchor._instance = new Anchor(connection);
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
@@ -40,16 +40,14 @@ const dlmm_1 = require("@meteora-ag/dlmm");
40
40
  const web3 = __importStar(require("@solana/web3.js"));
41
41
  const bn_js_1 = __importDefault(require("bn.js"));
42
42
  const addresses_1 = require("../addresses");
43
- const functions_1 = require("../functions");
44
43
  const types_1 = require("../types");
45
- const functions_2 = require("../functions");
44
+ const functions_1 = require("../functions");
45
+ const orca_1 = require("../orca");
46
46
  const hsToMeteora_1 = require("../hsToMeteora");
47
47
  const meteora_1 = require("../meteora");
48
48
  const anchor_1 = require("../anchor");
49
- // import { PDAUtil } from "@orca-so/whirlpools-sdk";
50
49
  const hawksight_1 = require("../hawksight");
51
50
  const types_2 = require("../types");
52
- const whirlpools_sdk_1 = require("@orca-so/whirlpools-sdk");
53
51
  class Transactions {
54
52
  /**
55
53
  * Generate UserPDA
@@ -59,7 +57,7 @@ class Transactions {
59
57
  * @returns
60
58
  */
61
59
  generateUserPda(userWallet, farm = addresses_1.USDC_FARM) {
62
- return (0, functions_2.generateUserPda)(userWallet, farm);
60
+ return (0, functions_1.generateUserPda)(userWallet, farm);
63
61
  }
64
62
  /**s
65
63
  * Registers a new entity or user with the necessary parameters, handling transaction creation and response.
@@ -72,7 +70,7 @@ class Transactions {
72
70
  register(_a) {
73
71
  return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
74
72
  const farm = addresses_1.USDC_FARM;
75
- const user = (0, functions_2.generateUserPda)(params.authority, farm);
73
+ const user = (0, functions_1.generateUserPda)(params.authority, farm);
76
74
  const [stableToken] = web3.PublicKey.findProgramAddressSync([
77
75
  Buffer.from("index-token", "utf-8"),
78
76
  addresses_1.STABLEMINT_1.toBuffer(),
@@ -91,7 +89,7 @@ class Transactions {
91
89
  throw new Error(`User PDA for wallet: ${params.authority} is already registered.`);
92
90
  }
93
91
  catch (_b) {
94
- return (0, functions_2.createTransactionMeta)({
92
+ return (0, functions_1.createTransactionMeta)({
95
93
  payer: params.authority,
96
94
  description: "Register User",
97
95
  addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
@@ -127,7 +125,7 @@ class Transactions {
127
125
  meteoraCreatePositionAndDeposit(_a) {
128
126
  return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
129
127
  const dlmmPool = yield meteora_1.MeteoraDLMM.create(connection, new web3.PublicKey(params.pool));
130
- const userPda = (0, functions_2.generateUserPda)(params.userWallet);
128
+ const userPda = (0, functions_1.generateUserPda)(params.userWallet);
131
129
  const mainInstructions = (yield dlmmPool.initializePositionAndAddLiquidityByStrategy(params.userWallet, params.userWallet, {
132
130
  positionPubKey: params.position,
133
131
  user: userPda,
@@ -141,7 +139,7 @@ class Transactions {
141
139
  slippage: params.slippage,
142
140
  skipInputTokenCheck: params.skipInputTokenCheck,
143
141
  }, hsToMeteora_1.meteoraToHawksight)).default();
144
- return (0, functions_2.createTransactionMeta)({
142
+ return (0, functions_1.createTransactionMeta)({
145
143
  payer: params.userWallet,
146
144
  description: "Create position and deposit to Meteora DLMM",
147
145
  addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
@@ -163,7 +161,7 @@ class Transactions {
163
161
  const dlmmPool = yield meteora_1.MeteoraDLMM.create(connection, poolAddress);
164
162
  const binArraysRequired = yield (0, dlmm_1.getBinArraysRequiredByPositionRange)(poolAddress, new bn_js_1.default(params.minBinId), new bn_js_1.default(params.maxBinId), dlmmPool.dlmm.program.programId);
165
163
  const mainInstructions = yield dlmmPool.dlmm.initializeBinArrays(binArraysRequired.map((b) => b.index), new web3.PublicKey(params.userWallet));
166
- return (0, functions_2.createTransactionMeta)({
164
+ return (0, functions_1.createTransactionMeta)({
167
165
  payer: params.userWallet,
168
166
  description: "Initialize bin arrays for Meteora DLMM pool",
169
167
  addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
@@ -195,7 +193,7 @@ class Transactions {
195
193
  minBinId = position.lowerBinId;
196
194
  }
197
195
  const dlmmPool = yield meteora_1.MeteoraDLMM.create(connection, new web3.PublicKey(lbPair));
198
- const userPda = (0, functions_2.generateUserPda)(params.userWallet);
196
+ const userPda = (0, functions_1.generateUserPda)(params.userWallet);
199
197
  const mainInstructions = (yield dlmmPool.addLiquidityByStrategy(params.userWallet, params.userWallet, {
200
198
  positionPubKey: params.position,
201
199
  user: userPda,
@@ -209,7 +207,7 @@ class Transactions {
209
207
  slippage: params.slippage,
210
208
  skipInputTokenCheck: params.skipInputTokenCheck,
211
209
  }, hsToMeteora_1.meteoraToHawksight)).default();
212
- return (0, functions_2.createTransactionMeta)({
210
+ return (0, functions_1.createTransactionMeta)({
213
211
  payer: params.userWallet,
214
212
  description: "Deposit to existing position in Meteora DLMM",
215
213
  addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
@@ -227,7 +225,7 @@ class Transactions {
227
225
  */
228
226
  meteoraWithdraw(_a) {
229
227
  return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
230
- const userPda = (0, functions_2.generateUserPda)(params.userWallet);
228
+ const userPda = (0, functions_1.generateUserPda)(params.userWallet);
231
229
  const program = yield meteora_1.MeteoraDLMM.program(connection);
232
230
  let lbPair, binIdsToRemove;
233
231
  if (params.fastGeneration !== undefined) {
@@ -271,7 +269,7 @@ class Transactions {
271
269
  else {
272
270
  description = "Partial position withdrawal from Meteora DLMM";
273
271
  }
274
- return (0, functions_2.createTransactionMeta)({
272
+ return (0, functions_1.createTransactionMeta)({
275
273
  payer: params.userWallet,
276
274
  description,
277
275
  addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
@@ -299,14 +297,14 @@ class Transactions {
299
297
  lbPair = position.lbPair;
300
298
  }
301
299
  const dlmmPool = yield meteora_1.MeteoraDLMM.create(connection, lbPair);
302
- const userPda = (0, functions_2.generateUserPda)(params.userWallet);
300
+ const userPda = (0, functions_1.generateUserPda)(params.userWallet);
303
301
  const { userPositions } = yield dlmmPool.getPositionsByUserAndLbPair(userPda);
304
302
  const index = userPositions.findIndex((v) => v.publicKey.equals(params.position));
305
303
  const mainInstructions = (yield dlmmPool.claimAllRewardsByPosition(params.userWallet, params.userWallet, {
306
304
  owner: userPda,
307
305
  position: userPositions[index],
308
306
  }, hsToMeteora_1.meteoraToHawksight)).default();
309
- return (0, functions_2.createTransactionMeta)({
307
+ return (0, functions_1.createTransactionMeta)({
310
308
  payer: params.userWallet,
311
309
  description: "Claim fees / rewards from Meteora DLMM Position",
312
310
  addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
@@ -327,7 +325,7 @@ class Transactions {
327
325
  const program = yield meteora_1.MeteoraDLMM.program(connection);
328
326
  const position = yield program.account.positionV2.fetch(params.position);
329
327
  const dlmmPool = yield meteora_1.MeteoraDLMM.create(connection, position.lbPair);
330
- const userPda = (0, functions_2.generateUserPda)(params.userWallet);
328
+ const userPda = (0, functions_1.generateUserPda)(params.userWallet);
331
329
  const { userPositions } = yield dlmmPool.getPositionsByUserAndLbPair(userPda);
332
330
  const index = userPositions.findIndex((v) => v.publicKey.equals(params.position));
333
331
  yield dlmmPool.getActiveBin();
@@ -335,7 +333,7 @@ class Transactions {
335
333
  owner: userPda,
336
334
  position: userPositions[index],
337
335
  }, hsToMeteora_1.meteoraToHawksight);
338
- return (0, functions_2.createTransactionMeta)({
336
+ return (0, functions_1.createTransactionMeta)({
339
337
  payer: params.userWallet,
340
338
  description: "Close Meteora DLMM Position",
341
339
  addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
@@ -348,7 +346,7 @@ class Transactions {
348
346
  const program = yield meteora_1.MeteoraDLMM.program(connection);
349
347
  const position = yield program.account.positionV2.fetch(params.position);
350
348
  const dlmmPool = yield meteora_1.MeteoraDLMM.create(connection, position.lbPair);
351
- const userPda = (0, functions_2.generateUserPda)(params.userWallet);
349
+ const userPda = (0, functions_1.generateUserPda)(params.userWallet);
352
350
  const { userPositions } = yield dlmmPool.getPositionsByUserAndLbPair(userPda);
353
351
  const index = userPositions.findIndex((v) => v.publicKey.equals(params.position));
354
352
  // Claim fee and claim reward ixs
@@ -377,7 +375,7 @@ class Transactions {
377
375
  // Step 3: Re-deposit fees
378
376
  ...addLiquidityBuilder.mainIxs,
379
377
  ];
380
- return (0, functions_2.createTransactionMeta)({
378
+ return (0, functions_1.createTransactionMeta)({
381
379
  payer: params.userWallet,
382
380
  description: "Automation IX: Meteora Auto-compound instructions (claim fee, reward, and deposit to position)",
383
381
  addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
@@ -390,7 +388,7 @@ class Transactions {
390
388
  const program = yield meteora_1.MeteoraDLMM.program(connection);
391
389
  const position = yield program.account.positionV2.fetch(params.currentPosition);
392
390
  const dlmmPool = yield meteora_1.MeteoraDLMM.create(connection, position.lbPair);
393
- const userPda = (0, functions_2.generateUserPda)(params.userWallet);
391
+ const userPda = (0, functions_1.generateUserPda)(params.userWallet);
394
392
  // Step 1: Claim all fees/rewards, remove all liquidity and close current position
395
393
  const { userPositions } = yield dlmmPool.getPositionsByUserAndLbPair(userPda);
396
394
  const binIdsToRemove = userPositions[0].positionData.positionBinData.map((bin) => bin.binId);
@@ -436,7 +434,7 @@ class Transactions {
436
434
  // Sweep dust
437
435
  ...sweepLiquidityBuilder.mainIxs,
438
436
  ];
439
- return (0, functions_2.createTransactionMeta)({
437
+ return (0, functions_1.createTransactionMeta)({
440
438
  payer: params.userWallet,
441
439
  description: "Automation IX: Meteora Auto-rebalance instructions (Close position and deposit to new position)",
442
440
  addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
@@ -455,7 +453,7 @@ class Transactions {
455
453
  return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
456
454
  const activePoolRewards = [];
457
455
  const mainInstructions = [];
458
- const userPda = (0, functions_2.generateUserPda)(params.userWallet);
456
+ const userPda = (0, functions_1.generateUserPda)(params.userWallet);
459
457
  if (params.protocol === types_2.Protocol.Meteora && params.pool) {
460
458
  const poolInfo = yield (0, functions_1.getMeteoraPool)(params.pool);
461
459
  if (poolInfo.reward_mint_x !== "11111111111111111111111111111111") {
@@ -467,7 +465,7 @@ class Transactions {
467
465
  }
468
466
  const combinedMints = [...params.mints, ...activePoolRewards];
469
467
  const filteredMints = combinedMints.filter((m, i) => combinedMints.findIndex((mint) => mint.equals(m)) === i);
470
- const storageAddresses = filteredMints.map((mint) => (0, functions_2.generateUserPdaStorageAccount)(userPda, mint));
468
+ const storageAddresses = filteredMints.map((mint) => (0, functions_1.generateUserPdaStorageAccount)(userPda, mint));
471
469
  const accountsData = yield connection.getMultipleAccountsInfo(storageAddresses, "processed");
472
470
  for (let i = 0; i < accountsData.length; i++) {
473
471
  if (!accountsData[i]) {
@@ -487,7 +485,7 @@ class Transactions {
487
485
  }
488
486
  }
489
487
  if (mainInstructions.length) {
490
- return (0, functions_2.createTransactionMeta)({
488
+ return (0, functions_1.createTransactionMeta)({
491
489
  payer: params.userWallet,
492
490
  description: "Initialize STAs",
493
491
  addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
@@ -502,7 +500,7 @@ class Transactions {
502
500
  const program = yield meteora_1.MeteoraDLMM.program(connection);
503
501
  const position = yield program.account.positionV2.fetch(params.position);
504
502
  const dlmmPool = yield meteora_1.MeteoraDLMM.create(connection, position.lbPair);
505
- const userPda = (0, functions_2.generateUserPda)(params.userWallet);
503
+ const userPda = (0, functions_1.generateUserPda)(params.userWallet);
506
504
  // Step 1: Claim all fees/rewards, remove all liquidity and close current position
507
505
  const { userPositions } = yield dlmmPool.getPositionsByUserAndLbPair(userPda);
508
506
  const binIdsToRemove = userPositions[0].positionData.positionBinData.map((bin) => bin.binId);
@@ -515,7 +513,7 @@ class Transactions {
515
513
  shouldClaimAndClose: true,
516
514
  });
517
515
  // Filter out non-meteora instructions
518
- const ixs = (0, functions_2.getIxs)(txn).filter((ix) => ix.programId.equals(addresses_1.METEORA_DLMM_PROGRAM));
516
+ const ixs = (0, functions_1.getIxs)(txn).filter((ix) => ix.programId.equals(addresses_1.METEORA_DLMM_PROGRAM));
519
517
  const farm = addresses_1.USDC_FARM;
520
518
  const authority = params.userWallet;
521
519
  const iyfProgram = addresses_1.IYF_MAIN;
@@ -533,8 +531,8 @@ class Transactions {
533
531
  position: _position.pubkey,
534
532
  lbPair: lbPair.pubkey,
535
533
  binArrayBitmapExtension: binArrayBitmapExtension.pubkey,
536
- userTokenX: (0, functions_2.generateUserPdaStorageAccount)(userPda, tokenXMint.pubkey),
537
- userTokenY: (0, functions_2.generateUserPdaStorageAccount)(userPda, tokenYMint.pubkey),
534
+ userTokenX: (0, functions_1.generateUserPdaStorageAccount)(userPda, tokenXMint.pubkey),
535
+ userTokenY: (0, functions_1.generateUserPdaStorageAccount)(userPda, tokenYMint.pubkey),
538
536
  reserveX: reserveX.pubkey,
539
537
  reserveY: reserveY.pubkey,
540
538
  tokenXMint: tokenXMint.pubkey,
@@ -545,8 +543,8 @@ class Transactions {
545
543
  binArrayUpper: binArrayUpper.pubkey,
546
544
  eventAuthority: eventAuthority.pubkey,
547
545
  meteoraDlmmProgram: meteoraDlmmProgram.pubkey,
548
- ownerFeeX: (0, functions_2.generateAta)(addresses_1.SITE_FEE_OWNER, tokenXMint.pubkey),
549
- ownerFeeY: (0, functions_2.generateAta)(addresses_1.SITE_FEE_OWNER, tokenYMint.pubkey),
546
+ ownerFeeX: (0, functions_1.generateAta)(addresses_1.SITE_FEE_OWNER, tokenXMint.pubkey),
547
+ ownerFeeY: (0, functions_1.generateAta)(addresses_1.SITE_FEE_OWNER, tokenYMint.pubkey),
550
548
  })
551
549
  .instruction();
552
550
  // Instruction via main hawksight contract
@@ -584,7 +582,7 @@ class Transactions {
584
582
  // Limit Close Automation Instruction (Hawksight CPI)
585
583
  ix,
586
584
  ];
587
- return (0, functions_2.createTransactionMeta)({
585
+ return (0, functions_1.createTransactionMeta)({
588
586
  payer: params.userWallet,
589
587
  description: "Automation IX: Meteora limit close instruction (Full withdraw and close on to specific bin id)",
590
588
  addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
@@ -595,7 +593,7 @@ class Transactions {
595
593
  removeLiquidityByRangeInfo(ixs) {
596
594
  for (const ix of ixs) {
597
595
  const programIdMatch = ix.programId.equals(addresses_1.METEORA_DLMM_PROGRAM);
598
- const _sighashMatch = (0, functions_2.sighashMatch)(ix.data, "RemoveLiquidityByRange");
596
+ const _sighashMatch = (0, functions_1.sighashMatch)(ix.data, "RemoveLiquidityByRange");
599
597
  if (programIdMatch && _sighashMatch) {
600
598
  return {
601
599
  data: ix.data,
@@ -633,9 +631,9 @@ class Transactions {
633
631
  orcaOpenPosition(_a) {
634
632
  return __awaiter(this, arguments, void 0, function* ({ connection, params }) {
635
633
  const farm = addresses_1.USDC_FARM;
636
- const userPda = (0, functions_2.generateUserPda)(params.userWallet, farm);
637
- const position = (0, functions_2.generateOrcaPositionPDA)(params.positionMint);
638
- const positionTokenAccount = (0, functions_2.generateAta)(userPda, params.positionMint);
634
+ const userPda = (0, functions_1.generateUserPda)(params.userWallet, farm);
635
+ const position = (0, functions_1.generateOrcaPositionPDA)(params.positionMint);
636
+ const positionTokenAccount = (0, functions_1.generateAta)(userPda, params.positionMint);
639
637
  const orcaOpenPositionIx = yield anchor_1.Anchor.instance().iyfExtension.methods
640
638
  .orcaOpenPosition(params.tickLowerIndex, params.tickUpperIndex)
641
639
  .accounts({
@@ -676,7 +674,7 @@ class Transactions {
676
674
  ])
677
675
  .instruction();
678
676
  const mainInstructions = [orcaOpenPositionIxViaMain];
679
- return (0, functions_2.createTransactionMeta)({
677
+ return (0, functions_1.createTransactionMeta)({
680
678
  payer: params.userWallet,
681
679
  description: "Create new Orca Position",
682
680
  addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
@@ -695,9 +693,9 @@ class Transactions {
695
693
  orcaClosePosition(_a) {
696
694
  return __awaiter(this, arguments, void 0, function* ({ connection, params }) {
697
695
  const farm = addresses_1.USDC_FARM;
698
- const userPda = (0, functions_2.generateUserPda)(params.userWallet, farm);
699
- const position = (0, functions_2.generateOrcaPositionPDA)(params.positionMint);
700
- const positionTokenAccount = (0, functions_2.generateAta)(userPda, params.positionMint);
696
+ const userPda = (0, functions_1.generateUserPda)(params.userWallet, farm);
697
+ const position = (0, functions_1.generateOrcaPositionPDA)(params.positionMint);
698
+ const positionTokenAccount = (0, functions_1.generateAta)(userPda, params.positionMint);
701
699
  const orcaOpenPositionIx = yield anchor_1.Anchor.instance().iyfExtension.methods
702
700
  .orcaClosePosition()
703
701
  .accounts({
@@ -732,7 +730,7 @@ class Transactions {
732
730
  ])
733
731
  .instruction();
734
732
  const mainInstructions = [orcaOpenPositionIxViaMain];
735
- return (0, functions_2.createTransactionMeta)({
733
+ return (0, functions_1.createTransactionMeta)({
736
734
  payer: params.userWallet,
737
735
  description: "Close Orca Position",
738
736
  addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
@@ -751,22 +749,22 @@ class Transactions {
751
749
  orcaDeposit(_a) {
752
750
  return __awaiter(this, arguments, void 0, function* ({ connection, params }) {
753
751
  const farm = addresses_1.USDC_FARM;
754
- const userPda = (0, functions_2.generateUserPda)(params.userWallet, farm);
755
- const position = (0, functions_2.generateOrcaPositionPDA)(params.positionMint);
756
- const positionTokenAccount = (0, functions_2.generateAta)(userPda, params.positionMint);
757
- const positionData = yield anchor_1.Anchor.instance().whirlpoolCtx.fetcher.getPosition(position);
752
+ const userPda = (0, functions_1.generateUserPda)(params.userWallet, farm);
753
+ const position = (0, functions_1.generateOrcaPositionPDA)(params.positionMint);
754
+ const positionTokenAccount = (0, functions_1.generateAta)(userPda, params.positionMint);
755
+ const positionData = yield anchor_1.Anchor.instance().orcaProgram.account.position.fetch(position);
758
756
  if (positionData === null) {
759
757
  throw new Error(`Position: ${position} does not exist or already closed. Position mint: ${params.positionMint}`);
760
758
  }
761
759
  const whirlpool = positionData.whirlpool;
762
- const whirlpoolData = yield anchor_1.Anchor.instance().whirlpoolCtx.fetcher.getPool(whirlpool);
760
+ const whirlpoolData = yield anchor_1.Anchor.instance().orcaProgram.account.whirlpool.fetch(whirlpool);
763
761
  const mintA = whirlpoolData.tokenMintA;
764
762
  const mintB = whirlpoolData.tokenMintB;
765
763
  const tokenSeeds = [
766
764
  { owner: params.userWallet, mint: mintA },
767
765
  { owner: params.userWallet, mint: mintB },
768
766
  ];
769
- const resultMap = yield (0, functions_2.tokenAccountExists)(connection, tokenSeeds);
767
+ const resultMap = yield (0, functions_1.tokenAccountExists)(connection, tokenSeeds);
770
768
  resultMap.map((result, index) => {
771
769
  const tokenKey = result.tokenKey;
772
770
  const token = tokenSeeds[index];
@@ -774,12 +772,12 @@ class Transactions {
774
772
  throw new Error(`Token: ${tokenKey} owned by ${token.owner} does not exist. Mint: ${token.mint}`);
775
773
  }
776
774
  });
777
- const tokenOwnerAccountA = (0, functions_2.generateAta)(userPda, mintA);
778
- const tokenOwnerAccountB = (0, functions_2.generateAta)(userPda, mintB);
779
- const { publicKey: tickArrayLower } = whirlpools_sdk_1.PDAUtil.getTickArrayFromTickIndex(positionData.tickLowerIndex, whirlpoolData.tickSpacing, whirlpool, addresses_1.ORCA_WHIRLPOOL_PROGRAM);
780
- const { publicKey: tickArrayUpper } = whirlpools_sdk_1.PDAUtil.getTickArrayFromTickIndex(positionData.tickUpperIndex, whirlpoolData.tickSpacing, whirlpool, addresses_1.ORCA_WHIRLPOOL_PROGRAM);
781
- const ownerFeeA = (0, functions_2.generateAta)(addresses_1.SITE_FEE_OWNER, mintA);
782
- const ownerFeeB = (0, functions_2.generateAta)(addresses_1.SITE_FEE_OWNER, mintB);
775
+ const tokenOwnerAccountA = (0, functions_1.generateAta)(userPda, mintA);
776
+ const tokenOwnerAccountB = (0, functions_1.generateAta)(userPda, mintB);
777
+ const { publicKey: tickArrayLower } = (0, orca_1.getTickArrayFromTickIndex)(positionData.tickLowerIndex, whirlpoolData.tickSpacing, whirlpool, addresses_1.ORCA_WHIRLPOOL_PROGRAM);
778
+ const { publicKey: tickArrayUpper } = (0, orca_1.getTickArrayFromTickIndex)(positionData.tickUpperIndex, whirlpoolData.tickSpacing, whirlpool, addresses_1.ORCA_WHIRLPOOL_PROGRAM);
779
+ const ownerFeeA = (0, functions_1.generateAta)(addresses_1.SITE_FEE_OWNER, mintA);
780
+ const ownerFeeB = (0, functions_1.generateAta)(addresses_1.SITE_FEE_OWNER, mintB);
783
781
  const depositIx = yield (0, hawksight_1.depositMultipleToken)({
784
782
  payer: params.userWallet,
785
783
  deposit: [
@@ -852,7 +850,7 @@ class Transactions {
852
850
  ],
853
851
  });
854
852
  const mainInstructions = [depositIx, orcaOpenPositionIxViaMain, clearRemainingTokensIxs];
855
- return (0, functions_2.createTransactionMeta)({
853
+ return (0, functions_1.createTransactionMeta)({
856
854
  payer: params.userWallet,
857
855
  description: `Deposit to Orca Position: ${position}`,
858
856
  addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
@@ -871,23 +869,23 @@ class Transactions {
871
869
  orcaWithdraw(_a) {
872
870
  return __awaiter(this, arguments, void 0, function* ({ connection, params }) {
873
871
  const farm = addresses_1.USDC_FARM;
874
- const userPda = (0, functions_2.generateUserPda)(params.userWallet, farm);
875
- const position = (0, functions_2.generateOrcaPositionPDA)(params.positionMint);
876
- const positionTokenAccount = (0, functions_2.generateAta)(userPda, params.positionMint);
877
- const positionData = yield anchor_1.Anchor.instance().whirlpoolCtx.fetcher.getPosition(position);
872
+ const userPda = (0, functions_1.generateUserPda)(params.userWallet, farm);
873
+ const position = (0, functions_1.generateOrcaPositionPDA)(params.positionMint);
874
+ const positionTokenAccount = (0, functions_1.generateAta)(userPda, params.positionMint);
875
+ const positionData = yield anchor_1.Anchor.instance().orcaProgram.account.position.fetch(position);
878
876
  if (positionData === null) {
879
877
  throw new Error(`Position: ${position} does not exist or already closed. Position mint: ${params.positionMint}`);
880
878
  }
881
879
  const whirlpool = positionData.whirlpool;
882
- const whirlpoolData = yield anchor_1.Anchor.instance().whirlpoolCtx.fetcher.getPool(whirlpool);
880
+ const whirlpoolData = yield anchor_1.Anchor.instance().orcaProgram.account.whirlpool.fetch(whirlpool);
883
881
  const mintA = whirlpoolData.tokenMintA;
884
882
  const mintB = whirlpoolData.tokenMintB;
885
- const tokenOwnerAccountA = (0, functions_2.generateAta)(userPda, mintA);
886
- const tokenOwnerAccountB = (0, functions_2.generateAta)(userPda, mintB);
887
- const { publicKey: tickArrayLower } = whirlpools_sdk_1.PDAUtil.getTickArrayFromTickIndex(positionData.tickLowerIndex, whirlpoolData.tickSpacing, whirlpool, addresses_1.ORCA_WHIRLPOOL_PROGRAM);
888
- const { publicKey: tickArrayUpper } = whirlpools_sdk_1.PDAUtil.getTickArrayFromTickIndex(positionData.tickUpperIndex, whirlpoolData.tickSpacing, whirlpool, addresses_1.ORCA_WHIRLPOOL_PROGRAM);
889
- const ownerFeeA = (0, functions_2.generateAta)(addresses_1.SITE_FEE_OWNER, mintA);
890
- const ownerFeeB = (0, functions_2.generateAta)(addresses_1.SITE_FEE_OWNER, mintB);
883
+ const tokenOwnerAccountA = (0, functions_1.generateAta)(userPda, mintA);
884
+ const tokenOwnerAccountB = (0, functions_1.generateAta)(userPda, mintB);
885
+ const { publicKey: tickArrayLower } = (0, orca_1.getTickArrayFromTickIndex)(positionData.tickLowerIndex, whirlpoolData.tickSpacing, whirlpool, addresses_1.ORCA_WHIRLPOOL_PROGRAM);
886
+ const { publicKey: tickArrayUpper } = (0, orca_1.getTickArrayFromTickIndex)(positionData.tickUpperIndex, whirlpoolData.tickSpacing, whirlpool, addresses_1.ORCA_WHIRLPOOL_PROGRAM);
887
+ const ownerFeeA = (0, functions_1.generateAta)(addresses_1.SITE_FEE_OWNER, mintA);
888
+ const ownerFeeB = (0, functions_1.generateAta)(addresses_1.SITE_FEE_OWNER, mintB);
891
889
  const orcaOpenPositionIx = yield anchor_1.Anchor.instance().iyfExtension.methods
892
890
  .orcaWithdraw(params.liquidityAmount)
893
891
  .accounts({
@@ -947,7 +945,7 @@ class Transactions {
947
945
  ],
948
946
  });
949
947
  const mainInstructions = [orcaOpenPositionIxViaMain, withdrawFromPda];
950
- return (0, functions_2.createTransactionMeta)({
948
+ return (0, functions_1.createTransactionMeta)({
951
949
  payer: params.userWallet,
952
950
  description: `Withdraw deposits from Orca Position: ${position}`,
953
951
  addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
@@ -966,29 +964,29 @@ class Transactions {
966
964
  orcaClaimRewards(_a) {
967
965
  return __awaiter(this, arguments, void 0, function* ({ connection, params }) {
968
966
  const farm = addresses_1.USDC_FARM;
969
- const userPda = (0, functions_2.generateUserPda)(params.userWallet, farm);
970
- const position = (0, functions_2.generateOrcaPositionPDA)(params.positionMint);
971
- const positionTokenAccount = (0, functions_2.generateAta)(userPda, params.positionMint);
972
- const positionData = yield anchor_1.Anchor.instance().whirlpoolCtx.fetcher.getPosition(position);
967
+ const userPda = (0, functions_1.generateUserPda)(params.userWallet, farm);
968
+ const position = (0, functions_1.generateOrcaPositionPDA)(params.positionMint);
969
+ const positionTokenAccount = (0, functions_1.generateAta)(userPda, params.positionMint);
970
+ const positionData = yield anchor_1.Anchor.instance().orcaProgram.account.position.fetch(position);
973
971
  if (positionData === null) {
974
972
  throw new Error(`Position: ${position} does not exist or already closed. Position mint: ${params.positionMint}`);
975
973
  }
976
974
  const whirlpool = positionData.whirlpool;
977
- const whirlpoolData = yield anchor_1.Anchor.instance().whirlpoolCtx.fetcher.getPool(whirlpool);
975
+ const whirlpoolData = yield anchor_1.Anchor.instance().orcaProgram.account.whirlpool.fetch(whirlpool);
978
976
  const mintA = whirlpoolData.tokenMintA;
979
977
  const mintB = whirlpoolData.tokenMintB;
980
- const tokenOwnerAccountA = (0, functions_2.generateAta)(userPda, mintA);
981
- const tokenOwnerAccountB = (0, functions_2.generateAta)(userPda, mintB);
982
- const { publicKey: tickArrayLower } = whirlpools_sdk_1.PDAUtil.getTickArrayFromTickIndex(positionData.tickLowerIndex, whirlpoolData.tickSpacing, whirlpool, addresses_1.ORCA_WHIRLPOOL_PROGRAM);
983
- const { publicKey: tickArrayUpper } = whirlpools_sdk_1.PDAUtil.getTickArrayFromTickIndex(positionData.tickUpperIndex, whirlpoolData.tickSpacing, whirlpool, addresses_1.ORCA_WHIRLPOOL_PROGRAM);
984
- const ownerFeeA = (0, functions_2.generateAta)(addresses_1.SITE_FEE_OWNER, mintA);
985
- const ownerFeeB = (0, functions_2.generateAta)(addresses_1.SITE_FEE_OWNER, mintB);
978
+ const tokenOwnerAccountA = (0, functions_1.generateAta)(userPda, mintA);
979
+ const tokenOwnerAccountB = (0, functions_1.generateAta)(userPda, mintB);
980
+ const { publicKey: tickArrayLower } = (0, orca_1.getTickArrayFromTickIndex)(positionData.tickLowerIndex, whirlpoolData.tickSpacing, whirlpool, addresses_1.ORCA_WHIRLPOOL_PROGRAM);
981
+ const { publicKey: tickArrayUpper } = (0, orca_1.getTickArrayFromTickIndex)(positionData.tickUpperIndex, whirlpoolData.tickSpacing, whirlpool, addresses_1.ORCA_WHIRLPOOL_PROGRAM);
982
+ const ownerFeeA = (0, functions_1.generateAta)(addresses_1.SITE_FEE_OWNER, mintA);
983
+ const ownerFeeB = (0, functions_1.generateAta)(addresses_1.SITE_FEE_OWNER, mintB);
986
984
  const remainingAccounts = [];
987
985
  for (const rewardInfo of whirlpoolData.rewardInfos) {
988
986
  if (rewardInfo.mint.toString() !== web3.SystemProgram.programId.toString()) {
989
- const rewardOwnerAccount = (0, functions_2.generateAta)(userPda, rewardInfo.mint);
987
+ const rewardOwnerAccount = (0, functions_1.generateAta)(userPda, rewardInfo.mint);
990
988
  const rewardVault = rewardInfo.vault;
991
- const rewardFee = (0, functions_2.generateAta)(addresses_1.SITE_FEE_OWNER, rewardInfo.mint);
989
+ const rewardFee = (0, functions_1.generateAta)(addresses_1.SITE_FEE_OWNER, rewardInfo.mint);
992
990
  remainingAccounts.push({ pubkey: rewardOwnerAccount, isSigner: false, isWritable: true });
993
991
  remainingAccounts.push({ pubkey: rewardVault, isSigner: false, isWritable: true });
994
992
  remainingAccounts.push({ pubkey: rewardFee, isSigner: false, isWritable: true });
@@ -1055,7 +1053,7 @@ class Transactions {
1055
1053
  ],
1056
1054
  });
1057
1055
  const mainInstructions = [orcaOpenPositionIxViaMain, withdrawFromPda];
1058
- return (0, functions_2.createTransactionMeta)({
1056
+ return (0, functions_1.createTransactionMeta)({
1059
1057
  payer: params.userWallet,
1060
1058
  description: `Claim rewards from Orca Position: ${position}`,
1061
1059
  addressLookupTableAddresses: addresses_1.GLOBAL_ALT,