Merge pull request #51 from metaplex-foundation/fix/cm-add-config-lines

Fix/cm add config lines

Author: tonyboylehub

asset-cache.json

@@ -1,7 +1,7 @@
 {
   "name": "@metaplex-foundation/cli",
   "description": "Metaplex CLI",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "author": "Metaplex <[email protected]>",
   "bin": {
     "mplx": "./bin/run.js"

package.json

@@ -1,18 +1,18 @@
-import { fetchCandyGuard, fetchCandyMachine, findCandyGuardPda } from '@metaplex-foundation/mpl-core-candy-machine'
+import { CandyGuard, fetchCandyGuard, fetchCandyMachine } from '@metaplex-foundation/mpl-core-candy-machine'
 import { publicKey } from '@metaplex-foundation/umi'
 import { Args, Flags } from '@oclif/core'
-import fs from 'node:fs'
-import path from 'node:path'
+import { readCmConfig } from '../../lib/cm/cm-utils.js'
 import { jsonStringify } from '../../lib/util.js'
 import { TransactionCommand } from '../../TransactionCommand.js'
-import { readCmConfig } from '../../lib/cm/cm-utils.js'
 
 export default class CmFetch extends TransactionCommand<typeof CmFetch> {
     static override description = `Fetch candy machine and guard data from the blockchain`
 
     static override examples = [
         '$ mplx cm fetch',
         '$ mplx cm fetch <address>',
+        '$ mplx cm fetch --items',
+        '$ mplx cm fetch <address> --items',
     ]
 
     static override usage = 'cm fetch [FLAGS] [ARGS]'
@@ -47,12 +47,33 @@ export default class CmFetch extends TransactionCommand<typeof CmFetch> {
                 this.error('No address provided and no config file found with candy machine address');
             }
 
+
+            let candyGuard: CandyGuard | undefined = undefined;
+            let authorityOnlyMinting: boolean = false;
+
             const { items, ...candyMachine } = await fetchCandyMachine(umi, publicKey(address));
-            const candyGuardPda = findCandyGuardPda(umi, { base: candyMachine.publicKey });
-            const candyGuard = await fetchCandyGuard(umi, candyGuardPda);
+            const mintAuthority = candyMachine.mintAuthority;
+            if (mintAuthority === candyMachine.authority) {
+                authorityOnlyMinting = true;
+            } else {
+                this.log(`Checking if mint authority is a Candy Guard...`);
+                candyGuard = await fetchCandyGuard(umi, candyMachine.mintAuthority)
+                    .then(guard => guard)
+                    .catch(error => {
+                        this.log(`Failed to fetch candy guard: ${error instanceof Error ? error.message : String(error)}`);
+                        this.log(`The mint authority address ${candyMachine.mintAuthority} doesn't appear to be a valid candy guard, may be a custom program`);
+                        return undefined;
+                    });
+            }
 
             this.log(jsonStringify(candyMachine, 2));
-            this.log(jsonStringify(candyGuard, 2));
+            if (candyGuard) {
+                this.log(jsonStringify(candyGuard, 2));
+            } else if (authorityOnlyMinting) {
+                this.log(`No candy guard - using authority-only minting`);
+            } else {
+                this.log(`No candy guard found - mint authority may be a custom program`);
+            }
 
             if (flags.items) {
                 this.log(jsonStringify(items, 2));

src/commands/cm/fetch.ts

@@ -1,17 +1,16 @@
-import { Flags } from '@oclif/core'
 import { createFungible } from '@metaplex-foundation/mpl-token-metadata'
 import { createTokenIfMissing, findAssociatedTokenPda, mintTokensTo } from '@metaplex-foundation/mpl-toolbox'
 import { generateSigner, percentAmount, Umi } from '@metaplex-foundation/umi'
-import { base58 } from '@metaplex-foundation/umi/serializers'
+import { Flags } from '@oclif/core'
 import ora from 'ora'
 import { TransactionCommand } from '../../../TransactionCommand.js'
 import { ExplorerType, generateExplorerUrl } from '../../../explorers.js'
 import umiSendAndConfirmTransaction from '../../../lib/umi/sendAndConfirm.js'
 import imageUploader from '../../../lib/uploader/imageUploader.js'
 import uploadJson from '../../../lib/uploader/uploadJson.js'
+import { RpcChain, txSignatureToString } from '../../../lib/util.js'
 import { validateMintAmount, validateTokenName, validateTokenSymbol } from '../../../lib/validations.js'
 import createTokenPrompt from '../../../prompts/createTokenPrompt.js'
-import { RpcChain, txSignatureToString } from '../../../lib/util.js'
 
 /* 
   Create Possibilities:

src/commands/toolbox/token/create.ts

@@ -57,8 +57,8 @@ const insertItems = async (umi: Umi, candyMachineConfig: CandyMachineConfig, ass
     let maxNameLength = 0
 
     for (const item of Object.values(assetCache.assetItems)) {
-        if (item.imageUri?.length && item.imageUri.length > maxUriLength) {
-            maxUriLength = item.imageUri.length
+        if (item.jsonUri?.length && item.jsonUri.length > maxUriLength) {
+            maxUriLength = item.jsonUri.length
         }
         if (item.name && item.name.length > maxNameLength) {
             maxNameLength = item.name.length
@@ -106,9 +106,30 @@ const insertItems = async (umi: Umi, candyMachineConfig: CandyMachineConfig, ass
         }
 
         // else we need to add the config lines to the transaction
+        // Validate all items have required fields before building configLines
+        for (let i = 0; i < configLineGroup.assetItems.length; i++) {
+            const item = configLineGroup.assetItems[i];
+            const itemIndex = configLineGroup.startingIndex + i;
+
+            if (!item.name || item.name.trim() === '') {
+                throw new Error(
+                    `Item at index ${itemIndex} is missing required field 'name'. ` +
+                    `Item details: ${JSON.stringify({ jsonUri: item.jsonUri, imageUri: item.imageUri })}`
+                );
+            }
+
+            if (!item.jsonUri || item.jsonUri.trim() === '') {
+                throw new Error(
+                    `Item at index ${itemIndex} is missing required field 'jsonUri'. ` +
+                    `Item details: ${JSON.stringify({ name: item.name, imageUri: item.imageUri })}`
+                );
+            }
+        }
+
+        // Build configLines with validated values (type assertion safe after validation)
         const configLines = configLineGroup.assetItems.map(item => ({
             name: item.name,
-            uri: item.imageUri!,
+            uri: item.jsonUri as string,
         }))
 
         const transaction = addConfigLines(umi, {