diff --git a/src/RadixDlt.NetworkGateway.PostgresIntegration/LedgerExtension/PostgresLedgerExtenderService.cs b/src/RadixDlt.NetworkGateway.PostgresIntegration/LedgerExtension/PostgresLedgerExtenderService.cs index e6af14c03..af97c8772 100644 --- a/src/RadixDlt.NetworkGateway.PostgresIntegration/LedgerExtension/PostgresLedgerExtenderService.cs +++ b/src/RadixDlt.NetworkGateway.PostgresIntegration/LedgerExtension/PostgresLedgerExtenderService.cs @@ -859,7 +859,7 @@ private async Task ProcessTransactions(ReadWriteDbContext db Id = sequences.EntityStateHistorySequence++, FromStateVersion = stateVersion, EntityId = referencedEntities.Get((EntityAddress)substateId.EntityAddress).DatabaseId, - State = componentState.Value.DataStruct.StructData.Hex.ConvertFromHex(), + State = componentState.Value.DataStruct.StructData.ToJson(), }); } diff --git a/src/RadixDlt.NetworkGateway.PostgresIntegration/LedgerExtension/WriteHelper.cs b/src/RadixDlt.NetworkGateway.PostgresIntegration/LedgerExtension/WriteHelper.cs index 42b7896b0..629e675fe 100644 --- a/src/RadixDlt.NetworkGateway.PostgresIntegration/LedgerExtension/WriteHelper.cs +++ b/src/RadixDlt.NetworkGateway.PostgresIntegration/LedgerExtension/WriteHelper.cs @@ -462,7 +462,7 @@ public async Task CopyEntityStateHistory(ICollection en await writer.WriteAsync(e.Id, NpgsqlDbType.Bigint, token); await writer.WriteAsync(e.FromStateVersion, NpgsqlDbType.Bigint, token); await writer.WriteAsync(e.EntityId, NpgsqlDbType.Bigint, token); - await writer.WriteAsync(e.State, NpgsqlDbType.Bytea, token); + await writer.WriteAsync(e.State, NpgsqlDbType.Jsonb, token); } await writer.CompleteAsync(token); diff --git a/src/RadixDlt.NetworkGateway.PostgresIntegration/Migrations/20230727102737_InitialCreate.Designer.cs b/src/RadixDlt.NetworkGateway.PostgresIntegration/Migrations/20230727103946_InitialCreate.Designer.cs similarity index 99% rename from src/RadixDlt.NetworkGateway.PostgresIntegration/Migrations/20230727102737_InitialCreate.Designer.cs rename to src/RadixDlt.NetworkGateway.PostgresIntegration/Migrations/20230727103946_InitialCreate.Designer.cs index 91c7fe88e..032ae8f03 100644 --- a/src/RadixDlt.NetworkGateway.PostgresIntegration/Migrations/20230727102737_InitialCreate.Designer.cs +++ b/src/RadixDlt.NetworkGateway.PostgresIntegration/Migrations/20230727103946_InitialCreate.Designer.cs @@ -81,7 +81,7 @@ namespace RadixDlt.NetworkGateway.PostgresIntegration.Migrations { [DbContext(typeof(MigrationsDbContext))] - [Migration("20230727102737_InitialCreate")] + [Migration("20230727103946_InitialCreate")] partial class InitialCreate { /// @@ -577,9 +577,9 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) .HasColumnType("bigint") .HasColumnName("from_state_version"); - b.Property("State") + b.Property("State") .IsRequired() - .HasColumnType("bytea") + .HasColumnType("jsonb") .HasColumnName("state"); b.HasKey("Id"); diff --git a/src/RadixDlt.NetworkGateway.PostgresIntegration/Migrations/20230727102737_InitialCreate.cs b/src/RadixDlt.NetworkGateway.PostgresIntegration/Migrations/20230727103946_InitialCreate.cs similarity index 99% rename from src/RadixDlt.NetworkGateway.PostgresIntegration/Migrations/20230727102737_InitialCreate.cs rename to src/RadixDlt.NetworkGateway.PostgresIntegration/Migrations/20230727103946_InitialCreate.cs index 38f4e7b5d..032049e4f 100644 --- a/src/RadixDlt.NetworkGateway.PostgresIntegration/Migrations/20230727102737_InitialCreate.cs +++ b/src/RadixDlt.NetworkGateway.PostgresIntegration/Migrations/20230727103946_InitialCreate.cs @@ -323,7 +323,7 @@ protected override void Up(MigrationBuilder migrationBuilder) .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), from_state_version = table.Column(type: "bigint", nullable: false), entity_id = table.Column(type: "bigint", nullable: false), - state = table.Column(type: "bytea", nullable: false) + state = table.Column(type: "jsonb", nullable: false) }, constraints: table => { diff --git a/src/RadixDlt.NetworkGateway.PostgresIntegration/Migrations/MigrationsDbContextModelSnapshot.cs b/src/RadixDlt.NetworkGateway.PostgresIntegration/Migrations/MigrationsDbContextModelSnapshot.cs index 4623e40a5..5868fb3f8 100644 --- a/src/RadixDlt.NetworkGateway.PostgresIntegration/Migrations/MigrationsDbContextModelSnapshot.cs +++ b/src/RadixDlt.NetworkGateway.PostgresIntegration/Migrations/MigrationsDbContextModelSnapshot.cs @@ -574,9 +574,9 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnType("bigint") .HasColumnName("from_state_version"); - b.Property("State") + b.Property("State") .IsRequired() - .HasColumnType("bytea") + .HasColumnType("jsonb") .HasColumnName("state"); b.HasKey("Id"); diff --git a/src/RadixDlt.NetworkGateway.PostgresIntegration/Models/EntityStateHistory.cs b/src/RadixDlt.NetworkGateway.PostgresIntegration/Models/EntityStateHistory.cs index d9859d7dc..6d7d86ff4 100644 --- a/src/RadixDlt.NetworkGateway.PostgresIntegration/Models/EntityStateHistory.cs +++ b/src/RadixDlt.NetworkGateway.PostgresIntegration/Models/EntityStateHistory.cs @@ -80,6 +80,6 @@ internal class EntityStateHistory [Column("entity_id")] public long EntityId { get; set; } - [Column("state")] - public byte[] State { get; set; } + [Column("state", TypeName = "jsonb")] + public string State { get; set; } }