Chore: retire mpl-core NPM js package (metaplex-foundation#892)

* remove from fixed-price-sale

* bump mpl-fixed-price-sale

* remove mpl core from candy machine js

* disable seeds in anchor gen

* major bump candy machine

* remove core/js package

* remove core/js from readme

* update issue templates

* remove core from actions

* fix tests

Author: stegaBOB

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -10,7 +10,6 @@ body:
       options:
         - auction-house
         - candy-machine
-        - core
         - fixed-price-sale
         - gumdrop
         - hydra

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -9,14 +9,17 @@ body:
       label: Which package is this feature request for?
       options:
         - auction-house
+        - auctioneer
+        - bubblegum
         - candy-machine
+        - candy-machine-core
         - core
         - fixed-price-sale
         - gumdrop
+        - hydra
         - nft-packs
         - token-entangler
         - token-metadata
-        - hydra
     validations:
       required: true
   - type: textarea
@@ -53,4 +56,4 @@ body:
     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.

.github/workflows/sdk-reusable.yml

@@ -28,7 +28,6 @@ jobs:
     runs-on: ubuntu-latest
     # Set job outputs to values from filter step
     outputs:
-      core: ${{ steps.filter.outputs.core }}
       package: ${{ steps.filter.outputs.package }}
       workflow: ${{ steps.filter.outputs.workflow }}
     steps:
@@ -38,8 +37,6 @@ jobs:
         id: filter
         with:
           filters: |
-            core:
-              - 'core/js/**'
             package:
               - '${{ inputs.name }}/js/**'
             workflow:
@@ -50,7 +47,6 @@ jobs:
     needs: changes
     if: |
       inputs.changes == false ||
-      needs.changes.outputs.core == 'true' || 
       needs.changes.outputs.package == 'true' || 
       needs.changes.outputs.workflow == 'true'
     runs-on: ubuntu-latest

.github/workflows/sdk.yml

@@ -28,7 +28,6 @@ jobs:
           - name: "candy-machine"
           - name: "candy-machine-core"
             skip_test: true
-          - name: "core"
           - name: "fixed-price-sale"
             skip_test: true
           - name: "gumdrop"

Anchor.toml

@@ -1,6 +1,3 @@
-[features]
-seeds = true
-
 [registry]
 url = "https://anchor.projectserum.com"
 

README.md

@@ -88,7 +88,6 @@ merged.
 | Bubblegum          | [mpl-bubblegum][mpl-bubblegum-npm]                   | [![NPM][mpl-bubblegum-nimg]][mpl-bubblegum-npm]                   |
 | Candy Machine Core | [mpl-candy-machine-core][mpl-candy-machine-core-npm] | [![NPM][mpl-candy-machine-core-nimg]][mpl-candy-machine-core-npm] |
 | Candy Machine      | [mpl-candy-machine][mpl-candy-machine-npm]           | [![NPM][mpl-candy-machine-nimg]][mpl-candy-machine-npm]           |
-| Core               | [mpl-core][mpl-core-npm]                             | [![NPM][mpl-core-nimg]][mpl-core-npm]                             |
 | Fixed Price Sale   | [mpl-fixed-price-sale][mpl-fixed-price-sale-npm]     | [![NPM][mpl-fixed-price-sale-nimg]][mpl-fixed-price-sale-npm]     |
 | Gumdrop            | [mpl-gumdrop][mpl-gumdrop-npm]                       | [![NPM][mpl-gumdrop-nimg]][mpl-gumdrop-npm]                       |
 | Hydra              | [mpl-hydra][mpl-hydra-npm]                           | [![NPM][mpl-hydra-nimg]][mpl-hydra-npm]                           |
@@ -210,9 +209,6 @@ under either the [MIT][mit-license] or the [Apache][apache-license] licenses.
 [mpl-fixed-price-sale-nimg-long]:https://img.shields.io/npm/v/@metaplex-foundation/mpl-fixed-price-sale?label=npm%20%7C%20mpl-fixed-price-sale&logo=typescript
 [mpl-fixed-price-sale-nimg]:https://img.shields.io/npm/v/@metaplex-foundation/mpl-fixed-price-sale?logo=typescript
 
-[mpl-core-nimg-long]:https://img.shields.io/npm/v/@metaplex-foundation/mpl-core?label=npm%20%7C%20mpl-core&logo=typescript
-[mpl-core-nimg]:https://img.shields.io/npm/v/@metaplex-foundation/mpl-core?logo=typescript
-
 [mpl-gumdrop-nimg-long]:https://img.shields.io/npm/v/@metaplex-foundation/mpl-gumdrop?label=npm%20%7C%20mpl-gumdrop&logo=typescript
 [mpl-gumdrop-nimg]:https://img.shields.io/npm/v/@metaplex-foundation/mpl-gumdrop?logo=typescript
 

candy-machine/js/idl/candy_machine.json

@@ -303,7 +303,10 @@
         {
           "name": "clock",
           "isMut": false,
-          "isSigner": false
+          "isSigner": false,
+          "docs": [
+            "Account not actually used."
+          ]
         },
         {
           "name": "recentBlockhashes",
@@ -543,6 +546,9 @@
   "accounts": [
     {
       "name": "CandyMachine",
+      "docs": [
+        "Candy machine state and config data."
+      ],
       "type": {
         "kind": "struct",
         "fields": [
@@ -575,6 +581,9 @@
     },
     {
       "name": "CollectionPDA",
+      "docs": [
+        "Collection PDA account"
+      ],
       "type": {
         "kind": "struct",
         "fields": [
@@ -591,6 +600,9 @@
     },
     {
       "name": "FreezePDA",
+      "docs": [
+        "Collection PDA account"
+      ],
       "type": {
         "kind": "struct",
         "fields": [
@@ -627,6 +639,9 @@
   "types": [
     {
       "name": "CandyMachineData",
+      "docs": [
+        "Candy machine settings data."
+      ],
       "type": {
         "kind": "struct",
         "fields": [
@@ -640,10 +655,16 @@
           },
           {
             "name": "symbol",
+            "docs": [
+              "The symbol for the asset"
+            ],
             "type": "string"
           },
           {
             "name": "sellerFeeBasisPoints",
+            "docs": [
+              "Royalty basis points that goes to creators in secondary sales (0-10000)"
+            ],
             "type": "u16"
           },
           {
@@ -702,6 +723,9 @@
           },
           {
             "name": "gatekeeper",
+            "docs": [
+              "If [`Some`] requires gateway tokens on mint"
+            ],
             "type": {
               "option": {
                 "defined": "GatekeeperConfig"
@@ -713,6 +737,9 @@
     },
     {
       "name": "ConfigLine",
+      "docs": [
+        "Individual config line for storing NFT data pre-mint."
+      ],
       "type": {
         "kind": "struct",
         "fields": [
@@ -722,6 +749,9 @@
           },
           {
             "name": "uri",
+            "docs": [
+              "URI pointing to JSON representing the asset"
+            ],
             "type": "string"
           }
         ]
@@ -767,6 +797,9 @@
     },
     {
       "name": "HiddenSettings",
+      "docs": [
+        "Hidden Settings for large mints used with offline data."
+      ],
       "type": {
         "kind": "struct",
         "fields": [
@@ -820,15 +853,25 @@
     },
     {
       "name": "GatekeeperConfig",
+      "docs": [
+        "Configurations options for the gatekeeper."
+      ],
       "type": {
         "kind": "struct",
         "fields": [
           {
             "name": "gatekeeperNetwork",
+            "docs": [
+              "The network for the gateway token required"
+            ],
             "type": "publicKey"
           },
           {
             "name": "expireOnUse",
+            "docs": [
+              "Whether or not the token should expire after minting.",
+              "The gatekeeper network must support this if true."
+            ],
             "type": "bool"
           }
         ]
@@ -1124,5 +1167,11 @@
       "name": "CannotSwitchFromHiddenSettings",
       "msg": "Cannot remove Hidden Settings."
     }
-  ]
+  ],
+  "metadata": {
+    "address": "cndy3Z4yapfJBmL3ShUp5exZKqR3z33thTzeNMm2gRZ",
+    "origin": "anchor",
+    "binaryVersion": "0.25.0",
+    "libVersion": "0.25.0"
+  }
 }

candy-machine/js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metaplex-foundation/mpl-candy-machine",
-  "version": "4.7.1",
+  "version": "5.0.0",
   "programVersion": "4.4.1",
   "description": "MPL Candy Machine JavaScript API. This MPL package is for the current generation of candy machine which is 2.0.0",
   "main": "dist/src/mpl-candy-machine.js",
@@ -39,22 +39,21 @@
   "author": "Metaplex Maintainers <[email protected]>",
   "license": "Apache-2.0",
   "dependencies": {
-    "@metaplex-foundation/beet": "^0.4.0",
-    "@metaplex-foundation/beet-solana": "^0.3.0",
+    "@metaplex-foundation/beet": "^0.7.1",
+    "@metaplex-foundation/beet-solana": "^0.4.0",
     "@metaplex-foundation/cusper": "^0.0.2",
-    "@metaplex-foundation/mpl-core": "^0.6.1",
-    "@solana/spl-token": "^0.3.5",
-    "@solana/web3.js": "^1.35.1"
+    "@solana/spl-token": "^0.3.6",
+    "@solana/web3.js": "^1.66.2"
   },
   "devDependencies": {
-    "eslint-config-prettier": "^8.3.0",
+    "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "@metaplex-foundation/solita": "^0.14.0",
-    "@typescript-eslint/eslint-plugin": "^5.4.0",
-    "@typescript-eslint/parser": "^5.4.0",
-    "eslint": "^8.3.0",
-    "prettier": "^2.5.1",
+    "@metaplex-foundation/solita": "^0.19.0",
+    "@typescript-eslint/eslint-plugin": "^5.43.0",
+    "@typescript-eslint/parser": "^5.43.0",
+    "eslint": "^8.27.0",
+    "prettier": "^2.7.1",
     "rimraf": "^3.0.2",
-    "typescript": "^4.6.2"
+    "typescript": "^4.9.3"
   }
-}
+}

candy-machine/js/src/CandyMachineProgram.ts

@@ -73,8 +73,9 @@ export class CandyMachine implements CandyMachineArgs {
   static async fromAccountAddress(
     connection: web3.Connection,
     address: web3.PublicKey,
+    commitmentOrConfig?: web3.Commitment | web3.GetAccountInfoConfig,
   ): Promise<CandyMachine> {
-    const accountInfo = await connection.getAccountInfo(address);
+    const accountInfo = await connection.getAccountInfo(address, commitmentOrConfig);
     if (accountInfo == null) {
       throw new Error(`Unable to find CandyMachine account at ${address}`);
     }