-
Notifications
You must be signed in to change notification settings - Fork 4
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
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
536c42f
feat: added min order check when placing a limit
crnbarr93 5f4e85a
test: fixed failing tests
crnbarr93 dbbb298
chore: removed unused imports
crnbarr93 c812877
test: added cases for min quantity
crnbarr93 bccdac2
feat: silently fail on zero amount claims
crnbarr93 244eaee
skip bounty and maker fee calculations in zero output scenario
AlpinYukseloglu d9ec236
return error instead of panicking on overflow
AlpinYukseloglu File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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(); | ||
|
||
tick_values.cumulative_total_value = tick_values | ||
.cumulative_total_value | ||
|
@@ -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); | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 | ||
|
@@ -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 | ||
|
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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?