Skip to content

Improve user tokens charge readability #50

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improve user tokens charge readability #50

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
67 changes: 39 additions & 28 deletions contracts/partials/TTMethodDex.ligo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,37 +386,48 @@ function token_to_token_route(
end;

(* declare helper variables *)
var token_id_in : nat := first_swap.pair.token_a_id;
var token_address_in : address := first_swap.pair.token_a_address;
const token_in_address : address = case first_swap.operation of
| Sell -> first_swap.pair.token_a_address
| Buy -> first_swap.pair.token_b_address
end;

(* prepare operation to withdraw user's tokens *)
case first_swap.operation of
| Sell -> {
operations :=
(* from *)
typed_transfer(Tezos.sender,
this,
params.amount_in,
first_swap.pair.token_a_id,
first_swap.pair.token_a_address,
first_swap.pair.token_a_type
) # operations;
}
| Buy -> {
token_id_in := first_swap.pair.token_b_id;
token_address_in := first_swap.pair.token_b_address;
operations :=
(* from *)
typed_transfer(Tezos.sender,
this,
params.amount_in,
first_swap.pair.token_b_id,
first_swap.pair.token_b_address,
first_swap.pair.token_b_type
) # operations;
}
const token_in_id : nat = case first_swap.operation of
| Sell -> first_swap.pair.token_a_id
| Buy -> first_swap.pair.token_b_id
end;

const token_in_standard: token_type = case first_swap.operation of
| Sell -> first_swap.pair.token_a_type
| Buy -> first_swap.pair.token_b_type
end;

(* prepare operation to withdraw user's tokens *)
operations :=
typed_transfer(
Tezos.sender,
Tezos.self_address,
params.amount_in,
token_in_id,
token_in_address,
token_in_standard
) # operations;

(* perform internal swaps *)
const tmp : internal_swap_type = List.fold(
internal_token_to_token_swap,
params.swaps,
record [
s = s;
amount_in = params.amount_in;
operation = (None : option(operation));
sender = Tezos.self_address;
receiver = params.receiver;
token_id_in = token_in_id;
token_address_in = token_in_address;
referrer = params.referrer;
]
);

(* perform internal swaps *)
const tmp : internal_swap_type = List.fold(
internal_token_to_token_swap,
Expand Down