update the latest package, fix the code check problems

Portkey-Wallet · Aug 19, 2024 · 0a21aa4 · 0a21aa4
1 parent c31f2f9
commit 0a21aa4
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 1,515 deletions.
diff --git a/contract/Portkey.Contracts.CA/CAContract_ACS2_StatePathsProvider.cs b/contract/Portkey.Contracts.CA/CAContract_ACS2_StatePathsProvider.cs
@@ -79,7 +79,7 @@ private void AddPathForDelegatees(ResourceInfo resourceInfo, Address from, Addre
         if (delegateeList.Count <= 0) return;
         var secondDelegateeList = new List<string>();
         //get and add second-level delegatee list
-        foreach (var delegateeAddress in delegateeList.Select(Address.FromBase58))
+        foreach (var delegateeAddress in delegateeList.Select(ConvertAddress))
         {
             //delegatee of the first-level delegate is delegator of the second-level delegate
             secondDelegateeList.AddRange(GetDelegateeList(delegateeAddress, to, methodName));
@@ -92,6 +92,12 @@ private void AddPathForDelegatees(ResourceInfo resourceInfo, Address from, Addre
             AddPathForTransactionFeeFreeAllowance(resourceInfo, Address.FromBase58(delegatee));
         }
     }
+
+    //code check not supports static invocation in linq
+    private Address ConvertAddress(string address)
+    {
+        return Address.FromBase58(address);
+    }
 
     private void AddPathForTransactionFee(ResourceInfo resourceInfo, string from, string methodName)
     {

diff --git a/contract/Portkey.Contracts.CA/CAContract_ZkLogin.cs b/contract/Portkey.Contracts.CA/CAContract_ZkLogin.cs
@@ -217,7 +217,7 @@ private List<string> PoseidonHashToPublicInput(string identifierHash)
         return new List<string>{ identifierHash };
     }
 
-    private static string HexToBigInt(byte[] hex)
+    private string HexToBigInt(byte[] hex)
     {
         return HexHelper.ConvertBigEndianToDecimalString(hex);
     }

diff --git a/contract/Portkey.Contracts.CA/Portkey.Contracts.CA.csproj b/contract/Portkey.Contracts.CA/Portkey.Contracts.CA.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <PackageId>Portkey.Contracts.CA</PackageId>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <Description>Portkey Contracts</Description>
@@ -94,7 +94,7 @@
         </ContractBase>
     </ItemGroup>
     <ItemGroup>
-      <PackageReference Include="Google.Protobuf" Version="3.26.0" />
-      <PackageReference Include="Groth16.Net" Version="1.0.3" />
+      <PackageReference Include="Google.Protobuf" Version="3.27.2" />
+      <PackageReference Include="Groth16.Net" Version="1.1.0" />
     </ItemGroup>
 </Project>
diff --git a/global.json b/global.json
@@ -1,5 +1,7 @@
-{
-  "sdk": {
-    "version": "6.0.310"
-  }
+{
+  "sdk": {
+    "version": "8.0.204",
+    "rollForward": "latestMajor",
+    "allowPrerelease": true
+  }
 }
diff --git a/src/AElf.Boilerplate.ContractPatcher/AElf.Boilerplate.ContractPatcher.csproj b/src/AElf.Boilerplate.ContractPatcher/AElf.Boilerplate.ContractPatcher.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <OutputType>Exe</OutputType>
         <Description>Smart contract deployer.</Description>
     </PropertyGroup>
@@ -13,17 +13,14 @@
         <None Pack="true" PackagePath="build\" Include="*.targets;" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="AElf.CSharp.CodeOps" Version="1.0.1" />
-        <PackageReference Include="AElf.Runtime.CSharp.Core" Version="1.3.0" />
-        <PackageReference Include="AElf.Types" Version="1.3.0" />
-       <!-- <PackageReference Include="AElf.CSharp.CodeOps" Version="1.10.0" />
+        <PackageReference Include="AElf.CSharp.CodeOps" Version="1.10.1" />
         <PackageReference Include="AElf.Runtime.CSharp.Core" Version="1.10.0" />
-        <PackageReference Include="AElf.Types" Version="1.10.0" />-->
+        <PackageReference Include="AElf.Types" Version="1.10.0" />
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="CommandLineParser" Version="2.8.0" />
-        <PackageReference Include="Google.Protobuf" Version="3.26.0" />
-        <PackageReference Include="Volo.Abp.Core" Version="7.0.0" />
+        <PackageReference Include="Google.Protobuf" Version="3.27.2" />
+        <PackageReference Include="Volo.Abp.Core" Version="8.0.5" />
     </ItemGroup>
 
     <Target Name="CopyDlls" AfterTargets="AfterBuild">

diff --git a/src/AElf.Boilerplate.MainChain/AElf.Boilerplate.MainChain.csproj b/src/AElf.Boilerplate.MainChain/AElf.Boilerplate.MainChain.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>AElf.Boilerplate.MainChain</RootNamespace>
     </PropertyGroup>
     <ItemGroup>

diff --git a/...f.Boilerplate.PortkeyContracts.Launcher/AElf.Boilerplate.PortkeyContracts.Launcher.csproj b/...f.Boilerplate.PortkeyContracts.Launcher/AElf.Boilerplate.PortkeyContracts.Launcher.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ServerGarbageCollection>true</ServerGarbageCollection>
     </PropertyGroup>
 
@@ -26,11 +26,11 @@
 
     <ItemGroup>
         <PackageReference Include="AElf.WebApp.Application.Chain" Version="1.3.0">
-            <CopyToOutputDirectory>lib\net6.0\*.xml</CopyToOutputDirectory>
+            <CopyToOutputDirectory>lib\net8.0\*.xml</CopyToOutputDirectory>
             <PackageName>aelf.webapp.application.chain</PackageName>
         </PackageReference>
         <PackageReference Include="AElf.WebApp.Application.Net" Version="1.3.0">
-            <CopyToOutputDirectory>lib\net6.0\*.xml</CopyToOutputDirectory>
+            <CopyToOutputDirectory>lib\net8.0\*.xml</CopyToOutputDirectory>
             <PackageName>aelf.webapp.application.net</PackageName>
         </PackageReference>
     </ItemGroup>

diff --git a/...Boilerplate.SystemTransactionGenerator/AElf.Boilerplate.SystemTransactionGenerator.csproj b/...Boilerplate.SystemTransactionGenerator/AElf.Boilerplate.SystemTransactionGenerator.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>AElf.Boilerplate.SystemTransactionGenerator</RootNamespace>
     </PropertyGroup>
 

diff --git a/src/AElf.Boilerplate.TestBase/AElf.Boilerplate.TestBase.csproj b/src/AElf.Boilerplate.TestBase/AElf.Boilerplate.TestBase.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>AElf.Boilerplate.TestBase</RootNamespace>
         <IsPackable>false</IsPackable>
     </PropertyGroup>