add initialize_vault_depositor

.gitignore

@@ -7,3 +7,5 @@ node_modules
 test-ledger
 .idea
 migrations
+ts/sdk/src/**/*.js
+ts/sdk/src/**/*.js.map

Anchor.toml

@@ -16,4 +16,4 @@ address = "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH"
 program = "./deps/drift.so"
 
 [scripts]
-test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
+test = "yarn anchor-tests"

package.json

@@ -1,10 +1,13 @@
 {
+    "license": "Apache-2.0",
     "scripts": {
         "prettify": "prettier --check './ts/sdk/src/**/*.ts' './tests/**.ts'",
         "prettify:fix": "prettier --write './ts/sdk/src/**/*.ts' './tests/**.ts'",
         "lint": "eslint . --ext ts --quiet",
         "lint:fix": "eslint . --ext ts --fix",
-        "prepare": "husky install"
+        "prepare": "husky install",
+        "update-types": "cp target/types/drift_vaults.ts ts/sdk/src/types/drift_vaults.ts",
+        "anchor-tests": "yarn update-types && yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
     },
     "devDependencies": {
         "chai": "^4.3.4",

programs/drift_vaults/Cargo.toml

@@ -16,4 +16,5 @@ default = []
 [dependencies]
 anchor-lang = { git = "https://github.com/drift-labs/anchor.git", rev = "ed950fe", version = "0.26.0" }
 drift = { git = "https://github.com/drift-labs/protocol-v2.git", features = ["cpi", "mainnet-beta"] }
-bytemuck = { version = "1.4.0" }
+bytemuck = { version = "1.4.0" }
+static_assertions = "1.1.0"

programs/drift_vaults/src/instructions/initialize_vault_depositor.rs

@@ -0,0 +1,29 @@
+use crate::{Size, Vault, VaultDepositor};
+use anchor_lang::prelude::*;
+
+pub fn initialize_vault_depositor(ctx: Context<InitializeVaultDepositor>) -> Result<()> {
+    let mut vault_depositor = ctx.accounts.vault_depositor.load_init()?;
+    vault_depositor.vault = ctx.accounts.vault.key();
+    vault_depositor.pubkey = ctx.accounts.vault_depositor.key();
+    vault_depositor.authority = *ctx.accounts.authority.key;
+
+    Ok(())
+}
+
+#[derive(Accounts)]
+pub struct InitializeVaultDepositor<'info> {
+    pub vault: AccountLoader<'info, Vault>,
+    #[account(
+        init,
+        seeds = [b"vault_depositor", vault.key().as_ref()],
+        space = Vault::SIZE,
+        bump,
+        payer = payer
+    )]
+    pub vault_depositor: AccountLoader<'info, VaultDepositor>,
+    pub authority: Signer<'info>,
+    #[account(mut)]
+    pub payer: Signer<'info>,
+    pub rent: Sysvar<'info, Rent>,
+    pub system_program: Program<'info, System>,
+}

programs/drift_vaults/src/instructions/mod.rs

@@ -1,3 +1,5 @@
 pub use initialize_vault::*;
+pub use initialize_vault_depositor::*;
 
 mod initialize_vault;
+mod initialize_vault_depositor;

programs/drift_vaults/src/lib.rs

@@ -15,4 +15,8 @@ pub mod drift_vaults {
     pub fn initialize_vault(ctx: Context<InitializeVault>, name: [u8; 32]) -> Result<()> {
         instructions::initialize_vault(ctx, name)
     }
+
+    pub fn initialize_vault_depositor(ctx: Context<InitializeVaultDepositor>) -> Result<()> {
+        instructions::initialize_vault_depositor(ctx)
+    }
 }

programs/drift_vaults/src/state/mod.rs

@@ -1,5 +1,7 @@
 pub use traits::*;
 pub use vault::*;
+pub use vault_depositor::*;
 
 mod traits;
 mod vault;
+mod vault_depositor;

programs/drift_vaults/src/state/vault.rs

@@ -1,5 +1,6 @@
 use crate::Size;
 use anchor_lang::prelude::*;
+use static_assertions::const_assert_eq;
 
 #[account(zero_copy)]
 #[derive(Eq, PartialEq, Debug)]
@@ -23,12 +24,4 @@ impl Size for Vault {
     const SIZE: usize = 169;
 }
 
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn impl_size() {
-        assert_eq!(super::Vault::SIZE, std::mem::size_of::<Vault>() + 8)
-    }
-}
+const_assert_eq!(Vault::SIZE, std::mem::size_of::<Vault>() + 8);

programs/drift_vaults/src/state/vault_depositor.rs

@@ -0,0 +1,24 @@
+use crate::Size;
+use anchor_lang::prelude::*;
+use static_assertions::const_assert_eq;
+
+#[account(zero_copy)]
+#[derive(Eq, PartialEq, Debug)]
+#[repr(C)]
+pub struct VaultDepositor {
+    /// The vault deposited into
+    pub vault: Pubkey,
+    /// The vault depositor account's pubkey. It is a pda of vault and authority
+    pub pubkey: Pubkey,
+    /// The authority is the address w permission to deposit/withdraw
+    pub authority: Pubkey,
+}
+
+impl Size for VaultDepositor {
+    const SIZE: usize = 104;
+}
+
+const_assert_eq!(
+    VaultDepositor::SIZE,
+    std::mem::size_of::<VaultDepositor>() + 8
+);

tests/driftVaults.ts

@@ -5,7 +5,9 @@ import { AdminClient, BN } from '@drift-labs/sdk';
 import { mockUSDCMint } from './testHelpers';
 import { Keypair } from '@solana/web3.js';
 import { assert } from 'chai';
-import { VaultClient } from '../ts/sdk/src/vaultClient';
+import { VaultClient } from '../ts/sdk/src';
+import { getVaultAddressSync } from '../ts/sdk/src';
+import { encodeName } from '../ts/sdk/lib/name';
 
 describe('driftVaults', () => {
 	// Configure the client to use the local cluster.
@@ -31,19 +33,28 @@ describe('driftVaults', () => {
 
 	let usdcMint: Keypair;
 
+	const vaultName = 'crisp vault';
+	const vault = getVaultAddressSync(program.programId, encodeName(vaultName));
+
 	before(async () => {
 		usdcMint = await mockUSDCMint(provider);
 		await adminClient.initialize(usdcMint.publicKey, false);
 		await adminClient.subscribe();
 	});
 
-	it('Is initialized!', async () => {
-		const name = 'crisp vault';
+	after(async () => {
+		await adminClient.unsubscribe();
+	});
 
-		await vaultClient.initializeVault(name);
+	it('Initialize Vault', async () => {
+		await vaultClient.initializeVault(vaultName);
 
 		await adminClient.fetchAccounts();
 		assert(adminClient.getStateAccount().numberOfAuthorities.eq(new BN(1)));
 		assert(adminClient.getStateAccount().numberOfSubAccounts.eq(new BN(1)));
 	});
+
+	it('Initialize Vault Depositor', async () => {
+		await vaultClient.initializeVaultDepositor(vault);
+	});
 });