Skip to content
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

Dev #216

Merged
merged 2 commits into from
Apr 4, 2024
Merged

Dev #216

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
690c831
Remove recent timestamp check
EquilateralDelta Apr 3, 2024
90c4806
Merge pull request #215 from convergence-rfq/remove-recent-timestamp-…
pindaroso Apr 4, 2024
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
17 changes: 1 addition & 16 deletions rfq/program/src/instructions/rfq/create_rfq.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ use crate::{
use anchor_lang::prelude::*;
use solana_program::hash::hash;

const RECENT_TIMESTAMP_VALIDITY: u64 = 120; // slightly higher then the recent blockhash validity

#[derive(Accounts)]
#[instruction(
expected_legs_size: u16,
Expand Down Expand Up @@ -112,18 +110,6 @@ fn validate_legs<'a, 'info: 'a>(
Ok(())
}

fn validate_recent_timestamp(recent_timestamp: u64) -> Result<()> {
let current_timestamp = Clock::get()?.unix_timestamp as u64;
let time_offset = recent_timestamp.abs_diff(current_timestamp);

require!(
time_offset < RECENT_TIMESTAMP_VALIDITY,
ProtocolError::InvalidRecentTimestamp
);

Ok(())
}

fn validate_whitelist(whitelist: &Whitelist, creator: Pubkey) -> Result<()> {
require_keys_eq!(
whitelist.associated_rfq,
Expand Down Expand Up @@ -161,7 +147,7 @@ pub fn create_rfq_instruction<'info>(
fixed_size: FixedSize,
active_window: u32,
settling_window: u32,
recent_timestamp: u64,
_recent_timestamp: u64,
) -> Result<()> {
let protocol = &ctx.accounts.protocol;
let mut remaining_accounts = ctx.remaining_accounts.iter();
Expand All @@ -178,7 +164,6 @@ pub fn create_rfq_instruction<'info>(
&legs,
print_trade_provider.is_some(),
)?;
validate_recent_timestamp(recent_timestamp)?;
validate_print_trade_provider(protocol, print_trade_provider)?;
let CreateRfqAccounts {
taker,
Expand Down
Loading