sandbox nyx rest api

spacing + working openapi local for nymapi
Move ecash schema out of ecash crate
2024-12-18 14:34:06 +01:00 · 2024-12-18 14:29:28 +01:00 · 2024-12-18 13:23:17 +01:00 · 2024-12-16 19:08:53 +01:00 · 2024-12-16 13:47:04 +01:00 · 2024-12-16 13:46:43 +01:00
255 changed files with 9582 additions and 4482 deletions
@@ -0,0 +1 @@
+nym-validator-rewarder/.sqlx/** diff=nodiff
@@ -30,7 +30,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [ arc-ubuntu-20.04, custom-windows-11, custom-runner-mac-m1 ]
+        os: [ arc-ubuntu-20.04, custom-runner-mac-m1 ]
    runs-on: ${{ matrix.os }}
    env:
      CARGO_TERM_COLOR: always
@@ -51,6 +51,4 @@ ppa-private-key.b64
 ppa-private-key.asc
 nym-network-monitor/topology.json
 nym-network-monitor/__pycache__
-nym-network-monitor/*.key
-nym-network-monitor/.envrc
-nym-network-monitor/.envrc
+nym-network-monitor/*.key
@@ -0,0 +1,49 @@
+# This file instructs Redocly's linter to ignore the rules contained for specific parts of your API.
+# See https://redocly.com/docs/cli/ for more information.
+formatted-openapi.json:
+  path-parameters-defined:
+    # - >-
+    #   #/paths/~1v1~1status~1mixnode~1{mix_id}~1compute-reward-estimation/post/parameters/0/name
+    # - >-
+    #   #/paths/~1v1~1status~1mixnode~1{mix_id}~1compute-reward-estimation/post/parameters/1/name
+    # - >-
+    #   #/paths/~1v1~1status~1mixnode~1{mix_id}~1compute-reward-estimation/post/parameters/2/name
+    # - >-
+    #   #/paths/~1v1~1status~1mixnode~1{mix_id}~1compute-reward-estimation/post/parameters/3/name
+    # - >-
+    #   #/paths/~1v1~1status~1mixnode~1{mix_id}~1compute-reward-estimation/post/parameters/4/name
+    # - >-
+    #   #/paths/~1v1~1status~1mixnode~1{mix_id}~1compute-reward-estimation/post/parameters/5/name
+    # - '#/paths/~1v1~1unstable~1nym-nodes~1skimmed~1active/get/parameters/0/name'
+    # - '#/paths/~1v1~1unstable~1nym-nodes~1skimmed~1active/get/parameters/1/name'
+    # - '#/paths/~1v1~1unstable~1nym-nodes~1skimmed~1active/get/parameters/2/name'
+    # - '#/paths/~1v1~1unstable~1nym-nodes~1skimmed~1active/get/parameters/3/name'
+  operation-operationId-unique:
+    - >-
+      #/paths/~1v1~1status~1mixnodes~1active~1detailed/get/get_active_set_detailed
+    - '#/paths/~1v1~1status~1mixnodes~1detailed/get/get_mixnodes_detailed'
+    - >-
+      #/paths/~1v1~1status~1mixnodes~1rewarded~1detailed/get/get_rewarded_set_detailed
+  no-unused-components:
+    - '#/components/schemas/AxumErrorResponse'
+    - '#/components/schemas/DateQuery'
+    - '#/components/schemas/EcashTicketVerificationRejection'
+    - '#/components/schemas/ExpirationDatePathParam'
+    - '#/components/schemas/FullFatNode'
+    - '#/components/schemas/HistoricalPerformanceResponse'
+    - '#/components/schemas/HistoricalUptimeResponse'
+    - '#/components/schemas/MasterVerificationKeyResponse'
+    - '#/components/schemas/MixnodeStatusReport'
+    - '#/components/schemas/NodeId'
+    - '#/components/schemas/NodeRoleQueryParam'
+    - '#/components/schemas/NoiseDetails'
+    - '#/components/schemas/NymNodeDescription'
+    - '#/components/schemas/NymNodeDetails'
+    - '#/components/schemas/PaginationRequest'
+    - '#/components/schemas/PartialCoinIndicesSignatureResponse'
+    - '#/components/schemas/SpentCredentialsResponse'
+    - '#/components/schemas/UptimeHistoryResponse'
+    - '#/components/schemas/VerifyEcashCredentialBody'
+    - '#/components/responses/AxumErrorResponse'
+    - '#/components/responses/CirculatingSupplyResponse'
+    - '#/components/responses/RequestError'
@@ -0,0 +1,83 @@
+extends:
+  - minimal
+apis:
+  nym-api:
+    root: ./formatted-openapi.json
+rules:
+  # https://redocly.com/docs/cli/rules/oas/operation-summary
+  operation-summary: off
+  # https://redocly.com/docs/cli/rules/oas/security-defined
+  security-defined: off
+  struct: off
+  # https://redocly.com/docs/cli/rules/oas/operation-2xx-response
+  operation-2xx-response: off
+# rules:
+#   skip-warnings: true
+  # ignore:
+  # - path: /v1/gateways
+  #   method: get
+  # - path: /v1/gateways/blacklisted
+  #   method: get
+  # - path: /v1/mixnodes
+  #   method: get
+  # - path: /v1/mixnodes/active
+  #   method: get
+  # - path: /v1/mixnodes/active/detailed
+  #   method: get
+  # - path: /v1/mixnodes/blacklisted
+  #   method: get
+  # - path: /v1/mixnodes/detailed
+  #   method: get
+  # - path: /v1/mixnodes/rewarded
+  #   method: get
+  # - path: /v1/mixnodes/rewarded/detailed
+  #   method: get
+  # - path: /v1/gateways/described
+  #   method: get
+  # # network-monitor-status (deprecated)
+  # - path: /v1/status/gateway/{identity}/avg_uptime
+  #   method: GET
+  # - path: /v1/status/gateway/{identity}/core-status-count
+  #   method: GET
+  # - path: /v1/status/gateway/{identity}/history
+  #   method: GET
+  # - path: /v1/status/gateway/{identity}/report
+  #   method: GET
+  # - path: /v1/status/gateways/detailed
+  #   method: GET
+  # - path: /v1/status/gateways/detailed-unfiltered
+  #   method: GET
+  # - path: /v1/status/mixnode/{mix_id}/avg_uptime
+  #   method: GET
+  # - path: /v1/status/mixnode/{mix_id}/compute-reward-estimation
+  #   method: POST
+  # - path: /v1/status/mixnode/{mix_id}/core-status-count
+  #   method: GET
+  # - path: /v1/status/mixnode/{mix_id}/history
+  #   method: GET
+  # - path: /v1/status/mixnode/{mix_id}/report
+  #   method: GET
+  # - path: /v1/status/mixnode/{mix_id}/reward-estimation
+  #   method: GET
+  # - path: /v1/status/mixnodes/detailed-unfiltered
+  #   method: GET
+  # # status
+  # - path: /v1/status/mixnode/{mix_id}/inclusion-probability
+  #   method: GET
+  # - path: /v1/status/mixnode/{mix_id}/stake-saturation
+  #   method: GET
+  # - path: /v1/status/mixnode/{mix_id}/status
+  #   method: GET
+  # - path: /v1/status/mixnodes/active/detailed
+  #   method: GET
+  # - path: /v1/status/mixnodes/detailed
+  #   method: GET
+  # - path: /v1/status/mixnodes/inclusion-probability
+  #   method: GET
+  # - path: /v1/status/mixnodes/rewarded/detailed
+  #   method: GET
+  # # unstable nym nodes
+  # - path: /v1/unstable/nym-nodes/gateways/skimmed
+  #   method: get
+  # - path: /v1/unstable/nym-nodes/mixnodes/skimmed
+  #   method: get
@@ -4,91 +4,6 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://

 ## [Unreleased]

-## [2025.1-reeses] (2025-01-15)
-
- Feture/legacy alert ([#5346])
- chore: readjusted --mode behaviour to fix the regression ([#5331])
- chore: apply 1.84 linter suggestions ([#5330])
- bugfix: make sure refresh data key matches bond info ([#5329])
- reduce log severity for number of packets being delayed ([#5321])
- feat: warn users if node is run in exit mode only ([#5320])
- Bugfix/contract version assignment ([#5318])
- fixed client session histogram buckets ([#5316])
- amend 250gb limit ([#5313])
- feature: expand nym-node prometheus metrics ([#5298])
- Cherry picked #5286 ([#5287])
- Add close to credential storage ([#5283])
- feature: wireguard metrics ([#5278])
- Add PATCH support to nym-http-api-client ([#5260])
- chore: removed legacy socks5 listener ([#5259])
- bugfix: make sure to apply gateway score filtering when choosing initial node ([#5256])
- Update TS bindings ([#5255])
- Add conversion unit tests for auth msg ([#5251])
- Add control messages to GatewayTransciver ([#5247])
- Remove unneeded async function annotation ([#5246])
- bugfix: make sure to update timestamp of last batch verification to prevent double redemption ([#5239])
- Add FromStr impl for UserAgent ([#5236])
- Extend swagger docs ([#5235])
- TicketType derive Hash and Eq ([#5233])
- Add fd callback to client core ([#5230])
- Extend raw ws fd for gateway client ([#5218])
- Shipping raw metrics to PG ([#5216])
- Change sqlite journal mode to WAL ([#5213])
- Derive serialize for UserAgent ([#5210])
- Restore Location fields ([#5208])
- better date serialization ([#5207])
- Fix overflow ([#5204])
- feature: hopefully final steps of the smoosh™️ ([#5201])
- Fix overflow ([#5184])
- NS API - Gateway stats scraping ([#5180])
- introduced initial internal commands for nym-cli: ecash key and request generation ([#5174])
- Move NS client to separate package under NS API ([#5171])
- build(deps): bump micromatch from 4.0.4 to 4.0.8 in /testnet-faucet ([#4813])
-
-[#5346]: https://github.com/nymtech/nym/pull/5346
-[#5331]: https://github.com/nymtech/nym/pull/5331
-[#5330]: https://github.com/nymtech/nym/pull/5330
-[#5329]: https://github.com/nymtech/nym/pull/5329
-[#5321]: https://github.com/nymtech/nym/pull/5321
-[#5320]: https://github.com/nymtech/nym/pull/5320
-[#5318]: https://github.com/nymtech/nym/pull/5318
-[#5316]: https://github.com/nymtech/nym/pull/5316
-[#5313]: https://github.com/nymtech/nym/pull/5313
-[#5298]: https://github.com/nymtech/nym/pull/5298
-[#5287]: https://github.com/nymtech/nym/pull/5287
-[#5283]: https://github.com/nymtech/nym/pull/5283
-[#5278]: https://github.com/nymtech/nym/pull/5278
-[#5260]: https://github.com/nymtech/nym/pull/5260
-[#5259]: https://github.com/nymtech/nym/pull/5259
-[#5256]: https://github.com/nymtech/nym/pull/5256
-[#5255]: https://github.com/nymtech/nym/pull/5255
-[#5251]: https://github.com/nymtech/nym/pull/5251
-[#5247]: https://github.com/nymtech/nym/pull/5247
-[#5246]: https://github.com/nymtech/nym/pull/5246
-[#5239]: https://github.com/nymtech/nym/pull/5239
-[#5236]: https://github.com/nymtech/nym/pull/5236
-[#5235]: https://github.com/nymtech/nym/pull/5235
-[#5233]: https://github.com/nymtech/nym/pull/5233
-[#5230]: https://github.com/nymtech/nym/pull/5230
-[#5218]: https://github.com/nymtech/nym/pull/5218
-[#5216]: https://github.com/nymtech/nym/pull/5216
-[#5213]: https://github.com/nymtech/nym/pull/5213
-[#5210]: https://github.com/nymtech/nym/pull/5210
-[#5208]: https://github.com/nymtech/nym/pull/5208
-[#5207]: https://github.com/nymtech/nym/pull/5207
-[#5204]: https://github.com/nymtech/nym/pull/5204
-[#5201]: https://github.com/nymtech/nym/pull/5201
-[#5184]: https://github.com/nymtech/nym/pull/5184
-[#5180]: https://github.com/nymtech/nym/pull/5180
-[#5174]: https://github.com/nymtech/nym/pull/5174
-[#5171]: https://github.com/nymtech/nym/pull/5171
-[#4813]: https://github.com/nymtech/nym/pull/4813
-
-## [2024.14-crunch-patched] (2024-12-17)
-
- Fixes an issue to allow previously registred clients to connect to latest nym-nodes
- Fixes compatibility issues between nym-nodes and older clients
-
 ## [2024.14-crunch] (2024-12-11)

 - Merge/release/2024.14-crunch ([#5242])
@@ -2416,7 +2416,7 @@ dependencies = [

 [[package]]
 name = "explorer-api"
-version = "1.1.44"
+version = "1.1.43"
 dependencies = [
 "chrono",
 "clap 4.5.20",
@@ -2475,17 +2475,11 @@ dependencies = [
 "once_cell",
 ]

-[[package]]
-name = "fallible-iterator"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
-
 [[package]]
 name = "fancy_constructor"
-version = "1.3.0"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07b19d0e43eae2bfbafe4931b5e79c73fb1a849ca15cd41a761a7b8587f9a1a2"
+checksum = "f71f317e4af73b2f8f608fac190c52eac4b1879d2145df1db2fe48881ca69435"
 dependencies = [
 "macroific",
 "proc-macro2",
@@ -2846,15 +2840,15 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"

 [[package]]
 name = "gloo-net"
-version = "0.6.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06f627b1a58ca3d42b45d6104bf1e1a03799df472df00988b6ba21accc10580"
+checksum = "43aaa242d1239a8822c15c645f02166398da4f8b5c4bae795c1f5b44e9eee173"
 dependencies = [
 "futures-channel",
 "futures-core",
 "futures-sink",
 "gloo-utils 0.2.0",
- "http 1.1.0",
+ "http 0.2.12",
 "js-sys",
 "pin-project",
 "serde",
@@ -3432,8 +3426,7 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
 [[package]]
 name = "indexed_db_futures"
 version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0704b71f13f81b5933d791abf2de26b33c40935143985220299a357721166706"
+source = "git+https://github.com/TiemenSch/rust-indexed-db?branch=update-uuid#9745d015707008b0c410115d787014a6d1af2efb"
 dependencies = [
 "accessory",
 "cfg-if",
@@ -3671,11 +3664,10 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"

 [[package]]
 name = "js-sys"
-version = "0.3.76"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7"
+checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
 dependencies = [
- "once_cell",
 "wasm-bindgen",
 ]

@@ -3838,6 +3830,12 @@ dependencies = [
 "scopeguard",
 ]

+[[package]]
+name = "lockfree-object-pool"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e"
+
 [[package]]
 name = "log"
 version = "0.4.22"
@@ -4357,27 +4355,6 @@ dependencies = [
 "libc",
 ]

-[[package]]
-name = "num_enum"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179"
-dependencies = [
- "num_enum_derive",
-]
-
-[[package]]
-name = "num_enum_derive"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn 2.0.90",
-]
-
 [[package]]
 name = "num_threads"
 version = "0.1.7"
@@ -4395,7 +4372,7 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"

 [[package]]
 name = "nym-api"
-version = "1.1.48"
+version = "1.1.47"
 dependencies = [
 "anyhow",
 "async-trait",
@@ -4644,7 +4621,7 @@ dependencies = [

 [[package]]
 name = "nym-cli"
-version = "1.1.46"
+version = "1.1.45"
 dependencies = [
 "anyhow",
 "base64 0.22.1",
@@ -4727,7 +4704,7 @@ dependencies = [

 [[package]]
 name = "nym-client"
-version = "1.1.46"
+version = "1.1.45"
 dependencies = [
 "bs58",
 "clap 4.5.20",
@@ -4974,6 +4951,7 @@ dependencies = [
 "sha2 0.9.9",
 "subtle 2.5.0",
 "thiserror",
+ "utoipa",
 "zeroize",
 ]

@@ -5002,6 +4980,7 @@ dependencies = [
 "serde",
 "serde_json",
 "thiserror",
+ "utoipa",
 "vergen",
 ]

@@ -5193,6 +5172,7 @@ dependencies = [
 "strum 0.26.3",
 "thiserror",
 "time",
+ "utoipa",
 ]

 [[package]]
@@ -5681,20 +5661,18 @@ version = "0.1.0"
 dependencies = [
 "dashmap",
 "lazy_static",
+ "log",
 "prometheus",
- "tracing",
 ]

 [[package]]
 name = "nym-mixnet-client"
 version = "0.1.0"
 dependencies = [
- "dashmap",
 "futures",
 "nym-sphinx",
 "nym-task",
 "tokio",
- "tokio-stream",
 "tokio-util",
 "tracing",
 ]
@@ -5792,7 +5770,6 @@ dependencies = [
 "nym-bin-common",
 "nym-client-core",
 "nym-crypto",
- "nym-gateway-requests",
 "nym-network-defaults",
 "nym-sdk",
 "nym-sphinx",
@@ -5806,7 +5783,6 @@ dependencies = [
 "serde",
 "serde_json",
 "tokio",
- "tokio-postgres",
 "tokio-util",
 "utoipa",
 "utoipa-swagger-ui",
@@ -5814,7 +5790,7 @@ dependencies = [

 [[package]]
 name = "nym-network-requester"
-version = "1.1.47"
+version = "1.1.46"
 dependencies = [
 "addr",
 "anyhow",
@@ -5865,7 +5841,7 @@ dependencies = [

 [[package]]
 name = "nym-node"
-version = "1.3.0"
+version = "1.2.0"
 dependencies = [
 "anyhow",
 "async-trait",
@@ -6237,7 +6213,7 @@ dependencies = [

 [[package]]
 name = "nym-socks5-client"
-version = "1.1.46"
+version = "1.1.45"
 dependencies = [
 "bs58",
 "clap 4.5.20",
@@ -6556,6 +6532,7 @@ dependencies = [
 "serde_json",
 "sha2 0.10.8",
 "time",
+ "utoipa",
 ]

 [[package]]
@@ -6622,6 +6599,7 @@ dependencies = [
 "thiserror",
 "ts-rs",
 "url",
+ "utoipa",
 "x25519-dalek",
 ]

@@ -6811,7 +6789,6 @@ dependencies = [
 "nym-crypto",
 "nym-gateway-storage",
 "nym-network-defaults",
- "nym-node-metrics",
 "nym-task",
 "nym-wireguard-types",
 "thiserror",
@@ -6839,7 +6816,7 @@ dependencies = [

 [[package]]
 name = "nymvisor"
-version = "0.1.11"
+version = "0.1.10"
 dependencies = [
 "anyhow",
 "bytes",
@@ -7263,24 +7240,6 @@ dependencies = [
 "indexmap 2.2.6",
 ]

-[[package]]
-name = "phf"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
-dependencies = [
- "phf_shared",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
-dependencies = [
- "siphasher 0.3.11",
-]
-
 [[package]]
 name = "pin-project"
 version = "1.1.6"
@@ -7419,35 +7378,6 @@ version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"

-[[package]]
-name = "postgres-protocol"
-version = "0.6.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acda0ebdebc28befa84bee35e651e4c5f09073d668c7aed4cf7e23c3cda84b23"
-dependencies = [
- "base64 0.22.1",
- "byteorder",
- "bytes",
- "fallible-iterator",
- "hmac",
- "md-5",
- "memchr",
- "rand",
- "sha2 0.10.8",
- "stringprep",
-]
-
-[[package]]
-name = "postgres-types"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f66ea23a2d0e5734297357705193335e0a957696f34bed2f2faefacb2fec336f"
-dependencies = [
- "bytes",
- "fallible-iterator",
- "postgres-protocol",
-]
-
 [[package]]
 name = "powerfmt"
 version = "0.2.0"
@@ -7480,39 +7410,6 @@ dependencies = [
 "log",
 ]

-[[package]]
-name = "proc-macro-crate"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
-dependencies = [
- "toml_edit 0.21.1",
-]
-
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
-
 [[package]]
 name = "proc-macro-error-attr2"
 version = "2.0.0"
@@ -7944,7 +7841,6 @@ checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10"
 dependencies = [
 "base64 0.22.1",
 "bytes",
- "futures-channel",
 "futures-core",
 "futures-util",
 "http 1.1.0",
@@ -8870,6 +8766,12 @@ dependencies = [
 "rand_core 0.6.4",
 ]

+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
 [[package]]
 name = "siphasher"
 version = "0.3.11"
@@ -9782,32 +9684,6 @@ dependencies = [
 "syn 2.0.90",
 ]

-[[package]]
-name = "tokio-postgres"
-version = "0.7.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b5d3742945bc7d7f210693b0c58ae542c6fd47b17adbbda0885f3dcb34a6bdb"
-dependencies = [
- "async-trait",
- "byteorder",
- "bytes",
- "fallible-iterator",
- "futures-channel",
- "futures-util",
- "log",
- "parking_lot",
- "percent-encoding",
- "phf",
- "pin-project-lite",
- "postgres-protocol",
- "postgres-types",
- "rand",
- "socket2",
- "tokio",
- "tokio-util",
- "whoami",
-]
-
 [[package]]
 name = "tokio-rustls"
 version = "0.24.1"
@@ -9927,7 +9803,7 @@ dependencies = [
 "serde",
 "serde_spanned",
 "toml_datetime",
- "toml_edit 0.22.14",
+ "toml_edit",
 ]

 [[package]]
@@ -9939,17 +9815,6 @@ dependencies = [
 "serde",
 ]

-[[package]]
-name = "toml_edit"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
-dependencies = [
- "indexmap 2.2.6",
- "toml_datetime",
- "winnow 0.5.40",
-]
-
 [[package]]
 name = "toml_edit"
 version = "0.22.14"
@@ -9960,7 +9825,7 @@ dependencies = [
 "serde",
 "serde_spanned",
 "toml_datetime",
- "winnow 0.6.13",
+ "winnow",
 ]

 [[package]]
@@ -10607,9 +10472,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"

 [[package]]
 name = "utoipa"
-version = "4.2.3"
+version = "5.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5afb1a60e207dca502682537fefcfd9921e71d0b83e9576060f09abc6efab23"
+checksum = "514a48569e4e21c86d0b84b5612b5e73c0b2cf09db63260134ba426d4e8ea714"
 dependencies = [
 "indexmap 2.2.6",
 "serde",
@@ -10619,11 +10484,10 @@ dependencies = [

 [[package]]
 name = "utoipa-gen"
-version = "4.3.0"
+version = "5.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bf0e16c02bc4bf5322ab65f10ab1149bdbcaa782cba66dc7057370a3f8190be"
+checksum = "5629efe65599d0ccd5d493688cbf6e03aa7c1da07fe59ff97cf5977ed0637f66"
 dependencies = [
- "proc-macro-error",
 "proc-macro2",
 "quote",
 "regex",
@@ -10633,14 +10497,13 @@ dependencies = [

 [[package]]
 name = "utoipa-swagger-ui"
-version = "7.1.0"
+version = "8.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "943e0ff606c6d57d410fd5663a4d7c074ab2c5f14ab903b9514565e59fa1189e"
+checksum = "a5c80b4dd79ea382e8374d67dcce22b5c6663fa13a82ad3886441d1bbede5e35"
 dependencies = [
 "axum 0.7.7",
 "mime_guess",
 "regex",
- "reqwest 0.12.4",
 "rust-embed",
 "serde",
 "serde_json",
@@ -10651,18 +10514,18 @@ dependencies = [

 [[package]]
 name = "utoipauto"
-version = "0.1.14"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608b8f2279483be386261655b562e40877ea434eb92093c894a644fda2021860"
+checksum = "cba36db2c397c614110554a60fbb4bb97d5f8c6823775c766e6f455e37377047"
 dependencies = [
 "utoipauto-macro",
 ]

 [[package]]
 name = "utoipauto-core"
-version = "0.1.12"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17e82ab96c5a55263b5bed151b8426410d93aa909a453acdbd4b6792b5af7d64"
+checksum = "268d76aaebb80eba79240b805972e52d7d410d4bcc52321b951318b0f440cd60"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -10671,9 +10534,9 @@ dependencies = [

 [[package]]
 name = "utoipauto-macro"
-version = "0.1.12"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b8338dc3c9526011ffaa2aa6bd60ddfda9d49d2123108690755c6e34844212"
+checksum = "382673bda1d05c85b4550d32fd4192ccd4cffe9a908543a0795d1e7682b36246"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -10764,9 +10627,9 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"

 [[package]]
 name = "wasm-bindgen"
-version = "0.2.99"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396"
+checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
 dependencies = [
 "cfg-if",
 "once_cell",
@@ -10775,12 +10638,13 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.99"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
+checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
 dependencies = [
 "bumpalo",
 "log",
+ "once_cell",
 "proc-macro2",
 "quote",
 "syn 2.0.90",
@@ -10789,22 +10653,21 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.49"
+version = "0.4.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2"
+checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b"
 dependencies = [
 "cfg-if",
 "js-sys",
- "once_cell",
 "wasm-bindgen",
 "web-sys",
 ]

 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.99"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe"
+checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
 dependencies = [
 "quote",
 "wasm-bindgen-macro-support",
@@ -10812,9 +10675,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.99"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
+checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -10825,9 +10688,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.99"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
+checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"

 [[package]]
 name = "wasm-bindgen-test"
@@ -10935,9 +10798,9 @@ dependencies = [

 [[package]]
 name = "wasmtimer"
-version = "0.4.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0048ad49a55b9deb3953841fa1fc5858f0efbcb7a18868c899a360269fac1b23"
+checksum = "5f656cd8858a5164932d8a90f936700860976ec21eb00e0fe2aa8cab13f6b4cf"
 dependencies = [
 "futures",
 "js-sys",
@@ -10949,9 +10812,9 @@ dependencies = [

 [[package]]
 name = "web-sys"
-version = "0.3.76"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc"
+checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112"
 dependencies = [
 "js-sys",
 "wasm-bindgen",
@@ -10998,7 +10861,6 @@ checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d"
 dependencies = [
 "redox_syscall 0.5.1",
 "wasite",
- "web-sys",
 ]

 [[package]]
@@ -11265,15 +11127,6 @@ version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"

-[[package]]
-name = "winnow"
-version = "0.5.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "winnow"
 version = "0.6.13"
@@ -11386,9 +11239,9 @@ dependencies = [

 [[package]]
 name = "zip"
-version = "1.1.4"
+version = "2.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cc23c04387f4da0374be4533ad1208cbb091d5c11d070dfef13676ad6497164"
+checksum = "40dd8c92efc296286ce1fbd16657c5dbefff44f1b4ca01cc5f517d8b7b3d3e2e"
 dependencies = [
 "arbitrary",
 "crc32fast",
@@ -11396,8 +11249,9 @@ dependencies = [
 "displaydoc",
 "flate2",
 "indexmap 2.2.6",
- "num_enum",
+ "memchr",
 "thiserror",
+ "zopfli",
 ]

 [[package]]
@@ -11427,3 +11281,17 @@ dependencies = [
 "wasmtimer",
 "zeroize",
 ]
+
+[[package]]
+name = "zopfli"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946"
+dependencies = [
+ "bumpalo",
+ "crc32fast",
+ "lockfree-object-pool",
+ "log",
+ "once_cell",
+ "simd-adler32",
+]
@@ -345,9 +345,9 @@ tracing-log = "0.2"
 ts-rs = "10.0.0"
 tungstenite = { version = "0.20.1", default-features = false }
 url = "2.5"
-utoipa = "4.2"
-utoipa-swagger-ui = "7.1"
-utoipauto = "0.1"
+utoipa = "5.2"
+utoipa-swagger-ui = "8.0"
+utoipauto = "0.2"
 uuid = "*"
 vergen = { version = "=8.3.1", default-features = false }
 walkdir = "2"
@@ -394,17 +394,19 @@ prost = { version = "0.12", default-features = false }

 # wasm-related dependencies
 gloo-utils = "0.2.0"
-gloo-net = "0.6.0"
+gloo-net = "0.5.0"

-# TODO: migrate to 0.6+
-indexed_db_futures = "0.4.2"
-js-sys = "0.3.76"
+# use a separate branch due to feature unification failures
+# this is blocked until the upstream removes outdates `wasm_bindgen` feature usage
+# indexed_db_futures = "0.4.1"
+indexed_db_futures = { git = "https://github.com/TiemenSch/rust-indexed-db", branch = "update-uuid" }
+js-sys = "0.3.70"
 serde-wasm-bindgen = "0.6.5"
 tsify = "0.4.5"
-wasm-bindgen = "0.2.99"
-wasm-bindgen-futures = "0.4.49"
-wasmtimer = "0.4.1"
-web-sys = "0.3.76"
+wasm-bindgen = "0.2.95"
+wasm-bindgen-futures = "0.4.45"
+wasmtimer = "0.2.0"
+web-sys = "0.3.72"

 # Profile settings for individual crates

@@ -1,6 +1,6 @@
 [package]
 name = "nym-client"
-version = "1.1.46"
+version = "1.1.45"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 description = "Implementation of the Nym Client"
 edition = "2021"
@@ -1,6 +1,6 @@
 [package]
 name = "nym-socks5-client"
-version = "1.1.46"
+version = "1.1.45"
 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"
@@ -28,7 +28,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(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub struct IpPair {
@@ -8,10 +8,7 @@ use crate::{
    },
 };
 use log::{debug, error};
-use sqlx::{
-    sqlite::{SqliteAutoVacuum, SqliteSynchronous},
-    ConnectOptions,
-};
+use sqlx::ConnectOptions;
 use std::path::Path;

 #[derive(Debug, Clone)]
@@ -33,9 +30,6 @@ impl StorageManager {
        }

        let opts = sqlx::sqlite::SqliteConnectOptions::new()
-            .journal_mode(sqlx::sqlite::SqliteJournalMode::Wal)
-            .synchronous(SqliteSynchronous::Normal)
-            .auto_vacuum(SqliteAutoVacuum::Incremental)
            .filename(database_path)
            .create_if_missing(true)
            .disable_statement_logging();
@@ -116,7 +110,7 @@ impl StorageManager {
    ) -> Result<(), sqlx::Error> {
        sqlx::query!(
            r#"
-                INSERT INTO registered_gateway(gateway_id_bs58, registration_timestamp, gateway_type)
+                INSERT INTO registered_gateway(gateway_id_bs58, registration_timestamp, gateway_type) 
                VALUES (?, ?, ?)
            "#,
            registered_gateway.gateway_id_bs58,
@@ -230,7 +224,7 @@ impl StorageManager {
    ) -> Result<(), sqlx::Error> {
        sqlx::query!(
            r#"
-                INSERT INTO custom_gateway_details(gateway_id_bs58, data)
+                INSERT INTO custom_gateway_details(gateway_id_bs58, data) 
                VALUES (?, ?)
            "#,
            custom.gateway_id_bs58,
@@ -32,7 +32,7 @@ use crate::init::{
    setup_gateway,
    types::{GatewaySetup, InitialisationResult},
 };
-use crate::{config, spawn_future, ForgetMe};
+use crate::{config, spawn_future};
 use futures::channel::mpsc;
 use log::*;
 use nym_bandwidth_controller::BandwidthController;
@@ -188,11 +188,6 @@ pub struct BaseClientBuilder<'a, C, S: MixnetClientStorage> {
    user_agent: Option<UserAgent>,

    setup_method: GatewaySetup,
-
-    #[cfg(unix)]
-    connection_fd_callback: Option<Arc<dyn Fn(RawFd) + Send + Sync>>,
-
-    forget_me: ForgetMe,
 }

 impl<'a, C, S> BaseClientBuilder<'a, C, S>
@@ -215,18 +210,9 @@ where
            shutdown: None,
            user_agent: None,
            setup_method: GatewaySetup::MustLoad { gateway_id: None },
-            #[cfg(unix)]
-            connection_fd_callback: None,
-            forget_me: Default::default(),
        }
    }

-    #[must_use]
-    pub fn with_forget_me(mut self, forget_me: &ForgetMe) -> Self {
-        self.forget_me = forget_me.clone();
-        self
-    }
-
    #[must_use]
    pub fn with_gateway_setup(mut self, setup: GatewaySetup) -> Self {
        self.setup_method = setup;
@@ -275,15 +261,6 @@ where
        Ok(self)
    }

-    #[cfg(unix)]
-    pub fn with_connection_fd_callback(
-        mut self,
-        callback: Arc<dyn Fn(RawFd) + Send + Sync>,
-    ) -> Self {
-        self.connection_fd_callback = Some(callback);
-        self
-    }
-
    // note: do **NOT** make this method public as its only valid usage is from within `start_base`
    // because it relies on the crypto keys being already loaded
    fn mix_address(details: &InitialisationResult) -> Recipient {
@@ -375,7 +352,6 @@ where
        controller.start_with_shutdown(shutdown)
    }

-    #[allow(clippy::too_many_arguments)]
    async fn start_gateway_client(
        config: &Config,
        initialisation_result: InitialisationResult,
@@ -383,7 +359,6 @@ where
        details_store: &S::GatewaysDetailsStore,
        packet_router: PacketRouter,
        stats_reporter: ClientStatsSender,
-        #[cfg(unix)] connection_fd_callback: Option<Arc<dyn Fn(RawFd) + Send + Sync>>,
        shutdown: TaskClient,
    ) -> Result<GatewayClient<C, S::CredentialStore>, ClientCoreError>
    where
@@ -426,8 +401,6 @@ where
                    packet_router,
                    bandwidth_controller,
                    stats_reporter,
-                    #[cfg(unix)]
-                    connection_fd_callback,
                    shutdown,
                )
            };
@@ -489,7 +462,6 @@ where
        details_store: &S::GatewaysDetailsStore,
        packet_router: PacketRouter,
        stats_reporter: ClientStatsSender,
-        #[cfg(unix)] connection_fd_callback: Option<Arc<dyn Fn(RawFd) + Send + Sync>>,
        mut shutdown: TaskClient,
    ) -> Result<Box<dyn GatewayTransceiver + Send>, ClientCoreError>
    where
@@ -521,8 +493,6 @@ where
            details_store,
            packet_router,
            stats_reporter,
-            #[cfg(unix)]
-            connection_fd_callback,
            shutdown,
        )
        .await?;
@@ -645,11 +615,9 @@ where
    fn start_mix_traffic_controller(
        gateway_transceiver: Box<dyn GatewayTransceiver + Send>,
        shutdown: TaskClient,
-        forget_me: ForgetMe,
    ) -> BatchMixMessageSender {
        info!("Starting mix traffic controller...");
-        let (mix_traffic_controller, mix_tx) =
-            MixTrafficController::new(gateway_transceiver, forget_me);
+        let (mix_traffic_controller, mix_tx) = MixTrafficController::new(gateway_transceiver);
        mix_traffic_controller.start_with_shutdown(shutdown);
        mix_tx
    }
@@ -804,8 +772,6 @@ where
            &details_store,
            gateway_packet_router,
            stats_reporter.clone(),
-            #[cfg(unix)]
-            self.connection_fd_callback,
            shutdown.fork("gateway_transceiver"),
        )
        .await?;
@@ -831,11 +797,9 @@ where
        // that are to be sent to the mixnet. They are used by cover traffic stream and real
        // traffic stream.
        // The MixTrafficController then sends the actual traffic
-
        let message_sender = Self::start_mix_traffic_controller(
            gateway_transceiver,
            shutdown.fork("mix_traffic_controller"),
-            self.forget_me,
        );

        // Channels that the websocket listener can use to signal downstream to the real traffic
@@ -2,9 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0

 use crate::client::mix_traffic::transceiver::GatewayTransceiver;
-use crate::{spawn_future, ForgetMe};
+use crate::spawn_future;
 use log::*;
-use nym_gateway_requests::ClientRequest;
 use nym_sphinx::forwarding::packet::MixPacket;

 pub type BatchMixMessageSender = tokio::sync::mpsc::Sender<Vec<MixPacket>>;
@@ -27,14 +26,10 @@ pub struct MixTrafficController {
    // TODO: this is temporary work-around.
    // in long run `gateway_client` will be moved away from `MixTrafficController` anyway.
    consecutive_gateway_failure_count: usize,
-    forget_me: ForgetMe,
 }

 impl MixTrafficController {
-    pub fn new<T>(
-        gateway_transceiver: T,
-        forget_me: ForgetMe,
-    ) -> (MixTrafficController, BatchMixMessageSender)
+    pub fn new<T>(gateway_transceiver: T) -> (MixTrafficController, BatchMixMessageSender)
    where
        T: GatewayTransceiver + Send + 'static,
    {
@@ -45,7 +40,6 @@ impl MixTrafficController {
                gateway_transceiver: Box::new(gateway_transceiver),
                mix_rx: message_receiver,
                consecutive_gateway_failure_count: 0,
-                forget_me,
            },
            message_sender,
        )
@@ -53,7 +47,6 @@ impl MixTrafficController {

    pub fn new_dynamic(
        gateway_transceiver: Box<dyn GatewayTransceiver + Send>,
-        forget_me: ForgetMe,
    ) -> (MixTrafficController, BatchMixMessageSender) {
        let (message_sender, message_receiver) =
            tokio::sync::mpsc::channel(MIX_MESSAGE_RECEIVER_BUFFER_SIZE);
@@ -62,7 +55,6 @@ impl MixTrafficController {
                gateway_transceiver,
                mix_rx: message_receiver,
                consecutive_gateway_failure_count: 0,
-                forget_me,
            },
            message_sender,
        )
@@ -119,27 +111,7 @@ impl MixTrafficController {
                }
            }
            shutdown.recv_timeout().await;
-
-            if self.forget_me.any() {
-                log::info!("Sending forget me request to the gateway");
-                match self
-                    .gateway_transceiver
-                    .send_client_request(ClientRequest::ForgetMe {
-                        client: self.forget_me.client(),
-                        stats: self.forget_me.stats(),
-                    })
-                    .await
-                {
-                    Ok(_) => {
-                        log::info!("Successfully sent forget me request to the gateway");
-                    }
-                    Err(err) => {
-                        log::error!("Failed to send forget me request to the gateway: {err}");
-                    }
-                }
-            }
-
            log::debug!("MixTrafficController: Exiting");
-        });
+        })
    }
 }
@@ -5,10 +5,8 @@ use async_trait::async_trait;
 use log::{debug, error};
 use nym_credential_storage::storage::Storage as CredentialStorage;
 use nym_crypto::asymmetric::identity;
-use nym_gateway_client::error::GatewayClientError;
 use nym_gateway_client::GatewayClient;
 pub use nym_gateway_client::{GatewayPacketRouter, PacketRouter};
-use nym_gateway_requests::ClientRequest;
 use nym_sphinx::forwarding::packet::MixPacket;
 use nym_validator_client::nyxd::contract_traits::DkgQueryClient;
 use std::fmt::Debug;
@@ -28,14 +26,9 @@ fn erase_err<E: std::error::Error + Send + Sync + 'static>(err: E) -> ErasedGate
 }

 /// This combines combines the functionalities of being able to send and receive mix packets.
-#[async_trait]
 pub trait GatewayTransceiver: GatewaySender + GatewayReceiver {
    fn gateway_identity(&self) -> identity::PublicKey;
    fn ws_fd(&self) -> Option<RawFd>;
-    async fn send_client_request(
-        &mut self,
-        message: ClientRequest,
-    ) -> Result<(), GatewayClientError>;
 }

 /// This trait defines the functionality of sending `MixPacket` into the mixnet,
@@ -72,7 +65,6 @@ pub trait GatewayReceiver {
 }

 // to allow for dynamic dispatch
-#[async_trait]
 impl<G: GatewayTransceiver + ?Sized + Send> GatewayTransceiver for Box<G> {
    #[inline]
    fn gateway_identity(&self) -> identity::PublicKey {
@@ -81,13 +73,6 @@ impl<G: GatewayTransceiver + ?Sized + Send> GatewayTransceiver for Box<G> {
    fn ws_fd(&self) -> Option<RawFd> {
        (**self).ws_fd()
    }
-
-    async fn send_client_request(
-        &mut self,
-        message: ClientRequest,
-    ) -> Result<(), GatewayClientError> {
-        (**self).send_client_request(message).await
-    }
 }

 #[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
@@ -106,6 +91,7 @@ impl<G: GatewaySender + ?Sized + Send> GatewaySender for Box<G> {
        (**self).batch_send_mix_packets(packets).await
    }
 }
+
 impl<G: GatewayReceiver + ?Sized> GatewayReceiver for Box<G> {
    #[inline]
    fn set_packet_router(&mut self, packet_router: PacketRouter) -> Result<(), ErasedGatewayError> {
@@ -125,7 +111,6 @@ impl<C, St> RemoteGateway<C, St> {
    }
 }

-#[async_trait]
 impl<C, St> GatewayTransceiver for RemoteGateway<C, St>
 where
    C: DkgQueryClient + Send + Sync,
@@ -138,20 +123,6 @@ where
    fn ws_fd(&self) -> Option<RawFd> {
        self.gateway_client.ws_fd()
    }
-
-    async fn send_client_request(
-        &mut self,
-        message: ClientRequest,
-    ) -> Result<(), GatewayClientError> {
-        if let Some(shared_key) = self.gateway_client.shared_key() {
-            self.gateway_client
-                .send_websocket_message(message.encrypt(&*shared_key)?)
-                .await?;
-            Ok(())
-        } else {
-            Err(GatewayClientError::ConnectionInInvalidState)
-        }
-    }
 }

 #[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
@@ -224,7 +195,6 @@ impl LocalGateway {
 mod nonwasm_sealed {
    use super::*;

-    #[async_trait]
    impl GatewayTransceiver for LocalGateway {
        fn gateway_identity(&self) -> identity::PublicKey {
            self.local_identity
@@ -232,13 +202,6 @@ mod nonwasm_sealed {
        fn ws_fd(&self) -> Option<RawFd> {
            None
        }
-
-        async fn send_client_request(
-            &mut self,
-            _message: ClientRequest,
-        ) -> Result<(), GatewayClientError> {
-            Ok(())
-        }
    }

    #[async_trait]
@@ -306,7 +269,6 @@ impl GatewaySender for MockGateway {
    }
 }

-#[async_trait]
 impl GatewayTransceiver for MockGateway {
    fn gateway_identity(&self) -> identity::PublicKey {
        self.dummy_identity
@@ -314,11 +276,4 @@ impl GatewayTransceiver for MockGateway {
    fn ws_fd(&self) -> Option<RawFd> {
        None
    }
-
-    async fn send_client_request(
-        &mut self,
-        _message: ClientRequest,
-    ) -> Result<(), GatewayClientError> {
-        Ok(())
-    }
 }
@@ -190,7 +190,7 @@ where
    Ok(GatewayWithLatency::new(gateway, avg))
 }

-pub async fn choose_gateway_by_latency<R: Rng, G: ConnectableGateway + Clone>(
+pub async fn choose_gateway_by_latency<'a, R: Rng, G: ConnectableGateway + Clone>(
    rng: &mut R,
    gateways: &[G],
    must_use_tls: bool,
@@ -34,48 +34,3 @@ where
 {
    tokio::spawn(future);
 }
-
-#[derive(Clone, Default, Debug)]
-pub struct ForgetMe {
-    client: bool,
-    stats: bool,
-}
-
-impl ForgetMe {
-    pub fn new_all() -> Self {
-        Self {
-            client: true,
-            stats: true,
-        }
-    }
-
-    pub fn new_client() -> Self {
-        Self {
-            client: true,
-            stats: false,
-        }
-    }
-
-    pub fn new_stats() -> Self {
-        Self {
-            client: false,
-            stats: true,
-        }
-    }
-
-    pub fn new(client: bool, stats: bool) -> Self {
-        Self { client, stats }
-    }
-
-    pub fn any(&self) -> bool {
-        self.client || self.stats
-    }
-
-    pub fn client(&self) -> bool {
-        self.client
-    }
-
-    pub fn stats(&self) -> bool {
-        self.stats
-    }
-}
@@ -9,10 +9,7 @@ use crate::backend::fs_backend::{
    },
 };
 use log::{error, info};
-use sqlx::{
-    sqlite::{SqliteAutoVacuum, SqliteSynchronous},
-    ConnectOptions,
-};
+use sqlx::ConnectOptions;
 use std::path::Path;

 #[derive(Debug, Clone)]
@@ -34,9 +31,6 @@ impl StorageManager {
        }

        let opts = sqlx::sqlite::SqliteConnectOptions::new()
-            .journal_mode(sqlx::sqlite::SqliteJournalMode::Wal)
-            .synchronous(SqliteSynchronous::Normal)
-            .auto_vacuum(SqliteAutoVacuum::Incremental)
            .filename(database_path)
            .create_if_missing(fresh)
            .disable_statement_logging();
@@ -101,10 +101,6 @@ pub struct GatewayClient<C, St = EphemeralCredentialStorage> {
    // currently unused (but populated)
    negotiated_protocol: Option<u8>,

-    // Callback on the fd as soon as the connection has been established
-    #[cfg(unix)]
-    connection_fd_callback: Option<Arc<dyn Fn(RawFd) + Send + Sync>>,
-
    /// Listen to shutdown messages and send notifications back to the task manager
    task_client: TaskClient,
 }
@@ -120,7 +116,6 @@ impl<C, St> GatewayClient<C, St> {
        packet_router: PacketRouter,
        bandwidth_controller: Option<BandwidthController<C, St>>,
        stats_reporter: ClientStatsSender,
-        #[cfg(unix)] connection_fd_callback: Option<Arc<dyn Fn(RawFd) + Send + Sync>>,
        task_client: TaskClient,
    ) -> Self {
        GatewayClient {
@@ -136,8 +131,6 @@ impl<C, St> GatewayClient<C, St> {
            bandwidth_controller,
            stats_reporter,
            negotiated_protocol: None,
-            #[cfg(unix)]
-            connection_fd_callback,
            task_client,
        }
    }
@@ -212,12 +205,6 @@ impl<C, St> GatewayClient<C, St> {
        };

        self.connection = SocketState::Available(Box::new(ws_stream));
-
-        #[cfg(unix)]
-        if let (Some(callback), Some(fd)) = (self.connection_fd_callback.as_ref(), self.ws_fd()) {
-            callback.as_ref()(fd);
-        }
-
        Ok(())
    }

@@ -324,7 +311,7 @@ impl<C, St> GatewayClient<C, St> {

    // If we want to send a message (with response), we need to have a full control over the socket,
    // as we need to be able to write the request and read the subsequent response
-    pub async fn send_websocket_message(
+    async fn send_websocket_message(
        &mut self,
        msg: impl Into<Message>,
    ) -> Result<ServerResponse, GatewayClientError> {
@@ -1047,8 +1034,6 @@ impl GatewayClient<InitOnly, EphemeralCredentialStorage> {
            bandwidth_controller: None,
            stats_reporter: ClientStatsSender::new(None),
            negotiated_protocol: None,
-            #[cfg(unix)]
-            connection_fd_callback: None,
            task_client,
        }
    }
@@ -1079,8 +1064,6 @@ impl GatewayClient<InitOnly, EphemeralCredentialStorage> {
            bandwidth_controller,
            stats_reporter,
            negotiated_protocol: self.negotiated_protocol,
-            #[cfg(unix)]
-            connection_fd_callback: self.connection_fd_callback,
            task_client,
        }
    }
@@ -8,12 +8,10 @@ license.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-dashmap = { workspace = true }
 futures = { workspace = true }
 tracing = { workspace = true }
-tokio = { workspace = true, features = ["time", "sync"] }
+tokio = { workspace = true, features = ["time"] }
 tokio-util = { workspace = true, features = ["codec"], optional = true }
-tokio-stream = { workspace = true }

 # internal
 nym-sphinx = { path = "../../nymsphinx" }
@@ -1,24 +1,21 @@
-// Copyright 2021-2024 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use dashmap::DashMap;
+use futures::channel::mpsc;
 use futures::StreamExt;
 use nym_sphinx::addressing::nodes::NymNodeRoutingAddress;
 use nym_sphinx::framing::codec::NymCodec;
 use nym_sphinx::framing::packet::FramedNymPacket;
 use nym_sphinx::params::PacketType;
 use nym_sphinx::NymPacket;
+use std::collections::HashMap;
 use std::io;
 use std::net::SocketAddr;
-use std::ops::Deref;
-use std::sync::atomic::{AtomicU32, AtomicUsize, Ordering};
+use std::sync::atomic::{AtomicU32, Ordering};
 use std::sync::Arc;
 use std::time::Duration;
 use tokio::net::TcpStream;
-use tokio::sync::mpsc;
-use tokio::sync::mpsc::error::TrySendError;
 use tokio::time::sleep;
-use tokio_stream::wrappers::ReceiverStream;
 use tokio_util::codec::Framed;
 use tracing::*;

@@ -58,37 +55,11 @@ pub trait SendWithoutResponse {
 }

 pub struct Client {
-    active_connections: ActiveConnections,
-    connections_count: Arc<AtomicUsize>,
+    conn_new: HashMap<NymNodeRoutingAddress, ConnectionSender>,
    config: Config,
 }

-#[derive(Default, Clone)]
-pub struct ActiveConnections {
-    inner: Arc<DashMap<NymNodeRoutingAddress, ConnectionSender>>,
-}
-
-impl ActiveConnections {
-    pub fn pending_packets(&self) -> usize {
-        self.inner
-            .iter()
-            .map(|sender| {
-                let max_capacity = sender.channel.max_capacity();
-                let capacity = sender.channel.capacity();
-                max_capacity - capacity
-            })
-            .sum()
-    }
-}
-
-impl Deref for ActiveConnections {
-    type Target = DashMap<NymNodeRoutingAddress, ConnectionSender>;
-    fn deref(&self) -> &Self::Target {
-        &self.inner
-    }
-}
-
-pub struct ConnectionSender {
+struct ConnectionSender {
    channel: mpsc::Sender<FramedNymPacket>,
    current_reconnection_attempt: Arc<AtomicU32>,
 }
@@ -102,53 +73,46 @@ impl ConnectionSender {
    }
 }

-struct ManagedConnection {
-    address: SocketAddr,
-    message_receiver: ReceiverStream<FramedNymPacket>,
-    connection_timeout: Duration,
-    current_reconnection: Arc<AtomicU32>,
-}
-
-impl ManagedConnection {
-    fn new(
-        address: SocketAddr,
-        message_receiver: mpsc::Receiver<FramedNymPacket>,
-        connection_timeout: Duration,
-        current_reconnection: Arc<AtomicU32>,
-    ) -> Self {
-        ManagedConnection {
-            address,
-            message_receiver: ReceiverStream::new(message_receiver),
-            connection_timeout,
-            current_reconnection,
+impl Client {
+    pub fn new(config: Config) -> Client {
+        Client {
+            conn_new: HashMap::new(),
+            config,
        }
    }

-    async fn run(self) {
-        let address = self.address;
+    async fn manage_connection(
+        address: SocketAddr,
+        receiver: mpsc::Receiver<FramedNymPacket>,
+        connection_timeout: Duration,
+        current_reconnection: &AtomicU32,
+    ) {
        let connection_fut = TcpStream::connect(address);

-        let conn = match tokio::time::timeout(self.connection_timeout, connection_fut).await {
+        let conn = match tokio::time::timeout(connection_timeout, connection_fut).await {
            Ok(stream_res) => match stream_res {
                Ok(stream) => {
-                    debug!("Managed to establish connection to {}", self.address);
+                    debug!("Managed to establish connection to {}", address);
                    // if we managed to connect, reset the reconnection count (whatever it might have been)
-                    self.current_reconnection.store(0, Ordering::Release);
+                    current_reconnection.store(0, Ordering::Release);
                    Framed::new(stream, NymCodec)
                }
                Err(err) => {
-                    debug!("failed to establish connection to {address} (err: {err})",);
+                    debug!(
+                        "failed to establish connection to {} (err: {})",
+                        address, err
+                    );
                    return;
                }
            },
            Err(_) => {
                debug!(
-                    "failed to connect to {address} within {:?}",
-                    self.connection_timeout
+                    "failed to connect to {} within {:?}",
+                    address, connection_timeout
                );

                // we failed to connect - increase reconnection attempt
-                self.current_reconnection.fetch_add(1, Ordering::SeqCst);
+                current_reconnection.fetch_add(1, Ordering::SeqCst);
                return;
            }
        };
@@ -156,28 +120,15 @@ impl ManagedConnection {
        // Take whatever the receiver channel produces and put it on the connection.
        // We could have as well used conn.send_all(receiver.map(Ok)), but considering we don't care
        // about neither receiver nor the connection, it doesn't matter which one gets consumed
-        if let Err(err) = self.message_receiver.map(Ok).forward(conn).await {
-            warn!("Failed to forward packets to {address}: {err}");
+        if let Err(err) = receiver.map(Ok).forward(conn).await {
+            warn!("Failed to forward packets to {} - {err}", address);
        }

        debug!(
-            "connection manager to {address} is finished. Either the connection failed or mixnet client got dropped",
+            "connection manager to {} is finished. Either the connection failed or mixnet client got dropped",
+            address
        );
    }
-}
-
-impl Client {
-    pub fn new(config: Config, connections_count: Arc<AtomicUsize>) -> Client {
-        Client {
-            active_connections: Default::default(),
-            connections_count,
-            config,
-        }
-    }
-
-    pub fn active_connections(&self) -> ActiveConnections {
-        self.active_connections.clone()
-    }

    /// If we're trying to reconnect, determine how long we should wait.
    fn determine_backoff(&self, current_attempt: u32) -> Option<Duration> {
@@ -197,7 +148,7 @@ impl Client {
    }

    fn make_connection(&mut self, address: NymNodeRoutingAddress, pending_packet: FramedNymPacket) {
-        let (sender, receiver) = mpsc::channel(self.config.maximum_connection_buffer_size);
+        let (mut sender, receiver) = mpsc::channel(self.config.maximum_connection_buffer_size);

        // this CAN'T fail because we just created the channel which has a non-zero capacity
        if self.config.maximum_connection_buffer_size > 0 {
@@ -205,16 +156,15 @@ impl Client {
        }

        // if we already tried to connect to `address` before, grab the current attempt count
-        let current_reconnection_attempt =
-            if let Some(mut existing) = self.active_connections.get_mut(&address) {
-                existing.channel = sender;
-                Arc::clone(&existing.current_reconnection_attempt)
-            } else {
-                let new_entry = ConnectionSender::new(sender);
-                let current_attempt = Arc::clone(&new_entry.current_reconnection_attempt);
-                self.active_connections.insert(address, new_entry);
-                current_attempt
-            };
+        let current_reconnection_attempt = if let Some(existing) = self.conn_new.get_mut(&address) {
+            existing.channel = sender;
+            Arc::clone(&existing.current_reconnection_attempt)
+        } else {
+            let new_entry = ConnectionSender::new(sender);
+            let current_attempt = Arc::clone(&new_entry.current_reconnection_attempt);
+            self.conn_new.insert(address, new_entry);
+            current_attempt
+        };

        // load the actual value.
        let reconnection_attempt = current_reconnection_attempt.load(Ordering::Acquire);
@@ -223,7 +173,6 @@ impl Client {
        // copy the value before moving into another task
        let initial_connection_timeout = self.config.initial_connection_timeout;

-        let connections_count = self.connections_count.clone();
        tokio::spawn(async move {
            // before executing the manager, wait for what was specified, if anything
            if let Some(backoff) = backoff {
@@ -231,16 +180,13 @@ impl Client {
                sleep(backoff).await;
            }

-            connections_count.fetch_add(1, Ordering::SeqCst);
-            ManagedConnection::new(
+            Self::manage_connection(
                address.into(),
                receiver,
                initial_connection_timeout,
-                current_reconnection_attempt,
+                &current_reconnection_attempt,
            )
-            .run()
-            .await;
-            connections_count.fetch_sub(1, Ordering::SeqCst);
+            .await
        });
    }
 }
@@ -255,47 +201,49 @@ impl SendWithoutResponse for Client {
        trace!("Sending packet to {address:?}");
        let framed_packet = FramedNymPacket::new(packet, packet_type);

-        let Some(sender) = self.active_connections.get_mut(&address) else {
+        if let Some(sender) = self.conn_new.get_mut(&address) {
+            if let Err(err) = sender.channel.try_send(framed_packet) {
+                if err.is_full() {
+                    debug!("Connection to {} seems to not be able to handle all the traffic - dropping the current packet", address);
+                    // it's not a 'big' error, but we did not manage to send the packet
+                    // if the queue is full, we can't really do anything but to drop the packet
+                    Err(io::Error::new(
+                        io::ErrorKind::WouldBlock,
+                        "connection queue is full",
+                    ))
+                } else if err.is_disconnected() {
+                    debug!(
+                        "Connection to {} seems to be dead. attempting to re-establish it...",
+                        address
+                    );
+                    // it's not a 'big' error, but we did not manage to send the packet, but queue
+                    // it up to send it as soon as the connection is re-established
+                    self.make_connection(address, err.into_inner());
+                    Err(io::Error::new(
+                        io::ErrorKind::ConnectionAborted,
+                        "reconnection attempt is in progress",
+                    ))
+                } else {
+                    // this can't really happen, but let's safe-guard against it in case something changes in futures library
+                    Err(io::Error::new(
+                        io::ErrorKind::Other,
+                        "unknown connection buffer error",
+                    ))
+                }
+            } else {
+                Ok(())
+            }
+        } else {
            // there was never a connection to begin with
            debug!("establishing initial connection to {}", address);
            // it's not a 'big' error, but we did not manage to send the packet, but queue the packet
            // for sending for as soon as the connection is created
            self.make_connection(address, framed_packet);
-            return Err(io::Error::new(
+            Err(io::Error::new(
                io::ErrorKind::NotConnected,
                "connection is in progress",
-            ));
-        };
-
-        let sending_res = sender.channel.try_send(framed_packet);
-        drop(sender);
-
-        sending_res.map_err(|err| {
-            match err {
-                TrySendError::Full(_) => {
-                    debug!("Connection to {address} seems to not be able to handle all the traffic - dropping the current packet");
-                    // it's not a 'big' error, but we did not manage to send the packet
-                    // if the queue is full, we can't really do anything but to drop the packet
-                    io::Error::new(
-                        io::ErrorKind::WouldBlock,
-                        "connection queue is full",
-                    )
-                }
-                TrySendError::Closed(dropped) => {
-                    debug!(
-                        "Connection to {address} seems to be dead. attempting to re-establish it...",
-                    );
-
-                    // it's not a 'big' error, but we did not manage to send the packet, but queue
-                    // it up to send it as soon as the connection is re-established
-                    self.make_connection(address, dropped);
-                    io::Error::new(
-                        io::ErrorKind::ConnectionAborted,
-                        "reconnection attempt is in progress",
-                    )
-                }
-            }
-        } )
+            ))
+        }
    }
 }

@@ -304,15 +252,12 @@ mod tests {
    use super::*;

    fn dummy_client() -> Client {
-        Client::new(
-            Config {
-                initial_reconnection_backoff: Duration::from_millis(10_000),
-                maximum_reconnection_backoff: Duration::from_millis(300_000),
-                initial_connection_timeout: Duration::from_millis(1_500),
-                maximum_connection_buffer_size: 128,
-            },
-            Default::default(),
-        )
+        Client::new(Config {
+            initial_reconnection_backoff: Duration::from_millis(10_000),
+            maximum_reconnection_backoff: Duration::from_millis(300_000),
+            initial_connection_timeout: Duration::from_millis(1_500),
+            maximum_connection_buffer_size: 128,
+        })
    }

    #[test]
@@ -65,12 +65,6 @@ pub enum EcashApiError {
        #[from]
        source: cosmrs::ErrorReport,
    },
-
-    #[error("nym api error")]
-    NymApi {
-        #[from]
-        source: crate::ValidatorClientError,
-    },
 }

 impl TryFrom<ContractVKShare> for EcashApiClient {
@@ -13,6 +13,7 @@ cosmwasm-std = { workspace = true }
 cosmwasm-schema = { workspace = true }
 cw-storage-plus = { workspace = true }
 schemars = { workspace = true }
+utoipa = { workspace = true, optional = true }
 serde = { workspace = true, features = ["derive"] }
 thiserror = { workspace = true }

@@ -23,4 +24,5 @@ serde_json = { workspace = true }
 vergen = { workspace = true, features = ["build", "git", "gitcl", "rustc", "cargo"] }

 [features]
-naive_float = []
+naive_float = []
+utoipa = ["dep:utoipa"]
@@ -221,6 +221,7 @@ fn default_unknown() -> String {
 // TODO: there's no reason this couldn't be used for proper binaries, but in that case
 // perhaps the struct should get renamed and moved to a "more" common crate
 #[cw_serde]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 pub struct ContractBuildInformation {
    /// Provides the name of the binary, i.e. the content of `CARGO_PKG_NAME` environmental variable.
    #[serde(default = "default_unknown")]
@@ -42,9 +42,11 @@ pub struct Gateway {
 #[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 pub struct GatewayBond {
    /// Original amount pledged by the operator of this node.
+    #[cfg_attr(feature = "utoipa", schema(value_type = crate::CoinSchema))]
    pub pledge_amount: Coin,

    /// Address of the owner of this gateway.
+    #[cfg_attr(feature = "utoipa", schema(value_type = String))]
    pub owner: Addr,

    /// Block height at which this gateway has been bonded.
@@ -55,6 +57,7 @@ pub struct GatewayBond {

    /// Entity who bonded this gateway on behalf of the owner.
    /// If exists, it's most likely the address of the vesting contract.
+    #[cfg_attr(feature = "utoipa", schema(value_type = String))]
    pub proxy: Option<Addr>,
 }

@@ -81,20 +81,25 @@ impl MixNodeDetails {

 // currently this struct is shared between mixnodes and nymnodes
 #[cw_serde]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 pub struct NodeRewarding {
    /// Information provided by the operator that influence the cost function.
    pub cost_params: NodeCostParams,

    /// Total pledge and compounded reward earned by the node operator.
+    #[cfg_attr(feature = "utoipa", schema(value_type = String))]
    pub operator: Decimal,

    /// Total delegation and compounded reward earned by all node delegators.
+    #[cfg_attr(feature = "utoipa", schema(value_type = String))]
    pub delegates: Decimal,

    /// Cumulative reward earned by the "unit delegation" since the block 0.
+    #[cfg_attr(feature = "utoipa", schema(value_type = String))]
    pub total_unit_reward: Decimal,

    /// Value of the theoretical "unit delegation" that has delegated to this node at block 0.
+    #[cfg_attr(feature = "utoipa", schema(value_type = String))]
    pub unit_delegation: Decimal,

    /// Marks the epoch when this node was last rewarded so that we wouldn't accidentally attempt
@@ -491,14 +496,17 @@ impl NodeRewarding {
    ::cosmwasm_schema::schemars::JsonSchema,
 )]
 #[schemars(crate = "::cosmwasm_schema::schemars")]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 pub struct MixNodeBond {
    /// Unique id assigned to the bonded mixnode.
    pub mix_id: NodeId,

    /// Address of the owner of this mixnode.
+    #[cfg_attr(feature = "utoipa", schema(value_type = String))]
    pub owner: Addr,

    /// Original amount pledged by the operator of this node.
+    #[cfg_attr(feature = "utoipa", schema(value_type = crate::CoinSchema))]
    pub original_pledge: Coin,

    // REMOVED (but might be needed due to legacy things, idk yet)
@@ -509,6 +517,7 @@ pub struct MixNodeBond {

    /// Entity who bonded this mixnode on behalf of the owner.
    /// If exists, it's most likely the address of the vesting contract.
+    #[cfg_attr(feature = "utoipa", schema(value_type = Option<String>))]
    pub proxy: Option<Addr>,

    /// Block height at which this mixnode has been bonded.
@@ -544,6 +553,7 @@ impl MixNodeBond {
    feature = "generate-ts",
    ts(export, export_to = "ts-packages/types/src/types/rust/Mixnode.ts")
 )]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 pub struct MixNode {
    /// Network address of this mixnode, for example 1.1.1.1 or foo.mixnode.com
    pub host: String,
@@ -570,11 +580,14 @@ pub struct MixNode {
 /// The cost parameters, or the cost function, defined for the particular mixnode that influences
 /// how the rewards should be split between the node operator and its delegators.
 #[cw_serde]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 pub struct NodeCostParams {
    /// The profit margin of the associated node, i.e. the desired percent of the reward to be distributed to the operator.
+    #[cfg_attr(feature = "utoipa", schema(value_type = String))]
    pub profit_margin_percent: Percent,

    /// Operating cost of the associated node per the entire interval.
+    #[cfg_attr(feature = "utoipa", schema(value_type = crate::CoinSchema))]
    pub interval_operating_cost: Coin,
 }

@@ -669,7 +682,9 @@ pub struct PendingMixNodeChanges {
 }

 #[derive(Default, Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 pub struct LegacyPendingMixNodeChanges {
+    #[cfg_attr(feature = "utoipa", schema(value_type = Option<u32>))]
    pub pledge_change: Option<EpochEventId>,
 }

@@ -863,4 +863,11 @@ pub enum QueryMsg {
 pub struct MigrateMsg {
    pub unsafe_skip_state_updates: Option<bool>,
    pub vesting_contract_address: Option<String>,
+    pub current_nym_node_semver: String,
+
+    #[serde(default)]
+    pub version_score_weights: OutdatedVersionWeights,
+
+    #[serde(default)]
+    pub version_score_params: VersionScoreFormulaParams,
 }
@@ -231,6 +231,7 @@ pub struct RoleMetadata {

 /// Full details associated with given node.
 #[cw_serde]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 pub struct NymNodeDetails {
    /// Basic bond information of this node, such as owner address, original pledge, etc.
    pub bond_information: NymNodeBond,
@@ -288,14 +289,19 @@ impl NymNodeDetails {
 }

 #[cw_serde]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 pub struct NymNodeBond {
    /// Unique id assigned to the bonded node.
+    #[cfg_attr(feature = "utoipa", schema(value_type = u32))]
    pub node_id: NodeId,

    /// Address of the owner of this nym-node.
+    #[cfg_attr(feature = "utoipa", schema(value_type = String))]
    pub owner: Addr,

    /// Original amount pledged by the operator of this node.
+
+    #[cfg_attr(feature = "utoipa", schema(value_type = crate::CoinSchema))]
    pub original_pledge: Coin,

    /// Block height at which this nym-node has been bonded.
@@ -348,6 +354,7 @@ impl NymNodeBond {
    feature = "generate-ts",
    ts(export, export_to = "ts-packages/types/src/types/rust/NymNode.ts")
 )]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 pub struct NymNode {
    /// Network address of this nym-node, for example 1.1.1.1 or foo.mixnode.com
    /// that is used to discover other capabilities of this node.
@@ -358,6 +365,7 @@ pub struct NymNode {
    pub custom_http_port: Option<u16>,

    /// Base58-encoded ed25519 EdDSA public key.
+    #[cfg_attr(feature = "utoipa", schema(value_type = String))]
    pub identity_key: IdentityKey,
    // TODO: I don't think we want to include sphinx keys here,
    // given we want to rotate them and keeping that in sync with contract will be a PITA
@@ -435,8 +443,11 @@ pub struct NodeConfigUpdate {
        export_to = "ts-packages/types/src/types/rust/PendingNodeChanges.ts"
    )
 )]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 pub struct PendingNodeChanges {
+    #[cfg_attr(feature = "utoipa", schema(value_type = Option<u32>))]
    pub pledge_change: Option<EpochEventId>,
+    #[cfg_attr(feature = "utoipa", schema(value_type = Option<u32>))]
    pub cost_params_change: Option<IntervalEventId>,
 }

@@ -21,31 +21,37 @@ pub type WorkFactor = Decimal;
 )]
 #[cw_serde]
 #[derive(Copy)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 pub struct IntervalRewardParams {
    /// Current value of the rewarding pool.
    /// It is expected to be constant throughout the interval.
    #[cfg_attr(feature = "generate-ts", ts(type = "string"))]
+    #[cfg_attr(feature = "utoipa", schema(value_type = String))]
    pub reward_pool: Decimal,

    /// Current value of the staking supply.
    /// It is expected to be constant throughout the interval.
    #[cfg_attr(feature = "generate-ts", ts(type = "string"))]
+    #[cfg_attr(feature = "utoipa", schema(value_type = String))]
    pub staking_supply: Decimal,

    /// Defines the percentage of stake needed to reach saturation for all of the nodes in the rewarded set.
    /// Also known as `beta`.
    #[cfg_attr(feature = "generate-ts", ts(type = "string"))]
+    #[cfg_attr(feature = "utoipa", schema(value_type = String))]
    pub staking_supply_scale_factor: Percent,

    // computed values
    /// Current value of the computed reward budget per epoch, per node.
    /// It is expected to be constant throughout the interval.
    #[cfg_attr(feature = "generate-ts", ts(type = "string"))]
+    #[cfg_attr(feature = "utoipa", schema(value_type = String))]
    pub epoch_reward_budget: Decimal,

    /// Current value of the stake saturation point.
    /// It is expected to be constant throughout the interval.
    #[cfg_attr(feature = "generate-ts", ts(type = "string"))]
+    #[cfg_attr(feature = "utoipa", schema(value_type = String))]
    pub stake_saturation_point: Decimal,

    // constants(-ish)
@@ -54,6 +60,7 @@ pub struct IntervalRewardParams {
    /// It is not really expected to be changing very often.
    /// As a matter of fact, unless there's a very specific reason, it should remain constant.
    #[cfg_attr(feature = "generate-ts", ts(type = "string"))]
+    #[cfg_attr(feature = "utoipa", schema(value_type = String))]
    pub sybil_resistance: Percent,

    // default: 10
@@ -61,6 +68,7 @@ pub struct IntervalRewardParams {
    /// It is not really expected to be changing very often.
    /// As a matter of fact, unless there's a very specific reason, it should remain constant.
    #[cfg_attr(feature = "generate-ts", ts(type = "string"))]
+    #[cfg_attr(feature = "utoipa", schema(value_type = String))]
    pub active_set_work_factor: Decimal,

    // default: 2%
@@ -70,6 +78,7 @@ pub struct IntervalRewardParams {
    /// It is not really expected to be changing very often.
    /// As a matter of fact, unless there's a very specific reason, it should remain constant.
    #[cfg_attr(feature = "generate-ts", ts(type = "string"))]
+    #[cfg_attr(feature = "utoipa", schema(value_type = String))]
    pub interval_pool_emission: Percent,
 }

@@ -90,6 +99,7 @@ impl IntervalRewardParams {
 )]
 #[cw_serde]
 #[derive(Copy)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 pub struct RewardingParams {
    /// Parameters that should remain unchanged throughout an interval.
    pub interval: IntervalRewardParams,
@@ -254,6 +264,7 @@ impl RewardingParams {
 )]
 #[cw_serde]
 #[derive(Copy)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 pub struct RewardedSetParams {
    /// The expected number of nodes assigned entry gateway role (i.e. [`Role::EntryGateway`])
    pub entry_gateways: u32,
@@ -17,10 +17,12 @@ pub mod simulator;
 )]
 #[cw_serde]
 #[derive(Copy, Default)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 pub struct RewardEstimate {
    /// The amount of **decimal** coins that are going to get distributed to the node,
    /// i.e. the operator and all its delegators.
    #[cfg_attr(feature = "generate-ts", ts(type = "string"))]
+    #[cfg_attr(feature = "utoipa", schema(value_type = String))]
    pub total_node_reward: Decimal,

    // note that operator reward includes the operating_cost,
@@ -28,14 +30,17 @@ pub struct RewardEstimate {
    // in that case the operator reward would still be `1nym` as opposed to 0
    /// The share of the reward that is going to get distributed to the node operator.
    #[cfg_attr(feature = "generate-ts", ts(type = "string"))]
+    #[cfg_attr(feature = "utoipa", schema(value_type = String))]
    pub operator: Decimal,

    /// The share of the reward that is going to get distributed among the node delegators.
    #[cfg_attr(feature = "generate-ts", ts(type = "string"))]
+    #[cfg_attr(feature = "utoipa", schema(value_type = String))]
    pub delegates: Decimal,

    /// The operating cost of this node. Note: it's already included in the operator reward.
    #[cfg_attr(feature = "generate-ts", ts(type = "string"))]
+    #[cfg_attr(feature = "utoipa", schema(value_type = String))]
    pub operating_cost: Decimal,
 }

@@ -134,6 +134,14 @@ where
    }
 }

+#[cfg(feature = "utoipa")]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[cfg_attr(feature = "utoipa", schema(title = "Coin"))]
+pub struct CoinSchema {
+    pub denom: String,
+    pub amount: String,
+}
+
 /// The current state of the mixnet contract.
 #[cw_serde]
 pub struct ContractState {
@@ -23,11 +23,6 @@ impl SqliteEcashTicketbookManager {
        SqliteEcashTicketbookManager { connection_pool }
    }

-    /// Closes the connection pool.
-    pub async fn close(&self) {
-        self.connection_pool.close().await
-    }
-
    pub(crate) async fn cleanup_expired(&self, deadline: Date) -> Result<(), sqlx::Error> {
        sqlx::query!(
            "DELETE FROM ecash_ticketbook WHERE expiration_date <= ?",
@@ -43,10 +43,6 @@ impl Debug for EphemeralStorage {
 impl Storage for EphemeralStorage {
    type StorageError = StorageError;

-    async fn close(&self) {
-        // nothing to do here
-    }
-
    async fn cleanup_expired(&self) -> Result<(), Self::StorageError> {
        self.storage_manager.cleanup_expired().await;
        Ok(())
@@ -33,10 +33,7 @@ use nym_credentials::{
    IssuanceTicketBook, IssuedTicketBook,
 };
 use nym_ecash_time::{ecash_today, Date, EcashTime};
-use sqlx::{
-    sqlite::{SqliteAutoVacuum, SqliteSynchronous},
-    ConnectOptions,
-};
+use sqlx::ConnectOptions;
 use std::path::Path;
 use zeroize::Zeroizing;

@@ -59,9 +56,6 @@ impl PersistentStorage {
        );

        let opts = sqlx::sqlite::SqliteConnectOptions::new()
-            .journal_mode(sqlx::sqlite::SqliteJournalMode::Wal)
-            .synchronous(SqliteSynchronous::Normal)
-            .auto_vacuum(SqliteAutoVacuum::Incremental)
            .filename(database_path)
            .create_if_missing(true)
            .disable_statement_logging();
@@ -89,10 +83,6 @@ impl PersistentStorage {
 impl Storage for PersistentStorage {
    type StorageError = StorageError;

-    async fn close(&self) {
-        self.storage_manager.close().await
-    }
-
    /// remove all expired ticketbooks and expiration date signatures
    async fn cleanup_expired(&self) -> Result<(), Self::StorageError> {
        let ecash_yesterday = ecash_today().date().previous_day().unwrap();
@@ -22,8 +22,6 @@ use std::error::Error;
 pub trait Storage: Send + Sync {
    type StorageError: Error;

-    async fn close(&self);
-
    /// remove all expired ticketbooks and expiration date signatures
    async fn cleanup_expired(&self) -> Result<(), Self::StorageError>;

@@ -13,7 +13,6 @@ use nym_api_requests::constants::MIN_BATCH_REDEMPTION_DELAY;
 use nym_api_requests::ecash::models::{BatchRedeemTicketsBody, VerifyEcashTicketBody};
 use nym_credentials_interface::Bandwidth;
 use nym_credentials_interface::{ClientTicket, TicketType};
-use nym_validator_client::coconut::EcashApiError;
 use nym_validator_client::nym_api::EpochId;
 use nym_validator_client::nyxd::contract_traits::{
    EcashSigningClient, MultisigQueryClient, MultisigSigningClient, PagedMultisigQueryClient,
@@ -353,9 +352,7 @@ impl CredentialHandler {
            }
            Err(err) => {
                error!("failed to send ticket {ticket_id} for verification to ecash signer '{client}': {err}. if we don't reach quorum, we'll retry later");
-                Err(EcashTicketError::ApiFailure(EcashApiError::NymApi {
-                    source: err,
-                }))
+                Ok(false)
            }
        }
    }
@@ -16,6 +16,7 @@ serde = { workspace = true, features = ["derive"] }
 thiserror = { workspace = true }
 strum = { workspace = true, features = ["derive"] }
 time = { workspace = true, features = ["serde"] }
+utoipa = { workspace = true }
 rand = { workspace = true }

 nym-compact-ecash = { path = "../nym_offline_compact_ecash" }
@@ -86,7 +86,6 @@ impl Display for AddressPolicyAction {
 /// ```
 #[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq, Eq)]
 #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))]
-#[cfg_attr(feature = "openapi", aliases(ExitPolicy))]
 pub struct AddressPolicy {
    /// A list of rules to apply to find out whether an address is
    /// contained by this policy.
@@ -727,10 +726,10 @@ mod test {
        let policy = AddressPolicy::parse_from_torrc(
            r#"
 ExitPolicy reject 1.2.3.4/32:*
-ExitPolicy reject 1.2.3.5:* 
+ExitPolicy reject 1.2.3.5:*
 ExitPolicy reject 1.2.3.6/16:*
-ExitPolicy reject 1.2.3.6/16:123-456 
-ExitPolicy accept *:53 
+ExitPolicy reject 1.2.3.6/16:123-456
+ExitPolicy accept *:53
 ExitPolicy accept6 *6:119
 ExitPolicy accept *4:120
 ExitPolicy reject6 [FC00::]/7:*
@@ -9,7 +9,7 @@ use futures::{Sink, Stream};
 use rand::{CryptoRng, RngCore};
 use tungstenite::Message as WsMessage;

-impl<S, R> State<'_, S, R> {
+impl<'a, S, R> State<'a, S, R> {
    async fn client_handshake_inner(&mut self) -> Result<(), HandshakeError>
    where
        S: Stream<Item = WsItem> + Sink<WsMessage> + Unpin,
@@ -10,7 +10,7 @@ use crate::registration::handshake::{error::HandshakeError, WsItem};
 use futures::{Sink, Stream};
 use tungstenite::Message as WsMessage;

-impl<S, R> State<'_, S, R> {
+impl<'a, S, R> State<'a, S, R> {
    async fn gateway_handshake_inner(
        &mut self,
        raw_init_message: Vec<u8>,
@@ -20,10 +20,6 @@ pub enum ClientRequest {
        hkdf_salt: Vec<u8>,
        derived_key_digest: Vec<u8>,
    },
-    ForgetMe {
-        client: bool,
-        stats: bool,
-    },
 }

 impl ClientRequest {
@@ -11,7 +11,6 @@ use tungstenite::Message;
 #[non_exhaustive]
 pub enum SensitiveServerResponse {
    KeyUpgradeAck {},
-    ForgetMeAck {},
 }

 impl SensitiveServerResponse {
@@ -6,10 +6,7 @@ use models::StoredFinishedSession;
 use nym_node_metrics::entry::{ActiveSession, FinishedSession, SessionType};
 use nym_sphinx::DestinationAddressBytes;
 use sessions::SessionManager;
-use sqlx::{
-    sqlite::{SqliteAutoVacuum, SqliteSynchronous},
-    ConnectOptions,
-};
+use sqlx::ConnectOptions;
 use std::path::Path;
 use time::Date;
 use tracing::{debug, error};
@@ -39,9 +36,6 @@ impl PersistentStatsStorage {
        // TODO: we can inject here more stuff based on our gateway global config
        // struct. Maybe different pool size or timeout intervals?
        let opts = sqlx::sqlite::SqliteConnectOptions::new()
-            .journal_mode(sqlx::sqlite::SqliteJournalMode::Wal)
-            .synchronous(SqliteSynchronous::Normal)
-            .auto_vacuum(SqliteAutoVacuum::Incremental)
            .filename(database_path)
            .create_if_missing(true)
            .disable_statement_logging();
@@ -122,16 +116,6 @@ impl PersistentStatsStorage {
            .await?)
    }

-    pub async fn delete_unique_user(
-        &self,
-        client_address: DestinationAddressBytes,
-    ) -> Result<(), StatsStorageError> {
-        Ok(self
-            .session_manager
-            .delete_unique_user(client_address.as_base58_string())
-            .await?)
-    }
-
    pub async fn insert_active_session(
        &self,
        client_address: DestinationAddressBytes,
@@ -71,16 +71,6 @@ impl SessionManager {
        Ok(())
    }

-    pub(crate) async fn delete_unique_user(&self, client_address_b58: String) -> Result<()> {
-        sqlx::query!(
-            "DELETE FROM sessions_unique_users WHERE client_address = ?",
-            client_address_b58
-        )
-        .execute(&self.connection_pool)
-        .await?;
-        Ok(())
-    }
-
    pub(crate) async fn get_unique_users(&self, date: Date) -> Result<Vec<String>> {
        sqlx::query_scalar!(
            "SELECT client_address as count FROM sessions_unique_users WHERE day = ?",
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "DELETE FROM message_store WHERE client_address_bs58 = ?",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": []
-  },
-  "hash": "3ea5542b21a41b14276a8fd6b870c61aa0ddd30fee2565803b88c6086bd2a734"
-}
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "DELETE FROM available_bandwidth WHERE client_id = ?",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": []
-  },
-  "hash": "a3cc707995b8215fa77738cd1a55f9e8d251a3e764104d2a54153895dee1a118"
-}
@@ -49,16 +49,6 @@ impl BandwidthManager {
        Ok(())
    }

-    pub(crate) async fn remove_client(&self, client_id: i64) -> Result<(), sqlx::Error> {
-        sqlx::query!(
-            "DELETE FROM available_bandwidth WHERE client_id = ?",
-            client_id
-        )
-        .execute(&self.connection_pool)
-        .await?;
-        Ok(())
-    }
-
    /// Set the expiration date of the particular client to the provided date.
    pub(crate) async fn set_expiration(
        &self,
@@ -133,17 +133,4 @@ impl InboxManager {
            .await?;
        Ok(())
    }
-
-    pub(crate) async fn remove_messages_for_client(
-        &self,
-        client_address_bs58: &str,
-    ) -> Result<(), sqlx::Error> {
-        sqlx::query!(
-            "DELETE FROM message_store WHERE client_address_bs58 = ?",
-            client_address_bs58
-        )
-        .execute(&self.connection_pool)
-        .await?;
-        Ok(())
-    }
 }
@@ -12,10 +12,7 @@ use nym_credentials_interface::ClientTicket;
 use nym_gateway_requests::shared_key::SharedGatewayKey;
 use nym_sphinx::DestinationAddressBytes;
 use shared_keys::SharedKeysManager;
-use sqlx::{
-    sqlite::{SqliteAutoVacuum, SqliteSynchronous},
-    ConnectOptions,
-};
+use sqlx::ConnectOptions;
 use std::path::Path;
 use tickets::TicketStorageManager;
 use time::OffsetDateTime;
@@ -44,33 +41,6 @@ pub struct GatewayStorage {
 }

 impl GatewayStorage {
-    #[allow(dead_code)]
-    pub(crate) fn client_manager(&self) -> &ClientManager {
-        &self.client_manager
-    }
-
-    pub(crate) fn shared_key_manager(&self) -> &SharedKeysManager {
-        &self.shared_key_manager
-    }
-
-    pub(crate) fn inbox_manager(&self) -> &InboxManager {
-        &self.inbox_manager
-    }
-
-    pub(crate) fn bandwidth_manager(&self) -> &BandwidthManager {
-        &self.bandwidth_manager
-    }
-
-    #[allow(dead_code)]
-    pub(crate) fn ticket_manager(&self) -> &TicketStorageManager {
-        &self.ticket_manager
-    }
-
-    #[allow(dead_code)]
-    pub(crate) fn wireguard_peer_manager(&self) -> &wireguard_peers::WgPeerManager {
-        &self.wireguard_peer_manager
-    }
-
    /// Initialises `PersistentStorage` using the provided path.
    ///
    /// # Arguments
@@ -89,9 +59,6 @@ impl GatewayStorage {
        // TODO: we can inject here more stuff based on our gateway global config
        // struct. Maybe different pool size or timeout intervals?
        let opts = sqlx::sqlite::SqliteConnectOptions::new()
-            .journal_mode(sqlx::sqlite::SqliteJournalMode::Wal)
-            .synchronous(SqliteSynchronous::Normal)
-            .auto_vacuum(SqliteAutoVacuum::Incremental)
            .filename(database_path)
            .create_if_missing(true)
            .disable_statement_logging();
@@ -134,21 +101,6 @@ impl GatewayStorage {
            .await?)
    }

-    pub async fn handle_forget_me(
-        &self,
-        client_address: DestinationAddressBytes,
-    ) -> Result<(), GatewayStorageError> {
-        let client_id = self.get_mixnet_client_id(client_address).await?;
-        self.inbox_manager()
-            .remove_messages_for_client(&client_address.as_base58_string())
-            .await?;
-        self.bandwidth_manager().remove_client(client_id).await?;
-        self.shared_key_manager()
-            .remove_shared_keys(&client_address.as_base58_string())
-            .await?;
-        Ok(())
-    }
-
    pub async fn insert_shared_keys(
        &self,
        client_address: DestinationAddressBytes,
@@ -324,56 +324,6 @@ impl Client {
        }
    }

-    pub fn create_patch_request<B, K, V>(
-        &self,
-        path: PathSegments<'_>,
-        params: Params<'_, K, V>,
-        json_body: &B,
-    ) -> RequestBuilder
-    where
-        B: Serialize + ?Sized,
-        K: AsRef<str>,
-        V: AsRef<str>,
-    {
-        let url = sanitize_url(&self.base_url, path, params);
-        self.reqwest_client.patch(url).json(json_body)
-    }
-
-    pub async fn send_patch_request<B, K, V, E>(
-        &self,
-        path: PathSegments<'_>,
-        params: Params<'_, K, V>,
-        json_body: &B,
-    ) -> Result<Response, HttpClientError<E>>
-    where
-        B: Serialize + ?Sized,
-        K: AsRef<str>,
-        V: AsRef<str>,
-        E: Display,
-    {
-        let url = sanitize_url(&self.base_url, path, params);
-
-        #[cfg(target_arch = "wasm32")]
-        {
-            Ok(wasmtimer::tokio::timeout(
-                self.request_timeout,
-                self.reqwest_client.patch(url).json(json_body).send(),
-            )
-            .await
-            .map_err(|_timeout| HttpClientError::RequestTimeout)??)
-        }
-
-        #[cfg(not(target_arch = "wasm32"))]
-        {
-            Ok(self
-                .reqwest_client
-                .patch(url)
-                .json(json_body)
-                .send()
-                .await?)
-        }
-    }
-
    #[instrument(level = "debug", skip_all)]
    pub async fn get_json<T, K, V, E>(
        &self,
@@ -422,23 +372,6 @@ impl Client {
        parse_response(res, false).await
    }

-    pub async fn patch_json<B, T, K, V, E>(
-        &self,
-        path: PathSegments<'_>,
-        params: Params<'_, K, V>,
-        json_body: &B,
-    ) -> Result<T, HttpClientError<E>>
-    where
-        B: Serialize + ?Sized,
-        for<'a> T: Deserialize<'a>,
-        K: AsRef<str>,
-        V: AsRef<str>,
-        E: Display + DeserializeOwned,
-    {
-        let res = self.send_patch_request(path, params, json_body).await?;
-        parse_response(res, true).await
-    }
-
    #[instrument(level = "debug", skip_all)]
    pub async fn get_json_endpoint<T, S, E>(&self, endpoint: S) -> Result<T, HttpClientError<E>>
    where
@@ -533,42 +466,6 @@ impl Client {

        parse_response(res, false).await
    }
-
-    pub async fn patch_json_endpoint<B, T, S, E>(
-        &self,
-        endpoint: S,
-        json_body: &B,
-    ) -> Result<T, HttpClientError<E>>
-    where
-        B: Serialize + ?Sized,
-        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
-                    .patch(self.base_url.join(endpoint.as_ref())?)
-                    .json(json_body)
-                    .send(),
-            )
-            .await
-            .map_err(|_timeout| HttpClientError::RequestTimeout)??
-        };
-
-        #[cfg(not(target_arch = "wasm32"))]
-        let res = {
-            self.reqwest_client
-                .patch(self.base_url.join(endpoint.as_ref())?)
-                .json(json_body)
-                .send()
-                .await?
-        };
-
-        parse_response(res, true).await
-    }
 }

 // define those methods on the trait for nicer extensions (and not having to type the thing twice)
@@ -10,7 +10,6 @@ use serde::{Deserialize, Serialize};
 pub mod middleware;

 #[derive(Debug, Clone)]
-#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 pub enum FormattedResponse<T> {
    Json(Json<T>),
    Yaml(Yaml<T>),
@@ -57,14 +57,3 @@ pub mod wireguard {
    pub const WG_TUN_DEVICE_IP_ADDRESS_V6: Ipv6Addr = Ipv6Addr::new(0xfc01, 0, 0, 0, 0, 0, 0, 0x1); // fc01::1
    pub const WG_TUN_DEVICE_NETMASK_V6: u8 = 112;
 }
-
-pub mod mixnet_vpn {
-    use std::net::{Ipv4Addr, Ipv6Addr};
-
-    // The interface used to route traffic
-    pub const NYM_TUN_BASE_NAME: &str = "nymtun";
-    pub const NYM_TUN_DEVICE_ADDRESS_V4: Ipv4Addr = Ipv4Addr::new(10, 0, 0, 1);
-    pub const NYM_TUN_DEVICE_NETMASK_V4: Ipv4Addr = Ipv4Addr::new(255, 255, 0, 0);
-    pub const NYM_TUN_DEVICE_ADDRESS_V6: Ipv6Addr = Ipv6Addr::new(0xfc00, 0, 0, 0, 0, 0, 0, 0x1); // fc00::1
-    pub const NYM_TUN_DEVICE_NETMASK_V6: &str = "112";
-}
@@ -65,14 +65,6 @@ impl<T> NonExhaustiveDelayQueue<T> {
    pub fn remove(&mut self, key: &QueueKey) -> Expired<T> {
        self.inner.remove(key)
    }
-
-    pub fn len(&self) -> usize {
-        self.inner.len()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.inner.is_empty()
-    }
 }

 impl<T> Default for NonExhaustiveDelayQueue<T> {
@@ -12,6 +12,6 @@ license.workspace = true

 [dependencies]
 prometheus = { workspace = true }
-tracing = { workspace = true }
+log = { workspace = true }
 dashmap = { workspace = true }
 lazy_static = { workspace = true }
@@ -1,18 +1,14 @@
 use dashmap::DashMap;
+pub use log::error;
+use log::{debug, warn};
 use std::fmt;
-use tracing::{debug, error, warn};
-
-use prometheus::{
-    core::Collector, Encoder as _, Gauge, Histogram, HistogramOpts, IntCounter, IntGauge, Registry,
-    TextEncoder,
-};
-
-pub use prometheus::HistogramTimer;
 pub use std::time::Instant;

+use prometheus::{core::Collector, Encoder as _, IntCounter, IntGauge, Registry, TextEncoder};
+
 #[macro_export]
 macro_rules! prepend_package_name {
-    ($name: tt) => {
+    ($name: literal) => {
        &format!(
            "{}_{}",
            std::module_path!()
@@ -27,29 +23,15 @@ macro_rules! prepend_package_name {

 #[macro_export]
 macro_rules! inc_by {
-    ($name:literal, $x:expr, $help: expr) => {
-        $crate::REGISTRY.maybe_register_and_inc_by(
-            $crate::prepend_package_name!($name),
-            $x as i64,
-            $help,
-        );
-    };
    ($name:literal, $x:expr) => {
-        $crate::REGISTRY.maybe_register_and_inc_by(
-            $crate::prepend_package_name!($name),
-            $x as i64,
-            None,
-        );
+        $crate::REGISTRY.inc_by($crate::prepend_package_name!($name), $x as i64);
    };
 }

 #[macro_export]
 macro_rules! inc {
-    ($name:literal, $help: expr) => {
-        $crate::REGISTRY.maybe_register_and_inc($crate::prepend_package_name!($name), $help);
-    };
    ($name:literal) => {
-        $crate::REGISTRY.maybe_register_and_inc($crate::prepend_package_name!($name), None);
+        $crate::REGISTRY.inc($crate::prepend_package_name!($name));
    };
 }

@@ -60,71 +42,6 @@ macro_rules! metrics {
    };
 }

-#[macro_export]
-macro_rules! set_metric {
-    ($name:literal, $x:expr, $help: expr) => {
-        $crate::REGISTRY.maybe_register_and_set(
-            $crate::prepend_package_name!($name),
-            $x as i64,
-            $help,
-        );
-    };
-    ($name:literal, $x:expr) => {
-        $crate::REGISTRY.maybe_register_and_set(
-            $crate::prepend_package_name!($name),
-            $x as i64,
-            None,
-        );
-    };
-}
-
-#[macro_export]
-macro_rules! set_metric_float {
-    ($name:literal, $x:expr, $help: expr) => {
-        $crate::REGISTRY.maybe_register_and_set_float(
-            $crate::prepend_package_name!($name),
-            $x as f64,
-            $help,
-        );
-    };
-    ($name:literal, $x:expr) => {
-        $crate::REGISTRY.maybe_register_and_set_float(
-            $crate::prepend_package_name!($name),
-            $x as f64,
-            None,
-        );
-    };
-}
-
-#[macro_export]
-macro_rules! add_histogram_obs {
-    ($name:expr, $x:expr, $b:expr, $help:expr) => {
-        $crate::REGISTRY.maybe_register_and_add_to_histogram(
-            $crate::prepend_package_name!($name),
-            $x as f64,
-            Some($b),
-            $help,
-        );
-    };
-
-    ($name:expr, $x:expr, $b:expr) => {
-        $crate::REGISTRY.maybe_register_and_add_to_histogram(
-            $crate::prepend_package_name!($name),
-            $x as f64,
-            Some($b),
-            None,
-        );
-    };
-    ($name:expr, $x:expr) => {
-        $crate::REGISTRY.maybe_register_and_add_to_histogram(
-            $crate::prepend_package_name!($name),
-            $x as f64,
-            None,
-            None,
-        );
-    };
-}
-
 #[macro_export]
 macro_rules! nanos {
    ( $name:literal, $x:expr ) => {{
@@ -133,7 +50,7 @@ macro_rules! nanos {
        let r = $x;
        let duration = start.elapsed().as_nanos() as i64;
        let name = $crate::prepend_package_name!($name);
-        $crate::REGISTRY.maybe_register_and_inc_by(&format!("{}_nanos", $name), duration, None);
+        $crate::REGISTRY.inc_by(&format!("{}_nanos", $name), duration);
        r
    }};
 }
@@ -142,100 +59,15 @@ lazy_static::lazy_static! {
    pub static ref REGISTRY: MetricsController = MetricsController::default();
 }

-pub fn metrics_registry() -> &'static MetricsController {
-    &REGISTRY
-}
-
 #[derive(Default)]
 pub struct MetricsController {
    registry: Registry,
    registry_index: DashMap<String, Metric>,
 }

-pub enum Metric {
-    IntCounter(Box<IntCounter>),
-    IntGauge(Box<IntGauge>),
-    FloatGauge(Box<Gauge>),
-    Histogram(Box<Histogram>),
-}
-
-impl Metric {
-    pub fn new_int_counter(name: &str, help: &str) -> Option<Self> {
-        match IntCounter::new(sanitize_metric_name(name), help) {
-            Ok(c) => Some(c.into()),
-            Err(err) => {
-                error!("Failed to create counter {name:?}: {err}");
-                None
-            }
-        }
-    }
-
-    pub fn new_int_gauge(name: &str, help: &str) -> Option<Self> {
-        match IntGauge::new(sanitize_metric_name(name), help) {
-            Ok(g) => Some(g.into()),
-            Err(err) => {
-                error!("Failed to create gauge {name:?}: {err}");
-                None
-            }
-        }
-    }
-
-    pub fn new_float_gauge(name: &str, help: &str) -> Option<Self> {
-        match Gauge::new(sanitize_metric_name(name), help) {
-            Ok(g) => Some(g.into()),
-            Err(err) => {
-                error!("Failed to create gauge {name:?}: {err}");
-                None
-            }
-        }
-    }
-
-    pub fn new_histogram(name: &str, help: &str, buckets: Option<&[f64]>) -> Option<Self> {
-        let mut opts = HistogramOpts::new(sanitize_metric_name(name), help);
-        if let Some(buckets) = buckets {
-            opts = opts.buckets(buckets.to_vec())
-        }
-        match Histogram::with_opts(opts) {
-            Ok(h) => Some(Metric::Histogram(Box::new(h))),
-            Err(err) => {
-                error!("failed to create histogram {name:?}: {err}");
-                None
-            }
-        }
-    }
-
-    fn as_collector(&self) -> Box<dyn Collector> {
-        match self {
-            Metric::IntCounter(c) => c.clone(),
-            Metric::IntGauge(g) => g.clone(),
-            Metric::FloatGauge(g) => g.clone(),
-            Metric::Histogram(h) => h.clone(),
-        }
-    }
-}
-
-impl From<IntCounter> for Metric {
-    fn from(v: IntCounter) -> Self {
-        Metric::IntCounter(Box::new(v))
-    }
-}
-
-impl From<IntGauge> for Metric {
-    fn from(v: IntGauge) -> Self {
-        Metric::IntGauge(Box::new(v))
-    }
-}
-
-impl From<Gauge> for Metric {
-    fn from(v: Gauge) -> Self {
-        Metric::FloatGauge(Box::new(v))
-    }
-}
-
-impl From<Histogram> for Metric {
-    fn from(v: Histogram) -> Self {
-        Metric::Histogram(Box::new(v))
-    }
+enum Metric {
+    C(Box<IntCounter>),
+    G(Box<IntGauge>),
 }

 fn fq_name(c: &dyn Collector) -> String {
@@ -249,92 +81,34 @@ impl Metric {
    #[inline(always)]
    fn fq_name(&self) -> String {
        match self {
-            Metric::IntCounter(c) => fq_name(c.as_ref()),
-            Metric::IntGauge(g) => fq_name(g.as_ref()),
-            Metric::FloatGauge(g) => fq_name(g.as_ref()),
-            Metric::Histogram(h) => fq_name(h.as_ref()),
+            Metric::C(c) => fq_name(c.as_ref()),
+            Metric::G(g) => fq_name(g.as_ref()),
        }
    }

    #[inline(always)]
    fn inc(&self) {
        match self {
-            Metric::IntCounter(c) => c.inc(),
-            Metric::IntGauge(g) => g.inc(),
-            Metric::FloatGauge(g) => g.inc(),
-            Metric::Histogram(_) => {
-                warn!("invalid operation: attempted to call increment on a histogram")
-            }
+            Metric::C(c) => c.inc(),
+            Metric::G(g) => g.inc(),
        }
    }

    #[inline(always)]
    fn inc_by(&self, value: i64) {
        match self {
-            Metric::IntCounter(c) => c.inc_by(value as u64),
-            Metric::IntGauge(g) => g.add(value),
-            Metric::FloatGauge(g) => {
-                warn!("attempted to increment a float gauge ('{}') by an integer - this is most likely a bug", self.fq_name());
-                g.add(value as f64)
-            }
-            Metric::Histogram(_) => {
-                warn!("invalid operation: attempted to call increment on a histogram")
-            }
+            Metric::C(c) => c.inc_by(value as u64),
+            Metric::G(g) => g.add(value),
        }
    }

    #[inline(always)]
    fn set(&self, value: i64) {
        match self {
-            Metric::IntCounter(_c) => {
+            Metric::C(_c) => {
                warn!("Cannot set value for counter {:?}", self.fq_name());
            }
-            Metric::IntGauge(g) => g.set(value),
-            Metric::FloatGauge(g) => {
-                warn!("attempted to set a float gauge ('{}') to an integer value - this is most likely a bug", self.fq_name());
-                g.set(value as f64)
-            }
-            Metric::Histogram(_) => {
-                warn!("invalid operation: attempted to call set on a histogram")
-            }
-        }
-    }
-
-    #[inline(always)]
-    fn set_float(&self, value: f64) {
-        match self {
-            Metric::IntCounter(_c) => {
-                warn!("Cannot set value for counter {:?}", self.fq_name());
-            }
-            Metric::IntGauge(g) => {
-                warn!("attempted to set a integer gauge ('{}') to a float value - this is most likely a bug", self.fq_name());
-                g.set(value as i64)
-            }
-            Metric::FloatGauge(g) => g.set(value),
-            Metric::Histogram(_) => {
-                warn!("invalid operation: attempted to call increment on a histogram")
-            }
-        }
-    }
-
-    #[inline(always)]
-    fn add_histogram_observation(&self, value: f64) {
-        match self {
-            Metric::Histogram(h) => {
-                h.observe(value);
-            }
-            _ => warn!("attempted to add histogram observation on a non-histogram metric"),
-        }
-    }
-
-    #[inline(always)]
-    fn start_timer(&self) -> Option<HistogramTimer> {
-        match self {
-            Metric::Histogram(h) => Some(h.start_timer()),
-            _ => {
-                warn!("attempted to start histogram observation on a non-histogram metric");
-                None
-            }
+            Metric::G(g) => g.set(value),
        }
    }
 }
@@ -371,165 +145,93 @@ impl MetricsController {
        }
    }

-    pub fn register_int_gauge<'a>(&self, name: &str, help: impl Into<Option<&'a str>>) {
-        let Some(metric) = Metric::new_int_gauge(name, help.into().unwrap_or(name)) else {
-            return;
-        };
-        self.register_metric(metric);
-    }
-
-    pub fn register_float_gauge<'a>(&self, name: &str, help: impl Into<Option<&'a str>>) {
-        let Some(metric) = Metric::new_float_gauge(name, help.into().unwrap_or(name)) else {
-            return;
-        };
-        self.register_metric(metric);
-    }
-
-    pub fn register_int_counter<'a>(&self, name: &str, help: impl Into<Option<&'a str>>) {
-        let Some(metric) = Metric::new_int_counter(name, help.into().unwrap_or(name)) else {
-            return;
-        };
-        self.register_metric(metric);
-    }
-
-    pub fn register_histogram<'a>(
-        &self,
-        name: &str,
-        help: impl Into<Option<&'a str>>,
-        buckets: Option<&[f64]>,
-    ) {
-        let Some(metric) = Metric::new_histogram(name, help.into().unwrap_or(name), buckets) else {
-            return;
-        };
-        self.register_metric(metric);
-    }
-
-    pub fn set(&self, name: &str, value: i64) -> bool {
+    pub fn set(&self, name: &str, value: i64) {
        if let Some(metric) = self.registry_index.get(name) {
            metric.set(value);
-            true
        } else {
-            false
+            let gauge = match IntGauge::new(sanitize_metric_name(name), name) {
+                Ok(g) => g,
+                Err(e) => {
+                    debug!("Failed to create gauge {:?}:\n{}", name, e);
+                    return;
+                }
+            };
+            self.register_gauge(Box::new(gauge));
+            self.set(name, value)
        }
    }

-    pub fn set_float(&self, name: &str, value: f64) -> bool {
-        if let Some(metric) = self.registry_index.get(name) {
-            metric.set_float(value);
-            true
-        } else {
-            false
-        }
-    }
-
-    pub fn add_to_histogram(&self, name: &str, value: f64) -> bool {
-        if let Some(metric) = self.registry_index.get(name) {
-            metric.add_histogram_observation(value);
-            true
-        } else {
-            false
-        }
-    }
-
-    pub fn start_timer(&self, name: &str) -> Option<HistogramTimer> {
-        self.registry_index
-            .get(name)
-            .and_then(|metric| metric.start_timer())
-    }
-
-    pub fn inc(&self, name: &str) -> bool {
+    pub fn inc(&self, name: &str) {
        if let Some(metric) = self.registry_index.get(name) {
            metric.inc();
-            true
        } else {
-            false
+            let counter = match IntCounter::new(sanitize_metric_name(name), name) {
+                Ok(c) => c,
+                Err(e) => {
+                    debug!("Failed to create counter {:?}:\n{}", name, e);
+                    return;
+                }
+            };
+            self.register_counter(Box::new(counter));
+            self.inc(name)
        }
    }

-    pub fn inc_by(&self, name: &str, value: i64) -> bool {
+    pub fn inc_by(&self, name: &str, value: i64) {
        if let Some(metric) = self.registry_index.get(name) {
            metric.inc_by(value);
-            true
        } else {
-            false
+            let counter = match IntCounter::new(sanitize_metric_name(name), name) {
+                Ok(c) => c,
+                Err(e) => {
+                    debug!("Failed to create counter {:?}:\n{}", name, e);
+                    return;
+                }
+            };
+            self.register_counter(Box::new(counter));
+            self.inc_by(name, value)
        }
    }

-    pub fn maybe_register_and_set<'a>(
-        &self,
-        name: &str,
-        value: i64,
-        help: impl Into<Option<&'a str>>,
-    ) {
-        if !self.set(name, value) {
-            let help = help.into();
-            self.register_int_gauge(name, help);
-            self.set(name, value);
-        }
-    }
-
-    pub fn maybe_register_and_set_float<'a>(
-        &self,
-        name: &str,
-        value: f64,
-        help: impl Into<Option<&'a str>>,
-    ) {
-        if !self.set_float(name, value) {
-            let help = help.into();
-            self.register_float_gauge(name, help);
-            self.set_float(name, value);
-        }
-    }
-
-    pub fn maybe_register_and_add_to_histogram<'a>(
-        &self,
-        name: &str,
-        value: f64,
-        buckets: Option<&[f64]>,
-        help: impl Into<Option<&'a str>>,
-    ) {
-        if !self.add_to_histogram(name, value) {
-            let help = help.into();
-            self.register_histogram(name, help, buckets);
-            self.add_to_histogram(name, value);
-        }
-    }
-
-    pub fn maybe_register_and_inc<'a>(&self, name: &str, help: impl Into<Option<&'a str>>) {
-        if !self.inc(name) {
-            let help = help.into();
-            self.register_int_counter(name, help);
-            self.inc(name);
-        }
-    }
-
-    pub fn maybe_register_and_inc_by<'a>(
-        &self,
-        name: &str,
-        value: i64,
-        help: impl Into<Option<&'a str>>,
-    ) {
-        if !self.inc_by(name, value) {
-            let help = help.into();
-            self.register_int_counter(name, help);
-            self.inc_by(name, value);
-        }
-    }
-
-    pub fn register_metric(&self, metric: impl Into<Metric>) {
-        let m = metric.into();
-        let fq_name = m.fq_name();
+    fn register_gauge(&self, metric: Box<IntGauge>) {
+        let fq_name = metric
+            .desc()
+            .first()
+            .map(|d| d.fq_name.clone())
+            .unwrap_or_default();

        if self.registry_index.contains_key(&fq_name) {
            return;
        }

-        match self.registry.register(m.as_collector()) {
+        match self.registry.register(metric.clone()) {
            Ok(_) => {
-                self.registry_index.insert(fq_name, m);
+                self.registry_index
+                    .insert(fq_name, Metric::G(metric.clone()));
            }
-            Err(err) => {
-                debug!("Failed to register '{fq_name}': {err}")
+            Err(e) => {
+                debug!("Failed to register {:?}:\n{}", fq_name, e)
+            }
+        }
+    }
+
+    fn register_counter(&self, metric: Box<IntCounter>) {
+        let fq_name = metric
+            .desc()
+            .first()
+            .map(|d| d.fq_name.clone())
+            .unwrap_or_default();
+
+        if self.registry_index.contains_key(&fq_name) {
+            return;
+        }
+        match self.registry.register(metric.clone()) {
+            Ok(_) => {
+                self.registry_index
+                    .insert(fq_name, Metric::C(metric.clone()));
+            }
+            Err(e) => {
+                debug!("Failed to register {:?}:\n{}", fq_name, e)
            }
        }
    }
@@ -573,15 +275,4 @@ mod tests {
            "packets_sent_34_242_65_133:1789"
        )
    }
-
-    #[test]
-    fn prepend_package_name() {
-        let literal = prepend_package_name!("foo");
-        assert_eq!(literal, "nym_metrics_foo");
-
-        let bar = "bar";
-        let format = format!("foomp_{}", bar);
-        let formatted = prepend_package_name!(format);
-        assert_eq!(formatted, "nym_metrics_foomp_bar");
-    }
 }
@@ -20,6 +20,7 @@ rand = { workspace = true }
 thiserror = { workspace = true }
 sha2 = "0.9"
 bs58 = { workspace = true }
+utoipa = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 rayon = { workspace = true, optional = true }
 zeroize = { workspace = true, features = ["zeroize_derive"] }
@@ -63,4 +64,4 @@ par_signing = ["rayon"]
 # but given it's not done very frequently, it shouldn't be too much of a problem
 # furthermore, we can't and shouldn't dedicate the entire nym-api CPU just for verification,
 # but this feature might potentially be desirable for clients.
-par_verify = ["rayon"]
+par_verify = ["rayon"]
@@ -4,10 +4,10 @@
 use crate::ecash_group_parameters;
 use crate::error::Result;
 use crate::helpers::{g1_tuple_to_bytes, recover_g1_tuple};
-use bls12_381::{G1Projective, Scalar};
 use serde::{Deserialize, Serialize};
 use subtle::Choice;

+pub use bls12_381::{G1Projective, G2Projective, Scalar};
 pub type SignerIndex = u64;

 #[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]
@@ -36,7 +36,7 @@ pub mod common_types;
 pub mod constants;
 pub mod error;
 mod helpers;
-mod proofs;
+pub mod proofs;
 pub mod scheme;
 pub mod tests;
 mod traits;
@@ -115,7 +115,10 @@ pub fn aggregate_signatures(
    let params = ecash_group_parameters();
    // aggregate the signature

-    let signature = Aggregatable::aggregate(signatures, indices)?;
+    let signature = match Aggregatable::aggregate(signatures, indices) {
+        Ok(res) => res,
+        Err(err) => return Err(err),
+    };

    // Ensure the aggregated signature is not an infinity point
    if bool::from(signature.is_at_infinity()) {
@@ -16,6 +16,7 @@ use group::{Curve, Group};
 use itertools::Itertools;
 use std::borrow::Borrow;
 use std::ops::Neg;
+use utoipa::ToSchema;

 pub struct Polynomial {
    coefficients: Vec<Scalar>,
@@ -51,6 +52,17 @@ impl Polynomial {
    }
 }

+#[derive(ToSchema)]
+#[schema(title = "G2Projective")]
+pub struct G2ProjectiveSchema {
+    #[schema(content_encoding = "base16")]
+    pub x: [u64; 6],
+    #[schema(content_encoding = "base16")]
+    pub y: [u64; 6],
+    #[schema(content_encoding = "base16")]
+    pub z: [u64; 6],
+}
+
 #[inline]
 pub fn generate_lagrangian_coefficients_at_origin(points: &[u64]) -> Vec<Scalar> {
    let x = Scalar::zero();
@@ -13,11 +13,7 @@ use crate::{
        models::{CommitSignature, Validator},
    },
 };
-use sqlx::{
-    sqlite::{SqliteAutoVacuum, SqliteSynchronous},
-    types::time::OffsetDateTime,
-    ConnectOptions, Sqlite, Transaction,
-};
+use sqlx::{types::time::OffsetDateTime, ConnectOptions, Sqlite, Transaction};
 use std::{fmt::Debug, path::Path};
 use tendermint::{
    block::{Commit, CommitSig},
@@ -55,9 +51,6 @@ impl ScraperStorage {
    #[instrument]
    pub async fn init<P: AsRef<Path> + Debug>(database_path: P) -> Result<Self, ScraperError> {
        let opts = sqlx::sqlite::SqliteConnectOptions::new()
-            .journal_mode(sqlx::sqlite::SqliteJournalMode::Wal)
-            .synchronous(SqliteSynchronous::Normal)
-            .auto_vacuum(SqliteAutoVacuum::Incremental)
            .filename(database_path)
            .create_if_missing(true)
            .disable_statement_logging();
@@ -428,7 +428,7 @@ impl PacketStatisticsControl {
        while self
            .history
            .front()
-            .is_some_and(|&(t, _)| t < recording_window)
+            .map_or(false, |&(t, _)| t < recording_window)
        {
            self.history.pop_front();
        }
@@ -462,7 +462,7 @@ impl PacketStatisticsControl {
        while self
            .rates
            .front()
-            .is_some_and(|&(t, _)| t < recording_window)
+            .map_or(false, |&(t, _)| t < recording_window)
        {
            self.rates.pop_front();
        }
@@ -58,10 +58,6 @@ pub enum GatewaySessionEvent {
        /// Address of the remote client opening the connection
        client: DestinationAddressBytes,
    },
-    SessionDelete {
-        /// Address of the remote client opening the connection
-        client: DestinationAddressBytes,
-    },
 }

 impl GatewaySessionEvent {
@@ -91,8 +87,4 @@ impl GatewaySessionEvent {
            client,
        }
    }
-
-    pub fn new_session_delete(client: DestinationAddressBytes) -> GatewaySessionEvent {
-        GatewaySessionEvent::SessionDelete { client }
-    }
 }
@@ -14,6 +14,7 @@ readme.workspace = true
 sha2 = { workspace = true }
 rs_merkle = { workspace = true }
 schemars = { workspace = true }
+utoipa = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 time = { workspace = true }

@@ -23,4 +24,4 @@ nym-serde-helpers = { path = "../serde-helpers", features = ["date", "base64", "
 [dev-dependencies]
 rand_chacha = { workspace = true }
 rand = { workspace = true }
-serde_json = { workspace = true }
+serde_json = { workspace = true }
@@ -14,15 +14,18 @@ use serde::{Deserialize, Serialize};
 use sha2::Digest;
 use std::fmt::{Debug, Formatter};
 use time::Date;
+use utoipa::ToSchema;

 // no point in importing the entire contract commons just for this one type
 pub type DepositId = u32;
 pub type DKGEpochId = u64;

-#[derive(Clone, Serialize, Deserialize, Debug, PartialEq, JsonSchema)]
+#[derive(Clone, Serialize, Deserialize, Debug, PartialEq, JsonSchema, ToSchema)]
 #[serde(rename_all = "camelCase")]
 pub struct IssuedTicketbook {
+    #[schema(value_type = u32)]
    pub deposit_id: DepositId,
+    #[schema(value_type = u32)]
    pub epoch_id: DKGEpochId,

    // 96 bytes serialised 'BlindedSignature'
@@ -37,9 +40,11 @@ pub struct IssuedTicketbook {

    #[schemars(with = "String")]
    #[serde(with = "nym_serde_helpers::date")]
+    #[schema(value_type = String)]
    pub expiration_date: Date,

    #[schemars(with = "String")]
+    #[schema(value_type = String)]
    pub ticketbook_type: TicketType,
 }

@@ -80,7 +85,7 @@ pub struct InsertedMerkleLeaf {
    pub leaf: MerkleLeaf,
 }

-#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, PartialOrd, PartialEq, Eq)]
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, PartialOrd, PartialEq, Eq, ToSchema)]
 pub struct MerkleLeaf {
    #[schemars(with = "String")]
    #[serde(with = "nym_serde_helpers::hex")]
@@ -162,16 +167,14 @@ impl IssuedTicketbooksMerkleTree {
    }
 }

-#[derive(Serialize, Deserialize, JsonSchema)]
+#[derive(Serialize, Deserialize, JsonSchema, ToSchema)]
 pub struct IssuedTicketbooksFullMerkleProof {
    #[schemars(with = "String")]
    #[serde(with = "inner_proof_base64_serde")]
+    #[schema(value_type = String)]
    inner_proof: MerkleProof<Sha256>,
-
    included_leaves: Vec<MerkleLeaf>,
-
    total_leaves: usize,
-
    #[schemars(with = "String")]
    #[serde(with = "nym_serde_helpers::hex")]
    root: Vec<u8>,
@@ -22,6 +22,7 @@ strum = { workspace = true, features = ["derive"] }
 thiserror = { workspace = true }
 ts-rs = { workspace = true }
 url = { workspace = true }
+utoipa = { workspace = true }
 x25519-dalek = { workspace = true, features = ["static_secrets"] }

 cosmwasm-std = { workspace = true }
@@ -3,6 +3,7 @@ use nym_mixnet_contract_common::NodeId;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::{collections::HashSet, sync::LazyLock, time::SystemTime};
+use utoipa::ToSchema;

 static NETWORK_MONITORS: LazyLock<HashSet<String>> = LazyLock::new(|| {
    let mut nm = HashSet::new();
@@ -10,8 +11,9 @@ static NETWORK_MONITORS: LazyLock<HashSet<String>> = LazyLock::new(|| {
    nm
 });

-#[derive(Debug, Serialize, Deserialize, JsonSchema, Clone)]
+#[derive(Debug, Serialize, Deserialize, JsonSchema, Clone, ToSchema)]
 pub struct NodeResult {
+    #[schema(value_type = u32)]
    pub node_id: NodeId,
    pub identity: String,
    pub reliability: u8,
@@ -34,7 +36,7 @@ pub enum MonitorResults {
    Gateway(Vec<NodeResult>),
 }

-#[derive(Serialize, Deserialize, JsonSchema)]
+#[derive(Serialize, Deserialize, JsonSchema, ToSchema)]
 pub struct MonitorMessage {
    results: Vec<NodeResult>,
    signature: String,
@@ -36,4 +36,3 @@ nym-gateway-storage = { path = "../gateway-storage" }
 nym-network-defaults = { path = "../network-defaults" }
 nym-task = { path = "../task" }
 nym-wireguard-types = { path = "../wireguard-types" }
-nym-node-metrics = { path = "../../nym-node/nym-node-metrics" }
@@ -85,7 +85,6 @@ pub struct WireguardData {
 #[cfg(target_os = "linux")]
 pub async fn start_wireguard(
    storage: nym_gateway_storage::GatewayStorage,
-    metrics: nym_node_metrics::NymNodeMetrics,
    all_peers: Vec<nym_gateway_storage::models::WireguardPeer>,
    task_client: nym_task::TaskClient,
    wireguard_data: WireguardData,
@@ -176,7 +175,6 @@ pub async fn start_wireguard(
    let wg_api = std::sync::Arc::new(WgApiWrapper::new(wg_api));
    let mut controller = PeerController::new(
        storage,
-        metrics,
        wg_api.clone(),
        host,
        peer_bandwidth_managers,
@@ -16,9 +16,7 @@ use nym_credential_verification::{
    ClientBandwidth,
 };
 use nym_gateway_storage::GatewayStorage;
-use nym_node_metrics::NymNodeMetrics;
 use nym_wireguard_types::DEFAULT_PEER_TIMEOUT_CHECK;
-use std::time::{Duration, SystemTime};
 use std::{collections::HashMap, sync::Arc};
 use tokio::sync::{mpsc, RwLock};
 use tokio_stream::{wrappers::IntervalStream, StreamExt};
@@ -67,11 +65,6 @@ pub struct QueryBandwidthControlResponse {

 pub struct PeerController {
    storage: GatewayStorage,
-
-    // we have "all" metrics of a node, but they're behind a single Arc pointer,
-    // so the overhead is minimal
-    metrics: NymNodeMetrics,
-
    // used to receive commands from individual handles too
    request_tx: mpsc::Sender<PeerControlRequest>,
    request_rx: mpsc::Receiver<PeerControlRequest>,
@@ -83,10 +76,8 @@ pub struct PeerController {
 }

 impl PeerController {
-    #[allow(clippy::too_many_arguments)]
    pub fn new(
        storage: GatewayStorage,
-        metrics: NymNodeMetrics,
        wg_api: Arc<WgApiWrapper>,
        initial_host_information: Host,
        bw_storage_managers: HashMap<Key, (Option<SharedBandwidthStorageManager>, Peer)>,
@@ -132,7 +123,6 @@ impl PeerController {
            request_rx,
            timeout_check_interval,
            task_client,
-            metrics,
        }
    }

@@ -267,55 +257,6 @@ impl PeerController {
        }))
    }

-    async fn update_metrics(&self, new_host: &Host) {
-        let now = SystemTime::now();
-        const ACTIVITY_THRESHOLD: Duration = Duration::from_secs(60);
-
-        let old_host = self.host_information.read().await;
-
-        let total_peers = new_host.peers.len();
-        let mut active_peers = 0;
-        let mut new_rx = 0;
-        let mut new_tx = 0;
-
-        for (peer_key, peer) in new_host.peers.iter() {
-            // only consider pre-existing peers,
-            // so that the value would always be increasing
-            if let Some(prior) = old_host.peers.get(peer_key) {
-                let delta_rx = peer.rx_bytes.saturating_sub(prior.rx_bytes);
-                let delta_tx = prior.tx_bytes.saturating_sub(prior.tx_bytes);
-
-                new_rx += delta_rx;
-                new_tx += delta_tx;
-            }
-
-            // if a peer hasn't performed a handshake in last minute,
-            // I think it's reasonable to assume it's no longer active
-            let Some(last_handshake) = peer.last_handshake else {
-                continue;
-            };
-            let Ok(elapsed) = now.duration_since(last_handshake) else {
-                continue;
-            };
-            if elapsed < ACTIVITY_THRESHOLD {
-                active_peers += 1;
-            }
-        }
-
-        self.metrics.wireguard.update(
-            // if the conversion fails it means we're running not running on a 64bit system
-            // and that's a reason enough for this failure.
-            new_rx.try_into().expect(
-                "failed to convert bytes from u64 to usize - are you running on non 64bit system?",
-            ),
-            new_tx.try_into().expect(
-                "failed to convert bytes from u64 to usize - are you running on non 64bit system?",
-            ),
-            total_peers,
-            active_peers,
-        );
-    }
-
    pub async fn run(&mut self) {
        info!("started wireguard peer controller");
        loop {
@@ -325,8 +266,6 @@ impl PeerController {
                        log::error!("Can't read wireguard kernel data");
                        continue;
                    };
-                    self.update_metrics(&host).await;
-
                    *self.host_information.write().await = host;
                }
                _ = self.task_client.recv() => {
@@ -464,7 +464,10 @@ pub fn instantiate_contracts(
        mixnet_contract_address.clone(),
        &nym_mixnet_contract_common::MigrateMsg {
            vesting_contract_address: Some(vesting_contract_address.to_string()),
+            current_nym_node_semver: "1.1.10".to_string(),
+            version_score_weights: Default::default(),
            unsafe_skip_state_updates: Some(true),
+            version_score_params: Default::default(),
        },
        mixnet_code_id,
    )
@@ -3470,13 +3470,43 @@
    "$schema": "http://json-schema.org/draft-07/schema#",
    "title": "MigrateMsg",
    "type": "object",
+    "required": [
+      "current_nym_node_semver"
+    ],
    "properties": {
+      "current_nym_node_semver": {
+        "type": "string"
+      },
      "unsafe_skip_state_updates": {
        "type": [
          "boolean",
          "null"
        ]
      },
+      "version_score_params": {
+        "default": {
+          "penalty": "0.995",
+          "penalty_scaling": "1.65"
+        },
+        "allOf": [
+          {
+            "$ref": "#/definitions/VersionScoreFormulaParams"
+          }
+        ]
+      },
+      "version_score_weights": {
+        "default": {
+          "major": 100,
+          "minor": 10,
+          "patch": 1,
+          "prerelease": 1
+        },
+        "allOf": [
+          {
+            "$ref": "#/definitions/OutdatedVersionWeights"
+          }
+        ]
+      },
      "vesting_contract_address": {
        "type": [
          "string",
@@ -3484,7 +3514,63 @@
        ]
      }
    },
-    "additionalProperties": false
+    "additionalProperties": false,
+    "definitions": {
+      "Decimal": {
+        "description": "A fixed-point decimal value with 18 fractional digits, i.e. Decimal(1_000_000_000_000_000_000) == 1.0\n\nThe greatest possible value that can be represented is 340282366920938463463.374607431768211455 (which is (2^128 - 1) / 10^18)",
+        "type": "string"
+      },
+      "OutdatedVersionWeights": {
+        "description": "Defines weights for calculating numbers of versions behind the current release.",
+        "type": "object",
+        "required": [
+          "major",
+          "minor",
+          "patch",
+          "prerelease"
+        ],
+        "properties": {
+          "major": {
+            "type": "integer",
+            "format": "uint32",
+            "minimum": 0.0
+          },
+          "minor": {
+            "type": "integer",
+            "format": "uint32",
+            "minimum": 0.0
+          },
+          "patch": {
+            "type": "integer",
+            "format": "uint32",
+            "minimum": 0.0
+          },
+          "prerelease": {
+            "type": "integer",
+            "format": "uint32",
+            "minimum": 0.0
+          }
+        },
+        "additionalProperties": false
+      },
+      "VersionScoreFormulaParams": {
+        "description": "Given the formula of version_score = penalty ^ (versions_behind_factor ^ penalty_scaling) define the relevant parameters",
+        "type": "object",
+        "required": [
+          "penalty",
+          "penalty_scaling"
+        ],
+        "properties": {
+          "penalty": {
+            "$ref": "#/definitions/Decimal"
+          },
+          "penalty_scaling": {
+            "$ref": "#/definitions/Decimal"
+          }
+        },
+        "additionalProperties": false
+      }
+    }
  },
  "sudo": null,
  "responses": {
@@ -2,13 +2,43 @@
  "$schema": "http://json-schema.org/draft-07/schema#",
  "title": "MigrateMsg",
  "type": "object",
+  "required": [
+    "current_nym_node_semver"
+  ],
  "properties": {
+    "current_nym_node_semver": {
+      "type": "string"
+    },
    "unsafe_skip_state_updates": {
      "type": [
        "boolean",
        "null"
      ]
    },
+    "version_score_params": {
+      "default": {
+        "penalty": "0.995",
+        "penalty_scaling": "1.65"
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/VersionScoreFormulaParams"
+        }
+      ]
+    },
+    "version_score_weights": {
+      "default": {
+        "major": 100,
+        "minor": 10,
+        "patch": 1,
+        "prerelease": 1
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/OutdatedVersionWeights"
+        }
+      ]
+    },
    "vesting_contract_address": {
      "type": [
        "string",
@@ -16,5 +46,61 @@
      ]
    }
  },
-  "additionalProperties": false
+  "additionalProperties": false,
+  "definitions": {
+    "Decimal": {
+      "description": "A fixed-point decimal value with 18 fractional digits, i.e. Decimal(1_000_000_000_000_000_000) == 1.0\n\nThe greatest possible value that can be represented is 340282366920938463463.374607431768211455 (which is (2^128 - 1) / 10^18)",
+      "type": "string"
+    },
+    "OutdatedVersionWeights": {
+      "description": "Defines weights for calculating numbers of versions behind the current release.",
+      "type": "object",
+      "required": [
+        "major",
+        "minor",
+        "patch",
+        "prerelease"
+      ],
+      "properties": {
+        "major": {
+          "type": "integer",
+          "format": "uint32",
+          "minimum": 0.0
+        },
+        "minor": {
+          "type": "integer",
+          "format": "uint32",
+          "minimum": 0.0
+        },
+        "patch": {
+          "type": "integer",
+          "format": "uint32",
+          "minimum": 0.0
+        },
+        "prerelease": {
+          "type": "integer",
+          "format": "uint32",
+          "minimum": 0.0
+        }
+      },
+      "additionalProperties": false
+    },
+    "VersionScoreFormulaParams": {
+      "description": "Given the formula of version_score = penalty ^ (versions_behind_factor ^ penalty_scaling) define the relevant parameters",
+      "type": "object",
+      "required": [
+        "penalty",
+        "penalty_scaling"
+      ],
+      "properties": {
+        "penalty": {
+          "$ref": "#/definitions/Decimal"
+        },
+        "penalty_scaling": {
+          "$ref": "#/definitions/Decimal"
+        }
+      },
+      "additionalProperties": false
+    }
+  }
 }
@@ -603,7 +603,7 @@ pub fn query(
 #[entry_point]
 pub fn migrate(
    mut deps: DepsMut<'_>,
-    _env: Env,
+    env: Env,
    msg: MigrateMsg,
 ) -> Result<Response, MixnetContractError> {
    set_build_information!(deps.storage)?;
@@ -612,7 +612,7 @@ pub fn migrate(
    let skip_state_updates = msg.unsafe_skip_state_updates.unwrap_or(false);

    if !skip_state_updates {
-        crate::queued_migrations::restore_node_version_history(deps.branch())?;
+        crate::queued_migrations::add_config_score_params(deps.branch(), env, &msg)?;
    }

    // due to circular dependency on contract addresses (i.e. mixnet contract requiring vesting contract address
@@ -34,13 +34,9 @@ impl NymNodeVersionHistory<'_> {
    }

    fn next_id(&self, storage: &mut dyn Storage) -> Result<u32, MixnetContractError> {
-        let id = self
-            .id_counter
-            .may_load(storage)?
-            .map(|current| current + 1)
-            .unwrap_or_default();
-        self.id_counter.save(storage, &id)?;
-        Ok(id)
+        let next = self.id_counter.may_load(storage)?.unwrap_or_default();
+        self.id_counter.save(storage, &next)?;
+        Ok(next)
    }

    pub fn current_version(
@@ -60,10 +56,10 @@ impl NymNodeVersionHistory<'_> {
    pub fn insert_new(
        &self,
        storage: &mut dyn Storage,
-        entry: &HistoricalNymNodeVersion,
+        entry: HistoricalNymNodeVersion,
    ) -> Result<u32, MixnetContractError> {
        let next_id = self.next_id(storage)?;
-        self.version_history.save(storage, next_id, entry)?;
+        self.version_history.save(storage, next_id, &entry)?;
        Ok(next_id)
    }

@@ -83,7 +79,7 @@ impl NymNodeVersionHistory<'_> {
            // treat this as genesis
            let genesis =
                HistoricalNymNodeVersion::genesis(raw_semver.to_string(), env.block.height);
-            return self.insert_new(storage, &genesis);
+            return self.insert_new(storage, genesis);
        };

        let current_semver = current.version_information.semver_unchecked();
@@ -103,7 +99,7 @@ impl NymNodeVersionHistory<'_> {
            introduced_at_height: env.block.height,
            difference_since_genesis: diff,
        };
-        self.insert_new(storage, &entry)
+        self.insert_new(storage, entry)
    }
 }

@@ -174,218 +170,3 @@ pub(crate) fn initialise_storage(
    ADMIN.set(deps, Some(initial_admin))?;
    Ok(())
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[cfg(test)]
-    mod nym_node_version_history {
-        use super::*;
-        use crate::support::tests::test_helpers::TestSetup;
-        use cosmwasm_std::testing::{mock_dependencies, mock_env};
-
-        #[test]
-        fn getting_current() -> anyhow::Result<()> {
-            // empty storage
-            let deps = mock_dependencies();
-            let storage = NymNodeVersionHistory::new();
-            assert!(storage.current_version(&deps.storage)?.is_none());
-
-            let mut test = TestSetup::new();
-
-            let zeroth = storage.current_version(test.storage())?.unwrap();
-            let manual_zeroth = storage.version_history.load(test.storage(), 0)?;
-            assert_eq!(zeroth.version_information, manual_zeroth);
-
-            // manually update the counter to make sure data is still read correctly
-            let dummy = HistoricalNymNodeVersion {
-                semver: "1.2.3".to_string(),
-                introduced_at_height: 1234,
-                difference_since_genesis: Default::default(),
-            };
-            storage.id_counter.save(test.storage_mut(), &123)?;
-            storage
-                .version_history
-                .save(test.storage_mut(), 123, &dummy)?;
-
-            let updated = storage.current_version(test.storage())?.unwrap();
-            assert_eq!(updated.version_information, dummy);
-
-            Ok(())
-        }
-
-        #[test]
-        fn inserting_new_entry() -> anyhow::Result<()> {
-            let mut test = TestSetup::new();
-            let storage = NymNodeVersionHistory::new();
-
-            let first = HistoricalNymNodeVersion {
-                semver: "1.1.1".to_string(),
-                introduced_at_height: 12,
-                difference_since_genesis: Default::default(),
-            };
-            let second = HistoricalNymNodeVersion {
-                semver: "1.1.2".to_string(),
-                introduced_at_height: 123,
-                difference_since_genesis: Default::default(),
-            };
-            let third = HistoricalNymNodeVersion {
-                semver: "1.1.3".to_string(),
-                introduced_at_height: 1234,
-                difference_since_genesis: Default::default(),
-            };
-
-            assert_eq!(storage.id_counter.load(test.storage())?, 0);
-
-            // id is correctly incremented for each case and no entry is overwritten
-            storage.insert_new(test.storage_mut(), &first)?;
-            assert_eq!(storage.id_counter.load(test.storage())?, 1);
-
-            storage.insert_new(test.storage_mut(), &second)?;
-            assert_eq!(storage.id_counter.load(test.storage())?, 2);
-
-            storage.insert_new(test.storage_mut(), &third)?;
-            assert_eq!(storage.id_counter.load(test.storage())?, 3);
-
-            assert_eq!(storage.version_history.load(test.storage(), 1)?, first);
-            assert_eq!(storage.version_history.load(test.storage(), 2)?, second);
-            assert_eq!(storage.version_history.load(test.storage(), 3)?, third);
-
-            Ok(())
-        }
-
-        #[test]
-        fn inserting_initial_semver() -> anyhow::Result<()> {
-            // empty storage
-            let mut deps = mock_dependencies();
-            let env = mock_env();
-            let storage = NymNodeVersionHistory::new();
-
-            assert!(storage
-                .id_counter
-                .may_load(deps.as_mut().storage)?
-                .is_none());
-
-            storage.try_insert_new(deps.as_mut().storage, &env, "1.1.1")?;
-            assert_eq!(storage.id_counter.load(deps.as_mut().storage)?, 0);
-
-            assert_eq!(
-                storage
-                    .version_history
-                    .load(deps.as_ref().storage, 0)?
-                    .semver,
-                "1.1.1"
-            );
-            assert_eq!(
-                storage
-                    .current_version(deps.as_ref().storage)?
-                    .unwrap()
-                    .version_information
-                    .semver,
-                "1.1.1"
-            );
-
-            Ok(())
-        }
-
-        #[test]
-        fn inserting_second_semver() -> anyhow::Result<()> {
-            let mut test = TestSetup::new();
-            let env = test.env();
-            let storage = NymNodeVersionHistory::new();
-
-            // lower version
-            assert!(storage
-                .try_insert_new(test.storage_mut(), &env, "1.1.9")
-                .is_err());
-            assert!(storage
-                .try_insert_new(test.storage_mut(), &env, "1.0.1")
-                .is_err());
-
-            // malformed
-            assert!(storage
-                .try_insert_new(test.storage_mut(), &env, "1.0")
-                .is_err());
-            assert!(storage
-                .try_insert_new(test.storage_mut(), &env, "1.0bad")
-                .is_err());
-            assert!(storage
-                .try_insert_new(test.storage_mut(), &env, "foomp")
-                .is_err());
-
-            // patch
-            let mut test = TestSetup::new();
-            storage.try_insert_new(test.storage_mut(), &env, "1.1.11")?;
-            let current = storage
-                .current_version(test.storage_mut())?
-                .unwrap()
-                .version_information;
-            assert_eq!(current.semver, "1.1.11");
-            assert_eq!(current.difference_since_genesis.major, 0);
-            assert_eq!(current.difference_since_genesis.minor, 0);
-            assert_eq!(current.difference_since_genesis.patch, 1);
-            assert_eq!(current.difference_since_genesis.prerelease, 0);
-
-            // minor
-            let mut test = TestSetup::new();
-            storage.try_insert_new(test.storage_mut(), &env, "1.2.0")?;
-            let current = storage
-                .current_version(test.storage_mut())?
-                .unwrap()
-                .version_information;
-            assert_eq!(current.semver, "1.2.0");
-            assert_eq!(current.difference_since_genesis.major, 0);
-            assert_eq!(current.difference_since_genesis.minor, 1);
-            assert_eq!(current.difference_since_genesis.patch, 0);
-            assert_eq!(current.difference_since_genesis.prerelease, 0);
-
-            // minor alt.
-            let mut test = TestSetup::new();
-            storage.try_insert_new(test.storage_mut(), &env, "1.2.3")?;
-            let current = storage
-                .current_version(test.storage_mut())?
-                .unwrap()
-                .version_information;
-            assert_eq!(current.semver, "1.2.3");
-            assert_eq!(current.difference_since_genesis.major, 0);
-            assert_eq!(current.difference_since_genesis.minor, 1);
-            assert_eq!(current.difference_since_genesis.patch, 0);
-            assert_eq!(current.difference_since_genesis.prerelease, 0);
-
-            Ok(())
-        }
-
-        #[test]
-        fn inserting_subsequent_semver() -> anyhow::Result<()> {
-            let mut test = TestSetup::new();
-            let env = test.env();
-            let storage = NymNodeVersionHistory::new();
-
-            storage.try_insert_new(test.storage_mut(), &env, "1.2.0")?;
-            storage.try_insert_new(test.storage_mut(), &env, "1.2.1")?;
-            storage.try_insert_new(test.storage_mut(), &env, "1.2.3")?;
-            let current = storage
-                .current_version(test.storage_mut())?
-                .unwrap()
-                .version_information;
-            assert_eq!(current.semver, "1.2.3");
-            assert_eq!(current.difference_since_genesis.major, 0);
-            assert_eq!(current.difference_since_genesis.minor, 1);
-            assert_eq!(current.difference_since_genesis.patch, 3);
-            assert_eq!(current.difference_since_genesis.prerelease, 0);
-
-            storage.try_insert_new(test.storage_mut(), &env, "1.3.0")?;
-            let current = storage
-                .current_version(test.storage_mut())?
-                .unwrap()
-                .version_information;
-            assert_eq!(current.semver, "1.3.0");
-            assert_eq!(current.difference_since_genesis.major, 0);
-            assert_eq!(current.difference_since_genesis.minor, 2);
-            assert_eq!(current.difference_since_genesis.patch, 3);
-            assert_eq!(current.difference_since_genesis.prerelease, 0);
-            Ok(())
-        }
-    }
-}
@@ -238,446 +238,4 @@ pub mod tests {
        // let res = try_update_contract_settings(deps.as_mut(), info, new_params);
        // assert_eq!(Err(MixnetContractError::ZeroActiveSet), res);
    }
-
-    #[cfg(test)]
-    mod updating_current_nym_node_semver {
-        use super::*;
-        use crate::mixnet_contract_settings::queries::query_current_nym_node_version;
-        use crate::support::tests::test_helpers::TestSetup;
-
-        #[test]
-        fn is_restricted_to_the_admin() -> anyhow::Result<()> {
-            let mut test = TestSetup::new();
-
-            let not_admin = mock_info("not-admin", &[]);
-            let admin = mock_info(test.admin().as_ref(), &[]);
-
-            let env = test.env();
-            let res = try_update_current_nym_node_semver(
-                test.deps_mut(),
-                env,
-                not_admin,
-                "1.2.1".to_string(),
-            );
-            assert!(res.is_err());
-
-            let env = test.env();
-            let res = try_update_current_nym_node_semver(
-                test.deps_mut(),
-                env,
-                admin,
-                "1.2.1".to_string(),
-            );
-            assert!(res.is_ok());
-            Ok(())
-        }
-
-        #[test]
-        fn updates_current_semver_value() -> anyhow::Result<()> {
-            let mut test = TestSetup::new();
-
-            let res = query_current_nym_node_version(test.deps())?;
-
-            let initial = res.version.unwrap().version_information.semver;
-            // sanity check to make sure our contract init hasn't changed
-            assert_eq!(initial, "1.1.10");
-
-            let update = "1.2.0".to_string();
-
-            let env = test.env();
-            let sender = test.admin_sender();
-            try_update_current_nym_node_semver(test.deps_mut(), env, sender, update.clone())?;
-
-            let updated = query_current_nym_node_version(test.deps())?;
-            let version = updated.version.unwrap().version_information.semver;
-            assert_eq!(version, update);
-
-            Ok(())
-        }
-
-        #[cfg(test)]
-        mod semver_chain_updates {
-            use super::*;
-            use crate::mixnet_contract_settings::queries::query_nym_node_version_history_paged;
-            use mixnet_contract_common::{
-                HistoricalNymNodeVersion, HistoricalNymNodeVersionEntry, TotalVersionDifference,
-            };
-
-            fn test_setup_with_initial_checks() -> anyhow::Result<TestSetup> {
-                let test = TestSetup::new();
-
-                let res = query_current_nym_node_version(test.deps())?;
-                let initial = res.version.unwrap().version_information.semver;
-
-                // sanity check to make sure our contract init hasn't changed
-                assert_eq!(initial, "1.1.10");
-
-                let history = query_nym_node_version_history_paged(test.deps(), None, None)?;
-                assert_eq!(history.history.len(), 1);
-
-                Ok(test)
-            }
-
-            #[test]
-            fn single_patch() -> anyhow::Result<()> {
-                let mut test = test_setup_with_initial_checks()?;
-                let initial = query_current_nym_node_version(test.deps())?
-                    .version
-                    .unwrap();
-
-                let env = test.env();
-                let sender = test.admin_sender();
-                try_update_current_nym_node_semver(
-                    test.deps_mut(),
-                    env.clone(),
-                    sender,
-                    "1.1.11".to_string(),
-                )?;
-
-                let history =
-                    query_nym_node_version_history_paged(test.deps(), None, None)?.history;
-                assert_eq!(history.len(), 2);
-                assert_eq!(history[0], initial);
-                assert_eq!(
-                    history[1],
-                    HistoricalNymNodeVersionEntry {
-                        id: 1,
-                        version_information: HistoricalNymNodeVersion {
-                            semver: "1.1.11".to_string(),
-                            introduced_at_height: env.block.height,
-                            difference_since_genesis: TotalVersionDifference {
-                                major: 0,
-                                minor: 0,
-                                patch: 1,
-                                prerelease: 0,
-                            },
-                        },
-                    }
-                );
-
-                Ok(())
-            }
-
-            #[test]
-            fn single_minor() -> anyhow::Result<()> {
-                let mut test = test_setup_with_initial_checks()?;
-                let initial = query_current_nym_node_version(test.deps())?
-                    .version
-                    .unwrap();
-
-                let env = test.env();
-                let sender = test.admin_sender();
-                try_update_current_nym_node_semver(
-                    test.deps_mut(),
-                    env.clone(),
-                    sender,
-                    "1.2.0".to_string(),
-                )?;
-
-                let history =
-                    query_nym_node_version_history_paged(test.deps(), None, None)?.history;
-                assert_eq!(history.len(), 2);
-                assert_eq!(history[0], initial);
-                assert_eq!(
-                    history[1],
-                    HistoricalNymNodeVersionEntry {
-                        id: 1,
-                        version_information: HistoricalNymNodeVersion {
-                            semver: "1.2.0".to_string(),
-                            introduced_at_height: env.block.height,
-                            difference_since_genesis: TotalVersionDifference {
-                                major: 0,
-                                minor: 1,
-                                patch: 0,
-                                prerelease: 0,
-                            },
-                        },
-                    }
-                );
-
-                Ok(())
-            }
-
-            #[test]
-            fn multiple_patches() -> anyhow::Result<()> {
-                let mut test = test_setup_with_initial_checks()?;
-                let initial = query_current_nym_node_version(test.deps())?
-                    .version
-                    .unwrap();
-
-                let mut env = test.env();
-                let sender = test.admin_sender();
-                try_update_current_nym_node_semver(
-                    test.deps_mut(),
-                    env.clone(),
-                    sender.clone(),
-                    "1.1.11".to_string(),
-                )?;
-                env.block.height += 1;
-                try_update_current_nym_node_semver(
-                    test.deps_mut(),
-                    env.clone(),
-                    sender.clone(),
-                    "1.1.12".to_string(),
-                )?;
-                env.block.height += 1;
-                try_update_current_nym_node_semver(
-                    test.deps_mut(),
-                    env.clone(),
-                    sender,
-                    "1.1.13".to_string(),
-                )?;
-
-                let history =
-                    query_nym_node_version_history_paged(test.deps(), None, None)?.history;
-                assert_eq!(history.len(), 4);
-                assert_eq!(history[0], initial);
-                assert_eq!(
-                    history[1],
-                    HistoricalNymNodeVersionEntry {
-                        id: 1,
-                        version_information: HistoricalNymNodeVersion {
-                            semver: "1.1.11".to_string(),
-                            introduced_at_height: env.block.height - 2,
-                            difference_since_genesis: TotalVersionDifference {
-                                major: 0,
-                                minor: 0,
-                                patch: 1,
-                                prerelease: 0,
-                            },
-                        },
-                    }
-                );
-                assert_eq!(
-                    history[2],
-                    HistoricalNymNodeVersionEntry {
-                        id: 2,
-                        version_information: HistoricalNymNodeVersion {
-                            semver: "1.1.12".to_string(),
-                            introduced_at_height: env.block.height - 1,
-                            difference_since_genesis: TotalVersionDifference {
-                                major: 0,
-                                minor: 0,
-                                patch: 2,
-                                prerelease: 0,
-                            },
-                        },
-                    }
-                );
-                assert_eq!(
-                    history[3],
-                    HistoricalNymNodeVersionEntry {
-                        id: 3,
-                        version_information: HistoricalNymNodeVersion {
-                            semver: "1.1.13".to_string(),
-                            introduced_at_height: env.block.height,
-                            difference_since_genesis: TotalVersionDifference {
-                                major: 0,
-                                minor: 0,
-                                patch: 3,
-                                prerelease: 0,
-                            },
-                        },
-                    }
-                );
-
-                Ok(())
-            }
-
-            #[test]
-            fn multiple_minors() -> anyhow::Result<()> {
-                let mut test = test_setup_with_initial_checks()?;
-                let initial = query_current_nym_node_version(test.deps())?
-                    .version
-                    .unwrap();
-
-                let mut env = test.env();
-                let sender = test.admin_sender();
-                try_update_current_nym_node_semver(
-                    test.deps_mut(),
-                    env.clone(),
-                    sender.clone(),
-                    "1.2.0".to_string(),
-                )?;
-                env.block.height += 1;
-                try_update_current_nym_node_semver(
-                    test.deps_mut(),
-                    env.clone(),
-                    sender.clone(),
-                    "1.3.0".to_string(),
-                )?;
-                env.block.height += 1;
-                try_update_current_nym_node_semver(
-                    test.deps_mut(),
-                    env.clone(),
-                    sender,
-                    "1.4.0".to_string(),
-                )?;
-
-                let history =
-                    query_nym_node_version_history_paged(test.deps(), None, None)?.history;
-                assert_eq!(history.len(), 4);
-                assert_eq!(history[0], initial);
-                assert_eq!(
-                    history[1],
-                    HistoricalNymNodeVersionEntry {
-                        id: 1,
-                        version_information: HistoricalNymNodeVersion {
-                            semver: "1.2.0".to_string(),
-                            introduced_at_height: env.block.height - 2,
-                            difference_since_genesis: TotalVersionDifference {
-                                major: 0,
-                                minor: 1,
-                                patch: 0,
-                                prerelease: 0,
-                            },
-                        },
-                    }
-                );
-                assert_eq!(
-                    history[2],
-                    HistoricalNymNodeVersionEntry {
-                        id: 2,
-                        version_information: HistoricalNymNodeVersion {
-                            semver: "1.3.0".to_string(),
-                            introduced_at_height: env.block.height - 1,
-                            difference_since_genesis: TotalVersionDifference {
-                                major: 0,
-                                minor: 2,
-                                patch: 0,
-                                prerelease: 0,
-                            },
-                        },
-                    }
-                );
-                assert_eq!(
-                    history[3],
-                    HistoricalNymNodeVersionEntry {
-                        id: 3,
-                        version_information: HistoricalNymNodeVersion {
-                            semver: "1.4.0".to_string(),
-                            introduced_at_height: env.block.height,
-                            difference_since_genesis: TotalVersionDifference {
-                                major: 0,
-                                minor: 3,
-                                patch: 0,
-                                prerelease: 0,
-                            },
-                        },
-                    }
-                );
-
-                Ok(())
-            }
-
-            #[test]
-            fn mixed_multiple_updates() -> anyhow::Result<()> {
-                let mut test = test_setup_with_initial_checks()?;
-                let initial = query_current_nym_node_version(test.deps())?
-                    .version
-                    .unwrap();
-
-                let mut env = test.env();
-                let sender = test.admin_sender();
-                try_update_current_nym_node_semver(
-                    test.deps_mut(),
-                    env.clone(),
-                    sender.clone(),
-                    "1.2.0".to_string(),
-                )?;
-                env.block.height += 1;
-                try_update_current_nym_node_semver(
-                    test.deps_mut(),
-                    env.clone(),
-                    sender.clone(),
-                    "1.2.1".to_string(),
-                )?;
-                env.block.height += 1;
-                try_update_current_nym_node_semver(
-                    test.deps_mut(),
-                    env.clone(),
-                    sender.clone(),
-                    "1.2.3".to_string(),
-                )?;
-                env.block.height += 1;
-                try_update_current_nym_node_semver(
-                    test.deps_mut(),
-                    env.clone(),
-                    sender,
-                    "1.3.0".to_string(),
-                )?;
-
-                let history =
-                    query_nym_node_version_history_paged(test.deps(), None, None)?.history;
-                assert_eq!(history.len(), 5);
-                assert_eq!(history[0], initial);
-                assert_eq!(
-                    history[1],
-                    HistoricalNymNodeVersionEntry {
-                        id: 1,
-                        version_information: HistoricalNymNodeVersion {
-                            semver: "1.2.0".to_string(),
-                            introduced_at_height: env.block.height - 3,
-                            difference_since_genesis: TotalVersionDifference {
-                                major: 0,
-                                minor: 1,
-                                patch: 0,
-                                prerelease: 0,
-                            },
-                        },
-                    }
-                );
-                assert_eq!(
-                    history[2],
-                    HistoricalNymNodeVersionEntry {
-                        id: 2,
-                        version_information: HistoricalNymNodeVersion {
-                            semver: "1.2.1".to_string(),
-                            introduced_at_height: env.block.height - 2,
-                            difference_since_genesis: TotalVersionDifference {
-                                major: 0,
-                                minor: 1,
-                                patch: 1,
-                                prerelease: 0,
-                            },
-                        },
-                    }
-                );
-                assert_eq!(
-                    history[3],
-                    HistoricalNymNodeVersionEntry {
-                        id: 3,
-                        version_information: HistoricalNymNodeVersion {
-                            semver: "1.2.3".to_string(),
-                            introduced_at_height: env.block.height - 1,
-                            difference_since_genesis: TotalVersionDifference {
-                                major: 0,
-                                minor: 1,
-                                patch: 3,
-                                prerelease: 0,
-                            },
-                        },
-                    }
-                );
-                assert_eq!(
-                    history[4],
-                    HistoricalNymNodeVersionEntry {
-                        id: 4,
-                        version_information: HistoricalNymNodeVersion {
-                            semver: "1.3.0".to_string(),
-                            introduced_at_height: env.block.height,
-                            difference_since_genesis: TotalVersionDifference {
-                                major: 0,
-                                minor: 2,
-                                patch: 3,
-                                prerelease: 0,
-                            },
-                        },
-                    }
-                );
-
-                Ok(())
-            }
-        }
-    }
 }
@@ -1,153 +1,86 @@
 // Copyright 2022-2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-mod node_version_history {
+mod config_score_params {
+    use crate::constants::CONTRACT_STATE_KEY;
+    use crate::mixnet_contract_settings::storage as mixnet_params_storage;
    use crate::mixnet_contract_settings::storage::NymNodeVersionHistory;
-    use cosmwasm_std::DepsMut;
+    use cosmwasm_std::{Addr, Coin, DepsMut, Env};
+    use cw_storage_plus::Item;
    use mixnet_contract_common::error::MixnetContractError;
-    use mixnet_contract_common::{HistoricalNymNodeVersion, TotalVersionDifference};
+    use mixnet_contract_common::{
+        ConfigScoreParams, ContractState, ContractStateParams, DelegationsParams, MigrateMsg,
+        OperatingCostRange, OperatorsParams, ProfitMarginRange,
+    };
+    use serde::{Deserialize, Serialize};
+    use std::str::FromStr;

-    pub(crate) fn restore_node_version_history(
+    pub(crate) fn add_config_score_params(
        deps: DepsMut<'_>,
+        env: Env,
+        msg: &MigrateMsg,
    ) -> Result<(), MixnetContractError> {
-        // sanity check:
-        let storage = NymNodeVersionHistory::new();
-        let Some(current) = storage.current_version(deps.storage)? else {
-            return Err(MixnetContractError::FailedMigration {
-                comment: "no node version history set".to_string(),
-            });
-        };
-        if current.version_information.semver != "1.2.1"
-            || current.version_information.introduced_at_height != 15902170
-        {
-            return Err(MixnetContractError::FailedMigration {
-                comment: format!("unexpected current node version history. got: {current:?}"),
+        if semver::Version::from_str(&msg.current_nym_node_semver).is_err() {
+            return Err(MixnetContractError::InvalidNymNodeSemver {
+                provided: msg.current_nym_node_semver.to_string(),
            });
        }
-        let lost = HistoricalNymNodeVersion {
-            semver: "1.1.12".to_string(),
-            introduced_at_height: 15779133,
-            difference_since_genesis: TotalVersionDifference::default(),
-        };

-        #[allow(clippy::unwrap_used)]
-        // SAFETY: this information was already stored in the contract, so it must be a valid semver
-        let difference_since_genesis = lost.cumulative_difference_since_genesis(
-            &current.version_information.semver.parse().unwrap(),
-        );
-        let updated_current = HistoricalNymNodeVersion {
-            semver: current.version_information.semver,
-            introduced_at_height: current.version_information.introduced_at_height,
-            difference_since_genesis,
-        };
+        #[derive(Serialize, Deserialize)]
+        pub struct OldContractState {
+            pub owner: Option<Addr>,
+            pub rewarding_validator_address: Addr,
+            pub vesting_contract_address: Addr,
+            pub rewarding_denom: String,
+            pub params: OldContractStateParams,
+        }

-        // restore overwritten entry for 1.1.12
-        storage.version_history.save(deps.storage, 0, &lost)?;
+        #[derive(Serialize, Deserialize)]
+        pub struct OldContractStateParams {
+            pub minimum_delegation: Option<Coin>,
+            pub minimum_pledge: Coin,
+            #[serde(default)]
+            pub profit_margin: ProfitMarginRange,
+            #[serde(default)]
+            pub interval_operating_cost: OperatingCostRange,
+        }

-        // re-insert 1.2.1 as the current
-        storage
-            .version_history
-            .save(deps.storage, 1, &updated_current)?;
-        storage.id_counter.save(deps.storage, &1)?;
+        const OLD_CONTRACT_STATE: Item<'_, OldContractState> = Item::new(CONTRACT_STATE_KEY);
+        let old_state = OLD_CONTRACT_STATE.load(deps.storage)?;

-        Ok(())
-    }
-}
-
-pub(crate) use node_version_history::restore_node_version_history;
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::mixnet_contract_settings::queries::query_nym_node_version_history_paged;
-    use crate::mixnet_contract_settings::storage::NymNodeVersionHistory;
-    use cosmwasm_std::testing::{mock_dependencies, mock_env};
-    use mixnet_contract_common::{
-        HistoricalNymNodeVersion, HistoricalNymNodeVersionEntry, TotalVersionDifference,
-    };
-
-    #[test]
-    fn fixing_history_storage() -> anyhow::Result<()> {
-        // current state on mainnet:
-        let mut deps = mock_dependencies();
-        let storage = NymNodeVersionHistory::new();
-
-        storage.id_counter.save(deps.as_mut().storage, &0)?;
-        storage.version_history.save(
-            deps.as_mut().storage,
-            0,
-            &HistoricalNymNodeVersion {
-                semver: "1.2.1".to_string(),
-                introduced_at_height: 15902170,
-                difference_since_genesis: Default::default(),
+        #[allow(deprecated)]
+        let new_state = ContractState {
+            owner: old_state.owner,
+            rewarding_validator_address: old_state.rewarding_validator_address,
+            vesting_contract_address: old_state.vesting_contract_address,
+            rewarding_denom: old_state.rewarding_denom,
+            params: ContractStateParams {
+                delegations_params: DelegationsParams {
+                    minimum_delegation: old_state.params.minimum_delegation,
+                },
+                operators_params: OperatorsParams {
+                    minimum_pledge: old_state.params.minimum_pledge,
+                    profit_margin: old_state.params.profit_margin,
+                    interval_operating_cost: old_state.params.interval_operating_cost,
+                },
+                config_score_params: ConfigScoreParams {
+                    version_weights: msg.version_score_weights,
+                    version_score_formula_params: msg.version_score_params,
+                },
            },
+        };
+
+        mixnet_params_storage::CONTRACT_STATE.save(deps.storage, &new_state)?;
+
+        // initialise the version chain
+        NymNodeVersionHistory::new().try_insert_new(
+            deps.storage,
+            &env,
+            &msg.current_nym_node_semver,
        )?;

-        // run migration
-        restore_node_version_history(deps.as_mut())?;
-
-        let current = storage.current_version(deps.as_ref().storage)?.unwrap();
-        assert_eq!(current.version_information.semver, "1.2.1");
-        assert_eq!(current.version_information.introduced_at_height, 15902170);
-        assert_eq!(
-            current.version_information.difference_since_genesis,
-            TotalVersionDifference {
-                major: 0,
-                minor: 1,
-                patch: 0,
-                prerelease: 0,
-            }
-        );
-
-        let history = query_nym_node_version_history_paged(deps.as_ref(), None, None)?.history;
-        assert_eq!(history.len(), 2);
-        assert_eq!(
-            history,
-            vec![
-                HistoricalNymNodeVersionEntry {
-                    id: 0,
-                    version_information: HistoricalNymNodeVersion {
-                        semver: "1.1.12".to_string(),
-                        introduced_at_height: 15779133,
-                        difference_since_genesis: Default::default(),
-                    },
-                },
-                HistoricalNymNodeVersionEntry {
-                    id: 1,
-                    version_information: HistoricalNymNodeVersion {
-                        semver: "1.2.1".to_string(),
-                        introduced_at_height: 15902170,
-                        difference_since_genesis: TotalVersionDifference {
-                            major: 0,
-                            minor: 1,
-                            patch: 0,
-                            prerelease: 0,
-                        },
-                    },
-                }
-            ]
-        );
-
-        let counter = storage.id_counter.load(deps.as_ref().storage)?;
-        assert_eq!(counter, 1);
-
-        // make sure adding another version doesn't mess anything up
-        storage.try_insert_new(deps.as_mut().storage, &mock_env(), "1.3.0")?;
-
-        let current = storage.current_version(deps.as_ref().storage)?.unwrap();
-        assert_eq!(current.version_information.semver, "1.3.0");
-        assert_eq!(
-            current.version_information.difference_since_genesis,
-            TotalVersionDifference {
-                major: 0,
-                minor: 2,
-                patch: 0,
-                prerelease: 0,
-            }
-        );
-        let counter = storage.id_counter.load(deps.as_ref().storage)?;
-        assert_eq!(counter, 2);
-
        Ok(())
    }
 }
+
+pub(crate) use config_score_params::add_config_score_params;
@@ -18,7 +18,7 @@ pub mod test_helpers {
    };
    use crate::interval::{pending_events, storage as interval_storage};
    use crate::mixnet_contract_settings::storage::{
-        self as mixnet_params_storage, minimum_node_pledge, ADMIN,
+        self as mixnet_params_storage, minimum_node_pledge,
    };
    use crate::mixnet_contract_settings::storage::{rewarding_denom, rewarding_validator_address};
    use crate::mixnodes::helpers::get_mixnode_details_by_id;
@@ -318,10 +318,6 @@ pub mod test_helpers {
            compare_decimals(mix_info.delegates, subtotal, Some(epsilon))
        }

-        pub fn admin(&self) -> Addr {
-            ADMIN.get(self.deps()).unwrap().unwrap()
-        }
-
        pub fn random_address(&mut self) -> String {
            format!("n1foomp{}", self.rng.next_u64())
        }
@@ -334,14 +330,6 @@ pub mod test_helpers {
            self.deps.as_mut()
        }

-        pub fn storage(&self) -> &dyn Storage {
-            self.deps().storage
-        }
-
-        pub fn storage_mut(&mut self) -> &mut dyn Storage {
-            self.deps_mut().storage
-        }
-
        pub fn env(&self) -> Env {
            self.env.clone()
        }
@@ -482,10 +470,6 @@ pub mod test_helpers {
                .unwrap()
        }

-        pub fn admin_sender(&self) -> MessageInfo {
-            mock_info(self.admin().as_ref(), &[])
-        }
-
        pub fn owner(&self) -> MessageInfo {
            self.owner.clone()
        }
@@ -4,6 +4,8 @@ The information below is generated with [Redoc](https://redocly.com/docs/redoc)

 There is also an overview of other Validator endpoints at [https://cosmos.directory/nyx](https://cosmos.directory/nyx).

+<br /><br />
+
 <RedocStandalone
  specUrl="https://api.nymtech.net/swagger/swagger.yaml"
  options={{
@@ -1,9 +1,11 @@
 import { RedocStandalone } from 'redoc';

-The information below is generated with [Redoc](https://redocly.com/docs/redoc) consuming the OpenAPI spec found at []() which is also used to generate the Swagger docs deployed at []().
+The information below is generated with [Redoc](https://redocly.com/docs/redoc) consuming the OpenAPI spec found at [https://api.sandbox.nymtech.net/swagger/swagger.yaml](https://api.sandbox.nymtech.net/swagger/swagger.yaml).
+
+<br /><br />

 <RedocStandalone
-  specUrl=""
+  specUrl="https://api.sandbox.nymtech.net/swagger/swagger.yaml"
  options={{
    nativeScrollbars: true,
    theme: {
@@ -3,6 +3,8 @@ import { RedocStandalone } from 'redoc';

 The information below is generated with [Redoc](https://redocly.com/docs/redoc) consuming the OpenAPI spec found at [https://explorer.nymtech.net/api/v1/openapi.json](https://explorer.nymtech.net/api/v1/openapi.json) which is also used to generate the Swagger docs deployed at [https://explorer.nymtech.net/api/swagger/index.html](https://explorer.nymtech.net/api/swagger/index.html).

+<br /><br />
+
 <RedocStandalone
  specUrl="https://sandbox-explorer.nymtech.net/api/v1/openapi.json"
  options={{
@@ -2,6 +2,8 @@ import { RedocStandalone } from 'redoc';

 The information below is generated with [Redoc](https://redocly.com/docs/redoc) consuming the OpenAPI spec found at [https://sandbox-explorer.nymtech.net/api/v1/openapi.json](https://sandbox-explorer.nymtech.net/api/v1/openapi.json) which is also used to generate the Swagger docs deployed at [https://sandbox-explorer.nymtech.net/api/swagger/index.html](https://sandbox-explorer.nymtech.net/api/swagger/index.html).

+<br /><br />
+
 <RedocStandalone
  specUrl="https://sandbox-explorer.nymtech.net/api/v1/openapi.json"
  options={{
@@ -1,3 +1,7 @@
+---
+description: Interactive APIs generated from the OpenAPI specs of various API endpoints offered by bits of Nym infrastructure run both by Nym and community operators for both Mainnet and the Sandbox testnet.
+---
+
 # Introduction

 This site contains interactive APIs generated from the OpenAPI specs of various API endpoints offered by bits of Nym infrastructure run both by Nym and community operators for both Mainnet and the Sandbox testnet.
@@ -2,6 +2,8 @@ import { RedocStandalone } from 'redoc';

 The information below is generated with [Redoc](https://redocly.com/docs/redoc) consuming the OpenAPI spec found at [https://mainnet-node-status-api.nymtech.cc/api-docs/openapi.json](https://mainnet-node-status-api.nymtech.cc/api-docs/openapi.json) which is also used to generate the Swagger docs deployed at [https://mainnet-node-status-api.nymtech.cc/swagger/](https://mainnet-node-status-api.nymtech.cc/swagger/).

+<br /><br />
+
 <RedocStandalone
  specUrl="https://mainnet-node-status-api.nymtech.cc/api-docs/openapi.json"
  options={{
@@ -2,6 +2,8 @@ import { RedocStandalone } from 'redoc';

 The information below is generated with [Redoc](https://redocly.com/docs/redoc) consuming the OpenAPI spec found at [https://sandbox-node-status-api.nymte.ch/api-docs/openapi.json](https://sandbox-node-status-api.nymte.ch/api-docs/openapi.json) which is also used to generate the Swagger docs deployed at [https://sandbox-node-status-api.nymte.ch/swagger/](https://sandbox-node-status-api.nymte.ch/swagger/).

+<br /><br />
+
 <RedocStandalone
  specUrl="https://sandbox-node-status-api.nymte.ch/api-docs/openapi.json"
  options={{
@@ -1,10 +1,27 @@
 import APITable from 'components/api-table.tsx';
+import { RedocStandalone } from 'redoc';
+import { Callout } from 'nextra/components'

 You can find the OpenAPI spec found at [https://validator.nymtech.net/api-docs/openapi.json](https://validator.nymtech.net/api-docs/openapi.json) which is also used to generate the Swagger docs deployed at [https://validator.nymtech.net/api/swagger/index.html](https://validator.nymtech.net/api/swagger/index.html).

+<Callout type="info" emoji="ℹ️">
 You can find the Swagger endpoints of other NymAPI instances at the following endpoints:
 <APITable endpoint="https://api.nymtech.net/cosmwasm/wasm/v1/contract/n19604yflqggs9mk2z26mqygq43q2kr3n932egxx630svywd5mpxjsztfpvx/smart/eyJnZXRfY3VycmVudF9kZWFsZXJzIjogeyJsaW1pdCI6IDMwfX0=" />

 There is also an overview of endpoints at [https://cosmos.directory/nyx](https://cosmos.directory/nyx).
+</Callout>

-> Interactive Redoc component coming soon
+<br /><br />
+
+<RedocStandalone
+  specUrl="http://localhost:8000/api-docs/openapi.json"
+  options={{
+    nativeScrollbars: true,
+    theme: {
+      sidebar: {
+        backgroundColor: '#273239',
+        textColor: '#FCFDFE'
+      }
+    }
+  }}
+/>
@@ -1,3 +1,7 @@
+---
+description: Nym's developer documentation covering core concepts of integrating with the Mixnet, interacting with the Nyx blockchain, an overview of the avaliable tools, and our SDK docs.
+---
+
 # Introduction
 Nym's developer documentation covering core concepts of integrating with the Mixnet, interacting with the Nyx blockchain, an overview of the avaliable tools, and our SDK docs.

@@ -1,3 +1,7 @@
+---
+description: Nym's network documentation covering network architecture, node types, tokenomics, and cryptography.
+---
+
 # Introduction
 Nym's network documentation covering network architecture, node types, tokenomics, and crypto systems.

@@ -1,3 +1,7 @@
+---
+description: Nym's Operators guide containing information and setup guides for the various components of Nym network and Nyx blockchain validators.
+---
+
 # Introduction

 This is **Nym's Operators guide**, containing information and setup guides for the various components of Nym network and Nyx blockchain validators.
@@ -222,7 +222,7 @@ Good performance is much more essential than [total stake](../tokenomics.mdx#sta
 For a comparison we made an example with 5 nodes, where first number is node performance and second stake saturation (assuming all of them `config_score` = 1 for simplification):

 <br />
-<AccordionTemplate name="✏️  Example: Performance ^ 20 * total_stake calculation">
+<AccordionTemplate name="✏️  Example: Performance ^ 20 \* total_stake calculation">
 > node_1 = 1.00 ^ 20 \* 1.0 = 1 <br />
 > node_2 = 1.00 ^ 20 \* 0.5 = 0.5 <br />
 > node_3 = 0.99 ^ 20 \* 1.0 = 0.818 <br />
@@ -11,23 +11,10 @@ const config: DocsThemeConfig = {
    const url = process.env.NEXT_PUBLIC_SITE_URL
    const image = url + '/nym_logo.jpg'

-    // Define descriptions for different "books"
-    const bookDescriptions: Record<string, string> = {
-      '/developers': "Nym's developer documentation covering core concepts of integrating with the Mixnet, interacting with the Nyx blockchain, an overview of the avaliable tools, and our SDK docs.",
-      '/network': "Nym's network documentation covering network architecture, node types, tokenomics, and cryptography.",
-      '/operators': "Nym's Operators guide containing information and setup guides for the various components of Nym network and Nyx blockchain validators.",
-      '/apis': "Interactive APIs generated from the OpenAPI specs of various API endpoints offered by bits of Nym infrastructure run both by Nym and community operators for both Mainnet and the Sandbox testnet."
-    }
-
-    const defaultDescription = 'Nym is a privacy platform. It provides strong network-level privacy against sophisticated end-to-end attackers, and anonymous access control using blinded, re-randomizable, decentralized credentials.'
-
-    const topLevel = '/' + route.split('/')[1]
    const description =
      config.frontMatter.description ||
-      bookDescriptions[topLevel] ||
-      defaultDescription
-
-      const title = config.title + (route === '/' ? '' : ' - Nym docs')
+      'Nym is a privacy platform. It provides strong network-level privacy against sophisticated end-to-end attackers, and anonymous access control using blinded, re-randomizable, decentralized credentials.'
+    const title = config.title + (route === '/' ? '' : ' - Nym docs')

    return (
      <>
@@ -1,6 +1,6 @@
 [package]
 name = "explorer-api"
-version = "1.1.44"
+version = "1.1.43"
 edition = "2021"
 license.workspace = true

@@ -120,7 +120,9 @@ impl ThreadsafeGatewayCache {
            .read()
            .await
            .get(&identity_key)
-            .is_some_and(|cache_item| cache_item.valid_until > SystemTime::now())
+            .map_or(false, |cache_item| {
+                cache_item.valid_until > SystemTime::now()
+            })
    }

    pub(crate) async fn get_locations(&self) -> GatewayLocationCache {
@@ -106,7 +106,9 @@ impl ThreadsafeMixNodesCache {
            .read()
            .await
            .get(&mix_id)
-            .is_some_and(|cache_item| cache_item.valid_until > SystemTime::now())
+            .map_or(false, |cache_item| {
+                cache_item.valid_until > SystemTime::now()
+            })
    }

    pub(crate) async fn get_locations(&self) -> MixnodeLocationCache {
@@ -60,7 +60,9 @@ impl ThreadSafeNymNodesCache {
            .read()
            .await
            .get(&node_id)
-            .is_some_and(|cache_item| cache_item.valid_until > SystemTime::now())
+            .map_or(false, |cache_item| {
+                cache_item.valid_until > SystemTime::now()
+            })
    }

    pub(crate) async fn get_bonded_nymnodes(
@@ -20,7 +20,6 @@ import { NYM_WEBSITE } from '@/app/api/constants'
 import { useMainContext } from '@/app/context/main'
 import { MobileDrawerClose } from '@/app/icons/MobileDrawerClose'
 import { NavOptionType, originalNavOptions } from '@/app/context/nav'
-import { ReleaseAlert } from '@/app/components/ReleaseAlert'
 import { DarkLightSwitchDesktop } from '@/app/components/Switch'
 import { Footer } from '@/app/components/Footer'
 import { ConnectKeplrWallet } from '@/app/components/Wallet/ConnectKeplrWallet'
@@ -370,7 +369,6 @@ export const Nav: FCWithChildren = ({ children }) => {
        style={{ width: `calc(100% - ${drawerWidth}px` }}
        sx={{ py: 5, px: 6, mt: 7 }}
      >
-        <ReleaseAlert />
        {children}
        <Footer />
      </Box>
@@ -22,7 +22,6 @@ import { ExpandableButton } from './DesktopNav'
 import { ConnectKeplrWallet } from '../Wallet/ConnectKeplrWallet'
 import { NetworkTitle } from '../NetworkTitle'
 import { originalNavOptions } from '@/app/context/nav'
-import { ReleaseAlert } from '@/app/components/ReleaseAlert'
 import {SearchToolbar} from "@/app/components/Nav/Search";

 export const MobileNav: FCWithChildren = ({ children }) => {
@@ -138,7 +137,6 @@ export const MobileNav: FCWithChildren = ({ children }) => {
      </Drawer>

      <Box sx={{ width: '100%', p: 4, mt: 7 }}>
-        <ReleaseAlert />
        {children}
        <Footer />
      </Box>
@@ -1,9 +0,0 @@
-import { Alert, Box, Typography } from '@mui/material';
-
-export const ReleaseAlert = () => (
-  <Alert severity="warning" sx={{ mb: 3, fontSize: 'medium', width: '100%' }}>
-    <Box>
-      <Typography>You are now viewing the legacy Nym mixnet explorer. Explorer 2.0 is coming soon.</Typography>
-    </Box>
-  </Alert>
-);
@@ -163,11 +163,4 @@ impl ActiveClientsStore {
    pub(crate) fn size(&self) -> usize {
        self.inner.len()
    }
-
-    pub fn pending_packets(&self) -> usize {
-        self.inner
-            .iter()
-            .map(|client| client.get_sender_ref().len())
-            .sum()
-    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
mfahampshire	7f1baa1db7	sandbox nyx rest api	2024-12-18 14:34:06 +01:00
mfahampshire	6d4eaea1cc	spacing + working openapi local for nymapi	2024-12-18 14:29:28 +01:00
dynco-nym	865b668e12	Move ecash schema out of ecash crate	2024-12-18 13:23:17 +01:00
dynco-nym	c4409e3c1a	Improvements	2024-12-16 19:08:53 +01:00
dynco-nym	3934c556ee	generate Sqlx schema files	2024-12-16 13:47:04 +01:00
dynco-nym	f0da36df7c	Gitattributes to ignore .sqlx diffs	2024-12-16 13:46:43 +01:00
dynco-nym	95989dbb67	Post rebase fixes	2024-12-16 13:32:06 +01:00
dynco-nym	33f2e2ca7d	WIP	2024-12-16 13:24:34 +01:00
dynco-nym	fce494af97	Compiles with utoipa 5.2	2024-12-16 13:24:33 +01:00
dynco-nym	671ce9a399	A bunch of annotations	2024-12-16 12:05:54 +01:00
dynco-nym	1303d404f7	Add cfg_attr	2024-12-16 12:05:54 +01:00
dynco-nym	7618ebf694	rustfmt	2024-12-16 12:05:54 +01:00
dynco-nym	13e64da2ad	ContractBuildInformation on /nym_contracts_detailed	2024-12-16 12:05:54 +01:00
dynco-nym	901b88f98b	Derive ToSchema for more types	2024-12-16 12:05:54 +01:00
dynco-nym	b60f07730b	WIP adding derive(ToSchema)	2024-12-16 12:05:54 +01:00
				`@@ -0,0 +1 @@`
				`nym-validator-rewarder/.sqlx/** diff=nodiff`