Compare commits
240 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| cebb768845 | |||
| d030444659 | |||
| e6bfa3ea09 | |||
| 89839fd2ee | |||
| ec29f4eee0 | |||
| 6ae81a81b9 | |||
| 5b55082e9b | |||
| e1917ff2a3 | |||
| 761f970912 | |||
| 0cdefc5881 | |||
| 85454dc431 | |||
| 7310d63f1b | |||
| 25eba09b92 | |||
| a8cecb1200 | |||
| 4e52e9bf77 | |||
| cf55e2fe86 | |||
| dc0835f1f3 | |||
| b5a8b9d283 | |||
| a395167139 | |||
| 6b98c168fc | |||
| 4645de3eb5 | |||
| e6dd670b16 | |||
| dc48750271 | |||
| 46c67440bb | |||
| e5cd9fd69e | |||
| 21c14c0df0 | |||
| 87c236a927 | |||
| b501ddd534 | |||
| e9f6d1d47a | |||
| 52b4490e80 | |||
| 7b30c83f9a | |||
| 4aabb4ed56 | |||
| b14c28a462 | |||
| 664782c0c6 | |||
| aeb2f1f0f6 | |||
| 268ba36700 | |||
| c4df05157a | |||
| 09548a9aa9 | |||
| 78b796bf24 | |||
| f5ab7b3eb6 | |||
| 9cf679dadb | |||
| 97a382520c | |||
| f87ce06865 | |||
| 6095215a73 | |||
| 8c6ff79cd1 | |||
| 16678537f7 | |||
| ae877e3867 | |||
| 21479bfb80 | |||
| f84de25302 | |||
| db8edfe752 | |||
| 73edf28f39 | |||
| d23a42f7f5 | |||
| d0f2c08cd1 | |||
| 5599987d89 | |||
| a93763d73b | |||
| 8e8b6f4467 | |||
| 7feeed41d5 | |||
| e9a20653b8 | |||
| 9438691506 | |||
| 84a4924e77 | |||
| 49277310ba | |||
| 944d2eb7d5 | |||
| bfaf17540e | |||
| 6dbc4efbd9 | |||
| cabbeaf1bf | |||
| e554f1e0ad | |||
| 62a4a2ed70 | |||
| caad74c73d | |||
| 917993d8fb | |||
| 1451db39e6 | |||
| f13a2a6c06 | |||
| ce39fb6675 | |||
| 02a926b74a | |||
| 54ba710ea0 | |||
| 2653d12e55 | |||
| f94d6d51cf | |||
| a0116f9aec | |||
| aaa8ee9d53 | |||
| ab0f6af4b9 | |||
| 7669d0933f | |||
| 50433fe265 | |||
| 42aade29eb | |||
| 9f26759b8d | |||
| 9e642c6354 | |||
| cca19f36c2 | |||
| 17894880e0 | |||
| a99b8348d7 | |||
| ef6fc82c39 | |||
| 0c83ae2408 | |||
| 92490731e7 | |||
| 0ce93e366e | |||
| 0d031875f6 | |||
| e6103e4c43 | |||
| bf85e9eb79 | |||
| 3f1e04ebd4 | |||
| d4c5131bcb | |||
| ef1c1b50d5 | |||
| 23b745d353 | |||
| 7140ba4ea9 | |||
| 62962509eb | |||
| 3dc94cc85a | |||
| d285b70030 | |||
| 534a5068d3 | |||
| a4c4345257 | |||
| a0fb92cf17 | |||
| 52cc77356e | |||
| a671084f4e | |||
| 3ae986acc8 | |||
| 754994ba01 | |||
| 33b181b26b | |||
| 809559e6dc | |||
| e32c042c8d | |||
| dd6a45f251 | |||
| 6ee1f16ce8 | |||
| 924d7d1ccc | |||
| 395c134186 | |||
| 55e485ebce | |||
| cfce6dedff | |||
| 5a08a4cdd2 | |||
| 42ffb7d36e | |||
| e024d68fac | |||
| e66a069d5f | |||
| 3531901a17 | |||
| a399a75b03 | |||
| 0de14718cb | |||
| cd476ef6a2 | |||
| ad56645fc5 | |||
| 7ceaf9a40e | |||
| 2209e8ac04 | |||
| 6f2a3d9033 | |||
| 0530967807 | |||
| 9db748e8dd | |||
| 82ed88e26e | |||
| 594174827d | |||
| f6f364c551 | |||
| f648349e82 | |||
| 4fb78c3737 | |||
| f208855bc8 | |||
| 60426b8c45 | |||
| 00cc2f215a | |||
| 9792a8829b | |||
| 5b23429415 | |||
| 89de989ad1 | |||
| 97068b2aac | |||
| 0e3e5c27f3 | |||
| 01e3c8206b | |||
| ef20b8c7d1 | |||
| 61af16784b | |||
| caf21076c9 | |||
| 1672135308 | |||
| c07ef0253d | |||
| cc799b69d3 | |||
| dd4bbc0708 | |||
| 7b77091fb1 | |||
| 6581ebf235 | |||
| 82ace6d27b | |||
| e362207583 | |||
| 68caecff35 | |||
| 2fae4414d2 | |||
| 6eca09b904 | |||
| 7ab821cb11 | |||
| 0343469179 | |||
| 9904f6b17c | |||
| 5e0eeeddd6 | |||
| b6df383584 | |||
| b7d13d6fa6 | |||
| 838dd630ae | |||
| 3f00e2c317 | |||
| 3cdda8fdfd | |||
| 33f47ef36e | |||
| 7f9dba6e99 | |||
| 96e88b6ea9 | |||
| 180802feb8 | |||
| 87882f70cf | |||
| 4077717d3a | |||
| bc3df31518 | |||
| 61d6acace8 | |||
| abb4e3f988 | |||
| c5488337da | |||
| f06eefe184 | |||
| 46a8697a5d | |||
| 0429238b0f | |||
| 8dc3ba4ec3 | |||
| 712e3f5183 | |||
| 5229df47ab | |||
| 32cffed36b | |||
| 49c710e651 | |||
| 0a5227a894 | |||
| b231eb4f04 | |||
| fdd2c8fac2 | |||
| e2dd8ac743 | |||
| 8001fa7f40 | |||
| 80370b98ec | |||
| 3524089ad8 | |||
| ec7ee49282 | |||
| 653d1c2dea | |||
| b579f987b1 | |||
| 59254c92c3 | |||
| 69887921cc | |||
| e075b07632 | |||
| d32b680351 | |||
| fcd59a19be | |||
| 08b20ac2ab | |||
| 4c007669f9 | |||
| e86fa8fc7f | |||
| c3a8fa8d0d | |||
| d8769157fd | |||
| 7cccf3cfff | |||
| 02eec164f8 | |||
| 4f13ab1e0a | |||
| a34c7ef19f | |||
| f00b18298c | |||
| 0426adc94e | |||
| 4b4a2fe387 | |||
| 1ebb7e06c7 | |||
| 1fd17c5cb3 | |||
| ef65cf4c9e | |||
| 48dad0f16b | |||
| 93ac638765 | |||
| c6589ca92c | |||
| 03d5a87826 | |||
| 512cfd1b74 | |||
| ba0625cd97 | |||
| a2c489dc5b | |||
| 5cee248122 | |||
| 86aec84697 | |||
| 8f376d1b9b | |||
| f0ae4f4090 | |||
| 4e850f6fe0 | |||
| bd3678dd4f | |||
| 28c1637198 | |||
| 8de574ec97 | |||
| 4464d12103 | |||
| 0d9d97e31e | |||
| a7705a5f2c | |||
| 7a300bdd74 | |||
| 6569479083 | |||
| 611844b248 | |||
| 2cc9b05520 | |||
| a450b6f984 |
@@ -7,7 +7,7 @@ jobs:
|
|||||||
build:
|
build:
|
||||||
runs-on: arc-ubuntu-22.04
|
runs-on: arc-ubuntu-22.04
|
||||||
env:
|
env:
|
||||||
NEXT_PUBLIC_SITE_URL: https://nymtech.net/docs
|
NEXT_PUBLIC_SITE_URL: https://nym.com/docs
|
||||||
defaults:
|
defaults:
|
||||||
run:
|
run:
|
||||||
working-directory: documentation/docs
|
working-directory: documentation/docs
|
||||||
@@ -15,10 +15,8 @@ jobs:
|
|||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
- name: Install Dependencies (Linux)
|
- name: Install Dependencies (Linux)
|
||||||
run: sudo apt-get update && sudo apt-get install -y build-essential curl wget libssl-dev libudev-dev squashfs-tools protobuf-compiler git python3 && sudo apt-get update --fix-missing
|
run: sudo apt-get update && sudo apt-get install -y build-essential curl wget libssl-dev libudev-dev squashfs-tools protobuf-compiler git python3 && sudo apt-get update --fix-missing
|
||||||
- name: Install pip3
|
|
||||||
run: sudo apt install -y python3-pip
|
|
||||||
- name: Install Python3 modules
|
- name: Install Python3 modules
|
||||||
run: sudo pip3 install pandas tabulate
|
run: sudo apt install -y python3-pandas python3-tabulate
|
||||||
- name: Install rsync
|
- name: Install rsync
|
||||||
run: sudo apt-get install -y rsync
|
run: sudo apt-get install -y rsync
|
||||||
- uses: rlespinasse/github-slug-action@v3.x
|
- uses: rlespinasse/github-slug-action@v3.x
|
||||||
@@ -41,6 +39,8 @@ jobs:
|
|||||||
|
|
||||||
- name: Install project dependencies
|
- name: Install project dependencies
|
||||||
run: pnpm i
|
run: pnpm i
|
||||||
|
- name: Generate llms-full.txt
|
||||||
|
run: pnpm run generate:llms
|
||||||
- name: Build project
|
- name: Build project
|
||||||
run: pnpm run build
|
run: pnpm run build
|
||||||
- name: Generate sitemap
|
- name: Generate sitemap
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ jobs:
|
|||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
platform: [arc-linux-latest]
|
platform: [arc-ubuntu-22.04]
|
||||||
|
|
||||||
runs-on: ${{ matrix.platform }}
|
runs-on: ${{ matrix.platform }}
|
||||||
env:
|
env:
|
||||||
|
|||||||
@@ -0,0 +1,63 @@
|
|||||||
|
name: ci-build-upload-network-monitor-agent
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build-and-upload:
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
platform: [arc-ubuntu-22.04]
|
||||||
|
|
||||||
|
runs-on: ${{ matrix.platform }}
|
||||||
|
env:
|
||||||
|
CARGO_TERM_COLOR: always
|
||||||
|
RUSTUP_PERMIT_COPY_RENAME: 1
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v6
|
||||||
|
|
||||||
|
- name: Prepare build output directory
|
||||||
|
shell: bash
|
||||||
|
env:
|
||||||
|
OUTPUT_DIR: ci-builds/${{ github.ref_name }}
|
||||||
|
run: |
|
||||||
|
rm -rf ci-builds || true
|
||||||
|
mkdir -p "$OUTPUT_DIR"
|
||||||
|
|
||||||
|
- name: Install Dependencies (Linux)
|
||||||
|
run: sudo apt-get update && sudo apt-get -y install libudev-dev
|
||||||
|
|
||||||
|
- name: Install Rust toolchain
|
||||||
|
uses: dtolnay/rust-toolchain@master
|
||||||
|
with:
|
||||||
|
toolchain: ${{ vars.REQUIRED_RUSTC_VERSION }}
|
||||||
|
|
||||||
|
- name: Build nym-network-monitor-agent
|
||||||
|
shell: bash
|
||||||
|
run: cargo build -p nym-network-monitor-agent --release
|
||||||
|
|
||||||
|
- name: Upload artifact
|
||||||
|
uses: actions/upload-artifact@v6
|
||||||
|
with:
|
||||||
|
name: nym-network-monitor-agent
|
||||||
|
path: target/release/nym-network-monitor-agent
|
||||||
|
retention-days: 30
|
||||||
|
|
||||||
|
- name: Prepare build output
|
||||||
|
shell: bash
|
||||||
|
env:
|
||||||
|
OUTPUT_DIR: ci-builds/${{ github.ref_name }}
|
||||||
|
run: cp target/release/nym-network-monitor-agent "$OUTPUT_DIR"
|
||||||
|
|
||||||
|
- name: Deploy to CI www
|
||||||
|
uses: easingthemes/ssh-deploy@main
|
||||||
|
env:
|
||||||
|
SSH_PRIVATE_KEY: ${{ secrets.CI_WWW_SSH_PRIVATE_KEY }}
|
||||||
|
ARGS: "-avzr"
|
||||||
|
SOURCE: "ci-builds/"
|
||||||
|
REMOTE_HOST: ${{ secrets.CI_WWW_REMOTE_HOST }}
|
||||||
|
REMOTE_USER: ${{ secrets.CI_WWW_REMOTE_USER }}
|
||||||
|
TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/builds/
|
||||||
|
EXCLUDE: "/dist/, /node_modules/"
|
||||||
@@ -90,7 +90,7 @@ jobs:
|
|||||||
uses: actions-rs/cargo@v1
|
uses: actions-rs/cargo@v1
|
||||||
with:
|
with:
|
||||||
command: clippy
|
command: clippy
|
||||||
args: --workspace --all-targets --exclude nym-gateway-probe --exclude nym-node-status-api -- -D warnings
|
args: --workspace --all-targets --exclude nym-gateway-probe --exclude nym-node-status-api --exclude nym-node-status-agent --exclude nym-node-status-client -- -D warnings
|
||||||
|
|
||||||
- name: Clippy (non-macos)
|
- name: Clippy (non-macos)
|
||||||
if: contains(matrix.os, 'linux') || contains(matrix.os, 'windows')
|
if: contains(matrix.os, 'linux') || contains(matrix.os, 'windows')
|
||||||
@@ -104,14 +104,15 @@ jobs:
|
|||||||
uses: actions-rs/cargo@v1
|
uses: actions-rs/cargo@v1
|
||||||
with:
|
with:
|
||||||
command: build
|
command: build
|
||||||
|
args: --workspace --exclude nym-gateway-probe --exclude nym-node-status-api --exclude nym-node-status-agent --exclude nym-node-status-client
|
||||||
|
|
||||||
# only build on linux because of wg FFI bindings of its dependency (network probe)
|
# Build Go FFI-dependent crates separately (requires Go, only available on Linux CI)
|
||||||
- name: Build nym-node-status-api (linux only)
|
- name: Build nym-node-status-api and nym-node-status-agent (linux only)
|
||||||
if: runner.os == 'Linux'
|
if: runner.os == 'Linux'
|
||||||
uses: actions-rs/cargo@v1
|
uses: actions-rs/cargo@v1
|
||||||
with:
|
with:
|
||||||
command: build
|
command: build
|
||||||
args: -p nym-node-status-api
|
args: -p nym-node-status-api -p nym-node-status-agent
|
||||||
|
|
||||||
- name: Build all examples
|
- name: Build all examples
|
||||||
if: contains(matrix.os, 'linux')
|
if: contains(matrix.os, 'linux')
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ jobs:
|
|||||||
components: rustfmt, clippy
|
components: rustfmt, clippy
|
||||||
|
|
||||||
- name: Install cosmwasm-check
|
- name: Install cosmwasm-check
|
||||||
run: cargo install cosmwasm-check
|
run: cargo install cosmwasm-check --locked
|
||||||
|
|
||||||
- name: Install wasm-opt
|
- name: Install wasm-opt
|
||||||
uses: ./.github/actions/install-wasm-opt
|
uses: ./.github/actions/install-wasm-opt
|
||||||
|
|||||||
@@ -15,6 +15,9 @@ env:
|
|||||||
jobs:
|
jobs:
|
||||||
publish-dry-run:
|
publish-dry-run:
|
||||||
runs-on: arc-linux-latest
|
runs-on: arc-linux-latest
|
||||||
|
timeout-minutes: 35
|
||||||
|
env:
|
||||||
|
RUSTUP_PERMIT_COPY_RENAME: 1
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repo
|
- name: Checkout repo
|
||||||
uses: actions/checkout@v6
|
uses: actions/checkout@v6
|
||||||
@@ -59,20 +62,60 @@ jobs:
|
|||||||
- name: Bump versions (local only)
|
- name: Bump versions (local only)
|
||||||
run: |
|
run: |
|
||||||
cargo workspaces version custom ${{ inputs.version }} \
|
cargo workspaces version custom ${{ inputs.version }} \
|
||||||
--allow-branch ${{ github.ref_name }} \
|
|
||||||
--no-git-commit \
|
--no-git-commit \
|
||||||
|
--yes
|
||||||
|
|
||||||
|
- name: Preflight publish checks
|
||||||
|
run: |
|
||||||
|
python3 tools/internal/check_publish_preflight.py
|
||||||
|
|
||||||
# Dry run may show cascading dependency errors because packages aren't
|
# Dry run may show cascading dependency errors because packages aren't
|
||||||
# actually uploaded - these are expected and ignored. We check for real
|
# actually uploaded - these are expected and ignored. We check for real
|
||||||
# errors like packaging failures, missing metadata, or invalid Cargo.toml.
|
# errors like packaging failures, missing metadata, or invalid Cargo.toml.
|
||||||
- name: Publish (dry run)
|
- name: Publish (dry run)
|
||||||
run: |
|
run: |
|
||||||
output=$(cargo workspaces publish --dry-run --allow-dirty 2>&1) || true
|
set +e
|
||||||
echo "$output"
|
publish_status=1
|
||||||
|
max_attempts=2
|
||||||
|
attempt=1
|
||||||
|
rm -f /tmp/publish-dry-run.log
|
||||||
|
|
||||||
# Check for real errors (not cascading dependency errors)
|
while [ "$attempt" -le "$max_attempts" ]; do
|
||||||
# Cascading errors mention "crates.io index", real errors mention "Cargo.toml"
|
echo "Dry-run publish attempt ${attempt}/${max_attempts}"
|
||||||
echo "$output" | grep -i "Cargo.toml" && exit 1 || true
|
cargo workspaces publish --dry-run --allow-dirty 2>&1 | tee /tmp/publish-dry-run.log
|
||||||
|
publish_status=${PIPESTATUS[0]}
|
||||||
|
|
||||||
|
if [ "$publish_status" -eq 0 ]; then
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Retry once for interruption/runner issues.
|
||||||
|
if [ "$attempt" -lt "$max_attempts" ] && \
|
||||||
|
{ [ "$publish_status" -eq 130 ] || [ "$publish_status" -eq 137 ]; }; then
|
||||||
|
echo "Publish dry-run interrupted (exit ${publish_status}), retrying in 10s..."
|
||||||
|
sleep 10
|
||||||
|
attempt=$((attempt + 1))
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
break
|
||||||
|
done
|
||||||
|
set -e
|
||||||
|
|
||||||
|
if grep -Eiq \
|
||||||
|
"failed to verify manifest|failed to parse manifest|invalid Cargo.toml|error: package .* has no (description|license|repository)" \
|
||||||
|
/tmp/publish-dry-run.log; then
|
||||||
|
echo "Detected real packaging/manifest errors"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# In dry-run mode, non-zero publish status is expected due to
|
||||||
|
# dependency-cascade failures against crates.io index.
|
||||||
|
if [ "$publish_status" -ne 0 ]; then
|
||||||
|
echo "Dry-run publish returned non-zero (${publish_status}) but no real manifest blockers were detected."
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Only expected dry-run dependency cascade errors detected (if any)."
|
||||||
|
|
||||||
# Show the list of packages published
|
# Show the list of packages published
|
||||||
- name: Show package versions
|
- name: Show package versions
|
||||||
|
|||||||
@@ -17,6 +17,8 @@ on:
|
|||||||
jobs:
|
jobs:
|
||||||
publish:
|
publish:
|
||||||
runs-on: arc-linux-latest
|
runs-on: arc-linux-latest
|
||||||
|
env:
|
||||||
|
RUSTUP_PERMIT_COPY_RENAME: 1
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repo
|
- name: Checkout repo
|
||||||
uses: actions/checkout@v6
|
uses: actions/checkout@v6
|
||||||
|
|||||||
@@ -17,6 +17,8 @@ on:
|
|||||||
jobs:
|
jobs:
|
||||||
publish:
|
publish:
|
||||||
runs-on: arc-linux-latest
|
runs-on: arc-linux-latest
|
||||||
|
env:
|
||||||
|
RUSTUP_PERMIT_COPY_RENAME: 1
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repo
|
- name: Checkout repo
|
||||||
uses: actions/checkout@v6
|
uses: actions/checkout@v6
|
||||||
|
|||||||
@@ -15,8 +15,11 @@ env:
|
|||||||
jobs:
|
jobs:
|
||||||
version-bump:
|
version-bump:
|
||||||
runs-on: arc-linux-latest
|
runs-on: arc-linux-latest
|
||||||
|
env:
|
||||||
|
RUSTUP_PERMIT_COPY_RENAME: 1
|
||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
|
pull-requests: write
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repo
|
- name: Checkout repo
|
||||||
uses: actions/checkout@v6
|
uses: actions/checkout@v6
|
||||||
@@ -64,11 +67,20 @@ jobs:
|
|||||||
--no-git-commit \
|
--no-git-commit \
|
||||||
--yes
|
--yes
|
||||||
|
|
||||||
- name: Commit and push version bump
|
- name: Create pull request
|
||||||
run: |
|
uses: peter-evans/create-pull-request@v7
|
||||||
git add -A
|
with:
|
||||||
git commit -m "crates release: bump version to ${{ inputs.version }}"
|
token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
git push
|
branch: "chore/bump-version-${{ inputs.version }}"
|
||||||
|
base: ${{ github.ref_name }}
|
||||||
|
commit-message: "crates release: bump version to ${{ inputs.version }}"
|
||||||
|
title: "chore: bump crate versions to ${{ inputs.version }}"
|
||||||
|
body: |
|
||||||
|
Automated version bump from `${{ steps.current_version.outputs.version }}` → `${{ inputs.version }}`.
|
||||||
|
|
||||||
|
Triggered by @${{ github.actor }} via workflow dispatch.
|
||||||
|
labels: "automated, crates-version-bump"
|
||||||
|
delete-branch: true
|
||||||
|
|
||||||
- name: Show package versions
|
- name: Show package versions
|
||||||
run: cargo workspaces list --long
|
run: cargo workspaces list --long
|
||||||
@@ -6,6 +6,8 @@ on:
|
|||||||
branches-ignore: [master]
|
branches-ignore: [master]
|
||||||
paths:
|
paths:
|
||||||
- "documentation/docs/**"
|
- "documentation/docs/**"
|
||||||
|
- "sdk/typescript/packages/sdk/src/**"
|
||||||
|
- "sdk/typescript/packages/mix-fetch/src/**"
|
||||||
- ".github/workflows/ci-docs.yml"
|
- ".github/workflows/ci-docs.yml"
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
@@ -20,10 +22,8 @@ jobs:
|
|||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
- name: Install Dependencies (Linux)
|
- name: Install Dependencies (Linux)
|
||||||
run: sudo apt-get update && sudo apt-get install -y build-essential curl wget libssl-dev libudev-dev squashfs-tools protobuf-compiler git python3 && sudo apt-get update --fix-missing
|
run: sudo apt-get update && sudo apt-get install -y build-essential curl wget libssl-dev libudev-dev squashfs-tools protobuf-compiler git python3 && sudo apt-get update --fix-missing
|
||||||
- name: Install pip3
|
|
||||||
run: sudo apt install -y python3-pip
|
|
||||||
- name: Install Python3 modules
|
- name: Install Python3 modules
|
||||||
run: sudo pip3 install pandas tabulate
|
run: sudo apt install -y python3-pandas python3-tabulate
|
||||||
- name: Install rsync
|
- name: Install rsync
|
||||||
run: sudo apt-get install -y rsync
|
run: sudo apt-get install -y rsync
|
||||||
- uses: rlespinasse/github-slug-action@v3.x
|
- uses: rlespinasse/github-slug-action@v3.x
|
||||||
@@ -44,10 +44,31 @@ jobs:
|
|||||||
command: build
|
command: build
|
||||||
args: --workspace --release
|
args: --workspace --release
|
||||||
|
|
||||||
|
- name: Check if TypeScript SDK source changed
|
||||||
|
id: check-ts-sdk
|
||||||
|
run: |
|
||||||
|
if git diff --name-only ${{ github.event.before }} ${{ github.sha }} | grep -qE '^sdk/typescript/packages/(sdk|mix-fetch)/src/'; then
|
||||||
|
echo "changed=true" >> $GITHUB_OUTPUT
|
||||||
|
else
|
||||||
|
echo "changed=false" >> $GITHUB_OUTPUT
|
||||||
|
fi
|
||||||
|
working-directory: ${{ github.workspace }}
|
||||||
|
|
||||||
|
- name: Regenerate TypeDoc API reference
|
||||||
|
if: steps.check-ts-sdk.outputs.changed == 'true'
|
||||||
|
run: |
|
||||||
|
npm install -g typedoc@0.25.13 typedoc-plugin-markdown@4.0.3
|
||||||
|
cd ${{ github.workspace }}/sdk/typescript/packages/sdk && typedoc --skipErrorChecking
|
||||||
|
cd ${{ github.workspace }}/sdk/typescript/packages/mix-fetch && typedoc --skipErrorChecking
|
||||||
|
|
||||||
- name: Install project dependencies
|
- name: Install project dependencies
|
||||||
run: pnpm i
|
run: pnpm i
|
||||||
|
- name: Generate llms-full.txt
|
||||||
|
run: pnpm run generate:llms
|
||||||
- name: Build project
|
- name: Build project
|
||||||
run: pnpm run build
|
run: pnpm run build
|
||||||
|
- name: Generate sitemap
|
||||||
|
run: npx next-sitemap
|
||||||
- name: Move files to /dist/
|
- name: Move files to /dist/
|
||||||
run: ../scripts/move-to-dist.sh
|
run: ../scripts/move-to-dist.sh
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,41 @@
|
|||||||
|
name: ci-nym-wallet-frontend
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
paths:
|
||||||
|
- 'nym-wallet/**'
|
||||||
|
- '.github/workflows/ci-nym-wallet-frontend.yml'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
types-lint:
|
||||||
|
runs-on: ubuntu-22.04
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v6
|
||||||
|
|
||||||
|
- uses: actions/setup-node@v4
|
||||||
|
with:
|
||||||
|
node-version-file: nym-wallet/.nvmrc
|
||||||
|
cache: yarn
|
||||||
|
cache-dependency-path: yarn.lock
|
||||||
|
|
||||||
|
- name: Install dependencies
|
||||||
|
run: yarn install --network-timeout 100000
|
||||||
|
|
||||||
|
- name: Build TypeScript packages (wallet depends on @nymproject/types, etc.)
|
||||||
|
run: yarn build:types
|
||||||
|
|
||||||
|
- name: Build @nymproject/mui-theme and @nymproject/react (wallet imports subpaths)
|
||||||
|
run: yarn build:packages
|
||||||
|
|
||||||
|
- name: Typecheck nym-wallet
|
||||||
|
run: yarn --cwd nym-wallet tsc
|
||||||
|
|
||||||
|
- name: Lint nym-wallet
|
||||||
|
run: yarn --cwd nym-wallet lint
|
||||||
|
|
||||||
|
- name: Yarn audit (workspace lockfile; informational)
|
||||||
|
run: yarn audit --level critical
|
||||||
|
continue-on-error: true
|
||||||
|
|
||||||
|
- name: Unit tests (nym-wallet)
|
||||||
|
run: yarn --cwd nym-wallet test
|
||||||
@@ -41,6 +41,9 @@ jobs:
|
|||||||
sed -i.bak '1s/^/\[profile.dev\]\ndebug = false\n\n/' Cargo.toml
|
sed -i.bak '1s/^/\[profile.dev\]\ndebug = false\n\n/' Cargo.toml
|
||||||
git diff
|
git diff
|
||||||
|
|
||||||
|
- name: Ensure nym-wallet/dist exists for Tauri
|
||||||
|
run: mkdir -p nym-wallet/dist
|
||||||
|
|
||||||
- name: Build all binaries
|
- name: Build all binaries
|
||||||
uses: actions-rs/cargo@v1
|
uses: actions-rs/cargo@v1
|
||||||
with:
|
with:
|
||||||
@@ -71,3 +74,16 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
command: clippy
|
command: clippy
|
||||||
args: --manifest-path nym-wallet/Cargo.toml --workspace --all-features --all-targets -- -D warnings
|
args: --manifest-path nym-wallet/Cargo.toml --workspace --all-features --all-targets -- -D warnings
|
||||||
|
|
||||||
|
- name: Install cargo-audit
|
||||||
|
uses: actions-rs/cargo@v1
|
||||||
|
with:
|
||||||
|
command: install
|
||||||
|
args: cargo-audit --locked
|
||||||
|
|
||||||
|
- name: Cargo audit (nym-wallet workspace)
|
||||||
|
uses: actions-rs/cargo@v1
|
||||||
|
with:
|
||||||
|
command: audit
|
||||||
|
working-directory: nym-wallet
|
||||||
|
continue-on-error: true
|
||||||
|
|||||||
@@ -1,53 +0,0 @@
|
|||||||
name: ci-nym-wallet-storybook
|
|
||||||
|
|
||||||
on:
|
|
||||||
pull_request:
|
|
||||||
paths:
|
|
||||||
- 'nym-wallet/**'
|
|
||||||
- '.github/workflows/ci-nym-wallet-storybook.yml'
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
runs-on: arc-linux-latest-dind
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v6
|
|
||||||
|
|
||||||
- name: Install rsync
|
|
||||||
run: sudo apt-get install rsync
|
|
||||||
continue-on-error: true
|
|
||||||
|
|
||||||
- uses: rlespinasse/github-slug-action@v3.x
|
|
||||||
|
|
||||||
- uses: actions/setup-node@v4
|
|
||||||
with:
|
|
||||||
node-version: 20
|
|
||||||
|
|
||||||
- name: Setup yarn
|
|
||||||
run: npm install -g yarn
|
|
||||||
|
|
||||||
- name: Install Rust toolchain
|
|
||||||
uses: actions-rs/toolchain@v1
|
|
||||||
with:
|
|
||||||
toolchain: ${{ vars.REQUIRED_RUSTC_VERSION }}
|
|
||||||
|
|
||||||
- name: Install wasm-pack
|
|
||||||
run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
|
|
||||||
|
|
||||||
- name: Build dependencies
|
|
||||||
run: yarn && yarn build
|
|
||||||
|
|
||||||
- name: Build storybook
|
|
||||||
run: yarn storybook:build
|
|
||||||
working-directory: ./nym-wallet
|
|
||||||
|
|
||||||
- name: Deploy branch to CI www (storybook)
|
|
||||||
continue-on-error: true
|
|
||||||
uses: easingthemes/ssh-deploy@main
|
|
||||||
env:
|
|
||||||
SSH_PRIVATE_KEY: ${{ secrets.CI_WWW_SSH_PRIVATE_KEY }}
|
|
||||||
ARGS: "-rltgoDzvO --delete"
|
|
||||||
SOURCE: "nym-wallet/storybook-static/"
|
|
||||||
REMOTE_HOST: ${{ secrets.CI_WWW_REMOTE_HOST }}
|
|
||||||
REMOTE_USER: ${{ secrets.CI_WWW_REMOTE_USER }}
|
|
||||||
TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/wallet-${{ env.GITHUB_REF_SLUG }}
|
|
||||||
EXCLUDE: "/dist/, /node_modules/"
|
|
||||||
@@ -8,7 +8,7 @@ on:
|
|||||||
jobs:
|
jobs:
|
||||||
sonarqube:
|
sonarqube:
|
||||||
name: SonarQube
|
name: SonarQube
|
||||||
runs-on: ubuntu-latest
|
runs-on: arc-linux-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
with:
|
with:
|
||||||
|
|||||||
@@ -2,8 +2,6 @@ name: nightly-build
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
schedule:
|
|
||||||
- cron: '14 1 * * *'
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ jobs:
|
|||||||
uses: actions/checkout@v6
|
uses: actions/checkout@v6
|
||||||
|
|
||||||
- name: Install Dependencies (Linux)
|
- name: Install Dependencies (Linux)
|
||||||
run: sudo apt-get update && sudo apt-get install -y libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev squashfs-tools
|
run: sudo apt-get update && sudo apt-get install -y libwebkit2gtk-4.1-dev build-essential curl wget libssl-dev libgtk-3-dev squashfs-tools libsoup-3.0-dev libjavascriptcoregtk-4.1-dev
|
||||||
if: matrix.os == 'ubuntu-22.04'
|
if: matrix.os == 'ubuntu-22.04'
|
||||||
|
|
||||||
- name: Install rust toolchain
|
- name: Install rust toolchain
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ on:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
integration-tests:
|
integration-tests:
|
||||||
runs-on: ubuntu-latest
|
runs-on: arc-linux-latest
|
||||||
env:
|
env:
|
||||||
API_BASE_URL: http://localhost:8000
|
API_BASE_URL: http://localhost:8000
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ env:
|
|||||||
jobs:
|
jobs:
|
||||||
check-milestone:
|
check-milestone:
|
||||||
name: Check Milestone
|
name: Check Milestone
|
||||||
runs-on: ubuntu-latest
|
runs-on: arc-linux-latest
|
||||||
steps:
|
steps:
|
||||||
- if: github.event.pull_request.milestone == null && contains( env.LABELS, 'no-milestone' ) == false
|
- if: github.event.pull_request.milestone == null && contains( env.LABELS, 'no-milestone' ) == false
|
||||||
run: exit 1
|
run: exit 1
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ jobs:
|
|||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- os: arc-linux-latest
|
- os: arc-ubuntu-22.04
|
||||||
target: x86_64-unknown-linux-gnu
|
target: x86_64-unknown-linux-gnu
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
|
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ jobs:
|
|||||||
- name: Node
|
- name: Node
|
||||||
uses: actions/setup-node@v4
|
uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: 21
|
node-version: 22.13.0
|
||||||
|
|
||||||
- name: Install Rust toolchain
|
- name: Install Rust toolchain
|
||||||
uses: dtolnay/rust-toolchain@stable
|
uses: dtolnay/rust-toolchain@stable
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ jobs:
|
|||||||
- name: Node
|
- name: Node
|
||||||
uses: actions/setup-node@v4
|
uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: 21
|
node-version: 22.13.0
|
||||||
cache: 'yarn'
|
cache: 'yarn'
|
||||||
|
|
||||||
- name: Install Rust toolchain
|
- name: Install Rust toolchain
|
||||||
@@ -72,6 +72,41 @@ jobs:
|
|||||||
find target/release/bundle -type d -name "*appimage*" -o -name "*AppImage*" || echo "No AppImage directories found"
|
find target/release/bundle -type d -name "*appimage*" -o -name "*AppImage*" || echo "No AppImage directories found"
|
||||||
find target/release/bundle -name "*.AppImage" -o -name "*.appimage" || echo "No AppImage files found"
|
find target/release/bundle -name "*.AppImage" -o -name "*.appimage" || echo "No AppImage files found"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
- name: Inspect AppImage (hook + bundled graphics libs)
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
APPIMAGE_REL=$(find target/release/bundle -name '*.AppImage' | head -n 1)
|
||||||
|
if [ -z "${APPIMAGE_REL}" ]; then
|
||||||
|
echo "No AppImage under target/release/bundle"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
APPIMAGE_ABS="${GITHUB_WORKSPACE}/nym-wallet/${APPIMAGE_REL}"
|
||||||
|
chmod +x "${APPIMAGE_ABS}"
|
||||||
|
EXTRACT_DIR=$(mktemp -d)
|
||||||
|
cd "${EXTRACT_DIR}"
|
||||||
|
"${APPIMAGE_ABS}" --appimage-extract
|
||||||
|
# Tauri only stages appimage "files" under /usr/ into the AppDir; paths like /apprun-hooks/ never reach the image.
|
||||||
|
# Wayland + WEBKIT_DISABLE_DMABUF_RENDERER defaults are applied in main() instead (see configure_linux_wayland_defaults).
|
||||||
|
HOOK=$(find squashfs-root -name '99-nym-wayland.sh' 2>/dev/null | head -n 1)
|
||||||
|
if [ -n "${HOOK}" ]; then
|
||||||
|
echo "Found legacy apprun hook at ${HOOK}"
|
||||||
|
else
|
||||||
|
echo "No apprun-hooks/99-nym-wayland.sh (expected): Wayland defaults are set in-process."
|
||||||
|
fi
|
||||||
|
find squashfs-root/usr/lib -maxdepth 6 \
|
||||||
|
\( -name 'libwayland-client.so*' -o -name 'libEGL.so*' -o -name 'libgbm.so*' \) \
|
||||||
|
2>/dev/null | sort > "${GITHUB_WORKSPACE}/nym-wallet/appimage-bundled-graphics-libs.txt"
|
||||||
|
wc -l "${GITHUB_WORKSPACE}/nym-wallet/appimage-bundled-graphics-libs.txt"
|
||||||
|
head -50 "${GITHUB_WORKSPACE}/nym-wallet/appimage-bundled-graphics-libs.txt" || true
|
||||||
|
|
||||||
|
- name: Upload AppImage graphics lib inventory
|
||||||
|
uses: actions/upload-artifact@v6
|
||||||
|
with:
|
||||||
|
name: nym-wallet-appimage-lib-inventory
|
||||||
|
path: nym-wallet/appimage-bundled-graphics-libs.txt
|
||||||
|
retention-days: 30
|
||||||
|
|
||||||
- name: Create AppImage tarball if needed
|
- name: Create AppImage tarball if needed
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@@ -26,6 +26,9 @@ jobs:
|
|||||||
outputs:
|
outputs:
|
||||||
release_tag: ${{ github.ref_name }}
|
release_tag: ${{ github.ref_name }}
|
||||||
|
|
||||||
|
env:
|
||||||
|
SIGN_WINDOWS: ${{ github.event_name == 'release' || inputs.sign }}
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
|
|
||||||
@@ -37,48 +40,82 @@ jobs:
|
|||||||
- name: Setup MSBuild.exe
|
- name: Setup MSBuild.exe
|
||||||
uses: microsoft/setup-msbuild@v2
|
uses: microsoft/setup-msbuild@v2
|
||||||
|
|
||||||
|
# No cache:yarn here: setup-node needs yarn on PATH to populate the cache, but this runner
|
||||||
|
# only gets yarn from the step below.
|
||||||
- name: Node
|
- name: Node
|
||||||
uses: actions/setup-node@v4
|
uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: 21
|
node-version: 22.13.0
|
||||||
|
|
||||||
|
- name: Install Yarn (classic)
|
||||||
|
shell: bash
|
||||||
|
run: npm install -g yarn@1.22.22
|
||||||
|
|
||||||
|
- name: Strip Authenticode thumbprint (avoid signtool on runner)
|
||||||
|
working-directory: nym-wallet/src-tauri
|
||||||
|
if: ${{ env.SIGN_WINDOWS == 'true' || (github.event_name == 'workflow_dispatch' && !inputs.sign) }}
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
if ! command -v yq >/dev/null 2>&1; then
|
||||||
|
echo "yq is required on this runner to edit tauri.conf.json"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
yq eval --inplace '
|
||||||
|
del(.bundle.windows.certificateThumbprint) |
|
||||||
|
del(.bundle.windows.digestAlgorithm) |
|
||||||
|
del(.bundle.windows.timestampUrl)
|
||||||
|
' tauri.conf.json
|
||||||
|
|
||||||
- name: Download EV CodeSignTool from ssl.com
|
- name: Download EV CodeSignTool from ssl.com
|
||||||
working-directory: nym-wallet/src-tauri
|
working-directory: nym-wallet/src-tauri
|
||||||
if: ${{ inputs.sign }}
|
if: env.SIGN_WINDOWS == 'true'
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
curl -L0 https://www.ssl.com/download/codesigntool-for-linux-and-macos/ -o codesigntool.zip
|
curl -L0 https://www.ssl.com/download/codesigntool-for-linux-and-macos/ -o codesigntool.zip
|
||||||
unzip codesigntool.zip
|
unzip codesigntool.zip
|
||||||
- name: Get EV certificate credential id
|
- name: Get EV certificate credential id
|
||||||
working-directory: nym-wallet/src-tauri
|
working-directory: nym-wallet/src-tauri
|
||||||
if: ${{ inputs.sign }}
|
if: env.SIGN_WINDOWS == 'true'
|
||||||
id: get_credential_ids
|
id: get_credential_ids
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
echo "SSL_COM_CREDENTIAL_ID=$(./CodeSignTool.sh get_credential_ids -username=${{ secrets.SSL_COM_USERNAME }} -password=${{ secrets.SSL_COM_PASSWORD }} | sed -n '1!p' | sed 's/- //')" >> "$GITHUB_OUTPUT"
|
echo "SSL_COM_CREDENTIAL_ID=$(./CodeSignTool.sh get_credential_ids -username=${{ secrets.SSL_COM_USERNAME }} -password=${{ secrets.SSL_COM_PASSWORD }} | sed -n '1!p' | sed 's/- //')" >> "$GITHUB_OUTPUT"
|
||||||
- name: Add custom sign command to tauri.conf.json
|
- name: Add custom sign command to tauri.conf.json
|
||||||
working-directory: nym-wallet/src-tauri
|
working-directory: nym-wallet/src-tauri
|
||||||
if: ${{ inputs.sign }}
|
if: env.SIGN_WINDOWS == 'true'
|
||||||
shell: bash
|
shell: bash
|
||||||
|
env:
|
||||||
|
SSL_SIGN_USER: ${{ secrets.SSL_COM_USERNAME }}
|
||||||
|
SSL_SIGN_PASS: ${{ secrets.SSL_COM_PASSWORD }}
|
||||||
|
SSL_SIGN_CRED: ${{ steps.get_credential_ids.outputs.SSL_COM_CREDENTIAL_ID }}
|
||||||
|
SSL_SIGN_TOTP: ${{ secrets.SSL_COM_TOTP_SECRET }}
|
||||||
run: |
|
run: |
|
||||||
yq eval --inplace '.bundle.windows +=
|
set -euo pipefail
|
||||||
{
|
if ! command -v cygpath >/dev/null 2>&1; then
|
||||||
"signCommand": {
|
echo "cygpath not found; install Git for Windows or use bash from Git SDK"
|
||||||
"cmd": "C:\Program Files\Git\bin\bash.EXE",
|
exit 1
|
||||||
"args": [
|
fi
|
||||||
"/c/actions-runner/_work/nym/nym/nym-wallet/src-tauri/CodeSignTool.sh",
|
export SCRIPT_UNIX="$(cygpath -u "$GITHUB_WORKSPACE/nym-wallet/src-tauri/CodeSignTool.sh")"
|
||||||
"sign",
|
yq eval --inplace '
|
||||||
"-username ${{ secrets.SSL_COM_USERNAME }}",
|
.bundle.windows += {
|
||||||
"-password ${{ secrets.SSL_COM_PASSWORD }}",
|
"signCommand": {
|
||||||
"-credential_id ${{ steps.get_credential_ids.outputs.SSL_COM_CREDENTIAL_ID }}",
|
"cmd": "C:/Program Files/Git/bin/bash.exe",
|
||||||
"-totp_secret ${{ secrets.SSL_COM_TOTP_SECRET }}",
|
"args": [
|
||||||
"-program_name NymWallet",
|
strenv(SCRIPT_UNIX),
|
||||||
"-input_file_path",
|
"sign",
|
||||||
"%1",
|
("-username " + strenv(SSL_SIGN_USER)),
|
||||||
"-override"
|
("-password " + strenv(SSL_SIGN_PASS)),
|
||||||
]
|
("-credential_id " + strenv(SSL_SIGN_CRED)),
|
||||||
|
("-totp_secret " + strenv(SSL_SIGN_TOTP)),
|
||||||
|
"-program_name NymWallet",
|
||||||
|
"-input_file_path",
|
||||||
|
"%1",
|
||||||
|
"-override"
|
||||||
|
]
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}' tauri.conf.json
|
' tauri.conf.json
|
||||||
- name: Install project dependencies
|
- name: Install project dependencies
|
||||||
shell: bash
|
shell: bash
|
||||||
run: cd .. && yarn --network-timeout 100000
|
run: cd .. && yarn --network-timeout 100000
|
||||||
@@ -93,10 +130,10 @@ jobs:
|
|||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
|
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
|
||||||
TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
|
TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
|
||||||
SSL_COM_USERNAME: ${{ inputs.sign && secrets.SSL_COM_USERNAME }}
|
SSL_COM_USERNAME: ${{ env.SIGN_WINDOWS == 'true' && secrets.SSL_COM_USERNAME }}
|
||||||
SSL_COM_PASSWORD: ${{ inputs.sign && secrets.SSL_COM_PASSWORD }}
|
SSL_COM_PASSWORD: ${{ env.SIGN_WINDOWS == 'true' && secrets.SSL_COM_PASSWORD }}
|
||||||
SSL_COM_CREDENTIAL_ID: ${{ inputs.sign && steps.get_credential_ids.outputs.SSL_COM_CREDENTIAL_ID }}
|
SSL_COM_CREDENTIAL_ID: ${{ env.SIGN_WINDOWS == 'true' && steps.get_credential_ids.outputs.SSL_COM_CREDENTIAL_ID }}
|
||||||
SSL_COM_TOTP_SECRET: ${{ inputs.sign && secrets.SSL_COM_TOTP_SECRET }}
|
SSL_COM_TOTP_SECRET: ${{ env.SIGN_WINDOWS == 'true' && secrets.SSL_COM_TOTP_SECRET }}
|
||||||
run: |
|
run: |
|
||||||
echo "Starting build process..."
|
echo "Starting build process..."
|
||||||
yarn build
|
yarn build
|
||||||
@@ -167,4 +204,4 @@ jobs:
|
|||||||
needs: publish-tauri
|
needs: publish-tauri
|
||||||
with:
|
with:
|
||||||
release_tag: ${{ needs.publish-tauri.outputs.release_tag || github.ref_name }}
|
release_tag: ${{ needs.publish-tauri.outputs.release_tag || github.ref_name }}
|
||||||
secrets: inherit
|
secrets: inherit
|
||||||
|
|||||||
@@ -36,6 +36,9 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
go-version: "1.24.6"
|
go-version: "1.24.6"
|
||||||
|
|
||||||
|
- name: Update root CA certificate bundle
|
||||||
|
run: ./wasm/mix-fetch/go-mix-conn/scripts/update-root-certs.sh
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: yarn
|
run: yarn
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,61 @@
|
|||||||
|
name: Build and upload Network Monitor Agent container to harbor.nymte.ch
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
release_image:
|
||||||
|
description: 'Tag image as a release (prefix with golden-)'
|
||||||
|
required: true
|
||||||
|
default: false
|
||||||
|
type: boolean
|
||||||
|
|
||||||
|
env:
|
||||||
|
WORKING_DIRECTORY: "nym-network-monitor-v3/nym-network-monitor-agent"
|
||||||
|
CONTAINER_NAME: "network-monitor-agent"
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build-container:
|
||||||
|
runs-on: arc-linux-latest-dind
|
||||||
|
steps:
|
||||||
|
- name: Login to Harbor
|
||||||
|
uses: docker/login-action@v3
|
||||||
|
with:
|
||||||
|
registry: harbor.nymte.ch
|
||||||
|
username: ${{ secrets.HARBOR_ROBOT_USERNAME }}
|
||||||
|
password: ${{ secrets.HARBOR_ROBOT_SECRET }}
|
||||||
|
|
||||||
|
- name: Checkout repo
|
||||||
|
uses: actions/checkout@v6
|
||||||
|
|
||||||
|
- name: Configure git identity
|
||||||
|
run: |
|
||||||
|
git config --global user.email "lawrence@nymtech.net"
|
||||||
|
git config --global user.name "Lawrence Stalder"
|
||||||
|
|
||||||
|
- name: Get version from Cargo.toml
|
||||||
|
id: get_version
|
||||||
|
run: |
|
||||||
|
VERSION=$(yq -oy '.package.version' ${{ env.WORKING_DIRECTORY }}/Cargo.toml)
|
||||||
|
echo "result=$VERSION" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
|
- name: Set GIT_TAG variable
|
||||||
|
run: echo "GIT_TAG=${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }}" >> $GITHUB_ENV
|
||||||
|
|
||||||
|
- name: Initialize RELEASE_TAG
|
||||||
|
run: echo "RELEASE_TAG=" >> $GITHUB_ENV
|
||||||
|
|
||||||
|
- name: Set RELEASE_TAG for release
|
||||||
|
if: github.event.inputs.release_image == 'true'
|
||||||
|
run: echo "RELEASE_TAG=golden-" >> $GITHUB_ENV
|
||||||
|
|
||||||
|
- name: Set IMAGE_NAME_AND_TAGS variable
|
||||||
|
run: echo "IMAGE_NAME_AND_TAGS=${{ env.CONTAINER_NAME }}:${{ env.RELEASE_TAG }}${{ steps.get_version.outputs.result }}" >> $GITHUB_ENV
|
||||||
|
|
||||||
|
- name: New env vars
|
||||||
|
run: echo "RELEASE_TAG='$RELEASE_TAG' GIT_TAG='$GIT_TAG' IMAGE_NAME_AND_TAGS='$IMAGE_NAME_AND_TAGS'"
|
||||||
|
|
||||||
|
- name: Build and push image to Harbor
|
||||||
|
run: |
|
||||||
|
docker build -f ${{ env.WORKING_DIRECTORY }}/Dockerfile . -t harbor.nymte.ch/nym/${{ env.IMAGE_NAME_AND_TAGS }}
|
||||||
|
docker push harbor.nymte.ch/nym/${{ env.CONTAINER_NAME }} --all-tags
|
||||||
|
|
||||||
@@ -0,0 +1,57 @@
|
|||||||
|
name: Build and upload Network Monitor Orchestrator container to harbor.nymte.ch
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
release_image:
|
||||||
|
description: 'Tag image as a release (prefix with golden-)'
|
||||||
|
required: true
|
||||||
|
default: false
|
||||||
|
type: boolean
|
||||||
|
|
||||||
|
env:
|
||||||
|
WORKING_DIRECTORY: "nym-network-monitor-v3/nym-network-monitor-orchestrator"
|
||||||
|
CONTAINER_NAME: "network-monitor-orchestrator"
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build-container:
|
||||||
|
runs-on: arc-linux-latest-dind
|
||||||
|
steps:
|
||||||
|
- name: Login to Harbor
|
||||||
|
uses: docker/login-action@v3
|
||||||
|
with:
|
||||||
|
registry: harbor.nymte.ch
|
||||||
|
username: ${{ secrets.HARBOR_ROBOT_USERNAME }}
|
||||||
|
password: ${{ secrets.HARBOR_ROBOT_SECRET }}
|
||||||
|
|
||||||
|
- name: Checkout repo
|
||||||
|
uses: actions/checkout@v6
|
||||||
|
|
||||||
|
- name: Configure git identity
|
||||||
|
run: |
|
||||||
|
git config --global user.email "lawrence@nymtech.net"
|
||||||
|
git config --global user.name "Lawrence Stalder"
|
||||||
|
|
||||||
|
- name: Get version from Cargo.toml
|
||||||
|
id: get_version
|
||||||
|
run: |
|
||||||
|
VERSION=$(yq -oy '.package.version' ${{ env.WORKING_DIRECTORY }}/Cargo.toml)
|
||||||
|
echo "result=$VERSION" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
|
- name: Initialize RELEASE_TAG
|
||||||
|
run: echo "RELEASE_TAG=" >> $GITHUB_ENV
|
||||||
|
|
||||||
|
- name: Set RELEASE_TAG for release
|
||||||
|
if: github.event.inputs.release_image == 'true'
|
||||||
|
run: echo "RELEASE_TAG=golden-" >> $GITHUB_ENV
|
||||||
|
|
||||||
|
- name: Set IMAGE_NAME_AND_TAGS variable
|
||||||
|
run: echo "IMAGE_NAME_AND_TAGS=${{ env.CONTAINER_NAME }}:${{ env.RELEASE_TAG }}${{ steps.get_version.outputs.result }}" >> $GITHUB_ENV
|
||||||
|
|
||||||
|
- name: Log image name
|
||||||
|
run: echo "RELEASE_TAG='$RELEASE_TAG' IMAGE_NAME_AND_TAGS='$IMAGE_NAME_AND_TAGS'"
|
||||||
|
|
||||||
|
- name: Build and push image to Harbor
|
||||||
|
run: |
|
||||||
|
docker build -f ${{ env.WORKING_DIRECTORY }}/Dockerfile . -t harbor.nymte.ch/nym/${{ env.IMAGE_NAME_AND_TAGS }}
|
||||||
|
docker push harbor.nymte.ch/nym/${{ env.CONTAINER_NAME }} --all-tags
|
||||||
@@ -25,6 +25,10 @@ jobs:
|
|||||||
- name: Install cargo-workspaces
|
- name: Install cargo-workspaces
|
||||||
run: cargo install cargo-workspaces
|
run: cargo install cargo-workspaces
|
||||||
|
|
||||||
|
- name: Preflight publish checks
|
||||||
|
run: |
|
||||||
|
python3 tools/internal/check_publish_preflight.py
|
||||||
|
|
||||||
- name: Publish remaining crates
|
- name: Publish remaining crates
|
||||||
env:
|
env:
|
||||||
CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
|
CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ v6-topology.json
|
|||||||
/explorer/public/downloads/mixmining.json
|
/explorer/public/downloads/mixmining.json
|
||||||
/explorer/public/downloads/topology.json
|
/explorer/public/downloads/topology.json
|
||||||
/nym-wallet/dist/*
|
/nym-wallet/dist/*
|
||||||
|
/nym-wallet/appimage-bundled-graphics-libs.txt
|
||||||
/clients/validator/examples/nym-driver-example/current-contract.txt
|
/clients/validator/examples/nym-driver-example/current-contract.txt
|
||||||
validator-api/v4.json
|
validator-api/v4.json
|
||||||
validator-api/v6.json
|
validator-api/v6.json
|
||||||
|
|||||||
+190
@@ -4,6 +4,196 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
|
|||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
|
## [2026.10-waterloo] (2026-05-27)
|
||||||
|
|
||||||
|
- Re-order default API urls for network details - Waterloo release ([#6799])
|
||||||
|
- [bugfix] IPR v8<->v9 mismatch on Waterloo ([#6772])
|
||||||
|
- Migrate to hickory 0.26.1 ([#6751])
|
||||||
|
- add workflows for NM3 ([#6729])
|
||||||
|
- credential proxy pool ([#6726])
|
||||||
|
- chore: made sphinx version threshold assertion a compile time check ([#6718])
|
||||||
|
- Feat/nmv3 updated performance calculation ([#6714])
|
||||||
|
- feat: NMv3: submission of stress testing result into nym-api ([#6709])
|
||||||
|
- feat: NMv3: Prometheus metrics for network monitor ([#6693])
|
||||||
|
- feat: NMv3: add read-only results API to orchestrator ([#6689])
|
||||||
|
- feat: NMv3: Eviction of stale testrun data ([#6685])
|
||||||
|
- feat: NMv3: Wire up testrun assignment and result submission flow ([#6680])
|
||||||
|
- feat: NMv3: Support multiple network monitor agents per host ([#6679])
|
||||||
|
- Feat/nmv3 agent announcement ([#6673])
|
||||||
|
- add node refresher for periodic scraping of bonded nym-node details ([#6626])
|
||||||
|
- Feat/nmv3 orchestrator queue ([#6597])
|
||||||
|
- feat: network monitor agent - standalone node stress-testing ([#6582])
|
||||||
|
- [feat] propagate NM agent noise keys to nym-node routing ([#6577])
|
||||||
|
- start mix stress testing topic branch ([#6575])
|
||||||
|
- Feat/nmv3 agents subscription ([#6567])
|
||||||
|
- Feat/nmv3 agents contract ([#6555])
|
||||||
|
|
||||||
|
[#6799]: https://github.com/nymtech/nym/pull/6799
|
||||||
|
[#6772]: https://github.com/nymtech/nym/pull/6772
|
||||||
|
[#6751]: https://github.com/nymtech/nym/pull/6751
|
||||||
|
[#6729]: https://github.com/nymtech/nym/pull/6729
|
||||||
|
[#6726]: https://github.com/nymtech/nym/pull/6726
|
||||||
|
[#6718]: https://github.com/nymtech/nym/pull/6718
|
||||||
|
[#6714]: https://github.com/nymtech/nym/pull/6714
|
||||||
|
[#6709]: https://github.com/nymtech/nym/pull/6709
|
||||||
|
[#6693]: https://github.com/nymtech/nym/pull/6693
|
||||||
|
[#6689]: https://github.com/nymtech/nym/pull/6689
|
||||||
|
[#6685]: https://github.com/nymtech/nym/pull/6685
|
||||||
|
[#6680]: https://github.com/nymtech/nym/pull/6680
|
||||||
|
[#6679]: https://github.com/nymtech/nym/pull/6679
|
||||||
|
[#6673]: https://github.com/nymtech/nym/pull/6673
|
||||||
|
[#6626]: https://github.com/nymtech/nym/pull/6626
|
||||||
|
[#6597]: https://github.com/nymtech/nym/pull/6597
|
||||||
|
[#6582]: https://github.com/nymtech/nym/pull/6582
|
||||||
|
[#6577]: https://github.com/nymtech/nym/pull/6577
|
||||||
|
[#6575]: https://github.com/nymtech/nym/pull/6575
|
||||||
|
[#6567]: https://github.com/nymtech/nym/pull/6567
|
||||||
|
[#6555]: https://github.com/nymtech/nym/pull/6555
|
||||||
|
|
||||||
|
## [2026.9-venaco] (2026-05-06)
|
||||||
|
|
||||||
|
- Fix for v9 IPR ([#6710])
|
||||||
|
- Only init SHARED_CLIENT if requested ([#6708])
|
||||||
|
- Fixes to crates and CI ([#6686])
|
||||||
|
- Return ipv6 addresses as well ([#6684])
|
||||||
|
- Fix invalid ticket spend ([#6683])
|
||||||
|
- Block non-public IPR/NR checks ([#6670])
|
||||||
|
|
||||||
|
[#6710]: https://github.com/nymtech/nym/pull/6710
|
||||||
|
[#6708]: https://github.com/nymtech/nym/pull/6708
|
||||||
|
[#6686]: https://github.com/nymtech/nym/pull/6686
|
||||||
|
[#6684]: https://github.com/nymtech/nym/pull/6684
|
||||||
|
[#6683]: https://github.com/nymtech/nym/pull/6683
|
||||||
|
[#6670]: https://github.com/nymtech/nym/pull/6670
|
||||||
|
|
||||||
|
## [2026.8-urda] (2026-04-20)
|
||||||
|
|
||||||
|
- Include all gateways in the returned list ([#6649])
|
||||||
|
- Optimize GW probe in NS agent ([#6636])
|
||||||
|
- Max/sdk docrs ([#6566])
|
||||||
|
- Max/sdk stream wrapper ([#6320])
|
||||||
|
|
||||||
|
[#6649]: https://github.com/nymtech/nym/pull/6649
|
||||||
|
[#6636]: https://github.com/nymtech/nym/pull/6636
|
||||||
|
[#6566]: https://github.com/nymtech/nym/pull/6566
|
||||||
|
[#6320]: https://github.com/nymtech/nym/pull/6320
|
||||||
|
|
||||||
|
## [2026.7-tola] (2026-04-07)
|
||||||
|
|
||||||
|
- Simon/ecash contract serde fix ([#6634])
|
||||||
|
- Update Fallback IP for Nym API ([#6622])
|
||||||
|
- Nym Node spam logging ([#6621])
|
||||||
|
- feat: multiple deposit prices ([#6608])
|
||||||
|
- move format_debug_bytes in common crate ([#6580])
|
||||||
|
- bugfix: make sure client keys are generated before requesting credentials ([#6579])
|
||||||
|
- Fix socks5 GW probe regression ([#6576])
|
||||||
|
- Max/lp stream framing ([#6573])
|
||||||
|
- HTTP domain rotation conditions ([#6570])
|
||||||
|
|
||||||
|
[#6634]: https://github.com/nymtech/nym/pull/6634
|
||||||
|
[#6622]: https://github.com/nymtech/nym/pull/6622
|
||||||
|
[#6621]: https://github.com/nymtech/nym/pull/6621
|
||||||
|
[#6608]: https://github.com/nymtech/nym/pull/6608
|
||||||
|
[#6580]: https://github.com/nymtech/nym/pull/6580
|
||||||
|
[#6579]: https://github.com/nymtech/nym/pull/6579
|
||||||
|
[#6576]: https://github.com/nymtech/nym/pull/6576
|
||||||
|
[#6573]: https://github.com/nymtech/nym/pull/6573
|
||||||
|
[#6570]: https://github.com/nymtech/nym/pull/6570
|
||||||
|
|
||||||
|
## [2026.6-stilton] (2026-03-25)
|
||||||
|
|
||||||
|
- lp fixes ([#6601])
|
||||||
|
- bugfix: allow deserialisation of LP data from either snake_case or lowercase ([#6586])
|
||||||
|
- bugfix: make sure to run cargo install cosmwasm-check with --locked flag during CI ([#6568])
|
||||||
|
- Add LP to NS UI ([#6562])
|
||||||
|
- feat: nyxd watcher ([#6561])
|
||||||
|
- Additional ticket for agent ([#6551])
|
||||||
|
- bugfix: make sure to use old values from metrics debug config during v12 migration (#6546) ([#6547])
|
||||||
|
- typo ([#6543])
|
||||||
|
- rng changes for a Send variant ([#6541])
|
||||||
|
- Add LP fields ([#6535])
|
||||||
|
- enable LP registration in registration client ([#6534])
|
||||||
|
- chore: rename LpMessage to LpFrame ([#6530])
|
||||||
|
- chore: LP improvements ([#6526])
|
||||||
|
- Remove dep leak of strum iterator ([#6522])
|
||||||
|
- chore: update ts-rs dep ([#6517])
|
||||||
|
- addressing LP PR comments ([#6513])
|
||||||
|
- remove redundant LP state machine in favour of in place processing ([#6512])
|
||||||
|
- chore: split up lp listener ([#6507])
|
||||||
|
- feat: enable mutual KKT exchange ([#6505])
|
||||||
|
- feat: introduce /v3/unstable/nym-nodes/semi-skimmed to aggregate LP information ([#6499])
|
||||||
|
- Max/asyncread asyncwrite nym client ([#6318])
|
||||||
|
- feat: localnet v2 ([#6277])
|
||||||
|
|
||||||
|
[#6601]: https://github.com/nymtech/nym/pull/6601
|
||||||
|
[#6586]: https://github.com/nymtech/nym/pull/6586
|
||||||
|
[#6568]: https://github.com/nymtech/nym/pull/6568
|
||||||
|
[#6562]: https://github.com/nymtech/nym/pull/6562
|
||||||
|
[#6561]: https://github.com/nymtech/nym/pull/6561
|
||||||
|
[#6551]: https://github.com/nymtech/nym/pull/6551
|
||||||
|
[#6547]: https://github.com/nymtech/nym/pull/6547
|
||||||
|
[#6543]: https://github.com/nymtech/nym/pull/6543
|
||||||
|
[#6541]: https://github.com/nymtech/nym/pull/6541
|
||||||
|
[#6535]: https://github.com/nymtech/nym/pull/6535
|
||||||
|
[#6534]: https://github.com/nymtech/nym/pull/6534
|
||||||
|
[#6530]: https://github.com/nymtech/nym/pull/6530
|
||||||
|
[#6526]: https://github.com/nymtech/nym/pull/6526
|
||||||
|
[#6522]: https://github.com/nymtech/nym/pull/6522
|
||||||
|
[#6517]: https://github.com/nymtech/nym/pull/6517
|
||||||
|
[#6513]: https://github.com/nymtech/nym/pull/6513
|
||||||
|
[#6512]: https://github.com/nymtech/nym/pull/6512
|
||||||
|
[#6507]: https://github.com/nymtech/nym/pull/6507
|
||||||
|
[#6505]: https://github.com/nymtech/nym/pull/6505
|
||||||
|
[#6499]: https://github.com/nymtech/nym/pull/6499
|
||||||
|
[#6318]: https://github.com/nymtech/nym/pull/6318
|
||||||
|
[#6277]: https://github.com/nymtech/nym/pull/6277
|
||||||
|
|
||||||
|
## [2026.5-raclette] (2026-03-10)
|
||||||
|
|
||||||
|
- bugfix: correctly populate gateway probe LP data ([#6533])
|
||||||
|
- chore: introduce additional prometheus metrics for registration times ([#6532])
|
||||||
|
- bugfix: lp information to have proper snake_case on API endpoints ([#6531])
|
||||||
|
- removed redundant LP states ([#6509])
|
||||||
|
- chore: removed all matrix notifications from github actions ([#6495])
|
||||||
|
- feat: Lewes Protocol with PSQv2 ([#6491])
|
||||||
|
- build(deps): bump minimatch from 3.1.2 to 3.1.4 in /documentation/docs ([#6486])
|
||||||
|
- build(deps): bump bn.js from 4.12.2 to 4.12.3 in /documentation/docs ([#6484])
|
||||||
|
- build(deps): bump bn.js from 4.12.2 to 4.12.3 ([#6483])
|
||||||
|
- build(deps): bump ajv from 8.17.1 to 8.18.0 in /clients/native/examples/js-examples/websocket ([#6478])
|
||||||
|
- build(deps): bump ajv from 6.12.6 to 6.14.0 in /documentation/docs ([#6477])
|
||||||
|
- build(deps): bump minimatch and glob in /documentation/scripts/post-process ([#6476])
|
||||||
|
- build(deps): bump hono from 4.11.9 to 4.12.0 ([#6475])
|
||||||
|
- build(deps): bump keccak from 0.1.5 to 0.1.6 ([#6472])
|
||||||
|
- build(deps-dev): bump qs from 6.14.1 to 6.14.2 in /clients/native/examples/js-examples/websocket ([#6466])
|
||||||
|
- build(deps): bump mikefarah/yq from 4.52.2 to 4.52.4 ([#6465])
|
||||||
|
- Otel minimal v2 ([#6464])
|
||||||
|
- build(deps): bump qs and express in /wasm/client/internal-dev ([#6461])
|
||||||
|
- bugfix: restore 'latest_measurement' field for nym-node /verloc endpoint ([#6452])
|
||||||
|
- build(deps-dev): bump webpack from 5.77.0 to 5.104.1 in /wasm/node-tester/internal-dev ([#6451])
|
||||||
|
- Max/mixfetch concurrent test ([#6417])
|
||||||
|
|
||||||
|
[#6533]: https://github.com/nymtech/nym/pull/6533
|
||||||
|
[#6532]: https://github.com/nymtech/nym/pull/6532
|
||||||
|
[#6531]: https://github.com/nymtech/nym/pull/6531
|
||||||
|
[#6509]: https://github.com/nymtech/nym/pull/6509
|
||||||
|
[#6495]: https://github.com/nymtech/nym/pull/6495
|
||||||
|
[#6491]: https://github.com/nymtech/nym/pull/6491
|
||||||
|
[#6486]: https://github.com/nymtech/nym/pull/6486
|
||||||
|
[#6484]: https://github.com/nymtech/nym/pull/6484
|
||||||
|
[#6483]: https://github.com/nymtech/nym/pull/6483
|
||||||
|
[#6478]: https://github.com/nymtech/nym/pull/6478
|
||||||
|
[#6477]: https://github.com/nymtech/nym/pull/6477
|
||||||
|
[#6476]: https://github.com/nymtech/nym/pull/6476
|
||||||
|
[#6475]: https://github.com/nymtech/nym/pull/6475
|
||||||
|
[#6472]: https://github.com/nymtech/nym/pull/6472
|
||||||
|
[#6466]: https://github.com/nymtech/nym/pull/6466
|
||||||
|
[#6465]: https://github.com/nymtech/nym/pull/6465
|
||||||
|
[#6464]: https://github.com/nymtech/nym/pull/6464
|
||||||
|
[#6461]: https://github.com/nymtech/nym/pull/6461
|
||||||
|
[#6452]: https://github.com/nymtech/nym/pull/6452
|
||||||
|
[#6451]: https://github.com/nymtech/nym/pull/6451
|
||||||
|
[#6417]: https://github.com/nymtech/nym/pull/6417
|
||||||
|
|
||||||
## [2026.4-quark] (2026-02-24)
|
## [2026.4-quark] (2026-02-24)
|
||||||
|
|
||||||
- Enhance CI workflow with feature inputs ([#6462])
|
- Enhance CI workflow with feature inputs ([#6462])
|
||||||
|
|||||||
Generated
+1041
-258
File diff suppressed because it is too large
Load Diff
+43
-20
@@ -44,6 +44,7 @@ members = [
|
|||||||
"common/cosmwasm-smart-contracts/nym-performance-contract",
|
"common/cosmwasm-smart-contracts/nym-performance-contract",
|
||||||
"common/cosmwasm-smart-contracts/nym-pool-contract",
|
"common/cosmwasm-smart-contracts/nym-pool-contract",
|
||||||
"common/cosmwasm-smart-contracts/vesting-contract",
|
"common/cosmwasm-smart-contracts/vesting-contract",
|
||||||
|
"common/cosmwasm-smart-contracts/network-monitors-contract",
|
||||||
"common/credential-proxy",
|
"common/credential-proxy",
|
||||||
"common/credential-storage",
|
"common/credential-storage",
|
||||||
"common/credential-utils",
|
"common/credential-utils",
|
||||||
@@ -147,6 +148,7 @@ members = [
|
|||||||
"sdk/ffi/go",
|
"sdk/ffi/go",
|
||||||
"sdk/ffi/shared",
|
"sdk/ffi/shared",
|
||||||
"sdk/rust/nym-sdk",
|
"sdk/rust/nym-sdk",
|
||||||
|
"smolmix/core",
|
||||||
"service-providers/common",
|
"service-providers/common",
|
||||||
"service-providers/ip-packet-router",
|
"service-providers/ip-packet-router",
|
||||||
"service-providers/network-requester",
|
"service-providers/network-requester",
|
||||||
@@ -157,8 +159,8 @@ members = [
|
|||||||
"tools/internal/mixnet-connectivity-check",
|
"tools/internal/mixnet-connectivity-check",
|
||||||
# "tools/internal/sdk-version-bump",
|
# "tools/internal/sdk-version-bump",
|
||||||
"tools/internal/ssl-inject",
|
"tools/internal/ssl-inject",
|
||||||
"tools/internal/testnet-manager",
|
"tools/internal/localnet-orchestrator",
|
||||||
"tools/internal/testnet-manager/dkg-bypass-contract",
|
"tools/internal/localnet-orchestrator/dkg-bypass-contract",
|
||||||
"tools/internal/validator-status-check",
|
"tools/internal/validator-status-check",
|
||||||
"tools/nym-cli",
|
"tools/nym-cli",
|
||||||
"tools/nym-id-cli",
|
"tools/nym-id-cli",
|
||||||
@@ -171,9 +173,12 @@ members = [
|
|||||||
"wasm/mix-fetch",
|
"wasm/mix-fetch",
|
||||||
"wasm/node-tester",
|
"wasm/node-tester",
|
||||||
"wasm/zknym-lib",
|
"wasm/zknym-lib",
|
||||||
# "nym-gateway-probe",
|
"nym-gateway-probe",
|
||||||
"integration-tests",
|
"integration-tests",
|
||||||
"common/nym-kkt-ciphersuite", "common/nym-kkt-context",
|
"common/nym-kkt-ciphersuite",
|
||||||
|
"common/nym-kkt-context",
|
||||||
|
"nym-network-monitor-v3/nym-network-monitor-orchestrator",
|
||||||
|
"nym-network-monitor-v3/nym-network-monitor-agent", "nym-network-monitor-v3/nym-network-monitor-orchestrator-requests",
|
||||||
]
|
]
|
||||||
|
|
||||||
default-members = [
|
default-members = [
|
||||||
@@ -183,14 +188,16 @@ default-members = [
|
|||||||
"nym-api",
|
"nym-api",
|
||||||
"nym-credential-proxy/nym-credential-proxy",
|
"nym-credential-proxy/nym-credential-proxy",
|
||||||
"nym-node",
|
"nym-node",
|
||||||
"nym-node-status-api/nym-node-status-agent",
|
|
||||||
"nym-statistics-api",
|
"nym-statistics-api",
|
||||||
"nym-validator-rewarder",
|
"nym-validator-rewarder",
|
||||||
"nyx-chain-watcher",
|
"nyx-chain-watcher",
|
||||||
"service-providers/ip-packet-router",
|
"service-providers/ip-packet-router",
|
||||||
"service-providers/network-requester",
|
"service-providers/network-requester",
|
||||||
"tools/nymvisor",
|
"tools/nymvisor",
|
||||||
"nym-registration-client"
|
"nym-registration-client",
|
||||||
|
"nym-network-monitor-v3/nym-network-monitor-orchestrator",
|
||||||
|
"nym-network-monitor-v3/nym-network-monitor-agent",
|
||||||
|
"tools/internal/localnet-orchestrator"
|
||||||
]
|
]
|
||||||
|
|
||||||
exclude = ["contracts", "nym-wallet", "cpu-cycles"]
|
exclude = ["contracts", "nym-wallet", "cpu-cycles"]
|
||||||
@@ -202,7 +209,7 @@ homepage = "https://nymtech.net"
|
|||||||
documentation = "https://nymtech.net"
|
documentation = "https://nymtech.net"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
license = "Apache-2.0"
|
license = "Apache-2.0"
|
||||||
rust-version = "1.85"
|
rust-version = "1.87.0"
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
version = "1.20.4"
|
version = "1.20.4"
|
||||||
|
|
||||||
@@ -232,6 +239,7 @@ bloomfilter = "3.0.1"
|
|||||||
bs58 = "0.5.1"
|
bs58 = "0.5.1"
|
||||||
bytecodec = "0.4.15"
|
bytecodec = "0.4.15"
|
||||||
bytes = "1.11.1"
|
bytes = "1.11.1"
|
||||||
|
cargo-edit = "0.13.8"
|
||||||
cargo_metadata = "0.19.2"
|
cargo_metadata = "0.19.2"
|
||||||
celes = "2.6.0"
|
celes = "2.6.0"
|
||||||
cfg-if = "1.0.0"
|
cfg-if = "1.0.0"
|
||||||
@@ -277,7 +285,8 @@ getrandom03 = { package = "getrandom", version = "=0.3.3" }
|
|||||||
glob = "0.3"
|
glob = "0.3"
|
||||||
handlebars = "3.5.5"
|
handlebars = "3.5.5"
|
||||||
hex = "0.4.3"
|
hex = "0.4.3"
|
||||||
hickory-resolver = "0.25.2"
|
hickory-proto = "0.26.1"
|
||||||
|
hickory-resolver = "0.26.1"
|
||||||
hkdf = "0.12.3"
|
hkdf = "0.12.3"
|
||||||
hmac = "0.12.1"
|
hmac = "0.12.1"
|
||||||
http = "1"
|
http = "1"
|
||||||
@@ -331,12 +340,13 @@ rayon = "1.5.1"
|
|||||||
regex = "1.10.6"
|
regex = "1.10.6"
|
||||||
reqwest = { version = "0.13.1", default-features = false }
|
reqwest = { version = "0.13.1", default-features = false }
|
||||||
rs_merkle = "1.5.0"
|
rs_merkle = "1.5.0"
|
||||||
|
rustls = { version = "0.23.37", default-features = false }
|
||||||
schemars = "0.8.22"
|
schemars = "0.8.22"
|
||||||
semver = "1.0.26"
|
semver = "1.0.26"
|
||||||
serde = "1.0.219"
|
serde = "1.0.219"
|
||||||
serde_bytes = "0.11.17"
|
serde_bytes = "0.11.17"
|
||||||
serde_derive = "1.0"
|
serde_derive = "1.0"
|
||||||
serde_json = "1.0.140"
|
serde_json = { version = "1.0.140", features = ["float_roundtrip"] }
|
||||||
serde_json_path = "0.7.2"
|
serde_json_path = "0.7.2"
|
||||||
serde_repr = "0.1"
|
serde_repr = "0.1"
|
||||||
serde_with = "3.9.0"
|
serde_with = "3.9.0"
|
||||||
@@ -344,11 +354,13 @@ serde_yaml = "0.9.25"
|
|||||||
serde_plain = "1.0.2"
|
serde_plain = "1.0.2"
|
||||||
sha2 = "0.10.3"
|
sha2 = "0.10.3"
|
||||||
si-scale = "0.2.3"
|
si-scale = "0.2.3"
|
||||||
|
smolmix = { version = "0.0.1", path = "smolmix/core" }
|
||||||
|
smoltcp = "0.12"
|
||||||
snow = "0.9.6"
|
snow = "0.9.6"
|
||||||
sphinx-packet = "=0.6.0"
|
sphinx-packet = "=0.6.0"
|
||||||
sqlx = "0.8.6"
|
sqlx = "0.8.6"
|
||||||
strum = "0.27.2"
|
strum = "0.28.0"
|
||||||
strum_macros = "0.27.2"
|
strum_macros = "0.28.0"
|
||||||
subtle-encoding = "0.5"
|
subtle-encoding = "0.5"
|
||||||
syn = "2"
|
syn = "2"
|
||||||
sysinfo = "0.37.0"
|
sysinfo = "0.37.0"
|
||||||
@@ -364,6 +376,8 @@ tokio-postgres = "0.7"
|
|||||||
tokio-stream = "0.1.17"
|
tokio-stream = "0.1.17"
|
||||||
tokio-test = "0.4.4"
|
tokio-test = "0.4.4"
|
||||||
tokio-tun = "0.11.5"
|
tokio-tun = "0.11.5"
|
||||||
|
tokio-rustls = "0.26"
|
||||||
|
tokio-smoltcp = "0.5"
|
||||||
tokio-tungstenite = { version = "0.20.1" }
|
tokio-tungstenite = { version = "0.20.1" }
|
||||||
tokio-util = "0.7.15"
|
tokio-util = "0.7.15"
|
||||||
toml = "0.8.22"
|
toml = "0.8.22"
|
||||||
@@ -375,7 +389,7 @@ tracing-opentelemetry = "0.32.1"
|
|||||||
tracing-subscriber = "0.3.20"
|
tracing-subscriber = "0.3.20"
|
||||||
tracing-indicatif = "0.3.9"
|
tracing-indicatif = "0.3.9"
|
||||||
tracing-test = "0.2.5"
|
tracing-test = "0.2.5"
|
||||||
ts-rs = "10.1.0"
|
ts-rs = "12.0.1"
|
||||||
tungstenite = { version = "0.20.1", default-features = false }
|
tungstenite = { version = "0.20.1", default-features = false }
|
||||||
typed-builder = "0.23.0"
|
typed-builder = "0.23.0"
|
||||||
uniffi = "0.29.2"
|
uniffi = "0.29.2"
|
||||||
@@ -393,16 +407,20 @@ zeroize = "1.7.0"
|
|||||||
|
|
||||||
prometheus = { version = "0.14.0" }
|
prometheus = { version = "0.14.0" }
|
||||||
|
|
||||||
|
# recreating lioness
|
||||||
|
# we don't care about particular versions - just pull whatever is used by sphinx
|
||||||
|
lioness = "*"
|
||||||
|
arrayref = "*"
|
||||||
|
|
||||||
# libcrux
|
# libcrux
|
||||||
libcrux-kem = { git = "https://github.com/cryspen/libcrux", rev = "b17f8687b67cdcfc10b55aeecc998bbbca28f775" }
|
libcrux-kem = "0.0.7"
|
||||||
libcrux-ecdh = { git = "https://github.com/cryspen/libcrux", rev = "b17f8687b67cdcfc10b55aeecc998bbbca28f775" }
|
libcrux-ecdh = "0.0.6"
|
||||||
libcrux-curve25519 = { git = "https://github.com/cryspen/libcrux", rev = "b17f8687b67cdcfc10b55aeecc998bbbca28f775" }
|
libcrux-curve25519 = "0.0.6"
|
||||||
libcrux-chacha20poly1305 = { git = "https://github.com/cryspen/libcrux", rev = "b17f8687b67cdcfc10b55aeecc998bbbca28f775" }
|
libcrux-chacha20poly1305 = "0.0.7"
|
||||||
libcrux-psq = { git = "https://github.com/cryspen/libcrux", rev = "b17f8687b67cdcfc10b55aeecc998bbbca28f775" }
|
libcrux-psq = "0.0.8"
|
||||||
libcrux-ml-kem = { git = "https://github.com/cryspen/libcrux", rev = "b17f8687b67cdcfc10b55aeecc998bbbca28f775" }
|
libcrux-ml-kem = "0.0.8"
|
||||||
libcrux-sha3 = { git = "https://github.com/cryspen/libcrux", rev = "b17f8687b67cdcfc10b55aeecc998bbbca28f775" }
|
libcrux-sha3 = "0.0.8"
|
||||||
libcrux-traits = { git = "https://github.com/cryspen/libcrux", rev = "b17f8687b67cdcfc10b55aeecc998bbbca28f775" }
|
libcrux-traits = "0.0.6"
|
||||||
|
|
||||||
# Workspace dep definitions required by crates.io publication - we need a workspace version since `cargo workspaces` doesn't work with path imports from crate manifests
|
# Workspace dep definitions required by crates.io publication - we need a workspace version since `cargo workspaces` doesn't work with path imports from crate manifests
|
||||||
nym-api-requests = { version = "1.20.4", path = "nym-api/nym-api-requests" }
|
nym-api-requests = { version = "1.20.4", path = "nym-api/nym-api-requests" }
|
||||||
@@ -438,6 +456,7 @@ nym-ecash-time = { version = "1.20.4", path = "common/ecash-time" }
|
|||||||
nym-exit-policy = { version = "1.20.4", path = "common/exit-policy" }
|
nym-exit-policy = { version = "1.20.4", path = "common/exit-policy" }
|
||||||
nym-ffi-shared = { version = "1.20.4", path = "sdk/ffi/shared" }
|
nym-ffi-shared = { version = "1.20.4", path = "sdk/ffi/shared" }
|
||||||
nym-gateway-client = { version = "1.20.4", path = "common/client-libs/gateway-client", default-features = false }
|
nym-gateway-client = { version = "1.20.4", path = "common/client-libs/gateway-client", default-features = false }
|
||||||
|
nym-gateway-probe = { version = "1.18.0", path = "nym-gateway-probe" }
|
||||||
nym-gateway-requests = { version = "1.20.4", path = "common/gateway-requests" }
|
nym-gateway-requests = { version = "1.20.4", path = "common/gateway-requests" }
|
||||||
nym-gateway-storage = { version = "1.20.4", path = "common/gateway-storage" }
|
nym-gateway-storage = { version = "1.20.4", path = "common/gateway-storage" }
|
||||||
nym-gateway-stats-storage = { version = "1.20.4", path = "common/gateway-stats-storage" }
|
nym-gateway-stats-storage = { version = "1.20.4", path = "common/gateway-stats-storage" }
|
||||||
@@ -448,8 +467,10 @@ nym-http-api-common = { version = "1.20.4", path = "common/http-api-common", def
|
|||||||
nym-id = { version = "1.20.4", path = "common/nym-id" }
|
nym-id = { version = "1.20.4", path = "common/nym-id" }
|
||||||
nym-ip-packet-client = { version = "1.20.4", path = "nym-ip-packet-client" }
|
nym-ip-packet-client = { version = "1.20.4", path = "nym-ip-packet-client" }
|
||||||
nym-ip-packet-requests = { version = "1.20.4", path = "common/ip-packet-requests" }
|
nym-ip-packet-requests = { version = "1.20.4", path = "common/ip-packet-requests" }
|
||||||
|
nym-lp = { version = "1.20.4", path = "common/nym-lp" }
|
||||||
nym-kkt = { version = "0.1.0", path = "common/nym-kkt" }
|
nym-kkt = { version = "0.1.0", path = "common/nym-kkt" }
|
||||||
nym-kkt-ciphersuite = { version = "1.20.4", path = "common/nym-kkt-ciphersuite" }
|
nym-kkt-ciphersuite = { version = "1.20.4", path = "common/nym-kkt-ciphersuite" }
|
||||||
|
nym-kkt-context = { version = "1.20.4", path = "common/nym-kkt-context" }
|
||||||
nym-metrics = { version = "1.20.4", path = "common/nym-metrics" }
|
nym-metrics = { version = "1.20.4", path = "common/nym-metrics" }
|
||||||
nym-mixnet-client = { version = "1.20.4", path = "common/client-libs/mixnet-client" }
|
nym-mixnet-client = { version = "1.20.4", path = "common/client-libs/mixnet-client" }
|
||||||
nym-mixnet-contract-common = { version = "1.20.4", path = "common/cosmwasm-smart-contracts/mixnet-contract" }
|
nym-mixnet-contract-common = { version = "1.20.4", path = "common/cosmwasm-smart-contracts/mixnet-contract" }
|
||||||
@@ -495,6 +516,7 @@ nym-types = { version = "1.20.4", path = "common/types" }
|
|||||||
nym-upgrade-mode-check = { version = "1.20.4", path = "common/upgrade-mode-check" }
|
nym-upgrade-mode-check = { version = "1.20.4", path = "common/upgrade-mode-check" }
|
||||||
nym-validator-client = { version = "1.20.4", path = "common/client-libs/validator-client", default-features = false }
|
nym-validator-client = { version = "1.20.4", path = "common/client-libs/validator-client", default-features = false }
|
||||||
nym-vesting-contract-common = { version = "1.20.4", path = "common/cosmwasm-smart-contracts/vesting-contract" }
|
nym-vesting-contract-common = { version = "1.20.4", path = "common/cosmwasm-smart-contracts/vesting-contract" }
|
||||||
|
nym-network-monitors-contract-common = { version = "1.20.4", path = "common/cosmwasm-smart-contracts/network-monitors-contract" }
|
||||||
nym-verloc = { version = "1.20.4", path = "common/verloc" }
|
nym-verloc = { version = "1.20.4", path = "common/verloc" }
|
||||||
nym-wireguard = { version = "1.20.4", path = "common/wireguard" }
|
nym-wireguard = { version = "1.20.4", path = "common/wireguard" }
|
||||||
nym-wireguard-types = { version = "1.20.4", path = "common/wireguard-types" }
|
nym-wireguard-types = { version = "1.20.4", path = "common/wireguard-types" }
|
||||||
@@ -553,6 +575,7 @@ wasm-bindgen = "0.2.99"
|
|||||||
wasm-bindgen-futures = "0.4.49"
|
wasm-bindgen-futures = "0.4.49"
|
||||||
wasm-bindgen-test = "0.3.49"
|
wasm-bindgen-test = "0.3.49"
|
||||||
wasmtimer = "0.4.1"
|
wasmtimer = "0.4.1"
|
||||||
|
webpki-roots = "0.26"
|
||||||
web-sys = "0.3.76"
|
web-sys = "0.3.76"
|
||||||
|
|
||||||
# for local development:
|
# for local development:
|
||||||
|
|||||||
@@ -30,8 +30,11 @@ client ───► Gateway ──┘ mix │ mix ┌─►mix ───►
|
|||||||
|
|
||||||
```
|
```
|
||||||
|
|
||||||
|
<!-- This is broken
|
||||||
[](https://github.com/nymtech/nym/actions?query=branch%3Adevelop)
|
[](https://github.com/nymtech/nym/actions?query=branch%3Adevelop)
|
||||||
|
-->
|
||||||
|
|
||||||
|
> This project integrates with the Midnight Network
|
||||||
|
|
||||||
### Building
|
### Building
|
||||||
|
|
||||||
|
|||||||
@@ -1,32 +1,38 @@
|
|||||||
---
|
---
|
||||||
ansible_ssh_private_key_file: ~/.ssh/<SSH_KEY>
|
ansible_ssh_private_key_file: ~/.ssh/<SSH_KEY>
|
||||||
|
|
||||||
# nym_version: "v2025.21-mozzarella"
|
|
||||||
#
|
|
||||||
# NOTE:
|
|
||||||
# if you want to pin Nym to a specific version instead of using the
|
|
||||||
# latest release from GitHub in /tasks/main.yml then
|
|
||||||
# uncomment the line above and set the tag
|
|
||||||
|
|
||||||
cli_url: "https://github.com/nymtech/nym/releases/download/nym-binaries-{{ nym_version }}/nym-cli"
|
cli_url: "https://github.com/nymtech/nym/releases/download/nym-binaries-{{ nym_version }}/nym-cli"
|
||||||
tunnel_manager_url: "https://github.com/nymtech/nym/raw/refs/heads/develop/scripts/nym-node-setup/network-tunnel-manager.sh"
|
tunnel_manager_url: "https://github.com/nymtech/nym/raw/refs/heads/develop/scripts/nym-node-setup/network-tunnel-manager.sh"
|
||||||
quic_bridge_deployment_url: "https://raw.githubusercontent.com/nymtech/nym/refs/heads/develop/scripts/nym-node-setup/quic_bridge_deployment.sh"
|
quic_bridge_deployment_url: "https://raw.githubusercontent.com/nymtech/nym/refs/heads/develop/scripts/nym-node-setup/quic_bridge_deployment.sh"
|
||||||
|
|
||||||
# NOTE: These values will be used globally unless overwritten per node in inventory/all
|
###############################################################################
|
||||||
|
## GLOBAL VARS
|
||||||
|
## These values will be used globally unless overwritten per node in inventory/all
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
ansible_user: root # used for ssh, like `ssh root@nym-exit.ch-1.mynodes.net`
|
ansible_user: root # used for ssh, like `ssh root@nym-exit.ch-1.mynodes.net`
|
||||||
email: "<EMAIL>" # used in certbot, description.toml and landing page
|
email: "<EMAIL>" # used in certbot, description.toml and landing page
|
||||||
website: "<WEBSITE>" # it is used in the description.toml
|
website: "<WEBSITE>" # it is used in the description.toml
|
||||||
description: "<NODE_PUBLIC_DESCRIPTION>" # or define per node in inventory/all
|
description: "<NODE_PUBLIC_DESCRIPTION>" # or define per node in inventory/all
|
||||||
|
# operator_name: "<OPERATOR_NAME>" # used in landing page if provided
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
## GLOBAL VARS
|
||||||
|
## These values will be used globally unless overwritten per node in inventory/all
|
||||||
|
## Set these vars only if you want them globally for all nodes
|
||||||
|
## Per node changes in inventory/all will overwrite these global vars
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
# NOTE: Set these vars if you want them globally for all nodes
|
|
||||||
# Per node changes in inventory/all will overwrite these global ones:
|
|
||||||
hostname: "" # this is a fallback, keep it and setup hostname per node in inventory/all
|
|
||||||
# moniker: "<MONIKER>" # if not setup here not in inventory/all it get's derived from the hostname
|
# moniker: "<MONIKER>" # if not setup here not in inventory/all it get's derived from the hostname
|
||||||
# mode: <MODE> # entry-gateway/exit-gateway/mixnode
|
# mode: <MODE> # entry-gateway/exit-gateway/mixnode
|
||||||
# wireguard_enabled: <WIREGUARD_ENABLED> # true/false
|
# wireguard_enabled: <WIREGUARD_ENABLED> # true/false
|
||||||
|
hostname: "" # this is a fallback, keep it and setup hostname per node in inventory/all
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
## GLOBAL PACKAGES
|
||||||
|
## These will be installed during deployment
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
# NOTE: Possible vars to incule on landing page, etc.
|
|
||||||
# operator_name: "<OPERATOR_NAME>"
|
|
||||||
|
|
||||||
packages:
|
packages:
|
||||||
- tmux
|
- tmux
|
||||||
@@ -42,3 +48,74 @@ packages:
|
|||||||
- jq
|
- jq
|
||||||
- wget
|
- wget
|
||||||
- ufw
|
- ufw
|
||||||
|
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
## OPTIONAL OVERRIDES
|
||||||
|
## All values below already have defaults in the playbook/roles
|
||||||
|
## Uncomment only if you want to override them
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
## SYSTEM MAINTENANCE PLAYBOOK KNOBS
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
|
# To use particular version instead of Latest, provide in such form:
|
||||||
|
# nym_version: "nym-binaries-v2026.7-tola"
|
||||||
|
|
||||||
|
## NOTE:
|
||||||
|
## if you want to pin Nym to a specific version instead of using the
|
||||||
|
## latest release from GitHub in /tasks/main.yml then
|
||||||
|
## uncomment the line above and set the tag
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
## SYSTEM MAINTENANCE PLAYBOOK KNOBS
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
|
## JOURNALD LIMITS
|
||||||
|
|
||||||
|
# journald_system_max_use: "100M" # max persistent journal size
|
||||||
|
# journald_runtime_max_use: "50M" # max runtime journal size
|
||||||
|
# journald_system_max_file_size: "25M" # max single journal file
|
||||||
|
# journald_runtime_max_file_size: "10M" # max runtime journal file
|
||||||
|
# journald_max_retention_sec: "3day" # retention time
|
||||||
|
|
||||||
|
# journald_rate_limit_interval: "30s" # rate limit window
|
||||||
|
# journald_rate_limit_burst: "1000" # rate limit burst
|
||||||
|
|
||||||
|
|
||||||
|
## NYM-NODE LOG CONTROL
|
||||||
|
|
||||||
|
# nymnode_log_level_max: "warning" # drop INFO logs
|
||||||
|
# nymnode_rate_limit_interval: "30s" # per nym-node rate limit window
|
||||||
|
# nymnode_rate_limit_burst: "200" # per nym-node rate limit burst
|
||||||
|
|
||||||
|
|
||||||
|
## JOURNAL VACUUM TARGETS
|
||||||
|
|
||||||
|
# journal_vacuum_size: "100M"
|
||||||
|
# journal_vacuum_time: "3days"
|
||||||
|
|
||||||
|
|
||||||
|
## RSYSLOG
|
||||||
|
|
||||||
|
# disable_rsyslog: true
|
||||||
|
|
||||||
|
|
||||||
|
## FSTRIM SCHEDULE
|
||||||
|
|
||||||
|
# fstrim_every_calendar: "*:0/15" # Aggressive
|
||||||
|
# fstrim_every_calendar: "hourly" # Less aggressive
|
||||||
|
|
||||||
|
|
||||||
|
## OPTIONAL CLEANUPS
|
||||||
|
|
||||||
|
# enable_apt_cleanup: true
|
||||||
|
# enable_snap_cleanup: true
|
||||||
|
|
||||||
|
|
||||||
|
## WRITEBACK TUNING
|
||||||
|
|
||||||
|
# enable_writeback_tuning: true
|
||||||
|
# writeback_dirty_writeback_centisecs: 1500
|
||||||
|
# writeback_dirty_expire_centisecs: 6000
|
||||||
|
|||||||
@@ -0,0 +1,38 @@
|
|||||||
|
---
|
||||||
|
- name: Restrict logging, vacuum journals, and enable periodic trim
|
||||||
|
hosts: all
|
||||||
|
become: true
|
||||||
|
gather_facts: false
|
||||||
|
|
||||||
|
# global knobs - override in inventory/group_vars/host_vars as needed
|
||||||
|
vars:
|
||||||
|
journald_system_max_use: "100M"
|
||||||
|
journald_runtime_max_use: "50M"
|
||||||
|
journald_system_max_file_size: "25M"
|
||||||
|
journald_runtime_max_file_size: "10M"
|
||||||
|
journald_max_retention_sec: "3day"
|
||||||
|
journald_rate_limit_interval: "30s"
|
||||||
|
journald_rate_limit_burst: "1000"
|
||||||
|
|
||||||
|
# per nym-node rate limit + level cap
|
||||||
|
nymnode_log_level_max: "warning"
|
||||||
|
nymnode_rate_limit_interval: "30s"
|
||||||
|
nymnode_rate_limit_burst: "200"
|
||||||
|
|
||||||
|
# journal vacuum targets
|
||||||
|
journal_vacuum_size: "100M"
|
||||||
|
journal_vacuum_time: "3days"
|
||||||
|
|
||||||
|
# fstrim cadence (note: the systemd override uses cron-like calendar)
|
||||||
|
fstrim_every_calendar: "*:0/15"
|
||||||
|
|
||||||
|
roles:
|
||||||
|
- role: journald_limits
|
||||||
|
- role: nymnode_logging
|
||||||
|
- role: rsyslog_disable
|
||||||
|
- role: journal_vacuum
|
||||||
|
- role: classic_log_cleanup
|
||||||
|
- role: apt_cleanup
|
||||||
|
- role: snap_cleanup
|
||||||
|
- role: fstrim_15min
|
||||||
|
- role: report
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
---
|
||||||
|
- name: Clean apt cache
|
||||||
|
command: apt-get clean
|
||||||
|
ignore_errors: true
|
||||||
|
|
||||||
|
- name: Autoremove unused packages
|
||||||
|
command: apt-get -y autoremove
|
||||||
|
ignore_errors: true
|
||||||
|
|
||||||
|
- name: Remove apt lists to reclaim space (they will be re-fetched on update)
|
||||||
|
file:
|
||||||
|
path: /var/lib/apt/lists
|
||||||
|
state: absent
|
||||||
|
ignore_errors: true
|
||||||
|
|
||||||
|
- name: Recreate apt lists directory
|
||||||
|
file:
|
||||||
|
path: /var/lib/apt/lists
|
||||||
|
state: directory
|
||||||
|
mode: "0755"
|
||||||
|
ignore_errors: true
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
---
|
||||||
|
- name: Remove classic /var/log files if present (optional)
|
||||||
|
file:
|
||||||
|
path: "{{ item }}"
|
||||||
|
state: absent
|
||||||
|
loop:
|
||||||
|
- /var/log/syslog
|
||||||
|
- /var/log/syslog.1
|
||||||
|
- /var/log/kern.log
|
||||||
|
- /var/log/kern.log.1
|
||||||
|
- /var/log/auth.log
|
||||||
|
- /var/log/auth.log.1
|
||||||
|
- /var/log/ufw.log
|
||||||
|
- /var/log/ufw.log.1
|
||||||
|
ignore_errors: true
|
||||||
|
|
||||||
|
# This is best-effort and may still fail if other packages' postrotate scripts assume services exist.
|
||||||
|
- name: Force logrotate (best-effort)
|
||||||
|
command: "logrotate --force /etc/logrotate.conf"
|
||||||
|
ignore_errors: true
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
---
|
||||||
|
fstrim_timer_dropin_dir: "/etc/systemd/system/fstrim.timer.d"
|
||||||
|
fstrim_every_calendar: "*:0/15"
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
---
|
||||||
|
- name: Ensure systemd drop-in dir for fstrim.timer exists
|
||||||
|
file:
|
||||||
|
path: "{{ fstrim_timer_dropin_dir }}"
|
||||||
|
state: directory
|
||||||
|
mode: "0755"
|
||||||
|
|
||||||
|
- name: Override fstrim.timer schedule
|
||||||
|
copy:
|
||||||
|
dest: "{{ fstrim_timer_dropin_dir }}/override.conf"
|
||||||
|
mode: "0644"
|
||||||
|
content: |
|
||||||
|
[Timer]
|
||||||
|
OnCalendar=
|
||||||
|
OnCalendar={{ fstrim_every_calendar }}
|
||||||
|
Persistent=true
|
||||||
|
RandomizedDelaySec=0
|
||||||
|
|
||||||
|
- name: Reload systemd after fstrim override
|
||||||
|
systemd:
|
||||||
|
daemon_reload: true
|
||||||
|
|
||||||
|
- name: Enable and start fstrim timer
|
||||||
|
systemd:
|
||||||
|
name: fstrim.timer
|
||||||
|
enabled: true
|
||||||
|
state: started
|
||||||
|
|
||||||
|
- name: Run fstrim now (best-effort)
|
||||||
|
command: fstrim -av
|
||||||
|
ignore_errors: true
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
---
|
||||||
|
journal_vacuum_size: "100M"
|
||||||
|
journal_vacuum_time: "3days"
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
---
|
||||||
|
- name: Vacuum journal to size cap (hard)
|
||||||
|
command: "journalctl --vacuum-size={{ journal_vacuum_size }}"
|
||||||
|
|
||||||
|
- name: Vacuum journal older than retention window (time)
|
||||||
|
command: "journalctl --vacuum-time={{ journal_vacuum_time }}"
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
---
|
||||||
|
journald_system_max_use: "100M"
|
||||||
|
journald_runtime_max_use: "50M"
|
||||||
|
journald_system_max_file_size: "25M"
|
||||||
|
journald_runtime_max_file_size: "10M"
|
||||||
|
journald_max_retention_sec: "3day"
|
||||||
|
journald_rate_limit_interval: "30s"
|
||||||
|
journald_rate_limit_burst: "1000"
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
- name: Restart journald
|
||||||
|
systemd:
|
||||||
|
name: systemd-journald
|
||||||
|
state: restarted
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
---
|
||||||
|
- name: Configure journald limits (persistent, capped, rate-limited)
|
||||||
|
copy:
|
||||||
|
dest: /etc/systemd/journald.conf
|
||||||
|
mode: "0644"
|
||||||
|
content: |
|
||||||
|
[Journal]
|
||||||
|
Storage=persistent
|
||||||
|
Compress=yes
|
||||||
|
Seal=yes
|
||||||
|
|
||||||
|
SystemMaxUse={{ journald_system_max_use }}
|
||||||
|
RuntimeMaxUse={{ journald_runtime_max_use }}
|
||||||
|
SystemMaxFileSize={{ journald_system_max_file_size }}
|
||||||
|
RuntimeMaxFileSize={{ journald_runtime_max_file_size }}
|
||||||
|
MaxRetentionSec={{ journald_max_retention_sec }}
|
||||||
|
|
||||||
|
RateLimitIntervalSec={{ journald_rate_limit_interval }}
|
||||||
|
RateLimitBurst={{ journald_rate_limit_burst }}
|
||||||
|
notify: Restart journald
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
nymnode_log_level_max: "warning"
|
||||||
|
nymnode_rate_limit_interval: "30s"
|
||||||
|
nymnode_rate_limit_burst: "200"
|
||||||
|
nymnode_unit_name: "nym-node" # set to "nym-node.service" if your distro expects it
|
||||||
|
nymnode_dropin_dir: "/etc/systemd/system/nym-node.service.d"
|
||||||
|
nymnode_dropin_file: "10-logging.conf"
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
---
|
||||||
|
- name: Ensure systemd drop-in dir for nym-node exists
|
||||||
|
file:
|
||||||
|
path: "{{ nymnode_dropin_dir }}"
|
||||||
|
state: directory
|
||||||
|
mode: "0755"
|
||||||
|
|
||||||
|
- name: Cap nym-node logs + apply per-unit rate limiting
|
||||||
|
copy:
|
||||||
|
dest: "{{ nymnode_dropin_dir }}/{{ nymnode_dropin_file }}"
|
||||||
|
mode: "0644"
|
||||||
|
content: |
|
||||||
|
[Service]
|
||||||
|
LogLevelMax={{ nymnode_log_level_max }}
|
||||||
|
LogRateLimitIntervalSec={{ nymnode_rate_limit_interval }}
|
||||||
|
LogRateLimitBurst={{ nymnode_rate_limit_burst }}
|
||||||
|
|
||||||
|
- name: Reload systemd after nym-node drop-in
|
||||||
|
systemd:
|
||||||
|
daemon_reload: true
|
||||||
|
|
||||||
|
- name: Restart nym-node to apply new logging limits (best-effort)
|
||||||
|
systemd:
|
||||||
|
name: "{{ nymnode_unit_name }}"
|
||||||
|
state: restarted
|
||||||
|
ignore_errors: true
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
---
|
||||||
|
- name: Show journal disk usage
|
||||||
|
command: journalctl --disk-usage
|
||||||
|
register: journal_usage
|
||||||
|
changed_when: false
|
||||||
|
|
||||||
|
- debug:
|
||||||
|
var: journal_usage.stdout
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
---
|
||||||
|
- name: Stop/disable rsyslog if installed (best-effort)
|
||||||
|
systemd:
|
||||||
|
name: rsyslog
|
||||||
|
state: stopped
|
||||||
|
enabled: false
|
||||||
|
ignore_errors: true
|
||||||
|
|
||||||
|
- name: Remove rsyslog logrotate stanza if present (prevents logrotate failures)
|
||||||
|
file:
|
||||||
|
path: /etc/logrotate.d/rsyslog
|
||||||
|
state: absent
|
||||||
|
ignore_errors: true
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
---
|
||||||
|
- name: Remove disabled snap revisions (best-effort)
|
||||||
|
shell: |
|
||||||
|
set -euo pipefail
|
||||||
|
snap list --all | awk '/disabled/{print $1, $3}' | while read -r name rev; do
|
||||||
|
snap remove "$name" --revision="$rev" || true
|
||||||
|
done
|
||||||
|
args:
|
||||||
|
executable: /bin/bash
|
||||||
|
ignore_errors: true
|
||||||
@@ -1,11 +1,30 @@
|
|||||||
---
|
---
|
||||||
- name: Configure tunnel manager
|
- name: Ensure nym binaries directory exists
|
||||||
|
file:
|
||||||
|
path: /root/nym-binaries
|
||||||
|
state: directory
|
||||||
|
mode: "0755"
|
||||||
tags:
|
tags:
|
||||||
|
- tunnel
|
||||||
- network_tunnel_manager
|
- network_tunnel_manager
|
||||||
become: true
|
- ntm
|
||||||
command:
|
|
||||||
cmd: "/root/nym-binaries/network-tunnel-manager.sh {{ item }}"
|
- name: Download network tunnel manager
|
||||||
|
get_url:
|
||||||
|
url: "{{ tunnel_manager_url }}"
|
||||||
|
dest: /root/nym-binaries/network-tunnel-manager.sh
|
||||||
|
mode: "0755"
|
||||||
|
force: yes
|
||||||
|
tags:
|
||||||
|
- tunnel
|
||||||
|
- network_tunnel_manager
|
||||||
|
- ntm
|
||||||
|
|
||||||
|
- name: Run network tunnel manager
|
||||||
|
command: "/root/nym-binaries/network-tunnel-manager.sh {{ item }}"
|
||||||
loop:
|
loop:
|
||||||
- complete_networking_configuration
|
- complete_networking_configuration
|
||||||
register: tunnel_mgr
|
tags:
|
||||||
failed_when: false
|
- tunnel
|
||||||
|
- network_tunnel_manager
|
||||||
|
- ntm
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "nym-client"
|
name = "nym-client"
|
||||||
version = "1.1.72"
|
|
||||||
authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
|
|
||||||
description = "Implementation of the Nym Client"
|
description = "Implementation of the Nym Client"
|
||||||
|
version = "1.1.77"
|
||||||
|
authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
rust-version = "1.85"
|
|
||||||
license.workspace = true
|
license.workspace = true
|
||||||
|
rust-version = "1.85"
|
||||||
publish = false
|
publish = false
|
||||||
|
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|||||||
@@ -1,13 +1,16 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "nym-client-websocket-requests"
|
name = "nym-client-websocket-requests"
|
||||||
|
description = "Request and response definitions for Nym client websocket connections"
|
||||||
version.workspace = true
|
version.workspace = true
|
||||||
authors = ["Jędrzej Stuczyński <andrew@nymtech.net>"]
|
authors = ["Jędrzej Stuczyński <andrew@nymtech.net>"]
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license.workspace = true
|
license.workspace = true
|
||||||
description = "Request and response definitions for Nym client websocket connections"
|
|
||||||
repository.workspace = true
|
repository.workspace = true
|
||||||
homepage.workspace = true
|
homepage.workspace = true
|
||||||
documentation.workspace = true
|
documentation.workspace = true
|
||||||
|
rust-version.workspace = true
|
||||||
|
readme.workspace = true
|
||||||
|
publish = true
|
||||||
|
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "nym-socks5-client"
|
name = "nym-socks5-client"
|
||||||
version = "1.1.72"
|
|
||||||
authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
|
|
||||||
description = "A SOCKS5 localhost proxy that converts incoming messages to Sphinx and sends them to a Nym address"
|
description = "A SOCKS5 localhost proxy that converts incoming messages to Sphinx and sends them to a Nym address"
|
||||||
|
version = "1.1.77"
|
||||||
|
authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
rust-version = "1.85"
|
|
||||||
license.workspace = true
|
license.workspace = true
|
||||||
|
rust-version = "1.85"
|
||||||
publish = false
|
publish = false
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
@@ -1,12 +1,16 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "nym-async-file-watcher"
|
name = "nym-async-file-watcher"
|
||||||
|
description = "Simple file watcher that sends a notification whenever there was any change in the watched file"
|
||||||
version.workspace = true
|
version.workspace = true
|
||||||
|
authors.workspace = true
|
||||||
edition.workspace = true
|
edition.workspace = true
|
||||||
license.workspace = true
|
license.workspace = true
|
||||||
description = "Simple file watcher that sends a notification whenever there was any change in the watched file"
|
|
||||||
repository.workspace = true
|
repository.workspace = true
|
||||||
homepage.workspace = true
|
homepage.workspace = true
|
||||||
documentation.workspace = true
|
documentation.workspace = true
|
||||||
|
rust-version.workspace = true
|
||||||
|
readme.workspace = true
|
||||||
|
publish = true
|
||||||
|
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|
||||||
|
|||||||
@@ -1,13 +1,16 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "nym-authenticator-requests"
|
name = "nym-authenticator-requests"
|
||||||
|
description = "Crate defining requests and responses for the Nym authenticator client"
|
||||||
version.workspace = true
|
version.workspace = true
|
||||||
authors.workspace = true
|
authors.workspace = true
|
||||||
|
edition.workspace = true
|
||||||
|
license.workspace = true
|
||||||
repository.workspace = true
|
repository.workspace = true
|
||||||
homepage.workspace = true
|
homepage.workspace = true
|
||||||
documentation.workspace = true
|
documentation.workspace = true
|
||||||
edition.workspace = true
|
rust-version.workspace = true
|
||||||
license.workspace = true
|
readme.workspace = true
|
||||||
description = "Crate defining requests and responses for the Nym authenticator client"
|
publish = true
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
base64 = { workspace = true }
|
base64 = { workspace = true }
|
||||||
|
|||||||
@@ -1,12 +1,16 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "nym-bandwidth-controller"
|
name = "nym-bandwidth-controller"
|
||||||
|
description = "Crate for controlling the use of zknym credentials to ensure constant bandwidth availability for NymVPN app"
|
||||||
version.workspace = true
|
version.workspace = true
|
||||||
|
authors.workspace = true
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license.workspace = true
|
license.workspace = true
|
||||||
description = "Crate for controlling the use of zknym credentials to ensure constant bandwidth availability for NymVPN app"
|
|
||||||
repository.workspace = true
|
repository.workspace = true
|
||||||
homepage.workspace = true
|
homepage.workspace = true
|
||||||
documentation.workspace = true
|
documentation.workspace = true
|
||||||
|
rust-version.workspace = true
|
||||||
|
readme.workspace = true
|
||||||
|
publish = true
|
||||||
|
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ where
|
|||||||
let signing_key = ed25519::PrivateKey::new(&mut rng);
|
let signing_key = ed25519::PrivateKey::new(&mut rng);
|
||||||
let expiration = expiration.unwrap_or_else(ecash_default_expiration_date);
|
let expiration = expiration.unwrap_or_else(ecash_default_expiration_date);
|
||||||
|
|
||||||
let deposit_amount = client.get_required_deposit_amount().await?;
|
let deposit_amount = client.get_default_deposit_amount().await?;
|
||||||
info!("we'll need to deposit {deposit_amount} to obtain the ticketbook");
|
info!("we'll need to deposit {deposit_amount} to obtain the ticketbook");
|
||||||
let result = client
|
let result = client
|
||||||
.make_ticketbook_deposit(
|
.make_ticketbook_deposit(
|
||||||
|
|||||||
@@ -1,11 +1,16 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "nym-bin-common"
|
name = "nym-bin-common"
|
||||||
version.workspace = true
|
|
||||||
description = "Common code for nym binaries"
|
description = "Common code for nym binaries"
|
||||||
edition = { workspace = true }
|
version.workspace = true
|
||||||
authors = { workspace = true }
|
authors = { workspace = true }
|
||||||
|
edition = { workspace = true }
|
||||||
license = { workspace = true }
|
license = { workspace = true }
|
||||||
repository = { workspace = true }
|
repository = { workspace = true }
|
||||||
|
homepage.workspace = true
|
||||||
|
documentation.workspace = true
|
||||||
|
rust-version.workspace = true
|
||||||
|
readme.workspace = true
|
||||||
|
publish = true
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
clap = { workspace = true, features = ["derive"], optional = true }
|
clap = { workspace = true, features = ["derive"], optional = true }
|
||||||
@@ -38,6 +43,7 @@ default = []
|
|||||||
openapi = ["utoipa"]
|
openapi = ["utoipa"]
|
||||||
output_format = ["serde_json", "dep:clap"]
|
output_format = ["serde_json", "dep:clap"]
|
||||||
bin_info_schema = ["schemars"]
|
bin_info_schema = ["schemars"]
|
||||||
|
ip_check = []
|
||||||
basic_tracing = ["dep:tracing", "dep:tracing-subscriber"]
|
basic_tracing = ["dep:tracing", "dep:tracing-subscriber"]
|
||||||
otel-otlp = [
|
otel-otlp = [
|
||||||
"basic_tracing",
|
"basic_tracing",
|
||||||
|
|||||||
+13
-18
@@ -1,29 +1,12 @@
|
|||||||
// Copyright 2025 - Nym Technologies SA <contact@nymtech.net>
|
|
||||||
// SPDX-License-Identifier: GPL-3.0-only
|
|
||||||
|
|
||||||
use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
|
use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
|
||||||
|
|
||||||
// use `ip` feature without nightly
|
pub const fn is_global_ip(ip: &IpAddr) -> bool {
|
||||||
// issue: https://github.com/rust-lang/rust/issues/27709
|
|
||||||
pub(crate) const fn is_global_ip(ip: &IpAddr) -> bool {
|
|
||||||
match ip {
|
match ip {
|
||||||
IpAddr::V4(addr) => is_global_ipv4(addr),
|
IpAddr::V4(addr) => is_global_ipv4(addr),
|
||||||
IpAddr::V6(addr) => is_global_ipv6(addr),
|
IpAddr::V6(addr) => is_global_ipv6(addr),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const fn is_shared_ipv4(ip: &Ipv4Addr) -> bool {
|
|
||||||
ip.octets()[0] == 100 && (ip.octets()[1] & 0b1100_0000 == 0b0100_0000)
|
|
||||||
}
|
|
||||||
|
|
||||||
const fn is_benchmarking_ipv4(ip: &Ipv4Addr) -> bool {
|
|
||||||
ip.octets()[0] == 198 && (ip.octets()[1] & 0xfe) == 18
|
|
||||||
}
|
|
||||||
|
|
||||||
const fn is_reserved_ipv4(ip: &Ipv4Addr) -> bool {
|
|
||||||
ip.octets()[0] & 240 == 240 && !ip.is_broadcast()
|
|
||||||
}
|
|
||||||
|
|
||||||
const fn is_global_ipv4(ip: &Ipv4Addr) -> bool {
|
const fn is_global_ipv4(ip: &Ipv4Addr) -> bool {
|
||||||
!(ip.octets()[0] == 0 // "This network"
|
!(ip.octets()[0] == 0 // "This network"
|
||||||
|| ip.is_private()
|
|| ip.is_private()
|
||||||
@@ -42,6 +25,18 @@ const fn is_global_ipv4(ip: &Ipv4Addr) -> bool {
|
|||||||
|| ip.is_broadcast())
|
|| ip.is_broadcast())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const fn is_shared_ipv4(ip: &Ipv4Addr) -> bool {
|
||||||
|
ip.octets()[0] == 100 && (ip.octets()[1] & 0b1100_0000 == 0b0100_0000)
|
||||||
|
}
|
||||||
|
|
||||||
|
const fn is_benchmarking_ipv4(ip: &Ipv4Addr) -> bool {
|
||||||
|
ip.octets()[0] == 198 && (ip.octets()[1] & 0xfe) == 18
|
||||||
|
}
|
||||||
|
|
||||||
|
const fn is_reserved_ipv4(ip: &Ipv4Addr) -> bool {
|
||||||
|
ip.octets()[0] & 240 == 240 && !ip.is_broadcast()
|
||||||
|
}
|
||||||
|
|
||||||
const fn is_documentation_ipv6(ip: &Ipv6Addr) -> bool {
|
const fn is_documentation_ipv6(ip: &Ipv6Addr) -> bool {
|
||||||
(ip.segments()[0] == 0x2001) && (ip.segments()[1] == 0xdb8)
|
(ip.segments()[0] == 0x2001) && (ip.segments()[1] == 0xdb8)
|
||||||
}
|
}
|
||||||
@@ -9,3 +9,6 @@ pub mod completions;
|
|||||||
|
|
||||||
#[cfg(feature = "output_format")]
|
#[cfg(feature = "output_format")]
|
||||||
pub mod output_format;
|
pub mod output_format;
|
||||||
|
|
||||||
|
#[cfg(feature = "ip_check")]
|
||||||
|
pub mod ip_check;
|
||||||
|
|||||||
@@ -1,14 +1,16 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "nym-client-core"
|
name = "nym-client-core"
|
||||||
|
description = "Crate containing core client functionality and configs, used by all other Nym client implentations"
|
||||||
version.workspace = true
|
version.workspace = true
|
||||||
authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
|
authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
|
||||||
edition = "2021"
|
edition = "2024"
|
||||||
rust-version = "1.85"
|
|
||||||
license.workspace = true
|
license.workspace = true
|
||||||
description = "Crate containing core client functionality and configs, used by all other Nym client implentations"
|
|
||||||
repository.workspace = true
|
repository.workspace = true
|
||||||
homepage.workspace = true
|
homepage.workspace = true
|
||||||
documentation.workspace = true
|
documentation.workspace = true
|
||||||
|
rust-version = "1.85"
|
||||||
|
readme.workspace = true
|
||||||
|
publish = true
|
||||||
|
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|
||||||
|
|||||||
@@ -1,12 +1,16 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "nym-client-core-config-types"
|
name = "nym-client-core-config-types"
|
||||||
|
description = "Low level configs and constants used by Nym clients and nodes"
|
||||||
version.workspace = true
|
version.workspace = true
|
||||||
|
authors.workspace = true
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license.workspace = true
|
license.workspace = true
|
||||||
description = "Low level configs and constants used by Nym clients and nodes"
|
|
||||||
repository.workspace = true
|
repository.workspace = true
|
||||||
homepage.workspace = true
|
homepage.workspace = true
|
||||||
documentation.workspace = true
|
documentation.workspace = true
|
||||||
|
rust-version.workspace = true
|
||||||
|
readme.workspace = true
|
||||||
|
publish = true
|
||||||
|
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ const DEFAULT_MIN_MIXNODE_PERFORMANCE: u8 = 50;
|
|||||||
const DEFAULT_MIN_GATEWAY_PERFORMANCE: u8 = 50;
|
const DEFAULT_MIN_GATEWAY_PERFORMANCE: u8 = 50;
|
||||||
|
|
||||||
const DEFAULT_MAX_STARTUP_GATEWAY_WAITING_PERIOD: Duration = Duration::from_secs(70 * 60); // 70min -> full epoch (1h) + a bit of overhead
|
const DEFAULT_MAX_STARTUP_GATEWAY_WAITING_PERIOD: Duration = Duration::from_secs(70 * 60); // 70min -> full epoch (1h) + a bit of overhead
|
||||||
|
const DEFAULT_MAX_STARTUP_TOPOLOGY_WAITING_PERIOD: Duration = Duration::from_secs(70 * 60); // 70min -> full epoch (1h) + a bit of overhead
|
||||||
|
|
||||||
// Set this to a high value for now, so that we don't risk sporadic timeouts that might cause
|
// Set this to a high value for now, so that we don't risk sporadic timeouts that might cause
|
||||||
// bought bandwidth tokens to not have time to be spent; Once we remove the gateway from the
|
// bought bandwidth tokens to not have time to be spent; Once we remove the gateway from the
|
||||||
@@ -555,6 +556,11 @@ pub struct Topology {
|
|||||||
#[serde(with = "humantime_serde")]
|
#[serde(with = "humantime_serde")]
|
||||||
pub max_startup_gateway_waiting_period: Duration,
|
pub max_startup_gateway_waiting_period: Duration,
|
||||||
|
|
||||||
|
/// Defines how long the client is going to wait on startup for minimal topology to become online,
|
||||||
|
/// before abandoning the procedure.
|
||||||
|
#[serde(with = "humantime_serde")]
|
||||||
|
pub max_startup_network_waiting_period: Duration,
|
||||||
|
|
||||||
/// Specifies a minimum performance of a mixnode that is used on route construction.
|
/// Specifies a minimum performance of a mixnode that is used on route construction.
|
||||||
/// This setting is only applicable when `NymApi` topology is used.
|
/// This setting is only applicable when `NymApi` topology is used.
|
||||||
pub minimum_mixnode_performance: u8,
|
pub minimum_mixnode_performance: u8,
|
||||||
@@ -583,6 +589,7 @@ impl Default for Topology {
|
|||||||
topology_resolution_timeout: DEFAULT_TOPOLOGY_RESOLUTION_TIMEOUT,
|
topology_resolution_timeout: DEFAULT_TOPOLOGY_RESOLUTION_TIMEOUT,
|
||||||
disable_refreshing: false,
|
disable_refreshing: false,
|
||||||
max_startup_gateway_waiting_period: DEFAULT_MAX_STARTUP_GATEWAY_WAITING_PERIOD,
|
max_startup_gateway_waiting_period: DEFAULT_MAX_STARTUP_GATEWAY_WAITING_PERIOD,
|
||||||
|
max_startup_network_waiting_period: DEFAULT_MAX_STARTUP_TOPOLOGY_WAITING_PERIOD,
|
||||||
minimum_mixnode_performance: DEFAULT_MIN_MIXNODE_PERFORMANCE,
|
minimum_mixnode_performance: DEFAULT_MIN_MIXNODE_PERFORMANCE,
|
||||||
minimum_gateway_performance: DEFAULT_MIN_GATEWAY_PERFORMANCE,
|
minimum_gateway_performance: DEFAULT_MIN_GATEWAY_PERFORMANCE,
|
||||||
use_extended_topology: false,
|
use_extended_topology: false,
|
||||||
|
|||||||
@@ -159,6 +159,7 @@ impl From<ConfigV6> for Config {
|
|||||||
use_extended_topology: value.debug.topology.use_extended_topology,
|
use_extended_topology: value.debug.topology.use_extended_topology,
|
||||||
ignore_egress_epoch_role: value.debug.topology.ignore_egress_epoch_role,
|
ignore_egress_epoch_role: value.debug.topology.ignore_egress_epoch_role,
|
||||||
ignore_ingress_epoch_role: value.debug.topology.ignore_ingress_epoch_role,
|
ignore_ingress_epoch_role: value.debug.topology.ignore_ingress_epoch_role,
|
||||||
|
..Default::default()
|
||||||
},
|
},
|
||||||
reply_surbs: ReplySurbs {
|
reply_surbs: ReplySurbs {
|
||||||
minimum_reply_surb_storage_threshold: value
|
minimum_reply_surb_storage_threshold: value
|
||||||
|
|||||||
@@ -1,13 +1,16 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "nym-client-core-gateways-storage"
|
name = "nym-client-core-gateways-storage"
|
||||||
|
description = "Functionality for Nym clients to store and retrive Gateway connections"
|
||||||
version.workspace = true
|
version.workspace = true
|
||||||
|
authors.workspace = true
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license.workspace = true
|
license.workspace = true
|
||||||
rust-version.workspace = true
|
|
||||||
description = "Functionality for Nym clients to store and retrive Gateway connections"
|
|
||||||
repository.workspace = true
|
repository.workspace = true
|
||||||
homepage.workspace = true
|
homepage.workspace = true
|
||||||
documentation.workspace = true
|
documentation.workspace = true
|
||||||
|
rust-version.workspace = true
|
||||||
|
readme.workspace = true
|
||||||
|
publish = true
|
||||||
|
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|
||||||
|
|||||||
@@ -160,7 +160,10 @@ where
|
|||||||
)
|
)
|
||||||
.await?;
|
.await?;
|
||||||
} else {
|
} else {
|
||||||
info!("registered with new gateway {} (under address {address}), but this will not be our default address", gateway_details.gateway_id);
|
info!(
|
||||||
|
"registered with new gateway {} (under address {address}), but this will not be our default address",
|
||||||
|
gateway_details.gateway_id
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(GatewayInfo {
|
Ok(GatewayInfo {
|
||||||
|
|||||||
@@ -4,13 +4,13 @@
|
|||||||
use super::mix_traffic::ClientRequestSender;
|
use super::mix_traffic::ClientRequestSender;
|
||||||
use super::received_buffer::ReceivedBufferMessage;
|
use super::received_buffer::ReceivedBufferMessage;
|
||||||
use super::statistics_control::StatisticsControl;
|
use super::statistics_control::StatisticsControl;
|
||||||
use crate::client::base_client::storage::helpers::store_client_keys;
|
|
||||||
use crate::client::base_client::storage::MixnetClientStorage;
|
use crate::client::base_client::storage::MixnetClientStorage;
|
||||||
|
use crate::client::base_client::storage::helpers::store_client_keys;
|
||||||
use crate::client::cover_traffic_stream::LoopCoverTrafficStream;
|
use crate::client::cover_traffic_stream::LoopCoverTrafficStream;
|
||||||
use crate::client::event_control::EventControl;
|
use crate::client::event_control::EventControl;
|
||||||
use crate::client::inbound_messages::{InputMessage, InputMessageReceiver, InputMessageSender};
|
use crate::client::inbound_messages::{InputMessage, InputMessageReceiver, InputMessageSender};
|
||||||
use crate::client::key_manager::persistence::KeyStore;
|
|
||||||
use crate::client::key_manager::ClientKeys;
|
use crate::client::key_manager::ClientKeys;
|
||||||
|
use crate::client::key_manager::persistence::KeyStore;
|
||||||
use crate::client::mix_traffic::transceiver::{GatewayReceiver, GatewayTransceiver, RemoteGateway};
|
use crate::client::mix_traffic::transceiver::{GatewayReceiver, GatewayTransceiver, RemoteGateway};
|
||||||
use crate::client::mix_traffic::{BatchMixMessageSender, MixTrafficController, MixTrafficEvent};
|
use crate::client::mix_traffic::{BatchMixMessageSender, MixTrafficController, MixTrafficEvent};
|
||||||
use crate::client::real_messages_control;
|
use crate::client::real_messages_control;
|
||||||
@@ -52,12 +52,12 @@ use nym_sphinx::addressing::nodes::NodeIdentity;
|
|||||||
use nym_sphinx::receiver::{ReconstructedMessage, SphinxMessageReceiver};
|
use nym_sphinx::receiver::{ReconstructedMessage, SphinxMessageReceiver};
|
||||||
use nym_statistics_common::clients::ClientStatsSender;
|
use nym_statistics_common::clients::ClientStatsSender;
|
||||||
use nym_statistics_common::generate_client_stats_id;
|
use nym_statistics_common::generate_client_stats_id;
|
||||||
use nym_task::connections::{ConnectionCommandReceiver, ConnectionCommandSender, LaneQueueLengths};
|
|
||||||
use nym_task::ShutdownTracker;
|
use nym_task::ShutdownTracker;
|
||||||
use nym_topology::provider_trait::TopologyProvider;
|
use nym_task::connections::{ConnectionCommandReceiver, ConnectionCommandSender, LaneQueueLengths};
|
||||||
use nym_topology::HardcodedTopologyProvider;
|
use nym_topology::HardcodedTopologyProvider;
|
||||||
|
use nym_topology::provider_trait::TopologyProvider;
|
||||||
use nym_validator_client::nym_api::NymApiClientExt;
|
use nym_validator_client::nym_api::NymApiClientExt;
|
||||||
use nym_validator_client::{nyxd::contract_traits::DkgQueryClient, UserAgent};
|
use nym_validator_client::{UserAgent, nyxd::contract_traits::DkgQueryClient};
|
||||||
use rand::prelude::SliceRandom;
|
use rand::prelude::SliceRandom;
|
||||||
use rand::rngs::OsRng;
|
use rand::rngs::OsRng;
|
||||||
use rand::thread_rng;
|
use rand::thread_rng;
|
||||||
@@ -220,6 +220,7 @@ pub struct BaseClientBuilder<C, S: MixnetClientStorage> {
|
|||||||
nym_api_urls: Option<Vec<nym_network_defaults::ApiUrl>>,
|
nym_api_urls: Option<Vec<nym_network_defaults::ApiUrl>>,
|
||||||
|
|
||||||
wait_for_gateway: bool,
|
wait_for_gateway: bool,
|
||||||
|
wait_for_initial_topology: bool,
|
||||||
custom_topology_provider: Option<Box<dyn TopologyProvider + Send + Sync>>,
|
custom_topology_provider: Option<Box<dyn TopologyProvider + Send + Sync>>,
|
||||||
custom_gateway_transceiver: Option<Box<dyn GatewayTransceiver + Send>>,
|
custom_gateway_transceiver: Option<Box<dyn GatewayTransceiver + Send>>,
|
||||||
shutdown: Option<ShutdownTracker>,
|
shutdown: Option<ShutdownTracker>,
|
||||||
@@ -250,6 +251,7 @@ where
|
|||||||
dkg_query_client,
|
dkg_query_client,
|
||||||
nym_api_urls: None,
|
nym_api_urls: None,
|
||||||
wait_for_gateway: false,
|
wait_for_gateway: false,
|
||||||
|
wait_for_initial_topology: false,
|
||||||
custom_topology_provider: None,
|
custom_topology_provider: None,
|
||||||
custom_gateway_transceiver: None,
|
custom_gateway_transceiver: None,
|
||||||
shutdown: None,
|
shutdown: None,
|
||||||
@@ -305,6 +307,12 @@ where
|
|||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[must_use]
|
||||||
|
pub fn with_wait_for_initial_topology(mut self, wait_for_initial_topology: bool) -> Self {
|
||||||
|
self.wait_for_initial_topology = wait_for_initial_topology;
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
#[must_use]
|
#[must_use]
|
||||||
pub fn with_topology_provider(
|
pub fn with_topology_provider(
|
||||||
mut self,
|
mut self,
|
||||||
@@ -674,6 +682,7 @@ where
|
|||||||
topology_accessor: TopologyAccessor,
|
topology_accessor: TopologyAccessor,
|
||||||
local_gateway: NodeIdentity,
|
local_gateway: NodeIdentity,
|
||||||
wait_for_gateway: bool,
|
wait_for_gateway: bool,
|
||||||
|
wait_for_initial_topology: bool,
|
||||||
shutdown_tracker: &ShutdownTracker,
|
shutdown_tracker: &ShutdownTracker,
|
||||||
) -> Result<(), ClientCoreError> {
|
) -> Result<(), ClientCoreError> {
|
||||||
let topology_refresher_config =
|
let topology_refresher_config =
|
||||||
@@ -694,6 +703,46 @@ where
|
|||||||
tracing::info!("Obtaining initial network topology");
|
tracing::info!("Obtaining initial network topology");
|
||||||
topology_refresher.try_refresh().await;
|
topology_refresher.try_refresh().await;
|
||||||
|
|
||||||
|
// 1. wait for the minimum topology (if applicable)
|
||||||
|
if topology_refresher
|
||||||
|
.ensure_topology_is_routable()
|
||||||
|
.await
|
||||||
|
.is_err()
|
||||||
|
&& wait_for_initial_topology
|
||||||
|
{
|
||||||
|
if let Err(err) = topology_refresher
|
||||||
|
.wait_for_initial_network(topology_config.max_startup_network_waiting_period)
|
||||||
|
.await
|
||||||
|
{
|
||||||
|
tracing::error!(
|
||||||
|
"the network did not come become online within the specified timeout: {err}"
|
||||||
|
);
|
||||||
|
return Err(err.into());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. wait for our gateway (if applicable)
|
||||||
|
if topology_refresher
|
||||||
|
.ensure_contains_routable_egress(local_gateway)
|
||||||
|
.await
|
||||||
|
.is_err()
|
||||||
|
&& wait_for_gateway
|
||||||
|
{
|
||||||
|
if let Err(err) = topology_refresher
|
||||||
|
.wait_for_gateway(
|
||||||
|
local_gateway,
|
||||||
|
topology_config.max_startup_gateway_waiting_period,
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
{
|
||||||
|
tracing::error!(
|
||||||
|
"the gateway did not come back online within the specified timeout: {err}"
|
||||||
|
);
|
||||||
|
return Err(err.into());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. check if the topology is routable (in case we were NOT waiting for it)
|
||||||
if let Err(err) = topology_refresher.ensure_topology_is_routable().await {
|
if let Err(err) = topology_refresher.ensure_topology_is_routable().await {
|
||||||
tracing::error!(
|
tracing::error!(
|
||||||
"The current network topology seem to be insufficient to route any packets through \
|
"The current network topology seem to be insufficient to route any packets through \
|
||||||
@@ -702,30 +751,15 @@ where
|
|||||||
return Err(ClientCoreError::InsufficientNetworkTopology(err));
|
return Err(ClientCoreError::InsufficientNetworkTopology(err));
|
||||||
}
|
}
|
||||||
|
|
||||||
let gateway_wait_timeout = if wait_for_gateway {
|
// 4. check if the gateway exists (in case we were NOT waiting for it)
|
||||||
Some(topology_config.max_startup_gateway_waiting_period)
|
|
||||||
} else {
|
|
||||||
None
|
|
||||||
};
|
|
||||||
|
|
||||||
if let Err(err) = topology_refresher
|
if let Err(err) = topology_refresher
|
||||||
.ensure_contains_routable_egress(local_gateway)
|
.ensure_contains_routable_egress(local_gateway)
|
||||||
.await
|
.await
|
||||||
{
|
{
|
||||||
if let Some(waiting_timeout) = gateway_wait_timeout {
|
tracing::error!(
|
||||||
if let Err(err) = topology_refresher
|
"the gateway we're supposedly connected to does not exist. We'll not be able to send any packets to ourselves: {err}"
|
||||||
.wait_for_gateway(local_gateway, waiting_timeout)
|
);
|
||||||
.await
|
return Err(err.into());
|
||||||
{
|
|
||||||
tracing::error!(
|
|
||||||
"the gateway did not come back online within the specified timeout: {err}"
|
|
||||||
);
|
|
||||||
return Err(err.into());
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
tracing::error!("the gateway we're supposedly connected to does not exist. We'll not be able to send any packets to ourselves: {err}");
|
|
||||||
return Err(err.into());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if !topology_config.disable_refreshing {
|
if !topology_config.disable_refreshing {
|
||||||
@@ -1024,6 +1058,7 @@ where
|
|||||||
shared_topology_accessor.clone(),
|
shared_topology_accessor.clone(),
|
||||||
self_address.gateway(),
|
self_address.gateway(),
|
||||||
self.wait_for_gateway,
|
self.wait_for_gateway,
|
||||||
|
self.wait_for_initial_topology,
|
||||||
&shutdown_tracker.clone(),
|
&shutdown_tracker.clone(),
|
||||||
)
|
)
|
||||||
.await?;
|
.await?;
|
||||||
@@ -1195,9 +1230,11 @@ mod tests {
|
|||||||
]);
|
]);
|
||||||
|
|
||||||
assert_eq!(network_details.nym_api_urls.as_ref().unwrap().len(), 2);
|
assert_eq!(network_details.nym_api_urls.as_ref().unwrap().len(), 2);
|
||||||
assert!(network_details.nym_api_urls.as_ref().unwrap()[1]
|
assert!(
|
||||||
.front_hosts
|
network_details.nym_api_urls.as_ref().unwrap()[1]
|
||||||
.is_some());
|
.front_hosts
|
||||||
|
.is_some()
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@@ -1210,11 +1247,13 @@ mod tests {
|
|||||||
|
|
||||||
assert_eq!(api_url.url, "https://nym-frontdoor.vercel.app/api/");
|
assert_eq!(api_url.url, "https://nym-frontdoor.vercel.app/api/");
|
||||||
assert_eq!(api_url.front_hosts.as_ref().unwrap().len(), 2);
|
assert_eq!(api_url.front_hosts.as_ref().unwrap().len(), 2);
|
||||||
assert!(api_url
|
assert!(
|
||||||
.front_hosts
|
api_url
|
||||||
.as_ref()
|
.front_hosts
|
||||||
.unwrap()
|
.as_ref()
|
||||||
.contains(&"vercel.app".to_string()));
|
.unwrap()
|
||||||
|
.contains(&"vercel.app".to_string())
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
// SPDX-License-Identifier: Apache-2.0
|
// SPDX-License-Identifier: Apache-2.0
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
client::replies::reply_storage::{fs_backend, CombinedReplyStorage, ReplyStorageBackend},
|
client::replies::reply_storage::{CombinedReplyStorage, ReplyStorageBackend, fs_backend},
|
||||||
config,
|
config,
|
||||||
config::Config,
|
config::Config,
|
||||||
error::ClientCoreError,
|
error::ClientCoreError,
|
||||||
@@ -10,7 +10,7 @@ use crate::{
|
|||||||
use nym_bandwidth_controller::BandwidthController;
|
use nym_bandwidth_controller::BandwidthController;
|
||||||
use nym_client_core_gateways_storage::OnDiskGatewaysDetails;
|
use nym_client_core_gateways_storage::OnDiskGatewaysDetails;
|
||||||
use nym_credential_storage::storage::Storage as CredentialStorage;
|
use nym_credential_storage::storage::Storage as CredentialStorage;
|
||||||
use nym_validator_client::{nyxd, QueryHttpRpcNyxdClient};
|
use nym_validator_client::{QueryHttpRpcNyxdClient, nyxd};
|
||||||
use std::{io, path::Path};
|
use std::{io, path::Path};
|
||||||
use time::OffsetDateTime;
|
use time::OffsetDateTime;
|
||||||
use tracing::{error, info, trace};
|
use tracing::{error, info, trace};
|
||||||
@@ -24,7 +24,9 @@ async fn setup_fresh_backend<P: AsRef<Path>>(
|
|||||||
let mut storage_backend = match fs_backend::Backend::init(db_path).await {
|
let mut storage_backend = match fs_backend::Backend::init(db_path).await {
|
||||||
Ok(backend) => backend,
|
Ok(backend) => backend,
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
error!("setup_fresh_backend: Failed to setup persistent storage backend for our reply needs: {err}");
|
error!(
|
||||||
|
"setup_fresh_backend: Failed to setup persistent storage backend for our reply needs: {err}"
|
||||||
|
);
|
||||||
return Err(ClientCoreError::SurbStorageError {
|
return Err(ClientCoreError::SurbStorageError {
|
||||||
source: Box::new(err),
|
source: Box::new(err),
|
||||||
});
|
});
|
||||||
@@ -93,7 +95,9 @@ pub async fn setup_fs_reply_surb_backend<P: AsRef<Path>>(
|
|||||||
match fs_backend::Backend::try_load(db_path).await {
|
match fs_backend::Backend::try_load(db_path).await {
|
||||||
Ok(backend) => Ok(backend),
|
Ok(backend) => Ok(backend),
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
error!("setup_fs_reply_surb_backend: Failed to setup persistent storage backend for our reply needs: {err}. We're going to create a fresh database instead. This behaviour might change in the future");
|
error!(
|
||||||
|
"setup_fs_reply_surb_backend: Failed to setup persistent storage backend for our reply needs: {err}. We're going to create a fresh database instead. This behaviour might change in the future"
|
||||||
|
);
|
||||||
archive_corrupted_database(db_path).await?;
|
archive_corrupted_database(db_path).await?;
|
||||||
setup_fresh_backend(db_path, surb_config).await
|
setup_fresh_backend(db_path, surb_config).await
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
|
// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
|
||||||
// SPDX-License-Identifier: Apache-2.0
|
// SPDX-License-Identifier: Apache-2.0
|
||||||
|
|
||||||
use crate::client::key_manager::persistence::KeyStore;
|
|
||||||
use crate::client::key_manager::ClientKeys;
|
use crate::client::key_manager::ClientKeys;
|
||||||
|
use crate::client::key_manager::persistence::KeyStore;
|
||||||
use crate::error::ClientCoreError;
|
use crate::error::ClientCoreError;
|
||||||
use nym_client_core_gateways_storage::{
|
use nym_client_core_gateways_storage::{
|
||||||
ActiveGateway, GatewayPublishedData, GatewayRegistration, GatewaysDetailsStore,
|
ActiveGateway, GatewayPublishedData, GatewayRegistration, GatewaysDetailsStore,
|
||||||
|
|||||||
@@ -2,8 +2,8 @@
|
|||||||
// SPDX-License-Identifier: Apache-2.0
|
// SPDX-License-Identifier: Apache-2.0
|
||||||
|
|
||||||
pub mod v1_1_33 {
|
pub mod v1_1_33 {
|
||||||
use crate::config::disk_persistence::old_v1_1_33::CommonClientPathsV1_1_33;
|
|
||||||
use crate::config::disk_persistence::CommonClientPaths;
|
use crate::config::disk_persistence::CommonClientPaths;
|
||||||
|
use crate::config::disk_persistence::old_v1_1_33::CommonClientPathsV1_1_33;
|
||||||
use crate::config::old_config_v1_1_33::OldGatewayEndpointConfigV1_1_33;
|
use crate::config::old_config_v1_1_33::OldGatewayEndpointConfigV1_1_33;
|
||||||
use crate::error::ClientCoreError;
|
use crate::error::ClientCoreError;
|
||||||
|
|
||||||
|
|||||||
@@ -11,8 +11,8 @@ use nym_sphinx::addressing::clients::Recipient;
|
|||||||
use nym_sphinx::cover::generate_loop_cover_packet;
|
use nym_sphinx::cover::generate_loop_cover_packet;
|
||||||
use nym_sphinx::params::{PacketSize, PacketType};
|
use nym_sphinx::params::{PacketSize, PacketType};
|
||||||
use nym_sphinx::utils::sample_poisson_duration;
|
use nym_sphinx::utils::sample_poisson_duration;
|
||||||
use nym_statistics_common::clients::{packet_statistics::PacketStatisticsEvent, ClientStatsSender};
|
use nym_statistics_common::clients::{ClientStatsSender, packet_statistics::PacketStatisticsEvent};
|
||||||
use rand::{rngs::OsRng, CryptoRng, Rng};
|
use rand::{CryptoRng, Rng, rngs::OsRng};
|
||||||
use std::pin::Pin;
|
use std::pin::Pin;
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
@@ -20,10 +20,10 @@ use tokio::sync::mpsc::error::TrySendError;
|
|||||||
use tracing::*;
|
use tracing::*;
|
||||||
|
|
||||||
#[cfg(not(target_arch = "wasm32"))]
|
#[cfg(not(target_arch = "wasm32"))]
|
||||||
use tokio::time::{sleep, Sleep};
|
use tokio::time::{Sleep, sleep};
|
||||||
|
|
||||||
#[cfg(target_arch = "wasm32")]
|
#[cfg(target_arch = "wasm32")]
|
||||||
use wasmtimer::tokio::{sleep, Sleep};
|
use wasmtimer::tokio::{Sleep, sleep};
|
||||||
|
|
||||||
pub struct LoopCoverTrafficStream<R>
|
pub struct LoopCoverTrafficStream<R>
|
||||||
where
|
where
|
||||||
@@ -179,7 +179,9 @@ impl LoopCoverTrafficStream<OsRng> {
|
|||||||
) {
|
) {
|
||||||
Ok(topology) => topology,
|
Ok(topology) => topology,
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
warn!("We're not going to send any loop cover message this time, as the current topology seem to be invalid - {err}");
|
warn!(
|
||||||
|
"We're not going to send any loop cover message this time, as the current topology seem to be invalid - {err}"
|
||||||
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -13,10 +13,10 @@ use crate::config::disk_persistence::ClientKeysPaths;
|
|||||||
#[cfg(not(target_arch = "wasm32"))]
|
#[cfg(not(target_arch = "wasm32"))]
|
||||||
use nym_crypto::asymmetric::{ed25519, x25519};
|
use nym_crypto::asymmetric::{ed25519, x25519};
|
||||||
#[cfg(not(target_arch = "wasm32"))]
|
#[cfg(not(target_arch = "wasm32"))]
|
||||||
use nym_pemstore::traits::{PemStorableKey, PemStorableKeyPair};
|
|
||||||
#[cfg(not(target_arch = "wasm32"))]
|
|
||||||
use nym_pemstore::KeyPairPath;
|
use nym_pemstore::KeyPairPath;
|
||||||
#[cfg(not(target_arch = "wasm32"))]
|
#[cfg(not(target_arch = "wasm32"))]
|
||||||
|
use nym_pemstore::traits::{PemStorableKey, PemStorableKeyPair};
|
||||||
|
#[cfg(not(target_arch = "wasm32"))]
|
||||||
use nym_sphinx::acknowledgements::AckKey;
|
use nym_sphinx::acknowledgements::AckKey;
|
||||||
|
|
||||||
// we have to define it as an async trait since wasm storage is async
|
// we have to define it as an async trait since wasm storage is async
|
||||||
|
|||||||
@@ -4,8 +4,8 @@
|
|||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
use nym_credential_storage::storage::Storage as CredentialStorage;
|
use nym_credential_storage::storage::Storage as CredentialStorage;
|
||||||
use nym_crypto::asymmetric::ed25519;
|
use nym_crypto::asymmetric::ed25519;
|
||||||
use nym_gateway_client::error::GatewayClientError;
|
|
||||||
use nym_gateway_client::GatewayClient;
|
use nym_gateway_client::GatewayClient;
|
||||||
|
use nym_gateway_client::error::GatewayClientError;
|
||||||
pub use nym_gateway_client::{GatewayPacketRouter, PacketRouter};
|
pub use nym_gateway_client::{GatewayPacketRouter, PacketRouter};
|
||||||
use nym_gateway_requests::ClientRequest;
|
use nym_gateway_requests::ClientRequest;
|
||||||
use nym_sphinx::forwarding::packet::MixPacket;
|
use nym_sphinx::forwarding::packet::MixPacket;
|
||||||
@@ -240,7 +240,7 @@ mod nonwasm_sealed {
|
|||||||
impl GatewaySender for LocalGateway {
|
impl GatewaySender for LocalGateway {
|
||||||
async fn send_mix_packet(&mut self, packet: MixPacket) -> Result<(), ErasedGatewayError> {
|
async fn send_mix_packet(&mut self, packet: MixPacket) -> Result<(), ErasedGatewayError> {
|
||||||
self.packet_forwarder
|
self.packet_forwarder
|
||||||
.forward_packet(packet)
|
.forward_client_packet_without_delay(packet)
|
||||||
.map_err(erase_err)
|
.map_err(erase_err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-3
@@ -2,13 +2,13 @@
|
|||||||
// SPDX-License-Identifier: Apache-2.0
|
// SPDX-License-Identifier: Apache-2.0
|
||||||
|
|
||||||
use super::action_controller::{AckActionSender, Action};
|
use super::action_controller::{AckActionSender, Action};
|
||||||
use nym_statistics_common::clients::{packet_statistics::PacketStatisticsEvent, ClientStatsSender};
|
use nym_statistics_common::clients::{ClientStatsSender, packet_statistics::PacketStatisticsEvent};
|
||||||
|
|
||||||
use futures::StreamExt;
|
use futures::StreamExt;
|
||||||
use nym_gateway_client::AcknowledgementReceiver;
|
use nym_gateway_client::AcknowledgementReceiver;
|
||||||
use nym_sphinx::{
|
use nym_sphinx::{
|
||||||
acknowledgements::{identifier::recover_identifier, AckKey},
|
acknowledgements::{AckKey, identifier::recover_identifier},
|
||||||
chunking::fragment::{FragmentIdentifier, COVER_FRAG_ID},
|
chunking::fragment::{COVER_FRAG_ID, FragmentIdentifier},
|
||||||
};
|
};
|
||||||
use nym_task::ShutdownToken;
|
use nym_task::ShutdownToken;
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
|||||||
+2
-2
@@ -3,11 +3,11 @@
|
|||||||
|
|
||||||
use super::PendingAcknowledgement;
|
use super::PendingAcknowledgement;
|
||||||
use crate::client::real_messages_control::acknowledgement_control::RetransmissionRequestSender;
|
use crate::client::real_messages_control::acknowledgement_control::RetransmissionRequestSender;
|
||||||
use futures::channel::mpsc;
|
|
||||||
use futures::StreamExt;
|
use futures::StreamExt;
|
||||||
|
use futures::channel::mpsc;
|
||||||
use nym_nonexhaustive_delayqueue::{Expired, NonExhaustiveDelayQueue, QueueKey};
|
use nym_nonexhaustive_delayqueue::{Expired, NonExhaustiveDelayQueue, QueueKey};
|
||||||
use nym_sphinx::chunking::fragment::FragmentIdentifier;
|
|
||||||
use nym_sphinx::Delay as SphinxDelay;
|
use nym_sphinx::Delay as SphinxDelay;
|
||||||
|
use nym_sphinx::chunking::fragment::FragmentIdentifier;
|
||||||
use nym_task::ShutdownToken;
|
use nym_task::ShutdownToken;
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
|||||||
+1
-1
@@ -9,8 +9,8 @@ use nym_sphinx::addressing::clients::Recipient;
|
|||||||
use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag;
|
use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag;
|
||||||
use nym_sphinx::forwarding::packet::MixPacket;
|
use nym_sphinx::forwarding::packet::MixPacket;
|
||||||
use nym_sphinx::params::PacketType;
|
use nym_sphinx::params::PacketType;
|
||||||
use nym_task::connections::TransmissionLane;
|
|
||||||
use nym_task::ShutdownToken;
|
use nym_task::ShutdownToken;
|
||||||
|
use nym_task::connections::TransmissionLane;
|
||||||
use rand::{CryptoRng, Rng};
|
use rand::{CryptoRng, Rng};
|
||||||
use tracing::*;
|
use tracing::*;
|
||||||
|
|
||||||
|
|||||||
@@ -16,10 +16,10 @@ use nym_gateway_client::AcknowledgementReceiver;
|
|||||||
use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag;
|
use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag;
|
||||||
use nym_sphinx::params::{PacketSize, PacketType};
|
use nym_sphinx::params::{PacketSize, PacketType};
|
||||||
use nym_sphinx::{
|
use nym_sphinx::{
|
||||||
|
Delay as SphinxDelay,
|
||||||
acknowledgements::AckKey,
|
acknowledgements::AckKey,
|
||||||
addressing::clients::Recipient,
|
addressing::clients::Recipient,
|
||||||
chunking::fragment::{Fragment, FragmentIdentifier},
|
chunking::fragment::{Fragment, FragmentIdentifier},
|
||||||
Delay as SphinxDelay,
|
|
||||||
};
|
};
|
||||||
use nym_statistics_common::clients::ClientStatsSender;
|
use nym_statistics_common::clients::ClientStatsSender;
|
||||||
use rand::{CryptoRng, Rng};
|
use rand::{CryptoRng, Rng};
|
||||||
|
|||||||
+2
-2
@@ -2,8 +2,8 @@
|
|||||||
// SPDX-License-Identifier: Apache-2.0
|
// SPDX-License-Identifier: Apache-2.0
|
||||||
|
|
||||||
use super::{
|
use super::{
|
||||||
action_controller::{AckActionSender, Action},
|
|
||||||
PendingAcknowledgement, RetransmissionRequestReceiver,
|
PendingAcknowledgement, RetransmissionRequestReceiver,
|
||||||
|
action_controller::{AckActionSender, Action},
|
||||||
};
|
};
|
||||||
use crate::client::real_messages_control::acknowledgement_control::PacketDestination;
|
use crate::client::real_messages_control::acknowledgement_control::PacketDestination;
|
||||||
use crate::client::real_messages_control::message_handler::{MessageHandler, PreparationError};
|
use crate::client::real_messages_control::message_handler::{MessageHandler, PreparationError};
|
||||||
@@ -13,7 +13,7 @@ use futures::StreamExt;
|
|||||||
use nym_sphinx::chunking::fragment::Fragment;
|
use nym_sphinx::chunking::fragment::Fragment;
|
||||||
use nym_sphinx::preparer::PreparedFragment;
|
use nym_sphinx::preparer::PreparedFragment;
|
||||||
use nym_sphinx::{addressing::clients::Recipient, params::PacketType};
|
use nym_sphinx::{addressing::clients::Recipient, params::PacketType};
|
||||||
use nym_task::{connections::TransmissionLane, ShutdownToken};
|
use nym_task::{ShutdownToken, connections::TransmissionLane};
|
||||||
use rand::{CryptoRng, Rng};
|
use rand::{CryptoRng, Rng};
|
||||||
use std::sync::{Arc, Weak};
|
use std::sync::{Arc, Weak};
|
||||||
use tracing::*;
|
use tracing::*;
|
||||||
|
|||||||
+2
-2
@@ -1,10 +1,10 @@
|
|||||||
// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
|
// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
|
||||||
// SPDX-License-Identifier: Apache-2.0
|
// SPDX-License-Identifier: Apache-2.0
|
||||||
|
|
||||||
use super::action_controller::{AckActionSender, Action};
|
|
||||||
use super::SentPacketNotificationReceiver;
|
use super::SentPacketNotificationReceiver;
|
||||||
|
use super::action_controller::{AckActionSender, Action};
|
||||||
use futures::StreamExt;
|
use futures::StreamExt;
|
||||||
use nym_sphinx::chunking::fragment::{FragmentIdentifier, COVER_FRAG_ID};
|
use nym_sphinx::chunking::fragment::{COVER_FRAG_ID, FragmentIdentifier};
|
||||||
use tracing::*;
|
use tracing::*;
|
||||||
|
|
||||||
/// Module responsible for starting up retransmission timers.
|
/// Module responsible for starting up retransmission timers.
|
||||||
|
|||||||
@@ -10,17 +10,17 @@ use crate::client::replies::reply_controller::MaxRetransmissions;
|
|||||||
use crate::client::replies::reply_storage::{ReceivedReplySurbsMap, SentReplyKeys, UsedSenderTags};
|
use crate::client::replies::reply_storage::{ReceivedReplySurbsMap, SentReplyKeys, UsedSenderTags};
|
||||||
use crate::client::topology_control::{TopologyAccessor, TopologyReadPermit};
|
use crate::client::topology_control::{TopologyAccessor, TopologyReadPermit};
|
||||||
use nym_client_core_surb_storage::RetrievedReplySurb;
|
use nym_client_core_surb_storage::RetrievedReplySurb;
|
||||||
|
use nym_sphinx::Delay;
|
||||||
use nym_sphinx::acknowledgements::AckKey;
|
use nym_sphinx::acknowledgements::AckKey;
|
||||||
use nym_sphinx::addressing::clients::Recipient;
|
use nym_sphinx::addressing::clients::Recipient;
|
||||||
use nym_sphinx::anonymous_replies::requests::{AnonymousSenderTag, RepliableMessage, ReplyMessage};
|
|
||||||
use nym_sphinx::anonymous_replies::ReplySurbWithKeyRotation;
|
use nym_sphinx::anonymous_replies::ReplySurbWithKeyRotation;
|
||||||
|
use nym_sphinx::anonymous_replies::requests::{AnonymousSenderTag, RepliableMessage, ReplyMessage};
|
||||||
use nym_sphinx::chunking::fragment::{Fragment, FragmentIdentifier};
|
use nym_sphinx::chunking::fragment::{Fragment, FragmentIdentifier};
|
||||||
use nym_sphinx::message::NymMessage;
|
use nym_sphinx::message::NymMessage;
|
||||||
use nym_sphinx::params::{PacketSize, PacketType};
|
use nym_sphinx::params::{PacketSize, PacketType};
|
||||||
use nym_sphinx::preparer::{MessagePreparer, PreparedFragment};
|
use nym_sphinx::preparer::{MessagePreparer, PreparedFragment};
|
||||||
use nym_sphinx::Delay;
|
|
||||||
use nym_task::connections::TransmissionLane;
|
|
||||||
use nym_task::ShutdownToken;
|
use nym_task::ShutdownToken;
|
||||||
|
use nym_task::connections::TransmissionLane;
|
||||||
use nym_topology::{NymRouteProvider, NymTopologyError};
|
use nym_topology::{NymRouteProvider, NymTopologyError};
|
||||||
use rand::{CryptoRng, Rng};
|
use rand::{CryptoRng, Rng};
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
@@ -272,7 +272,9 @@ where
|
|||||||
let primary_count = msg.required_packets(self.config.primary_packet_size);
|
let primary_count = msg.required_packets(self.config.primary_packet_size);
|
||||||
let secondary_count = msg.required_packets(secondary_packet);
|
let secondary_count = msg.required_packets(secondary_packet);
|
||||||
|
|
||||||
trace!("This message would require: {primary_count} primary packets or {secondary_count} secondary packets...");
|
trace!(
|
||||||
|
"This message would require: {primary_count} primary packets or {secondary_count} secondary packets..."
|
||||||
|
);
|
||||||
// if there would be no benefit in using the secondary packet - use the primary (duh)
|
// if there would be no benefit in using the secondary packet - use the primary (duh)
|
||||||
if primary_count <= secondary_count {
|
if primary_count <= secondary_count {
|
||||||
trace!("so choosing primary for this message");
|
trace!("so choosing primary for this message");
|
||||||
|
|||||||
@@ -25,9 +25,9 @@ use nym_gateway_client::AcknowledgementReceiver;
|
|||||||
use nym_sphinx::acknowledgements::AckKey;
|
use nym_sphinx::acknowledgements::AckKey;
|
||||||
use nym_sphinx::addressing::clients::Recipient;
|
use nym_sphinx::addressing::clients::Recipient;
|
||||||
use nym_statistics_common::clients::ClientStatsSender;
|
use nym_statistics_common::clients::ClientStatsSender;
|
||||||
use nym_task::connections::{ConnectionCommandReceiver, LaneQueueLengths};
|
|
||||||
use nym_task::ShutdownToken;
|
use nym_task::ShutdownToken;
|
||||||
use rand::{rngs::OsRng, CryptoRng, Rng};
|
use nym_task::connections::{ConnectionCommandReceiver, LaneQueueLengths};
|
||||||
|
use rand::{CryptoRng, Rng, rngs::OsRng};
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
|
||||||
use crate::client::replies::reply_controller::key_rotation_helpers::KeyRotationConfig;
|
use crate::client::replies::reply_controller::key_rotation_helpers::KeyRotationConfig;
|
||||||
|
|||||||
@@ -17,11 +17,11 @@ use nym_sphinx::forwarding::packet::MixPacket;
|
|||||||
use nym_sphinx::params::PacketSize;
|
use nym_sphinx::params::PacketSize;
|
||||||
use nym_sphinx::preparer::PreparedFragment;
|
use nym_sphinx::preparer::PreparedFragment;
|
||||||
use nym_sphinx::utils::sample_poisson_duration;
|
use nym_sphinx::utils::sample_poisson_duration;
|
||||||
use nym_statistics_common::clients::{packet_statistics::PacketStatisticsEvent, ClientStatsSender};
|
use nym_statistics_common::clients::{ClientStatsSender, packet_statistics::PacketStatisticsEvent};
|
||||||
|
use nym_task::ShutdownToken;
|
||||||
use nym_task::connections::{
|
use nym_task::connections::{
|
||||||
ConnectionCommand, ConnectionCommandReceiver, ConnectionId, LaneQueueLengths, TransmissionLane,
|
ConnectionCommand, ConnectionCommandReceiver, ConnectionId, LaneQueueLengths, TransmissionLane,
|
||||||
};
|
};
|
||||||
use nym_task::ShutdownToken;
|
|
||||||
use rand::{CryptoRng, Rng};
|
use rand::{CryptoRng, Rng};
|
||||||
use std::pin::Pin;
|
use std::pin::Pin;
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
@@ -29,11 +29,11 @@ use std::time::Duration;
|
|||||||
use tracing::*;
|
use tracing::*;
|
||||||
|
|
||||||
#[cfg(not(target_arch = "wasm32"))]
|
#[cfg(not(target_arch = "wasm32"))]
|
||||||
use tokio::time::{sleep, Sleep};
|
use tokio::time::{Sleep, sleep};
|
||||||
|
|
||||||
// use nym_wasm_utils::console_log;
|
// use nym_wasm_utils::console_log;
|
||||||
#[cfg(target_arch = "wasm32")]
|
#[cfg(target_arch = "wasm32")]
|
||||||
use wasmtimer::tokio::{sleep, Sleep};
|
use wasmtimer::tokio::{Sleep, sleep};
|
||||||
mod sending_delay_controller;
|
mod sending_delay_controller;
|
||||||
|
|
||||||
/// Configurable parameters of the `OutQueueControl`
|
/// Configurable parameters of the `OutQueueControl`
|
||||||
@@ -230,7 +230,9 @@ where
|
|||||||
let (next_message, fragment_id, packet_size) = match next_message {
|
let (next_message, fragment_id, packet_size) = match next_message {
|
||||||
StreamMessage::Cover => {
|
StreamMessage::Cover => {
|
||||||
let cover_traffic_packet_size = self.loop_cover_message_size();
|
let cover_traffic_packet_size = self.loop_cover_message_size();
|
||||||
trace!("the next loop cover message will be put in a {cover_traffic_packet_size} packet");
|
trace!(
|
||||||
|
"the next loop cover message will be put in a {cover_traffic_packet_size} packet"
|
||||||
|
);
|
||||||
|
|
||||||
// TODO for way down the line: in very rare cases (during topology update) we might have
|
// TODO for way down the line: in very rare cases (during topology update) we might have
|
||||||
// to wait a really tiny bit before actually obtaining the permit hence messing with our
|
// to wait a really tiny bit before actually obtaining the permit hence messing with our
|
||||||
@@ -244,7 +246,9 @@ where
|
|||||||
) {
|
) {
|
||||||
Ok(topology) => topology,
|
Ok(topology) => topology,
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
warn!("We're not going to send any loop cover message this time, as the current topology seem to be invalid - {err}");
|
warn!(
|
||||||
|
"We're not going to send any loop cover message this time, as the current topology seem to be invalid - {err}"
|
||||||
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -436,7 +440,7 @@ where
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if let Some(ref mut next_delay) = &mut self.next_delay {
|
if let Some(next_delay) = &mut self.next_delay {
|
||||||
// it is not yet time to return a message
|
// it is not yet time to return a message
|
||||||
if next_delay.as_mut().poll(cx).is_pending() {
|
if next_delay.as_mut().poll(cx).is_pending() {
|
||||||
return Poll::Pending;
|
return Poll::Pending;
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
|
// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
|
||||||
// SPDX-License-Identifier: Apache-2.0
|
// SPDX-License-Identifier: Apache-2.0
|
||||||
|
|
||||||
use crate::client::helpers::{get_time_now, Instant};
|
use crate::client::helpers::{Instant, get_time_now};
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
|
|
||||||
// The minimum time between increasing the average delay between packets. If we hit the ceiling in
|
// The minimum time between increasing the average delay between packets. If we hit the ceiling in
|
||||||
|
|||||||
@@ -5,20 +5,20 @@ use crate::client::helpers::get_time_now;
|
|||||||
use crate::client::replies::{
|
use crate::client::replies::{
|
||||||
reply_controller::ReplyControllerSender, reply_storage::SentReplyKeys,
|
reply_controller::ReplyControllerSender, reply_storage::SentReplyKeys,
|
||||||
};
|
};
|
||||||
|
use futures::StreamExt;
|
||||||
use futures::channel::mpsc;
|
use futures::channel::mpsc;
|
||||||
use futures::lock::Mutex;
|
use futures::lock::Mutex;
|
||||||
use futures::StreamExt;
|
|
||||||
use nym_crypto::asymmetric::x25519;
|
|
||||||
use nym_crypto::Digest;
|
use nym_crypto::Digest;
|
||||||
|
use nym_crypto::asymmetric::x25519;
|
||||||
use nym_gateway_client::MixnetMessageReceiver;
|
use nym_gateway_client::MixnetMessageReceiver;
|
||||||
use nym_sphinx::anonymous_replies::requests::{
|
use nym_sphinx::anonymous_replies::requests::{
|
||||||
RepliableMessage, RepliableMessageContent, ReplyMessage, ReplyMessageContent,
|
RepliableMessage, RepliableMessageContent, ReplyMessage, ReplyMessageContent,
|
||||||
};
|
};
|
||||||
use nym_sphinx::anonymous_replies::{encryption_key::EncryptionKeyDigest, SurbEncryptionKey};
|
use nym_sphinx::anonymous_replies::{SurbEncryptionKey, encryption_key::EncryptionKeyDigest};
|
||||||
use nym_sphinx::message::{NymMessage, PlainMessage};
|
use nym_sphinx::message::{NymMessage, PlainMessage};
|
||||||
use nym_sphinx::params::ReplySurbKeyDigestAlgorithm;
|
use nym_sphinx::params::ReplySurbKeyDigestAlgorithm;
|
||||||
use nym_sphinx::receiver::{MessageReceiver, MessageRecoveryError, ReconstructedMessage};
|
use nym_sphinx::receiver::{MessageReceiver, MessageRecoveryError, ReconstructedMessage};
|
||||||
use nym_statistics_common::clients::{packet_statistics::PacketStatisticsEvent, ClientStatsSender};
|
use nym_statistics_common::clients::{ClientStatsSender, packet_statistics::PacketStatisticsEvent};
|
||||||
use nym_task::ShutdownToken;
|
use nym_task::ShutdownToken;
|
||||||
use std::collections::HashSet;
|
use std::collections::HashSet;
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
@@ -78,14 +78,19 @@ impl<R: MessageReceiver> ReceivedMessagesBufferInner<R> {
|
|||||||
|
|
||||||
let fragment = match self.message_receiver.recover_fragment(fragment_data) {
|
let fragment = match self.message_receiver.recover_fragment(fragment_data) {
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
warn!("failed to recover fragment from raw data: {err}. The whole underlying message might be corrupted and unrecoverable!");
|
warn!(
|
||||||
|
"failed to recover fragment from raw data: {err}. The whole underlying message might be corrupted and unrecoverable!"
|
||||||
|
);
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
Ok(frag) => frag,
|
Ok(frag) => frag,
|
||||||
};
|
};
|
||||||
|
|
||||||
if self.recently_reconstructed.contains(&fragment.id()) {
|
if self.recently_reconstructed.contains(&fragment.id()) {
|
||||||
debug!("Received a chunk of already re-assembled message ({:?})! It probably got here because the ack got lost", fragment.id());
|
debug!(
|
||||||
|
"Received a chunk of already re-assembled message ({:?})! It probably got here because the ack got lost",
|
||||||
|
fragment.id()
|
||||||
|
);
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -93,7 +98,9 @@ impl<R: MessageReceiver> ReceivedMessagesBufferInner<R> {
|
|||||||
match self.message_receiver.insert_new_fragment(fragment) {
|
match self.message_receiver.insert_new_fragment(fragment) {
|
||||||
Err(err) => match err {
|
Err(err) => match err {
|
||||||
MessageRecoveryError::MalformedReconstructedMessage { source, used_sets } => {
|
MessageRecoveryError::MalformedReconstructedMessage { source, used_sets } => {
|
||||||
error!("message reconstruction failed - {source}. Attempting to re-use the message sets...");
|
error!(
|
||||||
|
"message reconstruction failed - {source}. Attempting to re-use the message sets..."
|
||||||
|
);
|
||||||
// TODO: should we really insert reconstructed sets? could this be abused for some attack?
|
// TODO: should we really insert reconstructed sets? could this be abused for some attack?
|
||||||
for set_id in used_sets {
|
for set_id in used_sets {
|
||||||
if !self.recently_reconstructed.insert(set_id) {
|
if !self.recently_reconstructed.insert(set_id) {
|
||||||
@@ -144,7 +151,9 @@ impl<R: MessageReceiver> ReceivedMessagesBufferInner<R> {
|
|||||||
&mut raw_fragment,
|
&mut raw_fragment,
|
||||||
) {
|
) {
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
warn!("failed to recover fragment data: {err}. The whole underlying message might be corrupted and unrecoverable!");
|
warn!(
|
||||||
|
"failed to recover fragment data: {err}. The whole underlying message might be corrupted and unrecoverable!"
|
||||||
|
);
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
Ok(frag_data) => frag_data,
|
Ok(frag_data) => frag_data,
|
||||||
@@ -275,7 +284,9 @@ impl<R: MessageReceiver> ReceivedMessagesBuffer<R> {
|
|||||||
}
|
}
|
||||||
RepliableMessageContent::Heartbeat(content) => {
|
RepliableMessageContent::Heartbeat(content) => {
|
||||||
let additional_reply_surbs = content.additional_reply_surbs;
|
let additional_reply_surbs = content.additional_reply_surbs;
|
||||||
error!("received a repliable heartbeat message - we don't know how to handle it yet (and we won't know until future PRs)");
|
error!(
|
||||||
|
"received a repliable heartbeat message - we don't know how to handle it yet (and we won't know until future PRs)"
|
||||||
|
);
|
||||||
(additional_reply_surbs, false)
|
(additional_reply_surbs, false)
|
||||||
}
|
}
|
||||||
RepliableMessageContent::DataV2(content) => {
|
RepliableMessageContent::DataV2(content) => {
|
||||||
@@ -304,7 +315,9 @@ impl<R: MessageReceiver> ReceivedMessagesBuffer<R> {
|
|||||||
}
|
}
|
||||||
RepliableMessageContent::HeartbeatV2(content) => {
|
RepliableMessageContent::HeartbeatV2(content) => {
|
||||||
let additional_reply_surbs = content.additional_reply_surbs;
|
let additional_reply_surbs = content.additional_reply_surbs;
|
||||||
error!("received a repliable heartbeat message - we don't know how to handle it yet (and we won't know until future PRs)");
|
error!(
|
||||||
|
"received a repliable heartbeat message - we don't know how to handle it yet (and we won't know until future PRs)"
|
||||||
|
);
|
||||||
(additional_reply_surbs, false)
|
(additional_reply_surbs, false)
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -380,7 +393,9 @@ impl<R: MessageReceiver> ReceivedMessagesBuffer<R> {
|
|||||||
if let Some(sender) = &inner_guard.message_sender {
|
if let Some(sender) = &inner_guard.message_sender {
|
||||||
trace!("Sending reconstructed messages to announced sender");
|
trace!("Sending reconstructed messages to announced sender");
|
||||||
if let Err(err) = sender.unbounded_send(reconstructed_messages) {
|
if let Err(err) = sender.unbounded_send(reconstructed_messages) {
|
||||||
warn!("The reconstructed message receiver went offline without explicit notification (relevant error: - {err})");
|
warn!(
|
||||||
|
"The reconstructed message receiver went offline without explicit notification (relevant error: - {err})"
|
||||||
|
);
|
||||||
inner_guard.message_sender = None;
|
inner_guard.message_sender = None;
|
||||||
inner_guard.messages.extend(err.into_inner());
|
inner_guard.messages.extend(err.into_inner());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,15 +5,15 @@ use crate::client::real_messages_control::acknowledgement_control::PendingAcknow
|
|||||||
use crate::client::real_messages_control::message_handler::{
|
use crate::client::real_messages_control::message_handler::{
|
||||||
FragmentWithMaxRetransmissions, MessageHandler, PreparationError,
|
FragmentWithMaxRetransmissions, MessageHandler, PreparationError,
|
||||||
};
|
};
|
||||||
use crate::client::replies::reply_controller::key_rotation_helpers::SurbRefreshState;
|
|
||||||
use crate::client::replies::reply_controller::Config;
|
use crate::client::replies::reply_controller::Config;
|
||||||
|
use crate::client::replies::reply_controller::key_rotation_helpers::SurbRefreshState;
|
||||||
use crate::client::topology_control::TopologyAccessor;
|
use crate::client::topology_control::TopologyAccessor;
|
||||||
use crate::client::transmission_buffer::TransmissionBuffer;
|
use crate::client::transmission_buffer::TransmissionBuffer;
|
||||||
use futures::channel::oneshot;
|
use futures::channel::oneshot;
|
||||||
use nym_client_core_surb_storage::{ReceivedReplySurb, ReceivedReplySurbsMap};
|
use nym_client_core_surb_storage::{ReceivedReplySurb, ReceivedReplySurbsMap};
|
||||||
use nym_crypto::aes::cipher::crypto_common::rand_core::CryptoRng;
|
use nym_crypto::aes::cipher::crypto_common::rand_core::CryptoRng;
|
||||||
use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag;
|
|
||||||
use nym_sphinx::anonymous_replies::ReplySurbWithKeyRotation;
|
use nym_sphinx::anonymous_replies::ReplySurbWithKeyRotation;
|
||||||
|
use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag;
|
||||||
use nym_sphinx::chunking::fragment::FragmentIdentifier;
|
use nym_sphinx::chunking::fragment::FragmentIdentifier;
|
||||||
use nym_task::connections::{ConnectionId, TransmissionLane};
|
use nym_task::connections::{ConnectionId, TransmissionLane};
|
||||||
use nym_topology::NymTopologyMetadata;
|
use nym_topology::NymTopologyMetadata;
|
||||||
@@ -50,7 +50,9 @@ impl SenderData {
|
|||||||
let pending_retransmissions = self.pending_retransmissions.len();
|
let pending_retransmissions = self.pending_retransmissions.len();
|
||||||
let total_pending = pending_retransmissions + pending_replies;
|
let total_pending = pending_retransmissions + pending_replies;
|
||||||
|
|
||||||
debug!("total queue size: {total_pending} = pending data {pending_replies} + pending retransmission {pending_retransmissions}");
|
debug!(
|
||||||
|
"total queue size: {total_pending} = pending data {pending_replies} + pending retransmission {pending_retransmissions}"
|
||||||
|
);
|
||||||
|
|
||||||
total_pending
|
total_pending
|
||||||
}
|
}
|
||||||
@@ -200,7 +202,9 @@ where
|
|||||||
let total_required_surbs = total_queue + target_surbs_after_clearing_queue;
|
let total_required_surbs = total_queue + target_surbs_after_clearing_queue;
|
||||||
let total_available_surbs = pending_surbs + available_surbs;
|
let total_available_surbs = pending_surbs + available_surbs;
|
||||||
|
|
||||||
debug!("available surbs: {available_surbs} pending surbs: {pending_surbs} threshold range: {min_surbs_threshold}..+{min_surbs_threshold_buffer}..{max_surbs_threshold}");
|
debug!(
|
||||||
|
"available surbs: {available_surbs} pending surbs: {pending_surbs} threshold range: {min_surbs_threshold}..+{min_surbs_threshold_buffer}..{max_surbs_threshold}"
|
||||||
|
);
|
||||||
|
|
||||||
// We should request more surbs if:
|
// We should request more surbs if:
|
||||||
// 1. We haven't hit the maximum surb threshold, and
|
// 1. We haven't hit the maximum surb threshold, and
|
||||||
@@ -225,9 +229,13 @@ where
|
|||||||
.is_none()
|
.is_none()
|
||||||
{
|
{
|
||||||
// don't report it every single time
|
// don't report it every single time
|
||||||
warn!("received reply request for {recipient_tag} but we don't have any surbs stored for that recipient!");
|
warn!(
|
||||||
|
"received reply request for {recipient_tag} but we don't have any surbs stored for that recipient!"
|
||||||
|
);
|
||||||
} else {
|
} else {
|
||||||
trace!("received reply request for {recipient_tag} but we don't have any surbs stored for that recipient!");
|
trace!(
|
||||||
|
"received reply request for {recipient_tag} but we don't have any surbs stored for that recipient!"
|
||||||
|
);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -383,7 +391,9 @@ where
|
|||||||
let (surbs_for_reply, _) = self.surbs_storage.get_reply_surbs(&target, to_take.len());
|
let (surbs_for_reply, _) = self.surbs_storage.get_reply_surbs(&target, to_take.len());
|
||||||
|
|
||||||
let Some(surbs_for_reply) = surbs_for_reply else {
|
let Some(surbs_for_reply) = surbs_for_reply else {
|
||||||
error!("somehow different task has stolen our reply surbs! - this should have been impossible");
|
error!(
|
||||||
|
"somehow different task has stolen our reply surbs! - this should have been impossible"
|
||||||
|
);
|
||||||
self.re_insert_pending_retransmission(&target, to_take);
|
self.re_insert_pending_retransmission(&target, to_take);
|
||||||
return;
|
return;
|
||||||
};
|
};
|
||||||
@@ -459,7 +469,9 @@ where
|
|||||||
.get_reply_surbs(&target, to_send_clone.len());
|
.get_reply_surbs(&target, to_send_clone.len());
|
||||||
|
|
||||||
let Some(surbs_for_reply) = surbs_for_reply else {
|
let Some(surbs_for_reply) = surbs_for_reply else {
|
||||||
error!("somehow different task has stolen our reply surbs! - this should have been impossible");
|
error!(
|
||||||
|
"somehow different task has stolen our reply surbs! - this should have been impossible"
|
||||||
|
);
|
||||||
self.re_insert_pending_replies(&target, to_send);
|
self.re_insert_pending_replies(&target, to_send);
|
||||||
return;
|
return;
|
||||||
};
|
};
|
||||||
@@ -543,7 +555,9 @@ where
|
|||||||
let ack_ref = match timed_out_ack.upgrade() {
|
let ack_ref = match timed_out_ack.upgrade() {
|
||||||
Some(ack) => ack,
|
Some(ack) => ack,
|
||||||
None => {
|
None => {
|
||||||
debug!("we received the ack for one of the reply packets as we were putting it in the retransmission queue");
|
debug!(
|
||||||
|
"we received the ack for one of the reply packets as we were putting it in the retransmission queue"
|
||||||
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -657,9 +671,13 @@ where
|
|||||||
|
|
||||||
// only log at higher level if it's the first time this error has occurred in a while
|
// only log at higher level if it's the first time this error has occurred in a while
|
||||||
if now - last_failure > time::Duration::seconds(30) {
|
if now - last_failure > time::Duration::seconds(30) {
|
||||||
warn!("failed to request more surbs to clear pending queue of size {total_queue} (attempted to request: {request_size}): {err}")
|
warn!(
|
||||||
|
"failed to request more surbs to clear pending queue of size {total_queue} (attempted to request: {request_size}): {err}"
|
||||||
|
)
|
||||||
} else {
|
} else {
|
||||||
debug!("failed to request more surbs to clear pending queue of size {total_queue} (attempted to request: {request_size}): {err}")
|
debug!(
|
||||||
|
"failed to request more surbs to clear pending queue of size {total_queue} (attempted to request: {request_size}): {err}"
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -681,7 +699,10 @@ where
|
|||||||
.surbs_storage
|
.surbs_storage
|
||||||
.surbs_last_received_at(pending_reply_target)
|
.surbs_last_received_at(pending_reply_target)
|
||||||
else {
|
else {
|
||||||
error!("we have {} pending replies for {pending_reply_target}, but we somehow never received any reply surbs from them!", retransmission_buf.total_size());
|
error!(
|
||||||
|
"we have {} pending replies for {pending_reply_target}, but we somehow never received any reply surbs from them!",
|
||||||
|
retransmission_buf.total_size()
|
||||||
|
);
|
||||||
to_remove.push(*pending_reply_target);
|
to_remove.push(*pending_reply_target);
|
||||||
continue;
|
continue;
|
||||||
};
|
};
|
||||||
@@ -702,7 +723,9 @@ where
|
|||||||
// if client is offline)
|
// if client is offline)
|
||||||
if vals.current_clear_rerequest_counter > max_rerequests {
|
if vals.current_clear_rerequest_counter > max_rerequests {
|
||||||
to_remove.push(*pending_reply_target);
|
to_remove.push(*pending_reply_target);
|
||||||
debug!("we have reached the maximum threshold of attempting to request surbs from {pending_reply_target}. dropping the sender");
|
debug!(
|
||||||
|
"we have reached the maximum threshold of attempting to request surbs from {pending_reply_target}. dropping the sender"
|
||||||
|
);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -710,7 +733,10 @@ where
|
|||||||
if diff > max_drop_wait {
|
if diff > max_drop_wait {
|
||||||
to_remove.push(*pending_reply_target)
|
to_remove.push(*pending_reply_target)
|
||||||
} else {
|
} else {
|
||||||
debug!("We haven't received any surbs in {} from {pending_reply_target}. Going to explicitly ask for more", humantime::format_duration(diff.unsigned_abs()));
|
debug!(
|
||||||
|
"We haven't received any surbs in {} from {pending_reply_target}. Going to explicitly ask for more",
|
||||||
|
humantime::format_duration(diff.unsigned_abs())
|
||||||
|
);
|
||||||
vals.increment_current_clear_rerequest_counter();
|
vals.increment_current_clear_rerequest_counter();
|
||||||
to_request.push(*pending_reply_target);
|
to_request.push(*pending_reply_target);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,8 +4,8 @@
|
|||||||
use crate::client::real_messages_control::acknowledgement_control::PendingAcknowledgement;
|
use crate::client::real_messages_control::acknowledgement_control::PendingAcknowledgement;
|
||||||
use futures::channel::{mpsc, oneshot};
|
use futures::channel::{mpsc, oneshot};
|
||||||
use nym_sphinx::addressing::clients::Recipient;
|
use nym_sphinx::addressing::clients::Recipient;
|
||||||
use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag;
|
|
||||||
use nym_sphinx::anonymous_replies::ReplySurbWithKeyRotation;
|
use nym_sphinx::anonymous_replies::ReplySurbWithKeyRotation;
|
||||||
|
use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag;
|
||||||
use nym_task::connections::{ConnectionId, TransmissionLane};
|
use nym_task::connections::{ConnectionId, TransmissionLane};
|
||||||
use std::sync::Weak;
|
use std::sync::Weak;
|
||||||
|
|
||||||
|
|||||||
@@ -43,7 +43,9 @@ where
|
|||||||
// 1. check whether we sent any surbs in the past to this recipient, otherwise
|
// 1. check whether we sent any surbs in the past to this recipient, otherwise
|
||||||
// they have no business in asking for more
|
// they have no business in asking for more
|
||||||
if !self.tags_storage.exists(&recipient) {
|
if !self.tags_storage.exists(&recipient) {
|
||||||
warn!("{recipient} asked us for reply SURBs even though we never sent them any anonymous messages before!");
|
warn!(
|
||||||
|
"{recipient} asked us for reply SURBs even though we never sent them any anonymous messages before!"
|
||||||
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -54,7 +56,12 @@ where
|
|||||||
.reply_surbs
|
.reply_surbs
|
||||||
.maximum_allowed_reply_surb_request_size
|
.maximum_allowed_reply_surb_request_size
|
||||||
{
|
{
|
||||||
warn!("The requested reply surb amount is larger than our maximum allowed ({amount} > {}). Lowering it to a more sane value...", self.config.reply_surbs.maximum_allowed_reply_surb_request_size);
|
warn!(
|
||||||
|
"The requested reply surb amount is larger than our maximum allowed ({amount} > {}). Lowering it to a more sane value...",
|
||||||
|
self.config
|
||||||
|
.reply_surbs
|
||||||
|
.maximum_allowed_reply_surb_request_size
|
||||||
|
);
|
||||||
amount = self
|
amount = self
|
||||||
.config
|
.config
|
||||||
.reply_surbs
|
.reply_surbs
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ use nym_sphinx::addressing::Recipient;
|
|||||||
use nym_statistics_common::clients::{
|
use nym_statistics_common::clients::{
|
||||||
ClientStatsController, ClientStatsReceiver, ClientStatsSender,
|
ClientStatsController, ClientStatsReceiver, ClientStatsSender,
|
||||||
};
|
};
|
||||||
use nym_task::{connections::TransmissionLane, ShutdownToken, ShutdownTracker};
|
use nym_task::{ShutdownToken, ShutdownTracker, connections::TransmissionLane};
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
|
|
||||||
/// Time interval between reporting statistics locally (logging/shutdown_token)
|
/// Time interval between reporting statistics locally (logging/shutdown_token)
|
||||||
|
|||||||
@@ -5,8 +5,8 @@ use nym_sphinx::addressing::clients::Recipient;
|
|||||||
use nym_topology::{NymRouteProvider, NymTopology, NymTopologyError, NymTopologyMetadata};
|
use nym_topology::{NymRouteProvider, NymTopology, NymTopologyError, NymTopologyMetadata};
|
||||||
use nym_validator_client::models::KeyRotationId;
|
use nym_validator_client::models::KeyRotationId;
|
||||||
use std::ops::Deref;
|
use std::ops::Deref;
|
||||||
use std::sync::atomic::{AtomicBool, Ordering};
|
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
use std::sync::atomic::{AtomicBool, Ordering};
|
||||||
use tokio::sync::{Notify, RwLock, RwLockReadGuard};
|
use tokio::sync::{Notify, RwLock, RwLockReadGuard};
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
|
|||||||
@@ -63,7 +63,9 @@ impl TopologyRefresher {
|
|||||||
trace!("Refreshing the topology");
|
trace!("Refreshing the topology");
|
||||||
|
|
||||||
if self.topology_accessor.controlled_manually() {
|
if self.topology_accessor.controlled_manually() {
|
||||||
info!("topology is being controlled manually - we're going to wait until the control is released...");
|
info!(
|
||||||
|
"topology is being controlled manually - we're going to wait until the control is released..."
|
||||||
|
);
|
||||||
self.topology_accessor
|
self.topology_accessor
|
||||||
.wait_for_released_manual_control()
|
.wait_for_released_manual_control()
|
||||||
.await;
|
.await;
|
||||||
@@ -138,6 +140,35 @@ impl TopologyRefresher {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub async fn wait_for_initial_network(
|
||||||
|
&mut self,
|
||||||
|
timeout_duration: Duration,
|
||||||
|
) -> Result<(), NymTopologyError> {
|
||||||
|
info!(
|
||||||
|
"going to wait for at most {timeout_duration:?} for initial network to become online"
|
||||||
|
);
|
||||||
|
|
||||||
|
let deadline = sleep(timeout_duration);
|
||||||
|
tokio::pin!(deadline);
|
||||||
|
|
||||||
|
loop {
|
||||||
|
tokio::select! {
|
||||||
|
_ = &mut deadline => {
|
||||||
|
return Err(NymTopologyError::TimedOutWaitingForTopology)
|
||||||
|
}
|
||||||
|
_ = self.try_refresh() => {
|
||||||
|
if let Err(err) = self.ensure_topology_is_routable().await {
|
||||||
|
info!("network is still not routable...: {err}");
|
||||||
|
} else {
|
||||||
|
return Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
sleep(self.refresh_rate).await
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// it's perfectly fine if task is interrupted mid-refresh
|
// it's perfectly fine if task is interrupted mid-refresh
|
||||||
// there's no data to persist or send over
|
// there's no data to persist or send over
|
||||||
pub async fn run(&mut self) {
|
pub async fn run(&mut self) {
|
||||||
|
|||||||
@@ -3,8 +3,8 @@
|
|||||||
|
|
||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
use nym_mixnet_contract_common::EpochRewardedSet;
|
use nym_mixnet_contract_common::EpochRewardedSet;
|
||||||
use nym_topology::provider_trait::{ToTopologyMetadata, TopologyProvider};
|
|
||||||
use nym_topology::NymTopology;
|
use nym_topology::NymTopology;
|
||||||
|
use nym_topology::provider_trait::{ToTopologyMetadata, TopologyProvider};
|
||||||
use nym_validator_client::nym_api::NymApiClientExt;
|
use nym_validator_client::nym_api::NymApiClientExt;
|
||||||
use rand::prelude::SliceRandom;
|
use rand::prelude::SliceRandom;
|
||||||
use rand::thread_rng;
|
use rand::thread_rng;
|
||||||
@@ -82,7 +82,9 @@ impl NymApiTopologyProvider {
|
|||||||
|
|
||||||
fn use_next_nym_api(&mut self) {
|
fn use_next_nym_api(&mut self) {
|
||||||
if self.nym_api_urls.len() == 1 {
|
if self.nym_api_urls.len() == 1 {
|
||||||
warn!("There's only a single nym API available - it won't be possible to use a different one");
|
warn!(
|
||||||
|
"There's only a single nym API available - it won't be possible to use a different one"
|
||||||
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -155,7 +157,10 @@ impl NymApiTopologyProvider {
|
|||||||
let mixnodes = mixnodes_res.nodes;
|
let mixnodes = mixnodes_res.nodes;
|
||||||
|
|
||||||
if !gateways_res.metadata.consistency_check(&metadata) {
|
if !gateways_res.metadata.consistency_check(&metadata) {
|
||||||
warn!("inconsistent nodes metadata between mixnodes and gateways calls! {metadata:?} and {:?}", gateways_res.metadata);
|
warn!(
|
||||||
|
"inconsistent nodes metadata between mixnodes and gateways calls! {metadata:?} and {:?}",
|
||||||
|
gateways_res.metadata
|
||||||
|
);
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
|
// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
|
||||||
// SPDX-License-Identifier: Apache-2.0
|
// SPDX-License-Identifier: Apache-2.0
|
||||||
|
|
||||||
use crate::client::helpers::{get_time_now, Instant};
|
use crate::client::helpers::{Instant, get_time_now};
|
||||||
use crate::client::real_messages_control::real_traffic_stream::RealMessage;
|
use crate::client::real_messages_control::real_traffic_stream::RealMessage;
|
||||||
use nym_sphinx::chunking::fragment::Fragment;
|
use nym_sphinx::chunking::fragment::Fragment;
|
||||||
use nym_task::connections::TransmissionLane;
|
use nym_task::connections::TransmissionLane;
|
||||||
use rand::{seq::SliceRandom, Rng};
|
use rand::{Rng, seq::SliceRandom};
|
||||||
use std::{
|
use std::{
|
||||||
collections::{HashMap, HashSet, VecDeque},
|
collections::{HashMap, HashSet, VecDeque},
|
||||||
time::Duration,
|
time::Duration,
|
||||||
|
|||||||
@@ -7,9 +7,9 @@ use nym_gateway_client::error::GatewayClientError;
|
|||||||
use nym_task::RegistryAccessError;
|
use nym_task::RegistryAccessError;
|
||||||
use nym_topology::node::RoutingNodeError;
|
use nym_topology::node::RoutingNodeError;
|
||||||
use nym_topology::{NodeId, NymTopologyError};
|
use nym_topology::{NodeId, NymTopologyError};
|
||||||
|
use nym_validator_client::ValidatorClientError;
|
||||||
use nym_validator_client::nym_api::error::NymAPIError;
|
use nym_validator_client::nym_api::error::NymAPIError;
|
||||||
use nym_validator_client::nyxd::error::NyxdError;
|
use nym_validator_client::nyxd::error::NyxdError;
|
||||||
use nym_validator_client::ValidatorClientError;
|
|
||||||
use rand::distributions::WeightedError;
|
use rand::distributions::WeightedError;
|
||||||
use std::error::Error;
|
use std::error::Error;
|
||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
@@ -56,7 +56,9 @@ pub enum ClientCoreError {
|
|||||||
#[error("no gateways on network")]
|
#[error("no gateways on network")]
|
||||||
NoGatewaysOnNetwork,
|
NoGatewaysOnNetwork,
|
||||||
|
|
||||||
#[error("there are no more new gateways on the network - it seems this client has already registered with all nodes it could have")]
|
#[error(
|
||||||
|
"there are no more new gateways on the network - it seems this client has already registered with all nodes it could have"
|
||||||
|
)]
|
||||||
NoNewGatewaysAvailable,
|
NoNewGatewaysAvailable,
|
||||||
|
|
||||||
#[error("list of nym apis is empty")]
|
#[error("list of nym apis is empty")]
|
||||||
@@ -127,7 +129,9 @@ pub enum ClientCoreError {
|
|||||||
#[error("unexpected exit")]
|
#[error("unexpected exit")]
|
||||||
UnexpectedExit,
|
UnexpectedExit,
|
||||||
|
|
||||||
#[error("this operation would have resulted in the gateway {gateway_id:?} key being overwritten without permission")]
|
#[error(
|
||||||
|
"this operation would have resulted in the gateway {gateway_id:?} key being overwritten without permission"
|
||||||
|
)]
|
||||||
ForbiddenGatewayKeyOverwrite { gateway_id: String },
|
ForbiddenGatewayKeyOverwrite { gateway_id: String },
|
||||||
|
|
||||||
#[error(
|
#[error(
|
||||||
@@ -151,7 +155,9 @@ pub enum ClientCoreError {
|
|||||||
#[error("attempted to obtain fresh gateway details whilst already knowing about one")]
|
#[error("attempted to obtain fresh gateway details whilst already knowing about one")]
|
||||||
UnexpectedGatewayDetails,
|
UnexpectedGatewayDetails,
|
||||||
|
|
||||||
#[error("the provided gateway details (for gateway {gateway_id}) do not correspond to the shared keys")]
|
#[error(
|
||||||
|
"the provided gateway details (for gateway {gateway_id}) do not correspond to the shared keys"
|
||||||
|
)]
|
||||||
MismatchedGatewayDetails { gateway_id: String },
|
MismatchedGatewayDetails { gateway_id: String },
|
||||||
|
|
||||||
#[error("unable to upgrade config file from `{current_version}`")]
|
#[error("unable to upgrade config file from `{current_version}`")]
|
||||||
@@ -227,7 +233,9 @@ pub enum ClientCoreError {
|
|||||||
source: url::ParseError,
|
source: url::ParseError,
|
||||||
},
|
},
|
||||||
|
|
||||||
#[error("this client (id: '{client_id}') has already been initialised before. If you want to add additional gateway, use `add-gateway` command")]
|
#[error(
|
||||||
|
"this client (id: '{client_id}') has already been initialised before. If you want to add additional gateway, use `add-gateway` command"
|
||||||
|
)]
|
||||||
AlreadyInitialised { client_id: String },
|
AlreadyInitialised { client_id: String },
|
||||||
|
|
||||||
#[error("this client has already registered with gateway {gateway_id}")]
|
#[error("this client has already registered with gateway {gateway_id}")]
|
||||||
|
|||||||
@@ -5,13 +5,13 @@ use crate::error::ClientCoreError;
|
|||||||
use crate::init::types::RegistrationResult;
|
use crate::init::types::RegistrationResult;
|
||||||
use futures::{SinkExt, StreamExt};
|
use futures::{SinkExt, StreamExt};
|
||||||
use nym_crypto::asymmetric::ed25519;
|
use nym_crypto::asymmetric::ed25519;
|
||||||
use nym_gateway_client::client::GatewayListeners;
|
|
||||||
use nym_gateway_client::GatewayClient;
|
use nym_gateway_client::GatewayClient;
|
||||||
|
use nym_gateway_client::client::GatewayListeners;
|
||||||
use nym_topology::node::RoutingNode;
|
use nym_topology::node::RoutingNode;
|
||||||
|
use nym_validator_client::UserAgent;
|
||||||
use nym_validator_client::client::{IdentityKeyRef, NymApiClientExt};
|
use nym_validator_client::client::{IdentityKeyRef, NymApiClientExt};
|
||||||
use nym_validator_client::nym_nodes::SkimmedNodesWithMetadata;
|
use nym_validator_client::nym_nodes::SkimmedNodesWithMetadata;
|
||||||
use nym_validator_client::UserAgent;
|
use rand::{Rng, seq::SliceRandom};
|
||||||
use rand::{seq::SliceRandom, Rng};
|
|
||||||
#[cfg(unix)]
|
#[cfg(unix)]
|
||||||
use std::os::fd::RawFd;
|
use std::os::fd::RawFd;
|
||||||
use std::{sync::Arc, time::Duration};
|
use std::{sync::Arc, time::Duration};
|
||||||
@@ -28,10 +28,10 @@ use nym_wasm_utils::websocket::JSWebsocket;
|
|||||||
#[cfg(not(target_arch = "wasm32"))]
|
#[cfg(not(target_arch = "wasm32"))]
|
||||||
use tokio::net::TcpStream;
|
use tokio::net::TcpStream;
|
||||||
#[cfg(not(target_arch = "wasm32"))]
|
#[cfg(not(target_arch = "wasm32"))]
|
||||||
use tokio::time::sleep;
|
|
||||||
#[cfg(not(target_arch = "wasm32"))]
|
|
||||||
use tokio::time::Instant;
|
use tokio::time::Instant;
|
||||||
#[cfg(not(target_arch = "wasm32"))]
|
#[cfg(not(target_arch = "wasm32"))]
|
||||||
|
use tokio::time::sleep;
|
||||||
|
#[cfg(not(target_arch = "wasm32"))]
|
||||||
use tokio_tungstenite::{MaybeTlsStream, WebSocketStream};
|
use tokio_tungstenite::{MaybeTlsStream, WebSocketStream};
|
||||||
#[cfg(target_arch = "wasm32")]
|
#[cfg(target_arch = "wasm32")]
|
||||||
use wasmtimer::std::Instant;
|
use wasmtimer::std::Instant;
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ use crate::client::base_client::storage::helpers::{
|
|||||||
has_gateway_details, load_active_gateway_details, load_client_keys, load_gateway_details,
|
has_gateway_details, load_active_gateway_details, load_client_keys, load_gateway_details,
|
||||||
store_gateway_details, update_stored_published_data_gateway,
|
store_gateway_details, update_stored_published_data_gateway,
|
||||||
};
|
};
|
||||||
use crate::client::key_manager::persistence::KeyStore;
|
|
||||||
use crate::client::key_manager::ClientKeys;
|
use crate::client::key_manager::ClientKeys;
|
||||||
|
use crate::client::key_manager::persistence::KeyStore;
|
||||||
use crate::error::ClientCoreError;
|
use crate::error::ClientCoreError;
|
||||||
use crate::init::helpers::{
|
use crate::init::helpers::{
|
||||||
choose_gateway_by_latency, get_specified_gateway, uniformly_random_gateway,
|
choose_gateway_by_latency, get_specified_gateway, uniformly_random_gateway,
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
// Copyright 2023-2024 - Nym Technologies SA <contact@nymtech.net>
|
// Copyright 2023-2024 - Nym Technologies SA <contact@nymtech.net>
|
||||||
// SPDX-License-Identifier: Apache-2.0
|
// SPDX-License-Identifier: Apache-2.0
|
||||||
|
|
||||||
use crate::client::key_manager::persistence::KeyStore;
|
|
||||||
use crate::client::key_manager::ClientKeys;
|
use crate::client::key_manager::ClientKeys;
|
||||||
|
use crate::client::key_manager::persistence::KeyStore;
|
||||||
use crate::config::Config;
|
use crate::config::Config;
|
||||||
use crate::error::ClientCoreError;
|
use crate::error::ClientCoreError;
|
||||||
use crate::init::{setup_gateway, use_loaded_gateway_details};
|
use crate::init::{setup_gateway, use_loaded_gateway_details};
|
||||||
@@ -10,8 +10,8 @@ use nym_client_core_gateways_storage::{
|
|||||||
GatewayRegistration, GatewaysDetailsStore, RemoteGatewayDetails,
|
GatewayRegistration, GatewaysDetailsStore, RemoteGatewayDetails,
|
||||||
};
|
};
|
||||||
use nym_crypto::asymmetric::ed25519;
|
use nym_crypto::asymmetric::ed25519;
|
||||||
use nym_gateway_client::client::{GatewayListeners, InitGatewayClient};
|
|
||||||
use nym_gateway_client::SharedSymmetricKey;
|
use nym_gateway_client::SharedSymmetricKey;
|
||||||
|
use nym_gateway_client::client::{GatewayListeners, InitGatewayClient};
|
||||||
use nym_sphinx::addressing::clients::Recipient;
|
use nym_sphinx::addressing::clients::Recipient;
|
||||||
use nym_topology::node::RoutingNode;
|
use nym_topology::node::RoutingNode;
|
||||||
use nym_validator_client::client::IdentityKey;
|
use nym_validator_client::client::IdentityKey;
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
#![allow(deprecated)] // silences clippy warning: use of deprecated associated function `nym_crypto::generic_array::GenericArray::<T, N>::clone_from_slice`: please upgrade to generic-array 1.x - TODO
|
||||||
use std::future::Future;
|
use std::future::Future;
|
||||||
|
|
||||||
#[cfg(all(
|
#[cfg(all(
|
||||||
|
|||||||
@@ -1,12 +1,16 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "nym-client-core-surb-storage"
|
name = "nym-client-core-surb-storage"
|
||||||
|
description = "Functionality for Nym clients to generate and use Single Use Reply Blocks (SURBs)"
|
||||||
version.workspace = true
|
version.workspace = true
|
||||||
|
authors.workspace = true
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license.workspace = true
|
license.workspace = true
|
||||||
description = "Functionality for Nym clients to generate and use Single Use Reply Blocks (SURBs)"
|
|
||||||
repository.workspace = true
|
repository.workspace = true
|
||||||
homepage.workspace = true
|
homepage.workspace = true
|
||||||
documentation.workspace = true
|
documentation.workspace = true
|
||||||
|
rust-version.workspace = true
|
||||||
|
readme.workspace = true
|
||||||
|
publish = true
|
||||||
|
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
|
// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
|
||||||
// SPDX-License-Identifier: Apache-2.0
|
// SPDX-License-Identifier: Apache-2.0
|
||||||
|
|
||||||
|
#![allow(deprecated)] // silences clippy warning: use of deprecated associated function `nym_crypto::generic_array::GenericArray::<T, N>::from_exact_iter`: please upgrade to generic-array 1.x - TODO
|
||||||
pub use backend::*;
|
pub use backend::*;
|
||||||
pub use combined::CombinedReplyStorage;
|
pub use combined::CombinedReplyStorage;
|
||||||
pub use key_storage::SentReplyKeys;
|
pub use key_storage::SentReplyKeys;
|
||||||
|
|||||||
@@ -1,13 +1,16 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "nym-gateway-client"
|
name = "nym-gateway-client"
|
||||||
|
description = "Functions and types for Nym client <> Gateway connections"
|
||||||
version.workspace = true
|
version.workspace = true
|
||||||
authors = ["Jędrzej Stuczyński <andrew@nymtech.net>"]
|
authors = ["Jędrzej Stuczyński <andrew@nymtech.net>"]
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license.workspace = true
|
license.workspace = true
|
||||||
description = "Functions and types for Nym client <> Gateway connections"
|
|
||||||
repository.workspace = true
|
repository.workspace = true
|
||||||
homepage.workspace = true
|
homepage.workspace = true
|
||||||
documentation.workspace = true
|
documentation.workspace = true
|
||||||
|
rust-version.workspace = true
|
||||||
|
readme.workspace = true
|
||||||
|
publish = true
|
||||||
|
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|
||||||
|
|||||||
@@ -1,13 +1,16 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "nym-mixnet-client"
|
name = "nym-mixnet-client"
|
||||||
|
description = "Client for Mix Node <> Mix Node & Mix Node <> Gateway communication"
|
||||||
version.workspace = true
|
version.workspace = true
|
||||||
authors = ["Jedrzej Stuczynski <andrew@nymtech.net>"]
|
authors = ["Jedrzej Stuczynski <andrew@nymtech.net>"]
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license.workspace = true
|
license.workspace = true
|
||||||
description = "Client for Mix Node <> Mix Node & Mix Node <> Gateway communication"
|
|
||||||
repository.workspace = true
|
repository.workspace = true
|
||||||
homepage.workspace = true
|
homepage.workspace = true
|
||||||
documentation.workspace = true
|
documentation.workspace = true
|
||||||
|
rust-version.workspace = true
|
||||||
|
readme.workspace = true
|
||||||
|
publish = true
|
||||||
|
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|
||||||
@@ -31,3 +34,4 @@ client = ["tokio-util", "nym-task", "tokio/net", "tokio/rt"]
|
|||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
nym-crypto = { workspace = true }
|
nym-crypto = { workspace = true }
|
||||||
rand = { workspace = true }
|
rand = { workspace = true }
|
||||||
|
tokio = { workspace = true, features = ["macros", "io-util", "rt", "rt-multi-thread"] }
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
// SPDX-License-Identifier: Apache-2.0
|
// SPDX-License-Identifier: Apache-2.0
|
||||||
|
|
||||||
use dashmap::DashMap;
|
use dashmap::DashMap;
|
||||||
use futures::StreamExt;
|
use futures::{SinkExt, StreamExt};
|
||||||
use nym_noise::config::NoiseConfig;
|
use nym_noise::config::NoiseConfig;
|
||||||
use nym_noise::upgrade_noise_initiator;
|
use nym_noise::upgrade_noise_initiator;
|
||||||
use nym_sphinx::forwarding::packet::MixPacket;
|
use nym_sphinx::forwarding::packet::MixPacket;
|
||||||
@@ -14,6 +14,7 @@ use std::ops::Deref;
|
|||||||
use std::sync::atomic::{AtomicU32, AtomicUsize, Ordering};
|
use std::sync::atomic::{AtomicU32, AtomicUsize, Ordering};
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
|
use tokio::io::{AsyncRead, AsyncWrite};
|
||||||
use tokio::net::TcpStream;
|
use tokio::net::TcpStream;
|
||||||
use tokio::sync::mpsc;
|
use tokio::sync::mpsc;
|
||||||
use tokio::sync::mpsc::error::TrySendError;
|
use tokio::sync::mpsc::error::TrySendError;
|
||||||
@@ -90,13 +91,17 @@ impl Deref for ActiveConnections {
|
|||||||
pub struct ConnectionSender {
|
pub struct ConnectionSender {
|
||||||
channel: mpsc::Sender<FramedNymPacket>,
|
channel: mpsc::Sender<FramedNymPacket>,
|
||||||
current_reconnection_attempt: Arc<AtomicU32>,
|
current_reconnection_attempt: Arc<AtomicU32>,
|
||||||
|
// Identifies the `ManagedConnection` task currently owning this entry; used
|
||||||
|
// to ensure drop-time eviction only fires on the still-owning task.
|
||||||
|
handle_token: Arc<()>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl ConnectionSender {
|
impl ConnectionSender {
|
||||||
fn new(channel: mpsc::Sender<FramedNymPacket>) -> Self {
|
fn new(channel: mpsc::Sender<FramedNymPacket>, handle_token: Arc<()>) -> Self {
|
||||||
ConnectionSender {
|
ConnectionSender {
|
||||||
channel,
|
channel,
|
||||||
current_reconnection_attempt: Arc::new(AtomicU32::new(0)),
|
current_reconnection_attempt: Arc::new(AtomicU32::new(0)),
|
||||||
|
handle_token,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -107,6 +112,31 @@ struct ManagedConnection {
|
|||||||
message_receiver: ReceiverStream<FramedNymPacket>,
|
message_receiver: ReceiverStream<FramedNymPacket>,
|
||||||
connection_timeout: Duration,
|
connection_timeout: Duration,
|
||||||
current_reconnection: Arc<AtomicU32>,
|
current_reconnection: Arc<AtomicU32>,
|
||||||
|
active_connections: ActiveConnections,
|
||||||
|
handle_token: Arc<()>,
|
||||||
|
}
|
||||||
|
|
||||||
|
// Evicts the cache entry on task exit (only if still owned by this task).
|
||||||
|
// Without this, a stale `ConnectionSender` survives after the peer disconnects
|
||||||
|
// and the next outbound packet is silently swallowed by the dead TCP.
|
||||||
|
struct EvictOnDrop {
|
||||||
|
active_connections: ActiveConnections,
|
||||||
|
address: SocketAddr,
|
||||||
|
handle_token: Arc<()>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Drop for EvictOnDrop {
|
||||||
|
fn drop(&mut self) {
|
||||||
|
let address = self.address;
|
||||||
|
let handle_token = &self.handle_token;
|
||||||
|
self.active_connections.remove_if(&address, |_, sender| {
|
||||||
|
Arc::ptr_eq(&sender.handle_token, handle_token)
|
||||||
|
});
|
||||||
|
trace!(
|
||||||
|
peer = %address,
|
||||||
|
"managed connection task exited; evicted owning cache entry"
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl ManagedConnection {
|
impl ManagedConnection {
|
||||||
@@ -116,6 +146,8 @@ impl ManagedConnection {
|
|||||||
message_receiver: mpsc::Receiver<FramedNymPacket>,
|
message_receiver: mpsc::Receiver<FramedNymPacket>,
|
||||||
connection_timeout: Duration,
|
connection_timeout: Duration,
|
||||||
current_reconnection: Arc<AtomicU32>,
|
current_reconnection: Arc<AtomicU32>,
|
||||||
|
active_connections: ActiveConnections,
|
||||||
|
handle_token: Arc<()>,
|
||||||
) -> Self {
|
) -> Self {
|
||||||
ManagedConnection {
|
ManagedConnection {
|
||||||
address,
|
address,
|
||||||
@@ -123,72 +155,30 @@ impl ManagedConnection {
|
|||||||
message_receiver: ReceiverStream::new(message_receiver),
|
message_receiver: ReceiverStream::new(message_receiver),
|
||||||
connection_timeout,
|
connection_timeout,
|
||||||
current_reconnection,
|
current_reconnection,
|
||||||
|
active_connections,
|
||||||
|
handle_token,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn run(self) {
|
async fn run(self) {
|
||||||
let address = self.address;
|
let address = self.address;
|
||||||
|
let _evict_guard = EvictOnDrop {
|
||||||
|
active_connections: self.active_connections,
|
||||||
|
address,
|
||||||
|
handle_token: self.handle_token,
|
||||||
|
};
|
||||||
|
|
||||||
let reconnection_attempt = self.current_reconnection.load(Ordering::Acquire);
|
let reconnection_attempt = self.current_reconnection.load(Ordering::Acquire);
|
||||||
let connect_start = tokio::time::Instant::now();
|
let connect_start = tokio::time::Instant::now();
|
||||||
let connection_fut = TcpStream::connect(address);
|
let connection_fut = TcpStream::connect(address);
|
||||||
|
|
||||||
let conn = match tokio::time::timeout(self.connection_timeout, connection_fut).await {
|
// 1. attempt to establish the connection with timeout
|
||||||
Ok(stream_res) => match stream_res {
|
let maybe_stream = match tokio::time::timeout(self.connection_timeout, connection_fut).await
|
||||||
Ok(stream) => {
|
{
|
||||||
let connect_ms = connect_start.elapsed().as_millis() as u64;
|
Ok(stream) => stream,
|
||||||
debug!(
|
|
||||||
peer = %address,
|
|
||||||
connect_ms,
|
|
||||||
"Managed to establish connection to {}", self.address
|
|
||||||
);
|
|
||||||
|
|
||||||
let noise_start = tokio::time::Instant::now();
|
|
||||||
let noise_stream =
|
|
||||||
match upgrade_noise_initiator(stream, &self.noise_config).await {
|
|
||||||
Ok(noise_stream) => noise_stream,
|
|
||||||
Err(err) => {
|
|
||||||
let noise_handshake_ms = noise_start.elapsed().as_millis() as u64;
|
|
||||||
warn!(
|
|
||||||
event = "connection.failed.noise",
|
|
||||||
peer = %address,
|
|
||||||
error = %err,
|
|
||||||
connect_ms,
|
|
||||||
noise_handshake_ms,
|
|
||||||
reconnection_attempt,
|
|
||||||
exit_reason = "noise_error",
|
|
||||||
"Failed to perform Noise initiator handshake with {address}"
|
|
||||||
);
|
|
||||||
self.current_reconnection.fetch_add(1, Ordering::SeqCst);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
let noise_handshake_ms = noise_start.elapsed().as_millis() as u64;
|
|
||||||
self.current_reconnection.store(0, Ordering::Release);
|
|
||||||
debug!(
|
|
||||||
peer = %address,
|
|
||||||
connect_ms,
|
|
||||||
noise_handshake_ms,
|
|
||||||
"Noise initiator handshake completed for {:?}", address
|
|
||||||
);
|
|
||||||
Framed::new(noise_stream, NymCodec)
|
|
||||||
}
|
|
||||||
Err(err) => {
|
|
||||||
let connect_ms = connect_start.elapsed().as_millis() as u64;
|
|
||||||
warn!(
|
|
||||||
event = "connection.failed.connect",
|
|
||||||
peer = %address,
|
|
||||||
error = %err,
|
|
||||||
connect_ms,
|
|
||||||
reconnection_attempt,
|
|
||||||
exit_reason = "connect_error",
|
|
||||||
"failed to establish connection to {address}"
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
Err(_) => {
|
Err(_) => {
|
||||||
let connect_ms = connect_start.elapsed().as_millis() as u64;
|
let connect_ms = connect_start.elapsed().as_millis() as u64;
|
||||||
warn!(
|
debug!(
|
||||||
event = "connection.failed.timeout",
|
event = "connection.failed.timeout",
|
||||||
peer = %address,
|
peer = %address,
|
||||||
timeout_ms = self.connection_timeout.as_millis() as u64,
|
timeout_ms = self.connection_timeout.as_millis() as u64,
|
||||||
@@ -203,21 +193,133 @@ impl ManagedConnection {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
if let Err(err) = self.message_receiver.map(Ok).forward(conn).await {
|
// 2. check if it actually succeeded
|
||||||
warn!(
|
let stream = match maybe_stream {
|
||||||
event = "connection.forward_error",
|
Ok(stream) => stream,
|
||||||
peer = %address,
|
Err(err) => {
|
||||||
error = %err,
|
let connect_ms = connect_start.elapsed().as_millis() as u64;
|
||||||
exit_reason = "forward_error",
|
debug!(
|
||||||
"Failed to forward packets to {address}: {err}"
|
event = "connection.failed.connect",
|
||||||
);
|
peer = %address,
|
||||||
}
|
error = %err,
|
||||||
|
connect_ms,
|
||||||
|
reconnection_attempt,
|
||||||
|
exit_reason = "connect_error",
|
||||||
|
"failed to establish connection to {address}"
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
let connect_ms = connect_start.elapsed().as_millis() as u64;
|
||||||
debug!(
|
debug!(
|
||||||
peer = %address,
|
peer = %address,
|
||||||
exit_reason = "sender_dropped",
|
connect_ms,
|
||||||
"connection manager to {address} finished"
|
"Managed to establish connection to {}", self.address
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// 3. perform noise handshake (if applicable)
|
||||||
|
let noise_start = tokio::time::Instant::now();
|
||||||
|
let noise_stream = match upgrade_noise_initiator(stream, &self.noise_config).await {
|
||||||
|
Ok(noise_stream) => noise_stream,
|
||||||
|
Err(err) => {
|
||||||
|
let noise_handshake_ms = noise_start.elapsed().as_millis() as u64;
|
||||||
|
debug!(
|
||||||
|
event = "connection.failed.noise",
|
||||||
|
peer = %address,
|
||||||
|
error = %err,
|
||||||
|
connect_ms,
|
||||||
|
noise_handshake_ms,
|
||||||
|
reconnection_attempt,
|
||||||
|
exit_reason = "noise_error",
|
||||||
|
"Failed to perform Noise initiator handshake with {address}"
|
||||||
|
);
|
||||||
|
self.current_reconnection.fetch_add(1, Ordering::SeqCst);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
let noise_handshake_ms = noise_start.elapsed().as_millis() as u64;
|
||||||
|
self.current_reconnection.store(0, Ordering::Release);
|
||||||
|
debug!(
|
||||||
|
peer = %address,
|
||||||
|
connect_ms,
|
||||||
|
noise_handshake_ms,
|
||||||
|
"Noise initiator handshake completed for {:?}", address
|
||||||
|
);
|
||||||
|
let conn = Framed::new(noise_stream, NymCodec);
|
||||||
|
|
||||||
|
// 4. start handling the framed stream
|
||||||
|
run_io_loop(conn, self.message_receiver, address).await;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The connection is unidirectional (send-only); we read from it solely to
|
||||||
|
// notice peer FIN/RST while idle so we can evict the cache entry before the
|
||||||
|
// next outbound send finds it stale.
|
||||||
|
async fn run_io_loop<T>(
|
||||||
|
conn: Framed<T, NymCodec>,
|
||||||
|
mut receiver: ReceiverStream<FramedNymPacket>,
|
||||||
|
address: SocketAddr,
|
||||||
|
) where
|
||||||
|
T: AsyncRead + AsyncWrite + Unpin,
|
||||||
|
{
|
||||||
|
let (mut sink, mut stream) = conn.split();
|
||||||
|
|
||||||
|
loop {
|
||||||
|
tokio::select! {
|
||||||
|
msg = stream.next() => {
|
||||||
|
match msg {
|
||||||
|
None => {
|
||||||
|
debug!(
|
||||||
|
peer = %address,
|
||||||
|
exit_reason = "peer_closed",
|
||||||
|
"peer closed mixnet connection to {address}"
|
||||||
|
);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
Some(Err(err)) => {
|
||||||
|
debug!(
|
||||||
|
event = "connection.read_error",
|
||||||
|
peer = %address,
|
||||||
|
error = %err,
|
||||||
|
exit_reason = "read_error",
|
||||||
|
"read error on mixnet connection to {address}: {err}"
|
||||||
|
);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
Some(Ok(_)) => {
|
||||||
|
trace!(
|
||||||
|
peer = %address,
|
||||||
|
"unexpected inbound packet on mixnet connection to {address}; discarding"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
outgoing = receiver.next() => {
|
||||||
|
match outgoing {
|
||||||
|
None => {
|
||||||
|
debug!(
|
||||||
|
peer = %address,
|
||||||
|
exit_reason = "sender_dropped",
|
||||||
|
"connection manager to {address} finished"
|
||||||
|
);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
Some(packet) => {
|
||||||
|
if let Err(err) = sink.send(packet).await {
|
||||||
|
debug!(
|
||||||
|
event = "connection.forward_error",
|
||||||
|
peer = %address,
|
||||||
|
error = %err,
|
||||||
|
exit_reason = "forward_error",
|
||||||
|
"Failed to forward packet to {address}: {err}"
|
||||||
|
);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -264,13 +366,18 @@ impl Client {
|
|||||||
sender.try_send(pending_packet).unwrap();
|
sender.try_send(pending_packet).unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Ownership token for the task we're about to spawn; lets it tell
|
||||||
|
// on exit whether the cache entry still names it.
|
||||||
|
let handle_token = Arc::new(());
|
||||||
|
|
||||||
// if we already tried to connect to `address` before, grab the current attempt count
|
// if we already tried to connect to `address` before, grab the current attempt count
|
||||||
let current_reconnection_attempt =
|
let current_reconnection_attempt =
|
||||||
if let Some(mut existing) = self.active_connections.get_mut(&address) {
|
if let Some(mut existing) = self.active_connections.get_mut(&address) {
|
||||||
existing.channel = sender;
|
existing.channel = sender;
|
||||||
|
existing.handle_token = Arc::clone(&handle_token);
|
||||||
Arc::clone(&existing.current_reconnection_attempt)
|
Arc::clone(&existing.current_reconnection_attempt)
|
||||||
} else {
|
} else {
|
||||||
let new_entry = ConnectionSender::new(sender);
|
let new_entry = ConnectionSender::new(sender, Arc::clone(&handle_token));
|
||||||
let current_attempt = Arc::clone(&new_entry.current_reconnection_attempt);
|
let current_attempt = Arc::clone(&new_entry.current_reconnection_attempt);
|
||||||
self.active_connections.insert(address, new_entry);
|
self.active_connections.insert(address, new_entry);
|
||||||
current_attempt
|
current_attempt
|
||||||
@@ -285,6 +392,7 @@ impl Client {
|
|||||||
|
|
||||||
let connections_count = self.connections_count.clone();
|
let connections_count = self.connections_count.clone();
|
||||||
let noise_config = self.noise_config.clone();
|
let noise_config = self.noise_config.clone();
|
||||||
|
let active_connections = self.active_connections.clone();
|
||||||
tokio::spawn(async move {
|
tokio::spawn(async move {
|
||||||
// before executing the manager, wait for what was specified, if anything
|
// before executing the manager, wait for what was specified, if anything
|
||||||
if let Some(backoff) = backoff {
|
if let Some(backoff) = backoff {
|
||||||
@@ -299,6 +407,8 @@ impl Client {
|
|||||||
receiver,
|
receiver,
|
||||||
initial_connection_timeout,
|
initial_connection_timeout,
|
||||||
current_reconnection_attempt,
|
current_reconnection_attempt,
|
||||||
|
active_connections,
|
||||||
|
handle_token,
|
||||||
)
|
)
|
||||||
.run()
|
.run()
|
||||||
.await;
|
.await;
|
||||||
@@ -342,7 +452,7 @@ impl SendWithoutResponse for Client {
|
|||||||
sending_res.map_err(|err| {
|
sending_res.map_err(|err| {
|
||||||
match err {
|
match err {
|
||||||
TrySendError::Full(_) => {
|
TrySendError::Full(_) => {
|
||||||
warn!(
|
trace!(
|
||||||
event = "mixclient.try_send",
|
event = "mixclient.try_send",
|
||||||
peer = %address,
|
peer = %address,
|
||||||
result = "full_dropped",
|
result = "full_dropped",
|
||||||
@@ -428,4 +538,102 @@ mod tests {
|
|||||||
client.config.maximum_reconnection_backoff
|
client.config.maximum_reconnection_backoff
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn test_addr() -> SocketAddr {
|
||||||
|
"127.0.0.1:1".parse().unwrap()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn insert_with_token(
|
||||||
|
active: &ActiveConnections,
|
||||||
|
addr: SocketAddr,
|
||||||
|
token: Arc<()>,
|
||||||
|
) -> mpsc::Receiver<FramedNymPacket> {
|
||||||
|
let (tx, rx) = mpsc::channel(1);
|
||||||
|
active.insert(addr, ConnectionSender::new(tx, token));
|
||||||
|
rx
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn evict_on_drop_removes_entry_when_token_still_matches() {
|
||||||
|
let active = ActiveConnections::default();
|
||||||
|
let addr = test_addr();
|
||||||
|
let token = Arc::new(());
|
||||||
|
let _rx = insert_with_token(&active, addr, Arc::clone(&token));
|
||||||
|
|
||||||
|
assert!(active.get(&addr).is_some());
|
||||||
|
|
||||||
|
{
|
||||||
|
let _guard = EvictOnDrop {
|
||||||
|
active_connections: active.clone(),
|
||||||
|
address: addr,
|
||||||
|
handle_token: token,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
assert!(
|
||||||
|
active.get(&addr).is_none(),
|
||||||
|
"owning task's drop should evict the entry"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn evict_on_drop_preserves_entry_replaced_by_newer_make_connection() {
|
||||||
|
// Simulates the race: old task's run() has returned, but before its
|
||||||
|
// drop guard fires, a concurrent `make_connection` replaced the
|
||||||
|
// entry's channel + handle_token with a fresh task's token.
|
||||||
|
let active = ActiveConnections::default();
|
||||||
|
let addr = test_addr();
|
||||||
|
let old_token = Arc::new(());
|
||||||
|
let new_token = Arc::new(());
|
||||||
|
let _rx_new = insert_with_token(&active, addr, Arc::clone(&new_token));
|
||||||
|
|
||||||
|
{
|
||||||
|
let _guard = EvictOnDrop {
|
||||||
|
active_connections: active.clone(),
|
||||||
|
address: addr,
|
||||||
|
handle_token: old_token,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
assert!(
|
||||||
|
active.get(&addr).is_some(),
|
||||||
|
"old task's drop must not clobber the newer entry"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn io_loop_exits_when_peer_closes_idle_connection() {
|
||||||
|
// The fix's second half: while no packets are flowing, peer FIN/RST
|
||||||
|
// must still be observed so the cache entry can be evicted before the
|
||||||
|
// next send finds it stale.
|
||||||
|
let (a, b) = tokio::io::duplex(64);
|
||||||
|
let conn = Framed::new(a, NymCodec);
|
||||||
|
let (_tx, rx) = mpsc::channel(1);
|
||||||
|
|
||||||
|
let task = tokio::spawn(run_io_loop(conn, ReceiverStream::new(rx), test_addr()));
|
||||||
|
|
||||||
|
// Simulate peer closing both directions of the connection.
|
||||||
|
drop(b);
|
||||||
|
|
||||||
|
tokio::time::timeout(Duration::from_secs(1), task)
|
||||||
|
.await
|
||||||
|
.expect("io_loop must notice peer close while idle")
|
||||||
|
.expect("io_loop task must not panic");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn io_loop_exits_when_sender_dropped() {
|
||||||
|
let (a, _b) = tokio::io::duplex(64);
|
||||||
|
let conn = Framed::new(a, NymCodec);
|
||||||
|
let (tx, rx) = mpsc::channel(1);
|
||||||
|
|
||||||
|
let task = tokio::spawn(run_io_loop(conn, ReceiverStream::new(rx), test_addr()));
|
||||||
|
|
||||||
|
drop(tx);
|
||||||
|
|
||||||
|
tokio::time::timeout(Duration::from_secs(1), task)
|
||||||
|
.await
|
||||||
|
.expect("io_loop must exit when the upstream sender is dropped")
|
||||||
|
.expect("io_loop task must not panic");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user