diff --git a/.github/workflows/build-upload-binaries.yml b/.github/workflows/build-upload-binaries.yml
deleted file mode 100644
index ee1271b4cd..0000000000
--- a/.github/workflows/build-upload-binaries.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-name: build-upload-binaries
-
-on:
-  workflow_dispatch:
-    inputs:
-      add_tokio_unstable:
-        description: 'True to add RUSTFLAGS="--cfg tokio_unstable"'
-        required: true
-        default: false
-        type: boolean
-
-env:
-  NETWORK: mainnet
-
-jobs:
-  publish-nym:
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: [ubuntu-20.04]
-
-    runs-on: ${{ matrix.platform }}
-    env:
-      CARGO_TERM_COLOR: always
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Install Dependencies (Linux)
-        run: sudo apt-get update && sudo apt-get -y install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools
-        continue-on-error: true
-
-      - name: Sets env vars for tokio if set in manual dispatch inputs
-        run: |
-          echo 'RUSTFLAGS="--cfg tokio_unstable"' >> $GITHUB_ENV
-        if: github.event_name == 'workflow_dispatch' && inputs.add_tokio_unstable == true
-
-      - name: Install Rust stable
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-
-      - name: Build all binaries
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --workspace --release
-
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: nym-binaries-artifacts
-          path: |
-            target/release/nym-client
-            target/release/nym-gateway
-            target/release/nym-mixnode
-            target/release/nym-socks5-client
-            target/release/nym-api
-            target/release/nym-network-requester
-            target/release/nym-network-statistics
-            target/release/nym-cli
-          retention-days: 30
diff --git a/.github/workflows/ci-build-upload-binaries.yml b/.github/workflows/ci-build-upload-binaries.yml
index 3465e7921a..afaae3536e 100644
--- a/.github/workflows/ci-build-upload-binaries.yml
+++ b/.github/workflows/ci-build-upload-binaries.yml
@@ -2,6 +2,19 @@ name: ci-build-upload-binaries
 
 on:
   workflow_dispatch:
+    inputs:
+      add_tokio_unstable:
+        description: 'True to add RUSTFLAGS="--cfg tokio_unstable"'
+        required: true
+        default: false
+        type: boolean
+      enable_wireguard:
+        description: 'Add --features wireguard'
+        required: true
+        default: false
+        type: boolean
+  schedule:
+    - cron: '14 0 * * *'
   pull_request:
     paths:
       - "clients/**"
@@ -10,12 +23,13 @@ on:
       - "gateway/**"
       - "integrations/**"
       - "mixnode/**"
+      - "nym-api/**"
+      - "nym-node/**"
+      - "nym-outfox/**"
+      - "nym-validator-rewarder/**"
       - "sdk/rust/nym-sdk/**"
       - "service-providers/**"
-      - "nym-api/**"
-      - "nym-outfox/**"
-      - "tools/nym-cli/**"
-      - "tools/ts-rs-cli/**"
+      - "tools/**"
 
 jobs:
   publish-nym:
@@ -42,6 +56,18 @@ jobs:
       - name: Install Dependencies (Linux)
         run: sudo apt update && sudo apt install libudev-dev
 
+      - name: Sets env vars for tokio if set in manual dispatch inputs
+        run: |
+          echo 'RUSTFLAGS="--cfg tokio_unstable"' >> $GITHUB_ENV
+        if: github.event_name == 'workflow_dispatch' && inputs.add_tokio_unstable == true
+
+      - name: Set CARGO_FEATURES
+        run: |
+          echo 'CARGO_FEATURES=--features wireguard' >> $GITHUB_ENV
+        if: >
+          github.event_name == 'schedule' ||
+          (github.event_name == 'workflow_dispatch' && inputs.enable_wireguard == true)
+
       - name: Install Rust stable
         uses: actions-rs/toolchain@v1
         with:
@@ -51,7 +77,7 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: build
-          args: --workspace --release
+          args: --workspace --release ${{ env.CARGO_FEATURES }}
 
       - name: Install cargo-deb
         uses: actions-rs/cargo@v1
@@ -61,9 +87,30 @@ jobs:
 
       - name: Build deb packages
         shell: bash
-        run: scripts/ppa.sh ${{ secrets.PPA_SIGNING_KEY }}
+        run: make deb
+
+      # If this was a manual workflow_dispatch, publish binaries.
+
+      - name: Upload Artifact
+        if: github.event_name == 'workflow_dispatch'
+        uses: actions/upload-artifact@v3
+        with:
+          name: nym-binaries-artifacts
+          path: |
+            target/release/nym-client
+            target/release/nym-gateway
+            target/release/nym-mixnode
+            target/release/nym-socks5-client
+            target/release/nym-api
+            target/release/nym-network-requester
+            target/release/nym-network-statistics
+            target/release/nym-cli
+          retention-days: 30
+
+      # If this was a pull_request or nightly, upload to build server
 
       - name: Prepare build output
+        # if: github.event_name == 'schedule' || github.event_name == 'pull_request'
         shell: bash
         env:
           OUTPUT_DIR: ci-builds/${{ github.ref_name }}
@@ -77,9 +124,10 @@ jobs:
           cp target/release/nym-network-statistics $OUTPUT_DIR
           cp target/release/nym-cli $OUTPUT_DIR
           cp target/release/explorer-api $OUTPUT_DIR
-          cp ppa/debian/* $OUTPUT_DIR
+          cp target/debian/*.deb $OUTPUT_DIR
 
       - name: Deploy branch to CI www
+        # if: github.event_name == 'schedule' || github.event_name == 'pull_request'
         continue-on-error: true
         uses: easingthemes/ssh-deploy@main
         env:
diff --git a/.github/workflows/ci-cargo-deny.yml b/.github/workflows/ci-cargo-deny.yml
index a9a84fc271..ab35b5fbf5 100644
--- a/.github/workflows/ci-cargo-deny.yml
+++ b/.github/workflows/ci-cargo-deny.yml
@@ -1,5 +1,8 @@
 name: ci-cargo-deny
-on: [workflow_dispatch]
+on:
+  workflow_dispatch:
+  pull_request:
+
 jobs:
   cargo-deny:
     runs-on: ubuntu-22.04
@@ -7,10 +10,7 @@ jobs:
       matrix:
         checks:
           # - advisories
-          - licenses
-          - bans sources
-
-    continue-on-error: ${{ matrix.checks == 'licenses' }}
+          - licenses bans sources
 
     steps:
     - uses: actions/checkout@v3
diff --git a/.github/workflows/ci-nym-api-tests.yml b/.github/workflows/ci-nym-api-tests.yml
index ac820dcd1f..8953956478 100644
--- a/.github/workflows/ci-nym-api-tests.yml
+++ b/.github/workflows/ci-nym-api-tests.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: install yarn in root
-        run: cd ../.. yarn install
+        run: cd ../.. && yarn install
 
       - name: Install npm
         run: npm install
diff --git a/.github/workflows/publish-nym-binaries.yml b/.github/workflows/publish-nym-binaries.yml
index f93f39524d..9846dff2c7 100644
--- a/.github/workflows/publish-nym-binaries.yml
+++ b/.github/workflows/publish-nym-binaries.yml
@@ -1,4 +1,4 @@
-name: Publish Nym binaries
+name: publish-nym-binaries
 
 on:
   workflow_dispatch:
diff --git a/.github/workflows/publish-nym-connect-macos.yml b/.github/workflows/publish-nym-connect-macos.yml
index 4a17f090e0..87bb1292f7 100644
--- a/.github/workflows/publish-nym-connect-macos.yml
+++ b/.github/workflows/publish-nym-connect-macos.yml
@@ -1,4 +1,4 @@
-name: Publish Nym Connect - desktop (MacOS)
+name: publish-nym-connect-macos
 on:
   workflow_dispatch:
   release:
diff --git a/.github/workflows/publish-nym-connect-ubuntu.yml b/.github/workflows/publish-nym-connect-ubuntu.yml
index c542f5fc87..d9c1e45567 100644
--- a/.github/workflows/publish-nym-connect-ubuntu.yml
+++ b/.github/workflows/publish-nym-connect-ubuntu.yml
@@ -1,4 +1,4 @@
-name: Publish Nym Connect - desktop (Ubuntu)
+name: publish-nym-connect-ubuntu
 on:
   workflow_dispatch:
   release:
diff --git a/.github/workflows/publish-nym-connect-win10.yml b/.github/workflows/publish-nym-connect-win10.yml
index 43b336d034..8529af4984 100644
--- a/.github/workflows/publish-nym-connect-win10.yml
+++ b/.github/workflows/publish-nym-connect-win10.yml
@@ -1,4 +1,4 @@
-name: Publish Nym Connect - desktop (Windows 10)
+name: publish-nym-connect-win10
 on:
   workflow_dispatch:
   release:
diff --git a/.github/workflows/publish-nym-contracts.yml b/.github/workflows/publish-nym-contracts.yml
index 03c4eddb63..493f99e8ac 100644
--- a/.github/workflows/publish-nym-contracts.yml
+++ b/.github/workflows/publish-nym-contracts.yml
@@ -1,4 +1,4 @@
-name: Build release of Nym smart contracts
+name: publish-nym-contracts
 on:
   workflow_dispatch:
   release:
diff --git a/.github/workflows/publish-nym-wallet-macos.yml b/.github/workflows/publish-nym-wallet-macos.yml
index af2db3dbf5..a591565ef8 100644
--- a/.github/workflows/publish-nym-wallet-macos.yml
+++ b/.github/workflows/publish-nym-wallet-macos.yml
@@ -1,4 +1,4 @@
-name: Publish Nym Wallet (MacOS)
+name: publish-nym-wallet-macos
 on:
   workflow_dispatch:
   release:
diff --git a/.github/workflows/publish-nym-wallet-ubuntu.yml b/.github/workflows/publish-nym-wallet-ubuntu.yml
index 5f71862a45..debdbb00e4 100644
--- a/.github/workflows/publish-nym-wallet-ubuntu.yml
+++ b/.github/workflows/publish-nym-wallet-ubuntu.yml
@@ -1,4 +1,4 @@
-name: Publish Nym Wallet (Ubuntu)
+name: publish-nym-wallet-ubuntu
 on:
   workflow_dispatch:
   release:
diff --git a/.github/workflows/publish-nym-wallet-win10.yml b/.github/workflows/publish-nym-wallet-win10.yml
index 69548ad315..7409dabde4 100644
--- a/.github/workflows/publish-nym-wallet-win10.yml
+++ b/.github/workflows/publish-nym-wallet-win10.yml
@@ -1,4 +1,4 @@
-name: Publish Nym Wallet (Windows 10)
+name: publish-nym-wallet-win10
 on:
   workflow_dispatch:
   release:
diff --git a/.github/workflows/publish-sdk-npm.yml b/.github/workflows/publish-sdk-npm.yml
index a0aa757379..32a8bc31f5 100644
--- a/.github/workflows/publish-sdk-npm.yml
+++ b/.github/workflows/publish-sdk-npm.yml
@@ -1,4 +1,4 @@
-name: Publish Typescript SDK
+name: publish-sdk-npm
 on:
   workflow_dispatch:
 
diff --git a/.github/workflows/release-calculate-hash.yml b/.github/workflows/release-calculate-hash.yml
index 4695b0867f..00d253908a 100644
--- a/.github/workflows/release-calculate-hash.yml
+++ b/.github/workflows/release-calculate-hash.yml
@@ -1,4 +1,4 @@
-name: Releases - calculate file hashes
+name: release-calculate-hash
 
 on:
   workflow_call:
diff --git a/Cargo.lock b/Cargo.lock
index 1690e2bfc6..45ada8fdf0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8,185 +8,6 @@ version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
 
-[[package]]
-name = "actix-codec"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "617a8268e3537fe1d8c9ead925fca49ef6400927ee7bc26750e90ecee14ce4b8"
-dependencies = [
- "bitflags 1.3.2",
- "bytes",
- "futures-core",
- "futures-sink",
- "memchr",
- "pin-project-lite 0.2.13",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "actix-http"
-version = "3.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a92ef85799cba03f76e4f7c10f533e66d87c9a7e7055f3391f09000ad8351bc9"
-dependencies = [
- "actix-codec",
- "actix-rt",
- "actix-service",
- "actix-utils",
- "ahash 0.8.3",
- "base64 0.21.4",
- "bitflags 2.4.1",
- "brotli",
- "bytes",
- "bytestring",
- "derive_more",
- "encoding_rs",
- "flate2",
- "futures-core",
- "h2",
- "http",
- "httparse",
- "httpdate",
- "itoa",
- "language-tags",
- "local-channel",
- "mime",
- "percent-encoding",
- "pin-project-lite 0.2.13",
- "rand 0.8.5",
- "sha1",
- "smallvec",
- "tokio",
- "tokio-util",
- "tracing",
- "zstd",
-]
-
-[[package]]
-name = "actix-macros"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb"
-dependencies = [
- "quote",
- "syn 2.0.38",
-]
-
-[[package]]
-name = "actix-router"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d66ff4d247d2b160861fa2866457e85706833527840e4133f8f49aa423a38799"
-dependencies = [
- "bytestring",
- "http",
- "regex",
- "serde",
- "tracing",
-]
-
-[[package]]
-name = "actix-rt"
-version = "2.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28f32d40287d3f402ae0028a9d54bef51af15c8769492826a69d28f81893151d"
-dependencies = [
- "futures-core",
- "tokio",
-]
-
-[[package]]
-name = "actix-server"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3eb13e7eef0423ea6eab0e59f6c72e7cb46d33691ad56a726b3cd07ddec2c2d4"
-dependencies = [
- "actix-rt",
- "actix-service",
- "actix-utils",
- "futures-core",
- "futures-util",
- "mio",
- "socket2 0.5.4",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "actix-service"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b894941f818cfdc7ccc4b9e60fa7e53b5042a2e8567270f9147d5591893373a"
-dependencies = [
- "futures-core",
- "paste",
- "pin-project-lite 0.2.13",
-]
-
-[[package]]
-name = "actix-utils"
-version = "3.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88a1dcdff1466e3c2488e1cb5c36a71822750ad43839937f85d2f4d9f8b705d8"
-dependencies = [
- "local-waker",
- "pin-project-lite 0.2.13",
-]
-
-[[package]]
-name = "actix-web"
-version = "4.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4a5b5e29603ca8c94a77c65cf874718ceb60292c5a5c3e5f4ace041af462b9"
-dependencies = [
- "actix-codec",
- "actix-http",
- "actix-macros",
- "actix-router",
- "actix-rt",
- "actix-server",
- "actix-service",
- "actix-utils",
- "actix-web-codegen",
- "ahash 0.8.3",
- "bytes",
- "bytestring",
- "cfg-if",
- "cookie 0.16.2",
- "derive_more",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "itoa",
- "language-tags",
- "log",
- "mime",
- "once_cell",
- "pin-project-lite 0.2.13",
- "regex",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "smallvec",
- "socket2 0.5.4",
- "time",
- "url",
-]
-
-[[package]]
-name = "actix-web-codegen"
-version = "4.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb1f50ebbb30eca122b188319a4398b3f7bb4a8cdf50ecfb73bfc6a3c3ce54f5"
-dependencies = [
- "actix-router",
- "proc-macro2",
- "quote",
- "syn 2.0.38",
-]
-
 [[package]]
 name = "addr"
 version = "0.15.6"
@@ -342,7 +163,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
 dependencies = [
  "cfg-if",
- "getrandom 0.2.10",
  "once_cell",
  "version_check",
 ]
@@ -356,21 +176,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "alloc-no-stdlib"
-version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3"
-
-[[package]]
-name = "alloc-stdlib"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece"
-dependencies = [
- "alloc-no-stdlib",
-]
-
 [[package]]
 name = "allocator-api2"
 version = "0.2.16"
@@ -469,9 +274,6 @@ name = "anyhow"
 version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
-dependencies = [
- "backtrace",
-]
 
 [[package]]
 name = "arc-swap"
@@ -491,12 +293,6 @@ dependencies = [
  "password-hash",
 ]
 
-[[package]]
-name = "array-bytes"
-version = "6.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b1c5a481ec30a5abd8dfbd94ab5cf1bb4e9a66be7f1b3b322f2f1170c200fd"
-
 [[package]]
 name = "arrayref"
 version = "0.3.7"
@@ -582,12 +378,6 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "155a5a185e42c6b77ac7b88a15143d930a9e9727a5b7b77eed417404ab15c247"
 
-[[package]]
-name = "assert_matches"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9"
-
 [[package]]
 name = "async-channel"
 version = "1.9.0"
@@ -1022,27 +812,6 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "845141a4fade3f790628b7daaaa298a25b204fb28907eb54febe5142db6ce653"
 
-[[package]]
-name = "brotli"
-version = "3.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f"
-dependencies = [
- "alloc-no-stdlib",
- "alloc-stdlib",
- "brotli-decompressor",
-]
-
-[[package]]
-name = "brotli-decompressor"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da74e2b81409b1b743f8f0c62cc6254afefb8b8e50bbfe3735550f7aeefa3448"
-dependencies = [
- "alloc-no-stdlib",
- "alloc-stdlib",
-]
-
 [[package]]
 name = "bs58"
 version = "0.4.0"
@@ -1101,78 +870,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "bytestring"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "238e4886760d98c4f899360c834fa93e62cf7f721ac3c2da375cbdf4b8679aae"
-dependencies = [
- "bytes",
-]
-
-[[package]]
-name = "camino"
-version = "1.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "cargo-edit"
-version = "0.11.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f769ab9e8c1652d78dd0b3ec59cdaa1e2bcb3b6b39f6681b256abcdbe101cc14"
-dependencies = [
- "anyhow",
- "cargo_metadata",
- "clap 4.4.7",
- "concolor-control",
- "crates-index",
- "dirs-next",
- "dunce",
- "env_proxy",
- "git2",
- "hex",
- "indexmap 1.9.3",
- "native-tls",
- "pathdiff",
- "regex",
- "semver 1.0.20",
- "serde",
- "serde_derive",
- "serde_json",
- "subprocess",
- "termcolor",
- "toml_edit 0.16.2",
- "ureq",
- "url",
-]
-
-[[package]]
-name = "cargo-platform"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12024c4645c97566567129c204f65d5815a8c9aecf30fcbe682b2fe034996d36"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "cargo_metadata"
-version = "0.15.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a"
-dependencies = [
- "camino",
- "cargo-platform",
- "semver 1.0.20",
- "serde",
- "serde_json",
- "thiserror",
-]
-
 [[package]]
 name = "cast"
 version = "0.3.0"
@@ -1191,7 +888,6 @@ version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
 dependencies = [
- "jobserver",
  "libc",
 ]
 
@@ -1380,7 +1076,6 @@ dependencies = [
  "anstyle",
  "clap_lex 0.6.0",
  "strsim",
- "terminal_size",
 ]
 
 [[package]]
@@ -1471,29 +1166,12 @@ version = "6.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7e959d788268e3bf9d35ace83e81b124190378e4c91c9067524675e33394b8ba"
 dependencies = [
- "crossterm",
+ "crossterm 0.26.1",
  "strum 0.24.1",
  "strum_macros 0.24.3",
  "unicode-width",
 ]
 
-[[package]]
-name = "concolor-control"
-version = "0.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7104119c2f80d887239879d0c50e033cd40eac9a3f3561e0684ba7d5d654f4da"
-dependencies = [
- "atty",
- "bitflags 1.3.2",
- "concolor-query",
-]
-
-[[package]]
-name = "concolor-query"
-version = "0.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad159cc964ac8f9d407cbc0aa44b02436c054b541f2b4b5f06972e1efdc54bc7"
-
 [[package]]
 name = "concurrent-queue"
 version = "2.3.0"
@@ -1503,20 +1181,6 @@ dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "config"
-version = "0.13.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d379af7f68bfc21714c6c7dea883544201741d2ce8274bb12fa54f89507f52a7"
-dependencies = [
- "async-trait",
- "lazy_static",
- "nom",
- "pathdiff",
- "serde",
- "toml 0.5.11",
-]
-
 [[package]]
 name = "console-api"
 version = "0.5.0"
@@ -1601,28 +1265,11 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
 
-[[package]]
-name = "convert_case"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
-
 [[package]]
 name = "cookie"
-version = "0.16.2"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb"
-dependencies = [
- "percent-encoding",
- "time",
- "version_check",
-]
-
-[[package]]
-name = "cookie"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24"
+checksum = "3cd91cf61412820176e137621345ee43b3f4423e589e7ae4e50d601d93e35ef8"
 dependencies = [
  "percent-encoding",
  "time",
@@ -1798,27 +1445,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "crates-index"
-version = "0.18.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "599f67b56f40863598cb30450427049935d05de2e36c61d33c050f04d7ec8cf2"
-dependencies = [
- "git2",
- "hex",
- "home",
- "memchr",
- "num_cpus",
- "rayon",
- "rustc-hash",
- "semver 1.0.20",
- "serde",
- "serde_derive",
- "serde_json",
- "smartstring",
- "toml 0.5.11",
-]
-
 [[package]]
 name = "crc"
 version = "3.0.1"
@@ -1932,6 +1558,22 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "crossterm"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67"
+dependencies = [
+ "bitflags 1.3.2",
+ "crossterm_winapi",
+ "libc",
+ "mio",
+ "parking_lot 0.12.1",
+ "signal-hook",
+ "signal-hook-mio",
+ "winapi",
+]
+
 [[package]]
 name = "crossterm"
 version = "0.26.1"
@@ -1957,12 +1599,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "crunchy"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
-
 [[package]]
 name = "crypto-bigint"
 version = "0.4.9"
@@ -2018,6 +1654,27 @@ dependencies = [
  "subtle 2.4.1",
 ]
 
+[[package]]
+name = "csv"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe"
+dependencies = [
+ "csv-core",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "csv-core"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "ctor"
 version = "0.1.26"
@@ -2109,7 +1766,6 @@ dependencies = [
  "cfg-if",
  "cpufeatures",
  "curve25519-dalek-derive",
- "digest 0.10.7",
  "fiat-crypto",
  "platforms",
  "rustc_version 0.4.0",
@@ -2501,19 +2157,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "derive_more"
-version = "0.99.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
-dependencies = [
- "convert_case",
- "proc-macro2",
- "quote",
- "rustc_version 0.4.0",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "devise"
 version = "0.4.1"
@@ -2595,16 +2238,6 @@ dependencies = [
  "dirs-sys 0.4.1",
 ]
 
-[[package]]
-name = "dirs-next"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
-dependencies = [
- "cfg-if",
- "dirs-sys-next",
-]
-
 [[package]]
 name = "dirs-sys"
 version = "0.3.7"
@@ -2628,17 +2261,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "dirs-sys-next"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
-dependencies = [
- "libc",
- "redox_users",
- "winapi",
-]
-
 [[package]]
 name = "displaydoc"
 version = "0.2.4"
@@ -2668,12 +2290,6 @@ version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653"
 
-[[package]]
-name = "dunce"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
-
 [[package]]
 name = "dyn-clone"
 version = "1.0.14"
@@ -2754,20 +2370,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "ed25519-dalek"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980"
-dependencies = [
- "curve25519-dalek 4.1.1",
- "ed25519 2.2.3",
- "rand_core 0.6.4",
- "serde",
- "sha2 0.10.8",
- "zeroize",
-]
-
 [[package]]
 name = "ed25519-zebra"
 version = "3.1.0"
@@ -2874,65 +2476,6 @@ dependencies = [
  "regex",
 ]
 
-[[package]]
-name = "env_proxy"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a5019be18538406a43b5419a5501461f0c8b49ea7dfda0cfc32f4e51fc44be1"
-dependencies = [
- "log",
- "url",
-]
-
-[[package]]
-name = "ephemera"
-version = "0.1.0"
-dependencies = [
- "actix-web",
- "anyhow",
- "array-bytes",
- "assert_matches",
- "async-trait",
- "asynchronous-codec",
- "blake2 0.10.6",
- "bs58 0.4.0",
- "bytes",
- "cfg-if",
- "chrono",
- "clap 4.4.7",
- "config",
- "digest 0.10.7",
- "dirs 5.0.1",
- "enum-as-inner",
- "futures",
- "futures-util",
- "lazy_static",
- "libp2p 0.51.3",
- "libp2p-identity",
- "log",
- "lru 0.10.1",
- "nym-config",
- "nym-ephemera-common",
- "nym-task",
- "pretty_env_logger",
- "rand 0.8.5",
- "refinery",
- "reqwest",
- "rusqlite",
- "serde",
- "serde_derive",
- "serde_json",
- "thiserror",
- "tokio",
- "tokio-tungstenite",
- "tokio-util",
- "toml 0.7.8",
- "unsigned-varint",
- "utoipa",
- "utoipa-swagger-ui",
- "uuid 1.5.0",
-]
-
 [[package]]
 name = "equivalent"
 version = "1.0.1"
@@ -3055,18 +2598,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "fallible-iterator"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
-
-[[package]]
-name = "fallible-streaming-iterator"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
-
 [[package]]
 name = "fastrand"
 version = "1.9.0"
@@ -3186,21 +2717,6 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
 [[package]]
 name = "form_urlencoded"
 version = "1.2.0"
@@ -3485,21 +3001,6 @@ version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
 
-[[package]]
-name = "git2"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0155506aab710a86160ddb504a480d2964d7ab5b9e62419be69e0032bc5931c"
-dependencies = [
- "bitflags 1.3.2",
- "libc",
- "libgit2-sys",
- "log",
- "openssl-probe",
- "openssl-sys",
- "url",
-]
-
 [[package]]
 name = "glob"
 version = "0.3.1"
@@ -3613,15 +3114,6 @@ dependencies = [
  "serde_json",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
-dependencies = [
- "ahash 0.7.6",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
@@ -3650,15 +3142,6 @@ dependencies = [
  "allocator-api2",
 ]
 
-[[package]]
-name = "hashlink"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf"
-dependencies = [
- "hashbrown 0.11.2",
-]
-
 [[package]]
 name = "hashlink"
 version = "0.8.4"
@@ -3719,9 +3202,6 @@ name = "hex"
 version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-dependencies = [
- "serde",
-]
 
 [[package]]
 name = "hex-literal"
@@ -3944,19 +3424,6 @@ dependencies = [
  "tokio-io-timeout",
 ]
 
-[[package]]
-name = "hyper-tls"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
-dependencies = [
- "bytes",
- "hyper",
- "native-tls",
- "tokio",
- "tokio-native-tls",
-]
-
 [[package]]
 name = "iana-time-zone"
 version = "0.1.58"
@@ -4123,6 +3590,22 @@ dependencies = [
  "generic-array 0.14.7",
 ]
 
+[[package]]
+name = "inquire"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c33e7c1ddeb15c9abcbfef6029d8e29f69b52b6d6c891031b88ed91b5065803b"
+dependencies = [
+ "bitflags 1.3.2",
+ "crossterm 0.25.0",
+ "dyn-clone",
+ "lazy_static",
+ "newline-converter",
+ "thiserror",
+ "unicode-segmentation",
+ "unicode-width",
+]
+
 [[package]]
 name = "instant"
 version = "0.1.12"
@@ -4342,15 +3825,6 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
-[[package]]
-name = "jobserver"
-version = "0.1.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "js-sys"
 version = "0.3.64"
@@ -4400,21 +3874,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "kstring"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec3066350882a1cd6d950d055997f379ac37fd39f81cd4d8ed186032eb3c5747"
-dependencies = [
- "static_assertions",
-]
-
-[[package]]
-name = "language-tags"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388"
-
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -4475,20 +3934,6 @@ version = "0.2.149"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
 
-[[package]]
-name = "libgit2-sys"
-version = "0.13.5+1.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51e5ea06c26926f1002dd553fded6cfcdc9784c1f60feeb58368b4d9b07b6dba"
-dependencies = [
- "cc",
- "libc",
- "libssh2-sys",
- "libz-sys",
- "openssl-sys",
- "pkg-config",
-]
-
 [[package]]
 name = "libm"
 version = "0.2.8"
@@ -4505,80 +3950,25 @@ dependencies = [
  "futures-timer",
  "getrandom 0.2.10",
  "instant",
- "libp2p-core 0.39.0",
- "libp2p-dns 0.39.0 (git+https://github.com/ChainSafe/rust-libp2p.git?rev=e3440d25681df380c9f0f8cfdcfd5ecc0a4f2fb6)",
- "libp2p-gossipsub 0.44.0",
+ "libp2p-core",
+ "libp2p-dns",
+ "libp2p-gossipsub",
  "libp2p-identify",
- "libp2p-mdns 0.43.0",
- "libp2p-metrics 0.12.0 (git+https://github.com/ChainSafe/rust-libp2p.git?rev=e3440d25681df380c9f0f8cfdcfd5ecc0a4f2fb6)",
+ "libp2p-mdns",
+ "libp2p-metrics",
  "libp2p-mplex",
- "libp2p-noise 0.42.0",
+ "libp2p-noise",
  "libp2p-ping",
- "libp2p-quic 0.7.0-alpha.2",
- "libp2p-swarm 0.42.0",
- "libp2p-tcp 0.39.0 (git+https://github.com/ChainSafe/rust-libp2p.git?rev=e3440d25681df380c9f0f8cfdcfd5ecc0a4f2fb6)",
- "libp2p-webrtc 0.4.0-alpha.2",
+ "libp2p-quic",
+ "libp2p-swarm",
+ "libp2p-tcp",
+ "libp2p-webrtc",
  "libp2p-websocket",
- "libp2p-yamux 0.43.0",
- "multiaddr 0.17.0",
+ "libp2p-yamux",
+ "multiaddr",
  "pin-project",
 ]
 
-[[package]]
-name = "libp2p"
-version = "0.51.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f210d259724eae82005b5c48078619b7745edb7b76de370b03f8ba59ea103097"
-dependencies = [
- "bytes",
- "futures",
- "futures-timer",
- "getrandom 0.2.10",
- "instant",
- "libp2p-allow-block-list",
- "libp2p-connection-limits",
- "libp2p-core 0.39.2",
- "libp2p-dns 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-gossipsub 0.44.4",
- "libp2p-identity",
- "libp2p-kad",
- "libp2p-mdns 0.43.1",
- "libp2p-metrics 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-noise 0.42.2",
- "libp2p-quic 0.7.0-alpha.3",
- "libp2p-request-response",
- "libp2p-swarm 0.42.2",
- "libp2p-tcp 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-webrtc 0.4.0-alpha.4",
- "libp2p-yamux 0.43.1",
- "multiaddr 0.17.1",
- "pin-project",
-]
-
-[[package]]
-name = "libp2p-allow-block-list"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "510daa05efbc25184458db837f6f9a5143888f1caa742426d92e1833ddd38a50"
-dependencies = [
- "libp2p-core 0.39.2",
- "libp2p-identity",
- "libp2p-swarm 0.42.2",
- "void",
-]
-
-[[package]]
-name = "libp2p-connection-limits"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4caa33f1d26ed664c4fe2cca81a08c8e07d4c1c04f2f4ac7655c2dd85467fda0"
-dependencies = [
- "libp2p-core 0.39.2",
- "libp2p-identity",
- "libp2p-swarm 0.42.2",
- "void",
-]
-
 [[package]]
 name = "libp2p-core"
 version = "0.39.0"
@@ -4586,23 +3976,23 @@ source = "git+https://github.com/ChainSafe/rust-libp2p.git?rev=e3440d25681df380c
 dependencies = [
  "asn1_der",
  "bs58 0.4.0",
- "ed25519-dalek 1.0.1",
+ "ed25519-dalek",
  "either",
  "fnv",
  "futures",
  "futures-timer",
  "instant",
  "log",
- "multiaddr 0.17.0",
+ "multiaddr",
  "multihash",
- "multistream-select 0.12.1 (git+https://github.com/ChainSafe/rust-libp2p.git?rev=e3440d25681df380c9f0f8cfdcfd5ecc0a4f2fb6)",
+ "multistream-select",
  "once_cell",
  "parking_lot 0.12.1",
  "pin-project",
  "prost 0.11.9",
  "prost-build",
  "rand 0.8.5",
- "rw-stream-sink 0.3.0 (git+https://github.com/ChainSafe/rust-libp2p.git?rev=e3440d25681df380c9f0f8cfdcfd5ecc0a4f2fb6)",
+ "rw-stream-sink",
  "sec1 0.3.0",
  "sha2 0.10.8",
  "smallvec",
@@ -4612,56 +4002,13 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "libp2p-core"
-version = "0.39.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c1df63c0b582aa434fb09b2d86897fa2b419ffeccf934b36f87fcedc8e835c2"
-dependencies = [
- "either",
- "fnv",
- "futures",
- "futures-timer",
- "instant",
- "libp2p-identity",
- "log",
- "multiaddr 0.17.1",
- "multihash",
- "multistream-select 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "once_cell",
- "parking_lot 0.12.1",
- "pin-project",
- "quick-protobuf",
- "rand 0.8.5",
- "rw-stream-sink 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde",
- "smallvec",
- "thiserror",
- "unsigned-varint",
- "void",
-]
-
-[[package]]
-name = "libp2p-dns"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "146ff7034daae62077c415c2376b8057368042df6ab95f5432ad5e88568b1554"
-dependencies = [
- "futures",
- "libp2p-core 0.39.2",
- "log",
- "parking_lot 0.12.1",
- "smallvec",
- "trust-dns-resolver",
-]
-
 [[package]]
 name = "libp2p-dns"
 version = "0.39.0"
 source = "git+https://github.com/ChainSafe/rust-libp2p.git?rev=e3440d25681df380c9f0f8cfdcfd5ecc0a4f2fb6#e3440d25681df380c9f0f8cfdcfd5ecc0a4f2fb6"
 dependencies = [
  "futures",
- "libp2p-core 0.39.0",
+ "libp2p-core",
  "log",
  "parking_lot 0.12.1",
  "smallvec",
@@ -4681,8 +4028,8 @@ dependencies = [
  "futures",
  "hex_fmt",
  "instant",
- "libp2p-core 0.39.0",
- "libp2p-swarm 0.42.0",
+ "libp2p-core",
+ "libp2p-swarm",
  "log",
  "prometheus-client",
  "prost 0.11.9",
@@ -4697,39 +4044,6 @@ dependencies = [
  "wasm-timer",
 ]
 
-[[package]]
-name = "libp2p-gossipsub"
-version = "0.44.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70b34b6da8165c0bde35c82db8efda39b824776537e73973549e76cadb3a77c5"
-dependencies = [
- "asynchronous-codec",
- "base64 0.21.4",
- "byteorder",
- "bytes",
- "either",
- "fnv",
- "futures",
- "hex_fmt",
- "instant",
- "libp2p-core 0.39.2",
- "libp2p-identity",
- "libp2p-swarm 0.42.2",
- "log",
- "prometheus-client",
- "quick-protobuf",
- "quick-protobuf-codec",
- "rand 0.8.5",
- "regex",
- "serde",
- "sha2 0.10.8",
- "smallvec",
- "thiserror",
- "unsigned-varint",
- "void",
- "wasm-timer",
-]
-
 [[package]]
 name = "libp2p-identify"
 version = "0.42.0"
@@ -4739,10 +4053,10 @@ dependencies = [
  "either",
  "futures",
  "futures-timer",
- "libp2p-core 0.39.0",
- "libp2p-swarm 0.42.0",
+ "libp2p-core",
+ "libp2p-swarm",
  "log",
- "lru 0.9.0",
+ "lru",
  "prost 0.11.9",
  "prost-build",
  "prost-codec",
@@ -4751,54 +4065,6 @@ dependencies = [
  "void",
 ]
 
-[[package]]
-name = "libp2p-identity"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "276bb57e7af15d8f100d3c11cbdd32c6752b7eef4ba7a18ecf464972c07abcce"
-dependencies = [
- "bs58 0.4.0",
- "ed25519-dalek 2.0.0",
- "log",
- "multiaddr 0.17.1",
- "multihash",
- "quick-protobuf",
- "rand 0.8.5",
- "serde",
- "sha2 0.10.8",
- "thiserror",
- "zeroize",
-]
-
-[[package]]
-name = "libp2p-kad"
-version = "0.43.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39d5ef876a2b2323d63c258e63c2f8e36f205fe5a11f0b3095d59635650790ff"
-dependencies = [
- "arrayvec",
- "asynchronous-codec",
- "bytes",
- "either",
- "fnv",
- "futures",
- "futures-timer",
- "instant",
- "libp2p-core 0.39.2",
- "libp2p-identity",
- "libp2p-swarm 0.42.2",
- "log",
- "quick-protobuf",
- "rand 0.8.5",
- "serde",
- "sha2 0.10.8",
- "smallvec",
- "thiserror",
- "uint",
- "unsigned-varint",
- "void",
-]
-
 [[package]]
 name = "libp2p-mdns"
 version = "0.43.0"
@@ -4807,8 +4073,8 @@ dependencies = [
  "data-encoding",
  "futures",
  "if-watch",
- "libp2p-core 0.39.0",
- "libp2p-swarm 0.42.0",
+ "libp2p-core",
+ "libp2p-swarm",
  "log",
  "rand 0.8.5",
  "smallvec",
@@ -4818,50 +4084,16 @@ dependencies = [
  "void",
 ]
 
-[[package]]
-name = "libp2p-mdns"
-version = "0.43.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19983e1f949f979a928f2c603de1cf180cc0dc23e4ac93a62651ccb18341460b"
-dependencies = [
- "data-encoding",
- "futures",
- "if-watch",
- "libp2p-core 0.39.2",
- "libp2p-identity",
- "libp2p-swarm 0.42.2",
- "log",
- "rand 0.8.5",
- "smallvec",
- "socket2 0.4.9",
- "tokio",
- "trust-dns-proto",
- "void",
-]
-
-[[package]]
-name = "libp2p-metrics"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a42ec91e227d7d0dafa4ce88b333cdf5f277253873ab087555c92798db2ddd46"
-dependencies = [
- "libp2p-core 0.39.2",
- "libp2p-gossipsub 0.44.4",
- "libp2p-kad",
- "libp2p-swarm 0.42.2",
- "prometheus-client",
-]
-
 [[package]]
 name = "libp2p-metrics"
 version = "0.12.0"
 source = "git+https://github.com/ChainSafe/rust-libp2p.git?rev=e3440d25681df380c9f0f8cfdcfd5ecc0a4f2fb6#e3440d25681df380c9f0f8cfdcfd5ecc0a4f2fb6"
 dependencies = [
- "libp2p-core 0.39.0",
- "libp2p-gossipsub 0.44.0",
+ "libp2p-core",
+ "libp2p-gossipsub",
  "libp2p-identify",
  "libp2p-ping",
- "libp2p-swarm 0.42.0",
+ "libp2p-swarm",
  "prometheus-client",
 ]
 
@@ -4873,7 +4105,7 @@ dependencies = [
  "asynchronous-codec",
  "bytes",
  "futures",
- "libp2p-core 0.39.0",
+ "libp2p-core",
  "log",
  "nohash-hasher",
  "parking_lot 0.12.1",
@@ -4890,7 +4122,7 @@ dependencies = [
  "bytes",
  "curve25519-dalek 3.2.0",
  "futures",
- "libp2p-core 0.39.0",
+ "libp2p-core",
  "log",
  "once_cell",
  "prost 0.11.9",
@@ -4904,29 +4136,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "libp2p-noise"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c3673da89d29936bc6435bafc638e2f184180d554ce844db65915113f86ec5e"
-dependencies = [
- "bytes",
- "curve25519-dalek 3.2.0",
- "futures",
- "libp2p-core 0.39.2",
- "libp2p-identity",
- "log",
- "once_cell",
- "quick-protobuf",
- "rand 0.8.5",
- "sha2 0.10.8",
- "snow",
- "static_assertions",
- "thiserror",
- "x25519-dalek 1.1.1",
- "zeroize",
-]
-
 [[package]]
 name = "libp2p-ping"
 version = "0.42.0"
@@ -4936,8 +4145,8 @@ dependencies = [
  "futures",
  "futures-timer",
  "instant",
- "libp2p-core 0.39.0",
- "libp2p-swarm 0.42.0",
+ "libp2p-core",
+ "libp2p-swarm",
  "log",
  "rand 0.8.5",
  "void",
@@ -4952,8 +4161,8 @@ dependencies = [
  "futures",
  "futures-timer",
  "if-watch",
- "libp2p-core 0.39.0",
- "libp2p-tls 0.1.0-alpha.2",
+ "libp2p-core",
+ "libp2p-tls",
  "log",
  "parking_lot 0.12.1",
  "quinn-proto",
@@ -4963,44 +4172,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "libp2p-quic"
-version = "0.7.0-alpha.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6b26abd81cd2398382a1edfe739b539775be8a90fa6914f39b2ab49571ec735"
-dependencies = [
- "bytes",
- "futures",
- "futures-timer",
- "if-watch",
- "libp2p-core 0.39.2",
- "libp2p-identity",
- "libp2p-tls 0.1.0",
- "log",
- "parking_lot 0.12.1",
- "quinn-proto",
- "rand 0.8.5",
- "rustls 0.20.9",
- "thiserror",
- "tokio",
-]
-
-[[package]]
-name = "libp2p-request-response"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffdb374267d42dc5ed5bc53f6e601d4a64ac5964779c6e40bb9e4f14c1e30d5"
-dependencies = [
- "async-trait",
- "futures",
- "instant",
- "libp2p-core 0.39.2",
- "libp2p-identity",
- "libp2p-swarm 0.42.2",
- "rand 0.8.5",
- "smallvec",
-]
-
 [[package]]
 name = "libp2p-swarm"
 version = "0.42.0"
@@ -5011,8 +4182,8 @@ dependencies = [
  "futures",
  "futures-timer",
  "instant",
- "libp2p-core 0.39.0",
- "libp2p-swarm-derive 0.32.0 (git+https://github.com/ChainSafe/rust-libp2p.git?rev=e3440d25681df380c9f0f8cfdcfd5ecc0a4f2fb6)",
+ "libp2p-core",
+ "libp2p-swarm-derive",
  "log",
  "rand 0.8.5",
  "smallvec",
@@ -5020,38 +4191,6 @@ dependencies = [
  "void",
 ]
 
-[[package]]
-name = "libp2p-swarm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "903b3d592d7694e56204d211f29d31bc004be99386644ba8731fc3e3ef27b296"
-dependencies = [
- "either",
- "fnv",
- "futures",
- "futures-timer",
- "instant",
- "libp2p-core 0.39.2",
- "libp2p-identity",
- "libp2p-swarm-derive 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log",
- "rand 0.8.5",
- "smallvec",
- "tokio",
- "void",
-]
-
-[[package]]
-name = "libp2p-swarm-derive"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fba456131824ab6acd4c7bf61e9c0f0a3014b5fc9868ccb8e10d344594cdc4f"
-dependencies = [
- "heck 0.4.1",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "libp2p-swarm-derive"
 version = "0.32.0"
@@ -5062,22 +4201,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "libp2p-tcp"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33d33698596d7722d85d3ab0c86c2c322254fce1241e91208e3679b4eb3026cf"
-dependencies = [
- "futures",
- "futures-timer",
- "if-watch",
- "libc",
- "libp2p-core 0.39.2",
- "log",
- "socket2 0.4.9",
- "tokio",
-]
-
 [[package]]
 name = "libp2p-tcp"
 version = "0.39.0"
@@ -5087,7 +4210,7 @@ dependencies = [
  "futures-timer",
  "if-watch",
  "libc",
- "libp2p-core 0.39.0",
+ "libp2p-core",
  "log",
  "socket2 0.4.9",
  "tokio",
@@ -5100,26 +4223,7 @@ source = "git+https://github.com/ChainSafe/rust-libp2p.git?rev=e3440d25681df380c
 dependencies = [
  "futures",
  "futures-rustls",
- "libp2p-core 0.39.0",
- "rcgen 0.10.0",
- "ring 0.16.20",
- "rustls 0.20.9",
- "thiserror",
- "webpki 0.22.4",
- "x509-parser 0.14.0",
- "yasna",
-]
-
-[[package]]
-name = "libp2p-tls"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff08d13d0dc66e5e9ba6279c1de417b84fa0d0adc3b03e5732928c180ec02781"
-dependencies = [
- "futures",
- "futures-rustls",
- "libp2p-core 0.39.2",
- "libp2p-identity",
+ "libp2p-core",
  "rcgen 0.10.0",
  "ring 0.16.20",
  "rustls 0.20.9",
@@ -5141,8 +4245,8 @@ dependencies = [
  "futures-timer",
  "hex",
  "if-watch",
- "libp2p-core 0.39.0",
- "libp2p-noise 0.42.0",
+ "libp2p-core",
+ "libp2p-noise",
  "log",
  "multihash",
  "prost 0.11.9",
@@ -5159,37 +4263,6 @@ dependencies = [
  "webrtc",
 ]
 
-[[package]]
-name = "libp2p-webrtc"
-version = "0.4.0-alpha.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dba48592edbc2f60b4bc7c10d65445b0c3964c07df26fdf493b6880d33be36f8"
-dependencies = [
- "async-trait",
- "asynchronous-codec",
- "bytes",
- "futures",
- "futures-timer",
- "hex",
- "if-watch",
- "libp2p-core 0.39.2",
- "libp2p-identity",
- "libp2p-noise 0.42.2",
- "log",
- "multihash",
- "quick-protobuf",
- "quick-protobuf-codec",
- "rand 0.8.5",
- "rcgen 0.9.3",
- "serde",
- "stun",
- "thiserror",
- "tinytemplate",
- "tokio",
- "tokio-util",
- "webrtc",
-]
-
 [[package]]
 name = "libp2p-websocket"
 version = "0.41.0"
@@ -5198,11 +4271,11 @@ dependencies = [
  "either",
  "futures",
  "futures-rustls",
- "libp2p-core 0.39.0",
+ "libp2p-core",
  "log",
  "parking_lot 0.12.1",
  "quicksink",
- "rw-stream-sink 0.3.0 (git+https://github.com/ChainSafe/rust-libp2p.git?rev=e3440d25681df380c9f0f8cfdcfd5ecc0a4f2fb6)",
+ "rw-stream-sink",
  "soketto",
  "url",
  "webpki-roots 0.22.6",
@@ -5214,20 +4287,7 @@ version = "0.43.0"
 source = "git+https://github.com/ChainSafe/rust-libp2p.git?rev=e3440d25681df380c9f0f8cfdcfd5ecc0a4f2fb6#e3440d25681df380c9f0f8cfdcfd5ecc0a4f2fb6"
 dependencies = [
  "futures",
- "libp2p-core 0.39.0",
- "log",
- "thiserror",
- "yamux",
-]
-
-[[package]]
-name = "libp2p-yamux"
-version = "0.43.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd21d950662700a385d4c6d68e2f5f54d778e97068cdd718522222ef513bda"
-dependencies = [
- "futures",
- "libp2p-core 0.39.2",
+ "libp2p-core",
  "log",
  "thiserror",
  "yamux",
@@ -5244,20 +4304,6 @@ dependencies = [
  "vcpkg",
 ]
 
-[[package]]
-name = "libssh2-sys"
-version = "0.2.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b094a36eb4b8b8c8a7b4b8ae43b2944502be3e59cd87687595cf6b0a71b3f4ca"
-dependencies = [
- "cc",
- "libc",
- "libz-sys",
- "openssl-sys",
- "pkg-config",
- "vcpkg",
-]
-
 [[package]]
 name = "libz-sys"
 version = "1.1.12"
@@ -5300,23 +4346,6 @@ dependencies = [
  "keystream",
 ]
 
-[[package]]
-name = "local-channel"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a493488de5f18c8ffcba89eebb8532ffc562dc400490eb65b84893fae0b178"
-dependencies = [
- "futures-core",
- "futures-sink",
- "local-waker",
-]
-
-[[package]]
-name = "local-waker"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e34f76eb3611940e0e7d53a9aaa4e6a3151f69541a282fd0dad5571420c53ff1"
-
 [[package]]
 name = "lock_api"
 version = "0.4.11"
@@ -5357,15 +4386,6 @@ dependencies = [
  "hashbrown 0.13.2",
 ]
 
-[[package]]
-name = "lru"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670"
-dependencies = [
- "hashbrown 0.13.2",
-]
-
 [[package]]
 name = "lru-cache"
 version = "0.1.2"
@@ -5569,25 +4589,6 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "multiaddr"
-version = "0.17.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b36f567c7099511fa8612bbbb52dda2419ce0bdbacf31714e3a5ffdb766d3bd"
-dependencies = [
- "arrayref",
- "byteorder",
- "data-encoding",
- "log",
- "multibase",
- "multihash",
- "percent-encoding",
- "serde",
- "static_assertions",
- "unsigned-varint",
- "url",
-]
-
 [[package]]
 name = "multibase"
 version = "0.9.1"
@@ -5608,8 +4609,6 @@ dependencies = [
  "core2",
  "digest 0.10.7",
  "multihash-derive",
- "serde",
- "serde-big-array",
  "sha2 0.10.8",
  "unsigned-varint",
 ]
@@ -5634,20 +4633,6 @@ version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
 
-[[package]]
-name = "multistream-select"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8552ab875c1313b97b8d20cb857b9fd63e2d1d6a0a1b53ce9821e575405f27a"
-dependencies = [
- "bytes",
- "futures",
- "log",
- "pin-project",
- "smallvec",
- "unsigned-varint",
-]
-
 [[package]]
 name = "multistream-select"
 version = "0.12.1"
@@ -5661,24 +4646,6 @@ dependencies = [
  "unsigned-varint",
 ]
 
-[[package]]
-name = "native-tls"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
-dependencies = [
- "lazy_static",
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
-]
-
 [[package]]
 name = "netlink-packet-core"
 version = "0.4.2"
@@ -5796,6 +4763,15 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "newline-converter"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f71d09d5c87634207f894c6b31b6a2b2c64ea3bdcf71bd5599fdbbe1600c00f"
+dependencies = [
+ "unicode-segmentation",
+]
+
 [[package]]
 name = "nix"
 version = "0.24.3"
@@ -5842,15 +4818,6 @@ dependencies = [
  "minimal-lexical",
 ]
 
-[[package]]
-name = "nom8"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "notify"
 version = "5.2.0"
@@ -5953,14 +4920,11 @@ dependencies = [
 name = "nym-api"
 version = "1.1.34"
 dependencies = [
- "actix-web",
  "anyhow",
- "array-bytes",
  "async-trait",
  "bip39",
  "bs58 0.4.0",
  "cfg-if",
- "chrono",
  "clap 4.4.7",
  "console-subscriber",
  "cosmwasm-std",
@@ -5969,9 +4933,7 @@ dependencies = [
  "cw3",
  "cw4",
  "dirs 4.0.0",
- "ephemera",
  "futures",
- "futures-util",
  "getset",
  "humantime-serde",
  "itertools 0.12.0",
@@ -5990,7 +4952,6 @@ dependencies = [
  "nym-credentials",
  "nym-crypto",
  "nym-dkg",
- "nym-ephemera-common",
  "nym-gateway-client",
  "nym-inclusion-probability",
  "nym-mixnet-contract-common",
@@ -6009,14 +4970,16 @@ dependencies = [
  "pin-project",
  "rand 0.7.3",
  "rand 0.8.5",
+ "rand_chacha 0.2.2",
+ "rand_chacha 0.3.1",
  "reqwest",
  "rocket",
  "rocket_cors",
  "rocket_okapi",
  "schemars",
  "serde",
- "serde_derive",
  "serde_json",
+ "sha2 0.9.9",
  "sqlx",
  "tap",
  "tempfile",
@@ -6026,7 +4989,6 @@ dependencies = [
  "tokio-stream",
  "ts-rs",
  "url",
- "uuid 1.5.0",
  "zeroize",
 ]
 
@@ -6116,6 +5078,7 @@ dependencies = [
  "clap_complete",
  "clap_complete_fig",
  "dotenvy",
+ "inquire",
  "log",
  "nym-bin-common",
  "nym-cli-commands",
@@ -6141,9 +5104,11 @@ dependencies = [
  "comfy-table",
  "cosmrs 0.15.0 (git+https://github.com/jstuczyn/cosmos-rust?branch=nym-temp/all-validator-features)",
  "cosmwasm-std",
+ "csv",
  "cw-utils",
  "handlebars",
  "humantime-serde",
+ "inquire",
  "k256",
  "log",
  "nym-bandwidth-controller",
@@ -6338,6 +5303,8 @@ dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
  "cw-utils",
+ "cw2",
+ "cw4",
  "nym-contracts-common",
  "nym-multisig-contract-common",
 ]
@@ -6431,7 +5398,7 @@ dependencies = [
  "cipher 0.4.4",
  "ctr 0.9.2",
  "digest 0.10.7",
- "ed25519-dalek 1.0.1",
+ "ed25519-dalek",
  "generic-array 0.14.7",
  "hkdf 0.12.3",
  "hmac 0.12.1",
@@ -6666,10 +5633,13 @@ version = "0.1.0"
 dependencies = [
  "bincode",
  "bytes",
+ "nym-bin-common",
  "nym-sphinx",
  "rand 0.8.5",
  "serde",
  "thiserror",
+ "tokio",
+ "tokio-util",
 ]
 
 [[package]]
@@ -6677,21 +5647,27 @@ name = "nym-ip-packet-router"
 version = "0.1.0"
 dependencies = [
  "bincode",
+ "bs58 0.4.0",
  "bytes",
+ "clap 4.4.7",
  "etherparse",
  "futures",
+ "lazy_static",
  "log",
  "nym-bin-common",
  "nym-client-core",
  "nym-config",
+ "nym-crypto",
  "nym-exit-policy",
  "nym-ip-packet-requests",
+ "nym-network-defaults",
  "nym-network-requester",
  "nym-sdk",
  "nym-service-providers-common",
  "nym-sphinx",
  "nym-task",
  "nym-tun",
+ "nym-types",
  "nym-wireguard",
  "nym-wireguard-types",
  "rand 0.8.5",
@@ -6702,6 +5678,7 @@ dependencies = [
  "thiserror",
  "tokio",
  "tokio-tun",
+ "tokio-util",
  "url",
 ]
 
@@ -6711,11 +5688,11 @@ version = "0.1.0"
 dependencies = [
  "futures",
  "log",
- "nym-client-core",
  "nym-crypto",
  "nym-noise",
  "nym-sphinx",
  "nym-task",
+ "nym-topology-control",
  "nym-validator-client",
  "rand 0.7.3",
  "tokio",
@@ -6858,6 +5835,7 @@ dependencies = [
  "cfg-if",
  "dotenvy",
  "hex-literal",
+ "log",
  "once_cell",
  "schemars",
  "serde",
@@ -7115,7 +6093,7 @@ dependencies = [
  "hex",
  "http",
  "httpcodec",
- "libp2p 0.51.0",
+ "libp2p",
  "log",
  "nym-bandwidth-controller",
  "nym-bin-common",
@@ -7258,7 +6236,6 @@ dependencies = [
  "nym-credential-storage",
  "nym-crypto",
  "nym-socks5-client-core",
- "openssl",
  "rand 0.7.3",
  "safer-ffi",
  "serde",
@@ -7613,7 +6590,6 @@ dependencies = [
  "nym-network-defaults",
  "nym-service-provider-directory-common",
  "nym-vesting-contract-common",
- "openssl",
  "prost 0.12.1",
  "reqwest",
  "serde",
@@ -7809,9 +6785,9 @@ dependencies = [
 
 [[package]]
 name = "okapi"
-version = "0.7.0-rc.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce66b6366e049880a35c378123fddb630b1a1a3c37fa1ca70caaf4a09f6e2893"
+checksum = "9a64853d7ab065474e87696f7601cee817d200e86c42e04004e005cb3e20c3c5"
 dependencies = [
  "log",
  "schemars",
@@ -7843,47 +6819,12 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
-[[package]]
-name = "openssl"
-version = "0.10.57"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c"
-dependencies = [
- "bitflags 2.4.1",
- "cfg-if",
- "foreign-types",
- "libc",
- "once_cell",
- "openssl-macros",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.38",
-]
-
 [[package]]
 name = "openssl-probe"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
-[[package]]
-name = "openssl-src"
-version = "300.1.5+3.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "559068e4c12950d7dcaa1857a61725c0d38d4fc03ff8e070ab31a75d6e316491"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "openssl-sys"
 version = "0.9.93"
@@ -7892,7 +6833,6 @@ checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d"
 dependencies = [
  "cc",
  "libc",
- "openssl-src",
  "pkg-config",
  "vcpkg",
 ]
@@ -8116,12 +7056,6 @@ version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
 
-[[package]]
-name = "pathdiff"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
-
 [[package]]
 name = "pbkdf2"
 version = "0.12.2"
@@ -8140,7 +7074,7 @@ checksum = "61a386cd715229d399604b50d1361683fe687066f42d56f54be995bc6868f71c"
 dependencies = [
  "inlinable_string",
  "pear_codegen",
- "yansi 1.0.0-rc.1",
+ "yansi",
 ]
 
 [[package]]
@@ -8517,7 +7451,7 @@ dependencies = [
  "quote",
  "syn 2.0.38",
  "version_check",
- "yansi 1.0.0-rc.1",
+ "yansi",
 ]
 
 [[package]]
@@ -8678,28 +7612,6 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
 
-[[package]]
-name = "quick-protobuf"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d6da84cc204722a989e01ba2f6e1e276e190f22263d0cb6ce8526fcdb0d2e1f"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "quick-protobuf-codec"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1693116345026436eb2f10b677806169c1a1260c1c60eaaffe3fb5a29ae23d8b"
-dependencies = [
- "asynchronous-codec",
- "bytes",
- "quick-protobuf",
- "thiserror",
- "unsigned-varint",
-]
-
 [[package]]
 name = "quicksink"
 version = "0.1.2"
@@ -9061,50 +7973,6 @@ dependencies = [
  "syn 2.0.38",
 ]
 
-[[package]]
-name = "refinery"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "529664dbccc0a296947615c997a857912d72d1c44be1fafb7bae54ecfa7a8c24"
-dependencies = [
- "refinery-core",
- "refinery-macros",
-]
-
-[[package]]
-name = "refinery-core"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e895cb870cf06e92318cbbeb701f274d022d5ca87a16fa8244e291cd035ef954"
-dependencies = [
- "async-trait",
- "cfg-if",
- "lazy_static",
- "log",
- "regex",
- "rusqlite",
- "serde",
- "siphasher",
- "thiserror",
- "time",
- "toml 0.7.8",
- "url",
- "walkdir",
-]
-
-[[package]]
-name = "refinery-macros"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "123e8b80f8010c3ae38330c81e76938fc7adf6cdbfbaad20295bb8c22718b4f1"
-dependencies = [
- "proc-macro2",
- "quote",
- "refinery-core",
- "regex",
- "syn 2.0.38",
-]
-
 [[package]]
 name = "regex"
 version = "1.10.2"
@@ -9165,12 +8033,10 @@ dependencies = [
  "http-body",
  "hyper",
  "hyper-rustls",
- "hyper-tls",
  "ipnet",
  "js-sys",
  "log",
  "mime",
- "native-tls",
  "once_cell",
  "percent-encoding",
  "pin-project-lite 0.2.13",
@@ -9182,7 +8048,6 @@ dependencies = [
  "serde_urlencoded",
  "system-configuration",
  "tokio",
- "tokio-native-tls",
  "tokio-rustls 0.24.1",
  "tokio-socks",
  "tokio-util",
@@ -9192,6 +8057,7 @@ dependencies = [
  "wasm-bindgen-futures",
  "wasm-streams",
  "web-sys",
+ "webpki-roots 0.25.2",
  "winreg",
 ]
 
@@ -9266,9 +8132,9 @@ dependencies = [
 
 [[package]]
 name = "rocket"
-version = "0.5.0-rc.3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58734f7401ae5cfd129685b48f61182331745b357b96f2367f01aebaf1cc9cc9"
+checksum = "9e7bb57ccb26670d73b6a47396c83139447b9e7878cab627fdfe9ea8da489150"
 dependencies = [
  "async-stream",
  "async-trait",
@@ -9278,8 +8144,7 @@ dependencies = [
  "either",
  "figment",
  "futures",
- "indexmap 1.9.3",
- "is-terminal",
+ "indexmap 2.0.2",
  "log",
  "memchr",
  "multer",
@@ -9300,30 +8165,33 @@ dependencies = [
  "tokio-util",
  "ubyte",
  "version_check",
- "yansi 0.5.1",
+ "yansi",
 ]
 
 [[package]]
 name = "rocket_codegen"
-version = "0.5.0-rc.3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7093353f14228c744982e409259fb54878ba9563d08214f2d880d59ff2fc508b"
+checksum = "a2238066abf75f21be6cd7dc1a09d5414a671f4246e384e49fe3f8a4936bd04c"
 dependencies = [
  "devise",
  "glob",
- "indexmap 1.9.3",
+ "indexmap 2.0.2",
  "proc-macro2",
  "quote",
  "rocket_http",
  "syn 2.0.38",
  "unicode-xid",
+ "version_check",
 ]
 
 [[package]]
 name = "rocket_cors"
-version = "0.5.2"
-source = "git+https://github.com/lawliet89/rocket_cors?rev=dfd3662c49e2f6fc37df35091cb94d82f7fb5915#dfd3662c49e2f6fc37df35091cb94d82f7fb5915"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfac3a1df83f8d4fc96aa41dba3b86c786417b7fc0f52ec76295df2ba781aa69"
 dependencies = [
+ "http",
  "log",
  "regex",
  "rocket",
@@ -9336,16 +8204,16 @@ dependencies = [
 
 [[package]]
 name = "rocket_http"
-version = "0.5.0-rc.3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "936012c99162a03a67f37f9836d5f938f662e26f2717809761a9ac46432090f4"
+checksum = "37a1663694d059fe5f943ea5481363e48050acedd241d46deb2e27f71110389e"
 dependencies = [
- "cookie 0.17.0",
+ "cookie",
  "either",
  "futures",
  "http",
  "hyper",
- "indexmap 1.9.3",
+ "indexmap 2.0.2",
  "log",
  "memchr",
  "pear",
@@ -9363,11 +8231,10 @@ dependencies = [
 
 [[package]]
 name = "rocket_okapi"
-version = "0.8.0-rc.3"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "742098674565c8f0c35c77444f90344aafedebb71cfee9cdbf0185acc6b9cdb7"
+checksum = "e059407ecef9ee2f071fc971e10444fcf942149deb028879d6d8ca61a7ce9edc"
 dependencies = [
- "either",
  "log",
  "okapi",
  "rocket",
@@ -9379,9 +8246,9 @@ dependencies = [
 
 [[package]]
 name = "rocket_okapi_codegen"
-version = "0.8.0-rc.3"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c43f8edc57d88750a220b0ec1870a36c1106204ec99cc35131b49de3b954a4a"
+checksum = "cfb96114e69e5d7f80bfa0948cbc0120016e9b460954abe9eed37e9a2ad3f999"
 dependencies = [
  "darling 0.13.4",
  "proc-macro2",
@@ -9430,21 +8297,6 @@ dependencies = [
  "webrtc-util",
 ]
 
-[[package]]
-name = "rusqlite"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85127183a999f7db96d1a976a309eebbfb6ea3b0b400ddd8340190129de6eb7a"
-dependencies = [
- "bitflags 1.3.2",
- "fallible-iterator",
- "fallible-streaming-iterator",
- "hashlink 0.7.0",
- "libsqlite3-sys",
- "memchr",
- "smallvec",
-]
-
 [[package]]
 name = "rust-embed"
 version = "6.8.1"
@@ -9620,17 +8472,6 @@ version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
 
-[[package]]
-name = "rw-stream-sink"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26338f5e09bb721b85b135ea05af7767c90b52f6de4f087d4f4a3a9d64e7dc04"
-dependencies = [
- "futures",
- "pin-project",
- "static_assertions",
-]
-
 [[package]]
 name = "rw-stream-sink"
 version = "0.3.0"
@@ -9697,9 +8538,9 @@ dependencies = [
 
 [[package]]
 name = "schemars"
-version = "0.8.15"
+version = "0.8.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f7b0ce13155372a76ee2e1c5ffba1fe61ede73fbea5630d61eee6fac4929c0c"
+checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29"
 dependencies = [
  "dyn-clone",
  "indexmap 1.9.3",
@@ -9710,9 +8551,9 @@ dependencies = [
 
 [[package]]
 name = "schemars_derive"
-version = "0.8.15"
+version = "0.8.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e85e2a16b12bdb763244c69ab79363d71db2b4b918a2def53f80b02e0574b13c"
+checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9752,18 +8593,6 @@ dependencies = [
  "untrusted 0.7.1",
 ]
 
-[[package]]
-name = "sdk-version-bump"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "cargo-edit",
- "clap 4.4.7",
- "semver 1.0.20",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "sdp"
 version = "0.5.3"
@@ -9850,9 +8679,6 @@ name = "semver"
 version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
-dependencies = [
- "serde",
-]
 
 [[package]]
 name = "semver-parser"
@@ -9878,15 +8704,6 @@ dependencies = [
  "serde_derive",
 ]
 
-[[package]]
-name = "serde-big-array"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd31f59f6fe2b0c055371bb2f16d7f0aa7d8881676c04a55b1596d1a17cd10a4"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "serde-json-wasm"
 version = "0.5.0"
@@ -10166,12 +8983,6 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
-[[package]]
-name = "siphasher"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54ac45299ccbd390721be55b412d41931911f654fa99e2cb8bfb57184b2061fe"
-
 [[package]]
 name = "slab"
 version = "0.4.9"
@@ -10198,18 +9009,6 @@ version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
 
-[[package]]
-name = "smartstring"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29"
-dependencies = [
- "autocfg 1.1.0",
- "serde",
- "static_assertions",
- "version_check",
-]
-
 [[package]]
 name = "snafu"
 version = "0.7.5"
@@ -10269,17 +9068,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "socks"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0c3dbbd9ae980613c6dd8e28a9407b50509d3803b57624d5dfe8315218cd58b"
-dependencies = [
- "byteorder",
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "soketto"
 version = "0.7.1"
@@ -10399,7 +9187,7 @@ dependencies = [
  "futures-executor",
  "futures-intrusive",
  "futures-util",
- "hashlink 0.8.4",
+ "hashlink",
  "hex",
  "indexmap 1.9.3",
  "itoa",
@@ -10475,9 +9263,9 @@ dependencies = [
 
 [[package]]
 name = "state"
-version = "0.5.3"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b"
+checksum = "2b8c4a4445d81357df8b1a650d0d0d6fbbbfe99d064aa5e02f3e4022061476d8"
 dependencies = [
  "loom",
 ]
@@ -10587,16 +9375,6 @@ dependencies = [
  "webrtc-util",
 ]
 
-[[package]]
-name = "subprocess"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c2e86926081dda636c546d8c5e641661049d7562a68f5488be4a1f7f66f6086"
-dependencies = [
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "substring"
 version = "1.4.5"
@@ -10844,16 +9622,6 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "terminal_size"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
-dependencies = [
- "rustix 0.38.19",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "textwrap"
 version = "0.16.0"
@@ -11010,16 +9778,6 @@ dependencies = [
  "syn 2.0.38",
 ]
 
-[[package]]
-name = "tokio-native-tls"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
-dependencies = [
- "native-tls",
- "tokio",
-]
-
 [[package]]
 name = "tokio-rustls"
 version = "0.23.4"
@@ -11098,9 +9856,8 @@ checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c"
 dependencies = [
  "futures-util",
  "log",
- "native-tls",
+ "rustls 0.21.7",
  "tokio",
- "tokio-native-tls",
  "tungstenite",
 ]
 
@@ -11139,7 +9896,7 @@ checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
 dependencies = [
  "serde",
  "serde_spanned",
- "toml_datetime 0.6.3",
+ "toml_datetime",
  "toml_edit 0.19.15",
 ]
 
@@ -11151,19 +9908,10 @@ checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d"
 dependencies = [
  "serde",
  "serde_spanned",
- "toml_datetime 0.6.3",
+ "toml_datetime",
  "toml_edit 0.20.2",
 ]
 
-[[package]]
-name = "toml_datetime"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "toml_datetime"
 version = "0.6.3"
@@ -11173,20 +9921,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "toml_edit"
-version = "0.16.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd30deba9a1cd7153c22aecf93e86df639e7b81c622b0af8d9255e989991a7b7"
-dependencies = [
- "indexmap 1.9.3",
- "itertools 0.10.5",
- "kstring",
- "nom8",
- "serde",
- "toml_datetime 0.5.1",
-]
-
 [[package]]
 name = "toml_edit"
 version = "0.19.15"
@@ -11196,7 +9930,7 @@ dependencies = [
  "indexmap 2.0.2",
  "serde",
  "serde_spanned",
- "toml_datetime 0.6.3",
+ "toml_datetime",
  "winnow",
 ]
 
@@ -11209,7 +9943,7 @@ dependencies = [
  "indexmap 2.0.2",
  "serde",
  "serde_spanned",
- "toml_datetime 0.6.3",
+ "toml_datetime",
  "winnow",
 ]
 
@@ -11553,7 +10287,6 @@ dependencies = [
  "http",
  "httparse",
  "log",
- "native-tls",
  "rand 0.8.5",
  "rustls 0.21.7",
  "sha1",
@@ -11602,18 +10335,6 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
 
-[[package]]
-name = "uint"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52"
-dependencies = [
- "byteorder",
- "crunchy",
- "hex",
- "static_assertions",
-]
-
 [[package]]
 name = "uncased"
 version = "0.9.9"
@@ -11751,25 +10472,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0976c77def3f1f75c4ef892a292c31c0bbe9e3d0702c63044d7c76db298171a3"
 
-[[package]]
-name = "ureq"
-version = "2.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3"
-dependencies = [
- "base64 0.21.4",
- "log",
- "native-tls",
- "once_cell",
- "rustls 0.21.7",
- "rustls-webpki",
- "serde",
- "serde_json",
- "socks",
- "url",
- "webpki-roots 0.25.2",
-]
-
 [[package]]
 name = "url"
 version = "2.4.1"
@@ -11831,7 +10533,6 @@ version = "3.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "84614caa239fb25b2bb373a52859ffd94605ceb256eeb1d63436325cf81e3653"
 dependencies = [
- "actix-web",
  "axum",
  "mime_guess",
  "regex",
@@ -11855,7 +10556,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc"
 dependencies = [
  "getrandom 0.2.10",
- "serde",
  "wasm-bindgen",
 ]
 
@@ -12729,17 +11429,14 @@ dependencies = [
  "static_assertions",
 ]
 
-[[package]]
-name = "yansi"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
-
 [[package]]
 name = "yansi"
 version = "1.0.0-rc.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1367295b8f788d371ce2dbc842c7b709c73ee1364d30351dd300ec2203b12377"
+dependencies = [
+ "is-terminal",
+]
 
 [[package]]
 name = "yasna"
@@ -12781,32 +11478,3 @@ dependencies = [
  "crossbeam-utils",
  "flate2",
 ]
-
-[[package]]
-name = "zstd"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c"
-dependencies = [
- "zstd-safe",
-]
-
-[[package]]
-name = "zstd-safe"
-version = "6.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581"
-dependencies = [
- "libc",
- "zstd-sys",
-]
-
-[[package]]
-name = "zstd-sys"
-version = "2.0.9+zstd.1.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656"
-dependencies = [
- "cc",
- "pkg-config",
-]
diff --git a/Cargo.toml b/Cargo.toml
index bedb046d5b..305be5b37b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -33,7 +33,7 @@ members = [
     "common/cosmwasm-smart-contracts/coconut-bandwidth-contract",
     "common/cosmwasm-smart-contracts/coconut-dkg",
     "common/cosmwasm-smart-contracts/contracts-common",
-    "common/cosmwasm-smart-contracts/ephemera",
+#    "common/cosmwasm-smart-contracts/ephemera",
     "common/cosmwasm-smart-contracts/group-contract",
     "common/cosmwasm-smart-contracts/mixnet-contract",
     "common/cosmwasm-smart-contracts/multisig-contract",
@@ -104,7 +104,7 @@ members = [
     "nym-outfox",
     "nym-validator-rewarder",
     "tools/internal/ssl-inject",
-    "tools/internal/sdk-version-bump",
+    # "tools/internal/sdk-version-bump",
     "tools/nym-cli",
     "tools/nym-nr-query",
     "tools/nymvisor",
@@ -158,7 +158,7 @@ log = "0.4"
 once_cell = "1.7.2"
 parking_lot = "0.12.1"
 rand = "0.8.5"
-reqwest = "0.11.22"
+reqwest = { version = "0.11.22", default_features = false, features = ["rustls-tls"] }
 schemars = "0.8.1"
 serde = "1.0.152"
 serde_json = "1.0.91"
@@ -168,9 +168,9 @@ time = "0.3.30"
 thiserror = "1.0.48"
 tokio = "1.33.0"
 tokio-util = "0.7.10"
-tokio-tungstenite = "0.20.1"
+tokio-tungstenite = { version = "0.20.1", features = ["rustls"] }
 tracing = "0.1.37"
-tungstenite = { version = "0.20.1", default-features = false }
+tungstenite = { version = "0.20.1", default-features = false, features = ["rustls"] }
 ts-rs = "7.0.0"
 utoipa = "3.5.0"
 utoipa-swagger-ui = "3.1.5"
diff --git a/Makefile b/Makefile
index da23d9e143..6be3f9f495 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ help:
 	@echo "  clippy: run clippy for all workspaces"
 	@echo "  test: run clippy, unit tests, and formatting."
 	@echo "  test-all: like test, but also includes the expensive tests"
-	@echo "  ppa: build debian package and generate files required for PPA update"
+	@echo "  deb: build debian packages
 
 # -----------------------------------------------------------------------------
 # Meta targets
@@ -176,6 +176,13 @@ run-api-tests:
 	cd nym-api/tests/functional_test && yarn test:qa
 
 # Build debian package, and update PPA
-# Requires base64 encode GPG key to be set up in environment PPA_SIGNING_KEY
-# ppa: build-nym-mixnode build-nym-gateway
-# 	scripts/ppa.sh
+deb-mixnode: build-nym-mixnode
+	cargo deb -p nym-mixnode 
+
+deb-gateway: build-nym-gateway
+	cargo deb -p nym-gateway
+
+deb-cli: build-nym-cli
+	cargo deb -p nym-cli
+
+deb: deb-mixnode deb-gateway deb-cli
\ No newline at end of file
diff --git a/clients/native/src/commands/init.rs b/clients/native/src/commands/init.rs
index 27f62bd05b..def0072d26 100644
--- a/clients/native/src/commands/init.rs
+++ b/clients/native/src/commands/init.rs
@@ -51,7 +51,7 @@ impl InitialisableClient for NativeClientInit {
     }
 }
 
-#[derive(Args, Clone)]
+#[derive(Args, Clone, Debug)]
 pub(crate) struct Init {
     #[command(flatten)]
     common_args: CommonClientInitArgs,
diff --git a/clients/socks5/src/commands/init.rs b/clients/socks5/src/commands/init.rs
index 44a247316e..ce13a1b7cc 100644
--- a/clients/socks5/src/commands/init.rs
+++ b/clients/socks5/src/commands/init.rs
@@ -51,7 +51,7 @@ impl InitialisableClient for Socks5ClientInit {
     }
 }
 
-#[derive(Args, Clone)]
+#[derive(Args, Clone, Debug)]
 pub(crate) struct Init {
     #[command(flatten)]
     common_args: CommonClientInitArgs,
diff --git a/common/client-core/src/cli_helpers/client_init.rs b/common/client-core/src/cli_helpers/client_init.rs
index c43ebf4545..9550cffdb2 100644
--- a/common/client-core/src/cli_helpers/client_init.rs
+++ b/common/client-core/src/cli_helpers/client_init.rs
@@ -109,6 +109,8 @@ pub async fn initialise_client<C>(
 ) -> Result<InitResultsWithConfig<C::Config>, C::Error>
 where
     C: InitialisableClient,
+    <C as InitialisableClient>::Config: std::fmt::Debug,
+    <C as InitialisableClient>::InitArgs: std::fmt::Debug,
 {
     info!("initialising {} client", C::NAME);
 
@@ -140,17 +142,32 @@ where
 
     // Attempt to use a user-provided gateway, if possible
     let user_chosen_gateway_id = common_args.gateway;
+    log::debug!("User chosen gateway id: {user_chosen_gateway_id:?}");
+
     let selection_spec = GatewaySelectionSpecification::new(
         user_chosen_gateway_id.map(|id| id.to_base58_string()),
         Some(common_args.latency_based_selection),
         false,
     );
+    log::debug!("Gateway selection specification: {selection_spec:?}");
 
     // Load and potentially override config
+    log::debug!("Init arguments: {init_args:#?}");
     let config = C::construct_config(&init_args);
+    log::debug!("Constructed config: {config:#?}");
     let paths = config.common_paths();
     let core = config.core_config();
 
+    log::info!(
+        "Using nym-api: {}",
+        core.client
+            .nym_api_urls
+            .iter()
+            .map(|url| url.as_str())
+            .collect::<Vec<&str>>()
+            .join(",")
+    );
+
     // 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(paths.keys.clone());
diff --git a/common/client-core/src/client/packet_statistics_control.rs b/common/client-core/src/client/packet_statistics_control.rs
index 85bf237928..a50e0c596c 100644
--- a/common/client-core/src/client/packet_statistics_control.rs
+++ b/common/client-core/src/client/packet_statistics_control.rs
@@ -13,8 +13,9 @@ const PACKET_REPORT_INTERVAL_SECS: u64 = 2;
 const SNAPSHOT_INTERVAL_MS: u64 = 500;
 // When computing rates, we include snapshots that are up to this old. We set it to some odd number
 // a tad larger than an integer number of snapshot intervals, so that we don't have to worry about
-// threshold effects
-const RECORDING_WINDOW_MS: u64 = 1700;
+// threshold effects.
+// Also, set it larger than the packet report interval so that we don't miss notable singular events
+const RECORDING_WINDOW_MS: u64 = 2300;
 
 #[derive(Default, Debug, Clone)]
 struct PacketStatistics {
@@ -265,11 +266,11 @@ impl std::ops::Div<f64> for PacketRates {
 impl PacketRates {
     fn summary(&self) -> String {
         format!(
-            "rx: {}/s (real: {}/s), tx: {}/s (real: {}/s)",
-            bibytes2(self.real_packets_received_size + self.cover_packets_received_size),
+            "down: {}/s, up: {}/s (cover down: {}/s, cover up: {}/s)",
             bibytes2(self.real_packets_received_size),
-            bibytes2(self.real_packets_sent_size + self.cover_packets_sent_size),
             bibytes2(self.real_packets_sent_size),
+            bibytes2(self.cover_packets_received_size),
+            bibytes2(self.cover_packets_sent_size),
         )
     }
 
@@ -287,6 +288,7 @@ impl PacketRates {
     }
 }
 
+#[derive(Debug)]
 pub(crate) enum PacketStatisticsEvent {
     // The real packets sent. Recall that acks are sent by the gateway, so it's not included here.
     RealPacketSent(usize),
@@ -434,10 +436,22 @@ impl PacketStatisticsControl {
         // If we get a burst of retransmissions
         // TODO: consider making this the number of retransmissions since last report instead.
         if latest_rates.retransmissions_queued > 0.0 {
-            log::info!(
-                "retransmissions: {} pkt/s",
+            log::debug!(
+                "retransmissions: {:.2} pkt/s",
                 latest_rates.retransmissions_queued
             );
+
+            // Check what the number of retransmissions was during the recording window
+            if let Some((_, start_stats)) = self.history.front() {
+                let delta = self.stats.clone() - start_stats.clone();
+                log::info!(
+                    "mix packet retransmissions/real mix packets: {}/{}",
+                    delta.retransmissions_queued,
+                    delta.real_packets_queued,
+                );
+            } else {
+                log::warn!("Unable to check retransmissions during recording window");
+            }
         }
 
         // IDEA: if there is a burst of acks, that could indicate tokio task starvation.
diff --git a/common/client-core/src/init/helpers.rs b/common/client-core/src/init/helpers.rs
index 38a0c3e841..06c5c8ef59 100644
--- a/common/client-core/src/init/helpers.rs
+++ b/common/client-core/src/init/helpers.rs
@@ -65,7 +65,7 @@ pub async fn current_gateways<R: Rng>(
         .ok_or(ClientCoreError::ListOfNymApisIsEmpty)?;
     let client = nym_validator_client::client::NymApiClient::new(nym_api.clone());
 
-    log::trace!("Fetching list of gateways from: {nym_api}");
+    log::debug!("Fetching list of gateways from: {nym_api}");
 
     let gateways = client.get_cached_described_gateways().await?;
     log::debug!("Found {} gateways", gateways.len());
diff --git a/common/client-core/src/init/types.rs b/common/client-core/src/init/types.rs
index bf9df9edb2..141bf8dd2d 100644
--- a/common/client-core/src/init/types.rs
+++ b/common/client-core/src/init/types.rs
@@ -178,7 +178,7 @@ impl<T> From<PersistedGatewayDetails<T>> for GatewayDetails<T> {
     }
 }
 
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub enum GatewaySelectionSpecification<T = EmptyCustomDetails> {
     /// Uniformly choose a random remote gateway.
     UniformRemote { must_use_tls: bool },
diff --git a/common/client-libs/gateway-client/Cargo.toml b/common/client-libs/gateway-client/Cargo.toml
index 75f56fd7c0..67297687e4 100644
--- a/common/client-libs/gateway-client/Cargo.toml
+++ b/common/client-libs/gateway-client/Cargo.toml
@@ -48,7 +48,7 @@ features = ["net", "sync", "time"]
 workspace = true
 # the choice of this particular tls feature was arbitrary;
 # if you reckon a different one would be more appropriate, feel free to change it
-features = ["native-tls"]
+# features = ["native-tls"]
 
 # wasm-only dependencies
 [target."cfg(target_arch = \"wasm32\")".dependencies.wasm-bindgen]
diff --git a/common/client-libs/mixnet-client/Cargo.toml b/common/client-libs/mixnet-client/Cargo.toml
index 505931fd73..5e0fb12e5e 100644
--- a/common/client-libs/mixnet-client/Cargo.toml
+++ b/common/client-libs/mixnet-client/Cargo.toml
@@ -16,7 +16,7 @@ tokio-util = { workspace = true, features = ["codec"] }
 # internal
 nym-sphinx = { path = "../../nymsphinx" }
 nym-task = { path = "../../task" }
-nym-client-core = { path = "../../client-core" }
+nym-topology-control = { path = "../../topology-control" }
 nym-noise = { path = "../../nymnoise"}
 nym-crypto = { path = "../../crypto" }
 nym-validator-client = { path = "../validator-client"}
diff --git a/common/client-libs/mixnet-client/src/client.rs b/common/client-libs/mixnet-client/src/client.rs
index 31dd88a0b1..b95810d121 100644
--- a/common/client-libs/mixnet-client/src/client.rs
+++ b/common/client-libs/mixnet-client/src/client.rs
@@ -4,7 +4,6 @@
 use futures::channel::mpsc;
 use futures::StreamExt;
 use log::*;
-use nym_client_core::client::topology_control::accessor::TopologyAccessor;
 use nym_crypto::asymmetric::encryption;
 use nym_noise::upgrade_noise_initiator_with_topology;
 use nym_sphinx::addressing::nodes::NymNodeRoutingAddress;
@@ -12,6 +11,7 @@ use nym_sphinx::framing::codec::NymCodec;
 use nym_sphinx::framing::packet::FramedNymPacket;
 use nym_sphinx::params::PacketType;
 use nym_sphinx::NymPacket;
+use nym_topology_control::accessor::TopologyAccessor;
 use nym_validator_client::NymApiClient;
 use std::collections::HashMap;
 use std::io;
diff --git a/common/client-libs/mixnet-client/src/forwarder.rs b/common/client-libs/mixnet-client/src/forwarder.rs
index f3357d5494..1a6e936581 100644
--- a/common/client-libs/mixnet-client/src/forwarder.rs
+++ b/common/client-libs/mixnet-client/src/forwarder.rs
@@ -5,9 +5,9 @@ use crate::client::{Client, Config, SendWithoutResponse};
 use futures::channel::mpsc;
 use futures::StreamExt;
 use log::*;
-use nym_client_core::client::topology_control::accessor::TopologyAccessor;
 use nym_crypto::asymmetric::encryption;
 use nym_sphinx::forwarding::packet::MixPacket;
+use nym_topology_control::accessor::TopologyAccessor;
 use nym_validator_client::NymApiClient;
 use std::sync::Arc;
 
diff --git a/common/client-libs/validator-client/Cargo.toml b/common/client-libs/validator-client/Cargo.toml
index 5e778b4cb2..5325428da2 100644
--- a/common/client-libs/validator-client/Cargo.toml
+++ b/common/client-libs/validator-client/Cargo.toml
@@ -31,7 +31,6 @@ log = { workspace = true }
 url = { workspace = true, features = ["serde"] }
 tokio = { workspace = true, features = ["sync", "time"] }
 futures = { workspace = true }
-openssl = { version = "^0.10.55", features = ["vendored"], optional = true }
 
 nym-coconut-interface = { path = "../../coconut-interface" }
 nym-network-defaults = { path = "../../network-defaults" }
@@ -90,7 +89,7 @@ required-features = ["http-client"]
 
 [features]
 default = ["http-client"]
-http-client = ["cosmrs/rpc", "openssl"]
+http-client = ["cosmrs/rpc"]
 generate-ts = []
 contract-testing = ["nym-mixnet-contract-common/contract-testing"]
 
diff --git a/common/client-libs/validator-client/src/nyxd/contract_traits/dkg_query_client.rs b/common/client-libs/validator-client/src/nyxd/contract_traits/dkg_query_client.rs
index 46712cb81b..5a3c019396 100644
--- a/common/client-libs/validator-client/src/nyxd/contract_traits/dkg_query_client.rs
+++ b/common/client-libs/validator-client/src/nyxd/contract_traits/dkg_query_client.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2022-2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::collect_paged;
@@ -7,14 +7,22 @@ use crate::nyxd::error::NyxdError;
 use crate::nyxd::CosmWasmClient;
 use async_trait::async_trait;
 use cosmrs::AccountId;
-use nym_coconut_dkg_common::{
-    dealer::{ContractDealing, DealerDetailsResponse, PagedDealerResponse, PagedDealingsResponse},
-    msg::QueryMsg as DkgQueryMsg,
-    types::{DealerDetails, Epoch, EpochId, InitialReplacementData},
-    verification_key::{ContractVKShare, PagedVKSharesResponse},
-};
+use nym_coconut_dkg_common::types::ChunkIndex;
 use serde::Deserialize;
 
+pub use nym_coconut_dkg_common::{
+    dealer::{DealerDetailsResponse, PagedDealerResponse},
+    dealing::{
+        DealerDealingsStatusResponse, DealingChunkResponse, DealingChunkStatusResponse,
+        DealingMetadataResponse, DealingStatusResponse,
+    },
+    msg::QueryMsg as DkgQueryMsg,
+    types::{
+        DealerDetails, DealingIndex, Epoch, EpochId, EpochState, InitialReplacementData, State,
+    },
+    verification_key::{ContractVKShare, PagedVKSharesResponse, VkShareResponse},
+};
+
 #[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
 #[cfg_attr(not(target_arch = "wasm32"), async_trait)]
 pub trait DkgQueryClient {
@@ -22,10 +30,16 @@ pub trait DkgQueryClient {
     where
         for<'a> T: Deserialize<'a>;
 
+    async fn get_state(&self) -> Result<State, NyxdError> {
+        let request = DkgQueryMsg::GetState {};
+        self.query_dkg_contract(request).await
+    }
+
     async fn get_current_epoch(&self) -> Result<Epoch, NyxdError> {
         let request = DkgQueryMsg::GetCurrentEpochState {};
         self.query_dkg_contract(request).await
     }
+
     async fn get_current_epoch_threshold(&self) -> Result<Option<u64>, NyxdError> {
         let request = DkgQueryMsg::GetCurrentEpochThreshold {};
         self.query_dkg_contract(request).await
@@ -64,17 +78,86 @@ pub trait DkgQueryClient {
         self.query_dkg_contract(request).await
     }
 
-    async fn get_dealings_paged(
+    async fn get_dealings_metadata(
         &self,
-        idx: u64,
-        start_after: Option<String>,
-        limit: Option<u32>,
-    ) -> Result<PagedDealingsResponse, NyxdError> {
-        let request = DkgQueryMsg::GetDealing {
-            idx,
-            limit,
-            start_after,
+        epoch_id: EpochId,
+        dealer: String,
+        dealing_index: DealingIndex,
+    ) -> Result<DealingMetadataResponse, NyxdError> {
+        let request = DkgQueryMsg::GetDealingsMetadata {
+            epoch_id,
+            dealer,
+            dealing_index,
         };
+
+        self.query_dkg_contract(request).await
+    }
+
+    async fn get_dealer_dealings_status(
+        &self,
+        epoch_id: EpochId,
+        dealer: String,
+    ) -> Result<DealerDealingsStatusResponse, NyxdError> {
+        let request = DkgQueryMsg::GetDealerDealingsStatus { epoch_id, dealer };
+
+        self.query_dkg_contract(request).await
+    }
+
+    async fn get_dealing_status(
+        &self,
+        epoch_id: EpochId,
+        dealer: String,
+        dealing_index: DealingIndex,
+    ) -> Result<DealingStatusResponse, NyxdError> {
+        let request = DkgQueryMsg::GetDealingStatus {
+            epoch_id,
+            dealer,
+            dealing_index,
+        };
+
+        self.query_dkg_contract(request).await
+    }
+
+    async fn get_dealing_chunk_status(
+        &self,
+        epoch_id: EpochId,
+        dealer: String,
+        dealing_index: DealingIndex,
+        chunk_index: ChunkIndex,
+    ) -> Result<DealingChunkStatusResponse, NyxdError> {
+        let request = DkgQueryMsg::GetDealingChunkStatus {
+            epoch_id,
+            dealer,
+            dealing_index,
+            chunk_index,
+        };
+
+        self.query_dkg_contract(request).await
+    }
+
+    async fn get_dealing_chunk(
+        &self,
+        epoch_id: EpochId,
+        dealer: String,
+        dealing_index: DealingIndex,
+        chunk_index: ChunkIndex,
+    ) -> Result<DealingChunkResponse, NyxdError> {
+        let request = DkgQueryMsg::GetDealingChunk {
+            epoch_id,
+            dealer,
+            dealing_index,
+            chunk_index,
+        };
+
+        self.query_dkg_contract(request).await
+    }
+
+    async fn get_vk_share(
+        &self,
+        epoch_id: EpochId,
+        owner: String,
+    ) -> Result<VkShareResponse, NyxdError> {
+        let request = DkgQueryMsg::GetVerificationKey { epoch_id, owner };
         self.query_dkg_contract(request).await
     }
 
@@ -91,6 +174,11 @@ pub trait DkgQueryClient {
         };
         self.query_dkg_contract(request).await
     }
+
+    async fn get_contract_cw2_version(&self) -> Result<cw2::ContractVersion, NyxdError> {
+        self.query_dkg_contract(DkgQueryMsg::GetCW2ContractVersion {})
+            .await
+    }
 }
 
 // extension trait to the query client to deal with the paged queries
@@ -106,10 +194,6 @@ pub trait PagedDkgQueryClient: DkgQueryClient {
         collect_paged!(self, get_past_dealers_paged, dealers)
     }
 
-    async fn get_all_epoch_dealings(&self, idx: u64) -> Result<Vec<ContractDealing>, NyxdError> {
-        collect_paged!(self, get_dealings_paged, dealings, idx)
-    }
-
     async fn get_all_verification_key_shares(
         &self,
         epoch_id: EpochId,
@@ -143,6 +227,7 @@ where
 mod tests {
     use super::*;
     use crate::nyxd::contract_traits::tests::IgnoreValue;
+    use nym_coconut_dkg_common::msg::QueryMsg;
 
     // it's enough that this compiles and clippy is happy about it
     #[allow(dead_code)]
@@ -151,6 +236,7 @@ mod tests {
         msg: DkgQueryMsg,
     ) {
         match msg {
+            DkgQueryMsg::GetState {} => client.get_state().ignore(),
             DkgQueryMsg::GetCurrentEpochState {} => client.get_current_epoch().ignore(),
             DkgQueryMsg::GetCurrentEpochThreshold {} => {
                 client.get_current_epoch_threshold().ignore()
@@ -165,11 +251,42 @@ mod tests {
             DkgQueryMsg::GetPastDealers { limit, start_after } => {
                 client.get_past_dealers_paged(start_after, limit).ignore()
             }
-            DkgQueryMsg::GetDealing {
-                idx,
-                limit,
-                start_after,
-            } => client.get_dealings_paged(idx, start_after, limit).ignore(),
+            DkgQueryMsg::GetDealingStatus {
+                epoch_id,
+                dealer,
+                dealing_index,
+            } => client
+                .get_dealing_status(epoch_id, dealer, dealing_index)
+                .ignore(),
+            DkgQueryMsg::GetDealingsMetadata {
+                epoch_id,
+                dealer,
+                dealing_index,
+            } => client
+                .get_dealings_metadata(epoch_id, dealer, dealing_index)
+                .ignore(),
+            QueryMsg::GetDealerDealingsStatus { epoch_id, dealer } => {
+                client.get_dealer_dealings_status(epoch_id, dealer).ignore()
+            }
+            DkgQueryMsg::GetDealingChunkStatus {
+                epoch_id,
+                dealer,
+                dealing_index,
+                chunk_index,
+            } => client
+                .get_dealing_chunk_status(epoch_id, dealer, dealing_index, chunk_index)
+                .ignore(),
+            DkgQueryMsg::GetDealingChunk {
+                epoch_id,
+                dealer,
+                dealing_index,
+                chunk_index,
+            } => client
+                .get_dealing_chunk(epoch_id, dealer, dealing_index, chunk_index)
+                .ignore(),
+            DkgQueryMsg::GetVerificationKey { epoch_id, owner } => {
+                client.get_vk_share(epoch_id, owner).ignore()
+            }
             DkgQueryMsg::GetVerificationKeys {
                 epoch_id,
                 limit,
@@ -177,6 +294,7 @@ mod tests {
             } => client
                 .get_vk_shares_paged(epoch_id, start_after, limit)
                 .ignore(),
+            DkgQueryMsg::GetCW2ContractVersion {} => client.get_contract_cw2_version().ignore(),
         };
     }
 }
diff --git a/common/client-libs/validator-client/src/nyxd/contract_traits/dkg_signing_client.rs b/common/client-libs/validator-client/src/nyxd/contract_traits/dkg_signing_client.rs
index 73bce467b7..47b4a3d256 100644
--- a/common/client-libs/validator-client/src/nyxd/contract_traits/dkg_signing_client.rs
+++ b/common/client-libs/validator-client/src/nyxd/contract_traits/dkg_signing_client.rs
@@ -8,11 +8,11 @@ use crate::nyxd::{Coin, Fee, SigningCosmWasmClient};
 use crate::signing::signer::OfflineSigner;
 use async_trait::async_trait;
 use cosmrs::AccountId;
-use cosmwasm_std::Addr;
+use nym_coconut_dkg_common::dealing::{DealingChunkInfo, PartialContractDealing};
 use nym_coconut_dkg_common::msg::ExecuteMsg as DkgExecuteMsg;
-use nym_coconut_dkg_common::types::EncodedBTEPublicKeyWithProof;
+use nym_coconut_dkg_common::types::{DealingIndex, EncodedBTEPublicKeyWithProof};
 use nym_coconut_dkg_common::verification_key::VerificationKeyShare;
-use nym_contracts_common::dealings::ContractSafeBytes;
+use nym_contracts_common::IdentityKey;
 
 #[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
 #[cfg_attr(not(target_arch = "wasm32"), async_trait)]
@@ -25,6 +25,13 @@ pub trait DkgSigningClient {
         funds: Vec<Coin>,
     ) -> Result<ExecuteResult, NyxdError>;
 
+    async fn initiate_dkg(&self, fee: Option<Fee>) -> Result<ExecuteResult, NyxdError> {
+        let req = DkgExecuteMsg::InitiateDkg {};
+
+        self.execute_dkg_contract(fee, req, "initiating the DKG".to_string(), vec![])
+            .await
+    }
+
     async fn advance_dkg_epoch_state(&self, fee: Option<Fee>) -> Result<ExecuteResult, NyxdError> {
         let req = DkgExecuteMsg::AdvanceEpochState {};
 
@@ -42,12 +49,14 @@ pub trait DkgSigningClient {
     async fn register_dealer(
         &self,
         bte_key: EncodedBTEPublicKeyWithProof,
+        identity_key: IdentityKey,
         announce_address: String,
         resharing: bool,
         fee: Option<Fee>,
     ) -> Result<ExecuteResult, NyxdError> {
         let req = DkgExecuteMsg::RegisterDealer {
             bte_key_with_proof: bte_key,
+            identity_key,
             announce_address,
             resharing,
         };
@@ -56,18 +65,32 @@ pub trait DkgSigningClient {
             .await
     }
 
-    async fn submit_dealing_bytes(
+    async fn submit_dealing_metadata(
         &self,
-        dealing_bytes: ContractSafeBytes,
+        dealing_index: DealingIndex,
+        chunks: Vec<DealingChunkInfo>,
         resharing: bool,
         fee: Option<Fee>,
     ) -> Result<ExecuteResult, NyxdError> {
-        let req = DkgExecuteMsg::CommitDealing {
-            dealing_bytes,
+        let req = DkgExecuteMsg::CommitDealingsMetadata {
+            dealing_index,
+            chunks,
             resharing,
         };
 
-        self.execute_dkg_contract(fee, req, "dealing commitment".to_string(), vec![])
+        self.execute_dkg_contract(fee, req, "dealing metadata commitment".to_string(), vec![])
+            .await
+    }
+
+    async fn submit_dealing_chunk(
+        &self,
+        chunk: PartialContractDealing,
+        resharing: bool,
+        fee: Option<Fee>,
+    ) -> Result<ExecuteResult, NyxdError> {
+        let req = DkgExecuteMsg::CommitDealingsChunk { chunk, resharing };
+
+        self.execute_dkg_contract(fee, req, "dealing chunk commitment".to_string(), vec![])
             .await
     }
 
@@ -94,9 +117,10 @@ pub trait DkgSigningClient {
         resharing: bool,
         fee: Option<Fee>,
     ) -> Result<ExecuteResult, NyxdError> {
-        // the call to unchecked is fine as we're converting from pre-validated `AccountId`
-        let owner = Addr::unchecked(owner.to_string());
-        let req = DkgExecuteMsg::VerifyVerificationKeyShare { owner, resharing };
+        let req = DkgExecuteMsg::VerifyVerificationKeyShare {
+            owner: owner.to_string(),
+            resharing,
+        };
 
         self.execute_dkg_contract(
             fee,
@@ -146,28 +170,36 @@ mod tests {
         msg: DkgExecuteMsg,
     ) {
         match msg {
+            DkgExecuteMsg::InitiateDkg {} => client.initiate_dkg(None).ignore(),
             DkgExecuteMsg::RegisterDealer {
                 bte_key_with_proof,
+                identity_key,
                 announce_address,
                 resharing,
             } => client
-                .register_dealer(bte_key_with_proof, announce_address, resharing, None)
+                .register_dealer(
+                    bte_key_with_proof,
+                    identity_key,
+                    announce_address,
+                    resharing,
+                    None,
+                )
                 .ignore(),
-            DkgExecuteMsg::CommitDealing {
-                dealing_bytes,
+            DkgExecuteMsg::CommitDealingsMetadata {
+                dealing_index,
+                chunks,
                 resharing,
             } => client
-                .submit_dealing_bytes(dealing_bytes, resharing, None)
+                .submit_dealing_metadata(dealing_index, chunks, resharing, None)
                 .ignore(),
+            DkgExecuteMsg::CommitDealingsChunk { chunk, resharing } => {
+                client.submit_dealing_chunk(chunk, resharing, None).ignore()
+            }
             DkgExecuteMsg::CommitVerificationKeyShare { share, resharing } => client
                 .submit_verification_key_share(share, resharing, None)
                 .ignore(),
             DkgExecuteMsg::VerifyVerificationKeyShare { owner, resharing } => client
-                .verify_verification_key_share(
-                    &owner.into_string().parse().unwrap(),
-                    resharing,
-                    None,
-                )
+                .verify_verification_key_share(&owner.parse().unwrap(), resharing, None)
                 .ignore(),
             DkgExecuteMsg::SurpassedThreshold {} => client.surpass_threshold(None).ignore(),
             DkgExecuteMsg::AdvanceEpochState {} => client.advance_dkg_epoch_state(None).ignore(),
diff --git a/common/client-libs/validator-client/src/nyxd/contract_traits/mod.rs b/common/client-libs/validator-client/src/nyxd/contract_traits/mod.rs
index dac63a2530..d6ee4acad2 100644
--- a/common/client-libs/validator-client/src/nyxd/contract_traits/mod.rs
+++ b/common/client-libs/validator-client/src/nyxd/contract_traits/mod.rs
@@ -8,26 +8,26 @@ use std::str::FromStr;
 // TODO: all of those could/should be derived via a macro
 
 // query clients
-mod coconut_bandwidth_query_client;
-mod dkg_query_client;
-mod ephemera_query_client;
-mod group_query_client;
-mod mixnet_query_client;
-mod multisig_query_client;
-mod name_service_query_client;
-mod sp_directory_query_client;
-mod vesting_query_client;
+pub mod coconut_bandwidth_query_client;
+pub mod dkg_query_client;
+pub mod ephemera_query_client;
+pub mod group_query_client;
+pub mod mixnet_query_client;
+pub mod multisig_query_client;
+pub mod name_service_query_client;
+pub mod sp_directory_query_client;
+pub mod vesting_query_client;
 
 // signing clients
-mod coconut_bandwidth_signing_client;
-mod dkg_signing_client;
-mod ephemera_signing_client;
-mod group_signing_client;
-mod mixnet_signing_client;
-mod multisig_signing_client;
-mod name_service_signing_client;
-mod sp_directory_signing_client;
-mod vesting_signing_client;
+pub mod coconut_bandwidth_signing_client;
+pub mod dkg_signing_client;
+pub mod ephemera_signing_client;
+pub mod group_signing_client;
+pub mod mixnet_signing_client;
+pub mod multisig_signing_client;
+pub mod name_service_signing_client;
+pub mod sp_directory_signing_client;
+pub mod vesting_signing_client;
 
 // re-export query traits
 pub use coconut_bandwidth_query_client::{
diff --git a/common/client-libs/validator-client/src/nyxd/mod.rs b/common/client-libs/validator-client/src/nyxd/mod.rs
index da8910a46f..2757f66967 100644
--- a/common/client-libs/validator-client/src/nyxd/mod.rs
+++ b/common/client-libs/validator-client/src/nyxd/mod.rs
@@ -16,7 +16,6 @@ use crate::signing::tx_signer::TxSigner;
 use crate::signing::AccountData;
 use crate::{DirectSigningReqwestRpcNyxdClient, QueryReqwestRpcNyxdClient, ReqwestRpcClient};
 use async_trait::async_trait;
-use cosmrs::cosmwasm;
 use cosmrs::tendermint::{abci, evidence::Evidence, Genesis};
 use cosmrs::tx::{Raw, SignDoc};
 use cosmwasm_std::Addr;
@@ -40,7 +39,7 @@ pub use crate::rpc::TendermintRpcClient;
 pub use coin::Coin;
 pub use cosmrs::{
     bank::MsgSend,
-    bip32,
+    bip32, cosmwasm,
     crypto::PublicKey,
     query::{PageRequest, PageResponse},
     tendermint::{
diff --git a/common/coconut-interface/src/lib.rs b/common/coconut-interface/src/lib.rs
index 65aab8fb7f..30037e29e0 100644
--- a/common/coconut-interface/src/lib.rs
+++ b/common/coconut-interface/src/lib.rs
@@ -14,7 +14,7 @@ pub use nym_coconut::{
     aggregate_signature_shares, aggregate_verification_keys, blind_sign, hash_to_scalar,
     prepare_blind_sign, prove_bandwidth_credential, Attribute, Base58, BlindSignRequest,
     BlindedSignature, Bytable, CoconutError, KeyPair, Parameters, PrivateAttribute,
-    PublicAttribute, Signature, SignatureShare, Theta, VerificationKey,
+    PublicAttribute, SecretKey, Signature, SignatureShare, Theta, VerificationKey,
 };
 
 #[derive(Debug, Serialize, Deserialize, Getters, CopyGetters, Clone, PartialEq, Eq)]
diff --git a/common/commands/Cargo.toml b/common/commands/Cargo.toml
index 6d4133acc4..a8e665acb4 100644
--- a/common/commands/Cargo.toml
+++ b/common/commands/Cargo.toml
@@ -13,9 +13,11 @@ bs58 = "0.4"
 comfy-table = "6.0.0"
 cfg-if = "1.0.0"
 clap = { workspace = true, features = ["derive"] }
+csv = "1.3.0"
 cw-utils = { workspace = true }
 handlebars = "3.0.1"
 humantime-serde = "1.0"
+inquire = "0.6.2"
 k256 = { workspace = true, features = ["ecdsa", "sha256"] }
 log = { workspace = true }
 rand = {version = "0.6", features = ["std"] }
diff --git a/common/commands/fixtures/test_send_multiple.csv b/common/commands/fixtures/test_send_multiple.csv
new file mode 100644
index 0000000000..f691ec2455
--- /dev/null
+++ b/common/commands/fixtures/test_send_multiple.csv
@@ -0,0 +1,4 @@
+n1q85lscptz860j3dx92f8phaeaw08j2l5dt7adq,50,nym
+n136ckky0n39eskewg04xhvahq9yp9f7sgtnxytt,50,unym
+n1xh7ru0zp67czxhvx0r5e8ur7rvg6n3ymmje0ju,50,nyx
+n13mpm4aj03alffnvz2x9ynjy4u3cxemxn2xw34w,50,unyx
diff --git a/common/commands/src/validator/account/mod.rs b/common/commands/src/validator/account/mod.rs
index b3cecc7c9a..422c478657 100644
--- a/common/commands/src/validator/account/mod.rs
+++ b/common/commands/src/validator/account/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
 use clap::{Args, Subcommand};
@@ -7,6 +7,7 @@ pub mod balance;
 pub mod create;
 pub mod pubkey;
 pub mod send;
+pub mod send_multiple;
 
 #[derive(Debug, Args)]
 #[clap(args_conflicts_with_subcommands = true, subcommand_required = true)]
@@ -25,4 +26,6 @@ pub enum AccountCommands {
     PubKey(crate::validator::account::pubkey::Args),
     /// Sends tokens to another account
     Send(crate::validator::account::send::Args),
+    /// Batch multiple token sends
+    SendMultiple(crate::validator::account::send_multiple::Args),
 }
diff --git a/common/commands/src/validator/account/send_multiple.rs b/common/commands/src/validator/account/send_multiple.rs
new file mode 100644
index 0000000000..9bac94f070
--- /dev/null
+++ b/common/commands/src/validator/account/send_multiple.rs
@@ -0,0 +1,216 @@
+// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::context::SigningClient;
+use crate::utils::pretty_coin;
+use clap::Parser;
+use comfy_table::Table;
+use cosmrs::rpc::endpoint::tx::Response;
+use log::{error, info};
+use nym_validator_client::nyxd::{AccountId, Coin};
+use serde_json::json;
+use std::str::FromStr;
+use std::{fs, io::Write};
+
+#[derive(Debug, Parser)]
+pub struct Args {
+    #[clap(long)]
+    pub memo: Option<String>,
+
+    #[clap(
+        long,
+        help = "Input file path (CSV format) with account/amount pairs to send"
+    )]
+    pub input: String,
+
+    #[clap(
+        long,
+        help = "An output file path (CSV format) to create or append a log of results to"
+    )]
+    pub output: Option<String>,
+}
+
+pub async fn send_multiple(args: Args, client: &SigningClient) {
+    let memo = args
+        .memo
+        .unwrap_or_else(|| "Sending tokens with nym-cli".to_owned());
+
+    let rows = InputFileReader::new(&args.input);
+    if let Err(e) = rows {
+        error!("Failed to read input file: {}", e);
+        return;
+    }
+    let rows = rows.unwrap();
+
+    let mut table = Table::new();
+
+    if rows.rows.is_empty() {
+        error!("No transactions to send");
+        return;
+    }
+
+    println!(
+        "The following transfer will be made from account {} to:",
+        client.address()
+    );
+    table.set_header(vec!["Address", "Amount"]);
+
+    for row in rows.rows.iter() {
+        table.add_row(vec![row.address.to_string(), pretty_coin(&row.amount)]);
+    }
+
+    println!("{table}");
+
+    let ans = inquire::Confirm::new("Do you want to continue with the transfers?")
+        .with_default(false)
+        .with_help_message("You must confirm before the transaction will be sent")
+        .prompt();
+
+    if let Err(e) = ans {
+        info!("Aborting, {}...", e);
+        return;
+    }
+    if let Ok(false) = ans {
+        info!("Aborting!");
+        return;
+    }
+
+    info!("Transferring from {}...", client.address());
+
+    let multiple_sends: Vec<(AccountId, Vec<Coin>)> = rows
+        .rows
+        .iter()
+        .map(|row| (row.address.clone(), vec![row.amount.clone()]))
+        .collect();
+
+    let res = client
+        .send_multiple(multiple_sends, memo, None)
+        .await
+        .expect("failed to send tokens!");
+
+    info!("Sending result: {}", json!(res));
+
+    println!();
+    println!(
+        "Nodesguru: https://nym.explorers.guru/transaction/{}",
+        &res.hash
+    );
+    println!("Mintscan: https://www.mintscan.io/nyx/txs/{}", &res.hash);
+    println!("Transaction result code: {}", &res.tx_result.code.value());
+    println!("Transaction hash: {}", &res.hash);
+
+    if let Some(output_filename) = args.output {
+        println!("\nWriting output log to {}", output_filename);
+
+        if let Err(e) = write_output_file(rows, res, &output_filename) {
+            error!(
+                "Failed to write output file {} with error {}",
+                output_filename, e
+            );
+        }
+    }
+}
+
+fn write_output_file(
+    rows: InputFileReader,
+    res: Response,
+    output_filename: &String,
+) -> Result<(), anyhow::Error> {
+    let mut file = fs::OpenOptions::new()
+        .create(true)
+        .append(true)
+        .open(output_filename)?;
+
+    let now = time::OffsetDateTime::now_utc();
+    let now = now.format(&time::format_description::well_known::Rfc3339)?;
+
+    let data = rows
+        .rows
+        .iter()
+        .map(|row| {
+            format!(
+                "{},{},{},{},{}",
+                row.address, row.amount.amount, row.amount.denom, now, res.hash
+            )
+        })
+        .collect::<Vec<String>>()
+        .join("\n");
+
+    Ok(file.write_all(format!("{}\n", data).as_bytes())?)
+}
+
+#[derive(Debug)]
+pub struct InputFileRow {
+    pub address: AccountId,
+    pub amount: Coin,
+}
+
+pub struct InputFileReader {
+    pub rows: Vec<InputFileRow>,
+}
+
+impl InputFileReader {
+    pub fn new(path: &str) -> Result<InputFileReader, anyhow::Error> {
+        let mut rows: Vec<InputFileRow> = vec![];
+        let file_contents = fs::read_to_string(path)?;
+
+        let lines: Vec<String> = file_contents.lines().map(String::from).collect();
+        for line in lines {
+            let tokens: Vec<_> = line.split(',').collect();
+            if tokens.len() < 3 {
+                return Err(anyhow::anyhow!(
+                    "'{}' does not have enough columns, expecting <address>,<amount>,<denom>",
+                    line
+                ));
+            }
+            // try parse amount to u128
+            let amount = u128::from_str(tokens[1])
+                .map_err(|_| anyhow::anyhow!("'{}' has an invalid amount", line))?;
+
+            let denom: String = tokens[2].into();
+
+            // multiply when a whole token amount, e.g. 50nym (50.123456nym is not allowed, that must be input as 50123456unym)
+            let (amount, denom) = if !denom.starts_with('u') {
+                (amount * 1_000_000u128, format!("u{}", denom))
+            } else {
+                (amount, denom)
+            };
+
+            let address = AccountId::from_str(tokens[0])
+                .map_err(|e| anyhow::anyhow!("'{}' has an invalid address: {}", line, e))?;
+
+            let amount = Coin { amount, denom };
+
+            rows.push(InputFileRow { address, amount })
+        }
+
+        Ok(InputFileReader { rows })
+    }
+}
+
+#[cfg(test)]
+mod test_multiple_send_input_csv {
+    use super::*;
+    use nym_validator_client::nyxd::AccountId;
+    use std::str::FromStr;
+    #[test]
+    fn works_on_happy_path() {
+        let input_csv = InputFileReader::new("fixtures/test_send_multiple.csv").unwrap();
+        assert_eq!(
+            AccountId::from_str("n1q85lscptz860j3dx92f8phaeaw08j2l5dt7adq").unwrap(),
+            input_csv.rows[0].address
+        );
+
+        println!("{:?}", input_csv.rows);
+
+        assert_eq!(50_000_000u128, input_csv.rows[0].amount.amount);
+        assert_eq!(50u128, input_csv.rows[1].amount.amount);
+        assert_eq!(50_000_000u128, input_csv.rows[2].amount.amount);
+        assert_eq!(50u128, input_csv.rows[3].amount.amount);
+
+        assert_eq!("unym", input_csv.rows[0].amount.denom);
+        assert_eq!("unym", input_csv.rows[1].amount.denom);
+        assert_eq!("unyx", input_csv.rows[2].amount.denom);
+        assert_eq!("unyx", input_csv.rows[3].amount.denom);
+    }
+}
diff --git a/common/commands/src/validator/cosmwasm/generators/coconut_dkg.rs b/common/commands/src/validator/cosmwasm/generators/coconut_dkg.rs
index 8c1f71fc69..3a80ff4ca5 100644
--- a/common/commands/src/validator/cosmwasm/generators/coconut_dkg.rs
+++ b/common/commands/src/validator/cosmwasm/generators/coconut_dkg.rs
@@ -3,6 +3,7 @@
 
 use clap::Parser;
 use log::{debug, info};
+use nym_coconut_dkg_common::dealing::DEFAULT_DEALINGS;
 use std::str::FromStr;
 
 use nym_coconut_dkg_common::msg::InstantiateMsg;
@@ -93,6 +94,7 @@ pub async fn generate(args: Args) {
         multisig_addr: multisig_addr.to_string(),
         time_configuration: Some(time_configuration),
         mix_denom,
+        key_size: DEFAULT_DEALINGS as u32,
     };
 
     debug!("instantiate_msg: {:?}", instantiate_msg);
diff --git a/common/cosmwasm-smart-contracts/coconut-dkg/Cargo.toml b/common/cosmwasm-smart-contracts/coconut-dkg/Cargo.toml
index b5872e102f..d2a9cbd50f 100644
--- a/common/cosmwasm-smart-contracts/coconut-dkg/Cargo.toml
+++ b/common/cosmwasm-smart-contracts/coconut-dkg/Cargo.toml
@@ -10,6 +10,8 @@ license.workspace = true
 cosmwasm-schema = { workspace = true }
 cosmwasm-std = { workspace = true }
 cw-utils = { workspace = true }
+cw2 = { workspace = true }
+cw4 = { workspace = true }
 
 contracts-common = { path = "../contracts-common", package = "nym-contracts-common" }
 nym-multisig-contract-common = { path = "../multisig-contract" }
diff --git a/common/cosmwasm-smart-contracts/coconut-dkg/src/dealer.rs b/common/cosmwasm-smart-contracts/coconut-dkg/src/dealer.rs
index 3547345fa1..7ee3f91eba 100644
--- a/common/cosmwasm-smart-contracts/coconut-dkg/src/dealer.rs
+++ b/common/cosmwasm-smart-contracts/coconut-dkg/src/dealer.rs
@@ -1,7 +1,7 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::types::{ContractSafeBytes, EncodedBTEPublicKeyWithProof, NodeIndex};
+use crate::types::{EncodedBTEPublicKeyWithProof, NodeIndex};
 use cosmwasm_schema::cw_serde;
 use cosmwasm_std::Addr;
 
@@ -9,6 +9,7 @@ use cosmwasm_std::Addr;
 pub struct DealerDetails {
     pub address: Addr,
     pub bte_public_key_with_proof: EncodedBTEPublicKeyWithProof,
+    pub ed25519_identity: String,
     pub announce_address: String,
     pub assigned_index: NodeIndex,
 }
@@ -64,38 +65,3 @@ impl PagedDealerResponse {
         }
     }
 }
-
-#[cw_serde]
-pub struct ContractDealing {
-    pub dealing: ContractSafeBytes,
-    pub dealer: Addr,
-}
-
-impl ContractDealing {
-    pub fn new(dealing: ContractSafeBytes, dealer: Addr) -> Self {
-        ContractDealing { dealing, dealer }
-    }
-}
-
-#[cw_serde]
-pub struct PagedDealingsResponse {
-    pub dealings: Vec<ContractDealing>,
-    pub per_page: usize,
-
-    /// Field indicating paging information for the following queries if the caller wishes to get further entries.
-    pub start_next_after: Option<Addr>,
-}
-
-impl PagedDealingsResponse {
-    pub fn new(
-        dealings: Vec<ContractDealing>,
-        per_page: usize,
-        start_next_after: Option<Addr>,
-    ) -> Self {
-        PagedDealingsResponse {
-            dealings,
-            per_page,
-            start_next_after,
-        }
-    }
-}
diff --git a/common/cosmwasm-smart-contracts/coconut-dkg/src/dealing.rs b/common/cosmwasm-smart-contracts/coconut-dkg/src/dealing.rs
new file mode 100644
index 0000000000..347a158a55
--- /dev/null
+++ b/common/cosmwasm-smart-contracts/coconut-dkg/src/dealing.rs
@@ -0,0 +1,290 @@
+// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::types::{ChunkIndex, DealingIndex, EpochId, PartialContractDealingData};
+use contracts_common::dealings::ContractSafeBytes;
+use cosmwasm_schema::cw_serde;
+use cosmwasm_std::Addr;
+use std::collections::{BTreeMap, HashMap};
+
+/// Defines the maximum size of a dealing chunk. Currently set to 2kB
+pub const MAX_DEALING_CHUNK_SIZE: usize = 2048;
+
+/// Defines the maximum size of a full dealing.
+/// Currently set to 100kB (which is enough for a dealing created for 100 parties)
+pub const MAX_DEALING_SIZE: usize = 102400;
+
+pub const MAX_DEALING_CHUNKS: usize = MAX_DEALING_SIZE / MAX_DEALING_CHUNK_SIZE;
+
+// 2 public attributes, 2 private attributes, 1 fixed for coconut credential
+pub const DEFAULT_DEALINGS: usize = 2 + 2 + 1;
+
+pub fn chunk_dealing(
+    dealing_index: DealingIndex,
+    dealing_bytes: Vec<u8>,
+    chunk_size: usize,
+) -> HashMap<ChunkIndex, PartialContractDealing> {
+    let mut chunks = HashMap::new();
+    for (chunk_index, chunk) in dealing_bytes.chunks(chunk_size).enumerate() {
+        let chunk = PartialContractDealing {
+            dealing_index,
+            chunk_index: chunk_index as ChunkIndex,
+            data: ContractSafeBytes(chunk.to_vec()),
+        };
+        chunks.insert(chunk_index as ChunkIndex, chunk);
+    }
+
+    chunks
+}
+
+#[cw_serde]
+#[derive(Copy)]
+pub struct DealingChunkInfo {
+    pub size: u64,
+}
+
+impl DealingChunkInfo {
+    pub fn new(size: usize) -> Self {
+        DealingChunkInfo { size: size as u64 }
+    }
+
+    pub fn construct(dealing_len: usize, chunk_size: usize) -> Vec<Self> {
+        let (full_chunks, overflow) = (dealing_len / chunk_size, dealing_len % chunk_size);
+
+        let mut chunks = Vec::new();
+        for _ in 0..full_chunks {
+            chunks.push(DealingChunkInfo::new(chunk_size));
+        }
+
+        if overflow != 0 {
+            chunks.push(DealingChunkInfo::new(overflow));
+        }
+
+        chunks
+    }
+}
+
+#[cw_serde]
+#[derive(Copy)]
+pub struct SubmittedChunk {
+    pub info: DealingChunkInfo,
+
+    pub status: ChunkSubmissionStatus,
+}
+
+#[cw_serde]
+#[derive(Default, Copy)]
+pub struct ChunkSubmissionStatus {
+    // this field is updated by the contract itself to indicate when this particular chunk has been received
+    pub submission_height: Option<u64>,
+}
+
+impl ChunkSubmissionStatus {
+    pub fn submitted(&self) -> bool {
+        self.submission_height.is_some()
+    }
+}
+
+impl From<DealingChunkInfo> for SubmittedChunk {
+    fn from(value: DealingChunkInfo) -> Self {
+        SubmittedChunk::new(value)
+    }
+}
+
+impl SubmittedChunk {
+    pub fn new(info: DealingChunkInfo) -> Self {
+        SubmittedChunk {
+            info,
+            status: Default::default(),
+        }
+    }
+
+    pub fn submitted(&self) -> bool {
+        self.status.submitted()
+    }
+}
+
+#[cw_serde]
+pub struct DealingMetadata {
+    pub dealing_index: DealingIndex,
+
+    pub submitted_chunks: BTreeMap<ChunkIndex, SubmittedChunk>,
+}
+
+impl DealingMetadata {
+    pub fn new(dealing_index: DealingIndex, chunks: Vec<DealingChunkInfo>) -> Self {
+        DealingMetadata {
+            dealing_index,
+            submitted_chunks: chunks
+                .into_iter()
+                .enumerate()
+                .map(|(id, chunk)| (id as ChunkIndex, chunk.into()))
+                .collect(),
+        }
+    }
+
+    pub fn is_complete(&self) -> bool {
+        self.submitted_chunks.values().all(|c| c.submitted())
+    }
+
+    pub fn total_size(&self) -> usize {
+        self.submitted_chunks
+            .values()
+            .map(|c| c.info.size as usize)
+            .sum()
+    }
+
+    pub fn submission_statuses(&self) -> BTreeMap<ChunkIndex, ChunkSubmissionStatus> {
+        self.submitted_chunks
+            .iter()
+            .map(|(id, c)| (*id, c.status))
+            .collect()
+    }
+}
+
+#[cw_serde]
+pub struct PartialContractDealing {
+    pub dealing_index: DealingIndex,
+    pub chunk_index: ChunkIndex,
+    pub data: PartialContractDealingData,
+}
+
+impl PartialContractDealing {
+    pub fn new(
+        dealing_index: DealingIndex,
+        chunk_index: ChunkIndex,
+        data: PartialContractDealingData,
+    ) -> Self {
+        PartialContractDealing {
+            dealing_index,
+            chunk_index,
+            data,
+        }
+    }
+}
+
+#[cw_serde]
+pub struct DealingMetadataResponse {
+    pub epoch_id: EpochId,
+
+    pub dealer: Addr,
+
+    pub dealing_index: DealingIndex,
+
+    pub metadata: Option<DealingMetadata>,
+}
+
+#[cw_serde]
+pub struct DealingChunkResponse {
+    pub epoch_id: EpochId,
+
+    pub dealer: Addr,
+
+    pub dealing_index: DealingIndex,
+
+    pub chunk_index: ChunkIndex,
+
+    pub chunk: Option<PartialContractDealingData>,
+}
+
+#[cw_serde]
+pub struct DealingChunkStatusResponse {
+    pub epoch_id: EpochId,
+
+    pub dealer: Addr,
+
+    pub dealing_index: DealingIndex,
+
+    pub chunk_index: ChunkIndex,
+
+    pub status: ChunkSubmissionStatus,
+}
+
+#[cw_serde]
+pub struct DealingStatusResponse {
+    pub epoch_id: EpochId,
+
+    pub dealer: Addr,
+
+    pub dealing_index: DealingIndex,
+
+    pub status: DealingStatus,
+}
+
+#[cw_serde]
+pub struct DealingStatus {
+    pub has_metadata: bool,
+
+    pub fully_submitted: bool,
+
+    pub chunk_submission_status: BTreeMap<ChunkIndex, ChunkSubmissionStatus>,
+}
+
+impl From<Option<DealingMetadata>> for DealingStatus {
+    fn from(metadata: Option<DealingMetadata>) -> Self {
+        DealingStatus {
+            has_metadata: metadata.is_some(),
+            fully_submitted: metadata
+                .as_ref()
+                .map(|m| m.is_complete())
+                .unwrap_or_default(),
+            chunk_submission_status: metadata
+                .map(|m| m.submission_statuses())
+                .unwrap_or_default(),
+        }
+    }
+}
+
+#[cw_serde]
+pub struct DealerDealingsStatusResponse {
+    pub epoch_id: EpochId,
+
+    pub dealer: Addr,
+
+    pub all_dealings_fully_submitted: bool,
+
+    pub dealing_submission_status: BTreeMap<DealingIndex, DealingStatus>,
+}
+
+impl DealerDealingsStatusResponse {
+    pub fn full_dealings(&self) -> usize {
+        self.dealing_submission_status
+            .values()
+            .filter(|s| s.fully_submitted)
+            .count()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn chunking_dealings() {
+        const CHUNK_SIZE: usize = 512;
+
+        let test_cases = [
+            (CHUNK_SIZE - 10, CHUNK_SIZE, 1),
+            (CHUNK_SIZE, CHUNK_SIZE, 1),
+            (CHUNK_SIZE + 10, CHUNK_SIZE, 2),
+            (CHUNK_SIZE * 2, CHUNK_SIZE, 2),
+            (CHUNK_SIZE * 2 + 1, CHUNK_SIZE, 3),
+            (CHUNK_SIZE * 10 + 42, CHUNK_SIZE, 11),
+        ];
+
+        for (dealing_len, chunk_size, expected_chunks) in test_cases {
+            let chunks = DealingChunkInfo::construct(dealing_len, chunk_size);
+            assert_eq!(expected_chunks, chunks.len());
+            assert_eq!(
+                dealing_len as u64,
+                chunks.iter().map(|c| c.size).sum::<u64>()
+            );
+
+            let mut expected_last = dealing_len % chunk_size;
+            if expected_last == 0 {
+                expected_last = chunk_size;
+            }
+            assert_eq!(chunks.last().unwrap().size, expected_last as u64);
+        }
+    }
+}
diff --git a/common/cosmwasm-smart-contracts/coconut-dkg/src/lib.rs b/common/cosmwasm-smart-contracts/coconut-dkg/src/lib.rs
index 545451eeb6..cd28eb9eb2 100644
--- a/common/cosmwasm-smart-contracts/coconut-dkg/src/lib.rs
+++ b/common/cosmwasm-smart-contracts/coconut-dkg/src/lib.rs
@@ -1,4 +1,8 @@
+// Copyright 2022-2024 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
 pub mod dealer;
+pub mod dealing;
 pub mod event_attributes;
 pub mod msg;
 pub mod types;
diff --git a/common/cosmwasm-smart-contracts/coconut-dkg/src/msg.rs b/common/cosmwasm-smart-contracts/coconut-dkg/src/msg.rs
index b986b77f41..e677efd80f 100644
--- a/common/cosmwasm-smart-contracts/coconut-dkg/src/msg.rs
+++ b/common/cosmwasm-smart-contracts/coconut-dkg/src/msg.rs
@@ -1,16 +1,23 @@
-// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2022-2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::types::{ContractSafeBytes, EncodedBTEPublicKeyWithProof, EpochId, TimeConfiguration};
+use crate::dealing::{DealingChunkInfo, PartialContractDealing};
+use crate::types::{
+    ChunkIndex, DealingIndex, EncodedBTEPublicKeyWithProof, EpochId, TimeConfiguration,
+};
 use crate::verification_key::VerificationKeyShare;
+use contracts_common::IdentityKey;
 use cosmwasm_schema::cw_serde;
-use cosmwasm_std::Addr;
 
 #[cfg(feature = "schema")]
 use crate::{
-    dealer::{DealerDetailsResponse, PagedDealerResponse, PagedDealingsResponse},
-    types::{Epoch, InitialReplacementData},
-    verification_key::PagedVKSharesResponse,
+    dealer::{DealerDetailsResponse, PagedDealerResponse},
+    dealing::{
+        DealerDealingsStatusResponse, DealingChunkResponse, DealingChunkStatusResponse,
+        DealingMetadataResponse, DealingStatusResponse,
+    },
+    types::{Epoch, InitialReplacementData, State},
+    verification_key::{PagedVKSharesResponse, VkShareResponse},
 };
 #[cfg(feature = "schema")]
 use cosmwasm_schema::QueryResponses;
@@ -21,18 +28,31 @@ pub struct InstantiateMsg {
     pub multisig_addr: String,
     pub time_configuration: Option<TimeConfiguration>,
     pub mix_denom: String,
+
+    /// Specifies the number of elements in the derived keys
+    pub key_size: u32,
 }
 
 #[cw_serde]
 pub enum ExecuteMsg {
+    // we could have just re-used AdvanceEpochState, but imo an explicit message is better
+    InitiateDkg {},
+
     RegisterDealer {
         bte_key_with_proof: EncodedBTEPublicKeyWithProof,
+        identity_key: IdentityKey,
         announce_address: String,
         resharing: bool,
     },
 
-    CommitDealing {
-        dealing_bytes: ContractSafeBytes,
+    CommitDealingsMetadata {
+        dealing_index: DealingIndex,
+        chunks: Vec<DealingChunkInfo>,
+        resharing: bool,
+    },
+
+    CommitDealingsChunk {
+        chunk: PartialContractDealing,
         resharing: bool,
     },
 
@@ -42,8 +62,7 @@ pub enum ExecuteMsg {
     },
 
     VerifyVerificationKeyShare {
-        // TODO: this should be using a String...
-        owner: Addr,
+        owner: String,
         resharing: bool,
     },
 
@@ -55,6 +74,9 @@ pub enum ExecuteMsg {
 #[cw_serde]
 #[cfg_attr(feature = "schema", derive(QueryResponses))]
 pub enum QueryMsg {
+    #[cfg_attr(feature = "schema", returns(State))]
+    GetState {},
+
     #[cfg_attr(feature = "schema", returns(Epoch))]
     GetCurrentEpochState {},
 
@@ -79,19 +101,53 @@ pub enum QueryMsg {
         start_after: Option<String>,
     },
 
-    #[cfg_attr(feature = "schema", returns(PagedDealingsResponse))]
-    GetDealing {
-        idx: u64,
-        limit: Option<u32>,
-        start_after: Option<String>,
+    #[cfg_attr(feature = "schema", returns(DealingMetadataResponse))]
+    GetDealingsMetadata {
+        epoch_id: EpochId,
+        dealer: String,
+        dealing_index: DealingIndex,
     },
 
+    #[cfg_attr(feature = "schema", returns(DealerDealingsStatusResponse))]
+    GetDealerDealingsStatus { epoch_id: EpochId, dealer: String },
+
+    #[cfg_attr(feature = "schema", returns(DealingStatusResponse))]
+    GetDealingStatus {
+        epoch_id: EpochId,
+        dealer: String,
+        dealing_index: DealingIndex,
+    },
+
+    #[cfg_attr(feature = "schema", returns(DealingChunkStatusResponse))]
+    GetDealingChunkStatus {
+        epoch_id: EpochId,
+        dealer: String,
+        dealing_index: DealingIndex,
+        chunk_index: ChunkIndex,
+    },
+
+    #[cfg_attr(feature = "schema", returns(DealingChunkResponse))]
+    GetDealingChunk {
+        epoch_id: EpochId,
+        dealer: String,
+        dealing_index: DealingIndex,
+        chunk_index: ChunkIndex,
+    },
+
+    #[cfg_attr(feature = "schema", returns(VkShareResponse))]
+    GetVerificationKey { epoch_id: EpochId, owner: String },
+
     #[cfg_attr(feature = "schema", returns(PagedVKSharesResponse))]
     GetVerificationKeys {
         epoch_id: EpochId,
         limit: Option<u32>,
         start_after: Option<String>,
     },
+
+    /// Gets the stored contract version information that's required by the CW2 spec interface for migrations.
+    #[serde(rename = "get_cw2_contract_version")]
+    #[cfg_attr(feature = "schema", returns(cw2::ContractVersion))]
+    GetCW2ContractVersion {},
 }
 
 #[cw_serde]
diff --git a/common/cosmwasm-smart-contracts/coconut-dkg/src/types.rs b/common/cosmwasm-smart-contracts/coconut-dkg/src/types.rs
index 29e7c52d67..c68c1f9515 100644
--- a/common/cosmwasm-smart-contracts/coconut-dkg/src/types.rs
+++ b/common/cosmwasm-smart-contracts/coconut-dkg/src/types.rs
@@ -8,14 +8,18 @@ use std::str::FromStr;
 pub use crate::dealer::{DealerDetails, PagedDealerResponse};
 pub use contracts_common::dealings::ContractSafeBytes;
 pub use cosmwasm_std::{Addr, Coin, Timestamp};
+pub use cw4::Cw4Contract;
 
 pub type EncodedBTEPublicKeyWithProof = String;
 pub type EncodedBTEPublicKeyWithProofRef<'a> = &'a str;
 pub type NodeIndex = u64;
 pub type EpochId = u64;
-
-// 2 public attributes, 2 private attributes, 1 fixed for coconut credential
-pub const TOTAL_DEALINGS: usize = 2 + 2 + 1;
+pub type DealingIndex = u32;
+// we really don't need to hold more data than that (even u8 would have been enough),
+// but explicitly make it different type than `DealingIndex` so type system would detect any
+// accidental misuses
+pub type ChunkIndex = u16;
+pub type PartialContractDealingData = ContractSafeBytes;
 
 #[cw_serde]
 pub struct InitialReplacementData {
@@ -73,13 +77,23 @@ impl Default for TimeConfiguration {
     }
 }
 
+#[cw_serde]
+pub struct State {
+    pub mix_denom: String,
+    pub multisig_addr: Addr,
+    pub group_addr: Cw4Contract,
+
+    /// Specifies the number of elements in the derived keys
+    pub key_size: u32,
+}
+
 #[cw_serde]
 #[derive(Copy, Default)]
 pub struct Epoch {
     pub state: EpochState,
     pub epoch_id: EpochId,
     pub time_configuration: TimeConfiguration,
-    pub finish_timestamp: Timestamp,
+    pub finish_timestamp: Option<Timestamp>,
 }
 
 impl Epoch {
@@ -90,36 +104,40 @@ impl Epoch {
         current_timestamp: Timestamp,
     ) -> Self {
         let duration = match state {
+            EpochState::WaitingInitialisation => None,
             EpochState::PublicKeySubmission { .. } => {
-                time_configuration.public_key_submission_time_secs
+                Some(time_configuration.public_key_submission_time_secs)
+            }
+            EpochState::DealingExchange { .. } => {
+                Some(time_configuration.dealing_exchange_time_secs)
             }
-            EpochState::DealingExchange { .. } => time_configuration.dealing_exchange_time_secs,
             EpochState::VerificationKeySubmission { .. } => {
-                time_configuration.verification_key_submission_time_secs
+                Some(time_configuration.verification_key_submission_time_secs)
             }
             EpochState::VerificationKeyValidation { .. } => {
-                time_configuration.verification_key_validation_time_secs
+                Some(time_configuration.verification_key_validation_time_secs)
             }
             EpochState::VerificationKeyFinalization { .. } => {
-                time_configuration.verification_key_finalization_time_secs
+                Some(time_configuration.verification_key_finalization_time_secs)
             }
-            EpochState::InProgress => time_configuration.in_progress_time_secs,
+            EpochState::InProgress => Some(time_configuration.in_progress_time_secs),
         };
         Epoch {
             state,
             epoch_id,
             time_configuration,
-            finish_timestamp: current_timestamp.plus_seconds(duration),
+            finish_timestamp: duration.map(|d| current_timestamp.plus_seconds(d)),
         }
     }
 
-    pub fn final_timestamp_secs(&self) -> u64 {
-        let mut finish = self.finish_timestamp.seconds();
+    pub fn final_timestamp_secs(&self) -> Option<u64> {
+        let mut finish = self.finish_timestamp?.seconds();
         let time_configuration = self.time_configuration;
         let mut curr_epoch_state = self.state;
         while let Some(state) = curr_epoch_state.next() {
             curr_epoch_state = state;
             let adding = match curr_epoch_state {
+                EpochState::WaitingInitialisation => return None,
                 EpochState::PublicKeySubmission { .. } => {
                     time_configuration.public_key_submission_time_secs
                 }
@@ -137,12 +155,13 @@ impl Epoch {
             };
             finish += adding;
         }
-        finish
+        Some(finish)
     }
 }
 
 // currently (it is still extremely likely to change, we might be able to get rid of verification key-related complaints),
 // the epoch can be in the following states (in order):
+// 0. WaitingInitialisation -> the contract has been instantiated, but awaits for the admin to kick off the process (group members might still be getting added)
 // 1. PublicKeySubmission -> potential dealers are submitting their BTE and ed25519 public keys to participate in dealing exchange
 // 2. DealingExchange -> the actual (off-chain) dealing exchange is happening
 // 3. ComplaintSubmission -> receivers submitting evidence of other dealers sending malformed data
@@ -156,6 +175,7 @@ impl Epoch {
 #[cw_serde]
 #[derive(Copy)]
 pub enum EpochState {
+    WaitingInitialisation,
     PublicKeySubmission { resharing: bool },
     DealingExchange { resharing: bool },
     VerificationKeySubmission { resharing: bool },
@@ -166,13 +186,14 @@ pub enum EpochState {
 
 impl Default for EpochState {
     fn default() -> Self {
-        Self::PublicKeySubmission { resharing: false }
+        Self::WaitingInitialisation
     }
 }
 
 impl Display for EpochState {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         match self {
+            EpochState::WaitingInitialisation => write!(f, "Waiting for initialisation"),
             EpochState::PublicKeySubmission { resharing } => {
                 write!(f, "PublicKeySubmission (resharing: {resharing})")
             }
@@ -194,8 +215,13 @@ impl Display for EpochState {
 }
 
 impl EpochState {
+    pub fn first() -> Self {
+        EpochState::PublicKeySubmission { resharing: false }
+    }
+
     pub fn next(self) -> Option<Self> {
         match self {
+            EpochState::WaitingInitialisation => None,
             EpochState::PublicKeySubmission { resharing } => {
                 Some(EpochState::DealingExchange { resharing })
             }
@@ -226,4 +252,8 @@ impl EpochState {
     pub fn is_final(&self) -> bool {
         *self == EpochState::InProgress
     }
+
+    pub fn is_in_progress(&self) -> bool {
+        matches!(self, EpochState::InProgress)
+    }
 }
diff --git a/common/cosmwasm-smart-contracts/coconut-dkg/src/verification_key.rs b/common/cosmwasm-smart-contracts/coconut-dkg/src/verification_key.rs
index 188215b3b0..e3a66a78a4 100644
--- a/common/cosmwasm-smart-contracts/coconut-dkg/src/verification_key.rs
+++ b/common/cosmwasm-smart-contracts/coconut-dkg/src/verification_key.rs
@@ -20,6 +20,13 @@ pub struct ContractVKShare {
     pub verified: bool,
 }
 
+#[cw_serde]
+pub struct VkShareResponse {
+    pub owner: Addr,
+    pub epoch_id: EpochId,
+    pub share: Option<ContractVKShare>,
+}
+
 #[cw_serde]
 pub struct PagedVKSharesResponse {
     pub shares: Vec<ContractVKShare>,
@@ -36,7 +43,10 @@ pub fn to_cosmos_msg(
     multisig_addr: String,
     expiration_time: Timestamp,
 ) -> StdResult<CosmosMsg> {
-    let verify_vk_share_req = ExecuteMsg::VerifyVerificationKeyShare { owner, resharing };
+    let verify_vk_share_req = ExecuteMsg::VerifyVerificationKeyShare {
+        owner: owner.to_string(),
+        resharing,
+    };
     let verify_vk_share_msg = CosmosMsg::Wasm(WasmMsg::Execute {
         contract_addr: coconut_dkg_addr,
         msg: to_binary(&verify_vk_share_req)?,
@@ -57,7 +67,14 @@ pub fn to_cosmos_msg(
     Ok(msg)
 }
 
-pub fn owner_from_cosmos_msgs(msgs: &[CosmosMsg]) -> Option<Addr> {
+// DKG SAFETY:
+// each legit verification proposal will only contain a single execute msg,
+// if they have more than one, we can safely ignore it
+pub fn owner_from_cosmos_msgs(msgs: &[CosmosMsg]) -> Option<String> {
+    if msgs.len() != 1 {
+        return None;
+    }
+
     if let Some(CosmosMsg::Wasm(WasmMsg::Execute {
         contract_addr: _,
         msg,
diff --git a/common/cosmwasm-smart-contracts/contracts-common/src/dealings.rs b/common/cosmwasm-smart-contracts/contracts-common/src/dealings.rs
index 8c79ccbcfc..b965bc366e 100644
--- a/common/cosmwasm-smart-contracts/contracts-common/src/dealings.rs
+++ b/common/cosmwasm-smart-contracts/contracts-common/src/dealings.rs
@@ -1,17 +1,17 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2022-2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
 use schemars::JsonSchema;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use std::fmt::{Display, Formatter};
-use std::ops::Deref;
+use std::ops::{Deref, DerefMut};
 
 // some sane upper-bound size on byte sizes
 // currently set to 128 bytes
 pub const MAX_DISPLAY_SIZE: usize = 128;
 
-// TODO: if we are to use this for different types, it might make sense to introduce something like
-// CommitmentTypeId field on the below for distinguishing different ones. it would somehow become part of the trait
+// helps to transfer bytes between contract boundary to decrease amount of data sent accross
+// after it's put to `Binary`
 #[derive(Debug, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, JsonSchema)]
 pub struct ContractSafeBytes(pub Vec<u8>);
 
@@ -23,6 +23,24 @@ impl Deref for ContractSafeBytes {
     }
 }
 
+impl DerefMut for ContractSafeBytes {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
+    }
+}
+
+impl From<Vec<u8>> for ContractSafeBytes {
+    fn from(value: Vec<u8>) -> Self {
+        ContractSafeBytes(value)
+    }
+}
+
+impl<'a> From<&'a [u8]> for ContractSafeBytes {
+    fn from(value: &'a [u8]) -> Self {
+        value.to_vec().into()
+    }
+}
+
 impl Display for ContractSafeBytes {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         if !self.0.is_empty() {
diff --git a/common/credential-utils/src/utils.rs b/common/credential-utils/src/utils.rs
index b58211eba0..c937d48fc3 100644
--- a/common/credential-utils/src/utils.rs
+++ b/common/credential-utils/src/utils.rs
@@ -5,7 +5,9 @@ use nym_bandwidth_controller::acquire::state::State;
 use nym_client_core::config::disk_persistence::CommonClientPaths;
 use nym_config::DEFAULT_DATA_DIR;
 use nym_credential_storage::persistent_storage::PersistentStorage;
-use nym_validator_client::nyxd::contract_traits::{CoconutBandwidthSigningClient, DkgQueryClient};
+use nym_validator_client::nyxd::contract_traits::{
+    dkg_query_client::EpochState, CoconutBandwidthSigningClient, DkgQueryClient,
+};
 use nym_validator_client::nyxd::Coin;
 use std::path::PathBuf;
 use std::process::exit;
@@ -87,21 +89,29 @@ where
             .duration_since(SystemTime::UNIX_EPOCH)
             .expect("the system clock is set to 01/01/1970 (or earlier)")
             .as_secs();
+
         if epoch.state.is_final() {
-            if current_timestamp_secs + SAFETY_BUFFER_SECS >= epoch.finish_timestamp.seconds() {
-                info!("In the next {} minute(s), a transition will take place in the coconut system. Deposits should be halted in this time for safety reasons.", SAFETY_BUFFER_SECS / 60);
-                exit(0);
+            if let Some(finish_timestamp) = epoch.finish_timestamp {
+                if current_timestamp_secs + SAFETY_BUFFER_SECS >= finish_timestamp.seconds() {
+                    info!("In the next {} minute(s), a transition will take place in the coconut system. Deposits should be halted in this time for safety reasons.", SAFETY_BUFFER_SECS / 60);
+                    exit(0);
+                }
             }
 
             break;
-        } else {
+        } else if let Some(final_timestamp) = epoch.final_timestamp_secs() {
             // Use 1 additional second to not start the next iteration immediately and spam get_current_epoch queries
-            let secs_until_final = epoch
-                .final_timestamp_secs()
-                .saturating_sub(current_timestamp_secs)
-                + 1;
+            let secs_until_final = final_timestamp.saturating_sub(current_timestamp_secs) + 1;
             info!("Approximately {} seconds until coconut is available. Sleeping until then. You can safely kill the process at any moment.", secs_until_final);
             tokio::time::sleep(Duration::from_secs(secs_until_final)).await;
+        } else if matches!(epoch.state, EpochState::WaitingInitialisation) {
+            info!("dkg hasn't been initialised yet and it is not known when it will be. Going to check again later");
+            tokio::time::sleep(Duration::from_secs(60 * 5)).await;
+        } else {
+            // this should never be the case since the only case where final timestamp is unknown is when it's waiting for initialisation,
+            // but let's guard ourselves against future changes
+            info!("it is unknown when coconut will be come available. Going to check again later");
+            tokio::time::sleep(Duration::from_secs(60 * 5)).await;
         }
     }
 
diff --git a/common/dkg/src/bte/encryption.rs b/common/dkg/src/bte/encryption.rs
index 22fd509677..aa2eef98ac 100644
--- a/common/dkg/src/bte/encryption.rs
+++ b/common/dkg/src/bte/encryption.rs
@@ -14,8 +14,7 @@ use std::collections::HashMap;
 use std::ops::Neg;
 use zeroize::Zeroize;
 
-#[derive(Debug)]
-#[cfg_attr(test, derive(Clone, PartialEq, Eq))]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Ciphertexts {
     pub rr: [G1Projective; NUM_CHUNKS],
     pub ss: [G1Projective; NUM_CHUNKS],
diff --git a/common/dkg/src/bte/keys.rs b/common/dkg/src/bte/keys.rs
index 8d682df757..132f161f5e 100644
--- a/common/dkg/src/bte/keys.rs
+++ b/common/dkg/src/bte/keys.rs
@@ -53,8 +53,7 @@ impl PublicKey {
     }
 }
 
-#[derive(Clone, Debug)]
-#[cfg_attr(test, derive(PartialEq, Eq))]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct PublicKeyWithProof {
     pub(crate) key: PublicKey,
     pub(crate) proof: ProofOfDiscreteLog,
diff --git a/common/dkg/src/bte/proof_chunking.rs b/common/dkg/src/bte/proof_chunking.rs
index de56107199..0cbadf5249 100644
--- a/common/dkg/src/bte/proof_chunking.rs
+++ b/common/dkg/src/bte/proof_chunking.rs
@@ -67,8 +67,7 @@ impl<'a> Instance<'a> {
     }
 }
 
-#[derive(Debug)]
-#[cfg_attr(test, derive(Clone, PartialEq, Eq))]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct ProofOfChunking {
     y0: G1Projective,
     bb: Vec<G1Projective>,
diff --git a/common/dkg/src/bte/proof_discrete_log.rs b/common/dkg/src/bte/proof_discrete_log.rs
index 489eb13244..95eef6eb42 100644
--- a/common/dkg/src/bte/proof_discrete_log.rs
+++ b/common/dkg/src/bte/proof_discrete_log.rs
@@ -13,8 +13,7 @@ use zeroize::Zeroize;
 const DISCRETE_LOG_DOMAIN: &[u8] =
     b"NYM_COCONUT_NIDKG_V01_CS01_WITH_BLS12381_XMD:SHA-256_SSWU_RO_PROOF_DISCRETE_LOG";
 
-#[derive(Clone, Debug)]
-#[cfg_attr(test, derive(PartialEq, Eq))]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct ProofOfDiscreteLog {
     pub(crate) rand_commitment: G1Projective,
     pub(crate) response: Scalar,
diff --git a/common/dkg/src/bte/proof_sharing.rs b/common/dkg/src/bte/proof_sharing.rs
index 8b3420db92..4b843bb8f4 100644
--- a/common/dkg/src/bte/proof_sharing.rs
+++ b/common/dkg/src/bte/proof_sharing.rs
@@ -76,8 +76,7 @@ impl<'a> Instance<'a> {
     }
 }
 
-#[derive(Debug)]
-#[cfg_attr(test, derive(Clone, PartialEq, Eq))]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct ProofOfSecretSharing {
     ff: G1Projective,
     aa: G2Projective,
diff --git a/common/dkg/src/dealing.rs b/common/dkg/src/dealing.rs
index 1e0363635f..6cc8afccb3 100644
--- a/common/dkg/src/dealing.rs
+++ b/common/dkg/src/dealing.rs
@@ -82,8 +82,7 @@ impl RecoveredVerificationKeys {
     }
 }
 
-#[derive(Debug)]
-#[cfg_attr(test, derive(PartialEq, Eq))]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Dealing {
     pub public_coefficients: PublicCoefficients,
     pub ciphertexts: Ciphertexts,
@@ -321,9 +320,17 @@ impl<'a> TryFrom<&'a nym_contracts_common::dealings::ContractSafeBytes> for Deal
     }
 }
 
-// this assumes all dealings have been verified
+/// Attempt to run the `VkCombine` algorithm to obtain the public master verification key, `VK`
+/// alongside shares of the verification key, `shvk_{1}`, `shvk_{2}`, ... `svhk_{n}`, where n is the number of receivers.
+///
+/// # Arguments
+///
+/// * `dealings`: map of dealer indices to dealings they generated
+/// * `threshold`: explicit threshold value of the associated dealings
+/// * `receivers`:map of receiver indices to their public keys
+// note: this function assumes all dealings have already been verified
 pub fn try_recover_verification_keys(
-    dealings: &[Dealing],
+    dealings: &BTreeMap<NodeIndex, Dealing>,
     threshold: Threshold,
     receivers: &BTreeMap<NodeIndex, PublicKey>,
 ) -> Result<RecoveredVerificationKeys, DkgError> {
@@ -331,24 +338,31 @@ pub fn try_recover_verification_keys(
         return Err(DkgError::NoDealingsAvailable);
     }
 
-    let threshold_usize = threshold as usize;
+    let threshold = threshold as usize;
+
+    if dealings.len() < threshold {
+        return Err(DkgError::NotEnoughDealingsAvailable {
+            available: dealings.len(),
+            required: threshold,
+        });
+    }
 
     if !dealings
-        .iter()
-        .all(|dealing| dealing.public_coefficients.size() == threshold_usize)
+        .values()
+        .all(|dealing| dealing.public_coefficients.size() == threshold)
     {
         return Err(DkgError::MismatchedDealings);
     }
 
-    let indices = receivers.keys().collect::<Vec<_>>();
+    let dealer_indices = dealings.keys().collect::<Vec<_>>();
 
     // Compute A0, ..., A_{t-1}
-    let mut interpolated_coefficients = Vec::with_capacity(threshold_usize);
-    for k in 0..threshold_usize {
-        let mut samples = Vec::with_capacity(indices.len());
-        for (j, dealing) in dealings.iter().enumerate() {
+    let mut interpolated_coefficients = Vec::with_capacity(threshold);
+    for k in 0..threshold {
+        let mut samples = Vec::with_capacity(dealer_indices.len());
+        for (dealer_index, dealing) in dealings.iter() {
             samples.push((
-                Scalar::from(*indices[j]),
+                Scalar::from(*dealer_index),
                 *dealing.public_coefficients.nth(k),
             ))
         }
@@ -365,7 +379,7 @@ pub fn try_recover_verification_keys(
     // shvk_j = A0^{j^0} * A1^{j^1} * ... * A_{t-1}^{j^{t-1}}
     let verification_key_shares = receivers
         .keys()
-        .map(|index| interpolated_coefficients.evaluate_at(&Scalar::from(*index)))
+        .map(|receiver_index| interpolated_coefficients.evaluate_at(&Scalar::from(*receiver_index)))
         .collect();
 
     Ok(RecoveredVerificationKeys {
@@ -457,14 +471,17 @@ mod tests {
         let dealings = node_indices
             .iter()
             .map(|&dealer_index| {
-                Dealing::create(&mut rng, &params, dealer_index, threshold, &receivers, None).0
+                (
+                    dealer_index,
+                    Dealing::create(&mut rng, &params, dealer_index, threshold, &receivers, None).0,
+                )
             })
-            .collect::<Vec<_>>();
+            .collect::<BTreeMap<_, _>>();
 
         let mut derived_secrets = Vec::new();
-        for (i, (ref mut dk, _)) in full_keys.iter_mut().enumerate() {
+        for (i, (ref dk, _)) in full_keys.iter().enumerate() {
             let shares = dealings
-                .iter()
+                .values()
                 .map(|dealing| decrypt_share(dk, i, &dealing.ciphertexts, None).unwrap())
                 .collect();
             derived_secrets.push(
@@ -513,9 +530,12 @@ mod tests {
         let dealings = node_indices
             .iter()
             .map(|&dealer_index| {
-                Dealing::create(&mut rng, &params, dealer_index, threshold, &receivers, None).0
+                (
+                    dealer_index,
+                    Dealing::create(&mut rng, &params, dealer_index, threshold, &receivers, None).0,
+                )
             })
-            .collect::<Vec<_>>();
+            .collect::<BTreeMap<_, _>>();
 
         let RecoveredVerificationKeys {
             recovered_master,
@@ -531,6 +551,66 @@ mod tests {
         .is_ok())
     }
 
+    #[test]
+    #[ignore] // expensive test
+    fn verifying_partial_verification_keys_with_different_dealers_and_receivers() {
+        let dummy_seed = [42u8; 32];
+        let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
+        let params = setup();
+
+        let dealer_indices = [1, 2, 3, 8];
+        let receiver_indices = [3, 4, 5, 6, 7];
+        let threshold = 3;
+
+        let mut receivers = BTreeMap::new();
+        let mut full_keys = Vec::new();
+        for index in &receiver_indices {
+            let (dk, pk) = keygen(&params, &mut rng);
+            receivers.insert(*index, *pk.public_key());
+            full_keys.push((dk, pk))
+        }
+
+        let dealings = dealer_indices
+            .iter()
+            .map(|&dealer_index| {
+                (
+                    dealer_index,
+                    Dealing::create(&mut rng, &params, dealer_index, threshold, &receivers, None).0,
+                )
+            })
+            .collect::<BTreeMap<_, _>>();
+
+        let RecoveredVerificationKeys {
+            recovered_master,
+            recovered_partials,
+        } = try_recover_verification_keys(&dealings, threshold, &receivers).unwrap();
+
+        let g2 = G2Projective::generator();
+
+        let mut derived_secrets = Vec::new();
+        for (i, (dk, _)) in full_keys.iter().enumerate() {
+            let shares = dealings
+                .values()
+                .map(|dealing| decrypt_share(dk, i, &dealing.ciphertexts, None).unwrap())
+                .collect();
+
+            let recovered_secret = combine_shares(shares, &dealer_indices).unwrap();
+
+            // make sure it matches the associated vk
+            assert_eq!(recovered_partials[i], g2 * recovered_secret);
+
+            derived_secrets.push(recovered_secret)
+        }
+
+        assert!(verify_verification_keys(
+            &recovered_master,
+            &recovered_partials,
+            &receivers,
+            threshold
+        )
+        .is_ok())
+    }
+
     #[test]
     #[ignore] // expensive test
     fn dealing_roundtrip() {
diff --git a/common/dkg/src/error.rs b/common/dkg/src/error.rs
index 372a00936a..9329f32794 100644
--- a/common/dkg/src/error.rs
+++ b/common/dkg/src/error.rs
@@ -3,7 +3,7 @@
 
 use thiserror::Error;
 
-#[derive(Debug, Error)]
+#[derive(Debug, Error, Clone)]
 pub enum DkgError {
     #[error("Provided set of values contained duplicate coordinate")]
     DuplicateCoordinate,
diff --git a/common/dkg/src/lib.rs b/common/dkg/src/lib.rs
index f754b16153..d11fa6071b 100644
--- a/common/dkg/src/lib.rs
+++ b/common/dkg/src/lib.rs
@@ -13,6 +13,7 @@ pub mod dealing;
 pub(crate) mod share;
 pub(crate) mod utils;
 
+pub use bls12_381::{G2Projective, Scalar};
 pub use dealing::*;
 pub use share::*;
 
diff --git a/common/dkg/tests/integration.rs b/common/dkg/tests/integration.rs
index 2e7ffcda07..81c861425d 100644
--- a/common/dkg/tests/integration.rs
+++ b/common/dkg/tests/integration.rs
@@ -52,7 +52,7 @@ fn single_sender() {
         .unwrap();
 
     // make sure each share is actually decryptable (even though proofs say they must be, perform this sanity check)
-    for (i, (ref mut dk, _)) in full_keys.iter_mut().enumerate() {
+    for (i, (ref dk, _)) in full_keys.iter().enumerate() {
         let _recovered = decrypt_share(dk, i, &dealing.ciphertexts, None).unwrap();
     }
 
@@ -91,10 +91,13 @@ fn full_threshold_secret_sharing() {
     let dealings = node_indices
         .iter()
         .map(|&dealer_index| {
-            Dealing::create(&mut rng, &params, dealer_index, threshold, &receivers, None).0
+            (
+                dealer_index,
+                Dealing::create(&mut rng, &params, dealer_index, threshold, &receivers, None).0,
+            )
         })
-        .collect::<Vec<_>>();
-    for dealing in dealings.iter() {
+        .collect::<BTreeMap<_, _>>();
+    for dealing in dealings.values() {
         dealing
             .verify(&params, threshold, &receivers, None)
             .unwrap();
@@ -109,9 +112,9 @@ fn full_threshold_secret_sharing() {
     let g2 = G2Projective::generator();
 
     let mut derived_secrets = Vec::new();
-    for (i, (ref mut dk, _)) in full_keys.iter_mut().enumerate() {
+    for (i, (ref dk, _)) in full_keys.iter().enumerate() {
         let shares = dealings
-            .iter()
+            .values()
             .map(|dealing| decrypt_share(dk, i, &dealing.ciphertexts, None).unwrap())
             .collect();
 
@@ -169,9 +172,12 @@ fn full_threshold_secret_resharing() {
     let first_dealings = node_indices
         .iter()
         .map(|&dealer_index| {
-            Dealing::create(&mut rng, &params, dealer_index, threshold, &receivers, None).0
+            (
+                dealer_index,
+                Dealing::create(&mut rng, &params, dealer_index, threshold, &receivers, None).0,
+            )
         })
-        .collect::<Vec<_>>();
+        .collect::<BTreeMap<_, _>>();
 
     // recover verification keys
     let RecoveredVerificationKeys {
@@ -180,9 +186,9 @@ fn full_threshold_secret_resharing() {
     } = try_recover_verification_keys(&first_dealings, threshold, &receivers).unwrap();
 
     let mut derived_secrets = Vec::new();
-    for (i, (ref mut dk, _)) in full_keys.iter_mut().enumerate() {
+    for (i, (ref dk, _)) in full_keys.iter().enumerate() {
         let shares = first_dealings
-            .iter()
+            .values()
             .map(|dealing| decrypt_share(dk, i, &dealing.ciphertexts, None).unwrap())
             .collect();
 
@@ -203,19 +209,22 @@ fn full_threshold_secret_resharing() {
         .iter()
         .zip(derived_secrets.iter())
         .map(|(&dealer_index, prior_secret)| {
-            Dealing::create(
-                &mut rng,
-                &params,
+            (
                 dealer_index,
-                threshold,
-                &receivers,
-                Some(*prior_secret),
+                Dealing::create(
+                    &mut rng,
+                    &params,
+                    dealer_index,
+                    threshold,
+                    &receivers,
+                    Some(*prior_secret),
+                )
+                .0,
             )
-            .0
         })
-        .collect::<Vec<_>>();
+        .collect::<BTreeMap<_, _>>();
 
-    for (reshared_dealing, prior_vk) in resharing_dealings.iter().zip(recovered_partials.iter()) {
+    for (reshared_dealing, prior_vk) in resharing_dealings.values().zip(recovered_partials.iter()) {
         reshared_dealing
             .verify(&params, threshold, &receivers, Some(*prior_vk))
             .unwrap();
@@ -228,9 +237,9 @@ fn full_threshold_secret_resharing() {
     } = try_recover_verification_keys(&resharing_dealings, threshold, &receivers).unwrap();
 
     let mut reshared_secrets = Vec::new();
-    for (i, (ref mut dk, _)) in full_keys.iter_mut().enumerate() {
+    for (i, (ref dk, _)) in full_keys.iter().enumerate() {
         let shares = resharing_dealings
-            .iter()
+            .values()
             .map(|dealing| decrypt_share(dk, i, &dealing.ciphertexts, None).unwrap())
             .collect();
 
@@ -279,9 +288,12 @@ fn full_threshold_secret_resharing_left_party() {
     let first_dealings = node_indices
         .iter()
         .map(|&dealer_index| {
-            Dealing::create(&mut rng, &params, dealer_index, threshold, &receivers, None).0
+            (
+                dealer_index,
+                Dealing::create(&mut rng, &params, dealer_index, threshold, &receivers, None).0,
+            )
         })
-        .collect::<Vec<_>>();
+        .collect::<BTreeMap<_, _>>();
 
     // recover verification keys
     let RecoveredVerificationKeys {
@@ -290,9 +302,9 @@ fn full_threshold_secret_resharing_left_party() {
     } = try_recover_verification_keys(&first_dealings, threshold, &receivers).unwrap();
 
     let mut derived_secrets = Vec::new();
-    for (i, (ref mut dk, _)) in full_keys.iter_mut().enumerate() {
+    for (i, (ref dk, _)) in full_keys.iter().enumerate() {
         let shares = first_dealings
-            .iter()
+            .values()
             .map(|dealing| decrypt_share(dk, i, &dealing.ciphertexts, None).unwrap())
             .collect();
 
@@ -323,20 +335,23 @@ fn full_threshold_secret_resharing_left_party() {
         .iter()
         .zip(derived_secrets.iter().take(2))
         .map(|(&dealer_index, prior_secret)| {
-            Dealing::create(
-                &mut rng,
-                &params,
+            (
                 dealer_index,
-                threshold,
-                &receivers,
-                Some(*prior_secret),
+                Dealing::create(
+                    &mut rng,
+                    &params,
+                    dealer_index,
+                    threshold,
+                    &receivers,
+                    Some(*prior_secret),
+                )
+                .0,
             )
-            .0
         })
-        .collect::<Vec<_>>();
+        .collect::<BTreeMap<_, _>>();
 
     for (reshared_dealing, prior_vk) in resharing_dealings
-        .iter()
+        .values()
         .zip(recovered_partials.iter().take(2))
     {
         reshared_dealing
@@ -351,9 +366,9 @@ fn full_threshold_secret_resharing_left_party() {
     } = try_recover_verification_keys(&resharing_dealings, threshold, &receivers).unwrap();
 
     let mut reshared_secrets = Vec::new();
-    for (i, (ref mut dk, _)) in full_keys.iter_mut().enumerate() {
+    for (i, (ref dk, _)) in full_keys.iter().enumerate() {
         let shares = resharing_dealings
-            .iter()
+            .values()
             .map(|dealing| decrypt_share(dk, i, &dealing.ciphertexts, None).unwrap())
             .collect();
 
diff --git a/common/ip-packet-requests/Cargo.toml b/common/ip-packet-requests/Cargo.toml
index 2a92715f82..e4b1f7311a 100644
--- a/common/ip-packet-requests/Cargo.toml
+++ b/common/ip-packet-requests/Cargo.toml
@@ -8,12 +8,13 @@ documentation.workspace = true
 edition.workspace = true
 license.workspace = true
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 bincode = "1.3.3"
 bytes = "1.5.0"
+nym-bin-common = { path = "../bin-common" }
 nym-sphinx = { path = "../nymsphinx" }
 rand = "0.8.5"
 serde = { workspace = true, features = ["derive"] }
 thiserror = { workspace = true }
+tokio = { workspace = true, features = ["time"] }
+tokio-util = { workspace = true, features = ["codec"] }
diff --git a/common/ip-packet-requests/src/codec.rs b/common/ip-packet-requests/src/codec.rs
new file mode 100644
index 0000000000..86df1ce8f7
--- /dev/null
+++ b/common/ip-packet-requests/src/codec.rs
@@ -0,0 +1,123 @@
+use std::time::Duration;
+
+use bytes::{Buf, Bytes, BytesMut};
+use tokio_util::codec::{Decoder, Encoder};
+
+#[derive(thiserror::Error, Debug)]
+pub enum Error {
+    #[error("{0}")]
+    IO(#[from] std::io::Error),
+}
+
+pub const BUFFER_TIMEOUT: Duration = Duration::from_millis(20);
+
+// TODO: increase this to make max out effective sphinx payload size. Sphinx packets also carry the
+// MixAck so that's why we can't just use 2kb.
+pub const MAX_PACKET_SIZE: usize = 1500;
+
+// Each IP packet is prefixed by a 2 byte length prefix
+const LENGTH_PREFIX_SIZE: usize = 2;
+
+// Tokio codec for bundling multiple IP packets into one buffer that is at most 1500 bytes long.
+// These packets are separated by a 2 byte length prefix. We need a timer so that we don't wait too
+// long for the buffer to fill up, since this kills latency.
+pub struct MultiIpPacketCodec {
+    buffer: BytesMut,
+    buffer_timeout: tokio::time::Interval,
+}
+
+impl MultiIpPacketCodec {
+    pub fn new(buffer_timeout: Duration) -> Self {
+        MultiIpPacketCodec {
+            buffer: BytesMut::new(),
+            buffer_timeout: tokio::time::interval(buffer_timeout),
+        }
+    }
+
+    // Append a packet to the buffer and return the buffer if it's full
+    pub fn append_packet(&mut self, packet: Bytes) -> Option<Bytes> {
+        let mut bundled_packets = BytesMut::new();
+        self.encode(packet, &mut bundled_packets).unwrap();
+        if bundled_packets.is_empty() {
+            None
+        } else {
+            // log::info!("Sphinx packet utilization: {:.2}", self.buffer.len() as f64 / MAX_PACKET_SIZE as f64);
+            Some(bundled_packets.freeze())
+        }
+    }
+
+    // Flush the current buffer and return it.
+    fn flush_current_buffer(&mut self) -> Bytes {
+        let mut output_buffer = BytesMut::new();
+        std::mem::swap(&mut output_buffer, &mut self.buffer);
+        output_buffer.freeze()
+    }
+
+    // Wait for the buffer_timeout to tick and then flush the buffer.
+    // This is useful when we want to send the buffer even if it's not full.
+    pub async fn buffer_timeout(&mut self) -> Option<Bytes> {
+        // Wait for buffer_timeout to tick
+        let _ = self.buffer_timeout.tick().await;
+
+        // Flush the buffer and return it
+        let packets = self.flush_current_buffer();
+        if packets.is_empty() {
+            None
+        } else {
+            Some(packets)
+        }
+    }
+}
+
+impl Encoder<Bytes> for MultiIpPacketCodec {
+    type Error = Error;
+
+    fn encode(&mut self, packet: Bytes, dst: &mut BytesMut) -> Result<(), Self::Error> {
+        if self.buffer.is_empty() {
+            self.buffer_timeout.reset();
+        }
+        let packet_size = packet.len();
+
+        if self.buffer.len() + packet_size + LENGTH_PREFIX_SIZE > MAX_PACKET_SIZE {
+            // If the packet doesn't fit in the buffer, send the buffer and then add it to the buffer
+            dst.extend_from_slice(&self.buffer);
+            self.buffer = BytesMut::new();
+            self.buffer_timeout.reset();
+        }
+
+        // Add the packet size
+        self.buffer
+            .extend_from_slice(&(packet_size as u16).to_be_bytes());
+        // Add the packet to the buffer
+        self.buffer.extend_from_slice(&packet);
+
+        Ok(())
+    }
+}
+
+impl Decoder for MultiIpPacketCodec {
+    type Item = Bytes;
+    type Error = Error;
+
+    fn decode(&mut self, src: &mut BytesMut) -> Result<Option<Self::Item>, Self::Error> {
+        if src.len() < LENGTH_PREFIX_SIZE {
+            // Not enough bytes to read the length prefix
+            return Ok(None);
+        }
+
+        let packet_size = u16::from_be_bytes([src[0], src[1]]) as usize;
+
+        if src.len() < packet_size + LENGTH_PREFIX_SIZE {
+            // Not enough bytes to read the packet
+            return Ok(None);
+        }
+
+        // Remove the length prefix
+        src.advance(LENGTH_PREFIX_SIZE);
+
+        // Read the packet
+        let packet = src.split_to(packet_size);
+
+        Ok(Some(packet.freeze()))
+    }
+}
diff --git a/common/ip-packet-requests/src/lib.rs b/common/ip-packet-requests/src/lib.rs
index bbdcd12dc9..fc97d13042 100644
--- a/common/ip-packet-requests/src/lib.rs
+++ b/common/ip-packet-requests/src/lib.rs
@@ -1,319 +1,8 @@
-use std::net::IpAddr;
+pub mod codec;
+pub mod request;
+pub mod response;
 
-use nym_sphinx::addressing::clients::Recipient;
-use serde::{Deserialize, Serialize};
-
-pub const CURRENT_VERSION: u8 = 1;
-
-fn generate_random() -> u64 {
-    use rand::RngCore;
-    let mut rng = rand::rngs::OsRng;
-    rng.next_u64()
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct IpPacketRequest {
-    pub version: u8,
-    pub data: IpPacketRequestData,
-}
-
-impl IpPacketRequest {
-    pub fn new_static_connect_request(
-        ip: IpAddr,
-        reply_to: Recipient,
-        reply_to_hops: Option<u8>,
-        reply_to_avg_mix_delays: Option<f64>,
-    ) -> (Self, u64) {
-        let request_id = generate_random();
-        (
-            Self {
-                version: CURRENT_VERSION,
-                data: IpPacketRequestData::StaticConnect(StaticConnectRequest {
-                    request_id,
-                    ip,
-                    reply_to,
-                    reply_to_hops,
-                    reply_to_avg_mix_delays,
-                }),
-            },
-            request_id,
-        )
-    }
-
-    pub fn new_dynamic_connect_request(
-        reply_to: Recipient,
-        reply_to_hops: Option<u8>,
-        reply_to_avg_mix_delays: Option<f64>,
-    ) -> (Self, u64) {
-        let request_id = generate_random();
-        (
-            Self {
-                version: CURRENT_VERSION,
-                data: IpPacketRequestData::DynamicConnect(DynamicConnectRequest {
-                    request_id,
-                    reply_to,
-                    reply_to_hops,
-                    reply_to_avg_mix_delays,
-                }),
-            },
-            request_id,
-        )
-    }
-
-    pub fn new_ip_packet(ip_packet: bytes::Bytes) -> Self {
-        Self {
-            version: CURRENT_VERSION,
-            data: IpPacketRequestData::Data(DataRequest { ip_packet }),
-        }
-    }
-
-    pub fn id(&self) -> Option<u64> {
-        match &self.data {
-            IpPacketRequestData::StaticConnect(request) => Some(request.request_id),
-            IpPacketRequestData::DynamicConnect(request) => Some(request.request_id),
-            IpPacketRequestData::Data(_) => None,
-        }
-    }
-
-    pub fn recipient(&self) -> Option<&Recipient> {
-        match &self.data {
-            IpPacketRequestData::StaticConnect(request) => Some(&request.reply_to),
-            IpPacketRequestData::DynamicConnect(request) => Some(&request.reply_to),
-            IpPacketRequestData::Data(_) => None,
-        }
-    }
-
-    pub fn to_bytes(&self) -> Result<Vec<u8>, bincode::Error> {
-        use bincode::Options;
-        make_bincode_serializer().serialize(self)
-    }
-
-    pub fn from_reconstructed_message(
-        message: &nym_sphinx::receiver::ReconstructedMessage,
-    ) -> Result<Self, bincode::Error> {
-        use bincode::Options;
-        make_bincode_serializer().deserialize(&message.message)
-    }
-}
-
-#[allow(clippy::large_enum_variant)]
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
-pub enum IpPacketRequestData {
-    StaticConnect(StaticConnectRequest),
-    DynamicConnect(DynamicConnectRequest),
-    Data(DataRequest),
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
-pub struct StaticConnectRequest {
-    pub request_id: u64,
-    pub ip: IpAddr,
-    // The nym-address the response should be sent back to
-    pub reply_to: Recipient,
-    // The number of mix node hops that responses should take, in addition to the entry and exit
-    // node. Zero means only client -> entry -> exit -> client.
-    pub reply_to_hops: Option<u8>,
-    // The average delay at each mix node, in milliseconds. Currently this is not supported by the
-    // ip packet router.
-    pub reply_to_avg_mix_delays: Option<f64>,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
-pub struct DynamicConnectRequest {
-    pub request_id: u64,
-    // The nym-address the response should be sent back to
-    pub reply_to: Recipient,
-    // The number of mix node hops that responses should take, in addition to the entry and exit
-    // node. Zero means only client -> entry -> exit -> client.
-    pub reply_to_hops: Option<u8>,
-    // The average delay at each mix node, in milliseconds. Currently this is not supported by the
-    // ip packet router.
-    pub reply_to_avg_mix_delays: Option<f64>,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
-pub struct DataRequest {
-    pub ip_packet: bytes::Bytes,
-}
-
-// ---
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct IpPacketResponse {
-    pub version: u8,
-    pub data: IpPacketResponseData,
-}
-
-impl IpPacketResponse {
-    pub fn new_static_connect_success(request_id: u64, reply_to: Recipient) -> Self {
-        Self {
-            version: CURRENT_VERSION,
-            data: IpPacketResponseData::StaticConnect(StaticConnectResponse {
-                request_id,
-                reply_to,
-                reply: StaticConnectResponseReply::Success,
-            }),
-        }
-    }
-
-    pub fn new_static_connect_failure(
-        request_id: u64,
-        reply_to: Recipient,
-        reason: StaticConnectFailureReason,
-    ) -> Self {
-        Self {
-            version: CURRENT_VERSION,
-            data: IpPacketResponseData::StaticConnect(StaticConnectResponse {
-                request_id,
-                reply_to,
-                reply: StaticConnectResponseReply::Failure(reason),
-            }),
-        }
-    }
-
-    pub fn new_dynamic_connect_success(request_id: u64, reply_to: Recipient, ip: IpAddr) -> Self {
-        Self {
-            version: CURRENT_VERSION,
-            data: IpPacketResponseData::DynamicConnect(DynamicConnectResponse {
-                request_id,
-                reply_to,
-                reply: DynamicConnectResponseReply::Success(DynamicConnectSuccess { ip }),
-            }),
-        }
-    }
-
-    pub fn new_dynamic_connect_failure(
-        request_id: u64,
-        reply_to: Recipient,
-        reason: DynamicConnectFailureReason,
-    ) -> Self {
-        Self {
-            version: CURRENT_VERSION,
-            data: IpPacketResponseData::DynamicConnect(DynamicConnectResponse {
-                request_id,
-                reply_to,
-                reply: DynamicConnectResponseReply::Failure(reason),
-            }),
-        }
-    }
-
-    pub fn new_ip_packet(ip_packet: bytes::Bytes) -> Self {
-        Self {
-            version: CURRENT_VERSION,
-            data: IpPacketResponseData::Data(DataResponse { ip_packet }),
-        }
-    }
-
-    pub fn id(&self) -> Option<u64> {
-        match &self.data {
-            IpPacketResponseData::StaticConnect(response) => Some(response.request_id),
-            IpPacketResponseData::DynamicConnect(response) => Some(response.request_id),
-            IpPacketResponseData::Data(_) => None,
-        }
-    }
-
-    pub fn recipient(&self) -> Option<&Recipient> {
-        match &self.data {
-            IpPacketResponseData::StaticConnect(response) => Some(&response.reply_to),
-            IpPacketResponseData::DynamicConnect(response) => Some(&response.reply_to),
-            IpPacketResponseData::Data(_) => None,
-        }
-    }
-
-    pub fn to_bytes(&self) -> Result<Vec<u8>, bincode::Error> {
-        use bincode::Options;
-        make_bincode_serializer().serialize(self)
-    }
-
-    pub fn from_reconstructed_message(
-        message: &nym_sphinx::receiver::ReconstructedMessage,
-    ) -> Result<Self, bincode::Error> {
-        use bincode::Options;
-        make_bincode_serializer().deserialize(&message.message)
-    }
-}
-
-#[allow(clippy::large_enum_variant)]
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub enum IpPacketResponseData {
-    StaticConnect(StaticConnectResponse),
-    DynamicConnect(DynamicConnectResponse),
-    Data(DataResponse),
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct StaticConnectResponse {
-    pub request_id: u64,
-    pub reply_to: Recipient,
-    pub reply: StaticConnectResponseReply,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub enum StaticConnectResponseReply {
-    Success,
-    Failure(StaticConnectFailureReason),
-}
-
-impl StaticConnectResponseReply {
-    pub fn is_success(&self) -> bool {
-        match self {
-            StaticConnectResponseReply::Success => true,
-            StaticConnectResponseReply::Failure(_) => false,
-        }
-    }
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, thiserror::Error)]
-pub enum StaticConnectFailureReason {
-    #[error("requested ip address is already in use")]
-    RequestedIpAlreadyInUse,
-    #[error("requested nym-address is already in use")]
-    RequestedNymAddressAlreadyInUse,
-    #[error("{0}")]
-    Other(String),
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct DynamicConnectResponse {
-    pub request_id: u64,
-    pub reply_to: Recipient,
-    pub reply: DynamicConnectResponseReply,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub enum DynamicConnectResponseReply {
-    Success(DynamicConnectSuccess),
-    Failure(DynamicConnectFailureReason),
-}
-
-impl DynamicConnectResponseReply {
-    pub fn is_success(&self) -> bool {
-        match self {
-            DynamicConnectResponseReply::Success(_) => true,
-            DynamicConnectResponseReply::Failure(_) => false,
-        }
-    }
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct DynamicConnectSuccess {
-    pub ip: IpAddr,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, thiserror::Error)]
-pub enum DynamicConnectFailureReason {
-    #[error("requested nym-address is already in use")]
-    RequestedNymAddressAlreadyInUse,
-    #[error("no available ip address")]
-    NoAvailableIp,
-    #[error("{0}")]
-    Other(String),
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct DataResponse {
-    pub ip_packet: bytes::Bytes,
-}
+pub const CURRENT_VERSION: u8 = 3;
 
 fn make_bincode_serializer() -> impl bincode::Options {
     use bincode::Options;
@@ -321,63 +10,3 @@ fn make_bincode_serializer() -> impl bincode::Options {
         .with_big_endian()
         .with_varint_encoding()
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn check_size_of_request() {
-        let connect = IpPacketRequest {
-            version: 4,
-            data: IpPacketRequestData::StaticConnect(
-                StaticConnectRequest {
-                    request_id: 123,
-                    ip: IpAddr::from([10, 0, 0, 1]),
-                    reply_to: Recipient::try_from_base58_string("D1rrpsysCGCYXy9saP8y3kmNpGtJZUXN9SvFoUcqAsM9.9Ssso1ea5NfkbMASdiseDSjTN1fSWda5SgEVjdSN4CvV@GJqd3ZxpXWSNxTfx7B1pPtswpetH4LnJdFeLeuY5KUuN").unwrap(),
-                    reply_to_hops: None,
-                    reply_to_avg_mix_delays: None,
-                },
-            )
-        };
-        assert_eq!(connect.to_bytes().unwrap().len(), 107);
-    }
-
-    #[test]
-    fn check_size_of_data() {
-        let data = IpPacketRequest {
-            version: 4,
-            data: IpPacketRequestData::Data(DataRequest {
-                ip_packet: bytes::Bytes::from(vec![1u8; 32]),
-            }),
-        };
-        assert_eq!(data.to_bytes().unwrap().len(), 35);
-    }
-
-    #[test]
-    fn serialize_and_deserialize_data_request() {
-        let data = IpPacketRequest {
-            version: 4,
-            data: IpPacketRequestData::Data(DataRequest {
-                ip_packet: bytes::Bytes::from(vec![1, 2, 4, 2, 5]),
-            }),
-        };
-
-        let serialized = data.to_bytes().unwrap();
-        let deserialized = IpPacketRequest::from_reconstructed_message(
-            &nym_sphinx::receiver::ReconstructedMessage {
-                message: serialized,
-                sender_tag: None,
-            },
-        )
-        .unwrap();
-
-        assert_eq!(deserialized.version, 4);
-        assert_eq!(
-            deserialized.data,
-            IpPacketRequestData::Data(DataRequest {
-                ip_packet: bytes::Bytes::from(vec![1, 2, 4, 2, 5]),
-            })
-        );
-    }
-}
diff --git a/common/ip-packet-requests/src/request.rs b/common/ip-packet-requests/src/request.rs
new file mode 100644
index 0000000000..6f4b17ffea
--- /dev/null
+++ b/common/ip-packet-requests/src/request.rs
@@ -0,0 +1,269 @@
+use std::net::IpAddr;
+
+use nym_sphinx::addressing::clients::Recipient;
+use serde::{Deserialize, Serialize};
+
+use crate::{make_bincode_serializer, CURRENT_VERSION};
+
+fn generate_random() -> u64 {
+    use rand::RngCore;
+    let mut rng = rand::rngs::OsRng;
+    rng.next_u64()
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct IpPacketRequest {
+    pub version: u8,
+    pub data: IpPacketRequestData,
+}
+
+impl IpPacketRequest {
+    pub fn new_static_connect_request(
+        ip: IpAddr,
+        reply_to: Recipient,
+        reply_to_hops: Option<u8>,
+        reply_to_avg_mix_delays: Option<f64>,
+        buffer_timeout: Option<u64>,
+    ) -> (Self, u64) {
+        let request_id = generate_random();
+        (
+            Self {
+                version: CURRENT_VERSION,
+                data: IpPacketRequestData::StaticConnect(StaticConnectRequest {
+                    request_id,
+                    ip,
+                    reply_to,
+                    reply_to_hops,
+                    reply_to_avg_mix_delays,
+                    buffer_timeout,
+                }),
+            },
+            request_id,
+        )
+    }
+
+    pub fn new_dynamic_connect_request(
+        reply_to: Recipient,
+        reply_to_hops: Option<u8>,
+        reply_to_avg_mix_delays: Option<f64>,
+        buffer_timeout: Option<u64>,
+    ) -> (Self, u64) {
+        let request_id = generate_random();
+        (
+            Self {
+                version: CURRENT_VERSION,
+                data: IpPacketRequestData::DynamicConnect(DynamicConnectRequest {
+                    request_id,
+                    reply_to,
+                    reply_to_hops,
+                    reply_to_avg_mix_delays,
+                    buffer_timeout,
+                }),
+            },
+            request_id,
+        )
+    }
+
+    pub fn new_disconnect_request(reply_to: Recipient) -> (Self, u64) {
+        let request_id = generate_random();
+        (
+            Self {
+                version: CURRENT_VERSION,
+                data: IpPacketRequestData::Disconnect(DisconnectRequest {
+                    request_id,
+                    reply_to,
+                }),
+            },
+            request_id,
+        )
+    }
+
+    pub fn new_data_request(ip_packets: bytes::Bytes) -> Self {
+        Self {
+            version: CURRENT_VERSION,
+            data: IpPacketRequestData::Data(DataRequest { ip_packets }),
+        }
+    }
+
+    pub fn id(&self) -> Option<u64> {
+        match &self.data {
+            IpPacketRequestData::StaticConnect(request) => Some(request.request_id),
+            IpPacketRequestData::DynamicConnect(request) => Some(request.request_id),
+            IpPacketRequestData::Disconnect(request) => Some(request.request_id),
+            IpPacketRequestData::Data(_) => None,
+            IpPacketRequestData::Ping(request) => Some(request.request_id),
+            IpPacketRequestData::Health(request) => Some(request.request_id),
+        }
+    }
+
+    pub fn recipient(&self) -> Option<&Recipient> {
+        match &self.data {
+            IpPacketRequestData::StaticConnect(request) => Some(&request.reply_to),
+            IpPacketRequestData::DynamicConnect(request) => Some(&request.reply_to),
+            IpPacketRequestData::Disconnect(request) => Some(&request.reply_to),
+            IpPacketRequestData::Data(_) => None,
+            IpPacketRequestData::Ping(request) => Some(&request.reply_to),
+            IpPacketRequestData::Health(request) => Some(&request.reply_to),
+        }
+    }
+
+    pub fn to_bytes(&self) -> Result<Vec<u8>, bincode::Error> {
+        use bincode::Options;
+        make_bincode_serializer().serialize(self)
+    }
+
+    pub fn from_reconstructed_message(
+        message: &nym_sphinx::receiver::ReconstructedMessage,
+    ) -> Result<Self, bincode::Error> {
+        use bincode::Options;
+        make_bincode_serializer().deserialize(&message.message)
+    }
+}
+
+#[allow(clippy::large_enum_variant)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
+pub enum IpPacketRequestData {
+    StaticConnect(StaticConnectRequest),
+    DynamicConnect(DynamicConnectRequest),
+    Disconnect(DisconnectRequest),
+    Data(DataRequest),
+    Ping(PingRequest),
+    Health(HealthRequest),
+}
+
+// A static connect request is when the client provides the internal IP address it will use on the
+// ip packet router.
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
+pub struct StaticConnectRequest {
+    pub request_id: u64,
+
+    pub ip: IpAddr,
+
+    // The nym-address the response should be sent back to
+    pub reply_to: Recipient,
+
+    // The number of mix node hops that responses should take, in addition to the entry and exit
+    // node. Zero means only client -> entry -> exit -> client.
+    pub reply_to_hops: Option<u8>,
+
+    // The average delay at each mix node, in milliseconds. Currently this is not supported by the
+    // ip packet router.
+    pub reply_to_avg_mix_delays: Option<f64>,
+
+    // The maximum time in milliseconds the IPR should wait when filling up a mix packet
+    // with ip packets.
+    pub buffer_timeout: Option<u64>,
+}
+
+// A dynamic connect request is when the client does not provide the internal IP address it will use
+// on the ip packet router, and instead requests one to be assigned to it.
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
+pub struct DynamicConnectRequest {
+    pub request_id: u64,
+
+    // The nym-address the response should be sent back to
+    pub reply_to: Recipient,
+
+    // The number of mix node hops that responses should take, in addition to the entry and exit
+    // node. Zero means only client -> entry -> exit -> client.
+    pub reply_to_hops: Option<u8>,
+
+    // The average delay at each mix node, in milliseconds. Currently this is not supported by the
+    // ip packet router.
+    pub reply_to_avg_mix_delays: Option<f64>,
+
+    // The maximum time in milliseconds the IPR should wait when filling up a mix packet
+    // with ip packets.
+    pub buffer_timeout: Option<u64>,
+}
+
+// A disconnect request is when the client wants to disconnect from the ip packet router and free
+// up the allocated IP address.
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
+pub struct DisconnectRequest {
+    pub request_id: u64,
+    // The nym-address the response should be sent back to
+    pub reply_to: Recipient,
+}
+
+// A data request is when the client wants to send an IP packet to a destination.
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
+pub struct DataRequest {
+    pub ip_packets: bytes::Bytes,
+}
+
+// A ping request is when the client wants to check if the ip packet router is still alive.
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
+pub struct PingRequest {
+    pub request_id: u64,
+    // The nym-address the response should be sent back to
+    pub reply_to: Recipient,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
+pub struct HealthRequest {
+    pub request_id: u64,
+    // The nym-address the response should be sent back to
+    pub reply_to: Recipient,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn check_size_of_request() {
+        let connect = IpPacketRequest {
+            version: 4,
+            data: IpPacketRequestData::StaticConnect(
+                StaticConnectRequest {
+                    request_id: 123,
+                    ip: IpAddr::from([10, 0, 0, 1]),
+                    reply_to: Recipient::try_from_base58_string("D1rrpsysCGCYXy9saP8y3kmNpGtJZUXN9SvFoUcqAsM9.9Ssso1ea5NfkbMASdiseDSjTN1fSWda5SgEVjdSN4CvV@GJqd3ZxpXWSNxTfx7B1pPtswpetH4LnJdFeLeuY5KUuN").unwrap(),
+                    reply_to_hops: None,
+                    reply_to_avg_mix_delays: None,
+                    buffer_timeout: None,
+                },
+            )
+        };
+        assert_eq!(connect.to_bytes().unwrap().len(), 108);
+    }
+
+    #[test]
+    fn check_size_of_data() {
+        let data = IpPacketRequest {
+            version: 4,
+            data: IpPacketRequestData::Data(DataRequest {
+                ip_packets: bytes::Bytes::from(vec![1u8; 32]),
+            }),
+        };
+        assert_eq!(data.to_bytes().unwrap().len(), 35);
+    }
+
+    #[test]
+    fn serialize_and_deserialize_data_request() {
+        let data = IpPacketRequest {
+            version: 4,
+            data: IpPacketRequestData::Data(DataRequest {
+                ip_packets: bytes::Bytes::from(vec![1, 2, 4, 2, 5]),
+            }),
+        };
+
+        let serialized = data.to_bytes().unwrap();
+        let deserialized = IpPacketRequest::from_reconstructed_message(
+            &nym_sphinx::receiver::ReconstructedMessage {
+                message: serialized,
+                sender_tag: None,
+            },
+        )
+        .unwrap();
+
+        assert_eq!(deserialized.version, 4);
+        assert_eq!(
+            deserialized.data,
+            IpPacketRequestData::Data(DataRequest {
+                ip_packets: bytes::Bytes::from(vec![1, 2, 4, 2, 5]),
+            })
+        );
+    }
+}
diff --git a/common/ip-packet-requests/src/response.rs b/common/ip-packet-requests/src/response.rs
new file mode 100644
index 0000000000..29553fa3e9
--- /dev/null
+++ b/common/ip-packet-requests/src/response.rs
@@ -0,0 +1,362 @@
+use std::net::IpAddr;
+
+use nym_sphinx::addressing::clients::Recipient;
+use serde::{Deserialize, Serialize};
+
+use crate::{make_bincode_serializer, CURRENT_VERSION};
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct IpPacketResponse {
+    pub version: u8,
+    pub data: IpPacketResponseData,
+}
+
+impl IpPacketResponse {
+    pub fn new_static_connect_success(request_id: u64, reply_to: Recipient) -> Self {
+        Self {
+            version: CURRENT_VERSION,
+            data: IpPacketResponseData::StaticConnect(StaticConnectResponse {
+                request_id,
+                reply_to,
+                reply: StaticConnectResponseReply::Success,
+            }),
+        }
+    }
+
+    pub fn new_static_connect_failure(
+        request_id: u64,
+        reply_to: Recipient,
+        reason: StaticConnectFailureReason,
+    ) -> Self {
+        Self {
+            version: CURRENT_VERSION,
+            data: IpPacketResponseData::StaticConnect(StaticConnectResponse {
+                request_id,
+                reply_to,
+                reply: StaticConnectResponseReply::Failure(reason),
+            }),
+        }
+    }
+
+    pub fn new_dynamic_connect_success(request_id: u64, reply_to: Recipient, ip: IpAddr) -> Self {
+        Self {
+            version: CURRENT_VERSION,
+            data: IpPacketResponseData::DynamicConnect(DynamicConnectResponse {
+                request_id,
+                reply_to,
+                reply: DynamicConnectResponseReply::Success(DynamicConnectSuccess { ip }),
+            }),
+        }
+    }
+
+    pub fn new_dynamic_connect_failure(
+        request_id: u64,
+        reply_to: Recipient,
+        reason: DynamicConnectFailureReason,
+    ) -> Self {
+        Self {
+            version: CURRENT_VERSION,
+            data: IpPacketResponseData::DynamicConnect(DynamicConnectResponse {
+                request_id,
+                reply_to,
+                reply: DynamicConnectResponseReply::Failure(reason),
+            }),
+        }
+    }
+
+    pub fn new_disconnect_success(request_id: u64, reply_to: Recipient) -> Self {
+        Self {
+            version: CURRENT_VERSION,
+            data: IpPacketResponseData::Disconnect(DisconnectResponse {
+                request_id,
+                reply_to,
+                reply: DisconnectResponseReply::Success,
+            }),
+        }
+    }
+
+    pub fn new_disconnect_failure(
+        request_id: u64,
+        reply_to: Recipient,
+        reason: DisconnectFailureReason,
+    ) -> Self {
+        Self {
+            version: CURRENT_VERSION,
+            data: IpPacketResponseData::Disconnect(DisconnectResponse {
+                request_id,
+                reply_to,
+                reply: DisconnectResponseReply::Failure(reason),
+            }),
+        }
+    }
+
+    pub fn new_unrequested_disconnect(
+        reply_to: Recipient,
+        reason: UnrequestedDisconnectReason,
+    ) -> Self {
+        Self {
+            version: CURRENT_VERSION,
+            data: IpPacketResponseData::UnrequestedDisconnect(UnrequestedDisconnect {
+                reply_to,
+                reason,
+            }),
+        }
+    }
+
+    pub fn new_ip_packet(ip_packet: bytes::Bytes) -> Self {
+        Self {
+            version: CURRENT_VERSION,
+            data: IpPacketResponseData::Data(DataResponse { ip_packet }),
+        }
+    }
+
+    pub fn new_version_mismatch(
+        request_id: u64,
+        reply_to: Recipient,
+        request_version: u8,
+        our_version: u8,
+    ) -> Self {
+        Self {
+            version: CURRENT_VERSION,
+            data: IpPacketResponseData::Error(ErrorResponse {
+                request_id,
+                reply_to,
+                reply: ErrorResponseReply::VersionMismatch {
+                    request_version,
+                    response_version: our_version,
+                },
+            }),
+        }
+    }
+
+    pub fn new_data_error_response(reply_to: Recipient, reply: ErrorResponseReply) -> Self {
+        Self {
+            version: CURRENT_VERSION,
+            data: IpPacketResponseData::Error(ErrorResponse {
+                request_id: 0,
+                reply_to,
+                reply,
+            }),
+        }
+    }
+
+    pub fn id(&self) -> Option<u64> {
+        match &self.data {
+            IpPacketResponseData::StaticConnect(response) => Some(response.request_id),
+            IpPacketResponseData::DynamicConnect(response) => Some(response.request_id),
+            IpPacketResponseData::Disconnect(response) => Some(response.request_id),
+            IpPacketResponseData::UnrequestedDisconnect(_) => None,
+            IpPacketResponseData::Data(_) => None,
+            IpPacketResponseData::Pong(response) => Some(response.request_id),
+            IpPacketResponseData::Health(response) => Some(response.request_id),
+            IpPacketResponseData::Error(response) => Some(response.request_id),
+        }
+    }
+
+    pub fn recipient(&self) -> Option<&Recipient> {
+        match &self.data {
+            IpPacketResponseData::StaticConnect(response) => Some(&response.reply_to),
+            IpPacketResponseData::DynamicConnect(response) => Some(&response.reply_to),
+            IpPacketResponseData::Disconnect(response) => Some(&response.reply_to),
+            IpPacketResponseData::UnrequestedDisconnect(response) => Some(&response.reply_to),
+            IpPacketResponseData::Data(_) => None,
+            IpPacketResponseData::Pong(response) => Some(&response.reply_to),
+            IpPacketResponseData::Health(response) => Some(&response.reply_to),
+            IpPacketResponseData::Error(response) => Some(&response.reply_to),
+        }
+    }
+
+    pub fn to_bytes(&self) -> Result<Vec<u8>, bincode::Error> {
+        use bincode::Options;
+        make_bincode_serializer().serialize(self)
+    }
+
+    pub fn from_reconstructed_message(
+        message: &nym_sphinx::receiver::ReconstructedMessage,
+    ) -> Result<Self, bincode::Error> {
+        use bincode::Options;
+        make_bincode_serializer().deserialize(&message.message)
+    }
+}
+
+#[allow(clippy::large_enum_variant)]
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub enum IpPacketResponseData {
+    // Response for a static connect request
+    StaticConnect(StaticConnectResponse),
+
+    // Response for a dynamic connect request
+    DynamicConnect(DynamicConnectResponse),
+
+    // Response for a disconnect initiqated by the client
+    Disconnect(DisconnectResponse),
+
+    // Message from the server that the client got disconnected without the client initiating it
+    UnrequestedDisconnect(UnrequestedDisconnect),
+
+    // Response to a data request
+    Data(DataResponse),
+
+    // Response to ping request
+    Pong(PongResponse),
+
+    // Response for a health request
+    Health(HealthResponse),
+
+    // Error response
+    Error(ErrorResponse),
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct StaticConnectResponse {
+    pub request_id: u64,
+    pub reply_to: Recipient,
+    pub reply: StaticConnectResponseReply,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub enum StaticConnectResponseReply {
+    Success,
+    Failure(StaticConnectFailureReason),
+}
+
+impl StaticConnectResponseReply {
+    pub fn is_success(&self) -> bool {
+        match self {
+            StaticConnectResponseReply::Success => true,
+            StaticConnectResponseReply::Failure(_) => false,
+        }
+    }
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize, thiserror::Error)]
+pub enum StaticConnectFailureReason {
+    #[error("requested ip address is already in use")]
+    RequestedIpAlreadyInUse,
+    #[error("requested nym-address is already in use")]
+    RequestedNymAddressAlreadyInUse,
+    #[error("{0}")]
+    Other(String),
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct DynamicConnectResponse {
+    pub request_id: u64,
+    pub reply_to: Recipient,
+    pub reply: DynamicConnectResponseReply,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub enum DynamicConnectResponseReply {
+    Success(DynamicConnectSuccess),
+    Failure(DynamicConnectFailureReason),
+}
+
+impl DynamicConnectResponseReply {
+    pub fn is_success(&self) -> bool {
+        match self {
+            DynamicConnectResponseReply::Success(_) => true,
+            DynamicConnectResponseReply::Failure(_) => false,
+        }
+    }
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct DynamicConnectSuccess {
+    pub ip: IpAddr,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize, thiserror::Error)]
+pub enum DynamicConnectFailureReason {
+    #[error("requested nym-address is already in use")]
+    RequestedNymAddressAlreadyInUse,
+    #[error("no available ip address")]
+    NoAvailableIp,
+    #[error("{0}")]
+    Other(String),
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct DisconnectResponse {
+    pub request_id: u64,
+    pub reply_to: Recipient,
+    pub reply: DisconnectResponseReply,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub enum DisconnectResponseReply {
+    Success,
+    Failure(DisconnectFailureReason),
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize, thiserror::Error)]
+pub enum DisconnectFailureReason {
+    #[error("requested nym-address is not currently connected")]
+    RequestedNymAddressNotConnected,
+    #[error("{0}")]
+    Other(String),
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct UnrequestedDisconnect {
+    pub reply_to: Recipient,
+    pub reason: UnrequestedDisconnectReason,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize, thiserror::Error)]
+pub enum UnrequestedDisconnectReason {
+    #[error("client mixnet traffic timeout")]
+    ClientMixnetTrafficTimeout,
+    #[error("client tun traffic timeout")]
+    ClientTunTrafficTimeout,
+    #[error("{0}")]
+    Other(String),
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct DataResponse {
+    pub ip_packet: bytes::Bytes,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct PongResponse {
+    pub request_id: u64,
+    pub reply_to: Recipient,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct HealthResponse {
+    pub request_id: u64,
+    pub reply_to: Recipient,
+    pub reply: HealthResponseReply,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct HealthResponseReply {
+    // Return the binary build information of the IPR
+    pub build_info: nym_bin_common::build_information::BinaryBuildInformationOwned,
+    // Return if the IPR has performed a successful routing test.
+    pub routable: Option<bool>,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct ErrorResponse {
+    pub request_id: u64,
+    pub reply_to: Recipient,
+    pub reply: ErrorResponseReply,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize, thiserror::Error)]
+pub enum ErrorResponseReply {
+    #[error("{msg}")]
+    Generic { msg: String },
+    #[error(
+        "version mismatch: response is v{request_version} and response is v{response_version}"
+    )]
+    VersionMismatch {
+        request_version: u8,
+        response_version: u8,
+    },
+    #[error("destination failed exit policy filter check: {dst}")]
+    ExitPolicyFilterCheckFailed { dst: String },
+}
diff --git a/common/network-defaults/Cargo.toml b/common/network-defaults/Cargo.toml
index 5d5e071343..3ed6da8de6 100644
--- a/common/network-defaults/Cargo.toml
+++ b/common/network-defaults/Cargo.toml
@@ -11,6 +11,7 @@ repository.workspace = true
 cfg-if = { workspace = true }
 dotenvy = { workspace = true }
 hex-literal = "0.3.3"
+log = { workspace = true }
 once_cell = { workspace = true }
 schemars = { workspace = true, features = ["preserve_order"] }
 serde = { workspace = true, features = ["derive"]}
diff --git a/common/network-defaults/src/lib.rs b/common/network-defaults/src/lib.rs
index 1d2af785c1..ea265e83d3 100644
--- a/common/network-defaults/src/lib.rs
+++ b/common/network-defaults/src/lib.rs
@@ -400,11 +400,25 @@ fn fix_deprecated_environmental_variables() {
     }
 }
 
+// Read the variables from the file and log what the corresponding values in the environment are.
+fn print_env_vars_with_keys_in_file<P: AsRef<Path> + Copy>(config_env_file: P) {
+    let items = dotenvy::from_path_iter(config_env_file)
+        .expect("Invalid path to environment configuration file");
+    for item in items {
+        let (key, val) = item.expect("Invalid item in environment configuration file");
+        log::debug!("{}: {}", key, val);
+    }
+}
+
 pub fn setup_env<P: AsRef<Path>>(config_env_file: Option<P>) {
     match std::env::var(var_names::CONFIGURED) {
         // if the configuration is not already set in the env vars
         Err(std::env::VarError::NotPresent) => {
-            if let Some(config_env_file) = config_env_file {
+            if let Some(config_env_file) = &config_env_file {
+                log::debug!(
+                    "Loading environment variables from {:?}",
+                    config_env_file.as_ref()
+                );
                 dotenvy::from_path(config_env_file)
                     .expect("Invalid path to environment configuration file");
                 fix_deprecated_environmental_variables();
@@ -412,17 +426,25 @@ pub fn setup_env<P: AsRef<Path>>(config_env_file: Option<P>) {
                 // if nothing is set, the use mainnet defaults
                 // if the user has not set `CONFIGURED`, then even if they set any of the env variables,
                 // overwrite them
+                log::debug!("Loading mainnet defaults");
                 crate::mainnet::export_to_env();
             }
         }
-        Err(_) => crate::mainnet::export_to_env(),
+        Err(_) => {
+            log::debug!("Environment variables already set. Using them");
+            crate::mainnet::export_to_env()
+        }
         _ => {
             fix_deprecated_environmental_variables();
         }
     }
 
     // if we haven't explicitly defined any of the constants, fallback to defaults
-    crate::mainnet::export_to_env_if_not_set()
+    crate::mainnet::export_to_env_if_not_set();
+
+    if let Some(config_env_file) = &config_env_file {
+        print_env_vars_with_keys_in_file(config_env_file);
+    }
 }
 
 // Name of the event triggered by the eth contract. If the event name is changed,
diff --git a/common/nymcoconut/src/scheme/keygen.rs b/common/nymcoconut/src/scheme/keygen.rs
index d033d8f0be..966ebb141c 100644
--- a/common/nymcoconut/src/scheme/keygen.rs
+++ b/common/nymcoconut/src/scheme/keygen.rs
@@ -99,7 +99,9 @@ impl SecretKey {
         Self { x, ys }
     }
 
-    pub fn into_raw(&self) -> (Scalar, Vec<Scalar>) {
+    /// Extract the Scalar copy of the underlying secrets.
+    /// The caller of this function must exercise extreme care to not misuse the data and ensuring it gets zeroized
+    pub fn hazmat_to_raw(&self) -> (Scalar, Vec<Scalar>) {
         (self.x, self.ys.clone())
     }
 
diff --git a/common/nymcoconut/src/scheme/verification.rs b/common/nymcoconut/src/scheme/verification.rs
index 0addda985a..1373c30bc7 100644
--- a/common/nymcoconut/src/scheme/verification.rs
+++ b/common/nymcoconut/src/scheme/verification.rs
@@ -228,10 +228,11 @@ pub fn check_vk_pairing(
 
     // safety: we made an explicit check for if the length of the slice is 0, thus unwrap here is fine
     #[allow(clippy::unwrap_used)]
-    if &vk.alpha != *dkg_values.last().as_ref().unwrap() {
+    if &vk.alpha != *dkg_values.first().as_ref().unwrap() {
         return false;
     }
-    if dkg_values
+    let dkg_betas = &dkg_values[1..];
+    if dkg_betas
         .iter()
         .zip(vk.beta_g2.iter())
         .any(|(dkg_beta, vk_beta)| dkg_beta != vk_beta)
@@ -329,8 +330,9 @@ mod tests {
         let params = setup(2).unwrap();
         let keypair = keygen(&params);
         let vk = keypair.verification_key();
-        let mut dkg_values = vk.beta_g2.clone();
-        dkg_values.push(vk.alpha);
+
+        let mut dkg_values = vec![vk.alpha];
+        dkg_values.append(&mut vk.beta_g2.clone());
         assert!(check_vk_pairing(&params, &dkg_values, vk));
     }
 
diff --git a/common/nymsphinx/src/message.rs b/common/nymsphinx/src/message.rs
index 7a8f3b6531..ed1aa25268 100644
--- a/common/nymsphinx/src/message.rs
+++ b/common/nymsphinx/src/message.rs
@@ -239,8 +239,15 @@ impl NymMessage {
         let (packets_used, space_left) =
             chunking::number_of_required_fragments(total_required_bytes, plaintext_per_packet);
 
-        let wasted_space = space_left as f32 / (bytes.len() + 1 + space_left) as f32;
-        log::trace!("Padding {self_display}: {} of raw plaintext bytes are required. They're going to be put into {packets_used} sphinx packets with {space_left} bytes of leftover space. {wasted_space}% of packet capacity is going to be wasted.", bytes.len() + 1);
+        let wasted_space_percentage =
+            (space_left as f32 / (bytes.len() + 1 + space_left) as f32) * 100.0;
+        log::trace!(
+            "Padding {self_display}: {} of raw plaintext bytes are required. \
+            They're going to be put into {packets_used} sphinx packets with {space_left} bytes \
+            of leftover space. {wasted_space_percentage:.1}% of packet capacity is going to \
+            be wasted.",
+            bytes.len() + 1
+        );
 
         bytes
             .into_iter()
diff --git a/contracts/Cargo.lock b/contracts/Cargo.lock
index 760f982b0e..bcd4743994 100644
--- a/contracts/Cargo.lock
+++ b/contracts/Cargo.lock
@@ -1220,12 +1220,13 @@ dependencies = [
  "cw-controllers",
  "cw-multi-test",
  "cw-storage-plus",
+ "cw2",
  "cw4",
  "cw4-group",
- "lazy_static",
  "nym-coconut-dkg-common",
  "nym-group-contract-common",
  "rusty-fork",
+ "semver",
  "serde",
  "thiserror",
 ]
@@ -1237,6 +1238,8 @@ dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
  "cw-utils",
+ "cw2",
+ "cw4",
  "nym-contracts-common",
  "nym-multisig-contract-common",
 ]
@@ -1879,9 +1882,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.17"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
+checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0"
 
 [[package]]
 name = "serde"
diff --git a/contracts/Cargo.toml b/contracts/Cargo.toml
index effb7d9df7..83f0a46531 100644
--- a/contracts/Cargo.toml
+++ b/contracts/Cargo.toml
@@ -48,5 +48,6 @@ cw3 = "=1.1.0"
 cw3-fixed-multisig = "=1.1.0"
 cw4 = "=1.1.0"
 cw20 = "=1.1.0"
+semver = "1.0.21"
 
 thiserror = "1.0.48"
diff --git a/contracts/coconut-dkg/Cargo.toml b/contracts/coconut-dkg/Cargo.toml
index dbdd097553..13937bcb3a 100644
--- a/contracts/coconut-dkg/Cargo.toml
+++ b/contracts/coconut-dkg/Cargo.toml
@@ -20,15 +20,16 @@ cosmwasm-std = { workspace = true }
 cosmwasm-storage = { workspace = true }
 cw-storage-plus = { workspace = true }
 cw-controllers = { workspace = true }
+cw2 = { workspace = true }
 cw4 = { workspace = true }
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
+semver = { workspace = true, default-features = false }
 thiserror = { workspace = true }
 
 [dev-dependencies]
 cw-multi-test = { workspace = true }
 cw4-group = { path = "../multisig/cw4-group" }
 nym-group-contract-common = { path = "../../common/cosmwasm-smart-contracts/group-contract" }
-lazy_static = "1.4"
 rusty-fork = "0.3"
 
 [features]
diff --git a/contracts/coconut-dkg/schema/nym-coconut-dkg.json b/contracts/coconut-dkg/schema/nym-coconut-dkg.json
index 035f1bfe8f..f578fd1bc9 100644
--- a/contracts/coconut-dkg/schema/nym-coconut-dkg.json
+++ b/contracts/coconut-dkg/schema/nym-coconut-dkg.json
@@ -8,6 +8,7 @@
     "type": "object",
     "required": [
       "group_addr",
+      "key_size",
       "mix_denom",
       "multisig_addr"
     ],
@@ -15,6 +16,12 @@
       "group_addr": {
         "type": "string"
       },
+      "key_size": {
+        "description": "Specifies the number of elements in the derived keys",
+        "type": "integer",
+        "format": "uint32",
+        "minimum": 0.0
+      },
       "mix_denom": {
         "type": "string"
       },
@@ -84,6 +91,19 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "title": "ExecuteMsg",
     "oneOf": [
+      {
+        "type": "object",
+        "required": [
+          "initiate_dkg"
+        ],
+        "properties": {
+          "initiate_dkg": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
       {
         "type": "object",
         "required": [
@@ -95,6 +115,7 @@
             "required": [
               "announce_address",
               "bte_key_with_proof",
+              "identity_key",
               "resharing"
             ],
             "properties": {
@@ -104,6 +125,9 @@
               "bte_key_with_proof": {
                 "type": "string"
               },
+              "identity_key": {
+                "type": "string"
+              },
               "resharing": {
                 "type": "boolean"
               }
@@ -116,18 +140,52 @@
       {
         "type": "object",
         "required": [
-          "commit_dealing"
+          "commit_dealings_metadata"
         ],
         "properties": {
-          "commit_dealing": {
+          "commit_dealings_metadata": {
             "type": "object",
             "required": [
-              "dealing_bytes",
+              "chunks",
+              "dealing_index",
               "resharing"
             ],
             "properties": {
-              "dealing_bytes": {
-                "$ref": "#/definitions/ContractSafeBytes"
+              "chunks": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/definitions/DealingChunkInfo"
+                }
+              },
+              "dealing_index": {
+                "type": "integer",
+                "format": "uint32",
+                "minimum": 0.0
+              },
+              "resharing": {
+                "type": "boolean"
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "type": "object",
+        "required": [
+          "commit_dealings_chunk"
+        ],
+        "properties": {
+          "commit_dealings_chunk": {
+            "type": "object",
+            "required": [
+              "chunk",
+              "resharing"
+            ],
+            "properties": {
+              "chunk": {
+                "$ref": "#/definitions/PartialContractDealing"
               },
               "resharing": {
                 "type": "boolean"
@@ -177,7 +235,7 @@
             ],
             "properties": {
               "owner": {
-                "$ref": "#/definitions/Addr"
+                "type": "string"
               },
               "resharing": {
                 "type": "boolean"
@@ -216,10 +274,6 @@
       }
     ],
     "definitions": {
-      "Addr": {
-        "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
-        "type": "string"
-      },
       "ContractSafeBytes": {
         "type": "array",
         "items": {
@@ -227,6 +281,44 @@
           "format": "uint8",
           "minimum": 0.0
         }
+      },
+      "DealingChunkInfo": {
+        "type": "object",
+        "required": [
+          "size"
+        ],
+        "properties": {
+          "size": {
+            "type": "integer",
+            "format": "uint64",
+            "minimum": 0.0
+          }
+        },
+        "additionalProperties": false
+      },
+      "PartialContractDealing": {
+        "type": "object",
+        "required": [
+          "chunk_index",
+          "data",
+          "dealing_index"
+        ],
+        "properties": {
+          "chunk_index": {
+            "type": "integer",
+            "format": "uint16",
+            "minimum": 0.0
+          },
+          "data": {
+            "$ref": "#/definitions/ContractSafeBytes"
+          },
+          "dealing_index": {
+            "type": "integer",
+            "format": "uint32",
+            "minimum": 0.0
+          }
+        },
+        "additionalProperties": false
       }
     }
   },
@@ -234,6 +326,19 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "title": "QueryMsg",
     "oneOf": [
+      {
+        "type": "object",
+        "required": [
+          "get_state"
+        ],
+        "properties": {
+          "get_state": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
       {
         "type": "object",
         "required": [
@@ -355,33 +460,194 @@
       {
         "type": "object",
         "required": [
-          "get_dealing"
+          "get_dealings_metadata"
         ],
         "properties": {
-          "get_dealing": {
+          "get_dealings_metadata": {
             "type": "object",
             "required": [
-              "idx"
+              "dealer",
+              "dealing_index",
+              "epoch_id"
             ],
             "properties": {
-              "idx": {
+              "dealer": {
+                "type": "string"
+              },
+              "dealing_index": {
+                "type": "integer",
+                "format": "uint32",
+                "minimum": 0.0
+              },
+              "epoch_id": {
+                "type": "integer",
+                "format": "uint64",
+                "minimum": 0.0
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "type": "object",
+        "required": [
+          "get_dealer_dealings_status"
+        ],
+        "properties": {
+          "get_dealer_dealings_status": {
+            "type": "object",
+            "required": [
+              "dealer",
+              "epoch_id"
+            ],
+            "properties": {
+              "dealer": {
+                "type": "string"
+              },
+              "epoch_id": {
+                "type": "integer",
+                "format": "uint64",
+                "minimum": 0.0
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "type": "object",
+        "required": [
+          "get_dealing_status"
+        ],
+        "properties": {
+          "get_dealing_status": {
+            "type": "object",
+            "required": [
+              "dealer",
+              "dealing_index",
+              "epoch_id"
+            ],
+            "properties": {
+              "dealer": {
+                "type": "string"
+              },
+              "dealing_index": {
+                "type": "integer",
+                "format": "uint32",
+                "minimum": 0.0
+              },
+              "epoch_id": {
+                "type": "integer",
+                "format": "uint64",
+                "minimum": 0.0
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "type": "object",
+        "required": [
+          "get_dealing_chunk_status"
+        ],
+        "properties": {
+          "get_dealing_chunk_status": {
+            "type": "object",
+            "required": [
+              "chunk_index",
+              "dealer",
+              "dealing_index",
+              "epoch_id"
+            ],
+            "properties": {
+              "chunk_index": {
+                "type": "integer",
+                "format": "uint16",
+                "minimum": 0.0
+              },
+              "dealer": {
+                "type": "string"
+              },
+              "dealing_index": {
+                "type": "integer",
+                "format": "uint32",
+                "minimum": 0.0
+              },
+              "epoch_id": {
+                "type": "integer",
+                "format": "uint64",
+                "minimum": 0.0
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "type": "object",
+        "required": [
+          "get_dealing_chunk"
+        ],
+        "properties": {
+          "get_dealing_chunk": {
+            "type": "object",
+            "required": [
+              "chunk_index",
+              "dealer",
+              "dealing_index",
+              "epoch_id"
+            ],
+            "properties": {
+              "chunk_index": {
+                "type": "integer",
+                "format": "uint16",
+                "minimum": 0.0
+              },
+              "dealer": {
+                "type": "string"
+              },
+              "dealing_index": {
+                "type": "integer",
+                "format": "uint32",
+                "minimum": 0.0
+              },
+              "epoch_id": {
+                "type": "integer",
+                "format": "uint64",
+                "minimum": 0.0
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "type": "object",
+        "required": [
+          "get_verification_key"
+        ],
+        "properties": {
+          "get_verification_key": {
+            "type": "object",
+            "required": [
+              "epoch_id",
+              "owner"
+            ],
+            "properties": {
+              "epoch_id": {
                 "type": "integer",
                 "format": "uint64",
                 "minimum": 0.0
               },
-              "limit": {
-                "type": [
-                  "integer",
-                  "null"
-                ],
-                "format": "uint32",
-                "minimum": 0.0
-              },
-              "start_after": {
-                "type": [
-                  "string",
-                  "null"
-                ]
+              "owner": {
+                "type": "string"
               }
             },
             "additionalProperties": false
@@ -425,6 +691,20 @@
           }
         },
         "additionalProperties": false
+      },
+      {
+        "description": "Gets the stored contract version information that's required by the CW2 spec interface for migrations.",
+        "type": "object",
+        "required": [
+          "get_cw2_contract_version"
+        ],
+        "properties": {
+          "get_cw2_contract_version": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
       }
     ]
   },
@@ -436,6 +716,26 @@
   },
   "sudo": null,
   "responses": {
+    "get_c_w2_contract_version": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "ContractVersion",
+      "type": "object",
+      "required": [
+        "contract",
+        "version"
+      ],
+      "properties": {
+        "contract": {
+          "description": "contract is the crate name of the implementing contract, eg. `crate:cw20-base` we will use other prefixes for other languages, and their standard global namespacing",
+          "type": "string"
+        },
+        "version": {
+          "description": "version is any string that this implementation knows. It may be simple counter \"1\", \"2\". or semantic version on release tags \"v0.7.0\", or some custom feature flag list. the only code that needs to understand the version parsing is code that knows how to migrate from the given contract (and is tied to it's implementation somehow)",
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
+    },
     "get_current_dealers": {
       "$schema": "http://json-schema.org/draft-07/schema#",
       "title": "PagedDealerResponse",
@@ -480,7 +780,8 @@
             "address",
             "announce_address",
             "assigned_index",
-            "bte_public_key_with_proof"
+            "bte_public_key_with_proof",
+            "ed25519_identity"
           ],
           "properties": {
             "address": {
@@ -496,6 +797,9 @@
             },
             "bte_public_key_with_proof": {
               "type": "string"
+            },
+            "ed25519_identity": {
+              "type": "string"
             }
           },
           "additionalProperties": false
@@ -508,7 +812,6 @@
       "type": "object",
       "required": [
         "epoch_id",
-        "finish_timestamp",
         "state",
         "time_configuration"
       ],
@@ -519,7 +822,14 @@
           "minimum": 0.0
         },
         "finish_timestamp": {
-          "$ref": "#/definitions/Timestamp"
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Timestamp"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "state": {
           "$ref": "#/definitions/EpochState"
@@ -535,6 +845,7 @@
             {
               "type": "string",
               "enum": [
+                "waiting_initialisation",
                 "in_progress"
               ]
             },
@@ -710,6 +1021,80 @@
       "format": "uint64",
       "minimum": 0.0
     },
+    "get_dealer_dealings_status": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "DealerDealingsStatusResponse",
+      "type": "object",
+      "required": [
+        "all_dealings_fully_submitted",
+        "dealer",
+        "dealing_submission_status",
+        "epoch_id"
+      ],
+      "properties": {
+        "all_dealings_fully_submitted": {
+          "type": "boolean"
+        },
+        "dealer": {
+          "$ref": "#/definitions/Addr"
+        },
+        "dealing_submission_status": {
+          "type": "object",
+          "additionalProperties": {
+            "$ref": "#/definitions/DealingStatus"
+          }
+        },
+        "epoch_id": {
+          "type": "integer",
+          "format": "uint64",
+          "minimum": 0.0
+        }
+      },
+      "additionalProperties": false,
+      "definitions": {
+        "Addr": {
+          "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+          "type": "string"
+        },
+        "ChunkSubmissionStatus": {
+          "type": "object",
+          "properties": {
+            "submission_height": {
+              "type": [
+                "integer",
+                "null"
+              ],
+              "format": "uint64",
+              "minimum": 0.0
+            }
+          },
+          "additionalProperties": false
+        },
+        "DealingStatus": {
+          "type": "object",
+          "required": [
+            "chunk_submission_status",
+            "fully_submitted",
+            "has_metadata"
+          ],
+          "properties": {
+            "chunk_submission_status": {
+              "type": "object",
+              "additionalProperties": {
+                "$ref": "#/definitions/ChunkSubmissionStatus"
+              }
+            },
+            "fully_submitted": {
+              "type": "boolean"
+            },
+            "has_metadata": {
+              "type": "boolean"
+            }
+          },
+          "additionalProperties": false
+        }
+      }
+    },
     "get_dealer_details": {
       "$schema": "http://json-schema.org/draft-07/schema#",
       "title": "DealerDetailsResponse",
@@ -744,7 +1129,8 @@
             "address",
             "announce_address",
             "assigned_index",
-            "bte_public_key_with_proof"
+            "bte_public_key_with_proof",
+            "ed25519_identity"
           ],
           "properties": {
             "address": {
@@ -760,6 +1146,9 @@
             },
             "bte_public_key_with_proof": {
               "type": "string"
+            },
+            "ed25519_identity": {
+              "type": "string"
             }
           },
           "additionalProperties": false
@@ -774,31 +1163,218 @@
         }
       }
     },
-    "get_dealing": {
+    "get_dealing_chunk": {
       "$schema": "http://json-schema.org/draft-07/schema#",
-      "title": "PagedDealingsResponse",
+      "title": "DealingChunkResponse",
       "type": "object",
       "required": [
-        "dealings",
-        "per_page"
+        "chunk_index",
+        "dealer",
+        "dealing_index",
+        "epoch_id"
       ],
       "properties": {
-        "dealings": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/ContractDealing"
-          }
-        },
-        "per_page": {
-          "type": "integer",
-          "format": "uint",
-          "minimum": 0.0
-        },
-        "start_next_after": {
-          "description": "Field indicating paging information for the following queries if the caller wishes to get further entries.",
+        "chunk": {
           "anyOf": [
             {
-              "$ref": "#/definitions/Addr"
+              "$ref": "#/definitions/ContractSafeBytes"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "chunk_index": {
+          "type": "integer",
+          "format": "uint16",
+          "minimum": 0.0
+        },
+        "dealer": {
+          "$ref": "#/definitions/Addr"
+        },
+        "dealing_index": {
+          "type": "integer",
+          "format": "uint32",
+          "minimum": 0.0
+        },
+        "epoch_id": {
+          "type": "integer",
+          "format": "uint64",
+          "minimum": 0.0
+        }
+      },
+      "additionalProperties": false,
+      "definitions": {
+        "Addr": {
+          "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+          "type": "string"
+        },
+        "ContractSafeBytes": {
+          "type": "array",
+          "items": {
+            "type": "integer",
+            "format": "uint8",
+            "minimum": 0.0
+          }
+        }
+      }
+    },
+    "get_dealing_chunk_status": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "DealingChunkStatusResponse",
+      "type": "object",
+      "required": [
+        "chunk_index",
+        "dealer",
+        "dealing_index",
+        "epoch_id",
+        "status"
+      ],
+      "properties": {
+        "chunk_index": {
+          "type": "integer",
+          "format": "uint16",
+          "minimum": 0.0
+        },
+        "dealer": {
+          "$ref": "#/definitions/Addr"
+        },
+        "dealing_index": {
+          "type": "integer",
+          "format": "uint32",
+          "minimum": 0.0
+        },
+        "epoch_id": {
+          "type": "integer",
+          "format": "uint64",
+          "minimum": 0.0
+        },
+        "status": {
+          "$ref": "#/definitions/ChunkSubmissionStatus"
+        }
+      },
+      "additionalProperties": false,
+      "definitions": {
+        "Addr": {
+          "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+          "type": "string"
+        },
+        "ChunkSubmissionStatus": {
+          "type": "object",
+          "properties": {
+            "submission_height": {
+              "type": [
+                "integer",
+                "null"
+              ],
+              "format": "uint64",
+              "minimum": 0.0
+            }
+          },
+          "additionalProperties": false
+        }
+      }
+    },
+    "get_dealing_status": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "DealingStatusResponse",
+      "type": "object",
+      "required": [
+        "dealer",
+        "dealing_index",
+        "epoch_id",
+        "status"
+      ],
+      "properties": {
+        "dealer": {
+          "$ref": "#/definitions/Addr"
+        },
+        "dealing_index": {
+          "type": "integer",
+          "format": "uint32",
+          "minimum": 0.0
+        },
+        "epoch_id": {
+          "type": "integer",
+          "format": "uint64",
+          "minimum": 0.0
+        },
+        "status": {
+          "$ref": "#/definitions/DealingStatus"
+        }
+      },
+      "additionalProperties": false,
+      "definitions": {
+        "Addr": {
+          "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+          "type": "string"
+        },
+        "ChunkSubmissionStatus": {
+          "type": "object",
+          "properties": {
+            "submission_height": {
+              "type": [
+                "integer",
+                "null"
+              ],
+              "format": "uint64",
+              "minimum": 0.0
+            }
+          },
+          "additionalProperties": false
+        },
+        "DealingStatus": {
+          "type": "object",
+          "required": [
+            "chunk_submission_status",
+            "fully_submitted",
+            "has_metadata"
+          ],
+          "properties": {
+            "chunk_submission_status": {
+              "type": "object",
+              "additionalProperties": {
+                "$ref": "#/definitions/ChunkSubmissionStatus"
+              }
+            },
+            "fully_submitted": {
+              "type": "boolean"
+            },
+            "has_metadata": {
+              "type": "boolean"
+            }
+          },
+          "additionalProperties": false
+        }
+      }
+    },
+    "get_dealings_metadata": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "DealingMetadataResponse",
+      "type": "object",
+      "required": [
+        "dealer",
+        "dealing_index",
+        "epoch_id"
+      ],
+      "properties": {
+        "dealer": {
+          "$ref": "#/definitions/Addr"
+        },
+        "dealing_index": {
+          "type": "integer",
+          "format": "uint32",
+          "minimum": 0.0
+        },
+        "epoch_id": {
+          "type": "integer",
+          "format": "uint64",
+          "minimum": 0.0
+        },
+        "metadata": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/DealingMetadata"
             },
             {
               "type": "null"
@@ -812,29 +1388,70 @@
           "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
           "type": "string"
         },
-        "ContractDealing": {
+        "ChunkSubmissionStatus": {
           "type": "object",
-          "required": [
-            "dealer",
-            "dealing"
-          ],
           "properties": {
-            "dealer": {
-              "$ref": "#/definitions/Addr"
-            },
-            "dealing": {
-              "$ref": "#/definitions/ContractSafeBytes"
+            "submission_height": {
+              "type": [
+                "integer",
+                "null"
+              ],
+              "format": "uint64",
+              "minimum": 0.0
             }
           },
           "additionalProperties": false
         },
-        "ContractSafeBytes": {
-          "type": "array",
-          "items": {
-            "type": "integer",
-            "format": "uint8",
-            "minimum": 0.0
-          }
+        "DealingChunkInfo": {
+          "type": "object",
+          "required": [
+            "size"
+          ],
+          "properties": {
+            "size": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            }
+          },
+          "additionalProperties": false
+        },
+        "DealingMetadata": {
+          "type": "object",
+          "required": [
+            "dealing_index",
+            "submitted_chunks"
+          ],
+          "properties": {
+            "dealing_index": {
+              "type": "integer",
+              "format": "uint32",
+              "minimum": 0.0
+            },
+            "submitted_chunks": {
+              "type": "object",
+              "additionalProperties": {
+                "$ref": "#/definitions/SubmittedChunk"
+              }
+            }
+          },
+          "additionalProperties": false
+        },
+        "SubmittedChunk": {
+          "type": "object",
+          "required": [
+            "info",
+            "status"
+          ],
+          "properties": {
+            "info": {
+              "$ref": "#/definitions/DealingChunkInfo"
+            },
+            "status": {
+              "$ref": "#/definitions/ChunkSubmissionStatus"
+            }
+          },
+          "additionalProperties": false
         }
       }
     },
@@ -921,7 +1538,8 @@
             "address",
             "announce_address",
             "assigned_index",
-            "bte_public_key_with_proof"
+            "bte_public_key_with_proof",
+            "ed25519_identity"
           ],
           "properties": {
             "address": {
@@ -937,6 +1555,124 @@
             },
             "bte_public_key_with_proof": {
               "type": "string"
+            },
+            "ed25519_identity": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        }
+      }
+    },
+    "get_state": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "State",
+      "type": "object",
+      "required": [
+        "group_addr",
+        "key_size",
+        "mix_denom",
+        "multisig_addr"
+      ],
+      "properties": {
+        "group_addr": {
+          "$ref": "#/definitions/Cw4Contract"
+        },
+        "key_size": {
+          "description": "Specifies the number of elements in the derived keys",
+          "type": "integer",
+          "format": "uint32",
+          "minimum": 0.0
+        },
+        "mix_denom": {
+          "type": "string"
+        },
+        "multisig_addr": {
+          "$ref": "#/definitions/Addr"
+        }
+      },
+      "additionalProperties": false,
+      "definitions": {
+        "Addr": {
+          "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+          "type": "string"
+        },
+        "Cw4Contract": {
+          "description": "Cw4Contract is a wrapper around Addr that provides a lot of helpers for working with cw4 contracts\n\nIf you wish to persist this, convert to Cw4CanonicalContract via .canonical()",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Addr"
+            }
+          ]
+        }
+      }
+    },
+    "get_verification_key": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "VkShareResponse",
+      "type": "object",
+      "required": [
+        "epoch_id",
+        "owner"
+      ],
+      "properties": {
+        "epoch_id": {
+          "type": "integer",
+          "format": "uint64",
+          "minimum": 0.0
+        },
+        "owner": {
+          "$ref": "#/definitions/Addr"
+        },
+        "share": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/ContractVKShare"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        }
+      },
+      "additionalProperties": false,
+      "definitions": {
+        "Addr": {
+          "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+          "type": "string"
+        },
+        "ContractVKShare": {
+          "type": "object",
+          "required": [
+            "announce_address",
+            "epoch_id",
+            "node_index",
+            "owner",
+            "share",
+            "verified"
+          ],
+          "properties": {
+            "announce_address": {
+              "type": "string"
+            },
+            "epoch_id": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            },
+            "node_index": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            },
+            "owner": {
+              "$ref": "#/definitions/Addr"
+            },
+            "share": {
+              "type": "string"
+            },
+            "verified": {
+              "type": "boolean"
             }
           },
           "additionalProperties": false
diff --git a/contracts/coconut-dkg/schema/raw/execute.json b/contracts/coconut-dkg/schema/raw/execute.json
index 5e87d1dc07..a576df2219 100644
--- a/contracts/coconut-dkg/schema/raw/execute.json
+++ b/contracts/coconut-dkg/schema/raw/execute.json
@@ -2,6 +2,19 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "ExecuteMsg",
   "oneOf": [
+    {
+      "type": "object",
+      "required": [
+        "initiate_dkg"
+      ],
+      "properties": {
+        "initiate_dkg": {
+          "type": "object",
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
     {
       "type": "object",
       "required": [
@@ -13,6 +26,7 @@
           "required": [
             "announce_address",
             "bte_key_with_proof",
+            "identity_key",
             "resharing"
           ],
           "properties": {
@@ -22,6 +36,9 @@
             "bte_key_with_proof": {
               "type": "string"
             },
+            "identity_key": {
+              "type": "string"
+            },
             "resharing": {
               "type": "boolean"
             }
@@ -34,18 +51,52 @@
     {
       "type": "object",
       "required": [
-        "commit_dealing"
+        "commit_dealings_metadata"
       ],
       "properties": {
-        "commit_dealing": {
+        "commit_dealings_metadata": {
           "type": "object",
           "required": [
-            "dealing_bytes",
+            "chunks",
+            "dealing_index",
             "resharing"
           ],
           "properties": {
-            "dealing_bytes": {
-              "$ref": "#/definitions/ContractSafeBytes"
+            "chunks": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/DealingChunkInfo"
+              }
+            },
+            "dealing_index": {
+              "type": "integer",
+              "format": "uint32",
+              "minimum": 0.0
+            },
+            "resharing": {
+              "type": "boolean"
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "commit_dealings_chunk"
+      ],
+      "properties": {
+        "commit_dealings_chunk": {
+          "type": "object",
+          "required": [
+            "chunk",
+            "resharing"
+          ],
+          "properties": {
+            "chunk": {
+              "$ref": "#/definitions/PartialContractDealing"
             },
             "resharing": {
               "type": "boolean"
@@ -95,7 +146,7 @@
           ],
           "properties": {
             "owner": {
-              "$ref": "#/definitions/Addr"
+              "type": "string"
             },
             "resharing": {
               "type": "boolean"
@@ -134,10 +185,6 @@
     }
   ],
   "definitions": {
-    "Addr": {
-      "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
-      "type": "string"
-    },
     "ContractSafeBytes": {
       "type": "array",
       "items": {
@@ -145,6 +192,44 @@
         "format": "uint8",
         "minimum": 0.0
       }
+    },
+    "DealingChunkInfo": {
+      "type": "object",
+      "required": [
+        "size"
+      ],
+      "properties": {
+        "size": {
+          "type": "integer",
+          "format": "uint64",
+          "minimum": 0.0
+        }
+      },
+      "additionalProperties": false
+    },
+    "PartialContractDealing": {
+      "type": "object",
+      "required": [
+        "chunk_index",
+        "data",
+        "dealing_index"
+      ],
+      "properties": {
+        "chunk_index": {
+          "type": "integer",
+          "format": "uint16",
+          "minimum": 0.0
+        },
+        "data": {
+          "$ref": "#/definitions/ContractSafeBytes"
+        },
+        "dealing_index": {
+          "type": "integer",
+          "format": "uint32",
+          "minimum": 0.0
+        }
+      },
+      "additionalProperties": false
     }
   }
 }
diff --git a/contracts/coconut-dkg/schema/raw/instantiate.json b/contracts/coconut-dkg/schema/raw/instantiate.json
index af468be6c6..9a10fad506 100644
--- a/contracts/coconut-dkg/schema/raw/instantiate.json
+++ b/contracts/coconut-dkg/schema/raw/instantiate.json
@@ -4,6 +4,7 @@
   "type": "object",
   "required": [
     "group_addr",
+    "key_size",
     "mix_denom",
     "multisig_addr"
   ],
@@ -11,6 +12,12 @@
     "group_addr": {
       "type": "string"
     },
+    "key_size": {
+      "description": "Specifies the number of elements in the derived keys",
+      "type": "integer",
+      "format": "uint32",
+      "minimum": 0.0
+    },
     "mix_denom": {
       "type": "string"
     },
diff --git a/contracts/coconut-dkg/schema/raw/query.json b/contracts/coconut-dkg/schema/raw/query.json
index c165069598..96f50233dd 100644
--- a/contracts/coconut-dkg/schema/raw/query.json
+++ b/contracts/coconut-dkg/schema/raw/query.json
@@ -2,6 +2,19 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "QueryMsg",
   "oneOf": [
+    {
+      "type": "object",
+      "required": [
+        "get_state"
+      ],
+      "properties": {
+        "get_state": {
+          "type": "object",
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
     {
       "type": "object",
       "required": [
@@ -123,33 +136,194 @@
     {
       "type": "object",
       "required": [
-        "get_dealing"
+        "get_dealings_metadata"
       ],
       "properties": {
-        "get_dealing": {
+        "get_dealings_metadata": {
           "type": "object",
           "required": [
-            "idx"
+            "dealer",
+            "dealing_index",
+            "epoch_id"
           ],
           "properties": {
-            "idx": {
+            "dealer": {
+              "type": "string"
+            },
+            "dealing_index": {
+              "type": "integer",
+              "format": "uint32",
+              "minimum": 0.0
+            },
+            "epoch_id": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "get_dealer_dealings_status"
+      ],
+      "properties": {
+        "get_dealer_dealings_status": {
+          "type": "object",
+          "required": [
+            "dealer",
+            "epoch_id"
+          ],
+          "properties": {
+            "dealer": {
+              "type": "string"
+            },
+            "epoch_id": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "get_dealing_status"
+      ],
+      "properties": {
+        "get_dealing_status": {
+          "type": "object",
+          "required": [
+            "dealer",
+            "dealing_index",
+            "epoch_id"
+          ],
+          "properties": {
+            "dealer": {
+              "type": "string"
+            },
+            "dealing_index": {
+              "type": "integer",
+              "format": "uint32",
+              "minimum": 0.0
+            },
+            "epoch_id": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "get_dealing_chunk_status"
+      ],
+      "properties": {
+        "get_dealing_chunk_status": {
+          "type": "object",
+          "required": [
+            "chunk_index",
+            "dealer",
+            "dealing_index",
+            "epoch_id"
+          ],
+          "properties": {
+            "chunk_index": {
+              "type": "integer",
+              "format": "uint16",
+              "minimum": 0.0
+            },
+            "dealer": {
+              "type": "string"
+            },
+            "dealing_index": {
+              "type": "integer",
+              "format": "uint32",
+              "minimum": 0.0
+            },
+            "epoch_id": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "get_dealing_chunk"
+      ],
+      "properties": {
+        "get_dealing_chunk": {
+          "type": "object",
+          "required": [
+            "chunk_index",
+            "dealer",
+            "dealing_index",
+            "epoch_id"
+          ],
+          "properties": {
+            "chunk_index": {
+              "type": "integer",
+              "format": "uint16",
+              "minimum": 0.0
+            },
+            "dealer": {
+              "type": "string"
+            },
+            "dealing_index": {
+              "type": "integer",
+              "format": "uint32",
+              "minimum": 0.0
+            },
+            "epoch_id": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "get_verification_key"
+      ],
+      "properties": {
+        "get_verification_key": {
+          "type": "object",
+          "required": [
+            "epoch_id",
+            "owner"
+          ],
+          "properties": {
+            "epoch_id": {
               "type": "integer",
               "format": "uint64",
               "minimum": 0.0
             },
-            "limit": {
-              "type": [
-                "integer",
-                "null"
-              ],
-              "format": "uint32",
-              "minimum": 0.0
-            },
-            "start_after": {
-              "type": [
-                "string",
-                "null"
-              ]
+            "owner": {
+              "type": "string"
             }
           },
           "additionalProperties": false
@@ -193,6 +367,20 @@
         }
       },
       "additionalProperties": false
+    },
+    {
+      "description": "Gets the stored contract version information that's required by the CW2 spec interface for migrations.",
+      "type": "object",
+      "required": [
+        "get_cw2_contract_version"
+      ],
+      "properties": {
+        "get_cw2_contract_version": {
+          "type": "object",
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
     }
   ]
 }
diff --git a/contracts/coconut-dkg/schema/raw/response_to_get_c_w2_contract_version.json b/contracts/coconut-dkg/schema/raw/response_to_get_c_w2_contract_version.json
new file mode 100644
index 0000000000..3ded8c84d9
--- /dev/null
+++ b/contracts/coconut-dkg/schema/raw/response_to_get_c_w2_contract_version.json
@@ -0,0 +1,20 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "ContractVersion",
+  "type": "object",
+  "required": [
+    "contract",
+    "version"
+  ],
+  "properties": {
+    "contract": {
+      "description": "contract is the crate name of the implementing contract, eg. `crate:cw20-base` we will use other prefixes for other languages, and their standard global namespacing",
+      "type": "string"
+    },
+    "version": {
+      "description": "version is any string that this implementation knows. It may be simple counter \"1\", \"2\". or semantic version on release tags \"v0.7.0\", or some custom feature flag list. the only code that needs to understand the version parsing is code that knows how to migrate from the given contract (and is tied to it's implementation somehow)",
+      "type": "string"
+    }
+  },
+  "additionalProperties": false
+}
diff --git a/contracts/coconut-dkg/schema/raw/response_to_get_current_dealers.json b/contracts/coconut-dkg/schema/raw/response_to_get_current_dealers.json
index e08ceedf09..12648de260 100644
--- a/contracts/coconut-dkg/schema/raw/response_to_get_current_dealers.json
+++ b/contracts/coconut-dkg/schema/raw/response_to_get_current_dealers.json
@@ -42,7 +42,8 @@
         "address",
         "announce_address",
         "assigned_index",
-        "bte_public_key_with_proof"
+        "bte_public_key_with_proof",
+        "ed25519_identity"
       ],
       "properties": {
         "address": {
@@ -58,6 +59,9 @@
         },
         "bte_public_key_with_proof": {
           "type": "string"
+        },
+        "ed25519_identity": {
+          "type": "string"
         }
       },
       "additionalProperties": false
diff --git a/contracts/coconut-dkg/schema/raw/response_to_get_current_epoch_state.json b/contracts/coconut-dkg/schema/raw/response_to_get_current_epoch_state.json
index 8af981b9db..3f4a9df103 100644
--- a/contracts/coconut-dkg/schema/raw/response_to_get_current_epoch_state.json
+++ b/contracts/coconut-dkg/schema/raw/response_to_get_current_epoch_state.json
@@ -4,7 +4,6 @@
   "type": "object",
   "required": [
     "epoch_id",
-    "finish_timestamp",
     "state",
     "time_configuration"
   ],
@@ -15,7 +14,14 @@
       "minimum": 0.0
     },
     "finish_timestamp": {
-      "$ref": "#/definitions/Timestamp"
+      "anyOf": [
+        {
+          "$ref": "#/definitions/Timestamp"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "state": {
       "$ref": "#/definitions/EpochState"
@@ -31,6 +37,7 @@
         {
           "type": "string",
           "enum": [
+            "waiting_initialisation",
             "in_progress"
           ]
         },
diff --git a/contracts/coconut-dkg/schema/raw/response_to_get_dealer_dealings_status.json b/contracts/coconut-dkg/schema/raw/response_to_get_dealer_dealings_status.json
new file mode 100644
index 0000000000..0422d9506b
--- /dev/null
+++ b/contracts/coconut-dkg/schema/raw/response_to_get_dealer_dealings_status.json
@@ -0,0 +1,74 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "DealerDealingsStatusResponse",
+  "type": "object",
+  "required": [
+    "all_dealings_fully_submitted",
+    "dealer",
+    "dealing_submission_status",
+    "epoch_id"
+  ],
+  "properties": {
+    "all_dealings_fully_submitted": {
+      "type": "boolean"
+    },
+    "dealer": {
+      "$ref": "#/definitions/Addr"
+    },
+    "dealing_submission_status": {
+      "type": "object",
+      "additionalProperties": {
+        "$ref": "#/definitions/DealingStatus"
+      }
+    },
+    "epoch_id": {
+      "type": "integer",
+      "format": "uint64",
+      "minimum": 0.0
+    }
+  },
+  "additionalProperties": false,
+  "definitions": {
+    "Addr": {
+      "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+      "type": "string"
+    },
+    "ChunkSubmissionStatus": {
+      "type": "object",
+      "properties": {
+        "submission_height": {
+          "type": [
+            "integer",
+            "null"
+          ],
+          "format": "uint64",
+          "minimum": 0.0
+        }
+      },
+      "additionalProperties": false
+    },
+    "DealingStatus": {
+      "type": "object",
+      "required": [
+        "chunk_submission_status",
+        "fully_submitted",
+        "has_metadata"
+      ],
+      "properties": {
+        "chunk_submission_status": {
+          "type": "object",
+          "additionalProperties": {
+            "$ref": "#/definitions/ChunkSubmissionStatus"
+          }
+        },
+        "fully_submitted": {
+          "type": "boolean"
+        },
+        "has_metadata": {
+          "type": "boolean"
+        }
+      },
+      "additionalProperties": false
+    }
+  }
+}
diff --git a/contracts/coconut-dkg/schema/raw/response_to_get_dealer_details.json b/contracts/coconut-dkg/schema/raw/response_to_get_dealer_details.json
index 474a247a99..776cfefbc1 100644
--- a/contracts/coconut-dkg/schema/raw/response_to_get_dealer_details.json
+++ b/contracts/coconut-dkg/schema/raw/response_to_get_dealer_details.json
@@ -32,7 +32,8 @@
         "address",
         "announce_address",
         "assigned_index",
-        "bte_public_key_with_proof"
+        "bte_public_key_with_proof",
+        "ed25519_identity"
       ],
       "properties": {
         "address": {
@@ -48,6 +49,9 @@
         },
         "bte_public_key_with_proof": {
           "type": "string"
+        },
+        "ed25519_identity": {
+          "type": "string"
         }
       },
       "additionalProperties": false
diff --git a/contracts/coconut-dkg/schema/raw/response_to_get_dealing.json b/contracts/coconut-dkg/schema/raw/response_to_get_dealing.json
index 8fc350b74c..9cf07f72c8 100644
--- a/contracts/coconut-dkg/schema/raw/response_to_get_dealing.json
+++ b/contracts/coconut-dkg/schema/raw/response_to_get_dealing.json
@@ -1,33 +1,35 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "PagedDealingsResponse",
+  "title": "DealingResponse",
   "type": "object",
   "required": [
-    "dealings",
-    "per_page"
+    "dealer",
+    "dealing_index",
+    "epoch_id"
   ],
   "properties": {
-    "dealings": {
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/ContractDealing"
-      }
+    "dealer": {
+      "$ref": "#/definitions/Addr"
     },
-    "per_page": {
-      "type": "integer",
-      "format": "uint",
-      "minimum": 0.0
-    },
-    "start_next_after": {
-      "description": "Field indicating paging information for the following queries if the caller wishes to get further entries.",
+    "dealing": {
       "anyOf": [
         {
-          "$ref": "#/definitions/Addr"
+          "$ref": "#/definitions/ContractSafeBytes"
         },
         {
           "type": "null"
         }
       ]
+    },
+    "dealing_index": {
+      "type": "integer",
+      "format": "uint32",
+      "minimum": 0.0
+    },
+    "epoch_id": {
+      "type": "integer",
+      "format": "uint64",
+      "minimum": 0.0
     }
   },
   "additionalProperties": false,
@@ -36,22 +38,6 @@
       "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
       "type": "string"
     },
-    "ContractDealing": {
-      "type": "object",
-      "required": [
-        "dealer",
-        "dealing"
-      ],
-      "properties": {
-        "dealer": {
-          "$ref": "#/definitions/Addr"
-        },
-        "dealing": {
-          "$ref": "#/definitions/ContractSafeBytes"
-        }
-      },
-      "additionalProperties": false
-    },
     "ContractSafeBytes": {
       "type": "array",
       "items": {
diff --git a/contracts/coconut-dkg/schema/raw/response_to_get_dealing_chunk.json b/contracts/coconut-dkg/schema/raw/response_to_get_dealing_chunk.json
new file mode 100644
index 0000000000..8006bf8845
--- /dev/null
+++ b/contracts/coconut-dkg/schema/raw/response_to_get_dealing_chunk.json
@@ -0,0 +1,56 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "DealingChunkResponse",
+  "type": "object",
+  "required": [
+    "chunk_index",
+    "dealer",
+    "dealing_index",
+    "epoch_id"
+  ],
+  "properties": {
+    "chunk": {
+      "anyOf": [
+        {
+          "$ref": "#/definitions/ContractSafeBytes"
+        },
+        {
+          "type": "null"
+        }
+      ]
+    },
+    "chunk_index": {
+      "type": "integer",
+      "format": "uint16",
+      "minimum": 0.0
+    },
+    "dealer": {
+      "$ref": "#/definitions/Addr"
+    },
+    "dealing_index": {
+      "type": "integer",
+      "format": "uint32",
+      "minimum": 0.0
+    },
+    "epoch_id": {
+      "type": "integer",
+      "format": "uint64",
+      "minimum": 0.0
+    }
+  },
+  "additionalProperties": false,
+  "definitions": {
+    "Addr": {
+      "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+      "type": "string"
+    },
+    "ContractSafeBytes": {
+      "type": "array",
+      "items": {
+        "type": "integer",
+        "format": "uint8",
+        "minimum": 0.0
+      }
+    }
+  }
+}
diff --git a/contracts/coconut-dkg/schema/raw/response_to_get_dealing_chunk_status.json b/contracts/coconut-dkg/schema/raw/response_to_get_dealing_chunk_status.json
new file mode 100644
index 0000000000..a278e4622d
--- /dev/null
+++ b/contracts/coconut-dkg/schema/raw/response_to_get_dealing_chunk_status.json
@@ -0,0 +1,56 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "DealingChunkStatusResponse",
+  "type": "object",
+  "required": [
+    "chunk_index",
+    "dealer",
+    "dealing_index",
+    "epoch_id",
+    "status"
+  ],
+  "properties": {
+    "chunk_index": {
+      "type": "integer",
+      "format": "uint16",
+      "minimum": 0.0
+    },
+    "dealer": {
+      "$ref": "#/definitions/Addr"
+    },
+    "dealing_index": {
+      "type": "integer",
+      "format": "uint32",
+      "minimum": 0.0
+    },
+    "epoch_id": {
+      "type": "integer",
+      "format": "uint64",
+      "minimum": 0.0
+    },
+    "status": {
+      "$ref": "#/definitions/ChunkSubmissionStatus"
+    }
+  },
+  "additionalProperties": false,
+  "definitions": {
+    "Addr": {
+      "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+      "type": "string"
+    },
+    "ChunkSubmissionStatus": {
+      "type": "object",
+      "properties": {
+        "submission_height": {
+          "type": [
+            "integer",
+            "null"
+          ],
+          "format": "uint64",
+          "minimum": 0.0
+        }
+      },
+      "additionalProperties": false
+    }
+  }
+}
diff --git a/contracts/coconut-dkg/schema/raw/response_to_get_dealing_status.json b/contracts/coconut-dkg/schema/raw/response_to_get_dealing_status.json
new file mode 100644
index 0000000000..c3a428dd14
--- /dev/null
+++ b/contracts/coconut-dkg/schema/raw/response_to_get_dealing_status.json
@@ -0,0 +1,73 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "DealingStatusResponse",
+  "type": "object",
+  "required": [
+    "dealer",
+    "dealing_index",
+    "epoch_id",
+    "status"
+  ],
+  "properties": {
+    "dealer": {
+      "$ref": "#/definitions/Addr"
+    },
+    "dealing_index": {
+      "type": "integer",
+      "format": "uint32",
+      "minimum": 0.0
+    },
+    "epoch_id": {
+      "type": "integer",
+      "format": "uint64",
+      "minimum": 0.0
+    },
+    "status": {
+      "$ref": "#/definitions/DealingStatus"
+    }
+  },
+  "additionalProperties": false,
+  "definitions": {
+    "Addr": {
+      "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+      "type": "string"
+    },
+    "ChunkSubmissionStatus": {
+      "type": "object",
+      "properties": {
+        "submission_height": {
+          "type": [
+            "integer",
+            "null"
+          ],
+          "format": "uint64",
+          "minimum": 0.0
+        }
+      },
+      "additionalProperties": false
+    },
+    "DealingStatus": {
+      "type": "object",
+      "required": [
+        "chunk_submission_status",
+        "fully_submitted",
+        "has_metadata"
+      ],
+      "properties": {
+        "chunk_submission_status": {
+          "type": "object",
+          "additionalProperties": {
+            "$ref": "#/definitions/ChunkSubmissionStatus"
+          }
+        },
+        "fully_submitted": {
+          "type": "boolean"
+        },
+        "has_metadata": {
+          "type": "boolean"
+        }
+      },
+      "additionalProperties": false
+    }
+  }
+}
diff --git a/contracts/coconut-dkg/schema/raw/response_to_get_dealings.json b/contracts/coconut-dkg/schema/raw/response_to_get_dealings.json
new file mode 100644
index 0000000000..b5395dfa6a
--- /dev/null
+++ b/contracts/coconut-dkg/schema/raw/response_to_get_dealings.json
@@ -0,0 +1,68 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "PagedDealingsResponse",
+  "type": "object",
+  "required": [
+    "dealer",
+    "dealings",
+    "epoch_id"
+  ],
+  "properties": {
+    "dealer": {
+      "$ref": "#/definitions/Addr"
+    },
+    "dealings": {
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/PartialContractDealing"
+      }
+    },
+    "epoch_id": {
+      "type": "integer",
+      "format": "uint64",
+      "minimum": 0.0
+    },
+    "start_next_after": {
+      "description": "Field indicating paging information for the following queries if the caller wishes to get further entries.",
+      "type": [
+        "integer",
+        "null"
+      ],
+      "format": "uint32",
+      "minimum": 0.0
+    }
+  },
+  "additionalProperties": false,
+  "definitions": {
+    "Addr": {
+      "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+      "type": "string"
+    },
+    "ContractSafeBytes": {
+      "type": "array",
+      "items": {
+        "type": "integer",
+        "format": "uint8",
+        "minimum": 0.0
+      }
+    },
+    "PartialContractDealing": {
+      "type": "object",
+      "required": [
+        "data",
+        "index"
+      ],
+      "properties": {
+        "data": {
+          "$ref": "#/definitions/ContractSafeBytes"
+        },
+        "index": {
+          "type": "integer",
+          "format": "uint32",
+          "minimum": 0.0
+        }
+      },
+      "additionalProperties": false
+    }
+  }
+}
diff --git a/contracts/coconut-dkg/schema/raw/response_to_get_dealings_metadata.json b/contracts/coconut-dkg/schema/raw/response_to_get_dealings_metadata.json
new file mode 100644
index 0000000000..1ef4bc443c
--- /dev/null
+++ b/contracts/coconut-dkg/schema/raw/response_to_get_dealings_metadata.json
@@ -0,0 +1,107 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "DealingMetadataResponse",
+  "type": "object",
+  "required": [
+    "dealer",
+    "dealing_index",
+    "epoch_id"
+  ],
+  "properties": {
+    "dealer": {
+      "$ref": "#/definitions/Addr"
+    },
+    "dealing_index": {
+      "type": "integer",
+      "format": "uint32",
+      "minimum": 0.0
+    },
+    "epoch_id": {
+      "type": "integer",
+      "format": "uint64",
+      "minimum": 0.0
+    },
+    "metadata": {
+      "anyOf": [
+        {
+          "$ref": "#/definitions/DealingMetadata"
+        },
+        {
+          "type": "null"
+        }
+      ]
+    }
+  },
+  "additionalProperties": false,
+  "definitions": {
+    "Addr": {
+      "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+      "type": "string"
+    },
+    "ChunkSubmissionStatus": {
+      "type": "object",
+      "properties": {
+        "submission_height": {
+          "type": [
+            "integer",
+            "null"
+          ],
+          "format": "uint64",
+          "minimum": 0.0
+        }
+      },
+      "additionalProperties": false
+    },
+    "DealingChunkInfo": {
+      "type": "object",
+      "required": [
+        "size"
+      ],
+      "properties": {
+        "size": {
+          "type": "integer",
+          "format": "uint64",
+          "minimum": 0.0
+        }
+      },
+      "additionalProperties": false
+    },
+    "DealingMetadata": {
+      "type": "object",
+      "required": [
+        "dealing_index",
+        "submitted_chunks"
+      ],
+      "properties": {
+        "dealing_index": {
+          "type": "integer",
+          "format": "uint32",
+          "minimum": 0.0
+        },
+        "submitted_chunks": {
+          "type": "object",
+          "additionalProperties": {
+            "$ref": "#/definitions/SubmittedChunk"
+          }
+        }
+      },
+      "additionalProperties": false
+    },
+    "SubmittedChunk": {
+      "type": "object",
+      "required": [
+        "info",
+        "status"
+      ],
+      "properties": {
+        "info": {
+          "$ref": "#/definitions/DealingChunkInfo"
+        },
+        "status": {
+          "$ref": "#/definitions/ChunkSubmissionStatus"
+        }
+      },
+      "additionalProperties": false
+    }
+  }
+}
diff --git a/contracts/coconut-dkg/schema/raw/response_to_get_past_dealers.json b/contracts/coconut-dkg/schema/raw/response_to_get_past_dealers.json
index e08ceedf09..12648de260 100644
--- a/contracts/coconut-dkg/schema/raw/response_to_get_past_dealers.json
+++ b/contracts/coconut-dkg/schema/raw/response_to_get_past_dealers.json
@@ -42,7 +42,8 @@
         "address",
         "announce_address",
         "assigned_index",
-        "bte_public_key_with_proof"
+        "bte_public_key_with_proof",
+        "ed25519_identity"
       ],
       "properties": {
         "address": {
@@ -58,6 +59,9 @@
         },
         "bte_public_key_with_proof": {
           "type": "string"
+        },
+        "ed25519_identity": {
+          "type": "string"
         }
       },
       "additionalProperties": false
diff --git a/contracts/coconut-dkg/schema/raw/response_to_get_state.json b/contracts/coconut-dkg/schema/raw/response_to_get_state.json
new file mode 100644
index 0000000000..075a5554f1
--- /dev/null
+++ b/contracts/coconut-dkg/schema/raw/response_to_get_state.json
@@ -0,0 +1,43 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "State",
+  "type": "object",
+  "required": [
+    "group_addr",
+    "key_size",
+    "mix_denom",
+    "multisig_addr"
+  ],
+  "properties": {
+    "group_addr": {
+      "$ref": "#/definitions/Cw4Contract"
+    },
+    "key_size": {
+      "description": "Specifies the number of elements in the derived keys",
+      "type": "integer",
+      "format": "uint32",
+      "minimum": 0.0
+    },
+    "mix_denom": {
+      "type": "string"
+    },
+    "multisig_addr": {
+      "$ref": "#/definitions/Addr"
+    }
+  },
+  "additionalProperties": false,
+  "definitions": {
+    "Addr": {
+      "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+      "type": "string"
+    },
+    "Cw4Contract": {
+      "description": "Cw4Contract is a wrapper around Addr that provides a lot of helpers for working with cw4 contracts\n\nIf you wish to persist this, convert to Cw4CanonicalContract via .canonical()",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Addr"
+        }
+      ]
+    }
+  }
+}
diff --git a/contracts/coconut-dkg/schema/raw/response_to_get_verification_key.json b/contracts/coconut-dkg/schema/raw/response_to_get_verification_key.json
new file mode 100644
index 0000000000..92d1761fa0
--- /dev/null
+++ b/contracts/coconut-dkg/schema/raw/response_to_get_verification_key.json
@@ -0,0 +1,72 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "VkShareResponse",
+  "type": "object",
+  "required": [
+    "epoch_id",
+    "owner"
+  ],
+  "properties": {
+    "epoch_id": {
+      "type": "integer",
+      "format": "uint64",
+      "minimum": 0.0
+    },
+    "owner": {
+      "$ref": "#/definitions/Addr"
+    },
+    "share": {
+      "anyOf": [
+        {
+          "$ref": "#/definitions/ContractVKShare"
+        },
+        {
+          "type": "null"
+        }
+      ]
+    }
+  },
+  "additionalProperties": false,
+  "definitions": {
+    "Addr": {
+      "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+      "type": "string"
+    },
+    "ContractVKShare": {
+      "type": "object",
+      "required": [
+        "announce_address",
+        "epoch_id",
+        "node_index",
+        "owner",
+        "share",
+        "verified"
+      ],
+      "properties": {
+        "announce_address": {
+          "type": "string"
+        },
+        "epoch_id": {
+          "type": "integer",
+          "format": "uint64",
+          "minimum": 0.0
+        },
+        "node_index": {
+          "type": "integer",
+          "format": "uint64",
+          "minimum": 0.0
+        },
+        "owner": {
+          "$ref": "#/definitions/Addr"
+        },
+        "share": {
+          "type": "string"
+        },
+        "verified": {
+          "type": "boolean"
+        }
+      },
+      "additionalProperties": false
+    }
+  }
+}
diff --git a/contracts/coconut-dkg/src/contract.rs b/contracts/coconut-dkg/src/contract.rs
index be9cfc05e2..1ab567d59c 100644
--- a/contracts/coconut-dkg/src/contract.rs
+++ b/contracts/coconut-dkg/src/contract.rs
@@ -1,20 +1,26 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2022-2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::dealers::queries::{
     query_current_dealers_paged, query_dealer_details, query_past_dealers_paged,
 };
 use crate::dealers::transactions::try_add_dealer;
-use crate::dealings::queries::query_dealings_paged;
-use crate::dealings::transactions::try_commit_dealings;
+use crate::dealings::queries::{
+    query_dealer_dealings_status, query_dealing_chunk, query_dealing_chunk_status,
+    query_dealing_metadata, query_dealing_status,
+};
+use crate::dealings::transactions::{try_commit_dealings_chunk, try_submit_dealings_metadata};
 use crate::epoch_state::queries::{
     query_current_epoch, query_current_epoch_threshold, query_initial_dealers,
 };
 use crate::epoch_state::storage::CURRENT_EPOCH;
-use crate::epoch_state::transactions::{advance_epoch_state, try_surpassed_threshold};
+use crate::epoch_state::transactions::{
+    advance_epoch_state, try_initiate_dkg, try_surpassed_threshold,
+};
 use crate::error::ContractError;
-use crate::state::{State, MULTISIG, STATE};
-use crate::verification_key_shares::queries::query_vk_shares_paged;
+use crate::state::queries::query_state;
+use crate::state::storage::{DKG_ADMIN, MULTISIG, STATE};
+use crate::verification_key_shares::queries::{query_vk_share, query_vk_shares_paged};
 use crate::verification_key_shares::transactions::try_commit_verification_key_share;
 use crate::verification_key_shares::transactions::try_verify_verification_key_share;
 use cosmwasm_std::{
@@ -22,7 +28,11 @@ use cosmwasm_std::{
 };
 use cw4::Cw4Contract;
 use nym_coconut_dkg_common::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
-use nym_coconut_dkg_common::types::{Epoch, EpochState};
+use nym_coconut_dkg_common::types::{Epoch, EpochState, State};
+use semver::Version;
+
+const CONTRACT_NAME: &str = "crate:nym-coconut-dkg";
+const CONTRACT_VERSION: &str = env!("CARGO_PKG_VERSION");
 
 /// Instantiate the contract.
 ///
@@ -33,13 +43,15 @@ use nym_coconut_dkg_common::types::{Epoch, EpochState};
 pub fn instantiate(
     mut deps: DepsMut<'_>,
     env: Env,
-    _info: MessageInfo,
+    info: MessageInfo,
     msg: InstantiateMsg,
 ) -> Result<Response, ContractError> {
     let multisig_addr = deps.api.addr_validate(&msg.multisig_addr)?;
     MULTISIG.set(deps.branch(), Some(multisig_addr.clone()))?;
 
-    let group_addr = Cw4Contract(deps.api.addr_validate(&msg.group_addr).map_err(|_| {
+    DKG_ADMIN.set(deps.branch(), Some(info.sender))?;
+
+    let group_addr = Cw4Contract::new(deps.api.addr_validate(&msg.group_addr).map_err(|_| {
         ContractError::InvalidGroup {
             addr: msg.group_addr.clone(),
         }
@@ -49,19 +61,22 @@ pub fn instantiate(
         group_addr,
         multisig_addr,
         mix_denom: msg.mix_denom,
+        key_size: msg.key_size,
     };
     STATE.save(deps.storage, &state)?;
 
     CURRENT_EPOCH.save(
         deps.storage,
         &Epoch::new(
-            EpochState::default(),
+            EpochState::WaitingInitialisation,
             0,
             msg.time_configuration.unwrap_or_default(),
             env.block.time,
         ),
     )?;
 
+    cw2::set_contract_version(deps.storage, CONTRACT_NAME, CONTRACT_VERSION)?;
+
     Ok(Response::default())
 }
 
@@ -74,15 +89,28 @@ pub fn execute(
     msg: ExecuteMsg,
 ) -> Result<Response, ContractError> {
     match msg {
+        ExecuteMsg::InitiateDkg {} => try_initiate_dkg(deps, env, info),
         ExecuteMsg::RegisterDealer {
             bte_key_with_proof,
+            identity_key,
             announce_address,
             resharing,
-        } => try_add_dealer(deps, info, bte_key_with_proof, announce_address, resharing),
-        ExecuteMsg::CommitDealing {
-            dealing_bytes,
+        } => try_add_dealer(
+            deps,
+            info,
+            bte_key_with_proof,
+            identity_key,
+            announce_address,
             resharing,
-        } => try_commit_dealings(deps, info, dealing_bytes, resharing),
+        ),
+        ExecuteMsg::CommitDealingsMetadata {
+            dealing_index,
+            chunks,
+            resharing,
+        } => try_submit_dealings_metadata(deps, info, dealing_index, chunks, resharing),
+        ExecuteMsg::CommitDealingsChunk { chunk, resharing } => {
+            try_commit_dealings_chunk(deps, env, info, chunk, resharing)
+        }
         ExecuteMsg::CommitVerificationKeyShare { share, resharing } => {
             try_commit_verification_key_share(deps, env, info, share, resharing)
         }
@@ -97,6 +125,7 @@ pub fn execute(
 #[entry_point]
 pub fn query(deps: Deps<'_>, _env: Env, msg: QueryMsg) -> Result<QueryResponse, ContractError> {
     let response = match msg {
+        QueryMsg::GetState {} => to_binary(&query_state(deps.storage)?)?,
         QueryMsg::GetCurrentEpochState {} => to_binary(&query_current_epoch(deps.storage)?)?,
         QueryMsg::GetCurrentEpochThreshold {} => {
             to_binary(&query_current_epoch_threshold(deps.storage)?)?
@@ -111,24 +140,90 @@ pub fn query(deps: Deps<'_>, _env: Env, msg: QueryMsg) -> Result<QueryResponse,
         QueryMsg::GetPastDealers { limit, start_after } => {
             to_binary(&query_past_dealers_paged(deps, start_after, limit)?)?
         }
-        QueryMsg::GetDealing {
-            idx,
-            limit,
-            start_after,
-        } => to_binary(&query_dealings_paged(deps, idx, start_after, limit)?)?,
+        QueryMsg::GetDealingsMetadata {
+            epoch_id,
+            dealer,
+            dealing_index,
+        } => to_binary(&query_dealing_metadata(
+            deps,
+            epoch_id,
+            dealer,
+            dealing_index,
+        )?)?,
+        QueryMsg::GetDealerDealingsStatus { epoch_id, dealer } => {
+            to_binary(&query_dealer_dealings_status(deps, epoch_id, dealer)?)?
+        }
+        QueryMsg::GetDealingStatus {
+            epoch_id,
+            dealer,
+            dealing_index,
+        } => to_binary(&query_dealing_status(
+            deps,
+            epoch_id,
+            dealer,
+            dealing_index,
+        )?)?,
+        QueryMsg::GetDealingChunkStatus {
+            epoch_id,
+            dealer,
+            dealing_index,
+            chunk_index,
+        } => to_binary(&query_dealing_chunk_status(
+            deps,
+            epoch_id,
+            dealer,
+            dealing_index,
+            chunk_index,
+        )?)?,
+        QueryMsg::GetDealingChunk {
+            epoch_id,
+            dealer,
+            dealing_index,
+            chunk_index,
+        } => to_binary(&query_dealing_chunk(
+            deps,
+            epoch_id,
+            dealer,
+            dealing_index,
+            chunk_index,
+        )?)?,
+        QueryMsg::GetVerificationKey { owner, epoch_id } => {
+            to_binary(&query_vk_share(deps, owner, epoch_id)?)?
+        }
         QueryMsg::GetVerificationKeys {
             epoch_id,
             limit,
             start_after,
         } => to_binary(&query_vk_shares_paged(deps, epoch_id, start_after, limit)?)?,
+        QueryMsg::GetCW2ContractVersion {} => to_binary(&cw2::get_contract_version(deps.storage)?)?,
     };
 
     Ok(response)
 }
 
 #[entry_point]
-pub fn migrate(_deps: DepsMut<'_>, _env: Env, _msg: MigrateMsg) -> Result<Response, ContractError> {
-    Ok(Default::default())
+pub fn migrate(deps: DepsMut<'_>, _env: Env, _msg: MigrateMsg) -> Result<Response, ContractError> {
+    fn parse_semver(raw: &str) -> Result<Version, ContractError> {
+        raw.parse()
+            .map_err(|error: semver::Error| ContractError::SemVerFailure {
+                value: CONTRACT_VERSION.to_string(),
+                error_message: error.to_string(),
+            })
+    }
+
+    // Note: don't remove this particular bit of code as we have to ALWAYS check whether we have to
+    // update the stored version
+    let build_version: Version = parse_semver(CONTRACT_VERSION)?;
+    let stored_version: Version = parse_semver(&cw2::get_contract_version(deps.storage)?.version)?;
+
+    if stored_version < build_version {
+        cw2::set_contract_version(deps.storage, CONTRACT_NAME, CONTRACT_VERSION)?;
+
+        // If state structure changed in any contract version in the way migration is needed, it
+        // should occur here, for example anything from `crate::queued_migrations::`
+    }
+
+    Ok(Response::new())
 }
 
 #[cfg(test)]
@@ -140,7 +235,8 @@ mod tests {
     use cosmwasm_std::{coins, Addr};
     use cw4::Member;
     use cw_multi_test::{App, AppBuilder, AppResponse, ContractWrapper, Executor};
-    use nym_coconut_dkg_common::msg::ExecuteMsg::RegisterDealer;
+    use nym_coconut_dkg_common::dealing::DEFAULT_DEALINGS;
+    use nym_coconut_dkg_common::msg::ExecuteMsg::{InitiateDkg, RegisterDealer};
     use nym_coconut_dkg_common::types::NodeIndex;
     use nym_group_contract_common::msg::InstantiateMsg as GroupInstantiateMsg;
 
@@ -178,6 +274,7 @@ mod tests {
             multisig_addr: MULTISIG_CONTRACT.to_string(),
             time_configuration: None,
             mix_denom: TEST_MIX_DENOM.to_string(),
+            key_size: DEFAULT_DEALINGS as u32,
         };
         app.instantiate_contract(
             coconut_dkg_code_id,
@@ -213,6 +310,7 @@ mod tests {
             multisig_addr: "multisig_addr".to_string(),
             time_configuration: None,
             mix_denom: "nym".to_string(),
+            key_size: 5,
         };
         let info = mock_info("creator", &[]);
 
@@ -235,6 +333,14 @@ mod tests {
         });
         let coconut_dkg_contract_addr = instantiate_with_group(&mut app, &members);
 
+        app.execute_contract(
+            Addr::unchecked(ADMIN_ADDRESS),
+            coconut_dkg_contract_addr.clone(),
+            &InitiateDkg {},
+            &[],
+        )
+        .unwrap();
+
         for (idx, member) in members.iter().enumerate() {
             let res = app
                 .execute_contract(
@@ -242,6 +348,7 @@ mod tests {
                     coconut_dkg_contract_addr.clone(),
                     &RegisterDealer {
                         bte_key_with_proof: "bte_key_with_proof".to_string(),
+                        identity_key: "identity".to_string(),
                         announce_address: "127.0.0.1:8000".to_string(),
                         resharing: false,
                     },
@@ -256,6 +363,7 @@ mod tests {
                     coconut_dkg_contract_addr.clone(),
                     &RegisterDealer {
                         bte_key_with_proof: "bte_key_with_proof".to_string(),
+                        identity_key: "identity".to_string(),
                         announce_address: "127.0.0.1:8000".to_string(),
                         resharing: false,
                     },
@@ -272,6 +380,7 @@ mod tests {
                 coconut_dkg_contract_addr,
                 &RegisterDealer {
                     bte_key_with_proof: "bte_key_with_proof".to_string(),
+                    identity_key: "identity".to_string(),
                     announce_address: "127.0.0.1:8000".to_string(),
                     resharing: false,
                 },
diff --git a/contracts/coconut-dkg/src/dealers/transactions.rs b/contracts/coconut-dkg/src/dealers/transactions.rs
index 290bbd2349..7c47f655d4 100644
--- a/contracts/coconut-dkg/src/dealers/transactions.rs
+++ b/contracts/coconut-dkg/src/dealers/transactions.rs
@@ -5,7 +5,7 @@ use crate::dealers::storage as dealers_storage;
 use crate::epoch_state::storage::INITIAL_REPLACEMENT_DATA;
 use crate::epoch_state::utils::check_epoch_state;
 use crate::error::ContractError;
-use crate::state::STATE;
+use crate::state::storage::STATE;
 use cosmwasm_std::{Addr, DepsMut, MessageInfo, Response};
 use nym_coconut_dkg_common::types::{DealerDetails, EncodedBTEPublicKeyWithProof, EpochState};
 
@@ -34,10 +34,13 @@ fn verify_dealer(deps: DepsMut<'_>, dealer: &Addr, resharing: bool) -> Result<()
     Ok(())
 }
 
+// future optimisation:
+// for a recurring dealer just let it refresh the keys without having to do all the storage operations
 pub fn try_add_dealer(
     mut deps: DepsMut<'_>,
     info: MessageInfo,
     bte_key_with_proof: EncodedBTEPublicKeyWithProof,
+    identity_key: String,
     announce_address: String,
     resharing: bool,
 ) -> Result<Response, ContractError> {
@@ -65,6 +68,7 @@ pub fn try_add_dealer(
     let dealer_details = DealerDetails {
         address: info.sender.clone(),
         bte_public_key_with_proof: bte_key_with_proof,
+        ed25519_identity: identity_key,
         announce_address,
         assigned_index: node_index,
     };
@@ -77,10 +81,10 @@ pub fn try_add_dealer(
 pub(crate) mod tests {
     use super::*;
     use crate::dealers::storage::current_dealers;
-    use crate::epoch_state::transactions::advance_epoch_state;
+    use crate::epoch_state::transactions::{advance_epoch_state, try_initiate_dkg};
     use crate::support::tests::fixtures::dealer_details_fixture;
     use crate::support::tests::helpers;
-    use crate::support::tests::helpers::{add_fixture_dealer, GROUP_MEMBERS};
+    use crate::support::tests::helpers::{add_fixture_dealer, ADMIN_ADDRESS, GROUP_MEMBERS};
     use cosmwasm_std::testing::{mock_env, mock_info};
     use cw4::Member;
     use nym_coconut_dkg_common::types::{InitialReplacementData, TimeConfiguration};
@@ -137,10 +141,13 @@ pub(crate) mod tests {
     #[test]
     fn invalid_state() {
         let mut deps = helpers::init_contract();
-        let owner = Addr::unchecked("owner");
         let mut env = mock_env();
+        try_initiate_dkg(deps.as_mut(), env.clone(), mock_info(ADMIN_ADDRESS, &[])).unwrap();
+
+        let owner = Addr::unchecked("owner");
         let info = mock_info(owner.as_str(), &[]);
         let bte_key_with_proof = String::from("bte_key_with_proof");
+        let identity = String::from("identity");
         let announce_address = String::from("localhost:8000");
 
         env.block.time = env
@@ -155,6 +162,7 @@ pub(crate) mod tests {
             deps.as_mut(),
             info,
             bte_key_with_proof,
+            identity,
             announce_address,
             false,
         )
@@ -163,7 +171,7 @@ pub(crate) mod tests {
             ret,
             ContractError::IncorrectEpochState {
                 current_state: EpochState::DealingExchange { resharing: false }.to_string(),
-                expected_state: EpochState::default().to_string(),
+                expected_state: EpochState::PublicKeySubmission { resharing: false }.to_string(),
             }
         );
     }
diff --git a/contracts/coconut-dkg/src/dealings/queries.rs b/contracts/coconut-dkg/src/dealings/queries.rs
index 1e35fd2c3d..0bedba014b 100644
--- a/contracts/coconut-dkg/src/dealings/queries.rs
+++ b/contracts/coconut-dkg/src/dealings/queries.rs
@@ -1,195 +1,230 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2022-2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::dealings::storage;
-use crate::dealings::storage::DEALINGS_BYTES;
-use cosmwasm_std::{Deps, Order, StdResult};
-use cw_storage_plus::Bound;
-use nym_coconut_dkg_common::dealer::{ContractDealing, PagedDealingsResponse};
-use nym_coconut_dkg_common::types::TOTAL_DEALINGS;
+use crate::dealings::storage::{StoredDealing, DEALINGS_METADATA};
+use crate::state::storage::STATE;
+use cosmwasm_std::{Deps, StdResult};
+use nym_coconut_dkg_common::dealing::{
+    DealerDealingsStatusResponse, DealingChunkResponse, DealingChunkStatusResponse,
+    DealingMetadataResponse, DealingStatus, DealingStatusResponse,
+};
+use nym_coconut_dkg_common::types::{ChunkIndex, DealingIndex, EpochId};
+use std::collections::BTreeMap;
 
-pub fn query_dealings_paged(
+/// Get the metadata associated with the particular dealing
+pub fn query_dealing_metadata(
     deps: Deps<'_>,
-    idx: u64,
-    start_after: Option<String>,
-    limit: Option<u32>,
-) -> StdResult<PagedDealingsResponse> {
-    let limit = limit
-        .unwrap_or(storage::DEALINGS_PAGE_DEFAULT_LIMIT)
-        .min(storage::DEALINGS_PAGE_MAX_LIMIT) as usize;
+    epoch_id: EpochId,
+    dealer: String,
+    dealing_index: DealingIndex,
+) -> StdResult<DealingMetadataResponse> {
+    let dealer = deps.api.addr_validate(&dealer)?;
+    let metadata = DEALINGS_METADATA.may_load(deps.storage, (epoch_id, &dealer, dealing_index))?;
 
-    let idx = idx as usize;
-    if idx >= TOTAL_DEALINGS {
-        return Ok(PagedDealingsResponse::new(vec![], limit, None));
+    Ok(DealingMetadataResponse {
+        epoch_id,
+        dealer,
+        dealing_index,
+        metadata,
+    })
+}
+
+/// Get the status of all dealings of particular dealer for given epoch.
+pub fn query_dealer_dealings_status(
+    deps: Deps<'_>,
+    epoch_id: EpochId,
+    dealer: String,
+) -> StdResult<DealerDealingsStatusResponse> {
+    let dealer = deps.api.addr_validate(&dealer)?;
+    let state = STATE.load(deps.storage)?;
+
+    let mut dealing_submission_status: BTreeMap<DealingIndex, DealingStatus> = BTreeMap::new();
+
+    // Since our key size is in single digit range, querying all of this at once on chain is fine
+    for dealing_index in 0..state.key_size {
+        let metadata =
+            DEALINGS_METADATA.may_load(deps.storage, (epoch_id, &dealer, dealing_index))?;
+        dealing_submission_status.insert(dealing_index, metadata.into());
     }
 
-    let addr = start_after
-        .map(|addr| deps.api.addr_validate(&addr))
-        .transpose()?;
+    Ok(DealerDealingsStatusResponse {
+        epoch_id,
+        dealer,
+        all_dealings_fully_submitted: dealing_submission_status
+            .values()
+            .all(|d| d.fully_submitted),
+        dealing_submission_status,
+    })
+}
 
-    let start = addr.as_ref().map(Bound::exclusive);
+/// Get the status of particular dealing, i.e. whether it has been fully submitted.
+pub fn query_dealing_status(
+    deps: Deps<'_>,
+    epoch_id: EpochId,
+    dealer: String,
+    dealing_index: DealingIndex,
+) -> StdResult<DealingStatusResponse> {
+    let dealer = deps.api.addr_validate(&dealer)?;
+    let metadata = DEALINGS_METADATA.may_load(deps.storage, (epoch_id, &dealer, dealing_index))?;
 
-    let dealings = DEALINGS_BYTES[idx]
-        .range(deps.storage, start, None, Order::Ascending)
-        .take(limit)
-        .map(|res| res.map(|(dealer, dealing)| ContractDealing::new(dealing, dealer)))
-        .collect::<StdResult<Vec<_>>>()?;
+    Ok(DealingStatusResponse {
+        epoch_id,
+        dealer,
+        dealing_index,
+        status: metadata.into(),
+    })
+}
 
-    let start_next_after = dealings.last().map(|dealing| dealing.dealer.clone());
+/// Get the status of particular chunk, i.e. whether (and when) it has been fully submitted.
+pub fn query_dealing_chunk_status(
+    deps: Deps<'_>,
+    epoch_id: EpochId,
+    dealer: String,
+    dealing_index: DealingIndex,
+    chunk_index: ChunkIndex,
+) -> StdResult<DealingChunkStatusResponse> {
+    let dealer = deps.api.addr_validate(&dealer)?;
+    let metadata = DEALINGS_METADATA.may_load(deps.storage, (epoch_id, &dealer, dealing_index))?;
 
-    Ok(PagedDealingsResponse::new(
-        dealings,
-        limit,
-        start_next_after,
-    ))
+    let status = metadata
+        .as_ref()
+        .and_then(|m| m.submitted_chunks.get(&chunk_index))
+        .map(|&c| c.status)
+        .unwrap_or_default();
+
+    Ok(DealingChunkStatusResponse {
+        epoch_id,
+        dealer,
+        dealing_index,
+        chunk_index,
+        status,
+    })
+}
+
+/// Get the particular chunk of the dealing.
+pub fn query_dealing_chunk(
+    deps: Deps<'_>,
+    epoch_id: EpochId,
+    dealer: String,
+    dealing_index: DealingIndex,
+    chunk_index: ChunkIndex,
+) -> StdResult<DealingChunkResponse> {
+    let dealer = deps.api.addr_validate(&dealer)?;
+    let chunk = StoredDealing::read(deps.storage, epoch_id, &dealer, dealing_index, chunk_index);
+
+    Ok(DealingChunkResponse {
+        epoch_id,
+        dealer,
+        dealing_index,
+        chunk_index,
+        chunk,
+    })
 }
 
 #[cfg(test)]
 pub(crate) mod tests {
     use super::*;
-    use crate::dealings::storage::{DEALINGS_PAGE_DEFAULT_LIMIT, DEALINGS_PAGE_MAX_LIMIT};
-    use crate::support::tests::fixtures::dealing_bytes_fixture;
+    use crate::support::tests::fixtures::{dealing_bytes_fixture, partial_dealing_fixture};
     use crate::support::tests::helpers::init_contract;
     use cosmwasm_std::{Addr, DepsMut};
+    use nym_coconut_dkg_common::dealing::{DealingChunkInfo, PartialContractDealing};
 
-    fn fill_dealings(deps: DepsMut<'_>, size: usize) {
-        for n in 0..size {
-            let dealing_share = dealing_bytes_fixture();
-            let sender = Addr::unchecked(format!("owner{}", n));
-            (0..TOTAL_DEALINGS).for_each(|idx| {
-                DEALINGS_BYTES[idx]
-                    .save(deps.storage, &sender, &dealing_share)
-                    .unwrap();
-            });
+    #[allow(unused)]
+    fn fill_dealings(
+        deps: DepsMut<'_>,
+        epoch: EpochId,
+        dealers: usize,
+        key_size: u32,
+        chunks: u16,
+    ) {
+        for i in 0..dealers {
+            let dealer = Addr::unchecked(format!("dealer{i}"));
+            for dealing_index in 0..key_size {
+                let data = dealing_bytes_fixture();
+                let chunks = data.0.chunks(data.len() / chunks as usize);
+
+                let mut chunk_infos = Vec::new();
+                for (chunk_index, chunk) in chunks.enumerate() {
+                    chunk_infos.push(DealingChunkInfo {
+                        size: chunk.len() as u64,
+                    });
+                    StoredDealing::save(
+                        deps.storage,
+                        epoch,
+                        &dealer,
+                        PartialContractDealing {
+                            dealing_index,
+                            chunk_index: chunk_index as ChunkIndex,
+                            data: chunk.into(),
+                        },
+                    )
+                }
+            }
         }
     }
 
     #[test]
-    fn empty_on_bad_idx() {
+    fn test_query_dealing_chunk() {
         let mut deps = init_contract();
-        fill_dealings(deps.as_mut(), 1000);
 
-        for idx in TOTAL_DEALINGS as u64..100 * TOTAL_DEALINGS as u64 {
-            let page1 = query_dealings_paged(deps.as_ref(), idx, None, None).unwrap();
-            assert_eq!(0, page1.dealings.len() as u32);
-        }
+        let bad_address = "FOOMP".to_string();
+        assert!(query_dealing_chunk(deps.as_ref(), 0, bad_address, 0, 0).is_err());
+
+        let empty = query_dealing_chunk(deps.as_ref(), 0, "foo".to_string(), 0, 0).unwrap();
+        assert_eq!(empty.epoch_id, 0);
+        assert_eq!(empty.dealing_index, 0);
+        assert_eq!(empty.chunk_index, 0);
+        assert_eq!(empty.dealer, Addr::unchecked("foo"));
+        assert!(empty.chunk.is_none());
+
+        // insert the dealing chunk
+        let dealing = partial_dealing_fixture();
+        StoredDealing::save(
+            deps.as_mut().storage,
+            0,
+            &Addr::unchecked("foo"),
+            dealing.clone(),
+        );
+
+        let retrieved = query_dealing_chunk(deps.as_ref(), 0, "foo".to_string(), 0, 0).unwrap();
+        assert_eq!(retrieved.epoch_id, 0);
+        assert_eq!(retrieved.dealing_index, dealing.dealing_index);
+        assert_eq!(retrieved.chunk_index, dealing.chunk_index);
+        assert_eq!(retrieved.dealer, Addr::unchecked("foo"));
+        assert_eq!(retrieved.chunk.unwrap(), dealing.data);
     }
 
     #[test]
-    fn dealings_empty_on_init() {
+    fn test_query_dealing_status() {
         let deps = init_contract();
-        for idx in 0..TOTAL_DEALINGS as u64 {
-            let response = query_dealings_paged(deps.as_ref(), idx, None, Option::from(2)).unwrap();
-            assert_eq!(0, response.dealings.len());
-        }
-    }
 
-    #[test]
-    fn dealings_paged_retrieval_obeys_limits() {
-        let mut deps = init_contract();
-        let limit = 2;
-        fill_dealings(deps.as_mut(), 1000);
+        let bad_address = "FOOMP".to_string();
+        assert!(query_dealing_status(deps.as_ref(), 0, bad_address, 0).is_err());
 
-        for idx in 0..TOTAL_DEALINGS as u64 {
-            let page1 =
-                query_dealings_paged(deps.as_ref(), idx, None, Option::from(limit)).unwrap();
-            assert_eq!(limit, page1.dealings.len() as u32);
-        }
-    }
+        let empty = query_dealing_status(deps.as_ref(), 0, "foo".to_string(), 0).unwrap();
+        assert_eq!(empty.epoch_id, 0);
+        assert_eq!(empty.dealing_index, 0);
+        assert_eq!(empty.dealer, Addr::unchecked("foo"));
+        assert!(!empty.status.fully_submitted);
+        assert!(!empty.status.has_metadata);
+        assert!(empty.status.chunk_submission_status.is_empty());
 
-    #[test]
-    fn dealings_paged_retrieval_has_default_limit() {
-        let mut deps = init_contract();
-        fill_dealings(deps.as_mut(), 1000);
+        // insert the metadata
+        //
 
-        for idx in 0..TOTAL_DEALINGS as u64 {
-            // query without explicitly setting a limit
-            let page1 = query_dealings_paged(deps.as_ref(), idx, None, None).unwrap();
-
-            assert_eq!(DEALINGS_PAGE_DEFAULT_LIMIT, page1.dealings.len() as u32);
-        }
-    }
-
-    #[test]
-    fn dealings_paged_retrieval_has_max_limit() {
-        let mut deps = init_contract();
-        fill_dealings(deps.as_mut(), 1000);
-
-        // query with a crazily high limit in an attempt to use too many resources
-        let crazy_limit = 1000 * DEALINGS_PAGE_MAX_LIMIT;
-        for idx in 0..TOTAL_DEALINGS as u64 {
-            let page1 =
-                query_dealings_paged(deps.as_ref(), idx, None, Option::from(crazy_limit)).unwrap();
-
-            // we default to a decent sized upper bound instead
-            let expected_limit = DEALINGS_PAGE_MAX_LIMIT;
-            assert_eq!(expected_limit, page1.dealings.len() as u32);
-        }
-    }
-
-    #[test]
-    fn dealings_pagination_works() {
-        let mut deps = init_contract();
-
-        fill_dealings(deps.as_mut(), 1);
-
-        let per_page = 2;
-
-        for idx in 0..TOTAL_DEALINGS as u64 {
-            let page1 =
-                query_dealings_paged(deps.as_ref(), idx, None, Option::from(per_page)).unwrap();
-
-            // page should have 1 result on it
-            assert_eq!(1, page1.dealings.len());
-        }
-
-        // save another
-        fill_dealings(deps.as_mut(), 2);
-
-        for idx in 0..TOTAL_DEALINGS as u64 {
-            // page1 should have 2 results on it
-            let page1 =
-                query_dealings_paged(deps.as_ref(), idx, None, Option::from(per_page)).unwrap();
-            assert_eq!(2, page1.dealings.len());
-        }
-
-        fill_dealings(deps.as_mut(), 3);
-
-        for idx in 0..TOTAL_DEALINGS as u64 {
-            // page1 still has 2 results
-            let page1 =
-                query_dealings_paged(deps.as_ref(), idx, None, Option::from(per_page)).unwrap();
-            assert_eq!(2, page1.dealings.len());
-
-            // retrieving the next page should start after the last key on this page
-            let start_after = page1.start_next_after.unwrap();
-            let page2 = query_dealings_paged(
-                deps.as_ref(),
-                idx,
-                Option::from(start_after.to_string()),
-                Option::from(per_page),
-            )
-            .unwrap();
-
-            assert_eq!(1, page2.dealings.len());
-        }
-
-        fill_dealings(deps.as_mut(), 4);
-
-        for idx in 0..TOTAL_DEALINGS as u64 {
-            let page1 =
-                query_dealings_paged(deps.as_ref(), idx, None, Option::from(per_page)).unwrap();
-            let start_after = page1.start_next_after.unwrap();
-            let page2 = query_dealings_paged(
-                deps.as_ref(),
-                idx,
-                Option::from(start_after.to_string()),
-                Option::from(per_page),
-            )
-            .unwrap();
-
-            // now we have 2 pages, with 2 results on the second page
-            assert_eq!(2, page2.dealings.len());
-        }
+        // // insert the dealing
+        // let dealing = partial_dealing_fixture();
+        // StoredDealing::save(
+        //     deps.as_mut().storage,
+        //     0,
+        //     &Addr::unchecked("foo"),
+        //     dealing.clone(),
+        // );
+        //
+        // let retrieved = query_dealing_status(deps.as_ref(), 0, "foo".to_string(), 0).unwrap();
+        // assert_eq!(retrieved.epoch_id, 0);
+        // assert_eq!(retrieved.dealing_index, dealing.dealing_index);
+        // assert_eq!(retrieved.dealer, Addr::unchecked("foo"));
+        // assert!(retrieved.dealing_submitted)
     }
 }
diff --git a/contracts/coconut-dkg/src/dealings/storage.rs b/contracts/coconut-dkg/src/dealings/storage.rs
index 0395fa8c74..2f242741e7 100644
--- a/contracts/coconut-dkg/src/dealings/storage.rs
+++ b/contracts/coconut-dkg/src/dealings/storage.rs
@@ -1,33 +1,426 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2022-2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use cosmwasm_std::Addr;
-use cw_storage_plus::Map;
-use nym_coconut_dkg_common::types::{ContractSafeBytes, TOTAL_DEALINGS};
+use crate::error::ContractError;
+use cosmwasm_std::{Addr, Storage};
+use cw_storage_plus::{Key, Map, Path, PrimaryKey};
+use nym_coconut_dkg_common::dealing::{DealingMetadata, PartialContractDealing};
+use nym_coconut_dkg_common::types::{
+    ChunkIndex, ContractSafeBytes, DealingIndex, EpochId, PartialContractDealingData,
+};
 
-pub(crate) const DEALINGS_PAGE_MAX_LIMIT: u32 = 2;
-pub(crate) const DEALINGS_PAGE_DEFAULT_LIMIT: u32 = 1;
+type Dealer<'a> = &'a Addr;
 
-type DealingKey<'a> = &'a Addr;
+/// Metadata for a dealing for given `EpochId`, submitted by particular `Dealer` for given `DealingIndex`.
+pub(crate) const DEALINGS_METADATA: Map<(EpochId, Dealer, DealingIndex), DealingMetadata> =
+    Map::new("dealings_metadata");
 
-// Note to whoever is looking at this implementation and is thinking of using something similar
-// for storing small commitments/hashes of data on chain:
-// If there's a lot of entries you want to store thinking, "oh, this digest is only 32 bytes, it's not that much",
-// the default cosmwasm' serializer will bloat it to around ~100B. So you really don't want to be using
-// Buckets/Maps, etc. for that purpose. Instead you want to use `storage` directly (look into the actual implementation of
-// `Map` or `Bucket` to see what I mean. Instead of using the `to_vec` method on serde_json_wasm, you'd
-// provide your data directly yourself.
-// but you must be extremely careful when doing so, as you might end up overwriting some existing data
-// if you don't choose your prefixes wisely.
-// I didn't have to do it here as I'm storing relatively little data and after just base58-encoding
-// my bytes, I was fine with the json overhead.
+pub(crate) fn metadata_exists(
+    storage: &dyn Storage,
+    epoch_id: EpochId,
+    dealer: Dealer,
+    dealing_index: DealingIndex,
+) -> bool {
+    DEALINGS_METADATA.has(storage, (epoch_id, dealer, dealing_index))
+}
 
-// if TOTAL_DEALINGS is modified to anything other then current value (5), this part will also need
-// to be modified
-pub(crate) const DEALINGS_BYTES: [Map<'_, DealingKey<'_>, ContractSafeBytes>; TOTAL_DEALINGS] = [
-    Map::new("dbyt1"),
-    Map::new("dbyt2"),
-    Map::new("dbyt3"),
-    Map::new("dbyt4"),
-    Map::new("dbyt5"),
-];
+pub(crate) fn must_read_metadata(
+    storage: &dyn Storage,
+    epoch_id: EpochId,
+    dealer: Dealer,
+    dealing_index: DealingIndex,
+) -> Result<DealingMetadata, ContractError> {
+    DEALINGS_METADATA
+        .may_load(storage, (epoch_id, dealer, dealing_index))?
+        .ok_or_else(|| ContractError::UnavailableDealingMetadata {
+            epoch_id,
+            dealer: dealer.to_owned(),
+            dealing_index,
+        })
+}
+
+pub(crate) fn store_metadata(
+    storage: &mut dyn Storage,
+    epoch_id: EpochId,
+    dealer: Dealer,
+    dealing_index: DealingIndex,
+    metadata: &DealingMetadata,
+) -> Result<(), ContractError> {
+    Ok(DEALINGS_METADATA.save(storage, (epoch_id, dealer, dealing_index), metadata)?)
+}
+
+// dealings data is stored in a multilevel map with the following hierarchy:
+//  - epoch-id:
+//      - issuer-address:
+//          - dealing id:
+//              - chunk_id:
+//                  - dealing content
+// NOTE: we're storing raw bytes bypassing serialization, so we can't use the `Map` type,
+// thus make sure you always use the below methods for using the storage!
+pub(crate) struct StoredDealing;
+
+impl StoredDealing {
+    const NAMESPACE: &'static [u8] = b"dealing";
+
+    // prefix-range related should we need it
+    #[cfg(test)]
+    fn deserialize_dealing_record(
+        kv: cosmwasm_std::Record,
+    ) -> cosmwasm_std::StdResult<(ChunkIndex, PartialContractDealingData)> {
+        let (k, v) = kv;
+        let index = <ChunkIndex as cw_storage_plus::KeyDeserialize>::from_vec(k)?;
+        let data = ContractSafeBytes(v);
+
+        Ok((index, data))
+    }
+
+    // prefix-range related should we need it
+    #[cfg(test)]
+    fn prefix(
+        prefix: (EpochId, Dealer, DealingIndex),
+    ) -> cw_storage_plus::Prefix<ChunkIndex, PartialContractDealingData, ChunkIndex> {
+        use cw_storage_plus::Prefixer;
+
+        cw_storage_plus::Prefix::with_deserialization_functions(
+            Self::NAMESPACE,
+            &prefix.prefix(),
+            &[],
+            // explicitly panic to make sure we're never attempting to call an unexpected deserializer on our data
+            |_, _, kv| Self::deserialize_dealing_record(kv),
+            |_, _, _| panic!("attempted to call custom de_fn_v"),
+        )
+    }
+
+    // prefix-range related should we need it
+    #[cfg(test)]
+    pub(crate) fn prefix_range<'a>(
+        storage: &'a dyn Storage,
+        prefix: (EpochId, Dealer, DealingIndex),
+        start: Option<cw_storage_plus::Bound<ChunkIndex>>,
+    ) -> impl Iterator<Item = cosmwasm_std::StdResult<PartialContractDealing>> + 'a {
+        let dealing_index = prefix.2;
+        Self::prefix(prefix)
+            .range(storage, start, None, cosmwasm_std::Order::Ascending)
+            .map(move |maybe_record| {
+                maybe_record.map(|(chunk_index, data)| PartialContractDealing {
+                    dealing_index,
+                    chunk_index,
+                    data,
+                })
+            })
+    }
+
+    fn storage_key(
+        epoch_id: EpochId,
+        dealer: Dealer,
+        dealing_index: DealingIndex,
+        chunk_index: ChunkIndex,
+    ) -> Path<Vec<u8>> {
+        // just replicate the behaviour from `Map::key`
+        // note: `PrimaryKey` trait is not implemented for tuple (T, U, V, W), only for up to (T, U, V)
+        // that's why we create a (T, U, (V, W)) tuple(s) instead
+        let key = (epoch_id, dealer, (dealing_index, chunk_index));
+        Path::new(
+            Self::NAMESPACE,
+            &key.key().iter().map(Key::as_ref).collect::<Vec<_>>(),
+        )
+    }
+
+    // pub(crate) fn exists(
+    //     storage: &dyn Storage,
+    //     epoch_id: EpochId,
+    //     dealer: &Addr,
+    //     dealing_index: DealingIndex,
+    //     chunk_index: ChunkIndex,
+    // ) -> StdResult<bool> {
+    //     // whenever the dealing is saved, the metadata is appropriately updated
+    //     // reading metadata is way cheaper than the dealing chunk itself
+    //     let Some(metadata) =
+    //         DEALINGS_METADATA.may_load(storage, (epoch_id, dealer, dealing_index))?
+    //     else {
+    //         return Ok(false);
+    //     };
+    //     let Some(chunk_info) = metadata.submitted_chunks.get(&chunk_index) else {
+    //         return Ok(false);
+    //     };
+    //     Ok(chunk_info.status.submitted())
+    //     // StoredDealing::storage_key(epoch_id, dealer, dealing_index).has(storage)
+    // }
+
+    pub(crate) fn save(
+        storage: &mut dyn Storage,
+        epoch_id: EpochId,
+        dealer: Dealer,
+        dealng_chunk: PartialContractDealing,
+    ) {
+        // NOTE: we're storing bytes directly here!
+        let storage_key = Self::storage_key(
+            epoch_id,
+            dealer,
+            dealng_chunk.dealing_index,
+            dealng_chunk.chunk_index,
+        );
+        storage.set(&storage_key, dealng_chunk.data.as_slice());
+    }
+
+    pub(crate) fn read(
+        storage: &dyn Storage,
+        epoch_id: EpochId,
+        dealer: Dealer,
+        dealing_index: DealingIndex,
+        chunk_index: ChunkIndex,
+    ) -> Option<PartialContractDealingData> {
+        let storage_key = Self::storage_key(epoch_id, dealer, dealing_index, chunk_index);
+        storage.get(&storage_key).map(ContractSafeBytes)
+    }
+
+    // iterate over all values, only to be used in tests due to the amount of data being returned
+    #[cfg(test)]
+    #[allow(clippy::type_complexity)]
+    pub(crate) fn unchecked_all_entries(
+        storage: &dyn Storage,
+    ) -> Vec<(
+        (EpochId, Addr, (DealingIndex, ChunkIndex)),
+        PartialContractDealingData,
+    )> {
+        use cw_storage_plus::KeyDeserialize;
+
+        type StorageKey<'a> = (EpochId, Dealer<'a>, (DealingIndex, ChunkIndex));
+
+        let empty_prefix: cw_storage_plus::Prefix<
+            StorageKey,
+            PartialContractDealingData,
+            StorageKey,
+        > = cw_storage_plus::Prefix::with_deserialization_functions(
+            Self::NAMESPACE,
+            &[],
+            &[],
+            |_, _, kv| StorageKey::from_vec(kv.0).map(|kt| (kt, ContractSafeBytes(kv.1))),
+            |_, _, _| unimplemented!(),
+        );
+
+        empty_prefix
+            .range(storage, None, None, cosmwasm_std::Order::Ascending)
+            .collect::<cosmwasm_std::StdResult<_>>()
+            .unwrap()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::support::tests::helpers::init_contract;
+    use cw_storage_plus::Bound;
+    use std::collections::HashMap;
+
+    fn dealing_data(
+        epoch_id: EpochId,
+        dealer: Dealer,
+        dealing_index: DealingIndex,
+        chunk_index: ChunkIndex,
+    ) -> PartialContractDealingData {
+        ContractSafeBytes(
+            format!("{epoch_id},{dealer},{dealing_index},{chunk_index}")
+                .as_bytes()
+                .to_vec(),
+        )
+    }
+
+    #[test]
+    fn saving_dealing_chunks() {
+        let mut deps = init_contract();
+
+        fn exists_in_storage(
+            storage: &dyn Storage,
+            epoch_id: EpochId,
+            dealer: Dealer,
+            dealing_index: DealingIndex,
+            chunk_index: ChunkIndex,
+        ) -> bool {
+            StoredDealing::storage_key(epoch_id, dealer, dealing_index, chunk_index).has(storage)
+        }
+
+        // make sure to check all combinations of epoch id, dealer address and dealing index to ensure nothing overlaps
+        let epochs = [54, 423, 754];
+        let dealers = [
+            Addr::unchecked("dealer1"),
+            Addr::unchecked("dealer2"),
+            Addr::unchecked("dealer3"),
+            Addr::unchecked("dealer4"),
+            Addr::unchecked("dealer5"),
+        ];
+        let dealing_indices = [0, 1, 2, 3, 4, 5, 6, 7];
+        let chunk_indices = [0, 1, 2, 3, 4];
+
+        for epoch_id in &epochs {
+            for dealer in &dealers {
+                for dealing_index in &dealing_indices {
+                    for chunk_index in &chunk_indices {
+                        assert!(!exists_in_storage(
+                            &deps.storage,
+                            *epoch_id,
+                            dealer,
+                            *dealing_index,
+                            *chunk_index
+                        ));
+
+                        StoredDealing::save(
+                            deps.as_mut().storage,
+                            *epoch_id,
+                            dealer,
+                            PartialContractDealing {
+                                dealing_index: *dealing_index,
+                                chunk_index: *chunk_index,
+                                data: dealing_data(*epoch_id, dealer, *dealing_index, *chunk_index),
+                            },
+                        )
+                    }
+                }
+            }
+        }
+
+        let all: HashMap<_, _> = StoredDealing::unchecked_all_entries(&deps.storage)
+            .into_iter()
+            .collect();
+        assert_eq!(
+            all.len(),
+            epochs.len() * dealers.len() * dealing_indices.len() * chunk_indices.len()
+        );
+
+        for epoch_id in &epochs {
+            for dealer in &dealers {
+                for dealing_index in &dealing_indices {
+                    for chunk_index in &chunk_indices {
+                        assert!(exists_in_storage(
+                            &deps.storage,
+                            *epoch_id,
+                            dealer,
+                            *dealing_index,
+                            *chunk_index
+                        ));
+
+                        let content = StoredDealing::read(
+                            &deps.storage,
+                            *epoch_id,
+                            dealer,
+                            *dealing_index,
+                            *chunk_index,
+                        )
+                        .unwrap();
+                        let expected =
+                            dealing_data(*epoch_id, dealer, *dealing_index, *chunk_index);
+                        assert_eq!(expected, content);
+                        assert_eq!(
+                            &expected,
+                            all.get(&(*epoch_id, dealer.clone(), (*dealing_index, *chunk_index)))
+                                .unwrap()
+                        );
+                    }
+                }
+            }
+        }
+    }
+
+    #[test]
+    fn iterating_over_dealing_chunks() {
+        let mut deps = init_contract();
+
+        let epochs = [54, 423, 754];
+        let dealers = [
+            Addr::unchecked("dealer1"),
+            Addr::unchecked("dealer2"),
+            Addr::unchecked("dealer3"),
+            Addr::unchecked("dealer4"),
+            Addr::unchecked("dealer5"),
+        ];
+        let dealing_indices = [0, 1, 2, 3, 4, 5, 6, 7];
+        let chunk_indices = [0, 1, 2, 3, 4];
+
+        for epoch_id in &epochs {
+            for dealer in &dealers {
+                for dealing_index in &dealing_indices {
+                    for chunk_index in &chunk_indices {
+                        StoredDealing::save(
+                            deps.as_mut().storage,
+                            *epoch_id,
+                            dealer,
+                            PartialContractDealing {
+                                dealing_index: *dealing_index,
+                                chunk_index: *chunk_index,
+                                data: dealing_data(*epoch_id, dealer, *dealing_index, *chunk_index),
+                            },
+                        )
+                    }
+                }
+            }
+        }
+
+        // remember, we're not testing the iterator implementation
+
+        // nothing under epoch 0
+        let dealings =
+            StoredDealing::prefix_range(&deps.storage, (0, &dealers[0], dealing_indices[0]), None)
+                .collect::<Vec<_>>();
+        assert!(dealings.is_empty());
+
+        // nothing for dealer "foo"
+        let foo = Addr::unchecked("foo");
+        let dealings =
+            StoredDealing::prefix_range(&deps.storage, (epochs[0], &foo, dealing_indices[0]), None)
+                .collect::<Vec<_>>();
+        assert!(dealings.is_empty());
+
+        // nothing for dealing index 99
+        let dealings =
+            StoredDealing::prefix_range(&deps.storage, (epochs[0], &dealers[0], 99), None)
+                .collect::<Vec<_>>();
+        assert!(dealings.is_empty());
+
+        let all = StoredDealing::prefix_range(
+            &deps.storage,
+            (epochs[0], &dealers[0], dealing_indices[0]),
+            None,
+        )
+        .collect::<Vec<_>>();
+        assert_eq!(all.len(), chunk_indices.len());
+
+        for (i, dealing) in all.iter().enumerate() {
+            let expected =
+                dealing_data(epochs[0], &dealers[0], dealing_indices[0], chunk_indices[i]);
+            assert_eq!(expected, dealing.as_ref().unwrap().data);
+            assert_eq!(chunk_indices[i], dealing.as_ref().unwrap().chunk_index);
+        }
+
+        // for sanity sake, check another dealer with different epoch and different dealing index
+        let all_other = StoredDealing::prefix_range(
+            &deps.storage,
+            (epochs[2], &dealers[3], dealing_indices[4]),
+            None,
+        )
+        .collect::<Vec<_>>();
+        assert_eq!(all_other.len(), chunk_indices.len());
+
+        for (i, dealing) in all_other.iter().enumerate() {
+            let expected =
+                dealing_data(epochs[2], &dealers[3], dealing_indices[4], chunk_indices[i]);
+            assert_eq!(expected, dealing.as_ref().unwrap().data);
+            assert_eq!(chunk_indices[i], dealing.as_ref().unwrap().chunk_index);
+        }
+
+        let without_first = StoredDealing::prefix_range(
+            &deps.storage,
+            (epochs[0], &dealers[0], dealing_indices[0]),
+            Some(Bound::exclusive(chunk_indices[0])),
+        )
+        .collect::<Vec<_>>();
+        assert_eq!(&all[1..], without_first);
+
+        let mid = StoredDealing::prefix_range(
+            &deps.storage,
+            (epochs[0], &dealers[0], dealing_indices[0]),
+            Some(Bound::inclusive(chunk_indices[3])),
+        )
+        .collect::<Vec<_>>();
+        assert_eq!(&all[3..], mid);
+    }
+}
diff --git a/contracts/coconut-dkg/src/dealings/transactions.rs b/contracts/coconut-dkg/src/dealings/transactions.rs
index 8a592073fd..07b2298bb9 100644
--- a/contracts/coconut-dkg/src/dealings/transactions.rs
+++ b/contracts/coconut-dkg/src/dealings/transactions.rs
@@ -1,78 +1,246 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2022-2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::dealers::storage as dealers_storage;
-use crate::dealings::storage::DEALINGS_BYTES;
-use crate::epoch_state::storage::INITIAL_REPLACEMENT_DATA;
+use crate::dealings::storage::{
+    metadata_exists, must_read_metadata, store_metadata, StoredDealing,
+};
+use crate::epoch_state::storage::{CURRENT_EPOCH, INITIAL_REPLACEMENT_DATA};
 use crate::epoch_state::utils::check_epoch_state;
 use crate::error::ContractError;
-use cosmwasm_std::{DepsMut, MessageInfo, Response};
-use nym_coconut_dkg_common::types::{ContractSafeBytes, EpochState};
+use crate::state::storage::STATE;
+use cosmwasm_std::{Addr, DepsMut, Env, MessageInfo, Response, Storage};
+use nym_coconut_dkg_common::dealing::{
+    DealingChunkInfo, DealingMetadata, PartialContractDealing, MAX_DEALING_CHUNKS,
+};
+use nym_coconut_dkg_common::types::{ChunkIndex, DealingIndex, EpochState};
 
-pub fn try_commit_dealings(
-    deps: DepsMut<'_>,
-    info: MessageInfo,
-    dealing_bytes: ContractSafeBytes,
+// make sure the epoch is in the dealing exchange and the message sender is a valid dealer for this epoch
+fn ensure_permission(
+    storage: &dyn Storage,
+    sender: &Addr,
     resharing: bool,
-) -> Result<Response, ContractError> {
-    check_epoch_state(deps.storage, EpochState::DealingExchange { resharing })?;
+) -> Result<(), ContractError> {
+    check_epoch_state(storage, EpochState::DealingExchange { resharing })?;
+
     // ensure the sender is a dealer
     if dealers_storage::current_dealers()
-        .may_load(deps.storage, &info.sender)?
+        .may_load(storage, sender)?
         .is_none()
     {
         return Err(ContractError::NotADealer);
     }
     if resharing
         && !INITIAL_REPLACEMENT_DATA
-            .load(deps.storage)?
+            .load(storage)?
             .initial_dealers
-            .contains(&info.sender)
+            .contains(sender)
     {
         return Err(ContractError::NotAnInitialDealer);
     }
+    Ok(())
+}
 
-    // check if this dealer has already committed to all dealings
-    // (we don't want to allow overwriting anything)
-    for dealings in DEALINGS_BYTES {
-        if !dealings.has(deps.storage, &info.sender) {
-            dealings.save(deps.storage, &info.sender, &dealing_bytes)?;
-            return Ok(Response::default());
+pub fn try_submit_dealings_metadata(
+    deps: DepsMut,
+    info: MessageInfo,
+    dealing_index: DealingIndex,
+    chunks: Vec<DealingChunkInfo>,
+    resharing: bool,
+) -> Result<Response, ContractError> {
+    ensure_permission(deps.storage, &info.sender, resharing)?;
+
+    let state = STATE.load(deps.storage)?;
+    let epoch = CURRENT_EPOCH.load(deps.storage)?;
+
+    // don't allow overwriting existing metadata
+    if metadata_exists(deps.storage, epoch.epoch_id, &info.sender, dealing_index) {
+        return Err(ContractError::MetadataAlreadyExists {
+            epoch_id: epoch.epoch_id,
+            dealer: info.sender,
+            dealing_index,
+        });
+    }
+
+    // make sure the dealing index is in the allowed range
+    // note: dealing indexing starts from 0
+    if dealing_index >= state.key_size {
+        return Err(ContractError::DealingOutOfRange {
+            epoch_id: epoch.epoch_id,
+            dealer: info.sender,
+            index: dealing_index,
+            key_size: state.key_size,
+        });
+    }
+
+    // make sure the metadata is not empty
+    if chunks.is_empty() {
+        return Err(ContractError::EmptyMetadata {
+            epoch_id: epoch.epoch_id,
+            dealer: info.sender,
+            dealing_index,
+        });
+    }
+
+    // make sure the chunks are non empty
+    if chunks.iter().any(|c| c.size == 0) {
+        return Err(ContractError::EmptyMetadata {
+            epoch_id: epoch.epoch_id,
+            dealer: info.sender,
+            dealing_index,
+        });
+    }
+
+    // make sure the number of dealing chunks is in the allowed range
+    // to prevent somebody splitting their dealings into 10B chunks
+    if chunks.len() > MAX_DEALING_CHUNKS {
+        return Err(ContractError::TooFragmentedMetadata {
+            epoch_id: epoch.epoch_id,
+            dealer: info.sender,
+            dealing_index,
+            chunks: chunks.len(),
+        });
+    }
+
+    // make sure all chunks, but the last one, have the same size
+    // SAFETY: we checked for whether `chunks` is empty and returned an error in that case
+    #[allow(clippy::unwrap_used)]
+    let first_chunk_size = chunks.first().unwrap().size;
+
+    for (chunk_index, chunk_info) in chunks.iter().enumerate().take(chunks.len() - 1) {
+        if chunk_info.size != first_chunk_size {
+            return Err(ContractError::UnevenChunkSplit {
+                epoch_id: epoch.epoch_id,
+                dealer: info.sender,
+                dealing_index,
+                chunk_index: chunk_index as ChunkIndex,
+                first_chunk_size,
+                size: chunk_info.size,
+            });
         }
     }
 
-    Err(ContractError::AlreadyCommitted {
-        commitment: String::from("dealing"),
-    })
+    // finally, construct and store the metadata
+    let metadata = DealingMetadata::new(dealing_index, chunks);
+
+    store_metadata(
+        deps.storage,
+        epoch.epoch_id,
+        &info.sender,
+        dealing_index,
+        &metadata,
+    )?;
+
+    Ok(Response::new())
+}
+
+pub fn try_commit_dealings_chunk(
+    deps: DepsMut<'_>,
+    env: Env,
+    info: MessageInfo,
+    chunk: PartialContractDealing,
+    resharing: bool,
+) -> Result<Response, ContractError> {
+    ensure_permission(deps.storage, &info.sender, resharing)?;
+
+    let epoch = CURRENT_EPOCH.load(deps.storage)?;
+
+    // read meta
+    let mut metadata = must_read_metadata(
+        deps.storage,
+        epoch.epoch_id,
+        &info.sender,
+        chunk.dealing_index,
+    )?;
+
+    // check if the received chunk is within the declared range
+    let Some(submission_status) = metadata.submitted_chunks.get_mut(&chunk.chunk_index) else {
+        return Err(ContractError::DealingChunkNotInMetadata {
+            epoch_id: epoch.epoch_id,
+            dealer: info.sender,
+            dealing_index: chunk.dealing_index,
+            chunk_index: chunk.chunk_index,
+        });
+    };
+
+    // check if this dealer has already committed this particular dealing chunk
+    if let Some(submission_height) = submission_status.status.submission_height {
+        return Err(ContractError::DealingChunkAlreadyCommitted {
+            epoch_id: epoch.epoch_id,
+            dealer: info.sender,
+            dealing_index: chunk.dealing_index,
+            chunk_index: chunk.chunk_index,
+            block_height: submission_height,
+        });
+    }
+
+    // check if the received chunk has the specified size
+    if submission_status.info.size != chunk.data.len() as u64 {
+        return Err(ContractError::InconsistentChunkLength {
+            epoch_id: epoch.epoch_id,
+            dealer: info.sender,
+            dealing_index: chunk.dealing_index,
+            chunk_index: chunk.chunk_index,
+            metadata_length: submission_status.info.size,
+            received: chunk.data.len() as u64,
+        });
+    }
+
+    // update the metadata
+    submission_status.status.submission_height = Some(env.block.height);
+    store_metadata(
+        deps.storage,
+        epoch.epoch_id,
+        &info.sender,
+        chunk.dealing_index,
+        &metadata,
+    )?;
+
+    // store the dealing
+    StoredDealing::save(deps.storage, epoch.epoch_id, &info.sender, chunk);
+
+    Ok(Response::new())
 }
 
 #[cfg(test)]
 pub(crate) mod tests {
     use super::*;
     use crate::epoch_state::storage::CURRENT_EPOCH;
-    use crate::epoch_state::transactions::advance_epoch_state;
-    use crate::support::tests::fixtures::{dealer_details_fixture, dealing_bytes_fixture};
+    use crate::epoch_state::transactions::{advance_epoch_state, try_initiate_dkg};
+    use crate::support::tests::fixtures::{
+        dealer_details_fixture, dealing_metadata_fixture, partial_dealing_fixture,
+    };
     use crate::support::tests::helpers;
-    use crate::support::tests::helpers::add_fixture_dealer;
+    use crate::support::tests::helpers::{add_fixture_dealer, ADMIN_ADDRESS};
     use cosmwasm_std::testing::{mock_env, mock_info};
     use cosmwasm_std::Addr;
     use nym_coconut_dkg_common::dealer::DealerDetails;
-    use nym_coconut_dkg_common::types::{InitialReplacementData, TimeConfiguration};
+    use nym_coconut_dkg_common::types::{
+        ContractSafeBytes, InitialReplacementData, TimeConfiguration,
+    };
 
     #[test]
-    fn invalid_commit_dealing() {
+    fn invalid_commit_dealing_chunk() {
         let mut deps = helpers::init_contract();
-        let owner = Addr::unchecked("owner1");
         let mut env = mock_env();
-        let info = mock_info(owner.as_str(), &[]);
-        let dealing_bytes = dealing_bytes_fixture();
+        try_initiate_dkg(deps.as_mut(), env.clone(), mock_info(ADMIN_ADDRESS, &[])).unwrap();
 
-        let ret = try_commit_dealings(deps.as_mut(), info.clone(), dealing_bytes.clone(), false)
-            .unwrap_err();
+        let owner = Addr::unchecked("owner1");
+        let info = mock_info(owner.as_str(), &[]);
+        let dealing = partial_dealing_fixture();
+
+        let ret = try_commit_dealings_chunk(
+            deps.as_mut(),
+            env.clone(),
+            info.clone(),
+            dealing.clone(),
+            false,
+        )
+        .unwrap_err();
         assert_eq!(
             ret,
             ContractError::IncorrectEpochState {
-                current_state: EpochState::default().to_string(),
+                current_state: EpochState::PublicKeySubmission { resharing: false }.to_string(),
                 expected_state: EpochState::DealingExchange { resharing: false }.to_string()
             }
         );
@@ -82,15 +250,22 @@ pub(crate) mod tests {
             .time
             .plus_seconds(TimeConfiguration::default().public_key_submission_time_secs);
         add_fixture_dealer(deps.as_mut());
-        advance_epoch_state(deps.as_mut(), env).unwrap();
+        advance_epoch_state(deps.as_mut(), env.clone()).unwrap();
 
-        let ret = try_commit_dealings(deps.as_mut(), info.clone(), dealing_bytes.clone(), false)
-            .unwrap_err();
+        let ret = try_commit_dealings_chunk(
+            deps.as_mut(),
+            env.clone(),
+            info.clone(),
+            dealing.clone(),
+            false,
+        )
+        .unwrap_err();
         assert_eq!(ret, ContractError::NotADealer);
 
         let dealer_details = DealerDetails {
             address: owner.clone(),
             bte_public_key_with_proof: String::new(),
+            ed25519_identity: String::new(),
             announce_address: String::new(),
             assigned_index: 1,
         };
@@ -114,8 +289,14 @@ pub(crate) mod tests {
                 },
             )
             .unwrap();
-        let ret = try_commit_dealings(deps.as_mut(), info.clone(), dealing_bytes.clone(), true)
-            .unwrap_err();
+        let ret = try_commit_dealings_chunk(
+            deps.as_mut(),
+            env.clone(),
+            info.clone(),
+            dealing.clone(),
+            true,
+        )
+        .unwrap_err();
         assert_eq!(ret, ContractError::NotAnInitialDealer);
 
         INITIAL_REPLACEMENT_DATA
@@ -125,18 +306,99 @@ pub(crate) mod tests {
             })
             .unwrap();
 
-        for dealings in DEALINGS_BYTES {
-            assert!(!dealings.has(deps.as_mut().storage, &owner));
-            let ret = try_commit_dealings(deps.as_mut(), info.clone(), dealing_bytes.clone(), true);
-            assert!(ret.is_ok());
-            assert!(dealings.has(deps.as_mut().storage, &owner));
-        }
-        let ret = try_commit_dealings(deps.as_mut(), info, dealing_bytes, true).unwrap_err();
+        // back to 'normal' mode
+        CURRENT_EPOCH
+            .update::<_, ContractError>(deps.as_mut().storage, |mut epoch| {
+                epoch.state = EpochState::DealingExchange { resharing: false };
+                Ok(epoch)
+            })
+            .unwrap();
+
+        // TODO: test case: no metadata
+        //
+        //
+
+        // add dealing metadata
+        try_submit_dealings_metadata(
+            deps.as_mut(),
+            info.clone(),
+            0,
+            dealing_metadata_fixture(),
+            false,
+        )
+        .unwrap();
+
+        // dealing chunk out of range
+        let ret = try_commit_dealings_chunk(
+            deps.as_mut(),
+            env.clone(),
+            info.clone(),
+            PartialContractDealing {
+                dealing_index: 0,
+                chunk_index: 42,
+                data: ContractSafeBytes(vec![1, 2, 3]),
+            },
+            false,
+        )
+        .unwrap_err();
         assert_eq!(
             ret,
-            ContractError::AlreadyCommitted {
-                commitment: String::from("dealing"),
+            ContractError::DealingChunkNotInMetadata {
+                epoch_id: 0,
+                dealer: info.sender.clone(),
+                dealing_index: 0,
+                chunk_index: 42,
             }
         );
+
+        // 'good' dealing
+        let ret = try_commit_dealings_chunk(
+            deps.as_mut(),
+            env.clone(),
+            info.clone(),
+            dealing.clone(),
+            false,
+        );
+        assert!(ret.is_ok());
+
+        // duplicate dealing
+        let ret = try_commit_dealings_chunk(
+            deps.as_mut(),
+            env.clone(),
+            info.clone(),
+            dealing.clone(),
+            false,
+        )
+        .unwrap_err();
+        assert_eq!(
+            ret,
+            ContractError::DealingChunkAlreadyCommitted {
+                epoch_id: 0,
+                dealer: info.sender.clone(),
+                dealing_index: 0,
+                chunk_index: 0,
+                block_height: env.block.height,
+            }
+        );
+
+        // same index, but next epoch
+        CURRENT_EPOCH
+            .update::<_, ContractError>(deps.as_mut().storage, |mut epoch| {
+                epoch.epoch_id += 1;
+                Ok(epoch)
+            })
+            .unwrap();
+
+        try_submit_dealings_metadata(
+            deps.as_mut(),
+            info.clone(),
+            0,
+            dealing_metadata_fixture(),
+            false,
+        )
+        .unwrap();
+
+        let ret = try_commit_dealings_chunk(deps.as_mut(), env, info, dealing.clone(), false);
+        assert!(ret.is_ok());
     }
 }
diff --git a/contracts/coconut-dkg/src/epoch_state/queries.rs b/contracts/coconut-dkg/src/epoch_state/queries.rs
index a7b968bf3f..6c07c65629 100644
--- a/contracts/coconut-dkg/src/epoch_state/queries.rs
+++ b/contracts/coconut-dkg/src/epoch_state/queries.rs
@@ -27,22 +27,29 @@ pub(crate) fn query_initial_dealers(
 #[cfg(test)]
 pub(crate) mod test {
     use super::*;
-    use crate::support::tests::helpers::init_contract;
-    use cosmwasm_std::testing::mock_env;
+    use crate::epoch_state::transactions::try_initiate_dkg;
+    use crate::support::tests::helpers::{init_contract, ADMIN_ADDRESS};
+    use cosmwasm_std::testing::{mock_env, mock_info};
     use nym_coconut_dkg_common::types::{EpochState, TimeConfiguration};
 
     #[test]
     fn query_state() {
         let mut deps = init_contract();
+        let epoch = query_current_epoch(deps.as_mut().storage).unwrap();
+        assert_eq!(epoch.state, EpochState::WaitingInitialisation);
+        assert_eq!(epoch.finish_timestamp, None);
+
+        let env = mock_env();
+        try_initiate_dkg(deps.as_mut(), env.clone(), mock_info(ADMIN_ADDRESS, &[])).unwrap();
+
         let epoch = query_current_epoch(deps.as_mut().storage).unwrap();
         assert_eq!(
             epoch.state,
             EpochState::PublicKeySubmission { resharing: false }
         );
         assert_eq!(
-            epoch.finish_timestamp,
-            mock_env()
-                .block
+            epoch.finish_timestamp.unwrap(),
+            env.block
                 .time
                 .plus_seconds(TimeConfiguration::default().public_key_submission_time_secs)
         );
diff --git a/contracts/coconut-dkg/src/epoch_state/transactions.rs b/contracts/coconut-dkg/src/epoch_state/transactions.rs
index 35f0e75f51..0f06bb381c 100644
--- a/contracts/coconut-dkg/src/epoch_state/transactions.rs
+++ b/contracts/coconut-dkg/src/epoch_state/transactions.rs
@@ -1,17 +1,16 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2022-2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::dealers::storage::{current_dealers, past_dealers};
-use crate::dealings::storage::DEALINGS_BYTES;
 use crate::epoch_state::storage::{CURRENT_EPOCH, INITIAL_REPLACEMENT_DATA, THRESHOLD};
 use crate::epoch_state::utils::check_epoch_state;
 use crate::error::ContractError;
-use crate::state::STATE;
+use crate::state::storage::{DKG_ADMIN, STATE};
 use crate::verification_key_shares::storage::verified_dealers;
-use cosmwasm_std::{Addr, Deps, DepsMut, Env, Order, Response, Storage};
+use cosmwasm_std::{Addr, Deps, DepsMut, Env, MessageInfo, Order, Response, Storage};
 use nym_coconut_dkg_common::types::{Epoch, EpochState, InitialReplacementData};
 
-fn reset_epoch_state(storage: &mut dyn Storage) -> Result<(), ContractError> {
+fn reset_dkg_state(storage: &mut dyn Storage) -> Result<(), ContractError> {
     THRESHOLD.remove(storage);
     let dealers: Vec<_> = current_dealers()
         .keys(storage, None, None, Order::Ascending)
@@ -19,15 +18,6 @@ fn reset_epoch_state(storage: &mut dyn Storage) -> Result<(), ContractError> {
 
     for dealer_addr in dealers {
         let details = current_dealers().load(storage, &dealer_addr)?;
-        for dealings in DEALINGS_BYTES {
-            let dealing_keys: Vec<_> = dealings
-                .keys(storage, None, None, Order::Ascending)
-                .flatten()
-                .collect();
-            for key in dealing_keys {
-                dealings.remove(storage, &key);
-            }
-        }
         current_dealers().remove(storage, &dealer_addr)?;
         past_dealers().save(storage, &dealer_addr, &details)?;
     }
@@ -80,18 +70,43 @@ fn replacement_threshold_surpassed(deps: &DepsMut<'_>) -> Result<bool, ContractE
     Ok(removed_dealer_count >= replacement_threshold)
 }
 
-pub(crate) fn advance_epoch_state(deps: DepsMut<'_>, env: Env) -> Result<Response, ContractError> {
+pub(crate) fn try_initiate_dkg(
+    deps: DepsMut<'_>,
+    env: Env,
+    info: MessageInfo,
+) -> Result<Response, ContractError> {
+    // only the admin is allowed to kick start the process
+    DKG_ADMIN.assert_admin(deps.as_ref(), &info.sender)?;
+
     let epoch = CURRENT_EPOCH.load(deps.storage)?;
-    if epoch.finish_timestamp > env.block.time {
-        return Err(ContractError::EarlyEpochStateAdvancement(
-            epoch
-                .finish_timestamp
-                .minus_seconds(env.block.time.seconds())
-                .seconds(),
-        ));
+    if !matches!(epoch.state, EpochState::WaitingInitialisation) {
+        return Err(ContractError::AlreadyInitialised);
     }
 
+    // the first exchange won't involve resharing
+    let initial_state = EpochState::PublicKeySubmission { resharing: false };
+    let initial_epoch = Epoch::new(initial_state, 0, epoch.time_configuration, env.block.time);
+    CURRENT_EPOCH.save(deps.storage, &initial_epoch)?;
+
+    Ok(Response::default())
+}
+
+pub(crate) fn advance_epoch_state(deps: DepsMut<'_>, env: Env) -> Result<Response, ContractError> {
     let current_epoch = CURRENT_EPOCH.load(deps.storage)?;
+    if current_epoch.state == EpochState::WaitingInitialisation {
+        return Err(ContractError::WaitingInitialisation);
+    }
+
+    if let Some(finish_timestamp) = current_epoch.finish_timestamp {
+        if finish_timestamp > env.block.time {
+            return Err(ContractError::EarlyEpochStateAdvancement(
+                finish_timestamp
+                    .minus_seconds(env.block.time.seconds())
+                    .seconds(),
+            ));
+        }
+    }
+
     let next_epoch = if let Some(state) = current_epoch.state.next() {
         // We are during DKG process
         let mut new_state = state;
@@ -123,6 +138,8 @@ pub(crate) fn advance_epoch_state(deps: DepsMut<'_>, env: Env) -> Result<Respons
     } else if dealers_eq_members(&deps)? {
         // The dealer set hasn't changed, so we only extend the finish timestamp
         // The epoch remains the same, as we use it as key for storing VKs
+
+        // TODO: change that behaviour in the following PR
         Epoch::new(
             current_epoch.state,
             current_epoch.epoch_id,
@@ -139,6 +156,7 @@ pub(crate) fn advance_epoch_state(deps: DepsMut<'_>, env: Env) -> Result<Respons
             // ... in reshare mode
             if INITIAL_REPLACEMENT_DATA.may_load(deps.storage)?.is_some() {
                 INITIAL_REPLACEMENT_DATA.update::<_, ContractError>(deps.storage, |mut data| {
+                    // TODO: FIXME: for second reshare the added set of dealers won't be allowed to participate
                     data.initial_height = env.block.height;
                     Ok(data)
                 })?;
@@ -152,7 +170,7 @@ pub(crate) fn advance_epoch_state(deps: DepsMut<'_>, env: Env) -> Result<Respons
 
             EpochState::PublicKeySubmission { resharing: true }
         };
-        reset_epoch_state(deps.storage)?;
+        reset_dkg_state(deps.storage)?;
         Epoch::new(
             state,
             current_epoch.epoch_id + 1,
@@ -174,7 +192,7 @@ pub(crate) fn try_surpassed_threshold(
     let threshold = THRESHOLD.load(deps.storage)?;
     let dealers = verified_dealers(deps.storage)?;
     if dealers_still_active(&deps.as_ref(), dealers.into_iter())? < threshold as usize {
-        reset_epoch_state(deps.storage)?;
+        reset_dkg_state(deps.storage)?;
         CURRENT_EPOCH.update::<_, ContractError>(deps.storage, |epoch| {
             Ok(Epoch::new(
                 EpochState::default(),
@@ -193,20 +211,19 @@ pub(crate) mod tests {
     use super::*;
     use crate::error::ContractError::EarlyEpochStateAdvancement;
     use crate::support::tests::fixtures::{dealer_details_fixture, vk_share_fixture};
-    use crate::support::tests::helpers::{init_contract, GROUP_MEMBERS};
+    use crate::support::tests::helpers::{init_contract, ADMIN_ADDRESS, GROUP_MEMBERS};
     use crate::verification_key_shares::storage::vk_shares;
-    use cosmwasm_std::testing::mock_env;
+    use cosmwasm_std::testing::{mock_env, mock_info};
     use cosmwasm_std::Addr;
     use cw4::Member;
-    use nym_coconut_dkg_common::types::{
-        ContractSafeBytes, DealerDetails, EpochState, TimeConfiguration,
-    };
+    use cw_controllers::AdminError;
+    use nym_coconut_dkg_common::types::{DealerDetails, EpochState, TimeConfiguration};
     use rusty_fork::rusty_fork_test;
 
     // Because of the global variable handling group, we need individual process for each test
 
     rusty_fork_test! {
-        // Using values from the DKG document
+    // Using values from the DKG document
         #[test]
         fn threshold_surpassed() {
             let mut deps = init_contract();
@@ -217,14 +234,18 @@ pub(crate) mod tests {
 
             for n in [10, 25, 50, 100] {
                 let dealers: Vec<_> = (0..n).map(dealer_details_fixture).collect();
-                let shares: Vec<_> = (0..n).map(|idx| vk_share_fixture(&format!("owner{}", idx), 0)).collect();
+                let shares: Vec<_> = (0..n)
+                    .map(|idx| vk_share_fixture(&format!("owner{}", idx), 0))
+                    .collect();
                 let initial_dealers = dealers.iter().map(|d| d.address.clone()).collect();
                 let data = InitialReplacementData {
                     initial_dealers,
                     initial_height: 1,
                 };
                 for share in shares {
-                    vk_shares().save(deps.as_mut().storage, (&share.owner, 0), &share).unwrap();
+                    vk_shares()
+                        .save(deps.as_mut().storage, (&share.owner, 0), &share)
+                        .unwrap();
                 }
                 for f in [two_thirds, three_fourths, ninty_pc] {
                     let threshold = f(n);
@@ -361,7 +382,8 @@ pub(crate) mod tests {
         fn advance_state() {
             let mut deps = init_contract();
             let mut env = mock_env();
-            {
+
+               {
                 let mut group = GROUP_MEMBERS.lock().unwrap();
 
                 group.push((
@@ -394,13 +416,21 @@ pub(crate) mod tests {
                 ));
             }
 
+            // can't advance the state if dkg hasn't been initiated
+            assert_eq!(
+                advance_epoch_state(deps.as_mut(), env.clone()).unwrap_err(),
+                ContractError::WaitingInitialisation
+            );
+
+            try_initiate_dkg(deps.as_mut(), env.clone(), mock_info(ADMIN_ADDRESS, &[])).unwrap();
+
             let epoch = CURRENT_EPOCH.load(deps.as_mut().storage).unwrap();
             assert_eq!(
                 epoch.state,
                 EpochState::PublicKeySubmission { resharing: false }
             );
             assert_eq!(
-                epoch.finish_timestamp,
+                epoch.finish_timestamp.unwrap(),
                 env.block
                     .time
                     .plus_seconds(epoch.time_configuration.public_key_submission_time_secs)
@@ -424,7 +454,8 @@ pub(crate) mod tests {
             );
 
             // setup dealer details
-            let all_shares: [_; 4] = std::array::from_fn(|i| vk_share_fixture(&format!("owner{}", i + 1), 0));
+            let all_shares: [_; 4] =
+                std::array::from_fn(|i| vk_share_fixture(&format!("owner{}", i + 1), 0));
             for share in all_shares.iter() {
                 vk_shares()
                     .save(deps.as_mut().storage, (&share.owner, 0), share)
@@ -441,7 +472,10 @@ pub(crate) mod tests {
                 .may_load(&deps.storage)
                 .unwrap()
                 .is_none());
-            env.block.time = env.block.time.plus_seconds(epoch.time_configuration.public_key_submission_time_secs);
+            env.block.time = env
+                .block
+                .time
+                .plus_seconds(epoch.time_configuration.public_key_submission_time_secs);
             advance_epoch_state(deps.as_mut(), env.clone()).unwrap();
             let epoch = CURRENT_EPOCH.load(deps.as_mut().storage).unwrap();
             assert_eq!(
@@ -449,7 +483,7 @@ pub(crate) mod tests {
                 EpochState::DealingExchange { resharing: false }
             );
             assert_eq!(
-                epoch.finish_timestamp,
+                epoch.finish_timestamp.unwrap(),
                 env.block
                     .time
                     .plus_seconds(epoch.time_configuration.dealing_exchange_time_secs)
@@ -472,7 +506,7 @@ pub(crate) mod tests {
                 EpochState::VerificationKeySubmission { resharing: false }
             );
             assert_eq!(
-                epoch.finish_timestamp,
+                epoch.finish_timestamp.unwrap(),
                 env.block.time.plus_seconds(
                     epoch
                         .time_configuration
@@ -499,7 +533,7 @@ pub(crate) mod tests {
                 EpochState::VerificationKeyValidation { resharing: false }
             );
             assert_eq!(
-                epoch.finish_timestamp,
+                epoch.finish_timestamp.unwrap(),
                 env.block.time.plus_seconds(
                     epoch
                         .time_configuration
@@ -526,7 +560,7 @@ pub(crate) mod tests {
                 EpochState::VerificationKeyFinalization { resharing: false }
             );
             assert_eq!(
-                epoch.finish_timestamp,
+                epoch.finish_timestamp.unwrap(),
                 env.block.time.plus_seconds(
                     epoch
                         .time_configuration
@@ -548,7 +582,7 @@ pub(crate) mod tests {
             let epoch = CURRENT_EPOCH.load(deps.as_mut().storage).unwrap();
             assert_eq!(epoch.state, EpochState::InProgress);
             assert_eq!(
-                epoch.finish_timestamp,
+                epoch.finish_timestamp.unwrap(),
                 env.block
                     .time
                     .plus_seconds(epoch.time_configuration.in_progress_time_secs)
@@ -614,7 +648,9 @@ pub(crate) mod tests {
 
             let all_details: [_; 4] = std::array::from_fn(|i| dealer_details_fixture(i as u64 + 2));
             for details in all_details.iter() {
-                past_dealers().remove(deps.as_mut().storage, &details.address).unwrap();
+                past_dealers()
+                    .remove(deps.as_mut().storage, &details.address)
+                    .unwrap();
                 current_dealers()
                     .save(deps.as_mut().storage, &details.address, details)
                     .unwrap();
@@ -622,9 +658,15 @@ pub(crate) mod tests {
             for times in [
                 epoch.time_configuration.public_key_submission_time_secs,
                 epoch.time_configuration.dealing_exchange_time_secs,
-                epoch.time_configuration.verification_key_submission_time_secs,
-                epoch.time_configuration.verification_key_validation_time_secs,
-                epoch.time_configuration.verification_key_finalization_time_secs,
+                epoch
+                    .time_configuration
+                    .verification_key_submission_time_secs,
+                epoch
+                    .time_configuration
+                    .verification_key_validation_time_secs,
+                epoch
+                    .time_configuration
+                    .verification_key_finalization_time_secs,
             ] {
                 env.block.time = env.block.time.plus_seconds(times);
                 advance_epoch_state(deps.as_mut(), env.clone()).unwrap();
@@ -634,7 +676,7 @@ pub(crate) mod tests {
                 let mut share = vk_share_fixture(&format!("owner{}", i + 1), 1);
                 share.verified = i % 2 == 0;
                 share
-                });
+            });
             for share in all_shares.iter() {
                 vk_shares()
                     .save(deps.as_mut().storage, (&share.owner, 0), share)
@@ -670,6 +712,8 @@ pub(crate) mod tests {
         fn surpass_threshold() {
             let mut deps = init_contract();
             let mut env = mock_env();
+            try_initiate_dkg(deps.as_mut(), env.clone(), mock_info(ADMIN_ADDRESS, &[])).unwrap();
+
             let time_configuration = TimeConfiguration::default();
             {
                 let mut group = GROUP_MEMBERS.lock().unwrap();
@@ -701,13 +745,13 @@ pub(crate) mod tests {
             assert_eq!(
                 ret,
                 ContractError::IncorrectEpochState {
-                    current_state: EpochState::default().to_string(),
+                    current_state: EpochState::PublicKeySubmission { resharing: false }.to_string(),
                     expected_state: EpochState::InProgress.to_string()
                 }
             );
 
-
-            let all_shares: [_; 3] = std::array::from_fn(|i| vk_share_fixture(&format!("owner{}", i + 1), 0));
+            let all_shares: [_; 3] =
+                std::array::from_fn(|i| vk_share_fixture(&format!("owner{}", i + 1), 0));
             for share in all_shares.iter() {
                 vk_shares()
                     .save(deps.as_mut().storage, (&share.owner, 0), share)
@@ -719,7 +763,8 @@ pub(crate) mod tests {
                     .save(deps.as_mut().storage, &details.address, details)
                     .unwrap();
             }
-            let all_shares: [_; 3] = std::array::from_fn(|i| vk_share_fixture(&format!("owner{}", i + 1), 0));
+            let all_shares: [_; 3] =
+                std::array::from_fn(|i| vk_share_fixture(&format!("owner{}", i + 1), 0));
             for share in all_shares.iter() {
                 vk_shares()
                     .save(deps.as_mut().storage, (&share.owner, share.epoch_id), share)
@@ -778,6 +823,46 @@ pub(crate) mod tests {
         }
     }
 
+    #[test]
+    fn initialising_dkg() {
+        let mut deps = init_contract();
+        let env = mock_env();
+
+        let initial_epoch_info = CURRENT_EPOCH.load(&deps.storage).unwrap();
+        assert!(initial_epoch_info.finish_timestamp.is_none());
+
+        // can only be executed by the admin
+        let res = try_initiate_dkg(deps.as_mut(), env.clone(), mock_info("not an admin", &[]))
+            .unwrap_err();
+        assert_eq!(ContractError::Admin(AdminError::NotAdmin {}), res);
+
+        let res = try_initiate_dkg(deps.as_mut(), env.clone(), mock_info(ADMIN_ADDRESS, &[]));
+        assert!(res.is_ok());
+
+        // can't be initialised more than once
+        let res = try_initiate_dkg(deps.as_mut(), env.clone(), mock_info(ADMIN_ADDRESS, &[]))
+            .unwrap_err();
+        assert_eq!(ContractError::AlreadyInitialised, res);
+
+        // sets the correct epoch data
+        let epoch = CURRENT_EPOCH.load(&deps.storage).unwrap();
+        assert_eq!(epoch.epoch_id, 0);
+        assert_eq!(
+            epoch.state,
+            EpochState::PublicKeySubmission { resharing: false }
+        );
+        assert_eq!(
+            epoch.time_configuration,
+            initial_epoch_info.time_configuration
+        );
+        assert_eq!(
+            epoch.finish_timestamp.unwrap(),
+            env.block
+                .time
+                .plus_seconds(epoch.time_configuration.public_key_submission_time_secs)
+        );
+    }
+
     #[test]
     fn reset_state() {
         let mut deps = init_contract();
@@ -788,27 +873,12 @@ pub(crate) mod tests {
             current_dealers()
                 .save(deps.as_mut().storage, &details.address, details)
                 .unwrap();
-            for dealings in DEALINGS_BYTES {
-                dealings
-                    .save(
-                        deps.as_mut().storage,
-                        &details.address,
-                        &ContractSafeBytes(vec![1, 2, 3]),
-                    )
-                    .unwrap();
-            }
         }
 
-        reset_epoch_state(deps.as_mut().storage).unwrap();
+        reset_dkg_state(deps.as_mut().storage).unwrap();
 
         assert!(THRESHOLD.may_load(&deps.storage).unwrap().is_none());
         for details in all_details {
-            for dealings in DEALINGS_BYTES {
-                assert!(dealings
-                    .may_load(&deps.storage, &details.address)
-                    .unwrap()
-                    .is_none());
-            }
             assert!(current_dealers()
                 .may_load(deps.as_mut().storage, &details.address)
                 .unwrap()
@@ -826,6 +896,7 @@ pub(crate) mod tests {
     fn verify_threshold() {
         let mut deps = init_contract();
         let mut env = mock_env();
+        try_initiate_dkg(deps.as_mut(), env.clone(), mock_info(ADMIN_ADDRESS, &[])).unwrap();
 
         assert!(THRESHOLD.may_load(deps.as_mut().storage).unwrap().is_none());
 
@@ -838,6 +909,7 @@ pub(crate) mod tests {
                     &DealerDetails {
                         address: address.clone(),
                         bte_public_key_with_proof: "bte_public_key_with_proof".to_string(),
+                        ed25519_identity: "identity".to_string(),
                         announce_address: "127.0.0.1".to_string(),
                         assigned_index: i,
                     },
diff --git a/contracts/coconut-dkg/src/epoch_state/utils.rs b/contracts/coconut-dkg/src/epoch_state/utils.rs
index cfbe82dfba..927f857877 100644
--- a/contracts/coconut-dkg/src/epoch_state/utils.rs
+++ b/contracts/coconut-dkg/src/epoch_state/utils.rs
@@ -33,14 +33,14 @@ pub(crate) mod test {
         let mut deps = init_contract();
         let env = mock_env();
 
-        for fixed_state in EpochState::default().all_until(EpochState::InProgress) {
+        for fixed_state in EpochState::first().all_until(EpochState::InProgress) {
             CURRENT_EPOCH
                 .save(
                     deps.as_mut().storage,
                     &Epoch::new(fixed_state, 0, TimeConfiguration::default(), env.block.time),
                 )
                 .unwrap();
-            for against_state in EpochState::default().all_until(EpochState::InProgress) {
+            for against_state in EpochState::first().all_until(EpochState::InProgress) {
                 let ret = check_epoch_state(deps.as_mut().storage, against_state);
                 if fixed_state == against_state {
                     assert!(ret.is_ok());
diff --git a/contracts/coconut-dkg/src/error.rs b/contracts/coconut-dkg/src/error.rs
index f8458d0c47..af28f920b7 100644
--- a/contracts/coconut-dkg/src/error.rs
+++ b/contracts/coconut-dkg/src/error.rs
@@ -1,8 +1,10 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use cosmwasm_std::StdError;
+use cosmwasm_std::{Addr, StdError};
 use cw_controllers::AdminError;
+use nym_coconut_dkg_common::dealing::MAX_DEALING_CHUNKS;
+use nym_coconut_dkg_common::types::{ChunkIndex, DealingIndex, EpochId};
 use thiserror::Error;
 
 /// Custom errors for contract failure conditions.
@@ -14,6 +16,12 @@ pub enum ContractError {
     #[error(transparent)]
     Admin(#[from] AdminError),
 
+    #[error("Dkg hasn't been initialised yet")]
+    WaitingInitialisation,
+
+    #[error("Dkg has already been initialised")]
+    AlreadyInitialised,
+
     #[error("Group contract invalid address '{addr}'")]
     InvalidGroup { addr: String },
 
@@ -30,7 +38,7 @@ pub enum ContractError {
     EpochNotInitialised,
 
     #[error(
-        "Requested action needs state to be {expected_state}, currently in state {current_state}, "
+        "Requested action needs state to be {expected_state}, currently in state {current_state}"
     )]
     IncorrectEpochState {
         current_state: String,
@@ -43,9 +51,89 @@ pub enum ContractError {
     #[error("This sender is not a dealer for the current resharing epoch")]
     NotAnInitialDealer,
 
+    #[error("Dealer {dealer} has already committed dealing chunk for epoch {epoch_id} with dealing index {dealing_index} and chunk index {chunk_index} at height {block_height}")]
+    DealingChunkAlreadyCommitted {
+        epoch_id: EpochId,
+        dealer: Addr,
+        dealing_index: DealingIndex,
+        chunk_index: ChunkIndex,
+        block_height: u64,
+    },
+
+    #[error("dealer {dealer} tried to commit chunk {chunk_index} of dealing {dealing_index} for epoch {epoch_id}, but it hasn't been declared in the prior metadata")]
+    DealingChunkNotInMetadata {
+        epoch_id: EpochId,
+        dealer: Addr,
+        dealing_index: DealingIndex,
+        chunk_index: ChunkIndex,
+    },
+
+    #[error("dealer {dealer} has attempted to commit dealing chunk for epoch {epoch_id} with dealing index {index} while the key size is set to {key_size}")]
+    DealingOutOfRange {
+        epoch_id: EpochId,
+        dealer: Addr,
+        index: DealingIndex,
+        key_size: u32,
+    },
+
+    #[error("dealer {dealer} has attempted to commit dealing metadata for epoch {epoch_id} for dealing index {dealing_index} with {chunks} chunks while at most {} chunks are allowed", MAX_DEALING_CHUNKS)]
+    TooFragmentedMetadata {
+        epoch_id: EpochId,
+        dealer: Addr,
+        dealing_index: DealingIndex,
+        chunks: usize,
+    },
+
+    #[error("the declared chunk split for epoch {epoch_id} from dealer {dealer} for dealing index {dealing_index} is uneven. first chunk has size of {first_chunk_size} while chunk at index {chunk_index} has {size}")]
+    UnevenChunkSplit {
+        epoch_id: EpochId,
+        dealer: Addr,
+        dealing_index: DealingIndex,
+        chunk_index: ChunkIndex,
+        first_chunk_size: u64,
+        size: u64,
+    },
+
+    #[error("the received chunk for epoch {epoch_id} from dealer {dealer} at dealing index {dealing_index} at chunk index {chunk_index} has inconsistent length. the metadata contains length of {metadata_length} while the received data is {received} bytes long")]
+    InconsistentChunkLength {
+        epoch_id: EpochId,
+        dealer: Addr,
+        dealing_index: DealingIndex,
+        chunk_index: ChunkIndex,
+        metadata_length: u64,
+        received: u64,
+    },
+
+    #[error("dealer {dealer} has attempted to commit dealing metadata for epoch {epoch_id} for dealing index {dealing_index} zero chunks")]
+    EmptyMetadata {
+        epoch_id: EpochId,
+        dealer: Addr,
+        dealing_index: DealingIndex,
+    },
+
+    #[error("metadata for dealing for epoch {epoch_id} from {dealer} at index {dealing_index} does not exist")]
+    UnavailableDealingMetadata {
+        epoch_id: EpochId,
+        dealer: Addr,
+        dealing_index: DealingIndex,
+    },
+
+    #[error("metadata for dealing for epoch {epoch_id} from {dealer} at index {dealing_index} already exists")]
+    MetadataAlreadyExists {
+        epoch_id: EpochId,
+        dealer: Addr,
+        dealing_index: DealingIndex,
+    },
+
     #[error("This dealer has already committed {commitment}")]
     AlreadyCommitted { commitment: String },
 
     #[error("No verification key committed for owner {owner}")]
     NoCommitForOwner { owner: String },
+
+    #[error("failed to parse {value} into a valid SemVer version: {error_message}")]
+    SemVerFailure {
+        value: String,
+        error_message: String,
+    },
 }
diff --git a/contracts/coconut-dkg/src/state/mod.rs b/contracts/coconut-dkg/src/state/mod.rs
index 90abdc3711..fffc20fcf1 100644
--- a/contracts/coconut-dkg/src/state/mod.rs
+++ b/contracts/coconut-dkg/src/state/mod.rs
@@ -1,19 +1,5 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2022-2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use cosmwasm_std::Addr;
-use cw4::Cw4Contract;
-use cw_controllers::Admin;
-use cw_storage_plus::Item;
-use serde::{Deserialize, Serialize};
-
-// unique items
-pub const STATE: Item<State> = Item::new("state");
-pub const MULTISIG: Admin = Admin::new("multisig");
-
-#[derive(Serialize, Deserialize, Clone, PartialEq, Debug)]
-pub struct State {
-    pub mix_denom: String,
-    pub multisig_addr: Addr,
-    pub group_addr: Cw4Contract,
-}
+pub mod queries;
+pub mod storage;
diff --git a/contracts/coconut-dkg/src/state/queries.rs b/contracts/coconut-dkg/src/state/queries.rs
new file mode 100644
index 0000000000..b5364dcc85
--- /dev/null
+++ b/contracts/coconut-dkg/src/state/queries.rs
@@ -0,0 +1,10 @@
+// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::state::storage::STATE;
+use cosmwasm_std::{StdResult, Storage};
+use nym_coconut_dkg_common::types::State;
+
+pub(crate) fn query_state(storage: &dyn Storage) -> StdResult<State> {
+    STATE.load(storage)
+}
diff --git a/contracts/coconut-dkg/src/state/storage.rs b/contracts/coconut-dkg/src/state/storage.rs
new file mode 100644
index 0000000000..f172049c22
--- /dev/null
+++ b/contracts/coconut-dkg/src/state/storage.rs
@@ -0,0 +1,13 @@
+// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use cw_controllers::Admin;
+use cw_storage_plus::Item;
+use nym_coconut_dkg_common::types::State;
+
+// unique items
+pub const DKG_ADMIN: Admin = Admin::new("dkg-admin");
+
+pub const STATE: Item<State> = Item::new("state");
+
+pub const MULTISIG: Admin = Admin::new("multisig");
diff --git a/contracts/coconut-dkg/src/support/tests/fixtures.rs b/contracts/coconut-dkg/src/support/tests/fixtures.rs
index 1771ee1310..8599502449 100644
--- a/contracts/coconut-dkg/src/support/tests/fixtures.rs
+++ b/contracts/coconut-dkg/src/support/tests/fixtures.rs
@@ -1,8 +1,9 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2022-2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
 use cosmwasm_std::Addr;
 use nym_coconut_dkg_common::dealer::DealerDetails;
+use nym_coconut_dkg_common::dealing::{DealingChunkInfo, PartialContractDealing};
 use nym_coconut_dkg_common::types::ContractSafeBytes;
 use nym_coconut_dkg_common::verification_key::ContractVKShare;
 
@@ -19,14 +20,31 @@ pub fn vk_share_fixture(owner: &str, index: u64) -> ContractVKShare {
     }
 }
 
+#[allow(unused)]
 pub fn dealing_bytes_fixture() -> ContractSafeBytes {
-    ContractSafeBytes(vec![])
+    ContractSafeBytes(vec![1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
+}
+
+pub fn partial_dealing_fixture() -> PartialContractDealing {
+    PartialContractDealing {
+        chunk_index: 0,
+        dealing_index: 0,
+        data: ContractSafeBytes(vec![1, 2, 3, 4, 5, 6, 7, 8, 9, 10]),
+    }
+}
+
+pub fn dealing_metadata_fixture() -> Vec<DealingChunkInfo> {
+    let chunk_fixture = partial_dealing_fixture();
+    vec![DealingChunkInfo {
+        size: chunk_fixture.data.len() as u64,
+    }]
 }
 
 pub fn dealer_details_fixture(assigned_index: u64) -> DealerDetails {
     DealerDetails {
         address: Addr::unchecked(format!("owner{}", assigned_index)),
         bte_public_key_with_proof: "".to_string(),
+        ed25519_identity: "".to_string(),
         announce_address: "".to_string(),
         assigned_index,
     }
diff --git a/contracts/coconut-dkg/src/support/tests/helpers.rs b/contracts/coconut-dkg/src/support/tests/helpers.rs
index 8bb21d5c40..b6b241dd4a 100644
--- a/contracts/coconut-dkg/src/support/tests/helpers.rs
+++ b/contracts/coconut-dkg/src/support/tests/helpers.rs
@@ -9,7 +9,7 @@ use cosmwasm_std::{
     QuerierResult, SystemResult, WasmQuery,
 };
 use cw4::{Cw4QueryMsg, Member, MemberListResponse, MemberResponse};
-use lazy_static::lazy_static;
+use nym_coconut_dkg_common::dealing::DEFAULT_DEALINGS;
 use nym_coconut_dkg_common::msg::InstantiateMsg;
 use nym_coconut_dkg_common::types::DealerDetails;
 use std::sync::Mutex;
@@ -20,9 +20,7 @@ pub const ADMIN_ADDRESS: &str = "admin address";
 pub const GROUP_CONTRACT: &str = "group contract address";
 pub const MULTISIG_CONTRACT: &str = "multisig contract address";
 
-lazy_static! {
-    pub static ref GROUP_MEMBERS: Mutex<Vec<(Member, u64)>> = Mutex::new(vec![]);
-}
+pub(crate) static GROUP_MEMBERS: Mutex<Vec<(Member, u64)>> = Mutex::new(Vec::new());
 
 pub fn add_fixture_dealer(deps: DepsMut<'_>) {
     let owner = Addr::unchecked("owner");
@@ -33,6 +31,7 @@ pub fn add_fixture_dealer(deps: DepsMut<'_>) {
             &DealerDetails {
                 address: owner.clone(),
                 bte_public_key_with_proof: String::new(),
+                ed25519_identity: String::new(),
                 announce_address: String::new(),
                 assigned_index: 100,
             },
@@ -87,6 +86,7 @@ pub fn init_contract() -> OwnedDeps<MemoryStorage, MockApi, MockQuerier<Empty>>
         multisig_addr: String::from(MULTISIG_CONTRACT),
         time_configuration: None,
         mix_denom: TEST_MIX_DENOM.to_string(),
+        key_size: DEFAULT_DEALINGS as u32,
     };
     let env = mock_env();
     let info = mock_info(ADMIN_ADDRESS, &[]);
diff --git a/contracts/coconut-dkg/src/verification_key_shares/queries.rs b/contracts/coconut-dkg/src/verification_key_shares/queries.rs
index 958fd6b68f..77abfd8d6e 100644
--- a/contracts/coconut-dkg/src/verification_key_shares/queries.rs
+++ b/contracts/coconut-dkg/src/verification_key_shares/queries.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2022-2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::verification_key_shares::storage;
@@ -6,7 +6,23 @@ use crate::verification_key_shares::storage::vk_shares;
 use cosmwasm_std::{Deps, Order, StdResult};
 use cw_storage_plus::Bound;
 use nym_coconut_dkg_common::types::EpochId;
-use nym_coconut_dkg_common::verification_key::PagedVKSharesResponse;
+use nym_coconut_dkg_common::verification_key::{PagedVKSharesResponse, VkShareResponse};
+
+// TODO: unit tests
+pub fn query_vk_share(
+    deps: Deps<'_>,
+    owner: String,
+    epoch_id: EpochId,
+) -> StdResult<VkShareResponse> {
+    let owner = deps.api.addr_validate(&owner)?;
+    let share = vk_shares().may_load(deps.storage, (&owner, epoch_id))?;
+
+    Ok(VkShareResponse {
+        owner,
+        epoch_id,
+        share,
+    })
+}
 
 pub fn query_vk_shares_paged(
     deps: Deps<'_>,
diff --git a/contracts/coconut-dkg/src/verification_key_shares/storage.rs b/contracts/coconut-dkg/src/verification_key_shares/storage.rs
index 51a7fbb03e..7c65518df4 100644
--- a/contracts/coconut-dkg/src/verification_key_shares/storage.rs
+++ b/contracts/coconut-dkg/src/verification_key_shares/storage.rs
@@ -1,7 +1,5 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
 
 use crate::constants::{VK_SHARES_EPOCH_ID_IDX_NAMESPACE, VK_SHARES_PK_NAMESPACE};
 use crate::epoch_state::storage::CURRENT_EPOCH;
diff --git a/contracts/coconut-dkg/src/verification_key_shares/transactions.rs b/contracts/coconut-dkg/src/verification_key_shares/transactions.rs
index d532c5579a..8ff202ec04 100644
--- a/contracts/coconut-dkg/src/verification_key_shares/transactions.rs
+++ b/contracts/coconut-dkg/src/verification_key_shares/transactions.rs
@@ -6,9 +6,9 @@ use crate::dealers::storage as dealers_storage;
 use crate::epoch_state::storage::CURRENT_EPOCH;
 use crate::epoch_state::utils::check_epoch_state;
 use crate::error::ContractError;
-use crate::state::{MULTISIG, STATE};
+use crate::state::storage::{MULTISIG, STATE};
 use crate::verification_key_shares::storage::vk_shares;
-use cosmwasm_std::{Addr, DepsMut, Env, MessageInfo, Response};
+use cosmwasm_std::{DepsMut, Env, MessageInfo, Response};
 use nym_coconut_dkg_common::types::EpochState;
 use nym_coconut_dkg_common::verification_key::{
     to_cosmos_msg, ContractVKShare, VerificationKeyShare,
@@ -54,6 +54,7 @@ pub fn try_commit_verification_key_share(
         resharing,
         env.contract.address.to_string(),
         STATE.load(deps.storage)?.multisig_addr.to_string(),
+        // TODO: make this value configurable
         env.block
             .time
             .plus_seconds(BLOCK_TIME_FOR_VERIFICATION_SECS),
@@ -65,9 +66,11 @@ pub fn try_commit_verification_key_share(
 pub fn try_verify_verification_key_share(
     deps: DepsMut<'_>,
     info: MessageInfo,
-    owner: Addr,
+    owner: String,
     resharing: bool,
 ) -> Result<Response, ContractError> {
+    let owner = deps.api.addr_validate(&owner)?;
+
     check_epoch_state(
         deps.storage,
         EpochState::VerificationKeyFinalization { resharing },
@@ -91,10 +94,11 @@ pub fn try_verify_verification_key_share(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::epoch_state::transactions::advance_epoch_state;
+    use crate::epoch_state::transactions::{advance_epoch_state, try_initiate_dkg};
     use crate::support::tests::helpers;
-    use crate::support::tests::helpers::{add_fixture_dealer, MULTISIG_CONTRACT};
+    use crate::support::tests::helpers::{add_fixture_dealer, ADMIN_ADDRESS, MULTISIG_CONTRACT};
     use cosmwasm_std::testing::{mock_env, mock_info};
+    use cosmwasm_std::Addr;
     use cw_controllers::AdminError;
     use nym_coconut_dkg_common::dealer::DealerDetails;
     use nym_coconut_dkg_common::types::{EpochState, TimeConfiguration};
@@ -103,6 +107,8 @@ mod tests {
     fn current_epoch_id() {
         let mut deps = helpers::init_contract();
         let mut env = mock_env();
+        try_initiate_dkg(deps.as_mut(), env.clone(), mock_info(ADMIN_ADDRESS, &[])).unwrap();
+
         let info = mock_info("requester", &[]);
         let share = "share".to_string();
 
@@ -122,6 +128,7 @@ mod tests {
         let dealer_details = DealerDetails {
             address: dealer.clone(),
             bte_public_key_with_proof: String::new(),
+            ed25519_identity: String::new(),
             announce_address: announce_address.clone(),
             assigned_index: 1,
         };
@@ -149,6 +156,8 @@ mod tests {
     fn commit_vk_share() {
         let mut deps = helpers::init_contract();
         let mut env = mock_env();
+        try_initiate_dkg(deps.as_mut(), env.clone(), mock_info(ADMIN_ADDRESS, &[])).unwrap();
+
         let info = mock_info("requester", &[]);
         let share = "share".to_string();
 
@@ -163,7 +172,7 @@ mod tests {
         assert_eq!(
             ret,
             ContractError::IncorrectEpochState {
-                current_state: EpochState::default().to_string(),
+                current_state: EpochState::PublicKeySubmission { resharing: false }.to_string(),
                 expected_state: EpochState::VerificationKeySubmission { resharing: false }
                     .to_string()
             }
@@ -193,6 +202,7 @@ mod tests {
         let dealer_details = DealerDetails {
             address: dealer.clone(),
             bte_public_key_with_proof: String::new(),
+            ed25519_identity: String::new(),
             announce_address: String::new(),
             assigned_index: 1,
         };
@@ -223,8 +233,10 @@ mod tests {
     fn invalid_verify_vk_share() {
         let mut deps = helpers::init_contract();
         let mut env = mock_env();
+        try_initiate_dkg(deps.as_mut(), env.clone(), mock_info(ADMIN_ADDRESS, &[])).unwrap();
+
         let info = mock_info("requester", &[]);
-        let owner = Addr::unchecked("owner");
+        let owner = "owner".to_string();
         let multisig_info = mock_info(MULTISIG_CONTRACT, &[]);
 
         let ret =
@@ -233,7 +245,7 @@ mod tests {
         assert_eq!(
             ret,
             ContractError::IncorrectEpochState {
-                current_state: EpochState::default().to_string(),
+                current_state: EpochState::PublicKeySubmission { resharing: false }.to_string(),
                 expected_state: EpochState::VerificationKeyFinalization { resharing: false }
                     .to_string()
             }
@@ -280,7 +292,9 @@ mod tests {
     fn verify_vk_share() {
         let mut deps = helpers::init_contract();
         let mut env = mock_env();
-        let owner = Addr::unchecked("owner");
+        try_initiate_dkg(deps.as_mut(), env.clone(), mock_info(ADMIN_ADDRESS, &[])).unwrap();
+
+        let owner = "owner".to_string();
         let info = mock_info(owner.as_ref(), &[]);
         let share = "share".to_string();
         let multisig_info = mock_info(MULTISIG_CONTRACT, &[]);
@@ -298,13 +312,18 @@ mod tests {
         advance_epoch_state(deps.as_mut(), env.clone()).unwrap();
 
         let dealer_details = DealerDetails {
-            address: owner.clone(),
+            address: Addr::unchecked(&owner),
             bte_public_key_with_proof: String::new(),
+            ed25519_identity: String::new(),
             announce_address: String::new(),
             assigned_index: 1,
         };
         dealers_storage::current_dealers()
-            .save(deps.as_mut().storage, &owner, &dealer_details)
+            .save(
+                deps.as_mut().storage,
+                &Addr::unchecked(&owner),
+                &dealer_details,
+            )
             .unwrap();
         try_commit_verification_key_share(deps.as_mut(), env.clone(), info, share, false).unwrap();
 
diff --git a/contracts/coconut-test/src/submit_vk_creates_proposal.rs b/contracts/coconut-test/src/submit_vk_creates_proposal.rs
index 4e1d5dc346..d863f90cfe 100644
--- a/contracts/coconut-test/src/submit_vk_creates_proposal.rs
+++ b/contracts/coconut-test/src/submit_vk_creates_proposal.rs
@@ -12,7 +12,7 @@ use cw4::Member;
 use cw_multi_test::Executor;
 use cw_utils::{Duration, Threshold};
 use nym_coconut_dkg_common::msg::ExecuteMsg::{
-    AdvanceEpochState, CommitVerificationKeyShare, RegisterDealer,
+    AdvanceEpochState, CommitVerificationKeyShare, InitiateDkg, RegisterDealer,
 };
 use nym_coconut_dkg_common::msg::InstantiateMsg as DkgInstantiateMsg;
 use nym_coconut_dkg_common::msg::QueryMsg::GetVerificationKeys;
@@ -75,6 +75,7 @@ fn dkg_proposal() {
         multisig_addr: multisig_contract_addr.to_string(),
         time_configuration: None,
         mix_denom: TEST_COIN_DENOM.to_string(),
+        key_size: 5,
     };
     let coconut_dkg_contract_addr = app
         .instantiate_contract(
@@ -99,11 +100,20 @@ fn dkg_proposal() {
     )
     .unwrap();
 
+    app.execute_contract(
+        Addr::unchecked(OWNER),
+        coconut_dkg_contract_addr.clone(),
+        &InitiateDkg {},
+        &[],
+    )
+    .unwrap();
+
     app.execute_contract(
         Addr::unchecked(MEMBER1),
         coconut_dkg_contract_addr.clone(),
         &RegisterDealer {
             bte_key_with_proof: "bte_key_with_proof".to_string(),
+            identity_key: "identity".to_string(),
             announce_address: "127.0.0.1:8000".to_string(),
             resharing: false,
         },
diff --git a/contracts/mixnet/Cargo.toml b/contracts/mixnet/Cargo.toml
index a6f1ba5d0e..c365dda0c6 100644
--- a/contracts/mixnet/Cargo.toml
+++ b/contracts/mixnet/Cargo.toml
@@ -41,7 +41,7 @@ bs58 = "0.4.0"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 thiserror = { workspace = true }
 time = { version = "0.3", features = ["macros"] }
-semver = { version = "1.0.16", default-features = false }
+semver = { workspace = true, default-features = false }
 
 [dev-dependencies]
 rand_chacha = "0.2"
diff --git a/contracts/name-service/Cargo.toml b/contracts/name-service/Cargo.toml
index e2b5ddb753..13cbb7a6c0 100644
--- a/contracts/name-service/Cargo.toml
+++ b/contracts/name-service/Cargo.toml
@@ -20,7 +20,7 @@ cw-utils = { workspace = true }
 cw2 = { workspace = true }
 nym-contracts-common = { path = "../../common/cosmwasm-smart-contracts/contracts-common", version = "0.5.0" }
 nym-name-service-common = { path = "../../common/cosmwasm-smart-contracts/name-service" }
-semver = { version = "1.0.16", default-features = false }
+semver = { workspace = true, default-features = false }
 serde = { version = "1.0.155", default-features = false, features = ["derive"] }
 thiserror = { workspace = true }
 
diff --git a/contracts/service-provider-directory/Cargo.toml b/contracts/service-provider-directory/Cargo.toml
index e6b36d3346..4acd39aa09 100644
--- a/contracts/service-provider-directory/Cargo.toml
+++ b/contracts/service-provider-directory/Cargo.toml
@@ -20,7 +20,7 @@ cw-utils = { workspace = true }
 cw2 = { workspace = true }
 nym-contracts-common = { path = "../../common/cosmwasm-smart-contracts/contracts-common", version = "0.5.0" }
 nym-service-provider-directory-common = { path = "../../common/cosmwasm-smart-contracts/service-provider-directory" }
-semver = { version = "1.0.16", default-features = false }
+semver = { workspace = true, default-features = false }
 serde = { version = "1.0.155", default-features = false, features = ["derive"] }
 thiserror = { workspace = true }
 
diff --git a/contracts/vesting/Cargo.toml b/contracts/vesting/Cargo.toml
index efd3f73006..28f3120c17 100644
--- a/contracts/vesting/Cargo.toml
+++ b/contracts/vesting/Cargo.toml
@@ -36,7 +36,7 @@ cw-storage-plus = { workspace = true, features = ["iterator"] }
 
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 thiserror ={ workspace = true }
-semver = { version = "1.0.16", default-features = false }
+semver = { workspace = true, default-features = false }
 
 [dev-dependencies]
 rand_chacha = "0.3.1"
diff --git a/cpu-cycles/Cargo.toml b/cpu-cycles/Cargo.toml
index 59d2ed52b6..4c234b8d30 100644
--- a/cpu-cycles/Cargo.toml
+++ b/cpu-cycles/Cargo.toml
@@ -4,9 +4,10 @@ version = "0.1.0"
 edition = "2021"
 build = "build.rs"
 links = "cpucycles"
+license = "LicenseRef-PD-hp OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT"
 
 [dependencies]
 libc = "0.2.140"
 
 [build-dependencies]
-cfg-if = "1"
\ No newline at end of file
+cfg-if = "1"
diff --git a/deny.toml b/deny.toml
index 63bf414358..812b1e6e1d 100644
--- a/deny.toml
+++ b/deny.toml
@@ -114,6 +114,7 @@ allow = [
     "CC0-1.0",
     "Unicode-DFS-2016",
     "OpenSSL",
+    "Zlib",
 ]
 # List of explicitly disallowed licenses
 # See https://spdx.org/licenses/ for list of possible licenses
@@ -216,6 +217,7 @@ deny = [
     # Wrapper crates can optionally be specified to allow the crate when it
     # is a direct dependency of the otherwise banned crate
     #{ name = "ansi_term", version = "=0.11.0", wrappers = [] },
+    { name = "openssl"},
 ]
 
 # List of features to allow/deny
diff --git a/documentation/dev-portal/book.toml b/documentation/dev-portal/book.toml
index 8bfe315678..d36c694e22 100644
--- a/documentation/dev-portal/book.toml
+++ b/documentation/dev-portal/book.toml
@@ -1,56 +1,35 @@
 [book]
-title = "Nym Developer Portal"
+title = "Nym Docs"
 authors = ["Max Hampshire, Serinko, Alexia Lorenza Martinel"]
+description = "Nym technical documentation"
 language = "en"
-multilingual = false
+multilingual = false # for the moment - ideally work on chinese, brazillian ,portugese spanish next
 src = "src"
 
+[rust]
+edition = "2018"
+
 #################
 # PREPROCESSORS #
 #################
 
-# Note if changing these fields:
-# - make sure you aren't running `mdbook serve`
-# - change value of `turn-off = true` to `false`. This is set to `true` usually to avoid a known constant-reload bug with `mdbook serve` and this preprocessor
-# - delete `./theme/` dir
-# - change the preprocessor values that you want to edit
-# - run `mdbook build`: this will rebuild the `./theme` directory
-# - change value of `turn-off` back to `true`
 [preprocessor.theme]
-pagetoc = true
-# some variables related (defined in theme/css/variables.css)
-# `content-max-width` + `pagetoc-width` = 95% seems the best
-pagetoc-width            = "13%"
-content-max-width        = "70%" # 82
-pagetoc-fontsize         = "14.5px"
-sidebar-width            = "300px"
-menu-bar-height          = "40px"   # memu-bar = the bar on the top
-page-padding             = "20px"
-mobile-content-max-width = "98%"
-
-# layout
-content-padding           = "0 10px"
-content-main-margin-left  = "10%"
-content-main-margin-right = "10%"
-nav-chapters-max-width    = "auto"
-nav-chapters-min-width    = "auto"
-chapter-line-height       = "2em"
-section-line-height       = "1.5em"
-
-# if true, never read and touch the files in theme dir
+sidebar-width             = "280px"
+content-max-width         = "70%"
+content-main-margin-left  = "5%"
+content-main-margin-right = "5%"
+root-font-size            = "70%"
+# DO NOT CHANGE or you might overwrite the custom hbs file
 turn-off = true
 
-
 [preprocessor.admonish]
 command = "mdbook-admonish"
 assets_version = "3.0.0" # do not edit: managed by `mdbook-admonish install`
 
-# variables preprocessor: import variables into files
 # https://gitlab.com/tglman/mdbook-variables/
 [preprocessor.variables.variables]
 minimum_rust_version = "1.66"
 wallet_release_version = "1.2.8"
-
 # nym-vpn related variables
 nym_vpn_latest_binary_url = "https://github.com/nymtech/nym/releases/tag/nym-vpn-alpha-0.0.3"
 nym_vpn_form_url = "https://opnform.com/forms/nymvpn-user-research-at-37c3-yccqko-2"
@@ -59,10 +38,11 @@ nym_vpn_form_url = "https://opnform.com/forms/nymvpn-user-research-at-37c3-yccqk
 command = "mdbook-last-changed"
 renderer = ["html"]
 
-# used for grabbing output of binary commands for automation
-# https://github.com/FauconFan/mdbook-cmdrun
+# used for grabbing output of binary commands for automation https://github.com/FauconFan/mdbook-cmdrun
 [preprocessor.cmdrun]
 
+# more pre-processor plugins to look into from https://github.com/rust-lang/mdBook/wiki/Third-party-plugins & https://lib.rs/keywords/mdbook-preprocessor
+# mdbook-i18n
 
 #########
 # BUILD #
@@ -79,19 +59,16 @@ extra-watch-dirs = []             # directories to watch for triggering builds
 ##########
 
 [output.html]
+theme         = "nym_themes"
 default-theme = "coal"
 preferred-dark-theme = "coal"
 curly-quotes = true
-# mathjax-support = false # useful if we want to pull equations in ?
 copy-fonts = true
 no-section-label = false
-additional-css = ["theme/pagetoc.css", "././mdbook-admonish.css", "custom.css", "./mdbook-admonish.css"]
-additional-js  = ["theme/pagetoc.js"]
+additional-css = ["./nym_themes/custom.css", "./nym_themes/mdbook-admonish.css", "./nym_themes/pagetoc.css"]
+additional-js  = ["./nym_themes/pagetoc.js"]
 git-repository-url = "https://github.com/nymtech/nym"
 git-repository-icon = "fa-github"
-# edit-url-template = "https://github.com/rust-lang/mdBook/edit/master/guide/{path}"
-site-url = "/developers/"
-# cname = "nymtech.net"
 input-404 = "not-found.md"
 
 [output.html.fold]
@@ -103,7 +80,7 @@ level = 0        # the depth to start folding
 editable = false         # allows editing the source code
 copyable = true          # include the copy button for copying code snippets
 copy-js = true           # includes the JavaScript for the code editor
-line-numbers = false     # displays line numbers for editable code
+line-numbers = true      # displays line numbers for editable code
 runnable = true          # displays a run button for rust code
 
 # options for the built in text search
diff --git a/documentation/dev-portal/custom.css b/documentation/dev-portal/custom.css
deleted file mode 100644
index 855f5eef5f..0000000000
--- a/documentation/dev-portal/custom.css
+++ /dev/null
@@ -1,37 +0,0 @@
-:root {
-  --mono-font: Consolas, "Ubuntu Mono", Menlo, "DejaVu Sans Mono", monospace;
-}
-.coal {
-  --bg: #121726;
-  --fg: #f2f2f2;
-
-  --sidebar-bg: #121726;
-  --sidebar-fg: #f2f2f2;
-  --sidebar-active: #fb6e4e;
-
-  --icons: #f2f2f2;
-  --icons-hover: #fb6e4e;
-
-  --links: #fb6e4e;
-}
-
-.light {
-  --bg: #f4f6f8;
-  --fg: #121726;
-
-  --sidebar-bg: #f4f6f8;
-  --sidebar-fg: #121726;
-  --sidebar-active: #fb6e4e;
-
-  --icons: #121726;
-  --icons-hover: #fb6e4e;
-
-  --links: #fb6e4e;
-}
-
-footer {
-  font-size: 0.8em;
-  text-align: center;
-  border-top: 1px solid black;
-  padding: 5px 0;
-}
diff --git a/documentation/operators/theme/css/chrome.css b/documentation/dev-portal/nym_themes/css/chrome.css
similarity index 69%
rename from documentation/operators/theme/css/chrome.css
rename to documentation/dev-portal/nym_themes/css/chrome.css
index febd1d40a6..a0e30b81ff 100644
--- a/documentation/operators/theme/css/chrome.css
+++ b/documentation/dev-portal/nym_themes/css/chrome.css
@@ -2,12 +2,6 @@
 
 @import 'variables.css';
 
-::-webkit-scrollbar {
-    background: var(--bg);
-}
-::-webkit-scrollbar-thumb {
-    background: var(--scrollbar);
-}
 html {
     scrollbar-color: var(--scrollbar) var(--bg);
 }
@@ -18,6 +12,19 @@ a > .hljs {
     color: var(--links);
 }
 
+/*
+    body-container is necessary because mobile browsers don't seem to like
+    overflow-x on the body tag when there is a <meta name="viewport"> tag.
+*/
+#body-container {
+    /*
+        This is used when the sidebar pushes the body content off the side of
+        the screen on small screens. Without it, dragging on mobile Safari
+        will want to reposition the viewport in a weird way.
+    */
+    overflow-x: clip;
+}
+
 /* Menu Bar */
 
 #menu-bar,
@@ -30,9 +37,9 @@ a > .hljs {
     display: flex;
     flex-wrap: wrap;
     background-color: var(--bg);
-    border-bottom-color: var(--bg);
-    border-bottom-width: 1px;
-    border-bottom-style: solid;
+    border-block-end-color: var(--bg);
+    border-block-end-width: 1px;
+    border-block-end-style: solid;
 }
 #menu-bar.sticky,
 .js #menu-bar-hover-placeholder:hover + #menu-bar,
@@ -49,7 +56,7 @@ a > .hljs {
     height: var(--menu-bar-height);
 }
 #menu-bar.bordered {
-    border-bottom-color: var(--table-border-color);
+    border-block-end-color: var(--table-border-color);
 }
 #menu-bar i, #menu-bar .icon-button {
     position: relative;
@@ -86,11 +93,13 @@ a > .hljs {
     display: flex;
     margin: 0 5px;
 }
-.no-js .left-buttons {
+.no-js .left-buttons button {
     display: none;
 }
 
 .menu-title {
+    position: absolute;
+    left: 50%;
     display: inline-block;
     font-weight: 200;
     font-size: 2.4rem;
@@ -153,7 +162,7 @@ a > .hljs {
 }
 
 .nav-wrapper {
-    margin-top: 50px;
+    margin-block-start: 50px;
     display: none;
 }
 
@@ -166,23 +175,34 @@ a > .hljs {
     background-color: var(--sidebar-bg);
 }
 
-.previous {
-    float: left;
-}
+/* Only Firefox supports flow-relative values */
+.previous { float: left; }
+[dir=rtl] .previous { float: right; }
 
+/* Only Firefox supports flow-relative values */
 .next {
     float: right;
     right: var(--page-padding);
 }
+[dir=rtl] .next {
+    float: left;
+    right: unset;
+    left: var(--page-padding);
+}
+
+/* Use the correct buttons for RTL layouts*/
+[dir=rtl] .previous i.fa-angle-left:before {content:"\f105";}
+[dir=rtl] .next i.fa-angle-right:before { content:"\f104"; }
 
 @media only screen and (max-width: 1080px) {
     .nav-wide-wrapper { display: none; }
     .nav-wrapper { display: block; }
 }
 
+/* sidebar-visible */
 @media only screen and (max-width: 1380px) {
-    .sidebar-visible .nav-wide-wrapper { display: none; }
-    .sidebar-visible .nav-wrapper { display: block; }
+    #sidebar-toggle-anchor:checked ~ .page-wrapper .nav-wide-wrapper { display: none; }
+    #sidebar-toggle-anchor:checked ~ .page-wrapper .nav-wrapper { display: block; }
 }
 
 /* Inline code */
@@ -229,7 +249,7 @@ pre > .buttons :hover {
     background-color: var(--theme-hover);
 }
 pre > .buttons i {
-    margin-left: 8px;
+    margin-inline-start: 8px;
 }
 pre > .buttons button {
     cursor: inherit;
@@ -251,8 +271,14 @@ pre > .buttons button {
         /* On mobile, make it easier to tap buttons. */
         padding: 0.3rem 1rem;
     }
+
+    .sidebar-resize-indicator {
+        /* Hide resize indicator on devices with limited accuracy */
+        display: none;
+    }
 }
 pre > code {
+    display: block;
     padding: 1rem;
 }
 
@@ -266,7 +292,7 @@ pre > code {
 }
 
 pre > .result {
-    margin-top: 10px;
+    margin-block-start: 10px;
 }
 
 /* Search */
@@ -277,8 +303,14 @@ pre > .result {
 
 mark {
     border-radius: 2px;
-    padding: 0 3px 1px 3px;
-    margin: 0 -3px -1px -3px;
+    padding-block-start: 0;
+    padding-block-end: 1px;
+    padding-inline-start: 3px;
+    padding-inline-end: 3px;
+    margin-block-start: 0;
+    margin-block-end: -1px;
+    margin-inline-start: -3px;
+    margin-inline-end: -3px;
     background-color: var(--search-mark-bg);
     transition: background-color 300ms linear;
     cursor: pointer;
@@ -290,14 +322,17 @@ mark.fade-out {
 }
 
 .searchbar-outer {
-    margin-left: auto;
-    margin-right: auto;
+    margin-inline-start: auto;
+    margin-inline-end: auto;
     max-width: var(--content-max-width);
 }
 
 #searchbar {
     width: 100%;
-    margin: 5px auto 0px auto;
+    margin-block-start: 5px;
+    margin-block-end: 0;
+    margin-inline-start: auto;
+    margin-inline-end: auto;
     padding: 10px 16px;
     transition: box-shadow 300ms ease-in-out;
     border: 1px solid var(--searchbar-border-color);
@@ -313,20 +348,23 @@ mark.fade-out {
 .searchresults-header {
     font-weight: bold;
     font-size: 1em;
-    padding: 18px 0 0 5px;
+    padding-block-start: 18px;
+    padding-block-end: 0;
+    padding-inline-start: 5px;
+    padding-inline-end: 0;
     color: var(--searchresults-header-fg);
 }
 
 .searchresults-outer {
-    margin-left: auto;
-    margin-right: auto;
+    margin-inline-start: auto;
+    margin-inline-end: auto;
     max-width: var(--content-max-width);
-    border-bottom: 1px dashed var(--searchresults-border-color);
+    border-block-end: 1px dashed var(--searchresults-border-color);
 }
 
 ul#searchresults {
     list-style: none;
-    padding-left: 20px;
+    padding-inline-start: 20px;
 }
 ul#searchresults li {
     margin: 10px 0px;
@@ -339,7 +377,10 @@ ul#searchresults li.focus {
 ul#searchresults span.teaser {
     display: block;
     clear: both;
-    margin: 5px 0 0 20px;
+    margin-block-start: 5px;
+    margin-block-end: 0;
+    margin-inline-start: 20px;
+    margin-inline-end: 0;
     font-size: 0.8em;
 }
 ul#searchresults span.teaser em {
@@ -355,19 +396,21 @@ ul#searchresults span.teaser em {
     top: 0;
     bottom: 0;
     width: var(--sidebar-width);
-    font-size: 1em;
+    font-size: 0.85em;
     box-sizing: border-box;
     -webkit-overflow-scrolling: touch;
     overscroll-behavior-y: contain;
     background-color: var(--sidebar-bg);
     color: var(--sidebar-fg);
 }
+[dir=rtl] .sidebar { left: unset; right: 0; }
 .sidebar-resizing {
     -moz-user-select: none;
     -webkit-user-select: none;
     -ms-user-select: none;
     user-select: none;
 }
+.no-js .sidebar,
 .js:not(.sidebar-resizing) .sidebar {
     transition: transform 0.3s; /* Animation: slide away */
 }
@@ -387,16 +430,35 @@ ul#searchresults span.teaser em {
     position: absolute;
     cursor: col-resize;
     width: 0;
-    right: 0;
+    right: calc(var(--sidebar-resize-indicator-width) * -1);
     top: 0;
     bottom: 0;
+    display: flex;
+    align-items: center;
+}
+
+.sidebar-resize-handle .sidebar-resize-indicator {
+    width: 100%;
+    height: 12px;
+    background-color: var(--icons);
+    margin-inline-start: var(--sidebar-resize-indicator-space);
+}
+
+[dir=rtl] .sidebar .sidebar-resize-handle {
+    left: calc(var(--sidebar-resize-indicator-width) * -1);
+    right: unset;
 }
 .js .sidebar .sidebar-resize-handle {
     cursor: col-resize;
-    width: 5px;
+    width: calc(var(--sidebar-resize-indicator-width) - var(--sidebar-resize-indicator-space));
 }
-.sidebar-hidden .sidebar {
-    transform: translateX(calc(0px - var(--sidebar-width)));
+/* sidebar-hidden */
+#sidebar-toggle-anchor:not(:checked) ~ .sidebar {
+    transform: translateX(calc(0px - var(--sidebar-width) - var(--sidebar-resize-indicator-width)));
+    z-index: -1;
+}
+[dir=rtl] #sidebar-toggle-anchor:not(:checked) ~ .sidebar {
+    transform: translateX(calc(var(--sidebar-width) + var(--sidebar-resize-indicator-width)));
 }
 .sidebar::-webkit-scrollbar {
     background: var(--sidebar-bg);
@@ -405,19 +467,26 @@ ul#searchresults span.teaser em {
     background: var(--scrollbar);
 }
 
-.sidebar-visible .page-wrapper {
-    transform: translateX(var(--sidebar-width));
+/* sidebar-visible */
+#sidebar-toggle-anchor:checked ~ .page-wrapper {
+    transform: translateX(calc(var(--sidebar-width) + var(--sidebar-resize-indicator-width)));
+}
+[dir=rtl] #sidebar-toggle-anchor:checked ~ .page-wrapper {
+    transform: translateX(calc(0px - var(--sidebar-width) - var(--sidebar-resize-indicator-width)));
 }
 @media only screen and (min-width: 620px) {
-    .sidebar-visible .page-wrapper {
+    #sidebar-toggle-anchor:checked ~ .page-wrapper {
+        transform: none;
+        margin-inline-start: calc(var(--sidebar-width) + var(--sidebar-resize-indicator-width));
+    }
+    [dir=rtl] #sidebar-toggle-anchor:checked ~ .page-wrapper {
         transform: none;
-        margin-left: var(--sidebar-width);
     }
 }
 
 .chapter {
     list-style: none outside none;
-    padding-left: 0;
+    padding-inline-start: 0;
     line-height: 2em;
 }
 
@@ -447,7 +516,7 @@ ul#searchresults span.teaser em {
 .chapter li > a.toggle {
     cursor: pointer;
     display: block;
-    margin-left: auto;
+    margin-inline-start: auto;
     padding: 0 10px;
     user-select: none;
     opacity: 0.68;
@@ -464,7 +533,7 @@ ul#searchresults span.teaser em {
 
 .chapter li.chapter-item {
     line-height: 1.5em;
-    margin-top: 0.6em;
+    margin-block-start: 0.6em;
 }
 
 .chapter li.expanded > a.toggle div {
@@ -487,7 +556,7 @@ ul#searchresults span.teaser em {
 
 .section {
     list-style: none outside none;
-    padding-left: 20px;
+    padding-inline-start: 20px;
     line-height: 1.5em;
 }
 
@@ -510,6 +579,7 @@ ul#searchresults span.teaser em {
     /* Don't let the children's background extend past the rounded corners. */
     overflow: hidden;
 }
+[dir=rtl] .theme-popup { left: unset;  right: 10px; }
 .theme-popup .default {
     color: var(--icons);
 }
@@ -520,7 +590,7 @@ ul#searchresults span.teaser em {
     padding: 2px 20px;
     line-height: 25px;
     white-space: nowrap;
-    text-align: left;
+    text-align: start;
     cursor: pointer;
     color: inherit;
     background: inherit;
@@ -533,6 +603,6 @@ ul#searchresults span.teaser em {
 .theme-selected::before {
     display: inline-block;
     content: "✓";
-    margin-left: -14px;
+    margin-inline-start: -14px;
     width: 14px;
 }
diff --git a/documentation/docs/theme/css/general.css b/documentation/dev-portal/nym_themes/css/general.css
similarity index 76%
rename from documentation/docs/theme/css/general.css
rename to documentation/dev-portal/nym_themes/css/general.css
index a06db43965..df8c1d12d2 100644
--- a/documentation/docs/theme/css/general.css
+++ b/documentation/dev-portal/nym_themes/css/general.css
@@ -5,6 +5,7 @@
 :root {
     /* Browser default font-size is 16px, this way 1 rem = 10px */
     font-size: 70%;
+    color-scheme: var(--color-scheme);
 }
 
 html {
@@ -24,6 +25,7 @@ body {
 code {
     font-family: var(--mono-font) !important;
     font-size: 0.9em;
+    direction: ltr !important;
 }
 
 /* make long words/inline code not x overflow */
@@ -47,13 +49,13 @@ h1 code, h2 code, h3 code, h4 code, h5 code, h6 code {
 .hide-boring .boring { display: none; }
 .hidden { display: none !important; }
 
-h2, h3 { margin-top: 2.5em; }
-h4, h5 { margin-top: 2em; }
+h2, h3 { margin-block-start: 2.5em; }
+h4, h5 { margin-block-start: 2em; }
 
 .header + .header h3,
 .header + .header h4,
 .header + .header h5 {
-    margin-top: 1em;
+    margin-block-start: 1em;
 }
 
 h1:target::before,
@@ -64,7 +66,7 @@ h5:target::before,
 h6:target::before {
     display: inline-block;
     content: "»";
-    margin-left: -30px;
+    margin-inline-start: -30px;
     width: 30px;
 }
 
@@ -73,28 +75,34 @@ h6:target::before {
    https://bugs.webkit.org/show_bug.cgi?id=218076
 */
 :target {
+    /* Safari does not support logical properties */
     scroll-margin-top: calc(var(--menu-bar-height) + 0.5em);
 }
 
 .page {
     outline: 0;
     padding: 0 var(--page-padding);
-    margin-top: calc(0px - var(--menu-bar-height)); /* Compensate for the #menu-bar-hover-placeholder */
+    margin-block-start: calc(0px - var(--menu-bar-height)); /* Compensate for the #menu-bar-hover-placeholder */
 }
 .page-wrapper {
     box-sizing: border-box;
+    background-color: var(--bg);
 }
+.no-js .page-wrapper,
 .js:not(.sidebar-resizing) .page-wrapper {
     transition: margin-left 0.3s ease, transform 0.3s ease; /* Animation: slide away */
 }
+[dir=rtl] .js:not(.sidebar-resizing) .page-wrapper {
+    transition: margin-right 0.3s ease, transform 0.3s ease; /* Animation: slide away */
+}
 
 .content {
     overflow-y: auto;
     padding: 0 10px;
 }
 .content main {
-    margin-left: 10%;
-    margin-right: 10%;
+    margin-inline-start: auto;
+    margin-inline-end: auto;
     max-width: var(--content-max-width);
 }
 .content p { line-height: 1.45em; }
@@ -144,8 +152,31 @@ blockquote {
     padding: 0 20px;
     color: var(--fg);
     background-color: var(--quote-bg);
-    border-top: .1em solid var(--quote-border);
-    border-bottom: .1em solid var(--quote-border);
+    border-block-start: .1em solid var(--quote-border);
+    border-block-end: .1em solid var(--quote-border);
+}
+
+.warning {
+    margin: 20px;
+    padding: 0 20px;
+    border-inline-start: 2px solid var(--warning-border);
+}
+
+.warning:before {
+    position: absolute;
+    width: 3rem;
+    height: 3rem;
+    margin-inline-start: calc(-1.5rem - 21px);
+    content: "ⓘ";
+    text-align: center;
+    background-color: var(--bg);
+    color: var(--warning-border);
+    font-weight: bold;
+    font-size: 2rem;
+}
+
+blockquote .warning:before {
+    background-color: var(--quote-bg);
 }
 
 kbd {
@@ -163,7 +194,7 @@ kbd {
 
 :not(.footnote-definition) + .footnote-definition,
 .footnote-definition + :not(.footnote-definition) {
-    margin-top: 2em;
+    margin-block-start: 2em;
 }
 .footnote-definition {
     font-size: 0.9em;
diff --git a/documentation/dev-portal/theme/css/variables.css b/documentation/dev-portal/nym_themes/css/variables.css
similarity index 92%
rename from documentation/dev-portal/theme/css/variables.css
rename to documentation/dev-portal/nym_themes/css/variables.css
index f8fa4cfd90..51b94cfc5a 100644
--- a/documentation/dev-portal/theme/css/variables.css
+++ b/documentation/dev-portal/nym_themes/css/variables.css
@@ -2,9 +2,11 @@
 /* Globals */
 
 :root {
-    --sidebar-width: 300px;
-    --page-padding: 20px;
-    --content-max-width: 70%;
+    --sidebar-width: 280px;
+    --sidebar-resize-indicator-width: 8px;
+    --sidebar-resize-indicator-space: 2px;
+    --page-padding: 15px;
+    --content-max-width: 80%;
     --menu-bar-height: 40px;
     --mono-font: "Source Code Pro", Consolas, "Ubuntu Mono", Menlo, "DejaVu Sans Mono", monospace, monospace;
     --code-font-size: 0.875em /* please adjust the ace font size accordingly in editor.js */
@@ -18,36 +20,6 @@
   }
 }
 
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
 /* Themes */
 
 .ayu {
@@ -76,6 +48,8 @@
     --quote-bg: hsl(226, 15%, 17%);
     --quote-border: hsl(226, 15%, 22%);
 
+    --warning-border: #ff8e00;
+
     --table-border-color: hsl(210, 25%, 13%);
     --table-header-bg: hsl(210, 25%, 28%);
     --table-alternate-bg: hsl(210, 25%, 11%);
@@ -88,6 +62,8 @@
     --searchresults-border-color: #888;
     --searchresults-li-bg: #252932;
     --search-mark-bg: #e3b171;
+
+    --color-scheme: dark;
 }
 
 .coal {
@@ -116,6 +92,8 @@
     --quote-bg: hsl(234, 21%, 18%);
     --quote-border: hsl(234, 21%, 23%);
 
+    --warning-border: #ff8e00;
+
     --table-border-color: hsl(200, 7%, 13%);
     --table-header-bg: hsl(200, 7%, 28%);
     --table-alternate-bg: hsl(200, 7%, 11%);
@@ -128,6 +106,8 @@
     --searchresults-border-color: #98a3ad;
     --searchresults-li-bg: #2b2b2f;
     --search-mark-bg: #355c7d;
+
+    --color-scheme: dark;
 }
 
 .light {
@@ -156,6 +136,8 @@
     --quote-bg: hsl(197, 37%, 96%);
     --quote-border: hsl(197, 37%, 91%);
 
+    --warning-border: #ff8e00;
+
     --table-border-color: hsl(0, 0%, 95%);
     --table-header-bg: hsl(0, 0%, 80%);
     --table-alternate-bg: hsl(0, 0%, 97%);
@@ -168,6 +150,8 @@
     --searchresults-border-color: #888;
     --searchresults-li-bg: #e4f2fe;
     --search-mark-bg: #a2cff5;
+
+    --color-scheme: light;
 }
 
 .navy {
@@ -196,6 +180,8 @@
     --quote-bg: hsl(226, 15%, 17%);
     --quote-border: hsl(226, 15%, 22%);
 
+    --warning-border: #ff8e00;
+
     --table-border-color: hsl(226, 23%, 16%);
     --table-header-bg: hsl(226, 23%, 31%);
     --table-alternate-bg: hsl(226, 23%, 14%);
@@ -208,6 +194,8 @@
     --searchresults-border-color: #5c5c68;
     --searchresults-li-bg: #242430;
     --search-mark-bg: #a2cff5;
+
+    --color-scheme: dark;
 }
 
 .rust {
@@ -236,6 +224,8 @@
     --quote-bg: hsl(60, 5%, 75%);
     --quote-border: hsl(60, 5%, 70%);
 
+    --warning-border: #ff8e00;
+
     --table-border-color: hsl(60, 9%, 82%);
     --table-header-bg: #b3a497;
     --table-alternate-bg: hsl(60, 9%, 84%);
@@ -248,6 +238,8 @@
     --searchresults-border-color: #888;
     --searchresults-li-bg: #dec2a2;
     --search-mark-bg: #e69f67;
+
+    --color-scheme: light;
 }
 
 @media (prefers-color-scheme: dark) {
@@ -277,6 +269,8 @@
         --quote-bg: hsl(234, 21%, 18%);
         --quote-border: hsl(234, 21%, 23%);
 
+        --warning-border: #ff8e00;
+
         --table-border-color: hsl(200, 7%, 13%);
         --table-header-bg: hsl(200, 7%, 28%);
         --table-alternate-bg: hsl(200, 7%, 11%);
diff --git a/documentation/dev-portal/nym_themes/custom.css b/documentation/dev-portal/nym_themes/custom.css
new file mode 100644
index 0000000000..35840fabec
--- /dev/null
+++ b/documentation/dev-portal/nym_themes/custom.css
@@ -0,0 +1,54 @@
+:root {
+  --mono-font: Consolas, "Ubuntu Mono", Menlo, "DejaVu Sans Mono", monospace;
+}
+
+.coal {
+  --fg: #f2f2f2;
+  --sidebar-fg: #f2f2f2;
+  --sidebar-active: #fb6e4e;
+  --icons-hover: #fb6e4e;
+  --links: #fb6e4e;
+  ::selection {
+    color: #121726;
+    background-color: #c5573d;
+  }
+  select option {
+    background-color: #121726;
+  }
+}
+
+.light {
+  --sidebar-active: #fb6e4e;
+  --icons-hover: #fb6e4e;
+  --links: #fb6e4e;
+  ::selection {
+    color:#f2f2f2;
+    background-color: #c5573d;
+  }
+}
+
+/*properly centering the title given the additional header items*/
+.menu-title {
+  position: absolute;
+  left: 50%;
+}
+
+.menu-bar .a:hover,
+
+/*necessary because of ^*/
+.right-buttons {
+  position: absolute;
+  right: 0;
+}
+
+select {
+  font-size: 16px;
+}
+
+footer {
+  font-size: 0.8em;
+  text-align: center;
+  border-top: 1px solid black;
+  padding: 5px 0;
+}
+
diff --git a/documentation/dev-portal/nym_themes/index.hbs b/documentation/dev-portal/nym_themes/index.hbs
new file mode 100644
index 0000000000..b8115558e3
--- /dev/null
+++ b/documentation/dev-portal/nym_themes/index.hbs
@@ -0,0 +1,381 @@
+<!DOCTYPE HTML>
+<html lang="{{ language }}" class="{{ default_theme }}" dir="{{ text_direction }}">
+    <head>
+        <!-- Book generated using mdBook -->
+        <meta charset="UTF-8">
+        <title>{{ title }}</title>
+        {{#if is_print }}
+        <meta name="robots" content="noindex">
+        {{/if}}
+        {{#if base_url}}
+        <base href="{{ base_url }}">
+        {{/if}}
+
+
+        <!-- Custom HTML head -->
+        {{> head}}
+
+        <meta name="description" content="{{ description }}">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <meta name="theme-color" content="#ffffff">
+
+        {{#if favicon_svg}}
+        <link rel="icon" href="{{ path_to_root }}favicon.svg">
+        {{/if}}
+        {{#if favicon_png}}
+        <link rel="shortcut icon" href="{{ path_to_root }}favicon.png">
+        {{/if}}
+        <link rel="stylesheet" href="{{ path_to_root }}css/variables.css">
+        <link rel="stylesheet" href="{{ path_to_root }}css/general.css">
+        <link rel="stylesheet" href="{{ path_to_root }}css/chrome.css">
+        {{#if print_enable}}
+        <link rel="stylesheet" href="{{ path_to_root }}css/print.css" media="print">
+        {{/if}}
+
+        <!-- Fonts -->
+        <link rel="stylesheet" href="{{ path_to_root }}FontAwesome/css/font-awesome.css">
+        {{#if copy_fonts}}
+        <link rel="stylesheet" href="{{ path_to_root }}fonts/fonts.css">
+        {{/if}}
+
+        <!-- Highlight.js Stylesheets -->
+        <link rel="stylesheet" href="{{ path_to_root }}highlight.css">
+        <link rel="stylesheet" href="{{ path_to_root }}tomorrow-night.css">
+        <link rel="stylesheet" href="{{ path_to_root }}ayu-highlight.css">
+
+        <!-- Custom theme stylesheets -->
+        {{#each additional_css}}
+        <link rel="stylesheet" href="{{ ../path_to_root }}{{ this }}">
+        {{/each}}
+
+<!--        {{#if mathjax_support}}-->
+<!--        &lt;!&ndash; MathJax &ndash;&gt;-->
+<!--        <script async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>-->
+<!--        {{/if}}-->
+    </head>
+    <body class="sidebar-visible no-js">
+    <div id="body-container">
+        <!-- Provide site root to javascript -->
+        <script>
+            var path_to_root = "{{ path_to_root }}";
+            var default_theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? "{{ preferred_dark_theme }}" : "{{ default_theme }}";
+        </script>
+
+        <!-- Work around some values being stored in localStorage wrapped in quotes -->
+        <script>
+            try {
+                var theme = localStorage.getItem('mdbook-theme');
+                var sidebar = localStorage.getItem('mdbook-sidebar');
+
+                if (theme.startsWith('"') && theme.endsWith('"')) {
+                    localStorage.setItem('mdbook-theme', theme.slice(1, theme.length - 1));
+                }
+
+                if (sidebar.startsWith('"') && sidebar.endsWith('"')) {
+                    localStorage.setItem('mdbook-sidebar', sidebar.slice(1, sidebar.length - 1));
+                }
+            } catch (e) { }
+        </script>
+
+        <!-- Set the theme before any content is loaded, prevents flash -->
+        <script>
+            var theme;
+            try { theme = localStorage.getItem('mdbook-theme'); } catch(e) { }
+            if (theme === null || theme === undefined) { theme = default_theme; }
+            var html = document.querySelector('html');
+            html.classList.remove('{{ default_theme }}')
+            html.classList.add(theme);
+            var body = document.querySelector('body');
+            body.classList.remove('no-js')
+            body.classList.add('js');
+        </script>
+
+        <input type="checkbox" id="sidebar-toggle-anchor" class="hidden">
+
+        <!-- Hide / unhide sidebar before it is displayed -->
+        <script>
+            var body = document.querySelector('body');
+            var sidebar = null;
+            var sidebar_toggle = document.getElementById("sidebar-toggle-anchor");
+            if (document.body.clientWidth >= 1080) {
+                try { sidebar = localStorage.getItem('mdbook-sidebar'); } catch(e) { }
+                sidebar = sidebar || 'visible';
+            } else {
+                sidebar = 'hidden';
+            }
+            sidebar_toggle.checked = sidebar === 'visible';
+            body.classList.remove('sidebar-visible');
+            body.classList.add("sidebar-" + sidebar);
+        </script>
+
+        <nav id="sidebar" class="sidebar" aria-label="Table of contents">
+            <div class="sidebar-scrollbox">
+                {{#toc}}{{/toc}}
+            </div>
+            <div id="sidebar-resize-handle" class="sidebar-resize-handle">
+                <div class="sidebar-resize-indicator"></div>
+            </div>
+        </nav>
+
+        <!-- Track and set sidebar scroll position -->
+        <script>
+            var sidebarScrollbox = document.querySelector('#sidebar .sidebar-scrollbox');
+            sidebarScrollbox.addEventListener('click', function(e) {
+                if (e.target.tagName === 'A') {
+                    sessionStorage.setItem('sidebar-scroll', sidebarScrollbox.scrollTop);
+                }
+            }, { passive: true });
+            var sidebarScrollTop = sessionStorage.getItem('sidebar-scroll');
+            sessionStorage.removeItem('sidebar-scroll');
+            if (sidebarScrollTop) {
+                // preserve sidebar scroll position when navigating via links within sidebar
+                sidebarScrollbox.scrollTop = sidebarScrollTop;
+            } else {
+                // scroll sidebar to current active section when navigating via "next/previous chapter" buttons
+                var activeSection = document.querySelector('#sidebar .active');
+                if (activeSection) {
+                    activeSection.scrollIntoView({ block: 'center' });
+                }
+            }
+        </script>
+
+        <div id="page-wrapper" class="page-wrapper">
+
+            <div class="page">
+                {{> header}}
+                <div id="menu-bar-hover-placeholder"></div>
+                <div id="menu-bar" class="menu-bar sticky">
+                    <div class="left-buttons">
+                        <label id="sidebar-toggle" class="icon-button" for="sidebar-toggle-anchor" title="Toggle Table of Contents" aria-label="Toggle Table of Contents" aria-controls="sidebar">
+                            <i class="fa fa-bars"></i>
+                        </label>
+
+                        <button id="theme-toggle" class="icon-button" type="button" title="Change theme" aria-label="Change theme" aria-haspopup="true" aria-expanded="false" aria-controls="theme-list">
+                            <i class="fa fa-paint-brush"></i>
+                        </button>
+                        <ul id="theme-list" class="theme-popup" aria-label="Themes" role="menu">
+                            <li role="none"><button role="menuitem" class="theme" id="light">Light</button></li>
+                            <li role="none"><button role="menuitem" class="theme" id="coal">Dark</button></li>
+                        </ul>
+
+                        <!-- CUSTOM -->
+                        <select id="dropdown-menu3" class="icon-button">
+                            <option value="">Network Protocol</option>
+                            <option value="https://nymtech.net/docs">Network Docs</option>
+                            <option value="https://nymtech.net/learn/papers">Academic Papers</option>
+                        </select>
+
+                        <select id="dropdown-menu" class="icon-button">
+                            <option value="">Developer Docs</option>
+                            <option value="https://nymtech.net/developers">Dev Portal</option>
+                            <option value="https://nymtech.net/docs/sdk/rust/rust.html">Rust SDK</option>
+                            <option value="https://sdk.nymtech.net">Typescript SDK</option>
+                        </select>
+
+                        <select id="dropdown-menu2" class="icon-button">
+                            <option value="">Setup Guides</option>
+                            <option value="https://nymtech.net/operators">Operators</option>
+                            <option value="https://nymtech.net/developers/nymvpn/intro.html">NymVPN Testing</option>
+                        </select>
+
+                        <script>
+                            document.getElementById('dropdown-menu').addEventListener('change', function() {
+                                const selected = this.options[this.selectedIndex];
+                                if (selected.value !== '') {
+                                    window.location.href = selected.value;
+                                }
+                            });
+                        </script>
+
+                        <script>
+                            document.getElementById('dropdown-menu2').addEventListener('change', function() {
+                                const selected = this.options[this.selectedIndex];
+                                if (selected.value !== '') {
+                                    window.location.href = selected.value;
+                                }
+                            });
+                        </script>
+
+                        <script>
+                            document.getElementById('dropdown-menu3').addEventListener('change', function() {
+                                const selected = this.options[this.selectedIndex];
+                                if (selected.value !== '') {
+                                    window.location.href = selected.value;
+                                }
+                            });
+                        </script>
+                        <!-- END CUSTOM -->
+                    </div>
+
+                    <h1 class="menu-title"> {{ book_title }}</h1>
+
+                    <div class="right-buttons">
+                        {{#if search_enabled}}
+                            <button id="search-toggle" class="icon-button" type="button" title="Search. (Shortkey: s)" aria-label="Toggle Searchbar" aria-expanded="false" aria-keyshortcuts="S" aria-controls="searchbar">
+                                <i class="fa fa-search"></i>
+                            </button>
+                        {{/if}}
+                        {{#if print_enable}}
+                        <a href="{{ path_to_root }}print.html" title="Print this book" aria-label="Print this book">
+                            <i id="print-button" class="fa fa-print"></i>
+                        </a>
+                        {{/if}}
+                        {{#if git_repository_url}}
+                        <a href="{{git_repository_url}}" title="Git repository" aria-label="Git repository">
+                            <i id="git-repository-button" class="fa {{git_repository_icon}}"></i>
+                        </a>
+                        {{/if}}
+                        {{#if git_repository_edit_url}}
+                        <a href="{{git_repository_edit_url}}" title="Suggest an edit" aria-label="Suggest an edit">
+                            <i id="git-edit-button" class="fa fa-edit"></i>
+                        </a>
+                        {{/if}}
+
+                    </div>
+                </div>
+
+                {{#if search_enabled}}
+                <div id="search-wrapper" class="hidden">
+                    <form id="searchbar-outer" class="searchbar-outer">
+                        <input type="search" id="searchbar" name="searchbar" placeholder="Search this book ..." aria-controls="searchresults-outer" aria-describedby="searchresults-header">
+                    </form>
+                    <div id="searchresults-outer" class="searchresults-outer hidden">
+                        <div id="searchresults-header" class="searchresults-header"></div>
+                        <ul id="searchresults">
+                        </ul>
+                    </div>
+                </div>
+                {{/if}}
+
+                <!-- Apply ARIA attributes after the sidebar and the sidebar toggle button are added to the DOM -->
+                <script>
+                    document.getElementById('sidebar-toggle').setAttribute('aria-expanded', sidebar === 'visible');
+                    document.getElementById('sidebar').setAttribute('aria-hidden', sidebar !== 'visible');
+                    Array.from(document.querySelectorAll('#sidebar a')).forEach(function(link) {
+                        link.setAttribute('tabIndex', sidebar === 'visible' ? 0 : -1);
+                    });
+                </script>
+
+                <div id="content" class="content">
+                    <main>
+                        <main>
+                            <div class="content-wrap">
+                        {{{ content }}}
+                            </div>
+                            <div class="sidetoc">
+                                <nav class="pagetoc"></nav>
+                            </div>
+                        </main>
+                    </main>
+
+                    <nav class="nav-wrapper" aria-label="Page navigation">
+                        <!-- Mobile navigation buttons -->
+                        {{#previous}}
+                            <a rel="prev" href="{{ path_to_root }}{{link}}" class="mobile-nav-chapters previous" title="Previous chapter" aria-label="Previous chapter" aria-keyshortcuts="Left">
+                                <i class="fa fa-angle-left"></i>
+                            </a>
+                        {{/previous}}
+
+                        {{#next}}
+                            <a rel="next prefetch" href="{{ path_to_root }}{{link}}" class="mobile-nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
+                                <i class="fa fa-angle-right"></i>
+                            </a>
+                        {{/next}}
+
+                        <div style="clear: both"></div>
+                    </nav>
+                </div>
+            </div>
+
+            <nav class="nav-wide-wrapper" aria-label="Page navigation">
+                {{#previous}}
+                    <a rel="prev" href="{{ path_to_root }}{{link}}" class="nav-chapters previous" title="Previous chapter" aria-label="Previous chapter" aria-keyshortcuts="Left">
+                        <i class="fa fa-angle-left"></i>
+                    </a>
+                {{/previous}}
+
+                {{#next}}
+                    <a rel="next prefetch" href="{{ path_to_root }}{{link}}" class="nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
+                        <i class="fa fa-angle-right"></i>
+                    </a>
+                {{/next}}
+            </nav>
+
+        </div>
+
+        {{#if live_reload_endpoint}}
+        <!-- Livereload script (if served using the cli tool) -->
+        <script>
+            const wsProtocol = location.protocol === 'https:' ? 'wss:' : 'ws:';
+            const wsAddress = wsProtocol + "//" + location.host + "/" + "{{{live_reload_endpoint}}}";
+            const socket = new WebSocket(wsAddress);
+            socket.onmessage = function (event) {
+                if (event.data === "reload") {
+                    socket.close();
+                    location.reload();
+                }
+            };
+
+            window.onbeforeunload = function() {
+                socket.close();
+            }
+        </script>
+        {{/if}}
+
+        {{#if playground_line_numbers}}
+        <script>
+            window.playground_line_numbers = true;
+        </script>
+        {{/if}}
+
+        {{#if playground_copyable}}
+        <script>
+            window.playground_copyable = true;
+        </script>
+        {{/if}}
+
+        {{#if playground_js}}
+        <script src="{{ path_to_root }}ace.js"></script>
+        <script src="{{ path_to_root }}editor.js"></script>
+        <script src="{{ path_to_root }}mode-rust.js"></script>
+        <script src="{{ path_to_root }}theme-dawn.js"></script>
+        <script src="{{ path_to_root }}theme-tomorrow_night.js"></script>
+        {{/if}}
+
+        {{#if search_js}}
+        <script src="{{ path_to_root }}elasticlunr.min.js"></script>
+        <script src="{{ path_to_root }}mark.min.js"></script>
+        <script src="{{ path_to_root }}searcher.js"></script>
+        {{/if}}
+
+        <script src="{{ path_to_root }}clipboard.min.js"></script>
+        <script src="{{ path_to_root }}highlight.js"></script>
+        <script src="{{ path_to_root }}book.js"></script>
+
+        <!-- Custom JS scripts -->
+        {{#each additional_js}}
+        <script src="{{ ../path_to_root }}{{this}}"></script>
+        {{/each}}
+
+        {{#if is_print}}
+        {{#if mathjax_support}}
+        <script>
+        window.addEventListener('load', function() {
+            MathJax.Hub.Register.StartupHook('End', function() {
+                window.setTimeout(window.print, 100);
+            });
+        });
+        </script>
+        {{else}}
+        <script>
+        window.addEventListener('load', function() {
+            window.setTimeout(window.print, 100);
+        });
+        </script>
+        {{/if}}
+        {{/if}}
+
+
+    </div>
+    </body>
+</html>
diff --git a/documentation/dev-portal/theme/index.hbs b/documentation/dev-portal/nym_themes/index.hbs.bak
similarity index 67%
rename from documentation/dev-portal/theme/index.hbs
rename to documentation/dev-portal/nym_themes/index.hbs.bak
index 5ce72962cb..d2a64dbc97 100644
--- a/documentation/dev-portal/theme/index.hbs
+++ b/documentation/dev-portal/nym_themes/index.hbs.bak
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML>
-<html lang="{{ language }}" class="sidebar-visible no-js {{ default_theme }}">
+<html lang="{{ language }}" class="{{ default_theme }}" dir="{{ text_direction }}">
     <head>
         <!-- Book generated using mdBook -->
         <meta charset="UTF-8">
         <title>{{ title }}</title>
         {{#if is_print }}
-        <meta name="robots" content="noindex" />
+        <meta name="robots" content="noindex">
         {{/if}}
         {{#if base_url}}
         <base href="{{ base_url }}">
@@ -17,7 +17,7 @@
 
         <meta name="description" content="{{ description }}">
         <meta name="viewport" content="width=device-width, initial-scale=1">
-        <meta name="theme-color" content="#ffffff" />
+        <meta name="theme-color" content="#ffffff">
 
         {{#if favicon_svg}}
         <link rel="icon" href="{{ path_to_root }}favicon.svg">
@@ -53,7 +53,8 @@
         <script async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
         {{/if}}
     </head>
-    <body>
+    <body class="sidebar-visible no-js">
+    <div id="body-container">
         <!-- Provide site root to javascript -->
         <script>
             var path_to_root = "{{ path_to_root }}";
@@ -82,61 +83,127 @@
             try { theme = localStorage.getItem('mdbook-theme'); } catch(e) { }
             if (theme === null || theme === undefined) { theme = default_theme; }
             var html = document.querySelector('html');
-            html.classList.remove('no-js')
             html.classList.remove('{{ default_theme }}')
             html.classList.add(theme);
-            html.classList.add('js');
+            var body = document.querySelector('body');
+            body.classList.remove('no-js')
+            body.classList.add('js');
         </script>
 
+        <input type="checkbox" id="sidebar-toggle-anchor" class="hidden">
+
         <!-- Hide / unhide sidebar before it is displayed -->
         <script>
-            var html = document.querySelector('html');
-            var sidebar = 'hidden';
+            var body = document.querySelector('body');
+            var sidebar = null;
+            var sidebar_toggle = document.getElementById("sidebar-toggle-anchor");
             if (document.body.clientWidth >= 1080) {
                 try { sidebar = localStorage.getItem('mdbook-sidebar'); } catch(e) { }
                 sidebar = sidebar || 'visible';
+            } else {
+                sidebar = 'hidden';
             }
-            html.classList.remove('sidebar-visible');
-            html.classList.add("sidebar-" + sidebar);
+            sidebar_toggle.checked = sidebar === 'visible';
+            body.classList.remove('sidebar-visible');
+            body.classList.add("sidebar-" + sidebar);
         </script>
 
         <nav id="sidebar" class="sidebar" aria-label="Table of contents">
             <div class="sidebar-scrollbox">
                 {{#toc}}{{/toc}}
             </div>
-            <div id="sidebar-resize-handle" class="sidebar-resize-handle"></div>
+            <div id="sidebar-resize-handle" class="sidebar-resize-handle">
+                <div class="sidebar-resize-indicator"></div>
+            </div>
         </nav>
 
+        <!-- Track and set sidebar scroll position -->
+        <script>
+            var sidebarScrollbox = document.querySelector('#sidebar .sidebar-scrollbox');
+            sidebarScrollbox.addEventListener('click', function(e) {
+                if (e.target.tagName === 'A') {
+                    sessionStorage.setItem('sidebar-scroll', sidebarScrollbox.scrollTop);
+                }
+            }, { passive: true });
+            var sidebarScrollTop = sessionStorage.getItem('sidebar-scroll');
+            sessionStorage.removeItem('sidebar-scroll');
+            if (sidebarScrollTop) {
+                // preserve sidebar scroll position when navigating via links within sidebar
+                sidebarScrollbox.scrollTop = sidebarScrollTop;
+            } else {
+                // scroll sidebar to current active section when navigating via "next/previous chapter" buttons
+                var activeSection = document.querySelector('#sidebar .active');
+                if (activeSection) {
+                    activeSection.scrollIntoView({ block: 'center' });
+                }
+            }
+        </script>
+
         <div id="page-wrapper" class="page-wrapper">
 
             <div class="page">
                 {{> header}}
                 <div id="menu-bar-hover-placeholder"></div>
-                <div id="menu-bar" class="menu-bar sticky bordered">
+                <div id="menu-bar" class="menu-bar sticky">
                     <div class="left-buttons">
-                        <button id="sidebar-toggle" class="icon-button" type="button" title="Toggle Table of Contents" aria-label="Toggle Table of Contents" aria-controls="sidebar">
+                        <label id="sidebar-toggle" class="icon-button" for="sidebar-toggle-anchor" title="Toggle Table of Contents" aria-label="Toggle Table of Contents" aria-controls="sidebar">
                             <i class="fa fa-bars"></i>
-                        </button>
+                        </label>
+
+                        <!-- TODO remove weird padding here -->
                         <button id="theme-toggle" class="icon-button" type="button" title="Change theme" aria-label="Change theme" aria-haspopup="true" aria-expanded="false" aria-controls="theme-list">
                             <i class="fa fa-paint-brush"></i>
                         </button>
                         <ul id="theme-list" class="theme-popup" aria-label="Themes" role="menu">
                             <li role="none"><button role="menuitem" class="theme" id="light">Light</button></li>
-                            <li role="none"><button role="menuitem" class="theme" id="rust">Rust</button></li>
-                            <li role="none"><button role="menuitem" class="theme" id="coal">Coal</button></li>
-                            <li role="none"><button role="menuitem" class="theme" id="navy">Navy</button></li>
-                            <li role="none"><button role="menuitem" class="theme" id="ayu">Ayu</button></li>
+                            <li role="none"><button role="menuitem" class="theme" id="coal">Dark</button></li>
                         </ul>
-                        {{#if search_enabled}}
-                        <button id="search-toggle" class="icon-button" type="button" title="Search. (Shortkey: s)" aria-label="Toggle Searchbar" aria-expanded="false" aria-keyshortcuts="S" aria-controls="searchbar">
-                            <i class="fa fa-search"></i>
-                        </button>
-                        {{/if}}
+
+                        <!-- CUSTOM -->
+                        <!-- TODO style when open -->
+                        <select id="dropdown-menu" class="icon-button">
+                            <option value="">SDKS</option>
+                            <option value="https://nymtech.net/docs/sdk/rust/rust.html">Rust</option>
+                            <option value="https://sdk.nymtech.net">Typescript</option>
+                        </select>
+
+                        <!-- TODO style when open -->
+                        <select id="dropdown-menu2" class="icon-button">
+                            <option value="">Doc Sites</option>
+                            <option value="https://nymtech.net/developers">Dev Portal</option>
+                            <option value="https://nymtech.net/docs/introduction.html">Network Docs</option>
+                            <option value="https://https://nymtech.net/operators">Operator Docs</option>
+                        </select>
+
+                        <script>
+                            document.getElementById('dropdown-menu').addEventListener('change', function() {
+                                const selected = this.options[this.selectedIndex];
+                                if (selected.value !== '') {
+                                    window.location.href = selected.value;
+                                }
+                            });
+                        </script>
+
+                        <script>
+                            document.getElementById('dropdown-menu2').addEventListener('change', function() {
+                                const selected = this.options[this.selectedIndex];
+                                if (selected.value !== '') {
+                                    window.location.href = selected.value;
+                                }
+                            });
+                        </script>
+                        <!-- END CUSTOM -->
+
                     </div>
 
                     <h1 class="menu-title">{{ book_title }}</h1>
 
                     <div class="right-buttons">
+                        {{#if search_enabled}}
+                            <button id="search-toggle" class="icon-button" type="button" title="Search. (Shortkey: s)" aria-label="Toggle Searchbar" aria-expanded="false" aria-keyshortcuts="S" aria-controls="searchbar">
+                                <i class="fa fa-search"></i>
+                            </button>
+                        {{/if}}
                         {{#if print_enable}}
                         <a href="{{ path_to_root }}print.html" title="Print this book" aria-label="Print this book">
                             <i id="print-button" class="fa fa-print"></i>
@@ -180,16 +247,14 @@
 
                 <div id="content" class="content">
                     <main>
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
+                        <main>
+                            <div class="content-wrap">
                         {{{ content }}}
+                            </div>
+                            <div class="sidetoc">
+                                <nav class="pagetoc"></nav>
+                            </div>
+                        </main>
                     </main>
 
                     <nav class="nav-wrapper" aria-label="Page navigation">
@@ -201,7 +266,7 @@
                         {{/previous}}
 
                         {{#next}}
-                            <a rel="next" href="{{ path_to_root }}{{link}}" class="mobile-nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
+                            <a rel="next prefetch" href="{{ path_to_root }}{{link}}" class="mobile-nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
                                 <i class="fa fa-angle-right"></i>
                             </a>
                         {{/next}}
@@ -219,7 +284,7 @@
                 {{/previous}}
 
                 {{#next}}
-                    <a rel="next" href="{{ path_to_root }}{{link}}" class="nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
+                    <a rel="next prefetch" href="{{ path_to_root }}{{link}}" class="nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
                         <i class="fa fa-angle-right"></i>
                     </a>
                 {{/next}}
@@ -246,25 +311,6 @@
         </script>
         {{/if}}
 
-        {{#if google_analytics}}
-        <!-- Google Analytics Tag -->
-        <script>
-            var localAddrs = ["localhost", "127.0.0.1", ""];
-
-            // make sure we don't activate google analytics if the developer is
-            // inspecting the book locally...
-            if (localAddrs.indexOf(document.location.hostname) === -1) {
-                (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-                (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-                m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-                })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-                ga('create', '{{google_analytics}}', 'auto');
-                ga('send', 'pageview');
-            }
-        </script>
-        {{/if}}
-
         {{#if playground_line_numbers}}
         <script>
             window.playground_line_numbers = true;
@@ -318,5 +364,7 @@
         {{/if}}
         {{/if}}
 
+
+    </div>
     </body>
 </html>
diff --git a/documentation/dev-portal/mdbook-admonish.css b/documentation/dev-portal/nym_themes/mdbook-admonish.css
similarity index 100%
rename from documentation/dev-portal/mdbook-admonish.css
rename to documentation/dev-portal/nym_themes/mdbook-admonish.css
diff --git a/documentation/dev-portal/nym_themes/pagetoc.css b/documentation/dev-portal/nym_themes/pagetoc.css
new file mode 100644
index 0000000000..651572ce55
--- /dev/null
+++ b/documentation/dev-portal/nym_themes/pagetoc.css
@@ -0,0 +1,101 @@
+:root {
+    --toc-width: 270px;
+    --center-content-toc-shift: calc(-1 * var(--toc-width) / 2);
+}
+
+.nav-chapters {
+    /* adjust width of buttons that bring to the previous or the next page */
+    min-width: 50px;
+}
+
+.previous {
+    /*
+    adjust the space between the left sidebar or the left side of the screen 
+    and the button that leads to the previous page
+    */
+    margin-left: var(--page-padding);
+}
+
+@media only screen {
+    main {
+        display: flex;
+    }
+
+    @media (max-width: 1179px) {
+        .sidebar-hidden .sidetoc {
+            display: none;
+        }
+    }
+
+    @media (max-width: 1439px) {
+        .sidebar-visible .sidetoc {
+            display: none;
+        }
+    }
+
+    @media (1180px <= width <= 1439px) {
+        .sidebar-hidden main {
+            position: relative;
+            left: var(--center-content-toc-shift);
+        }
+    }
+
+    @media (1440px <= width <= 1700px) {
+        .sidebar-visible main {
+            position: relative;
+            left: var(--center-content-toc-shift);
+        }
+    }
+
+    .content-wrap {
+        overflow-y: auto;
+        width: 100%;
+    }
+
+    .sidetoc {
+        margin-top: 20px;
+        margin-left: 10px;
+        margin-right: auto;
+    }
+    .pagetoc {
+        position: fixed;
+        /* adjust TOC width */
+        width: var(--toc-width);
+        height: calc(100vh - var(--menu-bar-height) - 0.67em * 4);
+        overflow: auto;
+    }
+    .pagetoc a {
+        border-left: 1px solid var(--sidebar-bg);
+        color: var(--fg) !important;
+        display: block;
+        padding-bottom: 5px;
+        padding-top: 5px;
+        padding-left: 10px;
+        text-align: left;
+        text-decoration: none;
+    }
+    .pagetoc a:hover,
+    .pagetoc a.active {
+        background: var(--sidebar-bg);
+        color: var(--sidebar-fg) !important;
+    }
+    .pagetoc .active {
+        background: var(--sidebar-bg);
+        color: var(--sidebar-fg);
+    }
+    .pagetoc .pagetoc-H2 {
+        padding-left: 20px;
+    }
+    .pagetoc .pagetoc-H3 {
+        padding-left: 40px;
+    }
+    .pagetoc .pagetoc-H4 {
+        padding-left: 60px;
+    }
+}
+
+@media print {
+    .sidetoc {
+        display: none;
+    }
+}
diff --git a/documentation/dev-portal/nym_themes/pagetoc.js b/documentation/dev-portal/nym_themes/pagetoc.js
new file mode 100644
index 0000000000..490d9e4c31
--- /dev/null
+++ b/documentation/dev-portal/nym_themes/pagetoc.js
@@ -0,0 +1,114 @@
+function forEach(elems, fun) {
+  Array.prototype.forEach.call(elems, fun);
+}
+
+function getPagetoc(){
+  return document.getElementsByClassName("pagetoc")[0]
+}
+
+function getPagetocElems() {
+  return getPagetoc().children;
+}
+
+function getHeaders(){
+  return document.getElementsByClassName("header")
+}
+
+// Un-active everything when you click it
+function forPagetocElem(fun) {
+  forEach(getPagetocElems(), fun);
+}
+
+function getRect(element) {
+  return element.getBoundingClientRect();
+}
+
+function overflowTop(container, element) {
+  return getRect(container).top - getRect(element).top;
+}
+
+function overflowBottom(container, element) {
+  return getRect(container).bottom - getRect(element).bottom;
+}
+
+var activeHref = location.href;
+
+var updateFunction = function (elem = undefined) {
+  var id = elem;
+
+  if (!id && location.href != activeHref) {
+    activeHref = location.href;
+    forPagetocElem(function (el) {
+      if (el.href === activeHref) {
+        id = el;
+      }
+    });
+  }
+
+  if (!id) {
+    var elements = getHeaders();
+    let margin = window.innerHeight / 3;
+
+    forEach(elements, function (el, i, arr) {
+      if (!id && getRect(el).top >= 0) {
+        if (getRect(el).top < margin) {
+          id = el;
+        } else {
+          id = arr[Math.max(0, i - 1)];
+        }
+      }
+      // a very long last section
+      // its heading is over the screen
+      if (!id && i == arr.length - 1) {
+        id = el
+      }
+    });
+  }
+
+  forPagetocElem(function (el) {
+    el.classList.remove("active");
+  });
+
+  if (!id) return;
+
+  forPagetocElem(function (el) {
+    if (id.href.localeCompare(el.href) == 0) {
+      el.classList.add("active");
+      let pagetoc = getPagetoc();
+      if (overflowTop(pagetoc, el) > 0) {
+        pagetoc.scrollTop = el.offsetTop;
+      }
+      if (overflowBottom(pagetoc, el) < 0) {
+        pagetoc.scrollTop -= overflowBottom(pagetoc, el);
+      }
+    }
+  });
+};
+
+let elements = getHeaders();
+
+if (elements.length > 1) {
+  // Populate sidebar on load
+  window.addEventListener("load", function () {
+    var pagetoc = getPagetoc();
+    var elements = getHeaders();
+    forEach(elements, function (el) {
+      var link = document.createElement("a");
+      link.appendChild(document.createTextNode(el.text));
+      link.href = el.hash;
+      link.classList.add("pagetoc-" + el.parentElement.tagName);
+      pagetoc.appendChild(link);
+      link.onclick = function () {
+        updateFunction(link);
+      };
+    });
+    updateFunction();
+  });
+
+  // Handle active elements on scroll
+  window.addEventListener("scroll", function () {
+    updateFunction();
+  });
+} else {
+  document.getElementsByClassName("sidetoc")[0].remove();
+}
diff --git a/documentation/dev-portal/src/nymvpn/gui-linux.md b/documentation/dev-portal/src/nymvpn/gui-linux.md
index 9b7d4cd6e8..4e79e90ebb 100644
--- a/documentation/dev-portal/src/nymvpn/gui-linux.md
+++ b/documentation/dev-portal/src/nymvpn/gui-linux.md
@@ -1,5 +1,7 @@
 # NymVPN alpha GUI: Guide for GNU/Linux
 
+<div style="padding:56.25% 0 0 0;position:relative;"><iframe src="https://player.vimeo.com/video/908221306?h=404b2bbdc8" style="position:absolute;top:0;left:0;width:100%;height:100%;" frameborder="0" allow="autoplay; fullscreen; picture-in-picture" allowfullscreen></iframe></div><script src="https://player.vimeo.com/api/player.js"></script>
+
 ```admonish info
 NymVPN is an experimental software and it's for [testing](./testing.md) purposes only. All users testing the client are expected to sign GDPR Information Sheet and Consent Form (shared at the workshop) so we use their results to improve the client, and submit the form [*NymVPN User research*]({{nym_vpn_form_url}}) with the testing results.
 ```
diff --git a/documentation/dev-portal/src/nymvpn/gui.md b/documentation/dev-portal/src/nymvpn/gui.md
index 0ab7decde5..1b0ccc2bb8 100644
--- a/documentation/dev-portal/src/nymvpn/gui.md
+++ b/documentation/dev-portal/src/nymvpn/gui.md
@@ -12,21 +12,21 @@ Follow the simple [automated script](#automated-script-for-gui-installation) bel
 
 ## Automated Script for GUI Installation
 
-We wrote a [script](https://gist.github.com/tommyv1987/7d210d4daa8f7abc61f9a696d0321f19) which does download of dependencies and the application, sha256 verification, extraction, installation and configuration for Linux and MacOS users automatically following the steps below:
+We wrote a [script](https://gist.github.com/serinko/e0a9f7ff3d79e974ec6f6783caa1137e) which does download of dependencies and the application, sha256 verification, extraction, installation and configuration for Linux and MacOS users automatically following the steps below:
 
 1. Open a terminal window in a directory where you want the script and NymVPN binary be downloaded and run
 ```sh
-curl -o nym-vpn-client-install-run.sh -L https://gist.githubusercontent.com/tommyv1987/7d210d4daa8f7abc61f9a696d0321f19/raw/933962e3e70198ec3d8a1bc5238bbaa20e7f0d52/nym-vpn-client-install-run.sh
+curl -o nym-vpn-desktop-install-run.sh -L https://gist.githubusercontent.com/serinko/e0a9f7ff3d79e974ec6f6783caa1137e/raw/064c0d42af6a187b4f62998a0c2e6a84c319eeef/nym-vpn-desktop-install-run.sh
 ```
 
 2. Make the script executable
 ```sh
-chmod u+x nym-vpn-client-install-run.sh
+chmod u+x nym-vpn-desktop-install-run.sh
 ```
 
 3. Start the script as root, turn off any VPN and run
 ```sh
-sudo -E ./nym-vpn-client-install-run.sh
+sudo -E ./nym-vpn-desktop-install-run.sh
 ```
 
 4. Follow the prompts in the program
diff --git a/documentation/dev-portal/src/nymvpn/testing.md b/documentation/dev-portal/src/nymvpn/testing.md
index 9d2a29f275..a2e87ea623 100644
--- a/documentation/dev-portal/src/nymvpn/testing.md
+++ b/documentation/dev-portal/src/nymvpn/testing.md
@@ -1,5 +1,7 @@
 # Testing NymVPN alpha
 
+<div style="padding:56.25% 0 0 0;position:relative;"><iframe src="https://player.vimeo.com/video/908640440?h=0f7f6dfa53" style="position:absolute;top:0;left:0;width:100%;height:100%;" frameborder="0" allow="autoplay; fullscreen; picture-in-picture" allowfullscreen></iframe></div><script src="https://player.vimeo.com/api/player.js"></script>
+
 ```admonish info
 NymVPN is an experimental software and it's for [testing](./testing.md) purposes only. All users testing the client are expected to sign GDPR Information Sheet and Consent Form (shared at the workshop) so we use their results to improve the client, and submit the form [*NymVPN User research*]({{nym_vpn_form_url}}) with the testing results.
 ```
diff --git a/documentation/dev-portal/theme/pagetoc.css b/documentation/dev-portal/theme/pagetoc.css
deleted file mode 100644
index a68e5b8e21..0000000000
--- a/documentation/dev-portal/theme/pagetoc.css
+++ /dev/null
@@ -1,47 +0,0 @@
-/* src: https://github.com/JorelAli/mdBook-pagetoc */
-
-@media only screen and (max-width:1439px) {
-    .sidetoc {
-        display: none;
-    }
-}
-
-@media only screen and (min-width:1440px) {
-    main {
-        position: relative;
-    }
-    .sidetoc {
-        margin-left: auto;
-        margin-right: auto;
-        /* left: calc(90% + (var(--content-min-width))/4 - 110px); */
-        left: 101%;
-        position: absolute;
-        font-size: var(--pagetoc-fontsize);
-    }
-    .pagetoc {
-        position: fixed;
-        width: var(--pagetoc-width);
-    }
-    .pagetoc a {
-        border-left: 1px solid var(--sidebar-bg);
-        /* color: var(--fg); */
-        /* color: var(--sidebar-fg); */
-        color: var(--links);
-        display: block;
-        padding-bottom: 5px;
-        padding-top: 5px;
-        padding-left: 10px;
-        text-align: left;
-        text-decoration: none;
-        font-weight: normal;
-        background: var(--sidebar-bg);
-    }
-    .pagetoc a:hover,
-    .pagetoc a.active {
-        background: var(--sidebar-bg);
-        /* color: var(--sidebar-fg); */
-        color: var(--sidebar-active);
-        font-weight: bold;
-        font-size: var(--pagetoc-fontsize);
-    }
-}
diff --git a/documentation/dev-portal/theme/pagetoc.js b/documentation/dev-portal/theme/pagetoc.js
deleted file mode 100644
index b11052427e..0000000000
--- a/documentation/dev-portal/theme/pagetoc.js
+++ /dev/null
@@ -1,68 +0,0 @@
-// src: https://github.com/JorelAli/mdBook-pagetoc
-
-// Un-active everything when you click it
-Array.prototype.forEach.call(document.getElementsByClassName("pagetoc")[0].children, function(el, i) {
-    el.addEventHandler("click", function() {
-        Array.prototype.forEach.call(document.getElementsByClassName("pagetoc")[0].children, function(el, i) {
-            el.classList.remove("active");
-        });
-        el.classList.add("active");
-    });
-});
-
-var updateFunction = function() {
-
-    var id;
-    var elements = document.getElementsByClassName("header");
-    Array.prototype.forEach.call(elements, function(el, i) {
-        if (window.pageYOffset >= el.offsetTop) {
-            id = el;
-        }
-    });
-
-    Array.prototype.forEach.call(document.getElementsByClassName("pagetoc")[0].children, function(el, i) {
-        el.classList.remove("active");
-    });
-
-    Array.prototype.forEach.call(document.getElementsByClassName("pagetoc")[0].children, function(el, i) {
-        if (id.href.localeCompare(el.href) == 0) {
-            el.classList.add("active");
-        }
-    });
-};
-
-// Populate sidebar on load
-window.addEventListener('load', function() {
-    var pagetoc = document.getElementsByClassName("pagetoc")[0];
-    var elements = document.getElementsByClassName("header");
-    Array.prototype.forEach.call(elements, function(el, i) {
-        var link = document.createElement("a");
-
-        // Indent shows hierarchy
-        var indent = "";
-        switch (el.parentElement.tagName) {
-            case "H2":
-                indent = "20px";
-                break;
-            case "H3":
-                indent = "40px";
-                break;
-            case "H4":
-                indent = "60px";
-                break;
-            default:
-                break;
-        }
-
-        link.appendChild(document.createTextNode(el.text));
-        link.style.paddingLeft = indent;
-        link.href = el.href;
-        pagetoc.appendChild(link);
-    });
-    updateFunction.call();
-});
-
-
-
-// Handle active elements on scroll
-window.addEventListener("scroll", updateFunction);
diff --git a/documentation/docs/.gitignore b/documentation/docs/.gitignore
index e84b38bdfb..757b40bb8d 100644
--- a/documentation/docs/.gitignore
+++ b/documentation/docs/.gitignore
@@ -1,27 +1,15 @@
 # mdbook files
-book
-book/*
-theme/index.hbs
-theme/pagetoc.css
-theme/pagetoc.js
-theme/*
-theme
+book/
+theme/
 
-# ---------------
 # Compiled assets
-# ---------------
 .sass-cache
 _site
 
-# ----------
 # Developing
-# ----------
 todo.md
-.vscode
+.idea
 
 # OSX
 .DS_Store
 
-theme/
-theme
-theme/*
diff --git a/documentation/docs/book.toml b/documentation/docs/book.toml
index d87f16e8f9..0f2732e7f3 100644
--- a/documentation/docs/book.toml
+++ b/documentation/docs/book.toml
@@ -3,7 +3,7 @@ title = "Nym Docs"
 authors = ["Max Hampshire, Serinko, Alexia Lorenza Martinel"]
 description = "Nym technical documentation"
 language = "en"
-multilingual = false # for the moment - ideally work on chinese, brazillian, spanish next
+multilingual = false # for the moment - ideally work on chinese, brazillian portugese, spanish next
 src = "src"
 
 [rust]
@@ -13,52 +13,32 @@ edition = "2018"
 # PREPROCESSORS #
 #################
 
-# Note if changing these fields:
-# - make sure you aren't running `mdbook serve`
-# - change value of `turn-off = true` to `false`. This is set to `true` usually to avoid a known constant-reload bug with `mdbook serve` and this preprocessor
-# - delete `./theme/` dir
-# - change the preprocessor values that you want to edit
-# - run `mdbook build`: this will rebuild the `./theme` directory
-# - change value of `turn-off` back to `true`
 [preprocessor.theme]
-pagetoc        = true
-# some variables related (defined in theme/css/variables.css)
-pagetoc-width            = "13%"
-content-max-width        = "70%" # 82
-pagetoc-fontsize         = "14.5px"
-sidebar-width            = "300px"
-menu-bar-height          = "40px" # memu-bar = the bar on the top
-page-padding             = "20px"
-mobile-content-max-width = "98%"
-
-# layout
-content-padding           = "0 10px"
-content-main-margin-left  = "10%"
-content-main-margin-right = "10%"
-nav-chapters-max-width    = "auto"
-nav-chapters-min-width    = "auto"
-chapter-line-height       = "2em"
-section-line-height       = "1.5em"
-
-# if true, never read and touch the files in theme dir: this is used to stop the looping reload issue referred to in the readme
+sidebar-width             = "280px"
+content-max-width         = "70%"
+content-main-margin-left  = "5%"
+content-main-margin-right = "5%"
+root-font-size            = "70%"
+# DO NOT CHANGE or you might overwrite the custom hbs file
 turn-off = true
 
 [preprocessor.admonish]
 command = "mdbook-admonish"
 assets_version = "3.0.0" # do not edit: managed by `mdbook-admonish install`
 
-# variables preprocessor: import variables into files
 # https://gitlab.com/tglman/mdbook-variables/
 [preprocessor.variables.variables]
 minimum_rust_version = "1.66"
 wallet_release_version = "1.2.8"
+# nym-vpn related variables
+nym_vpn_latest_binary_url = "https://github.com/nymtech/nym/releases/tag/nym-vpn-alpha-0.0.3"
+nym_vpn_form_url = "https://opnform.com/forms/nymvpn-user-research-at-37c3-yccqko-2"
 
 [preprocessor.last-changed]
 command = "mdbook-last-changed"
 renderer = ["html"]
 
-# used for grabbing output of binary commands for automation
-# https://github.com/FauconFan/mdbook-cmdrun
+# used for grabbing output of binary commands for automation https://github.com/FauconFan/mdbook-cmdrun
 [preprocessor.cmdrun]
 
 # more pre-processor plugins to look into from https://github.com/rust-lang/mdBook/wiki/Third-party-plugins & https://lib.rs/keywords/mdbook-preprocessor
@@ -79,20 +59,16 @@ extra-watch-dirs = []             # directories to watch for triggering builds
 ##########
 
 [output.html]
-theme         = "theme" # this is the default if not explicitly set
+theme         = "nym_themes"
 default-theme = "coal"
 preferred-dark-theme = "coal"
 curly-quotes = true
-# mathjax-support = false # useful if we want to pull equations in
 copy-fonts = true
 no-section-label = false
-additional-css = ["theme/pagetoc.css", "././mdbook-admonish.css", "./custom.css", "./mdbook-admonish.css"]
-additional-js  = ["theme/pagetoc.js"]
+additional-css = ["./nym_themes/custom.css", "./nym_themes/mdbook-admonish.css", "./nym_themes/pagetoc.css"]
+additional-js  = ["./nym_themes/pagetoc.js"]
 git-repository-url = "https://github.com/nymtech/nym"
 git-repository-icon = "fa-github"
-# edit-url-template = "https://github.com/rust-lang/mdBook/edit/master/guide/{path}"
-# site-url = "/docs/"
-# cname = "nymtech.net"
 input-404 = "not-found.md"
 
 [output.html.fold]
@@ -104,7 +80,7 @@ level = 0        # the depth to start folding
 editable = false         # allows editing the source code
 copyable = true          # include the copy button for copying code snippets
 copy-js = true           # includes the JavaScript for the code editor
-line-numbers = false     # displays line numbers for editable code
+line-numbers = true      # displays line numbers for editable code
 runnable = true          # displays a run button for rust code
 
 # options for the built in text search
diff --git a/documentation/docs/custom.css b/documentation/docs/custom.css
deleted file mode 100644
index 855f5eef5f..0000000000
--- a/documentation/docs/custom.css
+++ /dev/null
@@ -1,37 +0,0 @@
-:root {
-  --mono-font: Consolas, "Ubuntu Mono", Menlo, "DejaVu Sans Mono", monospace;
-}
-.coal {
-  --bg: #121726;
-  --fg: #f2f2f2;
-
-  --sidebar-bg: #121726;
-  --sidebar-fg: #f2f2f2;
-  --sidebar-active: #fb6e4e;
-
-  --icons: #f2f2f2;
-  --icons-hover: #fb6e4e;
-
-  --links: #fb6e4e;
-}
-
-.light {
-  --bg: #f4f6f8;
-  --fg: #121726;
-
-  --sidebar-bg: #f4f6f8;
-  --sidebar-fg: #121726;
-  --sidebar-active: #fb6e4e;
-
-  --icons: #121726;
-  --icons-hover: #fb6e4e;
-
-  --links: #fb6e4e;
-}
-
-footer {
-  font-size: 0.8em;
-  text-align: center;
-  border-top: 1px solid black;
-  padding: 5px 0;
-}
diff --git a/documentation/dev-portal/theme/css/chrome.css b/documentation/docs/nym_themes/css/chrome.css
similarity index 69%
rename from documentation/dev-portal/theme/css/chrome.css
rename to documentation/docs/nym_themes/css/chrome.css
index febd1d40a6..a0e30b81ff 100644
--- a/documentation/dev-portal/theme/css/chrome.css
+++ b/documentation/docs/nym_themes/css/chrome.css
@@ -2,12 +2,6 @@
 
 @import 'variables.css';
 
-::-webkit-scrollbar {
-    background: var(--bg);
-}
-::-webkit-scrollbar-thumb {
-    background: var(--scrollbar);
-}
 html {
     scrollbar-color: var(--scrollbar) var(--bg);
 }
@@ -18,6 +12,19 @@ a > .hljs {
     color: var(--links);
 }
 
+/*
+    body-container is necessary because mobile browsers don't seem to like
+    overflow-x on the body tag when there is a <meta name="viewport"> tag.
+*/
+#body-container {
+    /*
+        This is used when the sidebar pushes the body content off the side of
+        the screen on small screens. Without it, dragging on mobile Safari
+        will want to reposition the viewport in a weird way.
+    */
+    overflow-x: clip;
+}
+
 /* Menu Bar */
 
 #menu-bar,
@@ -30,9 +37,9 @@ a > .hljs {
     display: flex;
     flex-wrap: wrap;
     background-color: var(--bg);
-    border-bottom-color: var(--bg);
-    border-bottom-width: 1px;
-    border-bottom-style: solid;
+    border-block-end-color: var(--bg);
+    border-block-end-width: 1px;
+    border-block-end-style: solid;
 }
 #menu-bar.sticky,
 .js #menu-bar-hover-placeholder:hover + #menu-bar,
@@ -49,7 +56,7 @@ a > .hljs {
     height: var(--menu-bar-height);
 }
 #menu-bar.bordered {
-    border-bottom-color: var(--table-border-color);
+    border-block-end-color: var(--table-border-color);
 }
 #menu-bar i, #menu-bar .icon-button {
     position: relative;
@@ -86,11 +93,13 @@ a > .hljs {
     display: flex;
     margin: 0 5px;
 }
-.no-js .left-buttons {
+.no-js .left-buttons button {
     display: none;
 }
 
 .menu-title {
+    position: absolute;
+    left: 50%;
     display: inline-block;
     font-weight: 200;
     font-size: 2.4rem;
@@ -153,7 +162,7 @@ a > .hljs {
 }
 
 .nav-wrapper {
-    margin-top: 50px;
+    margin-block-start: 50px;
     display: none;
 }
 
@@ -166,23 +175,34 @@ a > .hljs {
     background-color: var(--sidebar-bg);
 }
 
-.previous {
-    float: left;
-}
+/* Only Firefox supports flow-relative values */
+.previous { float: left; }
+[dir=rtl] .previous { float: right; }
 
+/* Only Firefox supports flow-relative values */
 .next {
     float: right;
     right: var(--page-padding);
 }
+[dir=rtl] .next {
+    float: left;
+    right: unset;
+    left: var(--page-padding);
+}
+
+/* Use the correct buttons for RTL layouts*/
+[dir=rtl] .previous i.fa-angle-left:before {content:"\f105";}
+[dir=rtl] .next i.fa-angle-right:before { content:"\f104"; }
 
 @media only screen and (max-width: 1080px) {
     .nav-wide-wrapper { display: none; }
     .nav-wrapper { display: block; }
 }
 
+/* sidebar-visible */
 @media only screen and (max-width: 1380px) {
-    .sidebar-visible .nav-wide-wrapper { display: none; }
-    .sidebar-visible .nav-wrapper { display: block; }
+    #sidebar-toggle-anchor:checked ~ .page-wrapper .nav-wide-wrapper { display: none; }
+    #sidebar-toggle-anchor:checked ~ .page-wrapper .nav-wrapper { display: block; }
 }
 
 /* Inline code */
@@ -229,7 +249,7 @@ pre > .buttons :hover {
     background-color: var(--theme-hover);
 }
 pre > .buttons i {
-    margin-left: 8px;
+    margin-inline-start: 8px;
 }
 pre > .buttons button {
     cursor: inherit;
@@ -251,8 +271,14 @@ pre > .buttons button {
         /* On mobile, make it easier to tap buttons. */
         padding: 0.3rem 1rem;
     }
+
+    .sidebar-resize-indicator {
+        /* Hide resize indicator on devices with limited accuracy */
+        display: none;
+    }
 }
 pre > code {
+    display: block;
     padding: 1rem;
 }
 
@@ -266,7 +292,7 @@ pre > code {
 }
 
 pre > .result {
-    margin-top: 10px;
+    margin-block-start: 10px;
 }
 
 /* Search */
@@ -277,8 +303,14 @@ pre > .result {
 
 mark {
     border-radius: 2px;
-    padding: 0 3px 1px 3px;
-    margin: 0 -3px -1px -3px;
+    padding-block-start: 0;
+    padding-block-end: 1px;
+    padding-inline-start: 3px;
+    padding-inline-end: 3px;
+    margin-block-start: 0;
+    margin-block-end: -1px;
+    margin-inline-start: -3px;
+    margin-inline-end: -3px;
     background-color: var(--search-mark-bg);
     transition: background-color 300ms linear;
     cursor: pointer;
@@ -290,14 +322,17 @@ mark.fade-out {
 }
 
 .searchbar-outer {
-    margin-left: auto;
-    margin-right: auto;
+    margin-inline-start: auto;
+    margin-inline-end: auto;
     max-width: var(--content-max-width);
 }
 
 #searchbar {
     width: 100%;
-    margin: 5px auto 0px auto;
+    margin-block-start: 5px;
+    margin-block-end: 0;
+    margin-inline-start: auto;
+    margin-inline-end: auto;
     padding: 10px 16px;
     transition: box-shadow 300ms ease-in-out;
     border: 1px solid var(--searchbar-border-color);
@@ -313,20 +348,23 @@ mark.fade-out {
 .searchresults-header {
     font-weight: bold;
     font-size: 1em;
-    padding: 18px 0 0 5px;
+    padding-block-start: 18px;
+    padding-block-end: 0;
+    padding-inline-start: 5px;
+    padding-inline-end: 0;
     color: var(--searchresults-header-fg);
 }
 
 .searchresults-outer {
-    margin-left: auto;
-    margin-right: auto;
+    margin-inline-start: auto;
+    margin-inline-end: auto;
     max-width: var(--content-max-width);
-    border-bottom: 1px dashed var(--searchresults-border-color);
+    border-block-end: 1px dashed var(--searchresults-border-color);
 }
 
 ul#searchresults {
     list-style: none;
-    padding-left: 20px;
+    padding-inline-start: 20px;
 }
 ul#searchresults li {
     margin: 10px 0px;
@@ -339,7 +377,10 @@ ul#searchresults li.focus {
 ul#searchresults span.teaser {
     display: block;
     clear: both;
-    margin: 5px 0 0 20px;
+    margin-block-start: 5px;
+    margin-block-end: 0;
+    margin-inline-start: 20px;
+    margin-inline-end: 0;
     font-size: 0.8em;
 }
 ul#searchresults span.teaser em {
@@ -355,19 +396,21 @@ ul#searchresults span.teaser em {
     top: 0;
     bottom: 0;
     width: var(--sidebar-width);
-    font-size: 1em;
+    font-size: 0.85em;
     box-sizing: border-box;
     -webkit-overflow-scrolling: touch;
     overscroll-behavior-y: contain;
     background-color: var(--sidebar-bg);
     color: var(--sidebar-fg);
 }
+[dir=rtl] .sidebar { left: unset; right: 0; }
 .sidebar-resizing {
     -moz-user-select: none;
     -webkit-user-select: none;
     -ms-user-select: none;
     user-select: none;
 }
+.no-js .sidebar,
 .js:not(.sidebar-resizing) .sidebar {
     transition: transform 0.3s; /* Animation: slide away */
 }
@@ -387,16 +430,35 @@ ul#searchresults span.teaser em {
     position: absolute;
     cursor: col-resize;
     width: 0;
-    right: 0;
+    right: calc(var(--sidebar-resize-indicator-width) * -1);
     top: 0;
     bottom: 0;
+    display: flex;
+    align-items: center;
+}
+
+.sidebar-resize-handle .sidebar-resize-indicator {
+    width: 100%;
+    height: 12px;
+    background-color: var(--icons);
+    margin-inline-start: var(--sidebar-resize-indicator-space);
+}
+
+[dir=rtl] .sidebar .sidebar-resize-handle {
+    left: calc(var(--sidebar-resize-indicator-width) * -1);
+    right: unset;
 }
 .js .sidebar .sidebar-resize-handle {
     cursor: col-resize;
-    width: 5px;
+    width: calc(var(--sidebar-resize-indicator-width) - var(--sidebar-resize-indicator-space));
 }
-.sidebar-hidden .sidebar {
-    transform: translateX(calc(0px - var(--sidebar-width)));
+/* sidebar-hidden */
+#sidebar-toggle-anchor:not(:checked) ~ .sidebar {
+    transform: translateX(calc(0px - var(--sidebar-width) - var(--sidebar-resize-indicator-width)));
+    z-index: -1;
+}
+[dir=rtl] #sidebar-toggle-anchor:not(:checked) ~ .sidebar {
+    transform: translateX(calc(var(--sidebar-width) + var(--sidebar-resize-indicator-width)));
 }
 .sidebar::-webkit-scrollbar {
     background: var(--sidebar-bg);
@@ -405,19 +467,26 @@ ul#searchresults span.teaser em {
     background: var(--scrollbar);
 }
 
-.sidebar-visible .page-wrapper {
-    transform: translateX(var(--sidebar-width));
+/* sidebar-visible */
+#sidebar-toggle-anchor:checked ~ .page-wrapper {
+    transform: translateX(calc(var(--sidebar-width) + var(--sidebar-resize-indicator-width)));
+}
+[dir=rtl] #sidebar-toggle-anchor:checked ~ .page-wrapper {
+    transform: translateX(calc(0px - var(--sidebar-width) - var(--sidebar-resize-indicator-width)));
 }
 @media only screen and (min-width: 620px) {
-    .sidebar-visible .page-wrapper {
+    #sidebar-toggle-anchor:checked ~ .page-wrapper {
+        transform: none;
+        margin-inline-start: calc(var(--sidebar-width) + var(--sidebar-resize-indicator-width));
+    }
+    [dir=rtl] #sidebar-toggle-anchor:checked ~ .page-wrapper {
         transform: none;
-        margin-left: var(--sidebar-width);
     }
 }
 
 .chapter {
     list-style: none outside none;
-    padding-left: 0;
+    padding-inline-start: 0;
     line-height: 2em;
 }
 
@@ -447,7 +516,7 @@ ul#searchresults span.teaser em {
 .chapter li > a.toggle {
     cursor: pointer;
     display: block;
-    margin-left: auto;
+    margin-inline-start: auto;
     padding: 0 10px;
     user-select: none;
     opacity: 0.68;
@@ -464,7 +533,7 @@ ul#searchresults span.teaser em {
 
 .chapter li.chapter-item {
     line-height: 1.5em;
-    margin-top: 0.6em;
+    margin-block-start: 0.6em;
 }
 
 .chapter li.expanded > a.toggle div {
@@ -487,7 +556,7 @@ ul#searchresults span.teaser em {
 
 .section {
     list-style: none outside none;
-    padding-left: 20px;
+    padding-inline-start: 20px;
     line-height: 1.5em;
 }
 
@@ -510,6 +579,7 @@ ul#searchresults span.teaser em {
     /* Don't let the children's background extend past the rounded corners. */
     overflow: hidden;
 }
+[dir=rtl] .theme-popup { left: unset;  right: 10px; }
 .theme-popup .default {
     color: var(--icons);
 }
@@ -520,7 +590,7 @@ ul#searchresults span.teaser em {
     padding: 2px 20px;
     line-height: 25px;
     white-space: nowrap;
-    text-align: left;
+    text-align: start;
     cursor: pointer;
     color: inherit;
     background: inherit;
@@ -533,6 +603,6 @@ ul#searchresults span.teaser em {
 .theme-selected::before {
     display: inline-block;
     content: "✓";
-    margin-left: -14px;
+    margin-inline-start: -14px;
     width: 14px;
 }
diff --git a/documentation/operators/theme/css/general.css b/documentation/docs/nym_themes/css/general.css
similarity index 76%
rename from documentation/operators/theme/css/general.css
rename to documentation/docs/nym_themes/css/general.css
index a06db43965..df8c1d12d2 100644
--- a/documentation/operators/theme/css/general.css
+++ b/documentation/docs/nym_themes/css/general.css
@@ -5,6 +5,7 @@
 :root {
     /* Browser default font-size is 16px, this way 1 rem = 10px */
     font-size: 70%;
+    color-scheme: var(--color-scheme);
 }
 
 html {
@@ -24,6 +25,7 @@ body {
 code {
     font-family: var(--mono-font) !important;
     font-size: 0.9em;
+    direction: ltr !important;
 }
 
 /* make long words/inline code not x overflow */
@@ -47,13 +49,13 @@ h1 code, h2 code, h3 code, h4 code, h5 code, h6 code {
 .hide-boring .boring { display: none; }
 .hidden { display: none !important; }
 
-h2, h3 { margin-top: 2.5em; }
-h4, h5 { margin-top: 2em; }
+h2, h3 { margin-block-start: 2.5em; }
+h4, h5 { margin-block-start: 2em; }
 
 .header + .header h3,
 .header + .header h4,
 .header + .header h5 {
-    margin-top: 1em;
+    margin-block-start: 1em;
 }
 
 h1:target::before,
@@ -64,7 +66,7 @@ h5:target::before,
 h6:target::before {
     display: inline-block;
     content: "»";
-    margin-left: -30px;
+    margin-inline-start: -30px;
     width: 30px;
 }
 
@@ -73,28 +75,34 @@ h6:target::before {
    https://bugs.webkit.org/show_bug.cgi?id=218076
 */
 :target {
+    /* Safari does not support logical properties */
     scroll-margin-top: calc(var(--menu-bar-height) + 0.5em);
 }
 
 .page {
     outline: 0;
     padding: 0 var(--page-padding);
-    margin-top: calc(0px - var(--menu-bar-height)); /* Compensate for the #menu-bar-hover-placeholder */
+    margin-block-start: calc(0px - var(--menu-bar-height)); /* Compensate for the #menu-bar-hover-placeholder */
 }
 .page-wrapper {
     box-sizing: border-box;
+    background-color: var(--bg);
 }
+.no-js .page-wrapper,
 .js:not(.sidebar-resizing) .page-wrapper {
     transition: margin-left 0.3s ease, transform 0.3s ease; /* Animation: slide away */
 }
+[dir=rtl] .js:not(.sidebar-resizing) .page-wrapper {
+    transition: margin-right 0.3s ease, transform 0.3s ease; /* Animation: slide away */
+}
 
 .content {
     overflow-y: auto;
     padding: 0 10px;
 }
 .content main {
-    margin-left: 10%;
-    margin-right: 10%;
+    margin-inline-start: auto;
+    margin-inline-end: auto;
     max-width: var(--content-max-width);
 }
 .content p { line-height: 1.45em; }
@@ -144,8 +152,31 @@ blockquote {
     padding: 0 20px;
     color: var(--fg);
     background-color: var(--quote-bg);
-    border-top: .1em solid var(--quote-border);
-    border-bottom: .1em solid var(--quote-border);
+    border-block-start: .1em solid var(--quote-border);
+    border-block-end: .1em solid var(--quote-border);
+}
+
+.warning {
+    margin: 20px;
+    padding: 0 20px;
+    border-inline-start: 2px solid var(--warning-border);
+}
+
+.warning:before {
+    position: absolute;
+    width: 3rem;
+    height: 3rem;
+    margin-inline-start: calc(-1.5rem - 21px);
+    content: "ⓘ";
+    text-align: center;
+    background-color: var(--bg);
+    color: var(--warning-border);
+    font-weight: bold;
+    font-size: 2rem;
+}
+
+blockquote .warning:before {
+    background-color: var(--quote-bg);
 }
 
 kbd {
@@ -163,7 +194,7 @@ kbd {
 
 :not(.footnote-definition) + .footnote-definition,
 .footnote-definition + :not(.footnote-definition) {
-    margin-top: 2em;
+    margin-block-start: 2em;
 }
 .footnote-definition {
     font-size: 0.9em;
diff --git a/documentation/docs/nym_themes/css/variables.css b/documentation/docs/nym_themes/css/variables.css
new file mode 100644
index 0000000000..51b94cfc5a
--- /dev/null
+++ b/documentation/docs/nym_themes/css/variables.css
@@ -0,0 +1,287 @@
+
+/* Globals */
+
+:root {
+    --sidebar-width: 280px;
+    --sidebar-resize-indicator-width: 8px;
+    --sidebar-resize-indicator-space: 2px;
+    --page-padding: 15px;
+    --content-max-width: 80%;
+    --menu-bar-height: 40px;
+    --mono-font: "Source Code Pro", Consolas, "Ubuntu Mono", Menlo, "DejaVu Sans Mono", monospace, monospace;
+    --code-font-size: 0.875em /* please adjust the ace font size accordingly in editor.js */
+    --pagetoc-width: 13%;
+    --pagetoc-fontsize: 14.5px;
+}
+
+@media only screen and (max-width:1439px) {
+ :root{
+    --content-max-width: 98%;
+  }
+}
+
+/* Themes */
+
+.ayu {
+    --bg: hsl(210, 25%, 8%);
+    --fg: #c5c5c5;
+
+    --sidebar-bg: #14191f;
+    --sidebar-fg: #c8c9db;
+    --sidebar-non-existant: #5c6773;
+    --sidebar-active: #ffb454;
+    --sidebar-spacer: #2d334f;
+
+    --scrollbar: var(--sidebar-fg);
+
+    --icons: #737480;
+    --icons-hover: #b7b9cc;
+
+    --links: #0096cf;
+
+    --inline-code-color: #ffb454;
+
+    --theme-popup-bg: #14191f;
+    --theme-popup-border: #5c6773;
+    --theme-hover: #191f26;
+
+    --quote-bg: hsl(226, 15%, 17%);
+    --quote-border: hsl(226, 15%, 22%);
+
+    --warning-border: #ff8e00;
+
+    --table-border-color: hsl(210, 25%, 13%);
+    --table-header-bg: hsl(210, 25%, 28%);
+    --table-alternate-bg: hsl(210, 25%, 11%);
+
+    --searchbar-border-color: #848484;
+    --searchbar-bg: #424242;
+    --searchbar-fg: #fff;
+    --searchbar-shadow-color: #d4c89f;
+    --searchresults-header-fg: #666;
+    --searchresults-border-color: #888;
+    --searchresults-li-bg: #252932;
+    --search-mark-bg: #e3b171;
+
+    --color-scheme: dark;
+}
+
+.coal {
+    --bg: hsl(200, 7%, 8%);
+    --fg: #98a3ad;
+
+    --sidebar-bg: #292c2f;
+    --sidebar-fg: #a1adb8;
+    --sidebar-non-existant: #505254;
+    --sidebar-active: #3473ad;
+    --sidebar-spacer: #393939;
+
+    --scrollbar: var(--sidebar-fg);
+
+    --icons: #43484d;
+    --icons-hover: #b3c0cc;
+
+    --links: #2b79a2;
+
+    --inline-code-color: #c5c8c6;
+
+    --theme-popup-bg: #141617;
+    --theme-popup-border: #43484d;
+    --theme-hover: #1f2124;
+
+    --quote-bg: hsl(234, 21%, 18%);
+    --quote-border: hsl(234, 21%, 23%);
+
+    --warning-border: #ff8e00;
+
+    --table-border-color: hsl(200, 7%, 13%);
+    --table-header-bg: hsl(200, 7%, 28%);
+    --table-alternate-bg: hsl(200, 7%, 11%);
+
+    --searchbar-border-color: #aaa;
+    --searchbar-bg: #b7b7b7;
+    --searchbar-fg: #000;
+    --searchbar-shadow-color: #aaa;
+    --searchresults-header-fg: #666;
+    --searchresults-border-color: #98a3ad;
+    --searchresults-li-bg: #2b2b2f;
+    --search-mark-bg: #355c7d;
+
+    --color-scheme: dark;
+}
+
+.light {
+    --bg: hsl(0, 0%, 100%);
+    --fg: hsl(0, 0%, 0%);
+
+    --sidebar-bg: #fafafa;
+    --sidebar-fg: hsl(0, 0%, 0%);
+    --sidebar-non-existant: #aaaaaa;
+    --sidebar-active: #1f1fff;
+    --sidebar-spacer: #f4f4f4;
+
+    --scrollbar: #8F8F8F;
+
+    --icons: #747474;
+    --icons-hover: #000000;
+
+    --links: #1f1fff;
+
+    --inline-code-color: #F42C4C;
+
+    --theme-popup-bg: #fafafa;
+    --theme-popup-border: #cccccc;
+    --theme-hover: #e6e6e6;
+
+    --quote-bg: hsl(197, 37%, 96%);
+    --quote-border: hsl(197, 37%, 91%);
+
+    --warning-border: #ff8e00;
+
+    --table-border-color: hsl(0, 0%, 95%);
+    --table-header-bg: hsl(0, 0%, 80%);
+    --table-alternate-bg: hsl(0, 0%, 97%);
+
+    --searchbar-border-color: #aaa;
+    --searchbar-bg: #fafafa;
+    --searchbar-fg: #000;
+    --searchbar-shadow-color: #aaa;
+    --searchresults-header-fg: #666;
+    --searchresults-border-color: #888;
+    --searchresults-li-bg: #e4f2fe;
+    --search-mark-bg: #a2cff5;
+
+    --color-scheme: light;
+}
+
+.navy {
+    --bg: hsl(226, 23%, 11%);
+    --fg: #bcbdd0;
+
+    --sidebar-bg: #282d3f;
+    --sidebar-fg: #c8c9db;
+    --sidebar-non-existant: #505274;
+    --sidebar-active: #2b79a2;
+    --sidebar-spacer: #2d334f;
+
+    --scrollbar: var(--sidebar-fg);
+
+    --icons: #737480;
+    --icons-hover: #b7b9cc;
+
+    --links: #2b79a2;
+
+    --inline-code-color: #c5c8c6;
+
+    --theme-popup-bg: #161923;
+    --theme-popup-border: #737480;
+    --theme-hover: #282e40;
+
+    --quote-bg: hsl(226, 15%, 17%);
+    --quote-border: hsl(226, 15%, 22%);
+
+    --warning-border: #ff8e00;
+
+    --table-border-color: hsl(226, 23%, 16%);
+    --table-header-bg: hsl(226, 23%, 31%);
+    --table-alternate-bg: hsl(226, 23%, 14%);
+
+    --searchbar-border-color: #aaa;
+    --searchbar-bg: #aeaec6;
+    --searchbar-fg: #000;
+    --searchbar-shadow-color: #aaa;
+    --searchresults-header-fg: #5f5f71;
+    --searchresults-border-color: #5c5c68;
+    --searchresults-li-bg: #242430;
+    --search-mark-bg: #a2cff5;
+
+    --color-scheme: dark;
+}
+
+.rust {
+    --bg: hsl(60, 9%, 87%);
+    --fg: #262625;
+
+    --sidebar-bg: #3b2e2a;
+    --sidebar-fg: #c8c9db;
+    --sidebar-non-existant: #505254;
+    --sidebar-active: #e69f67;
+    --sidebar-spacer: #45373a;
+
+    --scrollbar: var(--sidebar-fg);
+
+    --icons: #737480;
+    --icons-hover: #262625;
+
+    --links: #2b79a2;
+
+    --inline-code-color: #6e6b5e;
+
+    --theme-popup-bg: #e1e1db;
+    --theme-popup-border: #b38f6b;
+    --theme-hover: #99908a;
+
+    --quote-bg: hsl(60, 5%, 75%);
+    --quote-border: hsl(60, 5%, 70%);
+
+    --warning-border: #ff8e00;
+
+    --table-border-color: hsl(60, 9%, 82%);
+    --table-header-bg: #b3a497;
+    --table-alternate-bg: hsl(60, 9%, 84%);
+
+    --searchbar-border-color: #aaa;
+    --searchbar-bg: #fafafa;
+    --searchbar-fg: #000;
+    --searchbar-shadow-color: #aaa;
+    --searchresults-header-fg: #666;
+    --searchresults-border-color: #888;
+    --searchresults-li-bg: #dec2a2;
+    --search-mark-bg: #e69f67;
+
+    --color-scheme: light;
+}
+
+@media (prefers-color-scheme: dark) {
+    .light.no-js {
+        --bg: hsl(200, 7%, 8%);
+        --fg: #98a3ad;
+
+        --sidebar-bg: #292c2f;
+        --sidebar-fg: #a1adb8;
+        --sidebar-non-existant: #505254;
+        --sidebar-active: #3473ad;
+        --sidebar-spacer: #393939;
+
+        --scrollbar: var(--sidebar-fg);
+
+        --icons: #43484d;
+        --icons-hover: #b3c0cc;
+
+        --links: #2b79a2;
+
+        --inline-code-color: #c5c8c6;
+
+        --theme-popup-bg: #141617;
+        --theme-popup-border: #43484d;
+        --theme-hover: #1f2124;
+
+        --quote-bg: hsl(234, 21%, 18%);
+        --quote-border: hsl(234, 21%, 23%);
+
+        --warning-border: #ff8e00;
+
+        --table-border-color: hsl(200, 7%, 13%);
+        --table-header-bg: hsl(200, 7%, 28%);
+        --table-alternate-bg: hsl(200, 7%, 11%);
+
+        --searchbar-border-color: #aaa;
+        --searchbar-bg: #b7b7b7;
+        --searchbar-fg: #000;
+        --searchbar-shadow-color: #aaa;
+        --searchresults-header-fg: #666;
+        --searchresults-border-color: #98a3ad;
+        --searchresults-li-bg: #2b2b2f;
+        --search-mark-bg: #355c7d;
+    }
+}
diff --git a/documentation/docs/nym_themes/custom.css b/documentation/docs/nym_themes/custom.css
new file mode 100644
index 0000000000..8005eb68df
--- /dev/null
+++ b/documentation/docs/nym_themes/custom.css
@@ -0,0 +1,54 @@
+:root {
+  --mono-font: Consolas, "Ubuntu Mono", Menlo, "DejaVu Sans Mono", monospace;
+}
+
+.coal {
+  --fg: #f2f2f2;
+  --sidebar-fg: #f2f2f2;
+  --sidebar-active: #fb6e4e;
+  --icons-hover: #fb6e4e;
+  --links: #fb6e4e;
+  ::selection {
+    color: #121726;
+    background-color: #c5573d;
+  }
+  select option {
+    background-color: #121726;
+  }
+}
+
+.light {
+  --sidebar-active: #fb6e4e;
+  --icons-hover: #fb6e4e;
+  --links: #fb6e4e;
+  ::selection {
+    color:#f2f2f2;
+    background-color: #c5573d;
+  }
+}
+
+/*properly centering the title given the additional header items*/
+.menu-title {
+  position: absolute;
+  left: 50%;
+}
+.menu-bar .a:hover,
+
+/*necessary because of ^*/
+.right-buttons {
+  position: absolute;
+  right: 0;
+}
+
+select {
+  font-size: 16px;
+}
+
+
+
+footer {
+  font-size: 0.8em;
+  text-align: center;
+  border-top: 1px solid black;
+  padding: 5px 0;
+}
diff --git a/documentation/docs/nym_themes/index.hbs b/documentation/docs/nym_themes/index.hbs
new file mode 100644
index 0000000000..b8115558e3
--- /dev/null
+++ b/documentation/docs/nym_themes/index.hbs
@@ -0,0 +1,381 @@
+<!DOCTYPE HTML>
+<html lang="{{ language }}" class="{{ default_theme }}" dir="{{ text_direction }}">
+    <head>
+        <!-- Book generated using mdBook -->
+        <meta charset="UTF-8">
+        <title>{{ title }}</title>
+        {{#if is_print }}
+        <meta name="robots" content="noindex">
+        {{/if}}
+        {{#if base_url}}
+        <base href="{{ base_url }}">
+        {{/if}}
+
+
+        <!-- Custom HTML head -->
+        {{> head}}
+
+        <meta name="description" content="{{ description }}">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <meta name="theme-color" content="#ffffff">
+
+        {{#if favicon_svg}}
+        <link rel="icon" href="{{ path_to_root }}favicon.svg">
+        {{/if}}
+        {{#if favicon_png}}
+        <link rel="shortcut icon" href="{{ path_to_root }}favicon.png">
+        {{/if}}
+        <link rel="stylesheet" href="{{ path_to_root }}css/variables.css">
+        <link rel="stylesheet" href="{{ path_to_root }}css/general.css">
+        <link rel="stylesheet" href="{{ path_to_root }}css/chrome.css">
+        {{#if print_enable}}
+        <link rel="stylesheet" href="{{ path_to_root }}css/print.css" media="print">
+        {{/if}}
+
+        <!-- Fonts -->
+        <link rel="stylesheet" href="{{ path_to_root }}FontAwesome/css/font-awesome.css">
+        {{#if copy_fonts}}
+        <link rel="stylesheet" href="{{ path_to_root }}fonts/fonts.css">
+        {{/if}}
+
+        <!-- Highlight.js Stylesheets -->
+        <link rel="stylesheet" href="{{ path_to_root }}highlight.css">
+        <link rel="stylesheet" href="{{ path_to_root }}tomorrow-night.css">
+        <link rel="stylesheet" href="{{ path_to_root }}ayu-highlight.css">
+
+        <!-- Custom theme stylesheets -->
+        {{#each additional_css}}
+        <link rel="stylesheet" href="{{ ../path_to_root }}{{ this }}">
+        {{/each}}
+
+<!--        {{#if mathjax_support}}-->
+<!--        &lt;!&ndash; MathJax &ndash;&gt;-->
+<!--        <script async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>-->
+<!--        {{/if}}-->
+    </head>
+    <body class="sidebar-visible no-js">
+    <div id="body-container">
+        <!-- Provide site root to javascript -->
+        <script>
+            var path_to_root = "{{ path_to_root }}";
+            var default_theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? "{{ preferred_dark_theme }}" : "{{ default_theme }}";
+        </script>
+
+        <!-- Work around some values being stored in localStorage wrapped in quotes -->
+        <script>
+            try {
+                var theme = localStorage.getItem('mdbook-theme');
+                var sidebar = localStorage.getItem('mdbook-sidebar');
+
+                if (theme.startsWith('"') && theme.endsWith('"')) {
+                    localStorage.setItem('mdbook-theme', theme.slice(1, theme.length - 1));
+                }
+
+                if (sidebar.startsWith('"') && sidebar.endsWith('"')) {
+                    localStorage.setItem('mdbook-sidebar', sidebar.slice(1, sidebar.length - 1));
+                }
+            } catch (e) { }
+        </script>
+
+        <!-- Set the theme before any content is loaded, prevents flash -->
+        <script>
+            var theme;
+            try { theme = localStorage.getItem('mdbook-theme'); } catch(e) { }
+            if (theme === null || theme === undefined) { theme = default_theme; }
+            var html = document.querySelector('html');
+            html.classList.remove('{{ default_theme }}')
+            html.classList.add(theme);
+            var body = document.querySelector('body');
+            body.classList.remove('no-js')
+            body.classList.add('js');
+        </script>
+
+        <input type="checkbox" id="sidebar-toggle-anchor" class="hidden">
+
+        <!-- Hide / unhide sidebar before it is displayed -->
+        <script>
+            var body = document.querySelector('body');
+            var sidebar = null;
+            var sidebar_toggle = document.getElementById("sidebar-toggle-anchor");
+            if (document.body.clientWidth >= 1080) {
+                try { sidebar = localStorage.getItem('mdbook-sidebar'); } catch(e) { }
+                sidebar = sidebar || 'visible';
+            } else {
+                sidebar = 'hidden';
+            }
+            sidebar_toggle.checked = sidebar === 'visible';
+            body.classList.remove('sidebar-visible');
+            body.classList.add("sidebar-" + sidebar);
+        </script>
+
+        <nav id="sidebar" class="sidebar" aria-label="Table of contents">
+            <div class="sidebar-scrollbox">
+                {{#toc}}{{/toc}}
+            </div>
+            <div id="sidebar-resize-handle" class="sidebar-resize-handle">
+                <div class="sidebar-resize-indicator"></div>
+            </div>
+        </nav>
+
+        <!-- Track and set sidebar scroll position -->
+        <script>
+            var sidebarScrollbox = document.querySelector('#sidebar .sidebar-scrollbox');
+            sidebarScrollbox.addEventListener('click', function(e) {
+                if (e.target.tagName === 'A') {
+                    sessionStorage.setItem('sidebar-scroll', sidebarScrollbox.scrollTop);
+                }
+            }, { passive: true });
+            var sidebarScrollTop = sessionStorage.getItem('sidebar-scroll');
+            sessionStorage.removeItem('sidebar-scroll');
+            if (sidebarScrollTop) {
+                // preserve sidebar scroll position when navigating via links within sidebar
+                sidebarScrollbox.scrollTop = sidebarScrollTop;
+            } else {
+                // scroll sidebar to current active section when navigating via "next/previous chapter" buttons
+                var activeSection = document.querySelector('#sidebar .active');
+                if (activeSection) {
+                    activeSection.scrollIntoView({ block: 'center' });
+                }
+            }
+        </script>
+
+        <div id="page-wrapper" class="page-wrapper">
+
+            <div class="page">
+                {{> header}}
+                <div id="menu-bar-hover-placeholder"></div>
+                <div id="menu-bar" class="menu-bar sticky">
+                    <div class="left-buttons">
+                        <label id="sidebar-toggle" class="icon-button" for="sidebar-toggle-anchor" title="Toggle Table of Contents" aria-label="Toggle Table of Contents" aria-controls="sidebar">
+                            <i class="fa fa-bars"></i>
+                        </label>
+
+                        <button id="theme-toggle" class="icon-button" type="button" title="Change theme" aria-label="Change theme" aria-haspopup="true" aria-expanded="false" aria-controls="theme-list">
+                            <i class="fa fa-paint-brush"></i>
+                        </button>
+                        <ul id="theme-list" class="theme-popup" aria-label="Themes" role="menu">
+                            <li role="none"><button role="menuitem" class="theme" id="light">Light</button></li>
+                            <li role="none"><button role="menuitem" class="theme" id="coal">Dark</button></li>
+                        </ul>
+
+                        <!-- CUSTOM -->
+                        <select id="dropdown-menu3" class="icon-button">
+                            <option value="">Network Protocol</option>
+                            <option value="https://nymtech.net/docs">Network Docs</option>
+                            <option value="https://nymtech.net/learn/papers">Academic Papers</option>
+                        </select>
+
+                        <select id="dropdown-menu" class="icon-button">
+                            <option value="">Developer Docs</option>
+                            <option value="https://nymtech.net/developers">Dev Portal</option>
+                            <option value="https://nymtech.net/docs/sdk/rust/rust.html">Rust SDK</option>
+                            <option value="https://sdk.nymtech.net">Typescript SDK</option>
+                        </select>
+
+                        <select id="dropdown-menu2" class="icon-button">
+                            <option value="">Setup Guides</option>
+                            <option value="https://nymtech.net/operators">Operators</option>
+                            <option value="https://nymtech.net/developers/nymvpn/intro.html">NymVPN Testing</option>
+                        </select>
+
+                        <script>
+                            document.getElementById('dropdown-menu').addEventListener('change', function() {
+                                const selected = this.options[this.selectedIndex];
+                                if (selected.value !== '') {
+                                    window.location.href = selected.value;
+                                }
+                            });
+                        </script>
+
+                        <script>
+                            document.getElementById('dropdown-menu2').addEventListener('change', function() {
+                                const selected = this.options[this.selectedIndex];
+                                if (selected.value !== '') {
+                                    window.location.href = selected.value;
+                                }
+                            });
+                        </script>
+
+                        <script>
+                            document.getElementById('dropdown-menu3').addEventListener('change', function() {
+                                const selected = this.options[this.selectedIndex];
+                                if (selected.value !== '') {
+                                    window.location.href = selected.value;
+                                }
+                            });
+                        </script>
+                        <!-- END CUSTOM -->
+                    </div>
+
+                    <h1 class="menu-title"> {{ book_title }}</h1>
+
+                    <div class="right-buttons">
+                        {{#if search_enabled}}
+                            <button id="search-toggle" class="icon-button" type="button" title="Search. (Shortkey: s)" aria-label="Toggle Searchbar" aria-expanded="false" aria-keyshortcuts="S" aria-controls="searchbar">
+                                <i class="fa fa-search"></i>
+                            </button>
+                        {{/if}}
+                        {{#if print_enable}}
+                        <a href="{{ path_to_root }}print.html" title="Print this book" aria-label="Print this book">
+                            <i id="print-button" class="fa fa-print"></i>
+                        </a>
+                        {{/if}}
+                        {{#if git_repository_url}}
+                        <a href="{{git_repository_url}}" title="Git repository" aria-label="Git repository">
+                            <i id="git-repository-button" class="fa {{git_repository_icon}}"></i>
+                        </a>
+                        {{/if}}
+                        {{#if git_repository_edit_url}}
+                        <a href="{{git_repository_edit_url}}" title="Suggest an edit" aria-label="Suggest an edit">
+                            <i id="git-edit-button" class="fa fa-edit"></i>
+                        </a>
+                        {{/if}}
+
+                    </div>
+                </div>
+
+                {{#if search_enabled}}
+                <div id="search-wrapper" class="hidden">
+                    <form id="searchbar-outer" class="searchbar-outer">
+                        <input type="search" id="searchbar" name="searchbar" placeholder="Search this book ..." aria-controls="searchresults-outer" aria-describedby="searchresults-header">
+                    </form>
+                    <div id="searchresults-outer" class="searchresults-outer hidden">
+                        <div id="searchresults-header" class="searchresults-header"></div>
+                        <ul id="searchresults">
+                        </ul>
+                    </div>
+                </div>
+                {{/if}}
+
+                <!-- Apply ARIA attributes after the sidebar and the sidebar toggle button are added to the DOM -->
+                <script>
+                    document.getElementById('sidebar-toggle').setAttribute('aria-expanded', sidebar === 'visible');
+                    document.getElementById('sidebar').setAttribute('aria-hidden', sidebar !== 'visible');
+                    Array.from(document.querySelectorAll('#sidebar a')).forEach(function(link) {
+                        link.setAttribute('tabIndex', sidebar === 'visible' ? 0 : -1);
+                    });
+                </script>
+
+                <div id="content" class="content">
+                    <main>
+                        <main>
+                            <div class="content-wrap">
+                        {{{ content }}}
+                            </div>
+                            <div class="sidetoc">
+                                <nav class="pagetoc"></nav>
+                            </div>
+                        </main>
+                    </main>
+
+                    <nav class="nav-wrapper" aria-label="Page navigation">
+                        <!-- Mobile navigation buttons -->
+                        {{#previous}}
+                            <a rel="prev" href="{{ path_to_root }}{{link}}" class="mobile-nav-chapters previous" title="Previous chapter" aria-label="Previous chapter" aria-keyshortcuts="Left">
+                                <i class="fa fa-angle-left"></i>
+                            </a>
+                        {{/previous}}
+
+                        {{#next}}
+                            <a rel="next prefetch" href="{{ path_to_root }}{{link}}" class="mobile-nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
+                                <i class="fa fa-angle-right"></i>
+                            </a>
+                        {{/next}}
+
+                        <div style="clear: both"></div>
+                    </nav>
+                </div>
+            </div>
+
+            <nav class="nav-wide-wrapper" aria-label="Page navigation">
+                {{#previous}}
+                    <a rel="prev" href="{{ path_to_root }}{{link}}" class="nav-chapters previous" title="Previous chapter" aria-label="Previous chapter" aria-keyshortcuts="Left">
+                        <i class="fa fa-angle-left"></i>
+                    </a>
+                {{/previous}}
+
+                {{#next}}
+                    <a rel="next prefetch" href="{{ path_to_root }}{{link}}" class="nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
+                        <i class="fa fa-angle-right"></i>
+                    </a>
+                {{/next}}
+            </nav>
+
+        </div>
+
+        {{#if live_reload_endpoint}}
+        <!-- Livereload script (if served using the cli tool) -->
+        <script>
+            const wsProtocol = location.protocol === 'https:' ? 'wss:' : 'ws:';
+            const wsAddress = wsProtocol + "//" + location.host + "/" + "{{{live_reload_endpoint}}}";
+            const socket = new WebSocket(wsAddress);
+            socket.onmessage = function (event) {
+                if (event.data === "reload") {
+                    socket.close();
+                    location.reload();
+                }
+            };
+
+            window.onbeforeunload = function() {
+                socket.close();
+            }
+        </script>
+        {{/if}}
+
+        {{#if playground_line_numbers}}
+        <script>
+            window.playground_line_numbers = true;
+        </script>
+        {{/if}}
+
+        {{#if playground_copyable}}
+        <script>
+            window.playground_copyable = true;
+        </script>
+        {{/if}}
+
+        {{#if playground_js}}
+        <script src="{{ path_to_root }}ace.js"></script>
+        <script src="{{ path_to_root }}editor.js"></script>
+        <script src="{{ path_to_root }}mode-rust.js"></script>
+        <script src="{{ path_to_root }}theme-dawn.js"></script>
+        <script src="{{ path_to_root }}theme-tomorrow_night.js"></script>
+        {{/if}}
+
+        {{#if search_js}}
+        <script src="{{ path_to_root }}elasticlunr.min.js"></script>
+        <script src="{{ path_to_root }}mark.min.js"></script>
+        <script src="{{ path_to_root }}searcher.js"></script>
+        {{/if}}
+
+        <script src="{{ path_to_root }}clipboard.min.js"></script>
+        <script src="{{ path_to_root }}highlight.js"></script>
+        <script src="{{ path_to_root }}book.js"></script>
+
+        <!-- Custom JS scripts -->
+        {{#each additional_js}}
+        <script src="{{ ../path_to_root }}{{this}}"></script>
+        {{/each}}
+
+        {{#if is_print}}
+        {{#if mathjax_support}}
+        <script>
+        window.addEventListener('load', function() {
+            MathJax.Hub.Register.StartupHook('End', function() {
+                window.setTimeout(window.print, 100);
+            });
+        });
+        </script>
+        {{else}}
+        <script>
+        window.addEventListener('load', function() {
+            window.setTimeout(window.print, 100);
+        });
+        </script>
+        {{/if}}
+        {{/if}}
+
+
+    </div>
+    </body>
+</html>
diff --git a/documentation/docs/nym_themes/index.hbs.bak b/documentation/docs/nym_themes/index.hbs.bak
new file mode 100644
index 0000000000..d2a64dbc97
--- /dev/null
+++ b/documentation/docs/nym_themes/index.hbs.bak
@@ -0,0 +1,370 @@
+<!DOCTYPE HTML>
+<html lang="{{ language }}" class="{{ default_theme }}" dir="{{ text_direction }}">
+    <head>
+        <!-- Book generated using mdBook -->
+        <meta charset="UTF-8">
+        <title>{{ title }}</title>
+        {{#if is_print }}
+        <meta name="robots" content="noindex">
+        {{/if}}
+        {{#if base_url}}
+        <base href="{{ base_url }}">
+        {{/if}}
+
+
+        <!-- Custom HTML head -->
+        {{> head}}
+
+        <meta name="description" content="{{ description }}">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <meta name="theme-color" content="#ffffff">
+
+        {{#if favicon_svg}}
+        <link rel="icon" href="{{ path_to_root }}favicon.svg">
+        {{/if}}
+        {{#if favicon_png}}
+        <link rel="shortcut icon" href="{{ path_to_root }}favicon.png">
+        {{/if}}
+        <link rel="stylesheet" href="{{ path_to_root }}css/variables.css">
+        <link rel="stylesheet" href="{{ path_to_root }}css/general.css">
+        <link rel="stylesheet" href="{{ path_to_root }}css/chrome.css">
+        {{#if print_enable}}
+        <link rel="stylesheet" href="{{ path_to_root }}css/print.css" media="print">
+        {{/if}}
+
+        <!-- Fonts -->
+        <link rel="stylesheet" href="{{ path_to_root }}FontAwesome/css/font-awesome.css">
+        {{#if copy_fonts}}
+        <link rel="stylesheet" href="{{ path_to_root }}fonts/fonts.css">
+        {{/if}}
+
+        <!-- Highlight.js Stylesheets -->
+        <link rel="stylesheet" href="{{ path_to_root }}highlight.css">
+        <link rel="stylesheet" href="{{ path_to_root }}tomorrow-night.css">
+        <link rel="stylesheet" href="{{ path_to_root }}ayu-highlight.css">
+
+        <!-- Custom theme stylesheets -->
+        {{#each additional_css}}
+        <link rel="stylesheet" href="{{ ../path_to_root }}{{ this }}">
+        {{/each}}
+
+        {{#if mathjax_support}}
+        <!-- MathJax -->
+        <script async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
+        {{/if}}
+    </head>
+    <body class="sidebar-visible no-js">
+    <div id="body-container">
+        <!-- Provide site root to javascript -->
+        <script>
+            var path_to_root = "{{ path_to_root }}";
+            var default_theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? "{{ preferred_dark_theme }}" : "{{ default_theme }}";
+        </script>
+
+        <!-- Work around some values being stored in localStorage wrapped in quotes -->
+        <script>
+            try {
+                var theme = localStorage.getItem('mdbook-theme');
+                var sidebar = localStorage.getItem('mdbook-sidebar');
+
+                if (theme.startsWith('"') && theme.endsWith('"')) {
+                    localStorage.setItem('mdbook-theme', theme.slice(1, theme.length - 1));
+                }
+
+                if (sidebar.startsWith('"') && sidebar.endsWith('"')) {
+                    localStorage.setItem('mdbook-sidebar', sidebar.slice(1, sidebar.length - 1));
+                }
+            } catch (e) { }
+        </script>
+
+        <!-- Set the theme before any content is loaded, prevents flash -->
+        <script>
+            var theme;
+            try { theme = localStorage.getItem('mdbook-theme'); } catch(e) { }
+            if (theme === null || theme === undefined) { theme = default_theme; }
+            var html = document.querySelector('html');
+            html.classList.remove('{{ default_theme }}')
+            html.classList.add(theme);
+            var body = document.querySelector('body');
+            body.classList.remove('no-js')
+            body.classList.add('js');
+        </script>
+
+        <input type="checkbox" id="sidebar-toggle-anchor" class="hidden">
+
+        <!-- Hide / unhide sidebar before it is displayed -->
+        <script>
+            var body = document.querySelector('body');
+            var sidebar = null;
+            var sidebar_toggle = document.getElementById("sidebar-toggle-anchor");
+            if (document.body.clientWidth >= 1080) {
+                try { sidebar = localStorage.getItem('mdbook-sidebar'); } catch(e) { }
+                sidebar = sidebar || 'visible';
+            } else {
+                sidebar = 'hidden';
+            }
+            sidebar_toggle.checked = sidebar === 'visible';
+            body.classList.remove('sidebar-visible');
+            body.classList.add("sidebar-" + sidebar);
+        </script>
+
+        <nav id="sidebar" class="sidebar" aria-label="Table of contents">
+            <div class="sidebar-scrollbox">
+                {{#toc}}{{/toc}}
+            </div>
+            <div id="sidebar-resize-handle" class="sidebar-resize-handle">
+                <div class="sidebar-resize-indicator"></div>
+            </div>
+        </nav>
+
+        <!-- Track and set sidebar scroll position -->
+        <script>
+            var sidebarScrollbox = document.querySelector('#sidebar .sidebar-scrollbox');
+            sidebarScrollbox.addEventListener('click', function(e) {
+                if (e.target.tagName === 'A') {
+                    sessionStorage.setItem('sidebar-scroll', sidebarScrollbox.scrollTop);
+                }
+            }, { passive: true });
+            var sidebarScrollTop = sessionStorage.getItem('sidebar-scroll');
+            sessionStorage.removeItem('sidebar-scroll');
+            if (sidebarScrollTop) {
+                // preserve sidebar scroll position when navigating via links within sidebar
+                sidebarScrollbox.scrollTop = sidebarScrollTop;
+            } else {
+                // scroll sidebar to current active section when navigating via "next/previous chapter" buttons
+                var activeSection = document.querySelector('#sidebar .active');
+                if (activeSection) {
+                    activeSection.scrollIntoView({ block: 'center' });
+                }
+            }
+        </script>
+
+        <div id="page-wrapper" class="page-wrapper">
+
+            <div class="page">
+                {{> header}}
+                <div id="menu-bar-hover-placeholder"></div>
+                <div id="menu-bar" class="menu-bar sticky">
+                    <div class="left-buttons">
+                        <label id="sidebar-toggle" class="icon-button" for="sidebar-toggle-anchor" title="Toggle Table of Contents" aria-label="Toggle Table of Contents" aria-controls="sidebar">
+                            <i class="fa fa-bars"></i>
+                        </label>
+
+                        <!-- TODO remove weird padding here -->
+                        <button id="theme-toggle" class="icon-button" type="button" title="Change theme" aria-label="Change theme" aria-haspopup="true" aria-expanded="false" aria-controls="theme-list">
+                            <i class="fa fa-paint-brush"></i>
+                        </button>
+                        <ul id="theme-list" class="theme-popup" aria-label="Themes" role="menu">
+                            <li role="none"><button role="menuitem" class="theme" id="light">Light</button></li>
+                            <li role="none"><button role="menuitem" class="theme" id="coal">Dark</button></li>
+                        </ul>
+
+                        <!-- CUSTOM -->
+                        <!-- TODO style when open -->
+                        <select id="dropdown-menu" class="icon-button">
+                            <option value="">SDKS</option>
+                            <option value="https://nymtech.net/docs/sdk/rust/rust.html">Rust</option>
+                            <option value="https://sdk.nymtech.net">Typescript</option>
+                        </select>
+
+                        <!-- TODO style when open -->
+                        <select id="dropdown-menu2" class="icon-button">
+                            <option value="">Doc Sites</option>
+                            <option value="https://nymtech.net/developers">Dev Portal</option>
+                            <option value="https://nymtech.net/docs/introduction.html">Network Docs</option>
+                            <option value="https://https://nymtech.net/operators">Operator Docs</option>
+                        </select>
+
+                        <script>
+                            document.getElementById('dropdown-menu').addEventListener('change', function() {
+                                const selected = this.options[this.selectedIndex];
+                                if (selected.value !== '') {
+                                    window.location.href = selected.value;
+                                }
+                            });
+                        </script>
+
+                        <script>
+                            document.getElementById('dropdown-menu2').addEventListener('change', function() {
+                                const selected = this.options[this.selectedIndex];
+                                if (selected.value !== '') {
+                                    window.location.href = selected.value;
+                                }
+                            });
+                        </script>
+                        <!-- END CUSTOM -->
+
+                    </div>
+
+                    <h1 class="menu-title">{{ book_title }}</h1>
+
+                    <div class="right-buttons">
+                        {{#if search_enabled}}
+                            <button id="search-toggle" class="icon-button" type="button" title="Search. (Shortkey: s)" aria-label="Toggle Searchbar" aria-expanded="false" aria-keyshortcuts="S" aria-controls="searchbar">
+                                <i class="fa fa-search"></i>
+                            </button>
+                        {{/if}}
+                        {{#if print_enable}}
+                        <a href="{{ path_to_root }}print.html" title="Print this book" aria-label="Print this book">
+                            <i id="print-button" class="fa fa-print"></i>
+                        </a>
+                        {{/if}}
+                        {{#if git_repository_url}}
+                        <a href="{{git_repository_url}}" title="Git repository" aria-label="Git repository">
+                            <i id="git-repository-button" class="fa {{git_repository_icon}}"></i>
+                        </a>
+                        {{/if}}
+                        {{#if git_repository_edit_url}}
+                        <a href="{{git_repository_edit_url}}" title="Suggest an edit" aria-label="Suggest an edit">
+                            <i id="git-edit-button" class="fa fa-edit"></i>
+                        </a>
+                        {{/if}}
+
+                    </div>
+                </div>
+
+                {{#if search_enabled}}
+                <div id="search-wrapper" class="hidden">
+                    <form id="searchbar-outer" class="searchbar-outer">
+                        <input type="search" id="searchbar" name="searchbar" placeholder="Search this book ..." aria-controls="searchresults-outer" aria-describedby="searchresults-header">
+                    </form>
+                    <div id="searchresults-outer" class="searchresults-outer hidden">
+                        <div id="searchresults-header" class="searchresults-header"></div>
+                        <ul id="searchresults">
+                        </ul>
+                    </div>
+                </div>
+                {{/if}}
+
+                <!-- Apply ARIA attributes after the sidebar and the sidebar toggle button are added to the DOM -->
+                <script>
+                    document.getElementById('sidebar-toggle').setAttribute('aria-expanded', sidebar === 'visible');
+                    document.getElementById('sidebar').setAttribute('aria-hidden', sidebar !== 'visible');
+                    Array.from(document.querySelectorAll('#sidebar a')).forEach(function(link) {
+                        link.setAttribute('tabIndex', sidebar === 'visible' ? 0 : -1);
+                    });
+                </script>
+
+                <div id="content" class="content">
+                    <main>
+                        <main>
+                            <div class="content-wrap">
+                        {{{ content }}}
+                            </div>
+                            <div class="sidetoc">
+                                <nav class="pagetoc"></nav>
+                            </div>
+                        </main>
+                    </main>
+
+                    <nav class="nav-wrapper" aria-label="Page navigation">
+                        <!-- Mobile navigation buttons -->
+                        {{#previous}}
+                            <a rel="prev" href="{{ path_to_root }}{{link}}" class="mobile-nav-chapters previous" title="Previous chapter" aria-label="Previous chapter" aria-keyshortcuts="Left">
+                                <i class="fa fa-angle-left"></i>
+                            </a>
+                        {{/previous}}
+
+                        {{#next}}
+                            <a rel="next prefetch" href="{{ path_to_root }}{{link}}" class="mobile-nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
+                                <i class="fa fa-angle-right"></i>
+                            </a>
+                        {{/next}}
+
+                        <div style="clear: both"></div>
+                    </nav>
+                </div>
+            </div>
+
+            <nav class="nav-wide-wrapper" aria-label="Page navigation">
+                {{#previous}}
+                    <a rel="prev" href="{{ path_to_root }}{{link}}" class="nav-chapters previous" title="Previous chapter" aria-label="Previous chapter" aria-keyshortcuts="Left">
+                        <i class="fa fa-angle-left"></i>
+                    </a>
+                {{/previous}}
+
+                {{#next}}
+                    <a rel="next prefetch" href="{{ path_to_root }}{{link}}" class="nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
+                        <i class="fa fa-angle-right"></i>
+                    </a>
+                {{/next}}
+            </nav>
+
+        </div>
+
+        {{#if live_reload_endpoint}}
+        <!-- Livereload script (if served using the cli tool) -->
+        <script>
+            const wsProtocol = location.protocol === 'https:' ? 'wss:' : 'ws:';
+            const wsAddress = wsProtocol + "//" + location.host + "/" + "{{{live_reload_endpoint}}}";
+            const socket = new WebSocket(wsAddress);
+            socket.onmessage = function (event) {
+                if (event.data === "reload") {
+                    socket.close();
+                    location.reload();
+                }
+            };
+
+            window.onbeforeunload = function() {
+                socket.close();
+            }
+        </script>
+        {{/if}}
+
+        {{#if playground_line_numbers}}
+        <script>
+            window.playground_line_numbers = true;
+        </script>
+        {{/if}}
+
+        {{#if playground_copyable}}
+        <script>
+            window.playground_copyable = true;
+        </script>
+        {{/if}}
+
+        {{#if playground_js}}
+        <script src="{{ path_to_root }}ace.js"></script>
+        <script src="{{ path_to_root }}editor.js"></script>
+        <script src="{{ path_to_root }}mode-rust.js"></script>
+        <script src="{{ path_to_root }}theme-dawn.js"></script>
+        <script src="{{ path_to_root }}theme-tomorrow_night.js"></script>
+        {{/if}}
+
+        {{#if search_js}}
+        <script src="{{ path_to_root }}elasticlunr.min.js"></script>
+        <script src="{{ path_to_root }}mark.min.js"></script>
+        <script src="{{ path_to_root }}searcher.js"></script>
+        {{/if}}
+
+        <script src="{{ path_to_root }}clipboard.min.js"></script>
+        <script src="{{ path_to_root }}highlight.js"></script>
+        <script src="{{ path_to_root }}book.js"></script>
+
+        <!-- Custom JS scripts -->
+        {{#each additional_js}}
+        <script src="{{ ../path_to_root }}{{this}}"></script>
+        {{/each}}
+
+        {{#if is_print}}
+        {{#if mathjax_support}}
+        <script>
+        window.addEventListener('load', function() {
+            MathJax.Hub.Register.StartupHook('End', function() {
+                window.setTimeout(window.print, 100);
+            });
+        });
+        </script>
+        {{else}}
+        <script>
+        window.addEventListener('load', function() {
+            window.setTimeout(window.print, 100);
+        });
+        </script>
+        {{/if}}
+        {{/if}}
+
+
+    </div>
+    </body>
+</html>
diff --git a/documentation/docs/mdbook-admonish.css b/documentation/docs/nym_themes/mdbook-admonish.css
similarity index 100%
rename from documentation/docs/mdbook-admonish.css
rename to documentation/docs/nym_themes/mdbook-admonish.css
diff --git a/documentation/docs/nym_themes/pagetoc.css b/documentation/docs/nym_themes/pagetoc.css
new file mode 100644
index 0000000000..651572ce55
--- /dev/null
+++ b/documentation/docs/nym_themes/pagetoc.css
@@ -0,0 +1,101 @@
+:root {
+    --toc-width: 270px;
+    --center-content-toc-shift: calc(-1 * var(--toc-width) / 2);
+}
+
+.nav-chapters {
+    /* adjust width of buttons that bring to the previous or the next page */
+    min-width: 50px;
+}
+
+.previous {
+    /*
+    adjust the space between the left sidebar or the left side of the screen 
+    and the button that leads to the previous page
+    */
+    margin-left: var(--page-padding);
+}
+
+@media only screen {
+    main {
+        display: flex;
+    }
+
+    @media (max-width: 1179px) {
+        .sidebar-hidden .sidetoc {
+            display: none;
+        }
+    }
+
+    @media (max-width: 1439px) {
+        .sidebar-visible .sidetoc {
+            display: none;
+        }
+    }
+
+    @media (1180px <= width <= 1439px) {
+        .sidebar-hidden main {
+            position: relative;
+            left: var(--center-content-toc-shift);
+        }
+    }
+
+    @media (1440px <= width <= 1700px) {
+        .sidebar-visible main {
+            position: relative;
+            left: var(--center-content-toc-shift);
+        }
+    }
+
+    .content-wrap {
+        overflow-y: auto;
+        width: 100%;
+    }
+
+    .sidetoc {
+        margin-top: 20px;
+        margin-left: 10px;
+        margin-right: auto;
+    }
+    .pagetoc {
+        position: fixed;
+        /* adjust TOC width */
+        width: var(--toc-width);
+        height: calc(100vh - var(--menu-bar-height) - 0.67em * 4);
+        overflow: auto;
+    }
+    .pagetoc a {
+        border-left: 1px solid var(--sidebar-bg);
+        color: var(--fg) !important;
+        display: block;
+        padding-bottom: 5px;
+        padding-top: 5px;
+        padding-left: 10px;
+        text-align: left;
+        text-decoration: none;
+    }
+    .pagetoc a:hover,
+    .pagetoc a.active {
+        background: var(--sidebar-bg);
+        color: var(--sidebar-fg) !important;
+    }
+    .pagetoc .active {
+        background: var(--sidebar-bg);
+        color: var(--sidebar-fg);
+    }
+    .pagetoc .pagetoc-H2 {
+        padding-left: 20px;
+    }
+    .pagetoc .pagetoc-H3 {
+        padding-left: 40px;
+    }
+    .pagetoc .pagetoc-H4 {
+        padding-left: 60px;
+    }
+}
+
+@media print {
+    .sidetoc {
+        display: none;
+    }
+}
diff --git a/documentation/docs/nym_themes/pagetoc.js b/documentation/docs/nym_themes/pagetoc.js
new file mode 100644
index 0000000000..490d9e4c31
--- /dev/null
+++ b/documentation/docs/nym_themes/pagetoc.js
@@ -0,0 +1,114 @@
+function forEach(elems, fun) {
+  Array.prototype.forEach.call(elems, fun);
+}
+
+function getPagetoc(){
+  return document.getElementsByClassName("pagetoc")[0]
+}
+
+function getPagetocElems() {
+  return getPagetoc().children;
+}
+
+function getHeaders(){
+  return document.getElementsByClassName("header")
+}
+
+// Un-active everything when you click it
+function forPagetocElem(fun) {
+  forEach(getPagetocElems(), fun);
+}
+
+function getRect(element) {
+  return element.getBoundingClientRect();
+}
+
+function overflowTop(container, element) {
+  return getRect(container).top - getRect(element).top;
+}
+
+function overflowBottom(container, element) {
+  return getRect(container).bottom - getRect(element).bottom;
+}
+
+var activeHref = location.href;
+
+var updateFunction = function (elem = undefined) {
+  var id = elem;
+
+  if (!id && location.href != activeHref) {
+    activeHref = location.href;
+    forPagetocElem(function (el) {
+      if (el.href === activeHref) {
+        id = el;
+      }
+    });
+  }
+
+  if (!id) {
+    var elements = getHeaders();
+    let margin = window.innerHeight / 3;
+
+    forEach(elements, function (el, i, arr) {
+      if (!id && getRect(el).top >= 0) {
+        if (getRect(el).top < margin) {
+          id = el;
+        } else {
+          id = arr[Math.max(0, i - 1)];
+        }
+      }
+      // a very long last section
+      // its heading is over the screen
+      if (!id && i == arr.length - 1) {
+        id = el
+      }
+    });
+  }
+
+  forPagetocElem(function (el) {
+    el.classList.remove("active");
+  });
+
+  if (!id) return;
+
+  forPagetocElem(function (el) {
+    if (id.href.localeCompare(el.href) == 0) {
+      el.classList.add("active");
+      let pagetoc = getPagetoc();
+      if (overflowTop(pagetoc, el) > 0) {
+        pagetoc.scrollTop = el.offsetTop;
+      }
+      if (overflowBottom(pagetoc, el) < 0) {
+        pagetoc.scrollTop -= overflowBottom(pagetoc, el);
+      }
+    }
+  });
+};
+
+let elements = getHeaders();
+
+if (elements.length > 1) {
+  // Populate sidebar on load
+  window.addEventListener("load", function () {
+    var pagetoc = getPagetoc();
+    var elements = getHeaders();
+    forEach(elements, function (el) {
+      var link = document.createElement("a");
+      link.appendChild(document.createTextNode(el.text));
+      link.href = el.hash;
+      link.classList.add("pagetoc-" + el.parentElement.tagName);
+      pagetoc.appendChild(link);
+      link.onclick = function () {
+        updateFunction(link);
+      };
+    });
+    updateFunction();
+  });
+
+  // Handle active elements on scroll
+  window.addEventListener("scroll", function () {
+    updateFunction();
+  });
+} else {
+  document.getElementsByClassName("sidetoc")[0].remove();
+}
diff --git a/documentation/docs/theme/css/variables.css b/documentation/docs/theme/css/variables.css
deleted file mode 100644
index 8dfcf92239..0000000000
--- a/documentation/docs/theme/css/variables.css
+++ /dev/null
@@ -1,3257 +0,0 @@
-
-/* Globals */
-
-:root {
-    --sidebar-width: 300px;
-    --page-padding: 20px;
-    --content-max-width: 70%;
-    --menu-bar-height: 40px;
-    --mono-font: "Source Code Pro", Consolas, "Ubuntu Mono", Menlo, "DejaVu Sans Mono", monospace, monospace;
-    --code-font-size: 0.875em /* please adjust the ace font size accordingly in editor.js */
-    --pagetoc-width: 13%;
-    --pagetoc-fontsize: 14.5px;
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-/* Themes */
-
-.ayu {
-    --bg: hsl(210, 25%, 8%);
-    --fg: #c5c5c5;
-
-    --sidebar-bg: #14191f;
-    --sidebar-fg: #c8c9db;
-    --sidebar-non-existant: #5c6773;
-    --sidebar-active: #ffb454;
-    --sidebar-spacer: #2d334f;
-
-    --scrollbar: var(--sidebar-fg);
-
-    --icons: #737480;
-    --icons-hover: #b7b9cc;
-
-    --links: #0096cf;
-
-    --inline-code-color: #ffb454;
-
-    --theme-popup-bg: #14191f;
-    --theme-popup-border: #5c6773;
-    --theme-hover: #191f26;
-
-    --quote-bg: hsl(226, 15%, 17%);
-    --quote-border: hsl(226, 15%, 22%);
-
-    --table-border-color: hsl(210, 25%, 13%);
-    --table-header-bg: hsl(210, 25%, 28%);
-    --table-alternate-bg: hsl(210, 25%, 11%);
-
-    --searchbar-border-color: #848484;
-    --searchbar-bg: #424242;
-    --searchbar-fg: #fff;
-    --searchbar-shadow-color: #d4c89f;
-    --searchresults-header-fg: #666;
-    --searchresults-border-color: #888;
-    --searchresults-li-bg: #252932;
-    --search-mark-bg: #e3b171;
-}
-
-.coal {
-    --bg: hsl(200, 7%, 8%);
-    --fg: #98a3ad;
-
-    --sidebar-bg: #292c2f;
-    --sidebar-fg: #a1adb8;
-    --sidebar-non-existant: #505254;
-    --sidebar-active: #3473ad;
-    --sidebar-spacer: #393939;
-
-    --scrollbar: var(--sidebar-fg);
-
-    --icons: #43484d;
-    --icons-hover: #b3c0cc;
-
-    --links: #2b79a2;
-
-    --inline-code-color: #c5c8c6;
-
-    --theme-popup-bg: #141617;
-    --theme-popup-border: #43484d;
-    --theme-hover: #1f2124;
-
-    --quote-bg: hsl(234, 21%, 18%);
-    --quote-border: hsl(234, 21%, 23%);
-
-    --table-border-color: hsl(200, 7%, 13%);
-    --table-header-bg: hsl(200, 7%, 28%);
-    --table-alternate-bg: hsl(200, 7%, 11%);
-
-    --searchbar-border-color: #aaa;
-    --searchbar-bg: #b7b7b7;
-    --searchbar-fg: #000;
-    --searchbar-shadow-color: #aaa;
-    --searchresults-header-fg: #666;
-    --searchresults-border-color: #98a3ad;
-    --searchresults-li-bg: #2b2b2f;
-    --search-mark-bg: #355c7d;
-}
-
-.light {
-    --bg: hsl(0, 0%, 100%);
-    --fg: hsl(0, 0%, 0%);
-
-    --sidebar-bg: #fafafa;
-    --sidebar-fg: hsl(0, 0%, 0%);
-    --sidebar-non-existant: #aaaaaa;
-    --sidebar-active: #1f1fff;
-    --sidebar-spacer: #f4f4f4;
-
-    --scrollbar: #8F8F8F;
-
-    --icons: #747474;
-    --icons-hover: #000000;
-
-    --links: #1f1fff;
-
-    --inline-code-color: #F42C4C;
-
-    --theme-popup-bg: #fafafa;
-    --theme-popup-border: #cccccc;
-    --theme-hover: #e6e6e6;
-
-    --quote-bg: hsl(197, 37%, 96%);
-    --quote-border: hsl(197, 37%, 91%);
-
-    --table-border-color: hsl(0, 0%, 95%);
-    --table-header-bg: hsl(0, 0%, 80%);
-    --table-alternate-bg: hsl(0, 0%, 97%);
-
-    --searchbar-border-color: #aaa;
-    --searchbar-bg: #fafafa;
-    --searchbar-fg: #000;
-    --searchbar-shadow-color: #aaa;
-    --searchresults-header-fg: #666;
-    --searchresults-border-color: #888;
-    --searchresults-li-bg: #e4f2fe;
-    --search-mark-bg: #a2cff5;
-}
-
-.navy {
-    --bg: hsl(226, 23%, 11%);
-    --fg: #bcbdd0;
-
-    --sidebar-bg: #282d3f;
-    --sidebar-fg: #c8c9db;
-    --sidebar-non-existant: #505274;
-    --sidebar-active: #2b79a2;
-    --sidebar-spacer: #2d334f;
-
-    --scrollbar: var(--sidebar-fg);
-
-    --icons: #737480;
-    --icons-hover: #b7b9cc;
-
-    --links: #2b79a2;
-
-    --inline-code-color: #c5c8c6;
-
-    --theme-popup-bg: #161923;
-    --theme-popup-border: #737480;
-    --theme-hover: #282e40;
-
-    --quote-bg: hsl(226, 15%, 17%);
-    --quote-border: hsl(226, 15%, 22%);
-
-    --table-border-color: hsl(226, 23%, 16%);
-    --table-header-bg: hsl(226, 23%, 31%);
-    --table-alternate-bg: hsl(226, 23%, 14%);
-
-    --searchbar-border-color: #aaa;
-    --searchbar-bg: #aeaec6;
-    --searchbar-fg: #000;
-    --searchbar-shadow-color: #aaa;
-    --searchresults-header-fg: #5f5f71;
-    --searchresults-border-color: #5c5c68;
-    --searchresults-li-bg: #242430;
-    --search-mark-bg: #a2cff5;
-}
-
-.rust {
-    --bg: hsl(60, 9%, 87%);
-    --fg: #262625;
-
-    --sidebar-bg: #3b2e2a;
-    --sidebar-fg: #c8c9db;
-    --sidebar-non-existant: #505254;
-    --sidebar-active: #e69f67;
-    --sidebar-spacer: #45373a;
-
-    --scrollbar: var(--sidebar-fg);
-
-    --icons: #737480;
-    --icons-hover: #262625;
-
-    --links: #2b79a2;
-
-    --inline-code-color: #6e6b5e;
-
-    --theme-popup-bg: #e1e1db;
-    --theme-popup-border: #b38f6b;
-    --theme-hover: #99908a;
-
-    --quote-bg: hsl(60, 5%, 75%);
-    --quote-border: hsl(60, 5%, 70%);
-
-    --table-border-color: hsl(60, 9%, 82%);
-    --table-header-bg: #b3a497;
-    --table-alternate-bg: hsl(60, 9%, 84%);
-
-    --searchbar-border-color: #aaa;
-    --searchbar-bg: #fafafa;
-    --searchbar-fg: #000;
-    --searchbar-shadow-color: #aaa;
-    --searchresults-header-fg: #666;
-    --searchresults-border-color: #888;
-    --searchresults-li-bg: #dec2a2;
-    --search-mark-bg: #e69f67;
-}
-
-@media (prefers-color-scheme: dark) {
-    .light.no-js {
-        --bg: hsl(200, 7%, 8%);
-        --fg: #98a3ad;
-
-        --sidebar-bg: #292c2f;
-        --sidebar-fg: #a1adb8;
-        --sidebar-non-existant: #505254;
-        --sidebar-active: #3473ad;
-        --sidebar-spacer: #393939;
-
-        --scrollbar: var(--sidebar-fg);
-
-        --icons: #43484d;
-        --icons-hover: #b3c0cc;
-
-        --links: #2b79a2;
-
-        --inline-code-color: #c5c8c6;
-
-        --theme-popup-bg: #141617;
-        --theme-popup-border: #43484d;
-        --theme-hover: #1f2124;
-
-        --quote-bg: hsl(234, 21%, 18%);
-        --quote-border: hsl(234, 21%, 23%);
-
-        --table-border-color: hsl(200, 7%, 13%);
-        --table-header-bg: hsl(200, 7%, 28%);
-        --table-alternate-bg: hsl(200, 7%, 11%);
-
-        --searchbar-border-color: #aaa;
-        --searchbar-bg: #b7b7b7;
-        --searchbar-fg: #000;
-        --searchbar-shadow-color: #aaa;
-        --searchresults-header-fg: #666;
-        --searchresults-border-color: #98a3ad;
-        --searchresults-li-bg: #2b2b2f;
-        --search-mark-bg: #355c7d;
-    }
-}
diff --git a/documentation/docs/theme/index.hbs b/documentation/docs/theme/index.hbs
deleted file mode 100644
index 06a3731f33..0000000000
--- a/documentation/docs/theme/index.hbs
+++ /dev/null
@@ -1,1063 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="{{ language }}" class="sidebar-visible no-js {{ default_theme }}">
-    <head>
-        <!-- Book generated using mdBook -->
-        <meta charset="UTF-8">
-        <title>{{ title }}</title>
-        {{#if is_print }}
-        <meta name="robots" content="noindex" />
-        {{/if}}
-        {{#if base_url}}
-        <base href="{{ base_url }}">
-        {{/if}}
-
-
-        <!-- Custom HTML head -->
-        {{> head}}
-
-        <meta name="description" content="{{ description }}">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <meta name="theme-color" content="#ffffff" />
-
-        {{#if favicon_svg}}
-        <link rel="icon" href="{{ path_to_root }}favicon.svg">
-        {{/if}}
-        {{#if favicon_png}}
-        <link rel="shortcut icon" href="{{ path_to_root }}favicon.png">
-        {{/if}}
-        <link rel="stylesheet" href="{{ path_to_root }}css/variables.css">
-        <link rel="stylesheet" href="{{ path_to_root }}css/general.css">
-        <link rel="stylesheet" href="{{ path_to_root }}css/chrome.css">
-        {{#if print_enable}}
-        <link rel="stylesheet" href="{{ path_to_root }}css/print.css" media="print">
-        {{/if}}
-
-        <!-- Fonts -->
-        <link rel="stylesheet" href="{{ path_to_root }}FontAwesome/css/font-awesome.css">
-        {{#if copy_fonts}}
-        <link rel="stylesheet" href="{{ path_to_root }}fonts/fonts.css">
-        {{/if}}
-
-        <!-- Highlight.js Stylesheets -->
-        <link rel="stylesheet" href="{{ path_to_root }}highlight.css">
-        <link rel="stylesheet" href="{{ path_to_root }}tomorrow-night.css">
-        <link rel="stylesheet" href="{{ path_to_root }}ayu-highlight.css">
-
-        <!-- Custom theme stylesheets -->
-        {{#each additional_css}}
-        <link rel="stylesheet" href="{{ ../path_to_root }}{{ this }}">
-        {{/each}}
-
-        {{#if mathjax_support}}
-        <!-- MathJax -->
-        <script async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
-        {{/if}}
-    </head>
-    <body>
-        <!-- Provide site root to javascript -->
-        <script>
-            var path_to_root = "{{ path_to_root }}";
-            var default_theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? "{{ preferred_dark_theme }}" : "{{ default_theme }}";
-        </script>
-
-        <!-- Work around some values being stored in localStorage wrapped in quotes -->
-        <script>
-            try {
-                var theme = localStorage.getItem('mdbook-theme');
-                var sidebar = localStorage.getItem('mdbook-sidebar');
-
-                if (theme.startsWith('"') && theme.endsWith('"')) {
-                    localStorage.setItem('mdbook-theme', theme.slice(1, theme.length - 1));
-                }
-
-                if (sidebar.startsWith('"') && sidebar.endsWith('"')) {
-                    localStorage.setItem('mdbook-sidebar', sidebar.slice(1, sidebar.length - 1));
-                }
-            } catch (e) { }
-        </script>
-
-        <!-- Set the theme before any content is loaded, prevents flash -->
-        <script>
-            var theme;
-            try { theme = localStorage.getItem('mdbook-theme'); } catch(e) { }
-            if (theme === null || theme === undefined) { theme = default_theme; }
-            var html = document.querySelector('html');
-            html.classList.remove('no-js')
-            html.classList.remove('{{ default_theme }}')
-            html.classList.add(theme);
-            html.classList.add('js');
-        </script>
-
-        <!-- Hide / unhide sidebar before it is displayed -->
-        <script>
-            var html = document.querySelector('html');
-            var sidebar = 'hidden';
-            if (document.body.clientWidth >= 1080) {
-                try { sidebar = localStorage.getItem('mdbook-sidebar'); } catch(e) { }
-                sidebar = sidebar || 'visible';
-            }
-            html.classList.remove('sidebar-visible');
-            html.classList.add("sidebar-" + sidebar);
-        </script>
-
-        <nav id="sidebar" class="sidebar" aria-label="Table of contents">
-            <div class="sidebar-scrollbox">
-                {{#toc}}{{/toc}}
-            </div>
-            <div id="sidebar-resize-handle" class="sidebar-resize-handle"></div>
-        </nav>
-
-        <div id="page-wrapper" class="page-wrapper">
-
-            <div class="page">
-                {{> header}}
-                <div id="menu-bar-hover-placeholder"></div>
-                <div id="menu-bar" class="menu-bar sticky bordered">
-                    <div class="left-buttons">
-                        <button id="sidebar-toggle" class="icon-button" type="button" title="Toggle Table of Contents" aria-label="Toggle Table of Contents" aria-controls="sidebar">
-                            <i class="fa fa-bars"></i>
-                        </button>
-                        <button id="theme-toggle" class="icon-button" type="button" title="Change theme" aria-label="Change theme" aria-haspopup="true" aria-expanded="false" aria-controls="theme-list">
-                            <i class="fa fa-paint-brush"></i>
-                        </button>
-                        <ul id="theme-list" class="theme-popup" aria-label="Themes" role="menu">
-                            <li role="none"><button role="menuitem" class="theme" id="light">Light</button></li>
-                            <li role="none"><button role="menuitem" class="theme" id="rust">Rust</button></li>
-                            <li role="none"><button role="menuitem" class="theme" id="coal">Coal</button></li>
-                            <li role="none"><button role="menuitem" class="theme" id="navy">Navy</button></li>
-                            <li role="none"><button role="menuitem" class="theme" id="ayu">Ayu</button></li>
-                        </ul>
-                        {{#if search_enabled}}
-                        <button id="search-toggle" class="icon-button" type="button" title="Search. (Shortkey: s)" aria-label="Toggle Searchbar" aria-expanded="false" aria-keyshortcuts="S" aria-controls="searchbar">
-                            <i class="fa fa-search"></i>
-                        </button>
-                        {{/if}}
-                    </div>
-
-                    <h1 class="menu-title">{{ book_title }}</h1>
-
-                    <div class="right-buttons">
-                        {{#if print_enable}}
-                        <a href="{{ path_to_root }}print.html" title="Print this book" aria-label="Print this book">
-                            <i id="print-button" class="fa fa-print"></i>
-                        </a>
-                        {{/if}}
-                        {{#if git_repository_url}}
-                        <a href="{{git_repository_url}}" title="Git repository" aria-label="Git repository">
-                            <i id="git-repository-button" class="fa {{git_repository_icon}}"></i>
-                        </a>
-                        {{/if}}
-                        {{#if git_repository_edit_url}}
-                        <a href="{{git_repository_edit_url}}" title="Suggest an edit" aria-label="Suggest an edit">
-                            <i id="git-edit-button" class="fa fa-edit"></i>
-                        </a>
-                        {{/if}}
-
-                    </div>
-                </div>
-
-                {{#if search_enabled}}
-                <div id="search-wrapper" class="hidden">
-                    <form id="searchbar-outer" class="searchbar-outer">
-                        <input type="search" id="searchbar" name="searchbar" placeholder="Search this book ..." aria-controls="searchresults-outer" aria-describedby="searchresults-header">
-                    </form>
-                    <div id="searchresults-outer" class="searchresults-outer hidden">
-                        <div id="searchresults-header" class="searchresults-header"></div>
-                        <ul id="searchresults">
-                        </ul>
-                    </div>
-                </div>
-                {{/if}}
-
-                <!-- Apply ARIA attributes after the sidebar and the sidebar toggle button are added to the DOM -->
-                <script>
-                    document.getElementById('sidebar-toggle').setAttribute('aria-expanded', sidebar === 'visible');
-                    document.getElementById('sidebar').setAttribute('aria-hidden', sidebar !== 'visible');
-                    Array.from(document.querySelectorAll('#sidebar a')).forEach(function(link) {
-                        link.setAttribute('tabIndex', sidebar === 'visible' ? 0 : -1);
-                    });
-                </script>
-
-                <div id="content" class="content">
-                    <main>
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        {{{ content }}}
-                    </main>
-
-                    <nav class="nav-wrapper" aria-label="Page navigation">
-                        <!-- Mobile navigation buttons -->
-                        {{#previous}}
-                            <a rel="prev" href="{{ path_to_root }}{{link}}" class="mobile-nav-chapters previous" title="Previous chapter" aria-label="Previous chapter" aria-keyshortcuts="Left">
-                                <i class="fa fa-angle-left"></i>
-                            </a>
-                        {{/previous}}
-
-                        {{#next}}
-                            <a rel="next" href="{{ path_to_root }}{{link}}" class="mobile-nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
-                                <i class="fa fa-angle-right"></i>
-                            </a>
-                        {{/next}}
-
-                        <div style="clear: both"></div>
-                    </nav>
-                </div>
-            </div>
-
-            <nav class="nav-wide-wrapper" aria-label="Page navigation">
-                {{#previous}}
-                    <a rel="prev" href="{{ path_to_root }}{{link}}" class="nav-chapters previous" title="Previous chapter" aria-label="Previous chapter" aria-keyshortcuts="Left">
-                        <i class="fa fa-angle-left"></i>
-                    </a>
-                {{/previous}}
-
-                {{#next}}
-                    <a rel="next" href="{{ path_to_root }}{{link}}" class="nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
-                        <i class="fa fa-angle-right"></i>
-                    </a>
-                {{/next}}
-            </nav>
-
-        </div>
-
-        {{#if live_reload_endpoint}}
-        <!-- Livereload script (if served using the cli tool) -->
-        <script>
-            const wsProtocol = location.protocol === 'https:' ? 'wss:' : 'ws:';
-            const wsAddress = wsProtocol + "//" + location.host + "/" + "{{{live_reload_endpoint}}}";
-            const socket = new WebSocket(wsAddress);
-            socket.onmessage = function (event) {
-                if (event.data === "reload") {
-                    socket.close();
-                    location.reload();
-                }
-            };
-
-            window.onbeforeunload = function() {
-                socket.close();
-            }
-        </script>
-        {{/if}}
-
-        {{#if google_analytics}}
-        <!-- Google Analytics Tag -->
-        <script>
-            var localAddrs = ["localhost", "127.0.0.1", ""];
-
-            // make sure we don't activate google analytics if the developer is
-            // inspecting the book locally...
-            if (localAddrs.indexOf(document.location.hostname) === -1) {
-                (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-                (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-                m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-                })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-                ga('create', '{{google_analytics}}', 'auto');
-                ga('send', 'pageview');
-            }
-        </script>
-        {{/if}}
-
-        {{#if playground_line_numbers}}
-        <script>
-            window.playground_line_numbers = true;
-        </script>
-        {{/if}}
-
-        {{#if playground_copyable}}
-        <script>
-            window.playground_copyable = true;
-        </script>
-        {{/if}}
-
-        {{#if playground_js}}
-        <script src="{{ path_to_root }}ace.js"></script>
-        <script src="{{ path_to_root }}editor.js"></script>
-        <script src="{{ path_to_root }}mode-rust.js"></script>
-        <script src="{{ path_to_root }}theme-dawn.js"></script>
-        <script src="{{ path_to_root }}theme-tomorrow_night.js"></script>
-        {{/if}}
-
-        {{#if search_js}}
-        <script src="{{ path_to_root }}elasticlunr.min.js"></script>
-        <script src="{{ path_to_root }}mark.min.js"></script>
-        <script src="{{ path_to_root }}searcher.js"></script>
-        {{/if}}
-
-        <script src="{{ path_to_root }}clipboard.min.js"></script>
-        <script src="{{ path_to_root }}highlight.js"></script>
-        <script src="{{ path_to_root }}book.js"></script>
-
-        <!-- Custom JS scripts -->
-        {{#each additional_js}}
-        <script src="{{ ../path_to_root }}{{this}}"></script>
-        {{/each}}
-
-        {{#if is_print}}
-        {{#if mathjax_support}}
-        <script>
-        window.addEventListener('load', function() {
-            MathJax.Hub.Register.StartupHook('End', function() {
-                window.setTimeout(window.print, 100);
-            });
-        });
-        </script>
-        {{else}}
-        <script>
-        window.addEventListener('load', function() {
-            window.setTimeout(window.print, 100);
-        });
-        </script>
-        {{/if}}
-        {{/if}}
-
-    </body>
-</html>
diff --git a/documentation/docs/theme/pagetoc.css b/documentation/docs/theme/pagetoc.css
deleted file mode 100644
index a68e5b8e21..0000000000
--- a/documentation/docs/theme/pagetoc.css
+++ /dev/null
@@ -1,47 +0,0 @@
-/* src: https://github.com/JorelAli/mdBook-pagetoc */
-
-@media only screen and (max-width:1439px) {
-    .sidetoc {
-        display: none;
-    }
-}
-
-@media only screen and (min-width:1440px) {
-    main {
-        position: relative;
-    }
-    .sidetoc {
-        margin-left: auto;
-        margin-right: auto;
-        /* left: calc(90% + (var(--content-min-width))/4 - 110px); */
-        left: 101%;
-        position: absolute;
-        font-size: var(--pagetoc-fontsize);
-    }
-    .pagetoc {
-        position: fixed;
-        width: var(--pagetoc-width);
-    }
-    .pagetoc a {
-        border-left: 1px solid var(--sidebar-bg);
-        /* color: var(--fg); */
-        /* color: var(--sidebar-fg); */
-        color: var(--links);
-        display: block;
-        padding-bottom: 5px;
-        padding-top: 5px;
-        padding-left: 10px;
-        text-align: left;
-        text-decoration: none;
-        font-weight: normal;
-        background: var(--sidebar-bg);
-    }
-    .pagetoc a:hover,
-    .pagetoc a.active {
-        background: var(--sidebar-bg);
-        /* color: var(--sidebar-fg); */
-        color: var(--sidebar-active);
-        font-weight: bold;
-        font-size: var(--pagetoc-fontsize);
-    }
-}
diff --git a/documentation/docs/theme/pagetoc.js b/documentation/docs/theme/pagetoc.js
deleted file mode 100644
index b11052427e..0000000000
--- a/documentation/docs/theme/pagetoc.js
+++ /dev/null
@@ -1,68 +0,0 @@
-// src: https://github.com/JorelAli/mdBook-pagetoc
-
-// Un-active everything when you click it
-Array.prototype.forEach.call(document.getElementsByClassName("pagetoc")[0].children, function(el, i) {
-    el.addEventHandler("click", function() {
-        Array.prototype.forEach.call(document.getElementsByClassName("pagetoc")[0].children, function(el, i) {
-            el.classList.remove("active");
-        });
-        el.classList.add("active");
-    });
-});
-
-var updateFunction = function() {
-
-    var id;
-    var elements = document.getElementsByClassName("header");
-    Array.prototype.forEach.call(elements, function(el, i) {
-        if (window.pageYOffset >= el.offsetTop) {
-            id = el;
-        }
-    });
-
-    Array.prototype.forEach.call(document.getElementsByClassName("pagetoc")[0].children, function(el, i) {
-        el.classList.remove("active");
-    });
-
-    Array.prototype.forEach.call(document.getElementsByClassName("pagetoc")[0].children, function(el, i) {
-        if (id.href.localeCompare(el.href) == 0) {
-            el.classList.add("active");
-        }
-    });
-};
-
-// Populate sidebar on load
-window.addEventListener('load', function() {
-    var pagetoc = document.getElementsByClassName("pagetoc")[0];
-    var elements = document.getElementsByClassName("header");
-    Array.prototype.forEach.call(elements, function(el, i) {
-        var link = document.createElement("a");
-
-        // Indent shows hierarchy
-        var indent = "";
-        switch (el.parentElement.tagName) {
-            case "H2":
-                indent = "20px";
-                break;
-            case "H3":
-                indent = "40px";
-                break;
-            case "H4":
-                indent = "60px";
-                break;
-            default:
-                break;
-        }
-
-        link.appendChild(document.createTextNode(el.text));
-        link.style.paddingLeft = indent;
-        link.href = el.href;
-        pagetoc.appendChild(link);
-    });
-    updateFunction.call();
-});
-
-
-
-// Handle active elements on scroll
-window.addEventListener("scroll", updateFunction);
diff --git a/documentation/operators/book.toml b/documentation/operators/book.toml
index 5ede8ee22a..0f2732e7f3 100644
--- a/documentation/operators/book.toml
+++ b/documentation/operators/book.toml
@@ -1,61 +1,44 @@
 [book]
-title = "Nym Operators Guide"
-authors = ["Max Hampshire", "serinko"]
-description = "Guides to setup Nym infrastructure"
+title = "Nym Docs"
+authors = ["Max Hampshire, Serinko, Alexia Lorenza Martinel"]
+description = "Nym technical documentation"
 language = "en"
-multilingual = false # for the moment - ideally work on chinese, brazillian, spanish next
+multilingual = false # for the moment - ideally work on chinese, brazillian portugese, spanish next
 src = "src"
 
+[rust]
+edition = "2018"
+
 #################
 # PREPROCESSORS #
 #################
 
-# Note if changing these fields:
-# - make sure you aren't running `mdbook serve`
-# - change value of `turn-off = true` to `false`. This is set to `true` usually to avoid a known constant-reload bug with `mdbook serve` and this preprocessor
-# - delete `./theme/` dir
-# - change the preprocessor values that you want to edit
-# - run `mdbook build`: this will rebuild the `./theme` directory
-# - change value of `turn-off` back to `true`
 [preprocessor.theme]
-pagetoc = true
-# some variables related (defined in theme/css/variables.css)
-pagetoc-width            = "13%"
-content-max-width        = "70%" # 82
-pagetoc-fontsize         = "14.5px"
-sidebar-width            = "300px"
-menu-bar-height          = "40px" # memu-bar = the bar on the top
-page-padding             = "20px"
-mobile-content-max-width = "98%"
-
-# layout
-content-padding           = "0 10px"
-content-main-margin-left  = "10%"
-content-main-margin-right = "10%"
-nav-chapters-max-width    = "auto"
-nav-chapters-min-width    = "auto"
-chapter-line-height       = "2em"
-section-line-height       = "1.5em"
-
-# if true, never read and touch the files in theme dir: this is used to stop the looping reload issue referred to in the readme
+sidebar-width             = "280px"
+content-max-width         = "70%"
+content-main-margin-left  = "5%"
+content-main-margin-right = "5%"
+root-font-size            = "70%"
+# DO NOT CHANGE or you might overwrite the custom hbs file
 turn-off = true
 
 [preprocessor.admonish]
 command = "mdbook-admonish"
 assets_version = "3.0.0" # do not edit: managed by `mdbook-admonish install`
 
-# variables preprocessor: import variables into files
 # https://gitlab.com/tglman/mdbook-variables/
 [preprocessor.variables.variables]
 minimum_rust_version = "1.66"
 wallet_release_version = "1.2.8"
+# nym-vpn related variables
+nym_vpn_latest_binary_url = "https://github.com/nymtech/nym/releases/tag/nym-vpn-alpha-0.0.3"
+nym_vpn_form_url = "https://opnform.com/forms/nymvpn-user-research-at-37c3-yccqko-2"
 
 [preprocessor.last-changed]
 command = "mdbook-last-changed"
 renderer = ["html"]
 
-# used for grabbing output of binary commands for automation
-# https://github.com/FauconFan/mdbook-cmdrun
+# used for grabbing output of binary commands for automation https://github.com/FauconFan/mdbook-cmdrun
 [preprocessor.cmdrun]
 
 # more pre-processor plugins to look into from https://github.com/rust-lang/mdBook/wiki/Third-party-plugins & https://lib.rs/keywords/mdbook-preprocessor
@@ -76,20 +59,16 @@ extra-watch-dirs = []             # directories to watch for triggering builds
 ##########
 
 [output.html]
-theme         = "theme" # this is the default if not explicitly set
+theme         = "nym_themes"
 default-theme = "coal"
 preferred-dark-theme = "coal"
 curly-quotes = true
-# mathjax-support = false # useful if we want to pull equations in
 copy-fonts = true
 no-section-label = false
-additional-css = ["theme/pagetoc.css", "./custom.css", "./mdbook-admonish.css"]
-additional-js  = ["theme/pagetoc.js"]
+additional-css = ["./nym_themes/custom.css", "./nym_themes/mdbook-admonish.css", "./nym_themes/pagetoc.css"]
+additional-js  = ["./nym_themes/pagetoc.js"]
 git-repository-url = "https://github.com/nymtech/nym"
 git-repository-icon = "fa-github"
-# edit-url-template = "https://github.com/rust-lang/mdBook/edit/master/guide/{path}"
-site-url = "/operators/"
-# cname = "nymtech.net"
 input-404 = "not-found.md"
 
 [output.html.fold]
@@ -101,7 +80,7 @@ level = 0        # the depth to start folding
 editable = false         # allows editing the source code
 copyable = true          # include the copy button for copying code snippets
 copy-js = true           # includes the JavaScript for the code editor
-line-numbers = false     # displays line numbers for editable code
+line-numbers = true      # displays line numbers for editable code
 runnable = true          # displays a run button for rust code
 
 # options for the built in text search
diff --git a/documentation/operators/custom.css b/documentation/operators/custom.css
deleted file mode 100644
index 855f5eef5f..0000000000
--- a/documentation/operators/custom.css
+++ /dev/null
@@ -1,37 +0,0 @@
-:root {
-  --mono-font: Consolas, "Ubuntu Mono", Menlo, "DejaVu Sans Mono", monospace;
-}
-.coal {
-  --bg: #121726;
-  --fg: #f2f2f2;
-
-  --sidebar-bg: #121726;
-  --sidebar-fg: #f2f2f2;
-  --sidebar-active: #fb6e4e;
-
-  --icons: #f2f2f2;
-  --icons-hover: #fb6e4e;
-
-  --links: #fb6e4e;
-}
-
-.light {
-  --bg: #f4f6f8;
-  --fg: #121726;
-
-  --sidebar-bg: #f4f6f8;
-  --sidebar-fg: #121726;
-  --sidebar-active: #fb6e4e;
-
-  --icons: #121726;
-  --icons-hover: #fb6e4e;
-
-  --links: #fb6e4e;
-}
-
-footer {
-  font-size: 0.8em;
-  text-align: center;
-  border-top: 1px solid black;
-  padding: 5px 0;
-}
diff --git a/documentation/docs/theme/css/chrome.css b/documentation/operators/nym_themes/css/chrome.css
similarity index 69%
rename from documentation/docs/theme/css/chrome.css
rename to documentation/operators/nym_themes/css/chrome.css
index febd1d40a6..a0e30b81ff 100644
--- a/documentation/docs/theme/css/chrome.css
+++ b/documentation/operators/nym_themes/css/chrome.css
@@ -2,12 +2,6 @@
 
 @import 'variables.css';
 
-::-webkit-scrollbar {
-    background: var(--bg);
-}
-::-webkit-scrollbar-thumb {
-    background: var(--scrollbar);
-}
 html {
     scrollbar-color: var(--scrollbar) var(--bg);
 }
@@ -18,6 +12,19 @@ a > .hljs {
     color: var(--links);
 }
 
+/*
+    body-container is necessary because mobile browsers don't seem to like
+    overflow-x on the body tag when there is a <meta name="viewport"> tag.
+*/
+#body-container {
+    /*
+        This is used when the sidebar pushes the body content off the side of
+        the screen on small screens. Without it, dragging on mobile Safari
+        will want to reposition the viewport in a weird way.
+    */
+    overflow-x: clip;
+}
+
 /* Menu Bar */
 
 #menu-bar,
@@ -30,9 +37,9 @@ a > .hljs {
     display: flex;
     flex-wrap: wrap;
     background-color: var(--bg);
-    border-bottom-color: var(--bg);
-    border-bottom-width: 1px;
-    border-bottom-style: solid;
+    border-block-end-color: var(--bg);
+    border-block-end-width: 1px;
+    border-block-end-style: solid;
 }
 #menu-bar.sticky,
 .js #menu-bar-hover-placeholder:hover + #menu-bar,
@@ -49,7 +56,7 @@ a > .hljs {
     height: var(--menu-bar-height);
 }
 #menu-bar.bordered {
-    border-bottom-color: var(--table-border-color);
+    border-block-end-color: var(--table-border-color);
 }
 #menu-bar i, #menu-bar .icon-button {
     position: relative;
@@ -86,11 +93,13 @@ a > .hljs {
     display: flex;
     margin: 0 5px;
 }
-.no-js .left-buttons {
+.no-js .left-buttons button {
     display: none;
 }
 
 .menu-title {
+    position: absolute;
+    left: 50%;
     display: inline-block;
     font-weight: 200;
     font-size: 2.4rem;
@@ -153,7 +162,7 @@ a > .hljs {
 }
 
 .nav-wrapper {
-    margin-top: 50px;
+    margin-block-start: 50px;
     display: none;
 }
 
@@ -166,23 +175,34 @@ a > .hljs {
     background-color: var(--sidebar-bg);
 }
 
-.previous {
-    float: left;
-}
+/* Only Firefox supports flow-relative values */
+.previous { float: left; }
+[dir=rtl] .previous { float: right; }
 
+/* Only Firefox supports flow-relative values */
 .next {
     float: right;
     right: var(--page-padding);
 }
+[dir=rtl] .next {
+    float: left;
+    right: unset;
+    left: var(--page-padding);
+}
+
+/* Use the correct buttons for RTL layouts*/
+[dir=rtl] .previous i.fa-angle-left:before {content:"\f105";}
+[dir=rtl] .next i.fa-angle-right:before { content:"\f104"; }
 
 @media only screen and (max-width: 1080px) {
     .nav-wide-wrapper { display: none; }
     .nav-wrapper { display: block; }
 }
 
+/* sidebar-visible */
 @media only screen and (max-width: 1380px) {
-    .sidebar-visible .nav-wide-wrapper { display: none; }
-    .sidebar-visible .nav-wrapper { display: block; }
+    #sidebar-toggle-anchor:checked ~ .page-wrapper .nav-wide-wrapper { display: none; }
+    #sidebar-toggle-anchor:checked ~ .page-wrapper .nav-wrapper { display: block; }
 }
 
 /* Inline code */
@@ -229,7 +249,7 @@ pre > .buttons :hover {
     background-color: var(--theme-hover);
 }
 pre > .buttons i {
-    margin-left: 8px;
+    margin-inline-start: 8px;
 }
 pre > .buttons button {
     cursor: inherit;
@@ -251,8 +271,14 @@ pre > .buttons button {
         /* On mobile, make it easier to tap buttons. */
         padding: 0.3rem 1rem;
     }
+
+    .sidebar-resize-indicator {
+        /* Hide resize indicator on devices with limited accuracy */
+        display: none;
+    }
 }
 pre > code {
+    display: block;
     padding: 1rem;
 }
 
@@ -266,7 +292,7 @@ pre > code {
 }
 
 pre > .result {
-    margin-top: 10px;
+    margin-block-start: 10px;
 }
 
 /* Search */
@@ -277,8 +303,14 @@ pre > .result {
 
 mark {
     border-radius: 2px;
-    padding: 0 3px 1px 3px;
-    margin: 0 -3px -1px -3px;
+    padding-block-start: 0;
+    padding-block-end: 1px;
+    padding-inline-start: 3px;
+    padding-inline-end: 3px;
+    margin-block-start: 0;
+    margin-block-end: -1px;
+    margin-inline-start: -3px;
+    margin-inline-end: -3px;
     background-color: var(--search-mark-bg);
     transition: background-color 300ms linear;
     cursor: pointer;
@@ -290,14 +322,17 @@ mark.fade-out {
 }
 
 .searchbar-outer {
-    margin-left: auto;
-    margin-right: auto;
+    margin-inline-start: auto;
+    margin-inline-end: auto;
     max-width: var(--content-max-width);
 }
 
 #searchbar {
     width: 100%;
-    margin: 5px auto 0px auto;
+    margin-block-start: 5px;
+    margin-block-end: 0;
+    margin-inline-start: auto;
+    margin-inline-end: auto;
     padding: 10px 16px;
     transition: box-shadow 300ms ease-in-out;
     border: 1px solid var(--searchbar-border-color);
@@ -313,20 +348,23 @@ mark.fade-out {
 .searchresults-header {
     font-weight: bold;
     font-size: 1em;
-    padding: 18px 0 0 5px;
+    padding-block-start: 18px;
+    padding-block-end: 0;
+    padding-inline-start: 5px;
+    padding-inline-end: 0;
     color: var(--searchresults-header-fg);
 }
 
 .searchresults-outer {
-    margin-left: auto;
-    margin-right: auto;
+    margin-inline-start: auto;
+    margin-inline-end: auto;
     max-width: var(--content-max-width);
-    border-bottom: 1px dashed var(--searchresults-border-color);
+    border-block-end: 1px dashed var(--searchresults-border-color);
 }
 
 ul#searchresults {
     list-style: none;
-    padding-left: 20px;
+    padding-inline-start: 20px;
 }
 ul#searchresults li {
     margin: 10px 0px;
@@ -339,7 +377,10 @@ ul#searchresults li.focus {
 ul#searchresults span.teaser {
     display: block;
     clear: both;
-    margin: 5px 0 0 20px;
+    margin-block-start: 5px;
+    margin-block-end: 0;
+    margin-inline-start: 20px;
+    margin-inline-end: 0;
     font-size: 0.8em;
 }
 ul#searchresults span.teaser em {
@@ -355,19 +396,21 @@ ul#searchresults span.teaser em {
     top: 0;
     bottom: 0;
     width: var(--sidebar-width);
-    font-size: 1em;
+    font-size: 0.85em;
     box-sizing: border-box;
     -webkit-overflow-scrolling: touch;
     overscroll-behavior-y: contain;
     background-color: var(--sidebar-bg);
     color: var(--sidebar-fg);
 }
+[dir=rtl] .sidebar { left: unset; right: 0; }
 .sidebar-resizing {
     -moz-user-select: none;
     -webkit-user-select: none;
     -ms-user-select: none;
     user-select: none;
 }
+.no-js .sidebar,
 .js:not(.sidebar-resizing) .sidebar {
     transition: transform 0.3s; /* Animation: slide away */
 }
@@ -387,16 +430,35 @@ ul#searchresults span.teaser em {
     position: absolute;
     cursor: col-resize;
     width: 0;
-    right: 0;
+    right: calc(var(--sidebar-resize-indicator-width) * -1);
     top: 0;
     bottom: 0;
+    display: flex;
+    align-items: center;
+}
+
+.sidebar-resize-handle .sidebar-resize-indicator {
+    width: 100%;
+    height: 12px;
+    background-color: var(--icons);
+    margin-inline-start: var(--sidebar-resize-indicator-space);
+}
+
+[dir=rtl] .sidebar .sidebar-resize-handle {
+    left: calc(var(--sidebar-resize-indicator-width) * -1);
+    right: unset;
 }
 .js .sidebar .sidebar-resize-handle {
     cursor: col-resize;
-    width: 5px;
+    width: calc(var(--sidebar-resize-indicator-width) - var(--sidebar-resize-indicator-space));
 }
-.sidebar-hidden .sidebar {
-    transform: translateX(calc(0px - var(--sidebar-width)));
+/* sidebar-hidden */
+#sidebar-toggle-anchor:not(:checked) ~ .sidebar {
+    transform: translateX(calc(0px - var(--sidebar-width) - var(--sidebar-resize-indicator-width)));
+    z-index: -1;
+}
+[dir=rtl] #sidebar-toggle-anchor:not(:checked) ~ .sidebar {
+    transform: translateX(calc(var(--sidebar-width) + var(--sidebar-resize-indicator-width)));
 }
 .sidebar::-webkit-scrollbar {
     background: var(--sidebar-bg);
@@ -405,19 +467,26 @@ ul#searchresults span.teaser em {
     background: var(--scrollbar);
 }
 
-.sidebar-visible .page-wrapper {
-    transform: translateX(var(--sidebar-width));
+/* sidebar-visible */
+#sidebar-toggle-anchor:checked ~ .page-wrapper {
+    transform: translateX(calc(var(--sidebar-width) + var(--sidebar-resize-indicator-width)));
+}
+[dir=rtl] #sidebar-toggle-anchor:checked ~ .page-wrapper {
+    transform: translateX(calc(0px - var(--sidebar-width) - var(--sidebar-resize-indicator-width)));
 }
 @media only screen and (min-width: 620px) {
-    .sidebar-visible .page-wrapper {
+    #sidebar-toggle-anchor:checked ~ .page-wrapper {
+        transform: none;
+        margin-inline-start: calc(var(--sidebar-width) + var(--sidebar-resize-indicator-width));
+    }
+    [dir=rtl] #sidebar-toggle-anchor:checked ~ .page-wrapper {
         transform: none;
-        margin-left: var(--sidebar-width);
     }
 }
 
 .chapter {
     list-style: none outside none;
-    padding-left: 0;
+    padding-inline-start: 0;
     line-height: 2em;
 }
 
@@ -447,7 +516,7 @@ ul#searchresults span.teaser em {
 .chapter li > a.toggle {
     cursor: pointer;
     display: block;
-    margin-left: auto;
+    margin-inline-start: auto;
     padding: 0 10px;
     user-select: none;
     opacity: 0.68;
@@ -464,7 +533,7 @@ ul#searchresults span.teaser em {
 
 .chapter li.chapter-item {
     line-height: 1.5em;
-    margin-top: 0.6em;
+    margin-block-start: 0.6em;
 }
 
 .chapter li.expanded > a.toggle div {
@@ -487,7 +556,7 @@ ul#searchresults span.teaser em {
 
 .section {
     list-style: none outside none;
-    padding-left: 20px;
+    padding-inline-start: 20px;
     line-height: 1.5em;
 }
 
@@ -510,6 +579,7 @@ ul#searchresults span.teaser em {
     /* Don't let the children's background extend past the rounded corners. */
     overflow: hidden;
 }
+[dir=rtl] .theme-popup { left: unset;  right: 10px; }
 .theme-popup .default {
     color: var(--icons);
 }
@@ -520,7 +590,7 @@ ul#searchresults span.teaser em {
     padding: 2px 20px;
     line-height: 25px;
     white-space: nowrap;
-    text-align: left;
+    text-align: start;
     cursor: pointer;
     color: inherit;
     background: inherit;
@@ -533,6 +603,6 @@ ul#searchresults span.teaser em {
 .theme-selected::before {
     display: inline-block;
     content: "✓";
-    margin-left: -14px;
+    margin-inline-start: -14px;
     width: 14px;
 }
diff --git a/documentation/dev-portal/theme/css/general.css b/documentation/operators/nym_themes/css/general.css
similarity index 74%
rename from documentation/dev-portal/theme/css/general.css
rename to documentation/operators/nym_themes/css/general.css
index f8597e5767..df8c1d12d2 100644
--- a/documentation/dev-portal/theme/css/general.css
+++ b/documentation/operators/nym_themes/css/general.css
@@ -5,6 +5,7 @@
 :root {
     /* Browser default font-size is 16px, this way 1 rem = 10px */
     font-size: 70%;
+    color-scheme: var(--color-scheme);
 }
 
 html {
@@ -22,8 +23,9 @@ body {
 }
 
 code {
-    font-family: var(--mono-font);
+    font-family: var(--mono-font) !important;
     font-size: 0.9em;
+    direction: ltr !important;
 }
 
 /* make long words/inline code not x overflow */
@@ -47,13 +49,13 @@ h1 code, h2 code, h3 code, h4 code, h5 code, h6 code {
 .hide-boring .boring { display: none; }
 .hidden { display: none !important; }
 
-h2, h3 { margin-top: 2.5em; }
-h4, h5 { margin-top: 2em; }
+h2, h3 { margin-block-start: 2.5em; }
+h4, h5 { margin-block-start: 2em; }
 
 .header + .header h3,
 .header + .header h4,
 .header + .header h5 {
-    margin-top: 1em;
+    margin-block-start: 1em;
 }
 
 h1:target::before,
@@ -62,10 +64,9 @@ h3:target::before,
 h4:target::before,
 h5:target::before,
 h6:target::before {
-     /* display "none" in order to avoid default artifacts on the community-applications-and-guides page */
-    display: none;
+    display: inline-block;
     content: "»";
-    margin-left: -30px;
+    margin-inline-start: -30px;
     width: 30px;
 }
 
@@ -74,28 +75,34 @@ h6:target::before {
    https://bugs.webkit.org/show_bug.cgi?id=218076
 */
 :target {
+    /* Safari does not support logical properties */
     scroll-margin-top: calc(var(--menu-bar-height) + 0.5em);
 }
 
 .page {
     outline: 0;
     padding: 0 var(--page-padding);
-    margin-top: calc(0px - var(--menu-bar-height)); /* Compensate for the #menu-bar-hover-placeholder */
+    margin-block-start: calc(0px - var(--menu-bar-height)); /* Compensate for the #menu-bar-hover-placeholder */
 }
 .page-wrapper {
     box-sizing: border-box;
+    background-color: var(--bg);
 }
+.no-js .page-wrapper,
 .js:not(.sidebar-resizing) .page-wrapper {
     transition: margin-left 0.3s ease, transform 0.3s ease; /* Animation: slide away */
 }
+[dir=rtl] .js:not(.sidebar-resizing) .page-wrapper {
+    transition: margin-right 0.3s ease, transform 0.3s ease; /* Animation: slide away */
+}
 
 .content {
     overflow-y: auto;
     padding: 0 10px;
 }
 .content main {
-    margin-left: 10%;
-    margin-right: 10%;
+    margin-inline-start: auto;
+    margin-inline-end: auto;
     max-width: var(--content-max-width);
 }
 .content p { line-height: 1.45em; }
@@ -145,8 +152,31 @@ blockquote {
     padding: 0 20px;
     color: var(--fg);
     background-color: var(--quote-bg);
-    border-top: .1em solid var(--quote-border);
-    border-bottom: .1em solid var(--quote-border);
+    border-block-start: .1em solid var(--quote-border);
+    border-block-end: .1em solid var(--quote-border);
+}
+
+.warning {
+    margin: 20px;
+    padding: 0 20px;
+    border-inline-start: 2px solid var(--warning-border);
+}
+
+.warning:before {
+    position: absolute;
+    width: 3rem;
+    height: 3rem;
+    margin-inline-start: calc(-1.5rem - 21px);
+    content: "ⓘ";
+    text-align: center;
+    background-color: var(--bg);
+    color: var(--warning-border);
+    font-weight: bold;
+    font-size: 2rem;
+}
+
+blockquote .warning:before {
+    background-color: var(--quote-bg);
 }
 
 kbd {
@@ -164,7 +194,7 @@ kbd {
 
 :not(.footnote-definition) + .footnote-definition,
 .footnote-definition + :not(.footnote-definition) {
-    margin-top: 2em;
+    margin-block-start: 2em;
 }
 .footnote-definition {
     font-size: 0.9em;
diff --git a/documentation/operators/nym_themes/css/variables.css b/documentation/operators/nym_themes/css/variables.css
new file mode 100644
index 0000000000..51b94cfc5a
--- /dev/null
+++ b/documentation/operators/nym_themes/css/variables.css
@@ -0,0 +1,287 @@
+
+/* Globals */
+
+:root {
+    --sidebar-width: 280px;
+    --sidebar-resize-indicator-width: 8px;
+    --sidebar-resize-indicator-space: 2px;
+    --page-padding: 15px;
+    --content-max-width: 80%;
+    --menu-bar-height: 40px;
+    --mono-font: "Source Code Pro", Consolas, "Ubuntu Mono", Menlo, "DejaVu Sans Mono", monospace, monospace;
+    --code-font-size: 0.875em /* please adjust the ace font size accordingly in editor.js */
+    --pagetoc-width: 13%;
+    --pagetoc-fontsize: 14.5px;
+}
+
+@media only screen and (max-width:1439px) {
+ :root{
+    --content-max-width: 98%;
+  }
+}
+
+/* Themes */
+
+.ayu {
+    --bg: hsl(210, 25%, 8%);
+    --fg: #c5c5c5;
+
+    --sidebar-bg: #14191f;
+    --sidebar-fg: #c8c9db;
+    --sidebar-non-existant: #5c6773;
+    --sidebar-active: #ffb454;
+    --sidebar-spacer: #2d334f;
+
+    --scrollbar: var(--sidebar-fg);
+
+    --icons: #737480;
+    --icons-hover: #b7b9cc;
+
+    --links: #0096cf;
+
+    --inline-code-color: #ffb454;
+
+    --theme-popup-bg: #14191f;
+    --theme-popup-border: #5c6773;
+    --theme-hover: #191f26;
+
+    --quote-bg: hsl(226, 15%, 17%);
+    --quote-border: hsl(226, 15%, 22%);
+
+    --warning-border: #ff8e00;
+
+    --table-border-color: hsl(210, 25%, 13%);
+    --table-header-bg: hsl(210, 25%, 28%);
+    --table-alternate-bg: hsl(210, 25%, 11%);
+
+    --searchbar-border-color: #848484;
+    --searchbar-bg: #424242;
+    --searchbar-fg: #fff;
+    --searchbar-shadow-color: #d4c89f;
+    --searchresults-header-fg: #666;
+    --searchresults-border-color: #888;
+    --searchresults-li-bg: #252932;
+    --search-mark-bg: #e3b171;
+
+    --color-scheme: dark;
+}
+
+.coal {
+    --bg: hsl(200, 7%, 8%);
+    --fg: #98a3ad;
+
+    --sidebar-bg: #292c2f;
+    --sidebar-fg: #a1adb8;
+    --sidebar-non-existant: #505254;
+    --sidebar-active: #3473ad;
+    --sidebar-spacer: #393939;
+
+    --scrollbar: var(--sidebar-fg);
+
+    --icons: #43484d;
+    --icons-hover: #b3c0cc;
+
+    --links: #2b79a2;
+
+    --inline-code-color: #c5c8c6;
+
+    --theme-popup-bg: #141617;
+    --theme-popup-border: #43484d;
+    --theme-hover: #1f2124;
+
+    --quote-bg: hsl(234, 21%, 18%);
+    --quote-border: hsl(234, 21%, 23%);
+
+    --warning-border: #ff8e00;
+
+    --table-border-color: hsl(200, 7%, 13%);
+    --table-header-bg: hsl(200, 7%, 28%);
+    --table-alternate-bg: hsl(200, 7%, 11%);
+
+    --searchbar-border-color: #aaa;
+    --searchbar-bg: #b7b7b7;
+    --searchbar-fg: #000;
+    --searchbar-shadow-color: #aaa;
+    --searchresults-header-fg: #666;
+    --searchresults-border-color: #98a3ad;
+    --searchresults-li-bg: #2b2b2f;
+    --search-mark-bg: #355c7d;
+
+    --color-scheme: dark;
+}
+
+.light {
+    --bg: hsl(0, 0%, 100%);
+    --fg: hsl(0, 0%, 0%);
+
+    --sidebar-bg: #fafafa;
+    --sidebar-fg: hsl(0, 0%, 0%);
+    --sidebar-non-existant: #aaaaaa;
+    --sidebar-active: #1f1fff;
+    --sidebar-spacer: #f4f4f4;
+
+    --scrollbar: #8F8F8F;
+
+    --icons: #747474;
+    --icons-hover: #000000;
+
+    --links: #1f1fff;
+
+    --inline-code-color: #F42C4C;
+
+    --theme-popup-bg: #fafafa;
+    --theme-popup-border: #cccccc;
+    --theme-hover: #e6e6e6;
+
+    --quote-bg: hsl(197, 37%, 96%);
+    --quote-border: hsl(197, 37%, 91%);
+
+    --warning-border: #ff8e00;
+
+    --table-border-color: hsl(0, 0%, 95%);
+    --table-header-bg: hsl(0, 0%, 80%);
+    --table-alternate-bg: hsl(0, 0%, 97%);
+
+    --searchbar-border-color: #aaa;
+    --searchbar-bg: #fafafa;
+    --searchbar-fg: #000;
+    --searchbar-shadow-color: #aaa;
+    --searchresults-header-fg: #666;
+    --searchresults-border-color: #888;
+    --searchresults-li-bg: #e4f2fe;
+    --search-mark-bg: #a2cff5;
+
+    --color-scheme: light;
+}
+
+.navy {
+    --bg: hsl(226, 23%, 11%);
+    --fg: #bcbdd0;
+
+    --sidebar-bg: #282d3f;
+    --sidebar-fg: #c8c9db;
+    --sidebar-non-existant: #505274;
+    --sidebar-active: #2b79a2;
+    --sidebar-spacer: #2d334f;
+
+    --scrollbar: var(--sidebar-fg);
+
+    --icons: #737480;
+    --icons-hover: #b7b9cc;
+
+    --links: #2b79a2;
+
+    --inline-code-color: #c5c8c6;
+
+    --theme-popup-bg: #161923;
+    --theme-popup-border: #737480;
+    --theme-hover: #282e40;
+
+    --quote-bg: hsl(226, 15%, 17%);
+    --quote-border: hsl(226, 15%, 22%);
+
+    --warning-border: #ff8e00;
+
+    --table-border-color: hsl(226, 23%, 16%);
+    --table-header-bg: hsl(226, 23%, 31%);
+    --table-alternate-bg: hsl(226, 23%, 14%);
+
+    --searchbar-border-color: #aaa;
+    --searchbar-bg: #aeaec6;
+    --searchbar-fg: #000;
+    --searchbar-shadow-color: #aaa;
+    --searchresults-header-fg: #5f5f71;
+    --searchresults-border-color: #5c5c68;
+    --searchresults-li-bg: #242430;
+    --search-mark-bg: #a2cff5;
+
+    --color-scheme: dark;
+}
+
+.rust {
+    --bg: hsl(60, 9%, 87%);
+    --fg: #262625;
+
+    --sidebar-bg: #3b2e2a;
+    --sidebar-fg: #c8c9db;
+    --sidebar-non-existant: #505254;
+    --sidebar-active: #e69f67;
+    --sidebar-spacer: #45373a;
+
+    --scrollbar: var(--sidebar-fg);
+
+    --icons: #737480;
+    --icons-hover: #262625;
+
+    --links: #2b79a2;
+
+    --inline-code-color: #6e6b5e;
+
+    --theme-popup-bg: #e1e1db;
+    --theme-popup-border: #b38f6b;
+    --theme-hover: #99908a;
+
+    --quote-bg: hsl(60, 5%, 75%);
+    --quote-border: hsl(60, 5%, 70%);
+
+    --warning-border: #ff8e00;
+
+    --table-border-color: hsl(60, 9%, 82%);
+    --table-header-bg: #b3a497;
+    --table-alternate-bg: hsl(60, 9%, 84%);
+
+    --searchbar-border-color: #aaa;
+    --searchbar-bg: #fafafa;
+    --searchbar-fg: #000;
+    --searchbar-shadow-color: #aaa;
+    --searchresults-header-fg: #666;
+    --searchresults-border-color: #888;
+    --searchresults-li-bg: #dec2a2;
+    --search-mark-bg: #e69f67;
+
+    --color-scheme: light;
+}
+
+@media (prefers-color-scheme: dark) {
+    .light.no-js {
+        --bg: hsl(200, 7%, 8%);
+        --fg: #98a3ad;
+
+        --sidebar-bg: #292c2f;
+        --sidebar-fg: #a1adb8;
+        --sidebar-non-existant: #505254;
+        --sidebar-active: #3473ad;
+        --sidebar-spacer: #393939;
+
+        --scrollbar: var(--sidebar-fg);
+
+        --icons: #43484d;
+        --icons-hover: #b3c0cc;
+
+        --links: #2b79a2;
+
+        --inline-code-color: #c5c8c6;
+
+        --theme-popup-bg: #141617;
+        --theme-popup-border: #43484d;
+        --theme-hover: #1f2124;
+
+        --quote-bg: hsl(234, 21%, 18%);
+        --quote-border: hsl(234, 21%, 23%);
+
+        --warning-border: #ff8e00;
+
+        --table-border-color: hsl(200, 7%, 13%);
+        --table-header-bg: hsl(200, 7%, 28%);
+        --table-alternate-bg: hsl(200, 7%, 11%);
+
+        --searchbar-border-color: #aaa;
+        --searchbar-bg: #b7b7b7;
+        --searchbar-fg: #000;
+        --searchbar-shadow-color: #aaa;
+        --searchresults-header-fg: #666;
+        --searchresults-border-color: #98a3ad;
+        --searchresults-li-bg: #2b2b2f;
+        --search-mark-bg: #355c7d;
+    }
+}
diff --git a/documentation/operators/nym_themes/custom.css b/documentation/operators/nym_themes/custom.css
new file mode 100644
index 0000000000..8005eb68df
--- /dev/null
+++ b/documentation/operators/nym_themes/custom.css
@@ -0,0 +1,54 @@
+:root {
+  --mono-font: Consolas, "Ubuntu Mono", Menlo, "DejaVu Sans Mono", monospace;
+}
+
+.coal {
+  --fg: #f2f2f2;
+  --sidebar-fg: #f2f2f2;
+  --sidebar-active: #fb6e4e;
+  --icons-hover: #fb6e4e;
+  --links: #fb6e4e;
+  ::selection {
+    color: #121726;
+    background-color: #c5573d;
+  }
+  select option {
+    background-color: #121726;
+  }
+}
+
+.light {
+  --sidebar-active: #fb6e4e;
+  --icons-hover: #fb6e4e;
+  --links: #fb6e4e;
+  ::selection {
+    color:#f2f2f2;
+    background-color: #c5573d;
+  }
+}
+
+/*properly centering the title given the additional header items*/
+.menu-title {
+  position: absolute;
+  left: 50%;
+}
+.menu-bar .a:hover,
+
+/*necessary because of ^*/
+.right-buttons {
+  position: absolute;
+  right: 0;
+}
+
+select {
+  font-size: 16px;
+}
+
+
+
+footer {
+  font-size: 0.8em;
+  text-align: center;
+  border-top: 1px solid black;
+  padding: 5px 0;
+}
diff --git a/documentation/operators/nym_themes/index.hbs b/documentation/operators/nym_themes/index.hbs
new file mode 100644
index 0000000000..b8115558e3
--- /dev/null
+++ b/documentation/operators/nym_themes/index.hbs
@@ -0,0 +1,381 @@
+<!DOCTYPE HTML>
+<html lang="{{ language }}" class="{{ default_theme }}" dir="{{ text_direction }}">
+    <head>
+        <!-- Book generated using mdBook -->
+        <meta charset="UTF-8">
+        <title>{{ title }}</title>
+        {{#if is_print }}
+        <meta name="robots" content="noindex">
+        {{/if}}
+        {{#if base_url}}
+        <base href="{{ base_url }}">
+        {{/if}}
+
+
+        <!-- Custom HTML head -->
+        {{> head}}
+
+        <meta name="description" content="{{ description }}">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <meta name="theme-color" content="#ffffff">
+
+        {{#if favicon_svg}}
+        <link rel="icon" href="{{ path_to_root }}favicon.svg">
+        {{/if}}
+        {{#if favicon_png}}
+        <link rel="shortcut icon" href="{{ path_to_root }}favicon.png">
+        {{/if}}
+        <link rel="stylesheet" href="{{ path_to_root }}css/variables.css">
+        <link rel="stylesheet" href="{{ path_to_root }}css/general.css">
+        <link rel="stylesheet" href="{{ path_to_root }}css/chrome.css">
+        {{#if print_enable}}
+        <link rel="stylesheet" href="{{ path_to_root }}css/print.css" media="print">
+        {{/if}}
+
+        <!-- Fonts -->
+        <link rel="stylesheet" href="{{ path_to_root }}FontAwesome/css/font-awesome.css">
+        {{#if copy_fonts}}
+        <link rel="stylesheet" href="{{ path_to_root }}fonts/fonts.css">
+        {{/if}}
+
+        <!-- Highlight.js Stylesheets -->
+        <link rel="stylesheet" href="{{ path_to_root }}highlight.css">
+        <link rel="stylesheet" href="{{ path_to_root }}tomorrow-night.css">
+        <link rel="stylesheet" href="{{ path_to_root }}ayu-highlight.css">
+
+        <!-- Custom theme stylesheets -->
+        {{#each additional_css}}
+        <link rel="stylesheet" href="{{ ../path_to_root }}{{ this }}">
+        {{/each}}
+
+<!--        {{#if mathjax_support}}-->
+<!--        &lt;!&ndash; MathJax &ndash;&gt;-->
+<!--        <script async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>-->
+<!--        {{/if}}-->
+    </head>
+    <body class="sidebar-visible no-js">
+    <div id="body-container">
+        <!-- Provide site root to javascript -->
+        <script>
+            var path_to_root = "{{ path_to_root }}";
+            var default_theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? "{{ preferred_dark_theme }}" : "{{ default_theme }}";
+        </script>
+
+        <!-- Work around some values being stored in localStorage wrapped in quotes -->
+        <script>
+            try {
+                var theme = localStorage.getItem('mdbook-theme');
+                var sidebar = localStorage.getItem('mdbook-sidebar');
+
+                if (theme.startsWith('"') && theme.endsWith('"')) {
+                    localStorage.setItem('mdbook-theme', theme.slice(1, theme.length - 1));
+                }
+
+                if (sidebar.startsWith('"') && sidebar.endsWith('"')) {
+                    localStorage.setItem('mdbook-sidebar', sidebar.slice(1, sidebar.length - 1));
+                }
+            } catch (e) { }
+        </script>
+
+        <!-- Set the theme before any content is loaded, prevents flash -->
+        <script>
+            var theme;
+            try { theme = localStorage.getItem('mdbook-theme'); } catch(e) { }
+            if (theme === null || theme === undefined) { theme = default_theme; }
+            var html = document.querySelector('html');
+            html.classList.remove('{{ default_theme }}')
+            html.classList.add(theme);
+            var body = document.querySelector('body');
+            body.classList.remove('no-js')
+            body.classList.add('js');
+        </script>
+
+        <input type="checkbox" id="sidebar-toggle-anchor" class="hidden">
+
+        <!-- Hide / unhide sidebar before it is displayed -->
+        <script>
+            var body = document.querySelector('body');
+            var sidebar = null;
+            var sidebar_toggle = document.getElementById("sidebar-toggle-anchor");
+            if (document.body.clientWidth >= 1080) {
+                try { sidebar = localStorage.getItem('mdbook-sidebar'); } catch(e) { }
+                sidebar = sidebar || 'visible';
+            } else {
+                sidebar = 'hidden';
+            }
+            sidebar_toggle.checked = sidebar === 'visible';
+            body.classList.remove('sidebar-visible');
+            body.classList.add("sidebar-" + sidebar);
+        </script>
+
+        <nav id="sidebar" class="sidebar" aria-label="Table of contents">
+            <div class="sidebar-scrollbox">
+                {{#toc}}{{/toc}}
+            </div>
+            <div id="sidebar-resize-handle" class="sidebar-resize-handle">
+                <div class="sidebar-resize-indicator"></div>
+            </div>
+        </nav>
+
+        <!-- Track and set sidebar scroll position -->
+        <script>
+            var sidebarScrollbox = document.querySelector('#sidebar .sidebar-scrollbox');
+            sidebarScrollbox.addEventListener('click', function(e) {
+                if (e.target.tagName === 'A') {
+                    sessionStorage.setItem('sidebar-scroll', sidebarScrollbox.scrollTop);
+                }
+            }, { passive: true });
+            var sidebarScrollTop = sessionStorage.getItem('sidebar-scroll');
+            sessionStorage.removeItem('sidebar-scroll');
+            if (sidebarScrollTop) {
+                // preserve sidebar scroll position when navigating via links within sidebar
+                sidebarScrollbox.scrollTop = sidebarScrollTop;
+            } else {
+                // scroll sidebar to current active section when navigating via "next/previous chapter" buttons
+                var activeSection = document.querySelector('#sidebar .active');
+                if (activeSection) {
+                    activeSection.scrollIntoView({ block: 'center' });
+                }
+            }
+        </script>
+
+        <div id="page-wrapper" class="page-wrapper">
+
+            <div class="page">
+                {{> header}}
+                <div id="menu-bar-hover-placeholder"></div>
+                <div id="menu-bar" class="menu-bar sticky">
+                    <div class="left-buttons">
+                        <label id="sidebar-toggle" class="icon-button" for="sidebar-toggle-anchor" title="Toggle Table of Contents" aria-label="Toggle Table of Contents" aria-controls="sidebar">
+                            <i class="fa fa-bars"></i>
+                        </label>
+
+                        <button id="theme-toggle" class="icon-button" type="button" title="Change theme" aria-label="Change theme" aria-haspopup="true" aria-expanded="false" aria-controls="theme-list">
+                            <i class="fa fa-paint-brush"></i>
+                        </button>
+                        <ul id="theme-list" class="theme-popup" aria-label="Themes" role="menu">
+                            <li role="none"><button role="menuitem" class="theme" id="light">Light</button></li>
+                            <li role="none"><button role="menuitem" class="theme" id="coal">Dark</button></li>
+                        </ul>
+
+                        <!-- CUSTOM -->
+                        <select id="dropdown-menu3" class="icon-button">
+                            <option value="">Network Protocol</option>
+                            <option value="https://nymtech.net/docs">Network Docs</option>
+                            <option value="https://nymtech.net/learn/papers">Academic Papers</option>
+                        </select>
+
+                        <select id="dropdown-menu" class="icon-button">
+                            <option value="">Developer Docs</option>
+                            <option value="https://nymtech.net/developers">Dev Portal</option>
+                            <option value="https://nymtech.net/docs/sdk/rust/rust.html">Rust SDK</option>
+                            <option value="https://sdk.nymtech.net">Typescript SDK</option>
+                        </select>
+
+                        <select id="dropdown-menu2" class="icon-button">
+                            <option value="">Setup Guides</option>
+                            <option value="https://nymtech.net/operators">Operators</option>
+                            <option value="https://nymtech.net/developers/nymvpn/intro.html">NymVPN Testing</option>
+                        </select>
+
+                        <script>
+                            document.getElementById('dropdown-menu').addEventListener('change', function() {
+                                const selected = this.options[this.selectedIndex];
+                                if (selected.value !== '') {
+                                    window.location.href = selected.value;
+                                }
+                            });
+                        </script>
+
+                        <script>
+                            document.getElementById('dropdown-menu2').addEventListener('change', function() {
+                                const selected = this.options[this.selectedIndex];
+                                if (selected.value !== '') {
+                                    window.location.href = selected.value;
+                                }
+                            });
+                        </script>
+
+                        <script>
+                            document.getElementById('dropdown-menu3').addEventListener('change', function() {
+                                const selected = this.options[this.selectedIndex];
+                                if (selected.value !== '') {
+                                    window.location.href = selected.value;
+                                }
+                            });
+                        </script>
+                        <!-- END CUSTOM -->
+                    </div>
+
+                    <h1 class="menu-title"> {{ book_title }}</h1>
+
+                    <div class="right-buttons">
+                        {{#if search_enabled}}
+                            <button id="search-toggle" class="icon-button" type="button" title="Search. (Shortkey: s)" aria-label="Toggle Searchbar" aria-expanded="false" aria-keyshortcuts="S" aria-controls="searchbar">
+                                <i class="fa fa-search"></i>
+                            </button>
+                        {{/if}}
+                        {{#if print_enable}}
+                        <a href="{{ path_to_root }}print.html" title="Print this book" aria-label="Print this book">
+                            <i id="print-button" class="fa fa-print"></i>
+                        </a>
+                        {{/if}}
+                        {{#if git_repository_url}}
+                        <a href="{{git_repository_url}}" title="Git repository" aria-label="Git repository">
+                            <i id="git-repository-button" class="fa {{git_repository_icon}}"></i>
+                        </a>
+                        {{/if}}
+                        {{#if git_repository_edit_url}}
+                        <a href="{{git_repository_edit_url}}" title="Suggest an edit" aria-label="Suggest an edit">
+                            <i id="git-edit-button" class="fa fa-edit"></i>
+                        </a>
+                        {{/if}}
+
+                    </div>
+                </div>
+
+                {{#if search_enabled}}
+                <div id="search-wrapper" class="hidden">
+                    <form id="searchbar-outer" class="searchbar-outer">
+                        <input type="search" id="searchbar" name="searchbar" placeholder="Search this book ..." aria-controls="searchresults-outer" aria-describedby="searchresults-header">
+                    </form>
+                    <div id="searchresults-outer" class="searchresults-outer hidden">
+                        <div id="searchresults-header" class="searchresults-header"></div>
+                        <ul id="searchresults">
+                        </ul>
+                    </div>
+                </div>
+                {{/if}}
+
+                <!-- Apply ARIA attributes after the sidebar and the sidebar toggle button are added to the DOM -->
+                <script>
+                    document.getElementById('sidebar-toggle').setAttribute('aria-expanded', sidebar === 'visible');
+                    document.getElementById('sidebar').setAttribute('aria-hidden', sidebar !== 'visible');
+                    Array.from(document.querySelectorAll('#sidebar a')).forEach(function(link) {
+                        link.setAttribute('tabIndex', sidebar === 'visible' ? 0 : -1);
+                    });
+                </script>
+
+                <div id="content" class="content">
+                    <main>
+                        <main>
+                            <div class="content-wrap">
+                        {{{ content }}}
+                            </div>
+                            <div class="sidetoc">
+                                <nav class="pagetoc"></nav>
+                            </div>
+                        </main>
+                    </main>
+
+                    <nav class="nav-wrapper" aria-label="Page navigation">
+                        <!-- Mobile navigation buttons -->
+                        {{#previous}}
+                            <a rel="prev" href="{{ path_to_root }}{{link}}" class="mobile-nav-chapters previous" title="Previous chapter" aria-label="Previous chapter" aria-keyshortcuts="Left">
+                                <i class="fa fa-angle-left"></i>
+                            </a>
+                        {{/previous}}
+
+                        {{#next}}
+                            <a rel="next prefetch" href="{{ path_to_root }}{{link}}" class="mobile-nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
+                                <i class="fa fa-angle-right"></i>
+                            </a>
+                        {{/next}}
+
+                        <div style="clear: both"></div>
+                    </nav>
+                </div>
+            </div>
+
+            <nav class="nav-wide-wrapper" aria-label="Page navigation">
+                {{#previous}}
+                    <a rel="prev" href="{{ path_to_root }}{{link}}" class="nav-chapters previous" title="Previous chapter" aria-label="Previous chapter" aria-keyshortcuts="Left">
+                        <i class="fa fa-angle-left"></i>
+                    </a>
+                {{/previous}}
+
+                {{#next}}
+                    <a rel="next prefetch" href="{{ path_to_root }}{{link}}" class="nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
+                        <i class="fa fa-angle-right"></i>
+                    </a>
+                {{/next}}
+            </nav>
+
+        </div>
+
+        {{#if live_reload_endpoint}}
+        <!-- Livereload script (if served using the cli tool) -->
+        <script>
+            const wsProtocol = location.protocol === 'https:' ? 'wss:' : 'ws:';
+            const wsAddress = wsProtocol + "//" + location.host + "/" + "{{{live_reload_endpoint}}}";
+            const socket = new WebSocket(wsAddress);
+            socket.onmessage = function (event) {
+                if (event.data === "reload") {
+                    socket.close();
+                    location.reload();
+                }
+            };
+
+            window.onbeforeunload = function() {
+                socket.close();
+            }
+        </script>
+        {{/if}}
+
+        {{#if playground_line_numbers}}
+        <script>
+            window.playground_line_numbers = true;
+        </script>
+        {{/if}}
+
+        {{#if playground_copyable}}
+        <script>
+            window.playground_copyable = true;
+        </script>
+        {{/if}}
+
+        {{#if playground_js}}
+        <script src="{{ path_to_root }}ace.js"></script>
+        <script src="{{ path_to_root }}editor.js"></script>
+        <script src="{{ path_to_root }}mode-rust.js"></script>
+        <script src="{{ path_to_root }}theme-dawn.js"></script>
+        <script src="{{ path_to_root }}theme-tomorrow_night.js"></script>
+        {{/if}}
+
+        {{#if search_js}}
+        <script src="{{ path_to_root }}elasticlunr.min.js"></script>
+        <script src="{{ path_to_root }}mark.min.js"></script>
+        <script src="{{ path_to_root }}searcher.js"></script>
+        {{/if}}
+
+        <script src="{{ path_to_root }}clipboard.min.js"></script>
+        <script src="{{ path_to_root }}highlight.js"></script>
+        <script src="{{ path_to_root }}book.js"></script>
+
+        <!-- Custom JS scripts -->
+        {{#each additional_js}}
+        <script src="{{ ../path_to_root }}{{this}}"></script>
+        {{/each}}
+
+        {{#if is_print}}
+        {{#if mathjax_support}}
+        <script>
+        window.addEventListener('load', function() {
+            MathJax.Hub.Register.StartupHook('End', function() {
+                window.setTimeout(window.print, 100);
+            });
+        });
+        </script>
+        {{else}}
+        <script>
+        window.addEventListener('load', function() {
+            window.setTimeout(window.print, 100);
+        });
+        </script>
+        {{/if}}
+        {{/if}}
+
+
+    </div>
+    </body>
+</html>
diff --git a/documentation/operators/nym_themes/index.hbs.bak b/documentation/operators/nym_themes/index.hbs.bak
new file mode 100644
index 0000000000..d2a64dbc97
--- /dev/null
+++ b/documentation/operators/nym_themes/index.hbs.bak
@@ -0,0 +1,370 @@
+<!DOCTYPE HTML>
+<html lang="{{ language }}" class="{{ default_theme }}" dir="{{ text_direction }}">
+    <head>
+        <!-- Book generated using mdBook -->
+        <meta charset="UTF-8">
+        <title>{{ title }}</title>
+        {{#if is_print }}
+        <meta name="robots" content="noindex">
+        {{/if}}
+        {{#if base_url}}
+        <base href="{{ base_url }}">
+        {{/if}}
+
+
+        <!-- Custom HTML head -->
+        {{> head}}
+
+        <meta name="description" content="{{ description }}">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <meta name="theme-color" content="#ffffff">
+
+        {{#if favicon_svg}}
+        <link rel="icon" href="{{ path_to_root }}favicon.svg">
+        {{/if}}
+        {{#if favicon_png}}
+        <link rel="shortcut icon" href="{{ path_to_root }}favicon.png">
+        {{/if}}
+        <link rel="stylesheet" href="{{ path_to_root }}css/variables.css">
+        <link rel="stylesheet" href="{{ path_to_root }}css/general.css">
+        <link rel="stylesheet" href="{{ path_to_root }}css/chrome.css">
+        {{#if print_enable}}
+        <link rel="stylesheet" href="{{ path_to_root }}css/print.css" media="print">
+        {{/if}}
+
+        <!-- Fonts -->
+        <link rel="stylesheet" href="{{ path_to_root }}FontAwesome/css/font-awesome.css">
+        {{#if copy_fonts}}
+        <link rel="stylesheet" href="{{ path_to_root }}fonts/fonts.css">
+        {{/if}}
+
+        <!-- Highlight.js Stylesheets -->
+        <link rel="stylesheet" href="{{ path_to_root }}highlight.css">
+        <link rel="stylesheet" href="{{ path_to_root }}tomorrow-night.css">
+        <link rel="stylesheet" href="{{ path_to_root }}ayu-highlight.css">
+
+        <!-- Custom theme stylesheets -->
+        {{#each additional_css}}
+        <link rel="stylesheet" href="{{ ../path_to_root }}{{ this }}">
+        {{/each}}
+
+        {{#if mathjax_support}}
+        <!-- MathJax -->
+        <script async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
+        {{/if}}
+    </head>
+    <body class="sidebar-visible no-js">
+    <div id="body-container">
+        <!-- Provide site root to javascript -->
+        <script>
+            var path_to_root = "{{ path_to_root }}";
+            var default_theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? "{{ preferred_dark_theme }}" : "{{ default_theme }}";
+        </script>
+
+        <!-- Work around some values being stored in localStorage wrapped in quotes -->
+        <script>
+            try {
+                var theme = localStorage.getItem('mdbook-theme');
+                var sidebar = localStorage.getItem('mdbook-sidebar');
+
+                if (theme.startsWith('"') && theme.endsWith('"')) {
+                    localStorage.setItem('mdbook-theme', theme.slice(1, theme.length - 1));
+                }
+
+                if (sidebar.startsWith('"') && sidebar.endsWith('"')) {
+                    localStorage.setItem('mdbook-sidebar', sidebar.slice(1, sidebar.length - 1));
+                }
+            } catch (e) { }
+        </script>
+
+        <!-- Set the theme before any content is loaded, prevents flash -->
+        <script>
+            var theme;
+            try { theme = localStorage.getItem('mdbook-theme'); } catch(e) { }
+            if (theme === null || theme === undefined) { theme = default_theme; }
+            var html = document.querySelector('html');
+            html.classList.remove('{{ default_theme }}')
+            html.classList.add(theme);
+            var body = document.querySelector('body');
+            body.classList.remove('no-js')
+            body.classList.add('js');
+        </script>
+
+        <input type="checkbox" id="sidebar-toggle-anchor" class="hidden">
+
+        <!-- Hide / unhide sidebar before it is displayed -->
+        <script>
+            var body = document.querySelector('body');
+            var sidebar = null;
+            var sidebar_toggle = document.getElementById("sidebar-toggle-anchor");
+            if (document.body.clientWidth >= 1080) {
+                try { sidebar = localStorage.getItem('mdbook-sidebar'); } catch(e) { }
+                sidebar = sidebar || 'visible';
+            } else {
+                sidebar = 'hidden';
+            }
+            sidebar_toggle.checked = sidebar === 'visible';
+            body.classList.remove('sidebar-visible');
+            body.classList.add("sidebar-" + sidebar);
+        </script>
+
+        <nav id="sidebar" class="sidebar" aria-label="Table of contents">
+            <div class="sidebar-scrollbox">
+                {{#toc}}{{/toc}}
+            </div>
+            <div id="sidebar-resize-handle" class="sidebar-resize-handle">
+                <div class="sidebar-resize-indicator"></div>
+            </div>
+        </nav>
+
+        <!-- Track and set sidebar scroll position -->
+        <script>
+            var sidebarScrollbox = document.querySelector('#sidebar .sidebar-scrollbox');
+            sidebarScrollbox.addEventListener('click', function(e) {
+                if (e.target.tagName === 'A') {
+                    sessionStorage.setItem('sidebar-scroll', sidebarScrollbox.scrollTop);
+                }
+            }, { passive: true });
+            var sidebarScrollTop = sessionStorage.getItem('sidebar-scroll');
+            sessionStorage.removeItem('sidebar-scroll');
+            if (sidebarScrollTop) {
+                // preserve sidebar scroll position when navigating via links within sidebar
+                sidebarScrollbox.scrollTop = sidebarScrollTop;
+            } else {
+                // scroll sidebar to current active section when navigating via "next/previous chapter" buttons
+                var activeSection = document.querySelector('#sidebar .active');
+                if (activeSection) {
+                    activeSection.scrollIntoView({ block: 'center' });
+                }
+            }
+        </script>
+
+        <div id="page-wrapper" class="page-wrapper">
+
+            <div class="page">
+                {{> header}}
+                <div id="menu-bar-hover-placeholder"></div>
+                <div id="menu-bar" class="menu-bar sticky">
+                    <div class="left-buttons">
+                        <label id="sidebar-toggle" class="icon-button" for="sidebar-toggle-anchor" title="Toggle Table of Contents" aria-label="Toggle Table of Contents" aria-controls="sidebar">
+                            <i class="fa fa-bars"></i>
+                        </label>
+
+                        <!-- TODO remove weird padding here -->
+                        <button id="theme-toggle" class="icon-button" type="button" title="Change theme" aria-label="Change theme" aria-haspopup="true" aria-expanded="false" aria-controls="theme-list">
+                            <i class="fa fa-paint-brush"></i>
+                        </button>
+                        <ul id="theme-list" class="theme-popup" aria-label="Themes" role="menu">
+                            <li role="none"><button role="menuitem" class="theme" id="light">Light</button></li>
+                            <li role="none"><button role="menuitem" class="theme" id="coal">Dark</button></li>
+                        </ul>
+
+                        <!-- CUSTOM -->
+                        <!-- TODO style when open -->
+                        <select id="dropdown-menu" class="icon-button">
+                            <option value="">SDKS</option>
+                            <option value="https://nymtech.net/docs/sdk/rust/rust.html">Rust</option>
+                            <option value="https://sdk.nymtech.net">Typescript</option>
+                        </select>
+
+                        <!-- TODO style when open -->
+                        <select id="dropdown-menu2" class="icon-button">
+                            <option value="">Doc Sites</option>
+                            <option value="https://nymtech.net/developers">Dev Portal</option>
+                            <option value="https://nymtech.net/docs/introduction.html">Network Docs</option>
+                            <option value="https://https://nymtech.net/operators">Operator Docs</option>
+                        </select>
+
+                        <script>
+                            document.getElementById('dropdown-menu').addEventListener('change', function() {
+                                const selected = this.options[this.selectedIndex];
+                                if (selected.value !== '') {
+                                    window.location.href = selected.value;
+                                }
+                            });
+                        </script>
+
+                        <script>
+                            document.getElementById('dropdown-menu2').addEventListener('change', function() {
+                                const selected = this.options[this.selectedIndex];
+                                if (selected.value !== '') {
+                                    window.location.href = selected.value;
+                                }
+                            });
+                        </script>
+                        <!-- END CUSTOM -->
+
+                    </div>
+
+                    <h1 class="menu-title">{{ book_title }}</h1>
+
+                    <div class="right-buttons">
+                        {{#if search_enabled}}
+                            <button id="search-toggle" class="icon-button" type="button" title="Search. (Shortkey: s)" aria-label="Toggle Searchbar" aria-expanded="false" aria-keyshortcuts="S" aria-controls="searchbar">
+                                <i class="fa fa-search"></i>
+                            </button>
+                        {{/if}}
+                        {{#if print_enable}}
+                        <a href="{{ path_to_root }}print.html" title="Print this book" aria-label="Print this book">
+                            <i id="print-button" class="fa fa-print"></i>
+                        </a>
+                        {{/if}}
+                        {{#if git_repository_url}}
+                        <a href="{{git_repository_url}}" title="Git repository" aria-label="Git repository">
+                            <i id="git-repository-button" class="fa {{git_repository_icon}}"></i>
+                        </a>
+                        {{/if}}
+                        {{#if git_repository_edit_url}}
+                        <a href="{{git_repository_edit_url}}" title="Suggest an edit" aria-label="Suggest an edit">
+                            <i id="git-edit-button" class="fa fa-edit"></i>
+                        </a>
+                        {{/if}}
+
+                    </div>
+                </div>
+
+                {{#if search_enabled}}
+                <div id="search-wrapper" class="hidden">
+                    <form id="searchbar-outer" class="searchbar-outer">
+                        <input type="search" id="searchbar" name="searchbar" placeholder="Search this book ..." aria-controls="searchresults-outer" aria-describedby="searchresults-header">
+                    </form>
+                    <div id="searchresults-outer" class="searchresults-outer hidden">
+                        <div id="searchresults-header" class="searchresults-header"></div>
+                        <ul id="searchresults">
+                        </ul>
+                    </div>
+                </div>
+                {{/if}}
+
+                <!-- Apply ARIA attributes after the sidebar and the sidebar toggle button are added to the DOM -->
+                <script>
+                    document.getElementById('sidebar-toggle').setAttribute('aria-expanded', sidebar === 'visible');
+                    document.getElementById('sidebar').setAttribute('aria-hidden', sidebar !== 'visible');
+                    Array.from(document.querySelectorAll('#sidebar a')).forEach(function(link) {
+                        link.setAttribute('tabIndex', sidebar === 'visible' ? 0 : -1);
+                    });
+                </script>
+
+                <div id="content" class="content">
+                    <main>
+                        <main>
+                            <div class="content-wrap">
+                        {{{ content }}}
+                            </div>
+                            <div class="sidetoc">
+                                <nav class="pagetoc"></nav>
+                            </div>
+                        </main>
+                    </main>
+
+                    <nav class="nav-wrapper" aria-label="Page navigation">
+                        <!-- Mobile navigation buttons -->
+                        {{#previous}}
+                            <a rel="prev" href="{{ path_to_root }}{{link}}" class="mobile-nav-chapters previous" title="Previous chapter" aria-label="Previous chapter" aria-keyshortcuts="Left">
+                                <i class="fa fa-angle-left"></i>
+                            </a>
+                        {{/previous}}
+
+                        {{#next}}
+                            <a rel="next prefetch" href="{{ path_to_root }}{{link}}" class="mobile-nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
+                                <i class="fa fa-angle-right"></i>
+                            </a>
+                        {{/next}}
+
+                        <div style="clear: both"></div>
+                    </nav>
+                </div>
+            </div>
+
+            <nav class="nav-wide-wrapper" aria-label="Page navigation">
+                {{#previous}}
+                    <a rel="prev" href="{{ path_to_root }}{{link}}" class="nav-chapters previous" title="Previous chapter" aria-label="Previous chapter" aria-keyshortcuts="Left">
+                        <i class="fa fa-angle-left"></i>
+                    </a>
+                {{/previous}}
+
+                {{#next}}
+                    <a rel="next prefetch" href="{{ path_to_root }}{{link}}" class="nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
+                        <i class="fa fa-angle-right"></i>
+                    </a>
+                {{/next}}
+            </nav>
+
+        </div>
+
+        {{#if live_reload_endpoint}}
+        <!-- Livereload script (if served using the cli tool) -->
+        <script>
+            const wsProtocol = location.protocol === 'https:' ? 'wss:' : 'ws:';
+            const wsAddress = wsProtocol + "//" + location.host + "/" + "{{{live_reload_endpoint}}}";
+            const socket = new WebSocket(wsAddress);
+            socket.onmessage = function (event) {
+                if (event.data === "reload") {
+                    socket.close();
+                    location.reload();
+                }
+            };
+
+            window.onbeforeunload = function() {
+                socket.close();
+            }
+        </script>
+        {{/if}}
+
+        {{#if playground_line_numbers}}
+        <script>
+            window.playground_line_numbers = true;
+        </script>
+        {{/if}}
+
+        {{#if playground_copyable}}
+        <script>
+            window.playground_copyable = true;
+        </script>
+        {{/if}}
+
+        {{#if playground_js}}
+        <script src="{{ path_to_root }}ace.js"></script>
+        <script src="{{ path_to_root }}editor.js"></script>
+        <script src="{{ path_to_root }}mode-rust.js"></script>
+        <script src="{{ path_to_root }}theme-dawn.js"></script>
+        <script src="{{ path_to_root }}theme-tomorrow_night.js"></script>
+        {{/if}}
+
+        {{#if search_js}}
+        <script src="{{ path_to_root }}elasticlunr.min.js"></script>
+        <script src="{{ path_to_root }}mark.min.js"></script>
+        <script src="{{ path_to_root }}searcher.js"></script>
+        {{/if}}
+
+        <script src="{{ path_to_root }}clipboard.min.js"></script>
+        <script src="{{ path_to_root }}highlight.js"></script>
+        <script src="{{ path_to_root }}book.js"></script>
+
+        <!-- Custom JS scripts -->
+        {{#each additional_js}}
+        <script src="{{ ../path_to_root }}{{this}}"></script>
+        {{/each}}
+
+        {{#if is_print}}
+        {{#if mathjax_support}}
+        <script>
+        window.addEventListener('load', function() {
+            MathJax.Hub.Register.StartupHook('End', function() {
+                window.setTimeout(window.print, 100);
+            });
+        });
+        </script>
+        {{else}}
+        <script>
+        window.addEventListener('load', function() {
+            window.setTimeout(window.print, 100);
+        });
+        </script>
+        {{/if}}
+        {{/if}}
+
+
+    </div>
+    </body>
+</html>
diff --git a/documentation/operators/mdbook-admonish.css b/documentation/operators/nym_themes/mdbook-admonish.css
similarity index 100%
rename from documentation/operators/mdbook-admonish.css
rename to documentation/operators/nym_themes/mdbook-admonish.css
diff --git a/documentation/operators/nym_themes/pagetoc.css b/documentation/operators/nym_themes/pagetoc.css
new file mode 100644
index 0000000000..651572ce55
--- /dev/null
+++ b/documentation/operators/nym_themes/pagetoc.css
@@ -0,0 +1,101 @@
+:root {
+    --toc-width: 270px;
+    --center-content-toc-shift: calc(-1 * var(--toc-width) / 2);
+}
+
+.nav-chapters {
+    /* adjust width of buttons that bring to the previous or the next page */
+    min-width: 50px;
+}
+
+.previous {
+    /*
+    adjust the space between the left sidebar or the left side of the screen 
+    and the button that leads to the previous page
+    */
+    margin-left: var(--page-padding);
+}
+
+@media only screen {
+    main {
+        display: flex;
+    }
+
+    @media (max-width: 1179px) {
+        .sidebar-hidden .sidetoc {
+            display: none;
+        }
+    }
+
+    @media (max-width: 1439px) {
+        .sidebar-visible .sidetoc {
+            display: none;
+        }
+    }
+
+    @media (1180px <= width <= 1439px) {
+        .sidebar-hidden main {
+            position: relative;
+            left: var(--center-content-toc-shift);
+        }
+    }
+
+    @media (1440px <= width <= 1700px) {
+        .sidebar-visible main {
+            position: relative;
+            left: var(--center-content-toc-shift);
+        }
+    }
+
+    .content-wrap {
+        overflow-y: auto;
+        width: 100%;
+    }
+
+    .sidetoc {
+        margin-top: 20px;
+        margin-left: 10px;
+        margin-right: auto;
+    }
+    .pagetoc {
+        position: fixed;
+        /* adjust TOC width */
+        width: var(--toc-width);
+        height: calc(100vh - var(--menu-bar-height) - 0.67em * 4);
+        overflow: auto;
+    }
+    .pagetoc a {
+        border-left: 1px solid var(--sidebar-bg);
+        color: var(--fg) !important;
+        display: block;
+        padding-bottom: 5px;
+        padding-top: 5px;
+        padding-left: 10px;
+        text-align: left;
+        text-decoration: none;
+    }
+    .pagetoc a:hover,
+    .pagetoc a.active {
+        background: var(--sidebar-bg);
+        color: var(--sidebar-fg) !important;
+    }
+    .pagetoc .active {
+        background: var(--sidebar-bg);
+        color: var(--sidebar-fg);
+    }
+    .pagetoc .pagetoc-H2 {
+        padding-left: 20px;
+    }
+    .pagetoc .pagetoc-H3 {
+        padding-left: 40px;
+    }
+    .pagetoc .pagetoc-H4 {
+        padding-left: 60px;
+    }
+}
+
+@media print {
+    .sidetoc {
+        display: none;
+    }
+}
diff --git a/documentation/operators/nym_themes/pagetoc.js b/documentation/operators/nym_themes/pagetoc.js
new file mode 100644
index 0000000000..490d9e4c31
--- /dev/null
+++ b/documentation/operators/nym_themes/pagetoc.js
@@ -0,0 +1,114 @@
+function forEach(elems, fun) {
+  Array.prototype.forEach.call(elems, fun);
+}
+
+function getPagetoc(){
+  return document.getElementsByClassName("pagetoc")[0]
+}
+
+function getPagetocElems() {
+  return getPagetoc().children;
+}
+
+function getHeaders(){
+  return document.getElementsByClassName("header")
+}
+
+// Un-active everything when you click it
+function forPagetocElem(fun) {
+  forEach(getPagetocElems(), fun);
+}
+
+function getRect(element) {
+  return element.getBoundingClientRect();
+}
+
+function overflowTop(container, element) {
+  return getRect(container).top - getRect(element).top;
+}
+
+function overflowBottom(container, element) {
+  return getRect(container).bottom - getRect(element).bottom;
+}
+
+var activeHref = location.href;
+
+var updateFunction = function (elem = undefined) {
+  var id = elem;
+
+  if (!id && location.href != activeHref) {
+    activeHref = location.href;
+    forPagetocElem(function (el) {
+      if (el.href === activeHref) {
+        id = el;
+      }
+    });
+  }
+
+  if (!id) {
+    var elements = getHeaders();
+    let margin = window.innerHeight / 3;
+
+    forEach(elements, function (el, i, arr) {
+      if (!id && getRect(el).top >= 0) {
+        if (getRect(el).top < margin) {
+          id = el;
+        } else {
+          id = arr[Math.max(0, i - 1)];
+        }
+      }
+      // a very long last section
+      // its heading is over the screen
+      if (!id && i == arr.length - 1) {
+        id = el
+      }
+    });
+  }
+
+  forPagetocElem(function (el) {
+    el.classList.remove("active");
+  });
+
+  if (!id) return;
+
+  forPagetocElem(function (el) {
+    if (id.href.localeCompare(el.href) == 0) {
+      el.classList.add("active");
+      let pagetoc = getPagetoc();
+      if (overflowTop(pagetoc, el) > 0) {
+        pagetoc.scrollTop = el.offsetTop;
+      }
+      if (overflowBottom(pagetoc, el) < 0) {
+        pagetoc.scrollTop -= overflowBottom(pagetoc, el);
+      }
+    }
+  });
+};
+
+let elements = getHeaders();
+
+if (elements.length > 1) {
+  // Populate sidebar on load
+  window.addEventListener("load", function () {
+    var pagetoc = getPagetoc();
+    var elements = getHeaders();
+    forEach(elements, function (el) {
+      var link = document.createElement("a");
+      link.appendChild(document.createTextNode(el.text));
+      link.href = el.hash;
+      link.classList.add("pagetoc-" + el.parentElement.tagName);
+      pagetoc.appendChild(link);
+      link.onclick = function () {
+        updateFunction(link);
+      };
+    });
+    updateFunction();
+  });
+
+  // Handle active elements on scroll
+  window.addEventListener("scroll", function () {
+    updateFunction();
+  });
+} else {
+  document.getElementsByClassName("sidetoc")[0].remove();
+}
diff --git a/documentation/operators/src/SUMMARY.md b/documentation/operators/src/SUMMARY.md
index fbe85719a0..d3b403d5b9 100644
--- a/documentation/operators/src/SUMMARY.md
+++ b/documentation/operators/src/SUMMARY.md
@@ -32,10 +32,14 @@
 # Legal Forum
 
 - [Exit Gateway](legal/exit-gateway.md)
-    - [Switzerland](legal/swiss.md)
-    - [United States](legal/united-states.md)
+- [Community Counsel](legal/community-counsel.md)
+    - [Jurisdictions](legal/jurisdictions.md)
+        - [Switzerland](legal/swiss.md)
+        - [United States](legal/united-states.md)
+    - [Landing Pages](legal/landing-pages.md)
+- [How to Add Info](legal/add-content.md)
 
---- 
+---
 # Misc.
 - [Code of Conduct](coc.md)
 - [Licensing](licensing.md)
diff --git a/documentation/operators/src/legal/add-content.md b/documentation/operators/src/legal/add-content.md
new file mode 100644
index 0000000000..a770b9d4d6
--- /dev/null
+++ b/documentation/operators/src/legal/add-content.md
@@ -0,0 +1,58 @@
+# Adding Content to Legal Forum
+
+Our aim is to establish a strong community network, sharing legal findings and other suggestions with each other. We would like to encourage all of the current and future operators to do research about the situation in the jurisdiction they operate in, to share solutions to the challenges they encountered when running Exit Gateway, and create a pull request (PR).
+
+First of all, please join our [Node Operators Legal Forum](https://matrix.to/#/!YfoUFsJjsXbWmijbPG:nymtech.chat?via=nymtech.chat&via=matrix.org) (Matrix chat) and post any information or questions there.
+
+To add your information to this book, you can create a PR directly to our [repository](https://github.com/nymtech/nym/tree/develop/documentation/operators/src/legal). 
+
+**Steps to make a pull request:**
+
+1. Write down your legal findings, suggestions, communication templates, FAQ in a text editor
+
+2. Clone `nymtech/nym` repository or pull in case you already have it and switch to `develop` branch
+
+```sh
+# clone the repository
+git clone https://github.com/nymtech/nym
+
+# go to the directory nym
+cd nym
+
+# switch to branch develop
+git checkout develop
+
+# update the repository
+git pull origin develop
+```
+
+3. Make your own branch based off `develop` and switch to it
+
+```sh
+# choose a descriptive and consise name without using <>
+git checkout -b operators/legal-forum/<MY_BRANCH_NAME>
+
+# example: git checkout -b operators/legal-forum/alice-vps-faq-template
+
+# you can double check that you are on the right branch
+git branch
+```
+
+4. Save your legal findings as `<JURISDICTION_NAME>.md` to `/nym/documentation/operators/src/legal` or add info to an existing page
+
+5. **Don't change anything in `SUMMARY.md`**, the admins will do it when merging
+
+6. Add, commit and push your changes
+
+```sh
+cd documentation/operators/src/legal
+git add <FILE_NAME>.md
+git commit -am "<DESCRIBE YOUR CHANGES>"
+git push origin operators/legal-forum/<MY_BRANCH_NAME>
+```
+7. Open the git generated link in your browser, fill the description and click on `Create a Pull Request` button
+```sh
+# the url will look like this
+ https://github.com/nymtech/nym/pull/new/operators/legal-forum/<MY_BRANCH_NAME>
+```
+8. Notify others in the [Node Operators Legal Forum](https://matrix.to/#/!YfoUFsJjsXbWmijbPG:nymtech.chat?via=nymtech.chat&via=matrix.org) (Matrix chat) about the PR.
diff --git a/documentation/operators/src/legal/community-counsel.md b/documentation/operators/src/legal/community-counsel.md
new file mode 100644
index 0000000000..aa0418f43d
--- /dev/null
+++ b/documentation/operators/src/legal/community-counsel.md
@@ -0,0 +1,11 @@
+# Community Counsel
+
+```admonish info
+The entire content of this page is under [Creative Commons Attribution 4.0 International Public License](https://creativecommons.org/licenses/by/4.0/).
+```
+
+Running an Exit Gateway is a commitment and as such is exposed to various challenges. Besides different legal regulations typical difficulties may be dealing with VPS or ISP providers. Our strength lies in decentralised community of squads and individuals supporting each other. Sharing examples of [landing pages](landing-pages.md), templates for communication and FAQs is a great way to empower other operators sharing the mission of liberating internet. Below is a simple way how to create a pull request directly to Nym Operator Guide book.
+
+## How to add content
+
+Our aim is to establish a strong community network, sharing legal findings and other suggestions with each other. We would like to encourage all of the current and future operators to do research about the situation in the jurisdiction they operate in as well as solutions to any challenges when running an Exit Gateway and add those through a pull request (PR). Please check out the [steps to make a pull request](add-content.md).
diff --git a/documentation/operators/src/legal/exit-gateway.md b/documentation/operators/src/legal/exit-gateway.md
index cc1e6bb81b..fa36eb3105 100644
--- a/documentation/operators/src/legal/exit-gateway.md
+++ b/documentation/operators/src/legal/exit-gateway.md
@@ -127,67 +127,14 @@ Useful links:
     - [github.com/coldhakca/abuse-templates/blob/master/dmca.template](https://github.com/coldhakca/abuse-templates/blob/master/dmca.template)
 
 
-## Legal environment - Findings from our legal team
+## Legal environment of Nym Exit Gateway
 
-The Node Operators Legal Forum pages are divided into pages according the region:
+The Node Operators Legal Forum pages are divided according [jurisdictions](jurisdictions.md). Read below to learn [how to add](add-content.md) findings about your jurisdiction or edit existing info.
 
-- [Switzerland](./swiss.md)
-- [United States](./united-states.md)
+## Community Counsel
 
-See the next chapter to learn how to edit information or add findings about your jurisdiction.
-
-## How to edit or add legal information
-
-Our aim is to establish a strong community network, sharing legal findings with each other. We would like to encourage all the current and future operators to do research about the situation in the jurisdiction they operate and update this page.
-
-First of all, please join our [Node Operators Legal Forum](https://matrix.to/#/!YfoUFsJjsXbWmijbPG:nymtech.chat?via=nymtech.chat&via=matrix.org) (Matrix chat) and post any information or questions there.
-
-To add your information to this book, you can create a pull request directly to our [repository](https://github.com/nymtech/nym/tree/develop/documentation/operators/src), than ping the admins in the [Legal Forum chat](https://matrix.to/#/!YfoUFsJjsXbWmijbPG:nymtech.chat?via=nymtech.chat&via=matrix.org) and we will review it as fast as possible. 
-
-To do so, follow the steps below:
-
-1. Write your legal findings down in a text editor (Soon we will share a template)
-2. Clone `nymtech/nym` repository and switch to develop branch
-
-```sh
-# Clone the repository
-git clone https://github.com/nymtech/nym
-
-# Go to the directory nym
-cd nym
-
-# Switch to branch develop
-git checkout develop
-
-# Update the repository
-git pull origin develop
-```
-
-3. Make your own branch based off `develop` and switch to it
-
-```sh
-git branch operators/legal-forum/<MY_BRANCH_NAME> # choose a descriptive and consiose name without using <>
-git checkout operators/legal-forum/<MY_BRANCH_NAME>
-
-# you can double check that you are on the right branch
-git branch
-```
-
-4. Save your legal findings as `<FILE_NAME>.md` to `/nym/documentation/operators/src/legal`
-5. Don't change anything in `SUMMARY.md`, the admins will do it when merging
-6. Add, commit and push your changes
-
-```sh
-cd documentation/operators/src/legal
-git add <FILE_NAME>.md
-git commit -am "<describe your changes>"
-git push origin operators/legal-forum/<MY_BRANCH_NAME>
-```
-7. Open the git generated link in your browser, fill the description and click on `Create a Pull Request` button
-```sh
-# The link will look like this
- https://github.com/nymtech/nym/pull/new/<MY_BRANCH_NAME>
-```
-8. Notify others in the [Node Operators Legal Forum](https://matrix.to/#/!YfoUFsJjsXbWmijbPG:nymtech.chat?via=nymtech.chat&via=matrix.org) (Matrix chat)
+Nym Node operators are invited to add their legal findings or helpful suggestions directly through [pull requests](add-content.md). This can be done as a new legal information (or entire new country) to the list of [jurisdictions](jurisdictions.md) or in a form of an advice to [Community counsel pages](community-counsel.md), sharing examples of Exit Gateway [landing pages](landing-pages.md), templates etcetra.
 
+## How to add content
 
+Our aim is to establish a strong community network, sharing legal findings and other suggestions with each other. We would like to encourage all of the current and future operators to do research about the situation in the jurisdiction they operate in as well as solutions to any challenges when running an Exit Gateway and add those through a pull request (PR). Please check out the [steps to make a pull request](add-content.md).
diff --git a/documentation/operators/src/legal/jurisdictions.md b/documentation/operators/src/legal/jurisdictions.md
new file mode 100644
index 0000000000..a629626695
--- /dev/null
+++ b/documentation/operators/src/legal/jurisdictions.md
@@ -0,0 +1,19 @@
+# Exit Gateway - Jurisdictions
+
+```admonish info
+The entire content of this page is under [Creative Commons Attribution 4.0 International Public License](https://creativecommons.org/licenses/by/4.0/).
+```
+
+```admonish warning
+The following part is for informational purposes only. Nym core team cannot provide comprehensive legal advice across all jurisdictions. Knowledge and experience with the legalities are being built up with the help of our counsel and with you, the community of Nym node operators. We encourage Nym node operators to join the [Node Operator](https://matrix.to/#/#operators:nymtech.chat) and [Operators Legal Forum](https://matrix.to/#/!YfoUFsJjsXbWmijbPG:nymtech.chat?via=nymtech.chat&via=matrix.org) channels on Element to share best practices and experiences.
+```
+
+There is no one silver bullet covering the entire globe. Every jurisdiction has different set of laws and practices regarding internet traffic routing. Therefore the Node Operators Legal Forum pages are divided per region.
+
+These are some findings from our legal team as an example:
+
+- [Switzerland](swiss.md)
+- [United States](united-states.md)
+
+> Nym Node operators are invited to add their legal findings directly through [pull requests](add-content.md).
+
diff --git a/documentation/operators/src/legal/landing-pages.md b/documentation/operators/src/legal/landing-pages.md
new file mode 100644
index 0000000000..a03546919e
--- /dev/null
+++ b/documentation/operators/src/legal/landing-pages.md
@@ -0,0 +1,9 @@
+# Landing Pages
+
+```admonish info
+The entire content of this page is under [Creative Commons Attribution 4.0 International Public License](https://creativecommons.org/licenses/by/4.0/).
+```
+
+> Nym Node operators are invited to add their legal findings and suggestions directly through [pull requests](add-content.md).
+
+Exit Gateway landing page is a great and transparent way to prevent possible troubles by providing people with basic facts, links to laws and regulations on a given topic as well as operator's contact info. To inspire each other we share some examples how Nym community handled this issue below.
diff --git a/documentation/operators/src/nodes/gateway-setup.md b/documentation/operators/src/nodes/gateway-setup.md
index b77c5c2924..321a26498b 100644
--- a/documentation/operators/src/nodes/gateway-setup.md
+++ b/documentation/operators/src/nodes/gateway-setup.md
@@ -132,7 +132,7 @@ Save, exit and restart your Gateway. Now you are an operator of post-smooshed Ex
 
 In case you already added Network Requester functionality to your Gateway as described above but haven't enabled the [exit policy](https://nymtech.net/.wellknown/network-requester/exit-policy.txt) there is an easy tweak to do so and turn your node into [Nym Exit Gateway](../faq/smoosh-faq.md#what-are-the-changes).
 
-Open the config file stored at `.nym/gateways/<ID>/config/network_requester_config.tom` and set:
+Open the config file stored at `.nym/gateways/<ID>/config/network_requester_config.toml` and set:
 ```sh
 use_deprecated_allow_list = false
 ```
diff --git a/documentation/operators/theme/css/variables.css b/documentation/operators/theme/css/variables.css
deleted file mode 100644
index 8dfcf92239..0000000000
--- a/documentation/operators/theme/css/variables.css
+++ /dev/null
@@ -1,3257 +0,0 @@
-
-/* Globals */
-
-:root {
-    --sidebar-width: 300px;
-    --page-padding: 20px;
-    --content-max-width: 70%;
-    --menu-bar-height: 40px;
-    --mono-font: "Source Code Pro", Consolas, "Ubuntu Mono", Menlo, "DejaVu Sans Mono", monospace, monospace;
-    --code-font-size: 0.875em /* please adjust the ace font size accordingly in editor.js */
-    --pagetoc-width: 13%;
-    --pagetoc-fontsize: 14.5px;
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-@media only screen and (max-width:1439px) {
- :root{
-    --content-max-width: 98%;
-  }
-}
-
-/* Themes */
-
-.ayu {
-    --bg: hsl(210, 25%, 8%);
-    --fg: #c5c5c5;
-
-    --sidebar-bg: #14191f;
-    --sidebar-fg: #c8c9db;
-    --sidebar-non-existant: #5c6773;
-    --sidebar-active: #ffb454;
-    --sidebar-spacer: #2d334f;
-
-    --scrollbar: var(--sidebar-fg);
-
-    --icons: #737480;
-    --icons-hover: #b7b9cc;
-
-    --links: #0096cf;
-
-    --inline-code-color: #ffb454;
-
-    --theme-popup-bg: #14191f;
-    --theme-popup-border: #5c6773;
-    --theme-hover: #191f26;
-
-    --quote-bg: hsl(226, 15%, 17%);
-    --quote-border: hsl(226, 15%, 22%);
-
-    --table-border-color: hsl(210, 25%, 13%);
-    --table-header-bg: hsl(210, 25%, 28%);
-    --table-alternate-bg: hsl(210, 25%, 11%);
-
-    --searchbar-border-color: #848484;
-    --searchbar-bg: #424242;
-    --searchbar-fg: #fff;
-    --searchbar-shadow-color: #d4c89f;
-    --searchresults-header-fg: #666;
-    --searchresults-border-color: #888;
-    --searchresults-li-bg: #252932;
-    --search-mark-bg: #e3b171;
-}
-
-.coal {
-    --bg: hsl(200, 7%, 8%);
-    --fg: #98a3ad;
-
-    --sidebar-bg: #292c2f;
-    --sidebar-fg: #a1adb8;
-    --sidebar-non-existant: #505254;
-    --sidebar-active: #3473ad;
-    --sidebar-spacer: #393939;
-
-    --scrollbar: var(--sidebar-fg);
-
-    --icons: #43484d;
-    --icons-hover: #b3c0cc;
-
-    --links: #2b79a2;
-
-    --inline-code-color: #c5c8c6;
-
-    --theme-popup-bg: #141617;
-    --theme-popup-border: #43484d;
-    --theme-hover: #1f2124;
-
-    --quote-bg: hsl(234, 21%, 18%);
-    --quote-border: hsl(234, 21%, 23%);
-
-    --table-border-color: hsl(200, 7%, 13%);
-    --table-header-bg: hsl(200, 7%, 28%);
-    --table-alternate-bg: hsl(200, 7%, 11%);
-
-    --searchbar-border-color: #aaa;
-    --searchbar-bg: #b7b7b7;
-    --searchbar-fg: #000;
-    --searchbar-shadow-color: #aaa;
-    --searchresults-header-fg: #666;
-    --searchresults-border-color: #98a3ad;
-    --searchresults-li-bg: #2b2b2f;
-    --search-mark-bg: #355c7d;
-}
-
-.light {
-    --bg: hsl(0, 0%, 100%);
-    --fg: hsl(0, 0%, 0%);
-
-    --sidebar-bg: #fafafa;
-    --sidebar-fg: hsl(0, 0%, 0%);
-    --sidebar-non-existant: #aaaaaa;
-    --sidebar-active: #1f1fff;
-    --sidebar-spacer: #f4f4f4;
-
-    --scrollbar: #8F8F8F;
-
-    --icons: #747474;
-    --icons-hover: #000000;
-
-    --links: #1f1fff;
-
-    --inline-code-color: #F42C4C;
-
-    --theme-popup-bg: #fafafa;
-    --theme-popup-border: #cccccc;
-    --theme-hover: #e6e6e6;
-
-    --quote-bg: hsl(197, 37%, 96%);
-    --quote-border: hsl(197, 37%, 91%);
-
-    --table-border-color: hsl(0, 0%, 95%);
-    --table-header-bg: hsl(0, 0%, 80%);
-    --table-alternate-bg: hsl(0, 0%, 97%);
-
-    --searchbar-border-color: #aaa;
-    --searchbar-bg: #fafafa;
-    --searchbar-fg: #000;
-    --searchbar-shadow-color: #aaa;
-    --searchresults-header-fg: #666;
-    --searchresults-border-color: #888;
-    --searchresults-li-bg: #e4f2fe;
-    --search-mark-bg: #a2cff5;
-}
-
-.navy {
-    --bg: hsl(226, 23%, 11%);
-    --fg: #bcbdd0;
-
-    --sidebar-bg: #282d3f;
-    --sidebar-fg: #c8c9db;
-    --sidebar-non-existant: #505274;
-    --sidebar-active: #2b79a2;
-    --sidebar-spacer: #2d334f;
-
-    --scrollbar: var(--sidebar-fg);
-
-    --icons: #737480;
-    --icons-hover: #b7b9cc;
-
-    --links: #2b79a2;
-
-    --inline-code-color: #c5c8c6;
-
-    --theme-popup-bg: #161923;
-    --theme-popup-border: #737480;
-    --theme-hover: #282e40;
-
-    --quote-bg: hsl(226, 15%, 17%);
-    --quote-border: hsl(226, 15%, 22%);
-
-    --table-border-color: hsl(226, 23%, 16%);
-    --table-header-bg: hsl(226, 23%, 31%);
-    --table-alternate-bg: hsl(226, 23%, 14%);
-
-    --searchbar-border-color: #aaa;
-    --searchbar-bg: #aeaec6;
-    --searchbar-fg: #000;
-    --searchbar-shadow-color: #aaa;
-    --searchresults-header-fg: #5f5f71;
-    --searchresults-border-color: #5c5c68;
-    --searchresults-li-bg: #242430;
-    --search-mark-bg: #a2cff5;
-}
-
-.rust {
-    --bg: hsl(60, 9%, 87%);
-    --fg: #262625;
-
-    --sidebar-bg: #3b2e2a;
-    --sidebar-fg: #c8c9db;
-    --sidebar-non-existant: #505254;
-    --sidebar-active: #e69f67;
-    --sidebar-spacer: #45373a;
-
-    --scrollbar: var(--sidebar-fg);
-
-    --icons: #737480;
-    --icons-hover: #262625;
-
-    --links: #2b79a2;
-
-    --inline-code-color: #6e6b5e;
-
-    --theme-popup-bg: #e1e1db;
-    --theme-popup-border: #b38f6b;
-    --theme-hover: #99908a;
-
-    --quote-bg: hsl(60, 5%, 75%);
-    --quote-border: hsl(60, 5%, 70%);
-
-    --table-border-color: hsl(60, 9%, 82%);
-    --table-header-bg: #b3a497;
-    --table-alternate-bg: hsl(60, 9%, 84%);
-
-    --searchbar-border-color: #aaa;
-    --searchbar-bg: #fafafa;
-    --searchbar-fg: #000;
-    --searchbar-shadow-color: #aaa;
-    --searchresults-header-fg: #666;
-    --searchresults-border-color: #888;
-    --searchresults-li-bg: #dec2a2;
-    --search-mark-bg: #e69f67;
-}
-
-@media (prefers-color-scheme: dark) {
-    .light.no-js {
-        --bg: hsl(200, 7%, 8%);
-        --fg: #98a3ad;
-
-        --sidebar-bg: #292c2f;
-        --sidebar-fg: #a1adb8;
-        --sidebar-non-existant: #505254;
-        --sidebar-active: #3473ad;
-        --sidebar-spacer: #393939;
-
-        --scrollbar: var(--sidebar-fg);
-
-        --icons: #43484d;
-        --icons-hover: #b3c0cc;
-
-        --links: #2b79a2;
-
-        --inline-code-color: #c5c8c6;
-
-        --theme-popup-bg: #141617;
-        --theme-popup-border: #43484d;
-        --theme-hover: #1f2124;
-
-        --quote-bg: hsl(234, 21%, 18%);
-        --quote-border: hsl(234, 21%, 23%);
-
-        --table-border-color: hsl(200, 7%, 13%);
-        --table-header-bg: hsl(200, 7%, 28%);
-        --table-alternate-bg: hsl(200, 7%, 11%);
-
-        --searchbar-border-color: #aaa;
-        --searchbar-bg: #b7b7b7;
-        --searchbar-fg: #000;
-        --searchbar-shadow-color: #aaa;
-        --searchresults-header-fg: #666;
-        --searchresults-border-color: #98a3ad;
-        --searchresults-li-bg: #2b2b2f;
-        --search-mark-bg: #355c7d;
-    }
-}
diff --git a/documentation/operators/theme/index.hbs b/documentation/operators/theme/index.hbs
deleted file mode 100644
index 06a3731f33..0000000000
--- a/documentation/operators/theme/index.hbs
+++ /dev/null
@@ -1,1063 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="{{ language }}" class="sidebar-visible no-js {{ default_theme }}">
-    <head>
-        <!-- Book generated using mdBook -->
-        <meta charset="UTF-8">
-        <title>{{ title }}</title>
-        {{#if is_print }}
-        <meta name="robots" content="noindex" />
-        {{/if}}
-        {{#if base_url}}
-        <base href="{{ base_url }}">
-        {{/if}}
-
-
-        <!-- Custom HTML head -->
-        {{> head}}
-
-        <meta name="description" content="{{ description }}">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <meta name="theme-color" content="#ffffff" />
-
-        {{#if favicon_svg}}
-        <link rel="icon" href="{{ path_to_root }}favicon.svg">
-        {{/if}}
-        {{#if favicon_png}}
-        <link rel="shortcut icon" href="{{ path_to_root }}favicon.png">
-        {{/if}}
-        <link rel="stylesheet" href="{{ path_to_root }}css/variables.css">
-        <link rel="stylesheet" href="{{ path_to_root }}css/general.css">
-        <link rel="stylesheet" href="{{ path_to_root }}css/chrome.css">
-        {{#if print_enable}}
-        <link rel="stylesheet" href="{{ path_to_root }}css/print.css" media="print">
-        {{/if}}
-
-        <!-- Fonts -->
-        <link rel="stylesheet" href="{{ path_to_root }}FontAwesome/css/font-awesome.css">
-        {{#if copy_fonts}}
-        <link rel="stylesheet" href="{{ path_to_root }}fonts/fonts.css">
-        {{/if}}
-
-        <!-- Highlight.js Stylesheets -->
-        <link rel="stylesheet" href="{{ path_to_root }}highlight.css">
-        <link rel="stylesheet" href="{{ path_to_root }}tomorrow-night.css">
-        <link rel="stylesheet" href="{{ path_to_root }}ayu-highlight.css">
-
-        <!-- Custom theme stylesheets -->
-        {{#each additional_css}}
-        <link rel="stylesheet" href="{{ ../path_to_root }}{{ this }}">
-        {{/each}}
-
-        {{#if mathjax_support}}
-        <!-- MathJax -->
-        <script async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
-        {{/if}}
-    </head>
-    <body>
-        <!-- Provide site root to javascript -->
-        <script>
-            var path_to_root = "{{ path_to_root }}";
-            var default_theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? "{{ preferred_dark_theme }}" : "{{ default_theme }}";
-        </script>
-
-        <!-- Work around some values being stored in localStorage wrapped in quotes -->
-        <script>
-            try {
-                var theme = localStorage.getItem('mdbook-theme');
-                var sidebar = localStorage.getItem('mdbook-sidebar');
-
-                if (theme.startsWith('"') && theme.endsWith('"')) {
-                    localStorage.setItem('mdbook-theme', theme.slice(1, theme.length - 1));
-                }
-
-                if (sidebar.startsWith('"') && sidebar.endsWith('"')) {
-                    localStorage.setItem('mdbook-sidebar', sidebar.slice(1, sidebar.length - 1));
-                }
-            } catch (e) { }
-        </script>
-
-        <!-- Set the theme before any content is loaded, prevents flash -->
-        <script>
-            var theme;
-            try { theme = localStorage.getItem('mdbook-theme'); } catch(e) { }
-            if (theme === null || theme === undefined) { theme = default_theme; }
-            var html = document.querySelector('html');
-            html.classList.remove('no-js')
-            html.classList.remove('{{ default_theme }}')
-            html.classList.add(theme);
-            html.classList.add('js');
-        </script>
-
-        <!-- Hide / unhide sidebar before it is displayed -->
-        <script>
-            var html = document.querySelector('html');
-            var sidebar = 'hidden';
-            if (document.body.clientWidth >= 1080) {
-                try { sidebar = localStorage.getItem('mdbook-sidebar'); } catch(e) { }
-                sidebar = sidebar || 'visible';
-            }
-            html.classList.remove('sidebar-visible');
-            html.classList.add("sidebar-" + sidebar);
-        </script>
-
-        <nav id="sidebar" class="sidebar" aria-label="Table of contents">
-            <div class="sidebar-scrollbox">
-                {{#toc}}{{/toc}}
-            </div>
-            <div id="sidebar-resize-handle" class="sidebar-resize-handle"></div>
-        </nav>
-
-        <div id="page-wrapper" class="page-wrapper">
-
-            <div class="page">
-                {{> header}}
-                <div id="menu-bar-hover-placeholder"></div>
-                <div id="menu-bar" class="menu-bar sticky bordered">
-                    <div class="left-buttons">
-                        <button id="sidebar-toggle" class="icon-button" type="button" title="Toggle Table of Contents" aria-label="Toggle Table of Contents" aria-controls="sidebar">
-                            <i class="fa fa-bars"></i>
-                        </button>
-                        <button id="theme-toggle" class="icon-button" type="button" title="Change theme" aria-label="Change theme" aria-haspopup="true" aria-expanded="false" aria-controls="theme-list">
-                            <i class="fa fa-paint-brush"></i>
-                        </button>
-                        <ul id="theme-list" class="theme-popup" aria-label="Themes" role="menu">
-                            <li role="none"><button role="menuitem" class="theme" id="light">Light</button></li>
-                            <li role="none"><button role="menuitem" class="theme" id="rust">Rust</button></li>
-                            <li role="none"><button role="menuitem" class="theme" id="coal">Coal</button></li>
-                            <li role="none"><button role="menuitem" class="theme" id="navy">Navy</button></li>
-                            <li role="none"><button role="menuitem" class="theme" id="ayu">Ayu</button></li>
-                        </ul>
-                        {{#if search_enabled}}
-                        <button id="search-toggle" class="icon-button" type="button" title="Search. (Shortkey: s)" aria-label="Toggle Searchbar" aria-expanded="false" aria-keyshortcuts="S" aria-controls="searchbar">
-                            <i class="fa fa-search"></i>
-                        </button>
-                        {{/if}}
-                    </div>
-
-                    <h1 class="menu-title">{{ book_title }}</h1>
-
-                    <div class="right-buttons">
-                        {{#if print_enable}}
-                        <a href="{{ path_to_root }}print.html" title="Print this book" aria-label="Print this book">
-                            <i id="print-button" class="fa fa-print"></i>
-                        </a>
-                        {{/if}}
-                        {{#if git_repository_url}}
-                        <a href="{{git_repository_url}}" title="Git repository" aria-label="Git repository">
-                            <i id="git-repository-button" class="fa {{git_repository_icon}}"></i>
-                        </a>
-                        {{/if}}
-                        {{#if git_repository_edit_url}}
-                        <a href="{{git_repository_edit_url}}" title="Suggest an edit" aria-label="Suggest an edit">
-                            <i id="git-edit-button" class="fa fa-edit"></i>
-                        </a>
-                        {{/if}}
-
-                    </div>
-                </div>
-
-                {{#if search_enabled}}
-                <div id="search-wrapper" class="hidden">
-                    <form id="searchbar-outer" class="searchbar-outer">
-                        <input type="search" id="searchbar" name="searchbar" placeholder="Search this book ..." aria-controls="searchresults-outer" aria-describedby="searchresults-header">
-                    </form>
-                    <div id="searchresults-outer" class="searchresults-outer hidden">
-                        <div id="searchresults-header" class="searchresults-header"></div>
-                        <ul id="searchresults">
-                        </ul>
-                    </div>
-                </div>
-                {{/if}}
-
-                <!-- Apply ARIA attributes after the sidebar and the sidebar toggle button are added to the DOM -->
-                <script>
-                    document.getElementById('sidebar-toggle').setAttribute('aria-expanded', sidebar === 'visible');
-                    document.getElementById('sidebar').setAttribute('aria-hidden', sidebar !== 'visible');
-                    Array.from(document.querySelectorAll('#sidebar a')).forEach(function(link) {
-                        link.setAttribute('tabIndex', sidebar === 'visible' ? 0 : -1);
-                    });
-                </script>
-
-                <div id="content" class="content">
-                    <main>
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        <!-- Page table of contents -->
-                        <div class="sidetoc"><nav class="pagetoc"></nav></div>
-
-                        {{{ content }}}
-                    </main>
-
-                    <nav class="nav-wrapper" aria-label="Page navigation">
-                        <!-- Mobile navigation buttons -->
-                        {{#previous}}
-                            <a rel="prev" href="{{ path_to_root }}{{link}}" class="mobile-nav-chapters previous" title="Previous chapter" aria-label="Previous chapter" aria-keyshortcuts="Left">
-                                <i class="fa fa-angle-left"></i>
-                            </a>
-                        {{/previous}}
-
-                        {{#next}}
-                            <a rel="next" href="{{ path_to_root }}{{link}}" class="mobile-nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
-                                <i class="fa fa-angle-right"></i>
-                            </a>
-                        {{/next}}
-
-                        <div style="clear: both"></div>
-                    </nav>
-                </div>
-            </div>
-
-            <nav class="nav-wide-wrapper" aria-label="Page navigation">
-                {{#previous}}
-                    <a rel="prev" href="{{ path_to_root }}{{link}}" class="nav-chapters previous" title="Previous chapter" aria-label="Previous chapter" aria-keyshortcuts="Left">
-                        <i class="fa fa-angle-left"></i>
-                    </a>
-                {{/previous}}
-
-                {{#next}}
-                    <a rel="next" href="{{ path_to_root }}{{link}}" class="nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
-                        <i class="fa fa-angle-right"></i>
-                    </a>
-                {{/next}}
-            </nav>
-
-        </div>
-
-        {{#if live_reload_endpoint}}
-        <!-- Livereload script (if served using the cli tool) -->
-        <script>
-            const wsProtocol = location.protocol === 'https:' ? 'wss:' : 'ws:';
-            const wsAddress = wsProtocol + "//" + location.host + "/" + "{{{live_reload_endpoint}}}";
-            const socket = new WebSocket(wsAddress);
-            socket.onmessage = function (event) {
-                if (event.data === "reload") {
-                    socket.close();
-                    location.reload();
-                }
-            };
-
-            window.onbeforeunload = function() {
-                socket.close();
-            }
-        </script>
-        {{/if}}
-
-        {{#if google_analytics}}
-        <!-- Google Analytics Tag -->
-        <script>
-            var localAddrs = ["localhost", "127.0.0.1", ""];
-
-            // make sure we don't activate google analytics if the developer is
-            // inspecting the book locally...
-            if (localAddrs.indexOf(document.location.hostname) === -1) {
-                (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-                (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-                m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-                })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-                ga('create', '{{google_analytics}}', 'auto');
-                ga('send', 'pageview');
-            }
-        </script>
-        {{/if}}
-
-        {{#if playground_line_numbers}}
-        <script>
-            window.playground_line_numbers = true;
-        </script>
-        {{/if}}
-
-        {{#if playground_copyable}}
-        <script>
-            window.playground_copyable = true;
-        </script>
-        {{/if}}
-
-        {{#if playground_js}}
-        <script src="{{ path_to_root }}ace.js"></script>
-        <script src="{{ path_to_root }}editor.js"></script>
-        <script src="{{ path_to_root }}mode-rust.js"></script>
-        <script src="{{ path_to_root }}theme-dawn.js"></script>
-        <script src="{{ path_to_root }}theme-tomorrow_night.js"></script>
-        {{/if}}
-
-        {{#if search_js}}
-        <script src="{{ path_to_root }}elasticlunr.min.js"></script>
-        <script src="{{ path_to_root }}mark.min.js"></script>
-        <script src="{{ path_to_root }}searcher.js"></script>
-        {{/if}}
-
-        <script src="{{ path_to_root }}clipboard.min.js"></script>
-        <script src="{{ path_to_root }}highlight.js"></script>
-        <script src="{{ path_to_root }}book.js"></script>
-
-        <!-- Custom JS scripts -->
-        {{#each additional_js}}
-        <script src="{{ ../path_to_root }}{{this}}"></script>
-        {{/each}}
-
-        {{#if is_print}}
-        {{#if mathjax_support}}
-        <script>
-        window.addEventListener('load', function() {
-            MathJax.Hub.Register.StartupHook('End', function() {
-                window.setTimeout(window.print, 100);
-            });
-        });
-        </script>
-        {{else}}
-        <script>
-        window.addEventListener('load', function() {
-            window.setTimeout(window.print, 100);
-        });
-        </script>
-        {{/if}}
-        {{/if}}
-
-    </body>
-</html>
diff --git a/documentation/operators/theme/pagetoc.css b/documentation/operators/theme/pagetoc.css
deleted file mode 100644
index a68e5b8e21..0000000000
--- a/documentation/operators/theme/pagetoc.css
+++ /dev/null
@@ -1,47 +0,0 @@
-/* src: https://github.com/JorelAli/mdBook-pagetoc */
-
-@media only screen and (max-width:1439px) {
-    .sidetoc {
-        display: none;
-    }
-}
-
-@media only screen and (min-width:1440px) {
-    main {
-        position: relative;
-    }
-    .sidetoc {
-        margin-left: auto;
-        margin-right: auto;
-        /* left: calc(90% + (var(--content-min-width))/4 - 110px); */
-        left: 101%;
-        position: absolute;
-        font-size: var(--pagetoc-fontsize);
-    }
-    .pagetoc {
-        position: fixed;
-        width: var(--pagetoc-width);
-    }
-    .pagetoc a {
-        border-left: 1px solid var(--sidebar-bg);
-        /* color: var(--fg); */
-        /* color: var(--sidebar-fg); */
-        color: var(--links);
-        display: block;
-        padding-bottom: 5px;
-        padding-top: 5px;
-        padding-left: 10px;
-        text-align: left;
-        text-decoration: none;
-        font-weight: normal;
-        background: var(--sidebar-bg);
-    }
-    .pagetoc a:hover,
-    .pagetoc a.active {
-        background: var(--sidebar-bg);
-        /* color: var(--sidebar-fg); */
-        color: var(--sidebar-active);
-        font-weight: bold;
-        font-size: var(--pagetoc-fontsize);
-    }
-}
diff --git a/documentation/operators/theme/pagetoc.js b/documentation/operators/theme/pagetoc.js
deleted file mode 100644
index b11052427e..0000000000
--- a/documentation/operators/theme/pagetoc.js
+++ /dev/null
@@ -1,68 +0,0 @@
-// src: https://github.com/JorelAli/mdBook-pagetoc
-
-// Un-active everything when you click it
-Array.prototype.forEach.call(document.getElementsByClassName("pagetoc")[0].children, function(el, i) {
-    el.addEventHandler("click", function() {
-        Array.prototype.forEach.call(document.getElementsByClassName("pagetoc")[0].children, function(el, i) {
-            el.classList.remove("active");
-        });
-        el.classList.add("active");
-    });
-});
-
-var updateFunction = function() {
-
-    var id;
-    var elements = document.getElementsByClassName("header");
-    Array.prototype.forEach.call(elements, function(el, i) {
-        if (window.pageYOffset >= el.offsetTop) {
-            id = el;
-        }
-    });
-
-    Array.prototype.forEach.call(document.getElementsByClassName("pagetoc")[0].children, function(el, i) {
-        el.classList.remove("active");
-    });
-
-    Array.prototype.forEach.call(document.getElementsByClassName("pagetoc")[0].children, function(el, i) {
-        if (id.href.localeCompare(el.href) == 0) {
-            el.classList.add("active");
-        }
-    });
-};
-
-// Populate sidebar on load
-window.addEventListener('load', function() {
-    var pagetoc = document.getElementsByClassName("pagetoc")[0];
-    var elements = document.getElementsByClassName("header");
-    Array.prototype.forEach.call(elements, function(el, i) {
-        var link = document.createElement("a");
-
-        // Indent shows hierarchy
-        var indent = "";
-        switch (el.parentElement.tagName) {
-            case "H2":
-                indent = "20px";
-                break;
-            case "H3":
-                indent = "40px";
-                break;
-            case "H4":
-                indent = "60px";
-                break;
-            default:
-                break;
-        }
-
-        link.appendChild(document.createTextNode(el.text));
-        link.style.paddingLeft = indent;
-        link.href = el.href;
-        pagetoc.appendChild(link);
-    });
-    updateFunction.call();
-});
-
-
-
-// Handle active elements on scroll
-window.addEventListener("scroll", updateFunction);
diff --git a/envs/qa.env b/envs/qa.env
index 97d9838411..fa323cf41d 100644
--- a/envs/qa.env
+++ b/envs/qa.env
@@ -12,18 +12,18 @@ DENOMS_EXPONENT=6
 
 MIXNET_CONTRACT_ADDRESS=n14hj2tavq8fpesdwxxcu44rty3hh90vhujrvcmstl4zr3txmfvw9sjyvg3g
 VESTING_CONTRACT_ADDRESS=n1nc5tatafv6eyq7llkr2gv50ff9e22mnf70qgjlv737ktmt4eswrq73f2nw
-COCONUT_BANDWIDTH_CONTRACT_ADDRESS=n1w798gp0zqv3s9hjl3jlnwxtwhykga6rn93p46q2crsdqhaj3y4gs68f74j
-GROUP_CONTRACT_ADDRESS=n1sthrn5ep8ls5vzz8f9gp89khhmedahhdqd244dh9uqzk3hx2pzrsvf7zgk
-MULTISIG_CONTRACT_ADDRESS=n1sr06m8yqg0wzqqyqvzvp5t07dj4nevx9u8qc7j4qa72qu8e3ct8qledthy
-COCONUT_DKG_CONTRACT_ADDRESS=n1udfs22xpxle475m2nz7u47jfa3vngncdegmczwwdx00cmetypa3s7uyuqn
-EPHEMERA_CONTRACT_ADDRESS=n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0
+COCONUT_BANDWIDTH_CONTRACT_ADDRESS=n1aht6sekk0302hh30eje9a4lq84juwehw2hxv65kjh863ptay0sxs84mhx8
+GROUP_CONTRACT_ADDRESS=n17akgf5y2t775k27kulyw8durzsgfedym9wemg0qv3msc4ry0cg2senyl36
+MULTISIG_CONTRACT_ADDRESS=n1075wwvq8ypag74tmzeu7a05mplwsa95g2p8wnxhhctv7hlp6y3wq9ttqcg
+COCONUT_DKG_CONTRACT_ADDRESS=n1hk7jy0m6ec5gventvgsx8skrz8mrudhqhun0ufg5gaa3mrr83qyq45v2zk
 REWARDING_VALIDATOR_ADDRESS=n1rfvpsynktze6wvn6ldskj8xgwfzzk5v6pnff39
 NAME_SERVICE_CONTRACT_ADDRESS=n1qum2tr7hh4y7ruzew68c64myjec0dq2s2njf6waja5t0w879lutqadamme
 SERVICE_PROVIDER_DIRECTORY_CONTRACT_ADDRESS=n13ehuhysn5mqjeaheeuew2gjs785f6k7jm8vfsqg3jhtpkwppcmzq6m2hmz
 
 STATISTICS_SERVICE_DOMAIN_ADDRESS="https://mainnet-stats.nymte.ch:8090"
 EXPLORER_API=https://qa-network-explorer.qa.nymte.ch/api
-NYXD="https://qa-validator.qa.nymte.ch/"
+NYXD="https://qa-validator.qa.nymte.ch"
 NYM_API="https://qa-nym-api.qa.nymte.ch/api"
 
 DKG_TIME_CONFIGURATION="600,300,300,60,60,1209600"
+EXIT_POLICY="https://nymtech.net/.wellknown/network-requester/exit-policy.txt"
\ No newline at end of file
diff --git a/ephemera/Cargo.toml b/ephemera/Cargo.toml
index e32fec2746..f8e963f5b7 100644
--- a/ephemera/Cargo.toml
+++ b/ephemera/Cargo.toml
@@ -2,6 +2,7 @@
 name = "ephemera"
 version = "0.1.0"
 edition = "2021"
+license.workspace = true
 
 [[bin]]
 name = "ephemera"
@@ -36,7 +37,7 @@ nym-config = { path = "../common/config" }
 nym-ephemera-common = { path = "../common/cosmwasm-smart-contracts/ephemera" }
 pretty_env_logger = "0.4"
 refinery = { version = "0.8.7", features = ["rusqlite"], optional = true }
-reqwest = { version = "0.11.22", features = ["json"] }
+reqwest = { version = "0.11.22", default_features = false, features = ["rustls-tls", "json"] }
 # Rocksdb kills compilation times and we're not currently using it. The reason
 # we comment it out is that rust-analyzer runs with --all-features
 #rocksdb = { version = "0.21.0", optional = true }
diff --git a/explorer-api/Cargo.toml b/explorer-api/Cargo.toml
index 0ee85478ac..f4d132d92a 100644
--- a/explorer-api/Cargo.toml
+++ b/explorer-api/Cargo.toml
@@ -16,15 +16,15 @@ itertools = "0.10.3"
 lazy_static = "1.4.0"
 log = { workspace = true }
 maxminddb = "0.23.0"
-okapi = { version = "0.7.0-rc.1", features = ["impl_json_schema"] }
+okapi = { version = "0.7.0", features = ["impl_json_schema"] }
 pretty_env_logger = "0.4.0"
 rand = "0.8.5"
 rand_pcg = "0.3.1"
 rand_seeder = "0.2.3"
 reqwest = { workspace = true }
-rocket = { version = "0.5.0-rc.2", features = ["json"] }
-rocket_cors = { git="https://github.com/lawliet89/rocket_cors", rev="dfd3662c49e2f6fc37df35091cb94d82f7fb5915" }
-rocket_okapi = { version = "0.8.0-rc.2", features = ["swagger"] }
+rocket = { version = "0.5.0", features = ["json"] }
+rocket_cors = { version = "0.6.0" }
+rocket_okapi = { version = "0.8.0", features = ["swagger"] }
 schemars = { workspace = true, features = ["preserve_order"] }
 serde = { workspace = true }
 serde_json = { workspace = true }
diff --git a/explorer-api/src/country_statistics/http.rs b/explorer-api/src/country_statistics/http.rs
index f51b8d242e..45259f11dc 100644
--- a/explorer-api/src/country_statistics/http.rs
+++ b/explorer-api/src/country_statistics/http.rs
@@ -1,6 +1,3 @@
-// due to the macro expansion of rather old rocket macros...
-#![allow(unused_imports)]
-
 use crate::country_statistics::country_nodes_distribution::CountryNodesDistribution;
 use crate::state::ExplorerApiStateContext;
 use rocket::serde::json::Json;
diff --git a/explorer-api/src/gateways/http.rs b/explorer-api/src/gateways/http.rs
index f47ea51146..ac0d85c0b1 100644
--- a/explorer-api/src/gateways/http.rs
+++ b/explorer-api/src/gateways/http.rs
@@ -1,9 +1,6 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-// due to the macro expansion of rather old rocket macros...
-#![allow(unused_imports)]
-
 use nym_explorer_api_requests::PrettyDetailedGatewayBond;
 use rocket::response::status::NotFound;
 use rocket::serde::json::Json;
diff --git a/explorer-api/src/guards/location.rs b/explorer-api/src/guards/location.rs
index 23bb92d941..045b03f5b4 100644
--- a/explorer-api/src/guards/location.rs
+++ b/explorer-api/src/guards/location.rs
@@ -60,7 +60,7 @@ impl<'r> FromRequest<'r> for Location {
     async fn from_request(request: &'r Request<'_>) -> Outcome<Self, Self::Error> {
         match find_location(request) {
             Ok(loc) => Outcome::Success(loc),
-            Err(e) => Outcome::Failure(e),
+            Err(e) => Outcome::Error(e),
         }
     }
 }
diff --git a/explorer-api/src/mix_node/http.rs b/explorer-api/src/mix_node/http.rs
index f1d2738db7..e00ed8ff82 100644
--- a/explorer-api/src/mix_node/http.rs
+++ b/explorer-api/src/mix_node/http.rs
@@ -1,9 +1,6 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-// due to the macro expansion of rather old rocket macros...
-#![allow(unused_imports)]
-
 use crate::mix_node::delegations::{
     get_single_mixnode_delegations, get_single_mixnode_delegations_summed,
 };
diff --git a/explorer-api/src/mix_nodes/http.rs b/explorer-api/src/mix_nodes/http.rs
index 5043a559e6..a36843b66f 100644
--- a/explorer-api/src/mix_nodes/http.rs
+++ b/explorer-api/src/mix_nodes/http.rs
@@ -1,6 +1,3 @@
-// due to the macro expansion of rather old rocket macros...
-#![allow(unused_imports)]
-
 use crate::mix_nodes::models::{MixNodeActiveSetSummary, MixNodeSummary};
 use crate::state::ExplorerApiStateContext;
 use nym_explorer_api_requests::{MixnodeStatus, PrettyDetailedMixNodeBond};
diff --git a/explorer-api/src/overview/http.rs b/explorer-api/src/overview/http.rs
index 1f130e68c6..a5cfb127c5 100644
--- a/explorer-api/src/overview/http.rs
+++ b/explorer-api/src/overview/http.rs
@@ -1,6 +1,3 @@
-// due to the macro expansion of rather old rocket macros...
-#![allow(unused_imports)]
-
 use rocket::serde::json::Json;
 use rocket::{Route, State};
 use rocket_okapi::okapi::openapi3::OpenApi;
diff --git a/explorer-api/src/ping/http.rs b/explorer-api/src/ping/http.rs
index a486c5c7a6..c3cd4107f1 100644
--- a/explorer-api/src/ping/http.rs
+++ b/explorer-api/src/ping/http.rs
@@ -1,9 +1,6 @@
 // Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-// due to the macro expansion of rather old rocket macros...
-#![allow(unused_imports)]
-
 use nym_mixnet_contract_common::{MixId, MixNode};
 use rocket::serde::json::Json;
 use rocket::{Route, State};
diff --git a/explorer-api/src/service_providers/http.rs b/explorer-api/src/service_providers/http.rs
index 5da66d9958..a942a68755 100644
--- a/explorer-api/src/service_providers/http.rs
+++ b/explorer-api/src/service_providers/http.rs
@@ -1,6 +1,3 @@
-// due to the macro expansion of rather old rocket macros...
-#![allow(unused_imports)]
-
 use crate::service_providers::models::{
     DirectoryService, DirectorySpDetailed, HarbourMasterService, PagedResult,
 };
diff --git a/explorer-api/src/validators/http.rs b/explorer-api/src/validators/http.rs
index ee42d2f14b..88a06eea01 100644
--- a/explorer-api/src/validators/http.rs
+++ b/explorer-api/src/validators/http.rs
@@ -1,9 +1,6 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-// due to the macro expansion of rather old rocket macros...
-#![allow(unused_imports)]
-
 use rocket::response::status::NotFound;
 use rocket::serde::json::Json;
 use rocket::{Route, State};
diff --git a/gateway/README.md b/gateway/README.md
index 1946046759..ad011e848c 100644
--- a/gateway/README.md
+++ b/gateway/README.md
@@ -27,8 +27,8 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 ## Install debian
 
 ```bash
-sudo curl -s --compressed "https://nymtech.github.io/nym/nymtech.gpg" | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/nymtech.gpg > /dev/null
-sudo echo "deb [signed-by=/etc/apt/trusted.gpg.d/nymtech.gpg] https://nymtech.github.io/nym/ /" > nymtech.list
+sudo curl -s --compressed "http://apt.nymtech.net.s3-website.eu-central-1.amazonaws.com/nymtech.gpg" | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/nymtech.gpg > /dev/null
+sudo echo "deb [signed-by=/etc/apt/trusted.gpg.d/nymtech.gpg] http://apt.nymtech.net.s3-website.eu-central-1.amazonaws.com/ squeeze main" > /etc/apt/sources.list.d/nymtech.list
 
 sudo apt-get update
 sudo apt-get install nym-gateway
diff --git a/gateway/src/commands/helpers.rs b/gateway/src/commands/helpers.rs
index 3b97212ae6..4b91876b75 100644
--- a/gateway/src/commands/helpers.rs
+++ b/gateway/src/commands/helpers.rs
@@ -240,6 +240,7 @@ pub(crate) fn override_network_requester_config(
     )
 }
 
+// NOTE: make sure this is in sync with service-providers/ip-packet-router/src/cli/mod.rs::override_config
 pub(crate) fn override_ip_packet_router_config(
     mut cfg: nym_ip_packet_router::Config,
     opts: Option<OverrideIpPacketRouterConfig>,
diff --git a/gateway/src/node/client_handling/websocket/connection_handler/authenticated.rs b/gateway/src/node/client_handling/websocket/connection_handler/authenticated.rs
index 103c1ad102..b97bae206f 100644
--- a/gateway/src/node/client_handling/websocket/connection_handler/authenticated.rs
+++ b/gateway/src/node/client_handling/websocket/connection_handler/authenticated.rs
@@ -229,26 +229,11 @@ where
             iv,
         )?;
 
-        // Get the latest coconut signers and their VK
-        let credential_api_clients = self
+        let aggregated_verification_key = self
             .inner
             .coconut_verifier
-            .all_coconut_api_clients(*credential.epoch_id())
+            .verification_key(*credential.epoch_id())
             .await?;
-        let current_api_clients = self
-            .inner
-            .coconut_verifier
-            .all_current_coconut_api_clients()
-            .await?;
-        if credential_api_clients.is_empty() || current_api_clients.is_empty() {
-            return Err(RequestHandlingError::NotEnoughNymAPIs {
-                received: 0,
-                needed: 1,
-            });
-        }
-
-        let aggregated_verification_key =
-            nym_credentials::obtain_aggregate_verification_key(&credential_api_clients).await?;
 
         if !credential.verify(&aggregated_verification_key) {
             return Err(RequestHandlingError::InvalidBandwidthCredential(
@@ -256,9 +241,15 @@ where
             ));
         }
 
+        let api_clients = self
+            .inner
+            .coconut_verifier
+            .api_clients(*credential.epoch_id())
+            .await?;
+
         self.inner
             .coconut_verifier
-            .release_funds(current_api_clients, &credential)
+            .release_funds(&api_clients, &credential)
             .await?;
 
         let bandwidth = Bandwidth::from(credential);
diff --git a/gateway/src/node/client_handling/websocket/connection_handler/coconut.rs b/gateway/src/node/client_handling/websocket/connection_handler/coconut.rs
index d4929d378e..89711d31e7 100644
--- a/gateway/src/node/client_handling/websocket/connection_handler/coconut.rs
+++ b/gateway/src/node/client_handling/websocket/connection_handler/coconut.rs
@@ -1,57 +1,175 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2022-2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: GPL-3.0-only
 
 use super::authenticated::RequestHandlingError;
 use log::*;
-use nym_coconut_interface::Credential;
+use nym_coconut_interface::{Credential, VerificationKey};
 use nym_validator_client::coconut::all_coconut_api_clients;
+use nym_validator_client::nym_api::EpochId;
+use nym_validator_client::nyxd::contract_traits::{MultisigQueryClient, NymContractsProvider};
 use nym_validator_client::nyxd::AccountId;
 use nym_validator_client::{
     nyxd::{
-        contract_traits::{
-            CoconutBandwidthSigningClient, DkgQueryClient, MultisigQueryClient,
-            MultisigSigningClient,
-        },
+        contract_traits::{CoconutBandwidthSigningClient, DkgQueryClient, MultisigSigningClient},
         cosmwasm_client::logs::{find_attribute, BANDWIDTH_PROPOSAL_ID},
         Coin,
     },
     CoconutApiClient, DirectSigningHttpRpcNyxdClient,
 };
+use std::collections::HashMap;
 use std::ops::Deref;
-use tokio::sync::RwLock;
+use tokio::sync::{RwLock, RwLockReadGuard};
 
 pub(crate) struct CoconutVerifier {
     address: AccountId,
     nyxd_client: RwLock<DirectSigningHttpRpcNyxdClient>,
+
+    // **CURRENTLY** api client addresses don't change during the epochs
+    api_clients: RwLock<HashMap<EpochId, Vec<CoconutApiClient>>>,
+
+    // keys never change during epochs
+    master_keys: RwLock<HashMap<EpochId, VerificationKey>>,
     mix_denom_base: String,
 }
 
 impl CoconutVerifier {
-    pub async fn new(nyxd_client: DirectSigningHttpRpcNyxdClient) -> Self {
+    pub async fn new(
+        nyxd_client: DirectSigningHttpRpcNyxdClient,
+    ) -> Result<Self, RequestHandlingError> {
         let mix_denom_base = nyxd_client.current_chain_details().mix_denom.base.clone();
         let address = nyxd_client.address();
 
-        CoconutVerifier {
+        let mut master_keys = HashMap::new();
+        let mut api_clients = HashMap::new();
+
+        // don't make it a hard failure in case we're running on mainnet (where DKG hasn't been deployed yet)
+        if nyxd_client.dkg_contract_address().is_none() {
+            error!(
+                "DKG contract address is not available - no coconut credentials will be redeemable"
+            );
+            return Ok(CoconutVerifier {
+                address,
+                nyxd_client: RwLock::new(nyxd_client),
+                api_clients: Default::default(),
+                master_keys: Default::default(),
+                mix_denom_base,
+            });
+        }
+
+        let Ok(current_epoch) = nyxd_client.get_current_epoch().await else {
+            // another case of somebody putting a placeholder address that doesn't exist
+            error!("the specified DKG contract address is invalid - no coconut credentials will be redeemable");
+            return Ok(CoconutVerifier {
+                address,
+                nyxd_client: RwLock::new(nyxd_client),
+                api_clients: Default::default(),
+                master_keys: Default::default(),
+                mix_denom_base,
+            });
+        };
+
+        // might as well obtain the key for the current epoch, if applicable
+        if current_epoch.state.is_in_progress() {
+            // note: even though we're constructing clients here, we will NOT be making any network requests
+            let epoch_api_clients =
+                all_coconut_api_clients(&nyxd_client, current_epoch.epoch_id).await?;
+            let threshold = nyxd_client.get_current_epoch_threshold().await?;
+
+            // SAFETY:
+            // if epoch state is in the 'in progress' state, it means the threshold value MUST HAVE
+            // been established. if it wasn't, there's an underlying issue with the DKG contract in which
+            // case we shouldn't continue anyway because here be dragons
+            #[allow(clippy::expect_used)]
+            let threshold = threshold.expect("unavailable threshold value") as usize;
+            if epoch_api_clients.len() < threshold {
+                return Err(RequestHandlingError::NotEnoughNymAPIs {
+                    received: epoch_api_clients.len(),
+                    needed: threshold,
+                });
+            }
+            let aggregated_verification_key =
+                nym_credentials::obtain_aggregate_verification_key(&epoch_api_clients).await?;
+
+            api_clients.insert(current_epoch.epoch_id, epoch_api_clients);
+            master_keys.insert(current_epoch.epoch_id, aggregated_verification_key);
+        }
+
+        Ok(CoconutVerifier {
             address,
             nyxd_client: RwLock::new(nyxd_client),
+            api_clients: RwLock::new(api_clients),
+            master_keys: RwLock::new(master_keys),
             mix_denom_base,
-        }
+        })
     }
 
-    pub async fn all_current_coconut_api_clients(
+    pub async fn api_clients(
         &self,
-    ) -> Result<Vec<CoconutApiClient>, RequestHandlingError> {
-        let epoch_id = self
-            .nyxd_client
-            .read()
-            .await
-            .get_current_epoch()
-            .await?
-            .epoch_id;
-        self.all_coconut_api_clients(epoch_id).await
+        epoch_id: EpochId,
+    ) -> Result<RwLockReadGuard<Vec<CoconutApiClient>>, RequestHandlingError> {
+        let guard = self.api_clients.read().await;
+
+        // the key was already in the map
+        if let Ok(mapped) = RwLockReadGuard::try_map(guard, |clients| clients.get(&epoch_id)) {
+            return Ok(mapped);
+        }
+
+        let api_clients = self.query_api_clients(epoch_id).await?;
+
+        // EDGE CASE:
+        // if this epoch is from the past, we can't query for its threshold
+        // we can only hope that enough valid keys were submitted
+        // the best we can do is check if we have at least a api
+        if api_clients.is_empty() {
+            return Err(RequestHandlingError::NotEnoughNymAPIs {
+                received: 0,
+                needed: 1,
+            });
+        }
+
+        let mut guard = self.api_clients.write().await;
+        guard.insert(epoch_id, api_clients);
+        let guard = guard.downgrade();
+
+        // SAFETY:
+        // we just inserted the entry into the map while NEVER dropping the lock (only downgraded it)
+        // so it MUST exist and thus the unwrap is fine
+        #[allow(clippy::unwrap_used)]
+        Ok(RwLockReadGuard::map(guard, |clients| {
+            clients.get(&epoch_id).unwrap()
+        }))
     }
 
-    pub async fn all_coconut_api_clients(
+    pub async fn verification_key(
+        &self,
+        epoch_id: EpochId,
+    ) -> Result<RwLockReadGuard<VerificationKey>, RequestHandlingError> {
+        let guard = self.master_keys.read().await;
+
+        // the key was already in the map
+        if let Ok(mapped) = RwLockReadGuard::try_map(guard, |keys| keys.get(&epoch_id)) {
+            return Ok(mapped);
+        }
+
+        let api_clients = self.api_clients(epoch_id).await?;
+
+        let aggregated_verification_key =
+            nym_credentials::obtain_aggregate_verification_key(&api_clients).await?;
+
+        let mut guard = self.master_keys.write().await;
+        guard.insert(epoch_id, aggregated_verification_key);
+        let guard = guard.downgrade();
+
+        // SAFETY:
+        // we just inserted the entry into the map while NEVER dropping the lock (only downgraded it)
+        // so it MUST exist and thus the unwrap is fine
+        #[allow(clippy::unwrap_used)]
+        Ok(RwLockReadGuard::map(guard, |keys| {
+            keys.get(&epoch_id).unwrap()
+        }))
+    }
+
+    pub async fn query_api_clients(
         &self,
         epoch_id: u64,
     ) -> Result<Vec<CoconutApiClient>, RequestHandlingError> {
@@ -60,7 +178,7 @@ impl CoconutVerifier {
 
     pub async fn release_funds(
         &self,
-        api_clients: Vec<CoconutApiClient>,
+        api_clients: &[CoconutApiClient],
         credential: &Credential,
     ) -> Result<(), RequestHandlingError> {
         let res = self
diff --git a/gateway/src/node/mixnet_handling/receiver/connection_handler.rs b/gateway/src/node/mixnet_handling/receiver/connection_handler.rs
index b2c002a8a4..426fa63d62 100644
--- a/gateway/src/node/mixnet_handling/receiver/connection_handler.rs
+++ b/gateway/src/node/mixnet_handling/receiver/connection_handler.rs
@@ -9,7 +9,6 @@ use crate::node::storage::Storage;
 use futures::channel::mpsc::SendError;
 use futures::StreamExt;
 use log::*;
-use nym_client_core::client::topology_control::accessor::TopologyAccessor;
 use nym_crypto::asymmetric::encryption;
 use nym_mixnet_client::forwarder::MixForwardingSender;
 use nym_mixnode_common::packet_processor::processor::ProcessedFinalHop;
@@ -19,6 +18,7 @@ use nym_sphinx::framing::codec::NymCodec;
 use nym_sphinx::framing::packet::FramedNymPacket;
 use nym_sphinx::DestinationAddressBytes;
 use nym_task::TaskClient;
+use nym_topology_control::accessor::TopologyAccessor;
 use nym_validator_client::NymApiClient;
 use std::collections::HashMap;
 use std::net::SocketAddr;
diff --git a/gateway/src/node/mod.rs b/gateway/src/node/mod.rs
index 54e8c3df03..2a491a1490 100644
--- a/gateway/src/node/mod.rs
+++ b/gateway/src/node/mod.rs
@@ -521,7 +521,7 @@ impl<St> Gateway<St> {
         let coconut_verifier = {
             let nyxd_client = self.random_nyxd_client()?;
             CoconutVerifier::new(nyxd_client).await
-        };
+        }?;
 
         let topology_provider = Self::setup_topology_provider(self.config.get_nym_api_endpoints());
 
diff --git a/integrations/bity/Cargo.toml b/integrations/bity/Cargo.toml
index d2b8e9ee10..16129e0c20 100644
--- a/integrations/bity/Cargo.toml
+++ b/integrations/bity/Cargo.toml
@@ -3,6 +3,7 @@ name = "nym-bity-integration"
 version = "0.1.0"
 edition = "2021"
 rust-version = "1.56"
+license.workspace = true
 
 [dependencies]
 serde = { version = "1", features = ["derive"] }
diff --git a/mixnode/README.md b/mixnode/README.md
index 1e910946d6..8d9680669b 100644
--- a/mixnode/README.md
+++ b/mixnode/README.md
@@ -35,8 +35,8 @@ By default, the Nym Mixnode will start on port 1789. If desired, you can change
 ## Install debian
 
 ```bash
-sudo curl -s --compressed "https://nymtech.github.io/nym/nymtech.gpg" | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/nymtech.gpg > /dev/null
-sudo echo "deb [signed-by=/etc/apt/trusted.gpg.d/nymtech.gpg] https://nymtech.github.io/nym/ /" > nymtech.list
+sudo curl -s --compressed "http://apt.nymtech.net.s3-website.eu-central-1.amazonaws.com/nymtech.gpg" | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/nymtech.gpg > /dev/null
+sudo echo "deb [signed-by=/etc/apt/trusted.gpg.d/nymtech.gpg] http://apt.nymtech.net.s3-website.eu-central-1.amazonaws.com/ squeeze main" > /etc/apt/sources.list.d/nymtech.list
 
 sudo apt-get update
 sudo apt-get install nym-mixnode
diff --git a/mixnode/src/node/listener/connection_handler/mod.rs b/mixnode/src/node/listener/connection_handler/mod.rs
index 796217ff58..a1c671efe6 100644
--- a/mixnode/src/node/listener/connection_handler/mod.rs
+++ b/mixnode/src/node/listener/connection_handler/mod.rs
@@ -9,7 +9,6 @@ use crate::node::TaskClient;
 use futures::StreamExt;
 use log::debug;
 use log::{error, info, warn};
-use nym_client_core::client::topology_control::accessor::TopologyAccessor;
 use nym_crypto::asymmetric::encryption;
 use nym_mixnode_common::measure;
 use nym_noise::upgrade_noise_responder_with_topology;
@@ -17,6 +16,7 @@ use nym_sphinx::forwarding::packet::MixPacket;
 use nym_sphinx::framing::codec::NymCodec;
 use nym_sphinx::framing::packet::FramedNymPacket;
 use nym_sphinx::Delay as SphinxDelay;
+use nym_topology_control::accessor::TopologyAccessor;
 use nym_validator_client::NymApiClient;
 use std::net::SocketAddr;
 use std::sync::Arc;
diff --git a/nym-api/Cargo.toml b/nym-api/Cargo.toml
index 3b19c6215b..579a98d991 100644
--- a/nym-api/Cargo.toml
+++ b/nym-api/Cargo.toml
@@ -32,8 +32,8 @@ pin-project = "1.0"
 rand = "0.8.5"
 rand-07 = { package = "rand", version = "0.7.3" } # required for compatibility
 reqwest = { workspace = true, features = ["json"] }
-rocket = { version = "0.5.0-rc.2", features = ["json"] }
-rocket_cors = { git = "https://github.com/lawliet89/rocket_cors", rev = "dfd3662c49e2f6fc37df35091cb94d82f7fb5915" }
+rocket = { version = "0.5.0", features = ["json"] }
+rocket_cors = { version = "0.6.0" }
 serde = { workspace = true }
 serde_json = { workspace = true }
 tap = "1.0"
@@ -60,27 +60,26 @@ sqlx = { workspace = true, features = [
     "migrate",
 ] }
 
-okapi = { version = "0.7.0-rc.1", features = ["impl_json_schema"] }
-rocket_okapi = { version = "0.8.0-rc.2", features = ["swagger"] }
+okapi = { version = "0.7.0", features = ["impl_json_schema"] }
+rocket_okapi = { version = "0.8.0", features = ["swagger"] }
 schemars = { workspace = true, features = ["preserve_order"] }
 zeroize = { workspace = true }
 
 ## ephemera-specific
-actix-web = "4"
-array-bytes = "6.0.0"
-chrono = { version = "0.4.24", default-features = false, features = ["clock"] }
-futures-util = "0.3.25"
-serde_derive = "1.0.149"
-tempfile = "3.3.0"
-uuid = { version = "1.3.0", features = ["serde", "v4"] }
+#actix-web = "4"
+#array-bytes = "6.0.0"
+#chrono = { version = "0.4.24", default-features = false, features = ["clock"] }
+#futures-util = "0.3.25"
+#serde_derive = "1.0.149"
+#uuid = { version = "1.3.0", features = ["serde", "v4"] }
 
 ## internal
-ephemera = { path = "../ephemera" }
+#ephemera = { path = "../ephemera" }
 nym-bandwidth-controller = { path = "../common/bandwidth-controller" }
 nym-coconut-bandwidth-contract-common = { path = "../common/cosmwasm-smart-contracts/coconut-bandwidth-contract" }
 nym-coconut-dkg-common = { path = "../common/cosmwasm-smart-contracts/coconut-dkg" }
 nym-coconut-interface = { path = "../common/coconut-interface" }
-nym-ephemera-common = { path = "../common/cosmwasm-smart-contracts/ephemera" }
+#nym-ephemera-common = { path = "../common/cosmwasm-smart-contracts/ephemera" }
 nym-config = { path = "../common/config" }
 cosmwasm-std = { workspace = true }
 nym-credential-storage = { path = "../common/credential-storage" }
@@ -123,5 +122,10 @@ sqlx = { workspace = true, features = [
 ] }
 
 [dev-dependencies]
+tempfile = "3.3.0"
 cw3 = { workspace = true }
 cw-utils = { workspace = true }
+rand_chacha = "0.3"
+rand_chacha_02 = { package = "rand_chacha", version = "0.2" }
+sha2 = "0.9"
+
diff --git a/nym-api/src/circulating_supply_api/routes.rs b/nym-api/src/circulating_supply_api/routes.rs
index fcf23b67fb..5bc76ab8bb 100644
--- a/nym-api/src/circulating_supply_api/routes.rs
+++ b/nym-api/src/circulating_supply_api/routes.rs
@@ -1,9 +1,6 @@
 // Copyright 2022-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: GPL-3.0-only
 
-// due to the macro expansion of rather old rocket macros...
-#![allow(unused_imports)]
-
 use crate::circulating_supply_api::cache::CirculatingSupplyCache;
 use crate::node_status_api::models::ErrorResponse;
 use nym_api_requests::models::CirculatingSupplyResponse;
diff --git a/nym-api/src/coconut/api_routes/mod.rs b/nym-api/src/coconut/api_routes/mod.rs
index 6e505d0479..12fa660f51 100644
--- a/nym-api/src/coconut/api_routes/mod.rs
+++ b/nym-api/src/coconut/api_routes/mod.rs
@@ -1,9 +1,6 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: GPL-3.0-only
 
-// due to the macro expansion of rather old rocket macros...
-#![allow(unused_imports)]
-
 use crate::coconut::api_routes::helpers::build_credentials_response;
 use crate::coconut::error::{CoconutError, Result};
 use crate::coconut::helpers::{accepted_vote_err, blind_sign};
@@ -58,7 +55,10 @@ pub async fn post_blind_sign(
 
     // check if we have the signing key available
     debug!("checking if we actually have coconut keys derived...");
-    let keypair_guard = state.coconut_keypair.get().await;
+    let maybe_keypair_guard = state.coconut_keypair.get().await;
+    let Some(keypair_guard) = maybe_keypair_guard.as_ref() else {
+        return Err(CoconutError::KeyPairNotDerivedYet);
+    };
     let Some(signing_key) = keypair_guard.as_ref() else {
         return Err(CoconutError::KeyPairNotDerivedYet);
     };
@@ -75,7 +75,7 @@ pub async fn post_blind_sign(
 
     // produce the partial signature
     debug!("producing the partial credential");
-    let blinded_signature = blind_sign(&blind_sign_request_body, signing_key.secret_key())?;
+    let blinded_signature = blind_sign(&blind_sign_request_body, signing_key.keys.secret_key())?;
 
     // store the information locally
     debug!("storing the issued credential in the database");
diff --git a/nym-api/src/coconut/client.rs b/nym-api/src/coconut/client.rs
index 8ff1f5ed79..c4ef30ebef 100644
--- a/nym-api/src/coconut/client.rs
+++ b/nym-api/src/coconut/client.rs
@@ -1,16 +1,21 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2022-2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: GPL-3.0-only
 
 use crate::coconut::error::Result;
-use cw3::ProposalResponse;
+use cw3::{ProposalResponse, VoteResponse};
 use cw4::MemberResponse;
 use nym_coconut_bandwidth_contract_common::spend_credential::SpendCredentialResponse;
-use nym_coconut_dkg_common::dealer::{ContractDealing, DealerDetails, DealerDetailsResponse};
+use nym_coconut_dkg_common::dealer::{DealerDetails, DealerDetailsResponse};
+use nym_coconut_dkg_common::dealing::{
+    DealerDealingsStatusResponse, DealingChunkInfo, DealingMetadata, DealingStatusResponse,
+    PartialContractDealing,
+};
 use nym_coconut_dkg_common::types::{
-    EncodedBTEPublicKeyWithProof, Epoch, EpochId, InitialReplacementData,
+    ChunkIndex, DealingIndex, EncodedBTEPublicKeyWithProof, Epoch, EpochId, InitialReplacementData,
+    PartialContractDealingData, State,
 };
 use nym_coconut_dkg_common::verification_key::{ContractVKShare, VerificationKeyShare};
-use nym_contracts_common::dealings::ContractSafeBytes;
+use nym_contracts_common::IdentityKey;
 use nym_dkg::Threshold;
 use nym_validator_client::nyxd::cosmwasm_client::types::ExecuteResult;
 use nym_validator_client::nyxd::{AccountId, Fee, Hash, TxResponse};
@@ -18,36 +23,100 @@ use nym_validator_client::nyxd::{AccountId, Fee, Hash, TxResponse};
 #[async_trait]
 pub trait Client {
     async fn address(&self) -> AccountId;
+
+    async fn dkg_contract_address(&self) -> Result<AccountId>;
+
     async fn get_tx(&self, tx_hash: Hash) -> Result<TxResponse>;
+
     async fn get_proposal(&self, proposal_id: u64) -> Result<ProposalResponse>;
+
     async fn list_proposals(&self) -> Result<Vec<ProposalResponse>>;
+
+    async fn get_vote(&self, proposal_id: u64, voter: String) -> Result<VoteResponse>;
+
     async fn get_spent_credential(
         &self,
         blinded_serial_number: String,
     ) -> Result<SpendCredentialResponse>;
+
+    async fn contract_state(&self) -> Result<State>;
+
     async fn get_current_epoch(&self) -> Result<Epoch>;
+
     async fn group_member(&self, addr: String) -> Result<MemberResponse>;
+
     async fn get_current_epoch_threshold(&self) -> Result<Option<Threshold>>;
+
     async fn get_initial_dealers(&self) -> Result<Option<InitialReplacementData>>;
+
     async fn get_self_registered_dealer_details(&self) -> Result<DealerDetailsResponse>;
+
+    async fn get_dealer_dealings_status(
+        &self,
+        epoch_id: EpochId,
+        dealer: String,
+    ) -> Result<DealerDealingsStatusResponse>;
+
+    async fn get_dealing_status(
+        &self,
+        epoch_id: EpochId,
+        dealer: String,
+        dealing_index: DealingIndex,
+    ) -> Result<DealingStatusResponse>;
+
     async fn get_current_dealers(&self) -> Result<Vec<DealerDetails>>;
-    async fn get_dealings(&self, idx: usize) -> Result<Vec<ContractDealing>>;
+
+    async fn get_dealing_metadata(
+        &self,
+        epoch_id: EpochId,
+        dealer: String,
+        dealing_index: DealingIndex,
+    ) -> Result<Option<DealingMetadata>>;
+
+    async fn get_dealing_chunk(
+        &self,
+        epoch_id: EpochId,
+        dealer: &str,
+        dealing_index: DealingIndex,
+        chunk_index: ChunkIndex,
+    ) -> Result<Option<PartialContractDealingData>>;
+
+    async fn get_verification_key_share(
+        &self,
+        epoch_id: EpochId,
+        dealer: String,
+    ) -> Result<Option<ContractVKShare>>;
+
     async fn get_verification_key_shares(&self, epoch_id: EpochId) -> Result<Vec<ContractVKShare>>;
+
     async fn vote_proposal(&self, proposal_id: u64, vote_yes: bool, fee: Option<Fee>)
         -> Result<()>;
+
     async fn execute_proposal(&self, proposal_id: u64) -> Result<()>;
+
     async fn advance_epoch_state(&self) -> Result<()>;
+
     async fn register_dealer(
         &self,
         bte_key: EncodedBTEPublicKeyWithProof,
+        identity_key: IdentityKey,
         announce_address: String,
         resharing: bool,
     ) -> Result<ExecuteResult>;
-    async fn submit_dealing(
+
+    async fn submit_dealing_metadata(
         &self,
-        dealing_bytes: ContractSafeBytes,
+        dealing_index: DealingIndex,
+        chunks: Vec<DealingChunkInfo>,
         resharing: bool,
     ) -> Result<ExecuteResult>;
+
+    async fn submit_dealing_chunk(
+        &self,
+        chunk: PartialContractDealing,
+        resharing: bool,
+    ) -> Result<ExecuteResult>;
+
     async fn submit_verification_key_share(
         &self,
         share: VerificationKeyShare,
diff --git a/nym-api/src/coconut/comm.rs b/nym-api/src/coconut/comm.rs
index 5bceaa7627..6f8a82a462 100644
--- a/nym-api/src/coconut/comm.rs
+++ b/nym-api/src/coconut/comm.rs
@@ -42,12 +42,18 @@ impl CachedEpoch {
 
     async fn update(&mut self, epoch: Epoch) -> Result<()> {
         let now = OffsetDateTime::now_utc();
-        let state_end =
-            OffsetDateTime::from_unix_timestamp(epoch.finish_timestamp.seconds() as i64).unwrap();
-        let until_epoch_state_end = state_end - now;
 
-        // make it valid until the next epoch transition or next 5min, whichever is smaller
-        self.valid_until = now + min(until_epoch_state_end, 5 * time::Duration::MINUTE);
+        let validity_duration = if let Some(epoch_finish) = epoch.finish_timestamp {
+            let state_end =
+                OffsetDateTime::from_unix_timestamp(epoch_finish.seconds() as i64).unwrap();
+            let until_epoch_state_end = state_end - now;
+            // make it valid until the next epoch transition or next 5min, whichever is smaller
+            min(until_epoch_state_end, 5 * time::Duration::MINUTE)
+        } else {
+            5 * time::Duration::MINUTE
+        };
+
+        self.valid_until = now + validity_duration;
         self.current_epoch_id = epoch.epoch_id;
 
         Ok(())
diff --git a/nym-api/src/coconut/dkg/client.rs b/nym-api/src/coconut/dkg/client.rs
index 0c62b6e8a4..9397d31a11 100644
--- a/nym-api/src/coconut/dkg/client.rs
+++ b/nym-api/src/coconut/dkg/client.rs
@@ -1,16 +1,20 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2022-2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: GPL-3.0-only
 
 use crate::coconut::client::Client;
 use crate::coconut::error::CoconutError;
-use cw3::ProposalResponse;
+use cw3::{ProposalResponse, Status, VoteResponse};
 use cw4::MemberResponse;
-use nym_coconut_dkg_common::dealer::{ContractDealing, DealerDetails, DealerDetailsResponse};
+use nym_coconut_dkg_common::dealer::{DealerDetails, DealerDetailsResponse};
+use nym_coconut_dkg_common::dealing::{
+    DealerDealingsStatusResponse, DealingChunkInfo, PartialContractDealing,
+};
 use nym_coconut_dkg_common::types::{
-    EncodedBTEPublicKeyWithProof, Epoch, EpochId, InitialReplacementData, NodeIndex,
+    ChunkIndex, DealingIndex, EncodedBTEPublicKeyWithProof, Epoch, EpochId, InitialReplacementData,
+    NodeIndex, PartialContractDealingData, State as ContractState,
 };
 use nym_coconut_dkg_common::verification_key::{ContractVKShare, VerificationKeyShare};
-use nym_contracts_common::dealings::ContractSafeBytes;
+use nym_contracts_common::IdentityKey;
 use nym_dkg::Threshold;
 use nym_validator_client::nyxd::cosmwasm_client::logs::{find_attribute, NODE_INDEX};
 use nym_validator_client::nyxd::cosmwasm_client::types::ExecuteResult;
@@ -21,10 +25,6 @@ pub(crate) struct DkgClient {
 }
 
 impl DkgClient {
-    // Some queries simply don't work the first time
-    // Until we determine why that is, retry the query a few more times
-    const RETRIES: usize = 3;
-
     pub(crate) fn new<C>(nyxd_client: C) -> Self
     where
         C: Client + Send + Sync + 'static,
@@ -38,15 +38,16 @@ impl DkgClient {
         self.inner.address().await
     }
 
+    pub(crate) async fn dkg_contract_address(&self) -> Result<AccountId, CoconutError> {
+        self.inner.dkg_contract_address().await
+    }
+
     pub(crate) async fn get_current_epoch(&self) -> Result<Epoch, CoconutError> {
-        let mut ret = self.inner.get_current_epoch().await;
-        for _ in 0..Self::RETRIES {
-            if ret.is_ok() {
-                return ret;
-            }
-            ret = self.inner.get_current_epoch().await;
-        }
-        ret
+        self.inner.get_current_epoch().await
+    }
+
+    pub(crate) async fn get_contract_state(&self) -> Result<ContractState, CoconutError> {
+        self.inner.contract_state().await
     }
 
     pub(crate) async fn group_member(&self) -> Result<MemberResponse, CoconutError> {
@@ -77,18 +78,50 @@ impl DkgClient {
         self.inner.get_current_dealers().await
     }
 
-    pub(crate) async fn get_dealings(
+    pub(crate) async fn get_dealings_statuses(
         &self,
-        idx: usize,
-    ) -> Result<Vec<ContractDealing>, CoconutError> {
-        let mut ret = self.inner.get_dealings(idx).await;
-        for _ in 0..Self::RETRIES {
-            if ret.is_ok() {
-                return ret;
-            }
-            ret = self.inner.get_dealings(idx).await;
-        }
-        ret
+        epoch_id: EpochId,
+        dealer: String,
+    ) -> Result<DealerDealingsStatusResponse, CoconutError> {
+        self.inner
+            .get_dealer_dealings_status(epoch_id, dealer)
+            .await
+    }
+
+    pub(crate) async fn get_dealing_chunk(
+        &self,
+        epoch_id: EpochId,
+        dealer: &str,
+        dealing_index: DealingIndex,
+        chunk_index: ChunkIndex,
+    ) -> Result<PartialContractDealingData, CoconutError> {
+        self.inner
+            .get_dealing_chunk(epoch_id, dealer, dealing_index, chunk_index)
+            .await?
+            .ok_or(CoconutError::MissingDealingChunk {
+                epoch_id,
+                dealer: dealer.to_string(),
+                dealing_index,
+                chunk_index,
+            })
+    }
+
+    pub(crate) async fn get_verification_key_share<S: Into<String>>(
+        &self,
+        epoch_id: EpochId,
+        address: S,
+    ) -> Result<Option<ContractVKShare>, CoconutError> {
+        self.inner
+            .get_verification_key_share(epoch_id, address.into())
+            .await
+    }
+
+    pub(crate) async fn get_verification_own_key_share(
+        &self,
+        epoch_id: EpochId,
+    ) -> Result<Option<ContractVKShare>, CoconutError> {
+        let address = self.inner.address().await;
+        self.get_verification_key_share(epoch_id, address).await
     }
 
     pub(crate) async fn get_verification_key_shares(
@@ -98,10 +131,22 @@ impl DkgClient {
         self.inner.get_verification_key_shares(epoch_id).await
     }
 
+    pub(crate) async fn get_vote(&self, proposal_id: u64) -> Result<VoteResponse, CoconutError> {
+        let address = self.get_address().await.to_string();
+        self.inner.get_vote(proposal_id, address).await
+    }
+
     pub(crate) async fn list_proposals(&self) -> Result<Vec<ProposalResponse>, CoconutError> {
         self.inner.list_proposals().await
     }
 
+    pub(crate) async fn get_proposal_status(
+        &self,
+        proposal_id: u64,
+    ) -> Result<Status, CoconutError> {
+        self.inner.get_proposal(proposal_id).await.map(|p| p.status)
+    }
+
     pub(crate) async fn advance_epoch_state(&self) -> Result<(), CoconutError> {
         self.inner.advance_epoch_state().await
     }
@@ -109,12 +154,13 @@ impl DkgClient {
     pub(crate) async fn register_dealer(
         &self,
         bte_key: EncodedBTEPublicKeyWithProof,
+        identity_key: IdentityKey,
         announce_address: String,
         resharing: bool,
     ) -> Result<NodeIndex, CoconutError> {
         let res = self
             .inner
-            .register_dealer(bte_key, announce_address, resharing)
+            .register_dealer(bte_key, identity_key, announce_address, resharing)
             .await?;
         let node_index = find_attribute(&res.logs, "wasm", NODE_INDEX)
             .ok_or(CoconutError::NodeIndexRecoveryError {
@@ -129,12 +175,24 @@ impl DkgClient {
         Ok(node_index)
     }
 
-    pub(crate) async fn submit_dealing(
+    pub(crate) async fn submit_dealing_metadata(
         &self,
-        dealing_bytes: ContractSafeBytes,
+        dealing_index: DealingIndex,
+        chunks: Vec<DealingChunkInfo>,
         resharing: bool,
     ) -> Result<(), CoconutError> {
-        self.inner.submit_dealing(dealing_bytes, resharing).await?;
+        self.inner
+            .submit_dealing_metadata(dealing_index, chunks, resharing)
+            .await?;
+        Ok(())
+    }
+
+    pub(crate) async fn submit_dealing_chunk(
+        &self,
+        chunk: PartialContractDealing,
+        resharing: bool,
+    ) -> Result<(), CoconutError> {
+        self.inner.submit_dealing_chunk(chunk, resharing).await?;
         Ok(())
     }
 
@@ -143,20 +201,9 @@ impl DkgClient {
         share: VerificationKeyShare,
         resharing: bool,
     ) -> Result<ExecuteResult, CoconutError> {
-        let mut ret = self
-            .inner
+        self.inner
             .submit_verification_key_share(share.clone(), resharing)
-            .await;
-        for _ in 0..Self::RETRIES {
-            if let Ok(res) = ret {
-                return Ok(res);
-            }
-            ret = self
-                .inner
-                .submit_verification_key_share(share.clone(), resharing)
-                .await;
-        }
-        ret
+            .await
     }
 
     pub(crate) async fn vote_verification_key_share(
diff --git a/nym-api/src/coconut/dkg/complaints.rs b/nym-api/src/coconut/dkg/complaints.rs
deleted file mode 100644
index 8b397f2564..0000000000
--- a/nym-api/src/coconut/dkg/complaints.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: GPL-3.0-only
-
-use serde::{Deserialize, Serialize};
-
-#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
-pub(crate) enum ComplaintReason {
-    MalformedBTEPublicKey,
-    InvalidBTEPublicKey,
-    MissingDealing,
-    MalformedDealing,
-    DealingVerificationError,
-}
diff --git a/nym-api/src/coconut/dkg/controller.rs b/nym-api/src/coconut/dkg/controller.rs
deleted file mode 100644
index 89275400ca..0000000000
--- a/nym-api/src/coconut/dkg/controller.rs
+++ /dev/null
@@ -1,221 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: GPL-3.0-only
-
-use crate::coconut::dkg::client::DkgClient;
-use crate::coconut::dkg::state::{ConsistentState, PersistentState, State};
-use crate::coconut::dkg::verification_key::{
-    verification_key_finalization, verification_key_validation,
-};
-use crate::coconut::dkg::{
-    dealing::dealing_exchange, public_key::public_key_submission,
-    verification_key::verification_key_submission,
-};
-use crate::coconut::keypair::KeyPair as CoconutKeyPair;
-use crate::nyxd;
-use crate::support::config;
-use anyhow::{bail, Result};
-use nym_coconut_dkg_common::types::EpochState;
-use nym_dkg::bte::keys::KeyPair as DkgKeyPair;
-use nym_task::{TaskClient, TaskManager};
-use rand::rngs::OsRng;
-use rand::{CryptoRng, RngCore};
-use std::path::PathBuf;
-use std::time::{Duration, SystemTime};
-use tokio::time::interval;
-
-pub(crate) fn init_keypair(config: &config::CoconutSigner) -> Result<()> {
-    let mut rng = OsRng;
-    let dkg_params = nym_dkg::bte::setup();
-    let kp = DkgKeyPair::new(&dkg_params, &mut rng);
-    nym_pemstore::store_keypair(
-        &kp,
-        &nym_pemstore::KeyPairPath::new(
-            &config.storage_paths.decryption_key_path,
-            &config.storage_paths.public_key_with_proof_path,
-        ),
-    )?;
-    Ok(())
-}
-
-pub(crate) struct DkgController<R> {
-    dkg_client: DkgClient,
-    secret_key_path: PathBuf,
-    verification_key_path: PathBuf,
-    state: State,
-    rng: R,
-    polling_rate: Duration,
-}
-
-impl<R: RngCore + CryptoRng + Clone> DkgController<R> {
-    pub(crate) async fn new(
-        config: &config::CoconutSigner,
-        nyxd_client: nyxd::Client,
-        coconut_keypair: CoconutKeyPair,
-        rng: R,
-    ) -> Result<Self> {
-        let Some(announce_address) = &config.announce_address else {
-            bail!("can't start a DKG controller without specifying an announce address!")
-        };
-
-        let dkg_keypair = nym_pemstore::load_keypair(&nym_pemstore::KeyPairPath::new(
-            &config.storage_paths.decryption_key_path,
-            &config.storage_paths.public_key_with_proof_path,
-        ))?;
-        if let Ok(coconut_keypair_value) =
-            nym_pemstore::load_keypair(&nym_pemstore::KeyPairPath::new(
-                &config.storage_paths.secret_key_path,
-                &config.storage_paths.verification_key_path,
-            ))
-        {
-            coconut_keypair.set(Some(coconut_keypair_value)).await;
-        }
-        let persistent_state =
-            PersistentState::load_from_file(&config.storage_paths.dkg_persistent_state_path)
-                .unwrap_or_default();
-
-        Ok(DkgController {
-            dkg_client: DkgClient::new(nyxd_client),
-            secret_key_path: config.storage_paths.secret_key_path.clone(),
-            verification_key_path: config.storage_paths.verification_key_path.clone(),
-            state: State::new(
-                config.storage_paths.dkg_persistent_state_path.clone(),
-                persistent_state,
-                announce_address.clone(),
-                dkg_keypair,
-                coconut_keypair,
-            ),
-            rng,
-            polling_rate: config.debug.dkg_contract_polling_rate,
-        })
-    }
-
-    async fn dump_persistent_state(&self) {
-        if !self.state.coconut_keypair_is_some().await {
-            // Delete the files just in case the process is killed before the new keys are generated
-            std::fs::remove_file(&self.secret_key_path).ok();
-            std::fs::remove_file(&self.verification_key_path).ok();
-        }
-        let persistent_state = PersistentState::from(&self.state);
-        if let Err(err) = persistent_state.save_to_file(self.state.persistent_state_path()) {
-            warn!("Could not backup the state for this iteration: {err}");
-        }
-    }
-
-    pub(crate) async fn handle_epoch_state(&mut self) {
-        match self.dkg_client.get_current_epoch().await {
-            Err(err) => warn!("Could not get current epoch state {err}"),
-            Ok(epoch) => {
-                if self
-                    .dkg_client
-                    .group_member()
-                    .await
-                    .map(|resp| resp.weight.is_none())
-                    .unwrap_or(true)
-                {
-                    debug!("Not a member of the group, DKG won't be run");
-                    return;
-                }
-                if let Err(err) = self.state.is_consistent(epoch.state).await {
-                    debug!("Epoch state is corrupted - {err}. Awaiting for a DKG restart.");
-                } else {
-                    let ret = match epoch.state {
-                        EpochState::PublicKeySubmission { resharing } => {
-                            public_key_submission(&self.dkg_client, &mut self.state, resharing)
-                                .await
-                        }
-                        EpochState::DealingExchange { resharing } => {
-                            dealing_exchange(
-                                &self.dkg_client,
-                                &mut self.state,
-                                self.rng.clone(),
-                                resharing,
-                            )
-                            .await
-                        }
-                        EpochState::VerificationKeySubmission { resharing } => {
-                            let keypair_path = nym_pemstore::KeyPairPath::new(
-                                self.secret_key_path.clone(),
-                                self.verification_key_path.clone(),
-                            );
-                            verification_key_submission(
-                                &self.dkg_client,
-                                &mut self.state,
-                                &keypair_path,
-                                resharing,
-                            )
-                            .await
-                        }
-                        EpochState::VerificationKeyValidation { resharing } => {
-                            verification_key_validation(
-                                &self.dkg_client,
-                                &mut self.state,
-                                resharing,
-                            )
-                            .await
-                        }
-                        EpochState::VerificationKeyFinalization { resharing } => {
-                            verification_key_finalization(
-                                &self.dkg_client,
-                                &mut self.state,
-                                resharing,
-                            )
-                            .await
-                        }
-                        // Just wait, in case we need to redo dkg at some point
-                        EpochState::InProgress => {
-                            self.state.set_was_in_progress();
-                            // We're dumping state here so that we don't do it uselessly during the
-                            // long InProgress state
-                            self.dump_persistent_state().await;
-                            Ok(())
-                        }
-                    };
-                    if let Err(err) = ret {
-                        warn!("Could not handle this iteration for the epoch state: {err}");
-                    } else if epoch.state != EpochState::InProgress {
-                        self.dump_persistent_state().await;
-                    }
-                }
-                if let Ok(current_timestamp) =
-                    SystemTime::now().duration_since(SystemTime::UNIX_EPOCH)
-                {
-                    if current_timestamp.as_secs() >= epoch.finish_timestamp.seconds() {
-                        // We try advancing the epoch state, on a best-effort basis
-                        info!("DKG: Trying to advance the epoch");
-                        self.dkg_client.advance_epoch_state().await.ok();
-                    }
-                }
-            }
-        }
-    }
-
-    pub(crate) async fn run(mut self, mut shutdown: TaskClient) {
-        let mut interval = interval(self.polling_rate);
-        while !shutdown.is_shutdown() {
-            tokio::select! {
-                _ = interval.tick() => self.handle_epoch_state().await,
-                _ = shutdown.recv() => {
-                    trace!("DkgController: Received shutdown");
-                }
-            }
-        }
-    }
-
-    // TODO: can we make it non-async? it seems we'd have to modify `coconut_keypair.set(coconut_keypair_value)` in new
-    // could we do it?
-    pub(crate) async fn start(
-        config: &config::CoconutSigner,
-        nyxd_client: nyxd::Client,
-        coconut_keypair: CoconutKeyPair,
-        rng: R,
-        shutdown: &TaskManager,
-    ) -> Result<()>
-    where
-        R: Sync + Send + 'static,
-    {
-        let shutdown_listener = shutdown.subscribe();
-        let dkg_controller = DkgController::new(config, nyxd_client, coconut_keypair, rng).await?;
-        tokio::spawn(async move { dkg_controller.run(shutdown_listener).await });
-        Ok(())
-    }
-}
diff --git a/nym-api/src/coconut/dkg/controller/error.rs b/nym-api/src/coconut/dkg/controller/error.rs
new file mode 100644
index 0000000000..2ac15d71f6
--- /dev/null
+++ b/nym-api/src/coconut/dkg/controller/error.rs
@@ -0,0 +1,72 @@
+// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: GPL-3.0-only
+
+use crate::coconut::dkg::dealing::DealingGenerationError;
+use crate::coconut::dkg::key_derivation::KeyDerivationError;
+use crate::coconut::dkg::key_finalization::KeyFinalizationError;
+use crate::coconut::dkg::key_validation::KeyValidationError;
+use crate::coconut::dkg::public_key::PublicKeySubmissionError;
+use crate::coconut::error::CoconutError;
+use std::path::PathBuf;
+use thiserror::Error;
+
+#[derive(Debug, Error)]
+pub enum DkgError {
+    #[error("failed to persist local state to disk at path {}: {source}", path.display())]
+    StatePersistenceFailure {
+        path: PathBuf,
+        #[source]
+        source: CoconutError,
+    },
+
+    #[error("failed to query for the current DKG epoch state: {source}")]
+    EpochQueryFailure {
+        #[source]
+        source: CoconutError,
+    },
+
+    #[error("failed to query the CW4 group contract for the membership status: {source}")]
+    GroupQueryFailure {
+        #[source]
+        source: CoconutError,
+    },
+
+    #[error("this API is currently not member of the DKG group and thus can't participate in the process")]
+    NotInGroup,
+
+    #[error("failed to submit public keys to the DKG contract: {source}")]
+    PublicKeySubmissionFailure {
+        #[source]
+        source: PublicKeySubmissionError,
+    },
+
+    #[error("failed to submit DKG dealings to the DKG contract: {source}")]
+    DealingExchangeFailure {
+        #[source]
+        source: DealingGenerationError,
+    },
+
+    #[error("failed to submit verification keys to the DKG contract: {source}")]
+    VerificationKeySubmissionFailure {
+        #[source]
+        source: KeyDerivationError,
+    },
+
+    #[error("failed to validate verification keys in the DKG contract: {source}")]
+    VerificationKeyValidationFailure {
+        #[source]
+        source: KeyValidationError,
+    },
+
+    #[error("failed to finalize verification keys in the DKG contract: {source}")]
+    VerificationKeyFinalizationFailure {
+        #[source]
+        source: KeyFinalizationError,
+    },
+
+    #[error("failed to advance the DKG state: {source}")]
+    StateAdvancementFailure {
+        #[source]
+        source: CoconutError,
+    },
+}
diff --git a/nym-api/src/coconut/dkg/controller/keys.rs b/nym-api/src/coconut/dkg/controller/keys.rs
new file mode 100644
index 0000000000..ce0d16930a
--- /dev/null
+++ b/nym-api/src/coconut/dkg/controller/keys.rs
@@ -0,0 +1,100 @@
+// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: GPL-3.0-only
+
+use crate::coconut::client::Client;
+use crate::coconut::keys::KeyPairWithEpoch;
+use crate::support::{config, nyxd};
+use anyhow::{anyhow, bail, Context};
+use nym_coconut_dkg_common::types::{EpochId, EpochState};
+use nym_dkg::bte::keys::KeyPair as DkgKeyPair;
+use rand::{CryptoRng, RngCore};
+use std::path::Path;
+use thiserror::__private::AsDisplay;
+
+pub(crate) fn init_bte_keypair<R: RngCore + CryptoRng>(
+    rng: &mut R,
+    config: &config::CoconutSigner,
+) -> anyhow::Result<()> {
+    let dkg_params = nym_dkg::bte::setup();
+    let kp = DkgKeyPair::new(&dkg_params, rng);
+    nym_pemstore::store_keypair(
+        &kp,
+        &nym_pemstore::KeyPairPath::new(
+            &config.storage_paths.decryption_key_path,
+            &config.storage_paths.public_key_with_proof_path,
+        ),
+    )
+    .context("DKG BTE keypair store failure")
+}
+
+pub(crate) fn load_bte_keypair(config: &config::CoconutSigner) -> anyhow::Result<DkgKeyPair> {
+    nym_pemstore::load_keypair(&nym_pemstore::KeyPairPath::new(
+        &config.storage_paths.decryption_key_path,
+        &config.storage_paths.public_key_with_proof_path,
+    ))
+    .context("bte keypair load failure")
+}
+
+pub(crate) fn load_coconut_keypair_if_exists(
+    config: &config::CoconutSigner,
+) -> anyhow::Result<Option<KeyPairWithEpoch>> {
+    if !config.storage_paths.coconut_key_path.exists() {
+        return Ok(None);
+    }
+    nym_pemstore::load_key(&config.storage_paths.coconut_key_path)
+        .context("coconut key load failure")
+        .map(Some)
+}
+
+// the keys can be considered valid if they were generated for the current dkg epoch
+// and we're either in the "in progress" or "key finalization" states of the DKG
+pub(crate) async fn can_validate_coconut_keys(
+    nyxd_client: &nyxd::Client,
+    issued_for: EpochId,
+) -> anyhow::Result<bool> {
+    // validate the keys if they were generated for the current dkg epoch
+    // and we're either in the "in progress" or "key finalization" states of the DKG
+    let current_dkg_epoch = nyxd_client.get_current_epoch().await?;
+    if issued_for != current_dkg_epoch.epoch_id {
+        warn!("managed to load coconut keys, but they were generated for epoch {issued_for}. The current epoch is {}. the keys won't be used for credential issuance", current_dkg_epoch.epoch_id);
+        Ok(false)
+    } else if !matches!(
+        current_dkg_epoch.state,
+        EpochState::InProgress | EpochState::VerificationKeyFinalization { .. }
+    ) {
+        warn!("managed to load coconut keys, but the current DKG epoch is at {}. the keys won't (yet) be used for credential issuance", current_dkg_epoch.state);
+        Ok(false)
+    } else {
+        Ok(true)
+    }
+}
+
+pub(crate) fn persist_coconut_keypair<P: AsRef<Path>>(
+    keys: &KeyPairWithEpoch,
+    store_path: P,
+) -> anyhow::Result<()> {
+    nym_pemstore::store_key(keys, store_path).context("coconut key store failure")
+}
+
+pub(crate) fn archive_coconut_keypair<P: AsRef<Path>>(
+    store_path: P,
+    epoch_id: EpochId,
+) -> anyhow::Result<()> {
+    let store_path = store_path.as_ref();
+    if !store_path.exists() {
+        bail!("coconut key does not exist at {}", store_path.as_display())
+    }
+
+    let dir = store_path
+        .parent()
+        .ok_or(anyhow!("the coconut key does not have a valid parent"))?;
+    let filename = store_path
+        .file_name()
+        .ok_or(anyhow!("the coconut key does not have a valid filename"))?
+        .to_str()
+        .ok_or(anyhow!("the coconut key filename is not valid UTF8"))?;
+    let archive_path = dir.join(format!("epoch-{epoch_id}-{filename}.archived"));
+    std::fs::rename(store_path, archive_path)?;
+
+    Ok(())
+}
diff --git a/nym-api/src/coconut/dkg/controller/mod.rs b/nym-api/src/coconut/dkg/controller/mod.rs
new file mode 100644
index 0000000000..8ddac1e80c
--- /dev/null
+++ b/nym-api/src/coconut/dkg/controller/mod.rs
@@ -0,0 +1,340 @@
+// Copyright 2022-2024 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: GPL-3.0-only
+
+use crate::coconut::dkg::client::DkgClient;
+use crate::coconut::dkg::controller::error::DkgError;
+use crate::coconut::dkg::state::{PersistentState, State};
+use crate::coconut::keys::KeyPair as CoconutKeyPair;
+use crate::nyxd;
+use crate::support::config;
+use anyhow::{bail, Result};
+use nym_coconut_dkg_common::types::{Epoch, EpochId, EpochState};
+use nym_crypto::asymmetric::identity;
+use nym_dkg::bte::keys::KeyPair as DkgKeyPair;
+use nym_task::{TaskClient, TaskManager};
+use rand::rngs::OsRng;
+use rand::{CryptoRng, Rng, RngCore};
+use std::path::PathBuf;
+use std::time::Duration;
+use time::OffsetDateTime;
+use tokio::time::interval;
+
+mod error;
+pub(crate) mod keys;
+
+pub(crate) struct DkgController<R = OsRng> {
+    pub(crate) dkg_client: DkgClient,
+    pub(crate) coconut_key_path: PathBuf,
+    pub(crate) state: State,
+    pub(super) rng: R,
+    polling_rate: Duration,
+}
+
+impl<R: RngCore + CryptoRng + Clone> DkgController<R> {
+    pub(crate) fn new(
+        config: &config::CoconutSigner,
+        nyxd_client: nyxd::Client,
+        coconut_keypair: CoconutKeyPair,
+        dkg_keypair: DkgKeyPair,
+        identity_key: identity::PublicKey,
+        rng: R,
+    ) -> Result<Self> {
+        let Some(announce_address) = &config.announce_address else {
+            bail!("can't start a DKG controller without specifying an announce address!")
+        };
+
+        let persistent_state = PersistentState::load_from_file(
+            &config.storage_paths.dkg_persistent_state_path,
+        ).unwrap_or_else(|err| {
+            warn!("could not load an existing persistent state from the file. a fresh state will be used: {err}");
+            Default::default()
+        });
+
+        Ok(DkgController {
+            dkg_client: DkgClient::new(nyxd_client),
+            coconut_key_path: config.storage_paths.coconut_key_path.clone(),
+            state: State::new(
+                config.storage_paths.dkg_persistent_state_path.clone(),
+                persistent_state,
+                announce_address.clone(),
+                dkg_keypair,
+                identity_key,
+                coconut_keypair,
+            ),
+            rng,
+            polling_rate: config.debug.dkg_contract_polling_rate,
+        })
+    }
+
+    fn persist_state(&self) -> Result<(), DkgError> {
+        let persistent_state = PersistentState::from(&self.state);
+        let save_path = self.state.persistent_state_path();
+        persistent_state.save_to_file(save_path).map_err(|source| {
+            DkgError::StatePersistenceFailure {
+                path: save_path.to_path_buf(),
+                source,
+            }
+        })
+    }
+
+    async fn current_epoch(&self) -> Result<Epoch, DkgError> {
+        self.dkg_client
+            .get_current_epoch()
+            .await
+            .map_err(|source| DkgError::EpochQueryFailure { source })
+    }
+
+    async fn ensure_group_member(&self) -> Result<(), DkgError> {
+        let membership_response = self
+            .dkg_client
+            .group_member()
+            .await
+            .map_err(|source| DkgError::GroupQueryFailure { source })?;
+
+        debug!("CW4 membership response: {membership_response:?}");
+
+        // make sure we are a voting member, i.e. have a non-zero weight
+        if let Some(weight) = membership_response.weight {
+            if weight == 0 {
+                return Err(DkgError::NotInGroup);
+            }
+        } else {
+            return Err(DkgError::NotInGroup);
+        }
+
+        Ok(())
+    }
+
+    async fn handle_awaiting_initialisation(&mut self) -> Result<(), DkgError> {
+        info!("DKG hasn't been initialised yet - nothing to do");
+        Ok(())
+    }
+
+    async fn handle_key_submission(
+        &mut self,
+        epoch_id: EpochId,
+        resharing: bool,
+    ) -> Result<(), DkgError> {
+        debug!("DKG: public key submission (resharing: {resharing})");
+        self.public_key_submission(epoch_id, resharing)
+            .await
+            .map_err(|source| DkgError::PublicKeySubmissionFailure { source })?;
+        self.persist_state()
+    }
+
+    async fn handle_dealing_exchange(
+        &mut self,
+        epoch_id: EpochId,
+        resharing: bool,
+    ) -> Result<(), DkgError> {
+        debug!("DKG: dealing exchange (resharing: {resharing})");
+        self.dealing_exchange(epoch_id, resharing)
+            .await
+            .map_err(|source| DkgError::DealingExchangeFailure { source })?;
+        self.persist_state()
+    }
+
+    async fn handle_verification_key_submission(
+        &mut self,
+        epoch_id: EpochId,
+        resharing: bool,
+    ) -> Result<(), DkgError> {
+        debug!("DKG: verification key submission (resharing: {resharing})");
+        self.verification_key_submission(epoch_id, resharing)
+            .await
+            .map_err(|source| DkgError::VerificationKeySubmissionFailure { source })?;
+        self.persist_state()
+    }
+
+    async fn handle_verification_key_validation(
+        &mut self,
+        epoch_id: EpochId,
+        resharing: bool,
+    ) -> Result<(), DkgError> {
+        debug!("DKG: verification key validation (resharing: {resharing})");
+
+        self.verification_key_validation(epoch_id)
+            .await
+            .map_err(|source| DkgError::VerificationKeyValidationFailure { source })?;
+        self.persist_state()
+    }
+
+    async fn handle_verification_key_finalization(
+        &mut self,
+        epoch_id: EpochId,
+        resharing: bool,
+    ) -> Result<(), DkgError> {
+        debug!("DKG: verification key finalization (resharing: {resharing})");
+
+        self.verification_key_finalization(epoch_id)
+            .await
+            .map_err(|source| DkgError::VerificationKeyFinalizationFailure { source })?;
+        self.persist_state()
+    }
+
+    async fn handle_in_progress(&mut self, epoch_id: EpochId) -> Result<(), DkgError> {
+        debug!("DKG: epoch in progress");
+
+        let Ok(state) = self.state.in_progress_state(epoch_id) else {
+            // we probably just started up the api while the DKG has already finished and we're waiting for new round to join
+            debug!("the DKG has finished without our participation");
+            return Ok(());
+        };
+
+        if !state.entered {
+            info!("this is the first time this node is in the in progress state - going to clear state from the PREVIOUS epoch...");
+            // if we finished dkg for epoch 123, we no longer care about anything from epoch 122
+            // (but keep track of data from 123 for the future reference)
+            self.state.clear_previous_epoch(epoch_id);
+
+            // SAFETY: we just accessed this item in an immutable way, thus it MUST exist so the unwrap is fine
+            self.state.in_progress_state_mut(epoch_id).unwrap().entered = true;
+        }
+
+        Ok(())
+    }
+
+    async fn try_advance_dkg_state(&mut self) -> Result<(), DkgError> {
+        // We try advancing the epoch state, on a best-effort basis
+        info!("DKG: Trying to advance the epoch");
+        self.dkg_client
+            .advance_epoch_state()
+            .await
+            .map_err(|source| DkgError::StateAdvancementFailure { source })
+    }
+
+    pub(crate) async fn handle_epoch_state(&mut self) -> Result<(), DkgError> {
+        self.ensure_group_member().await?;
+
+        let epoch = self.current_epoch().await?;
+
+        match epoch.state {
+            EpochState::WaitingInitialisation => self.handle_awaiting_initialisation().await?,
+            EpochState::PublicKeySubmission { resharing } => {
+                self.handle_key_submission(epoch.epoch_id, resharing)
+                    .await?
+            }
+            EpochState::DealingExchange { resharing } => {
+                self.handle_dealing_exchange(epoch.epoch_id, resharing)
+                    .await?
+            }
+            EpochState::VerificationKeySubmission { resharing } => {
+                self.handle_verification_key_submission(epoch.epoch_id, resharing)
+                    .await?
+            }
+            EpochState::VerificationKeyValidation { resharing } => {
+                self.handle_verification_key_validation(epoch.epoch_id, resharing)
+                    .await?
+            }
+            EpochState::VerificationKeyFinalization { resharing } => {
+                self.handle_verification_key_finalization(epoch.epoch_id, resharing)
+                    .await?
+            }
+            // Just wait, in case we need to redo dkg at some point
+            EpochState::InProgress => self.handle_in_progress(epoch.epoch_id).await?,
+        };
+
+        // add a bit of variance so that all apis wouldn't attempt to trigger it at the same time
+        let variance = self.rng.gen_range(0..=60);
+        if let Some(epoch_finish) = epoch.finish_timestamp {
+            let now = OffsetDateTime::now_utc();
+            if now.unix_timestamp() > epoch_finish.seconds() as i64 + variance {
+                // TODO: make sure to not overload validator in case its running slow
+                // i.e. send it once at most every X seconds
+                self.try_advance_dkg_state().await?
+            }
+        }
+
+        Ok(())
+    }
+
+    pub(crate) async fn run(mut self, mut shutdown: TaskClient) {
+        let mut interval = interval(self.polling_rate);
+
+        // sometimes when the process is running behind, the ticker resolves multiple times in quick succession
+        // so explicitly track those instances and make sure we don't overload the validator with contract calls
+        let mut last_polled = OffsetDateTime::now_utc();
+        let mut last_tick_duration = Default::default();
+
+        while !shutdown.is_shutdown() {
+            tokio::select! {
+                _ = interval.tick() => {
+                    let now = OffsetDateTime::now_utc();
+                    let tick_duration = now - last_polled;
+                    last_polled = now;
+
+                    if tick_duration < self.polling_rate {
+                        warn!("it seems the process is running behind. The current tick rate is lower than the polling rate. rate: {:?}, current tick: {}, previous tick: {}", self.polling_rate, tick_duration, last_tick_duration);
+                        last_tick_duration = tick_duration;
+                        continue
+                    }
+                    last_tick_duration = tick_duration;
+
+                    if let Err(err) = self.handle_epoch_state().await {
+                        error!("failed to update the DKG state: {err}")
+                    }
+                }
+                _ = shutdown.recv() => {
+                    trace!("DkgController: Received shutdown");
+                }
+            }
+        }
+    }
+
+    pub(crate) fn start(
+        config: &config::CoconutSigner,
+        nyxd_client: nyxd::Client,
+        coconut_keypair: CoconutKeyPair,
+        dkg_bte_keypair: DkgKeyPair,
+        identity_key: identity::PublicKey,
+        rng: R,
+        shutdown: &TaskManager,
+    ) -> Result<()>
+    where
+        R: Sync + Send + 'static,
+    {
+        let shutdown_listener = shutdown.subscribe();
+        let dkg_controller = DkgController::new(
+            config,
+            nyxd_client,
+            coconut_keypair,
+            dkg_bte_keypair,
+            identity_key,
+            rng,
+        )?;
+        tokio::spawn(async move { dkg_controller.run(shutdown_listener).await });
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+impl DkgController {
+    #[allow(dead_code)]
+    pub(crate) fn default_test_mock(
+        dkg_client: DkgClient,
+        state: State,
+    ) -> DkgController<rand_chacha::ChaCha20Rng> {
+        DkgController {
+            dkg_client,
+            coconut_key_path: Default::default(),
+            state,
+            rng: crate::coconut::tests::fixtures::test_rng([1u8; 32]),
+            polling_rate: Default::default(),
+        }
+    }
+
+    pub(crate) fn test_mock(
+        rng: rand_chacha::ChaCha20Rng,
+        dkg_client: DkgClient,
+        state: State,
+        coconut_key_path: PathBuf,
+    ) -> DkgController<rand_chacha::ChaCha20Rng> {
+        DkgController {
+            dkg_client,
+            coconut_key_path,
+            state,
+            rng,
+            polling_rate: Default::default(),
+        }
+    }
+}
diff --git a/nym-api/src/coconut/dkg/dealing.rs b/nym-api/src/coconut/dkg/dealing.rs
index 266c6db66e..77a6f3310e 100644
--- a/nym-api/src/coconut/dkg/dealing.rs
+++ b/nym-api/src/coconut/dkg/dealing.rs
@@ -1,348 +1,734 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2022-2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: GPL-3.0-only
 
-use crate::coconut::dkg::client::DkgClient;
-use crate::coconut::dkg::state::{ConsistentState, State};
+use crate::coconut::dkg;
+use crate::coconut::dkg::controller::keys::archive_coconut_keypair;
+use crate::coconut::dkg::controller::DkgController;
 use crate::coconut::error::CoconutError;
+use crate::coconut::keys::KeyPairWithEpoch;
 use log::debug;
-use nym_coconut_dkg_common::types::TOTAL_DEALINGS;
-use nym_contracts_common::dealings::ContractSafeBytes;
-use nym_dkg::bte::setup;
-use nym_dkg::Dealing;
-use rand::RngCore;
-use std::collections::VecDeque;
-use zeroize::Zeroize;
+use nym_coconut_dkg_common::dealing::{chunk_dealing, DealingChunkInfo, MAX_DEALING_CHUNK_SIZE};
+use nym_coconut_dkg_common::types::{DealingIndex, EpochId};
+use nym_dkg::{Dealing, Scalar};
+use rand::{CryptoRng, RngCore};
+use std::collections::{HashMap, HashSet};
+use std::fmt::{Debug, Formatter};
+use std::path::PathBuf;
+use thiserror::Error;
 
-pub(crate) async fn dealing_exchange(
-    dkg_client: &DkgClient,
-    state: &mut State,
-    rng: impl RngCore + Clone,
-    resharing: bool,
-) -> Result<(), CoconutError> {
-    if state.receiver_index().is_some() {
-        debug!("Receiver index was set previously, nothing to do");
-        return Ok(());
-    }
-
-    let dealers = dkg_client.get_current_dealers().await?;
-    let threshold = dkg_client.get_current_epoch_threshold().await?;
-    let initial_dealers = dkg_client
-        .get_initial_dealers()
-        .await?
-        .map(|d| d.initial_dealers)
-        .unwrap_or_default();
-    let own_address = dkg_client.get_address().await.as_ref().to_string();
-    state.set_dealers(dealers);
-    state.set_threshold(threshold);
-    let receivers = state.current_dealers_by_idx();
-    let dealer_index = state.node_index_value()?;
-    let receiver_index = receivers
-        .keys()
-        .position(|node_index| *node_index == dealer_index);
-
-    let prior_resharing_secrets = if let Some(mut keypair) = state.take_coconut_keypair().await {
-        // Double check that we are in resharing mode
-        if resharing {
-            let sk = keypair.secret_key();
-            if sk.size() + 1 != TOTAL_DEALINGS {
-                return Err(CoconutError::CorruptedCoconutKeyPair);
-            }
-
-            let (x, mut scalars) = sk.into_raw();
-
-            // We can now erase the keypair from memory
-            debug!("Removing coconut keypair from memory");
-            keypair.zeroize();
-            scalars.push(x);
-            scalars
-        } else {
-            log::warn!("Coconut key hasn't been reset in memory. The state might be corrupt");
-            vec![]
-        }
-    } else {
-        vec![]
-    };
-    let mut prior_resharing_secrets = VecDeque::from(prior_resharing_secrets);
-    if !resharing || initial_dealers.iter().any(|d| *d == own_address) {
-        let params = setup();
-        for _ in 0..TOTAL_DEALINGS {
-            debug!(
-                "Submitting dealing for indexes {:?} with resharing: {}",
-                receivers.keys().collect::<Vec<_>>(),
-                prior_resharing_secrets.front().is_some()
-            );
-            let (dealing, _) = Dealing::create(
-                rng.clone(),
-                &params,
-                dealer_index,
-                state.threshold()?,
-                &receivers,
-                prior_resharing_secrets.pop_front(),
-            );
-            dkg_client
-                .submit_dealing(ContractSafeBytes::from(&dealing), resharing)
-                .await?;
-        }
-    } else {
-        debug!("Nothing to do, waiting for initial dealers to submit dealings");
-    }
-
-    info!("DKG: Finished dealing exchange");
-    state.set_receiver_index(receiver_index);
-
-    Ok(())
+enum DealingGeneration {
+    Fresh { number: u32 },
+    Resharing { prior_secrets: Vec<Scalar> },
 }
 
+impl Debug for DealingGeneration {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match self {
+            DealingGeneration::Fresh { number } => f
+                .debug_struct("DealingGeneration::Fresh")
+                .field("number", number)
+                .finish(),
+            DealingGeneration::Resharing { prior_secrets } => f
+                .debug_struct("DealingGeneration::Resharing")
+                .field("number", &prior_secrets.len())
+                .finish(),
+        }
+    }
+}
+
+#[derive(Debug, Error)]
+pub enum DealingGenerationError {
+    #[error(transparent)]
+    CoconutError(#[from] CoconutError),
+
+    #[error("can't complete dealing exchange without registering public keys")]
+    IncompletePublicKeyRegistration,
+
+    #[error("contract state failure - the DKG threshold is unavailable even though dealing exchange has been initiated")]
+    UnavailableContractThreshold,
+
+    #[error("could not establish receiver index for epoch {epoch_id} even though we're a dealer!")]
+    UnavailableReceiverIndex { epoch_id: EpochId },
+
+    #[error("failed to archive coconut key for epoch {epoch_id} using path {}: {source}", path.display())]
+    KeyArchiveFailure {
+        epoch_id: EpochId,
+        path: PathBuf,
+
+        // I hate that we're using anyhow error source here, but changing that would require bigger refactoring
+        #[source]
+        source: anyhow::Error,
+    },
+}
+
+impl<R: RngCore + CryptoRng> DkgController<R> {
+    const DEALING_CHUNK_SIZE: usize = MAX_DEALING_CHUNK_SIZE;
+
+    async fn generate_dealings(
+        &mut self,
+        epoch_id: EpochId,
+        spec: DealingGeneration,
+    ) -> Result<HashMap<DealingIndex, Dealing>, DealingGenerationError> {
+        let threshold = self.dkg_client.get_current_epoch_threshold().await?.ok_or(
+            CoconutError::UnrecoverableState {
+                reason: String::from("Threshold should have been set"),
+            },
+        )?;
+
+        let dealer_index = self
+            .state
+            .registration_state(epoch_id)?
+            .assigned_index
+            .ok_or(CoconutError::UnrecoverableState {
+                reason: String::from("Node index should have been set"),
+            })?;
+
+        // in our case every dealer is also a receiver
+
+        // ASSUMPTION: all dealers see the same contract data, i.e. if one fails to decode and verify the receiver's key,
+        // all of them will
+        let filtered_receivers = self.state.valid_epoch_receivers_keys(epoch_id)?;
+
+        let dbg_receivers = filtered_receivers.keys().collect::<Vec<_>>();
+        debug!("generating dealings with threshold {threshold} for receivers: {dbg_receivers:?} with the following spec: {spec:?}. Our index is {dealer_index}");
+
+        let mut dealings = HashMap::new();
+        match spec {
+            DealingGeneration::Fresh { number } => {
+                for i in 0..number {
+                    let dealing = Dealing::create(
+                        &mut self.rng,
+                        dkg::params(),
+                        dealer_index,
+                        threshold,
+                        &filtered_receivers,
+                        None,
+                    );
+                    dealings.insert(i as DealingIndex, dealing.0);
+                }
+            }
+            DealingGeneration::Resharing { prior_secrets } => {
+                for (i, secret) in prior_secrets.into_iter().enumerate() {
+                    let dealing = Dealing::create(
+                        &mut self.rng,
+                        dkg::params(),
+                        dealer_index,
+                        threshold,
+                        &filtered_receivers,
+                        Some(secret),
+                    );
+                    dealings.insert(i as DealingIndex, dealing.0);
+                }
+            }
+        }
+
+        // update the state with the dealing information
+        self.state
+            .dealing_exchange_state_mut(epoch_id)?
+            .generated_dealings = dealings.clone();
+
+        Ok(dealings)
+    }
+
+    async fn generate_fresh_dealings(
+        &mut self,
+        epoch_id: EpochId,
+        number: u32,
+    ) -> Result<HashMap<DealingIndex, Dealing>, DealingGenerationError> {
+        self.generate_dealings(epoch_id, DealingGeneration::Fresh { number })
+            .await
+    }
+
+    async fn generate_resharing_dealings(
+        &mut self,
+        epoch_id: EpochId,
+        prior_secrets: Vec<Scalar>,
+    ) -> Result<HashMap<DealingIndex, Dealing>, DealingGenerationError> {
+        self.generate_dealings(epoch_id, DealingGeneration::Resharing { prior_secrets })
+            .await
+    }
+
+    async fn resubmit_pregenerated_dealings(
+        &self,
+        epoch_id: EpochId,
+        resharing: bool,
+    ) -> Result<(), DealingGenerationError> {
+        let dealing_state = self.state.dealing_exchange_state(epoch_id)?;
+        let address = self.dkg_client.get_address().await.to_string();
+
+        let status = self
+            .dkg_client
+            .get_dealings_statuses(epoch_id, address)
+            .await?;
+
+        if status.all_dealings_fully_submitted {
+            warn!("we have actually submitted all dealings for epoch {epoch_id}, but somehow haven't finalized the state!");
+            return Ok(());
+        }
+
+        // check which dealing is actually present on the chain (some might have gotten stuck in the mempool for quite a while)
+        for (dealing_index, dealing) in &dealing_state.generated_dealings {
+            // check the dealing
+            let Some(dealing_status) = status.dealing_submission_status.get(dealing_index) else {
+                // we should NEVER see this error
+                error!("we have generated a dealing for index {dealing_index} but the contract does not require its submission!");
+                continue;
+            };
+
+            if !dealing_status.has_metadata {
+                // if the metadata doesn't exist on the chain, we haven't submitted anything - treat it as fresh submission
+                self.submit_fresh_dealing(*dealing_index, dealing, resharing)
+                    .await?;
+                continue;
+            }
+
+            if dealing_status.fully_submitted {
+                warn!("we have already submitted the full dealing {dealing_index} before - we probably crashed or the chain timed out!");
+                continue;
+            }
+
+            let mut needs_resubmission = HashSet::new();
+            for (chunk_id, chunk_status) in &dealing_status.chunk_submission_status {
+                if !chunk_status.submitted() {
+                    needs_resubmission.insert(chunk_id);
+                } else {
+                    warn!("[dealing {dealing_index}]: we have already submitted chunk at index {chunk_id} before - we probably crashed or the chain timed out!");
+                }
+            }
+
+            warn!("[dealing {dealing_index}]: the following chunks need to be resubmitted: {needs_resubmission:?}");
+
+            // perform the chunking (again)
+            let mut chunks =
+                chunk_dealing(*dealing_index, dealing.to_bytes(), Self::DEALING_CHUNK_SIZE);
+            for chunk_index in needs_resubmission {
+                // this is a hard failure, panic level, actually.
+                // because we have already committed to dealings of particular size
+                // yet we don't have relevant chunks after chunking
+                let chunk = chunks
+                    .remove(chunk_index)
+                    .expect("chunking specification has changed mid-exchange!");
+                debug!("[dealing {dealing_index}]: resubmitting chunk index {chunk_index}");
+                self.dkg_client
+                    .submit_dealing_chunk(chunk, resharing)
+                    .await?;
+            }
+        }
+        Ok(())
+    }
+
+    async fn submit_fresh_dealing(
+        &self,
+        dealing_index: DealingIndex,
+        dealing: &Dealing,
+        resharing: bool,
+    ) -> Result<(), DealingGenerationError> {
+        let bytes = dealing.to_bytes();
+
+        // construct metadata
+        let chunk_info = DealingChunkInfo::construct(bytes.len(), Self::DEALING_CHUNK_SIZE);
+
+        let total_chunks = chunk_info.len();
+        debug!("dealing at index {dealing_index} has been chunked into {total_chunks} pieces",);
+
+        // submit the metadata
+        self.dkg_client
+            .submit_dealing_metadata(dealing_index, chunk_info, resharing)
+            .await?;
+
+        // actually chunk the dealing and submit the chunks
+        let chunks = chunk_dealing(dealing_index, bytes, Self::DEALING_CHUNK_SIZE);
+
+        for (chunk_index, chunk) in chunks {
+            let human_index = chunk_index + 1;
+            debug!("[dealing {dealing_index}]: submitting chunk index {chunk_index} ({human_index}/{total_chunks})");
+
+            self.dkg_client
+                .submit_dealing_chunk(chunk, resharing)
+                .await?;
+        }
+
+        Ok(())
+    }
+
+    /// Check whether this dealer can participate in the resharing
+    /// by looking into the contract and ensuring it's in the list of initial dealers for this epoch
+    async fn can_reshare(&self) -> Result<bool, DealingGenerationError> {
+        let Some(initial_data) = self.dkg_client.get_initial_dealers().await? else {
+            return Ok(false);
+        };
+
+        let address = self.dkg_client.get_address().await;
+        Ok(initial_data
+            .initial_dealers
+            .iter()
+            .any(|d| d.as_str() == address.as_ref()))
+    }
+
+    /// Deal with the dealing generation case where the system requests resharing
+    /// and this node contains an already derived coconut keypair from some previous epoch.
+    async fn handle_resharing_with_prior_key(
+        &mut self,
+        epoch_id: EpochId,
+        expected_key_size: u32,
+        old_keypair: KeyPairWithEpoch,
+    ) -> Result<(), DealingGenerationError> {
+        // make sure we're allowed to participate in resharing
+        if !self.can_reshare().await? {
+            // we have to wait for other dealers to give us the dealings (hopefully)
+            warn!("we we have an existing coconut keypair, but we're not allowed to participate in resharing");
+            return Ok(());
+        }
+
+        // EDGE CASE:
+        // make sure our keypair is from strictly the previous epoch
+        // because our node might have been offline for multiple epochs and while we do have a coconut keypair,
+        // it could be outdated and we can't use it for resharing
+        let previous = epoch_id.saturating_sub(1);
+        if old_keypair.issued_for_epoch != previous {
+            warn!("our existing coconut keypair has been generated for an distant epoch ({} vs expected {previous} for resharing)", old_keypair.issued_for_epoch);
+            // don't participate in resharing
+            return Ok(());
+        }
+
+        // EDGE CASE:
+        // we have changed the key size (because we wanted to add new attribute to credentials)
+        // in this instance we can't reuse our key and have to generate brand new dealings
+        if expected_key_size != 1 + old_keypair.keys.secret_key().size() as u32 {
+            warn!("our existing coconut keypair has different size than the currently expected value ({expected_key_size} vs {})", old_keypair.keys.secret_key().size() as u32);
+            self.generate_fresh_dealings(epoch_id, expected_key_size)
+                .await?;
+            return Ok(());
+        }
+
+        // generate resharing dealings
+        let prior_secrets = old_keypair.hazmat_into_secrets();
+        // safety:
+        // the prior secrets will be immediately converted into `Polynomial` with the specified coefficient
+        // that does implement `ZeroizeOnDrop`
+        self.generate_resharing_dealings(epoch_id, prior_secrets)
+            .await?;
+
+        Ok(())
+    }
+
+    /// Second step of the DKG process during which the nym api will generate appropriate [Dealing] for
+    /// other parties as indicated by public key registration from the previous step.
+    ///
+    /// Before submitting any dealings to the system, the node will persist them locally so that if any failure
+    /// occurs, it will be possible to recover.
+    pub(crate) async fn dealing_exchange(
+        &mut self,
+        epoch_id: EpochId,
+        resharing: bool,
+    ) -> Result<(), DealingGenerationError> {
+        let dealing_state = self.state.dealing_exchange_state(epoch_id)?;
+
+        // check if we have already submitted the dealings
+        if dealing_state.completed() {
+            // the only way this could be a false positive is if the chain forked and blocks got reverted,
+            // but I don't think we have to worry about that
+            debug!("we have already submitted all the dealings for this epoch");
+            return Ok(());
+        }
+
+        if !self.state.registration_state(epoch_id)?.completed() {
+            return Err(DealingGenerationError::IncompletePublicKeyRegistration);
+        }
+
+        // FAILURE CASE:
+        // check if we have already generated the dealings, but they failed to get sent to the contract for whatever reason
+        if !dealing_state.generated_dealings.is_empty() {
+            debug!("we have already generated the dealings for this epoch");
+            self.resubmit_pregenerated_dealings(epoch_id, resharing)
+                .await?;
+
+            // if we managed to resubmit the dealings (i.e. we didn't return an error),
+            // it means the state is complete now.
+            info!("DKG: resubmitted previously generated dealings - finished dealing exchange");
+            self.state.dealing_exchange_state_mut(epoch_id)?.completed = true;
+            return Ok(());
+        }
+
+        // we don't have any prior information - grab, parse and cache it since we will need it in next steps
+        // and it's not going to change during the epoch
+        let dealers = self.dkg_client.get_current_dealers().await?;
+
+        // EDGE CASE:
+        // if there are no receivers(dealers) in this epoch for some reason,
+        // don't attempt to generate dealings as this will fail with a panic
+        if dealers.is_empty() {
+            warn!("there are no active dealers/receivers to generate dealings for");
+            self.state.dealing_exchange_state_mut(epoch_id)?.completed = true;
+            return Ok(());
+        }
+
+        self.state.dkg_state_mut(epoch_id)?.set_dealers(dealers);
+
+        // obtain our dealer index to correctly set receiver index (used for share decryption)
+        let dealer_index = self.state.assigned_index(epoch_id)?;
+
+        // update internally used threshold value which should have been available after all dealers registered
+        let Some(threshold) = self.dkg_client.get_current_epoch_threshold().await? else {
+            // if we're in the dealing exchange phase, the threshold must have been already established
+            return Err(DealingGenerationError::UnavailableContractThreshold);
+        };
+        self.state
+            .key_derivation_state_mut(epoch_id)?
+            .expected_threshold = Some(threshold);
+
+        // establish our receiver index
+        let sorted_dealers = &self.state.dkg_state(epoch_id)?.dealing_exchange.dealers;
+        let Some(receiver_index) = sorted_dealers.keys().position(|idx| idx == &dealer_index)
+        else {
+            // this branch should be impossible as `dealing_exchange` should never be called unless we're actually a dealer
+            error!("could not establish receiver index for epoch {epoch_id} even though we're a dealer!");
+            return Err(DealingGenerationError::UnavailableReceiverIndex { epoch_id });
+        };
+        self.state
+            .dealing_exchange_state_mut(epoch_id)?
+            .receiver_index = Some(receiver_index);
+
+        // get the expected key size which will determine the number of dealings we need to construct
+        let contract_state = self.dkg_client.get_contract_state().await?;
+        let expected_key_size = contract_state.key_size;
+
+        // there are few cases to cover here based on the resharing status and presence of coconut keypair:
+        // - resharing + we have a key => we should use the prior secrets for the resharing dealings generation
+        // - resharing + we don't have a key => we are a new party that joined the existing setup and we have to wait for others to give us the shares
+        // - no resharing + we have a key => whole DKG has been restarted (probably enough new parties joined / old parties left) to trigger it
+        // - no resharing + we don't have a key => either as above (but we're a new party) or it's the very first instance of the DKG
+        if let Some(old_keypair) = self.state.take_coconut_keypair().await {
+            let keypair_epoch = old_keypair.issued_for_epoch;
+
+            if resharing {
+                debug!("resharing + prior key");
+                self.handle_resharing_with_prior_key(epoch_id, expected_key_size, old_keypair)
+                    .await?;
+            } else {
+                debug!("no resharing + prior key");
+                self.generate_fresh_dealings(epoch_id, expected_key_size)
+                    .await?;
+            }
+
+            // EDGE CASE:
+            // make sure to persist the state after possibly generating the resharing dealings as we're going to be archiving the keypair
+            // (so we won't be able to create resharing dealings again if we crashed since we won't be able to load the keys)
+            self.state.persist()?;
+            // archive the keypair
+            if let Err(source) = archive_coconut_keypair(&self.coconut_key_path, keypair_epoch) {
+                return Err(DealingGenerationError::KeyArchiveFailure {
+                    epoch_id,
+                    path: self.coconut_key_path.clone(),
+                    source,
+                });
+            }
+        } else {
+            // sure, the if statements could be collapsed, but i prefer to explicitly repeat the block for readability
+            if resharing {
+                debug!("resharing + no prior key -> nothing to do");
+                if self.can_reshare().await? {
+                    warn!("this dealer was expected to participate in resharing but it doesn't have any prior keys to use");
+                }
+            } else {
+                debug!("no resharing + no prior key");
+                self.generate_fresh_dealings(epoch_id, expected_key_size)
+                    .await?;
+            }
+        }
+
+        let dealings = &self
+            .state
+            .dealing_exchange_state(epoch_id)?
+            .generated_dealings;
+        let total = dealings.len();
+
+        // if we have generated any dealings persist the state in case we crash so that we would still have the data on hand
+        // for resubmission upon getting back up
+        if total > 0 {
+            self.state.persist()?;
+        }
+
+        for (i, (&dealing_index, dealing)) in dealings.iter().enumerate() {
+            let i = i + 1;
+            debug!("submitting dealing index {dealing_index} ({i}/{total})");
+
+            self.submit_fresh_dealing(dealing_index, dealing, resharing)
+                .await?;
+        }
+
+        self.state.dealing_exchange_state_mut(epoch_id)?.completed = true;
+        info!("DKG: Finished dealing exchange");
+        Ok(())
+    }
+}
+
+// NOTE: the following tests currently do NOT cover all cases
+// I've (@JS) only updated old, existing, tests. nothing more
 #[cfg(test)]
 pub(crate) mod tests {
     use super::*;
-    use crate::coconut::dkg::complaints::ComplaintReason;
-    use crate::coconut::dkg::state::PersistentState;
-    use crate::coconut::tests::DummyClient;
-    use crate::coconut::KeyPair;
-    use cosmwasm_std::Addr;
+    use crate::coconut::dkg::state::registration::KeyRejectionReason;
+    use crate::coconut::keys::KeyPair;
+    use crate::coconut::tests::fixtures::{
+        dealers_fixtures, test_rng, TestingDkgControllerBuilder,
+    };
+    use crate::coconut::tests::helpers::unchecked_decode_bte_key;
     use nym_coconut::{ttp_keygen, Parameters};
-    use nym_coconut_dkg_common::dealer::DealerDetails;
     use nym_coconut_dkg_common::types::InitialReplacementData;
-    use nym_dkg::bte::keys::KeyPair as DkgKeyPair;
-    use nym_dkg::bte::{Params, PublicKeyWithProof};
-    use nym_validator_client::nyxd::AccountId;
-    use rand::rngs::OsRng;
-    use std::collections::HashMap;
-    use std::path::PathBuf;
-    use std::str::FromStr;
-    use std::sync::{Arc, RwLock};
-    use url::Url;
+    use nym_dkg::bte::PublicKeyWithProof;
 
-    const TEST_VALIDATORS_ADDRESS: [&str; 4] = [
-        "n1aq9kakfgwqcufr23lsv644apavcntrsqsk4yus",
-        "n1s9l3xr4g0rglvk4yctktmck3h4eq0gp6z2e20v",
-        "n19kl4py32vsk297dm93ezem992cdyzdy4zuc2x6",
-        "n1jfrs6cmw9t7dv0x8cgny6geunzjh56n2s89fkv",
-    ];
+    #[tokio::test]
+    async fn exchange_dealing() -> anyhow::Result<()> {
+        let mut rng = test_rng([69u8; 32]);
+        let dealers = dealers_fixtures(&mut rng, 4);
+        let self_dealer = dealers[0].clone();
 
-    fn insert_dealers(
-        params: &Params,
-        dealer_details_db: &Arc<RwLock<HashMap<String, (DealerDetails, bool)>>>,
-    ) -> Vec<DkgKeyPair> {
-        let mut keypairs = vec![];
-        for (idx, addr) in TEST_VALIDATORS_ADDRESS.iter().enumerate() {
-            let keypair = DkgKeyPair::new(params, OsRng);
-            let bte_public_key_with_proof =
-                bs58::encode(&keypair.public_key().to_bytes()).into_string();
-            keypairs.push(keypair);
-            dealer_details_db.write().unwrap().insert(
-                addr.to_string(),
+        let mut controller = TestingDkgControllerBuilder::default()
+            .with_threshold(2)
+            .with_dealers(dealers.clone())
+            .with_as_dealer(self_dealer.clone())
+            .build()
+            .await;
+
+        let epoch = controller.dkg_client.get_current_epoch().await?.epoch_id;
+        let key_size = controller.dkg_client.get_contract_state().await?.key_size;
+
+        // initial state
+        assert!(controller
+            .state
+            .dealing_exchange_state(epoch)?
+            .dealers
+            .is_empty());
+        assert!(controller
+            .state
+            .dealing_exchange_state(epoch)?
+            .generated_dealings
+            .is_empty());
+
+        // exchange
+        let res = controller.dealing_exchange(epoch, false).await;
+        assert!(res.is_ok());
+
+        let expected_dealers = dealers
+            .iter()
+            .map(|d| {
                 (
-                    DealerDetails {
-                        address: Addr::unchecked(*addr),
-                        bte_public_key_with_proof,
-                        announce_address: format!("localhost:80{}", idx),
-                        assigned_index: (idx + 1) as u64,
-                    },
-                    true,
-                ),
-            );
+                    d.assigned_index,
+                    unchecked_decode_bte_key(&d.bte_public_key_with_proof),
+                )
+            })
+            .collect::<Vec<_>>();
+        let dealers = controller
+            .state
+            .dealing_exchange_state(epoch)?
+            .dealers
+            .values()
+            .map(|p| (p.assigned_index, p.unwrap_key()))
+            .collect::<Vec<_>>();
+
+        let generated_dealings = controller
+            .state
+            .dealing_exchange_state(epoch)?
+            .generated_dealings
+            .clone();
+
+        assert_eq!(expected_dealers, dealers);
+        assert_eq!(key_size as usize, generated_dealings.len());
+
+        // also make sure the fake chain state contains our dealings (since we submitted them)
+        let chain_state = controller.chain_state.lock().unwrap();
+
+        let submitted_dealings = chain_state
+            .dkg_contract
+            .dealings
+            .get(&epoch)
+            .unwrap()
+            .get(self_dealer.address.as_str())
+            .unwrap();
+
+        for (dealing_index, submitted_info) in submitted_dealings {
+            let dealing = Dealing::try_from_bytes(&submitted_info.unchecked_rebuild())?;
+
+            assert_eq!(generated_dealings.get(dealing_index).unwrap(), &dealing)
         }
-        keypairs
+
+        Ok(())
     }
 
     #[tokio::test]
-    #[ignore] // expensive test
-    async fn exchange_dealing() {
-        let self_index = 2;
-        let dealer_details_db = Arc::new(RwLock::new(HashMap::new()));
-        let dealings_db = Arc::new(RwLock::new(HashMap::new()));
-        let threshold_db = Arc::new(RwLock::new(Some(2)));
-        let dkg_client = DkgClient::new(
-            DummyClient::new(AccountId::from_str(TEST_VALIDATORS_ADDRESS[0]).unwrap())
-                .with_dealer_details(&dealer_details_db)
-                .with_dealings(&dealings_db)
-                .with_threshold(&threshold_db),
-        );
-        let params = setup();
-        let mut state = State::new(
-            PathBuf::default(),
-            PersistentState::default(),
-            Url::parse("localhost:8000").unwrap(),
-            DkgKeyPair::new(&params, OsRng),
-            KeyPair::new(),
-        );
-        state.set_node_index(Some(self_index));
-        let keypairs = insert_dealers(&params, &dealer_details_db);
+    async fn invalid_bte_proof_dealing_posted() -> anyhow::Result<()> {
+        let mut rng = test_rng([69u8; 32]);
+        let mut dealers = dealers_fixtures(&mut rng, 4);
+        let self_dealer = dealers[0].clone();
 
-        dealing_exchange(&dkg_client, &mut state, OsRng, false)
-            .await
+        // malform key of one of the dealers, but in such a way that it still deserializes correctly
+        let bad_dealer_addr = dealers[1].address.clone();
+        let mut bytes = bs58::decode(&dealers[1].bte_public_key_with_proof).into_vec()?;
+        let initial_byte = *bytes.last_mut().unwrap();
+        loop {
+            let last_byte = bytes.last_mut().unwrap();
+            let (ret, _) = last_byte.overflowing_add(1);
+            *last_byte = ret;
+            // stop when we find that value, or if we do a full round trip of u8 values
+            // and can't find one, in which case this test is invalid
+            if PublicKeyWithProof::try_from_bytes(&bytes).is_ok() {
+                break;
+            }
+            if ret == initial_byte {
+                panic!("did not find a valid byte")
+            }
+        }
+        dealers[1].bte_public_key_with_proof = bs58::encode(&bytes).into_string();
+
+        let mut controller = TestingDkgControllerBuilder::default()
+            .with_threshold(2)
+            .with_dealers(dealers.clone())
+            .with_as_dealer(self_dealer.clone())
+            .build()
+            .await;
+
+        let epoch = controller.dkg_client.get_current_epoch().await?.epoch_id;
+
+        // exchange
+        let res = controller.dealing_exchange(epoch, false).await;
+        assert!(res.is_ok());
+
+        let bad_dealer = controller
+            .state
+            .dealing_exchange_state(epoch)?
+            .dealers
+            .values()
+            .find(|d| d.address == bad_dealer_addr)
             .unwrap();
 
         assert_eq!(
-            state.current_dealers_by_idx().values().collect::<Vec<_>>(),
-            keypairs
-                .iter()
-                .map(|k| k.public_key().public_key())
-                .collect::<Vec<_>>()
+            KeyRejectionReason::InvalidBTEPublicKey,
+            bad_dealer.unwrap_rejection()
         );
-        assert_eq!(state.threshold().unwrap(), 2);
-        assert_eq!(state.receiver_index().unwrap(), 1);
-        let dealings = dealings_db
-            .read()
-            .unwrap()
-            .get(TEST_VALIDATORS_ADDRESS[0])
-            .unwrap()
-            .clone();
-        assert_eq!(dealings.len(), TOTAL_DEALINGS);
 
-        dealing_exchange(&dkg_client, &mut state, OsRng, false)
-            .await
-            .unwrap();
-        let new_dealings = dealings_db
-            .read()
-            .unwrap()
-            .get(TEST_VALIDATORS_ADDRESS[0])
-            .unwrap()
-            .clone();
-        assert_eq!(dealings, new_dealings);
+        Ok(())
     }
 
     #[tokio::test]
-    #[ignore] // expensive test
-    async fn invalid_bte_proof_dealing_posted() {
-        let self_index = 2;
-        let dealer_details_db = Arc::new(RwLock::new(HashMap::new()));
-        let dealings_db = Arc::new(RwLock::new(HashMap::new()));
-        let threshold_db = Arc::new(RwLock::new(Some(2)));
-        let dkg_client = DkgClient::new(
-            DummyClient::new(AccountId::from_str(TEST_VALIDATORS_ADDRESS[0]).unwrap())
-                .with_dealer_details(&dealer_details_db)
-                .with_dealings(&dealings_db)
-                .with_threshold(&threshold_db),
-        );
-        let params = setup();
-        let mut state = State::new(
-            PathBuf::default(),
-            PersistentState::default(),
-            Url::parse("localhost:8000").unwrap(),
-            DkgKeyPair::new(&params, OsRng),
-            KeyPair::new(),
-        );
-        state.set_node_index(Some(self_index));
-        insert_dealers(&params, &dealer_details_db);
+    async fn resharing_outside_initial_set() -> anyhow::Result<()> {
+        let mut rng = test_rng([69u8; 32]);
+        let dealers = dealers_fixtures(&mut rng, 4);
+        let self_dealer = dealers[0].clone();
 
-        dealer_details_db
-            .write()
-            .unwrap()
-            .entry(TEST_VALIDATORS_ADDRESS[1].to_string())
-            .and_modify(|details| {
-                let mut bytes = bs58::decode(details.0.bte_public_key_with_proof.clone())
-                    .into_vec()
-                    .unwrap();
-                // Find another value for last byte that still deserializes to a public key with proof
-                let initial_byte = *bytes.last_mut().unwrap();
-                loop {
-                    let last_byte = bytes.last_mut().unwrap();
-                    let (ret, _) = last_byte.overflowing_add(1);
-                    *last_byte = ret;
-                    // stop when we find that value, or if we do a full round trip of u8 values
-                    // and can't find one, in which case this test is invalid
-                    if PublicKeyWithProof::try_from_bytes(&bytes).is_ok() || ret == initial_byte {
-                        break;
-                    }
-                }
-                details.0.bte_public_key_with_proof = bs58::encode(&bytes).into_string();
-            });
+        let epoch = 0;
 
-        dealing_exchange(&dkg_client, &mut state, OsRng, false)
-            .await
-            .unwrap();
-        assert_eq!(
-            *state
-                .all_dealers()
-                .get(&Addr::unchecked(TEST_VALIDATORS_ADDRESS[1]))
-                .unwrap()
-                .as_ref()
-                .unwrap_err(),
-            ComplaintReason::InvalidBTEPublicKey
-        );
-    }
-
-    #[tokio::test]
-    #[ignore] // expensive test
-    async fn resharing_exchange_dealing() {
-        let self_index = 2;
-        let dealer_details_db = Arc::new(RwLock::new(HashMap::new()));
-        let dealings_db = Arc::new(RwLock::new(HashMap::new()));
-        let threshold_db = Arc::new(RwLock::new(Some(3)));
-        let initial_dealers_db = Arc::new(RwLock::new(Some(InitialReplacementData {
-            initial_dealers: vec![Addr::unchecked(TEST_VALIDATORS_ADDRESS[0])],
-            initial_height: 100,
-        })));
-        let dkg_client = DkgClient::new(
-            DummyClient::new(
-                AccountId::from_str("n1vxkywf9g4cg0k2dehanzwzz64jw782qm0kuynf").unwrap(),
-            )
-            .with_dealer_details(&dealer_details_db)
-            .with_dealings(&dealings_db)
-            .with_threshold(&threshold_db)
-            .with_initial_dealers_db(&initial_dealers_db),
-        );
-        let params = setup();
         let mut keys = ttp_keygen(&Parameters::new(4).unwrap(), 3, 4).unwrap();
         let coconut_keypair = KeyPair::new();
-        coconut_keypair.set(Some(keys.pop().unwrap())).await;
+        coconut_keypair
+            .set(KeyPairWithEpoch::new(keys.pop().unwrap(), epoch))
+            .await;
 
-        let mut state = State::new(
-            PathBuf::default(),
-            PersistentState::default(),
-            Url::parse("localhost:8000").unwrap(),
-            DkgKeyPair::new(&params, OsRng),
-            coconut_keypair.clone(),
-        );
-        state.set_node_index(Some(self_index));
-        let keypairs = insert_dealers(&params, &dealer_details_db);
+        let mut controller = TestingDkgControllerBuilder::default()
+            .with_threshold(3)
+            .with_dealers(dealers.clone())
+            .with_as_dealer(self_dealer.clone())
+            .with_keypair(coconut_keypair)
+            .with_initial_epoch_id(epoch)
+            .build()
+            .await;
 
-        dealing_exchange(&dkg_client, &mut state, OsRng, true)
-            .await
-            .unwrap();
+        let res = controller.dealing_exchange(epoch, true).await;
+        assert!(res.is_ok());
 
-        assert_eq!(
-            state.current_dealers_by_idx().values().collect::<Vec<_>>(),
-            keypairs
-                .iter()
-                .map(|k| k.public_key().public_key())
-                .collect::<Vec<_>>()
-        );
-        assert_eq!(state.threshold().unwrap(), 3);
-        assert_eq!(state.receiver_index().unwrap(), 1);
-        let addr = dkg_client.get_address().await;
-        assert!(dealings_db.read().unwrap().get(addr.as_ref()).is_none());
+        let expected_dealers = dealers
+            .iter()
+            .map(|d| {
+                (
+                    d.assigned_index,
+                    unchecked_decode_bte_key(&d.bte_public_key_with_proof),
+                )
+            })
+            .collect::<Vec<_>>();
+        let dealers = controller
+            .state
+            .dealing_exchange_state(epoch)?
+            .dealers
+            .values()
+            .map(|p| (p.assigned_index, p.unwrap_key()))
+            .collect::<Vec<_>>();
 
-        let mut state = State::new(
-            PathBuf::default(),
-            PersistentState::default(),
-            Url::parse("localhost:8000").unwrap(),
-            DkgKeyPair::new(&params, OsRng),
-            coconut_keypair,
-        );
-        state.set_node_index(Some(self_index));
-        // Use a client that is in the initial dealers set
-        let dkg_client = DkgClient::new(
-            DummyClient::new(AccountId::from_str(TEST_VALIDATORS_ADDRESS[0]).unwrap())
-                .with_dealer_details(&dealer_details_db)
-                .with_dealings(&dealings_db)
-                .with_threshold(&threshold_db)
-                .with_initial_dealers_db(&initial_dealers_db),
-        );
-
-        dealing_exchange(&dkg_client, &mut state, OsRng, true)
-            .await
-            .unwrap();
-
-        let dealings = dealings_db
-            .read()
-            .unwrap()
-            .get(TEST_VALIDATORS_ADDRESS[0])
-            .unwrap()
+        let generated_dealings = controller
+            .state
+            .dealing_exchange_state(epoch)?
+            .generated_dealings
             .clone();
-        assert_eq!(dealings.len(), TOTAL_DEALINGS);
+
+        assert_eq!(expected_dealers, dealers);
+
+        // no dealings submitted for the epoch, because we're not an initial dealer
+        assert!(generated_dealings.is_empty());
+
+        Ok(())
+    }
+
+    #[tokio::test]
+    async fn resharing_inside_initial_set() -> anyhow::Result<()> {
+        let mut rng = test_rng([69u8; 32]);
+        let dealers = dealers_fixtures(&mut rng, 4);
+        let self_dealer = dealers[0].clone();
+
+        let epoch = 0;
+
+        let mut keys = ttp_keygen(&Parameters::new(4).unwrap(), 3, 4).unwrap();
+        let coconut_keypair = KeyPair::new();
+        coconut_keypair
+            .set(KeyPairWithEpoch::new(keys.pop().unwrap(), epoch))
+            .await;
+
+        let initial_dealers = InitialReplacementData {
+            initial_dealers: vec![self_dealer.address.clone()],
+            initial_height: 100,
+        };
+
+        let mut controller = TestingDkgControllerBuilder::default()
+            .with_threshold(3)
+            .with_dealers(dealers.clone())
+            .with_as_dealer(self_dealer.clone())
+            .with_keypair(coconut_keypair)
+            .with_initial_epoch_id(epoch)
+            .with_initial_dealers(initial_dealers)
+            .build()
+            .await;
+
+        let key_size = controller.dkg_client.get_contract_state().await?.key_size;
+
+        let res = controller.dealing_exchange(epoch, true).await;
+        assert!(res.is_ok());
+
+        let expected_dealers = dealers
+            .iter()
+            .map(|d| {
+                (
+                    d.assigned_index,
+                    unchecked_decode_bte_key(&d.bte_public_key_with_proof),
+                )
+            })
+            .collect::<Vec<_>>();
+        let dealers = controller
+            .state
+            .dealing_exchange_state(epoch)?
+            .dealers
+            .values()
+            .map(|p| (p.assigned_index, p.unwrap_key()))
+            .collect::<Vec<_>>();
+
+        let generated_dealings = controller
+            .state
+            .dealing_exchange_state(epoch)?
+            .generated_dealings
+            .clone();
+
+        assert_eq!(expected_dealers, dealers);
+
+        // now we have dealings
+        assert_eq!(key_size as usize, generated_dealings.len());
+
+        Ok(())
     }
 }
diff --git a/nym-api/src/coconut/dkg/helpers.rs b/nym-api/src/coconut/dkg/helpers.rs
new file mode 100644
index 0000000000..e36c1c04fc
--- /dev/null
+++ b/nym-api/src/coconut/dkg/helpers.rs
@@ -0,0 +1,63 @@
+// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: GPL-3.0-only
+
+use crate::coconut::dkg::controller::DkgController;
+use crate::coconut::error::CoconutError;
+use cw3::{ProposalResponse, Status};
+use nym_coconut_dkg_common::verification_key::owner_from_cosmos_msgs;
+use nym_validator_client::nyxd::AccountId;
+use rand::{CryptoRng, RngCore};
+use std::collections::HashMap;
+
+impl<R: RngCore + CryptoRng> DkgController<R> {
+    fn filter_proposal(
+        &self,
+        dkg_contract: &AccountId,
+        proposal: &ProposalResponse,
+    ) -> Option<(String, u64)> {
+        // make sure the proposal we're checking is:
+        // - still open (not point in voting for anything that has already expired)
+        // - was proposed by the DKG contract - so that we'd ignore anything from malicious dealers
+        // - contains valid verification request (checked inside `owner_from_cosmos_msgs`)
+        if proposal.status == Status::Open && proposal.proposer.as_str() == dkg_contract.as_ref() {
+            if let Some(owner) = owner_from_cosmos_msgs(&proposal.msgs) {
+                return Some((owner, proposal.id));
+            }
+        }
+        None
+    }
+
+    pub(crate) async fn get_validation_proposals(
+        &self,
+    ) -> Result<HashMap<String, u64>, CoconutError> {
+        let dkg_contract = self.dkg_client.dkg_contract_address().await?;
+
+        // FUTURE OPTIMIZATION: don't query for ALL proposals. say if we're in epoch 50,
+        // we don't care about expired proposals from epochs 0-49...
+        // to do it, we'll need to have dkg contract store proposal ids,
+        // which will require usage of submsgs and replies so that might be a future project
+        let all_proposals = self.dkg_client.list_proposals().await?;
+
+        let mut deduped_proposals = HashMap::new();
+
+        // for each proposal, make sure it's a valid validation request;
+        // if for some reason there exist multiple proposals from the same owner, choose the one
+        // with the higher id (there might be multiple since we're grabbing them across epochs)
+        for proposal in all_proposals {
+            if let Some((owner, id)) = self.filter_proposal(&dkg_contract, &proposal) {
+                if let Some(old_id) = deduped_proposals.get(&owner) {
+                    if old_id < &id {
+                        deduped_proposals.insert(owner, id);
+                    }
+                } else {
+                    deduped_proposals.insert(owner, id);
+                }
+            }
+        }
+
+        // UNHANDLED EDGE CASE:
+        // since currently proposals are **NOT** tied to epochs,
+        // we might run into proposals from older epochs we don't have to vote on or might not even have data for
+        Ok(deduped_proposals)
+    }
+}
diff --git a/nym-api/src/coconut/dkg/key_derivation.rs b/nym-api/src/coconut/dkg/key_derivation.rs
new file mode 100644
index 0000000000..15f2a047d2
--- /dev/null
+++ b/nym-api/src/coconut/dkg/key_derivation.rs
@@ -0,0 +1,1019 @@
+// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: GPL-3.0-only
+
+use crate::coconut::dkg;
+use crate::coconut::dkg::controller::keys::persist_coconut_keypair;
+use crate::coconut::dkg::controller::DkgController;
+use crate::coconut::dkg::state::key_derivation::{DealerRejectionReason, DerivationFailure};
+use crate::coconut::error::CoconutError;
+use crate::coconut::keys::KeyPairWithEpoch;
+use crate::coconut::state::bandwidth_voucher_params;
+use cosmwasm_std::Addr;
+use log::debug;
+use nym_coconut::{check_vk_pairing, Base58, SecretKey, VerificationKey};
+use nym_coconut_dkg_common::event_attributes::DKG_PROPOSAL_ID;
+use nym_coconut_dkg_common::types::{DealingIndex, EpochId, NodeIndex};
+use nym_coconut_interface::KeyPair as CoconutKeyPair;
+use nym_dkg::{
+    bte::{self, decrypt_share},
+    combine_shares, try_recover_verification_keys, Dealing,
+};
+use nym_validator_client::nyxd::cosmwasm_client::logs::{find_attribute, Log};
+use nym_validator_client::nyxd::Hash;
+use rand::{CryptoRng, RngCore};
+use std::collections::{BTreeMap, HashMap};
+use std::ops::Deref;
+use thiserror::Error;
+
+#[derive(Debug, Error)]
+pub enum KeyDerivationError {
+    #[error(transparent)]
+    CoconutError(#[from] CoconutError),
+
+    #[error("can't complete key derivation without dealing exchange")]
+    IncompleteDealingExchange,
+
+    #[error("the initial, zeroth, epoch is set to be in resharing mode - this is illegal and should have been impossible!")]
+    ZerothEpochResharing,
+
+    #[error("could not recover our own proposal id from the submitted share")]
+    UnrecoverableProposalId,
+
+    #[error("failed to persist the generated keys to disk: {source}")]
+    KeyPersistenceFailure { source: anyhow::Error },
+
+    #[error("the state file has been tampered with - key generation state is marked as complete, but proposal id is not set")]
+    TamperedStateNoProposal,
+
+    #[error("the state file has been tampered with - key generation state is marked as complete, but the key doesn't exist")]
+    TamperedStateNoKeys,
+
+    #[error("the state file has been tampered with - we're in the middle of DKG for epoch {current_epoch}, but we loaded keys for epoch {keys_epoch}")]
+    TamperedStateWrongEpochKeys {
+        current_epoch: EpochId,
+        keys_epoch: EpochId,
+    },
+
+    #[error("did not derive partial key for ourselves (receiver: {receiver_index})")]
+    NoSelfPartialKey { receiver_index: usize },
+
+    #[error("did not find the proposal id attribute in the transaction events. looked for event '{event_type}' and attribute {attribute_key}' in tx {tx_hash}")]
+    MissingProposalIdAttribute {
+        tx_hash: Hash,
+        event_type: String,
+        attribute_key: String,
+    },
+
+    #[error("the retrieved proposal id ('{raw}') could not be parsed into a number")]
+    UnparsableProposalId { raw: String },
+}
+
+impl<R: RngCore + CryptoRng> DkgController<R> {
+    fn verified_dealer_dealings(
+        &self,
+        epoch_id: EpochId,
+        dealer: &Addr,
+        epoch_receivers: &BTreeMap<NodeIndex, bte::PublicKey>,
+        raw_dealings: HashMap<DealingIndex, Vec<u8>>,
+        prior_public_key: Option<VerificationKey>,
+    ) -> Result<Result<Vec<(DealingIndex, Dealing)>, DealerRejectionReason>, KeyDerivationError>
+    {
+        let threshold = self.state.threshold(epoch_id)?;
+
+        // extract G2 elements from the old verification key of the dealer for checking the resharing dealings
+        let prior_public_components = match prior_public_key {
+            Some(vk) => {
+                if vk.beta_g2().len() != raw_dealings.len().saturating_sub(1) {
+                    return Ok(Err(DealerRejectionReason::LastEpochKeyOfWrongSize {
+                        key_size: vk.beta_g2().len() + 1,
+                        expected: raw_dealings.len(),
+                    }));
+                }
+
+                let mut prior = HashMap::new();
+                prior.insert(0, *vk.alpha());
+                for (i, beta) in vk.beta_g2().iter().enumerate() {
+                    // element 1, 2, ...
+                    prior.insert((i + 1) as DealingIndex, *beta);
+                }
+
+                Some(prior)
+            }
+            None => None,
+        };
+
+        let mut temp_verified = Vec::with_capacity(raw_dealings.len());
+        // make sure ALL of them verify correctly, we can't have a situation where dealing 2 is valid but dealing 3 is not
+        for (index, data) in raw_dealings {
+            // recover the actual dealing from its submitted bytes representation
+            let dealing = match Dealing::try_from_bytes(&data) {
+                Ok(dealing) => dealing,
+                Err(err) => {
+                    warn!("failed to recover dealing {index} from {dealer}: {err}");
+                    return Ok(Err(DealerRejectionReason::MalformedDealing {
+                        index,
+                        err_msg: err.to_string(),
+                    }));
+                }
+            };
+
+            let prior_public = prior_public_components
+                .as_ref()
+                .and_then(|p| p.get(&index).copied());
+
+            // make sure the cryptographic material embedded inside is actually valid
+            if let Err(err) =
+                dealing.verify(dkg::params(), threshold, epoch_receivers, prior_public)
+            {
+                warn!("dealing {index} from {dealer} is invalid: {err}");
+                return Ok(Err(DealerRejectionReason::InvalidDealing {
+                    index,
+                    err_msg: err.to_string(),
+                }));
+            }
+
+            temp_verified.push((index, dealing))
+        }
+
+        Ok(Ok(temp_verified))
+    }
+
+    fn blacklist_dealer(
+        &mut self,
+        epoch_id: EpochId,
+        dealer: Addr,
+        reason: DealerRejectionReason,
+    ) -> Result<(), KeyDerivationError> {
+        self.state
+            .key_derivation_state_mut(epoch_id)?
+            .rejected_dealers
+            .insert(dealer, reason);
+        Ok(())
+    }
+
+    async fn get_old_verification_key(
+        &self,
+        epoch_id: EpochId,
+        dealer: &Addr,
+    ) -> Result<Option<VerificationKey>, KeyDerivationError> {
+        let Some(previous_epoch) = epoch_id.checked_sub(1) else {
+            return Err(KeyDerivationError::ZerothEpochResharing);
+        };
+
+        let Some(share) = self
+            .dkg_client
+            .get_verification_key_share(previous_epoch, dealer)
+            .await?
+        else {
+            return Ok(None);
+        };
+
+        if !share.verified {
+            return Ok(None);
+        }
+
+        // SAFETY:
+        // since this share appears as 'verified' on the chain, it means the consensus of dealers confirmed its validity
+        // and thus they must have been able to parse it, so the unwrap/expect here is fine
+        Ok(Some(
+            VerificationKey::try_from_bs58(&share.share)
+                .expect("failed to deserialize VERIFIED key"),
+        ))
+    }
+
+    async fn get_raw_dealings(
+        &self,
+        epoch_id: EpochId,
+        dealer: &Addr,
+        resharing: bool,
+        initial_dealers: &[Addr],
+    ) -> Result<Result<HashMap<DealingIndex, Vec<u8>>, DealerRejectionReason>, KeyDerivationError>
+    {
+        let dealing_statuses = self
+            .dkg_client
+            .get_dealings_statuses(epoch_id, dealer.to_string())
+            .await?;
+
+        let submitted = dealing_statuses.full_dealings();
+
+        // no point in making any queries if the dealer hasn't submitted ALL expected dealings
+        if !dealing_statuses.all_dealings_fully_submitted {
+            // the dealer only submitted some subset of dealings
+            if submitted > 0 {
+                return Ok(Err(
+                    DealerRejectionReason::InsufficientNumberOfDealingsProvided {
+                        got: submitted,
+                        expected: dealing_statuses.dealing_submission_status.len(),
+                    },
+                ));
+            }
+
+            // we might be in resharing mode and this dealer was not in "initial" set.
+            // in that case we don't expect any dealings
+            if resharing && !initial_dealers.contains(dealer) {
+                return Ok(Ok(HashMap::new()));
+            }
+            return Ok(Err(DealerRejectionReason::NoDealingsProvided));
+        }
+
+        // TODO: introduce caching here in case we crash or chain times out because those queries are EXPENSIVE
+
+        // rebuild the dealings
+        let mut raw_dealings = HashMap::new();
+        for (dealing_index, info) in dealing_statuses.dealing_submission_status {
+            let mut raw_dealing = Vec::new();
+
+            // note: we're iterating over a BTreeMap and so all chunk indices are guaranteed to be ordered
+            for chunk_index in info.chunk_submission_status.into_keys() {
+                let mut chunk_data = self
+                    .dkg_client
+                    .get_dealing_chunk(epoch_id, dealer.as_str(), dealing_index, chunk_index)
+                    .await?;
+                raw_dealing.append(&mut chunk_data);
+            }
+
+            raw_dealings.insert(dealing_index, raw_dealing);
+        }
+
+        Ok(Ok(raw_dealings))
+    }
+
+    /// Attempt to retrieve valid dealings submitted this epoch.
+    ///
+    /// For each dealer that submitted a valid public key, query its dealings.
+    /// Then for each of those dealings, make sure they're cryptographically consistent
+    pub(crate) async fn get_valid_dealings(
+        &mut self,
+        epoch_receivers: &BTreeMap<NodeIndex, bte::PublicKey>,
+        epoch_id: EpochId,
+        resharing: bool,
+    ) -> Result<BTreeMap<DealingIndex, BTreeMap<NodeIndex, Dealing>>, KeyDerivationError> {
+        let mut valid_dealings: BTreeMap<_, BTreeMap<_, _>> = BTreeMap::new();
+
+        // given at MOST we'll have like 50 entries here, iterating over entire vector for lookup is fine
+        let initial_dealers = self
+            .dkg_client
+            .get_initial_dealers()
+            .await?
+            .map(|i| i.initial_dealers)
+            .unwrap_or_default();
+
+        // for every valid dealer in this epoch, obtain its dealings
+        for (dealer, dealer_index) in self.state.valid_epoch_receivers(epoch_id)? {
+            // note: if we're in resharing mode, the contract itself will forbid submission of dealings from
+            // parties that were not "initial" dealers, so we don't have to worry about it
+
+            let raw_dealings = match self
+                .get_raw_dealings(epoch_id, &dealer, resharing, &initial_dealers)
+                .await?
+            {
+                Ok(dealings) => dealings,
+                Err(rejection) => {
+                    self.blacklist_dealer(epoch_id, dealer, rejection)?;
+                    continue;
+                }
+            };
+
+            // nothing to do
+            if raw_dealings.is_empty() {
+                continue;
+            }
+
+            // if this is resharing DKG, get the public key of this dealer from the previous epoch
+            // and use it for dealing(s) verification
+            let old_public_key = if resharing {
+                // OPTIMIZATION:
+                // rather than explicitly querying for the key, lookup the state from the previous epoch and reconstruct the key
+                let Some(key) = self.get_old_verification_key(epoch_id, &dealer).await? else {
+                    self.blacklist_dealer(
+                        epoch_id,
+                        dealer,
+                        DealerRejectionReason::MissingVerifiedLastEpochKey,
+                    )?;
+                    continue;
+                };
+                Some(key)
+            } else {
+                None
+            };
+
+            // parse and validate the received dealings
+            match self.verified_dealer_dealings(
+                epoch_id,
+                &dealer,
+                epoch_receivers,
+                raw_dealings,
+                old_public_key,
+            )? {
+                Ok(verified_dealings) => {
+                    // if we managed to verify ALL the dealings from this dealer, insert them into the map
+                    for (dealing_index, dealing) in verified_dealings {
+                        valid_dealings
+                            .entry(dealing_index)
+                            .or_default()
+                            .insert(dealer_index, dealing);
+                    }
+                }
+                Err(reason) => {
+                    self.blacklist_dealer(epoch_id, dealer, reason)?;
+                    continue;
+                }
+            }
+        }
+
+        Ok(valid_dealings)
+    }
+
+    fn derive_partial_keypair(
+        &mut self,
+        epoch_id: EpochId,
+        epoch_receivers: BTreeMap<NodeIndex, bte::PublicKey>,
+        dealings: BTreeMap<DealingIndex, BTreeMap<NodeIndex, Dealing>>,
+    ) -> Result<Result<KeyPairWithEpoch, DerivationFailure>, KeyDerivationError> {
+        debug!("attempting to derive coconut keypair for epoch {epoch_id}");
+
+        let threshold = self.state.threshold(epoch_id)?;
+        let receiver_index = self.state.receiver_index(epoch_id)?;
+
+        // TODO: make sure that each receiver received its dealings
+
+        // SAFETY:
+        // we have ensured before calling this function that the dealings map is non-empty
+        // and has exactly 'expected key size' number of entries;
+        // furthermore each entry has the same number of sub-entries (ALL dealings from given dealer must be valid)
+        //
+        // SAFETY2:
+        // dealing indexing starts from 0, so accessing 0th element is fine
+        if dealings[&0].len() < threshold as usize {
+            // make sure we have sufficient number of dealings to derive keys for the provided threshold,
+            // otherwise we can't perform the lagrangian interpolation
+            error!("we don't have enough dealings for key derivation");
+            return Ok(Err(DerivationFailure::InsufficientNumberOfDealings {
+                available: dealings[&0].len(),
+                threshold,
+            }));
+        }
+
+        let all_dealers = dealings[&0].keys().copied().collect::<Vec<_>>();
+
+        let mut derived_x = None;
+        let mut derived_secrets = Vec::new();
+
+        let total = dealings.len();
+
+        // for every part of the key
+        for (dealing_index, dealings) in dealings {
+            let human_index = dealing_index + 1;
+            debug!("recovering part {human_index}/{total} of the keys");
+
+            debug!("recovering the partial verification keys");
+            let recovered =
+                match try_recover_verification_keys(&dealings, threshold, &epoch_receivers) {
+                    Ok(keys) => keys,
+                    Err(err) => {
+                        error!("failed to derive partial keys for index {dealing_index}: {err}");
+                        return Ok(Err(DerivationFailure::KeyRecoveryFailure {
+                            dealing_index,
+                            err_msg: err.to_string(),
+                        }));
+                    }
+                };
+
+            self.state
+                .key_derivation_state_mut(epoch_id)?
+                .derived_partials
+                .insert(dealing_index, recovered);
+
+            debug!("decrypting received shares");
+
+            // for every received share of the key
+            let mut shares = Vec::with_capacity(dealings.len());
+            for (dealer_index, dealing) in dealings.into_iter() {
+                // attempt to decrypt our portion
+                let dk = self.state.dkg_keypair().private_key();
+                let share = match decrypt_share(dk, receiver_index, &dealing.ciphertexts, None) {
+                    Ok(share) => share,
+                    Err(err) => {
+                        error!("failed to decrypt share {human_index}/{total} generated from dealer {dealer_index}: {err} - can't generate the full key");
+                        return Ok(Err(DerivationFailure::ShareDecryptionFailure {
+                            dealing_index,
+                            dealer_index,
+                            err_msg: err.to_string(),
+                        }));
+                    }
+                };
+                shares.push(share)
+            }
+
+            debug!("combining the shares into part {human_index}/{total} of the epoch key");
+
+            // SAFETY: combining shares can only fail if we have different number shares and indices
+            // however, we returned an explicit error if decryption of any share failed and thus we know those values must match
+            let secret = combine_shares(shares, &all_dealers).unwrap();
+            if derived_x.is_none() {
+                derived_x = Some(secret)
+            } else {
+                derived_secrets.push(secret)
+            }
+        }
+
+        // SAFETY:
+        // we know we had a non-empty map of dealings and thus, at the very least, we must have derived a single secret
+        // (i.e. the x-element)
+        let sk = SecretKey::create_from_raw(derived_x.unwrap(), derived_secrets);
+        let derived_vk = sk.verification_key(bandwidth_voucher_params());
+
+        // make the key we derived out of the decrypted shares matches the partial key
+        // (cryptographically there shouldn't be any reason for the mismatch,
+        // but programmatically we might have accidentally used wrong index or something, so this is a good sanity check)
+        let derived_partial = self
+            .state
+            .key_derivation_state(epoch_id)?
+            .derived_partials_for(receiver_index)
+            .ok_or(KeyDerivationError::NoSelfPartialKey { receiver_index })?;
+
+        if !check_vk_pairing(bandwidth_voucher_params(), &derived_partial, &derived_vk) {
+            // can't do anything, we got all dealings, we derived all keys, but somehow they don't match
+            error!("our derived key does not match the expected partials!");
+            return Ok(Err(DerivationFailure::MismatchedPartialKey));
+        }
+
+        Ok(Ok(KeyPairWithEpoch::new(
+            CoconutKeyPair::from_keys(sk, derived_vk),
+            epoch_id,
+        )))
+    }
+
+    async fn submit_partial_verification_key(
+        &self,
+        key: &VerificationKey,
+        resharing: bool,
+    ) -> Result<u64, KeyDerivationError> {
+        fn extract_proposal_id_from_logs(
+            logs: &[Log],
+            tx_hash: Hash,
+        ) -> Result<u64, KeyDerivationError> {
+            let event_type = "wasm";
+            let attribute_key = DKG_PROPOSAL_ID;
+            let proposal_attribute = find_attribute(logs, event_type, attribute_key).ok_or(
+                KeyDerivationError::MissingProposalIdAttribute {
+                    tx_hash,
+                    event_type: event_type.to_string(),
+                    attribute_key: attribute_key.to_string(),
+                },
+            )?;
+
+            proposal_attribute
+                .value
+                .parse()
+                .map_err(|_| KeyDerivationError::UnparsableProposalId {
+                    raw: proposal_attribute.value.clone(),
+                })
+        }
+
+        debug!("submitting derived partial verification key to the contract");
+        let res = self
+            .dkg_client
+            .submit_verification_key_share(key.to_bs58(), resharing)
+            .await?;
+        let hash = res.transaction_hash;
+        let proposal_id = extract_proposal_id_from_logs(&res.logs, hash)?;
+        debug!("Submitted own verification key share, proposal id {proposal_id} is attached to it. tx hash: {hash}");
+
+        Ok(proposal_id)
+    }
+
+    async fn recover_proposal_id(&self) -> Result<u64, KeyDerivationError> {
+        // unfortunately because the [dkg] contract doesn't store the proposal ids, we have to go through the list of ALL
+        // submitted proposals and find the one with our address
+        self.get_validation_proposals()
+            .await?
+            .get(self.dkg_client.get_address().await.as_ref())
+            .copied()
+            .ok_or(KeyDerivationError::UnrecoverableProposalId)
+    }
+
+    fn complete_with_proposal(
+        &mut self,
+        epoch_id: EpochId,
+        proposal_id: u64,
+    ) -> Result<(), KeyDerivationError> {
+        let derivation_state = self.state.key_derivation_state_mut(epoch_id)?;
+        derivation_state.completed = Some(Ok(()));
+        derivation_state.proposal_id = Some(proposal_id);
+        info!("DKG: Finished key derivation");
+
+        Ok(())
+    }
+
+    fn complete_with_failure(
+        &mut self,
+        epoch_id: EpochId,
+        failure: DerivationFailure,
+    ) -> Result<(), KeyDerivationError> {
+        let derivation_state = self.state.key_derivation_state_mut(epoch_id)?;
+        error!("DKG: failed to finish the key derivation: {failure}");
+        derivation_state.completed = Some(Err(failure));
+
+        Ok(())
+    }
+
+    /// Check if we have already sent the verification transaction, but we failed to obtain valid proposal id in the previous iteration.
+    async fn maybe_recover_proposal_id(
+        &self,
+        epoch_id: EpochId,
+    ) -> Result<Option<u64>, KeyDerivationError> {
+        let maybe_share = self
+            .dkg_client
+            .get_verification_own_key_share(epoch_id)
+            .await?;
+
+        // we DID send the transaction and the share is on the chain
+        if maybe_share.is_some() {
+            // note: we only ever send the verification key AFTER persisting our key,
+            // so if the share is on the chain we MUST have the key
+            debug_assert!(self.state.coconut_keypair_is_some().await);
+
+            let proposal_id = self.recover_proposal_id().await?;
+            return Ok(Some(proposal_id));
+        }
+
+        Ok(None)
+    }
+
+    /// Check if we already have a valid coconut key in the storage, if so, attempt to submit the partial verification key share
+    /// to the contract and return the generated proposal id.
+    async fn maybe_submit_already_generated_keys(
+        &self,
+        epoch_id: EpochId,
+        resharing: bool,
+    ) -> Result<Option<u64>, KeyDerivationError> {
+        if let Some(keys) = self.state.unchecked_coconut_keypair().await.deref() {
+            let keys_epoch = keys.issued_for_epoch;
+            return if keys_epoch == epoch_id {
+                debug!("we have already generated keys for this epoch but failed to send them to the contract");
+
+                let proposal_id = self
+                    .submit_partial_verification_key(keys.keys.verification_key(), resharing)
+                    .await?;
+                Ok(Some(proposal_id))
+            } else {
+                error!("the state file has been tampered with - we're in the middle of DKG for epoch {epoch_id}, but we loaded keys for epoch {keys_epoch}");
+                Err(KeyDerivationError::TamperedStateWrongEpochKeys {
+                    current_epoch: epoch_id,
+                    keys_epoch,
+                })
+            };
+        };
+
+        Ok(None)
+    }
+
+    /// Third step of the DKG process during which the nym api will generate its Coconut keypair
+    /// with the [Dealing] received from other dealers. It will then submit its verification key
+    /// to the system so that it could be validated by other participants.
+    pub(crate) async fn verification_key_submission(
+        &mut self,
+        epoch_id: EpochId,
+        resharing: bool,
+    ) -> Result<(), KeyDerivationError> {
+        let key_generation_state = self.state.key_derivation_state(epoch_id)?;
+
+        // check if we have already generated the new keys and submitted verification proposal
+        if key_generation_state.completed_with_success() {
+            if key_generation_state.proposal_id.is_none() {
+                error!("the state file has been tampered with - key generation state is marked as complete, but proposal id is not set");
+                return Err(KeyDerivationError::TamperedStateNoProposal);
+            }
+            if !self.state.coconut_keypair_is_some().await {
+                error!("the state file has been tampered with - key generation state is marked as complete, but the key doesn't exist");
+                return Err(KeyDerivationError::TamperedStateNoKeys);
+            }
+
+            // the only way this could be a false positive is if the chain forked and blocks got reverted,
+            // but I don't think we have to worry about that
+            debug!(
+                "we have already generated key for this epoch and submitted validation proposal"
+            );
+            return Ok(());
+        } else if let Some(failure) = key_generation_state.completion_failure() {
+            error!("key derivation failed with unrecoverable failure: {failure}");
+            return Ok(());
+        }
+
+        if !self.state.dealing_exchange_state(epoch_id)?.completed {
+            return Err(KeyDerivationError::IncompleteDealingExchange);
+        }
+
+        // FAILURE CASE:
+        // check if we have already sent the verification key transaction, but it timed out or got stuck in the mempool and
+        // eventually got executed without us knowing about it, because it's illegal to recommit the key
+        if let Some(proposal_id) = self.maybe_recover_proposal_id(epoch_id).await? {
+            return self.complete_with_proposal(epoch_id, proposal_id);
+        }
+
+        // FAILURE CASE:
+        // check if we have already generated the keys, but we didn't send the tx at all - maybe the internet connection
+        // was momentarily down or something
+        if let Some(proposal_id) = self
+            .maybe_submit_already_generated_keys(epoch_id, resharing)
+            .await?
+        {
+            return self.complete_with_proposal(epoch_id, proposal_id);
+        }
+
+        // ASSUMPTION:
+        // all nym-apis would have filtered the dealers (receivers) the same way since they'd have had the same data
+        let epoch_receivers = self.state.valid_epoch_receivers_keys(epoch_id)?;
+
+        let dealings = self
+            .get_valid_dealings(&epoch_receivers, epoch_id, resharing)
+            .await?;
+        if dealings.is_empty() {
+            error!("did not recover ANY valid dealings - can't generate the epoch key");
+            return self
+                .complete_with_failure(epoch_id, DerivationFailure::NoValidDealings { epoch_id });
+        }
+
+        let dbg_dealers = dealings[&0].keys().collect::<Vec<_>>();
+        debug!("going to use dealings generated by {dbg_dealers:?}");
+
+        let coconut_keypair =
+            match self.derive_partial_keypair(epoch_id, epoch_receivers, dealings)? {
+                Ok(derived_keys) => derived_keys,
+                Err(derivation_failure) => {
+                    error!("we can't derive the coconut key: {derivation_failure}");
+                    return self.complete_with_failure(epoch_id, derivation_failure);
+                }
+            };
+
+        // before submitting our keys to the contract, persist the generated keypair
+        if let Err(source) = persist_coconut_keypair(&coconut_keypair, &self.coconut_key_path) {
+            return Err(KeyDerivationError::KeyPersistenceFailure { source });
+        }
+
+        let proposal_id = self
+            .submit_partial_verification_key(coconut_keypair.keys.verification_key(), resharing)
+            .await?;
+
+        self.state.set_coconut_keypair(coconut_keypair).await;
+        self.complete_with_proposal(epoch_id, proposal_id)
+    }
+}
+
+// NOTE: the following tests currently do NOT cover all cases
+// I've (@JS) only updated old, existing, tests. nothing more
+#[cfg(test)]
+pub(crate) mod tests {
+    use crate::coconut::dkg::state::key_derivation::DealerRejectionReason;
+    use crate::coconut::tests::helpers::{
+        exchange_dealings, initialise_controllers, initialise_dkg, submit_public_keys,
+    };
+
+    #[tokio::test]
+    #[ignore] // expensive test
+    async fn check_dealers_filter_all_good() -> anyhow::Result<()> {
+        let validators = 3;
+
+        let mut controllers = initialise_controllers(validators).await;
+        let chain = controllers[0].chain_state.clone();
+        let epoch = chain.lock().unwrap().dkg_contract.epoch.epoch_id;
+
+        initialise_dkg(&mut controllers, false).await;
+        submit_public_keys(&mut controllers, false).await;
+        exchange_dealings(&mut controllers, false).await;
+
+        let key_size = chain.lock().unwrap().dkg_contract.contract_state.key_size;
+        for controller in controllers.iter_mut() {
+            let epoch_receivers = controller.state.valid_epoch_receivers_keys(epoch)?;
+
+            let filtered = controller
+                .get_valid_dealings(&epoch_receivers, epoch, false)
+                .await?;
+
+            assert_eq!(filtered.len(), key_size as usize);
+            for dealing_map in filtered.values() {
+                assert_eq!(dealing_map.len(), validators)
+            }
+            let corrupted_status = &controller
+                .state
+                .key_derivation_state(epoch)?
+                .rejected_dealers;
+            assert!(corrupted_status.is_empty());
+        }
+
+        Ok(())
+    }
+
+    #[tokio::test]
+    #[ignore] // expensive test
+    async fn check_dealers_filter_one_bad_dealing() -> anyhow::Result<()> {
+        let validators = 3;
+
+        let mut controllers = initialise_controllers(validators).await;
+        let address = controllers[0].cw_address().await;
+        let chain = controllers[0].chain_state.clone();
+        let epoch = chain.lock().unwrap().dkg_contract.epoch.epoch_id;
+
+        initialise_dkg(&mut controllers, false).await;
+        submit_public_keys(&mut controllers, false).await;
+        exchange_dealings(&mut controllers, false).await;
+
+        let key_size = chain.lock().unwrap().dkg_contract.contract_state.key_size;
+
+        // corrupt just one dealing
+        chain
+            .lock()
+            .unwrap()
+            .dkg_contract
+            .dealings
+            .entry(epoch)
+            .and_modify(|epoch_dealings| {
+                let validator_dealings = epoch_dealings.get_mut(&address.to_string()).unwrap();
+                let mut first = validator_dealings.remove(&0).unwrap();
+                let first_chunk = first.chunks.get_mut(&0).unwrap();
+                first_chunk.0.pop().unwrap();
+                validator_dealings.insert(0, first);
+            });
+
+        for controller in controllers.iter_mut() {
+            let epoch_receivers = controller.state.valid_epoch_receivers_keys(epoch)?;
+
+            let filtered = controller
+                .get_valid_dealings(&epoch_receivers, epoch, false)
+                .await?;
+
+            assert_eq!(filtered.len(), key_size as usize);
+            let corrupted_status = controller
+                .state
+                .key_derivation_state(epoch)?
+                .rejected_dealers
+                .get(&address)
+                .unwrap();
+            assert!(matches!(
+                corrupted_status,
+                DealerRejectionReason::MalformedDealing { .. }
+            ));
+        }
+
+        Ok(())
+    }
+
+    #[tokio::test]
+    #[ignore] // expensive test
+    async fn check_dealers_resharing_filter_one_missing_dealing() -> anyhow::Result<()> {
+        let validators = 4;
+
+        let mut controllers = initialise_controllers(validators).await;
+        let address = controllers[0].cw_address().await;
+        let chain = controllers[0].chain_state.clone();
+        let epoch = chain.lock().unwrap().dkg_contract.epoch.epoch_id;
+        let key_size = chain.lock().unwrap().dkg_contract.contract_state.key_size;
+
+        initialise_dkg(&mut controllers, false).await;
+        submit_public_keys(&mut controllers, false).await;
+
+        // add all but the first dealing
+        for controller in controllers.iter_mut().skip(1) {
+            controller.dealing_exchange(epoch, false).await?;
+        }
+
+        for controller in controllers.iter_mut().skip(1) {
+            let epoch_receivers = controller.state.valid_epoch_receivers_keys(epoch)?;
+
+            let filtered = controller
+                .get_valid_dealings(&epoch_receivers, epoch, false)
+                .await?;
+
+            assert_eq!(filtered.len(), key_size as usize);
+            let corrupted_status = controller
+                .state
+                .key_derivation_state(epoch)?
+                .rejected_dealers
+                .get(&address)
+                .unwrap();
+            assert_eq!(corrupted_status, &DealerRejectionReason::NoDealingsProvided);
+        }
+
+        Ok(())
+    }
+
+    #[tokio::test]
+    #[ignore] // expensive test
+    async fn check_dealers_filter_all_bad_dealings() -> anyhow::Result<()> {
+        let validators = 3;
+
+        let mut controllers = initialise_controllers(validators).await;
+        let address = controllers[0].cw_address().await;
+        let chain = controllers[0].chain_state.clone();
+        let epoch = chain.lock().unwrap().dkg_contract.epoch.epoch_id;
+
+        initialise_dkg(&mut controllers, false).await;
+        submit_public_keys(&mut controllers, false).await;
+        exchange_dealings(&mut controllers, false).await;
+
+        let key_size = chain.lock().unwrap().dkg_contract.contract_state.key_size;
+
+        // // corrupt all dealings of one address
+        chain
+            .lock()
+            .unwrap()
+            .dkg_contract
+            .dealings
+            .entry(epoch)
+            .and_modify(|epoch_dealings| {
+                let validator_dealings = epoch_dealings.get_mut(&address.to_string()).unwrap();
+                validator_dealings.values_mut().for_each(|dealing| {
+                    dealing.chunks.values_mut().for_each(|chunk| {
+                        chunk.0.pop();
+                    })
+                });
+            });
+
+        for controller in controllers.iter_mut() {
+            let epoch_receivers = controller.state.valid_epoch_receivers_keys(epoch)?;
+
+            let filtered = controller
+                .get_valid_dealings(&epoch_receivers, epoch, false)
+                .await?;
+
+            assert_eq!(filtered.len(), key_size as usize);
+            for dealings in filtered.values() {
+                assert_eq!(dealings.len(), validators - 1)
+            }
+
+            let corrupted_status = controller
+                .state
+                .key_derivation_state(epoch)?
+                .rejected_dealers
+                .get(&address)
+                .unwrap();
+            assert!(matches!(
+                corrupted_status,
+                DealerRejectionReason::MalformedDealing { .. }
+            ));
+        }
+
+        Ok(())
+    }
+
+    #[tokio::test]
+    #[ignore] // expensive test
+    async fn check_dealers_filter_dealing_verification_error() -> anyhow::Result<()> {
+        let validators = 3;
+
+        let mut controllers = initialise_controllers(validators).await;
+        let address = controllers[0].cw_address().await;
+        let chain = controllers[0].chain_state.clone();
+        let epoch = chain.lock().unwrap().dkg_contract.epoch.epoch_id;
+
+        initialise_dkg(&mut controllers, false).await;
+        submit_public_keys(&mut controllers, false).await;
+        exchange_dealings(&mut controllers, false).await;
+
+        let key_size = chain.lock().unwrap().dkg_contract.contract_state.key_size;
+
+        // corrupt just one dealing
+        chain
+            .lock()
+            .unwrap()
+            .dkg_contract
+            .dealings
+            .entry(epoch)
+            .and_modify(|epoch_dealings| {
+                let validator_dealings = epoch_dealings.get_mut(&address.to_string()).unwrap();
+                let chunks = &mut validator_dealings.get_mut(&0).unwrap().chunks;
+                let mut last_entry = chunks.last_entry().unwrap();
+                let last = last_entry.get_mut();
+                let value = last.0.pop().unwrap();
+                if value == 42 {
+                    last.0.push(43);
+                } else {
+                    last.0.push(42);
+                }
+            });
+
+        for controller in controllers.iter_mut() {
+            let epoch_receivers = controller.state.valid_epoch_receivers_keys(epoch)?;
+
+            let filtered = controller
+                .get_valid_dealings(&epoch_receivers, epoch, false)
+                .await?;
+
+            assert_eq!(filtered.len(), key_size as usize);
+            let corrupted_status = controller
+                .state
+                .key_derivation_state(epoch)?
+                .rejected_dealers
+                .get(&address)
+                .unwrap();
+            assert!(matches!(
+                corrupted_status,
+                DealerRejectionReason::InvalidDealing { .. }
+            ));
+        }
+
+        Ok(())
+    }
+
+    #[tokio::test]
+    #[ignore] // expensive test
+    async fn partial_keypair_derivation() -> anyhow::Result<()> {
+        let validators = 3;
+
+        let mut controllers = initialise_controllers(validators).await;
+        let chain = controllers[0].chain_state.clone();
+        let epoch = chain.lock().unwrap().dkg_contract.epoch.epoch_id;
+
+        initialise_dkg(&mut controllers, false).await;
+        submit_public_keys(&mut controllers, false).await;
+        exchange_dealings(&mut controllers, false).await;
+
+        for controller in controllers.iter_mut() {
+            let epoch_receivers = controller.state.valid_epoch_receivers_keys(epoch)?;
+
+            let filtered = controller
+                .get_valid_dealings(&epoch_receivers, epoch, false)
+                .await?;
+
+            let res = controller
+                .derive_partial_keypair(epoch, epoch_receivers, filtered)
+                .unwrap();
+            assert!(res.is_ok());
+        }
+
+        Ok(())
+    }
+
+    #[tokio::test]
+    #[ignore] // expensive test
+    async fn partial_keypair_derivation_with_threshold() -> anyhow::Result<()> {
+        let validators = 4;
+
+        let mut controllers = initialise_controllers(validators).await;
+        let address = controllers[0].cw_address().await;
+        let chain = controllers[0].chain_state.clone();
+        let epoch = chain.lock().unwrap().dkg_contract.epoch.epoch_id;
+
+        initialise_dkg(&mut controllers, false).await;
+        submit_public_keys(&mut controllers, false).await;
+        exchange_dealings(&mut controllers, false).await;
+
+        // corrupt just one dealing
+        chain
+            .lock()
+            .unwrap()
+            .dkg_contract
+            .dealings
+            .entry(epoch)
+            .and_modify(|epoch_dealings| {
+                let validator_dealings = epoch_dealings.get_mut(&address.to_string()).unwrap();
+                let mut first = validator_dealings.remove(&0).unwrap();
+                let first_chunk = first.chunks.get_mut(&0).unwrap();
+                first_chunk.0.pop().unwrap();
+                validator_dealings.insert(0, first);
+            });
+
+        for controller in controllers.iter_mut().skip(1) {
+            let epoch_receivers = controller.state.valid_epoch_receivers_keys(epoch)?;
+            let filtered = controller
+                .get_valid_dealings(&epoch_receivers, epoch, false)
+                .await?;
+
+            let res = controller
+                .derive_partial_keypair(epoch, epoch_receivers, filtered)
+                .unwrap();
+            assert!(res.is_ok());
+        }
+
+        Ok(())
+    }
+
+    #[tokio::test]
+    #[ignore] // expensive test
+    async fn submit_verification_key() -> anyhow::Result<()> {
+        let validators = 4;
+        let mut controllers = initialise_controllers(validators).await;
+        let chain = controllers[0].chain_state.clone();
+        let epoch = chain.lock().unwrap().dkg_contract.epoch.epoch_id;
+
+        initialise_dkg(&mut controllers, false).await;
+        submit_public_keys(&mut controllers, false).await;
+        exchange_dealings(&mut controllers, false).await;
+
+        for controller in controllers.iter_mut() {
+            let res = controller.verification_key_submission(epoch, false).await;
+            assert!(res.is_ok());
+
+            assert!(controller
+                .state
+                .key_derivation_state(epoch)?
+                .completed_with_success());
+            let keys = controller.state.take_coconut_keypair().await;
+            assert!(keys.is_some());
+            assert_eq!(keys.as_ref().unwrap().issued_for_epoch, epoch);
+        }
+
+        Ok(())
+    }
+}
diff --git a/nym-api/src/coconut/dkg/key_finalization.rs b/nym-api/src/coconut/dkg/key_finalization.rs
new file mode 100644
index 0000000000..628f04daa3
--- /dev/null
+++ b/nym-api/src/coconut/dkg/key_finalization.rs
@@ -0,0 +1,131 @@
+// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: GPL-3.0-only
+
+use crate::coconut::dkg::controller::DkgController;
+use crate::coconut::error::CoconutError;
+use cw3::Status;
+use nym_coconut_dkg_common::types::EpochId;
+use rand::{CryptoRng, RngCore};
+use thiserror::Error;
+
+#[derive(Debug, Error)]
+pub enum KeyFinalizationError {
+    #[error(transparent)]
+    CoconutError(#[from] CoconutError),
+
+    #[error("our proposal for key verification is still open (or is pending) (proposal id: {proposal_id}) ")]
+    UnresolvedProposal { proposal_id: u64 },
+
+    #[error("our proposal for key verification has been rejected (proposal id: {proposal_id})")]
+    RejectedProposal { proposal_id: u64 },
+
+    #[error("can't complete key finalization without key validation")]
+    IncompleteKeyValidation,
+}
+
+impl<R: RngCore + CryptoRng> DkgController<R> {
+    pub(crate) async fn verification_key_finalization(
+        &mut self,
+        epoch_id: EpochId,
+    ) -> Result<(), KeyFinalizationError> {
+        let key_finalization_state = self.state.key_finalization_state(epoch_id)?;
+
+        // check if we have already executed our own proposal
+        if key_finalization_state.completed() {
+            // the only way this could be a false positive is if the chain forked and blocks got reverted,
+            // but I don't think we have to worry about that
+            debug!("our key has already been verified");
+            return Ok(());
+        }
+
+        if !self.state.key_validation_state(epoch_id)?.completed {
+            return Err(KeyFinalizationError::IncompleteKeyValidation);
+        }
+
+        let proposal_id = self.state.proposal_id(epoch_id)?;
+
+        // check whether our key has already been verified with executed proposal,
+        // either by us in previous iteration after a timeout
+        // or by another party
+        let status = self.dkg_client.get_proposal_status(proposal_id).await?;
+        match status {
+            // if the proposal hasn't been resolved, there's not much we can do but wait and pray
+            Status::Pending | Status::Open => {
+                // 'theoretically' it's possible that more votes are going to come in, but it's very unlikely
+                warn!("our proposal ({proposal_id}) still hasn't received enough votes to get accepted");
+                return Err(KeyFinalizationError::UnresolvedProposal { proposal_id });
+            }
+            // if the proposal has been rejected, there's nothing we can do, we failed the DKG
+            Status::Rejected => {
+                // technically there's nothing enforcing this, so as long as our keys have been properly generated
+                // (even though they've been rejected by other parties), they could still issue [cryptographically] valid credentials
+                error!("our key verification proposal ({proposal_id}) has been rejected - we can't use our derived keys!");
+                self.state.key_finalization_state_mut(epoch_id)?.completed = true;
+                return Err(KeyFinalizationError::RejectedProposal { proposal_id });
+            }
+            // if the proposal has passed, execute it to finalize our key
+            Status::Passed => {
+                self.dkg_client
+                    .execute_verification_key_share(proposal_id)
+                    .await?;
+            }
+            // if they proposal has already been executed, we're done!
+            Status::Executed => {
+                // generally each dealer is responsible for executing its own proposals,
+                // but technically there's nothing preventing other dealers from executing them
+                debug!("our dkg proposal has already been executed");
+            }
+        }
+
+        self.state.key_finalization_state_mut(epoch_id)?.completed = true;
+        self.state.validate_coconut_keypair();
+        info!("DKG: Finalized own verification key on chain");
+
+        Ok(())
+    }
+}
+
+// NOTE: the following tests currently do NOT cover all cases
+// I've (@JS) only updated old, existing, tests. nothing more
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::coconut::tests::helpers::{
+        derive_keypairs, exchange_dealings, initialise_controllers, initialise_dkg,
+        submit_public_keys, validate_keys,
+    };
+
+    #[tokio::test]
+    #[ignore] // expensive test
+    async fn finalize_verification_key() -> anyhow::Result<()> {
+        let validators = 4;
+
+        let mut controllers = initialise_controllers(validators).await;
+        let chain = controllers[0].chain_state.clone();
+        let epoch = chain.lock().unwrap().dkg_contract.epoch.epoch_id;
+
+        initialise_dkg(&mut controllers, false).await;
+        submit_public_keys(&mut controllers, false).await;
+        exchange_dealings(&mut controllers, false).await;
+        derive_keypairs(&mut controllers, false).await;
+        validate_keys(&mut controllers, false).await;
+
+        for controller in controllers.iter_mut() {
+            let res = controller.verification_key_finalization(epoch).await;
+            assert!(res.is_ok());
+
+            assert!(controller.state.key_finalization_state(epoch)?.completed);
+        }
+
+        let chain = controllers[0].chain_state.clone();
+        let guard = chain.lock().unwrap();
+        let proposals = &guard.multisig_contract.proposals;
+        assert_eq!(proposals.len(), validators);
+
+        for proposal in proposals.values() {
+            assert_eq!(Status::Executed, proposal.status)
+        }
+
+        Ok(())
+    }
+}
diff --git a/nym-api/src/coconut/dkg/key_validation.rs b/nym-api/src/coconut/dkg/key_validation.rs
new file mode 100644
index 0000000000..a957db8f23
--- /dev/null
+++ b/nym-api/src/coconut/dkg/key_validation.rs
@@ -0,0 +1,403 @@
+// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: GPL-3.0-only
+
+use crate::coconut::dkg::controller::DkgController;
+use crate::coconut::error::CoconutError;
+use crate::coconut::state::bandwidth_voucher_params;
+use cosmwasm_std::Addr;
+use cw3::Vote;
+use nym_coconut::{check_vk_pairing, Base58, VerificationKey};
+use nym_coconut_dkg_common::types::EpochId;
+use nym_coconut_dkg_common::verification_key::ContractVKShare;
+use rand::{CryptoRng, RngCore};
+use std::collections::HashMap;
+use thiserror::Error;
+
+fn vote_matches(voted_yes: bool, chain_vote: Vote) -> bool {
+    if voted_yes && chain_vote == Vote::Yes {
+        true
+    } else {
+        !voted_yes && chain_vote == Vote::No
+    }
+}
+
+#[derive(Debug, Error)]
+pub enum KeyValidationError {
+    #[error(transparent)]
+    CoconutError(#[from] CoconutError),
+
+    #[error("can't complete key validation without key derivation")]
+    IncompleteKeyDerivation,
+}
+
+#[derive(Debug, Error)]
+pub enum ShareRejectionReason {
+    #[error("{owner} does not appear to be present in the list of receivers for epoch {epoch_id}")]
+    NotAReceiver { epoch_id: EpochId, owner: Addr },
+
+    #[error("the share from {owner} for epoch {epoch_id} already appears as verified on chain!")]
+    AlreadyVerifiedOnChain { epoch_id: EpochId, owner: Addr },
+
+    #[error(
+        "the share from {owner} for epoch {epoch_id} does not use valid base58 encoding: {source}"
+    )]
+    MalformedKeyEncoding {
+        epoch_id: EpochId,
+        owner: Addr,
+        #[source]
+        source: nym_coconut::CoconutError,
+    },
+
+    #[error("did not derive partial keys for {owner} at index {receiver_index} for epoch {epoch_id} during the dealings exchange")]
+    MissingDerivedPartialKey {
+        epoch_id: EpochId,
+        owner: Addr,
+        receiver_index: usize,
+    },
+
+    #[error("the provided keys {owner} at index {receiver_index} for epoch {epoch_id} either did not match the partial keys derived during the dealings exchange or failed the local bilinear pairing consistency check")]
+    InconsistentKeys {
+        epoch_id: EpochId,
+        owner: Addr,
+        receiver_index: usize,
+    },
+}
+
+impl<R: RngCore + CryptoRng> DkgController<R> {
+    async fn verify_share(
+        &self,
+        epoch_id: EpochId,
+        share: ContractVKShare,
+    ) -> Result<(Option<bool>, Option<ShareRejectionReason>), KeyValidationError> {
+        fn reject(
+            reason: ShareRejectionReason,
+        ) -> Result<(Option<bool>, Option<ShareRejectionReason>), KeyValidationError> {
+            Ok((Some(false), Some(reason)))
+        }
+
+        let owner = share.owner;
+
+        if share.verified {
+            error!("the share from {owner} has already been validated on chain - this should be impossible unless this machine is running seriously behind");
+            let reason = ShareRejectionReason::AlreadyVerifiedOnChain { epoch_id, owner };
+            // explicitly return 'None' for the vote as we don't have to (nor even should) vote for this share
+            return Ok((None, Some(reason)));
+        }
+
+        // get the receiver index [of the dealings] for this participant
+        let Some(receiver_index) = self
+            .state
+            .valid_epoch_receivers(epoch_id)?
+            .iter()
+            .position(|(addr, _)| addr == owner)
+        else {
+            return reject(ShareRejectionReason::NotAReceiver { epoch_id, owner });
+        };
+
+        // attempt to recover the underlying key from its bs58 representation
+        let recovered_key = match VerificationKey::try_from_bs58(share.share) {
+            Ok(key) => key,
+            Err(source) => {
+                return reject(ShareRejectionReason::MalformedKeyEncoding {
+                    epoch_id,
+                    owner,
+                    source,
+                });
+            }
+        };
+
+        // retrieve the key we have recovered ourselves during the dealings exchange
+        let Some(self_derived) = self
+            .state
+            .key_derivation_state(epoch_id)?
+            .derived_partials_for(receiver_index)
+        else {
+            return reject(ShareRejectionReason::MissingDerivedPartialKey {
+                epoch_id,
+                owner,
+                receiver_index,
+            });
+        };
+
+        if !check_vk_pairing(bandwidth_voucher_params(), &self_derived, &recovered_key) {
+            return reject(ShareRejectionReason::InconsistentKeys {
+                epoch_id,
+                owner,
+                receiver_index,
+            });
+        }
+
+        // all is good -> accept the keys!
+        Ok((Some(true), None))
+    }
+
+    async fn generate_votes(
+        &self,
+        epoch_id: EpochId,
+    ) -> Result<HashMap<u64, bool>, KeyValidationError> {
+        let proposals = self.get_validation_proposals().await?;
+        let vk_shares = self
+            .dkg_client
+            .get_verification_key_shares(epoch_id)
+            .await?;
+
+        let mut votes = HashMap::new();
+        for contract_share in vk_shares {
+            let owner = contract_share.owner.clone();
+            debug!("verifying vk share from {owner}");
+
+            // there's no point in checking anything if there doesn't exist an associated multisig proposal
+            let Some(proposal_id) = proposals.get(owner.as_ref()) else {
+                warn!("there does not seem to exist proposal for share validation from {owner}");
+                continue;
+            };
+
+            // if this is our share, obviously vote for yes without spending time on verification
+            if owner.as_ref() == self.dkg_client.get_address().await.as_ref() {
+                votes.insert(*proposal_id, true);
+                continue;
+            }
+
+            let (vote, rejection_reason) = self.verify_share(epoch_id, contract_share).await?;
+            if let Some(vote) = vote {
+                votes.insert(*proposal_id, vote);
+            }
+            if let Some(rejection_reason) = rejection_reason {
+                warn!("rejecting share from {owner} (proposal: {proposal_id}): {rejection_reason}");
+            }
+        }
+
+        Ok(votes)
+    }
+
+    async fn resubmit_validation_votes(&self, epoch_id: EpochId) -> Result<(), KeyValidationError> {
+        let key_validation_state = self.state.key_validation_state(epoch_id)?;
+
+        for (&proposal, &vote) in &key_validation_state.votes {
+            // check whether we might have already voted on this particular proposal
+            // (the vote might have gotten stuck in the mempool)
+            let chain_vote = self.dkg_client.get_vote(proposal).await?;
+            if let Some(chain_vote) = chain_vote.vote {
+                warn!("we have already voted for proposal {proposal} before - we probably crashed or the chain timed out!");
+
+                // that's an extremely weird behaviour -> perhaps the user voted manually outside the nym-api,
+                // but we can't do anything about it
+                if !vote_matches(vote, chain_vote.vote) {
+                    error!("our vote for proposal {proposal} doesn't match the on-chain data! We decided to vote '{vote}' but the chain has {:?}", chain_vote.vote);
+                }
+                continue;
+            }
+            warn!("we have already decided on the vote status for proposal {proposal} before (vote: {vote}), but failed to submit it");
+            self.dkg_client
+                .vote_verification_key_share(proposal, vote)
+                .await?;
+        }
+        Ok(())
+    }
+
+    pub(crate) async fn verification_key_validation(
+        &mut self,
+        epoch_id: EpochId,
+    ) -> Result<(), KeyValidationError> {
+        let key_validation_state = self.state.key_validation_state(epoch_id)?;
+
+        // check if we have already validated and voted for all keys
+        if key_validation_state.completed() {
+            // the only way this could be a false positive is if the chain forked and blocks got reverted,
+            // but I don't think we have to worry about that
+            debug!("we have already voted in all validation proposals");
+            return Ok(());
+        }
+
+        if !self
+            .state
+            .key_derivation_state(epoch_id)?
+            .completed_with_success()
+        {
+            return Err(KeyValidationError::IncompleteKeyDerivation);
+        }
+
+        // FAILURE CASE:
+        // check if we have already verified the keys, but some voting txs either didn't get executed
+        // or got executed without us knowing about it
+        if !key_validation_state.votes.is_empty() {
+            debug!(
+                "we have already validated all keys for this epoch, but might have failed to vote"
+            );
+            self.resubmit_validation_votes(epoch_id).await?;
+
+            // if we managed to resubmit the votes (i.e. we didn't return an error)
+            // it means the state is complete now
+            info!("DKG: resubmitted previously generated votes - finished key validation");
+            self.state.key_validation_state_mut(epoch_id)?.completed = true;
+            return Ok(());
+        }
+
+        let votes = self.generate_votes(epoch_id).await?;
+        self.state.key_validation_state_mut(epoch_id)?.votes = votes.clone();
+
+        // send the votes
+        for (proposal, vote) in votes {
+            // FUTURE OPTIMIZATION: we could batch them in a single tx
+            self.dkg_client
+                .vote_verification_key_share(proposal, vote)
+                .await?;
+        }
+
+        self.state.key_validation_state_mut(epoch_id)?.completed = true;
+
+        info!("DKG: validated all the other verification keys");
+        Ok(())
+    }
+}
+
+// NOTE: the following tests currently do NOT cover all cases
+// I've (@JS) only updated old, existing, tests. nothing more
+#[cfg(test)]
+mod tests {
+    use crate::coconut::tests::helpers::{
+        derive_keypairs, exchange_dealings, initialise_controllers, initialise_dkg,
+        submit_public_keys,
+    };
+    use cw3::Status;
+    use nym_coconut_dkg_common::verification_key::owner_from_cosmos_msgs;
+
+    #[tokio::test]
+    #[ignore] // expensive test
+    async fn validate_verification_key() -> anyhow::Result<()> {
+        let validators = 4;
+
+        let mut controllers = initialise_controllers(validators).await;
+        let chain = controllers[0].chain_state.clone();
+        let epoch = chain.lock().unwrap().dkg_contract.epoch.epoch_id;
+
+        initialise_dkg(&mut controllers, false).await;
+        submit_public_keys(&mut controllers, false).await;
+        exchange_dealings(&mut controllers, false).await;
+        derive_keypairs(&mut controllers, false).await;
+
+        for controller in controllers.iter_mut() {
+            let res = controller.verification_key_validation(epoch).await;
+            assert!(res.is_ok());
+
+            assert!(controller.state.key_validation_state(epoch)?.completed);
+        }
+
+        let guard = chain.lock().unwrap();
+        let proposals = &guard.multisig_contract.proposals;
+        assert_eq!(proposals.len(), validators);
+
+        for proposal in proposals.values() {
+            assert_eq!(Status::Passed, proposal.status)
+        }
+
+        Ok(())
+    }
+
+    #[tokio::test]
+    #[ignore] // expensive test
+    async fn validate_verification_key_malformed_share() -> anyhow::Result<()> {
+        let validators = 4;
+
+        let mut controllers = initialise_controllers(validators).await;
+        let chain = controllers[0].chain_state.clone();
+        let epoch = chain.lock().unwrap().dkg_contract.epoch.epoch_id;
+
+        initialise_dkg(&mut controllers, false).await;
+        submit_public_keys(&mut controllers, false).await;
+        exchange_dealings(&mut controllers, false).await;
+        derive_keypairs(&mut controllers, false).await;
+
+        let first_dealer = controllers[0].dkg_client.get_address().await;
+
+        {
+            let mut guard = chain.lock().unwrap();
+            let shares = guard
+                .dkg_contract
+                .verification_shares
+                .get_mut(&epoch)
+                .unwrap();
+            let share = shares.get_mut(first_dealer.as_ref()).unwrap();
+            // mess up the share
+            share.share.push('x');
+        }
+
+        for controller in controllers.iter_mut() {
+            let res = controller.verification_key_validation(epoch).await;
+            assert!(res.is_ok());
+
+            assert!(controller.state.key_validation_state(epoch)?.completed);
+        }
+
+        let guard = chain.lock().unwrap();
+        let proposals = &guard.multisig_contract.proposals;
+        assert_eq!(proposals.len(), validators);
+
+        // the proposal from the first dealer would have gotten rejected
+        for proposal in proposals.values() {
+            let addr = owner_from_cosmos_msgs(&proposal.msgs).unwrap();
+            if addr.as_str() == first_dealer.as_ref() {
+                assert_eq!(Status::Rejected, proposal.status)
+            } else {
+                assert_eq!(Status::Passed, proposal.status)
+            }
+        }
+
+        Ok(())
+    }
+
+    #[tokio::test]
+    #[ignore] // expensive test
+    async fn validate_verification_key_unpaired_share() -> anyhow::Result<()> {
+        let validators = 2;
+
+        let mut controllers = initialise_controllers(validators).await;
+        let chain = controllers[0].chain_state.clone();
+        let epoch = chain.lock().unwrap().dkg_contract.epoch.epoch_id;
+
+        initialise_dkg(&mut controllers, false).await;
+        submit_public_keys(&mut controllers, false).await;
+        exchange_dealings(&mut controllers, false).await;
+        derive_keypairs(&mut controllers, false).await;
+
+        let first_dealer = controllers[0].dkg_client.get_address().await;
+        let second_dealer = controllers[1].dkg_client.get_address().await;
+
+        {
+            let mut guard = chain.lock().unwrap();
+            let shares = guard
+                .dkg_contract
+                .verification_shares
+                .get_mut(&epoch)
+                .unwrap();
+            let second_share = shares.get(second_dealer.as_ref()).unwrap().clone();
+
+            let share = shares.get_mut(first_dealer.as_ref()).unwrap();
+            // mess up the share
+            share.share = second_share.share;
+        }
+
+        for controller in controllers.iter_mut() {
+            let res = controller.verification_key_validation(epoch).await;
+            assert!(res.is_ok());
+
+            assert!(controller.state.key_validation_state(epoch)?.completed);
+        }
+
+        let guard = chain.lock().unwrap();
+        let proposals = &guard.multisig_contract.proposals;
+        assert_eq!(proposals.len(), validators);
+
+        // the proposal from the first dealer would have gotten rejected
+        for proposal in proposals.values() {
+            let addr = owner_from_cosmos_msgs(&proposal.msgs).unwrap();
+            if addr.as_str() == first_dealer.as_ref() {
+                assert_eq!(Status::Rejected, proposal.status)
+            } else {
+                assert_eq!(Status::Passed, proposal.status)
+            }
+        }
+
+        Ok(())
+    }
+}
diff --git a/nym-api/src/coconut/dkg/mod.rs b/nym-api/src/coconut/dkg/mod.rs
index ac82cf97c3..46083a2d1a 100644
--- a/nym-api/src/coconut/dkg/mod.rs
+++ b/nym-api/src/coconut/dkg/mod.rs
@@ -1,10 +1,102 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2022-2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: GPL-3.0-only
 
+use std::sync::OnceLock;
+
+pub(crate) fn params() -> &'static nym_dkg::bte::Params {
+    static PARAMS: OnceLock<nym_dkg::bte::Params> = OnceLock::new();
+    PARAMS.get_or_init(nym_dkg::bte::setup)
+}
+
 pub(crate) mod client;
-pub(crate) mod complaints;
 pub(crate) mod controller;
 pub(crate) mod dealing;
+mod helpers;
+pub(crate) mod key_derivation;
+pub(crate) mod key_finalization;
+pub(crate) mod key_validation;
 pub(crate) mod public_key;
 pub(crate) mod state;
-pub(crate) mod verification_key;
+
+#[cfg(test)]
+mod tests {
+    use crate::coconut::tests::helpers::{
+        derive_keypairs, exchange_dealings, finalize, init_chain, initialise_controller,
+        initialise_dkg, submit_public_keys, validate_keys,
+    };
+    use nym_coconut::aggregate_verification_keys;
+
+    #[tokio::test]
+    #[ignore] // expensive test
+    async fn reshare_preserves_master_key() -> anyhow::Result<()> {
+        let validators = 4;
+        let chain = init_chain();
+
+        let mut controllers = vec![];
+        for i in 0..validators {
+            controllers.push(initialise_controller(chain.clone(), i).await)
+        }
+
+        let chain = controllers[0].chain_state.clone();
+        let epoch = chain.lock().unwrap().dkg_contract.epoch.epoch_id;
+
+        // EPOCH 0 DKG
+        initialise_dkg(&mut controllers, false).await;
+        submit_public_keys(&mut controllers, false).await;
+        exchange_dealings(&mut controllers, false).await;
+        derive_keypairs(&mut controllers, false).await;
+        validate_keys(&mut controllers, false).await;
+        finalize(&mut controllers).await;
+
+        // get the master key
+        let mut vks = vec![];
+        let mut indices = vec![];
+        for controller in controllers.iter() {
+            let vk = controller.unchecked_coconut_vk().await;
+            let index = controller.state.assigned_index(epoch)?;
+            vks.push(vk);
+            indices.push(index);
+        }
+        let initial_first_key = vks[0].clone();
+        let initial_master_vk = aggregate_verification_keys(&vks, Some(&indices))?;
+
+        let new_controller = initialise_controller(chain.clone(), validators).await;
+        controllers.push(new_controller);
+
+        chain.lock().unwrap().advance_epoch_in_reshare_mode();
+
+        let next_epoch = epoch + 1;
+        // sanity check
+        assert_eq!(
+            next_epoch,
+            chain.lock().unwrap().dkg_contract.epoch.epoch_id
+        );
+
+        // EPOCH 1 DKG (resharing)
+        submit_public_keys(&mut controllers, true).await;
+        exchange_dealings(&mut controllers, true).await;
+        derive_keypairs(&mut controllers, true).await;
+        validate_keys(&mut controllers, true).await;
+        finalize(&mut controllers).await;
+
+        let mut vks = vec![];
+        let mut indices = vec![];
+        for controller in controllers.iter() {
+            let vk = controller.unchecked_coconut_vk().await;
+            let index = controller.state.assigned_index(next_epoch)?;
+            vks.push(vk);
+            indices.push(index);
+        }
+
+        let updated_first_key = vks[0].clone();
+        let reshared_master_vk = aggregate_verification_keys(&vks, Some(&indices))?;
+
+        // individual keys changed
+        assert_ne!(initial_first_key, updated_first_key);
+
+        // but master didn't
+        assert_eq!(initial_master_vk, reshared_master_vk);
+
+        Ok(())
+    }
+}
diff --git a/nym-api/src/coconut/dkg/public_key.rs b/nym-api/src/coconut/dkg/public_key.rs
index 74f3d5c9f3..b7a899b6cb 100644
--- a/nym-api/src/coconut/dkg/public_key.rs
+++ b/nym-api/src/coconut/dkg/public_key.rs
@@ -1,112 +1,132 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2022-2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: GPL-3.0-only
 
-use crate::coconut::dkg::client::DkgClient;
-use crate::coconut::dkg::state::State;
+use crate::coconut::dkg::controller::DkgController;
 use crate::coconut::error::CoconutError;
 use log::debug;
-use nym_coconut_dkg_common::dealer::DealerType;
+use nym_coconut_dkg_common::types::EpochId;
+use rand::{CryptoRng, RngCore};
+use thiserror::Error;
 
-pub(crate) async fn public_key_submission(
-    dkg_client: &DkgClient,
-    state: &mut State,
-    resharing: bool,
-) -> Result<(), CoconutError> {
-    if state.was_in_progress() {
-        let own_address = dkg_client.get_address().await.as_ref().to_string();
-        let is_initial_dealer = dkg_client
-            .get_initial_dealers()
-            .await?
-            .map(|data| data.initial_dealers.iter().any(|d| *d == own_address))
-            .unwrap_or(false);
-        let reset_coconut_keypair = !resharing || !is_initial_dealer;
-        debug!(
-            "Resetting state, with coconut keypair reset: {}",
-            reset_coconut_keypair
-        );
-        state.reset_persistent(reset_coconut_keypair).await;
-    }
-    if state.node_index().is_some() {
-        debug!("Node index was set previously, nothing to do");
-        return Ok(());
-    }
-
-    let bte_key = bs58::encode(&state.dkg_keypair().public_key().to_bytes()).into_string();
-    let dealer_details = dkg_client.get_self_registered_dealer_details().await?;
-    let index = if let Some(details) = dealer_details.details {
-        if dealer_details.dealer_type == DealerType::Past {
-            // If it was a dealer in a previous epoch, re-register it for this epoch
-            debug!("Registering for the current DKG round, with keys from a previous epoch");
-            dkg_client
-                .register_dealer(bte_key, state.announce_address().to_string(), resharing)
-                .await?;
-        }
-        details.assigned_index
-    } else {
-        debug!("Registering for the first time to be a dealer");
-        // First time registration
-        dkg_client
-            .register_dealer(bte_key, state.announce_address().to_string(), resharing)
-            .await?
-    };
-    state.set_node_index(Some(index));
-    info!("DKG: Using node index {}", index);
-
-    Ok(())
+#[derive(Debug, Error)]
+pub enum PublicKeySubmissionError {
+    #[error(transparent)]
+    CoconutError(#[from] CoconutError),
 }
 
+impl<R: RngCore + CryptoRng> DkgController<R> {
+    /// First step of the DKG process during which the nym api will register for the key exchange
+    /// by submitting its:
+    /// - BTE public key (alongside the proof of discrete log)
+    /// - ed25519 public key
+    /// - announce address to be used by clients for obtaining credentials
+    /// Upon successful registration, the node will receive a unique "NodeIndex"
+    /// which is the x-coordinate of the to be derived keys.
+    ///
+    /// During this step any prior coconut keys will be invalidated, i.e. keys from the previous epoch
+    /// won't be used for issuing new credentials.
+    ///
+    /// Furthermore, if the node experienced any failures during this step, a recovery will be attempted.
+    pub(crate) async fn public_key_submission(
+        &mut self,
+        epoch_id: EpochId,
+        resharing: bool,
+    ) -> Result<(), PublicKeySubmissionError> {
+        self.state.maybe_init_dkg_state(epoch_id);
+        let registration_state = self.state.registration_state(epoch_id)?;
+
+        // check if we have already submitted the key
+        if registration_state.completed() {
+            // the only way this could be a false positive is if the chain forked and blocks got reverted,
+            // but I don't think we have to worry about that
+            debug!("we have already submitted the keys for this epoch");
+            return Ok(());
+        }
+
+        // if we have coconut keys available, it means we have already completed the DKG before (in previous epoch)
+        // in which case, invalidate it so that it wouldn't be used for credential issuance
+        self.state.invalidate_coconut_keypair();
+
+        // FAILURE CASE:
+        // check if we have already sent the registration transaction, but it timed out or got stuck in the mempool and
+        // eventually got executed without us knowing about it
+        // in that case we MUST recover the assigned index since we won't be allowed to register again
+        let dealer_details = self.dkg_client.get_self_registered_dealer_details().await?;
+        if dealer_details.dealer_type.is_current() {
+            if let Some(details) = dealer_details.details {
+                // the tx did actually go through
+                self.state.registration_state_mut(epoch_id)?.assigned_index =
+                    Some(details.assigned_index);
+                info!("DKG: recovered node index: {}", details.assigned_index);
+                return Ok(());
+            }
+        }
+
+        // perform the full registration instead
+        let bte_key = bs58::encode(&self.state.dkg_keypair().public_key().to_bytes()).into_string();
+        let identity_key = self.state.identity_key().to_base58_string();
+        let announce_address = self.state.announce_address().to_string();
+
+        let assigned_index = self
+            .dkg_client
+            .register_dealer(bte_key, identity_key, announce_address, resharing)
+            .await?;
+        self.state.registration_state_mut(epoch_id)?.assigned_index = Some(assigned_index);
+        info!("DKG: Using node index {assigned_index}");
+
+        Ok(())
+    }
+}
+
+// NOTE: the following tests currently do NOT cover all cases
+// I've (@JS) only updated old, existing, tests. nothing more
 #[cfg(test)]
 pub(crate) mod tests {
-    use super::*;
-    use crate::coconut::dkg::state::PersistentState;
-    use crate::coconut::tests::DummyClient;
-    use crate::coconut::KeyPair;
-    use nym_dkg::bte::keys::KeyPair as DkgKeyPair;
-    use nym_validator_client::nyxd::AccountId;
-    use rand::rngs::OsRng;
-    use std::path::PathBuf;
-    use std::str::FromStr;
-    use url::Url;
-
-    const TEST_VALIDATOR_ADDRESS: &str = "n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0";
+    use crate::coconut::tests::fixtures;
 
     #[tokio::test]
-    #[ignore] // expensive test
-    async fn submit_public_key() {
-        let dkg_client = DkgClient::new(DummyClient::new(
-            AccountId::from_str(TEST_VALIDATOR_ADDRESS).unwrap(),
-        ));
-        let mut state = State::new(
-            PathBuf::default(),
-            PersistentState::default(),
-            Url::parse("localhost:8000").unwrap(),
-            DkgKeyPair::new(&nym_dkg::bte::setup(), OsRng),
-            KeyPair::new(),
-        );
+    async fn submit_public_key() -> anyhow::Result<()> {
+        let mut controller = fixtures::dkg_controller_fixture().await;
+        let epoch = controller.dkg_client.get_current_epoch().await?.epoch_id;
 
-        assert!(dkg_client
+        assert!(controller
+            .dkg_client
             .get_self_registered_dealer_details()
-            .await
-            .unwrap()
+            .await?
             .details
             .is_none());
-        public_key_submission(&dkg_client, &mut state, false)
-            .await
-            .unwrap();
-        let client_idx = dkg_client
+        controller.public_key_submission(epoch, false).await?;
+        let client_idx = controller
+            .dkg_client
             .get_self_registered_dealer_details()
-            .await
-            .unwrap()
+            .await?
             .details
             .unwrap()
             .assigned_index;
-        assert_eq!(state.node_index().unwrap(), client_idx);
+        assert_eq!(
+            controller
+                .state
+                .registration_state(epoch)?
+                .assigned_index
+                .unwrap(),
+            client_idx
+        );
 
         // keeps the same index from chain, not calling register_dealer again
-        state.set_node_index(None);
-        public_key_submission(&dkg_client, &mut state, false)
-            .await
-            .unwrap();
-        assert_eq!(state.node_index().unwrap(), client_idx);
+        controller
+            .state
+            .registration_state_mut(epoch)?
+            .assigned_index = None;
+        controller.public_key_submission(epoch, false).await?;
+        assert_eq!(
+            controller
+                .state
+                .registration_state(epoch)?
+                .assigned_index
+                .unwrap(),
+            client_idx
+        );
+
+        Ok(())
     }
 }
diff --git a/nym-api/src/coconut/dkg/state.rs b/nym-api/src/coconut/dkg/state.rs
deleted file mode 100644
index b22cd81f50..0000000000
--- a/nym-api/src/coconut/dkg/state.rs
+++ /dev/null
@@ -1,402 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: GPL-3.0-only
-
-use crate::coconut::dkg::complaints::ComplaintReason;
-use crate::coconut::error::CoconutError;
-use crate::coconut::keypair::KeyPair as CoconutKeyPair;
-use cosmwasm_std::Addr;
-use log::debug;
-use nym_coconut_dkg_common::dealer::DealerDetails;
-use nym_coconut_dkg_common::types::EpochState;
-use nym_dkg::bte::{keys::KeyPair as DkgKeyPair, PublicKey, PublicKeyWithProof};
-use nym_dkg::{NodeIndex, RecoveredVerificationKeys, Threshold};
-use serde::de::Error;
-use serde::{Deserialize, Deserializer, Serialize, Serializer};
-use std::collections::BTreeMap;
-use std::path::{Path, PathBuf};
-use url::Url;
-
-fn bte_pk_serialize<S: Serializer>(
-    val: &PublicKeyWithProof,
-    serializer: S,
-) -> Result<S::Ok, S::Error> {
-    val.to_bytes().serialize(serializer)
-}
-
-fn bte_pk_deserialize<'de, D>(deserializer: D) -> Result<PublicKeyWithProof, D::Error>
-where
-    D: Deserializer<'de>,
-{
-    let vec: Vec<u8> = Deserialize::deserialize(deserializer)?;
-    PublicKeyWithProof::try_from_bytes(&vec).map_err(|err| Error::custom(format_args!("{:?}", err)))
-}
-
-// note: each dealer is also a receiver which simplifies some logic significantly
-#[derive(Clone, Deserialize, Debug, Serialize)]
-pub(crate) struct DkgParticipant {
-    pub(crate) _address: Addr,
-    #[serde(serialize_with = "bte_pk_serialize")]
-    #[serde(deserialize_with = "bte_pk_deserialize")]
-    pub(crate) bte_public_key_with_proof: PublicKeyWithProof,
-    pub(crate) assigned_index: NodeIndex,
-}
-
-impl TryFrom<DealerDetails> for DkgParticipant {
-    type Error = ComplaintReason;
-
-    fn try_from(dealer: DealerDetails) -> Result<Self, Self::Error> {
-        let bte_public_key_with_proof = bs58::decode(dealer.bte_public_key_with_proof)
-            .into_vec()
-            .map(|bytes| PublicKeyWithProof::try_from_bytes(&bytes))
-            .map_err(|_| ComplaintReason::MalformedBTEPublicKey)?
-            .map_err(|_| ComplaintReason::MalformedBTEPublicKey)?;
-
-        if !bte_public_key_with_proof.verify() {
-            return Err(ComplaintReason::InvalidBTEPublicKey);
-        }
-
-        Ok(DkgParticipant {
-            _address: dealer.address,
-            bte_public_key_with_proof,
-            assigned_index: dealer.assigned_index,
-        })
-    }
-}
-
-#[async_trait]
-pub(crate) trait ConsistentState {
-    fn node_index_value(&self) -> Result<NodeIndex, CoconutError>;
-    fn receiver_index_value(&self) -> Result<usize, CoconutError>;
-    fn threshold(&self) -> Result<Threshold, CoconutError>;
-    async fn coconut_keypair_is_some(&self) -> Result<(), CoconutError>;
-    fn proposal_id_value(&self) -> Result<u64, CoconutError>;
-    async fn is_consistent(&self, epoch_state: EpochState) -> Result<(), CoconutError> {
-        match epoch_state {
-            EpochState::PublicKeySubmission { .. } => {}
-            EpochState::DealingExchange { .. } => {
-                self.node_index_value()?;
-            }
-            EpochState::VerificationKeySubmission { .. } => {
-                self.receiver_index_value()?;
-                self.threshold()?;
-            }
-            EpochState::VerificationKeyValidation { .. } => {
-                self.coconut_keypair_is_some().await?;
-            }
-            EpochState::VerificationKeyFinalization { .. } => {
-                self.proposal_id_value()?;
-            }
-            EpochState::InProgress => {}
-        }
-        Ok(())
-    }
-}
-
-#[async_trait]
-impl ConsistentState for State {
-    fn node_index_value(&self) -> Result<NodeIndex, CoconutError> {
-        self.node_index.ok_or(CoconutError::UnrecoverableState {
-            reason: String::from("Node index should have been set"),
-        })
-    }
-
-    fn receiver_index_value(&self) -> Result<usize, CoconutError> {
-        self.receiver_index.ok_or(CoconutError::UnrecoverableState {
-            reason: String::from("Receiver index should have been set"),
-        })
-    }
-
-    fn threshold(&self) -> Result<Threshold, CoconutError> {
-        let threshold = self.threshold.ok_or(CoconutError::UnrecoverableState {
-            reason: String::from("Threshold should have been set"),
-        })?;
-        if self.current_dealers_by_idx().len() < threshold as usize {
-            Err(CoconutError::UnrecoverableState {
-                reason: String::from(
-                    "Not enough good dealers in the signer set to achieve threshold",
-                ),
-            })
-        } else {
-            Ok(threshold)
-        }
-    }
-
-    async fn coconut_keypair_is_some(&self) -> Result<(), CoconutError> {
-        if self.coconut_keypair_is_some().await {
-            Ok(())
-        } else {
-            Err(CoconutError::UnrecoverableState {
-                reason: String::from("Coconut keypair should have been set"),
-            })
-        }
-    }
-
-    fn proposal_id_value(&self) -> Result<u64, CoconutError> {
-        self.proposal_id.ok_or(CoconutError::UnrecoverableState {
-            reason: String::from("Proposal id should have been set"),
-        })
-    }
-}
-
-fn vks_serialize<S: Serializer>(
-    val: &[RecoveredVerificationKeys],
-    serializer: S,
-) -> Result<S::Ok, S::Error> {
-    let vec: Vec<Vec<u8>> = val.iter().map(|vk| vk.to_bytes()).collect();
-    vec.serialize(serializer)
-}
-
-fn vks_deserialize<'de, D>(deserializer: D) -> Result<Vec<RecoveredVerificationKeys>, D::Error>
-where
-    D: Deserializer<'de>,
-{
-    let vec: Vec<Vec<u8>> = Deserialize::deserialize(deserializer)?;
-    vec.into_iter()
-        .map(|b| {
-            RecoveredVerificationKeys::try_from_bytes(&b)
-                .map_err(|err| D::Error::custom(format_args!("{:?}", err)))
-        })
-        .collect()
-}
-
-#[derive(Default, Deserialize, Serialize)]
-pub(crate) struct PersistentState {
-    node_index: Option<NodeIndex>,
-    dealers: BTreeMap<Addr, Result<DkgParticipant, ComplaintReason>>,
-    receiver_index: Option<usize>,
-    threshold: Option<Threshold>,
-    #[serde(serialize_with = "vks_serialize")]
-    #[serde(deserialize_with = "vks_deserialize")]
-    recovered_vks: Vec<RecoveredVerificationKeys>,
-    proposal_id: Option<u64>,
-    voted_vks: bool,
-    executed_proposal: bool,
-    was_in_progress: bool,
-}
-
-impl From<&State> for PersistentState {
-    fn from(s: &State) -> Self {
-        PersistentState {
-            node_index: s.node_index,
-            dealers: s.dealers.clone(),
-            receiver_index: s.receiver_index,
-            threshold: s.threshold,
-            recovered_vks: s.recovered_vks.clone(),
-            proposal_id: s.proposal_id,
-            voted_vks: s.voted_vks,
-            executed_proposal: s.executed_proposal,
-            was_in_progress: s.was_in_progress,
-        }
-    }
-}
-
-impl PersistentState {
-    pub fn save_to_file<P: AsRef<Path>>(&self, path: P) -> Result<(), CoconutError> {
-        std::fs::write(path, serde_json::to_string(self)?)?;
-        Ok(())
-    }
-
-    pub fn load_from_file<P: AsRef<Path>>(path: P) -> Result<Self, CoconutError> {
-        Ok(serde_json::from_str(&std::fs::read_to_string(path)?)?)
-    }
-}
-
-pub(crate) struct State {
-    persistent_state_path: PathBuf,
-    announce_address: Url,
-    dkg_keypair: DkgKeyPair,
-    coconut_keypair: CoconutKeyPair,
-    node_index: Option<NodeIndex>,
-    dealers: BTreeMap<Addr, Result<DkgParticipant, ComplaintReason>>,
-    receiver_index: Option<usize>,
-    threshold: Option<Threshold>,
-    recovered_vks: Vec<RecoveredVerificationKeys>,
-    proposal_id: Option<u64>,
-    voted_vks: bool,
-    executed_proposal: bool,
-    was_in_progress: bool,
-}
-
-impl State {
-    pub fn new(
-        persistent_state_path: PathBuf,
-        persistent_state: PersistentState,
-        announce_address: Url,
-        dkg_keypair: DkgKeyPair,
-        coconut_keypair: CoconutKeyPair,
-    ) -> Self {
-        State {
-            persistent_state_path,
-            announce_address,
-            dkg_keypair,
-            coconut_keypair,
-            node_index: persistent_state.node_index,
-            dealers: persistent_state.dealers,
-            receiver_index: persistent_state.receiver_index,
-            threshold: persistent_state.threshold,
-            recovered_vks: persistent_state.recovered_vks,
-            proposal_id: persistent_state.proposal_id,
-            voted_vks: persistent_state.voted_vks,
-            executed_proposal: persistent_state.executed_proposal,
-            was_in_progress: persistent_state.was_in_progress,
-        }
-    }
-
-    pub async fn reset_persistent(&mut self, reset_coconut_keypair: bool) {
-        if reset_coconut_keypair {
-            self.coconut_keypair.set(None).await;
-        }
-        self.node_index = Default::default();
-        self.dealers = Default::default();
-        self.receiver_index = Default::default();
-        self.threshold = Default::default();
-        self.recovered_vks = Default::default();
-        self.proposal_id = Default::default();
-        self.voted_vks = Default::default();
-        self.executed_proposal = Default::default();
-        self.was_in_progress = Default::default();
-    }
-
-    pub fn persistent_state_path(&self) -> PathBuf {
-        self.persistent_state_path.clone()
-    }
-
-    pub fn announce_address(&self) -> &Url {
-        &self.announce_address
-    }
-
-    pub fn dkg_keypair(&self) -> &DkgKeyPair {
-        &self.dkg_keypair
-    }
-
-    pub async fn coconut_keypair_is_some(&self) -> bool {
-        self.coconut_keypair.get().await.is_some()
-    }
-
-    pub async fn take_coconut_keypair(&self) -> Option<nym_coconut::KeyPair> {
-        self.coconut_keypair.take().await
-    }
-
-    #[cfg(test)]
-    pub async fn coconut_keypair(
-        &self,
-    ) -> tokio::sync::RwLockReadGuard<'_, Option<nym_coconut::KeyPair>> {
-        self.coconut_keypair.get().await
-    }
-
-    pub fn node_index(&self) -> Option<NodeIndex> {
-        self.node_index
-    }
-
-    pub fn receiver_index(&self) -> Option<usize> {
-        self.receiver_index
-    }
-
-    pub fn current_dealers_by_addr(&self) -> BTreeMap<Addr, NodeIndex> {
-        self.dealers
-            .iter()
-            .filter_map(|(addr, dealer)| {
-                dealer
-                    .as_ref()
-                    .ok()
-                    .map(|participant| (addr.clone(), participant.assigned_index))
-            })
-            .collect()
-    }
-
-    pub fn current_dealers_by_idx(&self) -> BTreeMap<NodeIndex, PublicKey> {
-        self.dealers
-            .iter()
-            .filter_map(|(_, dealer)| {
-                dealer.as_ref().ok().map(|participant| {
-                    (
-                        participant.assigned_index,
-                        *participant.bte_public_key_with_proof.public_key(),
-                    )
-                })
-            })
-            .collect()
-    }
-
-    pub fn recovered_vks(&self) -> &Vec<RecoveredVerificationKeys> {
-        &self.recovered_vks
-    }
-
-    pub fn voted_vks(&self) -> bool {
-        self.voted_vks
-    }
-
-    pub fn executed_proposal(&self) -> bool {
-        self.executed_proposal
-    }
-
-    pub fn was_in_progress(&self) -> bool {
-        self.was_in_progress
-    }
-
-    pub fn set_recovered_vks(&mut self, recovered_vks: Vec<RecoveredVerificationKeys>) {
-        self.recovered_vks = recovered_vks;
-    }
-
-    pub async fn set_coconut_keypair(
-        &mut self,
-        coconut_keypair: Option<nym_coconut_interface::KeyPair>,
-    ) {
-        self.coconut_keypair.set(coconut_keypair).await
-    }
-
-    pub fn set_node_index(&mut self, node_index: Option<NodeIndex>) {
-        self.node_index = node_index;
-    }
-
-    pub fn set_dealers(&mut self, dealers: Vec<DealerDetails>) {
-        self.dealers = BTreeMap::from_iter(
-            dealers
-                .into_iter()
-                .map(|details| (details.address.clone(), DkgParticipant::try_from(details))),
-        )
-    }
-
-    pub fn mark_bad_dealer(&mut self, dealer_addr: &Addr, reason: ComplaintReason) {
-        if let Some((_, value)) = self
-            .dealers
-            .iter_mut()
-            .find(|(addr, _)| *addr == dealer_addr)
-        {
-            debug!(
-                "Dealer {} misbehaved: {:?}. It will be marked locally as bad dealer and ignored",
-                dealer_addr, reason
-            );
-            *value = Err(reason);
-        }
-    }
-
-    pub fn set_receiver_index(&mut self, receiver_index: Option<usize>) {
-        self.receiver_index = receiver_index;
-    }
-
-    pub fn set_threshold(&mut self, threshold: Option<Threshold>) {
-        self.threshold = threshold;
-    }
-
-    pub fn set_proposal_id(&mut self, proposal_id: u64) {
-        self.proposal_id = Some(proposal_id);
-    }
-
-    pub fn set_voted_vks(&mut self) {
-        self.voted_vks = true;
-    }
-
-    pub fn set_executed_proposal(&mut self) {
-        self.executed_proposal = true;
-    }
-
-    pub fn set_was_in_progress(&mut self) {
-        self.was_in_progress = true;
-    }
-
-    #[cfg(test)]
-    pub fn all_dealers(&self) -> &BTreeMap<Addr, Result<DkgParticipant, ComplaintReason>> {
-        &self.dealers
-    }
-}
diff --git a/nym-api/src/coconut/dkg/state/dealing_exchange.rs b/nym-api/src/coconut/dkg/state/dealing_exchange.rs
new file mode 100644
index 0000000000..02a0ff1dd2
--- /dev/null
+++ b/nym-api/src/coconut/dkg/state/dealing_exchange.rs
@@ -0,0 +1,29 @@
+// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: GPL-3.0-only
+
+use super::serde_helpers::generated_dealings;
+use crate::coconut::dkg::state::DkgParticipant;
+use nym_coconut_dkg_common::types::DealingIndex;
+use nym_dkg::{Dealing, NodeIndex};
+use serde::{Deserialize, Serialize};
+use std::collections::{BTreeMap, HashMap};
+
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub struct DealingExchangeState {
+    pub(crate) dealers: BTreeMap<NodeIndex, DkgParticipant>,
+
+    #[serde(with = "generated_dealings")]
+    pub(crate) generated_dealings: HashMap<DealingIndex, Dealing>,
+
+    pub(crate) receiver_index: Option<usize>,
+
+    pub(crate) completed: bool,
+}
+
+impl DealingExchangeState {
+    /// Specifies whether this dealer has already shared dealings in this DKG epoch
+    pub fn completed(&self) -> bool {
+        self.completed
+    }
+}
diff --git a/nym-api/src/coconut/dkg/state/in_progress.rs b/nym-api/src/coconut/dkg/state/in_progress.rs
new file mode 100644
index 0000000000..ab6bc15353
--- /dev/null
+++ b/nym-api/src/coconut/dkg/state/in_progress.rs
@@ -0,0 +1,11 @@
+// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: GPL-3.0-only
+
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Copy, Default, Serialize, Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub struct InProgressState {
+    // indicate whether this node has been in this state before and performed any one-off tasks
+    pub(crate) entered: bool,
+}
diff --git a/nym-api/src/coconut/dkg/state/key_derivation.rs b/nym-api/src/coconut/dkg/state/key_derivation.rs
new file mode 100644
index 0000000000..51f43174ee
--- /dev/null
+++ b/nym-api/src/coconut/dkg/state/key_derivation.rs
@@ -0,0 +1,107 @@
+// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: GPL-3.0-only
+
+use super::serde_helpers::recovered_keys;
+use cosmwasm_std::Addr;
+use nym_coconut_dkg_common::types::{DealingIndex, EpochId};
+use nym_dkg::{G2Projective, NodeIndex, RecoveredVerificationKeys, Threshold};
+use serde::{Deserialize, Serialize};
+use std::collections::{BTreeMap, HashMap};
+use thiserror::Error;
+
+type ReceiverIndex = usize;
+
+#[derive(Debug, Clone, Error, Serialize, Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub enum DerivationFailure {
+    #[error("there were no valid dealings in epoch {epoch_id}")]
+    NoValidDealings { epoch_id: EpochId },
+
+    #[error("did not receive sufficient number of dealings for key derivation. got {available} per key fragment whislt the threshold is {threshold}")]
+    InsufficientNumberOfDealings {
+        available: usize,
+        threshold: Threshold,
+    },
+
+    #[error("could not recover partial verification keys for index {dealing_index}: {err_msg}")]
+    KeyRecoveryFailure {
+        dealing_index: DealingIndex,
+        err_msg: String,
+    },
+
+    #[error("could not decrypt share at index {dealing_index} generated by dealer at index {dealer_index}: {err_msg}")]
+    ShareDecryptionFailure {
+        dealing_index: DealingIndex,
+        dealer_index: NodeIndex,
+        err_msg: String,
+    },
+
+    #[error("the derived verification key does not match the expected partial elements")]
+    MismatchedPartialKey,
+}
+
+#[derive(Debug, Clone, Error, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(rename_all = "lowercase")]
+pub enum DealerRejectionReason {
+    #[error("no dealings were provided")]
+    NoDealingsProvided,
+
+    #[error("insufficient number of dealings was provided. got {got} but expected {expected}")]
+    InsufficientNumberOfDealingsProvided { got: usize, expected: usize },
+
+    #[error("no [verified] verification key from the previous epoch was available")]
+    MissingVerifiedLastEpochKey,
+
+    #[error("the key size from the previous epoch does not match the resharing dealing requirements: {key_size} vs {expected}")]
+    LastEpochKeyOfWrongSize { key_size: usize, expected: usize },
+
+    #[error("the dealing at index {index} is malformed: {err_msg}")]
+    MalformedDealing {
+        index: DealingIndex,
+        err_msg: String,
+    },
+
+    #[error("the dealing at index {index} is [cryptographically] invalid: {err_msg}")]
+    InvalidDealing {
+        index: DealingIndex,
+        err_msg: String,
+    },
+}
+
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub struct KeyDerivationState {
+    pub(crate) expected_threshold: Option<Threshold>,
+
+    #[serde(with = "recovered_keys")]
+    pub(crate) derived_partials: BTreeMap<DealingIndex, RecoveredVerificationKeys>,
+
+    pub(crate) rejected_dealers: HashMap<Addr, DealerRejectionReason>,
+
+    pub(crate) proposal_id: Option<u64>,
+
+    pub(crate) completed: Option<Result<(), DerivationFailure>>,
+}
+
+impl KeyDerivationState {
+    pub fn derived_partials_for(&self, receiver_index: ReceiverIndex) -> Option<Vec<G2Projective>> {
+        let mut recovered = Vec::new();
+        for keys in self.derived_partials.values() {
+            // SAFETY:
+            // make sure the receiver index of this receiver/dealer is within the size of the derived keys
+            if keys.recovered_partials.len() <= receiver_index {
+                return None;
+            };
+            recovered.push(keys.recovered_partials[receiver_index])
+        }
+        Some(recovered)
+    }
+
+    pub fn completed_with_success(&self) -> bool {
+        matches!(self.completed, Some(Ok(_)))
+    }
+
+    pub fn completion_failure(&self) -> Option<DerivationFailure> {
+        self.completed.clone().and_then(Result::err)
+    }
+}
diff --git a/nym-api/src/coconut/dkg/state/key_finalization.rs b/nym-api/src/coconut/dkg/state/key_finalization.rs
new file mode 100644
index 0000000000..ec7b74d7a3
--- /dev/null
+++ b/nym-api/src/coconut/dkg/state/key_finalization.rs
@@ -0,0 +1,17 @@
+// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: GPL-3.0-only
+
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Copy, Default, Serialize, Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub struct FinalizationState {
+    pub(crate) completed: bool,
+}
+
+impl FinalizationState {
+    /// Specifies whether this (or another) dealer has already executed its verification proposal
+    pub fn completed(&self) -> bool {
+        self.completed
+    }
+}
diff --git a/nym-api/src/coconut/dkg/state/key_validation.rs b/nym-api/src/coconut/dkg/state/key_validation.rs
new file mode 100644
index 0000000000..828e40a480
--- /dev/null
+++ b/nym-api/src/coconut/dkg/state/key_validation.rs
@@ -0,0 +1,22 @@
+// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: GPL-3.0-only
+
+use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
+
+type ProposalId = u64;
+
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub struct ValidationState {
+    pub votes: HashMap<ProposalId, bool>,
+
+    pub completed: bool,
+}
+
+impl ValidationState {
+    /// Specifies whether this dealer has already registered in the particular DKG epoch
+    pub fn completed(&self) -> bool {
+        self.completed
+    }
+}
diff --git a/nym-api/src/coconut/dkg/state/mod.rs b/nym-api/src/coconut/dkg/state/mod.rs
new file mode 100644
index 0000000000..5ef0fae275
--- /dev/null
+++ b/nym-api/src/coconut/dkg/state/mod.rs
@@ -0,0 +1,383 @@
+// Copyright 2022-2024 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: GPL-3.0-only
+
+use crate::coconut::dkg::state::dealing_exchange::DealingExchangeState;
+use crate::coconut::dkg::state::in_progress::InProgressState;
+use crate::coconut::dkg::state::key_derivation::KeyDerivationState;
+use crate::coconut::dkg::state::key_finalization::FinalizationState;
+use crate::coconut::dkg::state::key_validation::ValidationState;
+use crate::coconut::dkg::state::registration::{
+    DkgParticipant, ParticipantState, RegistrationState,
+};
+use crate::coconut::error::CoconutError;
+use crate::coconut::keys::{KeyPair as CoconutKeyPair, KeyPairWithEpoch};
+use cosmwasm_std::Addr;
+use log::debug;
+use nym_coconut_dkg_common::dealer::DealerDetails;
+use nym_coconut_dkg_common::types::EpochId;
+use nym_crypto::asymmetric::identity;
+use nym_dkg::bte::keys::KeyPair as DkgKeyPair;
+use nym_dkg::{bte, NodeIndex, Threshold};
+use serde::{Deserialize, Serialize};
+use std::collections::{BTreeMap, HashMap};
+use std::path::{Path, PathBuf};
+use time::OffsetDateTime;
+use url::Url;
+
+pub(crate) mod dealing_exchange;
+pub(crate) mod in_progress;
+pub(crate) mod key_derivation;
+pub(crate) mod key_finalization;
+pub(crate) mod key_validation;
+pub(crate) mod registration;
+pub(crate) mod serde_helpers;
+
+#[derive(Deserialize, Serialize)]
+pub(crate) struct PersistentState {
+    timestamp: OffsetDateTime,
+
+    dkg_instances: HashMap<EpochId, DkgState>,
+}
+
+impl Default for PersistentState {
+    fn default() -> Self {
+        PersistentState {
+            timestamp: OffsetDateTime::now_utc(),
+
+            dkg_instances: Default::default(),
+        }
+    }
+}
+
+impl From<&State> for PersistentState {
+    fn from(s: &State) -> Self {
+        PersistentState {
+            timestamp: OffsetDateTime::now_utc(),
+
+            dkg_instances: s.dkg_instances.clone(),
+        }
+    }
+}
+
+impl PersistentState {
+    pub fn save_to_file<P: AsRef<Path>>(&self, path: P) -> Result<(), CoconutError> {
+        debug!("persisting the dkg state");
+        std::fs::write(path, serde_json::to_string(self)?)?;
+        Ok(())
+    }
+
+    pub fn load_from_file<P: AsRef<Path>>(path: P) -> Result<Self, CoconutError> {
+        Ok(serde_json::from_str(&std::fs::read_to_string(path)?)?)
+    }
+}
+
+#[derive(Debug, Default, Clone, Serialize, Deserialize)]
+pub(crate) struct DkgState {
+    pub(crate) registration: RegistrationState,
+
+    pub(crate) dealing_exchange: DealingExchangeState,
+
+    pub(crate) key_generation: KeyDerivationState,
+
+    pub(crate) key_validation: ValidationState,
+
+    pub(crate) key_finalization: FinalizationState,
+
+    pub(crate) in_progress: InProgressState,
+}
+
+impl DkgState {
+    pub(crate) fn set_dealers(&mut self, raw_dealers: Vec<DealerDetails>) {
+        assert!(self.dealing_exchange.dealers.is_empty());
+        for raw_dealer in raw_dealers {
+            let dkg_participant = DkgParticipant::from(raw_dealer);
+            let address = &dkg_participant.address;
+            if let ParticipantState::Invalid(rejection) = &dkg_participant.state {
+                warn!("{address} dealer is malformed: {rejection}",)
+            }
+            self.dealing_exchange
+                .dealers
+                .insert(dkg_participant.assigned_index, dkg_participant);
+        }
+    }
+}
+
+pub(crate) struct State {
+    /// Path to the file containing the persistent state
+    persistent_state_path: PathBuf,
+
+    dkg_instances: HashMap<EpochId, DkgState>,
+
+    announce_address: Url,
+
+    identity_key: identity::PublicKey,
+
+    dkg_keypair: DkgKeyPair,
+
+    coconut_keypair: CoconutKeyPair,
+}
+
+impl State {
+    pub fn new(
+        persistent_state_path: PathBuf,
+        persistent_state: PersistentState,
+        announce_address: Url,
+        dkg_keypair: DkgKeyPair,
+        identity_key: identity::PublicKey,
+        coconut_keypair: CoconutKeyPair,
+    ) -> Self {
+        State {
+            persistent_state_path,
+            dkg_instances: persistent_state.dkg_instances,
+            announce_address,
+            identity_key,
+            dkg_keypair,
+            coconut_keypair,
+        }
+    }
+
+    pub fn persist(&self) -> Result<(), CoconutError> {
+        PersistentState::from(self).save_to_file(self.persistent_state_path())
+    }
+
+    pub fn clear_previous_epoch(&mut self, current_epoch: EpochId) {
+        if let Some(previous) = current_epoch.checked_sub(1) {
+            self.dkg_instances.remove(&previous);
+        }
+    }
+
+    pub fn maybe_init_dkg_state(&mut self, epoch_id: EpochId) {
+        // given we're not using that entry here, I think the explicit check and insert is more readable
+        #[allow(clippy::map_entry)]
+        if !self.dkg_instances.contains_key(&epoch_id) {
+            self.dkg_instances.insert(epoch_id, Default::default());
+        }
+    }
+
+    /// Obtain the list of dealers for the provided epoch that have submitted valid public keys.
+    pub fn valid_epoch_receivers(
+        &self,
+        epoch_id: EpochId,
+    ) -> Result<Vec<(Addr, NodeIndex)>, CoconutError> {
+        Ok(self
+            .dealing_exchange_state(epoch_id)?
+            .dealers
+            .values()
+            .filter_map(|d| {
+                if d.state.is_valid() {
+                    Some((d.address.clone(), d.assigned_index))
+                } else {
+                    None
+                }
+            })
+            .collect())
+    }
+
+    /// Filters out DKG participants based on whether they submitted valid public key
+    pub fn valid_epoch_receivers_keys(
+        &self,
+        epoch_id: EpochId,
+    ) -> Result<BTreeMap<NodeIndex, bte::PublicKey>, CoconutError> {
+        Ok(self
+            .dealing_exchange_state(epoch_id)?
+            .dealers
+            .values()
+            .filter_map(|d| d.state.public_key().map(|k| (d.assigned_index, k)))
+            .collect())
+    }
+
+    pub fn dkg_state(&self, epoch_id: EpochId) -> Result<&DkgState, CoconutError> {
+        self.dkg_instances
+            .get(&epoch_id)
+            .ok_or(CoconutError::MissingDkgState { epoch_id })
+    }
+
+    pub fn dkg_state_mut(&mut self, epoch_id: EpochId) -> Result<&mut DkgState, CoconutError> {
+        self.dkg_instances
+            .get_mut(&epoch_id)
+            .ok_or(CoconutError::MissingDkgState { epoch_id })
+    }
+
+    pub fn registration_state(
+        &self,
+        epoch_id: EpochId,
+    ) -> Result<&RegistrationState, CoconutError> {
+        self.dkg_instances
+            .get(&epoch_id)
+            .map(|state| &state.registration)
+            .ok_or(CoconutError::MissingDkgState { epoch_id })
+    }
+
+    pub fn registration_state_mut(
+        &mut self,
+        epoch_id: EpochId,
+    ) -> Result<&mut RegistrationState, CoconutError> {
+        self.dkg_instances
+            .get_mut(&epoch_id)
+            .map(|state| &mut state.registration)
+            .ok_or(CoconutError::MissingDkgState { epoch_id })
+    }
+
+    pub fn in_progress_state(&self, epoch_id: EpochId) -> Result<&InProgressState, CoconutError> {
+        self.dkg_instances
+            .get(&epoch_id)
+            .map(|state| &state.in_progress)
+            .ok_or(CoconutError::MissingDkgState { epoch_id })
+    }
+
+    pub fn in_progress_state_mut(
+        &mut self,
+        epoch_id: EpochId,
+    ) -> Result<&mut InProgressState, CoconutError> {
+        self.dkg_instances
+            .get_mut(&epoch_id)
+            .map(|state| &mut state.in_progress)
+            .ok_or(CoconutError::MissingDkgState { epoch_id })
+    }
+
+    pub fn dealing_exchange_state(
+        &self,
+        epoch_id: EpochId,
+    ) -> Result<&DealingExchangeState, CoconutError> {
+        self.dkg_instances
+            .get(&epoch_id)
+            .map(|state| &state.dealing_exchange)
+            .ok_or(CoconutError::MissingDkgState { epoch_id })
+    }
+
+    pub fn dealing_exchange_state_mut(
+        &mut self,
+        epoch_id: EpochId,
+    ) -> Result<&mut DealingExchangeState, CoconutError> {
+        self.dkg_instances
+            .get_mut(&epoch_id)
+            .map(|state| &mut state.dealing_exchange)
+            .ok_or(CoconutError::MissingDkgState { epoch_id })
+    }
+
+    pub fn key_derivation_state(
+        &self,
+        epoch_id: EpochId,
+    ) -> Result<&KeyDerivationState, CoconutError> {
+        self.dkg_instances
+            .get(&epoch_id)
+            .map(|state| &state.key_generation)
+            .ok_or(CoconutError::MissingDkgState { epoch_id })
+    }
+
+    pub fn key_derivation_state_mut(
+        &mut self,
+        epoch_id: EpochId,
+    ) -> Result<&mut KeyDerivationState, CoconutError> {
+        self.dkg_instances
+            .get_mut(&epoch_id)
+            .map(|state| &mut state.key_generation)
+            .ok_or(CoconutError::MissingDkgState { epoch_id })
+    }
+
+    pub fn key_validation_state(
+        &self,
+        epoch_id: EpochId,
+    ) -> Result<&ValidationState, CoconutError> {
+        self.dkg_instances
+            .get(&epoch_id)
+            .map(|state| &state.key_validation)
+            .ok_or(CoconutError::MissingDkgState { epoch_id })
+    }
+
+    pub fn key_validation_state_mut(
+        &mut self,
+        epoch_id: EpochId,
+    ) -> Result<&mut ValidationState, CoconutError> {
+        self.dkg_instances
+            .get_mut(&epoch_id)
+            .map(|state| &mut state.key_validation)
+            .ok_or(CoconutError::MissingDkgState { epoch_id })
+    }
+
+    pub fn key_finalization_state(
+        &self,
+        epoch_id: EpochId,
+    ) -> Result<&FinalizationState, CoconutError> {
+        self.dkg_instances
+            .get(&epoch_id)
+            .map(|state| &state.key_finalization)
+            .ok_or(CoconutError::MissingDkgState { epoch_id })
+    }
+
+    pub fn key_finalization_state_mut(
+        &mut self,
+        epoch_id: EpochId,
+    ) -> Result<&mut FinalizationState, CoconutError> {
+        self.dkg_instances
+            .get_mut(&epoch_id)
+            .map(|state| &mut state.key_finalization)
+            .ok_or(CoconutError::MissingDkgState { epoch_id })
+    }
+
+    pub fn threshold(&self, epoch_id: EpochId) -> Result<Threshold, CoconutError> {
+        self.key_derivation_state(epoch_id)?
+            .expected_threshold
+            .ok_or(CoconutError::UnavailableThreshold { epoch_id })
+    }
+
+    pub fn assigned_index(&self, epoch_id: EpochId) -> Result<NodeIndex, CoconutError> {
+        self.registration_state(epoch_id)?
+            .assigned_index
+            .ok_or(CoconutError::UnavailableAssignedIndex { epoch_id })
+    }
+
+    pub fn receiver_index(&self, epoch_id: EpochId) -> Result<usize, CoconutError> {
+        self.dealing_exchange_state(epoch_id)?
+            .receiver_index
+            .ok_or(CoconutError::UnavailableReceiverIndex { epoch_id })
+    }
+
+    pub fn proposal_id(&self, epoch_id: EpochId) -> Result<u64, CoconutError> {
+        self.key_derivation_state(epoch_id)?
+            .proposal_id
+            .ok_or(CoconutError::UnavailableProposalId { epoch_id })
+    }
+
+    pub fn persistent_state_path(&self) -> &Path {
+        self.persistent_state_path.as_path()
+    }
+
+    pub fn announce_address(&self) -> &Url {
+        &self.announce_address
+    }
+
+    pub fn identity_key(&self) -> identity::PublicKey {
+        self.identity_key
+    }
+
+    pub fn dkg_keypair(&self) -> &DkgKeyPair {
+        &self.dkg_keypair
+    }
+
+    pub async fn coconut_keypair_is_some(&self) -> bool {
+        self.coconut_keypair.read_keys().await.is_some()
+    }
+
+    pub async fn take_coconut_keypair(&self) -> Option<KeyPairWithEpoch> {
+        self.coconut_keypair.take().await
+    }
+
+    pub fn invalidate_coconut_keypair(&self) {
+        self.coconut_keypair.invalidate()
+    }
+
+    pub fn validate_coconut_keypair(&self) {
+        self.coconut_keypair.validate()
+    }
+
+    pub async fn unchecked_coconut_keypair(
+        &self,
+    ) -> tokio::sync::RwLockReadGuard<'_, Option<KeyPairWithEpoch>> {
+        self.coconut_keypair.read_keys().await
+    }
+
+    pub async fn set_coconut_keypair(&mut self, coconut_keypair: KeyPairWithEpoch) {
+        self.coconut_keypair.set(coconut_keypair).await
+    }
+}
diff --git a/nym-api/src/coconut/dkg/state/registration.rs b/nym-api/src/coconut/dkg/state/registration.rs
new file mode 100644
index 0000000000..8391cebeed
--- /dev/null
+++ b/nym-api/src/coconut/dkg/state/registration.rs
@@ -0,0 +1,120 @@
+// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: GPL-3.0-only
+
+use crate::coconut::dkg::state::serde_helpers::bte_pk_serde;
+use cosmwasm_std::Addr;
+use nym_coconut_dkg_common::dealer::DealerDetails;
+use nym_coconut_dkg_common::types::EncodedBTEPublicKeyWithProof;
+use nym_dkg::bte::PublicKeyWithProof;
+use nym_dkg::{bte, NodeIndex};
+use serde::{Deserialize, Serialize};
+use thiserror::Error;
+
+#[derive(Clone, Deserialize, Debug, Serialize)]
+pub(crate) enum ParticipantState {
+    Invalid(KeyRejectionReason),
+    VerifiedKey(#[serde(with = "bte_pk_serde")] Box<PublicKeyWithProof>),
+}
+
+impl ParticipantState {
+    pub fn is_valid(&self) -> bool {
+        matches!(self, ParticipantState::VerifiedKey(..))
+    }
+
+    pub fn public_key(&self) -> Option<bte::PublicKey> {
+        match self {
+            ParticipantState::Invalid(_) => None,
+            ParticipantState::VerifiedKey(key_with_proof) => Some(*key_with_proof.public_key()),
+        }
+    }
+
+    fn from_raw_encoded_key(raw: EncodedBTEPublicKeyWithProof) -> Self {
+        let bytes = match bs58::decode(raw).into_vec() {
+            Ok(bytes) => bytes,
+            Err(err) => {
+                return ParticipantState::Invalid(
+                    KeyRejectionReason::MalformedBTEPublicKeyEncoding {
+                        err_msg: err.to_string(),
+                    },
+                );
+            }
+        };
+
+        let key = match PublicKeyWithProof::try_from_bytes(&bytes) {
+            Ok(key) => key,
+            Err(err) => {
+                return ParticipantState::Invalid(KeyRejectionReason::MalformedBTEPublicKey {
+                    err_msg: err.to_string(),
+                });
+            }
+        };
+
+        if !key.verify() {
+            return ParticipantState::Invalid(KeyRejectionReason::InvalidBTEPublicKey);
+        }
+
+        ParticipantState::VerifiedKey(Box::new(key))
+    }
+}
+
+// note: each dealer is also a receiver which simplifies some logic significantly
+#[derive(Clone, Deserialize, Debug, Serialize)]
+pub(crate) struct DkgParticipant {
+    pub(crate) address: Addr,
+    pub(crate) assigned_index: NodeIndex,
+    pub(crate) state: ParticipantState,
+}
+
+impl From<DealerDetails> for DkgParticipant {
+    fn from(dealer: DealerDetails) -> Self {
+        DkgParticipant {
+            address: dealer.address,
+            state: ParticipantState::from_raw_encoded_key(dealer.bte_public_key_with_proof),
+            assigned_index: dealer.assigned_index,
+        }
+    }
+}
+
+impl DkgParticipant {
+    #[cfg(test)]
+    pub(crate) fn unwrap_key(&self) -> PublicKeyWithProof {
+        if let ParticipantState::VerifiedKey(key) = &self.state {
+            return *key.clone();
+        }
+        panic!("no key")
+    }
+
+    #[cfg(test)]
+    pub fn unwrap_rejection(&self) -> KeyRejectionReason {
+        if let ParticipantState::Invalid(rejection) = &self.state {
+            return rejection.clone();
+        }
+        panic!("not rejected")
+    }
+}
+
+#[derive(Clone, Error, Debug, Deserialize, Eq, PartialEq, Serialize)]
+#[serde(rename_all = "lowercase")]
+pub(crate) enum KeyRejectionReason {
+    #[error("provided BTE Public key encoding is malformed: {err_msg}")]
+    MalformedBTEPublicKeyEncoding { err_msg: String },
+
+    #[error("provided BTE Public key has invalid byte representation: {err_msg}")]
+    MalformedBTEPublicKey { err_msg: String },
+
+    #[error("provided BTE public key does not verify correctly")]
+    InvalidBTEPublicKey,
+}
+
+#[derive(Debug, Clone, Copy, Default, Serialize, Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub struct RegistrationState {
+    pub(crate) assigned_index: Option<NodeIndex>,
+}
+
+impl RegistrationState {
+    /// Specifies whether this dealer has already registered in the particular DKG epoch
+    pub fn completed(&self) -> bool {
+        self.assigned_index.is_some()
+    }
+}
diff --git a/nym-api/src/coconut/dkg/state/serde_helpers.rs b/nym-api/src/coconut/dkg/state/serde_helpers.rs
new file mode 100644
index 0000000000..8057ef5d20
--- /dev/null
+++ b/nym-api/src/coconut/dkg/state/serde_helpers.rs
@@ -0,0 +1,96 @@
+// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: GPL-3.0-only
+
+pub(super) mod bte_pk_serde {
+    use nym_dkg::bte::PublicKeyWithProof;
+    use serde::de::Error;
+    use serde::{Deserialize, Deserializer, Serialize, Serializer};
+
+    pub fn serialize<S: Serializer>(
+        val: &PublicKeyWithProof,
+        serializer: S,
+    ) -> Result<S::Ok, S::Error> {
+        val.to_bytes().serialize(serializer)
+    }
+
+    pub fn deserialize<'de, D>(deserializer: D) -> Result<Box<PublicKeyWithProof>, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let vec: Vec<u8> = Deserialize::deserialize(deserializer)?;
+        PublicKeyWithProof::try_from_bytes(&vec)
+            .map_err(|err| Error::custom(format_args!("{:?}", err)))
+            .map(Box::new)
+    }
+}
+
+pub(super) mod recovered_keys {
+    use nym_coconut_dkg_common::types::DealingIndex;
+    use nym_dkg::RecoveredVerificationKeys;
+    use serde::de::Error;
+    use serde::{Deserialize, Deserializer, Serialize, Serializer};
+    use std::collections::BTreeMap;
+
+    type Helper = BTreeMap<DealingIndex, Vec<u8>>;
+
+    pub fn serialize<S: Serializer>(
+        val: &BTreeMap<DealingIndex, RecoveredVerificationKeys>,
+        serializer: S,
+    ) -> Result<S::Ok, S::Error> {
+        let helper: Helper = val
+            .iter()
+            .map(|(idx, rec)| (*idx, rec.to_bytes()))
+            .collect();
+        helper.serialize(serializer)
+    }
+
+    pub fn deserialize<'de, D>(
+        deserializer: D,
+    ) -> Result<BTreeMap<DealingIndex, RecoveredVerificationKeys>, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let helper = Helper::deserialize(deserializer)?;
+        helper
+            .into_iter()
+            .map(|(idx, rec)| {
+                RecoveredVerificationKeys::try_from_bytes(&rec)
+                    .map_err(|err| D::Error::custom(format_args!("{:?}", err)))
+                    .map(|vk| (idx, vk))
+            })
+            .collect()
+    }
+}
+
+pub(super) mod generated_dealings {
+    use nym_coconut_dkg_common::types::DealingIndex;
+    use nym_dkg::Dealing;
+    use serde::{Deserialize, Deserializer, Serialize, Serializer};
+    use std::collections::HashMap;
+
+    pub fn serialize<S: Serializer>(
+        dealings: &HashMap<DealingIndex, Dealing>,
+        serializer: S,
+    ) -> Result<S::Ok, S::Error> {
+        let mut helper = HashMap::new();
+
+        for (dealing_index, dealing) in dealings {
+            helper.insert(*dealing_index, dealing.to_bytes());
+        }
+
+        helper.serialize(serializer)
+    }
+
+    pub fn deserialize<'de, D: Deserializer<'de>>(
+        deserializer: D,
+    ) -> Result<HashMap<DealingIndex, Dealing>, D::Error> {
+        <HashMap<DealingIndex, Vec<u8>>>::deserialize(deserializer)?
+            .into_iter()
+            .map(|(index, raw_dealing)| {
+                Dealing::try_from_bytes(&raw_dealing)
+                    .map_err(serde::de::Error::custom)
+                    .map(|dealing| (index, dealing))
+            })
+            .collect()
+    }
+}
diff --git a/nym-api/src/coconut/dkg/verification_key.rs b/nym-api/src/coconut/dkg/verification_key.rs
deleted file mode 100644
index 78e490af73..0000000000
--- a/nym-api/src/coconut/dkg/verification_key.rs
+++ /dev/null
@@ -1,1142 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: GPL-3.0-only
-
-use crate::coconut::dkg::client::DkgClient;
-use crate::coconut::dkg::complaints::ComplaintReason;
-use crate::coconut::dkg::state::{ConsistentState, State};
-use crate::coconut::error::CoconutError;
-use crate::coconut::helpers::accepted_vote_err;
-use crate::coconut::state::BANDWIDTH_CREDENTIAL_PARAMS;
-use cosmwasm_std::Addr;
-use cw3::{ProposalResponse, Status};
-use log::debug;
-use nym_coconut::tests::helpers::transpose_matrix;
-use nym_coconut::{check_vk_pairing, Base58, KeyPair, SecretKey, VerificationKey};
-use nym_coconut_dkg_common::event_attributes::DKG_PROPOSAL_ID;
-use nym_coconut_dkg_common::types::{NodeIndex, TOTAL_DEALINGS};
-use nym_coconut_dkg_common::verification_key::owner_from_cosmos_msgs;
-use nym_coconut_interface::KeyPair as CoconutKeyPair;
-use nym_dkg::bte::{decrypt_share, setup};
-use nym_dkg::error::DkgError;
-use nym_dkg::{combine_shares, try_recover_verification_keys, Dealing, Threshold};
-use nym_pemstore::KeyPairPath;
-use nym_validator_client::nyxd::cosmwasm_client::logs::find_attribute;
-use std::collections::BTreeMap;
-
-// Filter the dealers based on what dealing they posted (or not) in the contract
-async fn deterministic_filter_dealers(
-    dkg_client: &DkgClient,
-    state: &mut State,
-    threshold: Threshold,
-    resharing: bool,
-) -> Result<Vec<BTreeMap<NodeIndex, (Addr, Dealing)>>, CoconutError> {
-    let mut dealings_maps = vec![];
-    let initial_dealers_by_addr = state.current_dealers_by_addr();
-    let initial_receivers = state.current_dealers_by_idx();
-    let initial_resharing_dealers = if resharing {
-        dkg_client
-            .get_initial_dealers()
-            .await?
-            .map(|d| d.initial_dealers)
-            .unwrap_or_default()
-    } else {
-        vec![]
-    };
-
-    let params = setup();
-
-    for idx in 0..TOTAL_DEALINGS {
-        let dealings = dkg_client.get_dealings(idx).await?;
-        let dealings_map =
-            BTreeMap::from_iter(dealings.into_iter().filter_map(|contract_dealing| {
-                match Dealing::try_from(&contract_dealing.dealing) {
-                    Ok(dealing) => {
-                        if dealing
-                            .verify(&params, threshold, &initial_receivers, None)
-                            .is_err()
-                        {
-                            state.mark_bad_dealer(
-                                &contract_dealing.dealer,
-                                ComplaintReason::DealingVerificationError,
-                            );
-                            None
-                        } else if let Some(idx) =
-                            initial_dealers_by_addr.get(&contract_dealing.dealer)
-                        {
-                            Some((*idx, (contract_dealing.dealer, dealing)))
-                        } else {
-                            None
-                        }
-                    }
-                    Err(_) => {
-                        state.mark_bad_dealer(
-                            &contract_dealing.dealer,
-                            ComplaintReason::MalformedDealing,
-                        );
-                        None
-                    }
-                }
-            }));
-        dealings_maps.push(dealings_map);
-    }
-
-    for (addr, _) in initial_dealers_by_addr.iter() {
-        // in resharing mode, we don't commit dealings from dealers outside the initial set
-        if !resharing || initial_resharing_dealers.contains(addr) {
-            for dealings_map in dealings_maps.iter() {
-                if !dealings_map.iter().any(|(_, (address, _))| address == addr) {
-                    state.mark_bad_dealer(addr, ComplaintReason::MissingDealing);
-                    break;
-                }
-            }
-        }
-    }
-
-    Ok(dealings_maps)
-}
-
-fn derive_partial_keypair(
-    state: &mut State,
-    threshold: Threshold,
-    dealings_maps: Vec<BTreeMap<NodeIndex, (Addr, Dealing)>>,
-) -> Result<KeyPair, CoconutError> {
-    let filtered_receivers_by_idx = state.current_dealers_by_idx();
-    let filtered_dealers_by_addr = state.current_dealers_by_addr();
-    let dk = state.dkg_keypair().private_key();
-    let node_index_value = state.receiver_index_value()?;
-    let mut scalars = vec![];
-    let mut recovered_vks = vec![];
-    for dealings_map in dealings_maps.into_iter() {
-        let (filtered_dealers, filtered_dealings): (Vec<_>, Vec<_>) = dealings_map
-            .into_iter()
-            .filter_map(|(idx, (addr, dealing))| {
-                if filtered_dealers_by_addr.keys().any(|a| addr == *a) {
-                    Some((idx, dealing))
-                } else {
-                    None
-                }
-            })
-            .unzip();
-        debug!(
-            "Recovering verification keys from dealings of dealers {:?} with receivers {:?}",
-            filtered_dealers,
-            filtered_receivers_by_idx.keys().collect::<Vec<_>>()
-        );
-        let recovered = try_recover_verification_keys(
-            &filtered_dealings,
-            threshold,
-            &filtered_receivers_by_idx,
-        )?;
-        recovered_vks.push(recovered);
-
-        debug!("Decrypting shares");
-        let shares = filtered_dealings
-            .iter()
-            .map(|dealing| decrypt_share(dk, node_index_value, &dealing.ciphertexts, None))
-            .collect::<Result<_, _>>()?;
-        debug!("Combining shares into one secret");
-        let scalar = combine_shares(shares, &filtered_dealers)?;
-        scalars.push(scalar);
-    }
-    state.set_recovered_vks(recovered_vks);
-
-    let x = scalars.pop().ok_or(CoconutError::DkgError(
-        DkgError::NotEnoughDealingsAvailable {
-            available: 0,
-            required: 1,
-        },
-    ))?;
-    let sk = SecretKey::create_from_raw(x, scalars);
-    let vk = sk.verification_key(&BANDWIDTH_CREDENTIAL_PARAMS);
-
-    Ok(CoconutKeyPair::from_keys(sk, vk))
-}
-
-pub(crate) async fn verification_key_submission(
-    dkg_client: &DkgClient,
-    state: &mut State,
-    keypair_path: &KeyPairPath,
-    resharing: bool,
-) -> Result<(), CoconutError> {
-    if state.coconut_keypair_is_some().await {
-        debug!("Coconut keypair was set previously, nothing to do");
-        return Ok(());
-    }
-
-    let threshold = state.threshold()?;
-    let dealings_maps =
-        deterministic_filter_dealers(dkg_client, state, threshold, resharing).await?;
-    debug!(
-        "Filtered dealers to {:?}",
-        dealings_maps[0].keys().collect::<Vec<_>>()
-    );
-    let coconut_keypair = derive_partial_keypair(state, threshold, dealings_maps)?;
-    debug!("Derived own coconut keypair");
-    let vk_share = coconut_keypair.verification_key().to_bs58();
-    nym_pemstore::store_keypair(&coconut_keypair, keypair_path)?;
-    let res = dkg_client
-        .submit_verification_key_share(vk_share, resharing)
-        .await?;
-    let proposal_id = find_attribute(&res.logs, "wasm", DKG_PROPOSAL_ID)
-        .ok_or(CoconutError::ProposalIdError {
-            reason: String::from("proposal id not found"),
-        })?
-        .value
-        .parse::<u64>()
-        .map_err(|_| CoconutError::ProposalIdError {
-            reason: String::from("proposal id could not be parsed to u64"),
-        })?;
-    debug!(
-        "Submitted own verification key share, proposal id {} is attached to it",
-        proposal_id
-    );
-    state.set_proposal_id(proposal_id);
-    state.set_coconut_keypair(Some(coconut_keypair)).await;
-    info!("DKG: Submitted own verification key");
-
-    Ok(())
-}
-
-fn validate_proposal(proposal: &ProposalResponse) -> Option<(Addr, u64)> {
-    if proposal.status == Status::Open {
-        if let Some(owner) = owner_from_cosmos_msgs(&proposal.msgs) {
-            return Some((owner, proposal.id));
-        }
-    }
-    None
-}
-
-pub(crate) async fn verification_key_validation(
-    dkg_client: &DkgClient,
-    state: &mut State,
-    _resharing: bool,
-) -> Result<(), CoconutError> {
-    if state.voted_vks() {
-        debug!("Already voted on the verification keys, nothing to do");
-        return Ok(());
-    }
-
-    let epoch_id = dkg_client.get_current_epoch().await?.epoch_id;
-    let vk_shares = dkg_client.get_verification_key_shares(epoch_id).await?;
-    let proposal_ids = BTreeMap::from_iter(
-        dkg_client
-            .list_proposals()
-            .await?
-            .iter()
-            .filter_map(validate_proposal),
-    );
-    let filtered_receivers_by_idx: Vec<_> =
-        state.current_dealers_by_idx().keys().copied().collect();
-    let recovered_partials: Vec<_> = state
-        .recovered_vks()
-        .iter()
-        .map(|recovered_vk| recovered_vk.recovered_partials.clone())
-        .collect();
-    let recovered_partials = transpose_matrix(recovered_partials);
-    let params = &BANDWIDTH_CREDENTIAL_PARAMS;
-    for contract_share in vk_shares {
-        if let Some(proposal_id) = proposal_ids.get(&contract_share.owner).copied() {
-            match VerificationKey::try_from_bs58(contract_share.share) {
-                Ok(vk) => {
-                    if let Some(idx) = filtered_receivers_by_idx
-                        .iter()
-                        .position(|node_index| contract_share.node_index == *node_index)
-                    {
-                        let ret = if !check_vk_pairing(params, &recovered_partials[idx], &vk) {
-                            debug!(
-                                "Voting NO to proposal {} because of failed VK pairing",
-                                proposal_id
-                            );
-                            dkg_client
-                                .vote_verification_key_share(proposal_id, false)
-                                .await
-                        } else {
-                            debug!("Voting YES to proposal {}", proposal_id);
-                            dkg_client
-                                .vote_verification_key_share(proposal_id, true)
-                                .await
-                        };
-                        accepted_vote_err(ret)?;
-                    }
-                }
-                Err(_) => {
-                    debug!(
-                        "Voting NO to proposal {} because of failed base 58 deserialization",
-                        proposal_id
-                    );
-                    let ret = dkg_client
-                        .vote_verification_key_share(proposal_id, false)
-                        .await;
-                    accepted_vote_err(ret)?;
-                }
-            }
-        }
-    }
-    state.set_voted_vks();
-    info!("DKG: Validated the other verification keys");
-    Ok(())
-}
-
-pub(crate) async fn verification_key_finalization(
-    dkg_client: &DkgClient,
-    state: &mut State,
-    _resharing: bool,
-) -> Result<(), CoconutError> {
-    if state.executed_proposal() {
-        debug!("Already executed the proposal, nothing to do");
-        return Ok(());
-    }
-
-    let proposal_id = state.proposal_id_value()?;
-    dkg_client
-        .execute_verification_key_share(proposal_id)
-        .await?;
-    state.set_executed_proposal();
-    info!("DKG: Finalized own verification key on chain");
-
-    Ok(())
-}
-
-#[cfg(test)]
-pub(crate) mod tests {
-    use super::*;
-    use crate::coconut::dkg::dealing::dealing_exchange;
-    use crate::coconut::dkg::public_key::public_key_submission;
-    use crate::coconut::dkg::state::PersistentState;
-    use crate::coconut::tests::DummyClient;
-    use crate::coconut::KeyPair;
-    use nym_coconut::aggregate_verification_keys;
-    use nym_coconut_dkg_common::dealer::DealerDetails;
-    use nym_coconut_dkg_common::types::InitialReplacementData;
-    use nym_coconut_dkg_common::verification_key::ContractVKShare;
-    use nym_contracts_common::dealings::ContractSafeBytes;
-    use nym_dkg::bte::keys::KeyPair as DkgKeyPair;
-    use nym_validator_client::nyxd::AccountId;
-    use rand::rngs::OsRng;
-    use rand::Rng;
-    use std::collections::HashMap;
-    use std::env::temp_dir;
-    use std::path::PathBuf;
-    use std::str::FromStr;
-    use std::sync::{Arc, RwLock};
-    use url::Url;
-
-    struct MockContractDb {
-        dealer_details_db: Arc<RwLock<HashMap<String, (DealerDetails, bool)>>>,
-        dealings_db: Arc<RwLock<HashMap<String, Vec<ContractSafeBytes>>>>,
-        proposal_db: Arc<RwLock<HashMap<u64, ProposalResponse>>>,
-        verification_share_db: Arc<RwLock<HashMap<String, ContractVKShare>>>,
-        threshold_db: Arc<RwLock<Option<Threshold>>>,
-        initial_dealers_db: Arc<RwLock<Option<InitialReplacementData>>>,
-    }
-
-    impl MockContractDb {
-        pub fn new() -> Self {
-            MockContractDb {
-                dealer_details_db: Arc::new(Default::default()),
-                dealings_db: Arc::new(Default::default()),
-                proposal_db: Arc::new(Default::default()),
-                verification_share_db: Arc::new(Default::default()),
-                threshold_db: Arc::new(RwLock::new(Some(2))),
-                initial_dealers_db: Arc::new(RwLock::new(Default::default())),
-            }
-        }
-    }
-
-    const TEST_VALIDATORS_ADDRESS: [&str; 4] = [
-        "n1aq9kakfgwqcufr23lsv644apavcntrsqsk4yus",
-        "n1s9l3xr4g0rglvk4yctktmck3h4eq0gp6z2e20v",
-        "n19kl4py32vsk297dm93ezem992cdyzdy4zuc2x6",
-        "n1jfrs6cmw9t7dv0x8cgny6geunzjh56n2s89fkv",
-    ];
-
-    async fn prepare_clients_and_states(db: &MockContractDb) -> Vec<(DkgClient, State)> {
-        let params = setup();
-        let mut clients_and_states = vec![];
-
-        for addr in TEST_VALIDATORS_ADDRESS {
-            let dkg_client = DkgClient::new(
-                DummyClient::new(AccountId::from_str(addr).unwrap())
-                    .with_dealer_details(&db.dealer_details_db)
-                    .with_dealings(&db.dealings_db)
-                    .with_proposal_db(&db.proposal_db)
-                    .with_verification_share(&db.verification_share_db)
-                    .with_threshold(&db.threshold_db)
-                    .with_initial_dealers_db(&db.initial_dealers_db),
-            );
-            let keypair = DkgKeyPair::new(&params, OsRng);
-            let state = State::new(
-                PathBuf::default(),
-                PersistentState::default(),
-                Url::parse("localhost:8000").unwrap(),
-                keypair,
-                KeyPair::new(),
-            );
-            clients_and_states.push((dkg_client, state));
-        }
-        for (dkg_client, state) in clients_and_states.iter_mut() {
-            public_key_submission(dkg_client, state, false)
-                .await
-                .unwrap();
-        }
-        clients_and_states
-    }
-
-    async fn prepare_clients_and_states_with_dealing(
-        db: &MockContractDb,
-    ) -> Vec<(DkgClient, State)> {
-        let mut clients_and_states = prepare_clients_and_states(db).await;
-        for (dkg_client, state) in clients_and_states.iter_mut() {
-            dealing_exchange(dkg_client, state, OsRng, false)
-                .await
-                .unwrap();
-        }
-        clients_and_states
-    }
-
-    async fn prepare_clients_and_states_with_submission(
-        db: &MockContractDb,
-    ) -> Vec<(DkgClient, State)> {
-        let mut clients_and_states = prepare_clients_and_states_with_dealing(db).await;
-        for (dkg_client, state) in clients_and_states.iter_mut() {
-            let random_file: usize = OsRng.gen();
-            let private_key_path = temp_dir().join(format!("private{}.pem", random_file));
-            let public_key_path = temp_dir().join(format!("public{}.pem", random_file));
-            let keypair_path = KeyPairPath::new(private_key_path.clone(), public_key_path.clone());
-            verification_key_submission(dkg_client, state, &keypair_path, false)
-                .await
-                .unwrap();
-            std::fs::remove_file(private_key_path).unwrap();
-            std::fs::remove_file(public_key_path).unwrap();
-        }
-        clients_and_states
-    }
-
-    async fn prepare_clients_and_states_with_validation(
-        db: &MockContractDb,
-    ) -> Vec<(DkgClient, State)> {
-        let mut clients_and_states = prepare_clients_and_states_with_submission(db).await;
-        for (dkg_client, state) in clients_and_states.iter_mut() {
-            verification_key_validation(dkg_client, state, false)
-                .await
-                .unwrap();
-        }
-        clients_and_states
-    }
-
-    async fn prepare_clients_and_states_with_finalization(
-        db: &MockContractDb,
-    ) -> Vec<(DkgClient, State)> {
-        let mut clients_and_states = prepare_clients_and_states_with_validation(db).await;
-        for (dkg_client, state) in clients_and_states.iter_mut() {
-            verification_key_finalization(dkg_client, state, false)
-                .await
-                .unwrap();
-        }
-        clients_and_states
-    }
-
-    #[tokio::test]
-    #[ignore] // expensive test
-    async fn check_dealers_filter_all_good() {
-        let db = MockContractDb::new();
-        let mut clients_and_states = prepare_clients_and_states_with_dealing(&db).await;
-        for (dkg_client, state) in clients_and_states.iter_mut() {
-            let filtered = deterministic_filter_dealers(dkg_client, state, 2, false)
-                .await
-                .unwrap();
-            assert_eq!(filtered.len(), TOTAL_DEALINGS);
-            for mapping in filtered.iter() {
-                assert_eq!(mapping.len(), 4);
-            }
-        }
-    }
-
-    #[tokio::test]
-    #[ignore] // expensive test
-    async fn check_dealers_filter_one_bad_dealing() {
-        let db = MockContractDb::new();
-        let mut clients_and_states = prepare_clients_and_states_with_dealing(&db).await;
-
-        // corrupt just one dealing
-        db.dealings_db
-            .write()
-            .unwrap()
-            .entry(TEST_VALIDATORS_ADDRESS[0].to_string())
-            .and_modify(|dealings| {
-                let mut last = dealings.pop().unwrap();
-                last.0.pop();
-                dealings.push(last);
-            });
-
-        for (dkg_client, state) in clients_and_states.iter_mut().skip(1) {
-            let filtered = deterministic_filter_dealers(dkg_client, state, 2, false)
-                .await
-                .unwrap();
-            assert_eq!(filtered.len(), TOTAL_DEALINGS);
-            let corrupted_status = state
-                .all_dealers()
-                .get(&Addr::unchecked(TEST_VALIDATORS_ADDRESS[0]))
-                .unwrap()
-                .as_ref()
-                .unwrap_err();
-            assert_eq!(*corrupted_status, ComplaintReason::MissingDealing);
-        }
-    }
-
-    #[tokio::test]
-    #[ignore] // expensive test
-    async fn check_dealers_resharing_filter_one_missing_dealing() {
-        let db = MockContractDb::new();
-        let mut clients_and_states = prepare_clients_and_states(&db).await;
-
-        // add all but the first dealing
-        for (dkg_client, state) in clients_and_states.iter_mut().skip(1) {
-            dealing_exchange(dkg_client, state, OsRng, true)
-                .await
-                .unwrap();
-        }
-
-        for (dkg_client, state) in clients_and_states.iter_mut().skip(1) {
-            *db.initial_dealers_db.write().unwrap() = Some(InitialReplacementData {
-                initial_dealers: vec![Addr::unchecked(TEST_VALIDATORS_ADDRESS[0])],
-                initial_height: 1,
-            });
-            let filtered = deterministic_filter_dealers(dkg_client, state, 2, true)
-                .await
-                .unwrap();
-            assert_eq!(filtered.len(), TOTAL_DEALINGS);
-            let corrupted_status = state
-                .all_dealers()
-                .get(&Addr::unchecked(TEST_VALIDATORS_ADDRESS[0]))
-                .unwrap()
-                .as_ref()
-                .unwrap_err();
-
-            assert_eq!(*corrupted_status, ComplaintReason::MissingDealing);
-        }
-    }
-
-    #[tokio::test]
-    #[ignore] // expensive test
-    async fn check_dealers_resharing_filter_one_noninitial_missing_dealing() {
-        let db = MockContractDb::new();
-        let mut clients_and_states = prepare_clients_and_states(&db).await;
-
-        // add all but the first dealing
-        for (dkg_client, state) in clients_and_states.iter_mut().skip(1) {
-            dealing_exchange(dkg_client, state, OsRng, true)
-                .await
-                .unwrap();
-        }
-
-        for (dkg_client, state) in clients_and_states.iter_mut().skip(1) {
-            *db.initial_dealers_db.write().unwrap() = Some(InitialReplacementData {
-                initial_dealers: vec![],
-                initial_height: 1,
-            });
-            let filtered = deterministic_filter_dealers(dkg_client, state, 2, true)
-                .await
-                .unwrap();
-            assert_eq!(filtered.len(), TOTAL_DEALINGS);
-            assert!(state
-                .all_dealers()
-                .get(&Addr::unchecked(TEST_VALIDATORS_ADDRESS[0]))
-                .unwrap()
-                .as_ref()
-                .is_ok(),);
-        }
-    }
-
-    #[tokio::test]
-    #[ignore] // expensive test
-    async fn check_dealers_filter_all_bad_dealings() {
-        let db = MockContractDb::new();
-        let mut clients_and_states = prepare_clients_and_states_with_dealing(&db).await;
-
-        // corrupt all dealings of one address
-        db.dealings_db
-            .write()
-            .unwrap()
-            .entry(TEST_VALIDATORS_ADDRESS[0].to_string())
-            .and_modify(|dealings| {
-                dealings.iter_mut().for_each(|dealing| {
-                    dealing.0.pop();
-                });
-            });
-
-        for (dkg_client, state) in clients_and_states.iter_mut().skip(1) {
-            let filtered = deterministic_filter_dealers(dkg_client, state, 2, false)
-                .await
-                .unwrap();
-            assert_eq!(filtered.len(), TOTAL_DEALINGS);
-            for mapping in filtered.iter() {
-                assert_eq!(mapping.len(), 3);
-            }
-            let corrupted_status = state
-                .all_dealers()
-                .get(&Addr::unchecked(TEST_VALIDATORS_ADDRESS[0]))
-                .unwrap()
-                .as_ref()
-                .unwrap_err();
-            assert_eq!(*corrupted_status, ComplaintReason::MissingDealing);
-        }
-    }
-
-    #[tokio::test]
-    #[ignore] // expensive test
-    async fn check_dealers_filter_malformed_dealing() {
-        let db = MockContractDb::new();
-        let mut clients_and_states = prepare_clients_and_states_with_dealing(&db).await;
-
-        // corrupt just one dealing
-        db.dealings_db
-            .write()
-            .unwrap()
-            .entry(TEST_VALIDATORS_ADDRESS[0].to_string())
-            .and_modify(|dealings| {
-                let mut last = dealings.pop().unwrap();
-                last.0.pop();
-                dealings.push(last);
-            });
-
-        for (dkg_client, state) in clients_and_states.iter_mut().skip(1) {
-            deterministic_filter_dealers(dkg_client, state, 2, false)
-                .await
-                .unwrap();
-            // second filter will leave behind the bad dealer and surface why it was left out
-            // in the first place
-            let filtered = deterministic_filter_dealers(dkg_client, state, 2, false)
-                .await
-                .unwrap();
-            assert_eq!(filtered.len(), TOTAL_DEALINGS);
-            let corrupted_status = state
-                .all_dealers()
-                .get(&Addr::unchecked(TEST_VALIDATORS_ADDRESS[0]))
-                .unwrap()
-                .as_ref()
-                .unwrap_err();
-            assert_eq!(*corrupted_status, ComplaintReason::MalformedDealing);
-        }
-    }
-
-    #[tokio::test]
-    #[ignore] // expensive test
-    async fn check_dealers_filter_dealing_verification_error() {
-        let db = MockContractDb::new();
-        let mut clients_and_states = prepare_clients_and_states_with_dealing(&db).await;
-
-        // corrupt just one dealing
-        db.dealings_db
-            .write()
-            .unwrap()
-            .entry(TEST_VALIDATORS_ADDRESS[0].to_string())
-            .and_modify(|dealings| {
-                let mut last = dealings.pop().unwrap();
-                let value = last.0.pop().unwrap();
-                if value == 42 {
-                    last.0.push(43);
-                } else {
-                    last.0.push(42);
-                }
-                dealings.push(last);
-            });
-
-        for (dkg_client, state) in clients_and_states.iter_mut().skip(1) {
-            deterministic_filter_dealers(dkg_client, state, 2, false)
-                .await
-                .unwrap();
-            // second filter will leave behind the bad dealer and surface why it was left out
-            // in the first place
-            let filtered = deterministic_filter_dealers(dkg_client, state, 2, false)
-                .await
-                .unwrap();
-            assert_eq!(filtered.len(), TOTAL_DEALINGS);
-            let corrupted_status = state
-                .all_dealers()
-                .get(&Addr::unchecked(TEST_VALIDATORS_ADDRESS[0]))
-                .unwrap()
-                .as_ref()
-                .unwrap_err();
-            assert_eq!(*corrupted_status, ComplaintReason::DealingVerificationError);
-        }
-    }
-
-    #[tokio::test]
-    #[ignore] // expensive test
-    async fn partial_keypair_derivation() {
-        let db = MockContractDb::new();
-        let mut clients_and_states = prepare_clients_and_states_with_dealing(&db).await;
-        for (dkg_client, state) in clients_and_states.iter_mut() {
-            let filtered = deterministic_filter_dealers(dkg_client, state, 2, false)
-                .await
-                .unwrap();
-            assert!(derive_partial_keypair(state, 2, filtered).is_ok());
-        }
-    }
-
-    #[tokio::test]
-    #[ignore] // expensive test
-    async fn partial_keypair_derivation_with_threshold() {
-        let db = MockContractDb::new();
-        let mut clients_and_states = prepare_clients_and_states_with_dealing(&db).await;
-
-        // corrupt just one dealing
-        db.dealings_db
-            .write()
-            .unwrap()
-            .entry(TEST_VALIDATORS_ADDRESS[0].to_string())
-            .and_modify(|dealings| {
-                let mut last = dealings.pop().unwrap();
-                last.0.pop();
-                dealings.push(last);
-            });
-
-        for (dkg_client, state) in clients_and_states.iter_mut().skip(1) {
-            let filtered = deterministic_filter_dealers(dkg_client, state, 2, false)
-                .await
-                .unwrap();
-            assert!(derive_partial_keypair(state, 2, filtered).is_ok());
-        }
-    }
-
-    #[tokio::test]
-    #[ignore] // expensive test
-    async fn submit_verification_key() {
-        let db = MockContractDb::new();
-        let mut clients_and_states = prepare_clients_and_states_with_submission(&db).await;
-
-        for (_, state) in clients_and_states.iter_mut() {
-            assert!(db
-                .proposal_db
-                .read()
-                .unwrap()
-                .contains_key(&state.proposal_id_value().unwrap()));
-            assert!(state.coconut_keypair_is_some().await);
-        }
-    }
-
-    #[tokio::test]
-    #[ignore] // expensive test
-    async fn validate_verification_key() {
-        let db = MockContractDb::new();
-        let mut clients_and_states = prepare_clients_and_states_with_validation(&db).await;
-        for (_, state) in clients_and_states.iter_mut() {
-            let proposal = db
-                .proposal_db
-                .read()
-                .unwrap()
-                .get(&state.proposal_id_value().unwrap())
-                .unwrap()
-                .clone();
-            assert_eq!(proposal.status, Status::Passed);
-        }
-    }
-
-    #[tokio::test]
-    #[ignore] // expensive test
-    async fn validate_verification_key_malformed_share() {
-        let db = MockContractDb::new();
-        let mut clients_and_states = prepare_clients_and_states_with_submission(&db).await;
-
-        db.verification_share_db
-            .write()
-            .unwrap()
-            .entry(TEST_VALIDATORS_ADDRESS[0].to_string())
-            .and_modify(|share| share.share.push('x'));
-
-        for (dkg_client, state) in clients_and_states.iter_mut() {
-            verification_key_validation(dkg_client, state, false)
-                .await
-                .unwrap();
-        }
-
-        for (idx, (_, state)) in clients_and_states.iter().enumerate() {
-            let proposal = db
-                .proposal_db
-                .read()
-                .unwrap()
-                .get(&state.proposal_id_value().unwrap())
-                .unwrap()
-                .clone();
-            if idx == 0 {
-                assert_eq!(proposal.status, Status::Rejected);
-            } else {
-                assert_eq!(proposal.status, Status::Passed);
-            }
-        }
-    }
-
-    #[tokio::test]
-    #[ignore] // expensive test
-    async fn validate_verification_key_unpaired_share() {
-        let db = MockContractDb::new();
-        let mut clients_and_states = prepare_clients_and_states_with_submission(&db).await;
-
-        let second_share = db
-            .verification_share_db
-            .write()
-            .unwrap()
-            .get(TEST_VALIDATORS_ADDRESS[1])
-            .unwrap()
-            .share
-            .clone();
-        db.verification_share_db
-            .write()
-            .unwrap()
-            .entry(TEST_VALIDATORS_ADDRESS[0].to_string())
-            .and_modify(|share| share.share = second_share);
-
-        for (dkg_client, state) in clients_and_states.iter_mut() {
-            verification_key_validation(dkg_client, state, false)
-                .await
-                .unwrap();
-        }
-
-        for (idx, (_, state)) in clients_and_states.iter().enumerate() {
-            let proposal = db
-                .proposal_db
-                .read()
-                .unwrap()
-                .get(&state.proposal_id_value().unwrap())
-                .unwrap()
-                .clone();
-            if idx == 0 {
-                assert_eq!(proposal.status, Status::Rejected);
-            } else {
-                assert_eq!(proposal.status, Status::Passed);
-            }
-        }
-    }
-
-    #[tokio::test]
-    #[ignore] // expensive test
-    async fn finalize_verification_key() {
-        let db = MockContractDb::new();
-        let clients_and_states = prepare_clients_and_states_with_finalization(&db).await;
-
-        for (_, state) in clients_and_states.iter() {
-            let proposal = db
-                .proposal_db
-                .read()
-                .unwrap()
-                .get(&state.proposal_id_value().unwrap())
-                .unwrap()
-                .clone();
-            assert_eq!(proposal.status, Status::Executed);
-        }
-    }
-
-    #[tokio::test]
-    #[ignore] // expensive test
-    async fn reshare_preserves_keys() {
-        let db = MockContractDb::new();
-        let mut clients_and_states = prepare_clients_and_states_with_finalization(&db).await;
-        for (_, state) in clients_and_states.iter_mut() {
-            state.set_was_in_progress();
-        }
-
-        let mut vks = vec![];
-        let mut indices = vec![];
-        for (_, state) in clients_and_states.iter() {
-            let vk = state
-                .coconut_keypair()
-                .await
-                .as_ref()
-                .unwrap()
-                .verification_key()
-                .clone();
-            let index = state.node_index().unwrap();
-            vks.push(vk);
-            indices.push(index);
-        }
-        let initial_master_vk = aggregate_verification_keys(&vks, Some(&indices)).unwrap();
-
-        let new_dkg_client = DkgClient::new(
-            DummyClient::new(
-                AccountId::from_str("n1sqkxzh7nl6kgndr4ew9795t2nkwmd8tpql67q7").unwrap(),
-            )
-            .with_dealer_details(&db.dealer_details_db)
-            .with_dealings(&db.dealings_db)
-            .with_proposal_db(&db.proposal_db)
-            .with_verification_share(&db.verification_share_db)
-            .with_threshold(&db.threshold_db)
-            .with_initial_dealers_db(&db.initial_dealers_db),
-        );
-        let keypair = DkgKeyPair::new(&setup(), OsRng);
-        let state = State::new(
-            PathBuf::default(),
-            PersistentState::default(),
-            Url::parse("localhost:8000").unwrap(),
-            keypair,
-            KeyPair::new(),
-        );
-
-        for (_, active) in db.dealer_details_db.write().unwrap().values_mut() {
-            *active = false;
-        }
-
-        *db.dealings_db.write().unwrap() = Default::default();
-        *db.verification_share_db.write().unwrap() = Default::default();
-        let mut initial_dealers = vec![];
-        for (dkg_client, _) in clients_and_states.iter() {
-            let client_address = Addr::unchecked(dkg_client.get_address().await.as_ref());
-            initial_dealers.push(client_address);
-        }
-        *db.initial_dealers_db.write().unwrap() = Some(InitialReplacementData {
-            initial_dealers,
-            initial_height: 1,
-        });
-        *clients_and_states.first_mut().unwrap() = (new_dkg_client, state);
-
-        for (dkg_client, state) in clients_and_states.iter_mut() {
-            public_key_submission(dkg_client, state, true)
-                .await
-                .unwrap();
-        }
-
-        for (dkg_client, state) in clients_and_states.iter_mut() {
-            dealing_exchange(dkg_client, state, OsRng, true)
-                .await
-                .unwrap();
-        }
-
-        for (dkg_client, state) in clients_and_states.iter_mut() {
-            let random_file: usize = OsRng.gen();
-            let private_key_path = temp_dir().join(format!("private{}.pem", random_file));
-            let public_key_path = temp_dir().join(format!("public{}.pem", random_file));
-            let keypair_path = KeyPairPath::new(private_key_path.clone(), public_key_path.clone());
-            verification_key_submission(dkg_client, state, &keypair_path, true)
-                .await
-                .unwrap();
-            std::fs::remove_file(private_key_path).unwrap();
-            std::fs::remove_file(public_key_path).unwrap();
-        }
-        for (dkg_client, state) in clients_and_states.iter_mut() {
-            verification_key_validation(dkg_client, state, true)
-                .await
-                .unwrap();
-        }
-        for (dkg_client, state) in clients_and_states.iter_mut() {
-            verification_key_finalization(dkg_client, state, true)
-                .await
-                .unwrap();
-        }
-        assert!(db
-            .proposal_db
-            .read()
-            .unwrap()
-            .values()
-            .all(|proposal| { proposal.status == Status::Executed }));
-
-        let mut vks = vec![];
-        let mut indices = vec![];
-        for (_, state) in clients_and_states.iter() {
-            let vk = state
-                .coconut_keypair()
-                .await
-                .as_ref()
-                .unwrap()
-                .verification_key()
-                .clone();
-            let index = state.node_index().unwrap();
-            vks.push(vk);
-            indices.push(index);
-        }
-        let reshared_master_vk = aggregate_verification_keys(&vks, Some(&indices)).unwrap();
-        assert_eq!(initial_master_vk, reshared_master_vk);
-    }
-
-    #[tokio::test]
-    #[ignore] // expensive test
-    async fn reshare_after_reset() {
-        let db = MockContractDb::new();
-        let mut clients_and_states = prepare_clients_and_states_with_finalization(&db).await;
-        for (_, state) in clients_and_states.iter_mut() {
-            state.set_was_in_progress();
-        }
-
-        let new_dkg_client = DkgClient::new(
-            DummyClient::new(
-                AccountId::from_str("n1vxkywf9g4cg0k2dehanzwzz64jw782qm0kuynf").unwrap(),
-            )
-            .with_dealer_details(&db.dealer_details_db)
-            .with_dealings(&db.dealings_db)
-            .with_proposal_db(&db.proposal_db)
-            .with_verification_share(&db.verification_share_db)
-            .with_threshold(&db.threshold_db)
-            .with_initial_dealers_db(&db.initial_dealers_db),
-        );
-        let keypair = DkgKeyPair::new(&setup(), OsRng);
-        let state = State::new(
-            PathBuf::default(),
-            PersistentState::default(),
-            Url::parse("localhost:8000").unwrap(),
-            keypair,
-            KeyPair::new(),
-        );
-        let new_dkg_client2 = DkgClient::new(
-            DummyClient::new(
-                AccountId::from_str("n1sqkxzh7nl6kgndr4ew9795t2nkwmd8tpql67q7").unwrap(),
-            )
-            .with_dealer_details(&db.dealer_details_db)
-            .with_dealings(&db.dealings_db)
-            .with_proposal_db(&db.proposal_db)
-            .with_verification_share(&db.verification_share_db)
-            .with_threshold(&db.threshold_db)
-            .with_initial_dealers_db(&db.initial_dealers_db),
-        );
-        let keypair = DkgKeyPair::new(&setup(), OsRng);
-        let state2 = State::new(
-            PathBuf::default(),
-            PersistentState::default(),
-            Url::parse("localhost:8000").unwrap(),
-            keypair,
-            KeyPair::new(),
-        );
-
-        for (_, active) in db.dealer_details_db.write().unwrap().values_mut() {
-            *active = false;
-        }
-
-        *db.dealings_db.write().unwrap() = Default::default();
-        *db.verification_share_db.write().unwrap() = Default::default();
-        clients_and_states.pop().unwrap();
-        let (initial_client2, initial_state2) = clients_and_states.pop().unwrap();
-        clients_and_states.push((new_dkg_client, state));
-        clients_and_states.push((new_dkg_client2, state2));
-
-        // DKG in reset mode
-        for (dkg_client, state) in clients_and_states.iter_mut() {
-            public_key_submission(dkg_client, state, false)
-                .await
-                .unwrap();
-        }
-        for (dkg_client, state) in clients_and_states.iter_mut() {
-            dealing_exchange(dkg_client, state, OsRng, false)
-                .await
-                .unwrap();
-        }
-        for (dkg_client, state) in clients_and_states.iter_mut() {
-            let random_file: usize = OsRng.gen();
-            let private_key_path = temp_dir().join(format!("private{}.pem", random_file));
-            let public_key_path = temp_dir().join(format!("public{}.pem", random_file));
-            let keypair_path = KeyPairPath::new(private_key_path.clone(), public_key_path.clone());
-            verification_key_submission(dkg_client, state, &keypair_path, false)
-                .await
-                .unwrap();
-            std::fs::remove_file(private_key_path).unwrap();
-            std::fs::remove_file(public_key_path).unwrap();
-        }
-        for (dkg_client, state) in clients_and_states.iter_mut() {
-            verification_key_validation(dkg_client, state, false)
-                .await
-                .unwrap();
-        }
-        for (dkg_client, state) in clients_and_states.iter_mut() {
-            verification_key_finalization(dkg_client, state, false)
-                .await
-                .unwrap();
-        }
-        assert!(db
-            .proposal_db
-            .read()
-            .unwrap()
-            .values()
-            .all(|proposal| { proposal.status == Status::Executed }));
-        for (_, state) in clients_and_states.iter_mut() {
-            state.set_was_in_progress();
-        }
-
-        // DKG in reshare mode
-        let mut vks = vec![];
-        let mut indices = vec![];
-        for (_, state) in clients_and_states.iter() {
-            let vk = state
-                .coconut_keypair()
-                .await
-                .as_ref()
-                .unwrap()
-                .verification_key()
-                .clone();
-            let index = state.node_index().unwrap();
-            vks.push(vk);
-            indices.push(index);
-        }
-        let initial_master_vk = aggregate_verification_keys(&vks, Some(&indices)).unwrap();
-
-        for (_, active) in db.dealer_details_db.write().unwrap().values_mut() {
-            *active = false;
-        }
-        *db.dealings_db.write().unwrap() = Default::default();
-        *db.verification_share_db.write().unwrap() = Default::default();
-        let mut initial_dealers = vec![];
-        for (dkg_client, _) in clients_and_states.iter() {
-            let client_address = Addr::unchecked(dkg_client.get_address().await.as_ref());
-            initial_dealers.push(client_address);
-        }
-        *db.initial_dealers_db.write().unwrap() = Some(InitialReplacementData {
-            initial_dealers,
-            initial_height: 1,
-        });
-        *clients_and_states.last_mut().unwrap() = (initial_client2, initial_state2);
-
-        for (dkg_client, state) in clients_and_states.iter_mut() {
-            public_key_submission(dkg_client, state, true)
-                .await
-                .unwrap();
-        }
-
-        for (dkg_client, state) in clients_and_states.iter_mut() {
-            dealing_exchange(dkg_client, state, OsRng, true)
-                .await
-                .unwrap();
-        }
-
-        for (dkg_client, state) in clients_and_states.iter_mut() {
-            let random_file: usize = OsRng.gen();
-            let private_key_path = temp_dir().join(format!("private{}.pem", random_file));
-            let public_key_path = temp_dir().join(format!("public{}.pem", random_file));
-            let keypair_path = KeyPairPath::new(private_key_path.clone(), public_key_path.clone());
-            verification_key_submission(dkg_client, state, &keypair_path, true)
-                .await
-                .unwrap();
-            std::fs::remove_file(private_key_path).unwrap();
-            std::fs::remove_file(public_key_path).unwrap();
-        }
-
-        for (dkg_client, state) in clients_and_states.iter_mut() {
-            verification_key_validation(dkg_client, state, true)
-                .await
-                .unwrap();
-        }
-        for (dkg_client, state) in clients_and_states.iter_mut() {
-            verification_key_finalization(dkg_client, state, true)
-                .await
-                .unwrap();
-        }
-        // assert!(db
-        //     .proposal_db
-        //     .read()
-        //     .unwrap()
-        //     .values()
-        //     .all(|proposal| { proposal.status == Status::Executed }));
-
-        let mut vks = vec![];
-        let mut indices = vec![];
-        for (_, state) in clients_and_states.iter() {
-            let vk = state
-                .coconut_keypair()
-                .await
-                .as_ref()
-                .unwrap()
-                .verification_key()
-                .clone();
-            let index = state.node_index().unwrap();
-            vks.push(vk);
-            indices.push(index);
-        }
-        let reshared_master_vk = aggregate_verification_keys(&vks, Some(&indices)).unwrap();
-        assert_eq!(initial_master_vk, reshared_master_vk);
-    }
-}
diff --git a/nym-api/src/coconut/error.rs b/nym-api/src/coconut/error.rs
index 290f448fb1..423574db8d 100644
--- a/nym-api/src/coconut/error.rs
+++ b/nym-api/src/coconut/error.rs
@@ -1,12 +1,8 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2022-2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: GPL-3.0-only
 
-use rocket::http::{ContentType, Status};
-use rocket::response::Responder;
-use rocket::{response, Request, Response};
-use std::io::Cursor;
-use thiserror::Error;
-
+use crate::node_status_api::models::NymApiStorageError;
+use nym_coconut_dkg_common::types::{ChunkIndex, DealingIndex, EpochId};
 use nym_crypto::asymmetric::{
     encryption::KeyRecoveryError,
     identity::{Ed25519RecoveryError, SignatureError},
@@ -14,8 +10,11 @@ use nym_crypto::asymmetric::{
 use nym_dkg::error::DkgError;
 use nym_validator_client::coconut::CoconutApiError;
 use nym_validator_client::nyxd::error::{NyxdError, TendermintError};
-
-use crate::node_status_api::models::NymApiStorageError;
+use rocket::http::{ContentType, Status};
+use rocket::response::Responder;
+use rocket::{response, Request, Response};
+use std::io::Cursor;
+use thiserror::Error;
 
 pub type Result<T> = std::result::Result<T, CoconutError>;
 
@@ -124,6 +123,31 @@ pub enum CoconutError {
     // I guess we should make this one a bit more detailed
     #[error("the provided query arguments were invalid")]
     InvalidQueryArguments,
+
+    #[error("the internal dkg state for epoch {epoch_id} is missing - we might have joined mid exchange")]
+    MissingDkgState { epoch_id: EpochId },
+
+    #[error(
+        "the node index value for epoch {epoch_id} is not available - are you sure we are a dealer?"
+    )]
+    UnavailableAssignedIndex { epoch_id: EpochId },
+
+    #[error("the receiver index value for epoch {epoch_id} is not available - are you sure we are a receiver?")]
+    UnavailableReceiverIndex { epoch_id: EpochId },
+
+    #[error("the threshold value for epoch {epoch_id} is not available")]
+    UnavailableThreshold { epoch_id: EpochId },
+
+    #[error("the proposal id value for epoch {epoch_id} is not available")]
+    UnavailableProposalId { epoch_id: EpochId },
+
+    #[error("could not find dealing chunk {chunk_index} for dealing {dealing_index} from dealer {dealer} for epoch {epoch_id} on the chain!")]
+    MissingDealingChunk {
+        epoch_id: EpochId,
+        dealer: String,
+        dealing_index: DealingIndex,
+        chunk_index: ChunkIndex,
+    },
 }
 
 impl<'r, 'o: 'r> Responder<'r, 'o> for CoconutError {
diff --git a/nym-api/src/coconut/helpers.rs b/nym-api/src/coconut/helpers.rs
index a7e25d7b46..150ace1864 100644
--- a/nym-api/src/coconut/helpers.rs
+++ b/nym-api/src/coconut/helpers.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 use crate::coconut::error::CoconutError;
-use crate::coconut::state::BANDWIDTH_CREDENTIAL_PARAMS;
+use crate::coconut::state::bandwidth_voucher_params;
 use nym_api_requests::coconut::BlindSignRequestBody;
 use nym_coconut::{BlindedSignature, SecretKey};
 use nym_validator_client::nyxd::error::NyxdError::AbciError;
@@ -29,7 +29,7 @@ pub(crate) fn blind_sign(
     let attributes_ref = public_attributes.iter().collect::<Vec<_>>();
 
     Ok(nym_coconut_interface::blind_sign(
-        &BANDWIDTH_CREDENTIAL_PARAMS,
+        bandwidth_voucher_params(),
         signing_key,
         &request.inner_sign_request,
         &attributes_ref,
diff --git a/nym-api/src/coconut/keypair.rs b/nym-api/src/coconut/keypair.rs
deleted file mode 100644
index 57b7872971..0000000000
--- a/nym-api/src/coconut/keypair.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: GPL-3.0-only
-
-use std::sync::Arc;
-use tokio::sync::{RwLock, RwLockReadGuard};
-
-#[derive(Clone, Debug)]
-pub struct KeyPair {
-    inner: Arc<RwLock<Option<nym_coconut_interface::KeyPair>>>,
-}
-
-impl KeyPair {
-    pub fn new() -> Self {
-        Self {
-            inner: Arc::new(RwLock::new(None)),
-        }
-    }
-
-    pub async fn take(&self) -> Option<nym_coconut::KeyPair> {
-        self.inner.write().await.take()
-    }
-
-    pub async fn get(&self) -> RwLockReadGuard<'_, Option<nym_coconut::KeyPair>> {
-        self.inner.read().await
-    }
-
-    pub async fn set(&self, keypair: Option<nym_coconut_interface::KeyPair>) {
-        let mut w_lock = self.inner.write().await;
-        *w_lock = keypair;
-    }
-}
diff --git a/nym-api/src/coconut/keys/mod.rs b/nym-api/src/coconut/keys/mod.rs
new file mode 100644
index 0000000000..117c512b9e
--- /dev/null
+++ b/nym-api/src/coconut/keys/mod.rs
@@ -0,0 +1,86 @@
+// Copyright 2022-2024 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: GPL-3.0-only
+
+use nym_coconut_dkg_common::types::EpochId;
+use nym_dkg::Scalar;
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::Arc;
+use tokio::sync::{RwLock, RwLockReadGuard};
+
+mod persistence;
+
+#[derive(Clone, Debug)]
+pub struct KeyPair {
+    // keys: Arc<RwLock<HashMap<EpochId, nym_coconut_interface::KeyPair>>>,
+    keys: Arc<RwLock<Option<KeyPairWithEpoch>>>,
+    valid: Arc<AtomicBool>,
+}
+
+#[derive(Debug)]
+pub struct KeyPairWithEpoch {
+    pub(crate) keys: nym_coconut_interface::KeyPair,
+    pub(crate) issued_for_epoch: EpochId,
+}
+
+impl KeyPairWithEpoch {
+    pub(crate) fn new(keys: nym_coconut_interface::KeyPair, issued_for_epoch: EpochId) -> Self {
+        KeyPairWithEpoch {
+            keys,
+            issued_for_epoch,
+        }
+    }
+
+    // extract underlying secrets from the coconut's secret key.
+    // the caller of this function must exercise extreme care to not misuse the data and ensuring it gets zeroized
+    // `KeyPair` and `SecretKey` implement ZeroizeOnDrop; `Scalar` does not (it implements `Copy` -> important to keep in mind)
+    pub(crate) fn hazmat_into_secrets(self) -> Vec<Scalar> {
+        let (x, mut secrets) = self.keys.secret_key().hazmat_to_raw();
+
+        secrets.insert(0, x);
+        secrets
+        // since `nym_coconut_interface::KeyPair` implements `ZeroizeOnDrop` and we took ownership of the keypair,
+        // it will get zeroized after we exit this scope
+    }
+}
+
+impl KeyPair {
+    pub fn new() -> Self {
+        Self {
+            keys: Arc::new(RwLock::new(None)),
+            valid: Arc::new(Default::default()),
+        }
+    }
+
+    pub async fn take(&self) -> Option<KeyPairWithEpoch> {
+        self.keys.write().await.take()
+    }
+
+    pub async fn get(&self) -> Option<RwLockReadGuard<'_, Option<KeyPairWithEpoch>>> {
+        if self.is_valid() {
+            Some(self.read_keys().await)
+        } else {
+            None
+        }
+    }
+
+    pub async fn read_keys(&self) -> RwLockReadGuard<'_, Option<KeyPairWithEpoch>> {
+        self.keys.read().await
+    }
+
+    pub async fn set(&self, keypair: KeyPairWithEpoch) {
+        let mut w_lock = self.keys.write().await;
+        *w_lock = Some(keypair);
+    }
+
+    pub fn is_valid(&self) -> bool {
+        self.valid.load(Ordering::SeqCst)
+    }
+
+    pub fn validate(&self) {
+        self.valid.store(true, Ordering::SeqCst);
+    }
+
+    pub fn invalidate(&self) {
+        self.valid.store(false, Ordering::SeqCst);
+    }
+}
diff --git a/nym-api/src/coconut/keys/persistence.rs b/nym-api/src/coconut/keys/persistence.rs
new file mode 100644
index 0000000000..b3c9c330ce
--- /dev/null
+++ b/nym-api/src/coconut/keys/persistence.rs
@@ -0,0 +1,43 @@
+// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: GPL-3.0-only
+
+use crate::coconut::keys::KeyPairWithEpoch;
+use crate::coconut::state::bandwidth_voucher_params;
+use nym_coconut::{CoconutError, KeyPair, SecretKey};
+use nym_coconut_dkg_common::types::EpochId;
+use nym_pemstore::traits::PemStorableKey;
+use std::mem;
+
+impl PemStorableKey for KeyPairWithEpoch {
+    // that's not the best error for this, but it felt like an overkill to define a dedicated struct just for this purpose
+    type Error = CoconutError;
+
+    fn pem_type() -> &'static str {
+        "COCONUT KEY WITH EPOCH"
+    }
+
+    fn to_bytes(&self) -> Vec<u8> {
+        let mut bytes = self.issued_for_epoch.to_be_bytes().to_vec();
+        bytes.append(&mut self.keys.secret_key().to_bytes());
+        bytes
+    }
+
+    fn from_bytes(bytes: &[u8]) -> Result<Self, Self::Error> {
+        if bytes.len() <= mem::size_of::<EpochId>() {
+            return Err(CoconutError::Deserialization(
+                "insufficient number of bytes to decode secret key with epoch id".into(),
+            ));
+        }
+        let epoch_id = EpochId::from_be_bytes([
+            bytes[0], bytes[1], bytes[2], bytes[3], bytes[4], bytes[5], bytes[6], bytes[7],
+        ]);
+
+        let sk = SecretKey::from_bytes(&bytes[mem::size_of::<EpochId>()..])?;
+        let vk = sk.verification_key(bandwidth_voucher_params());
+
+        Ok(KeyPairWithEpoch {
+            keys: KeyPair::from_keys(sk, vk),
+            issued_for_epoch: epoch_id,
+        })
+    }
+}
diff --git a/nym-api/src/coconut/mod.rs b/nym-api/src/coconut/mod.rs
index 3f25cba0e1..2e1af74968 100644
--- a/nym-api/src/coconut/mod.rs
+++ b/nym-api/src/coconut/mod.rs
@@ -5,7 +5,7 @@ use self::comm::APICommunicationChannel;
 use crate::coconut::client::Client as LocalClient;
 use crate::coconut::state::State;
 use crate::support::storage::NymApiStorage;
-use keypair::KeyPair;
+use keys::KeyPair;
 use nym_config::defaults::NYM_API_VERSION;
 use nym_crypto::asymmetric::identity;
 use nym_validator_client::nym_api::routes::{BANDWIDTH, COCONUT_ROUTES};
@@ -18,7 +18,7 @@ mod deposit;
 pub(crate) mod dkg;
 pub(crate) mod error;
 pub(crate) mod helpers;
-pub(crate) mod keypair;
+pub(crate) mod keys;
 pub(crate) mod state;
 pub(crate) mod storage;
 #[cfg(test)]
diff --git a/nym-api/src/coconut/state.rs b/nym-api/src/coconut/state.rs
index 0cffc9e752..de38ca614f 100644
--- a/nym-api/src/coconut/state.rs
+++ b/nym-api/src/coconut/state.rs
@@ -5,10 +5,9 @@ use crate::coconut::client::Client as LocalClient;
 use crate::coconut::comm::APICommunicationChannel;
 use crate::coconut::deposit::validate_deposit_tx;
 use crate::coconut::error::Result;
-use crate::coconut::keypair::KeyPair;
+use crate::coconut::keys::KeyPair;
 use crate::coconut::storage::CoconutStorageExt;
 use crate::support::storage::NymApiStorage;
-use lazy_static::lazy_static;
 use nym_api_requests::coconut::helpers::issued_credential_plaintext;
 use nym_api_requests::coconut::BlindSignRequestBody;
 use nym_coconut::Parameters;
@@ -17,16 +16,16 @@ use nym_coconut_interface::{BlindedSignature, VerificationKey};
 use nym_credentials::coconut::bandwidth::BandwidthVoucher;
 use nym_crypto::asymmetric::identity;
 use nym_validator_client::nyxd::{Hash, TxResponse};
-use std::sync::Arc;
+use std::sync::{Arc, OnceLock};
 
 // keep it as a global static due to relatively high cost of computing the curve points;
 // plus we expect all clients to use the same set of parameters
 //
 // future note: once we allow for credentials with variable number of attributes, just create Parameters(max_allowed_attributes)
 // and take as many hs elements as required (since they will match for all variants)
-lazy_static! {
-    pub(crate) static ref BANDWIDTH_CREDENTIAL_PARAMS: Parameters =
-        BandwidthVoucher::default_parameters();
+pub(crate) fn bandwidth_voucher_params() -> &'static Parameters {
+    static BANDWIDTH_CREDENTIAL_PARAMS: OnceLock<Parameters> = OnceLock::new();
+    BANDWIDTH_CREDENTIAL_PARAMS.get_or_init(BandwidthVoucher::default_parameters)
 }
 
 pub struct State {
diff --git a/nym-api/src/coconut/tests/fixtures.rs b/nym-api/src/coconut/tests/fixtures.rs
new file mode 100644
index 0000000000..b7da76d805
--- /dev/null
+++ b/nym-api/src/coconut/tests/fixtures.rs
@@ -0,0 +1,294 @@
+// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: GPL-3.0-only
+
+use crate::coconut::dkg;
+use crate::coconut::dkg::client::DkgClient;
+use crate::coconut::dkg::controller::keys::persist_coconut_keypair;
+use crate::coconut::dkg::controller::DkgController;
+use crate::coconut::dkg::state::State;
+use crate::coconut::keys::KeyPair;
+use crate::coconut::tests::{DummyClient, SharedFakeChain};
+use cosmwasm_std::Addr;
+use nym_coconut::VerificationKey;
+use nym_coconut_dkg_common::types::{DealerDetails, EpochId, InitialReplacementData};
+use nym_crypto::asymmetric::identity;
+use nym_dkg::bte::keys::KeyPair as DkgKeyPair;
+use nym_dkg::{NodeIndex, Threshold};
+use nym_validator_client::nyxd::AccountId;
+use rand_chacha::{
+    rand_core::{RngCore, SeedableRng},
+    ChaCha20Rng,
+};
+use std::ops::{Deref, DerefMut};
+use tempfile::{tempdir, TempDir};
+
+pub fn test_rng(seed: [u8; 32]) -> ChaCha20Rng {
+    ChaCha20Rng::from_seed(seed)
+}
+
+pub fn test_rng_07(seed: [u8; 32]) -> rand_chacha_02::ChaCha20Rng {
+    use rand_chacha_02::rand_core::SeedableRng;
+    rand_chacha_02::ChaCha20Rng::from_seed(seed)
+}
+
+pub fn pseudorandom_account(rng: &mut ChaCha20Rng) -> AccountId {
+    let mut dummy_account_key_hash = [0u8; 32];
+    rng.fill_bytes(&mut dummy_account_key_hash);
+    AccountId::new("n", &dummy_account_key_hash).unwrap()
+}
+
+pub fn dealer_fixture(mut rng: &mut ChaCha20Rng, id: NodeIndex) -> DealerDetails {
+    // we might possibly need that private key later on
+    let keypair = DkgKeyPair::new(dkg::params(), &mut rng);
+
+    // lol, instantiate rng with an rng due to incompatibility, but even though it looks dodgy AF,
+    // it's 100% deterministic
+    let mut secondary_seed = [0u8; 32];
+    rng.fill_bytes(&mut secondary_seed);
+
+    let addr = pseudorandom_account(rng);
+    let identity_keypair = identity::KeyPair::new(&mut test_rng_07(secondary_seed));
+    let bte_public_key_with_proof = bs58::encode(&keypair.public_key().to_bytes()).into_string();
+
+    let port = 8080 + id;
+    DealerDetails {
+        address: Addr::unchecked(addr.to_string()),
+        bte_public_key_with_proof,
+        ed25519_identity: identity_keypair.public_key().to_base58_string(),
+        announce_address: format!("http://localhost:{port}"),
+        assigned_index: id,
+    }
+}
+
+pub fn dealers_fixtures(rng: &mut ChaCha20Rng, n: usize) -> Vec<DealerDetails> {
+    let mut dealers = Vec::new();
+    for i in 1..=n {
+        dealers.push(dealer_fixture(rng, i as NodeIndex))
+    }
+    dealers
+}
+
+#[derive(Default)]
+pub struct TestingDkgControllerBuilder {
+    rng: Option<ChaCha20Rng>,
+    rng_seed: Option<[u8; 32]>,
+    address: Option<AccountId>,
+    keypair: Option<KeyPair>,
+
+    chain_state: Option<SharedFakeChain>,
+
+    epoch_id: Option<EpochId>,
+    threshold: Option<Threshold>,
+    self_dealer: Option<DealerDetails>,
+    dealers: Vec<DealerDetails>,
+    initial_dealers: Option<InitialReplacementData>,
+}
+
+impl TestingDkgControllerBuilder {
+    pub fn with_magic_seed_val(mut self, val: u8) -> Self {
+        self.rng_seed = Some([val; 32]);
+        self
+    }
+
+    #[allow(dead_code)]
+    pub fn with_rng(mut self, rng: ChaCha20Rng) -> Self {
+        self.rng = Some(rng);
+        self
+    }
+
+    pub fn with_initial_epoch_id(mut self, initial: EpochId) -> Self {
+        self.epoch_id = Some(initial);
+        self
+    }
+
+    pub fn with_keypair(mut self, keypair: KeyPair) -> Self {
+        self.keypair = Some(keypair);
+        self
+    }
+
+    pub fn with_shared_chain_state(mut self, fake_chain: SharedFakeChain) -> Self {
+        self.chain_state = Some(fake_chain);
+        self
+    }
+
+    pub fn with_as_dealer(mut self, dealer_details: DealerDetails) -> Self {
+        self.self_dealer = Some(dealer_details);
+        self
+    }
+
+    #[allow(dead_code)]
+    pub fn with_dealer(mut self, dealer_details: DealerDetails) -> Self {
+        self.dealers.push(dealer_details);
+        self
+    }
+
+    pub fn with_dealers(mut self, dealers_details: Vec<DealerDetails>) -> Self {
+        self.dealers = dealers_details;
+        self
+    }
+
+    pub fn with_initial_dealers(mut self, initial_dealers: InitialReplacementData) -> Self {
+        self.initial_dealers = Some(initial_dealers);
+        self
+    }
+
+    #[allow(dead_code)]
+    pub fn with_address(mut self, address: impl Into<String>) -> Self {
+        let addr = address.into();
+        self.address = Some(addr.parse().unwrap());
+        self
+    }
+
+    pub fn with_threshold(mut self, threshold: Threshold) -> Self {
+        self.threshold = Some(threshold);
+        self
+    }
+
+    pub async fn build(self) -> TestingDkgController {
+        let mut rng = self.rng.unwrap_or_else(|| {
+            let rng_seed = self.rng_seed.unwrap_or([69u8; 32]);
+            test_rng(rng_seed)
+        });
+
+        let had_dealer_info = self.self_dealer.is_some();
+        // let had_keypair = self.keypair.is_some();
+
+        // is this ideal? no, but it works : P
+        let self_dealer = self.self_dealer.unwrap_or_else(|| {
+            let address = self
+                .address
+                .unwrap_or_else(|| pseudorandom_account(&mut rng));
+            let mut secondary_seed = [0u8; 32];
+            rng.fill_bytes(&mut secondary_seed);
+
+            let identity_keypair = identity::KeyPair::new(&mut test_rng_07(secondary_seed));
+
+            DealerDetails {
+                address: Addr::unchecked(address.as_ref()),
+                bte_public_key_with_proof: "foomp".to_string(),
+                ed25519_identity: identity_keypair.public_key().to_base58_string(),
+                announce_address: "http://localhost:8080".to_string(),
+                assigned_index: 1,
+            }
+        });
+
+        let chain_state = self.chain_state.unwrap_or_default();
+        let dummy_client = DummyClient::new(
+            self_dealer.address.to_string().parse().unwrap(),
+            chain_state.clone(),
+        );
+
+        // insert initial data into the chain state
+        {
+            let mut state_guard = chain_state.lock().unwrap();
+            if let Some(threshold) = self.threshold {
+                state_guard.dkg_contract.threshold = Some(threshold)
+            }
+            for dealer in self.dealers {
+                state_guard
+                    .dkg_contract
+                    .dealers
+                    .insert(dealer.assigned_index, dealer);
+            }
+            if let Some(epoch_id) = self.epoch_id {
+                state_guard.dkg_contract.epoch.epoch_id = epoch_id;
+            }
+            if let Some(initial_dealers) = self.initial_dealers {
+                state_guard.dkg_contract.initial_dealers = Some(initial_dealers)
+            }
+        }
+
+        let dummy_client = DkgClient::new(dummy_client);
+        let tmp_dir = tempdir().unwrap();
+
+        let dkg_state_path = tmp_dir.path().join("persistent_state.json");
+        let coconut_key_path = tmp_dir.path().join("coconut_keypair.pem");
+
+        // if we had a keypair, make sure to put it on disk otherwise, if we're testing dealing exchange,
+        // we'll fail to archive it
+        let keypair = if let Some(keypair) = self.keypair {
+            if let Some(keys) = keypair.read_keys().await.as_ref() {
+                persist_coconut_keypair(keys, &coconut_key_path).unwrap();
+            }
+            keypair
+        } else {
+            KeyPair::new()
+        };
+
+        let mut state = State::new(
+            dkg_state_path,
+            Default::default(),
+            self_dealer.announce_address.parse().unwrap(),
+            // TODO: we might need to fix up the key here
+            DkgKeyPair::new(&nym_dkg::bte::setup(), &mut rng),
+            self_dealer.ed25519_identity.parse().unwrap(),
+            keypair,
+        );
+
+        let epoch = chain_state.lock().unwrap().dkg_contract.epoch.epoch_id;
+        if had_dealer_info {
+            // if we had dealer info it means we must have gone through key registration
+            state.maybe_init_dkg_state(epoch);
+            state.registration_state_mut(epoch).unwrap().assigned_index =
+                Some(self_dealer.assigned_index);
+        }
+
+        // if had_keypair {
+        //     // if we had keypair, it means we must have gone through dealing exchange
+        //     state.dealing_exchange_state(epoch).unwrap();
+        // }
+
+        TestingDkgController {
+            controller: DkgController::test_mock(rng, dummy_client, state, coconut_key_path),
+            chain_state,
+            _tmp_dir: tmp_dir,
+        }
+    }
+}
+
+pub async fn dkg_controller_fixture() -> TestingDkgController {
+    TestingDkgControllerBuilder::default().build().await
+}
+
+pub(crate) struct TestingDkgController {
+    pub(crate) controller: DkgController<ChaCha20Rng>,
+
+    pub(crate) chain_state: SharedFakeChain,
+
+    _tmp_dir: TempDir,
+}
+
+impl TestingDkgController {
+    pub async fn address(&self) -> AccountId {
+        self.dkg_client.get_address().await
+    }
+
+    pub async fn cw_address(&self) -> Addr {
+        Addr::unchecked(self.address().await.as_ref())
+    }
+
+    pub(crate) async fn unchecked_coconut_vk(&self) -> VerificationKey {
+        self.state
+            .unchecked_coconut_keypair()
+            .await
+            .as_ref()
+            .unwrap()
+            .keys
+            .verification_key()
+            .clone()
+    }
+}
+
+impl Deref for TestingDkgController {
+    type Target = DkgController<ChaCha20Rng>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.controller
+    }
+}
+
+impl DerefMut for TestingDkgController {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.controller
+    }
+}
diff --git a/nym-api/src/coconut/tests/helpers.rs b/nym-api/src/coconut/tests/helpers.rs
new file mode 100644
index 0000000000..a92a448502
--- /dev/null
+++ b/nym-api/src/coconut/tests/helpers.rs
@@ -0,0 +1,158 @@
+// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: GPL-3.0-only
+
+use crate::coconut::tests::fixtures::{TestingDkgController, TestingDkgControllerBuilder};
+use crate::coconut::tests::SharedFakeChain;
+use nym_coconut_dkg_common::types::EpochState;
+use nym_dkg::bte::PublicKeyWithProof;
+
+pub(crate) fn unchecked_decode_bte_key(raw: &str) -> PublicKeyWithProof {
+    let bytes = bs58::decode(raw).into_vec().unwrap();
+    PublicKeyWithProof::try_from_bytes(&bytes).unwrap()
+}
+
+pub(crate) fn init_chain() -> SharedFakeChain {
+    Default::default()
+}
+
+pub(crate) async fn initialise_controllers(amount: usize) -> Vec<TestingDkgController> {
+    let chain = init_chain();
+
+    let mut controllers = Vec::with_capacity(amount);
+    assert!(amount <= u8::MAX as usize);
+    for rng_seed in 0..amount {
+        let controller = initialise_controller(chain.clone(), rng_seed as u8).await;
+
+        controllers.push(controller)
+    }
+
+    controllers
+}
+
+pub(crate) async fn initialise_controller(chain: SharedFakeChain, id: u8) -> TestingDkgController {
+    TestingDkgControllerBuilder::default()
+        .with_shared_chain_state(chain)
+        .with_magic_seed_val(id)
+        .build()
+        .await
+}
+
+pub(crate) async fn initialise_dkg(controllers: &mut [TestingDkgController], resharing: bool) {
+    assert_eq!(
+        controllers[0]
+            .chain_state
+            .lock()
+            .unwrap()
+            .dkg_contract
+            .epoch
+            .state,
+        EpochState::WaitingInitialisation
+    );
+
+    // add every dealer to group contract
+    for controller in controllers.iter() {
+        let address = controller.dkg_client.get_address().await;
+        let mut chain = controllers[0].chain_state.lock().unwrap();
+        chain.add_member(address.as_ref(), 10);
+    }
+
+    let mut chain = controllers[0].chain_state.lock().unwrap();
+    chain.dkg_contract.epoch.state = EpochState::PublicKeySubmission { resharing }
+}
+
+pub(crate) async fn submit_public_keys(controllers: &mut [TestingDkgController], resharing: bool) {
+    let epoch = controllers[0]
+        .chain_state
+        .lock()
+        .unwrap()
+        .dkg_contract
+        .epoch
+        .epoch_id;
+
+    for controller in controllers.iter_mut() {
+        controller
+            .public_key_submission(epoch, resharing)
+            .await
+            .unwrap();
+    }
+
+    let threshold = (2 * controllers.len() as u64 + 3 - 1) / 3;
+
+    let mut guard = controllers[0].chain_state.lock().unwrap();
+    guard.dkg_contract.epoch.state = EpochState::DealingExchange { resharing };
+    guard.dkg_contract.threshold = Some(threshold)
+}
+
+pub(crate) async fn exchange_dealings(controllers: &mut [TestingDkgController], resharing: bool) {
+    let epoch = controllers[0]
+        .chain_state
+        .lock()
+        .unwrap()
+        .dkg_contract
+        .epoch
+        .epoch_id;
+
+    for controller in controllers.iter_mut() {
+        controller.dealing_exchange(epoch, resharing).await.unwrap();
+    }
+
+    let mut guard = controllers[0].chain_state.lock().unwrap();
+    guard.dkg_contract.epoch.state = EpochState::VerificationKeySubmission { resharing };
+}
+
+pub(crate) async fn derive_keypairs(controllers: &mut [TestingDkgController], resharing: bool) {
+    let epoch = controllers[0]
+        .chain_state
+        .lock()
+        .unwrap()
+        .dkg_contract
+        .epoch
+        .epoch_id;
+
+    for controller in controllers.iter_mut() {
+        controller
+            .verification_key_submission(epoch, resharing)
+            .await
+            .unwrap();
+    }
+
+    let mut guard = controllers[0].chain_state.lock().unwrap();
+    guard.dkg_contract.epoch.state = EpochState::VerificationKeyValidation { resharing }
+}
+
+pub(crate) async fn validate_keys(controllers: &mut [TestingDkgController], resharing: bool) {
+    let epoch = controllers[0]
+        .chain_state
+        .lock()
+        .unwrap()
+        .dkg_contract
+        .epoch
+        .epoch_id;
+
+    for controller in controllers.iter_mut() {
+        controller.verification_key_validation(epoch).await.unwrap();
+    }
+
+    let mut guard = controllers[0].chain_state.lock().unwrap();
+    guard.dkg_contract.epoch.state = EpochState::VerificationKeyFinalization { resharing }
+}
+
+pub(crate) async fn finalize(controllers: &mut [TestingDkgController]) {
+    let epoch = controllers[0]
+        .chain_state
+        .lock()
+        .unwrap()
+        .dkg_contract
+        .epoch
+        .epoch_id;
+
+    for controller in controllers.iter_mut() {
+        controller
+            .verification_key_finalization(epoch)
+            .await
+            .unwrap();
+    }
+
+    let mut guard = controllers[0].chain_state.lock().unwrap();
+    guard.dkg_contract.epoch.state = EpochState::InProgress {}
+}
diff --git a/nym-api/src/coconut/tests/mod.rs b/nym-api/src/coconut/tests/mod.rs
index 6c7f70ad41..5690c7c46e 100644
--- a/nym-api/src/coconut/tests/mod.rs
+++ b/nym-api/src/coconut/tests/mod.rs
@@ -1,43 +1,46 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2022-2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: GPL-3.0-only
 
 use crate::coconut::error::{CoconutError, Result};
+use crate::coconut::keys::KeyPairWithEpoch;
+use crate::coconut::state::State;
 use crate::coconut::storage::CoconutStorageExt;
-use crate::coconut::{self, State};
 use crate::support::storage::NymApiStorage;
 use async_trait::async_trait;
-use cosmwasm_std::{coin, to_binary, Addr, CosmosMsg, Decimal, WasmMsg};
-use cw3::ProposalResponse;
-use cw4::MemberResponse;
-use nym_api_requests::coconut::models::{IssuedCredentialBody, IssuedCredentialResponse};
-use nym_api_requests::coconut::{
-    BlindSignRequestBody, BlindedSignatureResponse, VerifyCredentialBody, VerifyCredentialResponse,
+use cosmwasm_std::testing::{mock_env, mock_info};
+use cosmwasm_std::{
+    coin, from_binary, to_binary, Addr, Binary, BlockInfo, CosmosMsg, Decimal, MessageInfo, WasmMsg,
 };
-use nym_coconut::tests::helpers::theta_from_keys_and_attributes;
-use nym_coconut::{ttp_keygen, Base58, BlindedSignature, Parameters};
+use cw3::{Proposal, ProposalResponse, Vote, VoteInfo, VoteResponse, Votes};
+use cw4::{Cw4Contract, MemberResponse};
+use nym_api_requests::coconut::models::{IssuedCredentialBody, IssuedCredentialResponse};
+use nym_api_requests::coconut::{BlindSignRequestBody, BlindedSignatureResponse};
+use nym_coconut::{BlindedSignature, Parameters};
 use nym_coconut_bandwidth_contract_common::events::{
     DEPOSITED_FUNDS_EVENT_TYPE, DEPOSIT_ENCRYPTION_KEY, DEPOSIT_IDENTITY_KEY, DEPOSIT_INFO,
     DEPOSIT_VALUE,
 };
-use nym_coconut_bandwidth_contract_common::spend_credential::{
-    SpendCredential, SpendCredentialResponse,
-};
-use nym_coconut_dkg_common::dealer::{
-    ContractDealing, DealerDetails, DealerDetailsResponse, DealerType,
+use nym_coconut_bandwidth_contract_common::spend_credential::SpendCredentialResponse;
+use nym_coconut_dkg_common::dealer::{DealerDetails, DealerDetailsResponse, DealerType};
+use nym_coconut_dkg_common::dealing::{
+    DealerDealingsStatusResponse, DealingChunkInfo, DealingMetadata, DealingStatus,
+    DealingStatusResponse, PartialContractDealing,
 };
 use nym_coconut_dkg_common::event_attributes::{DKG_PROPOSAL_ID, NODE_INDEX};
 use nym_coconut_dkg_common::types::{
-    EncodedBTEPublicKeyWithProof, Epoch, EpochId, InitialReplacementData, TOTAL_DEALINGS,
+    ChunkIndex, DealingIndex, EncodedBTEPublicKeyWithProof, Epoch, EpochId, EpochState,
+    InitialReplacementData, PartialContractDealingData, State as ContractState,
 };
 use nym_coconut_dkg_common::verification_key::{ContractVKShare, VerificationKeyShare};
-use nym_coconut_interface::{hash_to_scalar, Credential, VerificationKey};
+use nym_coconut_interface::VerificationKey;
 use nym_config::defaults::VOUCHER_INFO;
-use nym_contracts_common::dealings::ContractSafeBytes;
+use nym_contracts_common::IdentityKey;
 use nym_credentials::coconut::bandwidth::BandwidthVoucher;
 use nym_crypto::asymmetric::{encryption, identity};
-use nym_dkg::Threshold;
+use nym_dkg::{NodeIndex, Threshold};
+use nym_mixnet_contract_common::BlockHeight;
 use nym_validator_client::nym_api::routes::{
-    API_VERSION, BANDWIDTH, COCONUT_BLIND_SIGN, COCONUT_ROUTES, COCONUT_VERIFY_BANDWIDTH_CREDENTIAL,
+    API_VERSION, BANDWIDTH, COCONUT_BLIND_SIGN, COCONUT_ROUTES,
 };
 use nym_validator_client::nyxd::cosmwasm_client::logs::Log;
 use nym_validator_client::nyxd::cosmwasm_client::types::ExecuteResult;
@@ -46,121 +49,494 @@ use nym_validator_client::nyxd::{
     AccountId, Algorithm, Event, EventAttribute, ExecTxResult, Fee, Hash, TxResponse,
 };
 use rand_07::rngs::OsRng;
-use rand_07::{Rng, RngCore};
+use rand_07::RngCore;
 use rocket::http::Status;
 use rocket::local::asynchronous::Client;
-use std::collections::HashMap;
+use std::collections::{BTreeMap, HashMap};
+use std::mem;
+use std::ops::Deref;
 use std::str::FromStr;
 use std::sync::atomic::{AtomicU64, Ordering};
-use std::sync::{Arc, RwLock};
+use std::sync::{Arc, Mutex};
+use tempfile::{tempdir, TempDir};
 
+pub(crate) mod fixtures;
+pub(crate) mod helpers;
 mod issued_credentials;
 
 const TEST_COIN_DENOM: &str = "unym";
 const TEST_REWARDING_VALIDATOR_ADDRESS: &str = "n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0";
 
-#[derive(Clone, Debug)]
-pub(crate) struct DummyClient {
-    validator_address: AccountId,
-    tx_db: Arc<RwLock<HashMap<Hash, TxResponse>>>,
-    proposal_db: Arc<RwLock<HashMap<u64, ProposalResponse>>>,
-    spent_credential_db: Arc<RwLock<HashMap<String, SpendCredentialResponse>>>,
-
-    epoch: Arc<RwLock<Epoch>>,
-    dealer_details: Arc<RwLock<HashMap<String, (DealerDetails, bool)>>>,
-    threshold: Arc<RwLock<Option<Threshold>>>,
-    dealings: Arc<RwLock<HashMap<String, Vec<ContractSafeBytes>>>>,
-    verification_share: Arc<RwLock<HashMap<String, ContractVKShare>>>,
-    group_db: Arc<RwLock<HashMap<String, MemberResponse>>>,
-    initial_dealers_db: Arc<RwLock<Option<InitialReplacementData>>>,
+#[derive(Default, Debug)]
+struct InternalCounters {
+    node_index_counter: NodeIndex,
+    tx_hash_counter: u64,
+    proposal_id_counter: u64,
 }
 
-impl DummyClient {
-    pub fn new(validator_address: AccountId) -> Self {
-        Self {
-            validator_address,
-            tx_db: Arc::new(RwLock::new(HashMap::new())),
-            proposal_db: Arc::new(RwLock::new(HashMap::new())),
-            spent_credential_db: Arc::new(RwLock::new(HashMap::new())),
-            epoch: Arc::new(RwLock::new(Epoch::default())),
-            dealer_details: Arc::new(RwLock::new(HashMap::new())),
-            threshold: Arc::new(RwLock::new(None)),
-            dealings: Arc::new(RwLock::new(HashMap::new())),
-            verification_share: Arc::new(RwLock::new(HashMap::new())),
-            group_db: Arc::new(RwLock::new(HashMap::new())),
-            initial_dealers_db: Arc::new(RwLock::new(None)),
+impl InternalCounters {
+    fn next_proposal_id(&mut self) -> NodeIndex {
+        self.proposal_id_counter += 1;
+        self.proposal_id_counter
+    }
+
+    fn next_node_index(&mut self) -> NodeIndex {
+        self.node_index_counter += 1;
+        self.node_index_counter
+    }
+
+    fn next_tx_hash(&mut self) -> Hash {
+        use sha2::Digest;
+
+        // just hash the current counter
+        self.tx_hash_counter += 1;
+        Hash::Sha256(sha2::Sha256::digest(&self.tx_hash_counter.to_be_bytes()).into())
+    }
+}
+
+#[derive(Debug)]
+pub(crate) struct Dealing {
+    // fake entry is created whenever the metadata is submitted
+    pub(crate) metadata: DealingMetadata,
+    pub(crate) chunks: BTreeMap<ChunkIndex, PartialContractDealingData>,
+}
+
+impl Dealing {
+    pub(crate) fn new_metadata_submission(
+        dealing_index: DealingIndex,
+        chunks: Vec<DealingChunkInfo>,
+    ) -> Self {
+        Dealing {
+            metadata: DealingMetadata::new(dealing_index, chunks),
+            chunks: Default::default(),
         }
     }
 
-    pub fn with_tx_db(mut self, tx_db: &Arc<RwLock<HashMap<Hash, TxResponse>>>) -> Self {
-        self.tx_db = Arc::clone(tx_db);
-        self
+    pub(crate) fn unchecked_rebuild(&self) -> Vec<u8> {
+        let mut data = Vec::new();
+
+        for (chunk_index, partial) in self.chunks.iter() {
+            assert!(self
+                .metadata
+                .submitted_chunks
+                .get(chunk_index)
+                .unwrap()
+                .status
+                .submitted());
+
+            data.append(&mut partial.clone())
+        }
+
+        data
+    }
+}
+
+#[derive(Debug)]
+pub(crate) struct FakeDkgContractState {
+    pub(crate) address: AccountId,
+
+    pub(crate) dealers: HashMap<NodeIndex, DealerDetails>,
+    pub(crate) past_dealers: HashMap<NodeIndex, DealerDetails>,
+    pub(crate) initial_dealers: Option<InitialReplacementData>,
+
+    // map of epoch id -> dealer -> dealings
+    pub(crate) dealings: HashMap<EpochId, HashMap<String, HashMap<DealingIndex, Dealing>>>,
+
+    // map of epoch id -> dealer -> vk share
+    pub(crate) verification_shares: HashMap<EpochId, HashMap<String, ContractVKShare>>,
+
+    pub(crate) epoch: Epoch,
+    pub(crate) contract_state: ContractState,
+    pub(crate) threshold: Option<Threshold>,
+}
+
+impl FakeDkgContractState {
+    pub(crate) fn verified_dealers(&self) -> Vec<Addr> {
+        let epoch_id = self.epoch.epoch_id;
+        let Some(shares) = self.verification_shares.get(&epoch_id) else {
+            return Vec::new();
+        };
+
+        shares
+            .values()
+            .filter(|s| s.verified)
+            .map(|s| s.owner.clone())
+            .collect()
     }
 
-    pub fn with_proposal_db(
-        mut self,
-        proposal_db: &Arc<RwLock<HashMap<u64, ProposalResponse>>>,
-    ) -> Self {
-        self.proposal_db = Arc::clone(proposal_db);
-        self
+    fn reset_dkg_state(&mut self) {
+        self.threshold = None;
+        let dealers = mem::take(&mut self.dealers);
+        for (index, details) in dealers {
+            self.past_dealers.insert(index, details);
+        }
     }
 
-    pub fn with_spent_credential_db(
-        mut self,
-        spent_credential_db: &Arc<RwLock<HashMap<String, SpendCredentialResponse>>>,
-    ) -> Self {
-        self.spent_credential_db = Arc::clone(spent_credential_db);
-        self
+    pub(crate) fn reset_epoch_in_reshare_mode(&mut self, block_height: BlockHeight) {
+        if let Some(initial_dealers) = self.initial_dealers.as_mut() {
+            initial_dealers.initial_height = block_height;
+        } else {
+            self.initial_dealers = Some(InitialReplacementData {
+                initial_dealers: self.verified_dealers(),
+                initial_height: block_height,
+            })
+        }
+
+        self.reset_dkg_state();
+        self.epoch.state = EpochState::PublicKeySubmission { resharing: true };
+        self.epoch.epoch_id += 1;
+    }
+}
+
+#[derive(Debug)]
+pub(crate) struct FakeGroupContractState {
+    pub(crate) address: Addr,
+    pub(crate) members: HashMap<String, MemberResponse>,
+}
+
+impl FakeGroupContractState {
+    pub(crate) fn total_weight(&self) -> u64 {
+        self.members
+            .values()
+            .map(|m| m.weight.unwrap_or_default())
+            .sum()
     }
 
-    pub fn _with_epoch(mut self, epoch: &Arc<RwLock<Epoch>>) -> Self {
-        self.epoch = Arc::clone(epoch);
-        self
+    pub(crate) fn add_member<S: Into<String>>(&mut self, address: S, weight: u64) {
+        self.members.insert(
+            address.into(),
+            MemberResponse {
+                weight: Some(weight),
+            },
+        );
+    }
+}
+
+#[derive(Debug)]
+pub(crate) struct FakeMultisigContractState {
+    pub(crate) address: Addr,
+    pub(crate) proposals: HashMap<u64, Proposal>,
+    pub(crate) votes: HashMap<(String, u64), VoteInfo>,
+}
+
+impl FakeMultisigContractState {
+    pub(crate) fn reset_votes(&mut self) {
+        self.votes = HashMap::new()
+    }
+}
+
+#[derive(Debug)]
+pub(crate) struct FakeBandwidthContractState {
+    pub(crate) address: Addr,
+    pub(crate) spent_credentials: HashMap<String, SpendCredentialResponse>,
+}
+
+#[derive(Debug, Clone, Default)]
+pub(crate) struct SharedFakeChain(Arc<Mutex<FakeChainState>>);
+
+impl Deref for SharedFakeChain {
+    type Target = Arc<Mutex<FakeChainState>>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+#[derive(Debug)]
+pub(crate) struct FakeChainState {
+    _counters: InternalCounters,
+
+    pub(crate) block_info: BlockInfo,
+
+    pub(crate) txs: HashMap<Hash, TxResponse>,
+    pub(crate) dkg_contract: FakeDkgContractState,
+    pub(crate) group_contract: FakeGroupContractState,
+    pub(crate) multisig_contract: FakeMultisigContractState,
+    pub(crate) bandwidth_contract: FakeBandwidthContractState,
+}
+
+impl Default for FakeChainState {
+    fn default() -> Self {
+        let multisig_contract =
+            Addr::unchecked("n14ph4e660eyqz0j36zlkaey4zgzexm5twkmjlqaequxr2cjm9eprqsmad6k");
+        let group_contract =
+            Addr::unchecked("n1pd7kfgvr5tpcv0xnlv46c4jsq9jg2r799xxrcwqdm4l2jhq2pjwqrmz5ju");
+        let dkg_contract =
+            Addr::unchecked("n1ahg0erc2fs6xx3j5m8sfx3ryuzdjh6kf6qm9plsf865fltekyrfsesac6a");
+        let bandwidth_contract =
+            Addr::unchecked("n16a32stm6kknhq5cc8rx77elr66pygf2hfszw7wvpq746x3uffylqkjar4l");
+
+        FakeChainState {
+            _counters: Default::default(),
+
+            block_info: mock_env().block,
+            txs: HashMap::new(),
+
+            dkg_contract: FakeDkgContractState {
+                address: dkg_contract.as_ref().parse().unwrap(),
+                dealers: HashMap::new(),
+                past_dealers: Default::default(),
+
+                epoch: Epoch::default(),
+                contract_state: ContractState {
+                    mix_denom: TEST_COIN_DENOM.to_string(),
+                    multisig_addr: multisig_contract.clone(),
+                    group_addr: Cw4Contract::new(group_contract.clone()),
+                    key_size: 5,
+                },
+                dealings: HashMap::new(),
+                verification_shares: HashMap::new(),
+                threshold: None,
+                initial_dealers: None,
+            },
+            group_contract: FakeGroupContractState {
+                address: group_contract,
+                members: Default::default(),
+            },
+            multisig_contract: FakeMultisigContractState {
+                address: multisig_contract,
+                proposals: Default::default(),
+                votes: Default::default(),
+            },
+            bandwidth_contract: FakeBandwidthContractState {
+                address: bandwidth_contract,
+                spent_credentials: Default::default(),
+            },
+        }
+    }
+}
+
+impl FakeChainState {
+    pub(crate) fn total_group_weight(&self) -> u64 {
+        self.group_contract.total_weight()
     }
 
-    pub fn with_dealer_details(
-        mut self,
-        dealer_details: &Arc<RwLock<HashMap<String, (DealerDetails, bool)>>>,
-    ) -> Self {
-        self.dealer_details = Arc::clone(dealer_details);
-        self
+    pub(crate) fn add_member<S: Into<String>>(&mut self, address: S, weight: u64) {
+        self.group_contract.add_member(address, weight)
     }
 
-    pub fn with_threshold(mut self, threshold: &Arc<RwLock<Option<Threshold>>>) -> Self {
-        self.threshold = Arc::clone(threshold);
-        self
+    pub(crate) fn reset_votes(&mut self) {
+        self.multisig_contract.reset_votes()
     }
 
-    pub fn with_dealings(
-        mut self,
-        dealings: &Arc<RwLock<HashMap<String, Vec<ContractSafeBytes>>>>,
-    ) -> Self {
-        self.dealings = Arc::clone(dealings);
-        self
+    pub(crate) fn advance_epoch_in_reshare_mode(&mut self) {
+        self.dkg_contract
+            .reset_epoch_in_reshare_mode(self.block_info.height)
     }
 
-    pub fn with_verification_share(
-        mut self,
-        verification_share: &Arc<RwLock<HashMap<String, ContractVKShare>>>,
-    ) -> Self {
-        self.verification_share = Arc::clone(verification_share);
-        self
+    // TODO: make it return a result
+    fn execute_dkg_contract(&mut self, sender: MessageInfo, msg: &Binary) {
+        let exec_msg: nym_coconut_dkg_common::msg::ExecuteMsg = from_binary(msg).unwrap();
+        match exec_msg {
+            nym_coconut_dkg_common::msg::ExecuteMsg::VerifyVerificationKeyShare {
+                owner,
+                resharing,
+            } => {
+                if sender.sender != self.multisig_contract.address {
+                    panic!("not multisig")
+                }
+                assert_eq!(
+                    self.dkg_contract.epoch.state,
+                    EpochState::VerificationKeyFinalization { resharing }
+                );
+                let epoch_id = self.dkg_contract.epoch.epoch_id;
+                let Some(shares) = self.dkg_contract.verification_shares.get_mut(&epoch_id) else {
+                    unimplemented!("no shares for epoch")
+                };
+                let Some(share) = shares.get_mut(owner.as_str()) else {
+                    unimplemented!("no shares for owner")
+                };
+                share.verified = true
+            }
+            other => unimplemented!("unimplemented exec of {other:?}"),
+        }
     }
 
-    pub fn _with_group_db(
-        mut self,
-        group_db: &Arc<RwLock<HashMap<String, MemberResponse>>>,
-    ) -> Self {
-        self.group_db = Arc::clone(group_db);
-        self
+    // TODO: make it return a result
+    fn execute_contract_msg(&mut self, contract: &String, msg: &Binary, sender: MessageInfo) {
+        if contract == &self.group_contract.address {
+            unimplemented!("group contract exec")
+        }
+        if contract == &self.multisig_contract.address {
+            unimplemented!("multisig contract exec")
+        }
+        if contract == &self.bandwidth_contract.address {
+            unimplemented!("bandwidth contract exec")
+        }
+        if contract == self.dkg_contract.address.as_ref() {
+            return self.execute_dkg_contract(sender, msg);
+        }
+        panic!("unknown contract {contract}")
     }
 
-    pub fn with_initial_dealers_db(
-        mut self,
-        initial_dealers: &Arc<RwLock<Option<InitialReplacementData>>>,
-    ) -> Self {
-        self.initial_dealers_db = Arc::clone(initial_dealers);
-        self
+    // TODO: make it return a result
+    fn execute_wasm_msg(&mut self, msg: &WasmMsg, sender_address: Addr) {
+        match msg {
+            WasmMsg::Execute {
+                contract_addr,
+                msg,
+                funds,
+            } => {
+                let sender = mock_info(sender_address.as_ref(), funds);
+                self.execute_contract_msg(contract_addr, msg, sender)
+            }
+            other => unimplemented!("unimplemented wasm proposal for {other:?}"),
+        }
+    }
+
+    // TODO: make it return a result
+    pub(crate) fn execute_msg(&mut self, msg: &CosmosMsg, sender_address: AccountId) {
+        match msg {
+            CosmosMsg::Wasm(wasm_msg) => {
+                self.execute_wasm_msg(wasm_msg, Addr::unchecked(sender_address.as_ref()))
+            }
+            other => unimplemented!("unimplemented proposal for {other:?}"),
+        };
+    }
+}
+
+fn proposal_to_response(
+    proposal_id: u64,
+    block: &BlockInfo,
+    proposal: Proposal,
+) -> ProposalResponse {
+    // replicate behaviour from `query_proposal` of cw3
+    let status = proposal.current_status(block);
+    let threshold = proposal.threshold.to_response(proposal.total_weight);
+    ProposalResponse {
+        id: proposal_id,
+        title: proposal.title,
+        description: proposal.description,
+        msgs: proposal.msgs,
+        status,
+        expires: proposal.expires,
+        threshold,
+        proposer: proposal.proposer,
+        deposit: proposal.deposit,
+    }
+}
+
+#[derive(Clone, Debug)]
+pub(crate) struct DummyClient {
+    validator_address: AccountId,
+
+    state: SharedFakeChain,
+}
+
+impl DummyClient {
+    pub fn new(validator_address: AccountId, state: SharedFakeChain) -> Self {
+        Self {
+            validator_address,
+            state,
+        }
+    }
+
+    #[allow(dead_code)]
+    pub fn chain_state(&self) -> SharedFakeChain {
+        self.state.clone()
+    }
+
+    // pub fn with_tx_db(mut self, tx_db: &Arc<RwLock<HashMap<Hash, TxResponse>>>) -> Self {
+    //     todo!()
+    //     // self.tx_db = Arc::clone(tx_db);
+    //     // self
+    // }
+    //
+    // pub fn with_proposal_db(
+    //     mut self,
+    //     proposal_db: &Arc<RwLock<HashMap<u64, ProposalResponse>>>,
+    // ) -> Self {
+    //     todo!()
+    //     // self.proposal_db = Arc::clone(proposal_db);
+    //     // self
+    // }
+    //
+    // pub fn with_spent_credential_db(
+    //     mut self,
+    //     spent_credential_db: &Arc<RwLock<HashMap<String, SpendCredentialResponse>>>,
+    // ) -> Self {
+    //     todo!()
+    //     // self.spent_credential_db = Arc::clone(spent_credential_db);
+    //     // self
+    // }
+    //
+    // pub fn _with_epoch(mut self, epoch: &Arc<RwLock<Epoch>>) -> Self {
+    //     todo!()
+    //     // self.epoch = Arc::clone(epoch);
+    //     // self
+    // }
+    //
+    // pub fn with_dealer_details(
+    //     mut self,
+    //     dealer_details: &Arc<RwLock<HashMap<String, (DealerDetails, bool)>>>,
+    // ) -> Self {
+    //     todo!()
+    //     // self.dealer_details = Arc::clone(dealer_details);
+    //     // self
+    // }
+    //
+    // pub fn with_threshold(mut self, threshold: &Arc<RwLock<Option<Threshold>>>) -> Self {
+    //     todo!()
+    //     // self.threshold = Arc::clone(threshold);
+    //     // self
+    // }
+    //
+    // // it's a really bad practice, but I'm not going to be changing it now...
+    // #[allow(clippy::type_complexity)]
+    // pub fn with_dealings(
+    //     mut self,
+    //     dealings: &Arc<RwLock<HashMap<EpochId, HashMap<String, Vec<PartialContractDealing>>>>>,
+    // ) -> Self {
+    //     todo!()
+    //     // self.dealings = Arc::clone(dealings);
+    //     // self
+    // }
+    //
+    // pub fn with_verification_share(
+    //     mut self,
+    //     verification_share: &Arc<RwLock<HashMap<String, ContractVKShare>>>,
+    // ) -> Self {
+    //     todo!()
+    //     // self.verification_share = Arc::clone(verification_share);
+    //     // self
+    // }
+    //
+    // pub fn _with_group_db(
+    //     mut self,
+    //     group_db: &Arc<RwLock<HashMap<String, MemberResponse>>>,
+    // ) -> Self {
+    //     todo!()
+    //     // self.group_db = Arc::clone(group_db);
+    //     // self
+    // }
+    //
+    // pub fn with_initial_dealers_db(
+    //     mut self,
+    //     initial_dealers: &Arc<RwLock<Option<InitialReplacementData>>>,
+    // ) -> Self {
+    //     todo!()
+    //     // self.initial_dealers_db = Arc::clone(initial_dealers);
+    //     // self
+    // }
+
+    async fn get_dealer_by_address(&self, address: &str) -> Option<DealerDetails> {
+        let guard = self.state.lock().unwrap();
+        for dealer in guard.dkg_contract.dealers.values() {
+            if dealer.address.as_str() == address {
+                return Some(dealer.clone());
+            }
+        }
+        None
+    }
+
+    async fn get_past_dealer_by_address(&self, address: &str) -> Option<DealerDetails> {
+        let guard = self.state.lock().unwrap();
+        for dealer in guard.dkg_contract.past_dealers.values() {
+            if dealer.address.as_str() == address {
+                return Some(dealer.clone());
+            }
+        }
+        None
     }
 }
 
@@ -170,32 +546,74 @@ impl super::client::Client for DummyClient {
         self.validator_address.clone()
     }
 
+    async fn dkg_contract_address(&self) -> Result<AccountId> {
+        Ok(self.state.lock().unwrap().dkg_contract.address.clone())
+    }
+
     async fn get_tx(&self, tx_hash: Hash) -> Result<TxResponse> {
-        Ok(self.tx_db.read().unwrap().get(&tx_hash).cloned().unwrap())
+        Ok(self
+            .state
+            .lock()
+            .unwrap()
+            .txs
+            .get(&tx_hash)
+            .cloned()
+            .unwrap())
     }
 
     async fn get_proposal(&self, proposal_id: u64) -> Result<ProposalResponse> {
-        self.proposal_db
-            .read()
-            .unwrap()
+        let chain = self.state.lock().unwrap();
+        let proposal = chain
+            .multisig_contract
+            .proposals
             .get(&proposal_id)
             .cloned()
             .ok_or(CoconutError::IncorrectProposal {
                 reason: String::from("proposal not found"),
-            })
+            })?;
+
+        // replicate behaviour from `query_proposal` of cw3
+        Ok(proposal_to_response(
+            proposal_id,
+            &chain.block_info,
+            proposal,
+        ))
     }
 
     async fn list_proposals(&self) -> Result<Vec<ProposalResponse>> {
-        Ok(self.proposal_db.read().unwrap().values().cloned().collect())
+        let chain = self.state.lock().unwrap();
+        let block = &chain.block_info;
+
+        Ok(chain
+            .multisig_contract
+            .proposals
+            .iter()
+            .map(|(id, proposal)| proposal_to_response(*id, block, proposal.clone()))
+            .collect())
+    }
+
+    async fn get_vote(&self, proposal_id: u64, voter: String) -> Result<VoteResponse> {
+        let vote = self
+            .state
+            .lock()
+            .unwrap()
+            .multisig_contract
+            .votes
+            .get(&(voter, proposal_id))
+            .cloned();
+
+        Ok(VoteResponse { vote })
     }
 
     async fn get_spent_credential(
         &self,
         blinded_serial_number: String,
     ) -> Result<SpendCredentialResponse> {
-        self.spent_credential_db
-            .read()
+        self.state
+            .lock()
             .unwrap()
+            .bandwidth_contract
+            .spent_credentials
             .get(&blinded_serial_number)
             .cloned()
             .ok_or(CoconutError::InvalidCredentialStatus {
@@ -203,86 +621,127 @@ impl super::client::Client for DummyClient {
             })
     }
 
+    async fn contract_state(&self) -> Result<ContractState> {
+        Ok(self
+            .state
+            .lock()
+            .unwrap()
+            .dkg_contract
+            .contract_state
+            .clone())
+    }
+
     async fn get_current_epoch(&self) -> Result<Epoch> {
-        Ok(*self.epoch.read().unwrap())
+        Ok(self.state.lock().unwrap().dkg_contract.epoch)
     }
 
     async fn group_member(&self, addr: String) -> Result<MemberResponse> {
         Ok(self
-            .group_db
-            .read()
+            .state
+            .lock()
             .unwrap()
+            .group_contract
+            .members
             .get(&addr)
             .cloned()
             .unwrap_or(MemberResponse { weight: None }))
     }
 
     async fn get_current_epoch_threshold(&self) -> Result<Option<Threshold>> {
-        Ok(*self.threshold.read().unwrap())
+        Ok(self.state.lock().unwrap().dkg_contract.threshold)
     }
 
     async fn get_initial_dealers(&self) -> Result<Option<InitialReplacementData>> {
-        Ok(self.initial_dealers_db.read().unwrap().clone())
+        Ok(self
+            .state
+            .lock()
+            .unwrap()
+            .dkg_contract
+            .initial_dealers
+            .clone())
     }
 
     async fn get_self_registered_dealer_details(&self) -> Result<DealerDetailsResponse> {
-        let (details, dealer_type) = if let Some((details, current)) = self
-            .dealer_details
-            .read()
-            .unwrap()
-            .get(self.validator_address.as_ref())
-            .cloned()
-        {
-            let dealer_type = if current {
-                DealerType::Current
-            } else {
-                DealerType::Past
-            };
-            (Some(details), dealer_type)
-        } else {
-            (None, DealerType::Unknown)
-        };
+        let address = self.validator_address.as_ref();
+
+        if let Some(details) = self.get_dealer_by_address(address).await {
+            return Ok(DealerDetailsResponse {
+                details: Some(details),
+                dealer_type: DealerType::Current,
+            });
+        }
+
+        if let Some(details) = self.get_past_dealer_by_address(address).await {
+            return Ok(DealerDetailsResponse {
+                details: Some(details),
+                dealer_type: DealerType::Past,
+            });
+        }
+
         Ok(DealerDetailsResponse {
-            details,
-            dealer_type,
+            details: None,
+            dealer_type: DealerType::Unknown,
+        })
+    }
+
+    async fn get_dealing_status(
+        &self,
+        epoch_id: EpochId,
+        dealer: String,
+        dealing_index: DealingIndex,
+    ) -> Result<DealingStatusResponse> {
+        let guard = self.state.lock().unwrap();
+
+        let metadata = guard
+            .dkg_contract
+            .dealings
+            .get(&epoch_id)
+            .and_then(|epoch_dealings| epoch_dealings.get(&dealer))
+            .and_then(|dealer_dealings| dealer_dealings.get(&dealing_index))
+            .map(|info| info.metadata.clone());
+
+        Ok(DealingStatusResponse {
+            epoch_id,
+            dealer: Addr::unchecked(dealer),
+            dealing_index,
+            status: metadata.into(),
         })
     }
 
     async fn get_current_dealers(&self) -> Result<Vec<DealerDetails>> {
         Ok(self
-            .dealer_details
-            .read()
+            .state
+            .lock()
             .unwrap()
+            .dkg_contract
+            .dealers
             .values()
             .cloned()
-            .filter_map(|(d, current)| if current { Some(d) } else { None })
             .collect())
     }
 
-    async fn get_dealings(&self, idx: usize) -> Result<Vec<ContractDealing>> {
-        Ok(self
-            .dealings
-            .read()
-            .unwrap()
-            .iter()
-            .map(|(dealer, dealings)| ContractDealing {
-                dealing: dealings.get(idx).unwrap().clone(),
-                dealer: Addr::unchecked(dealer),
-            })
-            .collect())
-    }
-
-    async fn get_verification_key_shares(
+    async fn get_verification_key_share(
         &self,
-        _epoch_id: EpochId,
-    ) -> Result<Vec<ContractVKShare>> {
-        Ok(self
-            .verification_share
-            .read()
-            .unwrap()
-            .values()
-            .cloned()
-            .collect())
+        epoch_id: EpochId,
+        dealer: String,
+    ) -> Result<Option<ContractVKShare>> {
+        let guard = self.state.lock().unwrap();
+        let epoch_shares = guard.dkg_contract.verification_shares.get(&epoch_id);
+
+        match epoch_shares {
+            None => Ok(None),
+            Some(epoch_shares) => Ok(epoch_shares.get(&dealer).cloned()),
+        }
+    }
+
+    async fn get_verification_key_shares(&self, epoch_id: EpochId) -> Result<Vec<ContractVKShare>> {
+        let guard = self.state.lock().unwrap();
+        let epoch_shares = guard.dkg_contract.verification_shares.get(&epoch_id);
+
+        match epoch_shares {
+            None => Ok(Vec::new()),
+            Some(epoch_shares) => Ok(epoch_shares.values().cloned().collect()),
+        }
     }
 
     async fn vote_proposal(
@@ -291,27 +750,71 @@ impl super::client::Client for DummyClient {
         vote_yes: bool,
         _fee: Option<Fee>,
     ) -> Result<()> {
-        if let Some(proposal) = self.proposal_db.write().unwrap().get_mut(&proposal_id) {
-            // for now, just suppose that every vote is honest
-            if !vote_yes {
-                proposal.status = cw3::Status::Rejected;
-            } else if vote_yes && proposal.status == cw3::Status::Open {
-                proposal.status = cw3::Status::Passed;
-            }
+        let voter = self.validator_address.to_string();
+        let mut chain = self.state.lock().unwrap();
+        if !chain.multisig_contract.proposals.contains_key(&proposal_id) {
+            return Err(CoconutError::IncorrectProposal {
+                reason: String::from("proposal not found"),
+            });
         }
+
+        // for now we assume every group member is a voter
+        let weight = chain
+            .group_contract
+            .members
+            .get(&voter)
+            .expect("todo: not a voter")
+            .weight
+            .expect("no vote weight");
+
+        let vote = if vote_yes { Vote::Yes } else { Vote::No };
+
+        if chain
+            .multisig_contract
+            .votes
+            .get(&(voter.clone(), proposal_id))
+            .is_some()
+        {
+            todo!("already voted");
+        }
+        chain.multisig_contract.votes.insert(
+            (voter.clone(), proposal_id),
+            VoteInfo {
+                proposal_id,
+                voter,
+                vote,
+                weight,
+            },
+        );
+
+        let block_info = chain.block_info.clone();
+        if let Some(proposal) = chain.multisig_contract.proposals.get_mut(&proposal_id) {
+            proposal.votes.add_vote(vote, weight);
+            proposal.update_status(&block_info)
+        }
+
         Ok(())
     }
 
     async fn execute_proposal(&self, proposal_id: u64) -> Result<()> {
-        self.proposal_db
-            .write()
-            .unwrap()
-            .entry(proposal_id)
-            .and_modify(|prop| {
-                if prop.status == cw3::Status::Passed {
-                    prop.status = cw3::Status::Executed
-                }
+        let mut chain = self.state.lock().unwrap();
+        let multisig_address: AccountId = chain.multisig_contract.address.as_str().parse().unwrap();
+
+        let Some(proposal) = chain.multisig_contract.proposals.get_mut(&proposal_id) else {
+            return Err(CoconutError::ProposalIdError {
+                reason: String::from("proposal id not found"),
             });
+        };
+
+        if proposal.status != cw3::Status::Passed {
+            unimplemented!("proposal hasn't been passed")
+        }
+        proposal.status = cw3::Status::Executed;
+
+        for msg in &proposal.msgs.clone() {
+            chain.execute_msg(msg, multisig_address.clone());
+        }
+
         Ok(())
     }
 
@@ -322,37 +825,49 @@ impl super::client::Client for DummyClient {
     async fn register_dealer(
         &self,
         bte_public_key_with_proof: EncodedBTEPublicKeyWithProof,
+        identity_key: IdentityKey,
         announce_address: String,
         _resharing: bool,
     ) -> Result<ExecuteResult> {
-        let mut dealer_details = self.dealer_details.write().unwrap();
-        let assigned_index = if let Some((details, active)) =
-            dealer_details.get_mut(self.validator_address.as_ref())
+        let assigned_index = if let Some(already_registered) = self
+            .get_dealer_by_address(self.validator_address.as_ref())
+            .await
         {
-            *active = true;
-            details.assigned_index
+            // current dealer
+            already_registered.assigned_index
+        } else if let Some(registered_in_the_past) = self
+            .get_past_dealer_by_address(self.validator_address.as_ref())
+            .await
+        {
+            // past dealer
+            let index = registered_in_the_past.assigned_index;
+            let mut guard = self.state.lock().unwrap();
+            guard
+                .dkg_contract
+                .dealers
+                .insert(index, registered_in_the_past);
+
+            index
         } else {
-            // let assigned_index = OsRng.gen();
-            let assigned_index = dealer_details
-                .values()
-                .map(|(d, _)| d.assigned_index)
-                .max()
-                .unwrap_or(0)
-                + 1;
-            dealer_details.insert(
-                self.validator_address.to_string(),
-                (
-                    DealerDetails {
-                        address: Addr::unchecked(self.validator_address.to_string()),
-                        bte_public_key_with_proof,
-                        announce_address,
-                        assigned_index,
-                    },
-                    true,
-                ),
+            // new dealer
+            let mut guard = self.state.lock().unwrap();
+            let assigned_index = guard._counters.next_node_index();
+
+            guard.dkg_contract.dealers.insert(
+                assigned_index,
+                DealerDetails {
+                    address: Addr::unchecked(self.validator_address.to_string()),
+                    bte_public_key_with_proof,
+                    ed25519_identity: identity_key,
+                    announce_address,
+                    assigned_index,
+                },
             );
             assigned_index
         };
+        let mut guard = self.state.lock().unwrap();
+        let transaction_hash = guard._counters.next_tx_hash();
+
         Ok(ExecuteResult {
             logs: vec![Log {
                 msg_index: 0,
@@ -360,91 +875,74 @@ impl super::client::Client for DummyClient {
                     .add_attribute(NODE_INDEX, assigned_index.to_string())],
             }],
             data: Default::default(),
-            transaction_hash: Hash::from_bytes(Algorithm::Sha256, &[0; 32]).unwrap(),
+            transaction_hash,
             gas_info: Default::default(),
         })
     }
-
-    async fn submit_dealing(
-        &self,
-        dealing_bytes: ContractSafeBytes,
-        _resharing: bool,
-    ) -> Result<ExecuteResult> {
-        self.dealings
-            .write()
-            .unwrap()
-            .entry(self.validator_address.to_string())
-            .and_modify(|v| {
-                if v.len() < TOTAL_DEALINGS {
-                    v.push(dealing_bytes.clone())
-                }
-            })
-            .or_insert_with(|| vec![dealing_bytes]);
-
-        Ok(ExecuteResult {
-            logs: vec![],
-            data: Default::default(),
-            transaction_hash: Hash::from_bytes(Algorithm::Sha256, &[0; 32]).unwrap(),
-            gas_info: Default::default(),
-        })
-    }
-
     async fn submit_verification_key_share(
         &self,
         share: VerificationKeyShare,
         resharing: bool,
     ) -> Result<ExecuteResult> {
-        let (dealer_details, active) = self
-            .dealer_details
-            .read()
-            .unwrap()
-            .get(self.validator_address.as_ref())
-            .unwrap()
-            .clone();
-        if !active {
+        let address = self.validator_address.to_string();
+
+        let Some(dealer_details) = self.get_dealer_by_address(&address).await else {
             // Just throw some error, not really the correct one
             return Err(CoconutError::DepositEncrKeyNotFound);
-        }
-        self.verification_share.write().unwrap().insert(
-            self.validator_address.to_string(),
-            ContractVKShare {
-                share,
-                announce_address: dealer_details.announce_address.clone(),
-                node_index: dealer_details.assigned_index,
-                owner: Addr::unchecked(self.validator_address.to_string()),
-                epoch_id: 0,
-                verified: false,
-            },
-        );
-        let proposal_id = OsRng.gen();
+        };
+
+        let mut chain = self.state.lock().unwrap();
+        let dkg_contract = chain.dkg_contract.address.clone();
+        let epoch_id = chain.dkg_contract.epoch.epoch_id;
+
+        chain
+            .dkg_contract
+            .verification_shares
+            .entry(epoch_id)
+            .or_default()
+            .insert(
+                self.validator_address.to_string(),
+                ContractVKShare {
+                    share,
+                    announce_address: dealer_details.announce_address.clone(),
+                    node_index: dealer_details.assigned_index,
+                    owner: Addr::unchecked(&address),
+                    epoch_id,
+                    verified: false,
+                },
+            );
+
+        let proposal_id = chain._counters.next_proposal_id();
         let verify_vk_share_req =
             nym_coconut_dkg_common::msg::ExecuteMsg::VerifyVerificationKeyShare {
-                owner: Addr::unchecked(self.validator_address.as_ref()),
+                owner: address,
                 resharing,
             };
         let verify_vk_share_msg = CosmosMsg::Wasm(WasmMsg::Execute {
-            contract_addr: String::new(),
+            contract_addr: chain.dkg_contract.address.to_string(),
             msg: to_binary(&verify_vk_share_req).unwrap(),
             funds: vec![],
         });
-        let proposal = ProposalResponse {
-            id: proposal_id,
+        let proposal = Proposal {
             title: String::new(),
             description: String::new(),
             msgs: vec![verify_vk_share_msg],
             status: cw3::Status::Open,
             expires: cw_utils::Expiration::Never {},
-            threshold: cw_utils::ThresholdResponse::AbsolutePercentage {
+            threshold: cw_utils::Threshold::AbsolutePercentage {
                 percentage: Decimal::from_ratio(2u32, 3u32),
-                total_weight: 100,
             },
-            proposer: Addr::unchecked(self.validator_address.as_ref()),
+            total_weight: chain.total_group_weight(),
+            votes: Votes::yes(0),
+            proposer: Addr::unchecked(dkg_contract.as_ref()),
             deposit: None,
+            start_height: 0,
         };
-        self.proposal_db
-            .write()
-            .unwrap()
+        chain
+            .multisig_contract
+            .proposals
             .insert(proposal_id, proposal);
+        let transaction_hash = chain._counters.next_tx_hash();
         Ok(ExecuteResult {
             logs: vec![Log {
                 msg_index: 0,
@@ -452,7 +950,171 @@ impl super::client::Client for DummyClient {
                     .add_attribute(DKG_PROPOSAL_ID, proposal_id.to_string())],
             }],
             data: Default::default(),
-            transaction_hash: Hash::from_bytes(Algorithm::Sha256, &[0; 32]).unwrap(),
+            transaction_hash,
+            gas_info: Default::default(),
+        })
+    }
+
+    async fn get_dealer_dealings_status(
+        &self,
+        epoch_id: EpochId,
+        dealer: String,
+    ) -> Result<DealerDealingsStatusResponse> {
+        let guard = self.state.lock().unwrap();
+        let key_size = guard.dkg_contract.contract_state.key_size;
+
+        let dealer_addr = Addr::unchecked(&dealer);
+
+        let Some(epoch_dealings) = guard.dkg_contract.dealings.get(&epoch_id) else {
+            return Ok(DealerDealingsStatusResponse {
+                epoch_id,
+                dealer: dealer_addr,
+                all_dealings_fully_submitted: false,
+                dealing_submission_status: Default::default(),
+            });
+        };
+
+        let Some(dealer_dealings) = epoch_dealings.get(&dealer) else {
+            return Ok(DealerDealingsStatusResponse {
+                epoch_id,
+                dealer: dealer_addr,
+                all_dealings_fully_submitted: false,
+                dealing_submission_status: Default::default(),
+            });
+        };
+
+        let mut dealing_submission_status: BTreeMap<DealingIndex, DealingStatus> = BTreeMap::new();
+        for dealing_index in 0..key_size {
+            let metadata = dealer_dealings
+                .get(&dealing_index)
+                .map(|d| d.metadata.clone());
+            dealing_submission_status.insert(dealing_index, metadata.into());
+        }
+
+        Ok(DealerDealingsStatusResponse {
+            epoch_id,
+            dealer: Addr::unchecked(&dealer),
+            all_dealings_fully_submitted: dealing_submission_status
+                .values()
+                .all(|d| d.fully_submitted),
+            dealing_submission_status,
+        })
+    }
+
+    async fn get_dealing_metadata(
+        &self,
+        epoch_id: EpochId,
+        dealer: String,
+        dealing_index: DealingIndex,
+    ) -> Result<Option<DealingMetadata>> {
+        let guard = self.state.lock().unwrap();
+
+        let Some(epoch_dealings) = guard.dkg_contract.dealings.get(&epoch_id) else {
+            return Ok(None);
+        };
+
+        let Some(dealer_dealings) = epoch_dealings.get(&dealer) else {
+            return Ok(None);
+        };
+
+        let Some(dealing) = dealer_dealings.get(&dealing_index) else {
+            return Ok(None);
+        };
+
+        Ok(Some(dealing.metadata.clone()))
+    }
+
+    async fn get_dealing_chunk(
+        &self,
+        epoch_id: EpochId,
+        dealer: &str,
+        dealing_index: DealingIndex,
+        chunk_index: ChunkIndex,
+    ) -> Result<Option<PartialContractDealingData>> {
+        let guard = self.state.lock().unwrap();
+
+        let Some(epoch_dealings) = guard.dkg_contract.dealings.get(&epoch_id) else {
+            return Ok(None);
+        };
+
+        let Some(dealer_dealings) = epoch_dealings.get(dealer) else {
+            return Ok(None);
+        };
+
+        let Some(dealing) = dealer_dealings.get(&dealing_index) else {
+            return Ok(None);
+        };
+
+        Ok(dealing.chunks.get(&chunk_index).cloned())
+    }
+
+    async fn submit_dealing_metadata(
+        &self,
+        dealing_index: DealingIndex,
+        chunks: Vec<DealingChunkInfo>,
+        _resharing: bool,
+    ) -> Result<ExecuteResult> {
+        let mut guard = self.state.lock().unwrap();
+        let current_epoch = guard.dkg_contract.epoch.epoch_id;
+
+        let epoch_dealings = guard
+            .dkg_contract
+            .dealings
+            .entry(current_epoch)
+            .or_default();
+
+        let dealer_dealings = epoch_dealings
+            .entry(self.validator_address.to_string())
+            .or_default();
+        dealer_dealings.insert(
+            dealing_index,
+            Dealing::new_metadata_submission(dealing_index, chunks),
+        );
+
+        let transaction_hash = guard._counters.next_tx_hash();
+
+        Ok(ExecuteResult {
+            logs: vec![],
+            data: Default::default(),
+            transaction_hash,
+            gas_info: Default::default(),
+        })
+    }
+
+    async fn submit_dealing_chunk(
+        &self,
+        chunk: PartialContractDealing,
+        _resharing: bool,
+    ) -> Result<ExecuteResult> {
+        let mut guard = self.state.lock().unwrap();
+        let current_epoch = guard.dkg_contract.epoch.epoch_id;
+        let current_height = guard.block_info.height;
+
+        // normally we should do checks for existence, etc.
+        // but since this is a testing code, we assume everything is sent in order and the appropriate entries exist
+        let epoch_dealings = guard.dkg_contract.dealings.get_mut(&current_epoch).unwrap();
+
+        let dealer_dealings = epoch_dealings
+            .get_mut(self.validator_address.as_ref())
+            .unwrap();
+
+        let dealing_chunks = dealer_dealings.get_mut(&chunk.dealing_index).unwrap();
+        dealing_chunks.chunks.insert(chunk.chunk_index, chunk.data);
+
+        dealing_chunks
+            .metadata
+            .submitted_chunks
+            .get_mut(&chunk.chunk_index)
+            .unwrap()
+            .status
+            .submission_height = Some(current_height);
+
+        let transaction_hash = guard._counters.next_tx_hash();
+
+        Ok(ExecuteResult {
+            logs: vec![],
+            data: Default::default(),
+            transaction_hash,
             gas_info: Default::default(),
         })
     }
@@ -613,40 +1275,48 @@ fn dummy_signature() -> identity::Signature {
         .unwrap()
 }
 
-async fn nym_api_storage_fixture(identity: &identity::KeyPair) -> NymApiStorage {
-    let mut db_dir = std::env::temp_dir();
-    db_dir.push(identity.public_key().to_base58_string());
-    NymApiStorage::init(db_dir).await.unwrap()
-}
-
 struct TestFixture {
     rocket: Client,
     storage: NymApiStorage,
-    tx_db: Arc<RwLock<HashMap<Hash, TxResponse>>>,
+    chain_state: SharedFakeChain,
     epoch: Arc<AtomicU64>,
+
+    _tmp_dir: TempDir,
 }
 
 impl TestFixture {
     async fn new() -> Self {
-        let mut rng = OsRng;
+        let mut rng = crate::coconut::tests::fixtures::test_rng_07([69u8; 32]);
         let params = Parameters::new(4).unwrap();
-        let coconut_keypair = ttp_keygen(&params, 1, 1).unwrap().remove(0);
+        let coconut_keypair = nym_coconut::ttp_keygen(&params, 1, 1).unwrap().remove(0);
         let identity = identity::KeyPair::new(&mut rng);
         let epoch = Arc::new(AtomicU64::new(1));
         let comm_channel =
             DummyCommunicationChannel::new(coconut_keypair.verification_key().clone())
                 .with_epoch(epoch.clone());
-        let storage = nym_api_storage_fixture(&identity).await;
+
+        // TODO: it's AWFUL to test with actual storage, we should somehow abstract it away
+        let tmp_dir = tempdir().unwrap();
+        let storage = NymApiStorage::init(tmp_dir.path().join("TESTING_STORAGE.db"))
+            .await
+            .unwrap();
 
         let staged_key_pair = crate::coconut::KeyPair::new();
-        staged_key_pair.set(Some(coconut_keypair)).await;
+        staged_key_pair
+            .set(KeyPairWithEpoch {
+                keys: coconut_keypair,
+                issued_for_epoch: 1,
+            })
+            .await;
+        staged_key_pair.validate();
 
-        let tx_db = Arc::new(RwLock::new(HashMap::new()));
-        let nyxd_client =
-            DummyClient::new(AccountId::from_str(TEST_REWARDING_VALIDATOR_ADDRESS).unwrap())
-                .with_tx_db(&tx_db);
+        let chain_state = SharedFakeChain::default();
+        let nyxd_client = DummyClient::new(
+            AccountId::from_str(TEST_REWARDING_VALIDATOR_ADDRESS).unwrap(),
+            chain_state.clone(),
+        );
 
-        let rocket = rocket::build().attach(coconut::stage(
+        let rocket = rocket::build().attach(crate::coconut::stage(
             nyxd_client,
             TEST_COIN_DENOM.to_string(),
             identity,
@@ -660,8 +1330,9 @@ impl TestFixture {
                 .await
                 .expect("valid rocket instance"),
             storage,
-            tx_db,
+            chain_state,
             epoch,
+            _tmp_dir: tmp_dir,
         }
     }
 
@@ -670,13 +1341,13 @@ impl TestFixture {
     }
 
     fn add_tx(&self, hash: Hash, tx: TxResponse) {
-        self.tx_db.write().unwrap().insert(hash, tx);
+        self.chain_state.lock().unwrap().txs.insert(hash, tx);
     }
 
     fn add_deposit_tx(&self, voucher: &BandwidthVoucher) {
-        let mut guard = self.tx_db.write().unwrap();
+        let mut guard = self.chain_state.lock().unwrap();
         let fixture = deposit_tx_fixture(voucher);
-        guard.insert(voucher.tx_hash(), fixture);
+        guard.txs.insert(voucher.tx_hash(), fixture);
     }
 
     async fn issue_dummy_credential(&self) {
@@ -700,6 +1371,7 @@ impl TestFixture {
             .json(&req)
             .dispatch()
             .await;
+
         assert_eq!(response.status(), Status::Ok);
         serde_json::from_str(&response.into_string().await.unwrap()).unwrap()
     }
@@ -725,557 +1397,646 @@ impl TestFixture {
     }
 }
 
-#[tokio::test]
-async fn already_issued() {
-    let (_, request_body) = voucher_request_fixture(coin(1234, TEST_COIN_DENOM), None);
-    let tx_hash = request_body.tx_hash;
-    let tx_entry = tx_entry_fixture(tx_hash);
+#[cfg(test)]
+mod credential_tests {
+    use super::*;
+    use crate::coconut::tests::helpers::init_chain;
+    use nym_api_requests::coconut::{VerifyCredentialBody, VerifyCredentialResponse};
+    use nym_coconut::tests::helpers::theta_from_keys_and_attributes;
+    use nym_coconut::{hash_to_scalar, ttp_keygen};
+    use nym_coconut_bandwidth_contract_common::spend_credential::SpendCredential;
+    use nym_coconut_interface::Credential;
+    use nym_validator_client::nym_api::routes::COCONUT_VERIFY_BANDWIDTH_CREDENTIAL;
 
-    let test_fixture = TestFixture::new().await;
-    test_fixture.add_tx(tx_hash, tx_entry);
+    #[tokio::test]
+    async fn already_issued() {
+        let (_, request_body) = voucher_request_fixture(coin(1234, TEST_COIN_DENOM), None);
+        let tx_hash = request_body.tx_hash;
+        let tx_entry = tx_entry_fixture(tx_hash);
 
-    let sig = blinded_signature_fixture();
-    let commitments = request_body.encode_commitments();
-    let public = request_body.public_attributes_plain.clone();
-    test_fixture
-        .storage
-        .store_issued_credential(42, tx_hash, &sig, dummy_signature(), commitments, public)
-        .await
-        .unwrap();
+        let test_fixture = TestFixture::new().await;
+        test_fixture.add_tx(tx_hash, tx_entry);
 
-    let response = test_fixture
-        .rocket
-        .post(format!(
-            "/{}/{}/{}/{}",
-            API_VERSION, COCONUT_ROUTES, BANDWIDTH, COCONUT_BLIND_SIGN
-        ))
-        .json(&request_body)
-        .dispatch()
-        .await;
-    assert_eq!(response.status(), Status::Ok);
-    let expected_response = BlindedSignatureResponse::new(sig);
-
-    // This is a more direct way, but there's a bug which makes it hang https://github.com/SergioBenitez/Rocket/issues/1893
-    // let blinded_signature_response = response
-    //     .into_json::<BlindedSignatureResponse>()
-    //     .await
-    //     .unwrap();
-    let blinded_signature_response =
-        serde_json::from_str::<BlindedSignatureResponse>(&response.into_string().await.unwrap())
+        let sig = blinded_signature_fixture();
+        let commitments = request_body.encode_commitments();
+        let public = request_body.public_attributes_plain.clone();
+        test_fixture
+            .storage
+            .store_issued_credential(42, tx_hash, &sig, dummy_signature(), commitments, public)
+            .await
             .unwrap();
-    assert_eq!(
-        blinded_signature_response.to_bytes(),
-        expected_response.to_bytes()
-    );
-}
 
-#[tokio::test]
-async fn state_functions() {
-    let mut rng = OsRng;
-    let identity = identity::KeyPair::new(&mut rng);
+        let response = test_fixture
+            .rocket
+            .post(format!(
+                "/{}/{}/{}/{}",
+                API_VERSION, COCONUT_ROUTES, BANDWIDTH, COCONUT_BLIND_SIGN
+            ))
+            .json(&request_body)
+            .dispatch()
+            .await;
+        assert_eq!(response.status(), Status::Ok);
+        let expected_response = BlindedSignatureResponse::new(sig);
 
-    let nyxd_client =
-        DummyClient::new(AccountId::from_str(TEST_REWARDING_VALIDATOR_ADDRESS).unwrap());
-    let params = Parameters::new(4).unwrap();
-    let key_pair = ttp_keygen(&params, 1, 1).unwrap().remove(0);
-    let mut db_dir = std::env::temp_dir();
-    db_dir.push(&key_pair.verification_key().to_bs58()[..8]);
-    let storage = NymApiStorage::init(db_dir).await.unwrap();
-    let comm_channel = DummyCommunicationChannel::new(key_pair.verification_key().clone());
-    let staged_key_pair = crate::coconut::KeyPair::new();
-    staged_key_pair.set(Some(key_pair)).await;
-    let state = State::new(
-        nyxd_client,
-        TEST_COIN_DENOM.to_string(),
-        identity,
-        staged_key_pair,
-        comm_channel,
-        storage.clone(),
-    );
-
-    let tx_hash = "6B27412050B823E58BB38447D7870BBC8CBE3C51C905BEA89D459ACCDA80A00E"
-        .parse()
-        .unwrap();
-    assert!(state.already_issued(tx_hash).await.unwrap().is_none());
-
-    let (_, request_body) = voucher_request_fixture(coin(1234, TEST_COIN_DENOM), None);
-    let commitments = request_body.encode_commitments();
-    let public = request_body.public_attributes_plain.clone();
-    let sig = blinded_signature_fixture();
-    storage
-        .store_issued_credential(
-            42,
-            tx_hash,
-            &sig,
-            dummy_signature(),
-            commitments.clone(),
-            public.clone(),
+        // This is a more direct way, but there's a bug which makes it hang https://github.com/SergioBenitez/Rocket/issues/1893
+        // let blinded_signature_response = response
+        //     .into_json::<BlindedSignatureResponse>()
+        //     .await
+        //     .unwrap();
+        let blinded_signature_response = serde_json::from_str::<BlindedSignatureResponse>(
+            &response.into_string().await.unwrap(),
         )
-        .await
         .unwrap();
+        assert_eq!(
+            blinded_signature_response.to_bytes(),
+            expected_response.to_bytes()
+        );
+    }
 
-    assert_eq!(
-        state
-            .already_issued(tx_hash)
+    #[tokio::test]
+    async fn state_functions() {
+        let mut rng = OsRng;
+        let identity = identity::KeyPair::new(&mut rng);
+
+        let nyxd_client = DummyClient::new(
+            AccountId::from_str(TEST_REWARDING_VALIDATOR_ADDRESS).unwrap(),
+            Default::default(),
+        );
+        let params = Parameters::new(4).unwrap();
+        let key_pair = ttp_keygen(&params, 1, 1).unwrap().remove(0);
+        let tmp_dir = tempdir().unwrap();
+
+        let storage = NymApiStorage::init(tmp_dir.path().join("storage.db"))
             .await
-            .unwrap()
-            .unwrap()
-            .to_bytes(),
-        blinded_signature_fixture().to_bytes()
-    );
+            .unwrap();
+        let comm_channel = DummyCommunicationChannel::new(key_pair.verification_key().clone());
+        let staged_key_pair = crate::coconut::KeyPair::new();
+        staged_key_pair
+            .set(KeyPairWithEpoch {
+                keys: key_pair,
+                issued_for_epoch: 1,
+            })
+            .await;
+        staged_key_pair.validate();
 
-    let blinded_signature = BlindedSignature::from_bytes(&[
-        183, 217, 166, 113, 40, 123, 74, 25, 72, 31, 136, 19, 125, 95, 217, 228, 96, 113, 25, 240,
-        12, 102, 125, 11, 174, 20, 216, 82, 192, 71, 27, 194, 48, 20, 17, 95, 243, 179, 82, 21, 57,
-        143, 101, 19, 22, 186, 147, 13, 147, 238, 39, 119, 15, 36, 251, 131, 250, 38, 185, 113,
-        187, 40, 227, 107, 134, 190, 123, 183, 126, 176, 226, 173, 147, 137, 17, 175, 13, 115, 78,
-        222, 119, 93, 146, 116, 229, 0, 152, 51, 232, 2, 102, 204, 147, 202, 254, 243,
-    ])
-    .unwrap();
+        let state = State::new(
+            nyxd_client,
+            TEST_COIN_DENOM.to_string(),
+            identity,
+            staged_key_pair,
+            comm_channel,
+            storage.clone(),
+        );
 
-    // Check that the new payload is not stored if there was already something signed for tx_hash
-    let storage_err = storage
-        .store_issued_credential(
-            42,
-            tx_hash,
-            &blinded_signature,
-            dummy_signature(),
-            commitments.clone(),
-            public.clone(),
-        )
-        .await;
-    assert!(storage_err.is_err());
+        let tx_hash = "6B27412050B823E58BB38447D7870BBC8CBE3C51C905BEA89D459ACCDA80A00E"
+            .parse()
+            .unwrap();
+        assert!(state.already_issued(tx_hash).await.unwrap().is_none());
 
-    // And use a new hash to store a new signature
-    let tx_hash = "97D64C38D6601B1F0FD3A82E20D252685CB7A210AFB0261018590659AB82B0BF"
-        .parse()
-        .unwrap();
-
-    storage
-        .store_issued_credential(
-            42,
-            tx_hash,
-            &blinded_signature,
-            dummy_signature(),
-            commitments.clone(),
-            public.clone(),
-        )
-        .await
-        .unwrap();
-
-    // Check that the same value for tx_hash is returned
-    assert_eq!(
-        state
-            .already_issued(tx_hash)
+        let (_, request_body) = voucher_request_fixture(coin(1234, TEST_COIN_DENOM), None);
+        let commitments = request_body.encode_commitments();
+        let public = request_body.public_attributes_plain.clone();
+        let sig = blinded_signature_fixture();
+        storage
+            .store_issued_credential(
+                42,
+                tx_hash,
+                &sig,
+                dummy_signature(),
+                commitments.clone(),
+                public.clone(),
+            )
             .await
-            .unwrap()
-            .unwrap()
-            .to_bytes(),
-        blinded_signature.to_bytes()
-    );
-}
+            .unwrap();
 
-#[tokio::test]
-async fn blind_sign_correct() {
-    let tx_hash =
-        Hash::from_str("7C41AF8266D91DE55E1C8F4712E6A952A165ED3D8C27C7B00428CBD0DE00A52B").unwrap();
+        assert_eq!(
+            state
+                .already_issued(tx_hash)
+                .await
+                .unwrap()
+                .unwrap()
+                .to_bytes(),
+            blinded_signature_fixture().to_bytes()
+        );
 
-    let params = Parameters::new(4).unwrap();
-    let mut rng = OsRng;
-    let nym_api_identity = identity::KeyPair::new(&mut rng);
+        let blinded_signature = BlindedSignature::from_bytes(&[
+            183, 217, 166, 113, 40, 123, 74, 25, 72, 31, 136, 19, 125, 95, 217, 228, 96, 113, 25,
+            240, 12, 102, 125, 11, 174, 20, 216, 82, 192, 71, 27, 194, 48, 20, 17, 95, 243, 179,
+            82, 21, 57, 143, 101, 19, 22, 186, 147, 13, 147, 238, 39, 119, 15, 36, 251, 131, 250,
+            38, 185, 113, 187, 40, 227, 107, 134, 190, 123, 183, 126, 176, 226, 173, 147, 137, 17,
+            175, 13, 115, 78, 222, 119, 93, 146, 116, 229, 0, 152, 51, 232, 2, 102, 204, 147, 202,
+            254, 243,
+        ])
+        .unwrap();
 
-    let identity_keypair = identity::KeyPair::new(&mut rng);
-    let encryption_keypair = encryption::KeyPair::new(&mut rng);
-    let voucher = BandwidthVoucher::new(
-        &params,
-        "1234".to_string(),
-        VOUCHER_INFO.to_string(),
-        tx_hash,
-        identity::PrivateKey::from_base58_string(identity_keypair.private_key().to_base58_string())
+        // Check that the new payload is not stored if there was already something signed for tx_hash
+        let storage_err = storage
+            .store_issued_credential(
+                42,
+                tx_hash,
+                &blinded_signature,
+                dummy_signature(),
+                commitments.clone(),
+                public.clone(),
+            )
+            .await;
+        assert!(storage_err.is_err());
+
+        // And use a new hash to store a new signature
+        let tx_hash = "97D64C38D6601B1F0FD3A82E20D252685CB7A210AFB0261018590659AB82B0BF"
+            .parse()
+            .unwrap();
+
+        storage
+            .store_issued_credential(
+                42,
+                tx_hash,
+                &blinded_signature,
+                dummy_signature(),
+                commitments.clone(),
+                public.clone(),
+            )
+            .await
+            .unwrap();
+
+        // Check that the same value for tx_hash is returned
+        assert_eq!(
+            state
+                .already_issued(tx_hash)
+                .await
+                .unwrap()
+                .unwrap()
+                .to_bytes(),
+            blinded_signature.to_bytes()
+        );
+    }
+
+    #[tokio::test]
+    async fn blind_sign_correct() {
+        let tx_hash =
+            Hash::from_str("7C41AF8266D91DE55E1C8F4712E6A952A165ED3D8C27C7B00428CBD0DE00A52B")
+                .unwrap();
+
+        let params = Parameters::new(4).unwrap();
+        let mut rng = OsRng;
+        let nym_api_identity = identity::KeyPair::new(&mut rng);
+
+        let identity_keypair = identity::KeyPair::new(&mut rng);
+        let encryption_keypair = encryption::KeyPair::new(&mut rng);
+        let voucher = BandwidthVoucher::new(
+            &params,
+            "1234".to_string(),
+            VOUCHER_INFO.to_string(),
+            tx_hash,
+            identity::PrivateKey::from_base58_string(
+                identity_keypair.private_key().to_base58_string(),
+            )
             .unwrap(),
-        encryption::PrivateKey::from_bytes(&encryption_keypair.private_key().to_bytes()).unwrap(),
-    );
+            encryption::PrivateKey::from_bytes(&encryption_keypair.private_key().to_bytes())
+                .unwrap(),
+        );
 
-    let key_pair = ttp_keygen(&params, 1, 1).unwrap().remove(0);
-    let mut db_dir = std::env::temp_dir();
-    db_dir.push(&key_pair.verification_key().to_bs58()[..8]);
-    let storage = NymApiStorage::init(db_dir).await.unwrap();
-    let tx_db = Arc::new(RwLock::new(HashMap::new()));
+        let key_pair = ttp_keygen(&params, 1, 1).unwrap().remove(0);
+        let tmp_dir = tempdir().unwrap();
+        let storage = NymApiStorage::init(tmp_dir.path().join("storage.db"))
+            .await
+            .unwrap();
 
-    let tx_entry = deposit_tx_fixture(&voucher);
+        let chain = init_chain();
 
-    tx_db.write().unwrap().insert(tx_hash, tx_entry.clone());
-    let nyxd_client =
-        DummyClient::new(AccountId::from_str(TEST_REWARDING_VALIDATOR_ADDRESS).unwrap())
-            .with_tx_db(&tx_db);
-    let comm_channel = DummyCommunicationChannel::new(key_pair.verification_key().clone());
-    let staged_key_pair = crate::coconut::KeyPair::new();
-    staged_key_pair.set(Some(key_pair)).await;
+        let tx_entry = deposit_tx_fixture(&voucher);
+        chain.lock().unwrap().txs.insert(tx_hash, tx_entry.clone());
 
-    let rocket = rocket::build().attach(coconut::stage(
-        nyxd_client,
-        TEST_COIN_DENOM.to_string(),
-        nym_api_identity,
-        staged_key_pair,
-        comm_channel,
-        storage.clone(),
-    ));
-    let client = Client::tracked(rocket)
-        .await
-        .expect("valid rocket instance");
+        let nyxd_client = DummyClient::new(
+            AccountId::from_str(TEST_REWARDING_VALIDATOR_ADDRESS).unwrap(),
+            chain.clone(),
+        );
 
-    let request_signature = voucher.sign();
+        let comm_channel = DummyCommunicationChannel::new(key_pair.verification_key().clone());
+        let staged_key_pair = crate::coconut::KeyPair::new();
+        staged_key_pair
+            .set(KeyPairWithEpoch {
+                keys: key_pair,
+                issued_for_epoch: 1,
+            })
+            .await;
+        staged_key_pair.validate();
 
-    let request_body = BlindSignRequestBody::new(
-        voucher.blind_sign_request().clone(),
-        tx_hash,
-        request_signature,
-        voucher.get_public_attributes_plain(),
-    );
+        let rocket = rocket::build().attach(crate::coconut::stage(
+            nyxd_client,
+            TEST_COIN_DENOM.to_string(),
+            nym_api_identity,
+            staged_key_pair,
+            comm_channel,
+            storage.clone(),
+        ));
+        let client = Client::tracked(rocket)
+            .await
+            .expect("valid rocket instance");
 
-    let response = client
-        .post(format!(
-            "/{}/{}/{}/{}",
-            API_VERSION, COCONUT_ROUTES, BANDWIDTH, COCONUT_BLIND_SIGN
-        ))
-        .json(&request_body)
-        .dispatch()
-        .await;
+        let request_signature = voucher.sign();
 
-    assert_eq!(response.status(), Status::Ok);
-    // This is a more direct way, but there's a bug which makes it hang https://github.com/SergioBenitez/Rocket/issues/1893
-    // assert!(response.into_json::<BlindedSignatureResponse>().is_some());
-    let blinded_signature_response =
-        serde_json::from_str::<BlindedSignatureResponse>(&response.into_string().await.unwrap());
-    assert!(blinded_signature_response.is_ok());
-}
-
-#[tokio::test]
-async fn verification_of_bandwidth_credential() {
-    // Setup variables
-    let validator_address = AccountId::from_str(TEST_REWARDING_VALIDATOR_ADDRESS).unwrap();
-    let proposal_db = Arc::new(RwLock::new(HashMap::new()));
-    let spent_credential_db = Arc::new(RwLock::new(HashMap::new()));
-    let nyxd_client = DummyClient::new(validator_address.clone())
-        .with_proposal_db(&proposal_db)
-        .with_spent_credential_db(&spent_credential_db);
-    let mut db_dir = std::env::temp_dir();
-    let params = Parameters::new(4).unwrap();
-    let mut key_pairs = ttp_keygen(&params, 1, 1).unwrap();
-    let voucher_value = 1234u64;
-    let voucher_info = "voucher info";
-    let public_attributes = [
-        hash_to_scalar(voucher_value.to_string()),
-        hash_to_scalar(voucher_info),
-    ];
-    let public_attributes_ref = vec![&public_attributes[0], &public_attributes[1]];
-    let indices: Vec<u64> = key_pairs
-        .iter()
-        .enumerate()
-        .map(|(idx, _)| (idx + 1) as u64)
-        .collect();
-    let theta =
-        theta_from_keys_and_attributes(&params, &key_pairs, &indices, &public_attributes_ref)
-            .unwrap();
-    let key_pair = key_pairs.remove(0);
-    db_dir.push(&key_pair.verification_key().to_bs58()[..8]);
-    let storage1 = NymApiStorage::init(db_dir).await.unwrap();
-    let comm_channel = DummyCommunicationChannel::new(key_pair.verification_key().clone());
-    let staged_key_pair = crate::coconut::KeyPair::new();
-    staged_key_pair.set(Some(key_pair)).await;
-    let mut rng = OsRng;
-    let identity = identity::KeyPair::new(&mut rng);
-
-    let rocket = rocket::build().attach(coconut::stage(
-        nyxd_client.clone(),
-        TEST_COIN_DENOM.to_string(),
-        identity,
-        staged_key_pair,
-        comm_channel.clone(),
-        storage1.clone(),
-    ));
-
-    let client = Client::tracked(rocket)
-        .await
-        .expect("valid rocket instance");
-
-    let credential = Credential::new(4, theta.clone(), voucher_value, voucher_info.to_string(), 0);
-    let proposal_id = 42;
-    // The address is not used, so we can use a duplicate
-    let gateway_cosmos_addr = validator_address.clone();
-    let req =
-        VerifyCredentialBody::new(credential.clone(), proposal_id, gateway_cosmos_addr.clone());
-
-    // Test endpoint with not proposal for the proposal id
-    let response = client
-        .post(format!(
-            "/{}/{}/{}/{}",
-            API_VERSION, COCONUT_ROUTES, BANDWIDTH, COCONUT_VERIFY_BANDWIDTH_CREDENTIAL
-        ))
-        .json(&req)
-        .dispatch()
-        .await;
-    assert_eq!(response.status(), Status::BadRequest);
-    assert_eq!(
-        response.into_string().await.unwrap(),
-        CoconutError::IncorrectProposal {
-            reason: "proposal not found".to_string()
-        }
-        .to_string()
-    );
-
-    let mut proposal = ProposalResponse {
-        id: proposal_id,
-        title: String::new(),
-        description: String::from("25mnnoCcUfeizfC85avvroFg2prpEZBgJbJM2SLtkgyyUkoAU3cqJiqWmg8cMHEPjfFf5sQF92SMAM2vbEoLZvUjenvXhadTLdA4TqMYArJpihyqirW2AhGoNehtcdcK5gnH"),
-        msgs: vec![],
-        status: cw3::Status::Open,
-        expires: cw_utils::Expiration::Never {},
-        threshold: cw_utils::ThresholdResponse::AbsolutePercentage {
-            percentage: Decimal::from_ratio(2u32, 3u32),
-            total_weight: 100,
-        },
-        proposer: Addr::unchecked("proposer"),
-        deposit: None,
-    };
-
-    // Test the endpoint with a different blinded serial number in the description
-    proposal_db
-        .write()
-        .unwrap()
-        .insert(proposal_id, proposal.clone());
-    let response = client
-        .post(format!(
-            "/{}/{}/{}/{}",
-            API_VERSION, COCONUT_ROUTES, BANDWIDTH, COCONUT_VERIFY_BANDWIDTH_CREDENTIAL
-        ))
-        .json(&req)
-        .dispatch()
-        .await;
-    assert_eq!(response.status(), Status::BadRequest);
-    assert_eq!(
-        response.into_string().await.unwrap(),
-        CoconutError::IncorrectProposal {
-            reason: "incorrect blinded serial number in description".to_string()
-        }
-        .to_string()
-    );
-
-    // Test the endpoint with no msg in the proposal action
-    proposal.description = credential.blinded_serial_number();
-    proposal_db
-        .write()
-        .unwrap()
-        .insert(proposal_id, proposal.clone());
-    let response = client
-        .post(format!(
-            "/{}/{}/{}/{}",
-            API_VERSION, COCONUT_ROUTES, BANDWIDTH, COCONUT_VERIFY_BANDWIDTH_CREDENTIAL
-        ))
-        .json(&req)
-        .dispatch()
-        .await;
-    assert_eq!(response.status(), Status::BadRequest);
-    assert_eq!(
-        response.into_string().await.unwrap(),
-        CoconutError::IncorrectProposal {
-            reason: "action is not to release funds".to_string()
-        }
-        .to_string()
-    );
-
-    // Test the endpoint without any credential recorded in the Coconut Bandwidth Contract
-    let funds = Coin::new(voucher_value as u128, TEST_COIN_DENOM);
-    let msg = nym_coconut_bandwidth_contract_common::msg::ExecuteMsg::ReleaseFunds {
-        funds: funds.clone().into(),
-    };
-    let cosmos_msg = CosmosMsg::Wasm(WasmMsg::Execute {
-        contract_addr: String::new(),
-        msg: to_binary(&msg).unwrap(),
-        funds: vec![],
-    });
-    proposal.msgs = vec![cosmos_msg];
-    proposal_db
-        .write()
-        .unwrap()
-        .insert(proposal_id, proposal.clone());
-    let response = client
-        .post(format!(
-            "/{}/{}/{}/{}",
-            API_VERSION, COCONUT_ROUTES, BANDWIDTH, COCONUT_VERIFY_BANDWIDTH_CREDENTIAL
-        ))
-        .json(&req)
-        .dispatch()
-        .await;
-    assert_eq!(response.status(), Status::BadRequest);
-    assert_eq!(
-        response.into_string().await.unwrap(),
-        CoconutError::InvalidCredentialStatus {
-            status: "spent credential not found".to_string()
-        }
-        .to_string()
-    );
-
-    spent_credential_db.write().unwrap().insert(
-        credential.blinded_serial_number(),
-        SpendCredentialResponse::new(None),
-    );
-    let response = client
-        .post(format!(
-            "/{}/{}/{}/{}",
-            API_VERSION, COCONUT_ROUTES, BANDWIDTH, COCONUT_VERIFY_BANDWIDTH_CREDENTIAL
-        ))
-        .json(&req)
-        .dispatch()
-        .await;
-    assert_eq!(response.status(), Status::BadRequest);
-    assert_eq!(
-        response.into_string().await.unwrap(),
-        CoconutError::InvalidCredentialStatus {
-            status: "Inexistent".to_string()
-        }
-        .to_string()
-    );
-
-    // Test the endpoint with a credential that doesn't verify correctly
-    let mut spent_credential = SpendCredential::new(
-        funds.clone().into(),
-        credential.blinded_serial_number(),
-        Addr::unchecked("unimportant"),
-    );
-    spent_credential_db.write().unwrap().insert(
-        credential.blinded_serial_number(),
-        SpendCredentialResponse::new(Some(spent_credential.clone())),
-    );
-    let bad_credential = Credential::new(
-        4,
-        theta.clone(),
-        voucher_value,
-        String::from("bad voucher info"),
-        0,
-    );
-    let bad_req =
-        VerifyCredentialBody::new(bad_credential, proposal_id, gateway_cosmos_addr.clone());
-    let response = client
-        .post(format!(
-            "/{}/{}/{}/{}",
-            API_VERSION, COCONUT_ROUTES, BANDWIDTH, COCONUT_VERIFY_BANDWIDTH_CREDENTIAL
-        ))
-        .json(&bad_req)
-        .dispatch()
-        .await;
-    assert_eq!(response.status(), Status::Ok);
-    let verify_credential_response =
-        serde_json::from_str::<VerifyCredentialResponse>(&response.into_string().await.unwrap())
-            .unwrap();
-    assert!(!verify_credential_response.verification_result);
-    assert_eq!(
-        cw3::Status::Rejected,
-        proposal_db
-            .read()
-            .unwrap()
-            .get(&proposal_id)
-            .unwrap()
-            .status
-    );
-
-    // Test the endpoint with a proposal that has a different value for the funds to be released
-    // then what's in the credential
-    let funds = Coin::new((voucher_value + 10) as u128, TEST_COIN_DENOM);
-    let msg = nym_coconut_bandwidth_contract_common::msg::ExecuteMsg::ReleaseFunds {
-        funds: funds.clone().into(),
-    };
-    let cosmos_msg = CosmosMsg::Wasm(WasmMsg::Execute {
-        contract_addr: String::new(),
-        msg: to_binary(&msg).unwrap(),
-        funds: vec![],
-    });
-    proposal.msgs = vec![cosmos_msg];
-    proposal_db
-        .write()
-        .unwrap()
-        .insert(proposal_id, proposal.clone());
-    let response = client
-        .post(format!(
-            "/{}/{}/{}/{}",
-            API_VERSION, COCONUT_ROUTES, BANDWIDTH, COCONUT_VERIFY_BANDWIDTH_CREDENTIAL
-        ))
-        .json(&req)
-        .dispatch()
-        .await;
-    assert_eq!(response.status(), Status::Ok);
-    let verify_credential_response =
-        serde_json::from_str::<VerifyCredentialResponse>(&response.into_string().await.unwrap())
-            .unwrap();
-    assert!(!verify_credential_response.verification_result);
-    assert_eq!(
-        cw3::Status::Rejected,
-        proposal_db
-            .read()
-            .unwrap()
-            .get(&proposal_id)
-            .unwrap()
-            .status
-    );
-
-    // Test the endpoint with every dependency met
-    let funds = Coin::new(voucher_value as u128, TEST_COIN_DENOM);
-    let msg = nym_coconut_bandwidth_contract_common::msg::ExecuteMsg::ReleaseFunds {
-        funds: funds.clone().into(),
-    };
-    let cosmos_msg = CosmosMsg::Wasm(WasmMsg::Execute {
-        contract_addr: String::new(),
-        msg: to_binary(&msg).unwrap(),
-        funds: vec![],
-    });
-    proposal.msgs = vec![cosmos_msg];
-    proposal_db
-        .write()
-        .unwrap()
-        .insert(proposal_id, proposal.clone());
-    let response = client
-        .post(format!(
-            "/{}/{}/{}/{}",
-            API_VERSION, COCONUT_ROUTES, BANDWIDTH, COCONUT_VERIFY_BANDWIDTH_CREDENTIAL
-        ))
-        .json(&req)
-        .dispatch()
-        .await;
-    assert_eq!(response.status(), Status::Ok);
-    let verify_credential_response =
-        serde_json::from_str::<VerifyCredentialResponse>(&response.into_string().await.unwrap())
-            .unwrap();
-    assert!(verify_credential_response.verification_result);
-    assert_eq!(
-        cw3::Status::Passed,
-        proposal_db
-            .read()
-            .unwrap()
-            .get(&proposal_id)
-            .unwrap()
-            .status
-    );
-
-    // Test the endpoint with the credential marked as Spent in the Coconut Bandwidth Contract
-    spent_credential.mark_as_spent();
-    spent_credential_db.write().unwrap().insert(
-        credential.blinded_serial_number(),
-        SpendCredentialResponse::new(Some(spent_credential)),
-    );
-    let response = client
-        .post(format!(
-            "/{}/{}/{}/{}",
-            API_VERSION, COCONUT_ROUTES, BANDWIDTH, COCONUT_VERIFY_BANDWIDTH_CREDENTIAL
-        ))
-        .json(&req)
-        .dispatch()
-        .await;
-    assert_eq!(response.status(), Status::BadRequest);
-    assert_eq!(
-        response.into_string().await.unwrap(),
-        CoconutError::InvalidCredentialStatus {
-            status: "Spent".to_string()
-        }
-        .to_string()
-    );
+        let request_body = BlindSignRequestBody::new(
+            voucher.blind_sign_request().clone(),
+            tx_hash,
+            request_signature,
+            voucher.get_public_attributes_plain(),
+        );
+
+        let response = client
+            .post(format!(
+                "/{}/{}/{}/{}",
+                API_VERSION, COCONUT_ROUTES, BANDWIDTH, COCONUT_BLIND_SIGN
+            ))
+            .json(&request_body)
+            .dispatch()
+            .await;
+
+        assert_eq!(response.status(), Status::Ok);
+        // This is a more direct way, but there's a bug which makes it hang https://github.com/SergioBenitez/Rocket/issues/1893
+        // assert!(response.into_json::<BlindedSignatureResponse>().is_some());
+        let blinded_signature_response = serde_json::from_str::<BlindedSignatureResponse>(
+            &response.into_string().await.unwrap(),
+        );
+        assert!(blinded_signature_response.is_ok());
+    }
+
+    #[tokio::test]
+    async fn verification_of_bandwidth_credential() {
+        // Setup variables
+        let chain = init_chain();
+        let validator_address = AccountId::from_str(TEST_REWARDING_VALIDATOR_ADDRESS).unwrap();
+        chain
+            .lock()
+            .unwrap()
+            .add_member(validator_address.as_ref(), 100);
+
+        let nyxd_client = DummyClient::new(validator_address.clone(), chain.clone());
+        let db_dir = tempdir().unwrap();
+        let params = Parameters::new(4).unwrap();
+        let mut key_pairs = ttp_keygen(&params, 1, 1).unwrap();
+        let voucher_value = 1234u64;
+        let voucher_info = "voucher info";
+        let public_attributes = [
+            hash_to_scalar(voucher_value.to_string()),
+            hash_to_scalar(voucher_info),
+        ];
+        let public_attributes_ref = vec![&public_attributes[0], &public_attributes[1]];
+        let indices: Vec<u64> = key_pairs
+            .iter()
+            .enumerate()
+            .map(|(idx, _)| (idx + 1) as u64)
+            .collect();
+        let theta =
+            theta_from_keys_and_attributes(&params, &key_pairs, &indices, &public_attributes_ref)
+                .unwrap();
+        let key_pair = key_pairs.remove(0);
+        let storage1 = NymApiStorage::init(db_dir.path().join("storage.db"))
+            .await
+            .unwrap();
+        let comm_channel = DummyCommunicationChannel::new(key_pair.verification_key().clone());
+        let staged_key_pair = crate::coconut::KeyPair::new();
+        staged_key_pair
+            .set(KeyPairWithEpoch {
+                keys: key_pair,
+                issued_for_epoch: 1,
+            })
+            .await;
+        staged_key_pair.validate();
+        let mut rng = OsRng;
+        let identity = identity::KeyPair::new(&mut rng);
+
+        let rocket = rocket::build().attach(crate::coconut::stage(
+            nyxd_client.clone(),
+            TEST_COIN_DENOM.to_string(),
+            identity,
+            staged_key_pair,
+            comm_channel.clone(),
+            storage1.clone(),
+        ));
+
+        let client = Client::tracked(rocket)
+            .await
+            .expect("valid rocket instance");
+
+        let credential =
+            Credential::new(4, theta.clone(), voucher_value, voucher_info.to_string(), 0);
+        let proposal_id = 42;
+        // The address is not used, so we can use a duplicate
+        let gateway_cosmos_addr = validator_address.clone();
+        let req =
+            VerifyCredentialBody::new(credential.clone(), proposal_id, gateway_cosmos_addr.clone());
+
+        // Test endpoint with not proposal for the proposal id
+        let response = client
+            .post(format!(
+                "/{}/{}/{}/{}",
+                API_VERSION, COCONUT_ROUTES, BANDWIDTH, COCONUT_VERIFY_BANDWIDTH_CREDENTIAL
+            ))
+            .json(&req)
+            .dispatch()
+            .await;
+        assert_eq!(response.status(), Status::BadRequest);
+        assert_eq!(
+            response.into_string().await.unwrap(),
+            CoconutError::IncorrectProposal {
+                reason: "proposal not found".to_string()
+            }
+            .to_string()
+        );
+
+        let mut proposal = Proposal {
+            title: String::new(),
+            description: String::from("25mnnoCcUfeizfC85avvroFg2prpEZBgJbJM2SLtkgyyUkoAU3cqJiqWmg8cMHEPjfFf5sQF92SMAM2vbEoLZvUjenvXhadTLdA4TqMYArJpihyqirW2AhGoNehtcdcK5gnH"),
+            msgs: vec![],
+            status: cw3::Status::Open,
+            expires: cw_utils::Expiration::Never {},
+            threshold: cw_utils::Threshold::AbsolutePercentage {
+                percentage: Decimal::from_ratio(2u32, 3u32),
+            },
+            total_weight: chain.lock().unwrap().total_group_weight(),
+            votes: Votes::yes(0),
+            proposer: Addr::unchecked("proposer"),
+            deposit: None,
+            start_height: 0
+        };
+
+        // Test the endpoint with a different blinded serial number in the description
+
+        chain
+            .lock()
+            .unwrap()
+            .multisig_contract
+            .proposals
+            .insert(proposal_id, proposal.clone());
+        let response = client
+            .post(format!(
+                "/{}/{}/{}/{}",
+                API_VERSION, COCONUT_ROUTES, BANDWIDTH, COCONUT_VERIFY_BANDWIDTH_CREDENTIAL
+            ))
+            .json(&req)
+            .dispatch()
+            .await;
+        assert_eq!(response.status(), Status::BadRequest);
+        assert_eq!(
+            response.into_string().await.unwrap(),
+            CoconutError::IncorrectProposal {
+                reason: "incorrect blinded serial number in description".to_string()
+            }
+            .to_string()
+        );
+
+        // Test the endpoint with no msg in the proposal action
+        proposal.description = credential.blinded_serial_number();
+        chain
+            .lock()
+            .unwrap()
+            .multisig_contract
+            .proposals
+            .insert(proposal_id, proposal.clone());
+        let response = client
+            .post(format!(
+                "/{}/{}/{}/{}",
+                API_VERSION, COCONUT_ROUTES, BANDWIDTH, COCONUT_VERIFY_BANDWIDTH_CREDENTIAL
+            ))
+            .json(&req)
+            .dispatch()
+            .await;
+        assert_eq!(response.status(), Status::BadRequest);
+        assert_eq!(
+            response.into_string().await.unwrap(),
+            CoconutError::IncorrectProposal {
+                reason: "action is not to release funds".to_string()
+            }
+            .to_string()
+        );
+
+        // Test the endpoint without any credential recorded in the Coconut Bandwidth Contract
+        let funds = Coin::new(voucher_value as u128, TEST_COIN_DENOM);
+        let msg = nym_coconut_bandwidth_contract_common::msg::ExecuteMsg::ReleaseFunds {
+            funds: funds.clone().into(),
+        };
+        let cosmos_msg = CosmosMsg::Wasm(WasmMsg::Execute {
+            contract_addr: String::new(),
+            msg: to_binary(&msg).unwrap(),
+            funds: vec![],
+        });
+        proposal.msgs = vec![cosmos_msg];
+        chain
+            .lock()
+            .unwrap()
+            .multisig_contract
+            .proposals
+            .insert(proposal_id, proposal.clone());
+        let response = client
+            .post(format!(
+                "/{}/{}/{}/{}",
+                API_VERSION, COCONUT_ROUTES, BANDWIDTH, COCONUT_VERIFY_BANDWIDTH_CREDENTIAL
+            ))
+            .json(&req)
+            .dispatch()
+            .await;
+        assert_eq!(response.status(), Status::BadRequest);
+        assert_eq!(
+            response.into_string().await.unwrap(),
+            CoconutError::InvalidCredentialStatus {
+                status: "spent credential not found".to_string()
+            }
+            .to_string()
+        );
+
+        chain
+            .lock()
+            .unwrap()
+            .bandwidth_contract
+            .spent_credentials
+            .insert(
+                credential.blinded_serial_number(),
+                SpendCredentialResponse::new(None),
+            );
+
+        let response = client
+            .post(format!(
+                "/{}/{}/{}/{}",
+                API_VERSION, COCONUT_ROUTES, BANDWIDTH, COCONUT_VERIFY_BANDWIDTH_CREDENTIAL
+            ))
+            .json(&req)
+            .dispatch()
+            .await;
+        assert_eq!(response.status(), Status::BadRequest);
+        assert_eq!(
+            response.into_string().await.unwrap(),
+            CoconutError::InvalidCredentialStatus {
+                status: "Inexistent".to_string()
+            }
+            .to_string()
+        );
+
+        // Test the endpoint with a credential that doesn't verify correctly
+        let mut spent_credential = SpendCredential::new(
+            funds.clone().into(),
+            credential.blinded_serial_number(),
+            Addr::unchecked("unimportant"),
+        );
+        chain
+            .lock()
+            .unwrap()
+            .bandwidth_contract
+            .spent_credentials
+            .insert(
+                credential.blinded_serial_number(),
+                SpendCredentialResponse::new(Some(spent_credential.clone())),
+            );
+        let bad_credential = Credential::new(
+            4,
+            theta.clone(),
+            voucher_value,
+            String::from("bad voucher info"),
+            0,
+        );
+        let bad_req =
+            VerifyCredentialBody::new(bad_credential, proposal_id, gateway_cosmos_addr.clone());
+        let response = client
+            .post(format!(
+                "/{}/{}/{}/{}",
+                API_VERSION, COCONUT_ROUTES, BANDWIDTH, COCONUT_VERIFY_BANDWIDTH_CREDENTIAL
+            ))
+            .json(&bad_req)
+            .dispatch()
+            .await;
+        assert_eq!(response.status(), Status::Ok);
+        let verify_credential_response = serde_json::from_str::<VerifyCredentialResponse>(
+            &response.into_string().await.unwrap(),
+        )
+        .unwrap();
+        assert!(!verify_credential_response.verification_result);
+        assert_eq!(
+            cw3::Status::Rejected,
+            chain
+                .lock()
+                .unwrap()
+                .multisig_contract
+                .proposals
+                .get(&proposal_id)
+                .unwrap()
+                .status
+        );
+
+        // Test the endpoint with a proposal that has a different value for the funds to be released
+        // then what's in the credential
+        let funds = Coin::new((voucher_value + 10) as u128, TEST_COIN_DENOM);
+        let msg = nym_coconut_bandwidth_contract_common::msg::ExecuteMsg::ReleaseFunds {
+            funds: funds.clone().into(),
+        };
+        let cosmos_msg = CosmosMsg::Wasm(WasmMsg::Execute {
+            contract_addr: String::new(),
+            msg: to_binary(&msg).unwrap(),
+            funds: vec![],
+        });
+        proposal.msgs = vec![cosmos_msg];
+        chain.lock().unwrap().reset_votes();
+        chain
+            .lock()
+            .unwrap()
+            .multisig_contract
+            .proposals
+            .insert(proposal_id, proposal.clone());
+        let response = client
+            .post(format!(
+                "/{}/{}/{}/{}",
+                API_VERSION, COCONUT_ROUTES, BANDWIDTH, COCONUT_VERIFY_BANDWIDTH_CREDENTIAL
+            ))
+            .json(&req)
+            .dispatch()
+            .await;
+        assert_eq!(response.status(), Status::Ok);
+        let verify_credential_response = serde_json::from_str::<VerifyCredentialResponse>(
+            &response.into_string().await.unwrap(),
+        )
+        .unwrap();
+        assert!(!verify_credential_response.verification_result);
+        assert_eq!(
+            cw3::Status::Rejected,
+            chain
+                .lock()
+                .unwrap()
+                .multisig_contract
+                .proposals
+                .get(&proposal_id)
+                .unwrap()
+                .status
+        );
+
+        // Test the endpoint with every dependency met
+        let funds = Coin::new(voucher_value as u128, TEST_COIN_DENOM);
+        let msg = nym_coconut_bandwidth_contract_common::msg::ExecuteMsg::ReleaseFunds {
+            funds: funds.clone().into(),
+        };
+        let cosmos_msg = CosmosMsg::Wasm(WasmMsg::Execute {
+            contract_addr: String::new(),
+            msg: to_binary(&msg).unwrap(),
+            funds: vec![],
+        });
+        proposal.msgs = vec![cosmos_msg];
+        chain.lock().unwrap().reset_votes();
+        chain
+            .lock()
+            .unwrap()
+            .multisig_contract
+            .proposals
+            .insert(proposal_id, proposal.clone());
+        let response = client
+            .post(format!(
+                "/{}/{}/{}/{}",
+                API_VERSION, COCONUT_ROUTES, BANDWIDTH, COCONUT_VERIFY_BANDWIDTH_CREDENTIAL
+            ))
+            .json(&req)
+            .dispatch()
+            .await;
+        assert_eq!(response.status(), Status::Ok);
+        let verify_credential_response = serde_json::from_str::<VerifyCredentialResponse>(
+            &response.into_string().await.unwrap(),
+        )
+        .unwrap();
+        assert!(verify_credential_response.verification_result);
+        assert_eq!(
+            cw3::Status::Passed,
+            chain
+                .lock()
+                .unwrap()
+                .multisig_contract
+                .proposals
+                .get(&proposal_id)
+                .unwrap()
+                .status
+        );
+
+        // Test the endpoint with the credential marked as Spent in the Coconut Bandwidth Contract
+        spent_credential.mark_as_spent();
+        chain
+            .lock()
+            .unwrap()
+            .bandwidth_contract
+            .spent_credentials
+            .insert(
+                credential.blinded_serial_number(),
+                SpendCredentialResponse::new(Some(spent_credential)),
+            );
+        let response = client
+            .post(format!(
+                "/{}/{}/{}/{}",
+                API_VERSION, COCONUT_ROUTES, BANDWIDTH, COCONUT_VERIFY_BANDWIDTH_CREDENTIAL
+            ))
+            .json(&req)
+            .dispatch()
+            .await;
+        assert_eq!(response.status(), Status::BadRequest);
+        assert_eq!(
+            response.into_string().await.unwrap(),
+            CoconutError::InvalidCredentialStatus {
+                status: "Spent".to_string()
+            }
+            .to_string()
+        );
+    }
 }
diff --git a/nym-api/src/ephemera/mod.rs b/nym-api/src/ephemera/mod.rs
index f9134e7e46..e6075e79d5 100644
--- a/nym-api/src/ephemera/mod.rs
+++ b/nym-api/src/ephemera/mod.rs
@@ -1,11 +1,14 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: GPL-3.0-only
 
+// while those files are completely unused now, I'm going to leave them here for future reference once we decide to revive the project to have a starting point
+// but whoever picks it up: you are forbidden from trying to use actix
+
 extern crate core;
 
 use clap::Parser;
 use ephemera::cli::init::Cmd;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use std::path::PathBuf;
 
 pub(crate) mod application;
diff --git a/nym-api/src/epoch_operations/helpers.rs b/nym-api/src/epoch_operations/helpers.rs
index 4724f14361..61ea0defeb 100644
--- a/nym-api/src/epoch_operations/helpers.rs
+++ b/nym-api/src/epoch_operations/helpers.rs
@@ -5,7 +5,7 @@ use crate::epoch_operations::RewardedSetUpdater;
 use cosmwasm_std::{Decimal, Fraction};
 use nym_mixnet_contract_common::reward_params::Performance;
 use nym_mixnet_contract_common::{ExecuteMsg, Interval, MixId};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Clone, Copy, Serialize, Deserialize)]
 pub(crate) struct MixnodeWithPerformance {
diff --git a/nym-api/src/epoch_operations/mod.rs b/nym-api/src/epoch_operations/mod.rs
index 7f5afbfc9e..7bb3116086 100644
--- a/nym-api/src/epoch_operations/mod.rs
+++ b/nym-api/src/epoch_operations/mod.rs
@@ -12,7 +12,6 @@
 // 3. Eventually this whole procedure is going to get expanded to allow for distribution of rewarded set generation
 //    and hence this might be a good place for it.
 
-use crate::ephemera::reward::{EpochOperations, RewardManager};
 use crate::node_status_api::ONE_DAY;
 use crate::nym_contract_cache::cache::NymContractCache;
 use crate::support::nyxd::Client;
@@ -33,7 +32,6 @@ mod rewarding;
 mod transition_beginning;
 
 pub struct RewardedSetUpdater {
-    ephemera_reward_manager: Option<RewardManager>,
     nyxd_client: Client,
     nym_contract_cache: NymContractCache,
     storage: NymApiStorage,
@@ -47,13 +45,11 @@ impl RewardedSetUpdater {
     }
 
     pub(crate) fn new(
-        ephemera_reward_manager: Option<RewardManager>,
         nyxd_client: Client,
         nym_contract_cache: NymContractCache,
         storage: NymApiStorage,
     ) -> Self {
         RewardedSetUpdater {
-            ephemera_reward_manager,
             nyxd_client,
             nym_contract_cache,
             storage,
@@ -92,11 +88,6 @@ impl RewardedSetUpdater {
     /// 8. the whole process repeats once the new epoch finishes
     async fn perform_epoch_operations(&mut self, interval: Interval) -> Result<(), RewardingError> {
         let mut rewards = self.nodes_to_reward(interval).await;
-        if let Some(ephemera_reward_manager) = self.ephemera_reward_manager.as_mut() {
-            rewards = ephemera_reward_manager
-                .perform_epoch_operations(rewards)
-                .await?;
-        }
         rewards.sort_by_key(|a| a.mix_id);
 
         log::info!("The current epoch has finished.");
@@ -274,14 +265,12 @@ impl RewardedSetUpdater {
     }
 
     pub(crate) fn start(
-        ephemera_reward_manager: Option<RewardManager>,
         nyxd_client: Client,
         nym_contract_cache: &NymContractCache,
         storage: &NymApiStorage,
         shutdown: &TaskManager,
     ) {
         let mut rewarded_set_updater = RewardedSetUpdater::new(
-            ephemera_reward_manager,
             nyxd_client,
             nym_contract_cache.to_owned(),
             storage.to_owned(),
diff --git a/nym-api/src/main.rs b/nym-api/src/main.rs
index e28d0ad37e..8feba3a48d 100644
--- a/nym-api/src/main.rs
+++ b/nym-api/src/main.rs
@@ -4,6 +4,9 @@
 #[macro_use]
 extern crate rocket;
 
+use crate::coconut::dkg::controller::keys::{
+    can_validate_coconut_keys, load_bte_keypair, load_coconut_keypair_if_exists,
+};
 use crate::epoch_operations::RewardedSetUpdater;
 use crate::network::models::NetworkDetails;
 use crate::node_describe_cache::DescribedNodes;
@@ -13,9 +16,7 @@ use crate::support::cli;
 use crate::support::config::Config;
 use crate::support::storage;
 use crate::support::storage::NymApiStorage;
-use ::ephemera::configuration::Configuration as EphemeraConfiguration;
 use ::nym_config::defaults::setup_env;
-use anyhow::Result;
 use circulating_supply_api::cache::CirculatingSupplyCache;
 use clap::Parser;
 use coconut::dkg::controller::DkgController;
@@ -30,7 +31,6 @@ use support::{http, nyxd};
 
 mod circulating_supply_api;
 mod coconut;
-mod ephemera;
 mod epoch_operations;
 pub(crate) mod network;
 mod network_monitor;
@@ -68,8 +68,20 @@ async fn start_nym_api_tasks(config: Config) -> anyhow::Result<ShutdownHandles>
     let nym_network_details = NymNetworkDetails::new_from_env();
     let network_details = NetworkDetails::new(connected_nyxd.to_string(), nym_network_details);
 
-    let coconut_keypair = coconut::keypair::KeyPair::new();
+    let coconut_keypair_wrapper = coconut::keys::KeyPair::new();
+
+    // if the keypair doesnt exist (because say this API is running in the caching mode), nothing will happen
+    if let Some(loaded_keys) = load_coconut_keypair_if_exists(&config.coconut_signer)? {
+        let issued_for = loaded_keys.issued_for_epoch;
+        coconut_keypair_wrapper.set(loaded_keys).await;
+
+        if can_validate_coconut_keys(&nyxd_client, issued_for).await? {
+            coconut_keypair_wrapper.validate()
+        }
+    }
+
     let identity_keypair = config.base.storage_paths.load_identity()?;
+    let identity_public_key = *identity_keypair.public_key();
 
     // let's build our rocket!
     let rocket = http::setup_rocket(
@@ -77,7 +89,7 @@ async fn start_nym_api_tasks(config: Config) -> anyhow::Result<ShutdownHandles>
         network_details,
         nyxd_client.clone(),
         identity_keypair,
-        coconut_keypair.clone(),
+        coconut_keypair_wrapper.clone(),
     )
     .await?;
 
@@ -133,46 +145,22 @@ async fn start_nym_api_tasks(config: Config) -> anyhow::Result<ShutdownHandles>
 
     // start dkg task
     if config.coconut_signer.enabled {
+        let dkg_bte_keypair = load_bte_keypair(&config.coconut_signer)?;
+
         DkgController::start(
             &config.coconut_signer,
             nyxd_client.clone(),
-            coconut_keypair,
+            coconut_keypair_wrapper,
+            dkg_bte_keypair,
+            identity_public_key,
             OsRng,
             &shutdown,
-        )
-        .await?;
+        )?;
     }
 
     // and then only start the uptime updater (and the monitor itself, duh)
     // if the monitoring if it's enabled
     if config.network_monitor.enabled {
-        let ephemera_config =
-            match EphemeraConfiguration::try_load(config.get_ephemera_config_path()) {
-                Ok(c) => c,
-                Err(_) => {
-                    config
-                        .get_ephemera_args()
-                        .cmd
-                        .clone()
-                        .execute(Some(&config.get_id()));
-                    EphemeraConfiguration::try_load(config.get_ephemera_config_path())
-                        .expect("Config file should be created now")
-                }
-            };
-        let ephemera_reward_manager = if config.ephemera.enabled {
-            Some(
-                ephemera::application::NymApi::run(
-                    config.get_ephemera_args().clone(),
-                    ephemera_config,
-                    nyxd_client.clone(),
-                    &shutdown,
-                )
-                .await?,
-            )
-        } else {
-            None
-        };
-
         // if network monitor is enabled, the storage MUST BE available
         let storage = maybe_storage.unwrap();
 
@@ -190,13 +178,7 @@ async fn start_nym_api_tasks(config: Config) -> anyhow::Result<ShutdownHandles>
         // start 'rewarding' if its enabled
         if config.rewarding.enabled {
             epoch_operations::ensure_rewarding_permission(&nyxd_client).await?;
-            RewardedSetUpdater::start(
-                ephemera_reward_manager,
-                nyxd_client,
-                nym_contract_cache_state,
-                storage,
-                &shutdown,
-            );
+            RewardedSetUpdater::start(nyxd_client, nym_contract_cache_state, storage, &shutdown);
         }
     }
 
diff --git a/nym-api/src/network/routes.rs b/nym-api/src/network/routes.rs
index 5febb8fd75..73625f8b88 100644
--- a/nym-api/src/network/routes.rs
+++ b/nym-api/src/network/routes.rs
@@ -1,9 +1,6 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: GPL-3.0-only
 
-// due to the macro expansion of rather old rocket macros...
-#![allow(unused_imports)]
-
 use crate::network::models::{ContractInformation, NetworkDetails};
 use crate::nym_contract_cache::cache::NymContractCache;
 use nym_contracts_common::ContractBuildInformation;
diff --git a/nym-api/src/node_describe_cache/mod.rs b/nym-api/src/node_describe_cache/mod.rs
index 9f3ad67229..0372d0a131 100644
--- a/nym-api/src/node_describe_cache/mod.rs
+++ b/nym-api/src/node_describe_cache/mod.rs
@@ -6,7 +6,7 @@ use crate::support::caching::cache::{SharedCache, UninitialisedCache};
 use crate::support::caching::refresher::{CacheItemProvider, CacheRefresher};
 use crate::support::config;
 use crate::support::config::DEFAULT_NODE_DESCRIBE_BATCH_SIZE;
-use futures_util::{stream, StreamExt};
+use futures::{stream, StreamExt};
 use mixnode::get_mixnode_description;
 use nym_api_requests::models::{
     IpPacketRouterDetails, NetworkRequesterDetails, NymNodeDescription,
diff --git a/nym-api/src/node_status_api/local_guard.rs b/nym-api/src/node_status_api/local_guard.rs
index fbbe8e27ec..9be3a252c2 100644
--- a/nym-api/src/node_status_api/local_guard.rs
+++ b/nym-api/src/node_status_api/local_guard.rs
@@ -36,7 +36,7 @@ impl<'r> FromRequest<'r> for LocalRequest {
                 "Received a request from {:?} for a local-only route",
                 request.client_ip()
             );
-            Outcome::Failure((Status::Unauthorized, NonLocalRequestError))
+            Outcome::Error((Status::Unauthorized, NonLocalRequestError))
         }
     }
 }
diff --git a/nym-api/src/node_status_api/routes.rs b/nym-api/src/node_status_api/routes.rs
index c3b95e3336..466b10f883 100644
--- a/nym-api/src/node_status_api/routes.rs
+++ b/nym-api/src/node_status_api/routes.rs
@@ -1,9 +1,6 @@
 // Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: GPL-3.0-only
 
-// due to the macro expansion of rather old rocket macros...
-#![allow(unused_imports)]
-
 use super::helpers::_get_gateways_detailed;
 use super::NodeStatusCache;
 use crate::node_status_api::helpers::{
diff --git a/nym-api/src/nym_contract_cache/routes.rs b/nym-api/src/nym_contract_cache/routes.rs
index 5573d3a629..01fbab47ac 100644
--- a/nym-api/src/nym_contract_cache/routes.rs
+++ b/nym-api/src/nym_contract_cache/routes.rs
@@ -1,9 +1,6 @@
 // Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: GPL-3.0-only
 
-// due to the macro expansion of rather old rocket macros...
-#![allow(unused_imports)]
-
 use crate::{
     node_status_api::{
         helpers::{_get_active_set_detailed, _get_mixnodes_detailed, _get_rewarded_set_detailed},
diff --git a/nym-api/src/nym_nodes/routes.rs b/nym-api/src/nym_nodes/routes.rs
index 7d19131ff9..88a2a05158 100644
--- a/nym-api/src/nym_nodes/routes.rs
+++ b/nym-api/src/nym_nodes/routes.rs
@@ -1,9 +1,6 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: GPL-3.0-only
 
-// due to the macro expansion of rather old rocket macros...
-#![allow(unused_imports)]
-
 use crate::node_describe_cache::DescribedNodes;
 use crate::nym_contract_cache::cache::NymContractCache;
 use crate::support::caching::cache::SharedCache;
diff --git a/nym-api/src/support/config/helpers.rs b/nym-api/src/support/config/helpers.rs
index 47b9d25557..a124a8e4dd 100644
--- a/nym-api/src/support/config/helpers.rs
+++ b/nym-api/src/support/config/helpers.rs
@@ -1,22 +1,26 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: GPL-3.0-only
 
+use crate::coconut::dkg::controller::keys::init_bte_keypair;
 use crate::support::config;
 use crate::support::config::{
     default_config_directory, default_data_directory, upgrade_helpers, Config,
 };
 use anyhow::{Context, Result};
 use nym_crypto::asymmetric::identity;
-use rand_07::rngs::OsRng;
+use rand::rngs::OsRng;
+use rand_07::rngs::OsRng as OsRng07;
 use std::{fs, io};
 
+// TODO: once we upgrade ed25519 library, we could use the same rand library and use proper
+// <R: RngCore + CryptoRng> bound
 fn init_identity_keys(config: &config::NymApiPaths) -> Result<()> {
     let keypaths = nym_pemstore::KeyPairPath::new(
         &config.private_identity_key_file,
         &config.public_identity_key_file,
     );
 
-    let mut rng = OsRng;
+    let mut rng = OsRng07;
     let keypair = identity::KeyPair::new(&mut rng);
     nym_pemstore::store_keypair(&keypair, &keypaths)
         .context("failed to store identity keys of the nym api")?;
@@ -38,7 +42,8 @@ pub(crate) fn initialise_new(id: &str) -> Result<Config> {
     init_identity_keys(&config.base.storage_paths)?;
 
     // create DKG BTE keys
-    crate::coconut::dkg::controller::init_keypair(&config.coconut_signer)?;
+    let mut rng = OsRng;
+    init_bte_keypair(&mut rng, &config.coconut_signer)?;
     Ok(config)
 }
 
diff --git a/nym-api/src/support/config/mod.rs b/nym-api/src/support/config/mod.rs
index 8d71b43fd6..ca2eb1328c 100644
--- a/nym-api/src/support/config/mod.rs
+++ b/nym-api/src/support/config/mod.rs
@@ -106,8 +106,6 @@ pub struct Config {
     pub rewarding: Rewarding,
 
     pub coconut_signer: CoconutSigner,
-
-    pub ephemera: Ephemera,
 }
 
 impl NymConfigTemplate for Config {
@@ -127,7 +125,6 @@ impl Config {
             circulating_supply_cacher: Default::default(),
             rewarding: Default::default(),
             coconut_signer: CoconutSigner::new_default(id.as_ref()),
-            ephemera: Ephemera::new_default(id.as_ref()),
         }
     }
 
@@ -142,10 +139,6 @@ impl Config {
             bail!("can't enable coconut signer without providing a mnemonic")
         }
 
-        if !can_sign && self.ephemera.enabled {
-            bail!("can't enable ephemera without providing a mnemonic")
-        }
-
         Ok(())
     }
 
@@ -223,10 +216,6 @@ impl Config {
         }
     }
 
-    pub fn get_id(&self) -> String {
-        self.base.id.clone()
-    }
-
     pub fn get_nyxd_url(&self) -> Url {
         self.base.local_validator.clone()
     }
@@ -234,14 +223,6 @@ impl Config {
     pub fn get_mnemonic(&self) -> Option<&bip39::Mnemonic> {
         self.base.mnemonic.as_ref()
     }
-
-    pub fn get_ephemera_args(&self) -> &crate::ephemera::Args {
-        &self.ephemera.args
-    }
-
-    pub fn get_ephemera_config_path(&self) -> PathBuf {
-        self.ephemera.args.ephemera_config.clone()
-    }
 }
 
 // we only really care about the mnemonic being zeroized
@@ -558,25 +539,3 @@ impl Default for CoconutSignerDebug {
         }
     }
 }
-
-#[derive(Debug, Default, Deserialize, PartialEq, Eq, Serialize)]
-#[serde(default)]
-pub struct Ephemera {
-    pub enabled: bool,
-    args: crate::ephemera::Args,
-}
-
-impl Ephemera {
-    fn new_default(id: &str) -> Self {
-        Ephemera {
-            enabled: false,
-            args: crate::ephemera::Args {
-                ephemera_config: ephemera::configuration::Configuration::ephemera_config_file_home(
-                    Some(id),
-                )
-                .unwrap(),
-                ..Default::default()
-            },
-        }
-    }
-}
diff --git a/nym-api/src/support/config/persistence.rs b/nym-api/src/support/config/persistence.rs
index 9a9b253776..d14996b743 100644
--- a/nym-api/src/support/config/persistence.rs
+++ b/nym-api/src/support/config/persistence.rs
@@ -14,8 +14,7 @@ pub const DEFAULT_NODE_STATUS_API_DATABASE_FILENAME: &str = "db.sqlite";
 pub const DEFAULT_DKG_PERSISTENT_STATE_FILENAME: &str = "dkg_persistent_state.json";
 pub const DEFAULT_DKG_DECRYPTION_KEY_FILENAME: &str = "dkg_decryption_key.pem";
 pub const DEFAULT_DKG_PUBLIC_KEY_WITH_PROOF_FILENAME: &str = "dkg_public_key_with_proof.pem";
-pub const DEFAULT_COCONUT_VERIFICATION_KEY_FILENAME: &str = "coconut_verification_key.pem";
-pub const DEFAULT_COCONUT_SECRET_KEY_FILENAME: &str = "coconut_secret_key.pem";
+pub const DEFAULT_COCONUT_KEY_FILENAME: &str = "coconut.pem";
 
 pub const DEFAULT_PRIVATE_IDENTITY_KEY_FILENAME: &str = "private_identity.pem";
 pub const DEFAULT_PUBLIC_IDENTITY_KEY_FILENAME: &str = "public_identity.pem";
@@ -78,11 +77,8 @@ pub struct CoconutSignerPaths {
     /// Path to a JSON file where state is persisted between different stages of DKG.
     pub dkg_persistent_state_path: PathBuf,
 
-    /// Path to the coconut verification key.
-    pub verification_key_path: PathBuf,
-
-    /// Path to the coconut secret key.
-    pub secret_key_path: PathBuf,
+    /// Path to the coconut key.
+    pub coconut_key_path: PathBuf,
 
     /// Path to the dkg dealer decryption key.
     pub decryption_key_path: PathBuf,
@@ -97,8 +93,7 @@ impl CoconutSignerPaths {
 
         CoconutSignerPaths {
             dkg_persistent_state_path: data_dir.join(DEFAULT_DKG_PERSISTENT_STATE_FILENAME),
-            verification_key_path: data_dir.join(DEFAULT_COCONUT_VERIFICATION_KEY_FILENAME),
-            secret_key_path: data_dir.join(DEFAULT_COCONUT_SECRET_KEY_FILENAME),
+            coconut_key_path: data_dir.join(DEFAULT_COCONUT_KEY_FILENAME),
             decryption_key_path: data_dir.join(DEFAULT_DKG_DECRYPTION_KEY_FILENAME),
             public_key_with_proof_path: data_dir.join(DEFAULT_DKG_PUBLIC_KEY_WITH_PROOF_FILENAME),
         }
diff --git a/nym-api/src/support/config/template.rs b/nym-api/src/support/config/template.rs
index a859d94ad1..170cc73ba3 100644
--- a/nym-api/src/support/config/template.rs
+++ b/nym-api/src/support/config/template.rs
@@ -118,11 +118,8 @@ announce_address = '{{ coconut_signer.announce_address }}'
 # Path to a JSON file where state is persisted between different stages of DKG.
 dkg_persistent_state_path = '{{ coconut_signer.storage_paths.dkg_persistent_state_path }}'
 
-# Path to the coconut verification key
-verification_key_path = '{{ coconut_signer.storage_paths.verification_key_path }}'
-
-# Path to the coconut verification key
-secret_key_path = '{{ coconut_signer.storage_paths.secret_key_path }}'
+# Path to the coconut key.
+coconut_key_path = '{{ coconut_signer.storage_paths.coconut_key_path }}'
 
 # Path to the dkg dealer decryption key
 decryption_key_path = '{{ coconut_signer.storage_paths.decryption_key_path }}'
@@ -130,12 +127,4 @@ decryption_key_path = '{{ coconut_signer.storage_paths.decryption_key_path }}'
 # Path to the dkg dealer public key with proof
 public_key_with_proof_path = '{{ coconut_signer.storage_paths.public_key_with_proof_path }}'
 
-[ephemera]
-
-enabled = {{ ephemera.enabled }}
-
-[ephemera.args]
-
-ephemera_config = '{{ ephemera.args.ephemera_config }}'
-
 "#;
diff --git a/nym-api/src/support/http/mod.rs b/nym-api/src/support/http/mod.rs
index 7f54a35f8e..1ca67c50bb 100644
--- a/nym-api/src/support/http/mod.rs
+++ b/nym-api/src/support/http/mod.rs
@@ -29,7 +29,7 @@ pub(crate) async fn setup_rocket(
     network_details: NetworkDetails,
     _nyxd_client: nyxd::Client,
     identity_keypair: identity::KeyPair,
-    coconut_keypair: coconut::keypair::KeyPair,
+    coconut_keypair: coconut::keys::KeyPair,
 ) -> anyhow::Result<Rocket<Ignite>> {
     let openapi_settings = rocket_okapi::settings::OpenApiSettings::default();
     let mut rocket = rocket::build();
diff --git a/nym-api/src/support/nyxd/mod.rs b/nym-api/src/support/nyxd/mod.rs
index 452f93569f..d583669fe9 100644
--- a/nym-api/src/support/nyxd/mod.rs
+++ b/nym-api/src/support/nyxd/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: GPL-3.0-only
 
 use crate::coconut::error::CoconutError;
@@ -6,20 +6,24 @@ use crate::epoch_operations::MixnodeWithPerformance;
 use crate::support::config::Config;
 use anyhow::Result;
 use async_trait::async_trait;
-use cw3::ProposalResponse;
+use cw3::{ProposalResponse, VoteResponse};
 use cw4::MemberResponse;
 use nym_coconut_bandwidth_contract_common::spend_credential::SpendCredentialResponse;
+use nym_coconut_dkg_common::dealing::{
+    DealerDealingsStatusResponse, DealingChunkInfo, DealingMetadata, DealingStatusResponse,
+    PartialContractDealing,
+};
 use nym_coconut_dkg_common::msg::QueryMsg as DkgQueryMsg;
-use nym_coconut_dkg_common::types::InitialReplacementData;
+use nym_coconut_dkg_common::types::{
+    ChunkIndex, DealingIndex, InitialReplacementData, PartialContractDealingData, State,
+};
 use nym_coconut_dkg_common::{
-    dealer::{ContractDealing, DealerDetails, DealerDetailsResponse},
+    dealer::{DealerDetails, DealerDetailsResponse},
     types::{EncodedBTEPublicKeyWithProof, Epoch, EpochId},
     verification_key::{ContractVKShare, VerificationKeyShare},
 };
 use nym_config::defaults::{ChainDetails, NymNetworkDetails};
-use nym_contracts_common::dealings::ContractSafeBytes;
-use nym_ephemera_common::msg::QueryMsg as EphemeraQueryMsg;
-use nym_ephemera_common::types::JsonPeerInfo;
+
 use nym_mixnet_contract_common::families::FamilyHead;
 use nym_mixnet_contract_common::mixnode::MixNodeDetails;
 use nym_mixnet_contract_common::reward_params::RewardingParams;
@@ -33,11 +37,10 @@ use nym_validator_client::nyxd::contract_traits::{NameServiceQueryClient, PagedD
 use nym_validator_client::nyxd::error::NyxdError;
 use nym_validator_client::nyxd::{
     contract_traits::{
-        CoconutBandwidthQueryClient, DkgQueryClient, DkgSigningClient, EphemeraQueryClient,
-        EphemeraSigningClient, GroupQueryClient, MixnetQueryClient, MixnetSigningClient,
-        MultisigQueryClient, MultisigSigningClient, NymContractsProvider, PagedEphemeraQueryClient,
-        PagedMixnetQueryClient, PagedMultisigQueryClient, PagedVestingQueryClient,
-        SpDirectoryQueryClient,
+        CoconutBandwidthQueryClient, DkgQueryClient, DkgSigningClient, GroupQueryClient,
+        MixnetQueryClient, MixnetSigningClient, MultisigQueryClient, MultisigSigningClient,
+        NymContractsProvider, PagedMixnetQueryClient, PagedMultisigQueryClient,
+        PagedVestingQueryClient, SpDirectoryQueryClient,
     },
     cosmwasm_client::types::ExecuteResult,
     CosmWasmClient, Fee,
@@ -344,6 +347,15 @@ impl crate::coconut::client::Client for Client {
         self.client_address().await
     }
 
+    async fn dkg_contract_address(&self) -> Result<AccountId, CoconutError> {
+        nyxd_query!(
+            self,
+            dkg_contract_address()
+                .cloned()
+                .ok_or_else(|| NyxdError::unavailable_contract_address("dkg contract").into())
+        )
+    }
+
     async fn get_tx(&self, tx_hash: Hash) -> crate::coconut::error::Result<nyxd::TxResponse> {
         nyxd_query!(self, get_tx(tx_hash).await).map_err(|source| {
             CoconutError::TxRetrievalFailure {
@@ -364,6 +376,14 @@ impl crate::coconut::client::Client for Client {
         Ok(nyxd_query!(self, get_all_proposals().await?))
     }
 
+    async fn get_vote(
+        &self,
+        proposal_id: u64,
+        voter: String,
+    ) -> crate::coconut::error::Result<VoteResponse> {
+        Ok(nyxd_query!(self, query_vote(proposal_id, voter).await?))
+    }
+
     async fn get_spent_credential(
         &self,
         blinded_serial_number: String,
@@ -374,6 +394,10 @@ impl crate::coconut::client::Client for Client {
         ))
     }
 
+    async fn contract_state(&self) -> crate::coconut::error::Result<State> {
+        Ok(nyxd_query!(self, get_state().await?))
+    }
+
     async fn get_current_epoch(&self) -> crate::coconut::error::Result<Epoch> {
         Ok(nyxd_query!(self, get_current_epoch().await?))
     }
@@ -401,21 +425,74 @@ impl crate::coconut::client::Client for Client {
         Ok(nyxd_query!(self, get_dealer_details(self_address).await?))
     }
 
+    async fn get_dealer_dealings_status(
+        &self,
+        epoch_id: EpochId,
+        dealer: String,
+    ) -> crate::coconut::error::Result<DealerDealingsStatusResponse> {
+        Ok(nyxd_query!(
+            self,
+            get_dealer_dealings_status(epoch_id, dealer).await?
+        ))
+    }
+
+    async fn get_dealing_status(
+        &self,
+        epoch_id: EpochId,
+        dealer: String,
+        dealing_index: DealingIndex,
+    ) -> crate::coconut::error::Result<DealingStatusResponse> {
+        Ok(nyxd_query!(
+            self,
+            get_dealing_status(epoch_id, dealer, dealing_index).await?
+        ))
+    }
+
     async fn get_current_dealers(&self) -> crate::coconut::error::Result<Vec<DealerDetails>> {
         Ok(nyxd_query!(self, get_all_current_dealers().await?))
     }
 
-    async fn get_dealings(
+    async fn get_dealing_metadata(
         &self,
-        idx: usize,
-    ) -> crate::coconut::error::Result<Vec<ContractDealing>> {
-        Ok(nyxd_query!(self, get_all_epoch_dealings(idx as u64).await?))
+        epoch_id: EpochId,
+        dealer: String,
+        dealing_index: DealingIndex,
+    ) -> crate::coconut::error::Result<Option<DealingMetadata>> {
+        Ok(nyxd_query!(
+            self,
+            get_dealings_metadata(epoch_id, dealer, dealing_index)
+                .await?
+                .metadata
+        ))
+    }
+
+    async fn get_dealing_chunk(
+        &self,
+        epoch_id: EpochId,
+        dealer: &str,
+        dealing_index: DealingIndex,
+        chunk_index: ChunkIndex,
+    ) -> crate::coconut::error::Result<Option<PartialContractDealingData>> {
+        Ok(nyxd_query!(
+            self,
+            get_dealing_chunk(epoch_id, dealer.to_string(), dealing_index, chunk_index)
+                .await?
+                .chunk
+        ))
+    }
+
+    async fn get_verification_key_share(
+        &self,
+        epoch_id: EpochId,
+        dealer: String,
+    ) -> Result<Option<ContractVKShare>, CoconutError> {
+        Ok(nyxd_query!(self, get_vk_share(epoch_id, dealer).await?).share)
     }
 
     async fn get_verification_key_shares(
         &self,
         epoch_id: EpochId,
-    ) -> crate::coconut::error::Result<Vec<ContractVKShare>> {
+    ) -> Result<Vec<ContractVKShare>, CoconutError> {
         Ok(nyxd_query!(
             self,
             get_all_verification_key_shares(epoch_id).await?
@@ -445,23 +522,36 @@ impl crate::coconut::client::Client for Client {
     async fn register_dealer(
         &self,
         bte_key: EncodedBTEPublicKeyWithProof,
+        identity_key: IdentityKey,
         announce_address: String,
         resharing: bool,
     ) -> Result<ExecuteResult, CoconutError> {
         Ok(nyxd_signing!(
             self,
-            register_dealer(bte_key, announce_address, resharing, None).await?
+            register_dealer(bte_key, identity_key, announce_address, resharing, None).await?
         ))
     }
 
-    async fn submit_dealing(
+    async fn submit_dealing_metadata(
         &self,
-        dealing_bytes: ContractSafeBytes,
+        dealing_index: DealingIndex,
+        chunks: Vec<DealingChunkInfo>,
+        resharing: bool,
+    ) -> crate::coconut::error::Result<ExecuteResult> {
+        Ok(nyxd_signing!(
+            self,
+            submit_dealing_metadata(dealing_index, chunks, resharing, None).await?
+        ))
+    }
+
+    async fn submit_dealing_chunk(
+        &self,
+        chunk: PartialContractDealing,
         resharing: bool,
     ) -> Result<ExecuteResult, CoconutError> {
         Ok(nyxd_signing!(
             self,
-            submit_dealing_bytes(dealing_bytes, resharing, None).await?
+            submit_dealing_chunk(chunk, resharing, None).await?
         ))
     }
 
@@ -477,23 +567,6 @@ impl crate::coconut::client::Client for Client {
     }
 }
 
-#[async_trait]
-impl crate::ephemera::client::Client for Client {
-    async fn get_ephemera_peers(&self) -> crate::ephemera::error::Result<Vec<JsonPeerInfo>> {
-        Ok(nyxd_query!(self, get_all_ephemera_peers().await?))
-    }
-
-    async fn register_ephemera_peer(
-        &self,
-        peer_info: JsonPeerInfo,
-    ) -> crate::ephemera::error::Result<ExecuteResult> {
-        Ok(nyxd_signing!(
-            self,
-            register_as_peer(peer_info, None).await?
-        ))
-    }
-}
-
 #[async_trait]
 impl DkgQueryClient for Client {
     async fn query_dkg_contract<T>(&self, query: DkgQueryMsg) -> std::result::Result<T, NyxdError>
@@ -504,19 +577,6 @@ impl DkgQueryClient for Client {
     }
 }
 
-#[async_trait]
-impl EphemeraQueryClient for Client {
-    async fn query_ephemera_contract<T>(
-        &self,
-        query: EphemeraQueryMsg,
-    ) -> std::result::Result<T, NyxdError>
-    where
-        for<'a> T: Deserialize<'a>,
-    {
-        nyxd_query!(self, query_ephemera_contract(query).await)
-    }
-}
-
 #[async_trait]
 impl SpDirectoryQueryClient for Client {
     async fn query_service_provider_contract<T>(
diff --git a/nym-connect/desktop/Cargo.lock b/nym-connect/desktop/Cargo.lock
index 842526b316..e20c5d4e69 100644
--- a/nym-connect/desktop/Cargo.lock
+++ b/nym-connect/desktop/Cargo.lock
@@ -3823,6 +3823,8 @@ dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
  "cw-utils",
+ "cw2",
+ "cw4",
  "nym-contracts-common",
  "nym-multisig-contract-common",
 ]
@@ -4146,6 +4148,7 @@ dependencies = [
  "cfg-if",
  "dotenvy",
  "hex-literal",
+ "log",
  "once_cell",
  "schemars",
  "serde",
@@ -4482,6 +4485,7 @@ version = "0.1.0"
 dependencies = [
  "async-trait",
  "futures",
+ "gloo-timers",
  "log",
  "nym-explorer-client",
  "nym-network-defaults",
@@ -4495,6 +4499,7 @@ dependencies = [
  "tokio",
  "tokio-stream",
  "url",
+ "wasmtimer",
 ]
 
 [[package]]
@@ -4533,7 +4538,6 @@ dependencies = [
  "nym-network-defaults",
  "nym-service-provider-directory-common",
  "nym-vesting-contract-common",
- "openssl",
  "prost",
  "reqwest",
  "serde",
@@ -4680,15 +4684,6 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
-[[package]]
-name = "openssl-src"
-version = "111.27.0+1.1.1v"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06e8f197c82d7511c5b014030c9b1efeda40d7d5f99d23b4ceed3524a5e63f02"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "openssl-sys"
 version = "0.9.91"
@@ -4697,7 +4692,6 @@ checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac"
 dependencies = [
  "cc",
  "libc",
- "openssl-src",
  "pkg-config",
  "vcpkg",
 ]
@@ -5538,6 +5532,7 @@ dependencies = [
  "wasm-bindgen-futures",
  "wasm-streams",
  "web-sys",
+ "webpki-roots 0.25.4",
  "winreg 0.50.0",
 ]
 
@@ -6493,7 +6488,7 @@ dependencies = [
  "thiserror",
  "tokio-stream",
  "url",
- "webpki-roots",
+ "webpki-roots 0.22.6",
 ]
 
 [[package]]
@@ -7282,9 +7277,8 @@ checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c"
 dependencies = [
  "futures-util",
  "log",
- "native-tls",
+ "rustls 0.21.7",
  "tokio",
- "tokio-native-tls",
  "tungstenite",
 ]
 
@@ -7464,8 +7458,8 @@ dependencies = [
  "http",
  "httparse",
  "log",
- "native-tls",
  "rand 0.8.5",
+ "rustls 0.21.7",
  "sha1",
  "thiserror",
  "url",
@@ -7909,6 +7903,12 @@ dependencies = [
  "webpki",
 ]
 
+[[package]]
+name = "webpki-roots"
+version = "0.25.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
+
 [[package]]
 name = "webview2-com"
 version = "0.19.1"
diff --git a/nym-node/Cargo.toml b/nym-node/Cargo.toml
index 77a7125c9c..745be5d884 100644
--- a/nym-node/Cargo.toml
+++ b/nym-node/Cargo.toml
@@ -37,12 +37,7 @@ mime = "0.3.17"
 hyper = { workspace = true }
 tower = { version = "0.4.13" }
 tower-http = { version = "0.4.4", features = ["fs"] }
-
-# `actix_extras`? what the hell?
-# hear me out first!
-# we can't use `axum_extras` because of freaking ephemera that depends on `actix_extras`.
-# however, it seems that pulling in `actix_extras` pulls in just enough shared features to improve `IntoParams` for our Query attributes
-utoipa = { workspace = true, features = ["actix_extras"] } # can't use `"axum_extras"` feature because ephemera uses `"actix_extras"` -.-'
+utoipa = { workspace = true, features = ["axum_extras"] }
 utoipa-swagger-ui = { workspace = true, features = ["axum"] }
 
 # if we ever wanted redoc/rapidoc bridges:
diff --git a/nym-validator-rewarder/Cargo.toml b/nym-validator-rewarder/Cargo.toml
index 7b7396babd..0e7d2f6309 100644
--- a/nym-validator-rewarder/Cargo.toml
+++ b/nym-validator-rewarder/Cargo.toml
@@ -6,7 +6,7 @@ repository.workspace = true
 homepage.workspace = true
 documentation.workspace = true
 edition.workspace = true
-license = "GPL-3"
+license = "GPL-3.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/nym-validator-rewarder/migrations/01_initial.sql b/nym-validator-rewarder/migrations/01_initial.sql
index b7b7b9f22f..2dbfb40e35 100644
--- a/nym-validator-rewarder/migrations/01_initial.sql
+++ b/nym-validator-rewarder/migrations/01_initial.sql
@@ -27,6 +27,7 @@ CREATE TABLE block_signing_reward
     rewarding_epoch_id          INTEGER NOT NULL REFERENCES rewarding_epoch (id),
     validator_consensus_address TEXT    NOT NULL,
     operator_account            TEXT    NOT NULL,
+    whitelisted                 BOOLEAN NOT NULL,
     amount                      TEXT    NOT NULL,
     voting_power                BIGINT  NOT NULL,
     voting_power_share          TEXT    NOT NULL,
@@ -38,11 +39,11 @@ CREATE TABLE block_signing_reward
 
 CREATE TABLE epoch_credential_issuance
 (
-    rewarding_epoch_id       INTEGER NOT NULL PRIMARY KEY REFERENCES rewarding_epoch (id),
-    starting_dkg_epoch       INTEGER NOT NULL,
-    ending_dkg_epoch         INTEGER NOT NULL,
+    rewarding_epoch_id               INTEGER NOT NULL PRIMARY KEY REFERENCES rewarding_epoch (id),
+    starting_dkg_epoch               INTEGER NOT NULL,
+    ending_dkg_epoch                 INTEGER NOT NULL,
     total_issued_partial_credentials INTEGER NOT NULL,
-    budget                   TEXT    NOT NULL
+    budget                           TEXT    NOT NULL
 );
 
 CREATE TABLE malformed_credential
@@ -56,6 +57,7 @@ CREATE TABLE credential_issuance_reward
     rewarding_epoch_id           INTEGER NOT NULL REFERENCES rewarding_epoch (id),
     operator_account             TEXT    NOT NULL,
     amount                       TEXT    NOT NULL,
+    whitelisted                  BOOLEAN NOT NULL,
     api_endpoint                 TEXT    NOT NULL,
     issued_partial_credentials   INTEGER NOT NULL,
     issued_credentials_share     TEXT    NOT NULL,
diff --git a/nym-validator-rewarder/src/cli/mod.rs b/nym-validator-rewarder/src/cli/mod.rs
index 7fe1dc8117..f9572442e1 100644
--- a/nym-validator-rewarder/src/cli/mod.rs
+++ b/nym-validator-rewarder/src/cli/mod.rs
@@ -53,6 +53,9 @@ pub struct ConfigOverridableArgs {
     #[clap(long)]
     pub disable_block_signing_rewarding: bool,
 
+    #[clap(long)]
+    pub block_signing_monitoring_only: bool,
+
     #[clap(long)]
     pub disable_credential_issuance_rewarding: bool,
 
diff --git a/nym-validator-rewarder/src/config/mod.rs b/nym-validator-rewarder/src/config/mod.rs
index 9003d32ceb..23dec58a4d 100644
--- a/nym-validator-rewarder/src/config/mod.rs
+++ b/nym-validator-rewarder/src/config/mod.rs
@@ -9,7 +9,7 @@ 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 nym_validator_client::nyxd::Coin;
+use nym_validator_client::nyxd::{AccountId, Coin};
 use serde::{Deserialize, Serialize};
 use serde_with::{serde_as, DisplayFromStr};
 use std::io;
@@ -225,7 +225,7 @@ impl Default for RewardingRatios {
 impl RewardingRatios {
     pub fn ensure_is_valid(&self) -> Result<(), NymRewarderError> {
         if self.block_signing + self.credential_verification + self.credential_issuance != 1.0 {
-            todo!()
+            return Err(NymRewarderError::InvalidRewardingRatios { ratios: *self });
         }
         Ok(())
     }
@@ -238,19 +238,30 @@ pub struct NyxdScraper {
     // TODO: debug with everything that's currently hardcoded in the scraper
 }
 
-#[derive(Debug, Clone, Deserialize, Serialize, Copy)]
+#[derive(Debug, Clone, Deserialize, Serialize)]
 pub struct BlockSigning {
-    /// Specifies whether credential issuance for block signing is enabled.
+    /// Specifies whether rewards for block signing is enabled.
     pub enabled: bool,
+
+    /// Specifies whether to only monitor and not send rewards.
+    pub monitor_only: bool,
+
+    /// List of validators that will receive rewards for block signing.
+    /// If not on the list, the validator will be treated as if it had 0 voting power.
+    pub whitelist: Vec<AccountId>,
 }
 
 impl Default for BlockSigning {
     fn default() -> Self {
-        BlockSigning { enabled: true }
+        BlockSigning {
+            enabled: true,
+            monitor_only: false,
+            whitelist: vec![],
+        }
     }
 }
 
-#[derive(Debug, Clone, Deserialize, Serialize, Copy)]
+#[derive(Debug, Clone, Deserialize, Serialize)]
 pub struct IssuanceMonitor {
     /// Specifies whether credential issuance monitoring (and associated rewards) are enabled.
     pub enabled: bool,
@@ -264,15 +275,20 @@ pub struct IssuanceMonitor {
 
     /// The sampling rate of the issued credentials
     pub sampling_rate: f64,
+
+    /// List of validators that will receive rewards for credential issuance.
+    /// If not on the list, the validator will be treated as if it hadn't issued a single credential.
+    pub whitelist: Vec<AccountId>,
 }
 
 impl Default for IssuanceMonitor {
     fn default() -> Self {
         IssuanceMonitor {
-            enabled: true,
+            enabled: false,
             run_interval: DEFAULT_MONITOR_RUN_INTERVAL,
             min_validate_per_issuer: DEFAULT_MONITOR_MIN_VALIDATE,
             sampling_rate: DEFAULT_MONITOR_SAMPLING_RATE,
+            whitelist: vec![],
         }
     }
 }
diff --git a/nym-validator-rewarder/src/config/override.rs b/nym-validator-rewarder/src/config/override.rs
index 01a42ef739..f16c6555fb 100644
--- a/nym-validator-rewarder/src/config/override.rs
+++ b/nym-validator-rewarder/src/config/override.rs
@@ -14,6 +14,10 @@ impl ConfigOverride for ConfigOverridableArgs {
             config.block_signing.enabled = false
         }
 
+        if self.block_signing_monitoring_only {
+            config.block_signing.monitor_only = true
+        }
+
         if self.disable_credential_issuance_rewarding {
             config.issuance_monitor.enabled = false
         }
diff --git a/nym-validator-rewarder/src/config/template.rs b/nym-validator-rewarder/src/config/template.rs
index 17ba1f9649..7e10b44d99 100644
--- a/nym-validator-rewarder/src/config/template.rs
+++ b/nym-validator-rewarder/src/config/template.rs
@@ -38,9 +38,19 @@ credential_verification = {{ rewarding.ratios.credential_verification }}
     
     
 [block_signing]
-# Specifies whether credential issuance for block signing is enabled.
+# Specifies whether rewarding for block signing is enabled.
 enabled = {{ block_signing.enabled }}
-    
+
+# Specifies whether to only monitor and not send rewards.
+monitor_only = {{ block_signing.monitor_only }}
+
+# List of validators that will receive rewards for block signing.
+# If not on the list, the validator will be treated as if it had 0 voting power.
+whitelist = [
+    # needs to be manually populated; expects nvalcons1... addresses.
+    # you can get them from, for example, `/cosmos/base/tendermint/v1beta1/validatorsets/latest` endpoint
+]
+ 
     
 [issuance_monitor]
 # Specifies whether credential issuance monitoring (and associated rewards) are enabled.
@@ -54,6 +64,12 @@ min_validate_per_issuer = {{ issuance_monitor.min_validate_per_issuer }}
 
 # The sampling rate of the issued credentials
 sampling_rate = {{ issuance_monitor.sampling_rate }}
+
+# List of validators that will receive rewards for credential issuance.
+# If not on the list, the validator will be treated as if it hadn't issued a single credential.
+whitelist = [
+    # needs to be manually populated; expects n1... addresses
+]
     
 [nyxd_scraper]
 # Url to the websocket endpoint of a validator, for example `wss://rpc.nymtech.net/websocket`
diff --git a/nym-validator-rewarder/src/error.rs b/nym-validator-rewarder/src/error.rs
index b6dae63537..3d00f0324d 100644
--- a/nym-validator-rewarder/src/error.rs
+++ b/nym-validator-rewarder/src/error.rs
@@ -1,6 +1,7 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: GPL-3.0-only
 
+use crate::config::RewardingRatios;
 use nym_coconut::CoconutError;
 use nym_validator_client::nym_api::error::NymAPIError;
 use nym_validator_client::nyxd::error::NyxdError;
@@ -50,7 +51,7 @@ pub enum NymRewarderError {
     NyxdFailure(#[from] NyxdError),
 
     #[error("the provided rewarding ratios don't add up to 1. ratios: {ratios:?}")]
-    InvalidRewardingRatios { ratios: Vec<f32> },
+    InvalidRewardingRatios { ratios: RewardingRatios },
 
     #[error("chain scraping failure: {source}")]
     ScraperFailure {
@@ -156,6 +157,12 @@ pub enum NymRewarderError {
 
     #[error("the scraper websocket endpoint hasn't been provided")]
     UnavailableWebsocketUrl,
+
+    #[error("block signing rewarding is enabled, but the validator whitelist is empty")]
+    EmptyBlockSigningWhitelist,
+
+    #[error("credential issuance rewarding is enabled, but the validator whitelist is empty")]
+    EmptyCredentialIssuanceWhitelist,
 }
 
 #[derive(Debug)]
diff --git a/nym-validator-rewarder/src/main.rs b/nym-validator-rewarder/src/main.rs
index fb03008a9a..eb513124d1 100644
--- a/nym-validator-rewarder/src/main.rs
+++ b/nym-validator-rewarder/src/main.rs
@@ -1,8 +1,10 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2023-2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: GPL-3.0-only
 
 #![warn(clippy::expect_used)]
 #![warn(clippy::unwrap_used)]
+#![warn(clippy::todo)]
+#![warn(clippy::dbg_macro)]
 
 use crate::cli::Cli;
 use clap::{crate_name, crate_version, Parser};
diff --git a/nym-validator-rewarder/src/rewarder/block_signing/mod.rs b/nym-validator-rewarder/src/rewarder/block_signing/mod.rs
index 4fcc75bc66..b87c6efaef 100644
--- a/nym-validator-rewarder/src/rewarder/block_signing/mod.rs
+++ b/nym-validator-rewarder/src/rewarder/block_signing/mod.rs
@@ -6,18 +6,19 @@ use crate::rewarder::block_signing::types::{EpochSigningResults, RawValidatorRes
 use crate::rewarder::epoch::Epoch;
 use crate::rewarder::nyxd_client::NyxdClient;
 use nym_validator_client::nyxd::module_traits::staking;
-use nym_validator_client::nyxd::PageRequest;
+use nym_validator_client::nyxd::{AccountId, PageRequest};
 use nyxd_scraper::NyxdScraper;
 use std::cmp::min;
 use std::collections::HashMap;
 use std::ops::Range;
-use tracing::info;
+use tracing::{debug, info, warn};
 
 pub(crate) mod types;
 
 pub struct EpochSigning {
     pub(crate) nyxd_client: NyxdClient,
     pub(crate) nyxd_scraper: NyxdScraper,
+    pub(crate) whitelist: Vec<AccountId>,
 }
 
 impl EpochSigning {
@@ -116,14 +117,29 @@ impl EpochSigning {
             else {
                 continue;
             };
-            total_vp += vp;
+
+            let cons_address = &validator.consensus_address;
+            // if this validator is NOT whitelisted, do not increase the total VP
+            let whitelisted = if let Ok(parsed) = cons_address.parse() {
+                if self.whitelist.contains(&parsed) {
+                    debug!("{cons_address} is on the whitelist");
+                    total_vp += vp;
+                    true
+                } else {
+                    warn!("{cons_address} is not a valid consensus address");
+                    false
+                }
+            } else {
+                debug!("{cons_address} is not on the whitelist");
+                false
+            };
 
             let signed = self
                 .nyxd_scraper
                 .storage
                 .get_signed_between_times(&validator.consensus_address, epoch_start, epoch_end)
                 .await?;
-            signed_in_epoch.insert(validator, RawValidatorResult::new(signed, vp));
+            signed_in_epoch.insert(validator, RawValidatorResult::new(signed, vp, whitelisted));
         }
 
         let total = self
diff --git a/nym-validator-rewarder/src/rewarder/block_signing/types.rs b/nym-validator-rewarder/src/rewarder/block_signing/types.rs
index bd28b2f49d..8cf31a5ba5 100644
--- a/nym-validator-rewarder/src/rewarder/block_signing/types.rs
+++ b/nym-validator-rewarder/src/rewarder/block_signing/types.rs
@@ -15,6 +15,7 @@ pub struct ValidatorSigning {
     pub validator: models::Validator,
     pub staking_details: staking::Validator,
     pub operator_account: AccountId,
+    pub whitelisted: bool,
 
     pub voting_power_at_epoch_start: i64,
     pub voting_power_ratio: Decimal,
@@ -33,6 +34,10 @@ impl ValidatorSigning {
     }
 
     pub fn reward_amount(&self, signing_budget: &Coin) -> Coin {
+        if !self.whitelisted {
+            return Coin::new(0, &signing_budget.denom);
+        }
+
         let amount =
             Uint128::new(signing_budget.amount) * self.ratio_signed * self.voting_power_ratio;
 
@@ -51,13 +56,15 @@ pub struct EpochSigningResults {
 pub struct RawValidatorResult {
     pub signed_blocks: i32,
     pub voting_power: i64,
+    pub whitelisted: bool,
 }
 
 impl RawValidatorResult {
-    pub fn new(signed_blocks: i32, voting_power: i64) -> Self {
+    pub fn new(signed_blocks: i32, voting_power: i64, whitelisted: bool) -> Self {
         Self {
             signed_blocks,
             voting_power,
+            whitelisted,
         }
     }
 }
@@ -93,7 +100,11 @@ impl EpochSigningResults {
             let vp: u64 = raw_results.voting_power.try_into().unwrap_or_default();
             let signed: u64 = raw_results.signed_blocks.try_into().unwrap_or_default();
 
-            let voting_power_ratio = Decimal::from_ratio(vp, total_vp_u64);
+            let voting_power_ratio = if raw_results.whitelisted {
+                Decimal::from_ratio(vp, total_vp_u64)
+            } else {
+                Decimal::zero()
+            };
 
             debug_assert!(signed <= blocks_u64);
             let ratio_signed = Decimal::from_ratio(signed, blocks_u64);
@@ -110,6 +121,7 @@ impl EpochSigningResults {
                 validator,
                 staking_details,
                 operator_account,
+                whitelisted: raw_results.whitelisted,
                 voting_power_at_epoch_start: raw_results.voting_power,
                 voting_power_ratio,
                 signed_blocks: raw_results.signed_blocks,
@@ -129,10 +141,11 @@ impl EpochSigningResults {
             .iter()
             .inspect(|v| {
                 info!(
-                    "validator {} will receive {} at address {} for block signing work",
+                    "validator {} will receive {} at address {} for block signing work (whitelisted: {})",
                     v.moniker(),
                     v.reward_amount(budget),
-                    v.operator_account
+                    v.operator_account,
+                    v.whitelisted
                 );
             })
             .map(|v| (v.operator_account.clone(), vec![v.reward_amount(budget)]))
diff --git a/nym-validator-rewarder/src/rewarder/credential_issuance/mod.rs b/nym-validator-rewarder/src/rewarder/credential_issuance/mod.rs
index 5807a60dec..7102ac2e69 100644
--- a/nym-validator-rewarder/src/rewarder/credential_issuance/mod.rs
+++ b/nym-validator-rewarder/src/rewarder/credential_issuance/mod.rs
@@ -8,6 +8,7 @@ use crate::rewarder::credential_issuance::types::{CredentialIssuanceResults, Mon
 use crate::rewarder::epoch::Epoch;
 use crate::rewarder::nyxd_client::NyxdClient;
 use nym_task::TaskClient;
+use nym_validator_client::nyxd::AccountId;
 use tracing::info;
 
 mod monitor;
@@ -21,9 +22,11 @@ impl CredentialIssuance {
     pub(crate) async fn new(
         epoch: Epoch,
         nyxd_client: &NyxdClient,
+        whitelist: &[AccountId],
     ) -> Result<Self, NymRewarderError> {
         Ok(CredentialIssuance {
-            monitoring_results: MonitoringResults::new_initial(epoch, nyxd_client).await?,
+            monitoring_results: MonitoringResults::new_initial(epoch, nyxd_client, whitelist)
+                .await?,
         })
     }
 
diff --git a/nym-validator-rewarder/src/rewarder/credential_issuance/monitor.rs b/nym-validator-rewarder/src/rewarder/credential_issuance/monitor.rs
index 884a63b9fe..96bdef6aae 100644
--- a/nym-validator-rewarder/src/rewarder/credential_issuance/monitor.rs
+++ b/nym-validator-rewarder/src/rewarder/credential_issuance/monitor.rs
@@ -235,12 +235,15 @@ impl CredentialIssuanceMonitor {
         let api_client = api_client(&issuer)?;
 
         let epoch_credentials = api_client.epoch_credentials(epoch_id).await?;
+        let whitelisted = self.config.whitelist.contains(&issuer.operator_account);
+
         let Some(first_id) = epoch_credentials.first_epoch_credential_id else {
             // no point in doing anything more - if they haven't issued anything, there's nothing to verify
             debug!("no credentials issued this epoch",);
             return Ok(RawOperatorResult::new_empty(
                 issuer.operator_account,
                 issuer.api_runner,
+                whitelisted,
             ));
         };
         trace!("issued credentials: {epoch_credentials:?}");
@@ -283,6 +286,7 @@ impl CredentialIssuanceMonitor {
         Ok(RawOperatorResult {
             operator_account: issuer.operator_account,
             api_runner: issuer.api_runner,
+            whitelisted,
             issued_credentials: epoch_credentials.total_issued,
             validated_credentials: sampled,
         })
diff --git a/nym-validator-rewarder/src/rewarder/credential_issuance/types.rs b/nym-validator-rewarder/src/rewarder/credential_issuance/types.rs
index e6f76a10ae..4b84870f70 100644
--- a/nym-validator-rewarder/src/rewarder/credential_issuance/types.rs
+++ b/nym-validator-rewarder/src/rewarder/credential_issuance/types.rs
@@ -25,6 +25,7 @@ impl MonitoringResults {
     pub(crate) async fn new_initial(
         initial_epoch: Epoch,
         nyxd_client: &NyxdClient,
+        whitelist: &[AccountId],
     ) -> Result<Self, NymRewarderError> {
         let epoch = nyxd_client.dkg_epoch().await?;
         let issuers = nyxd_client.get_credential_issuers(epoch.epoch_id).await?;
@@ -36,6 +37,7 @@ impl MonitoringResults {
             let mut raw_issuer = RawOperatorIssuing {
                 api_runner: issuer.api_runner.clone(),
                 runner_account: issuer.operator_account.clone(),
+                whitelisted: whitelist.contains(&issuer.operator_account),
                 per_epoch: Default::default(),
             };
 
@@ -132,6 +134,7 @@ impl MonitoringResults {
                 RawOperatorIssuing {
                     api_runner: result.api_runner.clone(),
                     runner_account: result.runner_account.clone(),
+                    whitelisted: result.whitelisted,
                     per_epoch: kept_epoch,
                 },
             );
@@ -157,18 +160,20 @@ pub(crate) struct MonitoringResultsInner {
 
 impl From<MonitoringResultsInner> for CredentialIssuanceResults {
     fn from(value: MonitoringResultsInner) -> Self {
-        let total_issued = value
-            .operators
-            .values()
-            .map(|o| {
-                let operator_issued: u32 = o
+        let mut total_issued = 0;
+
+        for operator in value.operators.values() {
+            // if this validator is NOT whitelisted, do not increase the total issued credentials
+            if operator.whitelisted {
+                let operator_issued: u32 = operator
                     .per_epoch
                     .values()
                     .map(|e| e.issued_since_monitor_started)
                     .sum();
-                operator_issued
-            })
-            .sum();
+
+                total_issued += operator_issued
+            }
+        }
 
         CredentialIssuanceResults {
             total_issued_partial_credentials: total_issued,
@@ -177,7 +182,7 @@ impl From<MonitoringResultsInner> for CredentialIssuanceResults {
                 .operators
                 .into_values()
                 .map(|runner| {
-                    let issued_ratio = if total_issued == 0 {
+                    let issued_ratio = if total_issued == 0 || !runner.whitelisted {
                         Decimal::zero()
                     } else {
                         Decimal::from_ratio(runner.issued_credentials(), total_issued)
@@ -187,6 +192,7 @@ impl From<MonitoringResultsInner> for CredentialIssuanceResults {
                         issued_credentials: runner.issued_credentials(),
                         validated_credentials: runner.validated_credentials(),
                         api_runner: runner.api_runner,
+                        whitelisted: runner.whitelisted,
                         runner_account: runner.runner_account,
                     }
                 })
@@ -212,6 +218,7 @@ impl MonitoringResultsInner {
 pub(crate) struct RawOperatorResult {
     pub(crate) operator_account: AccountId,
     pub(crate) api_runner: String,
+    pub(crate) whitelisted: bool,
 
     // how many credentials the operator claims to have issued in **TOTAL** in this **DKG** epoch
     pub(crate) issued_credentials: u32,
@@ -219,10 +226,15 @@ pub(crate) struct RawOperatorResult {
 }
 
 impl RawOperatorResult {
-    pub(crate) fn new_empty(operator_account: AccountId, api_runner: String) -> RawOperatorResult {
+    pub(crate) fn new_empty(
+        operator_account: AccountId,
+        api_runner: String,
+        whitelisted: bool,
+    ) -> RawOperatorResult {
         RawOperatorResult {
             operator_account,
             api_runner,
+            whitelisted,
             issued_credentials: 0,
             validated_credentials: Default::default(),
         }
@@ -232,6 +244,7 @@ impl RawOperatorResult {
 pub struct RawOperatorIssuing {
     pub api_runner: String,
     pub runner_account: AccountId,
+    pub whitelisted: bool,
 
     pub per_epoch: HashMap<u32, IssuedEpochCredentials>,
 }
@@ -243,6 +256,7 @@ impl RawOperatorIssuing {
         RawOperatorIssuing {
             api_runner: raw_result.api_runner,
             runner_account: raw_result.operator_account,
+            whitelisted: raw_result.whitelisted,
             per_epoch,
         }
     }
@@ -278,6 +292,7 @@ impl IssuedEpochCredentials {
 
 pub struct OperatorIssuing {
     pub api_runner: String,
+    pub whitelisted: bool,
     pub runner_account: AccountId,
 
     pub issued_ratio: Decimal,
@@ -286,10 +301,14 @@ pub struct OperatorIssuing {
 }
 
 impl OperatorIssuing {
-    pub fn reward_amount(&self, signing_budget: &Coin) -> Coin {
-        let amount = Uint128::new(signing_budget.amount) * self.issued_ratio;
+    pub fn reward_amount(&self, issuance_budget: &Coin) -> Coin {
+        if !self.whitelisted {
+            return Coin::new(0, &issuance_budget.denom);
+        }
 
-        Coin::new(amount.u128(), &signing_budget.denom)
+        let amount = Uint128::new(issuance_budget.amount) * self.issued_ratio;
+
+        Coin::new(amount.u128(), &issuance_budget.denom)
     }
 }
 
@@ -305,10 +324,11 @@ impl CredentialIssuanceResults {
             .iter()
             .inspect(|a| {
                 info!(
-                    "operator {} will receive {} at address {} for credential issuance work",
+                    "operator {} will receive {} at address {} for credential issuance work (whitelisted: {})",
                     a.api_runner,
                     a.reward_amount(budget),
                     a.runner_account,
+                    a.whitelisted
                 );
             })
             .map(|v| (v.runner_account.clone(), vec![v.reward_amount(budget)]))
diff --git a/nym-validator-rewarder/src/rewarder/epoch.rs b/nym-validator-rewarder/src/rewarder/epoch.rs
index 1b828da883..bf74fc748c 100644
--- a/nym-validator-rewarder/src/rewarder/epoch.rs
+++ b/nym-validator-rewarder/src/rewarder/epoch.rs
@@ -24,7 +24,8 @@ impl Epoch {
             .add(HOUR)
             .replace_nanosecond(0)?
             .replace_microsecond(0)?
-            .replace_second(0)?;
+            .replace_second(0)?
+            .replace_minute(0)?;
 
         Ok(Epoch {
             id: 0,
diff --git a/nym-validator-rewarder/src/rewarder/mod.rs b/nym-validator-rewarder/src/rewarder/mod.rs
index f58b3ce63f..216ee8eee8 100644
--- a/nym-validator-rewarder/src/rewarder/mod.rs
+++ b/nym-validator-rewarder/src/rewarder/mod.rs
@@ -41,17 +41,19 @@ impl EpochRewards {
         let mut amounts = Vec::new();
 
         if let Some(signing) = &self.signing {
-            for signing_amount in signing.rewarding_amounts(&self.signing_budget) {
-                if signing_amount.1[0].amount != 0 {
-                    amounts.push(signing_amount)
+            for (account, signing_amount) in signing.rewarding_amounts(&self.signing_budget) {
+                if signing_amount[0].amount != 0 {
+                    amounts.push((account, signing_amount))
                 }
             }
         }
 
         if let Some(credentials) = &self.credentials {
-            for credential_amount in credentials.rewarding_amounts(&self.credentials_budget) {
-                if credential_amount.1[0].amount != 0 {
-                    amounts.push(credential_amount)
+            for (account, credential_amount) in
+                credentials.rewarding_amounts(&self.credentials_budget)
+            {
+                if credential_amount[0].amount != 0 {
+                    amounts.push((account, credential_amount))
                 }
             }
         }
@@ -86,18 +88,29 @@ impl Rewarder {
         };
 
         let epoch_signing = if config.block_signing.enabled {
+            let whitelist = config.block_signing.whitelist.clone();
+            if whitelist.is_empty() {
+                return Err(NymRewarderError::EmptyBlockSigningWhitelist);
+            }
+
             let nyxd_scraper = NyxdScraper::new(config.scraper_config()).await?;
 
             Some(EpochSigning {
                 nyxd_scraper,
                 nyxd_client: nyxd_client.clone(),
+                whitelist,
             })
         } else {
             None
         };
 
         let credential_issuance = if config.issuance_monitor.enabled {
-            Some(CredentialIssuance::new(current_epoch, &nyxd_client).await?)
+            let whitelist = &config.issuance_monitor.whitelist;
+            if whitelist.is_empty() {
+                return Err(NymRewarderError::EmptyCredentialIssuanceWhitelist);
+            }
+
+            Some(CredentialIssuance::new(current_epoch, &nyxd_client, whitelist).await?)
         } else {
             None
         };
@@ -196,6 +209,11 @@ impl Rewarder {
         &self,
         amounts: Vec<(AccountId, Vec<Coin>)>,
     ) -> Result<Hash, NymRewarderError> {
+        if self.config.block_signing.monitor_only {
+            info!("skipping sending rewards, monitoring mode only");
+            return Ok(Hash::Sha256([0u8; 32]));
+        }
+
         info!("sending rewards");
         self.nyxd_client
             .send_rewards(self.current_epoch, amounts)
@@ -239,7 +257,7 @@ impl Rewarder {
 
         if let Some(ref credential_issuance) = self.credential_issuance {
             credential_issuance.start_monitor(
-                self.config.issuance_monitor,
+                self.config.issuance_monitor.clone(),
                 self.nyxd_client.clone(),
                 task_manager.subscribe(),
             );
diff --git a/nym-validator-rewarder/src/rewarder/storage/manager.rs b/nym-validator-rewarder/src/rewarder/storage/manager.rs
index 5d5ab191f8..b8f84bbd18 100644
--- a/nym-validator-rewarder/src/rewarder/storage/manager.rs
+++ b/nym-validator-rewarder/src/rewarder/storage/manager.rs
@@ -74,6 +74,7 @@ impl StorageManager {
         epoch: i64,
         consensus_address: String,
         operator_account: String,
+        whitelisted: bool,
         amount: String,
         voting_power: i64,
         voting_power_share: String,
@@ -86,16 +87,18 @@ impl StorageManager {
                     rewarding_epoch_id,
                     validator_consensus_address,
                     operator_account,
+                    whitelisted,
                     amount,
                     voting_power,
                     voting_power_share,
                     signed_blocks,
                     signed_blocks_percent
-                ) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+                ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
             "#,
             epoch,
             consensus_address,
             operator_account,
+            whitelisted,
             amount,
             voting_power,
             voting_power_share,
@@ -144,6 +147,7 @@ impl StorageManager {
         &self,
         epoch: i64,
         operator_account: String,
+        whitelisted: bool,
         amount: String,
         api_endpoint: String,
         issued_partial_credentials: u32,
@@ -155,15 +159,17 @@ impl StorageManager {
                 INSERT INTO credential_issuance_reward (
                     rewarding_epoch_id,
                     operator_account,
+                    whitelisted,
                     amount,
                     api_endpoint,
                     issued_partial_credentials,
                     issued_credentials_share,
                     validated_issued_credentials
-                ) VALUES (?, ?, ?, ?, ?, ?, ?)
+                ) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
             "#,
             epoch,
             operator_account,
+            whitelisted,
             amount,
             api_endpoint,
             issued_partial_credentials,
diff --git a/nym-validator-rewarder/src/rewarder/storage/mod.rs b/nym-validator-rewarder/src/rewarder/storage/mod.rs
index aada9ef5dd..0c35fb0400 100644
--- a/nym-validator-rewarder/src/rewarder/storage/mod.rs
+++ b/nym-validator-rewarder/src/rewarder/storage/mod.rs
@@ -104,6 +104,7 @@ impl RewarderStorage {
                         epoch_id,
                         validator.validator.consensus_address,
                         validator.operator_account.to_string(),
+                        validator.whitelisted,
                         reward_amount,
                         validator.voting_power_at_epoch_start,
                         validator.voting_power_ratio.to_string(),
@@ -152,6 +153,7 @@ impl RewarderStorage {
                     .insert_rewarding_epoch_credential_issuance_reward(
                         epoch_id,
                         api_runner.runner_account.to_string(),
+                        api_runner.whitelisted,
                         reward_amount,
                         api_runner.api_runner,
                         api_runner.issued_credentials,
diff --git a/nym-wallet/Cargo.lock b/nym-wallet/Cargo.lock
index 33252bd805..a197456fb9 100644
--- a/nym-wallet/Cargo.lock
+++ b/nym-wallet/Cargo.lock
@@ -750,6 +750,12 @@ version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f"
 
+[[package]]
+name = "const-str"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aca749d3d3f5b87a0d6100509879f9cf486ab510803a4a4e1001da1ff61c2bd6"
+
 [[package]]
 name = "convert_case"
 version = "0.4.0"
@@ -3109,6 +3115,7 @@ dependencies = [
  "clap",
  "clap_complete",
  "clap_complete_fig",
+ "const-str",
  "log",
  "pretty_env_logger",
  "schemars",
@@ -3153,6 +3160,8 @@ dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
  "cw-utils",
+ "cw2",
+ "cw4",
  "nym-contracts-common",
  "nym-multisig-contract-common",
 ]
@@ -3315,6 +3324,7 @@ dependencies = [
  "cfg-if",
  "dotenvy",
  "hex-literal",
+ "log",
  "once_cell",
  "schemars",
  "serde",
@@ -3444,7 +3454,6 @@ dependencies = [
  "nym-network-defaults",
  "nym-service-provider-directory-common",
  "nym-vesting-contract-common",
- "openssl",
  "prost",
  "reqwest",
  "serde",
@@ -3676,15 +3685,6 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
-[[package]]
-name = "openssl-src"
-version = "111.27.0+1.1.1v"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06e8f197c82d7511c5b014030c9b1efeda40d7d5f99d23b4ceed3524a5e63f02"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "openssl-sys"
 version = "0.9.91"
@@ -3693,7 +3693,6 @@ checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac"
 dependencies = [
  "cc",
  "libc",
- "openssl-src",
  "pkg-config",
  "vcpkg",
 ]
@@ -4444,6 +4443,7 @@ dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
+ "webpki-roots",
  "winreg",
 ]
 
@@ -6260,6 +6260,12 @@ dependencies = [
  "system-deps 6.1.1",
 ]
 
+[[package]]
+name = "webpki-roots"
+version = "0.25.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
+
 [[package]]
 name = "webview2-com"
 version = "0.19.1"
diff --git a/ppa/InRelease b/ppa/InRelease
deleted file mode 100644
index f9a39c17dd..0000000000
--- a/ppa/InRelease
+++ /dev/null
@@ -1,37 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-Date: Sun, 14 Jan 2024 20:34:14 +0000
-MD5Sum:
- f78e894e59a145bf9c44a2747bafc251             6083 Packages
- eea791395c8b2c200a5b9641aad92ff9             1813 Packages.gz
- 22a6d744604a316b88e048e9aba70861               38 Release
-SHA1:
- 8dff5ac5fa5b76a7b5e0436ed428adcfaeb6ee46             6083 Packages
- 6ddb3393c2a17b0350a90a8c1f9bcabb0480f008             1813 Packages.gz
- 05ed3399246e80daa379888037674e900d47f826               38 Release
-SHA256:
- f22508b4022ad510b77407f277f3963f08a68b9d89e04040e11712d37b250641             6083 Packages
- f2f36b35214d4a9b0fdf870a997dd5773ee695b02b35466fbda4319cf9d8d1aa             1813 Packages.gz
- a5f691742934e61dff3fbd6b36d59b290dcb3edc9a54ee45533f374a0de67c7b               38 Release
-SHA512:
- 6d1cadd20672271e5e9fe9e65c0fd2cb58ab41d87c7750841e284aa5a4023df4f04c3da373a0916a7360511bba61fe8b0a3dfc571f3aba51219b38143cf76a03             6083 Packages
- 5e84c10bce8d608f5fa373211a2bffb95c88a5e9d8823bfb61f9f989db1e76b9b6ef796cb8cede1242e1754f9202d64a23c6f3063ac21c6e6be7dafccbe2adcb             1813 Packages.gz
- ea4efdb7b497538ac2fa5ae786aeeb72fd867e9933cbe1ca05545a92306d8020506793d65e7f6d5964764c2c5772d92fad6088ed37aedb960069a4156e4bb4a9               38 Release
------BEGIN PGP SIGNATURE-----
-
-iQJEBAEBCgAuFiEEzWLrAxjj1jSobw5ZgQ9E11+JZgIFAmWkRUYQHG55bUBueW10
-ZWNoLm5ldAAKCRCBD0TXX4lmAj1ID/99hRCleE06tCD+I0eDTw2iUG/TVU1Qzq/I
-qh6jhtbS1KexM2VaVyb7qKYtTLphqYyelKHG3eNtQeuTXaGPrjC535Av91/VjC13
-wIAdy0/CsG5MVboiMnrmp1G3572hmdQbuY9u1VIqeJjKEHJKBQFNYC842LV6CB/A
-/HWZKTtWpEAXOd/Z68TM7uYmU8mM6Ef/UYaqN4jQ4SNrvI5ssGIfjm8z/YuhXWdm
-mj5rHiTPMwdzTFhXfrOkFGiwnbKcgOfmeSUBTtfU6s+yGnFCDIaL5tm4jSoBfxKy
-/swbJv9FBQTRAA+17luOlFJcrxc/DNCax1ZmnZmlWY47S75whjptJZQ5zRZ8oRoO
-l8sI5vLu6qwRmrMwibh+kjE+o7XOCuCDFrxXhqu3ZrawuUVL4g/IOdpWOgmHvsL7
-7Mf0cOzf7jWitRtHoK70Y9CGhx08x6NTa/7E5OEEAkFrd5wmAy7AWJp2SFBfGSLP
-Oni0cvGS67FQmT02YkSSFwaQIRVpb0U8rAIIAP3cn9bW9Zbv/8JAgJ12s8jqAHE8
-Vj39hv3x6LhzUQ6Y62LRC8DaPZ+RQmpTCjCUsQ61YLJ32Y56sar3sp51bi/BVihu
-7KYPrpNoIVn9p8EoaMwMm4XWc8TT9DbUKsgKn8CWiuZxCA225mVHVQbzaFWXY5y3
-4Dkmc1mjiA==
-=tMQC
------END PGP SIGNATURE-----
diff --git a/ppa/Packages b/ppa/Packages
deleted file mode 100644
index 8d4e02e9a1..0000000000
--- a/ppa/Packages
+++ /dev/null
@@ -1,214 +0,0 @@
-Package: nym-gateway
-Version: 1.1.32-1
-Architecture: amd64
-Maintainer: Dave Hrycyszyn <futurechimp@users.noreply.github.com>
-Installed-Size: 30299
-Depends: curl
-Filename: ./debian/nym-gateway_1.1.32-1_amd64.deb
-Size: 7406752
-MD5sum: 390da86b88bc1061cb01d4529af1b9a0
-SHA1: d9a733aa65e4f1fbb7be942d67de4d3ecfda6d06
-SHA256: c23b76a47c0b8ae265ab0d5c87040739c57bd0b55ebe2cb59a05e99bf94f1b2f
-Priority: optional
-Description: Implementation of the Nym Mixnet Gateway
- <!--
- Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
- SPDX-License-Identifier: GPL-3.0-only
- -->
- .
- # Nym Gateway
- .
- A Rust gateway implementation.
- .
- ## License
- .
- Copyright (C) 2023 Nym Technologies SA <contact@nymtech.net>
- .
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <https://www.gnu.org/licenses/>.
- .
- ## Install debian
- .
- ```bash
- sudo curl -s --compressed "https://nymtech.github.io/nym/nymtech.gpg" | gpg
- --dearmor | sudo tee /etc/apt/trusted.gpg.d/nymtech.gpg > /dev/null
- sudo echo "deb [signed-by=/etc/apt/trusted.gpg.d/nymtech.gpg]
- https://nymtech.github.io/nym/ /" > nymtech.list
- .
- sudo apt-get update
- sudo apt-get install nym-gateway
- .
- # See below for starting and managing the node
- ```
- .
- ## Systemd support
- .
- ```bash
- sudo systemctl enable nym-gateway
- .
- # Run
- sudo systemctl start nym-gateway
- .
- # Check status
- sudo systemctl status nym-mixnode
- .
- # Logs
- journalctl -f -u nym-mixnode
- .
- ```
- .
- ## Build debian package
- .
- ```bash
- # cargo install cargo-deb
- .
- # Build package
- cargo deb -p nym-mixnode
- .
- # Install
- .
- # This will init the mixnode to `/etc/nym` as `nym` user, and create a systemd
- service
- sudo dpkg -i target/debian/<PACKAGE>
- ```
-
-Package: nym-mixnode
-Version: 1.1.33-1
-Architecture: amd64
-Maintainer: Dave Hrycyszyn <futurechimp@users.noreply.github.com>
-Installed-Size: 23794
-Depends: libc6 (>= 2.34)
-Filename: ./debian/nym-mixnode_1.1.33-1_amd64.deb
-Size: 5245732
-MD5sum: a9377a1aabfda9d95ce3a937fb4f02ed
-SHA1: 535e76d7c5c0d8dc96b30c34fa1de46fbc9c40dd
-SHA256: 70874c9d738998b6b671965ee724c47f56a8486d8eb6c73e94498f8c240fa62b
-Priority: optional
-Description: Implementation of a Loopix-based Mixnode
- <!--
- Copyright 2020 - Nym Technologies SA <contact@nymtech.net>
- SPDX-License-Identifier: Apache-2.0
- -->
- .
- # Nym Mixnode
- .
- A Rust mixnode implementation.
- .
- ## Usage
- .
- * `nym-mixnode` prints a help message showing usage options
- * `nym-mixnode run --help` prints a help message showing usage options for the
- run command
- * `nym-mixnode run --layer 1 --host x.x.x.x` will start the mixnode in layer 1
- and bind to the specified host IP address. Coordinate with other people in your
- network to find out which layer needs coverage.
- .
- By default, the Nym Mixnode will start on port 1789. If desired, you can change
- the port using the `--port` option.
-
-Package: nym-mixnode
-Version: 1.1.34-1
-Architecture: amd64
-Maintainer: Dave Hrycyszyn <futurechimp@users.noreply.github.com>
-Installed-Size: 24536
-Depends: libc6 (>= 2.34)
-Filename: ./debian/nym-mixnode_1.1.34-1_amd64.deb
-Size: 5526956
-MD5sum: 0f4a0c65e0d6c3d124b5800e5f517ad8
-SHA1: b80d46d861f1b90ab5528f7d8c6be078923d7b2b
-SHA256: c294728949c85260428a736601870b5dc9f82b49ec33fa998e4195f41f83cca0
-Priority: optional
-Description: Implementation of a Loopix-based Mixnode
- <!--
- Copyright 2020 - Nym Technologies SA <contact@nymtech.net>
- SPDX-License-Identifier: GPL-3.0-only
- -->
- .
- # Nym Mixnode
- .
- A Rust mixnode implementation.
- .
- ## License
- .
- Copyright (C) 2020 Nym Technologies SA <contact@nymtech.net>
- .
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <https://www.gnu.org/licenses/>.
- .
- ## Usage
- .
- * `nym-mixnode` prints a help message showing usage options
- * `nym-mixnode run --help` prints a help message showing usage options for the
- run command
- * `nym-mixnode run --layer 1 --host x.x.x.x` will start the mixnode in layer 1
- and bind to the specified host IP address. Coordinate with other people in your
- network to find out which layer needs coverage.
- .
- By default, the Nym Mixnode will start on port 1789. If desired, you can change
- the port using the `--port` option.
- .
- ## Install debian
- .
- ```bash
- sudo curl -s --compressed "https://nymtech.github.io/nym/nymtech.gpg" | gpg
- --dearmor | sudo tee /etc/apt/trusted.gpg.d/nymtech.gpg > /dev/null
- sudo echo "deb [signed-by=/etc/apt/trusted.gpg.d/nymtech.gpg]
- https://nymtech.github.io/nym/ /" > nymtech.list
- .
- sudo apt-get update
- sudo apt-get install nym-mixnode
- .
- # See below for starting and managing the node
- ```
- .
- ## Systemd support
- .
- ```bash
- sudo systemctl enable nym-mixnode
- .
- # Run
- sudo systemctl start nym-mixnode
- .
- # Check status
- sudo systemctl status nym-mixnode
- .
- # Logs
- journalctl -f -u nym-mixnode
- .
- ```
- .
- ## Build debian package
- .
- ```bash
- # cargo install cargo-deb
- .
- # Build package
- cargo deb -p nym-mixnode
- .
- # Install
- .
- # This will init the mixnode to `/etc/nym` as `nym` user, and create a systemd
- service
- sudo dpkg -i target/debian/<PACKAGE>
- ```
-
diff --git a/ppa/Packages.gz b/ppa/Packages.gz
deleted file mode 100644
index 6d0a6bab73..0000000000
Binary files a/ppa/Packages.gz and /dev/null differ
diff --git a/ppa/Release b/ppa/Release
deleted file mode 100644
index 7dfdd2c8c1..0000000000
--- a/ppa/Release
+++ /dev/null
@@ -1,17 +0,0 @@
-Date: Sun, 14 Jan 2024 20:34:14 +0000
-MD5Sum:
- f78e894e59a145bf9c44a2747bafc251             6083 Packages
- eea791395c8b2c200a5b9641aad92ff9             1813 Packages.gz
- 22a6d744604a316b88e048e9aba70861               38 Release
-SHA1:
- 8dff5ac5fa5b76a7b5e0436ed428adcfaeb6ee46             6083 Packages
- 6ddb3393c2a17b0350a90a8c1f9bcabb0480f008             1813 Packages.gz
- 05ed3399246e80daa379888037674e900d47f826               38 Release
-SHA256:
- f22508b4022ad510b77407f277f3963f08a68b9d89e04040e11712d37b250641             6083 Packages
- f2f36b35214d4a9b0fdf870a997dd5773ee695b02b35466fbda4319cf9d8d1aa             1813 Packages.gz
- a5f691742934e61dff3fbd6b36d59b290dcb3edc9a54ee45533f374a0de67c7b               38 Release
-SHA512:
- 6d1cadd20672271e5e9fe9e65c0fd2cb58ab41d87c7750841e284aa5a4023df4f04c3da373a0916a7360511bba61fe8b0a3dfc571f3aba51219b38143cf76a03             6083 Packages
- 5e84c10bce8d608f5fa373211a2bffb95c88a5e9d8823bfb61f9f989db1e76b9b6ef796cb8cede1242e1754f9202d64a23c6f3063ac21c6e6be7dafccbe2adcb             1813 Packages.gz
- ea4efdb7b497538ac2fa5ae786aeeb72fd867e9933cbe1ca05545a92306d8020506793d65e7f6d5964764c2c5772d92fad6088ed37aedb960069a4156e4bb4a9               38 Release
diff --git a/ppa/Release.gpg b/ppa/Release.gpg
deleted file mode 100644
index 6cdd3ad60b..0000000000
--- a/ppa/Release.gpg
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQJEBAABCgAuFiEEzWLrAxjj1jSobw5ZgQ9E11+JZgIFAmWkRUYQHG55bUBueW10
-ZWNoLm5ldAAKCRCBD0TXX4lmAjSqEACHqQIP8w3mH86nqD0BJi3vZhMuYZsuxr9r
-nyZS7vhCqDTz+4ahJBEHW3n1GNdf6EI1KuswY82FeWEiBYQaIapDv++ADwH4mOY9
-splwnHYCITQOMOOL8+mvk1vFe3AGQNDkHW7jhhT/2GUIxl31wc3Y65lX9V1NQ0kf
-b1nfvZiLxES4Lw4YL5wopRlYw5ws9Qcp+GHuOJNA9423KYS/GeHoyay3wrilW8sJ
-JeUfS9zEPplaVD4wyaoz45taFC47PsnXPJegTZ3yyTrfyQi3l71qCS8qprza+sFv
-aCKa2zT+4YAetpTY77NYeeh/Wztai93aKjqlrjW5KEHPs3oWq8Y3afKI0/Ltjp2j
-kpqbWhyppbVSc20YYf/1rPU5oKYjIcu6yFyypnSBrX5Q0Q2MSqGgi8yAN+hwG/Aj
-/T+BylTqdKMAZCohV2r3Jp74jnJDydRqpGNtqQEdE4aSa4xfh8L3RbCEKYa6Ugqy
-KEgnMHGmYD7cNx/FKly9zVLdRsuMD4MV/ndtXVjk3+O+xMU4iNwvowfnHkbzAPcC
-nV7KyxkcMQ9wmXRbCmhPp71RsmLI4d/wm53/bxwrMtfOOJ8HMhi0PFASnO80mzbJ
-nT2EWyRy5JkHsX4gVvVTQmpYxB3ilSFIYVNxfVrhQNbX8hfv3epnvLbbWdMWequx
-knlP3IctJg==
-=Du2e
------END PGP SIGNATURE-----
diff --git a/ppa/debian/nym-gateway_1.1.32-1_amd64.deb b/ppa/debian/nym-gateway_1.1.32-1_amd64.deb
deleted file mode 100644
index a85e06753e..0000000000
Binary files a/ppa/debian/nym-gateway_1.1.32-1_amd64.deb and /dev/null differ
diff --git a/ppa/debian/nym-mixnode_1.1.33-1_amd64.deb b/ppa/debian/nym-mixnode_1.1.33-1_amd64.deb
deleted file mode 100644
index ac3e1ae786..0000000000
Binary files a/ppa/debian/nym-mixnode_1.1.33-1_amd64.deb and /dev/null differ
diff --git a/ppa/debian/nym-mixnode_1.1.34-1_amd64.deb b/ppa/debian/nym-mixnode_1.1.34-1_amd64.deb
deleted file mode 100644
index 99ff0fa578..0000000000
Binary files a/ppa/debian/nym-mixnode_1.1.34-1_amd64.deb and /dev/null differ
diff --git a/ppa/nymtech.list b/ppa/nymtech.list
deleted file mode 100644
index 0cecfea5fa..0000000000
--- a/ppa/nymtech.list
+++ /dev/null
@@ -1 +0,0 @@
-deb [signed-by=/etc/apt/trusted.gpg.d/nymtech.gpg] https://nymtech.github.io/nym/ /
\ No newline at end of file
diff --git a/scripts/ppa.sh b/scripts/ppa.sh
deleted file mode 100755
index 0dbac24fee..0000000000
--- a/scripts/ppa.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#/bin/bash
-# Run from repository root
-# Takes PPA_SIGNING_KEY base64 encoded as first argument
-
-echo $1 | base64 -d >ppa-signing-key.asc
-gpg --import ppa-signing-key.asc
-rm ppa-signing-key.asc
-
-cargo deb -p nym-mixnode
-cargo deb -p nym-gateway
-cargo deb -p nym-cli
-
-mv target/debian/*.deb ppa/debian
-
-cd ppa
-
-dpkg-scanpackages --multiversion . >Packages
-gzip -k -f Packages
-
-apt-ftparchive release . >Release
-gpg --default-key "nym@nymtech.net" -abs -o - Release >Release.gpg
-gpg --default-key "nym@nymtech.net" --clearsign -o - Release >InRelease
diff --git a/sdk/lib/socks5-listener/Cargo.toml b/sdk/lib/socks5-listener/Cargo.toml
index a3355fe3c6..425154a5cb 100644
--- a/sdk/lib/socks5-listener/Cargo.toml
+++ b/sdk/lib/socks5-listener/Cargo.toml
@@ -23,7 +23,6 @@ nym-config-common = { path = "../../../common/config", package = "nym-config" }
 nym-credential-storage = { path = "../../../common/credential-storage" }
 nym-crypto = { path = "../../../common/crypto" }
 nym-socks5-client-core = { path = "../../../common/socks5-client-core", default-features = false }
-openssl = { version = "^0.10.55", features = ["vendored"] }
 serde = { workspace = true }
 tokio = { workspace = true, features = ["sync", "time"] }
 log = "0.4.17"
diff --git a/service-providers/ip-packet-router/Cargo.toml b/service-providers/ip-packet-router/Cargo.toml
index 01ae4fb897..39f3e33e48 100644
--- a/service-providers/ip-packet-router/Cargo.toml
+++ b/service-providers/ip-packet-router/Cargo.toml
@@ -10,21 +10,27 @@ license.workspace = true
 
 [dependencies]
 bincode = "1.3.3"
+bs58 = "0.4.0"
 bytes = "1.5.0"
+clap.workspace = true
 etherparse = "0.13.0"
 futures = { workspace = true }
+lazy_static.workspace = true
 log = { workspace = true }
 nym-bin-common = { path = "../../common/bin-common" }
 nym-client-core = { path = "../../common/client-core" }
 nym-config = { path = "../../common/config" }
+nym-crypto = { path = "../../common/crypto" }
 nym-exit-policy = { path = "../../common/exit-policy" }
 nym-ip-packet-requests = { path = "../../common/ip-packet-requests" }
+nym-network-defaults = { path = "../../common/network-defaults" }
 nym-network-requester = { path = "../network-requester" }
 nym-sdk = { path = "../../sdk/rust/nym-sdk" }
 nym-service-providers-common = { path = "../common" }
 nym-sphinx = { path = "../../common/nymsphinx" }
 nym-task = { path = "../../common/task" }
 nym-tun = { path = "../../common/tun" }
+nym-types = { path = "../../common/types" }
 nym-wireguard = { path = "../../common/wireguard" }
 nym-wireguard-types = { path = "../../common/wireguard-types" }
 rand = "0.8.5"
@@ -34,6 +40,7 @@ serde_json = { workspace = true }
 tap.workspace = true
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["rt-multi-thread", "net", "io-util"] }
+tokio-util = { workspace = true, features = ["codec"] }
 url.workspace = true
 
 [target.'cfg(target_os = "linux")'.dependencies]
diff --git a/service-providers/ip-packet-router/src/cli/build_info.rs b/service-providers/ip-packet-router/src/cli/build_info.rs
new file mode 100644
index 0000000000..48bdf32eb0
--- /dev/null
+++ b/service-providers/ip-packet-router/src/cli/build_info.rs
@@ -0,0 +1,13 @@
+use clap::Args;
+use nym_bin_common::bin_info_owned;
+use nym_bin_common::output_format::OutputFormat;
+
+#[derive(Args)]
+pub(crate) struct BuildInfo {
+    #[arg(short, long, default_value_t = OutputFormat::default())]
+    output: OutputFormat,
+}
+
+pub(crate) fn execute(args: BuildInfo) {
+    println!("{}", args.output.format(&bin_info_owned!()))
+}
diff --git a/service-providers/ip-packet-router/src/cli/init.rs b/service-providers/ip-packet-router/src/cli/init.rs
new file mode 100644
index 0000000000..207a6a748c
--- /dev/null
+++ b/service-providers/ip-packet-router/src/cli/init.rs
@@ -0,0 +1,108 @@
+use std::{fmt::Display, fs, path::PathBuf};
+
+use clap::Args;
+use nym_bin_common::output_format::OutputFormat;
+use nym_client_core::cli_helpers::client_init::{
+    initialise_client, CommonClientInitArgs, InitResultsWithConfig, InitialisableClient,
+};
+use serde::Serialize;
+
+use crate::{
+    cli::{override_config, try_upgrade_config, OverrideConfig},
+    config::{default_config_directory, default_config_filepath, default_data_directory, Config},
+    error::IpPacketRouterError,
+};
+
+struct IpPacketRouterInit;
+
+impl InitialisableClient for IpPacketRouterInit {
+    const NAME: &'static str = "ip packet router";
+    type Error = IpPacketRouterError;
+    type InitArgs = Init;
+    type Config = Config;
+
+    fn try_upgrade_outdated_config(id: &str) -> Result<(), Self::Error> {
+        try_upgrade_config(id)
+    }
+
+    fn initialise_storage_paths(id: &str) -> Result<(), Self::Error> {
+        fs::create_dir_all(default_data_directory(id))?;
+        fs::create_dir_all(default_config_directory(id))?;
+        Ok(())
+    }
+
+    fn default_config_path(id: &str) -> PathBuf {
+        default_config_filepath(id)
+    }
+
+    fn construct_config(init_args: &Self::InitArgs) -> Self::Config {
+        override_config(
+            Config::new(&init_args.common_args.id),
+            OverrideConfig::from(init_args.clone()),
+        )
+    }
+}
+
+#[derive(Args, Clone, Debug)]
+pub(crate) struct Init {
+    #[command(flatten)]
+    common_args: CommonClientInitArgs,
+
+    #[clap(short, long, default_value_t = OutputFormat::default())]
+    output: OutputFormat,
+}
+
+impl From<Init> for OverrideConfig {
+    fn from(init_config: Init) -> Self {
+        OverrideConfig {
+            nym_apis: init_config.common_args.nym_apis,
+            nyxd_urls: init_config.common_args.nyxd_urls,
+            enabled_credentials_mode: init_config.common_args.enabled_credentials_mode,
+        }
+    }
+}
+
+impl AsRef<CommonClientInitArgs> for Init {
+    fn as_ref(&self) -> &CommonClientInitArgs {
+        &self.common_args
+    }
+}
+
+#[derive(Debug, Serialize)]
+pub struct InitResults {
+    #[serde(flatten)]
+    client_core: nym_client_core::init::types::InitResults,
+    client_address: String,
+}
+
+impl InitResults {
+    fn new(res: InitResultsWithConfig<Config>) -> Self {
+        Self {
+            client_address: res.init_results.address.to_string(),
+            client_core: res.init_results,
+        }
+    }
+}
+
+impl Display for InitResults {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        writeln!(f, "{}", self.client_core)?;
+        write!(
+            f,
+            "Address of this ip-packet-router: {}",
+            self.client_address
+        )
+    }
+}
+
+pub(crate) async fn execute(args: Init) -> Result<(), IpPacketRouterError> {
+    eprintln!("Initialising client...");
+
+    let output = args.output;
+    let res = initialise_client::<IpPacketRouterInit>(args).await?;
+
+    let init_results = InitResults::new(res);
+    println!("{}", output.format(&init_results));
+
+    Ok(())
+}
diff --git a/service-providers/ip-packet-router/src/cli/mod.rs b/service-providers/ip-packet-router/src/cli/mod.rs
new file mode 100644
index 0000000000..d17391eaed
--- /dev/null
+++ b/service-providers/ip-packet-router/src/cli/mod.rs
@@ -0,0 +1,197 @@
+use clap::{CommandFactory, Parser, Subcommand};
+use log::{error, trace};
+use nym_bin_common::completions::{fig_generate, ArgShell};
+use nym_bin_common::{bin_info, version_checker};
+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 crate::config::{BaseClientConfig, Config};
+use crate::error::IpPacketRouterError;
+
+mod build_info;
+mod init;
+mod run;
+mod sign;
+
+lazy_static::lazy_static! {
+    pub static ref PRETTY_BUILD_INFORMATION: String = bin_info!().pretty_print();
+}
+
+// Helper for passing LONG_VERSION to clap
+fn pretty_build_info_static() -> &'static str {
+    &PRETTY_BUILD_INFORMATION
+}
+
+#[derive(Parser)]
+#[command(author = "Nymtech", version, about, long_version = pretty_build_info_static())]
+pub(crate) struct Cli {
+    /// Path pointing to an env file that configures the client.
+    #[arg(short, long)]
+    pub(crate) config_env_file: Option<std::path::PathBuf>,
+
+    /// Flag used for disabling the printed banner in tty.
+    #[arg(long)]
+    pub(crate) no_banner: bool,
+
+    #[command(subcommand)]
+    command: Commands,
+}
+
+#[allow(clippy::large_enum_variant)]
+#[derive(Subcommand)]
+pub(crate) enum Commands {
+    /// Initialize a network-requester. Do this first!
+    Init(init::Init),
+
+    /// Run the network requester with the provided configuration and optionally override
+    /// parameters.
+    Run(run::Run),
+
+    /// Sign to prove ownership of this network requester
+    Sign(sign::Sign),
+
+    /// Show build information of this binary
+    BuildInfo(build_info::BuildInfo),
+
+    /// Generate shell completions
+    Completions(ArgShell),
+
+    /// Generate Fig specification
+    GenerateFigSpec,
+}
+
+// Configuration that can be overridden.
+pub(crate) struct OverrideConfig {
+    nym_apis: Option<Vec<url::Url>>,
+    nyxd_urls: Option<Vec<url::Url>>,
+    enabled_credentials_mode: Option<bool>,
+}
+
+pub(crate) fn override_config(mut config: Config, args: OverrideConfig) -> Config {
+    // disable poisson rate in the BASE client if the IPR option is enabled
+    if config.ip_packet_router.disable_poisson_rate {
+        log::info!("Disabling poisson rate for ip packet router");
+        config.set_no_poisson_process();
+    }
+
+    config
+        .with_optional_base_custom_env(
+            BaseClientConfig::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,
+            args.nyxd_urls,
+            nym_network_defaults::var_names::NYXD,
+            nym_config::parse_urls,
+        )
+        .with_optional_base(
+            BaseClientConfig::with_disabled_credentials,
+            args.enabled_credentials_mode.map(|b| !b),
+        )
+}
+
+pub(crate) async fn execute(args: Cli) -> Result<(), IpPacketRouterError> {
+    let bin_name = "nym-ip-packet-router";
+
+    match args.command {
+        Commands::Init(m) => init::execute(m).await?,
+        Commands::Run(m) => run::execute(&m).await?,
+        Commands::Sign(m) => sign::execute(&m).await?,
+        Commands::BuildInfo(m) => build_info::execute(m),
+        Commands::Completions(s) => s.generate(&mut Cli::command(), bin_name),
+        Commands::GenerateFigSpec => fig_generate(&mut Cli::command(), bin_name),
+    }
+    Ok(())
+}
+
+// Unused until we need to start implementing config upgrades
+#[allow(unused)]
+fn persist_gateway_details(
+    config: &Config,
+    details: GatewayEndpointConfig,
+) -> Result<(), IpPacketRouterError> {
+    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| {
+        IpPacketRouterError::ClientCoreError(ClientCoreError::KeyStoreError {
+            source: Box::new(source),
+        })
+    })?;
+    let persisted_details = PersistedGatewayDetails::new(details.into(), Some(&shared_keys))?;
+    details_store
+        .store_to_disk(&persisted_details)
+        .map_err(|source| {
+            IpPacketRouterError::ClientCoreError(ClientCoreError::GatewayDetailsStoreError {
+                source: Box::new(source),
+            })
+        })
+}
+
+fn try_upgrade_config(_id: &str) -> Result<(), IpPacketRouterError> {
+    trace!("Attempting to upgrade config");
+    Ok(())
+}
+
+fn try_load_current_config(id: &str) -> Result<Config, IpPacketRouterError> {
+    // try to load the config as is
+    if let Ok(cfg) = Config::read_from_default_path(id) {
+        return if !cfg.validate() {
+            Err(IpPacketRouterError::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(IpPacketRouterError::FailedToLoadConfig(id.to_string()));
+        }
+    };
+
+    if !config.validate() {
+        return Err(IpPacketRouterError::ConfigValidationFailure);
+    }
+
+    Ok(config)
+}
+
+// this only checks compatibility between config the binary. It does not take into consideration
+// 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;
+    if binary_version == config_version {
+        true
+    } else {
+        log::warn!(
+            "The native-client binary has different version than what is specified \
+            in config file! {binary_version} and {config_version}",
+        );
+        if version_checker::is_minor_version_compatible(binary_version, config_version) {
+            log::info!(
+                "but they are still semver compatible. \
+                However, consider running the `upgrade` command"
+            );
+            true
+        } else {
+            log::error!(
+                "and they are semver incompatible! - \
+                please run the `upgrade` command before attempting `run` again"
+            );
+            false
+        }
+    }
+}
diff --git a/service-providers/ip-packet-router/src/cli/run.rs b/service-providers/ip-packet-router/src/cli/run.rs
new file mode 100644
index 0000000000..cbfb3f8453
--- /dev/null
+++ b/service-providers/ip-packet-router/src/cli/run.rs
@@ -0,0 +1,44 @@
+use crate::cli::{try_load_current_config, version_check};
+use crate::{
+    cli::{override_config, OverrideConfig},
+    error::IpPacketRouterError,
+};
+use clap::Args;
+use log::error;
+use nym_client_core::cli_helpers::client_run::CommonClientRunArgs;
+
+#[allow(clippy::struct_excessive_bools)]
+#[derive(Args, Clone)]
+pub(crate) struct Run {
+    #[command(flatten)]
+    common_args: CommonClientRunArgs,
+}
+
+impl From<Run> for OverrideConfig {
+    fn from(run_config: Run) -> Self {
+        OverrideConfig {
+            nym_apis: None,
+            nyxd_urls: run_config.common_args.nyxd_urls,
+            enabled_credentials_mode: run_config.common_args.enabled_credentials_mode,
+        }
+    }
+}
+
+pub(crate) async fn execute(args: &Run) -> Result<(), IpPacketRouterError> {
+    let mut config = try_load_current_config(&args.common_args.id)?;
+    config = override_config(config, OverrideConfig::from(args.clone()));
+    log::debug!("Using config: {:#?}", config);
+
+    if !version_check(&config) {
+        error!("failed the local version check");
+        return Err(IpPacketRouterError::FailedLocalVersionCheck);
+    }
+
+    log::info!("Starting ip packet router service provider");
+    let mut server = crate::ip_packet_router::IpPacketRouter::new(config);
+    if let Some(custom_mixnet) = &args.common_args.custom_mixnet {
+        server = server.with_stored_topology(custom_mixnet)?
+    }
+
+    server.run_service_provider().await
+}
diff --git a/service-providers/ip-packet-router/src/cli/sign.rs b/service-providers/ip-packet-router/src/cli/sign.rs
new file mode 100644
index 0000000000..c282483de3
--- /dev/null
+++ b/service-providers/ip-packet-router/src/cli/sign.rs
@@ -0,0 +1,76 @@
+use crate::cli::{try_load_current_config, version_check};
+use crate::error::IpPacketRouterError;
+use clap::Args;
+use nym_bin_common::output_format::OutputFormat;
+use nym_client_core::client::key_manager::persistence::OnDiskKeys;
+use nym_client_core::error::ClientCoreError;
+use nym_crypto::asymmetric::identity;
+use nym_types::helpers::ConsoleSigningOutput;
+
+#[derive(Args, Clone)]
+pub(crate) struct Sign {
+    /// The id of the mixnode you want to sign with
+    #[arg(long)]
+    id: String,
+
+    /// Signs a transaction-specific payload, that is going to be sent to the smart contract, with your identity key
+    #[arg(long)]
+    contract_msg: String,
+
+    #[arg(short, long, default_value_t = OutputFormat::default())]
+    output: OutputFormat,
+}
+
+fn print_signed_contract_msg(
+    private_key: &identity::PrivateKey,
+    raw_msg: &str,
+    output: OutputFormat,
+) {
+    let trimmed = raw_msg.trim();
+    eprintln!(">>> attempting to sign {trimmed}");
+
+    let Ok(decoded) = bs58::decode(trimmed).into_vec() else {
+        println!("it seems you have incorrectly copied the message to sign. Make sure you didn't accidentally skip any characters");
+        return;
+    };
+
+    eprintln!(">>> decoding the message...");
+
+    // we don't really care about what particular information is embedded inside of it,
+    // we just want to know if user correctly copied the string, i.e. whether it's a valid bs58 encoded json
+    if serde_json::from_slice::<serde_json::Value>(&decoded).is_err() {
+        println!("it seems you have incorrectly copied the message to sign. Make sure you didn't accidentally skip any characters");
+        return;
+    };
+
+    // if this is a valid json, it MUST be a valid string
+    let decoded_string = String::from_utf8(decoded.clone()).unwrap();
+    let signature = private_key.sign(&decoded).to_base58_string();
+
+    let sign_output = ConsoleSigningOutput::new(decoded_string, signature);
+    println!("{}", output.format(&sign_output));
+}
+
+pub(crate) async fn execute(args: &Sign) -> Result<(), IpPacketRouterError> {
+    let config = try_load_current_config(&args.id)?;
+
+    if !version_check(&config) {
+        log::error!("Failed the local version check");
+        return Err(IpPacketRouterError::FailedLocalVersionCheck);
+    }
+
+    let key_store = OnDiskKeys::new(config.storage_paths.common_paths.keys);
+    let identity_keypair = key_store.load_identity_keypair().map_err(|source| {
+        IpPacketRouterError::ClientCoreError(ClientCoreError::KeyStoreError {
+            source: Box::new(source),
+        })
+    })?;
+
+    print_signed_contract_msg(
+        identity_keypair.private_key(),
+        &args.contract_msg,
+        args.output,
+    );
+
+    Ok(())
+}
diff --git a/service-providers/ip-packet-router/src/config/mod.rs b/service-providers/ip-packet-router/src/config/mod.rs
index d8c9aac583..1ea0ee755b 100644
--- a/service-providers/ip-packet-router/src/config/mod.rs
+++ b/service-providers/ip-packet-router/src/config/mod.rs
@@ -1,9 +1,12 @@
 pub use nym_client_core::config::Config as BaseClientConfig;
 
 use nym_bin_common::logging::LoggingSettings;
+use nym_client_core::{
+    cli_helpers::client_init::ClientConfig, config::disk_persistence::CommonClientPaths,
+};
 use nym_config::{
     defaults::mainnet, must_get_home, save_formatted_config_to_file,
-    serde_helpers::de_maybe_stringified, NymConfigTemplate, DEFAULT_CONFIG_DIR,
+    serde_helpers::de_maybe_stringified, NymConfigTemplate, OptionalSet, DEFAULT_CONFIG_DIR,
     DEFAULT_CONFIG_FILENAME, DEFAULT_DATA_DIR, NYM_DIR,
 };
 use nym_service_providers_common::DEFAULT_SERVICE_PROVIDERS_DIR;
@@ -11,6 +14,7 @@ use serde::{Deserialize, Serialize};
 use std::{
     io,
     path::{Path, PathBuf},
+    str::FromStr,
 };
 use url::Url;
 
@@ -71,6 +75,24 @@ impl NymConfigTemplate for Config {
     }
 }
 
+impl ClientConfig for Config {
+    fn common_paths(&self) -> &CommonClientPaths {
+        &self.storage_paths.common_paths
+    }
+
+    fn core_config(&self) -> &BaseClientConfig {
+        &self.base
+    }
+
+    fn default_store_location(&self) -> PathBuf {
+        self.default_location()
+    }
+
+    fn save_to<P: AsRef<Path>>(&self, path: P) -> io::Result<()> {
+        save_formatted_config_to_file(self, path)
+    }
+}
+
 impl Config {
     pub fn new<S: AsRef<str>>(id: S) -> Self {
         Config {
@@ -81,6 +103,7 @@ impl Config {
         }
     }
 
+    #[allow(unused)]
     pub fn with_data_directory<P: AsRef<Path>>(mut self, data_directory: P) -> Self {
         self.storage_paths = IpPacketRouterPaths::new_base(data_directory);
         self
@@ -98,6 +121,7 @@ impl Config {
         default_config_filepath(&self.base.client.id)
     }
 
+    #[allow(unused)]
     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)
@@ -112,6 +136,52 @@ impl Config {
     pub fn set_no_poisson_process(&mut self) {
         self.base.set_no_poisson_process()
     }
+
+    // poor man's 'builder' method
+    #[allow(unused)]
+    pub fn with_base<F, T>(mut self, f: F, val: T) -> Self
+    where
+        F: Fn(BaseClientConfig, T) -> BaseClientConfig,
+    {
+        self.base = f(self.base, val);
+        self
+    }
+
+    // helper methods to use `OptionalSet` trait. Those are defined due to very... ehm. 'specific' structure of this config
+    // (plz, lets refactor it)
+    pub fn with_optional_base<F, T>(mut self, f: F, val: Option<T>) -> Self
+    where
+        F: Fn(BaseClientConfig, T) -> BaseClientConfig,
+    {
+        self.base = self.base.with_optional(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: std::fmt::Debug,
+    {
+        self.base = self.base.with_optional_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.base = self.base.with_optional_custom_env(f, val, env_var, parser);
+        self
+    }
 }
 
 #[derive(Debug, Clone, Deserialize, PartialEq, Serialize)]
diff --git a/service-providers/ip-packet-router/src/connected_client_handler.rs b/service-providers/ip-packet-router/src/connected_client_handler.rs
new file mode 100644
index 0000000000..ba82ae0fa3
--- /dev/null
+++ b/service-providers/ip-packet-router/src/connected_client_handler.rs
@@ -0,0 +1,132 @@
+// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: GPL-3.0-only
+
+use bytes::Bytes;
+use nym_ip_packet_requests::{codec::MultiIpPacketCodec, response::IpPacketResponse};
+use nym_sdk::mixnet::{MixnetMessageSender, Recipient};
+
+use crate::{
+    constants::CLIENT_HANDLER_ACTIVITY_TIMEOUT,
+    error::{IpPacketRouterError, Result},
+    util::create_message::create_input_message,
+};
+
+// Data flow
+// Out: mixnet_listener -> decode -> handle_packet -> write_to_tun
+// In: tun_listener -> [connected_client_handler -> encode] -> mixnet_sender
+
+// This handler is spawned as a task, and it listens to IP packets passed from the tun_listener,
+// encodes it, and then sends to mixnet.
+pub(crate) struct ConnectedClientHandler {
+    nym_address: Recipient,
+    mix_hops: Option<u8>,
+    forward_from_tun_rx: tokio::sync::mpsc::UnboundedReceiver<Vec<u8>>,
+    mixnet_client_sender: nym_sdk::mixnet::MixnetClientSender,
+    close_rx: tokio::sync::oneshot::Receiver<()>,
+    activity_timeout: tokio::time::Interval,
+    encoder: MultiIpPacketCodec,
+}
+
+impl ConnectedClientHandler {
+    pub(crate) fn start(
+        reply_to: Recipient,
+        reply_to_hops: Option<u8>,
+        buffer_timeout: std::time::Duration,
+        mixnet_client_sender: nym_sdk::mixnet::MixnetClientSender,
+    ) -> (
+        tokio::sync::mpsc::UnboundedSender<Vec<u8>>,
+        tokio::sync::oneshot::Sender<()>,
+        tokio::task::JoinHandle<()>,
+    ) {
+        let (close_tx, close_rx) = tokio::sync::oneshot::channel();
+        let (forward_from_tun_tx, forward_from_tun_rx) = tokio::sync::mpsc::unbounded_channel();
+
+        // Reset so that we don't get the first tick immediately
+        let mut activity_timeout = tokio::time::interval(CLIENT_HANDLER_ACTIVITY_TIMEOUT);
+        activity_timeout.reset();
+
+        let encoder = MultiIpPacketCodec::new(buffer_timeout);
+
+        let connected_client_handler = ConnectedClientHandler {
+            nym_address: reply_to,
+            mix_hops: reply_to_hops,
+            forward_from_tun_rx,
+            mixnet_client_sender,
+            close_rx,
+            activity_timeout,
+            encoder,
+        };
+
+        let handle = tokio::spawn(async move {
+            if let Err(err) = connected_client_handler.run().await {
+                log::error!("connected client handler has failed: {err}")
+            }
+        });
+
+        (forward_from_tun_tx, close_tx, handle)
+    }
+
+    async fn send_packets_to_mixnet(&mut self, packets: Bytes) -> Result<()> {
+        let response_packet = IpPacketResponse::new_ip_packet(packets)
+            .to_bytes()
+            .map_err(|err| IpPacketRouterError::FailedToSerializeResponsePacket { source: err })?;
+        let input_message = create_input_message(self.nym_address, response_packet, self.mix_hops);
+
+        self.mixnet_client_sender
+            .send(input_message)
+            .await
+            .map_err(|err| IpPacketRouterError::FailedToSendPacketToMixnet { source: err })
+    }
+
+    async fn handle_buffer_timeout(&mut self, packets: Bytes) -> Result<()> {
+        if !packets.is_empty() {
+            self.send_packets_to_mixnet(packets).await
+        } else {
+            Ok(())
+        }
+    }
+
+    async fn handle_packet(&mut self, packet: Vec<u8>) -> Result<()> {
+        self.activity_timeout.reset();
+
+        if let Some(bundled_packets) = self.encoder.append_packet(packet.into()) {
+            self.send_packets_to_mixnet(bundled_packets).await
+        } else {
+            Ok(())
+        }
+    }
+
+    async fn run(mut self) -> Result<()> {
+        loop {
+            tokio::select! {
+                _ = &mut self.close_rx => {
+                    log::info!("client handler stopping: received close: {}", self.nym_address);
+                    break;
+                },
+                _ = self.activity_timeout.tick() => {
+                    log::info!("client handler stopping: activity timeout: {}", self.nym_address);
+                    break;
+                },
+                Some(packets) = self.encoder.buffer_timeout() => {
+                    if let Err(err) = self.handle_buffer_timeout(packets).await {
+                        log::error!("client handler: failed to handle buffer timeout: {err}");
+                    }
+                },
+                packet = self.forward_from_tun_rx.recv() => match packet {
+                    Some(packet) => {
+                        if let Err(err) = self.handle_packet(packet).await {
+                            log::error!("client handler: failed to handle packet: {err}");
+                        }
+                    },
+                    None => {
+                        log::info!("client handler stopping: tun channel closed");
+                        break;
+                    }
+                },
+            }
+        }
+
+        log::debug!("ConnectedClientHandler: exiting");
+        Ok(())
+    }
+}
diff --git a/service-providers/ip-packet-router/src/constants.rs b/service-providers/ip-packet-router/src/constants.rs
index 8fc028a88d..04e3bd1a6b 100644
--- a/service-providers/ip-packet-router/src/constants.rs
+++ b/service-providers/ip-packet-router/src/constants.rs
@@ -5,5 +5,12 @@ pub const TUN_BASE_NAME: &str = "nymtun";
 pub const TUN_DEVICE_ADDRESS: &str = "10.0.0.1";
 pub const TUN_DEVICE_NETMASK: &str = "255.255.255.0";
 
+// We routinely check if any clients needs to be disconnected at this interval
 pub(crate) const DISCONNECT_TIMER_INTERVAL: Duration = Duration::from_secs(10);
-pub(crate) const CLIENT_INACTIVITY_TIMEOUT: Duration = Duration::from_secs(5 * 60);
+
+// We consider a client inactive if it hasn't sent any mixnet packets in this duration
+pub(crate) const CLIENT_MIXNET_INACTIVITY_TIMEOUT: Duration = Duration::from_secs(5 * 60);
+
+// We consider a client handler inactive if it hasn't received any packets from the tun device in
+// this duration
+pub(crate) const CLIENT_HANDLER_ACTIVITY_TIMEOUT: Duration = Duration::from_secs(10 * 60);
diff --git a/service-providers/ip-packet-router/src/error.rs b/service-providers/ip-packet-router/src/error.rs
index 77b2797c8e..d4e0940b48 100644
--- a/service-providers/ip-packet-router/src/error.rs
+++ b/service-providers/ip-packet-router/src/error.rs
@@ -1,4 +1,4 @@
-use std::net::{IpAddr, SocketAddr};
+use std::net::SocketAddr;
 
 pub use nym_client_core::error::ClientCoreError;
 use nym_exit_policy::PolicyError;
@@ -57,15 +57,6 @@ pub enum IpPacketRouterError {
     #[error("the provided socket address, '{addr}' is not covered by the exit policy!")]
     AddressNotCoveredByExitPolicy { addr: SocketAddr },
 
-    #[error("the provided ip address, '{ip}' is not covered by the exit policy!")]
-    IpNotCoveredByExitPolicy { ip: IpAddr },
-
-    #[error("failed filter check: '{addr}'")]
-    AddressFailedFilterCheck { addr: SocketAddr },
-
-    #[error("failed filter check: '{ip}'")]
-    IpFailedFilterCheck { ip: IpAddr },
-
     #[error("failed to apply the exit policy: {source}")]
     ExitPolicyFailure {
         #[from]
diff --git a/service-providers/ip-packet-router/src/ip_packet_router.rs b/service-providers/ip-packet-router/src/ip_packet_router.rs
index bcc0bf0601..c6cd08e59d 100644
--- a/service-providers/ip-packet-router/src/ip_packet_router.rs
+++ b/service-providers/ip-packet-router/src/ip_packet_router.rs
@@ -12,9 +12,9 @@ use nym_sdk::mixnet::Recipient;
 use nym_task::{TaskClient, TaskHandle};
 
 use crate::{
+    config::Config,
     error::IpPacketRouterError,
     request_filter::{self, RequestFilter},
-    Config,
 };
 
 pub struct OnStartData {
@@ -56,12 +56,14 @@ impl IpPacketRouter {
     }
 
     #[must_use]
+    #[allow(unused)]
     pub fn with_shutdown(mut self, shutdown: TaskClient) -> Self {
         self.shutdown = Some(shutdown);
         self
     }
 
     #[must_use]
+    #[allow(unused)]
     pub fn with_custom_gateway_transceiver(
         mut self,
         gateway_transceiver: Box<dyn GatewayTransceiver + Send + Sync>,
@@ -71,18 +73,21 @@ impl IpPacketRouter {
     }
 
     #[must_use]
+    #[allow(unused)]
     pub fn with_wait_for_gateway(mut self, wait_for_gateway: bool) -> Self {
         self.wait_for_gateway = wait_for_gateway;
         self
     }
 
     #[must_use]
+    #[allow(unused)]
     pub fn with_on_start(mut self, on_start: oneshot::Sender<OnStartData>) -> Self {
         self.on_start = Some(on_start);
         self
     }
 
     #[must_use]
+    #[allow(unused)]
     pub fn with_custom_topology_provider(
         mut self,
         topology_provider: Box<dyn TopologyProvider + Send + Sync>,
@@ -137,11 +142,9 @@ impl IpPacketRouter {
         // Channel used by the IpPacketRouter to signal connected and disconnected clients to the
         // TunListener
         let (connected_clients, connected_clients_rx) = mixnet_listener::ConnectedClients::new();
-        // let (connected_client_tx, connected_client_rx) = tokio::sync::mpsc::unbounded_channel();
 
         let tun_listener = tun_listener::TunListener {
             tun_reader,
-            mixnet_client_sender: mixnet_client.split_sender(),
             task_client: task_handle.get_handle(),
             connected_clients: connected_clients_rx,
         };
@@ -157,7 +160,6 @@ impl IpPacketRouter {
             mixnet_client,
             task_handle,
             connected_clients,
-            // connected_client_tx,
         };
 
         log::info!("The address of this client is: {self_address}");
diff --git a/service-providers/ip-packet-router/src/lib.rs b/service-providers/ip-packet-router/src/lib.rs
index d3dab9bde1..3d464b05c3 100644
--- a/service-providers/ip-packet-router/src/lib.rs
+++ b/service-providers/ip-packet-router/src/lib.rs
@@ -5,11 +5,12 @@ pub use crate::config::Config;
 pub use ip_packet_router::{IpPacketRouter, OnStartData};
 
 pub mod config;
+mod connected_client_handler;
 mod constants;
 pub mod error;
 mod ip_packet_router;
 mod mixnet_client;
 mod mixnet_listener;
-mod request_filter;
+pub mod request_filter;
 mod tun_listener;
 mod util;
diff --git a/service-providers/ip-packet-router/src/main.rs b/service-providers/ip-packet-router/src/main.rs
new file mode 100644
index 0000000000..143833aecb
--- /dev/null
+++ b/service-providers/ip-packet-router/src/main.rs
@@ -0,0 +1,43 @@
+#[cfg(target_os = "linux")]
+mod cli;
+#[cfg(target_os = "linux")]
+mod config;
+#[cfg(target_os = "linux")]
+mod connected_client_handler;
+#[cfg(target_os = "linux")]
+mod constants;
+#[cfg(target_os = "linux")]
+mod error;
+#[cfg(target_os = "linux")]
+mod ip_packet_router;
+#[cfg(target_os = "linux")]
+mod mixnet_client;
+#[cfg(target_os = "linux")]
+mod mixnet_listener;
+#[cfg(target_os = "linux")]
+mod request_filter;
+#[cfg(target_os = "linux")]
+mod tun_listener;
+#[cfg(target_os = "linux")]
+mod util;
+
+#[cfg(target_os = "linux")]
+#[tokio::main]
+async fn main() -> Result<(), error::IpPacketRouterError> {
+    use clap::Parser;
+
+    let args = cli::Cli::parse();
+    nym_bin_common::logging::setup_logging();
+    nym_network_defaults::setup_env(args.config_env_file.as_ref());
+
+    if !args.no_banner {
+        nym_bin_common::logging::maybe_print_banner(clap::crate_name!(), clap::crate_version!());
+    }
+
+    cli::execute(args).await
+}
+
+#[cfg(not(target_os = "linux"))]
+fn main() {
+    println!("This binary is currently only supported on linux");
+}
diff --git a/service-providers/ip-packet-router/src/mixnet_listener.rs b/service-providers/ip-packet-router/src/mixnet_listener.rs
index 7eef17cec2..1f14c18218 100644
--- a/service-providers/ip-packet-router/src/mixnet_listener.rs
+++ b/service-providers/ip-packet-router/src/mixnet_listener.rs
@@ -3,92 +3,55 @@ use std::{
     net::{IpAddr, SocketAddr},
 };
 
+use bytes::{Bytes, BytesMut};
 use futures::StreamExt;
 use nym_ip_packet_requests::{
-    DynamicConnectFailureReason, IpPacketRequest, IpPacketRequestData, IpPacketResponse,
-    StaticConnectFailureReason,
+    codec::MultiIpPacketCodec,
+    request::{IpPacketRequest, IpPacketRequestData},
+    response::{
+        DynamicConnectFailureReason, ErrorResponseReply, IpPacketResponse,
+        StaticConnectFailureReason,
+    },
 };
 use nym_sdk::mixnet::{MixnetMessageSender, Recipient};
 use nym_sphinx::receiver::ReconstructedMessage;
 use nym_task::TaskHandle;
+use tap::TapFallible;
 #[cfg(target_os = "linux")]
 use tokio::io::AsyncWriteExt;
+use tokio_util::codec::Decoder;
 
 use crate::{
-    constants::{CLIENT_INACTIVITY_TIMEOUT, DISCONNECT_TIMER_INTERVAL},
+    config::Config,
+    connected_client_handler,
+    constants::{CLIENT_MIXNET_INACTIVITY_TIMEOUT, DISCONNECT_TIMER_INTERVAL},
     error::{IpPacketRouterError, Result},
     request_filter::{self},
+    tun_listener,
     util::generate_new_ip,
     util::{
         create_message::create_input_message,
         parse_ip::{parse_packet, ParsedPacket},
     },
-    Config,
 };
 
-#[cfg(target_os = "linux")]
-pub(crate) struct MixnetListener {
-    pub(crate) _config: Config,
-    pub(crate) request_filter: request_filter::RequestFilter,
-    pub(crate) tun_writer: tokio::io::WriteHalf<tokio_tun::Tun>,
-    pub(crate) mixnet_client: nym_sdk::mixnet::MixnetClient,
-    pub(crate) task_handle: TaskHandle,
-    pub(crate) connected_clients: ConnectedClients,
-}
-
 pub(crate) struct ConnectedClients {
+    // The set of connected clients
     clients: HashMap<IpAddr, ConnectedClient>,
-    connected_client_tx: tokio::sync::mpsc::UnboundedSender<ConnectedClientEvent>,
-}
 
-pub(crate) struct ConnectedClientsListener {
-    clients: HashMap<IpAddr, ConnectedClient>,
-    pub(crate) connected_client_rx: tokio::sync::mpsc::UnboundedReceiver<ConnectedClientEvent>,
-}
-
-impl ConnectedClientsListener {
-    pub(crate) fn get(&self, ip: &IpAddr) -> Option<&ConnectedClient> {
-        self.clients.get(ip)
-    }
-
-    pub(crate) fn update(&mut self, event: ConnectedClientEvent) {
-        match event {
-            ConnectedClientEvent::Connect(connected_event) => {
-                let ConnectEvent {
-                    ip,
-                    nym_address,
-                    mix_hops,
-                } = *connected_event;
-                log::trace!("Connect client: {ip}");
-                self.clients.insert(
-                    ip,
-                    ConnectedClient {
-                        nym_address,
-                        mix_hops,
-                        last_activity: std::time::Instant::now(),
-                    },
-                );
-            }
-            ConnectedClientEvent::Disconnect(DisconnectEvent(ip)) => {
-                log::trace!("Disconnect client: {ip}");
-                self.clients.remove(&ip);
-            }
-        }
-    }
+    // Notify the tun listener when a new client connects or disconnects
+    tun_listener_connected_client_tx: tokio::sync::mpsc::UnboundedSender<ConnectedClientEvent>,
 }
 
 impl ConnectedClients {
-    pub(crate) fn new() -> (Self, ConnectedClientsListener) {
+    pub(crate) fn new() -> (Self, tun_listener::ConnectedClientsListener) {
         let (connected_client_tx, connected_client_rx) = tokio::sync::mpsc::unbounded_channel();
         (
             Self {
                 clients: Default::default(),
-                connected_client_tx,
-            },
-            ConnectedClientsListener {
-                clients: Default::default(),
-                connected_client_rx,
+                tun_listener_connected_client_tx: connected_client_tx,
             },
+            tun_listener::ConnectedClientsListener::new(connected_client_rx),
         )
     }
 
@@ -96,13 +59,17 @@ impl ConnectedClients {
         self.clients.contains_key(ip)
     }
 
+    fn get_client_from_ip_mut(&mut self, ip: &IpAddr) -> Option<&mut ConnectedClient> {
+        self.clients.get_mut(ip)
+    }
+
     fn is_nym_address_connected(&self, nym_address: &Recipient) -> bool {
         self.clients
             .values()
             .any(|client| client.nym_address == *nym_address)
     }
 
-    fn get_ip(&self, nym_address: &Recipient) -> Option<IpAddr> {
+    fn lookup_ip_from_nym_address(&self, nym_address: &Recipient) -> Option<IpAddr> {
         self.clients.iter().find_map(|(ip, client)| {
             if client.nym_address == *nym_address {
                 Some(*ip)
@@ -112,28 +79,44 @@ impl ConnectedClients {
         })
     }
 
-    fn get_client_by_nym_address(&self, nym_address: &Recipient) -> Option<&ConnectedClient> {
+    fn lookup_client_from_nym_address(&self, nym_address: &Recipient) -> Option<&ConnectedClient> {
         self.clients
             .values()
             .find(|client| client.nym_address == *nym_address)
     }
 
-    fn connect(&mut self, ip: IpAddr, nym_address: Recipient, mix_hops: Option<u8>) {
+    fn connect(
+        &mut self,
+        ip: IpAddr,
+        nym_address: Recipient,
+        mix_hops: Option<u8>,
+        forward_from_tun_tx: tokio::sync::mpsc::UnboundedSender<Vec<u8>>,
+        close_tx: tokio::sync::oneshot::Sender<()>,
+        handle: tokio::task::JoinHandle<()>,
+    ) {
+        // The map of connected clients that the mixnet listener keeps track of. It monitors
+        // activity and disconnects clients that have been inactive for too long.
         self.clients.insert(
             ip,
             ConnectedClient {
                 nym_address,
                 mix_hops,
                 last_activity: std::time::Instant::now(),
+                close_tx: Some(close_tx),
+                handle,
             },
         );
-        self.connected_client_tx
+        // Send the connected client info to the tun listener, which will use it to forward packets
+        // to the connected client handler.
+        self.tun_listener_connected_client_tx
             .send(ConnectedClientEvent::Connect(Box::new(ConnectEvent {
                 ip,
-                nym_address,
-                mix_hops,
+                forward_from_tun_tx,
             })))
-            .unwrap();
+            .tap_err(|err| {
+                log::error!("Failed to send connected client event: {err}");
+            })
+            .ok();
     }
 
     fn update_activity(&mut self, ip: &IpAddr) -> Result<()> {
@@ -145,25 +128,57 @@ impl ConnectedClients {
         }
     }
 
-    fn disconnect_inactive_clients(&mut self) {
-        let now = std::time::Instant::now();
-        let inactive_clients: Vec<IpAddr> = self
-            .clients
-            .iter()
+    // Identify connected client handlers that have stopped without being told to stop
+    fn get_finished_client_handlers(&mut self) -> Vec<(IpAddr, Recipient)> {
+        self.clients
+            .iter_mut()
             .filter_map(|(ip, client)| {
-                if now.duration_since(client.last_activity) > CLIENT_INACTIVITY_TIMEOUT {
-                    Some(*ip)
+                if client.handle.is_finished() {
+                    Some((*ip, client.nym_address))
                 } else {
                     None
                 }
             })
-            .collect();
-        for ip in inactive_clients {
+            .collect()
+    }
+
+    fn get_inactive_clients(&mut self) -> Vec<(IpAddr, Recipient)> {
+        let now = std::time::Instant::now();
+        self.clients
+            .iter()
+            .filter_map(|(ip, client)| {
+                if now.duration_since(client.last_activity) > CLIENT_MIXNET_INACTIVITY_TIMEOUT {
+                    Some((*ip, client.nym_address))
+                } else {
+                    None
+                }
+            })
+            .collect()
+    }
+
+    fn disconnect_stopped_client_handlers(&mut self, stopped_clients: Vec<(IpAddr, Recipient)>) {
+        for (ip, _) in &stopped_clients {
+            log::info!("Disconnect stopped client: {ip}");
+            self.clients.remove(ip);
+            self.tun_listener_connected_client_tx
+                .send(ConnectedClientEvent::Disconnect(DisconnectEvent(*ip)))
+                .tap_err(|err| {
+                    log::error!("Failed to send disconnect event: {err}");
+                })
+                .ok();
+        }
+    }
+
+    fn disconnect_inactive_clients(&mut self, inactive_clients: Vec<(IpAddr, Recipient)>) {
+        for (ip, _) in &inactive_clients {
             log::info!("Disconnect inactive client: {ip}");
-            self.clients.remove(&ip);
-            self.connected_client_tx
-                .send(ConnectedClientEvent::Disconnect(DisconnectEvent(ip)))
-                .unwrap();
+            self.clients.remove(ip);
+            self.tun_listener_connected_client_tx
+                .send(ConnectedClientEvent::Disconnect(DisconnectEvent(*ip)))
+                .tap_err(|err| {
+                    log::error!("Failed to send disconnect event: {err}");
+                })
+                .ok();
         }
     }
 
@@ -173,17 +188,71 @@ impl ConnectedClients {
 }
 
 pub(crate) struct ConnectedClient {
+    // The nym address of the connected client that we are communicating with on the other side of
+    // the mixnet
     pub(crate) nym_address: Recipient,
+
+    // Number of mix node hops that the client has requested to use
     pub(crate) mix_hops: Option<u8>,
+
+    // Keep track of last activity so we can disconnect inactive clients
     pub(crate) last_activity: std::time::Instant,
+
+    // Send to connected clients listener to stop. This is option only because we need to take
+    // ownership of it when the client is dropped.
+    pub(crate) close_tx: Option<tokio::sync::oneshot::Sender<()>>,
+
+    // Handle for the connected client handler
+    pub(crate) handle: tokio::task::JoinHandle<()>,
+}
+
+impl ConnectedClient {
+    fn update_activity(&mut self) {
+        self.last_activity = std::time::Instant::now();
+    }
+}
+
+impl Drop for ConnectedClient {
+    fn drop(&mut self) {
+        log::debug!("signal to close client: {}", self.nym_address);
+        if let Some(close_tx) = self.close_tx.take() {
+            close_tx.send(()).ok();
+        }
+    }
+}
+
+type PacketHandleResult = Result<Option<IpPacketResponse>>;
+
+#[cfg(target_os = "linux")]
+pub(crate) struct MixnetListener {
+    // The configuration for the mixnet listener
+    pub(crate) _config: Config,
+
+    // The request filter that we use to check if a packet should be forwarded
+    pub(crate) request_filter: request_filter::RequestFilter,
+
+    // The TUN device that we use to send and receive packets from the internet
+    pub(crate) tun_writer: tokio::io::WriteHalf<tokio_tun::Tun>,
+
+    // The mixnet client that we use to send and receive packets from the mixnet
+    pub(crate) mixnet_client: nym_sdk::mixnet::MixnetClient,
+
+    // The task handle for the main loop
+    pub(crate) task_handle: TaskHandle,
+
+    // The map of connected clients that the mixnet listener keeps track of. It monitors
+    // activity and disconnects clients that have been inactive for too long.
+    pub(crate) connected_clients: ConnectedClients,
 }
 
 #[cfg(target_os = "linux")]
 impl MixnetListener {
+    // Receving a static connect request from a client with an IP provided that we assign to them,
+    // if it's available. If it's not available, we send a failure response.
     async fn on_static_connect_request(
         &mut self,
-        connect_request: nym_ip_packet_requests::StaticConnectRequest,
-    ) -> Result<Option<IpPacketResponse>> {
+        connect_request: nym_ip_packet_requests::request::StaticConnectRequest,
+    ) -> PacketHandleResult {
         log::info!(
             "Received static connect request from {sender_address}",
             sender_address = connect_request.reply_to
@@ -193,6 +262,8 @@ impl MixnetListener {
         let requested_ip = connect_request.ip;
         let reply_to = connect_request.reply_to;
         let reply_to_hops = connect_request.reply_to_hops;
+        // TODO: add to connect request
+        let buffer_timeout = nym_ip_packet_requests::codec::BUFFER_TIMEOUT;
         // TODO: ignoring reply_to_avg_mix_delays for now
 
         // Check that the IP is available in the set of connected clients
@@ -217,8 +288,25 @@ impl MixnetListener {
             }
             (false, false) => {
                 log::info!("Connecting a new client");
-                self.connected_clients
-                    .connect(requested_ip, reply_to, reply_to_hops);
+
+                // Spawn the ConnectedClientHandler for the new client
+                let (forward_from_tun_tx, close_tx, handle) =
+                    connected_client_handler::ConnectedClientHandler::start(
+                        reply_to,
+                        reply_to_hops,
+                        buffer_timeout,
+                        self.mixnet_client.split_sender(),
+                    );
+
+                // Register the new client in the set of connected clients
+                self.connected_clients.connect(
+                    requested_ip,
+                    reply_to,
+                    reply_to_hops,
+                    forward_from_tun_tx,
+                    close_tx,
+                    handle,
+                );
                 Ok(Some(IpPacketResponse::new_static_connect_success(
                     request_id, reply_to,
                 )))
@@ -244,8 +332,8 @@ impl MixnetListener {
 
     async fn on_dynamic_connect_request(
         &mut self,
-        connect_request: nym_ip_packet_requests::DynamicConnectRequest,
-    ) -> Result<Option<IpPacketResponse>> {
+        connect_request: nym_ip_packet_requests::request::DynamicConnectRequest,
+    ) -> PacketHandleResult {
         log::info!(
             "Received dynamic connect request from {sender_address}",
             sender_address = connect_request.reply_to
@@ -254,13 +342,15 @@ impl MixnetListener {
         let request_id = connect_request.request_id;
         let reply_to = connect_request.reply_to;
         let reply_to_hops = connect_request.reply_to_hops;
+        // TODO: add to connect request
+        let buffer_timeout = nym_ip_packet_requests::codec::BUFFER_TIMEOUT;
         // TODO: ignoring reply_to_avg_mix_delays for now
 
         // Check if it's the same client connecting again, then we just reuse the same IP
         // TODO: this is problematic. Until we sign connect requests this means you can spam people
         // with return traffic
 
-        if let Some(existing_ip) = self.connected_clients.get_ip(&reply_to) {
+        if let Some(existing_ip) = self.connected_clients.lookup_ip_from_nym_address(&reply_to) {
             log::info!("Found existing client for nym address");
             if self
                 .connected_clients
@@ -285,17 +375,38 @@ impl MixnetListener {
             )));
         };
 
-        self.connected_clients
-            .connect(new_ip, reply_to, reply_to_hops);
+        // Spawn the ConnectedClientHandler for the new client
+        let (forward_from_tun_tx, close_tx, handle) =
+            connected_client_handler::ConnectedClientHandler::start(
+                reply_to,
+                reply_to_hops,
+                buffer_timeout,
+                self.mixnet_client.split_sender(),
+            );
+
+        // Register the new client in the set of connected clients
+        self.connected_clients.connect(
+            new_ip,
+            reply_to,
+            reply_to_hops,
+            forward_from_tun_tx,
+            close_tx,
+            handle,
+        );
         Ok(Some(IpPacketResponse::new_dynamic_connect_success(
             request_id, reply_to, new_ip,
         )))
     }
 
-    async fn on_data_request(
-        &mut self,
-        data_request: nym_ip_packet_requests::DataRequest,
-    ) -> Result<Option<IpPacketResponse>> {
+    fn on_disconnect_request(
+        &self,
+        _disconnect_request: nym_ip_packet_requests::request::DisconnectRequest,
+    ) -> PacketHandleResult {
+        log::info!("Received disconnect request: not implemented, dropping");
+        Ok(None)
+    }
+
+    async fn handle_packet(&mut self, ip_packet: &Bytes) -> PacketHandleResult {
         log::trace!("Received data request");
 
         // We don't forward packets that we are not able to parse. BUT, there might be a good
@@ -310,39 +421,84 @@ impl MixnetListener {
             src_addr,
             dst_addr,
             dst,
-        } = parse_packet(&data_request.ip_packet)?;
+        } = parse_packet(ip_packet)?;
 
         let dst_str = dst.map_or(dst_addr.to_string(), |dst| dst.to_string());
-        log::info!("Received packet: {packet_type}: {src_addr} -> {dst_str}");
+        log::debug!("Received packet: {packet_type}: {src_addr} -> {dst_str}");
 
-        // Check if there is a connected client for this src_addr. If there is, update the last activity time
-        // for the client. If there isn't, drop the packet.
-        if self.connected_clients.update_activity(&src_addr).is_err() {
-            log::info!("Dropping packet: no connected client for {src_addr}");
-            return Ok(None);
+        if let Some(connected_client) = self.connected_clients.get_client_from_ip_mut(&src_addr) {
+            // Keep track of activity so we can disconnect inactive clients
+            connected_client.update_activity();
+
+            // For packets without a port, use 0.
+            let dst = dst.unwrap_or_else(|| SocketAddr::new(dst_addr, 0));
+
+            // Filter check
+            if self.request_filter.check_address(&dst).await {
+                // Forward the packet to the TUN device where it will be routed out to the internet
+                self.tun_writer
+                    .write_all(ip_packet)
+                    .await
+                    .map_err(|_| IpPacketRouterError::FailedToWritePacketToTun)?;
+                Ok(None)
+            } else {
+                log::info!("Denied filter check: {dst}");
+                Ok(Some(IpPacketResponse::new_data_error_response(
+                    connected_client.nym_address,
+                    ErrorResponseReply::ExitPolicyFilterCheckFailed {
+                        dst: dst.to_string(),
+                    },
+                )))
+            }
+        } else {
+            // If the client is not connected, just drop the packet silently
+            log::info!("dropping packet from mixnet: no registered client for packet with source: {src_addr}");
+            Ok(None)
         }
-
-        // Filter check
-        let dst = dst.unwrap_or_else(|| SocketAddr::new(dst_addr, 0));
-        if !self.request_filter.check_address(&dst).await {
-            log::info!("Denied filter check: {dst}");
-            // TODO: we could consider sending back a response here
-            return Err(IpPacketRouterError::AddressFailedFilterCheck { addr: dst });
-        }
-
-        // TODO: consider changing from Vec<u8> to bytes::Bytes?
-        let packet = data_request.ip_packet;
-        self.tun_writer
-            .write_all(&packet)
-            .await
-            .map_err(|_| IpPacketRouterError::FailedToWritePacketToTun)?;
-
-        Ok(None)
     }
+
+    async fn on_data_request(
+        &mut self,
+        data_request: nym_ip_packet_requests::request::DataRequest,
+    ) -> Result<Vec<PacketHandleResult>> {
+        let mut responses = Vec::new();
+        let mut decoder = MultiIpPacketCodec::new(nym_ip_packet_requests::codec::BUFFER_TIMEOUT);
+        let mut bytes = BytesMut::new();
+        bytes.extend_from_slice(&data_request.ip_packets);
+        while let Ok(Some(packet)) = decoder.decode(&mut bytes) {
+            let result = self.handle_packet(&packet).await;
+            responses.push(result);
+        }
+        Ok(responses)
+    }
+
+    fn on_version_mismatch(
+        &self,
+        version: u8,
+        reconstructed: &ReconstructedMessage,
+    ) -> PacketHandleResult {
+        // If it's possible to parse, do so and return back a response, otherwise just drop
+        let (id, recipient) = IpPacketRequest::from_reconstructed_message(reconstructed)
+            .ok()
+            .and_then(|request| {
+                request
+                    .recipient()
+                    .map(|recipient| (request.id().unwrap_or(0), *recipient))
+            })
+            .ok_or(IpPacketRouterError::InvalidPacketVersion(version))?;
+
+        Ok(Some(IpPacketResponse::new_version_mismatch(
+            id,
+            recipient,
+            version,
+            nym_ip_packet_requests::CURRENT_VERSION,
+        )))
+    }
+
     async fn on_reconstructed_message(
         &mut self,
         reconstructed: ReconstructedMessage,
-    ) -> Result<Option<IpPacketResponse>> {
+    ) -> Result<Vec<PacketHandleResult>> {
         log::debug!(
             "Received message with sender_tag: {:?}",
             reconstructed.sender_tag
@@ -353,8 +509,8 @@ impl MixnetListener {
             // The idea is that in the future we can add logic here to parse older versions to stay
             // backwards compatible.
             if *version != nym_ip_packet_requests::CURRENT_VERSION {
-                log::warn!("Received packet with invalid version");
-                return Err(IpPacketRouterError::InvalidPacketVersion(*version));
+                log::info!("Received packet with invalid version: v{version}");
+                return Ok(vec![self.on_version_mismatch(*version, &reconstructed)]);
             }
         }
 
@@ -363,20 +519,49 @@ impl MixnetListener {
 
         match request.data {
             IpPacketRequestData::StaticConnect(connect_request) => {
-                self.on_static_connect_request(connect_request).await
+                Ok(vec![self.on_static_connect_request(connect_request).await])
             }
             IpPacketRequestData::DynamicConnect(connect_request) => {
-                self.on_dynamic_connect_request(connect_request).await
+                Ok(vec![self.on_dynamic_connect_request(connect_request).await])
+            }
+            IpPacketRequestData::Disconnect(disconnect_request) => {
+                Ok(vec![self.on_disconnect_request(disconnect_request)])
             }
             IpPacketRequestData::Data(data_request) => self.on_data_request(data_request).await,
+            IpPacketRequestData::Ping(_) => {
+                log::info!("Received ping request: not implemented, dropping");
+                Ok(vec![])
+            }
+            IpPacketRequestData::Health(_) => {
+                log::info!("Received health request: not implemented, dropping");
+                Ok(vec![])
+            }
         }
     }
 
+    fn handle_disconnect_timer(&mut self) {
+        let stopped_clients = self.connected_clients.get_finished_client_handlers();
+        let inactive_clients = self.connected_clients.get_inactive_clients();
+
+        // TODO: Send disconnect responses to all disconnected clients
+        //for (ip, nym_address) in stopped_clients.iter().chain(disconnected_clients.iter()) {
+        //    let response = IpPacketResponse::new_unrequested_disconnect(...)
+        //    if let Err(err) = self.handle_response(response).await {
+        //        log::error!("Failed to send disconnect response: {err}");
+        //    }
+        //}
+
+        self.connected_clients
+            .disconnect_stopped_client_handlers(stopped_clients);
+        self.connected_clients
+            .disconnect_inactive_clients(inactive_clients);
+    }
+
     // When an incoming mixnet message triggers a response that we send back, such as during
     // connect handshake.
     async fn handle_response(&self, response: IpPacketResponse) -> Result<()> {
         let Some(recipient) = response.recipient() else {
-            log::error!("no recipient in response packet, this should NOT happen!");
+            log::error!("No recipient in response packet, this should NOT happen!");
             return Err(IpPacketRouterError::NoRecipientInResponse);
         };
 
@@ -388,7 +573,7 @@ impl MixnetListener {
         // We could avoid this lookup if we check this when we create the response.
         let mix_hops = self
             .connected_clients
-            .get_client_by_nym_address(recipient)
+            .lookup_client_from_nym_address(recipient)
             .and_then(|c| c.mix_hops);
 
         let input_message = create_input_message(*recipient, response_packet, mix_hops);
@@ -398,6 +583,26 @@ impl MixnetListener {
             .map_err(|err| IpPacketRouterError::FailedToSendPacketToMixnet { source: err })
     }
 
+    // A single incoming request can trigger multiple responses, such as when data requests contain
+    // multiple IP packets.
+    async fn handle_responses(&self, responses: Vec<PacketHandleResult>) {
+        for response in responses {
+            match response {
+                Ok(Some(response)) => {
+                    if let Err(err) = self.handle_response(response).await {
+                        log::error!("Mixnet listener failed to handle response: {err}");
+                    }
+                }
+                Ok(None) => {
+                    continue;
+                }
+                Err(err) => {
+                    log::error!("Error handling mixnet message: {err}");
+                }
+            }
+        }
+    }
+
     pub(crate) async fn run(mut self) -> Result<()> {
         let mut task_client = self.task_handle.fork("main_loop");
         let mut disconnect_timer = tokio::time::interval(DISCONNECT_TIMER_INTERVAL);
@@ -408,21 +613,14 @@ impl MixnetListener {
                     log::debug!("IpPacketRouter [main loop]: received shutdown");
                 },
                 _ = disconnect_timer.tick() => {
-                    self.connected_clients.disconnect_inactive_clients();
+                    self.handle_disconnect_timer();
                 },
                 msg = self.mixnet_client.next() => {
                     if let Some(msg) = msg {
                         match self.on_reconstructed_message(msg).await {
-                            Ok(Some(response)) => {
-                                if let Err(err) = self.handle_response(response).await {
-                                    log::error!("Mixnet listener failed to handle response: {err}");
-                                }
-                            },
-                            Ok(None) => {
-                                continue;
-                            },
+                            Ok(responses) => self.handle_responses(responses).await,
                             Err(err) => {
-                                log::error!("Error handling mixnet message: {err}");
+                                log::error!("Error handling reconstructed mixnet message: {err}");
                             }
 
                         };
@@ -448,6 +646,5 @@ pub(crate) struct DisconnectEvent(pub(crate) IpAddr);
 
 pub(crate) struct ConnectEvent {
     pub(crate) ip: IpAddr,
-    pub(crate) nym_address: Recipient,
-    pub(crate) mix_hops: Option<u8>,
+    pub(crate) forward_from_tun_tx: tokio::sync::mpsc::UnboundedSender<Vec<u8>>,
 }
diff --git a/service-providers/ip-packet-router/src/request_filter/exit_policy/mod.rs b/service-providers/ip-packet-router/src/request_filter/exit_policy/mod.rs
index a0eee039bc..9dcecbdea3 100644
--- a/service-providers/ip-packet-router/src/request_filter/exit_policy/mod.rs
+++ b/service-providers/ip-packet-router/src/request_filter/exit_policy/mod.rs
@@ -10,6 +10,7 @@ use reqwest::IntoUrl;
 use url::Url;
 
 pub struct ExitPolicyRequestFilter {
+    #[allow(unused)]
     upstream: Option<Url>,
     policy: ExitPolicy,
 }
@@ -34,10 +35,12 @@ impl ExitPolicyRequestFilter {
         }
     }
 
+    #[allow(unused)]
     pub fn policy(&self) -> &ExitPolicy {
         &self.policy
     }
 
+    #[allow(unused)]
     pub fn upstream(&self) -> Option<&Url> {
         self.upstream.as_ref()
     }
diff --git a/service-providers/ip-packet-router/src/request_filter/mod.rs b/service-providers/ip-packet-router/src/request_filter/mod.rs
index 2e3ca58b7e..c11fb6c9d6 100644
--- a/service-providers/ip-packet-router/src/request_filter/mod.rs
+++ b/service-providers/ip-packet-router/src/request_filter/mod.rs
@@ -26,6 +26,7 @@ impl RequestFilter {
         Self::new_exit_policy_filter(config).await
     }
 
+    #[allow(unused)]
     pub fn current_exit_policy_filter(&self) -> Option<&ExitPolicyRequestFilter> {
         match &*self.inner {
             RequestFilterInner::ExitPolicy { policy_filter } => Some(policy_filter),
diff --git a/service-providers/ip-packet-router/src/tun_listener.rs b/service-providers/ip-packet-router/src/tun_listener.rs
index 5dcc59d205..34fb12526e 100644
--- a/service-providers/ip-packet-router/src/tun_listener.rs
+++ b/service-providers/ip-packet-router/src/tun_listener.rs
@@ -1,22 +1,75 @@
-use nym_ip_packet_requests::IpPacketResponse;
-use nym_sdk::mixnet::MixnetMessageSender;
+use std::{collections::HashMap, net::IpAddr};
+
 use nym_task::TaskClient;
 #[cfg(target_os = "linux")]
 use tokio::io::AsyncReadExt;
 
 use crate::{
-    error::{IpPacketRouterError, Result},
+    error::Result,
     mixnet_listener::{self},
-    util::{create_message::create_input_message, parse_ip::parse_dst_addr},
+    util::parse_ip::parse_dst_addr,
 };
 
+// The TUN listener keeps a local map of the connected clients that has its state updated by the
+// mixnet listener. Basically it's just so that we don't have to have mutexes around shared state.
+// It's even ok if this is slightly out of date
+pub(crate) struct ConnectedClientMirror {
+    pub(crate) forward_from_tun_tx: tokio::sync::mpsc::UnboundedSender<Vec<u8>>,
+}
+
+pub(crate) struct ConnectedClientsListener {
+    clients: HashMap<IpAddr, ConnectedClientMirror>,
+    connected_client_rx:
+        tokio::sync::mpsc::UnboundedReceiver<mixnet_listener::ConnectedClientEvent>,
+}
+
+impl ConnectedClientsListener {
+    pub(crate) fn new(
+        connected_client_rx: tokio::sync::mpsc::UnboundedReceiver<
+            mixnet_listener::ConnectedClientEvent,
+        >,
+    ) -> Self {
+        ConnectedClientsListener {
+            clients: HashMap::new(),
+            connected_client_rx,
+        }
+    }
+
+    pub(crate) fn get(&self, ip: &IpAddr) -> Option<&ConnectedClientMirror> {
+        self.clients.get(ip)
+    }
+
+    pub(crate) fn update(&mut self, event: mixnet_listener::ConnectedClientEvent) {
+        match event {
+            mixnet_listener::ConnectedClientEvent::Connect(connected_event) => {
+                let mixnet_listener::ConnectEvent {
+                    ip,
+                    forward_from_tun_tx,
+                } = *connected_event;
+                log::trace!("Connect client: {ip}");
+                self.clients.insert(
+                    ip,
+                    ConnectedClientMirror {
+                        forward_from_tun_tx,
+                    },
+                );
+            }
+            mixnet_listener::ConnectedClientEvent::Disconnect(
+                mixnet_listener::DisconnectEvent(ip),
+            ) => {
+                log::trace!("Disconnect client: {ip}");
+                self.clients.remove(&ip);
+            }
+        }
+    }
+}
+
 // Reads packet from TUN and writes to mixnet client
 #[cfg(target_os = "linux")]
 pub(crate) struct TunListener {
     pub(crate) tun_reader: tokio::io::ReadHalf<tokio_tun::Tun>,
-    pub(crate) mixnet_client_sender: nym_sdk::mixnet::MixnetClientSender,
     pub(crate) task_client: TaskClient,
-    pub(crate) connected_clients: mixnet_listener::ConnectedClientsListener,
+    pub(crate) connected_clients: ConnectedClientsListener,
 }
 
 #[cfg(target_os = "linux")]
@@ -27,26 +80,22 @@ impl TunListener {
             return Ok(());
         };
 
-        if let Some(mixnet_listener::ConnectedClient {
-            nym_address,
-            mix_hops,
-            ..
+        if let Some(ConnectedClientMirror {
+            forward_from_tun_tx,
         }) = self.connected_clients.get(&dst_addr)
         {
             let packet = buf[..len].to_vec();
-            let response_packet = IpPacketResponse::new_ip_packet(packet.into())
-                .to_bytes()
-                .map_err(|err| IpPacketRouterError::FailedToSerializeResponsePacket {
-                    source: err,
-                })?;
-            let input_message = create_input_message(*nym_address, response_packet, *mix_hops);
-
-            self.mixnet_client_sender
-                .send(input_message)
-                .await
-                .map_err(|err| IpPacketRouterError::FailedToSendPacketToMixnet { source: err })?;
+            if forward_from_tun_tx.send(packet).is_err() {
+                log::warn!("Failed to forward packet to connected client {dst_addr}: disconnecting it from tun listener");
+                self.connected_clients
+                    .update(mixnet_listener::ConnectedClientEvent::Disconnect(
+                        mixnet_listener::DisconnectEvent(dst_addr),
+                    ));
+            }
         } else {
-            log::info!("No registered nym-address for packet - dropping");
+            log::info!(
+                "dropping packet from network: no registered client for destination: {dst_addr}"
+            );
         }
 
         Ok(())
diff --git a/service-providers/network-requester/src/cli/init.rs b/service-providers/network-requester/src/cli/init.rs
index 4333aa4970..630c4546f4 100644
--- a/service-providers/network-requester/src/cli/init.rs
+++ b/service-providers/network-requester/src/cli/init.rs
@@ -48,7 +48,7 @@ impl InitialisableClient for NetworkRequesterInit {
     }
 }
 
-#[derive(Args, Clone)]
+#[derive(Args, Clone, Debug)]
 pub(crate) struct Init {
     #[command(flatten)]
     common_args: CommonClientInitArgs,
diff --git a/service-providers/network-statistics/Cargo.toml b/service-providers/network-statistics/Cargo.toml
index 1895d2b88c..98f2494c41 100644
--- a/service-providers/network-statistics/Cargo.toml
+++ b/service-providers/network-statistics/Cargo.toml
@@ -10,7 +10,7 @@ license.workspace = true
 dirs = "4.0"
 log = { workspace = true }
 pretty_env_logger = "0.4"
-rocket = { version = "0.5.0-rc.2", features = ["json"] }
+rocket = { version = "0.5.0", features = ["json"] }
 serde = { workspace = true, features = ["derive"] }
 sqlx = { workspace = true, features = ["runtime-tokio-rustls", "sqlite", "macros", "migrate", "chrono"]}
 thiserror = { workspace = true }
diff --git a/service-providers/network-statistics/src/api/routes.rs b/service-providers/network-statistics/src/api/routes.rs
index 632841a675..33bad5d108 100644
--- a/service-providers/network-statistics/src/api/routes.rs
+++ b/service-providers/network-statistics/src/api/routes.rs
@@ -1,9 +1,6 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-// due to the macro expansion of rather old rocket macros...
-#![allow(unused_imports)]
-
 use crate::api::error::Result;
 use crate::storage::NetworkStatisticsStorage;
 use nym_statistics_common::StatsMessage;
diff --git a/tools/nym-cli/Cargo.toml b/tools/nym-cli/Cargo.toml
index cd7edb07ef..29a6f85e2f 100644
--- a/tools/nym-cli/Cargo.toml
+++ b/tools/nym-cli/Cargo.toml
@@ -12,6 +12,7 @@ clap = { workspace = true, features = ["derive"] }
 clap_complete = "4.0"
 clap_complete_fig = "4.0"
 dotenvy = { workspace = true }
+inquire = "0.6.2"
 log = { workspace = true }
 pretty_env_logger = "0.4"
 serde = { version = "1", features = ["derive"] }
diff --git a/tools/nym-cli/src/validator/account.rs b/tools/nym-cli/src/validator/account.rs
index b6c422170d..eb51786a4a 100644
--- a/tools/nym-cli/src/validator/account.rs
+++ b/tools/nym-cli/src/validator/account.rs
@@ -52,6 +52,13 @@ pub(crate) async fn execute(
             )
             .await;
         }
+        Some(nym_cli_commands::validator::account::AccountCommands::SendMultiple(args)) => {
+            nym_cli_commands::validator::account::send_multiple::send_multiple(
+                args,
+                &create_signing_client(global_args, network_details)?,
+            )
+            .await;
+        }
         _ => unreachable!(),
     }