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

Reserve Auctions (Final) #298

Merged
merged 57 commits into from
Jul 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
2c1df33
First pass at update sg-marketplace-common
tasiov Apr 25, 2023
9786eb9
Add load_marketplace_params and load_collection_royalties functions t…
tasiov Apr 25, 2023
e4f009a
Refactor reserve auction to use common functions
tasiov Apr 25, 2023
72e0ddf
Fixup PR
tasiov Apr 26, 2023
5e5cea7
Lint
tasiov Apr 26, 2023
8681b4f
Schema
tasiov Apr 26, 2023
5f11673
[OAK 1] Handle zero-amount transfers
tasiov May 16, 2023
ea75a1f
[OAK 2] Adjust reserve price denom
tasiov May 16, 2023
8dce40f
[OAK 4] Validate reserve-auctions config
tasiov May 16, 2023
a3ce214
[OAK 5] Incorrect error messages
tasiov May 16, 2023
da40c3f
[OAK 6] Validate asking price update does exceed max amount
tasiov May 16, 2023
10feeed
[OAK 8] Remove duplicate finder fee validation
tasiov May 16, 2023
2fecc0e
[OAK 9] Prevent update reserve price after auction end
tasiov May 16, 2023
9a40e98
Adjust contract to start only after the first bid is placed
tasiov May 16, 2023
f37ad7e
Update schema
tasiov May 16, 2023
9259e6e
Adjust expiring auction key
tasiov May 16, 2023
dbe95c1
Address PR comments
tasiov May 17, 2023
e5e0b15
Update types
tasiov May 17, 2023
3eb606b
Lint
tasiov May 17, 2023
3977e20
Deploy reserve auctions to testnet
tasiov May 17, 2023
0514ab6
Add auction_end_time event attribute when placing a bid
tasiov May 23, 2023
988ad9e
Add blank migration message to update testnet contract
tasiov May 23, 2023
cdea23c
Add support for multiple denoms
tasiov May 23, 2023
cb3c313
Check that NFT is tradable
tasiov May 23, 2023
a2df3cd
Update schema
tasiov May 23, 2023
7c865af
Publish new types version
tasiov May 23, 2023
35be764
Update sg-marketplace-common pkg to support fair burn contract
tasiov Jun 1, 2023
e5c98db
Adjust marketplace contract so that it still compiles
tasiov Jun 1, 2023
269d7fc
Format toml files
tasiov Jun 1, 2023
bf82399
Add support for multiple denoms in reserve auctions, also support fai…
tasiov Jun 1, 2023
adba36f
Adjust reserve auction tests
tasiov Jun 1, 2023
94c3877
Check in shell scripts
tasiov Jun 1, 2023
09a51a5
Lint
tasiov Jun 1, 2023
8f5762b
Schema
tasiov Jun 1, 2023
2b7d09e
Update fair burn dep
tasiov Jun 1, 2023
b910e2b
First pass implementation of reserve auction halt detections
tasiov Jun 13, 2023
8a2c71a
Write tests for halt manager logic
tasiov Jun 13, 2023
e00b584
Cleanup and lint
tasiov Jun 13, 2023
7f3c76b
Adjust auction creation fee logic
tasiov Jun 16, 2023
bfe5f9a
Update migrate message
tasiov Jun 16, 2023
3382941
Update schema
tasiov Jun 28, 2023
8ed2f67
Reset marketplace
tasiov Jun 28, 2023
301e61d
Update stargaze-fair-burn package
tasiov Jun 28, 2023
cc11751
Prep sg-marketplace-common
tasiov Jun 29, 2023
3e81630
Prep reserve-auctions, remove marketplace dependency
tasiov Jun 29, 2023
b337069
Conform reserve-auctions to sg-marketplace-common
tasiov Jun 29, 2023
3fdd890
Schema
tasiov Jun 29, 2023
8162229
Add comments to sg-marketplace-common
tasiov Jun 29, 2023
8f304e5
Fixup halt logic
tasiov Jun 29, 2023
0776dbd
Add migrate msg
tasiov Jun 29, 2023
5e438d1
Lint and schema
tasiov Jun 29, 2023
5d0f239
Update codecov.yml
tasiov Jun 29, 2023
6b94b52
Revert types dir changes
tasiov Jun 29, 2023
05a8299
Add min_reserve_prices tests
tasiov Jun 30, 2023
dadb870
Address PR comments
tasiov Jul 1, 2023
923662b
Bump sg-marketplace-common version
tasiov Jul 1, 2023
970d291
Add attributes to halt-detected event
tasiov Jul 6, 2023
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
4 changes: 2 additions & 2 deletions .cargo/config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[alias]
wasm = "build --release --target wasm32-unknown-unknown"
wasm = "build --lib --release --target wasm32-unknown-unknown"
wasm-debug = "build --target wasm32-unknown-unknown"
unit-test = "test --lib"
unit-test = "test --lib -- --nocapture"
5 changes: 3 additions & 2 deletions .codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@ coverage:
target: 90%

ignore:
- "contracts/marketplace/testing/.*"
- "contracts/reserve-auction/tests/.*"
- "contracts/marketplace/src/testing/.*"
- "contracts/reserve-auction/src/tests/.*"
- "packages/sg-marketplace-common/src/tests/.*"
224 changes: 192 additions & 32 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading