Skip to content

Update to incrementalmerkletree 0.8, shardtree 0.6#1692

Merged
nuttycom merged 2 commits into
zcash:mainfrom
nuttycom:incrementalmerkletree_update
Feb 7, 2025
Merged

Update to incrementalmerkletree 0.8, shardtree 0.6#1692
nuttycom merged 2 commits into
zcash:mainfrom
nuttycom:incrementalmerkletree_update

Conversation

@nuttycom
Copy link
Copy Markdown
Collaborator

@nuttycom nuttycom commented Jan 31, 2025

No description provided.

Comment thread Cargo.toml Outdated
Comment on lines +198 to +203
orchard = { git = "https://github.com/zcash/orchard.git", rev = "b1c22c07300db22239235d16dab096e23369948f" }
redjubjub = { git = "https://github.com/ZcashFoundation/redjubjub", rev = "eae848c5c14d9c795d000dd9f4c4762d1aee7ee1" }
sapling = { package = "sapling-crypto", git = "https://github.com/zcash/sapling-crypto.git", rev = "e607c52d13bb7ade66293f9ab8d07e311f4ad868" }
sapling = { package = "sapling-crypto", git = "https://github.com/zcash/sapling-crypto.git", rev = "6ca338532912adcd82369220faeea31aab4720c5" }
incrementalmerkletree = { git = "https://github.com/zcash/incrementalmerkletree.git", rev = "44065917a399a921a2151bd14d399a192eb61960" }
incrementalmerkletree-testing = { git = "https://github.com/zcash/incrementalmerkletree.git", rev = "44065917a399a921a2151bd14d399a192eb61960" }
shardtree = { git = "https://github.com/zcash/incrementalmerkletree.git", rev = "44065917a399a921a2151bd14d399a192eb61960" }
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have not checked these commit hashes.

daira
daira previously approved these changes Jan 31, 2025
Copy link
Copy Markdown
Contributor

@daira daira left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good so far.

@nuttycom nuttycom force-pushed the incrementalmerkletree_update branch from 34616c0 to 2de9260 Compare January 31, 2025 04:07
@nuttycom nuttycom marked this pull request as ready for review January 31, 2025 04:07
@daira
Copy link
Copy Markdown
Contributor

daira commented Jan 31, 2025

Not reviewing because it's still failing tests.

@nuttycom nuttycom force-pushed the incrementalmerkletree_update branch from 2de9260 to 6cf0806 Compare February 1, 2025 16:43
@nuttycom nuttycom requested review from daira and str4d February 1, 2025 16:43
@nuttycom nuttycom force-pushed the incrementalmerkletree_update branch from 6cf0806 to c19f8cd Compare February 1, 2025 16:45
@codecov
Copy link
Copy Markdown

codecov Bot commented Feb 1, 2025

Codecov Report

Attention: Patch coverage is 37.03704% with 17 lines in your changes missing coverage. Please review.

Project coverage is 54.33%. Comparing base (612bc03) to head (328c031).
Report is 3 commits behind head on main.

Files with missing lines Patch % Lines
zcash_client_sqlite/src/wallet/commitment_tree.rs 7.69% 12 Missing ⚠️
pczt/src/roles/creator/mod.rs 0.00% 1 Missing ⚠️
zcash_client_backend/src/fees/common.rs 50.00% 1 Missing ⚠️
zcash_client_backend/src/scan.rs 0.00% 1 Missing ⚠️
zcash_client_sqlite/src/lib.rs 0.00% 1 Missing ⚠️
zcash_proofs/src/circuit/sprout/mod.rs 0.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1692      +/-   ##
==========================================
- Coverage   54.36%   54.33%   -0.03%     
==========================================
  Files         173      173              
  Lines       20274    20282       +8     
==========================================
  Hits        11021    11021              
- Misses       9253     9261       +8     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@nuttycom nuttycom force-pushed the incrementalmerkletree_update branch from c19f8cd to fc306e9 Compare February 3, 2025 16:12
@nuttycom nuttycom force-pushed the incrementalmerkletree_update branch from fc306e9 to 1b2dab2 Compare February 3, 2025 17:10
Copy link
Copy Markdown
Contributor

@str4d str4d left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK 328c031

@nuttycom nuttycom merged commit 4ded512 into zcash:main Feb 7, 2025
@nuttycom nuttycom deleted the incrementalmerkletree_update branch February 7, 2025 01:10
let ceildiv = |num: usize, den: usize| num.div_ceil(den);

let logical_actions = max(
ceildiv(t_in_total_size, self.p2pkh_standard_input_size),
Copy link
Copy Markdown
Contributor

@daira daira Feb 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could be just t_in_total_size.div_ceil(self.p2pkh_standard_input_size), and similarly on the next line, deleting the closure definition. It doesn't really matter, but a good clean-up if you have time.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, ceildiv only existed in the first place because it wasn't supported in the standard library at the MSRV we were on; bumping to 1.81 made this change possible and I just didn't notice.

Copy link
Copy Markdown
Contributor

@daira daira left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Post-hoc ACK with minor comment.

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants