Fix review comments

Author: kvinwang

crates/phactory/src/contracts/pink.rs

@@ -161,7 +161,7 @@ impl contracts::NativeContract for Pink {
 
 impl NativeContractMore for Pink {
     fn id(&self) -> contracts::NativeContractId {
-        Pink::address_to_id(&self.instance.address).into()
+        Pink::address_to_id(&self.instance.address)
     }
 
     fn set_on_block_end_selector(&mut self, selector: u32) {

crates/phactory/src/contracts/support.rs

@@ -65,10 +65,8 @@ impl From<&[u8; 32]> for NativeContractId {
 }
 
 impl NativeContractId {
-    pub fn to_contract_id(&self, group: &phala_mq::ContractGroupId) -> phala_mq::ContractId {
-        let mut buffer = group.encode();
-        self.0.encode_to(&mut buffer);
-        sp_core::blake2_256(&buffer).into()
+    pub fn to_contract_id(&self, group_id: &phala_mq::ContractGroupId) -> phala_mq::ContractId {
+        sp_core::blake2_256(&(group_id, &self.0).encode()).into()
     }
 }
 
@@ -109,10 +107,8 @@ pub struct NativeContractWrapper<Con> {
 
 impl<Con> NativeContractWrapper<Con> {
     pub fn new(inner: Con, deployer: sp_core::H256, salt: &[u8], id: u32) -> Self {
-        let mut buffer = deployer.encode();
-        buffer.extend_from_slice(&id.to_be_bytes());
-        buffer.extend_from_slice(salt);
-        let id = sp_core::blake2_256(&buffer).into();
+        let encoded = (deployer, id, salt).encode();
+        let id = sp_core::blake2_256(&encoded).into();
         NativeContractWrapper { inner, id }
     }
 }

crates/phactory/src/system/mod.rs

@@ -856,15 +856,16 @@ impl<Platform: pal::Platform> System<Platform> {
                 use contracts::*;
                 let salt = contract_info.salt;
                 let deployer = phala_types::messaging::AccountId(contract_info.deployer.into());
+                let ecdh_key = contract_key
+                    .0
+                    .derive_ecdh_key()
+                    .or(Err(anyhow::anyhow!("Invalid contract key")))?;
 
                 macro_rules! match_and_install_contract {
                     ($(($id: path => $contract: expr)),*) => {{
                         match contract_id {
                             $(
                                 $id => {
-                                    let ecdh_key = contract_key
-                                        .derive_ecdh_key()
-                                        .expect("Derive ecdh_key should not fail");
                                     let contract = NativeContractWrapper::new(
                                         $contract,
                                         deployer,
@@ -891,10 +892,7 @@ impl<Platform: pal::Platform> System<Platform> {
                     }};
                 }
 
-                let ecdh_key = contract_key
-                    .0
-                    .derive_ecdh_key()
-                    .or(Err(anyhow::anyhow!("Invalid contract key")))?;
+                let ecdh_pubkey = ecdh_key.public();
 
                 let contract_id = match_and_install_contract! {
                     (DATA_PLAZA => data_plaza::DataPlaza::new()),
@@ -913,7 +911,7 @@ impl<Platform: pal::Platform> System<Platform> {
                     id: contract_id,
                     group_id,
                     deployer,
-                    pubkey: EcdhPublicKey(ecdh_key.public()),
+                    pubkey: EcdhPublicKey(ecdh_pubkey),
                 };
                 info!("Native contract instantiate status: {:?}", message);
                 self.egress.push_message(&message);