fix(1540): make supplyKey optional in create-nft and align KeySchema in batch-create-ft-from-file

Signed-off-by: matevszm <mateusz.marcinkowski@blockydevs.com>

Author: matevszm

src/plugins/token/README.md

@@ -416,6 +416,10 @@ The token file supports aliases and raw keys with optional key type prefixes:
 
 - **Alias**: `"my-account"` - resolved via alias service
 - **Account with key**: `"0.0.123456:privateKey"`
+- **Account ID only**: `"0.0.123456"`
+- **Public key**: `"ed25519:public:hex-key"` or `"ecdsa:public:hex-key"`
+- **Private key**: `"ed25519:private:hex-key"` or `"ecdsa:private:hex-key"`
+- **Key reference**: `"kr_xxx"` - managed by key manager
 
 **Note**: Token name is automatically registered as an alias after successful creation. Duplicate names are not allowed.
 
@@ -458,6 +462,10 @@ The NFT file supports aliases and raw keys with optional key type prefixes:
 
 - **Alias**: `"my-account"` - resolved via alias service
 - **Account with key**: `"0.0.123456:privateKey"`
+- **Account ID only**: `"0.0.123456"`
+- **Public key**: `"ed25519:public:hex-key"` or `"ecdsa:public:hex-key"`
+- **Private key**: `"ed25519:private:hex-key"` or `"ecdsa:private:hex-key"`
+- **Key reference**: `"kr_xxx"` - managed by key manager
 
 **Key Differences from Fungible Token:**
 
@@ -479,18 +487,17 @@ The plugin supports flexible parameter formats:
 - **Account name**: `alice` (resolved via alias service)
 - **Amount**: Display units (default) or base units with `t` suffix (e.g., `100t`)
 
-### Private Key Format
+### Key Format
 
-Private keys can optionally be prefixed with their key type:
+All key parameters accept any of the following formats:
 
-- **With prefix**: `ed25519:12345676543212345` or `ecdsa:12345676543212345`
-- **Without prefix**: `12345676543212345` (defaults to `ecdsa`)
-
-This applies to:
-
-- Treasury keys in `create-from-file` command
-- Association keys in `create-from-file` command
-- Account keys in `treasury-id:key` format
+- **Alias**: `"my-account"` - resolved via alias service
+- **Account with private key**: `"0.0.123456:privateKey"`
+- **Account ID only**: `"0.0.123456"`
+- **Public key with type prefix**: `"ed25519:public:hex-key"` or `"ecdsa:public:hex-key"`
+- **Private key with type prefix**: `"ed25519:private:hex-key"` or `"ecdsa:private:hex-key"`
+- **Key reference**: `"kr_xxx"` - managed by key manager
+- **EVM address**: `"0x..."` (where supported)
 
 ## 🔧 Core API Integration
 

src/plugins/token/__tests__/unit/create-nft.test.ts

@@ -132,7 +132,7 @@ describe('tokenCreateNftHandler', () => {
         },
       });
 
-      keyResolver.resolveSigningKey.mockResolvedValue({
+      keyResolver.getPublicKey.mockResolvedValue({
         keyRefId: 'supply-key-ref-id',
         publicKey: '302a300506032b6570032100' + '0'.repeat(64),
       });

src/plugins/token/commands/create-nft/handler.ts

@@ -22,7 +22,10 @@ import {
   buildTokenData,
   determineFiniteMaxSupply,
 } from '@/plugins/token/utils/token-data-builders';
-import { resolveOptionalKey } from '@/plugins/token/utils/token-resolve-optional-key';
+import {
+  resolveOptionalKey,
+  toPublicKey,
+} from '@/plugins/token/utils/token-resolve-optional-key';
 import { ZustandTokenStateHelper } from '@/plugins/token/zustand-state-helper';
 
 export const TOKEN_CREATE_NFT_COMMAND_NAME = 'token_create-nft';
@@ -64,10 +67,11 @@ export class TokenCreateNftCommand extends BaseTransactionCommand<
       api.keyResolver,
       'token:admin',
     );
-    const supply = await api.keyResolver.resolveSigningKey(
+    const supply = await resolveOptionalKey(
       validArgs.supplyKey,
       keyManager,
-      ['token:supply'],
+      api.keyResolver,
+      'token:supply',
     );
 
     let finalMaxSupply: bigint | undefined;
@@ -84,7 +88,7 @@ export class TokenCreateNftCommand extends BaseTransactionCommand<
     logger.debug('=== NFT PARAMS DEBUG ===');
     logger.debug(`Treasury ID: ${treasury.keyRefId}`);
     logger.debug(`Admin Key (keyRefId): ${admin?.keyRefId}`);
-    logger.debug(`Supply Key (keyRefId): ${supply.keyRefId}`);
+    logger.debug(`Supply Key (keyRefId): ${supply?.keyRefId}`);
     logger.debug(`Use Custom Treasury: ${String(Boolean(treasury))}`);
     logger.debug('=========================');
 
@@ -123,7 +127,7 @@ export class TokenCreateNftCommand extends BaseTransactionCommand<
       adminPublicKey: normalisedParams.admin
         ? PublicKey.fromString(normalisedParams.admin.publicKey)
         : undefined,
-      supplyPublicKey: PublicKey.fromString(normalisedParams.supply.publicKey),
+      supplyPublicKey: toPublicKey(normalisedParams.supply),
       memo: normalisedParams.memo,
     });
     return { transaction };
@@ -187,7 +191,7 @@ export class TokenCreateNftCommand extends BaseTransactionCommand<
       tokenType: normalisedParams.tokenType,
       supplyType: normalisedParams.supplyType,
       adminPublicKey: normalisedParams.admin?.publicKey,
-      supplyPublicKey: normalisedParams.supply.publicKey,
+      supplyPublicKey: normalisedParams.supply?.publicKey,
       network: normalisedParams.network,
     });
 
@@ -216,7 +220,7 @@ export class TokenCreateNftCommand extends BaseTransactionCommand<
       adminAccountId: undefined,
       adminPublicKey: normalisedParams.admin?.publicKey,
       supplyAccountId: undefined,
-      supplyPublicKey: normalisedParams.supply.publicKey,
+      supplyPublicKey: normalisedParams.supply?.publicKey,
       alias: normalisedParams.alias,
       network: normalisedParams.network,
     };

src/plugins/token/commands/create-nft/input.ts

@@ -33,7 +33,9 @@ export const TokenCreateNftInputSchema = z
     adminKey: KeySchema.optional().describe(
       'Admin key. Accepts any key format.',
     ),
-    supplyKey: KeySchema.describe('Supply key. Accepts any key format.'),
+    supplyKey: KeySchema.optional().describe(
+      'Supply key. Accepts any key format.',
+    ),
     name: TokenAliasNameSchema.optional().describe(
       'Optional alias to register for the token',
     ),

src/plugins/token/commands/create-nft/output.ts

@@ -31,7 +31,8 @@ export const TokenCreateNftOutputSchema = z.object({
   adminPublicKey:
     PublicKeyDefinitionSchema.optional().describe('Admin public key'),
   supplyAccountId: EntityIdSchema.optional().describe('Supply account ID'),
-  supplyPublicKey: PublicKeyDefinitionSchema.describe('Supply public key'),
+  supplyPublicKey:
+    PublicKeyDefinitionSchema.optional().describe('Supply public key'),
   alias: z.string().describe('Token alias').optional(),
   network: NetworkSchema.describe('Network on which token exists'),
 });
@@ -53,7 +54,9 @@ export const TOKEN_CREATE_NFT_TEMPLATE = `
 {{#if supplyAccountId}}
    Supply account: {{hashscanLink supplyAccountId "account" network}}
 {{/if}}
+{{#if supplyPublicKey}}
    Supply public key: {{supplyPublicKey}}
+{{/if}}
 {{#if alias}}
    Alias: {{alias}}
 {{/if}}

src/plugins/token/commands/create-nft/types.ts

@@ -21,7 +21,7 @@ export interface TokenCreateNftNormalizedParams {
   keyManager: KeyManagerName;
   treasury: ResolvedAccountCredential;
   admin?: ResolvedPublicKey;
-  supply: ResolvedPublicKey;
+  supply?: ResolvedPublicKey;
   finalMaxSupply?: bigint;
 }
 

src/plugins/token/hooks/batch-create-ft-from-file/types.ts

@@ -5,7 +5,6 @@ import {
   KeySchema,
   MemoSchema,
   NetworkSchema,
-  PrivateKeySchema,
   PrivateKeyWithAccountIdSchema,
   ResolvedAccountCredentialSchema,
   ResolvedPublicKeySchema,
@@ -24,8 +23,8 @@ export const FungibleTokenFileSchema = z.object({
   supplyType: z.union([z.literal('finite'), z.literal('infinite')]),
   initialSupply: TinybarSchema,
   maxSupply: TinybarSchema,
-  treasuryKey: PrivateKeyWithAccountIdSchema,
-  adminKey: PrivateKeySchema,
+  treasuryKey: KeySchema,
+  adminKey: KeySchema,
   supplyKey: KeySchema.optional(),
   wipeKey: KeySchema.optional(),
   kycKey: KeySchema.optional(),