d0zingcat/ore
1
0
Fork 0
mirror of https://github.com/d0zingcat/ore.git synced 2026-05-23 07:26:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Hardhat Chad
2025-06-25 09:40:11 -05:00
parent 7777c62238
commit 11d5442dd2
7 changed files with 2 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
program/src/swap.rs
View File

@@ -20,13 +20,6 @@ pub fn process_swap(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResult
let block: &mut Block = block_info
.as_account_mut::<Block>(&ore_api::ID)?
.assert_mut(|b| clock.slot < b.start_slot)?;
// collateral_info
// .is_writable()?
// .has_address(&collateral_pda(block.id).0)?
// .as_token_account()?
// .assert(|t| t.mint() == *mint_quote_info.key)?
// .assert(|t| t.owner() == *market_info.key)?;
// collateral_info.as_associated_token_account(block_info.key, mint_quote_info.key)?;
let market = market_info
.as_account_mut::<Market>(&ore_api::ID)?
.assert_mut(|m| m.id == block.id)?
@@ -44,14 +37,12 @@ pub fn process_swap(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResult
.as_token_account()?
.assert(|t| t.mint() == *mint_base_info.key)?
.assert(|t| t.owner() == *market_info.key)?;
// vault_base_info.as_associated_token_account(market_info.key, mint_base_info.key)?;
vault_quote_info
.is_writable()?
.has_address(&vault_quote_pda(block.id).0)?
.as_token_account()?
.assert(|t| t.mint() == *mint_quote_info.key)?
.assert(|t| t.owner() == *market_info.key)?;
// vault_quote_info.as_associated_token_account(market_info.key, mint_quote_info.key)?;
system_program.is_program(&system_program::ID)?;
token_program.is_program(&spl_token::ID)?;
associated_token_program.is_program(&spl_associated_token_account::ID)?;
@@ -141,8 +132,8 @@ pub fn process_swap(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResult
)?;
// Validate vault reserves.
let vault_base = vault_base_info.as_token_account()?; //.as_associated_token_account(market_info.key, mint_base_info.key)?;
let vault_quote = vault_quote_info.as_token_account()?; //.as_associated_token_account(market_info.key, mint_quote_info.key)?;
let vault_base = vault_base_info.as_token_account()?;
let vault_quote = vault_quote_info.as_token_account()?;
market.check_vaults(&vault_base, &vault_quote)?;
// Emit event.