Skip to content

[Merged by Bors] - Update dependencies #2084

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
blacktemplar wants to merge 1 commit into from
Closed

[Merged by Bors] - Update dependencies #2084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
132 changes: 102 additions & 30 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion beacon_node/eth1/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2018"
[dev-dependencies]
eth1_test_rig = { path = "../../testing/eth1_test_rig" }
toml = "0.5.6"
web3 = "0.13.0"
web3 = "0.14.0"
sloggers = "1.0.1"
environment = { path = "../../lighthouse/environment" }
tokio-compat-02 = "0.1"
Expand Down
2 changes: 1 addition & 1 deletion common/eth2/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ serde_utils = { path = "../../consensus/serde_utils" }
zeroize = { version = "1.1.1", features = ["zeroize_derive"] }
eth2_keystore = { path = "../../crypto/eth2_keystore" }
libsecp256k1 = "0.3.5"
ring = "0.16.12"
ring = "0.16.19"
bytes = "0.5.6"
account_utils = { path = "../../common/account_utils" }
eth2_ssz = "0.1.2"
Expand Down
2 changes: 1 addition & 1 deletion common/remote_signer_consumer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ remote_signer_test = { path = "../../testing/remote_signer_test" }
[dependencies]
reqwest = { version = "0.10.8", features = ["json"] }
serde = { version = "1.0.116", features = ["derive"] }
tokio = { version = "0.2.22", features = ["time"] }
tokio = { version = "0.3.5", features = ["time"] }
types = { path = "../../consensus/types" }
2 changes: 1 addition & 1 deletion crypto/eth2_hashing/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ description = "Hashing primitives used in Ethereum 2.0"
lazy_static = { version = "1.4.0", optional = true }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
ring = "0.16.12"
ring = "0.16.19"

[target.'cfg(target_arch = "wasm32")'.dependencies]
sha2 = "0.9.1"
Expand Down
2 changes: 1 addition & 1 deletion crypto/eth2_key_derivation/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ edition = "2018"
sha2 = "0.9.1"
zeroize = { version = "1.1.1", features = ["zeroize_derive"] }
num-bigint-dig = { version = "0.6.0", features = ["zeroize"] }
ring = "0.16.12"
ring = "0.16.19"
bls = { path = "../bls" }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion remote_signer/client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ clap = "2.33.3"
client_backend = { path = "../backend", package = "remote_signer_backend" }
environment = { path = "../../lighthouse/environment" }
futures = "0.3.6"
hyper = { git = "https://github.com/sigp/hyper", branch = "lighthouse" }
hyper = "0.13.8"
lazy_static = "1.4.0"
regex = "1.3.9"
serde = { version = "1.0.116", features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion testing/eth1_test_rig/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2018"
[dependencies]
tokio = { version = "0.3.2", features = ["time"] }
tokio-compat-02 = "0.1"
web3 = "0.13.0"
web3 = "0.14.0"
futures = "0.3.7"
types = { path = "../../consensus/types"}
serde_json = "1.0.58"
Expand Down
3 changes: 1 addition & 2 deletions testing/eth1_test_rig/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,8 +287,7 @@ async fn deploy_deposit_contract(
gas: Some(U256::from(CONTRACT_DEPLOY_GAS)),
..Options::default()
})
.execute(bytecode, (), deploy_address)
.map_err(|e| format!("Failed to execute deployment: {:?}", e))?;
.execute(bytecode, (), deploy_address);

pending_contract
.compat()
Expand Down
3 changes: 2 additions & 1 deletion testing/remote_signer_test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@ reqwest = { version = "0.10.8", features = ["blocking", "json"] }
serde = { version = "1.0.116", features = ["derive"] }
serde_json = "1.0.58"
tempdir = "0.3.7"
tokio = { version = "0.2.22", features = ["time"] }
tokio = { version = "0.3.5", features = ["time"] }
types = { path = "../../consensus/types" }
tokio-compat-02 = "0.1"
Loading