Refactor: finish correcting linter errors

Author: andraz maier

src/entity/utxo-entity-definitions.ts

@@ -15,7 +15,7 @@ import {
 } from 'typeorm';
 import { ApiDBBlock } from '../dtos/indexer/ApiDbBlock.dto';
 import { ApiDBTransaction } from '../dtos/indexer/ApiDbTransaction.dto';
-import { ApiDBVersion, IndexerVersion } from '../dtos/indexer/ApiDbVersion.dto';
+import { IndexerVersion } from '../dtos/indexer/ApiDbVersion.dto';
 import {
   BlockResult,
   TransactionResult,

src/entity/xrp-entity-definitions.ts

@@ -4,11 +4,11 @@ import { ChainType, IXrpGetTransactionRes } from '@flarenetwork/mcc';
 import { Column, Entity, PrimaryColumn } from 'typeorm';
 import { ApiDBBlock } from '../dtos/indexer/ApiDbBlock.dto';
 import { ApiDBTransaction } from '../dtos/indexer/ApiDbTransaction.dto';
+import { IndexerVersion } from '../dtos/indexer/ApiDbVersion.dto';
 import {
   BlockResult,
   TransactionResult,
 } from '../indexed-query-manager/indexed-query-manager-types';
-import { ApiDBVersion, IndexerVersion } from '../dtos/indexer/ApiDbVersion.dto';
 
 @Entity('blocks')
 export class DBXrpIndexerBlock {

src/external-libs/AttestationDefinitionStore.ts

@@ -6,7 +6,6 @@ import {
 } from '../dtos/attestation-types/AttestationTypeBase.dto';
 import { ABIDefinitions, TypeRecord } from './config-types';
 import {
-  ABIFragment,
   decodeAttestationName,
   DEFAULT_ATTESTATION_TYPE_CONFIGS_PATH,
   readAttestationTypeConfigs,
@@ -165,15 +164,15 @@ export class AttestationDefinitionStore {
       throw new Error(`Invalid request ABI`);
     }
     const requestBodyAbi = definition.requestAbi.components.find(
-      (item: ABIFragment) => item.name == 'requestBody',
-    ) as ABIFragment;
+      (item: ParamType) => item.name == 'requestBody',
+    ) as ParamType;
     if (!requestBodyAbi) {
       throw new Error(
         `Invalid request ABI for attestation type id: '${request.attestationType}'. No 'requestBody'.`,
       );
     }
     const abiEncodeBody = this.coder.encode(
-      [requestBodyAbi as unknown as ParamType],
+      [requestBodyAbi],
       [request.requestBody],
     );
     return ethers.concat([abiEncodePrefix, abiEncodeBody]);
@@ -218,15 +217,15 @@ export class AttestationDefinitionStore {
       throw new Error(`Invalid request ABI`);
     }
     const requestBodyAbi = definition.requestAbi?.components.find(
-      (item: ABIFragment) => item.name == 'requestBody',
-    ) as ABIFragment;
+      (item: ParamType) => item.name == 'requestBody',
+    ) as ParamType;
     if (!requestBodyAbi) {
       throw new Error(
         `Invalid request ABI for attestation type id: '${prefix.attestationType}'. No 'requestBody'.`,
       );
     }
     const parsed: unknown = this.coder.decode(
-      [requestBodyAbi as unknown as ParamType],
+      [requestBodyAbi],
       '0x' + bytes.slice(2 + 3 * 64),
     )[0];
     return serializeBigInts({
@@ -255,9 +254,9 @@ export class AttestationDefinitionStore {
     }
     const attestationType = decodeAttestationName(request1.attestationType);
 
-    const requestAbi: ABIFragment = this.getDefinitionForDecodedAttestationType(
+    const requestAbi: ParamType = this.getDefinitionForDecodedAttestationType(
       attestationType,
-    )?.requestAbi as ABIFragment;
+    )?.requestAbi as ParamType;
     if (!requestAbi) {
       throw new Error(`Unsupported attestation type id: '${attestationType}'`);
     }

src/external-libs/utils.ts

@@ -1,18 +1,8 @@
-import { ethers } from 'ethers';
-import { existsSync, readFileSync, readdirSync, statSync } from 'fs';
+import { ethers, ParamType } from 'ethers';
+import { existsSync, readdirSync, readFileSync, statSync } from 'fs';
 import * as path from 'path';
 import { TypeRecord } from './config-types';
 
-/**
- * ABIFragment is a subset of ethers ABIFragment. It is used to define the ABI fragments
- */
-export interface ABIFragment {
-  components?: ABIFragment[];
-  internalType: string;
-  name: string;
-  type: string;
-}
-
 export const DEFAULT_ATTESTATION_TYPE_CONFIGS_PATH = path.resolve(
   findPackageRoot(__dirname),
   'src/src/config/type-definitions',
@@ -151,7 +141,7 @@ export function decodeAttestationName(encoded: string) {
  */
 export function remapABIParsedToObjects(
   decoded: unknown,
-  abi: ABIFragment,
+  abi: ParamType,
   ignoreArray = false,
 ): unknown {
   if (abi.type == 'tuple' || (abi.type == 'tuple[]' && ignoreArray)) {
@@ -200,7 +190,7 @@ export function remapABIParsedToObjects(
 export function structsDeepEqual(
   struct1: unknown,
   struct2: unknown,
-  abi: ABIFragment,
+  abi: ParamType,
 ): boolean {
   if (Object.keys(struct1).length !== Object.keys(struct2).length) {
     return false;

src/services/common/base-indexer-engine-service.ts

@@ -1,9 +1,9 @@
 import { readFile } from 'fs/promises';
 import { join } from 'path';
-import { ApiDBVersion, Version } from '../../dtos/indexer/ApiDbVersion.dto';
 import { ApiDBBlock } from '../../dtos/indexer/ApiDbBlock.dto';
 import { ApiDBState } from '../../dtos/indexer/ApiDbState.dto';
 import { ApiDBTransaction } from '../../dtos/indexer/ApiDbTransaction.dto';
+import { ApiDBVersion, Version } from '../../dtos/indexer/ApiDbVersion.dto';
 import { BlockRange } from '../../dtos/indexer/BlockRange.dto';
 import { QueryBlock } from '../../dtos/indexer/QueryBlock.dto';
 import { QueryTransaction } from '../../dtos/indexer/QueryTransaction.dto';
@@ -22,9 +22,13 @@ export abstract class IIndexerEngineService {
   ): Promise<string | null> {
     return readFile(join(__dirname, filePath), 'utf-8')
       .then((data) => data.trim())
-      .catch((error) => {
-        if (error.code === 'ENOENT') {
-          return null;
+      .catch((error: unknown) => {
+        if (
+          typeof error === 'object' &&
+          'code' in error &&
+          error.code === 'ENOENT'
+        ) {
+          return null as string;
         }
         throw error;
       });

src/services/indexer-services/utxo-indexer.service.ts

@@ -1,6 +1,5 @@
 import { ChainType, unPrefix0x } from '@flarenetwork/mcc';
 import { Injectable } from '@nestjs/common';
-import { Version } from '../../dtos/indexer/ApiDbVersion.dto';
 
 import { EntityManager, SelectQueryBuilder } from 'typeorm';
 

src/services/indexer-services/xrp-indexer.service.ts

@@ -1,13 +1,12 @@
 import { unPrefix0x } from '@flarenetwork/mcc';
 import { Injectable } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
-import { ApiDBVersion } from '../../dtos/indexer/ApiDbVersion.dto';
 import { EntityManager } from 'typeorm';
 import { IConfig, VerifierServerConfig } from '../../config/configuration';
 import { ApiDBBlock } from '../../dtos/indexer/ApiDbBlock.dto';
 import { ApiDBState } from '../../dtos/indexer/ApiDbState.dto';
 import { ApiDBTransaction } from '../../dtos/indexer/ApiDbTransaction.dto';
-import { Version } from '../../dtos/indexer/ApiDbVersion.dto';
+import { ApiDBVersion } from '../../dtos/indexer/ApiDbVersion.dto';
 import { QueryBlock } from '../../dtos/indexer/QueryBlock.dto';
 import { QueryTransaction } from '../../dtos/indexer/QueryTransaction.dto';
 import {
@@ -87,8 +86,8 @@ export class XrpExternalIndexerEngineService extends IIndexerEngineService {
       throw new Error('No versions state found in the indexer database');
     }
 
-    const nodeVersion = resVersion.toNodeVersion()
-    const indexerVersion = resVersion.toIndexerVersion()
+    const nodeVersion = resVersion.toNodeVersion();
+    const indexerVersion = resVersion.toIndexerVersion();
     const apiServerVersion = await this.getServiceVersion();
 
     return {