use events index instead of logs (#1514)

bogdan-rosianu · cfaur09 · web-flow · commit 70ffe7e4a0de · 2025-08-13T14:21:50.000+03:00
* use events index instead of logs * configurable migrated indices * added protection for empty fields * fix log address * add transaction get unit tests (#1525) --------- Co-authored-by: cfaur09 <catalinfaurpaul@gmail.com> Co-authored-by: Catalin Faur <52102171+cfaur09@users.noreply.github.com>
diff --git a/config/config.devnet.yaml b/config/config.devnet.yaml
@@ -84,6 +84,8 @@ features:
     durationThresholdMs: 5000
     failureCountThreshold: 5
     resetTimeoutMs: 30000
+  elasticMigratedIndices:
+    logs: 'events'
   statusChecker:
     enabled: false
     thresholds:
diff --git a/config/config.e2e.mainnet.yaml b/config/config.e2e.mainnet.yaml
@@ -85,6 +85,8 @@ features:
     durationThresholdMs: 5000
     failureCountThreshold: 5
     resetTimeoutMs: 30000
+  elasticMigratedIndices:
+    logs: 'events'
   statusChecker:
     enabled: false
     thresholds:
diff --git a/config/config.mainnet.yaml b/config/config.mainnet.yaml
@@ -85,6 +85,8 @@ features:
     durationThresholdMs: 5000
     failureCountThreshold: 5
     resetTimeoutMs: 30000
+  elasticMigratedIndices:
+    logs: 'events'
   statusChecker:
     enabled: false
     thresholds:
diff --git a/config/config.testnet.yaml b/config/config.testnet.yaml
@@ -84,6 +84,8 @@ features:
     durationThresholdMs: 5000
     failureCountThreshold: 5
     resetTimeoutMs: 30000
+  elasticMigratedIndices:
+    logs: 'events'
   statusChecker:
     enabled: false
     thresholds:
diff --git a/src/common/api-config/api.config.service.ts b/src/common/api-config/api.config.service.ts
@@ -407,6 +407,10 @@ export class ApiConfigService {
     };
   }
 
+  getElasticMigratedIndicesConfig(): Record<string, string> {
+    return this.configService.get<Record<string, string>>('features.elasticMigratedIndices') ?? {};
+  }
+
   getIsWebsocketApiActive(): boolean {
     return this.configService.get<boolean>('api.websocket') ?? true;
   }
diff --git a/src/common/indexer/elastic/elastic.indexer.service.ts b/src/common/indexer/elastic/elastic.indexer.service.ts
@@ -591,17 +591,17 @@ export class ElasticIndexerService implements IndexerInterface {
     return query;
   }
 
-  async getTransactionLogs(hashes: string[]): Promise<any[]> {
+  async getTransactionLogs(hashes: string[], eventsIndex: string, txHashField: string): Promise<any[]> {
     const queries = [];
     for (const hash of hashes) {
-      queries.push(QueryType.Match('_id', hash));
+      queries.push(QueryType.Match(txHashField, hash));
     }
 
     const elasticQueryLogs = ElasticQuery.create()
       .withPagination({ from: 0, size: 10000 })
       .withCondition(QueryConditionOptions.should, queries);
 
-    return await this.elasticService.getList('logs', 'id', elasticQueryLogs);
+    return await this.elasticService.getList(eventsIndex, 'id', elasticQueryLogs);
   }
 
   async getTransactionScResults(txHash: string): Promise<any[]> {
diff --git a/src/common/indexer/entities/index.ts b/src/common/indexer/entities/index.ts
@@ -12,5 +12,5 @@ export { Tag } from './tag';
 export { Token } from './token';
 export { TokenAccount, TokenType } from './token.account';
 export { Transaction } from './transaction';
-export { TransactionLog, TransactionLogEvent } from './transaction.log';
+export { TransactionLog, TransactionLogEvent, ElasticTransactionLogEvent } from './transaction.log';
 export { TransactionReceipt } from './transaction.receipt';
diff --git a/src/common/indexer/entities/transaction.log.ts b/src/common/indexer/entities/transaction.log.ts
@@ -13,3 +13,15 @@ export interface TransactionLogEvent {
   data?: string;
   order: number;
 }
+
+export interface ElasticTransactionLogEvent {
+  address: string;
+  identifier: string;
+  topics: string[];
+  data?: string;
+  order: number;
+  txHash: string;
+  originalTxHash: string;
+  logAddress: string;
+  additionalData?: string[];
+}
diff --git a/src/common/indexer/indexer.interface.ts b/src/common/indexer/indexer.interface.ts
@@ -12,7 +12,7 @@ import { TokenWithRolesFilter } from "src/endpoints/tokens/entities/token.with.r
 import { TransactionFilter } from "src/endpoints/transactions/entities/transaction.filter";
 import { TokenAssets } from "../assets/entities/token.assets";
 import { QueryPagination } from "../entities/query.pagination";
-import { Account, AccountHistory, AccountTokenHistory, Block, Collection, MiniBlock, Operation, Round, ScDeploy, ScResult, Tag, Token, TokenAccount, Transaction, TransactionLog, TransactionReceipt } from "./entities";
+import { Account, AccountHistory, AccountTokenHistory, Block, Collection, MiniBlock, Operation, Round, ScDeploy, ScResult, Tag, Token, TokenAccount, Transaction, ElasticTransactionLogEvent, TransactionReceipt } from "./entities";
 import { AccountAssets } from "../assets/entities/account.assets";
 import { ProviderDelegators } from "./entities/provider.delegators";
 import { ApplicationFilter } from "src/endpoints/applications/entities/application.filter";
@@ -134,7 +134,7 @@ export interface IndexerInterface {
 
   getTokensForAddress(address: string, queryPagination: QueryPagination, filter: TokenFilter): Promise<Token[]>
 
-  getTransactionLogs(hashes: string[]): Promise<TransactionLog[]>
+  getTransactionLogs(hashes: string[], eventsIndex: string, txHashField: string): Promise<ElasticTransactionLogEvent[]>
 
   getTransactionScResults(txHash: string): Promise<ScResult[]>
 
diff --git a/src/common/indexer/indexer.service.ts b/src/common/indexer/indexer.service.ts
@@ -11,7 +11,7 @@ import { TransactionFilter } from "src/endpoints/transactions/entities/transacti
 import { MetricsEvents } from "src/utils/metrics-events.constants";
 import { TokenAssets } from "../assets/entities/token.assets";
 import { QueryPagination } from "../entities/query.pagination";
-import { Account, AccountHistory, AccountTokenHistory, Block, Collection, MiniBlock, Operation, Round, ScDeploy, ScResult, Tag, Token, TokenAccount, Transaction, TransactionLog, TransactionReceipt } from "./entities";
+import { Account, AccountHistory, AccountTokenHistory, Block, Collection, MiniBlock, Operation, Round, ScDeploy, ScResult, Tag, Token, TokenAccount, Transaction, ElasticTransactionLogEvent, TransactionReceipt } from "./entities";
 import { IndexerInterface } from "./indexer.interface";
 import { LogPerformanceAsync } from "src/utils/log.performance.decorator";
 import { AccountQueryOptions } from "src/endpoints/accounts/entities/account.query.options";
@@ -302,8 +302,8 @@ export class IndexerService implements IndexerInterface {
   }
 
   @LogPerformanceAsync(MetricsEvents.SetIndexerDuration)
-  async getTransactionLogs(hashes: string[]): Promise<TransactionLog[]> {
-    return await this.indexerInterface.getTransactionLogs(hashes);
+  async getTransactionLogs(hashes: string[], eventsIndex: string, txHashField: string): Promise<ElasticTransactionLogEvent[]> {
+    return await this.indexerInterface.getTransactionLogs(hashes, eventsIndex, txHashField);
   }
 
   @LogPerformanceAsync(MetricsEvents.SetIndexerDuration)
diff --git a/src/endpoints/transactions/entities/transaction.log.event.ts b/src/endpoints/transactions/entities/transaction.log.event.ts
@@ -21,6 +21,9 @@ export class TransactionLogEvent {
   @ApiProperty()
   data: string = '';
 
+  @ApiProperty()
+  order: number = 0;
+
   @ApiProperty()
   additionalData: string[] | undefined = undefined;
 }
diff --git a/src/endpoints/transactions/transaction.get.service.ts b/src/endpoints/transactions/transaction.get.service.ts
@@ -20,6 +20,7 @@ import { TransactionOperationType } from "./entities/transaction.operation.type"
 import { QueryPagination } from "src/common/entities/query.pagination";
 import { NftFilter } from "../nfts/entities/nft.filter";
 import { TokenAccount } from "src/common/indexer/entities";
+import { ApiConfigService } from "../../common/api-config/api.config.service";
 
 @Injectable()
 export class TransactionGetService {
@@ -30,6 +31,7 @@ export class TransactionGetService {
     private readonly gatewayService: GatewayService,
     @Inject(forwardRef(() => TokenTransferService))
     private readonly tokenTransferService: TokenTransferService,
+    private readonly apiConfigService: ApiConfigService,
   ) { }
 
   private async tryGetTransactionFromElasticBySenderAndNonce(sender: string, nonce: number): Promise<TransactionDetailed | undefined> {
@@ -51,8 +53,49 @@ export class TransactionGetService {
     return result.map(x => ApiUtils.mergeObjects(new TransactionLog(), x));
   }
 
-  private async getTransactionLogsFromElasticInternal(hashes: string[]): Promise<any[]> {
-    return await this.indexerService.getTransactionLogs(hashes);
+  private async getTransactionLogsFromElasticInternal(hashes: string[]) {
+    const esMigratedIndices = this.apiConfigService.getElasticMigratedIndicesConfig();
+    const index = esMigratedIndices?.['logs'] ?? 'logs';
+    if (index === 'events') {
+      return await this.getTransactionLogsFromElasticInternalEventsIndex(hashes);
+    }
+
+    return await this.getTransactionLogsFromElasticInternalLogsIndex(hashes);
+  }
+
+  private async getTransactionLogsFromElasticInternalLogsIndex(hashes: string[]): Promise<any[]> {
+    return await this.indexerService.getTransactionLogs(hashes, 'logs', '_id');
+  }
+
+  private async getTransactionLogsFromElasticInternalEventsIndex(hashes: string[]): Promise<any[]> {
+    const rawHits = await this.indexerService.getTransactionLogs(hashes, 'events', 'txHash');
+
+    const logsMap: Map<string, TransactionLog> = new Map();
+
+    for (const source of rawHits) {
+      const txHash = source.txHash;
+
+      if (!logsMap.has(txHash)) {
+        logsMap.set(txHash, new TransactionLog({
+          id: txHash,
+          address: source.logAddress,
+          events: [],
+        }));
+      }
+
+      const event = {
+        identifier: source.identifier,
+        address: source.address,
+        data: source.data && source.data.length > 0 ? BinaryUtils.hexToBase64(source.data ?? '') : source.data,
+        additionalData: source.additionalData?.map(d => d && d.length > 0 ? BinaryUtils.hexToBase64(d) : d),
+        topics: source.topics?.map(t => t && t.length > 0 ? BinaryUtils.hexToBase64(t) : t),
+        order: source.order ?? 0,
+      };
+
+      logsMap.get(txHash)?.events.push(ApiUtils.mergeObjects(new TransactionLogEvent(), event));
+    }
+
+    return Array.from(logsMap.values());
   }
 
   async getTransactionScResultsFromElastic(txHash: string): Promise<SmartContractResult[]> {
diff --git a/src/test/unit/services/transaction.get.spec.ts b/src/test/unit/services/transaction.get.spec.ts

Original file line number	Diff line number	Diff line change
`@@ -407,6 +407,10 @@ export class ApiConfigService {`
`407`	`407`	`};`
`408`	`408`	`}`
`409`	`409`
	`410`	`+ getElasticMigratedIndicesConfig(): Record<string, string> {`
	`411`	`+ return this.configService.get<Record<string, string>>('features.elasticMigratedIndices') ?? {};`
	`412`	`+ }`
	`413`	`+`
`410`	`414`	`getIsWebsocketApiActive(): boolean {`
`411`	`415`	`return this.configService.get<boolean>('api.websocket') ?? true;`
`412`	`416`	`}`
Original file line number	Diff line number	Diff line change
`@@ -591,17 +591,17 @@ export class ElasticIndexerService implements IndexerInterface {`
`591`	`591`	`return query;`
`592`	`592`	`}`
`593`	`593`
`594`		`- async getTransactionLogs(hashes: string[]): Promise<any[]> {`
	`594`	`+ async getTransactionLogs(hashes: string[], eventsIndex: string, txHashField: string): Promise<any[]> {`
`595`	`595`	`const queries = [];`
`596`	`596`	`for (const hash of hashes) {`
`597`		`- queries.push(QueryType.Match('_id', hash));`
	`597`	`+ queries.push(QueryType.Match(txHashField, hash));`
`598`	`598`	`}`
`599`	`599`
`600`	`600`	`const elasticQueryLogs = ElasticQuery.create()`
`601`	`601`	`.withPagination({ from: 0, size: 10000 })`
`602`	`602`	`.withCondition(QueryConditionOptions.should, queries);`
`603`	`603`
`604`		`- return await this.elasticService.getList('logs', 'id', elasticQueryLogs);`
	`604`	`+ return await this.elasticService.getList(eventsIndex, 'id', elasticQueryLogs);`
`605`	`605`	`}`
`606`	`606`
`607`	`607`	`async getTransactionScResults(txHash: string): Promise<any[]> {`