Fix evidence submission by using fix in custom branch tendermint-rs

informalsystems · Sep 14, 2023 · d1be35a · d1be35a
1 parent 5c7e87a
commit d1be35a
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 29 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -23,10 +23,17 @@ overflow-checks = true
 
 [patch.crates-io]
 ibc-proto                        = { git = "https://github.com/cosmos/ibc-proto-rs.git", branch = "ccv-protos" }
-# tendermint                       = { git = "https://github.com/informalsystems/tendermint-rs.git", branch = "main" }
-# tendermint-rpc                   = { git = "https://github.com/informalsystems/tendermint-rs.git", branch = "main" }
-# tendermint-proto                 = { git = "https://github.com/informalsystems/tendermint-rs.git", branch = "main" }
-# tendermint-light-client          = { git = "https://github.com/informalsystems/tendermint-rs.git", branch = "main" }
-# tendermint-light-client-verifier = { git = "https://github.com/informalsystems/tendermint-rs.git", branch = "main" }
-# tendermint-light-client-detector = { git = "https://github.com/informalsystems/tendermint-rs.git", branch = "main" }
-# tendermint-testgen               = { git = "https://github.com/informalsystems/tendermint-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-light-client-detector = { path = "../tendermint-rs/light-client-detector" }
+# tendermint-testgen               = { path = "../tendermint-rs/testgen" }
+tendermint                       = { git = "https://github.com/informalsystems/tendermint-rs.git", branch = "fix-evidence" }
+tendermint-rpc                   = { git = "https://github.com/informalsystems/tendermint-rs.git", branch = "fix-evidence" }
+tendermint-proto                 = { git = "https://github.com/informalsystems/tendermint-rs.git", branch = "fix-evidence" }
+tendermint-light-client          = { git = "https://github.com/informalsystems/tendermint-rs.git", branch = "fix-evidence" }
+tendermint-light-client-verifier = { git = "https://github.com/informalsystems/tendermint-rs.git", branch = "fix-evidence" }
+tendermint-light-client-detector = { git = "https://github.com/informalsystems/tendermint-rs.git", branch = "fix-evidence" }
+tendermint-testgen               = { git = "https://github.com/informalsystems/tendermint-rs.git", branch = "fix-evidence" }
diff --git a/ci/misbehaviour-ics/double_sign_test.sh b/ci/misbehaviour-ics/double_sign_test.sh
@@ -1,7 +1,13 @@
 #!/bin/bash
 # shellcheck disable=2086,2004
 
-set -eux 
+set -eu
+
+DEBUG=${DEBUG:-false}
+
+if [ "$DEBUG" = true ]; then
+    set -x
+fi
 
 # User balance of stake tokens 
 USER_COINS="100000000000stake"
@@ -13,10 +19,16 @@ NODE_IP="127.0.0.1"
 # Home directory
 HOME_DIR="/tmp/hermes-ics-double-sign"
 
+# Hermes debug
+if [ "$DEBUG" = true ]; then
+    HERMES_DEBUG="--debug=rpc"
+else
+    HERMES_DEBUG=""
+fi
 # Hermes config
 HERMES_CONFIG="$HOME_DIR/hermes.toml"
 # Hermes binary
-HERMES_BIN="cargo run -q --bin hermes -- --config $HERMES_CONFIG"
+HERMES_BIN="cargo run -q --bin hermes -- $HERMES_DEBUG --config $HERMES_CONFIG"
 
 # Validator moniker
 MONIKERS=("coordinator" "alice" "bob")

diff --git a/ci/misbehaviour-ics/misbehaviour_test.sh b/ci/misbehaviour-ics/misbehaviour_test.sh
@@ -1,7 +1,13 @@
 #!/bin/bash
 # shellcheck disable=2086
-set -eux 
 
+set -eu
+
+DEBUG=${DEBUG:-false}
+
+if [ "$DEBUG" = true ]; then
+    set -x
+fi
 
 diag() {
   echo ">>
@@ -22,12 +28,19 @@ NODE_IP="127.0.0.1"
 # Home directory
 HOME_DIR="/tmp/hermes-ics-misbehaviour"
 
+# Hermes debug
+if [ "$DEBUG" = true ]; then
+    HERMES_DEBUG="--debug=rpc"
+else
+    HERMES_DEBUG=""
+fi
+
 # Hermes config
 HERMES_CONFIG="$HOME_DIR/hermes.toml"
 HERMES_CONFIG_FORK="$HOME_DIR/hermes-fork.toml"
 # Hermes binary
-HERMES_BIN="cargo run -q --bin hermes -- --config $HERMES_CONFIG"
-HERMES_BIN_FORK="cargo run -q --bin hermes -- --config $HERMES_CONFIG_FORK"
+HERMES_BIN="cargo run -q --bin hermes -- $HERMES_DEBUG --config $HERMES_CONFIG"
+HERMES_BIN_FORK="cargo run -q --bin hermes -- $HERMES_DEBUG --config $HERMES_CONFIG_FORK"
 
 # Validator moniker
 MONIKER="coordinator"

diff --git a/crates/relayer/src/light_client/tendermint.rs b/crates/relayer/src/light_client/tendermint.rs
@@ -207,13 +207,18 @@ impl super::LightClient<CosmosSdkChain> for LightClient {
                 challenging_block,
             })) => {
                 warn!("misbehavior detected, reporting evidence to RPC witness node and primary chain");
+                debug!("evidence: {evidence:#?}");
+                debug!("challenging block: {challenging_block:#?}");
+
+                warn!("waiting 5 seconds before reporting evidence to RPC witness node");
+                std::thread::sleep(Duration::from_secs(5));
 
                 match detector::report_evidence(
                     self.io.rpc_client().clone(),
                     evidence.against_primary,
                 ) {
                     Ok(hash) => warn!("evidence reported to RPC witness node with hash: {hash}"),
-                    Err(e) => error!("failed to report evidence to RPC witness node: {}", e),
+                    Err(e) => error!("failed to report evidence to RPC witness node: {e}"),
                 }
 
                 let target_block = self.fetch(update_header.height())?;