Update to tendermint =0.23.2 and remove chrono (#1665)

* Bump tendermint-rs versions to 0.23.2

* modules: Replaced uses of chrono with time-rs

Update to the related changes in tendermint API.

* relayer: Removed uses of chrono

* no-std-check: Remove chrono

.changelog/unreleased/breaking-changes/1665-tendermint-0.23.2.md

@@ -0,0 +1,2 @@
+- Pin tendermint-rs dependencies to =0.23.2
+  ([#1665](https://github.com/informalsystems/ibc-rs/pull/1665))

.changelog/unreleased/breaking-changes/ibc/1665-remove-chrono.md

@@ -0,0 +1,4 @@
+- Remove `Timestamp` API that depended on the `chrono` crate:
+  ([#1665](https://github.com/informalsystems/ibc-rs/pull/1665)):
+  - `Timestamp::from_datetime`; use `From<tendermint::Time>`
+  - `Timestamp::as_datetime`, superseded by `Timestamp::into_datetime`

.changelog/unreleased/improvements/ibc/1665-remove-chrono.md

@@ -0,0 +1,4 @@
+- More conventional ad-hoc conversion methods on `Timestamp`
+  ([#1665](https://github.com/informalsystems/ibc-rs/pull/1665)):
+  - `Timestamp::nanoseconds` replaces `Timestamp::as_nanoseconds`
+  - `Timestamp::into_datetime` substitutes `Timestamp::as_datetime`

Cargo.toml

@@ -18,8 +18,15 @@ exclude = [
 ]
 
 # [patch.crates-io]
-# tendermint              = { git = "https://github.com/informalsystems/tendermint-rs", branch = "master" }
-# tendermint-rpc          = { git = "https://github.com/informalsystems/tendermint-rs", branch = "master" }
-# tendermint-proto        = { git = "https://github.com/informalsystems/tendermint-rs", branch = "master" }
-# tendermint-light-client = { git = "https://github.com/informalsystems/tendermint-rs", branch = "master" }
-# tendermint-testgen      = { git = "https://github.com/informalsystems/tendermint-rs", branch = "master" }
+# tendermint              = { git = "https://github.com/informalsystems/tendermint-rs", branch = "v0.23.x" }
+# tendermint-rpc          = { git = "https://github.com/informalsystems/tendermint-rs", branch = "v0.23.x" }
+# tendermint-proto        = { git = "https://github.com/informalsystems/tendermint-rs", branch = "v0.23.x" }
+# tendermint-light-client = { git = "https://github.com/informalsystems/tendermint-rs", branch = "v0.23.x" }
+# tendermint-testgen      = { git = "https://github.com/informalsystems/tendermint-rs", branch = "v0.23.x" }
+
+# [patch.crates-io]
+# 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-testgen      = { path = "../tendermint-rs/testgen" }

ci/no-std-check/Cargo.toml

@@ -16,7 +16,6 @@ sp-std = { version = "3.0.0", default-features = false, optional = true }
 
 # Dependencies that support no_std
 bytes = { version = "1.0.1", default-features = false }
-chrono = { version = "0.4.19", default-features = false }
 contracts = { version = "0.4.0", default-features = false }
 crossbeam-channel = { version = "0.5.1", default-features = false }
 ed25519 = { version = "1.2.0", default-features = false, features = ["serde"] }

ci/no-std-check/src/lib.rs

@@ -25,7 +25,6 @@ use sp_std;
 // Supported Imports
 
 use bytes;
-use chrono;
 use contracts;
 use crossbeam_channel;
 use ed25519;

modules/Cargo.toml

@@ -27,7 +27,7 @@ mocks = ["tendermint-testgen"]
 # Proto definitions for all IBC-related interfaces, e.g., connections or channels.
 ibc-proto = { version = "0.13.0", path = "../proto" }
 ics23 = { version = "0.6.7", default-features = false }
-chrono = { version = "0.4.19", default-features = false }
+time = { version = "0.3", default-features = false }
 thiserror = { version = "1.0.30", default-features = false }
 serde_derive = { version = "1.0.104", default-features = false }
 serde = { version = "1.0", default-features = false }
@@ -42,17 +42,17 @@ sha2 = { version = "0.10.0", default-features = false }
 flex-error = { version = "0.4.4", default-features = false }
 
 [dependencies.tendermint]
-version = "=0.23.1"
+version = "=0.23.2"
 
 [dependencies.tendermint-proto]
-version = "=0.23.1"
+version = "=0.23.2"
 
 [dependencies.tendermint-light-client]
-version = "=0.23.1"
+version = "=0.23.2"
 default-features = false
 
 [dependencies.tendermint-testgen]
-version = "=0.23.1"
+version = "=0.23.2"
 optional = true
 
 [dev-dependencies]
@@ -61,8 +61,8 @@ tracing-subscriber = { version = "0.3.3", features = ["fmt", "env-filter", "json
 test-log = { version = "0.2.8", features = ["trace"] }
 modelator = "0.4.1"
 sha2 = { version = "0.10.0" }
-tendermint-rpc = { version = "=0.23.1", features = ["http-client", "websocket-client"] }
-tendermint-testgen = { version = "=0.23.1" } # Needed for generating (synthetic) light blocks.
+tendermint-rpc = { version = "=0.23.2", features = ["http-client", "websocket-client"] }
+tendermint-testgen = { version = "=0.23.2" } # Needed for generating (synthetic) light blocks.
 
 [[test]]
 name = "mbt"

modules/src/applications/ics20_fungible_token_transfer/msgs/transfer.rs

@@ -92,7 +92,7 @@ impl From<MsgTransfer> for RawMsgTransfer {
             sender: domain_msg.sender.to_string(),
             receiver: domain_msg.receiver.to_string(),
             timeout_height: Some(domain_msg.timeout_height.into()),
-            timeout_timestamp: domain_msg.timeout_timestamp.as_nanoseconds(),
+            timeout_timestamp: domain_msg.timeout_timestamp.nanoseconds(),
         }
     }
 }

modules/src/clients/ics07_tendermint/client_def.rs

@@ -1,9 +1,9 @@
 use std::convert::TryInto;
 
 use ibc_proto::ibc::core::commitment::v1::MerkleProof;
-use tendermint::Time;
 use tendermint_light_client::components::verifier::{ProdVerifier, Verdict, Verifier};
 use tendermint_light_client::types::{TrustedBlockState, UntrustedBlockState};
+use time::OffsetDateTime;
 
 use crate::clients::ics07_tendermint::client_state::ClientState;
 use crate::clients::ics07_tendermint::consensus_state::ConsensusState;
@@ -107,7 +107,7 @@ impl ClientDef for TendermintClient {
             untrusted_state,
             trusted_state,
             &options,
-            Time(chrono::Utc::now()),
+            OffsetDateTime::now_utc().try_into().unwrap(),
         );
 
         match verdict {

modules/src/clients/ics07_tendermint/consensus_state.rs

@@ -2,9 +2,9 @@ use crate::prelude::*;
 
 use core::convert::Infallible;
 
-use chrono::{TimeZone, Utc};
 use serde::Serialize;
 use tendermint::{hash::Algorithm, time::Time, Hash};
+use tendermint_proto::google::protobuf as tpb;
 use tendermint_proto::Protobuf;
 
 use ibc_proto::ibc::lightclients::tendermint::v1::ConsensusState as RawConsensusState;
@@ -58,9 +58,15 @@ impl TryFrom<RawConsensusState> for ConsensusState {
     type Error = Error;
 
     fn try_from(raw: RawConsensusState) -> Result<Self, Self::Error> {
-        let proto_timestamp = raw
+        let prost_types::Timestamp { seconds, nanos } = raw
             .timestamp
             .ok_or_else(|| Error::invalid_raw_consensus_state("missing timestamp".into()))?;
+        // FIXME: shunts like this are necessary due to
+        // https://github.com/informalsystems/tendermint-rs/issues/1053
+        let proto_timestamp = tpb::Timestamp { seconds, nanos };
+        let timestamp = proto_timestamp
+            .try_into()
+            .map_err(|e| Error::invalid_raw_consensus_state(format!("invalid timestamp: {}", e)))?;
 
         Ok(Self {
             root: raw
@@ -70,9 +76,7 @@ impl TryFrom<RawConsensusState> for ConsensusState {
                 })?
                 .hash
                 .into(),
-            timestamp: Utc
-                .timestamp(proto_timestamp.seconds, proto_timestamp.nanos as u32)
-                .into(),
+            timestamp,
             next_validators_hash: Hash::from_bytes(Algorithm::Sha256, &raw.next_validators_hash)
                 .map_err(|e| Error::invalid_raw_consensus_state(e.to_string()))?,
         })
@@ -81,10 +85,10 @@ impl TryFrom<RawConsensusState> for ConsensusState {
 
 impl From<ConsensusState> for RawConsensusState {
     fn from(value: ConsensusState) -> Self {
-        let timestamp = prost_types::Timestamp {
-            seconds: value.timestamp.0.timestamp(),
-            nanos: value.timestamp.0.timestamp_subsec_nanos() as i32,
-        };
+        // FIXME: shunts like this are necessary due to
+        // https://github.com/informalsystems/tendermint-rs/issues/1053
+        let tpb::Timestamp { seconds, nanos } = value.timestamp.into();
+        let timestamp = prost_types::Timestamp { seconds, nanos };
 
         RawConsensusState {
             timestamp: Some(timestamp),

modules/src/clients/ics07_tendermint/header.rs

@@ -1,7 +1,6 @@
 use core::cmp::Ordering;
 
 use bytes::Buf;
-use chrono::DateTime;
 use prost::Message;
 use serde_derive::{Deserialize, Serialize};
 use tendermint::block::signed_header::SignedHeader;
@@ -78,7 +77,7 @@ impl crate::core::ics02_client::header::Header for Header {
     }
 
     fn timestamp(&self) -> Timestamp {
-        Timestamp::from_datetime(DateTime::from(self.signed_header.header.time))
+        self.signed_header.header.time.into()
     }
 
     fn wrap_any(self) -> AnyHeader {

modules/src/core/ics02_client/client_consensus.rs

@@ -3,8 +3,6 @@ use crate::prelude::*;
 use core::convert::Infallible;
 use core::marker::{Send, Sync};
 
-use chrono::{DateTime, Utc};
-
 use ibc_proto::ibc::core::client::v1::ConsensusStateWithHeight;
 use prost_types::Any;
 use serde::Serialize;
@@ -55,10 +53,7 @@ pub enum AnyConsensusState {
 impl AnyConsensusState {
     pub fn timestamp(&self) -> Timestamp {
         match self {
-            Self::Tendermint(cs_state) => {
-                let date: DateTime<Utc> = cs_state.timestamp.into();
-                Timestamp::from_datetime(date)
-            }
+            Self::Tendermint(cs_state) => cs_state.timestamp.into(),
 
             #[cfg(any(test, feature = "mocks"))]
             Self::Mock(mock_state) => mock_state.timestamp(),

modules/src/core/ics04_channel/events.rs

@@ -294,7 +294,7 @@ impl TryFrom<Packet> for Vec<Tag> {
             key: PKT_TIMEOUT_TIMESTAMP_ATTRIBUTE_KEY.parse().unwrap(),
             value: p
                 .timeout_timestamp
-                .as_nanoseconds()
+                .nanoseconds()
                 .to_string()
                 .parse()
                 .unwrap(),
@@ -960,7 +960,7 @@ mod tests {
             destination_channel: "b_test_channel".parse().unwrap(),
             data: "test_data".as_bytes().to_vec(),
             timeout_height: Height::new(1, 10),
-            timeout_timestamp: Timestamp::from_datetime(chrono::offset::Utc::now()),
+            timeout_timestamp: Timestamp::now(),
         };
         let mut abci_events = vec![];
         let send_packet = SendPacket {