Merge branch 'master' into romac/1797-ibc-v3

informalsystems · Feb 1, 2022 · 3918216 · 3918216
2 parents 4f9cd5a + c560998
commit 3918216
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 28 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/modules/Cargo.toml b/modules/Cargo.toml
@@ -63,7 +63,7 @@ default-features = false
 
 [dev-dependencies]
 env_logger = "0.9.0"
-tracing-subscriber = { version = "0.3.6", features = ["fmt", "env-filter", "json"]}
+tracing-subscriber = { version = "0.3.7", features = ["fmt", "env-filter", "json"]}
 test-log = { version = "0.2.8", features = ["trace"] }
 modelator = "0.4.2"
 sha2 = { version = "0.10.1" }

diff --git a/relayer-cli/Cargo.toml b/relayer-cli/Cargo.toml
@@ -38,7 +38,7 @@ humantime = "2.1"
 serde = { version = "1.0", features = ["serde_derive"] }
 tokio = { version = "1.0", features = ["full"] }
 tracing = "0.1.29"
-tracing-subscriber = { version = "0.3.6", features = ["fmt", "env-filter", "json"]}
+tracing-subscriber = { version = "0.3.7", features = ["fmt", "env-filter", "json"]}
 eyre = "0.6.6"
 color-eyre = "0.6"
 oneline-eyre = "0.1"

diff --git a/relayer-cli/src/commands/tx/client.rs b/relayer-cli/src/commands/tx/client.rs
@@ -27,18 +27,18 @@ pub struct TxCreateClientCmd {
 
     /// Override the default clock drift specified in the configuration.
     ///
-    /// The clock drift is a correction parameter dealing with only approximately synchronized clocks.
-    /// The local clock should always be ahead of timestamps from the blockchain; this
-    /// is the maximum amount that the local clock may drift behind a timestamp from the
-    /// blockchain.
+    /// The clock drift is a correction parameter. It helps deal with clocks
+    /// that are only approximately synchronized between the source and destination chains
+    /// of this client.
+    /// The destination chain for this client uses the clock drift parameter when deciding
+    /// to accept or reject a new header (originating from the source chain) for this client.
     #[clap(short = 'd', long)]
     clock_drift: Option<humantime::Duration>,
 
     /// Override the trusting period specified in the config.
     ///
     /// The trusting period specifies how long a validator set is trusted for
     /// (must be shorter than the chain's unbonding period).
-
     #[clap(short = 'p', long)]
     trusting_period: Option<humantime::Duration>,
 

diff --git a/relayer-rest/Cargo.toml b/relayer-rest/Cargo.toml
@@ -19,7 +19,7 @@ ibc-relayer       = { version = "0.11.0", path = "../relayer" }
 
 crossbeam-channel = "0.5"
 rouille           = "3.5"
-serde             = "1.0.135"
+serde             = "1.0"
 tracing           = "0.1"
 
 [dev-dependencies]

diff --git a/relayer/Cargo.toml b/relayer/Cargo.toml
@@ -94,7 +94,7 @@ version = "=0.23.5"
 ibc = { version = "0.11.0", path = "../modules", features = ["mocks"] }
 serial_test = "0.5.0"
 env_logger = "0.9.0"
-tracing-subscriber = { version = "0.3.6", features = ["fmt", "env-filter", "json"] }
+tracing-subscriber = { version = "0.3.7", features = ["fmt", "env-filter", "json"] }
 test-log = { version = "0.2.8", features = ["trace"] }
 
 # Needed for generating (synthetic) light blocks.

diff --git a/relayer/src/config.rs b/relayer/src/config.rs
@@ -389,10 +389,12 @@ pub struct ChainConfig {
     #[serde(default)]
     pub max_tx_size: MaxTxSize,
 
-    /// A correction parameter dealing with only approximately synchronized clocks.
-    /// The local clock should always be ahead of timestamps from the blockchain; this
-    /// is the maximum amount that the local clock may drift behind a timestamp from the
-    /// blockchain.
+    /// A correction parameter that helps deal with clocks that are only approximately synchronized
+    /// between the source and destination chains for a client.
+    /// This parameter is used when deciding to accept or reject a new header
+    /// (originating from the source chain) for any client with the destination chain
+    /// that uses this configuration, unless it is overridden by the client-specific
+    /// clock drift option.
     #[serde(default = "default::clock_drift", with = "humantime_serde")]
     pub clock_drift: Duration,
 

diff --git a/tools/integration-test/Cargo.toml b/tools/integration-test/Cargo.toml
@@ -23,7 +23,7 @@ tendermint-rpc  = { version = "=0.23.5", features = ["http-client", "websocket-c
 
 tokio = { version = "1.0", features = ["full"] }
 tracing = "0.1.26"
-tracing-subscriber = "0.3.6"
+tracing-subscriber = "0.3.7"
 eyre = "0.6.6"
 color-eyre = "0.6"
 rand = "0.8.4"