sync block height

neo-cli/CLI/MainService.Blockchain.cs

@@ -1,5 +1,6 @@
 using Neo.ConsoleService;
 using Neo.Ledger;
+using Neo.SmartContract.Native;
 using System;
 
 namespace Neo.CLI
@@ -15,13 +16,14 @@ partial class MainService
         [ConsoleCommand("export blocks", Category = "Blockchain Commands")]
         private void OnExportBlocksStartCountCommand(uint start, uint count = uint.MaxValue, string path = null)
         {
-            if (Blockchain.Singleton.Height < start)
+            uint height = NativeContract.Ledger.CurrentIndex(Blockchain.Singleton.View);
+            if (height < start)
             {
                 Console.WriteLine("Error: invalid start height.");
                 return;
             }
 
-            count = Math.Min(count, Blockchain.Singleton.Height - start + 1);
+            count = Math.Min(count, height - start + 1);
 
             if (string.IsNullOrEmpty(path))
             {

neo-cli/CLI/MainService.Node.cs

@@ -3,6 +3,7 @@
 using Neo.Ledger;
 using Neo.Network.P2P;
 using Neo.Network.P2P.Payloads;
+using Neo.SmartContract.Native;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -53,11 +54,13 @@ private void OnShowStateCommand()
 
             Console.CursorVisible = false;
             Console.Clear();
+
+            uint height = NativeContract.Ledger.CurrentIndex(Blockchain.Singleton.View);
             Task broadcast = Task.Run(async () =>
             {
                 while (!cancel.Token.IsCancellationRequested)
                 {
-                    NeoSystem.LocalNode.Tell(Message.Create(MessageCommand.Ping, PingPayload.Create(Blockchain.Singleton.Height)));
+                    NeoSystem.LocalNode.Tell(Message.Create(MessageCommand.Ping, PingPayload.Create(height)));
                     await Task.Delay(Blockchain.TimePerBlock, cancel.Token);
                 }
             });
@@ -68,7 +71,7 @@ private void OnShowStateCommand()
                 while (!cancel.Token.IsCancellationRequested)
                 {
                     Console.SetCursorPosition(0, 0);
-                    WriteLineWithoutFlicker($"block: {Blockchain.Singleton.Height}  connected: {LocalNode.Singleton.ConnectedCount}  unconnected: {LocalNode.Singleton.UnconnectedCount}", Console.WindowWidth - 1);
+                    WriteLineWithoutFlicker($"block: {height}  connected: {LocalNode.Singleton.ConnectedCount}  unconnected: {LocalNode.Singleton.UnconnectedCount}", Console.WindowWidth - 1);
 
                     int linesWritten = 1;
                     foreach (RemoteNode node in LocalNode.Singleton.GetRemoteNodes().OrderByDescending(u => u.LastBlockIndex).Take(Console.WindowHeight - 2).ToArray())

neo-cli/CLI/MainService.cs

@@ -176,15 +176,16 @@ private static IEnumerable<Block> GetBlocks(Stream stream, bool read_start = fal
             uint start = read_start ? r.ReadUInt32() : 0;
             uint count = r.ReadUInt32();
             uint end = start + count - 1;
-            if (end <= Blockchain.Singleton.Height) yield break;
+            uint currentHeight = NativeContract.Ledger.CurrentIndex(Blockchain.Singleton.View);
+            if (end <= currentHeight) yield break;
             for (uint height = start; height <= end; height++)
             {
                 var size = r.ReadInt32();
                 if (size > Message.PayloadMaxSize)
                     throw new ArgumentException($"Block {height} exceeds the maximum allowed size");
 
                 byte[] array = r.ReadBytes(size);
-                if (height > Blockchain.Singleton.Height)
+                if (height > currentHeight)
                 {
                     Block block = array.AsSerializable<Block>();
                     yield return block;
@@ -215,9 +216,10 @@ private IEnumerable<Block> GetBlocksFromFile()
                 IsCompressed = p.EndsWith(".zip")
             }).OrderBy(p => p.Start);
 
+            uint height = NativeContract.Ledger.CurrentIndex(Blockchain.Singleton.View);
             foreach (var path in paths)
             {
-                if (path.Start > Blockchain.Singleton.Height + 1) break;
+                if (path.Start > height + 1) break;
                 if (path.IsCompressed)
                     using (FileStream fs = new FileStream(path.FileName, FileMode.Open, FileAccess.Read, FileShare.Read))
                     using (ZipArchive zip = new ZipArchive(fs, ZipArchiveMode.Read))
@@ -526,8 +528,7 @@ private bool OnInvokeWithResult(UInt160 scriptHash, string operation, out StackI
                 }
             }
 
-            var snapshot = Blockchain.Singleton.GetSnapshot();
-            ContractState contract = NativeContract.ContractManagement.GetContract(snapshot, scriptHash);
+            ContractState contract = NativeContract.ContractManagement.GetContract(Blockchain.Singleton.View, scriptHash);
             if (contract == null)
             {
                 Console.WriteLine("Contract does not exist.");

neo-cli/neo-cli.csproj

@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  
+
   <PropertyGroup>
     <Copyright>2016-2020 The Neo Project</Copyright>
     <AssemblyTitle>Neo.CLI</AssemblyTitle>
@@ -28,7 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neo" Version="3.0.0-CI01171" />
+    <PackageReference Include="Neo" Version="3.0.0-CI01181" />
   </ItemGroup>
 
   <ItemGroup>