Add query message wrapper

2024-11-15 16:31:51 +02:00
397 changed files with 4002 additions and 11442 deletions
@@ -11,7 +11,7 @@ on:
 jobs:
  check-schema:
    name: Generate and check schema
-    runs-on: ubuntu-20.04
+    runs-on: arc-ubuntu-20.04
    env:
      CARGO_TERM_COLOR: always
    steps:
@@ -13,7 +13,7 @@ on:

 jobs:
  matrix_prep:
-    runs-on: ubuntu-20.04
+    runs-on: arc-ubuntu-20.04
    outputs:
      matrix: ${{ steps.set-matrix.outputs.matrix }}
    steps:
@@ -55,7 +55,6 @@ jobs:
        uses: actions-rs/toolchain@v1
        with:
          toolchain: stable
-          override: true

      - name: Build all binaries
        uses: actions-rs/cargo@v1
@@ -14,14 +14,13 @@ jobs:
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
-          toolchain: 1.77
+          toolchain: stable
          target: wasm32-unknown-unknown
          override: true
+          components: rustfmt, clippy

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

      - name: Build release contracts
        run: make contracts
@@ -26,7 +26,7 @@ jobs:
          git config --global user.name "Lawrence Stalder"

      - name: Get version from cargo.toml
-        uses: mikefarah/yq@v4.44.5
+        uses: mikefarah/yq@v4.44.3
        id: get_version
        with:
          cmd: yq -oy '.package.version' ${{ env.WORKING_DIRECTORY }}/nym-credential-proxy/Cargo.toml
@@ -26,7 +26,7 @@ jobs:
          git config --global user.name "Lawrence Stalder"

      - name: Get version from cargo.toml
-        uses: mikefarah/yq@v4.44.5
+        uses: mikefarah/yq@v4.44.3
        id: get_version
        with:
          cmd: yq -oy '.package.version' ${{ env.WORKING_DIRECTORY }}/Cargo.toml
@@ -25,27 +25,31 @@ jobs:
          git config --global user.email "lawrence@nymtech.net"
          git config --global user.name "Lawrence Stalder"

-      - name: Get version from cargo.toml
-        uses: mikefarah/yq@v4.44.5
+      - name: Get version from package.json
+        uses: sergeysova/jq-action@v2
        id: get_version
        with:
-          cmd: yq -oy '.package.version' ${{ env.WORKING_DIRECTORY }}/nym-network-monitor/Cargo.toml
-          
+          cmd: jq -r '.version' ${{ env.WORKING_DIRECTORY }}/package.json
+
+      - name: Check if tag exists
+        run: |
+          if git rev-parse ${{ steps.get_version.outputs.value }} >/dev/null 2>&1; then
+            echo "Tag ${{ steps.get_version.outputs.value }} already exists"
+          fi
+
      - name: Remove existing tag if exists
        run: |
-          echo "Checking if tag ${{ env.CONTAINER_NAME }}-${{ steps.get_version.outputs.result }} exists..."
-          if git rev-parse ${{ env.CONTAINER_NAME }}-${{ steps.get_version.outputs.result }} >/dev/null 2>&1; then
-            echo "Tag ${{ env.CONTAINER_NAME }}-${{ steps.get_version.outputs.result }} already exists"
-            git push --delete origin ${{ env.CONTAINER_NAME }}-${{ steps.get_version.outputs.result }}
-            git tag -d ${{ env.CONTAINER_NAME }}-${{ steps.get_version.outputs.result }}
+          if git rev-parse ${{ steps.get_version.outputs.value }} >/dev/null 2>&1; then
+            git push --delete origin ${{ steps.get_version.outputs.value }}
+            git tag -d ${{ steps.get_version.outputs.value }}
          fi

      - name: Create tag
        run: |
-          git tag -a ${{ env.CONTAINER_NAME }}-${{ steps.get_version.outputs.result }} -m "Version ${{ steps.get_version.outputs.result }}"
-          git push origin ${{ env.CONTAINER_NAME }}-${{ steps.get_version.outputs.result }}
-          
+          git tag -a ${{ steps.get_version.outputs.value }} -m "Version ${{ steps.get_version.outputs.value }}"
+          git push origin ${{ steps.get_version.outputs.value }}
+
      - name: BuildAndPushImageOnHarbor
        run: |
-          docker build -f nym-network-monitor.dockerfile ${{ env.WORKING_DIRECTORY }} -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
+          docker build -f nym-network-monitor.dockerfile ${{ env.WORKING_DIRECTORY }} -t harbor.nymte.ch/nym/${{ env.CONTAINER_NAME }}:${{ steps.get_version.outputs.value }} -t harbor.nymte.ch/nym/${{ env.CONTAINER_NAME }}:latest
+          docker push harbor.nymte.ch/nym/${{ env.CONTAINER_NAME }} --all-tags
@@ -31,7 +31,7 @@ jobs:
          git config --global user.name "Lawrence Stalder"

      - name: Get version from cargo.toml
-        uses: mikefarah/yq@v4.44.5
+        uses: mikefarah/yq@v4.44.3
        id: get_version
        with:
          cmd: yq -oy '.package.version' ${{ env.WORKING_DIRECTORY }}/Cargo.toml
@@ -58,4 +58,4 @@ jobs:
      - 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.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
+          docker push harbor.nymte.ch/nym/${{ env.CONTAINER_NAME }} --all-tags
@@ -26,7 +26,7 @@ jobs:
          git config --global user.name "Lawrence Stalder"

      - name: Get version from cargo.toml
-        uses: mikefarah/yq@v4.44.5
+        uses: mikefarah/yq@v4.44.3
        id: get_version
        with:
          cmd: yq -oy '.package.version' ${{ env.WORKING_DIRECTORY }}/Cargo.toml
@@ -26,7 +26,7 @@ jobs:
          git config --global user.name "Lawrence Stalder"

      - name: Get version from cargo.toml
-        uses: mikefarah/yq@v4.44.5
+        uses: mikefarah/yq@v4.44.3
        id: get_version
        with:
          cmd: yq -oy '.package.version' ${{ env.WORKING_DIRECTORY }}/Cargo.toml
@@ -26,7 +26,7 @@ jobs:
          git config --global user.name "Lawrence Stalder"

      - name: Get version from cargo.toml
-        uses: mikefarah/yq@v4.44.5
+        uses: mikefarah/yq@v4.44.3
        id: get_version
        with:
          cmd: yq -oy '.package.version' ${{ env.WORKING_DIRECTORY }}/nym-credential-proxy/Cargo.toml
@@ -4,350 +4,6 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://

 ## [Unreleased]

-## [2024.14-crunch] (2024-12-11)
-
- Merge/release/2024.14-crunch ([#5242])
- bugfix: added explicit openapi servers to account for route prefixes ([#5237])
- Further config score adjustments ([#5225])
- feature: remve any filtering on node semver ([#5224])
- Backport #5218 ([#5220])
- Derive serialize for UserAgent (#5210) ([#5217])
- dont consider legacy nodes for rewarded set selection ([#5215])
- introduce UNSTABLE endpoints for returning network monitor run details ([#5214])
- Nmv2 add debug config ([#5212])
- nym-api NMv1 adjustments ([#5209])
- adjusted config score penalty calculation ([#5206])
- Fix backwards compat mac generation ([#5202])
- merge crunch into develop ([#5199])
- Update Security disclosure email, public key and policy ([#5195])
- Guard storage access with cache ([#5193])
- chore: apply 1.84 linter suggestions ([#5192])
- improvement: make internal gateway clients use the same topology cache ([#5191])
- Bugfix/credential proxy sequencing ([#5187])
- Add monitor_run and testing_route indexes ([#5182])
- Add indexes to monitor run and testing route ([#5181])
- bugfix: fixed nym-node config migrations (again) ([#5179])
- bugfix: use default value for verloc config when deserialising missing values ([#5177])
- Remove peers with no allowed ip from storage ([#5175])
- Move two minor jobs to free tier github hosted runners ([#5169])
- Add support for DELETE to nym-http-api-client ([#5166])
- Fix env var name ([#5165])
- Add strum::EnumIter for TicketType ([#5164])
- Add export_to_env to NymNetworkDetails ([#5162])
- bugfix: correctly expose ecash-related data on nym-api ([#5155])
- fix: validator-rewarder GH job ([#5151])
- build(deps): bump cross-spawn from 7.0.3 to 7.0.6 in /testnet-faucet ([#5150])
- build(deps): bump mikefarah/yq from 4.44.3 to 4.44.5 ([#5149])
- start session collection for exit gateways ([#5148])
- add version to clientStatsReport ([#5147])
- update serde_json_path due to compilation issue ([#5144])
- chore: remove standalone legacy mixnode/gateway binaries ([#5135])
- [Product Data] Set up country reporting from vpn-client ([#5134])
- removed ci-nym-api-tests.yml which was running outdated (and broken) tests ([#5133])
- CI: reduce jobs running on cluster ([#5132])
- [DOCS/operators]: Release changes v2024.13-magura & Tokenomics pages v1.0 ([#5128])
- NS Agent auth with NS API ([#5127])
- [Product Data] Config deserialization bug fix ([#5126])
- bugfix: don't send empty BankMsg in ecash contract ([#5121])
- [Product data] Data consumption with ecash ticket ([#5120])
- feat: add GH workflow for nym-validator-rewarder ([#5119])
- feat: add Dockerfile and add env vars for clap arguments ([#5118])
- feature: config score ([#5117])
- [Product Data] Add stats reporting configuration in client config  ([#5115])
- Correct IPv6 address generation ([#5113])
- feature: rewarding for ticketbook issuance ([#5112])
- Add granular log on nym-node ([#5111])
- Send mixnet packet stats using task client ([#5109])
- Expose time range ([#5108])
- [Product Data] Client-side stats collection  ([#5107])
- chore: ecash contract migration to remove unused 'redemption_gateway_share' ([#5104])
- [Product Data] Better unique user count on gateways ([#5084])
- feat: add nym node GH workflow ([#5080])
- IPv6 support for wireguard ([#5059])
- Node Status API ([#5050])
- Authenticator CLI client mode ([#5044])
- Integrate nym-credential-proxy into workspace ([#5027])
- [Product Data] Introduce data persistence on gateways ([#5022])
- Bump the patch-updates group across 1 directory with 10 updates ([#5011])
- build(deps): bump once_cell from 1.19.0 to 1.20.2 ([#4952])
- Create TaskStatusEvent trait instead of piggybacking on Error ([#4919])
- build(deps): bump lazy_static from 1.4.0 to 1.5.0 ([#4913])
- Sync code with .env in build.rs ([#4876])
- build(deps): bump axios from 1.6.0 to 1.7.5 in /nym-api/tests ([#4790])
- Bump elliptic from 6.5.4 to 6.5.7 in /testnet-faucet ([#4768])
-
-[#5242]: https://github.com/nymtech/nym/pull/5242
-[#5237]: https://github.com/nymtech/nym/pull/5237
-[#5225]: https://github.com/nymtech/nym/pull/5225
-[#5224]: https://github.com/nymtech/nym/pull/5224
-[#5220]: https://github.com/nymtech/nym/pull/5220
-[#5217]: https://github.com/nymtech/nym/pull/5217
-[#5215]: https://github.com/nymtech/nym/pull/5215
-[#5214]: https://github.com/nymtech/nym/pull/5214
-[#5212]: https://github.com/nymtech/nym/pull/5212
-[#5209]: https://github.com/nymtech/nym/pull/5209
-[#5206]: https://github.com/nymtech/nym/pull/5206
-[#5202]: https://github.com/nymtech/nym/pull/5202
-[#5199]: https://github.com/nymtech/nym/pull/5199
-[#5195]: https://github.com/nymtech/nym/pull/5195
-[#5193]: https://github.com/nymtech/nym/pull/5193
-[#5192]: https://github.com/nymtech/nym/pull/5192
-[#5191]: https://github.com/nymtech/nym/pull/5191
-[#5187]: https://github.com/nymtech/nym/pull/5187
-[#5182]: https://github.com/nymtech/nym/pull/5182
-[#5181]: https://github.com/nymtech/nym/pull/5181
-[#5179]: https://github.com/nymtech/nym/pull/5179
-[#5177]: https://github.com/nymtech/nym/pull/5177
-[#5175]: https://github.com/nymtech/nym/pull/5175
-[#5169]: https://github.com/nymtech/nym/pull/5169
-[#5166]: https://github.com/nymtech/nym/pull/5166
-[#5165]: https://github.com/nymtech/nym/pull/5165
-[#5164]: https://github.com/nymtech/nym/pull/5164
-[#5162]: https://github.com/nymtech/nym/pull/5162
-[#5155]: https://github.com/nymtech/nym/pull/5155
-[#5151]: https://github.com/nymtech/nym/pull/5151
-[#5150]: https://github.com/nymtech/nym/pull/5150
-[#5149]: https://github.com/nymtech/nym/pull/5149
-[#5148]: https://github.com/nymtech/nym/pull/5148
-[#5147]: https://github.com/nymtech/nym/pull/5147
-[#5144]: https://github.com/nymtech/nym/pull/5144
-[#5135]: https://github.com/nymtech/nym/pull/5135
-[#5134]: https://github.com/nymtech/nym/pull/5134
-[#5133]: https://github.com/nymtech/nym/pull/5133
-[#5132]: https://github.com/nymtech/nym/pull/5132
-[#5128]: https://github.com/nymtech/nym/pull/5128
-[#5127]: https://github.com/nymtech/nym/pull/5127
-[#5126]: https://github.com/nymtech/nym/pull/5126
-[#5121]: https://github.com/nymtech/nym/pull/5121
-[#5120]: https://github.com/nymtech/nym/pull/5120
-[#5119]: https://github.com/nymtech/nym/pull/5119
-[#5118]: https://github.com/nymtech/nym/pull/5118
-[#5117]: https://github.com/nymtech/nym/pull/5117
-[#5115]: https://github.com/nymtech/nym/pull/5115
-[#5113]: https://github.com/nymtech/nym/pull/5113
-[#5112]: https://github.com/nymtech/nym/pull/5112
-[#5111]: https://github.com/nymtech/nym/pull/5111
-[#5109]: https://github.com/nymtech/nym/pull/5109
-[#5108]: https://github.com/nymtech/nym/pull/5108
-[#5107]: https://github.com/nymtech/nym/pull/5107
-[#5104]: https://github.com/nymtech/nym/pull/5104
-[#5084]: https://github.com/nymtech/nym/pull/5084
-[#5080]: https://github.com/nymtech/nym/pull/5080
-[#5059]: https://github.com/nymtech/nym/pull/5059
-[#5050]: https://github.com/nymtech/nym/pull/5050
-[#5044]: https://github.com/nymtech/nym/pull/5044
-[#5027]: https://github.com/nymtech/nym/pull/5027
-[#5022]: https://github.com/nymtech/nym/pull/5022
-[#5011]: https://github.com/nymtech/nym/pull/5011
-[#4952]: https://github.com/nymtech/nym/pull/4952
-[#4919]: https://github.com/nymtech/nym/pull/4919
-[#4913]: https://github.com/nymtech/nym/pull/4913
-[#4876]: https://github.com/nymtech/nym/pull/4876
-[#4790]: https://github.com/nymtech/nym/pull/4790
-[#4768]: https://github.com/nymtech/nym/pull/4768
-
-## [2024.13-magura-drift] (2024-11-29)
-
- Optimised syncing bandwidth information to storage
-
-## [2024.13-magura-patched] (2024-11-22)
-
- [experimental] allow clients to change between deterministic route selection based on packet headers and a pseudorandom distribution
- Introduced a configurable limit on retransmission frequency of packets if ACKs are not received
- Filtered out invalid IP addresses on nym-api
-
-## [2024.13-magura] (2024-11-18)
-
- Limit race probability ([#5145])
- bugifx: assign 'node_id' when converting from 'GatewayDetails' to 'TestNode' ([#5143])
- bugfix: make sure to assign correct node_id and identity during 'gateway_details' table migration ([#5142])
- Respond to auth messages with same version ([#5140])
- Pain/polyfill deprecated endpoints ([#5131])
- change: dont select mixnodes bonded with vested tokens into the rewarded set ([#5129])
- nym-credential-proxy-requests: reqwest use rustls-tls ([#5116])
- bugfix: preserve as much as possible of the rewarded set during migration ([#5103])
- Feature/force refresh node ([#5101])
- Add NYM_VPN_API to env files ([#5099])
- bugfix: fixed historical uptimes for nodes ([#5097])
- Remove old use of 1GB constant ([#5096])
- Graceful agent 1.1.5 ([#5093])
- Add more translations from v2 to v3 authenticator ([#5091])
- Nym node - Fix claim delegator rewards ([#5090])
- Make 250 GB/30 days for free ride mode ([#5083])
- Don't increase bandwidth two times ([#5081])
- Fix expiration date as today + 7 days ([#5076])
- Fix gateway decreasing bandwidth ([#5075])
- Allow custom http port to be reset ([#5073])
- bugfix: additional checks inside credential proxy ([#5072])
- chore: deprecated old nym-api client methods and replaced them when possible ([#5069])
- NS API with directory v2 (#5058) ([#5068])
- bugfix: credential-proxy obtain-async ([#5067])
- Allow nym node config updates ([#5066])
- bugfix: use corrext axum extractors for ecash route arguments ([#5065])
- Merge2/release/2024.13 magura ([#5063])
- bugfix/feature: added NymApiClient method to get all skimmed nodes ([#5062])
- Merge1/release/2024.13 magura ([#5061])
- added hacky routes to return nymnodes alongside legacy nodes ([#5051])
- bugfix: mark migrated gateways as rewarded in the previous epoch in case theyre in the rewarded set ([#5049])
- bugfix: adjust runtime storage migration ([#5047])
- bugfix: supersede 'cb13be27f8f61d9ae74d924e85d2e6787895eb14' by using… ([#5046])
- bugfix: restore default http port for nym-api ([#5045])
- bugfix: fix ecash handlers routes ([#5043])
- bugfix: don't assign exit gateways to standby set ([#5041])
- bugfix: make sure nym-nodes are also tested by network monitor ([#5040])
- bugfix: use bonded nym-nodes for determining initial network monitor … ([#5039])
- bugfix: make gateways insert themselves into [local] topology ([#5038])
- Pass poisson flag  ([#5037])
- bugfix: use human readable roles for annotations ([#5036])
- bugfix: use old name for 'epoch_role' in SkimmedNode ([#5034])
- bugfix: make sure to use correct highest node id when assigning role ([#5032])
- feature: use axum_client_ip for attempting to extract source ip ([#5031])
- bugfix: fixed backwards incompatibility for /gateways/described endpoint ([#5030])
- bugfix: verifying signed information of legacy nodes ([#5029])
- bugfix: introduce 'LegacyPendingMixNodeChanges' that does not contain 'cost_params_change' ([#5028])
- bugfix: missing #[serde(default)] for announce port ([#5024])
- bugfix: directory v2.1 `get_all_avg_gateway_reliability_in_interval` query ([#5023])
- added 'get_all_described_nodes' to NymApiClient and adjusted return t… ([#5016])
- Reapply fixes to new branch ([#5014])
- Consume only positive bandwidth ([#5013])
- feature: adjusted ticket sizes to the agreed amounts ([#5009])
- Push private ip before inserting ([#5008])
- chore: update itertools in compact ecash ([#4994])
- feature: make accepting t&c a hard requirement for rewarded set selection ([#4993])
- Fix rustfmt in nym-credential-proxy ([#4992])
- bugfix: client memory leak ([#4991])
- Eliminate 0 bandwidth race check ([#4988])
- [DOCs;/operators]: Release notes for v2024.12 aero ([#4984])
- Add topup req constructor ([#4983])
- Fix critical issues SI86 and SI87 from Cure53 ([#4982])
- Rename nym-vpn-api to nym-credential-proxy ([#4981])
- enable global ecash routes even if api is not a signer ([#4980])
- resolve beta clippy issues in contracts ([#4978])
- Re-enable vested delegation migration ([#4977])
- feature: require reporting using nym-node binary for rewarded set selection ([#4976])
- Top up bandwidth ([#4975])
- [Product Data] Add session type based on ecash ticket received ([#4974])
- Bugfix/additional directory fixes ([#4973])
- feat: add Dockerfile for nym node ([#4972])
- chore: remove unused rocket code ([#4968])
- Import nym-vpn-api crates ([#4967])
- feature: importer-cli to correctly handle mixnet/vesting import ([#4966])
- bugfix: fix expected return type on /v1/gateways endpoint ([#4965])
- [Product Data] First step in gateway usage data collection ([#4963])
- Bump sqlx to 0.7.4 ([#4959])
- Add env feature to clap and make clap parameters available as env variables ([#4957])
- Feature/contract state tools ([#4954])
- expose authenticator address along other address in node-details ([#4953])
- Extract packet processing from mixnode-common ([#4949])
- nym-api container ([#4948])
- Ticket type storage ([#4947])
- Add "utoipa" feature to nym-node ([#4945])
- build(deps): bump the patch-updates group across 1 directory with 9 updates ([#4944])
- V2 performance monitoring feature flag ([#4943])
- Bugfix/rewarder post pruning adjustments ([#4942])
- Switch over the last set of jobs to arc runners ([#4938])
- Fix broken build after merge ([#4937])
- bugfix: correctly paginate through 'search_tx' endpoint ([#4936])
- Add more conversions for responses of authenticator messages ([#4929])
- Directory Sevices v2.1 ([#4903])
- Migrate Legacy Node (Frontend)  ([#4826])
- Fix critical issues SI84 and SI85 from Cure53 ([#4758])
-
-[#5145]: https://github.com/nymtech/nym/pull/5145
-[#5143]: https://github.com/nymtech/nym/pull/5143
-[#5142]: https://github.com/nymtech/nym/pull/5142
-[#5140]: https://github.com/nymtech/nym/pull/5140
-[#5131]: https://github.com/nymtech/nym/pull/5131
-[#5129]: https://github.com/nymtech/nym/pull/5129
-[#5116]: https://github.com/nymtech/nym/pull/5116
-[#5103]: https://github.com/nymtech/nym/pull/5103
-[#5101]: https://github.com/nymtech/nym/pull/5101
-[#5099]: https://github.com/nymtech/nym/pull/5099
-[#5097]: https://github.com/nymtech/nym/pull/5097
-[#5096]: https://github.com/nymtech/nym/pull/5096
-[#5093]: https://github.com/nymtech/nym/pull/5093
-[#5091]: https://github.com/nymtech/nym/pull/5091
-[#5090]: https://github.com/nymtech/nym/pull/5090
-[#5083]: https://github.com/nymtech/nym/pull/5083
-[#5081]: https://github.com/nymtech/nym/pull/5081
-[#5076]: https://github.com/nymtech/nym/pull/5076
-[#5075]: https://github.com/nymtech/nym/pull/5075
-[#5073]: https://github.com/nymtech/nym/pull/5073
-[#5072]: https://github.com/nymtech/nym/pull/5072
-[#5069]: https://github.com/nymtech/nym/pull/5069
-[#5068]: https://github.com/nymtech/nym/pull/5068
-[#5067]: https://github.com/nymtech/nym/pull/5067
-[#5066]: https://github.com/nymtech/nym/pull/5066
-[#5065]: https://github.com/nymtech/nym/pull/5065
-[#5063]: https://github.com/nymtech/nym/pull/5063
-[#5062]: https://github.com/nymtech/nym/pull/5062
-[#5061]: https://github.com/nymtech/nym/pull/5061
-[#5051]: https://github.com/nymtech/nym/pull/5051
-[#5049]: https://github.com/nymtech/nym/pull/5049
-[#5047]: https://github.com/nymtech/nym/pull/5047
-[#5046]: https://github.com/nymtech/nym/pull/5046
-[#5045]: https://github.com/nymtech/nym/pull/5045
-[#5043]: https://github.com/nymtech/nym/pull/5043
-[#5041]: https://github.com/nymtech/nym/pull/5041
-[#5040]: https://github.com/nymtech/nym/pull/5040
-[#5039]: https://github.com/nymtech/nym/pull/5039
-[#5038]: https://github.com/nymtech/nym/pull/5038
-[#5037]: https://github.com/nymtech/nym/pull/5037
-[#5036]: https://github.com/nymtech/nym/pull/5036
-[#5034]: https://github.com/nymtech/nym/pull/5034
-[#5032]: https://github.com/nymtech/nym/pull/5032
-[#5031]: https://github.com/nymtech/nym/pull/5031
-[#5030]: https://github.com/nymtech/nym/pull/5030
-[#5029]: https://github.com/nymtech/nym/pull/5029
-[#5028]: https://github.com/nymtech/nym/pull/5028
-[#5024]: https://github.com/nymtech/nym/pull/5024
-[#5023]: https://github.com/nymtech/nym/pull/5023
-[#5016]: https://github.com/nymtech/nym/pull/5016
-[#5014]: https://github.com/nymtech/nym/pull/5014
-[#5013]: https://github.com/nymtech/nym/pull/5013
-[#5009]: https://github.com/nymtech/nym/pull/5009
-[#5008]: https://github.com/nymtech/nym/pull/5008
-[#4994]: https://github.com/nymtech/nym/pull/4994
-[#4993]: https://github.com/nymtech/nym/pull/4993
-[#4992]: https://github.com/nymtech/nym/pull/4992
-[#4991]: https://github.com/nymtech/nym/pull/4991
-[#4988]: https://github.com/nymtech/nym/pull/4988
-[#4984]: https://github.com/nymtech/nym/pull/4984
-[#4983]: https://github.com/nymtech/nym/pull/4983
-[#4982]: https://github.com/nymtech/nym/pull/4982
-[#4981]: https://github.com/nymtech/nym/pull/4981
-[#4980]: https://github.com/nymtech/nym/pull/4980
-[#4978]: https://github.com/nymtech/nym/pull/4978
-[#4977]: https://github.com/nymtech/nym/pull/4977
-[#4976]: https://github.com/nymtech/nym/pull/4976
-[#4975]: https://github.com/nymtech/nym/pull/4975
-[#4974]: https://github.com/nymtech/nym/pull/4974
-[#4973]: https://github.com/nymtech/nym/pull/4973
-[#4972]: https://github.com/nymtech/nym/pull/4972
-[#4968]: https://github.com/nymtech/nym/pull/4968
-[#4967]: https://github.com/nymtech/nym/pull/4967
-[#4966]: https://github.com/nymtech/nym/pull/4966
-[#4965]: https://github.com/nymtech/nym/pull/4965
-[#4963]: https://github.com/nymtech/nym/pull/4963
-[#4959]: https://github.com/nymtech/nym/pull/4959
-[#4957]: https://github.com/nymtech/nym/pull/4957
-[#4954]: https://github.com/nymtech/nym/pull/4954
-[#4953]: https://github.com/nymtech/nym/pull/4953
-[#4949]: https://github.com/nymtech/nym/pull/4949
-[#4948]: https://github.com/nymtech/nym/pull/4948
-[#4947]: https://github.com/nymtech/nym/pull/4947
-[#4945]: https://github.com/nymtech/nym/pull/4945
-[#4944]: https://github.com/nymtech/nym/pull/4944
-[#4943]: https://github.com/nymtech/nym/pull/4943
-[#4942]: https://github.com/nymtech/nym/pull/4942
-[#4938]: https://github.com/nymtech/nym/pull/4938
-[#4937]: https://github.com/nymtech/nym/pull/4937
-[#4936]: https://github.com/nymtech/nym/pull/4936
-[#4929]: https://github.com/nymtech/nym/pull/4929
-[#4903]: https://github.com/nymtech/nym/pull/4903
-[#4826]: https://github.com/nymtech/nym/pull/4826
-[#4758]: https://github.com/nymtech/nym/pull/4758
-
 ## [2024.12-aero] (2024-10-17)

 - nym-node: don't use bloomfilters for double spending checks ([#4960])
@@ -11,7 +11,7 @@ dependencies = [
 "macroific",
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -283,7 +283,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "serde",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -352,7 +352,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -363,7 +363,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -573,7 +573,7 @@ checksum = "57d123550fa8d071b7255cb0cc04dc302baa6c8c4a79f55701552684d8399bce"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -1140,7 +1140,7 @@ dependencies = [
 "heck 0.5.0",
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -1790,7 +1790,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -1948,7 +1948,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "strsim 0.11.1",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -1970,7 +1970,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178"
 dependencies = [
 "darling_core 0.20.9",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -2021,7 +2021,7 @@ dependencies = [
 "macroific",
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -2064,7 +2064,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -2097,7 +2097,7 @@ dependencies = [
 "proc-macro2",
 "proc-macro2-diagnostics",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -2165,7 +2165,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -2428,7 +2428,7 @@ dependencies = [

 [[package]]
 name = "explorer-api"
-version = "1.1.43"
+version = "1.1.41"
 dependencies = [
 "chrono",
 "clap 4.5.20",
@@ -2531,7 +2531,7 @@ dependencies = [
 "macroific",
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -2765,7 +2765,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -2860,7 +2860,7 @@ dependencies = [
 "proc-macro-error2",
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -3822,9 +3822,9 @@ dependencies = [

 [[package]]
 name = "libc"
-version = "0.2.162"
+version = "0.2.155"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"

 [[package]]
 name = "libm"
@@ -3950,7 +3950,7 @@ dependencies = [
 "cfg-if",
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -3961,7 +3961,7 @@ checksum = "13198c120864097a565ccb3ff947672d969932b7975ebd4085732c9f09435e55"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -3974,7 +3974,7 @@ dependencies = [
 "macroific_core",
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -4431,7 +4431,7 @@ dependencies = [
 "proc-macro-crate",
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -4451,7 +4451,7 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"

 [[package]]
 name = "nym-api"
-version = "1.1.47"
+version = "1.1.45"
 dependencies = [
 "anyhow",
 "async-trait",
@@ -4470,7 +4470,6 @@ dependencies = [
 "cw2",
 "cw3",
 "cw4",
- "dashmap",
 "dirs",
 "futures",
 "getset",
@@ -4674,6 +4673,7 @@ dependencies = [
 "opentelemetry-jaeger",
 "pretty_env_logger",
 "schemars",
+ "semver 1.0.23",
 "serde",
 "serde_json",
 "tracing-opentelemetry",
@@ -4700,7 +4700,7 @@ dependencies = [

 [[package]]
 name = "nym-cli"
-version = "1.1.45"
+version = "1.1.43"
 dependencies = [
 "anyhow",
 "base64 0.22.1",
@@ -4781,7 +4781,7 @@ dependencies = [

 [[package]]
 name = "nym-client"
-version = "1.1.45"
+version = "1.1.42"
 dependencies = [
 "bs58",
 "clap 4.5.20",
@@ -5010,9 +5010,6 @@ dependencies = [
 name = "nym-common-models"
 version = "0.1.0"
 dependencies = [
- "anyhow",
- "bincode",
- "nym-crypto",
 "serde",
 ]

@@ -5092,7 +5089,7 @@ dependencies = [

 [[package]]
 name = "nym-credential-proxy"
-version = "0.1.6"
+version = "0.1.3"
 dependencies = [
 "anyhow",
 "async-trait",
@@ -5112,7 +5109,6 @@ dependencies = [
 "nym-credentials",
 "nym-credentials-interface",
 "nym-crypto",
- "nym-ecash-contract-common",
 "nym-http-api-common",
 "nym-network-defaults",
 "nym-validator-client",
@@ -5620,15 +5616,12 @@ dependencies = [
 "axum-client-ip",
 "bytes",
 "colored",
- "futures",
 "mime",
 "serde",
 "serde_json",
 "serde_yaml",
- "tower 0.4.13",
 "tracing",
 "utoipa",
- "zeroize",
 ]

 [[package]]
@@ -5872,7 +5865,7 @@ dependencies = [

 [[package]]
 name = "nym-network-monitor"
-version = "1.0.2"
+version = "0.1.0"
 dependencies = [
 "anyhow",
 "axum 0.7.7",
@@ -5902,7 +5895,7 @@ dependencies = [

 [[package]]
 name = "nym-network-requester"
-version = "1.1.46"
+version = "1.1.43"
 dependencies = [
 "addr",
 "anyhow",
@@ -5953,7 +5946,7 @@ dependencies = [

 [[package]]
 name = "nym-node"
-version = "1.2.0"
+version = "1.1.9"
 dependencies = [
 "anyhow",
 "bip39",
@@ -5980,7 +5973,6 @@ dependencies = [
 "nym-sphinx-addressing",
 "nym-task",
 "nym-types",
- "nym-validator-client",
 "nym-wireguard",
 "nym-wireguard-types",
 "rand",
@@ -6056,20 +6048,14 @@ dependencies = [

 [[package]]
 name = "nym-node-status-agent"
-version = "1.0.0-rc.1"
+version = "0.1.4"
 dependencies = [
 "anyhow",
- "bincode",
- "chrono",
 "clap 4.5.20",
 "nym-bin-common",
 "nym-common-models",
- "nym-crypto",
- "rand",
 "reqwest 0.12.4",
- "serde",
 "serde_json",
- "tempfile",
 "tokio",
 "tokio-util",
 "tracing",
@@ -6078,11 +6064,10 @@ dependencies = [

 [[package]]
 name = "nym-node-status-api"
-version = "1.0.0-rc.2"
+version = "0.1.5"
 dependencies = [
 "anyhow",
 "axum 0.7.7",
- "bincode",
 "chrono",
 "clap 4.5.20",
 "cosmwasm-std",
@@ -6091,7 +6076,6 @@ dependencies = [
 "moka",
 "nym-bin-common",
 "nym-common-models",
- "nym-crypto",
 "nym-explorer-client",
 "nym-network-defaults",
 "nym-node-requests",
@@ -6309,7 +6293,7 @@ dependencies = [

 [[package]]
 name = "nym-socks5-client"
-version = "1.1.45"
+version = "1.1.42"
 dependencies = [
 "bs58",
 "clap 4.5.20",
@@ -6889,7 +6873,6 @@ dependencies = [
 "nym-task",
 "nym-wireguard-types",
 "thiserror",
- "time",
 "tokio",
 "tokio-stream",
 "x25519-dalek",
@@ -6912,7 +6895,7 @@ dependencies = [

 [[package]]
 name = "nymvisor"
-version = "0.1.10"
+version = "0.1.8"
 dependencies = [
 "anyhow",
 "bytes",
@@ -7225,7 +7208,7 @@ dependencies = [
 "proc-macro2",
 "proc-macro2-diagnostics",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -7312,7 +7295,7 @@ dependencies = [
 "pest_meta",
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -7353,7 +7336,7 @@ checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -7568,14 +7551,14 @@ dependencies = [
 "proc-macro-error-attr2",
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
 name = "proc-macro2"
-version = "1.0.89"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
+checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
 dependencies = [
 "unicode-ident",
 ]
@@ -7588,7 +7571,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 "version_check",
 "yansi",
 ]
@@ -7651,7 +7634,7 @@ dependencies = [
 "itertools 0.12.1",
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -7884,19 +7867,19 @@ checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
 name = "regex"
-version = "1.11.1"
+version = "1.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
 dependencies = [
 "aho-corasick",
 "memchr",
- "regex-automata 0.4.9",
- "regex-syntax 0.8.5",
+ "regex-automata 0.4.7",
+ "regex-syntax 0.8.4",
 ]

 [[package]]
@@ -7910,13 +7893,13 @@ dependencies = [

 [[package]]
 name = "regex-automata"
-version = "0.4.9"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
 dependencies = [
 "aho-corasick",
 "memchr",
- "regex-syntax 0.8.5",
+ "regex-syntax 0.8.4",
 ]

 [[package]]
@@ -7927,9 +7910,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"

 [[package]]
 name = "regex-syntax"
-version = "0.8.5"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"

 [[package]]
 name = "reqwest"
@@ -8111,7 +8094,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "rocket_http",
- "syn 2.0.87",
+ "syn 2.0.82",
 "unicode-xid",
 "version_check",
 ]
@@ -8237,7 +8220,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "rust-embed-utils",
- "syn 2.0.87",
+ "syn 2.0.82",
 "walkdir",
 ]

@@ -8293,9 +8276,9 @@ dependencies = [

 [[package]]
 name = "rustix"
-version = "0.38.40"
+version = "0.38.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99e4ea3e1cdc4b559b8e5650f9c8e5998e3e5c1343b4eaf034565f32318d63c0"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
 dependencies = [
 "bitflags 2.5.0",
 "errno",
@@ -8486,7 +8469,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "serde_derive_internals 0.29.1",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -8518,7 +8501,7 @@ checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -8595,9 +8578,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"

 [[package]]
 name = "serde"
-version = "1.0.215"
+version = "1.0.211"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
+checksum = "1ac55e59090389fb9f0dd9e0f3c09615afed1d19094284d0b200441f13550793"
 dependencies = [
 "serde_derive",
 ]
@@ -8644,13 +8627,13 @@ dependencies = [

 [[package]]
 name = "serde_derive"
-version = "1.0.215"
+version = "1.0.211"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
+checksum = "54be4f245ce16bc58d57ef2716271d0d4519e0f6defa147f6e081005bcb278ff"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -8661,7 +8644,7 @@ checksum = "e578a843d40b4189a4d66bba51d7684f57da5bd7c304c64e14bd63efbef49509"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -8672,7 +8655,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -8689,12 +8672,13 @@ dependencies = [

 [[package]]
 name = "serde_json_path"
-version = "0.7.1"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e176fbf9bd62f75c2d8be33207fa13af2f800a506635e89759e46f934c520f4d"
+checksum = "0bc0207b6351893eafa1e39aa9aea452abb6425ca7b02dd64faf29109e7a33ba"
 dependencies = [
 "inventory",
 "nom",
+ "once_cell",
 "regex",
 "serde",
 "serde_json",
@@ -8705,11 +8689,12 @@ dependencies = [

 [[package]]
 name = "serde_json_path_core"
-version = "0.2.1"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea3bfd54a421bec8328aefede43ac9f18c8c7ded3b2afc8addd44b4813d99fd0"
+checksum = "a3d64fe53ce1aaa31bea2b2b46d3b6ab6a37e61854bedcbd9f174e188f3f7d79"
 dependencies = [
 "inventory",
+ "once_cell",
 "serde",
 "serde_json",
 "thiserror",
@@ -8717,24 +8702,25 @@ dependencies = [

 [[package]]
 name = "serde_json_path_macros"
-version = "0.1.5"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee05bac728cc5232af5c23896b34fbdd17cf0bb0c113440588aeeb1b57c6ba1f"
+checksum = "2a31e8177a443fd3e94917f12946ae7891dfb656e6d4c5e79b8c5d202fbcb723"
 dependencies = [
 "inventory",
+ "once_cell",
 "serde_json_path_core",
 "serde_json_path_macros_internal",
 ]

 [[package]]
 name = "serde_json_path_macros_internal"
-version = "0.1.2"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aafbefbe175fa9bf03ca83ef89beecff7d2a95aaacd5732325b90ac8c3bd7b90"
+checksum = "75dde5a1d2ed78dfc411fc45592f72d3694436524d3353683ecb3d22009731dc"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -8755,7 +8741,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -8806,7 +8792,7 @@ dependencies = [
 "darling 0.20.9",
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -9405,7 +9391,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "rustversion",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -9448,9 +9434,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "2.0.87"
+version = "2.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
+checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -9530,13 +9516,12 @@ dependencies = [

 [[package]]
 name = "tempfile"
-version = "3.14.0"
+version = "3.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
 dependencies = [
 "cfg-if",
 "fastrand 2.1.1",
- "once_cell",
 "rustix",
 "windows-sys 0.52.0",
 ]
@@ -9741,22 +9726,22 @@ checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"

 [[package]]
 name = "thiserror"
-version = "1.0.69"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.69"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -9887,7 +9872,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -10166,7 +10151,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -10330,7 +10315,7 @@ checksum = "0ea0b99e8ec44abd6f94a18f28f7934437809dd062820797c52401298116f70e"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 "termcolor",
 ]

@@ -10357,7 +10342,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "serde_derive_internals 0.28.0",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -10560,7 +10545,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55137c122f712d9330fd985d66fa61bdc381752e89c35708c13ce63049a3002c"
 dependencies = [
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -10592,7 +10577,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "serde",
- "syn 2.0.87",
+ "syn 2.0.82",
 "toml 0.5.11",
 "uniffi_build",
 "uniffi_meta",
@@ -10724,7 +10709,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "regex",
- "syn 2.0.87",
+ "syn 2.0.82",
 "uuid",
 ]

@@ -10763,7 +10748,7 @@ checksum = "17e82ab96c5a55263b5bed151b8426410d93aa909a453acdbd4b6792b5af7d64"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -10774,7 +10759,7 @@ checksum = "86b8338dc3c9526011ffaa2aa6bd60ddfda9d49d2123108690755c6e34844212"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 "utoipauto-core",
 ]

@@ -10881,7 +10866,7 @@ dependencies = [
 "once_cell",
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 "wasm-bindgen-shared",
 ]

@@ -10915,7 +10900,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 "wasm-bindgen-backend",
 "wasm-bindgen-shared",
 ]
@@ -10949,7 +10934,7 @@ checksum = "4b8220be1fa9e4c889b30fd207d4906657e7e90b12e0e6b0c8b8d8709f5de021"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -11477,7 +11462,7 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -11497,7 +11482,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.82",
 ]

 [[package]]
@@ -314,7 +314,7 @@ serde = "1.0.211"
 serde_bytes = "0.11.15"
 serde_derive = "1.0"
 serde_json = "1.0.132"
-serde_json_path = "0.7.1"
+serde_json_path = "0.6.7"
 serde_repr = "0.1"
 serde_with = "3.9.0"
 serde_yaml = "0.9.25"
@@ -329,7 +329,7 @@ syn = "1"
 sysinfo = "0.30.13"
 tap = "1.0.1"
 tar = "0.4.42"
-tempfile = "3.14"
+tempfile = "3.5.0"
 thiserror = "1.0.64"
 time = "0.3.30"
 tokio = "1.39"
@@ -1,6 +1,6 @@
 [package]
 name = "nym-client"
-version = "1.1.45"
+version = "1.1.42"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 description = "Implementation of the Nym Client"
 edition = "2021"
@@ -3,10 +3,13 @@

 use crate::commands::try_load_current_config;
 use crate::{
-    client::SocketClient,
+    client::{config::Config, SocketClient},
    commands::{override_config, OverrideConfig},
+    error::ClientError,
 };
 use clap::Args;
+use log::*;
+use nym_bin_common::version_checker::is_minor_version_compatible;
 use nym_client_core::cli_helpers::client_run::CommonClientRunArgs;
 use std::error::Error;
 use std::net::IpAddr;
@@ -45,12 +48,36 @@ impl From<Run> for OverrideConfig {
    }
 }

+// this only checks compatibility between config the binary. It does not take into consideration
+// network version. It might do so in the future.
+fn version_check(cfg: &Config) -> bool {
+    let binary_version = env!("CARGO_PKG_VERSION");
+    let config_version = &cfg.base.client.version;
+    if binary_version == config_version {
+        true
+    } else {
+        warn!("The native-client binary has different version than what is specified in config file! {} and {}", binary_version, config_version);
+        if is_minor_version_compatible(binary_version, config_version) {
+            info!("but they are still semver compatible. However, consider running the `upgrade` command");
+            true
+        } else {
+            error!("and they are semver incompatible! - please run the `upgrade` command before attempting `run` again");
+            false
+        }
+    }
+}
+
 pub(crate) async fn execute(args: Run) -> Result<(), Box<dyn Error + Send + Sync>> {
    eprintln!("Starting client {}...", args.common_args.id);

    let mut config = try_load_current_config(&args.common_args.id).await?;
    config = override_config(config, OverrideConfig::from(args.clone()));

+    if !version_check(&config) {
+        error!("failed the local version check");
+        return Err(Box::new(ClientError::FailedLocalVersionCheck));
+    }
+
    SocketClient::new(config, args.common_args.custom_mixnet)
        .run_socket_forever()
        .await
@@ -17,6 +17,9 @@ pub enum ClientError {
    #[error("Failed to validate the loaded config")]
    ConfigValidationFailure,

+    #[error("Failed local version check, client and config mismatch")]
+    FailedLocalVersionCheck,
+
    #[error("Attempted to start the client in invalid socket mode")]
    InvalidSocketMode,

@@ -1,6 +1,6 @@
 [package]
 name = "nym-socks5-client"
-version = "1.1.45"
+version = "1.1.42"
 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"
@@ -2,8 +2,14 @@
 // SPDX-License-Identifier: Apache-2.0

 use crate::commands::try_load_current_config;
-use crate::commands::{override_config, OverrideConfig};
+use crate::config::Config;
+use crate::{
+    commands::{override_config, OverrideConfig},
+    error::Socks5ClientError,
+};
 use clap::Args;
+use log::*;
+use nym_bin_common::version_checker::is_minor_version_compatible;
 use nym_client_core::cli_helpers::client_run::CommonClientRunArgs;
 use nym_client_core::client::base_client::storage::OnDiskPersistent;
 use nym_client_core::client::topology_control::geo_aware_provider::CountryGroup;
@@ -76,12 +82,38 @@ fn validate_country_group(s: &str) -> Result<CountryGroup, String> {
    }
 }

+// this only checks compatibility between config the binary. It does not take into consideration
+// network version. It might do so in the future.
+fn version_check(cfg: &Config) -> bool {
+    let binary_version = env!("CARGO_PKG_VERSION");
+    let config_version = &cfg.core.base.client.version;
+    if binary_version == config_version {
+        true
+    } else {
+        warn!(
+            "The socks5-client binary has different version than what is specified in config file! {binary_version} and {config_version}",
+        );
+        if is_minor_version_compatible(binary_version, config_version) {
+            info!("but they are still semver compatible. However, consider running the `upgrade` command");
+            true
+        } else {
+            error!("and they are semver incompatible! - please run the `upgrade` command before attempting `run` again");
+            false
+        }
+    }
+}
+
 pub(crate) async fn execute(args: Run) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
    eprintln!("Starting client {}...", args.common_args.id);

    let mut config = try_load_current_config(&args.common_args.id).await?;
    config = override_config(config, OverrideConfig::from(args.clone()));

+    if !version_check(&config) {
+        error!("failed the local version check");
+        return Err(Box::new(Socks5ClientError::FailedLocalVersionCheck));
+    }
+
    let storage =
        OnDiskPersistent::from_paths(config.storage_paths.common_paths, &config.core.base.debug)
            .await?;
@@ -14,6 +14,9 @@ pub enum Socks5ClientError {
    #[error("Failed to validate the loaded config")]
    ConfigValidationFailure,

+    #[error("Failed local version check, client and config mismatch")]
+    FailedLocalVersionCheck,
+
    #[error("Fail to bind address")]
    FailToBindAddress,

@@ -22,7 +22,4 @@ pub enum Error {

    #[error("conversion: {0}")]
    Conversion(String),
-
-    #[error("failed to serialize response packet: {source}")]
-    FailedToSerializeResponsePacket { source: Box<bincode::ErrorKind> },
 }
@@ -1,7 +1,6 @@
 // Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-pub mod traits;
 pub mod v1;
 pub mod v2;
 pub mod v3;
@@ -1,343 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use nym_credentials_interface::CredentialSpendingData;
-use nym_crypto::asymmetric::x25519::PrivateKey;
-use nym_service_provider_requests_common::{Protocol, ServiceProviderType};
-use nym_sphinx::addressing::clients::Recipient;
-use nym_wireguard_types::PeerPublicKey;
-
-use crate::{
-    v1, v2, v3,
-    v4::{self, registration::IpPair},
-    Error,
-};
-
-#[derive(Copy, Clone, Debug)]
-pub enum AuthenticatorVersion {
-    V1,
-    V2,
-    V3,
-    V4,
-    UNKNOWN,
-}
-
-impl From<Protocol> for AuthenticatorVersion {
-    fn from(value: Protocol) -> Self {
-        if value.service_provider_type != ServiceProviderType::Authenticator {
-            AuthenticatorVersion::UNKNOWN
-        } else if value.version == v1::VERSION {
-            AuthenticatorVersion::V1
-        } else if value.version == v2::VERSION {
-            AuthenticatorVersion::V2
-        } else if value.version == v3::VERSION {
-            AuthenticatorVersion::V3
-        } else if value.version == v4::VERSION {
-            AuthenticatorVersion::V4
-        } else {
-            AuthenticatorVersion::UNKNOWN
-        }
-    }
-}
-
-pub trait InitMessage {
-    fn pub_key(&self) -> PeerPublicKey;
-}
-
-impl InitMessage for v1::registration::InitMessage {
-    fn pub_key(&self) -> PeerPublicKey {
-        self.pub_key
-    }
-}
-
-impl InitMessage for v2::registration::InitMessage {
-    fn pub_key(&self) -> PeerPublicKey {
-        self.pub_key
-    }
-}
-
-impl InitMessage for v3::registration::InitMessage {
-    fn pub_key(&self) -> PeerPublicKey {
-        self.pub_key
-    }
-}
-
-impl InitMessage for v4::registration::InitMessage {
-    fn pub_key(&self) -> PeerPublicKey {
-        self.pub_key
-    }
-}
-
-pub trait FinalMessage {
-    fn pub_key(&self) -> PeerPublicKey;
-    fn verify(&self, private_key: &PrivateKey, nonce: u64) -> Result<(), Error>;
-    fn private_ips(&self) -> IpPair;
-    fn credential(&self) -> Option<CredentialSpendingData>;
-}
-
-impl FinalMessage for v1::GatewayClient {
-    fn pub_key(&self) -> PeerPublicKey {
-        self.pub_key
-    }
-
-    fn verify(&self, private_key: &PrivateKey, nonce: u64) -> Result<(), Error> {
-        self.verify(private_key, nonce)
-    }
-
-    fn private_ips(&self) -> IpPair {
-        self.private_ip.into()
-    }
-
-    fn credential(&self) -> Option<CredentialSpendingData> {
-        None
-    }
-}
-
-impl FinalMessage for v2::registration::FinalMessage {
-    fn pub_key(&self) -> PeerPublicKey {
-        self.gateway_client.pub_key
-    }
-
-    fn verify(&self, private_key: &PrivateKey, nonce: u64) -> Result<(), Error> {
-        self.gateway_client.verify(private_key, nonce)
-    }
-
-    fn private_ips(&self) -> IpPair {
-        self.gateway_client.private_ip.into()
-    }
-
-    fn credential(&self) -> Option<CredentialSpendingData> {
-        self.credential.clone()
-    }
-}
-
-impl FinalMessage for v3::registration::FinalMessage {
-    fn pub_key(&self) -> PeerPublicKey {
-        self.gateway_client.pub_key
-    }
-
-    fn verify(&self, private_key: &PrivateKey, nonce: u64) -> Result<(), Error> {
-        self.gateway_client.verify(private_key, nonce)
-    }
-
-    fn private_ips(&self) -> IpPair {
-        self.gateway_client.private_ip.into()
-    }
-
-    fn credential(&self) -> Option<CredentialSpendingData> {
-        self.credential.clone()
-    }
-}
-
-impl FinalMessage for v4::registration::FinalMessage {
-    fn pub_key(&self) -> PeerPublicKey {
-        self.gateway_client.pub_key
-    }
-
-    fn verify(&self, private_key: &PrivateKey, nonce: u64) -> Result<(), Error> {
-        self.gateway_client.verify(private_key, nonce)
-    }
-
-    fn private_ips(&self) -> IpPair {
-        self.gateway_client.private_ips
-    }
-
-    fn credential(&self) -> Option<CredentialSpendingData> {
-        self.credential.clone()
-    }
-}
-
-pub trait QueryBandwidthMessage {
-    fn pub_key(&self) -> PeerPublicKey;
-}
-
-impl QueryBandwidthMessage for PeerPublicKey {
-    fn pub_key(&self) -> PeerPublicKey {
-        *self
-    }
-}
-
-pub trait TopUpMessage {
-    fn pub_key(&self) -> PeerPublicKey;
-    fn credential(&self) -> CredentialSpendingData;
-}
-
-impl TopUpMessage for v3::topup::TopUpMessage {
-    fn pub_key(&self) -> PeerPublicKey {
-        self.pub_key
-    }
-
-    fn credential(&self) -> CredentialSpendingData {
-        self.credential.clone()
-    }
-}
-
-impl TopUpMessage for v4::topup::TopUpMessage {
-    fn pub_key(&self) -> PeerPublicKey {
-        self.pub_key
-    }
-
-    fn credential(&self) -> CredentialSpendingData {
-        self.credential.clone()
-    }
-}
-
-pub enum AuthenticatorRequest {
-    Initial {
-        msg: Box<dyn InitMessage + Send + Sync + 'static>,
-        protocol: Protocol,
-        reply_to: Recipient,
-        request_id: u64,
-    },
-    Final {
-        msg: Box<dyn FinalMessage + Send + Sync + 'static>,
-        protocol: Protocol,
-        reply_to: Recipient,
-        request_id: u64,
-    },
-    QueryBandwidth {
-        msg: Box<dyn QueryBandwidthMessage + Send + Sync + 'static>,
-        protocol: Protocol,
-        reply_to: Recipient,
-        request_id: u64,
-    },
-    TopUpBandwidth {
-        msg: Box<dyn TopUpMessage + Send + Sync + 'static>,
-        protocol: Protocol,
-        reply_to: Recipient,
-        request_id: u64,
-    },
-}
-
-impl From<v1::request::AuthenticatorRequest> for AuthenticatorRequest {
-    fn from(value: v1::request::AuthenticatorRequest) -> Self {
-        match value.data {
-            v1::request::AuthenticatorRequestData::Initial(init_message) => Self::Initial {
-                msg: Box::new(init_message),
-                protocol: Protocol {
-                    version: value.version,
-                    service_provider_type: ServiceProviderType::Authenticator,
-                },
-                reply_to: value.reply_to,
-                request_id: value.request_id,
-            },
-            v1::request::AuthenticatorRequestData::Final(gateway_client) => Self::Final {
-                msg: Box::new(gateway_client),
-                protocol: Protocol {
-                    version: value.version,
-                    service_provider_type: ServiceProviderType::Authenticator,
-                },
-                reply_to: value.reply_to,
-                request_id: value.request_id,
-            },
-            v1::request::AuthenticatorRequestData::QueryBandwidth(peer_public_key) => {
-                Self::QueryBandwidth {
-                    msg: Box::new(peer_public_key),
-                    protocol: Protocol {
-                        version: value.version,
-                        service_provider_type: ServiceProviderType::Authenticator,
-                    },
-                    reply_to: value.reply_to,
-                    request_id: value.request_id,
-                }
-            }
-        }
-    }
-}
-
-impl From<v2::request::AuthenticatorRequest> for AuthenticatorRequest {
-    fn from(value: v2::request::AuthenticatorRequest) -> Self {
-        match value.data {
-            v2::request::AuthenticatorRequestData::Initial(init_message) => Self::Initial {
-                msg: Box::new(init_message),
-                protocol: value.protocol,
-                reply_to: value.reply_to,
-                request_id: value.request_id,
-            },
-            v2::request::AuthenticatorRequestData::Final(final_message) => Self::Final {
-                msg: final_message,
-                protocol: value.protocol,
-                reply_to: value.reply_to,
-                request_id: value.request_id,
-            },
-            v2::request::AuthenticatorRequestData::QueryBandwidth(peer_public_key) => {
-                Self::QueryBandwidth {
-                    msg: Box::new(peer_public_key),
-                    protocol: value.protocol,
-                    reply_to: value.reply_to,
-                    request_id: value.request_id,
-                }
-            }
-        }
-    }
-}
-
-impl From<v3::request::AuthenticatorRequest> for AuthenticatorRequest {
-    fn from(value: v3::request::AuthenticatorRequest) -> Self {
-        match value.data {
-            v3::request::AuthenticatorRequestData::Initial(init_message) => Self::Initial {
-                msg: Box::new(init_message),
-                protocol: value.protocol,
-                reply_to: value.reply_to,
-                request_id: value.request_id,
-            },
-            v3::request::AuthenticatorRequestData::Final(final_message) => Self::Final {
-                msg: final_message,
-                protocol: value.protocol,
-                reply_to: value.reply_to,
-                request_id: value.request_id,
-            },
-            v3::request::AuthenticatorRequestData::QueryBandwidth(peer_public_key) => {
-                Self::QueryBandwidth {
-                    msg: Box::new(peer_public_key),
-                    protocol: value.protocol,
-                    reply_to: value.reply_to,
-                    request_id: value.request_id,
-                }
-            }
-            v3::request::AuthenticatorRequestData::TopUpBandwidth(top_up_message) => {
-                Self::TopUpBandwidth {
-                    msg: top_up_message,
-                    protocol: value.protocol,
-                    reply_to: value.reply_to,
-                    request_id: value.request_id,
-                }
-            }
-        }
-    }
-}
-
-impl From<v4::request::AuthenticatorRequest> for AuthenticatorRequest {
-    fn from(value: v4::request::AuthenticatorRequest) -> Self {
-        match value.data {
-            v4::request::AuthenticatorRequestData::Initial(init_message) => Self::Initial {
-                msg: Box::new(init_message),
-                protocol: value.protocol,
-                reply_to: value.reply_to,
-                request_id: value.request_id,
-            },
-            v4::request::AuthenticatorRequestData::Final(final_message) => Self::Final {
-                msg: final_message,
-                protocol: value.protocol,
-                reply_to: value.reply_to,
-                request_id: value.request_id,
-            },
-            v4::request::AuthenticatorRequestData::QueryBandwidth(peer_public_key) => {
-                Self::QueryBandwidth {
-                    msg: Box::new(peer_public_key),
-                    protocol: value.protocol,
-                    reply_to: value.reply_to,
-                    request_id: value.request_id,
-                }
-            }
-            v4::request::AuthenticatorRequestData::TopUpBandwidth(top_up_message) => {
-                Self::TopUpBandwidth {
-                    msg: top_up_message,
-                    protocol: value.protocol,
-                    reply_to: value.reply_to,
-                    request_id: value.request_id,
-                }
-            }
-        }
-    }
-}
@@ -17,6 +17,11 @@ fn generate_random() -> u64 {
    rng.next_u64()
 }

+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct QueryMessage {
+    pub pub_key: PeerPublicKey,
+}
+
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct AuthenticatorRequest {
    pub protocol: Protocol,
@@ -65,7 +70,7 @@ impl AuthenticatorRequest {
        )
    }

-    pub fn new_query_request(peer_public_key: PeerPublicKey, reply_to: Recipient) -> (Self, u64) {
+    pub fn new_query_request(query_message: QueryMessage, reply_to: Recipient) -> (Self, u64) {
        let request_id = generate_random();
        (
            Self {
@@ -73,7 +78,7 @@ impl AuthenticatorRequest {
                    service_provider_type: ServiceProviderType::Authenticator,
                    version: VERSION,
                },
-                data: AuthenticatorRequestData::QueryBandwidth(peer_public_key),
+                data: AuthenticatorRequestData::QueryBandwidth(query_message.pub_key),
                reply_to,
                request_id,
            },
@@ -98,16 +98,6 @@ impl TryFrom<v3::response::AuthenticatorResponse> for v2::response::Authenticato
    }
 }

-impl From<v2::response::AuthenticatorResponse> for v3::response::AuthenticatorResponse {
-    fn from(value: v2::response::AuthenticatorResponse) -> Self {
-        Self {
-            protocol: value.protocol,
-            data: value.data.into(),
-            reply_to: value.reply_to,
-        }
-    }
-}
-
 impl TryFrom<v3::response::AuthenticatorResponseData> for v2::response::AuthenticatorResponseData {
    type Error = crate::Error;

@@ -139,22 +129,6 @@ impl TryFrom<v3::response::AuthenticatorResponseData> for v2::response::Authenti
    }
 }

-impl From<v2::response::AuthenticatorResponseData> for v3::response::AuthenticatorResponseData {
-    fn from(value: v2::response::AuthenticatorResponseData) -> Self {
-        match value {
-            v2::response::AuthenticatorResponseData::PendingRegistration(
-                pending_registration_response,
-            ) => Self::PendingRegistration(pending_registration_response.into()),
-            v2::response::AuthenticatorResponseData::Registered(registered_response) => {
-                Self::Registered(registered_response.into())
-            }
-            v2::response::AuthenticatorResponseData::RemainingBandwidth(
-                remaining_bandwidth_response,
-            ) => Self::RemainingBandwidth(remaining_bandwidth_response.into()),
-        }
-    }
-}
-
 impl From<v3::response::PendingRegistrationResponse> for v2::response::PendingRegistrationResponse {
    fn from(value: v3::response::PendingRegistrationResponse) -> Self {
        Self {
@@ -165,16 +139,6 @@ impl From<v3::response::PendingRegistrationResponse> for v2::response::PendingRe
    }
 }

-impl From<v2::response::PendingRegistrationResponse> for v3::response::PendingRegistrationResponse {
-    fn from(value: v2::response::PendingRegistrationResponse) -> Self {
-        Self {
-            request_id: value.request_id,
-            reply_to: value.reply_to,
-            reply: value.reply.into(),
-        }
-    }
-}
-
 impl From<v3::response::RegisteredResponse> for v2::response::RegisteredResponse {
    fn from(value: v3::response::RegisteredResponse) -> Self {
        Self {
@@ -185,16 +149,6 @@ impl From<v3::response::RegisteredResponse> for v2::response::RegisteredResponse
    }
 }

-impl From<v2::response::RegisteredResponse> for v3::response::RegisteredResponse {
-    fn from(value: v2::response::RegisteredResponse) -> Self {
-        Self {
-            request_id: value.request_id,
-            reply_to: value.reply_to,
-            reply: value.reply.into(),
-        }
-    }
-}
-
 impl From<v3::response::RemainingBandwidthResponse> for v2::response::RemainingBandwidthResponse {
    fn from(value: v3::response::RemainingBandwidthResponse) -> Self {
        Self {
@@ -205,16 +159,6 @@ impl From<v3::response::RemainingBandwidthResponse> for v2::response::RemainingB
    }
 }

-impl From<v2::response::RemainingBandwidthResponse> for v3::response::RemainingBandwidthResponse {
-    fn from(value: v2::response::RemainingBandwidthResponse) -> Self {
-        Self {
-            request_id: value.request_id,
-            reply_to: value.reply_to,
-            reply: value.reply.map(Into::into),
-        }
-    }
-}
-
 impl From<v3::registration::RegistrationData> for v2::registration::RegistrationData {
    fn from(value: v3::registration::RegistrationData) -> Self {
        Self {
@@ -225,16 +169,6 @@ impl From<v3::registration::RegistrationData> for v2::registration::Registration
    }
 }

-impl From<v2::registration::RegistrationData> for v3::registration::RegistrationData {
-    fn from(value: v2::registration::RegistrationData) -> Self {
-        Self {
-            nonce: value.nonce,
-            gateway_data: value.gateway_data.into(),
-            wg_port: value.wg_port,
-        }
-    }
-}
-
 impl From<v3::registration::RegistredData> for v2::registration::RegistredData {
    fn from(value: v3::registration::RegistredData) -> Self {
        Self {
@@ -245,16 +179,6 @@ impl From<v3::registration::RegistredData> for v2::registration::RegistredData {
    }
 }

-impl From<v2::registration::RegistredData> for v3::registration::RegistredData {
-    fn from(value: v2::registration::RegistredData) -> Self {
-        Self {
-            pub_key: value.pub_key,
-            private_ip: value.private_ip,
-            wg_port: value.wg_port,
-        }
-    }
-}
-
 impl From<v3::registration::RemainingBandwidthData> for v2::registration::RemainingBandwidthData {
    fn from(value: v3::registration::RemainingBandwidthData) -> Self {
        Self {
@@ -262,11 +186,3 @@ impl From<v3::registration::RemainingBandwidthData> for v2::registration::Remain
        }
    }
 }
-
-impl From<v2::registration::RemainingBandwidthData> for v3::registration::RemainingBandwidthData {
-    fn from(value: v2::registration::RemainingBandwidthData) -> Self {
-        Self {
-            available_bandwidth: value.available_bandwidth,
-        }
-    }
-}
@@ -27,7 +27,7 @@ pub type HmacSha256 = Hmac<Sha256>;
 pub type Nonce = u64;
 pub type Taken = Option<SystemTime>;

-pub const BANDWIDTH_CAP_PER_DAY: u64 = 250 * 1024 * 1024 * 1024; // 250 GB
+pub const BANDWIDTH_CAP_PER_DAY: u64 = 1024 * 1024 * 1024; // 1 GB

 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct InitMessage {
@@ -20,6 +20,11 @@ fn generate_random() -> u64 {
    rng.next_u64()
 }

+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct QueryMessage {
+    pub pub_key: PeerPublicKey,
+}
+
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct AuthenticatorRequest {
    pub protocol: Protocol,
@@ -68,7 +73,7 @@ impl AuthenticatorRequest {
        )
    }

-    pub fn new_query_request(peer_public_key: PeerPublicKey, reply_to: Recipient) -> (Self, u64) {
+    pub fn new_query_request(query_message: QueryMessage, reply_to: Recipient) -> (Self, u64) {
        let request_id = generate_random();
        (
            Self {
@@ -76,7 +81,7 @@ impl AuthenticatorRequest {
                    service_provider_type: ServiceProviderType::Authenticator,
                    version: VERSION,
                },
-                data: AuthenticatorRequestData::QueryBandwidth(peer_public_key),
+                data: AuthenticatorRequestData::QueryBandwidth(query_message.pub_key),
                reply_to,
                request_id,
            },
@@ -3,7 +3,7 @@

 use nym_service_provider_requests_common::{Protocol, ServiceProviderType};

-use crate::{v2, v3, v4};
+use crate::{v3, v4};

 impl From<v3::request::AuthenticatorRequest> for v4::request::AuthenticatorRequest {
    fn from(authenticator_request: v3::request::AuthenticatorRequest) -> Self {
@@ -64,16 +64,6 @@ impl From<Box<v3::topup::TopUpMessage>> for Box<v4::topup::TopUpMessage> {
    }
 }

-impl From<v2::registration::GatewayClient> for v4::registration::GatewayClient {
-    fn from(gw_client: v2::registration::GatewayClient) -> Self {
-        Self {
-            pub_key: gw_client.pub_key,
-            private_ips: gw_client.private_ip.into(),
-            mac: gw_client.mac.into(),
-        }
-    }
-}
-
 impl From<v3::registration::GatewayClient> for v4::registration::GatewayClient {
    fn from(gw_client: v3::registration::GatewayClient) -> Self {
        Self {
@@ -94,22 +84,6 @@ impl From<v4::registration::GatewayClient> for v3::registration::GatewayClient {
    }
 }

-impl From<v4::registration::GatewayClient> for v2::registration::GatewayClient {
-    fn from(gw_client: v4::registration::GatewayClient) -> Self {
-        Self {
-            pub_key: gw_client.pub_key,
-            private_ip: gw_client.private_ips.ipv4.into(),
-            mac: gw_client.mac.into(),
-        }
-    }
-}
-
-impl From<v2::registration::ClientMac> for v4::registration::ClientMac {
-    fn from(mac: v2::registration::ClientMac) -> Self {
-        Self::new(mac.to_vec())
-    }
-}
-
 impl From<v3::registration::ClientMac> for v4::registration::ClientMac {
    fn from(mac: v3::registration::ClientMac) -> Self {
        Self::new(mac.to_vec())
@@ -122,12 +96,6 @@ impl From<v4::registration::ClientMac> for v3::registration::ClientMac {
    }
 }

-impl From<v4::registration::ClientMac> for v2::registration::ClientMac {
-    fn from(mac: v4::registration::ClientMac) -> Self {
-        Self::new(mac.to_vec())
-    }
-}
-
 impl TryFrom<v4::response::AuthenticatorResponse> for v3::response::AuthenticatorResponse {
    type Error = crate::Error;

@@ -42,12 +42,6 @@ impl IpPair {
    }
 }

-impl From<(Ipv4Addr, Ipv6Addr)> for IpPair {
-    fn from((ipv4, ipv6): (Ipv4Addr, Ipv6Addr)) -> Self {
-        IpPair { ipv4, ipv6 }
-    }
-}
-
 impl fmt::Display for IpPair {
    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
        write!(f, "({}, {})", self.ipv4, self.ipv6)
@@ -20,6 +20,11 @@ fn generate_random() -> u64 {
    rng.next_u64()
 }

+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct QueryMessage {
+    pub pub_key: PeerPublicKey,
+}
+
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct AuthenticatorRequest {
    pub protocol: Protocol,
@@ -68,7 +73,7 @@ impl AuthenticatorRequest {
        )
    }

-    pub fn new_query_request(peer_public_key: PeerPublicKey, reply_to: Recipient) -> (Self, u64) {
+    pub fn new_query_request(query_message: QueryMessage, reply_to: Recipient) -> (Self, u64) {
        let request_id = generate_random();
        (
            Self {
@@ -76,7 +81,7 @@ impl AuthenticatorRequest {
                    service_provider_type: ServiceProviderType::Authenticator,
                    version: VERSION,
                },
-                data: AuthenticatorRequestData::QueryBandwidth(peer_public_key),
+                data: AuthenticatorRequestData::QueryBandwidth(query_message.pub_key),
                reply_to,
                request_id,
            },
@@ -17,7 +17,7 @@ use nym_validator_client::coconut::all_ecash_api_clients;
 use nym_validator_client::nym_api::EpochId;
 use nym_validator_client::nyxd::contract_traits::EcashSigningClient;
 use nym_validator_client::nyxd::contract_traits::{DkgQueryClient, EcashQueryClient};
-use nym_validator_client::nyxd::cosmwasm_client::ContractResponseData;
+use nym_validator_client::nyxd::cosmwasm_client::ToSingletonContractData;
 use nym_validator_client::EcashApiClient;
 use rand::rngs::OsRng;

@@ -15,6 +15,7 @@ const-str = { workspace = true }
 log = { workspace = true }
 pretty_env_logger = { workspace = true }
 schemars = { workspace = true, features = ["preserve_order"], optional = true }
+semver.workspace = true
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true, optional = true }

@@ -43,5 +44,5 @@ tracing = [
    "tracing-opentelemetry",
    "opentelemetry",
 ]
-clap = ["dep:clap", "dep:clap_complete", "dep:clap_complete_fig"]
+clap = [ "dep:clap", "dep:clap_complete", "dep:clap_complete_fig" ]
 models = []
@@ -3,6 +3,7 @@

 pub mod build_information;
 pub mod logging;
+pub mod version_checker;

 #[cfg(feature = "clap")]
 pub mod completions;
@@ -47,7 +47,6 @@ pub fn setup_logging() {
 #[cfg(feature = "basic_tracing")]
 pub fn setup_tracing_logger() {
    let log_builder = tracing_subscriber::fmt()
-        .with_writer(std::io::stderr)
        // Use a more compact, abbreviated log format
        .compact()
        // Display source code file paths
@@ -0,0 +1,78 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+pub use semver::Version;
+
+/// Checks if the version is minor version compatible.
+///
+/// Checks whether given `version` is compatible with a given semantic version requirement `req`
+/// according to major-minor semver rules. The semantic version requirement can be passed as a full,
+/// concrete version number, because that's what we'll have in our Cargo.toml files (e.g. 0.3.2).
+/// The patch number in the requirement gets dropped and replaced with a wildcard (0.3.*) as all
+/// minor versions should be compatible with each other.
+pub fn is_minor_version_compatible(version: &str, req: &str) -> bool {
+    let expected_version = match Version::parse(version) {
+        Ok(v) => v,
+        Err(_) => return false,
+    };
+    let req_version = match Version::parse(req) {
+        Ok(v) => v,
+        Err(_) => return false,
+    };
+
+    expected_version.major == req_version.major && expected_version.minor == req_version.minor
+}
+
+pub fn parse_version(raw_version: &str) -> Result<Version, semver::Error> {
+    Version::parse(raw_version)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn version_0_3_0_is_compatible_with_requirement_0_3_x() {
+        assert!(is_minor_version_compatible("0.3.0", "0.3.2"));
+    }
+
+    #[test]
+    fn version_0_3_1_is_compatible_with_minimum_requirement_0_3_x() {
+        assert!(is_minor_version_compatible("0.3.1", "0.3.2"));
+    }
+
+    #[test]
+    fn version_0_3_2_is_compatible_with_minimum_requirement_0_3_x() {
+        assert!(is_minor_version_compatible("0.3.2", "0.3.0"));
+    }
+
+    #[test]
+    fn version_0_2_0_is_not_compatible_with_requirement_0_3_x() {
+        assert!(!is_minor_version_compatible("0.2.0", "0.3.2"));
+    }
+
+    #[test]
+    fn version_0_4_0_is_not_compatible_with_requirement_0_3_x() {
+        assert!(!is_minor_version_compatible("0.4.0", "0.3.2"));
+    }
+
+    #[test]
+    fn version_1_3_2_is_not_compatible_with_requirement_0_3_x() {
+        assert!(!is_minor_version_compatible("1.3.2", "0.3.2"));
+    }
+
+    #[test]
+    fn version_0_4_0_rc_1_is_compatible_with_version_0_4_0_rc_1() {
+        assert!(is_minor_version_compatible("0.4.0-rc.1", "0.4.0-rc.1"));
+    }
+
+    #[test]
+    fn returns_false_on_foo_version() {
+        assert!(!is_minor_version_compatible("foo", "0.3.2"));
+    }
+
+    #[test]
+    fn returns_false_on_bar_version() {
+        assert!(!is_minor_version_compatible("0.3.2", "bar"));
+    }
+}
@@ -393,20 +393,13 @@ pub struct Traffic {
    /// poisson distribution.
    pub disable_main_poisson_packet_distribution: bool,

-    /// Specify whether route selection should be determined by the packet header.
-    pub deterministic_route_selection: bool,
-
-    /// Specify how many times particular packet can be retransmitted
-    /// None - no limit
-    pub maximum_number_of_retransmissions: Option<u32>,
-
    /// Specifies the packet size used for sent messages.
    /// Do not override it unless you understand the consequences of that change.
    pub primary_packet_size: PacketSize,

    /// Specifies the optional auxiliary packet size for optimizing message streams.
    /// Note that its use decreases overall anonymity.
-    /// Do not set it unless you understand the consequences of that change.
+    /// Do not set it it unless you understand the consequences of that change.
    pub secondary_packet_size: Option<PacketSize>,

    pub packet_type: PacketType,
@@ -431,8 +424,6 @@ impl Default for Traffic {
            average_packet_delay: DEFAULT_AVERAGE_PACKET_DELAY,
            message_sending_average_delay: DEFAULT_MESSAGE_STREAM_AVERAGE_DELAY,
            disable_main_poisson_packet_distribution: false,
-            deterministic_route_selection: false,
-            maximum_number_of_retransmissions: None,
            primary_packet_size: PacketSize::RegularPacket,
            secondary_packet_size: None,
            packet_type: PacketType::Mix,
@@ -111,7 +111,6 @@ impl From<ConfigV5> for Config {
                    primary_packet_size: value.debug.traffic.primary_packet_size,
                    secondary_packet_size: value.debug.traffic.secondary_packet_size,
                    packet_type: value.debug.traffic.packet_type,
-                    ..Default::default()
                },
                cover_traffic: CoverTraffic {
                    loop_cover_traffic_average_delay: value
@@ -514,10 +514,15 @@ where
                    min_gateway_performance: config_topology.minimum_gateway_performance,
                },
                nym_api_urls,
+                env!("CARGO_PKG_VERSION").to_string(),
                user_agent,
            )),
            config::TopologyStructure::GeoAware(group_by) => {
-                Box::new(GeoAwareTopologyProvider::new(nym_api_urls, group_by))
+                Box::new(GeoAwareTopologyProvider::new(
+                    nym_api_urls,
+                    env!("CARGO_PKG_VERSION").to_string(),
+                    group_by,
+                ))
            }
        })
    }
@@ -30,8 +30,7 @@ pub(crate) enum Action {
    InsertPending(Vec<PendingAcknowledgement>),

    /// Removes given `PendingAcknowledgement` from the 'shared' state. Also cancels the retransmission timer.
-    /// Initiated by `AcknowledgementListener` upon receiving the acknowledgement. Also by `RetransmissionRequestListener`
-    /// upon deciding to abandon the data.
+    /// Initiated by `AcknowledgementListener`
    RemovePending(FragmentIdentifier),

    /// Starts the retransmission timer on given `PendingAcknowledgement` with the `Duration` based on
@@ -42,7 +41,7 @@ pub(crate) enum Action {

    /// Updates the expected delay of given `PendingAcknowledgement` with the new provided `SphinxDelay`.
    /// Initiated by `RetransmissionRequestListener`
-    UpdatePendingAck(FragmentIdentifier, SphinxDelay),
+    UpdateDelay(FragmentIdentifier, SphinxDelay),
 }

 impl Action {
@@ -58,8 +57,8 @@ impl Action {
        Action::StartTimer(frag_id)
    }

-    pub(crate) fn new_update_pending_ack(frag_id: FragmentIdentifier, delay: SphinxDelay) -> Self {
-        Action::UpdatePendingAck(frag_id, delay)
+    pub(crate) fn new_update_delay(frag_id: FragmentIdentifier, delay: SphinxDelay) -> Self {
+        Action::UpdateDelay(frag_id, delay)
    }
 }

@@ -136,7 +135,7 @@ impl ActionController {
    }

    fn handle_start_timer(&mut self, frag_id: FragmentIdentifier) {
-        trace!("{frag_id} is starting its timer");
+        trace!("{} is starting its timer", frag_id);

        if let Some((pending_ack_data, queue_key)) = self.pending_acks_data.get_mut(&frag_id) {
            // the fact that this branch is now POSSIBLE is a sign of a need to refactor this whole
@@ -194,7 +193,7 @@ impl ActionController {

    // initiated basically as a first step of retransmission. At first data has its delay updated
    // (as new sphinx packet was created with new expected delivery time)
-    fn handle_update_pending_ack(&mut self, frag_id: FragmentIdentifier, delay: SphinxDelay) {
+    fn handle_update_delay(&mut self, frag_id: FragmentIdentifier, delay: SphinxDelay) {
        trace!("{} is updating its delay", frag_id);
        // TODO: is it possible to solve this without either locking or temporarily removing the value?
        if let Some((pending_ack_data, queue_key)) = self.pending_acks_data.remove(&frag_id) {
@@ -203,7 +202,7 @@ impl ActionController {
            // reference to this Arc. HOWEVER, before the Action was pushed onto the queue, the reference
            // was dropped hence this unwrap is safe.
            let mut inner_data = Arc::try_unwrap(pending_ack_data).unwrap();
-            inner_data.update_retransmitted(delay);
+            inner_data.update_delay(delay);

            self.pending_acks_data
                .insert(frag_id, (Arc::new(inner_data), queue_key));
@@ -226,7 +225,7 @@ impl ActionController {
        // about it. Perhaps just reschedule it at later point?
        let frag_id = expired_ack.into_inner();

-        trace!("{frag_id} has expired");
+        trace!("{} has expired", frag_id);

        if let Some((pending_ack_data, queue_key)) = self.pending_acks_data.get_mut(&frag_id) {
            if queue_key.is_none() {
@@ -259,9 +258,7 @@ impl ActionController {
            Action::InsertPending(pending_acks) => self.handle_insert(pending_acks),
            Action::RemovePending(frag_id) => self.handle_remove(frag_id),
            Action::StartTimer(frag_id) => self.handle_start_timer(frag_id),
-            Action::UpdatePendingAck(frag_id, delay) => {
-                self.handle_update_pending_ack(frag_id, delay)
-            }
+            Action::UpdateDelay(frag_id, delay) => self.handle_update_delay(frag_id, delay),
        }
    }

@@ -71,7 +71,6 @@ pub(crate) struct PendingAcknowledgement {
    delay: SphinxDelay,
    destination: PacketDestination,
    mix_hops: Option<u8>,
-    retransmissions: u32,
 }

 impl PendingAcknowledgement {
@@ -87,7 +86,6 @@ impl PendingAcknowledgement {
            delay,
            destination: PacketDestination::KnownRecipient(recipient.into()),
            mix_hops,
-            retransmissions: 0,
        }
    }

@@ -107,7 +105,6 @@ impl PendingAcknowledgement {
            // Messages sent using SURBs are using the number of mix hops set by the recipient when
            // they provided the SURBs, so it doesn't make sense to include it here.
            mix_hops: None,
-            retransmissions: 0,
        }
    }

@@ -119,9 +116,8 @@ impl PendingAcknowledgement {
        self.message_chunk.clone()
    }

-    fn update_retransmitted(&mut self, new_delay: SphinxDelay) {
+    fn update_delay(&mut self, new_delay: SphinxDelay) {
        self.delay = new_delay;
-        self.retransmissions += 1;
    }
 }

@@ -167,9 +163,6 @@ impl AcknowledgementControllerConnectors {

 /// Configurable parameters of the `AcknowledgementController`
 pub(super) struct Config {
-    /// Specify how many times particular packet can be retransmitted
-    maximum_retransmissions: Option<u32>,
-
    /// Given ack timeout in the form a * BASE_DELAY + b, it specifies the additive part `b`
    ack_wait_addition: Duration,

@@ -181,13 +174,8 @@ pub(super) struct Config {
 }

 impl Config {
-    pub(super) fn new(
-        maximum_retransmissions: Option<u32>,
-        ack_wait_addition: Duration,
-        ack_wait_multiplier: f64,
-    ) -> Self {
+    pub(super) fn new(ack_wait_addition: Duration, ack_wait_multiplier: f64) -> Self {
        Config {
-            maximum_retransmissions,
            ack_wait_addition,
            ack_wait_multiplier,
            packet_size: Default::default(),
@@ -250,7 +238,6 @@ where

        // will listen for any ack timeouts and trigger retransmission
        let retransmission_request_listener = RetransmissionRequestListener::new(
-            config.maximum_retransmissions,
            connectors.ack_action_sender.clone(),
            message_handler,
            retransmission_rx,
@@ -20,7 +20,6 @@ use std::sync::{Arc, Weak};

 // responsible for packet retransmission upon fired timer
 pub(super) struct RetransmissionRequestListener<R> {
-    maximum_retransmissions: Option<u32>,
    action_sender: AckActionSender,
    message_handler: MessageHandler<R>,
    request_receiver: RetransmissionRequestReceiver,
@@ -32,14 +31,12 @@ where
    R: CryptoRng + Rng,
 {
    pub(super) fn new(
-        maximum_retransmissions: Option<u32>,
        action_sender: AckActionSender,
        message_handler: MessageHandler<R>,
        request_receiver: RetransmissionRequestReceiver,
        reply_controller_sender: ReplyControllerSender,
    ) -> Self {
        RetransmissionRequestListener {
-            maximum_retransmissions,
            action_sender,
            message_handler,
            request_receiver,
@@ -80,18 +77,6 @@ where
            }
        };

-        let frag_id = timed_out_ack.message_chunk.fragment_identifier();
-
-        if let Some(limit) = self.maximum_retransmissions {
-            if timed_out_ack.retransmissions >= limit {
-                warn!("reached maximum number of allowed retransmissions for the packet");
-                self.action_sender
-                    .unbounded_send(Action::new_remove(frag_id))
-                    .unwrap();
-                return;
-            }
-        }
-
        let maybe_prepared_fragment = match &timed_out_ack.destination {
            PacketDestination::Anonymous {
                recipient_tag,
@@ -116,6 +101,8 @@ where
            }
        };

+        let frag_id = timed_out_ack.message_chunk.fragment_identifier();
+
        let prepared_fragment = match maybe_prepared_fragment {
            Ok(prepared_fragment) => prepared_fragment,
            Err(err) => {
@@ -149,7 +136,7 @@ where
        // with the additional poisson delay.
        // And since Actions are executed in order `UpdateTimer` will HAVE TO be executed before `StartTimer`
        self.action_sender
-            .unbounded_send(Action::new_update_pending_ack(frag_id, new_delay))
+            .unbounded_send(Action::new_update_delay(frag_id, new_delay))
            .unwrap();

        // send to `OutQueueControl` to eventually send to the mix network
@@ -91,9 +91,6 @@ pub(crate) struct Config {
    /// and surb-based are going to be sent.
    sender_address: Recipient,

-    /// Specify whether route selection should be determined by the packet header.
-    deterministic_route_selection: bool,
-
    /// Average delay a data packet is going to get delay at a single mixnode.
    average_packet_delay: Duration,

@@ -117,12 +114,10 @@ impl Config {
        sender_address: Recipient,
        average_packet_delay: Duration,
        average_ack_delay: Duration,
-        deterministic_route_selection: bool,
    ) -> Self {
        Config {
            ack_key,
            sender_address,
-            deterministic_route_selection,
            average_packet_delay,
            average_ack_delay,
            num_mix_hops: DEFAULT_NUM_MIX_HOPS,
@@ -181,7 +176,6 @@ where
    {
        let message_preparer = MessagePreparer::new(
            rng,
-            config.deterministic_route_selection,
            config.sender_address,
            config.average_packet_delay,
            config.average_ack_delay,
@@ -640,7 +634,7 @@ where

    pub(crate) fn update_ack_delay(&self, id: FragmentIdentifier, new_delay: Delay) {
        self.action_sender
-            .unbounded_send(Action::UpdatePendingAck(id, new_delay))
+            .unbounded_send(Action::UpdateDelay(id, new_delay))
            .expect("action control task has died")
    }

@@ -65,7 +65,6 @@ pub struct Config {
 impl<'a> From<&'a Config> for acknowledgement_control::Config {
    fn from(cfg: &'a Config) -> Self {
        acknowledgement_control::Config::new(
-            cfg.traffic.maximum_number_of_retransmissions,
            cfg.acks.ack_wait_addition,
            cfg.acks.ack_wait_multiplier,
        )
@@ -98,7 +97,6 @@ impl<'a> From<&'a Config> for message_handler::Config {
            cfg.self_recipient,
            cfg.traffic.average_packet_delay,
            cfg.acks.average_ack_delay,
-            cfg.traffic.deterministic_route_selection,
        )
        .with_custom_primary_packet_size(cfg.traffic.primary_packet_size)
        .with_custom_secondary_packet_size(cfg.traffic.secondary_packet_size)
@@ -38,7 +38,7 @@ pub struct TopologyReadPermit<'a> {
    permit: RwLockReadGuard<'a, Option<NymTopology>>,
 }

-impl Deref for TopologyReadPermit<'_> {
+impl<'a> Deref for TopologyReadPermit<'a> {
    type Target = Option<NymTopology>;

    fn deref(&self) -> &Self::Target {
@@ -85,10 +85,15 @@ fn check_layer_integrity(topology: NymTopology) -> Result<(), ()> {
 pub struct GeoAwareTopologyProvider {
    validator_client: nym_validator_client::client::NymApiClient,
    filter_on: GroupBy,
+    client_version: String,
 }

 impl GeoAwareTopologyProvider {
-    pub fn new(mut nym_api_urls: Vec<Url>, filter_on: GroupBy) -> GeoAwareTopologyProvider {
+    pub fn new(
+        mut nym_api_urls: Vec<Url>,
+        client_version: String,
+        filter_on: GroupBy,
+    ) -> GeoAwareTopologyProvider {
        log::info!(
            "Creating geo-aware topology provider with filter on {}",
            filter_on
@@ -100,13 +105,14 @@ impl GeoAwareTopologyProvider {
                nym_api_urls[0].clone(),
            ),
            filter_on,
+            client_version,
        }
    }

    async fn get_topology(&self) -> Option<NymTopology> {
        let mixnodes = match self
            .validator_client
-            .get_all_basic_active_mixing_assigned_nodes()
+            .get_all_basic_active_mixing_assigned_nodes(Some(self.client_version.clone()))
            .await
        {
            Err(err) => {
@@ -118,7 +124,7 @@ impl GeoAwareTopologyProvider {

        let gateways = match self
            .validator_client
-            .get_all_basic_entry_assigned_nodes()
+            .get_all_basic_entry_assigned_nodes(Some(self.client_version.clone()))
            .await
        {
            Err(err) => {
@@ -35,11 +35,18 @@ pub struct NymApiTopologyProvider {

    validator_client: nym_validator_client::client::NymApiClient,
    nym_api_urls: Vec<Url>,
+
+    client_version: String,
    currently_used_api: usize,
 }

 impl NymApiTopologyProvider {
-    pub fn new(config: Config, mut nym_api_urls: Vec<Url>, user_agent: Option<UserAgent>) -> Self {
+    pub fn new(
+        config: Config,
+        mut nym_api_urls: Vec<Url>,
+        client_version: String,
+        user_agent: Option<UserAgent>,
+    ) -> Self {
        nym_api_urls.shuffle(&mut thread_rng());

        let validator_client = if let Some(user_agent) = user_agent {
@@ -55,6 +62,7 @@ impl NymApiTopologyProvider {
            config,
            validator_client,
            nym_api_urls,
+            client_version,
            currently_used_api: 0,
        }
    }
@@ -91,7 +99,7 @@ impl NymApiTopologyProvider {
    async fn get_current_compatible_topology(&mut self) -> Option<NymTopology> {
        let mixnodes = match self
            .validator_client
-            .get_all_basic_active_mixing_assigned_nodes()
+            .get_all_basic_active_mixing_assigned_nodes(Some(self.client_version.clone()))
            .await
        {
            Err(err) => {
@@ -103,7 +111,7 @@ impl NymApiTopologyProvider {

        let gateways = match self
            .validator_client
-            .get_all_basic_entry_assigned_nodes()
+            .get_all_basic_entry_assigned_nodes(Some(self.client_version.clone()))
            .await
        {
            Err(err) => {
@@ -94,7 +94,7 @@ pub async fn current_gateways<R: Rng>(

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

-    let gateways = client.get_all_basic_entry_assigned_nodes().await?;
+    let gateways = client.get_all_basic_entry_assigned_nodes(None).await?;
    log::debug!("Found {} gateways", gateways.len());
    log::trace!("Gateways: {:#?}", gateways);

@@ -121,7 +121,9 @@ pub async fn current_mixnodes<R: Rng>(

    log::trace!("Fetching list of mixnodes from: {nym_api}");

-    let mixnodes = client.get_all_basic_active_mixing_assigned_nodes().await?;
+    let mixnodes = client
+        .get_all_basic_active_mixing_assigned_nodes(None)
+        .await?;
    let valid_mixnodes = mixnodes
        .iter()
        .filter_map(|mixnode| mixnode.try_into().ok())
@@ -87,10 +87,8 @@ impl ClientBandwidth {

        if remaining < 0 {
            tracing::warn!("OUT OF BANDWIDTH. remaining: {remaining_bi2}");
-        } else if remaining < 1_000_000 {
-            tracing::info!("remaining bandwidth: {remaining_bi2}");
        } else {
-            tracing::debug!("remaining bandwidth: {remaining_bi2}");
+            tracing::info!("remaining bandwidth: {remaining_bi2}");
        }

        self.inner
@@ -139,10 +139,6 @@ impl<C, St> GatewayClient<C, St> {
        self.gateway_identity
    }

-    pub fn shared_key(&self) -> Option<Arc<SharedGatewayKey>> {
-        self.shared_key.clone()
-    }
-
    pub fn ws_fd(&self) -> Option<RawFd> {
        match &self.connection {
            SocketState::Available(conn) => ws_fd(conn.as_ref()),
@@ -412,7 +408,7 @@ impl<C, St> GatewayClient<C, St> {
            }

            Some(_) => {
-                debug!("the gateway is using exactly the same (or older) protocol version as we are. We're good to continue!");
+                info!("the gateway is using exactly the same (or older) protocol version as we are. We're good to continue!");
                Ok(())
            }
        }
@@ -996,6 +992,24 @@ impl<C, St> GatewayClient<C, St> {
        }
        Ok(())
    }
+
+    #[deprecated(note = "this method does not deal with upgraded keys for legacy clients")]
+    pub async fn authenticate_and_start(
+        &mut self,
+    ) -> Result<AuthenticationResponse, GatewayClientError>
+    where
+        C: DkgQueryClient + Send + Sync,
+        St: CredentialStorage,
+        <St as CredentialStorage>::StorageError: Send + Sync + 'static,
+    {
+        let shared_key = self.perform_initial_authentication().await?;
+        self.claim_initial_bandwidth().await?;
+
+        // this call is NON-blocking
+        self.start_listening_for_mixnet_messages()?;
+
+        Ok(shared_key)
+    }
 }

 // type alias for an ease of use
@@ -46,8 +46,7 @@ pub(crate) fn ws_fd(_conn: &WsConn) -> Option<RawFd> {
    #[cfg(unix)]
    match _conn.get_ref() {
        MaybeTlsStream::Plain(stream) => Some(stream.as_raw_fd()),
-        MaybeTlsStream::Rustls(tls_stream) => Some(tls_stream.as_raw_fd()),
-        _ => None,
+        &_ => None,
    }
    #[cfg(not(unix))]
    None
@@ -111,11 +110,6 @@ impl PartiallyDelegatedRouter {
            }
        };

-        if self.stream_return.is_canceled() {
-            // nothing to do, receiver has been dropped
-            return;
-        }
-
        let return_res = match ret {
            Err(err) => self.stream_return.send(Err(err)),
            Ok(_) => {
@@ -1,6 +1,7 @@
 // Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

+pub use crate::nym_api::NymApiClientExt;
 use crate::nyxd::{self, NyxdClient};
 use crate::signing::direct_wallet::DirectSecp256k1HdWallet;
 use crate::signing::signer::{NoSigner, OfflineSigner};
@@ -19,8 +20,8 @@ use nym_api_requests::ecash::{
    PartialExpirationDateSignatureResponse, VerificationKeyResponse,
 };
 use nym_api_requests::models::{
-    ApiHealthResponse, GatewayBondAnnotated, GatewayCoreStatusResponse, MixnodeCoreStatusResponse,
-    MixnodeStatusResponse, NymNodeDescription, RewardEstimationResponse, StakeSaturationResponse,
+    ApiHealthResponse, GatewayCoreStatusResponse, MixnodeCoreStatusResponse, MixnodeStatusResponse,
+    NymNodeDescription, RewardEstimationResponse, StakeSaturationResponse,
 };
 use nym_api_requests::models::{LegacyDescribedGateway, MixNodeBondAnnotated};
 use nym_api_requests::nym_nodes::SkimmedNode;
@@ -31,7 +32,6 @@ use nym_network_defaults::NymNetworkDetails;
 use time::Date;
 use url::Url;

-pub use crate::nym_api::NymApiClientExt;
 pub use nym_mixnet_contract_common::{
    mixnode::MixNodeDetails, GatewayBond, IdentityKey, IdentityKeyRef, NodeId, NymNodeDetails,
 };
@@ -257,13 +257,6 @@ impl<C, S> Client<C, S> {
        Ok(self.nym_api.get_gateways().await?)
    }

-    #[deprecated]
-    pub async fn get_cached_gateways_detailed_unfiltered(
-        &self,
-    ) -> Result<Vec<GatewayBondAnnotated>, ValidatorClientError> {
-        Ok(self.nym_api.get_gateways_detailed_unfiltered().await?)
-    }
-
    // TODO: combine with NymApiClient...
    pub async fn get_all_cached_described_nodes(
        &self,
@@ -339,10 +332,10 @@ impl NymApiClient {
        NymApiClient { nym_api }
    }

-    pub fn new_with_user_agent(api_url: Url, user_agent: impl Into<UserAgent>) -> Self {
+    pub fn new_with_user_agent(api_url: Url, user_agent: UserAgent) -> Self {
        let nym_api = nym_api::Client::builder::<_, ValidatorClientError>(api_url)
            .expect("invalid api url")
-            .with_user_agent(user_agent.into())
+            .with_user_agent(user_agent)
            .build::<ValidatorClientError>()
            .expect("failed to build nym api client");

@@ -358,19 +351,34 @@ impl NymApiClient {
    }

    #[deprecated(note = "use get_all_basic_active_mixing_assigned_nodes instead")]
-    pub async fn get_basic_mixnodes(&self) -> Result<Vec<SkimmedNode>, ValidatorClientError> {
-        Ok(self.nym_api.get_basic_mixnodes().await?.nodes)
+    pub async fn get_basic_mixnodes(
+        &self,
+        semver_compatibility: Option<String>,
+    ) -> Result<Vec<SkimmedNode>, ValidatorClientError> {
+        Ok(self
+            .nym_api
+            .get_basic_mixnodes(semver_compatibility)
+            .await?
+            .nodes)
    }

    #[deprecated(note = "use get_all_basic_entry_assigned_nodes instead")]
-    pub async fn get_basic_gateways(&self) -> Result<Vec<SkimmedNode>, ValidatorClientError> {
-        Ok(self.nym_api.get_basic_gateways().await?.nodes)
+    pub async fn get_basic_gateways(
+        &self,
+        semver_compatibility: Option<String>,
+    ) -> Result<Vec<SkimmedNode>, ValidatorClientError> {
+        Ok(self
+            .nym_api
+            .get_basic_gateways(semver_compatibility)
+            .await?
+            .nodes)
    }

    /// retrieve basic information for nodes are capable of operating as an entry gateway
    /// this includes legacy gateways and nym-nodes
    pub async fn get_all_basic_entry_assigned_nodes(
        &self,
+        semver_compatibility: Option<String>,
    ) -> Result<Vec<SkimmedNode>, ValidatorClientError> {
        // TODO: deal with paging in macro or some helper function or something, because it's the same pattern everywhere
        let mut page = 0;
@@ -379,7 +387,12 @@ impl NymApiClient {
        loop {
            let mut res = self
                .nym_api
-                .get_basic_entry_assigned_nodes(false, Some(page), None)
+                .get_basic_entry_assigned_nodes(
+                    semver_compatibility.clone(),
+                    false,
+                    Some(page),
+                    None,
+                )
                .await?;

            nodes.append(&mut res.nodes.data);
@@ -397,6 +410,7 @@ impl NymApiClient {
    /// this includes legacy mixnodes and nym-nodes
    pub async fn get_all_basic_active_mixing_assigned_nodes(
        &self,
+        semver_compatibility: Option<String>,
    ) -> Result<Vec<SkimmedNode>, ValidatorClientError> {
        // TODO: deal with paging in macro or some helper function or something, because it's the same pattern everywhere
        let mut page = 0;
@@ -405,7 +419,12 @@ impl NymApiClient {
        loop {
            let mut res = self
                .nym_api
-                .get_basic_active_mixing_assigned_nodes(false, Some(page), None)
+                .get_basic_active_mixing_assigned_nodes(
+                    semver_compatibility.clone(),
+                    false,
+                    Some(page),
+                    None,
+                )
                .await?;

            nodes.append(&mut res.nodes.data);
@@ -423,6 +442,7 @@ impl NymApiClient {
    /// this includes legacy mixnodes and nym-nodes
    pub async fn get_all_basic_mixing_capable_nodes(
        &self,
+        semver_compatibility: Option<String>,
    ) -> Result<Vec<SkimmedNode>, ValidatorClientError> {
        // TODO: deal with paging in macro or some helper function or something, because it's the same pattern everywhere
        let mut page = 0;
@@ -431,7 +451,12 @@ impl NymApiClient {
        loop {
            let mut res = self
                .nym_api
-                .get_basic_mixing_capable_nodes(false, Some(page), None)
+                .get_basic_mixing_capable_nodes(
+                    semver_compatibility.clone(),
+                    false,
+                    Some(page),
+                    None,
+                )
                .await?;

            nodes.append(&mut res.nodes.data);
@@ -446,7 +471,10 @@ impl NymApiClient {
    }

    /// retrieve basic information for all bonded nodes on the network
-    pub async fn get_all_basic_nodes(&self) -> Result<Vec<SkimmedNode>, ValidatorClientError> {
+    pub async fn get_all_basic_nodes(
+        &self,
+        semver_compatibility: Option<String>,
+    ) -> Result<Vec<SkimmedNode>, ValidatorClientError> {
        // TODO: deal with paging in macro or some helper function or something, because it's the same pattern everywhere
        let mut page = 0;
        let mut nodes = Vec::new();
@@ -454,7 +482,7 @@ impl NymApiClient {
        loop {
            let mut res = self
                .nym_api
-                .get_basic_nodes(false, Some(page), None)
+                .get_basic_nodes(semver_compatibility.clone(), false, Some(page), None)
                .await?;

            nodes.append(&mut res.nodes.data);
@@ -13,7 +13,7 @@ use nym_api_requests::ecash::models::{
 use nym_api_requests::ecash::VerificationKeyResponse;
 use nym_api_requests::models::{
    AnnotationResponse, ApiHealthResponse, LegacyDescribedMixNode, NodePerformanceResponse,
-    NodeRefreshBody, NymNodeDescription,
+    NymNodeDescription,
 };
 use nym_api_requests::nym_nodes::PaginatedCachedNodesResponse;
 use nym_api_requests::pagination::PaginatedResponse;
@@ -102,23 +102,6 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    #[deprecated]
-    #[instrument(level = "debug", skip(self))]
-    async fn get_gateways_detailed_unfiltered(
-        &self,
-    ) -> Result<Vec<GatewayBondAnnotated>, NymAPIError> {
-        self.get_json(
-            &[
-                routes::API_VERSION,
-                routes::STATUS,
-                routes::GATEWAYS,
-                routes::DETAILED_UNFILTERED,
-            ],
-            NO_PARAMS,
-        )
-        .await
-    }
-
    #[deprecated]
    #[instrument(level = "debug", skip(self))]
    async fn get_mixnodes_detailed_unfiltered(
@@ -205,7 +188,16 @@ pub trait NymApiClientExt: ApiClient {

    #[deprecated]
    #[tracing::instrument(level = "debug", skip_all)]
-    async fn get_basic_mixnodes(&self) -> Result<CachedNodesResponse<SkimmedNode>, NymAPIError> {
+    async fn get_basic_mixnodes(
+        &self,
+        semver_compatibility: Option<String>,
+    ) -> Result<CachedNodesResponse<SkimmedNode>, NymAPIError> {
+        let params = if let Some(semver_compatibility) = &semver_compatibility {
+            vec![("semver_compatibility", semver_compatibility.as_str())]
+        } else {
+            vec![]
+        };
+
        self.get_json(
            &[
                routes::API_VERSION,
@@ -214,14 +206,23 @@ pub trait NymApiClientExt: ApiClient {
                "mixnodes",
                "skimmed",
            ],
-            NO_PARAMS,
+            &params,
        )
        .await
    }

    #[deprecated]
    #[instrument(level = "debug", skip(self))]
-    async fn get_basic_gateways(&self) -> Result<CachedNodesResponse<SkimmedNode>, NymAPIError> {
+    async fn get_basic_gateways(
+        &self,
+        semver_compatibility: Option<String>,
+    ) -> Result<CachedNodesResponse<SkimmedNode>, NymAPIError> {
+        let params = if let Some(semver_compatibility) = &semver_compatibility {
+            vec![("semver_compatibility", semver_compatibility.as_str())]
+        } else {
+            vec![]
+        };
+
        self.get_json(
            &[
                routes::API_VERSION,
@@ -230,7 +231,7 @@ pub trait NymApiClientExt: ApiClient {
                "gateways",
                "skimmed",
            ],
-            NO_PARAMS,
+            &params,
        )
        .await
    }
@@ -240,12 +241,17 @@ pub trait NymApiClientExt: ApiClient {
    #[instrument(level = "debug", skip(self))]
    async fn get_basic_entry_assigned_nodes(
        &self,
+        semver_compatibility: Option<String>,
        no_legacy: bool,
        page: Option<u32>,
        per_page: Option<u32>,
    ) -> Result<PaginatedCachedNodesResponse<SkimmedNode>, NymAPIError> {
        let mut params = Vec::new();

+        if let Some(arg) = &semver_compatibility {
+            params.push(("semver_compatibility", arg.clone()))
+        }
+
        if no_legacy {
            params.push(("no_legacy", "true".to_string()))
        }
@@ -277,12 +283,17 @@ pub trait NymApiClientExt: ApiClient {
    #[instrument(level = "debug", skip(self))]
    async fn get_basic_active_mixing_assigned_nodes(
        &self,
+        semver_compatibility: Option<String>,
        no_legacy: bool,
        page: Option<u32>,
        per_page: Option<u32>,
    ) -> Result<PaginatedCachedNodesResponse<SkimmedNode>, NymAPIError> {
        let mut params = Vec::new();

+        if let Some(arg) = &semver_compatibility {
+            params.push(("semver_compatibility", arg.clone()))
+        }
+
        if no_legacy {
            params.push(("no_legacy", "true".to_string()))
        }
@@ -314,12 +325,17 @@ pub trait NymApiClientExt: ApiClient {
    #[instrument(level = "debug", skip(self))]
    async fn get_basic_mixing_capable_nodes(
        &self,
+        semver_compatibility: Option<String>,
        no_legacy: bool,
        page: Option<u32>,
        per_page: Option<u32>,
    ) -> Result<PaginatedCachedNodesResponse<SkimmedNode>, NymAPIError> {
        let mut params = Vec::new();

+        if let Some(arg) = &semver_compatibility {
+            params.push(("semver_compatibility", arg.clone()))
+        }
+
        if no_legacy {
            params.push(("no_legacy", "true".to_string()))
        }
@@ -349,12 +365,17 @@ pub trait NymApiClientExt: ApiClient {
    #[instrument(level = "debug", skip(self))]
    async fn get_basic_nodes(
        &self,
+        semver_compatibility: Option<String>,
        no_legacy: bool,
        page: Option<u32>,
        per_page: Option<u32>,
    ) -> Result<PaginatedCachedNodesResponse<SkimmedNode>, NymAPIError> {
        let mut params = Vec::new();

+        if let Some(arg) = &semver_compatibility {
+            params.push(("semver_compatibility", arg.clone()))
+        }
+
        if no_legacy {
            params.push(("no_legacy", "true".to_string()))
        }
@@ -674,32 +695,16 @@ pub trait NymApiClientExt: ApiClient {
        &self,
        node_id: NodeId,
    ) -> Result<NodePerformanceResponse, NymAPIError> {
-        self.get_json(
-            &[
-                routes::API_VERSION,
-                "nym-nodes",
-                "performance",
-                &node_id.to_string(),
-            ],
-            NO_PARAMS,
-        )
-        .await
+        self.get_json_from(format!("/v1/nym-nodes/performance/{node_id}"))
+            .await
    }

    async fn get_node_annotation(
        &self,
        node_id: NodeId,
    ) -> Result<AnnotationResponse, NymAPIError> {
-        self.get_json(
-            &[
-                routes::API_VERSION,
-                "nym-nodes",
-                "annotation",
-                &node_id.to_string(),
-            ],
-            NO_PARAMS,
-        )
-        .await
+        self.get_json_from(format!("/v1/nym-nodes/annotation/{node_id}"))
+            .await
    }

    #[deprecated]
@@ -912,18 +917,6 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    async fn force_refresh_describe_cache(
-        &self,
-        request: &NodeRefreshBody,
-    ) -> Result<(), NymAPIError> {
-        self.post_json(
-            &[routes::API_VERSION, "nym-nodes", "refresh-described"],
-            NO_PARAMS,
-            request,
-        )
-        .await
-    }
-
    async fn issued_ticketbooks_for(
        &self,
        expiration_date: Date,
@@ -32,7 +32,7 @@ impl Div<GasPrice> for Coin {
    }
 }

-impl Div<GasPrice> for &Coin {
+impl<'a> Div<GasPrice> for &'a Coin {
    type Output = Gas;

    fn div(self, rhs: GasPrice) -> Self::Output {
@@ -10,10 +10,10 @@ use cosmrs::AccountId;
 use nym_contracts_common::signing::Nonce;
 use nym_mixnet_contract_common::gateway::{PreassignedGatewayIdsResponse, PreassignedId};
 use nym_mixnet_contract_common::nym_node::{
-    EpochAssignmentResponse, NodeDetailsByIdentityResponse, NodeDetailsResponse,
-    NodeOwnershipResponse, NodeRewardingDetailsResponse, PagedNymNodeBondsResponse,
-    PagedNymNodeDetailsResponse, PagedUnbondedNymNodesResponse, Role, RolesMetadataResponse,
-    StakeSaturationResponse, UnbondedNodeResponse, UnbondedNymNode,
+    EpochAssignmentResponse, NodeDetailsByIdentityResponse, NodeOwnershipResponse,
+    NodeRewardingDetailsResponse, PagedNymNodeBondsResponse, PagedNymNodeDetailsResponse,
+    PagedUnbondedNymNodesResponse, Role, RolesMetadataResponse, StakeSaturationResponse,
+    UnbondedNodeResponse, UnbondedNymNode,
 };
 use nym_mixnet_contract_common::reward_params::WorkFactor;
 use nym_mixnet_contract_common::{
@@ -26,11 +26,10 @@ use nym_mixnet_contract_common::{
    reward_params::{Performance, RewardingParams},
    rewarding::{EstimatedCurrentEpochRewardResponse, PendingRewardResponse},
    ContractBuildInformation, ContractState, ContractStateParams, CurrentIntervalResponse,
-    CurrentNymNodeVersionResponse, Delegation, EpochEventId, EpochStatus, GatewayBond,
-    GatewayBondResponse, GatewayOwnershipResponse, HistoricalNymNodeVersionEntry, IdentityKey,
-    IdentityKeyRef, IntervalEventId, MixNodeBond, MixNodeDetails, MixOwnershipResponse,
-    MixnodeDetailsByIdentityResponse, MixnodeDetailsResponse, NodeId,
-    NumberOfPendingEventsResponse, NymNodeBond, NymNodeDetails, NymNodeVersionHistoryResponse,
+    Delegation, EpochEventId, EpochStatus, GatewayBond, GatewayBondResponse,
+    GatewayOwnershipResponse, IdentityKey, IdentityKeyRef, IntervalEventId, MixNodeBond,
+    MixNodeDetails, MixOwnershipResponse, MixnodeDetailsByIdentityResponse, MixnodeDetailsResponse,
+    NodeId, NumberOfPendingEventsResponse, NymNodeBond, NymNodeDetails,
    PagedAllDelegationsResponse, PagedDelegatorDelegationsResponse, PagedGatewayResponse,
    PagedMixnodeBondsResponse, PagedNodeDelegationsResponse, PendingEpochEvent,
    PendingEpochEventResponse, PendingEpochEventsResponse, PendingIntervalEvent,
@@ -72,22 +71,6 @@ pub trait MixnetQueryClient {
            .await
    }

-    async fn get_nym_node_version_history_paged(
-        &self,
-        start_after: Option<u32>,
-        limit: Option<u32>,
-    ) -> Result<NymNodeVersionHistoryResponse, NyxdError> {
-        self.query_mixnet_contract(MixnetQueryMsg::GetNymNodeVersionHistory { limit, start_after })
-            .await
-    }
-
-    async fn get_current_nym_node_version(
-        &self,
-    ) -> Result<CurrentNymNodeVersionResponse, NyxdError> {
-        self.query_mixnet_contract(MixnetQueryMsg::GetCurrentNymNodeVersion {})
-            .await
-    }
-
    async fn get_mixnet_contract_state(&self) -> Result<ContractState, NyxdError> {
        self.query_mixnet_contract(MixnetQueryMsg::GetState {})
            .await
@@ -328,7 +311,10 @@ pub trait MixnetQueryClient {
        .await
    }

-    async fn get_nymnode_details(&self, node_id: NodeId) -> Result<NodeDetailsResponse, NyxdError> {
+    async fn get_nymnode_details(
+        &self,
+        node_id: NodeId,
+    ) -> Result<NodeOwnershipResponse, NyxdError> {
        self.query_mixnet_contract(MixnetQueryMsg::GetNymNodeDetails { node_id })
            .await
    }
@@ -655,12 +641,6 @@ pub trait PagedMixnetQueryClient: MixnetQueryClient {
    ) -> Result<Vec<PendingIntervalEvent>, NyxdError> {
        collect_paged!(self, get_pending_interval_events_paged, events)
    }
-
-    async fn get_full_nym_node_version_history(
-        &self,
-    ) -> Result<Vec<HistoricalNymNodeVersionEntry>, NyxdError> {
-        collect_paged!(self, get_nym_node_version_history_paged, history)
-    }
 }

 #[async_trait]
@@ -747,7 +727,6 @@ where
 mod tests {
    use super::*;
    use crate::nyxd::contract_traits::tests::IgnoreValue;
-    use nym_mixnet_contract_common::QueryMsg;

    // it's enough that this compiles and clippy is happy about it
    #[allow(dead_code)]
@@ -948,10 +927,6 @@ mod tests {
            MixnetQueryMsg::GetRewardedSetMetadata {} => {
                client.get_rewarded_set_metadata().ignore()
            }
-            QueryMsg::GetCurrentNymNodeVersion {} => client.get_current_nym_node_version().ignore(),
-            QueryMsg::GetNymNodeVersionHistory { limit, start_after } => client
-                .get_nym_node_version_history_paged(start_after, limit)
-                .ignore(),
        }
    }
 }
@@ -13,44 +13,6 @@ use tracing::error;

 pub use cosmrs::abci::MsgResponse;

-pub fn parse_singleton_u32_from_contract_response(b: Vec<u8>) -> Result<u32, NyxdError> {
-    if b.len() != 4 {
-        return Err(NyxdError::MalformedResponseData {
-            got: b.len(),
-            expected: 4,
-        });
-    }
-    Ok(u32::from_be_bytes([b[0], b[1], b[2], b[3]]))
-}
-
-pub fn parse_singleton_u64_from_contract_response(b: Vec<u8>) -> Result<u64, NyxdError> {
-    if b.len() != 8 {
-        return Err(NyxdError::MalformedResponseData {
-            got: b.len(),
-            expected: 8,
-        });
-    }
-    Ok(u64::from_be_bytes([
-        b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7],
-    ]))
-}
-
-#[derive(Debug, Clone)]
-pub struct ParsedContractResponse {
-    pub message_index: usize,
-    pub response: Vec<u8>,
-}
-
-impl ParsedContractResponse {
-    pub fn parse_singleton_u32_contract_data(self) -> Result<u32, NyxdError> {
-        parse_singleton_u32_from_contract_response(self.response)
-    }
-
-    pub fn parse_singleton_u64_contract_data(self) -> Result<u64, NyxdError> {
-        parse_singleton_u64_from_contract_response(self.response)
-    }
-}
-
 pub fn parse_msg_responses(data: Bytes) -> Vec<MsgResponse> {
    // it seems that currently, on wasmd 0.43 + tendermint-rs 0.37 + cosmrs 0.17.0-pre
    // the data is left in undecoded base64 form, but I'd imagine this might change so if the decoding fails,
@@ -72,25 +34,35 @@ pub fn parse_msg_responses(data: Bytes) -> Vec<MsgResponse> {
 }

 // requires there's a single response message
-pub trait ContractResponseData: Sized {
+pub trait ToSingletonContractData: Sized {
    fn parse_singleton_u32_contract_data(&self) -> Result<u32, NyxdError> {
        let b = self.to_singleton_contract_data()?;
-        parse_singleton_u32_from_contract_response(b)
+        if b.len() != 4 {
+            return Err(NyxdError::MalformedResponseData {
+                got: b.len(),
+                expected: 4,
+            });
+        }
+        Ok(u32::from_be_bytes([b[0], b[1], b[2], b[3]]))
    }

    fn parse_singleton_u64_contract_data(&self) -> Result<u64, NyxdError> {
        let b = self.to_singleton_contract_data()?;
-        parse_singleton_u64_from_contract_response(b)
+        if b.len() != 8 {
+            return Err(NyxdError::MalformedResponseData {
+                got: b.len(),
+                expected: 8,
+            });
+        }
+        Ok(u64::from_be_bytes([
+            b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7],
+        ]))
    }

    fn to_singleton_contract_data(&self) -> Result<Vec<u8>, NyxdError>;
-
-    fn to_unchecked_contract_data(&self) -> Result<Vec<Vec<u8>>, NyxdError>;
-
-    fn to_contract_data(&self) -> Result<Vec<ParsedContractResponse>, NyxdError>;
 }

-impl ContractResponseData for ExecuteResult {
+impl ToSingletonContractData for ExecuteResult {
    fn to_singleton_contract_data(&self) -> Result<Vec<u8>, NyxdError> {
        if self.msg_responses.len() != 1 {
            return Err(NyxdError::UnexpectedNumberOfMsgResponses {
@@ -100,30 +72,6 @@ impl ContractResponseData for ExecuteResult {

        self.msg_responses[0].to_contract_response_data()
    }
-
-    fn to_unchecked_contract_data(&self) -> Result<Vec<Vec<u8>>, NyxdError> {
-        self.msg_responses
-            .iter()
-            .map(ToContractResponseData::to_contract_response_data)
-            .collect()
-    }
-
-    fn to_contract_data(&self) -> Result<Vec<ParsedContractResponse>, NyxdError> {
-        let mut response = Vec::new();
-
-        for (message_index, msg) in self.msg_responses.iter().enumerate() {
-            // unfortunately `Name` trait has not been derived for `MsgExecuteContractResponse`,
-            // so we have to make an explicit string comparison instead
-            if msg.type_url == "/cosmwasm.wasm.v1.MsgExecuteContractResponse" {
-                response.push(ParsedContractResponse {
-                    message_index,
-                    response: msg.to_contract_response_data()?,
-                })
-            }
-        }
-
-        Ok(response)
-    }
 }

 pub trait ToContractResponseData: Sized {
@@ -23,7 +23,7 @@ use tendermint_rpc::endpoint::*;
 use tendermint_rpc::query::Query;
 use tendermint_rpc::{Error as TendermintRpcError, Order, Paging, SimpleRequest};

-pub use helpers::{ContractResponseData, ToContractResponseData};
+pub use helpers::{ToContractResponseData, ToSingletonContractData};

 #[cfg(feature = "http-client")]
 use crate::http_client;
@@ -22,7 +22,7 @@ pub struct GasPrice {
    pub denom: String,
 }

-impl Mul<Gas> for &GasPrice {
+impl<'a> Mul<Gas> for &'a GasPrice {
    type Output = Coin;

    fn mul(self, gas_limit: Gas) -> Self::Output {
@@ -98,13 +98,6 @@ impl DirectSecp256k1HdWallet {
        Ok((private_key, public_key))
    }

-    pub fn derive_extended_private_key(
-        &self,
-        hd_path: &DerivationPath,
-    ) -> Result<XPrv, DirectSecp256k1HdWalletError> {
-        Ok(XPrv::derive_from_path(self.seed, hd_path)?)
-    }
-
    pub fn try_derive_accounts(&self) -> Result<Vec<AccountData>, DirectSecp256k1HdWalletError> {
        let mut accounts = Vec::with_capacity(self.accounts.len());
        for derivation_info in &self.accounts {
@@ -1,673 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use cosmwasm_schema::cw_serde;
-use cosmwasm_std::Decimal;
-use std::cmp::Ordering;
-use std::ops::{Add, Sub};
-
-#[cw_serde]
-pub struct HistoricalNymNodeVersion {
-    /// Version of the nym node that is going to be used for determining the version score of a node.
-    /// note: value stored here is pre-validated `semver::Version`
-    pub semver: String,
-
-    /// Block height of when this version has been added to the contract
-    pub introduced_at_height: u64,
-
-    /// The absolute version difference as compared against the first version introduced into the contract.
-    pub difference_since_genesis: TotalVersionDifference,
-}
-
-impl HistoricalNymNodeVersion {
-    pub fn genesis(semver: String, height: u64) -> HistoricalNymNodeVersion {
-        HistoricalNymNodeVersion {
-            semver,
-            introduced_at_height: height,
-            difference_since_genesis: Default::default(),
-        }
-    }
-
-    // SAFETY: the value stored in the contract is always valid
-    // if you manually construct that struct with invalid value, it's on you.
-    #[allow(clippy::unwrap_used)]
-    pub fn semver_unchecked(&self) -> semver::Version {
-        self.semver.parse().unwrap()
-    }
-
-    /// Return [`TotalVersionDifference`] for a new release version that is going to be pushed right after this one
-    /// this function cannot be called against 2 arbitrary versions
-    #[inline]
-    pub fn cumulative_difference_since_genesis(
-        &self,
-        new_version: &semver::Version,
-    ) -> TotalVersionDifference {
-        let self_semver = self.semver_unchecked();
-        let mut new_absolute = self.difference_since_genesis;
-        if new_version.major > self_semver.major {
-            new_absolute.major += (new_version.major - self_semver.major) as u32
-        } else if new_version.minor > self_semver.minor {
-            new_absolute.minor += (new_version.minor - self_semver.minor) as u32
-        } else if new_version.patch > self_semver.patch {
-            new_absolute.patch += (new_version.patch - self_semver.patch) as u32
-        } else if new_version.pre != self_semver.pre {
-            new_absolute.prerelease += 1
-        }
-        new_absolute
-    }
-
-    pub fn relative_difference(&self, other: &Self) -> TotalVersionDifference {
-        if self.difference_since_genesis > other.difference_since_genesis {
-            self.difference_since_genesis - other.difference_since_genesis
-        } else {
-            other.difference_since_genesis - self.difference_since_genesis
-        }
-    }
-
-    pub fn difference_against_legacy(
-        &self,
-        legacy_version: &semver::Version,
-    ) -> TotalVersionDifference {
-        let current = self.semver_unchecked();
-        let major_diff = (current.major as i64 - legacy_version.major as i64).unsigned_abs() as u32;
-        let minor_diff = (current.minor as i64 - legacy_version.minor as i64).unsigned_abs() as u32;
-        let patch_diff = (current.patch as i64 - legacy_version.patch as i64).unsigned_abs() as u32;
-        let prerelease_diff = if current.pre == legacy_version.pre {
-            0
-        } else {
-            1
-        };
-
-        let mut diff = TotalVersionDifference::default();
-        // if there's a major increase, ignore minor and patch and treat it as 0
-        if major_diff != 0 {
-            diff.major += major_diff;
-            return diff;
-        }
-
-        // if there's a minor increase, ignore patch and treat is as 0
-        if minor_diff != 0 {
-            diff.minor += minor_diff;
-            return diff;
-        }
-
-        diff.patch = patch_diff;
-        diff.prerelease = prerelease_diff;
-        diff
-    }
-}
-
-#[cw_serde]
-#[derive(Default, Copy, PartialOrd, Ord, Eq)]
-pub struct TotalVersionDifference {
-    pub major: u32,
-    pub minor: u32,
-    pub patch: u32,
-    pub prerelease: u32,
-}
-
-impl Add for TotalVersionDifference {
-    type Output = TotalVersionDifference;
-    fn add(self, rhs: TotalVersionDifference) -> Self::Output {
-        TotalVersionDifference {
-            major: self.major.add(rhs.major),
-            minor: self.minor.add(rhs.minor),
-            patch: self.patch.add(rhs.patch),
-            prerelease: self.prerelease.add(rhs.prerelease),
-        }
-    }
-}
-
-impl Sub for TotalVersionDifference {
-    type Output = TotalVersionDifference;
-    fn sub(self, rhs: TotalVersionDifference) -> Self::Output {
-        TotalVersionDifference {
-            major: self.major.saturating_sub(rhs.major),
-            minor: self.minor.saturating_sub(rhs.minor),
-            patch: self.patch.saturating_sub(rhs.patch),
-            prerelease: self.prerelease.saturating_sub(rhs.prerelease),
-        }
-    }
-}
-
-#[cw_serde]
-pub struct HistoricalNymNodeVersionEntry {
-    /// The unique, ordered, id of this particular entry
-    pub id: u32,
-
-    /// Data associated with this particular version
-    pub version_information: HistoricalNymNodeVersion,
-}
-
-impl From<(u32, HistoricalNymNodeVersion)> for HistoricalNymNodeVersionEntry {
-    fn from((id, version_information): (u32, HistoricalNymNodeVersion)) -> Self {
-        HistoricalNymNodeVersionEntry {
-            id,
-            version_information,
-        }
-    }
-}
-
-impl PartialOrd for HistoricalNymNodeVersionEntry {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        // we only care about id for the purposes of ordering as they should have unique data
-        self.id.partial_cmp(&other.id)
-    }
-}
-
-#[cw_serde]
-pub struct NymNodeVersionHistoryResponse {
-    pub history: Vec<HistoricalNymNodeVersionEntry>,
-
-    /// Field indicating paging information for the following queries if the caller wishes to get further entries.
-    pub start_next_after: Option<u32>,
-}
-
-#[cw_serde]
-pub struct CurrentNymNodeVersionResponse {
-    pub version: Option<HistoricalNymNodeVersionEntry>,
-}
-
-#[cw_serde]
-pub struct ConfigScoreParams {
-    /// Defines weights for calculating numbers of versions behind the current release.
-    pub version_weights: OutdatedVersionWeights,
-
-    /// Defines the parameters of the formula for calculating the version score
-    pub version_score_formula_params: VersionScoreFormulaParams,
-}
-
-/// Defines weights for calculating numbers of versions behind the current release.
-#[cw_serde]
-#[derive(Copy)]
-pub struct OutdatedVersionWeights {
-    pub major: u32,
-    pub minor: u32,
-    pub patch: u32,
-    pub prerelease: u32,
-}
-
-fn is_one_semver_difference(this: &semver::Version, other: &semver::Version) -> bool {
-    let major_diff = (this.major as i64 - other.major as i64).unsigned_abs() as u32;
-    let minor_diff = (this.minor as i64 - other.minor as i64).unsigned_abs() as u32;
-    let patch_diff = (this.patch as i64 - other.patch as i64).unsigned_abs() as u32;
-    let prerelease_diff = if this.pre == other.pre { 0 } else { 1 };
-
-    if major_diff == 1 {
-        return true;
-    }
-
-    if major_diff == 0 && minor_diff == 1 {
-        return true;
-    }
-
-    if major_diff == 0 && minor_diff == 0 && patch_diff == 1 {
-        return true;
-    }
-
-    prerelease_diff == 1
-}
-
-impl OutdatedVersionWeights {
-    pub fn difference_to_versions_behind_factor(&self, diff: TotalVersionDifference) -> u32 {
-        diff.major * self.major
-            + diff.minor * self.minor
-            + diff.patch * self.patch
-            + diff.prerelease * self.prerelease
-    }
-
-    // INVARIANT: release chain is sorted
-    // do NOT call this method directly from inside the contract. it's too inefficient
-    // it relies on some external caching.
-    pub fn versions_behind_factor(
-        &self,
-        node_version: &semver::Version,
-        release_chain: &[HistoricalNymNodeVersionEntry],
-    ) -> u32 {
-        let Some(latest) = release_chain.last() else {
-            return 0;
-        };
-
-        let latest_semver = latest.version_information.semver_unchecked();
-
-        // if you're more recent than the latest, you get the benefit of the doubt, the release might have not yet been commited to the chain
-        // but only if you're only a single semver ahead, otherwise you get penalty equivalent of being major version behind for cheating
-        if node_version > &latest_semver {
-            return if is_one_semver_difference(node_version, &latest_semver) {
-                0
-            } else {
-                self.major
-            };
-        }
-
-        // find your position in the release chain, if we fail, we assume that the node comes from before the changes were introduced
-        // in which case we simply calculate the absolute difference between the genesis entry and add up the total difference
-        let version_diff = match release_chain
-            .iter()
-            .rfind(|h| &h.version_information.semver_unchecked() <= node_version)
-        {
-            Some(h) => {
-                // first chain entry that is smaller (or equal) to the provided node version
-                // now, calculate the difference to the genesis version and ultimately against the current head
-                let diff_since_genesis = if h.version_information.semver == node_version.to_string()
-                {
-                    h.version_information.difference_since_genesis
-                } else {
-                    h.version_information
-                        .cumulative_difference_since_genesis(node_version)
-                };
-                latest.version_information.difference_since_genesis - diff_since_genesis
-            }
-            None => {
-                // SAFETY: since we managed to get 'last' entry, it means the release chain is not empty,
-                // so we must be able to obtain the first entry
-                #[allow(clippy::unwrap_used)]
-                let genesis = release_chain.first().unwrap();
-
-                let difference_from_genesis = genesis
-                    .version_information
-                    .difference_against_legacy(node_version);
-                difference_from_genesis + latest.version_information.difference_since_genesis
-            }
-        };
-
-        self.difference_to_versions_behind_factor(version_diff)
-    }
-}
-
-impl Default for OutdatedVersionWeights {
-    fn default() -> Self {
-        OutdatedVersionWeights {
-            major: 100,
-            minor: 10,
-            patch: 1,
-            prerelease: 1,
-        }
-    }
-}
-
-/// Given the formula of version_score = penalty ^ (versions_behind_factor ^ penalty_scaling)
-/// define the relevant parameters
-#[cw_serde]
-#[derive(Copy)]
-pub struct VersionScoreFormulaParams {
-    pub penalty: Decimal,
-    pub penalty_scaling: Decimal,
-}
-
-impl Default for VersionScoreFormulaParams {
-    fn default() -> Self {
-        #[allow(clippy::unwrap_used)]
-        VersionScoreFormulaParams {
-            penalty: "0.995".parse().unwrap(),
-            penalty_scaling: "1.65".parse().unwrap(),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::ops::Deref;
-
-    // simple wrapper for tests
-    struct ReleaseChain {
-        inner: Vec<HistoricalNymNodeVersionEntry>,
-    }
-
-    impl Deref for ReleaseChain {
-        type Target = [HistoricalNymNodeVersionEntry];
-        fn deref(&self) -> &Self::Target {
-            self.inner.deref()
-        }
-    }
-
-    impl ReleaseChain {
-        fn new(initial: &str) -> Self {
-            ReleaseChain {
-                inner: vec![HistoricalNymNodeVersionEntry {
-                    id: 0,
-                    version_information: HistoricalNymNodeVersion {
-                        semver: initial.to_string(),
-                        introduced_at_height: 123,
-                        difference_since_genesis: TotalVersionDifference::default(),
-                    },
-                }],
-            }
-        }
-
-        fn with_release(mut self, raw: &str) -> Self {
-            self.push_new(raw);
-            self
-        }
-
-        fn push_new(&mut self, raw: &str) {
-            let latest = self.inner.last().unwrap();
-            let new_version: semver::Version = raw.parse().unwrap();
-
-            let new_absolute = latest
-                .version_information
-                .cumulative_difference_since_genesis(&new_version);
-
-            self.inner.push(HistoricalNymNodeVersionEntry {
-                id: latest.id + 1,
-                version_information: HistoricalNymNodeVersion {
-                    semver: new_version.to_string(),
-                    introduced_at_height: latest.version_information.introduced_at_height + 1,
-                    difference_since_genesis: new_absolute,
-                },
-            })
-        }
-    }
-
-    #[test]
-    fn versions_behind_factor() {
-        // helper to compact the parsing
-        fn s(raw: &str) -> semver::Version {
-            raw.parse().unwrap()
-        }
-
-        let weights = OutdatedVersionWeights::default();
-
-        // no releases:
-        let res = weights.versions_behind_factor(&s("1.1.13"), &[]);
-        assert_eq!(0, res);
-
-        // ###############################
-        // single released version (1.1.13)
-        // ###############################
-        let mut release_chain = ReleaseChain::new("1.1.13");
-
-        // "legacy" versions
-        let res = weights.versions_behind_factor(&s("1.0.12"), &release_chain);
-        assert_eq!(10, res);
-        let res = weights.versions_behind_factor(&s("1.0.4"), &release_chain);
-        assert_eq!(10, res);
-        let res = weights.versions_behind_factor(&s("1.0.1"), &release_chain);
-        assert_eq!(10, res);
-        let res = weights.versions_behind_factor(&s("0.1.12"), &release_chain);
-        assert_eq!(100, res);
-
-        let res = weights.versions_behind_factor(&s("1.1.12"), &release_chain);
-        assert_eq!(1, res);
-        let res = weights.versions_behind_factor(&s("1.1.11"), &release_chain);
-        assert_eq!(2, res);
-        let res = weights.versions_behind_factor(&s("1.1.9"), &release_chain);
-        assert_eq!(4, res);
-
-        // current version
-        let res = weights.versions_behind_factor(&s("1.1.13"), &release_chain);
-        assert_eq!(0, res);
-
-        // "ahead" versions
-        let res = weights.versions_behind_factor(&s("1.1.14"), &release_chain);
-        assert_eq!(0, res);
-        let res = weights.versions_behind_factor(&s("1.2.0"), &release_chain);
-        assert_eq!(0, res);
-        let res = weights.versions_behind_factor(&s("2.0.0"), &release_chain);
-        assert_eq!(0, res);
-
-        // cheating ahead:
-        let res = weights.versions_behind_factor(&s("1.1.15"), &release_chain);
-        assert_eq!(100, res);
-        let res = weights.versions_behind_factor(&s("1.3.0"), &release_chain);
-        assert_eq!(100, res);
-        let res = weights.versions_behind_factor(&s("3.0.0"), &release_chain);
-        assert_eq!(100, res);
-
-        // ###############################
-        // small patch release chain (1.1.13 => 1.1.14 => 1.1.15 => 1.1.16)
-        // ###############################
-        release_chain.push_new("1.1.14");
-        release_chain.push_new("1.1.15");
-        release_chain.push_new("1.1.16");
-
-        // "legacy" versions
-        let res = weights.versions_behind_factor(&s("1.0.12"), &release_chain);
-        assert_eq!(13, res);
-        let res = weights.versions_behind_factor(&s("1.0.4"), &release_chain);
-        assert_eq!(13, res);
-        let res = weights.versions_behind_factor(&s("1.0.1"), &release_chain);
-        assert_eq!(13, res);
-        let res = weights.versions_behind_factor(&s("0.1.12"), &release_chain);
-        assert_eq!(103, res);
-
-        let res = weights.versions_behind_factor(&s("1.1.12"), &release_chain);
-        assert_eq!(4, res);
-        let res = weights.versions_behind_factor(&s("1.1.11"), &release_chain);
-        assert_eq!(5, res);
-        let res = weights.versions_behind_factor(&s("1.1.9"), &release_chain);
-        assert_eq!(7, res);
-
-        // current version
-        let res = weights.versions_behind_factor(&s("1.1.16"), &release_chain);
-        assert_eq!(0, res);
-
-        // present in the chain
-        let res = weights.versions_behind_factor(&s("1.1.15"), &release_chain);
-        assert_eq!(1, res);
-        let res = weights.versions_behind_factor(&s("1.1.14"), &release_chain);
-        assert_eq!(2, res);
-        let res = weights.versions_behind_factor(&s("1.1.13"), &release_chain);
-        assert_eq!(3, res);
-
-        // "ahead" versions
-        let res = weights.versions_behind_factor(&s("1.1.17"), &release_chain);
-        assert_eq!(0, res);
-        let res = weights.versions_behind_factor(&s("1.2.0"), &release_chain);
-        assert_eq!(0, res);
-        let res = weights.versions_behind_factor(&s("2.0.0"), &release_chain);
-        assert_eq!(0, res);
-
-        // cheating ahead:
-        let res = weights.versions_behind_factor(&s("1.1.18"), &release_chain);
-        assert_eq!(100, res);
-        let res = weights.versions_behind_factor(&s("1.3.0"), &release_chain);
-        assert_eq!(100, res);
-        let res = weights.versions_behind_factor(&s("3.0.0"), &release_chain);
-        assert_eq!(100, res);
-
-        // ###############################
-        // small minor release chain (1.2.0 => 1.3.0 => 1.4.0)
-        // ###############################
-        let release_chain = ReleaseChain::new("1.2.0")
-            .with_release("1.3.0")
-            .with_release("1.4.0");
-
-        // "legacy" versions
-        let res = weights.versions_behind_factor(&s("1.0.12"), &release_chain);
-        assert_eq!(40, res);
-        let res = weights.versions_behind_factor(&s("1.0.4"), &release_chain);
-        assert_eq!(40, res);
-        let res = weights.versions_behind_factor(&s("1.0.1"), &release_chain);
-        assert_eq!(40, res);
-        let res = weights.versions_behind_factor(&s("0.1.12"), &release_chain);
-        assert_eq!(120, res);
-
-        let res = weights.versions_behind_factor(&s("1.1.12"), &release_chain);
-        assert_eq!(30, res);
-        let res = weights.versions_behind_factor(&s("1.1.11"), &release_chain);
-        assert_eq!(30, res);
-        let res = weights.versions_behind_factor(&s("1.1.9"), &release_chain);
-        assert_eq!(30, res);
-
-        // current version
-        let res = weights.versions_behind_factor(&s("1.4.0"), &release_chain);
-        assert_eq!(0, res);
-
-        // present in the chain
-        let res = weights.versions_behind_factor(&s("1.2.0"), &release_chain);
-        assert_eq!(20, res);
-        let res = weights.versions_behind_factor(&s("1.3.0"), &release_chain);
-        assert_eq!(10, res);
-
-        // weird in between
-        let res = weights.versions_behind_factor(&s("1.2.1"), &release_chain);
-        assert_eq!(20, res);
-        let res = weights.versions_behind_factor(&s("1.3.3"), &release_chain);
-        assert_eq!(10, res);
-
-        // "ahead" versions
-        let res = weights.versions_behind_factor(&s("1.4.1"), &release_chain);
-        assert_eq!(0, res);
-        let res = weights.versions_behind_factor(&s("1.5.0"), &release_chain);
-        assert_eq!(0, res);
-        let res = weights.versions_behind_factor(&s("2.0.0"), &release_chain);
-        assert_eq!(0, res);
-
-        // cheating ahead:
-        let res = weights.versions_behind_factor(&s("1.4.2"), &release_chain);
-        assert_eq!(100, res);
-        let res = weights.versions_behind_factor(&s("1.6.0"), &release_chain);
-        assert_eq!(100, res);
-        let res = weights.versions_behind_factor(&s("3.0.0"), &release_chain);
-        assert_eq!(100, res);
-
-        // ###############################
-        // mixed release chain (1.1.13 => 1.2.0 => 1.2.1 => 1.3.0 => 1.3.1 => 1.3.2 => 1.4.0)
-        // ###############################
-        let release_chain = ReleaseChain::new("1.1.13")
-            .with_release("1.2.0")
-            .with_release("1.2.1")
-            .with_release("1.3.0")
-            .with_release("1.3.1-importantpre")
-            .with_release("1.3.1")
-            .with_release("1.3.2")
-            .with_release("1.4.0");
-
-        // "legacy" versions
-        let res = weights.versions_behind_factor(&s("1.0.12"), &release_chain);
-        assert_eq!(44, res);
-        let res = weights.versions_behind_factor(&s("1.0.4"), &release_chain);
-        assert_eq!(44, res);
-        let res = weights.versions_behind_factor(&s("1.0.1"), &release_chain);
-        assert_eq!(44, res);
-        let res = weights.versions_behind_factor(&s("0.1.12"), &release_chain);
-        assert_eq!(134, res);
-
-        let res = weights.versions_behind_factor(&s("1.1.12"), &release_chain);
-        assert_eq!(35, res);
-        let res = weights.versions_behind_factor(&s("1.1.11"), &release_chain);
-        assert_eq!(36, res);
-        let res = weights.versions_behind_factor(&s("1.1.9"), &release_chain);
-        assert_eq!(38, res);
-
-        // current version
-        let res = weights.versions_behind_factor(&s("1.4.0"), &release_chain);
-        assert_eq!(0, res);
-
-        // present in the chain
-        let res = weights.versions_behind_factor(&s("1.1.13"), &release_chain);
-        assert_eq!(34, res);
-        let res = weights.versions_behind_factor(&s("1.2.0"), &release_chain);
-        assert_eq!(24, res);
-        let res = weights.versions_behind_factor(&s("1.2.1"), &release_chain);
-        assert_eq!(23, res);
-        let res = weights.versions_behind_factor(&s("1.3.0"), &release_chain);
-        assert_eq!(13, res);
-        let res = weights.versions_behind_factor(&s("1.3.1-importantpre"), &release_chain);
-        assert_eq!(12, res);
-        let res = weights.versions_behind_factor(&s("1.3.1"), &release_chain);
-        assert_eq!(11, res);
-        let res = weights.versions_behind_factor(&s("1.3.2"), &release_chain);
-        assert_eq!(10, res);
-
-        // weird in between
-        let res = weights.versions_behind_factor(&s("1.2.3"), &release_chain);
-        assert_eq!(21, res);
-        let res = weights.versions_behind_factor(&s("1.3.69"), &release_chain);
-        assert_eq!(10, res);
-
-        // "ahead" versions
-        let res = weights.versions_behind_factor(&s("1.4.1"), &release_chain);
-        assert_eq!(0, res);
-        let res = weights.versions_behind_factor(&s("1.5.0"), &release_chain);
-        assert_eq!(0, res);
-        let res = weights.versions_behind_factor(&s("2.0.0"), &release_chain);
-        assert_eq!(0, res);
-
-        // cheating ahead:
-        let res = weights.versions_behind_factor(&s("1.4.2"), &release_chain);
-        assert_eq!(100, res);
-        let res = weights.versions_behind_factor(&s("1.6.0"), &release_chain);
-        assert_eq!(100, res);
-        let res = weights.versions_behind_factor(&s("3.0.0"), &release_chain);
-        assert_eq!(100, res);
-
-        // ###############################
-        // skipped patch chain (1.1.13 => 1.2.0 => 1.2.1 => 1.2.4 => [1.3.0])
-        // ###############################
-        let mut release_chain = ReleaseChain::new("1.1.13")
-            .with_release("1.2.0")
-            .with_release("1.2.1")
-            .with_release("1.2.4");
-
-        // current
-        let res = weights.versions_behind_factor(&s("1.2.4"), &release_chain);
-        assert_eq!(0, res);
-
-        // on 'skipped' version
-        let res = weights.versions_behind_factor(&s("1.2.2"), &release_chain);
-        assert_eq!(2, res);
-
-        // on version before the skip
-        let res = weights.versions_behind_factor(&s("1.2.1"), &release_chain);
-        assert_eq!(3, res);
-
-        release_chain.push_new("1.3.0");
-        // current
-        let res = weights.versions_behind_factor(&s("1.3.0"), &release_chain);
-        assert_eq!(0, res);
-
-        // on 'skipped' version
-        let res = weights.versions_behind_factor(&s("1.2.2"), &release_chain);
-        assert_eq!(12, res);
-
-        // on version before the skip
-        let res = weights.versions_behind_factor(&s("1.2.1"), &release_chain);
-        assert_eq!(13, res);
-
-        // ###############################
-        // skipped minor chain (1.1.13 => 1.2.0 => 1.2.1 => 1.4.0 => [1.5.0])
-        // ###############################
-        let mut release_chain = ReleaseChain::new("1.1.13")
-            .with_release("1.2.0")
-            .with_release("1.2.1")
-            .with_release("1.4.0");
-
-        // current
-        let res = weights.versions_behind_factor(&s("1.4.0"), &release_chain);
-        assert_eq!(0, res);
-
-        // on 'skipped' version
-        let res = weights.versions_behind_factor(&s("1.3.0"), &release_chain);
-        assert_eq!(10, res);
-
-        // on version before the skip
-        let res = weights.versions_behind_factor(&s("1.2.1"), &release_chain);
-        assert_eq!(20, res);
-
-        let res = weights.versions_behind_factor(&s("1.2.0"), &release_chain);
-        assert_eq!(21, res);
-
-        release_chain.push_new("1.5.0");
-
-        // current
-        let res = weights.versions_behind_factor(&s("1.5.0"), &release_chain);
-        assert_eq!(0, res);
-
-        let res = weights.versions_behind_factor(&s("1.4.0"), &release_chain);
-        assert_eq!(10, res);
-
-        // on 'skipped' version
-        let res = weights.versions_behind_factor(&s("1.3.0"), &release_chain);
-        assert_eq!(20, res);
-
-        // on version before the skip
-        let res = weights.versions_behind_factor(&s("1.2.1"), &release_chain);
-        assert_eq!(30, res);
-
-        let res = weights.versions_behind_factor(&s("1.2.0"), &release_chain);
-        assert_eq!(31, res);
-    }
-}
@@ -275,9 +275,6 @@ pub enum MixnetContractError {

    #[error("the provided nym-node version is not a valid semver. got: {provided}")]
    InvalidNymNodeSemver { provided: String },
-
-    #[error("the provided nym-node version is not greater than the current one. got: {provided}. current: {current}")]
-    NonIncreasingSemver { provided: String, current: String },
 }

 impl MixnetContractError {
@@ -141,7 +141,6 @@ pub const NEW_INTERVAL_OPERATING_COST_RANGE_KEY: &str = "new_interval_operating_
 pub const NEW_VERSION_WEIGHTS_RANGE_KEY: &str = "new_version_weights_range";
 pub const NEW_VERSION_SCORE_FORMULA_PARAMS_KEY: &str = "new_version_score_formula_params";
 pub const NYM_NODE_CURRENT_SEMVER_KEY: &str = "new_current_semver";
-pub const NYM_NODE_CURRENT_SEMVER_ID_KEY: &str = "new_current_semver_id";

 pub const OLD_REWARDING_VALIDATOR_ADDRESS_KEY: &str = "old_rewarding_validator_address";
 pub const NEW_REWARDING_VALIDATOR_ADDRESS_KEY: &str = "new_rewarding_validator_address";
@@ -482,6 +481,12 @@ pub fn new_settings_update_event(update: &ContractStateParamsUpdate) -> Event {

    // check for config score params updates
    if let Some(config_score_update) = &update.config_score_params {
+        if let Some(current_nym_node_semver) = &config_score_update.current_nym_node_semver {
+            event.attributes.push(attr(
+                NYM_NODE_CURRENT_SEMVER_KEY,
+                current_nym_node_semver.to_string(),
+            ))
+        }
        if let Some(version_weights) = &config_score_update.version_weights {
            event.attributes.push(attr(
                NEW_VERSION_WEIGHTS_RANGE_KEY,
@@ -501,10 +506,9 @@ pub fn new_settings_update_event(update: &ContractStateParamsUpdate) -> Event {
    event
 }

-pub fn new_update_nym_node_semver_event(new_version: &str, new_id: u32) -> Event {
+pub fn new_update_nym_node_semver_event(new_version: &str) -> Event {
    Event::new(MixnetEventType::NymNodeSemverUpdate)
        .add_attribute(NYM_NODE_CURRENT_SEMVER_KEY, new_version)
-        .add_attribute(NYM_NODE_CURRENT_SEMVER_ID_KEY, new_id.to_string())
 }

 pub fn new_not_found_node_operator_rewarding_event(interval: Interval, node_id: NodeId) -> Event {
@@ -32,7 +32,7 @@ pub(crate) mod string_rfc3339_offset_date_time {

    struct Rfc3339OffsetDateTimeVisitor;

-    impl Visitor<'_> for Rfc3339OffsetDateTimeVisitor {
+    impl<'de> Visitor<'de> for Rfc3339OffsetDateTimeVisitor {
        type Value = OffsetDateTime;

        fn expecting(&self, formatter: &mut Formatter<'_>) -> std::fmt::Result {
@@ -5,7 +5,6 @@
 #![warn(clippy::unwrap_used)]
 #![warn(clippy::todo)]

-mod config_score;
 pub mod constants;
 pub mod delegation;
 pub mod error;
@@ -22,7 +21,6 @@ pub mod rewarding;
 pub mod signing_types;
 pub mod types;

-pub use config_score::*;
 pub use constants::*;
 pub use contracts_common::types::*;
 pub use cosmwasm_std::{Addr, Coin, Decimal, Fraction};
@@ -25,7 +25,6 @@ use std::time::Duration;

 #[cfg(feature = "schema")]
 use crate::{
-    config_score::{CurrentNymNodeVersionResponse, NymNodeVersionHistoryResponse},
    delegation::{
        NodeDelegationResponse, PagedAllDelegationsResponse, PagedDelegatorDelegationsResponse,
        PagedNodeDelegationsResponse,
@@ -424,20 +423,6 @@ pub enum QueryMsg {
    #[cfg_attr(feature = "schema", returns(ContractState))]
    GetState {},

-    /// Get the current expected version of a Nym Node.
-    #[cfg_attr(feature = "schema", returns(CurrentNymNodeVersionResponse))]
-    GetCurrentNymNodeVersion {},
-
-    /// Get the version history of Nym Node.
-    #[cfg_attr(feature = "schema", returns(NymNodeVersionHistoryResponse))]
-    GetNymNodeVersionHistory {
-        /// Controls the maximum number of entries returned by the query. Note that too large values will be overwritten by a saner default.
-        limit: Option<u32>,
-
-        /// Pagination control for the values returned by the query. Note that the provided value itself will **not** be used for the response.
-        start_after: Option<u32>,
-    },
-
    /// Gets the current parameters used for reward calculation.
    #[cfg_attr(feature = "schema", returns(RewardingParams))]
    GetRewardingParams {},
@@ -1,12 +1,11 @@
 // Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::config_score::{ConfigScoreParams, OutdatedVersionWeights, VersionScoreFormulaParams};
 use crate::nym_node::Role;
 use contracts_common::Percent;
 use cosmwasm_schema::cw_serde;
-use cosmwasm_std::Coin;
 use cosmwasm_std::{Addr, Uint128};
+use cosmwasm_std::{Coin, Decimal};
 use std::fmt::{Display, Formatter};

 // type aliases for better reasoning about available data
@@ -222,14 +221,96 @@ impl OperatorsParamsUpdate {
    }
 }

+#[cw_serde]
+pub struct ConfigScoreParams {
+    /// Current version of the nym node that is going to be used for determining the version score of a node.
+    /// note: value stored here is pre-validated `semver::Version`
+    pub current_nym_node_semver: String,
+
+    /// Defines weights for calculating numbers of versions behind the current release.
+    pub version_weights: OutdatedVersionWeights,
+
+    /// Defines the parameters of the formula for calculating the version score
+    pub version_score_formula_params: VersionScoreFormulaParams,
+}
+
+impl ConfigScoreParams {
+    // SAFETY: the value stored in the contract is always valid
+    #[allow(clippy::unwrap_used)]
+    pub fn unchecked_nym_node_version(&self) -> semver::Version {
+        self.current_nym_node_semver.parse().unwrap()
+    }
+
+    pub fn versions_behind(&self, node_semver: &semver::Version) -> u32 {
+        let expected = self.unchecked_nym_node_version();
+
+        let major_diff = (node_semver.major as i64 - expected.major as i64).unsigned_abs() as u32;
+        let minor_diff = (node_semver.minor as i64 - expected.minor as i64).unsigned_abs() as u32;
+        let patch_diff = (node_semver.patch as i64 - expected.patch as i64).unsigned_abs() as u32;
+        let prerelease_diff = if node_semver.pre == expected.pre {
+            0
+        } else {
+            1
+        };
+
+        major_diff * self.version_weights.major
+            + minor_diff * self.version_weights.minor
+            + patch_diff * self.version_weights.patch
+            + prerelease_diff * self.version_weights.prerelease
+    }
+}
+
+/// Defines weights for calculating numbers of versions behind the current release.
+#[cw_serde]
+#[derive(Copy)]
+pub struct OutdatedVersionWeights {
+    pub major: u32,
+    pub minor: u32,
+    pub patch: u32,
+    pub prerelease: u32,
+}
+
+impl Default for OutdatedVersionWeights {
+    fn default() -> Self {
+        OutdatedVersionWeights {
+            major: 100,
+            minor: 10,
+            patch: 1,
+            prerelease: 1,
+        }
+    }
+}
+
+/// Given the formula of version_score = penalty ^ (num_versions_behind ^ penalty_scaling)
+/// define the relevant parameters
+#[cw_serde]
+#[derive(Copy)]
+pub struct VersionScoreFormulaParams {
+    pub penalty: Decimal,
+    pub penalty_scaling: Decimal,
+}
+
+impl Default for VersionScoreFormulaParams {
+    fn default() -> Self {
+        #[allow(clippy::unwrap_used)]
+        VersionScoreFormulaParams {
+            penalty: "0.8".parse().unwrap(),
+            penalty_scaling: "2.0".parse().unwrap(),
+        }
+    }
+}
+
 #[cw_serde]
 pub struct ConfigScoreParamsUpdate {
+    pub current_nym_node_semver: Option<String>,
    pub version_weights: Option<OutdatedVersionWeights>,
    pub version_score_formula_params: Option<VersionScoreFormulaParams>,
 }

 impl ConfigScoreParamsUpdate {
    pub fn contains_updates(&self) -> bool {
-        self.version_weights.is_some() || self.version_score_formula_params.is_some()
+        self.current_nym_node_semver.is_some()
+            || self.version_weights.is_some()
+            || self.version_score_formula_params.is_some()
    }
 }
@@ -15,9 +15,7 @@ mixnet-contract-common = { path = "../mixnet-contract", package = "nym-mixnet-co
 contracts-common = { path = "../contracts-common", package = "nym-contracts-common", version = "0.5.0" }
 serde = { workspace = true, features = ["derive"] }
 thiserror = { workspace = true }
-# without this feature, cargo clippy emits a ton of incompatibility warnings
-# https://docs.rs/ts-rs/latest/ts_rs/#serde-compatability
-ts-rs = { workspace = true, optional = true, features = ["no-serde-warnings"] }
+ts-rs = { workspace = true, optional = true}

 [features]
 schema = ["cw2"]
@@ -111,7 +111,7 @@ impl<S: Storage + Clone + 'static> BandwidthStorageManager<S> {
    }

    #[instrument(level = "trace", skip_all)]
-    pub async fn sync_storage_bandwidth(&mut self) -> Result<()> {
+    async fn sync_storage_bandwidth(&mut self) -> Result<()> {
        trace!("syncing client bandwidth with the underlying storage");
        let updated = self
            .storage
@@ -8,8 +8,8 @@ use std::time::Duration;
 use time::OffsetDateTime;
 use tokio::sync::RwLock;

-const DEFAULT_CLIENT_BANDWIDTH_MAX_FLUSHING_RATE: Duration = Duration::from_secs(5 * 60); // 5 minutes
-const DEFAULT_CLIENT_BANDWIDTH_MAX_DELTA_FLUSHING_AMOUNT: i64 = 5 * 1024 * 1024; // 5MB
+const DEFAULT_CLIENT_BANDWIDTH_MAX_FLUSHING_RATE: Duration = Duration::from_millis(5);
+const DEFAULT_CLIENT_BANDWIDTH_MAX_DELTA_FLUSHING_AMOUNT: i64 = 512 * 1024; // 512kB

 #[derive(Debug, Clone, Copy)]
 pub struct BandwidthFlushingBehaviourConfig {
@@ -18,7 +18,7 @@ use nym_validator_client::nym_api::EpochId;
 use nym_validator_client::nyxd::contract_traits::{
    EcashSigningClient, MultisigQueryClient, MultisigSigningClient, PagedMultisigQueryClient,
 };
-use nym_validator_client::nyxd::cosmwasm_client::ContractResponseData;
+use nym_validator_client::nyxd::cosmwasm_client::ToSingletonContractData;
 use nym_validator_client::nyxd::cw3::Status;
 use nym_validator_client::nyxd::AccountId;
 use nym_validator_client::EcashApiClient;
@@ -221,15 +221,7 @@ impl From<PayInfo> for NymPayInfo {
 }

 #[derive(
-    Copy,
-    Clone,
-    Debug,
-    PartialEq,
-    Serialize,
-    Deserialize,
-    strum::Display,
-    strum::EnumString,
-    strum::EnumIter,
+    Copy, Clone, Debug, PartialEq, Serialize, Deserialize, strum::Display, strum::EnumString,
 )]
 #[serde(rename_all = "kebab-case")]
 #[strum(serialize_all = "kebab-case")]
@@ -6,7 +6,6 @@ use ed25519_dalek::{Signer, SigningKey};
 pub use ed25519_dalek::{Verifier, PUBLIC_KEY_LENGTH, SECRET_KEY_LENGTH, SIGNATURE_LENGTH};
 use nym_pemstore::traits::{PemStorableKey, PemStorableKeyPair};
 use std::fmt::{self, Debug, Display, Formatter};
-use std::hash::{Hash, Hasher};
 use std::str::FromStr;
 use thiserror::Error;
 use zeroize::{Zeroize, ZeroizeOnDrop};
@@ -123,14 +122,6 @@ impl PemStorableKeyPair for KeyPair {
 #[derive(Copy, Clone, Eq, PartialEq)]
 pub struct PublicKey(ed25519_dalek::VerifyingKey);

-impl Hash for PublicKey {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        // each public key has unique bytes representation which can be used
-        // for the hash implementation
-        self.to_bytes().hash(state)
-    }
-}
-
 impl Display for PublicKey {
    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
        Display::fmt(&self.to_base58_string(), f)
@@ -26,8 +26,9 @@ const PARALLEL_RUNS: usize = 32;
 /// `lambda` ($\lambda$) in the DKG paper
 const SECURITY_PARAMETER: usize = 256;

+// note: ceiling in integer division can be achieved via q = (x + y - 1) / y;
 /// ceil(SECURITY_PARAMETER / PARALLEL_RUNS) in the paper
-const NUM_CHALLENGE_BITS: usize = SECURITY_PARAMETER.div_ceil(PARALLEL_RUNS);
+const NUM_CHALLENGE_BITS: usize = (SECURITY_PARAMETER + PARALLEL_RUNS - 1) / PARALLEL_RUNS;

 // type alias for ease of use
 type FirstChallenge = Vec<Vec<Vec<u64>>>;
@@ -196,7 +196,7 @@ impl<'b> Add<&'b Polynomial> for Polynomial {
    }
 }

-impl Add<Polynomial> for &Polynomial {
+impl<'a> Add<Polynomial> for &'a Polynomial {
    type Output = Polynomial;

    fn add(self, rhs: Polynomial) -> Polynomial {
@@ -212,10 +212,10 @@ impl Add<Polynomial> for Polynomial {
    }
 }

-impl<'a> Add<&'a Polynomial> for &Polynomial {
+impl<'a, 'b> Add<&'b Polynomial> for &'a Polynomial {
    type Output = Polynomial;

-    fn add(self, rhs: &'a Polynomial) -> Self::Output {
+    fn add(self, rhs: &'b Polynomial) -> Self::Output {
        let len = self.coefficients.len();
        let rhs_len = rhs.coefficients.len();

@@ -37,7 +37,7 @@ pub struct GatewayHandshake<'a> {
    handshake_future: BoxFuture<'a, Result<SharedGatewayKey, HandshakeError>>,
 }

-impl Future for GatewayHandshake<'_> {
+impl<'a> Future for GatewayHandshake<'a> {
    type Output = Result<SharedGatewayKey, HandshakeError>;

    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
@@ -282,48 +282,6 @@ impl Client {
        }
    }

-    pub async fn create_delete_request<K, V>(
-        &self,
-        path: PathSegments<'_>,
-        params: Params<'_, K, V>,
-    ) -> RequestBuilder
-    where
-        K: AsRef<str>,
-        V: AsRef<str>,
-    {
-        let url = sanitize_url(&self.base_url, path, params);
-        self.reqwest_client.delete(url)
-    }
-
-    pub async fn send_delete_request<K, V, E>(
-        &self,
-        path: PathSegments<'_>,
-        params: Params<'_, K, V>,
-    ) -> Result<Response, HttpClientError<E>>
-    where
-        K: AsRef<str>,
-        V: AsRef<str>,
-        E: Display,
-    {
-        tracing::trace!("Sending DELETE request");
-        let url = sanitize_url(&self.base_url, path, params);
-
-        #[cfg(target_arch = "wasm32")]
-        {
-            Ok(wasmtimer::tokio::timeout(
-                self.request_timeout,
-                self.reqwest_client.delete(url).send(),
-            )
-            .await
-            .map_err(|_timeout| HttpClientError::RequestTimeout)??)
-        }
-
-        #[cfg(not(target_arch = "wasm32"))]
-        {
-            Ok(self.reqwest_client.delete(url).send().await?)
-        }
-    }
-
    #[instrument(level = "debug", skip_all)]
    pub async fn get_json<T, K, V, E>(
        &self,
@@ -357,22 +315,6 @@ impl Client {
        parse_response(res, true).await
    }

-    pub async fn delete_json<T, K, V, E>(
-        &self,
-        path: PathSegments<'_>,
-        params: Params<'_, K, V>,
-    ) -> Result<T, HttpClientError<E>>
-    where
-        for<'a> T: Deserialize<'a>,
-        K: AsRef<str>,
-        V: AsRef<str>,
-        E: Display + DeserializeOwned,
-    {
-        let res = self.send_delete_request(path, params).await?;
-        parse_response(res, false).await
-    }
-
-    #[instrument(level = "debug", skip_all)]
    pub async fn get_json_endpoint<T, S, E>(&self, endpoint: S) -> Result<T, HttpClientError<E>>
    where
        for<'a> T: Deserialize<'a>,
@@ -437,35 +379,6 @@ impl Client {

        parse_response(res, true).await
    }
-
-    pub async fn delete_json_endpoint<T, S, E>(&self, endpoint: S) -> Result<T, HttpClientError<E>>
-    where
-        for<'a> T: Deserialize<'a>,
-        E: Display + DeserializeOwned,
-        S: AsRef<str>,
-    {
-        #[cfg(target_arch = "wasm32")]
-        let res = {
-            wasmtimer::tokio::timeout(
-                self.request_timeout,
-                self.reqwest_client
-                    .delete(self.base_url.join(endpoint.as_ref())?)
-                    .send(),
-            )
-            .await
-            .map_err(|_timeout| HttpClientError::RequestTimeout)??
-        };
-
-        #[cfg(not(target_arch = "wasm32"))]
-        let res = {
-            self.reqwest_client
-                .delete(self.base_url.join(endpoint.as_ref())?)
-                .send()
-                .await?
-        };
-
-        parse_response(res, false).await
-    }
 }

 // define those methods on the trait for nicer extensions (and not having to type the thing twice)
@@ -498,17 +411,6 @@ pub trait ApiClient {
        V: AsRef<str> + Sync,
        E: Display + DeserializeOwned;

-    async fn delete_json<T, K, V, E>(
-        &self,
-        path: PathSegments<'_>,
-        params: Params<'_, K, V>,
-    ) -> Result<T, HttpClientError<E>>
-    where
-        for<'a> T: Deserialize<'a>,
-        K: AsRef<str> + Sync,
-        V: AsRef<str> + Sync,
-        E: Display + DeserializeOwned;
-
    /// `get` json data from the provided absolute endpoint, i.e. for example `"/api/v1/mixnodes?since=12345"`
    async fn get_json_from<T, S, E>(&self, endpoint: S) -> Result<T, HttpClientError<E>>
    where
@@ -526,12 +428,6 @@ pub trait ApiClient {
        for<'a> T: Deserialize<'a>,
        E: Display + DeserializeOwned,
        S: AsRef<str> + Sync + Send;
-
-    async fn delete_json_from<T, S, E>(&self, endpoint: S) -> Result<T, HttpClientError<E>>
-    where
-        for<'a> T: Deserialize<'a>,
-        E: Display + DeserializeOwned,
-        S: AsRef<str> + Sync + Send;
 }

 #[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
@@ -567,20 +463,6 @@ impl ApiClient for Client {
        self.post_json(path, params, json_body).await
    }

-    async fn delete_json<T, K, V, E>(
-        &self,
-        path: PathSegments<'_>,
-        params: Params<'_, K, V>,
-    ) -> Result<T, HttpClientError<E>>
-    where
-        for<'a> T: Deserialize<'a>,
-        K: AsRef<str> + Sync,
-        V: AsRef<str> + Sync,
-        E: Display + DeserializeOwned,
-    {
-        self.delete_json(path, params).await
-    }
-
    async fn get_json_from<T, S, E>(&self, endpoint: S) -> Result<T, HttpClientError<E>>
    where
        for<'a> T: Deserialize<'a>,
@@ -603,15 +485,6 @@ impl ApiClient for Client {
    {
        self.post_json_endpoint(endpoint, json_body).await
    }
-
-    async fn delete_json_from<T, S, E>(&self, endpoint: S) -> Result<T, HttpClientError<E>>
-    where
-        for<'a> T: Deserialize<'a>,
-        E: Display + DeserializeOwned,
-        S: AsRef<str> + Sync + Send,
-    {
-        self.delete_json_endpoint(endpoint).await
-    }
 }

 // utility function that should solve the double slash problem in API urls forever.
@@ -5,9 +5,8 @@ use std::fmt;

 use http::HeaderValue;
 use nym_bin_common::build_information::{BinaryBuildInformation, BinaryBuildInformationOwned};
-use serde::{Deserialize, Serialize};

-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[derive(Clone, Debug)]
 pub struct UserAgent {
    pub application: String,
    pub version: String,
@@ -15,15 +15,12 @@ axum-client-ip.workspace = true
 axum.workspace = true
 bytes = { workspace = true }
 colored.workspace = true
-futures = { workspace = true }
 mime = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json.workspace = true
 serde_yaml = { workspace = true }
-tower = { workspace = true }
 tracing.workspace = true
 utoipa = { workspace = true, optional = true }
-zeroize = { workspace = true }

 [features]
 utoipa = ["dep:utoipa"]
@@ -7,7 +7,7 @@ use axum::Json;
 use bytes::{BufMut, BytesMut};
 use serde::{Deserialize, Serialize};

-pub mod middleware;
+pub mod logging;

 #[derive(Debug, Clone)]
 #[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
@@ -1,5 +1,5 @@
 // Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: GPL-3.0-only

 use axum::extract::Request;
 use axum::http::header::{HOST, USER_AGENT};
@@ -11,7 +11,6 @@ use colored::Colorize;
 use std::time::Instant;
 use tracing::info;

-/// Simple logger for requests
 pub async fn logger(
    InsecureClientIp(addr): InsecureClientIp,
    request: Request,
@@ -1,5 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-pub mod bearer_auth;
-pub mod logging;
@@ -6,6 +6,7 @@ use crate::verloc::sender::{PacketSender, TestedNode};
 use futures::stream::FuturesUnordered;
 use futures::StreamExt;
 use log::*;
+use nym_bin_common::version_checker::{self, parse_version};
 use nym_crypto::asymmetric::identity;
 use nym_network_defaults::mainnet::NYM_API;
 use nym_node_http_api::state::metrics::{SharedVerlocStats, VerlocNodeResult};
@@ -29,6 +30,9 @@ pub(crate) mod measurement;
 pub(crate) mod packet;
 pub(crate) mod sender;

+// TODO: MUST BE UPDATED BEFORE ACTUAL RELEASE!!
+pub const MINIMUM_NODE_VERSION: &str = "0.10.1";
+
 // by default all of those are overwritten by config data from mixnodes directly
 const DEFAULT_VERLOC_PORT: u16 = 1790;
 const DEFAULT_PACKETS_PER_NODE: usize = 100;
@@ -41,6 +45,9 @@ const DEFAULT_RETRY_TIMEOUT: Duration = Duration::from_secs(60 * 30);

 #[derive(Clone, Debug)]
 pub struct Config {
+    /// Minimum semver version of a node (gateway or mixnode) that is capable of replying to echo packets.
+    minimum_compatible_node_version: version_checker::Version,
+
    /// Socket address of this node on which it will be listening for the measurement packets.
    listening_address: SocketAddr,

@@ -84,6 +91,11 @@ impl ConfigBuilder {
        Self::default()
    }

+    pub fn minimum_compatible_node_version(mut self, version: version_checker::Version) -> Self {
+        self.0.minimum_compatible_node_version = version;
+        self
+    }
+
    pub fn listening_address(mut self, listening_address: SocketAddr) -> Self {
        self.0.listening_address = listening_address;
        self
@@ -142,6 +154,7 @@ impl ConfigBuilder {
 impl Default for ConfigBuilder {
    fn default() -> Self {
        ConfigBuilder(Config {
+            minimum_compatible_node_version: parse_version(MINIMUM_NODE_VERSION).unwrap(),
            listening_address: format!("[::]:{DEFAULT_VERLOC_PORT}").parse().unwrap(),
            packets_per_node: DEFAULT_PACKETS_PER_NODE,
            packet_timeout: DEFAULT_PACKET_TIMEOUT,
@@ -11,7 +11,4 @@ rust-version.workspace = true
 readme.workspace = true

 [dependencies]
-anyhow = { workspace = true }
-bincode = { workspace = true }
-nym-crypto = { path = "../crypto", features = ["asymmetric", "serde"] }
 serde = { workspace = true, features = ["derive"] }
@@ -1,101 +1,7 @@
-use nym_crypto::asymmetric::ed25519::{PublicKey, Signature, SignatureError};
 use serde::{Deserialize, Serialize};

-pub mod get_testrun {
-    use super::*;
-    #[derive(Debug, Clone, Deserialize, Serialize)]
-    pub struct Payload {
-        pub agent_public_key: PublicKey,
-        pub timestamp: i64,
-    }
-
-    #[derive(Debug, Clone, Deserialize, Serialize)]
-    pub struct GetTestrunRequest {
-        pub payload: Payload,
-        pub signature: Signature,
-    }
-
-    impl SignedRequest for GetTestrunRequest {
-        type Payload = Payload;
-
-        fn public_key(&self) -> &PublicKey {
-            &self.payload.agent_public_key
-        }
-
-        fn signature(&self) -> &Signature {
-            &self.signature
-        }
-
-        fn payload(&self) -> &Self::Payload {
-            &self.payload
-        }
-    }
-}
-
 #[derive(Debug, Clone, Deserialize, Serialize)]
 pub struct TestrunAssignment {
    pub testrun_id: i64,
-    pub assigned_at_utc: i64,
    pub gateway_identity_key: String,
 }
-
-pub mod submit_results {
-    use super::*;
-    #[derive(Debug, Clone, Deserialize, Serialize)]
-    pub struct Payload {
-        pub probe_result: String,
-        pub agent_public_key: PublicKey,
-        pub assigned_at_utc: i64,
-    }
-
-    #[derive(Debug, Clone, Deserialize, Serialize)]
-    pub struct SubmitResults {
-        pub payload: Payload,
-        pub signature: Signature,
-    }
-
-    impl SignedRequest for SubmitResults {
-        type Payload = Payload;
-
-        fn public_key(&self) -> &PublicKey {
-            &self.payload.agent_public_key
-        }
-
-        fn signature(&self) -> &Signature {
-            &self.signature
-        }
-
-        fn payload(&self) -> &Self::Payload {
-            &self.payload
-        }
-    }
-}
-
-pub trait SignedRequest {
-    type Payload: serde::Serialize;
-
-    fn public_key(&self) -> &PublicKey;
-    fn signature(&self) -> &Signature;
-    fn payload(&self) -> &Self::Payload;
-}
-
-pub trait VerifiableRequest: SignedRequest {
-    type Error: From<bincode::Error> + From<SignatureError>;
-
-    fn verify_signature(&self) -> Result<(), Self::Error> {
-        bincode::serialize(self.payload())
-            .map_err(Self::Error::from)
-            .and_then(|serialized| {
-                self.public_key()
-                    .verify(serialized, self.signature())
-                    .map_err(Self::Error::from)
-            })
-    }
-}
-
-impl<T> VerifiableRequest for T
-where
-    T: SignedRequest,
-{
-    type Error = anyhow::Error;
-}
@@ -157,46 +157,6 @@ impl NymNetworkDetails {
        }
    }

-    #[rustfmt::skip]
-    #[cfg(feature = "env")]
-    pub fn export_to_env(self) {
-        use crate::var_names;
-        use std::env::set_var;
-
-        fn set_optional_var(var_name: &str, value: Option<String>) {
-            if let Some(value) = value {
-                set_var(var_name, value);
-            }
-        }
-
-        set_var(var_names::NETWORK_NAME, self.network_name);
-        set_var(var_names::BECH32_PREFIX, self.chain_details.bech32_account_prefix);
-
-        set_var(var_names::MIX_DENOM, self.chain_details.mix_denom.base);
-        set_var(var_names::MIX_DENOM_DISPLAY, self.chain_details.mix_denom.display);
-
-        set_var(var_names::STAKE_DENOM, self.chain_details.stake_denom.base);
-        set_var(var_names::STAKE_DENOM_DISPLAY, self.chain_details.stake_denom.display);
-
-        set_var(var_names::DENOMS_EXPONENT, self.chain_details.mix_denom.display_exponent.to_string());
-
-        if let Some(e) = self.endpoints.first() {
-            set_var(var_names::NYXD, e.nyxd_url.clone());
-            set_optional_var(var_names::NYM_API, e.api_url.clone());
-            set_optional_var(var_names::NYXD_WEBSOCKET, e.websocket_url.clone());
-        }
-
-        set_optional_var(var_names::MIXNET_CONTRACT_ADDRESS, self.contracts.mixnet_contract_address);
-        set_optional_var(var_names::VESTING_CONTRACT_ADDRESS, self.contracts.vesting_contract_address);
-        set_optional_var(var_names::ECASH_CONTRACT_ADDRESS, self.contracts.ecash_contract_address);
-        set_optional_var(var_names::GROUP_CONTRACT_ADDRESS, self.contracts.group_contract_address);
-        set_optional_var(var_names::MULTISIG_CONTRACT_ADDRESS, self.contracts.multisig_contract_address);
-        set_optional_var(var_names::COCONUT_DKG_CONTRACT_ADDRESS, self.contracts.coconut_dkg_contract_address);
-
-        set_optional_var(var_names::EXPLORER_API, self.explorer_api);
-        set_optional_var(var_names::NYM_VPN_API, self.nym_vpn_api_url);
-    }
-
    pub fn default_gas_price_amount(&self) -> f64 {
        GAS_PRICE_AMOUNT
    }
@@ -29,9 +29,6 @@ pub struct NodeTester<R> {

    packet_size: PacketSize,

-    /// Specify whether route selection should be determined by the packet header.
-    deterministic_route_selection: bool,
-
    /// Average delay a data packet is going to get delay at a single mixnode.
    average_packet_delay: Duration,

@@ -51,13 +48,11 @@ impl<R> NodeTester<R>
 where
    R: Rng + CryptoRng,
 {
-    #[allow(clippy::too_many_arguments)]
    pub fn new(
        rng: R,
        base_topology: NymTopology,
        self_address: Option<Recipient>,
        packet_size: PacketSize,
-        deterministic_route_selection: bool,
        average_packet_delay: Duration,
        average_ack_delay: Duration,
        ack_key: Arc<AckKey>,
@@ -67,7 +62,6 @@ where
            base_topology,
            self_address,
            packet_size,
-            deterministic_route_selection,
            average_packet_delay,
            average_ack_delay,
            num_mix_hops: DEFAULT_NUM_MIX_HOPS,
@@ -295,18 +289,10 @@ where
 impl<R: CryptoRng + Rng> FragmentPreparer for NodeTester<R> {
    type Rng = R;

-    fn deterministic_route_selection(&self) -> bool {
-        self.deterministic_route_selection
-    }
-
    fn rng(&mut self) -> &mut Self::Rng {
        &mut self.rng
    }

-    fn nonce(&self) -> i32 {
-        1
-    }
-
    fn num_mix_hops(&self) -> u8 {
        self.num_mix_hops
    }
@@ -318,4 +304,8 @@ impl<R: CryptoRng + Rng> FragmentPreparer for NodeTester<R> {
    fn average_ack_delay(&self) -> Duration {
        self.average_ack_delay
    }
+
+    fn nonce(&self) -> i32 {
+        1
+    }
 }
@@ -324,6 +324,18 @@ pub fn unchecked_aggregate_indices_signatures(
    _aggregate_indices_signatures(params, vk, signatures_shares, false)
 }

+/// Generates parameters for the scheme setup.
+///
+/// # Arguments
+///
+/// * `total_coins` - it is the number of coins in a freshly generated wallet. It is the public parameter of the scheme.
+///
+/// # Returns
+///
+/// A `Parameters` struct containing group parameters, public key, the number of signatures (`total_coins`),
+/// and a map of signatures for each index `l`.
+///
+
 #[cfg(test)]
 mod tests {
    use super::*;
@@ -264,7 +264,7 @@ impl<'b> Add<&'b VerificationKeyAuth> for VerificationKeyAuth {
    }
 }

-impl Mul<Scalar> for &VerificationKeyAuth {
+impl<'a> Mul<Scalar> for &'a VerificationKeyAuth {
    type Output = VerificationKeyAuth;

    #[inline]
@@ -984,7 +984,7 @@ pub struct SerialNumberRef<'a> {
    pub(crate) inner: &'a [G1Projective],
 }

-impl SerialNumberRef<'_> {
+impl<'a> SerialNumberRef<'a> {
    pub fn to_bytes(&self) -> Vec<u8> {
        let ss_len = self.inner.len();
        let mut bytes: Vec<u8> = Vec::with_capacity(ss_len * 48);
@@ -206,10 +206,10 @@ impl Deref for PublicKey {
    }
 }

-impl<'a> Mul<&'a Scalar> for &PublicKey {
+impl<'a, 'b> Mul<&'b Scalar> for &'a PublicKey {
    type Output = G1Projective;

-    fn mul(self, rhs: &'a Scalar) -> Self::Output {
+    fn mul(self, rhs: &'b Scalar) -> Self::Output {
        self.0 * rhs
    }
 }
@@ -305,7 +305,7 @@ impl<'b> Add<&'b VerificationKey> for VerificationKey {
    }
 }

-impl Mul<Scalar> for &VerificationKey {
+impl<'a> Mul<Scalar> for &'a VerificationKey {
    type Output = VerificationKey;

    #[inline]
@@ -64,7 +64,7 @@ impl<'de> Deserialize<'de> for Recipient {
    {
        struct RecipientVisitor;

-        impl Visitor<'_> for RecipientVisitor {
+        impl<'de> Visitor<'de> for RecipientVisitor {
            type Value = Recipient;

            fn expecting(&self, formatter: &mut Formatter<'_>) -> fmt::Result {
@@ -1,12 +1,6 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-//! Encodoing and decoding node routing information.
-//!
-//! This module is responsible for encoding and decoding node routing information, so that
-//! they could be later put into an appropriate field in a sphinx header.
-//! Currently, that routing information is an IP address, but in principle it can be anything
-//!  for as long as it's going to fit in the field.
 use nym_crypto::asymmetric::identity;
 use nym_sphinx_types::{NodeAddressBytes, NODE_ADDRESS_LENGTH};

@@ -18,6 +12,13 @@ use thiserror::Error;
 pub type NodeIdentity = identity::PublicKey;
 pub const NODE_IDENTITY_SIZE: usize = identity::PUBLIC_KEY_LENGTH;

+/// Encodoing and decoding node routing information.
+///
+/// This module is responsible for encoding and decoding node routing information, so that
+/// they could be later put into an appropriate field in a sphinx header.
+/// Currently, that routing information is an IP address, but in principle it can be anything
+/// for as long as it's going to fit in the field.
+
 /// MAX_UNPADDED_LEN represents maximum length an unpadded address could have.
 /// In this case it's an ipv6 socket address (with version prefix)
 pub const MAX_NODE_ADDRESS_UNPADDED_LEN: usize = 19;
@@ -56,7 +56,7 @@ impl<'de> Deserialize<'de> for ReplySurb {
    {
        struct ReplySurbVisitor;

-        impl Visitor<'_> for ReplySurbVisitor {
+        impl<'de> Visitor<'de> for ReplySurbVisitor {
            type Value = ReplySurb;

            fn expecting(&self, formatter: &mut Formatter<'_>) -> fmt::Result {
@@ -18,7 +18,7 @@ use nym_sphinx_params::{PacketType, ReplySurbKeyDigestAlgorithm, DEFAULT_NUM_MIX
 use nym_sphinx_types::{Delay, NymPacket};
 use nym_topology::{NymTopology, NymTopologyError};
 use rand::{CryptoRng, Rng, SeedableRng};
-use rand_chacha::ChaCha8Rng;
+use rand_chacha::ChaCha20Rng;

 use nym_sphinx_chunking::monitoring;
 use std::time::Duration;
@@ -51,7 +51,6 @@ impl From<PreparedFragment> for MixPacket {
 pub trait FragmentPreparer {
    type Rng: CryptoRng + Rng;

-    fn deterministic_route_selection(&self) -> bool;
    fn rng(&mut self) -> &mut Self::Rng;
    fn nonce(&self) -> i32;
    fn num_mix_hops(&self) -> u8;
@@ -202,7 +201,9 @@ pub trait FragmentPreparer {
        // could perform diffie-hellman with its own keys followed by a kdf to re-derive
        // the packet encryption key

-        let fragment_header = fragment.header();
+        let seed = fragment.seed().wrapping_mul(self.nonce());
+        let mut rng = ChaCha20Rng::seed_from_u64(seed as u64);
+
        let destination = packet_recipient.gateway();
        let hops = mix_hops.unwrap_or(self.num_mix_hops());
        monitoring::fragment_sent(&fragment, self.nonce(), *destination, hops);
@@ -240,18 +241,8 @@ pub trait FragmentPreparer {
        };

        // generate pseudorandom route for the packet
-        log::trace!("Preparing chunk for sending with {hops} mix hops");
-        let route = if self.deterministic_route_selection() {
-            log::trace!("using deterministic route selection");
-            let seed = fragment_header.seed().wrapping_mul(self.nonce());
-            let mut rng = ChaCha8Rng::seed_from_u64(seed as u64);
-            topology.random_route_to_gateway(&mut rng, hops, destination)?
-        } else {
-            log::trace!("using pseudorandom route selection");
-            let mut rng = self.rng();
-            topology.random_route_to_gateway(&mut rng, hops, destination)?
-        };
-
+        log::trace!("Preparing chunk for sending with {} mix hops", hops);
+        let route = topology.random_route_to_gateway(&mut rng, hops, destination)?;
        let destination = packet_recipient.as_sphinx_destination();

        // including set of delays
@@ -322,9 +313,6 @@ pub struct MessagePreparer<R> {
    /// Instance of a cryptographically secure random number generator.
    rng: R,

-    /// Specify whether route selection should be determined by the packet header.
-    deterministic_route_selection: bool,
-
    /// Address of this client which also represent an address to which all acknowledgements
    /// and surb-based are going to be sent.
    sender_address: Recipient,
@@ -348,7 +336,6 @@ where
 {
    pub fn new(
        rng: R,
-        deterministic_route_selection: bool,
        sender_address: Recipient,
        average_packet_delay: Duration,
        average_ack_delay: Duration,
@@ -357,7 +344,6 @@ where
        let nonce = rng.gen();
        MessagePreparer {
            rng,
-            deterministic_route_selection,
            sender_address,
            average_packet_delay,
            average_ack_delay,
@@ -471,18 +457,10 @@ where
 impl<R: CryptoRng + Rng> FragmentPreparer for MessagePreparer<R> {
    type Rng = R;

-    fn deterministic_route_selection(&self) -> bool {
-        self.deterministic_route_selection
-    }
-
    fn rng(&mut self) -> &mut Self::Rng {
        &mut self.rng
    }

-    fn nonce(&self) -> i32 {
-        self.nonce
-    }
-
    fn num_mix_hops(&self) -> u8 {
        self.num_mix_hops
    }
@@ -494,6 +472,10 @@ impl<R: CryptoRng + Rng> FragmentPreparer for MessagePreparer<R> {
    fn average_ack_delay(&self) -> Duration {
        self.average_ack_delay
    }
+
+    fn nonce(&self) -> i32 {
+        self.nonce
+    }
 }

 /*
@@ -3,7 +3,7 @@

 use serde::{Deserialize, Serialize};

-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, Serialize, Deserialize)]
 #[repr(u8)]
 pub enum ServiceProviderType {
    NetworkRequester = 0,
@@ -253,15 +253,25 @@ impl Socks5RequestContent {
    /// Deserialize the request type, connection id, destination address and port,
    /// and the request body from bytes.
    ///
+    // TODO: this was already inaccurate
+    // /// Serialized bytes looks like this:
+    // ///
+    // /// --------------------------------------------------------------------------------------
+    // ///  request_flag | connection_id | address_length | remote_address_bytes | request_data |
+    // ///        1      |       8       |      2         |    address_length    |    ...       |
+    // /// --------------------------------------------------------------------------------------
+    ///
    /// The request_flag tells us whether this is a new connection request (`new_connect`),
    /// an already-established connection we should send up (`new_send`), or
    /// a request to close an established connection (`new_close`).
+
    // connect:
    // RequestFlag::Connect || CONN_ID || ADDR_LEN || ADDR || <RETURN_ADDR>
    //
    // send:
    // RequestFlag::Send || CONN_ID || LOCAL_CLOSED || DATA
    // where DATA: SEQ || TRUE_DATA
+
    pub fn try_from_bytes(b: &[u8]) -> Result<Socks5RequestContent, RequestDeserializationError> {
        // each request needs to at least contain flag and ConnectionId
        if b.is_empty() {
@@ -95,7 +95,6 @@ impl ClientStatsController {
            gateway_conn_stats: self.gateway_conn_stats.report(),
            nym_api_stats: self.nym_api_stats.report(),
            connection_stats: self.connection_stats.report(),
-            ..Default::default()
        }
    }

@@ -12,14 +12,9 @@ use serde::{Deserialize, Serialize};
 use sysinfo::System;
 use time::OffsetDateTime;

-const KIND: &str = "client_stats_report";
-const VERSION: &str = "v1";
-
 /// Report object containing both data to be reported and client / device context. We take extra care not to overcapture context information.
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct ClientStatsReport {
-    pub(crate) kind: String,
-    pub(crate) api_version: String,
    pub(crate) last_update_time: OffsetDateTime,
    pub(crate) client_id: String,
    pub(crate) client_type: String,
@@ -46,23 +41,6 @@ impl TryFrom<&[u8]> for ClientStatsReport {
    }
 }

-impl Default for ClientStatsReport {
-    fn default() -> Self {
-        ClientStatsReport {
-            kind: KIND.to_string(),
-            api_version: VERSION.to_string(),
-            last_update_time: OffsetDateTime::now_utc(),
-            client_id: Default::default(),
-            client_type: Default::default(),
-            os_information: Default::default(),
-            packet_stats: Default::default(),
-            gateway_conn_stats: Default::default(),
-            nym_api_stats: Default::default(),
-            connection_stats: Default::default(),
-        }
-    }
-}
-
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct OsInformation {
    pub(crate) os_type: String,
@@ -0,0 +1,55 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use nym_bin_common::version_checker;
+use std::collections::{BTreeMap, HashMap};
+use std::hash::Hash;
+
+pub trait Versioned: Clone {
+    fn version(&self) -> String;
+}
+
+pub trait VersionFilterable<T> {
+    #[must_use]
+    fn filter_by_version(&self, expected_version: &str) -> Self;
+}
+
+impl<T> VersionFilterable<T> for Vec<T>
+where
+    T: Versioned,
+{
+    fn filter_by_version(&self, expected_version: &str) -> Self {
+        self.iter()
+            .filter(|node| {
+                version_checker::is_minor_version_compatible(&node.version(), expected_version)
+            })
+            .cloned()
+            .collect()
+    }
+}
+
+impl<T, K, V> VersionFilterable<T> for HashMap<K, V>
+where
+    K: Eq + Hash + Clone,
+    V: VersionFilterable<T>,
+    T: Versioned,
+{
+    fn filter_by_version(&self, expected_version: &str) -> Self {
+        self.iter()
+            .map(|(k, v)| (k.clone(), v.filter_by_version(expected_version)))
+            .collect()
+    }
+}
+
+impl<T, K, V> VersionFilterable<T> for BTreeMap<K, V>
+where
+    K: Eq + Ord + Clone,
+    V: VersionFilterable<T>,
+    T: Versioned,
+{
+    fn filter_by_version(&self, expected_version: &str) -> Self {
+        self.iter()
+            .map(|(k, v)| (k.clone(), v.filter_by_version(expected_version)))
+            .collect()
+    }
+}
@@ -1,7 +1,7 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::{NetworkAddress, NodeVersion};
+use crate::{filter, NetworkAddress, NodeVersion};
 use nym_api_requests::nym_nodes::SkimmedNode;
 use nym_crypto::asymmetric::{encryption, identity};
 use nym_mixnet_contract_common::NodeId;
@@ -126,6 +126,13 @@ impl fmt::Display for LegacyNode {
    }
 }

+impl filter::Versioned for LegacyNode {
+    fn version(&self) -> String {
+        // TODO: return semver instead
+        self.version.to_string()
+    }
+}
+
 impl<'a> From<&'a LegacyNode> for SphinxNode {
    fn from(node: &'a LegacyNode) -> Self {
        let node_address_bytes = NymNodeRoutingAddress::from(node.mix_host)
--- a/Show More
+++ b/Show More