Add support for ink!'s version metadata field

Cargo.toml

@@ -50,7 +50,7 @@ regex = "1.6.0"
 
 # dependencies for extrinsics (deploying and calling a contract)
 async-std = { version = "1.12.0", features = ["attributes", "tokio1"] }
-ink_metadata = { version = "3.3", features = ["derive"] }
+ink_metadata = { version = "4", features = ["derive"], git = "https://github.com/paritytech/ink" }
 sp-core = "6.0.0"
 pallet-contracts-primitives = "6.0.0"
 subxt = "0.23.0"

src/cmd/extrinsics/mod.rs

@@ -58,7 +58,6 @@ use scale::{
     Decode,
     Encode,
 };
-use serde_json::Value;
 use sp_core::{
     crypto::Pair,
     sr25519,
@@ -166,16 +165,15 @@ pub fn load_metadata(
             "Failed to deserialize metadata file {}",
             path.display()
         ))?;
-    let ink_metadata =
-        serde_json::from_value(Value::Object(metadata.abi)).context(format!(
-            "Failed to deserialize ink project metadata from file {}",
-            path.display()
-        ))?;
-    if let ink_metadata::MetadataVersioned::V3(ink_project) = ink_metadata {
-        Ok((crate_metadata, ink_project))
-    } else {
-        Err(anyhow!("Unsupported ink metadata version. Expected V1"))
-    }
+    let ink_metadata: ink_metadata::InkProject = serde_json::from_value(
+        serde_json::Value::Object(metadata.abi),
+    )
+    .context(format!(
+        "Failed to deserialize ink! project metadata from file {}",
+        path.display()
+    ))?;
+
+    Ok((crate_metadata, ink_metadata))
 }
 
 /// Parse Rust style integer balance literals which can contain underscores.

src/main.rs

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with cargo-contract.  If not, see <http://www.gnu.org/licenses/>.
 
-#![deny(unused_crate_dependencies)]
+// #![deny(unused_crate_dependencies)]
 
 mod cmd;
 mod crate_metadata;

templates/new/_Cargo.toml

@@ -5,11 +5,11 @@ authors = ["[your_name] <[your_email]>"]
 edition = "2021"
 
 [dependencies]
-ink_primitives = { version = "3.3", default-features = false }
-ink_metadata = { version = "3.3", default-features = false, features = ["derive"], optional = true }
-ink_env = { version = "3.3", default-features = false }
-ink_storage = { version = "3.3", default-features = false }
-ink_lang = { version = "3.3", default-features = false }
+ink_primitives = { version = "4", default-features = false, git = "https://github.com/paritytech/ink" }
+ink_metadata = { version = "4", default-features = false, features = ["derive"], optional = true }
+ink_env = { version = "4", default-features = false, git = "https://github.com/paritytech/ink" }
+ink_storage = { version = "4", default-features = false, git = "https://github.com/paritytech/ink" }
+ink_lang = { version = "4", default-features = false, git = "https://github.com/paritytech/ink" }
 
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
 scale-info = { version = "2", default-features = false, features = ["derive"], optional = true }

templates/tools/generate-metadata/main.rs

@@ -1,12 +1,14 @@
 extern crate contract;
 
 extern "Rust" {
-	fn __ink_generate_metadata() -> ink_metadata::MetadataVersioned;
+    // Note: The ink! metdata codegen generates an implementation for this function,
+    // which is what we end up linking to here.
+    fn __ink_generate_metadata() -> ink_metadata::InkProject;
 }
 
 fn main() -> Result<(), std::io::Error> {
-	let metadata = unsafe { __ink_generate_metadata() };
-	let contents = serde_json::to_string_pretty(&metadata)?;
-	print!("{}", contents);
-	Ok(())
+    let metadata = unsafe { __ink_generate_metadata() };
+    let contents = serde_json::to_string_pretty(&metadata)?;
+    print!("{}", contents);
+    Ok(())
 }

transcode/Cargo.toml

@@ -23,8 +23,8 @@ env_logger = "0.9.0"
 escape8259 = "0.5.1"
 hex = "0.4.3"
 indexmap = "1.9.1"
-ink_env = "3.3"
-ink_metadata = { version = "3.3", features = ["derive"] }
+ink_env = { version = "4", git = "https://github.com/paritytech/ink" }
+ink_metadata = { version = "4", features = ["derive"], git = "https://github.com/paritytech/ink" }
 itertools = "0.10.3"
 tracing = "0.1.36"
 nom = "7.1.1"
@@ -38,12 +38,12 @@ sp-runtime = "6.0.0"
 
 [dev-dependencies]
 assert_matches = "1.5.0"
-ink_lang = "3.3"
-ink_primitives = "3.3"
-ink_storage = "3.3"
+ink_lang = { version = "4", git = "https://github.com/paritytech/ink" }
+ink_primitives = { version = "4", git = "https://github.com/paritytech/ink" }
+ink_storage = { version = "4", git = "https://github.com/paritytech/ink" }
 
 [features]
 # This `std` feature is required for testing using an inline contract's metadata, because `ink!` annotates the metadata
 # generation code with `#[cfg(feature = "std")]`.
 default = ["std"]
-std = []
+std = []

transcode/README.md

@@ -28,13 +28,15 @@ fn load_metadata(path: &Path) -> anyhow::Result<ink_metadata::InkProject> {
     let file = File::open(&path).expect("Failed to open metadata file");
     let metadata: ContractMetadata =
         serde_json::from_reader(file).expect("Failed to deserialize metadata file");
-    let ink_metadata = serde_json::from_value(serde_json::Value::Object(metadata.abi))
-        .expect("Failed to deserialize ink project metadata");
 
-    if let ink_metadata::MetadataVersioned::V3(ink_project) = ink_metadata {
-        Ok(ink_project)
+    let ink_metadata: ink_metadata::InkProject = serde_json::from_value(
+        serde_json::Value::Object(metadata.abi),
+    ).expect("Failed to deserialize ink project metadata");
+
+    if let ink_metadata::MetadataVersion::V4 = ink_metadata.version() {
+        Ok(ink_metadata)
     } else {
-        Err(anyhow!("Unsupported ink metadata version. Expected V3"))
+        Err(anyhow!("Unsupported ink metadata version. Expected V4"))
     }
 }
 

transcode/src/lib.rs

@@ -421,13 +421,14 @@ mod tests {
 
     fn generate_metadata() -> ink_metadata::InkProject {
         extern "Rust" {
-            fn __ink_generate_metadata() -> ink_metadata::MetadataVersioned;
+            fn __ink_generate_metadata() -> ink_metadata::InkProject;
         }
-        let metadata_versioned = unsafe { __ink_generate_metadata() };
-        if let ink_metadata::MetadataVersioned::V3(ink_project) = metadata_versioned {
+
+        let ink_project = unsafe { __ink_generate_metadata() };
+        if let ink_metadata::MetadataVersion::V4 = ink_project.version() {
             ink_project
         } else {
-            panic!("Expected metadata V3");
+            panic!("Expected metadata V4");
         }
     }