update plugins

update mdbook admonish
2023-10-16 14:04:22 +02:00 · 2023-10-16 13:46:16 +02:00
140 changed files with 4407 additions and 4548 deletions
@@ -1,37 +0,0 @@
-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-upload-binaries
+name: Build and upload binaries to artifact storage

 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-linux
+    runs-on: custom-runner-linux
    steps:
      - uses: actions/checkout@v3
      - name: Install rsync
@@ -31,8 +31,8 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        platform: [custom-linux]
-
+        platform: [custom-runner-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,14 +1,13 @@
 name: ci-build-ts

 on:
-  pull_request:
+  push:
    paths:
-      - "ts-packages/**"
-      - "sdk/typescript/**"
+      - 'ts-packages/**'

 jobs:
  build:
-    runs-on: ubuntu-20.04-16-core
+    runs-on: custom-runner-linux
    steps:
    - uses: actions/checkout@v2
    - name: Install rsync
@@ -21,7 +20,7 @@ jobs:
    - name: Setup yarn
      run: npm install -g yarn
    - name: Build
-      run: yarn && yarn build && yarn build:ci:storybook
+      run: yarn && yarn build && yarn build:ci
    - name: Deploy branch to CI www (storybook)
      continue-on-error: true
      uses: easingthemes/ssh-deploy@main
@@ -2,6 +2,20 @@ 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/**'
@@ -17,16 +31,21 @@ on:
      - 'tools/nym-cli/**'
      - 'tools/ts-rs-cli/**'

+env:
+  NETWORK: mainnet
+
 jobs:
  publish-nym:
    strategy:
      fail-fast: false
      matrix:
-        platform: [ubuntu-20.04-16-core]
+        platform: [ubuntu-20.04]

    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

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

      - name: Install Dependencies (Linux)
-        run: sudo apt update && sudo apt install libudev-dev
+        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
@@ -48,6 +48,9 @@ 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,6 +2,10 @@ name: ci-contracts-schema

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

 on:
  workflow_dispatch:
+  push:
+    paths:
+      - 'common/**'
+      - 'contracts/**'
  pull_request:
    paths:
      - 'common/**'
@@ -12,9 +16,16 @@ env:

 jobs:
  publish-nym-contracts:
-    runs-on: ubuntu-20.04-16-core
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [ubuntu-20.04]
+
+    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

@@ -27,6 +38,10 @@ 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:
@@ -35,9 +50,7 @@ jobs:
          override: true

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

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

 jobs:
  build:
-    runs-on: ubuntu-20.04-16-core
+    runs-on: custom-runner-linux
    steps:
      - uses: actions/checkout@v3
      - name: Install rsync
@@ -28,20 +28,15 @@ jobs:
          command: build
          args: --workspace --release --all
      - name: Install mdbook
-        run: (test -x $HOME/.cargo/bin/mdbook || cargo install --vers "^0.4.35" mdbook)
+        run: (test -x $HOME/.cargo/bin/mdbook || cargo install --vers "^0.4.33" mdbook)
      - name: Install mdbook plugins
        run: |
          cargo install --vers "=0.2.2" mdbook-variables && cargo install \
-            --vers "^1.8.0" mdbook-admonish --force && cargo install --vers \
+            --vers "^1.8.0" mdbook-admonish && 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 \
-            # && cd documentation \
-            # && mdbook-admonish install dev-portal \
-            # && mdbook-admonish install docs \
-            # && mdbook-admonish install operators
-
+            && cargo install --vers "^0.7.7" mdbook-linkcheck
      - 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,6 +1,15 @@
 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/**"
@@ -13,7 +22,7 @@ on:

 jobs:
  build:
-    runs-on: ubuntu-20.04-16-core
+    runs-on: custom-runner-linux
    steps:
      - uses: actions/checkout@v2
      - uses: rlespinasse/github-slug-action@v3.x
@@ -28,15 +37,9 @@ 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
-        uses: ./.github/actions/install-wasm-opt
-        with:
-          version: '116'
-
      - name: Set up Go
        uses: actions/setup-go@v4
        with:
@@ -46,7 +49,7 @@ jobs:
        run: yarn

      - name: Build packages
-        run: yarn build:ci
+        run: yarn build:ci:sdk

      - name: Lint
        run: yarn lint
@@ -1,6 +1,16 @@
 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/**"
@@ -14,9 +24,11 @@ on:

 jobs:
  build:
-    runs-on: ubuntu-20.04-16-core
+    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:
-  pull_request:
+  push:
    paths:
      - 'nym-connect/desktop/**'

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

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

 jobs:
  build:
-    runs-on: custom-linux
+    runs-on: custom-runner-linux
    steps:
    - uses: actions/checkout@v2
    - name: Install rsync
@@ -16,9 +16,11 @@ on:

 jobs:
  build:
-    runs-on: custom-linux
+    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,44 +1,35 @@
-name: ci-nym-wallet-storybook
+name: Nym Wallet Storybook

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

 jobs:
  build:
-    runs-on: custom-linux
+    runs-on: custom-runner-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
@@ -50,11 +41,9 @@ 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,6 +1,10 @@
 name: ci-sdk-docs-typescript

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

 jobs:
  build:
-    runs-on: ubuntu-20.04-16-core
+    runs-on: custom-runner-linux
    steps:
      - uses: actions/checkout@v2
      - name: Install rsync
@@ -30,14 +34,6 @@ 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-linux
+    runs-on: [custom-runner-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,13 +32,12 @@ 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'
+        run: cargo install wasm-opt

      - 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-linux
+    runs-on: custom-runner-linux
    steps:
      - name: Collect jobs status
        uses: technote-space/workflow-conclusion-action@v2
@@ -68,7 +68,7 @@ jobs:

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

 on:
  schedule:
@@ -26,7 +26,7 @@ jobs:
          path: .github/workflows/support-files/notifications/deny.message
  notification:
    needs: cargo-deny
-    runs-on: custom-linux
+    runs-on: custom-runner-linux
    steps:
      - name: Check out repository code
        uses: actions/checkout@v2
@@ -14,7 +14,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        platform: [macos-12-large]
+        platform: [macos-latest]
    runs-on: ${{ matrix.platform }}

    outputs:
@@ -14,7 +14,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        platform: [macos-12-large]
+        platform: [macos-latest]
    runs-on: ${{ matrix.platform }}

    outputs:
@@ -1,4 +1,4 @@
-name: publish-nyms5-android-apk
+name: Nyms5 Android
 # 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-linux
+    runs-on: custom-runner-linux
    steps:
      - name: Checkout
        uses: actions/checkout@v3
@@ -4,7 +4,7 @@ on:

 jobs:
  publish:
-    runs-on: ubuntu-20.04-16-core
+    runs-on: [custom-ubuntu-20.04]
    steps:
      - uses: actions/checkout@v2

@@ -25,9 +25,6 @@ jobs:
      - 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
-
      - name: Install dependencies
        run: yarn

@@ -37,7 +37,7 @@ dependencies = [
 "actix-utils",
 "ahash 0.8.3",
 "base64 0.21.4",
- "bitflags 2.4.0",
+ "bitflags 2.4.1",
 "brotli",
 "bytes",
 "bytestring",
@@ -613,7 +613,7 @@ dependencies = [
 "log",
 "parking",
 "polling",
- "rustix 0.37.24",
+ "rustix 0.37.25",
 "slab",
 "socket2 0.4.9",
 "waker-fn",
@@ -663,9 +663,9 @@ dependencies = [

 [[package]]
 name = "async-trait"
-version = "0.1.73"
+version = "0.1.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
+checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -923,9 +923,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"

 [[package]]
 name = "bitflags"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"

 [[package]]
 name = "bitvec"
@@ -2085,9 +2085,9 @@ dependencies = [

 [[package]]
 name = "curl-sys"
-version = "0.4.67+curl-8.3.0"
+version = "0.4.68+curl-8.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cc35d066510b197a0f72de863736641539957628c8a42e70e27c66849e77c34"
+checksum = "b4a0d18d88360e374b16b2273c832b5e57258ffc1d4aa4f96b108e0738d5752f"
 dependencies = [
 "cc",
 "libc",
@@ -2409,10 +2409,11 @@ dependencies = [

 [[package]]
 name = "deranged"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946"
+checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3"
 dependencies = [
+ "powerfmt",
 "serde",
 ]

@@ -2497,7 +2498,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "35b50dba0afdca80b187392b24f2499a88c336d5a8493e4b4ccfb608708be56a"
 dependencies = [
- "bitflags 2.4.0",
+ "bitflags 2.4.1",
 "proc-macro2",
 "proc-macro2-diagnostics",
 "quote",
@@ -2681,9 +2682,9 @@ dependencies = [

 [[package]]
 name = "ed25519"
-version = "2.2.2"
+version = "2.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d"
+checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
 dependencies = [
 "pkcs8 0.10.2",
 "signature 2.1.0",
@@ -2724,7 +2725,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980"
 dependencies = [
 "curve25519-dalek 4.1.1",
- "ed25519 2.2.2",
+ "ed25519 2.2.3",
 "rand_core 0.6.4",
 "serde",
 "sha2 0.10.8",
@@ -3005,7 +3006,7 @@ dependencies = [

 [[package]]
 name = "extension-storage"
-version = "1.2.0"
+version = "1.2.0-rc.10"
 dependencies = [
 "bip39",
 "console_error_panic_hook",
@@ -3151,9 +3152,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"

 [[package]]
 name = "flate2"
-version = "1.0.27"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
+checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
 dependencies = [
 "crc32fast",
 "libz-sys",
@@ -4072,9 +4073,9 @@ dependencies = [

 [[package]]
 name = "if-watch"
-version = "3.0.1"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9465340214b296cd17a0009acdb890d6160010b8adf8f78a00d0d7ab270f79f"
+checksum = "bbb892e5777fe09e16f3d44de7802f4daa7267ecbe8c466f19d94e25bb0c303e"
 dependencies = [
 "async-io",
 "core-foundation",
@@ -4086,7 +4087,7 @@ dependencies = [
 "rtnetlink",
 "system-configuration",
 "tokio",
- "windows 0.34.0",
+ "windows 0.51.1",
 ]

 [[package]]
@@ -4298,7 +4299,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
 dependencies = [
 "hermit-abi 0.3.3",
- "rustix 0.38.18",
+ "rustix 0.38.19",
 "windows-sys 0.48.0",
 ]

@@ -5550,7 +5551,7 @@ dependencies = [

 [[package]]
 name = "mix-fetch-wasm"
-version = "1.2.0"
+version = "1.2.0-rc.10"
 dependencies = [
 "futures",
 "js-sys",
@@ -5814,7 +5815,7 @@ version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
 dependencies = [
- "bitflags 2.4.0",
+ "bitflags 2.4.1",
 "cfg-if",
 "libc",
 ]
@@ -6246,7 +6247,7 @@ dependencies = [

 [[package]]
 name = "nym-client-wasm"
-version = "1.2.0"
+version = "1.2.0-rc.10"
 dependencies = [
 "anyhow",
 "futures",
@@ -6875,7 +6876,7 @@ dependencies = [

 [[package]]
 name = "nym-node-tester-wasm"
-version = "1.2.0"
+version = "1.2.0-rc.10"
 dependencies = [
 "futures",
 "js-sys",
@@ -7469,7 +7470,7 @@ dependencies = [

 [[package]]
 name = "nym-wasm-sdk"
-version = "1.2.0"
+version = "1.2.0-rc.10"
 dependencies = [
 "mix-fetch-wasm",
 "nym-client-wasm",
@@ -7566,7 +7567,7 @@ version = "0.10.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c"
 dependencies = [
- "bitflags 2.4.0",
+ "bitflags 2.4.1",
 "cfg-if",
 "foreign-types",
 "libc",
@@ -7721,9 +7722,9 @@ dependencies = [

 [[package]]
 name = "os_str_bytes"
-version = "6.5.1"
+version = "6.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac"
+checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1"

 [[package]]
 name = "overload"
@@ -8158,6 +8159,12 @@ dependencies = [
 "universal-hash 0.5.1",
 ]

+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
 [[package]]
 name = "ppv-lite86"
 version = "0.2.17"
@@ -8772,14 +8779,14 @@ dependencies = [

 [[package]]
 name = "regex"
-version = "1.10.0"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d119d7c7ca818f8a53c300863d4f87566aac09943aef5b355bb83969dae75d87"
+checksum = "aaac441002f822bc9705a681810a4dd2963094b9ca0ddc41cb963a4c189189ea"
 dependencies = [
 "aho-corasick",
 "memchr",
- "regex-automata 0.4.1",
- "regex-syntax 0.8.0",
+ "regex-automata 0.4.2",
+ "regex-syntax 0.8.2",
 ]

 [[package]]
@@ -8793,13 +8800,13 @@ dependencies = [

 [[package]]
 name = "regex-automata"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "465c6fc0621e4abc4187a2bda0937bfd4f722c2730b29562e19689ea796c9a4b"
+checksum = "5011c7e263a695dc8ca064cddb722af1be54e517a280b12a5356f98366899e5d"
 dependencies = [
 "aho-corasick",
 "memchr",
- "regex-syntax 0.8.0",
+ "regex-syntax 0.8.2",
 ]

 [[package]]
@@ -8810,9 +8817,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"

 [[package]]
 name = "regex-syntax"
-version = "0.8.0"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3cbb081b9784b07cceb8824c8583f86db4814d172ab043f3c23f7dc600bf83d"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"

 [[package]]
 name = "reqwest"
@@ -8901,9 +8908,9 @@ dependencies = [

 [[package]]
 name = "ring"
-version = "0.17.3"
+version = "0.17.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9babe80d5c16becf6594aa32ad2be8fe08498e7ae60b77de8df700e67f191d7e"
+checksum = "fce3045ffa7c981a6ee93f640b538952e155f1ae3a1a02b84547fc7a56b7059a"
 dependencies = [
 "cc",
 "getrandom 0.2.10",
@@ -9179,9 +9186,9 @@ dependencies = [

 [[package]]
 name = "rustix"
-version = "0.37.24"
+version = "0.37.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4279d76516df406a8bd37e7dff53fd37d1a093f997a3c34a5c21658c126db06d"
+checksum = "d4eb579851244c2c03e7c24f501c3432bed80b8f720af1d6e5b0e0f01555a035"
 dependencies = [
 "bitflags 1.3.2",
 "errno",
@@ -9193,11 +9200,11 @@ dependencies = [

 [[package]]
 name = "rustix"
-version = "0.38.18"
+version = "0.38.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a74ee2d7c2581cd139b42447d7d9389b889bdaad3a73f1ebb16f2a3237bb19c"
+checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed"
 dependencies = [
- "bitflags 2.4.0",
+ "bitflags 2.4.1",
 "errno",
 "libc",
 "linux-raw-sys 0.4.10",
@@ -9529,9 +9536,9 @@ dependencies = [

 [[package]]
 name = "serde"
-version = "1.0.188"
+version = "1.0.189"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
+checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537"
 dependencies = [
 "serde_derive",
 ]
@@ -9576,9 +9583,9 @@ dependencies = [

 [[package]]
 name = "serde_derive"
-version = "1.0.188"
+version = "1.0.189"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
+checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -10408,7 +10415,7 @@ dependencies = [
 "cfg-if",
 "fastrand 2.0.1",
 "redox_syscall 0.3.5",
- "rustix 0.38.18",
+ "rustix 0.38.19",
 "windows-sys 0.48.0",
 ]

@@ -10420,7 +10427,7 @@ checksum = "3f0a7d05cf78524782337f8edd55cbc578d159a16ad4affe2135c92f7dbac7f0"
 dependencies = [
 "bytes",
 "digest 0.10.7",
- "ed25519 2.2.2",
+ "ed25519 2.2.3",
 "ed25519-consensus",
 "flex-error",
 "futures",
@@ -10525,7 +10532,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
 dependencies = [
- "rustix 0.38.18",
+ "rustix 0.38.19",
 "windows-sys 0.48.0",
 ]

@@ -10589,13 +10596,14 @@ dependencies = [

 [[package]]
 name = "time"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe"
+checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
 dependencies = [
 "deranged",
 "itoa",
 "js-sys",
+ "powerfmt",
 "serde",
 "time-core",
 "time-macros",
@@ -10946,11 +10954,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"

 [[package]]
 name = "tracing"
-version = "0.1.37"
+version = "0.1.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+checksum = "ee2ef2af84856a50c1d430afce2fdded0a4ec7eda868db86409b4543df0797f9"
 dependencies = [
- "cfg-if",
 "log",
 "pin-project-lite 0.2.13",
 "tracing-attributes",
@@ -10959,9 +10966,9 @@ dependencies = [

 [[package]]
 name = "tracing-attributes"
-version = "0.1.26"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -10970,9 +10977,9 @@ dependencies = [

 [[package]]
 name = "tracing-core"
-version = "0.1.31"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
 dependencies = [
 "once_cell",
 "valuable",
@@ -11791,7 +11798,7 @@ version = "0.22.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53"
 dependencies = [
- "ring 0.17.3",
+ "ring 0.17.4",
 "untrusted 0.9.0",
 ]

@@ -12036,7 +12043,7 @@ dependencies = [
 "either",
 "home",
 "once_cell",
- "rustix 0.38.18",
+ "rustix 0.38.19",
 ]

 [[package]]
@@ -12078,22 +12085,28 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

 [[package]]
 name = "windows"
-version = "0.34.0"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45296b64204227616fdbf2614cefa4c236b98ee64dfaaaa435207ed99fe7829f"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
 dependencies = [
- "windows_aarch64_msvc 0.34.0",
- "windows_i686_gnu 0.34.0",
- "windows_i686_msvc 0.34.0",
- "windows_x86_64_gnu 0.34.0",
- "windows_x86_64_msvc 0.34.0",
+ "windows-targets 0.48.5",
 ]

 [[package]]
 name = "windows"
-version = "0.48.0"
+version = "0.51.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9"
+dependencies = [
+ "windows-core",
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.51.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
 dependencies = [
 "windows-targets 0.48.5",
 ]
@@ -12158,12 +12171,6 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"

-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.42.2"
@@ -12176,12 +12183,6 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"

-[[package]]
-name = "windows_i686_gnu"
-version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.42.2"
@@ -12194,12 +12195,6 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"

-[[package]]
-name = "windows_i686_msvc"
-version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.42.2"
@@ -12212,12 +12207,6 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"

-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.42.2"
@@ -12242,12 +12231,6 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"

-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.42.2"
@@ -12262,9 +12245,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"

 [[package]]
 name = "winnow"
-version = "0.5.16"
+version = "0.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "037711d82167854aff2018dfd193aa0fef5370f456732f0d5a0c59b0f1b4b907"
+checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c"
 dependencies = [
 "memchr",
 ]
@@ -12457,11 +12440,10 @@ dependencies = [

 [[package]]
 name = "zstd-sys"
-version = "2.0.8+zstd.1.5.5"
+version = "2.0.9+zstd.1.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c"
+checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656"
 dependencies = [
 "cc",
- "libc",
 "pkg-config",
 ]
@@ -74,7 +74,7 @@ impl PartiallyDelegated {

    fn route_socket_messages(
        ws_msgs: Vec<Message>,
-        packet_router: &PacketRouter,
+        packet_router: &mut PacketRouter,
        shared_key: &SharedKeys,
    ) -> Result<(), GatewayClientError> {
        let plaintexts = Self::recover_received_plaintexts(ws_msgs, shared_key);
@@ -97,6 +97,7 @@ impl PartiallyDelegated {
        let mixnet_receiver_future = async move {
            let mut notify_receiver = notify_receiver;
            let mut chunk_stream = (&mut stream).ready_chunks(8);
+            let mut packet_router = packet_router;

            let ret_err = loop {
                tokio::select! {
@@ -114,7 +115,7 @@ impl PartiallyDelegated {
                            Ok(msgs) => msgs
                        };

-                        if let Err(err) = Self::route_socket_messages(ws_msgs, &packet_router, shared_key.as_ref()) {
+                        if let Err(err) = Self::route_socket_messages(ws_msgs, &mut packet_router, shared_key.as_ref()) {
                            log::warn!("Route socket messages failed: {err}");
                        }
                    }
@@ -42,9 +42,7 @@ pub trait GatewayPacketRouter {
                }

                n if n
-                    == PacketSize::OutfoxRegularPacket
-                        .plaintext_size()
-                        .saturating_sub(outfox_ack_overhead) =>
+                    == PacketSize::OutfoxRegularPacket.plaintext_size() - outfox_ack_overhead =>
                {
                    trace!("received regular outfox packet");
                    received_messages.push(received_packet);
@@ -1,52 +0,0 @@
-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,6 +4,4 @@ use thiserror::Error;
 pub enum WgError {
    #[error("unable to get tunnel")]
    UnableToGetTunnel,
-    #[error("handshake failed")]
-    HandshakeFailed,
 }
@@ -3,31 +3,25 @@ use std::fmt::{Display, Formatter};
 use bytes::Bytes;

 #[allow(unused)]
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub enum Event {
-    /// IP packet received from the WireGuard tunnel that should be passed through to the
-    /// corresponding virtual device/internet.
-    Wg(Bytes),
-    /// IP packet received from the WireGuard tunnel that was verified as part of the handshake.
-    WgVerified(Bytes),
+    /// IP packet received from the WireGuard tunnel that should be passed through to the corresponding virtual device/internet.
+    /// Original implementation also has protocol here since it understands it, but we'll have to infer it downstream
+    WgPacket(Bytes),
    /// IP packet to be sent through the WireGuard tunnel as crafted by the virtual device.
-    Ip(Bytes),
+    IpPacket(Bytes),
 }

 impl Display for Event {
    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
        match self {
-            Event::Wg(data) => {
+            Event::WgPacket(data) => {
                let size = data.len();
-                write!(f, "Wg{{ size={size} }}")
+                write!(f, "WgPacket{{ size={size} }}")
            }
-            Event::WgVerified(data) => {
+            Event::IpPacket(data) => {
                let size = data.len();
-                write!(f, "WgVerified{{ size={size} }}")
-            }
-            Event::Ip(data) => {
-                let size = data.len();
-                write!(f, "Ip{{ size={size} }}")
+                write!(f, "IpPacket{{ size={size} }}")
            }
        }
    }
@@ -1,14 +1,9 @@
 #![cfg_attr(not(target_os = "linux"), allow(dead_code))]
-// #![warn(clippy::pedantic)]
-// #![warn(clippy::expect_used)]
-// #![warn(clippy::unwrap_used)]

-mod active_peers;
 mod error;
 mod event;
 mod network_table;
 mod platform;
-mod registered_peers;
 mod setup;
 mod udp_listener;
 mod wg_tunnel;
@@ -18,7 +13,7 @@ mod wg_tunnel;
 use platform::linux::tun_device;

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

 impl TunTaskTx {
    fn send(&self, packet: Vec<u8>) -> Result<(), tokio::sync::mpsc::error::SendError<Vec<u8>>> {
@@ -26,26 +21,21 @@ impl TunTaskTx {
    }
 }

-/// Start wireguard UDP listener and TUN device
-///
-/// # Errors
-///
-/// This function will return an error if either the UDP listener of the TUN device fails to start.
 #[cfg(target_os = "linux")]
 pub async fn start_wireguard(
    task_client: nym_task::TaskClient,
 ) -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
    use std::sync::Arc;

+    // The set of active tunnels indexed by the peer's address
+    let active_peers = Arc::new(udp_listener::ActivePeers::new());
    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, tun_task_tx) = tun_device::TunDevice::new(peers_by_ip.clone());
-    tun.start();
+    let tun_task_tx = tun_device::start_tun_device(peers_by_ip.clone());

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

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

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

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

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

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

-    // The routing table.
-    // An alternative would be to do NAT by just matching incoming with outgoing.
-    peers_by_ip: Arc<std::sync::Mutex<PeersByIp>>,
-}
+    // 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);

-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) {
+    tokio::spawn(async move {
        let mut buf = [0u8; 1024];
-
        loop {
            tokio::select! {
                // Reading from the TUN device
-                len = self.tun.read(&mut buf) => match len {
+                len = tun_device_rx.read(&mut buf) => match len {
                    Ok(len) => {
                        let packet = &buf[..len];
-                        self.handle_tun_read(packet);
+                        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::IpPacket(packet.to_vec().into()))
+                                .tap_err(|err| log::error!("{err}"))
+                                .unwrap();
+                        } else {
+                            log::info!("No peer found, packet dropped");
+                        }
                    },
                    Err(err) => {
                        log::info!("iface: read error: {err}");
                        break;
                    }
                },
+
                // Writing to the TUN device
-                Some(data) = self.tun_task_rx.recv() => {
-                    self.handle_tun_write(data).await;
+                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();
                }
            }
        }
        log::info!("TUN device shutting down");
-    }
-
-    pub fn start(self) {
-        tokio::spawn(async move { self.run().await });
-    }
+    });
+    tun_task_tx
 }
@@ -1,56 +0,0 @@
-use std::{collections::HashMap, sync::Arc};
-
-use boringtun::x25519;
-use ip_network::IpNetwork;
-
-pub(crate) type PeerIdx = u32;
-
-#[derive(Debug)]
-pub(crate) struct RegisteredPeer {
-    pub(crate) public_key: x25519::PublicKey,
-    pub(crate) index: PeerIdx,
-    pub(crate) allowed_ips: IpNetwork,
-    // endpoint: SocketAddr,
-}
-
-#[derive(Debug, Default)]
-pub(crate) struct RegisteredPeers {
-    peers: HashMap<x25519::PublicKey, Arc<tokio::sync::Mutex<RegisteredPeer>>>,
-    peers_by_idx: HashMap<PeerIdx, Arc<tokio::sync::Mutex<RegisteredPeer>>>,
-}
-
-impl RegisteredPeers {
-    pub(crate) async fn insert(
-        &mut self,
-        public_key: x25519::PublicKey,
-        peer: Arc<tokio::sync::Mutex<RegisteredPeer>>,
-    ) {
-        let peer_idx = { peer.lock().await.index };
-        self.peers.insert(public_key, Arc::clone(&peer));
-        self.peers_by_idx.insert(peer_idx, peer);
-    }
-
-    #[allow(unused)]
-    pub(crate) async fn remove(&mut self, public_key: &x25519::PublicKey) {
-        if let Some(peer) = self.peers.remove(public_key) {
-            let peer_idx = peer.lock().await.index;
-            if self.peers_by_idx.remove(&peer_idx).is_none() {
-                log::error!("Removed registered peer but no registered index was found");
-            }
-        }
-    }
-
-    pub(crate) fn get_by_key(
-        &self,
-        public_key: &x25519::PublicKey,
-    ) -> Option<&Arc<tokio::sync::Mutex<RegisteredPeer>>> {
-        self.peers.get(public_key)
-    }
-
-    pub(crate) fn get_by_idx(
-        &self,
-        peer_idx: PeerIdx,
-    ) -> Option<&Arc<tokio::sync::Mutex<RegisteredPeer>>> {
-        self.peers_by_idx.get(&peer_idx)
-    }
-}
@@ -50,7 +50,7 @@ pub fn peer_static_public_key() -> x25519::PublicKey {
    let peer_static_public_bytes: [u8; 32] = decode_base64_key(PEER);
    let peer_static_public = x25519::PublicKey::try_from(peer_static_public_bytes).unwrap();
    info!(
-        "Adding wg peer public key: {}",
+        "peer public key: {}",
        general_purpose::STANDARD.encode(peer_static_public)
    );
    peer_static_public
@@ -1,9 +1,6 @@
-use std::{net::SocketAddr, sync::Arc, time::Duration};
+use std::{net::SocketAddr, sync::Arc};

-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;
@@ -14,110 +11,51 @@ use tokio::{
 };

 use crate::{
-    active_peers::ActivePeers,
-    error::WgError,
    event::Event,
    network_table::NetworkTable,
-    registered_peers::{RegisteredPeer, RegisteredPeers},
    setup::{self, WG_ADDRESS, WG_PORT},
    TunTaskTx,
 };

 const MAX_PACKET: usize = 65535;

-// Registered peers
+pub(crate) type ActivePeers = DashMap<SocketAddr, mpsc::UnboundedSender<Event>>;
 pub(crate) type PeersByIp = NetworkTable<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;
-    let peer_allowed_ips = setup::peer_allowed_ips();
-    let test_peer = Arc::new(tokio::sync::Mutex::new(RegisteredPeer {
-        public_key: peer_static_public,
-        index: peer_index,
-        allowed_ips: peer_allowed_ips,
-    }));
-    registered_peers.insert(peer_static_public, test_peer).await;
-}
-
-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>>,
-
-    // The UDP socket to the peer
-    udp: Arc<UdpSocket>,
-
-    // Send data to the TUN device for sending
+pub(crate) async fn start_udp_listener(
    tun_task_tx: TunTaskTx,
+    active_peers: Arc<ActivePeers>,
+    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_socket = Arc::new(UdpSocket::bind(wg_address).await?);

-    // Wireguard rate limiter
-    rate_limiter: RateLimiter,
-}
+    // Setup some static keys for development
+    let static_private = setup::server_static_private_key();
+    let peer_static_public = setup::peer_static_public_key();
+    let peer_allowed_ips = setup::peer_allowed_ips();

-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();
+    tokio::spawn(async move {
        // 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();
-
        let mut buf = [0u8; MAX_PACKET];
-        let mut dst_buf = [0u8; MAX_PACKET];

        while !task_client.is_shutdown() {
            tokio::select! {
-                () = task_client.recv() => {
+                _ = task_client.recv() => {
                    log::trace!("WireGuard UDP listener: received shutdown");
                    break;
                }
-                // Reset the rate limiter every 1 sec
-                () = tokio::time::sleep(Duration::from_secs(1)) => {
-                    self.rate_limiter.reset_count();
-                },
                // Handle tunnel closing
-                Some(public_key) = active_peers_task_handles.next() => {
-                    match public_key {
-                        Ok(public_key) => {
-                            active_peers.remove(&public_key);
+                Some(addr) = active_peers_task_handles.next() => {
+                    match addr {
+                        Ok(addr) => {
+                            log::info!("Removing peer: {addr:?}");
+                            active_peers.remove(&addr);
+                            // TODO: remove from peers_by_ip
                        }
                        Err(err) => {
                            error!("WireGuard UDP listener: error receiving shutdown from peer: {err}");
@@ -125,122 +63,47 @@ impl WgUdpListener {
                    }
                },
                // Handle incoming packets
-                Ok((len, addr)) = self.udp.recv_from(&mut buf) => {
+                Ok((len, addr)) = udp_socket.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.get_by_addr(&addr) {
+                    if let Some(peer_tx) = active_peers.get_mut(&addr) {
                        log::info!("udp: received {len} bytes from {addr} from known peer");
-                        peer_tx
-                            .send(Event::Wg(buf[..len].to_vec().into()))
-                            .tap_err(|e| log::error!("{e}"))
-                            .ok();
-                        continue;
-                    }
-
-                    // Verify the incoming packet
-                    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}");
-                            self.udp.send_to(cookie, addr).await.tap_err(|e| log::error!("{e}")).ok();
-                            continue;
-                        }
-                        Err(err) => {
-                            log::warn!("{err:?}");
-                            continue;
-                        }
-                    };
-
-                    // Check if this is a registered peer, if not, just skip
-                    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_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()))
+                        peer_tx.send(Event::WgPacket(buf[..len].to_vec().into()))
                            .tap_err(|err| log::error!("{err}"))
-                            .ok();
+                            .unwrap();
                    } else {
-                        // If it isn't, start a new tunnel
                        log::info!("udp: received {len} bytes from {addr} from unknown peer, starting tunnel");
-                        // NOTE: we are NOT passing in the existing rate_limiter. Re-visit this
-                        // choice later.
-                        log::warn!("Creating new rate limiter, consider re-using?");
+                        // TODO: this is a temporary solution for development since this
+                        // assumes we know the peer_static_public this corresponds to.
+                        // TODO: rework this before production! This is likely not secure!
+                        log::warn!("Assuming peer_static_public is known");
+                        log::warn!("SECURITY: Rework me to do proper handshake before creating the tunnel!");
                        let (join_handle, peer_tx) = crate::wg_tunnel::start_wg_tunnel(
                            addr,
-                            self.udp.clone(),
-                            self.static_private.clone(),
-                            registered_peer.public_key,
-                            registered_peer.index,
-                            registered_peer.allowed_ips,
-                            self.tun_task_tx.clone(),
+                            udp_socket.clone(),
+                            static_private.clone(),
+                            peer_static_public,
+                            peer_allowed_ips,
+                            tun_task_tx.clone(),
                        );

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

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

-                        log::info!("Adding peer: {:?}: {addr}", registered_peer.public_key);
-                        active_peers.insert(registered_peer.public_key, addr, peer_tx);
+                        // WIP(JON): active peers should probably be keyed by peer_static_public
+                        // instead. Does this current setup lead to any issues?
+                        log::info!("Adding peer: {addr}");
+                        active_peers.insert(addr, peer_tx);
                        active_peers_task_handles.push(join_handle);
                    }
                },
            }
        }
        log::info!("WireGuard listener: shutting down");
-    }
+    });

-    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)
+    Ok(())
 }
@@ -2,7 +2,7 @@ use std::{net::SocketAddr, sync::Arc, time::Duration};

 use async_recursion::async_recursion;
 use boringtun::{
-    noise::{errors::WireGuardError, rate_limiter::RateLimiter, Tunn, TunnResult},
+    noise::{errors::WireGuardError, Tunn, TunnResult},
    x25519,
 };
 use bytes::Bytes;
@@ -14,11 +14,7 @@ use tokio::{
    time::timeout,
 };

-use crate::{
-    error::WgError, event::Event, network_table::NetworkTable, registered_peers::PeerIdx, TunTaskTx,
-};
-
-const HANDSHAKE_MAX_RATE: u64 = 10;
+use crate::{error::WgError, event::Event, network_table::NetworkTable, TunTaskTx};

 const MAX_PACKET: usize = 65535;

@@ -59,9 +55,7 @@ impl WireGuardTunnel {
        endpoint: SocketAddr,
        static_private: x25519::StaticSecret,
        peer_static_public: x25519::PublicKey,
-        index: PeerIdx,
        peer_allowed_ips: ip_network::IpNetwork,
-        // rate_limiter: Option<RateLimiter>,
        tunnel_tx: TunTaskTx,
    ) -> (Self, mpsc::UnboundedSender<Event>) {
        let local_addr = udp.local_addr().unwrap();
@@ -70,12 +64,8 @@ impl WireGuardTunnel {

        let preshared_key = None;
        let persistent_keepalive = None;
-
-        let static_public = x25519::PublicKey::from(&static_private);
-        let rate_limiter = Some(Arc::new(RateLimiter::new(
-            &static_public,
-            HANDSHAKE_MAX_RATE,
-        )));
+        let index = 0;
+        let rate_limiter = None;

        let wg_tunnel = Arc::new(tokio::sync::Mutex::new(
            Tunn::new(
@@ -127,17 +117,12 @@ impl WireGuardTunnel {
                    Some(packet) => {
                        info!("event loop: {packet}");
                        match packet {
-                            Event::Wg(data) => {
+                            Event::WgPacket(data) => {
                                let _ = self.consume_wg(&data)
                                    .await
                                    .tap_err(|err| error!("WireGuard tunnel: consume_wg error: {err}"));
                            },
-                            Event::WgVerified(data) => {
-                                let _ = self.consume_verified_wg(&data)
-                                    .await
-                                    .tap_err(|err| error!("WireGuard tunnel: consume_verified_wg error: {err}"));
-                            }
-                            Event::Ip(data) => self.consume_eth(&data).await,
+                            Event::IpPacket(data) => self.consume_eth(&data).await,
                        }
                    },
                    None => {
@@ -145,7 +130,7 @@ impl WireGuardTunnel {
                        break;
                    },
                },
-                () = tokio::time::sleep(Duration::from_millis(250)) => {
+                _ = tokio::time::sleep(Duration::from_millis(250)) => {
                    let _ = self.update_wg_timers()
                        .await
                        .map_err(|err| error!("WireGuard tunnel: update_wg_timers error: {err}"));
@@ -197,6 +182,8 @@ impl WireGuardTunnel {
                }
            }
            TunnResult::WriteToTunnelV4(packet, addr) => {
+                // TODO: once the flow is redone, we should add updating the endpoint dynamically
+                // self.set_endpoint(addr);
                if self.allowed_ips.longest_match(addr).is_some() {
                    self.tun_task_tx.send(packet.to_vec()).unwrap();
                } else {
@@ -204,6 +191,8 @@ impl WireGuardTunnel {
                }
            }
            TunnResult::WriteToTunnelV6(packet, addr) => {
+                // TODO: once the flow is redone, we should add updating the endpoint dynamically
+                // self.set_endpoint(addr);
                if self.allowed_ips.longest_match(addr).is_some() {
                    self.tun_task_tx.send(packet.to_vec()).unwrap();
                } else {
@@ -220,13 +209,6 @@ impl WireGuardTunnel {
        Ok(())
    }

-    async fn consume_verified_wg(&mut self, data: &[u8]) -> Result<(), WgError> {
-        // Potentially we could take some shortcuts here in the name of performance, but currently
-        // I don't see that the needed functions in boringtun is exposed in the public API.
-        // TODO: make sure we don't put double pressure on the rate limiter!
-        self.consume_wg(data).await
-    }
-
    async fn consume_eth(&self, data: &Bytes) {
        info!("consume_eth: raw packet size: {}", data.len());
        let encapsulated_packet = self.encapsulate_packet(data).await;
@@ -287,7 +269,7 @@ impl WireGuardTunnel {
                    return;
                };
                peer.format_handshake_initiation(&mut buf[..], false);
-                self.handle_routine_tun_result(result).await;
+                self.handle_routine_tun_result(result).await
            }
            TunnResult::Err(err) => {
                error!("Failed to prepare routine packet for WireGuard endpoint: {err:?}");
@@ -305,11 +287,10 @@ pub(crate) fn start_wg_tunnel(
    udp: Arc<UdpSocket>,
    static_private: x25519::StaticSecret,
    peer_static_public: x25519::PublicKey,
-    peer_index: PeerIdx,
    peer_allowed_ips: ip_network::IpNetwork,
    tunnel_tx: TunTaskTx,
 ) -> (
-    tokio::task::JoinHandle<x25519::PublicKey>,
+    tokio::task::JoinHandle<SocketAddr>,
    mpsc::UnboundedSender<Event>,
 ) {
    let (mut tunnel, peer_tx) = WireGuardTunnel::new(
@@ -317,13 +298,12 @@ pub(crate) fn start_wg_tunnel(
        endpoint,
        static_private,
        peer_static_public,
-        peer_index,
        peer_allowed_ips,
        tunnel_tx,
    );
    let join_handle = tokio::spawn(async move {
        tunnel.spin_off().await;
-        peer_static_public
+        endpoint
    });
    (join_handle, peer_tx)
 }
@@ -17,7 +17,8 @@ This is a *reference page*, to see the entire presentation join Max's talk at [H
 ## SDKs

 * [Rust SDK](https://nymtech.net/docs/sdk/rust.html)
-* [Typescript SDK](https://sdk.nymtech.net/)
+* [Typescript SDK](https://nymtech.net/docs/sdk/typescript.html)
+* [Interactive Typescript SDK docs](https://sdk.nymtech.net)

 ### Rust examples

@@ -2,8 +2,4 @@

 Welcome to the Nym Developer Portal, containing quickstart resources, user manuals, integration information, and tutorials outlining to start building privacy enhanced apps.

-For more in-depth information about nodes, network traffic flows, clients, coconut etc check out the [docs](https://nymtech.net/docs). 
-
-If you are looking for information and setup guides for the various pieces of Nym mixnet infrastructure (mix nodes, gateways and network requesters) and Nyx blockchain validators see the **new [Operators Guides](https://nymtech.net/operators)** book. 
-
-If you're looking for TypeScript/JavaScript related information such as SDKs to build your own tools, step-by-step tutorials, live playgrounds and more, make sure to check out the **new [TS SDK Handbook](https://sdk.nymtech.net/)** !
+For more in-depth information about nodes, network traffic flows, clients, coconut etc check out the [docs](https://nymtech.net/docs). If you are looking for information and setup guides for the various pieces of Nym mixnet infrastructure (mix nodes, gateways and network requesters) and Nyx blockchain validators see the **new [Operators Guides](https://nymtech.net/operators)** book. 
@@ -1,3 +1,3 @@
 # Typescript

-Tutorial code in this section is built to interact with a standalone Nym client. You can read about interacting with standalone clients [here](https://nymtech.net/docs/clients/websocket-client.html#connecting-to-the-local-websocket), although it is usually preferable to use the [Typescript SDK](https://sdk.nymtech.net/). 
+Tutorial code in this section is built to interact with a standalone Nym client. You can read about interacting with standalone clients [here](https://nymtech.net/docs/clients/websocket-client.html#connecting-to-the-local-websocket), although it is usually preferable to use the [Typescript SDK](https://nymtech.net/docs/sdk/typescript.html). 
@@ -2,11 +2,9 @@

 This is Nym's technical documentation, containing information and setup guides about the various pieces of Nym software such as different mixnet infrastructure nodes, application clients, and existing applications like the desktop wallet and mixnet explorer.

-If you are new to Nym and want to learn about the mixnet, explore kickstart options and demos, learn how to integrate with the network, and follow developer tutorials check out the [Developer Portal](https://nymtech.net/developers/) where you can find also our [FAQ section](https://nymtech.net/developers/faq/general-faq.md).
-
 If you are looking for information and setup guides for the various pieces of Nym mixnet infrastructure (mix nodes, gateways and network requesters) and Nyx blockchain validators see the **new [Operators Guides](https://nymtech.net/operators)** book. 

-If you're specically looking for TypeScript/JavaScript related information such as SDKs to build your own tools, step-by-step tutorials, live playgrounds and more - make sure to check out the **new [TS SDK Handbook](https://sdk.nymtech.net/)** !
+If you are new to Nym and want to learn about the mixnet, explore kickstart options and demos, learn how to integrate with the network, and follow developer tutorials check out the [Developer Portal](https://nymtech.net/developers/) where you can find also our [FAQ section](https://nymtech.net/developers/faq/general-faq.md).

 ## Popular pages
 **Network Architecture:**
@@ -14,7 +12,7 @@ If you're specically looking for TypeScript/JavaScript related information such
 * [Mixnet Traffic Flow](./architecture/traffic-flow.md)

 **SDK examples:**
-* [Typescript SDK](https://sdk.nymtech.net/)
+* [Typescript SDK](./sdk/typescript.md)
 * [Rust SDK](./sdk/rust.md)

 **Nyx**
@@ -1,4 +1,66 @@
 # Typescript SDK
 The Typescript SDK allows developers to start building browser-based mixnet applications quickly, by simply importing the SDK into their code via NPM as they would any other Typescript library.

-> If you'd like to learn more, build apps or integrate Nym components using the TS SDK, please visit the **dedicated [TS SDK Handbook](https://sdk.nymtech.net/)** !
+You can find the source code [here](https://github.com/nymtech/nym/tree/master/sdk) and the library on NPM [here](https://www.npmjs.com/package/@nymproject/sdk).
+
+Currently developers can use the SDK to do the following **entirely in the browser**:
+* Create a client
+* Listen for incoming messages and reply to them
+* Encrypt text and binary-encoded messages as Sphinx packets and send these through the mixnet
+
+> We will be fleshing out further mixnet-related features in the coming weeks with functionality such as importing/exporting keypairs for developing apps with a retained identity over time.
+
+In the future the SDK will be made up of several components, each of which will allow developers to interact with different parts of Nym's infrastructure.
+
+| Component | Functionality                                                                  | Released |
+| --------- | ------------------------------------------------------------------------------ | -------- |
+| Mixnet    | Create clients & keypairs, subscribe to Mixnet events, send & receive messages | ✔️       |
+| Coconut   | Create & verify Coconut credentials                                            | ❌       |
+| Validator | Sign & broadcast Nyx blockchain transactions, query the blockchain             | ❌       |
+
+### How it works
+The SDK can be thought of as a 'wrapper' around the compiled [WebAssembly client](https://github.com/nymtech/nym/tree/master/clients/webassembly) code: it runs the client (a Wasm blob) in a web worker. This allows us to keep the work done by the client - such as the heavy lifting of creating and multiply-encrypting Sphinx packets - in a seperate thread from our UI, enabling you to build reactive frontends without worrying about the work done under the hood by the client eating your processing power.
+
+The SDK exposes an interface that allows developers to interact with the Wasm blob inside the webworker from frontend code.
+
+### Framework Support
+Currently, the SDK **only** works with frameworks that use either `Webpack` or `Parcel` as bundlers. If you want to use the SDK with a framework that isn't on this list, such as Angular, or NodeJS, **here be dragons!** These frameworks will probably use a different bundler and you will probably run into problems.
+
+| Bundler | Supported |
+| ------- | --------- |
+| Webpack | ✔️        |
+| Packer  | ✔️        |
+
+Support for environments with different bundlers will be added in subsequent releases.
+
+| Environment      | Supported |
+| ---------------- | --------- |
+| Browser          |  ✔️       |
+| Headless NodeJS  |  ❌       |
+| Electron Desktop |  ❌       |
+
+
+### Using the SDK
+There are multiple example projects in [`nym/sdk/typescript/examples/`](https://github.com/nymtech/nym/tree/master/sdk/typescript/examples/), each for a different frontend framework.
+
+#### Vanilla HTML
+The best place to start if you just want to quickly get a basic frontend up and running with which to experiment is `examples/plain-html`:
+
+```typescript
+{{#include ../../../../sdk/typescript/examples/shared/index.ts}}
+```
+
+As you can see, all that is required to create an ephemeral keypair and connect to the mixnet is creating a client and then subscribing to the mixnet events coming down the websocket, and adding logic to deal with them.
+
+#### Parcel
+If you don't want to use `Webpack` as your app bundler, we have an example with `Parcel` located at [`examples/parcel/`](https://github.com/nymtech/nym/tree/master/sdk/typescript/examples/chat-app/parcel).
+
+#### Create React App
+For React developers we have an example which is a basic React app scaffold with the additional logic for creating a client and subscribing to mixnet events in [`examples/react-webpack-with-theme-example/`](https://github.com/nymtech/nym/tree/master/sdk/typescript/examples/chat-app/react-webpack-with-theme-example).
+
+### Developers: think about what you're sending (and importing)!
+Think about what information your app sends. That goes for whatever you put into your Sphinx packet messages as well as what your app's environment may leak.
+
+Whenever you write client PEApps using HTML/JavaScript, we recommend that you **do not load external resources from CDNs**. Webapp developers do this all the time, to save load time for common resources, or just for convenience. But when you're writing privacy apps it's better not to make these kinds of requests. **Pack everything locally**.
+
+If you use only local resources within your Electron app or your browser extensions, explicitly encoding request data in a Sphinx packet does protect you from the normal leakage that gets sent in a browser HTTP request. [There's a lot of stuff that leaks when you make an HTTP request from a browser window](https://panopticlick.eff.org/). Luckily, all that metadata and request leakage doesn't happen in Nym, because you're choosing very explicitly what to encode into Sphinx packets, instead of sending a whole browser environment by default.
@@ -24,10 +24,6 @@
 - [Mix Nodes](./faq/mixnodes-faq.md)
 - [Project Smoosh](./faq/smoosh-faq.md)

-# Legal Forum
-
- [Exit Gateway](./legal/exit-gateway.md)
-
 --- 
 # Misc.
 - [Code of Conduct](coc.md)
@@ -1,205 +0,0 @@
-# Nym operators - Running Exit Gateway
-
-```admonish info
-The entire content of this page is under [Creative Commons Attribution 4.0 International Public License](https://creativecommons.org/licenses/by/4.0/).
-```
-
-This page is a part of Nym Community Legal Forum and its content is composed by shared advices in [Node Operators Legal Forum](https://matrix.to/#/!YfoUFsJjsXbWmijbPG:nymtech.chat?via=nymtech.chat&via=matrix.org) (Matrix chat) as well as though pull requests done by the node operators directly to our [repository](https://github.com/nymtech/nym/tree/develop/documentation/operators/src), reviewed by Nym DevRels.
-
-This document presents an initiative to further support Nym’s mission of allowing privacy for everyone everywhere. This would be achieved with the support of Nym node operators operating gateways and opening these to any online service with the safeguards of the [Tor Null ‘deny’ list](https://tornull.org/).
-
-
-```admonish warning
-Nym core team cannot provide comprehensive legal advice across all jurisdictions. Knowledge and experience with the legalities are being built up with the help of our counsel and with you, the community of Nym node operators. We encourage Nym node operators to join the operator channels ([Element](https://matrix.to/#/#operators:nymtech.chat), [Discord](https://discord.com/invite/nym), [Telegram](https://t.me/nymchan_help_chat)) to share best practices and experiences.
-```
-
-
-## Summary
-
-* This document outlines a plan to change Nym Gateways from operating with an ‘allow’ to a ‘deny’ list to enable broader uptake and usage of the Nym mixnet. It provides operators with an overview of the plan, pros and cons, legal as well as technical advice. 
-
-* Nym is committed to ensuring privacy for all users, regardless of their location and for the broadest possible range of online services. In order to achieve this aim, the Nym mixnet needs to increase its usability across a broad range of apps and services.
-
-* Currently, Nym Gateway nodes only enable access to apps and services that are on an ‘allow’ list that is maintained by the core team. 
-
-* To decentralise and enable privacy for a broader range of services, this initiative will have to transition from the current ‘allow’ list to a ‘deny’ list (based on the [Tor Null advisory BL](https://tornull.org/)). 
-
-* This will enhance the usage and appeal of Nym products for end users. As a result, increased usage will ultimately lead to higher revenues for Nym operators.
-
-* Nym core team cannot provide operators with definitive answers regarding the potential risks of operating open Gateways. However, there is online evidence of operating Tor exit relays:
-	* From a technical perspective, Nym node operators may need to implement additional controls, such as dedicated hardware and IP usage, or setting up an HTML exit notice on port 80.
-	* From an operational standpoint, node operators may be expected to actively manage their relationship with their ISP or VPS provider and respond to abuse requests using the proposed templates.
-	* Legally, exit relays are typically considered "telecommunication networks" and are subject to intermediary liability protection. However, there may be exceptions, particularly in cases involving criminal law and copyright claims. Operators could seek advice from local privacy associations and may consider running nodes under an entity rather than as individuals.
-
-* This document serves as the basis for a consultation with Nym node operators on any concerns or additional support and information you need for this change to be successful and ensure maximum availability, usability and adoption.
-
-## Goal of the initiative
-
-**Nym supports privacy for everyone, everywhere.**
-
-To offer a better and more private everyday experience for its users, Nym would like them to use any online services they please, without limiting its access to a few messaging apps or crypto wallets.
-
-To achieve this, operators running “gateways” would have to “open” their nodes to a wider range of online services, in a similar fashion to Tor exit relays.
-
-## Pros and cons of the initiative
-
-Previous setup: Running nodes supporting strict SOCKS5 app-based traffic
-
-| **Dimension** | **Pros** | **Cons** |
-| :--- | :--- | :--- |
-| Aspirational |   | - Very limited use cases, not supportive of the “Privacy for everyone everywhere” aspiration<br>- Limited appeal to users, low competitiveness in the market, thus low usage |
-| Technical | - No changes required in technical setup |   |
-| Operational | - No impact on operators operations (e.g., relationships with VPS providers)<br>- Low overhead<br>- Can be run as an individual |   |
-| Legal | - Limited legal risks for operators |    |
-| Financial |    | - Low revenues for operators due to limited product traction | 
-
-
-The new setup: Running nodes supporting traffic of any online service (with safeguards in the form of an denylist)
-
-| **Dimension** | **Pros** | **Cons** |
-| :--- | :--- | :--- |
-| Aspirational | - Higher market appeal of a fully-fledged product able to answer all users’ use cases<br>- Relevance in the market, driving higher usage |   |
-| Technical | - Very limited changes required in the technical setup (changes in the allow -> denylist) | - Increased monitoring required to detect and prevent abuse (e.g. spam) |
-| Operational |    | - Higher operational overhead, such as dealing with DMCA / abuse complaints, managing the VPS provider questions, or helping the community to maintain the denylist <br>- Administrative overhead if running nodes as a company or an entity |
-| Legal |   | - Ideally requires to check legal environment with local privacy association or lawyer | Financial | - Higher revenue potential for operators due to the increase in network usage | - If not running VPS with an unlimited bandwidth plan, higher costs due to higher network usage |
-
-## New gateway setup
-
-In our previous technical setup, network requesters acted as a proxy, and only made requests that match an allow list. That was a default IP based list of allowed domains stored at Nym page in a centralised fashion possibly re-defined by any Network requester operator. 
-
-This restricts the hosts that the NymConnect app can connect to and has the effect of selectively supporting messaging services (e.g. Telegram, Matrix) or crypto wallets (e.g. Electrum or Monero). Operators of network requesters can have confidence that the infrastructure they run only connects to a limited set of public internet hosts.
-
-In the new setup, the main change is to expand this short allow list to a more permissive setup. An exit policy will constrain the hosts that the users of the Nym Mixnet and Nym VPN can connect to. This will be done in an effort to protect the operators, as Gateways will act both as SOCKS5 Network Requesters, and exit nodes for IP traffic from Nym Mixnet VPN and VPN clients (both wrapped in the same app). 
-
-As of now we the gateways will be defaulted to Tornull’s (note: Not affiliated with Tor) deny list - reproduction permitted under Creative Commons Attribution 3.0 United States License which is IP-based, e.g., `ExitPolicy reject 5.188.10.0/23:*`. Whether we will stick with this list, do modifications (likely) or compile another one is still a subject of discussion.
-
-<:--
-These policies will be either reused without modification from Tor / Tornull (license permitting), or customized and updated in a Nym crowd-sourced community effort.
-->
-
-The Gateways will display an HTML page similar to that suggested by [Tor](https://gitlab.torproject.org/tpo/core/tor/-/raw/HEAD/contrib/operator-tools/tor-exit-notice.html) for exit relays on port 80 and port 443. This will allow the operator to provide information about their Gateway, possibly including the currently configured exit policy, without having to actively communicate with law enforcement or regulatory authorities. It also makes the behaviour of the Gateway transparent and even computable (a possible feature would be to offer a machine readable form of the notice in JSON or YAML).
-
-We also recommend operators to check the technical advice from [Tor](https://community.torproject.org/relay/setup/exit/).
-
-## Tor legal advice
-
-Giving the legal similarity between Nym exit gateways and Tor exit relays, it is helpful to have a look in [Tor community Exit Guidelines](https://community.torproject.org/relay/community-resources/tor-exit-guidelines/). This chapter is an exert of tor page.
-
-Note that Tor states: 
-> This FAQ is for informational purposes only and does not constitute legal advice.
-
-*Check legal advice prior to running an exit relay*  
-
-* Understand the risks associated with running an exit relay; E.g., know legal paragraphs relevant in the country of operations:
-    - US [DMCA 512](https://www.law.cornell.edu/uscode/text/17/512); see [EFF's Legal FAQ for TOr Operators](https://community.torproject.org/relay/community-resources/eff-tor-legal-faq) (a very good and relevant read for other countries as well)
-    - Germany’s [TeleMedienGesetz 8](http://www.gesetze-im-internet.de/tmg/__8.html) and [15](http://www.gesetze-im-internet.de/tmg/__15.html)
-    - Netherlands: [Artikel 6:196c BW](http://wetten.overheid.nl/BWBR0005289/Boek6/Titel3/Afdeling4A/Artikel196c/)
-    - Austria: [E-Commerce-Gesetz 13](http://www.ris.bka.gv.at/Dokument.wxe?Abfrage=Bundesnormen&Dokumentnummer=NOR40025809)
-    - Sweden: [16-19 2002:562](https://lagen.nu/2002:562#P16S1)
-* Top 3 advice
-    - Have an abuse response letter
-    - Run relay from a location that is not home
-    - Read through the legal resources that Tor-supportive lawyers put together: https://www.eff.org/pages/legal-faq-tor-relay-operators or https://www.noisebridge.net/wiki/Noisebridge_Tor/FBI
-* Consult a lawyer / local digital rights association / the EFF prior to operating an exit relay, especially in a place where exit relay operators have been harassed or not operating before. Note that Tor DOES NOT provide legal advice for specific countries. It only provides general advice (itself or in partnership), eventually skewed towards [US audiences](https://www.eff.org/pages/legal-faq-tor-relay-operators).
-
-
-*Run an exit relay within an entity*  
-
-As an organisation - it might help from a liability perspective  
-* Within your university
-* With a node operators’ association (e.g., a Torservers.net partner)
-* Within a company
-
-*Be ready to respond to abuse complaints*
-
-* Make your contact details (email, phone, or even fax) available, instead of those of the ISP
-* Reply in a timely manner (e.g., 24 hours) using the [provided templates](https://community.torproject.org/relay/community-resources/tor-abuse-templates)
-* Note that Tor states: *“We are not aware of any case that made it near a court, and we will do everything in our power to support you if it does.”*
-* Document experience with ISPs at [community.torproject.org/relay/community-resources/good-bad-isps](https://community.torproject.org/relay/community-resources/good-bad-isps/)
-
-Useful links:  
-
-* Tor abuse templates:
-    - [community.torproject.org/relay/community-resources/tor-abuse-templates/](https://community.torproject.org/relay/community-resources/tor-abuse-templates/)
-    - [gitlab.torproject.org/legacy/trac/-/wikis/doc/TorAbuseTemplates](https://gitlab.torproject.org/legacy/trac/-/wikis/doc/TorAbuseTemplates) (from 2020)
-    - [github.com/coldhakca/abuse-templates/blob/master/generic.template](https://github.com/coldhakca/abuse-templates/blob/master/generic.template)
-
-* DMCA response templates:
-    - [community.torproject.org/relay/community-resources/eff-tor-legal-faq/tor-dmca-response/](https://community.torproject.org/relay/community-resources/eff-tor-legal-faq/tor-dmca-response/)
-    - [2019.www.torproject.org/eff/tor-dmca-response.html](https://2019.www.torproject.org/eff/tor-dmca-response.html) (from 2011)
-    - [github.com/coldhakca/abuse-templates/blob/master/dmca.template](https://github.com/coldhakca/abuse-templates/blob/master/dmca.template)
-
-
-## Legal environment - Findings from our legal team
-
-```admonish warning
-Nym core team cannot provide comprehensive legal advice across all jurisdictions. Knowledge and experience with the legalities are being built up with the help of our counsel and with you, the community of Nym node operators. We encourage Nym node operators to join the operator channels ([Element](https://matrix.to/#/#operators:nymtech.chat), [Discord](https://discord.com/invite/nym), [Telegram](https://t.me/nymchan_help_chat)) to share best practices and experiences.
-```
-
-The Swiss legal counsel and US legal counsel have so far provided the following advice:
-
-### Switzerland
-
-TBD soon.
-
-### United States
-
-A US counsel shared the following advice:
-
-The legal risk faced by VPN operators subject to United States jurisdiction depends on various statutes and regulations related to privacy, anonymity, and electronic communications. The key areas to consider are: intermediary liability and exceptions, data protection, copyright infringement, export controls, criminal law, government requests for data and assistance, and third party liability.
-
-As outlined in Part A, the United States treats VPNs as telecommunications networks subject to intermediary liability protection from wrongful conduct that occurs on its network. However, such protections do have exceptions including criminal law and copyright claims that are worth considering. In the United States, I am not aware of an individual ever being prosecuted or convicted for running a node for a dVPN or a Privacy Enhancing Network.
-
-However, as discussed in Part B-C, VPN operators are subject to law enforcement requests for access or assistance in obtaining access to data relevant to an investigation into allegedly unlawful conduct that was facilitated by the network as an intermediary. As shown in Part C, governments may also request assistance from node operators for certain high-level and national security targets.
-
-Finally, as outlined in Parts D-G, VPN operators may also be subject to non-criminal liability including (Part D) failing to respond to notices under the DMCA, (Part E) privacy and data protection law, (Part F) third party lawsuits stemming from wrongful acts committed using the network, and (G) export control violations.
-
-
-## How to add legal information
-
-Our aim is to establish a strong community network, sharing legal findings with each other. We would like to encourage all the current and future operators to do research about the situation in the jurisdiction they operate and update this page.
-
-First of all, please join our [Node Operators Legal Forum](https://matrix.to/#/!YfoUFsJjsXbWmijbPG:nymtech.chat?via=nymtech.chat&via=matrix.org) (Matrix chat) and post any information or questions there.
-
-To add your information to this book, you can create a pull request directly to our [repository](https://github.com/nymtech/nym/tree/develop/documentation/operators/src), than ping the admins in the [Legal Forum chat](https://matrix.to/#/!YfoUFsJjsXbWmijbPG:nymtech.chat?via=nymtech.chat&via=matrix.org) and we will review it as fast as possible. 
-
-To do so, follow the steps below:
-
-1. Write your legal findings down in a text editor (Soon we will share a template)
-2. Clone `nymtech/nym` repository and switch to develop branch
-
-```sh
-# Clone the repository
-git clone https://github.com/nymtech/nym
-
-# Go to the directory nym
-cd nym
-
-# Switch to branch develop
-git checkout develop
-
-# Update the repository
-git pull origin develop
-```
-
-3. Make your own branch based off `develop` and switch to it
-
-```sh
-git branch operators/legal-forum/<MY_BRANCH_NAME> # choose a descriptive and consiose name without using <>
-git checkout operators/legal-forum/<MY_BRANCH_NAME>
-
-# you can double check that you are on the right branch
-git branch
-```
-
-4. Save your legal findings as `<FILE_NAME>.md` to `/nym/documentation/operators/src/legal`
-5. Don't change anything in `SUMMARY.md`, the admins will do it when merging
-6. Add, commit and push your changes
-
-```sh
-cd documentation/operators/src/legal
-git add <FILE_NAME>.md
-git commit -am "<describe your changes>"
-git push origin operators/legal-forum/<MY_BRANCH_NAME>
-```
-7. Notify others in the [Node Operators Legal Forum](https://matrix.to/#/!YfoUFsJjsXbWmijbPG:nymtech.chat?via=nymtech.chat&via=matrix.org) (Matrix chat)
@@ -101,7 +101,7 @@ impl ApiCmdProcessor {
    }

    fn ephemera_config<A: Application>(
-        ephemera: &Ephemera<A>,
+        ephemera: &mut Ephemera<A>,
        reply: Sender<api::Result<ApiEphemeraConfig>>,
    ) {
        let node_info = ephemera.node_info.clone();
@@ -191,10 +191,10 @@ impl<A: Application> EphemeraStarterWithApplication<A> {

        let block_manager = self.init_block_manager(&mut storage)?;

-        let (shutdown_manager, shutdown_handle) = ShutdownManager::init();
+        let (mut shutdown_manager, shutdown_handle) = ShutdownManager::init();

        let mut service_data = ServiceInfo::default();
-        let services = self.init_services(&mut service_data, &shutdown_manager, provider)?;
+        let services = self.init_services(&mut service_data, &mut shutdown_manager, provider)?;

        Ok(EphemeraStarterWithProvider {
            with_application: self,
@@ -237,7 +237,7 @@ impl<A: Application> EphemeraStarterWithApplication<A> {
    >(
        &mut self,
        service_data: &mut ServiceInfo,
-        shutdown_manager: &ShutdownManager,
+        shutdown_manager: &mut ShutdownManager,
        provider: P,
    ) -> anyhow::Result<Vec<BoxFuture<'static, anyhow::Result<()>>>> {
        let services = vec![
@@ -1,5 +1,5 @@
 import { GatewayResponse, GatewayBond, GatewayReportResponse } from '../typeDefs/explorer-api';
-import { toPercentInteger } from '../utils';
+import { toPercentIntegerString } from '../utils';

 export type GatewayRowType = {
  id: string;
@@ -9,7 +9,7 @@ export type GatewayRowType = {
  host: string;
  location: string;
  version: string;
-  node_performance: number;
+  node_performance: string;
 };

 export type GatewayEnrichedRowType = GatewayRowType & {
@@ -30,7 +30,7 @@ export function gatewayToGridRow(arrayOfGateways: GatewayResponse): GatewayRowTy
        bond: gw.pledge_amount.amount || 0,
        host: gw.gateway.host || '',
        version: gw.gateway.version || '',
-        node_performance: toPercentInteger(gw.node_performance.last_24h),
+        node_performance: toPercentIntegerString(gw.node_performance.last_24h),
      }));
 }

@@ -47,6 +47,6 @@ export function gatewayEnrichedToGridRow(gateway: GatewayBond, report: GatewayRe
    mixPort: gateway.gateway.mix_port || 0,
    routingScore: `${report.most_recent}%`,
    avgUptime: `${report.last_day || report.last_hour}%`,
-    node_performance: toPercentInteger(gateway.node_performance.most_recent),
+    node_performance: toPercentIntegerString(gateway.node_performance.most_recent),
  };
 }
@@ -1,6 +1,6 @@
 /* eslint-disable camelcase */
-import { MixNodeResponse, MixNodeResponseItem, MixnodeStatus } from '../../typeDefs/explorer-api';
-import { toPercentInteger, toPercentIntegerString } from '../../utils';
+import { MixNodeResponse, MixNodeResponseItem, MixnodeStatus, NodePerformance } from '../../typeDefs/explorer-api';
+import { toPercentIntegerString } from '../../utils';
 import { unymToNym } from '../../utils/currency';

 export type MixnodeRowType = {
@@ -15,11 +15,11 @@ export type MixnodeRowType = {
  pledge_amount: number;
  host: string;
  layer: string;
-  profit_percentage: number;
+  profit_percentage: string;
  avg_uptime: string;
  stake_saturation: React.ReactNode;
-  operating_cost: number;
-  node_performance: number;
+  operating_cost: string;
+  node_performance: NodePerformance['most_recent'];
  blacklisted: boolean;
 };

@@ -32,7 +32,7 @@ export function mixNodeResponseItemToMixnodeRowType(item: MixNodeResponseItem):
  const delegations = Number(item.total_delegation.amount) || 0;
  const totalBond = pledge + delegations;
  const selfPercentage = ((pledge * 100) / totalBond).toFixed(2);
-  const profitPercentage = toPercentInteger(item.profit_margin_percent) || 0;
+  const profitPercentage = toPercentIntegerString(item.profit_margin_percent) || 0;
  const uncappedSaturation = typeof item.uncapped_saturation === 'number' ? item.uncapped_saturation * 100 : 0;

  return {
@@ -47,11 +47,11 @@ export function mixNodeResponseItemToMixnodeRowType(item: MixNodeResponseItem):
    pledge_amount: pledge,
    host: item?.mix_node?.host || '',
    layer: item?.layer || '',
-    profit_percentage: profitPercentage,
+    profit_percentage: `${profitPercentage}%`,
    avg_uptime: `${toPercentIntegerString(item.node_performance.last_24h)}%`,
    stake_saturation: Number(uncappedSaturation.toFixed(2)),
-    operating_cost: Number(unymToNym(item.operating_cost?.amount, 6)) || 0,
-    node_performance: toPercentInteger(item.node_performance.most_recent),
+    operating_cost: `${unymToNym(item.operating_cost?.amount, 6)} NYM`,
+    node_performance: `${toPercentIntegerString(item.node_performance.most_recent)}%`,
    blacklisted: item.blacklisted,
  };
 }
@@ -210,7 +210,7 @@ export const PageMixnodes: FCWithChildren = () => {
          component={RRDLink}
          to={`/network-components/mixnode/${params.row.mix_id}`}
        >
-          {params.value}%
+          {params.value}
        </MuiLink>
      ),
    },
@@ -233,7 +233,7 @@ export const PageMixnodes: FCWithChildren = () => {
          component={RRDLink}
          to={`/network-components/mixnode/${params.row.mix_id}`}
        >
-          {params.value} NYM
+          {params.value}
        </MuiLink>
      ),
    },
@@ -256,7 +256,7 @@ export const PageMixnodes: FCWithChildren = () => {
          component={RRDLink}
          to={`/network-components/mixnode/${params.row.mix_id}`}
        >
-          {params.value}%
+          {params.value}
        </MuiLink>
      ),
    },
@@ -55,7 +55,6 @@ export const splice = (start: number, deleteCount: number, address?: string): st
 * @returns A stringified integer
 */
 export const toPercentIntegerString = (value: string) => Math.round(Number(value) * 100).toString();
-export const toPercentInteger = (value: string) => Math.round(Number(value) * 100);

 export const textColour = (value: EconomicsRowsType, field: string, theme: Theme) => {
  const progressBarValue = value?.progressBarValue || 0;
@@ -1,4 +1,5 @@
 use std::{
+    collections::HashMap,
    fmt,
    hash::{Hash, Hasher},
    net::SocketAddr,
@@ -7,7 +8,6 @@ use std::{
 };

 use base64::{engine::general_purpose, Engine};
-use dashmap::DashMap;
 use hmac::{Hmac, Mac};
 use nym_crypto::asymmetric::encryption::PrivateKey;
 use serde::{Deserialize, Serialize};
@@ -178,4 +178,4 @@ impl<'de> Deserialize<'de> for ClientPublicKey {
    }
 }

-pub(crate) type ClientRegistry = DashMap<SocketAddr, Client>;
+pub(crate) type ClientRegistry = HashMap<SocketAddr, Client>;
@@ -14,7 +14,8 @@ use crate::node::http::ApiState;

 async fn process_final_message(client: Client, state: Arc<ApiState>) -> StatusCode {
    let preshared_nonce = {
-        if let Some(nonce) = state.registration_in_progress.get(client.pub_key()) {
+        let in_progress_ro = state.registration_in_progress.read().await;
+        if let Some(nonce) = in_progress_ro.get(client.pub_key()) {
            *nonce
        } else {
            return StatusCode::BAD_REQUEST;
@@ -26,10 +27,12 @@ async fn process_final_message(client: Client, state: Arc<ApiState>) -> StatusCo
        .is_ok()
    {
        {
-            state.registration_in_progress.remove(client.pub_key());
+            let mut in_progress_rw = state.registration_in_progress.write().await;
+            in_progress_rw.remove(client.pub_key());
        }
        {
-            state.client_registry.insert(client.socket(), client);
+            let mut registry_rw = state.client_registry.write().await;
+            registry_rw.insert(client.socket(), client);
        }
        return StatusCode::OK;
    }
@@ -39,9 +42,8 @@ async fn process_final_message(client: Client, state: Arc<ApiState>) -> StatusCo

 async fn process_init_message(init_message: InitMessage, state: Arc<ApiState>) -> u64 {
    let nonce: u64 = fastrand::u64(..);
-    state
-        .registration_in_progress
-        .insert(init_message.pub_key().clone(), nonce);
+    let mut registry_rw = state.registration_in_progress.write().await;
+    registry_rw.insert(init_message.pub_key().clone(), nonce);
    nonce
 }

@@ -65,12 +67,12 @@ pub(crate) async fn register_client(
 pub(crate) async fn get_all_clients(
    State(state): State<Arc<ApiState>>,
 ) -> (StatusCode, Json<Vec<ClientPublicKey>>) {
+    let registry_ro = state.client_registry.read().await;
    (
        StatusCode::OK,
        Json(
-            state
-                .client_registry
-                .iter()
+            registry_ro
+                .values()
                .map(|c| c.pub_key().clone())
                .collect::<Vec<ClientPublicKey>>(),
        ),
@@ -85,13 +87,12 @@ pub(crate) async fn get_client(
        Ok(pub_key) => pub_key,
        Err(_) => return (StatusCode::BAD_REQUEST, Json(vec![])),
    };
-    let clients = state
-        .client_registry
+    let registry_ro = state.client_registry.read().await;
+    let clients = registry_ro
        .iter()
-        .filter_map(|r| {
-            let client = r.value();
-            if client.pub_key() == &pub_key {
-                Some(client.clone())
+        .filter_map(|(_, c)| {
+            if c.pub_key() == &pub_key {
+                Some(c.clone())
            } else {
                None
            }
@@ -1,12 +1,12 @@
-use std::sync::Arc;
+use std::{collections::HashMap, sync::Arc};

 use axum::{
    routing::{get, post},
    Router,
 };
-use dashmap::DashMap;
 use log::info;
 use nym_crypto::asymmetric::encryption;
+use tokio::sync::RwLock;

 mod api;
 use api::v1::client_registry::*;
@@ -16,9 +16,9 @@ use super::client_handling::client_registration::{ClientPublicKey, ClientRegistr
 const ROUTE_PREFIX: &str = "/api/v1/gateway/client-interfaces/wireguard";

 pub struct ApiState {
-    client_registry: Arc<ClientRegistry>,
+    client_registry: Arc<RwLock<ClientRegistry>>,
    sphinx_key_pair: Arc<encryption::KeyPair>,
-    registration_in_progress: Arc<DashMap<ClientPublicKey, u64>>,
+    registration_in_progress: Arc<RwLock<HashMap<ClientPublicKey, u64>>>,
 }

 fn router_with_state(state: Arc<ApiState>) -> Router {
@@ -33,7 +33,7 @@ fn router_with_state(state: Arc<ApiState>) -> Router {
 }

 pub(crate) async fn start_http_api(
-    client_registry: Arc<ClientRegistry>,
+    client_registry: Arc<RwLock<ClientRegistry>>,
    sphinx_key_pair: Arc<encryption::KeyPair>,
 ) {
    // Port should be 80 post smoosh
@@ -46,7 +46,7 @@ pub(crate) async fn start_http_api(
    let state = Arc::new(ApiState {
        client_registry,
        sphinx_key_pair,
-        registration_in_progress: Arc::new(DashMap::new()),
+        registration_in_progress: Arc::new(RwLock::new(HashMap::new())),
    });

    let routes = router_with_state(state);
@@ -62,17 +62,17 @@ pub(crate) async fn start_http_api(
 mod test {
    use std::net::SocketAddr;
    use std::str::FromStr;
-    use std::sync::Arc;
+    use std::{collections::HashMap, sync::Arc};

    use axum::body::Body;
    use axum::http::Request;
    use axum::http::StatusCode;
-    use dashmap::DashMap;
    use hmac::Mac;
    use tower::Service;
    use tower::ServiceExt;

    use nym_crypto::asymmetric::encryption;
+    use tokio::sync::RwLock;
    use x25519_dalek::{PublicKey, StaticSecret};

    use crate::node::client_handling::client_registration::{
@@ -105,8 +105,8 @@ mod test {

        let client_dh = client_static_private.diffie_hellman(&gateway_static_public);

-        let registration_in_progress = Arc::new(DashMap::new());
-        let client_registry = Arc::new(DashMap::new());
+        let registration_in_progress = Arc::new(RwLock::new(HashMap::new()));
+        let client_registry = Arc::new(RwLock::new(HashMap::new()));

        let state = Arc::new(ApiState {
            client_registry: Arc::clone(&client_registry),
@@ -136,7 +136,7 @@ mod test {
            .unwrap();

        assert_eq!(response.status(), StatusCode::OK);
-        assert!(!registration_in_progress.is_empty());
+        assert!(!registration_in_progress.read().await.is_empty());

        let nonce: Option<u64> =
            serde_json::from_slice(&hyper::body::to_bytes(response.into_body()).await.unwrap())
@@ -171,7 +171,7 @@ mod test {
            .unwrap();

        assert_eq!(response.status(), StatusCode::OK);
-        assert!(!client_registry.is_empty());
+        assert!(!client_registry.read().await.is_empty());

        let clients_request = Request::builder()
            .method("GET")
@@ -194,10 +194,11 @@ mod test {

        assert!(!clients.is_empty());

+        let ro_clients = client_registry.read().await.clone();
        assert_eq!(
-            client_registry
-                .iter()
-                .map(|c| c.value().pub_key().clone())
+            ro_clients
+                .values()
+                .map(|c| c.pub_key().clone())
                .collect::<Vec<ClientPublicKey>>(),
            clients
        )
@@ -18,7 +18,6 @@ use crate::node::mixnet_handling::receiver::connection_handler::ConnectionHandle
 use crate::node::statistics::collector::GatewayStatisticsCollector;
 use crate::node::storage::Storage;
 use anyhow::bail;
-use dashmap::DashMap;
 use futures::channel::{mpsc, oneshot};
 use log::*;
 use nym_crypto::asymmetric::{encryption, identity};
@@ -30,10 +29,12 @@ use nym_task::{TaskClient, TaskManager};
 use nym_validator_client::{nyxd, DirectSigningHttpRpcNyxdClient};
 use rand::seq::SliceRandom;
 use rand::thread_rng;
+use std::collections::HashMap;
 use std::error::Error;
 use std::net::SocketAddr;
 use std::path::PathBuf;
 use std::sync::Arc;
+use tokio::sync::RwLock;

 pub(crate) mod client_handling;
 pub(crate) mod helpers;
@@ -90,7 +91,7 @@ pub(crate) struct Gateway<St = PersistentStorage> {
    sphinx_keypair: Arc<encryption::KeyPair>,
    storage: St,

-    client_registry: Arc<ClientRegistry>,
+    client_registry: Arc<RwLock<ClientRegistry>>,
 }

 impl<St> Gateway<St> {
@@ -106,7 +107,7 @@ impl<St> Gateway<St> {
            sphinx_keypair: Arc::new(helpers::load_sphinx_keys(&config)?),
            config,
            network_requester_opts,
-            client_registry: Arc::new(DashMap::new()),
+            client_registry: Arc::new(RwLock::new(HashMap::new())),
        })
    }

@@ -124,7 +125,7 @@ impl<St> Gateway<St> {
            identity_keypair: Arc::new(identity_keypair),
            sphinx_keypair: Arc::new(sphinx_keypair),
            storage,
-            client_registry: Arc::new(DashMap::new()),
+            client_registry: Arc::new(RwLock::new(HashMap::new())),
        }
    }

@@ -156,15 +157,6 @@ 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,
@@ -387,10 +379,7 @@ 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) = self
-            .start_wireguard(shutdown.subscribe().named("wireguard"))
-            .await
-        {
+        if let Err(err) = nym_wireguard::start_wireguard(shutdown.subscribe()).await {
            // that's a nasty workaround, but anyhow errors are generally nicer, especially on exit
            bail!("{err}")
        }
@@ -52,89 +52,17 @@
      }
    },
    "node_modules/@babel/code-frame": {
-      "version": "7.22.13",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
-      "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
+      "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
      "dev": true,
      "dependencies": {
-        "@babel/highlight": "^7.22.13",
-        "chalk": "^2.4.2"
+        "@babel/highlight": "^7.18.6"
      },
      "engines": {
        "node": ">=6.9.0"
      }
    },
-    "node_modules/@babel/code-frame/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/code-frame/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/code-frame/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/@babel/code-frame/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true
-    },
-    "node_modules/@babel/code-frame/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/@babel/code-frame/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/code-frame/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
    "node_modules/@babel/compat-data": {
      "version": "7.18.8",
      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.8.tgz",
@@ -184,14 +112,13 @@
      }
    },
    "node_modules/@babel/generator": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
-      "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
+      "version": "7.18.12",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.12.tgz",
+      "integrity": "sha512-dfQ8ebCN98SvyL7IxNMCUtZQSq5R7kxgN+r8qYTGDmmSion1hX2C0zq2yo1bsCDhXixokv1SAWTZUMYbO/V5zg==",
      "dev": true,
      "dependencies": {
-        "@babel/types": "^7.23.0",
+        "@babel/types": "^7.18.10",
        "@jridgewell/gen-mapping": "^0.3.2",
-        "@jridgewell/trace-mapping": "^0.3.17",
        "jsesc": "^2.5.1"
      },
      "engines": {
@@ -240,34 +167,34 @@
      }
    },
    "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
+      "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==",
      "dev": true,
      "engines": {
        "node": ">=6.9.0"
      }
    },
    "node_modules/@babel/helper-function-name": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
-      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz",
+      "integrity": "sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A==",
      "dev": true,
      "dependencies": {
-        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.23.0"
+        "@babel/template": "^7.18.6",
+        "@babel/types": "^7.18.9"
      },
      "engines": {
        "node": ">=6.9.0"
      }
    },
    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
-      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
+      "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
      "dev": true,
      "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.18.6"
      },
      "engines": {
        "node": ">=6.9.0"
@@ -326,30 +253,30 @@
      }
    },
    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
+      "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
      "dev": true,
      "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.18.6"
      },
      "engines": {
        "node": ">=6.9.0"
      }
    },
    "node_modules/@babel/helper-string-parser": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
-      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
+      "version": "7.18.10",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz",
+      "integrity": "sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==",
      "dev": true,
      "engines": {
        "node": ">=6.9.0"
      }
    },
    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
+      "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==",
      "dev": true,
      "engines": {
        "node": ">=6.9.0"
@@ -379,13 +306,13 @@
      }
    },
    "node_modules/@babel/highlight": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
-      "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
      "dev": true,
      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "chalk": "^2.4.2",
+        "@babel/helper-validator-identifier": "^7.18.6",
+        "chalk": "^2.0.0",
        "js-tokens": "^4.0.0"
      },
      "engines": {
@@ -464,9 +391,9 @@
      }
    },
    "node_modules/@babel/parser": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
-      "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==",
+      "version": "7.18.11",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.11.tgz",
+      "integrity": "sha512-9JKn5vN+hDt0Hdqn1PiJ2guflwP+B6Ga8qbDuoF0PzzVhrzsKIJo8yGqVk6CmMHiMei9w1C1Bp9IMJSIK+HPIQ==",
      "dev": true,
      "bin": {
        "parser": "bin/babel-parser.js"
@@ -638,33 +565,33 @@
      }
    },
    "node_modules/@babel/template": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
-      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
+      "version": "7.18.10",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz",
+      "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==",
      "dev": true,
      "dependencies": {
-        "@babel/code-frame": "^7.22.13",
-        "@babel/parser": "^7.22.15",
-        "@babel/types": "^7.22.15"
+        "@babel/code-frame": "^7.18.6",
+        "@babel/parser": "^7.18.10",
+        "@babel/types": "^7.18.10"
      },
      "engines": {
        "node": ">=6.9.0"
      }
    },
    "node_modules/@babel/traverse": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
-      "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
+      "version": "7.18.11",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.11.tgz",
+      "integrity": "sha512-TG9PiM2R/cWCAy6BPJKeHzNbu4lPzOSZpeMfeNErskGpTJx6trEvFaVCbDvpcxwy49BKWmEPwiW8mrysNiDvIQ==",
      "dev": true,
      "dependencies": {
-        "@babel/code-frame": "^7.22.13",
-        "@babel/generator": "^7.23.0",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.23.0",
-        "@babel/types": "^7.23.0",
+        "@babel/code-frame": "^7.18.6",
+        "@babel/generator": "^7.18.10",
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-function-name": "^7.18.9",
+        "@babel/helper-hoist-variables": "^7.18.6",
+        "@babel/helper-split-export-declaration": "^7.18.6",
+        "@babel/parser": "^7.18.11",
+        "@babel/types": "^7.18.10",
        "debug": "^4.1.0",
        "globals": "^11.1.0"
      },
@@ -682,13 +609,13 @@
      }
    },
    "node_modules/@babel/types": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
-      "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
+      "version": "7.18.10",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.10.tgz",
+      "integrity": "sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ==",
      "dev": true,
      "dependencies": {
-        "@babel/helper-string-parser": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.20",
+        "@babel/helper-string-parser": "^7.18.10",
+        "@babel/helper-validator-identifier": "^7.18.6",
        "to-fast-properties": "^2.0.0"
      },
      "engines": {
@@ -1172,13 +1099,13 @@
      "dev": true
    },
    "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.19",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz",
-      "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==",
+      "version": "0.3.14",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz",
+      "integrity": "sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==",
      "dev": true,
      "dependencies": {
-        "@jridgewell/resolve-uri": "^3.1.0",
-        "@jridgewell/sourcemap-codec": "^1.4.14"
+        "@jridgewell/resolve-uri": "^3.0.3",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
      }
    },
    "node_modules/@nodelib/fs.scandir": {
@@ -4953,71 +4880,12 @@
      }
    },
    "@babel/code-frame": {
-      "version": "7.22.13",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
-      "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
+      "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
      "dev": true,
      "requires": {
-        "@babel/highlight": "^7.22.13",
-        "chalk": "^2.4.2"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "dev": true,
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-          "dev": true
-        },
-        "escape-string-regexp": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-          "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
+        "@babel/highlight": "^7.18.6"
      }
    },
    "@babel/compat-data": {
@@ -5058,14 +4926,13 @@
      }
    },
    "@babel/generator": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
-      "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
+      "version": "7.18.12",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.12.tgz",
+      "integrity": "sha512-dfQ8ebCN98SvyL7IxNMCUtZQSq5R7kxgN+r8qYTGDmmSion1hX2C0zq2yo1bsCDhXixokv1SAWTZUMYbO/V5zg==",
      "dev": true,
      "requires": {
-        "@babel/types": "^7.23.0",
+        "@babel/types": "^7.18.10",
        "@jridgewell/gen-mapping": "^0.3.2",
-        "@jridgewell/trace-mapping": "^0.3.17",
        "jsesc": "^2.5.1"
      },
      "dependencies": {
@@ -5103,28 +4970,28 @@
      }
    },
    "@babel/helper-environment-visitor": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
+      "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==",
      "dev": true
    },
    "@babel/helper-function-name": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
-      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz",
+      "integrity": "sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A==",
      "dev": true,
      "requires": {
-        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.23.0"
+        "@babel/template": "^7.18.6",
+        "@babel/types": "^7.18.9"
      }
    },
    "@babel/helper-hoist-variables": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
-      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
+      "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
      "dev": true,
      "requires": {
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.18.6"
      }
    },
    "@babel/helper-module-imports": {
@@ -5168,24 +5035,24 @@
      }
    },
    "@babel/helper-split-export-declaration": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
+      "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
      "dev": true,
      "requires": {
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.18.6"
      }
    },
    "@babel/helper-string-parser": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
-      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
+      "version": "7.18.10",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz",
+      "integrity": "sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==",
      "dev": true
    },
    "@babel/helper-validator-identifier": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
+      "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==",
      "dev": true
    },
    "@babel/helper-validator-option": {
@@ -5206,13 +5073,13 @@
      }
    },
    "@babel/highlight": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
-      "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
      "dev": true,
      "requires": {
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "chalk": "^2.4.2",
+        "@babel/helper-validator-identifier": "^7.18.6",
+        "chalk": "^2.0.0",
        "js-tokens": "^4.0.0"
      },
      "dependencies": {
@@ -5275,9 +5142,9 @@
      }
    },
    "@babel/parser": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
-      "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==",
+      "version": "7.18.11",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.11.tgz",
+      "integrity": "sha512-9JKn5vN+hDt0Hdqn1PiJ2guflwP+B6Ga8qbDuoF0PzzVhrzsKIJo8yGqVk6CmMHiMei9w1C1Bp9IMJSIK+HPIQ==",
      "dev": true
    },
    "@babel/plugin-syntax-async-generators": {
@@ -5398,30 +5265,30 @@
      }
    },
    "@babel/template": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
-      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
+      "version": "7.18.10",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz",
+      "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==",
      "dev": true,
      "requires": {
-        "@babel/code-frame": "^7.22.13",
-        "@babel/parser": "^7.22.15",
-        "@babel/types": "^7.22.15"
+        "@babel/code-frame": "^7.18.6",
+        "@babel/parser": "^7.18.10",
+        "@babel/types": "^7.18.10"
      }
    },
    "@babel/traverse": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
-      "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
+      "version": "7.18.11",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.11.tgz",
+      "integrity": "sha512-TG9PiM2R/cWCAy6BPJKeHzNbu4lPzOSZpeMfeNErskGpTJx6trEvFaVCbDvpcxwy49BKWmEPwiW8mrysNiDvIQ==",
      "dev": true,
      "requires": {
-        "@babel/code-frame": "^7.22.13",
-        "@babel/generator": "^7.23.0",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.23.0",
-        "@babel/types": "^7.23.0",
+        "@babel/code-frame": "^7.18.6",
+        "@babel/generator": "^7.18.10",
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-function-name": "^7.18.9",
+        "@babel/helper-hoist-variables": "^7.18.6",
+        "@babel/helper-split-export-declaration": "^7.18.6",
+        "@babel/parser": "^7.18.11",
+        "@babel/types": "^7.18.10",
        "debug": "^4.1.0",
        "globals": "^11.1.0"
      },
@@ -5435,13 +5302,13 @@
      }
    },
    "@babel/types": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
-      "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
+      "version": "7.18.10",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.10.tgz",
+      "integrity": "sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ==",
      "dev": true,
      "requires": {
-        "@babel/helper-string-parser": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.20",
+        "@babel/helper-string-parser": "^7.18.10",
+        "@babel/helper-validator-identifier": "^7.18.6",
        "to-fast-properties": "^2.0.0"
      }
    },
@@ -5820,13 +5687,13 @@
      "dev": true
    },
    "@jridgewell/trace-mapping": {
-      "version": "0.3.19",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz",
-      "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==",
+      "version": "0.3.14",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz",
+      "integrity": "sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==",
      "dev": true,
      "requires": {
-        "@jridgewell/resolve-uri": "^3.1.0",
-        "@jridgewell/sourcemap-codec": "^1.4.14"
+        "@jridgewell/resolve-uri": "^3.0.3",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
      }
    },
    "@nodelib/fs.scandir": {
@@ -17,14 +17,6 @@
  dependencies:
    "@babel/highlight" "^7.18.6"

-"@babel/code-frame@^7.22.13":
-  version "7.22.13"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.13.tgz#e3c1c099402598483b7a8c46a721d1038803755e"
-  integrity sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==
-  dependencies:
-    "@babel/highlight" "^7.22.13"
-    chalk "^2.4.2"
-
 "@babel/compat-data@^7.18.8":
  version "7.18.8"
  resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.8.tgz"
@@ -60,16 +52,6 @@
    "@jridgewell/gen-mapping" "^0.3.2"
    jsesc "^2.5.1"

-"@babel/generator@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.0.tgz#df5c386e2218be505b34837acbcb874d7a983420"
-  integrity sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==
-  dependencies:
-    "@babel/types" "^7.23.0"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    "@jridgewell/trace-mapping" "^0.3.17"
-    jsesc "^2.5.1"
-
 "@babel/helper-compilation-targets@^7.18.9":
  version "7.18.9"
  resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz"
@@ -85,25 +67,20 @@
  resolved "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz"
  integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==

-"@babel/helper-environment-visitor@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
-  integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
-
-"@babel/helper-function-name@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759"
-  integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==
+"@babel/helper-function-name@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz"
+  integrity sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A==
  dependencies:
-    "@babel/template" "^7.22.15"
-    "@babel/types" "^7.23.0"
+    "@babel/template" "^7.18.6"
+    "@babel/types" "^7.18.9"

-"@babel/helper-hoist-variables@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
-  integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==
+"@babel/helper-hoist-variables@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz"
+  integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==
  dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/types" "^7.18.6"

 "@babel/helper-module-imports@^7.18.6":
  version "7.18.6"
@@ -145,33 +122,16 @@
  dependencies:
    "@babel/types" "^7.18.6"

-"@babel/helper-split-export-declaration@^7.22.6":
-  version "7.22.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
-  integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
-  dependencies:
-    "@babel/types" "^7.22.5"
-
 "@babel/helper-string-parser@^7.18.10":
  version "7.18.10"
  resolved "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz"
  integrity sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==

-"@babel/helper-string-parser@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
-  integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
-
 "@babel/helper-validator-identifier@^7.18.6":
  version "7.18.6"
  resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz"
  integrity sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==

-"@babel/helper-validator-identifier@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
-  integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
-
 "@babel/helper-validator-option@^7.18.6":
  version "7.18.6"
  resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz"
@@ -195,25 +155,11 @@
    chalk "^2.0.0"
    js-tokens "^4.0.0"

-"@babel/highlight@^7.22.13":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.20.tgz#4ca92b71d80554b01427815e06f2df965b9c1f54"
-  integrity sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.22.20"
-    chalk "^2.4.2"
-    js-tokens "^4.0.0"
-
-"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.10":
+"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.10", "@babel/parser@^7.18.11":
  version "7.18.11"
  resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.18.11.tgz"
  integrity sha512-9JKn5vN+hDt0Hdqn1PiJ2guflwP+B6Ga8qbDuoF0PzzVhrzsKIJo8yGqVk6CmMHiMei9w1C1Bp9IMJSIK+HPIQ==

-"@babel/parser@^7.22.15", "@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==
-
 "@babel/plugin-syntax-async-generators@^7.8.4":
  version "7.8.4"
  resolved "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz"
@@ -314,28 +260,19 @@
    "@babel/parser" "^7.18.10"
    "@babel/types" "^7.18.10"

-"@babel/template@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38"
-  integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==
-  dependencies:
-    "@babel/code-frame" "^7.22.13"
-    "@babel/parser" "^7.22.15"
-    "@babel/types" "^7.22.15"
-
 "@babel/traverse@^7.18.10", "@babel/traverse@^7.18.9", "@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==
+  version "7.18.11"
+  resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.11.tgz"
+  integrity sha512-TG9PiM2R/cWCAy6BPJKeHzNbu4lPzOSZpeMfeNErskGpTJx6trEvFaVCbDvpcxwy49BKWmEPwiW8mrysNiDvIQ==
  dependencies:
-    "@babel/code-frame" "^7.22.13"
-    "@babel/generator" "^7.23.0"
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-function-name" "^7.23.0"
-    "@babel/helper-hoist-variables" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/parser" "^7.23.0"
-    "@babel/types" "^7.23.0"
+    "@babel/code-frame" "^7.18.6"
+    "@babel/generator" "^7.18.10"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-function-name" "^7.18.9"
+    "@babel/helper-hoist-variables" "^7.18.6"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/parser" "^7.18.11"
+    "@babel/types" "^7.18.10"
    debug "^4.1.0"
    globals "^11.1.0"

@@ -348,15 +285,6 @@
    "@babel/helper-validator-identifier" "^7.18.6"
    to-fast-properties "^2.0.0"

-"@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb"
-  integrity sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==
-  dependencies:
-    "@babel/helper-string-parser" "^7.22.5"
-    "@babel/helper-validator-identifier" "^7.22.20"
-    to-fast-properties "^2.0.0"
-
 "@bcoe/v8-coverage@^0.2.3":
  version "0.2.3"
  resolved "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz"
@@ -627,11 +555,6 @@
  resolved "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz"
  integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==

-"@jridgewell/resolve-uri@^3.1.0":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721"
-  integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==
-
 "@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1":
  version "1.1.2"
  resolved "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz"
@@ -642,11 +565,6 @@
  resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz"
  integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==

-"@jridgewell/sourcemap-codec@^1.4.14":
-  version "1.4.15"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
-  integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
-
 "@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.13", "@jridgewell/trace-mapping@^0.3.9":
  version "0.3.14"
  resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz"
@@ -655,14 +573,6 @@
    "@jridgewell/resolve-uri" "^3.0.3"
    "@jridgewell/sourcemap-codec" "^1.4.10"

-"@jridgewell/trace-mapping@^0.3.17":
-  version "0.3.19"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz#f8a3249862f91be48d3127c3cfe992f79b4b8811"
-  integrity sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==
-  dependencies:
-    "@jridgewell/resolve-uri" "^3.1.0"
-    "@jridgewell/sourcemap-codec" "^1.4.14"
-
 "@nodelib/fs.scandir@2.1.5":
  version "2.1.5"
  resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"
@@ -1118,7 +1028,7 @@ caniuse-lite@^1.0.30001370:
  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001375.tgz"
  integrity sha512-kWIMkNzLYxSvnjy0hL8w1NOaWNr2rn39RTAVyIwcw8juu60bZDWiF1/loOYANzjtJmy6qPgNmn38ro5Pygagdw==

-chalk@^2.0.0, chalk@^2.4.2:
+chalk@^2.0.0:
  version "2.4.2"
  resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -1,6 +1,6 @@
 [package]
 name = "extension-storage"
-version = "1.2.0"
+version = "1.2.0-rc.10"
 edition = "2021"
 license = "Apache-2.0"
 repository = "https://github.com/nymtech/nym"
@@ -2,12 +2,6 @@

 ## [Unreleased]

-## [v1.2.9] (2023-10-10)
-
- Wallet: Introduce edit account name ([#3895])
-
-[#3895]: https://github.com/nymtech/nym/pull/3895
-
 ## [v1.2.8] (2023-08-23)

 - [hotfix]: don't assign invalid fields when crossing the JS boundary ([#3805])
@@ -3512,7 +3512,7 @@ dependencies = [

 [[package]]
 name = "nym_wallet"
-version = "1.2.9"
+version = "1.2.8"
 dependencies = [
 "async-trait",
 "base64 0.13.1",
@@ -1,6 +1,6 @@
 {
  "name": "@nymproject/nym-wallet-app",
-  "version": "1.2.9",
+  "version": "1.2.8",
  "main": "index.js",
  "license": "MIT",
  "scripts": {
@@ -31,7 +31,7 @@
    "@nymproject/mui-theme": "^1.0.0",
    "@nymproject/react": "^1.0.0",
    "@nymproject/types": "^1.0.0",
-    "@nymproject/node-tester": "^1.0.0",
+    "@nymproject/node-tester": ">=1.2.0-rc.8",
    "@storybook/react": "^6.5.15",
    "@tauri-apps/api": "^1.2.0",
    "@tauri-apps/tauri-forage": "^1.0.0-beta.2",
@@ -123,4 +123,4 @@
    "webpack-favicons": "^1.3.8",
    "webpack-merge": "^5.8.0"
  }
-}
+}
@@ -1,6 +1,6 @@
 [package]
 name = "nym_wallet"
-version = "1.2.9"
+version = "1.2.8"
 description = "Nym Native Wallet"
 authors = ["Nym Technologies SA"]
 license = ""
@@ -1,7 +1,7 @@
 {
  "package": {
    "productName": "nym-wallet",
-    "version": "1.2.9"
+    "version": "1.2.8"
  },
  "build": {
    "distDir": "../dist",
@@ -29,7 +29,7 @@ export const items: DelegationWithEverything[] = [
    accumulated_by_operator: { amount: '100', denom: 'nym' },
    owner: '',
    block_height: BigInt(100),
-    stake_saturation: '0.25',
+    stake_saturation: '0.5',
    avg_uptime_percent: 0.5,
    uses_vesting_contract_tokens: false,
    pending_events: [],
@@ -38,7 +38,7 @@ export const items: DelegationWithEverything[] = [
  {
    mix_id: 2,
    node_identity: 'DT8S942S8AQs2zKHS9SVo1GyHmuca3pfL2uLhLksJ3D8',
-    amount: { amount: '1010', denom: 'nym' },
+    amount: { amount: '100', denom: 'nym' },
    delegated_on_iso_datetime: new Date(2021, 1, 2).toDateString(),
    unclaimed_rewards: { amount: '0.05', denom: 'nym' },
    cost_params: {
@@ -49,11 +49,11 @@ export const items: DelegationWithEverything[] = [
      },
    },
    accumulated_by_delegates: { amount: '50', denom: 'nym' },
-    accumulated_by_operator: { amount: '200', denom: 'nym' },
+    accumulated_by_operator: { amount: '100', denom: 'nym' },
    owner: '',
    block_height: BigInt(4000),
-    stake_saturation: '0.43',
-    avg_uptime_percent: 0.22,
+    stake_saturation: '0.5',
+    avg_uptime_percent: 0.1,
    uses_vesting_contract_tokens: true,
    pending_events: [],
    mixnode_is_unbonding: true,
@@ -61,18 +61,18 @@ export const items: DelegationWithEverything[] = [
  {
    mix_id: 3,
    node_identity: '',
-    amount: { amount: '300', denom: 'nym' },
+    amount: { amount: '100', denom: 'nym' },
    delegated_on_iso_datetime: new Date(2021, 1, 2).toDateString(),
    unclaimed_rewards: { amount: '0.05', denom: 'nym' },
    cost_params: {
      profit_margin_percent: '0.1122323949234',
      interval_operating_cost: {
-        amount: '50',
+        amount: '40',
        denom: 'nym',
      },
    },
    accumulated_by_delegates: { amount: '50', denom: 'nym' },
-    accumulated_by_operator: { amount: '300', denom: 'nym' },
+    accumulated_by_operator: { amount: '100', denom: 'nym' },
    owner: '',
    block_height: BigInt(4000),
    stake_saturation: '0.5',
@@ -84,18 +84,18 @@ export const items: DelegationWithEverything[] = [
  {
    mix_id: 4,
    node_identity: 'DT8S942S8AQs2zKHS9SVo1GyHmuca3pfL2uLhLksJ3D8',
-    amount: { amount: '201', denom: 'nym' },
+    amount: { amount: '100', denom: 'nym' },
    delegated_on_iso_datetime: new Date(2021, 1, 2).toDateString(),
    unclaimed_rewards: { amount: '0.05', denom: 'nym' },
    cost_params: {
      profit_margin_percent: '0.1122323949234',
      interval_operating_cost: {
-        amount: '60',
+        amount: '40',
        denom: 'nym',
      },
    },
    accumulated_by_delegates: { amount: '50', denom: 'nym' },
-    accumulated_by_operator: { amount: '202', denom: 'nym' },
+    accumulated_by_operator: { amount: '100', denom: 'nym' },
    owner: '',
    block_height: BigInt(4000),
    stake_saturation: '0.5',
@@ -113,7 +113,7 @@ export const items: DelegationWithEverything[] = [
    cost_params: {
      profit_margin_percent: '0.1122323949234',
      interval_operating_cost: {
-        amount: '80',
+        amount: '40',
        denom: 'nym',
      },
    },
@@ -130,11 +130,11 @@ export const items: DelegationWithEverything[] = [
  {
    mix_id: 6,
    node_identity: '',
-    amount: { amount: '202', denom: 'nym' },
+    amount: { amount: '100', denom: 'nym' },
    delegated_on_iso_datetime: new Date(2021, 1, 2).toDateString(),
    unclaimed_rewards: { amount: '0.05', denom: 'nym' },
    cost_params: {
-      profit_margin_percent: '0.8',
+      profit_margin_percent: '0.1122323949234',
      interval_operating_cost: {
        amount: '40',
        denom: 'nym',
@@ -155,9 +155,9 @@ export const items: DelegationWithEverything[] = [
    node_identity: 'FiojKW7oY9WQmLCiYAsCA21tpowZHS6zcUoyYm319p6Z',
    delegated_on_iso_datetime: new Date(2021, 1, 1).toDateString(),
    unclaimed_rewards: { amount: '0.05', denom: 'nym' },
-    amount: { amount: '202', denom: 'nym' },
+    amount: { amount: '10', denom: 'nym' },
    cost_params: {
-      profit_margin_percent: '0.59',
+      profit_margin_percent: '0.1122323949234',
      interval_operating_cost: {
        amount: '40',
        denom: 'nym',
@@ -190,7 +190,7 @@ export const items: DelegationWithEverything[] = [
    accumulated_by_operator: { amount: '100', denom: 'nym' },
    owner: '',
    block_height: BigInt(4000),
-    stake_saturation: '0.9',
+    stake_saturation: '0.5',
    avg_uptime_percent: 0.1,
    uses_vesting_contract_tokens: true,
    pending_events: [],
@@ -199,11 +199,11 @@ export const items: DelegationWithEverything[] = [
  {
    mix_id: 9,
    node_identity: '',
-    amount: { amount: '1000', denom: 'nym' },
+    amount: { amount: '100', denom: 'nym' },
    delegated_on_iso_datetime: new Date(2021, 1, 2).toDateString(),
    unclaimed_rewards: { amount: '0.05', denom: 'nym' },
    cost_params: {
-      profit_margin_percent: '0.4',
+      profit_margin_percent: '0.1122323949234',
      interval_operating_cost: {
        amount: '40',
        denom: 'nym',
@@ -213,7 +213,7 @@ export const items: DelegationWithEverything[] = [
    accumulated_by_operator: { amount: '100', denom: 'nym' },
    owner: '',
    block_height: BigInt(4000),
-    stake_saturation: '0.9',
+    stake_saturation: '0.5',
    avg_uptime_percent: 0.1,
    uses_vesting_contract_tokens: true,
    pending_events: [],
@@ -259,8 +259,8 @@ export const items: DelegationWithEverything[] = [
    accumulated_by_operator: { amount: '100', denom: 'nym' },
    owner: '',
    block_height: BigInt(4000),
-    stake_saturation: '0.56',
-    avg_uptime_percent: 0.9,
+    stake_saturation: '0.5',
+    avg_uptime_percent: 0.1,
    uses_vesting_contract_tokens: true,
    pending_events: [],
    mixnode_is_unbonding: true,
@@ -2,17 +2,17 @@ import React from 'react';
 import { Box, Table, TableBody, TableCell, TableContainer, TableHead, TableRow, TableSortLabel } from '@mui/material';
 import { visuallyHidden } from '@mui/utils';
 import ArrowDropDownIcon from '@mui/icons-material/ArrowDropDown';
+import { orderBy as _orderBy } from 'lodash';
 import { DelegationWithEverything } from '@nymproject/types';
-import { useSortDelegations } from 'src/hooks/useSortDelegations';
 import { DelegationListItemActions } from './DelegationActions';
+import { isDelegation, isPendingDelegation, TDelegations } from '../../context/delegations';
 import { DelegationItem } from './DelegationItem';
 import { PendingDelegationItem } from './PendingDelegationItem';
 import { LoadingModal } from '../Modals/LoadingModal';
-import { isDelegation, isPendingDelegation, TDelegations } from '../../context/delegations';

-export type Order = 'asc' | 'desc';
+type Order = 'asc' | 'desc';
 type AdditionalTypes = { profit_margin_percent: number; operating_cost: number };
-export type SortingKeys = keyof AdditionalTypes | keyof DelegationWithEverything;
+type SortingKeys = keyof AdditionalTypes | keyof DelegationWithEverything;

 interface EnhancedTableProps {
  onRequestSort: (event: React.MouseEvent<unknown>, property: string) => void;
@@ -83,6 +83,10 @@ const EnhancedTableHead: FCWithChildren<EnhancedTableProps> = ({ order, orderBy,
 };

 // Pin delegations on unbonded nodes to the top of the list
+const sortByUnbondedMixnodeFirst = (a: any) => {
+  if (!a.node_identity) return -1;
+  return 1;
+};

 export const DelegationList: FCWithChildren<{
  isLoading?: boolean;
@@ -94,13 +98,37 @@ export const DelegationList: FCWithChildren<{
  const [order, setOrder] = React.useState<Order>('asc');
  const [orderBy, setOrderBy] = React.useState<SortingKeys>('delegated_on_iso_datetime');

-  const handleRequestSort = (_: React.MouseEvent<unknown>, property: any) => {
+  const handleRequestSort = (event: React.MouseEvent<unknown>, property: any) => {
    const isAsc = orderBy === property && order === 'asc';
    setOrder(isAsc ? 'desc' : 'asc');
    setOrderBy(property);
  };

-  const sorted = useSortDelegations(items, order, orderBy);
+  // if sorting by either amount or unclaimed_rewards
+  // base sorting on their number counterparts
+  const mapOrderBy = (key: SortingKeys) => {
+    if (key === 'amount') return 'delegationValue';
+    if (key === 'unclaimed_rewards') return 'operatorReward';
+    if (key === 'profit_margin_percent') return 'profitMarginValue';
+    if (key === 'operating_cost') return 'operatorCostValue';
+    return key;
+  };
+
+  const mapAndSort = (_items: TDelegations) => {
+    const map = _items.map((item) =>
+      isDelegation(item)
+        ? {
+            ...item,
+            delegationValue: Number(item.amount.amount),
+            operatorReward: Number(item.unclaimed_rewards?.amount),
+            profitMarginValue: Number(item.cost_params?.profit_margin_percent),
+            operatorCostValue: Number(item.cost_params?.interval_operating_cost),
+          }
+        : item,
+    );
+
+    return _orderBy(map, mapOrderBy(orderBy), order).sort(sortByUnbondedMixnodeFirst);
+  };

  return (
    <TableContainer>
@@ -108,8 +136,8 @@ export const DelegationList: FCWithChildren<{
      <Table sx={{ width: '100%' }}>
        <EnhancedTableHead order={order} orderBy={orderBy} onRequestSort={handleRequestSort} />
        <TableBody>
-          {sorted?.length
-            ? sorted.map((item: any) => {
+          {items?.length
+            ? mapAndSort(items).map((item: any) => {
                if (isPendingDelegation(item)) return <PendingDelegationItem item={item} explorerUrl={explorerUrl} />;
                if (isDelegation(item))
                  return (
@@ -125,6 +125,7 @@ export type TBondingContext = {
  updateBondAmount: (data: TUpdateBondArgs, tokenPool: TokenPool) => Promise<TransactionExecuteResult | undefined>;
  redeemRewards: (fee?: FeeDetails) => Promise<TransactionExecuteResult | undefined>;
  updateMixnode: (pm: string, fee?: FeeDetails) => Promise<TransactionExecuteResult | undefined>;
+  checkOwnership: () => Promise<void>;
  generateMixnodeMsgPayload: (data: TBondMixnodeSignatureArgs) => Promise<string | undefined>;
  generateGatewayMsgPayload: (data: TBondGatewaySignatureArgs) => Promise<string | undefined>;
  isVestingAccount: boolean;
@@ -151,6 +152,9 @@ export const BondingContext = createContext<TBondingContext>({
  updateMixnode: async () => {
    throw new Error('Not implemented');
  },
+  checkOwnership(): Promise<void> {
+    throw new Error('Not implemented');
+  },
  generateMixnodeMsgPayload: async () => {
    throw new Error('Not implemented');
  },
@@ -167,7 +171,7 @@ export const BondingContextProvider: FCWithChildren = ({ children }): JSX.Elemen
  const [isVestingAccount, setIsVestingAccount] = useState(false);

  const { userBalance, clientDetails } = useContext(AppContext);
-  const { ownership, isLoading: isOwnershipLoading } = useCheckOwnership();
+  const { ownership, isLoading: isOwnershipLoading, checkOwnership } = useCheckOwnership();

  useEffect(() => {
    userBalance.fetchBalance();
@@ -338,6 +342,8 @@ export const BondingContextProvider: FCWithChildren = ({ children }): JSX.Elemen
    setIsLoading(true);
    setError(undefined);

+    await checkOwnership();
+
    if (ownership.hasOwnership && ownership.nodeType === EnumNodeType.mixnode && clientDetails) {
      try {
        const data = await getMixnodeBondDetails();
@@ -611,6 +617,7 @@ export const BondingContextProvider: FCWithChildren = ({ children }): JSX.Elemen
      refresh,
      redeemRewards,
      updateBondAmount,
+      checkOwnership,
      generateMixnodeMsgPayload,
      generateGatewayMsgPayload,
      isVestingAccount,
@@ -26,11 +26,11 @@ let mockDelegations: DelegationWithEverything[] = [
    cost_params: {
      profit_margin_percent: '0.04',
      interval_operating_cost: {
-        amount: '20',
+        amount: '40',
        denom: 'nym',
      },
    },
-    stake_saturation: '0.2',
+    stake_saturation: '0.5',
    avg_uptime_percent: 0.5,
    accumulated_by_delegates: { amount: '0', denom: 'nym' },
    accumulated_by_operator: { amount: '0', denom: 'nym' },
@@ -51,7 +51,7 @@ let mockDelegations: DelegationWithEverything[] = [
    cost_params: {
      profit_margin_percent: '0.04',
      interval_operating_cost: {
-        amount: '60',
+        amount: '40',
        denom: 'nym',
      },
    },
@@ -4,7 +4,7 @@ import { AppContext } from '../context/main';
 import { checkGatewayOwnership, checkMixnodeOwnership, getVestingPledgeInfo } from '../requests';
 import { EnumNodeType, TNodeOwnership } from '../types';

-const initial: TNodeOwnership = {
+const initial = {
  hasOwnership: false,
  nodeType: undefined,
  vestingPledge: undefined,
@@ -18,7 +18,8 @@ export const useCheckOwnership = () => {
  const [error, setError] = useState<string>();

  const checkOwnership = useCallback(async () => {
-    const status = { ...initial };
+    const status = initial as TNodeOwnership;
+
    try {
      const [ownsMixnode, ownsGateway] = await Promise.all([checkMixnodeOwnership(), checkGatewayOwnership()]);

@@ -1,45 +0,0 @@
-import { orderBy as _orderBy } from 'lodash';
-import { Order, SortingKeys } from 'src/components/Delegation/DelegationList';
-import { TDelegations, isDelegation } from 'src/context/delegations';
-
-type MappedTypes = 'delegationValue' | 'operatorReward' | 'profitMarginValue' | 'operatorCostValue';
-
-export const useSortDelegations = (delegationItems: TDelegations, order: Order, orderBy: SortingKeys) => {
-  const unbondedDelegations = delegationItems.filter((delegation) => !delegation.node_identity);
-  const delegations = delegationItems.filter((delegation) => delegation.node_identity);
-
-  // example of a mapped type in typescript
-
-  const mapOrderBy = (key: SortingKeys): MappedTypes | SortingKeys => {
-    switch (key) {
-      case 'amount':
-        return 'delegationValue';
-      case 'unclaimed_rewards':
-        return 'operatorReward';
-      case 'profit_margin_percent':
-        return 'profitMarginValue';
-      case 'operating_cost':
-        return 'operatorCostValue';
-      default:
-        return key;
-    }
-  };
-
-  const mapAndSort = (_items: TDelegations) => {
-    const mapToNumberType = _items.map((item) =>
-      isDelegation(item)
-        ? {
-            ...item,
-            delegationValue: Number(item.amount.amount),
-            operatorReward: Number(item.unclaimed_rewards?.amount),
-            profitMarginValue: Number(item.cost_params?.profit_margin_percent),
-            operatorCostValue: Number(item.cost_params?.interval_operating_cost.amount),
-          }
-        : item,
-    );
-    const ordered = _orderBy(mapToNumberType, mapOrderBy(orderBy), order).sort();
-    return ordered;
-  };
-
-  return [...unbondedDelegations, ...mapAndSort(delegations)];
-};
@@ -34,8 +34,17 @@ const Bonding = () => {

  const navigate = useNavigate();

-  const { bondedNode, bondMixnode, bondGateway, redeemRewards, isLoading, updateBondAmount, error, refresh } =
-    useBondingContext();
+  const {
+    bondedNode,
+    bondMixnode,
+    bondGateway,
+    redeemRewards,
+    isLoading,
+    checkOwnership,
+    updateBondAmount,
+    error,
+    refresh,
+  } = useBondingContext();

  useEffect(() => {
    if (bondedNode && isMixnode(bondedNode) && bondedNode.uncappedStakeSaturation) {
@@ -45,7 +54,7 @@ const Bonding = () => {

  const handleCloseModal = async () => {
    setShowModal(undefined);
-    refresh();
+    await checkOwnership();
  };

  const handleError = (err: string) => {
@@ -6,10 +6,7 @@
  "workspaces": [
    "dist/wasm/**",
    "dist/node/**",
-    "dist/ts/**",
-    "sdk/typescript/packages/mui-theme",
-    "sdk/typescript/packages/react-components",
-    "sdk/typescript/packages/validator-client",
+    "sdk/typescript/packages/**",
    "ts-packages/*",
    "nym-wallet",
    "nym-connect/**",
@@ -19,22 +16,22 @@
  ],
  "scripts": {
    "nuke": "npx rimraf **/node_modules node_modules",
-    "scrub": "npx rimraf **/dist dist",
    "clean": "lerna run clean",
+
+    "build:ci:sdk": "run-s build:types build:packages build:wasm build:sdk:ci",
+    "build:sdk:ci": "lerna run --scope '{@nymproject/sdk,@nymproject/node-tester,@nymproject/sdk-react,@nymproject/mix-fetch}' build:dev --stream",
+
    "build": "run-s build:types build:packages",
    "build:wasm": "make sdk-wasm-build",
+    "build:sdk": "make sdk-typescript-build",
    "build:types": "lerna run --scope @nymproject/types build --stream",
    "build:packages": "run-s build:packages:theme build:packages:react",
    "build:packages:theme": "lerna run --scope @nymproject/mui-theme build",
    "build:packages:react": "lerna run --scope @nymproject/react build",
    "build:react-example": "lerna run --scope @nymproject/react-webpack-with-theme-example build --stream",
    "build:playground": "lerna run --scope @nymproject/react storybook:build --stream",
-    "build:ci:storybook": "yarn build && yarn dev:on && run-p build:react-example build:playground && yarn build:ci:storybook:collect-artifacts",
-    "build:ci:storybook:collect-artifacts": "mkdir -p ts-packages/dist && mv sdk/typescript/packages/react-components/storybook-static ts-packages/dist/storybook && mv sdk/typescript/examples/react/mui-theme/dist ts-packages/dist/example",
-    "prebuild:ci": "yarn dev:on && yarn",
-    "build:ci": "run-s build:types build:packages build:wasm build:ci:sdk",
-    "postbuild:ci": "yarn dev:off",
-    "build:ci:sdk": "lerna run --scope '{@nymproject/sdk,@nymproject/node-tester,@nymproject/sdk-react,@nymproject/mix-fetch}' build:dev --stream",
+    "build:ci": "yarn build && run-p build:react-example build:playground && yarn build:ci:collect-artifacts",
+    "build:ci:collect-artifacts": "mkdir -p ts-packages/dist && mv ts-packages/react-components/storybook-static ts-packages/dist/storybook && mv ts-packages/react-webpack-with-theme-example/dist ts-packages/dist/example",
    "docs:prod:build": "run-s docs:prod:build:ws",
    "docs:prod:build:ws": "lerna run docs:prod:build --stream",
    "sdk:build": "./sdk/typescript/scripts/build-prod-sdk.sh",
@@ -43,9 +40,7 @@
    "lint:fix": "lerna run lint:fix --stream",
    "tsc": "lerna run tsc --stream",
    "types:lint:fix": "lerna run lint:fix --scope @nymproject/types --scope @nymproject/nym-wallet-app",
-    "audit:fix": "npm_config_yes=true npx yarn-audit-fix -- --dry-run",
-    "dev:on": "node sdk/typescript/scripts/dev-mode-add.mjs",
-    "dev:off": "node sdk/typescript/scripts/dev-mode-remove.mjs"
+    "audit:fix": "npm_config_yes=true npx yarn-audit-fix -- --dry-run"
  },
  "devDependencies": {
    "lerna": "^7.3.0",
@@ -53,4 +48,4 @@
    "@npmcli/node-gyp": "^3.0.0",
    "node-gyp": "^9.3.1"
  }
-}
+}
@@ -1,6 +1,6 @@
 {
  "name": "@nymproject/contract-clients",
-  "version": "1.2.0",
+  "version": "1.2.0-rc.10",
  "description": "A client for all Nym smart contracts",
  "license": "Apache-2.0",
  "author": "Nym Technologies SA",
@@ -1,133 +0,0 @@
-```ts copy filename="FormattedWalletConnectCode.tsx"
-import React from 'react';
-import { Coin } from '@cosmjs/stargate';
-import Button from '@mui/material/Button';
-import Paper from '@mui/material/Paper';
-import Box from '@mui/material/Box';
-import Typography from '@mui/material/Typography';
-import TextField from '@mui/material/TextField';
-
-// Connect method on Parent Component
-const getSignerAccount = async () => {
-  setAccountLoading(true);
-  try {
-    const signer = await signerAccount(mnemonic);
-    const accounts = await signer.getAccounts();
-    if (accounts[0]) {
-      setAccount(accounts[0].address);
-    }
-  } catch (error) {
-    console.error(error);
-  }
-  setAccountLoading(false);
-};
-
-// Get Balance on Parent Component
-const getBalance = useCallback(async () => {
-  setBalanceLoading(true);
-  try {
-    const newBalance = await signerCosmosWasmClient?.getBalance(account, 'unym');
-    setBalance(newBalance);
-  } catch (error) {
-    console.error(error);
-  }
-  setBalanceLoading(false);
-}, [account, signerCosmosWasmClient]);
-
-const getClients = async () => {
-  setClientLoading(true);
-  try {
-    setSignerCosmosWasmClient(await fetchSignerCosmosWasmClient(mnemonic));
-    setSignerClient(await fetchSignerClient(mnemonic));
-  } catch (error) {
-    console.error(error);
-  }
-  setClientLoading(false);
-};
-
-const connect = () => {
-  getSignerAccount();
-  getClients();
-};
-
-// Get Signner Account on Parent Component
-const getSignerAccount = async () => {
-  setAccountLoading(true);
-  try {
-    const signer = await signerAccount(mnemonic);
-    const accounts = await signer.getAccounts();
-    if (accounts[0]) {
-      setAccount(accounts[0].address);
-    }
-  } catch (error) {
-    console.error(error);
-  }
-  setAccountLoading(false);
-};
-
-export const ConnectWallet = ({
-  setMnemonic,
-  connect,
-  mnemonic,
-  accountLoading,
-  clientLoading,
-  balanceLoading,
-  account,
-  balance,
-  connectButtonText,
-}: {
-  setMnemonic: (value: string) => void;
-  connect: () => void;
-  mnemonic: string;
-  accountLoading: boolean;
-  clientLoading: boolean;
-  balanceLoading: boolean;
-  account: string;
-  balance: Coin;
-  connectButtonText: string;
-}) => {
-  return (
-    <Paper style={{ marginTop: '1rem', padding: '1rem' }}>
-      <Typography variant="h5" textAlign="center">
-        Connect to your account
-      </Typography>
-      <Box padding={3}>
-        <Typography variant="h6">Your account</Typography>
-        <Box marginY={3}>
-          <Typography variant="body1" marginBottom={3}>
-            Enter the mnemonic
-          </Typography>
-          <TextField
-            type="text"
-            placeholder="mnemonic"
-            onChange={(e) => setMnemonic(e.target.value)}
-            fullWidth
-            multiline
-            maxRows={4}
-            sx={{ marginBottom: 3 }}
-          />
-          <Button
-            variant="outlined"
-            onClick={() => connect()}
-            disabled={!mnemonic || accountLoading || clientLoading || balanceLoading}
-          >
-            {connectButtonText}
-          </Button>
-        </Box>
-        {account && balance ? (
-          <Box>
-            <Typography variant="body1">Address: {account}</Typography>
-            <Typography variant="body1">
-              Balance: {balance?.amount} {balance?.denom}
-            </Typography>
-          </Box>
-        ) : (
-          <Box>
-            <Typography variant="body1">Please, enter your mnemonic to receive your account information</Typography>
-          </Box>
-        )}
-      </Box>
-    </Paper>
-  );
-};
-```
@@ -1,189 +0,0 @@
-```ts copy filename="FormattedWalletDelegationsCode.tsx"
-import React from 'react';
-import Button from '@mui/material/Button';
-import Paper from '@mui/material/Paper';
-import Box from '@mui/material/Box';
-import { TableBody, TableCell, TableHead, TableRow, TextField, Typography } from '@mui/material';
-import Table from '@mui/material/Table';
-
-// Get Delegations on parent component
-  const getDelegations = useCallback(async () => {
-    const newDelegations = await signerClient.getDelegatorDelegations({
-      delegator: settings.address,
-    });
-    setDelegations(newDelegations);
-  }, [signerClient]);
-
-// Make a Delegation on parent component
-  const doDelegate = async ({ mixId, amount }: { mixId: number; amount: number }) => {
-    if (!signerClient) {
-      return;
-    }
-    setDelegationLoader(true);
-    try {
-      const res = await signerClient.delegateToMixnode({ mixId }, 'auto', undefined, [
-        { amount: `${amount}`, denom: 'unym' },
-      ]);
-      console.log('res', res);
-      setLog((prev) => [
-        ...prev,
-        <div key={JSON.stringify(res, null, 2)}>
-          <code style={{ marginRight: '2rem' }}>{new Date().toLocaleTimeString()}</code>
-          <pre>{JSON.stringify(res, null, 2)}</pre>
-        </div>,
-      ]);
-    } catch (error) {
-      console.error(error);
-    }
-    setDelegationLoader(false);
-  };
-
-  // Undelegate All on Parent Component
-  const doUndelegateAll = async () => {
-    if (!signerClient) {
-      return;
-    }
-    setUndeledationLoader(true);
-    try {
-      // eslint-disable-next-line no-restricted-syntax
-      for (const delegation of delegations.delegations) {
-        // eslint-disable-next-line no-await-in-loop
-        await signerClient.undelegateFromMixnode({ mixId: delegation.mix_id }, 'auto');
-      }
-    } catch (error) {
-      console.error(error);
-    }
-    setUndeledationLoader(false);
-  };
-
-  // Withdraw Rewards on Parent Component
-  const doWithdrawRewards = async () => {
-    const delegatorAddress = '';
-    const validatorAdress = '';
-    const memo = 'test sending tokens';
-    setWithdrawLoading(true);
-    try {
-      const res = await signerCosmosWasmClient.withdrawRewards(delegatorAddress, validatorAdress, 'auto', memo);
-      setLog((prev) => [
-        ...prev,
-        <div key={JSON.stringify(res, null, 2)}>
-          <code style={{ marginRight: '2rem' }}>{new Date().toLocaleTimeString()}</code>
-          <pre>{JSON.stringify(res, null, 2)}</pre>
-        </div>,
-      ]);
-    } catch (error) {
-      console.error(error);
-    }
-    setWithdrawLoading(false);
-  };
-
-import React, { useState } from 'react';
-import Button from '@mui/material/Button';
-import Paper from '@mui/material/Paper';
-import Box from '@mui/material/Box';
-import { TableBody, TableCell, TableHead, TableRow, TextField, Typography } from '@mui/material';
-import Table from '@mui/material/Table';
-
-export const Delegations = ({
-  delegations,
-  doDelegate,
-  delegationLoader,
-  doUndelegateAll,
-  undeledationLoader,
-  doWithdrawRewards,
-  withdrawLoading,
-}: {
-  delegations: any;
-  doDelegate: ({ mixId, amount }: { mixId: number; amount: number }) => void;
-  delegationLoader: boolean;
-  doUndelegateAll: () => void;
-  undeledationLoader: boolean;
-  doWithdrawRewards: () => void;
-  withdrawLoading: boolean;
-}) => {
-  const [delegationNodeId, setDelegationNodeId] = useState<string>();
-  const [amountToBeDelegated, setAmountToBeDelegated] = useState<string>();
-
-  return (
-    <Paper style={{ marginTop: '1rem', padding: '1rem' }}>
-      <Box padding={3}>
-        <Typography variant="h6">Delegations</Typography>
-        <Box marginY={3}>
-          <Box marginY={3} display="flex" flexDirection="column">
-            <Typography marginBottom={3} variant="body1">
-              Make a delegation
-            </Typography>
-            <TextField
-              type="text"
-              placeholder="Mixnode ID"
-              onChange={(e) => setDelegationNodeId(e.target.value)}
-              size="small"
-            />
-            <Box marginTop={3} display="flex" justifyContent="space-between">
-              <TextField
-                type="text"
-                placeholder="Amount"
-                onChange={(e) => setAmountToBeDelegated(e.target.value)}
-                size="small"
-              />
-              <Button
-                variant="outlined"
-                onClick={() =>
-                  doDelegate({ mixId: parseInt(delegationNodeId, 10), amount: parseInt(amountToBeDelegated, 10) })
-                }
-                disabled={delegationLoader}
-              >
-                {delegationLoader ? 'Delegation in process...' : 'Delegate'}
-              </Button>
-            </Box>
-          </Box>
-        </Box>
-        <Box marginTop={3}>
-          <Typography variant="body1">Your delegations</Typography>
-          <Box marginBottom={3} display="flex" flexDirection="column">
-            {!delegations?.delegations?.length ? (
-              <Typography>You do not have delegations</Typography>
-            ) : (
-              <Box>
-                <Table size="small">
-                  <TableHead>
-                    <TableRow>
-                      <TableCell>MixId</TableCell>
-                      <TableCell>Owner</TableCell>
-                      <TableCell>Amount</TableCell>
-                      <TableCell>Cumulative Reward Ratio</TableCell>
-                    </TableRow>
-                  </TableHead>
-                  <TableBody>
-                    {delegations?.delegations.map((delegation: any) => (
-                      <TableRow key={delegation.mix_id}>
-                        <TableCell>{delegation.mix_id}</TableCell>
-                        <TableCell>{delegation.owner}</TableCell>
-                        <TableCell>{delegation.amount.amount}</TableCell>
-                        <TableCell>{delegation.cumulative_reward_ratio}</TableCell>
-                      </TableRow>
-                    ))}
-                  </TableBody>
-                </Table>
-              </Box>
-            )}
-          </Box>
-          {delegations && (
-            <Box marginBottom={3}>
-              <Button variant="outlined" onClick={() => doUndelegateAll()} disabled={undeledationLoader}>
-                {undeledationLoader ? 'Undelegating...' : 'Undelegate All'}
-              </Button>
-            </Box>
-          )}
-          <Box>
-            <Button variant="outlined" onClick={() => doWithdrawRewards()} disabled={withdrawLoading}>
-              {withdrawLoading ? 'Doing withdraw...' : 'Withdraw rewards'}
-            </Button>
-          </Box>
-        </Box>
-      </Box>
-    </Paper>
-  );
-};
-
-```
@@ -0,0 +1,384 @@
+```ts copy filename="WalletSigningClientExample.tsx"
+import React, { useCallback, useEffect, useState } from 'react';
+import { contracts } from '@nymproject/contract-clients';
+import { SigningCosmWasmClient } from '@cosmjs/cosmwasm-stargate';
+import { DirectSecp256k1HdWallet } from '@cosmjs/proto-signing';
+import { Coin, GasPrice } from '@cosmjs/stargate';
+import Button from '@mui/material/Button';
+import Input from '@mui/material/Input';
+import Paper from '@mui/material/Paper';
+import Box from '@mui/material/Box';
+import { TableBody, TableCell, TableHead, TableRow, TextField, Typography } from '@mui/material';
+import Divider from '@mui/material/Divider';
+import Table from '@mui/material/Table';
+import LoadingButton from '@mui/lab/LoadingButton';
+import SaveIcon from '@mui/icons-material/Save';
+import { settings } from './client';
+
+const signerAccount = async (mnemonic) => {
+  const signer = await DirectSecp256k1HdWallet.fromMnemonic(mnemonic, {
+    prefix: 'n',
+  });
+
+  return signer;
+};
+
+const fetchSignerCosmosWasmClient = async (mnemonic) => {
+  const signer = await signerAccount(mnemonic);
+
+  const cosmWasmClient = await SigningCosmWasmClient.connectWithSigner(settings.url, signer, {
+    gasPrice: GasPrice.fromString('0.025unym'),
+  });
+
+  return cosmWasmClient;
+};
+
+const fetchSignerClient = async (mnemonic) => {
+  const signer = await signerAccount(mnemonic);
+
+  const cosmWasmClient = await SigningCosmWasmClient.connectWithSigner(settings.url, signer, {
+    gasPrice: GasPrice.fromString('0.025unym'),
+  });
+
+  /** create a mixnet contract client
+   * @param cosmWasmClient the client to use for signing and querying
+   * @param settings.address the bech32 address prefix (human readable part)
+   * @param settings.mixnetContractAddress the bech32 address prefix (human readable part)
+   * @returns the client in MixnetClient form
+   */
+
+  const mixnetClient = new contracts.Mixnet.MixnetClient(
+    cosmWasmClient,
+    settings.address, // sender (that account of the signer)
+    settings.mixnetContractAddress, // contract address (different on mainnet, QA, etc)
+  );
+
+  return mixnetClient;
+};
+
+export const Wallet = () => {
+  const [mnemonic, setMnemonic] = useState<string>();
+  const [signerCosmosWasmClient, setSignerCosmosWasmClient] = useState<any>();
+  const [signerClient, setSignerClient] = useState<any>();
+  const [account, setAccount] = useState<string>();
+  const [accountLoading, setAccountLoading] = useState<boolean>(false);
+  const [clientLoading, setClientLoading] = useState<boolean>(false);
+  const [balance, setBalance] = useState<Coin>();
+  const [balanceLoading, setBalanceLoading] = useState<boolean>(false);
+  const [log, setLog] = useState<React.ReactNode[]>([]);
+  const [tokensToSend, setTokensToSend] = useState<string>();
+  const [sendingTokensLoader, setSendingTokensLoader] = useState<boolean>(false);
+  const [delegations, setDelegations] = useState<any>();
+  const [recipientAddress, setRecipientAddress] = useState<string>('');
+  const [delegationNodeId, setDelegationNodeId] = useState<string>();
+  const [amountToBeDelegated, setAmountToBeDelegated] = useState<string>();
+  const [delegationLoader, setDelegationLoader] = useState<boolean>(false);
+  const [undeledationLoader, setUndeledationLoader] = useState<boolean>(false);
+  const [withdrawLoading, setWithdrawLoading] = useState<boolean>(false);
+
+  const getBalance = useCallback(async () => {
+    setBalanceLoading(true);
+    try {
+      const newBalance = await signerCosmosWasmClient?.getBalance(account, 'unym');
+      setBalance(newBalance);
+    } catch (error) {
+      console.error(error);
+    }
+    setBalanceLoading(false);
+  }, [account, signerCosmosWasmClient]);
+
+  const getSignerAccount = async () => {
+    setAccountLoading(true);
+    try {
+      const signer = await signerAccount(mnemonic);
+      const accounts = await signer.getAccounts();
+      if (accounts[0]) {
+        setAccount(accounts[0].address);
+      }
+    } catch (error) {
+      console.error(error);
+    }
+    setAccountLoading(false);
+  };
+
+  const getClients = async () => {
+    setClientLoading(true);
+    try {
+      setSignerCosmosWasmClient(await fetchSignerCosmosWasmClient(mnemonic));
+      setSignerClient(await fetchSignerClient(mnemonic));
+    } catch (error) {
+      console.error(error);
+    }
+    setClientLoading(false);
+  };
+
+  const getDelegations = useCallback(async () => {
+    const newDelegations = await signerClient.getDelegatorDelegations({
+      delegator: settings.address,
+    });
+    setDelegations(newDelegations);
+  }, [signerClient]);
+
+  const connect = () => {
+    getSignerAccount();
+    getClients();
+  };
+
+  const doUndelegateAll = async () => {
+    if (!signerClient) {
+      return;
+    }
+    setUndeledationLoader(true);
+    try {
+      // eslint-disable-next-line no-restricted-syntax
+      for (const delegation of delegations.delegations) {
+        // eslint-disable-next-line no-await-in-loop
+        await signerClient.undelegateFromMixnode({ mixId: delegation.mix_id }, 'auto');
+      }
+    } catch (error) {
+      console.error(error);
+    }
+    setUndeledationLoader(false);
+  };
+
+  const doDelegate = async ({ mixId, amount }: { mixId: number; amount: number }) => {
+    if (!signerClient) {
+      return;
+    }
+    setDelegationLoader(true);
+    try {
+      const res = await signerClient.delegateToMixnode({ mixId }, 'auto', undefined, [
+        { amount: `${amount}`, denom: 'unym' },
+      ]);
+      console.log('res', res);
+      setLog((prev) => [
+        ...prev,
+        <div key={JSON.stringify(res, null, 2)}>
+          <code style={{ marginRight: '2rem' }}>{new Date().toLocaleTimeString()}</code>
+          <pre>{JSON.stringify(res, null, 2)}</pre>
+        </div>,
+      ]);
+    } catch (error) {
+      console.error(error);
+    }
+    setDelegationLoader(false);
+  };
+  // End delegate
+
+  // Sending tokens
+  const doSendTokens = async () => {
+    const memo = 'test sending tokens';
+    setSendingTokensLoader(true);
+    try {
+      const res = await signerCosmosWasmClient.sendTokens(
+        account,
+        recipientAddress,
+        [{ amount: tokensToSend, denom: 'unym' }],
+        'auto',
+        memo,
+      );
+      setLog((prev) => [
+        ...prev,
+        <div key={JSON.stringify(res, null, 2)}>
+          <code style={{ marginRight: '2rem' }}>{new Date().toLocaleTimeString()}</code>
+          <pre>{JSON.stringify(res, null, 2)}</pre>
+        </div>,
+      ]);
+    } catch (error) {
+      console.error(error);
+    }
+    setSendingTokensLoader(false);
+  };
+  // End send tokens
+
+  // Withdraw Rewards
+  const doWithdrawRewards = async () => {
+    const delegatorAddress = '';
+    const validatorAdress = '';
+    const memo = 'test sending tokens';
+    setWithdrawLoading(true);
+    try {
+      const res = await signerCosmosWasmClient.withdrawRewards(delegatorAddress, validatorAdress, 'auto', memo);
+      setLog((prev) => [
+        ...prev,
+        <div key={JSON.stringify(res, null, 2)}>
+          <code style={{ marginRight: '2rem' }}>{new Date().toLocaleTimeString()}</code>
+          <pre>{JSON.stringify(res, null, 2)}</pre>
+        </div>,
+      ]);
+    } catch (error) {
+      console.error(error);
+    }
+    setWithdrawLoading(false);
+  };
+
+  useEffect(() => {
+    if (account && signerCosmosWasmClient) {
+      if (!balance) {
+        setBalanceLoading(true);
+        getBalance();
+        setBalanceLoading(false);
+      }
+    }
+  }, [account, signerCosmosWasmClient, balance, getBalance]);
+
+  useEffect(() => {
+    if (signerClient && !delegations) {
+      console.log('getDelegations');
+      getDelegations();
+    }
+  }, [signerClient, getDelegations, delegations]);
+
+  return (
+    <Box padding={3}>
+      <Paper style={{ marginTop: '1rem', padding: '1rem' }}>
+        <Typography variant="h5" textAlign="center">
+          Basic Wallet
+        </Typography>
+        <Box padding={3}>
+          <Typography variant="h6">Your account</Typography>
+          <Box marginY={3}>
+            <Typography variant="body1" marginBottom={3}>
+              Enter the mnemonic
+            </Typography>
+            <TextField
+              type="text"
+              placeholder="mnemonic"
+              onChange={(e) => setMnemonic(e.target.value)}
+              fullWidth
+              multiline
+              maxRows={4}
+              sx={{ marginBottom: 3 }}
+            />
+            <Button
+              variant="outlined"
+              onClick={() => connect()}
+              disabled={!mnemonic || accountLoading || clientLoading || balanceLoading}
+            >
+              {accountLoading || clientLoading ? 'Loading...' : !balanceLoading ? 'Connect' : 'Connected'}
+            </Button>
+          </Box>
+          {account && balance ? (
+            <Box>
+              <Typography variant="body1">Address: {account}</Typography>
+              <Typography variant="body1">
+                Balance: {balance?.amount} {balance?.denom}
+              </Typography>
+            </Box>
+          ) : (
+            <Box>
+              <Typography variant="body1">Please, enter your nemonic to receive your account info</Typography>
+            </Box>
+          )}
+        </Box>
+        <Divider />
+        <Box padding={3}>
+          <Typography variant="h6">Send Tokens</Typography>
+          <Box marginTop={3} display="flex" flexDirection="column">
+            <TextField
+              type="text"
+              placeholder="Recipient Address"
+              onChange={(e) => setRecipientAddress(e.target.value)}
+              size="small"
+            />
+            <Box marginY={3} display="flex" justifyContent="space-between">
+              <TextField
+                type="text"
+                placeholder="Amount"
+                onChange={(e) => setTokensToSend(e.target.value)}
+                size="small"
+              />
+              <Button variant="outlined" onClick={() => doSendTokens()} disabled={sendingTokensLoader}>
+                {sendingTokensLoader ? 'Sending...' : 'SendTokens'}
+              </Button>
+            </Box>
+          </Box>
+        </Box>
+        <Divider />
+        <Box padding={3}>
+          <Typography variant="h6">Delegations</Typography>
+          <Box marginY={3}>
+            <Box marginY={3} display="flex" flexDirection="column">
+              <Typography marginBottom={3} variant="body1">
+                Make a delegation
+              </Typography>
+              <TextField
+                type="text"
+                placeholder="Mixnode ID"
+                onChange={(e) => setDelegationNodeId(e.target.value)}
+                size="small"
+              />
+              <Box marginTop={3} display="flex" justifyContent="space-between">
+                <TextField
+                  type="text"
+                  placeholder="Amount"
+                  onChange={(e) => setAmountToBeDelegated(e.target.value)}
+                  size="small"
+                />
+                <Button
+                  variant="outlined"
+                  onClick={() =>
+                    doDelegate({ mixId: parseInt(delegationNodeId, 10), amount: parseInt(amountToBeDelegated, 10) })
+                  }
+                  disabled={delegationLoader}
+                >
+                  {delegationLoader ? 'Delegation in process...' : 'Delegate'}
+                </Button>
+              </Box>
+            </Box>
+          </Box>
+          <Box marginTop={3}>
+            <Typography variant="body1">Your delegations</Typography>
+            <Box marginBottom={3} display="flex" flexDirection="column">
+              {!delegations?.delegations?.length ? (
+                <Typography>You do not have delegations</Typography>
+              ) : (
+                <Box>
+                  <Table size="small">
+                    <TableHead>
+                      <TableRow>
+                        <TableCell>MixId</TableCell>
+                        <TableCell>Owner</TableCell>
+                        <TableCell>Amount</TableCell>
+                        <TableCell>Cumulative Reward Ratio</TableCell>
+                      </TableRow>
+                    </TableHead>
+                    <TableBody>
+                      {delegations?.delegations.map((delegation: any) => (
+                        <TableRow key={delegation.mix_id}>
+                          <TableCell>{delegation.mix_id}</TableCell>
+                          <TableCell>{delegation.owner}</TableCell>
+                          <TableCell>{delegation.amount.amount}</TableCell>
+                          <TableCell>{delegation.cumulative_reward_ratio}</TableCell>
+                        </TableRow>
+                      ))}
+                    </TableBody>
+                  </Table>
+                </Box>
+              )}
+            </Box>
+            {delegations && (
+              <Box marginBottom={3}>
+                <Button variant="outlined" onClick={() => doUndelegateAll()} disabled={undeledationLoader}>
+                  {undeledationLoader ? 'Undelegating...' : 'Undelegate All'}
+                </Button>
+              </Box>
+            )}
+            <Box>
+              <Button variant="outlined" onClick={() => doWithdrawRewards()} disabled={withdrawLoading}>
+                {withdrawLoading ? 'Doing withdraw...' : 'Withdraw rewards'}
+              </Button>
+            </Box>
+          </Box>
+        </Box>
+      </Paper>
+
+      <Box marginTop={3}>
+        <Typography variant="h5">Transaction Logs:</Typography>
+        {log}
+      </Box>
+    </Box>
+  );
+};
+
+```
@@ -1,72 +0,0 @@
-```ts copy filename="FormattedWalletSendTokensCode.tsx"
-import React, { useState } from 'react';
-import Button from '@mui/material/Button';
-import Paper from '@mui/material/Paper';
-import Box from '@mui/material/Box';
-import Typography from '@mui/material/Typography';
-import TextField from '@mui/material/TextField';
-
-// Send tokens on Parent component
-  const doSendTokens = async (amount: string) => {
-    const memo = 'test sending tokens';
-    setSendingTokensLoader(true);
-    try {
-      const res = await signerCosmosWasmClient.sendTokens(
-        account,
-        recipientAddress,
-        [{ amount, denom: 'unym' }],
-        'auto',
-        memo,
-      );
-      setLog((prev) => [
-        ...prev,
-        <div key={JSON.stringify(res, null, 2)}>
-          <code style={{ marginRight: '2rem' }}>{new Date().toLocaleTimeString()}</code>
-          <pre>{JSON.stringify(res, null, 2)}</pre>
-        </div>,
-      ]);
-    } catch (error) {
-      console.error(error);
-    }
-    setSendingTokensLoader(false);
-  };
-
-export const SendTokes = ({
-  setRecipientAddress,
-  doSendTokens,
-  sendingTokensLoader,
-}: {
-  setRecipientAddress: (value: string) => void;
-  doSendTokens: (amount: string) => void;
-  sendingTokensLoader: boolean;
-}) => {
-  const [tokensToSend, setTokensToSend] = useState<string>();
-
-  return (
-    <Paper style={{ marginTop: '1rem', padding: '1rem' }}>
-      <Box padding={3}>
-        <Typography variant="h6">Send Tokens</Typography>
-        <Box marginTop={3} display="flex" flexDirection="column">
-          <TextField
-            type="text"
-            placeholder="Recipient Address"
-            onChange={(e) => setRecipientAddress(e.target.value)}
-            size="small"
-          />
-          <Box marginY={3} display="flex" justifyContent="space-between">
-            <TextField
-              type="text"
-              placeholder="Amount"
-              onChange={(e) => setTokensToSend(e.target.value)}
-              size="small"
-            />
-            <Button variant="outlined" onClick={() => doSendTokens(amount)} disabled={sendingTokensLoader}>
-              {sendingTokensLoader ? 'Sending...' : 'SendTokens'}
-            </Button>
-          </Box>
-        </Box>
-      </Box>
-    </Paper>
-  );
-};
-```
@@ -1,47 +0,0 @@
-import React, { useState } from 'react';
-import TextField from '@mui/material/TextField';
-import Button from '@mui/material/Button';
-import Stack from '@mui/material/Stack';
-import Box from '@mui/material/Box';
-
-export const GitHubRepoSearch = () => {
-  const [repoUrl, setRepoUrl] = useState('');
-  
-  const handleSearch = () => {
-    if(!repoUrl || repoUrl.length < 1 ) {
-        return window.alert("Please enter a valid Github URL!")
-    } 
-    const matchedRepo = repoUrl.match(/https:\/\/github\.com\/(.*)/)[1]
-
-    // Construct the search URL
-    const searchUrl = `https://github.com/search?q=repo:${matchedRepo} fetch(&type=code`;
-
-    // Redirect the user to a new search results page
-    window.open(searchUrl, "_blank");
-  };
-
-  return (
-    <Box padding={3}>
-      <Box>
-        <TextField
-          type="text"
-          placeholder="Enter GitHub repo URL: https://github.com/nymtech/nym/"
-          value={repoUrl}
-          onChange={(e) => setRepoUrl(e.target.value)}
-          size="small"
-          sx={{width: "450px"}}
-        />
-  
-        <Button
-          variant="outlined"
-          onClick={handleSearch}
-          size="medium"
-          sx={{ marginLeft: 2, marginTop: 0.2 }}
-        >
-          Check mixFetch
-        </Button>
-      </Box>
-    </Box>
-  );
-}
-
@@ -12,6 +12,6 @@ export const NPMLink: FC<{ packageName: string; kind: 'esm' | 'cjs'; preBundled?
    sx={{ whiteSpace: 'nowrap', textDecoration: 'none' }}
  >
    {packageName} <Chip label={kind === 'cjs' ? 'CommonJS' : 'ESM'} size="small" />{' '}
-    {preBundled && <Chip label="pre-bundled" size="small" color="info" className="chipContained" />}
+    {preBundled && <Chip label="pre-bundled" size="small" color="info" />}
  </Link>
 );
@@ -50,7 +50,7 @@ export const Traffic = () => {
    await nym?.client.stop();
  };

-  const send = () => payload && recipient && nym?.client.send({ payload, recipient });
+  const send = () => nym.client.send({ payload, recipient });

  useEffect(() => {
    init();
@@ -0,0 +1,392 @@
+import React, { useCallback, useEffect, useState } from 'react';
+import { contracts } from '@nymproject/contract-clients';
+import { SigningCosmWasmClient } from '@cosmjs/cosmwasm-stargate';
+import { DirectSecp256k1HdWallet } from '@cosmjs/proto-signing';
+import { Coin, GasPrice } from '@cosmjs/stargate';
+import Button from '@mui/material/Button';
+import Paper from '@mui/material/Paper';
+import Box from '@mui/material/Box';
+import { TableBody, TableCell, TableHead, TableRow, TextField, Typography } from '@mui/material';
+import Divider from '@mui/material/Divider';
+import Table from '@mui/material/Table';
+import { settings } from './client';
+
+const signerAccount = async (mnemonic) => {
+  // create a wallet to sign transactions with the mnemonic
+  const signer = await DirectSecp256k1HdWallet.fromMnemonic(mnemonic, {
+    prefix: 'n',
+  });
+
+  return signer;
+};
+
+const fetchSignerCosmosWasmClient = async (mnemonic: string) => {
+  const signer = await signerAccount(mnemonic);
+
+  // create a signing client we don't need to set the gas price conversion for queries
+  const cosmWasmClient = await SigningCosmWasmClient.connectWithSigner(settings.url, signer, {
+    gasPrice: GasPrice.fromString('0.025unym'),
+  });
+
+  return cosmWasmClient;
+};
+
+const fetchSignerClient = async (mnemonic) => {
+  const signer = await signerAccount(mnemonic);
+
+  // create a signing client we don't need to set the gas price conversion for queries
+  // if you want to connect without signer you'd write ".connect" and "url" as param
+  const cosmWasmClient = await SigningCosmWasmClient.connectWithSigner(settings.url, signer, {
+    gasPrice: GasPrice.fromString('0.025unym'),
+  });
+
+  /** create a mixnet contract client
+   * @param cosmWasmClient the client to use for signing and querying
+   * @param settings.address the bech32 address prefix (human readable part)
+   * @param settings.mixnetContractAddress the bech32 address prefix (human readable part)
+   * @returns the client in MixnetClient form
+   */
+
+  const mixnetClient = new contracts.Mixnet.MixnetClient(
+    cosmWasmClient,
+    settings.address, // sender (that account of the signer)
+    settings.mixnetContractAddress, // contract address (different on mainnet, QA, etc)
+  );
+
+  return mixnetClient;
+};
+
+export const Wallet = () => {
+  const [mnemonic, setMnemonic] = useState<string>();
+  const [signerCosmosWasmClient, setSignerCosmosWasmClient] = useState<any>();
+  const [signerClient, setSignerClient] = useState<any>();
+  const [account, setAccount] = useState<string>();
+  const [accountLoading, setAccountLoading] = useState<boolean>(false);
+  const [clientLoading, setClientLoading] = useState<boolean>(false);
+  const [balance, setBalance] = useState<Coin>();
+  const [balanceLoading, setBalanceLoading] = useState<boolean>(false);
+  const [log, setLog] = useState<React.ReactNode[]>([]);
+  const [tokensToSend, setTokensToSend] = useState<string>();
+  const [sendingTokensLoader, setSendingTokensLoader] = useState<boolean>(false);
+  const [delegations, setDelegations] = useState<any>();
+  const [recipientAddress, setRecipientAddress] = useState<string>('');
+  const [delegationNodeId, setDelegationNodeId] = useState<string>();
+  const [amountToBeDelegated, setAmountToBeDelegated] = useState<string>();
+  const [delegationLoader, setDelegationLoader] = useState<boolean>(false);
+  const [undeledationLoader, setUndeledationLoader] = useState<boolean>(false);
+  const [withdrawLoading, setWithdrawLoading] = useState<boolean>(false);
+  const [connectButtonText, setConnectButtonText] = useState<string>('Connect');
+
+  const getBalance = useCallback(async () => {
+    setBalanceLoading(true);
+    try {
+      const newBalance = await signerCosmosWasmClient?.getBalance(account, 'unym');
+      setBalance(newBalance);
+    } catch (error) {
+      console.error(error);
+    }
+    setBalanceLoading(false);
+  }, [account, signerCosmosWasmClient]);
+
+  const getSignerAccount = async () => {
+    setAccountLoading(true);
+    try {
+      const signer = await signerAccount(mnemonic);
+      const accounts = await signer.getAccounts();
+      if (accounts[0]) {
+        setAccount(accounts[0].address);
+      }
+    } catch (error) {
+      console.error(error);
+    }
+    setAccountLoading(false);
+  };
+
+  const getClients = async () => {
+    setClientLoading(true);
+    try {
+      setSignerCosmosWasmClient(await fetchSignerCosmosWasmClient(mnemonic));
+      setSignerClient(await fetchSignerClient(mnemonic));
+    } catch (error) {
+      console.error(error);
+    }
+    setClientLoading(false);
+  };
+
+  const getDelegations = useCallback(async () => {
+    const newDelegations = await signerClient.getDelegatorDelegations({
+      delegator: settings.address,
+    });
+    setDelegations(newDelegations);
+  }, [signerClient]);
+
+  const connect = () => {
+    getSignerAccount();
+    getClients();
+  };
+
+  const doUndelegateAll = async () => {
+    if (!signerClient) {
+      return;
+    }
+    setUndeledationLoader(true);
+    try {
+      // eslint-disable-next-line no-restricted-syntax
+      for (const delegation of delegations.delegations) {
+        // eslint-disable-next-line no-await-in-loop
+        await signerClient.undelegateFromMixnode({ mixId: delegation.mix_id }, 'auto');
+      }
+    } catch (error) {
+      console.error(error);
+    }
+    setUndeledationLoader(false);
+  };
+
+  const doDelegate = async ({ mixId, amount }: { mixId: number; amount: number }) => {
+    if (!signerClient) {
+      return;
+    }
+    setDelegationLoader(true);
+    try {
+      const res = await signerClient.delegateToMixnode({ mixId }, 'auto', undefined, [
+        { amount: `${amount}`, denom: 'unym' },
+      ]);
+      console.log('res', res);
+      setLog((prev) => [
+        ...prev,
+        <div key={JSON.stringify(res, null, 2)}>
+          <code style={{ marginRight: '2rem' }}>{new Date().toLocaleTimeString()}</code>
+          <pre>{JSON.stringify(res, null, 2)}</pre>
+        </div>,
+      ]);
+    } catch (error) {
+      console.error(error);
+    }
+    setDelegationLoader(false);
+  };
+  // End delegate
+
+  // Sending tokens
+  const doSendTokens = async () => {
+    const memo = 'test sending tokens';
+    setSendingTokensLoader(true);
+    try {
+      const res = await signerCosmosWasmClient.sendTokens(
+        account,
+        recipientAddress,
+        [{ amount: tokensToSend, denom: 'unym' }],
+        'auto',
+        memo,
+      );
+      setLog((prev) => [
+        ...prev,
+        <div key={JSON.stringify(res, null, 2)}>
+          <code style={{ marginRight: '2rem' }}>{new Date().toLocaleTimeString()}</code>
+          <pre>{JSON.stringify(res, null, 2)}</pre>
+        </div>,
+      ]);
+    } catch (error) {
+      console.error(error);
+    }
+    setSendingTokensLoader(false);
+  };
+  // End send tokens
+
+  // Withdraw Rewards
+  const doWithdrawRewards = async () => {
+    const delegatorAddress = '';
+    const validatorAdress = '';
+    const memo = 'test sending tokens';
+    setWithdrawLoading(true);
+    try {
+      const res = await signerCosmosWasmClient.withdrawRewards(delegatorAddress, validatorAdress, 'auto', memo);
+      setLog((prev) => [
+        ...prev,
+        <div key={JSON.stringify(res, null, 2)}>
+          <code style={{ marginRight: '2rem' }}>{new Date().toLocaleTimeString()}</code>
+          <pre>{JSON.stringify(res, null, 2)}</pre>
+        </div>,
+      ]);
+    } catch (error) {
+      console.error(error);
+    }
+    setWithdrawLoading(false);
+  };
+
+  useEffect(() => {
+    if (account && signerCosmosWasmClient) {
+      if (!balance) {
+        setBalanceLoading(true);
+        getBalance();
+        setBalanceLoading(false);
+      }
+    }
+  }, [account, signerCosmosWasmClient, balance, getBalance]);
+
+  useEffect(() => {
+    if (signerClient && !delegations) {
+      console.log('getDelegations');
+      getDelegations();
+    }
+  }, [signerClient, getDelegations, delegations]);
+
+  useEffect(() => {
+    if (accountLoading || clientLoading || balanceLoading) {
+      setConnectButtonText('Loading...');
+    } else if (balance) {
+      setConnectButtonText('Connected');
+    }
+    setConnectButtonText('Connect');
+  }, [accountLoading, clientLoading, balanceLoading]);
+
+  return (
+    <Box padding={3}>
+      <Paper style={{ marginTop: '1rem', padding: '1rem' }}>
+        <Typography variant="h5" textAlign="center">
+          Basic Wallet
+        </Typography>
+        <Box padding={3}>
+          <Typography variant="h6">Your account</Typography>
+          <Box marginY={3}>
+            <Typography variant="body1" marginBottom={3}>
+              Enter the mnemonic
+            </Typography>
+            <TextField
+              type="text"
+              placeholder="mnemonic"
+              onChange={(e) => setMnemonic(e.target.value)}
+              fullWidth
+              multiline
+              maxRows={4}
+              sx={{ marginBottom: 3 }}
+            />
+            <Button
+              variant="outlined"
+              onClick={() => connect()}
+              disabled={!mnemonic || accountLoading || clientLoading || balanceLoading}
+            >
+              {connectButtonText}
+            </Button>
+          </Box>
+          {account && balance ? (
+            <Box>
+              <Typography variant="body1">Address: {account}</Typography>
+              <Typography variant="body1">
+                Balance: {balance?.amount} {balance?.denom}
+              </Typography>
+            </Box>
+          ) : (
+            <Box>
+              <Typography variant="body1">Please, enter your nemonic to receive your account info</Typography>
+            </Box>
+          )}
+        </Box>
+        <Divider />
+        <Box padding={3}>
+          <Typography variant="h6">Send Tokens</Typography>
+          <Box marginTop={3} display="flex" flexDirection="column">
+            <TextField
+              type="text"
+              placeholder="Recipient Address"
+              onChange={(e) => setRecipientAddress(e.target.value)}
+              size="small"
+            />
+            <Box marginY={3} display="flex" justifyContent="space-between">
+              <TextField
+                type="text"
+                placeholder="Amount"
+                onChange={(e) => setTokensToSend(e.target.value)}
+                size="small"
+              />
+              <Button variant="outlined" onClick={() => doSendTokens()} disabled={sendingTokensLoader}>
+                {sendingTokensLoader ? 'Sending...' : 'SendTokens'}
+              </Button>
+            </Box>
+          </Box>
+        </Box>
+        <Divider />
+        <Box padding={3}>
+          <Typography variant="h6">Delegations</Typography>
+          <Box marginY={3}>
+            <Box marginY={3} display="flex" flexDirection="column">
+              <Typography marginBottom={3} variant="body1">
+                Make a delegation
+              </Typography>
+              <TextField
+                type="text"
+                placeholder="Mixnode ID"
+                onChange={(e) => setDelegationNodeId(e.target.value)}
+                size="small"
+              />
+              <Box marginTop={3} display="flex" justifyContent="space-between">
+                <TextField
+                  type="text"
+                  placeholder="Amount"
+                  onChange={(e) => setAmountToBeDelegated(e.target.value)}
+                  size="small"
+                />
+                <Button
+                  variant="outlined"
+                  onClick={() =>
+                    doDelegate({ mixId: parseInt(delegationNodeId, 10), amount: parseInt(amountToBeDelegated, 10) })
+                  }
+                  disabled={delegationLoader}
+                >
+                  {delegationLoader ? 'Delegation in process...' : 'Delegate'}
+                </Button>
+              </Box>
+            </Box>
+          </Box>
+          <Box marginTop={3}>
+            <Typography variant="body1">Your delegations</Typography>
+            <Box marginBottom={3} display="flex" flexDirection="column">
+              {!delegations?.delegations?.length ? (
+                <Typography>You do not have delegations</Typography>
+              ) : (
+                <Box>
+                  <Table size="small">
+                    <TableHead>
+                      <TableRow>
+                        <TableCell>MixId</TableCell>
+                        <TableCell>Owner</TableCell>
+                        <TableCell>Amount</TableCell>
+                        <TableCell>Cumulative Reward Ratio</TableCell>
+                      </TableRow>
+                    </TableHead>
+                    <TableBody>
+                      {delegations?.delegations.map((delegation: any) => (
+                        <TableRow key={delegation.mix_id}>
+                          <TableCell>{delegation.mix_id}</TableCell>
+                          <TableCell>{delegation.owner}</TableCell>
+                          <TableCell>{delegation.amount.amount}</TableCell>
+                          <TableCell>{delegation.cumulative_reward_ratio}</TableCell>
+                        </TableRow>
+                      ))}
+                    </TableBody>
+                  </Table>
+                </Box>
+              )}
+            </Box>
+            {delegations && (
+              <Box marginBottom={3}>
+                <Button variant="outlined" onClick={() => doUndelegateAll()} disabled={undeledationLoader}>
+                  {undeledationLoader ? 'Undelegating...' : 'Undelegate All'}
+                </Button>
+              </Box>
+            )}
+            <Box>
+              <Button variant="outlined" onClick={() => doWithdrawRewards()} disabled={withdrawLoading}>
+                {withdrawLoading ? 'Doing withdraw...' : 'Withdraw rewards'}
+              </Button>
+            </Box>
+          </Box>
+        </Box>
+      </Paper>
+
+      <Box marginTop={3}>
+        <Typography variant="h5">Transaction Logs:</Typography>
+        {log}
+      </Box>
+    </Box>
+  );
+};
@@ -1,67 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import Button from '@mui/material/Button';
-import Paper from '@mui/material/Paper';
-import Box from '@mui/material/Box';
-import Typography from '@mui/material/Typography';
-import TextField from '@mui/material/TextField';
-import { useWalletContext } from './utils/wallet.context';
-
-export const ConnectWallet = () => {
-  const { connect, balance, balanceLoading, accountLoading, account, clientsAreLoading } = useWalletContext();
-
-  const [mnemonic, setMnemonic] = useState<string>();
-  const [connectButtonText, setConnectButtonText] = useState<string>('Connect');
-
-  useEffect(() => {
-    if (accountLoading || clientsAreLoading || balanceLoading) {
-      setConnectButtonText('Loading...');
-    } else if (balance) {
-      setConnectButtonText('Connected');
-    }
-    setConnectButtonText('Connect');
-  }, [accountLoading, clientsAreLoading, balanceLoading]);
-
-  return (
-    <Paper style={{ marginTop: '1rem', padding: '1rem' }}>
-      <Typography variant="h5" textAlign="center">
-        Connect to your testnet account
-      </Typography>
-      <Box padding={3}>
-        <Typography variant="h6">Your testnet account:</Typography>
-        <Box marginY={3}>
-          <Typography variant="body1" marginBottom={3}>
-            Enter the mnemonic
-          </Typography>
-          <TextField
-            type="text"
-            placeholder="mnemonic"
-            onChange={(e) => setMnemonic(e.target.value)}
-            fullWidth
-            multiline
-            maxRows={4}
-            sx={{ marginBottom: 3 }}
-          />
-          <Button
-            variant="outlined"
-            onClick={() => connect(mnemonic)}
-            disabled={!mnemonic || accountLoading || clientsAreLoading || balanceLoading}
-          >
-            {connectButtonText}
-          </Button>
-        </Box>
-        {account && balance ? (
-          <Box>
-            <Typography variant="body1">Address: {account}</Typography>
-            <Typography variant="body1">
-              Balance: {balance?.amount} {balance?.denom}
-            </Typography>
-          </Box>
-        ) : (
-          <Box>
-            <Typography variant="body1">Please, enter your mnemonic to receive your account information</Typography>
-          </Box>
-        )}
-      </Box>
-    </Paper>
-  );
-};
@@ -1,129 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import Button from '@mui/material/Button';
-import Paper from '@mui/material/Paper';
-import Box from '@mui/material/Box';
-import Typography from '@mui/material/Typography';
-import TextField from '@mui/material/TextField';
-import Alert from '@mui/material/Alert';
-import Table from '@mui/material/Table';
-import TableBody from '@mui/material/TableBody';
-import TableCell from '@mui/material/TableCell';
-import TableHead from '@mui/material/TableHead';
-import TableRow from '@mui/material/TableRow';
-import { useWalletContext } from './utils/wallet.context';
-
-export const Delegations = () => {
-  const { delegations, doDelegate, delegationLoader, unDelegateAll, unDelegateAllLoading, log } = useWalletContext();
-
-  const [delegationNodeId, setDelegationNodeId] = useState<string>();
-  const [amountToBeDelegated, setAmountToBeDelegated] = useState<string>();
-  const [infoText, setInfoText] = useState<string>('');
-
-  const cleanFields = () => {
-    setDelegationNodeId('');
-    setAmountToBeDelegated('');
-    setInfoText('');
-  };
-
-  useEffect(
-    () => () => {
-      cleanFields();
-    },
-    [],
-  );
-
-  return (
-    <Box>
-      <Paper style={{ marginTop: '1rem', padding: '1rem' }}>
-        <Box padding={3}>
-          <Typography variant="h6">Delegations</Typography>
-          <Box marginY={3}>
-            <Box marginY={3} display="flex" flexDirection="column">
-              <Typography marginBottom={3} variant="body1">
-                Make a delegation
-              </Typography>
-              <TextField
-                type="text"
-                placeholder="Mixnode ID"
-                onChange={(e) => setDelegationNodeId(e.target.value)}
-                size="small"
-              />
-              <Box marginTop={3} display="flex" justifyContent="space-between">
-                <TextField
-                  type="text"
-                  placeholder="Amount"
-                  onChange={(e) => setAmountToBeDelegated(e.target.value)}
-                  size="small"
-                />
-                <Button
-                  variant="outlined"
-                  onClick={() => {
-                    doDelegate(delegationNodeId, amountToBeDelegated);
-                    setInfoText('Changes will be visible after the next epoch');
-                    cleanFields();
-                  }}
-                  disabled={delegationLoader}
-                >
-                  {delegationLoader ? 'Delegation in process...' : 'Delegate'}
-                </Button>
-              </Box>
-            </Box>
-          </Box>
-          <Box marginTop={3}>
-            <Typography variant="body1">Your delegations:</Typography>
-            <Box marginBottom={3} display="flex" flexDirection="column">
-              {!delegations?.delegations?.length ? (
-                <Typography variant="body2">You do not have delegations</Typography>
-              ) : (
-                <Box overflow="auto">
-                  <Table size="small">
-                    <TableHead>
-                      <TableRow>
-                        <TableCell>MixId</TableCell>
-                        <TableCell>Owner</TableCell>
-                        <TableCell>Amount</TableCell>
-                        <TableCell>Cumulative Reward Ratio</TableCell>
-                      </TableRow>
-                    </TableHead>
-                    <TableBody>
-                      {delegations?.delegations.map((delegation: any) => (
-                        <TableRow key={delegation.mix_id}>
-                          <TableCell>{delegation.mix_id}</TableCell>
-                          <TableCell>{delegation.owner}</TableCell>
-                          <TableCell>{delegation.amount.amount}</TableCell>
-                          <TableCell>{delegation.cumulative_reward_ratio}</TableCell>
-                        </TableRow>
-                      ))}
-                    </TableBody>
-                  </Table>
-                </Box>
-              )}
-            </Box>
-            {delegations?.delegations.length > 0 && (
-              <Box marginBottom={3}>
-                <Button
-                  variant="outlined"
-                  onClick={() => {
-                    unDelegateAll();
-                    setInfoText('Changes will be visible after the next epoch');
-                  }}
-                  disabled={unDelegateAllLoading}
-                >
-                  Undelegate All
-                </Button>
-              </Box>
-            )}
-
-            {infoText && <Alert severity="info">{infoText}</Alert>}
-          </Box>
-        </Box>
-      </Paper>
-      {log?.node?.length > 0 && log.type === 'delegate' && (
-        <Box marginTop={3}>
-          <Typography variant="h5">Transaction Logs:</Typography>
-          {log.node}
-        </Box>
-      )}
-    </Box>
-  );
-};
@@ -1,69 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import Button from '@mui/material/Button';
-import Paper from '@mui/material/Paper';
-import Box from '@mui/material/Box';
-import Typography from '@mui/material/Typography';
-import TextField from '@mui/material/TextField';
-import { useWalletContext } from './utils/wallet.context';
-
-export const SendTokes = () => {
-  const { sendingTokensLoading, sendTokens, log } = useWalletContext();
-
-  const [recipientAddress, setRecipientAddress] = useState<string>();
-  const [tokensToSend, setTokensToSend] = useState<string>();
-
-  const cleanFields = () => {
-    setRecipientAddress('');
-    setTokensToSend('');
-  };
-
-  useEffect(
-    () => () => {
-      cleanFields();
-    },
-    [],
-  );
-
-  return (
-    <Box>
-      <Paper style={{ marginTop: '1rem', padding: '1rem' }}>
-        <Box padding={3}>
-          <Typography variant="h6">Send Tokens</Typography>
-          <Box marginTop={3} display="flex" flexDirection="column">
-            <TextField
-              type="text"
-              placeholder="Recipient Address"
-              onChange={(e) => setRecipientAddress(e.target.value)}
-              size="small"
-            />
-            <Box marginY={3} display="flex" justifyContent="space-between">
-              <TextField
-                type="text"
-                placeholder="Amount"
-                onChange={(e) => setTokensToSend(e.target.value)}
-                size="small"
-              />
-              <Button
-                variant="outlined"
-                onClick={() => {
-                  sendTokens(recipientAddress, tokensToSend);
-                  cleanFields();
-                }}
-                disabled={sendingTokensLoading}
-              >
-                {sendingTokensLoading ? 'Sending...' : 'Send tokens'}
-              </Button>
-            </Box>
-          </Box>
-        </Box>
-      </Paper>
-
-      {log?.node?.length > 0 && log.type === 'sendTokens' && (
-        <Box marginTop={3}>
-          <Typography variant="h5">Transaction Logs:</Typography>
-          {log.node}
-        </Box>
-      )}
-    </Box>
-  );
-};
@@ -1,262 +0,0 @@
-import React, { createContext, useContext, useState, useCallback, useEffect, useMemo } from 'react';
-import { Coin } from '@cosmjs/stargate';
-import { SigningCosmWasmClient } from '@cosmjs/cosmwasm-stargate';
-import { settings } from '../../client';
-import { signerAccount, fetchSignerCosmosWasmClient, fetchSignerClient } from './wallet.methods';
-
-/**
- * This context provides the state for wallet.
- */
-
-interface WalletState {
-  accountLoading: boolean;
-  account: string;
-  clientsAreLoading: boolean;
-  connect?: (mnemonic: string) => void;
-  balance?: Coin;
-  balanceLoading: boolean;
-  setRecipientAddress?: (value: string) => void;
-  setTokensToSend?: (value: string) => void;
-  sendingTokensLoading: boolean;
-  log?: { type: 'delegate' | 'sendTokens'; node: React.ReactNode[] };
-  sendTokens?: (recipientAddress: string, tokensToSend: string) => void;
-  delegations?: any;
-  doDelegate?: (mixId: string, amount: string) => void;
-  delegationLoader?: boolean;
-  unDelegateAll?: () => void;
-  unDelegateAllLoading?: boolean;
-}
-
-export const WalletContext = createContext<WalletState>({
-  accountLoading: false,
-  account: '',
-  clientsAreLoading: false,
-  balanceLoading: false,
-  sendingTokensLoading: false,
-});
-
-export const useWalletContext = (): React.ContextType<typeof WalletContext> => useContext<WalletState>(WalletContext);
-
-export const WalletContextProvider = ({ children }: { children: JSX.Element }) => {
-  const [cosmWasmSignerClient, setCosmWasmSignerClient] = useState<SigningCosmWasmClient>(null);
-  const [nymWasmSignerClient, setNymWasmSignerClient] = useState<any>(null);
-  const [account, setAccount] = useState<string>('');
-  const [accountLoading, setAccountLoading] = useState<boolean>(false);
-  const [delegations, setDelegations] = useState<{ delegations: any[]; start_next_after: any }>();
-  const [clientsAreLoading, setClientsAreLoading] = useState<boolean>(false);
-  const [balance, setBalance] = useState<Coin>(null);
-  const [balanceLoading, setBalanceLoading] = useState<boolean>(false);
-  const [sendingTokensLoading, setSendingTokensLoading] = useState<boolean>(false);
-  const [log, setLog] = useState<{ type: 'delegate' | 'sendTokens'; node: React.ReactNode[] }>();
-  const [delegationLoader, setDelegationLoader] = useState<boolean>(false);
-  const [unDelegateAllLoading, setUnDelegateAllLoading] = useState<boolean>(false);
-
-  const Reset = () => {
-    setAccountLoading(false);
-    setDelegations(null);
-    setClientsAreLoading(false);
-    setBalance(null);
-    setBalanceLoading(false);
-    setSendingTokensLoading(false);
-  };
-
-  const getSignerAccount = async (mnemonic: string) => {
-    setAccountLoading(true);
-    try {
-      const signer = await signerAccount(mnemonic);
-      const accounts = await signer.getAccounts();
-      if (accounts[0]) {
-        setAccount(accounts[0].address);
-      }
-    } catch (error) {
-      console.error(error);
-    }
-    setAccountLoading(false);
-  };
-
-  const getClients = async (mnemonic: string) => {
-    setClientsAreLoading(true);
-    try {
-      setCosmWasmSignerClient(await fetchSignerCosmosWasmClient(mnemonic));
-      setNymWasmSignerClient(await fetchSignerClient(mnemonic));
-    } catch (error) {
-      console.error(error);
-    }
-    setClientsAreLoading(false);
-  };
-
-  const connect = async (mnemonic: string) => {
-    getSignerAccount(mnemonic);
-    getClients(mnemonic);
-  };
-
-  const getBalance = useCallback(async () => {
-    setBalanceLoading(true);
-    try {
-      const newBalance = await cosmWasmSignerClient?.getBalance(account, 'unym');
-      setBalance(newBalance);
-    } catch (error) {
-      console.error(error);
-    }
-    setBalanceLoading(false);
-  }, [account, cosmWasmSignerClient]);
-
-  const getDelegations = useCallback(async () => {
-    const delegationsReceived = await nymWasmSignerClient.getDelegatorDelegations({
-      delegator: settings.address,
-    });
-    setDelegations(delegationsReceived);
-  }, [nymWasmSignerClient]);
-
-  const sendTokens = async (recipientAddress: string, tokensToSend: string) => {
-    const memo: string = 'test sending tokens';
-    setSendingTokensLoading(true);
-    try {
-      const res = await cosmWasmSignerClient.sendTokens(
-        account,
-        recipientAddress,
-        [{ amount: tokensToSend, denom: 'unym' }],
-        'auto',
-        memo,
-      );
-      setLog({
-        type: 'sendTokens',
-        node: [
-          <div key={JSON.stringify(res, null, 2)}>
-            <code style={{ marginRight: '2rem' }}>{new Date().toLocaleTimeString()}</code>
-            <pre>{JSON.stringify(res, null, 2)}</pre>
-          </div>,
-        ],
-      });
-    } catch (error) {
-      console.error(error);
-    }
-    setSendingTokensLoading(false);
-  };
-
-  const doDelegate = async (mixId: string, amount: string) => {
-    setDelegationLoader(true);
-    const memo: string = 'test delegation';
-    const coinAmount: Coin = { amount, denom: 'unym' };
-    try {
-      const res = await nymWasmSignerClient.delegateToMixnode({ mixId: parseInt(mixId, 10) }, 'auto', memo, [
-        coinAmount,
-      ]);
-      setLog({
-        type: 'delegate',
-        node: [
-          <div key={JSON.stringify(res, null, 2)}>
-            <code style={{ marginRight: '2rem' }}>{new Date().toLocaleTimeString()}</code>
-            <pre>{JSON.stringify(res, null, 2)}</pre>
-          </div>,
-        ],
-      });
-    } catch (error) {
-      console.error(error);
-    }
-    setDelegationLoader(false);
-  };
-
-  const unDelegateAll = async () => {
-    setUnDelegateAllLoading(true);
-    try {
-      const logs: React.ReactNode[] = [];
-      // eslint-disable-next-line no-restricted-syntax
-      for (const delegation of delegations.delegations) {
-        // eslint-disable-next-line no-await-in-loop
-        const res = await nymWasmSignerClient.undelegateFromMixnode({ mixId: delegation.mix_id }, 'auto');
-        setUnDelegateAllLoading(false);
-        logs.push(
-          <div key={JSON.stringify(res, null, 2)}>
-            <code style={{ marginRight: '2rem' }}>{new Date().toLocaleTimeString()}</code>
-            <pre>{JSON.stringify(res, null, 2)}</pre>
-          </div>,
-        );
-      }
-      setLog({
-        type: 'delegate',
-        node: logs,
-      });
-    } catch (error) {
-      console.error(error);
-      setUnDelegateAllLoading(false);
-    }
-  };
-
-  // const withdrawRewards = async () => {
-  //   const validatorAdress = '';
-  //   const memo = 'test withdraw rewards';
-  //   setWithdrawLoading(true);
-  //   try {
-  //     const res = await cosmWasmSignerClient.withdrawRewards(account, validatorAdress, 'auto', memo);
-  //     setLog({
-  //       type: 'delegate',
-  //       node: [
-  //         <div key={JSON.stringify(res, null, 2)}>
-  //           <code style={{ marginRight: '2rem' }}>{new Date().toLocaleTimeString()}</code>
-  //           <pre>{JSON.stringify(res, null, 2)}</pre>
-  //         </div>,
-  //       ],
-  //     });
-  //   } catch (error) {
-  //     console.error(error);
-  //   }
-  //   setWithdrawLoading(false);
-  // };
-
-  useEffect(
-    () => () => {
-      Reset();
-    },
-    [],
-  );
-
-  useEffect(() => {
-    if (cosmWasmSignerClient) {
-      getBalance();
-    }
-  }, [cosmWasmSignerClient]);
-
-  useEffect(() => {
-    if (nymWasmSignerClient) {
-      getDelegations();
-    }
-  }, [nymWasmSignerClient]);
-
-  const state = useMemo<WalletState>(
-    () => ({
-      accountLoading,
-      account,
-      clientsAreLoading,
-      connect,
-      balance,
-      balanceLoading,
-      sendingTokensLoading,
-      log,
-      sendTokens,
-      delegations,
-      doDelegate,
-      delegationLoader,
-      unDelegateAll,
-      unDelegateAllLoading,
-    }),
-    [
-      accountLoading,
-      account,
-      clientsAreLoading,
-      connect,
-      balance,
-      balanceLoading,
-      sendingTokensLoading,
-      log,
-      sendTokens,
-      delegations,
-      doDelegate,
-      delegationLoader,
-      unDelegateAll,
-      unDelegateAllLoading,
-    ],
-  );
-
-  return <WalletContext.Provider value={state}>{children}</WalletContext.Provider>;
-};
@@ -1,50 +0,0 @@
-import { contracts } from '@nymproject/contract-clients';
-import { SigningCosmWasmClient } from '@cosmjs/cosmwasm-stargate';
-import { DirectSecp256k1HdWallet } from '@cosmjs/proto-signing';
-import { GasPrice } from '@cosmjs/stargate';
-import { settings } from '../../client';
-
-export const signerAccount = async (mnemonic: string) => {
-  // create a wallet to sign transactions with the mnemonic
-  const signer = await DirectSecp256k1HdWallet.fromMnemonic(mnemonic, {
-    prefix: 'n',
-  });
-
-  return signer;
-};
-
-export const fetchSignerCosmosWasmClient = async (mnemonic: string) => {
-  const signer = await signerAccount(mnemonic);
-
-  // create a signing client we don't need to set the gas price conversion for queries
-  const cosmWasmClient = await SigningCosmWasmClient.connectWithSigner(settings.url, signer, {
-    gasPrice: GasPrice.fromString('0.025unym'),
-  });
-
-  return cosmWasmClient;
-};
-
-export const fetchSignerClient = async (mnemonic: string) => {
-  const signer = await signerAccount(mnemonic);
-
-  // create a signing client we don't need to set the gas price conversion for queries
-  // if you want to connect without signer you'd write ".connect" and "url" as param
-  const cosmWasmClient = await SigningCosmWasmClient.connectWithSigner(settings.url, signer, {
-    gasPrice: GasPrice.fromString('0.025unym'),
-  });
-
-  /** create a mixnet contract client
-   * @param cosmWasmClient the client to use for signing and querying
-   * @param settings.address the bech32 address prefix (human readable part)
-   * @param settings.mixnetContractAddress the bech32 address prefix (human readable part)
-   * @returns the client in MixnetClient form
-   */
-
-  const mixnetClient = new contracts.Mixnet.MixnetClient(
-    cosmWasmClient,
-    settings.address, // sender (that account of the signer)
-    settings.mixnetContractAddress, // contract address (different on mainnet, QA, etc)
-  );
-
-  return mixnetClient;
-};
@@ -1,6 +1,6 @@
 {
  "name": "@nymproject/ts-sdk-docs",
-  "version": "1.2.0",
+  "version": "1.2.0-rc.10",
  "description": "Nym Typescript SDK Docs",
  "license": "Apache-2.0",
  "author": "Nym Technologies SA",
@@ -28,10 +28,10 @@
    "@mui/icons-material": "^5.14.9",
    "@mui/lab": "^5.0.0-alpha.145",
    "@mui/material": "^5.14.8",
-    "@nymproject/contract-clients": ">=1.2.0-rc.10 || ^1",
-    "@nymproject/mix-fetch": ">=1.2.0-rc.10 || ^1",
-    "@nymproject/mix-fetch-full-fat": ">=1.2.0-rc.10 || ^1",
-    "@nymproject/sdk-full-fat": ">=1.2.0-rc.10 || ^1",
+    "@nymproject/contract-clients": "^1.2.0-rc.9",
+    "@nymproject/mix-fetch": "^1.2.0-rc.9",
+    "@nymproject/mix-fetch-full-fat": "^1.2.0-rc.9",
+    "@nymproject/sdk-full-fat": "^1.2.0-rc.9",
    "chain-registry": "^1.19.0",
    "cosmjs-types": "^0.8.0",
    "next": "^13.4.19",
@@ -51,4 +51,4 @@
    "typescript": "^4.9.3"
  },
  "private": false
-}
+}
@@ -1,4 +0,0 @@
-{
-    "general": "General FAQ"
-  }
-  
@@ -1,74 +0,0 @@
-# Welcome to the TS SDK FAQ!
-
-## How can I interact with Nym?
-
-#### For existing projects:
-If you would like to integrate parts of the Nym stack to your existing app, please check out the dedicated [integrations page](../FAQ/integrations).
-
-#### For builders:
-###### SDKs
-If you’re looking to build or ‘Nymify’ existing solutions, read on: For developing in Rust or TS/JS, then the Nym SDKs are your go-to. Please visit the [Rust SDK documentation](https://nymtech.net/developers/tutorials/rust-sdk.html) for more Rust-related information and tutorials.
-Stay on this page, the [TS SDK handbook](../) (you are here) for using the TypeScript SDK.
-These SDKs abstract away much of the messaging and core logic from your app, and allow you to run a Nym client as part of your application process, instead of having to run them separately. In short, they simplify building Nym clients into your project.
-
-###### Standalone Nym clients: Websocket, WebAssembly, SOCKS5
-Alternatively, you can also use one of the three standalone Nym clients to connect your application to the mixnet. 
-These clients do the majority of the heavy-lifting with regards to cryptographic operations and routing under the hood. 
-Essentially, they all do the same thing: create a connection to a gateway, encrypt and decrypt packets sent to and received from the mixnet, and send cover traffic to hide the flow of actual app traffic from observers. You can learn more about the Nym clients in this [Nym integration page](https://nymtech.net/developers/integrations/mixnet-integration.html).
-
-###### Network requesters: 
-Network requesters are a type of Service Provider that essentially act as a kind of proxy, somewhat similarly to a Tor exit node. If you have access to a server, you can run a Network Requester, which will perform the following functions: 
- Send outbound requests from the local machine through the mixnet to a server;
- The Network Requester then makes a request on the user’s behalf, shielding the user and their metadata from the untrusted and unknown infrastructure, for example with  email or instant messaging client servers;
-
-
-By default the Network Requester is not an open proxy but rather uses a local and global [allow list](https://nymtech.net/.wellknown/network-requester/standard-allowed-list.txt) to whitelist host access.
-
-## Which Service Provider to run?
-In order to ensure uptime and reliability, it is recommended that you run some pieces of mixnet infrastructure. This infrastructure varies depending on the architecture of your application, as well as the endpoints that it needs to hit:
-
- No Service Provider (Network Requester) needed: If you’re running a purely P2P application, then just integrating clients and having some method of sharing addresses should be enough to route your traffic through the mixnet;
- Network Requester needed (existing or own): If you’re wanting to place the mixnet between your users’ application instances and a server-based backend, you will need a Network Requester. In this case, if your app supports SOCKS5, you could either use an existing NR or, if your app supports SOCKS5 but needs more extensive whitelisting, you could  use the [network requester service provider binary](https://nymtech.net/operators/nodes/network-requester-setup.html) to proxy these requests to your application backend yourself, with the mixnet ‘between’ the user and your service, in order to prevent metadata leakage being broadcast to the internet.
- Running your own Service Provider: If your usecase is more complex, you’re wanting to route RPC requests through the mixnet to a blockchain for example, you will need to look into setting up some sort of Service that does the transaction broadcasting for you. You can find examples of such projects on the [community applications page](https://nymtech.net/developers/community-resources/community-applications-and-guides.html).
-
-
-## Why gateways?
-Nym apps have a stable, potentially long-lasting relation to a gateway node. A client will establish a symmetric key share with a gateway that can be verified on subsequent connection attempts.
-
-Gateways serve a few different functions:
-
- They act as an end-to-end encrypted message store in case your app goes offline;
- They send encrypted [surb-acks](https://nymtech.net/docs/architecture/traffic-flow.html) for potentially offline recipients, to ensure reliable message delivery;
- They offer a stable addressing location for apps, although the IP may change frequently;
-
-If you want to learn more about gateways, you can check the [mixnet integration page](https://nymtech.net/developers/integrations/mixnet-integration.html).
-
-
-## Why and when does the mixnet client complain about insufficient topology?
-
-It will in one of the following cases:
- There are empty mix layers - although this is rare;
- The gateway you've registered with does not appear in the network topology -> it is either unbonded or was blacklisted;
- The gateway you want to send packets to does not appear in the network topology -> it is either unbonded or was blacklisted;
-
-To avoid the last two, you need to make sure the gateway you are calling is bonded and whitelisted.
-
-## How can I check whether the gateway I am connecting to is bonded and not blacklisted?
-
-The easiest way of checking what gateway you're registered with is to look at your client address. 
-Client addresses are in the format of:
-`client-id . client-dh @ gateway-id. ` 
-
-To illustrate this: `DpB3cHAchJiNBQi5FrZx2csXb1mrHkpYh9Wzf8Rjsuko.ANNWrvHqMYuertHGHUrZdBntQhpzfbWekB39qez9U2Vx@2BuMSfMW3zpeAjKXyKLhmY4QW1DXurrtSPEJ6CjX3SEh `
-
- `DpB3cHAchJiNBQi5FrZx2csXb1mrHkpYh9Wzf8Rjsuko`: is the client's identity key;
- `ANNWrvHqMYuertHGHUrZdBntQhpzfbWekB39qez9U2Vx`: is the client's Diffie Hellman key;
- `2BuMSfMW3zpeAjKXyKLhmY4QW1DXurrtSPEJ6CjX3SEh`: is the gateway's identity, which is what you'll need to check the state of the gateway in the [Nym Explorer](https://explorer.nymtech.net/network-components/gateways). 
-
-
-## How can I get my service host whitelisted?
-Currently, the different options are: 
- You can get it added to the local list of an existing Network Requester;
- You can ask the Nym team to add it to the global [allow list](https://nymtech.net/.wellknown/network-requester/standard-allowed-list.txt) if it's not already there;
- You can run your own Network Requester and locally configure it to allow the hosts you need to connect to;
-If you'd like to learn more about Network Requesters and the global allow list, you can visit the [network requester set-up page](https://nymtech.net/operators/nodes/network-requester-setup.html).
@@ -1,13 +1,11 @@
 {
  "index": "Introduction",
  "overview": "SDK overview",
-  "integrations": "Nym integrations",
  "installation": "Installation",
  "start": "Getting started",
-  "examples": "Step-by-step examples",
+  "guides": "Examples",
  "playground": "Live Playground",
-  "bundling": "Bundling",
-  "FAQ": "FAQ",
+

  "contact": {
    "title": "Contact ↗",
@@ -1,4 +1,4 @@
-# Troubleshooting bundling
+# Troubleshooting Bundling

 You might need some help bundling packages from the Nym Typescript SDK into your package.

@@ -41,7 +41,7 @@ list. Use `[name][ext]` to preserve the output filename, because the package exp

 ## ESM not supported

-If your bundler does not support ECMAScript Modules (ESM), CommonJS packages are supported for most parts of the SDK.
+If your bundler does not support ECMAScript Modules (ESM) we provide CommonJS packages for most parts of the SDK.

 For those that don't have ESM versions, you will need to use a tool like [Babel](https://babeljs.io/) to convert
 ESM to CommonJS.
@@ -52,3 +52,4 @@ If you are using a `*-full-fat` package, or if you inline WASM or web workers, y
 [CSP](https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP) prevents WASM from being instantiated from a string.

 You'll have to experiment with either adjusting the CSP or use another variant that is unbundled.
+
@@ -1,6 +0,0 @@
-{
- "bundling": "General troubleshooting",
- "esbuild": "ESbuild",
- "webpack": "Webpack"
-}
-  
@@ -1,32 +0,0 @@
-import { Callout } from 'nextra/components';
-
-# Troubleshooting bundling with ESbuild
-
-If you've been following the steps outlined in the Examples section, your development environment should be configured as follows:
-
-#### Environment Setup
-Begin by creating a directory and configuring your application environment:
-
-Create your directory and set-up your app environment:
-```bash
-npm create vite@latest
-```
-During the environment setup, choose React and subsequently opt for Typescript if you want your application to function smoothly following this tutorial. Next, navigate to your application directory and run the following commands:
-```bash
-cd < YOUR_APP >
-npm i 
-npm run dev
-```
-
-##### Installation
-Install the required package:
-```bash
-npm install @nymproject/< PACKAGE_NAME >
-```
-
-<Callout type="info" emoji="ℹ️">
-    Remember that the CosmosKit example will require you to make use of polyfills.
-</Callout>
-
-By implementing the provided code for the various components in the step-by-step examples section, you should be able to set-up and run your application without encountering any bundling challenges!
-
@@ -1,93 +0,0 @@
-import { Callout } from 'nextra/components';
-
-# Troubleshooting bundling with Webpack
-
-## Webpack > 5 ESM
-
-For any project using Webpack, you´ll need the following rule in your `webpack.config.js` above version 5:
-```json
-{
-        test: /\.(m?js)$/,
-        resolve: {
-          fullySpecified: false
-        }
-}
-```
-
-### Create-react-app
-
-#### General cases
-
-If you wish to use Webpack for your app with the code provided in the step-by-step examples section, you'll need to:
-
-```bash
-npx create-react-app nymapp --template typescript
-cd nymapp
-```
-You'll then need to install the needed dependencies, head to your app's `App.tsx` file and paste the code provided in the step-by-step section. 
-
-#### Contract client
-
-<Callout type="info" emoji="ℹ️">
-    Using webpack, the `Contract client` for querying or executing might need polyfills. As create-react-app doesn´t allow you access to the Webpack config without ejecting, you'll overwrite it as follow:
-</Callout>
-
-##### Install contract-clients dependencies
-```bash
-npm install @nymproject/contract-clients @cosmjs/cosmwasm-stargate @cosmjs/proto-signing 
-```
-
-Head to you app's `App.tsx` file and replace the code by the one provided in the step-by-step examples section.
-
-##### Polyfilling
-
-Copy the following to your terminal and run:
-
-```bash
-npm install react-app-rewired
-npm install --save-dev crypto-browserify stream-browserify assert stream-http https-browserify os-browserify url buffer process
-cat <<EOF > config-overrides.js
-const webpack = require('webpack');
-const path = require('path')
-
-module.exports = function override(config) {
-  const fallback = config.resolve.fallback || {};
-  Object.assign(fallback, {
-    "crypto": require.resolve("crypto-browserify"),
-    "stream": require.resolve("stream-browserify"),
-    "assert": require.resolve("assert"),
-    "http": require.resolve("stream-http"),
-    "https": require.resolve("https-browserify"),
-    "os": require.resolve("os-browserify"),
-    "url": require.resolve("url")
-  })
-  config.resolve.fallback = fallback;
-  config.plugins = (config.plugins || []).concat([
-    new webpack.ProvidePlugin({
-      process: 'process/browser',
-      Buffer: ['buffer', 'Buffer']
-    })
-  ])
-  config.module.rules = (config.module.rules || []).concat([
-      {
-        test: /\.(m?js)$/,
-        resolve: {
-          fullySpecified: false
-        }
-      }
-    ])
-  return config; 
-}
-EOF
-```
-
-#### Edit the `package.json` file as follows:
-
-```json
-  "scripts": {
-    "start": "react-app-rewired start",
-    "build": "react-app-rewired build",
-    "test": "react-app-rewired test",
-    "eject": "react-scripts eject"
-  },
-```
@@ -1,6 +0,0 @@
-{
-  "mix-fetch": "1. mixFetch",
-  "mixnet": "2. Mixnet Client",
-  "nym-smart-contracts": "3. Nym Smart Contracts",
-  "cosmos-kit": "4. Cosmos Kit"
-}
@@ -1,158 +0,0 @@
-# Cosmos Kit
-
-The wonderful people of Cosmology have made some [fantastic components](https://cosmoskit.com/) that can be used with
-Nym. These include:
-
- Using the wallets such as Keplr, Cosmostation and others from your React application;
- Using the [Ledger hardware wallet](https://docs.cosmoskit.com/integrating-wallets/ledger) from your browser;
- Any wallet that supports [Wallet Connect v2.0](https://docs.cosmoskit.com/integrating-wallets/adding-new-wallets);
-
-##### Environment Setup
-Begin by creating a directory and configuring your application environment:
-
-```bash
-npm create vite@latest
-```
-
-During the environment setup, choose React and subsequently opt for Typescript if you want your application to function smoothly following this tutorial. Next, navigate to your application directory and run the following commands:
-```bash
-cd < YOUR_APP >
-npm i 
-npm run dev
-```
-
-##### Installation
-Install the required package:
-```bash
-npm install @cosmos-kit/react @cosmos-kit/keplr @cosmos-kit/ledger chain-registry
-```
-
-You need to polyfill some nodejs modules in order to use keplr and ledger wallets by modifying your `vite.config.js` file:
-```bash
-npm install @esbuild-plugins/node-globals-polyfill
-```
-
-```js
-// vite.config.js
-import { defineConfig } from 'vite'
-import react from '@vitejs/plugin-react'
-import { NodeGlobalsPolyfillPlugin } from '@esbuild-plugins/node-globals-polyfill'
-export default defineConfig({
-  plugins: [react()],
-  optimizeDeps: {
-        esbuildOptions: {
-            define: {
-                global: 'globalThis'
-            },
-            plugins: [
-                NodeGlobalsPolyfillPlugin({
-                    buffer: true
-                })
-            ]
-        }
-    }
-})
-```
-
-Your components have to be wrapped into a [ChainProvider](https://docs.cosmoskit.com/chain-provider),
-in order to use the `useChain('nyx')` hook. The nyx chain is provided in the 'chain-registry' NPM package by default.
-
-Now, go to the `src` folder and open your `App.tsx` file to replace all the code with the following, which will allow you to connect and disconnect a Ledger or Keplr wallet to Nyx: 
-
-```ts
-import "./App.css";
-import React from 'react';
-import { ChainProvider, useChain } from '@cosmos-kit/react';
-import { assets, chains } from 'chain-registry';
-import { wallets as ledger } from '@cosmos-kit/ledger';
-import { wallets as keplr } from '@cosmos-kit/keplr';
-import { AminoMsg, makeSignDoc } from '@cosmjs/amino';
-import { MsgSend } from 'cosmjs-types/cosmos/bank/v1beta1/tx';
- 
-export const getDoc = (address: string) => {
-  const chainId = 'nyx';
-  const msg: AminoMsg = {
-    type: '/cosmos.bank.v1beta1.MsgSend',
-    value: MsgSend.fromPartial({
-      fromAddress: address,
-      toAddress: 'n1nn8tghp94n8utsgyg3kfttlxm0exgjrsqkuwu9',
-      amount: [{ amount: '1000', denom: 'unym' }],
-    }),
-  };
-  const fee = {
-    amount: [{ amount: '2000', denom: 'ucosm' }],
-    gas: '180000', // 180k
-  };
-  const memo = 'Use your power wisely';
-  const accountNumber = 15;
-  const sequence = 16;
-  const doc = makeSignDoc([msg], fee, chainId, memo, accountNumber, sequence);
-  return doc
-};
- 
-function MyComponent() {
-  const {wallet, address, connect, disconnect, getOfflineSignerAmino } =
-  useChain('nyx');
- 
-  React.useEffect(() => {
-    connect();
-    disconnect();
-  }, []);
- 
-  const sign = async () => {
-    if (!address) return
-    const doc = getDoc(address);
-    return getOfflineSignerAmino().signAmino(address, doc);
-  };
- 
-  return (
-    <div>  
-      <div>
-        {wallet && 
-        <div> 
-          <div>Connected to {wallet?.prettyName} </div> 
-          <div>Address: <code>{address}</code></div>
-        </div>}
-      </div>
-      {wallet ? (
-        <div>
-          <button onClick={() => disconnect()}>Disconnect wallet</button>
-        </div>
-      ) : (
-        <div>
-          <button onClick={() => connect()}>Connect wallet</button>
-        </div>
-      )}
-    </div>
-  );
-}
- 
-export default function App() {
-    const assetsFixedUp = React.useMemo(() => {
-    const nyx = assets.find((a) => a.chain_name === 'nyx');
-    if (nyx) {
-      const nyxCoin = nyx.assets.find((a) => a.name === 'nyx');
-      if (nyxCoin) {
-        nyxCoin.coingecko_id = 'nyx';
-      }
-      nyx.assets = nyx.assets.reverse();
-    }
-    return assets;
-  }, [assets]);
- 
-  return (
-     <ChainProvider
-      chains={[chains.find((c) => c.chain_id === 'nyx')!]}
-      assetLists={assetsFixedUp}
-      wallets={[...ledger, ...keplr]}
-      signerOptions={{
-        preferredSignType: () => 'amino',
-      }}
-    >
- 
-        <MyComponent/>
-    </ChainProvider>
- 
-  )
-}
-```
@@ -1,165 +0,0 @@
-import { Callout } from 'nextra/components'
-
-# `mixFetch`
-
-An easy way to secure parts or all of your web app is to replace calls to [`fetch`](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API/Using_Fetch) with `mixFetch`:
-
-MixFetch works the same as vanilla `fetch` as it's a proxied wrapper around the original function. 
-Sounds great, are there any catches? Well, there are a few (for now):
-
-1. Currently, the operators of Network Requesters that make the final request at the egress part of the Nym mixnet to
-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 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.
-
-
-Read [this article](https://blog.nymtech.net/mixfetch-like-the-fetch-api-but-via-the-mixnet-82acfd435c62) to learn more about mixFetch.
-
-<Callout type="info" emoji="ℹ️">
-  We are currently working on a feature that adds a Secure Websocket (WSS) listener with HTTPS (automatically generated with LetsEncrypt) to Nym's
-  gateways.
-  While we are adding this feature, you can use a gateway that has Caddy providing HTTPS/WSS by adding this to the options when setting up `mixFetch`:
-</Callout>
-
-```ts
-// For mainnet
-import type { SetupMixFetchOps } from '@nymproject/mix-fetch';
-
-const extra = {
-  hiddenGateways: [
-    {
-      owner: 'n1kymvkx6vsq7pvn6hfurkpg06h3j4gxj4em7tlg',
-      host: 'gateway1.nymtech.net',
-      explicitIp: '213.219.38.119',
-      identityKey: 'E3mvZTHQCdBvhfr178Swx9g4QG3kkRUun7YnToLMcMbM',
-      sphinxKey: 'CYcrjoJ8GT7Dp54zViUyyRUfegeRCyPifWQZHRgMZrfX',
-    },
-  ],
-};
-
-const mixFetchOptions: SetupMixFetchOps = {
-  preferredGateway: 'E3mvZTHQCdBvhfr178Swx9g4QG3kkRUun7YnToLMcMbM', // with WSS
-  preferredNetworkRequester:
-    'GiRjFWrMxt58pEMuusm4yT3RxoMD1MMPrR9M2N4VWRJP.3CNZBPq4vg7v7qozjGjdPMXcvDmkbWPCgbGCjQVw9n6Z@2xU4CBE6QiiYt6EyBXSALwxkNvM7gqJfjHXaMkjiFmYW',
-  mixFetchOverride: {
-    requestTimeoutMs: 60_000,
-  },
-  forceTls: true, // force WSS
-  extra, // manually set the gateway details for WSS so certificates will work for hostname
-};
-```
-
-##### Environment Setup
-Begin by creating a directory and configuring your application environment:
-
-```bash
-npm create vite@latest
-```
-
-During the environment setup, choose React and subsequently opt for Typescript if you want your application to function smoothly following this tutorial. Next, navigate to your application directory and run the following commands:
-```bash
-cd < YOUR_APP >
-npm i 
-npm run dev
-```
-
-##### Installation
-Install the required package:
-```bash
-npm install @nymproject/mix-fetch-full-fat
-```
-
-##### Imports
-In the `src` folder, open the `App.tsx` file and delete all the code.
-
-Import the client in your app:
-````js
-import { mixFetch } from "@nymproject/mix-fetch-full-fat";
-````
-
-
-##### Example: using the `mixFetch` client:
-
-<Callout type="info" emoji="ℹ️">
-    Again, for this example, we will be using the `full-fat` version of the ESM SDK. 
-</Callout>
-
-`Get` and `Post` outputs will be observable from your console. 
-
-```ts
-import "./App.css";
-import { mixFetch, SetupMixFetchOps } from '@nymproject/mix-fetch-full-fat';
-import React from 'react';
-
-const extra = {
-  hiddenGateways: [
-    {
-      owner: 'n1kymvkx6vsq7pvn6hfurkpg06h3j4gxj4em7tlg',
-      host: 'gateway1.nymtech.net',
-      explicitIp: '213.219.38.119',
-      identityKey: 'E3mvZTHQCdBvhfr178Swx9g4QG3kkRUun7YnToLMcMbM',
-      sphinxKey: 'CYcrjoJ8GT7Dp54zViUyyRUfegeRCyPifWQZHRgMZrfX',
-    },
-  ],
-};
-
-const mixFetchOptions: SetupMixFetchOps = {
-  preferredGateway: 'E3mvZTHQCdBvhfr178Swx9g4QG3kkRUun7YnToLMcMbM', // with WSS
-  preferredNetworkRequester:
-    'GiRjFWrMxt58pEMuusm4yT3RxoMD1MMPrR9M2N4VWRJP.3CNZBPq4vg7v7qozjGjdPMXcvDmkbWPCgbGCjQVw9n6Z@2xU4CBE6QiiYt6EyBXSALwxkNvM7gqJfjHXaMkjiFmYW',
-  mixFetchOverride: {
-    requestTimeoutMs: 60_000,
-  },
-  forceTls: true, // force WSS
-  extra
-};
-
-
-export function HttpGET() {
-  const [html, setHtml] = React.useState('')
-    async function get () {
-       //Make sure the URL is whitelisted (see 'standard allowed list') otherwise you will get a network requester filter check error
-      const response = await mixFetch('https://nymtech.net/favicon.svg', { mode: 'unsafe-ignore-cors' }, mixFetchOptions)
-      const text = await response.text()
-      console.log('response was', text)
-      setHtml(html)
-    }
-
-  return (
-    <>
-      <button onClick={() => { get() }}>Get</button>
-    </>
-  )
-}
-
-export function HttpPOST() {
-    async function post () {
-       //Make sure the URL is whitelisted (see 'standard allowed list') otherwise you will get a network requester filter check error
-      const apiResponse = await mixFetch('https://postman-echo.com/post', {
-        method: 'POST',
-        body: JSON.stringify({ foo: 'bar' }),
-  headers: { 'Content-Type': 'application/json' }
-      }, mixFetchOptions)
-      console.log(apiResponse)
-    }
-  return (
-    <>
-      <button onClick={() => { post() }}>Post</button>
-    </>
-  )
-}
-
-export default function App() {
-  return (
-    <>
-    <HttpGET/>
-    <HttpPOST/>
-    </>
-  )
-}
-```
-
@@ -1,152 +0,0 @@
-import { Callout } from 'nextra/components'
-
-# Mixnet Client
-
-As you know by now, in order to send or receive messages over the mixnet, you'll need to use the [`SDK Client`](https://www.npmjs.com/package/@nymproject/sdk), which will allow you to create apps that can use the Nym mixnet and Coconut credentials.
-
-This client is message based - it can only send a one-way message to another client's address.
-
-Replying can be achieved in two ways:
- reveal the sender's address to the recipient (as part of the payload)
- use a SURB (single use reply block) that allows the recipient to reply to the sender without compromising the identity of either party
-
-##### Environment Setup
-Begin by creating a directory and configuring your application environment:
-
-```bash
-npm create vite@latest
-```
-
-During the environment setup, choose React and subsequently opt for Typescript if you want your application to function smoothly following this tutorial. Next, navigate to your application directory and run the following commands:
-```bash
-cd < YOUR_APP >
-npm i 
-npm run dev
-```
-
-##### Installation
-Install the required package:
-```bash
-npm install @nymproject/sdk-full-fat 
-```
-
-##### Imports
-In the `src` folder, open the `App.tsx` file and delete all the code.
-
-Import the SDK's Mixnet Client in your app:
-````js
-import { createNymMixnetClient, NymMixnetClient, Payload } from "@nymproject/sdk-full-fat";
-````
-
-##### Example: using the SDK's Mixnet Client to send and receive messages over the Nym mixnet
-By pasting the below code example, you should be able to send and receive messages through the mixnet through an unstyled mixnet app template!
-<Callout type="warning" emoji="ℹ️">
-    For this example, we will be using the `full-fat` version of the ESM SDK. If you'd like to use the unbundled version of the ESM one, make sure your [bundler configuration](../../bundling/bundling) copies the WebAssembly (WASM) and web worker files to the output bundle.
-</Callout>
-
-```ts
-import "./App.css";
-import { useEffect, useState } from "react";
-import {
-  createNymMixnetClient,
-  NymMixnetClient,
-  Payload,
-} from "@nymproject/sdk-full-fat";
- 
-const nymApiUrl = "https://validator.nymtech.net/api";
- 
-export function MixnetClient() {
-  const [nym, setNym] = useState<NymMixnetClient>();
-  const [selfAddress, setSelfAddress] = useState<string>();
-  const [recipient, setRecipient] = useState<string>();
-  const [payload, setPayload] = useState<Payload>();
-  const [receivedMessage, setReceivedMessage] = useState<string>();
- 
-  const init = async () => {
-    const client = await createNymMixnetClient();
-    setNym(client);
- 
-    // Start the client and connect to a gateway
-    await client?.client.start({
-      clientId: crypto.randomUUID(),
-      nymApiUrl,
-    });
- 
-    // Check when is connected and set the self address
-    client?.events.subscribeToConnected((e) => {
-      const { address } = e.args;
-      setSelfAddress(address);
-    });
- 
-    // Show whether the client is ready or not
-    client?.events.subscribeToLoaded((e) => {
-      console.log("Client ready: ", e.args);
-    });
-
-    // Show message payload content when received
-    client?.events.subscribeToTextMessageReceivedEvent((e) => {
-      console.log(e.args.payload);
-      setReceivedMessage(e.args.payload);
-    });
-  };
-
-
-  const stop = async () => {
-    await nym?.client.stop();
-  };
-
- const send = () => {
-    if (!nym || !payload || !recipient) return
-    nym.client.send({ payload, recipient });
-  }
- 
-  useEffect(() => {
-    init();
-    return () => {
-      stop();
-    };
-  }, []);
- 
-  if (!nym) return <div>Waiting for the mixnet client...</div>;
- 
-  if (!selfAddress) return <div>Connecting...</div>;
-
- 
-  return (
-    <div>
-      <h1>Send messages through the Nym mixnet</h1>
-      <p style={{ border: "1px solid black" }}>
-        My self address is: {selfAddress ? selfAddress : "loading"}
-      </p>
-      <div style={{ border: "1px solid black" }}>
-        <label>Recipient Address: </label>
-        <input
-          type="text"
-          onChange={(e) => setRecipient(e.target.value)}
-        ></input>
-        <input
-          type="text"
-          onChange={(e) =>
-            setPayload({ message: e.target.value, mimeType: "text/plain" })
-          }
-        ></input>
-        <button onClick={() => send()}>Send</button>
-      </div>
-      <p>Received message: {receivedMessage}</p>
-    </div>
-  );
-};
- 
-export default function App () {
-  return (
-    <>
-    <MixnetClient/>
-    </>
-  )
-}
-```
-
-<Callout type="info" emoji="⚠️">
-  If you encounter a Gateway client error that persists even after a hard refresh, you may need to take the following steps: Open your browser's console => Navigate to the "Application" tab => Delete the databases listed under "IndexedDB".
-  Additionally, please be aware that the mixnet client is currently limited to functioning in local development environments due to SSL-related issues.
-</Callout>
@@ -0,0 +1,6 @@
+{
+  "nym-smart-contracts": "1. Nym Smart Contracts",
+  "mixnet": "2. Mixnet Client",
+  "mix-fetch": "3. mixFetch",
+  "cosmos-kit": "4. Cosmos Kit"
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
serinko	0cc8cf0846	update plugins	2023-10-16 14:04:22 +02:00
serinko	87b3b76854	update mdbook admonish	2023-10-16 13:46:16 +02:00