remove ssz_rs dependency #1671
Open
remove ssz_rs dependency #1671
+61
−132
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
KolbyML
reviewed
Feb 7, 2025
crates/light-client/Cargo.toml
Outdated
Comment on lines
20
to
21
| trin-validation.workspace = true | ||
| ethereum_ssz.workspace = true |
There was a problem hiding this comment.
can you sort these alphabetically
| .expect("Unable to convert state root to bytes"), | ||
| )?; | ||
| let leaf_hash = leaf_object.tree_hash_root(); | ||
| let state_root = bytes32_to_node(&Bytes32::from(attested_header.state_root.0.to_vec()))?; |
There was a problem hiding this comment.
Suggested change
| let state_root = bytes32_to_node(&Bytes32::from(attested_header.state_root.0.to_vec()))?; | |
| let state_root = B256::from_slice(&attested_header.state_root.0.to_vec()))?; |
Comment on lines
68
to
69
| genesis_root: Bytes32, | ||
| ) -> Result<Bytes32> { |
There was a problem hiding this comment.
Suggested change
| genesis_root: Bytes32, | |
| ) -> Result<Bytes32> { | |
| genesis_root: Bytes32, | |
| ) -> Result<B256> { |
| let d = [start, end].concat(); | ||
| Ok(d.to_vec().try_into()?) | ||
| Ok(d.to_vec().into()) |
There was a problem hiding this comment.
Suggested change
| Ok(d.to_vec().into()) | |
| Ok(B256::from_slice(d)) |
KolbyML
reviewed
Feb 7, 2025
| ) -> Result<Node> { | ||
| let genesis_root = genesis_root.to_vec().try_into()?; | ||
| ) -> Result<B256> { | ||
| let genesis_root = genesis_root.to_vec().into(); |
There was a problem hiding this comment.
Suggested change
| let genesis_root = genesis_root.to_vec().into(); | |
| let genesis_root = B256::from_slice(genesis_root); |
KolbyML
reviewed
Feb 7, 2025
| } | ||
|
|
||
| pub fn compute_domain( | ||
| domain_type: &[u8], | ||
| fork_version: Vector<u8, 4>, | ||
| fork_version: FixedVector<u8, U4>, | ||
| genesis_root: Bytes32, |
There was a problem hiding this comment.
Suggested change
| genesis_root: Bytes32, | |
| genesis_root: B256, |
KolbyML
reviewed
Feb 7, 2025
Comment on lines
47
to
48
| object_root: Bytes32, | ||
| domain: Bytes32, |
There was a problem hiding this comment.
Suggested change
| object_root: Bytes32, | |
| domain: Bytes32, | |
| object_root: B256, | |
| domain: B256, |
KolbyML
reviewed
Feb 7, 2025
| genesis_validator_root: Bytes32, | ||
| } | ||
|
|
||
| pub fn compute_signing_root(object_root: Bytes32, domain: Bytes32) -> Result<Node> { | ||
| let mut data = SigningData { | ||
| pub fn compute_signing_root(object_root: Bytes32, domain: Bytes32) -> B256 { |
There was a problem hiding this comment.
Suggested change
| pub fn compute_signing_root(object_root: Bytes32, domain: Bytes32) -> B256 { | |
| pub fn compute_signing_root(object_root: B256, domain: B256) -> B256 { |
KolbyML
reviewed
Feb 7, 2025
crates/light-client/src/types.rs
Outdated
|
|
||
| pub type Bytes32 = Vector<u8, 32>; | ||
| pub type Bytes32 = FixedVector<u8, U32>; |
There was a problem hiding this comment.
Might as well remove this type Bytes32 and replace all with B256
|
@KolbyML, thanks for the feedback, I made the changes you suggested! |
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.
What was wrong?
FIxes #1417
light-client crate used ssz-rs crate for SSZ handling instead of ethereum-ssz crate
How was it fixed?
This PR removes the ssz-rs dependency and uses ethereum-ssz instead
To-Do