Commit Graph

369 Commits

Author SHA1 Message Date
stegaBOB a3a34c4c6a Fixed iframe styling 2021-09-19 23:50:49 -04:00
Jordan Prince 1f141454b6 End to end working and fix minting for spl in candy machine 2021-09-19 21:37:59 -05:00
Jordan Prince bd84e7fec5 Added confetti and merged updates 2021-09-19 18:33:26 -05:00
Jordan Prince faee844f92 Merge branch 'master' of github.com:metaplex-foundation/metaplex into f 2021-09-19 17:46:06 -05:00
Jordan Prince 74c09dbd48 more and less. 2021-09-19 16:22:08 -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
Jordan Prince 150a31a278 Midway stopping point...nothing is working. 2021-09-19 14:29:29 -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
bartosz-lipinski 2f5205dcc5 feat: style 2021-09-19 01:01:06 -05:00
bartosz-lipinski 24d532788d Merge branch 'f' of https://github.com/metaplex-foundation/metaplex into f 2021-09-18 09:34:48 -05:00
Jordan Prince 970ea6806f Working on recoding so that we can use spl tokens 2021-09-17 19:43:02 -05:00
bartosz-lipinski ea7cc3dd3b Merge branch 'f' of https://github.com/metaplex-foundation/metaplex into f 2021-09-17 17:02:06 -05:00
bartosz-lipinski f855561e74 feat: home 2021-09-17 17:01:59 -05:00
Jordan Prince 1c6c46400e Fix for when median is not divisible by tick 2021-09-17 16:28:57 -05:00
Jordan Prince dc167a92bb Bid adjustment 2021-09-17 11:54:44 -05:00
bartosz-lipinski 9db8fc2430 feat: countdown 2021-09-17 09:28:56 -05:00
shotgunofdeath 4be8f7509d fix(cache): fix cache imports 2021-09-17 14:19:24 +03:00
bartosz-lipinski 3b1eae0fde feat: style 2021-09-17 00:48:59 -05:00
Jordan Prince 533db43716 More display logic for fair launch 2021-09-16 21:10:35 -05:00
Jordan Prince 7cef1edd5d Come limited punching support 2021-09-16 19:32:10 -05:00
bartosz-lipinski 2769079e09 Merge branch 'f' of https://github.com/metaplex-foundation/metaplex into f 2021-09-16 19:17:02 -05:00
bartosz-lipinski c7e2b98c81 feat: home 2021-09-16 19:16:32 -05:00
Jordan Prince d8d9ab6771 wip on fair launch new fields 2021-09-16 17:49:23 -05:00
bartosz-lipinski 3079e62283 Merge branch 'f' of https://github.com/metaplex-foundation/metaplex into f 2021-09-16 16:07:11 -05:00
bartosz-lipinski 8e4dbb0123 feat: style 2021-09-16 16:07:08 -05:00
Jordan Prince b30ed8092c Hook up your bid 2021-09-16 15:31:47 -05:00
Jordan Prince a42144e45b trasury numbers 2021-09-16 15:30:12 -05:00
bartosz-lipinski 7a12af6eac Merge branch 'f' of https://github.com/metaplex-foundation/metaplex into f 2021-09-16 15:12:33 -05:00
bartosz-lipinski a10bda421b feat: layout 2021-09-16 15:02:24 -05:00
Jordan Prince 1452773343 Bid adjustment works in UI 2021-09-16 13:43:05 -05:00
Jordan Prince 322a5b0f02 Some fixes to the adjust ticket 2021-09-16 13:37:12 -05:00
Jordan Prince 6f1a5dd206 pushing 2021-09-16 13:26:09 -05:00
Jordan Prince 2329e520b6 Still investigating why newly made accounts have delegates 2021-09-16 11:33:56 -05: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
bartosz-lipinski aa112443dc feat: fair launch UI 2021-09-16 07:30:50 -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
bartosz-lipinski 15ccd805ab feat: purchaseTicket 2021-09-15 12:47:07 -05:00
bartosz-lipinski 6150ebf1aa feat: basic page 2021-09-15 12:19:25 -05:00
Jordan Prince 2e4830b40d Moref ixes 2021-09-15 08:24:54 -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
Jordan Prince 52fec3c4ca Some more fixes 2021-09-14 14:32:29 -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
Jordan Prince f3020bc926 Mostly working now 2021-09-13 18:31:18 -05: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
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 ccc51ffc84 things beginning to work 2021-09-12 21:05:10 -05:00
Jordan Prince 51b38c92cd Merge branch 'f' of github.com:metaplex-foundation/metaplex into f 2021-09-12 19:29:27 -05:00
Jordan Prince 6149685f27 Got my money back first time end to end b*tches 2021-09-12 19:29:11 -05:00
bartosz-lipinski c473315062 Merge branch 'f' of https://github.com/metaplex-foundation/metaplex into f 2021-09-12 18:06:28 -05:00
bartosz-lipinski 88c41e1361 feat: init commit for website 2021-09-12 18:06:21 -05:00
Jordan Prince 34ad88f514 Anti rug commit - before testing. 2021-09-12 14:44:41 -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
Jordan Prince d8e096e3af Think punching is working. Time for sleep. 2021-09-12 01:41:58 -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
Alice a2c2c7eb7e remove eth package 2021-09-12 02:06:59 +02: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
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