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.

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

Backport of bitcoin/bitcoin#8020 #4979

Merged
merged 4 commits into from Feb 15, 2021
Merged

Conversation

nuttycom
Copy link
Contributor

@nuttycom nuttycom commented Feb 11, 2021

Cherry-picked from bitcoin/bitcoin#8020

This is ~1.7x slower than the Lookup3-of-Xor-with-salt construct we were
using before, but it is a primitive designed for exactly this.

Zcash: Propagate CCoinsKeyHasher -> SaltedTxidHasher changes to where
we've used CCoinsKeyHasher outside of its original scope.
Zcash: conflicts resolved against 957e5d2
@nuttycom nuttycom requested a review from str4d February 11, 2021 18:12
@nuttycom nuttycom self-assigned this Feb 11, 2021
@nuttycom nuttycom requested a review from daira February 11, 2021 22:04
@nuttycom nuttycom added this to the Core Sprint 2021-06 milestone Feb 15, 2021
@str4d
Copy link
Contributor

str4d commented Feb 15, 2021

How does this conflict? 5490 from upstream was merged before we forked.

Copy link
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. I checked the SipHash-2-4 implementation against the reference implementation.

@str4d str4d added C-upstream-port Category: Changes that are ported from the Bitcoin Core codebase. I-dos Problems and improvements with respect to Denial-of-Service. labels Feb 15, 2021
@str4d
Copy link
Contributor

str4d commented Feb 15, 2021

This does not affect consensus (it alters the hasher used inside maps that are used by consensus, but that only affects the DoS-resistance of those maps, not their consensus behaviour), or risk user funds, and thus only requires one review.

@zkbot r+

@zkbot
Copy link
Contributor

zkbot commented Feb 15, 2021

📌 Commit cfc4ca1 has been approved by str4d

@zkbot
Copy link
Contributor

zkbot commented Feb 15, 2021

⌛ Testing commit cfc4ca1 with merge c81adc3...

@zkbot
Copy link
Contributor

zkbot commented Feb 15, 2021

☀️ Test successful - pr-merge
Approved by: str4d
Pushing c81adc3 to master...

@zkbot zkbot merged commit c81adc3 into zcash:master Feb 15, 2021
@nuttycom nuttycom deleted the upstream_siphash branch February 17, 2021 23:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C-upstream-port Category: Changes that are ported from the Bitcoin Core codebase. I-dos Problems and improvements with respect to Denial-of-Service.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants