Commit Graph

456 Commits

Author SHA1 Message Date
Jordan Prince cb4e07abeb
Fix fd launch (#457)
* added deploy cmds

* Too specific
2021-09-21 14:44:49 -05:00
Jordan Prince e68f3300b6
added deploy cmds (#455) 2021-09-21 14:14:14 -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
shotgunofdeath be726649de Merge branch 'instant-sale' of https://github.com/metaplex-foundation/metaplex into instant-sale 2021-09-21 15:02:25 +03:00
shotgunofdeath 57fb579a8a fix(instant sale): show item price in instant sale 2021-09-21 14:59:43 +03:00
Vadim 50dfdf1d33 Merge branch 'instant-sale' of github.com:metaplex-foundation/metaplex into instant-sale 2021-09-21 13:31:01 +03:00
shotgunofdeath 3e8720ab06 Merge branch 'master' into instant-sale
# Conflicts:
#	js/packages/common/src/contexts/meta/meta.tsx
2021-09-21 13:21:24 +03:00
shotgunofdeath 6da9c33064 fix(claimBid): move auctionExtendedKey to the end of keys list 2021-09-21 13:10:35 +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
stegaBOB b7e51b827e Reverted useless style changes 2021-09-20 19:21:22 -04:00
stegaBOB 7c064c6868 Merge branch 'master' of github.com:stegaBOB/metaplex 2021-09-20 19:15:49 -04:00
stegaBOB df6a0e130d Fixed HTMLcontent to only display on art view 2021-09-20 19:15:46 -04:00
stegaBOB 0872b0eaca Added .env to gitignore 2021-09-20 19:12:42 -04:00
stegaBOB c131b61a58
Merge branch 'metaplex-foundation:master' into master 2021-09-20 17:07:11 -04:00
Jordan Prince c94540417c
Update loadAccounts.ts 2021-09-20 15:58:27 -05:00
Jordan Prince 3532d5f11e
Speed Run Mode (#448)
* Fix

* stuff

* Fix

* stuff

* Change store ids

* Change name

* No warp speed limit

* Metaplex is really f-ing fast.

* Make it optional

* Fixes for original mode

* remove specific identifiers

* Fix more differences
2021-09-20 15:26:37 -05:00
adamjeffries 3596ab4798
Fix yarn build with unused endAuction 2021-09-20 11:49:48 -05:00
shotgunofdeath 0445dacd5a fix(notifications): add ended instant sale auctions to notifications 2021-09-20 18:43:17 +03:00
shotgunofdeath b943864d1e fix(instant sale): hide claim button for auction owner right after claiming 2021-09-20 14:12:27 +03:00
stegaBOB 981742a9ff fixed formatting 2021-09-20 00:34:43 -04:00
stegaBOB 3fdb859243
Merge branch 'metaplex-foundation:master' into master 2021-09-19 23:52:20 -04:00
stegaBOB a3a34c4c6a Fixed iframe styling 2021-09-19 23:50:49 -04:00
adamjeffries 7861b240d1
Merge branch 'master' of https://github.com/metaplex-foundation/metaplex into instant-sale 2021-09-19 15:28:15 -05:00
adamjeffries 8b80166f02
Restore getAssetCostToStore 2021-09-19 11:24:31 -05:00
adamjeffries 26bf8eef7e
Fix AuctionExtended pubkey 2021-09-19 11:20:02 -05:00
Bertrand f2dbf6f8fa
update README (#410) 2021-09-19 10:01:18 -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
Richard Fisher 1bf4c7fff5
Allow override of sol wallet address (#431)
* Allow specifying a different sol wallet address to receive mint funds

* remove debug logging
2021-09-19 09:46:04 -05:00
drbh 68bb26d64d
Fix/osx cli build issue (#433)
* remove --no-bytecode flag from osx build

* remove accidental trailing space
2021-09-19 09:44:16 -05:00
adamjeffries 58b9887b3d
Replace uploadFile2 with 4 2021-09-19 01:35:38 -05:00
stegaBOB 2e49041561
Merge branch 'metaplex-foundation:master' into master 2021-09-17 09:58:27 -04:00
shotgunofdeath 4be8f7509d fix(cache): fix cache imports 2021-09-17 14:19:24 +03:00
stegaBOB 09d323accd
Added HTML file support to the animation_url parameter (#395)
* Changed stuff

* working now

* Reset customized files

* Removed import

* Fixed formatting

* Added display flex to html style assets

Some last minute changes to make the html category style match better with the other types
2021-09-16 10:19:02 -05:00
shotgunofdeath a2ff5f9fb2 feat(meta): add update method to meta context 2021-09-16 14:50:42 +03: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
stegaBOB 473faa9242
Merge branch 'metaplex-foundation:master' into master 2021-09-15 21:42:53 -04:00
stegaBOB 78e3740c2a
Added display flex to html style assets
Some last minute changes to make the html category style match better with the other types
2021-09-15 20:31:58 -04:00
Bertrand fda50663d7
allow candy machine price update (#347) 2021-09-15 13:07:04 -05:00
exromany f3366f3ab0
Merge pull request #313 from exromany/feat/api-server-2
API-2: preparing to api
2021-09-15 12:19:45 +03:00
potato.sol b47912232e
Candy machine post sale mass signer (#365)
* candy_signer

* sign docs

* some docs

* Add a lil vid

* cleaning

* clean

* docs video and merge with refactor

* move to cache

* refactor to cache, move to commands

* Update README.md

Co-authored-by: potato <potato@sol.sol>
2021-09-14 14:56:59 -05:00
grimAgent 756f58ecd6
Command to verify candymachine price (#397) 2021-09-14 14:54:51 -05:00
Chris Heaney e9841d4bb1
cli: add support for custom spl-token mints (#388) 2021-09-13 21:26:13 -05:00
stegaBOB 43ed993bf9 Fixed formatting 2021-09-13 22:05:41 -04:00
stegaBOB b2e195b4fe Removed import 2021-09-13 22:01:56 -04:00
stegaBOB 71fc66e77a Merge branch 'master' of github.com:stegaBOB/metaplex 2021-09-13 21:56:44 -04:00
stegaBOB 9f988fcbf8 Reset customized files 2021-09-13 21:56:19 -04:00
stegaBOB 3db534e9f7
Merge branch 'metaplex-foundation:master' into master 2021-09-13 20:44:08 -04:00
stegaBOB 2f06302873 working now 2021-09-13 20:42:59 -04:00
Rad 308fb29a7d
Bugfix/number of elements fix (#389)
* number of elements fix

* number of elements fix part 2
2021-09-13 17:50:44 -05:00