Merge pull request #1270 from multiversx/merge/development-feat-xexch…

…ange-v3 Merge development into feat/xexchange-v3
multiversx · Feb 12, 2024 · 64a53df · 64a53df
2 parents 498bc5c + 86dc0ac
commit 64a53df
Show file tree

Hide file tree

Showing 31 changed files with 536 additions and 460 deletions.
diff --git a/.env.example b/.env.example
@@ -49,6 +49,7 @@ LOG_LEVEL=info
 JWT_SECRET=
 NATIVE_AUTH_MAX_EXPIRY_SECONDS=86400
 NATIVE_AUTH_ACCEPTED_ORIGINS=
+IMPERSONATE_URL=
 
 # RabbitMQ
 RABBITMQ_URL=

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -34,7 +34,7 @@
         "@multiversx/sdk-core": "^12.8.0",
         "@multiversx/sdk-data-api-client": "^0.5.8",
         "@multiversx/sdk-exchange": "^0.2.20",
-        "@multiversx/sdk-native-auth-server": "1.0.7",
+        "@multiversx/sdk-native-auth-server": "1.0.14",
         "@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",

diff --git a/src/config/default.json b/src/config/default.json
@@ -100,9 +100,9 @@
         "router": {
             "createPair": 30000000,
             "issueToken": 270000000,
-            "setLocalRoles": 150000000,
+            "setLocalRoles": 270000000,
             "multiPairSwapMultiplier": 100000000,
-            "swapEnableByUser": 170000000,
+            "swapEnableByUser": 180000000,
             "admin": {
                 "setState": 200000000,
                 "setFee": 200000000,
@@ -439,14 +439,14 @@
         },
         "simpleLock": {
             "lockTokens": 10000000,
-            "unlockTokens": 5000000,
+            "unlockTokens": 6000000,
             "addLiquidityLockedToken": 20000000,
-            "removeLiquidityLockedToken": 15000000,
+            "removeLiquidityLockedToken": 18000000,
             "enterFarmLockedToken": {
-                "default": 25000000,
-                "withTokenMerge": 30000000
+                "default": 30000000,
+                "withTokenMerge": 35000000
             },
-            "exitFarmLockedToken": 50000000,
+            "exitFarmLockedToken": 60000000,
             "claimRewardsFarmLockedToken": 35000000
         },
         "simpleLockEnergy": {

diff --git a/src/helpers/api.config.service.ts b/src/helpers/api.config.service.ts
@@ -226,6 +226,16 @@ export class ApiConfigService {
         return origins.split(',');
     }
 
+    getImpersonateUrl(): string {
+        const impersonateUrl =
+            this.configService.get<string>('IMPERSONATE_URL');
+        if (!impersonateUrl) {
+            throw new Error('No impersonate url present');
+        }
+
+        return impersonateUrl;
+    }
+
     getMXDataApiURL(): string {
         const url = this.configService.get<string>('MX_DATA_API_URL');
         if (!url) {

diff --git a/src/modules/auth/gql.auth.guard.ts b/src/modules/auth/gql.auth.guard.ts
@@ -25,15 +25,16 @@ export class GqlAuthGuard implements CanActivate {
         const headers = req.headers;
         this.logger.info('request header', [
             {
-                requestIP: req.ip, headers: {
-                    'host': headers['host'],
+                requestIP: req.ip,
+                headers: {
+                    host: headers['host'],
                     'x-request-id': headers['x-request-id'],
                     'x-real-ip': headers['x-real-ip'],
                     'x-forwarded-for': headers['x-forwarded-for'],
                     'x-forwarded-host': headers['x-forwarded-host'],
                     'x-forwarded-port': headers['x-forwarded-port'],
                     'user-agent': headers['user-agent'],
-                }
+                },
             },
         ]);
 
@@ -74,7 +75,6 @@ export class GqlAuthGuard implements CanActivate {
                 });
             });
         } catch (error) {
-            this.logger.error(error);
             return false;
         }
 

diff --git a/src/modules/auth/jwt.or.native.auth.guard.ts b/src/modules/auth/jwt.or.native.auth.guard.ts
@@ -34,7 +34,7 @@ export class JwtOrNativeAuthGuard implements CanActivate {
                 try {
                     return guard.canActivate(context);
                 } catch (error) {
-                    this.logger.error(
+                    this.logger.warn(
                         `${JwtOrNativeAuthGuard.name}: ${error.message}`,
                     );
                     return false;

diff --git a/src/modules/auth/native.auth.guard.ts b/src/modules/auth/native.auth.guard.ts
@@ -1,4 +1,7 @@
-import { NativeAuthServer } from '@multiversx/sdk-native-auth-server';
+import {
+    NativeAuthError,
+    NativeAuthServer,
+} from '@multiversx/sdk-native-auth-server';
 import {
     Injectable,
     CanActivate,
@@ -16,7 +19,6 @@ import { Logger } from 'winston';
 @Injectable()
 export class NativeAuthGuard implements CanActivate {
     private readonly authServer: NativeAuthServer;
-    private impersonateAddress: string;
 
     constructor(
         private readonly apiConfigService: ApiConfigService,
@@ -29,6 +31,7 @@ export class NativeAuthGuard implements CanActivate {
                 this.apiConfigService.getNativeAuthMaxExpirySeconds(),
             acceptedOrigins:
                 this.apiConfigService.getNativeAuthAcceptedOrigins(),
+            validateImpersonateUrl: this.apiConfigService.getImpersonateUrl(),
             cache: {
                 getValue: async <T>(key: string): Promise<T | undefined> => {
                     if (key === 'block:timestamp:latest') {
@@ -53,10 +56,6 @@ export class NativeAuthGuard implements CanActivate {
         const ctx = GqlExecutionContext.create(context);
         const { req } = ctx.getContext();
 
-        if (req.headers !== undefined) {
-            this.impersonateAddress = req.headers['impersonate-address'];
-        }
-
         const authorization: string = req.headers['authorization'];
         const origin = req.headers['origin'];
 
@@ -89,14 +88,16 @@ export class NativeAuthGuard implements CanActivate {
             req.auth = userInfo;
             req.jwt = userInfo;
 
-            if (this.impersonateAddress) {
+            if (
+                userInfo.extraInfo.impersonate &&
+                userInfo.extraInfo.impersonate !== undefined
+            ) {
                 const admins = process.env.SECURITY_ADMINS.split(',');
-                if (admins.find((admin) => admin === userInfo.address)) {
-                    req.res.set(
-                        'X-Native-Auth-Address',
-                        this.impersonateAddress,
-                    );
-                    req.auth.address = this.impersonateAddress;
+                if (
+                    admins.find((admin) => admin === userInfo.signerAddress) ===
+                    undefined
+                ) {
+                    throw new NativeAuthError('Impersonation not allowed');
                 }
             }
 

diff --git a/src/modules/auto-router/specs/auto-router.service.spec.ts b/src/modules/auto-router/specs/auto-router.service.spec.ts
@@ -32,6 +32,7 @@ import { ApiConfigService } from 'src/helpers/api.config.service';
 import winston from 'winston';
 import { DynamicModuleUtils } from 'src/utils/dynamic.module.utils';
 import { ComposableTasksTransactionService } from 'src/modules/composable-tasks/services/composable.tasks.transaction';
+import { MXApiServiceProvider } from 'src/services/multiversx-communication/mx.api.service.mock';
 
 describe('AutoRouterService', () => {
     let service: AutoRouterService;
@@ -80,6 +81,7 @@ describe('AutoRouterService', () => {
                 AutoRouterTransactionService,
                 ComposableTasksTransactionService,
                 ApiConfigService,
+                MXApiServiceProvider,
             ],
             exports: [],
         }).compile();

diff --git a/src/modules/farm/v2/services/farm.v2.transaction.service.ts b/src/modules/farm/v2/services/farm.v2.transaction.service.ts
@@ -18,6 +18,7 @@ import { FarmAbiServiceV2 } from './farm.v2.abi.service';
 import { PairService } from 'src/modules/pair/services/pair.service';
 import { PairAbiService } from 'src/modules/pair/services/pair.abi.service';
 import { MXApiService } from 'src/services/multiversx-communication/mx.api.service';
+import { ContextGetterService } from 'src/services/context/context.getter.service';
 
 @Injectable()
 export class FarmTransactionServiceV2 extends TransactionsFarmService {
@@ -27,6 +28,7 @@ export class FarmTransactionServiceV2 extends TransactionsFarmService {
         protected readonly pairService: PairService,
         protected readonly pairAbi: PairAbiService,
         private readonly mxApi: MXApiService,
+        private readonly contextGetter: ContextGetterService,
     ) {
         super(mxProxy, farmAbi, pairService, pairAbi);
     }
@@ -168,7 +170,7 @@ export class FarmTransactionServiceV2 extends TransactionsFarmService {
             return [];
         }
 
-        const userNfts = await this.mxApi.getNftsForUser(
+        const userNfts = await this.contextGetter.getNftsForUser(
             userAddress,
             0,
             userNftsCount,

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
@@ -32,6 +32,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 { MXApiServiceProvider } from 'src/services/multiversx-communication/mx.api.service.mock';
 
 describe('FeesCollectorComputeService', () => {
     let module: TestingModule;
@@ -70,6 +71,7 @@ describe('FeesCollectorComputeService', () => {
                 },
                 AnalyticsQueryServiceProvider,
                 ApiConfigService,
+                MXApiServiceProvider,
             ],
         }).compile();
     });

diff --git a/src/modules/pair/specs/pair.compute.service.spec.ts b/src/modules/pair/specs/pair.compute.service.spec.ts
@@ -17,6 +17,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 { MXApiServiceProvider } from 'src/services/multiversx-communication/mx.api.service.mock';
 
 describe('PairService', () => {
     let module: TestingModule;
@@ -42,6 +43,7 @@ describe('PairService', () => {
                 AnalyticsQueryServiceProvider,
                 ContextGetterServiceProvider,
                 ApiConfigService,
+                MXApiServiceProvider,
             ],
         }).compile();
     });

diff --git a/src/modules/pair/specs/pair.service.spec.ts b/src/modules/pair/specs/pair.service.spec.ts
@@ -12,6 +12,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 { MXApiServiceProvider } from 'src/services/multiversx-communication/mx.api.service.mock';
 
 describe('PairService', () => {
     let module: TestingModule;
@@ -34,6 +35,7 @@ describe('PairService', () => {
                 ContextGetterServiceProvider,
                 RouterAbiServiceProvider,
                 ApiConfigService,
+                MXApiServiceProvider,
             ],
         }).compile();
     });

diff --git a/src/modules/pair/specs/pair.transactions.service.spec.ts b/src/modules/pair/specs/pair.transactions.service.spec.ts
@@ -20,6 +20,7 @@ import { WinstonModule } from 'nest-winston';
 import winston from 'winston';
 import { DynamicModuleUtils } from 'src/utils/dynamic.module.utils';
 import { ComposableTasksTransactionService } from 'src/modules/composable-tasks/services/composable.tasks.transaction';
+import { MXApiServiceProvider } from 'src/services/multiversx-communication/mx.api.service.mock';
 
 describe('TransactionPairService', () => {
     let module: TestingModule;
@@ -48,6 +49,7 @@ describe('TransactionPairService', () => {
                 TokenServiceProvider,
                 ComposableTasksTransactionService,
                 PairTransactionService,
+                MXApiServiceProvider,
             ],
         }).compile();
     });

diff --git a/src/modules/position-creator/specs/position.creator.transaction.spec.ts b/src/modules/position-creator/specs/position.creator.transaction.spec.ts
@@ -34,6 +34,7 @@ import { ProxyFarmAbiServiceProvider } from 'src/modules/proxy/mocks/proxy.abi.s
 import { EnergyAbiServiceProvider } from 'src/modules/energy/mocks/energy.abi.service.mock';
 import { scAddress } from 'src/config';
 import { StakingAbiService } from 'src/modules/staking/services/staking.abi.service';
+import { MXApiServiceProvider } from 'src/services/multiversx-communication/mx.api.service.mock';
 
 describe('PositionCreatorTransaction', () => {
     let module: TestingModule;
@@ -74,6 +75,7 @@ describe('PositionCreatorTransaction', () => {
                 ConfigService,
                 ApiConfigService,
                 ContextGetterServiceProvider,
+                MXApiServiceProvider,
             ],
         }).compile();
     });

diff --git a/src/modules/proxy/services/proxy-farm/proxy.farm.transactions.service.ts b/src/modules/proxy/services/proxy-farm/proxy.farm.transactions.service.ts
@@ -34,6 +34,7 @@ import {
     WrappedFarmTokenAttributesV2,
 } from '@multiversx/sdk-exchange';
 import { FarmAbiServiceV2 } from 'src/modules/farm/v2/services/farm.v2.abi.service';
+import { ContextGetterService } from 'src/services/context/context.getter.service';
 
 @Injectable()
 export class ProxyFarmTransactionsService {
@@ -45,6 +46,7 @@ export class ProxyFarmTransactionsService {
         private readonly pairService: PairService,
         private readonly pairAbi: PairAbiService,
         private readonly proxyFarmAbi: ProxyFarmAbiService,
+        private readonly contextGetter: ContextGetterService,
     ) {}
 
     async enterFarmProxy(
@@ -283,7 +285,7 @@ export class ProxyFarmTransactionsService {
             proxyAddress,
         );
         const userNftsCount = await this.mxApi.getNftsCountForUser(sender);
-        const userNfts = await this.mxApi.getNftsForUser(
+        const userNfts = await this.contextGetter.getNftsForUser(
             sender,
             0,
             userNftsCount,

diff --git a/src/modules/proxy/specs/proxy-pair-transactions.service.spec.ts b/src/modules/proxy/specs/proxy-pair-transactions.service.spec.ts
@@ -25,6 +25,7 @@ import { encodeTransactionData } from 'src/helpers/helpers';
 import { WinstonModule } from 'nest-winston';
 import winston from 'winston';
 import { DynamicModuleUtils } from 'src/utils/dynamic.module.utils';
+import { MXApiServiceProvider } from 'src/services/multiversx-communication/mx.api.service.mock';
 
 describe('TransactionProxyPairService', () => {
     let module: TestingModule;
@@ -57,6 +58,7 @@ describe('TransactionProxyPairService', () => {
                 },
                 RouterAbiServiceProvider,
                 ContextGetterServiceProvider,
+                MXApiServiceProvider,
             ],
         }).compile();
     });

diff --git a/src/modules/router/specs/router.transactions.service.spec.ts b/src/modules/router/specs/router.transactions.service.spec.ts
@@ -22,6 +22,7 @@ import { WinstonModule } from 'nest-winston';
 import { ConfigModule } from '@nestjs/config';
 import winston from 'winston';
 import { DynamicModuleUtils } from 'src/utils/dynamic.module.utils';
+import { MXApiServiceProvider } from 'src/services/multiversx-communication/mx.api.service.mock';
 
 describe('RouterService', () => {
     let module: TestingModule;
@@ -54,6 +55,7 @@ describe('RouterService', () => {
                 RouterTransactionService,
                 TokenServiceProvider,
                 RouterService,
+                MXApiServiceProvider,
             ],
         }).compile();
     });

diff --git a/src/modules/staking/services/staking.transactions.service.ts b/src/modules/staking/services/staking.transactions.service.ts
@@ -16,13 +16,15 @@ import { MXProxyService } from 'src/services/multiversx-communication/mx.proxy.s
 import { StakingAbiService } from './staking.abi.service';
 import { ErrorLoggerAsync } from '@multiversx/sdk-nestjs-common';
 import { MXApiService } from 'src/services/multiversx-communication/mx.api.service';
+import { ContextGetterService } from 'src/services/context/context.getter.service';
 
 @Injectable()
 export class StakingTransactionService {
     constructor(
         private readonly stakingAbi: StakingAbiService,
         private readonly mxProxy: MXProxyService,
         private readonly mxApi: MXApiService,
+        private readonly contextGetter: ContextGetterService,
     ) {}
 
     @ErrorLoggerAsync()
@@ -210,7 +212,7 @@ export class StakingTransactionService {
             ],
         );
 
-        const userNfts = await this.mxApi.getNftsForUser(
+        const userNfts = await this.contextGetter.getNftsForUser(
             userAddress,
             0,
             userNftsCount,

diff --git a/src/modules/staking/specs/staking.transactions.service.spec.ts b/src/modules/staking/specs/staking.transactions.service.spec.ts
@@ -37,6 +37,7 @@ describe('StakingTransactionService', () => {
                 MXGatewayService,
                 MXApiServiceProvider,
                 ApiConfigService,
+                MXApiServiceProvider,
             ],
         }).compile();
     });

diff --git a/src/modules/tokens/specs/token.compute.service.spec.ts b/src/modules/tokens/specs/token.compute.service.spec.ts
@@ -15,6 +15,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 { MXApiServiceProvider } from 'src/services/multiversx-communication/mx.api.service.mock';
 
 describe('TokenComputeService', () => {
     let module: TestingModule;
@@ -40,6 +41,7 @@ describe('TokenComputeService', () => {
                 TokenComputeService,
                 ApiConfigService,
                 AnalyticsQueryServiceProvider,
+                MXApiServiceProvider,
             ],
         }).compile();
     });