feat: Add signature server

.gitignore

@@ -275,6 +275,9 @@ grpc_csharp_plugin
 
 launchSettings.json
 
+# dev settings
+*/**/appsettings.Development.json
+
 yarn.lock
 
 results/coverage.json

CAServer.sln

@@ -65,6 +65,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CAServer.EntityEventHandler
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CAServer.HttpApi.Tests", "test\CAServer.HttpApi.Tests\CAServer.HttpApi.Tests.csproj", "{A79C3A46-D7FA-435F-BFB0-6C41B27C33EE}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CAServer.Signature.HttpApi", "src\CAServer.Signature.HttpApi\CAServer.Signature.HttpApi.csproj", "{E591184A-51BB-4B30-9613-3D71B0A37827}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CAServer.Signature.HttpApi.Host", "src\CAServer.Signature.HttpApi.Host\CAServer.Signature.HttpApi.Host.csproj", "{13DC2010-60D4-4925-BE24-996A0516F0B6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CAServer.Signature.HttpApi.Tests", "test\CAServer.Signature.HttpApi.Tests\CAServer.Signature.HttpApi.Tests.csproj", "{B0079C9F-368D-4CDB-B097-27A6250BD402}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CAServer.Signature", "src\CAServer.Signature\CAServer.Signature.csproj", "{EC87414A-45DA-4FEB-9A25-874C5A852B91}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -187,6 +195,22 @@ Global
 		{A79C3A46-D7FA-435F-BFB0-6C41B27C33EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A79C3A46-D7FA-435F-BFB0-6C41B27C33EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A79C3A46-D7FA-435F-BFB0-6C41B27C33EE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E591184A-51BB-4B30-9613-3D71B0A37827}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E591184A-51BB-4B30-9613-3D71B0A37827}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E591184A-51BB-4B30-9613-3D71B0A37827}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E591184A-51BB-4B30-9613-3D71B0A37827}.Release|Any CPU.Build.0 = Release|Any CPU
+		{13DC2010-60D4-4925-BE24-996A0516F0B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{13DC2010-60D4-4925-BE24-996A0516F0B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{13DC2010-60D4-4925-BE24-996A0516F0B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{13DC2010-60D4-4925-BE24-996A0516F0B6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B0079C9F-368D-4CDB-B097-27A6250BD402}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B0079C9F-368D-4CDB-B097-27A6250BD402}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B0079C9F-368D-4CDB-B097-27A6250BD402}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B0079C9F-368D-4CDB-B097-27A6250BD402}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EC87414A-45DA-4FEB-9A25-874C5A852B91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EC87414A-45DA-4FEB-9A25-874C5A852B91}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EC87414A-45DA-4FEB-9A25-874C5A852B91}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EC87414A-45DA-4FEB-9A25-874C5A852B91}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -221,6 +245,10 @@ Global
 		{1B1FA09C-98AC-4893-9D76-EC34071E55C5} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
 		{484F985C-3BCC-484D-B2D4-5A366388C249} = {04DBDB01-70F4-4E06-B468-8F87850B22BE}
 		{A79C3A46-D7FA-435F-BFB0-6C41B27C33EE} = {04DBDB01-70F4-4E06-B468-8F87850B22BE}
+		{E591184A-51BB-4B30-9613-3D71B0A37827} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
+		{13DC2010-60D4-4925-BE24-996A0516F0B6} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
+		{B0079C9F-368D-4CDB-B097-27A6250BD402} = {04DBDB01-70F4-4E06-B468-8F87850B22BE}
+		{EC87414A-45DA-4FEB-9A25-874C5A852B91} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {28315BFD-90E7-4E14-A2EA-F3D23AF4126F}

azure-pipelines.yml

@@ -31,8 +31,8 @@ jobs:
 #       - script: PowerShell.exe -file build.ps1 --target=Upload-Coverage-Azure
 #         displayName: 'Upload data to Codecov'
   # All tasks on Linux
-  - job: build_all_linux
-    displayName: Build all tasks (Linux)
+#  - job: build_all_linux
+#    displayName: Build all tasks (Linux)
 #    timeoutInMinutes: 120
 #    pool:
 #      vmImage: ubuntu-latest
@@ -60,21 +60,19 @@ jobs:
 #      - script: bash build.sh --target=Upload-Coverage-Azure
 #        displayName: 'Upload data to Codecov'
   #All tasks on macOS
-#  - job: build_all_darwin
-#    displayName: Build all tasks (macOS)
+  - job: build_all_darwin
+    displayName: Build all tasks (macOS)
     timeoutInMinutes: 120
     pool:
-      name: Default
-      demands:
-          - Agent.OS -equals Linux
+      vmImage: macos-latest
     variables:
       CI_TEST: true
     steps:
       - task: UseDotNet@2
         displayName: 'Install .NET Core SDK'
         inputs:
           version: 7.0.x
-      - script: cd scripts && bash elasticsearch-linux.sh
+      - script: cd scripts && bash elasticsearch-macOS.sh
         displayName: 'Start an elasticsearch'
       - script: bash build.sh --target=Test-with-Codecov
         displayName: 'Build and Test'

src/CAServer.Application.Contracts/AppleAuth/AppleAuthOptions.cs

@@ -7,6 +7,7 @@ public class AppleAuthOptions
     public List<string> Audiences { get; set; }
     public string RedirectUrl { get; set; }
     public string BingoRedirectUrl { get; set; }
+    public string UnifyRedirectUrl { get; set; }
     public ExtensionConfig ExtensionConfig { get; set; }
 }
 

src/CAServer.Application.Contracts/CAActivity/ActivityConstants.cs

@@ -4,6 +4,27 @@ namespace CAServer.CAActivity;
 
 public static class ActivityConstants
 {
+    public static readonly Dictionary<string, string> TypeMap = new()
+    {
+        { "Transfer", "Transfer" },
+        { "CrossChainTransfer", "CrossChain Transfer" },
+        { "SocialRecovery", "Social Recovery" },
+        { "RemoveManagerInfo", "Exit Wallet" },
+        { "AddManagerInfo", "Scan code login" },
+        { "CreateCAHolder", "Create CA address" },
+        { "AddGuardian", "Add guardian" },
+        { "RemoveGuardian", "Remove guardian" },
+        { "UpdateGuardian", "Edit guardian" },
+        { "SetGuardianForLogin", "Set login account" },
+        { "UnsetGuardianForLogin", "Unset login account" },
+        { "RemoveOtherManagerInfo", "Remove device" },
+        { "ClaimToken", "Transfer" },
+        { "Register", "Register" },
+        { "Approve", "Approve" },
+        { "Bingo", "Bingo" },
+        { "Play", "Play" }
+    };
+
     public static readonly List<string> DefaultTypes = new()
     {
         "Transfer", "SocialRecovery", "RemoveManagerInfo", "AddManagerInfo"
@@ -13,7 +34,7 @@ public static class ActivityConstants
     {
         "Transfer", "CrossChainTransfer", "CrossChainReceiveToken", "SocialRecovery", "RemoveManagerInfo",
         "AddManagerInfo", "CreateCAHolder", "AddGuardian", "RemoveGuardian", "UpdateGuardian", "SetGuardianForLogin",
-        "UnsetGuardianForLogin", "RemoveOtherManagerInfo", "ClaimToken", "Approve", "Bingo", "Play"
+        "UnsetGuardianForLogin", "RemoveOtherManagerInfo", "ClaimToken", "Register", "Approve", "Bingo", "Play"
     };
 
     public static readonly List<string> TransferTypes = new()
@@ -24,7 +45,9 @@ public static class ActivityConstants
     public static readonly List<string> ContractTypes = new()
     {
         "SocialRecovery", "RemoveManagerInfo", "AddManagerInfo", "CreateCAHolder", "AddGuardian", "RemoveGuardian",
-        "UpdateGuardian", "SetGuardianForLogin", "UnsetGuardianForLogin", "RemoveOtherManagerInfo", "Approve", "Bingo", "Play"
+        "UpdateGuardian", "SetGuardianForLogin", "UnsetGuardianForLogin", "RemoveOtherManagerInfo", "Register",
+        "Approve", "Bingo",
+        "Play"
     };
 
     public static readonly List<string> ShowPriceTypes = new()
@@ -34,5 +57,15 @@ public static class ActivityConstants
         "UnsetGuardianForLogin", "RemoveOtherManagerInfo", "ClaimToken", "Approve", "Bingo", "Play"
     };
 
+    public static readonly List<string> ShowNftTypes = new()
+    {
+        "Transfer", "CrossChainTransfer"
+    };
+
+    public static readonly List<string> RecentTypes = new()
+    {
+        "Transfer", "CrossChainTransfer", "ClaimToken"
+    };
+
     public static readonly string Zero = "0";
 }

src/CAServer.Application.Contracts/CAActivity/Dtos/ActivityBase.cs

@@ -7,6 +7,7 @@ public class ActivityBase
     public string TransactionId { get; set; }
     public string BlockHash { get; set; }
     public string TransactionType { get; set; }
+    public string TransactionName { get; set; }
     public string Amount { get; set; }
     public string Symbol { get; set; }
     public string Decimals { get; set; }

src/CAServer.Application.Contracts/CAActivity/Dtos/GetTwoCaTransactionRequestDto.cs

@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+using CAServer.UserAssets;
+using Volo.Abp.Application.Dtos;
+
+namespace CAServer.CAActivity.Dtos;
+
+public class GetTwoCaTransactionRequestDto : PagedResultRequestDto
+{
+    public List<CAAddressInfo> TargetAddressInfos { get; set; }
+
+    public List<CAAddressInfo> CaAddressInfos { get; set; }
+    public string ChainId { get; set; }
+    public string Symbol { get; set; }
+
+    public int Width { get; set; }
+
+    public int Height { get; set; }
+}

src/CAServer.Application.Contracts/CAActivity/Dtos/IndexerTransactions.cs

@@ -8,6 +8,11 @@ public class IndexerTransactions
     public CaHolderTransaction CaHolderTransaction { get; set; }
 }
 
+public class TransactionsDto
+{
+    public CaHolderTransaction TwoCaHolderTransaction { get; set; }
+}
+
 public class CaHolderTransaction
 {
     public List<IndexerTransaction> Data { get; set; }

src/CAServer.Application.Contracts/CAActivity/IUserActivityService.cs

@@ -8,6 +8,7 @@ namespace CAServer.CAActivity;
 
 public interface IUserActivityAppService:IApplicationService
 {
+    Task<GetActivitiesDto> GetTwoCaTransactionsAsync(GetTwoCaTransactionRequestDto request);
     Task<GetActivitiesDto> GetActivitiesAsync(GetActivitiesRequestDto request);
     Task<GetActivityDto> GetActivityAsync(GetActivityRequestDto request);
 }

src/CAServer.Application.Contracts/CAServer.Application.Contracts.csproj

@@ -34,4 +34,9 @@
     <PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="7.0.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Orleans_CodeGenInputs Remove="Sample\ISampleAppService.cs" />
+    <Orleans_CodeGenInputs Remove="Sample\TestDto.cs" />
+  </ItemGroup>
+
 </Project>

src/CAServer.Application.Contracts/Commons/ContractServiceConstant.cs

@@ -0,0 +1,10 @@
+namespace CAServer.Commons;
+
+public static class AElfContractMethodName
+{
+    public const string GetHolderInfo = "GetHolderInfo";
+    public const string GetVerifierServers = "GetVerifierServers";
+    public const string GetBalance = "GetBalance";
+    public const string ClaimToken = "ClaimToken";
+    public const string Transfer = "Transfer";
+}

src/CAServer.Application.Contracts/Notify/Dtos/CmsNotifyDto.cs

@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace CAServer.Notify.Dtos;
+
+public class CmsNotifyDto
+{
+    public List<CmsNotify> Data { get; set; }
+}
+
+public class CmsNotify
+{
+    public int Id { get; set; }
+    public string Title { get; set; }
+    public string Content { get; set; }
+    public string AppId { get; set; }
+    public CmsTargetVersion TargetVersion { get; set; }
+    public List<CmsAppVersion> AppVersions { get; set; }
+    public string DownloadUrl { get; set; }
+    [JsonProperty("date_created")] public DateTime ReleaseTime { get; set; }
+    public List<CmsDeviceType> DeviceTypes { get; set; }
+    public List<CmsDeviceBrand> DeviceBrands { get; set; }
+    public List<CmsOperatingSystemVersion> OperatingSystemVersions { get; set; }
+    public List<CmsCountry> Countries { get; set; }
+    public CmsStyleType StyleType { get; set; }
+    public bool IsForceUpdate { get; set; }
+    public bool IsApproved { get; set; }
+}
+
+public class CmsAppVersion
+{
+    [JsonProperty("appVersion_id")] public CmsValue<string> AppVersion { get; set; }
+}
+
+public class CmsCountry
+{
+    [JsonProperty("country_id")] public CmsValue<string> Country { get; set; }
+}
+
+public class CmsDeviceBrand
+{
+    [JsonProperty("deviceBrand_id")] public CmsValue<string> DeviceBrand { get; set; }
+}
+
+public class CmsDeviceType
+{
+    [JsonProperty("deviceType_id")] public CmsValue<int> DeviceType { get; set; }
+}
+
+public class CmsTargetVersion
+{
+    public string Value { get; set; }
+}
+
+public class CmsStyleType
+{
+    public int Value { get; set; }
+}
+
+public class CmsOperatingSystemVersion
+{
+    [JsonProperty("operatingSystemVersion_id")] public CmsValue<string> OperatingSystemVersion { get; set; }
+}
+
+public class CmsValue<T>
+{
+    public T Value { get; set; }
+}

src/CAServer.Application.Contracts/Notify/Dtos/NotifyBaseDto.cs

@@ -17,5 +17,6 @@ public class NotifyBaseDto
     public string[] OperatingSystemVersions { get; set; }
     public NotifySendType[] SendTypes { get; set; }
     [Required] public bool IsForceUpdate { get; set; }
+    public int NotifyId { get; set; }
     public bool IsApproved { get; set; }
 }

src/CAServer.Application.Contracts/Notify/Dtos/PullNotifyDto.cs

@@ -10,5 +10,4 @@ public class PullNotifyDto
     public string DeviceBrand { get; set; }
     public string OperatingSystemVersion { get; set; }
     [Required] public string AppId { get; set; }
-    public bool IsColdBoot { get; set; }
 }

src/CAServer.Application.Contracts/Notify/Dtos/PullNotifyResultDto.cs

@@ -7,4 +7,5 @@ public class PullNotifyResultDto
     public string TargetVersion { get; set; }
     public string DownloadUrl { get; set; }
     public bool IsForceUpdate { get; set; }
+    public StyleType StyleType { get; set; }
 }

src/CAServer.Application.Contracts/Notify/INotifyAppService.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using CAServer.Notify.Dtos;
 
@@ -10,4 +11,7 @@ public interface INotifyAppService
     Task<NotifyResultDto> CreateAsync(CreateNotifyDto notifyDto);
     Task<NotifyResultDto> UpdateAsync(Guid id, UpdateNotifyDto notifyDto);
     Task DeleteAsync(Guid id);
+
+    Task<List<NotifyResultDto>> CreateFromCmsAsync(string version);
+    Task<NotifyResultDto> UpdateFromCmsAsync(Guid id);
 }

src/CAServer.Application.Contracts/Notify/NotifyBase.cs

@@ -11,4 +11,5 @@ public class NotifyBase
     public string DownloadUrl { get; set; }
     public DateTime ReleaseTime { get; set; }
     public bool IsForceUpdate { get; set; }
+    public StyleType StyleType { get; set; }
 }

src/CAServer.Application.Contracts/Notify/NotifyRulesBase.cs

@@ -2,11 +2,13 @@ namespace CAServer.Notify;
 
 public class NotifyRulesBase
 {
+    public int NotifyId { get; set; }
     public string AppId { get; set; }
     public string[] AppVersions { get; set; }
     public string[] DeviceTypes { get; set; }
     public string[] DeviceBrands { get; set; }
     public string[] OperatingSystemVersions { get; set; }
+    public string[] Countries { get; set; }
     public NotifySendType[] SendTypes { get; set; }
     public bool IsApproved { get; set; }
 }