Merge branch 'main' into add-blob-encryption

safe-global · Nov 15, 2024 · ad1c139 · ad1c139
2 parents f8af865 + 0f309a2
commit ad1c139
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/src/routes/transactions/entities/creation-transaction-info.entity.ts b/src/routes/transactions/entities/creation-transaction-info.entity.ts
@@ -6,22 +6,24 @@ import {
 } from '@/routes/transactions/entities/transaction-info.entity';
 
 export class CreationTransactionInfo extends TransactionInfo {
+  @ApiProperty({ enum: [TransactionInfoType.Creation] })
+  override type = TransactionInfoType.Creation;
   @ApiProperty()
   creator: AddressInfo;
   @ApiProperty()
   transactionHash: string;
   @ApiPropertyOptional({ type: AddressInfo, nullable: true })
   implementation: AddressInfo | null;
-  @ApiPropertyOptional({ type: AddressInfo, nullable: true })
-  factory: AddressInfo | null;
+  @ApiPropertyOptional({ type: AddressInfo })
+  factory: AddressInfo;
   @ApiPropertyOptional({ type: String, nullable: true })
   saltNonce: string | null;
 
   constructor(
     creator: AddressInfo,
     transactionHash: string,
     implementation: AddressInfo | null,
-    factory: AddressInfo | null,
+    factory: AddressInfo,
     saltNonce: string | null,
   ) {
     super(TransactionInfoType.Creation, null);

diff --git a/src/routes/transactions/entities/custom-transaction.entity.ts b/src/routes/transactions/entities/custom-transaction.entity.ts
@@ -6,6 +6,8 @@ import {
 } from '@/routes/transactions/entities/transaction-info.entity';
 
 export class CustomTransactionInfo extends TransactionInfo {
+  @ApiProperty({ enum: [TransactionInfoType.Custom] })
+  override type = TransactionInfoType.Custom;
   @ApiProperty()
   to: AddressInfo;
   @ApiProperty()

diff --git a/src/routes/transactions/entities/settings-change-transaction.entity.ts b/src/routes/transactions/entities/settings-change-transaction.entity.ts
@@ -7,6 +7,8 @@ import {
 } from '@/routes/transactions/entities/transaction-info.entity';
 
 export class SettingsChangeTransaction extends TransactionInfo {
+  @ApiProperty({ enum: [TransactionInfoType.SettingsChange] })
+  override type = TransactionInfoType.SettingsChange;
   @ApiProperty()
   dataDecoded: DataDecoded;
   @ApiPropertyOptional({ type: SettingsChange, nullable: true })

diff --git a/src/routes/transactions/entities/transfer-transaction-info.entity.ts b/src/routes/transactions/entities/transfer-transaction-info.entity.ts
@@ -13,6 +13,8 @@ export enum TransferDirection {
 }
 
 export class TransferTransactionInfo extends TransactionInfo {
+  @ApiProperty({ enum: [TransactionInfoType.Transfer] })
+  override type = TransactionInfoType.Transfer;
   @ApiProperty()
   sender: AddressInfo;
   @ApiProperty()

diff --git a/src/routes/transactions/swap-transfer-transaction-info.entity.ts b/src/routes/transactions/swap-transfer-transaction-info.entity.ts
@@ -21,6 +21,9 @@ export class SwapTransferTransactionInfo
   extends TransactionInfo
   implements TransferTransactionInfo, SwapOrderTransactionInfo
 {
+  @ApiProperty({ enum: [TransactionInfoType.SwapTransfer] })
+  override type = TransactionInfoType.SwapTransfer;
+
   // TransferTransactionInfo properties
   @ApiProperty()
   sender: AddressInfo;