Merge pull request #139 from Ashuaidehao/dev-back

Upgrade 3.3.1
neo-ngd · Jun 28, 2022 · af417a4 · af417a4
2 parents 1d636dd + 9498d0f
commit af417a4
Show file tree

Hide file tree

Showing 10 changed files with 52,128 additions and 28,573 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ Your feedbacks and suggestions are welcome. Please submit issues.
 
 ## Required Tools and Dependencies for development
 
-1. [Visual Studio 2019](https://visualstudio.microsoft.com/) and [.NET Core 5.0](https://dotnet.microsoft.com/download) 
+1. [Visual Studio 2019](https://visualstudio.microsoft.com/) and [.NET Core 6.0](https://dotnet.microsoft.com/download) 
 2. [Node.js](https://nodejs.org/) 
 
 ## Build and Run

diff --git a/neo3-gui/neo3-gui/ClientApp/package-lock.json b/neo3-gui/neo3-gui/ClientApp/package-lock.json
diff --git a/neo3-gui/neo3-gui/ClientApp/package.json b/neo3-gui/neo3-gui/ClientApp/package.json
@@ -1,6 +1,6 @@
 {
     "name": "neo-gui",
-    "version": "1.4.1",
+    "version": "1.4.2",
     "private": true,
     "main": "main.js",
     "homepage": "./",
@@ -120,4 +120,4 @@
         "electron-builder": "^22.4.1",
         "electron-devtools-installer": "^3.0.0"
     }
-}
+}
diff --git a/neo3-gui/neo3-gui/ClientApp/yarn.lock b/neo3-gui/neo3-gui/ClientApp/yarn.lock
diff --git a/neo3-gui/neo3-gui/Plugins/LevelDBStore.dll b/neo3-gui/neo3-gui/Plugins/LevelDBStore.dll
diff --git a/neo3-gui/neo3-gui/Plugins/LevelDBStore/LevelDBStore.dll b/neo3-gui/neo3-gui/Plugins/LevelDBStore/LevelDBStore.dll
diff --git a/neo3-gui/neo3-gui/Plugins/LevelDBStore/config.json b/neo3-gui/neo3-gui/Plugins/LevelDBStore/config.json
diff --git a/neo3-gui/neo3-gui/config.mainnet.json b/neo3-gui/neo3-gui/config.mainnet.json
@@ -7,18 +7,20 @@
     },
     "Storage": {
       "Engine": "LevelDBStore",
-      "Path": "Data_LevelDB_MainNet"
+      "Path": "Data_LevelDB_Mainnet"
     },
     "P2P": {
       "Port": 10333,
-      "WsPort": 10334
+      "WsPort": 10334,
+      "MinDesiredConnections": 10,
+      "MaxConnections": 40,
+      "MaxConnectionsPerAddress": 3
     },
     "UnlockWallet": {
       "Path": "",
       "Password": "",
       "IsActive": false
-    },
-    "PluginURL": "https://github.com/neo-project/neo-modules/releases/download/v{1}/{0}.zip"
+    }
   },
   "ProtocolConfiguration": {
     "Network": 860833102,
@@ -27,6 +29,9 @@
     "MaxTransactionsPerBlock": 512,
     "MemoryPoolMaxTransactions": 50000,
     "MaxTraceableBlocks": 2102400,
+    "Hardforks": {
+      "HF_Aspidochelone": 1730000
+    },
     "InitialGasDistribution": 5200000000000000,
     "ValidatorsCount": 7,
     "StandbyCommittee": [

diff --git a/neo3-gui/neo3-gui/config.testnet.json b/neo3-gui/neo3-gui/config.testnet.json
@@ -7,26 +7,31 @@
     },
     "Storage": {
       "Engine": "LevelDBStore",
-      "Path": "Data_LevelDB_TestNet"
+      "Path": "Data_LevelDB_Testnet"
     },
     "P2P": {
       "Port": 20333,
-      "WsPort": 20334
+      "WsPort": 20334,
+      "MinDesiredConnections": 10,
+      "MaxConnections": 40,
+      "MaxConnectionsPerAddress": 3
     },
     "UnlockWallet": {
       "Path": "",
       "Password": "",
       "IsActive": false
-    },
-    "PluginURL": "https://github.com/neo-project/neo-modules/releases/download/v{1}/{0}.zip"
+    }
   },
   "ProtocolConfiguration": {
-    "Network": 877933390,
+    "Network": 894710606,
     "AddressVersion": 53,
     "MillisecondsPerBlock": 15000,
-    "MaxTransactionsPerBlock": 512,
+    "MaxTransactionsPerBlock": 5000,
     "MemoryPoolMaxTransactions": 50000,
     "MaxTraceableBlocks": 2102400,
+    "Hardforks": {
+      "HF_Aspidochelone": 210000
+    },
     "InitialGasDistribution": 5200000000000000,
     "ValidatorsCount": 7,
     "StandbyCommittee": [
@@ -53,11 +58,11 @@
       "03184b018d6b2bc093e535519732b3fd3f7551c8cffaf4621dd5a0b89482ca66c9"
     ],
     "SeedList": [
-      "seed1t4.neo.org:20333",
-      "seed2t4.neo.org:20333",
-      "seed3t4.neo.org:20333",
-      "seed4t4.neo.org:20333",
-      "seed5t4.neo.org:20333"
+      "seed1t5.neo.org:20333",
+      "seed2t5.neo.org:20333",
+      "seed3t5.neo.org:20333",
+      "seed4t5.neo.org:20333",
+      "seed5t5.neo.org:20333"
     ]
   }
-}
+}
diff --git a/neo3-gui/neo3-gui/neo3-gui.csproj b/neo3-gui/neo3-gui/neo3-gui.csproj
@@ -24,19 +24,22 @@
 
   <ItemGroup>
     <PackageReference Include="EFCore.BulkExtensions" Version="3.1.1" />
-    <!--<PackageReference Include="Neo" Version="3.1.0" />-->
+    <PackageReference Include="Neo" Version="3.3.1" />
     <PackageReference Include="Neo.LevelDb.Dev" Version="3.0.0-pre4" />
     <PackageReference Include="System.ServiceProcess.ServiceController" Version="4.6.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\neo\src\neo\neo.csproj" />
+    <!--<ProjectReference Include="..\..\neo\src\neo\neo.csproj" />-->
   </ItemGroup>
 
   <ItemGroup>
     <None Update="Plugins\LevelDBStore.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Update="Plugins\LevelDBStore\LevelDBStore.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>