Remove unused function

Fully working state (minus task manager)
Restore commented out functionality in socks5 client
2023-05-16 14:45:01 +02:00 · 2023-05-16 14:39:15 +02:00 · 2023-05-16 10:50:02 +02:00 · 2023-05-16 10:05:44 +02:00 · 2023-05-15 16:15:11 +02:00 · 2023-05-15 14:28:46 +02:00
2254 changed files with 10234 additions and 365360 deletions
@@ -63,7 +63,7 @@ jobs:
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
-          toolchain: 1.69.0
+          toolchain: stable

      - name: Build all binaries
        uses: actions-rs/cargo@v1
@@ -74,7 +74,7 @@ jobs:
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
-          toolchain: 1.69.0
+          toolchain: stable
          target: wasm32-unknown-unknown
          override: true
          components: rustfmt, clippy
@@ -107,8 +107,6 @@ jobs:
          cp contracts/target/wasm32-unknown-unknown/release/nym_coconut_dkg.wasm $OUTPUT_DIR
          cp contracts/target/wasm32-unknown-unknown/release/cw3_flex_multisig.wasm $OUTPUT_DIR
          cp contracts/target/wasm32-unknown-unknown/release/cw4_group.wasm $OUTPUT_DIR
-          cp contracts/target/wasm32-unknown-unknown/release/nym_service_provider_directory.wasm $OUTPUT_DIR
-          cp contracts/target/wasm32-unknown-unknown/release/nym_name_service.wasm $OUTPUT_DIR

      - name: Deploy branch to CI www
        continue-on-error: true
@@ -9,14 +9,12 @@ on:
      - 'gateway/**'
      - 'integrations/**'
      - 'mixnode/**'
-      - 'sdk/lib/socks5-listener/**'
      - 'sdk/rust/nym-sdk/**'
      - 'service-providers/**'
      - 'nym-api/**'
      - 'nym-outfox/**'
      - 'tools/nym-cli/**'
      - 'tools/ts-rs-cli/**'
-      - 'Cargo.toml'
  pull_request:
    paths:
      - 'clients/**'
@@ -25,14 +23,12 @@ on:
      - 'gateway/**'
      - 'integrations/**'
      - 'mixnode/**'
-      - 'sdk/lib/socks5-listener/**'
      - 'sdk/rust/nym-sdk/**'
      - 'service-providers/**'
      - 'nym-api/**'
      - 'nym-outfox/**'
      - 'tools/nym-cli/**'
      - 'tools/ts-rs-cli/**'
-      - 'Cargo.toml'

 jobs:
  build:
@@ -0,0 +1,138 @@
+name: Nym Connect - Android APK Build
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - "release/nc-android-v[0-9].[0-9].[0-9]*"
+
+jobs:
+  build:
+    name: Build APK
+    runs-on: custom-runner-linux
+    env:
+      ANDROID_HOME: ${{ github.workspace }}/android-sdk
+      NDK_VERSION: 25.1.8937393
+      NDK_HOME: ${{ github.workspace }}/android-sdk/ndk/25.1.8937393
+      SDK_PLATFORM_VERSION: android-33
+      SDK_BUILDTOOLS_VERSION: 33.0.1
+
+    steps:
+      - name: Install Dependencies (Linux)
+        # https://next--tauri.netlify.app/next/guides/getting-started/prerequisites/linux/#1-system-dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get -y install \
+          build-essential \
+          unzip \
+          curl \
+          wget \
+          libssl-dev \
+          squashfs-tools \
+          librsvg2-dev
+
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Install Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: "temurin"
+          java-version: "17"
+
+      - name: Install Android SDK manager
+        # https://developer.android.com/studio/command-line/sdkmanager
+        run: |
+          curl -sS https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip -o cmdline-tools.zip
+          unzip cmdline-tools.zip
+          mkdir -p $ANDROID_HOME/cmdline-tools/latest
+          mv cmdline-tools/* $ANDROID_HOME/cmdline-tools/latest
+          rm -rf cmdline-tools
+
+      - name: Install Android S/NDK
+        run: |
+          echo y | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --licenses
+          echo y | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager \
+            "platforms;$SDK_PLATFORM_VERSION" \
+            "platform-tools" \
+            "ndk;$NDK_VERSION" \
+            "build-tools;$SDK_BUILDTOOLS_VERSION"
+
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+
+      # TODO this step takes a considerable amount of time
+      # We could avoid to compile from source tauri-cli and use instead
+      # pre-compiled binary provided by the node package `@tauri-apps/cli`
+      # But when using the later the build fails for some reason
+      # so keep installing and using tauri-cli
+      - name: Install tauri cli
+        run: cargo install tauri-cli --version "^2.0.0-alpha.2"
+
+      - name: Install rust android targets
+        run: |
+          rustup target add aarch64-linux-android \
+            armv7-linux-androideabi \
+            i686-linux-android \
+            x86_64-linux-android
+
+      - name: Setup Nodejs
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+
+      - name: Install yarn
+        run: |
+          npm i -g yarn
+          yarn --version
+
+      - name: Build frontend code
+        run: |
+          yarn install --frozen-lockfile
+          yarn build
+          yarn workspace @nym/nym-connect-mobile webpack:prod
+
+      - name: Build APK
+        working-directory: nym-connect/mobile
+        env:
+          # NODE_TAURI_CLI=${{ github.workspace }}/nym-connect/mobile/node_modules/.bin/tauri
+          ANDROID_SDK_ROOT: ${{ env.ANDROID_HOME }}
+          WRY_ANDROID_PACKAGE: net.nymtech.nym_connect
+          WRY_ANDROID_LIBRARY: nym_connect
+        # TODO build with release profile (--release), it will requires
+        # to sign the APK. For now build with debug profile to avoid that
+        # TODO build using `yarn tauri`, provide NODE_TAURI_CLI, see TODO notes above
+        run: cargo tauri android build --debug --apk --split-per-abi -t aarch64
+
+      # TODO add the version number to APK name
+      - name: Rename APK artifact
+        run: |
+          mkdir apk/
+          mv nym-connect/mobile/src-tauri/gen/android/nym_connect/app/build/outputs/apk/arm64/debug/app-arm64-debug.apk \
+            apk/nym-connect-arm64-debug.apk
+          mv nym-connect/mobile/src-tauri/gen/android/nym_connect/app/build/outputs/apk/x86_64/debug/app-x86_64-debug.apk \
+            apk/nym-connect-x86_64-debug.apk
+
+      - name: Upload APK artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: nc-apk-debug
+          path: |
+            apk/nym-connect-arm64-debug.apk
+            apk/nym-connect-x86_64-debug.apk
+
+  # publish:
+  #   name: Publish APK
+  #   needs: build
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: Checkout
+  #       uses: actions/checkout@v3
+  #     - name: Download binary artifact
+  #       uses: actions/download-artifact@v3
+  #       with:
+  #         name: nc-apk-debug
+  #         path: apk
+  #     # TODO add a step to upload the APK somewhere
+  #     - name: Publish
+  #       uses: ???
@@ -1,110 +0,0 @@
-name: Nyms5 Android
-# unsigned APKs only, supported archs:
-# - arm64-v8a (arm64)
-# - x86_64
-
-on:
-  workflow_dispatch:
-  push:
-    tags:
-      - nyms5-android-v*
-
-jobs:
-  build:
-    name: Build APK
-    runs-on: custom-runner-linux
-    env:
-      ANDROID_HOME: ${{ github.workspace }}/android-sdk
-      NDK_VERSION: 25.2.9519653
-      NDK_HOME: ${{ github.workspace }}/android-sdk/ndk/25.2.9519653
-      SDK_PLATFORM_VERSION: android-33
-      SDK_BUILDTOOLS_VERSION: 33.0.2
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Install Java
-        uses: actions/setup-java@v3
-        with:
-          distribution: "temurin"
-          java-version: "17"
-
-      - name: Install Android SDK manager
-        # https://developer.android.com/studio/command-line/sdkmanager
-        run: |
-          curl -sS https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip -o cmdline-tools.zip
-          unzip cmdline-tools.zip
-          mkdir -p $ANDROID_HOME/cmdline-tools/latest
-          mv cmdline-tools/* $ANDROID_HOME/cmdline-tools/latest
-          rm -rf cmdline-tools
-
-      - name: Install Android S/NDK
-        run: |
-          echo y | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --licenses
-          echo y | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager \
-            "platforms;$SDK_PLATFORM_VERSION" \
-            "platform-tools" \
-            "ndk;$NDK_VERSION" \
-            "build-tools;$SDK_BUILDTOOLS_VERSION"
-
-      - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@1.70.0
-
-      - name: Install rust android targets
-        run: |
-          rustup target add aarch64-linux-android \
-            x86_64-linux-android
-
-      - name: Build lib nym-socks5-listener
-        working-directory: sdk/lib/socks5-listener/
-        env:
-          RELEASE: true
-          RUSTFLAGS: "-C link-args=-Wl,--hash-style=gnu"
-        # build for arm64 and x86_64
-        run: ./build-android.sh aarch64 x86_64
-
-      - name: Build APKs (unsigned)
-        working-directory: nym-connect/native/android
-        env:
-          ANDROID_SDK_ROOT: ${{ env.ANDROID_HOME }}
-        # build for arm64 and x86_64
-        run: |
-          ./gradlew :app:assembleArch64Debug
-          ./gradlew :app:assembleArch64Release
-
-      - name: Prepare APKs
-        run: |
-          mkdir apk
-          mv nym-connect/native/android/app/build/outputs/apk/arch64/debug/app-arch64-debug.apk \
-            apk/nyms5-arch64-debug.apk
-          mv nym-connect/native/android/app/build/outputs/apk/arch64/release/app-arch64-release-unsigned.apk \
-            apk/nyms5-arch64-release.apk
-
-      - name: Upload APKs
-        uses: actions/upload-artifact@v3
-        with:
-          name: nyms5-apk-arch64
-          path: |
-            apk/nyms5-arch64-debug.apk
-            apk/nyms5-arch64-release.apk
-
-  gh-release:
-    name: Publish APK (GH release)
-    needs: build
-    runs-on: custom-runner-linux
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Download binary artifact
-        uses: actions/download-artifact@v3
-        with:
-          name: nyms5-apk-arch64
-          path: apk
-      - name: Release
-        uses: softprops/action-gh-release@v1
-        with:
-          files: |
-            apk/nyms5-arch64-debug.apk
-            apk/nyms5-arch64-release.apk
-
@@ -8,7 +8,6 @@
 .idea
 target
 .env
-.env.dev
 /.vscode/settings.json
 validator/.vscode
 sample-configs/validator-config.toml
@@ -42,5 +41,4 @@ storybook-static
 envs/qwerty.env
 .parcel-cache
 **/.DS_Store
-cpu-cycles/libcpucycles/build
-foxyfox.env
+cpu-cycles/libcpucycles/build
@@ -4,81 +4,6 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://

 ## [Unreleased]

-## [v1.1.22] (2023-06-20)
-
- CLI tool for querying network-requesters ([#3539])
- Statically link OpenSSL ([#3510])
- NymConnect - add sentry.io reporting ([#3421])
- init command does not change version number in config.toml ([#3336])
- [Bug] Config version does not correspond to binary version ([#3434])
-
-[#3539]: https://github.com/nymtech/nym/issues/3539
-[#3510]: https://github.com/nymtech/nym/issues/3510
-[#3421]: https://github.com/nymtech/nym/issues/3421
-[#3336]: https://github.com/nymtech/nym/issues/3336
-[#3434]: https://github.com/nymtech/nym/issues/3434
-
-## [v1.1.21] (2023-06-13)
-
- mixFetch: Change socks5 `SendRequest` to include OrderedMessage index as a field rather than making it serialized inside the `data` field
- ([#3534])
- Explorer - add more data columns to the Service Provider section: ([#3474])
- network-requester: support report if they run an open proxy using `ControlRequest` API ([#3461])
- Refactor client configs (London discussion) ([#3444])
- Increase `DEFAULT_MAXIMUM_CONNECTION_BUFFER_SIZE` to 2000 to improve reliability ([#3433])
- socks5: sender waits for lanes to clear even though the connection is closed ([#3366])
- version bump for variables ([#3545])
-
-[#3534]: https://github.com/nymtech/nym/issues/3534
-[#3474]: https://github.com/nymtech/nym/issues/3474
-[#3461]: https://github.com/nymtech/nym/issues/3461
-[#3444]: https://github.com/nymtech/nym/issues/3444
-[#3433]: https://github.com/nymtech/nym/issues/3433
-[#3366]: https://github.com/nymtech/nym/issues/3366
-[#3545]: https://github.com/nymtech/nym/pull/3545
-
-## [v1.1.20] (2023-06-06)
-
- Explorer - Fix SP supported apps list ([#3458])
- Investigate if we need to lower `SHUTDOWN_TIMEOUT` in  socks5 to zero (or almost zero) ([#3438])
- Explorer - show all gateways in the default view regardless of the version number ([#3427])
- service-provider-directory: add signature check when announcing ([#3360])
- Support functionality for nym-name-service (nym-api, nym-cli, etc) ([#3355])
- Edit the nym-network-requester to support the enabled-credentials-mode flag ([#3101])
- [BUG] network requester documentation update ([#3493])
- removing hardcoded version numbers ([#3485])
- [BUG] network requester documentation update ([#3481])
- [BUG] network requester documentation update ([#3469])
- Sign when announcing service providers to the directory contract ([#3459])
- mixnode documentation update ([#3435])
- updated readme with new developer chat links + new docs links ([#3141])
-
-[#3458]: https://github.com/nymtech/nym/issues/3458
-[#3438]: https://github.com/nymtech/nym/issues/3438
-[#3427]: https://github.com/nymtech/nym/issues/3427
-[#3360]: https://github.com/nymtech/nym/issues/3360
-[#3355]: https://github.com/nymtech/nym/issues/3355
-[#3101]: https://github.com/nymtech/nym/issues/3101
-[#3493]: https://github.com/nymtech/nym/pull/3493
-[#3485]: https://github.com/nymtech/nym/pull/3485
-[#3481]: https://github.com/nymtech/nym/pull/3481
-[#3469]: https://github.com/nymtech/nym/pull/3469
-[#3459]: https://github.com/nymtech/nym/pull/3459
-[#3435]: https://github.com/nymtech/nym/pull/3435
-[#3141]: https://github.com/nymtech/nym/pull/3141
-
-## [v1.1.19] (2023-05-16)
-
- nym-name-service endpoint in nym-api ([#3403])
- Implement key storage for WASM client using IndexedDB (for browser) ([#3329])
- Initial version of nym-name-service contract providing name aliases for nym-addresses ([#3274])
- Update Cargo.lock ([#3410])
-
-[#3403]: https://github.com/nymtech/nym/issues/3403
-[#3329]: https://github.com/nymtech/nym/issues/3329
-[#3274]: https://github.com/nymtech/nym/issues/3274
-[#3410]: https://github.com/nymtech/nym/pull/3410
-
 ## [v1.1.18] (2023-05-09)

 - Implement heartbeat messages between socks5 proxy and network requester ([#3215])
@@ -78,7 +78,6 @@ members = [
    "gateway/gateway-requests",
    "integrations/bity",
    "mixnode",
-    "sdk/lib/socks5-listener",
    "sdk/rust/nym-sdk",
    "service-providers/common",
    "service-providers/network-requester",
@@ -87,7 +86,6 @@ members = [
    "nym-api/nym-api-requests",
    "nym-outfox",
    "tools/nym-cli",
-    "tools/nym-nr-query",
    "tools/ts-rs-cli"
 ]

@@ -102,7 +100,7 @@ default-members = [
    "explorer-api",
 ]

-exclude = ["explorer", "contracts", "clients/webassembly", "nym-wallet", "nym-connect/mobile/src-tauri", "nym-connect/desktop", "cpu-cycles", "lib-25519"]
+exclude = ["socks5-c", "explorer", "contracts", "clients/webassembly", "nym-wallet", "nym-connect/mobile/src-tauri", "nym-connect/desktop", "cpu-cycles"]

 [workspace.package]
 authors = ["Nym Technologies SA"]
@@ -113,7 +111,6 @@ edition = "2021"
 license = "Apache-2.0"

 [workspace.dependencies]
-anyhow = "1.0.71"
 async-trait = "0.1.64"
 bip39 = { version = "2.0.0", features = ["zeroize"] }
 cfg-if = "1.0.0"
@@ -121,16 +118,13 @@ cosmwasm-derive = "=1.0.0"
 cosmwasm-schema = "=1.0.0"
 cosmwasm-std = "=1.0.0"
 cosmwasm-storage = "=1.0.0"
-cw-controllers = "=0.13.4"
-cw-storage-plus = "=0.13.4"
 cw-utils = "=0.13.4"
+cw-storage-plus = "=0.13.4"
 cw2 = { version = "=0.13.4" }
 cw3 = { version = "=0.13.4" }
 cw3-fixed-multisig = { version = "=0.13.4" }
 cw4 = { version = "=0.13.4" }
 dotenvy = "0.15.6"
-generic-array = "0.14.7"
-getrandom = "0.2.10"
 lazy_static = "1.4.0"
 log = "0.4"
 once_cell = "1.7.2"
@@ -141,4 +135,3 @@ tap = "1.0.1"
 thiserror = "1.0.38"
 tokio = "1.24.1"
 url = "2.2"
-zeroize = "1.6.0"
@@ -21,8 +21,8 @@ The platform is composed of multiple Rust crates. Top-level executable binary cr

 ### Building

-Platform build instructions are available on [our docs site](https://nymtech.net/docs/binaries/build-nym.html).
-Wallet build instructions are also available on [our docs site](https://nymtech.net/docs/wallet/desktop-wallet.html).
+Platform build instructions are available on [our docs site](https://nymtech.net/docs/binaries/building-nym.html).
+Wallet build instructions are also available on [our docs site](https://nymtech.net/docs/stable/nym-apps/wallet#for-developers).

 ### Developing

@@ -32,11 +32,7 @@ For Typescript components, please see [ts-packages](./ts-packages).

 ### Developer chat

-> We used to use Keybase for developer chats, but we have since migrated to Matrix and Discord. We no longer check the old **nymtech.friends** Keybase team. 
-
-You can chat to us in two places: 
-* The #dev channel on [Matrix](https://matrix.to/#/#dev:nymtech.chat)
-* The various developer channels on [Discord](https://discord.gg/nym)
+You can chat to us in [Keybase](https://keybase.io). Download their chat app, then click **Teams -> Join a team**. Type **nymtech.friends** into the team name and hit **continue**. For general chat, hang out in the **#general** channel. Our development takes places in the **#dev** channel. Node operators should be in the **#node-operators** channel.

 ### Rewards

@@ -50,7 +46,7 @@ Node, node operator and delegator rewards are determined according to the princi
 |<img src="https://render.githubusercontent.com/render/math?math=\lambda_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}\lambda_{i}#gh-dark-mode-only">|ratio of stake operator has pledged to their node to the token circulating supply.
 |<img src="https://render.githubusercontent.com/render/math?math=\omega_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}\omega_{i}#gh-dark-mode-only">|fraction of total effort undertaken by node `i`, set to `1/k`.
 |<img src="https://render.githubusercontent.com/render/math?math=k#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}k#gh-dark-mode-only">|number of nodes stakeholders are incentivised to create, set by the validators, a matter of governance. Currently determined by the `reward set` size, and set to 720 in testnet Sandbox.
-|<img src="https://render.githubusercontent.com/render/math?math=\alpha#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}\alpha#gh-dark-mode-only">|Sybil attack resistance parameter - the higher this parameter is set the stronger the reduction in competitiveness gets for a Sybil attacker.
+|<img src="https://render.githubusercontent.com/render/math?math=\alpha#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}\alpha#gh-dark-mode-only">|Sybil attack resistance parameter - the higher this parameter is set the stronger the reduction in competitivness gets for a Sybil attacker.
 |<img src="https://render.githubusercontent.com/render/math?math=PM_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}PM_{i}#gh-dark-mode-only">|declared profit margin of operator `i`, defaults to 10% in.
 |<img src="https://render.githubusercontent.com/render/math?math=PF_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}PF_{i}#gh-dark-mode-only">|uptime of node `i`, scaled to 0 - 1, for the rewarding epoch
 |<img src="https://render.githubusercontent.com/render/math?math=PP_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}PP_{i}#gh-dark-mode-only">|cost of operating node `i` for the duration of the rewarding epoch, set to 40 NYMT.
@@ -74,7 +70,7 @@ Operator of node `i` is credited with the following amount:
 <img src="https://render.githubusercontent.com/render/math?math=min\{PP_{i},R_{i})\} %2b max\{0, (PM_{i} %2b (1 - PM_{i}) \cdot \lambda_{i}/\delta_{i}) \cdot (R_{i} - PP_{i})\}#gh-light-mode-only">
 <img src="https://render.githubusercontent.com/render/math?math=\color{white}min\{PP_{i},R_{i})\} %2b max\{0, (PM_{i} %2b (1 - PM_{i}) \cdot \lambda_{i}/\delta_{i}) \cdot (R_{i} - PP_{i})\}#gh-dark-mode-only">

-Delegate with stake `s` receives:
+Delegate with stake `s` recieves:

 <img src="https://render.githubusercontent.com/render/math?math=max\{0, (1-PM_{i}) \cdot (s^'/\sigma_{i}) \cdot (R_{i} - PP_{i})\}#gh-light-mode-only">
 <img src="https://render.githubusercontent.com/render/math?math=\color{white}max\{0, (1-PM_{i}) \cdot (s^'/\sigma_{i}) \cdot (R_{i} - PP_{i})\}#gh-dark-mode-only">
@@ -1,7 +1,6 @@
 plugins {
    id 'com.android.application'
    id 'org.jetbrains.kotlin.android'
-    id 'org.jetbrains.kotlin.plugin.serialization' version '1.8.21'
 }

 android {
@@ -23,60 +22,10 @@ android {

    buildTypes {
        release {
-            minifyEnabled true
+            minifyEnabled false
            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
        }
    }
-
-    flavorDimensions "abi"
-    productFlavors {
-        universal {
-            dimension "abi"
-            ndk {
-                abiFilters "arm64-v8a", "armeabi-v7a", "x86_64", "x86"
-            }
-        }
-        arch64 {
-            dimension "abi"
-            ndk {
-                abiFilters "arm64-v8a", "x86_64"
-            }
-        }
-        arm64 {
-            dimension "abi"
-            ndk {
-                abiFilters "arm64-v8a"
-            }
-        }
-        arm {
-            dimension "abi"
-            ndk {
-                abiFilters "armeabi-v7a"
-            }
-        }
-        x86_64 {
-            dimension "abi"
-            ndk {
-                abiFilters "x86_64"
-            }
-        }
-        x86 {
-            dimension "abi"
-            ndk {
-                abiFilters "x86"
-            }
-        }
-    }
-
-//    splits {
-//        abi {
-//            enable true
-//            reset()
-//            include "x86_64", "arm64-v8a"
-//            universalApk true
-//        }
-//    }
-
    compileOptions {
        sourceCompatibility JavaVersion.VERSION_1_8
        targetCompatibility JavaVersion.VERSION_1_8
@@ -88,31 +37,29 @@ android {
        compose true
    }
    composeOptions {
-        kotlinCompilerExtensionVersion '1.4.6'
+        kotlinCompilerExtensionVersion '1.3.2'
    }
    packagingOptions {
        resources {
            excludes += '/META-INF/{AL2.0,LGPL2.1}'
        }
    }
+    ndkVersion '25.2.9519653'
+    buildToolsVersion '33.0.2'
 }

 dependencies {

-    implementation 'androidx.core:core-ktx:1.10.1'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
+    implementation 'androidx.core:core-ktx:1.8.0'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
    implementation 'androidx.activity:activity-compose:1.5.1'
    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
-    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0'
    implementation platform('androidx.compose:compose-bom:2022.10.00')
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1'
-    implementation 'androidx.compose.runtime:runtime-livedata'
    implementation 'androidx.compose.ui:ui'
    implementation 'androidx.compose.ui:ui-graphics'
    implementation 'androidx.compose.ui:ui-tooling-preview'
    implementation 'androidx.compose.material3:material3'
-    implementation 'androidx.work:work-runtime-ktx:2.8.1'
    testImplementation 'junit:junit:4.13.2'
    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
@@ -120,5 +67,4 @@ dependencies {
    androidTestImplementation 'androidx.compose.ui:ui-test-junit4'
    debugImplementation 'androidx.compose.ui:ui-tooling'
    debugImplementation 'androidx.compose.ui:ui-test-manifest'
-    implementation 'com.github.kittinunf.fuel:fuel:3.0.0-alpha1'
-}
+}
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools">
-
    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />

    <application
-        android:name=".App"
        android:allowBackup="true"
        android:dataExtractionRules="@xml/data_extraction_rules"
        android:fullBackupContent="@xml/backup_rules"
@@ -21,6 +17,7 @@
        <activity
            android:name=".MainActivity"
            android:exported="true"
+            android:label="@string/app_name"
            android:theme="@style/Theme.Nyms5">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
@@ -28,12 +25,6 @@
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
        </activity>
-
-        <!-- Remove default workManager initializer, we are using a custom one -->
-        <provider
-            android:name="androidx.startup.InitializationProvider"
-            android:authorities="${applicationId}.androidx-startup"
-            tools:node="remove" />
    </application>

-</manifest>
+</manifest>
@@ -0,0 +1,61 @@
+package net.nymtech.nyms5
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.activity.viewModels
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import kotlinx.coroutines.launch
+import net.nymtech.nyms5.ui.theme.Nyms5Theme
+
+class MainActivity : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val viewModel: MainViewModel by viewModels()
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.STARTED) {
+                viewModel.uiState.collect {
+                    // Update UI elements
+                }
+            }
+        }
+
+        setContent {
+            Nyms5Theme {
+                // A surface container using the 'background' color from the theme
+                Surface(
+                    modifier = Modifier.fillMaxSize(),
+                    color = MaterialTheme.colorScheme.background
+                ) {
+                    Greeting("Android")
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun Greeting(name: String, modifier: Modifier = Modifier) {
+    Text(
+        text = "Hello $name!",
+        modifier = modifier
+    )
+}
+
+@Preview(showBackground = true)
+@Composable
+fun GreetingPreview() {
+    Nyms5Theme {
+        Greeting("Android")
+    }
+}
@@ -0,0 +1,26 @@
+package net.nymtech.nyms5
+
+import android.util.Log
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+
+class MainViewModel : ViewModel() {
+
+    init {
+        viewModelScope.launch(Dispatchers.IO) {
+            val result = Socks5().runtest()
+            result?.let { Log.d("App", "result: $it") }
+        }
+        Log.d("App", "libnyms5 CALLED")
+    }
+
+    // Expose screen UI state
+    private val _uiState = MutableStateFlow(false)
+    val uiState: StateFlow<Boolean> = _uiState.asStateFlow()
+
+}
@@ -0,0 +1,15 @@
+package net.nymtech.nyms5
+
+class Socks5 {
+    // Load the native library "libsocks5-c.so".
+    init {
+        System.loadLibrary("socks5_c")
+    }
+
+    fun runtest(): String? {
+        return run("TEST")
+    }
+
+    // Native function implemented in Rust.
+    private external fun run(input: String): String?
+}
@@ -38,7 +38,7 @@ private val LightColorScheme = lightColorScheme(
 )

@Composable
-fun NymTheme(
+fun Nyms5Theme(
    darkTheme: Boolean = isSystemInDarkTheme(),
    // Dynamic color is available on Android 12+
    dynamicColor: Boolean = true,
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">nyms5</string>
+</resources>
@@ -0,0 +1,6 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+plugins {
+    id 'com.android.application' version '8.0.1' apply false
+    id 'com.android.library' version '8.0.1' apply false
+    id 'org.jetbrains.kotlin.android' version '1.7.20' apply false
+}
@@ -12,9 +12,7 @@ serde = { workspace = true, features = ["derive"] }
 thiserror = "1.0"
 tokio = { version = "1.24.1", features = ["rt-multi-thread", "net", "signal", "macros"] } # async runtime

-
 nym-bandwidth-controller = { path = "../../common/bandwidth-controller" }
-nym-client-core = { path = "../../common/client-core" }
 nym-config = { path = "../../common/config" }
 nym-credentials = { path = "../../common/credentials" }
 nym-credential-storage = { path = "../../common/credential-storage" }
@@ -1,4 +1,4 @@
-// Copyright 2022-2023 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

 mod commands;
@@ -9,14 +9,13 @@ use commands::*;
 use error::Result;
 use log::*;
 use nym_bin_common::completions::fig_generate;
-use nym_config::DEFAULT_DATA_DIR;
+use nym_config::{CRED_DB_FILE_NAME, DATA_DIR};
 use nym_network_defaults::{setup_env, NymNetworkDetails};
 use std::process::exit;
 use std::time::{Duration, SystemTime};

 use clap::{CommandFactory, Parser};
 use nym_bin_common::logging::setup_logging;
-use nym_client_core::config::disk_persistence::CommonClientPaths;
 use nym_validator_client::nyxd::traits::DkgQueryClient;
 use nym_validator_client::nyxd::{Coin, CosmWasmClient};
 use nym_validator_client::Config;
@@ -72,11 +71,10 @@ async fn main() -> Result<()> {

    match args.command {
        Command::Run(r) => {
-            // we assume the structure of <home-dir>/data
-            let data_dir = r.client_home_directory.join(DEFAULT_DATA_DIR);
-            let paths = CommonClientPaths::new_default(data_dir);
-            let db_path = paths.credentials_database;
-
+            let db_path = r
+                .client_home_directory
+                .join(DATA_DIR)
+                .join(CRED_DB_FILE_NAME);
            let shared_storage =
                nym_credential_storage::initialise_persistent_storage(db_path).await;
            let recovery_storage = recovery_storage::RecoveryStorage::new(r.recovery_dir)?;
@@ -1,6 +1,6 @@
 [package]
 name = "nym-client"
-version = "1.1.22"
+version = "1.1.18"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 description = "Implementation of the Nym Client"
 edition = "2021"
@@ -1,104 +1,99 @@
-// Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::client::config::persistence::ClientPaths;
-use crate::client::config::template::CONFIG_TEMPLATE;
-use nym_bin_common::logging::LoggingSettings;
+use crate::client::config::template::config_template;
+use nym_client_core::config::ClientCoreConfigTrait;
 use nym_config::defaults::DEFAULT_WEBSOCKET_LISTENING_PORT;
-use nym_config::{
-    must_get_home, read_config_from_toml_file, save_formatted_config_to_file, NymConfigTemplate,
-    OptionalSet, DEFAULT_CONFIG_DIR, DEFAULT_CONFIG_FILENAME, DEFAULT_DATA_DIR, NYM_DIR,
-};
+use nym_config::{NymConfig, OptionalSet};
 use serde::{Deserialize, Serialize};
 use std::fmt::Debug;
-use std::io;
 use std::net::{IpAddr, Ipv4Addr};
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 use std::str::FromStr;

-pub use nym_client_core::config::Config as BaseClientConfig;
+pub use nym_client_core::config::Config as BaseConfig;
+pub use nym_client_core::config::MISSING_VALUE;
 pub use nym_client_core::config::{DebugConfig, GatewayEndpointConfig};

 pub mod old_config_v1_1_13;
-pub mod old_config_v1_1_20;
-pub mod old_config_v1_1_20_2;
-mod persistence;
 mod template;

-const DEFAULT_CLIENTS_DIR: &str = "clients";
-
-/// Derive default path to clients's config directory.
-/// It should get resolved to `$HOME/.nym/mixnodes/<id>/config`
-pub fn default_config_directory<P: AsRef<Path>>(id: P) -> PathBuf {
-    must_get_home()
-        .join(NYM_DIR)
-        .join(DEFAULT_CLIENTS_DIR)
-        .join(id)
-        .join(DEFAULT_CONFIG_DIR)
+#[derive(Debug, Deserialize, PartialEq, Eq, Serialize, Clone, Copy)]
+#[serde(deny_unknown_fields)]
+pub enum SocketType {
+    WebSocket,
+    None,
 }

-/// Derive default path to client's config file.
-/// It should get resolved to `$HOME/.nym/clients/<id>/config/config.toml`
-pub fn default_config_filepath<P: AsRef<Path>>(id: P) -> PathBuf {
-    default_config_directory(id).join(DEFAULT_CONFIG_FILENAME)
+impl SocketType {
+    pub fn from_string<S: Into<String>>(val: S) -> Self {
+        let mut upper = val.into();
+        upper.make_ascii_uppercase();
+        match upper.as_ref() {
+            "WEBSOCKET" | "WS" => SocketType::WebSocket,
+            _ => SocketType::None,
+        }
+    }
+
+    pub fn is_websocket(&self) -> bool {
+        matches!(self, SocketType::WebSocket)
+    }
 }

-/// Derive default path to client's data directory where files, such as keys, are stored.
-/// It should get resolved to `$HOME/.nym/clients/<id>/data`
-pub fn default_data_directory<P: AsRef<Path>>(id: P) -> PathBuf {
-    must_get_home()
-        .join(NYM_DIR)
-        .join(DEFAULT_CLIENTS_DIR)
-        .join(id)
-        .join(DEFAULT_DATA_DIR)
-}
-
-#[derive(Debug, Deserialize, PartialEq, Serialize)]
+#[derive(Debug, Default, Deserialize, PartialEq, Serialize)]
+#[serde(deny_unknown_fields)]
 pub struct Config {
    #[serde(flatten)]
-    pub base: BaseClientConfig,
+    base: BaseConfig<Config>,

-    pub socket: Socket,
-
-    // pub paths: CommonClientPathfinder,
-    pub storage_paths: ClientPaths,
-
-    pub logging: LoggingSettings,
+    socket: Socket,
 }

-impl NymConfigTemplate for Config {
+impl NymConfig for Config {
    fn template() -> &'static str {
-        CONFIG_TEMPLATE
+        config_template()
+    }
+
+    fn default_root_directory() -> PathBuf {
+        dirs::home_dir()
+            .expect("Failed to evaluate $HOME value")
+            .join(".nym")
+            .join("clients")
+    }
+
+    fn try_default_root_directory() -> Option<PathBuf> {
+        dirs::home_dir().map(|path| path.join(".nym").join("clients"))
+    }
+
+    fn root_directory(&self) -> PathBuf {
+        self.base.get_nym_root_directory()
+    }
+
+    fn config_directory(&self) -> PathBuf {
+        self.root_directory()
+            .join(self.base.get_id())
+            .join("config")
+    }
+
+    fn data_directory(&self) -> PathBuf {
+        self.root_directory().join(self.base.get_id()).join("data")
+    }
+}
+
+impl ClientCoreConfigTrait for Config {
+    fn get_gateway_endpoint(&self) -> &nym_client_core::config::GatewayEndpointConfig {
+        self.base.get_gateway_endpoint()
    }
 }

 impl Config {
-    pub fn new<S: AsRef<str>>(id: S) -> Self {
+    pub fn new<S: Into<String>>(id: S) -> Self {
        Config {
-            base: BaseClientConfig::new(id.as_ref(), env!("CARGO_PKG_VERSION")),
-            storage_paths: ClientPaths::new_default(default_data_directory(id.as_ref())),
-            logging: Default::default(),
+            base: BaseConfig::new(id),
            socket: Default::default(),
        }
    }

-    pub fn read_from_toml_file<P: AsRef<Path>>(path: P) -> io::Result<Self> {
-        read_config_from_toml_file(path)
-    }
-
-    pub fn read_from_default_path<P: AsRef<Path>>(id: P) -> io::Result<Self> {
-        Self::read_from_toml_file(default_config_filepath(id))
-    }
-
-    pub fn default_location(&self) -> PathBuf {
-        default_config_filepath(&self.base.client.id)
-    }
-
-    pub fn save_to_default_location(&self) -> io::Result<()> {
-        let config_save_location: PathBuf = self.default_location();
-        save_formatted_config_to_file(self, config_save_location)
-    }
-
    pub fn validate(&self) -> bool {
        // no other sections have explicit requirements (yet)
        self.base.validate()
@@ -128,10 +123,39 @@ impl Config {
        self
    }

+    // getters
+    pub fn get_config_file_save_location(&self) -> PathBuf {
+        self.config_directory().join(Self::config_file_name())
+    }
+
+    pub fn get_base(&self) -> &BaseConfig<Self> {
+        &self.base
+    }
+
+    pub fn get_base_mut(&mut self) -> &mut BaseConfig<Self> {
+        &mut self.base
+    }
+
+    pub fn get_debug_settings(&self) -> &DebugConfig {
+        self.get_base().get_debug_config()
+    }
+
+    pub fn get_socket_type(&self) -> SocketType {
+        self.socket.socket_type
+    }
+
+    pub fn get_listening_ip(&self) -> IpAddr {
+        self.socket.host
+    }
+
+    pub fn get_listening_port(&self) -> u16 {
+        self.socket.listening_port
+    }
+
    // poor man's 'builder' method
    pub fn with_base<F, T>(mut self, f: F, val: T) -> Self
    where
-        F: Fn(BaseClientConfig, T) -> BaseClientConfig,
+        F: Fn(BaseConfig<Self>, T) -> BaseConfig<Self>,
    {
        self.base = f(self.base, val);
        self
@@ -141,7 +165,7 @@ impl Config {
    // (plz, lets refactor it)
    pub fn with_optional_ext<F, T>(mut self, f: F, val: Option<T>) -> Self
    where
-        F: Fn(BaseClientConfig, T) -> BaseClientConfig,
+        F: Fn(BaseConfig<Self>, T) -> BaseConfig<Self>,
    {
        self.base = self.base.with_optional(f, val);
        self
@@ -149,7 +173,7 @@ impl Config {

    pub fn with_optional_env_ext<F, T>(mut self, f: F, val: Option<T>, env_var: &str) -> Self
    where
-        F: Fn(BaseClientConfig, T) -> BaseClientConfig,
+        F: Fn(BaseConfig<Self>, T) -> BaseConfig<Self>,
        T: FromStr,
        <T as FromStr>::Err: Debug,
    {
@@ -165,7 +189,7 @@ impl Config {
        parser: G,
    ) -> Self
    where
-        F: Fn(BaseClientConfig, T) -> BaseClientConfig,
+        F: Fn(BaseConfig<Self>, T) -> BaseConfig<Self>,
        G: Fn(&str) -> T,
    {
        self.base = self.base.with_optional_custom_env(f, val, env_var, parser);
@@ -173,34 +197,19 @@ impl Config {
    }
 }

-// define_optional_set_inner!(Config, base, BaseClientConfig);
-
-#[derive(Debug, Deserialize, PartialEq, Eq, Serialize, Clone, Copy)]
-#[serde(deny_unknown_fields)]
-pub enum SocketType {
-    WebSocket,
-    None,
-}
-
-impl SocketType {
-    pub fn is_websocket(&self) -> bool {
-        matches!(self, SocketType::WebSocket)
-    }
-}
-
 #[derive(Debug, Deserialize, PartialEq, Eq, Serialize)]
 #[serde(default, deny_unknown_fields)]
 pub struct Socket {
-    pub socket_type: SocketType,
-    pub host: IpAddr,
-    pub listening_port: u16,
+    socket_type: SocketType,
+    host: IpAddr,
+    listening_port: u16,
 }

 impl Default for Socket {
    fn default() -> Self {
        Socket {
            socket_type: SocketType::WebSocket,
-            host: IpAddr::V4(Ipv4Addr::LOCALHOST),
+            host: IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)),
            listening_port: DEFAULT_WEBSOCKET_LISTENING_PORT,
        }
    }
@@ -1,33 +1,58 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::client::config::old_config_v1_1_20::{ConfigV1_1_20, SocketV1_1_20};
+use crate::client::config::{Config, Socket};
 use nym_client_core::config::old_config_v1_1_13::OldConfigV1_1_13 as OldBaseConfigV1_1_13;
-use nym_config::legacy_helpers::nym_config::MigrationNymConfig;
+use nym_config::NymConfig;
 use serde::{Deserialize, Serialize};
 use std::path::PathBuf;

-#[derive(Debug, Deserialize, PartialEq, Serialize)]
+#[derive(Debug, Default, Deserialize, PartialEq, Serialize)]
 #[serde(deny_unknown_fields)]
 pub struct OldConfigV1_1_13 {
    #[serde(flatten)]
-    pub base: OldBaseConfigV1_1_13<OldConfigV1_1_13>,
+    base: OldBaseConfigV1_1_13<OldConfigV1_1_13>,

-    pub socket: SocketV1_1_20,
+    socket: Socket,
 }

-impl MigrationNymConfig for OldConfigV1_1_13 {
+impl NymConfig for OldConfigV1_1_13 {
+    fn template() -> &'static str {
+        // not intended to be used
+        unimplemented!()
+    }
+
    fn default_root_directory() -> PathBuf {
        dirs::home_dir()
            .expect("Failed to evaluate $HOME value")
            .join(".nym")
            .join("clients")
    }
+
+    fn try_default_root_directory() -> Option<PathBuf> {
+        dirs::home_dir().map(|path| path.join(".nym").join("clients"))
+    }
+
+    fn root_directory(&self) -> PathBuf {
+        self.base.client.nym_root_directory.clone()
+    }
+
+    fn config_directory(&self) -> PathBuf {
+        self.root_directory()
+            .join(&self.base.client.id)
+            .join("config")
+    }
+
+    fn data_directory(&self) -> PathBuf {
+        self.root_directory()
+            .join(&self.base.client.id)
+            .join("data")
+    }
 }

-impl From<OldConfigV1_1_13> for ConfigV1_1_20 {
+impl From<OldConfigV1_1_13> for Config {
    fn from(value: OldConfigV1_1_13) -> Self {
-        ConfigV1_1_20 {
+        Config {
            base: value.base.into(),
            socket: value.socket,
        }
@@ -1,115 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::client::config::old_config_v1_1_20_2::{
-    ClientPathsV1_1_20_2, ConfigV1_1_20_2, SocketTypeV1_1_20_2, SocketV1_1_20_2,
-};
-use nym_bin_common::logging::LoggingSettings;
-use nym_client_core::config::disk_persistence::keys_paths::ClientKeysPaths;
-use nym_client_core::config::disk_persistence::old_v1_1_20_2::CommonClientPathsV1_1_20_2;
-use nym_client_core::config::old_config_v1_1_20::ConfigV1_1_20 as BaseConfigV1_1_20;
-use nym_client_core::config::old_config_v1_1_20_2::{
-    ClientV1_1_20_2, ConfigV1_1_20_2 as BaseConfigV1_1_20_2,
-};
-use nym_config::defaults::DEFAULT_WEBSOCKET_LISTENING_PORT;
-use nym_config::legacy_helpers::nym_config::MigrationNymConfig;
-use serde::{Deserialize, Serialize};
-use std::fmt::Debug;
-use std::net::{IpAddr, Ipv4Addr};
-use std::path::PathBuf;
-
-#[derive(Debug, Deserialize, PartialEq, Eq, Serialize, Clone, Copy)]
-#[serde(deny_unknown_fields)]
-pub enum SocketTypeV1_1_20 {
-    WebSocket,
-    None,
-}
-
-impl From<SocketTypeV1_1_20> for SocketTypeV1_1_20_2 {
-    fn from(value: SocketTypeV1_1_20) -> Self {
-        match value {
-            SocketTypeV1_1_20::WebSocket => SocketTypeV1_1_20_2::WebSocket,
-            SocketTypeV1_1_20::None => SocketTypeV1_1_20_2::None,
-        }
-    }
-}
-
-#[derive(Debug, Deserialize, PartialEq, Serialize)]
-#[serde(deny_unknown_fields)]
-pub struct ConfigV1_1_20 {
-    #[serde(flatten)]
-    pub base: BaseConfigV1_1_20<ConfigV1_1_20>,
-
-    pub socket: SocketV1_1_20,
-}
-
-impl From<ConfigV1_1_20> for ConfigV1_1_20_2 {
-    fn from(value: ConfigV1_1_20) -> Self {
-        ConfigV1_1_20_2 {
-            base: BaseConfigV1_1_20_2 {
-                client: ClientV1_1_20_2 {
-                    version: value.base.client.version,
-                    id: value.base.client.id,
-                    disabled_credentials_mode: value.base.client.disabled_credentials_mode,
-                    nyxd_urls: value.base.client.nyxd_urls,
-                    nym_api_urls: value.base.client.nym_api_urls,
-                    gateway_endpoint: value.base.client.gateway_endpoint.into(),
-                },
-                debug: value.base.debug.into(),
-            },
-            socket: value.socket.into(),
-            storage_paths: ClientPathsV1_1_20_2 {
-                common_paths: CommonClientPathsV1_1_20_2 {
-                    keys: ClientKeysPaths {
-                        private_identity_key_file: value.base.client.private_identity_key_file,
-                        public_identity_key_file: value.base.client.public_identity_key_file,
-                        private_encryption_key_file: value.base.client.private_encryption_key_file,
-                        public_encryption_key_file: value.base.client.public_encryption_key_file,
-                        gateway_shared_key_file: value.base.client.gateway_shared_key_file,
-                        ack_key_file: value.base.client.ack_key_file,
-                    },
-                    credentials_database: value.base.client.database_path,
-                    reply_surb_database: value.base.client.reply_surb_database_path,
-                },
-            },
-            logging: LoggingSettings::default(),
-        }
-    }
-}
-
-impl MigrationNymConfig for ConfigV1_1_20 {
-    fn default_root_directory() -> PathBuf {
-        dirs::home_dir()
-            .expect("Failed to evaluate $HOME value")
-            .join(".nym")
-            .join("clients")
-    }
-}
-
-#[derive(Debug, Deserialize, PartialEq, Eq, Serialize)]
-#[serde(default, deny_unknown_fields)]
-pub struct SocketV1_1_20 {
-    socket_type: SocketTypeV1_1_20,
-    host: IpAddr,
-    listening_port: u16,
-}
-
-impl From<SocketV1_1_20> for SocketV1_1_20_2 {
-    fn from(value: SocketV1_1_20) -> Self {
-        SocketV1_1_20_2 {
-            socket_type: value.socket_type.into(),
-            host: value.host,
-            listening_port: value.listening_port,
-        }
-    }
-}
-
-impl Default for SocketV1_1_20 {
-    fn default() -> Self {
-        SocketV1_1_20 {
-            socket_type: SocketTypeV1_1_20::WebSocket,
-            host: IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)),
-            listening_port: DEFAULT_WEBSOCKET_LISTENING_PORT,
-        }
-    }
-}
@@ -1,103 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::client::config::persistence::ClientPaths;
-use crate::client::config::{default_config_filepath, Config, Socket, SocketType};
-use nym_bin_common::logging::LoggingSettings;
-use nym_client_core::config::disk_persistence::old_v1_1_20_2::CommonClientPathsV1_1_20_2;
-use nym_client_core::config::old_config_v1_1_20_2::ConfigV1_1_20_2 as BaseConfigV1_1_20_2;
-use nym_client_core::config::GatewayEndpointConfig;
-use nym_config::read_config_from_toml_file;
-use nym_network_defaults::DEFAULT_WEBSOCKET_LISTENING_PORT;
-use serde::{Deserialize, Serialize};
-use std::io;
-use std::net::{IpAddr, Ipv4Addr};
-use std::path::Path;
-
-#[derive(Debug, Deserialize, PartialEq, Eq, Serialize, Clone)]
-pub struct ClientPathsV1_1_20_2 {
-    #[serde(flatten)]
-    pub common_paths: CommonClientPathsV1_1_20_2,
-}
-
-#[derive(Debug, Deserialize, PartialEq, Serialize)]
-pub struct ConfigV1_1_20_2 {
-    #[serde(flatten)]
-    pub base: BaseConfigV1_1_20_2,
-
-    pub socket: SocketV1_1_20_2,
-
-    pub storage_paths: ClientPathsV1_1_20_2,
-
-    pub logging: LoggingSettings,
-}
-
-impl ConfigV1_1_20_2 {
-    pub fn read_from_toml_file<P: AsRef<Path>>(path: P) -> io::Result<Self> {
-        read_config_from_toml_file(path)
-    }
-
-    pub fn read_from_default_path<P: AsRef<Path>>(id: P) -> io::Result<Self> {
-        Self::read_from_toml_file(default_config_filepath(id))
-    }
-
-    // in this upgrade, gateway endpoint configuration was moved out of the config file,
-    // so its returned to be stored elsewhere.
-    pub fn upgrade(self) -> (Config, GatewayEndpointConfig) {
-        let gateway_details = self.base.client.gateway_endpoint.clone().into();
-        let config = Config {
-            base: self.base.into(),
-            socket: self.socket.into(),
-            storage_paths: ClientPaths {
-                common_paths: self.storage_paths.common_paths.upgrade_default(),
-            },
-            logging: self.logging,
-        };
-
-        (config, gateway_details)
-    }
-}
-
-#[derive(Debug, Deserialize, PartialEq, Eq, Serialize, Clone, Copy)]
-#[serde(deny_unknown_fields)]
-pub enum SocketTypeV1_1_20_2 {
-    WebSocket,
-    None,
-}
-
-impl From<SocketTypeV1_1_20_2> for SocketType {
-    fn from(value: SocketTypeV1_1_20_2) -> Self {
-        match value {
-            SocketTypeV1_1_20_2::WebSocket => SocketType::WebSocket,
-            SocketTypeV1_1_20_2::None => SocketType::None,
-        }
-    }
-}
-
-#[derive(Debug, Deserialize, PartialEq, Eq, Serialize)]
-#[serde(default, deny_unknown_fields)]
-pub struct SocketV1_1_20_2 {
-    pub socket_type: SocketTypeV1_1_20_2,
-    pub host: IpAddr,
-    pub listening_port: u16,
-}
-
-impl From<SocketV1_1_20_2> for Socket {
-    fn from(value: SocketV1_1_20_2) -> Self {
-        Socket {
-            socket_type: value.socket_type.into(),
-            host: value.host,
-            listening_port: value.listening_port,
-        }
-    }
-}
-
-impl Default for SocketV1_1_20_2 {
-    fn default() -> Self {
-        SocketV1_1_20_2 {
-            socket_type: SocketTypeV1_1_20_2::WebSocket,
-            host: IpAddr::V4(Ipv4Addr::LOCALHOST),
-            listening_port: DEFAULT_WEBSOCKET_LISTENING_PORT,
-        }
-    }
-}
@@ -1,20 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use nym_client_core::config::disk_persistence::CommonClientPaths;
-use serde::{Deserialize, Serialize};
-use std::path::Path;
-
-#[derive(Debug, Deserialize, PartialEq, Eq, Serialize, Clone)]
-pub struct ClientPaths {
-    #[serde(flatten)]
-    pub common_paths: CommonClientPaths,
-}
-
-impl ClientPaths {
-    pub fn new_default<P: AsRef<Path>>(base_data_directory: P) -> Self {
-        ClientPaths {
-            common_paths: CommonClientPaths::new_default(base_data_directory),
-        }
-    }
-}
@@ -1,11 +1,12 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-// While using normal toml marshalling would have been way simpler with less overhead,
-// I think it's useful to have comments attached to the saved config file to explain behaviour of
-// particular fields.
-// Note: any changes to the template must be reflected in the appropriate structs.
-pub(crate) const CONFIG_TEMPLATE: &str = r#"
+pub(crate) fn config_template() -> &'static str {
+    // While using normal toml marshalling would have been way simpler with less overhead,
+    // I think it's useful to have comments attached to the saved config file to explain behaviour of
+    // particular fields.
+    // Note: any changes to the template must be reflected in the appropriate structs.
+    r#"
 # This is a TOML config file.
 # For more information, see https://github.com/toml-lang/toml

@@ -36,37 +37,50 @@ nym_api_urls = [
    {{/each}}
 ]

-[storage_paths] 
-
 # Path to file containing private identity key.
-keys.private_identity_key_file = '{{ storage_paths.keys.private_identity_key_file }}'
+private_identity_key_file = '{{ client.private_identity_key_file }}'

 # Path to file containing public identity key.
-keys.public_identity_key_file = '{{ storage_paths.keys.public_identity_key_file }}'
+public_identity_key_file = '{{ client.public_identity_key_file }}'

 # Path to file containing private encryption key.
-keys.private_encryption_key_file = '{{ storage_paths.keys.private_encryption_key_file }}'
+private_encryption_key_file = '{{ client.private_encryption_key_file }}'

 # Path to file containing public encryption key.
-keys.public_encryption_key_file = '{{ storage_paths.keys.public_encryption_key_file }}'
+public_encryption_key_file = '{{ client.public_encryption_key_file }}'
+
+# Path to the database containing bandwidth credentials
+database_path = '{{ client.database_path }}'
+
+# Path to the persistent store for received reply surbs, unused encryption keys and used sender tags.
+reply_surb_database_path = '{{ client.reply_surb_database_path }}'
+
+##### additional client config options #####

 # A gateway specific, optional, base58 stringified shared key used for
 # communication with particular gateway.
-keys.gateway_shared_key_file = '{{ storage_paths.keys.gateway_shared_key_file }}'
+gateway_shared_key_file = '{{ client.gateway_shared_key_file }}'

 # Path to file containing key used for encrypting and decrypting the content of an
 # acknowledgement so that nobody besides the client knows which packet it refers to.
-keys.ack_key_file = '{{ storage_paths.keys.ack_key_file }}'
+ack_key_file = '{{ client.ack_key_file }}'
+    
+##### advanced configuration options #####

-# Path to the database containing bandwidth credentials
-credentials_database = '{{ storage_paths.credentials_database }}'
+# Absolute path to the home Nym Clients directory.
+nym_root_directory = '{{ client.nym_root_directory }}'
+
+[client.gateway_endpoint]
+# ID of the gateway from which the client should be fetching messages.
+gateway_id = '{{ client.gateway_endpoint.gateway_id }}'
+
+# Address of the gateway owner to which the client should send messages.
+gateway_owner = '{{ client.gateway_endpoint.gateway_owner }}'
+
+# Address of the gateway listener to which all client requests should be sent.
+gateway_listener = '{{ client.gateway_endpoint.gateway_listener }}'

-# Path to the persistent store for received reply surbs, unused encryption keys and used sender tags.
-reply_surb_database = '{{ storage_paths.reply_surb_database }}'

-# Path to the file containing information about gateway used by this client,
-# i.e. details such as its public key, owner address or the network information.
-gateway_details = '{{ storage_paths.gateway_details }}'

 ##### socket config options #####

@@ -106,5 +120,5 @@ average_ack_delay = '{{ debug.acknowledgements.average_ack_delay }}'
 [debug.cover_traffic]
 loop_cover_traffic_average_delay = '{{ debug.cover_traffic.loop_cover_traffic_average_delay }}'

-
-"#;
+"#
+}
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

 use crate::client::config::Config;
@@ -6,40 +6,85 @@ use crate::error::ClientError;
 use crate::websocket;
 use futures::channel::mpsc;
 use log::*;
-use nym_client_core::client::base_client::non_wasm_helpers::default_query_dkg_client_from_config;
-use nym_client_core::client::base_client::storage::OnDiskPersistent;
+use nym_bandwidth_controller::BandwidthController;
 use nym_client_core::client::base_client::{
-    BaseClientBuilder, ClientInput, ClientOutput, ClientState,
+    non_wasm_helpers, BaseClientBuilder, ClientInput, ClientOutput, ClientState,
 };
 use nym_client_core::client::inbound_messages::InputMessage;
 use nym_client_core::client::received_buffer::{
    ReceivedBufferMessage, ReceivedBufferRequestSender, ReconstructedMessagesReceiver,
 };
+use nym_client_core::config::persistence::key_pathfinder::ClientKeyPathfinder;
 use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag;
-use nym_sphinx::params::PacketType;
 use nym_task::connections::TransmissionLane;
 use nym_task::TaskManager;
 use nym_validator_client::nyxd::QueryNyxdClient;
-use nym_validator_client::Client;
 use std::error::Error;
 use tokio::sync::watch::error::SendError;

+pub use nym_client_core::client::key_manager::KeyManager;
+use nym_credential_storage::persistent_storage::PersistentStorage;
 pub use nym_sphinx::addressing::clients::Recipient;
 pub use nym_sphinx::receiver::ReconstructedMessage;
+use nym_validator_client::Client;

 pub mod config;

-type NativeClientBuilder<'a> = BaseClientBuilder<'a, Client<QueryNyxdClient>, OnDiskPersistent>;
-
 pub struct SocketClient {
    /// Client configuration options, including, among other things, packet sending rates,
    /// key filepaths, etc.
    config: Config,
+
+    /// KeyManager object containing smart pointers to all relevant keys used by the client.
+    key_manager: KeyManager,
 }

 impl SocketClient {
    pub fn new(config: Config) -> Self {
-        SocketClient { config }
+        let pathfinder = ClientKeyPathfinder::new_from_config(config.get_base());
+        let key_manager = KeyManager::load_keys(&pathfinder).expect("failed to load stored keys");
+
+        SocketClient {
+            config,
+            key_manager,
+        }
+    }
+
+    pub fn new_with_keys(config: Config, key_manager: KeyManager) -> Self {
+        SocketClient {
+            config,
+            key_manager,
+        }
+    }
+
+    async fn create_bandwidth_controller(
+        config: &Config,
+    ) -> BandwidthController<Client<QueryNyxdClient>, PersistentStorage> {
+        let details = nym_network_defaults::NymNetworkDetails::new_from_env();
+        let mut client_config =
+            nym_validator_client::Config::try_from_nym_network_details(&details)
+                .expect("failed to construct validator client config");
+        let nyxd_url = config
+            .get_base()
+            .get_validator_endpoints()
+            .pop()
+            .expect("No nyxd validator endpoint provided");
+        let api_url = config
+            .get_base()
+            .get_nym_api_endpoints()
+            .pop()
+            .expect("No validator api endpoint provided");
+        // overwrite env configuration with config URLs
+        client_config = client_config.with_urls(nyxd_url, api_url);
+        let client = nym_validator_client::Client::new_query(client_config)
+            .expect("Could not construct query client");
+        BandwidthController::new(
+            nym_credential_storage::initialise_persistent_storage(
+                config.get_base().get_database_path(),
+            )
+            .await,
+            client,
+        )
    }

    fn start_websocket_listener(
@@ -49,7 +94,6 @@ impl SocketClient {
        client_state: ClientState,
        self_address: &Recipient,
        shutdown: nym_task::TaskClient,
-        packet_type: PacketType,
    ) {
        info!("Starting websocket listener...");

@@ -75,10 +119,9 @@ impl SocketClient {
            self_address,
            shared_lane_queue_lengths,
            reply_controller_sender,
-            Some(packet_type),
        );

-        websocket::Listener::new(config.socket.host, config.socket.listening_port)
+        websocket::Listener::new(config.get_listening_ip(), config.get_listening_port())
            .start(websocket_handler, shutdown);
    }

@@ -91,39 +134,31 @@ impl SocketClient {
        res
    }

-    async fn initialise_storage(&self) -> Result<OnDiskPersistent, ClientError> {
-        Ok(OnDiskPersistent::from_paths(
-            self.config.storage_paths.common_paths.clone(),
-            &self.config.base.debug,
-        )
-        .await?)
-    }
-
-    // TODO: see if this could also be shared with socks5 client / nym-sdk maybe
-    async fn create_base_client_builder(&self) -> Result<NativeClientBuilder, ClientError> {
-        // don't create dkg client for the bandwidth controller if credentials are disabled
-        let dkg_query_client = if self.config.base.client.disabled_credentials_mode {
-            None
-        } else {
-            Some(default_query_dkg_client_from_config(&self.config.base))
-        };
-
-        let storage = self.initialise_storage().await?;
-
-        let base_client = BaseClientBuilder::new(&self.config.base, storage, dkg_query_client);
-
-        Ok(base_client)
-    }
-
    pub async fn start_socket(self) -> Result<TaskManager, ClientError> {
-        if !self.config.socket.socket_type.is_websocket() {
+        if !self.config.get_socket_type().is_websocket() {
            return Err(ClientError::InvalidSocketMode);
        }

-        let base_builder = self.create_base_client_builder().await?;
-        let packet_type = self.config.base.debug.traffic.packet_type;
+        // don't create bandwidth controller if credentials are disabled
+        let bandwidth_controller = if self.config.get_base().get_disabled_credentials_mode() {
+            None
+        } else {
+            Some(Self::create_bandwidth_controller(&self.config).await)
+        };
+
+        let base_builder = BaseClientBuilder::new_from_base_config(
+            self.config.get_base(),
+            self.key_manager,
+            bandwidth_controller,
+            non_wasm_helpers::setup_fs_reply_surb_backend(
+                Some(self.config.get_base().get_reply_surb_database_path()),
+                self.config.get_debug_settings(),
+            )
+            .await?,
+        );
+
+        let self_address = base_builder.as_mix_recipient();
        let mut started_client = base_builder.start_base().await?;
-        let self_address = started_client.address;
        let client_input = started_client.client_input.register_producer();
        let client_output = started_client.client_output.register_consumer();
        let client_state = started_client.client_state;
@@ -135,24 +170,40 @@ impl SocketClient {
            client_state,
            &self_address,
            started_client.task_manager.subscribe(),
-            packet_type,
        );

        info!("Client startup finished!");
-        info!("The address of this client is: {self_address}");
+        info!("The address of this client is: {}", self_address);

        Ok(started_client.task_manager)
    }

    pub async fn start_direct(self) -> Result<DirectClient, ClientError> {
-        if self.config.socket.socket_type.is_websocket() {
+        if self.config.get_socket_type().is_websocket() {
            return Err(ClientError::InvalidSocketMode);
        }

-        let base_builder = self.create_base_client_builder().await?;
-        let packet_type = self.config.base.debug.traffic.packet_type;
-        let mut started_client = base_builder.start_base().await?;
-        let address = started_client.address;
+        // don't create bandwidth controller if credentials are disabled
+        let bandwidth_controller = if self.config.get_base().get_disabled_credentials_mode() {
+            None
+        } else {
+            Some(Self::create_bandwidth_controller(&self.config).await)
+        };
+
+        let base_client = BaseClientBuilder::new_from_base_config(
+            self.config.get_base(),
+            self.key_manager,
+            bandwidth_controller,
+            non_wasm_helpers::setup_fs_reply_surb_backend(
+                Some(self.config.get_base().get_reply_surb_database_path()),
+                self.config.get_debug_settings(),
+            )
+            .await?,
+        );
+
+        let address = base_client.as_mix_recipient();
+
+        let mut started_client = base_client.start_base().await?;
        let client_input = started_client.client_input.register_producer();
        let client_output = started_client.client_output.register_consumer();

@@ -173,7 +224,6 @@ impl SocketClient {
            reconstructed_receiver,
            address,
            shutdown_notifier: started_client.task_manager,
-            packet_type,
        })
    }
 }
@@ -187,7 +237,6 @@ pub struct DirectClient {

    // we need to keep reference to this guy otherwise things will start dropping
    shutdown_notifier: TaskManager,
-    packet_type: PacketType,
 }

 impl DirectClient {
@@ -208,7 +257,7 @@ impl DirectClient {
    /// well enough in local tests)
    pub async fn send_regular_message(&mut self, recipient: Recipient, message: Vec<u8>) {
        let lane = TransmissionLane::General;
-        let input_msg = InputMessage::new_regular(recipient, message, lane, Some(self.packet_type));
+        let input_msg = InputMessage::new_regular(recipient, message, lane);

        self.client_input
            .input_sender
@@ -227,13 +276,7 @@ impl DirectClient {
        reply_surbs: u32,
    ) {
        let lane = TransmissionLane::General;
-        let input_msg = InputMessage::new_anonymous(
-            recipient,
-            message,
-            reply_surbs,
-            lane,
-            Some(self.packet_type),
-        );
+        let input_msg = InputMessage::new_anonymous(recipient, message, reply_surbs, lane);

        self.client_input
            .input_sender
@@ -247,8 +290,7 @@ impl DirectClient {
    /// well enough in local tests)
    pub async fn send_reply(&mut self, recipient_tag: AnonymousSenderTag, message: Vec<u8>) {
        let lane = TransmissionLane::General;
-        let input_msg =
-            InputMessage::new_reply(recipient_tag, message, lane, Some(self.packet_type));
+        let input_msg = InputMessage::new_reply(recipient_tag, message, lane);

        self.client_input
            .input_sender
@@ -1,10 +1,7 @@
-// Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::client::config::{
-    default_config_directory, default_config_filepath, default_data_directory,
-};
-use crate::commands::try_upgrade_config;
+use crate::commands::try_upgrade_v1_1_13_config;
 use crate::{
    client::config::Config,
    commands::{override_config, OverrideConfig},
@@ -12,16 +9,13 @@ use crate::{
 };
 use clap::Args;
 use nym_bin_common::output_format::OutputFormat;
-use nym_client_core::client::base_client::storage::gateway_details::OnDiskGatewayDetails;
-use nym_client_core::client::key_manager::persistence::OnDiskKeys;
-use nym_client_core::config::GatewayEndpointConfig;
-use nym_client_core::init::GatewaySetup;
+use nym_config::NymConfig;
+use nym_credential_storage::persistent_storage::PersistentStorage;
 use nym_crypto::asymmetric::identity;
 use nym_sphinx::addressing::clients::Recipient;
 use serde::Serialize;
 use std::fmt::Display;
 use std::net::IpAddr;
-use std::{fs, io};
 use tap::TapFallible;

 #[derive(Args, Clone)]
@@ -103,15 +97,15 @@ impl From<Init> for OverrideConfig {
 pub struct InitResults {
    #[serde(flatten)]
    client_core: nym_client_core::init::InitResults,
-    client_listening_port: u16,
+    client_listening_port: String,
    client_address: String,
 }

 impl InitResults {
-    fn new(config: &Config, address: &Recipient, gateway: &GatewayEndpointConfig) -> Self {
+    fn new(config: &Config, address: &Recipient) -> Self {
        Self {
-            client_core: nym_client_core::init::InitResults::new(&config.base, address, gateway),
-            client_listening_port: config.socket.listening_port,
+            client_core: nym_client_core::init::InitResults::new(config.get_base(), address),
+            client_listening_port: config.get_listening_port().to_string(),
            client_address: address.to_string(),
        }
    }
@@ -125,26 +119,18 @@ impl Display for InitResults {
    }
 }

-fn init_paths(id: &str) -> io::Result<()> {
-    fs::create_dir_all(default_data_directory(id))?;
-    fs::create_dir_all(default_config_directory(id))
-}
-
 pub(crate) async fn execute(args: &Init) -> Result<(), ClientError> {
    eprintln!("Initialising client...");

    let id = &args.id;

-    let already_init = if default_config_filepath(id).exists() {
+    let already_init = Config::default_config_file_path(id).exists();
+    if already_init {
        // in case we're using old config, try to upgrade it
        // (if we're using the current version, it's a no-op)
-        try_upgrade_config(id)?;
+        try_upgrade_v1_1_13_config(id)?;
        eprintln!("Client \"{id}\" was already initialised before");
-        true
-    } else {
-        init_paths(id)?;
-        false
-    };
+    }

    // Usually you only register with the gateway on the first init, however you can force
    // re-registering if wanted.
@@ -160,44 +146,45 @@ pub(crate) async fn execute(args: &Init) -> Result<(), ClientError> {

    // Attempt to use a user-provided gateway, if possible
    let user_chosen_gateway_id = args.gateway;
-    let gateway_setup = GatewaySetup::new_fresh(
-        user_chosen_gateway_id.map(|id| id.to_base58_string()),
-        Some(args.latency_based_selection),
-    );

    // Load and potentially override config
-    let config = override_config(Config::new(id), OverrideConfig::from(args.clone()));
+    let mut config = override_config(Config::new(id), OverrideConfig::from(args.clone()));

    // Setup gateway by either registering a new one, or creating a new config from the selected
    // one but with keys kept, or reusing the gateway configuration.
-    let key_store = OnDiskKeys::new(config.storage_paths.common_paths.keys.clone());
-    let details_store =
-        OnDiskGatewayDetails::new(&config.storage_paths.common_paths.gateway_details);
-    let init_details = nym_client_core::init::setup_gateway(
-        &gateway_setup,
-        &key_store,
-        &details_store,
+    let gateway = nym_client_core::init::setup_gateway_from_config::<Config, _, PersistentStorage>(
        register_gateway,
-        Some(&config.base.client.nym_api_urls),
+        user_chosen_gateway_id,
+        config.get_base(),
+        args.latency_based_selection,
    )
    .await
    .tap_err(|err| eprintln!("Failed to setup gateway\nError: {err}"))?;

-    let config_save_location = config.default_location();
-    config.save_to_default_location().tap_err(|_| {
+    config.get_base_mut().set_gateway_endpoint(gateway);
+
+    config.save_to_file(None).tap_err(|_| {
        log::error!("Failed to save the config file");
    })?;
-    eprintln!(
-        "Saved configuration file to {}",
-        config_save_location.display()
-    );

-    let address = init_details.client_address()?;
+    print_saved_config(&config);

-    eprintln!("Client configuration completed.\n");
-
-    let init_results = InitResults::new(&config, &address, &init_details.gateway_details);
+    let address = nym_client_core::init::get_client_address_from_stored_keys(config.get_base())?;
+    let init_results = InitResults::new(&config, &address);
    println!("{}", args.output.format(&init_results));

    Ok(())
 }
+
+fn print_saved_config(config: &Config) {
+    let config_save_location = config.get_config_file_save_location();
+    eprintln!("Saved configuration file to {config_save_location:?}");
+    eprintln!("Using gateway: {}", config.get_base().get_gateway_id());
+    log::debug!("Gateway id: {}", config.get_base().get_gateway_id());
+    log::debug!("Gateway owner: {}", config.get_base().get_gateway_owner());
+    log::debug!(
+        "Gateway listener: {}",
+        config.get_base().get_gateway_listener()
+    );
+    eprintln!("Client configuration completed.\n");
+}
@@ -2,23 +2,14 @@
 // SPDX-License-Identifier: Apache-2.0

 use crate::client::config::old_config_v1_1_13::OldConfigV1_1_13;
-use crate::client::config::old_config_v1_1_20::ConfigV1_1_20;
-use crate::client::config::old_config_v1_1_20_2::ConfigV1_1_20_2;
-use crate::client::config::{BaseClientConfig, Config};
-use crate::error::ClientError;
+use crate::client::config::{BaseConfig, Config};
 use clap::CommandFactory;
 use clap::{Parser, Subcommand};
 use lazy_static::lazy_static;
-use log::{error, info};
+use log::info;
 use nym_bin_common::build_information::BinaryBuildInformation;
 use nym_bin_common::completions::{fig_generate, ArgShell};
-use nym_client_core::client::base_client::storage::gateway_details::{
-    OnDiskGatewayDetails, PersistedGatewayDetails,
-};
-use nym_client_core::client::key_manager::persistence::OnDiskKeys;
-use nym_client_core::config::GatewayEndpointConfig;
-use nym_client_core::error::ClientCoreError;
-use nym_config::OptionalSet;
+use nym_config::{NymConfig, OptionalSet};
 use std::error::Error;
 use std::net::IpAddr;

@@ -91,151 +82,40 @@ pub(crate) async fn execute(args: &Cli) -> Result<(), Box<dyn Error + Send + Syn
 pub(crate) fn override_config(config: Config, args: OverrideConfig) -> Config {
    config
        .with_optional(Config::with_disabled_socket, args.disable_socket)
-        .with_base(
-            BaseClientConfig::with_high_default_traffic_volume,
-            args.fastmode,
-        )
-        .with_base(BaseClientConfig::with_disabled_cover_traffic, args.no_cover)
+        .with_base(BaseConfig::with_high_default_traffic_volume, args.fastmode)
+        .with_base(BaseConfig::with_disabled_cover_traffic, args.no_cover)
        .with_optional(Config::with_port, args.port)
        .with_optional(Config::with_host, args.host)
        .with_optional_custom_env_ext(
-            BaseClientConfig::with_custom_nym_apis,
+            BaseConfig::with_custom_nym_apis,
            args.nym_apis,
            nym_network_defaults::var_names::NYM_API,
            nym_config::parse_urls,
        )
        .with_optional_custom_env_ext(
-            BaseClientConfig::with_custom_nyxd,
+            BaseConfig::with_custom_nyxd,
            args.nyxd_urls,
            nym_network_defaults::var_names::NYXD,
            nym_config::parse_urls,
        )
        .with_optional_ext(
-            BaseClientConfig::with_disabled_credentials,
+            BaseConfig::with_disabled_credentials,
            args.enabled_credentials_mode.map(|b| !b),
        )
 }

-fn persist_gateway_details(
-    config: &Config,
-    details: GatewayEndpointConfig,
-) -> Result<(), ClientError> {
-    let details_store =
-        OnDiskGatewayDetails::new(&config.storage_paths.common_paths.gateway_details);
-    let keys_store = OnDiskKeys::new(config.storage_paths.common_paths.keys.clone());
-    let shared_keys = keys_store.ephemeral_load_gateway_keys().map_err(|source| {
-        ClientError::ClientCoreError(ClientCoreError::KeyStoreError {
-            source: Box::new(source),
-        })
-    })?;
-    let persisted_details = PersistedGatewayDetails::new(details, &shared_keys);
-    details_store
-        .store_to_disk(&persisted_details)
-        .map_err(|source| {
-            ClientError::ClientCoreError(ClientCoreError::GatewayDetailsStoreError {
-                source: Box::new(source),
-            })
-        })
-}
-
-fn try_upgrade_v1_1_13_config(id: &str) -> Result<bool, ClientError> {
-    use nym_config::legacy_helpers::nym_config::MigrationNymConfig;
-
-    // explicitly load it as v1.1.13 (which is incompatible with the next step, i.e. 1.1.19)
+fn try_upgrade_v1_1_13_config(id: &str) -> std::io::Result<()> {
+    // explicitly load it as v1.1.13 (which is incompatible with the current, i.e. 1.1.14+)
    let Ok(old_config) = OldConfigV1_1_13::load_from_file(id) else {
        // if we failed to load it, there might have been nothing to upgrade
        // or maybe it was an even older file. in either way. just ignore it and carry on with our day
-        return Ok(false);
+        return Ok(());
    };
    info!("It seems the client is using <= v1.1.13 config template.");
    info!("It is going to get updated to the current specification.");

-    let updated_step1: ConfigV1_1_20 = old_config.into();
-    let updated_step2: ConfigV1_1_20_2 = updated_step1.into();
-    let (updated, gateway_config) = updated_step2.upgrade();
-    persist_gateway_details(&updated, gateway_config)?;
-
-    updated.save_to_default_location()?;
-    Ok(true)
-}
-
-fn try_upgrade_v1_1_20_config(id: &str) -> Result<bool, ClientError> {
-    use nym_config::legacy_helpers::nym_config::MigrationNymConfig;
-
-    // explicitly load it as v1.1.20 (which is incompatible with the current one, i.e. +1.1.21)
-    let Ok(old_config) = ConfigV1_1_20::load_from_file(id) else {
-        // if we failed to load it, there might have been nothing to upgrade
-        // or maybe it was an even older file. in either way. just ignore it and carry on with our day
-        return Ok(false);
-    };
-    info!("It seems the client is using <= v1.1.20 config template.");
-    info!("It is going to get updated to the current specification.");
-
-    let updated_step1: ConfigV1_1_20_2 = old_config.into();
-    let (updated, gateway_config) = updated_step1.upgrade();
-    persist_gateway_details(&updated, gateway_config)?;
-
-    updated.save_to_default_location()?;
-    Ok(true)
-}
-
-fn try_upgrade_v1_1_20_2_config(id: &str) -> Result<bool, ClientError> {
-    // explicitly load it as v1.1.20_2 (which is incompatible with the current one, i.e. +1.1.21)
-    let Ok(old_config) = ConfigV1_1_20_2::read_from_default_path(id) else {
-        // if we failed to load it, there might have been nothing to upgrade
-        // or maybe it was an even older file. in either way. just ignore it and carry on with our day
-        return Ok(false);
-    };
-    info!("It seems the client is using <= v1.1.20_2 config template.");
-    info!("It is going to get updated to the current specification.");
-
-    let (updated, gateway_config) = old_config.upgrade();
-    persist_gateway_details(&updated, gateway_config)?;
-
-    updated.save_to_default_location()?;
-    Ok(true)
-}
-
-fn try_upgrade_config(id: &str) -> Result<(), ClientError> {
-    if try_upgrade_v1_1_13_config(id)? {
-        return Ok(());
-    }
-    if try_upgrade_v1_1_20_config(id)? {
-        return Ok(());
-    }
-    if try_upgrade_v1_1_20_2_config(id)? {
-        return Ok(());
-    }
-
-    Ok(())
-}
-
-fn try_load_current_config(id: &str) -> Result<Config, ClientError> {
-    // try to load the config as is
-    if let Ok(cfg) = Config::read_from_default_path(id) {
-        return if !cfg.validate() {
-            Err(ClientError::ConfigValidationFailure)
-        } else {
-            Ok(cfg)
-        };
-    }
-
-    // we couldn't load it - try upgrading it from older revisions
-    try_upgrade_config(id)?;
-
-    let config = match Config::read_from_default_path(id) {
-        Ok(cfg) => cfg,
-        Err(err) => {
-            error!("Failed to load config for {id}. Are you sure you have run `init` before? (Error was: {err})");
-            return Err(ClientError::FailedToLoadConfig(id.to_string()));
-        }
-    };
-
-    if !config.validate() {
-        return Err(ClientError::ConfigValidationFailure);
-    }
-
-    Ok(config)
+    let updated: Config = old_config.into();
+    updated.save_to_file(None)
 }

 #[cfg(test)]
@@ -1,7 +1,10 @@
 // Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::commands::try_load_current_config;
+use std::error::Error;
+use std::net::IpAddr;
+
+use crate::commands::try_upgrade_v1_1_13_config;
 use crate::{
    client::{config::Config, SocketClient},
    commands::{override_config, OverrideConfig},
@@ -10,9 +13,8 @@ use crate::{
 use clap::Args;
 use log::*;
 use nym_bin_common::version_checker::is_minor_version_compatible;
+use nym_config::NymConfig;
 use nym_crypto::asymmetric::identity;
-use std::error::Error;
-use std::net::IpAddr;

 #[derive(Args, Clone)]
 pub(crate) struct Run {
@@ -80,7 +82,7 @@ impl From<Run> for OverrideConfig {
 // network version. It might do so in the future.
 fn version_check(cfg: &Config) -> bool {
    let binary_version = env!("CARGO_PKG_VERSION");
-    let config_version = &cfg.base.client.version;
+    let config_version = cfg.get_base().get_version();
    if binary_version == config_version {
        true
    } else {
@@ -96,10 +98,30 @@ fn version_check(cfg: &Config) -> bool {
 }

 pub(crate) async fn execute(args: &Run) -> Result<(), Box<dyn Error + Send + Sync>> {
-    eprintln!("Starting client {}...", args.id);
+    let id = &args.id;

-    let mut config = try_load_current_config(&args.id)?;
-    config = override_config(config, OverrideConfig::from(args.clone()));
+    // in case we're using old config, try to upgrade it
+    // (if we're using the current version, it's a no-op)
+    try_upgrade_v1_1_13_config(id)?;
+
+    let mut config = match Config::load_from_file(id) {
+        Ok(cfg) => cfg,
+        Err(err) => {
+            error!("Failed to load config for {}. Are you sure you have run `init` before? (Error was: {err})", id);
+            return Err(Box::new(ClientError::FailedToLoadConfig(id.to_string())));
+        }
+    };
+
+    if !config.validate() {
+        return Err(Box::new(ClientError::ConfigValidationFailure));
+    }
+
+    let override_config_fields = OverrideConfig::from(args.clone());
+    config = override_config(config, override_config_fields);
+
+    if config.get_base_mut().set_empty_fields_to_defaults() {
+        warn!("some of the core config options were left unset. the default values are going to get used instead.");
+    }

    if !version_check(&config) {
        error!("failed the local version check");
@@ -1,14 +1,42 @@
-// Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::client::config::Config;
-use crate::commands::try_load_current_config;
-use clap::Args;
+use crate::client::config::{Config, MISSING_VALUE};
+
 use nym_bin_common::version_checker::Version;
+use nym_config::NymConfig;
+
+use clap::Args;
+use std::fmt::Display;
 use std::process;

-fn unimplemented_upgrade(current_version: &Version, config_version: &Version) -> ! {
-    eprintln!("Cannot perform upgrade from {config_version} to {current_version} as it hasn't been implemented yet");
+#[allow(dead_code)]
+fn fail_upgrade<D1: Display, D2: Display>(from_version: D1, to_version: D2) -> ! {
+    print_failed_upgrade(from_version, to_version);
+    process::exit(1)
+}
+
+fn print_start_upgrade<D1: Display, D2: Display>(from: D1, to: D2) {
+    println!("\n==================\nTrying to upgrade client from {from} to {to} ...");
+}
+
+fn print_failed_upgrade<D1: Display, D2: Display>(from: D1, to: D2) {
+    eprintln!("Upgrade from {from} to {to} failed!\n==================\n");
+}
+
+fn print_successful_upgrade<D1: Display, D2: Display>(from: D1, to: D2) {
+    println!("Upgrade from {from} to {to} was successful!\n==================\n");
+}
+
+fn outdated_upgrade(config_version: &Version, package_version: &Version) -> ! {
+    eprintln!(
+        "Cannot perform upgrade from {config_version} to {package_version}. Your version is too old to perform the upgrade.!"
+    );
+    process::exit(1)
+}
+
+fn unsupported_upgrade(current_version: &Version, config_version: &Version) -> ! {
+    eprintln!("Cannot perform upgrade from {config_version} to {current_version}. Please let the developers know about this issue if you expected it to work!");
    process::exit(1)
 }

@@ -20,7 +48,7 @@ pub(crate) struct Upgrade {
 }

 fn parse_config_version(config: &Config) -> Version {
-    let version = Version::parse(&config.base.client.version).unwrap_or_else(|err| {
+    let version = Version::parse(config.get_base().get_version()).unwrap_or_else(|err| {
        eprintln!("failed to parse client version! - {err}");
        process::exit(1)
    });
@@ -49,14 +77,53 @@ fn parse_package_version() -> Version {
    version
 }

-fn do_upgrade(config: Config, _args: &Upgrade, package_version: &Version) {
-    let config_version = parse_config_version(&config);
-    if &config_version == package_version {
-        println!("You're using the most recent version!");
-        return;
-    }
+fn minor_0_12_upgrade(
+    mut config: Config,
+    _matches: &Upgrade,
+    config_version: &Version,
+    package_version: &Version,
+) -> Config {
+    let to_version = if package_version.major == 0 && package_version.minor == 12 {
+        package_version.clone()
+    } else {
+        Version::new(0, 12, 0)
+    };

-    unimplemented_upgrade(package_version, &config_version)
+    print_start_upgrade(config_version, &to_version);
+
+    config
+        .get_base_mut()
+        .set_custom_version(to_version.to_string().as_ref());
+
+    config.save_to_file(None).unwrap_or_else(|err| {
+        eprintln!("failed to overwrite config file! - {err}");
+        print_failed_upgrade(config_version, &to_version);
+        process::exit(1);
+    });
+
+    print_successful_upgrade(config_version, to_version);
+
+    config
+}
+
+fn do_upgrade(mut config: Config, args: &Upgrade, package_version: &Version) {
+    loop {
+        let config_version = parse_config_version(&config);
+
+        if &config_version == package_version {
+            println!("You're using the most recent version!");
+            return;
+        }
+
+        config = match config_version.major {
+            0 => match config_version.minor {
+                9 | 10 => outdated_upgrade(&config_version, package_version),
+                11 => minor_0_12_upgrade(config, args, &config_version, package_version),
+                _ => unsupported_upgrade(&config_version, package_version),
+            },
+            _ => unsupported_upgrade(&config_version, package_version),
+        }
+    }
 }

 pub(crate) fn execute(args: &Upgrade) {
@@ -64,15 +131,16 @@ pub(crate) fn execute(args: &Upgrade) {

    let id = &args.id;

-    let existing_config = try_load_current_config(id).unwrap_or_else(|err| {
+    let existing_config = Config::load_from_file(id).unwrap_or_else(|err| {
        eprintln!("failed to load existing config file! - {err}");
        process::exit(1)
    });

-    if existing_config.base.client.version.is_empty() {
+    if existing_config.get_base().get_version() == MISSING_VALUE {
        eprintln!("the existing configuration file does not seem to contain version number.");
        process::exit(1);
    }

+    // here be upgrade path to 0.9.X and beyond based on version number from config
    do_upgrade(existing_config, args, &package_version)
 }
@@ -14,7 +14,6 @@ use nym_client_core::client::{
 use nym_client_websocket_requests::{requests::ClientRequest, responses::ServerResponse};
 use nym_sphinx::addressing::clients::Recipient;
 use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag;
-use nym_sphinx::params::PacketType;
 use nym_sphinx::receiver::ReconstructedMessage;
 use nym_task::connections::{
    ConnectionCommand, ConnectionCommandSender, ConnectionId, LaneQueueLengths, TransmissionLane,
@@ -42,7 +41,6 @@ pub(crate) struct HandlerBuilder {
    self_full_address: Recipient,
    lane_queue_lengths: LaneQueueLengths,
    reply_controller_sender: ReplyControllerSender,
-    packet_type: Option<PacketType>,
 }

 impl HandlerBuilder {
@@ -53,7 +51,6 @@ impl HandlerBuilder {
        self_full_address: &Recipient,
        lane_queue_lengths: LaneQueueLengths,
        reply_controller_sender: ReplyControllerSender,
-        packet_type: Option<PacketType>,
    ) -> Self {
        Self {
            msg_input,
@@ -62,7 +59,6 @@ impl HandlerBuilder {
            self_full_address: *self_full_address,
            lane_queue_lengths,
            reply_controller_sender,
-            packet_type,
        }
    }

@@ -77,7 +73,6 @@ impl HandlerBuilder {
            received_response_type: Default::default(),
            lane_queue_lengths: self.lane_queue_lengths.clone(),
            reply_controller_sender: self.reply_controller_sender.clone(),
-            packet_type: self.packet_type,
        }
    }
 }
@@ -91,7 +86,6 @@ pub(crate) struct Handler {
    received_response_type: ReceivedResponseType,
    lane_queue_lengths: LaneQueueLengths,
    reply_controller_sender: ReplyControllerSender,
-    packet_type: Option<PacketType>,
 }

 impl Drop for Handler {
@@ -166,7 +160,7 @@ impl Handler {
        });

        // the ack control is now responsible for chunking, etc.
-        let input_msg = InputMessage::new_regular(recipient, message, lane, self.packet_type);
+        let input_msg = InputMessage::new_regular(recipient, message, lane);
        self.msg_input
            .send(input_msg)
            .await
@@ -197,8 +191,7 @@ impl Handler {
            TransmissionLane::ConnectionId(id)
        });

-        let input_msg =
-            InputMessage::new_anonymous(recipient, message, reply_surbs, lane, self.packet_type);
+        let input_msg = InputMessage::new_anonymous(recipient, message, reply_surbs, lane);
        self.msg_input
            .send(input_msg)
            .await
@@ -225,7 +218,7 @@ impl Handler {
            TransmissionLane::ConnectionId(id)
        });

-        let input_msg = InputMessage::new_reply(recipient_tag, message, lane, self.packet_type);
+        let input_msg = InputMessage::new_reply(recipient_tag, message, lane);
        self.msg_input
            .send(input_msg)
            .await
@@ -1,6 +1,6 @@
 [package]
 name = "nym-socks5-client"
-version = "1.1.22"
+version = "1.1.18"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 description = "A SOCKS5 localhost proxy that converts incoming messages to Sphinx and sends them to a Nym address"
 edition = "2021"
@@ -1,25 +1,20 @@
 // Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::commands::try_upgrade_config;
-use crate::config::{
-    default_config_directory, default_config_filepath, default_data_directory, Config,
-};
+use crate::commands::try_upgrade_v1_1_13_config;
 use crate::{
    commands::{override_config, OverrideConfig},
    error::Socks5ClientError,
 };
 use clap::Args;
 use nym_bin_common::output_format::OutputFormat;
-use nym_client_core::client::base_client::storage::gateway_details::OnDiskGatewayDetails;
-use nym_client_core::client::key_manager::persistence::OnDiskKeys;
-use nym_client_core::config::GatewayEndpointConfig;
-use nym_client_core::init::GatewaySetup;
+use nym_config::NymConfig;
+use nym_credential_storage::persistent_storage::PersistentStorage;
 use nym_crypto::asymmetric::identity;
+use nym_socks5_client_core::config::Config;
 use nym_sphinx::addressing::clients::Recipient;
 use serde::Serialize;
 use std::fmt::Display;
-use std::{fs, io};
 use tap::TapFallible;

 #[derive(Args, Clone)]
@@ -96,7 +91,6 @@ impl From<Init> for OverrideConfig {
            no_cover: init_config.no_cover,
            nyxd_urls: init_config.nyxd_urls,
            enabled_credentials_mode: init_config.enabled_credentials_mode,
-            outfox: false,
        }
    }
 }
@@ -105,19 +99,15 @@ impl From<Init> for OverrideConfig {
 pub struct InitResults {
    #[serde(flatten)]
    client_core: nym_client_core::init::InitResults,
-    socks5_listening_port: u16,
+    socks5_listening_port: String,
    client_address: String,
 }

 impl InitResults {
-    fn new(config: &Config, address: &Recipient, gateway: &GatewayEndpointConfig) -> Self {
+    fn new(config: &Config, address: &Recipient) -> Self {
        Self {
-            client_core: nym_client_core::init::InitResults::new(
-                &config.core.base,
-                address,
-                gateway,
-            ),
-            socks5_listening_port: config.core.socks5.listening_port,
+            client_core: nym_client_core::init::InitResults::new(config.get_base(), address),
+            socks5_listening_port: config.get_socks5().get_listening_port().to_string(),
            client_address: address.to_string(),
        }
    }
@@ -131,27 +121,19 @@ impl Display for InitResults {
    }
 }

-fn init_paths(id: &str) -> io::Result<()> {
-    fs::create_dir_all(default_data_directory(id))?;
-    fs::create_dir_all(default_config_directory(id))
-}
-
 pub(crate) async fn execute(args: &Init) -> Result<(), Socks5ClientError> {
    eprintln!("Initialising client...");

    let id = &args.id;
    let provider_address = &args.provider;

-    let already_init = if default_config_filepath(id).exists() {
+    let already_init = Config::default_config_file_path(id).exists();
+    if already_init {
        // in case we're using old config, try to upgrade it
        // (if we're using the current version, it's a no-op)
-        try_upgrade_config(id)?;
+        try_upgrade_v1_1_13_config(id)?;
        eprintln!("SOCKS5 client \"{id}\" was already initialised before");
-        true
-    } else {
-        init_paths(id)?;
-        false
-    };
+    }

    // Usually you only register with the gateway on the first init, however you can force
    // re-registering if wanted.
@@ -167,47 +149,50 @@ pub(crate) async fn execute(args: &Init) -> Result<(), Socks5ClientError> {

    // Attempt to use a user-provided gateway, if possible
    let user_chosen_gateway_id = args.gateway;
-    let gateway_setup = GatewaySetup::new_fresh(
-        user_chosen_gateway_id.map(|id| id.to_base58_string()),
-        Some(args.latency_based_selection),
-    );

    // Load and potentially override config
-    let config = override_config(
+    let mut config = override_config(
        Config::new(id, &provider_address.to_string()),
        OverrideConfig::from(args.clone()),
    );

    // Setup gateway by either registering a new one, or creating a new config from the selected
    // one but with keys kept, or reusing the gateway configuration.
-    let key_store = OnDiskKeys::new(config.storage_paths.common_paths.keys.clone());
-    let details_store =
-        OnDiskGatewayDetails::new(&config.storage_paths.common_paths.gateway_details);
-    let init_details = nym_client_core::init::setup_gateway(
-        &gateway_setup,
-        &key_store,
-        &details_store,
+    let gateway = nym_client_core::init::setup_gateway_from_config::<Config, _, PersistentStorage>(
        register_gateway,
-        Some(&config.core.base.client.nym_api_urls),
+        user_chosen_gateway_id,
+        config.get_base(),
+        args.latency_based_selection,
    )
    .await
    .tap_err(|err| eprintln!("Failed to setup gateway\nError: {err}"))?;

+    config.get_base_mut().set_gateway_endpoint(gateway);
+
    // TODO: ask the service provider we specified for its interface version and set it in the config

-    let config_save_location = config.default_location();
-    config.save_to_default_location().tap_err(|_| {
+    config.save_to_file(None).tap_err(|_| {
        log::error!("Failed to save the config file");
    })?;
-    eprintln!(
-        "Saved configuration file to {}",
-        config_save_location.display()
-    );

-    let address = init_details.client_address()?;
+    print_saved_config(&config);

-    let init_results = InitResults::new(&config, &address, &init_details.gateway_details);
+    let address = nym_client_core::init::get_client_address_from_stored_keys(config.get_base())?;
+    let init_results = InitResults::new(&config, &address);
    println!("{}", args.output.format(&init_results));

    Ok(())
 }
+
+fn print_saved_config(config: &Config) {
+    let config_save_location = config.get_config_file_save_location();
+    eprintln!("Saved configuration file to {:?}", config_save_location);
+    eprintln!("Using gateway: {}", config.get_base().get_gateway_id());
+    log::debug!("Gateway id: {}", config.get_base().get_gateway_id());
+    log::debug!("Gateway owner: {}", config.get_base().get_gateway_owner());
+    log::debug!(
+        "Gateway listener: {}",
+        config.get_base().get_gateway_listener()
+    );
+    eprintln!("Client configuration completed.\n");
+}
@@ -1,25 +1,15 @@
 // Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::config::old_config_v1_1_13::OldConfigV1_1_13;
-use crate::config::old_config_v1_1_20::ConfigV1_1_20;
-use crate::config::old_config_v1_1_20_2::ConfigV1_1_20_2;
-use crate::config::{BaseClientConfig, Config};
-use crate::error::Socks5ClientError;
 use clap::CommandFactory;
 use clap::{Parser, Subcommand};
 use lazy_static::lazy_static;
-use log::{error, info};
+use log::info;
 use nym_bin_common::build_information::BinaryBuildInformation;
 use nym_bin_common::completions::{fig_generate, ArgShell};
-use nym_client_core::client::base_client::storage::gateway_details::{
-    OnDiskGatewayDetails, PersistedGatewayDetails,
-};
-use nym_client_core::client::key_manager::persistence::OnDiskKeys;
-use nym_client_core::config::GatewayEndpointConfig;
-use nym_client_core::error::ClientCoreError;
-use nym_config::OptionalSet;
-use nym_sphinx::params::PacketType;
+use nym_config::{NymConfig, OptionalSet};
+use nym_socks5_client_core::config::old_config_v1_1_13::OldConfigV1_1_13;
+use nym_socks5_client_core::config::{BaseConfig, Config};
 use std::error::Error;

 pub mod init;
@@ -74,7 +64,6 @@ pub(crate) struct OverrideConfig {
    no_cover: bool,
    nyxd_urls: Option<Vec<url::Url>>,
    enabled_credentials_mode: Option<bool>,
-    outfox: bool,
 }

 pub(crate) async fn execute(args: &Cli) -> Result<(), Box<dyn Error + Send + Sync>> {
@@ -91,158 +80,41 @@ pub(crate) async fn execute(args: &Cli) -> Result<(), Box<dyn Error + Send + Syn
 }

 pub(crate) fn override_config(config: Config, args: OverrideConfig) -> Config {
-    let packet_type = if args.outfox {
-        PacketType::Outfox
-    } else {
-        PacketType::Mix
-    };
    config
-        .with_base(
-            BaseClientConfig::with_high_default_traffic_volume,
-            args.fastmode,
-        )
-        .with_base(BaseClientConfig::with_disabled_cover_traffic, args.no_cover)
-        .with_base(BaseClientConfig::with_packet_type, packet_type)
+        .with_base(BaseConfig::with_high_default_traffic_volume, args.fastmode)
+        .with_base(BaseConfig::with_disabled_cover_traffic, args.no_cover)
        .with_optional(Config::with_anonymous_replies, args.use_anonymous_replies)
        .with_optional(Config::with_port, args.port)
-        .with_optional_base_custom_env(
-            BaseClientConfig::with_custom_nym_apis,
+        .with_optional_custom_env_ext(
+            BaseConfig::with_custom_nym_apis,
            args.nym_apis,
            nym_network_defaults::var_names::NYM_API,
            nym_config::parse_urls,
        )
-        .with_optional_base_custom_env(
-            BaseClientConfig::with_custom_nyxd,
+        .with_optional_custom_env_ext(
+            BaseConfig::with_custom_nyxd,
            args.nyxd_urls,
            nym_network_defaults::var_names::NYXD,
            nym_config::parse_urls,
        )
-        .with_optional_base(
-            BaseClientConfig::with_disabled_credentials,
+        .with_optional_ext(
+            BaseConfig::with_disabled_credentials,
            args.enabled_credentials_mode.map(|b| !b),
        )
 }

-fn persist_gateway_details(
-    config: &Config,
-    details: GatewayEndpointConfig,
-) -> Result<(), Socks5ClientError> {
-    let details_store =
-        OnDiskGatewayDetails::new(&config.storage_paths.common_paths.gateway_details);
-    let keys_store = OnDiskKeys::new(config.storage_paths.common_paths.keys.clone());
-    let shared_keys = keys_store.ephemeral_load_gateway_keys().map_err(|source| {
-        Socks5ClientError::ClientCoreError(ClientCoreError::KeyStoreError {
-            source: Box::new(source),
-        })
-    })?;
-    let persisted_details = PersistedGatewayDetails::new(details, &shared_keys);
-    details_store
-        .store_to_disk(&persisted_details)
-        .map_err(|source| {
-            Socks5ClientError::ClientCoreError(ClientCoreError::GatewayDetailsStoreError {
-                source: Box::new(source),
-            })
-        })
-}
-
-fn try_upgrade_v1_1_13_config(id: &str) -> Result<bool, Socks5ClientError> {
-    use nym_config::legacy_helpers::nym_config::MigrationNymConfig;
-
-    // explicitly load it as v1.1.13 (which is incompatible with the next step, i.e. 1.1.19)
+fn try_upgrade_v1_1_13_config(id: &str) -> std::io::Result<()> {
+    // explicitly load it as v1.1.13 (which is incompatible with the current, i.e. 1.1.14+)
    let Ok(old_config) = OldConfigV1_1_13::load_from_file(id) else {
        // if we failed to load it, there might have been nothing to upgrade
        // or maybe it was an even older file. in either way. just ignore it and carry on with our day
-        return Ok(false);
+        return Ok(());
    };
    info!("It seems the client is using <= v1.1.13 config template.");
    info!("It is going to get updated to the current specification.");

-    let updated_step1: ConfigV1_1_20 = old_config.into();
-    let updated_step2: ConfigV1_1_20_2 = updated_step1.into();
-    let (updated, gateway_config) = updated_step2.upgrade();
-    persist_gateway_details(&updated, gateway_config)?;
-
-    updated.save_to_default_location()?;
-    Ok(true)
-}
-
-fn try_upgrade_v1_1_20_config(id: &str) -> Result<bool, Socks5ClientError> {
-    use nym_config::legacy_helpers::nym_config::MigrationNymConfig;
-
-    // explicitly load it as v1.1.20 (which is incompatible with the current one, i.e. +1.1.21)
-    let Ok(old_config) = ConfigV1_1_20::load_from_file(id) else {
-        // if we failed to load it, there might have been nothing to upgrade
-        // or maybe it was an even older file. in either way. just ignore it and carry on with our day
-        return Ok(false);
-    };
-    info!("It seems the client is using <= v1.1.20 config template.");
-    info!("It is going to get updated to the current specification.");
-
-    let updated_step1: ConfigV1_1_20_2 = old_config.into();
-    let (updated, gateway_config) = updated_step1.upgrade();
-    persist_gateway_details(&updated, gateway_config)?;
-
-    updated.save_to_default_location()?;
-    Ok(true)
-}
-
-fn try_upgrade_v1_1_20_2_config(id: &str) -> Result<bool, Socks5ClientError> {
-    // explicitly load it as v1.1.20_2 (which is incompatible with the current one, i.e. +1.1.21)
-    let Ok(old_config) = ConfigV1_1_20_2::read_from_default_path(id) else {
-        // if we failed to load it, there might have been nothing to upgrade
-        // or maybe it was an even older file. in either way. just ignore it and carry on with our day
-        return Ok(false);
-    };
-    info!("It seems the client is using <= v1.1.20_2 config template.");
-    info!("It is going to get updated to the current specification.");
-
-    let (updated, gateway_config) = old_config.upgrade();
-    persist_gateway_details(&updated, gateway_config)?;
-
-    updated.save_to_default_location()?;
-    Ok(true)
-}
-
-fn try_upgrade_config(id: &str) -> Result<(), Socks5ClientError> {
-    if try_upgrade_v1_1_13_config(id)? {
-        return Ok(());
-    }
-    if try_upgrade_v1_1_20_config(id)? {
-        return Ok(());
-    }
-    if try_upgrade_v1_1_20_2_config(id)? {
-        return Ok(());
-    }
-
-    Ok(())
-}
-
-fn try_load_current_config(id: &str) -> Result<Config, Socks5ClientError> {
-    // try to load the config as is
-    if let Ok(cfg) = Config::read_from_default_path(id) {
-        return if !cfg.validate() {
-            Err(Socks5ClientError::ConfigValidationFailure)
-        } else {
-            Ok(cfg)
-        };
-    }
-
-    // we couldn't load it - try upgrading it from older revisions
-    try_upgrade_config(id)?;
-
-    let config = match Config::read_from_default_path(id) {
-        Ok(cfg) => cfg,
-        Err(err) => {
-            error!("Failed to load config for {id}. Are you sure you have run `init` before? (Error was: {err})");
-            return Err(Socks5ClientError::FailedToLoadConfig(id.to_string()));
-        }
-    };
-
-    if !config.validate() {
-        return Err(Socks5ClientError::ConfigValidationFailure);
-    }
-
-    Ok(config)
+    let updated: Config = old_config.into();
+    updated.save_to_file(None)
 }

 #[cfg(test)]
@@ -1,8 +1,7 @@
-// Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::commands::try_load_current_config;
-use crate::config::Config;
+use crate::commands::try_upgrade_v1_1_13_config;
 use crate::{
    commands::{override_config, OverrideConfig},
    error::Socks5ClientError,
@@ -10,9 +9,9 @@ use crate::{
 use clap::Args;
 use log::*;
 use nym_bin_common::version_checker::is_minor_version_compatible;
-use nym_client_core::client::base_client::storage::OnDiskPersistent;
+use nym_config::NymConfig;
 use nym_crypto::asymmetric::identity;
-use nym_socks5_client_core::NymClient;
+use nym_socks5_client_core::{config::Config, NymClient};
 use nym_sphinx::addressing::clients::Recipient;

 #[derive(Args, Clone)]
@@ -21,6 +20,10 @@ pub(crate) struct Run {
    #[clap(long)]
    id: String,

+    /// Custom path to the nym-mixnet-client configuration file
+    #[clap(long)]
+    config: Option<String>,
+
    /// Specifies whether this client is going to use an anonymous sender tag for communication with the service provider.
    /// While this is going to hide its actual address information, it will make the actual communication
    /// slower and consume nearly double the bandwidth as it will require sending reply SURBs.
@@ -64,9 +67,6 @@ pub(crate) struct Run {
    /// with bandwidth credential requirement.
    #[clap(long, hide = true)]
    enabled_credentials_mode: Option<bool>,
-
-    #[clap(long, hide = true, action)]
-    outfox: bool,
 }

 impl From<Run> for OverrideConfig {
@@ -79,7 +79,6 @@ impl From<Run> for OverrideConfig {
            no_cover: run_config.no_cover,
            nyxd_urls: run_config.nyxd_urls,
            enabled_credentials_mode: run_config.enabled_credentials_mode,
-            outfox: run_config.outfox,
        }
    }
 }
@@ -88,12 +87,13 @@ impl From<Run> for OverrideConfig {
 // network version. It might do so in the future.
 fn version_check(cfg: &Config) -> bool {
    let binary_version = env!("CARGO_PKG_VERSION");
-    let config_version = &cfg.core.base.client.version;
+    let config_version = cfg.get_base().get_version();
    if binary_version == config_version {
        true
    } else {
        warn!(
-            "The socks5-client binary has different version than what is specified in config file! {binary_version} and {config_version}",
+            "The mixnode binary has different version than what is specified in config file! {} and {}",
+            binary_version, config_version
        );
        if is_minor_version_compatible(binary_version, config_version) {
            info!("but they are still semver compatible. However, consider running the `upgrade` command");
@@ -106,18 +106,37 @@ fn version_check(cfg: &Config) -> bool {
 }

 pub(crate) async fn execute(args: &Run) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-    eprintln!("Starting client {}...", args.id);
+    let id = &args.id;

-    let mut config = try_load_current_config(&args.id)?;
-    config = override_config(config, OverrideConfig::from(args.clone()));
+    // in case we're using old config, try to upgrade it
+    // (if we're using the current version, it's a no-op)
+    try_upgrade_v1_1_13_config(id)?;
+
+    let mut config = match Config::load_from_file(id) {
+        Ok(cfg) => cfg,
+        Err(err) => {
+            error!("Failed to load config for {}. Are you sure you have run `init` before? (Error was: {err})", id);
+            return Err(Box::new(Socks5ClientError::FailedToLoadConfig(
+                id.to_string(),
+            )));
+        }
+    };
+
+    if !config.validate() {
+        return Err(Box::new(Socks5ClientError::ConfigValidationFailure));
+    }
+
+    let override_config_fields = OverrideConfig::from(args.clone());
+    config = override_config(config, override_config_fields);
+
+    if config.get_base_mut().set_empty_fields_to_defaults() {
+        warn!("some of the core config options were left unset. the default values are going to get used instead.");
+    }

    if !version_check(&config) {
        error!("failed the local version check");
        return Err(Box::new(Socks5ClientError::FailedLocalVersionCheck));
    }

-    let storage =
-        OnDiskPersistent::from_paths(config.storage_paths.common_paths, &config.core.base.debug)
-            .await?;
-    NymClient::new(config.core, storage).run_forever().await
+    NymClient::new(config).run_forever().await
 }
@@ -1,14 +1,50 @@
-// Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::commands::try_load_current_config;
-use crate::config::Config;
-use clap::Args;
 use nym_bin_common::version_checker::Version;
-use std::process;
+use nym_config::NymConfig;
+use nym_socks5_client_core::config::{Config, MISSING_VALUE};

-fn unimplemented_upgrade(current_version: &Version, config_version: &Version) -> ! {
-    eprintln!("Cannot perform upgrade from {config_version} to {current_version} as it hasn't been implemented yet");
+use clap::Args;
+use std::{fmt::Display, process};
+
+#[allow(dead_code)]
+fn fail_upgrade<D1: Display, D2: Display>(from_version: D1, to_version: D2) -> ! {
+    print_failed_upgrade(from_version, to_version);
+    process::exit(1)
+}
+
+fn print_start_upgrade<D1: Display, D2: Display>(from: D1, to: D2) {
+    println!(
+        "\n==================\nTrying to upgrade client from {} to {} ...",
+        from, to
+    );
+}
+
+fn print_failed_upgrade<D1: Display, D2: Display>(from: D1, to: D2) {
+    eprintln!(
+        "Upgrade from {} to {} failed!\n==================\n",
+        from, to
+    );
+}
+
+fn print_successful_upgrade<D1: Display, D2: Display>(from: D1, to: D2) {
+    println!(
+        "Upgrade from {} to {} was successful!\n==================\n",
+        from, to
+    );
+}
+
+fn outdated_upgrade(config_version: &Version, package_version: &Version) -> ! {
+    eprintln!(
+        "Cannot perform upgrade from {} to {}. Your version is too old to perform the upgrade.!",
+        config_version, package_version
+    );
+    process::exit(1)
+}
+
+fn unsupported_upgrade(current_version: &Version, config_version: &Version) -> ! {
+    eprintln!("Cannot perform upgrade from {} to {}. Please let the developers know about this issue if you expected it to work!", config_version, current_version);
    process::exit(1)
 }

@@ -20,14 +56,15 @@ pub(crate) struct Upgrade {
 }

 fn parse_config_version(config: &Config) -> Version {
-    let version = Version::parse(&config.core.base.client.version).unwrap_or_else(|err| {
+    let version = Version::parse(config.get_base().get_version()).unwrap_or_else(|err| {
        eprintln!("failed to parse client version! - {err}");
        process::exit(1)
    });

    if version.is_prerelease() || !version.build.is_empty() {
        eprintln!(
-            "Trying to upgrade from a non-released version {version}. This is not supported!"
+            "Trying to upgrade from a non-released version {}. This is not supported!",
+            version
        );
        process::exit(1)
    }
@@ -42,21 +79,63 @@ fn parse_package_version() -> Version {
    // however, we are not using them ourselves at the moment and hence it should be fine.
    // if we change our mind, we could easily tweak this code
    if version.is_prerelease() || !version.build.is_empty() {
-        eprintln!("Trying to upgrade to a non-released version {version}. This is not supported!");
+        eprintln!(
+            "Trying to upgrade to a non-released version {}. This is not supported!",
+            version
+        );
        process::exit(1)
    }

    version
 }

-fn do_upgrade(config: Config, _args: &Upgrade, package_version: &Version) {
-    let config_version = parse_config_version(&config);
-    if &config_version == package_version {
-        println!("You're using the most recent version!");
-        return;
-    }
+fn minor_0_12_upgrade(
+    mut config: Config,
+    _args: &Upgrade,
+    config_version: &Version,
+    package_version: &Version,
+) -> Config {
+    let to_version = if package_version.major == 0 && package_version.minor == 12 {
+        package_version.clone()
+    } else {
+        Version::new(0, 12, 0)
+    };

-    unimplemented_upgrade(package_version, &config_version)
+    print_start_upgrade(config_version, &to_version);
+
+    config
+        .get_base_mut()
+        .set_custom_version(to_version.to_string().as_ref());
+
+    config.save_to_file(None).unwrap_or_else(|err| {
+        eprintln!("failed to overwrite config file! - {err}");
+        print_failed_upgrade(config_version, &to_version);
+        process::exit(1);
+    });
+
+    print_successful_upgrade(config_version, to_version);
+
+    config
+}
+
+fn do_upgrade(mut config: Config, args: &Upgrade, package_version: &Version) {
+    loop {
+        let config_version = parse_config_version(&config);
+
+        if &config_version == package_version {
+            println!("You're using the most recent version!");
+            return;
+        }
+
+        config = match config_version.major {
+            0 => match config_version.minor {
+                9 | 10 => outdated_upgrade(&config_version, package_version),
+                11 => minor_0_12_upgrade(config, args, &config_version, package_version),
+                _ => unsupported_upgrade(&config_version, package_version),
+            },
+            _ => unsupported_upgrade(&config_version, package_version),
+        }
+    }
 }

 pub(crate) fn execute(args: &Upgrade) {
@@ -64,15 +143,16 @@ pub(crate) fn execute(args: &Upgrade) {

    let id = &args.id;

-    let existing_config = try_load_current_config(id).unwrap_or_else(|err| {
+    let existing_config = Config::load_from_file(id).unwrap_or_else(|err| {
        eprintln!("failed to load existing config file! - {err}");
        process::exit(1)
    });

-    if existing_config.core.base.client.version.is_empty() {
+    if existing_config.get_base().get_version() == MISSING_VALUE {
        eprintln!("the existing configuration file does not seem to contain version number.");
        process::exit(1);
    }

+    // here be upgrade path to 0.9.X and beyond based on version number from config
    do_upgrade(existing_config, args, &package_version)
 }
@@ -1,160 +0,0 @@
-// Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::config::persistence::SocksClientPaths;
-use crate::config::template::CONFIG_TEMPLATE;
-use nym_bin_common::logging::LoggingSettings;
-use nym_config::{
-    must_get_home, read_config_from_toml_file, save_formatted_config_to_file, NymConfigTemplate,
-    DEFAULT_CONFIG_DIR, DEFAULT_CONFIG_FILENAME, DEFAULT_DATA_DIR, NYM_DIR,
-};
-use serde::{Deserialize, Serialize};
-use std::fmt::Debug;
-use std::io;
-use std::path::{Path, PathBuf};
-use std::str::FromStr;
-
-pub use nym_client_core::config::Config as BaseClientConfig;
-pub use nym_socks5_client_core::config::Config as CoreConfig;
-
-pub mod old_config_v1_1_13;
-pub mod old_config_v1_1_20;
-pub mod old_config_v1_1_20_2;
-mod persistence;
-mod template;
-
-const DEFAULT_SOCKS5_CLIENTS_DIR: &str = "socks5-clients";
-
-/// Derive default path to clients's config directory.
-/// It should get resolved to `$HOME/.nym/socks5-clients/<id>/config`
-pub fn default_config_directory<P: AsRef<Path>>(id: P) -> PathBuf {
-    must_get_home()
-        .join(NYM_DIR)
-        .join(DEFAULT_SOCKS5_CLIENTS_DIR)
-        .join(id)
-        .join(DEFAULT_CONFIG_DIR)
-}
-
-/// Derive default path to client's config file.
-/// It should get resolved to `$HOME/.nym/socks5-clients/<id>/config/config.toml`
-pub fn default_config_filepath<P: AsRef<Path>>(id: P) -> PathBuf {
-    default_config_directory(id).join(DEFAULT_CONFIG_FILENAME)
-}
-
-/// Derive default path to client's data directory where files, such as keys, are stored.
-/// It should get resolved to `$HOME/.nym/socks5-clients/<id>/data`
-pub fn default_data_directory<P: AsRef<Path>>(id: P) -> PathBuf {
-    must_get_home()
-        .join(NYM_DIR)
-        .join(DEFAULT_SOCKS5_CLIENTS_DIR)
-        .join(id)
-        .join(DEFAULT_DATA_DIR)
-}
-
-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
-#[serde(deny_unknown_fields)]
-pub struct Config {
-    pub core: CoreConfig,
-
-    pub storage_paths: SocksClientPaths,
-
-    pub logging: LoggingSettings,
-}
-
-impl NymConfigTemplate for Config {
-    fn template() -> &'static str {
-        CONFIG_TEMPLATE
-    }
-}
-
-impl Config {
-    pub fn new<S: AsRef<str>>(id: S, provider_mix_address: S) -> Self {
-        Config {
-            core: CoreConfig::new(
-                id.as_ref(),
-                env!("CARGO_PKG_VERSION"),
-                provider_mix_address.as_ref(),
-            ),
-            storage_paths: SocksClientPaths::new_default(default_data_directory(id.as_ref())),
-            logging: Default::default(),
-        }
-    }
-
-    pub fn read_from_toml_file<P: AsRef<Path>>(path: P) -> io::Result<Self> {
-        read_config_from_toml_file(path)
-    }
-
-    pub fn read_from_default_path<P: AsRef<Path>>(id: P) -> io::Result<Self> {
-        Self::read_from_toml_file(default_config_filepath(id))
-    }
-
-    pub fn default_location(&self) -> PathBuf {
-        default_config_filepath(&self.core.base.client.id)
-    }
-
-    pub fn save_to_default_location(&self) -> io::Result<()> {
-        let config_save_location: PathBuf = self.default_location();
-        save_formatted_config_to_file(self, config_save_location)
-    }
-
-    pub fn validate(&self) -> bool {
-        // no other sections have explicit requirements (yet)
-        self.core.validate()
-    }
-
-    pub fn with_port(mut self, port: u16) -> Self {
-        self.core.socks5.listening_port = port;
-        self
-    }
-
-    pub fn with_anonymous_replies(mut self, anonymous_replies: bool) -> Self {
-        self.core.socks5.send_anonymously = anonymous_replies;
-        self
-    }
-
-    // poor man's 'builder' method
-
-    pub fn with_base<F, T>(mut self, f: F, val: T) -> Self
-    where
-        F: Fn(BaseClientConfig, T) -> BaseClientConfig,
-    {
-        self.core = self.core.with_base(f, val);
-        self
-    }
-
-    pub fn with_optional_base<F, T>(mut self, f: F, val: Option<T>) -> Self
-    where
-        F: Fn(BaseClientConfig, T) -> BaseClientConfig,
-    {
-        self.core = self.core.with_optional_base(f, val);
-        self
-    }
-
-    #[allow(unused)]
-    pub fn with_optional_base_env<F, T>(mut self, f: F, val: Option<T>, env_var: &str) -> Self
-    where
-        F: Fn(BaseClientConfig, T) -> BaseClientConfig,
-        T: FromStr,
-        <T as FromStr>::Err: Debug,
-    {
-        self.core = self.core.with_optional_base_env(f, val, env_var);
-        self
-    }
-
-    pub fn with_optional_base_custom_env<F, T, G>(
-        mut self,
-        f: F,
-        val: Option<T>,
-        env_var: &str,
-        parser: G,
-    ) -> Self
-    where
-        F: Fn(BaseClientConfig, T) -> BaseClientConfig,
-        G: Fn(&str) -> T,
-    {
-        self.core = self
-            .core
-            .with_optional_base_custom_env(f, val, env_var, parser);
-        self
-    }
-}
@@ -1,38 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::config::old_config_v1_1_20::{ConfigV1_1_20, Socks5V1_1_20};
-use nym_client_core::config::old_config_v1_1_13::OldConfigV1_1_13 as OldBaseConfigV1_1_13;
-use nym_config::legacy_helpers::nym_config::MigrationNymConfig;
-use nym_config::must_get_home;
-use serde::{Deserialize, Serialize};
-use std::path::PathBuf;
-
-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
-#[serde(deny_unknown_fields)]
-pub struct OldConfigV1_1_13 {
-    #[serde(flatten)]
-    pub base: OldBaseConfigV1_1_13<OldConfigV1_1_13>,
-
-    pub socks5: Socks5V1_1_20,
-}
-
-impl MigrationNymConfig for OldConfigV1_1_13 {
-    fn default_root_directory() -> PathBuf {
-        #[cfg(not(any(target_os = "android", target_os = "ios")))]
-        let base_dir = must_get_home();
-        #[cfg(any(target_os = "android", target_os = "ios"))]
-        let base_dir = PathBuf::from("/tmp");
-
-        base_dir.join(".nym").join("socks5-clients")
-    }
-}
-
-impl From<OldConfigV1_1_13> for ConfigV1_1_20 {
-    fn from(value: OldConfigV1_1_13) -> Self {
-        ConfigV1_1_20 {
-            base: value.base.into(),
-            socks5: value.socks5,
-        }
-    }
-}
@@ -1,137 +0,0 @@
-// Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::config::old_config_v1_1_20_2::{
-    ConfigV1_1_20_2, CoreConfigV1_1_20_2, SocksClientPathsV1_1_20_2,
-};
-use nym_bin_common::logging::LoggingSettings;
-use nym_client_core::config::disk_persistence::keys_paths::ClientKeysPaths;
-use nym_client_core::config::disk_persistence::old_v1_1_20_2::CommonClientPathsV1_1_20_2;
-use nym_client_core::config::old_config_v1_1_20::ConfigV1_1_20 as BaseConfigV1_1_20;
-use nym_client_core::config::old_config_v1_1_20_2::ClientV1_1_20_2;
-use nym_config::legacy_helpers::nym_config::MigrationNymConfig;
-use nym_config::must_get_home;
-use nym_socks5_client_core::config::old_config_v1_1_20_2::{
-    BaseClientConfigV1_1_20_2, Socks5DebugV1_1_20_2, Socks5V1_1_20_2,
-};
-use nym_socks5_client_core::config::{ProviderInterfaceVersion, Socks5ProtocolVersion};
-use serde::{Deserialize, Serialize};
-use std::fmt::Debug;
-use std::path::PathBuf;
-
-const DEFAULT_CONNECTION_START_SURBS: u32 = 20;
-const DEFAULT_PER_REQUEST_SURBS: u32 = 3;
-
-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
-#[serde(deny_unknown_fields)]
-pub struct ConfigV1_1_20 {
-    #[serde(flatten)]
-    pub base: BaseConfigV1_1_20<ConfigV1_1_20>,
-
-    pub socks5: Socks5V1_1_20,
-}
-
-impl From<ConfigV1_1_20> for ConfigV1_1_20_2 {
-    fn from(value: ConfigV1_1_20) -> Self {
-        ConfigV1_1_20_2 {
-            core: CoreConfigV1_1_20_2 {
-                base: BaseClientConfigV1_1_20_2 {
-                    client: ClientV1_1_20_2 {
-                        version: value.base.client.version,
-                        id: value.base.client.id,
-                        disabled_credentials_mode: value.base.client.disabled_credentials_mode,
-                        nyxd_urls: value.base.client.nyxd_urls,
-                        nym_api_urls: value.base.client.nym_api_urls,
-                        gateway_endpoint: value.base.client.gateway_endpoint.into(),
-                    },
-                    debug: value.base.debug.into(),
-                },
-                socks5: value.socks5.into(),
-            },
-            storage_paths: SocksClientPathsV1_1_20_2 {
-                common_paths: CommonClientPathsV1_1_20_2 {
-                    keys: ClientKeysPaths {
-                        private_identity_key_file: value.base.client.private_identity_key_file,
-                        public_identity_key_file: value.base.client.public_identity_key_file,
-                        private_encryption_key_file: value.base.client.private_encryption_key_file,
-                        public_encryption_key_file: value.base.client.public_encryption_key_file,
-                        gateway_shared_key_file: value.base.client.gateway_shared_key_file,
-                        ack_key_file: value.base.client.ack_key_file,
-                    },
-                    credentials_database: value.base.client.database_path,
-                    reply_surb_database: value.base.client.reply_surb_database_path,
-                },
-            },
-            logging: LoggingSettings::default(),
-        }
-    }
-}
-
-impl MigrationNymConfig for ConfigV1_1_20 {
-    fn default_root_directory() -> PathBuf {
-        #[cfg(not(any(target_os = "android", target_os = "ios")))]
-        let base_dir = must_get_home();
-        #[cfg(any(target_os = "android", target_os = "ios"))]
-        let base_dir = PathBuf::from("/tmp");
-
-        base_dir.join(".nym").join("socks5-clients")
-    }
-}
-
-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize)]
-#[serde(deny_unknown_fields)]
-pub struct Socks5V1_1_20 {
-    pub listening_port: u16,
-
-    pub provider_mix_address: String,
-
-    #[serde(default = "ProviderInterfaceVersion::new_legacy")]
-    pub provider_interface_version: ProviderInterfaceVersion,
-
-    #[serde(default = "Socks5ProtocolVersion::new_legacy")]
-    pub socks5_protocol_version: Socks5ProtocolVersion,
-
-    #[serde(default)]
-    pub send_anonymously: bool,
-
-    #[serde(default)]
-    pub socks5_debug: Socks5DebugV1_1_20,
-}
-
-impl From<Socks5V1_1_20> for Socks5V1_1_20_2 {
-    fn from(value: Socks5V1_1_20) -> Self {
-        Socks5V1_1_20_2 {
-            listening_port: value.listening_port,
-            provider_mix_address: value.provider_mix_address,
-            provider_interface_version: value.provider_interface_version,
-            socks5_protocol_version: value.socks5_protocol_version,
-            send_anonymously: value.send_anonymously,
-            socks5_debug: value.socks5_debug.into(),
-        }
-    }
-}
-
-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize)]
-#[serde(deny_unknown_fields)]
-pub struct Socks5DebugV1_1_20 {
-    connection_start_surbs: u32,
-    per_request_surbs: u32,
-}
-
-impl From<Socks5DebugV1_1_20> for Socks5DebugV1_1_20_2 {
-    fn from(value: Socks5DebugV1_1_20) -> Self {
-        Socks5DebugV1_1_20_2 {
-            connection_start_surbs: value.connection_start_surbs,
-            per_request_surbs: value.per_request_surbs,
-        }
-    }
-}
-
-impl Default for Socks5DebugV1_1_20 {
-    fn default() -> Self {
-        Socks5DebugV1_1_20 {
-            connection_start_surbs: DEFAULT_CONNECTION_START_SURBS,
-            per_request_surbs: DEFAULT_PER_REQUEST_SURBS,
-        }
-    }
-}
@@ -1,54 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::config::persistence::SocksClientPaths;
-use crate::config::{default_config_filepath, Config};
-use nym_bin_common::logging::LoggingSettings;
-use nym_client_core::config::disk_persistence::old_v1_1_20_2::CommonClientPathsV1_1_20_2;
-use nym_client_core::config::GatewayEndpointConfig;
-use nym_config::read_config_from_toml_file;
-pub use nym_socks5_client_core::config::old_config_v1_1_20_2::ConfigV1_1_20_2 as CoreConfigV1_1_20_2;
-use serde::{Deserialize, Serialize};
-use std::io;
-use std::path::Path;
-
-#[derive(Debug, Deserialize, PartialEq, Eq, Serialize, Clone)]
-pub struct SocksClientPathsV1_1_20_2 {
-    #[serde(flatten)]
-    pub common_paths: CommonClientPathsV1_1_20_2,
-}
-
-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
-#[serde(deny_unknown_fields)]
-pub struct ConfigV1_1_20_2 {
-    pub core: CoreConfigV1_1_20_2,
-
-    pub storage_paths: SocksClientPathsV1_1_20_2,
-
-    pub logging: LoggingSettings,
-}
-
-impl ConfigV1_1_20_2 {
-    pub fn read_from_toml_file<P: AsRef<Path>>(path: P) -> io::Result<Self> {
-        read_config_from_toml_file(path)
-    }
-
-    pub fn read_from_default_path<P: AsRef<Path>>(id: P) -> io::Result<Self> {
-        Self::read_from_toml_file(default_config_filepath(id))
-    }
-
-    // in this upgrade, gateway endpoint configuration was moved out of the config file,
-    // so its returned to be stored elsewhere.
-    pub fn upgrade(self) -> (Config, GatewayEndpointConfig) {
-        let gateway_details = self.core.base.client.gateway_endpoint.clone().into();
-        let config = Config {
-            core: self.core.into(),
-            storage_paths: SocksClientPaths {
-                common_paths: self.storage_paths.common_paths.upgrade_default(),
-            },
-            logging: self.logging,
-        };
-
-        (config, gateway_details)
-    }
-}
@@ -1,20 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use nym_client_core::config::disk_persistence::CommonClientPaths;
-use serde::{Deserialize, Serialize};
-use std::path::Path;
-
-#[derive(Debug, Deserialize, PartialEq, Eq, Serialize, Clone)]
-pub struct SocksClientPaths {
-    #[serde(flatten)]
-    pub common_paths: CommonClientPaths,
-}
-
-impl SocksClientPaths {
-    pub fn new_default<P: AsRef<Path>>(base_data_directory: P) -> Self {
-        SocksClientPaths {
-            common_paths: CommonClientPaths::new_default(base_data_directory),
-        }
-    }
-}
@@ -1,114 +0,0 @@
-// Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-// While using normal toml marshalling would have been way simpler with less overhead,
-// I think it's useful to have comments attached to the saved config file to explain behaviour of
-// particular fields.
-// Note: any changes to the template must be reflected in the appropriate structs.
-pub(crate) const CONFIG_TEMPLATE: &str = r#"
-# This is a TOML config file.
-# For more information, see https://github.com/toml-lang/toml
-
-##### main base client config options #####
-
-[core.client]
-# Version of the client for which this configuration was created.
-version = '{{ core.client.version }}'
-
-# Human readable ID of this particular client.
-id = '{{ core.client.id }}'
-
-# Indicates whether this client is running in a disabled credentials mode, thus attempting
-# to claim bandwidth without presenting bandwidth credentials.
-disabled_credentials_mode = {{ core.client.disabled_credentials_mode }}
-
-# Addresses to nyxd validators via which the client can communicate with the chain.
-nyxd_urls = [
-    {{#each core.client.nyxd_urls }}
-        '{{this}}',
-    {{/each}}
-]
-
-# Addresses to APIs running on validator from which the client gets the view of the network.
-nym_api_urls = [
-    {{#each core.client.nym_api_urls }}
-        '{{this}}',
-    {{/each}}
-]
-
-[storage_paths] 
-
-# Path to file containing private identity key.
-keys.private_identity_key_file = '{{ storage_paths.keys.private_identity_key_file }}'
-
-# Path to file containing public identity key.
-keys.public_identity_key_file = '{{ storage_paths.keys.public_identity_key_file }}'
-
-# Path to file containing private encryption key.
-keys.private_encryption_key_file = '{{ storage_paths.keys.private_encryption_key_file }}'
-
-# Path to file containing public encryption key.
-keys.public_encryption_key_file = '{{ storage_paths.keys.public_encryption_key_file }}'
-
-# A gateway specific, optional, base58 stringified shared key used for
-# communication with particular gateway.
-keys.gateway_shared_key_file = '{{ storage_paths.keys.gateway_shared_key_file }}'
-
-# Path to file containing key used for encrypting and decrypting the content of an
-# acknowledgement so that nobody besides the client knows which packet it refers to.
-keys.ack_key_file = '{{ storage_paths.keys.ack_key_file }}'
-
-# Path to the database containing bandwidth credentials
-credentials_database = '{{ storage_paths.credentials_database }}'
-
-# Path to the persistent store for received reply surbs, unused encryption keys and used sender tags.
-reply_surb_database = '{{ storage_paths.reply_surb_database }}'
-
-# Path to the file containing information about gateway used by this client,
-# i.e. details such as its public key, owner address or the network information.
-gateway_details = '{{ storage_paths.gateway_details }}'
-
-##### socket config options #####
-
-[core.socks5]
-
-# The mix address of the provider to which all requests are going to be sent.
-provider_mix_address = '{{ core.socks5.provider_mix_address }}'
-
-# The port on which the client will be listening for incoming requests
-listening_port = {{ core.socks5.listening_port }}
-
-# Specifies whether this client is going to use an anonymous sender tag for communication with the service provider.
-# While this is going to hide its actual address information, it will make the actual communication
-# slower and consume nearly double the bandwidth as it will require sending reply SURBs.
-#
-# Note that some service providers might not support this.
-send_anonymously = {{ core.socks5.send_anonymously }}
-
-##### logging configuration options #####
-
-[logging]
-
-# TODO
-
-
-##### debug configuration options #####
-# The following options should not be modified unless you know EXACTLY what you are doing
-# as if set incorrectly, they may impact your anonymity.
-
-# [core.socks5.socks5_debug]
-
-
-[core.debug]
-
-[core.debug.traffic]
-average_packet_delay = '{{ core.debug.traffic.average_packet_delay }}'
-message_sending_average_delay = '{{ core.debug.traffic.message_sending_average_delay }}'
-
-[core.debug.acknowledgements]
-average_ack_delay = '{{ core.debug.acknowledgements.average_ack_delay }}'
-
-[core.debug.cover_traffic]
-loop_cover_traffic_average_delay = '{{ core.debug.cover_traffic.loop_cover_traffic_average_delay }}'
-
-"#;
@@ -8,7 +8,6 @@ use nym_bin_common::logging::{maybe_print_banner, setup_logging};
 use nym_network_defaults::setup_env;

 mod commands;
-mod config;
 pub mod error;

 #[tokio::main]
@@ -1,5 +1,6 @@
 /target
 **/*.rs.bk
+Cargo.lock
 bin/
 pkg/
 wasm-pack.log
@@ -1,7 +1,7 @@
 [package]
 name = "nym-client-wasm"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jedrzej Stuczynski <andrew@nymtech.net>"]
-version = "1.1.1"
+version = "1.1.0"
 edition = "2021"
 keywords = ["nym", "sphinx", "wasm", "webassembly", "privacy", "client"]
 license = "Apache-2.0"
@@ -17,7 +17,6 @@ default = ["console_error_panic_hook"]
 offline-test = []

 [dependencies]
-async-trait = "0.1.68"
 bs58 = "0.4.0"
 futures = "0.3"
 js-sys = "0.3"
@@ -25,13 +24,12 @@ rand = { version = "0.7.3", features = ["wasm-bindgen"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 anyhow = "1.0"
-serde-wasm-bindgen = "0.5"
+serde-wasm-bindgen = "0.4"
 tokio = { version = "1.24.1", features = ["sync"] }
 url = "2.2"
 wasm-bindgen = { version = "=0.2.83", features = ["serde-serialize"]  }
 wasm-bindgen-futures = "0.4"
 thiserror = "1.0.40"
-zeroize = "1.6.0"

 wasm-timer = { git = "https://github.com/mmsinclair/wasm-timer", rev = "b9d1a54ad514c2f230a026afe0dde341e98cd7b6"}

@@ -42,14 +40,13 @@ nym-bandwidth-controller = { path = "../../common/bandwidth-controller" }
 nym-coconut-interface = { path = "../../common/coconut-interface" }
 nym-credentials = { path = "../../common/credentials" }
 nym-credential-storage = { path = "../../common/credential-storage" }
-nym-crypto = { path = "../../common/crypto", features = ["asymmetric", "serde"] }
+nym-crypto = { path = "../../common/crypto" }
 nym-sphinx = { path = "../../common/nymsphinx" }
-nym-sphinx-acknowledgements = { path = "../../common/nymsphinx/acknowledgements", features = ["serde"]}
 nym-topology = { path = "../../common/topology" }
 nym-gateway-client = { path = "../../common/client-libs/gateway-client", default-features = false, features = ["wasm"] }
 nym-validator-client = { path = "../../common/client-libs/validator-client", default-features = false }
+wasm-utils = { path = "../../common/wasm-utils" }
 nym-task = { path = "../../common/task" }
-wasm-utils = { path = "../../common/wasm-utils", features = ["storage"], default-features = false }
 # The `console_error_panic_hook` crate provides better debugging of panics by
 # logging them with `console.error`. This is great for development, but requires
 # all the `std::fmt` and `std::panicking` infrastructure, so isn't great for
@@ -28,10 +28,7 @@ const {
    set_panic_hook,
    Config,
    GatewayEndpointConfig,
-    ClientStorage,
    current_network_topology,
-    make_key,
-    make_key2
 } = wasm_bindgen;

 let client = null;
@@ -106,25 +103,29 @@ function printAndDisplayTestResult(result) {
    });
 }

+function dummyGatewayConfig() {
+    return new GatewayEndpointConfig(
+        '336yuXAeGEgedRfqTJZsG2YV7P13QH1bHv1SjCZYarc9',
+        'n1rqqw8km7a0rvf8lr6k8dsdqvvkyn2mglj7xxfm',
+        'ws://85.159.212.96:9000',
+    )
+}
+
 async function testWithTester() {
-    const preferredGateway = "336yuXAeGEgedRfqTJZsG2YV7P13QH1bHv1SjCZYarc9";
+    const gatewayConfig = dummyGatewayConfig();

    // A) construct with hardcoded topology
    const topology = dummyTopology()
-    const nodeTester = await new NymNodeTester(topology, preferredGateway);
+    const nodeTester = await new NymNodeTester(gatewayConfig, topology);

    // B) first get topology directly from nym-api
    // const validator = 'https://qwerty-validator-api.qa.nymte.ch/api';
    // const topology = await current_network_topology(validator)
-    // const nodeTester = await new NymNodeTester(topology, undefined, preferredGateway);
+    // const nodeTester = await new NymNodeTester(gatewayConfig, topology);
    //
    // C) use nym-api in the constructor (note: it does no filtering for 'good' nodes on other layers)
    // const validator = 'https://qwerty-validator-api.qa.nymte.ch/api';
-    // const nodeTester = await NymNodeTester.new_with_api(validator, undefined, preferredGateway)
-
-    // D, E, F) you also don't have to specify the gateway. if you don't, a random one (from your topology) will be used
-    // const topology = dummyTopology()
-    // const nodeTester = await new NymNodeTester(topology);
+    // const nodeTester = await NymNodeTester.new_with_api(gatewayConfig, validator)

    self.onmessage = async event => {
        if (event.data && event.data.kind) {
@@ -139,44 +140,10 @@ async function testWithTester() {
            }
        }
    };
-}
-
-async function testerReconnection() {
-    const validator = 'https://qwerty-validator-api.qa.nymte.ch/api';
-    const nodeTester = await NymNodeTester.new_with_api(validator);
-
-    self.onmessage = async event => {
-        if (event.data && event.data.kind) {
-            switch (event.data.kind) {
-                case 'TestPacket': {
-                    const {mixnodeIdentity} = event.data.args;
-                    console.log("starting node test...");
-
-                    let result1 = await nodeTester.test_node(mixnodeIdentity);
-                    console.log("sleeping for 5s");
-                    await new Promise(r => setTimeout(r, 5000));
-                    await nodeTester.disconnect_from_gateway();
-
-                    console.log("sleeping for 5s");
-                    await new Promise(r => setTimeout(r, 5000));
-
-                    await nodeTester.reconnect_to_gateway();
-                    let result2 = await nodeTester.test_node(mixnodeIdentity);
-
-                    printAndDisplayTestResult(result1)
-                    printAndDisplayTestResult(result2)
-                }
-            }
-        }
-    };
-
-
-
-
 }

 async function testWithNymClient() {
-    const preferredGateway = "336yuXAeGEgedRfqTJZsG2YV7P13QH1bHv1SjCZYarc9";
+    const gatewayConfig = dummyGatewayConfig();
    const topology = dummyTopology()

    let received = 0
@@ -198,7 +165,7 @@ async function testWithNymClient() {

    console.log('Instantiating WASM client...');

-    let clientBuilder = NymClientBuilder.new_tester(topology, onMessageHandler, preferredGateway)
+    let clientBuilder = NymClientBuilder.new_tester(gatewayConfig, topology, onMessageHandler)
    console.log('Web worker creating WASM client...');
    let local_client = await clientBuilder.start_client();
    console.log('WASM client running!');
@@ -256,10 +223,10 @@ async function normalNymClientUsage() {

    debug.topology_refresh_rate_ms = BigInt(60000)

-    const preferredGateway = "336yuXAeGEgedRfqTJZsG2YV7P13QH1bHv1SjCZYarc9";
+    const gatewayConfig = dummyGatewayConfig();
    const validator = 'https://qwerty-validator-api.qa.nymte.ch/api';

-    const config = new Config('my-awesome-wasm-client', validator, debug);
+    const config = new Config('my-awesome-wasm-client', validator, gatewayConfig, debug);

    const onMessageHandler = (message) => {
        console.log(message);
@@ -303,57 +270,6 @@ async function normalNymClientUsage() {
            }
        }
    };
-}
-
-async function messWithStorage() {
-    self.onmessage = async event => {
-        if (event.data && event.data.kind) {
-            switch (event.data.kind) {
-                case 'TestPacket': {
-                    const { mixnodeIdentity } = event.data.args;
-                    console.log("button clicked...", mixnodeIdentity);
-
-                    let id1 = "one";
-                    let id2 = "two";
-
-                    console.log("making store1 NO-ENC");
-                    let _storage1 = await ClientStorage.new_unencrypted(id1);
-
-                    console.log("making store2 ENC")
-                    let _storage2 = await new ClientStorage(id2, "my-secret-password");
-                    //
-                    //
-                    //
-                    //     console.log("attempting to use store1 WITH PASSWORD")
-                    //     let _storage1_alt = await new ClientStorage(id1, "password");
-                    //
-                    //
-                    //
-                    //     console.log("attempting to use store2 WITHOUT PASSWORD")
-                    //     let _storage2_alt = await ClientStorage.new_unencrypted(id2);
-                    //
-                    //
-                    //
-                    //     console.log("attempting to use store2 with WRONG PASSWORD")
-                    //     let _storage2_bad = await new ClientStorage(id2, "bad-password")
-
-
-                    //
-                    // console.log("read1: ", await storage1.read());
-                    // console.log("read2: ", await storage2.read());
-                    //
-                    // console.log("store1: ", await storage1.store("FOOMP"));
-                    //
-                    // console.log("read1: ", await storage1.read());
-                    // console.log("read2: ", await storage2.read());
-                }
-            }
-        }
-    };
-
-
-
-
 }

 async function main() {
@@ -364,9 +280,6 @@ async function main() {
    // sets up better stack traces in case of in-rust panics
    set_panic_hook();

-    // show reconnection capabilities
-    // await testerReconnection()
-
    // run test on simplified and dedicated tester:
    await testWithTester()

@@ -1,4 +1,4 @@
-// Copyright 2022-2023 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

 // due to expansion of #[wasm_bindgen] macro on `Debug` Config struct
@@ -7,49 +7,60 @@
 #![allow(clippy::drop_copy)]

 use nym_client_core::config::{
-    Acknowledgements as ConfigAcknowledgements, Config as BaseClientConfig,
-    CoverTraffic as ConfigCoverTraffic, DebugConfig as ConfigDebug,
-    GatewayConnection as ConfigGatewayConnection, ReplySurbs as ConfigReplySurbs,
-    Topology as ConfigTopology, Traffic as ConfigTraffic,
+    Acknowledgements as ConfigAcknowledgements, CoverTraffic as ConfigCoverTraffic,
+    DebugConfig as ConfigDebug, GatewayConnection as ConfigGatewayConnection,
+    GatewayEndpointConfig, ReplySurbs as ConfigReplySurbs, Topology as ConfigTopology,
+    Traffic as ConfigTraffic,
 };
-use nym_sphinx::params::{PacketSize, PacketType};
+use nym_sphinx::params::PacketSize;
 use serde::{Deserialize, Serialize};
 use std::time::Duration;
+use url::Url;
 use wasm_bindgen::prelude::*;

 #[wasm_bindgen]
 #[derive(Debug, Deserialize, PartialEq, Serialize)]
 #[serde(deny_unknown_fields)]
 pub struct Config {
-    pub(crate) base: BaseClientConfig,
+    /// ID specifies the human readable ID of this particular client.
+    pub(crate) id: String,
+
+    pub(crate) nym_api_url: Option<Url>,
+
+    pub(crate) disabled_credentials_mode: bool,
+
+    /// Information regarding how the client should send data to gateway.
+    pub(crate) gateway_endpoint: GatewayEndpointConfig,
+
+    pub(crate) debug: ConfigDebug,
 }

 #[wasm_bindgen]
 impl Config {
    #[wasm_bindgen(constructor)]
-    pub fn new(id: String, validator_server: String, debug: Option<DebugWasm>) -> Self {
+    pub fn new(
+        id: String,
+        validator_server: String,
+        gateway_endpoint: GatewayEndpointConfig,
+        debug: Option<Debug>,
+    ) -> Self {
        Config {
-            base: BaseClientConfig::new(id, env!("CARGO_PKG_VERSION").to_string())
-                .with_custom_nyxd(vec![validator_server
+            id,
+            nym_api_url: Some(
+                validator_server
                    .parse()
-                    .expect("provided url was malformed")])
-                .with_debug_config(debug.map(Into::into).unwrap_or_default()),
-        }
-    }
-
-    pub(crate) fn new_tester_config<S: Into<String>>(id: S) -> Self {
-        Config {
-            base: BaseClientConfig::new(id.into(), env!("CARGO_PKG_VERSION").to_string())
-                .with_disabled_credentials(true)
-                .with_disabled_cover_traffic(true)
-                .with_disabled_topology_refresh(true),
+                    .expect("provided url was malformed"),
+            ),
+            disabled_credentials_mode: true,
+            gateway_endpoint,
+            debug: debug.map(Into::into).unwrap_or_default(),
        }
    }
 }

 #[wasm_bindgen]
 #[derive(Debug, Copy, Clone)]
-pub struct TrafficWasm {
+pub struct Traffic {
    /// The parameter of Poisson distribution determining how long, on average,
    /// sent packet is going to be delayed at any given mix node.
    /// So for a packet going through three mix nodes, on average, it will take three times this value
@@ -68,23 +79,14 @@ pub struct TrafficWasm {

    /// Controls whether the sent sphinx packet use the NON-DEFAULT bigger size.
    pub use_extended_packet_size: bool,
-
-    /// Controls whether the sent packets should use outfox as opposed to the default sphinx.
-    pub use_outfox: bool,
 }

-impl From<TrafficWasm> for ConfigTraffic {
-    fn from(traffic: TrafficWasm) -> Self {
+impl From<Traffic> for ConfigTraffic {
+    fn from(traffic: Traffic) -> Self {
        let use_extended_packet_size = traffic
            .use_extended_packet_size
            .then(|| PacketSize::ExtendedPacket32);

-        let packet_type = if traffic.use_outfox {
-            PacketType::Outfox
-        } else {
-            PacketType::Mix
-        };
-
        ConfigTraffic {
            average_packet_delay: Duration::from_millis(traffic.average_packet_delay_ms),
            message_sending_average_delay: Duration::from_millis(
@@ -94,28 +96,26 @@ impl From<TrafficWasm> for ConfigTraffic {
                .disable_main_poisson_packet_distribution,
            primary_packet_size: PacketSize::RegularPacket,
            secondary_packet_size: use_extended_packet_size,
-            packet_type,
        }
    }
 }

-impl From<ConfigTraffic> for TrafficWasm {
+impl From<ConfigTraffic> for Traffic {
    fn from(traffic: ConfigTraffic) -> Self {
-        TrafficWasm {
+        Traffic {
            average_packet_delay_ms: traffic.average_packet_delay.as_millis() as u64,
            message_sending_average_delay_ms: traffic.message_sending_average_delay.as_millis()
                as u64,
            disable_main_poisson_packet_distribution: traffic
                .disable_main_poisson_packet_distribution,
            use_extended_packet_size: traffic.secondary_packet_size.is_some(),
-            use_outfox: traffic.packet_type == PacketType::Outfox,
        }
    }
 }

 #[wasm_bindgen]
 #[derive(Debug, Copy, Clone)]
-pub struct CoverTrafficWasm {
+pub struct CoverTraffic {
    /// The parameter of Poisson distribution determining how long, on average,
    /// it is going to take for another loop cover traffic message to be sent.
    pub loop_cover_traffic_average_delay_ms: u64,
@@ -129,8 +129,8 @@ pub struct CoverTrafficWasm {
    pub disable_loop_cover_traffic_stream: bool,
 }

-impl From<CoverTrafficWasm> for ConfigCoverTraffic {
-    fn from(cover_traffic: CoverTrafficWasm) -> Self {
+impl From<CoverTraffic> for ConfigCoverTraffic {
+    fn from(cover_traffic: CoverTraffic) -> Self {
        ConfigCoverTraffic {
            loop_cover_traffic_average_delay: Duration::from_millis(
                cover_traffic.loop_cover_traffic_average_delay_ms,
@@ -141,9 +141,9 @@ impl From<CoverTrafficWasm> for ConfigCoverTraffic {
    }
 }

-impl From<ConfigCoverTraffic> for CoverTrafficWasm {
+impl From<ConfigCoverTraffic> for CoverTraffic {
    fn from(cover_traffic: ConfigCoverTraffic) -> Self {
-        CoverTrafficWasm {
+        CoverTraffic {
            loop_cover_traffic_average_delay_ms: cover_traffic
                .loop_cover_traffic_average_delay
                .as_millis() as u64,
@@ -155,14 +155,14 @@ impl From<ConfigCoverTraffic> for CoverTrafficWasm {

 #[wasm_bindgen]
 #[derive(Debug, Copy, Clone)]
-pub struct GatewayConnectionWasm {
+pub struct GatewayConnection {
    /// How long we're willing to wait for a response to a message sent to the gateway,
    /// before giving up on it.
    pub gateway_response_timeout_ms: u64,
 }

-impl From<GatewayConnectionWasm> for ConfigGatewayConnection {
-    fn from(gateway_connection: GatewayConnectionWasm) -> Self {
+impl From<GatewayConnection> for ConfigGatewayConnection {
+    fn from(gateway_connection: GatewayConnection) -> Self {
        ConfigGatewayConnection {
            gateway_response_timeout: Duration::from_millis(
                gateway_connection.gateway_response_timeout_ms,
@@ -171,9 +171,9 @@ impl From<GatewayConnectionWasm> for ConfigGatewayConnection {
    }
 }

-impl From<ConfigGatewayConnection> for GatewayConnectionWasm {
+impl From<ConfigGatewayConnection> for GatewayConnection {
    fn from(gateway_connection: ConfigGatewayConnection) -> Self {
-        GatewayConnectionWasm {
+        GatewayConnection {
            gateway_response_timeout_ms: gateway_connection.gateway_response_timeout.as_millis()
                as u64,
        }
@@ -182,7 +182,7 @@ impl From<ConfigGatewayConnection> for GatewayConnectionWasm {

 #[wasm_bindgen]
 #[derive(Debug, Copy, Clone)]
-pub struct AcknowledgementsWasm {
+pub struct Acknowledgements {
    /// The parameter of Poisson distribution determining how long, on average,
    /// sent acknowledgement is going to be delayed at any given mix node.
    /// So for an ack going through three mix nodes, on average, it will take three times this value
@@ -200,8 +200,8 @@ pub struct AcknowledgementsWasm {
    pub ack_wait_addition_ms: u64,
 }

-impl From<AcknowledgementsWasm> for ConfigAcknowledgements {
-    fn from(acknowledgements: AcknowledgementsWasm) -> Self {
+impl From<Acknowledgements> for ConfigAcknowledgements {
+    fn from(acknowledgements: Acknowledgements) -> Self {
        ConfigAcknowledgements {
            average_ack_delay: Duration::from_millis(acknowledgements.average_ack_delay_ms),
            ack_wait_multiplier: acknowledgements.ack_wait_multiplier,
@@ -210,9 +210,9 @@ impl From<AcknowledgementsWasm> for ConfigAcknowledgements {
    }
 }

-impl From<ConfigAcknowledgements> for AcknowledgementsWasm {
+impl From<ConfigAcknowledgements> for Acknowledgements {
    fn from(acknowledgements: ConfigAcknowledgements) -> Self {
-        AcknowledgementsWasm {
+        Acknowledgements {
            average_ack_delay_ms: acknowledgements.average_ack_delay.as_millis() as u64,
            ack_wait_multiplier: acknowledgements.ack_wait_multiplier,
            ack_wait_addition_ms: acknowledgements.ack_wait_addition.as_millis() as u64,
@@ -222,7 +222,7 @@ impl From<ConfigAcknowledgements> for AcknowledgementsWasm {

 #[wasm_bindgen]
 #[derive(Debug, Copy, Clone)]
-pub struct TopologyWasm {
+pub struct Topology {
    /// The uniform delay every which clients are querying the directory server
    /// to try to obtain a compatible network topology to send sphinx packets through.
    pub topology_refresh_rate_ms: u64,
@@ -238,8 +238,8 @@ pub struct TopologyWasm {
    pub disable_refreshing: bool,
 }

-impl From<TopologyWasm> for ConfigTopology {
-    fn from(topology: TopologyWasm) -> Self {
+impl From<Topology> for ConfigTopology {
+    fn from(topology: Topology) -> Self {
        ConfigTopology {
            topology_refresh_rate: Duration::from_millis(topology.topology_refresh_rate_ms),
            topology_resolution_timeout: Duration::from_millis(
@@ -250,9 +250,9 @@ impl From<TopologyWasm> for ConfigTopology {
    }
 }

-impl From<ConfigTopology> for TopologyWasm {
+impl From<ConfigTopology> for Topology {
    fn from(topology: ConfigTopology) -> Self {
-        TopologyWasm {
+        Topology {
            topology_refresh_rate_ms: topology.topology_refresh_rate.as_millis() as u64,
            topology_resolution_timeout_ms: topology.topology_resolution_timeout.as_millis() as u64,
            disable_refreshing: topology.disable_refreshing,
@@ -262,7 +262,7 @@ impl From<ConfigTopology> for TopologyWasm {

 #[wasm_bindgen]
 #[derive(Debug, Copy, Clone)]
-pub struct ReplySurbsWasm {
+pub struct ReplySurbs {
    /// Defines the minimum number of reply surbs the client wants to keep in its storage at all times.
    /// It can only allow to go below that value if its to request additional reply surbs.
    pub minimum_reply_surb_storage_threshold: usize,
@@ -296,8 +296,8 @@ pub struct ReplySurbsWasm {
    pub maximum_reply_key_age_ms: u64,
 }

-impl From<ReplySurbsWasm> for ConfigReplySurbs {
-    fn from(reply_surbs: ReplySurbsWasm) -> Self {
+impl From<ReplySurbs> for ConfigReplySurbs {
+    fn from(reply_surbs: ReplySurbs) -> Self {
        ConfigReplySurbs {
            minimum_reply_surb_storage_threshold: reply_surbs.minimum_reply_surb_storage_threshold,
            maximum_reply_surb_storage_threshold: reply_surbs.maximum_reply_surb_storage_threshold,
@@ -317,9 +317,9 @@ impl From<ReplySurbsWasm> for ConfigReplySurbs {
    }
 }

-impl From<ConfigReplySurbs> for ReplySurbsWasm {
+impl From<ConfigReplySurbs> for ReplySurbs {
    fn from(reply_surbs: ConfigReplySurbs) -> Self {
-        ReplySurbsWasm {
+        ReplySurbs {
            minimum_reply_surb_storage_threshold: reply_surbs.minimum_reply_surb_storage_threshold,
            maximum_reply_surb_storage_threshold: reply_surbs.maximum_reply_surb_storage_threshold,
            minimum_reply_surb_request_size: reply_surbs.minimum_reply_surb_request_size,
@@ -341,28 +341,28 @@ impl From<ConfigReplySurbs> for ReplySurbsWasm {
 // just a helper structure to more easily pass through the JS boundary
 #[wasm_bindgen]
 #[derive(Debug, Copy, Clone)]
-pub struct DebugWasm {
+pub struct Debug {
    /// Defines all configuration options related to traffic streams.
-    pub traffic: TrafficWasm,
+    pub traffic: Traffic,

    /// Defines all configuration options related to cover traffic stream(s).
-    pub cover_traffic: CoverTrafficWasm,
+    pub cover_traffic: CoverTraffic,

    /// Defines all configuration options related to the gateway connection.
-    pub gateway_connection: GatewayConnectionWasm,
+    pub gateway_connection: GatewayConnection,

    /// Defines all configuration options related to acknowledgements, such as delays or wait timeouts.
-    pub acknowledgements: AcknowledgementsWasm,
+    pub acknowledgements: Acknowledgements,

    /// Defines all configuration options related topology, such as refresh rates or timeouts.
-    pub topology: TopologyWasm,
+    pub topology: Topology,

    /// Defines all configuration options related to reply SURBs.
-    pub reply_surbs: ReplySurbsWasm,
+    pub reply_surbs: ReplySurbs,
 }

-impl From<DebugWasm> for ConfigDebug {
-    fn from(debug: DebugWasm) -> Self {
+impl From<Debug> for ConfigDebug {
+    fn from(debug: Debug) -> Self {
        ConfigDebug {
            traffic: debug.traffic.into(),
            cover_traffic: debug.cover_traffic.into(),
@@ -374,9 +374,9 @@ impl From<DebugWasm> for ConfigDebug {
    }
 }

-impl From<ConfigDebug> for DebugWasm {
+impl From<ConfigDebug> for Debug {
    fn from(debug: ConfigDebug) -> Self {
-        DebugWasm {
+        Debug {
            traffic: debug.traffic.into(),
            cover_traffic: debug.cover_traffic.into(),
            gateway_connection: debug.gateway_connection.into(),
@@ -388,6 +388,6 @@ impl From<ConfigDebug> for DebugWasm {
 }

 #[wasm_bindgen]
-pub fn default_debug() -> DebugWasm {
+pub fn default_debug() -> Debug {
    ConfigDebug::default().into()
 }
@@ -4,28 +4,27 @@
 use self::config::Config;
 use crate::client::helpers::{InputSender, NymClientTestRequest, WasmTopologyExt};
 use crate::client::response_pusher::ResponsePusher;
-use crate::constants::NODE_TESTER_CLIENT_ID;
 use crate::error::WasmClientError;
 use crate::helpers::{
-    parse_recipient, parse_sender_tag, setup_from_topology, setup_gateway_from_api,
-    setup_reply_surb_storage_backend,
+    parse_recipient, parse_sender_tag, setup_new_key_manager, setup_reply_surb_storage_backend,
 };
-use crate::storage::traits::FullWasmClientStorage;
-use crate::storage::ClientStorage;
 use crate::topology::WasmNymTopology;
 use js_sys::Promise;
 use nym_bandwidth_controller::wasm_mockups::{Client as FakeClient, DirectSigningNyxdClient};
+use nym_bandwidth_controller::BandwidthController;
 use nym_client_core::client::base_client::{
-    BaseClientBuilder, ClientInput, ClientOutput, ClientState,
+    BaseClientBuilder, ClientInput, ClientOutput, ClientState, CredentialsToggle,
 };
-use nym_client_core::client::inbound_messages::InputMessage;
-use nym_credential_storage::ephemeral_storage::EphemeralStorage as EphemeralCredentialStorage;
-use nym_sphinx::params::PacketType;
+use nym_client_core::client::replies::reply_storage::browser_backend;
+use nym_client_core::client::{inbound_messages::InputMessage, key_manager::KeyManager};
+use nym_client_core::config::{
+    CoverTraffic, DebugConfig, GatewayEndpointConfig, Topology, Traffic,
+};
+use nym_credential_storage::ephemeral_storage::EphemeralStorage;
 use nym_task::connections::TransmissionLane;
 use nym_task::TaskManager;
 use nym_topology::provider_trait::{HardcodedTopologyProvider, TopologyProvider};
 use nym_topology::NymTopology;
-use nym_validator_client::client::IdentityKey;
 use rand::rngs::OsRng;
 use rand::RngCore;
 use std::sync::Arc;
@@ -50,35 +49,39 @@ pub struct NymClient {
    // even though we don't use graceful shutdowns, other components rely on existence of this struct
    // and if it's dropped, everything will start going offline
    _task_manager: TaskManager,
-
-    packet_type: PacketType,
 }

 #[wasm_bindgen]
 pub struct NymClientBuilder {
    config: Config,
    custom_topology: Option<NymTopology>,
-    preferred_gateway: Option<IdentityKey>,

-    storage_passphrase: Option<String>,
+    /// KeyManager object containing smart pointers to all relevant keys used by the client.
+    key_manager: KeyManager,
+
+    reply_surb_storage_backend: browser_backend::Backend,
+
    on_message: js_sys::Function,
+
+    // unimplemented:
+    bandwidth_controller:
+        Option<BandwidthController<FakeClient<DirectSigningNyxdClient>, EphemeralStorage>>,
+    disabled_credentials: bool,
 }

 #[wasm_bindgen]
 impl NymClientBuilder {
    #[wasm_bindgen(constructor)]
-    pub fn new(
-        config: Config,
-        on_message: js_sys::Function,
-        preferred_gateway: Option<IdentityKey>,
-        storage_passphrase: Option<String>,
-    ) -> Self {
+    pub fn new(config: Config, on_message: js_sys::Function) -> Self {
+        //, key_manager: Option<KeyManager>) {
        NymClientBuilder {
+            reply_surb_storage_backend: setup_reply_surb_storage_backend(config.debug.reply_surbs),
            config,
            custom_topology: None,
-            storage_passphrase,
+            key_manager: setup_new_key_manager(),
            on_message,
-            preferred_gateway,
+            bandwidth_controller: None,
+            disabled_credentials: true,
        }
    }

@@ -87,24 +90,48 @@ impl NymClientBuilder {
    // hardcoded topology
    // NOTE: you most likely want to use `[NymNodeTester]` instead.
    pub fn new_tester(
+        gateway_config: GatewayEndpointConfig,
        topology: WasmNymTopology,
        on_message: js_sys::Function,
-        gateway: Option<IdentityKey>,
    ) -> Self {
-        if let Some(gateway_id) = &gateway {
-            if !topology.ensure_contains_gateway_id(gateway_id) {
-                panic!("the specified topology does not contain the gateway used by the client")
-            }
+        if !topology.ensure_contains(&gateway_config) {
+            panic!("the specified topology does not contain the gateway used by the client")
        }

-        let full_config = Config::new_tester_config(NODE_TESTER_CLIENT_ID);
+        let full_config = Config {
+            id: "ephemeral-id".to_string(),
+            nym_api_url: None,
+            disabled_credentials_mode: true,
+            gateway_endpoint: gateway_config,
+            debug: DebugConfig {
+                traffic: Traffic {
+                    disable_main_poisson_packet_distribution: true,
+                    ..Default::default()
+                },
+                cover_traffic: CoverTraffic {
+                    disable_loop_cover_traffic_stream: true,
+                    ..Default::default()
+                },
+                topology: Topology {
+                    disable_refreshing: true,
+                    ..Default::default()
+                },
+                ..Default::default()
+            },
+        };

        NymClientBuilder {
+            reply_surb_storage_backend: setup_reply_surb_storage_backend(
+                full_config.debug.reply_surbs,
+            ),
            config: full_config,
            custom_topology: Some(topology.into()),
+            // TODO: once we make keys persistent, we'll require some kind of `init` method to generate
+            // a prior shared keypair between the client and the gateway
+            key_manager: setup_new_key_manager(),
            on_message,
-            storage_passphrase: None,
-            preferred_gateway: gateway,
+            bandwidth_controller: None,
+            disabled_credentials: true,
        }
    }

@@ -112,7 +139,7 @@ impl NymClientBuilder {
        ResponsePusher::new(client_output, on_message).start()
    }

-    fn topology_provider(&mut self) -> Option<Box<dyn TopologyProvider + Send + Sync>> {
+    fn topology_provider(&mut self) -> Option<Box<dyn TopologyProvider>> {
        if let Some(hardcoded_topology) = self.custom_topology.take() {
            Some(Box::new(HardcodedTopologyProvider::new(hardcoded_topology)))
        } else {
@@ -120,49 +147,36 @@ impl NymClientBuilder {
        }
    }

-    fn initialise_storage(config: &Config, base_storage: ClientStorage) -> FullWasmClientStorage {
-        FullWasmClientStorage {
-            keys_and_gateway_store: base_storage,
-            reply_storage: setup_reply_surb_storage_backend(config.base.debug.reply_surbs),
-            credential_storage: EphemeralCredentialStorage::default(),
-        }
-    }
-
    async fn start_client_async(mut self) -> Result<NymClient, WasmClientError> {
        console_log!("Starting the wasm client");

-        let nym_api_endpoints = self.config.base.client.nym_api_urls.clone();
-
-        // TODO: this will have to be re-used for surbs. but this is a problem for another PR.
-        let client_store =
-            ClientStorage::new_async(&self.config.base.client.id, self.storage_passphrase.take())
-                .await?;
-
-        let user_chosen = self.preferred_gateway.clone();
-
-        // if we provided hardcoded topology, get gateway from it, otherwise get it the 'standard' way
-        if let Some(topology) = &self.custom_topology {
-            setup_from_topology(user_chosen, topology, &client_store).await?
-        } else {
-            setup_gateway_from_api(&client_store, user_chosen, &nym_api_endpoints).await?
-        };
-
-        let packet_type = self.config.base.debug.traffic.packet_type;
-        let storage = Self::initialise_storage(&self.config, client_store);
        let maybe_topology_provider = self.topology_provider();

-        let mut base_builder: BaseClientBuilder<_, FullWasmClientStorage> =
-            BaseClientBuilder::<FakeClient<DirectSigningNyxdClient>, _>::new(
-                &self.config.base,
-                storage,
-                None,
-            );
+        let disabled_credentials = if self.disabled_credentials {
+            CredentialsToggle::Disabled
+        } else {
+            CredentialsToggle::Enabled
+        };
+
+        let nym_api_endpoints = match self.config.nym_api_url {
+            Some(endpoint) => vec![endpoint],
+            None => Vec::new(),
+        };
+        let mut base_builder = BaseClientBuilder::new(
+            &self.config.gateway_endpoint,
+            &self.config.debug,
+            self.key_manager,
+            self.bandwidth_controller,
+            self.reply_surb_storage_backend,
+            disabled_credentials,
+            nym_api_endpoints,
+        );
        if let Some(topology_provider) = maybe_topology_provider {
            base_builder = base_builder.with_topology_provider(topology_provider);
        }

+        let self_address = base_builder.as_mix_recipient().to_string();
        let mut started_client = base_builder.start_base().await?;
-        let self_address = started_client.address.to_string();

        let client_input = started_client.client_input.register_producer();
        let client_output = started_client.client_output.register_consumer();
@@ -175,7 +189,6 @@ impl NymClientBuilder {
            client_state: Arc::new(started_client.client_state),
            _full_topology: None,
            _task_manager: started_client.task_manager,
-            packet_type,
        })
    }

@@ -189,27 +202,16 @@ impl NymClient {
    async fn _new(
        config: Config,
        on_message: js_sys::Function,
-        preferred_gateway: Option<IdentityKey>,
-        storage_passphrase: Option<String>,
    ) -> Result<NymClient, WasmClientError> {
-        NymClientBuilder::new(config, on_message, preferred_gateway, storage_passphrase)
+        NymClientBuilder::new(config, on_message)
            .start_client_async()
            .await
    }

    #[wasm_bindgen(constructor)]
    #[allow(clippy::new_ret_no_self)]
-    pub fn new(
-        config: Config,
-        on_message: js_sys::Function,
-        preferred_gateway: Option<IdentityKey>,
-        storage_passphrase: Option<String>,
-    ) -> Promise {
-        future_to_promise(async move {
-            Self::_new(config, on_message, preferred_gateway, storage_passphrase)
-                .await
-                .into_promise_result()
-        })
+    pub fn new(config: Config, on_message: js_sys::Function) -> Promise {
+        future_to_promise(async move { Self::_new(config, on_message).await.into_promise_result() })
    }

    pub fn self_address(&self) -> String {
@@ -253,7 +255,7 @@ impl NymClient {
        let input_msgs = request
            .test_msgs
            .into_iter()
-            .map(|p| InputMessage::new_regular(recipient, p, lane, None))
+            .map(|p| InputMessage::new_regular(recipient, p, lane))
            .collect();

        self.client_input.send_messages(input_msgs)
@@ -273,7 +275,7 @@ impl NymClient {

        let lane = TransmissionLane::General;

-        let input_msg = InputMessage::new_regular(recipient, message, lane, Some(self.packet_type));
+        let input_msg = InputMessage::new_regular(recipient, message, lane);
        self.client_input.send_message(input_msg)
    }

@@ -300,13 +302,7 @@ impl NymClient {

        let lane = TransmissionLane::General;

-        let input_msg = InputMessage::new_anonymous(
-            recipient,
-            message,
-            reply_surbs,
-            lane,
-            Some(self.packet_type),
-        );
+        let input_msg = InputMessage::new_anonymous(recipient, message, reply_surbs, lane);
        self.client_input.send_message(input_msg)
    }

@@ -324,7 +320,7 @@ impl NymClient {

        let lane = TransmissionLane::General;

-        let input_msg = InputMessage::new_reply(sender_tag, message, lane, Some(self.packet_type));
+        let input_msg = InputMessage::new_reply(sender_tag, message, lane);
        self.client_input.send_message(input_msg)
    }
 }
@@ -1,5 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-pub(crate) const NODE_TESTER_ID: &str = "_nym-node-tester";
-pub(crate) const NODE_TESTER_CLIENT_ID: &str = "_nym-node-tester-client";
@@ -1,17 +1,14 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::storage::errors::ClientStorageError;
 use crate::topology::WasmTopologyError;
 use js_sys::Promise;
-use nym_client_core::config::GatewayEndpointConfig;
 use nym_client_core::error::ClientCoreError;
 use nym_crypto::asymmetric::identity::Ed25519RecoveryError;
 use nym_gateway_client::error::GatewayClientError;
 use nym_node_tester_utils::error::NetworkTestingError;
 use nym_sphinx::addressing::clients::RecipientFormattingError;
 use nym_sphinx::anonymous_replies::requests::InvalidAnonymousSenderTagRepresentation;
-use nym_topology::NymTopologyError;
 use nym_validator_client::ValidatorClientError;
 use thiserror::Error;
 use wasm_bindgen::JsValue;
@@ -46,18 +43,12 @@ pub enum WasmClientError {
        source: ValidatorClientError,
    },

-    #[error("The provided wasm topology was invalid: {source}")]
+    #[error("The provided topology was invalid: {source}")]
    WasmTopologyError {
        #[from]
        source: WasmTopologyError,
    },

-    #[error("The provided nym topology was invalid: {source}")]
-    TopologyError {
-        #[from]
-        source: NymTopologyError,
-    },
-
    #[error("failed to test the node: {source}")]
    NodeTestingFailure {
        #[from]
@@ -76,9 +67,6 @@ pub enum WasmClientError {
    #[error("Mixnode {mixnode_identity} is not present in the current network topology")]
    NonExistentMixnode { mixnode_identity: String },

-    #[error("Gateway {gateway_identity} is not present in the current network topology")]
-    NonExistentGateway { gateway_identity: String },
-
    #[error("{raw} is not a valid Nym network recipient: {source}")]
    MalformedRecipient {
        raw: String,
@@ -90,17 +78,6 @@ pub enum WasmClientError {
        raw: String,
        source: InvalidAnonymousSenderTagRepresentation,
    },
-
-    #[error(transparent)]
-    StorageError {
-        #[from]
-        source: ClientStorageError,
-    },
-
-    #[error("this client has already registered with a gateway: {gateway_config:?}")]
-    AlreadyRegistered {
-        gateway_config: GatewayEndpointConfig,
-    },
 }

 impl WasmClientError {
@@ -2,26 +2,29 @@
 // SPDX-License-Identifier: Apache-2.0

 use crate::error::WasmClientError;
-use crate::storage::ClientStorage;
 use crate::topology::WasmNymTopology;
 use js_sys::Promise;
+use nym_client_core::client::key_manager::KeyManager;
 use nym_client_core::client::replies::reply_storage::browser_backend;
 use nym_client_core::config;
-use nym_client_core::init::helpers::current_gateways;
-use nym_client_core::init::{setup_gateway_from, GatewaySetup, InitialisationDetails};
 use nym_sphinx::addressing::clients::Recipient;
 use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag;
-use nym_topology::{gateway, NymTopology};
-use nym_validator_client::client::IdentityKey;
+use nym_topology::NymTopology;
 use nym_validator_client::NymApiClient;
-use rand::thread_rng;
+use rand::rngs::OsRng;
 use url::Url;
 use wasm_bindgen::prelude::wasm_bindgen;
 use wasm_bindgen_futures::future_to_promise;
-use wasm_utils::PromisableResult;
+use wasm_utils::{console_log, PromisableResult};
+
+pub(crate) fn setup_new_key_manager() -> KeyManager {
+    let mut rng = OsRng;
+    console_log!("generated new set of keys");
+    KeyManager::new(&mut rng)
+}

 // don't get too excited about the name, under the hood it's just a big fat placeholder
-// with no disk_persistence
+// with no persistence
 pub(crate) fn setup_reply_surb_storage_backend(
    config: config::ReplySurbs,
 ) -> browser_backend::Backend {
@@ -77,38 +80,3 @@ pub fn current_network_topology(nym_api_url: String) -> Promise {
            .into_promise_result()
    })
 }
-
-async fn setup_gateway(
-    client_store: &ClientStorage,
-    chosen_gateway: Option<IdentityKey>,
-    gateways: &[gateway::Node],
-) -> Result<InitialisationDetails, WasmClientError> {
-    let setup = if client_store.has_full_gateway_info().await? {
-        GatewaySetup::MustLoad
-    } else {
-        GatewaySetup::new_fresh(chosen_gateway.clone(), None)
-    };
-
-    setup_gateway_from(&setup, client_store, client_store, false, Some(gateways))
-        .await
-        .map_err(Into::into)
-}
-
-pub(crate) async fn setup_gateway_from_api(
-    client_store: &ClientStorage,
-    chosen_gateway: Option<IdentityKey>,
-    nym_apis: &[Url],
-) -> Result<InitialisationDetails, WasmClientError> {
-    let mut rng = thread_rng();
-    let gateways = current_gateways(&mut rng, nym_apis).await?;
-    setup_gateway(client_store, chosen_gateway, &gateways).await
-}
-
-pub(crate) async fn setup_from_topology(
-    explicit_gateway: Option<IdentityKey>,
-    topology: &NymTopology,
-    client_store: &ClientStorage,
-) -> Result<InitialisationDetails, WasmClientError> {
-    let gateways = topology.gateways();
-    setup_gateway(client_store, explicit_gateway, gateways).await
-}
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

 use wasm_bindgen::prelude::*;
@@ -12,8 +12,6 @@ pub mod error;
 #[cfg(target_arch = "wasm32")]
 pub mod gateway_selector;
 #[cfg(target_arch = "wasm32")]
-pub mod storage;
-#[cfg(target_arch = "wasm32")]
 pub mod tester;
 #[cfg(target_arch = "wasm32")]
 pub mod topology;
@@ -23,8 +21,6 @@ pub mod validation;
 #[cfg(target_arch = "wasm32")]
 mod helpers;

-mod constants;
-
 #[wasm_bindgen]
 pub fn set_panic_hook() {
    // When the `console_error_panic_hook` feature is enabled, we can call the
@@ -1,28 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use thiserror::Error;
-use wasm_bindgen::JsValue;
-use wasm_utils::simple_js_error;
-use wasm_utils::storage::error::StorageError;
-
-#[derive(Debug, Error)]
-pub enum ClientStorageError {
-    #[error("failed to use the storage: {source}")]
-    StorageError {
-        #[from]
-        source: StorageError,
-    },
-
-    #[error("{typ} cryptographic key is not available in storage")]
-    CryptoKeyNotInStorage { typ: String },
-
-    #[error("the prior gateway details are not available in the storage")]
-    GatewayDetailsNotInStorage,
-}
-
-impl From<ClientStorageError> for JsValue {
-    fn from(value: ClientStorageError) -> Self {
-        simple_js_error(value.to_string())
-    }
-}
@@ -1,294 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::client::config::Config;
-use crate::storage::errors::ClientStorageError;
-use js_sys::Promise;
-use nym_client_core::client::base_client::storage::gateway_details::PersistedGatewayDetails;
-use nym_crypto::asymmetric::{encryption, identity};
-use nym_gateway_client::SharedKeys;
-use nym_sphinx::acknowledgements::AckKey;
-use std::sync::Arc;
-use wasm_bindgen::prelude::*;
-use wasm_bindgen_futures::future_to_promise;
-use wasm_utils::storage::{IdbVersionChangeEvent, WasmStorage};
-use wasm_utils::PromisableResult;
-use zeroize::Zeroizing;
-
-pub(crate) mod errors;
-pub(crate) mod traits;
-
-const STORAGE_NAME_PREFIX: &str = "wasm-client-storage";
-const STORAGE_VERSION: u32 = 1;
-
-// v1 tables
-mod v1 {
-    // stores
-    pub const KEYS_STORE: &str = "keys";
-    pub const CORE_STORE: &str = "core";
-
-    // keys
-    pub const CONFIG: &str = "config";
-    pub const GATEWAY_DETAILS: &str = "gateway_details";
-
-    pub const ED25519_IDENTITY_KEYPAIR: &str = "ed25519_identity_keypair";
-    pub const X25519_ENCRYPTION_KEYPAIR: &str = "x25519_encryption_keypair";
-
-    // TODO: for those we could actually use the subtle crypto storage
-    pub const AES128CTR_ACK_KEY: &str = "aes128ctr_ack_key";
-    pub const AES128CTR_BLAKE3_HMAC_GATEWAY_KEYS: &str = "aes128ctr_blake3_hmac_gateway_keys";
-}
-
-#[wasm_bindgen]
-pub struct ClientStorage {
-    #[allow(dead_code)]
-    pub(crate) name: String,
-    pub(crate) inner: Arc<WasmStorage>,
-}
-
-#[wasm_bindgen]
-impl ClientStorage {
-    fn db_name(client_id: &str) -> String {
-        format!("{STORAGE_NAME_PREFIX}-{client_id}")
-    }
-
-    pub(crate) async fn new_async(
-        client_id: &str,
-        passphrase: Option<String>,
-    ) -> Result<Self, ClientStorageError> {
-        let name = Self::db_name(client_id);
-
-        // make sure the password is zeroized when no longer used, especially if we error out.
-        // special care must be taken on JS side to ensure it's correctly used there.
-        let passphrase = Zeroizing::new(passphrase);
-
-        let migrate_fn = Some(|evt: &IdbVersionChangeEvent| -> Result<(), JsValue> {
-            // Even if the web-sys bindings expose the version as a f64, the IndexedDB API
-            // works with an unsigned integer.
-            // See <https://github.com/rustwasm/wasm-bindgen/issues/1149>
-            let old_version = evt.old_version() as u32;
-
-            if old_version < 1 {
-                // migrating to version 1
-                let db = evt.db();
-
-                db.create_object_store(v1::KEYS_STORE)?;
-                db.create_object_store(v1::CORE_STORE)?;
-            }
-
-            Ok(())
-        });
-
-        let inner = WasmStorage::new(
-            &name,
-            STORAGE_VERSION,
-            migrate_fn,
-            passphrase.as_ref().map(|p| p.as_bytes()),
-        )
-        .await?;
-
-        Ok(ClientStorage {
-            inner: Arc::new(inner),
-            name,
-        })
-    }
-
-    #[wasm_bindgen(constructor)]
-    #[allow(clippy::new_ret_no_self)]
-    pub fn new(client_id: String, passphrase: String) -> Promise {
-        future_to_promise(async move {
-            Self::new_async(&client_id, Some(passphrase))
-                .await
-                .into_promise_result()
-        })
-    }
-
-    pub fn new_unencrypted(client_id: String) -> Promise {
-        future_to_promise(async move {
-            Self::new_async(&client_id, None)
-                .await
-                .into_promise_result()
-        })
-    }
-
-    // TODO: persist client's config
-    #[allow(dead_code)]
-    pub(crate) async fn read_config(&self) -> Result<Option<Config>, ClientStorageError> {
-        self.inner
-            .read_value(v1::CORE_STORE, JsValue::from_str(v1::CONFIG))
-            .await
-            .map_err(Into::into)
-    }
-
-    pub(crate) async fn may_read_gateway_details(
-        &self,
-    ) -> Result<Option<PersistedGatewayDetails>, ClientStorageError> {
-        self.inner
-            .read_value(v1::CORE_STORE, JsValue::from_str(v1::GATEWAY_DETAILS))
-            .await
-            .map_err(Into::into)
-    }
-
-    pub(crate) async fn must_read_gateway_details(
-        &self,
-    ) -> Result<PersistedGatewayDetails, ClientStorageError> {
-        self.may_read_gateway_details()
-            .await?
-            .ok_or(ClientStorageError::GatewayDetailsNotInStorage)
-    }
-
-    async fn may_read_identity_keypair(
-        &self,
-    ) -> Result<Option<identity::KeyPair>, ClientStorageError> {
-        self.inner
-            .read_value(
-                v1::KEYS_STORE,
-                JsValue::from_str(v1::ED25519_IDENTITY_KEYPAIR),
-            )
-            .await
-            .map_err(Into::into)
-    }
-
-    async fn may_read_encryption_keypair(
-        &self,
-    ) -> Result<Option<encryption::KeyPair>, ClientStorageError> {
-        self.inner
-            .read_value(
-                v1::KEYS_STORE,
-                JsValue::from_str(v1::X25519_ENCRYPTION_KEYPAIR),
-            )
-            .await
-            .map_err(Into::into)
-    }
-
-    async fn may_read_ack_key(&self) -> Result<Option<AckKey>, ClientStorageError> {
-        self.inner
-            .read_value(v1::KEYS_STORE, JsValue::from_str(v1::AES128CTR_ACK_KEY))
-            .await
-            .map_err(Into::into)
-    }
-
-    async fn may_read_gateway_shared_key(&self) -> Result<Option<SharedKeys>, ClientStorageError> {
-        self.inner
-            .read_value(
-                v1::KEYS_STORE,
-                JsValue::from_str(v1::AES128CTR_BLAKE3_HMAC_GATEWAY_KEYS),
-            )
-            .await
-            .map_err(Into::into)
-    }
-
-    async fn must_read_identity_keypair(&self) -> Result<identity::KeyPair, ClientStorageError> {
-        self.may_read_identity_keypair()
-            .await?
-            .ok_or(ClientStorageError::CryptoKeyNotInStorage {
-                typ: v1::ED25519_IDENTITY_KEYPAIR.to_string(),
-            })
-    }
-
-    async fn must_read_encryption_keypair(
-        &self,
-    ) -> Result<encryption::KeyPair, ClientStorageError> {
-        self.may_read_encryption_keypair()
-            .await?
-            .ok_or(ClientStorageError::CryptoKeyNotInStorage {
-                typ: v1::X25519_ENCRYPTION_KEYPAIR.to_string(),
-            })
-    }
-
-    async fn must_read_ack_key(&self) -> Result<AckKey, ClientStorageError> {
-        self.may_read_ack_key()
-            .await?
-            .ok_or(ClientStorageError::CryptoKeyNotInStorage {
-                typ: v1::AES128CTR_ACK_KEY.to_string(),
-            })
-    }
-
-    async fn must_read_gateway_shared_key(&self) -> Result<SharedKeys, ClientStorageError> {
-        self.may_read_gateway_shared_key()
-            .await?
-            .ok_or(ClientStorageError::CryptoKeyNotInStorage {
-                typ: v1::AES128CTR_BLAKE3_HMAC_GATEWAY_KEYS.to_string(),
-            })
-    }
-
-    async fn store_identity_keypair(
-        &self,
-        keypair: &identity::KeyPair,
-    ) -> Result<(), ClientStorageError> {
-        self.inner
-            .store_value(
-                v1::KEYS_STORE,
-                JsValue::from_str(v1::ED25519_IDENTITY_KEYPAIR),
-                keypair,
-            )
-            .await
-            .map_err(Into::into)
-    }
-
-    async fn store_encryption_keypair(
-        &self,
-        keypair: &encryption::KeyPair,
-    ) -> Result<(), ClientStorageError> {
-        self.inner
-            .store_value(
-                v1::KEYS_STORE,
-                JsValue::from_str(v1::X25519_ENCRYPTION_KEYPAIR),
-                keypair,
-            )
-            .await
-            .map_err(Into::into)
-    }
-
-    async fn store_ack_key(&self, key: &AckKey) -> Result<(), ClientStorageError> {
-        self.inner
-            .store_value(
-                v1::KEYS_STORE,
-                JsValue::from_str(v1::AES128CTR_ACK_KEY),
-                key,
-            )
-            .await
-            .map_err(Into::into)
-    }
-
-    async fn store_gateway_shared_key(&self, key: &SharedKeys) -> Result<(), ClientStorageError> {
-        self.inner
-            .store_value(
-                v1::KEYS_STORE,
-                JsValue::from_str(v1::AES128CTR_BLAKE3_HMAC_GATEWAY_KEYS),
-                key,
-            )
-            .await
-            .map_err(Into::into)
-    }
-
-    pub(crate) async fn store_gateway_details(
-        &self,
-        gateway_endpoint: &PersistedGatewayDetails,
-    ) -> Result<(), ClientStorageError> {
-        self.inner
-            .store_value(
-                v1::CORE_STORE,
-                JsValue::from_str(v1::GATEWAY_DETAILS),
-                gateway_endpoint,
-            )
-            .await
-            .map_err(Into::into)
-    }
-
-    // TODO: persist client's config
-    #[allow(dead_code)]
-    pub(crate) async fn store_config(&self, config: &Config) -> Result<(), ClientStorageError> {
-        self.inner
-            .store_value(v1::CORE_STORE, JsValue::from_str(v1::CONFIG), config)
-            .await
-            .map_err(Into::into)
-    }
-
-    pub(crate) async fn has_full_gateway_info(&self) -> Result<bool, ClientStorageError> {
-        let has_keys = self.may_read_gateway_shared_key().await?.is_some();
-        let has_details = self.may_read_gateway_details().await?.is_some();
-
-        Ok(has_keys && has_details)
-    }
-}
@@ -1,101 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::storage::errors::ClientStorageError;
-use crate::storage::ClientStorage;
-use async_trait::async_trait;
-use nym_client_core::client::base_client::storage::gateway_details::{
-    GatewayDetailsStore, PersistedGatewayDetails,
-};
-use nym_client_core::client::base_client::storage::MixnetClientStorage;
-use nym_client_core::client::key_manager::persistence::KeyStore;
-use nym_client_core::client::key_manager::KeyManager;
-use nym_client_core::client::replies::reply_storage::browser_backend;
-use nym_credential_storage::ephemeral_storage::EphemeralStorage as EphemeralCredentialStorage;
-use wasm_utils::console_log;
-
-// temporary until other variants are properly implemented (probably it should get changed into `ClientStorage`
-// implementing all traits and everything getting combined
-pub struct FullWasmClientStorage {
-    pub(crate) keys_and_gateway_store: ClientStorage,
-    pub(crate) reply_storage: browser_backend::Backend,
-    pub(crate) credential_storage: EphemeralCredentialStorage,
-}
-
-impl MixnetClientStorage for FullWasmClientStorage {
-    type KeyStore = ClientStorage;
-    type ReplyStore = browser_backend::Backend;
-    type CredentialStore = EphemeralCredentialStorage;
-
-    type GatewayDetailsStore = ClientStorage;
-
-    fn into_runtime_stores(self) -> (Self::ReplyStore, Self::CredentialStore) {
-        (self.reply_storage, self.credential_storage)
-    }
-
-    fn key_store(&self) -> &Self::KeyStore {
-        &self.keys_and_gateway_store
-    }
-
-    fn reply_store(&self) -> &Self::ReplyStore {
-        &self.reply_storage
-    }
-
-    fn credential_store(&self) -> &Self::CredentialStore {
-        &self.credential_storage
-    }
-
-    fn gateway_details_store(&self) -> &Self::GatewayDetailsStore {
-        &self.keys_and_gateway_store
-    }
-}
-
-#[async_trait(?Send)]
-impl KeyStore for ClientStorage {
-    type StorageError = ClientStorageError;
-
-    async fn load_keys(&self) -> Result<KeyManager, Self::StorageError> {
-        console_log!("attempting to load cryptographic keys...");
-
-        // all keys implement `ZeroizeOnDrop`, so if we return an Error, whatever was already loaded will be cleared
-        let identity_keypair = self.must_read_identity_keypair().await?;
-        let encryption_keypair = self.must_read_encryption_keypair().await?;
-        let ack_keypair = self.must_read_ack_key().await?;
-        let gateway_shared_key = self.must_read_gateway_shared_key().await?;
-
-        Ok(KeyManager::from_keys(
-            identity_keypair,
-            encryption_keypair,
-            gateway_shared_key,
-            ack_keypair,
-        ))
-    }
-
-    async fn store_keys(&self, keys: &KeyManager) -> Result<(), Self::StorageError> {
-        console_log!("attempting to store cryptographic keys...");
-
-        self.store_identity_keypair(&keys.identity_keypair())
-            .await?;
-        self.store_encryption_keypair(&keys.encryption_keypair())
-            .await?;
-        self.store_ack_key(&keys.ack_key()).await?;
-        self.store_gateway_shared_key(&keys.gateway_shared_key())
-            .await
-    }
-}
-
-#[async_trait(?Send)]
-impl GatewayDetailsStore for ClientStorage {
-    type StorageError = ClientStorageError;
-
-    async fn load_gateway_details(&self) -> Result<PersistedGatewayDetails, Self::StorageError> {
-        self.must_read_gateway_details().await
-    }
-
-    async fn store_gateway_details(
-        &self,
-        details: &PersistedGatewayDetails,
-    ) -> Result<(), Self::StorageError> {
-        self.store_gateway_details(details).await
-    }
-}
@@ -4,9 +4,6 @@
 // due to expansion of #[wasm_bindgen] macro on NodeTestResult
 #![allow(clippy::drop_non_drop)]

-use crate::error::WasmClientError;
-use crate::tester::LockedGatewayClient;
-use js_sys::Promise;
 use nym_node_tester_utils::processor::Received;
 use nym_node_tester_utils::receiver::ReceivedReceiver;
 use serde::{Deserialize, Serialize};
@@ -15,7 +12,6 @@ use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
 use tokio::sync::{Mutex as AsyncMutex, MutexGuard as AsyncMutexGuard};
 use wasm_bindgen::prelude::*;
-use wasm_bindgen_futures::future_to_promise;
 use wasm_utils::{console_log, console_warn};

 #[derive(Clone)]
@@ -111,37 +107,3 @@ impl Drop for TestMarker {
        self.value.store(false, Ordering::SeqCst)
    }
 }
-
-pub(crate) trait GatewayReconnection {
-    fn disconnect_from_gateway(&self) -> Promise;
-
-    fn reconnect_to_gateway(&self) -> Promise;
-}
-
-impl GatewayReconnection for LockedGatewayClient {
-    fn disconnect_from_gateway(&self) -> Promise {
-        let this = self.clone();
-
-        future_to_promise(async move {
-            let mut guard = this.lock().await;
-            guard
-                .disconnect()
-                .await
-                .map_err(|err| JsValue::from(WasmClientError::from(err)))?;
-            Ok(JsValue::undefined())
-        })
-    }
-
-    fn reconnect_to_gateway(&self) -> Promise {
-        let this = self.clone();
-
-        future_to_promise(async move {
-            let mut guard = this.lock().await;
-            guard
-                .try_reconnect()
-                .await
-                .map_err(|err| JsValue::from(WasmClientError::from(err)))?;
-            Ok(JsValue::undefined())
-        })
-    }
-}
@@ -1,22 +1,21 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::constants::NODE_TESTER_ID;
 use crate::error::WasmClientError;
-use crate::helpers::{current_network_topology_async, setup_from_topology};
-use crate::storage::ClientStorage;
+use crate::helpers::{current_network_topology_async, setup_new_key_manager};
 use crate::tester::ephemeral_receiver::EphemeralTestReceiver;
 use crate::tester::helpers::{
-    GatewayReconnection, NodeTestResult, ReceivedReceiverWrapper, TestMarker, WasmTestMessageExt,
+    NodeTestResult, ReceivedReceiverWrapper, TestMarker, WasmTestMessageExt,
 };
 use crate::topology::WasmNymTopology;
 use futures::channel::mpsc;
 use js_sys::Promise;
 use nym_bandwidth_controller::wasm_mockups::{Client as FakeClient, DirectSigningNyxdClient};
 use nym_bandwidth_controller::BandwidthController;
-use nym_client_core::client::key_manager::ManagedKeys;
-use nym_client_core::init::InitialisationDetails;
+use nym_client_core::client::key_manager::KeyManager;
+use nym_client_core::config::GatewayEndpointConfig;
 use nym_credential_storage::ephemeral_storage::EphemeralStorage;
+use nym_crypto::asymmetric::identity;
 use nym_gateway_client::GatewayClient;
 use nym_node_tester_utils::receiver::SimpleMessageReceiver;
 use nym_node_tester_utils::{NodeTester, TestMessage};
@@ -26,7 +25,6 @@ use nym_sphinx::params::PacketSize;
 use nym_sphinx::preparer::PreparedFragment;
 use nym_task::TaskManager;
 use nym_topology::NymTopology;
-use nym_validator_client::client::IdentityKey;
 use rand::rngs::OsRng;
 use std::collections::HashSet;
 use std::sync::atomic::{AtomicBool, AtomicU32, Ordering};
@@ -35,7 +33,7 @@ use std::time::Duration;
 use tokio::sync::Mutex as AsyncMutex;
 use wasm_bindgen::prelude::*;
 use wasm_bindgen_futures::future_to_promise;
-use wasm_utils::{check_promise_result, console_log, PromisableResult};
+use wasm_utils::{check_promise_result, console_log, console_warn, PromisableResult};

 mod ephemeral_receiver;
 pub(crate) mod helpers;
@@ -72,20 +70,22 @@ pub struct NymNodeTester {

 #[wasm_bindgen]
 pub struct NymNodeTesterBuilder {
-    gateway: Option<IdentityKey>,
-    id: Option<String>,
+    gateway_config: GatewayEndpointConfig,

    base_topology: NymTopology,

+    /// KeyManager object containing smart pointers to all relevant keys used by the client.
+    key_manager: KeyManager,
+
    // unimplemented
    bandwidth_controller:
        Option<BandwidthController<FakeClient<DirectSigningNyxdClient>, EphemeralStorage>>,
 }

-fn address(keys: &ManagedKeys, gateway_identity: NodeIdentity) -> Recipient {
+fn address(keys: &KeyManager, gateway_identity: NodeIdentity) -> Recipient {
    Recipient::new(
-        *keys.identity_public_key(),
-        *keys.encryption_public_key(),
+        *keys.identity_keypair().public_key(),
+        *keys.encryption_keypair().public_key(),
        gateway_identity,
    )
 }
@@ -94,74 +94,57 @@ fn address(keys: &ManagedKeys, gateway_identity: NodeIdentity) -> Recipient {
 impl NymNodeTesterBuilder {
    #[wasm_bindgen(constructor)]
    pub fn new(
+        gateway_config: GatewayEndpointConfig,
        base_topology: WasmNymTopology,
-        id: Option<String>,
-        gateway: Option<IdentityKey>,
    ) -> NymNodeTesterBuilder {
        NymNodeTesterBuilder {
-            id,
-            gateway,
+            gateway_config,
            base_topology: base_topology.into(),
+            key_manager: setup_new_key_manager(),
            bandwidth_controller: None,
        }
    }

    async fn _new_with_api(
+        gateway_config: GatewayEndpointConfig,
        api_url: String,
-        id: Option<String>,
-        gateway: Option<IdentityKey>,
    ) -> Result<Self, WasmClientError> {
        let topology = current_network_topology_async(api_url).await?;
-        Ok(NymNodeTesterBuilder::new(topology, id, gateway))
+        Ok(NymNodeTesterBuilder::new(gateway_config, topology))
    }

-    pub fn new_with_api(
-        api_url: String,
-        id: Option<String>,
-        gateway: Option<IdentityKey>,
-    ) -> Promise {
+    pub fn new_with_api(gateway_config: GatewayEndpointConfig, api_url: String) -> Promise {
        future_to_promise(async move {
-            Self::_new_with_api(api_url, id, gateway)
+            Self::_new_with_api(gateway_config, api_url)
                .await
                .into_promise_result()
        })
    }

-    async fn gateway_info(
-        &self,
-        client_store: &ClientStorage,
-    ) -> Result<InitialisationDetails, WasmClientError> {
-        if let Ok(loaded) = InitialisationDetails::try_load(client_store, client_store).await {
-            Ok(loaded)
-        } else {
-            setup_from_topology(self.gateway.clone(), &self.base_topology, client_store).await
-        }
-    }
-
    async fn _setup_client(mut self) -> Result<NymNodeTester, WasmClientError> {
+        let rng = OsRng;
        let task_manager = TaskManager::default();

-        let storage_id = if let Some(client_id) = &self.id {
-            format!("{NODE_TESTER_ID}-{client_id}")
+        let gateway_identity =
+            identity::PublicKey::from_base58_string(self.gateway_config.gateway_id)
+                .map_err(|source| WasmClientError::InvalidGatewayIdentity { source })?;
+
+        // we **REALLY** need persistence...
+        let shared_key = if self.key_manager.is_gateway_key_set() {
+            Some(self.key_manager.gateway_shared_key())
        } else {
-            NODE_TESTER_ID.to_owned()
+            console_warn!("Gateway key not set - will derive a fresh one.");
+            None
        };

-        let client_store = ClientStorage::new_async(&storage_id, None).await?;
-
-        let init_details = self.gateway_info(&client_store).await?;
-        let gateway_endpoint = init_details.gateway_details;
-        let gateway_identity = gateway_endpoint.try_get_gateway_identity_key()?;
-        let managed_keys = init_details.managed_keys;
-
        let (mixnet_message_sender, mixnet_message_receiver) = mpsc::unbounded();
        let (ack_sender, ack_receiver) = mpsc::unbounded();

        let mut gateway_client = GatewayClient::new(
-            gateway_endpoint.gateway_listener,
-            managed_keys.identity_keypair(),
+            self.gateway_config.gateway_listener,
+            self.key_manager.identity_keypair(),
            gateway_identity,
-            Some(managed_keys.must_get_gateway_shared_key()),
+            shared_key,
            mixnet_message_sender,
            ack_sender,
            Duration::from_secs(10),
@@ -170,24 +153,27 @@ impl NymNodeTesterBuilder {
        );

        gateway_client.set_disabled_credentials_mode(true);
-        gateway_client.authenticate_and_start().await?;
+        let shared_keys = gateway_client.authenticate_and_start().await?;
+
+        // currently pointless but might as well do it for the future ¯\_(ツ)_/¯
+        self.key_manager.insert_gateway_shared_key(shared_keys);

        // TODO: make those values configurable later
        let tester = NodeTester::new(
-            OsRng,
+            rng,
            self.base_topology,
-            Some(address(&managed_keys, gateway_identity)),
+            Some(address(&self.key_manager, gateway_identity)),
            PacketSize::default(),
            Duration::from_millis(5),
            Duration::from_millis(5),
-            managed_keys.ack_key(),
+            self.key_manager.ack_key(),
        );

        let (processed_sender, processed_receiver) = mpsc::unbounded();

        let mut receiver = SimpleMessageReceiver::new_sphinx_receiver(
-            managed_keys.encryption_keypair(),
-            managed_keys.ack_key(),
+            self.key_manager.encryption_keypair(),
+            self.key_manager.ack_key(),
            mixnet_message_receiver,
            ack_receiver,
            processed_sender,
@@ -248,46 +234,29 @@ async fn test_mixnode(
 impl NymNodeTester {
    #[wasm_bindgen(constructor)]
    #[allow(clippy::new_ret_no_self)]
-    pub fn new(
-        topology: WasmNymTopology,
-        id: Option<String>,
-        gateway: Option<IdentityKey>,
-    ) -> Promise {
+    pub fn new(gateway_config: GatewayEndpointConfig, topology: WasmNymTopology) -> Promise {
        console_log!("constructing node tester!");
-        NymNodeTesterBuilder::new(topology, id, gateway).setup_client()
+        NymNodeTesterBuilder::new(gateway_config, topology).setup_client()
    }

    async fn _new_with_api(
+        gateway_config: GatewayEndpointConfig,
        api_url: String,
-        id: Option<String>,
-        gateway: Option<IdentityKey>,
    ) -> Result<Self, WasmClientError> {
-        NymNodeTesterBuilder::_new_with_api(api_url, id, gateway)
+        NymNodeTesterBuilder::_new_with_api(gateway_config, api_url)
            .await?
            ._setup_client()
            .await
    }

-    pub fn new_with_api(
-        api_url: String,
-        id: Option<String>,
-        gateway: Option<IdentityKey>,
-    ) -> Promise {
+    pub fn new_with_api(gateway_config: GatewayEndpointConfig, api_url: String) -> Promise {
        future_to_promise(async move {
-            Self::_new_with_api(api_url, id, gateway)
+            Self::_new_with_api(gateway_config, api_url)
                .await
                .into_promise_result()
        })
    }

-    pub fn disconnect_from_gateway(&self) -> Promise {
-        self.gateway_client.disconnect_from_gateway()
-    }
-
-    pub fn reconnect_to_gateway(&self) -> Promise {
-        self.gateway_client.reconnect_to_gateway()
-    }
-
    fn prepare_test_packets(
        &self,
        mixnode_identity: String,
@@ -6,7 +6,7 @@ use nym_crypto::asymmetric::{encryption, identity};
 use nym_topology::gateway::GatewayConversionError;
 use nym_topology::mix::{Layer, MixnodeConversionError};
 use nym_topology::{gateway, mix, MixLayer, NymTopology};
-use nym_validator_client::client::{IdentityKeyRef, MixId};
+use nym_validator_client::client::MixId;
 use serde::{Deserialize, Serialize};
 use std::collections::BTreeMap;
 use thiserror::Error;
@@ -82,16 +82,11 @@ impl WasmNymTopology {
        })
    }

-    #[allow(dead_code)]
    pub(crate) fn ensure_contains(&self, gateway_config: &GatewayEndpointConfig) -> bool {
-        self.ensure_contains_gateway_id(&gateway_config.gateway_id)
-    }
-
-    pub(crate) fn ensure_contains_gateway_id(&self, gateway_id: IdentityKeyRef) -> bool {
        self.inner
            .gateways()
            .iter()
-            .any(|g| g.identity_key.to_base58_string() == gateway_id)
+            .any(|g| g.identity_key.to_base58_string() == gateway_config.gateway_id)
    }

    pub fn print(&self) {
@@ -130,7 +130,7 @@ impl AsyncFileWatcher {
                Ok(event) => {
                    let now = Instant::now();
                    if self.should_propagate(&event, now) {
-                        self.last_received.insert(event.kind, now);
+                        self.last_received.insert(event.kind.clone(), now);
                        if let Err(_err) = self.event_sender.unbounded_send(event) {
                            log::error!("the file watcher receiver has been dropped!");
                        }
@@ -55,16 +55,11 @@ where
    Ok(state)
 }

-pub async fn get_credential<C, St>(
+pub async fn get_credential<C: DkgQueryClient + Send + Sync, St: Storage>(
    state: &State,
    client: &C,
    storage: &St,
-) -> Result<(), BandwidthControllerError>
-where
-    C: DkgQueryClient + Send + Sync,
-    St: Storage,
-    <St as Storage>::StorageError: Send + Sync + 'static,
-{
+) -> Result<(), BandwidthControllerError> {
    let epoch_id = client.get_current_epoch().await?.epoch_id;
    let threshold = client
        .get_current_epoch_threshold()
@@ -88,6 +83,7 @@ where
            signature.to_bs58(),
            epoch_id.to_string(),
        )
-        .await
-        .map_err(|err| BandwidthControllerError::CredentialStorageError(Box::new(err)))
+        .await?;
+
+    Ok(())
 }
@@ -16,11 +16,7 @@ pub enum BandwidthControllerError {
    Nyxd(#[from] nym_validator_client::nyxd::error::NyxdError),

    #[error("There was a credential storage error - {0}")]
-    CredentialStorageError(Box<dyn std::error::Error + Send + Sync>),
-
-    // this should really be fully incorporated into the above, but messing with coconut is the last thing I want to do now
-    #[error(transparent)]
-    StorageError(#[from] StorageError),
+    CredentialStorageError(#[from] StorageError),

    #[error("Coconut error - {0}")]
    CoconutError(#[from] CoconutError),
@@ -26,7 +26,7 @@ pub mod error;
 #[cfg(target_arch = "wasm32")]
 pub mod wasm_mockups;

-pub struct BandwidthController<C, St> {
+pub struct BandwidthController<C, St: Storage> {
    storage: St,
    client: C,
 }
@@ -45,13 +45,8 @@ impl<C, St: Storage> BandwidthController<C, St> {
    ) -> Result<(nym_coconut_interface::Credential, i64), BandwidthControllerError>
    where
        C: DkgQueryClient + Sync + Send,
-        <St as Storage>::StorageError: Send + Sync + 'static,
    {
-        let bandwidth_credential = self
-            .storage
-            .get_next_coconut_credential()
-            .await
-            .map_err(|err| BandwidthControllerError::CredentialStorageError(Box::new(err)))?;
+        let bandwidth_credential = self.storage.get_next_coconut_credential().await?;
        let voucher_value = u64::from_str(&bandwidth_credential.voucher_value)
            .map_err(|_| StorageError::InconsistentData)?;
        let voucher_info = bandwidth_credential.voucher_info.clone();
@@ -87,16 +82,10 @@ impl<C, St: Storage> BandwidthController<C, St> {
        ))
    }

-    pub async fn consume_credential(&self, id: i64) -> Result<(), BandwidthControllerError>
-    where
-        <St as Storage>::StorageError: Send + Sync + 'static,
-    {
+    pub async fn consume_credential(&self, id: i64) -> Result<(), BandwidthControllerError> {
        // JS: shouldn't we send some contract/validator/gateway message here to actually, you know,
        // consume it?
-        self.storage
-            .consume_coconut_credential(id)
-            .await
-            .map_err(|err| BandwidthControllerError::CredentialStorageError(Box::new(err)))
+        Ok(self.storage.consume_coconut_credential(id).await?)
    }
 }

@@ -1,6 +1,6 @@
 [package]
 name = "nym-bin-common"
-version = "0.6.0"
+version = "0.5.0"
 description = "Common code for nym binaries"
 edition = { workspace = true }
 authors = { workspace = true }
@@ -15,21 +15,15 @@ clap_complete_fig = "4.0"
 log = { workspace = true }
 pretty_env_logger = "0.4.0"
 semver = "0.11"
-serde = { workspace = true, features = ["derive"] }
+serde = { workspace = true, features = ["derive"], optional = true }
 serde_json = { workspace = true, optional = true }

 ## tracing
+tracing-appender = { version = "0.2.2", optional = true }
 tracing-subscriber = { version = "0.3.16", features = [
    "env-filter",
 ], optional = true }
 tracing-tree = { version = "0.2.2", optional = true }
-opentelemetry-jaeger = { version = "0.18.0", optional = true, features = [
-    "rt-tokio",
-    "collector_client",
-    "isahc_collector_client",
-] }
-tracing-opentelemetry = { version = "0.19.0", optional = true }
-opentelemetry = { version = "0.19.0", optional = true, features = ["rt-tokio"] }


 [build-dependencies]
@@ -42,11 +36,5 @@ vergen = { version = "=7.4.3", default-features = false, features = [

 [features]
 default = []
-output_format = ["serde_json"]
-tracing = [
-    "tracing-subscriber",
-    "tracing-tree",
-    "opentelemetry-jaeger",
-    "tracing-opentelemetry",
-    "opentelemetry",
-]
+output_format = ["serde", "serde_json"]
+tracing = ["tracing-appender", "tracing-subscriber", "tracing-tree"]
@@ -4,8 +4,6 @@
 // TODO: at a later date this crate should probably also expose `ContractBuildInformation`
 // and be used by our smart contracts

-use serde::{Deserialize, Serialize};
-
 #[derive(Debug)]
 pub struct BinaryBuildInformation {
    // VERGEN_BUILD_TIMESTAMP
@@ -101,7 +99,8 @@ impl BinaryBuildInformation {
    }
 }

-#[derive(Clone, Debug, Serialize, Deserialize)]
+#[derive(Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct BinaryBuildInformationOwned {
    // VERGEN_BUILD_TIMESTAMP
    /// Provides the build timestamp, for example `2021-02-23T20:14:46.558472672+00:00`.
@@ -4,7 +4,5 @@
 pub mod build_information;
 pub mod completions;
 pub mod logging;
-pub mod version_checker;
-
-#[cfg(feature = "output_format")]
 pub mod output_format;
+pub mod version_checker;
@@ -1,25 +1,17 @@
-// Copyright 2022-2023 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
-
-use serde::{Deserialize, Serialize};
+// use tracing_subscriber::{
+//     fmt::Layer, layer::SubscriberExt, util::SubscriberInitExt, EnvFilter, Registry,
+// };
+// use tracing_tree::HierarchicalLayer;

 #[cfg(feature = "tracing")]
-pub use opentelemetry;
-#[cfg(feature = "tracing")]
-pub use opentelemetry_jaeger;
-#[cfg(feature = "tracing")]
-pub use tracing_opentelemetry;
+pub use tracing_appender;
 #[cfg(feature = "tracing")]
 pub use tracing_subscriber;
 #[cfg(feature = "tracing")]
 pub use tracing_tree;

-#[derive(Debug, Default, Clone, Deserialize, PartialEq, Eq, Serialize)]
-#[serde(deny_unknown_fields)]
-pub struct LoggingSettings {
-    // well, we need to implement something here at some point...
-}
-
 // I'd argue we should start transitioning from `log` to `tracing`
 pub fn setup_logging() {
    let mut log_builder = pretty_env_logger::formatted_timed_builder();
@@ -47,35 +39,27 @@ pub fn setup_logging() {
 #[cfg(feature = "tracing")]
 #[macro_export]
 macro_rules! setup_tracing {
-    ($service_name: expr) => {
+    ($file_name: expr) => {
        use nym_bin_common::logging::tracing_subscriber::layer::SubscriberExt;
        use nym_bin_common::logging::tracing_subscriber::util::SubscriberInitExt;

-        let registry = nym_bin_common::logging::tracing_subscriber::Registry::default()
+        let file_appender =
+            nym_bin_common::logging::tracing_appender::rolling::hourly($file_name, "log");
+        let (non_blocking, _guard) =
+            nym_bin_common::logging::tracing_appender::non_blocking(file_appender);
+        let appender_layer = nym_bin_common::logging::tracing_subscriber::fmt::Layer::new()
+            .with_ansi(false)
+            .with_writer(non_blocking);
+
+        nym_bin_common::logging::tracing_subscriber::Registry::default()
            .with(nym_bin_common::logging::tracing_subscriber::EnvFilter::from_default_env())
+            .with(appender_layer)
            .with(
                nym_bin_common::logging::tracing_tree::HierarchicalLayer::new(4)
                    .with_targets(true)
                    .with_bracketed_fields(true),
-            );
-
-        let tracer = nym_bin_common::logging::opentelemetry_jaeger::new_collector_pipeline()
-            .with_endpoint("http://44.199.230.10:14268/api/traces")
-            .with_service_name($service_name)
-            .with_isahc()
-            .with_trace_config(
-                nym_bin_common::logging::opentelemetry::sdk::trace::config().with_sampler(
-                    nym_bin_common::logging::opentelemetry::sdk::trace::Sampler::TraceIdRatioBased(
-                        0.1,
-                    ),
-                ),
            )
-            .install_batch(nym_bin_common::logging::opentelemetry::runtime::Tokio)
-            .expect("Could not init tracer");
-
-        let telemetry = nym_bin_common::logging::tracing_opentelemetry::layer().with_tracer(tracer);
-
-        registry.with(telemetry).init();
+            .init();
    };
 }

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jon Häggblad	2392d5615f	Remove unused function	2023-05-16 14:45:01 +02:00
Jon Häggblad	f914198e8a	Fully working state (minus task manager)	2023-05-16 14:39:15 +02:00
Jon Häggblad	67b7090430	Restore commented out functionality in socks5 client	2023-05-16 10:50:02 +02:00
Jon Häggblad	817e624adc	Remove the old non-working logger	2023-05-16 10:05:44 +02:00
pierre	5e7dbb8cd8	android: start socks5 process in a separated thread	2023-05-15 16:15:11 +02:00
pierre	86059c2898	set tag for libnyms5 logs	2023-05-15 14:28:46 +02:00
Jon Häggblad	e414bd5595	android_logging	2023-05-15 13:39:21 +02:00
pierre	7e000d433f	add android network permissions	2023-05-15 13:38:24 +02:00
pierre	10bb090c50	wip not crashing state	2023-05-15 11:57:21 +02:00
pierre	410630580a	use a good SP	2023-05-15 10:25:54 +02:00
pierre	78995834e7	fix typo in FFI function name	2023-05-15 10:08:16 +02:00
Jon Häggblad	d1e256e6ff	Update build.sh	2023-05-14 22:52:22 +02:00
pierre	aa1d7bc46f	wip	2023-05-12 17:56:35 +02:00
pierre	6eca697f90	fix jni dependency declaration	2023-05-12 17:51:09 +02:00
pierre	a7e4f4d153	add build script	2023-05-12 17:37:55 +02:00
pierre	d36efb46d6	add socks5 native lib in java	2023-05-12 17:36:05 +02:00
pierre	c5ff49d330	add native socks5 class	2023-05-12 17:34:01 +02:00
pierre	f298dce2b3	gitkeep android native lib path	2023-05-12 17:33:46 +02:00
Jon Häggblad	15d0b3c17d	update jni name	2023-05-12 16:45:22 +02:00
Jon Häggblad	4be31a42ea	android jni function	2023-05-12 15:38:59 +02:00
pierre	fe999593a2	bootstrap android app	2023-05-12 14:55:15 +02:00
Jędrzej Stuczyński	959fb65d02	cleanup	2023-05-12 13:48:32 +01:00
Jędrzej Stuczyński	6d2737099b	additional target os locking	2023-05-12 13:37:21 +01:00
Jędrzej Stuczyński	c6e68799ef	another layer of hacks	2023-05-12 12:26:54 +01:00
Jon Häggblad	4a401d23e5	Add header	2023-05-11 14:16:35 +01:00
Jon Häggblad	dc31576942	remove unused stuff	2023-05-11 14:10:32 +01:00
Jon Häggblad	a8c2828d2e	Make it work for x86_64-linux-android	2023-05-11 12:54:43 +01:00
Jędrzej Stuczyński	1f61b3d4ef	foomp	2023-05-11 12:01:20 +01:00
Jon Häggblad	c98dbc0407	initial crate	2023-05-11 11:37:21 +01:00