get real caller from ES for events

apps/api/src/endpoints/data-integration/data-integration.service.ts

@@ -4,7 +4,7 @@ import {
   IndexerService, JoinExitEvent, LatestBlockResponse,
   MultiversXApiService, PairResponse, SwapEvent, XExchangeService,
 } from "@mvx-monorepo/common";
-import { OriginLogger } from "@multiversx/sdk-nestjs-common";
+import { AddressUtils, BatchUtils, OriginLogger } from "@multiversx/sdk-nestjs-common";
 import { IProviderService } from "@mvx-monorepo/common/providers/interface";
 import { GeneralEvent } from "@mvx-monorepo/common/providers/entities/general.event";
 import { OneDexService } from "@mvx-monorepo/common/providers";
@@ -83,6 +83,8 @@ export class DataIntegrationService {
       allEvents.push(...event);
     }
 
+    await this.updateEventsCaller(allEvents);
+
     const sortedEvents = allEvents.sort((a, b) => {
       if (a.block.blockTimestamp !== b.block.blockTimestamp) {
         return a.block.blockTimestamp - b.block.blockTimestamp;
@@ -136,4 +138,38 @@ export class DataIntegrationService {
     }
     return events;
   }
+
+  private async updateEventsCaller(events: ({ block: Block } & (SwapEvent | JoinExitEvent))[]) {
+    const filteredEvents = events.filter(event => AddressUtils.isSmartContractAddress(event.maker));
+
+    const txHashes = filteredEvents.map(event => event.txnId);
+
+    const transactions = await this.getTxDetailsInBatches(txHashes, 200);
+
+    const txToCallerMap = new Map<string, string>(
+      transactions.map(transaction => [transaction.txHash, transaction.sender])
+    );
+
+    for (const event of events) {
+      if (AddressUtils.isSmartContractAddress(event.maker)) {
+        const callerFromMap = txToCallerMap.get(event.txnId);
+        if (callerFromMap) {
+          event.maker = callerFromMap;
+        }
+      }
+    }
+  }
+
+  private async getTxDetailsInBatches(txHashes: string[], batchSize: number) {
+    const transactions: any[] = [];
+    const txHashesBatches = BatchUtils.splitArrayIntoChunks(txHashes, batchSize);
+
+    for (const txHashesBatch of txHashesBatches) {
+      const transactionsBatch = await this.indexerService.getTxDetails(txHashesBatch);
+
+      transactions.push(...transactionsBatch);
+    }
+
+    return transactions;
+  }
 }

libs/common/src/providers/onedex/onedex.service.ts

@@ -109,7 +109,7 @@ export class OneDexService implements IProviderService {
   public async getPairsMetadata(): Promise<any[]> {
     return await this.cacheService.getOrSet(
       CacheInfo.OneDexPairsMetadata().key,
-      () => this.getPairsMetadataRaw(),
+      async () => await this.getPairsMetadataRaw(),
       CacheInfo.OneDexPairsMetadata().ttl,
     );
   }

libs/common/src/providers/xexchange/xexchange.service.ts

@@ -80,7 +80,7 @@ export class XExchangeService implements IProviderService {
   public async getPairsMetadata(): Promise<PairMetadata[]> {
     return await this.cacheService.getOrSet(
       CacheInfo.PairsMetadata().key,
-      () => this.getPairsMetadataRaw(),
+      async () => await this.getPairsMetadataRaw(),
       CacheInfo.PairsMetadata().ttl,
     );
   }
@@ -115,7 +115,7 @@ export class XExchangeService implements IProviderService {
   public async getPairFeePercent(pairAddress: string): Promise<number> {
     return await this.cacheService.getOrSet(
       CacheInfo.PairFeePercent(pairAddress).key,
-      () => this.getPairFeePercentRaw(pairAddress),
+      async () => await this.getPairFeePercentRaw(pairAddress),
       CacheInfo.PairFeePercent(pairAddress).ttl,
     );
   }

libs/common/src/services/indexer/indexer.service.ts

@@ -96,4 +96,24 @@ export class IndexerService {
 
     return logs;
   }
+
+  @LogPerformanceAsync(MetricsEvents.SetIndexerDuration)
+  public async getTxDetails(txHashes: string[]) {
+    try {
+      const query = ElasticQuery.create()
+        .withPagination({ from: 0, size: 10000 })
+        .withMustCondition([
+          QueryType.Should(txHashes.map(txHash => new MatchQuery("_id", txHash))),
+        ]);
+
+      const transactions = await this.elasticService.getList('operations', 'txHash', query);
+
+      return transactions;
+    } catch (error) {
+      this.logger.error(`Failed to get txDetails`);
+      this.logger.error(error);
+
+      return [];
+    }
+  }
 }

libs/common/src/services/multiversx.api/multiversx.api.service.ts

@@ -18,7 +18,7 @@ export class MultiversXApiService {
   public async getToken(identifier: string): Promise<Token | null> {
     return await this.cacheService.getOrSet(
       CacheInfo.Token(identifier).key,
-      () => this.getTokenRaw(identifier),
+      async () => await this.getTokenRaw(identifier),
       CacheInfo.Token(identifier).ttl,
     );
   }
@@ -42,7 +42,7 @@ export class MultiversXApiService {
   public async getContractDeployInfo(address: string): Promise<{ deployTxHash?: string, deployedAt?: number }> {
     return await this.cacheService.getOrSet(
       CacheInfo.ContractDeployInfo(address).key,
-      () => this.getContractDeployInfoRaw(address),
+      async () => await this.getContractDeployInfoRaw(address),
       CacheInfo.ContractDeployInfo(address).ttl,
     );
   }