Commit Graph

121 Commits

Author SHA1 Message Date
bartosz-lipinski 756ca1ee78 Merge remote-tracking branch 'origin/master' into therealLitJesus 2021-09-23 13:36:53 -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
Jordan Prince faee844f92 Merge branch 'master' of github.com:metaplex-foundation/metaplex into f 2021-09-19 17:46:06 -05: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
Jordan Prince 970ea6806f Working on recoding so that we can use spl tokens 2021-09-17 19:43:02 -05:00
Jordan Prince 1c6c46400e Fix for when median is not divisible by tick 2021-09-17 16:28:57 -05:00
Jordan Prince d8d9ab6771 wip on fair launch new fields 2021-09-16 17:49:23 -05:00
Jordan Prince 322a5b0f02 Some fixes to the adjust ticket 2021-09-16 13:37:12 -05:00
Jordan Prince 2329e520b6 Still investigating why newly made accounts have delegates 2021-09-16 11:33:56 -05:00
Jordan Prince f5aa219d5c Still figuring it out 2021-09-16 11:33:56 -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
Jordan Prince 2e4830b40d Moref ixes 2021-09-15 08:24:54 -05:00
Jordan Prince 52fec3c4ca Some more fixes 2021-09-14 14:32:29 -05:00
Jordan Prince f3020bc926 Mostly working now 2021-09-13 18:31:18 -05:00
Jordan Prince 8916935b22 Oh yeah, rug pull seems to be working... 2021-09-12 22:30:01 -05: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
Jordan Prince 6149685f27 Got my money back first time end to end b*tches 2021-09-12 19:29:11 -05:00
Jordan Prince 34ad88f514 Anti rug commit - before testing. 2021-09-12 14:44:41 -05:00
shotgunofdeath 54659809e4 feat(instant sale): claim bid update 2021-09-12 20:23:21 +03:00
Jordan Prince d8e096e3af Think punching is working. Time for sleep. 2021-09-12 01:41:58 -05:00
Jordan Prince 58e3338957 well ill be damned, some of it is working 2021-09-12 01:00:18 -05:00
Jordan Prince fc35a71660 Ninja'd that sh*t 2021-09-11 23:26:08 -05:00
Jordan Prince e187212b7d More junk, im losing it. 2021-09-11 20:44:43 -05:00
Jordan Prince e40ed962db This sh*t is gettin hot 2021-09-11 20:21:41 -05:00
Jordan Prince 0d08cc0b1c Mooore stuff 2021-09-11 18:20:12 -05:00
Jordan Prince 210a956a02 more commands, more love, more life 2021-09-11 15:47:31 -05:00
Jordan Prince 9dd06d4d19 Adjust ticket 2021-09-11 15:16:54 -05:00
Jordan Prince b2ebf9be87 Holy medians batman 2021-09-11 13:32:56 -05:00
Jordan Prince ff339ed482 well, a lot of stuff. 2021-09-11 01:29:14 -05:00
Jordan Prince b6ac259413 Hell yeah i can make these and show them 2021-09-10 22:20:05 -05:00
Jordan Prince 46693dc6dd COmmit to reproduce 2021-09-10 19:50:50 -05:00
Jordan Prince 43601098c2 Merge branch 'master' of github.com:metaplex-foundation/metaplex into f 2021-09-10 11:53:43 -05:00
Jordan Prince fb58acaf54 More work 2021-09-10 11:53:35 -05:00
Jordan Prince a1cc3b94c3 Code complete fair launch. first draft. 2021-09-10 11:18:31 -05:00
Jordan Prince 374a39b322 some monster commit here, almost done wiht initial draft 2021-09-09 22:16:10 -05:00
Maxim Gordienko c226677fc6 Merge branch 'master' into instant-sale 2021-09-09 16:31:15 +03:00
Jordan Prince c2b655e280 Knee deep in more actions 2021-09-08 20:37:21 -05:00
Jordan Prince 3058a9ee06 Lottery endpoints 2021-09-07 18:37:49 -05: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
Jordan Prince 2c1e19e8a1 Finish initializing fair launch. 2021-09-06 21:32:05 -05:00
Jordan Prince 6d323f8baf Working on fair launch 2021-09-06 14:56:33 -05:00
Jordan Prince db1a6980ee Merge branch 'master' of github.com:metaplex-foundation/metaplex into f 2021-09-04 18:43:24 -05:00
Jordan Prince 71ece1b8bb Fair launch update to anchor 14 and finish fleshing out commands 2021-09-04 18:40:27 -05:00