Merge neox-2.x to master-2.x (#645)

neo-project · Aug 11, 2020 · 42d3daf · 42d3daf
1 parent f81e60b
commit 42d3daf
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/neo-cli/Shell/MainService.cs b/neo-cli/Shell/MainService.cs
@@ -1160,7 +1160,7 @@ private bool OnShowStateCommand(string[] args)
                     if (Program.Wallet != null)
                         wh = (Program.Wallet.WalletHeight > 0) ? Program.Wallet.WalletHeight - 1 : 0;
 
-                    WriteLineWithoutFlicker($"block: {wh}/{Blockchain.Singleton.Height}/{Blockchain.Singleton.HeaderHeight}  connected: {LocalNode.Singleton.ConnectedCount}  unconnected: {LocalNode.Singleton.UnconnectedCount}");
+                    WriteLineWithoutFlicker($"block: {wh}/{Blockchain.Singleton.Height}/{Blockchain.Singleton.HeaderHeight}  state:{Blockchain.Singleton.StateHeight}  connected: {LocalNode.Singleton.ConnectedCount}  unconnected: {LocalNode.Singleton.UnconnectedCount}");
                     int linesWritten = 1;
                     foreach (RemoteNode node in LocalNode.Singleton.GetRemoteNodes().Take(Console.WindowHeight - 2).ToArray())
                     {

diff --git a/neo-cli/neo-cli.csproj b/neo-cli/neo-cli.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Copyright>2016-2019 The Neo Project</Copyright>
+    <Copyright>2016-2020 The Neo Project</Copyright>
     <AssemblyTitle>Neo.CLI</AssemblyTitle>
-    <Version>2.10.3</Version>
+    <Version>2.11.0</Version>
     <Authors>The Neo Project</Authors>
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <AssemblyName>neo-cli</AssemblyName>
@@ -28,7 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neo" Version="2.10.3" />
+    <PackageReference Include="Neo" Version="2.11.0" />
     <PackageReference Include="System.ServiceProcess.ServiceController" Version="4.5.0" />
   </ItemGroup>
 

diff --git a/neo-cli/protocol.json b/neo-cli/protocol.json
@@ -4,6 +4,7 @@
     "AddressVersion": 23,
     "SecondsPerBlock": 15,
     "LowPriorityThreshold": 0.001,
+    "StateRootEnableIndex": 6016000,
     "StandbyValidators": [
       "03b209fd4f53a7170ea4444e0cb0a6bb6a53c2bd016926989cf85f9b0fba17a70c",
       "02df48f60e8f3e01c48ff40b9b7f1310d7a8b2a193188befe1c2e3df740e895093",

diff --git a/neo-cli/protocol.mainnet.json b/neo-cli/protocol.mainnet.json
@@ -4,6 +4,7 @@
     "AddressVersion": 23,
     "SecondsPerBlock": 15,
     "LowPriorityThreshold": 0.001,
+    "StateRootEnableIndex": 6016000,
     "StandbyValidators": [
       "03b209fd4f53a7170ea4444e0cb0a6bb6a53c2bd016926989cf85f9b0fba17a70c",
       "02df48f60e8f3e01c48ff40b9b7f1310d7a8b2a193188befe1c2e3df740e895093",

diff --git a/neo-cli/protocol.testnet.json b/neo-cli/protocol.testnet.json
@@ -4,6 +4,7 @@
     "AddressVersion": 23,
     "SecondsPerBlock": 15,
     "LowPriorityThreshold": 0.001,
+    "StateRootEnableIndex": 4380100,
     "StandbyValidators": [
       "0327da12b5c40200e9f65569476bbff2218da4f32548ff43b6387ec1416a231ee8",
       "026ce35b29147ad09e4afe4ec4a7319095f08198fa8babbe3c56e970b143528d22",