Merge branch 'tomas/tower-abci-upstream' (#3137)

* tomas/tower-abci-upstream: changelog: add #3137 deps: switch back to upstream tower-abci v0.11.1
anoma · Apr 25, 2024 · 39be905 · 39be905
2 parents 1791bf5 + 5ca8ecb
commit 39be905
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.changelog/unreleased/miscellaneous/3137-tower-abci-upstream.md b/.changelog/unreleased/miscellaneous/3137-tower-abci-upstream.md
@@ -0,0 +1,2 @@
+- Switched back to upstream tower-abci v0.11.1.
+  ([\#3137](https://github.com/anoma/namada/pull/3137))
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -175,8 +175,7 @@ tonic = "0.8.3"
 tonic-build = "0.8.4"
 tower = "0.4"
 # Also, using the same version of tendermint-rs as we do here.
-# https://github.com/penumbra-zone/tower-abci/pull/40 based on 0.11.1
-tower-abci = {git = "https://github.com/heliaxdev/tower-abci.git", rev = "a41ab4b336875084e04f4803868adf41ef62a67c"}
+tower-abci = "0.11.1"
 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 @@
		- Switched back to upstream tower-abci v0.11.1.
		([\#3137](https://github.com/anoma/namada/pull/3137))