Add Bubblegum and Candy-wrapper #671

danenbm · 2022-08-10T23:05:12Z

Update

Met with @thlorenz and got further advice on js files:
- Moved bubblegum js dependencies to bubblegum specific package.json.
- Removed extra tsconfig file and added typedoc file.
- Moved and renamed main index.ts to src directory
Reverted some changes to Anchor.toml that were added to make anchor test run bubblegum-test.ts.
- The reason for this is long term we aren't planning to run anchor test in this repo.
- As a reference I left a version where anchor-test --skip-lint runs bubblegum-test.ts (but fails) at: danenbm/bubblegum-anchor-test-runs-fails
- On that branch there are instructions to get the test to run: TEST_INSTRUCTIONS.md
Excluding candy-wrapper from github workflow.
NOTE some of the scripts in bubblegum/js/package.json do not work. This is because they fail due to issues with the tests, which are going to be reworked anyways. And at this time we do not need things like yarn check:publish-ready, etc. since we aren't publishing this yet.
api:gen is working which is what is needed now for CI tests.

Overall summary

This PR ports Bubblegum and Candy-wrapper from the Candyland repo.
In order to do that a few directories are moved around, and various package.json etc. files are updated to get the dependencies right.

Testing

anchor build --skip-lint works and builds bubblegum.so and candy-wrapper.so.
yarn api:gen works from bubblegum/js directory and builds
same as existing IDL from Candyland repo (except adds a few metadata fields).

Previous PR

Previous PR was Adding Bubblegum and Candy-wrapper programs from demo repo #662 but this one has git revision history for Bubblegum and Candy-wrapper code that was pulled into metaplex-program-library.

Detailed Notes

@danenbm

Code was merged from https://github.com/jarry-xiao/candyland repo.
Moved program from programs/bubblegum/ to bubblegum/program.
Moved sdk from contracts/sdk/bubblegum/ to bubblegum/js.
Moved tests from contracts/tests/ to bubblegum/js/test.
Moved program from programs/candy-wrapper to candy-wrapper/program.
Adding api:gen script to bubblegum js directory
Adding couple misc files from original repo.
Adding solita config.
Cleaning up some yarn.lock and package.json files.
Including Bubblegum in some top level config files.

@jshiohaha

enable bubblegum anchor tests
- update package.json and tsconfig.json
- cleanup bubblegum test file and imports
- enable anchor test --skip-lint to run after anchor workspace members are built

@danenbm

Moving bubblegum js dependencies to bubblegum specific package.json.
Removing extra tsconfig file and adding typedoc file.
Moved and renamed index.ts to src directory.
Removing Anchor workspace additions and nonworking yarn scripts.
Excluding candy-wrapper from github workflow.

…ndyland into anchor-restructure

Separate datastructure from gummyroll smart contract

Add Gummyroll instructions

remove MC from cargo lock

- update package.json and tsconfig.json - cleanup bubblegum test file and imports - enable anchor test --skip-lint to run after anchor workspace members are built

Also cleanup bubblegum package.json.

- Also adding license files to js directories. - Also cleaning up extra bubblegum types file.

thlorenz

Aside from the nits you can fix LGTM

bubblegum/js/typedoc.json

bubblegum/js/package.json

They currently don't all work because the ts tests have issues.

jshiohaha

Few nit + informational comments, but overall LGTM - nice work!

bubblegum/program/Cargo.toml

candy-wrapper/program/Cargo.toml

jshiohaha · 2022-08-12T17:25:32Z

Anchor.toml

@@ -6,7 +6,8 @@ cluster = "localnet"
 wallet = "~/.config/solana/id.json"

 [programs.localnet]
-mpl_auction_house="hausS13jsjafwWwGqZTUQRmWyvyxn9EQpqMwV1PBBmk"
+auction_house="hausS13jsjafwWwGqZTUQRmWyvyxn9EQpqMwV1PBBmk"


Informational note on why this was changed: when trying to anchor test --skip-lint, I got errors related to not being able to find IDL for mpl_auction_house. I realized this is because the IDL generated and stored in the MPL root target/idl/ directory was called auction_house.json and had name field auction_house.

So tldr; it looks like anchor was expecting mpl_auction_house (based on this naming) but found auction_house. But, I guess this doesn't matter if we aren't using Anchor workspaces.

…apper

ngundotra · 2022-08-12T22:06:00Z

🔥 🔥 🔥

ngundotra and others added 30 commits May 27, 2022 16:33

Rename programs/programs -> contracts/programs

5dd596a

Rename programs/programs -> contracts/programs

527bca6

fix dockerfiles

d9403e7

Merge branch 'anchor-restructure' of https://github.com/jarry-xiao/ca…

2d6a45f

…ndyland into anchor-restructure

Merge branch 'anchor-restructure' of https://github.com/jarry-xiao/ca…

f465b96

…ndyland into anchor-restructure

Merge branch 'anchor-restructure' of https://github.com/jarry-xiao/ca…

f0f8ea2

…ndyland into anchor-restructure

fix nonce in bubblegum test

b97e2a5

Merge branch 'anchor-restructure' of https://github.com/jarry-xiao/ca…

cb6b17e

…ndyland into anchor-restructure

fix bubblegum nonce decoding, still failing test

36f47b1

rollback nonce by 1 for ownership transfer

c67b4bf

fix leafNonce for all instructions in test

74af0c9

fix leafNonce for all instructions in test

7403778

remove log

ae10a08

fix bubblegum test

b7bacbe

migrate bubblegum and bubblegum to use Vec<u8>

75e0704

set gummyroll interface back to [u8; 32]

9f0f90e

fix gummyroll tests

5e1fd72

propagate Node as [u8;32] type changes

ddf9ce6

fix gummyroll test

cf979bc

Merge pull request #85 from jarry-xiao/cmt-0

a52448c

Separate datastructure from gummyroll smart contract

Merge pull request #85 from jarry-xiao/cmt-0

b41ed0a

Separate datastructure from gummyroll smart contract

add appendAuthority transfer test

f6ee778

add authority transfer tests

feacbf5

add gummyroll sdk, refactor tests for replace & append ixs

3b577a8

add transferAuthIx to sdk, refactor tests

81cc904

clean up gummyroll tests a little bit more

fd593aa

move merkle-roll-serde to gummyroll accounts

a1642d9

add verifyLeaf tests

10794eb

Merge pull request #81 from jarry-xiao/gummyroll

3280b74

Add Gummyroll instructions

Fix merge conflicts in test files

3e48240

remove MC from cargo lock

enable bubblegum anchor tests

1a68c2e

- update package.json and tsconfig.json - cleanup bubblegum test file and imports - enable anchor test --skip-lint to run after anchor workspace members are built

danenbm marked this pull request as ready for review August 10, 2022 23:10

danenbm requested a review from a team as a code owner August 10, 2022 23:10

danenbm added 3 commits August 11, 2022 13:02

Moving bubblegum js dependencies to bubblegum specific package.json

120fe90

Removing extra tsconfig file and adding typedoc file

0ccadbd

Moved and renamed index.ts to src directory

6c6410e

Also cleanup bubblegum package.json.

danenbm force-pushed the danenbm/add-bubblegum-hist branch from 0552eb7 to 6c6410e Compare August 11, 2022 22:58

danenbm added 3 commits August 11, 2022 23:57

Removing Anchor workspace additions and nonworking yarn scripts

028bd5e

Merge branch 'master' into danenbm/add-bubblegum-hist

302ed9c

Updating yarn.lock file

2497d82

danenbm mentioned this pull request Aug 12, 2022

Adding Bubblegum and Candy-wrapper programs from demo repo #662

Closed

Adding empty api:gen script for candy-wrapper to support CI tests

a38a98b

- Also adding license files to js directories. - Also cleaning up extra bubblegum types file.

thlorenz previously approved these changes Aug 12, 2022

View reviewed changes

bubblegum/js/typedoc.json Outdated Show resolved Hide resolved

bubblegum/js/package.json Outdated Show resolved Hide resolved

danenbm added 4 commits August 12, 2022 10:06

Merge branch 'master' into danenbm/add-bubblegum-hist

a526c15

Adding back in the js scripts that were previously removed

3f2fe0b

They currently don't all work because the ts tests have issues.

Merge branch 'master' into danenbm/add-bubblegum-hist

0d590db

Updating yarn.lock file

2bd19d4

danenbm dismissed thlorenz’s stale review via 2bd19d4 August 12, 2022 17:44

danenbm added 2 commits August 12, 2022 10:58

Excluding candy-wrapper from github verify workflow

5f29a6b

Updating yarn.lock file

8b60f42

thlorenz previously approved these changes Aug 12, 2022

View reviewed changes

jshiohaha previously approved these changes Aug 12, 2022

View reviewed changes

Renaming bubblegum to mpl-bubblegum and candy-wrapper to mpl-candy-wr…

eb60fbe

…apper

danenbm dismissed stale reviews from jshiohaha and thlorenz via eb60fbe August 12, 2022 18:35

jshiohaha approved these changes Aug 12, 2022

View reviewed changes

austbot approved these changes Aug 12, 2022

View reviewed changes

austbot merged commit 4c45b58 into master Aug 12, 2022

stegaBOB deleted the danenbm/add-bubblegum-hist branch September 12, 2022 02:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Bubblegum and Candy-wrapper #671

Add Bubblegum and Candy-wrapper #671

danenbm commented Aug 10, 2022 •

edited

Loading

thlorenz left a comment

jshiohaha left a comment •

edited

Loading

jshiohaha Aug 12, 2022

ngundotra commented Aug 12, 2022

Add Bubblegum and Candy-wrapper #671

Add Bubblegum and Candy-wrapper #671

Conversation

danenbm commented Aug 10, 2022 • edited Loading

Update

Overall summary

Testing

Previous PR

Detailed Notes

thlorenz left a comment

Choose a reason for hiding this comment

jshiohaha left a comment • edited Loading

Choose a reason for hiding this comment

jshiohaha Aug 12, 2022

Choose a reason for hiding this comment

ngundotra commented Aug 12, 2022

danenbm commented Aug 10, 2022 •

edited

Loading

jshiohaha left a comment •

edited

Loading