Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Nethermind.Native project #5615

Merged
merged 5 commits into from
Apr 26, 2023
Merged

Remove Nethermind.Native project #5615

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
54f7960
Remove `Nethermind.Native` project
rubo Apr 24, 2023
8385c71
Merge branch 'master' into feature/native-loader-removal
rubo Apr 24, 2023
b9e64be
Replace `ShamatarLib` with `Nethermind.Crypto.Pairings` package
rubo Apr 26, 2023
52cae6c
Switch to the production package
rubo Apr 26, 2023
4c3bd69
Switch to file scope namespaces
rubo Apr 26, 2023
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
10 changes: 2 additions & 8 deletions src/Nethermind/Benchmarks.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 12.00

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.2.32630.192
MinimumVisualStudioVersion = 10.0.40219.1
Expand Down Expand Up @@ -42,8 +43,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nethermind.Abi", "Nethermin
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nethermind.Crypto", "Nethermind.Crypto\Nethermind.Crypto.csproj", "{C2CE6F47-CB73-4272-AF65-E5FD6294360C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nethermind.Native", "Nethermind.Native\Nethermind.Native.csproj", "{C7EE6D69-99FA-403C-BF5B-A14173771B92}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nethermind.Blockchain", "Nethermind.Blockchain\Nethermind.Blockchain.csproj", "{98E7871D-7894-4EF5-B515-CC35EFAA154D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nethermind.Wallet", "Nethermind.Wallet\Nethermind.Wallet.csproj", "{00079614-AD8D-45D3-B628-8B14404EDFF1}"
Expand Down Expand Up @@ -172,10 +171,6 @@ Global
{C2CE6F47-CB73-4272-AF65-E5FD6294360C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C2CE6F47-CB73-4272-AF65-E5FD6294360C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C2CE6F47-CB73-4272-AF65-E5FD6294360C}.Release|Any CPU.Build.0 = Release|Any CPU
{C7EE6D69-99FA-403C-BF5B-A14173771B92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C7EE6D69-99FA-403C-BF5B-A14173771B92}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C7EE6D69-99FA-403C-BF5B-A14173771B92}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C7EE6D69-99FA-403C-BF5B-A14173771B92}.Release|Any CPU.Build.0 = Release|Any CPU
{98E7871D-7894-4EF5-B515-CC35EFAA154D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{98E7871D-7894-4EF5-B515-CC35EFAA154D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{98E7871D-7894-4EF5-B515-CC35EFAA154D}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -287,7 +282,6 @@ Global
{38949E85-406D-4558-AD0D-0D181C1881E2} = {57CE427C-455B-47A9-85D6-CEF379DC00F6}
{81AEA5F7-FC77-42F8-8162-CFC1E402D11B} = {57CE427C-455B-47A9-85D6-CEF379DC00F6}
{C2CE6F47-CB73-4272-AF65-E5FD6294360C} = {57CE427C-455B-47A9-85D6-CEF379DC00F6}
{C7EE6D69-99FA-403C-BF5B-A14173771B92} = {57CE427C-455B-47A9-85D6-CEF379DC00F6}
{98E7871D-7894-4EF5-B515-CC35EFAA154D} = {57CE427C-455B-47A9-85D6-CEF379DC00F6}
{00079614-AD8D-45D3-B628-8B14404EDFF1} = {57CE427C-455B-47A9-85D6-CEF379DC00F6}
{4A437D5B-0799-476D-BC92-7A9B9AC2E164} = {57CE427C-455B-47A9-85D6-CEF379DC00F6}
Expand Down
1 change: 1 addition & 0 deletions src/Nethermind/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="7.0.3" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
<PackageVersion Include="Nethermind.Crypto.Pairings" Version="1.0.0" />
<PackageVersion Include="Nethermind.Crypto.SecP256k1" Version="1.0.0" />
<PackageVersion Include="Nethermind.DotNetty.Buffers" Version="1.0.0" />
<PackageVersion Include="Nethermind.DotNetty.Handlers" Version="1.0.0" />
Expand Down
23 changes: 0 additions & 23 deletions src/Nethermind/Nethermind.Crypto/LibResolver.cs
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions src/Nethermind/Nethermind.Crypto/Nethermind.Crypto.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Nethermind.Native\Nethermind.Native.csproj" />
<ProjectReference Include="..\Nethermind.Core\Nethermind.Core.csproj" />
<ProjectReference Include="..\Nethermind.Serialization.Rlp\Nethermind.Serialization.Rlp.csproj" />
</ItemGroup>
Expand All @@ -22,27 +21,6 @@
<PackageReference Include="System.Security.Cryptography.ProtectedData" />
</ItemGroup>

<ItemGroup>
<Content Include="runtimes\linux-arm64\native\libshamatar.so">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="runtimes\linux-arm\native\libshamatar.so">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="runtimes\linux-x64\native\libshamatar.so">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="runtimes\osx-x64\native\libshamatar.dylib">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="runtimes\osx-arm64\native\libshamatar.dylib">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="runtimes\win-x64\native\shamatar.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>

<ItemGroup>
<Content Include="kzg_trusted_setup.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Expand Down
133 changes: 0 additions & 133 deletions src/Nethermind/Nethermind.Crypto/ShamatarLib.cs
View file
Open in desktop

This file was deleted.

Binary file removed src/Nethermind/Nethermind.Crypto/runtimes/linux-arm/native/libshamatar.so
View file
Open in desktop
Binary file not shown.
Binary file removed src/Nethermind/Nethermind.Crypto/runtimes/linux-arm64/native/libshamatar.so
View file
Open in desktop
Binary file not shown.
Binary file removed src/Nethermind/Nethermind.Crypto/runtimes/linux-x64/native/libshamatar.so
View file
Open in desktop
Binary file not shown.
Binary file removed src/Nethermind/Nethermind.Crypto/runtimes/osx-arm64/native/libshamatar.dylib
View file
Open in desktop
Binary file not shown.
Binary file removed src/Nethermind/Nethermind.Crypto/runtimes/osx-x64/native/libshamatar.dylib
View file
Open in desktop
Binary file not shown.
Binary file removed src/Nethermind/Nethermind.Crypto/runtimes/win-x64/native/shamatar.dll
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion src/Nethermind/Nethermind.Evm.Test/BlsAddG1PrecompileTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using FluentAssertions;
using Nethermind.Core.Extensions;
using Nethermind.Evm.Precompiles;
using Nethermind.Evm.Precompiles.Bls.Shamatar;
using Nethermind.Evm.Precompiles.Bls;
using Nethermind.Specs.Forks;
using NUnit.Framework;

Expand Down
2 changes: 1 addition & 1 deletion src/Nethermind/Nethermind.Evm.Test/BlsAddG2PrecompileTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using FluentAssertions;
using Nethermind.Core.Extensions;
using Nethermind.Evm.Precompiles;
using Nethermind.Evm.Precompiles.Bls.Shamatar;
using Nethermind.Evm.Precompiles.Bls;
using Nethermind.Specs.Forks;
using NUnit.Framework;

Expand Down
2 changes: 1 addition & 1 deletion src/Nethermind/Nethermind.Evm.Test/BlsMapToG1Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using FluentAssertions;
using Nethermind.Core.Extensions;
using Nethermind.Evm.Precompiles;
using Nethermind.Evm.Precompiles.Bls.Shamatar;
using Nethermind.Evm.Precompiles.Bls;
using Nethermind.Specs.Forks;
using NUnit.Framework;

Expand Down
2 changes: 1 addition & 1 deletion src/Nethermind/Nethermind.Evm.Test/BlsMapToG2Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using FluentAssertions;
using Nethermind.Core.Extensions;
using Nethermind.Evm.Precompiles;
using Nethermind.Evm.Precompiles.Bls.Shamatar;
using Nethermind.Evm.Precompiles.Bls;
using Nethermind.Specs.Forks;
using NUnit.Framework;

Expand Down
2 changes: 1 addition & 1 deletion src/Nethermind/Nethermind.Evm.Test/BlsMulG1PrecompileTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using FluentAssertions;
using Nethermind.Core.Extensions;
using Nethermind.Evm.Precompiles;
using Nethermind.Evm.Precompiles.Bls.Shamatar;
using Nethermind.Evm.Precompiles.Bls;
using Nethermind.Specs.Forks;
using NUnit.Framework;

Expand Down
2 changes: 1 addition & 1 deletion src/Nethermind/Nethermind.Evm.Test/BlsMulG2PrecompileTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using FluentAssertions;
using Nethermind.Core.Extensions;
using Nethermind.Evm.Precompiles;
using Nethermind.Evm.Precompiles.Bls.Shamatar;
using Nethermind.Evm.Precompiles.Bls;
using Nethermind.Specs.Forks;
using NUnit.Framework;

Expand Down
2 changes: 1 addition & 1 deletion src/Nethermind/Nethermind.Evm.Test/BlsMultiMulG1PrecompileTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using FluentAssertions;
using Nethermind.Core.Extensions;
using Nethermind.Evm.Precompiles;
using Nethermind.Evm.Precompiles.Bls.Shamatar;
using Nethermind.Evm.Precompiles.Bls;
using Nethermind.Specs.Forks;
using NUnit.Framework;

Expand Down
2 changes: 1 addition & 1 deletion src/Nethermind/Nethermind.Evm.Test/BlsMultiMulG2PrecompileTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using FluentAssertions;
using Nethermind.Core.Extensions;
using Nethermind.Evm.Precompiles;
using Nethermind.Evm.Precompiles.Bls.Shamatar;
using Nethermind.Evm.Precompiles.Bls;
using NUnit.Framework;
using static Nethermind.Specs.Forks.MuirGlacier;

Expand Down
2 changes: 1 addition & 1 deletion src/Nethermind/Nethermind.Evm.Test/BlsParingPrecompileTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using FluentAssertions;
using Nethermind.Core.Extensions;
using Nethermind.Evm.Precompiles;
using Nethermind.Evm.Precompiles.Bls.Shamatar;
using Nethermind.Evm.Precompiles.Bls;
using Nethermind.Specs.Forks;
using NUnit.Framework;

Expand Down
6 changes: 3 additions & 3 deletions src/Nethermind/Nethermind.Evm.Test/BnAddPrecompileTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited
// SPDX-License-Identifier: LGPL-3.0-only

using System;
using Nethermind.Core.Extensions;
using Nethermind.Evm.Precompiles;
using Nethermind.Evm.Precompiles.Snarks;
using Nethermind.Specs.Forks;
using NUnit.Framework;

Expand Down Expand Up @@ -31,8 +31,8 @@ public void Test()

for (int i = 0; i < inputs.Length; i++)
{
IPrecompile shamatar = Precompiles.Snarks.Shamatar.Bn256AddPrecompile.Instance;
(ReadOnlyMemory<byte>, bool) resultShamatar = shamatar.Run(inputs[i], MuirGlacier.Instance);
IPrecompile precompile = Bn254AddPrecompile.Instance;
_ = precompile.Run(inputs[i], MuirGlacier.Instance);
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/Nethermind/Nethermind.Evm.Test/BnMulPrecompileTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited
// SPDX-License-Identifier: LGPL-3.0-only

using System;
using Nethermind.Core.Extensions;
using Nethermind.Evm.Precompiles;
using Nethermind.Evm.Precompiles.Snarks;
using Nethermind.Specs.Forks;
using NUnit.Framework;

Expand Down Expand Up @@ -31,8 +31,8 @@ public void Test()

for (int i = 0; i < inputs.Length; i++)
{
IPrecompile shamatar = Precompiles.Snarks.Shamatar.Bn256MulPrecompile.Instance;
(ReadOnlyMemory<byte>, bool) resultShamatar = shamatar.Run(inputs[i], MuirGlacier.Instance);
IPrecompile precompile = Bn254MulPrecompile.Instance;
_ = precompile.Run(inputs[i], MuirGlacier.Instance);
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/Nethermind/Nethermind.Evm.Test/BnPairPrecompileTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited
// SPDX-License-Identifier: LGPL-3.0-only

using System;
using Nethermind.Core.Extensions;
using Nethermind.Evm.Precompiles;
using Nethermind.Evm.Precompiles.Snarks;
using Nethermind.Specs.Forks;
using NUnit.Framework;

Expand Down Expand Up @@ -62,8 +62,8 @@ public void Test()
for (int i = 0; i < inputs.Length; i++)
{
byte[] cloned = inputs[i].Clone() as byte[];
IPrecompile shamatar = Precompiles.Snarks.Shamatar.Bn256PairingPrecompile.Instance;
(ReadOnlyMemory<byte>, bool) resultShamatar = shamatar.Run(cloned, MuirGlacier.Instance);
IPrecompile precompile = Bn254PairingPrecompile.Instance;
_ = precompile.Run(cloned, MuirGlacier.Instance);
}
}
}
Expand Down
Loading