Commit Graph

529 Commits

Author SHA1 Message Date
bartosz-lipinski 8f5e41e06a Merge remote-tracking branch 'r/metaplex-land' into feature/m 2021-04-28 19:18:17 -05:00
bartosz-lipinski 35e284fa9b fix: bids 2021-04-28 19:15:45 -05:00
rmshea 3cc2ce70a3 Fix fonts, add new Typeform 2021-04-28 19:13:31 -04:00
bartosz-lipinski 45ce75fc1b Merge remote-tracking branch 'origin/main' into feature/m 2021-04-28 17:31:01 -05:00
Tim Hagn 4aa29029aa
Add DOCTYPE & test vercel (#92)
* add doctype

* add charset

* rename landing.html to index.html
2021-04-28 17:30:23 -05:00
Jose 8bec1e0746
Metaplex: fixes (#94)
* artselector for tiered auction

* useArt id

* modal size, scroll body

* format go live ts

* fix progress circle

* hide steps when publishing
2021-04-28 17:06:48 -05:00
bartosz-lipinski 3169f97e01 feat: fix commitment 2021-04-28 17:05:50 -05:00
bartosz-lipinski a6107cc2df Merge remote-tracking branch 'origin/feature/m-jordan' into feature/m 2021-04-28 16:39:35 -05:00
bartosz-lipinski ccf8a790b9 feat: add mint 2021-04-28 16:39:29 -05:00
bartosz-lipinski 54af77bb6d feat: bids 2021-04-28 15:09:22 -05:00
Jordan Prince e00f4bd33b Fixed for multi auctions 2021-04-28 14:23:18 -05:00
Jordan Prince 676c7c7440 Limited editions 2021-04-28 12:40:32 -05:00
Jordan Prince 3f209d9baa Fix states 2021-04-28 11:40:20 -05:00
Jordan Prince b026cd1088 Merge branch 'feature/m' into feature/m-jordan 2021-04-28 11:24:26 -05:00
Jordan Prince 6016185052 Reset times 2021-04-28 11:23:45 -05:00
bartosz-lipinski e79c5a66ed chore: cleanup 2021-04-27 22:31:17 -05:00
bartosz-lipinski 3891bdcc47 Merge remote-tracking branch 'origin/main' into feature/m 2021-04-27 22:30:30 -05:00
bartosz-lipinski ada2fc035b Merge remote-tracking branch 'origin/feature/m-jordan' into feature/m 2021-04-27 22:22:52 -05:00
Jordan Prince c5d2a98404 Selling master editions work 2021-04-27 22:14:58 -05:00
bartosz-lipinski 84ee5f8c8f feat: max width 2021-04-27 21:34:42 -05:00
bartosz-lipinski 3e2ec40dd6 feat: icon 2021-04-27 19:55:09 -05:00
bartosz-lipinski 5b83fa9333 feat: add bidder info 2021-04-27 19:52:57 -05:00
Jose 4248648f76
Metaplex: winners range, datetime fields (#91)
* winners range

* store datetime fields on attributes

* initial landing page

* responsiveness with bootstrap
2021-04-27 17:32:53 -05:00
bartosz-lipinski fa203e280e Merge remote-tracking branch 'origin/feature/m-jordan' into feature/m 2021-04-27 16:42:05 -05:00
bartosz-lipinski a04f607fa5 feat: add bids 2021-04-27 16:25:36 -05:00
Jordan Prince 09885f6a2f Bid redemption 2021-04-27 15:33:20 -05:00
Jordan Prince 0be625108f Ok, lot of rough draft work getting redemption action ready to go. Need to sleep now, test it in the morning. 2021-04-27 02:25:10 -05:00
Jordan Prince bb952ced4e Resolve conflicts and remove print stmts 2021-04-26 23:57:18 -05:00
Jordan Prince 4bb72e82e1 Merge branch 'feature/m' into feature/m-jordan 2021-04-26 23:55:24 -05:00
Jordan Prince ce33240b85 Latest fixes to bidder metadata 2021-04-26 23:54:36 -05:00
bartosz-lipinski 6d4c03809b Merge remote-tracking branch 'origin/feature/m-jordan' into feature/m 2021-04-26 23:19:59 -05:00
bartosz-lipinski a43cdebae6 feat: art selector 2021-04-26 23:19:53 -05:00
Jordan Prince 59c1fc5c54 Fix a nasty borsh issue by re-arranging auction data 2021-04-26 23:00:25 -05:00
bartosz-lipinski 5dfc8d6f7f Merge remote-tracking branch 'origin/feature/m-jordan' into feature/m 2021-04-26 22:09:52 -05:00
Jordan Prince 4d83cddf45 Fix for my nft messup 2021-04-26 22:09:27 -05:00
bartosz-lipinski 15a6a41443 fix: tabs layout 2021-04-26 21:54:35 -05:00
bartosz-lipinski bb3f9fd192 Merge remote-tracking branch 'origin/feature/m-jordan' into feature/m 2021-04-26 21:48:02 -05:00
Jordan Prince 7ab009e0e6 I can bid 2021-04-26 21:46:30 -05:00
bartosz-lipinski bd9251ee9d Merge remote-tracking branch 'origin/feature/m-jordan' into feature/m 2021-04-26 18:50:29 -05:00
Jordan Prince b46406d61b Another fix for balance 2021-04-26 18:50:15 -05:00
bartosz-lipinski 3614cc4db8 Merge remote-tracking branch 'origin/feature/m-jordan' into feature/m 2021-04-26 18:48:53 -05:00
Jordan Prince e1984d5945 Some fixes for hooks 2021-04-26 18:48:08 -05:00
bartosz-lipinski 878e471c05 Merge remote-tracking branch 'origin/feature/m-jordan' into feature/m 2021-04-26 17:06:12 -05:00
bartosz-lipinski 127eeb03cf fix: art selector 2021-04-26 17:05:45 -05:00
Jordan Prince a46537221a Index and show pages for auctions 2021-04-26 16:59:16 -05:00
bartosz-lipinski f8c5458d48 Merge remote-tracking branch 'origin/feature/m-jordan' into feature/m 2021-04-26 13:26:34 -05:00
Jordan Prince 2f036f7009 Can create auction managers 2021-04-26 13:18:27 -05:00
bartosz-lipinski cc2d58a264 Merge remote-tracking branch 'origin/feature/m-jordan' into feature/m 2021-04-26 08:55:10 -05:00
Jordan Prince 4c89a1667c Pushing what i've got 2021-04-26 03:07:46 -05:00
bartosz-lipinski b89a841a52 fix: await confirmation 2021-04-26 00:42:29 -05:00
Jordan Prince b56d3991a9 Merge branch 'feature/m' into feature/m-jordan 2021-04-25 23:53:07 -05:00
Jordan Prince e658d81eed Some more changes 2021-04-25 23:52:31 -05:00
bartosz-lipinski bda3428d7a fix: onProgramAccountChange 2021-04-25 23:50:58 -05:00
bartosz-lipinski e1d27c0a52 fix: build error 2021-04-25 23:36:05 -05:00
Jordan Prince 38c1d6666d Merge branch 'feature/m' into feature/m-jordan 2021-04-25 23:13:55 -05:00
bartosz-lipinski f0cbbc2461 fix: undefined 2021-04-25 23:11:03 -05:00
Jordan Prince 2e8b39f3dd Merge branch 'feature/m' into feature/m-jordan 2021-04-25 23:05:02 -05:00
Jordan Prince 5575cd9bcf I think im ready to start testing 2021-04-25 23:04:13 -05:00
bartosz-lipinski 5fe9a9fe67 Merge remote-tracking branch 'origin/feature/m-jordan' into feature/m 2021-04-25 22:25:35 -05:00
Jordan Prince 769c6cf3e6 Some fixes 2021-04-25 22:21:34 -05:00
bartosz-lipinski 6dea5fba89 Merge remote-tracking branch 'origin/feature/m-jordan' into feature/m 2021-04-25 22:16:09 -05:00
Jordan Prince 577cfb3ff1 Partway through refactor 2021-04-25 22:15:25 -05:00
bartosz-lipinski c5e206cadc Merge branch 'feature/m' of https://github.com/solana-labs/oyster into feature/m 2021-04-25 21:59:24 -05:00
bartosz-lipinski 03296813a4 chore: cleanup 2021-04-25 21:58:41 -05:00
bartosz-lipinski d8d0add561 feat: auction 2021-04-25 21:49:13 -05:00
bartosz-lipinski 2a8a65feb0 feat: auction 2021-04-25 21:47:33 -05:00
Jordan Prince 3807f564c3 Massive WIP on useArt, adding safety deposit draft eveyrwhere 2021-04-25 21:38:22 -05:00
Jordan Prince 03a4cab50b Forgot a few steps to truly create an auction manager 2021-04-25 20:02:29 -05:00
Jordan Prince 5355fa8248 Got create auction manager superfunction created 2021-04-25 19:26:28 -05:00
bartosz-lipinski edc1339d84 feat: upgrade solana/web3 2021-04-25 15:42:45 -05:00
Jordan Prince 5ca8d47557 Finally built all the actions for metaplex, time to start connections 2021-04-25 14:43:26 -05:00
bartosz-lipinski 315717468c feat: update vector 2021-04-24 22:51:34 -05:00
bartosz-lipinski 06c0d0f419 feat: create metadata 2021-04-24 22:44:48 -05:00
Jordan Prince 20ada274ed Begin working on metaplex 2021-04-24 21:23:11 -05:00
Jordan Prince 41b7393d00 Finish auction actions out 2021-04-24 19:41:02 -05:00
Jordan Prince 87bb0870c6 Intermediate commit, working through auction manager super create 2021-04-24 13:21:35 -05:00
Sebastian.Bor 3b5e84b8b7 chore: rename proposals to governance 2021-04-24 13:46:36 +01:00
Sebastian.Bor eb786f2fc3 chore: rename program ids to governance 2021-04-24 13:34:41 +01:00
Sebastian.Bor 43e2c9060c chore: rename timelock props to governance 2021-04-24 13:29:08 +01:00
Sebastian.Bor 10ae7359da chore: disable render tracking 2021-04-24 13:24:47 +01:00
Sebastian.Bor 6394bf7a88 chore: rename timelockType 2021-04-24 13:24:28 +01:00
Sebastian.Bor 4f9798abd9 chore: update governance ids 2021-04-24 13:07:21 +01:00
Sebastian.Bor 598af20deb chore: rename params to Governance 2021-04-24 13:06:55 +01:00
Sebastian.Bor 05992a5ea7 chore: rename instructions and actions to Governance 2021-04-24 12:57:30 +01:00
Sebastian.Bor 5c994fe9c5 chore: rename instructions to Governance 2021-04-24 12:19:10 +01:00
Sebastian.Bor c19e7fe219 chore: rename state structs to Governance 2021-04-24 12:12:44 +01:00
Sebastian.Bor 9464d80d2c fix: show instruction program id and data 2021-04-24 11:09:23 +01:00
Sebastian.Bor 4082949802 chore: suppress lint warnings 2021-04-24 09:21:05 +01:00
Jordan Prince 85be78d001 Finish up metadata and vault actions. 2021-04-23 20:56:09 -05:00
Sebastian.Bor 50326a2298 chore: fix lint issues 2021-04-23 23:21:49 +01:00
Sebastian.Bor 61f4be3cbd chore: lint errors 2021-04-23 23:06:56 +01:00
Sebastian.Bor 90546db0e5 fix: use button for execute action 2021-04-23 23:06:28 +01:00
Jordan Prince b8c937c276 Merge branch 'feature/m' into feature/m-jordan 2021-04-23 14:57:44 -05:00
Jordan Prince 7c6da155c4 merge: 2021-04-23 14:54:48 -05:00
bartosz-lipinski 8df8be1d1d feat: metaplex 2021-04-23 14:54:09 -05:00
bartosz-lipinski 6183122b6a Merge branch 'feature/m' of https://github.com/solana-labs/oyster into feature/m 2021-04-23 14:53:31 -05:00
Jordan Prince 3516bca0dd Some fixes for connection and master edition 2021-04-23 14:39:19 -05:00
bartosz-lipinski 113d17ca04 feat: metaplex 2021-04-23 10:44:52 -05:00
Sebastian.Bor 0d0f8c8763 feat: use only program id for governance pda 2021-04-23 11:17:46 +01:00
bartosz-lipinski ccea274bfd feat: borsh 2021-04-22 23:56:16 -05:00
bartosz-lipinski 25559d5733 feat: add retry 2021-04-22 23:28:08 -05:00
bartosz-lipinski f45c08e773 feat: update style 2021-04-22 20:57:54 -05:00
bartosz-lipinski f87a59750f Merge branch 'feature/m' of https://github.com/solana-labs/oyster into feature/m 2021-04-22 19:54:16 -05:00
bartosz-lipinski 7b4a17006f feat: borsh 2021-04-22 19:53:50 -05:00
bartosz-lipinski cc1e58e4a1 Merge remote-tracking branch 'origin/main' into feature/m 2021-04-22 19:53:18 -05:00
Jose 6025dd9b98
Metaplex: Tiers step (#86)
* torus context

* bye torus as context

* torus mess

* price step

* initial phase

* end phase

* review step

* sale type and prices

* ending phase split

* unmix auction/sale wording

* tiers step
2021-04-22 19:52:54 -05:00
Juan Diego García 2fddc4d024
Working sol -> eth wormhole (#87)
* Workin sol -> eth wormhole

* remove console

* fixed selecting same chains and showing same balances
2021-04-22 19:52:18 -05:00
Sebastian.Bor 690ebd85c4 chore: fix lint warnings 2021-04-22 22:27:22 +01:00
Sebastian.Bor 3eba1d580a fix: update lookup offset for proposal 2021-04-22 22:00:10 +01:00
Sebastian.Bor c8a7c726f0 chore: fix linter warnings 2021-04-22 21:59:41 +01:00
Jordan Prince 9d30c4b12e
Merge pull request #84 from SebastianBor/feat/check-upgrade-authority-when-governance-created
Governance: Pass program data account and upgrade authority accounts
2021-04-22 15:37:40 -05:00
Jose 7c5e1d8079
Auction creation flow (#83)
* torus context

* bye torus as context

* torus mess

* price step

* initial phase

* end phase

* review step

* sale type and prices

* ending phase split

* unmix auction/sale wording
2021-04-22 15:02:31 -05:00
Sebastian.Bor 358d80ed03 feat: pass program data account and upgrade authority accounts 2021-04-22 11:10:22 +01:00
bartosz-lipinski edcbf78659 feat: open 2021-04-22 01:20:15 -05:00
bartosz-lipinski 0fcbf48718 feat: add art selector 2021-04-22 00:53:24 -05:00
bartosz-lipinski a58a3baf39 fix: spelling mistake 2021-04-21 21:54:10 -05:00
bartosz-lipinski e316021029 Merge branch 'feature/m' into main 2021-04-21 18:45:27 -05:00
bartosz-lipinski 96dc5e08cc feat: torus 2021-04-21 18:44:18 -05:00
Jose 2b6a4b5016
Auction creation steps (#82)
* torus context

* bye torus as context

* torus mess

* price step

* initial phase

* end phase

* review step
2021-04-21 18:41:03 -05:00
bartosz-lipinski 4c6c1ad934 feat: torus 2021-04-21 18:29:20 -05:00
Jose b7c3cc6366
Torus mess (#80)
* torus context

* bye torus as context

* torus mess
2021-04-21 09:47:44 -05:00
bartosz-lipinski 7dda1281a3 feat: auction creat 2021-04-21 09:37:10 -05:00
bartosz-lipinski 016e330f35 fix: build issue 2021-04-19 23:14:48 -05:00
bartosz-lipinski de111c66ca feat: update auction flow 2021-04-19 22:39:44 -05:00
Juan Diego García 5aaa4b4d74
fixed logo on firefox (#79) 2021-04-19 21:55:16 -05:00
bartosz-lipinski 24bbabb09c feat: add metaplex state 2021-04-17 21:51:35 -05:00
bartosz-lipinski 894a13af66 chore: style 2021-04-17 20:33:22 -05:00
Sebastian.Bor bbc56843dc feat/use vote threshold instead of consensus algorithm 2021-04-17 19:45:03 +01:00
Sebastian.Bor 86a6e62b2a fix: add missing CustomSingleSignerTransaction account type 2021-04-17 13:13:05 +01:00
Sebastian.Bor 7523c142f6 chore: use account type enum for CustomSingleSignerTransaction 2021-04-17 13:02:56 +01:00
Sebastian.Bor ed72e20ef8 chore: use account type enum for VoreRecord 2021-04-17 12:33:00 +01:00
Sebastian.Bor 57b389007b chore: use account type enum for ProposalState 2021-04-17 12:20:04 +01:00
Sebastian.Bor 065700babf chore: use account type enum for TimelockSet 2021-04-17 12:03:49 +01:00
Sebastian.Bor cb3bb03ba4 chore: remove Ping instruction and add GovernanceAccountType 2021-04-17 11:37:22 +01:00
Sebastian.Bor adb5d81a09 fix/ensure-transactions-sent-in-sequence 2021-04-17 10:59:56 +01:00
bartosz-lipinski 37656808e0 Merge branch 'main' into feature/m 2021-04-16 23:37:26 -05:00
bartosz-lipinski afef130246 fix: remove dummy text 2021-04-16 23:13:09 -05:00
bartosz-lipinski 523f01a719 feat: create auction 2021-04-16 22:57:29 -05:00
Jose 825aca40ef
Metaplex: Royalty sliders movement (#73)
* MainAuctionCard

* trending auctions

* fix scroll, reduce padding

* fixing errors/warnings and formatting

* formatting & sold auctions

* artists cards

* initial presale banner. move sample data to own file

* new home layout

* presale banner image fix

* countdown implementation

* initial artwork implementation

* getCountdown

* presale card

* fix presale banner image

* fix width. show preview. load only 1 file

* remove preview/keep filename. url id for steps

* slider > input number

* upload step for every category

* fix file handling

* hashrouter

* waiting view

* congrats buttons

* conffeti 🎉

* randomize conffeti rotation and size

* usd conversion

* initial royalties splitter

* sliders movement

* sliders movement

* prevent single creator error. shuffle array for impartial movement

Co-authored-by: B <264380+bartosz-lipinski@users.noreply.github.com>
2021-04-16 15:22:58 -05:00
Juan Diego García 09913bac90
fixed css conflict errors with previuos builds (#74) 2021-04-16 15:16:30 -05:00
Jordan Prince 73fd0aac7e
Merge pull request #71 from SebastianBor/fix/transfer-authority-signers
Governance: Fix transfer authority signers
2021-04-16 13:04:36 -05:00
Jordan Prince 1748f99e7e
Merge pull request #72 from SebastianBor/fix/use-prefixes-for-PDAs-to-avoid-collision-attacks
Fix: Use prefixes for PDAs to avoid collision attacks
2021-04-16 10:45:02 -05:00
Sebastian.Bor dd09bb1de9 fix: use single pda prefix 2021-04-16 16:26:27 +01:00
Sebastian.Bor 7795efd1a1 chore: fix naming convention 2021-04-16 15:59:21 +01:00
Sebastian.Bor 66271c0c1d fix: use prefixes for PDAs to avoid collision attacks 2021-04-16 15:24:44 +01:00
Sebastian.Bor e6c4ebd32c fix: transfer authority signers 2021-04-16 10:45:39 +01:00
Sebastian.Bor c33bf0e11e fix: use optional for council mint 2021-04-16 10:27:37 +01:00
bartosz-lipinski 5d1f45c79c fix: build error 2021-04-15 23:52:56 -05:00
bartosz-lipinski 94e0d0f569 fix: build issue 2021-04-15 22:49:21 -05:00
bartosz-lipinski 44b5fa403d Merge branch 'main' into feature/m 2021-04-15 21:17:10 -05:00