Merge pull request #1583 from multiversx/supernova-execution-results-mb

Supernova execution results mb

Author: bogdan-rosianu

src/common/gateway/entities/gateway.component.request.ts

@@ -1,5 +1,7 @@
 export enum GatewayComponentRequest {
   networkConfig = 'networkConfig',
+  networkEnableEpochs = 'networkEnableEpochs',
+  networkEnableEpochsV2 = 'networkEnableEpochsV2',
   networkStatus = 'networkStatus',
   networkEsdt = 'networkEsdt',
   networkEconomics = 'networkEconomics',

src/common/gateway/gateway.service.ts

@@ -91,6 +91,16 @@ export class GatewayService {
     });
   }
 
+  async getNetworkEnableEpochs(): Promise<Record<string,number>> {
+    const result = await this.get(`network/enable-epochs`, GatewayComponentRequest.networkEnableEpochs);
+    return result.enableEpochs;
+  }
+
+  async getNetworkEnableEpochsV2(): Promise<Record<string,number>> {
+    const result = await this.get(`network/enable-epochs-v2`, GatewayComponentRequest.networkEnableEpochsV2);
+    return result.enableEpochs;
+  }
+
   async getAddressDetails(address: string): Promise<Account> {
     const result = await this.get(`address/${address}`, GatewayComponentRequest.addressDetails);
     return result;

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

@@ -251,6 +251,10 @@ export class ElasticIndexerService implements IndexerInterface {
     return await this.elasticService.getItem('blocks', 'hash', hash);
   }
 
+  async getExecutionResults(hash: string): Promise<Block> {
+    return await this.elasticService.getItem('executionresults', 'hash', hash);
+  }
+
   async getBlockByMiniBlockHash(miniBlockHash: string): Promise<Block | undefined> {
     const elasticQuery = ElasticQuery.create()
       .withCondition(QueryConditionOptions.must, [QueryType.Match('miniBlocksHashes', miniBlockHash)])

src/common/indexer/indexer.interface.ts

@@ -74,6 +74,8 @@ export interface IndexerInterface {
 
   getBlock(hash: string): Promise<Block>
 
+  getExecutionResults(hash: string): Promise<Block>
+
   getBlockByMiniBlockHash(miniBlockHash: string): Promise<Block | undefined>
 
   getMiniBlock(miniBlockHash: string): Promise<MiniBlock>

src/common/indexer/indexer.service.ts

@@ -166,6 +166,11 @@ export class IndexerService implements IndexerInterface {
     return await this.indexerInterface.getBlock(hash);
   }
 
+  @LogPerformanceAsync(MetricsEvents.SetIndexerDuration)
+  async getExecutionResults(hash: string): Promise<Block> {
+    return await this.indexerInterface.getExecutionResults(hash);
+  }
+
   @LogPerformanceAsync(MetricsEvents.SetIndexerDuration)
   async getBlockByMiniBlockHash(miniBlockHash: string): Promise<Block | undefined> {
     return await this.indexerInterface.getBlockByMiniBlockHash(miniBlockHash);

src/endpoints/blocks/block.service.ts

@@ -11,6 +11,8 @@ import { NodeService } from "../nodes/node.service";
 import { IdentitiesService } from "../identities/identities.service";
 import { ApiConfigService } from "../../common/api-config/api.config.service";
 import { ConcurrencyUtils } from "src/utils/concurrency.utils";
+import { ApiUtils } from "@multiversx/sdk-nestjs-http";
+import { GatewayService } from "../../common/gateway/gateway.service";
 
 @Injectable()
 export class BlockService {
@@ -23,6 +25,7 @@ export class BlockService {
     @Inject(forwardRef(() => IdentitiesService))
     private readonly identitiesService: IdentitiesService,
     private readonly apiConfigService: ApiConfigService,
+    private readonly gatewayService: GatewayService,
   ) { }
 
   async getBlocksCount(filter: BlockFilter): Promise<number> {
@@ -109,11 +112,20 @@ export class BlockService {
   }
 
   async getBlock(hash: string): Promise<BlockDetailed> {
-    const result = await this.indexerService.getBlock(hash) as any;
+    let result = await this.indexerService.getBlock(hash) as any;
 
     const isChainAndromedaEnabled = this.apiConfigService.isChainAndromedaEnabled()
       && result.epoch >= this.apiConfigService.getChainAndromedaActivationEpoch();
 
+    const supernovaEnableEpoch = await this.getSupernovaEnableEpoch();
+    const isSupernovaEnabled = supernovaEnableEpoch !== -1 && result.epoch >= supernovaEnableEpoch;
+    if (isSupernovaEnabled) {
+      const executionResults = await this.indexerService.getExecutionResults(hash);
+      if (executionResults) {
+        result = ApiUtils.mergeObjects(result, executionResults);
+      }
+    }
+
     if (result.round > 0) {
       const publicKeys = await this.blsService.getPublicKeys(result.shardId, result.epoch);
       if (result.proposerBlsKey) {
@@ -122,7 +134,7 @@ export class BlockService {
         result.proposer = publicKeys[result.proposer];
       }
       if (!isChainAndromedaEnabled) {
-        result.validators = result.validators.map((validator: number) => publicKeys[validator]);
+        result.validators = result.validators?.map((validator: number) => publicKeys[validator]);
       } else {
         result.validators = publicKeys;
       }
@@ -161,4 +173,17 @@ export class BlockService {
     }
     return blocks[0];
   }
+
+  async getSupernovaEnableEpoch(): Promise<number> {
+    const enableEpochs = await this.getNetworkEnableEpochs();
+    return enableEpochs["erd_supernova_enable_epoch"] ?? -1;
+  }
+
+  async getNetworkEnableEpochs(): Promise<Record<string, number>> {
+    return await this.cachingService.getOrSet(
+      CacheInfo.NetworkEnableEpochs.key,
+      async () => await this.gatewayService.getNetworkEnableEpochs(),
+      CacheInfo.NetworkEnableEpochs.ttl,
+    );
+  }
 }

src/endpoints/proxy/gateway.proxy.controller.ts

@@ -233,6 +233,16 @@ export class GatewayProxyController {
     return await this.gatewayGet('network/config', GatewayComponentRequest.networkConfig);
   }
 
+  @Get('/network/enable-epochs')
+  async getNetworkEnableEpochs() {
+    return await this.gatewayGet('network/enable-epochs', GatewayComponentRequest.networkEnableEpochs);
+  }
+
+  @Get('/network/enable-epochs-v2')
+  async getNetworkEnabledEpochsV2() {
+    return await this.gatewayGet('network/enable-epochs-v2', GatewayComponentRequest.networkEnableEpochsV2);
+  }
+
   @Get('/network/economics')
   async getNetworkEconomics() {
     return await this.gatewayGet('network/economics', GatewayComponentRequest.networkEconomics);

src/test/unit/services/blocks.spec.ts

@@ -11,6 +11,7 @@ import { NodeService } from "src/endpoints/nodes/node.service";
 import { CacheInfo } from "src/utils/cache.info";
 import { BlockProofDto } from "../../../endpoints/blocks/entities/block.proof";
 import { ApiConfigService } from "../../../common/api-config/api.config.service";
+import { GatewayService } from "../../../common/gateway/gateway.service";
 
 describe('Block Service', () => {
   let blockService: BlockService;
@@ -65,6 +66,12 @@ describe('Block Service', () => {
             getChainAndromedaActivationEpoch: jest.fn(),
           },
         },
+        {
+          provide: GatewayService,
+          useValue: {
+            getNetworkEnableEpochs: jest.fn(),
+          },
+        },
       ],
     }).compile();
 

src/utils/cache.info.ts

@@ -418,6 +418,11 @@ export class CacheInfo {
     ttl: Constants.oneMinute() * 10,
   };
 
+  static NetworkEnableEpochs: CacheInfo = {
+    key: "networkEnableEpochs",
+    ttl: Constants.oneHour() * 10,
+  };
+
   static MexPairs: CacheInfo = {
     key: "mexPairs",
     ttl: Constants.oneMinute() * 10,