@lavarage/sdk 7.5.17 → 7.5.19
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 +120 -0
- package/dist/index.d.ts +120 -0
- package/dist/index.js +182 -14
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +182 -14
- package/dist/index.mjs.map +1 -1
- package/idl/lavarage.ts +100 -0
- package/idl/lavaragev2.ts +140 -0
- package/index.ts +54 -6
- package/package.json +1 -1
package/dist/index.d.mts
CHANGED
|
@@ -402,6 +402,31 @@ type Lavarage$1 = {
|
|
|
402
402
|
"name": "feeReceipient";
|
|
403
403
|
"isMut": true;
|
|
404
404
|
"isSigner": false;
|
|
405
|
+
},
|
|
406
|
+
{
|
|
407
|
+
"name": "positionTokenAccount";
|
|
408
|
+
"isMut": true;
|
|
409
|
+
"isSigner": false;
|
|
410
|
+
},
|
|
411
|
+
{
|
|
412
|
+
"name": "collateralTokenProgram";
|
|
413
|
+
"isMut": false;
|
|
414
|
+
"isSigner": false;
|
|
415
|
+
},
|
|
416
|
+
{
|
|
417
|
+
"name": "associatedTokenProgram";
|
|
418
|
+
"isMut": false;
|
|
419
|
+
"isSigner": false;
|
|
420
|
+
},
|
|
421
|
+
{
|
|
422
|
+
"name": "collateralMint";
|
|
423
|
+
"isMut": false;
|
|
424
|
+
"isSigner": false;
|
|
425
|
+
},
|
|
426
|
+
{
|
|
427
|
+
"name": "usersTokenAccount";
|
|
428
|
+
"isMut": true;
|
|
429
|
+
"isSigner": false;
|
|
405
430
|
}
|
|
406
431
|
];
|
|
407
432
|
"args": [
|
|
@@ -462,6 +487,31 @@ type Lavarage$1 = {
|
|
|
462
487
|
"name": "feeReceipient";
|
|
463
488
|
"isMut": true;
|
|
464
489
|
"isSigner": false;
|
|
490
|
+
},
|
|
491
|
+
{
|
|
492
|
+
"name": "positionTokenAccount";
|
|
493
|
+
"isMut": true;
|
|
494
|
+
"isSigner": false;
|
|
495
|
+
},
|
|
496
|
+
{
|
|
497
|
+
"name": "collateralTokenProgram";
|
|
498
|
+
"isMut": false;
|
|
499
|
+
"isSigner": false;
|
|
500
|
+
},
|
|
501
|
+
{
|
|
502
|
+
"name": "associatedTokenProgram";
|
|
503
|
+
"isMut": false;
|
|
504
|
+
"isSigner": false;
|
|
505
|
+
},
|
|
506
|
+
{
|
|
507
|
+
"name": "collateralMint";
|
|
508
|
+
"isMut": false;
|
|
509
|
+
"isSigner": false;
|
|
510
|
+
},
|
|
511
|
+
{
|
|
512
|
+
"name": "usersTokenAccount";
|
|
513
|
+
"isMut": true;
|
|
514
|
+
"isSigner": false;
|
|
465
515
|
}
|
|
466
516
|
];
|
|
467
517
|
"args": [
|
|
@@ -2115,6 +2165,41 @@ type Lavarage = {
|
|
|
2115
2165
|
"name": "tokenProgram";
|
|
2116
2166
|
"isMut": false;
|
|
2117
2167
|
"isSigner": false;
|
|
2168
|
+
},
|
|
2169
|
+
{
|
|
2170
|
+
"name": "positionTokenAccount";
|
|
2171
|
+
"isMut": true;
|
|
2172
|
+
"isSigner": false;
|
|
2173
|
+
},
|
|
2174
|
+
{
|
|
2175
|
+
"name": "usersTokenAccount";
|
|
2176
|
+
"isMut": true;
|
|
2177
|
+
"isSigner": false;
|
|
2178
|
+
},
|
|
2179
|
+
{
|
|
2180
|
+
"name": "collateralTokenProgram";
|
|
2181
|
+
"isMut": false;
|
|
2182
|
+
"isSigner": false;
|
|
2183
|
+
},
|
|
2184
|
+
{
|
|
2185
|
+
"name": "associatedTokenProgram";
|
|
2186
|
+
"isMut": false;
|
|
2187
|
+
"isSigner": false;
|
|
2188
|
+
},
|
|
2189
|
+
{
|
|
2190
|
+
"name": "collateralMint";
|
|
2191
|
+
"isMut": false;
|
|
2192
|
+
"isSigner": false;
|
|
2193
|
+
},
|
|
2194
|
+
{
|
|
2195
|
+
"name": "quoteMint";
|
|
2196
|
+
"isMut": false;
|
|
2197
|
+
"isSigner": false;
|
|
2198
|
+
},
|
|
2199
|
+
{
|
|
2200
|
+
"name": "feeRecipient";
|
|
2201
|
+
"isMut": false;
|
|
2202
|
+
"isSigner": false;
|
|
2118
2203
|
}
|
|
2119
2204
|
];
|
|
2120
2205
|
"args": [
|
|
@@ -2190,6 +2275,41 @@ type Lavarage = {
|
|
|
2190
2275
|
"name": "tokenProgram";
|
|
2191
2276
|
"isMut": false;
|
|
2192
2277
|
"isSigner": false;
|
|
2278
|
+
},
|
|
2279
|
+
{
|
|
2280
|
+
"name": "positionTokenAccount";
|
|
2281
|
+
"isMut": true;
|
|
2282
|
+
"isSigner": false;
|
|
2283
|
+
},
|
|
2284
|
+
{
|
|
2285
|
+
"name": "usersTokenAccount";
|
|
2286
|
+
"isMut": true;
|
|
2287
|
+
"isSigner": false;
|
|
2288
|
+
},
|
|
2289
|
+
{
|
|
2290
|
+
"name": "collateralTokenProgram";
|
|
2291
|
+
"isMut": false;
|
|
2292
|
+
"isSigner": false;
|
|
2293
|
+
},
|
|
2294
|
+
{
|
|
2295
|
+
"name": "associatedTokenProgram";
|
|
2296
|
+
"isMut": false;
|
|
2297
|
+
"isSigner": false;
|
|
2298
|
+
},
|
|
2299
|
+
{
|
|
2300
|
+
"name": "collateralMint";
|
|
2301
|
+
"isMut": false;
|
|
2302
|
+
"isSigner": false;
|
|
2303
|
+
},
|
|
2304
|
+
{
|
|
2305
|
+
"name": "quoteMint";
|
|
2306
|
+
"isMut": false;
|
|
2307
|
+
"isSigner": false;
|
|
2308
|
+
},
|
|
2309
|
+
{
|
|
2310
|
+
"name": "feeRecipient";
|
|
2311
|
+
"isMut": false;
|
|
2312
|
+
"isSigner": false;
|
|
2193
2313
|
}
|
|
2194
2314
|
];
|
|
2195
2315
|
"args": [
|
package/dist/index.d.ts
CHANGED
|
@@ -402,6 +402,31 @@ type Lavarage$1 = {
|
|
|
402
402
|
"name": "feeReceipient";
|
|
403
403
|
"isMut": true;
|
|
404
404
|
"isSigner": false;
|
|
405
|
+
},
|
|
406
|
+
{
|
|
407
|
+
"name": "positionTokenAccount";
|
|
408
|
+
"isMut": true;
|
|
409
|
+
"isSigner": false;
|
|
410
|
+
},
|
|
411
|
+
{
|
|
412
|
+
"name": "collateralTokenProgram";
|
|
413
|
+
"isMut": false;
|
|
414
|
+
"isSigner": false;
|
|
415
|
+
},
|
|
416
|
+
{
|
|
417
|
+
"name": "associatedTokenProgram";
|
|
418
|
+
"isMut": false;
|
|
419
|
+
"isSigner": false;
|
|
420
|
+
},
|
|
421
|
+
{
|
|
422
|
+
"name": "collateralMint";
|
|
423
|
+
"isMut": false;
|
|
424
|
+
"isSigner": false;
|
|
425
|
+
},
|
|
426
|
+
{
|
|
427
|
+
"name": "usersTokenAccount";
|
|
428
|
+
"isMut": true;
|
|
429
|
+
"isSigner": false;
|
|
405
430
|
}
|
|
406
431
|
];
|
|
407
432
|
"args": [
|
|
@@ -462,6 +487,31 @@ type Lavarage$1 = {
|
|
|
462
487
|
"name": "feeReceipient";
|
|
463
488
|
"isMut": true;
|
|
464
489
|
"isSigner": false;
|
|
490
|
+
},
|
|
491
|
+
{
|
|
492
|
+
"name": "positionTokenAccount";
|
|
493
|
+
"isMut": true;
|
|
494
|
+
"isSigner": false;
|
|
495
|
+
},
|
|
496
|
+
{
|
|
497
|
+
"name": "collateralTokenProgram";
|
|
498
|
+
"isMut": false;
|
|
499
|
+
"isSigner": false;
|
|
500
|
+
},
|
|
501
|
+
{
|
|
502
|
+
"name": "associatedTokenProgram";
|
|
503
|
+
"isMut": false;
|
|
504
|
+
"isSigner": false;
|
|
505
|
+
},
|
|
506
|
+
{
|
|
507
|
+
"name": "collateralMint";
|
|
508
|
+
"isMut": false;
|
|
509
|
+
"isSigner": false;
|
|
510
|
+
},
|
|
511
|
+
{
|
|
512
|
+
"name": "usersTokenAccount";
|
|
513
|
+
"isMut": true;
|
|
514
|
+
"isSigner": false;
|
|
465
515
|
}
|
|
466
516
|
];
|
|
467
517
|
"args": [
|
|
@@ -2115,6 +2165,41 @@ type Lavarage = {
|
|
|
2115
2165
|
"name": "tokenProgram";
|
|
2116
2166
|
"isMut": false;
|
|
2117
2167
|
"isSigner": false;
|
|
2168
|
+
},
|
|
2169
|
+
{
|
|
2170
|
+
"name": "positionTokenAccount";
|
|
2171
|
+
"isMut": true;
|
|
2172
|
+
"isSigner": false;
|
|
2173
|
+
},
|
|
2174
|
+
{
|
|
2175
|
+
"name": "usersTokenAccount";
|
|
2176
|
+
"isMut": true;
|
|
2177
|
+
"isSigner": false;
|
|
2178
|
+
},
|
|
2179
|
+
{
|
|
2180
|
+
"name": "collateralTokenProgram";
|
|
2181
|
+
"isMut": false;
|
|
2182
|
+
"isSigner": false;
|
|
2183
|
+
},
|
|
2184
|
+
{
|
|
2185
|
+
"name": "associatedTokenProgram";
|
|
2186
|
+
"isMut": false;
|
|
2187
|
+
"isSigner": false;
|
|
2188
|
+
},
|
|
2189
|
+
{
|
|
2190
|
+
"name": "collateralMint";
|
|
2191
|
+
"isMut": false;
|
|
2192
|
+
"isSigner": false;
|
|
2193
|
+
},
|
|
2194
|
+
{
|
|
2195
|
+
"name": "quoteMint";
|
|
2196
|
+
"isMut": false;
|
|
2197
|
+
"isSigner": false;
|
|
2198
|
+
},
|
|
2199
|
+
{
|
|
2200
|
+
"name": "feeRecipient";
|
|
2201
|
+
"isMut": false;
|
|
2202
|
+
"isSigner": false;
|
|
2118
2203
|
}
|
|
2119
2204
|
];
|
|
2120
2205
|
"args": [
|
|
@@ -2190,6 +2275,41 @@ type Lavarage = {
|
|
|
2190
2275
|
"name": "tokenProgram";
|
|
2191
2276
|
"isMut": false;
|
|
2192
2277
|
"isSigner": false;
|
|
2278
|
+
},
|
|
2279
|
+
{
|
|
2280
|
+
"name": "positionTokenAccount";
|
|
2281
|
+
"isMut": true;
|
|
2282
|
+
"isSigner": false;
|
|
2283
|
+
},
|
|
2284
|
+
{
|
|
2285
|
+
"name": "usersTokenAccount";
|
|
2286
|
+
"isMut": true;
|
|
2287
|
+
"isSigner": false;
|
|
2288
|
+
},
|
|
2289
|
+
{
|
|
2290
|
+
"name": "collateralTokenProgram";
|
|
2291
|
+
"isMut": false;
|
|
2292
|
+
"isSigner": false;
|
|
2293
|
+
},
|
|
2294
|
+
{
|
|
2295
|
+
"name": "associatedTokenProgram";
|
|
2296
|
+
"isMut": false;
|
|
2297
|
+
"isSigner": false;
|
|
2298
|
+
},
|
|
2299
|
+
{
|
|
2300
|
+
"name": "collateralMint";
|
|
2301
|
+
"isMut": false;
|
|
2302
|
+
"isSigner": false;
|
|
2303
|
+
},
|
|
2304
|
+
{
|
|
2305
|
+
"name": "quoteMint";
|
|
2306
|
+
"isMut": false;
|
|
2307
|
+
"isSigner": false;
|
|
2308
|
+
},
|
|
2309
|
+
{
|
|
2310
|
+
"name": "feeRecipient";
|
|
2311
|
+
"isMut": false;
|
|
2312
|
+
"isSigner": false;
|
|
2193
2313
|
}
|
|
2194
2314
|
];
|
|
2195
2315
|
"args": [
|
package/dist/index.js
CHANGED
|
@@ -2138,6 +2138,31 @@ var IDL2 = {
|
|
|
2138
2138
|
"name": "feeReceipient",
|
|
2139
2139
|
"isMut": true,
|
|
2140
2140
|
"isSigner": false
|
|
2141
|
+
},
|
|
2142
|
+
{
|
|
2143
|
+
"name": "positionTokenAccount",
|
|
2144
|
+
"isMut": true,
|
|
2145
|
+
"isSigner": false
|
|
2146
|
+
},
|
|
2147
|
+
{
|
|
2148
|
+
"name": "collateralTokenProgram",
|
|
2149
|
+
"isMut": false,
|
|
2150
|
+
"isSigner": false
|
|
2151
|
+
},
|
|
2152
|
+
{
|
|
2153
|
+
"name": "associatedTokenProgram",
|
|
2154
|
+
"isMut": false,
|
|
2155
|
+
"isSigner": false
|
|
2156
|
+
},
|
|
2157
|
+
{
|
|
2158
|
+
"name": "collateralMint",
|
|
2159
|
+
"isMut": false,
|
|
2160
|
+
"isSigner": false
|
|
2161
|
+
},
|
|
2162
|
+
{
|
|
2163
|
+
"name": "usersTokenAccount",
|
|
2164
|
+
"isMut": true,
|
|
2165
|
+
"isSigner": false
|
|
2141
2166
|
}
|
|
2142
2167
|
],
|
|
2143
2168
|
"args": [
|
|
@@ -2198,6 +2223,31 @@ var IDL2 = {
|
|
|
2198
2223
|
"name": "feeReceipient",
|
|
2199
2224
|
"isMut": true,
|
|
2200
2225
|
"isSigner": false
|
|
2226
|
+
},
|
|
2227
|
+
{
|
|
2228
|
+
"name": "positionTokenAccount",
|
|
2229
|
+
"isMut": true,
|
|
2230
|
+
"isSigner": false
|
|
2231
|
+
},
|
|
2232
|
+
{
|
|
2233
|
+
"name": "collateralTokenProgram",
|
|
2234
|
+
"isMut": false,
|
|
2235
|
+
"isSigner": false
|
|
2236
|
+
},
|
|
2237
|
+
{
|
|
2238
|
+
"name": "associatedTokenProgram",
|
|
2239
|
+
"isMut": false,
|
|
2240
|
+
"isSigner": false
|
|
2241
|
+
},
|
|
2242
|
+
{
|
|
2243
|
+
"name": "collateralMint",
|
|
2244
|
+
"isMut": false,
|
|
2245
|
+
"isSigner": false
|
|
2246
|
+
},
|
|
2247
|
+
{
|
|
2248
|
+
"name": "usersTokenAccount",
|
|
2249
|
+
"isMut": true,
|
|
2250
|
+
"isSigner": false
|
|
2201
2251
|
}
|
|
2202
2252
|
],
|
|
2203
2253
|
"args": [
|
|
@@ -3855,6 +3905,41 @@ var IDL3 = {
|
|
|
3855
3905
|
"name": "tokenProgram",
|
|
3856
3906
|
"isMut": false,
|
|
3857
3907
|
"isSigner": false
|
|
3908
|
+
},
|
|
3909
|
+
{
|
|
3910
|
+
"name": "positionTokenAccount",
|
|
3911
|
+
"isMut": true,
|
|
3912
|
+
"isSigner": false
|
|
3913
|
+
},
|
|
3914
|
+
{
|
|
3915
|
+
"name": "usersTokenAccount",
|
|
3916
|
+
"isMut": true,
|
|
3917
|
+
"isSigner": false
|
|
3918
|
+
},
|
|
3919
|
+
{
|
|
3920
|
+
"name": "collateralTokenProgram",
|
|
3921
|
+
"isMut": false,
|
|
3922
|
+
"isSigner": false
|
|
3923
|
+
},
|
|
3924
|
+
{
|
|
3925
|
+
"name": "associatedTokenProgram",
|
|
3926
|
+
"isMut": false,
|
|
3927
|
+
"isSigner": false
|
|
3928
|
+
},
|
|
3929
|
+
{
|
|
3930
|
+
"name": "collateralMint",
|
|
3931
|
+
"isMut": false,
|
|
3932
|
+
"isSigner": false
|
|
3933
|
+
},
|
|
3934
|
+
{
|
|
3935
|
+
"name": "quoteMint",
|
|
3936
|
+
"isMut": false,
|
|
3937
|
+
"isSigner": false
|
|
3938
|
+
},
|
|
3939
|
+
{
|
|
3940
|
+
"name": "feeRecipient",
|
|
3941
|
+
"isMut": false,
|
|
3942
|
+
"isSigner": false
|
|
3858
3943
|
}
|
|
3859
3944
|
],
|
|
3860
3945
|
"args": [
|
|
@@ -3930,6 +4015,41 @@ var IDL3 = {
|
|
|
3930
4015
|
"name": "tokenProgram",
|
|
3931
4016
|
"isMut": false,
|
|
3932
4017
|
"isSigner": false
|
|
4018
|
+
},
|
|
4019
|
+
{
|
|
4020
|
+
"name": "positionTokenAccount",
|
|
4021
|
+
"isMut": true,
|
|
4022
|
+
"isSigner": false
|
|
4023
|
+
},
|
|
4024
|
+
{
|
|
4025
|
+
"name": "usersTokenAccount",
|
|
4026
|
+
"isMut": true,
|
|
4027
|
+
"isSigner": false
|
|
4028
|
+
},
|
|
4029
|
+
{
|
|
4030
|
+
"name": "collateralTokenProgram",
|
|
4031
|
+
"isMut": false,
|
|
4032
|
+
"isSigner": false
|
|
4033
|
+
},
|
|
4034
|
+
{
|
|
4035
|
+
"name": "associatedTokenProgram",
|
|
4036
|
+
"isMut": false,
|
|
4037
|
+
"isSigner": false
|
|
4038
|
+
},
|
|
4039
|
+
{
|
|
4040
|
+
"name": "collateralMint",
|
|
4041
|
+
"isMut": false,
|
|
4042
|
+
"isSigner": false
|
|
4043
|
+
},
|
|
4044
|
+
{
|
|
4045
|
+
"name": "quoteMint",
|
|
4046
|
+
"isMut": false,
|
|
4047
|
+
"isSigner": false
|
|
4048
|
+
},
|
|
4049
|
+
{
|
|
4050
|
+
"name": "feeRecipient",
|
|
4051
|
+
"isMut": false,
|
|
4052
|
+
"isSigner": false
|
|
3933
4053
|
}
|
|
3934
4054
|
],
|
|
3935
4055
|
"args": [
|
|
@@ -5442,7 +5562,12 @@ var borrowV1 = (lavarageProgram, offer, marginSOL, leverage, randomSeed, tokenPr
|
|
|
5442
5562
|
systemProgram: import_web32.SystemProgram.programId,
|
|
5443
5563
|
clock: import_web32.SYSVAR_CLOCK_PUBKEY,
|
|
5444
5564
|
randomAccountAsId: randomSeed.publicKey.toBase58(),
|
|
5445
|
-
feeReceipient: "6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF"
|
|
5565
|
+
feeReceipient: "6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF",
|
|
5566
|
+
positionTokenAccount: toTokenAccount.account.address,
|
|
5567
|
+
collateralTokenProgram: tokenProgram,
|
|
5568
|
+
associatedTokenProgram: import_spl_token2.ASSOCIATED_TOKEN_PROGRAM_ID,
|
|
5569
|
+
collateralMint: offer.account.collateralType,
|
|
5570
|
+
usersTokenAccount: fromTokenAccount.account.address
|
|
5446
5571
|
}).remainingAccounts(
|
|
5447
5572
|
partnerFeeRecipient && partnerFeeMarkupAsPkey && userVaultPda ? [
|
|
5448
5573
|
{
|
|
@@ -5463,7 +5588,12 @@ var borrowV1 = (lavarageProgram, offer, marginSOL, leverage, randomSeed, tokenPr
|
|
|
5463
5588
|
systemProgram: import_web32.SystemProgram.programId,
|
|
5464
5589
|
clock: import_web32.SYSVAR_CLOCK_PUBKEY,
|
|
5465
5590
|
randomAccountAsId: randomSeed.publicKey.toBase58(),
|
|
5466
|
-
feeReceipient: "6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF"
|
|
5591
|
+
feeReceipient: "6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF",
|
|
5592
|
+
positionTokenAccount: toTokenAccount.account.address,
|
|
5593
|
+
collateralTokenProgram: tokenProgram,
|
|
5594
|
+
associatedTokenProgram: import_spl_token2.ASSOCIATED_TOKEN_PROGRAM_ID,
|
|
5595
|
+
collateralMint: offer.account.collateralType,
|
|
5596
|
+
usersTokenAccount: fromTokenAccount.account.address
|
|
5467
5597
|
}).remainingAccounts(
|
|
5468
5598
|
partnerFeeRecipient && partnerFeeMarkupAsPkey ? [
|
|
5469
5599
|
{
|
|
@@ -5493,8 +5623,8 @@ var borrowV1 = (lavarageProgram, offer, marginSOL, leverage, randomSeed, tokenPr
|
|
|
5493
5623
|
microLamports: computeBudgetMicroLamports != null ? computeBudgetMicroLamports : 1e5
|
|
5494
5624
|
});
|
|
5495
5625
|
const allInstructions = [
|
|
5496
|
-
fromTokenAccount.instruction
|
|
5497
|
-
toTokenAccount.instruction
|
|
5626
|
+
// fromTokenAccount.instruction!,
|
|
5627
|
+
// toTokenAccount.instruction!,
|
|
5498
5628
|
partnerFeeRecipientCreateIx,
|
|
5499
5629
|
tradingOpenBorrowInstruction,
|
|
5500
5630
|
openAddCollateralInstruction,
|
|
@@ -5608,7 +5738,14 @@ var borrowV2 = (lavarageProgram, offer, marginSOL, leverage, randomSeed, quoteTo
|
|
|
5608
5738
|
offer.account.nodeWallet,
|
|
5609
5739
|
true,
|
|
5610
5740
|
quoteTokenProgram
|
|
5611
|
-
)
|
|
5741
|
+
),
|
|
5742
|
+
positionTokenAccount: toTokenAccount.account.address,
|
|
5743
|
+
collateralTokenProgram: tokenProgram,
|
|
5744
|
+
associatedTokenProgram: import_spl_token2.ASSOCIATED_TOKEN_PROGRAM_ID,
|
|
5745
|
+
collateralMint: offer.account.collateralType,
|
|
5746
|
+
usersTokenAccount: fromTokenAccount.account.address,
|
|
5747
|
+
quoteMint: quoteToken,
|
|
5748
|
+
feeRecipient: new import_web32.PublicKey("6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF")
|
|
5612
5749
|
}).remainingAccounts(
|
|
5613
5750
|
partnerFeeRecipient && partnerFeeMarkupAsPkey && userVaultPda ? [
|
|
5614
5751
|
{
|
|
@@ -5653,7 +5790,14 @@ var borrowV2 = (lavarageProgram, offer, marginSOL, leverage, randomSeed, quoteTo
|
|
|
5653
5790
|
offer.account.nodeWallet,
|
|
5654
5791
|
true,
|
|
5655
5792
|
quoteTokenProgram
|
|
5656
|
-
)
|
|
5793
|
+
),
|
|
5794
|
+
positionTokenAccount: toTokenAccount.account.address,
|
|
5795
|
+
collateralTokenProgram: tokenProgram,
|
|
5796
|
+
associatedTokenProgram: import_spl_token2.ASSOCIATED_TOKEN_PROGRAM_ID,
|
|
5797
|
+
collateralMint: offer.account.collateralType,
|
|
5798
|
+
usersTokenAccount: fromTokenAccount.account.address,
|
|
5799
|
+
quoteMint: quoteToken,
|
|
5800
|
+
feeRecipient: new import_web32.PublicKey("6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF")
|
|
5657
5801
|
}).remainingAccounts(
|
|
5658
5802
|
partnerFeeRecipient && partnerFeeMarkupAsPkey && userVaultPda ? [
|
|
5659
5803
|
{
|
|
@@ -5827,7 +5971,12 @@ var openTradeV1 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
|
|
|
5827
5971
|
systemProgram: import_web32.SystemProgram.programId,
|
|
5828
5972
|
clock: import_web32.SYSVAR_CLOCK_PUBKEY,
|
|
5829
5973
|
randomAccountAsId: randomSeed.publicKey.toBase58(),
|
|
5830
|
-
feeReceipient: "6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF"
|
|
5974
|
+
feeReceipient: "6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF",
|
|
5975
|
+
positionTokenAccount: toTokenAccount.account.address,
|
|
5976
|
+
collateralTokenProgram: tokenProgram,
|
|
5977
|
+
associatedTokenProgram: import_spl_token2.ASSOCIATED_TOKEN_PROGRAM_ID,
|
|
5978
|
+
collateralMint: offer.account.collateralType,
|
|
5979
|
+
usersTokenAccount: fromTokenAccount.account.address
|
|
5831
5980
|
}).remainingAccounts(
|
|
5832
5981
|
partnerFeeRecipient && partnerFeeMarkupAsPkey && userVaultPda ? [
|
|
5833
5982
|
{
|
|
@@ -5848,7 +5997,12 @@ var openTradeV1 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
|
|
|
5848
5997
|
systemProgram: import_web32.SystemProgram.programId,
|
|
5849
5998
|
clock: import_web32.SYSVAR_CLOCK_PUBKEY,
|
|
5850
5999
|
randomAccountAsId: randomSeed.publicKey.toBase58(),
|
|
5851
|
-
feeReceipient: "6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF"
|
|
6000
|
+
feeReceipient: "6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF",
|
|
6001
|
+
positionTokenAccount: toTokenAccount.account.address,
|
|
6002
|
+
collateralTokenProgram: tokenProgram,
|
|
6003
|
+
associatedTokenProgram: import_spl_token2.ASSOCIATED_TOKEN_PROGRAM_ID,
|
|
6004
|
+
collateralMint: offer.account.collateralType,
|
|
6005
|
+
usersTokenAccount: fromTokenAccount.account.address
|
|
5852
6006
|
}).remainingAccounts(
|
|
5853
6007
|
partnerFeeRecipient && partnerFeeMarkupAsPkey ? [
|
|
5854
6008
|
{
|
|
@@ -5910,8 +6064,8 @@ var openTradeV1 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
|
|
|
5910
6064
|
return [tx2, tx3];
|
|
5911
6065
|
}
|
|
5912
6066
|
const allInstructions = [
|
|
5913
|
-
fromTokenAccount.instruction
|
|
5914
|
-
toTokenAccount.instruction
|
|
6067
|
+
// fromTokenAccount.instruction!,
|
|
6068
|
+
// toTokenAccount.instruction!,
|
|
5915
6069
|
partnerFeeRecipientCreateIx,
|
|
5916
6070
|
tradingOpenBorrowInstruction,
|
|
5917
6071
|
...jupiterIxs,
|
|
@@ -6111,7 +6265,14 @@ var openTradeV2 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
|
|
|
6111
6265
|
offer.account.nodeWallet,
|
|
6112
6266
|
true,
|
|
6113
6267
|
quoteTokenProgram
|
|
6114
|
-
)
|
|
6268
|
+
),
|
|
6269
|
+
positionTokenAccount: toTokenAccount.account.address,
|
|
6270
|
+
collateralTokenProgram: tokenProgram,
|
|
6271
|
+
associatedTokenProgram: import_spl_token2.ASSOCIATED_TOKEN_PROGRAM_ID,
|
|
6272
|
+
collateralMint: offer.account.collateralType,
|
|
6273
|
+
usersTokenAccount: fromTokenAccount.account.address,
|
|
6274
|
+
quoteMint: quoteToken,
|
|
6275
|
+
feeRecipient: new import_web32.PublicKey("6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF")
|
|
6115
6276
|
}).remainingAccounts(
|
|
6116
6277
|
partnerFeeRecipient && partnerFeeMarkupAsPkey && userVaultPda ? [
|
|
6117
6278
|
{
|
|
@@ -6156,7 +6317,14 @@ var openTradeV2 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
|
|
|
6156
6317
|
offer.account.nodeWallet,
|
|
6157
6318
|
true,
|
|
6158
6319
|
quoteTokenProgram
|
|
6159
|
-
)
|
|
6320
|
+
),
|
|
6321
|
+
positionTokenAccount: toTokenAccount.account.address,
|
|
6322
|
+
collateralTokenProgram: tokenProgram,
|
|
6323
|
+
associatedTokenProgram: import_spl_token2.ASSOCIATED_TOKEN_PROGRAM_ID,
|
|
6324
|
+
collateralMint: offer.account.collateralType,
|
|
6325
|
+
usersTokenAccount: fromTokenAccount.account.address,
|
|
6326
|
+
quoteMint: quoteToken,
|
|
6327
|
+
feeRecipient: new import_web32.PublicKey("6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF")
|
|
6160
6328
|
}).remainingAccounts(
|
|
6161
6329
|
partnerFeeRecipient && partnerFeeMarkupAsPkey && partnerDirectAta ? [
|
|
6162
6330
|
{
|
|
@@ -6192,7 +6360,7 @@ var openTradeV2 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
|
|
|
6192
6360
|
if (splitTransactions) {
|
|
6193
6361
|
const setUpInstructions = [
|
|
6194
6362
|
fromTokenAccount.instruction,
|
|
6195
|
-
toTokenAccount.instruction
|
|
6363
|
+
// toTokenAccount.instruction!,
|
|
6196
6364
|
partnerFeeRecipientVaultCreateIx,
|
|
6197
6365
|
partnerFeeRecipientTokenAccountCreateIx,
|
|
6198
6366
|
...setupInstructions.map(deserializeInstruction)
|
|
@@ -6220,7 +6388,7 @@ var openTradeV2 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
|
|
|
6220
6388
|
}
|
|
6221
6389
|
const allInstructions = [
|
|
6222
6390
|
fromTokenAccount.instruction,
|
|
6223
|
-
toTokenAccount.instruction
|
|
6391
|
+
// toTokenAccount.instruction!,
|
|
6224
6392
|
partnerFeeRecipientVaultCreateIx,
|
|
6225
6393
|
partnerFeeRecipientTokenAccountCreateIx,
|
|
6226
6394
|
tradingOpenBorrowInstruction,
|