Commit Graph

62 Commits

Author SHA1 Message Date
adamjeffries 3af15e6a26
Merge branch 'master' of https://github.com/metaplex-foundation/metaplex into instant-sale 2021-08-31 15:01:56 -05:00
Jordan Prince f11659cb43
H (#260)
* Adding candy machine

* Still working on stuff

* Commit where is top using anchor

* Working on candy machine

* Continue working on candy machine

* Still working

* Completely reasonable failure

* Completely unreasonable failure

* Finally, we have uploading configs and tests

* Add uuid support to candy machines so candy machine can rerun with same config

* feat: init cli

* Got minting now bro. All downhill from here.

* All done

* Chang eaddress

* Minor fix to anchor settings

* feat: integrate candy

* feat: cli upload

* Heck yeah. Switch out the pda for a non pda to allow for alrger allocs

* Send authority to candy machine authority if retain authority is true

* feat: add add congif lines

* Forgotten conflict

* Rewire CLI to chunkify and add verification

* Current changes

* Client finished

* Fuckin bitmasks bro

* Fix metadata client

* Working on cli

* Fixed the healing loop

* here we go.

* Fix the error that caused price to be 1 instead of 5

Co-authored-by: bartosz-lipinski <264380+bartosz-lipinski@users.noreply.github.com>
2021-08-31 14:16:16 -05:00
adamjeffries e56c62dd6c
Merge branch 'master' of https://github.com/metaplex-foundation/metaplex into instant-sale 2021-08-30 13:40:04 -05:00
Jordan Prince e1ab4494c4
Fix metadata client (#251) 2021-08-29 21:16:18 -05:00
adamjeffries 0b8feaed9a
Merge branch 'master' of https://github.com/metaplex-foundation/metaplex into instant-sale 2021-08-25 07:59:20 -06:00
sigaloid 61c124acf0
Cargo format, update, clippy fix, fix (#228)
* Cargo fmt

* Cargo update

* cargo +nightly clippy --fix -Z unstable-options

* Cargo fix
2021-08-24 09:23:41 -05:00
Jordan Prince 8c223fabaf
Fix for decomming v2s (#229)
* Fix null bytes showing up in wwindows

* Fix for decommissioning v2s
2021-08-20 16:30:40 -05:00
Jordan Prince 08cce01bc8
Fix off by one deprecated (#224)
* Use toPublicKey to convert string to public key to compare to public key in send cancel bid.

* Fix off by one error in deprecated v1 state
2021-08-19 22:04:21 -05:00
Jordan Prince 0dfdcaa7d4 Merge branch 'master' of github.com:metaplex-foundation/metaplex into instant-sale 2021-08-13 21:11:04 -05:00
B 81023eb3e5
Warp Speed 8 (#208)
* Work in progress on speed fix

* Oh yeaj, it works and it's fast as sh*t...just get the metadata oyu ned

* Separate the metadata gets into additional promises since technically they are async

* chore: Where no man has gone before

* Holy cow, now we have editions too

* remove a print

* feat: use string instead of pubkey

* Safer script

* feat: first batch

* feat: batch 2

* feat: remove toBase58

* fix: build error

* fix: another build issue

* fix: build issue

* fix: more fixes

* fix: build

* chore: delete dex parser

* fix: delete

* feat: add store as query parameter

* feat: faster url check

* feat: replace pubkeys with strings

* fix: build

* fix: build errors

* feat: fix env variable

Co-authored-by: Jordan Prince <jordanmprince@gmail.com>
2021-08-13 20:20:10 -05:00
Jordan Prince 6b30563b93 Merge branch 'master' of github.com:metaplex-foundation/metaplex into instant-sale 2021-08-13 20:13:30 -05:00
Jordan Prince bf22676c2c Working on instant sale 2021-08-13 20:09:34 -05:00
Jordan Prince 8904e67630
Operation: Warp Speed I (#203)
* Work in progress on speed fix

* Oh yeaj, it works and it's fast as sh*t...just get the metadata oyu ned

* Separate the metadata gets into additional promises since technically they are async

* Holy cow, now we have editions too

* remove a print

* Safer script

* Minor script fix
2021-08-13 08:03:08 -05:00
Jordan Prince b4f5b4b29b Fixing code 2021-08-12 19:30:36 -05:00
Jordan Prince d13e2a98c7 Merge branch 'feature/instant-sale' of github.com:atticwip/metaplex into instant-sale 2021-08-12 18:33:56 -05:00
Jordan Prince ad23dbfb4f Holy cow, now we have editions too 2021-08-11 17:31:10 -05:00
Jordan Prince 9170223fb0 Oh yeaj, it works and it's fast as sh*t...just get the metadata oyu ned 2021-08-10 19:52:21 -05:00
Jordan Prince bc97c0c678 Work in progress on speed fix 2021-08-10 08:17:36 -05:00
Leslie P. Polzer 3074ece80e
Client metadata tool: show edition mint after printing new edition. (#197)
* Token meta CLI client: add --mint and --mutable args to create call.

* Client metadata tool: show edition mint after printing new edition.

Co-authored-by: Solarians <hello@solarians.click>
2021-08-09 11:25:16 -05:00
Jordan Prince 8ea6b0e2d4
Refactor WinningConfigs into more scalable independent SafetyDepositConfig solution (#144)
* WIP on new configs

* WIP on building out primary pathway of new safety config, needs its own serde

* Finish the serde for safety config.

* Upgrade solana library and borsh library

* Refactor bid redemption ticket to use a bitmask behind the scenes and present a nice facade

* WIP commit - got most of the redemption stuff worked out through abstraction. Need to take a hard look at participation and work that one out next.

* WIP on smoothing out validations and participation

* More fixes to smooth out the facade between the v1 and v2 auction manager, mostly in withdraw master edition

* Lots of work on getting this thing ready to test but hit a snagin empty payment account that requires a whole new account to be created

* Still working

* Massive push to finish all the bugfixes to get the refactor ready for integration with UI

* Beginning the long work of integrating refactor into the UI

* Update the model files to have the latest new account keys for the refactor

* Still WIPing the front end into shape

* Slowly creating facades on the front end so that it no longer knows about winning configs in many places.

* Lots of refactoring to get rid of winning configs

* More build fixes

* Doesnt seem like much, but this commit is the first commit that can do an end to end auction to settlement with a single token in v2.

* More fixes to withdrawing editions and edition management in the v2 universe, and a fix for expected redemptions in the v1 universe that exists as a bug right now.

* Forgot to include the fix for expected redemptions in v1

* This commit demarcates open edition auctions working again

* Fixes to tiered auctions.

* Remove debugger

* Show token winning type

* Fix for bad royalties calcs

* More fixes

* Still working through various bugfixes in participation nfts

* More fixes to participation

* more bugfixes

* Dont allow av1s to create new redempton tickets

* Make a new endpoint for participation redemption since it now requires an argument

* Switch ok() to normal match as this seems to make a different and wont throw missing account keys

* Revert "Switch ok() to normal match as this seems to make a different and wont throw missing account keys"

This reverts commit 68b8c7cfc2eb2bc6d3b5297b337042c884e7c2c0.

* Master edition is actually safety deposit in the case of a v1 since it still is consuming from same iterator
2021-08-09 08:52:30 -05:00
Vadim 8909e57146 Add EndAuction proxy call to Metaplex program 2021-08-06 13:45:56 +03:00
Ilia bf95a0723b
Feature/token metadata tests(negative) (#182)
* feature: update borsh version, wip testing module

* Fixed signatures for create metadata in tests

* feature: success test for create_metadata_account

* feature: success test for update_metadata_account, added is_mutable param to create method

* feature: success test for update_primary_sale_happened_via_token, added token account creation in test metadata structure

* feature: success test for create_master_edition

* feature: success test for mint_new_edition_from_master_edition_via_token

* feature: added more success tests checks, wip: added necessary accounts

* feature: added more internal mocks, added mint_new_edition_from_master_edition_via_vault_proxy

* feature: added basic negative tests

Co-authored-by: Yuriy Savchenko <yuriy.savchenko@gmail.com>
2021-08-04 13:17:00 -05:00
Jordan Prince 0645a7029c
Fix secondary markets + Admin Conversion (#183)
* Add rate limiting to the converter, only show in the case of non public stores, and bring it back from the dead

* Dont mark an item as sold just because you're doing a full rights auction
2021-08-03 09:34:21 -05:00
Vecheslav Druzhbin 0a05815499 refactor: minor changes in the end checking 2021-08-02 18:25:25 +03:00
Vecheslav Druzhbin ebe3841013 style: typo has instant bid 2021-08-02 18:11:57 +03:00
Ilia 7a01f3c650
feature: success tests for token-metadata (#173)
* feature: update borsh version, wip testing module

* Fixed signatures for create metadata in tests

* feature: success test for create_metadata_account

* feature: success test for update_metadata_account, added is_mutable param to create method

* feature: success test for update_primary_sale_happened_via_token, added token account creation in test metadata structure

* feature: success test for create_master_edition

* feature: success test for mint_new_edition_from_master_edition_via_token

* feature: added more success tests checks, wip: added necessary accounts

* feature: added more internal mocks, added mint_new_edition_from_master_edition_via_vault_proxy

Co-authored-by: Yuriy Savchenko <yuriy.savchenko@gmail.com>
2021-07-30 10:33:22 -05:00
Leslie P. Polzer 47f2c56c65
Token meta CLI client: add --mint and --mutable args to create call. (#175) 2021-07-29 09:41:57 -05:00
Vecheslav Druzhbin d526364aaf refactor: style MAX_AUCTION_DATA_EXTENDED_SIZE 2021-07-29 15:02:52 +03:00
Vecheslav Druzhbin e18c4e0bf5 refactor: instant sale considered open edition auction 2021-07-29 13:05:30 +03:00
Vecheslav Druzhbin ff4ed1b18a fix: optional name for auction v1 2021-07-28 14:31:59 +03:00
Vecheslav Druzhbin 9f83796566 Merge branch 'master' into feature/instant-sale 2021-07-28 12:34:32 +03:00
Vecheslav Druzhbin 71b2e57032 Merge branch 'feature/add-auction-name' into feature/instant-sale 2021-07-28 12:30:15 +03:00
Jordan Prince b71adad26f
Dont validate edition info ownership if token only transfer since it is not used for token only (#169) 2021-07-26 18:19:55 -05:00
Yuriy Savchenko 18c3b0b1b7
Cancelling bid only if the auction has not ended yet (#165) 2021-07-25 16:38:27 -05:00
Yuriy Savchenko 1857649730 Added name to the auction data 2021-07-25 12:00:40 +03:00
Vadim 300fef21f8 Refactor after review 2021-07-23 20:02:48 +03:00
Vadim ca23b371a4 Refactor tests for Auction program 2021-07-23 16:35:30 +03:00
Vadim eb798f9825 Add instant_sale_price check to metaplex common redeem check util 2021-07-23 16:35:30 +03:00
Vadim 727b5fc10a Add tests for instant_sale_price feature 2021-07-23 16:35:30 +03:00
Vadim 3f43c2b45b Add instant_sale_price check to ClancelBid instruction 2021-07-23 16:35:30 +03:00
Vadim e4c670bec9 Add instant_sale_price check to ClaimBid instruction 2021-07-23 16:35:30 +03:00
Vadim e38684dd4f Add instant_sale_price check to PlaiceBid instruction 2021-07-23 16:35:30 +03:00
Vadim c2507c8287 Add check of instant_sale_price parameter to PlaceBid instruction 2021-07-23 16:35:30 +03:00
Vadim b47705253d Add instant_sale_price parameter to AuctionDataExtended 2021-07-23 16:35:30 +03:00
Jordan Prince 397bf8dbdc
Fix for bad state calculation (#139) 2021-07-17 15:06:36 -05:00
Jordan Prince c3b9c5eb4a
Master edition refactor (#108)
* WIP on new instructions

* WIP on refactor

* Lot of wip here on refactoring to a new master edition v2. too much to mention.

* Next wip state on new master edition

* More work, unfortunately had to add proxy call to vault to get access to authority to use store token

* A bit of a checkpoint here - removed all the old cli code since we have deviated so much it is not worth maintaining anymore and there is no real use for it given it doesnt use sol wrapped accounts, and we are ready to start integration testing with the remaining CLIs. No front end changes yet.

* Adding a bunch of new actions for the front end...still need to hook up more.

* Working on integration testing all of this but really have a CPU problem

* Got redeem bid working for the simplest case. Need to test more tomorrow.

* Cut down on CPU time by cutting out the O(n) scan of bidders

* Smarter withdraw that takes participation and empty auctions into account.

* After much pain and misery, i have working participation bids as well.

* More fixes for redemption

* Add a double check in case account mint is empty for send participation bid because if that one messes up yo end up with dupes

* A bunch of super optimizations to get 50 person auction sto pass muster even on the old system.

* Working on more fixes for v2

* Moratorium on alotted address size check for 2weeks

* Working on a new set of methods that allow me to get rid of deserializing auction entirely in redemption for metaplex...

* Went medieval on auction manager and wrote my own save function, and removed auction from being deserialized at all. Going to test a 50 person auction now in v2.

* A working autoredeemer, nearly

* Work in progress on multiple edition redemptions

* Updates to site for edition redemption

* Add conversion button and update sale happened if it should be in auction creation process
2021-07-16 15:06:27 -05:00
Jordan Prince 42a8d1d309
Edgecase for res list (#109)
* Super quick hotfix to token cli

* Account for edgecase in res list when you for some reason overwrite yourself

* Another fix, keeping track of population.
2021-07-02 22:13:03 -05:00
Jordan Prince 2fd58e5b2b
Edgecase for res list (#107)
* Super quick hotfix to token cli

* Account for edgecase in res list when you for some reason overwrite yourself
2021-07-02 14:47:20 -05:00
Jordan Prince 56351bfc62
Super quick hotfix to token cli (#106) 2021-07-02 14:18:32 -05:00
Jordan Prince bc729d73b7 Ensure nobody but the authorities on the vault and auction (which should themselves be equal) can be authority on the auction manager. 2021-06-28 20:40:24 -07:00