Merge branch 'development' into ws-custom-subscriptions

Author: stefangutica

config/config.devnet.yaml

@@ -73,6 +73,9 @@ features:
   stakingV5:
     enabled: true
     activationEpoch: 4817
+  deprecatedRelayedV1V2:
+    enabled: true
+    activationEpoch: 4569
   nodeEpochsLeft:
     enabled: false
   transactionProcessor:

config/config.mainnet.yaml

@@ -71,6 +71,9 @@ features:
   stakingV5:
     enabled: true
     activationEpoch: 1951
+  deprecatedRelayedV1V2:
+    enabled: true
+    activationEpoch: 1918
   nodeEpochsLeft:
     enabled: false
   transactionProcessor:

config/config.testnet.yaml

@@ -70,6 +70,9 @@ features:
   stakingV5:
     enabled: true
     activationEpoch: 2519
+  deprecatedRelayedV1V2:
+    enabled: true
+    activationEpoch: 2038
   nodeEpochsLeft:
     enabled: false
   transactionProcessor:

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

@@ -907,6 +907,23 @@ export class ApiConfigService {
     return this.configService.get<number>('features.stakingV5.activationEpoch') ?? 99999;
   }
 
+  isDeprecatedRelayedV1V2Enabled(): boolean {
+    return this.configService.get<boolean>('features.deprecatedRelayedV1V2.enabled') ?? false;
+  }
+
+  getDeprecatedRelayedV1V2ActivationEpoch(): number {
+    return this.configService.get<number>('features.deprecatedRelayedV1V2.activationEpoch') ?? 99999;
+  }
+
+  shouldDeprecateRelayedV1V2(epoch: number): boolean {
+    const isEnabled = this.isDeprecatedRelayedV1V2Enabled();
+    if (!isEnabled) {
+      return false;
+    }
+
+    return epoch >= this.getDeprecatedRelayedV1V2ActivationEpoch();
+  }
+
   isAssetsCdnFeatureEnabled(): boolean {
     return this.configService.get<boolean>('features.assetsFetch.enabled') ?? false;
   }

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

@@ -4,4 +4,5 @@ export enum TransactionActionCategory {
   stake = 'stake',
   scCall = 'scCall',
   scDeploy = 'scDeploy',
+  deprecatedRelayedV1V2 = 'deprecatedRelayedV1V2',
 }

src/endpoints/transactions/transaction.service.ts

@@ -42,6 +42,8 @@ import { NetworkService } from 'src/endpoints/network/network.service';
 import { TransactionWithPpu } from './entities/transaction.with.ppu';
 import { GasBucket } from './entities/gas.bucket';
 import { GasBucketConstants } from './constants/gas.bucket.constants';
+import { TransactionAction } from "./transaction-action/entities/transaction.action";
+import { TransactionActionCategory } from "./transaction-action/entities/transaction.action.category";
 
 @Injectable()
 export class TransactionService {
@@ -96,6 +98,32 @@ export class TransactionService {
     return await this.indexerService.getTransactionCount(filter, address);
   }
 
+  public reorderAccountSentTransactionsByNonce(transactions: TransactionDetailed[], accountAddress: string): TransactionDetailed[] {
+    const sentPositions: number[] = [];
+    const sentTransactions: TransactionDetailed[] = [];
+
+    transactions.forEach((tx, index) => {
+      if (tx.sender === accountAddress) {
+        sentPositions.push(index);
+        sentTransactions.push(tx);
+      }
+    });
+
+    sentTransactions.sort((a, b) => {
+      const nonceA = a.nonce ?? 0;
+      const nonceB = b.nonce ?? 0;
+      return nonceB - nonceA;
+    });
+
+    const result = [...transactions];
+
+    sentPositions.forEach((position, index) => {
+      result[position] = sentTransactions[index];
+    });
+
+    return result;
+  }
+
   private getDistinctUserAddressesFromTransactions(transactions: Transaction[]): string[] {
     const allAddresses = [];
     for (const transaction of transactions) {
@@ -169,6 +197,13 @@ export class TransactionService {
     let transactions: TransactionDetailed[] = [];
     transactions = elasticTransactions.map(x => ApiUtils.mergeObjects(new TransactionDetailed(), x));
 
+    const hasSenderFilter = filter.sender || (filter.senders && filter.senders.length > 0);
+    const hasReceiverFilter = filter.receivers && filter.receivers.length > 0;
+
+    if (address && !hasSenderFilter && !hasReceiverFilter) {
+      transactions = this.reorderAccountSentTransactionsByNonce(transactions, address);
+    }
+
     if (filter.hashes) {
       const txHashes: string[] = filter.hashes;
       const elasticHashes = elasticTransactions.map(({ txHash }: any) => txHash);
@@ -193,7 +228,6 @@ export class TransactionService {
 
     for (const transaction of transactions) {
       transaction.type = undefined;
-      transaction.relayedVersion = this.extractRelayedVersion(transaction);
     }
 
     await this.processTransactions(transactions, {
@@ -202,6 +236,8 @@ export class TransactionService {
       withActionTransferValue: queryOptions?.withActionTransferValue ?? false,
     });
 
+    this.processRelayedInfo(transactions);
+
     return transactions;
   }
 
@@ -225,9 +261,9 @@ export class TransactionService {
 
     if (transaction !== null) {
       transaction.price = await this.getTransactionPrice(transaction);
-      transaction.relayedVersion = this.extractRelayedVersion(transaction);
 
       await this.processTransactions([transaction], { withScamInfo: true, withUsername: true, withActionTransferValue });
+      this.processRelayedInfo([transaction]);
 
       if (transaction.pendingResults === true && transaction.results) {
         for (const result of transaction.results) {
@@ -347,6 +383,26 @@ export class TransactionService {
     }
   }
 
+  public processRelayedInfo(transactions: TransactionDetailed[]) {
+    for (const transaction of transactions) {
+      transaction.relayedVersion = this.extractRelayedVersion(transaction);
+      if (transaction.relayedVersion && ["v1", "v2"].includes(transaction.relayedVersion)) {
+        const shouldSkip = this.apiConfigService.shouldDeprecateRelayedV1V2(transaction.epoch ?? 0);
+        if (shouldSkip) {
+          transaction.function = undefined;
+          transaction.action = new TransactionAction({
+            category: TransactionActionCategory.deprecatedRelayedV1V2,
+            name: "Deprecated transaction action",
+            description: `Relayed v1/v2 transactions are deprecated`,
+          });
+        }
+      }
+      if (!transaction.isRelayed) {
+        transaction.relayedVersion = undefined;
+      }
+    }
+  }
+
   async processTransactions(transactions: Transaction[], options: { withScamInfo: boolean, withUsername: boolean, withActionTransferValue: boolean }): Promise<void> {
 
     this.normalizeTimestampMs(transactions);
@@ -587,7 +643,7 @@ export class TransactionService {
   }
 
   private extractRelayedVersion(transaction: TransactionDetailed): string | undefined {
-    if (transaction.isRelayed == true && transaction.data) {
+    if (transaction.data) {
       const decodedData = BinaryUtils.base64Decode(transaction.data);
 
       if (decodedData.startsWith('relayedTx@')) {

src/endpoints/transfers/transfer.service.ts

@@ -142,6 +142,13 @@ export class TransferService {
       transactions.push(transaction);
     }
 
+    const hasSenderFilter = filter.sender || (filter.senders && filter.senders.length > 0);
+    const hasReceiverFilter = filter.receivers && filter.receivers.length > 0;
+
+    if (filter.address && !hasSenderFilter && !hasReceiverFilter) {
+      transactions = this.transactionService.reorderAccountSentTransactionsByNonce(transactions, filter.address);
+    }
+
     if (queryOptions.withBlockInfo || (fields && fields.includesSome(['senderBlockHash', 'receiverBlockHash', 'senderBlockNonce', 'receiverBlockNonce']))) {
       await this.transactionService.applyBlockInfo(transactions);
     }
@@ -157,6 +164,8 @@ export class TransferService {
       withActionTransferValue: queryOptions.withActionTransferValue ?? false,
     });
 
+    this.transactionService.processRelayedInfo(transactions);
+
     return transactions;
   }