fixup! Merge remote-tracking branches 'namada/ray/standardize-tm-vers…

…ion' (#614) and 'namada/tiago/main/shim-vext' (#510)
anoma · Oct 17, 2022 · c9c7f8d · c9c7f8d
1 parent 2abfc64
commit c9c7f8d
Show file tree

Hide file tree

Showing 4 changed files with 122 additions and 796 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/shared/Cargo.toml b/shared/Cargo.toml
@@ -84,12 +84,12 @@ ferveo = {optional = true, git = "https://github.com/anoma/ferveo"}
 ferveo-common = {git = "https://github.com/anoma/ferveo"}
 tpke = {package = "group-threshold-cryptography", optional = true, git = "https://github.com/anoma/ferveo"}
 # TODO using the same version of tendermint-rs as we do here.
-ibc-abcipp = {package = "ibc", git = "https://github.com/heliaxdev/ibc-rs", rev = "30b3495ac56c6c37c99bc69ef9f2e84c3309c6cc", default-features = false, optional = true}
-ibc-proto-abcipp = {package = "ibc-proto", git = "https://github.com/heliaxdev/ibc-rs", rev = "30b3495ac56c6c37c99bc69ef9f2e84c3309c6cc", default-features = false, optional = true}
+ibc-abcipp = {package = "ibc", git = "https://github.com/heliaxdev/ibc-rs", rev = "9fcc1c8c19db6af50806ffe5b2f6c214adcbfd5d", default-features = false, optional = true}
+ibc-proto-abcipp = {package = "ibc-proto", git = "https://github.com/heliaxdev/ibc-rs", rev = "9fcc1c8c19db6af50806ffe5b2f6c214adcbfd5d", default-features = false, optional = true}
 # branch bat/abciplus
 # XXX need an abciplus and ics23 0.7.0 version here
-ibc = {git = "https://github.com/heliaxdev/ibc-rs", rev = "99a761657a51f6e5f074f3217426903e53632934", default-features = false, optional = true}
-ibc-proto = {git = "https://github.com/heliaxdev/ibc-rs", rev = "99a761657a51f6e5f074f3217426903e53632934", default-features = false, optional = true}
+ibc = {package = "ibc", git = "https://github.com/heliaxdev/ibc-rs", rev = "99a761657a51f6e5f074f3217426903e53632934", default-features = false, optional = true}
+ibc-proto = {package = "ibc-proto", git = "https://github.com/heliaxdev/ibc-rs", rev = "99a761657a51f6e5f074f3217426903e53632934", default-features = false, optional = true}
 ics23 = "0.7.0"
 itertools = "0.10.0"
 loupe = {version = "0.1.3", optional = true}