feat(1670): resolved merge conflicts

Signed-off-by: mmyslblocky <michal.myslinski@blockydevs.com>

Author: mmyslblocky

docs/adr/ADR-010-batch-transaction-plugin.md

@@ -360,7 +360,7 @@ export class BatchifyHook extends AbstractHook {
 
   override async preExecuteTransactionHook(
     args: CommandHandlerArgs,
-    params: PreExecuteTransactionParams<..., BatchifyBuildTransactionResult, BatchifySignTransactionResult>,
+    params: PreExecuteTransactionParams<..., BaseBuildTransactionResult, BaseSignTransactionResult>,
     commandName: string,
   ): Promise<HookResult> {
     const batchName = BatchifyInputSchema.parse(args.args).batch;

eslint.config.js

@@ -127,6 +127,14 @@ module.exports = [
     },
   },
 
+  // Type definition files - allow empty object types (used as named aliases for base types)
+  {
+    files: ['**/types.ts'],
+    rules: {
+      '@typescript-eslint/no-empty-object-type': 'off',
+    },
+  },
+
   // Command handlers - allow sync handlers
   {
     files: ['src/plugins/**/commands/**/handler.ts'],

src/core/errors/index.ts

@@ -13,3 +13,7 @@ export { StateError } from './state-error';
 export { TransactionError } from './transaction-error';
 export { TransactionPrecheckError } from './transaction-precheck-error';
 export { ValidationError } from './validation-error';
+export {
+  formatZodIssueLine,
+  formatZodIssuesForMessage,
+} from '@/core/utils/format-zod-issues';

src/core/errors/validation-error.ts

@@ -1,5 +1,10 @@
 import type { ZodError } from 'zod';
 
+import {
+  formatZodIssueLine,
+  formatZodIssuesForMessage,
+} from '@/core/utils/format-zod-issues';
+
 import { CliError } from './cli-error';
 
 export class ValidationError extends CliError {
@@ -21,11 +26,13 @@ export class ValidationError extends CliError {
   }
 
   static fromZod(zodError: ZodError): ValidationError {
-    const issues = zodError.issues.map((i) => i.message);
-    const message = `Validation failed:\n${issues.map((i) => `  - ${i}`).join('\n')}`;
+    const issueLines = zodError.issues.map((issue) =>
+      formatZodIssueLine(issue),
+    );
+    const message = `Validation failed:\n${formatZodIssuesForMessage(zodError)}`;
 
     return new ValidationError(message, {
-      context: { issues },
+      context: { issues: issueLines },
       cause: zodError,
     });
   }

src/core/index.ts

@@ -63,6 +63,11 @@ export {
   SupplyType,
   SupportedNetwork,
 } from './types/shared.types';
+export type {
+  BaseBuildTransactionResult,
+  BaseNormalizedParams,
+  BaseSignTransactionResult,
+} from './types/transaction.types';
 
 // ============================================================================
 // Shared Constants

src/core/schemas/__tests__/unit/common-schemas.test.ts

@@ -142,10 +142,6 @@ describe('ExpirationTimeSchema', () => {
     expect(ExpirationTimeSchema.parse(undefined)).toBeUndefined();
   });
 
-  test('accepts empty string as omitted expiration', () => {
-    expect(ExpirationTimeSchema.parse('')).toBeUndefined();
-  });
-
   test('rejects expiration in the past', () => {
     expect(() =>
       ExpirationTimeSchema.parse('2000-01-01T00:00:00.000Z'),

src/core/services/mirrornode/__tests__/unit/hedera-mirrornode-service.test.ts

@@ -21,10 +21,10 @@ import {
   createMockAccountListItemAPIResponse,
   createMockExchangeRateResponse,
   createMockGetAccountsAPIResponse,
+  createMockMirrorNodeTokenByIdJson,
   createMockNftInfo,
   createMockTokenAirdropsResponse,
   createMockTokenBalancesResponse,
-  createMockTokenInfo,
   createMockTopicInfo,
   createMockTopicMessage,
   createMockTopicMessagesAPIResponse,
@@ -827,10 +827,10 @@ describe('HederaMirrornodeServiceDefaultImpl', () => {
   describe('getTokenInfo', () => {
     it('should fetch token info with correct URL', async () => {
       const { service } = setupService();
-      const mockTokenInfo = createMockTokenInfo();
+      const mockJson = createMockMirrorNodeTokenByIdJson();
       (global.fetch as jest.Mock).mockResolvedValue({
         ok: true,
-        json: jest.fn().mockResolvedValue(mockTokenInfo),
+        json: jest.fn().mockResolvedValue(mockJson),
       });
 
       const result = await service.getTokenInfo(TEST_TOKEN_ID);
@@ -840,6 +840,7 @@ describe('HederaMirrornodeServiceDefaultImpl', () => {
       );
       expect(result.token_id).toBe(TEST_TOKEN_ID);
       expect(result.symbol).toBe('TEST');
+      expect(result.treasury_account_id).toBe('0.0.1234');
     });
 
     it('should throw error on HTTP 404', async () => {

src/core/services/mirrornode/__tests__/unit/mocks.ts

@@ -100,6 +100,9 @@ export const createMockTopicMessagesAPIResponse = (
   ...overrides,
 });
 
+/**
+ * Domain `TokenInfo` after `getTokenInfo` (for mocks that bypass HTTP and return a resolved value).
+ */
 export const createMockTokenInfo = (
   overrides: Partial<TokenInfo> = {},
 ): TokenInfo => ({
@@ -123,6 +126,32 @@ export const createMockTokenInfo = (
   ...overrides,
 });
 
+/**
+ * Raw JSON body for GET /api/v1/tokens/{id} (Mirror Node). Use with `fetch` mocks.
+ */
+export const createMockMirrorNodeTokenByIdJson = (
+  overrides: Record<string, unknown> = {},
+): Record<string, unknown> => ({
+  token_id: '0.0.2000',
+  symbol: 'TEST',
+  name: 'Test Token',
+  decimals: '6',
+  total_supply: '1000000000',
+  max_supply: '1000000000',
+  type: 'NON_FUNGIBLE_UNIQUE',
+  treasury_account_id: '0.0.1234',
+  created_timestamp: '2024-01-01T12:00:00.000Z',
+  deleted: false,
+  freeze_default: false,
+  default_kyc_status: false,
+  auto_renew_period: 7776000,
+  auto_renew_account: '0.0.1234',
+  expiry_timestamp: 1893456000000000000,
+  pause_status: 'UNPAUSED',
+  memo: '',
+  ...overrides,
+});
+
 export const createMockTopicInfo = (
   overrides: Partial<TopicInfo> = {},
 ): TopicInfo => ({

src/core/services/mirrornode/hedera-mirrornode-service.ts

@@ -26,10 +26,17 @@ import type {
   TransactionDetailsResponse,
 } from './types';
 
-import { ConfigurationError, NetworkError, NotFoundError } from '@/core/errors';
+import {
+  CliError,
+  ConfigurationError,
+  NetworkError,
+  NotFoundError,
+} from '@/core/errors';
 import { KeyAlgorithm } from '@/core/shared/constants';
+import { parseWithSchema } from '@/core/shared/validation/parse-with-schema.zod';
 import { handleMirrorNodeErrorResponse } from '@/core/utils/handle-mirror-node-error-response';
 
+import { TokenInfoSchema } from './schema';
 import { NetworkToBaseUrl } from './types';
 
 export class HederaMirrornodeServiceDefaultImpl implements HederaMirrornodeService {
@@ -324,10 +331,13 @@ export class HederaMirrornodeServiceDefaultImpl implements HederaMirrornodeServi
         );
       }
 
-      return (await response.json()) as TokenInfo;
+      return parseWithSchema(
+        TokenInfoSchema,
+        await response.json(),
+        `Mirror Node GET /tokens/${tokenId}`,
+      );
     } catch (error) {
-      if (error instanceof NotFoundError || error instanceof NetworkError)
-        throw error;
+      if (error instanceof CliError) throw error;
       throw new NetworkError(`Failed to fetch token info for ${tokenId}`, {
         cause: error,
         recoverable: true,

src/core/services/mirrornode/schema.ts

@@ -0,0 +1,38 @@
+import type { TokenInfo } from './types';
+
+import { z } from 'zod';
+
+const mirrorKeyObject = z.object({
+  _type: z.string(),
+  key: z.string(),
+});
+
+const optionalKeyRef = z.union([mirrorKeyObject, z.null()]).optional();
+
+export const TokenInfoSchema: z.ZodType<TokenInfo> = z.object({
+  token_id: z.string(),
+  symbol: z.string(),
+  name: z.string(),
+  decimals: z.string(),
+  total_supply: z.string(),
+  max_supply: z.string(),
+  type: z.string(),
+  treasury_account_id: z.string(),
+  admin_key: optionalKeyRef,
+  kyc_key: optionalKeyRef,
+  freeze_key: optionalKeyRef,
+  wipe_key: optionalKeyRef,
+  supply_key: optionalKeyRef,
+  fee_schedule_key: optionalKeyRef,
+  metadata_key: optionalKeyRef,
+  pause_key: optionalKeyRef,
+  created_timestamp: z.string(),
+  deleted: z.boolean().nullable().optional(),
+  freeze_default: z.boolean().optional(),
+  default_kyc_status: z.boolean(),
+  auto_renew_account: z.string(),
+  auto_renew_period: z.number(),
+  expiry_timestamp: z.number(),
+  pause_status: z.string(),
+  memo: z.string(),
+});