diff --git a/Directory.Packages.props b/Directory.Packages.props index afd33e24308..460430443d4 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -24,7 +24,7 @@ - + @@ -43,6 +43,7 @@ + diff --git a/src/Nethermind/Nethermind.Benchmark/Core/ByteArrayToHexBenchmarks.cs b/src/Nethermind/Nethermind.Benchmark/Core/ByteArrayToHexBenchmarks.cs index aa4ab3250b8..d52cba7a728 100644 --- a/src/Nethermind/Nethermind.Benchmark/Core/ByteArrayToHexBenchmarks.cs +++ b/src/Nethermind/Nethermind.Benchmark/Core/ByteArrayToHexBenchmarks.cs @@ -2,7 +2,6 @@ // SPDX-License-Identifier: LGPL-3.0-only using BenchmarkDotNet.Attributes; -using HexMate; using Nethermind.Core.Extensions; namespace Nethermind.Benchmarks.Core @@ -28,11 +27,5 @@ public string SafeLookup() { return Bytes.ByteArrayToHexViaLookup32Safe(array, false); } - - [Benchmark(Baseline = true)] - public string HexMateA() - { - return Convert.ToHexString(array, HexFormattingOptions.Lowercase); - } } } diff --git a/src/Nethermind/Nethermind.Benchmark/Nethermind.Benchmark.csproj b/src/Nethermind/Nethermind.Benchmark/Nethermind.Benchmark.csproj index 47d883bbd2e..4fe68806389 100644 --- a/src/Nethermind/Nethermind.Benchmark/Nethermind.Benchmark.csproj +++ b/src/Nethermind/Nethermind.Benchmark/Nethermind.Benchmark.csproj @@ -6,7 +6,6 @@ - diff --git a/src/Nethermind/Nethermind.HealthChecks/Nethermind.HealthChecks.csproj b/src/Nethermind/Nethermind.HealthChecks/Nethermind.HealthChecks.csproj index 3fe6267162e..7f6f3d606ef 100644 --- a/src/Nethermind/Nethermind.HealthChecks/Nethermind.HealthChecks.csproj +++ b/src/Nethermind/Nethermind.HealthChecks/Nethermind.HealthChecks.csproj @@ -3,6 +3,7 @@ + diff --git a/src/Nethermind/Nethermind.Network.Discovery/Nethermind.Network.Discovery.csproj b/src/Nethermind/Nethermind.Network.Discovery/Nethermind.Network.Discovery.csproj index ee01ab7f32e..e21eb0552dd 100644 --- a/src/Nethermind/Nethermind.Network.Discovery/Nethermind.Network.Discovery.csproj +++ b/src/Nethermind/Nethermind.Network.Discovery/Nethermind.Network.Discovery.csproj @@ -15,6 +15,7 @@ + diff --git a/src/Nethermind/Nethermind.Runner/packages.lock.json b/src/Nethermind/Nethermind.Runner/packages.lock.json index 66249443c4c..de5f39f1097 100644 --- a/src/Nethermind/Nethermind.Runner/packages.lock.json +++ b/src/Nethermind/Nethermind.Runner/packages.lock.json @@ -123,19 +123,6 @@ "resolved": "2.14.1", "contentHash": "lQKvtaTDOXnoVJ20ibTuSIOf2i0uO0MPbDhd1jm238I+U/2ZnRENj0cktKZhtchBMtCUSRQ5v4xBCUbKNmyVMw==" }, - "IdentityModel": { - "type": "Transitive", - "resolved": "5.2.0", - "contentHash": "nuhkbaDH9l5QzNJp2MtP3qio57MPtiRneUN8Ocr7od0JvSYaIe3gBj/vxllr11S/Qvu1AG4GZXoyv5469ewYDA==" - }, - "IdentityModel.OidcClient": { - "type": "Transitive", - "resolved": "5.2.1", - "contentHash": "OuPhDNAw/EoJVEmYO6/ChZUBcug4OGoGKTKLUyBCsGhlKegxJk25LYQ0EL7GCBMgkEL+BYNJukNZyaJ+JNaWog==", - "dependencies": { - "IdentityModel": "5.2.0" - } - }, "IPNetwork2": { "type": "Transitive", "resolved": "2.1.2", @@ -149,17 +136,6 @@ "resolved": "1.0.0", "contentHash": "duyRtj4I3+yZZZC7Ma5S/cxzWn5CLPRcXeXtmBcLS3TpjwLm74afQEGzfYEWma8H/dbpUiHl2ozYszKuQ8QpEg==" }, - "KubernetesClient": { - "type": "Transitive", - "resolved": "15.0.1", - "contentHash": "IOsMJaBpiHELr7ZeiJQypdtLDbc/HqxbEh9UMaDvLpBvGIzS+KhjA0LJVEbGgvubmhWHxLPfgHAL0le1zr2RwA==", - "dependencies": { - "Fractions": "7.3.0", - "IdentityModel.OidcClient": "5.2.1", - "System.IdentityModel.Tokens.Jwt": "7.1.2", - "YamlDotNet": "16.0.0" - } - }, "libsodium": { "type": "Transitive", "resolved": "1.0.20", @@ -622,15 +598,6 @@ "System.Composition.Runtime": "6.0.0" } }, - "System.IdentityModel.Tokens.Jwt": { - "type": "Transitive", - "resolved": "7.1.2", - "contentHash": "Thhbe1peAmtSBFaV/ohtykXiZSOkx59Da44hvtWfIMFofDA3M3LaVyjstACf2rKGn4dEDR2cUpRAZ0Xs/zB+7Q==", - "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "7.1.2", - "Microsoft.IdentityModel.Tokens": "7.1.2" - } - }, "System.Reactive": { "type": "Transitive", "resolved": "6.0.0", @@ -648,8 +615,8 @@ }, "YamlDotNet": { "type": "Transitive", - "resolved": "16.0.0", - "contentHash": "kZ4jR5ltFhnjaUqK9x81zXRIUTH4PTXTTEmJDNQdkDLQhcv+2Nl19r0dCSvPW1mstOYBfXTnjdieRbUO6gHMDw==" + "resolved": "16.3.0", + "contentHash": "SgMOdxbz8X65z8hraIs6hOEdnkH6hESTAIUa7viEngHOYaH+6q5XJmwr1+yb9vJpNQ19hCQY69xbFsLtXpobQA==" }, "nethermind.abi": { "type": "Project", @@ -889,6 +856,7 @@ "dependencies": { "AspNetCore.HealthChecks.UI": "[9.0.0, )", "AspNetCore.HealthChecks.UI.InMemory.Storage": "[9.0.0, )", + "KubernetesClient": "[18.0.5, )", "Nethermind.Api": "[1.36.0-unstable, )", "Nethermind.Merge.Plugin": "[1.36.0-unstable, )" } @@ -1336,6 +1304,16 @@ "Grpc.Core": "2.46.6" } }, + "KubernetesClient": { + "type": "CentralTransitive", + "requested": "[18.0.5, )", + "resolved": "18.0.5", + "contentHash": "xkttIbnGNibYwAyZ0sqeQle2w90bfaJrkF8BaURWHfSMKPbHwys9t/wq1XmT64eA4WRVXLENYlXtqmWlEstG6A==", + "dependencies": { + "Fractions": "7.3.0", + "YamlDotNet": "16.3.0" + } + }, "MathNet.Numerics.FSharp": { "type": "CentralTransitive", "requested": "[5.0.0, )",