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

Updates to tendermint patching #827

Merged

Conversation

james-chf
Copy link
Contributor

@james-chf james-chf commented Nov 25, 2022

Relates to #825

This PR makes it so that we pull in tendermint-related dependencies directly via a git source as we used before. e.g.

tendermint = {package = "tendermint", git = "https://github.com/heliaxdev/tendermint-rs", rev = "e6c684731f21bffd89886d3e91074b96aee074ba"}

This makes more sense as the namada code does hard depend on our forks, and doesn't work with upstream tendermint-rs packages. By specifying our forks as direct dependencies, there is no longer a need to patch in the correct versions via the workspace Cargo.tomls. Unfortunately we obscure the versions of our forks from our Cargo.tomls, but the versions will still show up in cargo tree and when running cargo build, cargo check, etc.

The motivation for changing this in the first place was to make patching over tendermint-rs easier, but it is still possible to do this by patching one git source to a different once (see rust-lang/cargo#5478 for why this is required) although it is a bit hacky e.g.

# example patch that we might have in the `eth-bridge-integration` branch, if we had to use a different version to what was in `main`
[patch."https://github.com/heliaxdev/tendermint-rs"]
tendermint = {git = "https://github.com/heliaxdev/tendermint-rs.git?branch=eth-bridge-integration", rev = "..."}

@james-chf james-chf mentioned this pull request Nov 25, 2022
11 tasks
@james-chf james-chf force-pushed the james/tendermint/fix-patching branch from cea6256 to c24ed2a Compare November 29, 2022 10:25
@james-chf james-chf marked this pull request as ready for review November 29, 2022 10:25
@james-chf james-chf merged commit f010ae4 into tendermint-v0.37-integration Nov 29, 2022
@james-chf james-chf deleted the james/tendermint/fix-patching branch November 29, 2022 10:25
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.

1 participant