rename field in StarknetCommitmentProof

informalsystems · Feb 1, 2025 · cb4fa8d · cb4fa8d
1 parent 7722d4d
commit cb4fa8d
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 20 deletions.
diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/ack_commitment.rs b/relayer/crates/starknet-chain-components/src/impls/queries/ack_commitment.rs
@@ -98,7 +98,7 @@ where
         let chain_status = chain.query_chain_status().await?;
 
         // hack(rano): passing block hash to message builder
-        let membership_proof_message = MembershipVerifierContainer {
+        let unsigned_membership_proof_bytes = MembershipVerifierContainer {
             state_root: chain_status.block_hash.to_bytes_be().to_vec(),
             prefix: chain.ibc_commitment_prefix().clone(),
             path: Path::Ack(AckPath::new(port_id, channel_id, *sequence))
@@ -111,7 +111,7 @@ where
         // TODO(rano): how to get the proof?
         let dummy_proof = StarknetCommitmentProof {
             proof_height: chain_status.height,
-            proof_bytes: membership_proof_message,
+            unsigned_membership_proof_bytes,
         };
 
         Ok((ack_bytes, dummy_proof))

diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/channel_end.rs b/relayer/crates/starknet-chain-components/src/impls/queries/channel_end.rs
@@ -122,7 +122,7 @@ where
         let chain_status = chain.query_chain_status().await?;
 
         // hack(rano): passing block hash to message builder
-        let membership_proof_message = MembershipVerifierContainer {
+        let unsigned_membership_proof_bytes = MembershipVerifierContainer {
             state_root: chain_status.block_hash.to_bytes_be().to_vec(),
             prefix: chain.ibc_commitment_prefix().clone(),
             path: Path::ChannelEnd(ChannelEndPath::new(port_id, channel_id))
@@ -135,7 +135,7 @@ where
         // TODO(rano): how to get the proof?
         let dummy_proof = StarknetCommitmentProof {
             proof_height: chain_status.height,
-            proof_bytes: membership_proof_message,
+            unsigned_membership_proof_bytes,
         };
 
         Ok((channel_end, dummy_proof))

diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/client_state.rs b/relayer/crates/starknet-chain-components/src/impls/queries/client_state.rs
@@ -103,7 +103,7 @@ where
 
         let proof = StarknetCommitmentProof {
             proof_height: *query_height,
-            proof_bytes: Vec::new(),
+            unsigned_membership_proof_bytes: Vec::new(),
         };
 
         Ok((client_state, proof))

diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/connection_end.rs b/relayer/crates/starknet-chain-components/src/impls/queries/connection_end.rs
@@ -110,7 +110,7 @@ where
         let chain_status = chain.query_chain_status().await?;
 
         // hack(rano): passing block hash to message builder
-        let membership_proof_message = MembershipVerifierContainer {
+        let unsigned_membership_proof_bytes = MembershipVerifierContainer {
             state_root: chain_status.block_hash.to_bytes_be().to_vec(),
             prefix: chain.ibc_commitment_prefix().clone(),
             path: Path::Connection(ConnectionPath::new(connection_id))
@@ -124,7 +124,7 @@ where
         let dummy_proof = StarknetCommitmentProof {
             proof_height: chain_status.height,
             // FIXME(hack) we are passing msg hash as proof as we don't have access to signer
-            proof_bytes: membership_proof_message,
+            unsigned_membership_proof_bytes,
         };
 
         Ok((connection_end, dummy_proof))

diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/consensus_state.rs b/relayer/crates/starknet-chain-components/src/impls/queries/consensus_state.rs
@@ -129,7 +129,7 @@ where
 
         let proof = StarknetCommitmentProof {
             proof_height: *query_height,
-            proof_bytes: Vec::new(),
+            unsigned_membership_proof_bytes: Vec::new(),
         };
 
         Ok((consensus_state, proof))

diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/packet_commitment.rs b/relayer/crates/starknet-chain-components/src/impls/queries/packet_commitment.rs
@@ -97,7 +97,7 @@ where
         let chain_status = chain.query_chain_status().await?;
 
         // hack(rano): passing block hash to message builder
-        let membership_proof_message = MembershipVerifierContainer {
+        let unsigned_membership_proof_bytes = MembershipVerifierContainer {
             state_root: chain_status.block_hash.to_bytes_be().to_vec(),
             prefix: chain.ibc_commitment_prefix().clone(),
             path: Path::Commitment(CommitmentPath::new(port_id, channel_id, *sequence))
@@ -110,7 +110,7 @@ where
         // TODO(rano): how to get the proof?
         let dummy_proof = StarknetCommitmentProof {
             proof_height: chain_status.height,
-            proof_bytes: membership_proof_message,
+            unsigned_membership_proof_bytes,
         };
 
         Ok((commitment_bytes, dummy_proof))

diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/packet_receipt.rs b/relayer/crates/starknet-chain-components/src/impls/queries/packet_receipt.rs
@@ -97,7 +97,7 @@ where
         let chain_status = chain.query_chain_status().await?;
 
         // hack(rano): passing block hash to message builder
-        let membership_proof_message = MembershipVerifierContainer {
+        let unsigned_membership_proof_bytes = MembershipVerifierContainer {
             state_root: chain_status.block_hash.to_bytes_be().to_vec(),
             prefix: chain.ibc_commitment_prefix().clone(),
             path: Path::Receipt(ReceiptPath::new(port_id, channel_id, *sequence))
@@ -110,7 +110,7 @@ where
         // TODO(rano): how to get the proof?
         let dummy_proof = StarknetCommitmentProof {
             proof_height: chain_status.height,
-            proof_bytes: membership_proof_message,
+            unsigned_membership_proof_bytes,
         };
 
         Ok((receipt_bytes, dummy_proof))

diff --git a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/channel_message.rs b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/channel_message.rs
@@ -85,7 +85,11 @@ where
 
         let proof_init = chain
             .get_default_signer()
-            .sign(&counterparty_payload.proof_init.proof_bytes)
+            .sign(
+                &counterparty_payload
+                    .proof_init
+                    .unsigned_membership_proof_bytes,
+            )
             .map_err(Chain::raise_error)?;
 
         let message = CosmosChannelOpenTryMessage {
@@ -131,7 +135,11 @@ where
 
         let proof_try = chain
             .get_default_signer()
-            .sign(&counterparty_payload.proof_try.proof_bytes)
+            .sign(
+                &counterparty_payload
+                    .proof_try
+                    .unsigned_membership_proof_bytes,
+            )
             .map_err(Chain::raise_error)?;
 
         let message = CosmosChannelOpenAckMessage {
@@ -174,7 +182,11 @@ where
 
         let proof_ack = chain
             .get_default_signer()
-            .sign(&counterparty_payload.proof_ack.proof_bytes)
+            .sign(
+                &counterparty_payload
+                    .proof_ack
+                    .unsigned_membership_proof_bytes,
+            )
             .map_err(Chain::raise_error)?;
 
         let message = CosmosChannelOpenConfirmMessage {

diff --git a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/connection_message.rs b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/connection_message.rs
@@ -123,7 +123,11 @@ where
 
         let proof_init = chain
             .get_default_signer()
-            .sign(&counterparty_payload.proof_init.proof_bytes)
+            .sign(
+                &counterparty_payload
+                    .proof_init
+                    .unsigned_membership_proof_bytes,
+            )
             .map_err(Chain::raise_error)?;
 
         let message = CosmosConnectionOpenTryMessage {
@@ -182,7 +186,11 @@ where
 
         let proof_try = chain
             .get_default_signer()
-            .sign(&counterparty_payload.proof_try.proof_bytes)
+            .sign(
+                &counterparty_payload
+                    .proof_try
+                    .unsigned_membership_proof_bytes,
+            )
             .map_err(Chain::raise_error)?;
 
         let message = CosmosConnectionOpenAckMessage {
@@ -229,7 +237,11 @@ where
 
         let proof_ack = chain
             .get_default_signer()
-            .sign(&counterparty_payload.proof_ack.proof_bytes)
+            .sign(
+                &counterparty_payload
+                    .proof_ack
+                    .unsigned_membership_proof_bytes,
+            )
             .map_err(Chain::raise_error)?;
 
         let message = CosmosConnectionOpenConfirmMessage {

diff --git a/relayer/crates/starknet-chain-components/src/impls/types/commitment_proof.rs b/relayer/crates/starknet-chain-components/src/impls/types/commitment_proof.rs
@@ -28,6 +28,7 @@ where
     Chain: HasCommitmentProofType<CommitmentProof = StarknetCommitmentProof>,
 {
     fn commitment_proof_bytes(proof: &StarknetCommitmentProof) -> &[u8] {
-        &proof.proof_bytes
+        // FIXME: this is not the actual commitment proof bytes
+        &proof.unsigned_membership_proof_bytes
     }
 }
diff --git a/relayer/crates/starknet-chain-components/src/types/commitment_proof.rs b/relayer/crates/starknet-chain-components/src/types/commitment_proof.rs
@@ -1,4 +1,4 @@
 pub struct StarknetCommitmentProof {
     pub proof_height: u64,
-    pub proof_bytes: Vec<u8>,
+    pub unsigned_membership_proof_bytes: Vec<u8>,
 }