From b1e0cc9a916fe4cc3b81cd1cc1eb24ef4aa06dd6 Mon Sep 17 00:00:00 2001 From: Chris O'Neil Date: Fri, 5 Jul 2024 01:21:07 +0100 Subject: [PATCH 1/2] chore(release): stable 2024-07-08 sn_networking-v0.17.0 sn_peers_acquisition-v0.4.0 sn_client-v0.108.0 nat-detection-v0.2.0 sn_node-v0.109.0 sn-node-manager-v0.10.0 node-launchpad-v0.3.10 sn_build_info-v0.1.9 sn_registers-v0.3.15 sn_transfers-v0.18.8 sn_protocol-v0.17.5 sn_logging-v0.2.30 sn_auditor-v0.2.2 sn_cli-v0.93.9 sn_faucet-v0.4.30 sn_metrics-v0.1.10 sn_service_management-v0.3.8 sn_node_rpc_client-v0.6.25 --- CHANGELOG.md | 78 ++++++++++++++++++++++++++++++++ Cargo.lock | 36 +++++++-------- nat-detection/Cargo.toml | 4 +- node-launchpad/Cargo.toml | 8 ++-- sn_auditor/Cargo.toml | 8 ++-- sn_build_info/Cargo.toml | 2 +- sn_cli/Cargo.toml | 14 +++--- sn_client/Cargo.toml | 18 ++++---- sn_faucet/Cargo.toml | 16 +++---- sn_logging/Cargo.toml | 2 +- sn_metrics/Cargo.toml | 2 +- sn_networking/Cargo.toml | 10 ++-- sn_node/Cargo.toml | 24 +++++----- sn_node_manager/Cargo.toml | 12 ++--- sn_node_rpc_client/Cargo.toml | 16 +++---- sn_peers_acquisition/Cargo.toml | 4 +- sn_protocol/Cargo.toml | 6 +-- sn_registers/Cargo.toml | 2 +- sn_service_management/Cargo.toml | 8 ++-- sn_transfers/Cargo.toml | 2 +- 20 files changed, 175 insertions(+), 97 deletions(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000000..9ce23135f3 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,78 @@ +# Changelog + +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.1.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +*When editing this file, please respect a line length of 100.* + +## 2024-07-10 + +### Binaries + +* `faucet` v0.4.30 +* `nat-detection` v0.2.0 +* `node-launchpad` v0.3.10 +* `safe` v0.93.9 +* `safenode` v0.109.0 +* `safenode-manager` v0.10.0 +* `sn_auditor` v0.2.2 +* `sn_node_rpc_client` v0.6.25 + +### Network + +#### Added + +- The node exposes more metrics, including its uptime, number of connected peers, number of peers in + the routing table, and the number of open connections. These will help us more effectively + diagnose user issues. + +#### Changed + +- Communication between node and client is strictly limited through synchronised public keys. The + current beta network allows the node and client to use different public keys, resulting in + undefined behaviour and performance issues. This change mitigates some of those issues and we also + expect it to prevent other double spend issues. +- Reduced base traffic for nodes, resulting in better upload performance. This will result in better + distribution of nanos, meaning users with a smaller number of nodes will be expected to receive + nanos more often. + +#### Fixed + +- In the case where a client retries a failed upload, they would re-send their payment. In a rare + circumstance, the node would forward this reward for a second time too. This is fixed on the node. +- Nodes are prevented from double spending under rare circumstances. +- ARM builds are no longer prevented from connecting to the network. + +### Node Manager + +#### Added + +- Global `--debug` and `--trace` arguments are provided. These will output debugging and trace-level + logging, respectively, direct to stderr. + +#### Changed + +- The mechanism used by the node manager to refresh its state is significantly changed to address + issues that caused commands to hang for long periods of time. Now, when using commands like + `start`, `stop`, and `reset`, users should no longer experience the commands taking excessively + long to complete. +- The `nat-detection run` command provides a default list of servers, meaning the `--servers` + argument is now optional. + +### Launchpad + +#### Added + +- Launchpad and node versions are displayed on the user interface. + +#### Changed + +- The node manager change for refreshing its state also applies to the launchpad. Users should + experience improvements in operations that appeared to be hanging but were actually just taking + an excessive amount of time to complete. + +#### Fixed + +- The correct primary storage will now be selected on Linux and macOS. diff --git a/Cargo.lock b/Cargo.lock index 53704a25fc..55e0dd315b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4559,7 +4559,7 @@ dependencies = [ [[package]] name = "nat-detection" -version = "0.1.0" +version = "0.2.0" dependencies = [ "clap", "clap-verbosity-flag", @@ -4674,7 +4674,7 @@ dependencies = [ [[package]] name = "node-launchpad" -version = "0.3.9" +version = "0.3.10" dependencies = [ "atty", "better-panic", @@ -6917,7 +6917,7 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "sn-node-manager" -version = "0.9.7" +version = "0.10.0" dependencies = [ "assert_cmd", "assert_fs", @@ -6979,7 +6979,7 @@ dependencies = [ [[package]] name = "sn_auditor" -version = "0.2.1" +version = "0.2.2" dependencies = [ "blsttc", "clap", @@ -7013,14 +7013,14 @@ dependencies = [ [[package]] name = "sn_build_info" -version = "0.1.8" +version = "0.1.9" dependencies = [ "vergen", ] [[package]] name = "sn_cli" -version = "0.93.8" +version = "0.93.9" dependencies = [ "aes 0.7.5", "base64 0.22.1", @@ -7061,7 +7061,7 @@ dependencies = [ [[package]] name = "sn_client" -version = "0.107.9" +version = "0.108.0" dependencies = [ "assert_matches", "async-trait", @@ -7146,7 +7146,7 @@ dependencies = [ [[package]] name = "sn_faucet" -version = "0.4.29" +version = "0.4.30" dependencies = [ "assert_fs", "base64 0.22.1", @@ -7178,7 +7178,7 @@ dependencies = [ [[package]] name = "sn_logging" -version = "0.2.29" +version = "0.2.30" dependencies = [ "chrono", "color-eyre", @@ -7203,7 +7203,7 @@ dependencies = [ [[package]] name = "sn_metrics" -version = "0.1.9" +version = "0.1.10" dependencies = [ "clap", "color-eyre", @@ -7217,7 +7217,7 @@ dependencies = [ [[package]] name = "sn_networking" -version = "0.16.6" +version = "0.17.0" dependencies = [ "aes-gcm-siv", "async-trait", @@ -7259,7 +7259,7 @@ dependencies = [ [[package]] name = "sn_node" -version = "0.108.4" +version = "0.109.0" dependencies = [ "assert_fs", "assert_matches", @@ -7314,7 +7314,7 @@ dependencies = [ [[package]] name = "sn_node_rpc_client" -version = "0.6.24" +version = "0.6.25" dependencies = [ "assert_fs", "async-trait", @@ -7341,7 +7341,7 @@ dependencies = [ [[package]] name = "sn_peers_acquisition" -version = "0.3.5" +version = "0.4.0" dependencies = [ "clap", "lazy_static", @@ -7357,7 +7357,7 @@ dependencies = [ [[package]] name = "sn_protocol" -version = "0.17.4" +version = "0.17.5" dependencies = [ "blsttc", "bytes", @@ -7384,7 +7384,7 @@ dependencies = [ [[package]] name = "sn_registers" -version = "0.3.14" +version = "0.3.15" dependencies = [ "blsttc", "crdts", @@ -7401,7 +7401,7 @@ dependencies = [ [[package]] name = "sn_service_management" -version = "0.3.7" +version = "0.3.8" dependencies = [ "async-trait", "dirs-next", @@ -7427,7 +7427,7 @@ dependencies = [ [[package]] name = "sn_transfers" -version = "0.18.7" +version = "0.18.8" dependencies = [ "assert_fs", "blsttc", diff --git a/nat-detection/Cargo.toml b/nat-detection/Cargo.toml index 880aee316c..3eafb22135 100644 --- a/nat-detection/Cargo.toml +++ b/nat-detection/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "nat-detection" readme = "README.md" repository = "https://github.com/maidsafe/safe_network" -version = "0.1.0" +version = "0.2.0" [[bin]] name = "nat-detection" @@ -28,7 +28,7 @@ libp2p = { version = "0.53", features = [ "macros", "upnp", ] } -sn_networking = { path = "../sn_networking", version = "0.16.6" } +sn_networking = { path = "../sn_networking", version = "0.17.0" } tokio = { version = "1.32.0", features = ["full"] } tracing = { version = "~0.1.26" } tracing-log = "0.2.0" diff --git a/node-launchpad/Cargo.toml b/node-launchpad/Cargo.toml index 1d04807df4..e3376cad89 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.9" +version = "0.3.10" edition = "2021" license = "GPL-3.0" homepage = "https://maidsafe.net" @@ -49,10 +49,10 @@ reqwest = { version = "0.12.2", default-features = false, features = [ serde = { version = "1.0.188", features = ["derive"] } serde_json = "1.0.107" signal-hook = "0.3.17" -sn-node-manager = { version = "0.9.7", path = "../sn_node_manager" } -sn_peers_acquisition = { version = "0.3.5", path = "../sn_peers_acquisition" } +sn-node-manager = { version = "0.10.0", path = "../sn_node_manager" } +sn_peers_acquisition = { version = "0.4.0", path = "../sn_peers_acquisition" } sn-releases = "~0.2.6" -sn_service_management = { version = "0.3.7", path = "../sn_service_management" } +sn_service_management = { version = "0.3.8", path = "../sn_service_management" } strip-ansi-escapes = "0.2.0" strum = { version = "0.26.1", features = ["derive"] } sysinfo = "0.30.12" diff --git a/sn_auditor/Cargo.toml b/sn_auditor/Cargo.toml index 8528f827bb..7c8497118a 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.2.1" +version = "0.2.2" edition = "2021" homepage = "https://maidsafe.net" repository = "https://github.com/maidsafe/safe_network" @@ -31,9 +31,9 @@ graphviz-rust = { version = "0.9.0", optional = true } lazy_static = "1.4.0" serde = { version = "1.0.133", features = ["derive", "rc"] } serde_json = "1.0.108" -sn_client = { path = "../sn_client", version = "0.107.9" } -sn_logging = { path = "../sn_logging", version = "0.2.29" } -sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.3.5" } +sn_client = { path = "../sn_client", version = "0.108.0" } +sn_logging = { path = "../sn_logging", version = "0.2.30" } +sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.4.0" } tiny_http = { version = "0.12", features = ["ssl-rustls"] } tracing = { version = "~0.1.26" } tokio = { version = "1.32.0", features = [ diff --git a/sn_build_info/Cargo.toml b/sn_build_info/Cargo.toml index 4466b45199..43517827bb 100644 --- a/sn_build_info/Cargo.toml +++ b/sn_build_info/Cargo.toml @@ -8,7 +8,7 @@ license = "GPL-3.0" name = "sn_build_info" readme = "README.md" repository = "https://github.com/maidsafe/safe_network" -version = "0.1.8" +version = "0.1.9" [build-dependencies] vergen = { version = "8.0.0", features = ["build", "git", "gitcl"] } diff --git a/sn_cli/Cargo.toml b/sn_cli/Cargo.toml index cb79a986bc..cd83b0acf4 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.8" +version = "0.93.9" [[bin]] path = "src/bin/main.rs" @@ -57,11 +57,11 @@ 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.8" } -sn_client = { path = "../sn_client", version = "0.107.9" } -sn_logging = { path = "../sn_logging", version = "0.2.29" } -sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.3.5" } -sn_protocol = { path = "../sn_protocol", version = "0.17.4" } +sn_build_info = { path = "../sn_build_info", version = "0.1.9" } +sn_client = { path = "../sn_client", version = "0.108.0" } +sn_logging = { path = "../sn_logging", version = "0.2.30" } +sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.4.0" } +sn_protocol = { path = "../sn_protocol", version = "0.17.5" } 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.9", features = [ +sn_client = { path = "../sn_client", version = "0.108.0", features = [ "test-utils", ] } diff --git a/sn_client/Cargo.toml b/sn_client/Cargo.toml index 6f83bf14d2..6aa122ca3d 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.9" +version = "0.108.0" [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.6" } -sn_protocol = { path = "../sn_protocol", version = "0.17.4" } +sn_networking = { path = "../sn_networking", version = "0.17.0" } +sn_protocol = { path = "../sn_protocol", version = "0.17.5" } serde_json = "1.0" -sn_registers = { path = "../sn_registers", version = "0.3.14" } -sn_transfers = { path = "../sn_transfers", version = "0.18.7" } +sn_registers = { path = "../sn_registers", version = "0.3.15" } +sn_transfers = { path = "../sn_transfers", version = "0.18.8" } 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.5", optional = true } +sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.4.0", optional = true } eyre = { version = "0.6.8", optional = true } lazy_static = { version = "~1.4.0", optional = true } @@ -69,8 +69,8 @@ dirs-next = "~2.0.0" # add rand to libp2p libp2p-identity = { version = "0.2.7", features = ["rand"] } sn_client = { path = "../sn_client", features = ["test-utils"] } -sn_logging = { path = "../sn_logging", version = "0.2.29" } -sn_registers = { path = "../sn_registers", version = "0.3.13", features = [ +sn_logging = { path = "../sn_logging", version = "0.2.30" } +sn_registers = { path = "../sn_registers", version = "0.3.15", features = [ "test-utils", ] } @@ -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.5" } +sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.4.0" } console_error_panic_hook = "0.1.6" tracing-wasm = "0.2.1" wasmtimer = "0.2.0" diff --git a/sn_faucet/Cargo.toml b/sn_faucet/Cargo.toml index 96dd5c2c85..18e85260da 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.29" +version = "0.4.30" [features] default = ["gifting"] @@ -37,13 +37,13 @@ indicatif = { version = "0.17.5", features = ["tokio"] } 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.8" } -sn_cli = { path = "../sn_cli", version = "0.93.8" } -sn_client = { path = "../sn_client", version = "0.107.9" } -sn_logging = { path = "../sn_logging", version = "0.2.29" } -sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.3.5" } -sn_protocol = { path = "../sn_protocol", version = "0.17.4" } -sn_transfers = { path = "../sn_transfers", version = "0.18.7" } +sn_build_info = { path = "../sn_build_info", version = "0.1.9" } +sn_cli = { path = "../sn_cli", version = "0.93.9" } +sn_client = { path = "../sn_client", version = "0.108.0" } +sn_logging = { path = "../sn_logging", version = "0.2.30" } +sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.4.0" } +sn_protocol = { path = "../sn_protocol", version = "0.17.5" } +sn_transfers = { path = "../sn_transfers", version = "0.18.8" } tokio = { version = "1.32.0", features = ["parking_lot", "rt"] } tracing = { version = "~0.1.26" } url = "2.5.0" diff --git a/sn_logging/Cargo.toml b/sn_logging/Cargo.toml index 6dd16309a0..01f93bd42d 100644 --- a/sn_logging/Cargo.toml +++ b/sn_logging/Cargo.toml @@ -8,7 +8,7 @@ license = "GPL-3.0" name = "sn_logging" readme = "README.md" repository = "https://github.com/maidsafe/safe_network" -version = "0.2.29" +version = "0.2.30" [dependencies] chrono = "~0.4.19" diff --git a/sn_metrics/Cargo.toml b/sn_metrics/Cargo.toml index e135efb5e6..c34a35f57d 100644 --- a/sn_metrics/Cargo.toml +++ b/sn_metrics/Cargo.toml @@ -8,7 +8,7 @@ license = "GPL-3.0" name = "sn_metrics" readme = "README.md" repository = "https://github.com/maidsafe/safe_network" -version = "0.1.9" +version = "0.1.10" [[bin]] path = "src/main.rs" diff --git a/sn_networking/Cargo.toml b/sn_networking/Cargo.toml index 91d8424b18..d712ff1b42 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.6" +version = "0.17.0" [features] default = ["libp2p/quic"] @@ -54,10 +54,10 @@ rand = { version = "~0.8.5", features = ["small_rng"] } 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.8" } -sn_protocol = { path = "../sn_protocol", version = "0.17.4" } -sn_transfers = { path = "../sn_transfers", version = "0.18.7" } -sn_registers = { path = "../sn_registers", version = "0.3.14" } +sn_build_info = { path="../sn_build_info", version = "0.1.9" } +sn_protocol = { path = "../sn_protocol", version = "0.17.5" } +sn_transfers = { path = "../sn_transfers", version = "0.18.8" } +sn_registers = { path = "../sn_registers", version = "0.3.15" } sysinfo = { version = "0.30.8", default-features = false, optional = true } thiserror = "1.0.23" tiny-keccak = { version = "~2.0.2", features = ["sha3"] } diff --git a/sn_node/Cargo.toml b/sn_node/Cargo.toml index 0e7d3dec94..1996cc6058 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.108.4" +version = "0.109.0" edition = "2021" license = "GPL-3.0" homepage = "https://maidsafe.net" @@ -51,15 +51,15 @@ rmp-serde = "1.1.1" 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.8" } -sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.3.5" } -sn_client = { path = "../sn_client", version = "0.107.9" } -sn_logging = { path = "../sn_logging", version = "0.2.29" } -sn_networking = { path = "../sn_networking", version = "0.16.6" } -sn_protocol = { path = "../sn_protocol", version = "0.17.4" } -sn_registers = { path = "../sn_registers", version = "0.3.14" } -sn_transfers = { path = "../sn_transfers", version = "0.18.7" } -sn_service_management = { path = "../sn_service_management", version = "0.3.7" } +sn_build_info = { path = "../sn_build_info", version = "0.1.9" } +sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.4.0" } +sn_client = { path = "../sn_client", version = "0.108.0" } +sn_logging = { path = "../sn_logging", version = "0.2.30" } +sn_networking = { path = "../sn_networking", version = "0.17.0" } +sn_protocol = { path = "../sn_protocol", version = "0.17.5" } +sn_registers = { path = "../sn_registers", version = "0.3.15" } +sn_transfers = { path = "../sn_transfers", version = "0.18.8" } +sn_service_management = { path = "../sn_service_management", version = "0.3.8" } thiserror = "1.0.23" tokio = { version = "1.32.0", features = [ "io-util", @@ -86,10 +86,10 @@ 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.4", features = [ +sn_protocol = { path = "../sn_protocol", version = "0.17.5", features = [ "rpc", ] } -sn_transfers = { path = "../sn_transfers", version = "0.18.7", features = [ +sn_transfers = { path = "../sn_transfers", version = "0.18.8", features = [ "test-utils", ] } tempfile = "3.6.0" diff --git a/sn_node_manager/Cargo.toml b/sn_node_manager/Cargo.toml index 8159f0b502..b5635edc6b 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.7" +version = "0.10.0" [[bin]] name = "safenode-manager" @@ -44,12 +44,12 @@ semver = "1.0.20" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" service-manager = "0.7.0" -sn_logging = { path = "../sn_logging", version = "0.2.29" } -sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.3.5" } -sn_protocol = { path = "../sn_protocol", version = "0.17.4" } -sn_service_management = { path = "../sn_service_management", version = "0.3.7" } +sn_logging = { path = "../sn_logging", version = "0.2.30" } +sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.4.0" } +sn_protocol = { path = "../sn_protocol", version = "0.17.5" } +sn_service_management = { path = "../sn_service_management", version = "0.3.8" } sn-releases = "0.2.6" -sn_transfers = { path = "../sn_transfers", version = "0.18.7" } +sn_transfers = { path = "../sn_transfers", version = "0.18.8" } sysinfo = "0.30.12" thiserror = "1.0.23" tokio = { version = "1.26", features = ["full"] } diff --git a/sn_node_rpc_client/Cargo.toml b/sn_node_rpc_client/Cargo.toml index 5ab5bcfa08..5f59246281 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.24" +version = "0.6.25" [[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.9" } -sn_logging = { path = "../sn_logging", version = "0.2.29" } -sn_node = { path = "../sn_node", version = "0.108.4" } -sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.3.5" } -sn_protocol = { path = "../sn_protocol", version = "0.17.4", features=["rpc"] } -sn_service_management = { path = "../sn_service_management", version = "0.3.7" } -sn_transfers = { path = "../sn_transfers", version = "0.18.7" } +sn_client = { path = "../sn_client", version = "0.108.0" } +sn_logging = { path = "../sn_logging", version = "0.2.30" } +sn_node = { path = "../sn_node", version = "0.109.0" } +sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.4.0" } +sn_protocol = { path = "../sn_protocol", version = "0.17.5", features=["rpc"] } +sn_service_management = { path = "../sn_service_management", version = "0.3.8" } +sn_transfers = { path = "../sn_transfers", version = "0.18.8" } 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/Cargo.toml b/sn_peers_acquisition/Cargo.toml index c86cc6ad13..8f4d7180dd 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.5" +version = "0.4.0" [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"] } -sn_networking = { path = "../sn_networking", version = "0.16.6", optional = true} +sn_networking = { path = "../sn_networking", version = "0.17.0", optional = true} thiserror = "1.0.23" tokio = { version = "1.32.0", default-features = false} tracing = { version = "~0.1.26" } diff --git a/sn_protocol/Cargo.toml b/sn_protocol/Cargo.toml index 36eda75be4..8a7ebe6ea5 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.4" +version = "0.17.5" [features] default = [] @@ -27,8 +27,8 @@ 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.7" } -sn_registers = { path = "../sn_registers", version = "0.3.14" } +sn_transfers = { path = "../sn_transfers", version = "0.18.8" } +sn_registers = { path = "../sn_registers", version = "0.3.15" } thiserror = "1.0.23" tiny-keccak = { version = "~2.0.2", features = [ "sha3" ] } tracing = { version = "~0.1.26" } diff --git a/sn_registers/Cargo.toml b/sn_registers/Cargo.toml index 3adf8e6e1f..d5d37195db 100644 --- a/sn_registers/Cargo.toml +++ b/sn_registers/Cargo.toml @@ -8,7 +8,7 @@ license = "GPL-3.0" name = "sn_registers" readme = "README.md" repository = "https://github.com/maidsafe/safe_network" -version = "0.3.14" +version = "0.3.15" [features] test-utils = [] diff --git a/sn_service_management/Cargo.toml b/sn_service_management/Cargo.toml index 4616295579..63b07ff84b 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.7" +version = "0.3.8" [dependencies] async-trait = "0.1" @@ -19,11 +19,11 @@ serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" semver = "1.0.20" service-manager = "0.7.0" -sn_logging = { path = "../sn_logging", version = "0.2.29" } -sn_protocol = { path = "../sn_protocol", version = "0.17.4", features = [ +sn_logging = { path = "../sn_logging", version = "0.2.30" } +sn_protocol = { path = "../sn_protocol", version = "0.17.5", features = [ "rpc", ] } -sn_transfers = { path = "../sn_transfers", version = "0.18.7" } +sn_transfers = { path = "../sn_transfers", version = "0.18.8" } sysinfo = "0.30.12" thiserror = "1.0.23" tokio = { version = "1.32.0", features = ["time"] } diff --git a/sn_transfers/Cargo.toml b/sn_transfers/Cargo.toml index f96d8f425d..bdd83aac7d 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.7" +version = "0.18.8" [features] reward-forward = [] From 8845a8a6c6f11f5ab35b6d982014454aa91c17b6 Mon Sep 17 00:00:00 2001 From: Chris O'Neil Date: Mon, 8 Jul 2024 18:31:48 +0100 Subject: [PATCH 2/2] chore: use the correct branch in packaging step To get the version numbers right on the packages, the branch or tag needs to be the same in both jobs. Also rename the step and remove the AWS variables, which are not necessary for packaging. --- .github/workflows/build-release-artifacts.yml | 25 ++++--------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build-release-artifacts.yml b/.github/workflows/build-release-artifacts.yml index 05010b5553..17a816958b 100644 --- a/.github/workflows/build-release-artifacts.yml +++ b/.github/workflows/build-release-artifacts.yml @@ -64,18 +64,13 @@ jobs: # This job isn't necessary, but it's useful for debugging the packaging process for the real release # workflow, just in case any issues are ever encountered there. package: - name: publish and release + name: package artifacts runs-on: ubuntu-latest needs: [build] - env: - AWS_ACCESS_KEY_ID: ${{ secrets.S3_DEPLOY_AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.S3_DEPLOY_AWS_SECRET_ACCESS_KEY }} - AWS_DEFAULT_REGION: eu-west-2 steps: - uses: actions/checkout@v4 with: - fetch-depth: "0" - token: ${{ secrets.VERSION_BUMP_COMMIT_PAT }} + ref: ${{ inputs.tag || inputs.branch }} - uses: actions/download-artifact@master with: name: safe_network-x86_64-pc-windows-msvc @@ -100,22 +95,12 @@ jobs: with: name: safe_network-aarch64-unknown-linux-musl path: artifacts/aarch64-unknown-linux-musl/release - # It's possible to `cargo install` just, but it's very slow to compile on GHA infra. - # Therefore we just pull the binary from the Github Release. - - name: install just - shell: bash - run: | - curl -L -O $JUST_BIN_URL - mkdir just - tar xvf just-1.25.2-x86_64-unknown-linux-musl.tar.gz -C just - rm just-1.25.2-x86_64-unknown-linux-musl.tar.gz - sudo mv just/just /usr/local/bin - rm -rf just - sudo apt-get install -y tree + - uses: cargo-bins/cargo-binstall@main + - shell: bash + run: cargo binstall --no-confirm just - name: package artifacts shell: bash run: | - tree artifacts just package-release-assets "faucet" just package-release-assets "nat-detection" just package-release-assets "node-launchpad"