gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-01 03:33:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/stable' into back-merge-6.0.1

Browse Source
This commit is contained in:
Michael Sproul
2024-12-16 15:37:52 +11:00
parent c92c07ff49 0d90135047
commit a6de0d5e12
17 changed files with 126 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/lighthouse_version/src/lib.rs
View File

@@ -17,8 +17,8 @@ pub const VERSION: &str = git_version!(
// NOTE: using --match instead of --exclude for compatibility with old Git
"--match=thiswillnevermatchlol"
],
prefix = "Lighthouse/v6.0.0-",
fallback = "Lighthouse/v6.0.0"
prefix = "Lighthouse/v6.0.1-",
fallback = "Lighthouse/v6.0.1"
);
/// Returns the first eight characters of the latest commit hash for this build.

4
common/system_health/src/lib.rs
View File

@@ -235,14 +235,14 @@ pub fn observe_nat() -> NatState {
let libp2p_ipv4 = lighthouse_network::metrics::get_int_gauge(
&lighthouse_network::metrics::NAT_OPEN,
&["libp2p"],
&["libp2p_ipv4"],
)
.map(|g| g.get() == 1)
.unwrap_or_default();
let libp2p_ipv6 = lighthouse_network::metrics::get_int_gauge(
&lighthouse_network::metrics::NAT_OPEN,
&["libp2p"],
&["libp2p_ipv6"],
)
.map(|g| g.get() == 1)
.unwrap_or_default();