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

Marketplace V2 Expiring Orders #329

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Marketplace V2 Expiring Orders #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ad8fd31
Implementation of order expirations with tests passing
tasiov Nov 24, 2024
404506a
Add min expiry fee messages
tasiov Nov 24, 2024
b14c62b
Add expiration queries for orders, add sudo blocker msgs, update migr…
tasiov Nov 24, 2024
46ade87
Add tests to verify order index changes, and add tests for expiry ask…
tasiov Nov 26, 2024
beb6ee3
Test bid and collection bid execute messages
tasiov Nov 26, 2024
2de37b8
Add test for expiry reward refund on sale, add test for order queries
tasiov Nov 26, 2024
ee7f48b
Add test for sudo end blocker and v0_8 migration code
tasiov Nov 26, 2024
013f8e5
Add admin tests for listing fee and min expiry rewards
tasiov Nov 26, 2024
782bdd0
Lint
tasiov Nov 26, 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
6 changes: 3 additions & 3 deletions contracts/stargaze-marketplace-v2/src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ pub enum ContractError {
#[error("{0}")]
MarketplaceStdError(#[from] MarketplaceStdError),

#[error("No match found")]
#[error("NoMatchFound")]
NoMatchFound,

#[error("InvalidInput: {0}")]
InvalidInput(String),

#[error("InsufficientFunds")]
InsufficientFunds,
#[error("InsufficientFunds: {0}")]
InsufficientFunds(String),

#[error("InternalError: {0}")]
InternalError(String),
Expand Down
17 changes: 17 additions & 0 deletions contracts/stargaze-marketplace-v2/src/events.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,23 @@ impl<'a> From<ListingFeeEvent<'a>> for Event {
}
}

pub struct MinExpiryRewardEvent<'a> {
pub ty: &'a str,
pub denom: &'a str,
pub amount: &'a Option<Uint128>,
}

impl<'a> From<MinExpiryRewardEvent<'a>> for Event {
fn from(mre: MinExpiryRewardEvent) -> Self {
let mut event = Event::new(mre.ty.to_string());
event = event.add_attribute("denom", mre.denom.to_string());
if let Some(amount) = mre.amount {
event = event.add_attribute("reward", amount.to_string());
}
event
}
}

pub struct AskEvent<'a> {
pub ty: &'a str,
pub ask: &'a Ask,
Expand Down
Loading