diff --git a/Cargo.lock b/Cargo.lock index 364893bf6d..4bdc0944a6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4692,7 +4692,7 @@ dependencies = [ [[package]] name = "node-launchpad" -version = "0.3.0" +version = "0.3.2" dependencies = [ "atty", "better-panic", @@ -6923,7 +6923,7 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "sn-node-manager" -version = "0.9.0" +version = "0.9.2" dependencies = [ "assert_cmd", "assert_fs", @@ -6982,7 +6982,7 @@ dependencies = [ [[package]] name = "sn_auditor" -version = "0.1.18" +version = "0.1.20" dependencies = [ "blsttc", "clap", @@ -7021,7 +7021,7 @@ dependencies = [ [[package]] name = "sn_cli" -version = "0.93.0" +version = "0.93.2" dependencies = [ "aes 0.7.5", "base64 0.22.1", @@ -7062,7 +7062,7 @@ dependencies = [ [[package]] name = "sn_client" -version = "0.107.0" +version = "0.107.3" dependencies = [ "assert_matches", "async-trait", @@ -7147,7 +7147,7 @@ dependencies = [ [[package]] name = "sn_faucet" -version = "0.4.20" +version = "0.4.22" dependencies = [ "assert_fs", "base64 0.22.1", @@ -7218,7 +7218,7 @@ dependencies = [ [[package]] name = "sn_networking" -version = "0.16.0" +version = "0.16.2" dependencies = [ "aes-gcm-siv", "async-trait", @@ -7260,7 +7260,7 @@ dependencies = [ [[package]] name = "sn_node" -version = "0.107.0" +version = "0.107.2" dependencies = [ "assert_fs", "assert_matches", @@ -7315,7 +7315,7 @@ dependencies = [ [[package]] name = "sn_node_rpc_client" -version = "0.6.19" +version = "0.6.20" dependencies = [ "assert_fs", "async-trait", @@ -7342,7 +7342,7 @@ dependencies = [ [[package]] name = "sn_peers_acquisition" -version = "0.3.0" +version = "0.3.1" dependencies = [ "clap", "lazy_static", @@ -7358,7 +7358,7 @@ dependencies = [ [[package]] name = "sn_protocol" -version = "0.17.0" +version = "0.17.2" dependencies = [ "blsttc", "bytes", @@ -7402,7 +7402,7 @@ dependencies = [ [[package]] name = "sn_service_management" -version = "0.3.1" +version = "0.3.3" dependencies = [ "async-trait", "dirs-next", @@ -7428,7 +7428,7 @@ dependencies = [ [[package]] name = "sn_transfers" -version = "0.18.2" +version = "0.18.4" dependencies = [ "assert_fs", "blsttc", diff --git a/nat-detection/Cargo.toml b/nat-detection/Cargo.toml index 63c556fa72..47322517c4 100644 --- a/nat-detection/Cargo.toml +++ b/nat-detection/Cargo.toml @@ -28,7 +28,7 @@ libp2p = { version = "0.53", features = [ "macros", "upnp", ] } -sn_networking = { path = "../sn_networking", version = "0.16.0" } +sn_networking = { path = "../sn_networking", version = "0.16.2" } tokio = { version = "1.32.0", features = ["full"] } tracing = { version = "~0.1.26" } tracing-log = "0.2.0" diff --git a/node-launchpad/CHANGELOG.md b/node-launchpad/CHANGELOG.md index 14c2ae231c..922680ea4c 100644 --- a/node-launchpad/CHANGELOG.md +++ b/node-launchpad/CHANGELOG.md @@ -6,6 +6,95 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.3.2](https://github.com/joshuef/safe_network/compare/node-launchpad-v0.3.1...node-launchpad-v0.3.2) - 2024-06-03 + +### Added +- provide `--autostart` flag for `add` command +- configure winsw in `node-launchpad` +- *(launchpad)* use nat detection server to determine the nat status +- *(launchpad)* update the start stop node popup +- *(launchpad)* keep track of the nodes to start +- *(launchpad)* update manage nodes ui +- *(launchpad)* implement help pop up +- *(launchpad)* revamp the beta programme flow +- *(launchpad)* update footer to include two lines of commands +- *(launchpad)* setup the basic device status table +- *(launchpad)* set a new header for the home scene +- *(launchpad)* set new discord id on change +- *(manager)* implement nat detection during safenode add +- *(launchpad)* provide safenode path for testing +- *(manager)* maintain n running nodes +- *(auditor)* add new beta participants via endpoint +- *(launchpad)* accept peers args +- supply discord username on launchpad +- provide `--owner` arg for `add` cmd +- *(nodeman)* add LogFormat as a startup arg for nodes +- *(node-launchpad)* discord name widget styling +- *(node-launchpad)* tweaks on resource allocation widget +- *(launchpad)* initial automatic resource allocation logic +- *(launchpad)* allow users to input disk space to allocate +- *(launchpad)* store discord username to disk +- *(launchpad)* use escape to exit input screen and restore old value +- *(launchpad)* have customizable footer +- *(launchpad)* add discord username scene +- *(launchpad)* remove separate ai launcher bin references +- *(launchpad)* ensure start mac launchapd with sudo only if not set + +### Fixed +- *(launchpad)* make the bg colors work better +- *(manager)* update nat detection exit code +- retain options on upgrade and prevent dup ports +- *(launchpad)* check if component is active before handling events +- *(launchpad)* prevent mac opening with sudo +- use fixed size popups +- *(launchpad)* prevent loops from terminal/sudo relaunching +- *(launchpad)* do not try to run sudo twice + +### Other +- *(release)* sn_faucet-v0.4.21/sn_service_management-v0.3.2/sn_transfers-v0.18.3/sn_auditor-v0.1.19/sn_client-v0.107.2/sn_networking-v0.16.1/sn_cli-v0.93.1/sn_node-v0.107.1/node-launchpad-v0.3.1/sn-node-manager-v0.9.1/sn_peers_acquisition-v0.3.1 +- bump versions to enable re-release with env vars at compilation +- *(release)* sn_auditor-v0.1.18/sn_client-v0.107.0/sn_networking-v0.16.0/sn_protocol-v0.17.0/sn_transfers-v0.18.2/sn_peers_acquisition-v0.3.0/sn_cli-v0.93.0/sn_faucet-v0.4.20/sn_metrics-v0.1.8/sn_node-v0.107.0/sn_service_management-v0.3.1/node-launchpad-v0.3.0/sn-node-manager-v0.9.0/sn_node_rpc_client-v0.6.19 +- *(launchpad)* typo fix, use program +- *(launchpad)* fixes for white terminal theme +- *(launchpad)* disable unused stats +- *(launchpad)* disable start stop if node count not set +- *(launchpad)* use the correct styling throughout +- *(launchpad)* update scene variant name to BetaProgramme +- *(launchpad)* removed the splash screen on discord id submition +- *(launchpad)* set new color scheme for home +- *(launchpad)* update node status box +- *(manager)* move nat detection out of add subcommand +- *(release)* sn_auditor-v0.1.17/sn_client-v0.106.3/sn_networking-v0.15.3/sn_transfers-v0.18.1/sn_logging-v0.2.27/sn_cli-v0.92.0/sn_faucet-v0.4.19/sn_node-v0.106.5/sn_service_management-v0.3.0/node-launchpad-v0.2.0/sn-node-manager-v0.8.0/sn_protocol-v0.16.7/sn_node_rpc_client-v0.6.18 +- update sn-releases +- update based on comment +- *(release)* sn_auditor-v0.1.16/sn_cli-v0.91.4/sn_faucet-v0.4.18/sn_metrics-v0.1.7/sn_node-v0.106.4/sn_service_management-v0.2.8/node-launchpad-v0.1.5/sn-node-manager-v0.7.7/sn_node_rpc_client-v0.6.17 +- check we are in terminal before creating one +- *(release)* node-launchpad-v0.1.4 +- use published versions of deps +- *(release)* node-launchpad-v0.1.3/sn-node-manager-v0.7.6 +- *(release)* sn_auditor-v0.1.15/sn_cli-v0.91.3/sn_faucet-v0.4.17/sn_metrics-v0.1.6/sn_node-v0.106.3/sn_service_management-v0.2.7/node-launchpad-v0.1.2/sn_node_rpc_client-v0.6.16 +- *(launchpad)* removing redudnat for loops +- move helper text inside popup +- change trigger resource allocation input box keybind +- *(launchpad)* highlight the table in green if we're currently running +- *(launchpad)* add more alternative keybinds +- change terminal launch behaviour +- use consistent border styles +- *(launchpad)* use safe data dir to store configs +- *(release)* sn_auditor-v0.1.13/sn_client-v0.106.1/sn_networking-v0.15.1/sn_protocol-v0.16.6/sn_cli-v0.91.1/sn_faucet-v0.4.15/sn_node-v0.106.1/node-launchpad-v0.1.1/sn_node_rpc_client-v0.6.14/sn_peers_acquisition-v0.2.12/sn_service_management-v0.2.6 +- *(release)* sn_auditor-v0.1.12/sn_client-v0.106.0/sn_networking-v0.15.0/sn_transfers-v0.18.0/sn_peers_acquisition-v0.2.11/sn_logging-v0.2.26/sn_cli-v0.91.0/sn_faucet-v0.4.14/sn_metrics-v0.1.5/sn_node-v0.106.0/sn_service_management-v0.2.5/test_utils-v0.4.1/node-launchpad-v/sn-node-manager-v0.7.5/sn_node_rpc_client-v0.6.13/token_supplies-v0.1.48/sn_protocol-v0.16.5 +- *(versions)* sync versions with latest crates.io vs for nodeman +- *(versions)* sync versions with latest crates.io vs +- rename sn_node_launchpad -> node-launchpad +- rename `node-launchpad` crate to `sn_node_launchpad` +- rebased and removed custom rustfmt +- *(tui)* rename crate + +## [0.3.1](https://github.com/joshuef/safe_network/compare/node-launchpad-v0.3.0...node-launchpad-v0.3.1) - 2024-06-03 + +### Other +- bump versions to enable re-release with env vars at compilation + ## [0.3.0](https://github.com/joshuef/safe_network/compare/node-launchpad-v0.2.0...node-launchpad-v0.3.0) - 2024-06-03 ### Added diff --git a/node-launchpad/Cargo.toml b/node-launchpad/Cargo.toml index a73e7ee654..0a0ea1e817 100644 --- a/node-launchpad/Cargo.toml +++ b/node-launchpad/Cargo.toml @@ -2,7 +2,7 @@ authors = ["MaidSafe Developers "] description = "Node Launchpad" name = "node-launchpad" -version = "0.3.0" +version = "0.3.2" edition = "2021" license = "GPL-3.0" homepage = "https://maidsafe.net" @@ -47,10 +47,10 @@ ratatui = { version = "0.26.0", features = ["serde", "macros", "unstable-widget- serde = { version = "1.0.188", features = ["derive"] } serde_json = "1.0.107" signal-hook = "0.3.17" -sn-node-manager = { version = "0.9.0", path = "../sn_node_manager" } -sn_peers_acquisition = { version = "0.3.0", path = "../sn_peers_acquisition", features = ["network-contacts"]} +sn-node-manager = { version = "0.9.2", path = "../sn_node_manager" } +sn_peers_acquisition = { version = "0.3.1", path = "../sn_peers_acquisition", features = ["network-contacts"]} sn-releases = "~0.2.6" -sn_service_management = { version = "0.3.1", path = "../sn_service_management" } +sn_service_management = { version = "0.3.3", path = "../sn_service_management" } strip-ansi-escapes = "0.2.0" strum = { version = "0.26.1", features = ["derive"] } sysinfo = "0.30.12" diff --git a/node-launchpad/src/components/home.rs b/node-launchpad/src/components/home.rs index 95dd82c861..a84d5af05e 100644 --- a/node-launchpad/src/components/home.rs +++ b/node-launchpad/src/components/home.rs @@ -226,6 +226,13 @@ impl Component for Home { }, Action::StoreNodesToStart(count) => { self.nodes_to_start = count; + if self.nodes_to_start == 0 { + info!("Nodes to start set to 0. Sending command to stop all nodes."); + return Ok(Some(Action::HomeActions(HomeActions::StopNodes))); + } else { + info!("Nodes to start set to: {count}. Sending command to start nodes"); + return Ok(Some(Action::HomeActions(HomeActions::StartNodes))); + } } Action::StoreDiscordUserName(username) => { let reset_safenode_services = (self.discord_username != username) diff --git a/node-launchpad/src/components/manage_nodes.rs b/node-launchpad/src/components/manage_nodes.rs index a9546d5d17..6d2b551ba7 100644 --- a/node-launchpad/src/components/manage_nodes.rs +++ b/node-launchpad/src/components/manage_nodes.rs @@ -24,6 +24,7 @@ use super::{utils::centered_rect_fixed, Component}; pub const GB_PER_NODE: usize = 5; pub const MB: usize = 1000 * 1000; pub const GB: usize = MB * 1000; +pub const MAX_NODE_COUNT: usize = 50; pub struct ManageNodes { /// Whether the component is active right now, capturing keystrokes + drawing things. @@ -35,17 +36,18 @@ pub struct ManageNodes { } impl ManageNodes { - pub fn new(allocated_space: usize) -> Result { + pub fn new(nodes_to_start: usize) -> Result { + let nodes_to_start = std::cmp::min(nodes_to_start, MAX_NODE_COUNT); let new = Self { active: false, available_disk_space_gb: Self::get_available_space_b()? / GB, - nodes_to_start_input: Input::default().with_value(allocated_space.to_string()), + nodes_to_start_input: Input::default().with_value(nodes_to_start.to_string()), old_value: Default::default(), }; Ok(new) } - fn get_nodes_to_start(&self) -> usize { + fn get_nodes_to_start_val(&self) -> usize { self.nodes_to_start_input.value().parse().unwrap_or(0) } @@ -62,6 +64,12 @@ impl ManageNodes { Ok(available_space_b) } + // Returns the max number of nodes to start + // It is the minimum of the available disk space and the max nodes limit + fn max_nodes_to_start(&self) -> usize { + std::cmp::min(self.available_disk_space_gb / GB_PER_NODE, MAX_NODE_COUNT) + } + #[cfg(unix)] fn get_mount_point() -> PathBuf { PathBuf::from("/") @@ -82,13 +90,9 @@ impl Component for ManageNodes { let send_back = match key.code { KeyCode::Enter => { let nodes_to_start_str = self.nodes_to_start_input.value().to_string(); - let nodes_to_start = { - let max_space_to_use = std::cmp::min( - self.get_nodes_to_start() * GB_PER_NODE, - self.available_disk_space_gb, - ); - max_space_to_use / GB_PER_NODE - }; + let nodes_to_start = + std::cmp::min(self.get_nodes_to_start_val(), self.max_nodes_to_start()); + // set the new value self.nodes_to_start_input = self .nodes_to_start_input @@ -120,17 +124,18 @@ impl Component for ManageNodes { if c == '0' && self.nodes_to_start_input.value().is_empty() { return Ok(vec![]); } - // if it might exceed the available space, then enter the max let number = c.to_string().parse::().unwrap_or(0); - let new_value = format!("{}{}", self.get_nodes_to_start(), number) + let new_value = format!("{}{}", self.get_nodes_to_start_val(), number) .parse::() .unwrap_or(0); - if new_value * GB_PER_NODE > self.available_disk_space_gb { - let max_nodes = self.available_disk_space_gb / GB_PER_NODE; + // if it might exceed the available space or if more than max_node_count, then enter the max + if new_value * GB_PER_NODE > self.available_disk_space_gb + || new_value > MAX_NODE_COUNT + { self.nodes_to_start_input = self .nodes_to_start_input .clone() - .with_value(max_nodes.to_string()); + .with_value(self.max_nodes_to_start().to_string()); return Ok(vec![]); } self.nodes_to_start_input.handle_event(&Event::Key(key)); @@ -142,20 +147,22 @@ impl Component for ManageNodes { } KeyCode::Up | KeyCode::Down => { let nodes_to_start = { - let nodes_to_start = self.get_nodes_to_start(); + let current_val = self.get_nodes_to_start_val(); if key.code == KeyCode::Up { - if (nodes_to_start + 1) * GB_PER_NODE <= self.available_disk_space_gb { - nodes_to_start + 1 + if current_val + 1 >= MAX_NODE_COUNT { + MAX_NODE_COUNT + } else if (current_val + 1) * GB_PER_NODE <= self.available_disk_space_gb { + current_val + 1 } else { - nodes_to_start + current_val } } else { // Key::Down - if nodes_to_start == 0 { + if current_val == 0 { 0 } else { - nodes_to_start - 1 + current_val - 1 } } }; @@ -255,7 +262,7 @@ impl Component for ManageNodes { let width = layer_input_field[2].width.max(3) - 3; let scroll = self.nodes_to_start_input.visual_scroll(width as usize); - let input = Paragraph::new(self.get_nodes_to_start().to_string()) + let input = Paragraph::new(self.get_nodes_to_start_val().to_string()) .style(Style::new().fg(VIVID_SKY_BLUE)) .scroll((0, scroll as u16)) .alignment(Alignment::Center); @@ -271,7 +278,7 @@ impl Component for ManageNodes { let info = Line::from(vec![ Span::styled("Using", info_style), Span::styled( - format!(" {}GB ", self.get_nodes_to_start() * GB_PER_NODE), + format!(" {}GB ", self.get_nodes_to_start_val() * GB_PER_NODE), info_style.bold(), ), Span::styled( @@ -283,7 +290,9 @@ impl Component for ManageNodes { f.render_widget(info, layer_one[2]); // ==== help ==== - let help = Paragraph::new(" Note: Each node will use a small amount of CPU\n Memory and Network Bandwidth. We recommend\n starting no more than 5 at a time.") + let help = Paragraph::new( + format!(" Note: Each node will use a small amount of CPU\n Memory and Network Bandwidth. We recommend\n starting no more than 5 at a time (max {MAX_NODE_COUNT} nodes).") + ) .fg(GHOST_WHITE); f.render_widget(help, layer_one[4]); diff --git a/resources/scripts/get-foundation-cash.sh b/resources/scripts/get-foundation-cash.sh new file mode 100755 index 0000000000..52929d90a8 --- /dev/null +++ b/resources/scripts/get-foundation-cash.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash + +# Grabs foundation cash note from a server and attempts to deposit it locally via the current installed safe version + +# Suffix to append to the version. Passed as an argument to this script. +FOUNDATION_SERVER="$1" + +# if doundation server not provided, exit + if [ -z "$FOUNDATION_SERVER" ]; then + echo "Please provide the foundation server IP address as an argument to this script" + exit 1 +fi + +scp root@$FOUNDATION_SERVER:/home/safe/.local/share/safe/test_faucet/wallet/foundation_disbursement.cash_note $TMPDIR/foundation.transfer +safe wallet receive $TMPDIR/foundation.transfer +safe wallet balance diff --git a/sn_auditor/CHANGELOG.md b/sn_auditor/CHANGELOG.md index 1350d9a8cf..c6058a7b17 100644 --- a/sn_auditor/CHANGELOG.md +++ b/sn_auditor/CHANGELOG.md @@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.1.20](https://github.com/joshuef/safe_network/compare/sn_auditor-v0.1.19...sn_auditor-v0.1.20) - 2024-06-03 + +### Other +- updated the following local packages: sn_client + +## [0.1.19](https://github.com/joshuef/safe_network/compare/sn_auditor-v0.1.18...sn_auditor-v0.1.19) - 2024-06-03 + +### Other +- bump versions to enable re-release with env vars at compilation + ## [0.1.18](https://github.com/joshuef/safe_network/compare/sn_auditor-v0.1.17...sn_auditor-v0.1.18) - 2024-06-03 ### Added diff --git a/sn_auditor/Cargo.toml b/sn_auditor/Cargo.toml index b70669079d..4cce23c440 100644 --- a/sn_auditor/Cargo.toml +++ b/sn_auditor/Cargo.toml @@ -2,7 +2,7 @@ authors = ["MaidSafe Developers "] description = "Safe Network Auditor" name = "sn_auditor" -version = "0.1.18" +version = "0.1.20" edition = "2021" homepage = "https://maidsafe.net" repository = "https://github.com/maidsafe/safe_network" @@ -29,9 +29,9 @@ dirs-next = "~2.0.0" graphviz-rust = { version = "0.9.0", optional = true } serde = { version = "1.0.133", features = ["derive", "rc"] } serde_json = "1.0.108" -sn_client = { path = "../sn_client", version = "0.107.0" } +sn_client = { path = "../sn_client", version = "0.107.3" } sn_logging = { path = "../sn_logging", version = "0.2.27" } -sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.3.0" } +sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.3.1" } tiny_http = { version = "0.12", features = ["ssl-rustls"] } tracing = { version = "~0.1.26" } tokio = { version = "1.32.0", features = [ diff --git a/sn_cli/CHANGELOG.md b/sn_cli/CHANGELOG.md index 9e36b111f9..11b1df7297 100644 --- a/sn_cli/CHANGELOG.md +++ b/sn_cli/CHANGELOG.md @@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.93.2](https://github.com/joshuef/safe_network/compare/sn_cli-v0.93.1...sn_cli-v0.93.2) - 2024-06-03 + +### Fixed +- enable compile time sk setting for faucet/genesis + +## [0.93.1](https://github.com/joshuef/safe_network/compare/sn_cli-v0.93.0...sn_cli-v0.93.1) - 2024-06-03 + +### Other +- bump versions to enable re-release with env vars at compilation + ## [0.93.0](https://github.com/joshuef/safe_network/compare/sn_cli-v0.92.0...sn_cli-v0.93.0) - 2024-06-03 ### Added diff --git a/sn_cli/Cargo.toml b/sn_cli/Cargo.toml index 42d7551a3a..e01965ff6d 100644 --- a/sn_cli/Cargo.toml +++ b/sn_cli/Cargo.toml @@ -8,7 +8,7 @@ license = "GPL-3.0" name = "sn_cli" readme = "README.md" repository = "https://github.com/maidsafe/safe_network" -version = "0.93.0" +version = "0.93.2" [[bin]] path = "src/bin/main.rs" @@ -58,10 +58,10 @@ reqwest = { version = "0.12.2", default-features = false, features = [ rmp-serde = "1.1.1" serde = { version = "1.0.133", features = ["derive"] } sn_build_info = { path = "../sn_build_info", version = "0.1.7" } -sn_client = { path = "../sn_client", version = "0.107.0" } +sn_client = { path = "../sn_client", version = "0.107.3" } sn_logging = { path = "../sn_logging", version = "0.2.27" } -sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.3.0" } -sn_protocol = { path = "../sn_protocol", version = "0.17.0" } +sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.3.1" } +sn_protocol = { path = "../sn_protocol", version = "0.17.2" } tempfile = "3.6.0" tiny-keccak = "~2.0.2" tokio = { version = "1.32.0", features = [ @@ -83,7 +83,7 @@ eyre = "0.6.8" criterion = "0.5.1" tempfile = "3.6.0" rand = { version = "~0.8.5", features = ["small_rng"] } -sn_client = { path = "../sn_client", version = "0.107.0", features = [ +sn_client = { path = "../sn_client", version = "0.107.3", features = [ "test-utils", ] } diff --git a/sn_client/CHANGELOG.md b/sn_client/CHANGELOG.md index 6beeba79d0..d8827b87ee 100644 --- a/sn_client/CHANGELOG.md +++ b/sn_client/CHANGELOG.md @@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.107.3](https://github.com/joshuef/safe_network/compare/sn_client-v0.107.2...sn_client-v0.107.3) - 2024-06-03 + +### Fixed +- enable compile time sk setting for faucet/genesis + +## [0.107.2](https://github.com/joshuef/safe_network/compare/sn_client-v0.107.1...sn_client-v0.107.2) - 2024-06-03 + +### Other +- bump versions to enable re-release with env vars at compilation + ## [0.107.0](https://github.com/joshuef/safe_network/compare/sn_client-v0.106.3...sn_client-v0.107.0) - 2024-06-03 ### Added diff --git a/sn_client/Cargo.toml b/sn_client/Cargo.toml index 6da6056e92..21f297ccf9 100644 --- a/sn_client/Cargo.toml +++ b/sn_client/Cargo.toml @@ -8,7 +8,7 @@ license = "GPL-3.0" name = "sn_client" readme = "README.md" repository = "https://github.com/maidsafe/safe_network" -version = "0.107.0" +version = "0.107.3" [features] default = [] @@ -49,17 +49,17 @@ rayon = "1.8.0" rmp-serde = "1.1.1" self_encryption = "~0.29.0" serde = { version = "1.0.133", features = ["derive", "rc"] } -sn_networking = { path = "../sn_networking", version = "0.16.0" } -sn_protocol = { path = "../sn_protocol", version = "0.17.0" } +sn_networking = { path = "../sn_networking", version = "0.16.2" } +sn_protocol = { path = "../sn_protocol", version = "0.17.2" } serde_json = "1.0" sn_registers = { path = "../sn_registers", version = "0.3.13" } -sn_transfers = { path = "../sn_transfers", version = "0.18.2" } +sn_transfers = { path = "../sn_transfers", version = "0.18.4" } tempfile = "3.6.0" thiserror = "1.0.23" tiny-keccak = "~2.0.2" tracing = { version = "~0.1.26" } xor_name = "5.0.0" -sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.3.0", optional = true } +sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.3.1", optional = true } eyre = { version = "0.6.8", optional = true } lazy_static = { version = "~1.4.0", optional = true } @@ -85,7 +85,7 @@ crate-type = ["cdylib", "rlib"] getrandom = { version = "0.2.12", features = ["js"] } wasm-bindgen = "0.2.90" wasm-bindgen-futures = "0.4.40" -sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.3.0" } +sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.3.1" } console_error_panic_hook = "0.1.6" tracing-wasm = "0.2.1" wasmtimer = "0.2.0" diff --git a/sn_client/src/faucet.rs b/sn_client/src/faucet.rs index ebecb4a683..e098037328 100644 --- a/sn_client/src/faucet.rs +++ b/sn_client/src/faucet.rs @@ -7,7 +7,7 @@ // permissions and limitations relating to use of the SAFE Network Software. use crate::{wallet::send, Client, Error, Result}; -use sn_transfers::{load_genesis_wallet, HotWallet, NanoTokens, FOUNDATION_PK}; +use sn_transfers::{load_genesis_wallet, HotWallet, NanoTokens, Transfer, FOUNDATION_PK}; const INITIAL_FAUCET_BALANCE: NanoTokens = NanoTokens::from(900000000000000000); @@ -98,14 +98,14 @@ pub async fn fund_faucet_from_genesis_wallet( // write the foundation cashnote to disk let root_dir = faucet_wallet.api().wallet_dir(); - let foundation_cashnote_path = root_dir.join("foundation_cashnote.cash_note"); + let foundation_transfer_path = root_dir.join("foundation_disbursement.transfer"); - debug!("Writing cash note to: {foundation_cashnote_path:?}"); - let hex = foundation_cashnote - .to_hex() - .map_err(|_| Error::GenesisDisbursement)?; - if let Err(error) = std::fs::write(foundation_cashnote_path, hex) { - error!("Could not write the foundation cashnote to disk: {error}."); + debug!("Writing cash note to: {foundation_transfer_path:?}"); + + let transfer = Transfer::transfer_from_cash_note(&foundation_cashnote)?.to_hex()?; + + if let Err(error) = std::fs::write(foundation_transfer_path, transfer) { + error!("Could not write the foundation transfer to disk: {error}."); return Err(Error::from(error)); } } diff --git a/sn_faucet/CHANGELOG.md b/sn_faucet/CHANGELOG.md index a341bb064e..01ea014b37 100644 --- a/sn_faucet/CHANGELOG.md +++ b/sn_faucet/CHANGELOG.md @@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.4.22](https://github.com/joshuef/safe_network/compare/sn_faucet-v0.4.21...sn_faucet-v0.4.22) - 2024-06-03 + +### Other +- updated the following local packages: sn_client, sn_transfers, sn_cli + ## [0.4.20](https://github.com/joshuef/safe_network/compare/sn_faucet-v0.4.19...sn_faucet-v0.4.20) - 2024-06-03 ### Added diff --git a/sn_faucet/Cargo.toml b/sn_faucet/Cargo.toml index 849f67f3ec..8d5ce061e9 100644 --- a/sn_faucet/Cargo.toml +++ b/sn_faucet/Cargo.toml @@ -8,7 +8,7 @@ license = "GPL-3.0" name = "sn_faucet" readme = "README.md" repository = "https://github.com/maidsafe/safe_network" -version = "0.4.20" +version = "0.4.22" [features] default = ["gifting"] @@ -38,12 +38,12 @@ minreq = { version = "2.11.0", features = ["https-rustls"], optional = true } serde = { version = "1.0.193", features = ["derive"] } serde_json = "1.0.108" sn_build_info = { path = "../sn_build_info", version = "0.1.7" } -sn_cli = { path = "../sn_cli", version = "0.93.0" } -sn_client = { path = "../sn_client", version = "0.107.0" } +sn_cli = { path = "../sn_cli", version = "0.93.2" } +sn_client = { path = "../sn_client", version = "0.107.3" } sn_logging = { path = "../sn_logging", version = "0.2.27" } -sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.3.0" } -sn_protocol = { path = "../sn_protocol", version = "0.17.0" } -sn_transfers = { path = "../sn_transfers", version = "0.18.2" } +sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.3.1" } +sn_protocol = { path = "../sn_protocol", version = "0.17.2" } +sn_transfers = { path = "../sn_transfers", version = "0.18.4" } tokio = { version = "1.32.0", features = ["parking_lot", "rt"] } tracing = { version = "~0.1.26" } url = "2.5.0" diff --git a/sn_networking/CHANGELOG.md b/sn_networking/CHANGELOG.md index cec658862d..931cdb9353 100644 --- a/sn_networking/CHANGELOG.md +++ b/sn_networking/CHANGELOG.md @@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.16.2](https://github.com/joshuef/safe_network/compare/sn_networking-v0.16.1...sn_networking-v0.16.2) - 2024-06-03 + +### Other +- updated the following local packages: sn_transfers + +## [0.16.1](https://github.com/joshuef/safe_network/compare/sn_networking-v0.16.0...sn_networking-v0.16.1) - 2024-06-03 + +### Other +- bump versions to enable re-release with env vars at compilation + ## [0.16.0](https://github.com/joshuef/safe_network/compare/sn_networking-v0.15.3...sn_networking-v0.16.0) - 2024-06-03 ### Added diff --git a/sn_networking/Cargo.toml b/sn_networking/Cargo.toml index e8f1338946..b7966c5312 100644 --- a/sn_networking/Cargo.toml +++ b/sn_networking/Cargo.toml @@ -8,7 +8,7 @@ license = "GPL-3.0" name = "sn_networking" readme = "README.md" repository = "https://github.com/maidsafe/safe_network" -version = "0.16.0" +version = "0.16.2" [features] default = ["libp2p/quic"] @@ -55,8 +55,8 @@ rayon = "1.8.0" rmp-serde = "1.1.1" serde = { version = "1.0.133", features = ["derive", "rc"] } sn_build_info = { path="../sn_build_info", version = "0.1.7" } -sn_protocol = { path = "../sn_protocol", version = "0.17.0" } -sn_transfers = { path = "../sn_transfers", version = "0.18.2" } +sn_protocol = { path = "../sn_protocol", version = "0.17.2" } +sn_transfers = { path = "../sn_transfers", version = "0.18.4" } sn_registers = { path = "../sn_registers", version = "0.3.13" } sysinfo = { version = "0.30.8", default-features = false, optional = true } thiserror = "1.0.23" diff --git a/sn_node/CHANGELOG.md b/sn_node/CHANGELOG.md index 1af37b9963..f6bd44d8c4 100644 --- a/sn_node/CHANGELOG.md +++ b/sn_node/CHANGELOG.md @@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.107.2](https://github.com/joshuef/safe_network/compare/sn_node-v0.107.1...sn_node-v0.107.2) - 2024-06-03 + +### Fixed +- enable compile time sk setting for faucet/genesis + +## [0.107.1](https://github.com/joshuef/safe_network/compare/sn_node-v0.107.0...sn_node-v0.107.1) - 2024-06-03 + +### Other +- bump versions to enable re-release with env vars at compilation + ## [0.107.0](https://github.com/joshuef/safe_network/compare/sn_node-v0.106.5...sn_node-v0.107.0) - 2024-06-03 ### Added diff --git a/sn_node/Cargo.toml b/sn_node/Cargo.toml index 9598cfbaac..d86fefd7e3 100644 --- a/sn_node/Cargo.toml +++ b/sn_node/Cargo.toml @@ -2,7 +2,7 @@ authors = ["MaidSafe Developers "] description = "Safe Node" name = "sn_node" -version = "0.107.0" +version = "0.107.2" edition = "2021" license = "GPL-3.0" homepage = "https://maidsafe.net" @@ -52,14 +52,14 @@ rayon = "1.8.0" self_encryption = "~0.29.0" serde = { version = "1.0.133", features = ["derive", "rc"] } sn_build_info = { path = "../sn_build_info", version = "0.1.7" } -sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.3.0" } -sn_client = { path = "../sn_client", version = "0.107.0" } +sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.3.1" } +sn_client = { path = "../sn_client", version = "0.107.3" } sn_logging = { path = "../sn_logging", version = "0.2.27" } -sn_networking = { path = "../sn_networking", version = "0.16.0" } -sn_protocol = { path = "../sn_protocol", version = "0.17.0" } +sn_networking = { path = "../sn_networking", version = "0.16.2" } +sn_protocol = { path = "../sn_protocol", version = "0.17.2" } sn_registers = { path = "../sn_registers", version = "0.3.13" } -sn_transfers = { path = "../sn_transfers", version = "0.18.2" } -sn_service_management = { path = "../sn_service_management", version = "0.3.1" } +sn_transfers = { path = "../sn_transfers", version = "0.18.4" } +sn_service_management = { path = "../sn_service_management", version = "0.3.3" } thiserror = "1.0.23" tokio = { version = "1.32.0", features = [ "io-util", @@ -86,7 +86,7 @@ reqwest = { version = "0.12.2", default-features = false, features = [ "rustls-tls-manual-roots", ] } serde_json = "1.0" -sn_protocol = { path = "../sn_protocol", version = "0.17.0", features = [ +sn_protocol = { path = "../sn_protocol", version = "0.17.2", features = [ "rpc", ] } tempfile = "3.6.0" diff --git a/sn_node_manager/CHANGELOG.md b/sn_node_manager/CHANGELOG.md index 493b4cf40e..85d23bd212 100644 --- a/sn_node_manager/CHANGELOG.md +++ b/sn_node_manager/CHANGELOG.md @@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.9.2](https://github.com/joshuef/safe_network/compare/sn-node-manager-v0.9.1...sn-node-manager-v0.9.2) - 2024-06-03 + +### Fixed +- enable compile time sk setting for faucet/genesis + +## [0.9.1](https://github.com/joshuef/safe_network/compare/sn-node-manager-v0.9.0...sn-node-manager-v0.9.1) - 2024-06-03 + +### Other +- bump versions to enable re-release with env vars at compilation + ## [0.9.0](https://github.com/joshuef/safe_network/compare/sn-node-manager-v0.8.0...sn-node-manager-v0.9.0) - 2024-06-03 ### Added diff --git a/sn_node_manager/Cargo.toml b/sn_node_manager/Cargo.toml index 3e3f4a67df..589f126472 100644 --- a/sn_node_manager/Cargo.toml +++ b/sn_node_manager/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "sn-node-manager" readme = "README.md" repository = "https://github.com/maidsafe/safe_network" -version = "0.9.0" +version = "0.9.2" [[bin]] name = "safenode-manager" @@ -43,11 +43,11 @@ serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" service-manager = "0.7.0" sn_logging = { path = "../sn_logging", version = "0.2.27" } -sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.3.0" } -sn_protocol = { path = "../sn_protocol", version = "0.17.0" } -sn_service_management = { path = "../sn_service_management", version = "0.3.1" } +sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.3.1" } +sn_protocol = { path = "../sn_protocol", version = "0.17.2" } +sn_service_management = { path = "../sn_service_management", version = "0.3.3" } sn-releases = "0.2.6" -sn_transfers = { path = "../sn_transfers", version = "0.18.2" } +sn_transfers = { path = "../sn_transfers", version = "0.18.4" } sysinfo = "0.30.12" tokio = { version = "1.26", features = ["full"] } tracing = { version = "~0.1.26" } diff --git a/sn_node_rpc_client/CHANGELOG.md b/sn_node_rpc_client/CHANGELOG.md index 0e1154d6b7..894b76e777 100644 --- a/sn_node_rpc_client/CHANGELOG.md +++ b/sn_node_rpc_client/CHANGELOG.md @@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.6.20](https://github.com/joshuef/safe_network/compare/sn_node_rpc_client-v0.6.19...sn_node_rpc_client-v0.6.20) - 2024-06-03 + +### Other +- updated the following local packages: sn_client, sn_transfers, sn_node + ## [0.6.19](https://github.com/joshuef/safe_network/compare/sn_node_rpc_client-v0.6.18...sn_node_rpc_client-v0.6.19) - 2024-06-03 ### Other diff --git a/sn_node_rpc_client/Cargo.toml b/sn_node_rpc_client/Cargo.toml index 4375260e76..368624e2cf 100644 --- a/sn_node_rpc_client/Cargo.toml +++ b/sn_node_rpc_client/Cargo.toml @@ -8,7 +8,7 @@ license = "GPL-3.0" name = "sn_node_rpc_client" readme = "README.md" repository = "https://github.com/maidsafe/safe_network" -version = "0.6.19" +version = "0.6.20" [[bin]] name = "safenode_rpc_client" @@ -23,13 +23,13 @@ color-eyre = "0.6.2" hex = "~0.4.3" libp2p = { version="0.53", features = ["kad"]} libp2p-identity = { version="0.2.7", features = ["rand"] } -sn_client = { path = "../sn_client", version = "0.107.0" } +sn_client = { path = "../sn_client", version = "0.107.3" } sn_logging = { path = "../sn_logging", version = "0.2.27" } -sn_node = { path = "../sn_node", version = "0.107.0" } -sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.3.0" } -sn_protocol = { path = "../sn_protocol", version = "0.17.0", features=["rpc"] } -sn_service_management = { path = "../sn_service_management", version = "0.3.1" } -sn_transfers = { path = "../sn_transfers", version = "0.18.2" } +sn_node = { path = "../sn_node", version = "0.107.2" } +sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.3.1" } +sn_protocol = { path = "../sn_protocol", version = "0.17.2", features=["rpc"] } +sn_service_management = { path = "../sn_service_management", version = "0.3.3" } +sn_transfers = { path = "../sn_transfers", version = "0.18.4" } thiserror = "1.0.23" # # watch out updating this, protoc compiler needs to be installed on all build systems # # arm builds + musl are very problematic diff --git a/sn_peers_acquisition/CHANGELOG.md b/sn_peers_acquisition/CHANGELOG.md index 46730abad6..6b5093af8a 100644 --- a/sn_peers_acquisition/CHANGELOG.md +++ b/sn_peers_acquisition/CHANGELOG.md @@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.3.1](https://github.com/joshuef/safe_network/compare/sn_peers_acquisition-v0.3.0...sn_peers_acquisition-v0.3.1) - 2024-06-03 + +### Other +- updated the following local packages: sn_networking + ## [0.3.0](https://github.com/joshuef/safe_network/compare/sn_peers_acquisition-v0.2.12...sn_peers_acquisition-v0.3.0) - 2024-06-03 ### Added diff --git a/sn_peers_acquisition/Cargo.toml b/sn_peers_acquisition/Cargo.toml index a352b1fa67..342d47bfd6 100644 --- a/sn_peers_acquisition/Cargo.toml +++ b/sn_peers_acquisition/Cargo.toml @@ -8,7 +8,7 @@ license = "GPL-3.0" name = "sn_peers_acquisition" readme = "README.md" repository = "https://github.com/maidsafe/safe_network" -version = "0.3.0" +version = "0.3.1" [features] local-discovery = [] @@ -21,7 +21,7 @@ lazy_static = "~1.4.0" libp2p = { version="0.53", features = [] } rand = "0.8.5" reqwest = { version="0.12.2", default-features=false, features = ["rustls-tls"], optional = true } -sn_networking = { path = "../sn_networking", version = "0.16.0" } +sn_networking = { path = "../sn_networking", version = "0.16.2" } thiserror = "1.0.23" tokio = { version = "1.32.0", optional = true, default-features = false} tracing = { version = "~0.1.26" } diff --git a/sn_protocol/CHANGELOG.md b/sn_protocol/CHANGELOG.md index a7dc746759..4160de6617 100644 --- a/sn_protocol/CHANGELOG.md +++ b/sn_protocol/CHANGELOG.md @@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.17.2](https://github.com/joshuef/safe_network/compare/sn_protocol-v0.17.1...sn_protocol-v0.17.2) - 2024-06-03 + +### Other +- updated the following local packages: sn_transfers + ## [0.17.0](https://github.com/joshuef/safe_network/compare/sn_protocol-v0.16.7...sn_protocol-v0.17.0) - 2024-06-03 ### Added diff --git a/sn_protocol/Cargo.toml b/sn_protocol/Cargo.toml index 3c3d805065..c5e1ce292c 100644 --- a/sn_protocol/Cargo.toml +++ b/sn_protocol/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "sn_protocol" readme = "README.md" repository = "https://github.com/maidsafe/safe_network" -version = "0.17.0" +version = "0.17.2" [features] default = [] @@ -27,7 +27,7 @@ rmp-serde = "1.1.1" serde = { version = "1.0.133", features = [ "derive", "rc" ]} serde_json = "1.0" sha2 = "0.10.7" -sn_transfers = { path = "../sn_transfers", version = "0.18.2" } +sn_transfers = { path = "../sn_transfers", version = "0.18.4" } sn_registers = { path = "../sn_registers", version = "0.3.13" } thiserror = "1.0.23" tiny-keccak = { version = "~2.0.2", features = [ "sha3" ] } diff --git a/sn_service_management/CHANGELOG.md b/sn_service_management/CHANGELOG.md index 9211857da5..76a3529324 100644 --- a/sn_service_management/CHANGELOG.md +++ b/sn_service_management/CHANGELOG.md @@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.3.3](https://github.com/joshuef/safe_network/compare/sn_service_management-v0.3.2...sn_service_management-v0.3.3) - 2024-06-03 + +### Other +- updated the following local packages: sn_transfers + ## [0.3.1](https://github.com/joshuef/safe_network/compare/sn_service_management-v0.3.0...sn_service_management-v0.3.1) - 2024-06-03 ### Added diff --git a/sn_service_management/Cargo.toml b/sn_service_management/Cargo.toml index 7a2a49dbf3..2e6a4ca69a 100644 --- a/sn_service_management/Cargo.toml +++ b/sn_service_management/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "sn_service_management" readme = "README.md" repository = "https://github.com/maidsafe/safe_network" -version = "0.3.1" +version = "0.3.3" [dependencies] async-trait = "0.1" @@ -20,10 +20,10 @@ serde_json = "1.0" semver = "1.0.20" service-manager = "0.7.0" sn_logging = { path = "../sn_logging", version = "0.2.27" } -sn_protocol = { path = "../sn_protocol", version = "0.17.0", features = [ +sn_protocol = { path = "../sn_protocol", version = "0.17.2", features = [ "rpc", ] } -sn_transfers = { path = "../sn_transfers", version = "0.18.2" } +sn_transfers = { path = "../sn_transfers", version = "0.18.4" } sysinfo = "0.30.12" thiserror = "1.0.23" tokio = { version = "1.32.0", features = ["time"] } diff --git a/sn_transfers/CHANGELOG.md b/sn_transfers/CHANGELOG.md index e295f97cd0..722e2aaf20 100644 --- a/sn_transfers/CHANGELOG.md +++ b/sn_transfers/CHANGELOG.md @@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.18.4](https://github.com/joshuef/safe_network/compare/sn_transfers-v0.18.3...sn_transfers-v0.18.4) - 2024-06-03 + +### Fixed +- enable compile time sk setting for faucet/genesis + ## [0.18.2](https://github.com/joshuef/safe_network/compare/sn_transfers-v0.18.1...sn_transfers-v0.18.2) - 2024-06-03 ### Added diff --git a/sn_transfers/Cargo.toml b/sn_transfers/Cargo.toml index 777e967718..ec2b2c58c5 100644 --- a/sn_transfers/Cargo.toml +++ b/sn_transfers/Cargo.toml @@ -8,7 +8,7 @@ license = "GPL-3.0" name = "sn_transfers" readme = "README.md" repository = "https://github.com/maidsafe/safe_network" -version = "0.18.2" +version = "0.18.4" [features] reward-forward = [] diff --git a/sn_transfers/src/genesis.rs b/sn_transfers/src/genesis.rs index 0e08f61cc6..a08b209eaf 100644 --- a/sn_transfers/src/genesis.rs +++ b/sn_transfers/src/genesis.rs @@ -108,17 +108,20 @@ lazy_static! { } lazy_static! { - /// Secret_key for testing purposes. - /// The one for live network shall be passed in via env set. - static ref GENESIS_SK_STR: String = { - if let Ok(sk) = std::env::var("GENESIS_SK") { - info!("Using runtime GENESIS_SK"); - sk - } - else { - warn!("USING DEFAULT GENESIS SK (23746b) FOR TESTING PURPOSES! EXPECTING PAIRED PK (9934c2) TO BE USED!"); - DEFAULT_LIVE_GENESIS_SK.to_string() + pub static ref GENESIS_SK_STR: String = { + let compile_time_key = option_env!("GENESIS_SK").unwrap_or(DEFAULT_LIVE_GENESIS_SK); + let runtime_key = + std::env::var("GENESIS_SK").unwrap_or_else(|_| compile_time_key.to_string()); + + if runtime_key == DEFAULT_LIVE_GENESIS_SK { + warn!("USING DEFAULT GENESIS SK (23746b) FOR TESTING PURPOSES! EXPECTING PAIRED PK (9934c2) TO BE USED!"); + } else if runtime_key == compile_time_key { + warn!("Using compile-time GENESIS_SK"); + } else { + warn!("Overridden by runtime GENESIS_SK"); } + + runtime_key }; }