Merge pull request #94 from datachainlab/lc-message

Refactor commitments

Signed-off-by: Jun Kimura <[email protected]>

Author: bluele

enclave-modules/ecall-handler/src/light_client/init_client.rs

@@ -29,9 +29,9 @@ pub fn init_client<R: LightClientResolver, S: KVStore, K: Signer>(
     ctx.increase_client_counter();
 
     let proof = if res.prove {
-        prove_commitment(ek, input.signer, res.commitment)?
+        prove_commitment(ek, input.signer, res.message)?
     } else {
-        CommitmentProof::new_with_no_signature(res.commitment.to_commitment_bytes())
+        CommitmentProof::new_with_no_signature(res.message.to_bytes())
     };
     Ok(LightClientResult::InitClient(InitClientResult {
         client_id,

enclave-modules/ecall-handler/src/light_client/update_client.rs

@@ -1,10 +1,11 @@
 use super::registry::get_light_client_by_client_id;
 use crate::light_client::Error;
+use crate::prelude::*;
 use context::Context;
 use crypto::Signer;
 use ecall_commands::{LightClientResult, UpdateClientInput, UpdateClientResult};
 use light_client::commitments::{
-    prove_commitment, Commitment, CommitmentProof, UpdateClientCommitment,
+    prove_commitment, CommitmentProof, EmittedState, Message, UpdateClientMessage,
 };
 use light_client::{ClientKeeper, LightClientResolver};
 use store::KVStore;
@@ -19,21 +20,24 @@ pub fn update_client<R: LightClientResolver, S: KVStore, K: Signer>(
     let ek = ctx.get_enclave_key();
     let res = lc.update_client(ctx, input.client_id.clone(), input.any_header.into())?;
 
-    let commitment: Commitment = {
-        let mut commitment = UpdateClientCommitment::try_from(res.commitment)?;
-        if input.include_state && commitment.new_state.is_none() {
-            commitment.new_state = Some(res.new_any_client_state.clone());
+    let message: Message = {
+        let mut msg = UpdateClientMessage::try_from(res.message)?;
+        if input.include_state && !msg.emitted_states.is_empty() {
+            msg.emitted_states = vec![EmittedState(
+                res.height,
+                res.new_any_consensus_state.clone(),
+            )];
         }
-        commitment.into()
+        msg.into()
     };
 
     ctx.store_any_client_state(input.client_id.clone(), res.new_any_client_state)?;
     ctx.store_any_consensus_state(input.client_id, res.height, res.new_any_consensus_state)?;
 
     let proof = if res.prove {
-        prove_commitment(ek, input.signer, commitment)?
+        prove_commitment(ek, input.signer, message)?
     } else {
-        CommitmentProof::new_with_no_signature(commitment.to_commitment_bytes())
+        CommitmentProof::new_with_no_signature(message.to_bytes())
     };
     Ok(LightClientResult::UpdateClient(UpdateClientResult(proof)))
 }

enclave-modules/ecall-handler/src/light_client/verify_state.rs

@@ -28,7 +28,7 @@ pub fn verify_membership<R: LightClientResolver, S: KVStore, K: Signer>(
     )?;
 
     Ok(LightClientResult::VerifyMembership(VerifyMembershipResult(
-        prove_commitment(ek, input.signer, res.state_commitment)?,
+        prove_commitment(ek, input.signer, res.message)?,
     )))
 }
 
@@ -49,6 +49,6 @@ pub fn verify_non_membership<R: LightClientResolver, S: KVStore, K: Signer>(
     )?;
 
     Ok(LightClientResult::VerifyNonMembership(
-        VerifyNonMembershipResult(prove_commitment(ek, input.signer, res.state_commitment)?),
+        VerifyNonMembershipResult(prove_commitment(ek, input.signer, res.message)?),
     ))
 }