Replace ShamatarLib with Nethermind.Crypto.Pairings package

NethermindEth · Apr 25, 2023 · ece72d9 · ece72d9
1 parent 8385c71
commit ece72d9
Show file tree

Hide file tree

Showing 41 changed files with 98 additions and 285 deletions.
diff --git a/src/Nethermind/Directory.Packages.props b/src/Nethermind/Directory.Packages.props
@@ -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-preview.1" />
     <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" />
@@ -78,4 +79,4 @@
     <PackageVersion Include="Websocket.Client" Version="4.5.2" />
     <PackageVersion Include="YamlDotNet" Version="13.0.1" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/Nethermind/Nethermind.Crypto/Nethermind.Crypto.csproj b/src/Nethermind/Nethermind.Crypto/Nethermind.Crypto.csproj
@@ -21,24 +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-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>

diff --git a/src/Nethermind/Nethermind.Crypto/ShamatarLib.cs b/src/Nethermind/Nethermind.Crypto/ShamatarLib.cs
diff --git a/src/Nethermind/Nethermind.Crypto/runtimes/linux-arm64/native/libshamatar.so b/src/Nethermind/Nethermind.Crypto/runtimes/linux-arm64/native/libshamatar.so
diff --git a/src/Nethermind/Nethermind.Crypto/runtimes/linux-x64/native/libshamatar.so b/src/Nethermind/Nethermind.Crypto/runtimes/linux-x64/native/libshamatar.so
diff --git a/src/Nethermind/Nethermind.Crypto/runtimes/osx-arm64/native/libshamatar.dylib b/src/Nethermind/Nethermind.Crypto/runtimes/osx-arm64/native/libshamatar.dylib
diff --git a/src/Nethermind/Nethermind.Crypto/runtimes/osx-x64/native/libshamatar.dylib b/src/Nethermind/Nethermind.Crypto/runtimes/osx-x64/native/libshamatar.dylib
diff --git a/src/Nethermind/Nethermind.Crypto/runtimes/win-x64/native/shamatar.dll b/src/Nethermind/Nethermind.Crypto/runtimes/win-x64/native/shamatar.dll
diff --git a/src/Nethermind/Nethermind.Evm.Test/BlsAddG1PrecompileTests.cs b/src/Nethermind/Nethermind.Evm.Test/BlsAddG1PrecompileTests.cs
@@ -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;
 

diff --git a/src/Nethermind/Nethermind.Evm.Test/BlsAddG2PrecompileTests.cs b/src/Nethermind/Nethermind.Evm.Test/BlsAddG2PrecompileTests.cs
@@ -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;
 

diff --git a/src/Nethermind/Nethermind.Evm.Test/BlsMapToG1Tests.cs b/src/Nethermind/Nethermind.Evm.Test/BlsMapToG1Tests.cs
@@ -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;
 

diff --git a/src/Nethermind/Nethermind.Evm.Test/BlsMapToG2Tests.cs b/src/Nethermind/Nethermind.Evm.Test/BlsMapToG2Tests.cs
@@ -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;
 

diff --git a/src/Nethermind/Nethermind.Evm.Test/BlsMulG1PrecompileTests.cs b/src/Nethermind/Nethermind.Evm.Test/BlsMulG1PrecompileTests.cs
@@ -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;
 

diff --git a/src/Nethermind/Nethermind.Evm.Test/BlsMulG2PrecompileTests.cs b/src/Nethermind/Nethermind.Evm.Test/BlsMulG2PrecompileTests.cs
@@ -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;
 

diff --git a/src/Nethermind/Nethermind.Evm.Test/BlsMultiMulG1PrecompileTests.cs b/src/Nethermind/Nethermind.Evm.Test/BlsMultiMulG1PrecompileTests.cs
@@ -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;
 

diff --git a/src/Nethermind/Nethermind.Evm.Test/BlsMultiMulG2PrecompileTests.cs b/src/Nethermind/Nethermind.Evm.Test/BlsMultiMulG2PrecompileTests.cs
@@ -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;
 

diff --git a/src/Nethermind/Nethermind.Evm.Test/BlsParingPrecompileTests.cs b/src/Nethermind/Nethermind.Evm.Test/BlsParingPrecompileTests.cs
@@ -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;
 

diff --git a/src/Nethermind/Nethermind.Evm.Test/BnAddPrecompileTests.cs b/src/Nethermind/Nethermind.Evm.Test/BnAddPrecompileTests.cs
@@ -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;
 
@@ -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);
             }
         }
     }

diff --git a/src/Nethermind/Nethermind.Evm.Test/BnMulPrecompileTests.cs b/src/Nethermind/Nethermind.Evm.Test/BnMulPrecompileTests.cs
@@ -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;
 
@@ -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);
             }
         }
     }

diff --git a/src/Nethermind/Nethermind.Evm.Test/BnPairPrecompileTests.cs b/src/Nethermind/Nethermind.Evm.Test/BnPairPrecompileTests.cs
@@ -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;
 
@@ -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);
             }
         }
     }