From 24eb417581ff969ee3327e56532efab1f4b6d5c7 Mon Sep 17 00:00:00 2001
From: Guantong <i@guantong.io>
Date: Tue, 10 Jan 2023 15:21:07 +0800
Subject: [PATCH] Update ethereum to 0.14.0

---
 Cargo.lock                         | 179 +++++++++--------------------
 pallet/message-transact/Cargo.toml |   2 +-
 2 files changed, 54 insertions(+), 127 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0dba0627..6e9e6cf1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2342,7 +2342,7 @@ dependencies = [
  "array-bytes 4.2.0",
  "bp-message-dispatch",
  "bp-runtime",
- "ethereum 0.12.0",
+ "ethereum",
  "fp-ethereum",
  "fp-evm",
  "fp-self-contained",
@@ -2622,7 +2622,7 @@ name = "dc-inflation"
 version = "6.0.0"
 dependencies = [
  "dc-types",
- "primitive-types 0.12.1",
+ "primitive-types",
  "sp-arithmetic",
  "substrate-fixed",
 ]
@@ -2982,20 +2982,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "ethbloom"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11da94e443c60508eb62cf256243a64da87304c2802ac2528847f79d750007ef"
-dependencies = [
- "crunchy",
- "fixed-hash 0.7.0",
- "impl-codec",
- "impl-rlp",
- "scale-info",
- "tiny-keccak",
-]
-
 [[package]]
 name = "ethbloom"
 version = "0.13.0"
@@ -3003,7 +2989,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c22d4b5885b6aa2fe5e8b9329fb8d232bf739e434e6b87347c63bdd00c120f60"
 dependencies = [
  "crunchy",
- "fixed-hash 0.8.0",
+ "fixed-hash",
  "impl-codec",
  "impl-rlp",
  "impl-serde 0.4.0",
@@ -3011,25 +2997,6 @@ dependencies = [
  "tiny-keccak",
 ]
 
-[[package]]
-name = "ethereum"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23750149fe8834c0e24bb9adcbacbe06c45b9861f15df53e09f26cb7c4ab91ef"
-dependencies = [
- "bytes",
- "ethereum-types 0.13.1",
- "hash-db",
- "hash256-std-hasher",
- "parity-scale-codec",
- "rlp",
- "rlp-derive",
- "scale-info",
- "serde",
- "sha3 0.10.6",
- "triehash",
-]
-
 [[package]]
 name = "ethereum"
 version = "0.14.0"
@@ -3037,7 +3004,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a89fb87a9e103f71b903b80b670200b54cc67a07578f070681f1fffb7396fb7"
 dependencies = [
  "bytes",
- "ethereum-types 0.14.1",
+ "ethereum-types",
  "hash-db",
  "hash256-std-hasher",
  "parity-scale-codec",
@@ -3048,33 +3015,18 @@ dependencies = [
  "triehash",
 ]
 
-[[package]]
-name = "ethereum-types"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2827b94c556145446fcce834ca86b7abf0c39a805883fe20e72c5bfdb5a0dc6"
-dependencies = [
- "ethbloom 0.12.1",
- "fixed-hash 0.7.0",
- "impl-codec",
- "impl-rlp",
- "primitive-types 0.11.1",
- "scale-info",
- "uint",
-]
-
 [[package]]
 name = "ethereum-types"
 version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "02d215cbf040552efcbe99a38372fe80ab9d00268e20012b79fcd0f073edd8ee"
 dependencies = [
- "ethbloom 0.13.0",
- "fixed-hash 0.8.0",
+ "ethbloom",
+ "fixed-hash",
  "impl-codec",
  "impl-rlp",
  "impl-serde 0.4.0",
- "primitive-types 0.12.1",
+ "primitive-types",
  "scale-info",
  "uint",
 ]
@@ -3093,13 +3045,13 @@ checksum = "f4448c65b71e8e2b9718232d84d09045eeaaccb2320494e6bd6dbf7e58fec8ff"
 dependencies = [
  "auto_impl",
  "environmental",
- "ethereum 0.14.0",
+ "ethereum",
  "evm-core",
  "evm-gasometer",
  "evm-runtime",
  "log",
  "parity-scale-codec",
- "primitive-types 0.12.1",
+ "primitive-types",
  "rlp",
  "scale-info",
  "serde",
@@ -3113,7 +3065,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "64c51bec0eb68a891c2575c758eaaa1d61373fc51f7caaf216b1fb5c3fea3b5d"
 dependencies = [
  "parity-scale-codec",
- "primitive-types 0.12.1",
+ "primitive-types",
  "scale-info",
  "serde",
 ]
@@ -3127,7 +3079,7 @@ dependencies = [
  "environmental",
  "evm-core",
  "evm-runtime",
- "primitive-types 0.12.1",
+ "primitive-types",
 ]
 
 [[package]]
@@ -3139,7 +3091,7 @@ dependencies = [
  "auto_impl",
  "environmental",
  "evm-core",
- "primitive-types 0.12.1",
+ "primitive-types",
  "sha3 0.10.6",
 ]
 
@@ -3226,10 +3178,10 @@ dependencies = [
 [[package]]
 name = "fc-cli"
 version = "1.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#8e56bd5328624bacde527462b96d54084ac7488c"
+source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#e66dc0457406dde585f6189bdcd685776814eb83"
 dependencies = [
  "clap",
- "ethereum-types 0.14.1",
+ "ethereum-types",
  "fc-db",
  "fp-rpc",
  "fp-storage",
@@ -3245,7 +3197,7 @@ dependencies = [
 [[package]]
 name = "fc-consensus"
 version = "2.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#8e56bd5328624bacde527462b96d54084ac7488c"
+source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#e66dc0457406dde585f6189bdcd685776814eb83"
 dependencies = [
  "async-trait",
  "fc-db",
@@ -3264,7 +3216,7 @@ dependencies = [
 [[package]]
 name = "fc-db"
 version = "2.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#8e56bd5328624bacde527462b96d54084ac7488c"
+source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#e66dc0457406dde585f6189bdcd685776814eb83"
 dependencies = [
  "fp-storage",
  "kvdb-rocksdb",
@@ -3283,7 +3235,7 @@ dependencies = [
 [[package]]
 name = "fc-mapping-sync"
 version = "2.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#8e56bd5328624bacde527462b96d54084ac7488c"
+source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#e66dc0457406dde585f6189bdcd685776814eb83"
 dependencies = [
  "fc-db",
  "fp-consensus",
@@ -3300,10 +3252,10 @@ dependencies = [
 [[package]]
 name = "fc-rpc"
 version = "2.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#8e56bd5328624bacde527462b96d54084ac7488c"
+source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#e66dc0457406dde585f6189bdcd685776814eb83"
 dependencies = [
- "ethereum 0.14.0",
- "ethereum-types 0.14.1",
+ "ethereum",
+ "ethereum-types",
  "evm",
  "fc-db",
  "fc-rpc-core",
@@ -3343,10 +3295,10 @@ dependencies = [
 [[package]]
 name = "fc-rpc-core"
 version = "1.1.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#8e56bd5328624bacde527462b96d54084ac7488c"
+source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#e66dc0457406dde585f6189bdcd685776814eb83"
 dependencies = [
- "ethereum 0.14.0",
- "ethereum-types 0.14.1",
+ "ethereum",
+ "ethereum-types",
  "jsonrpsee",
  "rlp",
  "rustc-hex",
@@ -3417,18 +3369,6 @@ dependencies = [
  "scale-info",
 ]
 
-[[package]]
-name = "fixed-hash"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c"
-dependencies = [
- "byteorder",
- "rand 0.8.5",
- "rustc-hex",
- "static_assertions",
-]
-
 [[package]]
 name = "fixed-hash"
 version = "0.8.0"
@@ -3493,9 +3433,9 @@ dependencies = [
 [[package]]
 name = "fp-consensus"
 version = "2.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#8e56bd5328624bacde527462b96d54084ac7488c"
+source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#e66dc0457406dde585f6189bdcd685776814eb83"
 dependencies = [
- "ethereum 0.14.0",
+ "ethereum",
  "parity-scale-codec",
  "sp-core",
  "sp-runtime",
@@ -3505,10 +3445,10 @@ dependencies = [
 [[package]]
 name = "fp-ethereum"
 version = "1.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#8e56bd5328624bacde527462b96d54084ac7488c"
+source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#e66dc0457406dde585f6189bdcd685776814eb83"
 dependencies = [
- "ethereum 0.14.0",
- "ethereum-types 0.14.1",
+ "ethereum",
+ "ethereum-types",
  "fp-evm",
  "frame-support",
  "num_enum",
@@ -3520,7 +3460,7 @@ dependencies = [
 [[package]]
 name = "fp-evm"
 version = "3.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#8e56bd5328624bacde527462b96d54084ac7488c"
+source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#e66dc0457406dde585f6189bdcd685776814eb83"
 dependencies = [
  "evm",
  "frame-support",
@@ -3533,10 +3473,10 @@ dependencies = [
 [[package]]
 name = "fp-rpc"
 version = "3.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#8e56bd5328624bacde527462b96d54084ac7488c"
+source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#e66dc0457406dde585f6189bdcd685776814eb83"
 dependencies = [
- "ethereum 0.14.0",
- "ethereum-types 0.14.1",
+ "ethereum",
+ "ethereum-types",
  "fp-evm",
  "parity-scale-codec",
  "scale-info",
@@ -3550,9 +3490,9 @@ dependencies = [
 [[package]]
 name = "fp-self-contained"
 version = "1.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#8e56bd5328624bacde527462b96d54084ac7488c"
+source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#e66dc0457406dde585f6189bdcd685776814eb83"
 dependencies = [
- "ethereum 0.14.0",
+ "ethereum",
  "frame-support",
  "parity-scale-codec",
  "parity-util-mem",
@@ -3564,7 +3504,7 @@ dependencies = [
 [[package]]
 name = "fp-storage"
 version = "2.0.0"
-source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#8e56bd5328624bacde527462b96d54084ac7488c"
+source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#e66dc0457406dde585f6189bdcd685776814eb83"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -6302,7 +6242,7 @@ dependencies = [
 [[package]]
 name = "pallet-base-fee"
 version = "1.0.0"
-source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#8e56bd5328624bacde527462b96d54084ac7488c"
+source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#e66dc0457406dde585f6189bdcd685776814eb83"
 dependencies = [
  "fp-evm",
  "frame-support",
@@ -6580,10 +6520,10 @@ dependencies = [
 [[package]]
 name = "pallet-ethereum"
 version = "4.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#8e56bd5328624bacde527462b96d54084ac7488c"
+source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#e66dc0457406dde585f6189bdcd685776814eb83"
 dependencies = [
- "ethereum 0.14.0",
- "ethereum-types 0.14.1",
+ "ethereum",
+ "ethereum-types",
  "evm",
  "fp-consensus",
  "fp-ethereum",
@@ -6607,7 +6547,7 @@ dependencies = [
 [[package]]
 name = "pallet-evm"
 version = "6.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#8e56bd5328624bacde527462b96d54084ac7488c"
+source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#e66dc0457406dde585f6189bdcd685776814eb83"
 dependencies = [
  "environmental",
  "evm",
@@ -6619,7 +6559,7 @@ dependencies = [
  "log",
  "pallet-timestamp",
  "parity-scale-codec",
- "primitive-types 0.12.1",
+ "primitive-types",
  "rlp",
  "scale-info",
  "serde",
@@ -6632,7 +6572,7 @@ dependencies = [
 [[package]]
 name = "pallet-evm-precompile-blake2"
 version = "2.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#8e56bd5328624bacde527462b96d54084ac7488c"
+source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#e66dc0457406dde585f6189bdcd685776814eb83"
 dependencies = [
  "fp-evm",
 ]
@@ -6640,7 +6580,7 @@ dependencies = [
 [[package]]
 name = "pallet-evm-precompile-bn128"
 version = "2.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#8e56bd5328624bacde527462b96d54084ac7488c"
+source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#e66dc0457406dde585f6189bdcd685776814eb83"
 dependencies = [
  "fp-evm",
  "sp-core",
@@ -6650,7 +6590,7 @@ dependencies = [
 [[package]]
 name = "pallet-evm-precompile-dispatch"
 version = "2.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#8e56bd5328624bacde527462b96d54084ac7488c"
+source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#e66dc0457406dde585f6189bdcd685776814eb83"
 dependencies = [
  "fp-evm",
  "frame-support",
@@ -6660,7 +6600,7 @@ dependencies = [
 [[package]]
 name = "pallet-evm-precompile-modexp"
 version = "2.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#8e56bd5328624bacde527462b96d54084ac7488c"
+source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#e66dc0457406dde585f6189bdcd685776814eb83"
 dependencies = [
  "fp-evm",
  "num",
@@ -6669,7 +6609,7 @@ dependencies = [
 [[package]]
 name = "pallet-evm-precompile-simple"
 version = "2.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#8e56bd5328624bacde527462b96d54084ac7488c"
+source = "git+https://github.com/darwinia-network/frontier?branch=prepare-polkadot-v0.9.33#e66dc0457406dde585f6189bdcd685776814eb83"
 dependencies = [
  "fp-evm",
  "ripemd",
@@ -7533,13 +7473,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d32c34f4f5ca7f9196001c0aba5a1f9a5a12382c8944b8b0f90233282d1e8f8"
 dependencies = [
  "cfg-if",
- "ethereum-types 0.14.1",
+ "ethereum-types",
  "hashbrown",
  "impl-trait-for-tuples",
  "lru",
  "parity-util-mem-derive",
  "parking_lot 0.12.1",
- "primitive-types 0.12.1",
+ "primitive-types",
  "smallvec",
  "winapi",
 ]
@@ -9042,26 +8982,13 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "primitive-types"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28720988bff275df1f51b171e1b2a18c30d194c4d2b61defdacecd625a5d94a"
-dependencies = [
- "fixed-hash 0.7.0",
- "impl-codec",
- "impl-rlp",
- "scale-info",
- "uint",
-]
-
 [[package]]
 name = "primitive-types"
 version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f3486ccba82358b11a77516035647c34ba167dfa53312630de83b12bd4f3d66"
 dependencies = [
- "fixed-hash 0.8.0",
+ "fixed-hash",
  "impl-codec",
  "impl-rlp",
  "impl-serde 0.4.0",
@@ -11618,7 +11545,7 @@ dependencies = [
  "num-traits",
  "parity-scale-codec",
  "parking_lot 0.12.1",
- "primitive-types 0.12.1",
+ "primitive-types",
  "rand 0.7.3",
  "regex",
  "scale-info",
@@ -11882,7 +11809,7 @@ dependencies = [
  "bytes",
  "impl-trait-for-tuples",
  "parity-scale-codec",
- "primitive-types 0.12.1",
+ "primitive-types",
  "sp-externalities",
  "sp-runtime-interface-proc-macro",
  "sp-std",
@@ -13886,8 +13813,8 @@ name = "xcm-primitives"
 version = "0.1.0"
 source = "git+https://github.com/darwinia-network/moonbeam?branch=prepare-polkadot-v0.9.33#d9a02eca48e9026ca304223b93348d8d958f719a"
 dependencies = [
- "ethereum 0.14.0",
- "ethereum-types 0.14.1",
+ "ethereum",
+ "ethereum-types",
  "frame-support",
  "frame-system",
  "hex",
diff --git a/pallet/message-transact/Cargo.toml b/pallet/message-transact/Cargo.toml
index b0baa3a4..d671dbfc 100644
--- a/pallet/message-transact/Cargo.toml
+++ b/pallet/message-transact/Cargo.toml
@@ -12,7 +12,7 @@ version     = "6.0.0"
 [dependencies]
 # crates.io
 codec      = { default-features = false, package = "parity-scale-codec", version = "3.2.1", features = ["derive"] }
-ethereum   = { default-features = false, version = "0.12.0",  features = ["with-codec"] }
+ethereum   = { default-features = false, version = "0.14.0",  features = ["with-codec"] }
 scale-info = { default-features = false, version = "2.3.0", features = ["derive"] }
 
 # frontier