chore: resolve comments

Signed-off-by: nikolay <n.atanasow94@gmail.com>

Author: natanasow

packages/relay/src/lib/decorators/cache.decorator.ts

@@ -45,6 +45,11 @@ const shouldSkipCachingForSingleParams = (args: IArguments, params: CacheSingleP
     if (values.indexOf(args[item.index]) > -1) {
       return true;
     }
+
+    // do not cache optional parameters like 'blockNumber' on 'eth_getStorageAt'
+    if (!args.hasOwnProperty(item.index)) {
+      return true;
+    }
   }
 
   return false;
@@ -71,16 +76,23 @@ const shouldSkipCachingForSingleParams = (args: IArguments, params: CacheSingleP
  *   }]
  */
 const shouldSkipCachingForNamedParams = (args: IArguments, params: CacheNamedParams[] = []): boolean => {
-  for (const item of params) {
-    const input = args[item.index];
-    // @ts-ignore
-    const skipList = Object.assign({}, ...params.filter(el => el.index == item.index)[0].fields.map(el => {
-      return { [el.name]: el.value };
-    }));
+  for (const { index, fields } of params) {
+    const input = args[index];
 
+    // build a map from field names to their match values
+    const skipList: Record<string, string> = Object.fromEntries(
+      fields.map(({ name, value }) => [name, value])
+    );
+
+    // check each field in the skip list
     for (const [key, value] of Object.entries(skipList)) {
-      const values = (value as string).split('|');
-      if (values.indexOf(input[key]) > -1) {
+      // convert "latest|safe" to ["latest", "safe"]
+      const allowedValues = value.split('|');
+      // get the actual value from the input object
+      const actualValue = (input as Record<string, any>)[key];
+
+      // if the actual value is one of the values that should skip caching, return true
+      if (allowedValues.includes(actualValue)) {
         return true;
       }
     }
@@ -132,9 +144,8 @@ const generateCacheKey = (methodName: string, args: IArguments) => {
  * @returns The first found `RequestDetails` instance, or a new one with default values if none is found.
  */
 const extractRequestDetails = (args: IArguments): RequestDetails => {
-  for (const [, value] of Object.entries(args)) {
-    if (value?.constructor?.name == 'RequestDetails') {
-      // @ts-ignore
+  for (const value of Array.from(args)) {
+    if (value instanceof RequestDetails) {
       return value;
     }
   }

packages/relay/src/lib/eth.ts

@@ -122,10 +122,10 @@ export class EthImpl implements Eth {
     this.logger = logger;
     this.common = new CommonService(mirrorNodeClient, logger, cacheService);
     this.filterService = new FilterService(mirrorNodeClient, logger, cacheService, this.common);
-    this.feeService = new FeeService(mirrorNodeClient, this.common, logger, cacheService);
+    this.feeService = new FeeService(mirrorNodeClient, this.common, logger);
     this.contractService = new ContractService(cacheService, this.common, hapiService, logger, mirrorNodeClient);
     this.accountService = new AccountService(cacheService, this.common, logger, mirrorNodeClient);
-    this.blockService = new BlockService(cacheService, chain, this.common, mirrorNodeClient, logger);
+    this.blockService = new BlockService(chain, this.common, mirrorNodeClient, logger);
     this.eventEmitter = eventEmitter;
     this.transactionService = new TransactionService(
       cacheService,

packages/relay/src/lib/services/ethService/blockService/BlockService.ts

@@ -18,11 +18,6 @@ import { IBlockService, ICommonService } from '../../index';
 import { CommonService } from '../ethCommonService/CommonService';
 
 export class BlockService implements IBlockService {
-  /**
-   * The cache service used for caching all responses.
-   * @private
-   */
-  private readonly cacheService: CacheService;
 
   /**
    * The chain id.
@@ -53,25 +48,13 @@ export class BlockService implements IBlockService {
    */
   private readonly mirrorNodeClient: MirrorNodeClient;
 
-  /**
-   * The static method for the eth_getBlockByHash RPC call.
-   */
-  private static ethGetBlockByHash = 'eth_GetBlockByHash';
-
-  /**
-   * The static method for the eth_getBlockByNumber RPC call.
-   */
-  private static ethGetBlockByNumber = 'eth_GetBlockByNumber';
-
   /** Constructor */
   constructor(
-    cacheService: CacheService,
     chain: string,
     common: ICommonService,
     mirrorNodeClient: MirrorNodeClient,
     logger: Logger,
   ) {
-    this.cacheService = cacheService;
     this.chain = chain;
     this.common = common;
     this.mirrorNodeClient = mirrorNodeClient;

packages/relay/src/lib/services/ethService/ethCommonService/CommonService.ts

@@ -62,18 +62,6 @@ export class CommonService implements ICommonService {
   public static readonly isDevMode = ConfigService.get('DEV_MODE');
   public static readonly latestBlockNumber = 'getLatestBlockNumber';
 
-  /**
-   * private constants
-   * @private
-   */
-  private readonly ethBlockNumberCacheTtlMs = parseNumericEnvVar(
-    'ETH_BLOCK_NUMBER_CACHE_TTL_MS',
-    'ETH_BLOCK_NUMBER_CACHE_TTL_MS_DEFAULT',
-  );
-  private readonly ethGasPriceCacheTtlMs = parseNumericEnvVar(
-    'ETH_GET_GAS_PRICE_CACHE_TTL_MS',
-    'ETH_GET_GAS_PRICE_CACHE_TTL_MS_DEFAULT',
-  );
   private readonly maxBlockRange = parseNumericEnvVar('MAX_BLOCK_RANGE', 'MAX_BLOCK_RANGE');
   private readonly maxTimestampParamRange = 604800; // 7 days
 

packages/relay/src/lib/services/ethService/feeService/FeeService.ts

@@ -35,13 +35,6 @@ export class FeeService implements IFeeService {
    */
   private readonly logger: Logger;
 
-  /**
-   * The service used for caching items from requests.
-   *
-   * @private
-   */
-  private readonly cacheService: CacheService;
-
   /**
    * Constructor
    *
@@ -50,11 +43,10 @@ export class FeeService implements IFeeService {
    * @param logger
    * @param cacheService
    */
-  constructor(mirrorNodeClient: MirrorNodeClient, common: ICommonService, logger: Logger, cacheService: CacheService) {
+  constructor(mirrorNodeClient: MirrorNodeClient, common: ICommonService, logger: Logger) {
     this.mirrorNodeClient = mirrorNodeClient;
     this.common = common;
     this.logger = logger;
-    this.cacheService = cacheService;
   }
 
   /**

packages/relay/tests/lib/ethGetBlockBy.spec.ts

@@ -141,7 +141,7 @@ describe('eth_getBlockBy', async function () {
     // @ts-ignore
     ethImpl = new EthImpl(hapiServiceInstance, mirrorNodeInstance, logger, '0x12a', cacheService, eventEmitter);
     const common = new CommonService(mirrorNodeInstance, logger, cacheService);
-    blockService = new BlockService(cacheService, '0x12a', common, mirrorNodeInstance, logger);
+    blockService = new BlockService('0x12a', common, mirrorNodeInstance, logger);
   });
 
   this.beforeEach(async () => {