Merge master into oxford

baking-bad · Feb 5, 2024 · d849758 · d849758
2 parents 9df11c5 + 82506cc
commit d849758
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/Tzkt.Api.Tests/Tzkt.Api.Tests.csproj b/Tzkt.Api.Tests/Tzkt.Api.Tests.csproj
@@ -5,7 +5,7 @@
         <Nullable>enable</Nullable>
         <IsPackable>false</IsPackable>
         <LangVersion>10</LangVersion>
-		<AssemblyVersion>1.12.4</AssemblyVersion>
+		<AssemblyVersion>1.12.5</AssemblyVersion>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/Tzkt.Api/Repositories/OperationRepository.SmartRollupExecuteOperation.cs b/Tzkt.Api/Repositories/OperationRepository.SmartRollupExecuteOperation.cs
@@ -149,7 +149,7 @@ public async Task<IEnumerable<SmartRollupExecuteOperation>> GetSmartRollupExecut
                 StorageLimit = row.StorageLimit,
                 StorageUsed = row.StorageUsed,
                 BakerFee = row.BakerFee,
-                StorageFee = row.StorageFee,
+                StorageFee = row.StorageFee ?? 0,
                 Status = OpStatuses.ToString(row.Status),
                 Rollup = row.SmartRollupId == null ? null : Accounts.GetAlias(row.SmartRollupId),
                 Commitment = row.cId == null ? null : new()
@@ -239,7 +239,7 @@ public async Task<object[][]> GetSmartRollupExecuteOps(SrOperationFilter filter,
                         break;
                     case "storageFee":
                         foreach (var row in rows)
-                            result[j++][i] = row.StorageFee;
+                            result[j++][i] = row.StorageFee ?? 0;
                         break;
                     case "status":
                         foreach (var row in rows)

diff --git a/Tzkt.Api/Repositories/OperationRepository.SmartRollupOriginateOperation.cs b/Tzkt.Api/Repositories/OperationRepository.SmartRollupOriginateOperation.cs
@@ -100,7 +100,7 @@ public async Task<IEnumerable<SmartRollupOriginateOperation>> GetSmartRollupOrig
                 StorageLimit = row.StorageLimit,
                 StorageUsed = row.StorageUsed,
                 BakerFee = row.BakerFee,
-                StorageFee = row.StorageFee,
+                StorageFee = row.StorageFee ?? 0,
                 Status = OpStatuses.ToString(row.Status),
                 PvmKind = PvmKinds.ToString((int)row.PvmKind),
                 Kernel = row.Kernel,
@@ -188,7 +188,7 @@ public async Task<object[][]> GetSmartRollupOriginateOps(SrOperationFilter filte
                         break;
                     case "storageFee":
                         foreach (var row in rows)
-                            result[j++][i] = row.StorageFee;
+                            result[j++][i] = row.StorageFee ?? 0;
                         break;
                     case "status":
                         foreach (var row in rows)

diff --git a/Tzkt.Api/Swagger/Swagger.cs b/Tzkt.Api/Swagger/Swagger.cs
@@ -2,7 +2,7 @@
 {
     public static class Swagger
     {
-        const string Version = "1.12.4";
+        const string Version = "1.12.5";
         const string Path = "/v1/swagger.json";
 
         public static void AddOpenApiDocument(this IServiceCollection services)

diff --git a/Tzkt.Api/Tzkt.Api.csproj b/Tzkt.Api/Tzkt.Api.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
-		<AssemblyVersion>1.12.4</AssemblyVersion>
+		<AssemblyVersion>1.12.5</AssemblyVersion>
 	</PropertyGroup>
 
     <PropertyGroup>

diff --git a/Tzkt.Data/Tzkt.Data.csproj b/Tzkt.Data/Tzkt.Data.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-	  <AssemblyVersion>1.12.4</AssemblyVersion>
+    <AssemblyVersion>1.12.5</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Tzkt.Sync.Tests/Tzkt.Sync.Tests.csproj b/Tzkt.Sync.Tests/Tzkt.Sync.Tests.csproj
@@ -5,7 +5,7 @@
         <TargetFramework>net7.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-	    <AssemblyVersion>1.12.4</AssemblyVersion>
+	    <AssemblyVersion>1.12.5</AssemblyVersion>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/Tzkt.Sync/Tzkt.Sync.csproj b/Tzkt.Sync/Tzkt.Sync.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
-		<AssemblyVersion>1.12.4</AssemblyVersion>
+		<AssemblyVersion>1.12.5</AssemblyVersion>
 	</PropertyGroup>
 
     <PropertyGroup>