Skip to content

asking for blocks to any peer that has height greater than me #294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 2, 2022
Merged

asking for blocks to any peer that has height greater than me #294

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 20 additions & 19 deletions src/Lachain.Core/Network/BlockSynchronizer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ private static readonly ILogger<BlockSynchronizer>

private readonly object _peerHasTransactions = new object();
private readonly object _peerHasBlocks = new object();
private readonly object _peerHeightUpdate = new object();
private readonly object _blocksLock = new object();
private readonly object _txLock = new object();
private LogLevel _logLevelForSync = LogLevel.Trace;
Expand Down Expand Up @@ -148,6 +149,9 @@ public bool HandleBlockFromPeer(BlockInfo blockWithTransactions, ECDSAPublicKey
Logger.LogTrace($"Skipped block {block.Header.Index} from peer {publicKey.ToHex()}: invalid multisig with error: {error}");
return false;
}
// let it know that we received a valid response
lock (_peerHasBlocks)
Monitor.PulseAll(_peerHasBlocks);
// This is to tell consensus manager to terminate current era, since we trust given multisig
OnSignedBlockReceived?.Invoke(this, block.Header.Index);

Expand All @@ -173,21 +177,19 @@ public bool HandleBlockFromPeer(BlockInfo blockWithTransactions, ECDSAPublicKey
return false;
}

lock (_peerHasBlocks)
Monitor.PulseAll(_peerHasBlocks);
return true;
}
}

public void HandlePeerHasBlocks(ulong blockHeight, ECDSAPublicKey publicKey)
{
Logger.Log(_logLevelForSync, $"Peer {publicKey.ToHex()} has height {blockHeight}");
lock (_peerHasBlocks)
lock (_peerHeightUpdate)
{
if (_peerHeights.TryGetValue(publicKey, out var peerHeight) && blockHeight <= peerHeight)
return;
_peerHeights[publicKey] = blockHeight;
Monitor.PulseAll(_peerHasBlocks);
Monitor.PulseAll(_peerHeightUpdate);
}
}

Expand All @@ -199,8 +201,8 @@ public bool IsSynchronizingWith(IEnumerable<ECDSAPublicKey> peers)
var setOfPeers = peers.ToHashSet();
if (setOfPeers.Count == 0) return false;

lock (_peerHasBlocks)
Monitor.Wait(_peerHasBlocks, TimeSpan.FromSeconds(1));
lock (_peerHeightUpdate)
Monitor.Wait(_peerHeightUpdate, TimeSpan.FromSeconds(1));
var validatorPeers = _peerHeights
.Where(entry => setOfPeers.Contains(entry.Key))
.ToArray();
Expand Down Expand Up @@ -296,32 +298,31 @@ private void BlockSyncWorker()
const int maxBlocksToRequest = 10;

var peers = _peerHeights
.Where(entry => entry.Value >= maxHeight)
.Select(entry => entry.Key)
.Where(entry => entry.Value > myHeight)
.OrderBy(_ => rnd.Next())
.Take(maxPeersToAsk)
.ToArray();

var leftBound = myHeight + 1;
var rightBound = Math.Min(maxHeight, myHeight + maxBlocksToRequest);
Logger.LogTrace($"Sending query for blocks [{leftBound}; {rightBound}] to {peers.Length} peers");
foreach (var peer in peers)
{
var rightBound = Math.Min(peer.Value, myHeight + maxBlocksToRequest);
Logger.LogTrace($"Sending query for blocks [{leftBound}; {rightBound}] to peer {peer.Key.ToHex()}");
_networkManager.SendTo(
peer, _networkManager.MessageFactory.SyncBlocksRequest(leftBound, rightBound),
peer.Key, _networkManager.MessageFactory.SyncBlocksRequest(leftBound, rightBound),
NetworkMessagePriority.PeerSyncMessage
);
}

var waitStart = TimeUtils.CurrentTimeMillis();
while (true)
var waitForBlockExecution = 4000;
bool gotResponse = true;
lock (_peerHasBlocks)
{
lock (_peerHasBlocks)
{
Monitor.Wait(_peerHasBlocks, TimeSpan.FromMilliseconds(1_000));
}

if (TimeUtils.CurrentTimeMillis() - waitStart > 5_000) break;
gotResponse = Monitor.Wait(_peerHasBlocks, TimeSpan.FromMilliseconds(1_000));
}
if (gotResponse)
{
Thread.Sleep(waitForBlockExecution);
}
}
catch (Exception e)
Expand Down