Skip to content
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

Jump to bottom

Decrease the block time threshold (3x) #1233

Merged
merged 18 commits into from
Nov 21, 2019
Merged

Decrease the block time threshold (3x) #1233

Changes from 4 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
e44b333
Decrease the time threshold
shargon Nov 12, 2019
c6b5c6c
Merge branch 'master' into decrease-max-time
erikzhang Nov 13, 2019
c731bb6
Merge branch 'master' into decrease-max-time
shargon Nov 13, 2019
beb7ab3
Merge branch 'master' into decrease-max-time
lock9 Nov 13, 2019
26d68b0
Change to a formula
shargon Nov 14, 2019
af95a69
Merge branch 'master' into decrease-max-time
shargon Nov 14, 2019
fa13cc4
UT
shargon Nov 14, 2019
fcff076
Merge remote-tracking branch 'shargon/decrease-max-time' into decreas…
shargon Nov 14, 2019
dca3da5
Change formula
shargon Nov 16, 2019
1d18d5d
UT
shargon Nov 16, 2019
aaeb28d
Clean
shargon Nov 16, 2019
405e3da
Remove static
shargon Nov 16, 2019
7baf00f
Fix isolated issues
shargon Nov 16, 2019
b8eccf3
Change to static
shargon Nov 17, 2019
09bfd6f
private
erikzhang Nov 18, 2019
1bb6cbf
Simplify
erikzhang Nov 18, 2019
0aca13d
Merge branch 'master' into decrease-max-time
erikzhang Nov 18, 2019
3155b04
Merge branch 'master' into decrease-max-time
shargon Nov 19, 2019
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
2 changes: 1 addition & 1 deletion neo/Consensus/ConsensusService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ private void OnPrepareRequestReceived(ConsensusPayload payload, PrepareRequest m
if (context.RequestSentOrReceived || context.NotAcceptingPayloadsDueToViewChanging) return;
if (payload.ValidatorIndex != context.Block.ConsensusData.PrimaryIndex || message.ViewNumber != context.ViewNumber) return;
Log($"{nameof(OnPrepareRequestReceived)}: height={payload.BlockIndex} view={message.ViewNumber} index={payload.ValidatorIndex} tx={message.TransactionHashes.Length}");
if (message.Timestamp <= context.PrevHeader.Timestamp || message.Timestamp > TimeProvider.Current.UtcNow.AddMinutes(10).ToTimestampMS())
if (message.Timestamp <= context.PrevHeader.Timestamp || message.Timestamp > TimeProvider.Current.UtcNow.AddMinutes(2).ToTimestampMS())
shargon marked this conversation as resolved.
Show resolved Hide resolved
{
Log($"Timestamp incorrect: {message.Timestamp}", LogLevel.Warning);
return;
Expand Down