Skip to content

chore(payments): check non-zero amount before transfer #22

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

Merged
MohammadNassar1 merged 1 commit into from
Sep 25, 2025
Merged

chore(payments): check non-zero amount before transfer #22

Show file tree
Hide file tree
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: 35 additions & 32 deletions src/payments.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,42 +214,45 @@ pub mod payments {
let fee_a = self._calculate_fee(order_a_actual_sell_amount);
// For `order_b`, the actual sold amount is `order_a_actual_buy_amount`.
let fee_b = self._calculate_fee(order_a_actual_buy_amount);
assert_with_byte_array(
sell_token.transfer_from(order_a.user, fee_recipient, fee_a.into()),
transfer_failed_error(
token: order_a.sell_token, sender: order_a.user, amount: fee_a,
),
);
assert_with_byte_array(
buy_token.transfer_from(order_b.user, fee_recipient, fee_b.into()),
transfer_failed_error(
token: order_a.buy_token, sender: order_b.user, amount: fee_b,
),
);

// Transfer fees only if they are non-zero
if fee_a.is_non_zero() {
assert_with_byte_array(
sell_token.transfer_from(order_a.user, fee_recipient, fee_a.into()),
transfer_failed_error(
token: order_a.sell_token, sender: order_a.user, amount: fee_a,
),
);
}
if fee_b.is_non_zero() {
assert_with_byte_array(
buy_token.transfer_from(order_b.user, fee_recipient, fee_b.into()),
transfer_failed_error(
token: order_a.buy_token, sender: order_b.user, amount: fee_b,
),
);
}

// Transfer the actual amounts.
assert_with_byte_array(
sell_token
.transfer_from(
order_a.user, order_b.user, (order_a_actual_sell_amount - fee_a).into(),
let net_sell_amount = order_a_actual_sell_amount - fee_a;
let net_buy_amount = order_a_actual_buy_amount - fee_b;

if net_sell_amount.is_non_zero() {
assert_with_byte_array(
sell_token.transfer_from(order_a.user, order_b.user, net_sell_amount.into()),
transfer_failed_error(
token: order_a.sell_token, sender: order_a.user, amount: net_sell_amount,
),
transfer_failed_error(
token: order_a.sell_token,
sender: order_a.user,
amount: order_a_actual_sell_amount - fee_a,
),
);
assert_with_byte_array(
buy_token
.transfer_from(
order_b.user, order_a.user, (order_a_actual_buy_amount - fee_b).into(),
);
}
if net_buy_amount.is_non_zero() {
assert_with_byte_array(
buy_token.transfer_from(order_b.user, order_a.user, net_buy_amount.into()),
transfer_failed_error(
token: order_a.buy_token, sender: order_b.user, amount: net_buy_amount,
),
transfer_failed_error(
token: order_a.buy_token,
sender: order_b.user,
amount: order_a_actual_buy_amount - fee_b,
),
);
);
}

// Emit an event.
self
Expand Down
1 change: 0 additions & 1 deletion src/tests/test_payments.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,6 @@ fn test_invalid_trade_scenarios() {
initial_balance: constants::INITIAL_BALANCE,
);
let dispatcher = IPaymentsSafeDispatcher { contract_address };
let mut spy = snforge_std::spy_events();

// Add tokens.
cheat_caller_address_once(:contract_address, caller_address: testing_constants::APP_GOVERNOR);
Expand Down