update rust-toolchain to 1.69.0 and update some deps

polkadot-evm · Jun 14, 2023 · f0b434b · f0b434b
1 parent 18adfe1
commit f0b434b
Show file tree

Hide file tree

Showing 16 changed files with 40 additions and 34 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -16,7 +16,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.68.2
+          toolchain: 1.69.0
           target: wasm32-unknown-unknown
           override: true
           components: rust-docs

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -20,7 +20,7 @@ jobs:
       uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: 1.68.2
+        toolchain: 1.69.0
         target: wasm32-unknown-unknown
         override: true
     - name: Install protoc
@@ -39,7 +39,7 @@ jobs:
       uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: 1.68.2
+        toolchain: 1.69.0
         target: wasm32-unknown-unknown
         override: true
     - name: Install protoc
@@ -72,7 +72,7 @@ jobs:
       uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: 1.68.2
+        toolchain: 1.69.0
         target: wasm32-unknown-unknown
         override: true
         components: rustfmt, clippy

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -39,25 +39,30 @@ edition = "2021"
 repository = "https://github.com/paritytech/frontier/"
 
 [workspace.dependencies]
+async-trait = "0.1"
 bn = { package = "substrate-bn", version = "0.6", default-features = false }
 clap = { version = "4.3", features = ["derive", "deprecated"] }
 environmental = { version = "1.1.4", default-features = false }
 ethereum = { version = "0.14.0", default-features = false }
 ethereum-types = { version = "0.14.1", default-features = false }
 evm = { version = "0.39.1", default-features = false }
-hex-literal = { version = "0.3.4" }
+futures = "0.3.28"
+hex = { version = "0.4.3", default-features = false, features = ["alloc"] }
+hex-literal = "0.4.1"
 impl-serde = { version = "0.4.0", default-features = false }
 jsonrpsee = "0.16.2"
 kvdb-rocksdb = "0.19.0"
 libsecp256k1 = { version = "0.7.1", default-features = false }
 log = { version = "0.4.17", default-features = false }
-parity-db = "0.4.6"
+parity-db = "0.4.8"
+parking_lot = "0.12.1"
 rlp = { version = "0.5", default-features = false }
 scale-codec = { package = "parity-scale-codec", version = "3.2.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.3.1", default-features = false, features = ["derive"] }
 serde = { version = "1.0", default-features = false, features = ["derive", "alloc"] }
 serde_json = "1.0"
 sqlx = { version = "0.7.0-alpha.3", default-features = false, features = ["macros"] }
+thiserror = "1.0"
 tokio = "1.28.2"
 # Substrate Client
 sc-basic-authorship = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", branch = "master" }

diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
@@ -26,7 +26,7 @@ fp-rpc = { workspace = true, features = ["default"] }
 fp-storage = { workspace = true, features = ["default"] }
 
 [dev-dependencies]
-futures = "0.3.21"
+futures = { workspace = true }
 scale-codec = { package = "parity-scale-codec", workspace = true }
 tempfile = "3.3.0"
 # Substrate

diff --git a/client/consensus/Cargo.toml b/client/consensus/Cargo.toml
@@ -11,8 +11,8 @@ repository = { workspace = true }
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-async-trait = "0.1"
-thiserror = "1.0"
+async-trait = { workspace = true }
+thiserror = { workspace = true }
 # Substrate
 sc-consensus = { workspace = true }
 sp-api = { workspace = true }

diff --git a/client/db/Cargo.toml b/client/db/Cargo.toml
@@ -11,17 +11,17 @@ repository = { workspace = true }
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-async-trait = "0.1"
+async-trait = { workspace = true }
 ethereum = { workspace = true, features = ["with-codec"] }
-futures = "0.3.25"
+futures = { workspace = true }
 kvdb-rocksdb = { workspace = true, optional = true }
-log = "0.4.17"
+log = { workspace = true }
 parity-db = { workspace = true, optional = true }
-parking_lot = "0.12.1"
+parking_lot = { workspace = true }
 scale-codec = { package = "parity-scale-codec", workspace = true }
 smallvec = "1.10"
 sqlx = { workspace = true, features = ["runtime-tokio-native-tls", "sqlite"] }
-tokio = { version = "1.19", features = ["macros", "sync"] }
+tokio = { workspace = true, features = ["macros", "sync"] }
 # Substrate
 sc-client-api = { workspace = true }
 sc-client-db = { workspace = true, features = ["rocksdb"] }

diff --git a/client/mapping-sync/Cargo.toml b/client/mapping-sync/Cargo.toml
@@ -11,11 +11,11 @@ repository = { workspace = true }
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-futures = "0.3.25"
+futures = { workspace = true }
 futures-timer = "3.0.2"
-log = "0.4.17"
-parking_lot = "0.12.1"
-tokio = { version = "1.19", features = ["macros", "sync"] }
+log = { workspace = true }
+parking_lot = { workspace = true }
+tokio = { workspace = true, features = ["macros", "sync"] }
 # Substrate
 sc-client-api = { workspace = true }
 sc-utils = { workspace = true }

diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml
@@ -14,11 +14,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 ethereum = { workspace = true, features = ["with-codec"] }
 ethereum-types = { workspace = true }
 evm = { workspace = true }
-futures = "0.3.25"
-hex = "0.4.3"
+futures = { workspace = true }
+hex = { workspace = true }
 jsonrpsee = { workspace = true, features = ["server", "macros"] }
 libsecp256k1 = { workspace = true }
-log = "0.4.17"
+log = { workspace = true }
 lru = "0.8.1"
 prometheus = { version = "0.13.1", default-features = false }
 rand = "0.8"

diff --git a/frame/ethereum/Cargo.toml b/frame/ethereum/Cargo.toml
@@ -31,7 +31,7 @@ fp-storage = { workspace = true }
 pallet-evm = { workspace = true }
 
 [dev-dependencies]
-hex = "0.4.3"
+hex = { workspace = true }
 libsecp256k1 = { workspace = true, features = ["static-context", "hmac"] }
 rlp = { workspace = true }
 # Substrate

diff --git a/frame/evm/Cargo.toml b/frame/evm/Cargo.toml
@@ -14,8 +14,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 environmental = { workspace = true, optional = true }
 evm = { workspace = true, features = ["with-codec"] }
-hex = { version = "0.4.3", default-features = false, features = ["alloc"] }
-hex-literal = { version = "0.3.4" }
+hex = { workspace = true, optional = true }
+hex-literal = { workspace = true }
 impl-trait-for-tuples = "0.2.2"
 log = { workspace = true }
 rlp = { workspace = true }
@@ -45,7 +45,7 @@ std = [
 	"environmental?/std",
 	"evm/std",
 	"evm/with-serde",
-	"hex/std",
+	"hex?/std",
 	"log/std",
 	"rlp/std",
 	"scale-codec/std",
@@ -63,6 +63,7 @@ std = [
 	"fp-evm/std",
 ]
 runtime-benchmarks = [
+	"hex",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",

diff --git a/frame/evm/precompile/modexp/Cargo.toml b/frame/evm/precompile/modexp/Cargo.toml
@@ -13,7 +13,7 @@ num = { version = "0.4", default-features = false, features = ["alloc"] }
 fp-evm = { workspace = true }
 
 [dev-dependencies]
-hex = "0.4.3"
+hex = { workspace = true }
 # Frontier
 pallet-evm-test-vector-support = { workspace = true }
 

diff --git a/frame/evm/test-vector-support/Cargo.toml b/frame/evm/test-vector-support/Cargo.toml
@@ -9,7 +9,7 @@ repository = { workspace = true }
 
 [dependencies]
 evm = { workspace = true, features = ["with-codec"] }
-hex = "0.4.3"
+hex = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 # Substrate

diff --git a/primitives/account/Cargo.toml b/primitives/account/Cargo.toml
@@ -8,7 +8,7 @@ edition = { workspace = true }
 repository = { workspace = true }
 
 [dependencies]
-hex = { version = "0.4.3", default-features = false }
+hex = { workspace = true }
 impl-serde = { workspace = true, optional = true }
 libsecp256k1 = { workspace = true }
 log = { workspace = true }

diff --git a/primitives/dynamic-fee/Cargo.toml b/primitives/dynamic-fee/Cargo.toml
@@ -11,7 +11,7 @@ repository = { workspace = true }
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-async-trait = { version = "0.1", optional = true }
+async-trait = { workspace = true, optional = true }
 # Substrate
 sp-core = { workspace = true }
 sp-inherents = { workspace = true }

diff --git a/template/node/Cargo.toml b/template/node/Cargo.toml
@@ -13,12 +13,12 @@ repository = { workspace = true }
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-async-trait = "0.1"
+async-trait = { workspace = true }
 clap = { workspace = true }
-futures = "0.3.25"
+futures = { workspace = true }
 hex-literal = { workspace = true }
 jsonrpsee = { workspace = true, features = ["server", "macros"] }
-log = "0.4.17"
+log = { workspace = true }
 scale-codec = { package = "parity-scale-codec", workspace = true }
 serde = { workspace = true }