Fix test

Add config http api port to gateway
ci: install protoc in nightly-nym-wallet-build
2023-10-18 13:07:02 +03:00 · 2023-10-18 12:48:35 +03:00 · 2023-10-17 23:39:28 +02:00 · 2023-10-17 23:02:41 +02:00 · 2023-10-17 22:58:25 +02:00 · 2023-10-17 22:57:24 +02:00
49 changed files with 758 additions and 448 deletions
@@ -0,0 +1,37 @@
+name: 'Install wasm-opt'
+description: 'Installs wasm-opt from binaryen'
+inputs:
+  version:
+    description: 'Version of wasm-opt to install'
+    default: '116'
+runs:
+  using: 'composite'
+  steps:
+    - name: Check platform compatibility
+      run: |
+        if [[ "$(uname)" != "Linux" ]]; then
+          echo "Error: This action is only compatible with Linux."
+          exit 1
+        fi
+      shell: bash
+
+    - name: Download wasm-opt
+      run: |
+        set -e
+        SOURCE="https://github.com/WebAssembly/binaryen/releases/download/version_${{ inputs.version }}/binaryen-version_${{ inputs.version }}-x86_64-linux.tar.gz"
+        TEMP_ARCHIVE="$RUNNER_TEMP/binaryen-version_${{ inputs.version }}-x86_64-linux.tar.gz"
+        curl -L -o "$TEMP_ARCHIVE" "$SOURCE"
+        tar -xvzf $TEMP_ARCHIVE -C $RUNNER_TEMP
+        echo "$RUNNER_TEMP/binaryen-version_${{ inputs.version }}/bin" >> $GITHUB_PATH
+      shell: bash
+      id: install-binary
+
+    - name: Verify installation
+      run: |
+        if ! command -v wasm-opt &> /dev/null; then
+          echo "Error: wasm-opt binary was not installed successfully."
+          exit 1
+        fi
+      shell: bash
+      id: verify-installation
+
@@ -1,16 +1,16 @@
-name: Build and upload binaries to artifact storage
+name: build-upload-binaries

 on:
  workflow_dispatch:
-    inputs:  
+    inputs:
      add_tokio_unstable:
        description: 'True to add RUSTFLAGS="--cfg tokio_unstable"'
        required: true
        default: false
-        type: boolean 
-    
+        type: boolean
+
 env:
-  NETWORK: mainnet    
+  NETWORK: mainnet

 jobs:
  publish-nym:
@@ -9,7 +9,7 @@ on:

 jobs:
  build:
-    runs-on: custom-runner-linux
+    runs-on: custom-linux
    steps:
      - uses: actions/checkout@v3
      - name: Install rsync
@@ -31,8 +31,8 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        platform: [custom-runner-linux]
-         
+        platform: [custom-linux]
+
    runs-on: ${{ matrix.platform }}
    steps:
      - uses: actions/checkout@v3
@@ -45,12 +45,12 @@ jobs:
        uses: actions-rs/toolchain@v1
        with:
          toolchain: stable
-          
+
      - name: Branch name
        run: echo running on branch ${GITHUB_REF##*/}
-                    
+
      - name: Run tests against binaries
        run: ./build_and_run.sh ${{ github.head_ref || github.ref_name }}
        working-directory: tests/
-        
-      
+
+
@@ -1,7 +1,7 @@
 name: ci-build-ts

 on:
-  push:
+  pull_request:
    paths:
      - "ts-packages/**"
      - "sdk/typescript/**"
@@ -2,20 +2,6 @@ name: ci-build-upload-binaries

 on:
  workflow_dispatch:
-  push:
-    paths:
-      - 'clients/**'
-      - 'common/**'
-      - 'explorer-api/**'
-      - 'gateway/**'
-      - 'integrations/**'
-      - 'mixnode/**'
-      - 'sdk/rust/nym-sdk/**'
-      - 'service-providers/**'
-      - 'nym-api/**'
-      - 'nym-outfox/**'
-      - 'tools/nym-cli/**'
-      - 'tools/ts-rs-cli/**'
  pull_request:
    paths:
      - 'clients/**'
@@ -31,9 +17,6 @@ on:
      - 'tools/nym-cli/**'
      - 'tools/ts-rs-cli/**'

-env:
-  NETWORK: mainnet
-
 jobs:
  publish-nym:
    strategy:
@@ -44,8 +27,6 @@ jobs:
    runs-on: ${{ matrix.platform }}
    env:
      CARGO_TERM_COLOR: always
-    # a push event from the origin repo, or a PR from external repo
-    if: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name != 'nymtech/nym' }}
    steps:
      - uses: actions/checkout@v3

@@ -59,8 +40,7 @@ jobs:
          echo $OUTPUT_DIR

      - name: Install Dependencies (Linux)
-        run: sudo apt-get update && sudo apt-get -y install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools protobuf-compiler
-        continue-on-error: true
+        run: sudo apt update && sudo apt install libudev-dev

      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
@@ -48,9 +48,6 @@ jobs:
    runs-on: ${{ matrix.os }}
    env:
      CARGO_TERM_COLOR: always
-    # Enable sccache via environment variable
-    # env:
-      # RUSTC_WRAPPER: /home/ubuntu/.cargo/bin/sccache
    steps:
      - name: Install Dependencies (Linux)
        run: sudo apt-get update && sudo apt-get -y install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools protobuf-compiler
@@ -2,10 +2,6 @@ name: ci-contracts-schema

 on:
  workflow_dispatch:
-  push:
-    paths:
-      - 'contracts/**'
-      - 'common/**'
  pull_request:
    paths:
      - 'contracts/**'
@@ -14,7 +10,7 @@ on:
 jobs:
  check-schema:
    name: Generate and check schema
-    runs-on: custom-runner-linux
+    runs-on: custom-linux
    env:
      CARGO_TERM_COLOR: always
    steps:
@@ -2,10 +2,6 @@ name: ci-contracts-upload-binaries

 on:
  workflow_dispatch:
-  push:
-    paths:
-      - 'common/**'
-      - 'contracts/**'
  pull_request:
    paths:
      - 'common/**'
@@ -24,8 +20,6 @@ jobs:
    runs-on: ${{ matrix.platform }}
    env:
      CARGO_TERM_COLOR: always
-    # a push event from the origin repo, or a PR from external repo
-    if: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name != 'nymtech/nym' }}
    steps:
      - uses: actions/checkout@v3

@@ -38,10 +32,6 @@ jobs:
          mkdir -p $OUTPUT_DIR
          echo $OUTPUT_DIR

-      - name: Install Dependencies (Linux)
-        run: sudo apt-get update && sudo apt-get -y install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools protobuf-compiler
-        continue-on-error: true
-
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
@@ -50,7 +40,9 @@ jobs:
          override: true

      - name: Install wasm-opt
-        run: cargo install --version 0.112.0 wasm-opt
+        uses: ./.github/actions/install-wasm-opt
+        with:
+          version: '112'

      - name: Build release contracts
        run: make contracts
@@ -9,7 +9,7 @@ on:

 jobs:
  build:
-    runs-on: custom-runner-linux
+    runs-on: custom-linux
    steps:
      - uses: actions/checkout@v3
      - name: Install rsync
@@ -35,9 +35,13 @@ jobs:
            --vers "^1.8.0" mdbook-admonish --force && cargo install --vers \
            "^0.1.2" mdbook-last-changed && cargo install --vers "^0.1.2" mdbook-theme \
            && cargo install --vers "^0.7.7" mdbook-linkcheck \
-            && mdbook-admonish install
+            # && cd documentation \
+            # && mdbook-admonish install dev-portal \
+            # && mdbook-admonish install docs \
+            # && mdbook-admonish install operators
+
      - name: Build all projects in documentation/ & move to ~/dist/docs/
-        run: cd documentation && ./build_all_to_dist.sh
+        run: cd documentation && ./build_all_to_dist.sh 
        continue-on-error: false
      - name: Deploy branch to CI www
        continue-on-error: true
@@ -1,15 +1,6 @@
 name: ci-lint-typescript

 on:
-  push:
-    paths:
-      - "ts-packages/**"
-      - "sdk/typescript/**"
-      - "nym-connect/desktop/src/**"
-      - "nym-connect/desktop/package.json"
-      - "nym-wallet/src/**"
-      - "nym-wallet/package.json"
-      - "explorer/**"
  pull_request:
    paths:
      - "ts-packages/**"
@@ -37,10 +28,14 @@ jobs:
        uses: actions-rs/toolchain@v1
        with:
          toolchain: stable
+
      - name: Install wasm-pack
        run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
+
      - name: Install wasm-opt
-        run: cargo install wasm-opt
+        uses: ./.github/actions/install-wasm-opt
+        with:
+          version: '116'

      - name: Set up Go
        uses: actions/setup-go@v4
@@ -1,16 +1,6 @@
 name: ci-nym-connect-desktop-rust

 on:
-  push:
-    paths:
-      - "nym-connect/desktop/src-tauri/**"
-      - "nym-connect/desktop/src-tauri/Cargo.toml"
-      - "clients/client-core/**"
-      - "clients/socks5/**"
-      - "common/**"
-      - "gateway/gateway-requests/**"
-      - "contracts/vesting/**"
-      - "nym-api/nym-api-requests/**"
  pull_request:
    paths:
      - "nym-connect/desktop/src-tauri/**"
@@ -27,8 +17,6 @@ jobs:
    runs-on: [self-hosted, custom-linux]
    env:
      CARGO_TERM_COLOR: always
-    # env:
-    #   RUSTC_WRAPPER: /home/ubuntu/.cargo/bin/sccache
    steps:
      - name: Install Dependencies (Linux)
        run: sudo apt-get update && sudo apt-get -y install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev squashfs-tools libayatana-appindicator3-dev
@@ -1,7 +1,7 @@
 name: ci-nym-connect-desktop

 on:
-  push:
+  pull_request:
    paths:
      - 'nym-connect/desktop/**'

@@ -11,7 +11,7 @@ defaults:

 jobs:
  build:
-    runs-on: custom-runner-linux
+    runs-on: custom-linux
    steps:
    - uses: actions/checkout@v2
    - name: Install rsync
@@ -12,7 +12,7 @@ defaults:

 jobs:
  build:
-    runs-on: custom-runner-linux
+    runs-on: custom-linux
    steps:
    - uses: actions/checkout@v2
    - name: Install rsync
@@ -19,8 +19,6 @@ jobs:
    runs-on: [ self-hosted, custom-linux ]
    env:
      CARGO_TERM_COLOR: always
-    # env:
-    #   RUSTC_WRAPPER: /home/ubuntu/.cargo/bin/sccache
    steps:
      - name: Install Dependencies (Linux)
        run: sudo apt-get update && sudo apt-get -y install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev squashfs-tools
@@ -1,35 +1,44 @@
-name: Nym Wallet Storybook
+name: ci-nym-wallet-storybook

 on:
-  push:
+  pull_request:
    paths:
      - 'nym-wallet/**'

 jobs:
  build:
-    runs-on: custom-runner-linux
+    runs-on: custom-linux
    steps:
    - uses: actions/checkout@v2
+
    - name: Install rsync
      run: sudo apt-get install rsync
      continue-on-error: true
+
    - uses: rlespinasse/github-slug-action@v3.x
+
    - uses: actions/setup-node@v3
      with:
        node-version: 18
+
    - name: Setup yarn
      run: npm install -g yarn
+
    - name: Install Rust stable
      uses: actions-rs/toolchain@v1
      with:
        toolchain: stable
+
    - name: Install wasm-pack
-      run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh      
+      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
@@ -41,9 +50,11 @@ jobs:
        REMOTE_USER: ${{ secrets.CI_WWW_REMOTE_USER }}
        TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/wallet-${{ env.GITHUB_REF_SLUG }}
        EXCLUDE: "/dist/, /node_modules/"
+
    - name: Matrix - Node Install
      run: npm install
      working-directory: .github/workflows/support-files
+
    - name: Matrix - Send Notification
      env:
        NYM_NOTIFICATION_KIND: nym-wallet
@@ -1,10 +1,6 @@
 name: ci-sdk-docs-typescript

 on:
-  push:
-    paths:
-      - "sdk/typescript/**"
-      - "wasm/**"
  pull_request:
    paths:
      - "sdk/typescript/**"
@@ -12,7 +8,7 @@ on:

 jobs:
  build:
-    runs-on: custom-runner-linux
+    runs-on: custom-linux
    steps:
      - uses: actions/checkout@v2
      - name: Install rsync
@@ -34,6 +30,14 @@ jobs:
        with:
          go-version: '1.20'

+      - name: Install wasm-pack
+        run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
+
+      - name: Install wasm-opt
+        uses: ./.github/actions/install-wasm-opt
+        with:
+          version: '116'
+
      - name: Build branch WASM packages
        run: make sdk-wasm-build

@@ -9,7 +9,7 @@ on:

 jobs:
  wasm:
-    runs-on: [custom-runner-linux]
+    runs-on: [custom-linux]
    env:
      CARGO_TERM_COLOR: always
    steps:
@@ -18,7 +18,7 @@ jobs:
      - uses: actions/setup-node@v3
        with:
          node-version: 18
-          
+
      - uses: actions-rs/toolchain@v1
        with:
          profile: minimal
@@ -32,12 +32,13 @@ jobs:
        with:
          go-version: '1.20'

-
      - name: Install wasm-pack
        run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh

      - name: Install wasm-opt
-        run: cargo install wasm-opt
+        uses: ./.github/actions/install-wasm-opt
+        with:
+          version: '116'

      - name: Install wasm-bindgen-cli
        run: cargo install wasm-bindgen-cli
@@ -1,4 +1,4 @@
-name: Greetings
+name: greetings

 on: [pull_request_target, issues]

@@ -70,7 +70,7 @@ jobs:

  notification:
    needs: build
-    runs-on: custom-runner-linux
+    runs-on: custom-linux
    steps:
      - name: Collect jobs status
        uses: technote-space/workflow-conclusion-action@v2
@@ -35,6 +35,9 @@ jobs:
          override: true
          components: rustfmt, clippy

+      - name: Install Protoc
+        uses: arduino/setup-protoc@v2
+
      - name: Check formatting
        uses: actions-rs/cargo@v1
        with:
@@ -68,7 +71,7 @@ jobs:

  notification:
    needs: build
-    runs-on: custom-runner-linux
+    runs-on: custom-linux
    steps:
      - name: Collect jobs status
        uses: technote-space/workflow-conclusion-action@v2
@@ -1,4 +1,4 @@
-name: Daily security audit
+name: nightly-security-audit

 on:
  schedule:
@@ -26,7 +26,7 @@ jobs:
          path: .github/workflows/support-files/notifications/deny.message
  notification:
    needs: cargo-deny
-    runs-on: custom-runner-linux
+    runs-on: custom-linux
    steps:
      - name: Check out repository code
        uses: actions/checkout@v2
@@ -1,4 +1,4 @@
-name: Nyms5 Android
+name: publish-nyms5-android-apk
 # unsigned APKs only, supported archs:
 # - arm64-v8a (arm64)
 # - x86_64
@@ -94,7 +94,7 @@ jobs:
  gh-release:
    name: Publish APK (GH release)
    needs: build
-    runs-on: custom-runner-linux
+    runs-on: custom-linux
    steps:
      - name: Checkout
        uses: actions/checkout@v3
@@ -84,6 +84,7 @@ pub struct GatewayNodeDetailsResponse {
    pub bind_address: String,
    pub mix_port: u16,
    pub clients_port: u16,
+    pub http_api_port: u16,
    pub config_path: String,
    pub data_store: String,

@@ -0,0 +1,52 @@
+use std::net::SocketAddr;
+
+use boringtun::x25519;
+use dashmap::{
+    mapref::one::{Ref, RefMut},
+    DashMap,
+};
+use tokio::sync::mpsc::{self};
+
+use crate::event::Event;
+
+pub(crate) type PeersByKey = DashMap<x25519::PublicKey, mpsc::UnboundedSender<Event>>;
+pub(crate) type PeersByAddr = DashMap<SocketAddr, mpsc::UnboundedSender<Event>>;
+
+#[derive(Default)]
+pub(crate) struct ActivePeers {
+    active_peers: PeersByKey,
+    active_peers_by_addr: PeersByAddr,
+}
+
+impl ActivePeers {
+    pub(crate) fn remove(&self, public_key: &x25519::PublicKey) {
+        log::info!("Removing peer: {public_key:?}");
+        self.active_peers.remove(public_key);
+        log::warn!("TODO: remove from peers_by_ip?");
+        log::warn!("TODO: remove from peers_by_addr");
+    }
+
+    pub(crate) fn insert(
+        &self,
+        public_key: x25519::PublicKey,
+        addr: SocketAddr,
+        peer_tx: mpsc::UnboundedSender<Event>,
+    ) {
+        self.active_peers.insert(public_key, peer_tx.clone());
+        self.active_peers_by_addr.insert(addr, peer_tx);
+    }
+
+    pub(crate) fn get_by_key_mut(
+        &self,
+        public_key: &x25519::PublicKey,
+    ) -> Option<RefMut<'_, x25519::PublicKey, mpsc::UnboundedSender<Event>>> {
+        self.active_peers.get_mut(public_key)
+    }
+
+    pub(crate) fn get_by_addr(
+        &self,
+        addr: &SocketAddr,
+    ) -> Option<Ref<'_, SocketAddr, mpsc::UnboundedSender<Event>>> {
+        self.active_peers_by_addr.get(addr)
+    }
+}
@@ -4,4 +4,6 @@ use thiserror::Error;
 pub enum WgError {
    #[error("unable to get tunnel")]
    UnableToGetTunnel,
+    #[error("handshake failed")]
+    HandshakeFailed,
 }
@@ -3,6 +3,7 @@
 // #![warn(clippy::expect_used)]
 // #![warn(clippy::unwrap_used)]

+mod active_peers;
 mod error;
 mod event;
 mod network_table;
@@ -17,7 +18,7 @@ mod wg_tunnel;
 use platform::linux::tun_device;

 #[derive(Clone)]
-struct TunTaskTx(tokio::sync::mpsc::UnboundedSender<Vec<u8>>);
+pub struct TunTaskTx(tokio::sync::mpsc::UnboundedSender<Vec<u8>>);

 impl TunTaskTx {
    fn send(&self, packet: Vec<u8>) -> Result<(), tokio::sync::mpsc::error::SendError<Vec<u8>>> {
@@ -39,10 +40,12 @@ pub async fn start_wireguard(
    let peers_by_ip = Arc::new(std::sync::Mutex::new(network_table::NetworkTable::new()));

    // Start the tun device that is used to relay traffic outbound
-    let tun_task_tx = tun_device::start_tun_device(peers_by_ip.clone());
+    let (tun, tun_task_tx) = tun_device::TunDevice::new(peers_by_ip.clone());
+    tun.start();

    // Start the UDP listener that clients connect to
-    udp_listener::start_udp_listener(tun_task_tx, peers_by_ip, task_client).await?;
+    let udp_listener = udp_listener::WgUdpListener::new(tun_task_tx, peers_by_ip).await?;
+    udp_listener.start(task_client);

    Ok(())
 }
@@ -4,7 +4,7 @@ use ip_network::IpNetwork;
 use ip_network_table::IpNetworkTable;

 #[derive(Default)]
-pub(crate) struct NetworkTable<T> {
+pub struct NetworkTable<T> {
    ips: IpNetworkTable<T>,
 }

@@ -28,72 +28,111 @@ fn setup_tokio_tun_device(name: &str, address: Ipv4Addr, netmask: Ipv4Addr) -> t
        .expect("Failed to setup tun device, do you have permission?")
 }

-pub(crate) fn start_tun_device(peers_by_ip: Arc<std::sync::Mutex<PeersByIp>>) -> TunTaskTx {
-    let tun = setup_tokio_tun_device(
-        format!("{TUN_BASE_NAME}%d").as_str(),
-        TUN_DEVICE_ADDRESS.parse().unwrap(),
-        TUN_DEVICE_NETMASK.parse().unwrap(),
-    );
-    log::info!("Created TUN device: {}", tun.name());
+pub struct TunDevice {
+    // The TUN device that we read/write to, to send/receive packets
+    tun: tokio_tun::Tun,

-    let (mut tun_device_rx, mut tun_device_tx) = tokio::io::split(tun);
+    // Incoming data that we should send
+    tun_task_rx: mpsc::UnboundedReceiver<Vec<u8>>,

-    // Channels to communicate with the other tasks
-    let (tun_task_tx, mut tun_task_rx) = mpsc::unbounded_channel::<Vec<u8>>();
-    let tun_task_tx = TunTaskTx(tun_task_tx);
+    // The routing table.
+    // An alternative would be to do NAT by just matching incoming with outgoing.
+    peers_by_ip: Arc<std::sync::Mutex<PeersByIp>>,
+}

-    tokio::spawn(async move {
+impl TunDevice {
+    pub fn new(peers_by_ip: Arc<std::sync::Mutex<PeersByIp>>) -> (Self, TunTaskTx) {
+        let tun = setup_tokio_tun_device(
+            format!("{TUN_BASE_NAME}%d").as_str(),
+            TUN_DEVICE_ADDRESS.parse().unwrap(),
+            TUN_DEVICE_NETMASK.parse().unwrap(),
+        );
+        log::info!("Created TUN device: {}", tun.name());
+
+        // Channels to communicate with the other tasks
+        let (tun_task_tx, tun_task_rx) = mpsc::unbounded_channel::<Vec<u8>>();
+        let tun_task_tx = TunTaskTx(tun_task_tx);
+
+        let tun_device = TunDevice {
+            tun_task_rx,
+            tun,
+            peers_by_ip,
+        };
+
+        (tun_device, tun_task_tx)
+    }
+
+    fn handle_tun_read(&self, packet: &[u8]) {
+        let dst_addr = boringtun::noise::Tunn::dst_address(packet).unwrap();
+
+        let headers = SlicedPacket::from_ip(packet).unwrap();
+        let src_addr = match headers.ip.unwrap() {
+            InternetSlice::Ipv4(ip, _) => ip.source_addr().to_string(),
+            InternetSlice::Ipv6(ip, _) => ip.source_addr().to_string(),
+        };
+        log::info!(
+            "iface: read Packet({src_addr} -> {dst_addr}, {} bytes)",
+            packet.len(),
+        );
+
+        // Route packet to the correct peer.
+        if let Some(peer_tx) = self
+            .peers_by_ip
+            .lock()
+            .unwrap()
+            .longest_match(dst_addr)
+            .map(|(_, tx)| tx)
+        {
+            log::info!("Forward packet to wg tunnel");
+            peer_tx
+                .send(Event::Ip(packet.to_vec().into()))
+                .tap_err(|err| log::error!("{err}"))
+                .unwrap();
+        } else {
+            log::info!("No peer found, packet dropped");
+        }
+    }
+
+    async fn handle_tun_write(&mut self, data: Vec<u8>) {
+        let headers = SlicedPacket::from_ip(&data).unwrap();
+        let (source_addr, destination_addr) = match headers.ip.unwrap() {
+            InternetSlice::Ipv4(ip, _) => (ip.source_addr(), ip.destination_addr()),
+            InternetSlice::Ipv6(_, _) => unimplemented!(),
+        };
+
+        log::info!(
+            "iface: write Packet({source_addr} -> {destination_addr}, {} bytes)",
+            data.len()
+        );
+        self.tun.write_all(&data).await.unwrap();
+    }
+
+    pub async fn run(mut self) {
        let mut buf = [0u8; 1024];
+
        loop {
            tokio::select! {
                // Reading from the TUN device
-                len = tun_device_rx.read(&mut buf) => match len {
+                len = self.tun.read(&mut buf) => match len {
                    Ok(len) => {
                        let packet = &buf[..len];
-                        let dst_addr = boringtun::noise::Tunn::dst_address(packet).unwrap();
-
-                        let headers = SlicedPacket::from_ip(packet).unwrap();
-                        let src_addr = match headers.ip.unwrap() {
-                            InternetSlice::Ipv4(ip, _) => ip.source_addr().to_string(),
-                            InternetSlice::Ipv6(ip, _) => ip.source_addr().to_string(),
-                        };
-                        log::info!("iface: read Packet({src_addr} -> {dst_addr}, {len} bytes)");
-
-                        // Route packet to the correct peer.
-                        if let Some(peer_tx) = peers_by_ip.lock().unwrap().longest_match(dst_addr).map(|(_, tx)| tx) {
-                            log::info!("Forward packet to wg tunnel");
-                            peer_tx
-                                .send(Event::Ip(packet.to_vec().into()))
-                                .tap_err(|err| log::error!("{err}"))
-                                .unwrap();
-                        } else {
-                            log::info!("No peer found, packet dropped");
-                        }
+                        self.handle_tun_read(packet);
                    },
                    Err(err) => {
                        log::info!("iface: read error: {err}");
                        break;
                    }
                },
-
                // Writing to the TUN device
-                Some(data) = tun_task_rx.recv() => {
-                    let headers = SlicedPacket::from_ip(&data).unwrap();
-                    let (source_addr, destination_addr) = match headers.ip.unwrap() {
-                        InternetSlice::Ipv4(ip, _) => (ip.source_addr(), ip.destination_addr()),
-                        InternetSlice::Ipv6(_, _) => unimplemented!(),
-                    };
-
-                    log::info!(
-                        "iface: write Packet({source_addr} -> {destination_addr}, {} bytes)",
-                        data.len()
-                    );
-                    // log::info!("iface: writing {} bytes", data.len());
-                    tun_device_tx.write_all(&data).await.unwrap();
+                Some(data) = self.tun_task_rx.recv() => {
+                    self.handle_tun_write(data).await;
                }
            }
        }
        log::info!("TUN device shutting down");
-    });
-    tun_task_tx
+    }
+
+    pub fn start(self) {
+        tokio::spawn(async move { self.run().await });
+    }
 }
@@ -4,7 +4,6 @@ use boringtun::{
    noise::{self, handshake::parse_handshake_anon, rate_limiter::RateLimiter, TunnResult},
    x25519,
 };
-use dashmap::DashMap;
 use futures::StreamExt;
 use log::error;
 use nym_task::TaskClient;
@@ -15,6 +14,8 @@ use tokio::{
 };

 use crate::{
+    active_peers::ActivePeers,
+    error::WgError,
    event::Event,
    network_table::NetworkTable,
    registered_peers::{RegisteredPeer, RegisteredPeers},
@@ -27,10 +28,6 @@ const MAX_PACKET: usize = 65535;
 // Registered peers
 pub(crate) type PeersByIp = NetworkTable<mpsc::UnboundedSender<Event>>;

-// Active peers
-pub(crate) type ActivePeers = DashMap<x25519::PublicKey, mpsc::UnboundedSender<Event>>;
-pub(crate) type PeersByAddr = DashMap<SocketAddr, mpsc::UnboundedSender<Event>>;
-
 async fn add_test_peer(registered_peers: &mut RegisteredPeers) {
    let peer_static_public = setup::peer_static_public_key();
    let peer_index = 0;
@@ -43,29 +40,62 @@ async fn add_test_peer(registered_peers: &mut RegisteredPeers) {
    registered_peers.insert(peer_static_public, test_peer).await;
 }

-pub(crate) async fn start_udp_listener(
-    tun_task_tx: TunTaskTx,
+pub struct WgUdpListener {
+    // Our private key
+    static_private: x25519::StaticSecret,
+
+    // Our public key
+    static_public: x25519::PublicKey,
+
+    // The list of registered peers that we allow
+    registered_peers: RegisteredPeers,
+
+    // The routing table, as defined by wireguard
    peers_by_ip: Arc<std::sync::Mutex<PeersByIp>>,
-    mut task_client: TaskClient,
-) -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
-    let wg_address = SocketAddr::new(WG_ADDRESS.parse().unwrap(), WG_PORT);
-    log::info!("Starting wireguard UDP listener on {wg_address}");
-    let udp = Arc::new(UdpSocket::bind(wg_address).await?);

-    // Setup our own keys
-    let static_private = setup::server_static_private_key();
-    let static_public = x25519::PublicKey::from(&static_private);
-    let handshake_max_rate = 100u64;
-    let rate_limiter = RateLimiter::new(&static_public, handshake_max_rate);
+    // The UDP socket to the peer
+    udp: Arc<UdpSocket>,

-    // Create a test peer for dev
-    let mut registered_peers = RegisteredPeers::default();
-    add_test_peer(&mut registered_peers).await;
+    // Send data to the TUN device for sending
+    tun_task_tx: TunTaskTx,

-    tokio::spawn(async move {
-        // The set of active tunnels indexed by the peer's address
-        let active_peers = Arc::new(ActivePeers::new());
-        let active_peers_by_addr = PeersByAddr::new();
+    // Wireguard rate limiter
+    rate_limiter: RateLimiter,
+}
+
+impl WgUdpListener {
+    pub async fn new(
+        tun_task_tx: TunTaskTx,
+        peers_by_ip: Arc<std::sync::Mutex<PeersByIp>>,
+    ) -> Result<Self, Box<dyn std::error::Error + Send + Sync + 'static>> {
+        let wg_address = SocketAddr::new(WG_ADDRESS.parse().unwrap(), WG_PORT);
+        log::info!("Starting wireguard UDP listener on {wg_address}");
+        let udp = Arc::new(UdpSocket::bind(wg_address).await?);
+
+        // Setup our own keys
+        let static_private = setup::server_static_private_key();
+        let static_public = x25519::PublicKey::from(&static_private);
+        let handshake_max_rate = 100u64;
+        let rate_limiter = RateLimiter::new(&static_public, handshake_max_rate);
+
+        // Create a test peer for dev
+        let mut registered_peers = RegisteredPeers::default();
+        add_test_peer(&mut registered_peers).await;
+
+        Ok(Self {
+            static_private,
+            static_public,
+            registered_peers,
+            peers_by_ip,
+            udp,
+            tun_task_tx,
+            rate_limiter,
+        })
+    }
+
+    pub async fn run(self, mut task_client: TaskClient) {
+        // The set of active tunnels
+        let active_peers = ActivePeers::default();
        // Each tunnel is run in its own task, and the task handle is stored here so we can remove
        // it from `active_peers` when the tunnel is closed
        let mut active_peers_task_handles = futures::stream::FuturesUnordered::new();
@@ -81,16 +111,13 @@ pub(crate) async fn start_udp_listener(
                }
                // Reset the rate limiter every 1 sec
                () = tokio::time::sleep(Duration::from_secs(1)) => {
-                    rate_limiter.reset_count();
+                    self.rate_limiter.reset_count();
                },
                // Handle tunnel closing
                Some(public_key) = active_peers_task_handles.next() => {
                    match public_key {
                        Ok(public_key) => {
-                            log::info!("Removing peer: {public_key:?}");
                            active_peers.remove(&public_key);
-                            log::warn!("TODO: remove from peers_by_ip?");
-                            log::warn!("TODO: remove from peers_by_addr");
                        }
                        Err(err) => {
                            error!("WireGuard UDP listener: error receiving shutdown from peer: {err}");
@@ -98,13 +125,13 @@ pub(crate) async fn start_udp_listener(
                    }
                },
                // Handle incoming packets
-                Ok((len, addr)) = udp.recv_from(&mut buf) => {
+                Ok((len, addr)) = self.udp.recv_from(&mut buf) => {
                    log::trace!("udp: received {} bytes from {}", len, addr);

                    // If this addr has already been encountered, send directly to tunnel
                    // TODO: optimization opportunity to instead create a connected UDP socket
                    // inside the wg tunnel, where you can recv the data directly.
-                    if let Some(peer_tx) = active_peers_by_addr.get(&addr) {
+                    if let Some(peer_tx) = active_peers.get_by_addr(&addr) {
                        log::info!("udp: received {len} bytes from {addr} from known peer");
                        peer_tx
                            .send(Event::Wg(buf[..len].to_vec().into()))
@@ -114,11 +141,11 @@ pub(crate) async fn start_udp_listener(
                    }

                    // Verify the incoming packet
-                    let verified_packet = match rate_limiter.verify_packet(Some(addr.ip()), &buf[..len], &mut dst_buf) {
+                    let verified_packet = match self.rate_limiter.verify_packet(Some(addr.ip()), &buf[..len], &mut dst_buf) {
                        Ok(packet) => packet,
                        Err(TunnResult::WriteToNetwork(cookie)) => {
                            log::info!("Send back cookie to: {addr}");
-                            udp.send_to(cookie, addr).await.tap_err(|e| log::error!("{e}")).ok();
+                            self.udp.send_to(cookie, addr).await.tap_err(|e| log::error!("{e}")).ok();
                            continue;
                        }
                        Err(err) => {
@@ -128,40 +155,25 @@ pub(crate) async fn start_udp_listener(
                    };

                    // Check if this is a registered peer, if not, just skip
-                    let registered_peer = {
-                        let reg_peer = match verified_packet {
-                            noise::Packet::HandshakeInit(ref packet) => {
-                                let Ok(handshake) = parse_handshake_anon(&static_private, &static_public, packet) else {
-                                    log::warn!("Handshake failed: {addr}");
-                                    continue;
-                                };
-                                registered_peers.get_by_key(&x25519::PublicKey::from(handshake.peer_static_public))
-                            },
-                            noise::Packet::HandshakeResponse(packet) => {
-                                let peer_idx = packet.receiver_idx >> 8;
-                                registered_peers.get_by_idx(peer_idx)
-                            },
-                            noise::Packet::PacketCookieReply(packet) => {
-                                let peer_idx = packet.receiver_idx >> 8;
-                                registered_peers.get_by_idx(peer_idx)
-                            },
-                            noise::Packet::PacketData(packet) => {
-                                let peer_idx = packet.receiver_idx >> 8;
-                                registered_peers.get_by_idx(peer_idx)
-                            },
-                        };
-
-                        match reg_peer {
-                            Some(reg_peer) => reg_peer.lock().await,
-                            None => {
-                                log::warn!("Peer not registered: {addr}");
-                                continue;
-                            }
+                    let registered_peer = match parse_peer(
+                        verified_packet,
+                        &self.registered_peers,
+                        &self.static_private,
+                        &self.static_public
+                    ) {
+                        Ok(Some(peer)) => peer.lock().await,
+                        Ok(None) => {
+                            log::warn!("Peer not registered: {addr}");
+                            continue;
                        }
+                        Err(err) => {
+                            log::error!("{err}");
+                            continue;
+                        },
                    };

                    // Look up if the peer is already connected
-                    if let Some(peer_tx) = active_peers.get_mut(&registered_peer.public_key) {
+                    if let Some(peer_tx) = active_peers.get_by_key_mut(&registered_peer.public_key) {
                        // We found the peer as connected, even though the addr was not known
                        log::info!("udp: received {len} bytes from {addr} which is a known peer with unknown addr");
                        peer_tx.send(Event::WgVerified(buf[..len].to_vec().into()))
@@ -175,30 +187,60 @@ pub(crate) async fn start_udp_listener(
                        log::warn!("Creating new rate limiter, consider re-using?");
                        let (join_handle, peer_tx) = crate::wg_tunnel::start_wg_tunnel(
                            addr,
-                            udp.clone(),
-                            static_private.clone(),
+                            self.udp.clone(),
+                            self.static_private.clone(),
                            registered_peer.public_key,
                            registered_peer.index,
                            registered_peer.allowed_ips,
-                            tun_task_tx.clone(),
+                            self.tun_task_tx.clone(),
                        );

-                        peers_by_ip.lock().unwrap().insert(registered_peer.allowed_ips, peer_tx.clone());
-                        active_peers_by_addr.insert(addr, peer_tx.clone());
+                        self.peers_by_ip.lock().unwrap().insert(registered_peer.allowed_ips, peer_tx.clone());

                        peer_tx.send(Event::Wg(buf[..len].to_vec().into()))
                            .tap_err(|e| log::error!("{e}"))
                            .ok();

-                        log::info!("Adding peer: {addr}");
-                        active_peers.insert(registered_peer.public_key, peer_tx);
+                        log::info!("Adding peer: {:?}: {addr}", registered_peer.public_key);
+                        active_peers.insert(registered_peer.public_key, addr, peer_tx);
                        active_peers_task_handles.push(join_handle);
                    }
                },
            }
        }
        log::info!("WireGuard listener: shutting down");
-    });
+    }

-    Ok(())
+    pub fn start(self, task_client: TaskClient) {
+        tokio::spawn(async move { self.run(task_client).await });
+    }
+}
+
+fn parse_peer<'a>(
+    verified_packet: noise::Packet,
+    registered_peers: &'a RegisteredPeers,
+    static_private: &x25519::StaticSecret,
+    static_public: &x25519::PublicKey,
+) -> Result<Option<&'a Arc<tokio::sync::Mutex<RegisteredPeer>>>, WgError> {
+    let registered_peer = match verified_packet {
+        noise::Packet::HandshakeInit(ref packet) => {
+            let Ok(handshake) = parse_handshake_anon(static_private, static_public, packet) else {
+                return Err(WgError::HandshakeFailed);
+            };
+            registered_peers.get_by_key(&x25519::PublicKey::from(handshake.peer_static_public))
+        }
+        noise::Packet::HandshakeResponse(packet) => {
+            let peer_idx = packet.receiver_idx >> 8;
+            registered_peers.get_by_idx(peer_idx)
+        }
+        noise::Packet::PacketCookieReply(packet) => {
+            let peer_idx = packet.receiver_idx >> 8;
+            registered_peers.get_by_idx(peer_idx)
+        }
+        noise::Packet::PacketData(packet) => {
+            let peer_idx = packet.receiver_idx >> 8;
+            registered_peers.get_by_idx(peer_idx)
+        }
+    };
+    Ok(registered_peer)
 }
@@ -43,7 +43,7 @@ turn-off = true

 [preprocessor.admonish]
 command = "mdbook-admonish"
-assets_version = "2.0.0" # do not edit: managed by `mdbook-admonish install`
+assets_version = "3.0.0" # do not edit: managed by `mdbook-admonish install`

 # variables preprocessor: import variables into files
 # https://gitlab.com/tglman/mdbook-variables/
@@ -76,7 +76,7 @@ curly-quotes = true
 # mathjax-support = false # useful if we want to pull equations in ?
 copy-fonts = true
 no-section-label = false
-additional-css = ["theme/pagetoc.css", "././mdbook-admonish.css", "custom.css"]
+additional-css = ["theme/pagetoc.css", "././mdbook-admonish.css", "custom.css", "./mdbook-admonish.css"]
 additional-js  = ["theme/pagetoc.js"]
 git-repository-url = "https://github.com/nymtech/nym"
 git-repository-icon = "fa-github"
@@ -1,31 +1,18 @@
@charset "UTF-8";
 :root {
-  --md-admonition-icon--note:
-    url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M20.71 7.04c.39-.39.39-1.04 0-1.41l-2.34-2.34c-.37-.39-1.02-.39-1.41 0l-1.84 1.83 3.75 3.75M3 17.25V21h3.75L17.81 9.93l-3.75-3.75L3 17.25z'/></svg>");
-  --md-admonition-icon--abstract:
-    url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M17 9H7V7h10m0 6H7v-2h10m-3 6H7v-2h7M12 3a1 1 0 0 1 1 1 1 1 0 0 1-1 1 1 1 0 0 1-1-1 1 1 0 0 1 1-1m7 0h-4.18C14.4 1.84 13.3 1 12 1c-1.3 0-2.4.84-2.82 2H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2V5a2 2 0 0 0-2-2z'/></svg>");
-  --md-admonition-icon--info:
-    url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M13 9h-2V7h2m0 10h-2v-6h2m-1-9A10 10 0 0 0 2 12a10 10 0 0 0 10 10 10 10 0 0 0 10-10A10 10 0 0 0 12 2z'/></svg>");
-  --md-admonition-icon--tip:
-    url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M17.66 11.2c-.23-.3-.51-.56-.77-.82-.67-.6-1.43-1.03-2.07-1.66C13.33 7.26 13 4.85 13.95 3c-.95.23-1.78.75-2.49 1.32-2.59 2.08-3.61 5.75-2.39 8.9.04.1.08.2.08.33 0 .22-.15.42-.35.5-.23.1-.47.04-.66-.12a.58.58 0 0 1-.14-.17c-1.13-1.43-1.31-3.48-.55-5.12C5.78 10 4.87 12.3 5 14.47c.06.5.12 1 .29 1.5.14.6.41 1.2.71 1.73 1.08 1.73 2.95 2.97 4.96 3.22 2.14.27 4.43-.12 6.07-1.6 1.83-1.66 2.47-4.32 1.53-6.6l-.13-.26c-.21-.46-.77-1.26-.77-1.26m-3.16 6.3c-.28.24-.74.5-1.1.6-1.12.4-2.24-.16-2.9-.82 1.19-.28 1.9-1.16 2.11-2.05.17-.8-.15-1.46-.28-2.23-.12-.74-.1-1.37.17-2.06.19.38.39.76.63 1.06.77 1 1.98 1.44 2.24 2.8.04.14.06.28.06.43.03.82-.33 1.72-.93 2.27z'/></svg>");
-  --md-admonition-icon--success:
-    url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='m9 20.42-6.21-6.21 2.83-2.83L9 14.77l9.88-9.89 2.83 2.83L9 20.42z'/></svg>");
-  --md-admonition-icon--question:
-    url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='m15.07 11.25-.9.92C13.45 12.89 13 13.5 13 15h-2v-.5c0-1.11.45-2.11 1.17-2.83l1.24-1.26c.37-.36.59-.86.59-1.41a2 2 0 0 0-2-2 2 2 0 0 0-2 2H8a4 4 0 0 1 4-4 4 4 0 0 1 4 4 3.2 3.2 0 0 1-.93 2.25M13 19h-2v-2h2M12 2A10 10 0 0 0 2 12a10 10 0 0 0 10 10 10 10 0 0 0 10-10c0-5.53-4.5-10-10-10z'/></svg>");
-  --md-admonition-icon--warning:
-    url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M13 14h-2V9h2m0 9h-2v-2h2M1 21h22L12 2 1 21z'/></svg>");
-  --md-admonition-icon--failure:
-    url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M20 6.91 17.09 4 12 9.09 6.91 4 4 6.91 9.09 12 4 17.09 6.91 20 12 14.91 17.09 20 20 17.09 14.91 12 20 6.91z'/></svg>");
-  --md-admonition-icon--danger:
-    url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M11 15H6l7-14v8h5l-7 14v-8z'/></svg>");
-  --md-admonition-icon--bug:
-    url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M14 12h-4v-2h4m0 6h-4v-2h4m6-6h-2.81a5.985 5.985 0 0 0-1.82-1.96L17 4.41 15.59 3l-2.17 2.17a6.002 6.002 0 0 0-2.83 0L8.41 3 7 4.41l1.62 1.63C7.88 6.55 7.26 7.22 6.81 8H4v2h2.09c-.05.33-.09.66-.09 1v1H4v2h2v1c0 .34.04.67.09 1H4v2h2.81c1.04 1.79 2.97 3 5.19 3s4.15-1.21 5.19-3H20v-2h-2.09c.05-.33.09-.66.09-1v-1h2v-2h-2v-1c0-.34-.04-.67-.09-1H20V8z'/></svg>");
-  --md-admonition-icon--example:
-    url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M7 13v-2h14v2H7m0 6v-2h14v2H7M7 7V5h14v2H7M3 8V5H2V4h2v4H3m-1 9v-1h3v4H2v-1h2v-.5H3v-1h1V17H2m2.25-7a.75.75 0 0 1 .75.75c0 .2-.08.39-.21.52L3.12 13H5v1H2v-.92L4 11H2v-1h2.25z'/></svg>");
-  --md-admonition-icon--quote:
-    url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M14 17h3l2-4V7h-6v6h3M6 17h3l2-4V7H5v6h3l-2 4z'/></svg>");
-  --md-details-icon:
-    url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M8.59 16.58 13.17 12 8.59 7.41 10 6l6 6-6 6-1.41-1.42Z'/></svg>");
+  --md-admonition-icon--admonish-note: url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M20.71 7.04c.39-.39.39-1.04 0-1.41l-2.34-2.34c-.37-.39-1.02-.39-1.41 0l-1.84 1.83 3.75 3.75M3 17.25V21h3.75L17.81 9.93l-3.75-3.75L3 17.25z'/></svg>");
+  --md-admonition-icon--admonish-abstract: url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M17 9H7V7h10m0 6H7v-2h10m-3 6H7v-2h7M12 3a1 1 0 0 1 1 1 1 1 0 0 1-1 1 1 1 0 0 1-1-1 1 1 0 0 1 1-1m7 0h-4.18C14.4 1.84 13.3 1 12 1c-1.3 0-2.4.84-2.82 2H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2V5a2 2 0 0 0-2-2z'/></svg>");
+  --md-admonition-icon--admonish-info: url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M13 9h-2V7h2m0 10h-2v-6h2m-1-9A10 10 0 0 0 2 12a10 10 0 0 0 10 10 10 10 0 0 0 10-10A10 10 0 0 0 12 2z'/></svg>");
+  --md-admonition-icon--admonish-tip: url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M17.66 11.2c-.23-.3-.51-.56-.77-.82-.67-.6-1.43-1.03-2.07-1.66C13.33 7.26 13 4.85 13.95 3c-.95.23-1.78.75-2.49 1.32-2.59 2.08-3.61 5.75-2.39 8.9.04.1.08.2.08.33 0 .22-.15.42-.35.5-.23.1-.47.04-.66-.12a.58.58 0 0 1-.14-.17c-1.13-1.43-1.31-3.48-.55-5.12C5.78 10 4.87 12.3 5 14.47c.06.5.12 1 .29 1.5.14.6.41 1.2.71 1.73 1.08 1.73 2.95 2.97 4.96 3.22 2.14.27 4.43-.12 6.07-1.6 1.83-1.66 2.47-4.32 1.53-6.6l-.13-.26c-.21-.46-.77-1.26-.77-1.26m-3.16 6.3c-.28.24-.74.5-1.1.6-1.12.4-2.24-.16-2.9-.82 1.19-.28 1.9-1.16 2.11-2.05.17-.8-.15-1.46-.28-2.23-.12-.74-.1-1.37.17-2.06.19.38.39.76.63 1.06.77 1 1.98 1.44 2.24 2.8.04.14.06.28.06.43.03.82-.33 1.72-.93 2.27z'/></svg>");
+  --md-admonition-icon--admonish-success: url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='m9 20.42-6.21-6.21 2.83-2.83L9 14.77l9.88-9.89 2.83 2.83L9 20.42z'/></svg>");
+  --md-admonition-icon--admonish-question: url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='m15.07 11.25-.9.92C13.45 12.89 13 13.5 13 15h-2v-.5c0-1.11.45-2.11 1.17-2.83l1.24-1.26c.37-.36.59-.86.59-1.41a2 2 0 0 0-2-2 2 2 0 0 0-2 2H8a4 4 0 0 1 4-4 4 4 0 0 1 4 4 3.2 3.2 0 0 1-.93 2.25M13 19h-2v-2h2M12 2A10 10 0 0 0 2 12a10 10 0 0 0 10 10 10 10 0 0 0 10-10c0-5.53-4.5-10-10-10z'/></svg>");
+  --md-admonition-icon--admonish-warning: url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M13 14h-2V9h2m0 9h-2v-2h2M1 21h22L12 2 1 21z'/></svg>");
+  --md-admonition-icon--admonish-failure: url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M20 6.91 17.09 4 12 9.09 6.91 4 4 6.91 9.09 12 4 17.09 6.91 20 12 14.91 17.09 20 20 17.09 14.91 12 20 6.91z'/></svg>");
+  --md-admonition-icon--admonish-danger: url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M11 15H6l7-14v8h5l-7 14v-8z'/></svg>");
+  --md-admonition-icon--admonish-bug: url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M14 12h-4v-2h4m0 6h-4v-2h4m6-6h-2.81a5.985 5.985 0 0 0-1.82-1.96L17 4.41 15.59 3l-2.17 2.17a6.002 6.002 0 0 0-2.83 0L8.41 3 7 4.41l1.62 1.63C7.88 6.55 7.26 7.22 6.81 8H4v2h2.09c-.05.33-.09.66-.09 1v1H4v2h2v1c0 .34.04.67.09 1H4v2h2.81c1.04 1.79 2.97 3 5.19 3s4.15-1.21 5.19-3H20v-2h-2.09c.05-.33.09-.66.09-1v-1h2v-2h-2v-1c0-.34-.04-.67-.09-1H20V8z'/></svg>");
+  --md-admonition-icon--admonish-example: url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M7 13v-2h14v2H7m0 6v-2h14v2H7M7 7V5h14v2H7M3 8V5H2V4h2v4H3m-1 9v-1h3v4H2v-1h2v-.5H3v-1h1V17H2m2.25-7a.75.75 0 0 1 .75.75c0 .2-.08.39-.21.52L3.12 13H5v1H2v-.92L4 11H2v-1h2.25z'/></svg>");
+  --md-admonition-icon--admonish-quote: url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M14 17h3l2-4V7h-6v6h3M6 17h3l2-4V7H5v6h3l-2 4z'/></svg>");
+  --md-details-icon: url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M8.59 16.58 13.17 12 8.59 7.41 10 6l6 6-6 6-1.41-1.42Z'/></svg>");
 }

 :is(.admonition) {
@@ -75,8 +62,9 @@ a.admonition-anchor-link::before {
  content: "§";
 }

-:is(.admonition-title, summary) {
+:is(.admonition-title, summary.admonition-title) {
  position: relative;
+  min-height: 4rem;
  margin-block: 0;
  margin-inline: -1.6rem -1.2rem;
  padding-block: 0.8rem;
@@ -85,13 +73,13 @@ a.admonition-anchor-link::before {
  background-color: rgba(68, 138, 255, 0.1);
  display: flex;
 }
-:is(.admonition-title, summary) p {
+:is(.admonition-title, summary.admonition-title) p {
  margin: 0;
 }
-html :is(.admonition-title, summary):last-child {
+html :is(.admonition-title, summary.admonition-title):last-child {
  margin-bottom: 0;
 }
-:is(.admonition-title, summary)::before {
+:is(.admonition-title, summary.admonition-title)::before {
  position: absolute;
  top: 0.625em;
  inset-inline-start: 1.6rem;
@@ -106,7 +94,7 @@ html :is(.admonition-title, summary):last-child {
  -webkit-mask-size: contain;
  content: "";
 }
-:is(.admonition-title, summary):hover a.admonition-anchor-link {
+:is(.admonition-title, summary.admonition-title):hover a.admonition-anchor-link {
  display: initial;
 }

@@ -131,204 +119,204 @@ details[open].admonition > summary.admonition-title::after {
  transform: rotate(90deg);
 }

-:is(.admonition):is(.note) {
+:is(.admonition):is(.admonish-note) {
  border-color: #448aff;
 }

-:is(.note) > :is(.admonition-title, summary) {
+:is(.admonish-note) > :is(.admonition-title, summary.admonition-title) {
  background-color: rgba(68, 138, 255, 0.1);
 }
-:is(.note) > :is(.admonition-title, summary)::before {
+:is(.admonish-note) > :is(.admonition-title, summary.admonition-title)::before {
  background-color: #448aff;
-  mask-image: var(--md-admonition-icon--note);
-  -webkit-mask-image: var(--md-admonition-icon--note);
+  mask-image: var(--md-admonition-icon--admonish-note);
+  -webkit-mask-image: var(--md-admonition-icon--admonish-note);
  mask-repeat: no-repeat;
  -webkit-mask-repeat: no-repeat;
  mask-size: contain;
  -webkit-mask-repeat: no-repeat;
 }

-:is(.admonition):is(.abstract, .summary, .tldr) {
+:is(.admonition):is(.admonish-abstract, .admonish-summary, .admonish-tldr) {
  border-color: #00b0ff;
 }

-:is(.abstract, .summary, .tldr) > :is(.admonition-title, summary) {
+:is(.admonish-abstract, .admonish-summary, .admonish-tldr) > :is(.admonition-title, summary.admonition-title) {
  background-color: rgba(0, 176, 255, 0.1);
 }
-:is(.abstract, .summary, .tldr) > :is(.admonition-title, summary)::before {
+:is(.admonish-abstract, .admonish-summary, .admonish-tldr) > :is(.admonition-title, summary.admonition-title)::before {
  background-color: #00b0ff;
-  mask-image: var(--md-admonition-icon--abstract);
-  -webkit-mask-image: var(--md-admonition-icon--abstract);
+  mask-image: var(--md-admonition-icon--admonish-abstract);
+  -webkit-mask-image: var(--md-admonition-icon--admonish-abstract);
  mask-repeat: no-repeat;
  -webkit-mask-repeat: no-repeat;
  mask-size: contain;
  -webkit-mask-repeat: no-repeat;
 }

-:is(.admonition):is(.info, .todo) {
+:is(.admonition):is(.admonish-info, .admonish-todo) {
  border-color: #00b8d4;
 }

-:is(.info, .todo) > :is(.admonition-title, summary) {
+:is(.admonish-info, .admonish-todo) > :is(.admonition-title, summary.admonition-title) {
  background-color: rgba(0, 184, 212, 0.1);
 }
-:is(.info, .todo) > :is(.admonition-title, summary)::before {
+:is(.admonish-info, .admonish-todo) > :is(.admonition-title, summary.admonition-title)::before {
  background-color: #00b8d4;
-  mask-image: var(--md-admonition-icon--info);
-  -webkit-mask-image: var(--md-admonition-icon--info);
+  mask-image: var(--md-admonition-icon--admonish-info);
+  -webkit-mask-image: var(--md-admonition-icon--admonish-info);
  mask-repeat: no-repeat;
  -webkit-mask-repeat: no-repeat;
  mask-size: contain;
  -webkit-mask-repeat: no-repeat;
 }

-:is(.admonition):is(.tip, .hint, .important) {
+:is(.admonition):is(.admonish-tip, .admonish-hint, .admonish-important) {
  border-color: #00bfa5;
 }

-:is(.tip, .hint, .important) > :is(.admonition-title, summary) {
+:is(.admonish-tip, .admonish-hint, .admonish-important) > :is(.admonition-title, summary.admonition-title) {
  background-color: rgba(0, 191, 165, 0.1);
 }
-:is(.tip, .hint, .important) > :is(.admonition-title, summary)::before {
+:is(.admonish-tip, .admonish-hint, .admonish-important) > :is(.admonition-title, summary.admonition-title)::before {
  background-color: #00bfa5;
-  mask-image: var(--md-admonition-icon--tip);
-  -webkit-mask-image: var(--md-admonition-icon--tip);
+  mask-image: var(--md-admonition-icon--admonish-tip);
+  -webkit-mask-image: var(--md-admonition-icon--admonish-tip);
  mask-repeat: no-repeat;
  -webkit-mask-repeat: no-repeat;
  mask-size: contain;
  -webkit-mask-repeat: no-repeat;
 }

-:is(.admonition):is(.success, .check, .done) {
+:is(.admonition):is(.admonish-success, .admonish-check, .admonish-done) {
  border-color: #00c853;
 }

-:is(.success, .check, .done) > :is(.admonition-title, summary) {
+:is(.admonish-success, .admonish-check, .admonish-done) > :is(.admonition-title, summary.admonition-title) {
  background-color: rgba(0, 200, 83, 0.1);
 }
-:is(.success, .check, .done) > :is(.admonition-title, summary)::before {
+:is(.admonish-success, .admonish-check, .admonish-done) > :is(.admonition-title, summary.admonition-title)::before {
  background-color: #00c853;
-  mask-image: var(--md-admonition-icon--success);
-  -webkit-mask-image: var(--md-admonition-icon--success);
+  mask-image: var(--md-admonition-icon--admonish-success);
+  -webkit-mask-image: var(--md-admonition-icon--admonish-success);
  mask-repeat: no-repeat;
  -webkit-mask-repeat: no-repeat;
  mask-size: contain;
  -webkit-mask-repeat: no-repeat;
 }

-:is(.admonition):is(.question, .help, .faq) {
+:is(.admonition):is(.admonish-question, .admonish-help, .admonish-faq) {
  border-color: #64dd17;
 }

-:is(.question, .help, .faq) > :is(.admonition-title, summary) {
+:is(.admonish-question, .admonish-help, .admonish-faq) > :is(.admonition-title, summary.admonition-title) {
  background-color: rgba(100, 221, 23, 0.1);
 }
-:is(.question, .help, .faq) > :is(.admonition-title, summary)::before {
+:is(.admonish-question, .admonish-help, .admonish-faq) > :is(.admonition-title, summary.admonition-title)::before {
  background-color: #64dd17;
-  mask-image: var(--md-admonition-icon--question);
-  -webkit-mask-image: var(--md-admonition-icon--question);
+  mask-image: var(--md-admonition-icon--admonish-question);
+  -webkit-mask-image: var(--md-admonition-icon--admonish-question);
  mask-repeat: no-repeat;
  -webkit-mask-repeat: no-repeat;
  mask-size: contain;
  -webkit-mask-repeat: no-repeat;
 }

-:is(.admonition):is(.warning, .caution, .attention) {
+:is(.admonition):is(.admonish-warning, .admonish-caution, .admonish-attention) {
  border-color: #ff9100;
 }

-:is(.warning, .caution, .attention) > :is(.admonition-title, summary) {
+:is(.admonish-warning, .admonish-caution, .admonish-attention) > :is(.admonition-title, summary.admonition-title) {
  background-color: rgba(255, 145, 0, 0.1);
 }
-:is(.warning, .caution, .attention) > :is(.admonition-title, summary)::before {
+:is(.admonish-warning, .admonish-caution, .admonish-attention) > :is(.admonition-title, summary.admonition-title)::before {
  background-color: #ff9100;
-  mask-image: var(--md-admonition-icon--warning);
-  -webkit-mask-image: var(--md-admonition-icon--warning);
+  mask-image: var(--md-admonition-icon--admonish-warning);
+  -webkit-mask-image: var(--md-admonition-icon--admonish-warning);
  mask-repeat: no-repeat;
  -webkit-mask-repeat: no-repeat;
  mask-size: contain;
  -webkit-mask-repeat: no-repeat;
 }

-:is(.admonition):is(.failure, .fail, .missing) {
+:is(.admonition):is(.admonish-failure, .admonish-fail, .admonish-missing) {
  border-color: #ff5252;
 }

-:is(.failure, .fail, .missing) > :is(.admonition-title, summary) {
+:is(.admonish-failure, .admonish-fail, .admonish-missing) > :is(.admonition-title, summary.admonition-title) {
  background-color: rgba(255, 82, 82, 0.1);
 }
-:is(.failure, .fail, .missing) > :is(.admonition-title, summary)::before {
+:is(.admonish-failure, .admonish-fail, .admonish-missing) > :is(.admonition-title, summary.admonition-title)::before {
  background-color: #ff5252;
-  mask-image: var(--md-admonition-icon--failure);
-  -webkit-mask-image: var(--md-admonition-icon--failure);
+  mask-image: var(--md-admonition-icon--admonish-failure);
+  -webkit-mask-image: var(--md-admonition-icon--admonish-failure);
  mask-repeat: no-repeat;
  -webkit-mask-repeat: no-repeat;
  mask-size: contain;
  -webkit-mask-repeat: no-repeat;
 }

-:is(.admonition):is(.danger, .error) {
+:is(.admonition):is(.admonish-danger, .admonish-error) {
  border-color: #ff1744;
 }

-:is(.danger, .error) > :is(.admonition-title, summary) {
+:is(.admonish-danger, .admonish-error) > :is(.admonition-title, summary.admonition-title) {
  background-color: rgba(255, 23, 68, 0.1);
 }
-:is(.danger, .error) > :is(.admonition-title, summary)::before {
+:is(.admonish-danger, .admonish-error) > :is(.admonition-title, summary.admonition-title)::before {
  background-color: #ff1744;
-  mask-image: var(--md-admonition-icon--danger);
-  -webkit-mask-image: var(--md-admonition-icon--danger);
+  mask-image: var(--md-admonition-icon--admonish-danger);
+  -webkit-mask-image: var(--md-admonition-icon--admonish-danger);
  mask-repeat: no-repeat;
  -webkit-mask-repeat: no-repeat;
  mask-size: contain;
  -webkit-mask-repeat: no-repeat;
 }

-:is(.admonition):is(.bug) {
+:is(.admonition):is(.admonish-bug) {
  border-color: #f50057;
 }

-:is(.bug) > :is(.admonition-title, summary) {
+:is(.admonish-bug) > :is(.admonition-title, summary.admonition-title) {
  background-color: rgba(245, 0, 87, 0.1);
 }
-:is(.bug) > :is(.admonition-title, summary)::before {
+:is(.admonish-bug) > :is(.admonition-title, summary.admonition-title)::before {
  background-color: #f50057;
-  mask-image: var(--md-admonition-icon--bug);
-  -webkit-mask-image: var(--md-admonition-icon--bug);
+  mask-image: var(--md-admonition-icon--admonish-bug);
+  -webkit-mask-image: var(--md-admonition-icon--admonish-bug);
  mask-repeat: no-repeat;
  -webkit-mask-repeat: no-repeat;
  mask-size: contain;
  -webkit-mask-repeat: no-repeat;
 }

-:is(.admonition):is(.example) {
+:is(.admonition):is(.admonish-example) {
  border-color: #7c4dff;
 }

-:is(.example) > :is(.admonition-title, summary) {
+:is(.admonish-example) > :is(.admonition-title, summary.admonition-title) {
  background-color: rgba(124, 77, 255, 0.1);
 }
-:is(.example) > :is(.admonition-title, summary)::before {
+:is(.admonish-example) > :is(.admonition-title, summary.admonition-title)::before {
  background-color: #7c4dff;
-  mask-image: var(--md-admonition-icon--example);
-  -webkit-mask-image: var(--md-admonition-icon--example);
+  mask-image: var(--md-admonition-icon--admonish-example);
+  -webkit-mask-image: var(--md-admonition-icon--admonish-example);
  mask-repeat: no-repeat;
  -webkit-mask-repeat: no-repeat;
  mask-size: contain;
  -webkit-mask-repeat: no-repeat;
 }

-:is(.admonition):is(.quote, .cite) {
+:is(.admonition):is(.admonish-quote, .admonish-cite) {
  border-color: #9e9e9e;
 }

-:is(.quote, .cite) > :is(.admonition-title, summary) {
+:is(.admonish-quote, .admonish-cite) > :is(.admonition-title, summary.admonition-title) {
  background-color: rgba(158, 158, 158, 0.1);
 }
-:is(.quote, .cite) > :is(.admonition-title, summary)::before {
+:is(.admonish-quote, .admonish-cite) > :is(.admonition-title, summary.admonition-title)::before {
  background-color: #9e9e9e;
-  mask-image: var(--md-admonition-icon--quote);
-  -webkit-mask-image: var(--md-admonition-icon--quote);
+  mask-image: var(--md-admonition-icon--admonish-quote);
+  -webkit-mask-image: var(--md-admonition-icon--admonish-quote);
  mask-repeat: no-repeat;
  -webkit-mask-repeat: no-repeat;
  mask-size: contain;
@@ -339,7 +327,8 @@ details[open].admonition > summary.admonition-title::after {
  background-color: var(--sidebar-bg);
 }

-.ayu :is(.admonition), .coal :is(.admonition) {
+.ayu :is(.admonition),
+.coal :is(.admonition) {
  background-color: var(--theme-hover);
 }

@@ -42,7 +42,7 @@ turn-off = true

 [preprocessor.admonish]
 command = "mdbook-admonish"
-assets_version = "2.0.0" # do not edit: managed by `mdbook-admonish install`
+assets_version = "3.0.0" # do not edit: managed by `mdbook-admonish install`

 # variables preprocessor: import variables into files
 # https://gitlab.com/tglman/mdbook-variables/
@@ -83,7 +83,7 @@ curly-quotes = true
 # mathjax-support = false # useful if we want to pull equations in
 copy-fonts = true
 no-section-label = false
-additional-css = ["theme/pagetoc.css", "././mdbook-admonish.css", "./custom.css"]
+additional-css = ["theme/pagetoc.css", "././mdbook-admonish.css", "./custom.css", "./mdbook-admonish.css"]
 additional-js  = ["theme/pagetoc.js"]
 git-repository-url = "https://github.com/nymtech/nym"
 git-repository-icon = "fa-github"
@@ -1,31 +1,18 @@
@charset "UTF-8";
 :root {
-  --md-admonition-icon--note:
-    url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M20.71 7.04c.39-.39.39-1.04 0-1.41l-2.34-2.34c-.37-.39-1.02-.39-1.41 0l-1.84 1.83 3.75 3.75M3 17.25V21h3.75L17.81 9.93l-3.75-3.75L3 17.25z'/></svg>");
-  --md-admonition-icon--abstract:
-    url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M17 9H7V7h10m0 6H7v-2h10m-3 6H7v-2h7M12 3a1 1 0 0 1 1 1 1 1 0 0 1-1 1 1 1 0 0 1-1-1 1 1 0 0 1 1-1m7 0h-4.18C14.4 1.84 13.3 1 12 1c-1.3 0-2.4.84-2.82 2H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2V5a2 2 0 0 0-2-2z'/></svg>");
-  --md-admonition-icon--info:
-    url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M13 9h-2V7h2m0 10h-2v-6h2m-1-9A10 10 0 0 0 2 12a10 10 0 0 0 10 10 10 10 0 0 0 10-10A10 10 0 0 0 12 2z'/></svg>");
-  --md-admonition-icon--tip:
-    url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M17.66 11.2c-.23-.3-.51-.56-.77-.82-.67-.6-1.43-1.03-2.07-1.66C13.33 7.26 13 4.85 13.95 3c-.95.23-1.78.75-2.49 1.32-2.59 2.08-3.61 5.75-2.39 8.9.04.1.08.2.08.33 0 .22-.15.42-.35.5-.23.1-.47.04-.66-.12a.58.58 0 0 1-.14-.17c-1.13-1.43-1.31-3.48-.55-5.12C5.78 10 4.87 12.3 5 14.47c.06.5.12 1 .29 1.5.14.6.41 1.2.71 1.73 1.08 1.73 2.95 2.97 4.96 3.22 2.14.27 4.43-.12 6.07-1.6 1.83-1.66 2.47-4.32 1.53-6.6l-.13-.26c-.21-.46-.77-1.26-.77-1.26m-3.16 6.3c-.28.24-.74.5-1.1.6-1.12.4-2.24-.16-2.9-.82 1.19-.28 1.9-1.16 2.11-2.05.17-.8-.15-1.46-.28-2.23-.12-.74-.1-1.37.17-2.06.19.38.39.76.63 1.06.77 1 1.98 1.44 2.24 2.8.04.14.06.28.06.43.03.82-.33 1.72-.93 2.27z'/></svg>");
-  --md-admonition-icon--success:
-    url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='m9 20.42-6.21-6.21 2.83-2.83L9 14.77l9.88-9.89 2.83 2.83L9 20.42z'/></svg>");
-  --md-admonition-icon--question:
-    url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='m15.07 11.25-.9.92C13.45 12.89 13 13.5 13 15h-2v-.5c0-1.11.45-2.11 1.17-2.83l1.24-1.26c.37-.36.59-.86.59-1.41a2 2 0 0 0-2-2 2 2 0 0 0-2 2H8a4 4 0 0 1 4-4 4 4 0 0 1 4 4 3.2 3.2 0 0 1-.93 2.25M13 19h-2v-2h2M12 2A10 10 0 0 0 2 12a10 10 0 0 0 10 10 10 10 0 0 0 10-10c0-5.53-4.5-10-10-10z'/></svg>");
-  --md-admonition-icon--warning:
-    url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M13 14h-2V9h2m0 9h-2v-2h2M1 21h22L12 2 1 21z'/></svg>");
-  --md-admonition-icon--failure:
-    url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M20 6.91 17.09 4 12 9.09 6.91 4 4 6.91 9.09 12 4 17.09 6.91 20 12 14.91 17.09 20 20 17.09 14.91 12 20 6.91z'/></svg>");
-  --md-admonition-icon--danger:
-    url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M11 15H6l7-14v8h5l-7 14v-8z'/></svg>");
-  --md-admonition-icon--bug:
-    url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M14 12h-4v-2h4m0 6h-4v-2h4m6-6h-2.81a5.985 5.985 0 0 0-1.82-1.96L17 4.41 15.59 3l-2.17 2.17a6.002 6.002 0 0 0-2.83 0L8.41 3 7 4.41l1.62 1.63C7.88 6.55 7.26 7.22 6.81 8H4v2h2.09c-.05.33-.09.66-.09 1v1H4v2h2v1c0 .34.04.67.09 1H4v2h2.81c1.04 1.79 2.97 3 5.19 3s4.15-1.21 5.19-3H20v-2h-2.09c.05-.33.09-.66.09-1v-1h2v-2h-2v-1c0-.34-.04-.67-.09-1H20V8z'/></svg>");
-  --md-admonition-icon--example:
-    url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M7 13v-2h14v2H7m0 6v-2h14v2H7M7 7V5h14v2H7M3 8V5H2V4h2v4H3m-1 9v-1h3v4H2v-1h2v-.5H3v-1h1V17H2m2.25-7a.75.75 0 0 1 .75.75c0 .2-.08.39-.21.52L3.12 13H5v1H2v-.92L4 11H2v-1h2.25z'/></svg>");
-  --md-admonition-icon--quote:
-    url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M14 17h3l2-4V7h-6v6h3M6 17h3l2-4V7H5v6h3l-2 4z'/></svg>");
-  --md-details-icon:
-    url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M8.59 16.58 13.17 12 8.59 7.41 10 6l6 6-6 6-1.41-1.42Z'/></svg>");
+  --md-admonition-icon--admonish-note: url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M20.71 7.04c.39-.39.39-1.04 0-1.41l-2.34-2.34c-.37-.39-1.02-.39-1.41 0l-1.84 1.83 3.75 3.75M3 17.25V21h3.75L17.81 9.93l-3.75-3.75L3 17.25z'/></svg>");
+  --md-admonition-icon--admonish-abstract: url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M17 9H7V7h10m0 6H7v-2h10m-3 6H7v-2h7M12 3a1 1 0 0 1 1 1 1 1 0 0 1-1 1 1 1 0 0 1-1-1 1 1 0 0 1 1-1m7 0h-4.18C14.4 1.84 13.3 1 12 1c-1.3 0-2.4.84-2.82 2H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2V5a2 2 0 0 0-2-2z'/></svg>");
+  --md-admonition-icon--admonish-info: url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M13 9h-2V7h2m0 10h-2v-6h2m-1-9A10 10 0 0 0 2 12a10 10 0 0 0 10 10 10 10 0 0 0 10-10A10 10 0 0 0 12 2z'/></svg>");
+  --md-admonition-icon--admonish-tip: url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M17.66 11.2c-.23-.3-.51-.56-.77-.82-.67-.6-1.43-1.03-2.07-1.66C13.33 7.26 13 4.85 13.95 3c-.95.23-1.78.75-2.49 1.32-2.59 2.08-3.61 5.75-2.39 8.9.04.1.08.2.08.33 0 .22-.15.42-.35.5-.23.1-.47.04-.66-.12a.58.58 0 0 1-.14-.17c-1.13-1.43-1.31-3.48-.55-5.12C5.78 10 4.87 12.3 5 14.47c.06.5.12 1 .29 1.5.14.6.41 1.2.71 1.73 1.08 1.73 2.95 2.97 4.96 3.22 2.14.27 4.43-.12 6.07-1.6 1.83-1.66 2.47-4.32 1.53-6.6l-.13-.26c-.21-.46-.77-1.26-.77-1.26m-3.16 6.3c-.28.24-.74.5-1.1.6-1.12.4-2.24-.16-2.9-.82 1.19-.28 1.9-1.16 2.11-2.05.17-.8-.15-1.46-.28-2.23-.12-.74-.1-1.37.17-2.06.19.38.39.76.63 1.06.77 1 1.98 1.44 2.24 2.8.04.14.06.28.06.43.03.82-.33 1.72-.93 2.27z'/></svg>");
+  --md-admonition-icon--admonish-success: url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='m9 20.42-6.21-6.21 2.83-2.83L9 14.77l9.88-9.89 2.83 2.83L9 20.42z'/></svg>");
+  --md-admonition-icon--admonish-question: url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='m15.07 11.25-.9.92C13.45 12.89 13 13.5 13 15h-2v-.5c0-1.11.45-2.11 1.17-2.83l1.24-1.26c.37-.36.59-.86.59-1.41a2 2 0 0 0-2-2 2 2 0 0 0-2 2H8a4 4 0 0 1 4-4 4 4 0 0 1 4 4 3.2 3.2 0 0 1-.93 2.25M13 19h-2v-2h2M12 2A10 10 0 0 0 2 12a10 10 0 0 0 10 10 10 10 0 0 0 10-10c0-5.53-4.5-10-10-10z'/></svg>");
+  --md-admonition-icon--admonish-warning: url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M13 14h-2V9h2m0 9h-2v-2h2M1 21h22L12 2 1 21z'/></svg>");
+  --md-admonition-icon--admonish-failure: url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M20 6.91 17.09 4 12 9.09 6.91 4 4 6.91 9.09 12 4 17.09 6.91 20 12 14.91 17.09 20 20 17.09 14.91 12 20 6.91z'/></svg>");
+  --md-admonition-icon--admonish-danger: url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M11 15H6l7-14v8h5l-7 14v-8z'/></svg>");
+  --md-admonition-icon--admonish-bug: url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M14 12h-4v-2h4m0 6h-4v-2h4m6-6h-2.81a5.985 5.985 0 0 0-1.82-1.96L17 4.41 15.59 3l-2.17 2.17a6.002 6.002 0 0 0-2.83 0L8.41 3 7 4.41l1.62 1.63C7.88 6.55 7.26 7.22 6.81 8H4v2h2.09c-.05.33-.09.66-.09 1v1H4v2h2v1c0 .34.04.67.09 1H4v2h2.81c1.04 1.79 2.97 3 5.19 3s4.15-1.21 5.19-3H20v-2h-2.09c.05-.33.09-.66.09-1v-1h2v-2h-2v-1c0-.34-.04-.67-.09-1H20V8z'/></svg>");
+  --md-admonition-icon--admonish-example: url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M7 13v-2h14v2H7m0 6v-2h14v2H7M7 7V5h14v2H7M3 8V5H2V4h2v4H3m-1 9v-1h3v4H2v-1h2v-.5H3v-1h1V17H2m2.25-7a.75.75 0 0 1 .75.75c0 .2-.08.39-.21.52L3.12 13H5v1H2v-.92L4 11H2v-1h2.25z'/></svg>");
+  --md-admonition-icon--admonish-quote: url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M14 17h3l2-4V7h-6v6h3M6 17h3l2-4V7H5v6h3l-2 4z'/></svg>");
+  --md-details-icon: url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M8.59 16.58 13.17 12 8.59 7.41 10 6l6 6-6 6-1.41-1.42Z'/></svg>");
 }

 :is(.admonition) {
@@ -75,8 +62,9 @@ a.admonition-anchor-link::before {
  content: "§";
 }

-:is(.admonition-title, summary) {
+:is(.admonition-title, summary.admonition-title) {
  position: relative;
+  min-height: 4rem;
  margin-block: 0;
  margin-inline: -1.6rem -1.2rem;
  padding-block: 0.8rem;
@@ -85,13 +73,13 @@ a.admonition-anchor-link::before {
  background-color: rgba(68, 138, 255, 0.1);
  display: flex;
 }
-:is(.admonition-title, summary) p {
+:is(.admonition-title, summary.admonition-title) p {
  margin: 0;
 }
-html :is(.admonition-title, summary):last-child {
+html :is(.admonition-title, summary.admonition-title):last-child {
  margin-bottom: 0;
 }
-:is(.admonition-title, summary)::before {
+:is(.admonition-title, summary.admonition-title)::before {
  position: absolute;
  top: 0.625em;
  inset-inline-start: 1.6rem;
@@ -106,7 +94,7 @@ html :is(.admonition-title, summary):last-child {
  -webkit-mask-size: contain;
  content: "";
 }
-:is(.admonition-title, summary):hover a.admonition-anchor-link {
+:is(.admonition-title, summary.admonition-title):hover a.admonition-anchor-link {
  display: initial;
 }

@@ -131,204 +119,204 @@ details[open].admonition > summary.admonition-title::after {
  transform: rotate(90deg);
 }

-:is(.admonition):is(.note) {
+:is(.admonition):is(.admonish-note) {
  border-color: #448aff;
 }

-:is(.note) > :is(.admonition-title, summary) {
+:is(.admonish-note) > :is(.admonition-title, summary.admonition-title) {
  background-color: rgba(68, 138, 255, 0.1);
 }
-:is(.note) > :is(.admonition-title, summary)::before {
+:is(.admonish-note) > :is(.admonition-title, summary.admonition-title)::before {
  background-color: #448aff;
-  mask-image: var(--md-admonition-icon--note);
-  -webkit-mask-image: var(--md-admonition-icon--note);
+  mask-image: var(--md-admonition-icon--admonish-note);
+  -webkit-mask-image: var(--md-admonition-icon--admonish-note);
  mask-repeat: no-repeat;
  -webkit-mask-repeat: no-repeat;
  mask-size: contain;
  -webkit-mask-repeat: no-repeat;
 }

-:is(.admonition):is(.abstract, .summary, .tldr) {
+:is(.admonition):is(.admonish-abstract, .admonish-summary, .admonish-tldr) {
  border-color: #00b0ff;
 }

-:is(.abstract, .summary, .tldr) > :is(.admonition-title, summary) {
+:is(.admonish-abstract, .admonish-summary, .admonish-tldr) > :is(.admonition-title, summary.admonition-title) {
  background-color: rgba(0, 176, 255, 0.1);
 }
-:is(.abstract, .summary, .tldr) > :is(.admonition-title, summary)::before {
+:is(.admonish-abstract, .admonish-summary, .admonish-tldr) > :is(.admonition-title, summary.admonition-title)::before {
  background-color: #00b0ff;
-  mask-image: var(--md-admonition-icon--abstract);
-  -webkit-mask-image: var(--md-admonition-icon--abstract);
+  mask-image: var(--md-admonition-icon--admonish-abstract);
+  -webkit-mask-image: var(--md-admonition-icon--admonish-abstract);
  mask-repeat: no-repeat;
  -webkit-mask-repeat: no-repeat;
  mask-size: contain;
  -webkit-mask-repeat: no-repeat;
 }

-:is(.admonition):is(.info, .todo) {
+:is(.admonition):is(.admonish-info, .admonish-todo) {
  border-color: #00b8d4;
 }

-:is(.info, .todo) > :is(.admonition-title, summary) {
+:is(.admonish-info, .admonish-todo) > :is(.admonition-title, summary.admonition-title) {
  background-color: rgba(0, 184, 212, 0.1);
 }
-:is(.info, .todo) > :is(.admonition-title, summary)::before {
+:is(.admonish-info, .admonish-todo) > :is(.admonition-title, summary.admonition-title)::before {
  background-color: #00b8d4;
-  mask-image: var(--md-admonition-icon--info);
-  -webkit-mask-image: var(--md-admonition-icon--info);
+  mask-image: var(--md-admonition-icon--admonish-info);
+  -webkit-mask-image: var(--md-admonition-icon--admonish-info);
  mask-repeat: no-repeat;
  -webkit-mask-repeat: no-repeat;
  mask-size: contain;
  -webkit-mask-repeat: no-repeat;
 }

-:is(.admonition):is(.tip, .hint, .important) {
+:is(.admonition):is(.admonish-tip, .admonish-hint, .admonish-important) {
  border-color: #00bfa5;
 }

-:is(.tip, .hint, .important) > :is(.admonition-title, summary) {
+:is(.admonish-tip, .admonish-hint, .admonish-important) > :is(.admonition-title, summary.admonition-title) {
  background-color: rgba(0, 191, 165, 0.1);
 }
-:is(.tip, .hint, .important) > :is(.admonition-title, summary)::before {
+:is(.admonish-tip, .admonish-hint, .admonish-important) > :is(.admonition-title, summary.admonition-title)::before {
  background-color: #00bfa5;
-  mask-image: var(--md-admonition-icon--tip);
-  -webkit-mask-image: var(--md-admonition-icon--tip);
+  mask-image: var(--md-admonition-icon--admonish-tip);
+  -webkit-mask-image: var(--md-admonition-icon--admonish-tip);
  mask-repeat: no-repeat;
  -webkit-mask-repeat: no-repeat;
  mask-size: contain;
  -webkit-mask-repeat: no-repeat;
 }

-:is(.admonition):is(.success, .check, .done) {
+:is(.admonition):is(.admonish-success, .admonish-check, .admonish-done) {
  border-color: #00c853;
 }

-:is(.success, .check, .done) > :is(.admonition-title, summary) {
+:is(.admonish-success, .admonish-check, .admonish-done) > :is(.admonition-title, summary.admonition-title) {
  background-color: rgba(0, 200, 83, 0.1);
 }
-:is(.success, .check, .done) > :is(.admonition-title, summary)::before {
+:is(.admonish-success, .admonish-check, .admonish-done) > :is(.admonition-title, summary.admonition-title)::before {
  background-color: #00c853;
-  mask-image: var(--md-admonition-icon--success);
-  -webkit-mask-image: var(--md-admonition-icon--success);
+  mask-image: var(--md-admonition-icon--admonish-success);
+  -webkit-mask-image: var(--md-admonition-icon--admonish-success);
  mask-repeat: no-repeat;
  -webkit-mask-repeat: no-repeat;
  mask-size: contain;
  -webkit-mask-repeat: no-repeat;
 }

-:is(.admonition):is(.question, .help, .faq) {
+:is(.admonition):is(.admonish-question, .admonish-help, .admonish-faq) {
  border-color: #64dd17;
 }

-:is(.question, .help, .faq) > :is(.admonition-title, summary) {
+:is(.admonish-question, .admonish-help, .admonish-faq) > :is(.admonition-title, summary.admonition-title) {
  background-color: rgba(100, 221, 23, 0.1);
 }
-:is(.question, .help, .faq) > :is(.admonition-title, summary)::before {
+:is(.admonish-question, .admonish-help, .admonish-faq) > :is(.admonition-title, summary.admonition-title)::before {
  background-color: #64dd17;
-  mask-image: var(--md-admonition-icon--question);
-  -webkit-mask-image: var(--md-admonition-icon--question);
+  mask-image: var(--md-admonition-icon--admonish-question);
+  -webkit-mask-image: var(--md-admonition-icon--admonish-question);
  mask-repeat: no-repeat;
  -webkit-mask-repeat: no-repeat;
  mask-size: contain;
  -webkit-mask-repeat: no-repeat;
 }

-:is(.admonition):is(.warning, .caution, .attention) {
+:is(.admonition):is(.admonish-warning, .admonish-caution, .admonish-attention) {
  border-color: #ff9100;
 }

-:is(.warning, .caution, .attention) > :is(.admonition-title, summary) {
+:is(.admonish-warning, .admonish-caution, .admonish-attention) > :is(.admonition-title, summary.admonition-title) {
  background-color: rgba(255, 145, 0, 0.1);
 }
-:is(.warning, .caution, .attention) > :is(.admonition-title, summary)::before {
+:is(.admonish-warning, .admonish-caution, .admonish-attention) > :is(.admonition-title, summary.admonition-title)::before {
  background-color: #ff9100;
-  mask-image: var(--md-admonition-icon--warning);
-  -webkit-mask-image: var(--md-admonition-icon--warning);
+  mask-image: var(--md-admonition-icon--admonish-warning);
+  -webkit-mask-image: var(--md-admonition-icon--admonish-warning);
  mask-repeat: no-repeat;
  -webkit-mask-repeat: no-repeat;
  mask-size: contain;
  -webkit-mask-repeat: no-repeat;
 }

-:is(.admonition):is(.failure, .fail, .missing) {
+:is(.admonition):is(.admonish-failure, .admonish-fail, .admonish-missing) {
  border-color: #ff5252;
 }

-:is(.failure, .fail, .missing) > :is(.admonition-title, summary) {
+:is(.admonish-failure, .admonish-fail, .admonish-missing) > :is(.admonition-title, summary.admonition-title) {
  background-color: rgba(255, 82, 82, 0.1);
 }
-:is(.failure, .fail, .missing) > :is(.admonition-title, summary)::before {
+:is(.admonish-failure, .admonish-fail, .admonish-missing) > :is(.admonition-title, summary.admonition-title)::before {
  background-color: #ff5252;
-  mask-image: var(--md-admonition-icon--failure);
-  -webkit-mask-image: var(--md-admonition-icon--failure);
+  mask-image: var(--md-admonition-icon--admonish-failure);
+  -webkit-mask-image: var(--md-admonition-icon--admonish-failure);
  mask-repeat: no-repeat;
  -webkit-mask-repeat: no-repeat;
  mask-size: contain;
  -webkit-mask-repeat: no-repeat;
 }

-:is(.admonition):is(.danger, .error) {
+:is(.admonition):is(.admonish-danger, .admonish-error) {
  border-color: #ff1744;
 }

-:is(.danger, .error) > :is(.admonition-title, summary) {
+:is(.admonish-danger, .admonish-error) > :is(.admonition-title, summary.admonition-title) {
  background-color: rgba(255, 23, 68, 0.1);
 }
-:is(.danger, .error) > :is(.admonition-title, summary)::before {
+:is(.admonish-danger, .admonish-error) > :is(.admonition-title, summary.admonition-title)::before {
  background-color: #ff1744;
-  mask-image: var(--md-admonition-icon--danger);
-  -webkit-mask-image: var(--md-admonition-icon--danger);
+  mask-image: var(--md-admonition-icon--admonish-danger);
+  -webkit-mask-image: var(--md-admonition-icon--admonish-danger);
  mask-repeat: no-repeat;
  -webkit-mask-repeat: no-repeat;
  mask-size: contain;
  -webkit-mask-repeat: no-repeat;
 }

-:is(.admonition):is(.bug) {
+:is(.admonition):is(.admonish-bug) {
  border-color: #f50057;
 }

-:is(.bug) > :is(.admonition-title, summary) {
+:is(.admonish-bug) > :is(.admonition-title, summary.admonition-title) {
  background-color: rgba(245, 0, 87, 0.1);
 }
-:is(.bug) > :is(.admonition-title, summary)::before {
+:is(.admonish-bug) > :is(.admonition-title, summary.admonition-title)::before {
  background-color: #f50057;
-  mask-image: var(--md-admonition-icon--bug);
-  -webkit-mask-image: var(--md-admonition-icon--bug);
+  mask-image: var(--md-admonition-icon--admonish-bug);
+  -webkit-mask-image: var(--md-admonition-icon--admonish-bug);
  mask-repeat: no-repeat;
  -webkit-mask-repeat: no-repeat;
  mask-size: contain;
  -webkit-mask-repeat: no-repeat;
 }

-:is(.admonition):is(.example) {
+:is(.admonition):is(.admonish-example) {
  border-color: #7c4dff;
 }

-:is(.example) > :is(.admonition-title, summary) {
+:is(.admonish-example) > :is(.admonition-title, summary.admonition-title) {
  background-color: rgba(124, 77, 255, 0.1);
 }
-:is(.example) > :is(.admonition-title, summary)::before {
+:is(.admonish-example) > :is(.admonition-title, summary.admonition-title)::before {
  background-color: #7c4dff;
-  mask-image: var(--md-admonition-icon--example);
-  -webkit-mask-image: var(--md-admonition-icon--example);
+  mask-image: var(--md-admonition-icon--admonish-example);
+  -webkit-mask-image: var(--md-admonition-icon--admonish-example);
  mask-repeat: no-repeat;
  -webkit-mask-repeat: no-repeat;
  mask-size: contain;
  -webkit-mask-repeat: no-repeat;
 }

-:is(.admonition):is(.quote, .cite) {
+:is(.admonition):is(.admonish-quote, .admonish-cite) {
  border-color: #9e9e9e;
 }

-:is(.quote, .cite) > :is(.admonition-title, summary) {
+:is(.admonish-quote, .admonish-cite) > :is(.admonition-title, summary.admonition-title) {
  background-color: rgba(158, 158, 158, 0.1);
 }
-:is(.quote, .cite) > :is(.admonition-title, summary)::before {
+:is(.admonish-quote, .admonish-cite) > :is(.admonition-title, summary.admonition-title)::before {
  background-color: #9e9e9e;
-  mask-image: var(--md-admonition-icon--quote);
-  -webkit-mask-image: var(--md-admonition-icon--quote);
+  mask-image: var(--md-admonition-icon--admonish-quote);
+  -webkit-mask-image: var(--md-admonition-icon--admonish-quote);
  mask-repeat: no-repeat;
  -webkit-mask-repeat: no-repeat;
  mask-size: contain;
@@ -339,7 +327,8 @@ details[open].admonition > summary.admonition-title::after {
  background-color: var(--sidebar-bg);
 }

-.ayu :is(.admonition), .coal :is(.admonition) {
+.ayu :is(.admonition),
+.coal :is(.admonition) {
  background-color: var(--theme-hover);
 }

@@ -28,6 +28,7 @@ pub(crate) struct OverrideConfig {
    pub(crate) host: Option<IpAddr>,
    pub(crate) mix_port: Option<u16>,
    pub(crate) clients_port: Option<u16>,
+    pub(crate) http_api_port: Option<u16>,
    pub(crate) datastore: Option<PathBuf>,
    pub(crate) enabled_statistics: Option<bool>,
    pub(crate) statistics_service_url: Option<url::Url>,
@@ -44,6 +45,7 @@ impl OverrideConfig {
            .with_optional(Config::with_listening_address, self.host)
            .with_optional(Config::with_mix_port, self.mix_port)
            .with_optional(Config::with_clients_port, self.clients_port)
+            .with_optional(Config::with_http_api_port, self.http_api_port)
            .with_optional_custom_env(
                Config::with_custom_nym_apis,
                self.nym_apis,
@@ -32,6 +32,10 @@ pub struct Init {
    #[arg(long)]
    clients_port: Option<u16>,

+    /// The port on which the gateway will be listening for http requests
+    #[clap(long)]
+    http_api_port: Option<u16>,
+
    /// Path to sqlite database containing all gateway persistent data
    #[arg(long)]
    datastore: Option<PathBuf>,
@@ -127,6 +131,7 @@ impl From<Init> for OverrideConfig {
            host: Some(init_config.host),
            mix_port: init_config.mix_port,
            clients_port: init_config.clients_port,
+            http_api_port: init_config.http_api_port,
            datastore: init_config.datastore,
            nym_apis: init_config.nym_apis,
            mnemonic: init_config.mnemonic,
@@ -247,6 +252,7 @@ mod tests {
            host: "1.1.1.1".parse().unwrap(),
            mix_port: Some(42),
            clients_port: Some(43),
+            http_api_port: Some(44),
            datastore: Some("/foo-datastore".parse().unwrap()),
            nym_apis: None,
            mnemonic: None,
@@ -26,6 +26,10 @@ pub struct Run {
    #[clap(long)]
    mix_port: Option<u16>,

+    /// The port on which the gateway will be listening for http requests
+    #[clap(long)]
+    http_api_port: Option<u16>,
+
    /// The port on which the gateway will be listening for clients gateway-requests
    #[clap(long)]
    clients_port: Option<u16>,
@@ -124,6 +128,7 @@ impl From<Run> for OverrideConfig {
            host: run_config.host,
            mix_port: run_config.mix_port,
            clients_port: run_config.clients_port,
+            http_api_port: run_config.http_api_port,
            datastore: run_config.datastore,
            nym_apis: run_config.nym_apis,
            mnemonic: run_config.mnemonic,
@@ -3,6 +3,7 @@

 use crate::config::old_config_v1_1_20::ConfigV1_1_20;
 use crate::config::old_config_v1_1_28::ConfigV1_1_28;
+use crate::config::old_config_v1_1_30::ConfigV1_1_30;
 use crate::config::{default_config_filepath, Config};
 use crate::error::GatewayError;
 use log::info;
@@ -20,7 +21,8 @@ fn try_upgrade_v1_1_20_config(id: &str) -> Result<bool, GatewayError> {
    info!("It is going to get updated to the current specification.");

    let updated_step1: ConfigV1_1_28 = old_config.into();
-    let updated: Config = updated_step1.into();
+    let updated_step2: ConfigV1_1_30 = updated_step1.into();
+    let updated: Config = updated_step2.into();
    updated
        .save_to_default_location()
        .map_err(|err| GatewayError::ConfigSaveFailure {
@@ -42,6 +44,33 @@ fn try_upgrade_v1_1_28_config(id: &str) -> Result<bool, GatewayError> {
    info!("It seems the gateway is using <= v1.1.28 config template.");
    info!("It is going to get updated to the current specification.");

+    let updated_step1: ConfigV1_1_30 = old_config.into();
+    let updated: Config = updated_step1.into();
+    updated
+        .save_to_default_location()
+        .map_err(|err| GatewayError::ConfigSaveFailure {
+            path: default_config_filepath(id),
+            id: id.to_string(),
+            source: err,
+        })?;
+
+    Ok(true)
+}
+
+fn try_upgrade_v1_1_30_config(id: &str) -> Result<bool, GatewayError> {
+    // if current configuration can be loaded, there is no need to try the upgrade
+    if Config::read_from_default_path(id).is_ok() {
+        return Ok(true);
+    }
+    // explicitly load it as v1.1.32 (which is incompatible with the current, i.e. 1.1.33+)
+    let Ok(old_config) = ConfigV1_1_30::read_from_default_path(id) else {
+        // if we failed to load it, there might have been nothing to upgrade
+        // or maybe it was an even older file. in either way. just ignore it and carry on with our day
+        return Ok(false);
+    };
+    info!("It seems the gateway is using <= v1.1.32 config template.");
+    info!("It is going to get updated to the current specification.");
+
    let updated: Config = old_config.into();
    updated
        .save_to_default_location()
@@ -61,6 +90,9 @@ pub(crate) fn try_upgrade_config(id: &str) -> Result<(), GatewayError> {
    if try_upgrade_v1_1_28_config(id)? {
        return Ok(());
    }
+    if try_upgrade_v1_1_30_config(id)? {
+        return Ok(());
+    }

    Ok(())
 }
@@ -5,7 +5,9 @@ use crate::config::persistence::paths::GatewayPaths;
 use crate::config::template::CONFIG_TEMPLATE;
 use log::{debug, warn};
 use nym_bin_common::logging::LoggingSettings;
-use nym_config::defaults::{DEFAULT_CLIENT_LISTENING_PORT, DEFAULT_MIX_LISTENING_PORT};
+use nym_config::defaults::{
+    DEFAULT_CLIENT_LISTENING_PORT, DEFAULT_HTTP_API_LISTENING_PORT, DEFAULT_MIX_LISTENING_PORT,
+};
 use nym_config::helpers::inaddr_any;
 use nym_config::{
    must_get_home, read_config_from_toml_file, save_formatted_config_to_file, NymConfigTemplate,
@@ -22,6 +24,7 @@ use zeroize::{Zeroize, ZeroizeOnDrop};

 pub(crate) mod old_config_v1_1_20;
 pub(crate) mod old_config_v1_1_28;
+pub(crate) mod old_config_v1_1_30;
 pub mod persistence;
 mod template;

@@ -197,6 +200,11 @@ impl Config {
        self
    }

+    pub fn with_http_api_port(mut self, port: u16) -> Self {
+        self.gateway.http_api_port = port;
+        self
+    }
+
    pub fn with_custom_persistent_store(mut self, store_dir: PathBuf) -> Self {
        self.storage_paths.clients_storage = store_dir;
        self
@@ -245,6 +253,10 @@ pub struct Gateway {
    /// (default: 9000)
    pub clients_port: u16,

+    /// Port used for listening for http requests.
+    /// (default: 8000)
+    pub http_api_port: u16,
+
    /// Whether gateway collects and sends anonymized statistics
    pub enabled_statistics: bool,

@@ -279,6 +291,7 @@ impl Gateway {
            listening_address: inaddr_any(),
            mix_port: DEFAULT_MIX_LISTENING_PORT,
            clients_port: DEFAULT_CLIENT_LISTENING_PORT,
+            http_api_port: DEFAULT_HTTP_API_LISTENING_PORT,
            enabled_statistics: false,
            statistics_service_url: mainnet::STATISTICS_SERVICE_DOMAIN_ADDRESS
                .parse()
@@ -1,8 +1,9 @@
 // Copyright 2020-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

+use crate::config::old_config_v1_1_30::{ConfigV1_1_30, GatewayV1_1_30};
 use crate::config::persistence::paths::{GatewayPaths, KeysPaths};
-use crate::config::{Config, Debug, Gateway};
+use crate::config::Debug;
 use nym_bin_common::logging::LoggingSettings;
 use nym_config::{
    must_get_home, read_config_from_toml_file, DEFAULT_CONFIG_DIR, DEFAULT_CONFIG_FILENAME, NYM_DIR,
@@ -84,11 +85,11 @@ impl ConfigV1_1_28 {
    }
 }

-impl From<ConfigV1_1_28> for Config {
+impl From<ConfigV1_1_28> for ConfigV1_1_30 {
    fn from(value: ConfigV1_1_28) -> Self {
-        Config {
+        ConfigV1_1_30 {
            save_path: None,
-            gateway: Gateway {
+            gateway: GatewayV1_1_30 {
                version: value.gateway.version,
                id: value.gateway.id,
                only_coconut_credentials: value.gateway.only_coconut_credentials,
@@ -0,0 +1,110 @@
+// Copyright 2020-2023 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::config::default_config_filepath;
+use crate::config::persistence::paths::GatewayPaths;
+use crate::config::{Config, Debug, Gateway, NetworkRequester};
+use nym_bin_common::logging::LoggingSettings;
+use nym_config::read_config_from_toml_file;
+use nym_network_defaults::DEFAULT_HTTP_API_LISTENING_PORT;
+use serde::{Deserialize, Serialize};
+use std::io;
+use std::net::IpAddr;
+use std::path::{Path, PathBuf};
+use url::Url;
+
+#[derive(Debug, Deserialize, PartialEq, Serialize)]
+#[serde(deny_unknown_fields)]
+pub struct ConfigV1_1_30 {
+    // additional metadata holding on-disk location of this config file
+    #[serde(skip)]
+    pub(crate) save_path: Option<PathBuf>,
+
+    pub gateway: GatewayV1_1_30,
+
+    pub storage_paths: GatewayPaths,
+
+    pub network_requester: NetworkRequester,
+
+    #[serde(default)]
+    pub logging: LoggingSettings,
+
+    #[serde(default)]
+    pub debug: Debug,
+}
+
+impl ConfigV1_1_30 {
+    pub fn read_from_default_path<P: AsRef<Path>>(id: P) -> io::Result<Self> {
+        read_config_from_toml_file(default_config_filepath(id))
+    }
+}
+
+impl From<ConfigV1_1_30> for Config {
+    fn from(value: ConfigV1_1_30) -> Self {
+        Config {
+            save_path: value.save_path,
+            gateway: Gateway {
+                version: value.gateway.version,
+                id: value.gateway.id,
+                only_coconut_credentials: value.gateway.only_coconut_credentials,
+                listening_address: value.gateway.listening_address,
+                mix_port: value.gateway.mix_port,
+                http_api_port: DEFAULT_HTTP_API_LISTENING_PORT,
+                clients_port: value.gateway.clients_port,
+                enabled_statistics: value.gateway.enabled_statistics,
+                nym_api_urls: value.gateway.nym_api_urls,
+                nyxd_urls: value.gateway.nyxd_urls,
+                statistics_service_url: value.gateway.statistics_service_url,
+                cosmos_mnemonic: value.gateway.cosmos_mnemonic,
+            },
+            storage_paths: value.storage_paths,
+            network_requester: value.network_requester,
+            logging: value.logging,
+            debug: value.debug,
+        }
+    }
+}
+
+#[derive(Debug, Deserialize, PartialEq, Eq, Serialize)]
+pub struct GatewayV1_1_30 {
+    /// Version of the gateway for which this configuration was created.
+    pub version: String,
+
+    /// ID specifies the human readable ID of this particular gateway.
+    pub id: String,
+
+    /// Indicates whether this gateway is accepting only coconut credentials for accessing the
+    /// the mixnet, or if it also accepts non-paying clients
+    #[serde(default)]
+    pub only_coconut_credentials: bool,
+
+    /// Address to which this mixnode will bind to and will be listening for packets.
+    pub listening_address: IpAddr,
+
+    /// Port used for listening for all mixnet traffic.
+    /// (default: 1789)
+    pub mix_port: u16,
+
+    /// Port used for listening for all client-related traffic.
+    /// (default: 9000)
+    pub clients_port: u16,
+
+    /// Whether gateway collects and sends anonymized statistics
+    pub enabled_statistics: bool,
+
+    /// Domain address of the statistics service
+    pub statistics_service_url: Url,
+
+    /// Addresses to APIs from which the node gets the view of the network.
+    #[serde(alias = "validator_api_urls")]
+    pub nym_api_urls: Vec<Url>,
+
+    /// Addresses to validators which the node uses to check for double spending of ERC20 tokens.
+    #[serde(alias = "validator_nymd_urls")]
+    pub nyxd_urls: Vec<Url>,
+
+    /// Mnemonic of a cosmos wallet used in checking for double spending.
+    // #[deprecated(note = "move to storage")]
+    // TODO: I don't think this should be stored directly in the config...
+    pub cosmos_mnemonic: bip39::Mnemonic,
+}
@@ -33,6 +33,10 @@ mix_port = {{ gateway.mix_port }}
 # (default: 9000)
 clients_port = {{ gateway.clients_port }}

+# Port used for listening for http requests.
+# (default: 8000)
+http_api_port = {{ gateway.http_api_port }}
+
 # Wheather gateway collects and sends anonymized statistics
 enabled_statistics = {{ gateway.enabled_statistics }}

@@ -76,6 +76,7 @@ pub(crate) fn node_details(config: &Config) -> Result<GatewayNodeDetailsResponse
        bind_address: config.gateway.listening_address.to_string(),
        mix_port: config.gateway.mix_port,
        clients_port: config.gateway.clients_port,
+        http_api_port: config.gateway.http_api_port,
        config_path: display_maybe_path(config.save_path.as_ref()),
        data_store: display_path(&config.storage_paths.clients_storage),
        network_requester,
@@ -33,12 +33,10 @@ fn router_with_state(state: Arc<ApiState>) -> Router {
 }

 pub(crate) async fn start_http_api(
+    port: u16,
    client_registry: Arc<ClientRegistry>,
    sphinx_key_pair: Arc<encryption::KeyPair>,
 ) {
-    // Port should be 80 post smoosh
-    let port = 8000;
-
    info!("Started HTTP API on port {}", port);

    let client_registry = Arc::clone(&client_registry);
@@ -156,6 +156,15 @@ impl<St> Gateway<St> {
        mixnet_handling::Listener::new(listening_address, shutdown).start(connection_handler);
    }

+    #[cfg(feature = "wireguard")]
+    async fn start_wireguard(
+        &self,
+        shutdown: TaskClient,
+    ) -> Result<(), Box<dyn Error + Send + Sync>> {
+        // TODO: possibly we should start the UDP listener and TUN device explicitly here
+        nym_wireguard::start_wireguard(shutdown).await
+    }
+
    fn start_client_websocket_listener(
        &self,
        forwarding_channel: MixForwardingSender,
@@ -378,13 +387,17 @@ impl<St> Gateway<St> {
        // Once this is a bit more mature, make this a commandline flag instead of a compile time
        // flag
        #[cfg(feature = "wireguard")]
-        if let Err(err) = nym_wireguard::start_wireguard(shutdown.subscribe()).await {
+        if let Err(err) = self
+            .start_wireguard(shutdown.subscribe().named("wireguard"))
+            .await
+        {
            // that's a nasty workaround, but anyhow errors are generally nicer, especially on exit
            bail!("{err}")
        }

        // This should likely be wireguard feature gated, but its easier to test if it hangs in here
        tokio::spawn(start_http_api(
+            self.config.gateway.http_api_port,
            Arc::clone(&self.client_registry),
            Arc::clone(&self.sphinx_keypair),
        ));
@@ -11,13 +11,11 @@ Sounds great, are there any catches? Well, there are a few (for now):
 the internet use a [standard allow list](https://nymtech.net/.wellknown/network-requester/standard-allowed-list.txt)
 in combination with their own configuration. If you are trying to access something that is not on the allow list, please check the FAQ page.

-2. CA certificates in `mixFetch` are periodically updated, so if you get a certificate error, the root certificate you need might not be in the [standard allow list](https://nymtech.net/.wellknown/network-requester/standard-allowed-list.txt). If that's the case, [send a PR](https://github.com/nymtech/nym/pulls) if you need changes.
+2. CA certificates in `mixFetch` are periodically updated, so if you get a certificate error, the root certificate you need might not be valid. If that's the case, [send a PR](https://github.com/nymtech/nym/pulls) if you need changes to the Certificates.

 3. If you are using `mixFetch` in a web app with HTTPS you will need to use a gateway that has Secure Websockets to
 avoid getting a [mixed content](https://developer.mozilla.org/en-US/docs/Web/Security/Mixed_content) error.

-4. Workaround for Mixed Content Errors because you might be using `mixFetch` from web app served from HTTPS while
-connecting a gateway that only listens on a plain websocket, without HTTPS/TLS.

 Read [this article](https://blog.nymtech.net/mixfetch-like-the-fetch-api-but-via-the-mixnet-82acfd435c62) to learn more about mixFetch.

@@ -42,13 +42,13 @@ If you're unsure where to start, the following set of questions should help you
 ```ascii
                           +-----------------------------------+
                           |                                   |      +---------------------+
-                           | Is app JS/TS or another language? +------+Go / C / C++ / Swift +-----------------------+
+                           | Is app JS/TS or another language? +-----+|Go / C / C++ / Swift |+----------------------+
                           |                                   |      +---------------------+                       |
                           +--------+-----------------+--------+                                                    |
                                    |                 |                                                             |
                                    |                 |                                                             |
                               +----+----+         +--+---+                                                         |
-                               |  TS/JS  |         | Rust +--------------------------------------+                  |
+                               |  TS/JS  |         | Rust |+-------------------------------------+                  |
                               +----+----+         +------+                                      |                  |
                                    |                                                            |                  |
                  +----+------------+---------------------+--------+--------------+              |                  |
@@ -65,7 +65,7 @@ If you're unsure where to start, the following set of questions should help you
   +--+--+   +----+----+  +------+---------+                  |                   |              |                  |
      |           |              |                            |                   |              |                  |
 +-----v---+ +-----v-----+   +----v-------+           +--------v---------+    +----v---+     +----v-----+   +--------v---------+
-|mixFetch | |Talk to us |   | No support |           | mixFetch nodeJS  |    | TS SDK |     | Rust SDK |   |    FFI* / Nym     |
+|mixFetch | |Talk to us |   | No support |           | mixFetch nodeJS  |    | TS SDK |     | Rust SDK |   |    FFI* / Nym    |
 +---------+ +-----------+   +------------+           +------------------+    +--------+     +----------+   | standalone client|
                                                                                                           +------------------+
 
@@ -35,7 +35,7 @@
    "@babel/highlight" "^7.22.13"
    chalk "^2.4.2"

-"@babel/compat-data@^7.20.5", "@babel/compat-data@^7.22.20", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.22.9":
+"@babel/compat-data@^7.20.5", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.22.9":
  version "7.22.20"
  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.20.tgz#8df6e96661209623f1975d66c35ffca66f3306d0"
  integrity sha512-BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw==
@@ -83,7 +83,7 @@
    json5 "^2.2.3"
    semver "^6.3.1"

-"@babel/generator@^7.12.11", "@babel/generator@^7.12.5", "@babel/generator@^7.23.0", "@babel/generator@^7.7.2":
+"@babel/generator@^7.12.11", "@babel/generator@^7.12.5", "@babel/generator@^7.22.15", "@babel/generator@^7.23.0", "@babel/generator@^7.7.2":
  version "7.23.0"
  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.0.tgz#df5c386e2218be505b34837acbcb874d7a983420"
  integrity sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==
@@ -201,7 +201,7 @@
  dependencies:
    "@babel/types" "^7.22.15"

-"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.22.5", "@babel/helper-module-transforms@^7.23.0":
+"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.22.17", "@babel/helper-module-transforms@^7.22.5", "@babel/helper-module-transforms@^7.23.0":
  version "7.23.0"
  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz#3ec246457f6c842c0aee62a01f60739906f7047e"
  integrity sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==
@@ -292,7 +292,7 @@
    "@babel/template" "^7.22.15"
    "@babel/types" "^7.22.19"

-"@babel/helpers@^7.12.5", "@babel/helpers@^7.23.0":
+"@babel/helpers@^7.12.5":
  version "7.23.1"
  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.1.tgz#44e981e8ce2b9e99f8f0b703f3326a4636c16d15"
  integrity sha512-chNpneuK18yW5Oxsr+t553UZzzAs3aZnFm4bxhebsNTeshrC95yA7l5yl7GBAG+JG1rF0F7zzD2EixK9mWSDoA==
@@ -301,6 +301,15 @@
    "@babel/traverse" "^7.23.0"
    "@babel/types" "^7.23.0"

+"@babel/helpers@^7.22.15":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.2.tgz#2832549a6e37d484286e15ba36a5330483cac767"
+  integrity sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ==
+  dependencies:
+    "@babel/template" "^7.22.15"
+    "@babel/traverse" "^7.23.2"
+    "@babel/types" "^7.23.0"
+
 "@babel/highlight@^7.10.4", "@babel/highlight@^7.22.13":
  version "7.22.20"
  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.20.tgz#4ca92b71d80554b01427815e06f2df965b9c1f54"
@@ -310,7 +319,7 @@
    chalk "^2.4.2"
    js-tokens "^4.0.0"

-"@babel/parser@^7.1.0", "@babel/parser@^7.12.11", "@babel/parser@^7.12.7", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.22.15", "@babel/parser@^7.23.0":
+"@babel/parser@^7.1.0", "@babel/parser@^7.12.11", "@babel/parser@^7.12.7", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.22.15", "@babel/parser@^7.22.16", "@babel/parser@^7.23.0":
  version "7.23.0"
  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719"
  integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==
@@ -782,7 +791,7 @@
    "@babel/helper-module-transforms" "^7.23.0"
    "@babel/helper-plugin-utils" "^7.22.5"

-"@babel/plugin-transform-modules-commonjs@^7.22.15", "@babel/plugin-transform-modules-commonjs@^7.23.0":
+"@babel/plugin-transform-modules-commonjs@^7.22.15":
  version "7.23.0"
  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.0.tgz#b3dba4757133b2762c00f4f94590cf6d52602481"
  integrity sha512-32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ==
@@ -1213,10 +1222,10 @@
    "@babel/parser" "^7.22.15"
    "@babel/types" "^7.22.15"

-"@babel/traverse@^7.1.6", "@babel/traverse@^7.12.11", "@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.23.0", "@babel/traverse@^7.7.2":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.0.tgz#18196ddfbcf4ccea324b7f6d3ada00d8c5a99c53"
-  integrity sha512-t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw==
+"@babel/traverse@^7.1.6", "@babel/traverse@^7.12.11", "@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.22.17", "@babel/traverse@^7.23.0", "@babel/traverse@^7.23.2", "@babel/traverse@^7.7.2":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8"
+  integrity sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==
  dependencies:
    "@babel/code-frame" "^7.22.13"
    "@babel/generator" "^7.23.0"
@@ -1229,7 +1238,7 @@
    debug "^4.1.0"
    globals "^11.1.0"

-"@babel/types@^7.0.0", "@babel/types@^7.12.11", "@babel/types@^7.12.7", "@babel/types@^7.2.0", "@babel/types@^7.20.0", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
+"@babel/types@^7.0.0", "@babel/types@^7.12.11", "@babel/types@^7.12.7", "@babel/types@^7.2.0", "@babel/types@^7.20.0", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.17", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
  version "7.23.0"
  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb"
  integrity sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==
@@ -6599,7 +6608,7 @@ browserify-zlib@^0.2.0:
  dependencies:
    pako "~1.0.5"

-browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.21.4, browserslist@^4.21.9, browserslist@^4.22.1:
+browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.21.10, browserslist@^4.21.4, browserslist@^4.21.9, browserslist@^4.22.1:
  version "4.22.1"
  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.1.tgz#ba91958d1a59b87dab6fed8dfbcb3da5e2e9c619"
  integrity sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==
@@ -7529,11 +7538,6 @@ convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.6.0,
  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
  integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==

-convert-source-map@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
-  integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
-
 cookie-signature@1.0.6:
  version "1.0.6"
  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
@@ -17554,7 +17558,7 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==

-source-map@^0.7.0, source-map@^0.7.3, source-map@^0.7.4:
+source-map@^0.7.0, source-map@^0.7.3:
  version "0.7.4"
  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656"
  integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==
Author	SHA1	Message	Date
Bogdan-Ștefan Neacşu	a6e1483fc8	Fix test	2023-10-18 13:07:02 +03:00
Bogdan-Ștefan Neacşu	6af10da5ad	Add config http api port to gateway	2023-10-18 12:48:35 +03:00
Jon Häggblad	4141a7844f	ci: install protoc in nightly-nym-wallet-build	2023-10-17 23:39:28 +02:00
Jon Häggblad	1de86f7ad7	Merge pull request #4015 from nymtech/jon/ci-cleanup ci: general cleanup	2023-10-17 23:02:41 +02:00
Jon Häggblad	833502ee35	Download wasm-opt release binaries instead of compiling	2023-10-17 22:58:25 +02:00
Jon Häggblad	9095da1e10	Install wasm-pacl in ci-sdk-docs-typescript	2023-10-17 22:57:24 +02:00
Jon Häggblad	b5eb8e94f4	Rename a few workflows	2023-10-17 22:56:33 +02:00
Jon Häggblad	8377c17838	Remove unnecessary apt install	2023-10-17 22:55:46 +02:00
Jon Häggblad	af018180d2	Switch to pull_request triggers on a few workflows	2023-10-17 22:55:00 +02:00
Jon Häggblad	5102fe9797	Remove some old build conditionals	2023-10-17 22:53:45 +02:00
Jon Häggblad	188e766106	Rename to ci-nym-api-tests	2023-10-17 22:52:15 +02:00
Jon Häggblad	5729123dd1	Rename to build-upload-binaries	2023-10-17 22:51:24 +02:00
Jon Häggblad	1935df960b	Remove push triggers on a bunch of CI workflows	2023-10-17 22:50:30 +02:00
Jon Häggblad	c39fd49b1f	Remove commented out leftovers	2023-10-17 22:47:17 +02:00
Jon Häggblad	bc6634fb6f	ci: use custom-linux instead of custom-runner-linux (#4014 )	2023-10-17 22:42:31 +02:00
Tommy Verrall	09941eb741	Merge pull request #4013 from nymtech/feature/ts-sdk-fixes	2023-10-17 19:09:49 +01:00
Lorexia	2fc0d51377	Update mixfetch documentation	2023-10-17 19:11:09 +02:00
Lorexia	1e1b69c3b5	Update mixfetch doc and ascii tree bug	2023-10-17 19:07:25 +02:00
Tommy Verrall	829296c0bb	Merge pull request #4009 from nymtech/CI/CD-docs-patch CI/CD-docs patch	2023-10-17 14:56:08 +01:00
Jon Häggblad	7a8c9317bc	ci: create install-wasm-opt reusable action (#4012 )	2023-10-17 15:35:44 +02:00
serinko	11ca9dd34e	fix flow	2023-10-17 13:24:03 +00:00
serinko	3e48b8db92	build books locally - success	2023-10-17 15:19:52 +02:00
serinko	38377ca776	edit syntax logic	2023-10-17 13:03:21 +00:00
serinko	529ad0e146	edit command path syntax	2023-10-17 12:43:01 +00:00
Tommy Verrall	e328898971	Merge pull request #4005 from nymtech/dependabot/npm_and_yarn/babel/traverse-7.23.2 build(deps): bump @babel/traverse from 7.22.17 to 7.23.2	2023-10-17 11:44:26 +01:00
serinko	72a6de18ae	edit syntax	2023-10-17 10:38:03 +00:00
serinko	52dc25b0ea	correct path	2023-10-17 10:34:16 +00:00
serinko	a6180a54bf	serinko/patch/ci-docs I was not finished with the previous PR - was merged too fast	2023-10-17 10:27:35 +00:00
Tommy Verrall	f9971fbc8d	Merge pull request #4008 from nymtech/patch/ci-docs/serinko Fix ci/cd-docs errors	2023-10-17 11:20:54 +01:00
Jon Häggblad	96a925c040	wireguard: create structs for udp handler and tun device (#4007 ) * Extract out parse_peer * wip: handle_packet extract * Extract out active_peers.rs * wip: rework to struct from free function * udp_listener working * wip * more udp_listener * tun_device * wip * tun_device * Remove some old commented out stuff * tidy * Remove commented out line	2023-10-17 12:01:11 +02:00
dependabot[bot]	2ae61ae79f	build(deps): bump @babel/traverse from 7.22.17 to 7.23.2 Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.22.17 to 7.23.2. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse) --- updated-dependencies: - dependency-name: "@babel/traverse" dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2023-10-16 16:08:39 +00:00