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

Implementing support for emptyBlockPeriodSeconds in QBFT (Issue #3810) #6965

Merged
merged 44 commits into from
Sep 24, 2024
Merged

Implementing support for emptyBlockPeriodSeconds in QBFT (Issue #3810) #6965

Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
940243a
Implementing support for emptyBlockPeriodSeconds in QBFT (Issue #3810)
amsmota Apr 18, 2024
3af8a6a
Fixing integration tests
amsmota Apr 23, 2024
12090c1
Reinstated TimestampMoreRecentThanParent header rule
amsmota Apr 24, 2024
2ed8d67
Refactored some QbftRound methods
amsmota Apr 24, 2024
b38e417
Refactored some QbftRound methods
amsmota Apr 24, 2024
2a7a61a
Removed log comments for all block period seconds
amsmota Apr 24, 2024
59a5bd1
Removed log comments for all block period seconds
amsmota Apr 24, 2024
fc51597
Run spotlessApply
amsmota Apr 29, 2024
5ada709
Corrected the way the BlockTimer handles emptyBlockPeriodSeconds and …
amsmota May 13, 2024
b85476f
Corrected the way the BlockTimer handles emptyBlockPeriodSeconds and …
amsmota May 13, 2024
7f6bc50
Corrected the way the BlockTimer handles emptyBlockPeriodSeconds and …
amsmota May 13, 2024
de4e534
Corrected the way the BlockTimer handles emptyBlockPeriodSeconds and …
amsmota May 14, 2024
5529a23
Corrected the way the BlockTimer handles emptyBlockPeriodSeconds and …
amsmota May 14, 2024
a45b725
Corrected the way the BlockTimer handles the next block expire block
amsmota Jun 21, 2024
26bfeed
Corrected the way the BlockTimer handles the next block expire block
amsmota Jun 21, 2024
3a6d41d
Merge branch 'hyperledger:main' into issue-3810-no-empty-block
amsmota Jun 21, 2024
58729b7
Merge remote-tracking branch 'origin/main' into issue-3810-no-empty-b…
amsmota Jul 12, 2024
41d7c4b
Changes after review, reviweing failing tests
amsmota Jul 13, 2024
5cacd7c
Fixed formatting
amsmota Jul 14, 2024
20f5e43
Fixed failing tests in QbftBlockHeightManagerTest
amsmota Jul 15, 2024
78ed724
Fixed failing tests in BlockerTimerTest
amsmota Jul 16, 2024
34778ed
Merge branch 'hyperledger:main' into issue-3810-no-empty-block
amsmota Aug 4, 2024
8c6905e
Merge branch 'hyperledger:main' into issue-3810-no-empty-block
amsmota Sep 8, 2024
cf11ac6
Merge branch 'main' into issue-3810-no-empty-block
amsmota Sep 11, 2024
f238d37
Fixed conflicts
amsmota Sep 11, 2024
16cb3f6
Merge branch 'hyperledger:main' into issue-3810-no-empty-block
amsmota Sep 15, 2024
41b3a73
Merge branch 'hyperledger:main' into issue-3810-no-empty-block
amsmota Sep 16, 2024
ba122ef
Merge branch 'hyperledger:main' into issue-3810-no-empty-block
amsmota Sep 18, 2024
8536b4d
Merge branch 'hyperledger:main' into issue-3810-no-empty-block
amsmota Sep 18, 2024
a093d81
Merge branch 'main' into issue-3810-no-empty-block
amsmota Sep 20, 2024
0c6fc85
Fixed conflicts from merge, implemented suggested changes, reverted g…
amsmota Sep 20, 2024
62e4e24
Fixed conflicts from merge, implemented suggested changes, reverted g…
amsmota Sep 20, 2024
0b34185
Fixed conflicts from merge, implemented suggested changes, reverted g…
amsmota Sep 20, 2024
ceaf0a2
Added entry in CHANGELOG
amsmota Sep 20, 2024
65a4b2e
Merge branch 'hyperledger:main' into issue-3810-no-empty-block
amsmota Sep 20, 2024
12abcb5
Merge branch 'hyperledger:main' into issue-3810-no-empty-block
amsmota Sep 21, 2024
e7747ff
Merge branch 'hyperledger:main' into issue-3810-no-empty-block
amsmota Sep 22, 2024
66ad32e
Merge branch 'hyperledger:main' into issue-3810-no-empty-block
amsmota Sep 23, 2024
9b9f499
Merge branch 'hyperledger:main' into issue-3810-no-empty-block
amsmota Sep 23, 2024
73c7451
Fixed QbftBlockHeightManagerTest
amsmota Sep 24, 2024
711e46b
Merge branch 'hyperledger:main' into issue-3810-no-empty-block
amsmota Sep 24, 2024
dd39cc2
Fixed QbftBlockHeightManagerTest
amsmota Sep 24, 2024
fa8a271
Fixed QbftBlockHeightManagerTest
amsmota Sep 24, 2024
39b23a4
Merge branch 'hyperledger:main' into issue-3810-no-empty-block
amsmota Sep 24, 2024
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
Prev Previous commit
Next Next commit
Corrected the way the BlockTimer handles emptyBlockPeriodSeconds and … 
…other stuff

Signed-off-by: Antonio Mota <antonio.mota@citi.com>
  • Loading branch information
@amsmota
amsmota committed May 13, 2024
commit b85476f234bde53e550162debdafb52f47c9e6fc
7 changes: 5 additions & 2 deletions besu/src/main/java/org/hyperledger/besu/controller/QbftBesuControllerBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,11 +417,14 @@ private static MinedBlockObserver blockLogger(
return block ->
LOG.info(
String.format(
"%s %s #%,d / %d tx / %d pending /",
"%s %s #%,d / %d tx / %d pending / %,d (%01.1f%%) gas / (%s)",
block.getHeader().getCoinbase().equals(localAddress) ? "Produced" : "Imported",
block.getBody().getTransactions().size() == 0 ? "empty block" : "block",
block.getHeader().getNumber(),
block.getBody().getTransactions().size(),
transactionPool.count()));
transactionPool.count(),
block.getHeader().getGasUsed(),
(block.getHeader().getGasUsed() * 100.0) / block.getHeader().getGasLimit(),
block.getHash().toHexString()));
}
}