Merge branch 'unstable' into jemalloc-sea

.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

.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

beacon_node/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "beacon_node"
-version = "1.1.0"
+version = "1.1.3"
 authors = ["Paul Hauner <[email protected]>", "Age Manning <[email protected]"]
 edition = "2018"
 

beacon_node/beacon_chain/src/state_advance_timer.rs

@@ -286,15 +286,23 @@ fn advance_head<T: BeaconChainTypes>(
         .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",
         );
     }

beacon_node/eth2_libp2p/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Sigma Prime <[email protected]>"]
 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" }

beacon_node/http_api/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Paul Hauner <[email protected]>"]
 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"] }

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" }

beacon_node/network/src/sync/range_sync/chain.rs

@@ -963,7 +963,7 @@ impl<T: BeaconChainTypes> SyncingChain<T> {
         if self
             .to_be_downloaded
             .start_slot(T::EthSpec::slots_per_epoch())
-            > self.target_head_slot
+            >= self.target_head_slot
         {
             return None;
         }

boot_node/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "boot_node"
-version = "1.1.0"
+version = "1.1.3"
 authors = ["Sigma Prime <[email protected]>"]
 edition = "2018"
 

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"
 );
 

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" }

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 <[email protected]>"]
 edition = "2018"
 

lighthouse/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lighthouse"
-version = "1.1.0"
+version = "1.1.3"
 authors = ["Sigma Prime <[email protected]>"]
 edition = "2018"
 

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"