diff --git a/.changelog/unreleased/miscellaneous/3216-update-tower-abci.md b/.changelog/unreleased/miscellaneous/3216-update-tower-abci.md new file mode 100644 index 0000000000..f8ae248b2e --- /dev/null +++ b/.changelog/unreleased/miscellaneous/3216-update-tower-abci.md @@ -0,0 +1,2 @@ +- Update tower-abci to fix windows build. + ([\#3216](https://github.com/anoma/namada/pull/3216)) \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index dc7b21255e..915fe21542 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -490,7 +490,7 @@ dependencies = [ "bitflags 2.5.0", "cexpr", "clang-sys", - "itertools 0.11.0", + "itertools 0.12.1", "lazy_static", "lazycell", "proc-macro2", @@ -8249,7 +8249,7 @@ dependencies = [ [[package]] name = "tower-abci" version = "0.12.0" -source = "git+https://github.com/penumbra-zone/tower-abci.git?rev=4b7306578b93a4def9d76abae8e2a46c8ee6952f#4b7306578b93a4def9d76abae8e2a46c8ee6952f" +source = "git+https://github.com/heliaxdev/tower-abci?rev=52382f4d2bab1022a66b06958a605da946b75144#52382f4d2bab1022a66b06958a605da946b75144" dependencies = [ "bytes", "futures", diff --git a/Cargo.toml b/Cargo.toml index 11531f5699..878b14342d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -178,10 +178,9 @@ toml = "0.5.8" tonic = "0.8.3" tonic-build = "0.8.4" tower = "0.4" -# Also, using the same version of tendermint-rs as we do here. -# for tendermint-rs v0.35 -#tower-abci = "0.11.1" -tower-abci = {git = "https://github.com/penumbra-zone/tower-abci.git", rev = "4b7306578b93a4def9d76abae8e2a46c8ee6952f"} +# Using the same version of tendermint-rs as we do (v0.35) +# Based on tower-abci 0.12 (upstreamed in https://github.com/penumbra-zone/tower-abci/pull/47) +tower-abci = { git = "https://github.com/heliaxdev/tower-abci", rev = "52382f4d2bab1022a66b06958a605da946b75144" } tracing = "0.1.30" tracing-appender = "0.2.2" tracing-log = "0.1.2"