Merge branch 'main' into eip2333

.github/workflows/merge.yml

@@ -75,8 +75,15 @@ jobs:
         shell: bash
         run: if [[ ! $(cargo metadata --no-deps --format-version 1 | jq -r '.packages[].features.default[]? | select(. == "local-discovery")') ]]; then echo "local-discovery is not a default feature in any package."; else echo "local-discovery is a default feature in at least one package." && exit 1; fi
 
+      # In a cargo workspace, feature unification can occur, allowing a crate to be built successfully even if it
+      # doesn't explicitly specify a feature it uses, provided another crate in the workspace enables that feature.
+      # To detect such cases, we must build each crate using `--package` flag, building all packages at once does not work.
       - name: Check the whole workspace can build
-        run: cargo build --all-targets --all-features
+        shell: bash
+        run: |
+          for package in $(cargo metadata --no-deps --format-version=1 | jq -r '.packages[].name'); do
+            cargo build -p "$package"
+          done
 
   unit:
     if: "!startsWith(github.event.head_commit.message, 'chore(release):')"

.github/workflows/nightly.yml

@@ -45,7 +45,7 @@ jobs:
 
       # only these unit tests require a network, the rest are run above in unit test section
       - name: Run sn_client --tests
-        run: cargo test --bin sn_client --release --tests
+        run: cargo test --package sn_client --release --tests
         env:
           SN_LOG: "all"
           # only set the target dir for windows to bypass the linker issue.

release-plz.toml

@@ -67,16 +67,20 @@ changelog_update = true
 git_release_enable = false
 publish = true
 
-
 [[package]]
 name = "sn_metrics"
 changelog_update = true
 git_release_enable = false
 publish = false
 
-
 [[package]]
 name = "token_supplies"
 changelog_update = true
 git_release_enable = false
 publish = true
+
+[[package]]
+name = "test_utils"
+changelog_update = true
+git_release_enable = false
+publish = false

resources/scripts/bump_version.sh

@@ -52,15 +52,11 @@ fi
 
 commit_message="chore(release): "
 for crate in "${crates_bumped[@]}"; do
-    # split the crate name and version
-    crate_name=$(echo "$crate" | cut -d'v' -f1)
-    # remove trailing hyphen
-    crate_name=${crate_name%-}
-
-    echo "the crate is: $crate_name"
-    version=$(echo "$crate" | cut -d'v' -f2)
+    # Extract the crate name and version in a cross-platform way
+    crate_name=$(echo "$crate" | sed -E 's/-v.*$//')
+    version=$(echo "$crate" | sed -E 's/^.*-v(.*)$/\1/')
     new_version=$version
-
+    echo "the crate is: $crate_name"
     # if we're changing the release channel...
     if [ -n "$SUFFIX" ]; then
         #if we're already in a realse channel, reapplying the suffix will reset things.
@@ -71,12 +67,14 @@ for crate in "${crates_bumped[@]}"; do
         else
             new_version="${version}-${SUFFIX}.0"
         fi
-
-        # set the version
-        crate=$new_version
-        # echo "new v for $crate_name: $new_version"
-        cargo set-version -p $crate_name $new_version
+    else
+        # For main release, strip any alpha or beta suffix from the version
+        new_version=$(echo "$version" | sed -E 's/(-alpha\.[0-9]+|-beta\.[0-9]+)$//')
     fi
+
+    # set the version
+    crate=$new_version
+    cargo set-version -p $crate_name $new_version
     # update the commit msg
     commit_message="${commit_message}${crate_name}-v$new_version/"
 done

sn_cli/CHANGELOG.md

@@ -6,6 +6,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.89.83](https://github.com/joshuef/safe_network/compare/sn_cli-v0.89.82...sn_cli-v0.89.83) - 2024-03-14
+
+### Added
+- self in import change
+- moved param to outside calc
+- refactor spend validation
+
+### Fixed
+- *(cli)* allow to upload chunks from acc-packet using chunked files local cache
+- *(cli)* use chunk-mgr with iterator skipping tracking info files
+
+### Other
+- *(acc-packet)* adding verifications to compare tracking info generated on acc-packets cloned
+- *(acc-packet)* adding verifications to compare the files/dirs stored on acc-packets cloned
+- *(acc-packet)* testing sync empty root dirs
+- *(acc-packet)* testing mutations syncing across clones of an acc-packet
+- *(acc-packet)* adding automated tests to sn_cli::AccountPacket
+- *(cli)* chunk-mgr to report files chunked/uploaded rather than bailing out
+- improve code quality
+- new `sn_service_management` crate
+
 ## [0.89.82-alpha.1](https://github.com/joshuef/safe_network/compare/sn_cli-v0.89.82-alpha.0...sn_cli-v0.89.82-alpha.1) - 2024-03-08
 
 ### Added

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.89.82"
+version = "0.89.83"
 
 [[bin]]
 path="src/main.rs"
@@ -47,9 +47,9 @@ reqwest = { version="0.11.18", default-features=false, features = ["rustls"] }
 rmp-serde = "1.1.1"
 serde = { version = "1.0.133", features = [ "derive"]}
 sn_build_info = { path="../sn_build_info", version = "0.1.5" }
-sn_client = { path = "../sn_client", version = "0.104.29-alpha.1" }
-sn_logging = { path = "../sn_logging", version = "0.2.21" }
-sn_peers_acquisition= { path="../sn_peers_acquisition", version = "0.2.6" }
+sn_client = { path = "../sn_client", version = "0.104.29" }
+sn_logging = { path = "../sn_logging", version = "0.2.23" }
+sn_peers_acquisition= { path="../sn_peers_acquisition", version = "0.2.8" }
 tempfile = "3.6.0"
 tokio = { version = "1.32.0", features = ["io-util", "macros", "parking_lot", "rt", "sync", "time", "fs"] }
 tracing = { version = "~0.1.26" }
@@ -63,8 +63,8 @@ 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.104.29-alpha.1", features = ["test-utils"] }
-sn_protocol = { path = "../sn_protocol", version = "0.15.2-alpha.0" }
+sn_client = { path = "../sn_client", version = "0.104.29", features = ["test-utils"] }
+sn_protocol = { path = "../sn_protocol", version = "0.15.4" }
 
 [lints]
 workspace = true