All payment tweaks

.github/workflows/benchmark-prs.yml

@@ -89,7 +89,7 @@ jobs:
         shell: bash
         run: |
           client_peak_mem_limit_mb="2000" # mb
-          client_avg_mem_limit_mb="700" # mb
+          client_avg_mem_limit_mb="1500" # mb
 
           peak_mem_usage=$(
             rg '"memory_used_mb":[^,]*' $CLIENT_DATA_PATH/logs/safe.* -o --no-line-number --no-filename |
@@ -237,7 +237,7 @@ jobs:
       - name: Check node memory usage
         shell: bash
         run: |
-          node_peak_mem_limit_mb="100" # mb
+          node_peak_mem_limit_mb="250" # mb
           peak_mem_usage=$(
             rg '"memory_used_mb":[^,]*' $NODE_DATA_PATH/*/logs/* -o --no-line-number --no-filename | 
             awk -F':' '/"memory_used_mb":/{print $2}' | 

.github/workflows/generate-benchmark-charts.yml

@@ -122,7 +122,7 @@ jobs:
       - name: Check node memory usage
         shell: bash
         run: |
-          node_peak_mem_limit_mb="100" # mb
+          node_peak_mem_limit_mb="250" # mb
           peak_mem_usage=$(
             rg '"memory_used_mb":[^,]*' $NODE_DATA_PATH/*/logs/* -o --no-line-number --no-filename | 
             awk -F':' '/"memory_used_mb":/{print $2}' | 
@@ -162,7 +162,7 @@ jobs:
         shell: bash
         run: |
           client_peak_mem_limit_mb="2000" # mb
-          client_avg_mem_limit_mb="700" # mb
+          client_avg_mem_limit_mb="1500" # mb
 
           peak_mem_usage=$(
             rg '"memory_used_mb":[^,]*' $CLIENT_DATA_PATH/logs/safe.* -o --no-line-number --no-filename | 

.github/workflows/memcheck.yml

@@ -104,12 +104,12 @@ jobs:
         timeout-minutes: 25
 
       - name: Chunks data integrity during nodes churn
-        run: cargo test --release -p sn_node --test data_with_churn -- --nocapture 
+        run: cargo test --release -p sn_node --test data_with_churn -- --nocapture
         env:
           TEST_DURATION_MINS: 15
           TEST_TOTAL_CHURN_CYCLES: 15
           SN_LOG: "all"
-        timeout-minutes: 20
+        timeout-minutes: 30
 
       - name: Verify restart of nodes using rg
         shell: bash
@@ -151,7 +151,7 @@ jobs:
           received_list_count=$(rg "Replicate list received from" $NODE_DATA_PATH -c --stats | \
             rg "(\d+) matches" | rg "\d+" -o)
           echo "Received $received_list_count replication lists"
-          fetching_attempt_count=$(rg "Fetching replication" $NODE_DATA_PATH -c --stats | \
+          fetching_attempt_count=$(rg "FetchingKeysForReplication" $NODE_DATA_PATH -c --stats | \
             rg "(\d+) matches" | rg "\d+" -o)
           echo "Carried out $fetching_attempt_count fetching attempts"
           replication_attempt_count=$(rg "Replicating chunk" $NODE_DATA_PATH -c --stats | \
@@ -206,7 +206,7 @@ jobs:
         # The memory usage here will be significantly higher here than in the benchmark test,
         # where we don't have a bootstrap node.
         run: |
-          node_peak_mem_limit_mb="160" # mb
+          node_peak_mem_limit_mb="300" # mb
 
           peak_mem_usage=$(
             rg '"memory_used_mb":[^,]*' $NODE_DATA_PATH/*/logs/* -o --no-line-number --no-filename | 
@@ -226,7 +226,7 @@ jobs:
         shell: bash
         run: |
           client_peak_mem_limit_mb="2000" # mb
-          client_avg_mem_limit_mb="700" # mb
+          client_avg_mem_limit_mb="1500" # mb
 
           peak_mem_usage=$(
             rg '"memory_used_mb":[^,]*' $CLIENT_DATA_PATH/logs/safe.* -o --no-line-number --no-filename | 

.github/workflows/merge.yml

@@ -262,14 +262,14 @@ jobs:
           fi
 
       - name: execute the dbc spend tests
-        run: cargo test --release --features="local-discovery" --test sequential_transfers -- --nocapture
+        run: cargo test --release -p sn_node --features="local-discovery" --test sequential_transfers -- --nocapture
         env:
           SN_LOG: "all"
           CARGO_TARGET_DIR: "./transfer-target"
         timeout-minutes: 25
 
       - name: execute the storage payment tests
-        run: cargo test --release --features="local-discovery" --test storage_payments -- --nocapture --test-threads=1
+        run: cargo test --release -p sn_node --features="local-discovery" --test storage_payments -- --nocapture --test-threads=1
         env:
           SN_LOG: "all"
           CARGO_TARGET_DIR: "./transfer-target"

sn_cli/Cargo.toml

@@ -41,7 +41,7 @@ sn_transfers = { path = "../sn_transfers", version = "0.10.28" }
 sn_logging = { path = "../sn_logging", version = "0.2.4" }
 sn_peers_acquisition= { path="../sn_peers_acquisition", version = "0.1.5" }
 sn_protocol = { path = "../sn_protocol", version = "0.5.3" }
-tokio = { version = "1.17.0", features = ["fs", "io-util", "macros", "parking_lot", "rt", "sync", "time"] }
+tokio = { version = "1.32.0", features = ["io-util", "macros", "parking_lot", "rt", "sync", "time"] }
 tracing = { version = "~0.1.26" }
 tracing-core = "0.1.30"
 url = "2.4.0"

sn_cli/src/main.rs

@@ -52,8 +52,8 @@ async fn main() -> Result<()> {
     println!("Built with git version: {}", sn_build_info::git_info());
     println!("Instantiating a SAFE client...");
 
-    let client_data_dir_path = get_client_data_dir_path().await?;
-    let secret_key = get_client_secret_key(&client_data_dir_path).await?;
+    let client_data_dir_path = get_client_data_dir_path()?;
+    let secret_key = get_client_secret_key(&client_data_dir_path)?;
 
     if opt.peers.peers.is_empty() {
         if !cfg!(feature = "local-discovery") {
@@ -89,27 +89,27 @@ async fn main() -> Result<()> {
     Ok(())
 }
 
-async fn get_client_secret_key(root_dir: &PathBuf) -> Result<SecretKey> {
+fn get_client_secret_key(root_dir: &PathBuf) -> Result<SecretKey> {
     // create the root directory if it doesn't exist
-    tokio::fs::create_dir_all(&root_dir).await?;
+    std::fs::create_dir_all(root_dir)?;
     let key_path = root_dir.join(CLIENT_KEY);
     let secret_key = if key_path.is_file() {
         info!("Client key found. Loading from file...");
-        let secret_hex_bytes = tokio::fs::read(key_path).await?;
+        let secret_hex_bytes = std::fs::read(key_path)?;
         bls_secret_from_hex(secret_hex_bytes)?
     } else {
         info!("No key found. Generating a new client key...");
         let secret_key = SecretKey::random();
-        tokio::fs::write(key_path, hex::encode(secret_key.to_bytes())).await?;
+        std::fs::write(key_path, hex::encode(secret_key.to_bytes()))?;
         secret_key
     };
     Ok(secret_key)
 }
 
-async fn get_client_data_dir_path() -> Result<PathBuf> {
+fn get_client_data_dir_path() -> Result<PathBuf> {
     let mut home_dirs = dirs_next::data_dir().expect("Data directory is obtainable");
     home_dirs.push("safe");
     home_dirs.push("client");
-    tokio::fs::create_dir_all(home_dirs.as_path()).await?;
+    std::fs::create_dir_all(home_dirs.as_path())?;
     Ok(home_dirs)
 }