Merge pull request #1366 from multiversx/development

Merge development into main
multiversx · Jun 6, 2024 · af16707 · af16707
2 parents f84d0bd + 9ce329e
commit af16707
Show file tree

Hide file tree

Showing 38 changed files with 744 additions and 357 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -35,11 +35,11 @@
         "@multiversx/sdk-data-api-client": "^0.5.8",
         "@multiversx/sdk-exchange": "^0.2.19",
         "@multiversx/sdk-native-auth-server": "1.0.15",
-        "@multiversx/sdk-nestjs-cache": "^2.0.0-beta.2",
-        "@multiversx/sdk-nestjs-common": "^2.0.0-beta.2",
-        "@multiversx/sdk-nestjs-elastic": "^2.0.0-beta.3",
-        "@multiversx/sdk-nestjs-http": "^2.0.0-beta.2",
-        "@multiversx/sdk-nestjs-monitoring": "^2.0.0-beta.2",
+        "@multiversx/sdk-nestjs-cache": "^3.7.0",
+        "@multiversx/sdk-nestjs-common": "^3.7.0",
+        "@multiversx/sdk-nestjs-elastic": "^3.7.0",
+        "@multiversx/sdk-nestjs-http": "^3.7.0",
+        "@multiversx/sdk-nestjs-monitoring": "^3.7.0",
         "@multiversx/sdk-network-providers": "^2.0.0",
         "@nestjs/apollo": "^12.0.7",
         "@nestjs/axios": "^3.0.0",

diff --git a/src/endpoints/metrics/metrics.controller.ts b/src/endpoints/metrics/metrics.controller.ts
@@ -6,11 +6,11 @@ import {
     Param,
 } from '@nestjs/common';
 import { MetricsCollector } from 'src/utils/metrics.collector';
-import { MetricsService } from './metrics.service';
+import { ESTransactionsService } from 'src/services/elastic-search/services/es.transactions.service';
 
 @Controller()
 export class MetricsController {
-    constructor(private readonly metricsService: MetricsService) {}
+    constructor(private readonly metricsService: ESTransactionsService) {}
 
     @Get('/metrics')
     async getMetrics(): Promise<string> {

diff --git a/src/helpers/api.config.service.ts b/src/helpers/api.config.service.ts
@@ -312,4 +312,18 @@ export class ApiConfigService {
         }
         return password;
     }
+
+    getElasticSearchUrl(): string {
+        const elasticSearchUrl =
+            this.configService.get<string>('ELASTICSEARCH_URL');
+        if (!elasticSearchUrl) {
+            throw new Error('No Elastic Search url present');
+        }
+
+        return elasticSearchUrl;
+    }
+
+    getRateLimiterSecret(): string | undefined {
+        return this.configService.get<string>('RATE_LIMITER_SECRET');
+    }
 }
diff --git a/src/modules/analytics/specs/analytics.service.spec.ts b/src/modules/analytics/specs/analytics.service.spec.ts
@@ -45,7 +45,7 @@ import { WinstonModule } from 'nest-winston';
 import { ApiConfigService } from 'src/helpers/api.config.service';
 import winston from 'winston';
 import { DynamicModuleUtils } from 'src/utils/dynamic.module.utils';
-import { ElasticService } from 'src/helpers/elastic.service';
+import { ElasticSearchModule } from 'src/services/elastic-search/elastic.search.module';
 
 describe('AnalyticsService', () => {
     let module: TestingModule;
@@ -58,6 +58,7 @@ describe('AnalyticsService', () => {
                 }),
                 ConfigModule.forRoot({}),
                 DynamicModuleUtils.getCacheModule(),
+                ElasticSearchModule,
             ],
             providers: [
                 ContextGetterServiceProvider,
@@ -104,7 +105,6 @@ describe('AnalyticsService', () => {
                 RemoteConfigGetterServiceProvider,
                 AnalyticsQueryServiceProvider,
                 ApiConfigService,
-                ElasticService,
             ],
         }).compile();
     });

diff --git a/src/modules/farm/specs/farm.compute.service.spec.ts b/src/modules/farm/specs/farm.compute.service.spec.ts
@@ -21,7 +21,7 @@ import { ApiConfigService } from 'src/helpers/api.config.service';
 import winston from 'winston';
 import { DynamicModuleUtils } from 'src/utils/dynamic.module.utils';
 import { AnalyticsQueryServiceProvider } from 'src/services/analytics/mocks/analytics.query.service.mock';
-import { ElasticService } from 'src/helpers/elastic.service';
+import { ElasticSearchModule } from 'src/services/elastic-search/elastic.search.module';
 
 describe('FarmService', () => {
     let module: TestingModule;
@@ -34,6 +34,7 @@ describe('FarmService', () => {
                 }),
                 ConfigModule.forRoot({}),
                 DynamicModuleUtils.getCacheModule(),
+                ElasticSearchModule,
             ],
             providers: [
                 MXApiServiceProvider,
@@ -51,7 +52,6 @@ describe('FarmService', () => {
                 FarmServiceV1_2,
                 ApiConfigService,
                 AnalyticsQueryServiceProvider,
-                ElasticService,
             ],
         }).compile();
     });

diff --git a/src/modules/farm/specs/farm.service.spec.ts b/src/modules/farm/specs/farm.service.spec.ts
@@ -40,7 +40,7 @@ import { ApiConfigService } from 'src/helpers/api.config.service';
 import winston from 'winston';
 import { DynamicModuleUtils } from 'src/utils/dynamic.module.utils';
 import { AnalyticsQueryServiceProvider } from 'src/services/analytics/mocks/analytics.query.service.mock';
-import { ElasticService } from 'src/helpers/elastic.service';
+import { ElasticSearchModule } from 'src/services/elastic-search/elastic.search.module';
 
 describe('FarmService', () => {
     let module: TestingModule;
@@ -53,6 +53,7 @@ describe('FarmService', () => {
                 }),
                 ConfigModule.forRoot({}),
                 DynamicModuleUtils.getCacheModule(),
+                ElasticSearchModule,
             ],
             providers: [
                 FarmFactoryService,
@@ -98,7 +99,6 @@ describe('FarmService', () => {
                 MXDataApiServiceProvider,
                 AnalyticsQueryServiceProvider,
                 ApiConfigService,
-                ElasticService,
             ],
         }).compile();
     });

diff --git a/src/modules/farm/specs/farm.transactions.service.spec.ts b/src/modules/farm/specs/farm.transactions.service.spec.ts
@@ -21,7 +21,7 @@ import { WinstonModule } from 'nest-winston';
 import winston from 'winston';
 import { DynamicModuleUtils } from 'src/utils/dynamic.module.utils';
 import { AnalyticsQueryServiceProvider } from 'src/services/analytics/mocks/analytics.query.service.mock';
-import { ElasticService } from 'src/helpers/elastic.service';
+import { ElasticSearchModule } from 'src/services/elastic-search/elastic.search.module';
 
 describe('FarmService', () => {
     let module: TestingModule;
@@ -34,6 +34,7 @@ describe('FarmService', () => {
                     transports: [new winston.transports.Console({})],
                 }),
                 DynamicModuleUtils.getCacheModule(),
+                ElasticSearchModule,
             ],
             providers: [
                 ApiConfigService,
@@ -52,7 +53,6 @@ describe('FarmService', () => {
                 MXDataApiServiceProvider,
                 AnalyticsQueryServiceProvider,
                 ApiConfigService,
-                ElasticService,
             ],
         }).compile();
     });

diff --git a/src/modules/farm/specs/farm.v1.2.compute.service.spec.ts b/src/modules/farm/specs/farm.v1.2.compute.service.spec.ts
@@ -19,7 +19,7 @@ import { ApiConfigService } from 'src/helpers/api.config.service';
 import winston from 'winston';
 import { DynamicModuleUtils } from 'src/utils/dynamic.module.utils';
 import { AnalyticsQueryServiceProvider } from 'src/services/analytics/mocks/analytics.query.service.mock';
-import { ElasticService } from 'src/helpers/elastic.service';
+import { ElasticSearchModule } from 'src/services/elastic-search/elastic.search.module';
 
 describe('FarmService', () => {
     let module: TestingModule;
@@ -32,6 +32,7 @@ describe('FarmService', () => {
                 }),
                 ConfigModule.forRoot({}),
                 DynamicModuleUtils.getCacheModule(),
+                ElasticSearchModule,
             ],
             providers: [
                 FarmAbiServiceProviderV1_2,
@@ -49,7 +50,6 @@ describe('FarmService', () => {
                 MXDataApiServiceProvider,
                 AnalyticsQueryServiceProvider,
                 ApiConfigService,
-                ElasticService,
             ],
         }).compile();
     });

diff --git a/src/modules/farm/specs/farm.v1.3.compute.service.spec.ts b/src/modules/farm/specs/farm.v1.3.compute.service.spec.ts
@@ -19,7 +19,7 @@ import { ApiConfigService } from 'src/helpers/api.config.service';
 import winston from 'winston';
 import { DynamicModuleUtils } from 'src/utils/dynamic.module.utils';
 import { AnalyticsQueryServiceProvider } from 'src/services/analytics/mocks/analytics.query.service.mock';
-import { ElasticService } from 'src/helpers/elastic.service';
+import { ElasticSearchModule } from 'src/services/elastic-search/elastic.search.module';
 
 describe('FarmService', () => {
     let module: TestingModule;
@@ -32,6 +32,7 @@ describe('FarmService', () => {
                 }),
                 ConfigModule.forRoot({}),
                 DynamicModuleUtils.getCacheModule(),
+                ElasticSearchModule,
             ],
             providers: [
                 FarmAbiServiceProviderV1_3,
@@ -49,7 +50,6 @@ describe('FarmService', () => {
                 MXDataApiServiceProvider,
                 AnalyticsQueryServiceProvider,
                 ApiConfigService,
-                ElasticService,
             ],
         }).compile();
     });

diff --git a/src/modules/farm/specs/farm.v2.compute.service.spec.ts b/src/modules/farm/specs/farm.v2.compute.service.spec.ts
@@ -24,7 +24,7 @@ import { ApiConfigService } from 'src/helpers/api.config.service';
 import winston from 'winston';
 import { DynamicModuleUtils } from 'src/utils/dynamic.module.utils';
 import { AnalyticsQueryServiceProvider } from 'src/services/analytics/mocks/analytics.query.service.mock';
-import { ElasticService } from 'src/helpers/elastic.service';
+import { ElasticSearchModule } from 'src/services/elastic-search/elastic.search.module';
 
 describe('FarmServiceV2', () => {
     let module: TestingModule;
@@ -37,6 +37,7 @@ describe('FarmServiceV2', () => {
                 }),
                 ConfigModule.forRoot({}),
                 DynamicModuleUtils.getCacheModule(),
+                ElasticSearchModule,
             ],
             providers: [
                 MXApiServiceProvider,
@@ -59,7 +60,6 @@ describe('FarmServiceV2', () => {
                 FarmServiceV2,
                 AnalyticsQueryServiceProvider,
                 ApiConfigService,
-                ElasticService,
             ],
         }).compile();
     });

diff --git a/src/modules/fees-collector/specs/fees-collector.service.spec.ts b/src/modules/fees-collector/specs/fees-collector.service.spec.ts
@@ -29,7 +29,7 @@ import { ApiConfigService } from 'src/helpers/api.config.service';
 import winston from 'winston';
 import { DynamicModuleUtils } from 'src/utils/dynamic.module.utils';
 import { AnalyticsQueryServiceProvider } from 'src/services/analytics/mocks/analytics.query.service.mock';
-import { ElasticService } from 'src/helpers/elastic.service';
+import { ElasticSearchModule } from 'src/services/elastic-search/elastic.search.module';
 
 describe('FeesCollectorService', () => {
     let module: TestingModule;
@@ -43,6 +43,7 @@ describe('FeesCollectorService', () => {
                 }),
                 ConfigModule.forRoot({}),
                 DynamicModuleUtils.getCacheModule(),
+                ElasticSearchModule,
             ],
             providers: [
                 FeesCollectorService,
@@ -69,7 +70,6 @@ describe('FeesCollectorService', () => {
                 },
                 AnalyticsQueryServiceProvider,
                 ApiConfigService,
-                ElasticService,
             ],
         }).compile();
     });

diff --git a/src/modules/fees-collector/specs/fees.collector.compute.service.spec.ts b/src/modules/fees-collector/specs/fees.collector.compute.service.spec.ts
@@ -33,7 +33,7 @@ import winston from 'winston';
 import { DynamicModuleUtils } from 'src/utils/dynamic.module.utils';
 import { AnalyticsQueryServiceProvider } from 'src/services/analytics/mocks/analytics.query.service.mock';
 import { MXApiServiceProvider } from 'src/services/multiversx-communication/mx.api.service.mock';
-import { ElasticService } from 'src/helpers/elastic.service';
+import { ElasticSearchModule } from 'src/services/elastic-search/elastic.search.module';
 
 describe('FeesCollectorComputeService', () => {
     let module: TestingModule;
@@ -46,6 +46,7 @@ describe('FeesCollectorComputeService', () => {
                 }),
                 ConfigModule.forRoot({}),
                 DynamicModuleUtils.getCacheModule(),
+                ElasticSearchModule,
             ],
             providers: [
                 FeesCollectorComputeService,
@@ -73,7 +74,6 @@ describe('FeesCollectorComputeService', () => {
                 AnalyticsQueryServiceProvider,
                 ApiConfigService,
                 MXApiServiceProvider,
-                ElasticService,
             ],
         }).compile();
     });

diff --git a/src/modules/pair/services/pair.filtering.service.ts b/src/modules/pair/services/pair.filtering.service.ts
@@ -7,12 +7,14 @@ import {
     PairsFilter,
 } from 'src/modules/router/models/filter.args';
 import BigNumber from 'bignumber.js';
+import { PairService } from './pair.service';
 
 @Injectable()
 export class PairFilteringService {
     constructor(
         private readonly pairAbi: PairAbiService,
         private readonly pairCompute: PairComputeService,
+        private readonly pairService: PairService,
     ) {}
 
     async pairsByIssuedLpToken(
@@ -82,6 +84,50 @@ export class PairFilteringService {
         return await Promise.resolve(pairsMetadata);
     }
 
+    async pairsByWildcardToken(
+        pairFilter: PairsFilter,
+        pairsMetadata: PairMetadata[],
+    ): Promise<PairMetadata[]> {
+        if (
+            !pairFilter.searchToken ||
+            pairFilter.searchToken.trim().length < 3
+        ) {
+            return pairsMetadata;
+        }
+
+        const searchTerm = pairFilter.searchToken.toUpperCase().trim();
+
+        const pairsFirstToken = await Promise.all(
+            pairsMetadata.map((pairMetadata) =>
+                this.pairService.getFirstToken(pairMetadata.address),
+            ),
+        );
+        const pairsSecondToken = await Promise.all(
+            pairsMetadata.map((pairMetadata) =>
+                this.pairService.getSecondToken(pairMetadata.address),
+            ),
+        );
+
+        const filteredPairs: PairMetadata[] = [];
+        for (const [index, pair] of pairsMetadata.entries()) {
+            const firstToken = pairsFirstToken[index];
+            const secondToken = pairsSecondToken[index];
+
+            if (
+                firstToken.name.toUpperCase().includes(searchTerm) ||
+                firstToken.identifier.toUpperCase().includes(searchTerm) ||
+                firstToken.ticker.toUpperCase().includes(searchTerm) ||
+                secondToken.name.toUpperCase().includes(searchTerm) ||
+                secondToken.identifier.toUpperCase().includes(searchTerm) ||
+                secondToken.ticker.toUpperCase().includes(searchTerm)
+            ) {
+                filteredPairs.push(pair);
+            }
+        }
+
+        return filteredPairs;
+    }
+
     async pairsByState(
         pairFilter: PairFilterArgs | PairsFilter,
         pairsMetadata: PairMetadata[],

diff --git a/src/modules/pair/services/pair.metadata.builder.ts b/src/modules/pair/services/pair.metadata.builder.ts
@@ -52,6 +52,14 @@ export class PairsMetadataBuilder {
     }
 
     async filterByTokens(): Promise<PairsMetadataBuilder> {
+        if (this.filters.searchToken) {
+            this.pairsMetadata =
+                await this.filteringService.pairsByWildcardToken(
+                    this.filters,
+                    this.pairsMetadata,
+                );
+        }
+
         this.pairsMetadata = await this.filteringService.pairsByTokens(
             this.filters,
             this.pairsMetadata,

diff --git a/src/modules/pair/specs/pair.compute.service.spec.ts b/src/modules/pair/specs/pair.compute.service.spec.ts
@@ -27,6 +27,7 @@ import { ElasticService } from 'src/helpers/elastic.service';
 import { RemoteConfigGetterServiceProvider } from 'src/modules/remote-config/mocks/remote-config.getter.mock';
 import { StakingProxyAbiServiceProvider } from 'src/modules/staking-proxy/mocks/staking.proxy.abi.service.mock';
 import { FarmAbiServiceProviderV2 } from 'src/modules/farm/mocks/farm.v2.abi.service.mock';
+import { ElasticSearchModule } from 'src/services/elastic-search/elastic.search.module';
 
 describe('PairService', () => {
     let module: TestingModule;
@@ -39,6 +40,7 @@ describe('PairService', () => {
                 }),
                 ConfigModule.forRoot({}),
                 DynamicModuleUtils.getCacheModule(),
+                ElasticSearchModule,
             ],
             providers: [
                 PairComputeService,

diff --git a/src/modules/router/models/filter.args.ts b/src/modules/router/models/filter.args.ts
@@ -57,6 +57,8 @@ export class PairsFilter {
     hasDualFarms: boolean;
     @Field({ nullable: true })
     minDeployedAt: number;
+    @Field({ nullable: true })
+    searchToken: string;
 }
 
 @InputType()