-
Notifications
You must be signed in to change notification settings - Fork 537
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
Dutch auction #78
Closed
Closed
Dutch auction #78
Changes from all commits
Commits
Show all changes
164 commits
Select commit
Hold shift + click to select a range
7d7bbbe
Copy pasted my dutch auction program
SwayStar123 cab7f47
Added logic to cap the price to the ending price
SwayStar123 11d3048
fixed comment
SwayStar123 d032145
Update dutch-auction/Cargo.toml
SwayStar123 03bdb05
Added missing semi colons and a `storage.`
SwayStar123 4d59187
Merge branch '69-dutch-auction' of https://github.com/FuelLabs/sway-a…
SwayStar123 c8aa432
Update dutch-auction/Cargo.toml
SwayStar123 6a54b58
Update dutch-auction/Forc.toml
SwayStar123 a7ce7b0
Removed unused function
SwayStar123 3b8d3f3
Added comments
SwayStar123 a9c075a
Made uses alphabetical, and changed abi name
SwayStar123 cd78934
Added enum errors and replaced assert with require
SwayStar123 03bf17e
Missing semicolon
SwayStar123 dc32a85
Seperated abi from main file
SwayStar123 6baaa49
Allowing admin to change the asset id via the setup_auction function
SwayStar123 924b008
Added some comments and end_auction function
SwayStar123 8e55d9d
Added a constructor function
SwayStar123 8e279c1
Added some comments and disallowed bidding before start time
SwayStar123 5667d46
Added a semi colon and the end_auction function in the abi
SwayStar123 b5ee469
Added explanation to the win function
SwayStar123 c4338cb
Changed it to be an implicit return
SwayStar123 c119c73
Removed abbreviations, and put the constructor at the top
SwayStar123 c049da2
Allow auction to start in the current block
SwayStar123 c28e0a8
fixed variable name error
SwayStar123 c5111a4
renamed the price function
SwayStar123 315c95b
More comments for calculate_price
SwayStar123 ff8b26d
Better explanation for now
SwayStar123 b4e615d
Renamed storage variables to fit style guide and auction naming conve…
SwayStar123 7647e1b
Fixed up the get_sender() function
SwayStar123 4fa4985
Moved the dutch auction into a auctions folder instead of letting it …
SwayStar123 6dcc69a
Using a StorageMap to allow for multiple auctions simultaneously. DOE…
SwayStar123 790b493
Fixed storagemap's struct field setting
SwayStar123 a294a1a
Loading in the auction once instead of repeatedly
SwayStar123 39f622e
Update auctions/dutch-auction/src/main.sw
SwayStar123 f8df912
Update auctions/dutch-auction/src/main.sw
SwayStar123 9137d4c
Update auctions/dutch-auction/src/main.sw
SwayStar123 e310f3a
alphabetical order
SwayStar123 dd6b8f5
constructed -> initialized
SwayStar123 dc101ed
Comment change
SwayStar123 3a850be
Comment change
SwayStar123 d5218a5
merge changes made on github
SwayStar123 8a98067
added cannot reinitialize and made asset id auction specific, removed…
SwayStar123 d1d2901
Address -> Identity in abi
SwayStar123 157285e
nvm ill change it to identity later
SwayStar123 2bec7f4
Update auctions/dutch-auction/src/main.sw
SwayStar123 02c34e1
Update auctions/dutch-auction/Cargo.toml
SwayStar123 844e6af
Switching some comparisons around for formatting
SwayStar123 c48e65d
Merge branch '69-dutch-auction' of https://github.com/FuelLabs/sway-a…
SwayStar123 32111cd
Update auctions/dutch-auction/src/main.sw
SwayStar123 aa7aba4
changed latest_auction_id to auction_count
SwayStar123 74c4c8e
Update auctions/dutch-auction/src/main.sw
SwayStar123 653e305
Update auctions/dutch-auction/src/abi.sw
SwayStar123 7ee1584
added check for valid auction id
SwayStar123 dc22f8a
Merge branch '69-dutch-auction' of https://github.com/FuelLabs/sway-a…
SwayStar123 c1d14ab
Minor stylization
SwayStar123 97db208
Assigned price to a variable instead of recalculating everytime, and …
SwayStar123 50ef57e
Moved errors enum and auction struct into seperate files
SwayStar123 c5ff265
Made admin and beneficiary generic over identity
SwayStar123 b0d7b57
Added logging
SwayStar123 6f300ea
forc fmt
SwayStar123 cdc9103
removed a comment
SwayStar123 2ebacdf
Create README.md
SwayStar123 9ccfc0e
Merge branch '69-dutch-auction' of https://github.com/FuelLabs/sway-a…
SwayStar123 de933d1
Update ci.yml
SwayStar123 95d3851
forc fmt
SwayStar123 e7d0e5c
Merge branch '69-dutch-auction' of https://github.com/FuelLabs/sway-a…
SwayStar123 9dd404e
cargo fmt
SwayStar123 a111b42
Update ci.yml
SwayStar123 2a13c9e
Update auctions/dutch-auction/src/data_structures.sw
SwayStar123 e40dc9e
Update auctions/dutch-auction/src/data_structures.sw
SwayStar123 ea02241
Update auctions/dutch-auction/src/main.sw
SwayStar123 a6a1ad7
Update auctions/dutch-auction/src/main.sw
SwayStar123 ff9d95a
Update auctions/dutch-auction/src/main.sw
SwayStar123 fea8551
Update auctions/dutch-auction/src/main.sw
SwayStar123 2eebdeb
Update auctions/dutch-auction/src/main.sw
SwayStar123 bb37186
Update auctions/dutch-auction/src/main.sw
SwayStar123 64de14d
Update auctions/dutch-auction/src/main.sw
SwayStar123 3af0084
Renamed an event and some minor stylization
SwayStar123 0d5d835
Merge branch '69-dutch-auction' of https://github.com/FuelLabs/sway-a…
SwayStar123 4f2fcb5
forc fmt
SwayStar123 93771ea
validate id function added
SwayStar123 45432cc
changed documentation into comments
SwayStar123 0a98876
changed more documentation into comments
SwayStar123 e029ce4
Reformatted the order of function calls and assignments in bid function
SwayStar123 bf6153d
renamed get_sender_identity
SwayStar123 23d55f0
added a check to see if auction already ended in cancel_auction
SwayStar123 ee659a7
Changed position of auction ended check
SwayStar123 5383bb7
Added documentation for every function
SwayStar123 0f8900d
Seperated errors into seperate enums
SwayStar123 b6e9e07
Create README.md
SwayStar123 bcc3141
auction() function returns auction from an id
SwayStar123 9e3c79c
Merge branch '69-dutch-auction' of https://github.com/FuelLabs/sway-a…
SwayStar123 031a96f
documentation
SwayStar123 4e8a27f
Merge branch 'master' into 69-dutch-auction
Braqzen 4952de4
Removed the concept of an admin, anyone can make an auction and only …
SwayStar123 2a362e5
data_structures alphabetical order
SwayStar123 6908379
Reworked the classification of some errors
SwayStar123 4904a8a
missed the word "error"
SwayStar123 94c7a53
Minor changes and added a check in bid to not allow bids after auctio…
SwayStar123 74207ff
comment changes, changed the position of some statements
SwayStar123 c05f3d3
added change_asset and change_beneficiary functions, and made abi alp…
SwayStar123 8a01b0a
added a check to see if auction has ended
SwayStar123 a92aea3
removed unncessary comment
SwayStar123 849ef05
Added a "active_auctions_by_identity" storage variable
SwayStar123 0b3fef6
added panic comments
SwayStar123 c6aaabb
Update README.md
SwayStar123 f8a679c
Update README.md
SwayStar123 0b0047b
Merge branch 'master' into 69-dutch-auction
Braqzen 50757c0
Update .github/workflows/ci.yml
SwayStar123 302c559
Update build.sh
SwayStar123 634bbf4
changed order of fields in auction struct
SwayStar123 6f668fd
changed order of errors
SwayStar123 40ffde0
changed documentation
SwayStar123 9b81255
Updated documentation and comments
SwayStar123 e203352
moved most private functions to utils.sw
SwayStar123 03e6b73
replaced beneficiary with author for authorization of some functions
SwayStar123 11fcdcf
added a auctions_won function
SwayStar123 e637108
Added a winner option field to the auction struct
SwayStar123 0276ccd
addded a new log for changed asset
SwayStar123 b9b964d
fixed breaking changes
SwayStar123 4efbad8
Merge branch 'master' into 69-dutch-auction
SwayStar123 5e9b347
Update build.sh
SwayStar123 c2836f0
Update build.sh
SwayStar123 26e011e
updated std use
SwayStar123 efe5dd4
Merge branch '69-dutch-auction' of https://github.com/FuelLabs/sway-a…
SwayStar123 f4245a1
forc fmt
SwayStar123 7fbe7e5
started tests and realized im blocked on vec
SwayStar123 7834fa1
resolved merge conflict
SwayStar123 aeb8c50
forc fmt
SwayStar123 cd132bf
Created a storagemapvec and used it
SwayStar123 0d3b3e7
Updated documentation and moved it
SwayStar123 fa72e08
Merge branch 'master' into 69-dutch-auction
SwayStar123 bb92532
Merge branch 'master' into 69-dutch-auction
SwayStar123 362d8de
froc fmt
SwayStar123 63132c4
simplified the view functions
SwayStar123 2798f0f
Merge branch 'master' into 69-dutch-auction
SwayStar123 ac6dca4
switched to swaylibs storagemapvec
SwayStar123 0bf1801
changed some of the documentation
SwayStar123 d9cb7e0
changed auction documentation
SwayStar123 455e8f4
changed documentation of auctions won
SwayStar123 fc23650
forc fmt
SwayStar123 bef11ca
added dutch auction to workspace
SwayStar123 b8ce884
Updating dutch auction
SwayStar123 125d3de
Merge branch 'master' into 69-dutch-auction
SwayStar123 b979d71
Updated and cleaned up dutch action
SwayStar123 eda567f
test for price
SwayStar123 9cd81b5
failed transfer to address error
SwayStar123 aabb90e
debugging
SwayStar123 cdf2f7e
fuel-toolchain added
SwayStar123 fddbde5
changed forc version
SwayStar123 c1bef5a
changing versions
SwayStar123 6ac913f
updating forc and adding create_auction tests
SwayStar123 e44922c
failing tets for create_auction
SwayStar123 4877099
cargo fmt and add incorrect asset test
SwayStar123 c826081
active_auctions_of_author is not updated correctly
SwayStar123 331edda
added fix for removing correct auction_id from active_auctions
SwayStar123 665f596
fmt
SwayStar123 e622f9b
added auction tests
SwayStar123 ab795ab
change_asset tests
SwayStar123 cc5e7c4
change_beneficiary tests
SwayStar123 e4582aa
all tests done
SwayStar123 d6ae33b
move everything into project folder
SwayStar123 5deed75
ci typo
SwayStar123 274de37
Merge branch 'master' into 69-dutch-auction
SwayStar123 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
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 |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| # Overview | ||
SwayStar123 marked this conversation as resolved.
Show resolved
Hide resolved
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. I suggest looking at the other README files and adjusting this one to contain a higher level structure / scope / content of the auctions as this only has a few lines / bullet points. It's too barebones. |
||
| This is a repository of auction contracts maintained by the Fuel application developer team. They will support auctioning of NFTs but can be edited for other purposes | ||
|
|
||
| There are 3 seperate auctions in this folder | ||
| - English Auction | ||
| - Dutch Auction | ||
| - Blind Auction | ||
|
|
||
| # How to run | ||
|
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. I would check the repo to see if this is even needed or if a repo level gitignore already contains there |
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 |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| out | ||
| target |
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.