add transaction message

src/RadixDlt.NetworkGateway.DataAggregator/NodeServices/ApiReaders/TransactionStreamReader.cs

@@ -106,12 +106,14 @@ public TransactionStreamReader(INetworkConfigurationProvider networkConfiguratio
                         RawLedgerTransaction = true,
                         RawNotarizedTransaction = true,
                         RawSystemTransaction = true,
+                        Message = true,
                     },
                     substateFormatOptions: new CoreModel.SubstateFormatOptions
                     {
                         Hash = false,
                         Raw = false,
                         Typed = true,
+                        Previous = false,
                     },
                     sborFormatOptions: new CoreModel.SborFormatOptions
                     {

src/RadixDlt.NetworkGateway.GatewayApi/gateway-api-schema.yaml

@@ -1244,8 +1244,9 @@ components:
           $ref: "#/components/schemas/HexString"
         receipt:
           $ref: "#/components/schemas/TransactionReceipt"
-        message_hex:
-          $ref: "#/components/schemas/HexString"
+        message:
+          type: object
+          description: defined in core api specs.
 
     TransactionStatus:
       type: string

src/RadixDlt.NetworkGateway.GatewayApiSdk/generated/Model/CommittedTransactionInfo.cs

@@ -122,8 +122,8 @@ protected CommittedTransactionInfo() { }
         /// <param name="errorMessage">errorMessage.</param>
         /// <param name="rawHex">Hex-encoded binary blob..</param>
         /// <param name="receipt">receipt.</param>
-        /// <param name="messageHex">Hex-encoded binary blob..</param>
-        public CommittedTransactionInfo(long stateVersion = default(long), long epoch = default(long), long round = default(long), string roundTimestamp = default(string), TransactionStatus transactionStatus = default(TransactionStatus), string payloadHashHex = default(string), string intentHashHex = default(string), string feePaid = default(string), List<string> affectedGlobalEntities = default(List<string>), DateTime? confirmedAt = default(DateTime?), string errorMessage = default(string), string rawHex = default(string), TransactionReceipt receipt = default(TransactionReceipt), string messageHex = default(string))
+        /// <param name="message">defined in core api specs..</param>
+        public CommittedTransactionInfo(long stateVersion = default(long), long epoch = default(long), long round = default(long), string roundTimestamp = default(string), TransactionStatus transactionStatus = default(TransactionStatus), string payloadHashHex = default(string), string intentHashHex = default(string), string feePaid = default(string), List<string> affectedGlobalEntities = default(List<string>), DateTime? confirmedAt = default(DateTime?), string errorMessage = default(string), string rawHex = default(string), TransactionReceipt receipt = default(TransactionReceipt), Object message = default(Object))
         {
             this.StateVersion = stateVersion;
             this.Epoch = epoch;
@@ -143,7 +143,7 @@ protected CommittedTransactionInfo() { }
             this.ErrorMessage = errorMessage;
             this.RawHex = rawHex;
             this.Receipt = receipt;
-            this.MessageHex = messageHex;
+            this.Message = message;
         }
 
         /// <summary>
@@ -223,11 +223,11 @@ protected CommittedTransactionInfo() { }
         public TransactionReceipt Receipt { get; set; }
 
         /// <summary>
-        /// Hex-encoded binary blob.
+        /// defined in core api specs.
         /// </summary>
-        /// <value>Hex-encoded binary blob.</value>
-        [DataMember(Name = "message_hex", EmitDefaultValue = true)]
-        public string MessageHex { get; set; }
+        /// <value>defined in core api specs.</value>
+        [DataMember(Name = "message", EmitDefaultValue = true)]
+        public Object Message { get; set; }
 
         /// <summary>
         /// Returns the string presentation of the object
@@ -250,7 +250,7 @@ public override string ToString()
             sb.Append("  ErrorMessage: ").Append(ErrorMessage).Append("\n");
             sb.Append("  RawHex: ").Append(RawHex).Append("\n");
             sb.Append("  Receipt: ").Append(Receipt).Append("\n");
-            sb.Append("  MessageHex: ").Append(MessageHex).Append("\n");
+            sb.Append("  Message: ").Append(Message).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -349,9 +349,9 @@ public bool Equals(CommittedTransactionInfo input)
                     this.Receipt.Equals(input.Receipt))
                 ) && 
                 (
-                    this.MessageHex == input.MessageHex ||
-                    (this.MessageHex != null &&
-                    this.MessageHex.Equals(input.MessageHex))
+                    this.Message == input.Message ||
+                    (this.Message != null &&
+                    this.Message.Equals(input.Message))
                 );
         }
 
@@ -404,9 +404,9 @@ public override int GetHashCode()
                 {
                     hashCode = (hashCode * 59) + this.Receipt.GetHashCode();
                 }
-                if (this.MessageHex != null)
+                if (this.Message != null)
                 {
-                    hashCode = (hashCode * 59) + this.MessageHex.GetHashCode();
+                    hashCode = (hashCode * 59) + this.Message.GetHashCode();
                 }
                 return hashCode;
             }

src/RadixDlt.NetworkGateway.PostgresIntegration/GatewayModelExtensions.cs

@@ -125,14 +125,14 @@ public static GatewayModel.CommittedTransactionInfo ToGatewayModel(
         string? payloadHashHex = null;
         string? intentHashHex = null;
         string? rawHex = null;
-        string? messageHex = null;
+        JRaw? message = null;
 
         if (lt is UserLedgerTransaction ult)
         {
             payloadHashHex = ult.PayloadHash.ToHex();
             intentHashHex = ult.IntentHash.ToHex();
             rawHex = optIns.RawHex ? ult.RawPayload.ToHex() : null;
-            messageHex = ult.Message?.ToHex();
+            message = new JRaw(ult.Message);
         }
 
         var receipt = new GatewayModel.TransactionReceipt
@@ -160,7 +160,7 @@ public static GatewayModel.CommittedTransactionInfo ToGatewayModel(
             errorMessage: lt.EngineReceipt.ErrorMessage,
             rawHex: rawHex,
             receipt: receipt,
-            messageHex: messageHex
+            message: message
         );
     }
 

src/RadixDlt.NetworkGateway.PostgresIntegration/LedgerExtension/PostgresLedgerExtenderService.cs

@@ -522,6 +522,7 @@ private async Task<ExtendLedgerReport> ProcessTransactions(ReadWriteDbContext db
                             PayloadHash = ult.NotarizedTransaction.GetHashBytes(),
                             IntentHash = ult.NotarizedTransaction.SignedIntent.Intent.GetHashBytes(),
                             SignedIntentHash = ult.NotarizedTransaction.SignedIntent.GetHashBytes(),
+                            Message = ult.NotarizedTransaction.SignedIntent.Intent.Message?.ToJson(),
                         },
                         CoreModel.RoundUpdateLedgerTransaction => new RoundUpdateLedgerTransaction(),
                         _ => throw new UnreachableException(),

src/RadixDlt.NetworkGateway.PostgresIntegration/LedgerExtension/WriteHelper.cs

@@ -179,15 +179,14 @@ public async Task<int> CopyLedgerTransaction(ICollection<LedgerTransaction> enti
             return 0;
         }
 
-        await using var writer = await _connection.BeginBinaryImportAsync("COPY ledger_transactions (state_version, message, epoch, round_in_epoch, index_in_epoch, index_in_round, is_end_of_epoch, fee_paid, tip_paid, affected_global_entities, round_timestamp, created_timestamp, normalized_round_timestamp, raw_payload, receipt_state_updates, receipt_status, receipt_fee_summary, receipt_error_message, receipt_output, receipt_next_epoch, receipt_event_sbors, receipt_event_schema_hashes, receipt_event_type_indexes, receipt_event_sbor_type_kinds, discriminator, payload_hash, intent_hash, signed_intent_hash) FROM STDIN (FORMAT BINARY)", token);
+        await using var writer = await _connection.BeginBinaryImportAsync("COPY ledger_transactions (state_version, epoch, round_in_epoch, index_in_epoch, index_in_round, is_end_of_epoch, fee_paid, tip_paid, affected_global_entities, round_timestamp, created_timestamp, normalized_round_timestamp, raw_payload, receipt_state_updates, receipt_status, receipt_fee_summary, receipt_error_message, receipt_output, receipt_next_epoch, receipt_event_sbors, receipt_event_schema_hashes, receipt_event_type_indexes, receipt_event_sbor_type_kinds, discriminator, payload_hash, intent_hash, signed_intent_hash, message) FROM STDIN (FORMAT BINARY)", token);
 
         foreach (var lt in entities)
         {
             var discriminator = GetDiscriminator<LedgerTransactionType>(lt.GetType());
 
             await writer.StartRowAsync(token);
             await writer.WriteAsync(lt.StateVersion, NpgsqlDbType.Bigint, token);
-            await writer.WriteNullableAsync(lt.Message, NpgsqlDbType.Bytea, token);
             await writer.WriteAsync(lt.Epoch, NpgsqlDbType.Bigint, token);
             await writer.WriteAsync(lt.RoundInEpoch, NpgsqlDbType.Bigint, token);
             await writer.WriteAsync(lt.IndexInEpoch, NpgsqlDbType.Bigint, token);
@@ -219,16 +218,19 @@ public async Task<int> CopyLedgerTransaction(ICollection<LedgerTransaction> enti
                     await writer.WriteNullAsync(token);
                     await writer.WriteNullAsync(token);
                     await writer.WriteNullAsync(token);
+                    await writer.WriteNullAsync(token);
                     break;
                 case UserLedgerTransaction ult:
                     await writer.WriteAsync(ult.PayloadHash, NpgsqlDbType.Bytea, token);
                     await writer.WriteAsync(ult.IntentHash, NpgsqlDbType.Bytea, token);
                     await writer.WriteAsync(ult.SignedIntentHash, NpgsqlDbType.Bytea, token);
+                    await writer.WriteAsync(ult.Message, NpgsqlDbType.Jsonb, token);
                     break;
                 case RoundUpdateLedgerTransaction:
                     await writer.WriteNullAsync(token);
                     await writer.WriteNullAsync(token);
                     await writer.WriteNullAsync(token);
+                    await writer.WriteNullAsync(token);
                     break;
                 default:
                     throw new ArgumentOutOfRangeException(nameof(lt), lt, null);

src/RadixDlt.NetworkGateway.PostgresIntegration/Migrations/20230814100026_InitialCreate.cs → src/RadixDlt.NetworkGateway.PostgresIntegration/Migrations/20230815125818_InitialCreate.cs

@@ -398,7 +398,6 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 columns: table => new
                 {
                     state_version = table.Column<long>(type: "bigint", nullable: false),
-                    message = table.Column<byte[]>(type: "bytea", nullable: true),
                     epoch = table.Column<long>(type: "bigint", nullable: false),
                     round_in_epoch = table.Column<long>(type: "bigint", nullable: false),
                     index_in_epoch = table.Column<long>(type: "bigint", nullable: false),
@@ -424,7 +423,8 @@ protected override void Up(MigrationBuilder migrationBuilder)
                     discriminator = table.Column<LedgerTransactionType>(type: "ledger_transaction_type", nullable: false),
                     payload_hash = table.Column<byte[]>(type: "bytea", nullable: true),
                     intent_hash = table.Column<byte[]>(type: "bytea", nullable: true),
-                    signed_intent_hash = table.Column<byte[]>(type: "bytea", nullable: true)
+                    signed_intent_hash = table.Column<byte[]>(type: "bytea", nullable: true),
+                    message = table.Column<string>(type: "jsonb", nullable: true)
                 },
                 constraints: table =>
                 {

src/RadixDlt.NetworkGateway.PostgresIntegration/Migrations/MigrationsDbContextModelSnapshot.cs

@@ -726,10 +726,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("boolean")
                         .HasColumnName("is_end_of_epoch");
 
-                    b.Property<byte[]>("Message")
-                        .HasColumnType("bytea")
-                        .HasColumnName("message");
-
                     b.Property<DateTime>("NormalizedRoundTimestamp")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("normalized_round_timestamp");
@@ -1841,6 +1837,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("bytea")
                         .HasColumnName("intent_hash");
 
+                    b.Property<string>("Message")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("message");
+
                     b.Property<byte[]>("PayloadHash")
                         .IsRequired()
                         .HasColumnType("bytea")

src/RadixDlt.NetworkGateway.PostgresIntegration/Models/LedgerTransaction.cs

@@ -83,9 +83,6 @@ internal abstract class LedgerTransaction
     [Column("state_version")]
     public long StateVersion { get; set; }
 
-    [Column("message")]
-    public byte[]? Message { get; set; }
-
     [Column("epoch")]
     public long Epoch { get; set; }
 
@@ -200,6 +197,9 @@ internal class UserLedgerTransaction : LedgerTransaction
     /// </summary>
     [Column("signed_intent_hash")]
     public byte[] SignedIntentHash { get; set; }
+
+    [Column("message", TypeName = "jsonb")]
+    public string? Message { get; set; }
 }
 
 internal class RoundUpdateLedgerTransaction : LedgerTransaction