Commit Graph

331 Commits

Author SHA1 Message Date
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
shotgunofdeath 57fb579a8a fix(instant sale): show item price in instant sale 2021-09-21 14:59:43 +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
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 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
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
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
shotgunofdeath b5edccef1b fix(contract ids): return original contract ids 2021-09-13 14:22:19 +03:00
shotgunofdeath 6226ade91d feat(instant sale): allow auction owner place bid on mater nft with no copies 2021-09-13 14:19:33 +03:00
stegaBOB 0e49fa7fe8 Changed stuff 2021-09-13 00:59:36 -04: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
B ac56799220
Merge pull request #369 from 21e8/remove-eth-use-wallet
remove `use-wallet` eth package
2021-09-12 13:17:10 -05:00
shotgunofdeath 4c5f1e7642 feat(instant sale): add the instant sale with copies flow 2021-09-12 20:17:45 +03:00
Alice a2c2c7eb7e remove eth package 2021-09-12 02:06:59 +02:00
shotgunofdeath 5c338a156e fix(auctionsList): fix instant sale auctions filtering 2021-09-10 00:04:32 +03:00
Maxim Gordienko 9d8ba6d236 fix auction view exception 2021-09-09 18:23:59 +03:00
Maxim Gordienko c226677fc6 Merge branch 'master' into instant-sale 2021-09-09 16:31:15 +03:00
Maxim Gordienko b14ece2ad9 change auction view for instant sale 2021-09-09 16:30:33 +03:00
Maxim Gordienko cb507827df hide Create copies of a Master Edition NFT block on instant sale creation 2021-09-09 15:16:50 +03:00
Maxim Gordienko 4e5bd1611e fix ended auction list on home page 2021-09-09 15:04:36 +03:00
Maxim Gordienko 4fb7d50fe5 fix auction list, winnerIndex 2021-09-08 13:48:38 +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
exromany 06a10a4025 fix: after update master 2021-09-07 11:31:23 +03:00
exromany 921abd3890 [meta] keep all creators 2021-09-07 11:26:41 +03:00
exromany 5dadcd9ee7 useLocalStorage hook 2021-09-07 11:26:10 +03:00
exromany 65b885c9dd split contexts/accounts 2021-09-07 11:22:32 +03:00
exromany 9e353e9243 move contexts/meta to common pkg 2021-09-07 11:10:30 +03:00
exromany 48de59e916 move models/metaplex to common pkg 2021-09-07 11:09:57 +03:00
Bertrand 929a5e2697
allow float price (#321) 2021-09-06 20:52:27 -05:00
B e529eee3d5
Add env option to bundler (#320)
* feature: add env to cli

* fix: format
2021-09-06 11:25:41 -05:00
Efremov Alexey c0bba430b8 update 2021-09-06 13:34:03 +03:00
Efremov Alexey 908ece91b6 Add: github action for linting 2021-09-06 13:22:38 +03:00
Efremov Alexey f27ffb39a7 Fix: eslint configuration + fix and reformat existing code + eslint as step for lint-staged
I
2021-09-06 13:22:36 +03:00
Jordan Prince 40cfa29511
A few candy machine fixes - to uploader and program (#304) 2021-09-04 15:32:45 -05:00
Jordan Prince 0ba4954762
Wallet adapter fix (#292)
* minor fix to type declaration

* Some more typescript fixes
2021-09-03 19:37:05 -05:00
Jordan Prince 2bcd97ac04
minor fix to type declaration (#291) 2021-09-03 19:20:06 -05:00
Jordan Prince 14401e878d
feat: mint editions into wallet (#289)
feat(ArtMinting): add mint destination address validation

feat(ArtMinting): add cofetti

feat(ArtMinting): add remounting logic

chore(mint editions): upodate types

chore(art minting): update imports

Co-authored-by: shotgunofdeath <42133844+shotgunofdeath@users.noreply.github.com>
2021-09-03 18:58:43 -05:00
Maxim Gordienko d9d87407ee implement update auctionview without refresh, fix claimBid instruction 2021-09-03 18:41:11 +03:00
adamjeffries 3c7a9d2ae3
AuctionCard terminology for instant sale 2021-09-02 21:40:14 -05:00
adamjeffries 6a43da6fd7
Import missing function 2021-09-02 21:37:58 -05:00
adamjeffries 0731e45c23
Auction Create remove duration from Instant Sale 2021-09-02 15:14:55 -05:00
Koenrad MacBride 617d197e84
Fix/candy machine cli (#280)
* fix: stringify tx object

* add: log the CM publicKey

* mod: mine_one_token ty Dad!

* remove: built js file (i m smurt)
2021-09-02 11:18:13 -05:00
Jordan Prince f98142b182
Update .env 2021-09-01 18:02:50 -05:00
nftintern e2acaae9f2
correction: tx -> tx['txid']; also remove duplicate @solana/web3.js package that was causing name collision (#270) 2021-09-01 12:26:34 -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
adamjeffries 1a9c200082
Accept SVG image upload 2021-08-31 15:01:34 -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 5949de6fd4
AuctionCard Instant Sale first pass 2021-08-30 13:39:47 -05:00
adamjeffries 743fcf55d0
Instant Sale Auction Create 2021-08-30 13:31:10 -05:00
adamjeffries 746a082efd
useAuction add extended data 2021-08-30 13:26:25 -05:00
adamjeffries 7f77823543
Update Bid vs Price labels 2021-08-30 13:23:40 -05:00
adamjeffries 705d311bd9
Send place bid accept BNs 2021-08-30 13:22:03 -05:00
adamjeffries babe5bfa6d Merge branch 'master' of https://github.com/metaplex-foundation/metaplex into instant-sale 2021-08-26 14:47:04 -05:00
Jordan Sexton 4808690afc Merge branch 'master' into wallet-fixes 2021-08-25 18:17:25 -05:00
Jordan Sexton 0e45b68142 wallet fixes 2021-08-25 18:12:12 -05:00
bartosz-lipinski 1e92387686 fix: build errors 2021-08-25 18:05:21 -05:00
adamjeffries f684a0490c
Instant Sale Create Flow 2021-08-25 15:43:05 -05:00
Jordan Sexton c6228fea45 Merge branch 'master' into wallet-adapter-merge 2021-08-25 13:53:13 -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
Pierre 71f674af4b
Add attributes when creating NFT and display (#219)
* attempt to set attributes

* add support for attributes, creation, auction, art view

* validate on Continue to royalties, support for number value, trait_type is optional

* update antd no effect, remove label wrapping which breaks form

Co-authored-by: Arrowana <8245419+Arrowana@users.noreply.github.com>
2021-08-24 11:05:36 -05:00
Jordan Prince 2b5ed5feae
Fix notification color (#234) 2021-08-24 11:05:21 -05:00
Pierre 194a82f35e
Model viewer (#220)
* change mesh viewer to model-viewer

* cleanup

* remove adding antd, which was a mistake

Co-authored-by: Arrowana <8245419+Arrowana@users.noreply.github.com>
2021-08-21 22:54:57 -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 8f925f5704
Fix null bytes showing up in wwindows (#227) 2021-08-20 11:51:29 -05:00
Jordan Prince 6ad9b15a77
Fix showing master editions for stores with < 100 items and < 3 creators (#225)
* Use toPublicKey to convert string to public key to compare to public key in send cancel bid.

* Fix for stores with less than 100 items not being able to list items
2021-08-19 22:56:10 -05:00
exromany a4718e87ef
Improve init store (#213)
* chore: missed env CLIENT_ID used NEXT_PUBLIC prefix now

* chore: return missed #root

* chore: organize styles

* feat: storeProvider

* feat: STORE_ADDRESS in ENV

* feat: improve store initialization
2021-08-19 13:38:49 -05:00