upgrade evm 0.37.0

harryliisme3 · harryliisme3 · commit 11afa2d0efee · 2023-01-31T13:44:25.000+08:00
diff --git a/src/components/abciapp/Cargo.toml b/src/components/abciapp/Cargo.toml
@@ -42,7 +42,7 @@ percent-encoding = "2.1.0"
 nix = "0.22.1"
 ruc = { version = "1.0.5", default-features = false, features = ["compact"] }
 module-evm = { path = "../contracts/modules/evm"}
-ethereum-types = { version = "0.13.1", default-features = false }
+ethereum-types = { version = "0.14.1", default-features = false }
 
 noah = { git = "https://github.com/FindoraNetwork/noah", tag = "v0.3.0" }
 noah-algebra = { git = "https://github.com/FindoraNetwork/noah", tag = "v0.3.0" }
diff --git a/src/components/contracts/baseapp/Cargo.toml b/src/components/contracts/baseapp/Cargo.toml
@@ -10,14 +10,14 @@ version = "0.1.0"
 
 [dependencies]
 abci = "0.7.2"
-ethereum = { version = "0.12.0", default-features = false, features = ["with-serde"] }
-ethereum-types = { version = "0.13.1", default-features = false }
+ethereum = { version = "0.14.0", default-features = false, features = ["with-serde"] }
+ethereum-types = { version = "0.14.1", default-features = false }
 futures = "0.3.16"
 lazy_static = "1.4.0"
 ledger = {path = "../../../ledger"}
 tracing = "0.1"
 parking_lot = "0.12"
-primitive-types = { version = "0.11.1", default-features = false, features = ["rlp", "byteorder", "serde"] }
+primitive-types = { version = "0.12.1", default-features = false, features = ["rlp", "byteorder", "serde"] }
 protobuf = "2.16"
 ruc = "1.0"
 serde = {version = "1.0.124", features = ["derive"]}
diff --git a/src/components/contracts/modules/account/Cargo.toml b/src/components/contracts/modules/account/Cargo.toml
@@ -11,7 +11,7 @@ readme = "README.md"
 [dependencies]
 abci = "0.7.2"
 tracing = "0.1"
-primitive-types = { version = "0.11.1", default-features = false, features = ["rlp", "byteorder", "serde"] }
+primitive-types = { version = "0.12.1", default-features = false, features = ["rlp", "byteorder", "serde"] }
 ruc = "1.0"
 serde = { version = "1.0.124", features = ["derive"] }
 serde_json = "1.0.64"
diff --git a/src/components/contracts/modules/ethereum/Cargo.toml b/src/components/contracts/modules/ethereum/Cargo.toml
@@ -10,9 +10,9 @@ readme = "README.md"
 
 [dependencies]
 abci = "0.7.2"
-ethereum = { version = "0.12.0", default-features = false, features = ["with-serde"] }
-ethereum-types = { version = "0.13.1", default-features = false }
-evm = { version = "0.36.0", default-features = false, features = ["with-serde"] }
+ethereum = { version = "0.14.0", default-features = false, features = ["with-serde"] }
+ethereum-types = { version = "0.14.1", default-features = false }
+evm = { version = "0.37.0", default-features = false, features = ["with-serde"] }
 tracing = "0.1"
 rand = "0.8"
 rlp = "0.5"
diff --git a/src/components/contracts/modules/evm/Cargo.toml b/src/components/contracts/modules/evm/Cargo.toml
@@ -10,11 +10,11 @@ readme = "README.md"
 
 [dependencies]
 abci = "0.7.2"
-ethereum-types = { version = "0.13.1", default-features = false }
-evm = { version = "0.36.0", default-features = false, features = ["with-serde"] }
+ethereum-types = { version = "0.14.1", default-features = false }
+evm = { version = "0.37.0", default-features = false, features = ["with-serde"] }
 evm-runtime = { version = "0.35.0", default-features = false }
 evm-gasometer = { version = "0.30.0", default-features = false }
-ethereum = { version = "0.12.0", default-features = false, features = ["with-serde"] }
+ethereum = { version = "0.14.0", default-features = false, features = ["with-serde"] }
 impl-trait-for-tuples = "0.2"
 tracing = "0.1"
 rlp = { version = "0.5", default-features = false }
@@ -23,7 +23,7 @@ serde = { version = "1.0.124", features = ["derive"] }
 serde_json = "1.0.64"
 sha3 = { version = "0.10", default-features = false }
 hex = "0.4.2"
-ethabi = "17.1.0"
+ethabi = "18.0.0"
 noah = { git = "https://github.com/FindoraNetwork/noah", tag = "v0.3.0" }
 noah-algebra = { git = "https://github.com/FindoraNetwork/noah", tag = "v0.3.0" }
 
diff --git a/src/components/contracts/modules/evm/precompile/Cargo.toml b/src/components/contracts/modules/evm/precompile/Cargo.toml
@@ -9,9 +9,9 @@ description = "MODEXP precompiles for EVM module."
 readme = "README.md"
 
 [dependencies]
-evm = { version = "0.36.0", default-features = false, features = ["with-serde"] }
+evm = { version = "0.37.0", default-features = false, features = ["with-serde"] }
 module-evm = { path = "../../../modules/evm"}
-ethereum-types = "0.13.1"
+ethereum-types = "0.14.1"
 evm-precompile-basic = { path = "./basic" }
 evm-precompile-sha3fips = {path = "./sha3fips" }
 evm-precompile-modexp = { path = "./modexp" }
diff --git a/src/components/contracts/modules/evm/precompile/basic/Cargo.toml b/src/components/contracts/modules/evm/precompile/basic/Cargo.toml
@@ -9,7 +9,7 @@ description = "Basic precompiles for EVM module."
 readme = "README.md"
 
 [dependencies]
-evm = { version = "0.36.0", default-features = false, features = ["with-serde"] }
+evm = { version = "0.37.0", default-features = false, features = ["with-serde"] }
 module-evm = { path = "../../../../modules/evm"}
 ripemd = "0.1"
 
diff --git a/src/components/contracts/modules/evm/precompile/eth-pairings/Cargo.toml b/src/components/contracts/modules/evm/precompile/eth-pairings/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 eth_pairings = { git = "https://github.com/FindoraNetwork/eip1962", branch = "master" }
-evm = { version = "0.36.0", default-features = false, features = ["with-serde"] }
+evm = { version = "0.37.0", default-features = false, features = ["with-serde"] }
 evm-precompile-utils = { path = "../utils"}
 tracing = "0.1"
 module-evm = { path = "../../../../modules/evm"}
@@ -16,5 +16,5 @@ num_enum = { version = "0.5.4", default-features = false }
 [dev-dependencies]
 baseapp = { path = "../../../../baseapp" }
 fp-mocks = { path = "../../../../primitives/mocks" }
-ethereum-types = { version = "0.13.1", default-features = false }
+ethereum-types = { version = "0.14.1", default-features = false }
 hex = "0.4"
diff --git a/src/components/contracts/modules/evm/precompile/frc20/Cargo.toml b/src/components/contracts/modules/evm/precompile/frc20/Cargo.toml
@@ -9,8 +9,8 @@ description = "FRC20 precompiles for EVM module."
 readme = "README.md"
 
 [dependencies]
-ethereum-types = { version = "0.13.1", default-features = false }
-evm = { version = "0.36.0", default-features = false, features = ["with-serde"] }
+ethereum-types = { version = "0.14.1", default-features = false }
+evm = { version = "0.37.0", default-features = false, features = ["with-serde"] }
 evm-precompile-utils = { path = "../utils"}
 fp-traits = { path = "../../../../primitives/traits" }
 tracing = "0.1"
diff --git a/src/components/contracts/modules/evm/precompile/modexp/Cargo.toml b/src/components/contracts/modules/evm/precompile/modexp/Cargo.toml
@@ -9,10 +9,10 @@ description = "MODEXP precompiles for EVM module."
 readme = "README.md"
 
 [dependencies]
-evm = { version = "0.36.0", default-features = false, features = ["with-serde"] }
+evm = { version = "0.37.0", default-features = false, features = ["with-serde"] }
 module-evm = { path = "../../../../modules/evm"}
 num = { version = "0.4", features = ["alloc"] }
-ethereum-types = { version = "0.13.1", default-features = false }
+ethereum-types = { version = "0.14.1", default-features = false }
 
 [dev-dependencies]
 hex = "0.4.2"
diff --git a/src/components/contracts/modules/evm/precompile/sha3fips/Cargo.toml b/src/components/contracts/modules/evm/precompile/sha3fips/Cargo.toml
@@ -9,6 +9,6 @@ description = "SHA3 FIPS202 precompiles for EVM module."
 readme = "README.md"
 
 [dependencies]
-evm = { version = "0.36.0", default-features = false, features = ["with-serde"] }
+evm = { version = "0.37.0", default-features = false, features = ["with-serde"] }
 module-evm = { path = "../../../../modules/evm"}
 tiny-keccak = { version = "2.0", features = ["fips202"] }
diff --git a/src/components/contracts/modules/evm/precompile/utils/Cargo.toml b/src/components/contracts/modules/evm/precompile/utils/Cargo.toml
@@ -6,9 +6,9 @@ edition = "2021"
 description = "Utils to write EVM precompiles."
 
 [dependencies]
-ethereum = { version = "0.12.0", default-features = false, features = ["with-serde"] }
-ethereum-types = { version = "0.13.1", default-features = false }
-evm = { version = "0.36.0", default-features = false, features = ["with-serde"] }
+ethereum = { version = "0.14.0", default-features = false, features = ["with-serde"] }
+ethereum-types = { version = "0.14.1", default-features = false }
+evm = { version = "0.37.0", default-features = false, features = ["with-serde"] }
 tracing = "0.1"
 num_enum = { version = "0.5.3", default-features = false }
 precompile-utils-macro = { path = "macro" }
diff --git a/src/components/contracts/modules/evm/test-vector-support/Cargo.toml b/src/components/contracts/modules/evm/test-vector-support/Cargo.toml
@@ -10,7 +10,7 @@ repository = "https://github.com/findoranetwork/platform/"
 hex = { version = "0.4.2"}
 serde = { version = "1.0.124", features = ["derive"] }
 serde_json = { version = "1.0"}
-evm = { version = "0.36.0", default-features = false, features = ["with-serde"] }
+evm = { version = "0.37.0", default-features = false, features = ["with-serde"] }
 module-evm = { path = "../../../modules/evm"}
 fp-mocks = { path = "../../../primitives/mocks" }
-ethereum-types = { version = "0.13.1", default-features = false }
+ethereum-types = { version = "0.14.1", default-features = false }
diff --git a/src/components/contracts/modules/evm/test-vector-support/src/lib.rs b/src/components/contracts/modules/evm/test-vector-support/src/lib.rs
@@ -75,7 +75,7 @@ pub fn test_precompile_test_vectors<P: Precompile>(
                     "test '{}' failed (different output)",
                     test.Name
                 );
-                if let Some(expected_gas) = test.Gas {
+                if let Some(_expected_gas) = test.Gas {
                     assert_eq!(
                         handle.gas_used,
                         0, //expected_gas,
diff --git a/src/components/contracts/modules/xhub/Cargo.toml b/src/components/contracts/modules/xhub/Cargo.toml
@@ -13,7 +13,7 @@ abci = "0.7.2"
 lazy_static = "1.4.0"
 ledger = { path = "../../../../ledger" }
 tracing = "0.1"
-primitive-types = { version = "0.11.1", default-features = false, features = ["rlp", "byteorder", "serde"] }
+primitive-types = { version = "0.12.1", default-features = false, features = ["rlp", "byteorder", "serde"] }
 ruc = "1.0"
 serde = { version = "1.0.124", features = ["derive"] }
 serde_json = "1.0"
diff --git a/src/components/contracts/primitives/core/Cargo.toml b/src/components/contracts/primitives/core/Cargo.toml
@@ -10,10 +10,10 @@ readme = "README.md"
 
 [dependencies]
 abci = { version = "0.7.2", optional = true }
-ethereum = { version = "0.12.0", default-features = false, features = ["with-serde"] }
+ethereum = { version = "0.14.0", default-features = false, features = ["with-serde"] }
 impl-trait-for-tuples = "0.2"
 parking_lot = "0.12"
-primitive-types = { version = "0.11.1", default-features = false, features = ["rlp", "byteorder", "serde"] }
+primitive-types = { version = "0.12.1", default-features = false, features = ["rlp", "byteorder", "serde"] }
 ruc = "1.0"
 serde = { version = "1.0.124", features = ["derive"] }
 storage = { git = "https://github.com/FindoraNetwork/storage.git", tag = "v1.0.0", optional = true }
diff --git a/src/components/contracts/primitives/enterprise-web3/Cargo.toml b/src/components/contracts/primitives/enterprise-web3/Cargo.toml
@@ -8,8 +8,8 @@ edition = "2021"
 [dependencies]
 lazy_static = "1.4.0"
 evm-exporter = { package = "evm-exporter", git = "https://github.com/FindoraNetwork/enterprise-web3.git", tag = "1.0.0"}
-ethereum = { version = "0.12.0", default-features = false, features = ["with-serde"] }
-primitive-types = "0.11.1" 
+ethereum = { version = "0.14.0", default-features = false, features = ["with-serde"] }
+primitive-types = "0.12.1" 
 redis = { version = "0.21", default-features = false, features = [ "tls", "r2d2" ] }
 r2d2 = { version = "0.8.8"}
 ruc = "1.0"
diff --git a/src/components/contracts/primitives/evm/Cargo.toml b/src/components/contracts/primitives/evm/Cargo.toml
@@ -9,9 +9,9 @@ description = "Findora Primitive EVM abstractions types"
 readme = "README.md"
 
 [dependencies]
-ethereum = { version = "0.12.0", default-features = false, features = ["with-serde"] }
-ethereum-types = { version = "0.13.1", default-features = false }
-evm = { version = "0.36.0", default-features = false, features = ["with-serde"] }
+ethereum = { version = "0.14.0", default-features = false, features = ["with-serde"] }
+ethereum-types = { version = "0.14.1", default-features = false }
+evm = { version = "0.37.0", default-features = false, features = ["with-serde"] }
 ruc = "1.0"
 serde = { version = "1.0.124", features = ["derive"] }
 
diff --git a/src/components/contracts/primitives/mocks/Cargo.toml b/src/components/contracts/primitives/mocks/Cargo.toml
@@ -10,10 +10,10 @@ description = "Findora primitive mock functions for testing"
 [dependencies]
 abci = "0.7.2"
 baseapp = { path = "../../baseapp" }
-ethereum = { version = "0.12.0", default-features = false, features = ["with-serde"] }
+ethereum = { version = "0.14.0", default-features = false, features = ["with-serde"] }
 lazy_static = "1.4.0"
 libsecp256k1 = { version = "0.7", features = ["static-context", "hmac"] }
-primitive-types = { version = "0.11.1", default-features = false, features = ["rlp", "byteorder", "serde"] }
+primitive-types = { version = "0.12.1", default-features = false, features = ["rlp", "byteorder", "serde"] }
 rand_chacha = "0.3"
 rlp = "0.5"
 serde_json = "1.0"
diff --git a/src/components/contracts/primitives/rpc-core/Cargo.toml b/src/components/contracts/primitives/rpc-core/Cargo.toml
@@ -9,7 +9,7 @@ description = "RPC traits of Ethereum."
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
-ethereum-types = "0.13.1"
+ethereum-types = "0.14.1"
 futures = "0.3.16"
 jsonrpc-core = { git = "https://github.com/FindoraNetwork/jsonrpc.git", package = "jsonrpc-core" }
 jsonrpc-core-client = { git = "https://github.com/FindoraNetwork/jsonrpc.git", package = "jsonrpc-core-client" }
diff --git a/src/components/contracts/primitives/traits/Cargo.toml b/src/components/contracts/primitives/traits/Cargo.toml
@@ -10,8 +10,8 @@ readme = "README.md"
 
 [dependencies]
 config = {path = "../../../config"}
-ethereum = { version = "0.12.0", default-features = false, features = ["with-serde"] }
-primitive-types = { version = "0.11.1", default-features = false, features = ["rlp", "byteorder", "serde"] }
+ethereum = { version = "0.14.0", default-features = false, features = ["with-serde"] }
+primitive-types = { version = "0.12.1", default-features = false, features = ["rlp", "byteorder", "serde"] }
 ruc = "1.0"
 
 # primitives
diff --git a/src/components/contracts/primitives/types/Cargo.toml b/src/components/contracts/primitives/types/Cargo.toml
@@ -10,12 +10,12 @@ readme = "README.md"
 
 [dependencies]
 bech32 = "0.7.2"
-ethereum = { version = "0.12.0", default-features = false, features = ["with-serde"] }
+ethereum = { version = "0.14.0", default-features = false, features = ["with-serde"] }
 fixed-hash = "0.8.0"
 hex = "0.4.2"
 globutils = { path = "../../../../libs/globutils" }
 libsecp256k1 = { version = "0.7", features = ["static-context", "hmac"] }
-primitive-types = { version = "0.11.1", default-features = false, features = ["rlp", "byteorder", "serde"] }
+primitive-types = { version = "0.12.1", default-features = false, features = ["rlp", "byteorder", "serde"] }
 ruc = "1.0"
 serde = { version = "1.0.124", features = ["derive"] }
 serde_json = "1.0"
diff --git a/src/components/contracts/primitives/utils/Cargo.toml b/src/components/contracts/primitives/utils/Cargo.toml
@@ -16,7 +16,7 @@ blake2-rfc = "0.2.18"
 byteorder = "1.4.3"
 hex = "0.4.2"
 libsecp256k1 = { version = "0.7", features = ["static-context", "hmac"] }
-primitive-types = { version = "0.11.1", default-features = false, features = ["rlp", "byteorder", "serde"] }
+primitive-types = { version = "0.12.1", default-features = false, features = ["rlp", "byteorder", "serde"] }
 protobuf = "2.16"
 rand = "0.8"
 ruc = "1.0"
diff --git a/src/components/contracts/primitives/wasm/Cargo.toml b/src/components/contracts/primitives/wasm/Cargo.toml
@@ -14,8 +14,8 @@ wasm-opt = false
 
 [dependencies]
 base64 = "0.13"
-ethereum = { version = "0.12.0", default-features = false, features = ["with-serde"] }
-ethereum-types = { version = "0.13.1", default-features = false }
+ethereum = { version = "0.14.0", default-features = false, features = ["with-serde"] }
+ethereum-types = { version = "0.14.1", default-features = false }
 fp-types = { path = "../../primitives/types" }
 fp-utils = { path = "../../primitives/utils" }
 rlp = "0.5"
diff --git a/src/components/contracts/rpc/Cargo.toml b/src/components/contracts/rpc/Cargo.toml
@@ -14,9 +14,9 @@ abci = "0.7.2"
 async-std = "1.9.0"
 baseapp = { path = "../baseapp" }
 base64 = "0.13"
-ethereum = { version = "0.12.0", default-features = false, features = ["with-serde"] }
-ethereum-types = { version = "0.13.1", default-features = false }
-evm = { version = "0.36.0", default-features = false, features = ["with-serde"] }
+ethereum = { version = "0.14.0", default-features = false, features = ["with-serde"] }
+ethereum-types = { version = "0.14.1", default-features = false }
+evm = { version = "0.37.0", default-features = false, features = ["with-serde"] }
 fp-rpc-core = { path = "../primitives/rpc-core" }
 fp-rpc-server = { path = "../primitives/rpc-server" }
 futures = { version = "0.3.16", features = ["compat", "thread-pool"] }
