Skip to content

Improve deposit margin validation #7

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
devwraithe wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improve deposit margin validation #7

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
8 changes: 8 additions & 0 deletions programs/perp_smith/src/errors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,12 @@ pub enum EternaError {
InvalidOraclePrice,
#[msg("Stale data")]
StaleData,
#[msg("Invalid collateral mint")]
InvalidCollateralMint,
#[msg("Invalid user collateral account")]
InvalidUserCollateralAccount,
#[msg("Invalid collateral vault")]
InvalidCollateralVault,
#[msg("Invalid margin account owner")]
InvalidMarginAccountOwner,
}
43 changes: 38 additions & 5 deletions programs/perp_smith/src/instructions/deposit_margin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ pub struct DepositMargin<'info> {
}

pub fn deposit_margin(ctx: Context<DepositMargin>, amount: u64) -> Result<()> {
msg!("DepositMargin: Intitializing...");
msg!("DepositMargin: Initializing...");

let market = &mut ctx.accounts.market;
let margin_account = &mut ctx.accounts.margin_account;
Expand All @@ -51,16 +51,49 @@ pub fn deposit_margin(ctx: Context<DepositMargin>, amount: u64) -> Result<()> {
let user = &ctx.accounts.user;

require!(amount > 0, EternaError::InvalidAmount);
require_keys_eq!(
market.collateral_mint,
ctx.accounts.collateral_mint.key(),
EternaError::InvalidCollateralMint
);
require_keys_eq!(
user_collateral_ata.owner,
user.key(),
EternaError::InvalidUserCollateralAccount
);
require_eq!(
user_collateral_ata.mint,
ctx.accounts.collateral_mint.key(),
EternaError::InvalidCollateralMint
);
require_keys_eq!(
vault_collateral_ata.key(),
market.collateral_vault,
EternaError::InvalidCollateralVault
);
require_eq!(
vault_collateral_ata.mint,
ctx.accounts.collateral_mint.key(),
EternaError::InvalidCollateralMint
);

if margin_account.owner == Pubkey::default() {
margin_account.owner = user.key();
} else {
require_keys_eq!(
margin_account.owner,
user.key(),
EternaError::InvalidMarginAccountOwner
);
}

let cpi_accounts = Transfer {
from: user_collateral_ata.to_account_info(),
to: vault_collateral_ata.to_account_info(),
authority: user.to_account_info(),
};
let cpi = CpiContext::new(token_program.to_account_info(), cpi_accounts);
let _ = transfer(cpi, amount)?;

margin_account.owner = user.key();
transfer(cpi, amount)?;
margin_account.deposited_margin = margin_account
.deposited_margin
.checked_add(amount)
Expand All @@ -72,7 +105,7 @@ pub fn deposit_margin(ctx: Context<DepositMargin>, amount: u64) -> Result<()> {

emit!(DepositMarginEvent {
owner: ctx.accounts.user.key(),
amount: amount,
amount,
deposited_margin: margin_account.deposited_margin,
});

Expand Down
2 changes: 1 addition & 1 deletion programs/perp_smith/src/instructions/initialize_market.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ pub struct InitializeMarket<'info> {
#[account(
init,
payer = admin,
seeds = [SEED_MARKET, collateral_mint.key().as_ref()],
seeds = [SEED_MARKET, collateral_mint.key().as_ref()],
bump,
space = 8 + Market::LEN
)]
Expand Down