Fixing BLS cross platform (#66)

* Update IcpBlsUtil.cs * Update EdjCase.Cryptography.BLS.csproj * Update IcpBlsUtil.cs * Update IcpBlsUtil.cs * Update IcpBlsUtil.cs * Update IcpBlsUtil.cs * Update IcpBlsUtil.cs * Update libbls384_256.dylib * Update EdjCase.Cryptography.BLS.csproj * Update IcpBlsUtil.cs * Adding files to runtime specific folders * Remove broken CustomMapperAttributes * Changing to not use DLLImport * Update dotnet.yml * Fixing build * dd * d * Adding hex string method * Update IcpBlsUtil.cs * Update dotnet.yml
edjCase · Apr 25, 2023 · bcfbb59 · bcfbb59
1 parent 6a9be15
commit bcfbb59
Show file tree

Hide file tree

Showing 16 changed files with 171 additions and 240 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     steps:
       - uses: actions/checkout@v3
@@ -20,6 +20,8 @@ jobs:
         uses: actions/setup-dotnet@v2
         with:
           dotnet-version: 6.0.x
+      - name: Install libdl
+        run: sudo apt update && sudo apt install -y libc-dev
       - name: Restore dependencies
         run: dotnet restore
       - name: Build

diff --git a/src/Candid/API.md b/src/Candid/API.md
@@ -427,9 +427,6 @@
 - [CompoundTypeTable](#T-EdjCase-ICP-Candid-Models-CompoundTypeTable 'EdjCase.ICP.Candid.Models.CompoundTypeTable')
   - [CompoundTypeIndexMap](#F-EdjCase-ICP-Candid-Models-CompoundTypeTable-CompoundTypeIndexMap 'EdjCase.ICP.Candid.Models.CompoundTypeTable.CompoundTypeIndexMap')
   - [TryAdd(typeDef)](#M-EdjCase-ICP-Candid-Models-CompoundTypeTable-TryAdd-EdjCase-ICP-Candid-Models-Types-CandidCompoundType- 'EdjCase.ICP.Candid.Models.CompoundTypeTable.TryAdd(EdjCase.ICP.Candid.Models.Types.CandidCompoundType)')
-- [CustomMapperAttribute](#T-EdjCase-ICP-Candid-Mapping-CustomMapperAttribute 'EdjCase.ICP.Candid.Mapping.CustomMapperAttribute')
-  - [#ctor(mapper)](#M-EdjCase-ICP-Candid-Mapping-CustomMapperAttribute-#ctor-EdjCase-ICP-Candid-Mapping-ICandidValueMapper- 'EdjCase.ICP.Candid.Mapping.CustomMapperAttribute.#ctor(EdjCase.ICP.Candid.Mapping.ICandidValueMapper)')
-  - [Mapper](#P-EdjCase-ICP-Candid-Mapping-CustomMapperAttribute-Mapper 'EdjCase.ICP.Candid.Mapping.CustomMapperAttribute.Mapper')
 - [EmptyValue](#T-EdjCase-ICP-Candid-Models-EmptyValue 'EdjCase.ICP.Candid.Models.EmptyValue')
 - [EncodedValue](#T-EdjCase-ICP-Candid-Models-HashTree-EncodedValue 'EdjCase.ICP.Candid.Models.HashTree.EncodedValue')
   - [#ctor(value)](#M-EdjCase-ICP-Candid-Models-HashTree-EncodedValue-#ctor-System-Byte[]- 'EdjCase.ICP.Candid.Models.HashTree.EncodedValue.#ctor(System.Byte[])')
@@ -6061,33 +6058,6 @@ True if added, otherwise false
 | ---- | ---- | ----------- |
 | typeDef | [EdjCase.ICP.Candid.Models.Types.CandidCompoundType](#T-EdjCase-ICP-Candid-Models-Types-CandidCompoundType 'EdjCase.ICP.Candid.Models.Types.CandidCompoundType') | Type to add to table |
 
-<a name='T-EdjCase-ICP-Candid-Mapping-CustomMapperAttribute'></a>
-## CustomMapperAttribute `type`
-
-##### Namespace
-
-EdjCase.ICP.Candid.Mapping
-
-##### Summary
-
-An attribute that specifies a custom mapper for the class, struct, property or field
-
-<a name='M-EdjCase-ICP-Candid-Mapping-CustomMapperAttribute-#ctor-EdjCase-ICP-Candid-Mapping-ICandidValueMapper-'></a>
-### #ctor(mapper) `constructor`
-
-##### Parameters
-
-| Name | Type | Description |
-| ---- | ---- | ----------- |
-| mapper | [EdjCase.ICP.Candid.Mapping.ICandidValueMapper](#T-EdjCase-ICP-Candid-Mapping-ICandidValueMapper 'EdjCase.ICP.Candid.Mapping.ICandidValueMapper') | The object mapper to use for the decorated item |
-
-<a name='P-EdjCase-ICP-Candid-Mapping-CustomMapperAttribute-Mapper'></a>
-### Mapper `property`
-
-##### Summary
-
-The object mapper to use for the decorated item
-
 <a name='T-EdjCase-ICP-Candid-Models-EmptyValue'></a>
 ## EmptyValue `type`
 

diff --git a/src/Candid/API.xml b/src/Candid/API.xml
diff --git a/src/Candid/CandidConverter.cs b/src/Candid/CandidConverter.cs
@@ -140,11 +140,6 @@ private ICandidValueMapper ResolveMapper(Type type)
 
 		private ICandidValueMapper ResolveUncached(Type type)
 		{
-			CustomMapperAttribute? mapperAttr = type.GetCustomAttribute<CustomMapperAttribute>();
-			if (mapperAttr != null)
-			{
-				return mapperAttr.Mapper;
-			}
 			ICandidValueMapper? mapper = null;
 			if (this._options.CustomMappers != null)
 			{

diff --git a/src/Candid/Mapping/IResolvableTypeInfo.cs b/src/Candid/Mapping/IResolvableTypeInfo.cs
@@ -486,9 +486,7 @@ private static IResolvableTypeInfo BuildRecord(Type objType)
 				{
 					tag = CandidTag.FromName(property.Name);
 				}
-				CustomMapperAttribute? customMapperAttribute = property.GetCustomAttribute<CustomMapperAttribute>();
-
-				PropertyMetaData propertyMetaData = new(property, customMapperAttribute?.Mapper);
+				PropertyMetaData propertyMetaData = new(property, CustomMapper: null); // TODO attribute custom mapper
 				propertyMetaDataMap.Add(tag, propertyMetaData);
 			}
 			List<Type> dependencies = propertyMetaDataMap

diff --git a/src/Candid/Mapping/MapperAttributes.cs b/src/Candid/Mapping/MapperAttributes.cs
@@ -47,24 +47,6 @@ public CandidTagAttribute(string name)
 		}
 	}
 
-	/// <summary>
-	/// An attribute that specifies a custom mapper for the class, struct, property or field
-	/// </summary>
-	[AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Property | AttributeTargets.Field)]
-	public class CustomMapperAttribute : Attribute
-	{
-		/// <summary>
-		/// The object mapper to use for the decorated item
-		/// </summary>
-		public ICandidValueMapper Mapper { get; }
-
-		/// <param name="mapper">The object mapper to use for the decorated item</param>
-		public CustomMapperAttribute(ICandidValueMapper mapper)
-		{
-			this.Mapper = mapper ?? throw new ArgumentNullException(nameof(mapper));
-		}
-	}
-
 	/// <summary>
 	/// An attribute to ignore a property/field of a class during serialization
 	/// </summary>

diff --git a/src/EdjCase.Cryptography.BLS/Delegates.cs b/src/EdjCase.Cryptography.BLS/Delegates.cs
@@ -16,5 +16,6 @@ internal static class Delegates
 		public delegate ulong PublicKeyDeserialize(ref Interop.PublicKey pub, [In] byte[] buf, ulong bufSize);
 		public delegate ulong SignatureDeserialize(ref Signature sig, [In] byte[] buf, ulong bufSize);
 		public delegate int Verify(in Signature sig, in PublicKey pub, [In] byte[] buf, ulong size);
+		public delegate int PublicKeySetHexStr(ref PublicKey pub, [In][MarshalAs(UnmanagedType.LPStr)] string buf, ulong bufSize);
 	}
 }
diff --git a/src/EdjCase.Cryptography.BLS/EdjCase.Cryptography.BLS.csproj b/src/EdjCase.Cryptography.BLS/EdjCase.Cryptography.BLS.csproj
@@ -2,6 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.1</TargetFramework>
+		<RuntimeIdentifiers>win-x64;linux-x64;osx-x64;osx-arm64</RuntimeIdentifiers>
 		<Nullable>enable</Nullable>
 		<LangVersion>latest</LangVersion>
 		<RootNamespace>EdjCase.Cryptography.BLS</RootNamespace>
@@ -19,32 +20,22 @@
 		<DocumentationFile>API.xml</DocumentationFile>
 		<DocumentationMarkdown>$(MSBuildProjectDirectory)\API.md</DocumentationMarkdown>
 		<UseAppHost>true</UseAppHost>
+		<PlatformTarget>AnyCPU</PlatformTarget>
 	</PropertyGroup>
 
+
 	<ItemGroup>
 		<None Include="README.md">
 			<Pack>True</Pack>
 			<PackagePath>\</PackagePath>
 		</None>
 	</ItemGroup>
+
 	<ItemGroup>
-		<None Update="lib\libbls384_256.so">
-			<Link>libbls384_256.so</Link>
-			<PackagePath>runtimes\linux-x64\native</PackagePath>
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		<None Include="runtimes/**/*">
 			<Pack>true</Pack>
-		</None>
-		<None Update="lib\libbls384_256.dylib">
-			<Link>libbls384_256.dylib</Link>
-			<PackagePath>runtimes\osx-x64\native</PackagePath>
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-			<Pack>true</Pack>
-		</None>
-		<None Update="lib\bls384_256.dll">
-			<Link>bls384_256.dll</Link>
-		  <PackagePath>runtimes\win-x64\native</PackagePath>
-		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		  <Pack>true</Pack>
+			<PackagePath>runtimes</PackagePath>
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 	</ItemGroup>