Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

VAULT: Require inital supply when creating vault #150

Merged
merged 16 commits into from
Dec 23, 2024
Merged

VAULT: Require inital supply when creating vault #150

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
7836e68
wrong direction maybe
coachchucksol Oct 24, 2024
b3892fc
partial solution
coachchucksol Oct 25, 2024
3b50e8e
tests passing
coachchucksol Oct 25, 2024
956e88f
VAULT: Remove Slash (#141)
coachchucksol Oct 24, 2024
656eb54
Rotate operator update indices (#144)
ebatsell Oct 24, 2024
8f79089
Merge branch 'master' into ck/frontrun-creation
buffalu Oct 25, 2024
c10ff6c
added no 0 VRT out
coachchucksol Oct 25, 2024
62c3b0f
Merge branch 'master' into ck/frontrun-creation
coachchucksol Nov 20, 2024
88c1cc0
Merge branch 'master' into ck/frontrun-creation
coachchucksol Dec 11, 2024
cba7121
tests passing
coachchucksol Dec 11, 2024
21a32c3
working
coachchucksol Dec 13, 2024
9faa94f
Merge branch 'master' into ck/frontrun-creation
coachchucksol Dec 16, 2024
937a85f
working
coachchucksol Dec 20, 2024
09dfe43
added tests
coachchucksol Dec 20, 2024
6917821
comments addressed
coachchucksol Dec 23, 2024
1d42507
updated clients
coachchucksol Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cli/src/vault_handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ impl VaultCliHandler {
.config(Config::find_program_address(&self.vault_program_id).0)
.vault(vault)
.vrt_mint(vrt_mint.pubkey())
.token_mint(token_mint)
.st_mint(token_mint)
.admin(keypair.pubkey())
.base(base.pubkey())
.deposit_fee_bps(deposit_fee_bps)
Expand Down
72 changes: 53 additions & 19 deletions clients/js/vault_client/instructions/initializeVault.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ export type InitializeVaultInstruction<
TAccountConfig extends string | IAccountMeta<string> = string,
TAccountVault extends string | IAccountMeta<string> = string,
TAccountVrtMint extends string | IAccountMeta<string> = string,
TAccountTokenMint extends string | IAccountMeta<string> = string,
TAccountStMint extends string | IAccountMeta<string> = string,
TAccountAdminStTokenAccount extends string | IAccountMeta<string> = string,
TAccountVaultStTokenAccount extends string | IAccountMeta<string> = string,
TAccountAdmin extends string | IAccountMeta<string> = string,
TAccountBase extends string | IAccountMeta<string> = string,
TAccountSystemProgram extends
Expand All @@ -68,9 +70,15 @@ export type InitializeVaultInstruction<
? WritableSignerAccount<TAccountVrtMint> &
IAccountSignerMeta<TAccountVrtMint>
: TAccountVrtMint,
TAccountTokenMint extends string
? ReadonlyAccount<TAccountTokenMint>
: TAccountTokenMint,
TAccountStMint extends string
? ReadonlyAccount<TAccountStMint>
: TAccountStMint,
TAccountAdminStTokenAccount extends string
? WritableAccount<TAccountAdminStTokenAccount>
: TAccountAdminStTokenAccount,
TAccountVaultStTokenAccount extends string
? WritableAccount<TAccountVaultStTokenAccount>
: TAccountVaultStTokenAccount,
TAccountAdmin extends string
? WritableSignerAccount<TAccountAdmin> &
IAccountSignerMeta<TAccountAdmin>
Expand Down Expand Up @@ -140,7 +148,9 @@ export type InitializeVaultInput<
TAccountConfig extends string = string,
TAccountVault extends string = string,
TAccountVrtMint extends string = string,
TAccountTokenMint extends string = string,
TAccountStMint extends string = string,
TAccountAdminStTokenAccount extends string = string,
TAccountVaultStTokenAccount extends string = string,
TAccountAdmin extends string = string,
TAccountBase extends string = string,
TAccountSystemProgram extends string = string,
Expand All @@ -149,7 +159,9 @@ export type InitializeVaultInput<
config: Address<TAccountConfig>;
vault: Address<TAccountVault>;
vrtMint: TransactionSigner<TAccountVrtMint>;
tokenMint: Address<TAccountTokenMint>;
stMint: Address<TAccountStMint>;
adminStTokenAccount: Address<TAccountAdminStTokenAccount>;
vaultStTokenAccount: Address<TAccountVaultStTokenAccount>;
admin: TransactionSigner<TAccountAdmin>;
base: TransactionSigner<TAccountBase>;
systemProgram?: Address<TAccountSystemProgram>;
Expand All @@ -164,7 +176,9 @@ export function getInitializeVaultInstruction<
TAccountConfig extends string,
TAccountVault extends string,
TAccountVrtMint extends string,
TAccountTokenMint extends string,
TAccountStMint extends string,
TAccountAdminStTokenAccount extends string,
TAccountVaultStTokenAccount extends string,
TAccountAdmin extends string,
TAccountBase extends string,
TAccountSystemProgram extends string,
Expand All @@ -174,7 +188,9 @@ export function getInitializeVaultInstruction<
TAccountConfig,
TAccountVault,
TAccountVrtMint,
TAccountTokenMint,
TAccountStMint,
TAccountAdminStTokenAccount,
TAccountVaultStTokenAccount,
TAccountAdmin,
TAccountBase,
TAccountSystemProgram,
Expand All @@ -185,7 +201,9 @@ export function getInitializeVaultInstruction<
TAccountConfig,
TAccountVault,
TAccountVrtMint,
TAccountTokenMint,
TAccountStMint,
TAccountAdminStTokenAccount,
TAccountVaultStTokenAccount,
TAccountAdmin,
TAccountBase,
TAccountSystemProgram,
Expand All @@ -199,7 +217,15 @@ export function getInitializeVaultInstruction<
config: { value: input.config ?? null, isWritable: true },
vault: { value: input.vault ?? null, isWritable: true },
vrtMint: { value: input.vrtMint ?? null, isWritable: true },
tokenMint: { value: input.tokenMint ?? null, isWritable: false },
stMint: { value: input.stMint ?? null, isWritable: false },
adminStTokenAccount: {
value: input.adminStTokenAccount ?? null,
isWritable: true,
},
vaultStTokenAccount: {
value: input.vaultStTokenAccount ?? null,
isWritable: true,
},
admin: { value: input.admin ?? null, isWritable: true },
base: { value: input.base ?? null, isWritable: false },
systemProgram: { value: input.systemProgram ?? null, isWritable: false },
Expand Down Expand Up @@ -229,7 +255,9 @@ export function getInitializeVaultInstruction<
getAccountMeta(accounts.config),
getAccountMeta(accounts.vault),
getAccountMeta(accounts.vrtMint),
getAccountMeta(accounts.tokenMint),
getAccountMeta(accounts.stMint),
getAccountMeta(accounts.adminStTokenAccount),
getAccountMeta(accounts.vaultStTokenAccount),
getAccountMeta(accounts.admin),
getAccountMeta(accounts.base),
getAccountMeta(accounts.systemProgram),
Expand All @@ -244,7 +272,9 @@ export function getInitializeVaultInstruction<
TAccountConfig,
TAccountVault,
TAccountVrtMint,
TAccountTokenMint,
TAccountStMint,
TAccountAdminStTokenAccount,
TAccountVaultStTokenAccount,
TAccountAdmin,
TAccountBase,
TAccountSystemProgram,
Expand All @@ -263,11 +293,13 @@ export type ParsedInitializeVaultInstruction<
config: TAccountMetas[0];
vault: TAccountMetas[1];
vrtMint: TAccountMetas[2];
tokenMint: TAccountMetas[3];
admin: TAccountMetas[4];
base: TAccountMetas[5];
systemProgram: TAccountMetas[6];
tokenProgram: TAccountMetas[7];
stMint: TAccountMetas[3];
adminStTokenAccount: TAccountMetas[4];
vaultStTokenAccount: TAccountMetas[5];
admin: TAccountMetas[6];
base: TAccountMetas[7];
systemProgram: TAccountMetas[8];
tokenProgram: TAccountMetas[9];
};
data: InitializeVaultInstructionData;
};
Expand All @@ -280,7 +312,7 @@ export function parseInitializeVaultInstruction<
IInstructionWithAccounts<TAccountMetas> &
IInstructionWithData<Uint8Array>
): ParsedInitializeVaultInstruction<TProgram, TAccountMetas> {
if (instruction.accounts.length < 8) {
if (instruction.accounts.length < 10) {
// TODO: Coded error.
throw new Error('Not enough accounts');
}
Expand All @@ -296,7 +328,9 @@ export function parseInitializeVaultInstruction<
config: getNextAccount(),
vault: getNextAccount(),
vrtMint: getNextAccount(),
tokenMint: getNextAccount(),
stMint: getNextAccount(),
adminStTokenAccount: getNextAccount(),
vaultStTokenAccount: getNextAccount(),
admin: getNextAccount(),
base: getNextAccount(),
systemProgram: getNextAccount(),
Expand Down
Loading
Loading