Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@ pub fn deposit_liquidity(
// Making sure they are provided in the same proportion as existing liquidity
let pool_a = &ctx.accounts.pool_account_a;
let pool_b = &ctx.accounts.pool_account_b;
// Defining pool creation like this allows attackers to frontrun pool creation with bad ratios
let pool_creation = pool_a.amount == 0 && pool_b.amount == 0;
(amount_a, amount_b) = if pool_creation {
// Add as is if there is no liquidity
(amount_a, amount_b)
} else {
let ratio = I64F64::from_num(pool_a.amount)
.checked_mul(I64F64::from_num(pool_b.amount))
.unwrap();
// FIX: Use proper ratio (division) instead of product (multiplication)
if pool_a.amount > pool_b.amount {
let ratio = I64F64::from_num(pool_a.amount)
.checked_div(I64F64::from_num(pool_b.amount))
.unwrap();
(
I64F64::from_num(amount_b)
.checked_mul(ratio)
Expand All @@ -49,10 +49,13 @@ pub fn deposit_liquidity(
amount_b,
)
} else {
let ratio = I64F64::from_num(pool_b.amount)
.checked_div(I64F64::from_num(pool_a.amount))
.unwrap();
(
amount_a,
I64F64::from_num(amount_a)
.checked_div(ratio)
.checked_mul(ratio)
.unwrap()
.to_num::<u64>(),
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ pub fn swap_exact_tokens_for_tokens(
];
let signer_seeds = &[&authority_seeds[..]];
if swap_a {
// Swap A β†’ B: Trader sends A to pool, pool sends B to trader
token::transfer(
CpiContext::new(
ctx.accounts.token_program.to_account_info(),
Expand All @@ -97,28 +98,29 @@ pub fn swap_exact_tokens_for_tokens(
output,
)?;
} else {
// FIX: Swap B β†’ A: Trader sends B (input) to pool, pool sends A (output) to trader
token::transfer(
CpiContext::new_with_signer(
CpiContext::new(
ctx.accounts.token_program.to_account_info(),
Transfer {
from: ctx.accounts.pool_account_a.to_account_info(),
to: ctx.accounts.trader_account_a.to_account_info(),
authority: ctx.accounts.pool_authority.to_account_info(),
from: ctx.accounts.trader_account_b.to_account_info(),
to: ctx.accounts.pool_account_b.to_account_info(),
authority: ctx.accounts.trader.to_account_info(),
},
signer_seeds,
),
input,
input, // FIX: Trader sends INPUT amount of B to pool
)?;
token::transfer(
CpiContext::new(
CpiContext::new_with_signer(
ctx.accounts.token_program.to_account_info(),
Transfer {
from: ctx.accounts.trader_account_b.to_account_info(),
to: ctx.accounts.pool_account_b.to_account_info(),
authority: ctx.accounts.trader.to_account_info(),
from: ctx.accounts.pool_account_a.to_account_info(),
to: ctx.accounts.trader_account_a.to_account_info(),
authority: ctx.accounts.pool_authority.to_account_info(),
},
signer_seeds,
),
output,
output, // FIX: Pool sends OUTPUT amount of A to trader
)?;
}

Expand All @@ -134,7 +136,8 @@ pub fn swap_exact_tokens_for_tokens(
// We tolerate if the new invariant is higher because it means a rounding error for LPs
ctx.accounts.pool_account_a.reload()?;
ctx.accounts.pool_account_b.reload()?;
if invariant > ctx.accounts.pool_account_a.amount * ctx.accounts.pool_account_a.amount {
// FIX: Use pool_account_b instead of pool_account_a (was a copy-paste bug)
if invariant > ctx.accounts.pool_account_a.amount * ctx.accounts.pool_account_b.amount {
return err!(TutorialError::InvariantViolated);
}

Expand Down