added ibc messages to MessageRegistry

using SignerInfo proto definitions for db serialisation
Revert "use postgres in chain scraper"
2025-07-08 10:41:54 +01:00 · 2025-07-08 10:05:49 +01:00 · 2025-07-07 17:21:22 +01:00 · 2025-07-07 15:04:33 +01:00 · 2025-07-07 15:00:27 +01:00 · 2025-07-07 14:54:16 +01:00
251 changed files with 5781 additions and 4007 deletions
@@ -31,26 +31,33 @@ jobs:
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
-          toolchain: stable
          target: wasm32-unknown-unknown
          override: true

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

      - name: Build release contracts
-        run: make publish-contracts
+        run: make contracts

      - name: Prepare build output
        shell: bash
        env:
          OUTPUT_DIR: ci-contract-builds/${{ github.ref_name }}
        run: |
-          find contracts/artifacts -maxdepth 1 -type f -name '*.wasm' -exec cp {} $OUTPUT_DIR \;
-          # Also include the optimizer-generated checksums if present
-          if [ -f contracts/artifacts/checksums.txt ]; then
-            cp contracts/artifacts/checksums.txt $OUTPUT_DIR
-          fi
+          cp contracts/target/wasm32-unknown-unknown/release/mixnet_contract.wasm $OUTPUT_DIR
+          cp contracts/target/wasm32-unknown-unknown/release/vesting_contract.wasm $OUTPUT_DIR
+          cp contracts/target/wasm32-unknown-unknown/release/nym_coconut_dkg.wasm $OUTPUT_DIR
+          cp contracts/target/wasm32-unknown-unknown/release/cw3_flex_multisig.wasm $OUTPUT_DIR
+          cp contracts/target/wasm32-unknown-unknown/release/cw4_group.wasm $OUTPUT_DIR
+          cp contracts/target/wasm32-unknown-unknown/release/nym_ecash.wasm $OUTPUT_DIR
+          cp contracts/target/wasm32-unknown-unknown/release/nym_pool_contract.wasm $OUTPUT_DIR
+          cp contracts/target/wasm32-unknown-unknown/release/nym_performance_contract.wasm $OUTPUT_DIR

      - name: Deploy branch to CI www
        continue-on-error: true
@@ -1,19 +0,0 @@
-name: Run SonarQube Scan
-on:
-  push:
-    branches:
-      - develop
-#  pull_request:
-#    types: [opened, synchronize, reopened]
-jobs:
-  sonarqube:
-    name: SonarQube
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: SonarQube Scan
-        uses: SonarSource/sonarqube-scan-action@v5
-        env:
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
@@ -49,8 +49,6 @@ jobs:
        run: |
          curl -L0 https://www.ssl.com/download/codesigntool-for-linux-and-macos/ -o codesigntool.zip
          unzip codesigntool.zip
-          chmod +x CodeSignTool.sh
-          
      - name: Get EV certificate credential id
        working-directory: nym-wallet/src-tauri
        if: ${{ inputs.sign }}
@@ -58,7 +56,6 @@ jobs:
        shell: bash
        run: |
          echo "SSL_COM_CREDENTIAL_ID=$(./CodeSignTool.sh get_credential_ids -username=${{ secrets.SSL_COM_USERNAME }} -password=${{ secrets.SSL_COM_PASSWORD }} | sed -n '1!p' | sed 's/- //')" >> "$GITHUB_OUTPUT"
-          
      - name: Add custom sign command to tauri.conf.json
        working-directory: nym-wallet/src-tauri
        if: ${{ inputs.sign }}
@@ -82,7 +79,6 @@ jobs:
              ]
            }
          }' tauri.conf.json
-          
      - name: Install project dependencies
        shell: bash
        run: cd .. && yarn --network-timeout 100000
@@ -97,14 +93,12 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
          TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
-          SSL_COM_USERNAME: ${{ inputs.sign && secrets.SSL_COM_USERNAME || '' }}
-          SSL_COM_PASSWORD: ${{ inputs.sign && secrets.SSL_COM_PASSWORD || '' }}
-          SSL_COM_CREDENTIAL_ID: ${{ inputs.sign && steps.get_credential_ids.outputs.SSL_COM_CREDENTIAL_ID || '' }}
-          SSL_COM_TOTP_SECRET: ${{ inputs.sign && secrets.SSL_COM_TOTP_SECRET || '' }}
-          CODE_SIGN_TOOL_PATH: ${{ inputs.sign && 'C:\\actions-runner\\_work\\nym\\nym\\nym-wallet\\src-tauri\\' || '' }}
+          SSL_COM_USERNAME: ${{ inputs.sign && secrets.SSL_COM_USERNAME }}
+          SSL_COM_PASSWORD: ${{ inputs.sign && secrets.SSL_COM_PASSWORD }}
+          SSL_COM_CREDENTIAL_ID: ${{ inputs.sign && steps.get_credential_ids.outputs.SSL_COM_CREDENTIAL_ID }}
+          SSL_COM_TOTP_SECRET: ${{ inputs.sign && secrets.SSL_COM_TOTP_SECRET }}
        run: |
          echo "Starting build process..."
-          echo "Signing enabled: ${{ inputs.sign }}"
          yarn build

      - name: Check bundle directory
@@ -153,7 +147,7 @@ jobs:
            nym-wallet/${{ env.BUNDLE_PATH }}/msi/*.msi.zip*
            nym-wallet/${{ env.BUNDLE_PATH }}/*/nym-wallet*.msi
            nym-wallet/src-tauri/target/release/bundle/msi/*.msi
-  
+          
      - name: Find MSI path for deployment
        id: find-msi
        shell: bash
@@ -173,4 +167,4 @@ jobs:
    needs: publish-tauri
    with:
      release_tag: ${{ needs.publish-tauri.outputs.release_tag || github.ref_name }}
-    secrets: inherit
+    secrets: inherit
@@ -5,15 +5,8 @@ on:
    inputs:
      gateway_probe_git_ref:
        type: string
-        default: nym-vpn-core-v1.4.0
-        required: true
        description: Which gateway probe git ref to build the image with
-      release_image:
-        description: 'Tag image as a release'
-        required: true
-        default: false
-        type: boolean
-        
+
 env:
  WORKING_DIRECTORY: "nym-node-status-api/nym-node-status-agent"
  CONTAINER_NAME: "node-status-agent"
@@ -50,32 +43,19 @@ jobs:
          GIT_REF_SLUG="${GATEWAY_PROBE_GIT_REF//\//-}"
          echo "git_ref=${GIT_REF_SLUG}" >> $GITHUB_OUTPUT

-      - name: Set GIT_TAG variable
-        run: echo "GIT_TAG=${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }}-${{ steps.cleanup_gateway_probe_ref.outputs.git_ref }}" >> $GITHUB_ENV
+      - name: Remove existing tag if exists
+        run: |
+          if git rev-parse ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }}-${{ steps.cleanup_gateway_probe_ref.outputs.git_ref }} >/dev/null 2>&1; then
+            git push --delete origin ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }}-${{ steps.cleanup_gateway_probe_ref.outputs.git_ref }}
+            git tag -d ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }}-${{ steps.cleanup_gateway_probe_ref.outputs.git_ref }}
+          fi

-      - name: Set RELEASE_TAG variable
-        if: github.event.inputs.release_image == 'true'
-        run: echo "RELEASE_TAG=golden-" >> $GITHUB_ENV
-
-      - name: Set IMAGE_NAME_AND_TAGS variable
-        run: echo "IMAGE_NAME_AND_TAGS=${{ env.CONTAINER_NAME }}:${{ env.RELEASE_TAG }}${{ steps.get_version.outputs.result }}-${{ steps.cleanup_gateway_probe_ref.outputs.git_ref }}" >> $GITHUB_ENV
-
-      - name: New env vars
-        run: echo "RELEASE_TAG='$RELEASE_TAG' GIT_TAG='$GIT_TAG' IMAGE_NAME_AND_TAGS='$IMAGE_NAME_AND_TAGS'"        
-
-      # - name: Remove existing tag if exists
-      #   run: |
-      #     if git rev-parse $${{ env.GIT_TAG }} >/dev/null 2>&1; then
-      #       git push --delete origin $${{ env.GIT_TAG }}
-      #       git tag -d $${{ env.GIT_TAG }}
-      #     fi
-
-      # - name: Create tag
-      #   run: |
-      #     git tag -a $${{ env.GIT_TAG }} -m "Version ${{ steps.get_version.outputs.result }}-${{ steps.cleanup_gateway_probe_ref.outputs.git_ref }}"
-      #     git push origin $${{ env.GIT_TAG }}
+      - name: Create tag
+        run: |
+          git tag -a ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }}-${{ steps.cleanup_gateway_probe_ref.outputs.git_ref }} -m "Version ${{ steps.get_version.outputs.result }}-${{ steps.cleanup_gateway_probe_ref.outputs.git_ref }}"
+          git push origin ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }}-${{ steps.cleanup_gateway_probe_ref.outputs.git_ref }}

      - name: BuildAndPushImageOnHarbor
        run: |
-          docker build --build-arg GIT_REF=${{ github.event.inputs.gateway_probe_git_ref }} -f ${{ env.WORKING_DIRECTORY }}/Dockerfile . -t harbor.nymte.ch/nym/${{ env.IMAGE_NAME_AND_TAGS }}
+          docker build --build-arg GIT_REF=${{ github.event.inputs.gateway_probe_git_ref }} -f ${{ env.WORKING_DIRECTORY }}/Dockerfile . -t harbor.nymte.ch/nym/${{ env.CONTAINER_NAME }}:${{ steps.get_version.outputs.result }}-${{ steps.cleanup_gateway_probe_ref.outputs.git_ref }}
          docker push harbor.nymte.ch/nym/${{ env.CONTAINER_NAME }} --all-tags
@@ -1,13 +1,7 @@
 name: Build and upload Node Status API container to harbor.nymte.ch
 on:
  workflow_dispatch:
-    inputs:
-      release_image:
-        description: 'Tag image as a release'
-        required: true
-        default: false
-        type: boolean
-        
+
 env:
  WORKING_DIRECTORY: "nym-node-status-api/nym-node-status-api"
  CONTAINER_NAME: "node-status-api"
@@ -37,35 +31,25 @@ jobs:
        with:
          cmd: yq -oy '.package.version' ${{ env.WORKING_DIRECTORY }}/Cargo.toml

-      - name: Set GIT_TAG variable
-        run: echo "GIT_TAG=${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }}" >> $GITHUB_ENV
+      - name: Check if tag exists
+        run: |
+          if git rev-parse ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }} >/dev/null 2>&1; then
+            echo "Tag ${{ steps.get_version.outputs.result }} already exists"
+          fi

-      - name: Set RELEASE_TAG variable
-        if: github.event.inputs.release_image == 'true'
-        run: echo "RELEASE_TAG=golden-" >> $GITHUB_ENV
+      - name: Remove existing tag if exists
+        run: |
+          if git rev-parse ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }} >/dev/null 2>&1; then
+            git push --delete origin ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }}
+            git tag -d ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }}
+          fi

-      - name: Set IMAGE_NAME_AND_TAGS variable
-        run: echo "IMAGE_NAME_AND_TAGS=${{ env.CONTAINER_NAME }}:${{ env.RELEASE_TAG }}${{ steps.get_version.outputs.result }}" >> $GITHUB_ENV
-
-      - name: New env vars
-        run: echo "RELEASE_TAG='$RELEASE_TAG' GIT_TAG='$GIT_TAG' IMAGE_NAME_AND_TAGS='$IMAGE_NAME_AND_TAGS'"        
-
-      # - name: Remove existing tag if exists, then create
-      #   run: |
-      #     if git rev-parse "$GIT_TAG" >/dev/null 2>&1; then
-      #       echo "Tag '$GIT_TAG' already exists, deleting"
-      #       git push --delete origin "$GIT_TAG"
-      #       git tag -d "$GIT_TAG"
-      #       echo "Tag '$GIT_TAG' deleted"
-      #     else
-      #       echo "Tag '$GIT_TAG' does not exist, creating it"
-      #       git tag -a $GIT_TAG -m "Version ${{ steps.get_version.outputs.result }}"
-      #       git push origin $GIT_TAG
-      #       echo "Tag '$GIT_TAG' created"
-      #     fi
+      - name: Create tag
+        run: |
+          git tag -a ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }} -m "Version ${{ steps.get_version.outputs.result }}"
+          git push origin ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }}

      - name: BuildAndPushImageOnHarbor
        run: |
-          docker build -f ${{ env.WORKING_DIRECTORY }}/Dockerfile . -t harbor.nymte.ch/nym/${{ env.IMAGE_NAME_AND_TAGS }} -t harbor.nymte.ch/nym/${{ env.CONTAINER_NAME }}:latest
+          docker build -f ${{ env.WORKING_DIRECTORY }}/Dockerfile . -t harbor.nymte.ch/nym/${{ env.CONTAINER_NAME }}:${{ steps.get_version.outputs.result }} -t harbor.nymte.ch/nym/${{ env.CONTAINER_NAME }}:latest
          docker push harbor.nymte.ch/nym/${{ env.CONTAINER_NAME }} --all-tags
-
@@ -35,8 +35,6 @@ validator-api/keypair
 contracts/mixnet/code_id
 contracts/mixnet/Justfile
 contracts/mixnet/Makefile
-artifacts
-contracts/artifacts
 validator-config
 *.patch
 validator-api-config.toml
@@ -4,74 +4,6 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://

 ## [Unreleased]

-## [2025.12-dolcelatte] (2025-07-07)
-
- bugfix: key-rotation + reply SURBs ([#5876])
- Bugfix/backwards compat ([#5865])
- bugfix: allow gateways to permit authentication from v4 clients ([#5862])
- fixed client route for obtaining v2 list of gateways ([#5859])
- Updated browser extension piece removal ([#5849])
- Remove/old env references ([#5848])
- Remove qa env ([#5847])
- remove not used old mock-api ([#5845])
- remove bity dir ([#5844])
- build(deps-dev): bump webpack-dev-server from 4.13.2 to 5.2.1 in /wasm/mix-fetch/internal-dev ([#5843])
- Amended the buy section ([#5841])
- Removing test-net faucet ([#5840])
- Feature/node status dvpn directory ([#5829])
- build(deps-dev): bump webpack-dev-server from 4.15.2 to 5.2.1 in /nym-credential-proxy/vpn-api-lib-wasm/internal-dev ([#5826])
- bugfix: fix swapped total and circulating supplies ([#5822])
- build(deps): bump tar-fs from 3.0.8 to 3.0.9 in /sdk/typescript/tests/integration-tests/mix-fetch ([#5821])
- Url scheme warning log ([#5819])
- chore: adjust heuristic for wireguard peer activity ([#5818])
- Use the same client bandwidth for top up ([#5813])
- Replace chrono with time in NS API ([#5811])
- build(deps-dev): bump http-proxy-middleware from 2.0.4 to 2.0.9 in /clients/native/examples/js-examples/websocket ([#5810])
- build(deps): bump tokio from 1.44.2 to 1.45.1 ([#5798])
- Close sqlite pool before moving or reopening databases ([#5796])
- HTTP Client Retries, Fallbacks, and Redirects ([#5789])
- feat: key rotation ([#5777])
- build(deps): bump next from 14.2.15 to 14.2.26 in /documentation/docs ([#5772])
- build(deps): bump undici from 5.28.5 to 5.29.0 in /.github/actions/nym-hash-releases/src ([#5771])
- build(deps): bump cargo_metadata from 0.18.1 to 0.19.2 ([#5765])
- build(deps): bump tempfile from 3.19.1 to 3.20.0 ([#5764])
- [Feature] Noise XKpsk3 integration (2025 version) ([#5692])
- feature: nympool contract ([#5464])
- chore: fixed typo in API endpoint parameter ([#5449])
-
-[#5876]: https://github.com/nymtech/nym/pull/5876
-[#5865]: https://github.com/nymtech/nym/pull/5865
-[#5862]: https://github.com/nymtech/nym/pull/5862
-[#5859]: https://github.com/nymtech/nym/pull/5859
-[#5849]: https://github.com/nymtech/nym/pull/5849
-[#5848]: https://github.com/nymtech/nym/pull/5848
-[#5847]: https://github.com/nymtech/nym/pull/5847
-[#5845]: https://github.com/nymtech/nym/pull/5845
-[#5844]: https://github.com/nymtech/nym/pull/5844
-[#5843]: https://github.com/nymtech/nym/pull/5843
-[#5841]: https://github.com/nymtech/nym/pull/5841
-[#5840]: https://github.com/nymtech/nym/pull/5840
-[#5829]: https://github.com/nymtech/nym/pull/5829
-[#5826]: https://github.com/nymtech/nym/pull/5826
-[#5822]: https://github.com/nymtech/nym/pull/5822
-[#5821]: https://github.com/nymtech/nym/pull/5821
-[#5819]: https://github.com/nymtech/nym/pull/5819
-[#5818]: https://github.com/nymtech/nym/pull/5818
-[#5813]: https://github.com/nymtech/nym/pull/5813
-[#5811]: https://github.com/nymtech/nym/pull/5811
-[#5810]: https://github.com/nymtech/nym/pull/5810
-[#5798]: https://github.com/nymtech/nym/pull/5798
-[#5796]: https://github.com/nymtech/nym/pull/5796
-[#5789]: https://github.com/nymtech/nym/pull/5789
-[#5777]: https://github.com/nymtech/nym/pull/5777
-[#5772]: https://github.com/nymtech/nym/pull/5772
-[#5771]: https://github.com/nymtech/nym/pull/5771
-[#5765]: https://github.com/nymtech/nym/pull/5765
-[#5764]: https://github.com/nymtech/nym/pull/5764
-[#5692]: https://github.com/nymtech/nym/pull/5692
-[#5464]: https://github.com/nymtech/nym/pull/5464
-[#5449]: https://github.com/nymtech/nym/pull/5449
-
 ## [2025.11-cheddar] (2025-06-10)

 - No autoremoval of peers ([#5831])
@@ -471,6 +471,17 @@ dependencies = [
 "pin-project-lite",
 ]

+[[package]]
+name = "async-recursion"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "async-stream"
 version = "0.3.6"
@@ -1344,7 +1355,7 @@ checksum = "c2895653b4d9f1538a83970077cb01dfc77a4810524e51a110944688e916b18e"
 dependencies = [
 "prost 0.11.9",
 "prost-types",
- "tonic",
+ "tonic 0.9.2",
 "tracing-core",
 ]

@@ -1366,7 +1377,7 @@ dependencies = [
 "thread_local",
 "tokio",
 "tokio-stream",
- "tonic",
+ "tonic 0.9.2",
 "tracing",
 "tracing-core",
 "tracing-subscriber",
@@ -1456,6 +1467,19 @@ dependencies = [
 "tendermint-proto",
 ]

+[[package]]
+name = "cosmos-sdk-proto"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95ac39be7373404accccaede7cc1ec942ccef14f0ca18d209967a756bf1dbb1f"
+dependencies = [
+ "informalsystems-pbjson",
+ "prost 0.13.5",
+ "serde",
+ "tendermint-proto",
+ "tonic 0.13.1",
+]
+
 [[package]]
 name = "cosmrs"
 version = "0.21.1"
@@ -1463,7 +1487,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1394c263335da09e8ba8c4b2c675d804e3e0deb44cce0866a5f838d3ddd43d02"
 dependencies = [
 "bip32",
- "cosmos-sdk-proto",
+ "cosmos-sdk-proto 0.26.1",
+ "ecdsa",
+ "eyre",
+ "k256",
+ "rand_core 0.6.4",
+ "serde",
+ "serde_json",
+ "signature",
+ "subtle-encoding",
+ "tendermint",
+ "tendermint-rpc",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "cosmrs"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34e74fa7a22930fe0579bef560f2d64b78415d4c47b9dd976c0635136809471d"
+dependencies = [
+ "bip32",
+ "cosmos-sdk-proto 0.27.0",
 "ecdsa",
 "eyre",
 "k256",
@@ -3064,9 +3109,9 @@ dependencies = [

 [[package]]
 name = "h2"
-version = "0.4.11"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17da50a276f1e01e0ba6c029e47b7100754904ee8a278f886546e98575380785"
+checksum = "75249d144030531f8dee69fe9cea04d3edf809a017ae445e2abdff6629e86633"
 dependencies = [
 "atomic-waker",
 "bytes",
@@ -3240,19 +3285,21 @@ checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"

 [[package]]
 name = "hickory-proto"
-version = "0.25.2"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8a6fe56c0038198998a6f217ca4e7ef3a5e51f46163bd6dd60b5c71ca6c6502"
+checksum = "6d844af74f7b799e41c78221be863bade11c430d46042c3b49ca8ae0c6d27287"
 dependencies = [
+ "async-recursion",
 "async-trait",
 "bytes",
 "cfg-if",
+ "critical-section",
 "data-encoding",
 "enum-as-inner",
 "futures-channel",
 "futures-io",
 "futures-util",
- "h2 0.4.11",
+ "h2 0.4.9",
 "http 1.3.1",
 "idna",
 "ipnet",
@@ -3494,6 +3541,7 @@ dependencies = [
 "bytes",
 "futures-channel",
 "futures-util",
+ "h2 0.4.9",
 "http 1.3.1",
 "http-body 1.0.1",
 "httparse",
@@ -3549,6 +3597,19 @@ dependencies = [
 "tokio-io-timeout",
 ]

+[[package]]
+name = "hyper-timeout"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0"
+dependencies = [
+ "hyper 1.6.0",
+ "hyper-util",
+ "pin-project-lite",
+ "tokio",
+ "tower-service",
+]
+
 [[package]]
 name = "hyper-util"
 version = "0.1.11"
@@ -3592,6 +3653,39 @@ dependencies = [
 "cc",
 ]

+[[package]]
+name = "ibc-proto"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a650b51e384e54264b53974feb38e95e37aac70f7f2f9c07eb8022fe15eb8e20"
+dependencies = [
+ "base64 0.22.1",
+ "bytes",
+ "cosmos-sdk-proto 0.27.0",
+ "flex-error",
+ "ics23",
+ "informalsystems-pbjson",
+ "prost 0.13.5",
+ "serde",
+ "subtle-encoding",
+ "tendermint-proto",
+ "tonic 0.13.1",
+]
+
+[[package]]
+name = "ics23"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73b17f1a5bd7d12ad30a21445cfa5f52fd7651cb3243ba866f9916b1ec112f12"
+dependencies = [
+ "anyhow",
+ "bytes",
+ "hex",
+ "informalsystems-pbjson",
+ "prost 0.13.5",
+ "serde",
+]
+
 [[package]]
 name = "icu_collections"
 version = "1.5.0"
@@ -3853,6 +3947,16 @@ dependencies = [
 "web-time",
 ]

+[[package]]
+name = "informalsystems-pbjson"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aa4a0980c8379295100d70854354e78df2ee1c6ca0f96ffe89afeb3140e3a3d"
+dependencies = [
+ "base64 0.21.7",
+ "serde",
+]
+
 [[package]]
 name = "inotify"
 version = "0.9.6"
@@ -3916,9 +4020,9 @@ checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02"

 [[package]]
 name = "inventory"
-version = "0.3.19"
+version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54b12ebb6799019b044deaf431eadfe23245b259bba5a2c0796acec3943a3cdb"
+checksum = "ab08d7cd2c5897f2c949e5383ea7c7db03fb19130ffcfbf7eda795137ae3cb83"
 dependencies = [
 "rustversion",
 ]
@@ -4802,7 +4906,7 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"

 [[package]]
 name = "nym-api"
-version = "1.1.61"
+version = "1.1.60"
 dependencies = [
 "anyhow",
 "async-trait",
@@ -4893,7 +4997,7 @@ name = "nym-api-requests"
 version = "0.1.0"
 dependencies = [
 "bs58",
- "cosmrs",
+ "cosmrs 0.22.0",
 "cosmwasm-std",
 "ecdsa",
 "getset",
@@ -4931,7 +5035,7 @@ version = "0.1.0"
 source = "git+https://github.com/nymtech/nym.git?branch=release/2025.11-cheddar#e9bb9792ab723a1ad5fe40cb292dc08d4eb40c2f"
 dependencies = [
 "bs58",
- "cosmrs",
+ "cosmrs 0.21.1",
 "cosmwasm-std",
 "ecdsa",
 "getset",
@@ -5091,7 +5195,7 @@ dependencies = [

 [[package]]
 name = "nym-cli"
-version = "1.1.58"
+version = "1.1.57"
 dependencies = [
 "anyhow",
 "base64 0.22.1",
@@ -5125,7 +5229,7 @@ dependencies = [
 "clap",
 "colored",
 "comfy-table",
- "cosmrs",
+ "cosmrs 0.22.0",
 "cosmwasm-std",
 "csv",
 "cw-utils",
@@ -5173,7 +5277,7 @@ dependencies = [

 [[package]]
 name = "nym-client"
-version = "1.1.58"
+version = "1.1.57"
 dependencies = [
 "bs58",
 "clap",
@@ -5220,13 +5324,15 @@ dependencies = [
 "futures",
 "gloo-timers",
 "http-body-util",
- "humantime",
+ "humantime-serde",
 "hyper 1.6.0",
 "hyper-util",
+ "log",
 "nym-bandwidth-controller",
 "nym-client-core-config-types",
 "nym-client-core-gateways-storage",
 "nym-client-core-surb-storage",
+ "nym-config 0.1.0",
 "nym-credential-storage",
 "nym-credentials-interface 0.1.0",
 "nym-crypto 0.4.0",
@@ -5235,6 +5341,7 @@ dependencies = [
 "nym-gateway-requests",
 "nym-http-api-client 0.1.0",
 "nym-id",
+ "nym-metrics 0.1.0",
 "nym-mixnet-client",
 "nym-network-defaults 0.1.0",
 "nym-nonexhaustive-delayqueue",
@@ -5286,7 +5393,8 @@ name = "nym-client-core-gateways-storage"
 version = "0.1.0"
 dependencies = [
 "async-trait",
- "cosmrs",
+ "cosmrs 0.22.0",
+ "log",
 "nym-crypto 0.4.0",
 "nym-gateway-requests",
 "serde",
@@ -5294,7 +5402,6 @@ dependencies = [
 "thiserror 2.0.12",
 "time",
 "tokio",
- "tracing",
 "url",
 "zeroize",
 ]
@@ -5305,6 +5412,7 @@ version = "0.1.0"
 dependencies = [
 "async-trait",
 "dashmap",
+ "log",
 "nym-crypto 0.4.0",
 "nym-sphinx 0.1.0",
 "nym-task 0.1.0",
@@ -5313,7 +5421,6 @@ dependencies = [
 "thiserror 2.0.12",
 "time",
 "tokio",
- "tracing",
 ]

 [[package]]
@@ -5646,7 +5753,7 @@ version = "0.1.0"
 dependencies = [
 "bincode",
 "bls12_381",
- "cosmrs",
+ "cosmrs 0.22.0",
 "log",
 "nym-api-requests 0.1.0",
 "nym-credentials-interface 0.1.0",
@@ -6458,7 +6565,7 @@ dependencies = [

 [[package]]
 name = "nym-network-requester"
-version = "1.1.59"
+version = "1.1.58"
 dependencies = [
 "addr",
 "anyhow",
@@ -6508,7 +6615,7 @@ dependencies = [

 [[package]]
 name = "nym-node"
-version = "1.14.0"
+version = "1.13.0"
 dependencies = [
 "anyhow",
 "arc-swap",
@@ -6669,7 +6776,7 @@ dependencies = [

 [[package]]
 name = "nym-node-status-api"
-version = "3.1.2"
+version = "3.1.1"
 dependencies = [
 "ammonia",
 "anyhow",
@@ -7046,7 +7153,7 @@ dependencies = [

 [[package]]
 name = "nym-socks5-client"
-version = "1.1.58"
+version = "1.1.57"
 dependencies = [
 "bs58",
 "clap",
@@ -7634,16 +7741,17 @@ version = "0.1.0"
 dependencies = [
 "async-trait",
 "nym-api-requests 0.1.0",
+ "nym-config 0.1.0",
 "nym-crypto 0.4.0",
 "nym-mixnet-contract-common 0.6.0",
 "nym-sphinx-addressing 0.1.0",
+ "nym-sphinx-routing 0.1.0",
 "nym-sphinx-types 0.2.0",
 "rand 0.8.5",
 "reqwest 0.12.15",
 "serde",
 "serde_json",
 "thiserror 2.0.12",
- "time",
 "tracing",
 "tsify",
 "wasm-bindgen",
@@ -7687,7 +7795,7 @@ name = "nym-types"
 version = "1.0.0"
 dependencies = [
 "base64 0.22.1",
- "cosmrs",
+ "cosmrs 0.22.0",
 "cosmwasm-std",
 "eyre",
 "hmac",
@@ -7721,7 +7829,7 @@ dependencies = [
 "bip32",
 "bip39",
 "colored",
- "cosmrs",
+ "cosmrs 0.22.0",
 "cosmwasm-std",
 "cw-controllers",
 "cw-utils",
@@ -7772,7 +7880,7 @@ dependencies = [
 "bip32",
 "bip39",
 "colored",
- "cosmrs",
+ "cosmrs 0.21.1",
 "cosmwasm-std",
 "cw-controllers",
 "cw-utils",
@@ -7837,7 +7945,7 @@ dependencies = [
 "nym-task 0.1.0",
 "nym-ticketbooks-merkle 0.1.0",
 "nym-validator-client 0.1.0",
- "nyxd-scraper",
+ "nyxd-scraper-sqlite",
 "rand 0.8.5",
 "rand_chacha 0.3.1",
 "serde",
@@ -7928,7 +8036,7 @@ dependencies = [
 name = "nym-wallet-types"
 version = "1.0.0"
 dependencies = [
- "cosmrs",
+ "cosmrs 0.21.1",
 "cosmwasm-std",
 "hex-literal",
 "nym-config 0.1.0",
@@ -8002,7 +8110,7 @@ dependencies = [

 [[package]]
 name = "nymvisor"
-version = "0.1.23"
+version = "0.1.22"
 dependencies = [
 "anyhow",
 "bytes",
@@ -8044,7 +8152,7 @@ dependencies = [
 "nym-network-defaults 0.1.0",
 "nym-task 0.1.0",
 "nym-validator-client 0.1.0",
- "nyxd-scraper",
+ "nyxd-scraper-sqlite",
 "reqwest 0.12.15",
 "schemars",
 "serde",
@@ -8062,18 +8170,39 @@ dependencies = [
 ]

 [[package]]
-name = "nyxd-scraper"
+name = "nyxd-scraper-psql"
 version = "0.1.0"
 dependencies = [
 "async-trait",
+ "base64 0.22.1",
+ "cosmrs 0.22.0",
+ "itertools 0.14.0",
+ "nyxd-scraper-shared",
+ "serde",
+ "serde_json",
+ "sqlx",
+ "thiserror 2.0.12",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "nyxd-scraper-shared"
+version = "0.1.0"
+dependencies = [
+ "async-trait",
+ "base64 0.22.1",
 "const_format",
- "cosmrs",
+ "cosmos-sdk-proto 0.27.0",
+ "cosmrs 0.22.0",
 "eyre",
 "futures",
 "humantime",
+ "ibc-proto",
+ "prost 0.13.5",
 "serde",
+ "serde_json",
 "sha2 0.10.9",
- "sqlx",
 "tendermint",
 "tendermint-rpc",
 "thiserror 2.0.12",
@@ -8085,6 +8214,18 @@ dependencies = [
 "url",
 ]

+[[package]]
+name = "nyxd-scraper-sqlite"
+version = "0.1.0"
+dependencies = [
+ "async-trait",
+ "nyxd-scraper-shared",
+ "sqlx",
+ "thiserror 2.0.12",
+ "tokio",
+ "tracing",
+]
+
 [[package]]
 name = "object"
 version = "0.36.7"
@@ -10777,7 +10918,6 @@ dependencies = [
 "console",
 "cw-utils",
 "dkg-bypass-contract",
- "humantime",
 "indicatif",
 "nym-bin-common 0.6.0",
 "nym-coconut-dkg-common 0.1.0",
@@ -11200,7 +11340,7 @@ dependencies = [
 "http 0.2.12",
 "http-body 0.4.6",
 "hyper 0.14.32",
- "hyper-timeout",
+ "hyper-timeout 0.4.1",
 "percent-encoding",
 "pin-project",
 "prost 0.11.9",
@@ -11212,6 +11352,34 @@ dependencies = [
 "tracing",
 ]

+[[package]]
+name = "tonic"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e581ba15a835f4d9ea06c55ab1bd4dce26fc53752c69a04aac00703bfb49ba9"
+dependencies = [
+ "async-trait",
+ "base64 0.22.1",
+ "bytes",
+ "h2 0.4.9",
+ "http 1.3.1",
+ "http-body 1.0.1",
+ "http-body-util",
+ "hyper 1.6.0",
+ "hyper-timeout 0.5.2",
+ "hyper-util",
+ "percent-encoding",
+ "pin-project",
+ "prost 0.13.5",
+ "socket2",
+ "tokio",
+ "tokio-stream",
+ "tower 0.5.2",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
 [[package]]
 name = "tower"
 version = "0.4.13"
@@ -11240,9 +11408,12 @@ checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
 dependencies = [
 "futures-core",
 "futures-util",
+ "indexmap 2.7.1",
 "pin-project-lite",
+ "slab",
 "sync_wrapper 1.0.2",
 "tokio",
+ "tokio-util",
 "tower-layer",
 "tower-service",
 "tracing",
@@ -80,7 +80,9 @@ members = [
    "common/nymsphinx/params",
    "common/nymsphinx/routing",
    "common/nymsphinx/types",
-    "common/nyxd-scraper",
+    "common/nyxd-scraper-sqlite",
+    "common/nyxd-scraper-psql",
+    "common/nyxd-scraper-shared",
    "common/pemstore",
    "common/serde-helpers",
    "common/service-provider-requests-common",
@@ -383,7 +385,9 @@ cw-multi-test = "=2.3.2"
 bip32 = { version = "0.5.3", default-features = false }


-cosmrs = { version = "0.21.1" }
+cosmrs = { version = "0.22.0" }
+cosmos-sdk-proto = { version = "0.27.0" }
+ibc-proto = { version = "0.52.0" }
 tendermint = "0.40.4"
 tendermint-rpc = "0.40.4"
 prost = { version = "0.13", default-features = false }
@@ -12,11 +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 "  deb: build debian packages"
-	@echo ""
-	@echo "Contract building targets:"
-	@echo "  contracts: build contracts for development (includes wasm-opt)"
-	@echo "  publish-contracts: build contracts using Docker optimizer (deterministic)"
+	@echo "  deb: build debian packages

 # -----------------------------------------------------------------------------
 # Meta targets
@@ -134,69 +130,25 @@ cargo-test: sdk-wasm-test
 clippy: sdk-wasm-lint

 # -----------------------------------------------------------------------------
-# Build CosmWasm contracts (deterministic docker build)
+# Build contracts ready for deploy
 # -----------------------------------------------------------------------------

+CONTRACTS=vesting_contract mixnet_contract nym_ecash cw3_flex_multisig cw4_group nym_coconut_dkg nym_pool_contract nym_performance_contract
+CONTRACTS_WASM=$(addsuffix .wasm, $(CONTRACTS))
+CONTRACTS_OUT_DIR=contracts/target/wasm32-unknown-unknown/release

-WASM_CONTRACT_DIR := contracts/target/wasm32-unknown-unknown/release
-# Find every direct contract folder that contains a Cargo.toml
-CONTRACT_DIRS := $(shell find contracts -type f -name Cargo.toml \( ! -path "contracts/Cargo.toml" \) | grep -v integration-tests | xargs -n1 dirname | sort -u)
-
-CONTRACTS_OUT_DIR = contracts/artifacts
-
-# Build all contracts via the official CosmWasm optimizer image (one invocation per contract)
-# See : https://github.com/CosmWasm/optimizer?tab=readme-ov-file#contracts-excluded-from-workspace
-# The optimizer ships separate multi-arch images. ARM builds are *not* bit-for-bit identical to the
-# canonical x86_64 build (see README notice in CosmWasm/optimizer).  For reproducible artefacts we
-# therefore always run the amd64 variant by default.
-#   Override with :
-#   $ COSMWASM_OPTIMIZER_IMAGE=cosmwasm/optimizer-arm64:0.17.0 make contracts-publish
-#
-COSMWASM_OPTIMIZER_IMAGE ?= cosmwasm/optimizer:0.17.0
-COSMWASM_OPTIMIZER_PLATFORM ?= linux/amd64
-
-# Ensure clean build environment and run the optimizer
-optimize-contracts:
-	@rm -rf artifacts 2>/dev/null || true
-	@echo "=== Ensuring clean build environment"
-	docker volume rm nym_contracts_cache 2>/dev/null || true
-	docker volume rm registry_cache 2>/dev/null || true
-	@for DIR in $(CONTRACT_DIRS); do \
-	  echo "=== Optimizing $${DIR}"; \
-	  docker run --rm --platform $(COSMWASM_OPTIMIZER_PLATFORM) \
-	    -v $(CURDIR):/code \
-	    --mount type=volume,source=nym_contracts_cache,target=/target \
-	    --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
-	    -e CARGO_BUILD_INCREMENTAL=false \
-	    -e RUSTFLAGS="-C target-cpu=generic -C debuginfo=0" \
-	    -e SOURCE_DATE_EPOCH=1 \
-	    $(COSMWASM_OPTIMIZER_IMAGE) $${DIR}; \
-	done
-	@mkdir -p $(CONTRACTS_OUT_DIR)
-	@cp artifacts/*.wasm $(CONTRACTS_OUT_DIR)/ 2>/dev/null || true
-
-	@cd $(CONTRACTS_OUT_DIR) && sha256sum *.wasm > checksums.txt
-	# Cleanup temporary artefacts directory
-	@rm -rf artifacts 2>/dev/null || true
+contracts: build-release-contracts wasm-opt-contracts cosmwasm-check-contracts

 wasm-opt-contracts:
-	@for WASM in $(WASM_CONTRACT_DIR)/*.wasm; do \
-	  echo "Running wasm-opt on $$WASM"; \
-	  wasm-opt --signext-lowering -Os $$WASM -o $$WASM ; \
+	for contract in $(CONTRACTS_WASM); do \
+	  wasm-opt --signext-lowering -Os $(CONTRACTS_OUT_DIR)/$$contract -o $(CONTRACTS_OUT_DIR)/$$contract; \
 	done

 cosmwasm-check-contracts:
-	@for WASM in $(WASM_CONTRACT_DIR)/*.wasm; do \
-	  echo "Checking $$WASM"; \
-	  cosmwasm-check $$WASM ; \
+	for contract in $(CONTRACTS_WASM); do \
+	  cosmwasm-check $(CONTRACTS_OUT_DIR)/$$contract; \
 	done

-# Default development build
-contracts: build-release-contracts wasm-opt-contracts cosmwasm-check-contracts
-
-# Publishing build used by CI – deterministic Docker optimiser
-publish-contracts: optimize-contracts cosmwasm-check-contracts
-
 # Consider adding 's' to make plural consistent (beware: used in github workflow)
 contract-schema:
 	$(MAKE) -C contracts schema
@@ -1,6 +1,6 @@
 [package]
 name = "nym-client"
-version = "1.1.58"
+version = "1.1.57"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 description = "Implementation of the Nym Client"
 edition = "2021"
@@ -1,6 +1,6 @@
 [package]
 name = "nym-socks5-client"
-version = "1.1.58"
+version = "1.1.57"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 description = "A SOCKS5 localhost proxy that converts incoming messages to Sphinx and sends them to a Nym address"
 edition = "2021"
@@ -15,7 +15,8 @@ bs58 = { workspace = true }
 clap = { workspace = true, optional = true }
 comfy-table = { workspace = true, optional = true }
 futures = { workspace = true }
-humantime = { workspace = true }
+humantime-serde = { workspace = true }
+log = { workspace = true }
 rand = { workspace = true }
 rand_chacha = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
@@ -24,18 +25,20 @@ sha2 = { workspace = true }
 si-scale = { workspace = true }
 thiserror = { workspace = true }
 url = { workspace = true, features = ["serde"] }
+tokio = { workspace = true, features = ["macros"] }
 time = { workspace = true }
-tokio = { workspace = true, features = ["sync", "macros"] }
 tracing = { workspace = true }
 zeroize = { workspace = true }

 # internal
 nym-id = { path = "../nym-id" }
 nym-bandwidth-controller = { path = "../bandwidth-controller" }
+nym-config = { path = "../config" }
 nym-crypto = { path = "../crypto" }
 nym-gateway-client = { path = "../client-libs/gateway-client" }
 nym-gateway-requests = { path = "../gateway-requests" }
 nym-http-api-client = { path = "../http-api-client" }
+nym-metrics = { path = "../nym-metrics" }
 nym-nonexhaustive-delayqueue = { path = "../nonexhaustive-delayqueue" }
 nym-sphinx = { path = "../nymsphinx" }
 nym-statistics-common = { path = "../statistics" }
@@ -57,7 +57,9 @@ const DEFAULT_MAXIMUM_ALLOWED_SURB_REQUEST_SIZE: u32 = 500;

 const DEFAULT_MAXIMUM_REPLY_SURB_REREQUEST_WAITING_PERIOD: Duration = Duration::from_secs(10);
 const DEFAULT_MAXIMUM_REPLY_SURB_DROP_WAITING_PERIOD: Duration = Duration::from_secs(5 * 60);
-const DEFAULT_MAXIMUM_REPLY_SURB_REREQUESTS: usize = 5;
+
+// 12 hours
+const DEFAULT_MAXIMUM_REPLY_SURB_AGE: Duration = Duration::from_secs(12 * 60 * 60);

 // 24 hours
 const DEFAULT_MAXIMUM_REPLY_KEY_AGE: Duration = Duration::from_secs(24 * 60 * 60);
@@ -626,9 +628,10 @@ pub struct ReplySurbs {
    #[serde(with = "humantime_serde")]
    pub maximum_reply_surb_drop_waiting_period: Duration,

-    /// Defines maximum number of times the client is going to re-request reply surbs
-    /// for clearing pending messages before giving up after making no progress.
-    pub maximum_reply_surbs_rerequests: usize,
+    /// Defines maximum amount of time given reply surb is going to be valid for.
+    /// This is going to be superseded by key rotation once implemented.
+    #[serde(with = "humantime_serde")]
+    pub maximum_reply_surb_age: Duration,

    /// Defines maximum amount of time given reply key is going to be valid for.
    /// This is going to be superseded by key rotation once implemented.
@@ -638,6 +641,9 @@ pub struct ReplySurbs {
    /// Specifies the number of mixnet hops the packet should go through. If not specified, then
    /// the default value is used.
    pub surb_mix_hops: Option<u8>,
+
+    /// Specifies if we should reset all the sender tags on startup
+    pub fresh_sender_tags: bool,
 }

 impl Default for ReplySurbs {
@@ -652,9 +658,10 @@ impl Default for ReplySurbs {
            maximum_reply_surb_rerequest_waiting_period:
                DEFAULT_MAXIMUM_REPLY_SURB_REREQUEST_WAITING_PERIOD,
            maximum_reply_surb_drop_waiting_period: DEFAULT_MAXIMUM_REPLY_SURB_DROP_WAITING_PERIOD,
-            maximum_reply_surbs_rerequests: DEFAULT_MAXIMUM_REPLY_SURB_REREQUESTS,
+            maximum_reply_surb_age: DEFAULT_MAXIMUM_REPLY_SURB_AGE,
            maximum_reply_key_age: DEFAULT_MAXIMUM_REPLY_KEY_AGE,
            surb_mix_hops: None,
+            fresh_sender_tags: false,
        }
    }
 }
@@ -189,13 +189,14 @@ impl From<ConfigV6> for Config {
                        .debug
                        .reply_surbs
                        .maximum_reply_surb_drop_waiting_period,
+                    maximum_reply_surb_age: value.debug.reply_surbs.maximum_reply_surb_age,
                    maximum_reply_key_age: value.debug.reply_surbs.maximum_reply_key_age,
                    surb_mix_hops: value.debug.reply_surbs.surb_mix_hops,
                    minimum_reply_surb_threshold_buffer: value
                        .debug
                        .reply_surbs
                        .minimum_reply_surb_threshold_buffer,
-                    ..Default::default()
+                    fresh_sender_tags: value.debug.reply_surbs.fresh_sender_tags,
                },
                stats_reporting: StatsReporting {
                    enabled: value.debug.stats_reporting.enabled,
@@ -9,11 +9,11 @@ license.workspace = true
 [dependencies]
 async-trait.workspace = true
 cosmrs.workspace = true
+log.workspace = true
 serde = { workspace = true, features = ["derive"] }
 thiserror.workspace = true
 time.workspace = true
 tokio = { workspace = true, features = ["sync"] }
-tracing.workspace = true
 url.workspace = true
 zeroize = { workspace = true, features = ["zeroize_derive"] }

@@ -7,12 +7,12 @@ use crate::{
        RawActiveGateway, RawCustomGatewayDetails, RawRegisteredGateway, RawRemoteGatewayDetails,
    },
 };
+use log::{debug, error};
 use sqlx::{
    sqlite::{SqliteAutoVacuum, SqliteSynchronous},
    ConnectOptions,
 };
 use std::path::Path;
-use tracing::{debug, error};

 #[derive(Debug, Clone)]
 pub struct StorageManager {
@@ -12,12 +12,12 @@ use crate::{
    error::ClientCoreError,
    init::types::{GatewaySelectionSpecification, GatewaySetup},
 };
+use log::info;
 use nym_client_core_gateways_storage::GatewayDetails;
 use nym_crypto::asymmetric::ed25519;
 use nym_topology::NymTopology;
 use nym_validator_client::UserAgent;
 use std::path::PathBuf;
-use tracing::info;

 #[cfg_attr(feature = "cli", derive(clap::Args))]
 #[derive(Debug, Clone)]
@@ -81,14 +81,14 @@ where

    // Attempt to use a user-provided gateway, if possible
    let user_chosen_gateway_id = common_args.gateway_id;
-    tracing::debug!("User chosen gateway id: {user_chosen_gateway_id:?}");
+    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),
        common_args.force_tls_gateway,
    );
-    tracing::debug!("Gateway selection specification: {selection_spec:?}");
+    log::debug!("Gateway selection specification: {selection_spec:?}");

    let registered_gateways = get_all_registered_identities(&details_store).await?;

@@ -12,6 +12,7 @@ use crate::{
    },
    init::types::{GatewaySelectionSpecification, GatewaySetup, InitResults},
 };
+use log::info;
 use nym_client_core_gateways_storage::GatewayDetails;
 use nym_crypto::asymmetric::ed25519;
 use nym_sphinx::addressing::Recipient;
@@ -19,7 +20,6 @@ use nym_topology::NymTopology;
 use nym_validator_client::UserAgent;
 use rand::rngs::OsRng;
 use std::path::PathBuf;
-use tracing::info;

 // we can suppress this warning (as suggested by linter itself) since we're only using it in our own code
 #[allow(async_fn_in_trait)]
@@ -130,23 +130,23 @@ where

    // Attempt to use a user-provided gateway, if possible
    let user_chosen_gateway_id = common_args.gateway;
-    tracing::debug!("User chosen gateway id: {user_chosen_gateway_id:?}");
+    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),
        common_args.force_tls_gateway,
    );
-    tracing::debug!("Gateway selection specification: {selection_spec:?}");
+    log::debug!("Gateway selection specification: {selection_spec:?}");

    // Load and potentially override config
-    tracing::debug!("Init arguments: {init_args:#?}");
+    log::debug!("Init arguments: {init_args:#?}");
    let config = C::construct_config(&init_args);
-    tracing::debug!("Constructed config: {config:#?}");
+    log::debug!("Constructed config: {config:#?}");
    let paths = config.common_paths();
    let core = config.core_config();

-    tracing::info!(
+    log::info!(
        "Using nym-api: {}",
        core.client
            .nym_api_urls
@@ -18,7 +18,6 @@ use crate::client::received_buffer::{
    ReceivedBufferRequestReceiver, ReceivedBufferRequestSender, ReceivedMessagesBufferController,
 };
 use crate::client::replies::reply_controller;
-use crate::client::replies::reply_controller::key_rotation_helpers::KeyRotationConfig;
 use crate::client::replies::reply_controller::{ReplyControllerReceiver, ReplyControllerSender};
 use crate::client::replies::reply_storage::{
    CombinedReplyStorage, PersistentReplyStorage, ReplyStorageBackend, SentReplyKeys,
@@ -35,6 +34,7 @@ use crate::init::{
 };
 use crate::{config, spawn_future};
 use futures::channel::mpsc;
+use log::*;
 use nym_bandwidth_controller::BandwidthController;
 use nym_client_core_config_types::{ForgetMe, RememberMe};
 use nym_client_core_gateways_storage::{GatewayDetails, GatewaysDetailsStore};
@@ -56,18 +56,13 @@ use nym_task::connections::{ConnectionCommandReceiver, ConnectionCommandSender,
 use nym_task::{TaskClient, TaskHandle};
 use nym_topology::provider_trait::TopologyProvider;
 use nym_topology::HardcodedTopologyProvider;
-use nym_validator_client::nym_api::NymApiClientExt;
-use nym_validator_client::{nyxd::contract_traits::DkgQueryClient, NymApiClient, UserAgent};
-use rand::prelude::SliceRandom;
+use nym_validator_client::{nyxd::contract_traits::DkgQueryClient, UserAgent};
 use rand::rngs::OsRng;
-use rand::thread_rng;
 use std::fmt::Debug;
 use std::os::raw::c_int as RawFd;
 use std::path::Path;
 use std::sync::Arc;
-use time::OffsetDateTime;
 use tokio::sync::mpsc::Sender;
-use tracing::*;
 use url::Url;

 #[cfg(all(
@@ -343,7 +338,6 @@ where
    #[allow(clippy::too_many_arguments)]
    fn start_real_traffic_controller(
        controller_config: real_messages_control::Config,
-        key_rotation_config: KeyRotationConfig,
        topology_accessor: TopologyAccessor,
        ack_receiver: AcknowledgementReceiver,
        input_receiver: InputMessageReceiver,
@@ -361,7 +355,6 @@ where

        RealMessagesController::new(
            controller_config,
-            key_rotation_config,
            ack_receiver,
            input_receiver,
            mix_sender,
@@ -460,7 +453,7 @@ where
            };

        let gateway_failure = |err| {
-            tracing::error!("Could not authenticate and start up the gateway connection - {err}");
+            log::error!("Could not authenticate and start up the gateway connection - {err}");
            ClientCoreError::GatewayClientError {
                gateway_id: details.gateway_id.to_base58_string(),
                source: Box::new(err),
@@ -562,14 +555,14 @@ where
        custom_provider: Option<Box<dyn TopologyProvider + Send + Sync>>,
        config_topology: config::Topology,
        nym_api_urls: Vec<Url>,
-        nym_api_client: NymApiClient,
+        user_agent: Option<UserAgent>,
    ) -> Box<dyn TopologyProvider + Send + Sync> {
        // if no custom provider was ... provided ..., create one using nym-api
        custom_provider.unwrap_or_else(|| {
            Box::new(NymApiTopologyProvider::new(
                config_topology,
                nym_api_urls,
-                nym_api_client,
+                user_agent,
            ))
        })
    }
@@ -605,7 +598,7 @@ where
        topology_refresher.try_refresh().await;

        if let Err(err) = topology_refresher.ensure_topology_is_routable().await {
-            tracing::error!(
+            log::error!(
                "The current network topology seem to be insufficient to route any packets through \
                - check if enough nodes and a gateway are online - source: {err}"
            );
@@ -681,26 +674,16 @@ where
    // TODO: rename it as it implies the data is persistent whilst one can use InMemBackend
    async fn setup_persistent_reply_storage(
        backend: S::ReplyStore,
-        key_rotation_config: KeyRotationConfig,
        shutdown: TaskClient,
    ) -> Result<CombinedReplyStorage, ClientCoreError>
    where
        <S::ReplyStore as ReplyStorageBackend>::StorageError: Sync + Send,
        S::ReplyStore: Send + Sync,
    {
-        tracing::trace!("Setup persistent reply storage");
-        let now = OffsetDateTime::now_utc();
-        let expected_current_key_rotation_start =
-            key_rotation_config.expected_current_key_rotation_start(now);
-        // time of the start of one epoch BEFORE the CURRENT rotation has begun
-        // this indicates the starting time of when packets with the current keys might have been constructed
-        // (i.e. any surbs OLDER than that MUST BE invalid)
-        let prior_epoch_start =
-            expected_current_key_rotation_start - key_rotation_config.epoch_duration;
-
+        log::trace!("Setup persistent reply storage");
        let persistent_storage = PersistentReplyStorage::new(backend);
        let mem_store = persistent_storage
-            .load_state_from_backend(prior_epoch_start)
+            .load_state_from_backend()
            .await
            .map_err(|err| ClientCoreError::SurbStorageError {
                source: Box::new(err),
@@ -742,23 +725,6 @@ where
        setup_gateway(setup_method, key_store, details_store).await
    }

-    fn construct_nym_api_client(config: &Config, user_agent: Option<UserAgent>) -> NymApiClient {
-        let mut nym_api_urls = config.get_nym_api_endpoints();
-        nym_api_urls.shuffle(&mut thread_rng());
-
-        if let Some(user_agent) = user_agent {
-            NymApiClient::new_with_user_agent(nym_api_urls[0].clone(), user_agent)
-        } else {
-            NymApiClient::new(nym_api_urls[0].clone())
-        }
-    }
-
-    async fn determine_key_rotation_state(
-        client: &NymApiClient,
-    ) -> Result<KeyRotationConfig, ClientCoreError> {
-        Ok(client.nym_api.get_key_rotation_info().await?.into())
-    }
-
    pub async fn start_base(mut self) -> Result<BaseClient, ClientCoreError>
    where
        S::ReplyStore: Send + Sync,
@@ -823,14 +789,11 @@ where
            .dkg_query_client
            .map(|client| BandwidthController::new(credential_store, client));

-        let nym_api_client = Self::construct_nym_api_client(&self.config, self.user_agent.clone());
-        let key_rotation_config = Self::determine_key_rotation_state(&nym_api_client).await?;
-
        let topology_provider = Self::setup_topology_provider(
            self.custom_topology_provider.take(),
            self.config.debug.topology,
            self.config.get_nym_api_endpoints(),
-            nym_api_client,
+            self.user_agent.clone(),
        );

        let stats_reporter = Self::start_statistics_control(
@@ -875,7 +838,6 @@ where

        let reply_storage = Self::setup_persistent_reply_storage(
            reply_storage_backend,
-            key_rotation_config,
            shutdown.fork("persistent_reply_storage"),
        )
        .await?;
@@ -916,7 +878,6 @@ where

        Self::start_real_traffic_controller(
            controller_config,
-            key_rotation_config,
            shared_topology_accessor.clone(),
            ack_receiver,
            input_receiver,
@@ -7,13 +7,13 @@ use crate::{
    config::Config,
    error::ClientCoreError,
 };
+use log::{error, info, trace};
 use nym_bandwidth_controller::BandwidthController;
 use nym_client_core_gateways_storage::OnDiskGatewaysDetails;
 use nym_credential_storage::storage::Storage as CredentialStorage;
 use nym_validator_client::{nyxd, QueryHttpRpcNyxdClient};
 use std::{io, path::Path};
 use time::OffsetDateTime;
-use tracing::{error, info, trace};
 use url::Url;

 async fn setup_fresh_backend<P: AsRef<Path>>(
@@ -90,7 +90,7 @@ pub async fn setup_fs_reply_surb_backend<P: AsRef<Path>>(
    let db_path = db_path.as_ref();
    if db_path.exists() {
        info!("Loading existing surb database");
-        match fs_backend::Backend::try_load(db_path).await {
+        match fs_backend::Backend::try_load(db_path, surb_config.fresh_sender_tags).await {
            Ok(backend) => Ok(backend),
            Err(err) => {
                error!("setup_fs_reply_surb_backend: Failed to setup persistent storage backend for our reply needs: {err}. We're going to create a fresh database instead. This behaviour might change in the future");
@@ -6,6 +6,7 @@ use crate::client::topology_control::TopologyAccessor;
 use crate::{config, spawn_future};
 use futures::task::{Context, Poll};
 use futures::{Future, Stream, StreamExt};
+use log::*;
 use nym_sphinx::acknowledgements::AckKey;
 use nym_sphinx::addressing::clients::Recipient;
 use nym_sphinx::cover::generate_loop_cover_packet;
@@ -18,7 +19,6 @@ use std::pin::Pin;
 use std::sync::Arc;
 use std::time::Duration;
 use tokio::sync::mpsc::error::TrySendError;
-use tracing::*;

 #[cfg(not(target_arch = "wasm32"))]
 use tokio::time::{sleep, Sleep};
@@ -210,10 +210,10 @@ impl LoopCoverTrafficStream<OsRng> {
                TrySendError::Full(_) => {
                    // This isn't a problem, if the channel is full means we're already sending the
                    // max amount of messages downstream can handle.
-                    tracing::debug!("Failed to send cover message - channel full");
+                    log::debug!("Failed to send cover message - channel full");
                }
                TrySendError::Closed(_) => {
-                    tracing::warn!("Failed to send cover message - channel closed");
+                    log::warn!("Failed to send cover message - channel closed");
                }
            }
        } else {
@@ -258,20 +258,20 @@ impl LoopCoverTrafficStream<OsRng> {
                tokio::select! {
                    biased;
                    _ = shutdown.recv() => {
-                        tracing::trace!("LoopCoverTrafficStream: Received shutdown");
+                        log::trace!("LoopCoverTrafficStream: Received shutdown");
                    }
                    next = self.next() => {
                        if next.is_some() {
                            self.on_new_message().await;
                        } else {
-                            tracing::trace!("LoopCoverTrafficStream: Stopping since channel closed");
+                            log::trace!("LoopCoverTrafficStream: Stopping since channel closed");
                            break;
                        }
                    }
                }
            }
            shutdown.recv_timeout().await;
-            tracing::debug!("LoopCoverTrafficStream: Exiting");
+            log::debug!("LoopCoverTrafficStream: Exiting");
        })
    }
 }
@@ -135,9 +135,7 @@ impl InputMessage {
            recipient_tag,
            data,
            lane,
-            // \/ set it to SOME sane default so that if we run out of surbs and constantly
-            // fail to request more, we wouldn't be stuck in limbo
-            max_retransmissions: Some(10),
+            max_retransmissions: None,
        };
        if let Some(packet_type) = packet_type {
            InputMessage::new_wrapper(message, packet_type)
@@ -4,10 +4,10 @@
 use crate::client::mix_traffic::transceiver::GatewayTransceiver;
 use crate::error::ClientCoreError;
 use crate::spawn_future;
+use log::*;
 use nym_gateway_requests::ClientRequest;
 use nym_sphinx::forwarding::packet::MixPacket;
 use nym_task::TaskClient;
-use tracing::*;
 use transceiver::ErasedGatewayError;

 pub type BatchMixMessageSender = tokio::sync::mpsc::Sender<Vec<MixPacket>>;
@@ -138,7 +138,7 @@ impl MixTrafficController {
                            }
                        },
                        None => {
-                            tracing::trace!("MixTrafficController: Stopping since channel closed");
+                            log::trace!("MixTrafficController: Stopping since channel closed");
                            break;
                        }
                    },
@@ -150,18 +150,18 @@ impl MixTrafficController {
                            };
                        },
                        None => {
-                            tracing::trace!("MixTrafficController, client request channel closed");
+                            log::trace!("MixTrafficController, client request channel closed");
                        }
                    },
                    _ = self.task_client.recv() => {
-                        tracing::trace!("MixTrafficController: Received shutdown");
+                        log::trace!("MixTrafficController: Received shutdown");
                        break;
                    }
                }
            }
            self.task_client.recv_timeout().await;

-            tracing::debug!("MixTrafficController: Exiting");
+            log::debug!("MixTrafficController: Exiting");
        });
    }
 }
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0

 use async_trait::async_trait;
+use log::{debug, error};
 use nym_credential_storage::storage::Storage as CredentialStorage;
 use nym_crypto::asymmetric::ed25519;
 use nym_gateway_client::error::GatewayClientError;
@@ -13,7 +14,6 @@ use nym_validator_client::nyxd::contract_traits::DkgQueryClient;
 use std::fmt::Debug;
 use std::os::raw::c_int as RawFd;
 use thiserror::Error;
-use tracing::{debug, error};

 #[cfg(not(target_arch = "wasm32"))]
 use futures::channel::oneshot;
@@ -27,7 +27,7 @@ fn erase_err<E: std::error::Error + Send + Sync + 'static>(err: E) -> ErasedGate
    ErasedGatewayError(Box::new(err))
 }

-/// This combines the functionalities of being able to send and receive mix packets.
+/// This combines combines the functionalities of being able to send and receive mix packets.
 #[async_trait]
 pub trait GatewayTransceiver: GatewaySender + GatewayReceiver {
    fn gateway_identity(&self) -> ed25519::PublicKey;
@@ -87,7 +87,7 @@ impl<G: GatewayTransceiver + ?Sized + Send> GatewayTransceiver for Box<G> {
        message: ClientRequest,
    ) -> Result<(), GatewayClientError> {
        let _ = (**self).send_client_request(message.clone()).await?;
-        tracing::debug!("Sent client request: {:?}", message);
+        log::debug!("Sent client request: {:?}", message);
        Ok(())
    }
 }
@@ -5,6 +5,7 @@ use super::action_controller::{AckActionSender, Action};
 use nym_statistics_common::clients::{packet_statistics::PacketStatisticsEvent, ClientStatsSender};

 use futures::StreamExt;
+use log::*;
 use nym_gateway_client::AcknowledgementReceiver;
 use nym_sphinx::{
    acknowledgements::{identifier::recover_identifier, AckKey},
@@ -12,7 +13,6 @@ use nym_sphinx::{
 };
 use nym_task::TaskClient;
 use std::sync::Arc;
-use tracing::*;

 /// Module responsible for listening for any data resembling acknowledgements from the network
 /// and firing actions to remove them from the 'Pending' state.
@@ -93,16 +93,16 @@ impl AcknowledgementListener {
                acks = self.ack_receiver.next() => match acks {
                    Some(acks) => self.handle_ack_receiver_item(acks).await,
                    None => {
-                        tracing::trace!("AcknowledgementListener: Stopping since channel closed");
+                        log::trace!("AcknowledgementListener: Stopping since channel closed");
                        break;
                    }
                },
                _ = self.task_client.recv() => {
-                    tracing::trace!("AcknowledgementListener: Received shutdown");
+                    log::trace!("AcknowledgementListener: Received shutdown");
                }
            }
        }
        self.task_client.recv_timeout().await;
-        tracing::debug!("AcknowledgementListener: Exiting");
+        log::debug!("AcknowledgementListener: Exiting");
    }
 }
@@ -5,6 +5,7 @@ use super::PendingAcknowledgement;
 use crate::client::real_messages_control::acknowledgement_control::RetransmissionRequestSender;
 use futures::channel::mpsc;
 use futures::StreamExt;
+use log::*;
 use nym_nonexhaustive_delayqueue::{Expired, NonExhaustiveDelayQueue, QueueKey};
 use nym_sphinx::chunking::fragment::FragmentIdentifier;
 use nym_sphinx::Delay as SphinxDelay;
@@ -12,7 +13,6 @@ use nym_task::TaskClient;
 use std::collections::HashMap;
 use std::sync::Arc;
 use std::time::Duration;
-use tracing::*;

 pub(crate) type AckActionSender = mpsc::UnboundedSender<Action>;
 pub(crate) type AckActionReceiver = mpsc::UnboundedReceiver<Action>;
@@ -229,7 +229,7 @@ impl ActionController {
                .unbounded_send(Arc::downgrade(pending_ack_data))
            {
                if !self.task_client.is_shutdown_poll() {
-                    tracing::error!("Failed to send pending ack for retransmission: {err}");
+                    log::error!("Failed to send pending ack for retransmission: {err}");
                }
            }
        } else {
@@ -257,7 +257,7 @@ impl ActionController {
                action = self.incoming_actions.next() => match action {
                    Some(action) => self.process_action(action),
                    None => {
-                        tracing::trace!(
+                        log::trace!(
                            "ActionController: Stopping since incoming actions channel closed"
                        );
                        break;
@@ -266,17 +266,17 @@ impl ActionController {
                expired_ack = self.pending_acks_timers.next() => match expired_ack {
                    Some(expired_ack) => self.handle_expired_ack_timer(expired_ack),
                    None => {
-                        tracing::trace!("ActionController: Stopping since ack channel closed");
+                        log::trace!("ActionController: Stopping since ack channel closed");
                        break;
                    }
                },
                _ = self.task_client.recv() => {
-                    tracing::trace!("ActionController: Received shutdown");
+                    log::trace!("ActionController: Received shutdown");
                    break;
                }
            }
        }
        self.task_client.recv_timeout().await;
-        tracing::debug!("ActionController: Exiting");
+        log::debug!("ActionController: Exiting");
    }
 }
@@ -5,6 +5,7 @@ use crate::client::inbound_messages::{InputMessage, InputMessageReceiver};
 use crate::client::real_messages_control::message_handler::MessageHandler;
 use crate::client::real_messages_control::real_traffic_stream::RealMessage;
 use crate::client::replies::reply_controller::ReplyControllerSender;
+use log::*;
 use nym_sphinx::addressing::clients::Recipient;
 use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag;
 use nym_sphinx::forwarding::packet::MixPacket;
@@ -12,7 +13,6 @@ use nym_sphinx::params::PacketType;
 use nym_task::connections::TransmissionLane;
 use nym_task::TaskClient;
 use rand::{CryptoRng, Rng};
-use tracing::*;

 /// Module responsible for dealing with the received messages: splitting them, creating acknowledgements,
 /// putting everything into sphinx packets, etc.
@@ -228,16 +228,16 @@ where
                        self.on_input_message(input_msg).await;
                    },
                    None => {
-                        tracing::trace!("InputMessageListener: Stopping since channel closed");
+                        log::trace!("InputMessageListener: Stopping since channel closed");
                        break;
                    }
                },
                _ = self.task_client.recv() => {
-                    tracing::trace!("InputMessageListener: Received shutdown");
+                    log::trace!("InputMessageListener: Received shutdown");
                }
            }
        }
        self.task_client.recv_timeout().await;
-        tracing::debug!("InputMessageListener: Exiting");
+        log::debug!("InputMessageListener: Exiting");
    }
 }
@@ -13,6 +13,7 @@ use crate::client::replies::reply_controller::ReplyControllerSender;
 use crate::spawn_future;
 use action_controller::AckActionReceiver;
 use futures::channel::mpsc;
+use log::*;
 use nym_gateway_client::AcknowledgementReceiver;
 use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag;
 use nym_sphinx::params::{PacketSize, PacketType};
@@ -29,7 +30,6 @@ use std::{
    sync::{Arc, Weak},
    time::Duration,
 };
-use tracing::*;

 pub(crate) use action_controller::{AckActionSender, Action};

@@ -10,13 +10,13 @@ use crate::client::real_messages_control::message_handler::{MessageHandler, Prep
 use crate::client::real_messages_control::real_traffic_stream::RealMessage;
 use crate::client::replies::reply_controller::ReplyControllerSender;
 use futures::StreamExt;
+use log::*;
 use nym_sphinx::chunking::fragment::Fragment;
 use nym_sphinx::preparer::PreparedFragment;
 use nym_sphinx::{addressing::clients::Recipient, params::PacketType};
 use nym_task::{connections::TransmissionLane, TaskClient};
 use rand::{CryptoRng, Rng};
 use std::sync::{Arc, Weak};
-use tracing::*;

 // responsible for packet retransmission upon fired timer
 pub(super) struct RetransmissionRequestListener<R> {
@@ -182,16 +182,16 @@ where
                timed_out_ack = self.request_receiver.next() => match timed_out_ack {
                    Some(timed_out_ack) => self.on_retransmission_request(timed_out_ack, packet_type).await,
                    None => {
-                        tracing::trace!("RetransmissionRequestListener: Stopping since channel closed");
+                        log::trace!("RetransmissionRequestListener: Stopping since channel closed");
                        break;
                    }
                },
                _ = self.task_client.recv() => {
-                    tracing::trace!("RetransmissionRequestListener: Received shutdown");
+                    log::trace!("RetransmissionRequestListener: Received shutdown");
                }
            }
        }
        self.task_client.recv_timeout().await;
-        tracing::debug!("RetransmissionRequestListener: Exiting");
+        log::debug!("RetransmissionRequestListener: Exiting");
    }
 }
@@ -4,9 +4,9 @@
 use super::action_controller::{AckActionSender, Action};
 use super::SentPacketNotificationReceiver;
 use futures::StreamExt;
+use log::*;
 use nym_sphinx::chunking::fragment::{FragmentIdentifier, COVER_FRAG_ID};
 use nym_task::TaskClient;
-use tracing::*;

 /// Module responsible for starting up retransmission timers.
 /// It is required because when we send our packet to the `real traffic stream` controlled
@@ -56,17 +56,17 @@ impl SentNotificationListener {
                        self.on_sent_message(frag_id).await;
                    }
                    None => {
-                        tracing::trace!("SentNotificationListener: Stopping since channel closed");
+                        log::trace!("SentNotificationListener: Stopping since channel closed");
                        break;
                    }
                },
                _ = self.task_client.recv() => {
-                    tracing::trace!("SentNotificationListener: Received shutdown");
+                    log::trace!("SentNotificationListener: Received shutdown");
                    break;
                }
            }
        }
        assert!(self.task_client.is_shutdown_poll());
-        tracing::debug!("SentNotificationListener: Exiting");
+        log::debug!("SentNotificationListener: Exiting");
    }
 }
@@ -9,7 +9,6 @@ use crate::client::real_messages_control::{AckActionSender, Action};
 use crate::client::replies::reply_controller::MaxRetransmissions;
 use crate::client::replies::reply_storage::{ReceivedReplySurbsMap, SentReplyKeys, UsedSenderTags};
 use crate::client::topology_control::{TopologyAccessor, TopologyReadPermit};
-use nym_client_core_surb_storage::RetrievedReplySurb;
 use nym_sphinx::acknowledgements::AckKey;
 use nym_sphinx::addressing::clients::Recipient;
 use nym_sphinx::anonymous_replies::requests::{AnonymousSenderTag, RepliableMessage, ReplyMessage};
@@ -45,7 +44,10 @@ pub enum PreparationError {
 }

 impl PreparationError {
-    fn return_surbs(self, returned_surbs: Vec<RetrievedReplySurb>) -> SurbWrappedPreparationError {
+    fn return_surbs(
+        self,
+        returned_surbs: Vec<ReplySurbWithKeyRotation>,
+    ) -> SurbWrappedPreparationError {
        SurbWrappedPreparationError {
            source: self,
            returned_surbs: Some(returned_surbs),
@@ -59,7 +61,7 @@ pub struct SurbWrappedPreparationError {
    #[source]
    source: PreparationError,

-    returned_surbs: Option<Vec<RetrievedReplySurb>>,
+    returned_surbs: Option<Vec<ReplySurbWithKeyRotation>>,
 }

 impl<T> From<T> for SurbWrappedPreparationError
@@ -81,7 +83,7 @@ impl SurbWrappedPreparationError {
        target: &AnonymousSenderTag,
    ) -> PreparationError {
        if let Some(reply_surbs) = self.returned_surbs {
-            surb_storage.re_insert_reply_surbs(target, reply_surbs)
+            surb_storage.insert_surbs(target, reply_surbs)
        }
        self.source
    }
@@ -229,10 +231,6 @@ where
        }
    }

-    pub(crate) fn topology_access_handle(&self) -> &TopologyAccessor {
-        &self.topology_access
-    }
-
    fn get_or_create_sender_tag(&mut self, recipient: &Recipient) -> AnonymousSenderTag {
        if let Some(existing) = self.tag_storage.try_get_existing(recipient) {
            trace!("we already had sender tag for {recipient}");
@@ -300,7 +298,7 @@ where
        &mut self,
        target: AnonymousSenderTag,
        message: ReplyMessage,
-        reply_surb: RetrievedReplySurb,
+        reply_surb: ReplySurbWithKeyRotation,
        is_extra_surb_request: bool,
    ) -> Result<(), SurbWrappedPreparationError> {
        let msg = NymMessage::new_reply(message);
@@ -331,10 +329,7 @@ where
            Some(chunk.fragment_identifier()),
        );
        let delay = prepared_fragment.total_delay;
-
-        // we have to set a maximum number of retransmissions in case we fail to retrieve
-        // surbs for a long period of time; we don't want to be stuck constantly resending the data
-        let max_retransmissions = Some(10);
+        let max_retransmissions = None;
        let pending_ack = PendingAcknowledgement::new_anonymous(
            chunk,
            delay,
@@ -357,7 +352,7 @@ where
    pub(crate) async fn try_request_additional_reply_surbs(
        &mut self,
        from: AnonymousSenderTag,
-        reply_surb: RetrievedReplySurb,
+        reply_surb: ReplySurbWithKeyRotation,
        amount: u32,
    ) -> Result<(), SurbWrappedPreparationError> {
        debug!("requesting {amount} reply SURBs from {from}");
@@ -397,9 +392,11 @@ where
        &mut self,
        target: AnonymousSenderTag,
        fragments: Vec<FragmentWithMaxRetransmissions>,
-        reply_surbs: impl IntoIterator<Item = RetrievedReplySurb>,
+        reply_surbs: Vec<ReplySurbWithKeyRotation>,
        lane: TransmissionLane,
    ) -> Result<(), SurbWrappedPreparationError> {
+        // TODO: technically this is performing an unnecessary cloning, but in the grand scheme of things
+        // is it really that bad?
        self.try_send_reply_chunks(
            target,
            fragments.into_iter().map(|f| (lane, f)).collect(),
@@ -412,7 +409,7 @@ where
        &mut self,
        target: AnonymousSenderTag,
        fragments: Vec<(TransmissionLane, FragmentWithMaxRetransmissions)>,
-        reply_surbs: impl IntoIterator<Item = RetrievedReplySurb>,
+        reply_surbs: Vec<ReplySurbWithKeyRotation>,
    ) -> Result<(), SurbWrappedPreparationError> {
        let prepared_fragments = self
            .prepare_reply_chunks_for_sending(
@@ -574,7 +571,7 @@ where
        )
        .await?;

-        tracing::trace!("storing {} reply keys", reply_keys.len());
+        log::trace!("storing {} reply keys", reply_keys.len());
        self.reply_key_storage.insert_multiple(reply_keys);

        Ok(())
@@ -614,7 +611,7 @@ where
        )
        .await?;

-        tracing::trace!("storing {} reply keys", reply_keys.len());
+        log::trace!("storing {} reply keys", reply_keys.len());
        self.reply_key_storage.insert_multiple(reply_keys);

        Ok(())
@@ -644,12 +641,20 @@ where
    pub(crate) async fn prepare_reply_chunks_for_sending(
        &mut self,
        fragments: Vec<Fragment>,
-        reply_surbs: impl IntoIterator<Item = RetrievedReplySurb>,
+        reply_surbs: Vec<ReplySurbWithKeyRotation>,
    ) -> Result<Vec<PreparedFragment>, SurbWrappedPreparationError> {
+        debug_assert_eq!(
+            fragments.len(),
+            reply_surbs.len(),
+            "attempted to send {} fragments with {} reply surbs",
+            fragments.len(),
+            reply_surbs.len()
+        );
+
        let topology_permit = self.topology_access.get_read_permit().await;
        let topology = match self.get_topology(&topology_permit) {
            Ok(topology) => topology,
-            Err(err) => return Err(err.return_surbs(reply_surbs.into_iter().collect())),
+            Err(err) => return Err(err.return_surbs(reply_surbs)),
        };

        Ok(fragments
@@ -662,7 +667,7 @@ where
                        fragment,
                        topology,
                        &self.config.ack_key,
-                        reply_surb.into(),
+                        reply_surb,
                        PacketType::Mix,
                    )
                    .unwrap()
@@ -672,7 +677,7 @@ where

    pub(crate) async fn try_prepare_single_reply_chunk_for_sending(
        &mut self,
-        reply_surb: RetrievedReplySurb,
+        reply_surb: ReplySurbWithKeyRotation,
        chunk: Fragment,
    ) -> Result<PreparedFragment, SurbWrappedPreparationError> {
        let topology_permit = self.topology_access.get_read_permit().await;
@@ -685,7 +690,7 @@ where
            chunk,
            topology,
            &self.config.ack_key,
-            reply_surb.into(),
+            reply_surb,
            PacketType::Mix,
        )?;

@@ -24,6 +24,7 @@ use crate::{
    spawn_future,
 };
 use futures::channel::mpsc;
+use log::*;
 use nym_gateway_client::AcknowledgementReceiver;
 use nym_sphinx::acknowledgements::AckKey;
 use nym_sphinx::addressing::clients::Recipient;
@@ -33,9 +34,7 @@ use nym_task::connections::{ConnectionCommandReceiver, LaneQueueLengths};
 use nym_task::TaskClient;
 use rand::{rngs::OsRng, CryptoRng, Rng};
 use std::sync::Arc;
-use tracing::*;

-use crate::client::replies::reply_controller::key_rotation_helpers::KeyRotationConfig;
 pub(crate) use acknowledgement_control::{AckActionSender, Action};

 pub(crate) mod acknowledgement_control;
@@ -86,6 +85,12 @@ impl<'a> From<&'a Config> for real_traffic_stream::Config {
    }
 }

+impl<'a> From<&'a Config> for reply_controller::Config {
+    fn from(cfg: &'a Config) -> Self {
+        reply_controller::Config::new(cfg.reply_surbs)
+    }
+}
+
 impl<'a> From<&'a Config> for message_handler::Config {
    fn from(cfg: &'a Config) -> Self {
        message_handler::Config::new(
@@ -134,7 +139,6 @@ impl RealMessagesController<OsRng> {
    #[allow(clippy::too_many_arguments)]
    pub(crate) fn new(
        config: Config,
-        key_rotation_config: KeyRotationConfig,
        ack_receiver: AcknowledgementReceiver,
        input_receiver: InputMessageReceiver,
        mix_sender: BatchMixMessageSender,
@@ -165,8 +169,7 @@ impl RealMessagesController<OsRng> {
        // create all configs for the components
        let ack_control_config = (&config).into();
        let out_queue_config = (&config).into();
-        let reply_controller_config =
-            reply_controller::Config::new(config.reply_surbs, key_rotation_config);
+        let reply_controller_config = (&config).into();
        let message_handler_config = (&config).into();

        // create the actual components
@@ -9,6 +9,7 @@ use crate::client::transmission_buffer::TransmissionBuffer;
 use crate::config;
 use futures::task::{Context, Poll};
 use futures::{Future, Stream, StreamExt};
+use log::*;
 use nym_sphinx::acknowledgements::AckKey;
 use nym_sphinx::addressing::clients::Recipient;
 use nym_sphinx::chunking::fragment::FragmentIdentifier;
@@ -26,7 +27,6 @@ use rand::{CryptoRng, Rng};
 use std::pin::Pin;
 use std::sync::Arc;
 use std::time::Duration;
-use tracing::*;

 #[cfg(not(target_arch = "wasm32"))]
 use tokio::time::{sleep, Sleep};
@@ -280,7 +280,7 @@ where

        if let Err(err) = self.mix_tx.send(vec![next_message]).await {
            if !self.task_client.is_shutdown_poll() {
-                tracing::error!("Failed to send: {err}");
+                log::error!("Failed to send: {err}");
            }
        } else {
            let event = if fragment_id.is_some() {
@@ -313,7 +313,7 @@ where
    }

    fn on_close_connection(&mut self, connection_id: ConnectionId) {
-        tracing::debug!("Removing lane for connection: {connection_id}");
+        log::debug!("Removing lane for connection: {connection_id}");
        self.transmission_buffer
            .remove(&TransmissionLane::ConnectionId(connection_id));
    }
@@ -325,7 +325,7 @@ where

    fn adjust_current_average_message_sending_delay(&mut self) {
        let used_slots = self.mix_tx.max_capacity() - self.mix_tx.capacity();
-        tracing::trace!(
+        log::trace!(
            "used_slots: {used_slots}, current_multiplier: {}",
            self.sending_delay_controller.current_multiplier()
        );
@@ -334,7 +334,7 @@ where
            .sending_delay_controller
            .is_backpressure_currently_detected(used_slots)
        {
-            tracing::trace!("Backpressure detected");
+            log::trace!("Backpressure detected");
            self.sending_delay_controller.record_backpressure_detected();
        }

@@ -436,7 +436,7 @@ where
                Poll::Ready(None) => Poll::Ready(None),

                Poll::Ready(Some((real_messages, conn_id))) => {
-                    tracing::trace!("handling real_messages: size: {}", real_messages.len());
+                    log::trace!("handling real_messages: size: {}", real_messages.len());

                    self.transmission_buffer.store(&conn_id, real_messages);
                    let real_next = self.pop_next_message().expect("Just stored one");
@@ -483,7 +483,7 @@ where
            Poll::Ready(None) => Poll::Ready(None),

            Poll::Ready(Some((real_messages, conn_id))) => {
-                tracing::trace!("handling real_messages: size: {}", real_messages.len());
+                log::trace!("handling real_messages: size: {}", real_messages.len());

                // First store what we got for the given connection id
                self.transmission_buffer.store(&conn_id, real_messages);
@@ -538,11 +538,11 @@ where
        };

        if packets > 1000 {
-            tracing::warn!("{status_str}");
+            log::warn!("{status_str}");
        } else if packets > 0 {
-            tracing::info!("{status_str}");
+            log::info!("{status_str}");
        } else {
-            tracing::debug!("{status_str}");
+            log::debug!("{status_str}");
        }

        // Send status message to whoever is listening (possibly UI)
@@ -566,7 +566,7 @@ where
                tokio::select! {
                    biased;
                    _ = shutdown.recv() => {
-                        tracing::trace!("OutQueueControl: Received shutdown");
+                        log::trace!("OutQueueControl: Received shutdown");
                        break;
                    }
                    _ = status_timer.tick() => {
@@ -575,7 +575,7 @@ where
                    next_message = self.next() => if let Some(next_message) = next_message {
                        self.on_message(next_message).await;
                    } else {
-                        tracing::trace!("OutQueueControl: Stopping since channel closed");
+                        log::trace!("OutQueueControl: Stopping since channel closed");
                        break;
                    }
                }
@@ -589,18 +589,18 @@ where
                tokio::select! {
                    biased;
                    _ = shutdown.recv() => {
-                        tracing::trace!("OutQueueControl: Received shutdown");
+                        log::trace!("OutQueueControl: Received shutdown");
                    }
                    next_message = self.next() => if let Some(next_message) = next_message {
                        self.on_message(next_message).await;
                    } else {
-                        tracing::trace!("OutQueueControl: Stopping since channel closed");
+                        log::trace!("OutQueueControl: Stopping since channel closed");
                        break;
                    }
                }
            }
        }
-        tracing::debug!("OutQueueControl: Exiting");
+        log::debug!("OutQueueControl: Exiting");
    }
 }

@@ -98,12 +98,12 @@ impl SendingDelayController {
            self.current_multiplier =
                (self.current_multiplier + 1).clamp(self.lower_bound, self.upper_bound);
            self.time_when_changed = get_time_now();
-            tracing::debug!(
+            log::debug!(
                "Increasing sending delay multiplier to: {}",
                self.current_multiplier
            );
        } else {
-            tracing::warn!("Trying to increase delay multipler higher than allowed");
+            log::warn!("Trying to increase delay multipler higher than allowed");
        }
    }

@@ -112,7 +112,7 @@ impl SendingDelayController {
            self.current_multiplier =
                (self.current_multiplier - 1).clamp(self.lower_bound, self.upper_bound);
            self.time_when_changed = get_time_now();
-            tracing::debug!(
+            log::debug!(
                "Decreasing sending delay multiplier to: {}",
                self.current_multiplier
            );
@@ -164,11 +164,11 @@ impl SendingDelayController {
                self.current_multiplier()
            );
            if self.current_multiplier() > 0 {
-                tracing::debug!("{status_str}");
+                log::debug!("{status_str}");
            } else if self.current_multiplier() > 1 {
-                tracing::info!("{status_str}");
+                log::info!("{status_str}");
            } else if self.current_multiplier() > 2 {
-                tracing::warn!("{status_str}");
+                log::warn!("{status_str}");
            }
            self.time_when_logged_about_elevated_multiplier = now;
        }
@@ -8,6 +8,7 @@ use crate::spawn_future;
 use futures::channel::mpsc;
 use futures::lock::Mutex;
 use futures::StreamExt;
+use log::*;
 use nym_crypto::asymmetric::x25519;
 use nym_crypto::Digest;
 use nym_gateway_client::MixnetMessageReceiver;
@@ -23,7 +24,6 @@ use nym_task::TaskClient;
 use std::collections::HashSet;
 use std::sync::Arc;
 use std::time::{Duration, Instant};
-use tracing::*;

 // The interval at which we check for stale buffers
 const STALE_BUFFER_CHECK_INTERVAL: Duration = Duration::from_secs(10);
@@ -307,15 +307,13 @@ impl<R: MessageReceiver> ReceivedMessagesBuffer<R> {
                }
            };

-            if !reply_surbs.is_empty() {
-                if let Err(err) = self.reply_controller_sender.send_additional_surbs(
-                    msg.sender_tag,
-                    reply_surbs,
-                    from_surb_request,
-                ) {
-                    if !self.task_client.is_shutdown_poll() {
-                        error!("{err}");
-                    }
+            if let Err(err) = self.reply_controller_sender.send_additional_surbs(
+                msg.sender_tag,
+                reply_surbs,
+                from_surb_request,
+            ) {
+                if !self.task_client.is_shutdown_poll() {
+                    error!("{err}");
                }
            }
        }
@@ -499,20 +497,20 @@ impl<R: MessageReceiver> RequestReceiver<R> {
            tokio::select! {
                biased;
                _ = self.task_client.recv() => {
-                    tracing::trace!("RequestReceiver: Received shutdown");
+                    log::trace!("RequestReceiver: Received shutdown");
                }
                request = self.query_receiver.next() => {
                    if let Some(message) = request {
                        self.handle_message(message).await
                    } else {
-                        tracing::trace!("RequestReceiver: Stopping since channel closed");
+                        log::trace!("RequestReceiver: Stopping since channel closed");
                        break;
                    }
                },
            }
        }
        self.task_client.recv().await;
-        tracing::debug!("RequestReceiver: Exiting");
+        log::debug!("RequestReceiver: Exiting");
    }
 }

@@ -543,17 +541,17 @@ impl<R: MessageReceiver> FragmentedMessageReceiver<R> {
                    if let Some(new_messages) = new_messages {
                        self.received_buffer.handle_new_received(new_messages).await?;
                    } else {
-                        tracing::trace!("FragmentedMessageReceiver: Stopping since channel closed");
+                        log::trace!("FragmentedMessageReceiver: Stopping since channel closed");
                        break;
                    }
                },
                _ = self.task_client.recv_with_delay() => {
-                    tracing::trace!("FragmentedMessageReceiver: Received shutdown");
+                    log::trace!("FragmentedMessageReceiver: Received shutdown");
                }
            }
        }
        self.task_client.recv_timeout().await;
-        tracing::debug!("FragmentedMessageReceiver: Exiting");
+        log::debug!("FragmentedMessageReceiver: Exiting");
        Ok(())
    }
 }
@@ -1,169 +0,0 @@
-// Copyright 2025 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use nym_topology::NymTopologyMetadata;
-use nym_validator_client::models::{
-    EpochId, KeyRotationId, KeyRotationInfoResponse, KeyRotationState,
-};
-use std::time::Duration;
-use time::OffsetDateTime;
-
-#[derive(Clone, Copy)]
-pub(crate) enum SurbRefreshState {
-    WaitingForNextRotation { last_known: KeyRotationId },
-    ScheduledForNextInvocation,
-}
-
-#[derive(Clone, Copy)]
-pub(crate) struct ReferenceEpoch {
-    pub(crate) absolute_epoch_id: EpochId,
-    pub(crate) start_time: OffsetDateTime,
-}
-
-#[derive(Clone, Copy)]
-pub(crate) struct KeyRotationConfig {
-    pub(crate) epoch_duration: Duration,
-    pub(crate) rotation_state: KeyRotationState,
-    pub(crate) reference_epoch: ReferenceEpoch,
-}
-
-impl From<KeyRotationInfoResponse> for KeyRotationConfig {
-    fn from(value: KeyRotationInfoResponse) -> Self {
-        KeyRotationConfig {
-            epoch_duration: value.details.epoch_duration,
-            rotation_state: value.details.key_rotation_state,
-            reference_epoch: ReferenceEpoch {
-                absolute_epoch_id: value.details.current_absolute_epoch_id,
-                start_time: value.details.current_epoch_start,
-            },
-        }
-    }
-}
-
-impl KeyRotationConfig {
-    pub(crate) fn rotation_lifetime(&self) -> Duration {
-        (self.rotation_state.validity_epochs + 1) * self.epoch_duration
-    }
-
-    pub(crate) fn key_rotation_id(&self, current_absolute_epoch_id: EpochId) -> KeyRotationId {
-        self.rotation_state
-            .key_rotation_id(current_absolute_epoch_id)
-    }
-
-    // this is called with the assumption that now is always > reference epoch start
-    pub(crate) fn expected_current_epoch_id(&self, now: OffsetDateTime) -> EpochId {
-        let diff_secs = (now - self.reference_epoch.start_time).as_seconds_f64();
-        let epochs = (diff_secs / self.epoch_duration.as_secs_f64()).floor() as u32;
-
-        self.reference_epoch.absolute_epoch_id + epochs
-    }
-
-    fn initial_rotation_epoch_start(&self) -> OffsetDateTime {
-        let epochs_diff = self
-            .reference_epoch
-            .absolute_epoch_id
-            .saturating_sub(self.rotation_state.initial_epoch_id);
-
-        self.reference_epoch.start_time - epochs_diff * self.epoch_duration
-    }
-
-    pub(crate) fn key_rotation_start(&self, key_rotation_id: KeyRotationId) -> OffsetDateTime {
-        let rotation_duration = self.rotation_state.validity_epochs * self.epoch_duration;
-        let initial_start = self.initial_rotation_epoch_start();
-
-        // note: key rotation starts from 0
-        initial_start + rotation_duration * key_rotation_id
-    }
-
-    pub(crate) fn expected_current_key_rotation_id(&self, now: OffsetDateTime) -> KeyRotationId {
-        let expected_current_epoch = self.expected_current_epoch_id(now);
-        self.key_rotation_id(expected_current_epoch)
-    }
-
-    pub(crate) fn expected_current_key_rotation_start(
-        &self,
-        now: OffsetDateTime,
-    ) -> OffsetDateTime {
-        let expected_current_key_rotation_id = self.expected_current_key_rotation_id(now);
-        self.key_rotation_start(expected_current_key_rotation_id)
-    }
-
-    pub(crate) fn epoch_stuck(&self, topology_metadata: NymTopologyMetadata) -> bool {
-        // add leeway of 2mins each direction since transition is not instantaneous
-        let lower_bound = topology_metadata.refreshed_at - Duration::from_secs(2);
-        let upper_bound = topology_metadata.refreshed_at + Duration::from_secs(2);
-
-        let expected_epoch_lower = self.expected_current_epoch_id(lower_bound);
-        let expected_epoch_upper = self.expected_current_epoch_id(upper_bound);
-
-        topology_metadata.absolute_epoch_id != expected_epoch_lower
-            && topology_metadata.absolute_epoch_id != expected_epoch_upper
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use time::macros::datetime;
-
-    fn mock_config() -> KeyRotationConfig {
-        KeyRotationConfig {
-            epoch_duration: Duration::from_secs(60 * 60),
-            rotation_state: KeyRotationState {
-                validity_epochs: 10,
-                initial_epoch_id: 80,
-            },
-            reference_epoch: ReferenceEpoch {
-                absolute_epoch_id: 100,
-                start_time: datetime!(2025-06-30 12:00:00+00:00),
-            },
-        }
-    }
-
-    #[test]
-    fn expected_current_key_rotation_start() {
-        // rot0: 80-89
-        // rot1: 90-99
-        // rot2: 100-109
-        // rot3: 110-119
-        // ... etc
-        let cfg = mock_config();
-
-        assert_eq!(
-            cfg.initial_rotation_epoch_start(),
-            datetime!(2025-06-29 16:00:00+00:00)
-        );
-
-        let fake_now = datetime!(2025-06-30 12:00:00+00:00);
-        assert_eq!(cfg.expected_current_epoch_id(fake_now), 100);
-        assert_eq!(cfg.expected_current_key_rotation_id(fake_now), 2);
-        assert_eq!(
-            cfg.expected_current_key_rotation_start(fake_now),
-            datetime!(2025-06-30 12:00:00+00:00)
-        );
-
-        let fake_now = datetime!(2025-06-30 12:30:00+00:00);
-        assert_eq!(cfg.expected_current_epoch_id(fake_now), 100);
-        assert_eq!(cfg.expected_current_key_rotation_id(fake_now), 2);
-        assert_eq!(
-            cfg.expected_current_key_rotation_start(fake_now),
-            datetime!(2025-06-30 12:00:00+00:00)
-        );
-
-        let fake_now = datetime!(2025-06-30 13:01:00+00:00);
-        assert_eq!(cfg.expected_current_epoch_id(fake_now), 101);
-        assert_eq!(cfg.expected_current_key_rotation_id(fake_now), 2);
-        assert_eq!(
-            cfg.expected_current_key_rotation_start(fake_now),
-            datetime!(2025-06-30 12:00:00+00:00)
-        );
-
-        let fake_now = datetime!(2025-06-30 22:02:00+00:00);
-        assert_eq!(cfg.expected_current_epoch_id(fake_now), 110);
-        assert_eq!(cfg.expected_current_key_rotation_id(fake_now), 3);
-        assert_eq!(
-            cfg.expected_current_key_rotation_start(fake_now),
-            datetime!(2025-06-30 22:00:00+00:00)
-        );
-    }
-}
@@ -1,899 +0,0 @@
-// Copyright 2025 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::client::real_messages_control::acknowledgement_control::PendingAcknowledgement;
-use crate::client::real_messages_control::message_handler::{
-    FragmentWithMaxRetransmissions, MessageHandler, PreparationError,
-};
-use crate::client::replies::reply_controller::key_rotation_helpers::SurbRefreshState;
-use crate::client::replies::reply_controller::Config;
-use crate::client::topology_control::TopologyAccessor;
-use crate::client::transmission_buffer::TransmissionBuffer;
-use futures::channel::oneshot;
-use nym_client_core_surb_storage::{ReceivedReplySurb, ReceivedReplySurbsMap};
-use nym_crypto::aes::cipher::crypto_common::rand_core::CryptoRng;
-use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag;
-use nym_sphinx::anonymous_replies::ReplySurbWithKeyRotation;
-use nym_sphinx::chunking::fragment::FragmentIdentifier;
-use nym_task::connections::{ConnectionId, TransmissionLane};
-use nym_topology::NymTopologyMetadata;
-use rand::Rng;
-use std::cmp::{max, min};
-use std::collections::btree_map::Entry;
-use std::collections::{BTreeMap, HashMap};
-use std::mem;
-use std::sync::{Arc, Weak};
-use time::OffsetDateTime;
-use tracing::{debug, error, info, trace, warn};
-
-struct SenderData {
-    current_clear_rerequest_counter: usize,
-    pending_replies: TransmissionBuffer<FragmentWithMaxRetransmissions>,
-    pending_retransmissions: BTreeMap<FragmentIdentifier, Weak<PendingAcknowledgement>>,
-    last_request_failure: OffsetDateTime,
-}
-
-impl Default for SenderData {
-    fn default() -> Self {
-        SenderData {
-            current_clear_rerequest_counter: 0,
-            pending_replies: Default::default(),
-            pending_retransmissions: Default::default(),
-            last_request_failure: OffsetDateTime::UNIX_EPOCH,
-        }
-    }
-}
-
-impl SenderData {
-    fn total_pending(&self) -> usize {
-        let pending_replies = self.pending_replies.total_size();
-        let pending_retransmissions = self.pending_retransmissions.len();
-        let total_pending = pending_retransmissions + pending_replies;
-
-        debug!("total queue size: {total_pending} = pending data {pending_replies} + pending retransmission {pending_retransmissions}");
-
-        total_pending
-    }
-
-    pub(crate) fn increment_current_clear_rerequest_counter(&mut self) {
-        self.current_clear_rerequest_counter += 1;
-    }
-
-    pub(crate) fn reset_current_clear_rerequest_counter(&mut self) {
-        self.current_clear_rerequest_counter = 0;
-    }
-
-    pub(crate) fn reset_last_request_failure(&mut self, now: OffsetDateTime) -> OffsetDateTime {
-        mem::replace(&mut self.last_request_failure, now)
-    }
-}
-
-/// Reply controller responsible for controlling receiver-related part
-/// of replies, such as requesting additional reply SURBs
-pub struct ReceiverReplyController<R> {
-    config: Config,
-
-    surb_refresh_state: SurbRefreshState,
-    topology_access: TopologyAccessor,
-
-    surb_senders: HashMap<AnonymousSenderTag, SenderData>,
-    unavailable: HashMap<AnonymousSenderTag, OffsetDateTime>,
-    surbs_storage: ReceivedReplySurbsMap,
-
-    // TODO: incorporate that field at some point
-    // and use binomial distribution to determine the expected required number
-    // of surbs required to send the message through
-    // expected_reliability: f32,
-    message_handler: MessageHandler<R>,
-}
-
-impl<R> ReceiverReplyController<R>
-where
-    R: CryptoRng + Rng,
-{
-    pub(crate) fn new(
-        config: Config,
-        storage: ReceivedReplySurbsMap,
-        message_handler: MessageHandler<R>,
-    ) -> Self {
-        let topology_access = message_handler.topology_access_handle().clone();
-
-        ReceiverReplyController {
-            config,
-            surb_refresh_state: SurbRefreshState::WaitingForNextRotation {
-                last_known: config
-                    .key_rotation
-                    .expected_current_key_rotation_id(OffsetDateTime::now_utc()),
-            },
-            topology_access,
-            surb_senders: Default::default(),
-            unavailable: Default::default(),
-            surbs_storage: storage,
-            message_handler,
-        }
-    }
-
-    fn get_or_create_surb_sender(&mut self, tag: &AnonymousSenderTag) -> &mut SenderData {
-        self.surb_senders.entry(*tag).or_default()
-    }
-
-    async fn current_topology_metadata(&self) -> Option<NymTopologyMetadata> {
-        self.topology_access.current_metadata().await
-    }
-
-    fn insert_pending_replies<I: IntoIterator<Item = FragmentWithMaxRetransmissions>>(
-        &mut self,
-        recipient: &AnonymousSenderTag,
-        fragments: I,
-        lane: TransmissionLane,
-    ) {
-        trace!("buffering pending replies for {recipient}");
-        self.surb_senders
-            .entry(*recipient)
-            .or_default()
-            .pending_replies
-            .store(&lane, fragments)
-    }
-
-    fn re_insert_pending_replies(
-        &mut self,
-        recipient: &AnonymousSenderTag,
-        fragments: Vec<(TransmissionLane, FragmentWithMaxRetransmissions)>,
-    ) {
-        trace!("re-inserting pending replies for {recipient}");
-        // the buffer should ALWAYS exist at this point, if it doesn't, it's a bug...
-        self.surb_senders
-            .entry(*recipient)
-            .or_default()
-            .pending_replies
-            .store_multiple(fragments)
-    }
-
-    fn re_insert_pending_retransmission(
-        &mut self,
-        recipient: &AnonymousSenderTag,
-        data: Vec<Arc<PendingAcknowledgement>>,
-    ) {
-        trace!("re-inserting pending retransmissions for {recipient}");
-        // the underlying entry MUST exist as we've just got data from there
-        // and we hold a mut reference
-        let map_entry = &mut self
-            .surb_senders
-            .get_mut(recipient)
-            .expect("our pending retransmission entry is somehow gone!")
-            .pending_retransmissions;
-
-        for pending in data {
-            // if it's 0, we don't need to do anything - we just got that ack!
-            if Arc::strong_count(&pending) > 1 {
-                let id = pending.inner_fragment_identifier();
-                let downgraded = Arc::downgrade(&pending);
-                map_entry.insert(id, downgraded);
-            }
-        }
-    }
-
-    fn should_request_more_surbs(&self, target: &AnonymousSenderTag) -> bool {
-        trace!("checking if we should request more surbs from {target}");
-
-        let total_queue = self
-            .surb_senders
-            .get(target)
-            .map(|pending| pending.total_pending())
-            .unwrap_or_default();
-
-        // only consider 'fresh' surbs
-        let available_surbs = self.surbs_storage.available_fresh_surbs(target);
-        let pending_surbs = self.surbs_storage.pending_reception(target) as usize;
-        let min_surbs_threshold = self.surbs_storage.min_surb_threshold();
-        let max_surbs_threshold = self.surbs_storage.max_surb_threshold();
-        let min_surbs_threshold_buffer =
-            self.config.reply_surbs.minimum_reply_surb_threshold_buffer;
-
-        // After clearing the queue, we want to have at least `min_surbs_threshold` surbs available
-        // and reserved for requesting additional surbs, and in addition to that we also want to
-        // have `min_surbs_threshold_buffer` surbs available proactively.
-        let target_surbs_after_clearing_queue = min_surbs_threshold + min_surbs_threshold_buffer;
-
-        // Check if we have enough surbs to handle the total queue and maintain minimum thresholds
-        let total_required_surbs = total_queue + target_surbs_after_clearing_queue;
-        let total_available_surbs = pending_surbs + available_surbs;
-
-        debug!("available surbs: {available_surbs} pending surbs: {pending_surbs} threshold range: {min_surbs_threshold}..+{min_surbs_threshold_buffer}..{max_surbs_threshold}");
-
-        // We should request more surbs if:
-        // 1. We haven't hit the maximum surb threshold, and
-        // 2. We don't have enough surbs to handle the queue plus minimum thresholds
-        let is_below_max_threshold = total_available_surbs < max_surbs_threshold;
-        let is_below_required_surbs = total_available_surbs < total_required_surbs;
-
-        is_below_max_threshold && is_below_required_surbs
-    }
-
-    pub(crate) async fn handle_send_reply(
-        &mut self,
-        recipient_tag: AnonymousSenderTag,
-        data: Vec<u8>,
-        lane: TransmissionLane,
-        max_retransmissions: Option<u32>,
-    ) {
-        if !self.surbs_storage.contains_surbs_for(&recipient_tag) {
-            if self
-                .unavailable
-                .insert(recipient_tag, OffsetDateTime::now_utc())
-                .is_none()
-            {
-                // don't report it every single time
-                warn!("received reply request for {recipient_tag} but we don't have any surbs stored for that recipient!");
-            } else {
-                trace!("received reply request for {recipient_tag} but we don't have any surbs stored for that recipient!");
-            }
-            return;
-        }
-
-        trace!("handling reply to {recipient_tag}");
-        let mut fragments = self.message_handler.split_reply_message(data);
-        let total_size = fragments.len();
-        trace!("This reply requires {total_size} SURBs");
-
-        // for the purposes of sending reply, do allow using possibly stale entries
-        let available_surbs = self.surbs_storage.available_surbs(&recipient_tag);
-        let min_surbs_threshold = self.surbs_storage.min_surb_threshold();
-
-        let max_to_send = if available_surbs > min_surbs_threshold {
-            min(fragments.len(), available_surbs - min_surbs_threshold)
-        } else {
-            0
-        };
-
-        if max_to_send > 0 {
-            let (surbs, surbs_left) = self
-                .surbs_storage
-                .get_reply_surbs(&recipient_tag, max_to_send);
-
-            debug!(
-                "retrieved {} reply surbs. {surbs_left} surbs remaining in storage",
-                surbs.as_ref().map(|s| s.len()).unwrap_or_default()
-            );
-            if let Some(reply_surbs) = surbs {
-                let to_send = fragments
-                    .drain(..reply_surbs.len())
-                    .map(|f| FragmentWithMaxRetransmissions {
-                        fragment: f,
-                        max_retransmissions,
-                    })
-                    .collect::<Vec<_>>();
-
-                if let Err(err) = self
-                    .message_handler
-                    .try_send_reply_chunks_on_lane(
-                        recipient_tag,
-                        to_send.clone(),
-                        reply_surbs,
-                        lane,
-                    )
-                    .await
-                {
-                    let err = err.return_unused_surbs(&self.surbs_storage, &recipient_tag);
-                    warn!("failed to send reply to {recipient_tag}: {err}");
-                    info!(
-                        "buffering {no_fragments} fragments for {recipient_tag}",
-                        no_fragments = to_send.len()
-                    );
-                    self.insert_pending_replies(&recipient_tag, to_send, lane);
-                }
-            }
-        }
-
-        // if there's leftover data we didn't send because we didn't have enough (or any) surbs - buffer it
-        if !fragments.is_empty() {
-            // Ideally we should have enough surbs above the minimum threshold to handle sending
-            // new replies without having to first request more surbs. That's why I'd like to log
-            // these cases as they might indicate a problem with the surb management.
-            debug!(
-                "buffering {no_fragments} fragments for {recipient_tag}",
-                no_fragments = fragments.len()
-            );
-            let fragments: Vec<_> = fragments
-                .into_iter()
-                .map(|fragment| FragmentWithMaxRetransmissions {
-                    fragment,
-                    max_retransmissions,
-                })
-                .collect();
-            self.insert_pending_replies(&recipient_tag, fragments, lane);
-        }
-
-        if self.should_request_more_surbs(&recipient_tag) {
-            self.request_reply_surbs_for_queue_clearing(recipient_tag)
-                .await;
-        }
-    }
-
-    async fn request_additional_reply_surbs(
-        &mut self,
-        target: AnonymousSenderTag,
-        amount: u32,
-    ) -> Result<(), PreparationError> {
-        debug!("requesting {amount} additional reply surbs for {target}");
-        let (reply_surb, _) = self
-            .surbs_storage
-            .get_reply_surb_ignoring_threshold(&target);
-
-        let reply_surb = reply_surb.ok_or(PreparationError::NotEnoughSurbs {
-            available: 0,
-            required: 1,
-        })?;
-
-        if let Err(err) = self
-            .message_handler
-            .try_request_additional_reply_surbs(target, reply_surb, amount)
-            .await
-        {
-            let err = err.return_unused_surbs(&self.surbs_storage, &target);
-            warn!("failed to request additional surbs from {target}: {err}",);
-            return Err(err);
-        } else {
-            self.surbs_storage
-                .increment_pending_reception(&target, amount);
-        }
-
-        Ok(())
-    }
-
-    async fn try_clear_pending_retransmission(&mut self, target: AnonymousSenderTag) {
-        trace!("trying to clear pending retransmission queue");
-        let available_surbs = self.surbs_storage.available_surbs(&target);
-        let min_surbs_threshold = self.surbs_storage.min_surb_threshold();
-
-        let max_to_clear = if available_surbs > min_surbs_threshold {
-            available_surbs - min_surbs_threshold
-        } else {
-            trace!("we don't have enough surbs for retransmission queue clearing...");
-            return;
-        };
-        trace!("we can clear up to {max_to_clear} entries");
-
-        let Some(pending) = self.surb_senders.get_mut(&target) else {
-            trace!("no pending entry for {target}!");
-            return;
-        };
-
-        let mut to_take = Vec::new();
-
-        while to_take.len() < max_to_clear {
-            if let Some((_, data)) = pending.pending_retransmissions.pop_first() {
-                // no need to do anything if we failed to upgrade the reference,
-                // it means we got the ack while the data was waiting in the queue
-                if let Some(upgraded) = data.upgrade() {
-                    to_take.push(upgraded)
-                }
-            } else {
-                // our map is empty!
-                break;
-            }
-        }
-
-        if to_take.is_empty() {
-            // no need to do anything
-            return;
-        }
-
-        let (surbs_for_reply, _) = self.surbs_storage.get_reply_surbs(&target, to_take.len());
-
-        let Some(surbs_for_reply) = surbs_for_reply else {
-            error!("somehow different task has stolen our reply surbs! - this should have been impossible");
-            self.re_insert_pending_retransmission(&target, to_take);
-            return;
-        };
-
-        let to_send_vec = to_take.iter().map(|ack| ack.fragment_data()).collect();
-
-        let prepared_fragments = match self
-            .message_handler
-            .prepare_reply_chunks_for_sending(to_send_vec, surbs_for_reply)
-            .await
-        {
-            Ok(prepared) => prepared,
-            Err(err) => {
-                let err = err.return_unused_surbs(&self.surbs_storage, &target);
-                self.re_insert_pending_retransmission(&target, to_take);
-
-                warn!("failed to clear pending retransmission queue for {target}: {err}",);
-                return;
-            }
-        };
-
-        // we can't fail at this point, so drop all references to acks so that timer updates wouldn't blow up
-        drop(to_take);
-
-        self.message_handler
-            .send_retransmission_reply_chunks(prepared_fragments, TransmissionLane::Retransmission)
-            .await;
-    }
-
-    fn pop_at_most_pending_replies(
-        &mut self,
-        from: &AnonymousSenderTag,
-        amount: usize,
-    ) -> Option<Vec<(TransmissionLane, FragmentWithMaxRetransmissions)>> {
-        // if possible, pop all pending replies, if not, pop only entries for which we'd have a reply surb
-        let pending = self.surb_senders.get_mut(from)?;
-        let total = pending.pending_replies.total_size();
-        trace!("pending queue has {total} elements");
-        if total == 0 {
-            return None;
-        }
-        pending
-            .pending_replies
-            .pop_at_most_n_next_messages_at_random(amount)
-    }
-
-    async fn try_clear_pending_queue(&mut self, target: AnonymousSenderTag) {
-        trace!("trying to clear pending queue");
-        let available_surbs = self.surbs_storage.available_surbs(&target);
-        let min_surbs_threshold = self.surbs_storage.min_surb_threshold();
-
-        let max_to_clear = if available_surbs > min_surbs_threshold {
-            available_surbs - min_surbs_threshold
-        } else {
-            trace!("we don't have enough surbs for queue clearing...");
-            return;
-        };
-        trace!("we can clear up to {max_to_clear} entries");
-
-        // we're guaranteed to not get more entries than we have reply surbs for
-        if let Some(to_send) = self.pop_at_most_pending_replies(&target, max_to_clear) {
-            let to_send_clone = to_send.clone();
-
-            if to_send_clone.is_empty() {
-                panic!(
-                    "please let the devs know if you ever see this message (reply_controller.rs)"
-                );
-            }
-
-            let (surbs_for_reply, _) = self
-                .surbs_storage
-                .get_reply_surbs(&target, to_send_clone.len());
-
-            let Some(surbs_for_reply) = surbs_for_reply else {
-                error!("somehow different task has stolen our reply surbs! - this should have been impossible");
-                self.re_insert_pending_replies(&target, to_send);
-                return;
-            };
-
-            if let Err(err) = self
-                .message_handler
-                .try_send_reply_chunks(target, to_send_clone, surbs_for_reply)
-                .await
-            {
-                let err = err.return_unused_surbs(&self.surbs_storage, &target);
-                self.re_insert_pending_replies(&target, to_send);
-                warn!("failed to clear pending queue for {target}: {err}");
-            }
-        } else {
-            trace!("the pending queue is empty");
-        }
-    }
-
-    fn reset_rerequest_counter(&mut self, from: &AnonymousSenderTag) {
-        if let Some(pending) = self.surb_senders.get_mut(from) {
-            pending.reset_current_clear_rerequest_counter()
-        }
-    }
-
-    pub(crate) async fn handle_received_surbs(
-        &mut self,
-        from: AnonymousSenderTag,
-        reply_surbs: Vec<ReplySurbWithKeyRotation>,
-        from_surb_request: bool,
-    ) {
-        trace!("handling received surbs");
-
-        // clear the requesting flag since we should have been asking for surbs
-        if from_surb_request {
-            self.surbs_storage
-                .decrement_pending_reception(&from, reply_surbs.len() as u32);
-        }
-
-        // store received surbs
-        self.surbs_storage.insert_fresh_surbs(&from, reply_surbs);
-
-        // reset, if applicable, request counter
-        self.reset_rerequest_counter(&from);
-
-        // use as many as we can for clearing pending retransmission queue
-        self.try_clear_pending_retransmission(from).await;
-
-        // use as many as we can for clearing pending 'normal' queue
-        self.try_clear_pending_queue(from).await;
-
-        // if we have to, request more
-        if self.should_request_more_surbs(&from) {
-            self.request_reply_surbs_for_queue_clearing(from).await;
-        }
-    }
-    fn buffer_pending_ack(
-        &mut self,
-        recipient: AnonymousSenderTag,
-        ack_ref: Arc<PendingAcknowledgement>,
-        weak_ack_ref: Weak<PendingAcknowledgement>,
-    ) {
-        let frag_id = ack_ref.inner_fragment_identifier();
-
-        let pending = self.surb_senders.entry(recipient).or_default();
-        if let Entry::Vacant(e) = pending.pending_retransmissions.entry(frag_id) {
-            e.insert(weak_ack_ref);
-        } else {
-            warn!(
-                "we're already trying to retransmit {frag_id}. We must be really behind in surbs!"
-            );
-        }
-    }
-
-    pub(crate) async fn handle_reply_retransmission(
-        &mut self,
-        recipient_tag: AnonymousSenderTag,
-        timed_out_ack: Weak<PendingAcknowledgement>,
-        extra_surbs_request: bool,
-    ) {
-        // seems we got the ack in the end
-        let ack_ref = match timed_out_ack.upgrade() {
-            Some(ack) => ack,
-            None => {
-                debug!("we received the ack for one of the reply packets as we were putting it in the retransmission queue");
-                return;
-            }
-        };
-
-        // if this is retransmission for obtaining additional reply surbs,
-        // we can dip below the storage threshold
-        let (maybe_reply_surb, _) = if extra_surbs_request {
-            self.surbs_storage
-                .get_reply_surb_ignoring_threshold(&recipient_tag)
-        } else {
-            self.surbs_storage.get_reply_surb(&recipient_tag)
-        };
-
-        if let Some(reply_surb) = maybe_reply_surb {
-            match self
-                .message_handler
-                .try_prepare_single_reply_chunk_for_sending(reply_surb, ack_ref.fragment_data())
-                .await
-            {
-                Ok(prepared) => {
-                    // drop the ack ref so that controller would not panic on `UpdateTimer` if that task
-                    // got to handle the action before this function terminated (which is very much
-                    // possible if `forward_messages` takes a while)
-                    drop(ack_ref);
-
-                    self.message_handler
-                        .update_ack_delay(prepared.fragment_identifier, prepared.total_delay);
-                    self.message_handler
-                        .forward_messages(vec![prepared.into()], TransmissionLane::Retransmission)
-                        .await;
-                }
-                Err(err) => {
-                    let err = err.return_unused_surbs(&self.surbs_storage, &recipient_tag);
-                    warn!("failed to prepare message for retransmission - {err}");
-                    // we buffer that packet and to try another day
-                    self.buffer_pending_ack(recipient_tag, ack_ref, timed_out_ack);
-
-                    if self.should_request_more_surbs(&recipient_tag) {
-                        self.request_reply_surbs_for_queue_clearing(recipient_tag)
-                            .await;
-                    }
-                }
-            };
-        } else {
-            self.buffer_pending_ack(recipient_tag, ack_ref, timed_out_ack);
-
-            if self.should_request_more_surbs(&recipient_tag) {
-                self.request_reply_surbs_for_queue_clearing(recipient_tag)
-                    .await;
-            }
-        }
-    }
-
-    // to be honest this doesn't make a lot of sense in the context of `connection_id`,
-    // it should really be asked per tag
-    pub(crate) fn handle_lane_queue_length(
-        &self,
-        connection_id: ConnectionId,
-        response_channel: oneshot::Sender<usize>,
-    ) {
-        // TODO: if we ever have duplicate ids for different senders, it means our rng is super weak
-        // thus I don't think we have to worry about it?
-        let lane = TransmissionLane::ConnectionId(connection_id);
-        for buf in self.surb_senders.values().map(|p| &p.pending_replies) {
-            if let Some(length) = buf.lane_length(&lane) {
-                if response_channel.send(length).is_err() {
-                    error!("the requester for lane queue length has dropped the response channel!")
-                }
-                return;
-            }
-        }
-        // make sure that if we didn't find that lane, we reply with 0
-        if response_channel.send(0).is_err() {
-            error!("the requester for lane queue length has dropped the response channel!")
-        }
-    }
-
-    // TODO: modify this method to more accurately determine the amount of surbs it needs to request
-    // it should take into consideration the average latency, sending rate and queue size.
-    // it should request as many surbs as it takes to saturate its sending rate before next batch arrives
-    async fn request_reply_surbs_for_queue_clearing(&mut self, target: AnonymousSenderTag) {
-        trace!("requesting surbs for queue clearing");
-
-        let total_queue = self
-            .surb_senders
-            .get(&target)
-            .map(|pending| pending.total_pending() as u32)
-            .unwrap_or_default();
-
-        let min_surbs_buffer = self.config.reply_surbs.minimum_reply_surb_threshold_buffer as u32;
-
-        // To proactively request additional surbs, we aim to have a buffer of extra surbs in our
-        // storage.
-        let total_queue_with_buffer = total_queue + min_surbs_buffer;
-
-        let request_size = min(
-            self.config.reply_surbs.maximum_reply_surb_request_size,
-            max(
-                total_queue_with_buffer,
-                self.config.reply_surbs.minimum_reply_surb_request_size,
-            ),
-        );
-
-        if let Err(err) = self
-            .request_additional_reply_surbs(target, request_size)
-            .await
-        {
-            let now = OffsetDateTime::now_utc();
-            let sender_info = self.get_or_create_surb_sender(&target);
-            let last_failure = sender_info.reset_last_request_failure(now);
-
-            // only log at higher level if it's the first time this error has occurred in a while
-            if now - last_failure > time::Duration::seconds(30) {
-                warn!("failed to request more surbs to clear pending queue of size {total_queue} (attempted to request: {request_size}): {err}")
-            } else {
-                debug!("failed to request more surbs to clear pending queue of size {total_queue} (attempted to request: {request_size}): {err}")
-            }
-        }
-    }
-
-    pub(crate) async fn inspect_stale_pending_data(&mut self) {
-        let mut to_request = Vec::new();
-        let mut to_remove = Vec::new();
-
-        let now = OffsetDateTime::now_utc();
-        for (pending_reply_target, vals) in self.surb_senders.iter_mut() {
-            // for now recreate old behaviour
-            let retransmission_buf = &vals.pending_replies;
-
-            if retransmission_buf.is_empty() {
-                continue;
-            }
-
-            let Some(last_received_time) = self
-                .surbs_storage
-                .surbs_last_received_at(pending_reply_target)
-            else {
-                error!("we have {} pending replies for {pending_reply_target}, but we somehow never received any reply surbs from them!", retransmission_buf.total_size());
-                to_remove.push(*pending_reply_target);
-                continue;
-            };
-
-            let diff = now - last_received_time;
-            let max_rerequest_wait = self
-                .config
-                .reply_surbs
-                .maximum_reply_surb_rerequest_waiting_period;
-            let max_drop_wait = self
-                .config
-                .reply_surbs
-                .maximum_reply_surb_drop_waiting_period;
-            let max_rerequests = self.config.reply_surbs.maximum_reply_surbs_rerequests;
-
-            // if we have already requested extra surbs because of the stale entry,
-            // don't do it again (otherwise we'll get stuck in a constant cycle of requesting more surbs
-            // if client is offline)
-            if vals.current_clear_rerequest_counter > max_rerequests {
-                to_remove.push(*pending_reply_target);
-                debug!("we have reached the maximum threshold of attempting to request surbs from {pending_reply_target}. dropping the sender");
-                continue;
-            }
-
-            if diff > max_rerequest_wait {
-                if diff > max_drop_wait {
-                    to_remove.push(*pending_reply_target)
-                } else {
-                    debug!("We haven't received any surbs in {} from {pending_reply_target}. Going to explicitly ask for more", humantime::format_duration(diff.unsigned_abs()));
-                    vals.increment_current_clear_rerequest_counter();
-                    to_request.push(*pending_reply_target);
-                }
-            }
-        }
-
-        for pending_reply_target in to_request {
-            self.request_reply_surbs_for_queue_clearing(pending_reply_target)
-                .await;
-            self.surbs_storage
-                .reset_pending_reception(&pending_reply_target)
-        }
-        for to_remove in to_remove {
-            // TODO: in the 'old' version we just removed pending messages,
-            // not retransmissions, but I think those should follow the same logic.
-            // if something breaks because of that. I guess here is your explanation, future reader
-            self.surb_senders.remove(&to_remove);
-        }
-    }
-
-    pub(crate) async fn check_surb_refresh(&mut self) {
-        let Some(current_rotation_id) = self.topology_access.current_key_rotation_id().await else {
-            warn!("failed to retrieve current key rotation id from the network topology");
-            return;
-        };
-
-        if let SurbRefreshState::WaitingForNextRotation { last_known } = self.surb_refresh_state {
-            if last_known == current_rotation_id {
-                trace!("no changes in key rotation id");
-            } else {
-                // key rotation actually changed and given the polling rate (1/8th epoch) we should have plenty
-                // of time to perform the upgrade.
-                // but wait for one more call before doing this so that the clients could also resync
-                // their topologies and discover new rotation
-                self.surb_refresh_state = SurbRefreshState::ScheduledForNextInvocation;
-            }
-            return;
-        }
-
-        // here we are in `SurbRefreshState::ScheduledForNextInvocation` state
-
-        let mut marked_as_stale = HashMap::new();
-
-        // 1. mark all existing surbs we have as possibly stale
-        for mut map_entry in self.surbs_storage.as_raw_iter_mut() {
-            let (sender, received) = map_entry.pair_mut();
-            let num_downgraded = received.downgrade_freshness();
-            trace!("{sender}: {num_downgraded} downgraded");
-            if num_downgraded != 0 {
-                marked_as_stale.insert(*sender, num_downgraded);
-            }
-        }
-
-        // 2. attempt to re-request the equivalent number of fresh surbs
-        // TODO PROBLEM: if our request gets lost, we might be in trouble...
-        // we need some sort of retry mechanism
-        for (sender, num_to_request) in marked_as_stale {
-            if self
-                .request_additional_reply_surbs(sender, num_to_request as u32)
-                .await
-                .is_err()
-            {
-                warn!("surb refresh request failed")
-            }
-        }
-
-        self.surb_refresh_state = SurbRefreshState::WaitingForNextRotation {
-            last_known: current_rotation_id,
-        };
-    }
-
-    pub(crate) async fn inspect_and_clear_stale_data(&mut self, now: OffsetDateTime) {
-        // technically we don't know if epoch is stuck, but we're flying in blind here,
-        // so we have to assume the worst and not purge anything depending on proper epoch progression
-        let is_epoch_stuck = self
-            .current_topology_metadata()
-            .await
-            .map(|m| self.config.key_rotation.epoch_stuck(m))
-            .unwrap_or(false);
-
-        // expected time of when the CURRENT key rotation has begun
-        let expected_current_key_rotation_start = self
-            .config
-            .key_rotation
-            .expected_current_key_rotation_start(now);
-
-        // expected ID of the CURRENT key rotation
-        let expected_current_key_rotation = self
-            .config
-            .key_rotation
-            .expected_current_key_rotation_id(now);
-
-        // time of the start of one epoch BEFORE the CURRENT rotation has begun
-        // this indicates the starting time of when packets with the current keys might have been constructed
-        let prior_epoch_start =
-            expected_current_key_rotation_start - self.config.key_rotation.epoch_duration;
-
-        // time of the start of one epoch AFTER the current rotation has begun
-        // this indicates the end of transition period and any packets constructed with keys different
-        // from the current one are definitely invalid
-        let following_epoch_start =
-            expected_current_key_rotation_start + self.config.key_rotation.epoch_duration;
-
-        // define a closure for validating individual surbs
-        // (we have to run it twice for different piles)
-        let basic_surb_retention_logic = |received_surb: &ReceivedReplySurb| {
-            if is_epoch_stuck {
-                let diff = now - received_surb.received_at();
-                return diff < self.config.key_rotation.rotation_lifetime();
-            }
-
-            if received_surb.received_at() < prior_epoch_start {
-                // it's definitely from previous rotation
-                return false;
-            }
-            let surb_rotation = received_surb.key_rotation();
-
-            if surb_rotation.is_unknown() {
-                // can't do anything, so just retain it
-                return true;
-            }
-
-            // TODO: will this backfire during transition period where we need surbs to refresh surbs
-            // and we failed to send a request?
-            if surb_rotation.is_even() && expected_current_key_rotation % 2 == 1 {
-                return false;
-            }
-
-            if surb_rotation.is_odd() && expected_current_key_rotation % 2 == 0 {
-                return false;
-            }
-
-            true
-        };
-
-        // 1. purge full old clients data (this applies to RECEIVER)
-        self.surbs_storage.retain(|_, received| {
-            if is_epoch_stuck {
-                // if epoch is stuck, we can't do much (because we don't know for certain if rotation has advanced)
-                // apart from the basic check of surbs being received more than maximum lifetime of a rotation
-                // because at that point we know they must be invalid
-                let diff = now - received.surbs_last_received_at();
-                return diff < self.config.key_rotation.rotation_lifetime();
-            }
-
-            // if surbs were received more than 1h before the start of the current rotation,
-            // they're DEFINITELY invalid.
-            // if it was up until 1h AFTER the start of the current rotation they MIGHT be valid -
-            // we don't know for sure, unless the client explicitly attached rotation information
-            // (which only applies to more recent versions of clients so we can't 100% rely on that)
-            if received.surbs_last_received_at() < prior_epoch_start {
-                return false;
-            }
-
-            // 1.1. check individual surbs (same basic logic applies)
-            received.retain_fresh_surbs(&basic_surb_retention_logic);
-
-            // 1.2. check the possibly stale entries
-            // 1.2.1. check if we're beyond the key rotation transition period,
-            // if so those surbs are definitely unusable
-            if now > following_epoch_start {
-                received.drop_possibly_stale_surbs();
-            }
-
-            // 1.2.2. otherwise continue with the same logic as the fresh ones
-            received.retain_possibly_stale_surbs(&basic_surb_retention_logic);
-
-            // no surbs left, we're not expecting any AND we haven't received anything in a while
-            // (i.e. sender probably abandoned us)
-            let max_drop_wait = self
-                .config
-                .reply_surbs
-                .maximum_reply_surb_drop_waiting_period;
-            let last_received = received.surbs_last_received_at();
-
-            let possibly_abandoned = last_received + max_drop_wait < now;
-            if received.is_empty() && received.pending_reception() == 0 && possibly_abandoned {
-                return false;
-            }
-
-            true
-        });
-
-        // 1.3 inspect old unavailable receivers to clear any stale data
-        self.unavailable
-            .retain(|_, last_reported| now - *last_reported < time::Duration::seconds(30));
-    }
-}
@@ -3,12 +3,12 @@

 use crate::client::real_messages_control::acknowledgement_control::PendingAcknowledgement;
 use futures::channel::{mpsc, oneshot};
+use log::error;
 use nym_sphinx::addressing::clients::Recipient;
 use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag;
 use nym_sphinx::anonymous_replies::ReplySurbWithKeyRotation;
 use nym_task::connections::{ConnectionId, TransmissionLane};
 use std::sync::Weak;
-use tracing::error;

 pub(crate) fn new_control_channels() -> (ReplyControllerSender, ReplyControllerReceiver) {
    let (tx, rx) = mpsc::unbounded();
@@ -1,101 +0,0 @@
-// Copyright 2025 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::client::real_messages_control::message_handler::MessageHandler;
-use crate::client::replies::reply_controller::Config;
-use nym_client_core_surb_storage::{CombinedReplyStorage, SentReplyKeys, UsedSenderTags};
-use nym_crypto::aes::cipher::crypto_common::rand_core::CryptoRng;
-use nym_sphinx::addressing::Recipient;
-use rand::Rng;
-use std::cmp::min;
-use std::time::Duration;
-use time::OffsetDateTime;
-use tracing::{debug, trace, warn};
-
-/// Reply controller responsible for controlling sender-related part
-/// of replies, such as checking if any reply keys are stale
-pub struct SenderReplyController<R> {
-    config: Config,
-
-    tags_storage: UsedSenderTags,
-    sent_reply_keys: SentReplyKeys,
-    message_handler: MessageHandler<R>,
-}
-
-impl<R> SenderReplyController<R>
-where
-    R: CryptoRng + Rng,
-{
-    pub(crate) fn new(
-        config: Config,
-        storage: &CombinedReplyStorage,
-        message_handler: MessageHandler<R>,
-    ) -> Self {
-        SenderReplyController {
-            config,
-            tags_storage: storage.tags_storage(),
-            sent_reply_keys: storage.key_storage(),
-            message_handler,
-        }
-    }
-
-    pub(crate) async fn handle_surb_request(&mut self, recipient: Recipient, mut amount: u32) {
-        // 1. check whether we sent any surbs in the past to this recipient, otherwise
-        // they have no business in asking for more
-        if !self.tags_storage.exists(&recipient) {
-            warn!("{recipient} asked us for reply SURBs even though we never sent them any anonymous messages before!");
-            return;
-        }
-
-        // 2. check whether the requested amount is within sane range
-        if amount
-            > self
-                .config
-                .reply_surbs
-                .maximum_allowed_reply_surb_request_size
-        {
-            warn!("The requested reply surb amount is larger than our maximum allowed ({amount} > {}). Lowering it to a more sane value...", self.config.reply_surbs.maximum_allowed_reply_surb_request_size);
-            amount = self
-                .config
-                .reply_surbs
-                .maximum_allowed_reply_surb_request_size;
-        }
-
-        // 3. construct and send the surbs away
-        // (send them in smaller batches to make the experience a bit smoother
-        let mut remaining = amount;
-        while remaining > 0 {
-            let to_send = min(remaining, 100);
-            if let Err(err) = self
-                .message_handler
-                .try_send_additional_reply_surbs(
-                    recipient,
-                    to_send,
-                    nym_sphinx::params::PacketType::Mix,
-                )
-                .await
-            {
-                warn!("failed to send additional surbs to {recipient} - {err}");
-            } else {
-                trace!("sent {to_send} reply SURBs to {recipient}");
-            }
-
-            remaining -= to_send;
-        }
-    }
-
-    pub(crate) fn inspect_and_clear_stale_data(&self, now: OffsetDateTime) {
-        // check reply keys (this applies to SENDER)
-        self.sent_reply_keys.retain(|_, reply_key| {
-            let diff = now - reply_key.sent_at;
-            if diff > self.config.reply_surbs.maximum_reply_key_age {
-                let std_diff = Duration::try_from(diff).unwrap_or_default();
-                let diff_formatted = humantime::format_duration(std_diff);
-                debug!("it's been {diff_formatted} since we created this reply key. it's probably never going to get used, so we're going to purge it...");
-                false
-            } else {
-                true
-            }
-        });
-    }
-}
@@ -93,14 +93,14 @@ impl StatisticsControl {
            None,
        );
        if let Err(err) = self.report_tx.send(report_message).await {
-            tracing::error!("Failed to report client stats: {err:?}");
+            log::error!("Failed to report client stats: {err:?}");
        } else {
            self.stats.reset();
        }
    }

    async fn run(&mut self) {
-        tracing::debug!("Started StatisticsControl with graceful shutdown support");
+        log::debug!("Started StatisticsControl with graceful shutdown support");

        #[cfg(not(target_arch = "wasm32"))]
        let mut stats_report_interval = tokio_stream::wrappers::IntervalStream::new(
@@ -133,13 +133,13 @@ impl StatisticsControl {
            tokio::select! {
                biased;
                _ = self.task_client.recv() => {
-                    tracing::trace!("StatisticsControl: Received shutdown");
+                    log::trace!("StatisticsControl: Received shutdown");
                    break;
                },
                stats_event = self.stats_rx.recv() => match stats_event {
                        Some(stats_event) => self.stats.handle_event(stats_event),
                        None => {
-                            tracing::trace!("StatisticsControl: shutting down due to closed stats channel");
+                            log::trace!("StatisticsControl: shutting down due to closed stats channel");
                            break;
                        }
                },
@@ -161,7 +161,7 @@ impl StatisticsControl {
                }
            }
        }
-        tracing::debug!("StatisticsControl: Exiting");
+        log::debug!("StatisticsControl: Exiting");
    }

    pub(crate) fn start(mut self) {
@@ -2,8 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0

 use nym_sphinx::addressing::clients::Recipient;
-use nym_topology::{NymRouteProvider, NymTopology, NymTopologyError, NymTopologyMetadata};
-use nym_validator_client::models::KeyRotationId;
+use nym_topology::{NymRouteProvider, NymTopology, NymTopologyError};
 use std::ops::Deref;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
@@ -135,21 +134,6 @@ impl TopologyAccessor {
        }
    }

-    pub async fn current_mixnet_epoch_id(&self) -> Option<u32> {
-        let route_provider = self.current_route_provider().await?;
-        Some(route_provider.absolute_epoch_id())
-    }
-
-    pub async fn current_key_rotation_id(&self) -> Option<KeyRotationId> {
-        let route_provider = self.current_route_provider().await?;
-        Some(route_provider.current_key_rotation())
-    }
-
-    pub async fn current_metadata(&self) -> Option<NymTopologyMetadata> {
-        let route_provider = self.current_route_provider().await?;
-        Some(route_provider.metadata())
-    }
-
    pub async fn manually_change_topology(&self, new_topology: NymTopology) {
        self.inner.controlled_manually.store(true, Ordering::SeqCst);
        self.inner.update(Some(new_topology)).await;
@@ -4,11 +4,11 @@
 use crate::spawn_future;
 pub(crate) use accessor::{TopologyAccessor, TopologyReadPermit};
 use futures::StreamExt;
+use log::*;
 use nym_sphinx::addressing::nodes::NodeIdentity;
 use nym_task::TaskClient;
 use nym_topology::NymTopologyError;
 use std::time::Duration;
-use tracing::*;

 #[cfg(not(target_arch = "wasm32"))]
 use tokio::time::sleep;
@@ -20,7 +20,7 @@ mod accessor;
 pub mod nym_api_provider;

 pub use nym_api_provider::{Config as NymApiTopologyProviderConfig, NymApiTopologyProvider};
-pub use nym_topology::provider_trait::{ToTopologyMetadata, TopologyProvider};
+pub use nym_topology::provider_trait::TopologyProvider;

 // TODO: move it to config later
 const MAX_FAILURE_COUNT: usize = 10;
@@ -169,12 +169,12 @@ impl TopologyRefresher {
                        self.try_refresh().await;
                    },
                    _ = self.task_client.recv() => {
-                        tracing::trace!("TopologyRefresher: Received shutdown");
+                        log::trace!("TopologyRefresher: Received shutdown");
                    },
                }
            }
            self.task_client.recv_timeout().await;
-            tracing::debug!("TopologyRefresher: Exiting");
+            log::debug!("TopologyRefresher: Exiting");
        })
    }
 }
@@ -2,12 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0

 use async_trait::async_trait;
-use nym_topology::provider_trait::{ToTopologyMetadata, TopologyProvider};
-use nym_topology::NymTopology;
+use log::{debug, error, warn};
+use nym_topology::provider_trait::TopologyProvider;
+use nym_topology::{NymTopology, NymTopologyMetadata};
+use nym_validator_client::UserAgent;
 use rand::prelude::SliceRandom;
 use rand::thread_rng;
 use std::cmp::min;
-use tracing::{debug, error, warn};
 use url::Url;

 #[derive(Debug)]
@@ -48,10 +49,18 @@ impl NymApiTopologyProvider {
    pub fn new(
        config: impl Into<Config>,
        mut nym_api_urls: Vec<Url>,
-        mut validator_client: nym_validator_client::client::NymApiClient,
+        user_agent: Option<UserAgent>,
    ) -> Self {
        nym_api_urls.shuffle(&mut thread_rng());
-        validator_client.change_nym_api(nym_api_urls[0].clone());
+
+        let validator_client = if let Some(user_agent) = user_agent {
+            nym_validator_client::client::NymApiClient::new_with_user_agent(
+                nym_api_urls[0].clone(),
+                user_agent,
+            )
+        } else {
+            nym_validator_client::client::NymApiClient::new(nym_api_urls[0].clone())
+        };

        NymApiTopologyProvider {
            config: config.into(),
@@ -99,8 +108,12 @@ impl NymApiTopologyProvider {
                .filter(|n| n.performance.round_to_integer() >= self.config.min_node_performance())
                .collect::<Vec<_>>();

-            NymTopology::new(metadata.to_topology_metadata(), rewarded_set, Vec::new())
-                .with_skimmed_nodes(&nodes_filtered)
+            NymTopology::new(
+                NymTopologyMetadata::new(metadata.rotation_id, metadata.absolute_epoch_id),
+                rewarded_set,
+                Vec::new(),
+            )
+            .with_skimmed_nodes(&nodes_filtered)
        } else {
            // if we're not using extended topology, we're only getting active set mixnodes and gateways

@@ -111,7 +124,7 @@ impl NymApiTopologyProvider {
            // TODO: we really should be getting ACTIVE gateways only
            let gateways_fut = self
                .validator_client
-                .get_all_basic_entry_assigned_nodes_with_metadata();
+                .get_all_basic_entry_assigned_nodes_v2();

            let (rewarded_set, mixnodes_res, gateways_res) =
                futures::try_join!(rewarded_set_fut, mixnodes_fut, gateways_fut)
@@ -123,7 +136,7 @@ impl NymApiTopologyProvider {
            let metadata = mixnodes_res.metadata;
            let mixnodes = mixnodes_res.nodes;

-            if !gateways_res.metadata.consistency_check(&metadata) {
+            if gateways_res.metadata != metadata {
                warn!("inconsistent nodes metadata between mixnodes and gateways calls! {metadata:?} and {:?}", gateways_res.metadata);
                return None;
            }
@@ -148,8 +161,12 @@ impl NymApiTopologyProvider {
                }
            }

-            NymTopology::new(metadata.to_topology_metadata(), rewarded_set, Vec::new())
-                .with_skimmed_nodes(&nodes)
+            NymTopology::new(
+                NymTopologyMetadata::new(metadata.rotation_id, metadata.absolute_epoch_id),
+                rewarded_set,
+                Vec::new(),
+            )
+            .with_skimmed_nodes(&nodes)
        };

        if !topology.is_minimally_routable() {
@@ -36,18 +36,11 @@ impl SizedData for Fragment {
    }
 }

+#[derive(Default)]
 pub(crate) struct TransmissionBuffer<T> {
    buffer: HashMap<TransmissionLane, LaneBufferEntry<T>>,
 }

-impl<T> Default for TransmissionBuffer<T> {
-    fn default() -> Self {
-        TransmissionBuffer {
-            buffer: HashMap::new(),
-        }
-    }
-}
-
 impl<T> TransmissionBuffer<T> {
    pub(crate) fn new() -> Self {
        TransmissionBuffer {
@@ -218,7 +211,7 @@ impl<T> TransmissionBuffer<T> {
        };

        let msg = self.pop_front_from_lane(&lane)?;
-        tracing::trace!("picking to send from lane: {lane:?}");
+        log::trace!("picking to send from lane: {lane:?}");
        Some((lane, msg))
    }

@@ -6,7 +6,6 @@ use nym_crypto::asymmetric::ed25519::Ed25519RecoveryError;
 use nym_gateway_client::error::GatewayClientError;
 use nym_topology::node::RoutingNodeError;
 use nym_topology::{NodeId, NymTopologyError};
-use nym_validator_client::nym_api::error::NymAPIError;
 use nym_validator_client::ValidatorClientError;
 use std::error::Error;
 use std::path::PathBuf;
@@ -53,15 +52,7 @@ pub enum ClientCoreError {
    #[error("list of nym apis is empty")]
    ListOfNymApisIsEmpty,

-    #[error("failed to resolve a query to nym API: {source}")]
-    NymApiQueryFailure {
-        #[from]
-        source: NymAPIError,
-    },
-
-    #[error(
-        "the current network topology seem to be insufficient to route any packets through:\n\t{0}"
-    )]
+    #[error("the current network topology seem to be insufficient to route any packets through")]
    InsufficientNetworkTopology(#[from] NymTopologyError),

    #[error("experienced a failure with our reply surb persistent storage: {source}")]
@@ -4,6 +4,7 @@
 use crate::error::ClientCoreError;
 use crate::init::types::RegistrationResult;
 use futures::{SinkExt, StreamExt};
+use log::{debug, info, trace, warn};
 use nym_crypto::asymmetric::ed25519;
 use nym_gateway_client::GatewayClient;
 use nym_topology::node::RoutingNode;
@@ -13,7 +14,6 @@ use rand::{seq::SliceRandom, Rng};
 #[cfg(unix)]
 use std::os::fd::RawFd;
 use std::{sync::Arc, time::Duration};
-use tracing::{debug, info, trace, warn};
 use tungstenite::Message;
 use url::Url;

@@ -105,15 +105,12 @@ pub async fn gateways_for_init<R: Rng>(
        nym_validator_client::client::NymApiClient::new(nym_api.clone())
    };

-    tracing::debug!("Fetching list of gateways from: {nym_api}");
+    log::debug!("Fetching list of gateways from: {nym_api}");

-    let gateways = client
-        .get_all_basic_entry_assigned_nodes_with_metadata()
-        .await?
-        .nodes;
+    let gateways = client.get_all_basic_entry_assigned_nodes_v2().await?.nodes;
    info!("nym api reports {} gateways", gateways.len());

-    tracing::trace!("Gateways: {gateways:#?}");
+    log::trace!("Gateways: {gateways:#?}");

    // filter out gateways below minimum performance and ones that could operate as a mixnode
    // (we don't want instability)
@@ -123,10 +120,10 @@ pub async fn gateways_for_init<R: Rng>(
        .filter(|g| g.performance.round_to_integer() >= minimum_performance)
        .filter_map(|gateway| gateway.try_into().ok())
        .collect::<Vec<_>>();
-    tracing::debug!("After checking validity: {}", valid_gateways.len());
-    tracing::trace!("Valid gateways: {valid_gateways:#?}");
+    log::debug!("After checking validity: {}", valid_gateways.len());
+    log::trace!("Valid gateways: {valid_gateways:#?}");

-    tracing::info!(
+    log::info!(
        "and {} after validity and performance filtering",
        valid_gateways.len()
    );
@@ -289,7 +286,7 @@ pub(super) fn get_specified_gateway(
    gateways: &[RoutingNode],
    must_use_tls: bool,
 ) -> Result<RoutingNode, ClientCoreError> {
-    tracing::debug!("Requesting specified gateway: {gateway_identity}");
+    log::debug!("Requesting specified gateway: {gateway_identity}");
    let user_gateway = ed25519::PublicKey::from_base58_string(gateway_identity)
        .map_err(ClientCoreError::UnableToCreatePublicKeyFromGatewayId)?;

@@ -329,7 +326,7 @@ pub(super) async fn register_with_gateway(
    );

    gateway_client.establish_connection().await.map_err(|err| {
-        tracing::warn!("Failed to establish connection with gateway!");
+        log::warn!("Failed to establish connection with gateway!");
        ClientCoreError::GatewayClientError {
            gateway_id: gateway_id.to_base58_string(),
            source: Box::new(err),
@@ -339,7 +336,7 @@ pub(super) async fn register_with_gateway(
        .perform_initial_authentication()
        .await
        .map_err(|err| {
-            tracing::warn!("Failed to register with the gateway {gateway_id}: {err}");
+            log::warn!("Failed to register with the gateway {gateway_id}: {err}");
            ClientCoreError::GatewayClientError {
                gateway_id: gateway_id.to_base58_string(),
                source: Box::new(err),
@@ -63,7 +63,7 @@ where
    K::StorageError: Send + Sync + 'static,
    D::StorageError: Send + Sync + 'static,
 {
-    tracing::trace!("Setting up new gateway");
+    log::trace!("Setting up new gateway");

    // if we're setting up new gateway, we must have had generated long-term client keys before
    let client_keys = load_client_keys(key_store).await?;
@@ -202,10 +202,10 @@ where
    K::StorageError: Send + Sync + 'static,
    D::StorageError: Send + Sync + 'static,
 {
-    tracing::debug!("Setting up gateway");
+    log::debug!("Setting up gateway");
    match setup {
        GatewaySetup::MustLoad { gateway_id } => {
-            tracing::debug!("GatewaySetup::MustLoad with id: {gateway_id:?}");
+            log::debug!("GatewaySetup::MustLoad with id: {gateway_id:?}");
            use_loaded_gateway_details(key_store, details_store, gateway_id).await
        }
        GatewaySetup::New {
@@ -214,7 +214,7 @@ where
            #[cfg(unix)]
            connection_fd_callback,
        } => {
-            tracing::debug!("GatewaySetup::New with spec: {specification:?}");
+            log::debug!("GatewaySetup::New with spec: {specification:?}");
            setup_new_gateway(
                key_store,
                details_store,
@@ -230,7 +230,7 @@ where
            gateway_details,
            client_keys: managed_keys,
        } => {
-            tracing::debug!("GatewaySetup::ReuseConnection");
+            log::debug!("GatewaySetup::ReuseConnection");
            Ok(reuse_gateway_connection(
                *authenticated_ephemeral_client,
                *gateway_details,
@@ -9,7 +9,7 @@ license.workspace = true
 [dependencies]
 async-trait.workspace = true
 dashmap.workspace = true
-tracing.workspace = true
+log.workspace = true
 thiserror.workspace = true
 time.workspace = true

@@ -23,7 +23,7 @@ features = ["fs"]

 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.sqlx]
 workspace = true
-features = ["runtime-tokio-rustls", "sqlite", "macros", "migrate", "time"]
+features = ["runtime-tokio-rustls", "sqlite", "macros", "migrate"]
 optional = true

 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.sqlx-pool-guard]
@@ -1,81 +0,0 @@
-/*
- * Copyright 2025 - Nym Technologies SA <contact@nymtech.net>
- * SPDX-License-Identifier: Apache-2.0
- */
-
-- change `previous_flush_timestamp` unix timestamp to `previous_flush` timestamp
-CREATE TABLE status_new
-(
-    flush_in_progress INTEGER                     NOT NULL,
-    previous_flush    TIMESTAMP WITHOUT TIME ZONE NOT NULL,
-    client_in_use     INTEGER                     NOT NULL
-);
-
-INSERT INTO status_new (flush_in_progress, previous_flush, client_in_use)
-SELECT flush_in_progress,
-       datetime(previous_flush_timestamp, 'unixepoch') AS previous_flush,
-       client_in_use
-FROM status;
-
-DROP TABLE status;
-ALTER TABLE status_new
-    RENAME TO status;
-
-
-- change `sent_at_timestamp` unix timestamp to `sent_at` timestamp
-CREATE TABLE reply_key_new
-(
-    key_digest BLOB                        NOT NULL UNIQUE,
-    reply_key  BLOB                        NOT NULL UNIQUE,
-    sent_at    TIMESTAMP WITHOUT TIME ZONE NOT NULL
-);
-
-INSERT INTO reply_key_new (key_digest, reply_key, sent_at)
-SELECT key_digest,
-       reply_key,
-       datetime(sent_at_timestamp, 'unixepoch') AS sent_at
-FROM reply_key;
-
-DROP TABLE reply_key;
-ALTER TABLE reply_key_new
-    RENAME TO reply_key;
-
-
-- change `last_sent_timestamp` unix timestamp to `sent_at` last_sent
-CREATE TABLE reply_surb_sender_new
-(
-    id        INTEGER                     NOT NULL PRIMARY KEY AUTOINCREMENT,
-    last_sent TIMESTAMP WITHOUT TIME ZONE NOT NULL,
-    tag       BLOB                        NOT NULL UNIQUE
-);
-
-INSERT INTO reply_surb_sender_new (id, last_sent, tag)
-SELECT id,
-       datetime(last_sent_timestamp, 'unixepoch') AS last_sent,
-       tag
-FROM reply_surb_sender;
-
-
-- recreate `reply_surb` table due to foreign key constraint
-CREATE TABLE reply_surb_new
-(
-    reply_surb_sender_id INTEGER NOT NULL,
-    reply_surb           BLOB    NOT NULL,
-    encoded_key_rotation TINYINT NOT NULL,
-
-    FOREIGN KEY (reply_surb_sender_id) REFERENCES reply_surb_sender_new (id)
-);
-
-INSERT INTO reply_surb_new
-SELECT *
-FROM reply_surb;
-
-DROP TABLE reply_surb;
-ALTER TABLE reply_surb_new
-    RENAME TO reply_surb;
-
-DROP TABLE reply_surb_sender;
-ALTER TABLE reply_surb_sender_new
-    RENAME TO reply_surb_sender;
-
-
@@ -1,12 +0,0 @@
-/*
- * Copyright 2025 - Nym Technologies SA <contact@nymtech.net>
- * SPDX-License-Identifier: Apache-2.0
- */
-
-- don't persist sender_tag in the DB. instead generate fresh one on each restart
-- this will:
-- A) further help against correlation attacks
-- B) realistically after client restarts, we might be in new key rotation anyway meaning receiver would have to start
-- "from scratch" with surbs
-
-DROP TABLE sender_tag;
@@ -4,7 +4,6 @@
 use crate::backend::Empty;
 use crate::{CombinedReplyStorage, ReplyStorageBackend};
 use async_trait::async_trait;
-use time::OffsetDateTime;

 // well, right now we don't have the browser storage : (
 // so we keep everything in memory
@@ -39,10 +38,7 @@ impl ReplyStorageBackend for Backend {
        self.empty.init_fresh(fresh).await
    }

-    async fn load_surb_storage(
-        &self,
-        surb_freshness_cutoff: OffsetDateTime,
-    ) -> Result<CombinedReplyStorage, Self::StorageError> {
-        self.empty.load_surb_storage(surb_freshness_cutoff).await
+    async fn load_surb_storage(&self) -> Result<CombinedReplyStorage, Self::StorageError> {
+        self.empty.load_surb_storage().await
    }
 }
@@ -3,15 +3,17 @@

 use crate::backend::fs_backend::{
    error::StorageError,
-    models::{ReplySurbStorageMetadata, StoredReplyKey, StoredReplySurb, StoredSurbSender},
+    models::{
+        ReplySurbStorageMetadata, StoredReplyKey, StoredReplySurb, StoredSenderTag,
+        StoredSurbSender,
+    },
 };
+use log::{error, info};
 use sqlx::{
    sqlite::{SqliteAutoVacuum, SqliteSynchronous},
    ConnectOptions,
 };
 use std::path::Path;
-use time::OffsetDateTime;
-use tracing::{error, info};

 use sqlx_pool_guard::SqlitePoolGuard;

@@ -79,11 +81,9 @@ impl StorageManager {
    }

    pub async fn create_status_table(&self) -> Result<(), sqlx::Error> {
-        sqlx::query!(
-            "INSERT INTO status(flush_in_progress, previous_flush, client_in_use) VALUES (0, 0, 1)"
-        )
-        .execute(&*self.connection_pool)
-        .await?;
+        sqlx::query!("INSERT INTO status(flush_in_progress, previous_flush_timestamp, client_in_use) VALUES (0, 0, 1)")
+            .execute(&*self.connection_pool)
+            .await?;
        Ok(())
    }

@@ -94,18 +94,18 @@ impl StorageManager {
            .map(|r| r.flush_in_progress > 0)
    }

-    pub async fn set_previous_flush(&self, timestamp: OffsetDateTime) -> Result<(), sqlx::Error> {
-        sqlx::query!("UPDATE status SET previous_flush = ?", timestamp)
+    pub async fn set_previous_flush_timestamp(&self, timestamp: i64) -> Result<(), sqlx::Error> {
+        sqlx::query!("UPDATE status SET previous_flush_timestamp = ?", timestamp)
            .execute(&*self.connection_pool)
            .await?;
        Ok(())
    }

-    pub async fn get_previous_flush_time(&self) -> Result<OffsetDateTime, sqlx::Error> {
-        sqlx::query!(r#"SELECT previous_flush AS "previous_flush: OffsetDateTime" FROM status"#)
+    pub async fn get_previous_flush_timestamp(&self) -> Result<i64, sqlx::Error> {
+        sqlx::query!("SELECT previous_flush_timestamp FROM status;")
            .fetch_one(&*self.connection_pool)
            .await
-            .map(|r| r.previous_flush)
+            .map(|r| r.previous_flush_timestamp)
    }

    pub async fn set_flush_status(&self, in_progress: bool) -> Result<(), sqlx::Error> {
@@ -131,6 +131,32 @@ impl StorageManager {
        Ok(())
    }

+    pub async fn delete_all_tags(&self) -> Result<(), sqlx::Error> {
+        sqlx::query!("DELETE FROM sender_tag;")
+            .execute(&*self.connection_pool)
+            .await?;
+        Ok(())
+    }
+
+    pub async fn get_tags(&self) -> Result<Vec<StoredSenderTag>, sqlx::Error> {
+        sqlx::query_as!(StoredSenderTag, "SELECT * FROM sender_tag;",)
+            .fetch_all(&*self.connection_pool)
+            .await
+    }
+
+    pub async fn insert_tag(&self, stored_tag: StoredSenderTag) -> Result<(), sqlx::Error> {
+        sqlx::query!(
+            r#"
+                INSERT INTO sender_tag(recipient, tag) VALUES (?, ?);
+            "#,
+            stored_tag.recipient,
+            stored_tag.tag
+        )
+        .execute(&*self.connection_pool)
+        .await?;
+        Ok(())
+    }
+
    pub async fn delete_all_reply_keys(&self) -> Result<(), sqlx::Error> {
        sqlx::query!("DELETE FROM reply_key;")
            .execute(&*self.connection_pool)
@@ -139,7 +165,7 @@ impl StorageManager {
    }

    pub async fn get_reply_keys(&self) -> Result<Vec<StoredReplyKey>, sqlx::Error> {
-        sqlx::query_as("SELECT * FROM reply_key;")
+        sqlx::query_as!(StoredReplyKey, "SELECT * FROM reply_key;",)
            .fetch_all(&*self.connection_pool)
            .await
    }
@@ -150,11 +176,11 @@ impl StorageManager {
    ) -> Result<(), sqlx::Error> {
        sqlx::query!(
            r#"
-                INSERT INTO reply_key(key_digest, reply_key, sent_at) VALUES (?, ?, ?);
+                INSERT INTO reply_key(key_digest, reply_key, sent_at_timestamp) VALUES (?, ?, ?);
            "#,
            stored_reply_key.key_digest,
            stored_reply_key.reply_key,
-            stored_reply_key.sent_at
+            stored_reply_key.sent_at_timestamp
        )
        .execute(&*self.connection_pool)
        .await?;
@@ -162,7 +188,7 @@ impl StorageManager {
    }

    pub async fn get_surb_senders(&self) -> Result<Vec<StoredSurbSender>, sqlx::Error> {
-        sqlx::query_as("SELECT * FROM reply_surb_sender;")
+        sqlx::query_as!(StoredSurbSender, "SELECT * FROM reply_surb_sender;",)
            .fetch_all(&*self.connection_pool)
            .await
    }
@@ -173,10 +199,10 @@ impl StorageManager {
    ) -> Result<i64, sqlx::Error> {
        let id = sqlx::query!(
            r#"
-                INSERT INTO reply_surb_sender(tag, last_sent) VALUES (?, ?);
+                INSERT INTO reply_surb_sender(tag, last_sent_timestamp) VALUES (?, ?);
            "#,
            stored_surb_sender.tag,
-            stored_surb_sender.last_sent
+            stored_surb_sender.last_sent_timestamp
        )
        .execute(&*self.connection_pool)
        .await?
@@ -191,7 +217,7 @@ impl StorageManager {
        sqlx::query_as!(
            StoredReplySurb,
            r#"
-                SELECT reply_surb_sender_id, reply_surb, encoded_key_rotation as "encoded_key_rotation: u8" FROM reply_surb
+                SELECT reply_surb_sender_id, reply_surb, encoded_key_rotation as "encoded_key_rotation: u8" FROM reply_surb 
                WHERE reply_surb_sender_id = ?
            "#,
            sender_id
@@ -4,16 +4,20 @@
 use crate::{
    backend::fs_backend::{
        manager::StorageManager,
-        models::{ReplySurbStorageMetadata, StoredReplyKey, StoredReplySurb, StoredSurbSender},
+        models::{
+            ReplySurbStorageMetadata, StoredReplyKey, StoredReplySurb, StoredSenderTag,
+            StoredSurbSender,
+        },
    },
    surb_storage::ReceivedReplySurbs,
    CombinedReplyStorage, ReceivedReplySurbsMap, ReplyStorageBackend, SentReplyKeys,
+    UsedSenderTags,
 };
 use async_trait::async_trait;
+use log::{debug, error, info, warn};
 use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag;
 use std::path::{Path, PathBuf};
 use time::OffsetDateTime;
-use tracing::{error, info, warn};

 pub use self::error::StorageError;

@@ -53,7 +57,10 @@ impl Backend {
        }
    }

-    pub async fn try_load<P: AsRef<Path>>(database_path: P) -> Result<Self, StorageError> {
+    pub async fn try_load<P: AsRef<Path>>(
+        database_path: P,
+        fresh_sender_tags: bool,
+    ) -> Result<Self, StorageError> {
        let owned_path: PathBuf = database_path.as_ref().into();
        if owned_path.file_name().is_none() {
            return Err(StorageError::DatabasePathWithoutFilename {
@@ -62,7 +69,7 @@ impl Backend {
        }

        let manager = StorageManager::init(database_path, false).await?;
-        match Self::try_load_inner(&manager).await {
+        match Self::try_load_inner(&manager, fresh_sender_tags).await {
            Ok(()) => Ok(Backend {
                temporary_old_path: None,
                database_path: owned_path,
@@ -80,15 +87,18 @@ impl Backend {
        self.manager.close_pool().await
    }

-    async fn try_load_inner(manager: &StorageManager) -> Result<(), StorageError> {
+    async fn try_load_inner(
+        manager: &StorageManager,
+        fresh_sender_tags: bool,
+    ) -> Result<(), StorageError> {
        // the database flush wasn't fully finished and thus the data is in inconsistent state
        // (we don't really know what's properly saved or what's not)
        if manager.get_flush_status().await? {
            return Err(StorageError::IncompleteDataFlush);
        }

-        let last_flush = manager.get_previous_flush_time().await?;
-        if last_flush == OffsetDateTime::UNIX_EPOCH {
+        let last_flush_timestamp = manager.get_previous_flush_timestamp().await?;
+        if last_flush_timestamp == 0 {
            // either this client has been running since 1970 or the flush failed
            return Err(StorageError::IncompleteDataFlush);
        }
@@ -108,6 +118,15 @@ impl Backend {
            return Err(err.into());
        }

+        let last_flush = match OffsetDateTime::from_unix_timestamp(last_flush_timestamp) {
+            Ok(last_flush) => last_flush,
+            Err(err) => {
+                return Err(StorageError::CorruptedData {
+                    details: format!("failed to parse stored timestamp - {err}"),
+                });
+            }
+        };
+
        // in theory clients can use our reply surbs whenever they want, even a year in the future
        // (assuming no key rotation has happened)
        // but the way it's currently coded, everyone will purge old data
@@ -125,6 +144,14 @@ impl Backend {
            manager.delete_all_reply_keys().await?;
        }

+        if days > 2 {
+            info!("it's been over {days} days and {hours} hours since we last used our data store. our used sender tags are already outdated - we're going to purge them now.");
+            manager.delete_all_tags().await?;
+        } else if fresh_sender_tags {
+            debug!("starting with fresh sender tags");
+            manager.delete_all_tags().await?;
+        }
+
        Ok(())
    }

@@ -169,7 +196,7 @@ impl Backend {

    async fn end_storage_flush(&self) -> Result<(), StorageError> {
        self.manager
-            .set_previous_flush(OffsetDateTime::now_utc())
+            .set_previous_flush_timestamp(OffsetDateTime::now_utc().unix_timestamp())
            .await?;
        Ok(self.manager.set_flush_status(false).await?)
    }
@@ -182,6 +209,29 @@ impl Backend {
        Ok(self.manager.set_client_in_use_status(false).await?)
    }

+    async fn get_stored_tags(&self) -> Result<UsedSenderTags, StorageError> {
+        let stored = self.manager.get_tags().await?;
+
+        // stop at the first instance of corruption. if even a single entry is malformed,
+        // something weird has happened and we can't trust the rest of the data
+        let raw = stored
+            .into_iter()
+            .map(TryInto::try_into)
+            .collect::<Result<_, _>>()?;
+
+        Ok(UsedSenderTags::from_raw(raw))
+    }
+
+    async fn dump_sender_tags(&self, tags: &UsedSenderTags) -> Result<(), StorageError> {
+        for map_ref in tags.as_raw_iter() {
+            let (recipient, tag) = map_ref.pair();
+            self.manager
+                .insert_tag(StoredSenderTag::new(*recipient, *tag))
+                .await?;
+        }
+        Ok(())
+    }
+
    async fn get_stored_reply_keys(&self) -> Result<SentReplyKeys, StorageError> {
        let stored = self.manager.get_reply_keys().await?;

@@ -205,17 +255,14 @@ impl Backend {
        Ok(())
    }

-    async fn get_stored_reply_surbs(
-        &self,
-        surb_freshness_cutoff: OffsetDateTime,
-    ) -> Result<ReceivedReplySurbsMap, StorageError> {
+    async fn get_stored_reply_surbs(&self) -> Result<ReceivedReplySurbsMap, StorageError> {
        let surb_senders = self.manager.get_surb_senders().await?;

        let metadata = self.get_reply_surb_storage_metadata().await?;
        let mut received_surbs = Vec::with_capacity(surb_senders.len());
        for sender in surb_senders {
            let sender_id = sender.id;
-            let (sender_tag, surbs_last_received_at): (AnonymousSenderTag, OffsetDateTime) =
+            let (sender_tag, surbs_last_received_at_timestamp): (AnonymousSenderTag, i64) =
                sender.try_into()?;
            let stored_surbs = self
                .manager
@@ -227,17 +274,15 @@ impl Backend {

            received_surbs.push((
                sender_tag,
-                ReceivedReplySurbs::new_retrieved(stored_surbs, surbs_last_received_at),
+                ReceivedReplySurbs::new_retrieved(stored_surbs, surbs_last_received_at_timestamp),
            ))
        }

-        let received_surbs = ReceivedReplySurbsMap::from_raw(
+        Ok(ReceivedReplySurbsMap::from_raw(
            metadata.min_reply_surb_threshold as usize,
            metadata.max_reply_surb_threshold as usize,
            received_surbs,
-        );
-        received_surbs.drop_stale_loaded_surbs(surb_freshness_cutoff);
-        Ok(received_surbs)
+        ))
    }

    async fn dump_reply_surbs(
@@ -259,14 +304,6 @@ impl Backend {
                    .insert_reply_surb(StoredReplySurb::new(sender_id, reply_surb))
                    .await?
            }
-
-            // TODO: should we also retain the stale ones?
-            if received_surbs.possibly_stale_left() != 0 {
-                warn!(
-                    "dropping {} possibly stale surbs for {tag}",
-                    received_surbs.possibly_stale_left()
-                );
-            }
        }
        Ok(())
    }
@@ -310,6 +347,7 @@ impl ReplyStorageBackend for Backend {
        self.rotate().await?;
        self.start_storage_flush().await?;

+        self.dump_sender_tags(storage.tags_storage_ref()).await?;
        self.dump_sender_reply_keys(storage.key_storage_ref())
            .await?;
        let surbs_ref = storage.surbs_storage_ref();
@@ -326,14 +364,12 @@ impl ReplyStorageBackend for Backend {
            .await
    }

-    async fn load_surb_storage(
-        &self,
-        surb_freshness_cutoff: OffsetDateTime,
-    ) -> Result<CombinedReplyStorage, Self::StorageError> {
+    async fn load_surb_storage(&self) -> Result<CombinedReplyStorage, Self::StorageError> {
        let reply_keys = self.get_stored_reply_keys().await?;
-        let reply_surbs = self.get_stored_reply_surbs(surb_freshness_cutoff).await?;
+        let tags = self.get_stored_tags().await?;
+        let reply_surbs = self.get_stored_reply_surbs().await?;

-        Ok(CombinedReplyStorage::load(reply_keys, reply_surbs))
+        Ok(CombinedReplyStorage::load(reply_keys, reply_surbs, tags))
    }

    async fn stop_storage_session(self) -> Result<(), Self::StorageError> {
@@ -3,7 +3,6 @@

 use crate::backend::fs_backend::error::StorageError;
 use crate::key_storage::UsedReplyKey;
-use crate::ReceivedReplySurb;
 use nym_crypto::generic_array::typenum::Unsigned;
 use nym_crypto::Digest;
 use nym_sphinx::addressing::clients::{Recipient, RecipientBytes};
@@ -13,8 +12,6 @@ use nym_sphinx::anonymous_replies::{
    ReplySurb, ReplySurbWithKeyRotation, SurbEncryptionKey, SurbEncryptionKeySize,
 };
 use nym_sphinx::params::{ReplySurbKeyDigestAlgorithm, SphinxKeyRotation};
-use sqlx::FromRow;
-use time::OffsetDateTime;

 #[derive(Debug, Clone)]
 pub struct StoredSenderTag {
@@ -61,11 +58,11 @@ impl TryFrom<StoredSenderTag> for (RecipientBytes, AnonymousSenderTag) {
    }
 }

-#[derive(Debug, Clone, FromRow)]
+#[derive(Debug, Clone)]
 pub struct StoredReplyKey {
    pub key_digest: Vec<u8>,
    pub reply_key: Vec<u8>,
-    pub sent_at: OffsetDateTime,
+    pub sent_at_timestamp: i64,
 }

 impl StoredReplyKey {
@@ -73,7 +70,7 @@ impl StoredReplyKey {
        StoredReplyKey {
            key_digest: key_digest.to_vec(),
            reply_key: (*reply_key).to_bytes(),
-            sent_at: reply_key.sent_at,
+            sent_at_timestamp: reply_key.sent_at_timestamp,
        }
    }
 }
@@ -103,30 +100,32 @@ impl TryFrom<StoredReplyKey> for (EncryptionKeyDigest, UsedReplyKey) {
            });
        };

-        Ok((digest, UsedReplyKey::new(reply_key, value.sent_at)))
+        Ok((
+            digest,
+            UsedReplyKey::new(reply_key, value.sent_at_timestamp),
+        ))
    }
 }

-#[derive(FromRow)]
 pub struct StoredSurbSender {
    pub id: i64,
    pub tag: Vec<u8>,
-    pub last_sent: OffsetDateTime,
+    pub last_sent_timestamp: i64,
 }

 impl StoredSurbSender {
-    pub fn new(tag: AnonymousSenderTag, last_sent: OffsetDateTime) -> Self {
+    pub fn new(tag: AnonymousSenderTag, last_sent_timestamp: i64) -> Self {
        StoredSurbSender {
            // for the purposes of STORING data,
            // we ignore that field anyway
            id: 0,
            tag: tag.to_bytes().to_vec(),
-            last_sent,
+            last_sent_timestamp,
        }
    }
 }

-impl TryFrom<StoredSurbSender> for (AnonymousSenderTag, OffsetDateTime) {
+impl TryFrom<StoredSurbSender> for (AnonymousSenderTag, i64) {
    type Error = StorageError;

    fn try_from(value: StoredSurbSender) -> Result<Self, Self::Error> {
@@ -141,7 +140,7 @@ impl TryFrom<StoredSurbSender> for (AnonymousSenderTag, OffsetDateTime) {

        Ok((
            AnonymousSenderTag::from_bytes(sender_tag_bytes),
-            value.last_sent,
+            value.last_sent_timestamp,
        ))
    }
 }
@@ -156,10 +155,10 @@ pub struct StoredReplySurb {
 }

 impl StoredReplySurb {
-    pub fn new(reply_surb_sender_id: i64, reply_surb: &ReceivedReplySurb) -> Self {
+    pub fn new(reply_surb_sender_id: i64, reply_surb: &ReplySurbWithKeyRotation) -> Self {
        StoredReplySurb {
            reply_surb_sender_id,
-            reply_surb: reply_surb.surb.inner_reply_surb().to_bytes(),
+            reply_surb: reply_surb.inner_reply_surb().to_bytes(),
            encoded_key_rotation: reply_surb.key_rotation() as u8,
        }
    }
@@ -5,7 +5,6 @@ use crate::CombinedReplyStorage;
 use async_trait::async_trait;
 use std::error::Error;
 use thiserror::Error;
-use time::OffsetDateTime;

 // TODO: this should now live inside our wasm/client-core
 pub mod browser_backend;
@@ -54,10 +53,7 @@ impl ReplyStorageBackend for Empty {
        Ok(())
    }

-    async fn load_surb_storage(
-        &self,
-        _: OffsetDateTime,
-    ) -> Result<CombinedReplyStorage, Self::StorageError> {
+    async fn load_surb_storage(&self) -> Result<CombinedReplyStorage, Self::StorageError> {
        Ok(CombinedReplyStorage::new(
            self.min_surb_threshold,
            self.max_surb_threshold,
@@ -84,10 +80,7 @@ pub trait ReplyStorageBackend: Sized {
    /// (such as surb thresholds)
    async fn init_fresh(&mut self, fresh: &CombinedReplyStorage) -> Result<(), Self::StorageError>;

-    async fn load_surb_storage(
-        &self,
-        surb_freshness_cutoff: OffsetDateTime,
-    ) -> Result<CombinedReplyStorage, Self::StorageError>;
+    async fn load_surb_storage(&self) -> Result<CombinedReplyStorage, Self::StorageError>;

    async fn stop_storage_session(self) -> Result<(), Self::StorageError> {
        Ok(())
@@ -25,11 +25,12 @@ impl CombinedReplyStorage {
    pub fn load(
        sent_reply_keys: SentReplyKeys,
        received_reply_surbs: ReceivedReplySurbsMap,
+        used_tags: UsedSenderTags,
    ) -> Self {
        CombinedReplyStorage {
            sent_reply_keys,
            received_reply_surbs,
-            used_tags: UsedSenderTags::new(),
+            used_tags,
        }
    }

@@ -47,12 +47,8 @@ impl SentReplyKeys {
        self.inner.data.iter()
    }

-    pub fn retain(&self, f: impl FnMut(&EncryptionKeyDigest, &mut UsedReplyKey) -> bool) {
-        self.inner.data.retain(f);
-    }
-
    pub fn insert_multiple(&self, keys: Vec<SurbEncryptionKey>) {
-        let now = OffsetDateTime::now_utc();
+        let now = OffsetDateTime::now_utc().unix_timestamp();
        for key in keys {
            self.insert(UsedReplyKey::new(key, now))
        }
@@ -75,12 +71,15 @@ impl SentReplyKeys {
 pub struct UsedReplyKey {
    key: SurbEncryptionKey,
    // the purpose of this field is to perform invalidation at relatively very long intervals
-    pub sent_at: OffsetDateTime,
+    pub sent_at_timestamp: i64,
 }

 impl UsedReplyKey {
-    pub(crate) fn new(key: SurbEncryptionKey, sent_at: OffsetDateTime) -> Self {
-        UsedReplyKey { key, sent_at }
+    pub(crate) fn new(key: SurbEncryptionKey, sent_at_timestamp: i64) -> Self {
+        UsedReplyKey {
+            key,
+            sent_at_timestamp,
+        }
    }
 }

@@ -4,9 +4,8 @@
 pub use backend::*;
 pub use combined::CombinedReplyStorage;
 pub use key_storage::SentReplyKeys;
-pub use surb_storage::{ReceivedReplySurb, ReceivedReplySurbsMap, RetrievedReplySurb};
+pub use surb_storage::ReceivedReplySurbsMap;
 pub use tag_storage::UsedSenderTags;
-use time::OffsetDateTime;

 mod backend;
 mod combined;
@@ -30,11 +29,8 @@ where
        PersistentReplyStorage { backend }
    }

-    pub async fn load_state_from_backend(
-        &self,
-        surb_freshness_cutoff: OffsetDateTime,
-    ) -> Result<CombinedReplyStorage, T::StorageError> {
-        self.backend.load_surb_storage(surb_freshness_cutoff).await
+    pub async fn load_state_from_backend(&self) -> Result<CombinedReplyStorage, T::StorageError> {
+        self.backend.load_surb_storage().await
    }

    pub async fn flush_on_shutdown(
@@ -42,7 +38,7 @@ where
        mem_state: CombinedReplyStorage,
        mut shutdown: nym_task::TaskClient,
    ) {
-        use tracing::{debug, error, info};
+        use log::{debug, error, info};

        debug!("Started PersistentReplyStorage");
        if let Err(err) = self.backend.start_storage_session().await {
@@ -1,45 +1,15 @@
 // Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use dashmap::iter::{Iter, IterMut};
+use dashmap::iter::Iter;
 use dashmap::DashMap;
+use log::trace;
 use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag;
 use nym_sphinx::anonymous_replies::ReplySurbWithKeyRotation;
-use nym_sphinx::params::SphinxKeyRotation;
-use std::cmp::min;
 use std::collections::VecDeque;
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::Arc;
 use time::OffsetDateTime;
-use tracing::{error, info, trace};
-
-#[derive(Debug)]
-pub struct RetrievedReplySurb {
-    pub(crate) reply_surb: ReceivedReplySurb,
-    pub(crate) stale_pile: bool,
-}
-
-impl RetrievedReplySurb {
-    pub(crate) fn new_fresh(reply_surb: ReceivedReplySurb) -> Self {
-        RetrievedReplySurb {
-            reply_surb,
-            stale_pile: false,
-        }
-    }
-
-    pub(crate) fn new_stale(reply_surb: ReceivedReplySurb) -> Self {
-        RetrievedReplySurb {
-            reply_surb,
-            stale_pile: true,
-        }
-    }
-}
-
-impl From<RetrievedReplySurb> for ReplySurbWithKeyRotation {
-    fn from(retrieved: RetrievedReplySurb) -> Self {
-        retrieved.reply_surb.into()
-    }
-}

 #[derive(Debug, Clone)]
 pub struct ReceivedReplySurbsMap {
@@ -87,40 +57,17 @@ impl ReceivedReplySurbsMap {
        self.inner.data.iter()
    }

-    pub fn as_raw_iter_mut(&self) -> IterMut<'_, AnonymousSenderTag, ReceivedReplySurbs> {
-        self.inner.data.iter_mut()
+    pub fn remove(&self, target: &AnonymousSenderTag) {
+        self.inner.data.remove(target);
    }

-    fn total_surbs(&self) -> usize {
-        self.inner
-            .data
-            .iter()
-            .map(|entry| entry.value().data.len())
-            .sum()
-    }
-
-    pub fn drop_stale_loaded_surbs(&self, cutoff: OffsetDateTime) {
-        let before = self.total_surbs();
-        self.inner.data.retain(|_, v| {
-            if v.surbs_last_received_at() < cutoff {
-                return false;
-            }
-
-            v.data.retain(|s| s.received_at > cutoff);
-            !v.data.is_empty()
-        });
-        let after = self.total_surbs();
-        let diff = before - after;
-        if diff != 0 {
-            info!("removed {diff} stale reply SURBs")
+    pub fn reset_surbs_last_received_at(&self, target: &AnonymousSenderTag) {
+        if let Some(mut entry) = self.inner.data.get_mut(target) {
+            entry.surbs_last_received_at_timestamp = OffsetDateTime::now_utc().unix_timestamp();
        }
    }

-    pub fn retain(&self, f: impl FnMut(&AnonymousSenderTag, &mut ReceivedReplySurbs) -> bool) {
-        self.inner.data.retain(f);
-    }
-
-    pub fn surbs_last_received_at(&self, target: &AnonymousSenderTag) -> Option<OffsetDateTime> {
+    pub fn surbs_last_received_at(&self, target: &AnonymousSenderTag) -> Option<i64> {
        self.inner
            .data
            .get(target)
@@ -179,25 +126,15 @@ impl ReceivedReplySurbsMap {
            .unwrap_or_default()
    }

-    pub fn available_fresh_surbs(&self, target: &AnonymousSenderTag) -> usize {
-        self.inner
-            .data
-            .get(target)
-            .map(|entry| entry.fresh_left())
-            .unwrap_or_default()
-    }
-
    pub fn contains_surbs_for(&self, target: &AnonymousSenderTag) -> bool {
        self.inner.data.contains_key(target)
    }

-    /// Attempt to retrieve the specified number of reply SURBs for the target sender
-    /// and return the number of SURBs remaining in the storage after the call.
    pub fn get_reply_surbs(
        &self,
        target: &AnonymousSenderTag,
        amount: usize,
-    ) -> (Option<Vec<RetrievedReplySurb>>, usize) {
+    ) -> (Option<Vec<ReplySurbWithKeyRotation>>, usize) {
        if let Some(mut entry) = self.inner.data.get_mut(target) {
            let surbs_left = entry.items_left();
            if surbs_left < self.min_surb_threshold() + amount {
@@ -213,72 +150,34 @@ impl ReceivedReplySurbsMap {
    pub fn get_reply_surb_ignoring_threshold(
        &self,
        target: &AnonymousSenderTag,
-    ) -> (Option<RetrievedReplySurb>, usize) {
-        let Some(mut entry) = self.inner.data.get_mut(target) else {
-            return (None, 0);
-        };
-
-        entry.get_reply_surb()
+    ) -> Option<(Option<ReplySurbWithKeyRotation>, usize)> {
+        self.inner
+            .data
+            .get_mut(target)
+            .map(|mut s| s.get_reply_surb())
    }

    pub fn get_reply_surb(
        &self,
        target: &AnonymousSenderTag,
-    ) -> (Option<RetrievedReplySurb>, usize) {
-        let Some(mut entry) = self.inner.data.get_mut(target) else {
-            return (None, 0);
-        };
-
-        let surbs_left = entry.items_left();
-        if surbs_left < self.min_surb_threshold() {
-            (None, surbs_left)
-        } else {
-            entry.get_reply_surb()
-        }
-    }
-
-    pub fn re_insert_reply_surbs(
-        &self,
-        target: &AnonymousSenderTag,
-        surbs: Vec<RetrievedReplySurb>,
-    ) {
-        error!("re-inserting {} unused surbs", surbs.len());
-        let mut entry = self.inner.data.entry(*target).or_insert_with(|| {
-            // this branch should realistically NEVER happen, but software be software, so let's not crash
-            error!("attempting to return surbs to no longer existing entry {target}");
-            ReceivedReplySurbs::new(VecDeque::new())
-        });
-
-        let entry = entry.value_mut();
-        for returned_surb in surbs.into_iter().rev() {
-            if returned_surb.stale_pile {
-                entry.possibly_stale.push_front(returned_surb.reply_surb)
+    ) -> Option<(Option<ReplySurbWithKeyRotation>, usize)> {
+        self.inner.data.get_mut(target).map(|mut entry| {
+            let surbs_left = entry.items_left();
+            if surbs_left < self.min_surb_threshold() {
+                (None, surbs_left)
            } else {
-                entry.data.push_front(returned_surb.reply_surb)
+                entry.get_reply_surb()
            }
-        }
+        })
    }

-    pub fn insert_fresh_surbs<I: IntoIterator<Item = ReplySurbWithKeyRotation>>(
+    pub fn insert_surbs<I: IntoIterator<Item = ReplySurbWithKeyRotation>>(
        &self,
        target: &AnonymousSenderTag,
        surbs: I,
    ) {
        if let Some(mut existing_data) = self.inner.data.get_mut(target) {
-            existing_data.insert_fresh_reply_surbs(surbs);
-
-            if existing_data.possibly_stale.is_empty() {
-                return;
-            }
-
-            // if we're above the minimum threshold, remove stale surbs
-            let threshold = self.min_surb_threshold();
-            let diff = existing_data.data.len().saturating_sub(threshold);
-
-            trace!("will attempt to remove up to {diff} stale surbs");
-            if diff > 0 {
-                existing_data.remove_stale_surbs(diff);
-            }
+            existing_data.insert_reply_surbs(surbs)
        } else {
            let new_entry = ReceivedReplySurbs::new(surbs.into_iter().collect());
            self.inner.data.insert(*target, new_entry);
@@ -286,102 +185,44 @@ impl ReceivedReplySurbsMap {
    }
 }

-#[derive(Debug)]
-pub struct ReceivedReplySurb {
-    pub(crate) surb: ReplySurbWithKeyRotation,
-    pub(crate) received_at: OffsetDateTime,
-}
-
-impl From<ReceivedReplySurb> for ReplySurbWithKeyRotation {
-    fn from(surb: ReceivedReplySurb) -> Self {
-        surb.surb
-    }
-}
-
-impl ReceivedReplySurb {
-    pub fn received_at(&self) -> OffsetDateTime {
-        self.received_at
-    }
-
-    pub fn key_rotation(&self) -> SphinxKeyRotation {
-        self.surb.key_rotation()
-    }
-}
-
 #[derive(Debug)]
 pub struct ReceivedReplySurbs {
-    data: VecDeque<ReceivedReplySurb>,
-    possibly_stale: VecDeque<ReceivedReplySurb>,
+    // in the future we'd probably want to put extra data here to indicate when the SURBs got received
+    // so we could invalidate entries from the previous key rotations
+    data: VecDeque<ReplySurbWithKeyRotation>,

    pending_reception: u32,
-    surbs_last_received_at: OffsetDateTime,
+    surbs_last_received_at_timestamp: i64,
 }

 impl ReceivedReplySurbs {
    fn new(initial_surbs: VecDeque<ReplySurbWithKeyRotation>) -> Self {
-        let mut this = ReceivedReplySurbs {
-            data: Default::default(),
-            possibly_stale: Default::default(),
+        ReceivedReplySurbs {
+            data: initial_surbs,
            pending_reception: 0,
-            surbs_last_received_at: OffsetDateTime::now_utc(),
-        };
-        this.insert_fresh_reply_surbs(initial_surbs);
-        this
+            surbs_last_received_at_timestamp: OffsetDateTime::now_utc().unix_timestamp(),
+        }
    }

    #[cfg(all(not(target_arch = "wasm32"), feature = "fs-surb-storage"))]
    pub fn new_retrieved(
        surbs: Vec<ReplySurbWithKeyRotation>,
-        surbs_last_received_at: OffsetDateTime,
+        surbs_last_received_at_timestamp: i64,
    ) -> ReceivedReplySurbs {
-        let mut this = ReceivedReplySurbs {
-            data: Default::default(),
-            possibly_stale: Default::default(),
+        ReceivedReplySurbs {
+            data: surbs.into(),
            pending_reception: 0,
-            surbs_last_received_at,
-        };
-        this.insert_fresh_reply_surbs(surbs);
-        this.surbs_last_received_at = surbs_last_received_at;
-        this
-    }
-
-    pub fn downgrade_freshness(&mut self) -> usize {
-        debug_assert!(self.possibly_stale.is_empty());
-        std::mem::swap(&mut self.data, &mut self.possibly_stale);
-        self.possibly_stale.len()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.data.is_empty() && self.possibly_stale.is_empty()
+            surbs_last_received_at_timestamp,
+        }
    }

    #[cfg(all(not(target_arch = "wasm32"), feature = "fs-surb-storage"))]
-    pub fn surbs_ref(&self) -> &VecDeque<ReceivedReplySurb> {
+    pub fn surbs_ref(&self) -> &VecDeque<ReplySurbWithKeyRotation> {
        &self.data
    }

-    pub fn retain_fresh_surbs(&mut self, f: impl FnMut(&ReceivedReplySurb) -> bool) {
-        self.data.retain(f);
-    }
-
-    pub fn retain_possibly_stale_surbs(&mut self, f: impl FnMut(&ReceivedReplySurb) -> bool) {
-        self.possibly_stale.retain(f);
-    }
-
-    pub fn fresh_left(&self) -> usize {
-        self.data.len()
-    }
-
-    pub fn possibly_stale_left(&self) -> usize {
-        self.possibly_stale.len()
-    }
-
-    pub fn drop_possibly_stale_surbs(&mut self) {
-        self.possibly_stale = VecDeque::new();
-    }
-
-    pub fn surbs_last_received_at(&self) -> OffsetDateTime {
-        self.surbs_last_received_at
+    pub fn surbs_last_received_at(&self) -> i64 {
+        self.surbs_last_received_at_timestamp
    }

    pub fn pending_reception(&self) -> u32 {
@@ -402,78 +243,39 @@ impl ReceivedReplySurbs {
        self.pending_reception = 0;
    }

-    /// Attempt to retrieve the specified number of reply SURBs (if at least that many are present)
-    /// and return the number of SURBs remaining in the storage after the call.
-    pub fn get_reply_surbs(&mut self, amount: usize) -> (Option<Vec<RetrievedReplySurb>>, usize) {
+    pub fn get_reply_surbs(
+        &mut self,
+        amount: usize,
+    ) -> (Option<Vec<ReplySurbWithKeyRotation>>, usize) {
        if self.items_left() < amount {
            (None, self.items_left())
        } else {
-            let available_fresh = self.fresh_left();
-
-            // prefer the 'fresh' data if available. otherwise fallback to the possibly stale entries
-            let mut reply_surbs = Vec::with_capacity(amount);
-
-            let fresh_to_retrieve = min(available_fresh, amount);
-
-            for surb in self.data.drain(..fresh_to_retrieve) {
-                reply_surbs.push(RetrievedReplySurb::new_fresh(surb))
-            }
-
-            if available_fresh < amount {
-                let stale_to_retrieve = amount - fresh_to_retrieve;
-                for surb in self.possibly_stale.drain(..stale_to_retrieve) {
-                    reply_surbs.push(RetrievedReplySurb::new_stale(surb))
-                }
-            }
-
-            (Some(reply_surbs), self.items_left())
+            let surbs = self.data.drain(..amount).collect();
+            (Some(surbs), self.items_left())
        }
    }

-    pub fn get_reply_surb(&mut self) -> (Option<RetrievedReplySurb>, usize) {
+    pub fn get_reply_surb(&mut self) -> (Option<ReplySurbWithKeyRotation>, usize) {
        (self.pop_surb(), self.items_left())
    }

-    fn pop_surb(&mut self) -> Option<RetrievedReplySurb> {
-        // prefer the 'fresh' data if available. otherwise fallback to the possibly stale entries
-        if let Some(fresh) = self.data.pop_front() {
-            return Some(RetrievedReplySurb::new_fresh(fresh));
-        }
-        if let Some(stale) = self.possibly_stale.pop_front() {
-            return Some(RetrievedReplySurb::new_stale(stale));
-        }
-        None
+    fn pop_surb(&mut self) -> Option<ReplySurbWithKeyRotation> {
+        self.data.pop_front()
    }

    fn items_left(&self) -> usize {
-        self.data.len() + self.possibly_stale.len()
-    }
-
-    pub fn remove_stale_surbs(&mut self, amount: usize) {
-        // remove up to amount number of possibly stale surbs
-        let amount = min(amount, self.possibly_stale.len());
-
-        self.possibly_stale.drain(..amount);
+        self.data.len()
    }

    // realistically we're always going to be getting multiple surbs at once
-    pub(crate) fn insert_fresh_reply_surbs<I: IntoIterator<Item = ReplySurbWithKeyRotation>>(
+    pub fn insert_reply_surbs<I: IntoIterator<Item = ReplySurbWithKeyRotation>>(
        &mut self,
        surbs: I,
    ) {
-        let received_at = OffsetDateTime::now_utc();
-        let mut v = surbs
-            .into_iter()
-            .map(|surb| ReceivedReplySurb { surb, received_at })
-            .collect::<VecDeque<_>>();
-
-        if v.is_empty() {
-            return;
-        }
-
+        let mut v = surbs.into_iter().collect::<VecDeque<_>>();
        trace!("storing {} surbs in the storage", v.len());
        self.data.append(&mut v);
-        self.surbs_last_received_at = received_at;
+        self.surbs_last_received_at_timestamp = OffsetDateTime::now_utc().unix_timestamp();
        trace!("we now have {} surbs!", self.data.len());
    }
 }
@@ -272,7 +272,7 @@ impl<C, St> GatewayClient<C, St> {
    ) -> Result<(), GatewayClientError> {
        if let Some(shared_key) = self.shared_key() {
            let encrypted = message.encrypt(&*shared_key)?;
-            Box::pin(self.send_websocket_message_without_response(encrypted)).await?;
+            Box::pin(self.send_websocket_message(encrypted)).await?;
            Ok(())
        } else {
            Err(GatewayClientError::ConnectionInInvalidState)
@@ -330,80 +330,9 @@ impl<C, St> GatewayClient<C, St> {
        }
    }

-    /// Attempt to send a websocket message to the gateway without waiting for any response
-    async fn send_websocket_message_without_response(
-        &mut self,
-        msg: impl Into<Message>,
-    ) -> Result<(), GatewayClientError> {
-        match self.connection {
-            SocketState::Available(ref mut conn) => Ok(conn.send(msg.into()).await?),
-            SocketState::PartiallyDelegated(ref mut partially_delegated) => {
-                if let Err(err) = partially_delegated.send_without_response(msg.into()).await {
-                    error!("failed to send message without response - {err}...");
-                    // we must ensure we do not leave the task still active
-                    if let Err(err) = self.recover_socket_connection().await {
-                        error!("... and the delegated stream has also errored out - {err}")
-                    }
-                    Err(err)
-                } else {
-                    Ok(())
-                }
-            }
-            SocketState::NotConnected => Err(GatewayClientError::ConnectionNotEstablished),
-            _ => Err(GatewayClientError::ConnectionInInvalidState),
-        }
-    }
-
-    // A very nasty hack due to lack of id tags on messages - send a non-sphinx packet websocket
-    // message and wait until first non 'Send' response within timeout
-    pub async fn send_websocket_message_with_non_send_response(
-        &mut self,
-        msg: impl Into<Message>,
-    ) -> Result<ServerResponse, GatewayClientError> {
-        let should_restart_mixnet_listener = if self.connection.is_partially_delegated() {
-            self.recover_socket_connection().await?;
-            true
-        } else {
-            false
-        };
-
-        let conn = match self.connection {
-            SocketState::Available(ref mut conn) => conn,
-            SocketState::NotConnected => return Err(GatewayClientError::ConnectionNotEstablished),
-            _ => return Err(GatewayClientError::ConnectionInInvalidState),
-        };
-        conn.send(msg.into()).await?;
-
-        let timeout = sleep(self.cfg.connection.response_timeout_duration);
-        tokio::pin!(timeout);
-
-        let response = loop {
-            tokio::select! {
-                _ = &mut timeout => {
-                    break Err(GatewayClientError::Timeout);
-                }
-                // note: the below will also listen for shutdown signals
-                msg = self.read_control_response() => {
-                    match msg {
-                        Ok(res) => if !res.is_send() {
-                            break Ok(res);
-                        },
-                        Err(err) => break Err(err),
-                    }
-                }
-            }
-        };
-
-        if should_restart_mixnet_listener {
-            self.start_listening_for_mixnet_messages()?;
-        }
-        response
-    }
-
-    /// Attempt to send a websocket message to the gateway and wait until we receive a response.
    // If we want to send a message (with response), we need to have a full control over the socket,
    // as we need to be able to write the request and read the subsequent response
-    pub async fn send_websocket_message_with_response(
+    pub async fn send_websocket_message(
        &mut self,
        msg: impl Into<Message>,
    ) -> Result<ServerResponse, GatewayClientError> {
@@ -458,6 +387,29 @@ impl<C, St> GatewayClient<C, St> {
        }
    }

+    async fn send_websocket_message_without_response(
+        &mut self,
+        msg: Message,
+    ) -> Result<(), GatewayClientError> {
+        match self.connection {
+            SocketState::Available(ref mut conn) => Ok(conn.send(msg).await?),
+            SocketState::PartiallyDelegated(ref mut partially_delegated) => {
+                if let Err(err) = partially_delegated.send_without_response(msg).await {
+                    error!("failed to send message without response - {err}...");
+                    // we must ensure we do not leave the task still active
+                    if let Err(err) = self.recover_socket_connection().await {
+                        error!("... and the delegated stream has also errored out - {err}")
+                    }
+                    Err(err)
+                } else {
+                    Ok(())
+                }
+            }
+            SocketState::NotConnected => Err(GatewayClientError::ConnectionNotEstablished),
+            _ => Err(GatewayClientError::ConnectionInInvalidState),
+        }
+    }
+
    fn check_gateway_protocol(
        &self,
        gateway_protocol: Option<u8>,
@@ -583,10 +535,7 @@ impl<C, St> GatewayClient<C, St> {
        .encrypt(legacy_key)?;

        info!("sending upgrade request and awaiting the acknowledgement back");
-        let (ciphertext, nonce) = match self
-            .send_websocket_message_with_response(upgrade_request)
-            .await?
-        {
+        let (ciphertext, nonce) = match self.send_websocket_message(upgrade_request).await? {
            ServerResponse::EncryptedResponse { ciphertext, nonce } => (ciphertext, nonce),
            ServerResponse::Error { message } => {
                return Err(GatewayClientError::GatewayError(message))
@@ -618,7 +567,7 @@ impl<C, St> GatewayClient<C, St> {
        &mut self,
        msg: ClientControlRequest,
    ) -> Result<(), GatewayClientError> {
-        match self.send_websocket_message_with_response(msg).await? {
+        match self.send_websocket_message(msg).await? {
            ServerResponse::Authenticate {
                protocol_version,
                status,
@@ -768,16 +717,13 @@ impl<C, St> GatewayClient<C, St> {
        }
    }

-    /// Attempt to retrieve the currently supported gateway protocol version of the remote.
    pub async fn get_gateway_protocol(&mut self) -> Result<u8, GatewayClientError> {
        if !self.connection.is_established() {
            return Err(GatewayClientError::ConnectionNotEstablished);
        }

        match self
-            .send_websocket_message_with_non_send_response(
-                ClientControlRequest::SupportedProtocol {},
-            )
+            .send_websocket_message(ClientControlRequest::SupportedProtocol {})
            .await?
        {
            ServerResponse::SupportedProtocol { version } => Ok(version),
@@ -794,10 +740,7 @@ impl<C, St> GatewayClient<C, St> {
            credential,
            self.shared_key.as_ref().unwrap(),
        )?;
-        let bandwidth_remaining = match self
-            .send_websocket_message_with_non_send_response(msg)
-            .await?
-        {
+        let bandwidth_remaining = match self.send_websocket_message(msg).await? {
            ServerResponse::Bandwidth { available_total } => Ok(available_total),
            ServerResponse::Error { message } => Err(GatewayClientError::GatewayError(message)),
            ServerResponse::TypedError { error } => {
@@ -815,10 +758,7 @@ impl<C, St> GatewayClient<C, St> {

    async fn try_claim_testnet_bandwidth(&mut self) -> Result<(), GatewayClientError> {
        let msg = ClientControlRequest::ClaimFreeTestnetBandwidth;
-        let bandwidth_remaining = match self
-            .send_websocket_message_with_non_send_response(msg)
-            .await?
-        {
+        let bandwidth_remaining = match self.send_websocket_message(msg).await? {
            ServerResponse::Bandwidth { available_total } => Ok(available_total),
            ServerResponse::Error { message } => Err(GatewayClientError::GatewayError(message)),
            other => Err(GatewayClientError::UnexpectedResponse { name: other.name() }),
@@ -28,7 +28,6 @@ pub struct Config {
    pub maximum_reconnection_backoff: Duration,
    pub initial_connection_timeout: Duration,
    pub maximum_connection_buffer_size: usize,
-    pub use_legacy_packet_encoding: bool,
 }

 impl Config {
@@ -37,14 +36,12 @@ impl Config {
        maximum_reconnection_backoff: Duration,
        initial_connection_timeout: Duration,
        maximum_connection_buffer_size: usize,
-        use_legacy_packet_encoding: bool,
    ) -> Self {
        Config {
            initial_reconnection_backoff,
            maximum_reconnection_backoff,
            initial_connection_timeout,
            maximum_connection_buffer_size,
-            use_legacy_packet_encoding,
        }
    }
 }
@@ -270,12 +267,7 @@ impl SendWithoutResponse for Client {
    fn send_without_response(&self, packet: MixPacket) -> io::Result<()> {
        let address = packet.next_hop_address();
        trace!("Sending packet to {address}");
-
-        // TODO: optimisation for the future: rather than constantly using legacy encoding,
-        // once we're addressing by node_id (and thus have full node info here),
-        // we could simply infer supported encoding based on their version
-        let framed_packet =
-            FramedNymPacket::from_mix_packet(packet, self.config.use_legacy_packet_encoding);
+        let framed_packet = FramedNymPacket::from(packet);

        let Some(sender) = self.active_connections.get_mut(&address) else {
            // there was never a connection to begin with
@@ -336,7 +328,6 @@ mod tests {
                maximum_reconnection_backoff: Duration::from_millis(300_000),
                initial_connection_timeout: Duration::from_millis(1_500),
                maximum_connection_buffer_size: 128,
-                use_legacy_packet_encoding: false,
            },
            NoiseConfig::new(
                Arc::new(x25519::KeyPair::new(&mut rng)),
@@ -72,7 +72,7 @@ macro_rules! collect_paged_skimmed_v2 {
                .$f(false, Some(page), None, $self.use_bincode)
                .await?;

-            if !metadata.consistency_check(&res.metadata) {
+            if metadata != res.metadata {
                return Err(ValidatorClientError::InconsistentPagedMetadata);
            }

@@ -471,12 +471,12 @@ impl NymApiClient {
    pub async fn get_all_basic_entry_assigned_nodes(
        &self,
    ) -> Result<Vec<SkimmedNode>, ValidatorClientError> {
-        self.get_all_basic_entry_assigned_nodes_with_metadata()
+        self.get_all_basic_entry_assigned_nodes_v2()
            .await
            .map(|res| res.nodes)
    }

-    pub async fn get_all_basic_entry_assigned_nodes_with_metadata(
+    pub async fn get_all_basic_entry_assigned_nodes_v2(
        &self,
    ) -> Result<SkimmedNodesWithMetadata, ValidatorClientError> {
        collect_paged_skimmed_v2!(self, get_basic_entry_assigned_nodes_v2)
@@ -389,6 +389,7 @@ pub trait NymApiClientExt: ApiClient {
                routes::NYM_NODES_ROUTES,
                "skimmed",
                "entry-gateways",
+                "all",
            ],
            &params,
        )
@@ -112,10 +112,6 @@ impl ServerResponse {
            _ => false,
        }
    }
-
-    pub fn is_send(&self) -> bool {
-        matches!(self, ServerResponse::Send { .. })
-    }
 }

 impl From<ServerResponse> for Message {
@@ -131,8 +131,7 @@ impl NoiseConfig {
    }

    // Only for phased update
-    //SW This can lead to some troubles if two nodes share the same IP and one support Noise but not the other.
-    // This in only for the progressive update though and there is no workaround
+    //SW This can lead to some troubles if two nodes shares the same IP and one support Noise but not the other. This in only for the progressive update though and there is no workaround
    pub(crate) fn get_noise_support(&self, ip_addr: IpAddr) -> Option<NoiseVersion> {
        let plain_ip_support = self.network.support.inner.load().get(&ip_addr).copied();

@@ -72,7 +72,11 @@ pub struct FragmentIdentifier {

 impl fmt::Display for FragmentIdentifier {
    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        write!(f, "{} @ {}", self.set_id, self.fragment_position)
+        write!(
+            f,
+            "Fragment Identifier: id: {} position: {}",
+            self.set_id, self.fragment_position
+        )
    }
 }

@@ -6,9 +6,7 @@ use bytes::{BufMut, BytesMut};
 use nym_sphinx_forwarding::packet::MixPacket;
 use nym_sphinx_params::key_rotation::SphinxKeyRotation;
 use nym_sphinx_params::packet_sizes::PacketSize;
-use nym_sphinx_params::packet_version::{
-    PacketVersion, CURRENT_PACKET_VERSION, LEGACY_PACKET_VERSION,
-};
+use nym_sphinx_params::packet_version::{PacketVersion, CURRENT_PACKET_VERSION};
 use nym_sphinx_params::PacketType;
 use nym_sphinx_types::NymPacket;

@@ -21,25 +19,26 @@ pub struct FramedNymPacket {
    pub(crate) packet: NymPacket,
 }

+impl From<MixPacket> for FramedNymPacket {
+    fn from(packet: MixPacket) -> Self {
+        let typ = packet.packet_type();
+        let rot = packet.key_rotation();
+        FramedNymPacket::new(packet.into_packet(), typ, rot)
+    }
+}
+
 impl FramedNymPacket {
    pub fn new(
        packet: NymPacket,
        packet_type: PacketType,
        key_rotation: SphinxKeyRotation,
-        use_legacy_packet_encoding: bool,
    ) -> Self {
        // If this fails somebody is using the library in a super incorrect way, because they
        // already managed to somehow create a sphinx packet
        let packet_size = PacketSize::get_type(packet.len()).unwrap();

-        let packet_version = if use_legacy_packet_encoding {
-            LEGACY_PACKET_VERSION
-        } else {
-            PacketVersion::new()
-        };
-
        let header = Header {
-            packet_version,
+            packet_version: PacketVersion::new(),
            packet_size,
            key_rotation,
            packet_type,
@@ -48,12 +47,6 @@ impl FramedNymPacket {
        FramedNymPacket { header, packet }
    }

-    pub fn from_mix_packet(packet: MixPacket, use_legacy_packet_encoding: bool) -> Self {
-        let typ = packet.packet_type();
-        let rot = packet.key_rotation();
-        FramedNymPacket::new(packet.into_packet(), typ, rot, use_legacy_packet_encoding)
-    }
-
    pub fn header(&self) -> Header {
        self.header
    }
@@ -15,24 +15,6 @@ pub enum SphinxKeyRotation {
    EvenRotation = 2,
 }

-impl SphinxKeyRotation {
-    pub fn from_key_rotation_id(rotation_id: u32) -> Self {
-        rotation_id.into()
-    }
-
-    pub fn is_unknown(&self) -> bool {
-        matches!(self, SphinxKeyRotation::Unknown)
-    }
-
-    pub fn is_even(&self) -> bool {
-        matches!(self, SphinxKeyRotation::EvenRotation)
-    }
-
-    pub fn is_odd(&self) -> bool {
-        matches!(self, SphinxKeyRotation::OddRotation)
-    }
-}
-
 #[derive(Debug, Error)]
 #[error("{received} is not a valid encoding of a sphinx key rotation")]
 pub struct InvalidSphinxKeyRotation {
@@ -10,7 +10,7 @@ use thiserror::Error;
 // - packet_version (starting with v1.1.0)
 // - packet_size indicator
 // - packet_type
-// - sphinx key rotation (starting with v1.13.0 - the Dolcelatte release)
+// - sphinx key rotation (starting with v1.12.0/v1.13.0 - either Cheddar or Dolcelatte release)

 // it also just so happens that the only valid values for packet_size indicator include values 1-6
 // therefore if we receive byte `7` (or larger than that) we'll know we received a versioned packet,
@@ -22,9 +22,6 @@ pub const CURRENT_PACKET_VERSION_NUMBER: u8 = KEY_ROTATION_VERSION_NUMBER;
 pub const CURRENT_PACKET_VERSION: PacketVersion =
    PacketVersion::unchecked(CURRENT_PACKET_VERSION_NUMBER);

-pub const LEGACY_PACKET_VERSION: PacketVersion =
-    PacketVersion::unchecked(INITIAL_PACKET_VERSION_NUMBER);
-
 #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
 pub struct PacketVersion(u8);

@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO validator (consensus_address, consensus_pubkey)\n            VALUES ($1, $2)\n            ON CONFLICT DO NOTHING\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "0d3709efacf763b06bf14803bb803b5ee5b27879b0026bb0480b3f2722318a75"
+}
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM pre_commit WHERE height < $1",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "1c2fb0e9ffceca21ef8dbea19b116422b1f723d0a316314b50c43c8b29f8891d"
+}
@@ -0,0 +1,26 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        INSERT INTO transaction\n        (hash, height, index, success, messages, memo, signatures, signer_infos, fee, gas_wanted, gas_used, raw_log, logs)\n        VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13)\n        ON CONFLICT (hash) DO UPDATE\n            SET height = excluded.height,\n                index = excluded.index,\n                success = excluded.success,\n                messages = excluded.messages,\n                memo = excluded.memo,\n                signatures = excluded.signatures,\n                signer_infos = excluded.signer_infos,\n                fee = excluded.fee,\n                gas_wanted = excluded.gas_wanted,\n                gas_used = excluded.gas_used,\n                raw_log = excluded.raw_log,\n                logs = excluded.logs\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Int8",
+        "Int4",
+        "Bool",
+        "Json",
+        "Text",
+        "TextArray",
+        "Jsonb",
+        "Jsonb",
+        "Int8",
+        "Int8",
+        "Text",
+        "Jsonb"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "1e344c1dff8b98eb0eb2e530e28f3cb2eed5b5d35391fd30a4d5f44f2e2178b7"
+}
@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                SELECT height\n                FROM block\n                ORDER BY height ASC\n                LIMIT 1\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "height",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "2561fb016951ea4cd29e43fb9a4a93e944b0d44ed1f7c1036f306e34372da11c"
+}
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE metadata SET last_processed_height = GREATEST(last_processed_height, $1)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int4"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "2679cdf11fa66c7920678cde860c57402119ec7c3aae731b0da831327301466f"
+}
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE pruning SET last_pruned_height = $1",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "36ba5941aca6e7b604a10b8b0aba70635028f392fe794d6131827b083e1755e1"
+}
@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                SELECT last_pruned_height FROM pruning\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "last_pruned_height",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "3bdf81a9db6075f6f77224c30553f419a849d4ec45af40b052a4cbf09b44f3ec"
+}
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM message WHERE height < $1",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "52c27143720ddfdfd0f5644b60f5b67fd9281ce1de0653efa53b9d9b93cf335d"
+}
@@ -0,0 +1,18 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO pre_commit (validator_address, height, timestamp, voting_power, proposer_priority)\n            VALUES ($1, $2, $3, $4, $5)\n            ON CONFLICT (validator_address, timestamp) DO NOTHING\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Int8",
+        "Timestamp",
+        "Int8",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "62e14613f5ffe692346a79086857a22f0444fbc679db1c06b651fb8b5538b278"
+}
@@ -0,0 +1,19 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO block (height, hash, num_txs, total_gas, proposer_address, timestamp)\n            VALUES ($1, $2, $3, $4, $5, $6)\n            ON CONFLICT DO NOTHING\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Text",
+        "Int4",
+        "Int8",
+        "Text",
+        "Timestamp"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "64a484fd46d8ec46797f944a4cced56b6e270ce186f0e49528865d1924343b78"
+}
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                SELECT height\n                FROM block\n                WHERE timestamp < $1\n                ORDER BY timestamp DESC\n                LIMIT 1\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "height",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Timestamp"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "7e82426f5dbcadf1631ba1a806e19cc462d04222fb20ad76de2a40f3f4f8fe15"
+}
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                SELECT height\n                FROM block\n                WHERE timestamp > $1\n                ORDER BY timestamp\n                LIMIT 1\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "height",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Timestamp"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "9455331f9be5a3be28e2bd399a36b2e2d6a9ad4b225c4c883aafc4e9f0428008"
+}
@@ -0,0 +1,24 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                SELECT COUNT(*) as count FROM pre_commit\n                WHERE\n                    validator_address = $1\n                    AND height >= $2\n                    AND height <= $3\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "count",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Int8",
+        "Int8"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "bc7795e58ce71893c3f32a19db8e77b7bc0a1af315ffd42c3e68156d6e4ace70"
+}
@@ -0,0 +1,28 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                SELECT * FROM validator\n                WHERE EXISTS (\n                    SELECT 1 FROM pre_commit\n                    WHERE height = $1\n                    AND pre_commit.validator_address = validator.consensus_address\n                )\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "consensus_address",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 1,
+        "name": "consensus_pubkey",
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": [
+      false,
+      false
+    ]
+  },
+  "hash": "be43d4873911deca784b7be0531ab7bd82ecd68041aa932a56c8ce09623251e4"
+}
@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                SELECT last_processed_height FROM metadata\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "last_processed_height",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "c88d07fecc3f33deaa6e93db1469ce71582635df47f52dcf3fd1df4e7be6b96d"
+}
@@ -0,0 +1,19 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO message(transaction_hash, index, type, value, involved_accounts_addresses, height)\n            VALUES ($1, $2, $3, $4, $5, $6)\n            ON CONFLICT (transaction_hash, index) DO UPDATE\n                SET height = excluded.height,\n                    type = excluded.type,\n                    value = excluded.value,\n                    involved_accounts_addresses = excluded.involved_accounts_addresses\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Int8",
+        "Text",
+        "Json",
+        "TextArray",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "cc0ae74082d7d8a89f2d3364676890bbf6150ab394c72783114340d4def5f9ef"
+}
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM block WHERE height < $1",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "cdba9b267f143c8a8c6c3d6ed713cf00236490b86779559d84740ec18bcfa3a9"
+}
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM transaction WHERE height < $1",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "d89558c37c51e8e6b1e6a9d5a2b13d0598fd856aa019a0cbbae12d7cafb4672f"
+}
@@ -0,0 +1,34 @@
+[package]
+name = "nyxd-scraper-psql"
+version = "0.1.0"
+authors.workspace = true
+repository.workspace = true
+homepage.workspace = true
+documentation.workspace = true
+edition.workspace = true
+license.workspace = true
+rust-version.workspace = true
+readme.workspace = true
+
+[dependencies]
+async-trait = { workspace = true }
+base64 = { workspace = true }
+itertools = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
+sqlx = { workspace = true, features = ["runtime-tokio-rustls", "postgres", "macros", "migrate", "time"] }
+thiserror = { workspace = true }
+tokio = { workspace = true, features = ["full"] }
+tracing.workspace = true
+
+nyxd-scraper-shared = { path = "../nyxd-scraper-shared" }
+
+# temp due to cosmrs redefinitions for serde
+cosmrs = { workspace = true }
+
+[build-dependencies]
+sqlx = { workspace = true, features = ["runtime-tokio-rustls", "postgres", "macros", "migrate"] }
+tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
+
+[lints]
+workspace = true
@@ -0,0 +1,102 @@
+# Makefile for nyxd-scraper-psql database management
+
+# --- Configuration ---
+TEST_DATABASE_URL := postgres://testuser:testpass@localhost:5433/nyxd_scraper_test
+
+# Docker compose service names
+DB_SERVICE_NAME := postgres-test
+DB_CONTAINER_NAME := nyxd_scraper_psql_test
+
+# Default target
+.PHONY: default
+default: help
+
+# --- Main Targets ---
+.PHONY: prepare-pg
+prepare-pg: test-db-up test-db-wait test-db-migrate test-db-prepare test-db-down ## Setup PostgreSQL and prepare SQLx offline cache
+
+.PHONY: test-db
+test-db: test-db-up test-db-wait test-db-migrate test-db-run test-db-down ## Run tests with PostgreSQL database
+
+.PHONY: dev-db
+dev-db: test-db-up test-db-wait test-db-migrate ## Start PostgreSQL for development (keeps running)
+	@echo "PostgreSQL is running on port 5433"
+	@echo "Connection string: $(TEST_DATABASE_URL)"
+
+# --- Docker Compose Targets ---
+.PHONY: test-db-up
+test-db-up: ## Start the PostgreSQL test database in the background
+	@echo "Starting PostgreSQL test database..."
+	docker compose up -d $(DB_SERVICE_NAME)
+
+.PHONY: test-db-wait
+test-db-wait: ## Wait for the PostgreSQL database to be healthy
+	@echo "Waiting for PostgreSQL database..."
+	@while ! docker inspect --format='{{.State.Health.Status}}' $(DB_CONTAINER_NAME) 2>/dev/null | grep -q 'healthy'; do \
+		echo -n "."; \
+		sleep 1; \
+	done; \
+	echo " Database is healthy!"
+
+.PHONY: test-db-down
+test-db-down: ## Stop and remove the test database
+	@echo "Stopping PostgreSQL test database..."
+	docker compose down
+
+# --- SQLx Targets ---
+.PHONY: test-db-migrate
+test-db-migrate: ## Run database migrations against PostgreSQL
+	@echo "Running PostgreSQL migrations..."
+	DATABASE_URL="$(TEST_DATABASE_URL)" sqlx migrate run --source sql_migrations
+
+.PHONY: test-db-prepare
+test-db-prepare: ## Run sqlx prepare for compile-time query verification
+	@echo "Running sqlx prepare for PostgreSQL..."
+	DATABASE_URL="$(TEST_DATABASE_URL)" cargo sqlx prepare
+
+# --- Build and Test Targets ---
+.PHONY: test-db-run
+test-db-run: ## Run tests with PostgreSQL feature
+	@echo "Running tests with PostgreSQL..."
+	DATABASE_URL="$(TEST_DATABASE_URL)" cargo test --features pg --no-default-features
+
+.PHONY: build-pg
+build-pg: ## Build with PostgreSQL feature
+	@echo "Building with PostgreSQL feature..."
+	cargo build
+
+.PHONY: check-pg
+check-pg: ## Check code with PostgreSQL feature
+	@echo "Checking code with PostgreSQL feature..."
+	cargo check
+
+.PHONY: clippy
+clippy: clippy-pg
+
+.PHONY: clippy-pg
+clippy-pg: ## Run clippy with PostgreSQL feature
+	@echo "Running clippy with PostgreSQL feature..."
+	cargo clippy -- -D warnings
+
+# --- Cleanup Targets ---
+.PHONY: clean
+clean: ## Clean build artifacts and SQLx cache
+	cargo clean
+	rm -rf .sqlx
+
+.PHONY: clean-db
+clean-db: test-db-down ## Stop database and clean volumes
+	docker volume rm -f nym-node-status-api_postgres_test_data 2>/dev/null || true
+
+# --- Utility Targets ---
+.PHONY: sqlx-cli
+sqlx-cli: ## Install sqlx-cli if not already installed
+	@command -v sqlx >/dev/null 2>&1 || cargo install sqlx-cli --features postgres
+
+.PHONY: psql
+psql: ## Connect to the running PostgreSQL database with psql
+	@docker exec -it $(DB_CONTAINER_NAME) psql -U testuser -d nyxd_scraper_test
+
+.PHONY: help
+help: ## Show help for Makefile targets
+	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}'
@@ -0,0 +1,79 @@
+## Quick Start with PostgreSQL
+
+### 1. Install Prerequisites
+
+```bash
+# Install sqlx-cli if not already installed
+make sqlx-cli
+```
+
+### 2. Prepare PostgreSQL for Development
+
+```bash
+# This will:
+# - Start PostgreSQL in Docker
+# - Run migrations
+# - Generate SQLx offline query cache
+# - Stop the database
+make prepare-pg
+```
+
+### 3. Build with PostgreSQL
+
+```bash
+# Build with PostgreSQL feature
+make build-pg
+
+# Or manually:
+cargo build
+```
+
+### 4. Run with PostgreSQL
+
+```bash
+# Start PostgreSQL for development (keeps running)
+make dev-db
+
+# In another terminal, run the application
+DATABASE_URL=postgres://testuser:testpass@localhost:5433/nym_node_status_api_test \
+cargo run
+```
+
+## Makefile Targets
+
+```bash
+make help                # Show all available targets
+make prepare-pg         # Setup PostgreSQL and prepare SQLx cache
+make dev-db            # Start PostgreSQL for development
+make test-db           # Run tests with PostgreSQL
+make build-pg          # Build with PostgreSQL
+make psql              # Connect to running PostgreSQL
+make clean             # Clean build artifacts
+make clean-db          # Stop database and clean volumes
+```
+
+## Environment Variables
+
+See `.env.example` for all configuration options. Key variable:
+
+```bash
+# For PostgreSQL:
+DATABASE_URL=postgres://testuser:testpass@localhost:5433/nym_node_status_api_test
+```
+
+## Troubleshooting
+
+### SQLx Offline Mode
+
+If you see "no cached data for this query" errors:
+
+1. Ensure PostgreSQL is running: `make dev-db`
+2. Run: `make test-db-prepare`
+
+### Connection Refused
+
+If you see "Connection refused" errors:
+
+1. Check Docker is running: `docker ps`
+2. Check PostgreSQL container: `docker ps | grep nym_node_status_api_postgres_test`
+3. Restart database: `make test-db-down && make dev-db`
@@ -0,0 +1,8 @@
+// Copyright 2025 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+fn main() {
+    if let Ok(database_url) = std::env::var("DATABASE_URL") {
+        println!("cargo::rustc-env=DATABASE_URL={database_url}");
+    }
+}
@@ -0,0 +1,21 @@
+services:
+  postgres-test:
+    image: postgres:16-alpine
+    container_name: nyxd_scraper_psql_test
+    environment:
+      POSTGRES_DB: nyxd_scraper_test
+      POSTGRES_USER: testuser
+      POSTGRES_PASSWORD: testpass
+    ports:
+      - '5433:5432' # Map to 5433 to avoid conflicts with default PostgreSQL
+    healthcheck:
+      test: [ 'CMD-SHELL', 'pg_isready -U testuser -d nyxd_scraper_test' ]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+    # Optional: Add volume for persistent data during development
+    # volumes:
+    #   - postgres_test_data:/var/lib/postgresql/data
+
+# volumes:
+#   postgres_test_data:
@@ -0,0 +1,127 @@
+CREATE TABLE validator
+(
+    consensus_address TEXT NOT NULL PRIMARY KEY, /* Validator consensus address */
+    consensus_pubkey  TEXT NOT NULL UNIQUE /* Validator consensus public key */
+);
+
+CREATE TABLE pre_commit
+(
+    validator_address TEXT                        NOT NULL REFERENCES validator (consensus_address),
+    height            BIGINT                      NOT NULL,
+    timestamp         TIMESTAMP WITHOUT TIME ZONE NOT NULL,
+    voting_power      BIGINT                      NOT NULL,
+    proposer_priority BIGINT                      NOT NULL,
+    UNIQUE (validator_address, timestamp)
+);
+CREATE INDEX pre_commit_validator_address_index ON pre_commit (validator_address);
+CREATE INDEX pre_commit_height_index ON pre_commit (height);
+
+CREATE TABLE block
+(
+    height           BIGINT UNIQUE PRIMARY KEY,
+    hash             TEXT                        NOT NULL UNIQUE,
+    num_txs          INTEGER DEFAULT 0,
+    total_gas        BIGINT  DEFAULT 0,
+    proposer_address TEXT REFERENCES validator (consensus_address),
+    timestamp        TIMESTAMP WITHOUT TIME ZONE NOT NULL
+);
+CREATE INDEX block_height_index ON block (height);
+CREATE INDEX block_hash_index ON block (hash);
+CREATE INDEX block_proposer_address_index ON block (proposer_address);
+ALTER TABLE block
+    SET (
+        autovacuum_vacuum_scale_factor = 0,
+        autovacuum_analyze_scale_factor = 0,
+        autovacuum_vacuum_threshold = 10000,
+        autovacuum_analyze_threshold = 10000
+        );
+
+CREATE TABLE transaction
+(
+    hash         TEXT    NOT NULL,
+    height       BIGINT  NOT NULL REFERENCES block (height),
+    "index"      INTEGER NOT NULL, -- <<<=== not present in original bdjuno table, but it's quite useful
+    success      BOOLEAN NOT NULL,
+
+    /* Body */
+    messages     JSON    NOT NULL DEFAULT '[]'::JSON,
+    memo         TEXT,
+    signatures   TEXT[]  NOT NULL,
+
+    /* AuthInfo */
+    signer_infos JSONB   NOT NULL DEFAULT '[]'::JSONB,
+    fee          JSONB   NOT NULL DEFAULT '{}'::JSONB,
+
+    /* Tx response */
+    gas_wanted   BIGINT           DEFAULT 0,
+    gas_used     BIGINT           DEFAULT 0,
+    raw_log      TEXT,
+    logs         JSONB,
+
+    CONSTRAINT unique_tx UNIQUE (hash)
+);
+CREATE INDEX transaction_hash_index ON transaction (hash);
+CREATE INDEX transaction_height_index ON transaction (height);
+
+CREATE TABLE message_type
+(
+    type   TEXT   NOT NULL UNIQUE,
+    module TEXT   NOT NULL,
+    label  TEXT   NOT NULL,
+    height BIGINT NOT NULL
+);
+CREATE INDEX message_type_module_index ON message_type (module);
+CREATE INDEX message_type_type_index ON message_type (type);
+
+CREATE TABLE message
+(
+    transaction_hash            TEXT   NOT NULL,
+    index                       BIGINT NOT NULL,
+    type                        TEXT   NOT NULL REFERENCES message_type (type),
+    value                       JSON   NOT NULL,
+    involved_accounts_addresses TEXT[] NOT NULL,
+
+    height                      BIGINT NOT NULL,
+    FOREIGN KEY (transaction_hash) REFERENCES transaction (hash),
+    CONSTRAINT unique_message_per_tx UNIQUE (transaction_hash, index)
+);
+CREATE INDEX message_transaction_hash_index ON message (transaction_hash);
+CREATE INDEX message_type_index ON message (type);
+CREATE INDEX message_involved_accounts_index ON message USING GIN (involved_accounts_addresses);
+
+/**
+ * This function is used to find all the utils that involve any of the given addresses and have
+ * type that is one of the specified types.
+ */
+CREATE FUNCTION messages_by_address(
+    addresses TEXT[],
+    types TEXT[],
+    "limit" BIGINT = 100,
+    "offset" BIGINT = 0)
+    RETURNS SETOF message AS
+$$
+SELECT *
+FROM message
+WHERE (cardinality(types) = 0 OR type = ANY (types))
+  AND addresses && involved_accounts_addresses
+ORDER BY height DESC
+LIMIT "limit" OFFSET "offset"
+$$ LANGUAGE sql STABLE;
+
+CREATE FUNCTION messages_by_type(
+    types text[],
+    "limit" bigint DEFAULT 100,
+    "offset" bigint DEFAULT 0)
+    RETURNS SETOF message AS
+$$
+SELECT *
+FROM message
+WHERE (cardinality(types) = 0 OR type = ANY (types))
+ORDER BY height DESC
+LIMIT "limit" OFFSET "offset"
+$$ LANGUAGE sql STABLE;
+
+CREATE TABLE pruning
+(
+    last_pruned_height BIGINT NOT NULL
+);
@@ -0,0 +1,43 @@
+// Copyright 2025 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use nyxd_scraper_shared::helpers::MalformedDataError;
+use nyxd_scraper_shared::storage::NyxdScraperStorageError;
+use thiserror::Error;
+
+#[derive(Error, Debug)]
+pub enum PostgresScraperError {
+    #[error("experienced internal database error: {0}")]
+    InternalDatabaseError(#[from] sqlx::error::Error),
+
+    #[error("failed to perform startup SQL migration: {0}")]
+    StartupMigrationFailure(#[from] sqlx::migrate::MigrateError),
+
+    #[error("failed to begin storage tx: {source}")]
+    StorageTxBeginFailure {
+        #[source]
+        source: sqlx::error::Error,
+    },
+
+    #[error("failed to commit storage tx: {source}")]
+    StorageTxCommitFailure {
+        #[source]
+        source: sqlx::error::Error,
+    },
+
+    #[error(transparent)]
+    MalformedData(#[from] MalformedDataError),
+
+    // TOOD: add struct name
+    #[error("json serialisation failure: {source}")]
+    SerialisationFailure {
+        #[from]
+        source: serde_json::Error,
+    },
+}
+
+impl From<PostgresScraperError> for NyxdScraperStorageError {
+    fn from(err: PostgresScraperError) -> Self {
+        NyxdScraperStorageError::new(err)
+    }
+}
@@ -0,0 +1,21 @@
+// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::storage::block_storage::PostgresScraperStorage;
+use nyxd_scraper_shared::NyxdScraper;
+
+pub use nyxd_scraper_shared::constants;
+pub use nyxd_scraper_shared::error::ScraperError;
+pub use nyxd_scraper_shared::{
+    BlockModule, MsgModule, NyxdScraperTransaction, ParsedTransactionResponse, PruningOptions,
+    PruningStrategy, StartingBlockOpts, TxModule,
+};
+pub use storage::models;
+
+pub mod error;
+pub mod storage;
+
+pub type PostgresNyxdScraper = NyxdScraper<PostgresScraperStorage>;
+
+// TODO: for now just use exactly the same config
+pub use nyxd_scraper_shared::Config;
@@ -0,0 +1,246 @@
+// Copyright 2025 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::error::PostgresScraperError;
+use crate::models::{CommitSignature, Validator};
+use crate::storage::manager::{
+    prune_blocks, prune_messages, prune_pre_commits, prune_transactions, update_last_pruned,
+    StorageManager,
+};
+use crate::storage::transaction::PostgresStorageTransaction;
+use async_trait::async_trait;
+use nyxd_scraper_shared::storage::helpers::log_db_operation_time;
+use nyxd_scraper_shared::storage::{NyxdScraperStorage, NyxdScraperStorageError};
+use nyxd_scraper_shared::{default_message_registry, MessageRegistry};
+use sqlx::types::time::{OffsetDateTime, PrimitiveDateTime};
+use tokio::time::Instant;
+use tracing::{debug, error, info, instrument};
+
+#[derive(Clone)]
+pub struct PostgresScraperStorage {
+    pub(crate) manager: StorageManager,
+
+    // kinda like very limited cosmos sdk codec
+    pub(crate) message_registry: MessageRegistry,
+}
+
+impl PostgresScraperStorage {
+    #[instrument]
+    pub async fn init(connection_string: &str) -> Result<Self, PostgresScraperError> {
+        debug!("initialising scraper database with '{connection_string}'",);
+
+        let connection_pool = match sqlx::PgPool::connect(connection_string).await {
+            Ok(db) => db,
+            Err(err) => {
+                error!("Failed to connect to SQLx database: {err}");
+                return Err(err.into());
+            }
+        };
+
+        if let Err(err) = sqlx::migrate!("./sql_migrations")
+            .run(&connection_pool)
+            .await
+        {
+            error!("Failed to initialize SQLx database: {err}");
+            return Err(err.into());
+        }
+
+        info!("Database migration finished!");
+
+        let manager = StorageManager { connection_pool };
+        manager.set_initial_metadata().await?;
+
+        let storage = PostgresScraperStorage {
+            manager,
+            message_registry: default_message_registry(),
+        };
+
+        Ok(storage)
+    }
+
+    #[instrument(skip(self))]
+    pub async fn prune_storage(
+        &self,
+        oldest_to_keep: u32,
+        current_height: u32,
+    ) -> Result<(), PostgresScraperError> {
+        let start = Instant::now();
+
+        let mut tx = self.begin_processing_tx().await?;
+
+        prune_messages(oldest_to_keep.into(), &mut **tx).await?;
+        prune_transactions(oldest_to_keep.into(), &mut **tx).await?;
+        prune_pre_commits(oldest_to_keep.into(), &mut **tx).await?;
+        prune_blocks(oldest_to_keep.into(), &mut **tx).await?;
+        update_last_pruned(current_height.into(), &mut **tx).await?;
+
+        let commit_start = Instant::now();
+        tx.inner
+            .commit()
+            .await
+            .map_err(|source| PostgresScraperError::StorageTxCommitFailure { source })?;
+        log_db_operation_time("committing pruning tx", commit_start);
+
+        log_db_operation_time("pruning storage", start);
+        Ok(())
+    }
+
+    #[instrument(skip_all)]
+    pub async fn begin_processing_tx(
+        &self,
+    ) -> Result<PostgresStorageTransaction, PostgresScraperError> {
+        debug!("starting storage tx");
+        self.manager
+            .connection_pool
+            .begin()
+            .await
+            .map(|inner| PostgresStorageTransaction {
+                inner,
+                registry: self.message_registry.clone(),
+            })
+            .map_err(|source| PostgresScraperError::StorageTxBeginFailure { source })
+    }
+
+    pub async fn lowest_block_height(&self) -> Result<Option<i64>, PostgresScraperError> {
+        Ok(self.manager.get_lowest_block().await?)
+    }
+
+    pub async fn get_first_block_height_after(
+        &self,
+        time: OffsetDateTime,
+    ) -> Result<Option<i64>, PostgresScraperError> {
+        let time = PrimitiveDateTime::new(time.date(), time.time());
+
+        Ok(self.manager.get_first_block_height_after(time).await?)
+    }
+
+    pub async fn get_last_block_height_before(
+        &self,
+        time: OffsetDateTime,
+    ) -> Result<Option<i64>, PostgresScraperError> {
+        let time = PrimitiveDateTime::new(time.date(), time.time());
+
+        Ok(self.manager.get_last_block_height_before(time).await?)
+    }
+
+    pub async fn get_blocks_between(
+        &self,
+        start_time: OffsetDateTime,
+        end_time: OffsetDateTime,
+    ) -> Result<i64, PostgresScraperError> {
+        let Some(block_start) = self.get_first_block_height_after(start_time).await? else {
+            return Ok(0);
+        };
+        let Some(block_end) = self.get_last_block_height_before(end_time).await? else {
+            return Ok(0);
+        };
+
+        Ok(block_end - block_start)
+    }
+
+    pub async fn get_signed_between(
+        &self,
+        consensus_address: &str,
+        start_height: i64,
+        end_height: i64,
+    ) -> Result<i64, PostgresScraperError> {
+        Ok(self
+            .manager
+            .get_signed_between(consensus_address, start_height, end_height)
+            .await?)
+    }
+
+    pub async fn get_signed_between_times(
+        &self,
+        consensus_address: &str,
+        start_time: OffsetDateTime,
+        end_time: OffsetDateTime,
+    ) -> Result<i64, PostgresScraperError> {
+        let Some(block_start) = self.get_first_block_height_after(start_time).await? else {
+            return Ok(0);
+        };
+        let Some(block_end) = self.get_last_block_height_before(end_time).await? else {
+            return Ok(0);
+        };
+
+        self.get_signed_between(consensus_address, block_start, block_end)
+            .await
+    }
+
+    pub async fn get_precommit(
+        &self,
+        consensus_address: &str,
+        height: i64,
+    ) -> Result<Option<CommitSignature>, PostgresScraperError> {
+        Ok(self
+            .manager
+            .get_precommit(consensus_address, height)
+            .await?)
+    }
+
+    pub async fn get_block_signers(
+        &self,
+        height: i64,
+    ) -> Result<Vec<Validator>, PostgresScraperError> {
+        Ok(self.manager.get_block_validators(height).await?)
+    }
+
+    pub async fn get_all_known_validators(&self) -> Result<Vec<Validator>, PostgresScraperError> {
+        Ok(self.manager.get_validators().await?)
+    }
+
+    pub async fn get_last_processed_height(&self) -> Result<i64, PostgresScraperError> {
+        Ok(self.manager.get_last_processed_height().await?)
+    }
+
+    pub async fn get_pruned_height(&self) -> Result<i64, PostgresScraperError> {
+        Ok(self.manager.get_pruned_height().await?)
+    }
+}
+
+#[async_trait]
+impl NyxdScraperStorage for PostgresScraperStorage {
+    type StorageTransaction = PostgresStorageTransaction;
+
+    async fn initialise(storage: &str) -> Result<Self, NyxdScraperStorageError> {
+        PostgresScraperStorage::init(storage)
+            .await
+            .map_err(NyxdScraperStorageError::from)
+    }
+
+    async fn begin_processing_tx(
+        &self,
+    ) -> Result<Self::StorageTransaction, NyxdScraperStorageError> {
+        self.begin_processing_tx()
+            .await
+            .map_err(NyxdScraperStorageError::from)
+    }
+
+    async fn get_last_processed_height(&self) -> Result<i64, NyxdScraperStorageError> {
+        self.get_last_processed_height()
+            .await
+            .map_err(NyxdScraperStorageError::from)
+    }
+
+    async fn get_pruned_height(&self) -> Result<i64, NyxdScraperStorageError> {
+        self.get_pruned_height()
+            .await
+            .map_err(NyxdScraperStorageError::from)
+    }
+
+    async fn lowest_block_height(&self) -> Result<Option<i64>, NyxdScraperStorageError> {
+        self.lowest_block_height()
+            .await
+            .map_err(NyxdScraperStorageError::from)
+    }
+
+    async fn prune_storage(
+        &self,
+        oldest_to_keep: u32,
+        current_height: u32,
+    ) -> Result<(), NyxdScraperStorageError> {
+        self.prune_storage(oldest_to_keep, current_height)
+            .await
+            .map_err(NyxdScraperStorageError::from)
+    }
+}
@@ -0,0 +1,25 @@
+// Copyright 2025 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use cosmrs::AccountId;
+use itertools::Itertools;
+use nyxd_scraper_shared::ParsedTransactionResponse;
+use std::str::FromStr;
+
+// replicate behaviour of `CosmosMessageAddressesParser` from juno
+pub(crate) fn parse_addresses_from_events(tx: &ParsedTransactionResponse) -> Vec<String> {
+    let mut addresses: Vec<String> = Vec::new();
+    for event in &tx.tx_result.events {
+        for attribute in &event.attributes {
+            let Ok(value) = attribute.value_str() else {
+                continue;
+            };
+
+            // Try parsing the address as an account address
+            if let Ok(address) = AccountId::from_str(value) {
+                addresses.push(address.to_string());
+            }
+        }
+    }
+    addresses.into_iter().unique().collect()
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jędrzej Stuczyński	b2ecc81da6	added ibc messages to MessageRegistry	2025-07-08 10:41:54 +01:00
Jędrzej Stuczyński	3547e1caf1	using SignerInfo proto definitions for db serialisation	2025-07-08 10:05:49 +01:00
Jędrzej Stuczyński	70590dd4f0	Revert "use postgres in chain scraper" This reverts commit `83c84bfd2d`.	2025-07-07 17:21:22 +01:00
Jędrzej Stuczyński	aafa7ba14c	adding null value for logs	2025-07-07 15:04:33 +01:00
Jędrzej Stuczyński	05f2079b64	involved addresses	2025-07-07 15:00:27 +01:00
Jędrzej Stuczyński	42c0b69f4d	message content parsing in psql	2025-07-07 14:54:16 +01:00
Jędrzej Stuczyński	2320a2f249	added message registry to block processor	2025-07-07 14:36:53 +01:00
Jędrzej Stuczyński	83c84bfd2d	use postgres in chain scraper	2025-07-04 18:15:24 +01:00
Jędrzej Stuczyński	71090c85c2	initial postgres support - missing some proto -> json parsing	2025-07-04 18:04:37 +01:00
Jędrzej Stuczyński	976961471b	psql scaffolding	2025-07-04 12:45:06 +01:00
Jędrzej Stuczyński	655fd421a6	using sqlite instance for rewarder and chain watcher	2025-07-04 12:25:08 +01:00
Jędrzej Stuczyński	81eaf7b1cc	implemented traits for sqlite instance	2025-07-04 12:09:45 +01:00
Jędrzej Stuczyński	027bd85200	changed error types to make modules dyn compatible	2025-07-04 11:23:25 +01:00
Jędrzej Stuczyński	08cff312af	wip: made storage mostly generic minus modules	2025-07-04 11:08:05 +01:00
Jędrzej Stuczyński	2920e6ff01	rename nyxd-scraper to sqlite	2025-07-03 16:33:32 +01:00