From 2e8d8390f731866d30d37627fc66925f4b381fda Mon Sep 17 00:00:00 2001
From: Mikhail Zabaluev <mikhail@informal.systems>
Date: Fri, 3 Dec 2021 15:35:17 +0200
Subject: [PATCH 1/4] Pin the abscissa version to 0.6.0-beta.1 (#1638)

Unpinned, a `cargo update` "updates" it to 0.6.0-pre.2, which is later
by semver, but not by the pre-release sequence used by abscissa.
---
 relayer-cli/Cargo.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/relayer-cli/Cargo.toml b/relayer-cli/Cargo.toml
index c17833f946..323371f895 100644
--- a/relayer-cli/Cargo.toml
+++ b/relayer-cli/Cargo.toml
@@ -71,10 +71,10 @@ version = "=0.23.1"
 features = ["unstable"]
 
 [dependencies.abscissa_core]
-version = "0.6.0-beta.1"
+version = "=0.6.0-beta.1"
 features = ["options"]
 
 [dev-dependencies]
-abscissa_core = { version = "0.6.0-beta.1", features = ["testing"] }
+abscissa_core = { version = "=0.6.0-beta.1", features = ["testing"] }
 once_cell = "1.8"
 regex = "1.5"

From 859f9dcc8a006cab21eb28bcfa7c9bbfcb46663b Mon Sep 17 00:00:00 2001
From: Mikhail Zabaluev <mikhail@informal.systems>
Date: Sun, 5 Dec 2021 14:03:54 +0200
Subject: [PATCH 2/4] Bump Rust toolchain to 1.57, fix lints (#1642)

* Bump Rust toolchain to 1.57

* Fix trivial lints introduced in clippy 0.1.57

* Box the value in SupervisorCmd::UpdateConfig

The clippy lint has a point: the enum may be too large to be efficiently
sent over a channel.

* Factor config errors out into a smaller error type

There's been a layering violation, the config module should use its own
smaller domain error. This gets rid of a clippy lint, too.

* Remove reload handles for tracing subscribers

They don't seem to be used for anything, and this triggers a clippy
lint.

* relayer-cli: Remove trivial casts in components
---
 .../clients/ics07_tendermint/client_def.rs    | 10 +---
 .../src/core/ics03_connection/connection.rs   | 12 +----
 modules/src/core/ics03_connection/events.rs   | 14 +-----
 modules/src/core/ics04_channel/channel.rs     | 11 +----
 modules/src/core/ics04_channel/events.rs      | 15 +-----
 modules/src/core/ics04_channel/packet.rs      | 10 ++--
 modules/src/timestamp.rs                      |  8 +---
 relayer-cli/src/components.rs                 | 47 ++++---------------
 relayer/src/config.rs                         | 24 ++++------
 relayer/src/config/error.rs                   | 18 +++++++
 relayer/src/config/reload.rs                  |  4 +-
 relayer/src/error.rs                          | 12 -----
 relayer/src/supervisor.rs                     |  2 +-
 relayer/src/supervisor/cmd.rs                 |  2 +-
 rust-toolchain.toml                           |  2 +-
 15 files changed, 50 insertions(+), 141 deletions(-)
 create mode 100644 relayer/src/config/error.rs

diff --git a/modules/src/clients/ics07_tendermint/client_def.rs b/modules/src/clients/ics07_tendermint/client_def.rs
index 2eace19293..351ffffa2a 100644
--- a/modules/src/clients/ics07_tendermint/client_def.rs
+++ b/modules/src/clients/ics07_tendermint/client_def.rs
@@ -29,19 +29,11 @@ use crate::Height;
 
 use crate::downcast;
 
-#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(Clone, Debug, Default, PartialEq, Eq)]
 pub struct TendermintClient {
     verifier: ProdVerifier,
 }
 
-impl Default for TendermintClient {
-    fn default() -> Self {
-        Self {
-            verifier: ProdVerifier::default(),
-        }
-    }
-}
-
 impl ClientDef for TendermintClient {
     type Header = Header;
     type ClientState = ClientState;
diff --git a/modules/src/core/ics03_connection/connection.rs b/modules/src/core/ics03_connection/connection.rs
index d03e22315e..5c379fe3f0 100644
--- a/modules/src/core/ics03_connection/connection.rs
+++ b/modules/src/core/ics03_connection/connection.rs
@@ -235,23 +235,13 @@ impl ConnectionEnd {
     }
 }
 
-#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[derive(Clone, Debug, Default, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub struct Counterparty {
     client_id: ClientId,
     pub connection_id: Option<ConnectionId>,
     prefix: CommitmentPrefix,
 }
 
-impl Default for Counterparty {
-    fn default() -> Self {
-        Counterparty {
-            client_id: Default::default(),
-            connection_id: None,
-            prefix: Default::default(),
-        }
-    }
-}
-
 impl Protobuf<RawCounterparty> for Counterparty {}
 
 // Converts from the wire format RawCounterparty. Typically used from the relayer side
diff --git a/modules/src/core/ics03_connection/events.rs b/modules/src/core/ics03_connection/events.rs
index a3a8b73b5e..1ab4dbdcd3 100644
--- a/modules/src/core/ics03_connection/events.rs
+++ b/modules/src/core/ics03_connection/events.rs
@@ -71,7 +71,7 @@ fn extract_attributes_from_tx(event: &tendermint::abci::Event) -> Result<Attribu
     Ok(attr)
 }
 
-#[derive(Debug, Deserialize, Serialize, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[derive(Debug, Default, Deserialize, Serialize, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct Attributes {
     pub height: Height,
     pub connection_id: Option<ConnectionId>,
@@ -80,18 +80,6 @@ pub struct Attributes {
     pub counterparty_client_id: ClientId,
 }
 
-impl Default for Attributes {
-    fn default() -> Self {
-        Attributes {
-            height: Default::default(),
-            connection_id: Default::default(),
-            client_id: Default::default(),
-            counterparty_connection_id: Default::default(),
-            counterparty_client_id: Default::default(),
-        }
-    }
-}
-
 /// Convert attributes to Tendermint ABCI tags
 ///
 /// # Note
diff --git a/modules/src/core/ics04_channel/channel.rs b/modules/src/core/ics04_channel/channel.rs
index 15e0ad946a..2965a08153 100644
--- a/modules/src/core/ics04_channel/channel.rs
+++ b/modules/src/core/ics04_channel/channel.rs
@@ -244,21 +244,12 @@ impl ChannelEnd {
     }
 }
 
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Counterparty {
     pub port_id: PortId,
     pub channel_id: Option<ChannelId>,
 }
 
-impl Default for Counterparty {
-    fn default() -> Self {
-        Counterparty {
-            port_id: Default::default(),
-            channel_id: None,
-        }
-    }
-}
-
 impl Counterparty {
     pub fn new(port_id: PortId, channel_id: Option<ChannelId>) -> Self {
         Self {
diff --git a/modules/src/core/ics04_channel/events.rs b/modules/src/core/ics04_channel/events.rs
index 8483df271f..972794c8a8 100644
--- a/modules/src/core/ics04_channel/events.rs
+++ b/modules/src/core/ics04_channel/events.rs
@@ -180,7 +180,7 @@ fn extract_packet_and_write_ack_from_tx(
     Ok((packet, write_ack))
 }
 
-#[derive(Debug, Deserialize, Serialize, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[derive(Debug, Default, Deserialize, Serialize, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct Attributes {
     pub height: Height,
     pub port_id: PortId,
@@ -199,19 +199,6 @@ impl Attributes {
     }
 }
 
-impl Default for Attributes {
-    fn default() -> Self {
-        Attributes {
-            height: Default::default(),
-            port_id: Default::default(),
-            channel_id: Default::default(),
-            connection_id: Default::default(),
-            counterparty_port_id: Default::default(),
-            counterparty_channel_id: Default::default(),
-        }
-    }
-}
-
 /// Convert attributes to Tendermint ABCI tags
 ///
 /// # Note
diff --git a/modules/src/core/ics04_channel/packet.rs b/modules/src/core/ics04_channel/packet.rs
index 8273cedb01..12ec013549 100644
--- a/modules/src/core/ics04_channel/packet.rs
+++ b/modules/src/core/ics04_channel/packet.rs
@@ -54,15 +54,11 @@ impl core::fmt::Display for PacketMsgType {
 }
 
 /// The sequence number of a packet enforces ordering among packets from the same source.
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Deserialize, Serialize, PartialOrd, Ord)]
+#[derive(
+    Copy, Clone, Debug, Default, PartialEq, Eq, Hash, PartialOrd, Ord, Deserialize, Serialize,
+)]
 pub struct Sequence(u64);
 
-impl Default for Sequence {
-    fn default() -> Self {
-        Sequence(0)
-    }
-}
-
 impl FromStr for Sequence {
     type Err = Error;
 
diff --git a/modules/src/timestamp.rs b/modules/src/timestamp.rs
index ece5c63e67..500ea37377 100644
--- a/modules/src/timestamp.rs
+++ b/modules/src/timestamp.rs
@@ -20,7 +20,7 @@ pub const ZERO_DURATION: Duration = Duration::from_secs(0);
 /// a `u64` value and a raw timestamp. In protocol buffer, the timestamp is
 /// represented as a `u64` Unix timestamp in nanoseconds, with 0 representing the absence
 /// of timestamp.
-#[derive(PartialEq, Eq, Copy, Clone, Debug, Deserialize, Serialize, Hash)]
+#[derive(PartialEq, Eq, Copy, Clone, Debug, Default, Deserialize, Serialize, Hash)]
 pub struct Timestamp {
     time: Option<DateTime<Utc>>,
 }
@@ -241,12 +241,6 @@ impl From<Time> for Timestamp {
     }
 }
 
-impl Default for Timestamp {
-    fn default() -> Self {
-        Timestamp { time: None }
-    }
-}
-
 pub mod util {
 
     const NANOS_PER_SEC: u64 = 1_000_000_000;
diff --git a/relayer-cli/src/components.rs b/relayer-cli/src/components.rs
index c291d5558b..d8847ee419 100644
--- a/relayer-cli/src/components.rs
+++ b/relayer-cli/src/components.rs
@@ -1,27 +1,10 @@
-use std::io;
-
 use abscissa_core::{Component, FrameworkError, FrameworkErrorKind};
-use tracing_subscriber::{
-    filter::EnvFilter,
-    fmt::{
-        format::{DefaultFields, Format, Full, Json, JsonFields},
-        time::SystemTime,
-        Formatter as TracingFormatter,
-    },
-    reload::Handle,
-    util::SubscriberInitExt,
-    FmtSubscriber,
-};
+use tracing_subscriber::{filter::EnvFilter, util::SubscriberInitExt, FmtSubscriber};
 
 use ibc_relayer::config::GlobalConfig;
 
 use crate::config::Error;
 
-/// Custom types to simplify the `Tracing` definition below
-type JsonFormatter = TracingFormatter<JsonFields, Format<Json, SystemTime>, StdWriter>;
-type PrettyFormatter = TracingFormatter<DefaultFields, Format<Full, SystemTime>, StdWriter>;
-type StdWriter = fn() -> io::Stderr;
-
 /// A custom component for parametrizing `tracing` in the relayer.
 /// Primarily used for:
 ///
@@ -29,13 +12,10 @@ type StdWriter = fn() -> io::Stderr;
 ///   (`debug!`, `info!`, etc.) or abscissa macros (`status_err`, `status_info`, etc.).
 /// - Enabling JSON-formatted output without coloring
 #[derive(Component, Debug)]
-pub struct JsonTracing {
-    filter_handle: Handle<EnvFilter, JsonFormatter>,
-}
+pub struct JsonTracing;
 
 impl JsonTracing {
     /// Creates a new [`JsonTracing`] component
-    #[allow(trivial_casts)]
     pub fn new(cfg: GlobalConfig) -> Result<Self, FrameworkError> {
         let filter = build_tracing_filter(cfg.log_level.to_string())?;
         // Note: JSON formatter is un-affected by ANSI 'color' option. Set to 'false'.
@@ -45,29 +25,23 @@ impl JsonTracing {
         let builder = FmtSubscriber::builder()
             .with_target(false)
             .with_env_filter(filter)
-            .with_writer(std::io::stderr as StdWriter)
+            .with_writer(std::io::stderr)
             .with_ansi(use_color)
             .with_thread_ids(true)
-            .json()
-            .with_filter_reloading();
-
-        let filter_handle = builder.reload_handle();
+            .json();
 
         let subscriber = builder.finish();
         subscriber.init();
 
-        Ok(Self { filter_handle })
+        Ok(Self)
     }
 }
 
 #[derive(Component, Debug)]
-pub struct PrettyTracing {
-    filter_handle: Handle<EnvFilter, PrettyFormatter>,
-}
+pub struct PrettyTracing;
 
 impl PrettyTracing {
     /// Creates a new [`PrettyTracing`] component
-    #[allow(trivial_casts)]
     pub fn new(cfg: GlobalConfig) -> Result<Self, FrameworkError> {
         let filter = build_tracing_filter(cfg.log_level.to_string())?;
 
@@ -75,17 +49,14 @@ impl PrettyTracing {
         let builder = FmtSubscriber::builder()
             .with_target(false)
             .with_env_filter(filter)
-            .with_writer(std::io::stderr as StdWriter)
+            .with_writer(std::io::stderr)
             .with_ansi(enable_ansi())
-            .with_thread_ids(true)
-            .with_filter_reloading();
-
-        let filter_handle = builder.reload_handle();
+            .with_thread_ids(true);
 
         let subscriber = builder.finish();
         subscriber.init();
 
-        Ok(Self { filter_handle })
+        Ok(Self)
     }
 }
 
diff --git a/relayer/src/config.rs b/relayer/src/config.rs
index bdaf137bcf..b2d29bb245 100644
--- a/relayer/src/config.rs
+++ b/relayer/src/config.rs
@@ -1,5 +1,6 @@
 //! Relayer configuration
 
+mod error;
 mod proof_specs;
 pub mod reload;
 pub mod types;
@@ -18,9 +19,10 @@ use ibc::core::ics24_host::identifier::{ChainId, ChannelId, PortId};
 use ibc::timestamp::ZERO_DURATION;
 
 use crate::config::types::{MaxMsgNum, MaxTxSize, Memo};
-use crate::error::Error;
 use crate::keyring::Store;
 
+pub use error::Error;
+
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct GasPrice {
     pub price: f64,
@@ -286,20 +288,12 @@ impl fmt::Display for LogLevel {
     }
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 #[serde(default, deny_unknown_fields)]
 pub struct GlobalConfig {
     pub log_level: LogLevel,
 }
 
-impl Default for GlobalConfig {
-    fn default() -> Self {
-        Self {
-            log_level: LogLevel::default(),
-        }
-    }
-}
-
 #[derive(Clone, Debug, Deserialize, Serialize)]
 #[serde(deny_unknown_fields)]
 pub struct TelemetryConfig {
@@ -411,9 +405,9 @@ pub struct ChainConfig {
 
 /// Attempt to load and parse the TOML config file as a `Config`.
 pub fn load(path: impl AsRef<Path>) -> Result<Config, Error> {
-    let config_toml = std::fs::read_to_string(&path).map_err(Error::config_io)?;
+    let config_toml = std::fs::read_to_string(&path).map_err(Error::io)?;
 
-    let config = toml::from_str::<Config>(&config_toml[..]).map_err(Error::config_decode)?;
+    let config = toml::from_str::<Config>(&config_toml[..]).map_err(Error::decode)?;
 
     Ok(config)
 }
@@ -425,16 +419,16 @@ pub fn store(config: &Config, path: impl AsRef<Path>) -> Result<(), Error> {
     } else {
         File::create(path)
     }
-    .map_err(Error::config_io)?;
+    .map_err(Error::io)?;
 
     store_writer(config, &mut file)
 }
 
 /// Serialize the given `Config` as TOML to the given writer.
 pub(crate) fn store_writer(config: &Config, mut writer: impl Write) -> Result<(), Error> {
-    let toml_config = toml::to_string_pretty(&config).map_err(Error::config_encode)?;
+    let toml_config = toml::to_string_pretty(&config).map_err(Error::encode)?;
 
-    writeln!(writer, "{}", toml_config).map_err(Error::config_io)?;
+    writeln!(writer, "{}", toml_config).map_err(Error::io)?;
 
     Ok(())
 }
diff --git a/relayer/src/config/error.rs b/relayer/src/config/error.rs
new file mode 100644
index 0000000000..94287b285e
--- /dev/null
+++ b/relayer/src/config/error.rs
@@ -0,0 +1,18 @@
+use flex_error::{define_error, TraceError};
+
+define_error! {
+    Error {
+        Io
+            [ TraceError<std::io::Error> ]
+            |_| { "config I/O error" },
+
+        Decode
+            [ TraceError<toml::de::Error> ]
+            |_| { "invalid configuration" },
+
+        Encode
+            [ TraceError<toml::ser::Error> ]
+            |_| { "invalid configuration" },
+
+    }
+}
diff --git a/relayer/src/config/reload.rs b/relayer/src/config/reload.rs
index b584b61c2d..944c610827 100644
--- a/relayer/src/config/reload.rs
+++ b/relayer/src/config/reload.rs
@@ -20,7 +20,7 @@ use super::{ChainConfig, Config};
 #[derive(Debug, Error)]
 pub enum Error {
     #[error("failed to load configuration from disk")]
-    LoadFailed(#[source] crate::error::Error),
+    LoadFailed(#[source] super::error::Error),
 
     #[error("configuration is inconsistent, did not find config for added/updated chain {0}")]
     InconsistentConfig(ChainId),
@@ -80,7 +80,7 @@ impl ConfigReload {
         for update in updates {
             if self
                 .tx_cmd
-                .send(SupervisorCmd::UpdateConfig(update))
+                .send(SupervisorCmd::UpdateConfig(Box::new(update)))
                 .is_err()
             {
                 debug!("failed to send config update to supervisor, channel is closed");
diff --git a/relayer/src/error.rs b/relayer/src/error.rs
index 08f3cf99ae..7ea23a23e6 100644
--- a/relayer/src/error.rs
+++ b/relayer/src/error.rs
@@ -39,22 +39,10 @@ use crate::sdk_error::SdkError;
 
 define_error! {
     Error {
-        ConfigIo
-            [ TraceError<std::io::Error> ]
-            |_| { "config I/O error" },
-
         Io
             [ TraceError<std::io::Error> ]
             |_| { "I/O error" },
 
-        ConfigDecode
-            [ TraceError<toml::de::Error> ]
-            |_| { "invalid configuration" },
-
-        ConfigEncode
-            [ TraceError<toml::ser::Error> ]
-            |_| { "invalid configuration" },
-
         Rpc
             { url: tendermint_rpc::Url }
             [ TraceClone<TendermintRpcError> ]
diff --git a/relayer/src/supervisor.rs b/relayer/src/supervisor.rs
index eb8d1b3ae9..05d6ab2aff 100644
--- a/relayer/src/supervisor.rs
+++ b/relayer/src/supervisor.rs
@@ -377,7 +377,7 @@ impl<Chain: ChainHandle + 'static> Supervisor<Chain> {
         if let Ok(cmd) = self.cmd_rx.try_recv() {
             match cmd {
                 SupervisorCmd::UpdateConfig(update) => {
-                    let effect = self.update_config(update);
+                    let effect = self.update_config(*update);
 
                     if let CmdEffect::ConfigChanged = effect {
                         match self.init_subscriptions() {
diff --git a/relayer/src/supervisor/cmd.rs b/relayer/src/supervisor/cmd.rs
index 65c02d2bfe..408230763d 100644
--- a/relayer/src/supervisor/cmd.rs
+++ b/relayer/src/supervisor/cmd.rs
@@ -14,7 +14,7 @@ pub enum ConfigUpdate {
 
 #[derive(Clone, Debug)]
 pub enum SupervisorCmd {
-    UpdateConfig(ConfigUpdate),
+    UpdateConfig(Box<ConfigUpdate>),
     DumpState(Sender<SupervisorState>),
     Stop(Sender<()>),
 }
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 7227a7d1c4..54776de993 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel    = "1.56"
+channel    = "1.57"
 components = ["rustfmt", "clippy"]

From fd65565151106c7e074a3a292b9404360b2b0d06 Mon Sep 17 00:00:00 2001
From: Dan Connolly <dckc@madmode.com>
Date: Mon, 6 Dec 2021 02:57:28 -0600
Subject: [PATCH 3/4] include SSL certificates in hermes docker image (#1647)

---
 ci/hermes.Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci/hermes.Dockerfile b/ci/hermes.Dockerfile
index a4e58a9062..cbee1188d6 100644
--- a/ci/hermes.Dockerfile
+++ b/ci/hermes.Dockerfile
@@ -25,3 +25,4 @@ ENTRYPOINT ["/usr/bin/hermes"]
 COPY --chown=0:0 --from=build-env /usr/lib/x86_64-linux-gnu/libssl.so.1.1 /usr/lib/x86_64-linux-gnu/libssl.so.1.1
 COPY --chown=0:0 --from=build-env /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1
 COPY --chown=0:0 --from=build-env /root/ibc-rs/target/release/hermes /usr/bin/hermes
+COPY --chown=0:0 --from=build-env /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt

From d18cc90e323575c5c22a80e07a3aa281f55da6db Mon Sep 17 00:00:00 2001
From: Soares Chen <soares.chen@gmail.com>
Date: Mon, 6 Dec 2021 18:57:38 +0100
Subject: [PATCH 4/4] Convert frozen height to None when raw frozen height is
 zero (#1640)

* Convert frozen height to None when raw frozen height is zero

* Fix Python E2E test
---
 e2e/e2e/client.py                                    |  2 +-
 modules/src/clients/ics07_tendermint/client_state.rs | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/e2e/e2e/client.py b/e2e/e2e/client.py
index e1819f8fe1..fd71a5ae18 100644
--- a/e2e/e2e/client.py
+++ b/e2e/e2e/client.py
@@ -60,7 +60,7 @@ class AllowUpdate:
 @dataclass
 class ClientState:
     chain_id: ChainId
-    frozen_height: Height
+    frozen_height: Optional[Height]
     latest_height: Height
     max_clock_drift: Duration
     trust_level: TrustLevel
diff --git a/modules/src/clients/ics07_tendermint/client_state.rs b/modules/src/clients/ics07_tendermint/client_state.rs
index 196152adcc..eecfcae139 100644
--- a/modules/src/clients/ics07_tendermint/client_state.rs
+++ b/modules/src/clients/ics07_tendermint/client_state.rs
@@ -200,6 +200,15 @@ impl TryFrom<RawClientState> for ClientState {
             .clone()
             .ok_or_else(Error::missing_trusting_period)?;
 
+        let frozen_height = raw.frozen_height.and_then(|raw_height| {
+            let height = raw_height.into();
+            if height == Height::zero() {
+                None
+            } else {
+                Some(height)
+            }
+        });
+
         Ok(Self {
             chain_id: ChainId::from_string(raw.chain_id.as_str()),
             trust_level: trust_level
@@ -224,7 +233,7 @@ impl TryFrom<RawClientState> for ClientState {
                 .latest_height
                 .ok_or_else(Error::missing_latest_height)?
                 .into(),
-            frozen_height: raw.frozen_height.map(|h| h.into()),
+            frozen_height,
             upgrade_path: raw.upgrade_path,
             allow_update: AllowUpdate {
                 after_expiry: raw.allow_update_after_expiry,