From 11d5442dd2db4a999b47c785f39ce2c2394425c8 Mon Sep 17 00:00:00 2001 From: Hardhat Chad Date: Wed, 25 Jun 2025 09:40:11 -0500 Subject: [PATCH] cleanup --- program/src/close.rs | 4 ---- program/src/deposit.rs | 1 - program/src/mine.rs | 3 --- program/src/open.rs | 21 --------------------- program/src/swap.rs | 13 ++----------- program/src/uncommit.rs | 1 - program/src/withdraw.rs | 1 - 7 files changed, 2 insertions(+), 42 deletions(-) diff --git a/program/src/close.rs b/program/src/close.rs index 4536171..25aa9e8 100644 --- a/program/src/close.rs +++ b/program/src/close.rs @@ -20,14 +20,12 @@ pub fn process_close(accounts: &[AccountInfo<'_>], _data: &[u8]) -> ProgramResul .as_token_account()? .assert(|t| t.mint() == *mint_quote_info.key)? .assert(|t| t.owner() == *market_info.key)?; - // .as_associated_token_account(block_info.key, mint_quote_info.key)?; commitment_info .is_writable()? .has_address(&commitment_pda(block.id).0)? .as_token_account()? .assert(|t| t.mint() == *mint_base_info.key)? .assert(|t| t.owner() == *block_info.key)?; - // commitment_info.as_associated_token_account(block_info.key, mint_base_info.key)?; let market = market_info .as_account_mut::(&ore_api::ID)? .assert_mut(|m| m.id == block.id)?; @@ -42,14 +40,12 @@ pub fn process_close(accounts: &[AccountInfo<'_>], _data: &[u8]) -> ProgramResul .as_token_account()? .assert(|t| t.mint() == *mint_base_info.key)? .assert(|t| t.owner() == *market_info.key)?; - // .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)?; - // .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)?; diff --git a/program/src/deposit.rs b/program/src/deposit.rs index 1eb27f1..537f955 100644 --- a/program/src/deposit.rs +++ b/program/src/deposit.rs @@ -24,7 +24,6 @@ pub fn process_deposit(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResu .as_token_account()? .assert(|t| t.mint() == *mint_ore_info.key)? .assert(|t| t.owner() == *block_info.key)?; - // .as_associated_token_account(block_info.key, mint_ore_info.key)?; mint_ore_info.has_address(&MINT_ADDRESS)?.as_mint()?; sender_info .is_writable()? diff --git a/program/src/mine.rs b/program/src/mine.rs index 635bb7a..aa966a6 100644 --- a/program/src/mine.rs +++ b/program/src/mine.rs @@ -26,9 +26,6 @@ pub fn process_mine(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResult .is_writable()? .has_address(&commitment_pda(block.id).0)? .as_token_account()?; - // .assert(|t| t.mint() == *mint_hash_info.key)? - // .assert(|t| t.owner() == *block_info.key)?; - // commitment_info.as_associated_token_account(block_info.key, mint_hash_info.key)?; let market = market_info .as_account::(&ore_api::ID)? .assert(|m| m.id == block.id)?; diff --git a/program/src/open.rs b/program/src/open.rs index ee1533a..ed35917 100644 --- a/program/src/open.rs +++ b/program/src/open.rs @@ -205,7 +205,6 @@ pub fn process_open(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResult ], )?; } else { - // commitment_info.as_associated_token_account(block_info.key, mint_base_info.key)?; commitment_info .has_address(&commitment_pda(id).0)? .as_token_account()? @@ -215,15 +214,6 @@ pub fn process_open(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResult // Initialize vault token accounts. if vault_base_info.data_is_empty() { - // create_associated_token_account( - // signer_info, - // market_info, - // vault_base_info, - // mint_base_info, - // system_program, - // token_program, - // associated_token_program, - // )?; let vault_base_pda = vault_base_pda(id); allocate_account_with_bump( vault_base_info, @@ -253,7 +243,6 @@ pub fn process_open(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResult ], )?; } else { - // vault_base_info.as_associated_token_account(market_info.key, mint_base_info.key)?; vault_base_info .has_address(&vault_base_pda(id).0)? .as_token_account()? @@ -261,15 +250,6 @@ pub fn process_open(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResult .assert(|t| t.owner() == *market_info.key)?; } if vault_quote_info.data_is_empty() { - // create_associated_token_account( - // signer_info, - // market_info, - // vault_quote_info, - // mint_quote_info, - // system_program, - // token_program, - // associated_token_program, - // )?; let vault_quote_pda = vault_quote_pda(id); allocate_account_with_bump( vault_quote_info, @@ -299,7 +279,6 @@ pub fn process_open(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResult ], )?; } else { - // vault_quote_info.as_associated_token_account(market_info.key, mint_quote_info.key)?; vault_quote_info .has_address(&vault_quote_pda(id).0)? .as_token_account()? diff --git a/program/src/swap.rs b/program/src/swap.rs index 0eb21ed..4e52412 100644 --- a/program/src/swap.rs +++ b/program/src/swap.rs @@ -20,13 +20,6 @@ pub fn process_swap(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResult let block: &mut Block = block_info .as_account_mut::(&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::(&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. diff --git a/program/src/uncommit.rs b/program/src/uncommit.rs index 064d26d..3a22dda 100644 --- a/program/src/uncommit.rs +++ b/program/src/uncommit.rs @@ -24,7 +24,6 @@ pub fn process_uncommit(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramRes .as_token_account()? .assert(|t| t.mint() == *mint_info.key)? .assert(|t| t.owner() == *block_info.key)?; - // commitment_info.as_associated_token_account(block_info.key, mint_info.key)?; let market = market_info .as_account::(&ore_api::ID)? .assert(|m| m.id == block.id)?; diff --git a/program/src/withdraw.rs b/program/src/withdraw.rs index cd5f790..9dfe86e 100644 --- a/program/src/withdraw.rs +++ b/program/src/withdraw.rs @@ -15,7 +15,6 @@ pub fn process_withdraw(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramRes return Err(ProgramError::NotEnoughAccountKeys); }; signer_info.is_signer()?; - // .as_associated_token_account(block_info.key, mint_ore_info.key)?; mint_ore_info.has_address(&MINT_ADDRESS)?.as_mint()?; recipient_info .is_writable()?