add relayed transaction version

multiversx · Oct 2, 2023 · 3b2c389 · 3b2c389
1 parent 0243332
commit 3b2c389
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 2 deletions.
diff --git a/src/endpoints/transactions/entities/transaction.detailed.ts b/src/endpoints/transactions/entities/transaction.detailed.ts
@@ -60,5 +60,9 @@ export class TransactionDetailed extends Transaction {
   @Field(() => Boolean, { description: "InTransit transaction details.", nullable: true })
   @ApiProperty({ type: Boolean, nullable: true })
   inTransit: boolean | undefined = undefined;
+
+  @Field(() => String, { description: "Relayed transaction version.", nullable: true })
+  @ApiProperty({ type: String, nullable: true })
+  relayedVersion: string | undefined = undefined;
 }
 
diff --git a/src/endpoints/transactions/entities/transaction.ts b/src/endpoints/transactions/entities/transaction.ts
@@ -126,7 +126,7 @@ export class Transaction {
   @ApiProperty({ type: String, nullable: true })
   guardianSignature: string | undefined = undefined;
 
-  @Field(() => String, { description: "Is relayed transaction.", nullable: true })
+  @Field(() => Boolean, { description: "Is relayed transaction.", nullable: true })
   @ApiProperty({ type: String, nullable: true })
   isRelayed: boolean | undefined = undefined;
 

diff --git a/src/endpoints/transactions/transaction.service.ts b/src/endpoints/transactions/transaction.service.ts
@@ -18,7 +18,7 @@ import { GatewayComponentRequest } from 'src/common/gateway/entities/gateway.com
 import { TransactionActionService } from './transaction-action/transaction.action.service';
 import { TransactionDecodeDto } from './entities/dtos/transaction.decode.dto';
 import { TransactionStatus } from './entities/transaction.status';
-import { AddressUtils, Constants, PendingExecuter } from '@multiversx/sdk-nestjs-common';
+import { AddressUtils, BinaryUtils, Constants, PendingExecuter } from '@multiversx/sdk-nestjs-common';
 import { ApiUtils } from "@multiversx/sdk-nestjs-http";
 import { CacheService } from "@multiversx/sdk-nestjs-cache";
 import { TransactionUtils } from './transaction.utils';
@@ -176,6 +176,15 @@ export class TransactionService {
       transactions = await this.getExtraDetailsForTransactions(elasticTransactions, transactions, queryOptions);
     }
 
+    transactions = transactions.map(transaction => {
+      const relayedVersion = this.extractRelayedVersion(transaction);
+      if (relayedVersion) {
+        transaction.relayedVersion = relayedVersion;
+      }
+
+      return transaction;
+    });
+
     await this.processTransactions(transactions, {
       withScamInfo: queryOptions?.withScamInfo ?? false,
       withUsername: queryOptions?.withUsername ?? false,
@@ -540,4 +549,20 @@ export class TransactionService {
       }
     }
   }
+
+  private extractRelayedVersion(transaction: TransactionDetailed): string | null {
+    if (transaction.isRelayed && transaction.data) {
+      const decodedData = BinaryUtils.base64Decode(transaction.data);
+
+      const relayedMatch = decodedData.match(/relayedTx(V\d+)?/);
+      if (relayedMatch) {
+        if (relayedMatch[1]) {
+          return relayedMatch[1].toLowerCase();
+        } else {
+          return 'v1';
+        }
+      }
+    }
+    return null;
+  }
 }