Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Xenomega committed Dec 7, 2018
2 parents 8cfcb37 + 1116a3f commit ddc7780
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions src/Meadow.Core/Utils/SolidityUtil.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public static byte[] PackAndHash(params (AbiTypeInfo SolidityType, object Value)
/// Performs an ECDSA sign on the given 32-byte message hash.
/// Returns the signature in r,s,v format. Use <see cref="SignatureToRpcFormat(byte[], byte[], byte)"/> to convert into the serialized byte array format.
/// </summary>
/// <param name="messageHash">The 32 byte message hash. Usually the output from <see cref="HashPersonalMessage(string)"/> or <see cref="KeccakHash.ComputeHash(Span{byte})"/></param>
/// <param name="messageHash">The 32 byte message hash. Usually the output from <see cref="HashPersonalMessage(string)"/> or <see cref="KeccakHash.ComputeHash(Span{byte}, int)"/></param>
/// <param name="signerPrivateKeyHex">Hex encoded private key to sign with.</param>
public static (byte[] R, byte[] S, byte V) ECSign(byte[] messageHash, string signerPrivateKeyHex)
{
Expand All @@ -70,7 +70,7 @@ public static (byte[] R, byte[] S, byte V) ECSign(byte[] messageHash, string sig
/// Performs an ECDSA sign on the given 32-byte message hash.
/// Returns the signature in r,s,v format. Use <see cref="SignatureToRpcFormat(byte[], byte[], byte)"/> to convert into the serialized byte array format.
/// </summary>
/// <param name="messageHash">The 32 byte message hash. Usually the output from <see cref="HashPersonalMessage(string)"/> or <see cref="KeccakHash.ComputeHash(Span{byte})"/></param>
/// <param name="messageHash">The 32 byte message hash. Usually the output from <see cref="HashPersonalMessage(string)"/> or <see cref="KeccakHash.ComputeHash(Span{byte}, int)"/></param>
/// <param name="signerPrivateKey">The private key to sign with.</param>
public static (byte[] R, byte[] S, byte V) ECSign(byte[] messageHash, byte[] signerPrivateKey)
{
Expand Down
6 changes: 3 additions & 3 deletions src/Meadow.CoverageReport/Meadow.CoverageReport.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.3" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="2.1.1" />
<PackageReference Include="System.Memory" Version="4.5.1" />
</ItemGroup>

Expand Down

0 comments on commit ddc7780

Please sign in to comment.