Merge pull request #3325 from AElfProject/release/1.2.1

Release v1.2.1
AElfProject · Aug 23, 2022 · 69cc24e · 69cc24e
2 parents e7376fc + 5342204
commit 69cc24e
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 42 deletions.
diff --git a/AElf.sln b/AElf.sln
@@ -195,8 +195,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AElf.Kernel.TestBase", "tes
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AElf.Kernel.Tests", "test\AElf.Kernel.Tests\AElf.Kernel.Tests.csproj", "{4782F920-5DC0-4109-A214-ACC825092A2A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AElf.Kernel.Token.Tests", "test\AElf.Kernel.Token.Tests\AElf.Kernel.Token.Tests.csproj", "{6BC27BD8-E076-476E-AB84-BAC6ED58CE7B}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AElf.Kernel.Token.Tests", "test\AElf.Kernel.Token.Tests\AElf.Kernel.Token.Tests.csproj", "{30DCA775-E8FD-47A5-BD58-57791E1166BE}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AElf.Kernel.TransactionPool.Tests", "test\AElf.Kernel.TransactionPool.Tests\AElf.Kernel.TransactionPool.Tests.csproj", "{FB82A8FC-C7BA-4BE7-A750-A15094EAA02D}"
@@ -329,7 +327,6 @@ Global
 		{30B4F036-6C76-4A0F-A2C1-2E4F0153EAFA} = {B7751FC6-0B5D-4AD1-93FB-77FF50954BC5}
 		{A378BFD9-393A-4DF3-81FD-DED192C1D83B} = {B7751FC6-0B5D-4AD1-93FB-77FF50954BC5}
 		{4782F920-5DC0-4109-A214-ACC825092A2A} = {B7751FC6-0B5D-4AD1-93FB-77FF50954BC5}
-		{6BC27BD8-E076-476E-AB84-BAC6ED58CE7B} = {B7751FC6-0B5D-4AD1-93FB-77FF50954BC5}
 		{30DCA775-E8FD-47A5-BD58-57791E1166BE} = {B7751FC6-0B5D-4AD1-93FB-77FF50954BC5}
 		{FB82A8FC-C7BA-4BE7-A750-A15094EAA02D} = {B7751FC6-0B5D-4AD1-93FB-77FF50954BC5}
 		{D089CD83-0331-4415-989C-E79470922E2F} = {B7751FC6-0B5D-4AD1-93FB-77FF50954BC5}
@@ -707,10 +704,6 @@ Global
 		{4782F920-5DC0-4109-A214-ACC825092A2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4782F920-5DC0-4109-A214-ACC825092A2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4782F920-5DC0-4109-A214-ACC825092A2A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6BC27BD8-E076-476E-AB84-BAC6ED58CE7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6BC27BD8-E076-476E-AB84-BAC6ED58CE7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6BC27BD8-E076-476E-AB84-BAC6ED58CE7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6BC27BD8-E076-476E-AB84-BAC6ED58CE7B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{30DCA775-E8FD-47A5-BD58-57791E1166BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{30DCA775-E8FD-47A5-BD58-57791E1166BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{30DCA775-E8FD-47A5-BD58-57791E1166BE}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/src/AElf.Kernel/Miner/Application/MinerService.cs b/src/AElf.Kernel/Miner/Application/MinerService.cs
@@ -56,7 +56,7 @@ public async Task<BlockExecutedSet> MineAsync(Hash previousBlockHash, long previ
 
         Logger.LogInformation(
             "Start mining with previous hash: {PreviousBlockHash}, previous height: {PreviousBlockHeight}",
-            previousBlockHash, previousBlockHeight);
+            previousBlockHash.ToHex(), previousBlockHeight);
         return await _miningService.MineAsync(
             new RequestMiningDto
             {

diff --git a/src/AElf.Kernel/Miner/Application/MiningService.cs b/src/AElf.Kernel/Miner/Application/MiningService.cs
@@ -83,7 +83,7 @@ public async Task<BlockExecutedSet> MineAsync(RequestMiningDto requestMiningDto,
                                   "previous: {PreviousBlockHash}, " +
                                   "executed transactions: {TransactionsCount}, " +
                                   "not executed transactions {NotExecutedTransactionsCount}",
-                block.ToDiagnosticString(), block.Header.PreviousBlockHash, block.Body.TransactionsCount,
+                block.ToDiagnosticString(), block.Header.PreviousBlockHash.ToHex(), block.Body.TransactionsCount,
                 pending.Count + systemTransactions.Count - block.Body.TransactionsCount);
             return blockExecutedSet;
         }

diff --git a/src/AElf.WebApp.Web/AElf.WebApp.Web.csproj b/src/AElf.WebApp.Web/AElf.WebApp.Web.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="..\..\common.props"/>
+    <Import Project="..\..\common.props" />
 
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
@@ -9,18 +9,18 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\AElf.WebApp.Application.Chain\AElf.WebApp.Application.Chain.csproj"/>
-        <ProjectReference Include="..\AElf.WebApp.Application.Net\AElf.WebApp.Application.Net.csproj"/>
+        <ProjectReference Include="..\AElf.WebApp.Application.Chain\AElf.WebApp.Application.Chain.csproj" />
+        <ProjectReference Include="..\AElf.WebApp.Application.Net\AElf.WebApp.Application.Net.csproj" />
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.0.0"/>
-        <PackageReference Include="Microsoft.Extensions.Primitives" Version="6.0.0"/>
-        <PackageReference Include="Volo.Abp.Autofac" Version="5.2.2"/>
-        <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="5.2.2"/>
-        <PackageReference Include="Volo.Abp.Authorization" Version="5.2.2"/>
-        <PackageReference Include="Volo.Abp.Castle.Core" Version="5.2.2"/>
-        <PackageReference Include="Volo.Abp.Swashbuckle" Version="5.2.2"/>
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Primitives" Version="6.0.0" />
+        <PackageReference Include="Volo.Abp.Autofac" Version="5.2.2" />
+        <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="5.2.2" />
+        <PackageReference Include="Volo.Abp.Authorization" Version="5.2.2" />
+        <PackageReference Include="Volo.Abp.Castle.Core" Version="5.2.2" />
+        <PackageReference Include="Volo.Abp.Swashbuckle" Version="5.2.2" />
     </ItemGroup>
 
 </Project>
diff --git a/src/AElf.WebApp.Web/UpperCamelCaseNamingPolicy.cs b/src/AElf.WebApp.Web/UpperCamelCaseNamingPolicy.cs
@@ -0,0 +1,12 @@
+using System.Text.Json;
+
+namespace AElf.WebApp.Web;
+
+public class UpperCamelCaseNamingPolicy : JsonNamingPolicy
+{
+    public override string ConvertName(string name)
+    {
+        var camelCase = CamelCase.ConvertName(name);
+        return $"{char.ToUpperInvariant(camelCase[0])}{camelCase[1..]}";
+    }
+}
diff --git a/src/AElf.WebApp.Web/UpperCamelCaseNamingStrategy.cs b/src/AElf.WebApp.Web/UpperCamelCaseNamingStrategy.cs
diff --git a/src/AElf.WebApp.Web/WebWebAppAElfModule.cs b/src/AElf.WebApp.Web/WebWebAppAElfModule.cs
@@ -20,7 +20,6 @@
 using Microsoft.OpenApi.Models;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Serialization;
 using Swashbuckle.AspNetCore.SwaggerGen;
 using Volo.Abp;
 using Volo.Abp.AspNetCore.Mvc;
@@ -61,17 +60,13 @@ public override void ConfigureServices(ServiceConfigurationContext context)
 
         ConfigureSwaggerServices(context.Services);
 
-        context.Services.AddControllers(options =>
+        context.Services.AddControllers(configure =>
         {
-            options.InputFormatters.Add(new ProtobufInputFormatter());
-            options.OutputFormatters.Add(new ProtobufOutputFormatter());
-        }).AddNewtonsoftJson(options =>
+            configure.InputFormatters.Add(new ProtobufInputFormatter());
+            configure.OutputFormatters.Add(new ProtobufOutputFormatter());
+        }).AddJsonOptions(options =>
         {
-            options.SerializerSettings.ContractResolver = new DefaultContractResolver
-            {
-                NamingStrategy = new UpperCamelCaseNamingStrategy()
-            };
-            options.SerializerSettings.Converters.Add(new ProtoMessageConverter());
+            options.JsonSerializerOptions.PropertyNamingPolicy = new UpperCamelCaseNamingPolicy();
         });
 
         context.Services.AddAuthentication("BasicAuthentication")