Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<PackageVersion Include="Google.Protobuf.Tools" Version="3.33.1" />
<PackageVersion Include="Grpc" Version="2.46.6" />
<PackageVersion Include="Grpc.Tools" Version="2.76.0" />
<PackageVersion Include="HexMate" Version="0.0.3" />
<PackageVersion Include="KubernetesClient" Version="18.0.5" />
<PackageVersion Include="MathNet.Numerics.FSharp" Version="5.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.DataProtection" Version="10.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.DataProtection.Extensions" Version="10.0.0" />
Expand All @@ -43,6 +43,7 @@
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.15.0" />
<PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// SPDX-License-Identifier: LGPL-3.0-only

using BenchmarkDotNet.Attributes;
using HexMate;
using Nethermind.Core.Extensions;

namespace Nethermind.Benchmarks.Core
Expand All @@ -28,11 +27,5 @@ public string SafeLookup()
{
return Bytes.ByteArrayToHexViaLookup32Safe(array, false);
}

[Benchmark(Baseline = true)]
public string HexMateA()
{
return Convert.ToHexString(array, HexFormattingOptions.Lowercase);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" />
<PackageReference Include="HexMate" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Nethermind.Consensus.Ethash\Nethermind.Consensus.Ethash.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<ItemGroup>
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" />
<PackageReference Include="AspNetCore.HealthChecks.UI" />
<PackageReference Include="KubernetesClient" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Nethermind.Api\Nethermind.Api.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

<ItemGroup>
<PackageReference Include="PierTwo.Lantern.Discv5.WireProtocol" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" />
</ItemGroup>

</Project>
48 changes: 13 additions & 35 deletions src/Nethermind/Nethermind.Runner/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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, )"
}
Expand Down Expand Up @@ -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, )",
Expand Down