Merge branch 'tomas/update-tower-abci' (#3216)

* tomas/update-tower-abci: changelog: add #3216 deps: update tower-abci to v0.12
anoma · May 10, 2024 · 78edf75 · 78edf75
2 parents fedecea + 4a55777
commit 78edf75
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.changelog/unreleased/miscellaneous/3216-update-tower-abci.md 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))
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- Update tower-abci to fix windows build.
		([\#3216](https://github.com/anoma/namada/pull/3216))