Commit Graph

92 Commits

Author SHA1 Message Date
Austin Adams d670968d6c
Add informational comment 2021-10-28 12:13:46 -05:00
Hendrik Hofstadt f1f13b2dac Allow seed authority to seed metadata for existing tokens 2021-10-08 13:22:49 +02:00
Jordan Prince 8952ed80c4
Fix id (#618) 2021-10-04 13:09:18 -05:00
Jordan Prince 27d14c6626
Fix candy machine (#614)
* Remove auction cli nobody uses

* Fix for case when update authority is not signer, treat them like any other creator in the list.

* Fix candy machine
2021-10-04 12:27:52 -05:00
Jordan Prince 17c2ca80e0
Fix metadata creator bug (#609)
* Remove auction cli nobody uses

* Fix for case when update authority is not signer, treat them like any other creator in the list.
2021-10-04 09:48:37 -05:00
Jordan Prince 93a8816f11
Add token pre-minting (#596) 2021-10-03 18:02:47 -05:00
Jordan Prince 446470ae27
Participation nfts in fl (#537)
* fix some boolean checks and add check for 0 sol

* Fixes for eligible count, not having enough sol, and couple other things like rug verbiage

* Make punching faster in cli and make rug screen better

* Added try catches for errors around txns

* Work in progress on NFTs

* Still wip

* continuation

* still working

* WIP on stuff

* Assert ownership of ATAs

* Continue adding participation nfts

* WIP on participation

* Fix to lottery call

* Looks like participation is getting close, just need to test the negative.

* Participation complete
2021-10-01 19:45:49 -05:00
Jordan Prince 0056c5770c
Fix lottery call (#545)
* Fix to lottery call

* Remove unneeded print statements that brick the contract when too large of a lottery
2021-09-29 10:19:03 -05:00
Anthony Morris 6364c1e7c4
Fix typos in README 2021-09-27 20:06:02 -07:00
Jordan Prince 23372a130a
Add ownership check to flp (#516)
* Assert ownership of ATAs

* Some better checks in punch
2021-09-26 18:31:56 -05:00
Jordan Prince d850637d31
Fix updating of prices for FLP (#499) 2021-09-25 13:08:29 -05:00
Jordan Prince ec99a334a7
Some minor fixes to contract + UI (#469)
* fix some boolean checks and add check for 0 sol

* Fixes for eligible count, not having enough sol, and couple other things like rug verbiage
2021-09-22 15:54:34 -05:00
Jordan Prince b48aefdfaa
Metadata for fair launch (#460)
* added deploy cmds

* Too specific

* Add metadata support for fair launch tokens.
2021-09-21 21:23:29 -05:00
Adam Jeffries ef54f97ca8
Merge pull request #233 from metaplex-foundation/instant-sale
Instant sale
2021-09-21 17:48:55 -05:00
Jordan Prince d1dedeacdd
The Fair Launch Protocol (#367)
* Fair launch work

* Add cargo

* Update cargo to latest

* Latest candy machine types

* Fair launch update to anchor 14 and finish fleshing out commands

* Working on fair launch

* Finish initializing fair launch.

* Lottery endpoints

* Knee deep in more actions

* some monster commit here, almost done wiht initial draft

* Code complete fair launch. first draft.

* More work

* COmmit to reproduce

* Hell yeah i can make these and show them

* well, a lot of stuff.

* Holy medians batman

* Adjust ticket

* more commands, more love, more life

* Mooore stuff

* This sh*t is gettin hot

* More junk, im losing it.

* Ninja'd that sh*t

* well ill be damned, some of it is working

* Think punching is working. Time for sleep.

* Anti rug commit - before testing.

* feat: init commit for website

* Got my money back first time end to end b*tches

* things beginning to work

* Oh yeah, rug pull seems to be working...

* Mostly working now

* Some more fixes

* Moref ixes

* feat: basic page

* feat: purchaseTicket

* feat: fair launch UI

* Still figuring it out

* Still investigating why newly made accounts have delegates

* pushing

* Some fixes to the adjust ticket

* Bid adjustment works in UI

* feat: layout

* trasury numbers

* Hook up your bid

* feat: style

* wip on fair launch new fields

* feat: home

* Come limited punching support

* More display logic for fair launch

* feat: style

* feat: countdown

* Bid adjustment

* Fix for when median is not divisible by tick

* feat: home

* Working on recoding so that we can use spl tokens

* feat: style

* Midway stopping point...nothing is working.

* more and less.

* Added confetti and merged updates

* End to end working and fix minting for spl in candy machine

* New fair launch

* New fair launch

* Better loading and stuff

* feat: style changes

* fix: warnings

* candy time

* Anti rug screens

* better verbiage

* feat: hide withdraw button

* Refund working and set id

* Good to go for prod

Co-authored-by: bartosz-lipinski <264380+bartosz-lipinski@users.noreply.github.com>
2021-09-21 13:33:22 -05:00
Vadim b59772c75c Add comment for ClaimBid instruction 2021-09-21 15:52:21 +03:00
Vadim b3ba1a95e2 Fix Metaplex ClaimBid instruction, move extended acc info to the end of acc list 2021-09-21 11:42:02 +03:00
shotgunofdeath 0445dacd5a fix(notifications): add ended instant sale auctions to notifications 2021-09-20 18:43:17 +03:00
adamjeffries 7861b240d1
Merge branch 'master' of https://github.com/metaplex-foundation/metaplex into instant-sale 2021-09-19 15:28:15 -05:00
Slavomir 633d3668c7
Improve doc comments (#436)
* token-metadata: fix doc formatting for SignMetadata instruction.

* auction: add doc to `SetAuthority` instruction.

Deduced from `pub fn set_authority_instruction`

See 09d323accd/rust/auction/program/src/instruction.rs (L115)

* Remove newline

* Improve comment
2021-09-19 09:47:27 -05:00
shotgunofdeath bf39727cc9 Merge branch 'master' into instant-sale
# Conflicts:
#	js/packages/cli/src/helpers/accounts.ts
#	js/packages/cli/src/types.ts
#	js/packages/common/src/models/metaplex/claimBid.ts
#	js/packages/common/src/models/metaplex/index.ts
#	js/packages/common/src/models/metaplex/redeemBid.ts
#	js/packages/common/src/models/metaplex/redeemFullRightsTransferBid.ts
#	js/packages/common/src/models/metaplex/redeemPrintingV2Bid.ts
#	js/packages/web/src/components/AuctionCard/index.tsx
#	js/packages/web/src/contexts/meta/meta.tsx
#	js/packages/web/src/views/auctionCreate/index.tsx
2021-09-16 13:12:10 +03:00
Rad 76de057a0c
another overhaul (#337)
* another overhaul

- added backend signing for a single metadata id
- some small refactoring
- extracted upload from the CLI (maybe will do the same with other methods)

* optimized logging in the CLI

- logging now has levels
- added more readme content

* eslint update
2021-09-12 21:17:02 -05:00
shotgunofdeath 54659809e4 feat(instant sale): claim bid update 2021-09-12 20:23:21 +03:00
Maxim Gordienko c226677fc6 Merge branch 'master' into instant-sale 2021-09-09 16:31:15 +03:00
Jordan Prince 4a1b7d2f67
Feat/metaplex cli overhaul merged (#334)
* feat: candy-machine cli overhaul, so it's more readable

- extracted constants
- separated some helpers out
- removed duplication of crucial parts (like cache management, instruction creation, etc)
- renamed some variables to make them more accurate
- added `env` option and removed `url` option
- used env in all operations
- added some error handling

* more cleanups

* Add env option to bundler (#320)

* feature: add env to cli

* fix: format

* more cleanups

* added error checking

* eslint updates

* Some small bugfixes

Co-authored-by: Radoslaw Domanski <woohaas@gmail.com>
Co-authored-by: B <264380+bartosz-lipinski@users.noreply.github.com>
2021-09-07 14:02:10 -05:00
Armani Ferrante e0f2c1b068
Update candy machine with anchor v0.14.0 (#283) 2021-09-04 17:59:44 -05:00
Jordan Prince 40cfa29511
A few candy machine fixes - to uploader and program (#304) 2021-09-04 15:32:45 -05:00
Jordan Prince 0b064b6df4
Fix 10k error (#287) 2021-09-03 15:38:03 -05:00
lpeace 9d9d9d93b1
Fix example link (#252) 2021-09-02 10:10:44 -05:00
Slavomir c09c96e58c
Fix Anchor.toml (#272) 2021-09-02 10:09:50 -05:00
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