Update dependencies

baking-bad · May 31, 2024 · bf2078b · bf2078b
1 parent f03b15f
commit bf2078b
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 22 deletions.
diff --git a/Tzkt.Api.Tests/Tzkt.Api.Tests.csproj b/Tzkt.Api.Tests/Tzkt.Api.Tests.csproj
@@ -10,13 +10,13 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
-        <PackageReference Include="xunit" Version="2.4.2" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+        <PackageReference Include="xunit" Version="2.8.0" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="6.0.0">
+        <PackageReference Include="coverlet.collector" Version="6.0.2">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>

diff --git a/Tzkt.Api/Models/Accounts/Base/Account.cs b/Tzkt.Api/Models/Accounts/Base/Account.cs
@@ -24,7 +24,7 @@ public abstract class Account
         public abstract string Address { get; set; }
     }
 
-    public class AccountJsonInheritanceConverter : JsonInheritanceConverter
+    public class AccountJsonInheritanceConverter : JsonInheritanceConverter<Account>
     {
         public AccountJsonInheritanceConverter(string name) : base(name) { }
 

diff --git a/Tzkt.Api/Models/Operations/Base/Operation.cs b/Tzkt.Api/Models/Operations/Base/Operation.cs
@@ -61,7 +61,7 @@ public abstract class Operation
         public abstract long Id { get; set; }
     }
 
-    public class OperationJsonInheritanceConverter : JsonInheritanceConverter
+    public class OperationJsonInheritanceConverter : JsonInheritanceConverter<Operation>
     {
         public OperationJsonInheritanceConverter(string name) : base(name) { }
 

diff --git a/Tzkt.Api/Models/Operations/Base/OperationError.cs b/Tzkt.Api/Models/Operations/Base/OperationError.cs
@@ -20,7 +20,7 @@ public abstract class OperationError
         public abstract string Type { get; set; }
     }
 
-    public class OperationErrorJsonInheritanceConverter : JsonInheritanceConverter
+    public class OperationErrorJsonInheritanceConverter : JsonInheritanceConverter<OperationError>
     {
         public OperationErrorJsonInheritanceConverter(string name) : base(name) { }
 

diff --git a/Tzkt.Api/Services/Cache/Accounts/AccountsCache.cs b/Tzkt.Api/Services/Cache/Accounts/AccountsCache.cs
@@ -45,7 +45,7 @@ public AccountsCache(NpgsqlDataSource dataSource, StateCache state, IConfigurati
                 : (int)(limit * 1.1);
 
             using var db = DataSource.OpenConnection();
-            using var reader = db.ExecuteReader($@"{SelectQuery} ORDER BY ""LastLevel"" DESC LIMIT @limit", new { limit });
+            using IDataReader reader = db.ExecuteReader($@"{SelectQuery} ORDER BY ""LastLevel"" DESC LIMIT @limit", new { limit });
 
             AccountsById = new Dictionary<int, RawAccount>(capacity);
             AccountsByAddress = new Dictionary<string, RawAccount>(capacity);
@@ -98,7 +98,7 @@ public async Task UpdateAsync()
             #endregion
 
             await using var db = await DataSource.OpenConnectionAsync();
-            using var reader = await db.ExecuteReaderAsync($@"{SelectQuery} WHERE ""LastLevel"" > @from", new { from });
+            using IDataReader reader = await db.ExecuteReaderAsync($@"{SelectQuery} WHERE ""LastLevel"" > @from", new { from });
 
             var parsers = new Func<IDataReader, RawAccount>[6]
             {

diff --git a/Tzkt.Api/Tzkt.Api.csproj b/Tzkt.Api/Tzkt.Api.csproj
@@ -51,9 +51,9 @@
         <PackageReference Include="App.Metrics.AspNetCore.Mvc" Version="4.3.0" />
         <PackageReference Include="App.Metrics.AspNetCore.Tracking" Version="4.3.0" />
         <PackageReference Include="App.Metrics.Formatters.Prometheus" Version="4.3.0" />
-        <PackageReference Include="Dapper" Version="2.0.123" />
-        <PackageReference Include="Npgsql" Version="7.0.4" />
-        <PackageReference Include="NSwag.AspNetCore" Version="13.19.0" />
+        <PackageReference Include="Dapper" Version="2.1.35" />
+        <PackageReference Include="Npgsql" Version="7.0.7" />
+        <PackageReference Include="NSwag.AspNetCore" Version="14.0.7" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/Tzkt.Data/Tzkt.Data.csproj b/Tzkt.Data/Tzkt.Data.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Netezos" Version="2.9.0" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.4" />
+    <PackageReference Include="Netezos" Version="2.10.1" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.18" />
   </ItemGroup>
 
 </Project>
diff --git a/Tzkt.Sync/Extensions/JsonElementExtension.cs b/Tzkt.Sync/Extensions/JsonElementExtension.cs
@@ -141,6 +141,15 @@ public static BigInteger RequiredBigInteger(this JsonElement el, string name)
                 : throw new SerializationException($"Missed required BigInteger {name}");
         }
 
+        public static BigInteger? OptionalBigInteger(this JsonElement el, string name)
+        {
+            if (!el.TryGetProperty(name, out var prop))
+                return null;
+
+            return BigInteger.TryParse(prop.GetString(), out var res) ? res
+                : throw new SerializationException($"Invalid BigInteger {name}");
+        }
+
         public static bool TryGetBigInteger(this JsonElement el, string name, out BigInteger res)
         {
             res = BigInteger.Zero;

diff --git a/Tzkt.Sync/Protocols/Handlers/Proto18/Commits/Operations/DoubleEndorsingCommit.cs b/Tzkt.Sync/Protocols/Handlers/Proto18/Commits/Operations/DoubleEndorsingCommit.cs
@@ -83,18 +83,19 @@ public void Revert(DoubleEndorsingOperation operation)
         {
             var branch = op.RequiredString("branch");
             var content = op.Required("operations");
-            var endorsement = new EndorsementContent
+            var attestation = new AttestationContent
             {
                 Level = content.RequiredInt32("level"),
                 Round = content.RequiredInt32("round"),
                 Slot = content.RequiredInt32("slot"),
-                PayloadHash = content.RequiredString("block_payload_hash")
+                PayloadHash = content.RequiredString("block_payload_hash"),
+                DalAttestation = content.OptionalBigInteger("dal_attestation")
             };
             var signature = Base58.Parse(op.RequiredString("signature"), 3);
 
             var bytes = new byte[1] { 19 }
                 .Concat(Base58.Parse(chainId, 3))
-                .Concat(await new LocalForge().ForgeOperationAsync(branch, endorsement))
+                .Concat(await new LocalForge().ForgeOperationAsync(branch, attestation))
                 .ToArray();
 
             foreach (var baker in Cache.Accounts.GetDelegates().OrderByDescending(x => x.LastLevel))

diff --git a/Tzkt.Sync/Protocols/Handlers/Proto18/Commits/Operations/DoublePreendorsingCommit.cs b/Tzkt.Sync/Protocols/Handlers/Proto18/Commits/Operations/DoublePreendorsingCommit.cs
@@ -83,7 +83,7 @@ public void Revert(DoublePreendorsingOperation operation)
         {
             var branch = op.RequiredString("branch");
             var content = op.Required("operations");
-            var preendorsement = new PreendorsementContent
+            var preattestation = new PreattestationContent
             {
                 Level = content.RequiredInt32("level"),
                 Round = content.RequiredInt32("round"),
@@ -94,7 +94,7 @@ public void Revert(DoublePreendorsingOperation operation)
 
             var bytes = new byte[1] { 18 }
                 .Concat(Base58.Parse(chainId, 3))
-                .Concat(await new LocalForge().ForgeOperationAsync(branch, preendorsement))
+                .Concat(await new LocalForge().ForgeOperationAsync(branch, preattestation))
                 .ToArray();
 
             foreach (var baker in Cache.Accounts.GetDelegates().OrderByDescending(x => x.LastLevel))

diff --git a/Tzkt.Sync/Tzkt.Sync.csproj b/Tzkt.Sync/Tzkt.Sync.csproj
@@ -14,12 +14,12 @@
         <PackageReference Include="App.Metrics.AspNetCore.Endpoints" Version="4.3.0" />
         <PackageReference Include="App.Metrics.AspNetCore.Hosting" Version="4.3.0" />
         <PackageReference Include="App.Metrics.Formatters.Prometheus" Version="4.3.0" />
-        <PackageReference Include="Dapper" Version="2.0.123" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.5">
+        <PackageReference Include="Dapper" Version="2.1.35" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.18">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Netezos" Version="2.9.0" />
+        <PackageReference Include="Netezos" Version="2.10.1" />
         <PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2" />
         <PackageReference Include="SauceControl.Blake2Fast" Version="2.0.0" />
     </ItemGroup>