feed foundation wallet by default, not faucet

.github/workflows/benchmark-prs.yml

@@ -3,7 +3,7 @@ name: PR Benchmarks
 on: pull_request
 
 env:
-  CARGO_INCREMENTAL: '0'
+  CARGO_INCREMENTAL: "0"
   RUST_BACKTRACE: 1
   CLIENT_DATA_PATH: /home/runner/.local/share/safe/client
   NODE_DATA_PATH: /home/runner/.local/share/safe/node
@@ -43,7 +43,11 @@ jobs:
       # it will be better to execute bench test with `local-discovery`,
       # to make the measurement results reflect speed improvement or regression more accurately.
       - name: Build sn bins
-        run: cargo build --release --bins --features local-discovery
+        run: cargo build --release --bin safe --bin safenode --features local-discovery
+        timeout-minutes: 30
+
+      - name: Build faucet bin
+        run: cargo build --release --bin faucet --features local-discovery --features="gifting-from-genesis"
         timeout-minutes: 30
 
       - name: Start a local network
@@ -143,8 +147,8 @@ jobs:
       - name: Alert for client memory usage
         uses: benchmark-action/github-action-benchmark@v1
         with:
-          name: 'Memory Usage of Client during uploading large file'
-          tool: 'customSmallerIsBetter'
+          name: "Memory Usage of Client during uploading large file"
+          tool: "customSmallerIsBetter"
           output-file-path: client_memory_usage.json
           # Where the previous data file is stored
           external-data-json-path: ./cache/client-mem-usage.json
@@ -155,7 +159,7 @@ jobs:
           # Enable alert commit comment
           comment-on-alert: true
           # 200% regression will result in alert
-          alert-threshold: '200%'
+          alert-threshold: "200%"
           # Enable Job Summary for PRs
           summary-always: true
 
@@ -186,7 +190,7 @@ jobs:
         uses: benchmark-action/github-action-benchmark@v1
         with:
           # What benchmark tool the output.txt came from
-          tool: 'customBiggerIsBetter'
+          tool: "customBiggerIsBetter"
           output-file-path: files-benchmark.json
           # Where the previous data file is stored
           external-data-json-path: ./cache/benchmark-data.json
@@ -197,7 +201,7 @@ jobs:
           # Enable alert commit comment
           comment-on-alert: true
           # 200% regression will result in alert
-          alert-threshold: '200%'
+          alert-threshold: "200%"
           # Enable Job Summary for PRs
           summary-always: true
 
@@ -269,7 +273,7 @@ jobs:
       - name: Alert for node memory usage
         uses: benchmark-action/github-action-benchmark@v1
         with:
-          tool: 'customSmallerIsBetter'
+          tool: "customSmallerIsBetter"
           output-file-path: node_memory_usage.json
           # Where the previous data file is stored
           external-data-json-path: ./cache/node-mem-usage.json
@@ -282,7 +286,7 @@ jobs:
           # Comment on the PR
           comment-always: true
           # 200% regression will result in alert
-          alert-threshold: '200%'
+          alert-threshold: "200%"
           # Enable Job Summary for PRs
           summary-always: true
 
@@ -369,7 +373,7 @@ jobs:
       - name: Alert for swarm_driver long handlings
         uses: benchmark-action/github-action-benchmark@v1
         with:
-          tool: 'customSmallerIsBetter'
+          tool: "customSmallerIsBetter"
           output-file-path: swarm_driver_long_handlings.json
           # Where the previous data file is stored
           external-data-json-path: ./cache/swarm_driver_long_handlings.json
@@ -382,7 +386,7 @@ jobs:
           # Comment on the PR
           comment-always: true
           # 200% regression will result in alert
-          alert-threshold: '200%'
+          alert-threshold: "200%"
           # Enable Job Summary for PRs
           summary-always: true
 
@@ -410,8 +414,6 @@ jobs:
       - name: install ripgrep
         run: sudo apt-get -y install ripgrep
 
-
-
       ########################
       ### Benchmark        ###
       ########################

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

@@ -13,7 +13,7 @@ permissions:
   contents: write
 
 env:
-  CARGO_INCREMENTAL: '0'
+  CARGO_INCREMENTAL: "0"
   RUST_BACKTRACE: 1
   CLIENT_DATA_PATH: /home/runner/.local/share/safe/client
   NODE_DATA_PATH: /home/runner/.local/share/safe/node
@@ -28,7 +28,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-          
+
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: rustfmt, clippy
@@ -44,9 +44,13 @@ jobs:
       - name: Download 95mb file to be uploaded with the safe client
         shell: bash
         run: wget https://sn-node.s3.eu-west-2.amazonaws.com/the-test-data.zip
-     
+
       - name: Build node and client
-        run: cargo build --release --features local-discovery --bin safenode --bin safe --bin faucet
+        run: cargo build --release --features local-discovery --bin safenode --bin safe
+        timeout-minutes: 30
+
+      - name: Build faucet bin
+        run: cargo build --release --bin faucet --features local-discovery --features="gifting-from-genesis"
         timeout-minutes: 30
 
       - name: Start a local network
@@ -91,13 +95,13 @@ jobs:
       - name: check files-benchmark.json
         shell: bash
         run: cat files-benchmark.json
-        
+
       # gh-pages branch is updated and pushed automatically with extracted benchmark data
       - name: Store cli files benchmark result
         uses: benchmark-action/github-action-benchmark@v1
         with:
           name: "`safe files` benchmarks"
-          tool: 'customBiggerIsBetter'
+          tool: "customBiggerIsBetter"
           output-file-path: files-benchmark.json
           github-token: ${{ secrets.GITHUB_TOKEN }}
           auto-push: true
@@ -108,7 +112,7 @@ jobs:
         run: cargo run --bin safe --release -- --log-output-dest=data-dir files upload the-test-data.zip --retry-strategy quick
         env:
           SN_LOG: "all"
-      
+
       #########################
       ### Stop Network      ###
       #########################
@@ -130,12 +134,12 @@ jobs:
         shell: bash
         run: |
           peak_mem_usage=$(
-            rg '"memory_used_mb":[^,]*' $NODE_DATA_PATH/*/logs/* -o --no-line-number --no-filename | 
-            awk -F':' '/"memory_used_mb":/{print $2}' | 
-            sort -n | 
+            rg '"memory_used_mb":[^,]*' $NODE_DATA_PATH/*/logs/* -o --no-line-number --no-filename |
+            awk -F':' '/"memory_used_mb":/{print $2}' |
+            sort -n |
             tail -n 1
           )
-         
+
           # Write the node memory usage to a file
           echo '[
               {
@@ -152,8 +156,8 @@ jobs:
       - name: Upload Node Memory Usage
         uses: benchmark-action/github-action-benchmark@v1
         with:
-          name: 'Node memory'
-          tool: 'customSmallerIsBetter'
+          name: "Node memory"
+          tool: "customSmallerIsBetter"
           output-file-path: node_memory_usage.json
           github-token: ${{ secrets.GITHUB_TOKEN }}
           auto-push: true
@@ -163,13 +167,13 @@ jobs:
         shell: bash
         run: |
           peak_mem_usage=$(
-            rg '"memory_used_mb":[^,]*' $CLIENT_DATA_PATH/logs --glob safe.* -o --no-line-number --no-filename | 
-            awk -F':' '/"memory_used_mb":/{print $2}' | 
-            sort -n | 
+            rg '"memory_used_mb":[^,]*' $CLIENT_DATA_PATH/logs --glob safe.* -o --no-line-number --no-filename |
+            awk -F':' '/"memory_used_mb":/{print $2}' |
+            sort -n |
             tail -n 1
           )
           total_mem=$(
-            rg '"memory_used_mb":[^,]*' $CLIENT_DATA_PATH/logs --glob safe.* -o --no-line-number --no-filename | 
+            rg '"memory_used_mb":[^,]*' $CLIENT_DATA_PATH/logs --glob safe.* -o --no-line-number --no-filename |
             awk -F':' '/"memory_used_mb":/ {sum += $2} END {printf "%.0f\n", sum}'
           )
           num_of_times=$(
@@ -204,8 +208,8 @@ jobs:
       - name: Upload Client Memory Usage
         uses: benchmark-action/github-action-benchmark@v1
         with:
-          name: 'Client memory'
-          tool: 'customSmallerIsBetter'
+          name: "Client memory"
+          tool: "customSmallerIsBetter"
           output-file-path: client_memory_usage.json
           github-token: ${{ secrets.GITHUB_TOKEN }}
           auto-push: true
@@ -252,7 +256,7 @@ jobs:
           echo "Total swarm_driver long handling times is: $total_num_of_times"
           echo "Total swarm_driver long handling duration is: $total_long_handling ms"
           echo "Total average swarm_driver long handling duration is: $average_handling_ms ms"
-         
+
           # Write the node memory usage to a file
           echo '[
               {
@@ -279,8 +283,8 @@ jobs:
       - name: Upload swarm_driver Long Handlings
         uses: benchmark-action/github-action-benchmark@v1
         with:
-          name: 'swarm_driver long handlings'
-          tool: 'customSmallerIsBetter'
+          name: "swarm_driver long handlings"
+          tool: "customSmallerIsBetter"
           output-file-path: swarm_driver_long_handlings.json
           github-token: ${{ secrets.GITHUB_TOKEN }}
           auto-push: true

.github/workflows/memcheck.yml

@@ -35,7 +35,11 @@ jobs:
         run: sudo apt-get install -y ripgrep
 
       - name: Build binaries
-        run: cargo build --release --bins
+        run: cargo build --release --bin safe --bin safenode
+        timeout-minutes: 30
+
+      - name: Build faucet binary with gifting
+        run: cargo build --release --bin faucet --features="gifting-from-genesis"
         timeout-minutes: 30
 
       - name: Build tests
@@ -412,6 +416,23 @@ jobs:
         continue-on-error: true
         if: always()
 
+      - name: Move faucet log to the working folder
+        run: |
+          echo "current folder is:"
+          pwd
+          echo "SAFE_DATA_PATH has: "
+          ls -l $SAFE_DATA_PATH
+          echo "test_faucet foder has: "
+          ls -l $SAFE_DATA_PATH/test_faucet
+          echo "logs folder has: "
+          ls -l $SAFE_DATA_PATH/test_faucet/logs
+          mv $FAUCET_LOG_PATH/*.log ./faucet_log.log
+        env:
+          SN_LOG: "all"
+        continue-on-error: true
+        if: always()
+        timeout-minutes: 1
+
       - name: Upload faucet log
         uses: actions/upload-artifact@main
         with:

.github/workflows/merge.yml

@@ -355,7 +355,11 @@ jobs:
       - uses: Swatinem/rust-cache@v2
 
       - name: Build binaries
-        run: cargo build --release --bin safenode --bin safe --bin faucet
+        run: cargo build --release --bin safenode --bin safe
+        timeout-minutes: 30
+
+      - name: Build faucet binary
+        run: cargo build --release --bin faucet --features="gifting-from-genesis"
         timeout-minutes: 30
 
       - name: Start a local network
@@ -534,7 +538,11 @@ jobs:
       - uses: Swatinem/rust-cache@v2
 
       - name: Build binaries
-        run: cargo build --release --features=local-discovery --bin safenode --bin faucet
+        run: cargo build --release --features=local-discovery --bin safenode
+        timeout-minutes: 30
+
+      - name: Build faucet binary
+        run: cargo build --release --bin faucet --features="local-discovery,gifting-from-genesis"
         timeout-minutes: 30
 
       - name: Build testing executable
@@ -603,7 +611,11 @@ jobs:
       - uses: Swatinem/rust-cache@v2
 
       - name: Build binaries
-        run: cargo build --release --features=local-discovery,distribution --bin safenode --bin faucet
+        run: cargo build --release --features=local-discovery,distribution --bin safenode
+        timeout-minutes: 35
+
+      - name: Build faucet binary
+        run: cargo build --release --features=local-discovery,distribution,gifting-from-genesis --bin faucet
         timeout-minutes: 35
 
       - name: Build testing executable
@@ -673,7 +685,11 @@ jobs:
       - uses: Swatinem/rust-cache@v2
 
       - name: Build binaries
-        run: cargo build --release --features local-discovery --bin safenode --bin faucet
+        run: cargo build --release --features local-discovery --bin safenode
+        timeout-minutes: 30
+
+      - name: Build faucet binaries
+        run: cargo build --release --features="local-discovery,gifting-from-genesis" --bin faucet
         timeout-minutes: 30
 
       - name: Build churn tests
@@ -799,7 +815,11 @@ jobs:
       - uses: Swatinem/rust-cache@v2
 
       - name: Build binaries
-        run: cargo build --release --features local-discovery --bin safenode --bin faucet
+        run: cargo build --release --features local-discovery --bin safenode
+        timeout-minutes: 30
+
+      - name: Build fuacet binary
+        run: cargo build --release --features="local-discovery,gifting-from-genesis" --bin faucet
         timeout-minutes: 30
 
       - name: Build data location and routing table tests
@@ -934,7 +954,11 @@ jobs:
           ls -l
 
       - name: Build binaries
-        run: cargo build --release --bin safenode --bin safe --bin faucet
+        run: cargo build --release --bin safenode --bin safe
+        timeout-minutes: 30
+
+      - name: Build faucet binary
+        run: cargo build --release --bin faucet --features="gifting-from-genesis"
         timeout-minutes: 30
 
       - name: Start a local network
@@ -1070,7 +1094,11 @@ jobs:
           df
 
       - name: Build binaries
-        run: cargo build --release --bin safenode --bin safe --bin faucet
+        run: cargo build --release --bin safenode --bin safe
+        timeout-minutes: 30
+
+      - name: Build faucet binary
+        run: cargo build --release --bin faucet --features="gifting-from-genesis"
         timeout-minutes: 30
 
       - name: Start a local network