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

Feature/swap received method #10

Merged
merged 9 commits into from
Jul 1, 2024
Merged

Feature/swap received method #10

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
714a33b
swap excess reserve method
JanKuczma Jun 26, 2024
9a62df3
fix amount in
JanKuczma Jun 26, 2024
a7a116a
rename to swap_received
JanKuczma Jun 28, 2024
3522516
Merge branch 'main' into feature/swap-method
JanKuczma Jun 28, 2024
9884292
emit Sync on swap_received
JanKuczma Jun 28, 2024
a135b43
refactor
JanKuczma Jul 1, 2024
35c01d9
test pr check
JanKuczma Jul 1, 2024
537745d
Revert "test pr check"
JanKuczma Jul 1, 2024
80dd664
use macro for simple checks
JanKuczma Jul 1, 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
186 changes: 108 additions & 78 deletions amm/contracts/stable_pool/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,11 @@ pub mod stable_pool {
address.into()
}

#[inline]
fn token_by_id(&self, token_id: usize) -> contract_ref!(PSP22) {
self.pool.tokens[token_id].into()
}

fn update_rates(&mut self) {
let current_time = self.env().block_timestamp();
let mut rate_changed = false;
Expand Down Expand Up @@ -386,16 +391,27 @@ pub mod stable_pool {
/// - updates reserves
/// It assumes that rates have been updated.
/// Returns (token_out_amount, swap_fee)
fn _swap_to(
fn _swap_exact_in(
&mut self,
token_in_id: usize,
token_out_id: usize,
token_in_amount: u128,
token_in: AccountId,
token_out: AccountId,
token_in_amount: Option<u128>,
min_token_out_amount: u128,
to: AccountId,
) -> Result<(u128, u128), StablePoolError> {
//check token ids
let (token_in_id, token_out_id) = self.check_tokens(token_in, token_out)?;

// get transfered token_in amount
let token_in_amount = self._transfer_in(token_in_id, token_in_amount)?;

if token_in_amount == 0 {
return Err(StablePoolError::InsufficientInputAmount);
}

// Make sure rates are up to date before we attempt any calculations
self.update_rates();

let rates = self.get_scaled_rates()?;
// calc amount_out and fees
let (token_out_amount, fee) = math::rated_swap_to(
Expand All @@ -418,6 +434,22 @@ pub mod stable_pool {

// mint admin fee
self.mint_admin_fee(fee, token_out_id)?;

// transfer token_out
self.token_by_address(token_out)
.transfer(to, token_out_amount, vec![])?;

self.env().emit_event(Swap {
sender: self.env().caller(),
token_in,
amount_in: token_in_amount,
token_out,
amount_out: token_out_amount,
to,
});
self.env().emit_event(Sync {
reserves: self.reserves(),
});
Ok((token_out_amount, fee))
}

Expand All @@ -428,17 +460,26 @@ pub mod stable_pool {
/// - updates reserves
/// It assumes that rates have been updated.
/// Returns (token_in_amount, swap_fee)
fn _swap_from(
fn _swap_exact_out(
&mut self,
token_in_id: usize,
token_out_id: usize,
token_in: AccountId,
token_out: AccountId,
token_out_amount: u128,
max_token_in_amount: u128,
to: AccountId,
) -> Result<(u128, u128), StablePoolError> {
//check token ids
let (token_in_id, token_out_id) = self.check_tokens(token_in, token_out)?;

if token_out_amount == 0 {
return Err(StablePoolError::InsufficientOutputAmount);
}

// Make sure rates are up to date before we attempt any calculations
self.update_rates();

let rates = self.get_scaled_rates()?;

// calc amount_out and fees
let (token_in_amount, fee) = math::rated_swap_from(
&rates,
Expand All @@ -461,9 +502,49 @@ pub mod stable_pool {
// mint admin fee
self.mint_admin_fee(fee, token_out_id)?;

// note that fee is applied to token_out (same as in _swap_to)
// transfer token_in
_ = self._transfer_in(token_in_id, Some(token_in_amount))?;

// transfer token_out
self.token_by_address(token_out)
.transfer(to, token_out_amount, vec![])?;

self.env().emit_event(Swap {
sender: self.env().caller(),
token_in,
amount_in: token_in_amount,
token_out,
amount_out: token_out_amount,
to,
});
self.env().emit_event(Sync {
reserves: self.reserves(),
});
// note that fee is applied to token_out (same as in _swap_exact_in)
Ok((token_in_amount, fee))
}

fn _transfer_in(
&self,
token_id: usize,
amount: Option<u128>,
) -> Result<u128, StablePoolError> {
let mut token = self.token_by_id(token_id);
if let Some(token_amount) = amount {
JanKuczma marked this conversation as resolved.
Show resolved Hide resolved
token.transfer_from(
self.env().caller(),
self.env().account_id(),
token_amount,
vec![],
)?;
Ok(token_amount)
} else {
token
.balance_of(self.env().account_id())
.checked_sub(self.pool.reserves[token_id])
.ok_or(StablePoolError::InsufficientInputAmount)
}
}
}

impl StablePool for StablePoolContract {
Expand Down Expand Up @@ -642,44 +723,13 @@ pub mod stable_pool {
min_token_out_amount: u128,
to: AccountId,
) -> Result<(u128, u128), StablePoolError> {
//check token ids
let (token_in_id, token_out_id) = self.check_tokens(token_in, token_out)?;

// Make sure rates are up to date before we attempt any calculations
self.update_rates();

// transfer token_in
self.token_by_address(token_in).transfer_from(
self.env().caller(),
self.env().account_id(),
token_in_amount,
vec![],
)?;

// calculate amount out, mint admin fee and update reserves
let (token_out_amount, swap_fee) = self._swap_to(
token_in_id,
token_out_id,
token_in_amount,
min_token_out_amount,
)?;

// transfer token_out
self.token_by_address(token_out)
.transfer(to, token_out_amount, vec![])?;

self.env().emit_event(Swap {
sender: self.env().caller(),
self._swap_exact_in(
token_in,
amount_in: token_in_amount,
token_out,
amount_out: token_out_amount,
Some(token_in_amount),
min_token_out_amount,
to,
});
self.env().emit_event(Sync {
reserves: self.reserves(),
});
Ok((token_out_amount, swap_fee))
)
}

#[ink(message)]
Expand All @@ -691,44 +741,24 @@ pub mod stable_pool {
max_token_in_amount: u128,
to: AccountId,
) -> Result<(u128, u128), StablePoolError> {
//check token ids
let (token_in_id, token_out_id) = self.check_tokens(token_in, token_out)?;

// Make sure rates are up to date before we attempt any calculations
self.update_rates();

// calculate amount out, mint admin fee and update reserves
let (token_in_amount, swap_fee) = self._swap_from(
token_in_id,
token_out_id,
token_out_amount,
max_token_in_amount,
)?;

// transfer token_in
self.token_by_address(token_in).transfer_from(
self.env().caller(),
self.env().account_id(),
token_in_amount,
vec![],
)?;

// transfer token_out
self.token_by_address(token_out)
.transfer(to, token_out_amount, vec![])?;

self.env().emit_event(Swap {
sender: self.env().caller(),
self._swap_exact_out(
token_in,
amount_in: token_in_amount,
token_out,
amount_out: token_out_amount,
token_out_amount,
max_token_in_amount,
to,
});
self.env().emit_event(Sync {
reserves: self.reserves(),
});
Ok((token_in_amount, swap_fee))
)
}

#[ink(message)]
fn swap_received(
&mut self,
token_in: AccountId,
token_out: AccountId,
min_token_out_amount: u128,
to: AccountId,
) -> Result<(u128, u128), StablePoolError> {
self._swap_exact_in(token_in, token_out, None, min_token_out_amount, to)
}

#[ink(message)]
Expand Down
13 changes: 13 additions & 0 deletions amm/traits/stable_pool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,19 @@ pub trait StablePool {
to: AccountId,
) -> Result<(u128, u128), StablePoolError>;

/// Swaps excess reserve balance of `token_in` to `token_out`.
///
/// Swapped tokens are transferred to the `to` account.
/// Returns (amount_out, fees)
#[ink(message)]
fn swap_received(
&mut self,
token_in: AccountId,
token_out: AccountId,
min_token_out_amount: u128,
to: AccountId,
) -> Result<(u128, u128), StablePoolError>;

#[ink(message)]
fn set_owner(&mut self, new_owner: AccountId) -> Result<(), StablePoolError>;

Expand Down
Loading