Enforce Collections w/ CM and clean up code

.github/workflows/program-candy-machine.yml

@@ -8,7 +8,7 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  SOLANA_VERSION: 1.9.14
+  SOLANA_VERSION: 1.9.18
   RUST_TOOLCHAIN: stable
 
 jobs:
@@ -57,10 +57,7 @@ jobs:
             ~/.cargo/git/db/
             ./rust/target
           key: ${{ env.cache_id }}-${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUSTC_HASH }}
-
-      # Build deps
-      - uses: ./.github/actions/build-token-vault
-
+      - uses: ./.github/actions/build-token-metadata
       # Run test
       - name: test-candy-machine
         id: run_test

.github/workflows/sdk-candy-machine.yml

@@ -24,7 +24,7 @@ jobs:
             - 'core/**'
           package:
             - 'candy-machine/**'
-  build-lint-and-test-auction:
+  build-lint-and-test-candy-machine:
     needs: changes
     if: ${{ needs.changes.outputs.core == 'true' || needs.changes.outputs.package == 'true' }}
     runs-on: ubuntu-latest

candy-machine/js/.solitarc.js

@@ -0,0 +1,16 @@
+// @ts-check
+const path = require('path');
+const programDir = path.join(__dirname, '..', 'program');
+const idlDir = path.join(__dirname, 'idl');
+const sdkDir = path.join(__dirname, 'src', 'generated');
+const binaryInstallDir = path.join(__dirname, '.crates');
+
+module.exports = {
+    idlGenerator: 'anchor',
+    programName: 'candy_machine',
+    programId: 'cndy3Z4yapfJBmL3ShUp5exZKqR3z33thTzeNMm2gRZ',
+    idlDir,
+    sdkDir,
+    binaryInstallDir,
+    programDir,
+};

candy-machine/js/idl/candy_machine.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.1.3",
+  "version": "4.0.0",
   "name": "candy_machine",
   "instructions": [
     {
@@ -259,7 +259,7 @@
       "accounts": [
         {
           "name": "candyMachine",
-          "isMut": false,
+          "isMut": true,
           "isSigner": false
         },
         {
@@ -320,7 +320,7 @@
       "accounts": [
         {
           "name": "candyMachine",
-          "isMut": false,
+          "isMut": true,
           "isSigner": false
         },
         {
@@ -688,107 +688,189 @@
           }
         ]
       }
+    }
+  ],
+  "errors": [
+    {
+      "code": 6000,
+      "name": "IncorrectOwner",
+      "msg": "Account does not have correct owner!"
     },
     {
-      "name": "ErrorCode",
-      "type": {
-        "kind": "enum",
-        "variants": [
-          {
-            "name": "IncorrectOwner"
-          },
-          {
-            "name": "Uninitialized"
-          },
-          {
-            "name": "MintMismatch"
-          },
-          {
-            "name": "IndexGreaterThanLength"
-          },
-          {
-            "name": "NumericalOverflowError"
-          },
-          {
-            "name": "TooManyCreators"
-          },
-          {
-            "name": "UuidMustBeExactly6Length"
-          },
-          {
-            "name": "NotEnoughTokens"
-          },
-          {
-            "name": "NotEnoughSOL"
-          },
-          {
-            "name": "TokenTransferFailed"
-          },
-          {
-            "name": "CandyMachineEmpty"
-          },
-          {
-            "name": "CandyMachineNotLive"
-          },
-          {
-            "name": "HiddenSettingsConfigsDoNotHaveConfigLines"
-          },
-          {
-            "name": "CannotChangeNumberOfLines"
-          },
-          {
-            "name": "DerivedKeyInvalid"
-          },
-          {
-            "name": "PublicKeyMismatch"
-          },
-          {
-            "name": "NoWhitelistToken"
-          },
-          {
-            "name": "TokenBurnFailed"
-          },
-          {
-            "name": "GatewayAppMissing"
-          },
-          {
-            "name": "GatewayTokenMissing"
-          },
-          {
-            "name": "GatewayTokenExpireTimeInvalid"
-          },
-          {
-            "name": "NetworkExpireFeatureMissing"
-          },
-          {
-            "name": "CannotFindUsableConfigLine"
-          },
-          {
-            "name": "InvalidString"
-          },
-          {
-            "name": "SuspiciousTransaction"
-          },
-          {
-            "name": "CannotSwitchToHiddenSettings"
-          },
-          {
-            "name": "IncorrectSlotHashesPubkey"
-          },
-          {
-            "name": "IncorrectCollectionAuthority"
-          },
-          {
-            "name": "MismatchedCollectionPDA"
-          },
-          {
-            "name": "MismatchedCollectionMint"
-          }
-        ]
-      }
+      "code": 6001,
+      "name": "Uninitialized",
+      "msg": "Account is not initialized!"
+    },
+    {
+      "code": 6002,
+      "name": "MintMismatch",
+      "msg": "Mint Mismatch!"
+    },
+    {
+      "code": 6003,
+      "name": "IndexGreaterThanLength",
+      "msg": "Index greater than length!"
+    },
+    {
+      "code": 6004,
+      "name": "NumericalOverflowError",
+      "msg": "Numerical overflow error!"
+    },
+    {
+      "code": 6005,
+      "name": "TooManyCreators",
+      "msg": "Can only provide up to 4 creators to candy machine (because candy machine is one)!"
+    },
+    {
+      "code": 6006,
+      "name": "UuidMustBeExactly6Length",
+      "msg": "Uuid must be exactly of 6 length"
+    },
+    {
+      "code": 6007,
+      "name": "NotEnoughTokens",
+      "msg": "Not enough tokens to pay for this minting"
+    },
+    {
+      "code": 6008,
+      "name": "NotEnoughSOL",
+      "msg": "Not enough SOL to pay for this minting"
+    },
+    {
+      "code": 6009,
+      "name": "TokenTransferFailed",
+      "msg": "Token transfer failed"
+    },
+    {
+      "code": 6010,
+      "name": "CandyMachineEmpty",
+      "msg": "Candy machine is empty!"
+    },
+    {
+      "code": 6011,
+      "name": "CandyMachineNotLive",
+      "msg": "Candy machine is not live!"
+    },
+    {
+      "code": 6012,
+      "name": "HiddenSettingsConfigsDoNotHaveConfigLines",
+      "msg": "Configs that are using hidden uris do not have config lines, they have a single hash representing hashed order"
+    },
+    {
+      "code": 6013,
+      "name": "CannotChangeNumberOfLines",
+      "msg": "Cannot change number of lines unless is a hidden config"
+    },
+    {
+      "code": 6014,
+      "name": "DerivedKeyInvalid",
+      "msg": "Derived key invalid"
+    },
+    {
+      "code": 6015,
+      "name": "PublicKeyMismatch",
+      "msg": "Public key mismatch"
+    },
+    {
+      "code": 6016,
+      "name": "NoWhitelistToken",
+      "msg": "No whitelist token present"
+    },
+    {
+      "code": 6017,
+      "name": "TokenBurnFailed",
+      "msg": "Token burn failed"
+    },
+    {
+      "code": 6018,
+      "name": "GatewayAppMissing",
+      "msg": "Missing gateway app when required"
+    },
+    {
+      "code": 6019,
+      "name": "GatewayTokenMissing",
+      "msg": "Missing gateway token when required"
+    },
+    {
+      "code": 6020,
+      "name": "GatewayTokenExpireTimeInvalid",
+      "msg": "Invalid gateway token expire time"
+    },
+    {
+      "code": 6021,
+      "name": "NetworkExpireFeatureMissing",
+      "msg": "Missing gateway network expire feature when required"
+    },
+    {
+      "code": 6022,
+      "name": "CannotFindUsableConfigLine",
+      "msg": "Unable to find an unused config line near your random number index"
+    },
+    {
+      "code": 6023,
+      "name": "InvalidString",
+      "msg": "Invalid string"
+    },
+    {
+      "code": 6024,
+      "name": "SuspiciousTransaction",
+      "msg": "Suspicious transaction detected"
+    },
+    {
+      "code": 6025,
+      "name": "CannotSwitchToHiddenSettings",
+      "msg": "Cannot Switch to Hidden Settings after items available is greater than 0"
+    },
+    {
+      "code": 6026,
+      "name": "IncorrectSlotHashesPubkey",
+      "msg": "Incorrect SlotHashes PubKey"
+    },
+    {
+      "code": 6027,
+      "name": "IncorrectCollectionAuthority",
+      "msg": "Incorrect collection NFT authority"
+    },
+    {
+      "code": 6028,
+      "name": "MismatchedCollectionPDA",
+      "msg": "Collection PDA address is invalid"
+    },
+    {
+      "code": 6029,
+      "name": "MismatchedCollectionMint",
+      "msg": "Provided mint account doesn't match collection PDA mint"
+    },
+    {
+      "code": 6030,
+      "name": "SlotHashesEmpty",
+      "msg": "Slot hashes Sysvar is empty"
+    },
+    {
+      "code": 6031,
+      "name": "MetadataAccountMustBeEmpty",
+      "msg": "The metadata account has data in it, and this must be empty to mint a new NFT"
+    },
+    {
+      "code": 6032,
+      "name": "MissingSetCollectionDuringMint",
+      "msg": "Missing set collection during mint IX for Candy Machine with collection set"
+    },
+    {
+      "code": 6033,
+      "name": "NoChangingCollectionDuringMint",
+      "msg": "Can't change collection settings after items have begun to be minted"
+    },
+    {
+      "code": 6034,
+      "name": "CandyCollectionRequiresRetainAuthority",
+      "msg": "Retain authority must be true for Candy Machines with a collection set"
     }
   ],
   "metadata": {
-    "address": "cndy3Z4yapfJBmL3ShUp5exZKqR3z33thTzeNMm2gRZ"
+    "address": "cndy3Z4yapfJBmL3ShUp5exZKqR3z33thTzeNMm2gRZ",
+    "origin": "anchor",
+    "binaryVersion": "0.24.2",
+    "libVersion": "0.24.2"
   }
 }

candy-machine/js/package.json

@@ -14,7 +14,7 @@
     "build:docs": "typedoc",
     "build": "rimraf dist && tsc -p tsconfig.json",
     "test": "echo mpl-candy-machine tests coming up ...",
-    "api:gen": "node scripts/api-gen-ts.js && prettier --write ./src/**/*.ts",
+    "api:gen": "DEBUG='(solita|rustbin):(info|error)' solita",
     "lint": "eslint \"{src,test}/**/*.ts\" --format stylish",
     "fix:lint": "yarn lint --fix",
     "prettier": "prettier \"{src,test}/**/*.ts\" --check",