remove support for indexer v 3

config/config.devnet-old.yaml

@@ -22,7 +22,6 @@ flags:
   useRequestLogging: false
   useVmQueryTracing: false
   processNfts: true
-  indexer-v3: true
   collectionPropertiesFromGateway: false
 features:
   eventsNotifier:

config/config.devnet.yaml

@@ -18,7 +18,6 @@ flags:
   useRequestLogging: false
   useVmQueryTracing: false
   processNfts: true
-  indexer-v3: true
   collectionPropertiesFromGateway: false
 features:
   eventsNotifier:
@@ -165,4 +164,4 @@ inflation:
   - 719203
 nftProcess:
   parallelism: 1
-  maxRetries: 3
+  maxRetries: 3

config/config.e2e-mocked.mainnet.yaml

@@ -21,7 +21,6 @@ flags:
   useRequestCaching: true
   useKeepAliveAgent: true
   useTracing: false
-  indexer-v3: true
   collectionPropertiesFromGateway: false
 urls:
   self: 'https://api.multiversx.com'

config/config.e2e.mainnet.yaml

@@ -24,7 +24,6 @@ flags:
   useRequestCaching: true
   useKeepAliveAgent: true
   useTracing: false
-  indexer-v3: true
   collectionPropertiesFromGateway: false
 urls:
   self: 'https://api.multiversx.com'

config/config.mainnet.yaml

@@ -18,7 +18,6 @@ flags:
   useRequestLogging: false
   useVmQueryTracing: false
   processNfts: true
-  indexer-v3: false
   collectionPropertiesFromGateway: false
 features:
   eventsNotifier:
@@ -169,4 +168,4 @@ inflation:
   - 719203
 nftProcess:
   parallelism: 1
-  maxRetries: 3
+  maxRetries: 3

config/config.testnet.yaml

@@ -18,7 +18,6 @@ flags:
   useRequestLogging: false
   useVmQueryTracing: false
   processNfts: true
-  indexer-v3: true
   collectionPropertiesFromGateway: false
 features:
   eventsNotifier:

src/common/api-config/api.config.service.ts

@@ -367,10 +367,6 @@ export class ApiConfigService {
     return this.configService.get<boolean>('features.processNfts.enabled') ?? this.configService.get<boolean>('flags.processNfts') ?? false;
   }
 
-  getIsIndexerV3FlagActive(): boolean {
-    return this.configService.get<boolean>('flags.indexer-v3') ?? false;
-  }
-
   isGraphQlActive(): boolean {
     return this.configService.get<boolean>('api.graphql') ?? false;
   }

src/common/indexer/elastic/elastic.indexer.helper.ts

@@ -83,51 +83,45 @@ export class ElasticIndexerHelper {
       .withMustMultiShouldCondition(Object.values(NftType), type => QueryType.Match('type', type));
 
     if (address) {
-      if (this.apiConfigService.getIsIndexerV3FlagActive()) {
-        elasticQuery = elasticQuery.withMustCondition(QueryType.Should(
-          [
-            QueryType.Match('currentOwner', address),
-            QueryType.Nested('roles', [new MatchQuery('roles.ESDTRoleNFTCreate', address)]),
-            QueryType.Nested('roles', [new MatchQuery('roles.ESDTRoleNFTBurn', address)]),
-            QueryType.Nested('roles', [new MatchQuery('roles.ESDTRoleNFTAddQuantity', address)]),
-            QueryType.Nested('roles', [new MatchQuery('roles.ESDTRoleNFTUpdateAttributes', address)]),
-            QueryType.Nested('roles', [new MatchQuery('roles.ESDTRoleNFTAddURI', address)]),
-            QueryType.Nested('roles', [new MatchQuery('roles.ESDTTransferRole', address)]),
-          ]
-        ));
-      } else {
-        elasticQuery = elasticQuery.withMustCondition(QueryType.Match('currentOwner', address));
-      }
+      elasticQuery = elasticQuery.withMustCondition(QueryType.Should(
+        [
+          QueryType.Match('currentOwner', address),
+          QueryType.Nested('roles', [new MatchQuery('roles.ESDTRoleNFTCreate', address)]),
+          QueryType.Nested('roles', [new MatchQuery('roles.ESDTRoleNFTBurn', address)]),
+          QueryType.Nested('roles', [new MatchQuery('roles.ESDTRoleNFTAddQuantity', address)]),
+          QueryType.Nested('roles', [new MatchQuery('roles.ESDTRoleNFTUpdateAttributes', address)]),
+          QueryType.Nested('roles', [new MatchQuery('roles.ESDTRoleNFTAddURI', address)]),
+          QueryType.Nested('roles', [new MatchQuery('roles.ESDTTransferRole', address)]),
+        ]
+      ));
     }
 
     if (filter.before || filter.after) {
       elasticQuery = elasticQuery.withDateRangeFilter('timestamp', filter.before, filter.after);
     }
 
-    if (this.apiConfigService.getIsIndexerV3FlagActive()) {
-      if (filter.canCreate !== undefined) {
-        elasticQuery = this.getRoleCondition(elasticQuery, 'ESDTRoleNFTCreate', address, filter.canCreate);
-      }
+    if (filter.canCreate !== undefined) {
+      elasticQuery = this.getRoleCondition(elasticQuery, 'ESDTRoleNFTCreate', address, filter.canCreate);
+    }
 
-      if (filter.canBurn !== undefined) {
-        elasticQuery = this.getRoleCondition(elasticQuery, 'ESDTRoleNFTBurn', address, filter.canBurn);
-      }
+    if (filter.canBurn !== undefined) {
+      elasticQuery = this.getRoleCondition(elasticQuery, 'ESDTRoleNFTBurn', address, filter.canBurn);
+    }
 
-      if (filter.canAddQuantity !== undefined) {
-        elasticQuery = this.getRoleCondition(elasticQuery, 'ESDTRoleNFTAddQuantity', address, filter.canAddQuantity);
-      }
+    if (filter.canAddQuantity !== undefined) {
+      elasticQuery = this.getRoleCondition(elasticQuery, 'ESDTRoleNFTAddQuantity', address, filter.canAddQuantity);
+    }
 
-      if (filter.canUpdateAttributes !== undefined) {
-        elasticQuery = this.getRoleCondition(elasticQuery, 'ESDTRoleNFTUpdateAttributes', address, filter.canUpdateAttributes);
-      }
+    if (filter.canUpdateAttributes !== undefined) {
+      elasticQuery = this.getRoleCondition(elasticQuery, 'ESDTRoleNFTUpdateAttributes', address, filter.canUpdateAttributes);
+    }
 
-      if (filter.canAddUri !== undefined) {
-        elasticQuery = this.getRoleCondition(elasticQuery, 'ESDTRoleNFTAddURI', address, filter.canAddUri);
-      }
+    if (filter.canAddUri !== undefined) {
+      elasticQuery = this.getRoleCondition(elasticQuery, 'ESDTRoleNFTAddURI', address, filter.canAddUri);
+    }
 
-      if (filter.canTransferRole !== undefined) {
-        elasticQuery = this.getRoleCondition(elasticQuery, 'ESDTTransferRole', address, filter.canTransferRole);
-      }
+    if (filter.canTransferRole !== undefined) {
+      elasticQuery = this.getRoleCondition(elasticQuery, 'ESDTTransferRole', address, filter.canTransferRole);
     }
 
     if (filter.excludeMetaESDT === true) {
@@ -219,7 +213,7 @@ export class ElasticIndexerHelper {
       elasticQuery = elasticQuery.withMustCondition(QueryType.Should(filter.identifiers.map(identifier => QueryType.Match('identifier', identifier, QueryOperator.AND))));
     }
 
-    if (filter.isWhitelistedStorage !== undefined && this.apiConfigService.getIsIndexerV3FlagActive()) {
+    if (filter.isWhitelistedStorage !== undefined) {
       elasticQuery = elasticQuery.withMustCondition(QueryType.Nested("data", [new MatchQuery("data.whiteListedStorage", filter.isWhitelistedStorage)]));
     }
 
@@ -329,7 +323,7 @@ export class ElasticIndexerHelper {
       elasticQuery = elasticQuery.withMustMultiShouldCondition(filter.tokens, token => QueryType.Match('tokens', token, QueryOperator.AND));
     }
 
-    if (filter.functions && filter.functions.length > 0 && this.apiConfigService.getIsIndexerV3FlagActive()) {
+    if (filter.functions && filter.functions.length > 0) {
       if (filter.functions.length === 1 && filter.functions[0] === '') {
         elasticQuery = elasticQuery.withMustNotExistCondition('function');
       } else {
@@ -459,10 +453,7 @@ export class ElasticIndexerHelper {
     if (address) {
       shouldQueries.push(QueryType.Match('sender', address));
       shouldQueries.push(QueryType.Match('receiver', address));
-
-      if (this.apiConfigService.getIsIndexerV3FlagActive()) {
-        shouldQueries.push(QueryType.Match('receivers', address));
-      }
+      shouldQueries.push(QueryType.Match('receivers', address));
     }
 
     const elasticQuery = ElasticQuery.create()
@@ -484,7 +475,7 @@ export class ElasticIndexerHelper {
       .withMustMultiShouldCondition(filter.tokens, token => QueryType.Match('tokens', token, QueryOperator.AND))
       .withDateRangeFilter('timestamp', filter.before, filter.after);
 
-    if (filter.functions && filter.functions.length > 0 && this.apiConfigService.getIsIndexerV3FlagActive()) {
+    if (filter.functions && filter.functions.length > 0) {
       if (filter.functions.length === 1 && filter.functions[0] === '') {
         elasticQuery = elasticQuery.withMustNotExistCondition('function');
       } else {
@@ -508,10 +499,7 @@ export class ElasticIndexerHelper {
       }
 
       if (filter.receivers) {
-        const keys = ['receiver'];
-        if (this.apiConfigService.getIsIndexerV3FlagActive()) {
-          keys.push('receivers');
-        }
+        const keys = ['receiver', 'receivers'];
 
         for (const receiver of filter.receivers) {
           for (const key of keys) {
@@ -523,11 +511,7 @@ export class ElasticIndexerHelper {
       elasticQuery = elasticQuery.withMustMatchCondition('sender', filter.sender);
 
       if (filter.receivers) {
-        const keys = ['receiver'];
-
-        if (this.apiConfigService.getIsIndexerV3FlagActive()) {
-          keys.push('receivers');
-        }
+        const keys = ['receiver', 'receivers'];
 
         const queries: AbstractQuery[] = [];
 
@@ -542,11 +526,7 @@ export class ElasticIndexerHelper {
     }
 
     if (address) {
-      const keys: string[] = ['sender', 'receiver'];
-
-      if (this.apiConfigService.getIsIndexerV3FlagActive()) {
-        keys.push('receivers');
-      }
+      const keys: string[] = ['sender', 'receiver', 'receivers'];
 
       elasticQuery = elasticQuery.withMustMultiShouldCondition(keys, key => QueryType.Match(key, address));
     }
@@ -655,7 +635,7 @@ export class ElasticIndexerHelper {
       elasticQuery = elasticQuery.withShouldCondition(QueryType.Match('receiver', filter.receiver));
     }
 
-    if (filter.functions && filter.functions.length > 0 && this.apiConfigService.getIsIndexerV3FlagActive()) {
+    if (filter.functions && filter.functions.length > 0) {
       if (filter.functions.length === 1 && filter.functions[0] === '') {
         elasticQuery = elasticQuery.withMustNotExistCondition('function');
       } else {

src/common/indexer/elastic/elastic.indexer.service.ts

@@ -1,6 +1,5 @@
 import { HttpStatus, Injectable } from "@nestjs/common";
 import { BinaryUtils } from "@multiversx/sdk-nestjs-common";
-import { ApiService } from "@multiversx/sdk-nestjs-http";
 import { ElasticService, ElasticQuery, QueryOperator, QueryType, QueryConditionOptions, ElasticSortOrder, ElasticSortProperty, TermsQuery, RangeGreaterThanOrEqual, MatchQuery } from "@multiversx/sdk-nestjs-elastic";
 import { IndexerInterface } from "../indexer.interface";
 import { ApiConfigService } from "src/common/api-config/api.config.service";
@@ -36,7 +35,6 @@ export class ElasticIndexerService implements IndexerInterface {
     private readonly apiConfigService: ApiConfigService,
     private readonly elasticService: ElasticService,
     private readonly indexerHelper: ElasticIndexerHelper,
-    private readonly apiService: ApiService,
   ) { }
 
   async getAccountsCount(filter: AccountQueryOptions): Promise<number> {
@@ -653,17 +651,12 @@ export class ElasticIndexerService implements IndexerInterface {
   }
 
   async getNftsForAddress(address: string, filter: NftFilter, pagination: QueryPagination): Promise<any[]> {
-    let elasticQuery = this.indexerHelper.buildElasticNftFilter(filter, undefined, address)
-      .withPagination(pagination);
-
-    if (this.apiConfigService.getIsIndexerV3FlagActive()) {
-      elasticQuery = elasticQuery.withSort([
+    const elasticQuery = this.indexerHelper.buildElasticNftFilter(filter, undefined, address)
+      .withPagination(pagination)
+      .withSort([
         { name: 'timestamp', order: ElasticSortOrder.descending },
         { name: 'tokenNonce', order: ElasticSortOrder.descending },
       ]);
-    } else {
-      elasticQuery = elasticQuery.withSort([{ name: '_id', order: ElasticSortOrder.ascending }]);
-    }
 
     return await this.elasticService.getList('accountsesdt', 'identifier', elasticQuery);
   }
@@ -760,22 +753,6 @@ export class ElasticIndexerService implements IndexerInterface {
     return undefined;
   }
 
-  private indexerV5Active: boolean | undefined = undefined;
-
-  async isIndexerV5Active(): Promise<boolean> {
-    if (this.indexerV5Active !== undefined) {
-      return this.indexerV5Active;
-    }
-
-    const mappingsResult = await this.apiService.get(`${this.apiConfigService.getElasticUrl()}/tokens/_mappings`);
-    const mappings = mappingsResult.data?.tokens?.mappings?.properties ?? mappingsResult.data['tokens-000001']?.mappings?.properties;
-
-    const currentOwnerType = mappings?.currentOwner?.type;
-
-    this.indexerV5Active = currentOwnerType === 'keyword';
-    return this.indexerV5Active;
-  }
-
   async getCollectionsForAddress(
     address: string,
     filter: CollectionFilter,
@@ -786,8 +763,6 @@ export class ElasticIndexerService implements IndexerInterface {
       types.push(NftType.MetaESDT);
     }
 
-    const isIndexerV5Active = await this.isIndexerV5Active();
-
     const elasticQuery = ElasticQuery.create()
       .withMustExistCondition('identifier')
       .withMustMatchCondition('address', address)
@@ -806,7 +781,7 @@ export class ElasticIndexerService implements IndexerInterface {
                 {
                   collection: {
                     terms: {
-                      field: isIndexerV5Active ? 'token' : 'token.keyword',
+                      field: 'token.keyword',
                     },
                   },
                 },

src/endpoints/accounts/account.controller.ts

@@ -27,7 +27,6 @@ import { AccountHistory } from "./entities/account.history";
 import { AccountEsdtHistory } from "./entities/account.esdt.history";
 import { EsdtDataSource } from '../esdt/entities/esdt.data.source';
 import { TransferService } from '../transfers/transfer.service';
-import { ApiConfigService } from 'src/common/api-config/api.config.service';
 import { Transaction } from '../transactions/entities/transaction';
 import { ProviderStake } from '../stake/entities/provider.stake';
 import { TokenDetailedWithBalance } from '../tokens/entities/token.detailed.with.balance';
@@ -74,7 +73,6 @@ export class AccountController {
     private readonly scResultService: SmartContractResultService,
     private readonly collectionService: CollectionService,
     private readonly transferService: TransferService,
-    private readonly apiConfigService: ApiConfigService,
     private readonly delegationService: DelegationService,
   ) { }
 
@@ -973,10 +971,6 @@ export class AccountController {
     @Query('withOperations', new ParseBoolPipe) withOperations?: boolean,
     @Query('withActionTransferValue', ParseBoolPipe) withActionTransferValue?: boolean,
   ): Promise<Transaction[]> {
-    if (!this.apiConfigService.getIsIndexerV3FlagActive()) {
-      throw new HttpException('Endpoint not live yet', HttpStatus.NOT_IMPLEMENTED);
-    }
-
     const options = TransactionQueryOptions.applyDefaultOptions(
       size, { withScamInfo, withUsername, withBlockInfo, withOperations, withLogs, withActionTransferValue });
 
@@ -1032,10 +1026,6 @@ export class AccountController {
     @Query('after', ParseIntPipe) after?: number,
     @Query('senderOrReceiver', ParseAddressPipe) senderOrReceiver?: string,
   ): Promise<number> {
-    if (!this.apiConfigService.getIsIndexerV3FlagActive()) {
-      throw new HttpException('Endpoint not live yet', HttpStatus.NOT_IMPLEMENTED);
-    }
-
     return await this.transferService.getTransfersCount(new TransactionFilter({
       address,
       senders: sender,
@@ -1070,10 +1060,6 @@ export class AccountController {
     @Query('after', ParseIntPipe) after?: number,
     @Query('senderOrReceiver', ParseAddressPipe) senderOrReceiver?: string,
   ): Promise<number> {
-    if (!this.apiConfigService.getIsIndexerV3FlagActive()) {
-      throw new HttpException('Endpoint not live yet', HttpStatus.NOT_IMPLEMENTED);
-    }
-
     return await this.transferService.getTransfersCount(new TransactionFilter({
       address,
       senders: sender,