reorg so manager functions are more grouped

drift-labs · Aug 9, 2023 · e5ef8e2 · e5ef8e2
1 parent 690135b
commit e5ef8e2
Show file tree

Hide file tree

Showing 2 changed files with 140 additions and 140 deletions.
diff --git a/programs/drift_vaults/src/lib.rs b/programs/drift_vaults/src/lib.rs
@@ -66,12 +66,6 @@ pub mod drift_vaults {
         instructions::withdraw(ctx)
     }
 
-    pub fn force_withdraw<'info>(
-        ctx: Context<'_, '_, '_, 'info, ForceWithdraw<'info>>,
-    ) -> Result<()> {
-        instructions::force_withdraw(ctx)
-    }
-
     pub fn liquidate<'info>(ctx: Context<'_, '_, '_, 'info, Liquidate<'info>>) -> Result<()> {
         instructions::liquidate(ctx)
     }
@@ -102,4 +96,10 @@ pub mod drift_vaults {
     ) -> Result<()> {
         instructions::apply_profit_share(ctx)
     }
+
+    pub fn force_withdraw<'info>(
+        ctx: Context<'_, '_, '_, 'info, ForceWithdraw<'info>>,
+    ) -> Result<()> {
+        instructions::force_withdraw(ctx)
+    }
 }
diff --git a/ts/sdk/src/types/drift_vaults.ts b/ts/sdk/src/types/drift_vaults.ts
@@ -385,72 +385,6 @@ export type DriftVaults = {
 			];
 			args: [];
 		},
-		{
-			name: 'forceWithdraw';
-			accounts: [
-				{
-					name: 'vault';
-					isMut: true;
-					isSigner: false;
-				},
-				{
-					name: 'manager';
-					isMut: false;
-					isSigner: true;
-				},
-				{
-					name: 'vaultDepositor';
-					isMut: true;
-					isSigner: false;
-				},
-				{
-					name: 'vaultTokenAccount';
-					isMut: true;
-					isSigner: false;
-				},
-				{
-					name: 'driftUserStats';
-					isMut: true;
-					isSigner: false;
-				},
-				{
-					name: 'driftUser';
-					isMut: true;
-					isSigner: false;
-				},
-				{
-					name: 'driftState';
-					isMut: false;
-					isSigner: false;
-				},
-				{
-					name: 'driftSpotMarketVault';
-					isMut: true;
-					isSigner: false;
-				},
-				{
-					name: 'driftSigner';
-					isMut: false;
-					isSigner: false;
-				},
-				{
-					name: 'userTokenAccount';
-					isMut: true;
-					isSigner: false;
-				},
-				{
-					name: 'driftProgram';
-					isMut: false;
-					isSigner: false;
-				},
-				{
-					name: 'tokenProgram';
-					isMut: false;
-					isSigner: false;
-				}
-			];
-			args: [];
-		},
 		{
 			name: 'liquidate';
 			accounts: [
@@ -652,7 +586,7 @@ export type DriftVaults = {
 			];
 		},
 		{
-			name: 'managerCrankProfitShare';
+			name: 'applyProfitShare';
 			accounts: [
 				{
 					name: 'vault';
@@ -696,6 +630,72 @@ export type DriftVaults = {
 				}
 			];
 			args: [];
+		},
+		{
+			name: 'forceWithdraw';
+			accounts: [
+				{
+					name: 'vault';
+					isMut: true;
+					isSigner: false;
+				},
+				{
+					name: 'manager';
+					isMut: false;
+					isSigner: true;
+				},
+				{
+					name: 'vaultDepositor';
+					isMut: true;
+					isSigner: false;
+				},
+				{
+					name: 'vaultTokenAccount';
+					isMut: true;
+					isSigner: false;
+				},
+				{
+					name: 'driftUserStats';
+					isMut: true;
+					isSigner: false;
+				},
+				{
+					name: 'driftUser';
+					isMut: true;
+					isSigner: false;
+				},
+				{
+					name: 'driftState';
+					isMut: false;
+					isSigner: false;
+				},
+				{
+					name: 'driftSpotMarketVault';
+					isMut: true;
+					isSigner: false;
+				},
+				{
+					name: 'driftSigner';
+					isMut: false;
+					isSigner: false;
+				},
+				{
+					name: 'userTokenAccount';
+					isMut: true;
+					isSigner: false;
+				},
+				{
+					name: 'driftProgram';
+					isMut: false;
+					isSigner: false;
+				},
+				{
+					name: 'tokenProgram';
+					isMut: false;
+					isSigner: false;
+				}
+			];
+			args: [];
 		}
 	];
 	accounts: [
@@ -1724,72 +1724,6 @@ export const IDL: DriftVaults = {
 			],
 			args: [],
 		},
-		{
-			name: 'forceWithdraw',
-			accounts: [
-				{
-					name: 'vault',
-					isMut: true,
-					isSigner: false,
-				},
-				{
-					name: 'manager',
-					isMut: false,
-					isSigner: true,
-				},
-				{
-					name: 'vaultDepositor',
-					isMut: true,
-					isSigner: false,
-				},
-				{
-					name: 'vaultTokenAccount',
-					isMut: true,
-					isSigner: false,
-				},
-				{
-					name: 'driftUserStats',
-					isMut: true,
-					isSigner: false,
-				},
-				{
-					name: 'driftUser',
-					isMut: true,
-					isSigner: false,
-				},
-				{
-					name: 'driftState',
-					isMut: false,
-					isSigner: false,
-				},
-				{
-					name: 'driftSpotMarketVault',
-					isMut: true,
-					isSigner: false,
-				},
-				{
-					name: 'driftSigner',
-					isMut: false,
-					isSigner: false,
-				},
-				{
-					name: 'userTokenAccount',
-					isMut: true,
-					isSigner: false,
-				},
-				{
-					name: 'driftProgram',
-					isMut: false,
-					isSigner: false,
-				},
-				{
-					name: 'tokenProgram',
-					isMut: false,
-					isSigner: false,
-				},
-			],
-			args: [],
-		},
 		{
 			name: 'liquidate',
 			accounts: [
@@ -1991,7 +1925,7 @@ export const IDL: DriftVaults = {
 			],
 		},
 		{
-			name: 'managerCrankProfitShare',
+			name: 'applyProfitShare',
 			accounts: [
 				{
 					name: 'vault',
@@ -2036,6 +1970,72 @@ export const IDL: DriftVaults = {
 			],
 			args: [],
 		},
+		{
+			name: 'forceWithdraw',
+			accounts: [
+				{
+					name: 'vault',
+					isMut: true,
+					isSigner: false,
+				},
+				{
+					name: 'manager',
+					isMut: false,
+					isSigner: true,
+				},
+				{
+					name: 'vaultDepositor',
+					isMut: true,
+					isSigner: false,
+				},
+				{
+					name: 'vaultTokenAccount',
+					isMut: true,
+					isSigner: false,
+				},
+				{
+					name: 'driftUserStats',
+					isMut: true,
+					isSigner: false,
+				},
+				{
+					name: 'driftUser',
+					isMut: true,
+					isSigner: false,
+				},
+				{
+					name: 'driftState',
+					isMut: false,
+					isSigner: false,
+				},
+				{
+					name: 'driftSpotMarketVault',
+					isMut: true,
+					isSigner: false,
+				},
+				{
+					name: 'driftSigner',
+					isMut: false,
+					isSigner: false,
+				},
+				{
+					name: 'userTokenAccount',
+					isMut: true,
+					isSigner: false,
+				},
+				{
+					name: 'driftProgram',
+					isMut: false,
+					isSigner: false,
+				},
+				{
+					name: 'tokenProgram',
+					isMut: false,
+					isSigner: false,
+				},
+			],
+			args: [],
+		},
 	],
 	accounts: [
 		{