@hawksightco/hawk-sdk 1.3.278 → 1.3.280
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.
- package/dist/classes/Transactions.d.ts.map +1 -1
- package/dist/classes/Transactions.js +58 -3
- package/dist/meteora/slippage.d.ts +19 -0
- package/dist/meteora/slippage.d.ts.map +1 -0
- package/dist/meteora/slippage.js +27 -0
- package/dist/meteora/transferFee.d.ts +29 -0
- package/dist/meteora/transferFee.d.ts.map +1 -0
- package/dist/meteora/transferFee.js +66 -0
- package/dist/meteora.d.ts +27 -0
- package/dist/meteora.d.ts.map +1 -1
- package/dist/meteora.js +119 -26
- package/package.json +1 -1
|
@@ -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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"}
|
|
@@ -73,6 +73,8 @@ const OrcaPdaGenerator_1 = require("../pdaGenerator/OrcaPdaGenerator");
|
|
|
73
73
|
const hsToMeteora_1 = require("../hsToMeteora");
|
|
74
74
|
const meteora_1 = require("../meteora");
|
|
75
75
|
const liquidityStrategy_1 = require("../meteora/liquidityStrategy");
|
|
76
|
+
const slippage_1 = require("../meteora/slippage");
|
|
77
|
+
const transferFee_1 = require("../meteora/transferFee");
|
|
76
78
|
const anchor_1 = require("../anchor");
|
|
77
79
|
const types_2 = require("../types");
|
|
78
80
|
const Logging_1 = require("./Logging");
|
|
@@ -490,7 +492,14 @@ class Transactions {
|
|
|
490
492
|
meteoraCreatePositionAndDeposit(_a) {
|
|
491
493
|
return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
|
|
492
494
|
const dlmmPool = yield meteora_1.MeteoraDLMM.create(connection, new web3.PublicKey(params.pool), this.ix);
|
|
495
|
+
// Warm MintCache for both mints in one call; the source-ATA and deposit-to-PDA layers
|
|
496
|
+
// below each look one mint up and would otherwise pay a serial round apiece (H-2665).
|
|
497
|
+
yield (0, functions_1.getTokenProgramMapForMints)(connection, [
|
|
498
|
+
dlmmPool.dlmm.lbPair.tokenXMint,
|
|
499
|
+
dlmmPool.dlmm.lbPair.tokenYMint,
|
|
500
|
+
]);
|
|
493
501
|
const userPda = (0, functions_1.generateUserPda)(params.userWallet);
|
|
502
|
+
const liquidity = yield (0, transferFee_1.transferFeeExcludedAmounts)(connection, dlmmPool.dlmm.tokenX.mint, dlmmPool.dlmm.tokenY.mint, params.totalXAmount, params.totalYAmount);
|
|
494
503
|
const mainInstructions = (yield dlmmPool.initializePositionAndAddLiquidityByStrategy(connection, params.userWallet, params.userWallet, {
|
|
495
504
|
positionPubKey: params.position,
|
|
496
505
|
user: userPda,
|
|
@@ -506,6 +515,14 @@ class Transactions {
|
|
|
506
515
|
opt: {
|
|
507
516
|
pdaTokenType: params.pdaTokenType,
|
|
508
517
|
},
|
|
518
|
+
// H-2641: the create paths never forwarded slippage, so every create ran
|
|
519
|
+
// at the DLMM SDK's 3-bin fallback regardless of the user's setting.
|
|
520
|
+
liquiditySlippage: (0, slippage_1.effectiveSlippage)(dlmmPool.dlmm.lbPair.binStep, params.slippage),
|
|
521
|
+
// H-2641: the deposit above moves totalXAmount into the PDA and a
|
|
522
|
+
// Token-2022 fee is taken in transit, so DLMM must be told what will
|
|
523
|
+
// actually be there or its TransferChecked fails on insufficient funds.
|
|
524
|
+
liquidityXAmount: liquidity.amountX,
|
|
525
|
+
liquidityYAmount: liquidity.amountY,
|
|
509
526
|
}, hsToMeteora_1.meteoraToHawksight)).default();
|
|
510
527
|
return (0, functions_1.createTransactionMeta)({
|
|
511
528
|
payer: params.userWallet,
|
|
@@ -540,6 +557,8 @@ class Transactions {
|
|
|
540
557
|
slippage: params.slippage,
|
|
541
558
|
skipInputTokenCheck: params.skipInputTokenCheck,
|
|
542
559
|
pdaTokenType: params.pdaTokenType,
|
|
560
|
+
// H-2641: see meteoraCreatePositionAndDeposit.
|
|
561
|
+
liquiditySlippage: (0, slippage_1.effectiveSlippage)(dlmmPool.dlmm.lbPair.binStep, params.slippage),
|
|
543
562
|
}, hsToMeteora_1.meteoraToHawksightPdaIxs)).default();
|
|
544
563
|
return (0, functions_1.createTransactionMeta)({
|
|
545
564
|
payer: params.userWallet,
|
|
@@ -689,11 +708,15 @@ class Transactions {
|
|
|
689
708
|
}
|
|
690
709
|
const dlmmPool = yield meteora_1.MeteoraDLMM.create(connection, new web3.PublicKey(lbPair), this.ix);
|
|
691
710
|
const userPda = (0, functions_1.generateUserPda)(params.userWallet);
|
|
711
|
+
const liquidity = yield (0, transferFee_1.transferFeeExcludedAmounts)(connection, dlmmPool.dlmm.tokenX.mint, dlmmPool.dlmm.tokenY.mint, params.totalXAmount, params.totalYAmount);
|
|
692
712
|
const mainInstructions = (yield dlmmPool.addLiquidityByStrategy(connection, params.userWallet, params.userWallet, {
|
|
693
713
|
positionPubKey: params.position,
|
|
694
714
|
user: userPda,
|
|
695
715
|
totalXAmount: params.totalXAmount,
|
|
696
716
|
totalYAmount: params.totalYAmount,
|
|
717
|
+
// H-2641: see meteoraCreatePositionAndDeposit.
|
|
718
|
+
liquidityXAmount: liquidity.amountX,
|
|
719
|
+
liquidityYAmount: liquidity.amountY,
|
|
697
720
|
strategy: {
|
|
698
721
|
maxBinId,
|
|
699
722
|
minBinId,
|
|
@@ -4321,12 +4344,17 @@ class Transactions {
|
|
|
4321
4344
|
const dlmmPool = yield meteora_1.MeteoraDLMM.create(connection, lbPair, this.ix);
|
|
4322
4345
|
const { binId: activeId } = yield dlmmPool.dlmm.getActiveBin();
|
|
4323
4346
|
const binStep = new bn_js_1.default(dlmmPool.dlmm.lbPair.binStep);
|
|
4347
|
+
// H-2641: the deposit below moves totalXAmount into the PDA and a Token-2022
|
|
4348
|
+
// fee is taken in transit, so the strategy has to be sized on what will
|
|
4349
|
+
// actually be there. favorXInActiveId above stays on the raw amounts: it is
|
|
4350
|
+
// a zero-check, and a dust deposit whose fee consumes it must not flip sides.
|
|
4351
|
+
const liquidity = yield (0, transferFee_1.transferFeeExcludedAmounts)(connection, dlmmPool.dlmm.tokenX.mint, dlmmPool.dlmm.tokenY.mint, totalXAmount, totalYAmount);
|
|
4324
4352
|
console.log(`Active ID: ${activeId}, Bin Step: ${binStep.toString()}`);
|
|
4325
4353
|
// Calculate delta IDs relative to active bin for entire position
|
|
4326
4354
|
const minDeltaId = new bn_js_1.default(lowerBinId - activeId);
|
|
4327
4355
|
const maxDeltaId = new bn_js_1.default(upperBinId - activeId);
|
|
4328
4356
|
// Build strategy parameters ONCE for entire position
|
|
4329
|
-
const strategyParams = (0, liquidityStrategy_1.buildStrategyParameters)(strategyType,
|
|
4357
|
+
const strategyParams = (0, liquidityStrategy_1.buildStrategyParameters)(strategyType, liquidity.amountX, liquidity.amountY, minDeltaId, maxDeltaId, binStep, new bn_js_1.default(activeId), favorXInActiveId);
|
|
4330
4358
|
console.log(`Strategy params - x0: ${strategyParams.x0.toString()}, y0: ${strategyParams.y0.toString()}, deltaX: ${strategyParams.deltaX.toString()}, deltaY: ${strategyParams.deltaY.toString()}`);
|
|
4331
4359
|
// Chunk the deposit using the same strategy parameters
|
|
4332
4360
|
const chunks = (0, liquidityStrategy_1.chunkDepositParameters)(strategyParams, minDeltaId, maxDeltaId, new bn_js_1.default(activeId), binStep, MAX_BINS_PER_TX, favorXInActiveId);
|
|
@@ -4561,7 +4589,13 @@ class Transactions {
|
|
|
4561
4589
|
// ≤70 bins: single-tx path via meteoraDepositLargerPosition
|
|
4562
4590
|
if (totalBins <= 70) {
|
|
4563
4591
|
const dlmmPool = yield meteora_1.MeteoraDLMM.create(connection, new web3.PublicKey(params.pool), this.ix);
|
|
4592
|
+
// H-2665: see meteoraCreatePositionAndDeposit.
|
|
4593
|
+
yield (0, functions_1.getTokenProgramMapForMints)(connection, [
|
|
4594
|
+
dlmmPool.dlmm.lbPair.tokenXMint,
|
|
4595
|
+
dlmmPool.dlmm.lbPair.tokenYMint,
|
|
4596
|
+
]);
|
|
4564
4597
|
const userPda = (0, functions_1.generateUserPda)(params.userWallet);
|
|
4598
|
+
const liquidity = yield (0, transferFee_1.transferFeeExcludedAmounts)(connection, dlmmPool.dlmm.tokenX.mint, dlmmPool.dlmm.tokenY.mint, params.totalXAmount, params.totalYAmount);
|
|
4565
4599
|
const mainInstructions = (yield dlmmPool.initializePositionAndAddLiquidityByStrategyLabeled(connection, params.userWallet, params.userWallet, {
|
|
4566
4600
|
positionPubKey: params.position,
|
|
4567
4601
|
user: userPda,
|
|
@@ -4577,6 +4611,10 @@ class Transactions {
|
|
|
4577
4611
|
opt: {
|
|
4578
4612
|
pdaTokenType: params.pdaTokenType,
|
|
4579
4613
|
},
|
|
4614
|
+
// H-2641: see meteoraCreatePositionAndDeposit.
|
|
4615
|
+
liquiditySlippage: (0, slippage_1.effectiveSlippage)(dlmmPool.dlmm.lbPair.binStep, params.slippage),
|
|
4616
|
+
liquidityXAmount: liquidity.amountX,
|
|
4617
|
+
liquidityYAmount: liquidity.amountY,
|
|
4580
4618
|
}, hsToMeteora_1.meteoraToHawksightLabeled)).default();
|
|
4581
4619
|
return [
|
|
4582
4620
|
yield (0, functions_1.createTransactionMeta2)({
|
|
@@ -4757,10 +4795,13 @@ class Transactions {
|
|
|
4757
4795
|
const binStep = new bn_js_1.default(dlmmPool.dlmm.lbPair.binStep);
|
|
4758
4796
|
const minDeltaId = new bn_js_1.default(lowerBinId - activeId);
|
|
4759
4797
|
const maxDeltaId = new bn_js_1.default(upperBinId - activeId);
|
|
4798
|
+
// H-2641: see _meteoraDepositToLargePosition. Size the strategy on the
|
|
4799
|
+
// post-transfer-fee amounts; the deposit leg below keeps the raw ones.
|
|
4800
|
+
const liquidity = yield (0, transferFee_1.transferFeeExcludedAmounts)(connection, dlmmPool.dlmm.tokenX.mint, dlmmPool.dlmm.tokenY.mint, totalXAmount, totalYAmount);
|
|
4760
4801
|
const strategyResults = (0, liquidityStrategy_1.distributionToHybridStrategy)({
|
|
4761
4802
|
hybridDistribution: layers,
|
|
4762
|
-
amountX:
|
|
4763
|
-
amountY:
|
|
4803
|
+
amountX: liquidity.amountX,
|
|
4804
|
+
amountY: liquidity.amountY,
|
|
4764
4805
|
minDeltaId,
|
|
4765
4806
|
maxDeltaId,
|
|
4766
4807
|
binStep,
|
|
@@ -5037,6 +5078,8 @@ class Transactions {
|
|
|
5037
5078
|
// Get pool data
|
|
5038
5079
|
const dlmmPool = yield meteora_1.MeteoraDLMM.create(connection, lbPair, this.ix);
|
|
5039
5080
|
const userPda = (0, functions_1.generateUserPda)(userWallet);
|
|
5081
|
+
// H-2641: see meteoraCreatePositionAndDeposit.
|
|
5082
|
+
const liquidity = yield (0, transferFee_1.transferFeeExcludedAmounts)(connection, dlmmPool.dlmm.tokenX.mint, dlmmPool.dlmm.tokenY.mint, totalXAmount, totalYAmount);
|
|
5040
5083
|
const instructions = [];
|
|
5041
5084
|
// Step 2: Either initialize position and add liquidity, or just add liquidity
|
|
5042
5085
|
if (initializePosition) {
|
|
@@ -5046,6 +5089,8 @@ class Transactions {
|
|
|
5046
5089
|
positionPubKey: position,
|
|
5047
5090
|
totalXAmount,
|
|
5048
5091
|
totalYAmount,
|
|
5092
|
+
liquidityXAmount: liquidity.amountX,
|
|
5093
|
+
liquidityYAmount: liquidity.amountY,
|
|
5049
5094
|
strategy: {
|
|
5050
5095
|
minBinId: lowerBinId,
|
|
5051
5096
|
maxBinId: upperBinId,
|
|
@@ -5053,6 +5098,12 @@ class Transactions {
|
|
|
5053
5098
|
},
|
|
5054
5099
|
user: userPda,
|
|
5055
5100
|
slippage,
|
|
5101
|
+
// H-2641: this branch is the only one in this method that goes
|
|
5102
|
+
// through initializePositionAndAddLiquidityByStrategy, which reads
|
|
5103
|
+
// liquiditySlippage rather than slippage. Without it the branch
|
|
5104
|
+
// would sit on the SDK's 3-bin fallback while the sibling
|
|
5105
|
+
// addLiquidityByStrategy branches honour the user's setting.
|
|
5106
|
+
liquiditySlippage: (0, slippage_1.effectiveSlippage)(dlmmPool.dlmm.lbPair.binStep, slippage),
|
|
5056
5107
|
skipInputTokenCheck,
|
|
5057
5108
|
opt: {
|
|
5058
5109
|
pdaTokenType,
|
|
@@ -5158,6 +5209,8 @@ class Transactions {
|
|
|
5158
5209
|
positionPubKey: position,
|
|
5159
5210
|
totalXAmount,
|
|
5160
5211
|
totalYAmount,
|
|
5212
|
+
liquidityXAmount: liquidity.amountX,
|
|
5213
|
+
liquidityYAmount: liquidity.amountY,
|
|
5161
5214
|
strategy: {
|
|
5162
5215
|
minBinId: lowerBinId,
|
|
5163
5216
|
maxBinId: upperBinId,
|
|
@@ -5216,6 +5269,8 @@ class Transactions {
|
|
|
5216
5269
|
positionPubKey: position,
|
|
5217
5270
|
totalXAmount,
|
|
5218
5271
|
totalYAmount,
|
|
5272
|
+
liquidityXAmount: liquidity.amountX,
|
|
5273
|
+
liquidityYAmount: liquidity.amountY,
|
|
5219
5274
|
strategy: {
|
|
5220
5275
|
minBinId: lowerBinId,
|
|
5221
5276
|
maxBinId: upperBinId,
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Translate a deposit slippage percentage into the value the DLMM SDK expects.
|
|
3
|
+
*
|
|
4
|
+
* The DLMM SDK turns a slippage percentage into an active-bin tolerance with
|
|
5
|
+
* `ceil(slippage / (binStep / 100))`, and falls back to MAX_ACTIVE_BIN_SLIPPAGE
|
|
6
|
+
* when it is given nothing. The create paths used to pass nothing at all, so
|
|
7
|
+
* every create ran at that fallback no matter what the user set — which is what
|
|
8
|
+
* raises `ExceededBinSlippageTolerance` (0x1774) when the active bin drifts.
|
|
9
|
+
*
|
|
10
|
+
* Forwarding the percentage raw is not unconditionally safer: on a wide-bin-step
|
|
11
|
+
* pool it converts to *fewer* bins than the fallback (binStep 100 at 1% is a
|
|
12
|
+
* single bin), which would make create stricter than it has ever been. So floor
|
|
13
|
+
* the result at the tolerance create already had.
|
|
14
|
+
*
|
|
15
|
+
* Returns undefined when the caller has no slippage to express, which leaves the
|
|
16
|
+
* DLMM SDK on its own fallback and keeps the instruction byte-identical.
|
|
17
|
+
*/
|
|
18
|
+
export declare function effectiveSlippage(binStep: number, slippage?: number): number | undefined;
|
|
19
|
+
//# sourceMappingURL=slippage.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"slippage.d.ts","sourceRoot":"","sources":["../../src/meteora/slippage.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,MAAM,EACf,QAAQ,CAAC,EAAE,MAAM,GAChB,MAAM,GAAG,SAAS,CAKpB"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.effectiveSlippage = effectiveSlippage;
|
|
4
|
+
const dlmm_1 = require("@meteora-ag/dlmm");
|
|
5
|
+
/**
|
|
6
|
+
* Translate a deposit slippage percentage into the value the DLMM SDK expects.
|
|
7
|
+
*
|
|
8
|
+
* The DLMM SDK turns a slippage percentage into an active-bin tolerance with
|
|
9
|
+
* `ceil(slippage / (binStep / 100))`, and falls back to MAX_ACTIVE_BIN_SLIPPAGE
|
|
10
|
+
* when it is given nothing. The create paths used to pass nothing at all, so
|
|
11
|
+
* every create ran at that fallback no matter what the user set — which is what
|
|
12
|
+
* raises `ExceededBinSlippageTolerance` (0x1774) when the active bin drifts.
|
|
13
|
+
*
|
|
14
|
+
* Forwarding the percentage raw is not unconditionally safer: on a wide-bin-step
|
|
15
|
+
* pool it converts to *fewer* bins than the fallback (binStep 100 at 1% is a
|
|
16
|
+
* single bin), which would make create stricter than it has ever been. So floor
|
|
17
|
+
* the result at the tolerance create already had.
|
|
18
|
+
*
|
|
19
|
+
* Returns undefined when the caller has no slippage to express, which leaves the
|
|
20
|
+
* DLMM SDK on its own fallback and keeps the instruction byte-identical.
|
|
21
|
+
*/
|
|
22
|
+
function effectiveSlippage(binStep, slippage) {
|
|
23
|
+
if (slippage === undefined) {
|
|
24
|
+
return undefined;
|
|
25
|
+
}
|
|
26
|
+
return Math.max(slippage, (binStep / 100) * dlmm_1.MAX_ACTIVE_BIN_SLIPPAGE);
|
|
27
|
+
}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import BN from 'bn.js';
|
|
2
|
+
import * as web3 from '@solana/web3.js';
|
|
3
|
+
import { type Mint } from '@solana/spl-token';
|
|
4
|
+
/**
|
|
5
|
+
* What actually lands in the destination account when `amount` is transferred.
|
|
6
|
+
*
|
|
7
|
+
* Mirrors getMeteoraCompoundPostClaimAmount in classes/Transactions.ts: epoch
|
|
8
|
+
* aware, respects `maximumFee`, and a pass-through for mints that charge
|
|
9
|
+
* nothing (including every plain SPL Token mint, where getTransferFeeConfig
|
|
10
|
+
* returns null).
|
|
11
|
+
*/
|
|
12
|
+
export declare function transferFeeExcludedAmount(mint: Mint, amount: BN, epoch: bigint): BN;
|
|
13
|
+
/**
|
|
14
|
+
* H-2641: the deposit leg transfers the caller's amount into the user PDA, and
|
|
15
|
+
* a Token-2022 transfer fee is taken in transit. The add-liquidity leg then has
|
|
16
|
+
* to move that balance back out of the PDA, so it must be told what is going to
|
|
17
|
+
* be there, not what we sent. Passing the caller's amount to both is what makes
|
|
18
|
+
* DLMM's TransferChecked fail with `insufficient funds` (0x1) on a fee-bearing
|
|
19
|
+
* mint.
|
|
20
|
+
*
|
|
21
|
+
* Both mints are already unpacked on the DLMM pool object, so reading the fee
|
|
22
|
+
* config is free; only the epoch costs a round trip, and only when one of the
|
|
23
|
+
* two mints actually charges.
|
|
24
|
+
*/
|
|
25
|
+
export declare function transferFeeExcludedAmounts(connection: web3.Connection, tokenX: Mint, tokenY: Mint, amountX: BN, amountY: BN): Promise<{
|
|
26
|
+
amountX: BN;
|
|
27
|
+
amountY: BN;
|
|
28
|
+
}>;
|
|
29
|
+
//# sourceMappingURL=transferFee.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"transferFee.d.ts","sourceRoot":"","sources":["../../src/meteora/transferFee.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,OAAO,CAAC;AACvB,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAGL,KAAK,IAAI,EACV,MAAM,mBAAmB,CAAC;AAE3B;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,EAAE,EACV,KAAK,EAAE,MAAM,GACZ,EAAE,CAaJ;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,0BAA0B,CAC9C,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,MAAM,EAAE,IAAI,EACZ,MAAM,EAAE,IAAI,EACZ,OAAO,EAAE,EAAE,EACX,OAAO,EAAE,EAAE,GACV,OAAO,CAAC;IAAE,OAAO,EAAE,EAAE,CAAC;IAAC,OAAO,EAAE,EAAE,CAAA;CAAE,CAAC,CAYvC"}
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
exports.transferFeeExcludedAmount = transferFeeExcludedAmount;
|
|
16
|
+
exports.transferFeeExcludedAmounts = transferFeeExcludedAmounts;
|
|
17
|
+
const bn_js_1 = __importDefault(require("bn.js"));
|
|
18
|
+
const spl_token_1 = require("@solana/spl-token");
|
|
19
|
+
/**
|
|
20
|
+
* What actually lands in the destination account when `amount` is transferred.
|
|
21
|
+
*
|
|
22
|
+
* Mirrors getMeteoraCompoundPostClaimAmount in classes/Transactions.ts: epoch
|
|
23
|
+
* aware, respects `maximumFee`, and a pass-through for mints that charge
|
|
24
|
+
* nothing (including every plain SPL Token mint, where getTransferFeeConfig
|
|
25
|
+
* returns null).
|
|
26
|
+
*/
|
|
27
|
+
function transferFeeExcludedAmount(mint, amount, epoch) {
|
|
28
|
+
if (amount.isZero()) {
|
|
29
|
+
return amount;
|
|
30
|
+
}
|
|
31
|
+
const config = (0, spl_token_1.getTransferFeeConfig)(mint);
|
|
32
|
+
if (config === null) {
|
|
33
|
+
return amount;
|
|
34
|
+
}
|
|
35
|
+
const fee = (0, spl_token_1.calculateEpochFee)(config, epoch, BigInt(amount.toString()));
|
|
36
|
+
if (fee === BigInt(0)) {
|
|
37
|
+
return amount;
|
|
38
|
+
}
|
|
39
|
+
return amount.sub(new bn_js_1.default(fee.toString()));
|
|
40
|
+
}
|
|
41
|
+
/**
|
|
42
|
+
* H-2641: the deposit leg transfers the caller's amount into the user PDA, and
|
|
43
|
+
* a Token-2022 transfer fee is taken in transit. The add-liquidity leg then has
|
|
44
|
+
* to move that balance back out of the PDA, so it must be told what is going to
|
|
45
|
+
* be there, not what we sent. Passing the caller's amount to both is what makes
|
|
46
|
+
* DLMM's TransferChecked fail with `insufficient funds` (0x1) on a fee-bearing
|
|
47
|
+
* mint.
|
|
48
|
+
*
|
|
49
|
+
* Both mints are already unpacked on the DLMM pool object, so reading the fee
|
|
50
|
+
* config is free; only the epoch costs a round trip, and only when one of the
|
|
51
|
+
* two mints actually charges.
|
|
52
|
+
*/
|
|
53
|
+
function transferFeeExcludedAmounts(connection, tokenX, tokenY, amountX, amountY) {
|
|
54
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
55
|
+
const charges = (0, spl_token_1.getTransferFeeConfig)(tokenX) !== null ||
|
|
56
|
+
(0, spl_token_1.getTransferFeeConfig)(tokenY) !== null;
|
|
57
|
+
if (!charges) {
|
|
58
|
+
return { amountX, amountY };
|
|
59
|
+
}
|
|
60
|
+
const epoch = BigInt((yield connection.getEpochInfo()).epoch);
|
|
61
|
+
return {
|
|
62
|
+
amountX: transferFeeExcludedAmount(tokenX, amountX, epoch),
|
|
63
|
+
amountY: transferFeeExcludedAmount(tokenY, amountY, epoch),
|
|
64
|
+
};
|
|
65
|
+
});
|
|
66
|
+
}
|
package/dist/meteora.d.ts
CHANGED
|
@@ -51,6 +51,23 @@ export declare class MeteoraDLMM {
|
|
|
51
51
|
activeBin: import("@meteora-ag/dlmm").BinLiquidity;
|
|
52
52
|
userPositions: Array<LbPosition>;
|
|
53
53
|
}>;
|
|
54
|
+
/**
|
|
55
|
+
* The two Meteora instructions `dlmm.initializePositionAndAddLiquidityByStrategy` would
|
|
56
|
+
* return, built without its transaction plumbing (H-2665).
|
|
57
|
+
*
|
|
58
|
+
* That builder returns a `Transaction`; we keep only its Meteora-program instructions and
|
|
59
|
+
* discard the rest, so four of its RPC rounds bought nothing: a per-bin-array
|
|
60
|
+
* `getAccountInfo` loop (batched here into one call), two ATA probes whose create-ATA ixs
|
|
61
|
+
* we filter out, a compute-unit simulation whose ix we filter out, and a blockhash whose
|
|
62
|
+
* `Transaction` we never send. Create went from 7 sequential rounds to 3.
|
|
63
|
+
*
|
|
64
|
+
* Must stay byte-identical to the filtered builder output —
|
|
65
|
+
* `test/unit/meteoraCreateIxParity.spec.ts` compares them. Keep the account order, the
|
|
66
|
+
* builder's `maxActiveBinSlippage` derivation (H-2641 forwards `liquiditySlippage` here;
|
|
67
|
+
* `undefined` means the SDK's 3-bin fallback), and the off-curve ATA derivation (`user` is
|
|
68
|
+
* the user PDA).
|
|
69
|
+
*/
|
|
70
|
+
private buildInitializePositionAndAddLiquidityByStrategyIxs;
|
|
54
71
|
/**
|
|
55
72
|
* Initializes a position and adds liquidity to the specified strategy, with various steps including
|
|
56
73
|
* handling wrapped SOL tokens, depositing tokens, adding liquidity, and handling dust withdrawals.
|
|
@@ -92,6 +109,9 @@ export declare class MeteoraDLMM {
|
|
|
92
109
|
};
|
|
93
110
|
fuelAccount?: boolean;
|
|
94
111
|
};
|
|
112
|
+
liquiditySlippage?: number;
|
|
113
|
+
liquidityXAmount?: BN;
|
|
114
|
+
liquidityYAmount?: BN;
|
|
95
115
|
}, meteoraToHawksight: MeteoraToHawksightFn): Promise<InitializePositionAndAddLiquidityByStrategyBuilder>;
|
|
96
116
|
/**
|
|
97
117
|
* Initializes a position and adds liquidity to the specified strategy, with various steps including
|
|
@@ -134,6 +154,9 @@ export declare class MeteoraDLMM {
|
|
|
134
154
|
};
|
|
135
155
|
fuelAccount?: boolean;
|
|
136
156
|
};
|
|
157
|
+
liquiditySlippage?: number;
|
|
158
|
+
liquidityXAmount?: BN;
|
|
159
|
+
liquidityYAmount?: BN;
|
|
137
160
|
}, meteoraToHawksight: MeteoraToHawksightFnLabeled): Promise<InitializePositionAndAddLiquidityByStrategyBuilderLabeled>;
|
|
138
161
|
/**
|
|
139
162
|
* Initializes a position and adds liquidity to the specified strategy, with various steps including
|
|
@@ -169,6 +192,7 @@ export declare class MeteoraDLMM {
|
|
|
169
192
|
slippage?: number;
|
|
170
193
|
skipInputTokenCheck?: boolean;
|
|
171
194
|
pdaTokenType?: TokenType;
|
|
195
|
+
liquiditySlippage?: number;
|
|
172
196
|
}, meteoraToHawksight: MeteoraToHawksightFn): Promise<InitializePositionAndAddLiquidityByStrategyPdaBuilder>;
|
|
173
197
|
/**
|
|
174
198
|
* Adds liquidity to an existing position according to a specified strategy.
|
|
@@ -206,6 +230,8 @@ export declare class MeteoraDLMM {
|
|
|
206
230
|
slippage?: number;
|
|
207
231
|
skipInputTokenCheck: boolean;
|
|
208
232
|
pdaTokenType?: TokenType;
|
|
233
|
+
liquidityXAmount?: BN;
|
|
234
|
+
liquidityYAmount?: BN;
|
|
209
235
|
}, meteoraToHawksight: MeteoraToHawksightFn): Promise<AddLiquidityByStrategyBuilder>;
|
|
210
236
|
/**
|
|
211
237
|
* Removes liquidity from an existing position.
|
|
@@ -391,6 +417,7 @@ export declare class MeteoraFunctions {
|
|
|
391
417
|
lockReleasePoint: BN;
|
|
392
418
|
padding0: number;
|
|
393
419
|
feeOwner: web3.PublicKey;
|
|
420
|
+
version: number;
|
|
394
421
|
reserved: number[];
|
|
395
422
|
}, LbPosition][]>;
|
|
396
423
|
/**
|
package/dist/meteora.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"meteora.d.ts","sourceRoot":"","sources":["../src/meteora.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"meteora.d.ts","sourceRoot":"","sources":["../src/meteora.ts"],"names":[],"mappings":"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"}
|
package/dist/meteora.js
CHANGED
|
@@ -48,6 +48,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
48
48
|
exports.InitializePositionAndAddLiquidityByStrategyPdaBuilder = exports.InitializePositionAndAddLiquidityByStrategyBuilderLabeled = exports.InitializePositionAndAddLiquidityByStrategyBuilder = exports.RemoveLiquidityPdaBuilder = exports.RemoveLiquidityBuilder = exports.AddLiquidityByStrategyBuilder = exports.ClaimAllRewardsByPositionBuilder = exports.MeteoraFunctions = exports.MeteoraDLMM = void 0;
|
|
49
49
|
exports.restoreRequestedBinRange = restoreRequestedBinRange;
|
|
50
50
|
const dlmm_1 = __importStar(require("@meteora-ag/dlmm"));
|
|
51
|
+
const spl_token_1 = require("@solana/spl-token");
|
|
51
52
|
const bn_js_1 = __importDefault(require("bn.js"));
|
|
52
53
|
const web3 = __importStar(require("@solana/web3.js"));
|
|
53
54
|
const errors_1 = require("./errors");
|
|
@@ -193,6 +194,98 @@ class MeteoraDLMM {
|
|
|
193
194
|
return yield this.dlmm.getPositionsByUserAndLbPair(userPubKey);
|
|
194
195
|
});
|
|
195
196
|
}
|
|
197
|
+
/**
|
|
198
|
+
* The two Meteora instructions `dlmm.initializePositionAndAddLiquidityByStrategy` would
|
|
199
|
+
* return, built without its transaction plumbing (H-2665).
|
|
200
|
+
*
|
|
201
|
+
* That builder returns a `Transaction`; we keep only its Meteora-program instructions and
|
|
202
|
+
* discard the rest, so four of its RPC rounds bought nothing: a per-bin-array
|
|
203
|
+
* `getAccountInfo` loop (batched here into one call), two ATA probes whose create-ATA ixs
|
|
204
|
+
* we filter out, a compute-unit simulation whose ix we filter out, and a blockhash whose
|
|
205
|
+
* `Transaction` we never send. Create went from 7 sequential rounds to 3.
|
|
206
|
+
*
|
|
207
|
+
* Must stay byte-identical to the filtered builder output —
|
|
208
|
+
* `test/unit/meteoraCreateIxParity.spec.ts` compares them. Keep the account order, the
|
|
209
|
+
* builder's `maxActiveBinSlippage` derivation (H-2641 forwards `liquiditySlippage` here;
|
|
210
|
+
* `undefined` means the SDK's 3-bin fallback), and the off-curve ATA derivation (`user` is
|
|
211
|
+
* the user PDA).
|
|
212
|
+
*/
|
|
213
|
+
buildInitializePositionAndAddLiquidityByStrategyIxs(connection, params) {
|
|
214
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
215
|
+
const { dlmm } = this;
|
|
216
|
+
const { positionPubKey, totalXAmount, totalYAmount, strategy, user, slippage } = params;
|
|
217
|
+
const { maxBinId, minBinId } = strategy;
|
|
218
|
+
const lowerBinId = new bn_js_1.default(minBinId);
|
|
219
|
+
const upperBinId = new bn_js_1.default(maxBinId);
|
|
220
|
+
// Same expression as the DLMM SDK builder.
|
|
221
|
+
const maxActiveBinSlippage = slippage
|
|
222
|
+
? Math.ceil(slippage / (dlmm.lbPair.binStep / 100))
|
|
223
|
+
: dlmm_1.MAX_ACTIVE_BIN_SLIPPAGE;
|
|
224
|
+
const initializePositionIx = yield dlmm.program.methods
|
|
225
|
+
.initializePosition(minBinId, maxBinId - minBinId + 1)
|
|
226
|
+
.accountsPartial({
|
|
227
|
+
payer: user,
|
|
228
|
+
position: positionPubKey,
|
|
229
|
+
lbPair: dlmm.pubkey,
|
|
230
|
+
owner: user,
|
|
231
|
+
rent: web3.SYSVAR_RENT_PUBKEY,
|
|
232
|
+
})
|
|
233
|
+
.instruction();
|
|
234
|
+
// One batched existence check for every bin array the range covers. Meteora's
|
|
235
|
+
// `createBinArraysIfNeeded` awaits a `getAccountInfo` per index in a loop.
|
|
236
|
+
const binArrayIndexes = (0, dlmm_1.getBinArrayIndexesCoverage)(lowerBinId, upperBinId);
|
|
237
|
+
const binArrayKeys = binArrayIndexes.map((idx) => (0, dlmm_1.deriveBinArray)(dlmm.pubkey, idx, dlmm.program.programId)[0]);
|
|
238
|
+
const binArrayAccounts = yield connection.getMultipleAccountsInfo(binArrayKeys);
|
|
239
|
+
const createBinArrayIxs = yield Promise.all(binArrayIndexes
|
|
240
|
+
.filter((_, i) => binArrayAccounts[i] === null)
|
|
241
|
+
.map((idx) => dlmm.program.methods
|
|
242
|
+
.initializeBinArray(idx)
|
|
243
|
+
.accountsPartial({
|
|
244
|
+
binArray: (0, dlmm_1.deriveBinArray)(dlmm.pubkey, idx, dlmm.program.programId)[0],
|
|
245
|
+
funder: user,
|
|
246
|
+
lbPair: dlmm.pubkey,
|
|
247
|
+
})
|
|
248
|
+
.instruction()));
|
|
249
|
+
// Same derivation as Meteora's getOrCreateATAInstruction (allowOwnerOffCurve = true;
|
|
250
|
+
// `user` is the Hawksight user PDA). The existence probe is dropped: its only product
|
|
251
|
+
// was a create-ATA ix we filter out.
|
|
252
|
+
const userTokenX = (0, spl_token_1.getAssociatedTokenAddressSync)(dlmm.tokenX.publicKey, user, true, dlmm.tokenX.owner, spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID);
|
|
253
|
+
const userTokenY = (0, spl_token_1.getAssociatedTokenAddressSync)(dlmm.tokenY.publicKey, user, true, dlmm.tokenY.owner, spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID);
|
|
254
|
+
const useExtension = (0, dlmm_1.isOverflowDefaultBinArrayBitmap)((0, dlmm_1.binIdToBinArrayIndex)(lowerBinId)) ||
|
|
255
|
+
(0, dlmm_1.isOverflowDefaultBinArrayBitmap)((0, dlmm_1.binIdToBinArrayIndex)(upperBinId));
|
|
256
|
+
const binArrayBitmapExtension = useExtension
|
|
257
|
+
? (0, dlmm_1.deriveBinArrayBitmapExtension)(dlmm.pubkey, dlmm.program.programId)[0]
|
|
258
|
+
: null;
|
|
259
|
+
const liquidityParams = {
|
|
260
|
+
amountX: totalXAmount,
|
|
261
|
+
amountY: totalYAmount,
|
|
262
|
+
activeId: dlmm.lbPair.activeId,
|
|
263
|
+
maxActiveBinSlippage,
|
|
264
|
+
strategyParameters: (0, dlmm_1.toStrategyParameters)(strategy),
|
|
265
|
+
};
|
|
266
|
+
const { slices, accounts: transferHookAccounts } = dlmm.getPotentialToken2022IxDataAndAccounts(dlmm_1.ActionType.Liquidity);
|
|
267
|
+
const addLiquidityIx = yield dlmm.program.methods
|
|
268
|
+
.addLiquidityByStrategy2(liquidityParams, { slices })
|
|
269
|
+
.accountsPartial({
|
|
270
|
+
position: positionPubKey,
|
|
271
|
+
lbPair: dlmm.pubkey,
|
|
272
|
+
userTokenX,
|
|
273
|
+
userTokenY,
|
|
274
|
+
reserveX: dlmm.lbPair.reserveX,
|
|
275
|
+
reserveY: dlmm.lbPair.reserveY,
|
|
276
|
+
tokenXMint: dlmm.lbPair.tokenXMint,
|
|
277
|
+
tokenYMint: dlmm.lbPair.tokenYMint,
|
|
278
|
+
binArrayBitmapExtension,
|
|
279
|
+
sender: user,
|
|
280
|
+
tokenXProgram: dlmm.tokenX.owner,
|
|
281
|
+
tokenYProgram: dlmm.tokenY.owner,
|
|
282
|
+
})
|
|
283
|
+
.remainingAccounts(transferHookAccounts)
|
|
284
|
+
.remainingAccounts((0, dlmm_1.getBinArrayAccountMetasCoverage)(lowerBinId, upperBinId, dlmm.pubkey, dlmm.program.programId))
|
|
285
|
+
.instruction();
|
|
286
|
+
return [initializePositionIx, ...createBinArrayIxs, addLiquidityIx];
|
|
287
|
+
});
|
|
288
|
+
}
|
|
196
289
|
/**
|
|
197
290
|
* Initializes a position and adds liquidity to the specified strategy, with various steps including
|
|
198
291
|
* handling wrapped SOL tokens, depositing tokens, adding liquidity, and handling dust withdrawals.
|
|
@@ -216,7 +309,7 @@ class MeteoraDLMM {
|
|
|
216
309
|
*/
|
|
217
310
|
initializePositionAndAddLiquidityByStrategy(connection, userWallet, payer, params, meteoraToHawksight) {
|
|
218
311
|
return __awaiter(this, void 0, void 0, function* () {
|
|
219
|
-
var _a, _b, _c, _d, _e;
|
|
312
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
220
313
|
if (!!!params.skipInputTokenCheck) {
|
|
221
314
|
// Throw error if input token(s) do not exist on blockchain
|
|
222
315
|
yield (0, functions_1.inputTokenExists)(anchor_1.Anchor.instance().connection, userWallet, [
|
|
@@ -243,16 +336,15 @@ class MeteoraDLMM {
|
|
|
243
336
|
strategyType,
|
|
244
337
|
singleSidedX,
|
|
245
338
|
};
|
|
246
|
-
//
|
|
247
|
-
const
|
|
339
|
+
// InitializePosition + AddLiquidityByStrategy2, built locally (H-2665, see the method).
|
|
340
|
+
const ixs = yield this.buildInitializePositionAndAddLiquidityByStrategyIxs(connection, {
|
|
248
341
|
positionPubKey: params.positionPubKey,
|
|
249
|
-
totalXAmount: params.totalXAmount,
|
|
250
|
-
totalYAmount: params.totalYAmount,
|
|
342
|
+
totalXAmount: (_a = params.liquidityXAmount) !== null && _a !== void 0 ? _a : params.totalXAmount,
|
|
343
|
+
totalYAmount: (_b = params.liquidityYAmount) !== null && _b !== void 0 ? _b : params.totalYAmount,
|
|
251
344
|
strategy,
|
|
252
345
|
user: params.user,
|
|
346
|
+
slippage: params.liquiditySlippage,
|
|
253
347
|
});
|
|
254
|
-
// Filter out non-meteora instructions
|
|
255
|
-
const ixs = (0, functions_1.getIxs)(txn).filter((ix) => ix.programId.equals(addresses_1.METEORA_DLMM_PROGRAM));
|
|
256
348
|
// Find mint from meteora instructions
|
|
257
349
|
const mints = (0, functions_1.getMintsFromInstruction)({
|
|
258
350
|
instructions: ixs,
|
|
@@ -293,7 +385,7 @@ class MeteoraDLMM {
|
|
|
293
385
|
{ mint: this.dlmm.tokenX.publicKey, amount: params.totalXAmount },
|
|
294
386
|
{ mint: this.dlmm.tokenY.publicKey, amount: params.totalYAmount },
|
|
295
387
|
],
|
|
296
|
-
pdaTokenType: (
|
|
388
|
+
pdaTokenType: (_c = params.opt) === null || _c === void 0 ? void 0 : _c.pdaTokenType,
|
|
297
389
|
}),
|
|
298
390
|
// Step 3: Initialize position and add liquidity by strategy
|
|
299
391
|
yield meteoraToHawksight({
|
|
@@ -301,10 +393,10 @@ class MeteoraDLMM {
|
|
|
301
393
|
userPda: params.user,
|
|
302
394
|
authority: userWallet,
|
|
303
395
|
opt: {
|
|
304
|
-
pdaTokenType: (
|
|
396
|
+
pdaTokenType: (_d = params.opt) === null || _d === void 0 ? void 0 : _d.pdaTokenType,
|
|
305
397
|
params: {
|
|
306
|
-
withAmount: (
|
|
307
|
-
fuelAccount: (
|
|
398
|
+
withAmount: (_e = params.opt) === null || _e === void 0 ? void 0 : _e.withAmount,
|
|
399
|
+
fuelAccount: (_f = params.opt) === null || _f === void 0 ? void 0 : _f.fuelAccount,
|
|
308
400
|
},
|
|
309
401
|
},
|
|
310
402
|
}),
|
|
@@ -315,7 +407,7 @@ class MeteoraDLMM {
|
|
|
315
407
|
withdraw: mints.map((mint) => {
|
|
316
408
|
return { mint, amount: new bn_js_1.default(0) };
|
|
317
409
|
}),
|
|
318
|
-
pdaTokenType: (
|
|
410
|
+
pdaTokenType: (_g = params.opt) === null || _g === void 0 ? void 0 : _g.pdaTokenType,
|
|
319
411
|
hasAmount: false,
|
|
320
412
|
}),
|
|
321
413
|
// Step 5: Close wSOL account (if there's any)
|
|
@@ -345,7 +437,7 @@ class MeteoraDLMM {
|
|
|
345
437
|
*/
|
|
346
438
|
initializePositionAndAddLiquidityByStrategyLabeled(connection, userWallet, payer, params, meteoraToHawksight) {
|
|
347
439
|
return __awaiter(this, void 0, void 0, function* () {
|
|
348
|
-
var _a, _b, _c, _d, _e;
|
|
440
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
349
441
|
if (!!!params.skipInputTokenCheck) {
|
|
350
442
|
// Throw error if input token(s) do not exist on blockchain
|
|
351
443
|
yield (0, functions_1.inputTokenExists)(anchor_1.Anchor.instance().connection, userWallet, [
|
|
@@ -372,16 +464,15 @@ class MeteoraDLMM {
|
|
|
372
464
|
strategyType,
|
|
373
465
|
singleSidedX,
|
|
374
466
|
};
|
|
375
|
-
//
|
|
376
|
-
const
|
|
467
|
+
// InitializePosition + AddLiquidityByStrategy2, built locally (H-2665, see the method).
|
|
468
|
+
const ixs = yield this.buildInitializePositionAndAddLiquidityByStrategyIxs(connection, {
|
|
377
469
|
positionPubKey: params.positionPubKey,
|
|
378
|
-
totalXAmount: params.totalXAmount,
|
|
379
|
-
totalYAmount: params.totalYAmount,
|
|
470
|
+
totalXAmount: (_a = params.liquidityXAmount) !== null && _a !== void 0 ? _a : params.totalXAmount,
|
|
471
|
+
totalYAmount: (_b = params.liquidityYAmount) !== null && _b !== void 0 ? _b : params.totalYAmount,
|
|
380
472
|
strategy,
|
|
381
473
|
user: params.user,
|
|
474
|
+
slippage: params.liquiditySlippage,
|
|
382
475
|
});
|
|
383
|
-
// Filter out non-meteora instructions
|
|
384
|
-
const ixs = (0, functions_1.getIxs)(txn).filter((ix) => ix.programId.equals(addresses_1.METEORA_DLMM_PROGRAM));
|
|
385
476
|
// Find mint from meteora instructions
|
|
386
477
|
const mints = (0, functions_1.getMintsFromInstruction)({
|
|
387
478
|
instructions: ixs,
|
|
@@ -422,7 +513,7 @@ class MeteoraDLMM {
|
|
|
422
513
|
{ mint: this.dlmm.tokenX.publicKey, amount: params.totalXAmount },
|
|
423
514
|
{ mint: this.dlmm.tokenY.publicKey, amount: params.totalYAmount },
|
|
424
515
|
],
|
|
425
|
-
pdaTokenType: (
|
|
516
|
+
pdaTokenType: (_c = params.opt) === null || _c === void 0 ? void 0 : _c.pdaTokenType,
|
|
426
517
|
}),
|
|
427
518
|
// Step 3: Initialize position and add liquidity by strategy
|
|
428
519
|
yield meteoraToHawksight({
|
|
@@ -430,10 +521,10 @@ class MeteoraDLMM {
|
|
|
430
521
|
userPda: params.user,
|
|
431
522
|
authority: userWallet,
|
|
432
523
|
opt: {
|
|
433
|
-
pdaTokenType: (
|
|
524
|
+
pdaTokenType: (_d = params.opt) === null || _d === void 0 ? void 0 : _d.pdaTokenType,
|
|
434
525
|
params: {
|
|
435
|
-
withAmount: (
|
|
436
|
-
fuelAccount: (
|
|
526
|
+
withAmount: (_e = params.opt) === null || _e === void 0 ? void 0 : _e.withAmount,
|
|
527
|
+
fuelAccount: (_f = params.opt) === null || _f === void 0 ? void 0 : _f.fuelAccount,
|
|
437
528
|
},
|
|
438
529
|
},
|
|
439
530
|
classification: `initializePositionAndAddLiquidityByStrategyLabelled`,
|
|
@@ -445,7 +536,7 @@ class MeteoraDLMM {
|
|
|
445
536
|
withdraw: mints.map((mint) => {
|
|
446
537
|
return { mint, amount: new bn_js_1.default(0) };
|
|
447
538
|
}),
|
|
448
|
-
pdaTokenType: (
|
|
539
|
+
pdaTokenType: (_g = params.opt) === null || _g === void 0 ? void 0 : _g.pdaTokenType,
|
|
449
540
|
hasAmount: false,
|
|
450
541
|
}),
|
|
451
542
|
// Step 5: Close wSOL account (if there's any)
|
|
@@ -495,6 +586,7 @@ class MeteoraDLMM {
|
|
|
495
586
|
singleSidedX,
|
|
496
587
|
},
|
|
497
588
|
user: params.user,
|
|
589
|
+
slippage: params.liquiditySlippage,
|
|
498
590
|
});
|
|
499
591
|
// Filter out non-meteora instructions
|
|
500
592
|
const ixs = (0, functions_1.getIxs)(txn).filter((ix) => ix.programId.equals(addresses_1.METEORA_DLMM_PROGRAM));
|
|
@@ -556,6 +648,7 @@ class MeteoraDLMM {
|
|
|
556
648
|
*/
|
|
557
649
|
addLiquidityByStrategy(connection, userWallet, payer, params, meteoraToHawksight) {
|
|
558
650
|
return __awaiter(this, void 0, void 0, function* () {
|
|
651
|
+
var _a, _b;
|
|
559
652
|
if (!!!params.skipInputTokenCheck) {
|
|
560
653
|
// Throw error if input token(s) do not exist on blockchain
|
|
561
654
|
yield (0, functions_1.inputTokenExists)(anchor_1.Anchor.instance().connection, userWallet, [
|
|
@@ -567,8 +660,8 @@ class MeteoraDLMM {
|
|
|
567
660
|
// AddLiquidityByStrategy instruction from Meteora API
|
|
568
661
|
const txn = yield this.dlmm.addLiquidityByStrategy({
|
|
569
662
|
positionPubKey: params.positionPubKey,
|
|
570
|
-
totalXAmount: params.totalXAmount,
|
|
571
|
-
totalYAmount: params.totalYAmount,
|
|
663
|
+
totalXAmount: (_a = params.liquidityXAmount) !== null && _a !== void 0 ? _a : params.totalXAmount,
|
|
664
|
+
totalYAmount: (_b = params.liquidityYAmount) !== null && _b !== void 0 ? _b : params.totalYAmount,
|
|
572
665
|
strategy: {
|
|
573
666
|
maxBinId: params.strategy.maxBinId,
|
|
574
667
|
minBinId: params.strategy.minBinId,
|