Merge branch 'refs/heads/feat/sovereign' into merge-dev-feat-sov-jan30

# Conflicts:
#	src/endpoints/tokens/token.controller.ts
#	src/endpoints/transactions/transaction.controller.ts

.github/workflows/unit.tests.yml

@@ -4,10 +4,7 @@
 name: Unit tests
 
 on:
-  push:
-    branches: [main, development]
   pull_request:
-    branches: [main, development]
 
 jobs:
   build:

config/config.devnet-old.yaml

@@ -1,5 +1,6 @@
 network: 'devnet-old'
 metaChainShardId: 4294967295
+crossChainSenderShardId: 4294967293
 api:
   public: true
   private: true

config/config.devnet.yaml

@@ -1,5 +1,6 @@
 network: 'devnet'
 metaChainShardId: 4294967295
+crossChainSenderShardId: 4294967293
 api:
   public: true
   publicPort: 3001

config/config.e2e-mocked.mainnet.yaml

@@ -1,5 +1,6 @@
 network: 'mainnet'
 metaChainShardId: 4294967295
+crossChainSenderShardId: 4294967293
 api:
   public: true
   private: true

config/config.e2e.mainnet.yaml

@@ -1,5 +1,6 @@
 network: 'mainnet'
 metaChainShardId: 4294967295
+crossChainSenderShardId: 4294967293
 api:
   public: true
   private: true

config/config.mainnet.yaml

@@ -1,5 +1,6 @@
 network: 'mainnet'
 metaChainShardId: 4294967295
+crossChainSenderShardId: 4294967293
 api:
   public: true
   publicPort: 3001

config/config.placeholder.yaml

@@ -1,5 +1,6 @@
 network: 'DAPP_CONFIG'
 metaChainShardId: 4294967295
+crossChainSenderShardId: 4294967293
 api:
   public: true
   publicPort: 3001

config/config.testnet.yaml

@@ -1,5 +1,6 @@
 network: 'testnet'
 metaChainShardId: 4294967295
+crossChainSenderShardId: 4294967293
 api:
   public: true
   publicPort: 3001

src/common/api-config/api.config.service.ts

@@ -550,6 +550,15 @@ export class ApiConfigService {
     return metaChainShardId;
   }
 
+  getCrossChainSenderShardId(): number {
+    const crossChainSenderShardId = this.configService.get<number>('crossChainSenderShardId');
+    if (crossChainSenderShardId === undefined) {
+      throw new Error('No crossChainSenderShardId present');
+    }
+
+    return crossChainSenderShardId;
+  }
+
   getRateLimiterSecret(): string | undefined {
     return this.configService.get<string>('rateLimiterSecret');
   }

src/common/indexer/elastic/elastic.indexer.helper.ts

@@ -535,16 +535,27 @@ export class ElasticIndexerHelper {
     let elasticQuery = ElasticQuery.create();
 
     if (!filter.withRelayedScresults) {
-      elasticQuery = elasticQuery.withMustMatchCondition('type', 'normal');
+      if (!filter.withCrossChainTransfers) {
+        elasticQuery = elasticQuery.withMustMatchCondition('type', 'normal');
+      } else {
+        elasticQuery = elasticQuery.withShouldCondition([
+          QueryType.Match('type', 'normal'),
+          QueryType.Match('senderShard', this.apiConfigService.getCrossChainSenderShardId()),
+        ]);
+      }
     } else {
-      elasticQuery = elasticQuery.withShouldCondition([
+      const shouldConditions = [
         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`),
         ]),
-      ]);
+      ];
+      if (filter.withCrossChainTransfers) {
+        shouldConditions.push(QueryType.Match('senderShard', this.apiConfigService.getCrossChainSenderShardId()));
+      }
+      elasticQuery = elasticQuery.withShouldCondition(shouldConditions);
     }
 
     elasticQuery = elasticQuery.withMustMatchCondition('senderShard', filter.senderShard)

src/endpoints/accounts/account.controller.ts

@@ -885,6 +885,7 @@ export class AccountController {
   @ApiQuery({ name: 'isScCall', description: 'Returns sc call transactions details', required: false, type: Boolean })
   @ApiQuery({ name: 'withActionTransferValue', description: 'Returns value in USD and EGLD for transferred tokens within the action attribute', required: false })
   @ApiQuery({ name: 'withRelayedScresults', description: 'If set to true, will include smart contract results that resemble relayed transactions', required: false, type: Boolean })
+  @ApiQuery({ name: 'withCrossChainTransfers', description: 'If set to true, will include cross chain transfer transactions', required: false, type: Boolean })
   async getAccountTransactions(
     @Param('address', ParseAddressPipe) address: string,
     @Query('from', new DefaultValuePipe(0), ParseIntPipe) from: number,
@@ -914,6 +915,7 @@ export class AccountController {
     @Query('isScCall', ParseBoolPipe) isScCall?: boolean,
     @Query('withActionTransferValue', ParseBoolPipe) withActionTransferValue?: boolean,
     @Query('withRelayedScresults', ParseBoolPipe) withRelayedScresults?: boolean,
+    @Query('withCrossChainTransfers', ParseBoolPipe) withCrossChainTransfers?: boolean,
   ) {
     const options = TransactionQueryOptions.applyDefaultOptions(size, { withScResults, withOperations, withLogs, withScamInfo, withUsername, withBlockInfo, withActionTransferValue });
 
@@ -935,6 +937,7 @@ export class AccountController {
       isScCall,
       round,
       withRelayedScresults,
+      withCrossChainTransfers,
     });
     TransactionFilter.validate(transactionFilter, size);
     return await this.transactionService.getTransactions(transactionFilter, new QueryPagination({ from, size }), options, address, fields);
@@ -959,6 +962,7 @@ export class AccountController {
   @ApiQuery({ name: 'isRelayed', description: 'Returns isRelayed transactions details', required: false, type: Boolean })
   @ApiQuery({ name: 'isScCall', description: 'Returns sc call transactions details', required: false, type: Boolean })
   @ApiQuery({ name: 'withRelayedScresults', description: 'If set to true, will include smart contract results that resemble relayed transactions', required: false, type: Boolean })
+  @ApiQuery({ name: 'withCrossChainTransfers', description: 'If set to true, will include cross chain transfer transactions', required: false, type: Boolean })
   async getAccountTransactionsCount(
     @Param('address', ParseAddressPipe) address: string,
     @Query('sender', ParseAddressPipe) sender?: string,
@@ -977,7 +981,7 @@ export class AccountController {
     @Query('isRelayed', ParseBoolPipe) isRelayed?: boolean,
     @Query('isScCall', ParseBoolPipe) isScCall?: boolean,
     @Query('withRelayedScresults', ParseBoolPipe) withRelayedScresults?: boolean,
-
+    @Query('withCrossChainTransfers', ParseBoolPipe) withCrossChainTransfers?: boolean,
   ): Promise<number> {
 
     return await this.transactionService.getTransactionCount(new TransactionFilter({
@@ -997,6 +1001,7 @@ export class AccountController {
       isScCall,
       round,
       withRelayedScresults,
+      withCrossChainTransfers,
     }), address);
   }
 

src/endpoints/tokens/token.controller.ts

@@ -206,6 +206,7 @@ export class TokenController {
   @ApiQuery({ name: 'withBlockInfo', description: 'Returns sender / receiver block details', required: false, type: Boolean })
   @ApiQuery({ name: 'withActionTransferValue', description: 'Returns value in USD and EGLD for transferred tokens within the action attribute', required: false })
   @ApiQuery({ name: 'withRelayedScresults', description: 'If set to true, will include smart contract results that resemble relayed transactions', required: false, type: Boolean })
+  @ApiQuery({ name: 'withCrossChainTransfers', description: 'If set to true, will include cross chain transfer transactions', required: false, type: Boolean })
   async getTokenTransactions(
     @Param('identifier', ParseTokenPipe) identifier: string,
     @Query('from', new DefaultValuePipe(0), ParseIntPipe) from: number,
@@ -232,6 +233,7 @@ export class TokenController {
     @Query('withBlockInfo', ParseBoolPipe) withBlockInfo?: boolean,
     @Query('withActionTransferValue', ParseBoolPipe) withActionTransferValue?: boolean,
     @Query('withRelayedScresults', ParseBoolPipe) withRelayedScresults?: boolean,
+    @Query('withCrossChainTransfers', ParseBoolPipe) withCrossChainTransfers?: boolean,
   ) {
     const options = TransactionQueryOptions.applyDefaultOptions(size, { withScResults, withOperations, withLogs, withScamInfo, withUsername, withBlockInfo, withActionTransferValue });
 
@@ -256,6 +258,7 @@ export class TokenController {
       round,
       isScCall,
       withRelayedScresults,
+      withCrossChainTransfers,
     });
     TransactionFilter.validate(transactionFilter, size);
 
@@ -284,6 +287,7 @@ export class TokenController {
   @ApiQuery({ name: 'round', description: 'Filter by round number', required: false })
   @ApiQuery({ name: 'isScCall', description: 'Returns sc call transactions details', required: false, type: Boolean })
   @ApiQuery({ name: 'withRelayedScresults', description: 'If set to true, will include smart contract results that resemble relayed transactions', required: false, type: Boolean })
+  @ApiQuery({ name: 'withCrossChainTransfers', description: 'If set to true, will include cross chain transfer transactions', required: false, type: Boolean })
   async getTokenTransactionsCount(
     @Param('identifier', ParseTokenPipe) identifier: string,
     @Query('sender', ParseAddressPipe) sender?: string,
@@ -298,6 +302,7 @@ export class TokenController {
     @Query('round', ParseIntPipe) round?: number,
     @Query('withRelayedScresults', ParseBoolPipe) withRelayedScresults?: boolean,
     @Query('isScCall', ParseBoolPipe) isScCall?: boolean,
+    @Query('withCrossChainTransfers', ParseBoolPipe) withCrossChainTransfers?: boolean,
   ) {
     return await this.transactionService.getTransactionCount(new TransactionFilter({
       sender,
@@ -313,6 +318,7 @@ export class TokenController {
       round,
       withRelayedScresults,
       isScCall,
+      withCrossChainTransfers,
     }));
   }
 

src/endpoints/transactions/entities/transaction.filter.ts

@@ -30,6 +30,7 @@ export class TransactionFilter {
   withRefunds?: boolean;
   withRelayedScresults?: boolean;
   withTxsRelayedByAddress?: boolean;
+  withCrossChainTransfers?: boolean;
 
   constructor(init?: Partial<TransactionFilter>) {
     Object.assign(this, init);

src/endpoints/transactions/transaction-action/entities/transaction.metadata.ts

@@ -11,6 +11,7 @@ export class TransactionMetadata {
   receiver: string = '';
   value: BigInt = BigInt(0);
   functionName?: string;
+  senderShard?: number = -1;
   functionArgs: string[] = [];
   timestamp: number = 0;
   transfers?: TransactionMetadataTransfer[];

src/endpoints/transactions/transaction-action/transaction.action.service.ts

@@ -10,8 +10,9 @@ import { TransactionActionEsdtNftRecognizerService } from "./recognizers/esdt/tr
 import { TokenTransferService } from "src/endpoints/tokens/token.transfer.service";
 import { TransactionType } from "src/endpoints/transactions/entities/transaction.type";
 import { MetabondingActionRecognizerService } from "./recognizers/mex/mex.metabonding.action.recognizer.service";
-import { AddressUtils, BinaryUtils, StringUtils } from "@multiversx/sdk-nestjs-common";
-import { OriginLogger } from "@multiversx/sdk-nestjs-common";
+import { AddressUtils, BinaryUtils, OriginLogger, StringUtils } from "@multiversx/sdk-nestjs-common";
+import { TokenTransferProperties } from "../../tokens/entities/token.transfer.properties";
+import { ApiConfigService } from "../../../common/api-config/api.config.service";
 
 @Injectable()
 export class TransactionActionService {
@@ -26,6 +27,7 @@ export class TransactionActionService {
     @Inject(forwardRef(() => TokenTransferService))
     private readonly tokenTransferService: TokenTransferService,
     private readonly metabondingRecognizer: MetabondingActionRecognizerService,
+    private readonly apiConfigService: ApiConfigService,
   ) { }
 
   private async getRecognizers() {
@@ -86,6 +88,9 @@ export class TransactionActionService {
     metadata.receiver = transaction.receiver;
     metadata.timestamp = transaction.timestamp;
     metadata.value = BigInt(transaction.value);
+    if (transaction.senderShard !== undefined) {
+      metadata.senderShard = transaction.senderShard;
+    }
 
     if (transaction.data) {
       const decodedData = BinaryUtils.base64Decode(transaction.data);
@@ -130,7 +135,8 @@ export class TransactionActionService {
     try {
       if (transaction.type === TransactionType.SmartContractResult) {
         if (metadata.functionName === 'MultiESDTNFTTransfer' &&
-          metadata.functionArgs.length > 0
+          metadata.functionArgs.length > 0 &&
+          metadata.senderShard !== this.apiConfigService.getCrossChainSenderShardId()
         ) {
           // if the first argument has up to 4 hex chars (meaning it will contain up to 65536 transfers)
           // then we insert the address as the first parameter. otherwise we assume that the address
@@ -170,8 +176,15 @@ export class TransactionActionService {
   }
 
   private async getMultiTransferMetadata(metadata: TransactionMetadata, applyValue: boolean = false): Promise<TransactionMetadata | undefined> {
+    /*
+    sovereign cross chain transfer example: MultiESDTNFTTransfer@02@4147452d626532353731@@01314fb37062980000@42474431362d633437663436@@5d894a4a3a220000
+    regular chain example:                  MultiESDTNFTTransfer@0000000000000000050000b4c094947e427d79931a8bad81316b797d238cdb3f@02@4c524f4e452d633133303234@@036f5933a0d19ae387@524f4e452d626232653639@@04493d2ce61b650000@6164644c6971756964697479@01@01
+     */
+    const isSovereignCrossChainTransfer = metadata.senderShard === this.apiConfigService.getCrossChainSenderShardId();
     if (metadata.sender !== metadata.receiver) {
-      return undefined;
+      if (!isSovereignCrossChainTransfer) {
+        return undefined;
+      }
     }
 
     if (metadata.functionName !== 'MultiESDTNFTTransfer') {
@@ -183,27 +196,42 @@ export class TransactionActionService {
       return undefined;
     }
 
-    if (!AddressUtils.isValidHexAddress(args[0])) {
+    if (!AddressUtils.isValidHexAddress(args[0]) && !isSovereignCrossChainTransfer) {
       return undefined;
     }
 
-    const receiver = AddressUtils.bech32Encode(args[0]);
-    const transferCount = BinaryUtils.hexToNumber(args[1]);
+    let receiver: string;
+    if (!isSovereignCrossChainTransfer) {
+      receiver = AddressUtils.bech32Encode(args[0]);
+    } else {
+      receiver = metadata.receiver;
+    }
+
+    let transferCountIndex = 1;
+    if (isSovereignCrossChainTransfer) {
+      transferCountIndex = 0;
+    }
+    const transferCount = BinaryUtils.hexToNumber(args[transferCountIndex]);
 
     const result = new TransactionMetadata();
     if (!result.transfers) {
       result.transfers = [];
     }
 
     let index = 2;
+    if (isSovereignCrossChainTransfer) {
+      index = 1;
+    }
     for (let i = 0; i < transferCount; i++) {
       const identifier = BinaryUtils.hexToString(args[index++]);
       const nonce = args[index++];
       const value = this.parseValueFromMultiTransferValueArg(args[index++]);
 
+      let validProperties = false;
       if (nonce && nonce !== "00") {
         const properties = await this.tokenTransferService.getTokenTransferProperties({ identifier, nonce });
         if (properties) {
+          validProperties = true;
           result.transfers.push({
             value,
             properties,
@@ -212,12 +240,26 @@ export class TransactionActionService {
       } else {
         const properties = await this.tokenTransferService.getTokenTransferProperties({ identifier, timestamp: metadata.timestamp, value: value.toString(), applyValue });
         if (properties) {
+          validProperties = true;
           result.transfers.push({
             value,
             properties,
           });
         }
       }
+
+      // TODO: might remove this after token details are indexed inside sovereign es
+      if (!validProperties) { // missing token details (decimals for example. extract transfer info - best effort)
+        result.transfers.push({
+          value,
+          properties: new TokenTransferProperties({
+            decimals: 18,
+            identifier,
+            ticker: identifier,
+            token: identifier,
+          }),
+        });
+      }
     }
 
     result.sender = metadata.sender;