Merge pull request #1423 from multiversx/merge-development-feat-cs-e2…

…e-tests-dec12 Merge development feat cs e2e tests
multiversx · Dec 12, 2024 · 642aa7f · 642aa7f
2 parents 3edb5bb + adeeb5a
commit 642aa7f
Show file tree

Hide file tree

Showing 20 changed files with 378 additions and 230 deletions.
diff --git a/src/common/gateway/entities/gateway.component.request.ts b/src/common/gateway/entities/gateway.component.request.ts
@@ -5,6 +5,7 @@ export enum GatewayComponentRequest {
   networkEconomics = 'networkEconomics',
   networkTotalStaked = 'networkTotalStaked',
   addressDetails = 'addressDetails',
+  addressesBulk = 'addressesBulk',
   addressEsdt = 'addressEsdt',
   addressEsdtHistorical = 'addressEsdtHistorical',
   addressEsdtBalance = 'addressEsdtBalance',

diff --git a/src/common/gateway/gateway.service.ts b/src/common/gateway/gateway.service.ts
@@ -95,6 +95,11 @@ export class GatewayService {
     return result;
   }
 
+  async getAccountsBulk(addresses: string[]): Promise<Account[]> {
+    const result = await this.create('address/bulk', GatewayComponentRequest.addressesBulk, addresses);
+    return result.accounts;
+  }
+
   async getEsdtSupply(identifier: string): Promise<EsdtSupply> {
     const result = await this.get(`network/esdt/supply/${identifier}`, GatewayComponentRequest.esdtSupply);
     return result;

diff --git a/src/common/indexer/elastic/elastic.indexer.helper.ts b/src/common/indexer/elastic/elastic.indexer.helper.ts
@@ -18,6 +18,7 @@ import { SmartContractResultFilter } from "src/endpoints/sc-results/entities/sma
 import { ApplicationFilter } from "src/endpoints/applications/entities/application.filter";
 import { NftType } from "../entities/nft.type";
 import { EventsFilter } from "src/endpoints/events/entities/events.filter";
+import { ScriptQuery } from "./script.query";
 
 @Injectable()
 export class ElasticIndexerHelper {
@@ -93,7 +94,7 @@ export class ElasticIndexerHelper {
           QueryType.Nested('roles', [new MatchQuery('roles.ESDTRoleNFTUpdateAttributes', address)]),
           QueryType.Nested('roles', [new MatchQuery('roles.ESDTRoleNFTAddURI', address)]),
           QueryType.Nested('roles', [new MatchQuery('roles.ESDTTransferRole', address)]),
-        ]
+        ],
       ));
     }
 
@@ -253,7 +254,7 @@ export class ElasticIndexerHelper {
         QueryType.Should([
           QueryType.Match('nft_scamInfoType', 'scam'),
           QueryType.Match('nft_scamInfoType', 'potentialScam'),
-        ])
+        ]),
       );
     }
 
@@ -309,12 +310,16 @@ export class ElasticIndexerHelper {
         smartContractResultConditions.push(QueryType.Match('sender', filter.address));
       }
 
+      let mustNotQueries: AbstractQuery[] = [
+        QueryType.Exists('canBeIgnored'),
+      ];
+      if (filter.withRefunds) {
+        mustNotQueries = [];
+      }
       elasticQuery = elasticQuery.withCondition(QueryConditionOptions.should, QueryType.Must([
         QueryType.Match('type', 'unsigned'),
         QueryType.Should(smartContractResultConditions),
-      ], [
-        QueryType.Exists('canBeIgnored'),
-      ]))
+      ], mustNotQueries))
         .withCondition(QueryConditionOptions.should, QueryType.Must([
           QueryType.Should([QueryType.Match('type', 'normal')]),
           QueryType.Should([
@@ -429,7 +434,7 @@ export class ElasticIndexerHelper {
         [
           QueryType.Match('currentOwner', address),
           ...rolesConditions,
-        ]
+        ],
       ))
       .withMustMatchCondition('token', filter.identifier)
       .withMustMatchCondition('currentOwner', filter.owner);
@@ -507,9 +512,22 @@ export class ElasticIndexerHelper {
   }
 
   public buildTransactionFilterQuery(filter: TransactionFilter, address?: string): ElasticQuery {
-    let elasticQuery = ElasticQuery.create()
-      .withMustMatchCondition('type', 'normal')
-      .withMustMatchCondition('senderShard', filter.senderShard)
+    let elasticQuery = ElasticQuery.create();
+
+    if (!filter.withRelayedScresults) {
+      elasticQuery = elasticQuery.withMustMatchCondition('type', 'normal');
+    } else {
+      elasticQuery = elasticQuery.withShouldCondition([
+        QueryType.Match('type', 'normal'),
+        QueryType.Must([
+          QueryType.Exists('relayerAddr'),
+          QueryType.Match('type', 'unsigned'),
+          new ScriptQuery(`doc['originalTxHash'].size() > 0 && doc['prevTxHash'].size() > 0 && doc['originalTxHash'].value == doc['prevTxHash'].value`),
+        ]),
+      ]);
+    }
+
+    elasticQuery = elasticQuery.withMustMatchCondition('senderShard', filter.senderShard)
       .withMustMatchCondition('receiverShard', filter.receiverShard)
       .withMustMatchCondition('miniBlockHash', filter.miniBlockHash)
       .withMustMultiShouldCondition(filter.hashes, hash => QueryType.Match('_id', hash))

diff --git a/src/common/indexer/elastic/script.query.ts b/src/common/indexer/elastic/script.query.ts
@@ -0,0 +1,14 @@
+import { AbstractQuery } from "@multiversx/sdk-nestjs-elastic";
+
+// TODO: remove this and use ScriptQuery from sdk-nestjs when PR #247 is merged
+export class ScriptQuery extends AbstractQuery {
+  constructor(
+    private readonly source: string | undefined,
+  ) {
+    super();
+  }
+
+  getQuery(): any {
+    return { script: { script: { source: this.source, lang: 'painless' } } };
+  }
+}