fix: fix VN merkle root mismatch #220
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
applications/tari_validator_node/src/p2p/proto/conversions/consensus.rs
Outdated
Show resolved
Hide resolved
applications/tari_validator_node/src/p2p/services/epoch_manager/base_layer_epoch_manager.rs
Outdated
Show resolved
Hide resolved
| // .map_err(|_| HotStuffError::InvalidQuorumCertificate("invalid merkle proof".to_string()))?; | ||
| // } | ||
| let validator_node_root = self.epoch_manager.get_validator_node_merkle_root(qc.epoch()).await?; | ||
| for md in qc.validators_metadata() { |
There was a problem hiding this comment.
Another future optimization: These merkleproofs can be combined into a single merkle proof before the QC is constructed. Then only one validation is needed
| // ) | ||
| // .map_err(|_| HotStuffError::InvalidQuorumCertificate("invalid merkle proof".to_string()))?; | ||
| // } | ||
| let validator_node_root = self.epoch_manager.get_validator_node_merkle_root(qc.epoch()).await?; |
There was a problem hiding this comment.
This value can also be cached by the epoch manager during scanning
| fn sign(&self, challenge: &[u8]) -> Option<Signature> { | ||
| let (nonce, public_nonce) = create_key_pair(); | ||
| let challenge = Self::create_challenge(&public_nonce, self.node_identity.public_key(), challenge); | ||
| let sig = Signature::sign(self.node_identity.secret_key().clone(), nonce, &*challenge).ok()?; |
There was a problem hiding this comment.
todo: change to sign_raw when tari_crypto is updated
There was a problem hiding this comment.
Yeah I want to update all the tari deps soon
* development: feat: determine leader from payload (tari-project#221)
sdbondi
force-pushed
the
update-merkle-proof
branch
from
2fdb0e2
to
fbf6be9
Compare
stringhandler
approved these changes
Nov 25, 2022
sdbondi
added a commit
to mrnaveira/tari-dan
that referenced
this pull request
Nov 28, 2022
* development: fix: db error when starting state sync fixes tari-project#225 (tari-project#227) feat: add template name to list templates + minor cleanups (tari-project#226) fix: remove handle new valid transaction check (tari-project#224) fix: vns should not store transactions for shards outside committee range (see issue tari-project#193) (tari-project#206) feat!: add is_mut field to function def (see issue tari-project#213) (tari-project#214) fix: fix VN merkle root mismatch (tari-project#220) feat: determine leader from payload (tari-project#221)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Motivation and Context
Relies on tari-project/tari#4952
Fixes #218
How Has This Been Tested?
Manually
Existing tests updated