Use eth-bridge-integration branch for tendermint-rs/ibc-rs/tower-abci dependencies
#531
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
james-chf
changed the title
eth-bridge-integration for tendermint-rs/ibc-rs/tower-abci dependencieseth-bridge-integration branch for tendermint-rs/ibc-rs/tower-abci dependencies
james-chf
force-pushed
the
james/ethbridge/fork-patching
branch
2 times, most recently
from
db28db7 to
c1f2e52
Compare
This was referenced Oct 3, 2022
james-chf
force-pushed
the
james/ethbridge/fork-patching
branch
from
c1f2e52 to
1116073
Compare
|
pls update wasm |
sug0
approved these changes
Oct 3, 2022
james-chf
commented
Oct 3, 2022
Comment on lines
+28
to
+37
| # patched to a commit on the `eth-bridge-integration` branch of our fork | ||
| tendermint = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "bc0b6ac47b3bfc1ee8b944341b654b867b3b5d0b"} | ||
| tendermint-proto = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "bc0b6ac47b3bfc1ee8b944341b654b867b3b5d0b"} | ||
| tendermint-testgen = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "bc0b6ac47b3bfc1ee8b944341b654b867b3b5d0b"} | ||
| tendermint-light-client-verifier = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "bc0b6ac47b3bfc1ee8b944341b654b867b3b5d0b"} | ||
|
|
||
| # patched to a commit on the `eth-bridge-integration` branch of our fork | ||
| ibc = {git = "https://github.com/heliaxdev/ibc-rs.git", rev = "451ff75591d9de48b7147a651858c3daeb5e2436"} | ||
| ibc-proto = {git = "https://github.com/heliaxdev/ibc-rs.git", rev = "451ff75591d9de48b7147a651858c3daeb5e2436"} | ||
|
|
There was a problem hiding this comment.
We didn't have to patch these things in our wasm crates before, as the namada crates were pulling in the forks for us indirectly. Now, because the namada crates are patched at the workspace level, we have to also patch anywhere we use the individual namada crates.
In some sense, it would make sense for individual namada crates to pull in the forks directly rather than via workspace-level Cargo.toml patching, but it's not possible to patch individual crates in a workspace - also, we are then unable to patch tendermint-rs and the like whenever we are using those crates outside of the workspace due to rust-lang/cargo#5478 :(
batconjurer
approved these changes
Oct 4, 2022
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.
eth-bridge-integrationbranches are set up on our tendermint-rs, ibc-rs and tower-abci forks, and this PR switches namadaeth-bridge-integrationbranch to start using them. This PR also makes it so that we can patch to a different version oftendermint-rsjust via changingCargo.tomls in this repo, rather than also in the ibc-rs/tower-abci forks. (Relates to #527).eth-bridge-integrationis based off the currentbat/abciplusbranch, the only difference being we start using[patch.crates-io]there and specify the original tendermint version requirements (Explicitly patch with our tendermint-rs fork foreth-bridge-integrationheliaxdev/tower-abci#3)eth-bridge-integrationbranch is based off of the ibc-rs rev that was currently being used (9fcc1c8c19), the only difference being we start using[patch.crates-io]and specify the original tendermint version requirements there as well (Explicitly patch tendermint-rs foreth-bridge-integrationheliaxdev/ibc-rs#4)eth-bridge-integrationbranch was the same as the currentbat/abciplusbranch, except it was cleanly rebased ontov0.23.6(bat/abcipluswas based onv0.23.5) and then I made and merged this PR into it - Pemit an empty app_state in a Tendermint genesis.json heliaxdev/tendermint-rs#6 - to fix an issue withv0.23.6The change of tendermint-rs from v0.23.5 to v0.23.6 is because ibc v0.14.0, which we based our ibc-rs fork off, depends explicitly on tendermint-rs v0.23.6 (it specifies
version = "=0.23.6"for tendermint-rs in some of itsCargo.toml). This meant our v0.23.5-based tendermint-rs fork couldn't be straightforwardly patched onto our ibc-rs fork, as it didn't match the semver requirements specified by ibc-rs. Going forwards:mainlooks to be tracking Tendermint v0.37 (though not 100% confirmed), so we probably want to try catching up our tendermint-rs fork branchabcippdependencies and the like remain unchanged, runningmake test-abcipplocally still passes. I tested running the ledger locally, using this prebuilt.anomadirectory - anoma-ethbridge-2022-09-30.tar.gz