@hawksightco/hawk-sdk 1.3.224 → 1.3.225
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Transactions.d.ts","sourceRoot":"","sources":["../../../src/classes/Transactions.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAiBxC,OAAO,EACL,YAAY,EACZ,eAAe,EACf,YAAY,EACZ,eAAe,EACf,gBAAgB,EAChB,iBAAiB,EACjB,+BAA+B,EAC/B,kCAAkC,EAClC,cAAc,EACd,0BAA0B,EAC1B,gBAAgB,EAChB,eAAe,EACf,QAAQ,EACR,WAAW,EACX,6BAA6B,EAC7B,2BAA2B,EAC3B,4BAA4B,EAC5B,gBAAgB,EAChB,iBAAiB,EACjB,WAAW,EACX,YAAY,EACZ,aAAa,EACb,gBAAgB,EAChB,2BAA2B,EAC3B,iBAAiB,EACjB,iBAAiB,EAEjB,mBAAmB,EACnB,kBAAkB,EAClB,oBAAoB,EAEpB,gBAAgB,EAChB,wBAAwB,EACxB,+BAA+B,EAC/B,4BAA4B,EAC5B,iBAAiB,EAEjB,8BAA8B,EAE9B,4BAA4B,EAC5B,6BAA6B,EAC7B,iCAAiC,EAIjC,sCAAsC,EAEtC,4BAA4B,EAC5B,+BAA+B,EAC/B,+BAA+B,EAChC,MAAM,UAAU,CAAC;AAkDlB,OAAO,EAEL,wBAAwB,EACxB,mBAAmB,EACnB,wBAAwB,EACzB,MAAM,UAAU,CAAC;AAKlB,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAuBxD,qBAAa,YAAY;IACvB;;OAEG;IACH,OAAO;IAKP;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAe;IAEtC;;OAEG;IACI,EAAE,EAAE,iBAAiB,CAAC;IAE7B;;OAEG;IACH,OAAO,CAAC,OAAO,CAAmB;IAElC;;;;OAIG;IACH,MAAM,CAAC,WAAW,IAAI,YAAY;IAOlC;;;;;;OAMG;IACH,eAAe,CACb,UAAU,EAAE,IAAI,CAAC,SAAS,EAC1B,IAAI,GAAE,IAAI,CAAC,SAAqB,GAC/B,IAAI,CAAC,SAAS;IAIjB;;;;;;;OAOG;IACG,QAAQ,CAAC,EACb,UAAU,EACV,MAAM,GACP,EAAE,WAAW,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAyD/D;;;;;;OAMG;IACG,8BAA8B,CAAC,EACnC,UAAU,EACV,MAAM,GACP,EAAE,WAAW,CAAC,6BAA6B,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAmDpF;;;;;;;;;OASG;IACG,+BAA+B,CAAC,EACpC,UAAU,EACV,MAAM,GACP,EAAE,WAAW,CAAC,+BAA+B,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAuCtF;;;;;;;OAOG;IACG,kCAAkC,CAAC,EACvC,UAAU,EACV,MAAM,GACP,EAAE,WAAW,CAAC,kCAAkC,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAqCzF;;;;;;;OAOG;IACG,0BAA0B,CAAC,EAC/B,UAAU,EACV,MAAM,GACP,EAAE,WAAW,CAAC,0BAA0B,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAwBjF;;;;;;;OAOG;IACG,2BAA2B,CAAC,EAChC,UAAU,EACV,MAAM,GACP,EAAE,WAAW,CAAC,0BAA0B,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAmB3E,4BAA4B,CAAC,EACjC,UAAU,EACV,MAAM,GACP,EAAE,WAAW,CAAC,4BAA4B,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IA0EnF;;;;;;;;;OASG;IACG,cAAc,CAAC,EACnB,UAAU,EACV,MAAM,GACP,EAAE,WAAW,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAkDrE;;;;;;;;;OASG;IACG,eAAe,CAAC,EACpB,UAAU,EACV,MAAM,GACP,EAAE,WAAW,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAqGtE;;;;;;;OAOG;IACG,kBAAkB,CAAC,EACvB,UAAU,EACV,MAAM,GACP,EAAE,WAAW,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAuEtE;;;;;;;;;;;OAWG;IACG,4BAA4B,CAAC,EACjC,UAAU,EACV,MAAM,GACP,EAAE;QACD,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC;QAC5B,MAAM,EAAE,6BAA6B,CAAC;KACvC,GAAG,OAAO,CAAC,2BAA2B,EAAE,CAAC;IAuE1C;;;OAGG;YACW,wBAAwB;IAyBtC;;;OAGG;YACW,0BAA0B;
|
|
1
|
+
{"version":3,"file":"Transactions.d.ts","sourceRoot":"","sources":["../../../src/classes/Transactions.ts"],"names":[],"mappings":"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"}
|
|
@@ -773,6 +773,12 @@ class Transactions {
|
|
|
773
773
|
hasAmount: false,
|
|
774
774
|
});
|
|
775
775
|
mainInstructions.push(withdrawFromPdaIx);
|
|
776
|
+
// 6. Unwrap wSOL to native SOL (if either mint is wSOL)
|
|
777
|
+
const unwrapIxs = (0, functions_1.unwrapSolIfMintIsWsol)(params.userWallet, [
|
|
778
|
+
params.tokenXMint,
|
|
779
|
+
params.tokenYMint,
|
|
780
|
+
]);
|
|
781
|
+
mainInstructions.push(...unwrapIxs);
|
|
776
782
|
return mainInstructions;
|
|
777
783
|
});
|
|
778
784
|
}
|
|
@@ -820,6 +826,7 @@ class Transactions {
|
|
|
820
826
|
*/
|
|
821
827
|
meteoraClaimLargePosition(_a) {
|
|
822
828
|
return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
|
|
829
|
+
var _b;
|
|
823
830
|
// Determine lbPair and bin range
|
|
824
831
|
let lbPair;
|
|
825
832
|
let lowerBinId;
|
|
@@ -890,6 +897,31 @@ class Transactions {
|
|
|
890
897
|
});
|
|
891
898
|
instructions.push(claimRewardIx);
|
|
892
899
|
}
|
|
900
|
+
// Withdraw tokens from PDA back to user wallet
|
|
901
|
+
const withdrawMints = [
|
|
902
|
+
{ mint: resolved.tokenXMint, amount: new bn_js_1.default(0) },
|
|
903
|
+
{ mint: resolved.tokenYMint, amount: new bn_js_1.default(0) },
|
|
904
|
+
];
|
|
905
|
+
for (let rewardIndex = 0; rewardIndex < 2; rewardIndex++) {
|
|
906
|
+
const rewardInfo = resolved.lbPairInfo.rewardInfos[rewardIndex];
|
|
907
|
+
if (rewardInfo && !rewardInfo.mint.equals(web3.PublicKey.default)) {
|
|
908
|
+
withdrawMints.push({ mint: rewardInfo.mint, amount: new bn_js_1.default(0) });
|
|
909
|
+
}
|
|
910
|
+
}
|
|
911
|
+
const withdrawFromPdaIx = yield this.ix.iyfMain.withdrawMultipleTokenWithToken2022({
|
|
912
|
+
connection,
|
|
913
|
+
payer: params.userWallet,
|
|
914
|
+
withdraw: withdrawMints,
|
|
915
|
+
pdaTokenType: (_b = params.pdaTokenType) !== null && _b !== void 0 ? _b : types_1.TokenType.ATA,
|
|
916
|
+
hasAmount: false,
|
|
917
|
+
});
|
|
918
|
+
instructions.push(withdrawFromPdaIx);
|
|
919
|
+
// Unwrap wSOL to native SOL (if either mint is wSOL)
|
|
920
|
+
const unwrapIxs = (0, functions_1.unwrapSolIfMintIsWsol)(params.userWallet, [
|
|
921
|
+
resolved.tokenXMint,
|
|
922
|
+
resolved.tokenYMint,
|
|
923
|
+
]);
|
|
924
|
+
instructions.push(...unwrapIxs);
|
|
893
925
|
transactions.push(yield (0, functions_1.createTransactionMeta)({
|
|
894
926
|
payer: params.userWallet,
|
|
895
927
|
description: `Claim from large Meteora DLMM Position (chunk ${i + 1}/${chunks.length})`,
|
|
@@ -6429,6 +6461,7 @@ class Transactions {
|
|
|
6429
6461
|
combinedAccounts.push(...baseRemainingAccountsInfo.accounts);
|
|
6430
6462
|
for (const reward of rewardInfos) {
|
|
6431
6463
|
const rewardTransferHookInfo = yield (0, functions_1.fetchRemainingAccountsInfoForReward)(connection, reward.rewardMint, reward.rewardTokenProgram);
|
|
6464
|
+
reward.rewardRemainingAccountsInfo = rewardTransferHookInfo;
|
|
6432
6465
|
const transferHookLength = rewardTransferHookInfo.slices.length > 0
|
|
6433
6466
|
? rewardTransferHookInfo.slices[0].length
|
|
6434
6467
|
: 0;
|
|
@@ -6444,14 +6477,21 @@ class Transactions {
|
|
|
6444
6477
|
accounts: combinedAccounts,
|
|
6445
6478
|
};
|
|
6446
6479
|
// --- Estimate total amounts ---
|
|
6480
|
+
// When compound=true, fees are claimed via claimFee2Automation which takes an 8% hawk-side
|
|
6481
|
+
// cut (HARVEST_FEE_NUMERATOR=800, FEE_DENOMINATOR=10000). The net fee after cut is what's
|
|
6482
|
+
// available for re-deposit.
|
|
6447
6483
|
const positionData = userPosition.positionData;
|
|
6448
6484
|
const feeX = positionData.feeX;
|
|
6449
6485
|
const feeY = positionData.feeY;
|
|
6486
|
+
const HAWK_FEE_BPS = 800;
|
|
6487
|
+
const FEE_BPS_DENOM = 10000;
|
|
6488
|
+
const netFeeX = feeX.mul(new bn_js_1.default(FEE_BPS_DENOM - HAWK_FEE_BPS)).div(new bn_js_1.default(FEE_BPS_DENOM));
|
|
6489
|
+
const netFeeY = feeY.mul(new bn_js_1.default(FEE_BPS_DENOM - HAWK_FEE_BPS)).div(new bn_js_1.default(FEE_BPS_DENOM));
|
|
6450
6490
|
const estimatedTotalX = compound
|
|
6451
|
-
? new bn_js_1.default(positionData.totalXAmount).add(
|
|
6491
|
+
? new bn_js_1.default(positionData.totalXAmount).add(netFeeX)
|
|
6452
6492
|
: new bn_js_1.default(positionData.totalXAmount);
|
|
6453
6493
|
const estimatedTotalY = compound
|
|
6454
|
-
? new bn_js_1.default(positionData.totalYAmount).add(
|
|
6494
|
+
? new bn_js_1.default(positionData.totalYAmount).add(netFeeY)
|
|
6455
6495
|
: new bn_js_1.default(positionData.totalYAmount);
|
|
6456
6496
|
const _rebalanceLiquidityAutomation = (_a) => __awaiter(this, [_a], void 0, function* ({ position, maxDepositXAmount, maxDepositYAmount, pdaTokenType, shrinkMode, shouldClaimFee, shouldClaimReward, removeLiquidityParams, addLiquidityParams, maxActiveBinSlippage, }) {
|
|
6457
6497
|
return yield this.ix.meteoraDlmm.rebalanceLiquidityAutomation({
|
|
@@ -6491,62 +6531,61 @@ class Transactions {
|
|
|
6491
6531
|
});
|
|
6492
6532
|
});
|
|
6493
6533
|
const withdrawFn = (_a) => __awaiter(this, [_a], void 0, function* ({ position, minBinId, maxBinId, compound, origin, }) {
|
|
6494
|
-
|
|
6495
|
-
|
|
6496
|
-
|
|
6497
|
-
|
|
6498
|
-
|
|
6499
|
-
|
|
6500
|
-
|
|
6501
|
-
|
|
6502
|
-
|
|
6503
|
-
|
|
6504
|
-
|
|
6505
|
-
|
|
6506
|
-
|
|
6507
|
-
|
|
6508
|
-
|
|
6509
|
-
|
|
6510
|
-
|
|
6511
|
-
|
|
6512
|
-
|
|
6513
|
-
|
|
6514
|
-
|
|
6515
|
-
|
|
6516
|
-
|
|
6517
|
-
|
|
6518
|
-
|
|
6519
|
-
|
|
6520
|
-
|
|
6521
|
-
|
|
6522
|
-
shrinkMode: types_3.ShrinkMode.NoShrinkBoth,
|
|
6523
|
-
shouldClaimFee: false,
|
|
6524
|
-
// Note:
|
|
6525
|
-
// User Reward Token is not affected by this parameter. It's always STA regardless.
|
|
6526
|
-
// pdaTokenType only affects token deposits (which essentially are fees as well)
|
|
6527
|
-
pdaTokenType: types_1.TokenType.ATA,
|
|
6528
|
-
})
|
|
6529
|
-
},
|
|
6530
|
-
// Claim fees and shrink position
|
|
6531
|
-
{
|
|
6532
|
-
label: 'claim_fees_using_rbl',
|
|
6533
|
-
class: 'withdrawFn',
|
|
6534
|
-
instruction: yield _withdrawFn({
|
|
6534
|
+
const pdaTokenTypeForClaimables = compound ? types_1.TokenType.ATA : types_1.TokenType.STA;
|
|
6535
|
+
const ixs = [];
|
|
6536
|
+
// 1. Claim fees with hawk-side cut (must happen before withdraw+shrink invalidates position)
|
|
6537
|
+
ixs.push({
|
|
6538
|
+
label: 'claim_fee',
|
|
6539
|
+
class: origin,
|
|
6540
|
+
instruction: yield this.ix.meteoraDlmm.claimFee2Automation(connection, {
|
|
6541
|
+
userWallet,
|
|
6542
|
+
lbPair,
|
|
6543
|
+
position,
|
|
6544
|
+
tokenMintX: tokenXMint,
|
|
6545
|
+
tokenMintY: tokenYMint,
|
|
6546
|
+
tokenProgramX: tokenXProgram,
|
|
6547
|
+
tokenProgramY: tokenYProgram,
|
|
6548
|
+
lowerBinId: minBinId,
|
|
6549
|
+
upperBinId: maxBinId,
|
|
6550
|
+
pdaTokenType: pdaTokenTypeForClaimables,
|
|
6551
|
+
remainingAccountsInfo: baseRemainingAccountsInfo,
|
|
6552
|
+
}),
|
|
6553
|
+
});
|
|
6554
|
+
// 2. Claim rewards with hawk-side cut (must happen before withdraw+shrink invalidates position)
|
|
6555
|
+
for (const reward of rewardInfos) {
|
|
6556
|
+
ixs.push({
|
|
6557
|
+
label: 'claim_reward',
|
|
6558
|
+
class: origin,
|
|
6559
|
+
instruction: yield this.ix.meteoraDlmm.claimReward2Automation(connection, {
|
|
6560
|
+
userWallet,
|
|
6561
|
+
lbPair,
|
|
6535
6562
|
position,
|
|
6536
|
-
|
|
6537
|
-
|
|
6538
|
-
|
|
6539
|
-
|
|
6540
|
-
|
|
6541
|
-
|
|
6542
|
-
shouldClaimFee: true,
|
|
6543
|
-
// Note (continuation):
|
|
6544
|
-
// That is why we split it to 2 ix, because we want fees to be transfered to STA if
|
|
6545
|
-
// compound is off
|
|
6563
|
+
rewardIndex: reward.rewardIndex,
|
|
6564
|
+
rewardMint: reward.rewardMint,
|
|
6565
|
+
rewardVault: reward.rewardVault,
|
|
6566
|
+
tokenProgram: reward.rewardTokenProgram,
|
|
6567
|
+
lowerBinId: minBinId,
|
|
6568
|
+
upperBinId: maxBinId,
|
|
6546
6569
|
pdaTokenType: types_1.TokenType.STA,
|
|
6547
|
-
|
|
6548
|
-
|
|
6549
|
-
|
|
6570
|
+
remainingAccountsInfo: reward.rewardRemainingAccountsInfo,
|
|
6571
|
+
}),
|
|
6572
|
+
});
|
|
6573
|
+
}
|
|
6574
|
+
// 3. Withdraw liquidity + shrink (position may be invalidated after this)
|
|
6575
|
+
ixs.push({
|
|
6576
|
+
label: 'withdraw_using_rbl',
|
|
6577
|
+
class: origin,
|
|
6578
|
+
instruction: yield _withdrawFn({
|
|
6579
|
+
position,
|
|
6580
|
+
minBinId,
|
|
6581
|
+
maxBinId,
|
|
6582
|
+
shouldClaimReward: false,
|
|
6583
|
+
shouldClaimFee: false,
|
|
6584
|
+
shrinkMode: types_3.ShrinkMode.Default,
|
|
6585
|
+
pdaTokenType: types_1.TokenType.ATA,
|
|
6586
|
+
}),
|
|
6587
|
+
});
|
|
6588
|
+
return ixs;
|
|
6550
6589
|
});
|
|
6551
6590
|
const depositFn = (_a) => __awaiter(this, [_a], void 0, function* ({ position, maxDepositXAmount, maxDepositYAmount, pdaTokenType, addLiquidityParams, origin, }) {
|
|
6552
6591
|
return {
|
|
@@ -6580,6 +6619,7 @@ class Transactions {
|
|
|
6580
6619
|
tokenYMint,
|
|
6581
6620
|
tokenXProgram,
|
|
6582
6621
|
tokenYProgram,
|
|
6622
|
+
baseRemainingAccountsInfo,
|
|
6583
6623
|
remainingAccountsInfo,
|
|
6584
6624
|
rewardInfos,
|
|
6585
6625
|
estimatedTotalX,
|