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

chore: update depends so we can use sigp crates directly #1423

Merged
merged 4 commits into from
Sep 5, 2024

Conversation

KolbyML
Copy link
Member

@KolbyML KolbyML commented Sep 4, 2024

What was wrong?

This is a part of 68f4bae

We were relying on forks of sigp library's during our transition to using Reth's primitive types, I made forks to update those sigp libraries to use Reth's primitives as well, they are now updated so here is a PR using them

How was it fixed?

Updating library's as required and code as well.

Many libraries depend on each other in certain ways so I just updated everything that be needed so we can compile again, well also achieving the goal of relying on sigp's library's directly again

Copy link
Collaborator

@morph-dev morph-dev left a comment

Choose a reason for hiding this comment

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

Can we also update revm-inspectors in trin-execution/Cargo.toml?

gas_used,
timestamp: U256::from(timestamp),
number,
gas_limit: gas_limit.to::<u128>(),
Copy link
Collaborator

Choose a reason for hiding this comment

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

nit: I didn't check it, but I think you don't have to specify ::<u128> as compiler should be able to figure it out. But it's fine if you want to be explicit. Here and in most other places

Cargo.toml Outdated
@@ -80,8 +80,8 @@ members = [

[workspace.dependencies]
alloy-consensus = { git = "https://github.com/alloy-rs/alloy.git", rev = "d68a6b787b2904061f0ae7fcc02ece8513e3c500"}
Copy link
Collaborator

Choose a reason for hiding this comment

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

Can we update this as well?

Copy link
Member Author

Choose a reason for hiding this comment

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

I will just remove it as we just use a constant from it so it is a little overkill

Copy link
Collaborator

Choose a reason for hiding this comment

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

nit: You could have used alloy_consensus: v0.3.1, as we already depend on it indirectly. Up to you.

@KolbyML
Copy link
Member Author

KolbyML commented Sep 5, 2024

Can we also update revm-inspectors in trin-execution/Cargo.toml?

I tried, but they have it configured weird so it wasn't easy to do

@KolbyML
Copy link
Member Author

KolbyML commented Sep 5, 2024

Can we also update revm-inspectors in trin-execution/Cargo.toml?

I tried, but they have it configured weird so it wasn't easy to do

I think I figured it out

@KolbyML
Copy link
Member Author

KolbyML commented Sep 5, 2024

@morph-dev ready for another review I believe I resolved all the concerns

@@ -12,6 +12,7 @@ authors = ["https://github.com/ethereum/trin/graphs/contributors"]


[dependencies]
alloy-consensus.workspace = true
Copy link
Collaborator

Choose a reason for hiding this comment

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

nit: just don't forget to remove constants that you introduced

@KolbyML KolbyML merged commit 1713c0a into ethereum:master Sep 5, 2024
8 checks passed
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.

2 participants