From d7c3bc8c134938a1f05017f18f035f88ba4faa23 Mon Sep 17 00:00:00 2001 From: Michael McGee Date: Mon, 1 Apr 2024 20:04:08 +0000 Subject: [PATCH] firedancer: report client as firedancer via. gossip --- version/src/legacy.rs | 8 ++++---- version/src/lib.rs | 11 ++++++----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/version/src/legacy.rs b/version/src/legacy.rs index 4c9d7d3073f054..fbdc7f8afd857c 100644 --- a/version/src/legacy.rs +++ b/version/src/legacy.rs @@ -47,10 +47,10 @@ impl Default for LegacyVersion2 { .unwrap(), ); Self { - major: env!("CARGO_PKG_VERSION_MAJOR").parse().unwrap(), - minor: env!("CARGO_PKG_VERSION_MINOR").parse().unwrap(), - patch: env!("CARGO_PKG_VERSION_PATCH").parse().unwrap(), - commit: compute_commit(option_env!("CI_COMMIT")), + major: env!("FIREDANCER_VERSION_MAJOR").parse().unwrap(), + minor: env!("FIREDANCER_VERSION_MINOR").parse().unwrap(), + patch: env!("FIREDANCER_VERSION_PATCH").parse().unwrap(), + commit: compute_commit(option_env!("FIREDANCER_CI_COMMIT")), feature_set, } } diff --git a/version/src/lib.rs b/version/src/lib.rs index f570188f1d12b0..6a99fc39045c99 100644 --- a/version/src/lib.rs +++ b/version/src/lib.rs @@ -73,13 +73,14 @@ impl Default for Version { .unwrap(), ); Self { - major: env!("CARGO_PKG_VERSION_MAJOR").parse().unwrap(), - minor: env!("CARGO_PKG_VERSION_MINOR").parse().unwrap(), - patch: env!("CARGO_PKG_VERSION_PATCH").parse().unwrap(), - commit: compute_commit(option_env!("CI_COMMIT")).unwrap_or_default(), + // FIREDANCER: Report client as Firedancer to gossip + major: env!("FIREDANCER_VERSION_MAJOR").parse().unwrap(), + minor: env!("FIREDANCER_VERSION_MINOR").parse().unwrap(), + patch: env!("FIREDANCER_VERSION_PATCH").parse().unwrap(), + commit: compute_commit(option_env!("FIREDANCER_CI_COMMIT")).unwrap_or_default(), feature_set, // Other client implementations need to modify this line. - client: u16::try_from(ClientId::Agave).unwrap(), + client: u16::try_from(ClientId::Firedancer).unwrap(), } } }