Skip to content

merge latest #3

Open
aircadet69 wants to merge 170 commits into
kreation-tech:masterfrom
metaplex-foundation:master
Open

merge latest #3
aircadet69 wants to merge 170 commits into
kreation-tech:masterfrom
metaplex-foundation:master

Conversation

@aircadet69

Copy link
Copy Markdown
Collaborator

No description provided.

stegaBOB and others added 30 commits December 28, 2021 14:49
* fixed image.png not changing

* fix eslint
Currently, the `get_all_mint_addresses` command returns an empty
list. This has been noted by a few users on discord.

This PR now properly derives the candy machine v2 address
(as in
https://github.com/samuelvanderwaal/metaboss/blob/edeb9acdb63dc53278c66ffec4d0509b8304c5b7/src/snapshot.rs#L138).
* update wallet-adapter patch version to include slope

* add slope to list of wallets in context

* match version of wallet-adapter in web package to common

* update lockfile to remove duplicate dependency

Co-authored-by: Will Roeder <will@metaplex.com>
* Deprecated candy machine v1 cli

* Refactored warnings into one function and re-worded the V1 deprecation string

Co-authored-by: Will Roeder <roederw@outlook.com>

Co-authored-by: Sammy <41593264+stegaBOB@users.noreply.github.com>
* Fixed stale actions

* Update action.yml

* Update action.yml
* Added test script for CMv2

* uploadv2 cache fix

* Added command exit codes

* Initial version of test script for CMv2

* Using --env in the commands

* Adding options to test other storage types

* [run-test-v2.sh] minor typo fixes; add optional withdraw command

* fix: packs dataloading was blocked by update (#1232)

* fix: redeem flickering (#1230)

* feat: animation for redeem modal

* fix: remove validCreatorsFilter on pack creation

* feat: use npm package

* remove label

Co-authored-by: Irina <ikadushkina@techflower.io>

* feat: error message for pack redemption (#1239)

* feat: error message for pack redemption

* fix yarn build

* fix: remove profile link (#1282)

* fix: fixed redeem modal view (#1251)

Co-authored-by: Irina <ikadushkina@techflower.io>

* added .gif and .jpg to test

* feat: added refresh button on pack creation flow (#1290)

* feat: added refresh button on pack creation flow

* fix: comments fixed

Co-authored-by: Irina <ikadushkina@techflower.io>

* fix: missing metadata when loading more than 100 token accounts (#1345)

* fix: page refresh data didn't load (#1346)

* fix: transactions failing due to the limits (#1347)

* feat: update instant sale purchase congratulations modal (#1040)

* feat: added congratulation modal for instant sale purchase

* fix: comments fixed

* fix: small fixes

Co-authored-by: Irina <ikadushkina@techflower.io>

* Feat: update instant sale claim congratulations modal (#1050)

* feat: added congratulation modal for instant sale purchase

* fix: comments fixed

* fix: small fixes

* feat: added congratulation modal for instant sale claim

* fix: added two congratulations modal

Co-authored-by: Irina <ikadushkina@techflower.io>

* fix: storefront build (#1349)

* fix: loading state of My Items (#1229)

* feat: error message for pack creation (#1254)

* feat: error message for pack creation

* fix code

* Fix packages dependencies (#1353)

* Separate dependencies fair-launch and token-entangler

* Filter token-entangler from build

* remove redundant cachContent.items check (#1354)

* Added flag to specify custom rpc (#1357)

* Cover case where counter is counting down. (#1377)

* Fix minting UI (#1378)

* Fix for hijack attack of candy machine (#1366)

* candy-machine-v2-cli: Fix `get_all_mint_addresses` cmd (#1363)

Currently, the `get_all_mint_addresses` command returns an empty
list. This has been noted by a few users on discord.

This PR now properly derives the candy machine v2 address
(as in
https://github.com/samuelvanderwaal/metaboss/blob/edeb9acdb63dc53278c66ffec4d0509b8304c5b7/src/snapshot.rs#L138).

* Added test to verify that the gateway token was created after the go_live_date (#1375)

* Cover case where counter is counting down.

* Fix for civics expiry bug

Co-authored-by: Tyler Julian <APTy@users.noreply.github.com>
Co-authored-by: febo <febo@kent.ac.uk>

* fixed v2 test and added v1 test

* Deprecated candy machine v1 cli (#1384)

* Revert "Deprecated candy machine v1 cli (#1384)" (#1385)

This reverts commit 0ba14b7.

* Deprecated candy machine v1 cli (#1386)

* Deprecated candy machine v1 cli

* Refactored warnings into one function and re-worded the V1 deprecation string

Co-authored-by: Will Roeder <roederw@outlook.com>

* Fixed web dependencies  (#1358)

* Added missing dependencies

* Filter fair-launch from build

* Fixed html nfts and moved style to class

Co-authored-by: Sammy <41593264+stegaBOB@users.noreply.github.com>

* Update action.yml

* Fix upload rerun (#1382)

Co-authored-by: Samuel Vanderwaal <samuel.vanderwaal@gmail.com>

* Update action.yml

* Adds a check to not allow hidden settings to be toggled once you have set a configline out of hidden settings. (#1431)

* Skipping unsupported files, like .DS_STORE on macOS, instead of throwing an error. (#1426)

* Deprecate v1 (#1421)

* Fix for hijack attack of candy machine (#1366)

* candy-machine-v2-cli: Fix `get_all_mint_addresses` cmd (#1363)

Currently, the `get_all_mint_addresses` command returns an empty
list. This has been noted by a few users on discord.

This PR now properly derives the candy machine v2 address
(as in
https://github.com/samuelvanderwaal/metaboss/blob/edeb9acdb63dc53278c66ffec4d0509b8304c5b7/src/snapshot.rs#L138).

* Added test to verify that the gateway token was created after the go_live_date (#1375)

* Deprecated cmv1

* Update lib.rs

* Update lib.rs

* clean up deprecation; include mut -> zero fix

Co-authored-by: Jordan Prince <jordanmprince@gmail.com>
Co-authored-by: Tyler Julian <APTy@users.noreply.github.com>
Co-authored-by: febo <febo@kent.ac.uk>
Co-authored-by: Samuel Vanderwaal <samuel.vanderwaal@gmail.com>

* Changed required options to requiredOption (#1435)

* Merged master into release/v1.1.0 (#1436)

* Fix for hijack attack of candy machine (#1366)

* candy-machine-v2-cli: Fix `get_all_mint_addresses` cmd (#1363)

Currently, the `get_all_mint_addresses` command returns an empty
list. This has been noted by a few users on discord.

This PR now properly derives the candy machine v2 address
(as in
https://github.com/samuelvanderwaal/metaboss/blob/edeb9acdb63dc53278c66ffec4d0509b8304c5b7/src/snapshot.rs#L138).

* Added test to verify that the gateway token was created after the go_live_date (#1375)

* added link to sell doc (#1337)

* Add Slope wallet (#918)

* update wallet-adapter patch version to include slope

* add slope to list of wallets in context

* match version of wallet-adapter in web package to common

* update lockfile to remove duplicate dependency

Co-authored-by: Will Roeder <will@metaplex.com>

* Deprecated candy machine v1 cli (#1386) (#1398)

* Deprecated candy machine v1 cli

* Refactored warnings into one function and re-worded the V1 deprecation string

Co-authored-by: Will Roeder <roederw@outlook.com>

Co-authored-by: Sammy <41593264+stegaBOB@users.noreply.github.com>

* fixed yaml file (#1400)

* Fixed stale actions (#1410)

* Fixed stale actions

* Update action.yml

* Update action.yml

* Update action.yml (#1411)

* Deprecated cmv1 (#1420)

* Update lib.rs (#1434)

* Changed required options to requiredOption

Co-authored-by: Jordan Prince <jordanmprince@gmail.com>
Co-authored-by: Tyler Julian <APTy@users.noreply.github.com>
Co-authored-by: febo <febo@kent.ac.uk>
Co-authored-by: C0mberry <37657937+C0mberry@users.noreply.github.com>
Co-authored-by: Jordan Sexton <jordan@jordansexton.com>
Co-authored-by: Will Roeder <will@metaplex.com>
Co-authored-by: Will Roeder <roederw@outlook.com>
Co-authored-by: Austin Adams <austbot@users.noreply.github.com>

* fixing sign all v2 (#1430)

* Deprecating Fair Launch Protocol UI (#1424)

Removed Fair Launch Protocol logic from Candy Machine Mint UI and moved the package from fair-launch to candy-machine-ui

Co-authored-by: febo <fernando.otero@metaplex.com>
Co-authored-by: febo <febo@kent.ac.uk>
Co-authored-by: Samuel Vanderwaal <samuel.vanderwaal@gmail.com>
Co-authored-by: Michael <sebastiyan.michael@outlook.com>
Co-authored-by: Irina <ikadushkina@techflower.io>
Co-authored-by: ViacheslavMylostyvyi <gamer2forse@gmail.com>
Co-authored-by: Irina Kadushkina <69786983+ikadushkina@users.noreply.github.com>
Co-authored-by: Jordan Prince <jordanmprince@gmail.com>
Co-authored-by: Tyler Julian <APTy@users.noreply.github.com>
Co-authored-by: Will Roeder <roederw@outlook.com>
Co-authored-by: Dmitrii Goriunov <goriunovd@gmail.com>
Co-authored-by: Austin Adams <austbot@users.noreply.github.com>
Co-authored-by: C0mberry <37657937+C0mberry@users.noreply.github.com>
Co-authored-by: Jordan Sexton <jordan@jordansexton.com>
Co-authored-by: Will Roeder <will@metaplex.com>
Co-authored-by: Sarah Strange <strange1120@gmail.com>
* chore: deprecate rust folder + add readme with explanation

* ci: removing rust specific gh workflow and actions
Increased operations per run from 100 to 500 since we have too many issues to parse with just 100 operations at this time
* Improve error message

Without this, you get:
```
TypeError: Cannot read properties of undefined (reading '_bn')
```

* Optional Chaining

Makes sure the correct error is thrown

Co-authored-by: Sammy <41593264+stegaBOB@users.noreply.github.com>
* upgrade test script

* Merge remote-tracking branch 'upstream/master'

* fix error in script

* fixed test script
* upgrade test script

* Merge remote-tracking branch 'upstream/master'

* fix error in script

* fixed test script

* removed required keypair from commands
yusefnapora and others added 30 commits March 29, 2022 22:53
* Added manual cache creation

* Added back png_min

Co-authored-by: Sammy <41593264+stegaBOB@users.noreply.github.com>
* Use generators in standard way

- for..of iterate over generator instead of manual loop

* Use AsyncGenerator instead of Generator<Promise<..>>

* Fund arweave-sol bundlr wallet once instead of every bundle

- precalculate the total size to upload and fund with that amount

* Fixed bundlr file size calculation

Co-authored-by: Sammy <41593264+stegaBOB@users.noreply.github.com>
Co-authored-by: Dmitrii Goriunov <goriunov@users.noreply.github.com>
* improve logging

* AWS upload log
* improve logging

* CM UI Error handling

* improve error message
* misspells

* misspells
…2052)

This should solve #2013.

Given original metadata (ie `0.json`) like:
```json
{
  "name": "name",
  "symbol": "",
  "description": "desc",
  "image": "image.png",
  "properties": {
    "files": [{ "uri": "image.png", "type": "image/png" }]
  }
}
```
this function used to produce an updated metadata with the arweave image link in the `image` property but would leave the one in `properties.files` intact:
```json
{
  "name": "name",
  "symbol": "",
  "description": "desc",
  "image": "https://arweave.net/foobarbaz?ext=png",
  "properties": {
    "files": [{ "uri": "image.png", "type": "image/png" }]
  }
}
```
but with this change it produces:
```json
{
  "name": "name",
  "symbol": "",
  "description": "desc",
  "image": "https://arweave.net/foobarbaz?ext=png",
  "properties": {
    "files": [{ "uri": "https://arweave.net/foobarbaz?ext=png", "type": "image/png" }]
  }
}
```
* improve logging

* Split up minting into multiple txns and save setup

* Update js/packages/candy-machine-ui/src/Home.tsx

* Fix variable name
Co-authored-by: Noah Gundotra <noahgundotra@noahs-mbp.mynetworksettings.com>
…2058)

* Update nft-storage.ts

Update metadata's properties.file.uri when uploading via arweave-sol (#…2052)

This should solve #2013.

* Update metadata properties.file.uri 

same error as 
Update metadata's properties.file.uri when uploading via arweave-sol (#2052)

This should solve #2013.

* Update metadata properties.file.uri 

same error as 
Update metadata's properties.file.uri when uploading via arweave-sol (#2052)

This should solve #2013.

* Update Metadata properties.file.uri

* method for set FileUri property

* Forgot to run Prettier? yes, sorry

* Update js/packages/cli/src/helpers/upload/pinata.ts

* Update pinata.ts

Co-authored-by: Sammy <41593264+stegaBOB@users.noreply.github.com>
This replaces the nft.storage uploader with one that supports "bundles"
of multiple NFTs. This greatly improves performance by avoiding rate
limits and requiring fewer signatures to authorize uploads.

See nftstorage/metaplex-auth#39 for context.

The existing `batchSize` config param is used to determine how many NFTs
to include in each bundle, with a default of 50 if no `batchSize` is
set, and a maximum of NFTBundle.MAX_ENTRIES (currently 2200).

This PR also adds an `nftStorageGateway` config option that can override
the default HTTP gateway host of `https://nftstorage.link` used in
metadata links, in case the creator has a preferred gateway.

Finally, the `files` array of the final metadata now contains two
entries for each asset file. The first entry, with `cdn = true` is an HTTP
gateway link, while the second, with `cdn = false` is an `ipfs://` URI
that can be used to locate the data using any IPFS peer or gateway. This
should add a bit of resiliency in case the primary gateway should go
down, although that will require clients that know to look for the
alternative `ipfs://` URIs.
* improve logging

* prevent bad txns

* prevent bad txns and update UI often
* Add new subcommand that returns deocded private key

* allow use of encoded priv key instead of passing filename that contains decoded priv key

* change create-key-array to decode_private_key

* make Private lowercase
* improve logging

* reduce txn size by removing unneccesary keypairs
- Previously if the name was wrong it would default to devnet.
- With this change it will use the default if nothing is specified,
  but if something is specified and not found it will throw an
  error.

Testing
- Ran it and observed passing behavior with default specified, a
  valid env specified, and observed the error thrown with an invalid
  env specified.

Co-authored-by: Michael Danenberg <danenbm@users.noreply.github.com>
…#2105)

* Apply asset manifest symbol validation when reading file and allow empty string symbol

* Throw TypeError instead of Error

* Fix lint error

* Default asset manifest symbol to empty string if not defined
…2135)

* Update candy-machine-v2-cli.ts

Fixing common existing issue by throwing error on incorrect env flag during call to `upload`.

Issue on display here: https://solscan.io/account/6FKvsq4ydWFci6nGq9ckbjYMtnmaqAoatz5c9XWjiDuS#solTransfers

* Fix lint

Co-authored-by: Sammy <41593264+stegaBOB@users.noreply.github.com>
* feat: bump @civic/solana-gateway-react to 0.7.0

* chore: yarn install

* fix: GatewayProvider set clusterUrl=rpcUrl

Co-authored-by: Kevin Colgan <kevin@civic.com>
* set and verify collection command

* set and verify collection all command for a hashlist

* Required options

Co-authored-by: Rodrigo Rivera <rrivem@gmail.com>
Co-authored-by: Sammy <41593264+stegaBOB@users.noreply.github.com>
* fix civicpass

* add env validation catch

* linting
* fix

* remove console.logs

* shift

* jest

* fix presale

* fix endDate

* fix

* revert to base package.json

* fix

* fix

* fix

* fix

* fix
* replace with directory

* update readme

* update readme

* update readme

* update readme

* update and add alt

* update

* remove alt

* add descriptions and improve formatting

* improve wording

* typos

* update links

* Update README.md
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.