GetBlocks by block index

src/neo/Ledger/Blockchain.cs

@@ -61,7 +61,6 @@ private class ParallelVerified { public Transaction Transaction; public bool Sho
         private readonly NeoSystem system;
         private readonly List<UInt256> header_index = new List<UInt256>();
         private uint stored_header_count = 0;
-        private readonly Dictionary<UInt256, Block> block_cache = new Dictionary<UInt256, Block>();
         private readonly Dictionary<uint, LinkedList<Block>> block_cache_unverified = new Dictionary<uint, LinkedList<Block>>();
         internal readonly RelayCache ConsensusRelayCache = new RelayCache(100);
         private SnapshotView currentSnapshot;
@@ -142,7 +141,6 @@ public Blockchain(NeoSystem system, IStore store)
 
         public bool ContainsBlock(UInt256 hash)
         {
-            if (block_cache.ContainsKey(hash)) return true;
             return View.ContainsBlock(hash);
         }
 
@@ -189,8 +187,6 @@ public Block GetBlock(uint index)
 
         public Block GetBlock(UInt256 hash)
         {
-            if (block_cache.TryGetValue(hash, out Block block))
-                return block;
             return View.GetBlock(hash);
         }
 
@@ -215,8 +211,6 @@ public Header GetHeader(uint index)
 
         public Header GetHeader(UInt256 hash)
         {
-            if (block_cache.TryGetValue(hash, out Block block))
-                return block.Header;
             return View.GetHeader(hash);
         }
 
@@ -259,7 +253,11 @@ private void AddUnverifiedBlockToCache(Block block)
                 blocks = new LinkedList<Block>();
                 block_cache_unverified.Add(block.Index, blocks);
             }
-
+            foreach (var unverifiedBlock in blocks)
+            {
+                if (block.Hash == unverifiedBlock.Hash)
+                    return;
+            }
             blocks.AddLast(block);
         }
 
@@ -292,78 +290,30 @@ private RelayResultReason OnNewBlock(Block block)
         {
             if (block.Index <= Height)
                 return RelayResultReason.AlreadyExists;
-            if (block_cache.ContainsKey(block.Hash))
-                return RelayResultReason.AlreadyExists;
-            if (block.Index - 1 >= header_index.Count)
+            if (block.Index - 1 > Height)
             {
                 AddUnverifiedBlockToCache(block);
                 return RelayResultReason.UnableToVerify;
             }
-            if (block.Index == header_index.Count)
-            {
-                if (!block.Verify(currentSnapshot))
-                    return RelayResultReason.Invalid;
-            }
-            else
-            {
-                if (!block.Hash.Equals(header_index[(int)block.Index]))
-                    return RelayResultReason.Invalid;
-            }
             if (block.Index == Height + 1)
             {
-                Block block_persist = block;
-                List<Block> blocksToPersistList = new List<Block>();
-                while (true)
-                {
-                    blocksToPersistList.Add(block_persist);
-                    if (block_persist.Index + 1 >= header_index.Count) break;
-                    UInt256 hash = header_index[(int)block_persist.Index + 1];
-                    if (!block_cache.TryGetValue(hash, out block_persist)) break;
-                }
-
-                int blocksPersisted = 0;
-                foreach (Block blockToPersist in blocksToPersistList)
+                if (!block.Verify(currentSnapshot))
                 {
-                    block_cache_unverified.Remove(blockToPersist.Index);
-                    Persist(blockToPersist);
-
-                    // 15000 is the default among of seconds per block, while MilliSecondsPerBlock is the current
-                    uint extraBlocks = (15000 - MillisecondsPerBlock) / 1000;
-
-                    if (blocksPersisted++ < blocksToPersistList.Count - (2 + Math.Max(0, extraBlocks))) continue;
-                    // Empirically calibrated for relaying the most recent 2 blocks persisted with 15s network
-                    // Increase in the rate of 1 block per second in configurations with faster blocks
-
-                    if (blockToPersist.Index + 100 >= header_index.Count)
-                        system.LocalNode.Tell(new LocalNode.RelayDirectly { Inventory = blockToPersist });
+                    system.SyncManager.Tell(new SyncManager.InvalidBlockIndex { InvalidIndex = block.Index });
+                    return RelayResultReason.Invalid;
                 }
+                block_cache_unverified.Remove(block.Index);
+                Persist(block);
+                system.LocalNode.Tell(new LocalNode.RelayDirectly { Inventory = block });
+                system.SyncManager.Tell(new SyncManager.PersistedBlockIndex { PersistedIndex = block.Index });
                 SaveHeaderHashList();
-
                 if (block_cache_unverified.TryGetValue(Height + 1, out LinkedList<Block> unverifiedBlocks))
                 {
                     foreach (var unverifiedBlock in unverifiedBlocks)
                         Self.Tell(unverifiedBlock, ActorRefs.NoSender);
                     block_cache_unverified.Remove(Height + 1);
                 }
             }
-            else
-            {
-                block_cache.Add(block.Hash, block);
-                if (block.Index + 100 >= header_index.Count)
-                    system.LocalNode.Tell(new LocalNode.RelayDirectly { Inventory = block });
-                if (block.Index == header_index.Count)
-                {
-                    header_index.Add(block.Hash);
-                    using (SnapshotView snapshot = GetSnapshot())
-                    {
-                        snapshot.Blocks.Add(block.Hash, block.Header.Trim());
-                        snapshot.HeaderHashIndex.GetAndChange().Set(block);
-                        SaveHeaderHashList(snapshot);
-                        snapshot.Commit();
-                    }
-                    UpdateCurrentSnapshot();
-                }
-            }
             return RelayResultReason.Succeed;
         }
 
@@ -441,7 +391,6 @@ private void OnParallelVerified(ParallelVerified parallelVerified)
 
         private void OnPersistCompleted(Block block)
         {
-            block_cache.Remove(block.Hash);
             MemPool.UpdatePoolForBlockPersisted(block, currentSnapshot);
             Context.System.EventStream.Publish(new PersistCompleted { Block = block });
         }

src/neo/NeoSystem.cs

@@ -21,6 +21,7 @@ public class NeoSystem : IDisposable
         public IActorRef Blockchain { get; }
         public IActorRef LocalNode { get; }
         internal IActorRef TaskManager { get; }
+        internal IActorRef SyncManager { get; }
         public IActorRef Consensus { get; private set; }
 
         private readonly IStore store;
@@ -36,6 +37,7 @@ public NeoSystem(string storageEngine = null)
             this.Blockchain = ActorSystem.ActorOf(Ledger.Blockchain.Props(this, store));
             this.LocalNode = ActorSystem.ActorOf(Network.P2P.LocalNode.Props(this));
             this.TaskManager = ActorSystem.ActorOf(Network.P2P.TaskManager.Props(this));
+            this.SyncManager = ActorSystem.ActorOf(Network.P2P.SyncManager.Props(this));
             foreach (var plugin in Plugin.Plugins)
                 plugin.OnPluginsLoaded();
         }

src/neo/Network/P2P/MessageCommand.cs

@@ -40,6 +40,8 @@ public enum MessageCommand : byte
         Block = 0x2c,
         [ReflectionCache(typeof(ConsensusPayload))]
         Consensus = 0x2d,
+        [ReflectionCache(typeof(Block))]
+        BlockData = 0x2e,
         Reject = 0x2f,
 
         //SPV protocol

src/neo/Network/P2P/ProtocolHandler.cs

@@ -91,6 +91,9 @@ private void OnMessage(Message msg)
                 case MessageCommand.Block:
                     OnInventoryReceived((Block)msg.Payload);
                     break;
+                case MessageCommand.BlockData:
+                    OnBlockDataReceived((Block)msg.Payload);
+                    break;
                 case MessageCommand.Consensus:
                     OnInventoryReceived((ConsensusPayload)msg.Payload);
                     break;
@@ -148,6 +151,12 @@ private void OnMessage(Message msg)
             }
         }
 
+        private void OnBlockDataReceived(Block payload)
+        {
+            if (payload != null)
+                system.SyncManager.Tell(payload, Context.Parent);
+        }
+
         private void OnAddrMessageReceived(AddrPayload payload)
         {
             system.LocalNode.Tell(new Peer.Peers
@@ -229,7 +238,7 @@ private void OnGetBlockDataMessageReceived(GetBlockDataPayload payload)
 
                 if (bloom_filter == null)
                 {
-                    Context.Parent.Tell(Message.Create(MessageCommand.Block, block));
+                    Context.Parent.Tell(Message.Create(MessageCommand.BlockData, block));
                 }
                 else
                 {

src/neo/Network/P2P/RemoteNode.cs

@@ -162,6 +162,7 @@ private void OnPingPayload(PingPayload payload)
             {
                 LastBlockIndex = payload.LastBlockIndex;
                 system.TaskManager.Tell(new TaskManager.Update { LastBlockIndex = LastBlockIndex });
+                system.SyncManager.Tell(new SyncManager.Update { LastBlockIndex = LastBlockIndex });
             }
         }
 
@@ -196,6 +197,7 @@ private void OnVerack()
         {
             verack = true;
             system.TaskManager.Tell(new TaskManager.Register { Version = Version });
+            system.SyncManager.Tell(new SyncManager.Register { Version = Version });
             CheckMessageQueue();
         }