Set upgrade client state latest height rev number to new chain-id

informalsystems · Feb 2, 2023 · 5235a95 · 5235a95
1 parent 097c5df
commit 5235a95
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/crates/relayer-types/src/core/ics02_client/height.rs b/crates/relayer-types/src/core/ics02_client/height.rs
@@ -15,7 +15,7 @@ use crate::core::ics02_client::error::Error;
 #[derive(Copy, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub struct Height {
     /// Previously known as "epoch"
-    revision_number: u64,
+    pub revision_number: u64,
 
     /// The height of a block
     revision_height: u64,

diff --git a/crates/relayer/src/upgrade_chain.rs b/crates/relayer/src/upgrade_chain.rs
@@ -68,10 +68,11 @@ pub fn build_and_send_ibc_upgrade_proposal(
     src_chain: impl ChainHandle, // the source chain; supplies a client state for building the upgrade plan
     opts: &UpgradePlanOptions,
 ) -> Result<TxHash, UpgradeChainError> {
-    let upgrade_height = dst_chain
+    let mut upgrade_height = dst_chain
         .query_latest_height() // FIXME(romac): Use query_chain_latest_height once added to ChainHandle
         .map_err(UpgradeChainError::query)?
         .add(opts.height_offset);
+    upgrade_height.revision_number = opts.upgraded_chain_id.version();
 
     let (client_state, _) = src_chain
         .query_client_state(