@drift-labs/vaults-sdk 0.1.0 → 0.1.2

package/cli/commands/viewVault.ts

@@ -18,13 +18,13 @@ export const viewVault = async (program: Command, cmdOpts: OptionValues) => {
 
     const {
         driftVault
-    } = await getCommandContext(program, true);
+    } = await getCommandContext(program, false);
 
     const vault = await driftVault.getVault(address);
-    printVault(vault);
+    const { managerSharePct } = printVault(vault);
     const vaultEquity = await driftVault.calculateVaultEquity({
         vault,
     });
-    console.log(`vaultEquity: ${convertToNumber(vaultEquity, QUOTE_PRECISION)}`);
-    console.log("Done!");
+    console.log(`vaultEquity: $${convertToNumber(vaultEquity, QUOTE_PRECISION)}`);
+    console.log(`manager share: $${managerSharePct * convertToNumber(vaultEquity, QUOTE_PRECISION)}`);
 };

package/cli/commands/viewVaultDepositor.ts

@@ -33,5 +33,4 @@ export const viewVaultDepositor = async (program: Command, cmdOpts: OptionValues
 
     const vaultDepositor = await driftVault.getVaultDepositor(vaultDepositorAddress);
     printVaultDepositor(vaultDepositor);
-    console.log("Done!");
 };

package/cli/commands/withdraw.ts

@@ -21,5 +21,4 @@ export const withdraw = async (program: Command, cmdOpts: OptionValues) => {
 
     const tx = await driftVault.withdraw(vaultDepositorAddress);
     console.log(`Withdrew from vault: ${tx}`);
-    console.log("Done!");
 };

package/cli/utils.ts

@@ -1,5 +1,5 @@
-import { DriftClient, PublicKey, Wallet, loadKeypair } from "@drift-labs/sdk";
-import { Vault, VaultClient, decodeName } from "../src";
+import { DriftClient, Wallet, loadKeypair } from "@drift-labs/sdk";
+import { VAULT_PROGRAM_ID, Vault, VaultClient, decodeName } from "../src";
 import { Command } from "commander";
 import { Connection, Keypair } from "@solana/web3.js";
 import { AnchorProvider } from "@coral-xyz/anchor";
@@ -18,7 +18,8 @@ export function printVault(vault: Vault) {
     console.log(`userShares:      ${vault.userShares.toString()}`);
     console.log(`totalShares:     ${vault.totalShares.toString()}`);
     const managerShares = vault.totalShares.sub(vault.userShares);
-    console.log(`  [managerShares]: ${managerShares.toString()} (${(managerShares.toNumber() / vault.totalShares.toNumber() * 100.0).toFixed(4)}%)`);
+    const managerSharePct = managerShares.toNumber() / vault.totalShares.toNumber();
+    console.log(`  [managerShares]: ${managerShares.toString()} (${(managerSharePct * 100.0).toFixed(4)}%)`);
     console.log(`totalShares:     ${vault.totalShares.toString()}`);
     console.log(`lastFeeUpdateTs:    ${vault.lastFeeUpdateTs.toString()}`);
     console.log(`liquidationStartTs: ${vault.liquidationStartTs.toString()}`);
@@ -46,6 +47,11 @@ export function printVault(vault: Vault) {
     console.log(`hurdleRate:        ${vault.hurdleRate}`);
     console.log(`spotMarketIndex:   ${vault.spotMarketIndex}`);
     console.log(`permissioned:      ${vault.permissioned}`);
+
+    return {
+        managerShares,
+        managerSharePct,
+    };
 }
 
 export function printVaultDepositor(vaultDepositor) {
@@ -53,9 +59,9 @@ export function printVaultDepositor(vaultDepositor) {
     console.log(`pubkey:         ${vaultDepositor.pubkey.toBase58()}`);
     console.log(`authority:      ${vaultDepositor.authority.toBase58()}`);
     console.log(`vaultShares:    ${vaultDepositor.vaultShares.toString()}`);
-    console.log(`lastWithdrawRequestShares:   ${vaultDepositor.lastWithdrawRequestShares.toString()}`);
-    console.log(`lastWithdrawRequestValue:    ${vaultDepositor.lastWithdrawRequestValue.toString()}`);
-    console.log(`lastWithdrawRequestTs:       ${vaultDepositor.lastWithdrawRequestTs.toString()}`);
+    console.log(`lastWithdrawRequest.Shares:   ${vaultDepositor.lastWithdrawRequest.shares.toString()}`);
+    console.log(`lastWithdrawRequest.Value:    ${vaultDepositor.lastWithdrawRequest.value.toString()}`);
+    console.log(`lastWithdrawRequest.Ts:       ${vaultDepositor.lastWithdrawRequest.ts.toString()}`);
     console.log(`lastValidTs:                 ${vaultDepositor.lastValidTs.toString()}`);
     console.log(`netDeposits:                 ${vaultDepositor.netDeposits.toString()}`);
     console.log(`totalDeposits:               ${vaultDepositor.totalDeposits.toString()}`);
@@ -74,6 +80,7 @@ export async function getCommandContext(program: Command, needToSign: boolean):
     let keypair: Keypair;
     if (needToSign) {
         try {
+            console.log(opts.keypair);
             keypair = loadKeypair(opts.keypair as string);
         } catch (e) {
             console.error(`Need to provide a valid keypair: ${e}`);
@@ -86,7 +93,7 @@ export async function getCommandContext(program: Command, needToSign: boolean):
     const wallet = new Wallet(keypair);
     console.log(`Signing wallet address (need to sign: ${needToSign}): `, wallet.publicKey.toBase58());
 
-    const connection = new Connection(opts.rpc, {
+    const connection = new Connection(opts.url, {
         commitment: opts.commitment,
     });
     const driftClient = new DriftClient({
@@ -103,7 +110,7 @@ export async function getCommandContext(program: Command, needToSign: boolean):
 
     const provider = new AnchorProvider(connection, wallet, {});
     anchor.setProvider(provider);
-    const vaultProgramId = new PublicKey("vAuLTsyrvSfZRuRB3XgvkPwNGgYSs9YRYymVebLKoxR");
+    const vaultProgramId = VAULT_PROGRAM_ID;
     const vaultProgram = new anchor.Program(IDL, vaultProgramId, provider);
 
     const driftVault = new VaultClient({

package/lib/accountSubscribers/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/accounts/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/accounts/vaultAccount.js

@@ -18,7 +18,7 @@ class VaultAccount extends vaultsProgramAccount_1.VaultsProgramAccount {
         }
     }
     static getAddressSync(programId, vaultName) {
-        return addresses_1.getVaultAddressSync(programId, name_1.encodeName(vaultName));
+        return (0, addresses_1.getVaultAddressSync)(programId, (0, name_1.encodeName)(vaultName));
     }
     calcSharesAfterManagementFee(vaultEquity) {
         const accountData = this.accountSubscriber.getAccountAndSlot().data;

package/lib/accounts/vaultDepositorAccount.js

@@ -17,7 +17,7 @@ class VaultDepositorAccount extends vaultsProgramAccount_1.VaultsProgramAccount
         }
     }
     static getAddressSync(programId, vault, authority) {
-        return addresses_1.getVaultDepositorAddressSync(programId, vault, authority);
+        return (0, addresses_1.getVaultDepositorAddressSync)(programId, vault, authority);
     }
     /**
      * Calculates the percentage of a depositor's equity that will be paid as profit share fees.

package/lib/addresses.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/parsers/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/parsers/logParser.d.ts

@@ -1,7 +1,7 @@
 import { Program } from '@coral-xyz/anchor';
 import { TransactionSignature } from '@solana/web3.js';
 import { WrappedEvents } from '../types/types';
-declare type Log = {
+type Log = {
     txSig: TransactionSignature;
     slot: number;
     logs: string[];

package/lib/types/drift_vaults.d.ts

@@ -1,4 +1,4 @@
-export declare type DriftVaults = {
+export type DriftVaults = {
     version: '0.1.0';
     name: 'drift_vaults';
     instructions: [
@@ -789,6 +789,118 @@ export declare type DriftVaults = {
                 }
             ];
             args: [];
+        },
+        {
+            name: 'initializeInsuranceFundStake';
+            accounts: [
+                {
+                    name: 'vault';
+                    isMut: true;
+                    isSigner: false;
+                },
+                {
+                    name: 'manager';
+                    isMut: false;
+                    isSigner: true;
+                },
+                {
+                    name: 'payer';
+                    isMut: true;
+                    isSigner: true;
+                },
+                {
+                    name: 'rent';
+                    isMut: false;
+                    isSigner: false;
+                },
+                {
+                    name: 'systemProgram';
+                    isMut: false;
+                    isSigner: false;
+                },
+                {
+                    name: 'driftSpotMarket';
+                    isMut: false;
+                    isSigner: false;
+                },
+                {
+                    name: 'insuranceFundStake';
+                    isMut: true;
+                    isSigner: false;
+                },
+                {
+                    name: 'driftUserStats';
+                    isMut: true;
+                    isSigner: false;
+                },
+                {
+                    name: 'driftState';
+                    isMut: false;
+                    isSigner: false;
+                },
+                {
+                    name: 'driftProgram';
+                    isMut: false;
+                    isSigner: false;
+                }
+            ];
+            args: [
+                {
+                    name: 'marketIndex';
+                    type: 'u16';
+                }
+            ];
+        },
+        {
+            name: 'initializeCompetitor';
+            accounts: [
+                {
+                    name: 'vault';
+                    isMut: true;
+                    isSigner: false;
+                },
+                {
+                    name: 'manager';
+                    isMut: false;
+                    isSigner: true;
+                },
+                {
+                    name: 'payer';
+                    isMut: true;
+                    isSigner: true;
+                },
+                {
+                    name: 'rent';
+                    isMut: false;
+                    isSigner: false;
+                },
+                {
+                    name: 'systemProgram';
+                    isMut: false;
+                    isSigner: false;
+                },
+                {
+                    name: 'competitor';
+                    isMut: true;
+                    isSigner: false;
+                },
+                {
+                    name: 'driftCompetitions';
+                    isMut: true;
+                    isSigner: false;
+                },
+                {
+                    name: 'driftUserStats';
+                    isMut: true;
+                    isSigner: false;
+                },
+                {
+                    name: 'driftCompetitionsProgram';
+                    isMut: false;
+                    isSigner: false;
+                }
+            ];
+            args: [];
         }
     ];
     accounts: [

package/lib/types/drift_vaults.js

@@ -793,6 +793,118 @@ exports.IDL = {
             ],
             args: [],
         },
+        {
+            name: 'initializeInsuranceFundStake',
+            accounts: [
+                {
+                    name: 'vault',
+                    isMut: true,
+                    isSigner: false,
+                },
+                {
+                    name: 'manager',
+                    isMut: false,
+                    isSigner: true,
+                },
+                {
+                    name: 'payer',
+                    isMut: true,
+                    isSigner: true,
+                },
+                {
+                    name: 'rent',
+                    isMut: false,
+                    isSigner: false,
+                },
+                {
+                    name: 'systemProgram',
+                    isMut: false,
+                    isSigner: false,
+                },
+                {
+                    name: 'driftSpotMarket',
+                    isMut: false,
+                    isSigner: false,
+                },
+                {
+                    name: 'insuranceFundStake',
+                    isMut: true,
+                    isSigner: false,
+                },
+                {
+                    name: 'driftUserStats',
+                    isMut: true,
+                    isSigner: false,
+                },
+                {
+                    name: 'driftState',
+                    isMut: false,
+                    isSigner: false,
+                },
+                {
+                    name: 'driftProgram',
+                    isMut: false,
+                    isSigner: false,
+                },
+            ],
+            args: [
+                {
+                    name: 'marketIndex',
+                    type: 'u16',
+                },
+            ],
+        },
+        {
+            name: 'initializeCompetitor',
+            accounts: [
+                {
+                    name: 'vault',
+                    isMut: true,
+                    isSigner: false,
+                },
+                {
+                    name: 'manager',
+                    isMut: false,
+                    isSigner: true,
+                },
+                {
+                    name: 'payer',
+                    isMut: true,
+                    isSigner: true,
+                },
+                {
+                    name: 'rent',
+                    isMut: false,
+                    isSigner: false,
+                },
+                {
+                    name: 'systemProgram',
+                    isMut: false,
+                    isSigner: false,
+                },
+                {
+                    name: 'competitor',
+                    isMut: true,
+                    isSigner: false,
+                },
+                {
+                    name: 'driftCompetitions',
+                    isMut: true,
+                    isSigner: false,
+                },
+                {
+                    name: 'driftUserStats',
+                    isMut: true,
+                    isSigner: false,
+                },
+                {
+                    name: 'driftCompetitionsProgram',
+                    isMut: false,
+                    isSigner: false,
+                },
+            ],
+            args: [],
+        },
     ],
     accounts: [
         {

package/lib/types/types.d.ts

@@ -16,12 +16,12 @@ export declare class WithdrawUnit {
         sharesPercent: {};
     };
 }
-export declare type WithdrawRequest = {
+export type WithdrawRequest = {
     shares: BN;
     value: BN;
     ts: BN;
 };
-export declare type Vault = {
+export type Vault = {
     name: number[];
     pubkey: PublicKey;
     manager: PublicKey;
@@ -56,7 +56,7 @@ export declare type Vault = {
     permissioned: boolean;
     lastManagerWithdrawRequest: WithdrawRequest;
 };
-export declare type VaultDepositor = {
+export type VaultDepositor = {
     vault: PublicKey;
     pubkey: PublicKey;
     authority: PublicKey;
@@ -71,14 +71,14 @@ export declare type VaultDepositor = {
     profitShareFeePaid: BN;
     padding: number[];
 };
-export declare type VaultsProgramAccountBaseEvents = {
+export type VaultsProgramAccountBaseEvents = {
     update: void;
     error: (e: Error) => void;
 };
-export declare type VaultDepositorAccountEvents = {
+export type VaultDepositorAccountEvents = {
     vaultDepositorUpdate: (payload: VaultDepositor) => void;
 } & VaultsProgramAccountBaseEvents;
-export declare type VaultAccountEvents = {
+export type VaultAccountEvents = {
     vaultUpdate: (payload: Vault) => void;
 } & VaultsProgramAccountBaseEvents;
 export interface VaultsProgramAccountSubscriber<Account, AccountEvents extends VaultsProgramAccountBaseEvents> {
@@ -90,8 +90,8 @@ export interface VaultsProgramAccountSubscriber<Account, AccountEvents extends V
     unsubscribe(): Promise<void>;
     getAccountAndSlot(): DataAndSlot<Account>;
 }
-export declare type VaultAccountSubscriber = VaultsProgramAccountSubscriber<Vault, VaultAccountEvents>;
-export declare type VaultDepositorAccountSubscriber = VaultsProgramAccountSubscriber<VaultDepositor, VaultDepositorAccountEvents>;
+export type VaultAccountSubscriber = VaultsProgramAccountSubscriber<Vault, VaultAccountEvents>;
+export type VaultDepositorAccountSubscriber = VaultsProgramAccountSubscriber<VaultDepositor, VaultDepositorAccountEvents>;
 export declare class VaultDepositorAction {
     static readonly DEPOSIT: {
         deposit: {};
@@ -109,7 +109,7 @@ export declare class VaultDepositorAction {
         feePayment: {};
     };
 }
-export declare type VaultDepositorRecord = {
+export type VaultDepositorRecord = {
     ts: BN;
     vault: PublicKey;
     depositorAuthority: PublicKey;
@@ -127,11 +127,11 @@ export declare type VaultDepositorRecord = {
     managementFee: BN;
     managementFeeShares: BN;
 };
-export declare type VaultsEventMap = {
+export type VaultsEventMap = {
     VaultDepositorRecord: Event<VaultDepositorRecord>;
 };
-export declare type EventType = keyof VaultsEventMap;
-export declare type WrappedEvent<Type extends EventType> = VaultsEventMap[Type] & {
+export type EventType = keyof VaultsEventMap;
+export type WrappedEvent<Type extends EventType> = VaultsEventMap[Type] & {
     eventType: Type;
 };
-export declare type WrappedEvents = WrappedEvent<EventType>[];
+export type WrappedEvents = WrappedEvent<EventType>[];

package/lib/utils.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -33,7 +37,7 @@ const getDriftVaultProgram = (connection, wallet) => {
 };
 exports.getDriftVaultProgram = getDriftVaultProgram;
 const getVaultClient = (connection, wallet, driftClient) => {
-    const vaultProgram = exports.getDriftVaultProgram(connection, wallet);
+    const vaultProgram = (0, exports.getDriftVaultProgram)(connection, wallet);
     const vaultClient = new vaultClient_1.VaultClient({
         driftClient,
         program: vaultProgram,

package/lib/vaultClient.d.ts

@@ -2,6 +2,7 @@
 import { BN, DriftClient } from '@drift-labs/sdk';
 import { Program, ProgramAccount } from '@coral-xyz/anchor';
 import { DriftVaults } from './types/drift_vaults';
+import { CompetitionsClient } from '@drift-labs/competitions-sdk/lib/competitionClient';
 import { PublicKey, SetComputeUnitLimitParams, TransactionInstruction, TransactionSignature } from '@solana/web3.js';
 import { Vault, VaultDepositor, WithdrawUnit } from './types/types';
 export declare class VaultClient {
@@ -44,6 +45,13 @@ export declare class VaultClient {
      * @returns
      */
     updateDelegate(vault: PublicKey, delegate: PublicKey): Promise<TransactionSignature>;
+    /**
+     * Updates the vault margin trading status.
+     * @param vault vault address to update
+     * @param enabeld whether to enable margin trading
+     * @returns
+     */
+    updateMarginTradingEnabled(vault: PublicKey, enabled: boolean): Promise<TransactionSignature>;
     /**
      *
      * @param vault vault address to deposit to
@@ -97,4 +105,18 @@ export declare class VaultClient {
      * Used for UI wallet adapters compatibility
      */
     createAndSendTxn(ixs: TransactionInstruction[], computeUnitParams?: SetComputeUnitLimitParams): Promise<TransactionSignature>;
+    /**
+     * Initializes an insurance fund stake for the vault.
+     * @param vault vault address to update
+     * @param spotMarketIndex spot market index of the insurance fund stake
+     * @returns
+     */
+    initializeInsuranceFundStake(vault: PublicKey, spotMarketIndex: number): Promise<TransactionSignature>;
+    /**
+     * Initializes a DriftCompetitions Competitor account for the vault.
+     * @param vault vault address to initialize Competitor for
+     * @param competitionName name of the competition to initialize for
+     * @returns
+     */
+    initializeCompetitor(vault: PublicKey, competitionsClient: CompetitionsClient, competitionName: string): Promise<TransactionSignature>;
 }