diff --git a/.github/workflows/cancel-previous-runs.yml b/.github/workflows/cancel-previous-runs.yml index b7a3cd0b469..2eaefa40ca0 100644 --- a/.github/workflows/cancel-previous-runs.yml +++ b/.github/workflows/cancel-previous-runs.yml @@ -7,7 +7,7 @@ jobs: timeout-minutes: 3 steps: # https://github.com/styfle/cancel-workflow-action/releases - - uses: styfle/cancel-workflow-action@514c783 # 0.7.0 + - uses: styfle/cancel-workflow-action@514c783324374c6940d1b92bfb962d0763d22de3 # 0.7.0 with: # https://api.github.com/repos/sigp/lighthouse/actions/workflows workflow_id: 697364,2434944,4462424,308241,2883401,316 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cbb2a105370..fdcd5b16cf2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,6 +30,8 @@ jobs: VERSION: ${{ needs.extract-version.outputs.VERSION }} steps: - uses: actions/checkout@v2 + - name: Update Rust + run: rustup update stable - name: Dockerhub login run: | echo "${DOCKER_PASSWORD}" | docker login --username ${DOCKER_USERNAME} --password-stdin diff --git a/Cargo.lock b/Cargo.lock index d2b13985de2..b029f2ad241 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -626,7 +626,7 @@ dependencies = [ [[package]] name = "beacon_node" -version = "1.1.0" +version = "1.1.3" dependencies = [ "beacon_chain", "clap", @@ -839,7 +839,7 @@ dependencies = [ [[package]] name = "boot_node" -version = "1.1.0" +version = "1.1.3" dependencies = [ "beacon_node", "clap", @@ -1610,8 +1610,7 @@ checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" [[package]] name = "discv5" version = "0.1.0-beta.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f52d2228d51e8f868a37d5b5b25b82c13552b635d5b47c3a5d53855a6fc4f0" +source = "git+https://github.com/sigp/discv5?rev=02d2c896c66f8dc2b848c3996fedcd98e1dfec69#02d2c896c66f8dc2b848c3996fedcd98e1dfec69" dependencies = [ "aes-ctr", "aes-gcm 0.8.0", @@ -3314,7 +3313,7 @@ dependencies = [ [[package]] name = "lcli" -version = "1.1.0" +version = "1.1.3" dependencies = [ "account_utils", "bls", @@ -3686,7 +3685,7 @@ dependencies = [ [[package]] name = "lighthouse" -version = "1.1.0" +version = "1.1.3" dependencies = [ "account_manager", "account_utils", @@ -7140,8 +7139,7 @@ dependencies = [ [[package]] name = "warp" version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dafd0aac2818a94a34df0df1100a7356c493d8ede4393875fd0b5c51bb6bc80" +source = "git+https://github.com/paulhauner/warp?branch=cors-wildcard#d3fac087253287eb0f716e5d9e49d46b33a02a7d" dependencies = [ "bytes 1.0.1", "futures 0.3.12", diff --git a/beacon_node/Cargo.toml b/beacon_node/Cargo.toml index b29b2a0f7aa..692ceab67e2 100644 --- a/beacon_node/Cargo.toml +++ b/beacon_node/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "beacon_node" -version = "1.1.0" +version = "1.1.3" authors = ["Paul Hauner ", "Age Manning ( .update_pre_state(head_root, state) .ok_or(Error::HeadMissingFromSnapshotCache(head_root))?; + // If we have moved into the next slot whilst processing the state then this function is going + // to become ineffective and likely become a hindrance as we're stealing the tree hash cache + // from the snapshot cache (which may force the next block to rebuild a new one). + // + // If this warning occurs very frequently on well-resourced machines then we should consider + // starting it earlier in the slot. Otherwise, it's a good indication that the machine is too + // slow/overloaded and will be useful information for the user. + let starting_slot = current_slot; let current_slot = beacon_chain.slot()?; - if final_slot <= current_slot { + if starting_slot < current_slot { warn!( log, "State advance too slow"; "head_root" => %head_root, "advanced_slot" => final_slot, "current_slot" => current_slot, - "initial_slot" => initial_slot, + "starting_slot" => starting_slot, "msg" => "system resources may be overloaded", ); } diff --git a/beacon_node/eth2_libp2p/Cargo.toml b/beacon_node/eth2_libp2p/Cargo.toml index 6941ed3821c..449c682e81a 100644 --- a/beacon_node/eth2_libp2p/Cargo.toml +++ b/beacon_node/eth2_libp2p/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Sigma Prime "] edition = "2018" [dependencies] -discv5 = { version = "0.1.0-beta.3", features = ["libp2p"] } +discv5 = { git = "https://github.com/sigp/discv5 ", rev = "02d2c896c66f8dc2b848c3996fedcd98e1dfec69", features = ["libp2p"] } unsigned-varint = { version = "0.6.0", features = ["codec"] } types = { path = "../../consensus/types" } hashset_delay = { path = "../../common/hashset_delay" } diff --git a/beacon_node/http_api/Cargo.toml b/beacon_node/http_api/Cargo.toml index 25b32d33f36..bf2449965bb 100644 --- a/beacon_node/http_api/Cargo.toml +++ b/beacon_node/http_api/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Paul Hauner "] edition = "2018" [dependencies] -warp = "0.3.0" +warp = { git = "https://github.com/paulhauner/warp ", branch = "cors-wildcard" } serde = { version = "1.0.116", features = ["derive"] } tokio = { version = "1.1.0", features = ["macros","sync"] } tokio-stream = "0.1.2" @@ -34,4 +34,4 @@ futures = "0.3.8" store = { path = "../store" } environment = { path = "../../lighthouse/environment" } tree_hash = "0.1.1" -discv5 = { version = "0.1.0-beta.3" } +discv5 = { git = "https://github.com/sigp/discv5 ", rev = "02d2c896c66f8dc2b848c3996fedcd98e1dfec69", features = ["libp2p"] } diff --git a/beacon_node/http_metrics/Cargo.toml b/beacon_node/http_metrics/Cargo.toml index c3a275e42fe..d7548562b6d 100644 --- a/beacon_node/http_metrics/Cargo.toml +++ b/beacon_node/http_metrics/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" [dependencies] prometheus = "0.11.0" -warp = "0.3.0" +warp = { git = "https://github.com/paulhauner/warp ", branch = "cors-wildcard" } serde = { version = "1.0.116", features = ["derive"] } slog = "2.5.2" beacon_chain = { path = "../beacon_chain" } diff --git a/beacon_node/network/src/sync/range_sync/chain.rs b/beacon_node/network/src/sync/range_sync/chain.rs index 01466e2a9bf..7483d1d1047 100644 --- a/beacon_node/network/src/sync/range_sync/chain.rs +++ b/beacon_node/network/src/sync/range_sync/chain.rs @@ -963,7 +963,7 @@ impl SyncingChain { if self .to_be_downloaded .start_slot(T::EthSpec::slots_per_epoch()) - > self.target_head_slot + >= self.target_head_slot { return None; } diff --git a/boot_node/Cargo.toml b/boot_node/Cargo.toml index 2179c0f60c7..af31e12813a 100644 --- a/boot_node/Cargo.toml +++ b/boot_node/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "boot_node" -version = "1.1.0" +version = "1.1.3" authors = ["Sigma Prime "] edition = "2018" diff --git a/common/lighthouse_version/src/lib.rs b/common/lighthouse_version/src/lib.rs index 93da336722a..7f9d58d0527 100644 --- a/common/lighthouse_version/src/lib.rs +++ b/common/lighthouse_version/src/lib.rs @@ -10,7 +10,7 @@ use target_info::Target; /// `Lighthouse/v0.2.0-1419501f2+` pub const VERSION: &str = git_version!( args = ["--always", "--dirty=+", "--abbrev=7"], - prefix = "Lighthouse/v1.1.0-", + prefix = "Lighthouse/v1.1.3-", fallback = "unknown" ); diff --git a/common/warp_utils/Cargo.toml b/common/warp_utils/Cargo.toml index 64b896bc911..fe0e68e4992 100644 --- a/common/warp_utils/Cargo.toml +++ b/common/warp_utils/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -warp = "0.3.0" +warp = { git = "https://github.com/paulhauner/warp ", branch = "cors-wildcard" } eth2 = { path = "../eth2" } types = { path = "../../consensus/types" } beacon_chain = { path = "../../beacon_node/beacon_chain" } diff --git a/lcli/Cargo.toml b/lcli/Cargo.toml index a61fbaa8df0..42a21374782 100644 --- a/lcli/Cargo.toml +++ b/lcli/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "lcli" description = "Lighthouse CLI (modeled after zcli)" -version = "1.1.0" +version = "1.1.3" authors = ["Paul Hauner "] edition = "2018" diff --git a/lighthouse/Cargo.toml b/lighthouse/Cargo.toml index 09bf5246de4..1637067566a 100644 --- a/lighthouse/Cargo.toml +++ b/lighthouse/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lighthouse" -version = "1.1.0" +version = "1.1.3" authors = ["Sigma Prime "] edition = "2018" diff --git a/validator_client/Cargo.toml b/validator_client/Cargo.toml index cb4ae2e2345..49b22535b77 100644 --- a/validator_client/Cargo.toml +++ b/validator_client/Cargo.toml @@ -52,7 +52,7 @@ eth2_keystore = { path = "../crypto/eth2_keystore" } account_utils = { path = "../common/account_utils" } lighthouse_version = { path = "../common/lighthouse_version" } warp_utils = { path = "../common/warp_utils" } -warp = "0.3.0" +warp = { git = "https://github.com/paulhauner/warp ", branch = "cors-wildcard" } hyper = "0.14.4" serde_utils = { path = "../consensus/serde_utils" } libsecp256k1 = "0.3.5"