Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replacing gumdrop with a README #1202

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Bug report
title: "[Bug]: "
title: '[Bug]: '
description: Report incorrect or unexpected behavior
labels: [bug]
body:
Expand All @@ -11,7 +11,6 @@ body:
- auction-house
- candy-machine
- fixed-price-sale
- gumdrop
- hydra
- nft-packs
- token-entangler
Expand All @@ -25,14 +24,14 @@ body:
- Rust Contract
- JS SDK
validations:
required: true
required: true
- type: textarea
id: description
attributes:
label: Issue description
description: |
Describe the issue in as much detail as possible.

If this is for a JS SDK, please inclide your package json and any other build systems or package manager information.

Tip: You can attach images or log files by clicking this area to highlight it and then dragging files into it.
Expand All @@ -47,15 +46,19 @@ body:
id: logs
attributes:
label: Relevant log output
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
description:
Please copy and paste any relevant log output. This will be automatically formatted into
code, so no need for backticks.
render: shell
validations:
required: false
- type: dropdown
id: priority
attributes:
label: Priority this issue should have
description: Please be realistic. If you need to elaborate on your reasoning, please use the Issue description field above.
description:
Please be realistic. If you need to elaborate on your reasoning, please use the Issue
description field above.
options:
- Low (slightly annoying)
- Medium (should be fixed soon)
Expand Down
19 changes: 12 additions & 7 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Feature request
description: Request a new feature
title: "[Feature]: "
title: '[Feature]: '
labels: [enhancement]
body:
- type: dropdown
Expand All @@ -13,7 +13,6 @@ body:
- candy-machine
- core
- fixed-price-sale
- gumdrop
- hydra
- nft-packs
- token-entangler
Expand All @@ -23,7 +22,9 @@ body:
id: description
attributes:
label: Feature
description: A clear and concise description of what the problem is, or what feature you want to be implemented.
description:
A clear and concise description of what the problem is, or what feature you want to be
implemented.
placeholder: I'm always frustrated when..., A good addition would be...
validations:
required: true
Expand All @@ -32,8 +33,8 @@ body:
attributes:
label: Standard Change?
options:
- "No"
- "Yes"
- 'No'
- 'Yes'
description: Does this feature change the Metaplex token standard in a fundamental way?
validations:
required: true
Expand All @@ -48,9 +49,13 @@ body:
id: alternatives
attributes:
label: Alternative solutions or implementations
description: A clear and concise description of any alternative solutions or features you have considered.
description:
A clear and concise description of any alternative solutions or features you have
considered.
- type: textarea
id: additional-context
attributes:
label: Other context
description: Any other context, screenshots, or file uploads that help us understand your feature request.
description:
Any other context, screenshots, or file uploads that help us understand your feature
request.
19 changes: 9 additions & 10 deletions .github/workflows/program.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Program Tests

on:
push:
branches: [ master ]
branches: [master]
pull_request:
branches: [ master ]
branches: [master]

workflow_dispatch:
inputs:
Expand All @@ -19,18 +19,17 @@ on:

jobs:
program-tests:
name: "Program: ${{ matrix.node.name }}"
name: 'Program: ${{ matrix.node.name }}'
strategy:
fail-fast: false
matrix:
node:
- name: "auctioneer"
- name: "candy-machine"
- name: "auction-house"
- name: "fixed-price-sale"
- name: "gumdrop"
- name: "hydra"
- name: "token-entangler"
- name: 'auctioneer'
- name: 'candy-machine'
- name: 'auction-house'
- name: 'fixed-price-sale'
- name: 'hydra'
- name: 'token-entangler'

uses: ./.github/workflows/program-reusable.yml
with:
Expand Down
19 changes: 8 additions & 11 deletions .github/workflows/sdk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: SDK Tests

on:
push:
branches: [ master ]
branches: [master]
pull_request:
branches: [ master ]
branches: [master]

workflow_dispatch:
inputs:
Expand All @@ -19,21 +19,18 @@ on:

jobs:
sdk-tests:
name: "SDK: ${{ matrix.node.name }}"
name: 'SDK: ${{ matrix.node.name }}'
strategy:
fail-fast: false
matrix:
node:
- name: "auction-house"
- name: "candy-machine"
- name: "fixed-price-sale"
- name: 'auction-house'
- name: 'candy-machine'
- name: 'fixed-price-sale'
skip_test: true
- name: "gumdrop"
# - name: "hydra"
# skip_test: true
- name: "nft-packs"
- name: 'nft-packs'
skip_test: true
- name: "token-entangler"
- name: 'token-entangler'

uses: ./.github/workflows/sdk-reusable.yml
with:
Expand Down
12 changes: 4 additions & 8 deletions Anchor.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ cluster = "localnet"
wallet = "~/.config/solana/id.json"

[programs.localnet]
auction_house="hausS13jsjafwWwGqZTUQRmWyvyxn9EQpqMwV1PBBmk"
bubblegum="BGUMAp9Gq7iTEuizy4pqaxsTyUCBK68MDfK752saRPUY"
auction_house = "hausS13jsjafwWwGqZTUQRmWyvyxn9EQpqMwV1PBBmk"
bubblegum = "BGUMAp9Gq7iTEuizy4pqaxsTyUCBK68MDfK752saRPUY"

[[test.genesis]]
address = "metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s"
Expand All @@ -28,19 +28,15 @@ program = "target/deploy/mpl_token_entangler.so"
address = "SaLeTjyUa5wXHnGuewUSyJ5JWZaHwz3TxqUntCE9czo"
program = "target/deploy/mpl_fixed_price_sale.so"

[[test.genesis]]
address = "gdrpGjVffourzkdDRrQmySw4aTHr8a3xmQzzxSwFD1a"
program = "target/deploy/mpl_gumdrop.so"

[[test.genesis]]
address = "hyDQ4Nz1eYyegS6JfenyKwKzYxRsCWCriYSAjtzP4Vg"
program = "target/deploy/mpl_hydra.so"

[workspace]
members = [
"token-entangler/program",
"auction-house/program",
"bubblegum/program",
"fixed-price-sale/program",
"hydra/program",
"bubblegum/program",
"token-entangler/program",
]
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ function exists_in_list() {

input=$1

programs="auction-house auctioneer candy-machine fixed-price-sale gumdrop hydra token-entangler"
programs="auction-house auctioneer candy-machine fixed-price-sale hydra token-entangler"

mkdir -p test-programs

Expand Down
9 changes: 9 additions & 0 deletions gumdrop/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Metaplex Gumdrop

The Gumdrop program is now part of a separate `mpl-gumdrop` repository which contains all programs and clients related to Gumdrop.

Here are some useful links for you to find what you came here for:

- Repository: [📂 MPL Gumdrop](https://github.com/metaplex-foundation/mpl-gumdrop)
- Program documentation: [📄 Readme](https://github.com/metaplex-foundation/mpl-gumdrop/tree/main/programs/mpl-gumdrop)
- Umi SDK: [📦 NPM](https://github.com/metaplex-foundation/mpl-gumdrop/tree/main/clients/js)
3 changes: 0 additions & 3 deletions gumdrop/js/.eslintignore

This file was deleted.

16 changes: 0 additions & 16 deletions gumdrop/js/.eslintrc.js

This file was deleted.

2 changes: 0 additions & 2 deletions gumdrop/js/.prettierignore

This file was deleted.

2 changes: 0 additions & 2 deletions gumdrop/js/.prettierrc.js

This file was deleted.

Loading
Loading