From b4ce6ecb0db923a173b9a19276437056e8d7ec0e Mon Sep 17 00:00:00 2001
From: Wei Tang <wei@that.world>
Date: Fri, 5 Feb 2021 13:21:17 +0100
Subject: [PATCH] Upgrade evm to 0.23 (#287)

---
 Cargo.lock                               | 16 ++++++++--------
 frame/ethereum/Cargo.toml                |  2 +-
 frame/evm/Cargo.toml                     |  6 +++---
 frame/evm/precompile/blake2/Cargo.toml   |  2 +-
 frame/evm/precompile/bn128/Cargo.toml    |  2 +-
 frame/evm/precompile/dispatch/Cargo.toml |  2 +-
 frame/evm/precompile/ed25519/Cargo.toml  |  2 +-
 frame/evm/precompile/modexp/Cargo.toml   |  2 +-
 frame/evm/precompile/simple/Cargo.toml   |  2 +-
 primitives/evm/Cargo.toml                |  2 +-
 10 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0ab290f04de2c..e0ba9b902ca71 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1127,9 +1127,9 @@ checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59"
 
 [[package]]
 name = "evm"
-version = "0.22.1"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd540113f54cb8f20c74a594e3dc4422d69cb3df7c425ed7ed33c0383f780df0"
+checksum = "3b46f945d7548bea2affc1a48168f6d7e832bae914e0d90627a2ea2a7ba63001"
 dependencies = [
  "ethereum",
  "evm-core",
@@ -1145,9 +1145,9 @@ dependencies = [
 
 [[package]]
 name = "evm-core"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa225f553e9380c498f5beb4ba6e5d455b147a133d371b550f0326b92c95cc17"
+checksum = "cc372feb219651f8ae872e6ec0f84b346053c058bd0e8408b1f44a2a796bfecd"
 dependencies = [
  "parity-scale-codec",
  "primitive-types",
@@ -1156,9 +1156,9 @@ dependencies = [
 
 [[package]]
 name = "evm-gasometer"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08bdd70b8a66727a77b991eb8374374f38b076fd9d539244751c59ebac9c3082"
+checksum = "5737059b7a570b3e28a0126b02e0e36e218cc828b29dddbbae73d0b97fce1e0a"
 dependencies = [
  "evm-core",
  "evm-runtime",
@@ -1167,9 +1167,9 @@ dependencies = [
 
 [[package]]
 name = "evm-runtime"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25ab3a3ea8ab273ef0f9237e13f5fa271b6deb19d604766b88325d8d807afcaf"
+checksum = "95726118dbc5f76ed1ee300e685950e58e52a1c4db454a7635aba636c7002186"
 dependencies = [
  "evm-core",
  "primitive-types",
diff --git a/frame/ethereum/Cargo.toml b/frame/ethereum/Cargo.toml
index d4af3e21fbd16..87e9be136ab7e 100644
--- a/frame/ethereum/Cargo.toml
+++ b/frame/ethereum/Cargo.toml
@@ -19,7 +19,7 @@ sp-runtime = { version = "2.0.0-dev", default-features = false, git = "https://g
 sp-std = { version = "2.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
 sp-io = { version = "2.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
 fp-evm = { version = "0.8.0", default-features = false, path = "../../primitives/evm" }
-evm = { version = "0.22.0", features = ["with-codec"], default-features = false }
+evm = { version = "0.23.0", features = ["with-codec"], default-features = false }
 ethereum = { version = "0.6", default-features = false, features = ["with-codec"] }
 ethereum-types = { version = "0.10", default-features = false }
 rlp = { version = "0.5", default-features = false }
diff --git a/frame/evm/Cargo.toml b/frame/evm/Cargo.toml
index 0e0c2b8a4b49e..7142cd89ab7f5 100644
--- a/frame/evm/Cargo.toml
+++ b/frame/evm/Cargo.toml
@@ -26,9 +26,9 @@ sp-io = { version = "2.0.0", default-features = false, git = "https://github.com
 fp-evm = { version = "0.8.0", default-features = false, path = "../../primitives/evm" }
 primitive-types = { version = "0.8.0", default-features = false, features = ["rlp", "byteorder"] }
 rlp = { version = "0.5", default-features = false }
-evm = { version = "0.22.0", default-features = false, features = ["with-codec"] }
-evm-runtime = { version = "0.22.0", default-features = false }
-evm-gasometer = { version = "0.22.0", default-features = false }
+evm = { version = "0.23.0", default-features = false, features = ["with-codec"] }
+evm-runtime = { version = "0.23.0", default-features = false }
+evm-gasometer = { version = "0.23.0", default-features = false }
 sha3 = { version = "0.8", default-features = false }
 
 [features]
diff --git a/frame/evm/precompile/blake2/Cargo.toml b/frame/evm/precompile/blake2/Cargo.toml
index a05ef57c4326f..0b90e002392a9 100644
--- a/frame/evm/precompile/blake2/Cargo.toml
+++ b/frame/evm/precompile/blake2/Cargo.toml
@@ -12,7 +12,7 @@ description = "BLAKE2 precompiles for EVM pallet."
 sp-core = { version = "2.0.0", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
 sp-io = { version = "2.0.0", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
 fp-evm = { version = "0.8.0", default-features = false, path = "../../../../primitives/evm" }
-evm = { version = "0.22.0", default-features = false, features = ["with-codec"] }
+evm = { version = "0.23.0", default-features = false, features = ["with-codec"] }
 
 [features]
 default = ["std"]
diff --git a/frame/evm/precompile/bn128/Cargo.toml b/frame/evm/precompile/bn128/Cargo.toml
index f3cd8eb9946dc..454d03d45e51a 100644
--- a/frame/evm/precompile/bn128/Cargo.toml
+++ b/frame/evm/precompile/bn128/Cargo.toml
@@ -12,7 +12,7 @@ description = "BN128 precompiles for EVM pallet."
 sp-core = { version = "2.0.0", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
 sp-io = { version = "2.0.0", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
 fp-evm = { version = "0.8.0", default-features = false, path = "../../../../primitives/evm" }
-evm = { version = "0.22.0", default-features = false, features = ["with-codec"] }
+evm = { version = "0.23.0", default-features = false, features = ["with-codec"] }
 bn = { package = "substrate-bn", version = "0.5", default-features = false }
 
 [features]
diff --git a/frame/evm/precompile/dispatch/Cargo.toml b/frame/evm/precompile/dispatch/Cargo.toml
index 1794d22a17d92..d81c547409102 100644
--- a/frame/evm/precompile/dispatch/Cargo.toml
+++ b/frame/evm/precompile/dispatch/Cargo.toml
@@ -14,7 +14,7 @@ sp-io = { version = "2.0.0", default-features = false, git = "https://github.com
 frame-support = { version = "2.0.0", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
 pallet-evm = { version = "2.0.0", default-features = false, path = "../.." }
 fp-evm = { version = "0.8.0", default-features = false, path = "../../../../primitives/evm" }
-evm = { version = "0.22.0", default-features = false, features = ["with-codec"] }
+evm = { version = "0.23.0", default-features = false, features = ["with-codec"] }
 codec = { package = "parity-scale-codec", version = "1.3.5", default-features = false }
 
 [features]
diff --git a/frame/evm/precompile/ed25519/Cargo.toml b/frame/evm/precompile/ed25519/Cargo.toml
index 295bd27bc1e19..4d360e2513928 100644
--- a/frame/evm/precompile/ed25519/Cargo.toml
+++ b/frame/evm/precompile/ed25519/Cargo.toml
@@ -12,7 +12,7 @@ description = "ED25519 precompiles for EVM pallet."
 sp-core = { version = "2.0.0", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
 sp-io = { version = "2.0.0", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
 fp-evm = { version = "0.8.0", default-features = false, path = "../../../../primitives/evm" }
-evm = { version = "0.22.0", default-features = false, features = ["with-codec"] }
+evm = { version = "0.23.0", default-features = false, features = ["with-codec"] }
 ed25519-dalek = { version = "1.0.0", features = ["alloc", "u64_backend"], default-features = false }
 
 [features]
diff --git a/frame/evm/precompile/modexp/Cargo.toml b/frame/evm/precompile/modexp/Cargo.toml
index 04f116da61e1a..e52e254f821c7 100644
--- a/frame/evm/precompile/modexp/Cargo.toml
+++ b/frame/evm/precompile/modexp/Cargo.toml
@@ -12,7 +12,7 @@ description = "MODEXP precompiles for EVM pallet."
 sp-core = { version = "2.0.0", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
 sp-io = { version = "2.0.0", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
 fp-evm = { version = "0.8.0", default-features = false, path = "../../../../primitives/evm" }
-evm = { version = "0.22.0", default-features = false, features = ["with-codec"] }
+evm = { version = "0.23.0", default-features = false, features = ["with-codec"] }
 num = { version = "0.3", features = ["alloc"], default-features = false }
 
 [dev-dependencies]
diff --git a/frame/evm/precompile/simple/Cargo.toml b/frame/evm/precompile/simple/Cargo.toml
index 9690bde898e97..ff23d91c43238 100644
--- a/frame/evm/precompile/simple/Cargo.toml
+++ b/frame/evm/precompile/simple/Cargo.toml
@@ -12,7 +12,7 @@ description = "Simple precompiles for EVM pallet."
 sp-core = { version = "2.0.0", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
 sp-io = { version = "2.0.0", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
 fp-evm = { version = "0.8.0", default-features = false, path = "../../../../primitives/evm" }
-evm = { version = "0.22.0", default-features = false, features = ["with-codec"] }
+evm = { version = "0.23.0", default-features = false, features = ["with-codec"] }
 ripemd160 = { version = "0.9", default-features = false }
 
 [features]
diff --git a/primitives/evm/Cargo.toml b/primitives/evm/Cargo.toml
index 6d2645a90f686..5b6c31558d71e 100644
--- a/primitives/evm/Cargo.toml
+++ b/primitives/evm/Cargo.toml
@@ -18,7 +18,7 @@ sp-core = { version = "2.0.0", git = "https://github.com/paritytech/substrate.gi
 sp-std = { version = "2.0.0", git = "https://github.com/paritytech/substrate.git", branch = "frontier", default-features = false }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false }
-evm = { version = "0.22.0", default-features = false, features = ["with-codec"] }
+evm = { version = "0.23.0", default-features = false, features = ["with-codec"] }
 impl-trait-for-tuples = "0.1"
 
 [features]