Skip to content

fix: vault account fixed to associated token account #18

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

Merged
gcranju merged 2 commits into from
Aug 11, 2025
Merged

fix: vault account fixed to associated token account #18

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3476a15
fix: vault account fixed to associated token account
gcranju Aug 7, 2025
974061e
fix: structure checks
gcranju Aug 11, 2025
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
19 changes: 14 additions & 5 deletions programs/asset-manager/src/states.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use anchor_lang::prelude::*;
use anchor_spl::{
associated_token,
associated_token::{self, get_associated_token_address},
token::{Mint, Token, TokenAccount},
};
use xcall::program::Xcall;
Expand Down Expand Up @@ -85,12 +85,16 @@ pub struct GetWithdrawLimit<'info> {

#[derive(Accounts)]
pub struct DepositToken<'info> {
#[account(mut)]
#[account(mut, constraint = from.owner == from_authority.key())]
pub from: Option<Account<'info, TokenAccount>>,
#[account(mut)]
pub from_authority: Signer<'info>,

#[account(mut, constraint=vault_token_account.owner==valult_authority.clone().unwrap().key() @AssetManagerError::InvalidValultTokenAccount )]
#[account(
mut,
associated_token::mint = from.as_ref().unwrap().mint,
associated_token::authority = valult_authority.as_ref().unwrap(),
owner = token_program.as_ref().unwrap().key()
)]
pub vault_token_account: Option<Account<'info, TokenAccount>>,
#[account(seeds = [VAULT_SEED, from.clone().unwrap().mint.as_ref()], bump)]
pub valult_authority: Option<AccountInfo<'info>>,
Expand Down Expand Up @@ -164,7 +168,12 @@ pub struct HandleCallMessage<'info> {
#[account(seeds = [STATE_SEED], bump)]
pub state: Account<'info, State>,
pub token_state: Account<'info, TokenState>,
#[account(mut, constraint=vault_token_account.owner==valult_authority.clone().unwrap().key() @AssetManagerError::InvalidValultTokenAccount)]
#[account(
mut,
associated_token::mint = to.as_ref().unwrap().mint,
associated_token::authority = valult_authority.as_ref().unwrap(),
owner = token_program.as_ref().unwrap().key()
)]
pub vault_token_account: Option<Account<'info, TokenAccount>>,
#[account(mut, seeds = [VAULT_NATIVE_SEED], bump)]
pub vault_native_account: Option<AccountInfo<'info>>,
Expand Down
Loading