@lavarage/sdk 7.5.11 → 7.5.13
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/index.d.mts +78 -52
- package/dist/index.d.ts +78 -52
- package/dist/index.js +87 -60
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +87 -60
- package/dist/index.mjs.map +1 -1
- package/idl/lavarage.ts +156 -104
- package/index.ts +5 -4
- package/package.json +1 -1
package/dist/index.d.mts
CHANGED
|
@@ -513,13 +513,23 @@ type Lavarage$1 = {
|
|
|
513
513
|
},
|
|
514
514
|
{
|
|
515
515
|
"name": "toTokenAccount";
|
|
516
|
-
"isMut":
|
|
516
|
+
"isMut": true;
|
|
517
517
|
"isSigner": false;
|
|
518
518
|
},
|
|
519
519
|
{
|
|
520
520
|
"name": "randomAccountAsId";
|
|
521
521
|
"isMut": false;
|
|
522
522
|
"isSigner": false;
|
|
523
|
+
},
|
|
524
|
+
{
|
|
525
|
+
"name": "tokenProgram";
|
|
526
|
+
"isMut": false;
|
|
527
|
+
"isSigner": false;
|
|
528
|
+
},
|
|
529
|
+
{
|
|
530
|
+
"name": "associatedTokenProgram";
|
|
531
|
+
"isMut": false;
|
|
532
|
+
"isSigner": false;
|
|
523
533
|
}
|
|
524
534
|
];
|
|
525
535
|
"args": [
|
|
@@ -586,6 +596,11 @@ type Lavarage$1 = {
|
|
|
586
596
|
"name": "randomAccountAsId";
|
|
587
597
|
"isMut": false;
|
|
588
598
|
"isSigner": false;
|
|
599
|
+
},
|
|
600
|
+
{
|
|
601
|
+
"name": "associatedTokenProgram";
|
|
602
|
+
"isMut": false;
|
|
603
|
+
"isSigner": false;
|
|
589
604
|
}
|
|
590
605
|
];
|
|
591
606
|
"args": [];
|
|
@@ -806,6 +821,63 @@ type Lavarage$1 = {
|
|
|
806
821
|
}
|
|
807
822
|
];
|
|
808
823
|
},
|
|
824
|
+
{
|
|
825
|
+
"name": "tradingClosePositionAccount";
|
|
826
|
+
"accounts": [
|
|
827
|
+
{
|
|
828
|
+
"name": "positionAccount";
|
|
829
|
+
"isMut": true;
|
|
830
|
+
"isSigner": false;
|
|
831
|
+
},
|
|
832
|
+
{
|
|
833
|
+
"name": "admin";
|
|
834
|
+
"isMut": false;
|
|
835
|
+
"isSigner": true;
|
|
836
|
+
},
|
|
837
|
+
{
|
|
838
|
+
"name": "feeReceipient";
|
|
839
|
+
"isMut": true;
|
|
840
|
+
"isSigner": false;
|
|
841
|
+
},
|
|
842
|
+
{
|
|
843
|
+
"name": "systemProgram";
|
|
844
|
+
"isMut": false;
|
|
845
|
+
"isSigner": false;
|
|
846
|
+
}
|
|
847
|
+
];
|
|
848
|
+
"args": [];
|
|
849
|
+
},
|
|
850
|
+
{
|
|
851
|
+
"name": "tradingClosePoolAccount";
|
|
852
|
+
"accounts": [
|
|
853
|
+
{
|
|
854
|
+
"name": "poolAccount";
|
|
855
|
+
"isMut": true;
|
|
856
|
+
"isSigner": false;
|
|
857
|
+
},
|
|
858
|
+
{
|
|
859
|
+
"name": "operator";
|
|
860
|
+
"isMut": false;
|
|
861
|
+
"isSigner": true;
|
|
862
|
+
},
|
|
863
|
+
{
|
|
864
|
+
"name": "admin";
|
|
865
|
+
"isMut": false;
|
|
866
|
+
"isSigner": true;
|
|
867
|
+
},
|
|
868
|
+
{
|
|
869
|
+
"name": "feeReceipient";
|
|
870
|
+
"isMut": true;
|
|
871
|
+
"isSigner": false;
|
|
872
|
+
},
|
|
873
|
+
{
|
|
874
|
+
"name": "systemProgram";
|
|
875
|
+
"isMut": false;
|
|
876
|
+
"isSigner": false;
|
|
877
|
+
}
|
|
878
|
+
];
|
|
879
|
+
"args": [];
|
|
880
|
+
},
|
|
809
881
|
{
|
|
810
882
|
"name": "syncNodeWallet";
|
|
811
883
|
"accounts": [
|
|
@@ -1092,57 +1164,6 @@ type Lavarage$1 = {
|
|
|
1092
1164
|
}
|
|
1093
1165
|
];
|
|
1094
1166
|
},
|
|
1095
|
-
{
|
|
1096
|
-
"name": "rescueStuckTokens";
|
|
1097
|
-
"accounts": [
|
|
1098
|
-
{
|
|
1099
|
-
"name": "position";
|
|
1100
|
-
"isMut": true;
|
|
1101
|
-
"isSigner": false;
|
|
1102
|
-
},
|
|
1103
|
-
{
|
|
1104
|
-
"name": "pool";
|
|
1105
|
-
"isMut": true;
|
|
1106
|
-
"isSigner": false;
|
|
1107
|
-
},
|
|
1108
|
-
{
|
|
1109
|
-
"name": "nodeWallet";
|
|
1110
|
-
"isMut": true;
|
|
1111
|
-
"isSigner": false;
|
|
1112
|
-
},
|
|
1113
|
-
{
|
|
1114
|
-
"name": "positionTokenAccount";
|
|
1115
|
-
"isMut": true;
|
|
1116
|
-
"isSigner": false;
|
|
1117
|
-
},
|
|
1118
|
-
{
|
|
1119
|
-
"name": "traderTokenAccount";
|
|
1120
|
-
"isMut": true;
|
|
1121
|
-
"isSigner": false;
|
|
1122
|
-
},
|
|
1123
|
-
{
|
|
1124
|
-
"name": "positionMint";
|
|
1125
|
-
"isMut": true;
|
|
1126
|
-
"isSigner": false;
|
|
1127
|
-
},
|
|
1128
|
-
{
|
|
1129
|
-
"name": "admin";
|
|
1130
|
-
"isMut": true;
|
|
1131
|
-
"isSigner": true;
|
|
1132
|
-
},
|
|
1133
|
-
{
|
|
1134
|
-
"name": "tokenProgram";
|
|
1135
|
-
"isMut": false;
|
|
1136
|
-
"isSigner": false;
|
|
1137
|
-
}
|
|
1138
|
-
];
|
|
1139
|
-
"args": [
|
|
1140
|
-
{
|
|
1141
|
-
"name": "amount";
|
|
1142
|
-
"type": "u64";
|
|
1143
|
-
}
|
|
1144
|
-
];
|
|
1145
|
-
},
|
|
1146
1167
|
{
|
|
1147
1168
|
"name": "initWithdrawalAccessList";
|
|
1148
1169
|
"accounts": [
|
|
@@ -1655,6 +1676,11 @@ type Lavarage$1 = {
|
|
|
1655
1676
|
"code": 6009;
|
|
1656
1677
|
"name": "BlacklistedAccount";
|
|
1657
1678
|
"msg": "Account is blacklisted";
|
|
1679
|
+
},
|
|
1680
|
+
{
|
|
1681
|
+
"code": 6010;
|
|
1682
|
+
"name": "CloseStatusRecallTimestampZero";
|
|
1683
|
+
"msg": "Close status recall timestamp is zero";
|
|
1658
1684
|
}
|
|
1659
1685
|
];
|
|
1660
1686
|
};
|
package/dist/index.d.ts
CHANGED
|
@@ -513,13 +513,23 @@ type Lavarage$1 = {
|
|
|
513
513
|
},
|
|
514
514
|
{
|
|
515
515
|
"name": "toTokenAccount";
|
|
516
|
-
"isMut":
|
|
516
|
+
"isMut": true;
|
|
517
517
|
"isSigner": false;
|
|
518
518
|
},
|
|
519
519
|
{
|
|
520
520
|
"name": "randomAccountAsId";
|
|
521
521
|
"isMut": false;
|
|
522
522
|
"isSigner": false;
|
|
523
|
+
},
|
|
524
|
+
{
|
|
525
|
+
"name": "tokenProgram";
|
|
526
|
+
"isMut": false;
|
|
527
|
+
"isSigner": false;
|
|
528
|
+
},
|
|
529
|
+
{
|
|
530
|
+
"name": "associatedTokenProgram";
|
|
531
|
+
"isMut": false;
|
|
532
|
+
"isSigner": false;
|
|
523
533
|
}
|
|
524
534
|
];
|
|
525
535
|
"args": [
|
|
@@ -586,6 +596,11 @@ type Lavarage$1 = {
|
|
|
586
596
|
"name": "randomAccountAsId";
|
|
587
597
|
"isMut": false;
|
|
588
598
|
"isSigner": false;
|
|
599
|
+
},
|
|
600
|
+
{
|
|
601
|
+
"name": "associatedTokenProgram";
|
|
602
|
+
"isMut": false;
|
|
603
|
+
"isSigner": false;
|
|
589
604
|
}
|
|
590
605
|
];
|
|
591
606
|
"args": [];
|
|
@@ -806,6 +821,63 @@ type Lavarage$1 = {
|
|
|
806
821
|
}
|
|
807
822
|
];
|
|
808
823
|
},
|
|
824
|
+
{
|
|
825
|
+
"name": "tradingClosePositionAccount";
|
|
826
|
+
"accounts": [
|
|
827
|
+
{
|
|
828
|
+
"name": "positionAccount";
|
|
829
|
+
"isMut": true;
|
|
830
|
+
"isSigner": false;
|
|
831
|
+
},
|
|
832
|
+
{
|
|
833
|
+
"name": "admin";
|
|
834
|
+
"isMut": false;
|
|
835
|
+
"isSigner": true;
|
|
836
|
+
},
|
|
837
|
+
{
|
|
838
|
+
"name": "feeReceipient";
|
|
839
|
+
"isMut": true;
|
|
840
|
+
"isSigner": false;
|
|
841
|
+
},
|
|
842
|
+
{
|
|
843
|
+
"name": "systemProgram";
|
|
844
|
+
"isMut": false;
|
|
845
|
+
"isSigner": false;
|
|
846
|
+
}
|
|
847
|
+
];
|
|
848
|
+
"args": [];
|
|
849
|
+
},
|
|
850
|
+
{
|
|
851
|
+
"name": "tradingClosePoolAccount";
|
|
852
|
+
"accounts": [
|
|
853
|
+
{
|
|
854
|
+
"name": "poolAccount";
|
|
855
|
+
"isMut": true;
|
|
856
|
+
"isSigner": false;
|
|
857
|
+
},
|
|
858
|
+
{
|
|
859
|
+
"name": "operator";
|
|
860
|
+
"isMut": false;
|
|
861
|
+
"isSigner": true;
|
|
862
|
+
},
|
|
863
|
+
{
|
|
864
|
+
"name": "admin";
|
|
865
|
+
"isMut": false;
|
|
866
|
+
"isSigner": true;
|
|
867
|
+
},
|
|
868
|
+
{
|
|
869
|
+
"name": "feeReceipient";
|
|
870
|
+
"isMut": true;
|
|
871
|
+
"isSigner": false;
|
|
872
|
+
},
|
|
873
|
+
{
|
|
874
|
+
"name": "systemProgram";
|
|
875
|
+
"isMut": false;
|
|
876
|
+
"isSigner": false;
|
|
877
|
+
}
|
|
878
|
+
];
|
|
879
|
+
"args": [];
|
|
880
|
+
},
|
|
809
881
|
{
|
|
810
882
|
"name": "syncNodeWallet";
|
|
811
883
|
"accounts": [
|
|
@@ -1092,57 +1164,6 @@ type Lavarage$1 = {
|
|
|
1092
1164
|
}
|
|
1093
1165
|
];
|
|
1094
1166
|
},
|
|
1095
|
-
{
|
|
1096
|
-
"name": "rescueStuckTokens";
|
|
1097
|
-
"accounts": [
|
|
1098
|
-
{
|
|
1099
|
-
"name": "position";
|
|
1100
|
-
"isMut": true;
|
|
1101
|
-
"isSigner": false;
|
|
1102
|
-
},
|
|
1103
|
-
{
|
|
1104
|
-
"name": "pool";
|
|
1105
|
-
"isMut": true;
|
|
1106
|
-
"isSigner": false;
|
|
1107
|
-
},
|
|
1108
|
-
{
|
|
1109
|
-
"name": "nodeWallet";
|
|
1110
|
-
"isMut": true;
|
|
1111
|
-
"isSigner": false;
|
|
1112
|
-
},
|
|
1113
|
-
{
|
|
1114
|
-
"name": "positionTokenAccount";
|
|
1115
|
-
"isMut": true;
|
|
1116
|
-
"isSigner": false;
|
|
1117
|
-
},
|
|
1118
|
-
{
|
|
1119
|
-
"name": "traderTokenAccount";
|
|
1120
|
-
"isMut": true;
|
|
1121
|
-
"isSigner": false;
|
|
1122
|
-
},
|
|
1123
|
-
{
|
|
1124
|
-
"name": "positionMint";
|
|
1125
|
-
"isMut": true;
|
|
1126
|
-
"isSigner": false;
|
|
1127
|
-
},
|
|
1128
|
-
{
|
|
1129
|
-
"name": "admin";
|
|
1130
|
-
"isMut": true;
|
|
1131
|
-
"isSigner": true;
|
|
1132
|
-
},
|
|
1133
|
-
{
|
|
1134
|
-
"name": "tokenProgram";
|
|
1135
|
-
"isMut": false;
|
|
1136
|
-
"isSigner": false;
|
|
1137
|
-
}
|
|
1138
|
-
];
|
|
1139
|
-
"args": [
|
|
1140
|
-
{
|
|
1141
|
-
"name": "amount";
|
|
1142
|
-
"type": "u64";
|
|
1143
|
-
}
|
|
1144
|
-
];
|
|
1145
|
-
},
|
|
1146
1167
|
{
|
|
1147
1168
|
"name": "initWithdrawalAccessList";
|
|
1148
1169
|
"accounts": [
|
|
@@ -1655,6 +1676,11 @@ type Lavarage$1 = {
|
|
|
1655
1676
|
"code": 6009;
|
|
1656
1677
|
"name": "BlacklistedAccount";
|
|
1657
1678
|
"msg": "Account is blacklisted";
|
|
1679
|
+
},
|
|
1680
|
+
{
|
|
1681
|
+
"code": 6010;
|
|
1682
|
+
"name": "CloseStatusRecallTimestampZero";
|
|
1683
|
+
"msg": "Close status recall timestamp is zero";
|
|
1658
1684
|
}
|
|
1659
1685
|
];
|
|
1660
1686
|
};
|
package/dist/index.js
CHANGED
|
@@ -2249,13 +2249,23 @@ var IDL2 = {
|
|
|
2249
2249
|
},
|
|
2250
2250
|
{
|
|
2251
2251
|
"name": "toTokenAccount",
|
|
2252
|
-
"isMut":
|
|
2252
|
+
"isMut": true,
|
|
2253
2253
|
"isSigner": false
|
|
2254
2254
|
},
|
|
2255
2255
|
{
|
|
2256
2256
|
"name": "randomAccountAsId",
|
|
2257
2257
|
"isMut": false,
|
|
2258
2258
|
"isSigner": false
|
|
2259
|
+
},
|
|
2260
|
+
{
|
|
2261
|
+
"name": "tokenProgram",
|
|
2262
|
+
"isMut": false,
|
|
2263
|
+
"isSigner": false
|
|
2264
|
+
},
|
|
2265
|
+
{
|
|
2266
|
+
"name": "associatedTokenProgram",
|
|
2267
|
+
"isMut": false,
|
|
2268
|
+
"isSigner": false
|
|
2259
2269
|
}
|
|
2260
2270
|
],
|
|
2261
2271
|
"args": [
|
|
@@ -2322,6 +2332,11 @@ var IDL2 = {
|
|
|
2322
2332
|
"name": "randomAccountAsId",
|
|
2323
2333
|
"isMut": false,
|
|
2324
2334
|
"isSigner": false
|
|
2335
|
+
},
|
|
2336
|
+
{
|
|
2337
|
+
"name": "associatedTokenProgram",
|
|
2338
|
+
"isMut": false,
|
|
2339
|
+
"isSigner": false
|
|
2325
2340
|
}
|
|
2326
2341
|
],
|
|
2327
2342
|
"args": []
|
|
@@ -2542,6 +2557,63 @@ var IDL2 = {
|
|
|
2542
2557
|
}
|
|
2543
2558
|
]
|
|
2544
2559
|
},
|
|
2560
|
+
{
|
|
2561
|
+
"name": "tradingClosePositionAccount",
|
|
2562
|
+
"accounts": [
|
|
2563
|
+
{
|
|
2564
|
+
"name": "positionAccount",
|
|
2565
|
+
"isMut": true,
|
|
2566
|
+
"isSigner": false
|
|
2567
|
+
},
|
|
2568
|
+
{
|
|
2569
|
+
"name": "admin",
|
|
2570
|
+
"isMut": false,
|
|
2571
|
+
"isSigner": true
|
|
2572
|
+
},
|
|
2573
|
+
{
|
|
2574
|
+
"name": "feeReceipient",
|
|
2575
|
+
"isMut": true,
|
|
2576
|
+
"isSigner": false
|
|
2577
|
+
},
|
|
2578
|
+
{
|
|
2579
|
+
"name": "systemProgram",
|
|
2580
|
+
"isMut": false,
|
|
2581
|
+
"isSigner": false
|
|
2582
|
+
}
|
|
2583
|
+
],
|
|
2584
|
+
"args": []
|
|
2585
|
+
},
|
|
2586
|
+
{
|
|
2587
|
+
"name": "tradingClosePoolAccount",
|
|
2588
|
+
"accounts": [
|
|
2589
|
+
{
|
|
2590
|
+
"name": "poolAccount",
|
|
2591
|
+
"isMut": true,
|
|
2592
|
+
"isSigner": false
|
|
2593
|
+
},
|
|
2594
|
+
{
|
|
2595
|
+
"name": "operator",
|
|
2596
|
+
"isMut": false,
|
|
2597
|
+
"isSigner": true
|
|
2598
|
+
},
|
|
2599
|
+
{
|
|
2600
|
+
"name": "admin",
|
|
2601
|
+
"isMut": false,
|
|
2602
|
+
"isSigner": true
|
|
2603
|
+
},
|
|
2604
|
+
{
|
|
2605
|
+
"name": "feeReceipient",
|
|
2606
|
+
"isMut": true,
|
|
2607
|
+
"isSigner": false
|
|
2608
|
+
},
|
|
2609
|
+
{
|
|
2610
|
+
"name": "systemProgram",
|
|
2611
|
+
"isMut": false,
|
|
2612
|
+
"isSigner": false
|
|
2613
|
+
}
|
|
2614
|
+
],
|
|
2615
|
+
"args": []
|
|
2616
|
+
},
|
|
2545
2617
|
{
|
|
2546
2618
|
"name": "syncNodeWallet",
|
|
2547
2619
|
"accounts": [
|
|
@@ -2828,57 +2900,6 @@ var IDL2 = {
|
|
|
2828
2900
|
}
|
|
2829
2901
|
]
|
|
2830
2902
|
},
|
|
2831
|
-
{
|
|
2832
|
-
"name": "rescueStuckTokens",
|
|
2833
|
-
"accounts": [
|
|
2834
|
-
{
|
|
2835
|
-
"name": "position",
|
|
2836
|
-
"isMut": true,
|
|
2837
|
-
"isSigner": false
|
|
2838
|
-
},
|
|
2839
|
-
{
|
|
2840
|
-
"name": "pool",
|
|
2841
|
-
"isMut": true,
|
|
2842
|
-
"isSigner": false
|
|
2843
|
-
},
|
|
2844
|
-
{
|
|
2845
|
-
"name": "nodeWallet",
|
|
2846
|
-
"isMut": true,
|
|
2847
|
-
"isSigner": false
|
|
2848
|
-
},
|
|
2849
|
-
{
|
|
2850
|
-
"name": "positionTokenAccount",
|
|
2851
|
-
"isMut": true,
|
|
2852
|
-
"isSigner": false
|
|
2853
|
-
},
|
|
2854
|
-
{
|
|
2855
|
-
"name": "traderTokenAccount",
|
|
2856
|
-
"isMut": true,
|
|
2857
|
-
"isSigner": false
|
|
2858
|
-
},
|
|
2859
|
-
{
|
|
2860
|
-
"name": "positionMint",
|
|
2861
|
-
"isMut": true,
|
|
2862
|
-
"isSigner": false
|
|
2863
|
-
},
|
|
2864
|
-
{
|
|
2865
|
-
"name": "admin",
|
|
2866
|
-
"isMut": true,
|
|
2867
|
-
"isSigner": true
|
|
2868
|
-
},
|
|
2869
|
-
{
|
|
2870
|
-
"name": "tokenProgram",
|
|
2871
|
-
"isMut": false,
|
|
2872
|
-
"isSigner": false
|
|
2873
|
-
}
|
|
2874
|
-
],
|
|
2875
|
-
"args": [
|
|
2876
|
-
{
|
|
2877
|
-
"name": "amount",
|
|
2878
|
-
"type": "u64"
|
|
2879
|
-
}
|
|
2880
|
-
]
|
|
2881
|
-
},
|
|
2882
2903
|
{
|
|
2883
2904
|
"name": "initWithdrawalAccessList",
|
|
2884
2905
|
"accounts": [
|
|
@@ -3391,6 +3412,11 @@ var IDL2 = {
|
|
|
3391
3412
|
"code": 6009,
|
|
3392
3413
|
"name": "BlacklistedAccount",
|
|
3393
3414
|
"msg": "Account is blacklisted"
|
|
3415
|
+
},
|
|
3416
|
+
{
|
|
3417
|
+
"code": 6010,
|
|
3418
|
+
"name": "CloseStatusRecallTimestampZero",
|
|
3419
|
+
"msg": "Close status recall timestamp is zero"
|
|
3394
3420
|
}
|
|
3395
3421
|
]
|
|
3396
3422
|
};
|
|
@@ -5393,14 +5419,15 @@ var borrowV1 = (lavarageProgram, offer, marginSOL, leverage, randomSeed, tokenPr
|
|
|
5393
5419
|
toTokenAccount: toTokenAccount.account.address,
|
|
5394
5420
|
systemProgram: import_web32.SystemProgram.programId,
|
|
5395
5421
|
positionAccount,
|
|
5396
|
-
randomAccountAsId: randomSeed.publicKey.toBase58()
|
|
5422
|
+
randomAccountAsId: randomSeed.publicKey.toBase58(),
|
|
5423
|
+
tokenProgram,
|
|
5424
|
+
associatedTokenProgram: import_spl_token2.ASSOCIATED_TOKEN_PROGRAM_ID
|
|
5397
5425
|
}).instruction();
|
|
5398
5426
|
const computeFeeIx = import_web32.ComputeBudgetProgram.setComputeUnitPrice({
|
|
5399
5427
|
microLamports: computeBudgetMicroLamports != null ? computeBudgetMicroLamports : 1e5
|
|
5400
5428
|
});
|
|
5401
5429
|
const allInstructions = [
|
|
5402
5430
|
fromTokenAccount.instruction,
|
|
5403
|
-
toTokenAccount.instruction,
|
|
5404
5431
|
partnerFeeRecipientCreateIx,
|
|
5405
5432
|
tradingOpenBorrowInstruction,
|
|
5406
5433
|
openAddCollateralInstruction,
|
|
@@ -5775,7 +5802,9 @@ var openTradeV1 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
|
|
|
5775
5802
|
toTokenAccount: toTokenAccount.account.address,
|
|
5776
5803
|
systemProgram: import_web32.SystemProgram.programId,
|
|
5777
5804
|
positionAccount,
|
|
5778
|
-
randomAccountAsId: randomSeed.publicKey.toBase58()
|
|
5805
|
+
randomAccountAsId: randomSeed.publicKey.toBase58(),
|
|
5806
|
+
tokenProgram,
|
|
5807
|
+
associatedTokenProgram: import_spl_token2.ASSOCIATED_TOKEN_PROGRAM_ID
|
|
5779
5808
|
}).instruction();
|
|
5780
5809
|
const jupiterIxs = [
|
|
5781
5810
|
...setupInstructions.map(deserializeInstruction),
|
|
@@ -5814,7 +5843,6 @@ var openTradeV1 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
|
|
|
5814
5843
|
}
|
|
5815
5844
|
const allInstructions = [
|
|
5816
5845
|
fromTokenAccount.instruction,
|
|
5817
|
-
toTokenAccount.instruction,
|
|
5818
5846
|
partnerFeeRecipientCreateIx,
|
|
5819
5847
|
tradingOpenBorrowInstruction,
|
|
5820
5848
|
...jupiterIxs,
|
|
@@ -6384,7 +6412,8 @@ var closeTradeV1 = (lavarageProgram, position, offer, jupInstruction, partnerFee
|
|
|
6384
6412
|
systemProgram: import_web32.SystemProgram.programId,
|
|
6385
6413
|
trader: lavarageProgram.provider.publicKey,
|
|
6386
6414
|
tokenProgram,
|
|
6387
|
-
randomAccountAsId: position.account.seed
|
|
6415
|
+
randomAccountAsId: position.account.seed,
|
|
6416
|
+
associatedTokenProgram: import_spl_token2.ASSOCIATED_TOKEN_PROGRAM_ID
|
|
6388
6417
|
}).instruction();
|
|
6389
6418
|
let repaySolIx = null;
|
|
6390
6419
|
let jupiterIxs = [];
|
|
@@ -6518,8 +6547,7 @@ var closeTradeV1 = (lavarageProgram, position, offer, jupInstruction, partnerFee
|
|
|
6518
6547
|
if (splitTransactions) {
|
|
6519
6548
|
const setUpInstructions = [
|
|
6520
6549
|
partnerFeeRecipientCreateIx,
|
|
6521
|
-
jupInstruction.instructions && (platformFeeRecipientAccount == null ? void 0 : platformFeeRecipientAccount.instruction) ? platformFeeRecipientAccount.instruction : null
|
|
6522
|
-
createAssociatedTokenAccountInstruction2
|
|
6550
|
+
jupInstruction.instructions && (platformFeeRecipientAccount == null ? void 0 : platformFeeRecipientAccount.instruction) ? platformFeeRecipientAccount.instruction : null
|
|
6523
6551
|
].filter((i) => !!i);
|
|
6524
6552
|
const allInstructions2 = [
|
|
6525
6553
|
((_a = jupInstruction.instructions) == null ? void 0 : _a.tokenLedgerInstruction) ? deserializeInstruction(
|
|
@@ -6547,7 +6575,6 @@ var closeTradeV1 = (lavarageProgram, position, offer, jupInstruction, partnerFee
|
|
|
6547
6575
|
const allInstructions = [
|
|
6548
6576
|
partnerFeeRecipientCreateIx,
|
|
6549
6577
|
jupInstruction.instructions && (platformFeeRecipientAccount == null ? void 0 : platformFeeRecipientAccount.instruction) ? platformFeeRecipientAccount.instruction : null,
|
|
6550
|
-
createAssociatedTokenAccountInstruction2,
|
|
6551
6578
|
((_b = jupInstruction.instructions) == null ? void 0 : _b.tokenLedgerInstruction) ? deserializeInstruction(
|
|
6552
6579
|
jupInstruction.instructions.tokenLedgerInstruction
|
|
6553
6580
|
) : null,
|