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.

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

[Sumtree]: Min Order Quantity #193

Merged
merged 7 commits into from
Jun 26, 2024
Merged
Show file tree
Hide file tree
Changes from 5 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
37 changes: 18 additions & 19 deletions contracts/sumtree-orderbook/src/order.rs
Original file line number Diff line number Diff line change
Expand Up @@ -105,16 +105,14 @@ pub fn place_limit(
);

let quant_dec256 = Decimal256::from_ratio(limit_order.quantity.u128(), Uint256::one());
// Only save the order if not fully filled
if limit_order.quantity > Uint128::zero() {
// Save the order to the orderbook
orders().save(deps.storage, &(tick_id, order_id), &limit_order)?;

tick_values.total_amount_of_liquidity = tick_values
.total_amount_of_liquidity
.checked_add(quant_dec256)
.unwrap();
}
// Save the order to the orderbook
orders().save(deps.storage, &(tick_id, order_id), &limit_order)?;

tick_values.total_amount_of_liquidity = tick_values
.total_amount_of_liquidity
.checked_add(quant_dec256)
.unwrap();
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just realized – we should be returning the error here instead of unwrapping right?


tick_values.cumulative_total_value = tick_values
.cumulative_total_value
Expand Down Expand Up @@ -669,9 +667,6 @@ pub(crate) fn claim_order(
// Immutable amount to prevent bounty/maker fee calculations affecting each other
let raw_amount = amount;

// Cannot send a zero amount, may be zero'd out by rounding
ensure!(!amount.is_zero(), ContractError::ZeroClaim);

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we are skipping this check now, we should also probably be skipping the bounty & maker fee calculations if the amount is zero right?

let denom = orderbook.get_opposite_denom(&order.order_direction);

// Send claim bounty to sender if applicable
Expand All @@ -696,13 +691,17 @@ pub(crate) fn claim_order(
amount = amount.checked_sub(maker_fee_amount)?;
}

// Claimed amount always goes to the order owner
let bank_msg = MsgSend256 {
from_address: contract_address.to_string(),
to_address: order.owner.to_string(),
amount: vec![coin_u256(amount, &denom)],
};
let mut bank_msg_vec = vec![SubMsg::reply_on_error(bank_msg, REPLY_ID_CLAIM)];
let mut bank_msg_vec = vec![];
// Silently fail on zero claim (dust amount) orders
if !amount.is_zero() {
// Claimed amount always goes to the order owner
let bank_msg = MsgSend256 {
from_address: contract_address.to_string(),
to_address: order.owner.to_string(),
amount: vec![coin_u256(amount, &denom)],
};
bank_msg_vec.push(SubMsg::reply_on_error(bank_msg, REPLY_ID_CLAIM));
}

if !bounty.is_zero() {
// Bounty always goes to the sender
Expand Down
Loading
Loading