From dd445615c26677af53e8b4f7f15528ae64c4ec26 Mon Sep 17 00:00:00 2001
From: Romain Ruetschi <romain@informal.systems>
Date: Tue, 4 Apr 2023 15:28:07 +0200
Subject: [PATCH] Use tendermint-rs branch

---
 Cargo.lock                                           |  7 +++++++
 Cargo.toml                                           | 12 ++++++------
 crates/relayer/src/light_client/tendermint.rs        |  2 +-
 .../relayer/src/light_client/tendermint/detector.rs  |  2 +-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7ae808464f..ec1e5b1370 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3951,6 +3951,7 @@ dependencies = [
 [[package]]
 name = "tendermint"
 version = "0.30.0"
+source = "git+https://github.com/informalsystems/tendermint-rs.git?branch=romac/new-misbehavior-detector#d4e10f5bf18b4956bba90fa7cdeaca8971761d88"
 dependencies = [
  "bytes",
  "digest 0.10.6",
@@ -3980,6 +3981,7 @@ dependencies = [
 [[package]]
 name = "tendermint-config"
 version = "0.30.0"
+source = "git+https://github.com/informalsystems/tendermint-rs.git?branch=romac/new-misbehavior-detector#d4e10f5bf18b4956bba90fa7cdeaca8971761d88"
 dependencies = [
  "flex-error",
  "serde",
@@ -3992,6 +3994,7 @@ dependencies = [
 [[package]]
 name = "tendermint-light-client"
 version = "0.30.0"
+source = "git+https://github.com/informalsystems/tendermint-rs.git?branch=romac/new-misbehavior-detector#d4e10f5bf18b4956bba90fa7cdeaca8971761d88"
 dependencies = [
  "contracts",
  "crossbeam-channel 0.4.4",
@@ -4014,6 +4017,7 @@ dependencies = [
 [[package]]
 name = "tendermint-light-client-verifier"
 version = "0.30.0"
+source = "git+https://github.com/informalsystems/tendermint-rs.git?branch=romac/new-misbehavior-detector#d4e10f5bf18b4956bba90fa7cdeaca8971761d88"
 dependencies = [
  "derive_more",
  "flex-error",
@@ -4025,6 +4029,7 @@ dependencies = [
 [[package]]
 name = "tendermint-proto"
 version = "0.30.0"
+source = "git+https://github.com/informalsystems/tendermint-rs.git?branch=romac/new-misbehavior-detector#d4e10f5bf18b4956bba90fa7cdeaca8971761d88"
 dependencies = [
  "bytes",
  "flex-error",
@@ -4041,6 +4046,7 @@ dependencies = [
 [[package]]
 name = "tendermint-rpc"
 version = "0.30.0"
+source = "git+https://github.com/informalsystems/tendermint-rs.git?branch=romac/new-misbehavior-detector#d4e10f5bf18b4956bba90fa7cdeaca8971761d88"
 dependencies = [
  "async-trait",
  "async-tungstenite",
@@ -4074,6 +4080,7 @@ dependencies = [
 [[package]]
 name = "tendermint-testgen"
 version = "0.30.0"
+source = "git+https://github.com/informalsystems/tendermint-rs.git?branch=romac/new-misbehavior-detector#d4e10f5bf18b4956bba90fa7cdeaca8971761d88"
 dependencies = [
  "ed25519-consensus",
  "gumdrop",
diff --git a/Cargo.toml b/Cargo.toml
index 4c05167273..f0cb443696 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,9 +17,9 @@ members = [
 
 [patch.crates-io]
 # ibc-proto                        = { git = "https://github.com/cosmos/ibc-proto-rs.git",       branch = "main" }
-tendermint                       = { path = "../tendermint-rs/tendermint" }
-tendermint-rpc                   = { path = "../tendermint-rs/rpc" }
-tendermint-proto                 = { path = "../tendermint-rs/proto" }
-tendermint-light-client          = { path = "../tendermint-rs/light-client" }
-tendermint-light-client-verifier = { path = "../tendermint-rs/light-client-verifier" }
-tendermint-testgen               = { path = "../tendermint-rs/testgen" }
+tendermint                       = { git = "https://github.com/informalsystems/tendermint-rs.git", branch = "romac/new-misbehavior-detector" }
+tendermint-rpc                   = { git = "https://github.com/informalsystems/tendermint-rs.git", branch = "romac/new-misbehavior-detector" }
+tendermint-proto                 = { git = "https://github.com/informalsystems/tendermint-rs.git", branch = "romac/new-misbehavior-detector" }
+tendermint-light-client          = { git = "https://github.com/informalsystems/tendermint-rs.git", branch = "romac/new-misbehavior-detector" }
+tendermint-light-client-verifier = { git = "https://github.com/informalsystems/tendermint-rs.git", branch = "romac/new-misbehavior-detector" }
+tendermint-testgen               = { git = "https://github.com/informalsystems/tendermint-rs.git", branch = "romac/new-misbehavior-detector" }
diff --git a/crates/relayer/src/light_client/tendermint.rs b/crates/relayer/src/light_client/tendermint.rs
index 9d57399120..4973687ee6 100644
--- a/crates/relayer/src/light_client/tendermint.rs
+++ b/crates/relayer/src/light_client/tendermint.rs
@@ -5,8 +5,8 @@ use tracing::{debug, error, trace, warn};
 
 use tendermint_light_client::{
     components::{self, io::AtHeight},
+    detector::Divergence,
     light_client::LightClient as TmLightClient,
-    misbehavior::Divergence,
     state::State as LightClientState,
     store::{memory::MemoryStore, LightStore},
 };
diff --git a/crates/relayer/src/light_client/tendermint/detector.rs b/crates/relayer/src/light_client/tendermint/detector.rs
index cca347fdcc..2caebda0f0 100644
--- a/crates/relayer/src/light_client/tendermint/detector.rs
+++ b/crates/relayer/src/light_client/tendermint/detector.rs
@@ -8,7 +8,7 @@ use tendermint::{
 use tendermint_light_client::{
     builder::LightClientBuilder,
     components::{clock::FixedClock, io::ProdIo, scheduler},
-    misbehavior::{detect_divergence, Divergence, Provider},
+    detector::{detect_divergence, Divergence, Provider},
     predicates::ProdPredicates,
     store::memory::MemoryStore,
     types::{LightBlock, PeerId},