Log code hash if contract is already uploaded. (use-ink#805)

* Log code hash if contract is already uploaded.

* Reimplement from_metadata as TryFrom

* Copy instance of code hash rather than loading the whole metadata from file.

* Format code.

* Update crates/cargo-contract/src/cmd/extrinsics/upload.rs

Co-authored-by: Andrew Jones <ascjones@gmail.com>

* Fix compilation.

Co-authored-by: Andrew Jones <ascjones@gmail.com>

crates/cargo-contract/src/cmd/extrinsics/upload.rs

@@ -72,7 +72,14 @@ impl UploadCommand {
         let crate_metadata = CrateMetadata::from_manifest_path(
             self.extrinsic_opts.manifest_path.as_ref(),
         )?;
-        let transcoder = ContractMessageTranscoder::load(crate_metadata.metadata_path())?;
+        let contract_metadata =
+            contract_metadata::ContractMetadata::load(&crate_metadata.metadata_path())?;
+        let code_hash = contract_metadata.source.hash;
+        let transcoder =
+            ContractMessageTranscoder::try_from(contract_metadata).context(format!(
+                "Failed to deserialize ink project metadata from contract metadata {}",
+                crate_metadata.metadata_path().display()
+            ))?;
         let signer = super::pair_signer(self.extrinsic_opts.signer()?);
 
         let wasm_path = match &self.wasm_path {
@@ -127,7 +134,11 @@ impl UploadCommand {
                 }
                 Ok(())
             } else {
-                Err("This contract has already been uploaded".into())
+                Err(anyhow::anyhow!(
+                    "This contract has already been uploaded with code hash: {:?}",
+                    code_hash
+                )
+                .into())
             }
         })
     }

crates/metadata/Cargo.toml

@@ -19,6 +19,7 @@ semver = { version = "1.0.14", features = ["serde"] }
 serde = { version = "1.0.147", default-features = false, features = ["derive"] }
 serde_json = "1.0.87"
 url = { version = "2.3.1", features = ["serde"] }
+anyhow = "1.0.66"
 
 [dev-dependencies]
 pretty_assertions = "1.3.0"

crates/metadata/src/lib.rs

@@ -58,6 +58,10 @@
 
 mod byte_str;
 
+use anyhow::{
+    Context,
+    Result,
+};
 use semver::Version;
 use serde::{
     de,
@@ -75,6 +79,8 @@ use std::{
         Formatter,
         Result as DisplayResult,
     },
+    fs::File,
+    path::Path,
     str::FromStr,
 };
 use url::Url;
@@ -113,10 +119,24 @@ impl ContractMetadata {
     pub fn remove_source_wasm_attribute(&mut self) {
         self.source.wasm = None;
     }
+
+    /// Reads the file and tries to parse it as instance of `ContractMetadata`.
+    pub fn load<P>(metadata_path: &P) -> Result<Self>
+    where
+        P: AsRef<Path>,
+    {
+        let path = metadata_path.as_ref();
+        let file = File::open(path)
+            .context(format!("Failed to open metadata file {}", path.display()))?;
+        serde_json::from_reader(file).context(format!(
+            "Failed to deserialize metadata file {}",
+            path.display()
+        ))
+    }
 }
 
 /// Representation of the Wasm code hash.
-#[derive(Clone, Debug, Eq, PartialEq, Deserialize, Serialize)]
+#[derive(Clone, Copy, Debug, Eq, PartialEq, Deserialize, Serialize)]
 pub struct CodeHash(
     #[serde(
         serialize_with = "byte_str::serialize_as_byte_str",

crates/transcode/src/lib.rs

@@ -137,7 +137,6 @@ use scale_info::{
 };
 use std::{
     fmt::Debug,
-    fs::File,
     path::Path,
 };
 
@@ -166,13 +165,8 @@ impl ContractMessageTranscoder {
         P: AsRef<Path>,
     {
         let path = metadata_path.as_ref();
-        let file = File::open(path)
-            .context(format!("Failed to open metadata file {}", path.display()))?;
-        let metadata: contract_metadata::ContractMetadata = serde_json::from_reader(file)
-            .context(format!(
-                "Failed to deserialize metadata file {}",
-                path.display()
-            ))?;
+        let metadata: contract_metadata::ContractMetadata =
+            contract_metadata::ContractMetadata::load(&metadata_path)?;
         let ink_metadata = serde_json::from_value(serde_json::Value::Object(
             metadata.abi,
         ))
@@ -344,6 +338,18 @@ impl ContractMessageTranscoder {
     }
 }
 
+impl TryFrom<contract_metadata::ContractMetadata> for ContractMessageTranscoder {
+    type Error = anyhow::Error;
+
+    fn try_from(
+        metadata: contract_metadata::ContractMetadata,
+    ) -> Result<Self, Self::Error> {
+        Ok(Self::new(serde_json::from_value(
+            serde_json::Value::Object(metadata.abi),
+        )?))
+    }
+}
+
 #[derive(Debug)]
 pub enum CompositeTypeFields {
     Named(Vec<CompositeTypeNamedField>),