fix: use raw bool instead of HasPacketReceiptReturn (#1829)

unionlabs · Apr 26, 2024 · db68149 · db68149
2 parents 9e7ff3e + f091f2f
commit db68149
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 21 deletions.
diff --git a/generated/rust/protos/src/union.ibc.lightclients.scroll.v1.rs b/generated/rust/protos/src/union.ibc.lightclients.scroll.v1.rs
diff --git a/lib/chain-utils/src/ethereum.rs b/lib/chain-utils/src/ethereum.rs
@@ -690,7 +690,7 @@ impl_eth_call_ext! {
     GetChannelCall                               -> GetChannelReturn;
     GetHashedPacketCommitmentCall                -> GetHashedPacketCommitmentReturn;
     GetHashedPacketAcknowledgementCommitmentCall -> GetHashedPacketAcknowledgementCommitmentReturn;
-    HasPacketReceiptCall                         -> HasPacketReceiptReturn;
+    HasPacketReceiptCall                         -> bool;
     NextConnectionSequenceCall                   -> u64;
     NextClientSequenceCall                       -> u64;
 }
@@ -876,7 +876,7 @@ where
     }
 
     fn decode_ibc_state(encoded: <Self::EthCall as EthCallExt>::Return) -> Self::Value {
-        encoded.0
+        encoded
     }
 }
 

diff --git a/lib/chain-utils/src/scroll.rs b/lib/chain-utils/src/scroll.rs
@@ -293,7 +293,6 @@ impl Chain for Scroll {
             .unwrap();
 
         scroll::consensus_state::ConsensusState {
-            batch_index,
             ibc_storage_root: storage_root.into(),
             // Normalize to nanoseconds to be ibc-go compliant
             timestamp: self

diff --git a/lib/unionlabs/src/ibc/lightclients/scroll/consensus_state.rs b/lib/unionlabs/src/ibc/lightclients/scroll/consensus_state.rs
@@ -8,15 +8,13 @@ use crate::{errors::InvalidLength, hash::H256};
     from
 ))]
 pub struct ConsensusState {
-    pub batch_index: u64,
     pub ibc_storage_root: H256,
     pub timestamp: u64,
 }
 
 impl From<ConsensusState> for protos::union::ibc::lightclients::scroll::v1::ConsensusState {
     fn from(value: ConsensusState) -> Self {
         Self {
-            batch_index: value.batch_index,
             ibc_storage_root: value.ibc_storage_root.into(),
             timestamp: value.timestamp,
         }
@@ -35,7 +33,6 @@ impl TryFrom<protos::union::ibc::lightclients::scroll::v1::ConsensusState> for C
         value: protos::union::ibc::lightclients::scroll::v1::ConsensusState,
     ) -> Result<Self, Self::Error> {
         Ok(Self {
-            batch_index: value.batch_index,
             ibc_storage_root: value
                 .ibc_storage_root
                 .try_into()

diff --git a/light-clients/scroll-light-client/src/client.rs b/light-clients/scroll-light-client/src/client.rs
@@ -171,21 +171,15 @@ impl IbcClient for ScrollLightClient {
             update_client_state(deps.branch(), client_state, header.last_batch_index);
         }
 
-        let updated_height = Height {
-            // TODO: Extract into a constant
-            revision_number: 0,
-            revision_height: header.last_batch_index,
-        };
         let consensus_state = WasmConsensusState {
             data: ConsensusState {
-                batch_index: header.last_batch_index,
                 ibc_storage_root: header.l2_ibc_account_proof.storage_root,
                 // must be nanos
                 timestamp: 1_000_000_000 * timestamp,
             },
         };
-        save_consensus_state(deps, consensus_state, &updated_height);
-        Ok(vec![updated_height])
+        save_consensus_state(deps, consensus_state, &header.l1_height);
+        Ok(vec![header.l1_height])
     }
 
     fn update_state_on_misbehaviour(

diff --git a/uniond/proto/union/ibc/lightclients/scroll/v1/scroll.proto b/uniond/proto/union/ibc/lightclients/scroll/v1/scroll.proto
@@ -21,9 +21,8 @@ message ClientState {
 }
 
 message ConsensusState {
-  uint64 batch_index = 1;
-  bytes ibc_storage_root = 2;
-  uint64 timestamp = 3;
+  bytes ibc_storage_root = 1;
+  uint64 timestamp = 2;
 }
 
 message Header {