refactors validator service

Signed-off-by: Konstantina Blazhukova <[email protected]>

Author: konstantinabl

packages/relay/src/lib/debug.ts

@@ -105,9 +105,8 @@ export class DebugImpl implements Debug {
    */
   @rpcMethod
   @rpcParamValidationRules({
-    0: { type: ['transactionHash'], required: true },
-    1: { type: ['tracerType', 'tracerConfig', 'tracerConfigWrapper'], required: false },
-    2: { type: 'tracerConfig', required: false },
+    0: { type: 'transactionHash', required: true },
+    1: { type: 'tracerConfigWrapper', required: true },
   })
   @rpcParamLayoutConfig(RPC_LAYOUT.custom((params) => [params[0], params[1]]))
   @cache(CacheService.getInstance(CACHE_LEVEL.L1))

packages/relay/src/lib/eth.ts

@@ -34,7 +34,6 @@ import {
   ITransactionReceipt,
   RequestDetails,
 } from './types';
-import { ParamType } from './types/validation';
 import { rpcParamValidationRules } from './validators';
 
 /**

packages/relay/src/lib/validators/objectTypes.ts

@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
+import { TracerType } from '../constants';
 import { predefined } from '../errors/JsonRpcError';
 import { validateObject } from './utils';
 
@@ -220,7 +221,7 @@ export function validateSchema(schema: IObjectSchema, object: any) {
   return validateObject(object, schema);
 }
 
-export function validateEthSubscribeLogsParamObject(param: any): asserts param is { address: string } {
+export function validateEthSubscribeLogsParamObject(param: any): boolean {
   const schema = OBJECTS_VALIDATIONS.ethSubscribeLogsParams;
   const valid = validateSchema(schema, param);
   // Check if the address is an array and has a length of 0
@@ -229,5 +230,40 @@ export function validateEthSubscribeLogsParamObject(param: any): asserts param i
     throw predefined.MISSING_REQUIRED_PARAMETER(`'address' for ${schema.name}`);
   }
 
-  // return valid;
+  return valid;
+}
+
+export function validateTracerConfigWrapper(param: any): boolean {
+  const schema = OBJECTS_VALIDATIONS.tracerConfigWrapper;
+  const valid = validateSchema(schema, param);
+  const { tracer, tracerConfig } = param;
+
+  if (!tracerConfig) {
+    return valid;
+  }
+
+  const callTracerKeys = Object.keys(OBJECTS_VALIDATIONS.callTracerConfig.properties);
+  const opcodeLoggerKeys = Object.keys(OBJECTS_VALIDATIONS.opcodeLoggerConfig.properties);
+
+  const configKeys = Object.keys(tracerConfig);
+  const hasCallTracerKeys = configKeys.some((k) => callTracerKeys.includes(k));
+  const hasOpcodeLoggerKeys = configKeys.some((k) => opcodeLoggerKeys.includes(k));
+
+  // we want to accept ICallTracerConfig only if the tracer is callTracer
+  // this config is not valid for opcodeLogger and vice versa
+  // accept only IOpcodeLoggerConfig with opcodeLogger tracer
+  if (hasCallTracerKeys && tracer === TracerType.OpcodeLogger) {
+    throw predefined.INVALID_PARAMETER(
+      1,
+      `callTracer 'tracerConfig' for ${schema.name} is only valid when tracer=${TracerType.CallTracer}`,
+    );
+  }
+
+  if (hasOpcodeLoggerKeys && tracer !== TracerType.OpcodeLogger) {
+    throw predefined.INVALID_PARAMETER(
+      1,
+      `opcodeLogger 'tracerConfig' for ${schema.name} is only valid when tracer=${TracerType.OpcodeLogger}`,
+    );
+  }
+  return valid;
 }

packages/ws-server/src/utils/validators.ts

@@ -6,6 +6,11 @@ import constants from '@hashgraph/json-rpc-relay/dist/lib/constants';
 import { RequestDetails } from '@hashgraph/json-rpc-relay/dist/lib/types';
 import { validateEthSubscribeLogsParamObject } from '@hashgraph/json-rpc-relay/dist/lib/validators';
 
+interface EthSubscribeLogsParams {
+  address?: string | string[];
+  topics?: any[];
+}
+
 /**
  * Validates whether the provided address corresponds to a contract or token type.
  * Throws an error if the address is not a valid contract or token type or does not exist.
@@ -43,7 +48,7 @@ const validateIsContractOrTokenAddress = async (
  * @param {RequestDetails} requestDetails - The request details for logging and tracking.
  */
 export const validateSubscribeEthLogsParams = async (
-  filters: unknown,
+  filters: EthSubscribeLogsParams,
   mirrorNodeClient: MirrorNodeClient,
   requestDetails: RequestDetails,
 ) => {