feat: Implement v0.68 block merkle tree structure #21930

mhess-swl · 2025-10-30T06:34:18Z

TODO

Signed-off-by: Matt Hess <[email protected]>

lfdt-bot · 2025-10-30T06:34:37Z

✅ Snyk checks have passed. No issues have been found so far.

Status	Scanner	Critical	High	Medium	Low	Total (0)
✅	Open Source Security	0	0	0	0	0 issues

💻 Catch issues earlier using the plugins for VS Code, JetBrains IDEs, Visual Studio, and Eclipse.

codecov · 2025-10-30T08:59:42Z

Codecov Report

❌ Patch coverage is 90.59406% with 19 lines in your changes missing coverage. Please review.

Files with missing lines	Patch %	Lines
...a/node/app/blocks/impl/BlockStreamManagerImpl.java	91.25%	10 Missing and 4 partials ⚠️
...de/app/blocks/impl/IncrementalStreamingHasher.java	91.66%	2 Missing and 1 partial ⚠️
...-app/src/main/java/com/hedera/node/app/Hedera.java	75.00%	0 Missing and 1 partial ⚠️
...app/blocks/impl/streaming/FileBlockItemWriter.java	0.00%	1 Missing ⚠️

@@             Coverage Diff              @@
##               main   #21930      +/-   ##
============================================
+ Coverage     70.79%   70.86%   +0.06%     
- Complexity    24381    24411      +30     
============================================
  Files          2667     2668       +1     
  Lines        104204   104323     +119     
  Branches      10942    10952      +10     
============================================
+ Hits          73774    73926     +152     
+ Misses        26383    26344      -39     
- Partials       4047     4053       +6

Files with missing lines	Coverage Δ	Complexity Δ
...va/com/hedera/node/app/hapi/utils/CommonUtils.java	`72.91% <100.00%> (+0.57%)`	`24.00 <3.00> (+3.00)`
...com/hedera/node/app/blocks/BlockStreamManager.java	`100.00% <ø> (ø)`	`1.00 <0.00> (ø)`
...-app/src/main/java/com/hedera/node/app/Hedera.java	`56.17% <75.00%> (+4.13%)`	`52.00 <0.00> (ø)`
...app/blocks/impl/streaming/FileBlockItemWriter.java	`41.66% <0.00%> (+0.68%)`	`21.00 <0.00> (ø)`
...de/app/blocks/impl/IncrementalStreamingHasher.java	`91.66% <91.66%> (ø)`	`11.00 <11.00> (?)`
...a/node/app/blocks/impl/BlockStreamManagerImpl.java	`77.11% <91.25%> (+3.48%)`	`67.00 <12.00> (+10.00)`

... and 21 files with indirect coverage changes

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

codacy-production · 2025-10-30T08:59:45Z

Coverage summary from Codacy

See diff coverage on Codacy

Coverage variation	Diff coverage
✅ +0.07% (target: -1.00%)	✅ 93.56%

Coverage variation details

	Coverable lines	Covered lines	Coverage
Common ancestor commit (`5362176`)	104109	77776	74.71%
Head commit (`9b322a0`)	104228 (+119)	77934 (+158)	74.77% (+0.07%)

Coverage variation is the difference between the coverage for the head and common ancestor commits of the pull request branch: <coverage of head commit> - <coverage of common ancestor commit>

Diff coverage details

	Coverable lines	Covered lines	Diff coverage
Pull request (#21930)	202	189	93.56%

Diff coverage is the percentage of lines that are covered by tests out of the coverable lines that the pull request added or modified: <covered lines added or modified>/<coverable lines added or modified> * 100%

See your quality gate settings Change summary preferences

Signed-off-by: Matt Hess <[email protected]>

github-actions · 2025-10-30T16:11:43Z

Node: HAPI Test (Misc) Results

101 files - 60 1 errors 100 suites - 61 4m 9s ⏱️ - 12m 57s
102 tests - 47 1 ✅ - 148 0 💤 ±0 101 ❌ +101
134 runs - 370 1 ✅ - 503 0 💤 ±0 133 ❌ +133

For more details on these parsing errors and failures, see this check.

Results for commit 8e04874. ± Comparison against base commit 5362176.

This pull request removes 76 and adds 29 tests. Note that renamed tests count towards both.

com.hedera.services.bdd.suites.consensus.AtomicBatchConsensusServiceEndToEndTest$AtomicBatchConsensusServiceWithCustomFeesUpdates ‑ as written
com.hedera.services.bdd.suites.contract.ethereum.JumboTransactionsEnabledTest$JumboEthereumTransactionsNegativeTests ‑ as written
com.hedera.services.bdd.suites.contract.ethereum.JumboTransactionsEnabledTest$JumboEthereumTransactionsPositiveTests ‑ as written
com.hedera.services.bdd.suites.contract.fees.SmartContractServiceFeesTest ‑ as written
com.hedera.services.bdd.suites.contract.hips.batch.AtomicCreateWithAliasDisabledTest ‑ as written
com.hedera.services.bdd.suites.contract.hips.hip583.CreateWithAliasDisabledTest ‑ as written
com.hedera.services.bdd.suites.contract.leaky.batch.AtomicLeakyContractTestsSuite ‑ as written
com.hedera.services.bdd.suites.contract.opcodes.AtomicOpCodesSuite ‑ as written
com.hedera.services.bdd.suites.contract.precompile.UpdateTokenFeeScheduleTest ‑ as written
com.hedera.services.bdd.suites.contract.precompile.airdrops.AirdropFromContractTest ‑ as written
…

com.hedera.services.bdd.suites.contract.hips.batch.AtomicCreateWithAliasDisabledTest ‑ initializationError
com.hedera.services.bdd.suites.contract.hips.hip583.CreateWithAliasDisabledTest ‑ initializationError
com.hedera.services.bdd.suites.contract.leaky.batch.AtomicLeakyContractTestsSuite ‑ initializationError
com.hedera.services.bdd.suites.contract.opcodes.AtomicOpCodesSuite ‑ initializationError
com.hedera.services.bdd.suites.contract.precompile.schedule.ScheduleCreateTokenTest ‑ initializationError
com.hedera.services.bdd.suites.fees.AtomicCryptoServiceFeesSuite ‑ initializationError
com.hedera.services.bdd.suites.fees.CryptoServiceFeesSuite ‑ initializationError
com.hedera.services.bdd.suites.hip1195.Hip1195DisabledTest ‑ initializationError
com.hedera.services.bdd.suites.hip423.DisabledLongTermExecutionScheduleTest ‑ initializationError
com.hedera.services.bdd.suites.hip551.AtomicBatchInvalidSignaturesTests ‑ initializationError
…

♻️ This comment has been updated with latest results.

Signed-off-by: Matt Hess <[email protected]>

github-actions · 2025-10-30T17:24:10Z

Node: HAPI Test (Smart Contract) Results

117 files - 8 110 errors 7 suites - 118 11s ⏱️ - 19m 51s
8 tests - 132 3 ✅ - 135 2 💤 ±0 3 ❌ +3
8 runs - 239 3 ✅ - 242 2 💤 ±0 3 ❌ +3

For more details on these parsing errors and failures, see this check.

Results for commit 8e04874. ± Comparison against base commit 5362176.

This pull request removes 135 and adds 3 tests. Note that renamed tests count towards both.

com.hedera.services.bdd.suites.contract.ethereum.HelloWorldEthereumSuite ‑ as written
com.hedera.services.bdd.suites.contract.ethereum.JumboTransactionsEnabledTest ‑ as written
com.hedera.services.bdd.suites.contract.ethereum.JumboTransactionsEnabledTest$JumboEthereumTransactionsPositiveTests ‑ as written
com.hedera.services.bdd.suites.contract.ethereum.NonceSuite ‑ as written
com.hedera.services.bdd.suites.contract.ethereum.batch.AtomicEthereumSuite ‑ as written
com.hedera.services.bdd.suites.contract.ethereum.batch.AtomicEthereumSuite ‑ feePaymentMatrix Failure/0/0
com.hedera.services.bdd.suites.contract.ethereum.batch.AtomicHelloWorldEthereumSuite ‑ as written
com.hedera.services.bdd.suites.contract.evm.Evm38ValidationSuite ‑ as written
com.hedera.services.bdd.suites.contract.evm.Evm46ValidationSuite ‑ as written
com.hedera.services.bdd.suites.contract.evm.Evm50ValidationSuite ‑ as written
…

com.hedera.services.bdd.suites.contract.precompile.TokenExpiryInfoSuite$WhenAuthorized ‑ initializationError
com.hedera.services.bdd.suites.contract.precompile.airdrops.HRCTokenCancelTest ‑ initializationError
com.hedera.services.bdd.suites.contract.validation.EvmValidationTest$TouchAccountContract ‑ initializationError

Signed-off-by: Matt Hess <[email protected]>

github-actions · 2025-10-31T07:46:34Z

Node: HAPI Test (Crypto) Results

30 files - 5 28 errors 2 suites - 33 3m 59s ⏱️ - 2m 35s
2 tests - 32 0 ✅ - 34 0 💤 ±0 2 ❌ +2
2 runs - 99 0 ✅ - 101 0 💤 ±0 2 ❌ +2

For more details on these parsing errors and failures, see this check.

Results for commit 9b322a0. ± Comparison against base commit 5362176.

This pull request removes 34 and adds 2 tests. Note that renamed tests count towards both.

com.hedera.services.bdd.suites.crypto.AutoAccountCreationSuite ‑ as written
com.hedera.services.bdd.suites.crypto.AutoAccountCreationUnlimitedAssociationsSuite ‑ as written
com.hedera.services.bdd.suites.crypto.AutoAccountUpdateSuite ‑ as written
com.hedera.services.bdd.suites.crypto.CryptoApproveAllowanceSuite ‑ as written
com.hedera.services.bdd.suites.crypto.CryptoCreateSuite ‑ as written
com.hedera.services.bdd.suites.crypto.CryptoDeleteAllowanceSuite ‑ as written
com.hedera.services.bdd.suites.crypto.CryptoDeleteSuite ‑ as written
com.hedera.services.bdd.suites.crypto.CryptoGetInfoRegression ‑ as written
com.hedera.services.bdd.suites.crypto.CryptoGetRecordsRegression ‑ as written
com.hedera.services.bdd.suites.crypto.CryptoRecordsSanityCheckSuite ‑ as written
…

Gradle Test Run :test-clients:testSubprocess ‑ failed to execute tests
com.hedera.services.bdd.suites.hip904.TokenAirdropTest ‑ initializationError

Neeharika-Sompalli · 2025-10-31T15:13:23Z

hapi/hedera-protobuf-java-api/src/main/proto/block/stream/block_item.proto

 */
 message BlockItem {
    // Reserved for future items that require separate handling for block hash purposes.
-    reserved 12,13,14,15,16,17,18,19;


Doesnt seem like correct way to re-use 12

This is what Joseph suggested

These reserved values (12-19) are properly "held for future use" rather than "previously used and not available".
When the block stream is completely final (hopefully by release 0.70), we'll stop replacing/reusing fields and begin treating it the same as the rest of the API.

jsync-swirlds · 2025-10-31T17:38:35Z

hapi/hedera-protobuf-java-api/src/main/proto/block/stream/block_item.proto

-         * Presence of `filtered_item` entries SHALL NOT prevent verification
-         * of a block, but MAY preclude verification or reconstruction of
-         * consensus state.<br/>
+         * A transaction intentionally filtered from the stream.


Suggested change

* A transaction intentionally filtered from the stream.

* A transaction (or other block item) intentionally filtered from the stream.

Changed to A block item intentionally filtered from the stream in the other PR (#21401)

mhess-swl · 2025-11-03T22:45:54Z

This PR was supposed to supersede #21401, but it was easier to fix the issues by walking forward from that PR. Disregard this, closing in favor of #21401.

mhess-swl added 5 commits October 28, 2025 10:37

Protobuf doc updates

9739892

Signed-off-by: Matt Hess <[email protected]>

feat: Implement v0.68 block merkle tree structure

f87e592

Signed-off-by: Matt Hess <[email protected]>

Merge remote-tracking branch 'origin/main' into 21181-merkle-subtrees

b031cac

Spotless

6bc70bb

Signed-off-by: Matt Hess <[email protected]>

Merge remote-tracking branch 'origin/main' into 21181-merkle-subtrees

4b243ba

mhess-swl added this to the v0.68 milestone Oct 30, 2025

mhess-swl self-assigned this Oct 30, 2025

Test fixes

3d918b6

Signed-off-by: Matt Hess <[email protected]>

Track block closure time instead of last round consensus time

8e04874

Signed-off-by: Matt Hess <[email protected]>

wip

b70774e

Signed-off-by: Matt Hess <[email protected]>

mhess-swl mentioned this pull request Oct 31, 2025

feat: Use streaming merkle trees for block proof hashes #21401

Merged

mhess-swl added 5 commits October 31, 2025 00:17

Fix ISS test

3eb9d39

Signed-off-by: Matt Hess <[email protected]>

Fix test

4fc636d

Signed-off-by: Matt Hess <[email protected]>

Fix block item proto

cc33b1e

Signed-off-by: Matt Hess <[email protected]>

Fix compile

0e38579

Signed-off-by: Matt Hess <[email protected]>

Doc update

9b322a0

Signed-off-by: Matt Hess <[email protected]>

Neeharika-Sompalli reviewed Oct 31, 2025

View reviewed changes

jsync-swirlds reviewed Oct 31, 2025

View reviewed changes

jsync-swirlds mentioned this pull request Oct 31, 2025

chore: Add block stream event hash validators #21648

Merged

mhess-swl closed this Nov 3, 2025

mhess-swl deleted the 21181-merkle-subtrees branch November 3, 2025 22:46

	* A transaction intentionally filtered from the stream.
	* A transaction (or other block item) intentionally filtered from the stream.

feat: Implement v0.68 block merkle tree structure #21930

feat: Implement v0.68 block merkle tree structure #21930

Uh oh!

Conversation

mhess-swl commented Oct 30, 2025

Uh oh!

lfdt-bot commented Oct 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Snyk checks have passed. No issues have been found so far.

Uh oh!

codecov bot commented Oct 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

codacy-production bot commented Oct 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Coverage summary from Codacy

See diff coverage on Codacy

See your quality gate settings Change summary preferences

Uh oh!

github-actions bot commented Oct 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Node: HAPI Test (Misc) Results

Uh oh!

github-actions bot commented Oct 30, 2025

Node: HAPI Test (Smart Contract) Results

Uh oh!

github-actions bot commented Oct 31, 2025

Node: HAPI Test (Crypto) Results

Uh oh!

Neeharika-Sompalli Oct 31, 2025

Choose a reason for hiding this comment

Uh oh!

mhess-swl Oct 31, 2025

Choose a reason for hiding this comment

Uh oh!

jsync-swirlds Oct 31, 2025

Choose a reason for hiding this comment

Uh oh!

jsync-swirlds Oct 31, 2025

Choose a reason for hiding this comment

Uh oh!

mhess-swl Nov 3, 2025

Choose a reason for hiding this comment

Uh oh!

mhess-swl commented Nov 3, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

lfdt-bot commented Oct 30, 2025 •

edited

Loading

codecov bot commented Oct 30, 2025 •

edited

Loading

codacy-production bot commented Oct 30, 2025 •

edited

Loading

github-actions bot commented Oct 30, 2025 •

edited

Loading