[MEX-961] code quality improvements

proto/dex_state.proto

@@ -313,6 +313,10 @@ message PairsCountResponse {
   uint32 count = 1;
 }
 
+message IsStateInitializedResponse {
+  bool initialized = 1;
+}
+
 service DexStateService {
   rpc GetPairs (GetPairsRequest) returns (Pairs) {}
   rpc GetFilteredPairs (GetFilteredPairsRequest) returns (PaginatedPairs) {}
@@ -351,4 +355,6 @@ service DexStateService {
   rpc GetWeeklyTimekeeping (GetWeeklyTimekeepingRequest) returns (WeekTimekeeping) {}
 
   rpc UpdateUsdcPrice (UpdateUsdcPriceRequest) returns (UpdateUsdcPriceResponse) {}
+
+  rpc IsStateInitialized (google.protobuf.Empty) returns (IsStateInitializedResponse) {}
 }

src/microservices/dex-state/dex.state.controller.ts

@@ -26,6 +26,7 @@ import {
     IDexStateService,
     InitStateRequest,
     InitStateResponse,
+    IsStateInitializedResponse,
     PaginatedPairs,
     PaginatedStakingFarms,
     PaginatedTokens,
@@ -229,6 +230,13 @@ export class DexStateController implements IDexStateService {
         return this.dexStateService.getWeeklyTimekeeping(request);
     }
 
+    @GrpcMethod(DEX_STATE_SERVICE_NAME, 'isStateInitialized')
+    isStateInitialized(): IsStateInitializedResponse {
+        return {
+            initialized: this.dexStateService.isReady(),
+        };
+    }
+
     private ensureReady() {
         if (!this.dexStateService.isReady()) {
             throw new RpcException({

src/microservices/dex-state/interfaces/dex_state.interfaces.ts

@@ -308,6 +308,10 @@ export interface PairsCountResponse {
     count: number;
 }
 
+export interface IsStateInitializedResponse {
+    initialized: boolean;
+}
+
 export const DEX_STATE_PACKAGE_NAME = 'dex_state';
 
 export interface IDexStateServiceClient {
@@ -390,6 +394,8 @@ export interface IDexStateServiceClient {
     updateUsdcPrice(
         request: UpdateUsdcPriceRequest,
     ): Observable<UpdateUsdcPriceResponse>;
+
+    isStateInitialized(request: Empty): Observable<IsStateInitializedResponse>;
 }
 
 export interface IDexStateService {
@@ -527,6 +533,8 @@ export interface IDexStateService {
         | Promise<UpdateUsdcPriceResponse>
         | Observable<UpdateUsdcPriceResponse>
         | UpdateUsdcPriceResponse;
+
+    isStateInitialized(request: Empty): IsStateInitializedResponse;
 }
 
 export const DEX_STATE_SERVICE_NAME = 'DexStateService';

src/microservices/dex-state/services/bulk.updates.service.ts

@@ -199,6 +199,12 @@ export class BulkUpdatesService {
                 }
             }
 
+            pairs = pairs.filter((pair) => {
+                return pair.firstTokenId === id
+                    ? this.commonTokenIDs.includes(pair.secondTokenId)
+                    : this.commonTokenIDs.includes(pair.firstTokenId);
+            });
+
             const tokenPairs: PairModel[] = [];
 
             pairs.forEach((pair) => {
@@ -211,6 +217,8 @@ export class BulkUpdatesService {
             return tokenPairs;
         };
 
+        const minLiquidity = new BigNumber(`1e${mxConfig.EGLDDecimals}`);
+
         const tokenDerivedEGLD = (tokenID: string): string => {
             if (memo.has(tokenID)) {
                 return memo.get(tokenID);
@@ -256,7 +264,10 @@ export class BulkUpdatesService {
                         .times(secondTokenDerivedEGLD)
                         .times(`1e${mxConfig.EGLDDecimals}`)
                         .integerValue();
-                    if (egldLocked.isGreaterThan(largestLiquidityEGLD)) {
+                    if (
+                        egldLocked.isGreaterThan(largestLiquidityEGLD) &&
+                        egldLocked.gt(minLiquidity)
+                    ) {
                         largestLiquidityEGLD = egldLocked;
                         priceSoFar = new BigNumber(pair.firstTokenPrice).times(
                             secondTokenDerivedEGLD,
@@ -273,7 +284,10 @@ export class BulkUpdatesService {
                         .times(firstTokenDerivedEGLD)
                         .times(`1e${mxConfig.EGLDDecimals}`)
                         .integerValue();
-                    if (egldLocked.isGreaterThan(largestLiquidityEGLD)) {
+                    if (
+                        egldLocked.isGreaterThan(largestLiquidityEGLD) &&
+                        egldLocked.gt(minLiquidity)
+                    ) {
                         largestLiquidityEGLD = egldLocked;
                         priceSoFar = new BigNumber(pair.secondTokenPrice).times(
                             firstTokenDerivedEGLD,
@@ -296,9 +310,8 @@ export class BulkUpdatesService {
         let newLockedValue = new BigNumber(0);
         for (const pair of tokenPairs) {
             if (
-                pair.state === 'Active' ||
-                (this.commonTokenIDs.includes(pair.firstTokenId) &&
-                    this.commonTokenIDs.includes(pair.secondTokenId))
+                this.commonTokenIDs.includes(pair.firstTokenId) &&
+                this.commonTokenIDs.includes(pair.secondTokenId)
             ) {
                 const tokenLockedValueUSD =
                     tokenID === pair.firstTokenId
@@ -360,9 +373,8 @@ export class BulkUpdatesService {
         };
 
         if (
-            pair.state === 'Active' ||
-            (this.commonTokenIDs.includes(pair.firstTokenId) &&
-                this.commonTokenIDs.includes(pair.secondTokenId))
+            this.commonTokenIDs.includes(pair.firstTokenId) &&
+            this.commonTokenIDs.includes(pair.secondTokenId)
         ) {
             result.lockedValueUSD = firstTokenLockedValueUSD
                 .plus(secondTokenLockedValueUSD)

src/microservices/dex-state/services/compute/fees-collector.compute.service.ts

@@ -5,6 +5,7 @@ import {
     refreshWeekStartAndEndEpochs,
 } from '../../utils/rewards.compute.utils';
 import { StateStore } from '../state.store';
+import { constantsConfig } from 'src/config';
 
 @Injectable()
 export class FeesCollectorComputeService {
@@ -15,6 +16,11 @@ export class FeesCollectorComputeService {
     ): FeesCollectorModel {
         refreshWeekStartAndEndEpochs(feesCollector.time);
 
+        feesCollector.startWeek =
+            feesCollector.time.currentWeek -
+            constantsConfig.USER_MAX_CLAIM_WEEKS;
+        feesCollector.endWeek = feesCollector.time.currentWeek;
+
         feesCollector.undistributedRewards.forEach((globalInfo) => {
             if (!globalInfo.totalRewardsForWeek) {
                 globalInfo.totalRewardsForWeek = [];

src/microservices/dex-state/services/state.store.ts

@@ -100,6 +100,9 @@ export class StateStore {
 
     // Setters for controlled mutation
     setToken(identifier: string, token: EsdtToken): void {
+        if (!identifier) {
+            throw new Error('Token identifier must not be empty');
+        }
         this._tokens.set(identifier, token);
     }
 
@@ -144,7 +147,10 @@ export class StateStore {
         if (!this._tokenPairs.has(tokenId)) {
             this._tokenPairs.set(tokenId, []);
         }
-        this._tokenPairs.get(tokenId).push(pairAddress);
+        const pairs = this._tokenPairs.get(tokenId);
+        if (!pairs.includes(pairAddress)) {
+            pairs.push(pairAddress);
+        }
     }
 
     addTokenByType(type: EsdtTokenType, tokenId: string): void {