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

(example) Patch some crates that we have forked at the workspace level for namada v0.7.1 #528

Closed
wants to merge 4 commits into from

Conversation

james-chf
Copy link
Contributor

@james-chf james-chf commented Sep 29, 2022

Resolves #527

This PR changes tendermint-rs, ibc-rs and tower-abci forks that we depend on to be patched in the workspace Cargo.toml, rather than pulled in directly via git in individual crate Cargo.tomls. Feature flags we are using stay specified in individual crate Cargo.tomls. We are already following this sort of pattern for our borsh fork.

Also in tandem with this PR, our ibc-rs and tower-abci forks should be updated to do something similar.

ibc-rs - heliaxdev/ibc-rs#3
tower-abci - heliaxdev/tower-abci#2

Specifically, they shouldn't depend on our tendermint-rs fork directly via git but should instead use a [patch.crates-io] entry. This means when we patch tendermint-rs in namada, e.g. changing the rev to something different, the patch will propagate to ibc-rs and tower-abci without us having to go and update the hardcoded rev in those forks as well.

@james-chf
Copy link
Contributor Author

pls update wasm

@james-chf james-chf force-pushed the james/mainline/fork-patching branch from 7ab9635 to bb479bd Compare September 30, 2022 10:46
@james-chf
Copy link
Contributor Author

This PR just served as a proof of concept and shouldn't actually land since in main, since we are using an old Tendermint v0.36-based fork there and are upgrading to Tendermint v0.37 in the eth-bridge-integration branch. Instead we should land #531 and then update main to use Tendermint v0.37 all at once by merging in the needed changes from eth-bridge-integration.

@james-chf james-chf closed this Oct 3, 2022
@james-chf james-chf changed the title Patch some crates that we have forked at the workspace level (example) Patch some crates that we have forked at the workspace level for namada v0.7.1 Oct 3, 2022
@james-chf james-chf deleted the james/mainline/fork-patching branch October 3, 2022 10:32
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.

Make it easier to patch tendermint-rs in our codebase
1 participant