Merge branch 'rc-2024.10.4' into upload_performance

.github/workflows/memcheck.yml

@@ -5,9 +5,9 @@ on:
   # on main, we want to know that all commits are passing at a glance, any deviation should help bisecting errors
   # the merge run checks should show on master and enable this clear test/passing history
   merge_group:
-    branches: [ main, alpha*, beta*, rc* ]
+    branches: [main, alpha*, beta*, rc*]
   pull_request:
-    branches: [ "*" ]
+    branches: ["*"]
 
 env:
   SAFE_DATA_PATH: /home/runner/.local/share/safe
@@ -126,6 +126,9 @@ jobs:
       - name: Assert we've reloaded some chunks
         run: rg "Existing record found" $RESTART_TEST_NODE_DATA_PATH
 
+      - name: Wait at least 1min for replication to happen # it is throttled to once/30s.
+        run: sleep 60
+
       - name: Verify data replication using rg
         shell: bash
         timeout-minutes: 1
@@ -232,7 +235,7 @@ jobs:
 
       # Logging of handling time is on Trace level,
       # meanwhile the local_network startup tool sets the logging level on Debug.
-      # 
+      #
       # - name: Check node swarm_driver handling statistics
       #   shell: bash
       #   # With the latest improvements, swarm_driver will be in high chance

.github/workflows/merge.yml

@@ -670,7 +670,7 @@ jobs:
         timeout-minutes: 1
         run: |
           peer_removed=$(rg "PeerRemovedFromRoutingTable" "${{ matrix.node_data_path }}" -c --stats | \
-            rg "(\d+) matches" | rg "\d+" -o) || { echo "Failed to extract peer removal count"; exit 1; }
+            rg "(\d+) matches" | rg "\d+" -o) || { echo "Failed to extract peer removal count"; exit 0; }
           if [ -z "$peer_removed" ]; then
             echo "No peer removal count found"
             exit 1
@@ -811,19 +811,24 @@ jobs:
         # Otherwise kad will remove a `dropped out node` directly from RT.
         # So, the detection of the removal explicity will now have much less chance,
         # due to the removal of connection_issue tracking.
+        #
+        # With the further reduction of replication frequency,
+        # it now becomes harder to detect a `dropped out node` as a `failed to replicate` node.
+        # Hence now remove the assertion check and replace with a print out only.
         run: |
+          node_count=$(ls "${{ matrix.node_data_path }}" | wc -l)
+          echo "Node dir count is $node_count"
           restart_count=$(rg "Node is restarting in" "${{ matrix.node_data_path }}" -c --stats | \
             rg "(\d+) matches" | rg "\d+" -o)
           echo "Restart $restart_count nodes"
+          if ! rg "PeerRemovedFromRoutingTable" "${{ matrix.node_data_path }}" -c --stats
+          then
+            echo "No peer removal count found"
+            exit 0
+          fi
           peer_removed=$(rg "PeerRemovedFromRoutingTable" "${{ matrix.node_data_path }}" -c --stats | \
             rg "(\d+) matches" | rg "\d+" -o)
           echo "PeerRemovedFromRoutingTable $peer_removed times"
-          if [ -z "$peer_removed" ]; then
-            echo "No peer removal count found"
-            exit 1
-          fi
-          node_count=$(ls "${{ matrix.node_data_path }}" | wc -l)
-          echo "Node dir count is $node_count"
 
       # Only error out after uploading the logs
       - name: Don't log raw data

autonomi-cli/Cargo.toml

@@ -3,7 +3,7 @@ authors = ["MaidSafe Developers <[email protected]>"]
 name = "autonomi-cli"
 description = "Autonomi CLI"
 license = "GPL-3.0"
-version = "0.1.2"
+version = "0.1.3-rc.2"
 edition = "2021"
 homepage = "https://maidsafe.net"
 readme = "README.md"
@@ -24,7 +24,7 @@ name = "files"
 harness = false
 
 [dependencies]
-autonomi = { path = "../autonomi", version = "0.2.1", features = [
+autonomi = { path = "../autonomi", version = "0.2.2-rc.2", features = [
     "data",
     "fs",
     "vault",
@@ -45,15 +45,15 @@ tokio = { version = "1.32.0", features = [
     "fs",
 ] }
 tracing = { version = "~0.1.26" }
-sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.5.4" }
-sn_build_info = { path = "../sn_build_info", version = "0.1.16" }
-sn_logging = { path = "../sn_logging", version = "0.2.37" }
+sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.5.5-rc.2" }
+sn_build_info = { path = "../sn_build_info", version = "0.1.17-rc.2" }
+sn_logging = { path = "../sn_logging", version = "0.2.38-rc.2" }
 walkdir = "2.5.0"
 serde_json = "1.0.132"
 serde = "1.0.210"
 
 [dev-dependencies]
-autonomi = { path = "../autonomi", version = "0.2.1", features = [
+autonomi = { path = "../autonomi", version = "0.2.2-rc.2", features = [
     "data",
     "fs",
 ] }

autonomi/Cargo.toml

@@ -3,7 +3,7 @@ authors = ["MaidSafe Developers <[email protected]>"]
 description = "Autonomi client API"
 name = "autonomi"
 license = "GPL-3.0"
-version = "0.2.1"
+version = "0.2.2-rc.2"
 edition = "2021"
 homepage = "https://maidsafe.net"
 readme = "README.md"
@@ -38,11 +38,11 @@ rand = "0.8.5"
 rmp-serde = "1.1.1"
 self_encryption = "~0.30.0"
 serde = { version = "1.0.133", features = ["derive", "rc"] }
-sn_networking = { path = "../sn_networking", version = "0.19.0" }
-sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.5.4" }
-sn_protocol = { version = "0.17.12", path = "../sn_protocol" }
-sn_registers = { path = "../sn_registers", version = "0.4.0" }
-sn_evm = { path = "../sn_evm", version = "0.1.1" }
+sn_networking = { path = "../sn_networking", version = "0.19.1-rc.2" }
+sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.5.5-rc.2" }
+sn_protocol = { version = "0.17.13-rc.2", path = "../sn_protocol" }
+sn_registers = { path = "../sn_registers", version = "0.4.1-rc.2" }
+sn_evm = { path = "../sn_evm", version = "0.1.2-rc.2" }
 thiserror = "1.0.23"
 tokio = { version = "1.35.0", features = ["sync"] }
 tracing = { version = "~0.1.26" }
@@ -60,8 +60,8 @@ blstrs = "0.7.1"
 alloy = { version = "0.5.3", default-features = false, features = ["std", "reqwest-rustls-tls", "provider-anvil-node", "sol-types", "json", "signers", "contract", "signer-local", "network"] }
 eyre = "0.6.5"
 sha2 = "0.10.6"
-sn_logging = { path = "../sn_logging", version = "0.2.37" }
-sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.5.4" }
+sn_logging = { path = "../sn_logging", version = "0.2.38-rc.2" }
+sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.5.5-rc.2" }
 # Do not specify the version field. Release process expects even the local dev deps to be published.
 # Removing the version field is a workaround.
 test_utils = { path = "../test_utils" }
@@ -71,7 +71,7 @@ wasm-bindgen-test = "0.3.43"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 console_error_panic_hook = "0.1.7"
-evmlib = { path = "../evmlib", version = "0.1.1", features = ["wasm-bindgen"] }
+evmlib = { path = "../evmlib", version = "0.1.2-rc.2", features = ["wasm-bindgen"] }
 # See https://github.com/sebcrozet/instant/blob/7bd13f51f5c930239fddc0476a837870fb239ed7/README.md#using-instant-for-a-wasm-platform-where-performancenow-is-not-available
 instant = { version = "0.1", features = ["wasm-bindgen", "inaccurate"] }
 js-sys = "0.3.70"