@lavarage/sdk 7.5.16 → 7.5.18
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.js +2 -0
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +2 -0
- package/dist/index.mjs.map +1 -1
- package/idl/lavarage.ts +100 -0
- package/idl/lavaragev2.ts +140 -0
- package/index.ts +56 -6
- package/package.json +1 -1
package/idl/lavarage.ts
CHANGED
|
@@ -398,6 +398,31 @@ export type Lavarage = {
|
|
|
398
398
|
"name": "feeReceipient",
|
|
399
399
|
"isMut": true,
|
|
400
400
|
"isSigner": false
|
|
401
|
+
},
|
|
402
|
+
{
|
|
403
|
+
"name": "positionTokenAccount",
|
|
404
|
+
"isMut": true,
|
|
405
|
+
"isSigner": false
|
|
406
|
+
},
|
|
407
|
+
{
|
|
408
|
+
"name": "collateralTokenProgram",
|
|
409
|
+
"isMut": false,
|
|
410
|
+
"isSigner": false
|
|
411
|
+
},
|
|
412
|
+
{
|
|
413
|
+
"name": "associatedTokenProgram",
|
|
414
|
+
"isMut": false,
|
|
415
|
+
"isSigner": false
|
|
416
|
+
},
|
|
417
|
+
{
|
|
418
|
+
"name": "collateralMint",
|
|
419
|
+
"isMut": false,
|
|
420
|
+
"isSigner": false
|
|
421
|
+
},
|
|
422
|
+
{
|
|
423
|
+
"name": "usersTokenAccount",
|
|
424
|
+
"isMut": true,
|
|
425
|
+
"isSigner": false
|
|
401
426
|
}
|
|
402
427
|
],
|
|
403
428
|
"args": [
|
|
@@ -458,6 +483,31 @@ export type Lavarage = {
|
|
|
458
483
|
"name": "feeReceipient",
|
|
459
484
|
"isMut": true,
|
|
460
485
|
"isSigner": false
|
|
486
|
+
},
|
|
487
|
+
{
|
|
488
|
+
"name": "positionTokenAccount",
|
|
489
|
+
"isMut": true,
|
|
490
|
+
"isSigner": false
|
|
491
|
+
},
|
|
492
|
+
{
|
|
493
|
+
"name": "collateralTokenProgram",
|
|
494
|
+
"isMut": false,
|
|
495
|
+
"isSigner": false
|
|
496
|
+
},
|
|
497
|
+
{
|
|
498
|
+
"name": "associatedTokenProgram",
|
|
499
|
+
"isMut": false,
|
|
500
|
+
"isSigner": false
|
|
501
|
+
},
|
|
502
|
+
{
|
|
503
|
+
"name": "collateralMint",
|
|
504
|
+
"isMut": false,
|
|
505
|
+
"isSigner": false
|
|
506
|
+
},
|
|
507
|
+
{
|
|
508
|
+
"name": "usersTokenAccount",
|
|
509
|
+
"isMut": true,
|
|
510
|
+
"isSigner": false
|
|
461
511
|
}
|
|
462
512
|
],
|
|
463
513
|
"args": [
|
|
@@ -2081,6 +2131,31 @@ export const IDL: Lavarage = {
|
|
|
2081
2131
|
"name": "feeReceipient",
|
|
2082
2132
|
"isMut": true,
|
|
2083
2133
|
"isSigner": false
|
|
2134
|
+
},
|
|
2135
|
+
{
|
|
2136
|
+
"name": "positionTokenAccount",
|
|
2137
|
+
"isMut": true,
|
|
2138
|
+
"isSigner": false
|
|
2139
|
+
},
|
|
2140
|
+
{
|
|
2141
|
+
"name": "collateralTokenProgram",
|
|
2142
|
+
"isMut": false,
|
|
2143
|
+
"isSigner": false
|
|
2144
|
+
},
|
|
2145
|
+
{
|
|
2146
|
+
"name": "associatedTokenProgram",
|
|
2147
|
+
"isMut": false,
|
|
2148
|
+
"isSigner": false
|
|
2149
|
+
},
|
|
2150
|
+
{
|
|
2151
|
+
"name": "collateralMint",
|
|
2152
|
+
"isMut": false,
|
|
2153
|
+
"isSigner": false
|
|
2154
|
+
},
|
|
2155
|
+
{
|
|
2156
|
+
"name": "usersTokenAccount",
|
|
2157
|
+
"isMut": true,
|
|
2158
|
+
"isSigner": false
|
|
2084
2159
|
}
|
|
2085
2160
|
],
|
|
2086
2161
|
"args": [
|
|
@@ -2141,6 +2216,31 @@ export const IDL: Lavarage = {
|
|
|
2141
2216
|
"name": "feeReceipient",
|
|
2142
2217
|
"isMut": true,
|
|
2143
2218
|
"isSigner": false
|
|
2219
|
+
},
|
|
2220
|
+
{
|
|
2221
|
+
"name": "positionTokenAccount",
|
|
2222
|
+
"isMut": true,
|
|
2223
|
+
"isSigner": false
|
|
2224
|
+
},
|
|
2225
|
+
{
|
|
2226
|
+
"name": "collateralTokenProgram",
|
|
2227
|
+
"isMut": false,
|
|
2228
|
+
"isSigner": false
|
|
2229
|
+
},
|
|
2230
|
+
{
|
|
2231
|
+
"name": "associatedTokenProgram",
|
|
2232
|
+
"isMut": false,
|
|
2233
|
+
"isSigner": false
|
|
2234
|
+
},
|
|
2235
|
+
{
|
|
2236
|
+
"name": "collateralMint",
|
|
2237
|
+
"isMut": false,
|
|
2238
|
+
"isSigner": false
|
|
2239
|
+
},
|
|
2240
|
+
{
|
|
2241
|
+
"name": "usersTokenAccount",
|
|
2242
|
+
"isMut": true,
|
|
2243
|
+
"isSigner": false
|
|
2144
2244
|
}
|
|
2145
2245
|
],
|
|
2146
2246
|
"args": [
|
package/idl/lavaragev2.ts
CHANGED
|
@@ -427,6 +427,41 @@ export type Lavarage = {
|
|
|
427
427
|
"name": "tokenProgram",
|
|
428
428
|
"isMut": false,
|
|
429
429
|
"isSigner": false
|
|
430
|
+
},
|
|
431
|
+
{
|
|
432
|
+
"name": "positionTokenAccount",
|
|
433
|
+
"isMut": true,
|
|
434
|
+
"isSigner": false
|
|
435
|
+
},
|
|
436
|
+
{
|
|
437
|
+
"name": "usersTokenAccount",
|
|
438
|
+
"isMut": true,
|
|
439
|
+
"isSigner": false
|
|
440
|
+
},
|
|
441
|
+
{
|
|
442
|
+
"name": "collateralTokenProgram",
|
|
443
|
+
"isMut": false,
|
|
444
|
+
"isSigner": false
|
|
445
|
+
},
|
|
446
|
+
{
|
|
447
|
+
"name": "associatedTokenProgram",
|
|
448
|
+
"isMut": false,
|
|
449
|
+
"isSigner": false
|
|
450
|
+
},
|
|
451
|
+
{
|
|
452
|
+
"name": "collateralMint",
|
|
453
|
+
"isMut": false,
|
|
454
|
+
"isSigner": false
|
|
455
|
+
},
|
|
456
|
+
{
|
|
457
|
+
"name": "quoteMint",
|
|
458
|
+
"isMut": false,
|
|
459
|
+
"isSigner": false
|
|
460
|
+
},
|
|
461
|
+
{
|
|
462
|
+
"name": "feeRecipient",
|
|
463
|
+
"isMut": false,
|
|
464
|
+
"isSigner": false
|
|
430
465
|
}
|
|
431
466
|
],
|
|
432
467
|
"args": [
|
|
@@ -502,6 +537,41 @@ export type Lavarage = {
|
|
|
502
537
|
"name": "tokenProgram",
|
|
503
538
|
"isMut": false,
|
|
504
539
|
"isSigner": false
|
|
540
|
+
},
|
|
541
|
+
{
|
|
542
|
+
"name": "positionTokenAccount",
|
|
543
|
+
"isMut": true,
|
|
544
|
+
"isSigner": false
|
|
545
|
+
},
|
|
546
|
+
{
|
|
547
|
+
"name": "usersTokenAccount",
|
|
548
|
+
"isMut": true,
|
|
549
|
+
"isSigner": false
|
|
550
|
+
},
|
|
551
|
+
{
|
|
552
|
+
"name": "collateralTokenProgram",
|
|
553
|
+
"isMut": false,
|
|
554
|
+
"isSigner": false
|
|
555
|
+
},
|
|
556
|
+
{
|
|
557
|
+
"name": "associatedTokenProgram",
|
|
558
|
+
"isMut": false,
|
|
559
|
+
"isSigner": false
|
|
560
|
+
},
|
|
561
|
+
{
|
|
562
|
+
"name": "collateralMint",
|
|
563
|
+
"isMut": false,
|
|
564
|
+
"isSigner": false
|
|
565
|
+
},
|
|
566
|
+
{
|
|
567
|
+
"name": "quoteMint",
|
|
568
|
+
"isMut": false,
|
|
569
|
+
"isSigner": false
|
|
570
|
+
},
|
|
571
|
+
{
|
|
572
|
+
"name": "feeRecipient",
|
|
573
|
+
"isMut": false,
|
|
574
|
+
"isSigner": false
|
|
505
575
|
}
|
|
506
576
|
],
|
|
507
577
|
"args": [
|
|
@@ -2263,6 +2333,41 @@ export const IDL: Lavarage = {
|
|
|
2263
2333
|
"name": "tokenProgram",
|
|
2264
2334
|
"isMut": false,
|
|
2265
2335
|
"isSigner": false
|
|
2336
|
+
},
|
|
2337
|
+
{
|
|
2338
|
+
"name": "positionTokenAccount",
|
|
2339
|
+
"isMut": true,
|
|
2340
|
+
"isSigner": false
|
|
2341
|
+
},
|
|
2342
|
+
{
|
|
2343
|
+
"name": "usersTokenAccount",
|
|
2344
|
+
"isMut": true,
|
|
2345
|
+
"isSigner": false
|
|
2346
|
+
},
|
|
2347
|
+
{
|
|
2348
|
+
"name": "collateralTokenProgram",
|
|
2349
|
+
"isMut": false,
|
|
2350
|
+
"isSigner": false
|
|
2351
|
+
},
|
|
2352
|
+
{
|
|
2353
|
+
"name": "associatedTokenProgram",
|
|
2354
|
+
"isMut": false,
|
|
2355
|
+
"isSigner": false
|
|
2356
|
+
},
|
|
2357
|
+
{
|
|
2358
|
+
"name": "collateralMint",
|
|
2359
|
+
"isMut": false,
|
|
2360
|
+
"isSigner": false
|
|
2361
|
+
},
|
|
2362
|
+
{
|
|
2363
|
+
"name": "quoteMint",
|
|
2364
|
+
"isMut": false,
|
|
2365
|
+
"isSigner": false
|
|
2366
|
+
},
|
|
2367
|
+
{
|
|
2368
|
+
"name": "feeRecipient",
|
|
2369
|
+
"isMut": false,
|
|
2370
|
+
"isSigner": false
|
|
2266
2371
|
}
|
|
2267
2372
|
],
|
|
2268
2373
|
"args": [
|
|
@@ -2338,6 +2443,41 @@ export const IDL: Lavarage = {
|
|
|
2338
2443
|
"name": "tokenProgram",
|
|
2339
2444
|
"isMut": false,
|
|
2340
2445
|
"isSigner": false
|
|
2446
|
+
},
|
|
2447
|
+
{
|
|
2448
|
+
"name": "positionTokenAccount",
|
|
2449
|
+
"isMut": true,
|
|
2450
|
+
"isSigner": false
|
|
2451
|
+
},
|
|
2452
|
+
{
|
|
2453
|
+
"name": "usersTokenAccount",
|
|
2454
|
+
"isMut": true,
|
|
2455
|
+
"isSigner": false
|
|
2456
|
+
},
|
|
2457
|
+
{
|
|
2458
|
+
"name": "collateralTokenProgram",
|
|
2459
|
+
"isMut": false,
|
|
2460
|
+
"isSigner": false
|
|
2461
|
+
},
|
|
2462
|
+
{
|
|
2463
|
+
"name": "associatedTokenProgram",
|
|
2464
|
+
"isMut": false,
|
|
2465
|
+
"isSigner": false
|
|
2466
|
+
},
|
|
2467
|
+
{
|
|
2468
|
+
"name": "collateralMint",
|
|
2469
|
+
"isMut": false,
|
|
2470
|
+
"isSigner": false
|
|
2471
|
+
},
|
|
2472
|
+
{
|
|
2473
|
+
"name": "quoteMint",
|
|
2474
|
+
"isMut": false,
|
|
2475
|
+
"isSigner": false
|
|
2476
|
+
},
|
|
2477
|
+
{
|
|
2478
|
+
"name": "feeRecipient",
|
|
2479
|
+
"isMut": false,
|
|
2480
|
+
"isSigner": false
|
|
2341
2481
|
}
|
|
2342
2482
|
],
|
|
2343
2483
|
"args": [
|
package/index.ts
CHANGED
|
@@ -501,6 +501,11 @@ export const borrowV1 = async (
|
|
|
501
501
|
clock: SYSVAR_CLOCK_PUBKEY,
|
|
502
502
|
randomAccountAsId: randomSeed.publicKey.toBase58(),
|
|
503
503
|
feeReceipient: "6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF",
|
|
504
|
+
positionTokenAccount: toTokenAccount.account!.address,
|
|
505
|
+
collateralTokenProgram: tokenProgram,
|
|
506
|
+
associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
|
|
507
|
+
collateralMint: offer.account.collateralType,
|
|
508
|
+
usersTokenAccount: fromTokenAccount.account.address,
|
|
504
509
|
})
|
|
505
510
|
.remainingAccounts(
|
|
506
511
|
partnerFeeRecipient && partnerFeeMarkupAsPkey && userVaultPda
|
|
@@ -529,6 +534,11 @@ export const borrowV1 = async (
|
|
|
529
534
|
clock: SYSVAR_CLOCK_PUBKEY,
|
|
530
535
|
randomAccountAsId: randomSeed.publicKey.toBase58(),
|
|
531
536
|
feeReceipient: "6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF",
|
|
537
|
+
positionTokenAccount: toTokenAccount.account!.address,
|
|
538
|
+
collateralTokenProgram: tokenProgram,
|
|
539
|
+
associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
|
|
540
|
+
collateralMint: offer.account.collateralType,
|
|
541
|
+
usersTokenAccount: fromTokenAccount.account.address,
|
|
532
542
|
})
|
|
533
543
|
.remainingAccounts(
|
|
534
544
|
partnerFeeRecipient && partnerFeeMarkupAsPkey
|
|
@@ -568,7 +578,8 @@ export const borrowV1 = async (
|
|
|
568
578
|
});
|
|
569
579
|
|
|
570
580
|
const allInstructions = [
|
|
571
|
-
fromTokenAccount.instruction!,
|
|
581
|
+
// fromTokenAccount.instruction!,
|
|
582
|
+
// toTokenAccount.instruction!,
|
|
572
583
|
partnerFeeRecipientCreateIx,
|
|
573
584
|
tradingOpenBorrowInstruction!,
|
|
574
585
|
openAddCollateralInstruction!,
|
|
@@ -731,6 +742,13 @@ export const borrowV2 = async (
|
|
|
731
742
|
true,
|
|
732
743
|
quoteTokenProgram
|
|
733
744
|
),
|
|
745
|
+
positionTokenAccount: toTokenAccount.account!.address,
|
|
746
|
+
collateralTokenProgram: tokenProgram,
|
|
747
|
+
associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
|
|
748
|
+
collateralMint: offer.account.collateralType,
|
|
749
|
+
usersTokenAccount: fromTokenAccount.account!.address,
|
|
750
|
+
quoteMint: quoteToken,
|
|
751
|
+
feeRecipient: new PublicKey("6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF"),
|
|
734
752
|
})
|
|
735
753
|
.remainingAccounts(
|
|
736
754
|
partnerFeeRecipient && partnerFeeMarkupAsPkey && userVaultPda
|
|
@@ -782,6 +800,13 @@ export const borrowV2 = async (
|
|
|
782
800
|
true,
|
|
783
801
|
quoteTokenProgram
|
|
784
802
|
),
|
|
803
|
+
positionTokenAccount: toTokenAccount.account!.address,
|
|
804
|
+
collateralTokenProgram: tokenProgram,
|
|
805
|
+
associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
|
|
806
|
+
collateralMint: offer.account.collateralType,
|
|
807
|
+
usersTokenAccount: fromTokenAccount.account!.address,
|
|
808
|
+
quoteMint: quoteToken,
|
|
809
|
+
feeRecipient: new PublicKey("6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF"),
|
|
785
810
|
})
|
|
786
811
|
.remainingAccounts(
|
|
787
812
|
partnerFeeRecipient && partnerFeeMarkupAsPkey && userVaultPda
|
|
@@ -1082,6 +1107,11 @@ export const openTradeV1 = async (
|
|
|
1082
1107
|
clock: SYSVAR_CLOCK_PUBKEY,
|
|
1083
1108
|
randomAccountAsId: randomSeed.publicKey.toBase58(),
|
|
1084
1109
|
feeReceipient: "6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF",
|
|
1110
|
+
positionTokenAccount: toTokenAccount.account!.address,
|
|
1111
|
+
collateralTokenProgram: tokenProgram,
|
|
1112
|
+
associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
|
|
1113
|
+
collateralMint: offer.account.collateralType,
|
|
1114
|
+
usersTokenAccount: fromTokenAccount.account.address,
|
|
1085
1115
|
})
|
|
1086
1116
|
.remainingAccounts(
|
|
1087
1117
|
partnerFeeRecipient && partnerFeeMarkupAsPkey && userVaultPda
|
|
@@ -1110,6 +1140,11 @@ export const openTradeV1 = async (
|
|
|
1110
1140
|
clock: SYSVAR_CLOCK_PUBKEY,
|
|
1111
1141
|
randomAccountAsId: randomSeed.publicKey.toBase58(),
|
|
1112
1142
|
feeReceipient: "6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF",
|
|
1143
|
+
positionTokenAccount: toTokenAccount.account!.address,
|
|
1144
|
+
collateralTokenProgram: tokenProgram,
|
|
1145
|
+
associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
|
|
1146
|
+
collateralMint: offer.account.collateralType,
|
|
1147
|
+
usersTokenAccount: fromTokenAccount.account.address,
|
|
1113
1148
|
})
|
|
1114
1149
|
.remainingAccounts(
|
|
1115
1150
|
partnerFeeRecipient && partnerFeeMarkupAsPkey
|
|
@@ -1188,7 +1223,8 @@ export const openTradeV1 = async (
|
|
|
1188
1223
|
}
|
|
1189
1224
|
|
|
1190
1225
|
const allInstructions = [
|
|
1191
|
-
fromTokenAccount.instruction!,
|
|
1226
|
+
// fromTokenAccount.instruction!,
|
|
1227
|
+
// toTokenAccount.instruction!,
|
|
1192
1228
|
partnerFeeRecipientCreateIx,
|
|
1193
1229
|
tradingOpenBorrowInstruction!,
|
|
1194
1230
|
...jupiterIxs,
|
|
@@ -1526,6 +1562,13 @@ export const openTradeV2 = async (
|
|
|
1526
1562
|
true,
|
|
1527
1563
|
quoteTokenProgram
|
|
1528
1564
|
),
|
|
1565
|
+
positionTokenAccount: toTokenAccount.account!.address,
|
|
1566
|
+
collateralTokenProgram: tokenProgram,
|
|
1567
|
+
associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
|
|
1568
|
+
collateralMint: offer.account.collateralType,
|
|
1569
|
+
usersTokenAccount: fromTokenAccount.account!.address,
|
|
1570
|
+
quoteMint: quoteToken,
|
|
1571
|
+
feeRecipient: new PublicKey("6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF"),
|
|
1529
1572
|
})
|
|
1530
1573
|
.remainingAccounts(
|
|
1531
1574
|
partnerFeeRecipient && partnerFeeMarkupAsPkey && userVaultPda
|
|
@@ -1577,6 +1620,13 @@ export const openTradeV2 = async (
|
|
|
1577
1620
|
true,
|
|
1578
1621
|
quoteTokenProgram
|
|
1579
1622
|
),
|
|
1623
|
+
positionTokenAccount: toTokenAccount.account!.address,
|
|
1624
|
+
collateralTokenProgram: tokenProgram,
|
|
1625
|
+
associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
|
|
1626
|
+
collateralMint: offer.account.collateralType,
|
|
1627
|
+
usersTokenAccount: fromTokenAccount.account!.address,
|
|
1628
|
+
quoteMint: quoteToken,
|
|
1629
|
+
feeRecipient: new PublicKey("6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF"),
|
|
1580
1630
|
})
|
|
1581
1631
|
.remainingAccounts(
|
|
1582
1632
|
partnerFeeRecipient && partnerFeeMarkupAsPkey && partnerDirectAta
|
|
@@ -1622,8 +1672,8 @@ export const openTradeV2 = async (
|
|
|
1622
1672
|
|
|
1623
1673
|
if (splitTransactions) {
|
|
1624
1674
|
const setUpInstructions = [
|
|
1625
|
-
fromTokenAccount.instruction!,
|
|
1626
|
-
toTokenAccount.instruction!,
|
|
1675
|
+
// fromTokenAccount.instruction!,
|
|
1676
|
+
// toTokenAccount.instruction!,
|
|
1627
1677
|
partnerFeeRecipientVaultCreateIx,
|
|
1628
1678
|
partnerFeeRecipientTokenAccountCreateIx,
|
|
1629
1679
|
...setupInstructions.map(deserializeInstruction),
|
|
@@ -1656,8 +1706,8 @@ export const openTradeV2 = async (
|
|
|
1656
1706
|
}
|
|
1657
1707
|
|
|
1658
1708
|
const allInstructions = [
|
|
1659
|
-
fromTokenAccount.instruction!,
|
|
1660
|
-
toTokenAccount.instruction!,
|
|
1709
|
+
// fromTokenAccount.instruction!,
|
|
1710
|
+
// toTokenAccount.instruction!,
|
|
1661
1711
|
partnerFeeRecipientVaultCreateIx,
|
|
1662
1712
|
partnerFeeRecipientTokenAccountCreateIx,
|
|
1663
1713
|
tradingOpenBorrowInstruction!,
|