@hawksightco/hawk-sdk 1.3.151 → 1.3.153
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/src/classes/Transactions.d.ts.map +1 -1
- package/dist/src/classes/Transactions.js +31 -9
- package/dist/src/classes/TxGenerator.d.ts.map +1 -1
- package/dist/src/classes/TxGenerator.js +270 -0
- package/dist/src/hsToMeteora.js +13 -8
- package/dist/src/ixGenerator/MeteoraDlmmIxGenerator.d.ts +24 -0
- package/dist/src/ixGenerator/MeteoraDlmmIxGenerator.d.ts.map +1 -1
- package/dist/src/ixGenerator/MeteoraDlmmIxGenerator.js +102 -0
- package/dist/src/meteora.d.ts +26 -0
- package/dist/src/meteora.d.ts.map +1 -1
- package/dist/src/meteora.js +63 -55
- package/dist/src/pdaGenerator/MeteoraPdaGenerator.d.ts +2 -0
- package/dist/src/pdaGenerator/MeteoraPdaGenerator.d.ts.map +1 -1
- package/dist/src/pdaGenerator/MeteoraPdaGenerator.js +20 -0
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Transactions.d.ts","sourceRoot":"","sources":["../../../src/classes/Transactions.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAqBxC,OAAO,EACL,YAAY,EACZ,eAAe,EACf,YAAY,EACZ,eAAe,EACf,+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,kBAAkB,EAClB,oBAAoB,EAEpB,gBAAgB,EAChB,+BAA+B,EAC/B,4BAA4B,EAC5B,iBAAiB,EAClB,MAAM,UAAU,CAAC;AA+BlB,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;AAqBxD,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;;;;;;;OAOG;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;;;;;;;OAOG;IACG,cAAc,CAAC,EACnB,UAAU,EACV,MAAM,GACP,EAAE,WAAW,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAkDrE;;;;;;;OAOG;IACG,eAAe,CAAC,EACpB,UAAU,EACV,MAAM,GACP,EAAE,WAAW,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"Transactions.d.ts","sourceRoot":"","sources":["../../../src/classes/Transactions.ts"],"names":[],"mappings":"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"}
|
|
@@ -463,15 +463,37 @@ class Transactions {
|
|
|
463
463
|
const amountBps = params.shouldClaimAndClose
|
|
464
464
|
? new bn_js_1.default(10000)
|
|
465
465
|
: params.amountBps;
|
|
466
|
-
const mainInstructions =
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
|
|
466
|
+
const mainInstructions = yield (() => __awaiter(this, void 0, void 0, function* () {
|
|
467
|
+
try {
|
|
468
|
+
const mainInstructions = (yield dlmmPool.removeLiquidity(connection, params.userWallet, params.userWallet, {
|
|
469
|
+
user: userPda,
|
|
470
|
+
position: params.position,
|
|
471
|
+
fromBinId: lowerBinId,
|
|
472
|
+
toBinId: upperBinId,
|
|
473
|
+
bps: amountBps,
|
|
474
|
+
shouldClaimAndClose: params.shouldClaimAndClose,
|
|
475
|
+
pdaTokenType: params.pdaTokenType,
|
|
476
|
+
}, hsToMeteora_1.meteoraToHawksight)).default();
|
|
477
|
+
return mainInstructions;
|
|
478
|
+
}
|
|
479
|
+
catch (error) {
|
|
480
|
+
if (error instanceof Error && error.message.includes('No liquidity to remove')) {
|
|
481
|
+
console.warn('No liquidity to remove, closing position instead.');
|
|
482
|
+
const { userPositions } = yield dlmmPool.getPositionsByUserAndLbPair(userPda);
|
|
483
|
+
const index = userPositions.findIndex(v => v.publicKey.equals(params.position));
|
|
484
|
+
const fn = new meteora_1.MeteoraFunctions(this.ix);
|
|
485
|
+
const claimFeeAndRewardIxs = (yield fn.claimFeeAndRewardIxs2(connection, [params.position], params.userWallet, userPda, hsToMeteora_1.meteoraToHawksight, lbPair)).default();
|
|
486
|
+
const mainInstructions = yield dlmmPool.closePosition(params.userWallet, {
|
|
487
|
+
owner: userPda,
|
|
488
|
+
position: userPositions[index],
|
|
489
|
+
}, hsToMeteora_1.meteoraToHawksight);
|
|
490
|
+
return [...claimFeeAndRewardIxs, ...mainInstructions];
|
|
491
|
+
}
|
|
492
|
+
else {
|
|
493
|
+
throw error;
|
|
494
|
+
}
|
|
495
|
+
}
|
|
496
|
+
}))();
|
|
475
497
|
let description;
|
|
476
498
|
if (params.shouldClaimAndClose) {
|
|
477
499
|
description =
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TxGenerator.d.ts","sourceRoot":"","sources":["../../../src/classes/TxGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,KAAK,OAAO,MAAM,6BAA6B,CAAC;AACvD,OAAO,EACL,6BAA6B,EAC7B,kBAAkB,EAClB,iBAAiB,EACjB,kBAAkB,EAClB,mBAAmB,EAInB,YAAY,EACZ,WAAW,EACX,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,eAAe,EACf,kCAAkC,EAClC,mBAAmB,EACnB,oBAAoB,EACpB,wBAAwB,EACxB,wBAAwB,EACxB,aAAa,EACb,sBAAsB,EACtB,qBAAqB,EACrB,SAAS,EACT,+BAA+B,EAE/B,4BAA4B,EAC5B,0BAA0B,EAC1B,iBAAiB,EAClB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAQlC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EAAE,MAAM,OAAO,CAAC;AAEvB,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAG1D,KAAK,kBAAkB,GAAG;IACxB,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,OAAO,EAAE;QACP,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;QACrB,MAAM,EAAE,EAAE,CAAC;KACZ,EAAE,CAAC;CACL,CAAC;AAEF,KAAK,qBAAqB,GAAG;IAC3B,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,QAAQ,EAAE;QACR,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;QACrB,MAAM,EAAE,EAAE,CAAC;KACZ,EAAE,CAAC;IACJ,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF;;;;GAIG;AACH,qBAAa,WAAW;IAiBpB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc;IAjBnD;;OAEG;IACI,EAAE,EAAE,iBAAiB,CAAC;IAE7B;;OAEG;IACI,GAAG,EAAE,kBAAkB,CAAC;IAE/B;;;;OAIG;gBAEgB,MAAM,EAAE,MAAM,EACZ,cAAc,EAAE,cAAc;IAMnD;;;;;;;;OAQG;IACG,iBAAiB,CACrB,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,iBAAiB,GACxB,OAAO,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"TxGenerator.d.ts","sourceRoot":"","sources":["../../../src/classes/TxGenerator.ts"],"names":[],"mappings":"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"}
|
|
@@ -97,6 +97,16 @@ class TxGenerator {
|
|
|
97
97
|
};
|
|
98
98
|
}
|
|
99
99
|
catch (e) {
|
|
100
|
+
if (e instanceof Error) {
|
|
101
|
+
return {
|
|
102
|
+
status: 400,
|
|
103
|
+
data: {
|
|
104
|
+
code: "custom",
|
|
105
|
+
message: e.message,
|
|
106
|
+
path: [],
|
|
107
|
+
},
|
|
108
|
+
};
|
|
109
|
+
}
|
|
100
110
|
return {
|
|
101
111
|
status: 400,
|
|
102
112
|
data: {
|
|
@@ -132,6 +142,16 @@ class TxGenerator {
|
|
|
132
142
|
};
|
|
133
143
|
}
|
|
134
144
|
catch (e) {
|
|
145
|
+
if (e instanceof Error) {
|
|
146
|
+
return {
|
|
147
|
+
status: 400,
|
|
148
|
+
data: {
|
|
149
|
+
code: "custom",
|
|
150
|
+
message: e.message,
|
|
151
|
+
path: [],
|
|
152
|
+
},
|
|
153
|
+
};
|
|
154
|
+
}
|
|
135
155
|
return {
|
|
136
156
|
status: 400,
|
|
137
157
|
data: {
|
|
@@ -168,6 +188,16 @@ class TxGenerator {
|
|
|
168
188
|
};
|
|
169
189
|
}
|
|
170
190
|
catch (e) {
|
|
191
|
+
if (e instanceof Error) {
|
|
192
|
+
return {
|
|
193
|
+
status: 400,
|
|
194
|
+
data: {
|
|
195
|
+
code: "custom",
|
|
196
|
+
message: e.message,
|
|
197
|
+
path: [],
|
|
198
|
+
},
|
|
199
|
+
};
|
|
200
|
+
}
|
|
171
201
|
return {
|
|
172
202
|
status: 400,
|
|
173
203
|
data: {
|
|
@@ -203,6 +233,16 @@ class TxGenerator {
|
|
|
203
233
|
};
|
|
204
234
|
}
|
|
205
235
|
catch (e) {
|
|
236
|
+
if (e instanceof Error) {
|
|
237
|
+
return {
|
|
238
|
+
status: 400,
|
|
239
|
+
data: {
|
|
240
|
+
code: "custom",
|
|
241
|
+
message: e.message,
|
|
242
|
+
path: [],
|
|
243
|
+
},
|
|
244
|
+
};
|
|
245
|
+
}
|
|
206
246
|
return {
|
|
207
247
|
status: 400,
|
|
208
248
|
data: {
|
|
@@ -366,6 +406,16 @@ class TxGenerator {
|
|
|
366
406
|
};
|
|
367
407
|
}
|
|
368
408
|
catch (e) {
|
|
409
|
+
if (e instanceof Error) {
|
|
410
|
+
return {
|
|
411
|
+
status: 400,
|
|
412
|
+
data: {
|
|
413
|
+
code: "custom",
|
|
414
|
+
message: e.message,
|
|
415
|
+
path: [],
|
|
416
|
+
},
|
|
417
|
+
};
|
|
418
|
+
}
|
|
369
419
|
return {
|
|
370
420
|
status: 400,
|
|
371
421
|
data: {
|
|
@@ -412,6 +462,16 @@ class TxGenerator {
|
|
|
412
462
|
};
|
|
413
463
|
}
|
|
414
464
|
catch (e) {
|
|
465
|
+
if (e instanceof Error) {
|
|
466
|
+
return {
|
|
467
|
+
status: 400,
|
|
468
|
+
data: {
|
|
469
|
+
code: "custom",
|
|
470
|
+
message: e.message,
|
|
471
|
+
path: [],
|
|
472
|
+
},
|
|
473
|
+
};
|
|
474
|
+
}
|
|
415
475
|
return {
|
|
416
476
|
status: 400,
|
|
417
477
|
data: {
|
|
@@ -459,6 +519,16 @@ class TxGenerator {
|
|
|
459
519
|
};
|
|
460
520
|
}
|
|
461
521
|
catch (e) {
|
|
522
|
+
if (e instanceof Error) {
|
|
523
|
+
return {
|
|
524
|
+
status: 400,
|
|
525
|
+
data: {
|
|
526
|
+
code: "custom",
|
|
527
|
+
message: e.message,
|
|
528
|
+
path: [],
|
|
529
|
+
},
|
|
530
|
+
};
|
|
531
|
+
}
|
|
462
532
|
return {
|
|
463
533
|
status: 400,
|
|
464
534
|
data: {
|
|
@@ -508,6 +578,16 @@ class TxGenerator {
|
|
|
508
578
|
};
|
|
509
579
|
}
|
|
510
580
|
catch (e) {
|
|
581
|
+
if (e instanceof Error) {
|
|
582
|
+
return {
|
|
583
|
+
status: 400,
|
|
584
|
+
data: {
|
|
585
|
+
code: "custom",
|
|
586
|
+
message: e.message,
|
|
587
|
+
path: [],
|
|
588
|
+
},
|
|
589
|
+
};
|
|
590
|
+
}
|
|
511
591
|
return {
|
|
512
592
|
status: 400,
|
|
513
593
|
data: {
|
|
@@ -557,6 +637,16 @@ class TxGenerator {
|
|
|
557
637
|
};
|
|
558
638
|
}
|
|
559
639
|
catch (e) {
|
|
640
|
+
if (e instanceof Error) {
|
|
641
|
+
return {
|
|
642
|
+
status: 400,
|
|
643
|
+
data: {
|
|
644
|
+
code: "custom",
|
|
645
|
+
message: e.message,
|
|
646
|
+
path: [],
|
|
647
|
+
},
|
|
648
|
+
};
|
|
649
|
+
}
|
|
560
650
|
return {
|
|
561
651
|
status: 400,
|
|
562
652
|
data: {
|
|
@@ -604,6 +694,16 @@ class TxGenerator {
|
|
|
604
694
|
};
|
|
605
695
|
}
|
|
606
696
|
catch (e) {
|
|
697
|
+
if (e instanceof Error) {
|
|
698
|
+
return {
|
|
699
|
+
status: 400,
|
|
700
|
+
data: {
|
|
701
|
+
code: "custom",
|
|
702
|
+
message: `${e.message} at ${e.stack}`,
|
|
703
|
+
path: [],
|
|
704
|
+
},
|
|
705
|
+
};
|
|
706
|
+
}
|
|
607
707
|
return {
|
|
608
708
|
status: 400,
|
|
609
709
|
data: {
|
|
@@ -666,6 +766,16 @@ class TxGenerator {
|
|
|
666
766
|
};
|
|
667
767
|
}
|
|
668
768
|
catch (e) {
|
|
769
|
+
if (e instanceof Error) {
|
|
770
|
+
return {
|
|
771
|
+
status: 400,
|
|
772
|
+
data: {
|
|
773
|
+
code: "custom",
|
|
774
|
+
message: e.message,
|
|
775
|
+
path: [],
|
|
776
|
+
},
|
|
777
|
+
};
|
|
778
|
+
}
|
|
669
779
|
return {
|
|
670
780
|
status: 400,
|
|
671
781
|
data: {
|
|
@@ -706,6 +816,16 @@ class TxGenerator {
|
|
|
706
816
|
};
|
|
707
817
|
}
|
|
708
818
|
catch (e) {
|
|
819
|
+
if (e instanceof Error) {
|
|
820
|
+
return {
|
|
821
|
+
status: 400,
|
|
822
|
+
data: {
|
|
823
|
+
code: "custom",
|
|
824
|
+
message: e.message,
|
|
825
|
+
path: [],
|
|
826
|
+
},
|
|
827
|
+
};
|
|
828
|
+
}
|
|
709
829
|
return {
|
|
710
830
|
status: 400,
|
|
711
831
|
data: {
|
|
@@ -741,6 +861,16 @@ class TxGenerator {
|
|
|
741
861
|
};
|
|
742
862
|
}
|
|
743
863
|
catch (e) {
|
|
864
|
+
if (e instanceof Error) {
|
|
865
|
+
return {
|
|
866
|
+
status: 400,
|
|
867
|
+
data: {
|
|
868
|
+
code: "custom",
|
|
869
|
+
message: e.message,
|
|
870
|
+
path: [],
|
|
871
|
+
},
|
|
872
|
+
};
|
|
873
|
+
}
|
|
744
874
|
return {
|
|
745
875
|
status: 400,
|
|
746
876
|
data: {
|
|
@@ -768,6 +898,16 @@ class TxGenerator {
|
|
|
768
898
|
};
|
|
769
899
|
}
|
|
770
900
|
catch (e) {
|
|
901
|
+
if (e instanceof Error) {
|
|
902
|
+
return {
|
|
903
|
+
status: 400,
|
|
904
|
+
data: {
|
|
905
|
+
code: "custom",
|
|
906
|
+
message: e.message,
|
|
907
|
+
path: [],
|
|
908
|
+
},
|
|
909
|
+
};
|
|
910
|
+
}
|
|
771
911
|
return {
|
|
772
912
|
status: 400,
|
|
773
913
|
data: {
|
|
@@ -809,6 +949,16 @@ class TxGenerator {
|
|
|
809
949
|
};
|
|
810
950
|
}
|
|
811
951
|
catch (e) {
|
|
952
|
+
if (e instanceof Error) {
|
|
953
|
+
return {
|
|
954
|
+
status: 400,
|
|
955
|
+
data: {
|
|
956
|
+
code: "custom",
|
|
957
|
+
message: e.message,
|
|
958
|
+
path: [],
|
|
959
|
+
},
|
|
960
|
+
};
|
|
961
|
+
}
|
|
812
962
|
return {
|
|
813
963
|
status: 400,
|
|
814
964
|
data: {
|
|
@@ -847,6 +997,16 @@ class TxGenerator {
|
|
|
847
997
|
};
|
|
848
998
|
}
|
|
849
999
|
catch (e) {
|
|
1000
|
+
if (e instanceof Error) {
|
|
1001
|
+
return {
|
|
1002
|
+
status: 400,
|
|
1003
|
+
data: {
|
|
1004
|
+
code: "custom",
|
|
1005
|
+
message: e.message,
|
|
1006
|
+
path: [],
|
|
1007
|
+
},
|
|
1008
|
+
};
|
|
1009
|
+
}
|
|
850
1010
|
return {
|
|
851
1011
|
status: 400,
|
|
852
1012
|
data: {
|
|
@@ -889,6 +1049,16 @@ class TxGenerator {
|
|
|
889
1049
|
};
|
|
890
1050
|
}
|
|
891
1051
|
catch (e) {
|
|
1052
|
+
if (e instanceof Error) {
|
|
1053
|
+
return {
|
|
1054
|
+
status: 400,
|
|
1055
|
+
data: {
|
|
1056
|
+
code: "custom",
|
|
1057
|
+
message: e.message,
|
|
1058
|
+
path: [],
|
|
1059
|
+
},
|
|
1060
|
+
};
|
|
1061
|
+
}
|
|
892
1062
|
return {
|
|
893
1063
|
status: 400,
|
|
894
1064
|
data: {
|
|
@@ -930,6 +1100,16 @@ class TxGenerator {
|
|
|
930
1100
|
};
|
|
931
1101
|
}
|
|
932
1102
|
catch (e) {
|
|
1103
|
+
if (e instanceof Error) {
|
|
1104
|
+
return {
|
|
1105
|
+
status: 400,
|
|
1106
|
+
data: {
|
|
1107
|
+
code: "custom",
|
|
1108
|
+
message: e.message,
|
|
1109
|
+
path: [],
|
|
1110
|
+
},
|
|
1111
|
+
};
|
|
1112
|
+
}
|
|
933
1113
|
return {
|
|
934
1114
|
status: 400,
|
|
935
1115
|
data: {
|
|
@@ -970,6 +1150,16 @@ class TxGenerator {
|
|
|
970
1150
|
};
|
|
971
1151
|
}
|
|
972
1152
|
catch (e) {
|
|
1153
|
+
if (e instanceof Error) {
|
|
1154
|
+
return {
|
|
1155
|
+
status: 400,
|
|
1156
|
+
data: {
|
|
1157
|
+
code: "custom",
|
|
1158
|
+
message: e.message,
|
|
1159
|
+
path: [],
|
|
1160
|
+
},
|
|
1161
|
+
};
|
|
1162
|
+
}
|
|
973
1163
|
return {
|
|
974
1164
|
status: 400,
|
|
975
1165
|
data: {
|
|
@@ -1009,6 +1199,16 @@ class TxGenerator {
|
|
|
1009
1199
|
};
|
|
1010
1200
|
}
|
|
1011
1201
|
catch (e) {
|
|
1202
|
+
if (e instanceof Error) {
|
|
1203
|
+
return {
|
|
1204
|
+
status: 400,
|
|
1205
|
+
data: {
|
|
1206
|
+
code: "custom",
|
|
1207
|
+
message: e.message,
|
|
1208
|
+
path: [],
|
|
1209
|
+
},
|
|
1210
|
+
};
|
|
1211
|
+
}
|
|
1012
1212
|
return {
|
|
1013
1213
|
status: 400,
|
|
1014
1214
|
data: {
|
|
@@ -1044,6 +1244,16 @@ class TxGenerator {
|
|
|
1044
1244
|
};
|
|
1045
1245
|
}
|
|
1046
1246
|
catch (e) {
|
|
1247
|
+
if (e instanceof Error) {
|
|
1248
|
+
return {
|
|
1249
|
+
status: 400,
|
|
1250
|
+
data: {
|
|
1251
|
+
code: "custom",
|
|
1252
|
+
message: e.message,
|
|
1253
|
+
path: [],
|
|
1254
|
+
},
|
|
1255
|
+
};
|
|
1256
|
+
}
|
|
1047
1257
|
return {
|
|
1048
1258
|
status: 400,
|
|
1049
1259
|
data: {
|
|
@@ -1083,6 +1293,16 @@ class TxGenerator {
|
|
|
1083
1293
|
};
|
|
1084
1294
|
}
|
|
1085
1295
|
catch (e) {
|
|
1296
|
+
if (e instanceof Error) {
|
|
1297
|
+
return {
|
|
1298
|
+
status: 400,
|
|
1299
|
+
data: {
|
|
1300
|
+
code: "custom",
|
|
1301
|
+
message: e.message,
|
|
1302
|
+
path: [],
|
|
1303
|
+
},
|
|
1304
|
+
};
|
|
1305
|
+
}
|
|
1086
1306
|
return {
|
|
1087
1307
|
status: 400,
|
|
1088
1308
|
data: {
|
|
@@ -1110,6 +1330,16 @@ class TxGenerator {
|
|
|
1110
1330
|
};
|
|
1111
1331
|
}
|
|
1112
1332
|
catch (e) {
|
|
1333
|
+
if (e instanceof Error) {
|
|
1334
|
+
return {
|
|
1335
|
+
status: 400,
|
|
1336
|
+
data: {
|
|
1337
|
+
code: "custom",
|
|
1338
|
+
message: e.message,
|
|
1339
|
+
path: [],
|
|
1340
|
+
},
|
|
1341
|
+
};
|
|
1342
|
+
}
|
|
1113
1343
|
return {
|
|
1114
1344
|
status: 400,
|
|
1115
1345
|
data: {
|
|
@@ -1137,6 +1367,16 @@ class TxGenerator {
|
|
|
1137
1367
|
};
|
|
1138
1368
|
}
|
|
1139
1369
|
catch (e) {
|
|
1370
|
+
if (e instanceof Error) {
|
|
1371
|
+
return {
|
|
1372
|
+
status: 400,
|
|
1373
|
+
data: {
|
|
1374
|
+
code: "custom",
|
|
1375
|
+
message: e.message,
|
|
1376
|
+
path: [],
|
|
1377
|
+
},
|
|
1378
|
+
};
|
|
1379
|
+
}
|
|
1140
1380
|
return {
|
|
1141
1381
|
status: 400,
|
|
1142
1382
|
data: {
|
|
@@ -1164,6 +1404,16 @@ class TxGenerator {
|
|
|
1164
1404
|
};
|
|
1165
1405
|
}
|
|
1166
1406
|
catch (e) {
|
|
1407
|
+
if (e instanceof Error) {
|
|
1408
|
+
return {
|
|
1409
|
+
status: 400,
|
|
1410
|
+
data: {
|
|
1411
|
+
code: "custom",
|
|
1412
|
+
message: e.message,
|
|
1413
|
+
path: [],
|
|
1414
|
+
},
|
|
1415
|
+
};
|
|
1416
|
+
}
|
|
1167
1417
|
return {
|
|
1168
1418
|
status: 400,
|
|
1169
1419
|
data: {
|
|
@@ -1191,6 +1441,16 @@ class TxGenerator {
|
|
|
1191
1441
|
};
|
|
1192
1442
|
}
|
|
1193
1443
|
catch (e) {
|
|
1444
|
+
if (e instanceof Error) {
|
|
1445
|
+
return {
|
|
1446
|
+
status: 400,
|
|
1447
|
+
data: {
|
|
1448
|
+
code: "custom",
|
|
1449
|
+
message: e.message,
|
|
1450
|
+
path: [],
|
|
1451
|
+
},
|
|
1452
|
+
};
|
|
1453
|
+
}
|
|
1194
1454
|
return {
|
|
1195
1455
|
status: 400,
|
|
1196
1456
|
data: {
|
|
@@ -1218,6 +1478,16 @@ class TxGenerator {
|
|
|
1218
1478
|
};
|
|
1219
1479
|
}
|
|
1220
1480
|
catch (e) {
|
|
1481
|
+
if (e instanceof Error) {
|
|
1482
|
+
return {
|
|
1483
|
+
status: 400,
|
|
1484
|
+
data: {
|
|
1485
|
+
code: "custom",
|
|
1486
|
+
message: e.message,
|
|
1487
|
+
path: [],
|
|
1488
|
+
},
|
|
1489
|
+
};
|
|
1490
|
+
}
|
|
1221
1491
|
return {
|
|
1222
1492
|
status: 400,
|
|
1223
1493
|
data: {
|
package/dist/src/hsToMeteora.js
CHANGED
|
@@ -903,16 +903,20 @@ class ClaimReward extends HawksightMeteoraCpi {
|
|
|
903
903
|
* @param authority The authority public key that has signing capabilities over the transaction.
|
|
904
904
|
*/
|
|
905
905
|
constructor(ix, userPda, authority, opt, sighash = util.sighash("ClaimReward")) {
|
|
906
|
+
console.log('ClaimReward constructor...');
|
|
906
907
|
super(ix, userPda, authority, sighash, opt);
|
|
907
908
|
}
|
|
908
909
|
getMint() {
|
|
910
|
+
console.log('ClaimReward getMint...');
|
|
909
911
|
return this.ix.keys[6].pubkey;
|
|
910
912
|
}
|
|
911
913
|
replaceSigner() {
|
|
914
|
+
console.log('ClaimReward replaceSigner...');
|
|
912
915
|
this.ix.keys[4].pubkey = this.userPda;
|
|
913
916
|
this.ix.keys[4].isSigner = false;
|
|
914
917
|
}
|
|
915
918
|
replaceTokenInputs(token) {
|
|
919
|
+
console.log('ClaimReward replaceTokenInputs...');
|
|
916
920
|
this.ix.keys[5].pubkey = token;
|
|
917
921
|
}
|
|
918
922
|
/**
|
|
@@ -920,6 +924,7 @@ class ClaimReward extends HawksightMeteoraCpi {
|
|
|
920
924
|
*/
|
|
921
925
|
replace() {
|
|
922
926
|
var _a;
|
|
927
|
+
console.log('ClaimReward or ClaimReward2 replace...');
|
|
923
928
|
this.replaceSigner();
|
|
924
929
|
const rewardMint = this.getMint();
|
|
925
930
|
const mintInfo = AccountCache_1.AccountCache.get(rewardMint);
|
|
@@ -1021,26 +1026,26 @@ class ClaimReward2 extends ClaimReward {
|
|
|
1021
1026
|
super(ix, userPda, authority, opt, sighash);
|
|
1022
1027
|
}
|
|
1023
1028
|
getMint() {
|
|
1024
|
-
return this.ix.keys[
|
|
1029
|
+
return this.ix.keys[4].pubkey;
|
|
1025
1030
|
}
|
|
1026
1031
|
replaceSigner() {
|
|
1027
|
-
this.ix.keys[
|
|
1028
|
-
this.ix.keys[
|
|
1032
|
+
this.ix.keys[2].pubkey = this.userPda;
|
|
1033
|
+
this.ix.keys[2].isSigner = false;
|
|
1029
1034
|
}
|
|
1030
1035
|
replaceTokenInputs(token) {
|
|
1031
|
-
this.ix.keys[
|
|
1036
|
+
this.ix.keys[5].pubkey = token;
|
|
1032
1037
|
}
|
|
1033
1038
|
generateMeteoraDlmmClaimRewardIx(ownerFee) {
|
|
1034
1039
|
return __awaiter(this, void 0, void 0, function* () {
|
|
1035
1040
|
// Common parameters
|
|
1036
1041
|
const userPda = this.userPda;
|
|
1037
1042
|
const authority = this.authority;
|
|
1038
|
-
// New meteora parameters
|
|
1039
|
-
const minBinId = this.ix.data.readInt32LE(12);
|
|
1040
|
-
const maxBinId = this.ix.data.readInt32LE(16);
|
|
1041
|
-
const remainingAccountsInfo = this.ix.data.subarray(24);
|
|
1042
1043
|
// Get reward index from parameter
|
|
1043
1044
|
const rewardIndex = Number(this.ix.data.readBigInt64LE(8).toString());
|
|
1045
|
+
// New meteora parameters
|
|
1046
|
+
const minBinId = this.ix.data.readInt32LE(16);
|
|
1047
|
+
const maxBinId = this.ix.data.readInt32LE(20);
|
|
1048
|
+
const remainingAccountsInfo = this.ix.data.subarray(24);
|
|
1044
1049
|
// Generate IX via extension contract
|
|
1045
1050
|
// @ts-ignore
|
|
1046
1051
|
const claimReward = yield anchor_1.Anchor.instance().iyfExtension.methods
|
|
@@ -154,6 +154,28 @@ type MeteoraDlmmInitializeBinArrayParams = {
|
|
|
154
154
|
lowerBinId: number;
|
|
155
155
|
upperBinId: number;
|
|
156
156
|
};
|
|
157
|
+
type MeteoraDlmmClaimFee2Params = {
|
|
158
|
+
userWallet: web3.PublicKey;
|
|
159
|
+
lbPair: web3.PublicKey;
|
|
160
|
+
position: web3.PublicKey;
|
|
161
|
+
tokenMintX: web3.PublicKey;
|
|
162
|
+
tokenMintY: web3.PublicKey;
|
|
163
|
+
tokenProgramX: web3.PublicKey;
|
|
164
|
+
tokenProgramY: web3.PublicKey;
|
|
165
|
+
lowerBinId: number;
|
|
166
|
+
upperBinId: number;
|
|
167
|
+
};
|
|
168
|
+
type MeteoraDlmmClaimReward2Params = {
|
|
169
|
+
userWallet: web3.PublicKey;
|
|
170
|
+
lbPair: web3.PublicKey;
|
|
171
|
+
position: web3.PublicKey;
|
|
172
|
+
rewardIndex: number;
|
|
173
|
+
rewardMint: web3.PublicKey;
|
|
174
|
+
rewardVault: web3.PublicKey;
|
|
175
|
+
tokenProgram: web3.PublicKey;
|
|
176
|
+
lowerBinId: number;
|
|
177
|
+
upperBinId: number;
|
|
178
|
+
};
|
|
157
179
|
/**
|
|
158
180
|
* Meteora related instructions executed via iyf extension or iyf main
|
|
159
181
|
*/
|
|
@@ -165,7 +187,9 @@ export declare class MeteoraDlmmIxGenerator {
|
|
|
165
187
|
redepositAutomation(connection: web3.Connection, { userWallet, lbPair, position, relativeLowerBinId, relativeUpperBinId, strategyType, checkRange }: OpenPositionAndDepositAutomation): Promise<web3.TransactionInstruction>;
|
|
166
188
|
redepositAutomation2(connection: web3.Connection, { userWallet, lbPair, position, relativeLowerBinId, relativeUpperBinId, strategyType, checkRange }: RedepositAutomation2): Promise<web3.TransactionInstruction>;
|
|
167
189
|
claimFee(connection: web3.Connection, params: {}): Promise<web3.TransactionInstruction>;
|
|
190
|
+
claimFee2(connection: web3.Connection, { userWallet, lbPair, position, tokenMintX, tokenMintY, tokenProgramX, tokenProgramY, lowerBinId, upperBinId }: MeteoraDlmmClaimFee2Params): Promise<web3.TransactionInstruction>;
|
|
168
191
|
claimReward(connection: web3.Connection, params: {}): Promise<web3.TransactionInstruction>;
|
|
192
|
+
claimReward2(connection: web3.Connection, { userWallet, lbPair, position, rewardIndex, rewardMint, rewardVault, tokenProgram, lowerBinId, upperBinId }: MeteoraDlmmClaimReward2Params): Promise<web3.TransactionInstruction>;
|
|
169
193
|
claimFeeAutomation(connection: web3.Connection, params: {}): Promise<web3.TransactionInstruction>;
|
|
170
194
|
claimRewardAutomation(connection: web3.Connection, params: {}): Promise<web3.TransactionInstruction>;
|
|
171
195
|
depositAutomation(connection: web3.Connection, params: DepositAutomation): Promise<web3.TransactionInstruction>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MeteoraDlmmIxGenerator.d.ts","sourceRoot":"","sources":["../../../src/ixGenerator/MeteoraDlmmIxGenerator.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"MeteoraDlmmIxGenerator.d.ts","sourceRoot":"","sources":["../../../src/ixGenerator/MeteoraDlmmIxGenerator.ts"],"names":[],"mappings":"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"}
|
|
@@ -421,6 +421,61 @@ class MeteoraDlmmIxGenerator {
|
|
|
421
421
|
});
|
|
422
422
|
});
|
|
423
423
|
}
|
|
424
|
+
claimFee2(connection_1, _a) {
|
|
425
|
+
return __awaiter(this, arguments, void 0, function* (connection, { userWallet, lbPair, position, tokenMintX, tokenMintY, tokenProgramX, tokenProgramY, lowerBinId, upperBinId }) {
|
|
426
|
+
// Initialize anchor
|
|
427
|
+
anchor_1.Anchor.initialize(connection);
|
|
428
|
+
const userPda = (0, functions_1.generateUserPda)(userWallet);
|
|
429
|
+
const reserveX = this.pda.meteora.deriveReserve(tokenMintX, lbPair);
|
|
430
|
+
const reserveY = this.pda.meteora.deriveReserve(tokenMintY, lbPair);
|
|
431
|
+
const userTokenX = (0, functions_1.generateAta)(userPda, tokenMintX, tokenProgramX);
|
|
432
|
+
const userTokenY = (0, functions_1.generateAta)(userPda, tokenMintY, tokenProgramY);
|
|
433
|
+
const ownerFeeX = (0, functions_1.generateAta)(addresses_1.SITE_FEE_OWNER, tokenMintX, tokenProgramX);
|
|
434
|
+
const ownerFeeY = (0, functions_1.generateAta)(addresses_1.SITE_FEE_OWNER, tokenMintY, tokenProgramY);
|
|
435
|
+
const binArrays = this.pda.meteora.deriveBinArrays(lbPair, lowerBinId, upperBinId);
|
|
436
|
+
const sighash = util.sighash("meteora_dlmm_claim_fee_2");
|
|
437
|
+
const minBinId = Buffer.alloc(4);
|
|
438
|
+
const maxBinId = Buffer.alloc(4);
|
|
439
|
+
const remainingAccountsInfo = Buffer.from(new Uint8Array([
|
|
440
|
+
0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
|
441
|
+
]));
|
|
442
|
+
minBinId.writeInt32LE(lowerBinId, 0);
|
|
443
|
+
maxBinId.writeInt32LE(upperBinId, 0);
|
|
444
|
+
return yield this.ix.iyfMain.iyfExtensionExecuteV2(connection, {
|
|
445
|
+
userPda,
|
|
446
|
+
authority: userWallet,
|
|
447
|
+
ix: new web3.TransactionInstruction({
|
|
448
|
+
data: Buffer.concat([
|
|
449
|
+
new Uint8Array(sighash),
|
|
450
|
+
new Uint8Array(minBinId),
|
|
451
|
+
new Uint8Array(maxBinId),
|
|
452
|
+
new Uint8Array(remainingAccountsInfo),
|
|
453
|
+
]),
|
|
454
|
+
keys: [
|
|
455
|
+
{ pubkey: userPda, isSigner: false, isWritable: false },
|
|
456
|
+
{ pubkey: userWallet, isSigner: true, isWritable: false },
|
|
457
|
+
{ pubkey: METEORA_DLMM_PROGRAM, isSigner: false, isWritable: false },
|
|
458
|
+
{ pubkey: lbPair, isSigner: false, isWritable: true },
|
|
459
|
+
{ pubkey: position, isSigner: false, isWritable: true },
|
|
460
|
+
{ pubkey: reserveX, isSigner: false, isWritable: true },
|
|
461
|
+
{ pubkey: reserveY, isSigner: false, isWritable: true },
|
|
462
|
+
{ pubkey: userTokenX, isSigner: false, isWritable: true },
|
|
463
|
+
{ pubkey: userTokenY, isSigner: false, isWritable: true },
|
|
464
|
+
{ pubkey: tokenMintX, isSigner: false, isWritable: false },
|
|
465
|
+
{ pubkey: tokenMintY, isSigner: false, isWritable: false },
|
|
466
|
+
{ pubkey: tokenProgramX, isSigner: false, isWritable: false },
|
|
467
|
+
{ pubkey: tokenProgramY, isSigner: false, isWritable: false },
|
|
468
|
+
{ pubkey: addresses_1.MEMO_PROGRAM, isSigner: false, isWritable: false },
|
|
469
|
+
{ pubkey: METEORA_EVENT_AUTHORITY, isSigner: false, isWritable: false },
|
|
470
|
+
{ pubkey: ownerFeeX, isSigner: false, isWritable: true },
|
|
471
|
+
{ pubkey: ownerFeeY, isSigner: false, isWritable: true },
|
|
472
|
+
...binArrays.map(binArray => ({ pubkey: binArray, isSigner: false, isWritable: true })),
|
|
473
|
+
],
|
|
474
|
+
programId: addresses_1.IYF_EXTENSION,
|
|
475
|
+
})
|
|
476
|
+
});
|
|
477
|
+
});
|
|
478
|
+
}
|
|
424
479
|
claimReward(connection, params) {
|
|
425
480
|
return __awaiter(this, void 0, void 0, function* () {
|
|
426
481
|
// Initialize anchor
|
|
@@ -432,6 +487,53 @@ class MeteoraDlmmIxGenerator {
|
|
|
432
487
|
});
|
|
433
488
|
});
|
|
434
489
|
}
|
|
490
|
+
claimReward2(connection_1, _a) {
|
|
491
|
+
return __awaiter(this, arguments, void 0, function* (connection, { userWallet, lbPair, position, rewardIndex, rewardMint, rewardVault, tokenProgram, lowerBinId, upperBinId }) {
|
|
492
|
+
// Initialize anchor
|
|
493
|
+
anchor_1.Anchor.initialize(connection);
|
|
494
|
+
const userPda = (0, functions_1.generateUserPda)(userWallet);
|
|
495
|
+
const userTokenAccount = (0, functions_1.generateAta)(userPda, rewardMint);
|
|
496
|
+
const ownerFee = (0, functions_1.generateAta)(addresses_1.SITE_FEE_OWNER, rewardMint, tokenProgram);
|
|
497
|
+
const binArrays = this.pda.meteora.deriveBinArrays(lbPair, lowerBinId, upperBinId);
|
|
498
|
+
const sighash = util.sighash("meteora_dlmm_claim_reward_2");
|
|
499
|
+
const minBinId = Buffer.alloc(4);
|
|
500
|
+
const maxBinId = Buffer.alloc(4);
|
|
501
|
+
const remainingAccountsInfo = Buffer.from(new Uint8Array([
|
|
502
|
+
0x06, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00
|
|
503
|
+
]));
|
|
504
|
+
minBinId.writeInt32LE(lowerBinId, 0);
|
|
505
|
+
maxBinId.writeInt32LE(upperBinId, 0);
|
|
506
|
+
return yield this.ix.iyfMain.iyfExtensionExecuteV2(connection, {
|
|
507
|
+
userPda,
|
|
508
|
+
authority: userWallet,
|
|
509
|
+
ix: new web3.TransactionInstruction({
|
|
510
|
+
data: Buffer.concat([
|
|
511
|
+
new Uint8Array(sighash),
|
|
512
|
+
new Uint8Array([rewardIndex]),
|
|
513
|
+
new Uint8Array(minBinId),
|
|
514
|
+
new Uint8Array(maxBinId),
|
|
515
|
+
new Uint8Array(remainingAccountsInfo),
|
|
516
|
+
]),
|
|
517
|
+
keys: [
|
|
518
|
+
{ pubkey: userPda, isSigner: false, isWritable: false },
|
|
519
|
+
{ pubkey: userWallet, isSigner: true, isWritable: false },
|
|
520
|
+
{ pubkey: METEORA_DLMM_PROGRAM, isSigner: false, isWritable: false },
|
|
521
|
+
{ pubkey: lbPair, isSigner: false, isWritable: true },
|
|
522
|
+
{ pubkey: position, isSigner: false, isWritable: true },
|
|
523
|
+
{ pubkey: rewardVault, isSigner: false, isWritable: true },
|
|
524
|
+
{ pubkey: rewardMint, isSigner: false, isWritable: true },
|
|
525
|
+
{ pubkey: userTokenAccount, isSigner: false, isWritable: true },
|
|
526
|
+
{ pubkey: tokenProgram, isSigner: false, isWritable: true },
|
|
527
|
+
{ pubkey: addresses_1.MEMO_PROGRAM, isSigner: false, isWritable: false },
|
|
528
|
+
{ pubkey: METEORA_EVENT_AUTHORITY, isSigner: false, isWritable: false },
|
|
529
|
+
{ pubkey: ownerFee, isSigner: false, isWritable: true },
|
|
530
|
+
...binArrays.map(binArray => ({ pubkey: binArray, isSigner: false, isWritable: true })),
|
|
531
|
+
],
|
|
532
|
+
programId: addresses_1.IYF_EXTENSION,
|
|
533
|
+
})
|
|
534
|
+
});
|
|
535
|
+
});
|
|
536
|
+
}
|
|
435
537
|
claimFeeAutomation(connection, params) {
|
|
436
538
|
return __awaiter(this, void 0, void 0, function* () {
|
|
437
539
|
// Initialize anchor
|
package/dist/src/meteora.d.ts
CHANGED
|
@@ -304,6 +304,32 @@ export declare class MeteoraFunctions {
|
|
|
304
304
|
* @param userPda
|
|
305
305
|
*/
|
|
306
306
|
getAllUserPosition(connection: web3.Connection, userPda: web3.PublicKey): Promise<web3.PublicKey[]>;
|
|
307
|
+
getPositions(dlmm: DLMM, positions: web3.PublicKey[]): Promise<[{
|
|
308
|
+
lbPair: web3.PublicKey;
|
|
309
|
+
owner: web3.PublicKey;
|
|
310
|
+
liquidityShares: BN[];
|
|
311
|
+
rewardInfos: {
|
|
312
|
+
rewardPerTokenCompletes: BN[];
|
|
313
|
+
rewardPendings: BN[];
|
|
314
|
+
}[];
|
|
315
|
+
feeInfos: {
|
|
316
|
+
feeXPerTokenComplete: BN;
|
|
317
|
+
feeYPerTokenComplete: BN;
|
|
318
|
+
feeXPending: BN;
|
|
319
|
+
feeYPending: BN;
|
|
320
|
+
}[];
|
|
321
|
+
lowerBinId: number;
|
|
322
|
+
upperBinId: number;
|
|
323
|
+
lastUpdatedAt: BN;
|
|
324
|
+
totalClaimedFeeXAmount: BN;
|
|
325
|
+
totalClaimedFeeYAmount: BN;
|
|
326
|
+
totalClaimedRewards: BN[];
|
|
327
|
+
operator: web3.PublicKey;
|
|
328
|
+
lockReleasePoint: BN;
|
|
329
|
+
padding0: number;
|
|
330
|
+
feeOwner: web3.PublicKey;
|
|
331
|
+
reserved: number[];
|
|
332
|
+
}, LbPosition][]>;
|
|
307
333
|
/**
|
|
308
334
|
* Generate instruction that claims all fees and rewards by user
|
|
309
335
|
*
|
|
@@ -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":"AAAA,OAAO,IAAI,EAAE,EAAuF,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACpL,OAAO,EAAE,MAAM,OAAO,CAAC;AACvB,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAUxC,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAoB,SAAS,EAAE,MAAM,SAAS,CAAC;AAI1F,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AA8BhE,qBAAa,WAAW;aAEJ,IAAI,EAAE,IAAI;aACV,EAAE,EAAE,iBAAiB;IAFvC,OAAO;IAKP,QAAQ,CAAC,MAAM,iBAAoB;IAEnC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAc;IACrC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAc;IACtC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAiB;IAC5C,OAAO,CAAC,MAAM,CAAC,WAAW,CAAkB;WAE/B,MAAM,CACjB,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,WAAW,EAAE,IAAI,CAAC,SAAS,EAC3B,EAAE,EAAE,iBAAiB,GACpB,OAAO,CAAC,WAAW,CAAC;IAWvB;;;;OAIG;WACU,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC;IAQvE,uBAAuB,CACrB,YAAY,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,EAC1C,SAAS,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAC3C,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM;;;;;IA4Bd,YAAY;IAIZ,2BAA2B,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS;;;;IAI5D;;;;;;;;;;;;;;;;;;;;OAoBG;IACG,2CAA2C,CAC/C,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,UAAU,EAAE,IAAI,CAAC,SAAS,EAC1B,KAAK,EAAE,IAAI,CAAC,SAAS,EACrB,MAAM,EAAE;QACN,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC;QAC/B,YAAY,EAAE,EAAE,CAAC;QACjB,YAAY,EAAE,EAAE,CAAC;QACjB,QAAQ,EAAE;YACR,QAAQ,EAAE,MAAM,CAAC;YACjB,QAAQ,EAAE,MAAM,CAAC;YACjB,YAAY,EAAE,YAAY,CAAC;SAC5B,CAAC;QACF,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;QACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,mBAAmB,CAAC,EAAE,OAAO,CAAC;QAC9B,GAAG,CAAC,EAAE;YACJ,YAAY,CAAC,EAAE,SAAS,CAAC;YACzB,UAAU,CAAC,EAAE;gBACX,gBAAgB,EAAE,EAAE,GAAG,IAAI,CAAC;gBAC5B,gBAAgB,EAAE,EAAE,GAAG,IAAI,CAAC;aAC7B,CAAA;YACD,WAAW,CAAC,EAAE,OAAO,CAAC;SACvB,CAAA;KACF,EACD,kBAAkB,EAAE,oBAAoB,GACvC,OAAO,CAAC,kDAAkD,CAAC;IAoH9D;;;;;;;;;;;;;;;;;;;;OAoBG;IACG,8CAA8C,CAClD,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,UAAU,EAAE,IAAI,CAAC,SAAS,EAC1B,KAAK,EAAE,IAAI,CAAC,SAAS,EACrB,MAAM,EAAE;QACN,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC;QAC/B,YAAY,EAAE,EAAE,CAAC;QACjB,YAAY,EAAE,EAAE,CAAC;QACjB,QAAQ,EAAE;YACR,QAAQ,EAAE,MAAM,CAAC;YACjB,QAAQ,EAAE,MAAM,CAAC;YACjB,YAAY,EAAE,YAAY,CAAC;SAC5B,CAAC;QACF,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;QACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,mBAAmB,CAAC,EAAE,OAAO,CAAC;QAC9B,YAAY,CAAC,EAAE,SAAS,CAAC;KAC1B,EACD,kBAAkB,EAAE,oBAAoB,GACvC,OAAO,CAAC,qDAAqD,CAAC;IAqEjE;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACG,sBAAsB,CAC1B,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,UAAU,EAAE,IAAI,CAAC,SAAS,EAC1B,KAAK,EAAE,IAAI,CAAC,SAAS,EACrB,MAAM,EAAE;QACN,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC;QAC/B,YAAY,EAAE,EAAE,CAAC;QACjB,YAAY,EAAE,EAAE,CAAC;QACjB,QAAQ,EAAE;YACR,QAAQ,EAAE,MAAM,CAAC;YACjB,QAAQ,EAAE,MAAM,CAAC;YACjB,YAAY,EAAE,YAAY,CAAC;SAC5B,CAAC;QACF,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;QACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,mBAAmB,EAAE,OAAO,CAAC;QAC7B,YAAY,CAAC,EAAE,SAAS,CAAC;KAC1B,EACD,kBAAkB,EAAE,oBAAoB,GACvC,OAAO,CAAC,6BAA6B,CAAC;IAuHzC;;;;;;;;;;;;;;;;;OAiBG;IACG,eAAe,CACnB,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,UAAU,EAAE,IAAI,CAAC,SAAS,EAC1B,KAAK,EAAE,IAAI,CAAC,SAAS,EACrB,MAAM,EAAE;QACN,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;QACrB,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC;QACzB,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;QAChB,GAAG,EAAE,EAAE,CAAC;QACR,mBAAmB,CAAC,EAAE,OAAO,CAAC;QAC9B,YAAY,CAAC,EAAE,SAAS,CAAC;QACzB,WAAW,CAAC,EAAE,OAAO,CAAC;KACvB,EACD,kBAAkB,EAAE,oBAAoB,GACvC,OAAO,CAAC,sBAAsB,CAAC;IAwHlC;;;;;;;;;;;;;;;;;OAiBG;IACG,kBAAkB,CACtB,UAAU,EAAE,IAAI,CAAC,SAAS,EAC1B,KAAK,EAAE,IAAI,CAAC,SAAS,EACrB,MAAM,EAAE;QACN,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;QACrB,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC;QACzB,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;QAChB,GAAG,EAAE,EAAE,CAAC;QACR,mBAAmB,CAAC,EAAE,OAAO,CAAC;QAC9B,YAAY,CAAC,EAAE,SAAS,CAAC;KAC1B,EACD,kBAAkB,EAAE,oBAAoB,GACvC,OAAO,CAAC,yBAAyB,CAAC;IA8DrC;;;;;;;;;;;;;;;;;OAiBG;IACG,yBAAyB,CAC7B,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,UAAU,EAAE,IAAI,CAAC,SAAS,EAC1B,KAAK,EAAE,IAAI,CAAC,SAAS,EACrB,MAAM,EAAE;QACN,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC;QACtB,QAAQ,EAAE,UAAU,CAAC;KACtB,EACD,kBAAkB,EAAE,oBAAoB,GACvC,OAAO,CAAC,gCAAgC,CAAC;IAiE5C;;;;;;;;;;;OAWG;IACG,aAAa,CACjB,UAAU,EAAE,IAAI,CAAC,SAAS,EAC1B,MAAM,EAAE;QACN,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC;QACtB,QAAQ,EAAE,UAAU,CAAC;KACtB,EACD,kBAAkB,EAAE,oBAAoB,GACvC,OAAO,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC;CAmB1C;AAED;;GAEG;AACH,qBAAa,gBAAgB;IAGzB,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,iBAAiB;IAGxC;;OAEG;IACH,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAM;IAErD;;OAEG;IACH,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAM;IAEvD;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAM;IAE5C;;;;;;;;;;;;;;;;;OAiBG;IACG,yBAAyB,CAC7B,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,UAAU,EAAE,IAAI,CAAC,SAAS,EAC1B,KAAK,EAAE,IAAI,CAAC,SAAS,EACrB,MAAM,EAAE;QACN,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC;QACtB,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC;QACvB,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC;QACzB,YAAY,EAAE,SAAS,CAAC;KACzB,EACD,kBAAkB,EAAE,oBAAoB,GACvC,OAAO,CAAC,gCAAgC,CAAC;IA6G5C,SAAS,CAAC,OAAO,EAAE,WAAW;;;;;;IAuB9B,MAAM,CAAC,qBAAqB,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE;IAc1G,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,CAAC,SAAS;IAQ3D,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE,GAAG,IAAI,CAAC,SAAS;IAgBxE,MAAM,CAAC,oBAAoB,CAAC,kBAAkB,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE;IAKvD,oBAAoB,CACxB,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,MAAM,EAAE,IAAI,CAAC,SAAS,EACtB,QAAQ,EAAE,IAAI,CAAC,SAAS,GACvB,OAAO,CAAC;QACT,aAAa,EAAE,GAAG,CAAC;QACnB,eAAe,EAAE,GAAG,CAAC;QACrB,SAAS,EAAE,GAAG,CAAA;KACf,CAAC;IAmBF;;;;;OAKG;IACG,kBAAkB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,IAAI,CAAC,SAAS;IA6DvE,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;IAY1D;;;;;;;;OAQG;IACG,qBAAqB,CACzB,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,EAC3B,UAAU,EAAE,IAAI,CAAC,SAAS,EAC1B,OAAO,EAAE,IAAI,CAAC,SAAS,EACvB,kBAAkB,EAAE,oBAAoB,EACxC,MAAM,CAAC,EAAE,IAAI,CAAC,SAAS,GACtB,OAAO,CAAC,gCAAgC,CAAC;IA4GtC,oBAAoB,CACxB,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,MAAM,EAAE,IAAI,CAAC,SAAS,EACtB,QAAQ,EAAE,IAAI,CAAC,SAAS,EACxB,OAAO,EAAE,IAAI,CAAC,SAAS,GACtB,OAAO,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC;IAUzC,UAAU,CACR,MAAM,EAAE,IAAI,CAAC,SAAS,EACtB,QAAQ,EAAE,IAAI,CAAC,SAAS,EACxB,OAAO,EAAE,IAAI,CAAC,SAAS,EACvB,0BAA0B,EAAE;QAC1B,aAAa,EAAE,GAAG,CAAC;QACnB,eAAe,EAAE,GAAG,CAAA;QACpB,SAAS,EAAE,GAAG,CAAC;KAChB,GACA,IAAI,CAAC,sBAAsB;IA4C9B,cAAc,CACZ,MAAM,EAAE,IAAI,CAAC,SAAS,EACtB,QAAQ,EAAE,IAAI,CAAC,SAAS,EACxB,OAAO,EAAE,IAAI,CAAC,SAAS,EACvB,0BAA0B,EAAE;QAC1B,aAAa,EAAE,GAAG,CAAC;QACnB,eAAe,EAAE,GAAG,CAAA;QACpB,SAAS,EAAE,GAAG,CAAC;KAChB,GACA,IAAI,CAAC,sBAAsB,EAAE;CA+CjC;AAED;;;;;GAKG;AACH,qBAAa,gCAAgC;IAWzC,QAAQ,CAAC,YAAY,EAAE,IAAI,CAAC,sBAAsB,EAAE;IACpD,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,sBAAsB,EAAE;IAC/C,QAAQ,CAAC,uBAAuB,EAAE,IAAI,CAAC,sBAAsB;IAC7D,QAAQ,CAAC,aAAa,EAAE,IAAI,CAAC,sBAAsB,EAAE;IAZvD;;;;;;;OAOG;gBAEQ,YAAY,EAAE,IAAI,CAAC,sBAAsB,EAAE,EAC3C,OAAO,EAAE,IAAI,CAAC,sBAAsB,EAAE,EACtC,uBAAuB,EAAE,IAAI,CAAC,sBAAsB,EACpD,aAAa,EAAE,IAAI,CAAC,sBAAsB,EAAE;IAGvD;;;;;;;;;;OAUG;IACH,OAAO,IAAI,IAAI,CAAC,sBAAsB,EAAE;IAgBxC;;OAEG;IACH,yBAAyB;IAsBzB;;OAEG;IACH,uBAAuB;CAgBxB;AAED;;;;;;GAMG;AACH,qBAAa,6BAA6B;IAYtC,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,sBAAsB,EAAE;IAClD,QAAQ,CAAC,eAAe,EAAE,IAAI,CAAC,sBAAsB;IACrD,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,sBAAsB,EAAE;IAC/C,QAAQ,CAAC,aAAa,EAAE,IAAI,CAAC,sBAAsB;IACnD,QAAQ,CAAC,aAAa,EAAE,IAAI,CAAC,sBAAsB,EAAE;IAdvD;;;;;;;;OAQG;gBAEQ,UAAU,EAAE,IAAI,CAAC,sBAAsB,EAAE,EACzC,eAAe,EAAE,IAAI,CAAC,sBAAsB,EAC5C,OAAO,EAAE,IAAI,CAAC,sBAAsB,EAAE,EACtC,aAAa,EAAE,IAAI,CAAC,sBAAsB,EAC1C,aAAa,EAAE,IAAI,CAAC,sBAAsB,EAAE;IAGvD;;;;;;;;;;;OAWG;IACH,OAAO,IAAI,IAAI,CAAC,sBAAsB,EAAE;CAkBzC;AAED;;;;;;GAMG;AACH,qBAAa,sBAAsB;IAW/B,QAAQ,CAAC,YAAY,EAAE,IAAI,CAAC,sBAAsB,EAAE;IACpD,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,sBAAsB,EAAE;IAC/C,QAAQ,CAAC,uBAAuB,EAAE,IAAI,CAAC,sBAAsB;IAC7D,QAAQ,CAAC,aAAa,EAAE,IAAI,CAAC,sBAAsB,EAAE;IAZvD;;;;;;;OAOG;gBAEQ,YAAY,EAAE,IAAI,CAAC,sBAAsB,EAAE,EAC3C,OAAO,EAAE,IAAI,CAAC,sBAAsB,EAAE,EACtC,uBAAuB,EAAE,IAAI,CAAC,sBAAsB,EACpD,aAAa,EAAE,IAAI,CAAC,sBAAsB,EAAE;IAGvD;;;;;;;;;;OAUG;IACH,OAAO,IAAI,IAAI,CAAC,sBAAsB,EAAE;IAgBxC;;OAEG;IACH,yBAAyB;IAkBzB;;OAEG;IACH,uBAAuB;IAevB;;OAEG;IACH,yBAAyB;IAkBzB;;OAEG;IACH,uBAAuB;CAexB;AAED;;;;;;GAMG;AACH,qBAAa,yBAAyB;IAWlC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,sBAAsB,EAAE;IATjD;;;;;;OAMG;gBAGQ,OAAO,EAAE,IAAI,CAAC,sBAAsB,EAAE;IAGjD;;;;;;;;;;OAUG;IACH,OAAO,IAAI,IAAI,CAAC,sBAAsB,EAAE;IAgBxC;;OAEG;IACH,yBAAyB;IAkBzB;;OAEG;IACH,uBAAuB;CAcxB;AAED;;;;;;GAMG;AACH,qBAAa,kDAAkD;IAY3D,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,sBAAsB,EAAE;IAClD,QAAQ,CAAC,eAAe,EAAE,IAAI,CAAC,sBAAsB;IACrD,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,sBAAsB,EAAE;IAC/C,QAAQ,CAAC,aAAa,EAAE,IAAI,CAAC,sBAAsB;IACnD,QAAQ,CAAC,aAAa,EAAE,IAAI,CAAC,sBAAsB,EAAE;IAdvD;;;;;;;;OAQG;gBAEQ,UAAU,EAAE,IAAI,CAAC,sBAAsB,EAAE,EACzC,eAAe,EAAE,IAAI,CAAC,sBAAsB,EAC5C,OAAO,EAAE,IAAI,CAAC,sBAAsB,EAAE,EACtC,aAAa,EAAE,IAAI,CAAC,sBAAsB,EAC1C,aAAa,EAAE,IAAI,CAAC,sBAAsB,EAAE;IAGvD;;;;;;;;;;OAUG;IACH,OAAO,IAAI,IAAI,CAAC,sBAAsB,EAAE;CAkBzC;AAED;;;;;;GAMG;AACH,qBAAa,qDAAqD;IAQ9D,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,sBAAsB,EAAE;IANjD;;;;OAIG;gBAEQ,OAAO,EAAE,IAAI,CAAC,sBAAsB,EAAE;IAGjD;;;;;;;;;;OAUG;IACH,OAAO,IAAI,IAAI,CAAC,sBAAsB,EAAE;CAQzC"}
|
package/dist/src/meteora.js
CHANGED
|
@@ -1013,6 +1013,19 @@ class MeteoraFunctions {
|
|
|
1013
1013
|
return positions.map(position => position.publicKey);
|
|
1014
1014
|
});
|
|
1015
1015
|
}
|
|
1016
|
+
getPositions(dlmm, positions) {
|
|
1017
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
1018
|
+
const promises = [];
|
|
1019
|
+
for (const position of positions) {
|
|
1020
|
+
promises.push(Promise.all([
|
|
1021
|
+
dlmm.program.account.positionV2.fetch(position),
|
|
1022
|
+
dlmm.getPosition(position),
|
|
1023
|
+
]));
|
|
1024
|
+
}
|
|
1025
|
+
const results = yield Promise.all(promises);
|
|
1026
|
+
return results;
|
|
1027
|
+
});
|
|
1028
|
+
}
|
|
1016
1029
|
/**
|
|
1017
1030
|
* Generate instruction that claims all fees and rewards by user
|
|
1018
1031
|
*
|
|
@@ -1038,59 +1051,58 @@ class MeteoraFunctions {
|
|
|
1038
1051
|
// };
|
|
1039
1052
|
// await this.getAllUserPosition(connection, userPda);
|
|
1040
1053
|
const ixs = [];
|
|
1041
|
-
|
|
1042
|
-
|
|
1043
|
-
|
|
1044
|
-
|
|
1045
|
-
|
|
1046
|
-
|
|
1047
|
-
|
|
1048
|
-
|
|
1049
|
-
|
|
1050
|
-
|
|
1051
|
-
|
|
1052
|
-
|
|
1053
|
-
|
|
1054
|
-
|
|
1055
|
-
|
|
1056
|
-
|
|
1057
|
-
|
|
1058
|
-
|
|
1059
|
-
|
|
1060
|
-
|
|
1061
|
-
// const claimRewardIxs = this.claimRewardIxs(lbPair, position, userPda, result);
|
|
1062
|
-
const txn = yield dlmm.claimSwapFee({
|
|
1063
|
-
owner: userPda,
|
|
1064
|
-
position: positionData,
|
|
1054
|
+
const _positions = yield this.getPositions(dlmm, positions);
|
|
1055
|
+
const pairMints = [];
|
|
1056
|
+
const rewardMints = [];
|
|
1057
|
+
const claimFeeIxs = [];
|
|
1058
|
+
const claimRewardIxs = [];
|
|
1059
|
+
for (const position of _positions) {
|
|
1060
|
+
const positionAccount = position[0];
|
|
1061
|
+
const positionData = position[1];
|
|
1062
|
+
console.log(`Position: ${positionData.publicKey.toString()}`);
|
|
1063
|
+
let txn = [];
|
|
1064
|
+
const claimFeeIx = yield this.ix.meteoraDlmm.claimFee2(connection, {
|
|
1065
|
+
userWallet,
|
|
1066
|
+
lbPair: positionAccount.lbPair,
|
|
1067
|
+
position: positionData.publicKey,
|
|
1068
|
+
tokenMintX: dlmm.tokenX.mint.address,
|
|
1069
|
+
tokenMintY: dlmm.tokenY.mint.address,
|
|
1070
|
+
tokenProgramX: dlmm.tokenX.owner,
|
|
1071
|
+
tokenProgramY: dlmm.tokenY.owner,
|
|
1072
|
+
lowerBinId: positionData.positionData.lowerBinId,
|
|
1073
|
+
upperBinId: positionData.positionData.upperBinId,
|
|
1065
1074
|
});
|
|
1066
|
-
|
|
1067
|
-
|
|
1068
|
-
|
|
1075
|
+
claimFeeIxs.push(claimFeeIx);
|
|
1076
|
+
pairMints.push(dlmm.tokenX.mint.address);
|
|
1077
|
+
pairMints.push(dlmm.tokenY.mint.address);
|
|
1078
|
+
let rewardIndex = -1;
|
|
1079
|
+
for (const reward of dlmm.rewards) {
|
|
1080
|
+
rewardIndex++;
|
|
1081
|
+
if (reward && !reward.mint.address.equals(web3.SystemProgram.programId)) {
|
|
1082
|
+
const claimRewardIx = yield this.ix.meteoraDlmm.claimReward2(connection, {
|
|
1083
|
+
userWallet,
|
|
1084
|
+
lbPair: positionAccount.lbPair,
|
|
1085
|
+
position: positionData.publicKey,
|
|
1086
|
+
rewardIndex,
|
|
1087
|
+
rewardMint: reward.mint.address,
|
|
1088
|
+
rewardVault: reward.reserve,
|
|
1089
|
+
tokenProgram: reward.owner,
|
|
1090
|
+
lowerBinId: positionData.positionData.lowerBinId,
|
|
1091
|
+
upperBinId: positionData.positionData.upperBinId,
|
|
1092
|
+
});
|
|
1093
|
+
claimRewardIxs.push(claimRewardIx);
|
|
1094
|
+
rewardMints.push(reward.mint.address);
|
|
1095
|
+
}
|
|
1096
|
+
}
|
|
1069
1097
|
}
|
|
1070
1098
|
// Find mint from meteora instructions
|
|
1071
|
-
const mints = (
|
|
1072
|
-
|
|
1073
|
-
|
|
1074
|
-
|
|
1075
|
-
|
|
1076
|
-
|
|
1077
|
-
|
|
1078
|
-
"claim_fee2": {
|
|
1079
|
-
programId: addresses_1.METEORA_DLMM_PROGRAM.toBase58(),
|
|
1080
|
-
mintIndices: [7, 8],
|
|
1081
|
-
manualSnakeCase: true,
|
|
1082
|
-
},
|
|
1083
|
-
ClaimReward: {
|
|
1084
|
-
programId: addresses_1.METEORA_DLMM_PROGRAM.toBase58(),
|
|
1085
|
-
mintIndices: [6],
|
|
1086
|
-
},
|
|
1087
|
-
"claim_reward2": {
|
|
1088
|
-
programId: addresses_1.METEORA_DLMM_PROGRAM.toBase58(),
|
|
1089
|
-
mintIndices: [4],
|
|
1090
|
-
manualSnakeCase: true,
|
|
1091
|
-
},
|
|
1092
|
-
},
|
|
1093
|
-
});
|
|
1099
|
+
const mints = (() => {
|
|
1100
|
+
const mints = [...pairMints, ...rewardMints];
|
|
1101
|
+
// Remove duplicates
|
|
1102
|
+
const set = new Set(mints.map(mint => mint.toString()));
|
|
1103
|
+
const unique = Array.from(set).map(mint => new web3.PublicKey(mint));
|
|
1104
|
+
return unique;
|
|
1105
|
+
})();
|
|
1094
1106
|
// Get token program map for mints
|
|
1095
1107
|
const tokenProgramMap = yield (0, functions_1.getTokenProgramMapForMints)(connection, mints);
|
|
1096
1108
|
return new ClaimAllRewardsByPositionBuilder(
|
|
@@ -1101,11 +1113,7 @@ class MeteoraFunctions {
|
|
|
1101
1113
|
}),
|
|
1102
1114
|
}),
|
|
1103
1115
|
// Step 2: Claim fees and/or rewards, remove liquidity, and possibly close position (if set)
|
|
1104
|
-
|
|
1105
|
-
ixs,
|
|
1106
|
-
userPda,
|
|
1107
|
-
authority: userWallet,
|
|
1108
|
-
}),
|
|
1116
|
+
[...claimFeeIxs, ...claimRewardIxs],
|
|
1109
1117
|
// Step 3: Withdraw tokens to user wallet
|
|
1110
1118
|
yield this.ix.iyfMain.withdrawMultipleTokenWithToken2022({
|
|
1111
1119
|
connection,
|
|
@@ -54,6 +54,8 @@ export declare class MeteoraPdaGenerator {
|
|
|
54
54
|
* @returns
|
|
55
55
|
*/
|
|
56
56
|
deriveBinArray(lbPair: web3.PublicKey, index: BN): web3.PublicKey;
|
|
57
|
+
deriveBinArrays(lbPair: web3.PublicKey, lowerBinId: number, upperBinId: number): web3.PublicKey[];
|
|
58
|
+
private binIdToBinArrayIndex;
|
|
57
59
|
/**
|
|
58
60
|
* Derive Bin Array Bitmap Extension
|
|
59
61
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MeteoraPdaGenerator.d.ts","sourceRoot":"","sources":["../../../src/pdaGenerator/MeteoraPdaGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAExC,OAAO,EAAE,MAAM,OAAO,CAAC;AAEvB;;GAEG;AACH,qBAAa,mBAAmB;IAE9B;;;;;;;OAOG;IACH,uCAAuC,CACrC,kBAAkB,EAAE,IAAI,CAAC,SAAS,EAClC,MAAM,EAAE,IAAI,CAAC,SAAS,EACtB,MAAM,EAAE,IAAI,CAAC,SAAS,GACrB,IAAI,CAAC,SAAS;IASjB;;;;;;;;OAQG;IACH,aAAa,CACX,MAAM,EAAE,IAAI,CAAC,SAAS,EACtB,MAAM,EAAE,IAAI,CAAC,SAAS,EACtB,OAAO,EAAE,EAAE,EACX,UAAU,EAAE,EAAE,EACd,SAAS,EAAE,IAAI,CAAC,SAAS,GACxB,IAAI,CAAC,SAAS;IAcjB;;;;;;OAMG;IACH,aAAa,CACX,KAAK,EAAE,IAAI,CAAC,SAAS,EACrB,MAAM,EAAE,IAAI,CAAC,SAAS,GACrB,IAAI,CAAC,SAAS;IAQjB;;;;;OAKG;IACH,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS;IAQpD;;;;;;OAMG;IACH,gBAAgB,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS;IAK3D;;;;;;OAMG;IACH,cAAc,CACZ,MAAM,EAAE,IAAI,CAAC,SAAS,EACtB,KAAK,EAAE,EAAE,GACR,IAAI,CAAC,SAAS;IAgBjB;;;;;;OAMG;IACH,6BAA6B,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS;IAQrE;;;;;;OAMG;IACH,OAAO,CAAC,cAAc;CAIvB"}
|
|
1
|
+
{"version":3,"file":"MeteoraPdaGenerator.d.ts","sourceRoot":"","sources":["../../../src/pdaGenerator/MeteoraPdaGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAExC,OAAO,EAAE,MAAM,OAAO,CAAC;AAEvB;;GAEG;AACH,qBAAa,mBAAmB;IAE9B;;;;;;;OAOG;IACH,uCAAuC,CACrC,kBAAkB,EAAE,IAAI,CAAC,SAAS,EAClC,MAAM,EAAE,IAAI,CAAC,SAAS,EACtB,MAAM,EAAE,IAAI,CAAC,SAAS,GACrB,IAAI,CAAC,SAAS;IASjB;;;;;;;;OAQG;IACH,aAAa,CACX,MAAM,EAAE,IAAI,CAAC,SAAS,EACtB,MAAM,EAAE,IAAI,CAAC,SAAS,EACtB,OAAO,EAAE,EAAE,EACX,UAAU,EAAE,EAAE,EACd,SAAS,EAAE,IAAI,CAAC,SAAS,GACxB,IAAI,CAAC,SAAS;IAcjB;;;;;;OAMG;IACH,aAAa,CACX,KAAK,EAAE,IAAI,CAAC,SAAS,EACrB,MAAM,EAAE,IAAI,CAAC,SAAS,GACrB,IAAI,CAAC,SAAS;IAQjB;;;;;OAKG;IACH,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS;IAQpD;;;;;;OAMG;IACH,gBAAgB,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS;IAK3D;;;;;;OAMG;IACH,cAAc,CACZ,MAAM,EAAE,IAAI,CAAC,SAAS,EACtB,KAAK,EAAE,EAAE,GACR,IAAI,CAAC,SAAS;IAgBjB,eAAe,CACb,MAAM,EAAE,IAAI,CAAC,SAAS,EACtB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB,IAAI,CAAC,SAAS,EAAE;IAYnB,OAAO,CAAC,oBAAoB;IAM5B;;;;;;OAMG;IACH,6BAA6B,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS;IAQrE;;;;;;OAMG;IACH,OAAO,CAAC,cAAc;CAIvB"}
|
|
@@ -32,10 +32,14 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
32
32
|
return result;
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
36
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
37
|
+
};
|
|
35
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
39
|
exports.MeteoraPdaGenerator = void 0;
|
|
37
40
|
const web3 = __importStar(require("@solana/web3.js"));
|
|
38
41
|
const addresses_1 = require("../addresses");
|
|
42
|
+
const bn_js_1 = __importDefault(require("bn.js"));
|
|
39
43
|
/**
|
|
40
44
|
* Meteora PDA Generator
|
|
41
45
|
*/
|
|
@@ -122,6 +126,22 @@ class MeteoraPdaGenerator {
|
|
|
122
126
|
const [pda] = web3.PublicKey.findProgramAddressSync([Buffer.from("bin_array"), lbPair.toBytes(), binArrayBytes], addresses_1.METEORA_DLMM_PROGRAM);
|
|
123
127
|
return pda;
|
|
124
128
|
}
|
|
129
|
+
deriveBinArrays(lbPair, lowerBinId, upperBinId) {
|
|
130
|
+
const indices = new Set();
|
|
131
|
+
for (let binId = lowerBinId; binId <= upperBinId; binId++) {
|
|
132
|
+
indices.add(this.binIdToBinArrayIndex(new bn_js_1.default(binId)).toString());
|
|
133
|
+
}
|
|
134
|
+
const indicesUnique = Array.from(indices).map(index => new bn_js_1.default(index));
|
|
135
|
+
console.log('indicesUnique', indicesUnique);
|
|
136
|
+
const binArrays = indicesUnique.map(index => this.deriveBinArray(lbPair, index));
|
|
137
|
+
console.log('binArrays', binArrays);
|
|
138
|
+
return binArrays;
|
|
139
|
+
}
|
|
140
|
+
binIdToBinArrayIndex(binId) {
|
|
141
|
+
const MAX_BIN_ARRAY_SIZE = new bn_js_1.default(70);
|
|
142
|
+
const { div: idx, mod } = binId.divmod(MAX_BIN_ARRAY_SIZE);
|
|
143
|
+
return binId.isNeg() && !mod.isZero() ? idx.sub(new bn_js_1.default(1)) : idx;
|
|
144
|
+
}
|
|
125
145
|
/**
|
|
126
146
|
* Derive Bin Array Bitmap Extension
|
|
127
147
|
*
|