From b471aa90996815fca1b818889961cafb6ff3ec74 Mon Sep 17 00:00:00 2001 From: tgmichel Date: Thu, 17 Mar 2022 14:07:33 +0100 Subject: [PATCH 1/3] `ethereum` 0.12 --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index e97531caa..f805ebfaa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "evm" -version = "0.33.1" +version = "0.33.2" license = "Apache-2.0" authors = ["Wei Tang ", "Parity Technologies "] description = "SputnikVM - a Portable Blockchain Virtual Machine" @@ -18,7 +18,7 @@ rlp = { version = "0.5", default-features = false } primitive-types = { version = "0.10", default-features = false, features = ["rlp"] } serde = { version = "1.0", default-features = false, features = ["derive"], optional = true } codec = { package = "parity-scale-codec", version = "2.0", default-features = false, features = ["derive"], optional = true } -ethereum = { version = ">= 0.10, <= 0.11", default-features = false } +ethereum = { version = ">= 0.10, <= 0.12", default-features = false } environmental = { version = "1.1.2", default-features = false, optional = true } scale-info = { version = "1.0.0", default-features = false, features = ["derive"], optional = true } auto_impl = "0.5.0" From c9244a2bc2818ddb1f38e121f42279b1f080e713 Mon Sep 17 00:00:00 2001 From: tgmichel Date: Thu, 17 Mar 2022 14:37:12 +0100 Subject: [PATCH 2/3] Bump `primitive-types` --- Cargo.toml | 2 +- core/Cargo.toml | 2 +- gasometer/Cargo.toml | 2 +- runtime/Cargo.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f805ebfaa..02959795b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ evm-gasometer = { version = "0.33", path = "gasometer", default-features = false evm-runtime = { version = "0.33", path = "runtime", default-features = false } sha3 = { version = "0.8", default-features = false } rlp = { version = "0.5", default-features = false } -primitive-types = { version = "0.10", default-features = false, features = ["rlp"] } +primitive-types = { version = ">= 0.10, <= 0.11", default-features = false, features = ["rlp"] } serde = { version = "1.0", default-features = false, features = ["derive"], optional = true } codec = { package = "parity-scale-codec", version = "2.0", default-features = false, features = ["derive"], optional = true } ethereum = { version = ">= 0.10, <= 0.12", default-features = false } diff --git a/core/Cargo.toml b/core/Cargo.toml index a7bd3b8d0..8d7180a03 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -9,7 +9,7 @@ keywords = ["no_std", "ethereum"] edition = "2018" [dependencies] -primitive-types = { version = "0.10", default-features = false } +primitive-types = { version = ">= 0.10, <= 0.11", default-features = false } codec = { package = "parity-scale-codec", version = "2.0", default-features = false, features = ["derive", "full"], optional = true } serde = { version = "1.0", default-features = false, features = ["derive"], optional = true } scale-info = { version = "1.0.0", default-features = false, features = ["derive"], optional = true } diff --git a/gasometer/Cargo.toml b/gasometer/Cargo.toml index 044345f12..3848d018c 100644 --- a/gasometer/Cargo.toml +++ b/gasometer/Cargo.toml @@ -9,7 +9,7 @@ keywords = ["no_std", "ethereum"] edition = "2018" [dependencies] -primitive-types = { version = "0.10", default-features = false } +primitive-types = { version = ">= 0.10, <= 0.11", default-features = false } evm-core = { version = "0.33", path = "../core", default-features = false } evm-runtime = { version = "0.33", path = "../runtime", default-features = false } environmental = { version = "1.1.2", default-features = false, optional = true } diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 16fc15050..92576aa39 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -10,7 +10,7 @@ edition = "2018" [dependencies] evm-core = { version = "0.33", path = "../core", default-features = false } -primitive-types = { version = "0.10", default-features = false } +primitive-types = { version = ">= 0.10, <= 0.11", default-features = false } sha3 = { version = "0.8", default-features = false } environmental = { version = "1.1.2", default-features = false, optional = true} auto_impl = "0.5.0" From 3108e632871d4ce0ef320b4f6ad2aaab2016db97 Mon Sep 17 00:00:00 2001 From: zqh Date: Wed, 23 Mar 2022 12:46:17 +0800 Subject: [PATCH 3/3] update codec and scale-info --- Cargo.toml | 4 ++-- core/Cargo.toml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index e97531caa..9ae07b232 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,10 +17,10 @@ sha3 = { version = "0.8", default-features = false } rlp = { version = "0.5", default-features = false } primitive-types = { version = "0.10", default-features = false, features = ["rlp"] } serde = { version = "1.0", default-features = false, features = ["derive"], optional = true } -codec = { package = "parity-scale-codec", version = "2.0", default-features = false, features = ["derive"], optional = true } +codec = { package = "parity-scale-codec", version = "3.0", default-features = false, features = ["derive"], optional = true } ethereum = { version = ">= 0.10, <= 0.11", default-features = false } environmental = { version = "1.1.2", default-features = false, optional = true } -scale-info = { version = "1.0.0", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.0", default-features = false, features = ["derive"], optional = true } auto_impl = "0.5.0" [dev-dependencies] diff --git a/core/Cargo.toml b/core/Cargo.toml index a7bd3b8d0..bb9f8ae60 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -10,9 +10,9 @@ edition = "2018" [dependencies] primitive-types = { version = "0.10", default-features = false } -codec = { package = "parity-scale-codec", version = "2.0", default-features = false, features = ["derive", "full"], optional = true } +codec = { package = "parity-scale-codec", version = "3.0", default-features = false, features = ["derive", "full"], optional = true } serde = { version = "1.0", default-features = false, features = ["derive"], optional = true } -scale-info = { version = "1.0.0", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.0", default-features = false, features = ["derive"], optional = true } # Work-around for https://github.com/myrrlyn/funty/issues/3 funty = { version = "=1.1", default-features = false }