Skip to content

feat: add merkle tree test suite #527

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
Open
wolfv wants to merge 24 commits into
base: main
Choose a base branch
from
Open

feat: add merkle tree test suite #527

wolfv wants to merge 24 commits into from

Conversation

@wolfv
Copy link
Contributor

@wolfv wolfv commented Nov 17, 2025

Summary

Release Note

Documentation

vembacher and others added 20 commits March 20, 2024 10:30
@vembacher
Added implementations for Merkle proofs.
0d3fc02 
Relates to: sigstore#283

Signed-off-by: Victor Embacher <victor@embacher.xyz>
@vembacher
Added merkle proof examples, fixed some bugs, reduced repetition and …
7dd4224 
…added some functionality.

Relates to: sigstore#283

Signed-off-by: Victor Embacher <victor@embacher.xyz>
@vembacher
consolidated methods
73dd6e8 
Signed-off-by: Victor Embacher <victor@embacher.xyz>
@vembacher
Added doctests to LogInfo and LogEntry merkle proof verification func…
d936abd 
…tions.

Signed-off-by: Victor Embacher <victor@embacher.xyz>
@vembacher
Rebased to main.
6d51377 
Signed-off-by: Victor Embacher <victor@embacher.xyz>
@vembacher
Refactored to use a single library for JSON canonicalization.
e45c952 
Signed-off-by: Victor Embacher <victor@embacher.xyz>
@vembacher
changed usize to u64 for compatibility
4398466 
Signed-off-by: Victor Embacher <victor@embacher.xyz>
@vembacher
Added tests to LogEntry struct in order to additionally test inclus…
c935f04 
…ion proofs at this level

Signed-off-by: Victor Embacher <victor@embacher.xyz>
@vembacher
added an additional test for consistency proofs and changes to data t…
41a9976 
…ypes

Signed-off-by: Victor Embacher <victor@embacher.xyz>
@vembacher
fixed formatting error
d068671 
Signed-off-by: Victor Embacher <victor@embacher.xyz>
@vembacher
Merge branch 'main' into feature/merkle-proofs
c459c6a
@vembacher
fixed inclusion proof bug, caused by using the incorrect root hash
38b0829 
Signed-off-by: Victor Embacher <victor@embacher.xyz>
@vembacher
replaced ToString/FromStr trait implemenations with encode/decode fun…
333d686 
…ctions

Signed-off-by: Victor Embacher <victor@embacher.xyz>
@vembacher
added more cases to the consistency proof test suite
31f0dac
@wolfv
Add comprehensive test suite using transparency-dev test vectors
484468e 
Signed-off-by: Wolf Vollprecht <w.vollprecht@gmail.com>
@wolfv
Merge main into feature/merkle-proofs
b1beb04 
Signed-off-by: Wolf Vollprecht <w.vollprecht@gmail.com>
@wolfv
fix merge
9c38592 
Signed-off-by: Wolf Vollprecht <w.vollprecht@gmail.com>
@wolfv
fix formatting of toml
01cecd1 
Signed-off-by: Wolf Vollprecht <w.vollprecht@gmail.com>
@wolfv
run fmt
8a887ca
@wolfv
use verify feature where needed
dc450da 
temporarily disable failing doctest (needs dsse)

Signed-off-by: Wolf Vollprecht <w.vollprecht@gmail.com>
@wolfv
Copy link
Contributor Author

wolfv commented Nov 17, 2025

Looks like the upstream tests are also passing in this branch! :)

I also made the PR to @vembacher repository. I did have to merge main and get rid of a few merge conflicts, which is why the PR looks a bit messy: vembacher#1

I'll tackle the remaining cargo hack issues.

wolfv added 2 commits November 17, 2025 19:08
@wolfv
fix cargo hack check
a7c37fd 
Signed-off-by: Wolf Vollprecht <w.vollprecht@gmail.com>
@wolfv
fmt
1d02a43 
Signed-off-by: Wolf Vollprecht <w.vollprecht@gmail.com>
@wolfv wolfv mentioned this pull request Nov 17, 2025
Open
5 tasks
wolfv added 2 commits November 18, 2025 12:51
@wolfv
merge main and move to canonicalizer
f5f38c4 
Signed-off-by: Wolf Vollprecht <w.vollprecht@gmail.com>
@wolfv
fix up features
96f6707 
Signed-off-by: Wolf Vollprecht <w.vollprecht@gmail.com>
@wolfv
Copy link
Contributor Author

wolfv commented Nov 18, 2025

Thanks @flavio for merging serde_json_canonicalizer! Merged main again, and moved everything over from olpc-cjson.

@viccuad
Copy link
Collaborator

viccuad commented Nov 21, 2025

Hi, thanks for tackling this.

Sadly, I cannot humanly review a merge commit with 89 changed files nor I can blindly trust it. Hence I elected to perform it on my own plus minimal fixes on #285.

Can you rebase or cherry pick 484468e on top of the current state of #285 please?

In addition, that commit will not pass make test locally. For that, I would like the merkle tests to be gated under a feature, and a new make target to run them. For now we can keep obtaining the testcase files as a manual step; I would like to keep it simple without submodules, nor importing the history of transparency-dev/merkle, nor copy-pasting them and needing to diff between the repos every time they are updated.

@wolfv
Copy link
Contributor Author

wolfv commented Nov 21, 2025

I'm happy to make a new PR with the test suite after vembachers pr is merged. This was mostly a demonstration that tests pass.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@wolfv @viccuad @vembacher