@drift-labs/vaults-sdk 0.2.67 → 0.3.1
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/lib/types/drift_vaults.d.ts +0 -40
- package/lib/types/drift_vaults.js +0 -40
- package/lib/vaultClient.d.ts +1 -1
- package/lib/vaultClient.js +6 -17
- package/package.json +2 -2
- package/src/idl/drift_vaults.json +0 -40
- package/src/types/drift_vaults.ts +0 -80
- package/src/vaultClient.ts +15 -26
|
@@ -576,11 +576,6 @@ export type DriftVaults = {
|
|
|
576
576
|
name: 'driftUser';
|
|
577
577
|
isMut: false;
|
|
578
578
|
isSigner: false;
|
|
579
|
-
},
|
|
580
|
-
{
|
|
581
|
-
name: 'driftState';
|
|
582
|
-
isMut: false;
|
|
583
|
-
isSigner: false;
|
|
584
579
|
}
|
|
585
580
|
];
|
|
586
581
|
args: [
|
|
@@ -623,11 +618,6 @@ export type DriftVaults = {
|
|
|
623
618
|
name: 'driftUser';
|
|
624
619
|
isMut: false;
|
|
625
620
|
isSigner: false;
|
|
626
|
-
},
|
|
627
|
-
{
|
|
628
|
-
name: 'driftState';
|
|
629
|
-
isMut: false;
|
|
630
|
-
isSigner: false;
|
|
631
621
|
}
|
|
632
622
|
];
|
|
633
623
|
args: [];
|
|
@@ -726,11 +716,6 @@ export type DriftVaults = {
|
|
|
726
716
|
isMut: true;
|
|
727
717
|
isSigner: false;
|
|
728
718
|
},
|
|
729
|
-
{
|
|
730
|
-
name: 'driftState';
|
|
731
|
-
isMut: false;
|
|
732
|
-
isSigner: false;
|
|
733
|
-
},
|
|
734
719
|
{
|
|
735
720
|
name: 'driftProgram';
|
|
736
721
|
isMut: false;
|
|
@@ -747,11 +732,6 @@ export type DriftVaults = {
|
|
|
747
732
|
isMut: true;
|
|
748
733
|
isSigner: false;
|
|
749
734
|
},
|
|
750
|
-
{
|
|
751
|
-
name: 'authority';
|
|
752
|
-
isMut: false;
|
|
753
|
-
isSigner: true;
|
|
754
|
-
},
|
|
755
735
|
{
|
|
756
736
|
name: 'driftUser';
|
|
757
737
|
isMut: true;
|
|
@@ -848,11 +828,6 @@ export type DriftVaults = {
|
|
|
848
828
|
name: 'driftUser';
|
|
849
829
|
isMut: false;
|
|
850
830
|
isSigner: false;
|
|
851
|
-
},
|
|
852
|
-
{
|
|
853
|
-
name: 'driftState';
|
|
854
|
-
isMut: false;
|
|
855
|
-
isSigner: false;
|
|
856
831
|
}
|
|
857
832
|
];
|
|
858
833
|
args: [
|
|
@@ -890,11 +865,6 @@ export type DriftVaults = {
|
|
|
890
865
|
name: 'driftUser';
|
|
891
866
|
isMut: false;
|
|
892
867
|
isSigner: false;
|
|
893
|
-
},
|
|
894
|
-
{
|
|
895
|
-
name: 'driftState';
|
|
896
|
-
isMut: false;
|
|
897
|
-
isSigner: false;
|
|
898
868
|
}
|
|
899
869
|
];
|
|
900
870
|
args: [];
|
|
@@ -1464,11 +1434,6 @@ export type DriftVaults = {
|
|
|
1464
1434
|
name: 'driftUser';
|
|
1465
1435
|
isMut: false;
|
|
1466
1436
|
isSigner: false;
|
|
1467
|
-
},
|
|
1468
|
-
{
|
|
1469
|
-
name: 'driftState';
|
|
1470
|
-
isMut: false;
|
|
1471
|
-
isSigner: false;
|
|
1472
1437
|
}
|
|
1473
1438
|
];
|
|
1474
1439
|
args: [
|
|
@@ -1511,11 +1476,6 @@ export type DriftVaults = {
|
|
|
1511
1476
|
name: 'driftUser';
|
|
1512
1477
|
isMut: false;
|
|
1513
1478
|
isSigner: false;
|
|
1514
|
-
},
|
|
1515
|
-
{
|
|
1516
|
-
name: 'driftState';
|
|
1517
|
-
isMut: false;
|
|
1518
|
-
isSigner: false;
|
|
1519
1479
|
}
|
|
1520
1480
|
];
|
|
1521
1481
|
args: [];
|
|
@@ -580,11 +580,6 @@ exports.IDL = {
|
|
|
580
580
|
isMut: false,
|
|
581
581
|
isSigner: false,
|
|
582
582
|
},
|
|
583
|
-
{
|
|
584
|
-
name: 'driftState',
|
|
585
|
-
isMut: false,
|
|
586
|
-
isSigner: false,
|
|
587
|
-
},
|
|
588
583
|
],
|
|
589
584
|
args: [
|
|
590
585
|
{
|
|
@@ -627,11 +622,6 @@ exports.IDL = {
|
|
|
627
622
|
isMut: false,
|
|
628
623
|
isSigner: false,
|
|
629
624
|
},
|
|
630
|
-
{
|
|
631
|
-
name: 'driftState',
|
|
632
|
-
isMut: false,
|
|
633
|
-
isSigner: false,
|
|
634
|
-
},
|
|
635
625
|
],
|
|
636
626
|
args: [],
|
|
637
627
|
},
|
|
@@ -729,11 +719,6 @@ exports.IDL = {
|
|
|
729
719
|
isMut: true,
|
|
730
720
|
isSigner: false,
|
|
731
721
|
},
|
|
732
|
-
{
|
|
733
|
-
name: 'driftState',
|
|
734
|
-
isMut: false,
|
|
735
|
-
isSigner: false,
|
|
736
|
-
},
|
|
737
722
|
{
|
|
738
723
|
name: 'driftProgram',
|
|
739
724
|
isMut: false,
|
|
@@ -750,11 +735,6 @@ exports.IDL = {
|
|
|
750
735
|
isMut: true,
|
|
751
736
|
isSigner: false,
|
|
752
737
|
},
|
|
753
|
-
{
|
|
754
|
-
name: 'authority',
|
|
755
|
-
isMut: false,
|
|
756
|
-
isSigner: true,
|
|
757
|
-
},
|
|
758
738
|
{
|
|
759
739
|
name: 'driftUser',
|
|
760
740
|
isMut: true,
|
|
@@ -852,11 +832,6 @@ exports.IDL = {
|
|
|
852
832
|
isMut: false,
|
|
853
833
|
isSigner: false,
|
|
854
834
|
},
|
|
855
|
-
{
|
|
856
|
-
name: 'driftState',
|
|
857
|
-
isMut: false,
|
|
858
|
-
isSigner: false,
|
|
859
|
-
},
|
|
860
835
|
],
|
|
861
836
|
args: [
|
|
862
837
|
{
|
|
@@ -894,11 +869,6 @@ exports.IDL = {
|
|
|
894
869
|
isMut: false,
|
|
895
870
|
isSigner: false,
|
|
896
871
|
},
|
|
897
|
-
{
|
|
898
|
-
name: 'driftState',
|
|
899
|
-
isMut: false,
|
|
900
|
-
isSigner: false,
|
|
901
|
-
},
|
|
902
872
|
],
|
|
903
873
|
args: [],
|
|
904
874
|
},
|
|
@@ -1468,11 +1438,6 @@ exports.IDL = {
|
|
|
1468
1438
|
isMut: false,
|
|
1469
1439
|
isSigner: false,
|
|
1470
1440
|
},
|
|
1471
|
-
{
|
|
1472
|
-
name: 'driftState',
|
|
1473
|
-
isMut: false,
|
|
1474
|
-
isSigner: false,
|
|
1475
|
-
},
|
|
1476
1441
|
],
|
|
1477
1442
|
args: [
|
|
1478
1443
|
{
|
|
@@ -1515,11 +1480,6 @@ exports.IDL = {
|
|
|
1515
1480
|
isMut: false,
|
|
1516
1481
|
isSigner: false,
|
|
1517
1482
|
},
|
|
1518
|
-
{
|
|
1519
|
-
name: 'driftState',
|
|
1520
|
-
isMut: false,
|
|
1521
|
-
isSigner: false,
|
|
1522
|
-
},
|
|
1523
1483
|
],
|
|
1524
1484
|
args: [],
|
|
1525
1485
|
},
|
package/lib/vaultClient.d.ts
CHANGED
|
@@ -133,7 +133,7 @@ export declare class VaultClient {
|
|
|
133
133
|
* @param amount amount to deposit
|
|
134
134
|
* @returns
|
|
135
135
|
*/
|
|
136
|
-
managerDeposit(vault: PublicKey, amount: BN, uiTxParams?: TxParams): Promise<TransactionSignature>;
|
|
136
|
+
managerDeposit(vault: PublicKey, amount: BN, uiTxParams?: TxParams, managerTokenAccount?: PublicKey): Promise<TransactionSignature>;
|
|
137
137
|
managerRequestWithdraw(vault: PublicKey, amount: BN, withdrawUnit: WithdrawUnit, uiTxParams?: TxParams): Promise<TransactionSignature>;
|
|
138
138
|
managerCancelWithdrawRequest(vault: PublicKey, uiTxParams?: TxParams): Promise<TransactionSignature>;
|
|
139
139
|
managerWithdraw(vault: PublicKey, uiTxParams?: TxParams): Promise<TransactionSignature>;
|
package/lib/vaultClient.js
CHANGED
|
@@ -459,7 +459,7 @@ class VaultClient {
|
|
|
459
459
|
* @param amount amount to deposit
|
|
460
460
|
* @returns
|
|
461
461
|
*/
|
|
462
|
-
async managerDeposit(vault, amount, uiTxParams) {
|
|
462
|
+
async managerDeposit(vault, amount, uiTxParams, managerTokenAccount) {
|
|
463
463
|
const vaultAccount = await this.program.account.vault.fetch(vault);
|
|
464
464
|
const driftSpotMarket = this.driftClient.getSpotMarketAccount(vaultAccount.spotMarketIndex);
|
|
465
465
|
if (!driftSpotMarket) {
|
|
@@ -486,7 +486,7 @@ class VaultClient {
|
|
|
486
486
|
driftProgram: this.driftClient.program.programId,
|
|
487
487
|
driftState: await this.driftClient.getStatePublicKey(),
|
|
488
488
|
driftSpotMarketVault: driftSpotMarket.vault,
|
|
489
|
-
userTokenAccount: (0, spl_token_1.getAssociatedTokenAddressSync)(driftSpotMarket.mint, this.driftClient.wallet.publicKey),
|
|
489
|
+
userTokenAccount: managerTokenAccount !== null && managerTokenAccount !== void 0 ? managerTokenAccount : (0, spl_token_1.getAssociatedTokenAddressSync)(driftSpotMarket.mint, this.driftClient.wallet.publicKey),
|
|
490
490
|
tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
|
|
491
491
|
};
|
|
492
492
|
const { userTokenAccount, preIxs, postIxs } = await this.handleWSolMovement(amount, driftSpotMarket, accounts.userTokenAccount);
|
|
@@ -533,12 +533,10 @@ class VaultClient {
|
|
|
533
533
|
});
|
|
534
534
|
}
|
|
535
535
|
const userStatsKey = (0, sdk_1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, vault);
|
|
536
|
-
const driftStateKey = await this.driftClient.getStatePublicKey();
|
|
537
536
|
const accounts = {
|
|
538
537
|
vault,
|
|
539
|
-
driftUserStats: userStatsKey,
|
|
540
538
|
driftUser: vaultAccount.user,
|
|
541
|
-
|
|
539
|
+
driftUserStats: userStatsKey,
|
|
542
540
|
};
|
|
543
541
|
if (this.cliMode) {
|
|
544
542
|
return await this.program.methods
|
|
@@ -564,13 +562,11 @@ class VaultClient {
|
|
|
564
562
|
async managerCancelWithdrawRequest(vault, uiTxParams) {
|
|
565
563
|
const vaultAccount = await this.program.account.vault.fetch(vault);
|
|
566
564
|
const userStatsKey = (0, sdk_1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, vault);
|
|
567
|
-
const driftStateKey = await this.driftClient.getStatePublicKey();
|
|
568
565
|
const accounts = {
|
|
569
566
|
manager: this.driftClient.wallet.publicKey,
|
|
570
567
|
vault,
|
|
571
|
-
driftUserStats: userStatsKey,
|
|
572
568
|
driftUser: vaultAccount.user,
|
|
573
|
-
|
|
569
|
+
driftUserStats: userStatsKey,
|
|
574
570
|
};
|
|
575
571
|
const user = await this.getSubscribedVaultUser(vaultAccount.user);
|
|
576
572
|
const remainingAccounts = this.driftClient.getRemainingAccounts({
|
|
@@ -595,6 +591,7 @@ class VaultClient {
|
|
|
595
591
|
const cancelRequestWithdrawIx = this.program.instruction.mangerCancelWithdrawRequest({
|
|
596
592
|
accounts: {
|
|
597
593
|
...accounts,
|
|
594
|
+
driftUserStats: (0, sdk_1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, vault),
|
|
598
595
|
manager: this.driftClient.wallet.publicKey,
|
|
599
596
|
},
|
|
600
597
|
remainingAccounts,
|
|
@@ -1066,13 +1063,11 @@ class VaultClient {
|
|
|
1066
1063
|
});
|
|
1067
1064
|
}
|
|
1068
1065
|
const userStatsKey = (0, sdk_1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, vaultDepositorAccount.vault);
|
|
1069
|
-
const driftStateKey = await this.driftClient.getStatePublicKey();
|
|
1070
1066
|
const accounts = {
|
|
1071
1067
|
vault: vaultDepositorAccount.vault,
|
|
1072
1068
|
vaultDepositor,
|
|
1073
|
-
driftUserStats: userStatsKey,
|
|
1074
1069
|
driftUser: vaultAccount.user,
|
|
1075
|
-
|
|
1070
|
+
driftUserStats: userStatsKey,
|
|
1076
1071
|
};
|
|
1077
1072
|
if (this.cliMode) {
|
|
1078
1073
|
return await this.program.methods
|
|
@@ -1240,13 +1235,11 @@ class VaultClient {
|
|
|
1240
1235
|
const vaultDepositorAccount = await this.program.account.vaultDepositor.fetch(vaultDepositor);
|
|
1241
1236
|
const vaultAccount = await this.program.account.vault.fetch(vaultDepositorAccount.vault);
|
|
1242
1237
|
const userStatsKey = (0, sdk_1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, vaultDepositorAccount.vault);
|
|
1243
|
-
const driftStateKey = await this.driftClient.getStatePublicKey();
|
|
1244
1238
|
const accounts = {
|
|
1245
1239
|
vault: vaultDepositorAccount.vault,
|
|
1246
1240
|
vaultDepositor,
|
|
1247
1241
|
driftUserStats: userStatsKey,
|
|
1248
1242
|
driftUser: vaultAccount.user,
|
|
1249
|
-
driftState: driftStateKey,
|
|
1250
1243
|
};
|
|
1251
1244
|
const user = await this.getSubscribedVaultUser(vaultAccount.user);
|
|
1252
1245
|
const remainingAccounts = this.driftClient.getRemainingAccounts({
|
|
@@ -1538,12 +1531,10 @@ class VaultClient {
|
|
|
1538
1531
|
});
|
|
1539
1532
|
}
|
|
1540
1533
|
const userStatsKey = (0, sdk_1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, vault);
|
|
1541
|
-
const driftStateKey = await this.driftClient.getStatePublicKey();
|
|
1542
1534
|
const accounts = {
|
|
1543
1535
|
vault,
|
|
1544
1536
|
driftUserStats: userStatsKey,
|
|
1545
1537
|
driftUser: vaultAccount.user,
|
|
1546
|
-
driftState: driftStateKey,
|
|
1547
1538
|
};
|
|
1548
1539
|
if (this.cliMode) {
|
|
1549
1540
|
return await this.program.methods
|
|
@@ -1569,13 +1560,11 @@ class VaultClient {
|
|
|
1569
1560
|
async protocolCancelWithdrawRequest(vault) {
|
|
1570
1561
|
const vaultAccount = await this.program.account.vault.fetch(vault);
|
|
1571
1562
|
const userStatsKey = (0, sdk_1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, vault);
|
|
1572
|
-
const driftStateKey = await this.driftClient.getStatePublicKey();
|
|
1573
1563
|
const accounts = {
|
|
1574
1564
|
manager: this.driftClient.wallet.publicKey,
|
|
1575
1565
|
vault,
|
|
1576
1566
|
driftUserStats: userStatsKey,
|
|
1577
1567
|
driftUser: vaultAccount.user,
|
|
1578
|
-
driftState: driftStateKey,
|
|
1579
1568
|
};
|
|
1580
1569
|
const user = await this.getSubscribedVaultUser(vaultAccount.user);
|
|
1581
1570
|
const remainingAccounts = this.driftClient.getRemainingAccounts({
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@drift-labs/vaults-sdk",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.3.1",
|
|
4
4
|
"main": "lib/index.js",
|
|
5
5
|
"types": "lib/index.d.ts",
|
|
6
6
|
"directories": {
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
},
|
|
9
9
|
"dependencies": {
|
|
10
10
|
"@coral-xyz/anchor": "0.28.0",
|
|
11
|
-
"@drift-labs/sdk": "2.108.0-beta.
|
|
11
|
+
"@drift-labs/sdk": "2.108.0-beta.3",
|
|
12
12
|
"@ledgerhq/hw-app-solana": "7.2.4",
|
|
13
13
|
"@ledgerhq/hw-transport": "6.31.4",
|
|
14
14
|
"@ledgerhq/hw-transport-node-hid": "6.29.5",
|
|
@@ -576,11 +576,6 @@
|
|
|
576
576
|
"name": "driftUser",
|
|
577
577
|
"isMut": false,
|
|
578
578
|
"isSigner": false
|
|
579
|
-
},
|
|
580
|
-
{
|
|
581
|
-
"name": "driftState",
|
|
582
|
-
"isMut": false,
|
|
583
|
-
"isSigner": false
|
|
584
579
|
}
|
|
585
580
|
],
|
|
586
581
|
"args": [
|
|
@@ -623,11 +618,6 @@
|
|
|
623
618
|
"name": "driftUser",
|
|
624
619
|
"isMut": false,
|
|
625
620
|
"isSigner": false
|
|
626
|
-
},
|
|
627
|
-
{
|
|
628
|
-
"name": "driftState",
|
|
629
|
-
"isMut": false,
|
|
630
|
-
"isSigner": false
|
|
631
621
|
}
|
|
632
622
|
],
|
|
633
623
|
"args": []
|
|
@@ -726,11 +716,6 @@
|
|
|
726
716
|
"isMut": true,
|
|
727
717
|
"isSigner": false
|
|
728
718
|
},
|
|
729
|
-
{
|
|
730
|
-
"name": "driftState",
|
|
731
|
-
"isMut": false,
|
|
732
|
-
"isSigner": false
|
|
733
|
-
},
|
|
734
719
|
{
|
|
735
720
|
"name": "driftProgram",
|
|
736
721
|
"isMut": false,
|
|
@@ -747,11 +732,6 @@
|
|
|
747
732
|
"isMut": true,
|
|
748
733
|
"isSigner": false
|
|
749
734
|
},
|
|
750
|
-
{
|
|
751
|
-
"name": "authority",
|
|
752
|
-
"isMut": false,
|
|
753
|
-
"isSigner": true
|
|
754
|
-
},
|
|
755
735
|
{
|
|
756
736
|
"name": "driftUser",
|
|
757
737
|
"isMut": true,
|
|
@@ -848,11 +828,6 @@
|
|
|
848
828
|
"name": "driftUser",
|
|
849
829
|
"isMut": false,
|
|
850
830
|
"isSigner": false
|
|
851
|
-
},
|
|
852
|
-
{
|
|
853
|
-
"name": "driftState",
|
|
854
|
-
"isMut": false,
|
|
855
|
-
"isSigner": false
|
|
856
831
|
}
|
|
857
832
|
],
|
|
858
833
|
"args": [
|
|
@@ -890,11 +865,6 @@
|
|
|
890
865
|
"name": "driftUser",
|
|
891
866
|
"isMut": false,
|
|
892
867
|
"isSigner": false
|
|
893
|
-
},
|
|
894
|
-
{
|
|
895
|
-
"name": "driftState",
|
|
896
|
-
"isMut": false,
|
|
897
|
-
"isSigner": false
|
|
898
868
|
}
|
|
899
869
|
],
|
|
900
870
|
"args": []
|
|
@@ -1464,11 +1434,6 @@
|
|
|
1464
1434
|
"name": "driftUser",
|
|
1465
1435
|
"isMut": false,
|
|
1466
1436
|
"isSigner": false
|
|
1467
|
-
},
|
|
1468
|
-
{
|
|
1469
|
-
"name": "driftState",
|
|
1470
|
-
"isMut": false,
|
|
1471
|
-
"isSigner": false
|
|
1472
1437
|
}
|
|
1473
1438
|
],
|
|
1474
1439
|
"args": [
|
|
@@ -1511,11 +1476,6 @@
|
|
|
1511
1476
|
"name": "driftUser",
|
|
1512
1477
|
"isMut": false,
|
|
1513
1478
|
"isSigner": false
|
|
1514
|
-
},
|
|
1515
|
-
{
|
|
1516
|
-
"name": "driftState",
|
|
1517
|
-
"isMut": false,
|
|
1518
|
-
"isSigner": false
|
|
1519
1479
|
}
|
|
1520
1480
|
],
|
|
1521
1481
|
"args": []
|
|
@@ -576,11 +576,6 @@ export type DriftVaults = {
|
|
|
576
576
|
name: 'driftUser';
|
|
577
577
|
isMut: false;
|
|
578
578
|
isSigner: false;
|
|
579
|
-
},
|
|
580
|
-
{
|
|
581
|
-
name: 'driftState';
|
|
582
|
-
isMut: false;
|
|
583
|
-
isSigner: false;
|
|
584
579
|
}
|
|
585
580
|
];
|
|
586
581
|
args: [
|
|
@@ -623,11 +618,6 @@ export type DriftVaults = {
|
|
|
623
618
|
name: 'driftUser';
|
|
624
619
|
isMut: false;
|
|
625
620
|
isSigner: false;
|
|
626
|
-
},
|
|
627
|
-
{
|
|
628
|
-
name: 'driftState';
|
|
629
|
-
isMut: false;
|
|
630
|
-
isSigner: false;
|
|
631
621
|
}
|
|
632
622
|
];
|
|
633
623
|
args: [];
|
|
@@ -726,11 +716,6 @@ export type DriftVaults = {
|
|
|
726
716
|
isMut: true;
|
|
727
717
|
isSigner: false;
|
|
728
718
|
},
|
|
729
|
-
{
|
|
730
|
-
name: 'driftState';
|
|
731
|
-
isMut: false;
|
|
732
|
-
isSigner: false;
|
|
733
|
-
},
|
|
734
719
|
{
|
|
735
720
|
name: 'driftProgram';
|
|
736
721
|
isMut: false;
|
|
@@ -747,11 +732,6 @@ export type DriftVaults = {
|
|
|
747
732
|
isMut: true;
|
|
748
733
|
isSigner: false;
|
|
749
734
|
},
|
|
750
|
-
{
|
|
751
|
-
name: 'authority';
|
|
752
|
-
isMut: false;
|
|
753
|
-
isSigner: true;
|
|
754
|
-
},
|
|
755
735
|
{
|
|
756
736
|
name: 'driftUser';
|
|
757
737
|
isMut: true;
|
|
@@ -848,11 +828,6 @@ export type DriftVaults = {
|
|
|
848
828
|
name: 'driftUser';
|
|
849
829
|
isMut: false;
|
|
850
830
|
isSigner: false;
|
|
851
|
-
},
|
|
852
|
-
{
|
|
853
|
-
name: 'driftState';
|
|
854
|
-
isMut: false;
|
|
855
|
-
isSigner: false;
|
|
856
831
|
}
|
|
857
832
|
];
|
|
858
833
|
args: [
|
|
@@ -890,11 +865,6 @@ export type DriftVaults = {
|
|
|
890
865
|
name: 'driftUser';
|
|
891
866
|
isMut: false;
|
|
892
867
|
isSigner: false;
|
|
893
|
-
},
|
|
894
|
-
{
|
|
895
|
-
name: 'driftState';
|
|
896
|
-
isMut: false;
|
|
897
|
-
isSigner: false;
|
|
898
868
|
}
|
|
899
869
|
];
|
|
900
870
|
args: [];
|
|
@@ -1464,11 +1434,6 @@ export type DriftVaults = {
|
|
|
1464
1434
|
name: 'driftUser';
|
|
1465
1435
|
isMut: false;
|
|
1466
1436
|
isSigner: false;
|
|
1467
|
-
},
|
|
1468
|
-
{
|
|
1469
|
-
name: 'driftState';
|
|
1470
|
-
isMut: false;
|
|
1471
|
-
isSigner: false;
|
|
1472
1437
|
}
|
|
1473
1438
|
];
|
|
1474
1439
|
args: [
|
|
@@ -1511,11 +1476,6 @@ export type DriftVaults = {
|
|
|
1511
1476
|
name: 'driftUser';
|
|
1512
1477
|
isMut: false;
|
|
1513
1478
|
isSigner: false;
|
|
1514
|
-
},
|
|
1515
|
-
{
|
|
1516
|
-
name: 'driftState';
|
|
1517
|
-
isMut: false;
|
|
1518
|
-
isSigner: false;
|
|
1519
1479
|
}
|
|
1520
1480
|
];
|
|
1521
1481
|
args: [];
|
|
@@ -3340,11 +3300,6 @@ export const IDL: DriftVaults = {
|
|
|
3340
3300
|
isMut: false,
|
|
3341
3301
|
isSigner: false,
|
|
3342
3302
|
},
|
|
3343
|
-
{
|
|
3344
|
-
name: 'driftState',
|
|
3345
|
-
isMut: false,
|
|
3346
|
-
isSigner: false,
|
|
3347
|
-
},
|
|
3348
3303
|
],
|
|
3349
3304
|
args: [
|
|
3350
3305
|
{
|
|
@@ -3387,11 +3342,6 @@ export const IDL: DriftVaults = {
|
|
|
3387
3342
|
isMut: false,
|
|
3388
3343
|
isSigner: false,
|
|
3389
3344
|
},
|
|
3390
|
-
{
|
|
3391
|
-
name: 'driftState',
|
|
3392
|
-
isMut: false,
|
|
3393
|
-
isSigner: false,
|
|
3394
|
-
},
|
|
3395
3345
|
],
|
|
3396
3346
|
args: [],
|
|
3397
3347
|
},
|
|
@@ -3489,11 +3439,6 @@ export const IDL: DriftVaults = {
|
|
|
3489
3439
|
isMut: true,
|
|
3490
3440
|
isSigner: false,
|
|
3491
3441
|
},
|
|
3492
|
-
{
|
|
3493
|
-
name: 'driftState',
|
|
3494
|
-
isMut: false,
|
|
3495
|
-
isSigner: false,
|
|
3496
|
-
},
|
|
3497
3442
|
{
|
|
3498
3443
|
name: 'driftProgram',
|
|
3499
3444
|
isMut: false,
|
|
@@ -3510,11 +3455,6 @@ export const IDL: DriftVaults = {
|
|
|
3510
3455
|
isMut: true,
|
|
3511
3456
|
isSigner: false,
|
|
3512
3457
|
},
|
|
3513
|
-
{
|
|
3514
|
-
name: 'authority',
|
|
3515
|
-
isMut: false,
|
|
3516
|
-
isSigner: true,
|
|
3517
|
-
},
|
|
3518
3458
|
{
|
|
3519
3459
|
name: 'driftUser',
|
|
3520
3460
|
isMut: true,
|
|
@@ -3612,11 +3552,6 @@ export const IDL: DriftVaults = {
|
|
|
3612
3552
|
isMut: false,
|
|
3613
3553
|
isSigner: false,
|
|
3614
3554
|
},
|
|
3615
|
-
{
|
|
3616
|
-
name: 'driftState',
|
|
3617
|
-
isMut: false,
|
|
3618
|
-
isSigner: false,
|
|
3619
|
-
},
|
|
3620
3555
|
],
|
|
3621
3556
|
args: [
|
|
3622
3557
|
{
|
|
@@ -3654,11 +3589,6 @@ export const IDL: DriftVaults = {
|
|
|
3654
3589
|
isMut: false,
|
|
3655
3590
|
isSigner: false,
|
|
3656
3591
|
},
|
|
3657
|
-
{
|
|
3658
|
-
name: 'driftState',
|
|
3659
|
-
isMut: false,
|
|
3660
|
-
isSigner: false,
|
|
3661
|
-
},
|
|
3662
3592
|
],
|
|
3663
3593
|
args: [],
|
|
3664
3594
|
},
|
|
@@ -4228,11 +4158,6 @@ export const IDL: DriftVaults = {
|
|
|
4228
4158
|
isMut: false,
|
|
4229
4159
|
isSigner: false,
|
|
4230
4160
|
},
|
|
4231
|
-
{
|
|
4232
|
-
name: 'driftState',
|
|
4233
|
-
isMut: false,
|
|
4234
|
-
isSigner: false,
|
|
4235
|
-
},
|
|
4236
4161
|
],
|
|
4237
4162
|
args: [
|
|
4238
4163
|
{
|
|
@@ -4275,11 +4200,6 @@ export const IDL: DriftVaults = {
|
|
|
4275
4200
|
isMut: false,
|
|
4276
4201
|
isSigner: false,
|
|
4277
4202
|
},
|
|
4278
|
-
{
|
|
4279
|
-
name: 'driftState',
|
|
4280
|
-
isMut: false,
|
|
4281
|
-
isSigner: false,
|
|
4282
|
-
},
|
|
4283
4203
|
],
|
|
4284
4204
|
args: [],
|
|
4285
4205
|
},
|
package/src/vaultClient.ts
CHANGED
|
@@ -702,7 +702,8 @@ export class VaultClient {
|
|
|
702
702
|
public async managerDeposit(
|
|
703
703
|
vault: PublicKey,
|
|
704
704
|
amount: BN,
|
|
705
|
-
uiTxParams?: TxParams
|
|
705
|
+
uiTxParams?: TxParams,
|
|
706
|
+
managerTokenAccount?: PublicKey
|
|
706
707
|
): Promise<TransactionSignature> {
|
|
707
708
|
const vaultAccount = await this.program.account.vault.fetch(vault);
|
|
708
709
|
const driftSpotMarket = this.driftClient.getSpotMarketAccount(
|
|
@@ -743,10 +744,12 @@ export class VaultClient {
|
|
|
743
744
|
driftProgram: this.driftClient.program.programId,
|
|
744
745
|
driftState: await this.driftClient.getStatePublicKey(),
|
|
745
746
|
driftSpotMarketVault: driftSpotMarket.vault,
|
|
746
|
-
userTokenAccount:
|
|
747
|
-
|
|
748
|
-
|
|
749
|
-
|
|
747
|
+
userTokenAccount:
|
|
748
|
+
managerTokenAccount ??
|
|
749
|
+
getAssociatedTokenAddressSync(
|
|
750
|
+
driftSpotMarket.mint,
|
|
751
|
+
this.driftClient.wallet.publicKey
|
|
752
|
+
),
|
|
750
753
|
tokenProgram: TOKEN_PROGRAM_ID,
|
|
751
754
|
};
|
|
752
755
|
|
|
@@ -816,13 +819,10 @@ export class VaultClient {
|
|
|
816
819
|
vault
|
|
817
820
|
);
|
|
818
821
|
|
|
819
|
-
const driftStateKey = await this.driftClient.getStatePublicKey();
|
|
820
|
-
|
|
821
822
|
const accounts = {
|
|
822
823
|
vault,
|
|
823
|
-
driftUserStats: userStatsKey,
|
|
824
824
|
driftUser: vaultAccount.user,
|
|
825
|
-
|
|
825
|
+
driftUserStats: userStatsKey,
|
|
826
826
|
};
|
|
827
827
|
|
|
828
828
|
if (this.cliMode) {
|
|
@@ -861,14 +861,11 @@ export class VaultClient {
|
|
|
861
861
|
vault
|
|
862
862
|
);
|
|
863
863
|
|
|
864
|
-
const driftStateKey = await this.driftClient.getStatePublicKey();
|
|
865
|
-
|
|
866
864
|
const accounts = {
|
|
867
865
|
manager: this.driftClient.wallet.publicKey,
|
|
868
866
|
vault,
|
|
869
|
-
driftUserStats: userStatsKey,
|
|
870
867
|
driftUser: vaultAccount.user,
|
|
871
|
-
|
|
868
|
+
driftUserStats: userStatsKey,
|
|
872
869
|
};
|
|
873
870
|
|
|
874
871
|
const user = await this.getSubscribedVaultUser(vaultAccount.user);
|
|
@@ -895,6 +892,10 @@ export class VaultClient {
|
|
|
895
892
|
this.program.instruction.mangerCancelWithdrawRequest({
|
|
896
893
|
accounts: {
|
|
897
894
|
...accounts,
|
|
895
|
+
driftUserStats: getUserStatsAccountPublicKey(
|
|
896
|
+
this.driftClient.program.programId,
|
|
897
|
+
vault
|
|
898
|
+
),
|
|
898
899
|
manager: this.driftClient.wallet.publicKey,
|
|
899
900
|
},
|
|
900
901
|
remainingAccounts,
|
|
@@ -1716,14 +1717,11 @@ export class VaultClient {
|
|
|
1716
1717
|
vaultDepositorAccount.vault
|
|
1717
1718
|
);
|
|
1718
1719
|
|
|
1719
|
-
const driftStateKey = await this.driftClient.getStatePublicKey();
|
|
1720
|
-
|
|
1721
1720
|
const accounts = {
|
|
1722
1721
|
vault: vaultDepositorAccount.vault,
|
|
1723
1722
|
vaultDepositor,
|
|
1724
|
-
driftUserStats: userStatsKey,
|
|
1725
1723
|
driftUser: vaultAccount.user,
|
|
1726
|
-
|
|
1724
|
+
driftUserStats: userStatsKey,
|
|
1727
1725
|
};
|
|
1728
1726
|
|
|
1729
1727
|
if (this.cliMode) {
|
|
@@ -2002,14 +2000,11 @@ export class VaultClient {
|
|
|
2002
2000
|
vaultDepositorAccount.vault
|
|
2003
2001
|
);
|
|
2004
2002
|
|
|
2005
|
-
const driftStateKey = await this.driftClient.getStatePublicKey();
|
|
2006
|
-
|
|
2007
2003
|
const accounts = {
|
|
2008
2004
|
vault: vaultDepositorAccount.vault,
|
|
2009
2005
|
vaultDepositor,
|
|
2010
2006
|
driftUserStats: userStatsKey,
|
|
2011
2007
|
driftUser: vaultAccount.user,
|
|
2012
|
-
driftState: driftStateKey,
|
|
2013
2008
|
};
|
|
2014
2009
|
|
|
2015
2010
|
const user = await this.getSubscribedVaultUser(vaultAccount.user);
|
|
@@ -2467,13 +2462,10 @@ export class VaultClient {
|
|
|
2467
2462
|
vault
|
|
2468
2463
|
);
|
|
2469
2464
|
|
|
2470
|
-
const driftStateKey = await this.driftClient.getStatePublicKey();
|
|
2471
|
-
|
|
2472
2465
|
const accounts = {
|
|
2473
2466
|
vault,
|
|
2474
2467
|
driftUserStats: userStatsKey,
|
|
2475
2468
|
driftUser: vaultAccount.user,
|
|
2476
|
-
driftState: driftStateKey,
|
|
2477
2469
|
};
|
|
2478
2470
|
|
|
2479
2471
|
if (this.cliMode) {
|
|
@@ -2511,14 +2503,11 @@ export class VaultClient {
|
|
|
2511
2503
|
vault
|
|
2512
2504
|
);
|
|
2513
2505
|
|
|
2514
|
-
const driftStateKey = await this.driftClient.getStatePublicKey();
|
|
2515
|
-
|
|
2516
2506
|
const accounts = {
|
|
2517
2507
|
manager: this.driftClient.wallet.publicKey,
|
|
2518
2508
|
vault,
|
|
2519
2509
|
driftUserStats: userStatsKey,
|
|
2520
2510
|
driftUser: vaultAccount.user,
|
|
2521
|
-
driftState: driftStateKey,
|
|
2522
2511
|
};
|
|
2523
2512
|
|
|
2524
2513
|
const user = await this.getSubscribedVaultUser(vaultAccount.user);
|