Merge branch 'rc-2024.12.1-hotfix'

maidsafe · Dec 21, 2024 · 4e671d7 · 4e671d7
2 parents ddc8906 + c087762
commit 4e671d7
Show file tree

Hide file tree

Showing 28 changed files with 177 additions and 122 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -217,7 +217,7 @@ jobs:
       - name: create release
         uses: actions/create-release@v1
         env:
-          GITHUB_TOKEN: ${{ secrets.VERSION_BUMP_COMMIT_PAT }}
+          GITHUB_TOKEN: ${{ secrets.AUTONOMI_PAT }}
         with:
           tag_name: ${{ env.RELEASE_PREFIX }}-${{ env.PACKAGE_VERSION }}
           release_name: ${{ env.PACKAGE_VERSION }}
@@ -226,7 +226,7 @@ jobs:
 
       - name: upload artifacts as assets
         env:
-          GITHUB_TOKEN: ${{ secrets.VERSION_BUMP_COMMIT_PAT }}
+          GITHUB_TOKEN: ${{ secrets.AUTONOMI_PAT }}
         shell: bash
         run: |
           (
@@ -250,7 +250,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: "0"
-          token: ${{ secrets.VERSION_BUMP_COMMIT_PAT }}
+          token: ${{ secrets.AUTONOMI_PAT }}
       - uses: dtolnay/rust-toolchain@stable
 
       # Required for the creation of tags
@@ -269,7 +269,7 @@ jobs:
           cargo login "${{ secrets.CRATES_IO_TOKEN }}"
           # The use of 'awk' suppresses the annoying instrumentation output that makes the log
           # difficult to read.
-          release-plz release --git-token ${{ secrets.VERSION_BUMP_COMMIT_PAT }} | \
+          release-plz release --git-token ${{ secrets.AUTONOMI_PAT }} | \
             awk '{ if (!/^\s*in release with input/ && !/^\s{4}/) print }'
 
       - name: post notification to slack on failure

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 *When editing this file, please respect a line length of 100.*
 
+## 2024-12-21
+
+### Network
+
+#### Fixed
+
+- Do not dial back when a new peer is detected. This resulted in a large number of open connections,
+  in turn causing increased CPU usage.
+
+### Client
+
+#### Changed
+
+- Remove the 'dial error' output on the `file upload` command
+
 ## 2024-12-18
 
 ### General

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ant-bootstrap/Cargo.toml b/ant-bootstrap/Cargo.toml
@@ -7,14 +7,14 @@ license = "GPL-3.0"
 name = "ant-bootstrap"
 readme = "README.md"
 repository = "https://github.com/maidsafe/autonomi"
-version = "0.1.0"
+version = "0.1.1"
 
 [features]
 local = []
 
 [dependencies]
-ant-logging = { path = "../ant-logging", version = "0.2.41" }
-ant-protocol = { path = "../ant-protocol", version = "0.3.0" }
+ant-logging = { path = "../ant-logging", version = "0.2.42" }
+ant-protocol = { path = "../ant-protocol", version = "0.3.1" }
 atomic-write-file = "0.2.2"
 chrono = { version = "0.4", features = ["serde"] }
 clap = { version = "4.2.1", features = ["derive", "env"] }

diff --git a/ant-build-info/Cargo.toml b/ant-build-info/Cargo.toml
@@ -7,7 +7,7 @@ license = "GPL-3.0"
 name = "ant-build-info"
 readme = "README.md"
 repository = "https://github.com/maidsafe/autonomi"
-version = "0.1.20"
+version = "0.1.21"
 build = "build.rs"
 include = ["Cargo.toml", "src/**/*", "build.rs"]
 

diff --git a/ant-build-info/src/release_info.rs b/ant-build-info/src/release_info.rs
@@ -1,4 +1,4 @@
 pub const RELEASE_YEAR: &str = "2024";
 pub const RELEASE_MONTH: &str = "12";
 pub const RELEASE_CYCLE: &str = "1";
-pub const RELEASE_CYCLE_COUNTER: &str = "5";
+pub const RELEASE_CYCLE_COUNTER: &str = "6";
diff --git a/ant-cli/Cargo.toml b/ant-cli/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["MaidSafe Developers <dev@maidsafe.net>"]
 name = "ant-cli"
 description = "CLI client for the Autonomi network"
 license = "GPL-3.0"
-version = "0.3.0"
+version = "0.3.1"
 edition = "2021"
 homepage = "https://maidsafe.net"
 readme = "README.md"
@@ -24,11 +24,11 @@ name = "files"
 harness = false
 
 [dependencies]
-ant-bootstrap = { path = "../ant-bootstrap", version = "0.1.0" }
-ant-build-info = { path = "../ant-build-info", version = "0.1.20" }
-ant-logging = { path = "../ant-logging", version = "0.2.41" }
-ant-protocol = { path = "../ant-protocol", version = "0.3.0" }
-autonomi = { path = "../autonomi", version = "0.3.0", features = [
+ant-bootstrap = { path = "../ant-bootstrap", version = "0.1.1" }
+ant-build-info = { path = "../ant-build-info", version = "0.1.21" }
+ant-logging = { path = "../ant-logging", version = "0.2.42" }
+ant-protocol = { path = "../ant-protocol", version = "0.3.1" }
+autonomi = { path = "../autonomi", version = "0.3.1", features = [
     "fs",
     "vault",
     "registers",
@@ -60,7 +60,7 @@ tracing = { version = "~0.1.26" }
 walkdir = "2.5.0"
 
 [dev-dependencies]
-autonomi = { path = "../autonomi", version = "0.3.0", features = ["fs"] }
+autonomi = { path = "../autonomi", version = "0.3.1", features = ["fs"]}
 criterion = "0.5.1"
 eyre = "0.6.8"
 rand = { version = "~0.8.5", features = ["small_rng"] }

diff --git a/ant-evm/Cargo.toml b/ant-evm/Cargo.toml
@@ -7,7 +7,7 @@ license = "GPL-3.0"
 name = "ant-evm"
 readme = "README.md"
 repository = "https://github.com/maidsafe/autonomi"
-version = "0.1.5"
+version = "0.1.6"
 
 [features]
 local = ["evmlib/local"]
@@ -16,7 +16,7 @@ test-utils = []
 
 [dependencies]
 custom_debug = "~0.6.1"
-evmlib = { path = "../evmlib", version = "0.1.5" }
+evmlib = { path = "../evmlib", version = "0.1.6" }
 hex = "~0.4.3"
 lazy_static = "1.4.0"
 libp2p = { version = "0.54.1", features = ["identify", "kad"] }