Skip to content

Address conditional vault review #410

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

Open
pileks wants to merge 1 commit into
base: develop
Choose a base branch
from
+20 −0
Open

Address conditional vault review #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions programs/conditional_vault/src/instructions/merge_tokens.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
use super::*;

impl<'info, 'c: 'info> InteractWithVault<'info> {
pub fn validate_merge_tokens(&self) -> Result<()> {
require!(
!self.question.is_resolved(),
VaultError::QuestionAlreadyResolved
);

Ok(())
}

pub fn handle_merge_tokens(ctx: Context<'_, '_, 'c, 'info, Self>, amount: u64) -> Result<()> {
let accs = &ctx.accounts;

Expand Down
9 changes: 9 additions & 0 deletions programs/conditional_vault/src/instructions/split_tokens.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
use super::*;

impl<'info, 'c: 'info> InteractWithVault<'info> {
pub fn validate_split_tokens(&self) -> Result<()> {
require!(
!self.question.is_resolved(),
VaultError::QuestionAlreadyResolved
);

Ok(())
}

pub fn handle_split_tokens(ctx: Context<'_, '_, 'c, 'info, Self>, amount: u64) -> Result<()> {
let accs = &ctx.accounts;

Expand Down
2 changes: 2 additions & 0 deletions programs/conditional_vault/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,15 @@ pub mod conditional_vault {
InitializeConditionalVault::handle(ctx)
}

#[access_control(ctx.accounts.validate_split_tokens())]
pub fn split_tokens<'c: 'info, 'info>(
ctx: Context<'_, '_, 'c, 'info, InteractWithVault<'info>>,
amount: u64,
) -> Result<()> {
InteractWithVault::handle_split_tokens(ctx, amount)
}

#[access_control(ctx.accounts.validate_merge_tokens())]
pub fn merge_tokens<'c: 'info, 'info>(
ctx: Context<'_, '_, 'c, 'info, InteractWithVault<'info>>,
amount: u64,
Expand Down
Loading