- Fixed bugs in address generation.

- postgre batched nextinput fix
simpleledger · Feb 3, 2022 · 97a26d4 · 97a26d4
1 parent c11714f
commit 97a26d4
Show file tree

Hide file tree

Showing 9 changed files with 561 additions and 91 deletions.
diff --git a/Slp.API/Startup.cs b/Slp.API/Startup.cs
@@ -12,6 +12,7 @@
 using Slp.Common.Interfaces;
 using Slp.Common.Options;
 using Slp.Common.Services;
+using Slp.Common.Utility;
 using System;
 
 namespace Slp.API
@@ -49,14 +50,24 @@ public void ConfigureServices(IServiceCollection services)
                 c.EnableAnnotations();
                 c.SwaggerDoc("v2", new OpenApiInfo { Title = "Slp.API", Version = "v2" });
             });
-            var connectionString = Configuration.GetConnectionString("SlpDbConnection");
+            var connectionString = Configuration.GetConnectionString("SlpDbConnection");            
             services.AddDbContext<SlpDbContext>(
                options =>
                {
 #if DEBUG
                     options.EnableSensitiveDataLogging();
 #endif
-                    options.UseSqlServer(connectionString);
+                   var databaseType = Configuration.GetValue(nameof(SD.DatabaseBackend), SD.DatabaseBackend);
+                   if (databaseType == SD.DatabaseBackendType.POSTGRESQL)
+                   {
+                       options.UseNpgsql(connectionString, x => x.MigrationsAssembly("Slp.Migrations.POSTGRESQL"));
+                   }
+                   else if (databaseType == SD.DatabaseBackendType.MSSQL)
+                   {
+                       options.UseSqlServer(connectionString, x => x.MigrationsAssembly("Slp.Migrations.MSSQL"));
+                   }
+                   else
+                       throw new NotSupportedException();
                },
                contextLifetime: ServiceLifetime.Scoped,ServiceLifetime.Scoped
            );

diff --git a/Slp.Common/Models/DbModels/SlpAddress.cs b/Slp.Common/Models/DbModels/SlpAddress.cs
@@ -9,9 +9,10 @@ public class SlpAddress
         [Key, DatabaseGenerated(DatabaseGeneratedOption.None)]
         public int Id { get; set; }
         [MaxLength(SD.AddressSize)]
-        [ForeignKey(nameof(Block))]
+        //[ForeignKey(nameof(Block))]
+        [NotMapped]
         public int? BlockHeight { get; set; }
-        public SlpBlock Block { get; set; }
+        //public SlpBlock Block { get; set; }
         public string Address { get; set; }
 
         [NotMapped]

diff --git a/Slp.Common/Models/DbModels/SlpTransactionInput.cs b/Slp.Common/Models/DbModels/SlpTransactionInput.cs
@@ -31,5 +31,7 @@ public class SlpTransactionInput
         [MaxLength(SD.HashSize)]
         public byte[] SourceTxHash { get; set; }
         public int VOut { get; set; }        
+
+       // public int? BlockHeight { get; set; }
     }
 }
diff --git a/Slp.Common/Models/DbModels/SlpTransactionOutput.cs b/Slp.Common/Models/DbModels/SlpTransactionOutput.cs
@@ -35,5 +35,6 @@ public class SlpTransactionOutput
         public long SlpTransactionId { get; set; }
         public virtual SlpTransaction SlpTransaction { get; set; }
 
+       // public int? BlockHeight { get; set; }
     }
 }
diff --git a/Slp.Indexer/Services/SlpIndexerService.cs b/Slp.Indexer/Services/SlpIndexerService.cs
diff --git a/Slp.Indexer/Slp.Indexer.csproj b/Slp.Indexer/Slp.Indexer.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <Version>1.0.0</Version>
+    <Version>1.0.1</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Description>Slp indexer that listens to BCH node and builds SQL databases with SLP data.</Description>
     <UserSecretsId>c5ef8d94-2d0f-4b35-8176-f9f2ea8449aa</UserSecretsId>