[SERVICES-1824] improve escrow queries

src/modules/escrow/services/escrow.abi.service.ts

@@ -17,12 +17,16 @@
 import { GetOrSetCache } from 'src/helpers/decorators/caching.decorator';
 import { oneDay } from 'src/helpers/helpers';
 import { CacheTtlInfo } from 'src/services/caching/cache.ttl.info';
+import { CachingService } from 'src/services/caching/cache.service';
+import { EscrowSetterService } from './escrow.setter.service';
 
 @Injectable()
 export class EscrowAbiService extends GenericAbiService {
     constructor(
         protected readonly mxProxy: MXProxyService,
         private readonly mxGateway: MXGatewayService,
+        private readonly cachingService: CachingService,
+        private readonly escrowSetter: EscrowSetterService,
     ) {
         super(mxProxy);
     }
@@ -110,10 +114,17 @@
     }
 
     async getAllReceiversRaw(senderAddress: string): Promise<string[]> {
-        const hexValues = await this.mxGateway.getSCStorageKeys(
-            scAddress.escrow,
-            [],
+        let hexValues = await this.cachingService.getCache<object>(
+            `escrow.scKeys`,
         );
+        if (!hexValues || hexValues === undefined) {
+            hexValues = await this.mxGateway.getSCStorageKeys(
+                scAddress.escrow,
+                [],
+            );
+            await this.escrowSetter.setSCStorageKeys(hexValues);
+        }
+
         const receivers = [];
         const allSendersHex = Buffer.from('allSenders').toString('hex');
         const itemHex = Buffer.from('.item').toString('hex');
@@ -266,6 +277,12 @@
         remoteTtl: oneDay(),
     })
     async addressPermission(address: string): Promise<SCPermissions[]> {
+        const addressesWithPermissions =
+            await this.allAddressesWithPermissions();
+        if (!addressesWithPermissions.includes(address)) {
+            return [SCPermissions.NONE];
+        }
+
         return await this.getAddressPermissionRaw(address);
     }
 
@@ -293,4 +310,40 @@
                 return [];
         }
     }
+
+    @ErrorLoggerAsync({
+        className: EscrowAbiService.name,
+        logArgs: true,
+    })
+    @GetOrSetCache({
+        baseKey: 'escrow',
+        remoteTtl: oneDay(),
+    })
+    async allAddressesWithPermissions(): Promise<string[]> {
+        return await this.getAllAddressesWithPermissionsRaw();
+    }
+
+    async getAllAddressesWithPermissionsRaw(): Promise<string[]> {
+        let hexValues = await this.cachingService.getCache<object>(
+            `escrow.scKeys`,
+        );
+        if (!hexValues || hexValues === undefined) {
+            hexValues = await this.mxGateway.getSCStorageKeys(
+                scAddress.escrow,
+                [],
+            );
+            await this.escrowSetter.setSCStorageKeys(hexValues);
+        }
+
+        const addresses = [];
+        const permissionsHex = Buffer.from('permissions').toString('hex');
+        Object.keys(hexValues).forEach((key) => {
+            if (key.includes(permissionsHex)) {
+                const addressHex = key.split(permissionsHex)[1];
+                addresses.push(Address.fromHex(addressHex).bech32());
+            }
+        });
+
+        return addresses;
+    }
 }

src/modules/escrow/services/escrow.setter.service.ts

@@ -5,6 +5,7 @@ import { CachingService } from 'src/services/caching/cache.service';
 import { GenericSetterService } from 'src/services/generics/generic.setter.service';
 import { Logger } from 'winston';
 import { ScheduledTransferModel } from '../models/escrow.model';
+import { CacheTtlInfo } from 'src/services/caching/cache.ttl.info';
 
 @Injectable()
 export class EscrowSetterService extends GenericSetterService {
@@ -70,4 +71,13 @@ export class EscrowSetterService extends GenericSetterService {
             oneDay(),
         );
     }
+
+    async setSCStorageKeys(value: object): Promise<string> {
+        return await this.setData(
+            this.getCacheKey('scKeys'),
+            value,
+            CacheTtlInfo.ContractState.remoteTtl,
+            CacheTtlInfo.ContractState.localTtl,
+        );
+    }
 }

src/modules/escrow/specs/escrow.abi.service.spec.ts

@@ -11,10 +11,12 @@ import { CacheModule } from '@nestjs/cache-manager';
 import { CachingService } from 'src/services/caching/cache.service';
 import { ApiConfigService } from 'src/helpers/api.config.service';
 import winston from 'winston';
+import { EscrowSetterService } from '../services/escrow.setter.service';
 
 describe('EscrowAbiService', () => {
     let service: EscrowAbiService;
     let mxGateway: MXGatewayService;
+    let cachingService: CachingService;
 
     beforeAll(async () => {
         const module: TestingModule = await Test.createTestingModule({
@@ -27,6 +29,7 @@ describe('EscrowAbiService', () => {
             ],
             providers: [
                 EscrowAbiService,
+                EscrowSetterService,
                 MXProxyServiceProvider,
                 MXGatewayServiceProvider,
                 CachingService,
@@ -36,6 +39,7 @@ describe('EscrowAbiService', () => {
 
         service = module.get<EscrowAbiService>(EscrowAbiService);
         mxGateway = module.get<MXGatewayService>(MXGatewayService);
+        cachingService = module.get<CachingService>(CachingService);
     });
 
     it('should be defined', () => {
@@ -119,6 +123,7 @@ describe('EscrowAbiService', () => {
 
         receivers = await service.getAllReceiversRaw(sender.bech32());
         expect(receivers).toEqual([]);
+        await cachingService.deleteInCache(`escrow.scKeys`);
     });
 
     it('should get one receiver for sender', async () => {
@@ -136,6 +141,7 @@ describe('EscrowAbiService', () => {
         expect(receivers).toEqual([
             'erd1devnet6uy8xjusvusfy3q83qadfhwrtty5fwa8ceh9cl60q2p6ysra7aaa',
         ]);
+        await cachingService.deleteInCache(`escrow.scKeys`);
     });
 
     it('should get two receivers for sender', async () => {
@@ -160,5 +166,6 @@ describe('EscrowAbiService', () => {
             'erd1devnet6uy8xjusvusfy3q83qadfhwrtty5fwa8ceh9cl60q2p6ysra7aaa',
             'erd1932eft30w753xyvme8d49qejgkjc09n5e49w4mwdjtm0neld797su0dlxp',
         ]);
+        await cachingService.deleteInCache(`escrow.scKeys`);
     });
 });

src/modules/rabbitmq/handlers/escrow.handler.service.ts

@@ -6,15 +6,18 @@ import {
 } from '@multiversx/sdk-exchange';
 import { Inject, Injectable } from '@nestjs/common';
 import { RedisPubSub } from 'graphql-redis-subscriptions';
+import { scAddress } from 'src/config';
 import { EscrowAbiService } from 'src/modules/escrow/services/escrow.abi.service';
 import { EscrowSetterService } from 'src/modules/escrow/services/escrow.setter.service';
+import { MXGatewayService } from 'src/services/multiversx-communication/mx.gateway.service';
 import { PUB_SUB } from 'src/services/redis.pubSub.module';
 
 @Injectable()
 export class EscrowHandlerService {
     constructor(
         private readonly escrowAbi: EscrowAbiService,
         private readonly escrowSetter: EscrowSetterService,
+        private readonly mxGateway: MXGatewayService,
         @Inject(PUB_SUB) private pubSub: RedisPubSub,
     ) {}
 
@@ -82,6 +85,13 @@ export class EscrowHandlerService {
         sender: string,
         receiver: string,
     ): Promise<void> {
+        const scKeys = await this.mxGateway.getSCStorageKeys(
+            scAddress.escrow,
+            [],
+        );
+        const cachedKey = await this.escrowSetter.setSCStorageKeys(scKeys);
+        await this.deleteCacheKeys([cachedKey]);
+
         const [allSenders, allReceivers, scheduledTransfers] =
             await Promise.all([
                 this.escrowAbi.getAllSendersRaw(receiver),