From b3ea7f35f11dd03ff17aa3107f2cfeec0dde8b56 Mon Sep 17 00:00:00 2001 From: Robin Freyler Date: Wed, 18 Mar 2020 11:28:43 +0100 Subject: [PATCH 1/4] update template to ink! 2.0 dependencies --- template/Cargo.toml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/template/Cargo.toml b/template/Cargo.toml index f70b0e4c..3d21bf5d 100644 --- a/template/Cargo.toml +++ b/template/Cargo.toml @@ -5,13 +5,19 @@ authors = ["[your_name] <[your_email]>"] edition = "2018" [dependencies] -ink_abi = { git = "https://github.com/paritytech/ink", package = "ink_abi", default-features = false, features = ["derive"], optional = true } -ink_primitives = { git = "https://github.com/paritytech/ink", package = "ink_primitives", default-features = false } -ink_core = { git = "https://github.com/paritytech/ink", package = "ink_core", default-features = false } -ink_lang = { git = "https://github.com/paritytech/ink", package = "ink_lang", default-features = false } +ink_abi = { version = "2.0.0", git = "https://github.com/paritytech/ink", tag = "latest-v2.0", package = "ink_abi", default-features = false, features = ["derive"], optional = true } +ink_primitives = { version = "2.0.0", git = "https://github.com/paritytech/ink", tag = "latest-v2.0", package = "ink_primitives", default-features = false } +ink_core = { version = "2.0.0", git = "https://github.com/paritytech/ink", tag = "latest-v2.0", package = "ink_core", default-features = false } +ink_lang = { version = "2.0.0", git = "https://github.com/paritytech/ink", tag = "latest-v2.0", package = "ink_lang", default-features = false } scale = { package = "parity-scale-codec", version = "1.2", default-features = false, features = ["derive"] } -type-metadata = { git = "https://github.com/type-metadata/type-metadata.git", default-features = false, features = ["derive"], optional = true } + +[dependencies.type-metadata] +git = "https://github.com/type-metadata/type-metadata.git" +rev = "02eae9f35c40c943b56af5b60616219f2b72b47d" +default-features = false +features = ["derive"] +optional = true [lib] name = "{{name}}" -- GitLab From e3d4eddc7e0d349179491fe4a87c178141e6b02b Mon Sep 17 00:00:00 2001 From: Robin Freyler Date: Wed, 18 Mar 2020 11:49:17 +0100 Subject: [PATCH 2/4] fix abi_gen ink_lang version --- template/.ink/abi_gen/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/.ink/abi_gen/Cargo.toml b/template/.ink/abi_gen/Cargo.toml index acdd1ca1..5c893f81 100644 --- a/template/.ink/abi_gen/Cargo.toml +++ b/template/.ink/abi_gen/Cargo.toml @@ -11,6 +11,6 @@ path = "main.rs" [dependencies] contract = { path = "../..", package = "{{name}}", default-features = false, features = ["ink-generate-abi"] } -ink_lang = { git = "https://github.com/paritytech/ink", package = "ink_lang", default-features = false, features = ["ink-generate-abi"] } +ink_lang = { version = "2.0.0", git = "https://github.com/paritytech/ink", tag = "latest-v2.0", package = "ink_lang", default-features = false, features = ["ink-generate-abi"] } serde = "1.0" serde_json = "1.0" -- GitLab From 400405efa0c9e91ce9a4146fa6d111d60f8d931a Mon Sep 17 00:00:00 2001 From: Robin Freyler Date: Wed, 18 Mar 2020 12:03:04 +0100 Subject: [PATCH 3/4] change version tag latest-v2.0 -> latest-v2 --- template/.ink/abi_gen/Cargo.toml | 2 +- template/Cargo.toml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/template/.ink/abi_gen/Cargo.toml b/template/.ink/abi_gen/Cargo.toml index 5c893f81..c918ad33 100644 --- a/template/.ink/abi_gen/Cargo.toml +++ b/template/.ink/abi_gen/Cargo.toml @@ -11,6 +11,6 @@ path = "main.rs" [dependencies] contract = { path = "../..", package = "{{name}}", default-features = false, features = ["ink-generate-abi"] } -ink_lang = { version = "2.0.0", git = "https://github.com/paritytech/ink", tag = "latest-v2.0", package = "ink_lang", default-features = false, features = ["ink-generate-abi"] } +ink_lang = { version = "2.0.0", git = "https://github.com/paritytech/ink", tag = "latest-v2", package = "ink_lang", default-features = false, features = ["ink-generate-abi"] } serde = "1.0" serde_json = "1.0" diff --git a/template/Cargo.toml b/template/Cargo.toml index 3d21bf5d..ac257b08 100644 --- a/template/Cargo.toml +++ b/template/Cargo.toml @@ -5,10 +5,10 @@ authors = ["[your_name] <[your_email]>"] edition = "2018" [dependencies] -ink_abi = { version = "2.0.0", git = "https://github.com/paritytech/ink", tag = "latest-v2.0", package = "ink_abi", default-features = false, features = ["derive"], optional = true } -ink_primitives = { version = "2.0.0", git = "https://github.com/paritytech/ink", tag = "latest-v2.0", package = "ink_primitives", default-features = false } -ink_core = { version = "2.0.0", git = "https://github.com/paritytech/ink", tag = "latest-v2.0", package = "ink_core", default-features = false } -ink_lang = { version = "2.0.0", git = "https://github.com/paritytech/ink", tag = "latest-v2.0", package = "ink_lang", default-features = false } +ink_abi = { version = "2.0.0", git = "https://github.com/paritytech/ink", tag = "latest-v2", package = "ink_abi", default-features = false, features = ["derive"], optional = true } +ink_primitives = { version = "2.0.0", git = "https://github.com/paritytech/ink", tag = "latest-v2", package = "ink_primitives", default-features = false } +ink_core = { version = "2.0.0", git = "https://github.com/paritytech/ink", tag = "latest-v2", package = "ink_core", default-features = false } +ink_lang = { version = "2.0.0", git = "https://github.com/paritytech/ink", tag = "latest-v2", package = "ink_lang", default-features = false } scale = { package = "parity-scale-codec", version = "1.2", default-features = false, features = ["derive"] } -- GitLab From d57cfae16e040084271f8b209d9ff1b130043414 Mon Sep 17 00:00:00 2001 From: Robin Freyler Date: Wed, 18 Mar 2020 12:19:50 +0100 Subject: [PATCH 4/4] fix Cargo version of ink! crates --- template/.ink/abi_gen/Cargo.toml | 2 +- template/Cargo.toml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/template/.ink/abi_gen/Cargo.toml b/template/.ink/abi_gen/Cargo.toml index c918ad33..eedf518c 100644 --- a/template/.ink/abi_gen/Cargo.toml +++ b/template/.ink/abi_gen/Cargo.toml @@ -11,6 +11,6 @@ path = "main.rs" [dependencies] contract = { path = "../..", package = "{{name}}", default-features = false, features = ["ink-generate-abi"] } -ink_lang = { version = "2.0.0", git = "https://github.com/paritytech/ink", tag = "latest-v2", package = "ink_lang", default-features = false, features = ["ink-generate-abi"] } +ink_lang = { version = "2", git = "https://github.com/paritytech/ink", tag = "latest-v2", package = "ink_lang", default-features = false, features = ["ink-generate-abi"] } serde = "1.0" serde_json = "1.0" diff --git a/template/Cargo.toml b/template/Cargo.toml index ac257b08..12515285 100644 --- a/template/Cargo.toml +++ b/template/Cargo.toml @@ -5,10 +5,10 @@ authors = ["[your_name] <[your_email]>"] edition = "2018" [dependencies] -ink_abi = { version = "2.0.0", git = "https://github.com/paritytech/ink", tag = "latest-v2", package = "ink_abi", default-features = false, features = ["derive"], optional = true } -ink_primitives = { version = "2.0.0", git = "https://github.com/paritytech/ink", tag = "latest-v2", package = "ink_primitives", default-features = false } -ink_core = { version = "2.0.0", git = "https://github.com/paritytech/ink", tag = "latest-v2", package = "ink_core", default-features = false } -ink_lang = { version = "2.0.0", git = "https://github.com/paritytech/ink", tag = "latest-v2", package = "ink_lang", default-features = false } +ink_abi = { version = "2", git = "https://github.com/paritytech/ink", tag = "latest-v2", package = "ink_abi", default-features = false, features = ["derive"], optional = true } +ink_primitives = { version = "2", git = "https://github.com/paritytech/ink", tag = "latest-v2", package = "ink_primitives", default-features = false } +ink_core = { version = "2", git = "https://github.com/paritytech/ink", tag = "latest-v2", package = "ink_core", default-features = false } +ink_lang = { version = "2", git = "https://github.com/paritytech/ink", tag = "latest-v2", package = "ink_lang", default-features = false } scale = { package = "parity-scale-codec", version = "1.2", default-features = false, features = ["derive"] } -- GitLab