Skip to content

Commit

Permalink
penumbra: switch back to tendermint upstream!
Browse files Browse the repository at this point in the history
  • Loading branch information
erwanor committed Dec 25, 2024
1 parent 689e18a commit 0f2b447
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 24 deletions.
25 changes: 15 additions & 10 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 5 additions & 13 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -220,11 +220,11 @@ sha2 = { version = "0.10" }
sqlx = { version = "0.8", features = ["bigdecimal", "postgres", "runtime-tokio", "tls-rustls"] }
tap = "1.0.1"
tempfile = { version = "3.3.0" }
tendermint = { default-features = false, version = "0.40.0" }
tendermint-config = { version = "0.40.0" }
tendermint-light-client-verifier = { version = "0.40.0" }
tendermint-proto = { version = "0.40.0" }
tendermint-rpc = { version = "0.40.0" }
tendermint = { default-features = false, version = "0.40.1" }
tendermint-config = { version = "0.40.1" }
tendermint-light-client-verifier = { version = "0.40.1" }
tendermint-proto = { version = "0.40.1" }
tendermint-rpc = { version = "0.40.1" }
termion = { version = "3" }
thiserror = { version = "1.0" }
time = { version = "0.3" }
Expand All @@ -242,11 +242,3 @@ tracing = { version = "0.1" }
tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
url = { version = "2.2" }
getrandom = { version = "0.2", default-features = false }

# TODO: cut 41 in trs
[patch.crates-io]
tendermint = { git = "https://github.com/informalsystems/tendermint-rs/", rev = "refs/pull/1480/head" }
tendermint-config = { git = "https://github.com/informalsystems/tendermint-rs/", rev = "refs/pull/1480/head" }
tendermint-light-client-verifier = { git = "https://github.com/informalsystems/tendermint-rs/", rev = "refs/pull/1480/head" }
tendermint-proto = { git = "https://github.com/informalsystems/tendermint-rs/", rev = "refs/pull/1480/head" }
tendermint-rpc = { git = "https://github.com/informalsystems/tendermint-rs/", rev = "refs/pull/1480/head" }
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[toolchain]
# We set a specific version of rust so that CI workflows use the same
# version development environments do.
channel = "1.80"
channel = "1.83"
components = [ "rustfmt", "rust-analyzer" ]
# Include wasm toolchain, for CI tests to check wasm32 build targets still work,
# to avoid downstream breakage in `penumbra-wasm` crate, in the web repo.
Expand Down

0 comments on commit 0f2b447

Please sign in to comment.