Update PULL_REQUEST_TEMPLATE.md

Merge pull request #4603 from nymtech/jon/purge-name-service-and-sp-dir-contracts
Purge name service and service provider directory contracts
2024-06-11 12:11:52 +02:00 · 2024-06-11 11:50:13 +02:00 · 2024-06-11 11:48:00 +02:00 · 2024-06-11 11:06:27 +02:00 · 2024-06-10 16:55:05 +03:00 · 2024-06-07 14:02:47 +03:00
533 changed files with 64192 additions and 22622 deletions
@@ -1,9 +1,43 @@
 # Description

-Closes: #XXXX
+<!-- Please include a summary of the change and which issue is fixed. Also include relevant motivation and context. List any dependencies that are required for this change. -->

-<!-- If appropriate, insert relevant description here -->
+Fixes # (issue)

-# Checklist:
+## Type of Change

- [ ] added a changelog entry to `CHANGELOG.md`
+Please delete options that are not relevant.
+
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- [ ] Documentation update
+
+## How Has This Been Tested?
+
+<!-- Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration -->
+
+- [ ] Test A
+- [ ] Test B
+
+**Test Configuration**:
+* Component:
+* Chain:
+* Binaries:
+* SDK:
+
+## Checklist:
+
+- [ ] My code follows the style guidelines of this project
+- [ ] I have performed a self-review of my own code
+- [ ] I have commented my code, particularly in hard-to-understand areas
+- [ ] I have made corresponding changes to the documentation
+- [ ] My changes generate no new warnings
+- [ ] I have added tests that prove my fix is effective or that my feature works
+- [ ] New and existing unit tests pass locally with my changes
+- [ ] I have added a changelog entry to `CHANGELOG.md`
+- [ ] I have checked my code and corrected any misspellings
+
+## Additional Notes
+
+<!-- Any other notes (e.g. discussions, concerns, etc) you want to include -->
@@ -9,7 +9,11 @@ jobs:
    steps:
      - uses: actions/checkout@v3
      - name: Install Dependencies (Linux)
-        run: sudo apt-get update && sudo apt-get install -y build-essential curl wget libssl-dev libudev-dev squashfs-tools protobuf-compiler git
+        run: sudo apt-get update && sudo apt-get install -y build-essential curl wget libssl-dev libudev-dev squashfs-tools protobuf-compiler git python3 && sudo apt-get update --fix-missing
+      - name: Install pip3
+        run: sudo apt install -y python3-pip  
+      - name: Install Python3 modules
+        run: sudo pip3 install pandas tabulate
      - name: Install rsync
        run: sudo apt-get install rsync
      - uses: rlespinasse/github-slug-action@v3.x
@@ -35,7 +35,7 @@ jobs:
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
-          toolchain: stable
+          toolchain: 1.77
          target: wasm32-unknown-unknown
          override: true

@@ -58,8 +58,6 @@ jobs:
          cp contracts/target/wasm32-unknown-unknown/release/nym_coconut_dkg.wasm $OUTPUT_DIR
          cp contracts/target/wasm32-unknown-unknown/release/cw3_flex_multisig.wasm $OUTPUT_DIR
          cp contracts/target/wasm32-unknown-unknown/release/cw4_group.wasm $OUTPUT_DIR
-          cp contracts/target/wasm32-unknown-unknown/release/nym_service_provider_directory.wasm $OUTPUT_DIR
-          cp contracts/target/wasm32-unknown-unknown/release/nym_name_service.wasm $OUTPUT_DIR

      - name: Deploy branch to CI www
        continue-on-error: true
@@ -13,7 +13,11 @@ jobs:
    steps:
      - uses: actions/checkout@v3
      - name: Install Dependencies (Linux)
-        run: sudo apt-get update && sudo apt-get install -y build-essential curl wget libssl-dev libudev-dev squashfs-tools protobuf-compiler git
+        run: sudo apt-get update && sudo apt-get install -y build-essential curl wget libssl-dev libudev-dev squashfs-tools protobuf-compiler git python3 && sudo apt-get update --fix-missing
+      - name: Install pip3
+        run: sudo apt install -y python3-pip  
+      - name: Install Python3 modules
+        run: sudo pip3 install pandas tabulate
      - name: Install rsync
        run: sudo apt-get install rsync
      - uses: rlespinasse/github-slug-action@v3.x
@@ -17,7 +17,7 @@ jobs:
      - uses: rlespinasse/github-slug-action@v3.x
      - uses: actions/setup-node@v3
        with:
-          node-version: 18
+          node-version: 18.17
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
@@ -4,6 +4,55 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://

 ## [Unreleased]

+## [2024.5-ragusa] (2024-05-22)
+
+- Feature/nym node api location ([#4605])
+- Add optional signature to IPR request/response ([#4604])
+- Feature/unstable tested nodes endpoint ([#4601])
+- nym-api: make report/avg_uptime endpoints ignore blacklist ([#4599])
+- removed blocking for coconut in the final epoch state ([#4598])
+- allow using explicit admin address for issuing freepasses ([#4595])
+- Use rfc3339 for last_polled in described nym-api endpoint ([#4591])
+- Explicitly handle constraint unique violation when importing credential ([#4588])
+- [bugfix] noop flag for nym-api for nymvisor compatibility ([#4586])
+- Chore/additional helpers ([#4585])
+- Feature/wasm coconut ([#4584])
+- upgraded axum and related deps to the most recent version ([#4573])
+- Feature/nyxd scraper pruning ([#4564])
+- Run cargo autoinherit on the main workspace ([#4553])
+- Add rustls-tls to reqwest in validator-client ([#4552])
+- Feature/rewarder voucher issuance ([#4548])
+- make sure 'OffsetDateTimeJsonSchemaWrapper' is serialised with legacy format  ([#4613])
+
+
+[#4613]: https://github.com/nymtech/nym/pull/4613
+[#4605]: https://github.com/nymtech/nym/pull/4605
+[#4604]: https://github.com/nymtech/nym/pull/4604
+[#4601]: https://github.com/nymtech/nym/pull/4601
+[#4599]: https://github.com/nymtech/nym/pull/4599
+[#4598]: https://github.com/nymtech/nym/pull/4598
+[#4595]: https://github.com/nymtech/nym/pull/4595
+[#4591]: https://github.com/nymtech/nym/pull/4591
+[#4588]: https://github.com/nymtech/nym/pull/4588
+[#4586]: https://github.com/nymtech/nym/pull/4586
+[#4585]: https://github.com/nymtech/nym/pull/4585
+[#4584]: https://github.com/nymtech/nym/pull/4584
+[#4573]: https://github.com/nymtech/nym/pull/4573
+[#4564]: https://github.com/nymtech/nym/pull/4564
+[#4553]: https://github.com/nymtech/nym/pull/4553
+[#4552]: https://github.com/nymtech/nym/pull/4552
+[#4548]: https://github.com/nymtech/nym/pull/4548
+
+## [2024.4-nutella] (2024-05-08)
+
+- [fix] apply disable_poisson_rate from internal NR/IPR cfgs ([#4579])
+- updating sign commands to include nym-node ([#4578])
+- changed nym-node redirects from 308 'Permanent Redirect' to 303: 'See Other' ([#4572])
+
+[#4579]: https://github.com/nymtech/nym/pull/4579
+[#4578]: https://github.com/nymtech/nym/pull/4578
+[#4572]: https://github.com/nymtech/nym/pull/4572
+
 ## [2024.3-eclipse] (2024-04-22)

 - Initial release of the first iteration of the Nym Node
@@ -39,8 +39,6 @@ members = [
    "common/cosmwasm-smart-contracts/group-contract",
    "common/cosmwasm-smart-contracts/mixnet-contract",
    "common/cosmwasm-smart-contracts/multisig-contract",
-    "common/cosmwasm-smart-contracts/name-service",
-    "common/cosmwasm-smart-contracts/service-provider-directory",
    "common/cosmwasm-smart-contracts/vesting-contract",
    "common/country-group",
    "common/credential-storage",
@@ -122,6 +120,7 @@ members = [
    #    "wasm/full-nym-wasm",
    "wasm/mix-fetch",
    "wasm/node-tester",
+    "wasm/zknym-lib",
 ]

 default-members = [
@@ -158,44 +157,142 @@ edition = "2021"
 license = "Apache-2.0"

 [workspace.dependencies]
+addr = "0.15.6"
+aes = "0.8.1"
+aes-gcm = "0.10.1"
 anyhow = "1.0.71"
+argon2 = "0.5.0"
 async-trait = "0.1.68"
-axum = "0.6.20"
+axum = "0.7.5"
+axum-extra = "0.9.3"
 base64 = "0.21.4"
-bs58 = "0.5.0"
+bincode = "1.3.3"
 bip39 = { version = "2.0.0", features = ["zeroize"] }
-clap = "4.4.7"
+bitvec = "1.0.0"
+blake3 = "1.3.1"
+bs58 = "0.5.1"
+bytecodec = "0.4.15"
+bytes = "1.5.0"
+cargo_metadata = "0.18.1"
+celes = "2.4.0"
 cfg-if = "1.0.0"
+chacha20 = "0.9.0"
+chacha20poly1305 = "0.10.1"
+chrono = "0.4.31"
+cipher = "0.4.3"
+clap = "4.4.7"
+clap_complete = "4.0"
+clap_complete_fig = "4.0"
+colored = "2.0"
+comfy-table = "6.0.0"
+console-subscriber = "0.1.1"
+console_error_panic_hook = "0.1"
+const-str = "0.5.6"
+const_format = "0.2.32"
+criterion = "0.4"
+csv = "1.3.0"
+ctr = "0.9.1"
+cupid = "0.6.1"
+curve25519-dalek = "4.1"
 dashmap = "5.5.3"
+defguard_wireguard_rs = "0.4.2"
+doc-comment = "0.3"
 dotenvy = "0.15.6"
+ecdsa = "0.16"
+ed25519-dalek = "2.1"
+etherparse = "0.13.0"
+eyre = "0.6.9"
+flate2 = "1.0.28"
 futures = "0.3.28"
 generic-array = "0.14.7"
 getrandom = "0.2.10"
+getset = "0.1.1"
+handlebars = "3.5.5"
+headers = "0.4.0"
+hex = "0.4.3"
+hex-literal = "0.3.3"
+hkdf = "0.12.3"
+hmac = "0.12.1"
+httpcodec = "0.2.3"
+humantime = "2.1.0"
 humantime-serde = "1.1.1"
-hyper = "0.14.27"
+http = "1"
+hyper = "1.3.1"
+indexed_db_futures = "0.3.0"
+inquire = "0.6.2"
+ip_network = "0.4.1"
+isocountry = "0.3.2"
 k256 = "0.13"
 lazy_static = "1.4.0"
+ledger-transport = "0.10.0"
+ledger-transport-hid = "0.10.0"
 log = "0.4"
+maxminddb = "0.23.0"
+mime = "0.3.17"
+nix = "0.27.1"
+notify = "5.1.0"
+okapi = "0.7.0"
 once_cell = "1.7.2"
+opentelemetry = "0.19.0"
+opentelemetry-jaeger = "0.18.0"
 parking_lot = "0.12.1"
+pem = "0.8"
+pin-project = "1.0"
+pretty_env_logger = "0.4.0"
+publicsuffix = "2.2.3"
+quote = "1"
 rand = "0.8.5"
-reqwest = { version = "0.11.22", default-features = false }
+rand-07 = "0.7.3"
+rand_chacha_02 = "0.2"
+rand_core = "0.6.3"
+rand_distr = "0.4"
+rand_pcg = "0.3.1"
+rand_seeder = "0.2.3"
+rayon = "1.5.1"
+regex = "1.8.4"
+reqwest = { version = "0.12.4", default-features = false }
+rocket = "0.5.0"
+rocket_cors = "0.6.0"
+rocket_okapi = "0.8.0"
+safer-ffi = "0.1.4"
 schemars = "0.8.1"
 serde = "1.0.152"
+serde_bytes = "0.11.6"
+serde_derive = "1.0"
 serde_json = "1.0.91"
+serde_repr = "0.1"
+serde_with = "3.4.0"
+serde_yaml = "0.9.25"
+si-scale = "0.2.2"
+sphinx-packet = "0.1.1"
 sqlx = "0.6.3"
+strum = "0.25"
+subtle-encoding = "0.5"
+syn = "1"
 tap = "1.0.1"
-time = "0.3.30"
+tar = "0.4.40"
+tempfile = "3.5.0"
 thiserror = "1.0.48"
+time = "0.3.30"
 tokio = "1.33.0"
-tokio-util = "0.7.10"
+tokio-stream = "0.1.14"
+tokio-test = "0.4.2"
 tokio-tungstenite = { version = "0.20.1" }
+tokio-util = "0.7.10"
+tower = "0.4.13"
+tower-http = "0.5.2"
 tracing = "0.1.37"
-tungstenite = { version = "0.20.1", default-features = false }
+tracing-opentelemetry = "0.19.0"
+tracing-subscriber = "0.3.16"
+tracing-tree = "0.2.2"
 ts-rs = "7.0.0"
-utoipa = "3.5.0"
-utoipa-swagger-ui = "3.1.5"
+tungstenite = { version = "0.20.1", default-features = false }
 url = "2.4"
+utoipa = "4.2.0"
+utoipa-swagger-ui = "6.0.0"
+vergen = { version = "=8.2.6", default-features = false }
+walkdir = "2"
+wasm-bindgen-test = "0.3.36"
 zeroize = "1.6.0"

 prometheus = { version = "0.13.0" }
@@ -207,7 +304,6 @@ bls12_381 = { git = "https://github.com/jstuczyn/bls12_381", branch = "feature/g
 group = "0.13.0"
 ff = "0.13.0"

-
 # cosmwasm-related
 cosmwasm-derive = "=1.4.3"
 cosmwasm-schema = "=1.4.3"
@@ -235,14 +331,16 @@ tendermint-rpc = "0.34" # same version as used by cosmrs
 prost = "0.12"

 # wasm-related dependencies
-gloo-utils = "0.1.7"
-js-sys = "0.3.63"
-serde-wasm-bindgen = "0.5.0"
+gloo-utils = "0.2.0"
+gloo-net = "0.5.0"
+js-sys = "0.3.69"
+serde-wasm-bindgen = "0.6.5"
 tsify = "0.4.5"
-wasm-bindgen = "0.2.86"
-wasm-bindgen-futures = "0.4.37"
+wasm-bindgen = "0.2.92"
+wasm-bindgen-futures = "0.4.39"
 wasmtimer = "0.2.0"
-web-sys = "0.3.63"
+web-sys = "0.3.69"
+

 # Profile settings for individual crates

@@ -105,6 +105,7 @@ sdk-wasm-build:
 	$(MAKE) -C wasm/client
 	$(MAKE) -C wasm/node-tester
 	$(MAKE) -C wasm/mix-fetch
+	$(MAKE) -C wasm/zknym-lib
 	#$(MAKE) -C wasm/full-nym-wasm

 # run this from npm/yarn to ensure tools are in the path, e.g. yarn build:sdk from root of repo
@@ -115,7 +116,7 @@ sdk-typescript-build:
 	yarn --cwd sdk/typescript/codegen/contract-clients build

 # NOTE: These targets are part of the main workspace (but not as wasm32-unknown-unknown)
-WASM_CRATES = extension-storage nym-client-wasm nym-node-tester-wasm
+WASM_CRATES = extension-storage nym-client-wasm nym-node-tester-wasm zknym-lib

 sdk-wasm-test:
 	#cargo test $(addprefix -p , $(WASM_CRATES)) --target wasm32-unknown-unknown -- -Dwarnings
@@ -133,7 +134,7 @@ clippy: sdk-wasm-lint
 # Build contracts ready for deploy
 # -----------------------------------------------------------------------------

-CONTRACTS=vesting_contract mixnet_contract nym_service_provider_directory nym_name_service
+CONTRACTS=vesting_contract mixnet_contract
 CONTRACTS_WASM=$(addsuffix .wasm, $(CONTRACTS))
 CONTRACTS_OUT_DIR=contracts/target/wasm32-unknown-unknown/release

@@ -185,4 +186,4 @@ deb-gateway: build-nym-gateway
 deb-cli: build-nym-cli
 	cargo deb -p nym-cli

-deb: deb-mixnode deb-gateway deb-cli
+deb: deb-mixnode deb-gateway deb-cli
@@ -1,6 +1,6 @@
 [package]
 name = "nym-client"
-version = "1.1.34"
+version = "1.1.35"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 description = "Implementation of the Nym Client"
 edition = "2021"
@@ -25,11 +25,11 @@ bs58 = { workspace = true }
 clap = { workspace = true, features = ["cargo", "derive"] }
 dirs = "4.0"
 log = { workspace = true } # self explanatory
-rand = { version = "0.7.3", features = ["wasm-bindgen"] } # rng-related traits + some rng implementation to use
+rand = { workspace = true }
 serde = { workspace = true, features = ["derive"] } # for config serialization/deserialization
 serde_json = { workspace = true }
 thiserror = { workspace = true }
-tap = "1.0.1"
+tap = { workspace = true }
 time = { workspace = true }
 tokio = { workspace = true, features = ["rt-multi-thread", "net", "signal"] } # async runtime
 tokio-tungstenite = { workspace = true }
@@ -1,6 +1,6 @@
 [package]
 name = "nym-socks5-client"
-version = "1.1.34"
+version = "1.1.35"
 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"
@@ -13,10 +13,10 @@ clap = { workspace = true, features = ["cargo", "derive"] }
 log = { workspace = true }
 serde = { workspace = true, features = ["derive"] } # for config serialization/deserialization
 serde_json = { workspace = true }
-tap = "1.0.1"
+tap = { workspace = true }
 thiserror = { workspace = true }
-tokio = { version = "1.24.1", features = ["rt-multi-thread", "net", "signal"] }
-rand = "0.7.3"
+tokio = { workspace = true, features = ["rt-multi-thread", "net", "signal"] }
+rand = { workspace = true }
 time = { workspace = true }
 url = { workspace = true }
 zeroize = { workspace = true }
@@ -8,6 +8,6 @@ license.workspace = true

 [dependencies]
 futures = { workspace = true }
-log = "0.4"
-notify = "5.1.0"
+log = { workspace = true }
+notify = { workspace = true }
 tokio = { workspace = true, features = ["time"] }
@@ -9,7 +9,7 @@ license.workspace = true
 [dependencies]
 bip39 = { workspace = true }
 log = { workspace = true }
-rand = "0.7.3"
+rand = { workspace = true }
 thiserror = { workspace = true }
 url = { workspace = true }
 zeroize = { workspace = true }
@@ -8,40 +8,28 @@ license = { workspace = true }
 repository = { workspace = true }

 [dependencies]
-const-str = "0.5.6"
+const-str = { workspace = true }
 clap = { workspace = true, features = ["derive"] }
-clap_complete = "4.0"
-clap_complete_fig = "4.0"
+clap_complete = { workspace = true }
+clap_complete_fig = { workspace = true }
 log = { workspace = true }
-pretty_env_logger = "0.4.0"
+pretty_env_logger = { workspace = true }
 semver = "0.11"
 schemars = { workspace = true, features = ["preserve_order"], optional = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true, optional = true }

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


 [build-dependencies]
-vergen = { version = "=8.2.6", default-features = false, features = [
-    "build",
-    "git",
-    "gitcl",
-    "rustc",
-    "cargo",
-] }
+vergen = { workspace = true, features = ["build", "git", "gitcl", "rustc", "cargo"] }

 [features]
 default = []
@@ -12,20 +12,19 @@ license.workspace = true
 async-trait = { workspace = true }
 base64 = "0.21.2"
 bs58 = { workspace = true }
-cfg-if = "1.0.0"
+cfg-if = { workspace = true }
 clap = { workspace = true, optional = true }
 futures = { workspace = true }
 humantime-serde = { workspace = true }
 log = { workspace = true }
-rand = { version = "0.7.3", features = ["wasm-bindgen"] }
+rand = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 sha2 = "0.10.6"
-si-scale = "0.2.2"
-tap = "1.0.1"
+si-scale = { workspace = true }
+tap = { workspace = true }
 thiserror = { workspace = true }
 url = { workspace = true, features = ["serde"] }
-tungstenite = { workspace = true, default-features = false }
 tokio = { workspace = true, features = ["macros"] }
 time = { workspace = true }
 zeroize = { workspace = true }
@@ -74,8 +73,17 @@ workspace = true
 features = ["time"]

 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio-tungstenite]
-version = "0.20.1"
-features = ["rustls-tls-native-roots"]
+workspace = true
+features = ["rustls-tls-webpki-roots"]
+
+[target."cfg(not(target_arch = \"wasm32\"))".dependencies.tungstenite]
+workspace = true
+default-features = true
+features = ["rustls-tls-webpki-roots"]
+
+[target."cfg(target_arch = \"wasm32\")".dependencies.tungstenite]
+workspace = true
+default-features = false

 [target."cfg(target_arch = \"wasm32\")".dependencies.wasm-bindgen-futures]
 workspace = true
@@ -100,7 +108,7 @@ version = "0.3.17"
 features = ["wasm-bindgen"]

 [dev-dependencies]
-tempfile = "3.1.0"
+tempfile = { workspace = true }

 [features]
 default = []
@@ -39,7 +39,7 @@ use log::{debug, error, info, warn};
 use nym_bandwidth_controller::BandwidthController;
 use nym_client_core_gateways_storage::{GatewayDetails, GatewaysDetailsStore};
 use nym_credential_storage::storage::Storage as CredentialStorage;
-use nym_crypto::asymmetric::encryption;
+use nym_crypto::asymmetric::{encryption, identity};
 use nym_gateway_client::{
    AcknowledgementReceiver, GatewayClient, GatewayConfig, MixnetMessageReceiver, PacketRouter,
 };
@@ -670,6 +670,7 @@ where
        let self_address = Self::mix_address(&init_res);
        let ack_key = init_res.client_keys.ack_key();
        let encryption_keys = init_res.client_keys.encryption_keypair();
+        let identity_keys = init_res.client_keys.identity_keypair();

        // the components are started in very specific order. Unless you know what you are doing,
        // do not change that.
@@ -792,6 +793,7 @@ where

        Ok(BaseClient {
            address: self_address,
+            identity_keys,
            client_input: ClientInputStatus::AwaitingProducer {
                client_input: ClientInput {
                    connection_command_sender: client_connection_tx,
@@ -816,6 +818,7 @@ where

 pub struct BaseClient {
    pub address: Recipient,
+    pub identity_keys: Arc<identity::KeyPair>,
    pub client_input: ClientInputStatus,
    pub client_output: ClientOutputStatus,
    pub client_state: ClientState,
@@ -14,9 +14,9 @@ futures = { workspace = true }
 log = { workspace = true }
 thiserror = { workspace = true }
 url = { workspace = true }
-rand = { version = "0.7.3", features = ["wasm-bindgen"] }
-tokio = { version = "1.24.1", features = ["macros"] }
-si-scale = "0.2.2"
+rand = { workspace = true }
+tokio = { workspace = true, features = ["macros"] }
+si-scale = { workspace = true }
 time.workspace = true

 # internal
@@ -48,10 +48,7 @@ features = ["net", "sync", "time"]

 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio-tungstenite]
 workspace = true
-# the choice of this particular tls feature was arbitrary;
-# if you reckon a different one would be more appropriate, feel free to change it
-# features = ["native-tls"]
-features = ["rustls-tls-native-roots"]
+features = ["rustls-tls-webpki-roots"]

 # wasm-only dependencies
 [target."cfg(target_arch = \"wasm32\")".dependencies.wasm-bindgen]
@@ -220,9 +220,18 @@ impl<C, St> GatewayClient<C, St> {

    #[cfg(not(target_arch = "wasm32"))]
    pub async fn establish_connection(&mut self) -> Result<(), GatewayClientError> {
+        debug!(
+            "Attemting to establish connection to gateway at: {}",
+            self.gateway_address
+        );
        let ws_stream = match connect_async(&self.gateway_address).await {
            Ok((ws_stream, _)) => ws_stream,
-            Err(e) => return Err(GatewayClientError::NetworkError(e)),
+            Err(error) => {
+                return Err(GatewayClientError::NetworkConnectionFailed {
+                    address: self.gateway_address.clone(),
+                    source: error,
+                })
+            }
        };

        self.connection = SocketState::Available(Box::new(ws_stream));
@@ -23,6 +23,9 @@ pub enum GatewayClientError {
    #[error("There was a network error: {0}")]
    NetworkErrorWasm(#[from] JsError),

+    #[error("connection failed: {address}: {source}")]
+    NetworkConnectionFailed { address: String, source: WsError },
+
    #[error("Invalid URL: {0}")]
    InvalidURL(String),

@@ -10,7 +10,7 @@ license.workspace = true

 [dependencies]
 base64 = "0.13"
-colored = "2.0"
+colored = { workspace = true }

 nym-coconut-dkg-common = { path = "../../cosmwasm-smart-contracts/coconut-dkg" }
 nym-contracts-common = { path = "../../cosmwasm-smart-contracts/contracts-common" }
@@ -19,12 +19,9 @@ nym-mixnet-contract-common = { path = "../../cosmwasm-smart-contracts/mixnet-con
 nym-vesting-contract-common = { path = "../../cosmwasm-smart-contracts/vesting-contract" }
 nym-coconut-bandwidth-contract-common = { path = "../../cosmwasm-smart-contracts/coconut-bandwidth-contract" }
 nym-multisig-contract-common = { path = "../../cosmwasm-smart-contracts/multisig-contract" }
-nym-name-service-common = { path = "../../cosmwasm-smart-contracts/name-service" }
 nym-group-contract-common = { path = "../../cosmwasm-smart-contracts/group-contract" }
-nym-service-provider-directory-common = { path = "../../cosmwasm-smart-contracts/service-provider-directory" }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
-reqwest = { workspace = true, features = ["json"] }
 nym-http-api-client = { path = "../../../common/http-api-client"}
 thiserror = { workspace = true }
 log = { workspace = true }
@@ -49,14 +46,14 @@ tendermint-rpc = { workspace = true }
 # of cargo's feature unification we'd get `bip32/std` meaning we'd get `std::error::Error` for the re-exported (via cosmrs) bip32::Error type
 bip32 = { workspace = true, default-features = false, features = ["std"] }

-eyre = { version = "0.6" }
+eyre = { workspace = true }
 cw-utils = { workspace = true }
 cw2 = { workspace = true }
 cw3 = { workspace = true }
 cw4 = { workspace = true }
 cw-controllers = { workspace = true }
 prost = { workspace = true, default-features = false }
-flate2 = { version = "1.0.20" }
+flate2 = { workspace = true }
 sha2 = { version = "0.9.5" }
 itertools = { version = "0.10" }
 zeroize = { workspace = true, features = ["zeroize_derive"] }
@@ -67,6 +64,14 @@ cosmwasm-std = { workspace = true }
 workspace = true
 features = ["tokio"]

+[target."cfg(target_arch = \"wasm32\")".dependencies.reqwest]
+workspace = true
+features = ["json"]
+
+[target."cfg(not(target_arch = \"wasm32\"))".dependencies.reqwest]
+workspace = true
+features = ["json", "rustls-tls"]
+
 [dev-dependencies]
 bip39 = { workspace = true }
 cosmrs = { workspace = true, features = ["bip32"] }
@@ -79,14 +84,6 @@ name = "offline_signing"
 # (traits would need to be moved around and refactored themselves)
 required-features = ["http-client"]

-[[example]]
-name = "query_service_provider_directory"
-required-features = ["http-client"]
-
-[[example]]
-name = "query_name_service"
-required-features = ["http-client"]
-
 [features]
 default = ["http-client"]
 http-client = ["cosmrs/rpc"]
@@ -1,37 +0,0 @@
-use std::str::FromStr;
-
-use cosmrs::AccountId;
-use nym_name_service_common::Address;
-use nym_network_defaults::{setup_env, NymNetworkDetails};
-use nym_validator_client::nyxd::contract_traits::{
-    NameServiceQueryClient, PagedNameServiceQueryClient,
-};
-
-#[tokio::main]
-async fn main() {
-    setup_env(Some("../../../envs/qa.env"));
-    let network_details = NymNetworkDetails::new_from_env();
-    let config =
-        nym_validator_client::Config::try_from_nym_network_details(&network_details).unwrap();
-    let client = nym_validator_client::Client::new_query(config).unwrap();
-
-    let config = client.nyxd.get_name_service_config().await.unwrap();
-    println!("config: {config:?}");
-
-    let names_paged = client.nyxd.get_names_paged(None, None).await.unwrap();
-    println!("names (paged): {names_paged:#?}");
-
-    let names = client.nyxd.get_all_names().await.unwrap();
-    println!("names: {names:#?}");
-
-    let owner = AccountId::from_str("n1hmf957kc7arcd39rl7xq8l0a4zyg7kxnv7su87").unwrap();
-    let names_by_owner = client.nyxd.get_names_by_owner(owner).await.unwrap();
-    println!("names (by owner): {names_by_owner:#?}");
-
-    let nym_address = Address::new("client_id.client_key@gateway_id").unwrap();
-    let names_by_address = client.nyxd.get_names_by_address(nym_address).await.unwrap();
-    println!("names (by address): {names_by_address:#?}");
-
-    let service_info = client.nyxd.get_name_entry(1).await;
-    println!("service info: {service_info:#?}");
-}
@@ -1,45 +0,0 @@
-use std::str::FromStr;
-
-use cosmrs::AccountId;
-use nym_network_defaults::{setup_env, NymNetworkDetails};
-use nym_service_provider_directory_common::NymAddress;
-use nym_validator_client::nyxd::contract_traits::{
-    PagedSpDirectoryQueryClient, SpDirectoryQueryClient,
-};
-
-#[tokio::main]
-async fn main() {
-    setup_env(Some("../../../envs/qa.env"));
-    let network_details = NymNetworkDetails::new_from_env();
-    let config =
-        nym_validator_client::Config::try_from_nym_network_details(&network_details).unwrap();
-    let client = nym_validator_client::Client::new_query(config).unwrap();
-
-    let config = client.nyxd.get_service_config().await.unwrap();
-    println!("config: {config:?}");
-
-    let services_paged = client.nyxd.get_services_paged(None, None).await.unwrap();
-    println!("services (paged): {services_paged:#?}");
-
-    let services = client.nyxd.get_all_services().await.unwrap();
-    println!("services: {services:#?}");
-
-    let announcer = AccountId::from_str("n1hmf957kc7arcd39rl7xq8l0a4zyg7kxnv7su87").unwrap();
-    let services_by_announcer = client
-        .nyxd
-        .get_services_by_announcer(announcer)
-        .await
-        .unwrap();
-    println!("services (by announcer): {services_by_announcer:#?}");
-
-    let nym_address = NymAddress::new("foo.bar@gateway");
-    let services_by_nym_address = client
-        .nyxd
-        .get_services_by_nym_address(nym_address)
-        .await
-        .unwrap();
-    assert_eq!(services_by_announcer, services_by_nym_address);
-
-    let service_info = client.nyxd.get_service_info(1).await;
-    println!("service info: {service_info:#?}");
-}
@@ -25,8 +25,6 @@ pub use nym_coconut_dkg_common::types::EpochId;
 use nym_http_api_client::{ApiClient, NO_PARAMS};
 use nym_mixnet_contract_common::mixnode::MixNodeDetails;
 use nym_mixnet_contract_common::{GatewayBond, IdentityKeyRef, MixId};
-use nym_name_service_common::response::NamesListResponse;
-use nym_service_provider_directory_common::response::ServicesListResponse;

 pub mod error;
 pub mod routes;
@@ -492,19 +490,6 @@ pub trait NymApiClientExt: ApiClient {
        )
        .await
    }
-
-    async fn get_service_providers(&self) -> Result<ServicesListResponse, NymAPIError> {
-        log::trace!("Getting service providers");
-        self.get_json(&[routes::API_VERSION, routes::SERVICE_PROVIDERS], NO_PARAMS)
-            .await
-    }
-
-    //async fn get_registered_names(&self) -> Result<Vec<NameEntry>, NymAPIError> {
-    async fn get_registered_names(&self) -> Result<NamesListResponse, NymAPIError> {
-        log::trace!("Getting registered names");
-        self.get_json(&[routes::API_VERSION, routes::REGISTERED_NAMES], NO_PARAMS)
-            .await
-    }
 }

 #[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
@@ -40,4 +40,3 @@ pub const STAKE_SATURATION: &str = "stake-saturation";
 pub const INCLUSION_CHANCE: &str = "inclusion-probability";

 pub const SERVICE_PROVIDERS: &str = "services";
-pub const REGISTERED_NAMES: &str = "names";
@@ -14,8 +14,6 @@ pub mod ephemera_query_client;
 pub mod group_query_client;
 pub mod mixnet_query_client;
 pub mod multisig_query_client;
-pub mod name_service_query_client;
-pub mod sp_directory_query_client;
 pub mod vesting_query_client;

 // signing clients
@@ -25,8 +23,6 @@ pub mod ephemera_signing_client;
 pub mod group_signing_client;
 pub mod mixnet_signing_client;
 pub mod multisig_signing_client;
-pub mod name_service_signing_client;
-pub mod sp_directory_signing_client;
 pub mod vesting_signing_client;

 // re-export query traits
@@ -38,8 +34,6 @@ pub use ephemera_query_client::{EphemeraQueryClient, PagedEphemeraQueryClient};
 pub use group_query_client::{GroupQueryClient, PagedGroupQueryClient};
 pub use mixnet_query_client::{MixnetQueryClient, PagedMixnetQueryClient};
 pub use multisig_query_client::{MultisigQueryClient, PagedMultisigQueryClient};
-pub use name_service_query_client::{NameServiceQueryClient, PagedNameServiceQueryClient};
-pub use sp_directory_query_client::{PagedSpDirectoryQueryClient, SpDirectoryQueryClient};
 pub use vesting_query_client::{PagedVestingQueryClient, VestingQueryClient};

 // re-export signing traits
@@ -49,8 +43,6 @@ pub use ephemera_signing_client::EphemeraSigningClient;
 pub use group_signing_client::GroupSigningClient;
 pub use mixnet_signing_client::MixnetSigningClient;
 pub use multisig_signing_client::MultisigSigningClient;
-pub use name_service_signing_client::NameServiceSigningClient;
-pub use sp_directory_signing_client::SpDirectorySigningClient;
 pub use vesting_signing_client::VestingSigningClient;

 // helper for providing blanket implementation for query clients
@@ -67,10 +59,6 @@ pub trait NymContractsProvider {

    // ephemera-related
    fn ephemera_contract_address(&self) -> Option<&AccountId>;
-
-    // SPs
-    fn name_service_contract_address(&self) -> Option<&AccountId>;
-    fn service_provider_contract_address(&self) -> Option<&AccountId>;
 }

 #[derive(Debug, Clone)]
@@ -84,9 +72,6 @@ pub struct TypedNymContracts {
    pub coconut_dkg_contract_address: Option<AccountId>,

    pub ephemera_contract_address: Option<AccountId>,
-
-    pub service_provider_directory_contract_address: Option<AccountId>,
-    pub name_service_contract_address: Option<AccountId>,
 }

 impl TryFrom<NymContracts> for TypedNymContracts {
@@ -122,14 +107,6 @@ impl TryFrom<NymContracts> for TypedNymContracts {
                .ephemera_contract_address
                .map(|addr| addr.parse())
                .transpose()?,
-            service_provider_directory_contract_address: value
-                .service_provider_directory_contract_address
-                .map(|addr| addr.parse())
-                .transpose()?,
-            name_service_contract_address: value
-                .name_service_contract_address
-                .map(|addr| addr.parse())
-                .transpose()?,
        })
    }
 }
@@ -1,144 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::collect_paged;
-use crate::nyxd::contract_traits::NymContractsProvider;
-use crate::nyxd::{error::NyxdError, CosmWasmClient};
-use async_trait::async_trait;
-use cosmrs::AccountId;
-use nym_contracts_common::{signing::Nonce, ContractBuildInformation};
-use nym_name_service_common::{
-    msg::QueryMsg as NameQueryMsg,
-    response::{ConfigResponse, NamesListResponse, PagedNamesListResponse},
-    Address, NameId, NymName, RegisteredName,
-};
-use serde::Deserialize;
-
-#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
-pub trait NameServiceQueryClient {
-    async fn query_name_service_contract<T>(&self, query: NameQueryMsg) -> Result<T, NyxdError>
-    where
-        for<'a> T: Deserialize<'a>;
-
-    async fn get_name_service_config(&self) -> Result<ConfigResponse, NyxdError> {
-        self.query_name_service_contract(NameQueryMsg::Config {})
-            .await
-    }
-
-    async fn get_name_entry(&self, name_id: NameId) -> Result<RegisteredName, NyxdError> {
-        self.query_name_service_contract(NameQueryMsg::NameId { name_id })
-            .await
-    }
-
-    async fn get_names_paged(
-        &self,
-        start_after: Option<NameId>,
-        limit: Option<u32>,
-    ) -> Result<PagedNamesListResponse, NyxdError> {
-        self.query_name_service_contract(NameQueryMsg::All { limit, start_after })
-            .await
-    }
-
-    async fn get_name_signing_nonce(&self, address: &AccountId) -> Result<Nonce, NyxdError> {
-        self.query_name_service_contract(NameQueryMsg::SigningNonce {
-            address: address.to_string(),
-        })
-        .await
-    }
-
-    async fn get_names_by_owner(&self, owner: AccountId) -> Result<NamesListResponse, NyxdError> {
-        self.query_name_service_contract(NameQueryMsg::ByOwner {
-            owner: owner.to_string(),
-        })
-        .await
-    }
-
-    async fn get_names_by_nym_name(&self, name: NymName) -> Result<NamesListResponse, NyxdError> {
-        self.query_name_service_contract(NameQueryMsg::ByName { name })
-            .await
-    }
-
-    async fn get_names_by_address(&self, address: Address) -> Result<NamesListResponse, NyxdError> {
-        self.query_name_service_contract(NameQueryMsg::ByAddress { address })
-            .await
-    }
-
-    async fn get_name_service_contract_version(
-        &self,
-    ) -> Result<ContractBuildInformation, NyxdError> {
-        self.query_name_service_contract(NameQueryMsg::GetContractVersion {})
-            .await
-    }
-
-    async fn get_name_service_contract_cw2_version(
-        &self,
-    ) -> Result<cw2::ContractVersion, NyxdError> {
-        self.query_name_service_contract(NameQueryMsg::GetCW2ContractVersion {})
-            .await
-    }
-}
-
-#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
-pub trait PagedNameServiceQueryClient: NameServiceQueryClient {
-    async fn get_all_names(&self) -> Result<Vec<RegisteredName>, NyxdError> {
-        collect_paged!(self, get_names_paged, names)
-    }
-}
-
-#[async_trait]
-impl<T> PagedNameServiceQueryClient for T where T: NameServiceQueryClient {}
-
-#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
-impl<C> NameServiceQueryClient for C
-where
-    C: CosmWasmClient + NymContractsProvider + Send + Sync,
-{
-    async fn query_name_service_contract<T>(&self, query: NameQueryMsg) -> Result<T, NyxdError>
-    where
-        for<'a> T: Deserialize<'a>,
-    {
-        let name_service_contract_address = &self
-            .name_service_contract_address()
-            .ok_or_else(|| NyxdError::unavailable_contract_address("name service contract"))?;
-        self.query_contract_smart(name_service_contract_address, &query)
-            .await
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::nyxd::contract_traits::tests::IgnoreValue;
-
-    // it's enough that this compiles and clippy is happy about it
-    #[allow(dead_code)]
-    fn all_query_variants_are_covered<C: NameServiceQueryClient + Send + Sync>(
-        client: C,
-        msg: NameQueryMsg,
-    ) {
-        match msg {
-            NameQueryMsg::NameId { name_id } => client.get_name_entry(name_id).ignore(),
-            NameQueryMsg::ByOwner { owner } => {
-                client.get_names_by_owner(owner.parse().unwrap()).ignore()
-            }
-            NameQueryMsg::ByName { name } => client.get_names_by_nym_name(name).ignore(),
-            NameQueryMsg::ByAddress { address } => client.get_names_by_address(address).ignore(),
-            NameQueryMsg::All { limit, start_after } => {
-                client.get_names_paged(limit, start_after).ignore()
-            }
-            NameQueryMsg::SigningNonce { address } => client
-                .get_name_signing_nonce(&address.parse().unwrap())
-                .ignore(),
-            NameQueryMsg::Config {} => client.get_name_service_config().ignore(),
-            NameQueryMsg::GetContractVersion {} => {
-                client.get_name_service_contract_version().ignore()
-            }
-            NameQueryMsg::GetCW2ContractVersion {} => {
-                client.get_name_service_contract_cw2_version().ignore()
-            }
-        };
-    }
-}
@@ -1,138 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use async_trait::async_trait;
-use nym_contracts_common::signing::MessageSignature;
-use nym_name_service_common::{msg::ExecuteMsg as NameExecuteMsg, NameDetails, NameId, NymName};
-
-use crate::nyxd::contract_traits::NymContractsProvider;
-use crate::nyxd::{
-    coin::Coin, cosmwasm_client::types::ExecuteResult, error::NyxdError, Fee, SigningCosmWasmClient,
-};
-use crate::signing::signer::OfflineSigner;
-
-#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
-pub trait NameServiceSigningClient {
-    async fn execute_name_service_contract(
-        &self,
-        fee: Option<Fee>,
-        msg: NameExecuteMsg,
-        funds: Vec<Coin>,
-    ) -> Result<ExecuteResult, NyxdError>;
-
-    async fn register_name(
-        &self,
-        name: NameDetails,
-        owner_signature: MessageSignature,
-        deposit: Coin,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NyxdError> {
-        self.execute_name_service_contract(
-            fee,
-            NameExecuteMsg::Register {
-                name,
-                owner_signature,
-            },
-            vec![deposit],
-        )
-        .await
-    }
-
-    async fn delete_name_by_id(
-        &self,
-        name_id: NameId,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NyxdError> {
-        self.execute_name_service_contract(fee, NameExecuteMsg::DeleteId { name_id }, vec![])
-            .await
-    }
-
-    async fn delete_service_provider_by_name(
-        &self,
-        name: NymName,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NyxdError> {
-        self.execute_name_service_contract(fee, NameExecuteMsg::DeleteName { name }, vec![])
-            .await
-    }
-
-    async fn update_deposit_required(
-        &self,
-        deposit_required: Coin,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NyxdError> {
-        self.execute_name_service_contract(
-            fee,
-            NameExecuteMsg::UpdateDepositRequired {
-                deposit_required: deposit_required.into(),
-            },
-            vec![],
-        )
-        .await
-    }
-}
-
-#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
-impl<C> NameServiceSigningClient for C
-where
-    C: SigningCosmWasmClient + NymContractsProvider + Sync,
-    NyxdError: From<<Self as OfflineSigner>::Error>,
-{
-    async fn execute_name_service_contract(
-        &self,
-        fee: Option<Fee>,
-        msg: NameExecuteMsg,
-        funds: Vec<Coin>,
-    ) -> Result<ExecuteResult, NyxdError> {
-        let name_service_contract_address = &self
-            .name_service_contract_address()
-            .ok_or_else(|| NyxdError::unavailable_contract_address("name service contract"))?;
-
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier())));
-        let memo = msg.default_memo();
-
-        let signer_address = &self.signer_addresses()?[0];
-        self.execute(
-            signer_address,
-            name_service_contract_address,
-            &msg,
-            fee,
-            memo,
-            funds,
-        )
-        .await
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::nyxd::contract_traits::tests::{mock_coin, IgnoreValue};
-
-    // it's enough that this compiles and clippy is happy about it
-    #[allow(dead_code)]
-    fn all_execute_variants_are_covered<C: NameServiceSigningClient + Send + Sync>(
-        client: C,
-        msg: NameExecuteMsg,
-    ) {
-        match msg {
-            NameExecuteMsg::Register {
-                name,
-                owner_signature,
-            } => client
-                .register_name(name, owner_signature, mock_coin(), None)
-                .ignore(),
-            NameExecuteMsg::DeleteId { name_id } => {
-                client.delete_name_by_id(name_id, None).ignore()
-            }
-            NameExecuteMsg::DeleteName { name } => {
-                client.delete_service_provider_by_name(name, None).ignore()
-            }
-            NameExecuteMsg::UpdateDepositRequired { deposit_required } => client
-                .update_deposit_required(deposit_required.into(), None)
-                .ignore(),
-        };
-    }
-}
@@ -1,142 +0,0 @@
-use crate::collect_paged;
-use async_trait::async_trait;
-use cosmrs::AccountId;
-use nym_contracts_common::{signing::Nonce, ContractBuildInformation};
-use nym_service_provider_directory_common::{
-    msg::QueryMsg as SpQueryMsg,
-    response::{
-        ConfigResponse, PagedServicesListResponse, ServiceInfoResponse, ServicesListResponse,
-    },
-    NymAddress, Service, ServiceId,
-};
-use serde::Deserialize;
-
-use crate::nyxd::contract_traits::NymContractsProvider;
-use crate::nyxd::{error::NyxdError, CosmWasmClient};
-
-#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
-pub trait SpDirectoryQueryClient {
-    async fn query_service_provider_contract<T>(&self, query: SpQueryMsg) -> Result<T, NyxdError>
-    where
-        for<'a> T: Deserialize<'a>;
-
-    async fn get_service_config(&self) -> Result<ConfigResponse, NyxdError> {
-        self.query_service_provider_contract(SpQueryMsg::Config {})
-            .await
-    }
-
-    async fn get_service_info(
-        &self,
-        service_id: ServiceId,
-    ) -> Result<ServiceInfoResponse, NyxdError> {
-        self.query_service_provider_contract(SpQueryMsg::ServiceId { service_id })
-            .await
-    }
-
-    async fn get_services_paged(
-        &self,
-        start_after: Option<ServiceId>,
-        limit: Option<u32>,
-    ) -> Result<PagedServicesListResponse, NyxdError> {
-        self.query_service_provider_contract(SpQueryMsg::All { limit, start_after })
-            .await
-    }
-
-    async fn get_services_by_announcer(
-        &self,
-        announcer: AccountId,
-    ) -> Result<ServicesListResponse, NyxdError> {
-        self.query_service_provider_contract(SpQueryMsg::ByAnnouncer {
-            announcer: announcer.to_string(),
-        })
-        .await
-    }
-
-    async fn get_services_by_nym_address(
-        &self,
-        nym_address: NymAddress,
-    ) -> Result<ServicesListResponse, NyxdError> {
-        self.query_service_provider_contract(SpQueryMsg::ByNymAddress { nym_address })
-            .await
-    }
-
-    async fn get_sp_contract_version(&self) -> Result<ContractBuildInformation, NyxdError> {
-        self.query_service_provider_contract(SpQueryMsg::GetContractVersion {})
-            .await
-    }
-
-    async fn get_sp_contract_cw2_version(&self) -> Result<cw2::ContractVersion, NyxdError> {
-        self.query_service_provider_contract(SpQueryMsg::GetCW2ContractVersion {})
-            .await
-    }
-
-    async fn get_service_signing_nonce(&self, address: &AccountId) -> Result<Nonce, NyxdError> {
-        self.query_service_provider_contract(SpQueryMsg::SigningNonce {
-            address: address.to_string(),
-        })
-        .await
-    }
-}
-
-#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
-pub trait PagedSpDirectoryQueryClient: SpDirectoryQueryClient {
-    async fn get_all_services(&self) -> Result<Vec<Service>, NyxdError> {
-        collect_paged!(self, get_services_paged, services)
-    }
-}
-
-#[async_trait]
-impl<T> PagedSpDirectoryQueryClient for T where T: SpDirectoryQueryClient {}
-
-#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
-impl<C> SpDirectoryQueryClient for C
-where
-    C: CosmWasmClient + NymContractsProvider + Send + Sync,
-{
-    async fn query_service_provider_contract<T>(&self, query: SpQueryMsg) -> Result<T, NyxdError>
-    where
-        for<'a> T: Deserialize<'a>,
-    {
-        let sp_directory_contract_address =
-            &self.service_provider_contract_address().ok_or_else(|| {
-                NyxdError::unavailable_contract_address("service provider directory contract")
-            })?;
-        self.query_contract_smart(sp_directory_contract_address, &query)
-            .await
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::nyxd::contract_traits::tests::IgnoreValue;
-
-    // it's enough that this compiles and clippy is happy about it
-    #[allow(dead_code)]
-    fn all_query_variants_are_covered<C: SpDirectoryQueryClient + Send + Sync>(
-        client: C,
-        msg: SpQueryMsg,
-    ) {
-        match msg {
-            SpQueryMsg::ServiceId { service_id } => client.get_service_info(service_id).ignore(),
-            SpQueryMsg::ByAnnouncer { announcer } => client
-                .get_services_by_announcer(announcer.parse().unwrap())
-                .ignore(),
-            SpQueryMsg::ByNymAddress { nym_address } => {
-                client.get_services_by_nym_address(nym_address).ignore()
-            }
-            SpQueryMsg::All { limit, start_after } => {
-                client.get_services_paged(start_after, limit).ignore()
-            }
-            SpQueryMsg::SigningNonce { address } => client
-                .get_service_signing_nonce(&address.parse().unwrap())
-                .ignore(),
-            SpQueryMsg::Config {} => client.get_service_config().ignore(),
-            SpQueryMsg::GetContractVersion {} => client.get_sp_contract_version().ignore(),
-            SpQueryMsg::GetCW2ContractVersion {} => client.get_sp_contract_cw2_version().ignore(),
-        };
-    }
-}
@@ -1,148 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::nyxd::contract_traits::NymContractsProvider;
-use crate::nyxd::{
-    coin::Coin, cosmwasm_client::types::ExecuteResult, error::NyxdError, Fee, SigningCosmWasmClient,
-};
-use crate::signing::signer::OfflineSigner;
-use async_trait::async_trait;
-use nym_contracts_common::signing::MessageSignature;
-use nym_service_provider_directory_common::{
-    msg::ExecuteMsg as SpExecuteMsg, NymAddress, ServiceDetails, ServiceId,
-};
-
-#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
-pub trait SpDirectorySigningClient {
-    async fn execute_service_provider_directory_contract(
-        &self,
-        fee: Option<Fee>,
-        msg: SpExecuteMsg,
-        funds: Vec<Coin>,
-    ) -> Result<ExecuteResult, NyxdError>;
-
-    async fn announce_service_provider(
-        &self,
-        service: ServiceDetails,
-        owner_signature: MessageSignature,
-        deposit: Coin,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NyxdError> {
-        self.execute_service_provider_directory_contract(
-            fee,
-            SpExecuteMsg::Announce {
-                service,
-                owner_signature,
-            },
-            vec![deposit],
-        )
-        .await
-    }
-
-    async fn delete_service_provider_by_id(
-        &self,
-        service_id: ServiceId,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NyxdError> {
-        self.execute_service_provider_directory_contract(
-            fee,
-            SpExecuteMsg::DeleteId { service_id },
-            vec![],
-        )
-        .await
-    }
-
-    async fn delete_service_provider_by_nym_address(
-        &self,
-        nym_address: NymAddress,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NyxdError> {
-        self.execute_service_provider_directory_contract(
-            fee,
-            SpExecuteMsg::DeleteNymAddress { nym_address },
-            vec![],
-        )
-        .await
-    }
-
-    async fn update_deposit_required(
-        &self,
-        deposit_required: Coin,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NyxdError> {
-        self.execute_service_provider_directory_contract(
-            fee,
-            SpExecuteMsg::UpdateDepositRequired {
-                deposit_required: deposit_required.into(),
-            },
-            vec![],
-        )
-        .await
-    }
-}
-
-#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
-impl<C> SpDirectorySigningClient for C
-where
-    C: SigningCosmWasmClient + NymContractsProvider + Sync,
-    NyxdError: From<<Self as OfflineSigner>::Error>,
-{
-    async fn execute_service_provider_directory_contract(
-        &self,
-        fee: Option<Fee>,
-        msg: SpExecuteMsg,
-        funds: Vec<Coin>,
-    ) -> Result<ExecuteResult, NyxdError> {
-        let sp_directory_contract_address =
-            &self.service_provider_contract_address().ok_or_else(|| {
-                NyxdError::unavailable_contract_address("service provider directory contract")
-            })?;
-
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier())));
-        let memo = msg.default_memo();
-
-        let signer_address = &self.signer_addresses()?[0];
-        self.execute(
-            signer_address,
-            sp_directory_contract_address,
-            &msg,
-            fee,
-            memo,
-            funds,
-        )
-        .await
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::nyxd::contract_traits::tests::{mock_coin, IgnoreValue};
-
-    // it's enough that this compiles and clippy is happy about it
-    #[allow(dead_code)]
-    fn all_execute_variants_are_covered<C: SpDirectorySigningClient + Send + Sync>(
-        client: C,
-        msg: SpExecuteMsg,
-    ) {
-        match msg {
-            SpExecuteMsg::Announce {
-                service,
-                owner_signature,
-            } => client
-                .announce_service_provider(service, owner_signature, mock_coin(), None)
-                .ignore(),
-            SpExecuteMsg::DeleteId { service_id } => client
-                .delete_service_provider_by_id(service_id, None)
-                .ignore(),
-            SpExecuteMsg::DeleteNymAddress { nym_address } => client
-                .delete_service_provider_by_nym_address(nym_address, None)
-                .ignore(),
-            SpExecuteMsg::UpdateDepositRequired { deposit_required } => client
-                .update_deposit_required(deposit_required.into(), None)
-                .ignore(),
-        };
-    }
-}
@@ -246,12 +246,6 @@ impl<C, S> NyxdClient<C, S> {
        self.config.contracts.multisig_contract_address = Some(address);
    }

-    pub fn set_service_provider_contract_address(&mut self, address: AccountId) {
-        self.config
-            .contracts
-            .service_provider_directory_contract_address = Some(address);
-    }
-
    pub fn set_simulated_gas_multiplier(&mut self, multiplier: f32) {
        self.config.simulated_gas_multiplier = multiplier;
    }
@@ -288,17 +282,6 @@ impl<C, S> NymContractsProvider for NyxdClient<C, S> {
    fn ephemera_contract_address(&self) -> Option<&AccountId> {
        self.config.contracts.ephemera_contract_address.as_ref()
    }
-
-    fn name_service_contract_address(&self) -> Option<&AccountId> {
-        self.config.contracts.name_service_contract_address.as_ref()
-    }
-
-    fn service_provider_contract_address(&self) -> Option<&AccountId> {
-        self.config
-            .contracts
-            .service_provider_directory_contract_address
-            .as_ref()
-    }
 }

 // queries
@@ -10,26 +10,26 @@ anyhow = { workspace = true }
 base64 = "0.13.0"
 bip39 = { workspace = true }
 bs58 = { workspace = true }
-comfy-table = "6.0.0"
-cfg-if = "1.0.0"
+comfy-table = { workspace = true }
+cfg-if = { workspace = true }
 clap = { workspace = true, features = ["derive"] }
-csv = "1.3.0"
+csv = { workspace = true }
 cw-utils = { workspace = true }
 futures = { workspace = true }
-handlebars = "3.0.1"
+handlebars = { workspace = true }
 humantime-serde = { workspace = true }
-inquire = "0.6.2"
+inquire = { workspace = true }
 k256 = { workspace = true, features = ["ecdsa", "sha256"] }
 log = { workspace = true }
 rand = {version = "0.6", features = ["std"] }
-serde = { version = "1.0", features = ["derive"] }
+serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 thiserror = { workspace = true }
 time = { workspace = true, features = ["parsing", "formatting"] }
 tokio = { workspace = true, features = ["sync"]}
 toml = "0.5.6"
 url = { workspace = true }
-tap = "1"
+tap = { workspace = true }
 zeroize = { workspace = true }

 cosmrs = { workspace = true }
@@ -46,8 +46,6 @@ nym-vesting-contract-common = { path = "../cosmwasm-smart-contracts/vesting-cont
 nym-coconut-bandwidth-contract-common = { path = "../cosmwasm-smart-contracts/coconut-bandwidth-contract" }
 nym-coconut-dkg-common = { path = "../cosmwasm-smart-contracts/coconut-dkg" }
 nym-multisig-contract-common = { path = "../cosmwasm-smart-contracts/multisig-contract" }
-nym-service-provider-directory-common = { path = "../cosmwasm-smart-contracts/service-provider-directory" }
-nym-name-service-common = { path = "../cosmwasm-smart-contracts/name-service" }
 nym-sphinx = { path = "../../common/nymsphinx" }
 nym-client-core = { path = "../../common/client-core" }
 nym-config = { path = "../../common/config" }
@@ -6,8 +6,6 @@ use clap::{Args, Subcommand};
 pub mod gateway;
 pub mod identity_key;
 pub mod mixnode;
-pub mod name;
-pub mod service;

 #[derive(Debug, Args)]
 #[clap(args_conflicts_with_subcommands = true, subcommand_required = true)]
@@ -23,10 +21,6 @@ pub enum MixnetOperatorsCommands {
    Mixnode(mixnode::MixnetOperatorsMixnode),
    /// Manage your gateway
    Gateway(gateway::MixnetOperatorsGateway),
-    /// Manage your service
-    ServiceProvider(service::MixnetOperatorsService),
-    /// Manage your registered name
-    Name(name::MixnetOperatorsName),
    /// Sign messages using your private identity key
    IdentityKey(identity_key::MixnetOperatorsIdentityKey),
 }
@@ -1,25 +0,0 @@
-use clap::Parser;
-use log::{error, info};
-use nym_name_service_common::NameId;
-use nym_validator_client::nyxd::{contract_traits::NameServiceSigningClient, error::NyxdError};
-use tap::TapFallible;
-
-use crate::context::SigningClient;
-
-#[derive(Debug, Parser)]
-pub struct Args {
-    #[clap(long)]
-    pub id: NameId,
-}
-
-pub async fn delete(args: Args, client: SigningClient) -> Result<(), NyxdError> {
-    info!("Deleting registered name alias with id {}", args.id);
-
-    let res = client
-        .delete_name_by_id(args.id, None)
-        .await
-        .tap_err(|err| error!("Failed to delete name: {err:#?}"))?;
-
-    info!("Deleted: {res:?}");
-    Ok(())
-}
@@ -1,22 +0,0 @@
-use clap::{Args, Subcommand};
-
-pub mod delete;
-pub mod register;
-pub mod register_sign_payload;
-
-#[derive(Debug, Args)]
-#[clap(args_conflicts_with_subcommands = true, subcommand_required = true)]
-pub struct MixnetOperatorsName {
-    #[clap(subcommand)]
-    pub command: MixnetOperatorsNameCommands,
-}
-
-#[derive(Debug, Subcommand)]
-pub enum MixnetOperatorsNameCommands {
-    /// Register a name alias for a nym address
-    Register(register::Args),
-    /// Delete name alias for a nym address
-    Delete(delete::Args),
-    /// Create base58-encoded payload required for producing valiid register signature.
-    CreateNameRegisterPayload(register_sign_payload::Args),
-}
@@ -1,53 +0,0 @@
-use clap::Parser;
-use log::{error, info};
-use nym_contracts_common::signing::MessageSignature;
-use nym_name_service_common::{Address, Coin, NameDetails, NymName};
-use nym_sphinx::addressing::clients::Recipient;
-use nym_validator_client::nyxd::{contract_traits::NameServiceSigningClient, error::NyxdError};
-use tap::TapFallible;
-
-use crate::context::SigningClient;
-
-#[derive(Debug, Parser)]
-pub struct Args {
-    /// Name alias
-    #[clap(long)]
-    pub name: NymName,
-
-    /// Nym address that the alias is pointing to
-    #[clap(long)]
-    pub nym_address: Recipient,
-
-    #[clap(long)]
-    pub signature: MessageSignature,
-
-    /// Deposit to be made to the service provider directory, in curent DENOMINATION (e.g. 'unym')
-    #[clap(long)]
-    pub deposit: u128,
-}
-
-pub async fn register(args: Args, client: SigningClient) -> Result<(), NyxdError> {
-    info!(
-        "Registering name alias '{}' for nym address '{}'",
-        args.name, args.nym_address
-    );
-
-    let address = Address::new(&args.nym_address.to_string()).expect("invalid address");
-    let identity_key = address.client_id().to_string();
-    let name = NameDetails {
-        name: args.name,
-        address,
-        identity_key,
-    };
-
-    let denom = client.current_chain_details().mix_denom.base.as_str();
-    let deposit = Coin::new(args.deposit, denom);
-
-    let res = client
-        .register_name(name, args.signature, deposit.into(), None)
-        .await
-        .tap_err(|err| error!("Failed to register name: {err:#?}"))?;
-
-    info!("Registered name: {res:?}");
-    Ok(())
-}
@@ -1,65 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::{
-    context::SigningClient,
-    utils::{account_id_to_cw_addr, DataWrapper},
-};
-
-use clap::Parser;
-use cosmwasm_std::Coin;
-
-use nym_bin_common::output_format::OutputFormat;
-use nym_name_service_common::{
-    signing_types::construct_name_register_sign_payload, Address, NymName,
-};
-use nym_sphinx::addressing::clients::Recipient;
-use nym_validator_client::nyxd::{contract_traits::NameServiceQueryClient, error::NyxdError};
-
-#[derive(Debug, Parser)]
-pub struct Args {
-    // The name to register.
-    #[arg(long)]
-    pub name: NymName,
-
-    /// The nym address the name should point to.
-    #[arg(long)]
-    pub nym_address: Recipient,
-
-    #[arg(long)]
-    pub amount: u128,
-
-    #[arg(short, long, default_value_t = OutputFormat::default())]
-    output: OutputFormat,
-}
-
-pub async fn create_payload(args: Args, client: SigningClient) -> Result<(), NyxdError> {
-    let address = Address::new(&args.nym_address.to_string()).expect("invalid address");
-    let identity_key = address.client_id().to_string();
-    let name = nym_name_service_common::NameDetails {
-        name: args.name,
-        address,
-        identity_key,
-    };
-
-    let denom = client.current_chain_details().mix_denom.base.as_str();
-    let deposit = Coin::new(args.amount, denom);
-
-    let nonce = match client.get_name_signing_nonce(&client.address()).await {
-        Ok(nonce) => nonce,
-        Err(err) => {
-            eprint!(
-                "failed to query for the signing nonce of {}: {err}",
-                client.address()
-            );
-            return Err(err);
-        }
-    };
-
-    let address = account_id_to_cw_addr(&client.address());
-    let payload = construct_name_register_sign_payload(nonce, address, deposit, name);
-    let wrapper = DataWrapper::new(payload.to_base58_string().unwrap());
-    println!("{}", args.output.format(&wrapper));
-
-    Ok(())
-}
@@ -1,45 +0,0 @@
-use clap::Parser;
-use log::info;
-use nym_contracts_common::signing::MessageSignature;
-use nym_service_provider_directory_common::{Coin, NymAddress, ServiceDetails, ServiceType};
-use nym_validator_client::nyxd::contract_traits::SpDirectorySigningClient;
-
-use crate::context::SigningClient;
-
-#[derive(Debug, Parser)]
-pub struct Args {
-    #[clap(long)]
-    pub nym_address: String,
-
-    #[clap(long)]
-    pub signature: MessageSignature,
-
-    /// Deposit to be made to the service provider directory, in curent DENOMINATION (e.g. 'unym')
-    #[clap(long)]
-    pub deposit: u128,
-
-    #[clap(long)]
-    pub identity_key: String,
-}
-
-pub async fn announce(args: Args, client: SigningClient) {
-    info!("Annoucing service provider");
-
-    let nym_address = NymAddress::Address(args.nym_address);
-    let service_type = ServiceType::NetworkRequester;
-    let service = ServiceDetails {
-        nym_address,
-        service_type,
-        identity_key: args.identity_key,
-    };
-
-    let denom = client.current_chain_details().mix_denom.base.as_str();
-    let deposit = Coin::new(args.deposit, denom);
-
-    let res = client
-        .announce_service_provider(service, args.signature, deposit.into(), None)
-        .await
-        .expect("Failed to announce service provider");
-
-    info!("Announced service provider: {res:?}");
-}
@@ -1,61 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::{
-    context::SigningClient,
-    utils::{account_id_to_cw_addr, DataWrapper},
-};
-
-use clap::Parser;
-use cosmwasm_std::Coin;
-
-use nym_bin_common::output_format::OutputFormat;
-use nym_service_provider_directory_common::{
-    signing_types::construct_service_provider_announce_sign_payload, NymAddress,
-    ServiceType::NetworkRequester,
-};
-use nym_sphinx::addressing::clients::Recipient;
-use nym_validator_client::nyxd::contract_traits::SpDirectoryQueryClient;
-
-#[derive(Debug, Parser)]
-pub struct Args {
-    #[clap(long)]
-    pub nym_address: Recipient,
-
-    #[clap(long)]
-    pub amount: u128,
-
-    #[clap(long)]
-    pub identity_key: String,
-
-    #[clap(short, long, default_value_t = OutputFormat::default())]
-    output: OutputFormat,
-}
-
-pub async fn create_payload(args: Args, client: SigningClient) {
-    let service = nym_service_provider_directory_common::ServiceDetails {
-        nym_address: NymAddress::new(&args.nym_address.to_string()),
-        service_type: NetworkRequester,
-        identity_key: args.identity_key,
-    };
-
-    let denom = client.current_chain_details().mix_denom.base.as_str();
-    let deposit = Coin::new(args.amount, denom);
-
-    let nonce = match client.get_service_signing_nonce(&client.address()).await {
-        Ok(nonce) => nonce,
-        Err(err) => {
-            eprint!(
-                "failed to query for the signing nonce of {}: {err}",
-                client.address()
-            );
-            return;
-        }
-    };
-
-    let address = account_id_to_cw_addr(&client.address());
-    let payload =
-        construct_service_provider_announce_sign_payload(nonce, address, deposit, service);
-    let wrapper = DataWrapper::new(payload.to_base58_string().unwrap());
-    println!("{}", args.output.format(&wrapper))
-}
@@ -1,23 +0,0 @@
-use clap::Parser;
-use log::info;
-use nym_service_provider_directory_common::ServiceId;
-use nym_validator_client::nyxd::contract_traits::SpDirectorySigningClient;
-
-use crate::context::SigningClient;
-
-#[derive(Debug, Parser)]
-pub struct Args {
-    #[clap(long)]
-    pub id: ServiceId,
-}
-
-pub async fn delete(args: Args, client: SigningClient) {
-    info!("Deleting service provider with id {}", args.id);
-
-    let res = client
-        .delete_service_provider_by_id(args.id, None)
-        .await
-        .expect("Failed to delete service provider");
-
-    info!("Deleted: {res:?}");
-}
@@ -1,23 +0,0 @@
-use clap::{Args, Subcommand};
-
-pub mod announce;
-pub mod announce_sign_payload;
-pub mod delete;
-
-#[derive(Debug, Args)]
-#[clap(args_conflicts_with_subcommands = true, subcommand_required = true)]
-pub struct MixnetOperatorsService {
-    #[clap(subcommand)]
-    pub command: MixnetOperatorsServiceCommands,
-}
-
-#[allow(clippy::large_enum_variant)]
-#[derive(Debug, Subcommand)]
-pub enum MixnetOperatorsServiceCommands {
-    /// Announce service provider to the world
-    Announce(announce::Args),
-    /// Delete entry for service provider from the directory
-    Delete(delete::Args),
-    /// Create base58-encoded payload required for producing valid announce signature.
-    CreateServiceAnnounceSignPayload(announce_sign_payload::Args),
-}
@@ -5,8 +5,6 @@ use clap::{Args, Subcommand};

 pub mod query_all_gateways;
 pub mod query_all_mixnodes;
-pub mod query_all_names;
-pub mod query_all_service_providers;

 #[derive(Debug, Args)]
 #[clap(args_conflicts_with_subcommands = true, subcommand_required = true)]
@@ -21,8 +19,4 @@ pub enum MixnetQueryCommands {
    Mixnodes(query_all_mixnodes::Args),
    /// Query gateways
    Gateways(query_all_gateways::Args),
-    /// Query announced service-providers
-    ServiceProviders(query_all_service_providers::Args),
-    /// Query registed names
-    Names(query_all_names::Args),
 }
@@ -1,53 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::context::QueryClientWithNyxd;
-use crate::utils::show_error;
-use clap::Parser;
-use comfy_table::Table;
-use nym_validator_client::client::NymApiClientExt;
-use nym_validator_client::nym_api::error::NymAPIError;
-
-#[derive(Debug, Parser)]
-pub struct Args {
-    #[clap(value_parser)]
-    #[clap(help = "Optionally, the registered name to display")]
-    pub name: Option<String>,
-}
-
-pub async fn query(args: Args, client: &QueryClientWithNyxd) {
-    log::trace!("Querying all registered names");
-
-    match client.nym_api.get_registered_names().await {
-        Ok(res) => {
-            if let Some(name) = args.name {
-                let name = res.names.iter().find(|name_entry| {
-                    name_entry.name.name.to_string().eq_ignore_ascii_case(&name)
-                });
-                println!(
-                    "{}",
-                    ::serde_json::to_string_pretty(&name).expect("json formatting error")
-                );
-            } else {
-                let mut table = Table::new();
-
-                table.set_header(vec!["Name Id", "Owner", "Nym Address", "Name"]);
-                for name_entry in res.names {
-                    table.add_row(vec![
-                        name_entry.id.to_string(),
-                        name_entry.owner.to_string(),
-                        name_entry.name.address.to_string(),
-                        name_entry.name.name.to_string(),
-                    ]);
-                }
-
-                println!("The registered names in the directory are:");
-                println!("{table}");
-            }
-        }
-        Err(NymAPIError::NotFound) => {
-            println!("nym-api reports no name endpoint available");
-        }
-        Err(e) => show_error(e),
-    }
-}
@@ -1,55 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::context::QueryClientWithNyxd;
-use crate::utils::show_error;
-use clap::Parser;
-use comfy_table::Table;
-use nym_validator_client::client::NymApiClientExt;
-use nym_validator_client::nym_api::error::NymAPIError;
-
-#[derive(Debug, Parser)]
-pub struct Args {
-    #[clap(value_parser)]
-    #[clap(help = "Optionally, the service provider to display")]
-    pub nym_address: Option<String>,
-}
-
-pub async fn query(args: Args, client: &QueryClientWithNyxd) {
-    match client.nym_api.get_service_providers().await {
-        Ok(res) => {
-            if let Some(nym_address) = args.nym_address {
-                let service = res.services.iter().find(|service| {
-                    service
-                        .service
-                        .nym_address
-                        .to_string()
-                        .eq_ignore_ascii_case(&nym_address)
-                });
-                println!(
-                    "{}",
-                    ::serde_json::to_string_pretty(&service).expect("json formatting error")
-                );
-            } else {
-                let mut table = Table::new();
-
-                table.set_header(vec!["Service Id", "Announcer", "Type", "Nym Address"]);
-                for service in res.services {
-                    table.add_row(vec![
-                        service.service_id.to_string(),
-                        service.announcer.to_string(),
-                        service.service.service_type.to_string(),
-                        service.service.nym_address.to_string(),
-                    ]);
-                }
-
-                println!("The service providers in the directory are:");
-                println!("{table}");
-            }
-        }
-        Err(NymAPIError::NotFound) => {
-            println!("nym-api reports no service provider endpoint available");
-        }
-        Err(e) => show_error(e),
-    }
-}
@@ -9,7 +9,7 @@ license.workspace = true

 [dependencies]
 dirs = { version = "5.0.1", optional = true }
-handlebars = "3.5.5"
+handlebars = { workspace = true }
 log = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 toml = "0.7.4"
@@ -328,4 +328,8 @@ impl EpochState {
    pub fn is_dealing_exchange(&self) -> bool {
        matches!(self, EpochState::DealingExchange { .. })
    }
+
+    pub fn is_waiting_initialisation(&self) -> bool {
+        matches!(self, EpochState::WaitingInitialisation)
+    }
 }
@@ -11,7 +11,7 @@ repository = { workspace = true }
 bs58 = { workspace = true }
 cosmwasm-std = { workspace = true }
 cosmwasm-schema = { workspace = true }
-schemars = "0.8"
+schemars = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 thiserror = { workspace = true }

@@ -10,5 +10,5 @@ license.workspace = true
 cosmwasm-schema = { workspace = true }
 cw4 = { workspace = true }
 cw-controllers = { workspace = true }
-schemars = "0.8"
+schemars = { workspace = true }
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
@@ -14,14 +14,14 @@ cosmwasm-std = { workspace = true }
 cosmwasm-schema = { workspace = true }
 cw2 = { workspace = true, optional = true }
 serde = { workspace = true, features = ["derive"] }
-serde_repr = "0.1"
+serde_repr = { workspace = true }

 # we still have to preserve that import for `JsonSchema` for `Layer` type (since we can't use cw_serde macro due to custom serde impl)
-schemars = "0.8"
+schemars = { workspace = true }
 thiserror = { workspace = true }
 contracts-common = { path = "../contracts-common", package = "nym-contracts-common", version = "0.5.0" }
 serde-json-wasm = { workspace = true }
-humantime-serde = "1.1.1"
+humantime-serde = { workspace = true }

 # TO CHECK WHETHER STILL NEEDED:
 log = { workspace = true }
@@ -13,6 +13,6 @@ cw4 = { workspace = true }
 cw-storage-plus = { workspace = true }
 cosmwasm-schema = { workspace = true }
 cosmwasm-std = { workspace = true }
-schemars = "0.8"
+schemars = { workspace = true }
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 thiserror = { workspace = true }
@@ -1,20 +0,0 @@
-[package]
-name = "nym-name-service-common"
-version = "0.1.0"
-edition = "2021"
-license.workspace = true
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-cosmwasm-schema = { workspace = true }
-cosmwasm-std = { workspace = true }
-cw2 = { workspace = true, optional = true }
-cw-controllers = { workspace = true }
-cw-utils = { workspace = true }
-nym-contracts-common = { path = "../contracts-common", version = "0.5.0" }
-serde = { workspace = true, features = ["derive"] }
-thiserror = { workspace = true }
-
-[features]
-schema = ["cw2"]
@@ -1,83 +0,0 @@
-use cosmwasm_std::{Addr, StdError};
-use cw_controllers::AdminError;
-use nym_contracts_common::signing::verifier::ApiVerifierError;
-use thiserror::Error;
-
-use crate::{Address, NameId, NymName};
-
-#[derive(Error, Debug, PartialEq)]
-pub enum NameServiceError {
-    #[error("{0}")]
-    Std(#[from] StdError),
-
-    #[error("{0}")]
-    AdminError(#[from] AdminError),
-
-    #[error("name id entry not found: {name_id}")]
-    NotFound { name_id: NameId },
-
-    #[error("name entry not found: {name}")]
-    NameNotFound { name: NymName },
-
-    #[error("{sender} is not registrator of name")]
-    Unauthorized { sender: Addr },
-
-    #[error("deposit required to register a name")]
-    DepositRequired { source: cw_utils::PaymentError },
-
-    #[error("insufficiant deposit: {funds}, required: {deposit_required}")]
-    InsufficientDeposit {
-        funds: cosmwasm_std::Uint128,
-        deposit_required: cosmwasm_std::Uint128,
-    },
-
-    #[error("deposit too large: {funds}, required: {deposit_required}")]
-    TooLargeDeposit {
-        funds: cosmwasm_std::Uint128,
-        deposit_required: cosmwasm_std::Uint128,
-    },
-
-    #[error("reached the max number of names ({max_names}) for owner {owner}")]
-    ReachedMaxNamesForOwner { max_names: u32, owner: Addr },
-
-    #[error("reached the max number of names ({max_names}) for address {0}", address.to_string())]
-    ReachedMaxNamesForAddress { max_names: u32, address: Address },
-
-    #[error("failed to parse {value} into a valid SemVer version: {error_message}")]
-    SemVerFailure {
-        value: String,
-        error_message: String,
-    },
-
-    #[error("failed to recover ed25519 public key from its base58 representation: {0}")]
-    MalformedEd25519IdentityKey(String),
-
-    #[error("failed to recover ed25519 signature from its base58 representation: {0}")]
-    MalformedEd25519Signature(String),
-
-    #[error("provided ed25519 signature did not verify correctly")]
-    InvalidEd25519Signature,
-
-    #[error("failed to verify message signature: {source}")]
-    SignatureVerificationFailure {
-        #[from]
-        source: ApiVerifierError,
-    },
-
-    #[error("duplicate entries detected for name: {name}")]
-    DuplicateNames { name: NymName },
-
-    #[error("name already registered: {name}")]
-    NameAlreadyRegistered { name: NymName },
-
-    #[error("invalid nym address format: {0}")]
-    InvalidNymAddress(String),
-
-    #[error("client identity in nym address does not match the provided identity key")]
-    IdentityKeyMismatch {
-        address: Address,
-        identity_key: String,
-    },
-}
-
-pub type Result<T, E = NameServiceError> = std::result::Result<T, E>;
@@ -1,66 +0,0 @@
-use cosmwasm_std::{Coin, Event};
-
-use crate::RegisteredName;
-
-pub enum NameEventType {
-    Register,
-    DeleteId,
-    DeleteName,
-    UpdateDepositRequired,
-}
-
-impl std::fmt::Display for NameEventType {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            NameEventType::Register => write!(f, "register"),
-            NameEventType::DeleteId => write!(f, "delete_id"),
-            NameEventType::DeleteName => write!(f, "delete_name"),
-            NameEventType::UpdateDepositRequired => write!(f, "update_deposit_required"),
-        }
-    }
-}
-
-impl From<NameEventType> for String {
-    fn from(event_type: NameEventType) -> Self {
-        event_type.to_string()
-    }
-}
-
-pub const ACTION: &str = "action";
-
-pub const NAME_ID: &str = "name_id";
-pub const NAME: &str = "name";
-pub const OWNER: &str = "owner";
-
-pub const DEPOSIT_REQUIRED: &str = "deposit_required";
-
-pub fn new_register_event(name: RegisteredName) -> Event {
-    Event::new(NameEventType::Register)
-        .add_attribute(ACTION, NameEventType::Register)
-        .add_attribute(NAME_ID, name.id.to_string())
-        .add_attribute(NAME, name.name.name.to_string())
-        .add_attribute(name.name.address.event_tag(), name.name.address.to_string())
-        .add_attribute(OWNER, name.owner.to_string())
-}
-
-pub fn new_delete_id_event(name: RegisteredName) -> Event {
-    Event::new(NameEventType::DeleteId)
-        .add_attribute(ACTION, NameEventType::DeleteId)
-        .add_attribute(NAME_ID, name.id.to_string())
-        .add_attribute(NAME, name.name.name.to_string())
-        .add_attribute(name.name.address.event_tag(), name.name.address.to_string())
-}
-
-pub fn new_delete_name_event(name: RegisteredName) -> Event {
-    Event::new(NameEventType::DeleteId)
-        .add_attribute(ACTION, NameEventType::DeleteName)
-        .add_attribute(NAME_ID, name.id.to_string())
-        .add_attribute(NAME, name.name.name.to_string())
-        .add_attribute(name.name.address.event_tag(), name.name.address.to_string())
-}
-
-pub fn new_update_deposit_required_event(deposit_required: Coin) -> Event {
-    Event::new(NameEventType::UpdateDepositRequired)
-        .add_attribute(ACTION, NameEventType::UpdateDepositRequired)
-        .add_attribute(DEPOSIT_REQUIRED, deposit_required.to_string())
-}
@@ -1,11 +0,0 @@
-pub mod error;
-pub mod events;
-pub mod msg;
-pub mod response;
-pub mod signing_types;
-pub mod types;
-
-// Re-export all types at the top-level
-pub use types::*;
-
-pub use cosmwasm_std::{Addr, Coin, Decimal, Fraction};
@@ -1,123 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::{Address, NameDetails, NameId, NymName};
-use cosmwasm_schema::cw_serde;
-use cosmwasm_std::Coin;
-use nym_contracts_common::signing::MessageSignature;
-
-#[cfg(feature = "schema")]
-use crate::{
-    response::{ConfigResponse, NamesListResponse, PagedNamesListResponse},
-    types::RegisteredName,
-};
-#[cfg(feature = "schema")]
-use cosmwasm_schema::QueryResponses;
-#[cfg(feature = "schema")]
-use nym_contracts_common::{signing::Nonce, ContractBuildInformation};
-
-#[cw_serde]
-pub struct InstantiateMsg {
-    pub deposit_required: Coin,
-}
-
-impl InstantiateMsg {
-    pub fn new(deposit_required: Coin) -> Self {
-        Self { deposit_required }
-    }
-}
-
-#[cw_serde]
-pub struct MigrateMsg {}
-
-#[cw_serde]
-pub enum ExecuteMsg {
-    /// Announcing a name pointing to a nym-address
-    Register {
-        name: NameDetails,
-        owner_signature: MessageSignature,
-    },
-
-    /// Delete a name entry by id
-    DeleteId { name_id: NameId },
-
-    /// Delete a name entry by name
-    DeleteName { name: NymName },
-
-    /// Change the deposit required for announcing a name
-    UpdateDepositRequired { deposit_required: Coin },
-}
-
-impl ExecuteMsg {
-    pub fn delete_id(name_id: NameId) -> Self {
-        ExecuteMsg::DeleteId { name_id }
-    }
-
-    pub fn default_memo(&self) -> String {
-        match self {
-            ExecuteMsg::Register {
-                name,
-                owner_signature: _,
-            } => {
-                format!("registering {} as name: {}", name.address, name.name)
-            }
-            ExecuteMsg::DeleteId { name_id } => {
-                format!("deleting name with id {name_id}")
-            }
-            ExecuteMsg::DeleteName { name } => {
-                format!("deleting name: {name}")
-            }
-            ExecuteMsg::UpdateDepositRequired { deposit_required } => {
-                format!("updating the deposit required to {deposit_required}")
-            }
-        }
-    }
-}
-
-#[cw_serde]
-#[cfg_attr(feature = "schema", derive(QueryResponses))]
-pub enum QueryMsg {
-    /// Query the name by it's assigned id
-    #[cfg_attr(feature = "schema", returns(RegisteredName))]
-    NameId { name_id: NameId },
-
-    /// Query the names by the registrator
-    #[cfg_attr(feature = "schema", returns(NamesListResponse))]
-    ByOwner { owner: String },
-
-    #[cfg_attr(feature = "schema", returns(RegisteredName))]
-    ByName { name: NymName },
-
-    #[cfg_attr(feature = "schema", returns(NamesListResponse))]
-    ByAddress { address: Address },
-
-    #[cfg_attr(feature = "schema", returns(PagedNamesListResponse))]
-    All {
-        limit: Option<u32>,
-        start_after: Option<NameId>,
-    },
-
-    #[cfg_attr(feature = "schema", returns(Nonce))]
-    SigningNonce { address: String },
-
-    #[cfg_attr(feature = "schema", returns(ConfigResponse))]
-    Config {},
-
-    /// Gets build information of this contract, such as the commit hash used for the build or rustc version.
-    #[cfg_attr(feature = "schema", returns(ContractBuildInformation))]
-    GetContractVersion {},
-
-    /// Gets the stored contract version information that's required by the CW2 spec interface for migrations.
-    #[serde(rename = "get_cw2_contract_version")]
-    #[cfg_attr(feature = "schema", returns(cw2::ContractVersion))]
-    GetCW2ContractVersion {},
-}
-
-impl QueryMsg {
-    pub fn all() -> QueryMsg {
-        QueryMsg::All {
-            limit: None,
-            start_after: None,
-        }
-    }
-}
@@ -1,53 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::{NameId, RegisteredName};
-use cosmwasm_schema::cw_serde;
-use cosmwasm_std::Coin;
-
-#[cw_serde]
-pub struct NamesListResponse {
-    pub names: Vec<RegisteredName>,
-}
-
-impl NamesListResponse {
-    pub fn new(names: Vec<RegisteredName>) -> NamesListResponse {
-        NamesListResponse { names }
-    }
-}
-
-impl From<&[RegisteredName]> for NamesListResponse {
-    fn from(names: &[RegisteredName]) -> Self {
-        NamesListResponse {
-            names: names.to_vec(),
-        }
-    }
-}
-
-#[cw_serde]
-pub struct PagedNamesListResponse {
-    pub names: Vec<RegisteredName>,
-    pub per_page: usize,
-
-    /// Field indicating paging information for the following queries if the caller wishes to get further entries.
-    pub start_next_after: Option<NameId>,
-}
-
-impl PagedNamesListResponse {
-    pub fn new(
-        names: Vec<RegisteredName>,
-        per_page: usize,
-        start_next_after: Option<NameId>,
-    ) -> PagedNamesListResponse {
-        PagedNamesListResponse {
-            names,
-            per_page,
-            start_next_after,
-        }
-    }
-}
-
-#[cw_serde]
-pub struct ConfigResponse {
-    pub deposit_required: Coin,
-}
@@ -1,32 +0,0 @@
-use cosmwasm_std::{Addr, Coin};
-use nym_contracts_common::signing::{
-    ContractMessageContent, MessageType, Nonce, SignableMessage, SigningPurpose,
-};
-use serde::Serialize;
-
-use crate::NameDetails;
-
-pub type SignableNameRegisterMsg = SignableMessage<ContractMessageContent<NameRegister>>;
-
-#[derive(Serialize)]
-pub struct NameRegister {
-    name: NameDetails,
-}
-
-impl SigningPurpose for NameRegister {
-    fn message_type() -> MessageType {
-        MessageType::new("name-register")
-    }
-}
-
-pub fn construct_name_register_sign_payload(
-    nonce: Nonce,
-    sender: Addr,
-    deposit: Coin,
-    name: NameDetails,
-) -> SignableNameRegisterMsg {
-    let payload = NameRegister { name };
-    let proxy = None;
-    let content = ContractMessageContent::new(sender, proxy, vec![deposit], payload);
-    SignableMessage::new(nonce, content)
-}
@@ -1,252 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use cosmwasm_schema::cw_serde;
-use cosmwasm_std::{Addr, Coin};
-use nym_contracts_common::IdentityKey;
-use std::{
-    fmt::{Display, Formatter},
-    str::FromStr,
-};
-use thiserror::Error;
-
-use crate::error::{NameServiceError, Result};
-
-/// The directory of names are indexed by [`NameId`].
-pub type NameId = u32;
-
-#[cw_serde]
-pub struct RegisteredName {
-    /// Unique id assigned to the registerd name.
-    pub id: NameId,
-
-    /// The registerd name details.
-    pub name: NameDetails,
-
-    /// name owner.
-    pub owner: Addr,
-
-    /// Block height at which the name was added.
-    pub block_height: u64,
-
-    /// The deposit used to announce the name.
-    pub deposit: Coin,
-}
-
-impl RegisteredName {
-    // Shortcut for getting the actual name
-    pub fn entry(&self) -> &NymName {
-        &self.name.name
-    }
-}
-
-#[cw_serde]
-pub struct NameDetails {
-    /// The name pointing to the nym address
-    pub name: NymName,
-
-    /// The address of the name alias.
-    pub address: Address,
-
-    /// The identity key of the registered name.
-    pub identity_key: IdentityKey,
-}
-
-/// String representation of a nym address, which is of the form
-/// client_id.client_enc@gateway_id.
-/// NOTE: entirely unvalidated.
-#[cw_serde]
-pub enum Address {
-    NymAddress(NymAddressInner),
-    // Possible extension:
-    //Gateway(String)
-}
-
-#[cw_serde]
-pub struct NymAddressInner {
-    client_id: String,
-    client_enc: String,
-    gateway_id: String,
-}
-
-// ADDRESS . ENCRYPTION @ GATEWAY_ID
-impl std::fmt::Display for NymAddressInner {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(
-            f,
-            "{}.{}@{}",
-            self.client_id, self.client_enc, self.gateway_id
-        )
-    }
-}
-
-impl Address {
-    /// Create a new nym address.
-    pub fn new(address: &str) -> Result<Self> {
-        parse_nym_address(address)
-            .map(Self::NymAddress)
-            .ok_or_else(|| NameServiceError::InvalidNymAddress(address.to_string()))
-    }
-
-    pub fn client_id(&self) -> &str {
-        match self {
-            Address::NymAddress(address) => &address.client_id,
-        }
-    }
-
-    pub fn client_enc(&self) -> &str {
-        match self {
-            Address::NymAddress(address) => &address.client_enc,
-        }
-    }
-
-    pub fn gateway_id(&self) -> &str {
-        match self {
-            Address::NymAddress(address) => &address.gateway_id,
-        }
-    }
-
-    pub fn event_tag(&self) -> &str {
-        match self {
-            Address::NymAddress(_) => "nym_address",
-            //Address::Gateway(_) => "gatway_address",
-        }
-    }
-}
-
-impl Display for Address {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Address::NymAddress(address) => write!(f, "{}", address),
-        }
-    }
-}
-
-// A valid nym address is of the form client_id.client_enc@gateway_id
-fn parse_nym_address(address: &str) -> Option<NymAddressInner> {
-    let parts: Vec<&str> = address.split('@').collect();
-    if parts.len() != 2 {
-        return None;
-    }
-
-    let client_part = parts[0];
-    let gateway_part = parts[1];
-
-    // The client part consists of two parts separated by a dot
-    let client_parts: Vec<&str> = client_part.split('.').collect();
-    if client_parts.len() != 2 {
-        return None;
-    }
-
-    // Check that the gateway part does not contain any dots
-    if gateway_part.contains('.') {
-        return None;
-    }
-
-    Some(NymAddressInner {
-        client_id: client_parts[0].to_string(),
-        client_enc: client_parts[1].to_string(),
-        gateway_id: gateway_part.to_string(),
-    })
-}
-
-/// Name stored and pointing a to a nym-address
-#[cw_serde]
-pub struct NymName(String);
-
-#[derive(Debug, Error)]
-pub enum NymNameError {
-    #[error("invalid name")]
-    InvalidName,
-}
-
-/// Defines what names are allowed
-fn is_valid_name_char(c: char) -> bool {
-    // Normal lowercase letters
-    (c.is_alphabetic() && c.is_lowercase())
-        // or numbers
-        || c.is_numeric()
-        // special case hyphen or underscore
-        || c == '-' || c == '_'
-}
-
-impl NymName {
-    pub fn new(name: &str) -> Result<NymName, NymNameError> {
-        // We are a bit restrictive in which names we allow, to start out with. Consider relaxing
-        // this in the future.
-        if !name.chars().all(is_valid_name_char) {
-            return Err(NymNameError::InvalidName);
-        }
-        Ok(Self(name.to_string()))
-    }
-
-    pub fn as_str(&self) -> &str {
-        &self.0
-    }
-}
-
-impl FromStr for NymName {
-    type Err = NymNameError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        Self::new(s)
-    }
-}
-
-impl Display for NymName {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::NymName;
-
-    #[test]
-    fn parse_nym_name() {
-        // Test some valid cases
-        assert!(NymName::new("foo").is_ok());
-        assert!(NymName::new("foo-bar").is_ok());
-        assert!(NymName::new("foo-bar-123").is_ok());
-        assert!(NymName::new("foo_bar").is_ok());
-        assert!(NymName::new("foo_bar_123").is_ok());
-
-        // And now test all some invalid ones
-        assert!(NymName::new("Foo").is_err());
-        assert!(NymName::new("foo bar").is_err());
-        assert!(NymName::new("foo!bar").is_err());
-        assert!(NymName::new("foo#bar").is_err());
-        assert!(NymName::new("foo$bar").is_err());
-        assert!(NymName::new("foo%bar").is_err());
-        assert!(NymName::new("foo&bar").is_err());
-        assert!(NymName::new("foo'bar").is_err());
-        assert!(NymName::new("foo(bar").is_err());
-        assert!(NymName::new("foo)bar").is_err());
-        assert!(NymName::new("foo*bar").is_err());
-        assert!(NymName::new("foo+bar").is_err());
-        assert!(NymName::new("foo,bar").is_err());
-        assert!(NymName::new("foo.bar").is_err());
-        assert!(NymName::new("foo.bar").is_err());
-        assert!(NymName::new("foo/bar").is_err());
-        assert!(NymName::new("foo/bar").is_err());
-        assert!(NymName::new("foo:bar").is_err());
-        assert!(NymName::new("foo;bar").is_err());
-        assert!(NymName::new("foo<bar").is_err());
-        assert!(NymName::new("foo=bar").is_err());
-        assert!(NymName::new("foo>bar").is_err());
-        assert!(NymName::new("foo?bar").is_err());
-        assert!(NymName::new("foo@bar").is_err());
-        assert!(NymName::new("fooBar").is_err());
-        assert!(NymName::new("foo[bar").is_err());
-        assert!(NymName::new("foo\"bar").is_err());
-        assert!(NymName::new("foo\\bar").is_err());
-        assert!(NymName::new("foo]bar").is_err());
-        assert!(NymName::new("foo^bar").is_err());
-        assert!(NymName::new("foo`bar").is_err());
-        assert!(NymName::new("foo{bar").is_err());
-        assert!(NymName::new("foo|bar").is_err());
-        assert!(NymName::new("foo}bar").is_err());
-        assert!(NymName::new("foo~bar").is_err());
-    }
-}
@@ -1,19 +0,0 @@
-[package]
-name = "nym-service-provider-directory-common"
-version = "0.1.0"
-edition = "2021"
-license.workspace = true
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-cosmwasm-schema = { workspace = true }
-cosmwasm-std = { workspace = true }
-cw2 = { workspace = true, optional = true }
-cw-controllers = { workspace = true }
-cw-utils = { workspace = true }
-nym-contracts-common = { path = "../contracts-common", version = "0.5.0" }
-thiserror = { workspace = true }
-
-[features]
-schema = ["cw2"]
@@ -1,68 +0,0 @@
-use cosmwasm_std::{Addr, StdError};
-use cw_controllers::AdminError;
-use nym_contracts_common::signing::verifier::ApiVerifierError;
-use thiserror::Error;
-
-use crate::{NymAddress, ServiceId};
-
-#[derive(Error, Debug, PartialEq)]
-pub enum SpContractError {
-    #[error("{0}")]
-    Std(#[from] StdError),
-
-    #[error("{0}")]
-    AdminError(#[from] AdminError),
-
-    #[error("service not found: {service_id}")]
-    NotFound { service_id: ServiceId },
-
-    #[error("{sender} is not announcer of service")]
-    Unauthorized { sender: Addr },
-
-    #[error("deposit required to announce service")]
-    DepositRequired { source: cw_utils::PaymentError },
-
-    #[error("insufficiant deposit: {funds}, required: {deposit_required}")]
-    InsufficientDeposit {
-        funds: cosmwasm_std::Uint128,
-        deposit_required: cosmwasm_std::Uint128,
-    },
-
-    #[error("deposit too large: {funds}, required: {deposit_required}")]
-    TooLargeDeposit {
-        funds: cosmwasm_std::Uint128,
-        deposit_required: cosmwasm_std::Uint128,
-    },
-
-    #[error("reached the max number of providers ({max_providers}) for announcer {announcer}")]
-    ReachedMaxProvidersForAdmin { max_providers: u32, announcer: Addr },
-
-    #[error("reached the max number of aliases ({max_aliases}) for nym address {0}", nym_address.to_string())]
-    ReachedMaxAliasesForNymAddress {
-        max_aliases: u32,
-        nym_address: NymAddress,
-    },
-
-    #[error("failed to parse {value} into a valid SemVer version: {error_message}")]
-    SemVerFailure {
-        value: String,
-        error_message: String,
-    },
-
-    #[error("Failed to recover ed25519 public key from its base58 representation - {0}")]
-    MalformedEd25519IdentityKey(String),
-
-    #[error("Failed to recover ed25519 signature from its base58 representation - {0}")]
-    MalformedEd25519Signature(String),
-
-    #[error("Provided ed25519 signature did not verify correctly")]
-    InvalidEd25519Signature,
-
-    #[error("failed to verify message signature: {source}")]
-    SignatureVerificationFailure {
-        #[from]
-        source: ApiVerifierError,
-    },
-}
-
-pub type Result<T, E = SpContractError> = std::result::Result<T, E>;
@@ -1,58 +0,0 @@
-use cosmwasm_std::{Coin, Event};
-
-use crate::{Service, ServiceId};
-
-pub enum ServiceProviderEventType {
-    Announce,
-    DeleteId,
-    DeleteNymAddress,
-    UpdateDepositRequired,
-}
-
-impl std::fmt::Display for ServiceProviderEventType {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            ServiceProviderEventType::Announce => write!(f, "announce"),
-            ServiceProviderEventType::DeleteId => write!(f, "delete_id"),
-            ServiceProviderEventType::DeleteNymAddress => write!(f, "delete_nym_address"),
-            ServiceProviderEventType::UpdateDepositRequired => write!(f, "update_deposit_required"),
-        }
-    }
-}
-
-impl From<ServiceProviderEventType> for String {
-    fn from(event_type: ServiceProviderEventType) -> Self {
-        event_type.to_string()
-    }
-}
-
-pub const ACTION: &str = "action";
-
-pub const SERVICE_ID: &str = "service_id";
-pub const SERVICE_TYPE: &str = "service_type";
-pub const NYM_ADDRESS: &str = "nym_address";
-pub const OWNER: &str = "owner";
-
-pub const DEPOSIT_REQUIRED: &str = "deposit_required";
-
-pub fn new_announce_event(service_id: ServiceId, service: Service) -> Event {
-    Event::new(ServiceProviderEventType::Announce)
-        .add_attribute(ACTION, ServiceProviderEventType::Announce)
-        .add_attribute(SERVICE_ID, service_id.to_string())
-        .add_attribute(SERVICE_TYPE, service.service.service_type.to_string())
-        .add_attribute(NYM_ADDRESS, service.service.nym_address.to_string())
-        .add_attribute(OWNER, service.announcer.to_string())
-}
-
-pub fn new_delete_id_event(service: Service) -> Event {
-    Event::new(ServiceProviderEventType::DeleteId)
-        .add_attribute(ACTION, ServiceProviderEventType::DeleteId)
-        .add_attribute(SERVICE_ID, service.service_id.to_string())
-        .add_attribute(NYM_ADDRESS, service.service.nym_address.to_string())
-}
-
-pub fn new_update_deposit_required_event(deposit_required: Coin) -> Event {
-    Event::new(ServiceProviderEventType::UpdateDepositRequired)
-        .add_attribute(ACTION, ServiceProviderEventType::UpdateDepositRequired)
-        .add_attribute(DEPOSIT_REQUIRED, deposit_required.to_string())
-}
@@ -1,11 +0,0 @@
-pub mod error;
-pub mod events;
-pub mod msg;
-pub mod response;
-pub mod signing_types;
-pub mod types;
-
-// Re-export all types at the top-level
-pub use types::*;
-
-pub use cosmwasm_std::{Addr, Coin, Decimal, Fraction};
@@ -1,118 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::{NymAddress, ServiceDetails, ServiceId};
-use cosmwasm_schema::cw_serde;
-use cosmwasm_std::Coin;
-use nym_contracts_common::signing::MessageSignature;
-
-#[cfg(feature = "schema")]
-use crate::{
-    response::{ConfigResponse, PagedServicesListResponse, ServicesListResponse},
-    types::Service,
-};
-#[cfg(feature = "schema")]
-use cosmwasm_schema::QueryResponses;
-#[cfg(feature = "schema")]
-use nym_contracts_common::{signing::Nonce, ContractBuildInformation};
-
-#[cw_serde]
-pub struct InstantiateMsg {
-    pub deposit_required: Coin,
-}
-
-impl InstantiateMsg {
-    pub fn new(deposit_required: Coin) -> Self {
-        Self { deposit_required }
-    }
-}
-
-#[cw_serde]
-pub struct MigrateMsg {}
-
-#[cw_serde]
-pub enum ExecuteMsg {
-    Announce {
-        service: ServiceDetails,
-        owner_signature: MessageSignature,
-    },
-    DeleteId {
-        service_id: ServiceId,
-    },
-    DeleteNymAddress {
-        nym_address: NymAddress,
-    },
-    UpdateDepositRequired {
-        deposit_required: Coin,
-    },
-}
-
-impl ExecuteMsg {
-    pub fn delete_id(service_id: ServiceId) -> Self {
-        ExecuteMsg::DeleteId { service_id }
-    }
-
-    pub fn default_memo(&self) -> String {
-        match self {
-            ExecuteMsg::Announce {
-                service,
-                owner_signature: _,
-            } => format!(
-                "announcing {} as type {}",
-                service.nym_address, service.service_type
-            ),
-            ExecuteMsg::DeleteId { service_id } => {
-                format!("deleting service with service id {service_id}")
-            }
-            ExecuteMsg::DeleteNymAddress { nym_address } => {
-                format!("deleting service with nym address {nym_address}")
-            }
-            ExecuteMsg::UpdateDepositRequired { deposit_required } => {
-                format!("updating the deposit required to {deposit_required}")
-            }
-        }
-    }
-}
-
-#[cw_serde]
-#[cfg_attr(feature = "schema", derive(QueryResponses))]
-pub enum QueryMsg {
-    #[cfg_attr(feature = "schema", returns(Service))]
-    ServiceId { service_id: ServiceId },
-
-    #[cfg_attr(feature = "schema", returns(ServicesListResponse))]
-    ByAnnouncer { announcer: String },
-
-    #[cfg_attr(feature = "schema", returns(ServicesListResponse))]
-    ByNymAddress { nym_address: NymAddress },
-
-    #[cfg_attr(feature = "schema", returns(PagedServicesListResponse))]
-    All {
-        limit: Option<u32>,
-        start_after: Option<ServiceId>,
-    },
-
-    #[cfg_attr(feature = "schema", returns(Nonce))]
-    SigningNonce { address: String },
-
-    #[cfg_attr(feature = "schema", returns(ConfigResponse))]
-    Config {},
-
-    /// Gets build information of this contract, such as the commit hash used for the build or rustc version.
-    #[cfg_attr(feature = "schema", returns(ContractBuildInformation))]
-    GetContractVersion {},
-
-    /// Gets the stored contract version information that's required by the CW2 spec interface for migrations.
-    #[serde(rename = "get_cw2_contract_version")]
-    #[cfg_attr(feature = "schema", returns(cw2::ContractVersion))]
-    GetCW2ContractVersion {},
-}
-
-impl QueryMsg {
-    pub fn all() -> QueryMsg {
-        QueryMsg::All {
-            limit: None,
-            start_after: None,
-        }
-    }
-}
@@ -1,59 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::{Service, ServiceId};
-use cosmwasm_schema::cw_serde;
-use cosmwasm_std::Coin;
-
-#[cw_serde]
-pub struct ServiceInfoResponse {
-    pub service_id: ServiceId,
-    pub service: Option<Service>,
-}
-
-#[cw_serde]
-pub struct ServicesListResponse {
-    pub services: Vec<Service>,
-}
-
-impl ServicesListResponse {
-    pub fn new(services: Vec<Service>) -> ServicesListResponse {
-        ServicesListResponse { services }
-    }
-}
-
-impl From<&[Service]> for ServicesListResponse {
-    fn from(services: &[Service]) -> Self {
-        Self {
-            services: services.to_vec(),
-        }
-    }
-}
-
-#[cw_serde]
-pub struct PagedServicesListResponse {
-    pub services: Vec<Service>,
-    pub per_page: usize,
-
-    /// Field indicating paging information for the following queries if the caller wishes to get further entries.
-    pub start_next_after: Option<ServiceId>,
-}
-
-impl PagedServicesListResponse {
-    pub fn new(
-        services: Vec<Service>,
-        per_page: usize,
-        start_next_after: Option<ServiceId>,
-    ) -> PagedServicesListResponse {
-        PagedServicesListResponse {
-            services,
-            per_page,
-            start_next_after,
-        }
-    }
-}
-
-#[cw_serde]
-pub struct ConfigResponse {
-    pub deposit_required: Coin,
-}
@@ -1,35 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::ServiceDetails;
-use cosmwasm_schema::cw_serde;
-use cosmwasm_std::{Addr, Coin};
-use nym_contracts_common::signing::{
-    ContractMessageContent, MessageType, Nonce, SignableMessage, SigningPurpose,
-};
-
-pub type SignableServiceProviderAnnounceMsg =
-    SignableMessage<ContractMessageContent<ServiceProviderAnnounce>>;
-
-#[cw_serde]
-pub struct ServiceProviderAnnounce {
-    service: ServiceDetails,
-}
-
-impl SigningPurpose for ServiceProviderAnnounce {
-    fn message_type() -> MessageType {
-        MessageType::new("service-provider-announce")
-    }
-}
-
-pub fn construct_service_provider_announce_sign_payload(
-    nonce: Nonce,
-    sender: Addr,
-    deposit: Coin,
-    service: ServiceDetails,
-) -> SignableServiceProviderAnnounceMsg {
-    let payload = ServiceProviderAnnounce { service };
-    let proxy = None;
-    let content = ContractMessageContent::new(sender, proxy, vec![deposit], payload);
-    SignableMessage::new(nonce, content)
-}
@@ -1,79 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use cosmwasm_schema::cw_serde;
-use cosmwasm_std::{Addr, Coin};
-use nym_contracts_common::IdentityKey;
-use std::fmt::{Display, Formatter};
-
-/// The directory of services are indexed by [`ServiceId`].
-pub type ServiceId = u32;
-
-#[cw_serde]
-pub struct Service {
-    /// Unique id assigned to the anounced service.
-    pub service_id: ServiceId,
-    /// The announced service.
-    pub service: ServiceDetails,
-    /// Address of the service owner.
-    pub announcer: Addr,
-    /// Block height at which the service was added.
-    pub block_height: u64,
-    /// The deposit used to announce the service.
-    pub deposit: Coin,
-}
-
-#[cw_serde]
-pub struct ServiceDetails {
-    /// The address of the service.
-    pub nym_address: NymAddress,
-    /// The service type.
-    pub service_type: ServiceType,
-    /// The identity key of the service.
-    pub identity_key: IdentityKey,
-}
-
-/// The types of addresses supported.
-#[cw_serde]
-pub enum NymAddress {
-    /// String representation of a nym address, which is of the form
-    /// client_id.client_enc@gateway_id.
-    Address(String),
-    // String name that can looked up in the nym-name-service contract (once it exists)
-    //Name(String),
-}
-
-impl NymAddress {
-    /// Create a new nym address.
-    pub fn new(address: &str) -> Self {
-        Self::Address(address.to_string())
-    }
-
-    pub fn as_str(&self) -> &str {
-        match self {
-            NymAddress::Address(address) => address,
-            //NymAddress::Name(name) => name,
-        }
-    }
-}
-
-impl Display for NymAddress {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.as_str())
-    }
-}
-
-/// The type of services provider supported
-#[cw_serde]
-pub enum ServiceType {
-    NetworkRequester,
-}
-
-impl std::fmt::Display for ServiceType {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let service_type = match self {
-            ServiceType::NetworkRequester => "network_requester",
-        };
-        write!(f, "{service_type}")
-    }
-}
@@ -13,7 +13,7 @@ cosmwasm-schema = { workspace = true }
 cw2 = { workspace = true, optional = true }
 mixnet-contract-common = { path = "../mixnet-contract", package = "nym-mixnet-contract-common", version = "0.6.0" }
 contracts-common = { path = "../contracts-common", package = "nym-contracts-common", version = "0.5.0" }
-serde = { version = "1.0", features = ["derive"] }
+serde = { workspace = true, features = ["derive"] }
 thiserror = { workspace = true }
 ts-rs = { workspace = true, optional = true}

@@ -26,4 +26,4 @@ features = [ "rt-multi-thread", "net", "signal", "fs" ]

 [build-dependencies]
 sqlx = { workspace = true, features = ["runtime-tokio-rustls", "sqlite", "macros", "migrate"] }
-tokio = { version = "1.24.1", features = ["rt-multi-thread", "macros"] }
+tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
@@ -18,4 +18,7 @@ pub enum StorageError {

    #[error("No unused credential in database. You need to buy at least one")]
    NoCredential,
+
+    #[error("Database unique constraint violation. Is the credential already imported?")]
+    ConstraintUnique,
 }
@@ -69,9 +69,21 @@ impl Storage for PersistentStorage {
                bandwidth_credential.credential_data,
                bandwidth_credential.epoch_id,
            )
-            .await?;
-
-        Ok(())
+            .await
+            .map_err(|err| {
+                // There is one error we want to handle specifically.
+                // Check if database_error is `SqliteError` with code 2067 which
+                // means UNIQUE constraint violation
+                if let Some(db_error) = err.as_database_error() {
+                    if db_error.code().map_or(false, |code| code == "2067") {
+                        StorageError::ConstraintUnique
+                    } else {
+                        err.into()
+                    }
+                } else {
+                    err.into()
+                }
+            })
    }

    async fn get_next_unspent_credential(
@@ -11,11 +11,8 @@ use nym_validator_client::nyxd::contract_traits::{
 };
 use nym_validator_client::nyxd::Coin;
 use std::path::PathBuf;
-use std::process::exit;
 use std::time::{Duration, SystemTime};

-const SAFETY_BUFFER_SECS: u64 = 60; // 1 minute
-
 pub async fn issue_credential<C>(
    client: &C,
    amount: Coin,
@@ -92,13 +89,6 @@ where
            .as_secs();

        if epoch.state.is_final() {
-            if let Some(finish_timestamp) = epoch.deadline {
-                if current_timestamp_secs + SAFETY_BUFFER_SECS >= finish_timestamp.seconds() {
-                    info!("In the next {} minute(s), a transition will take place in the coconut system. Deposits should be halted in this time for safety reasons.", SAFETY_BUFFER_SECS / 60);
-                    exit(0);
-                }
-            }
-
            break;
        } else if let Some(final_timestamp) = epoch.final_timestamp_secs() {
            // Use 1 additional second to not start the next iteration immediately and spam get_current_epoch queries
@@ -8,11 +8,11 @@ use std::str::FromStr;
 use thiserror::Error;

 pub use nym_coconut::{
-    aggregate_signature_shares_and_verify, aggregate_verification_keys, blind_sign, hash_to_scalar,
-    keygen, prepare_blind_sign, prove_bandwidth_credential, verify_credential, Attribute, Base58,
-    BlindSignRequest, BlindedSerialNumber, BlindedSignature, Bytable, CoconutError, KeyPair,
-    Parameters, PrivateAttribute, PublicAttribute, SecretKey, Signature, SignatureShare,
-    VerificationKey, VerifyCredentialRequest,
+    aggregate_signature_shares, aggregate_signature_shares_and_verify, aggregate_verification_keys,
+    blind_sign, hash_to_scalar, keygen, prepare_blind_sign, prove_bandwidth_credential,
+    verify_credential, Attribute, Base58, BlindSignRequest, BlindedSerialNumber, BlindedSignature,
+    Bytable, CoconutError, KeyPair, Parameters, PrivateAttribute, PublicAttribute, SecretKey,
+    Signature, SignatureShare, VerificationKey, VerifyCredentialRequest,
 };

 pub const VOUCHER_INFO_TYPE: &str = "BandwidthVoucher";
@@ -8,7 +8,7 @@ license.workspace = true

 [dependencies]
 bls12_381 = { workspace = true, default-features = false, features = ["pairings", "alloc", "experimental"] }
-bincode = "1.3.3"
+bincode = { workspace = true }
 cosmrs = { workspace = true }
 thiserror = { workspace = true }
 log = { workspace = true }
@@ -23,5 +23,5 @@ nym-api-requests = { path = "../../nym-api/nym-api-requests" }
 nym-validator-client = { path = "../client-libs/validator-client", default-features = false }

 [dev-dependencies]
-rand = "0.7.3"
+rand = "0.8.5"

@@ -12,7 +12,8 @@ use serde::{Deserialize, Serialize};
 use time::{Duration, OffsetDateTime, Time};
 use zeroize::{Zeroize, ZeroizeOnDrop};

-pub const MAX_FREE_PASS_VALIDITY: Duration = Duration::WEEK; // 1 week
+pub const DEFAULT_FREE_PASS_VALIDITY: Duration = Duration::WEEK; // 1 week
+pub const MAX_FREE_PASS_VALIDITY: Duration = Duration::weeks(12); // 12 weeks

 #[derive(Debug, Zeroize, ZeroizeOnDrop, Serialize, Deserialize)]
 pub struct FreePassIssuedData {
@@ -77,9 +78,9 @@ impl FreePassIssuanceData {
    }

    pub fn default_expiry_date() -> OffsetDateTime {
-        // set it to furthest midnight in the future such as it's no more than a week away,
+        // set it to the furthest midnight in the future such as it's no more than a week away,
        // i.e. if it's currently for example 9:43 on 2nd March 2024, it will set it to 0:00 on 9th March 2024
-        (OffsetDateTime::now_utc() + MAX_FREE_PASS_VALIDITY).replace_time(Time::MIDNIGHT)
+        (OffsetDateTime::now_utc() + DEFAULT_FREE_PASS_VALIDITY).replace_time(Time::MIDNIGHT)
    }

    pub fn expiry_date_attribute(&self) -> &Attribute {
@@ -10,9 +10,9 @@ use crate::coconut::bandwidth::{
 use crate::coconut::utils::scalar_serde_helper;
 use crate::error::Error;
 use nym_credentials_interface::{
-    aggregate_signature_shares_and_verify, hash_to_scalar, prepare_blind_sign, Attribute,
-    BlindedSerialNumber, BlindedSignature, Parameters, PrivateAttribute, PublicAttribute,
-    Signature, SignatureShare, VerificationKey,
+    aggregate_signature_shares, aggregate_signature_shares_and_verify, hash_to_scalar,
+    prepare_blind_sign, Attribute, BlindedSerialNumber, BlindedSignature, Parameters,
+    PrivateAttribute, PublicAttribute, Signature, SignatureShare, VerificationKey,
 };
 use nym_crypto::asymmetric::{encryption, identity};
 use nym_validator_client::nym_api::EpochId;
@@ -266,6 +266,13 @@ impl IssuanceBandwidthCredential {
        self.unblind_signature(validator_vk, &signing_data, blinded_signature)
    }

+    pub fn unchecked_aggregate_signature_shares(
+        &self,
+        shares: &[SignatureShare],
+    ) -> Result<Signature, Error> {
+        aggregate_signature_shares(shares).map_err(Error::SignatureAggregationError)
+    }
+
    pub fn aggregate_signature_shares(
        &self,
        verification_key: &VerificationKey,
@@ -155,11 +155,6 @@ impl IssuedBandwidthCredential {
            })
    }

-    pub fn randomise_signature(&mut self) {
-        let signature_prime = self.signature.randomise(bandwidth_credential_params());
-        self.signature = signature_prime.0
-    }
-
    pub fn default_parameters() -> Parameters {
        IssuanceBandwidthCredential::default_parameters()
    }
@@ -6,7 +6,7 @@ use crate::coconut::utils::scalar_serde_helper;
 use crate::error::Error;
 use nym_api_requests::coconut::BlindSignRequestBody;
 use nym_credentials_interface::{
-    hash_to_scalar, Attribute, BlindSignRequest, BlindedSignature, PublicAttribute,
+    hash_to_scalar, Attribute, BlindSignRequest, BlindedSignature, CredentialType, PublicAttribute,
 };
 use nym_crypto::asymmetric::{encryption, identity};
 use nym_validator_client::nyxd::{Coin, Hash};
@@ -30,6 +30,10 @@ impl<'a> From<&'a BandwidthVoucherIssuanceData> for BandwidthVoucherIssuedData {
 }

 impl BandwidthVoucherIssuedData {
+    pub fn new(value: Coin) -> Self {
+        BandwidthVoucherIssuedData { value }
+    }
+
    pub fn value(&self) -> &Coin {
        &self.value
    }
@@ -123,6 +127,10 @@ impl BandwidthVoucherIssuanceData {
        &self.value_prehashed
    }

+    pub fn typ() -> CredentialType {
+        CredentialType::Voucher
+    }
+
    pub fn tx_hash(&self) -> Hash {
        self.deposit_tx_hash
    }
@@ -8,21 +8,21 @@ license = { workspace = true }
 repository = { workspace = true }

 [dependencies]
-aes = { version = "0.8.1", optional = true }
+aes = { workspace = true, optional = true }
 bs58 = { workspace = true }
-blake3 = { version = "1.3.1", features = ["traits-preview"], optional = true }
-ctr = { version = "0.9.1", optional = true }
+blake3 = { workspace = true, features = ["traits-preview"], optional = true }
+ctr = { workspace = true, optional = true }
 digest = { version = "0.10.3", optional = true }
 generic-array = { workspace = true, optional = true }
-hkdf = { version = "0.12.3", optional = true }
-hmac = { version = "0.12.1", optional = true }
-cipher = { version = "0.4.3", optional = true }
-x25519-dalek = { version = "1.1", optional = true }
-ed25519-dalek = { version = "1.0", optional = true }
-rand = { version = "0.7.3", features = ["wasm-bindgen"], optional = true }
+hkdf = { workspace = true, optional = true }
+hmac = { workspace = true, optional = true }
+cipher = { workspace = true, optional = true }
+x25519-dalek = { version = "2.0", optional = true, features = ["static_secrets"]}
+ed25519-dalek = { version = "2.1", features = ["rand_core"], optional = true }
+rand = { workspace = true, optional = true }
 serde_bytes = { version = "0.11.6", optional = true }
 serde_crate = { version = "1.0", optional = true, default_features = false, features = ["derive"], package = "serde" }
-subtle-encoding = { version = "0.5", features =  ["bech32-preview"]}
+subtle-encoding = { workspace = true, features = ["bech32-preview"] }
 thiserror = { workspace = true }
 zeroize = { workspace = true, optional = true, features = ["zeroize_derive"] }

@@ -31,7 +31,7 @@ nym-sphinx-types = { path = "../nymsphinx/types", version = "0.2.0", default-fea
 nym-pemstore = { path = "../../common/pemstore", version = "0.3.0" }

 [dev-dependencies]
-rand_chacha = "0.2"
+rand_chacha = "0.3"

 [features]
 default = ["sphinx"]
@@ -56,7 +56,7 @@ pub struct KeyPair {
 impl KeyPair {
    #[cfg(feature = "rand")]
    pub fn new<R: RngCore + CryptoRng>(rng: &mut R) -> Self {
-        let private_key = x25519_dalek::StaticSecret::new(rng);
+        let private_key = x25519_dalek::StaticSecret::random_from_rng(rng);
        let public_key = (&private_key).into();

        KeyPair {
@@ -200,10 +200,18 @@ impl<'a> From<&'a PrivateKey> for PublicKey {
    }
 }

+impl FromStr for PrivateKey {
+    type Err = KeyRecoveryError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        PrivateKey::from_base58_string(s)
+    }
+}
+
 impl PrivateKey {
    #[cfg(feature = "rand")]
    pub fn new<R: RngCore + CryptoRng>(rng: &mut R) -> Self {
-        let x25519_secret = x25519_dalek::StaticSecret::new(rng);
+        let x25519_secret = x25519_dalek::StaticSecret::random_from_rng(rng);

        PrivateKey(x25519_secret)
    }
@@ -350,16 +358,23 @@ mod sphinx_key_conversion {
            let private = &keys.private_key;
            let public = &keys.public_key;

-            let private_bytes = private.to_bytes();
+            let dummy_remote = KeyPair::new(&mut rng);
+            let dh1 = private.diffie_hellman(&dummy_remote.public_key);
+
            let public_bytes = public.to_bytes();

            let sphinx_private: nym_sphinx_types::PrivateKey = private.into();
            let recovered_private = PrivateKey::from(sphinx_private);

+            let dh2 = recovered_private.diffie_hellman(&dummy_remote.public_key);
+
            let sphinx_public: nym_sphinx_types::PublicKey = public.into();
            let recovered_public = PublicKey::from(sphinx_public);
-            assert_eq!(private_bytes, recovered_private.to_bytes());
            assert_eq!(public_bytes, recovered_public.to_bytes());
+
+            // even though the byte representation of the private key changed, the resultant DH is the same
+            // which is what matters
+            assert_eq!(dh1, dh2);
        }
    }

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

-pub use ed25519_dalek::ed25519::signature::Signature as SignatureTrait;
 pub use ed25519_dalek::SignatureError;
+use ed25519_dalek::{Signer, SigningKey};
 pub use ed25519_dalek::{Verifier, PUBLIC_KEY_LENGTH, SECRET_KEY_LENGTH, SIGNATURE_LENGTH};
 use nym_pemstore::traits::{PemStorableKey, PemStorableKeyPair};
 use std::fmt::{self, Display, Formatter};
@@ -30,6 +30,9 @@ pub enum Ed25519RecoveryError {
    #[error(transparent)]
    MalformedBytes(#[from] SignatureError),

+    #[error(transparent)]
+    BytesLengthError(#[from] std::array::TryFromSliceError),
+
    #[error("the base58 representation of the public key was malformed - {source}")]
    MalformedPublicKeyString {
        #[source]
@@ -64,11 +67,11 @@ pub struct KeyPair {
 impl KeyPair {
    #[cfg(feature = "rand")]
    pub fn new<R: RngCore + CryptoRng>(rng: &mut R) -> Self {
-        let ed25519_keypair = ed25519_dalek::Keypair::generate(rng);
+        let ed25519_signing_key = ed25519_dalek::SigningKey::generate(rng);

        KeyPair {
-            private_key: PrivateKey(ed25519_keypair.secret),
-            public_key: PublicKey(ed25519_keypair.public),
+            private_key: PrivateKey(ed25519_signing_key.to_bytes()),
+            public_key: PublicKey(ed25519_signing_key.verifying_key()),
        }
    }

@@ -109,7 +112,7 @@ impl PemStorableKeyPair for KeyPair {

 /// ed25519 EdDSA Public Key
 #[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub struct PublicKey(ed25519_dalek::PublicKey);
+pub struct PublicKey(ed25519_dalek::VerifyingKey);

 impl Display for PublicKey {
    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
@@ -135,7 +138,9 @@ impl PublicKey {
    }

    pub fn from_bytes(b: &[u8]) -> Result<Self, Ed25519RecoveryError> {
-        Ok(PublicKey(ed25519_dalek::PublicKey::from_bytes(b)?))
+        Ok(PublicKey(ed25519_dalek::VerifyingKey::from_bytes(
+            b.try_into()?,
+        )?))
    }

    pub fn to_base58_string(self) -> String {
@@ -189,7 +194,7 @@ impl<'d> Deserialize<'d> for PublicKey {
    where
        D: Deserializer<'d>,
    {
-        Ok(PublicKey(ed25519_dalek::PublicKey::deserialize(
+        Ok(PublicKey(ed25519_dalek::VerifyingKey::deserialize(
            deserializer,
        )?))
    }
@@ -223,14 +228,22 @@ impl Display for PrivateKey {

 impl<'a> From<&'a PrivateKey> for PublicKey {
    fn from(pk: &'a PrivateKey) -> Self {
-        PublicKey((&pk.0).into())
+        PublicKey(SigningKey::from_bytes(&pk.0).verifying_key())
+    }
+}
+
+impl FromStr for PrivateKey {
+    type Err = Ed25519RecoveryError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        PrivateKey::from_base58_string(s)
    }
 }

 impl PrivateKey {
    #[cfg(feature = "rand")]
    pub fn new<R: RngCore + CryptoRng>(rng: &mut R) -> Self {
-        let ed25519_secret = ed25519_dalek::SecretKey::generate(rng);
+        let ed25519_secret = ed25519_dalek::SigningKey::generate(rng).to_bytes();

        PrivateKey(ed25519_secret)
    }
@@ -240,11 +253,11 @@ impl PrivateKey {
    }

    pub fn to_bytes(&self) -> [u8; SECRET_KEY_LENGTH] {
-        self.0.to_bytes()
+        self.0
    }

    pub fn from_bytes(b: &[u8]) -> Result<Self, Ed25519RecoveryError> {
-        Ok(PrivateKey(ed25519_dalek::SecretKey::from_bytes(b)?))
+        Ok(PrivateKey(b.try_into()?))
    }

    pub fn to_base58_string(&self) -> String {
@@ -259,9 +272,8 @@ impl PrivateKey {
    }

    pub fn sign<M: AsRef<[u8]>>(&self, message: M) -> Signature {
-        let expanded_secret_key = ed25519_dalek::ExpandedSecretKey::from(&self.0);
-        let public_key: PublicKey = self.into();
-        let sig = expanded_secret_key.sign(message.as_ref(), &public_key.0);
+        let signing_key: SigningKey = self.0.into();
+        let sig = signing_key.sign(message.as_ref());
        Signature(sig)
    }

@@ -330,7 +342,9 @@ impl Signature {
    }

    pub fn from_bytes(bytes: &[u8]) -> Result<Self, Ed25519RecoveryError> {
-        Ok(Signature(ed25519_dalek::Signature::from_bytes(bytes)?))
+        Ok(Signature(ed25519_dalek::Signature::from_bytes(
+            bytes.try_into()?,
+        )))
    }
 }

@@ -3,11 +3,11 @@

 use crate::asymmetric::encryption;
 use crate::hkdf;
+#[cfg(feature = "rand")]
+use cipher::crypto_common::rand_core::{CryptoRng, RngCore};
 use cipher::{Key, KeyIvInit, StreamCipher};
 use digest::crypto_common::BlockSizeUser;
 use digest::Digest;
-#[cfg(feature = "rand")]
-use rand::{CryptoRng, RngCore};

 /// Generate an ephemeral encryption keypair and perform diffie-hellman to establish
 /// shared key with the remote.
@@ -8,7 +8,7 @@ license.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-bitvec = "1.0.0"
+bitvec = { workspace = true }

 # unfortunately until https://github.com/zkcrypto/bls12_381/issues/10 is resolved, we have to rely on the fork
 # as we need to be able to serialize Gt so that we could create the lookup table for baby-step-giant-step algorithm
@@ -17,13 +17,13 @@ nym-contracts-common = { path = "../cosmwasm-smart-contracts/contracts-common",
 bs58 = { workspace = true }


-lazy_static = "1.4.0"
+lazy_static = { workspace = true }
 rand = { version = "0.8.5", default-features = false}
 rand_chacha = "0.3"
-rand_core = "0.6.3"
+rand_core = { workspace = true }
 sha2 = "0.9"
 serde = { workspace = true }
-serde_derive = "1.0"
+serde_derive = { workspace = true }
 thiserror = { workspace = true }
 zeroize = { workspace = true, features = ["zeroize_derive"] }

@@ -38,7 +38,7 @@ workspace = true
 default-features = false

 [dev-dependencies]
-criterion = "0.4"
+criterion = { workspace = true }

 [[bench]]
 name = "benchmarks"
@@ -8,5 +8,5 @@ license.workspace = true
 proc-macro = true

 [dependencies]
-syn = { version = "1", features = ["full"] }
-quote = "1"
+syn = { workspace = true, features = ["full"] }
+quote = { workspace = true }
@@ -13,6 +13,7 @@ license.workspace = true
 [dependencies]
 async-trait = { workspace = true }
 reqwest = { workspace = true, features = ["json"] }
+http.workspace = true
 url = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
@@ -2,7 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0

 use async_trait::async_trait;
-use reqwest::{IntoUrl, Response, StatusCode};
+use reqwest::header::HeaderValue;
+use reqwest::{RequestBuilder, Response, StatusCode};
 use serde::de::DeserializeOwned;
 use serde::{Deserialize, Serialize};
 use std::fmt::Display;
@@ -11,6 +12,8 @@ use thiserror::Error;
 use tracing::warn;
 use url::Url;

+pub use reqwest::IntoUrl;
+
 pub const DEFAULT_TIMEOUT: Duration = Duration::from_secs(10);

 pub type PathSegments<'a> = &'a [&'a str];
@@ -52,6 +55,88 @@ pub enum HttpClientError<E: Display = String> {
    RequestTimeout,
 }

+pub struct ClientBuilder {
+    url: Url,
+    timeout: Option<Duration>,
+    custom_user_agent: bool,
+    reqwest_client_builder: reqwest::ClientBuilder,
+}
+
+impl ClientBuilder {
+    pub fn new<U, E>(url: U) -> Result<Self, HttpClientError<E>>
+    where
+        U: IntoUrl,
+        E: Display,
+    {
+        // a naive check: if the provided URL does not start with http(s), add that scheme
+        let str_url = url.as_str();
+
+        if !str_url.starts_with("http") {
+            let alt = format!("http://{str_url}");
+            warn!("the provided url ('{str_url}') does not contain scheme information. Changing it to '{alt}' ...");
+            // TODO: or should we maybe default to https?
+            Self::new(alt)
+        } else {
+            Ok(ClientBuilder {
+                url: url.into_url()?,
+                timeout: None,
+                custom_user_agent: false,
+                reqwest_client_builder: reqwest::ClientBuilder::new(),
+            })
+        }
+    }
+
+    pub fn with_timeout(mut self, timeout: Duration) -> Self {
+        self.timeout = Some(timeout);
+        self
+    }
+
+    pub fn with_reqwest_builder(mut self, reqwest_builder: reqwest::ClientBuilder) -> Self {
+        self.reqwest_client_builder = reqwest_builder;
+        self
+    }
+
+    pub fn with_user_agent<V>(mut self, value: V) -> Self
+    where
+        V: TryInto<HeaderValue>,
+        V::Error: Into<http::Error>,
+    {
+        self.custom_user_agent = true;
+        self.reqwest_client_builder = self.reqwest_client_builder.user_agent(value);
+        self
+    }
+
+    pub fn build<E>(self) -> Result<Client, HttpClientError<E>>
+    where
+        E: Display,
+    {
+        #[cfg(target_arch = "wasm32")]
+        let reqwest_client = self.reqwest_client_builder.build()?;
+
+        // TODO: we should probably be propagating the error rather than panicking,
+        // but that'd break bunch of things due to type changes
+        #[cfg(not(target_arch = "wasm32"))]
+        let reqwest_client = {
+            let mut builder = self
+                .reqwest_client_builder
+                .timeout(self.timeout.unwrap_or(DEFAULT_TIMEOUT));
+            if !self.custom_user_agent {
+                builder =
+                    builder.user_agent(format!("nym-http-api-client/{}", env!("CARGO_PKG_VERSION")))
+            }
+            builder.build()?
+        };
+
+        Ok(Client {
+            base_url: self.url,
+            reqwest_client,
+
+            #[cfg(target_arch = "wasm32")]
+            request_timeout: self.timeout.unwrap_or(DEFAULT_TIMEOUT),
+        })
+    }
+}
+
 /// A simple extendable client wrapper for http request with extra url sanitization.
 #[derive(Debug, Clone)]
 pub struct Client {
@@ -65,25 +150,9 @@ pub struct Client {
 impl Client {
    // no timeout until https://github.com/seanmonstar/reqwest/issues/1135 is fixed
    pub fn new(base_url: Url, timeout: Option<Duration>) -> Self {
-        #[cfg(target_arch = "wasm32")]
-        let reqwest_client = reqwest::Client::new();
-
-        // TODO: we should probably be propagating the error rather than panicking,
-        // but that'd break bunch of things due to type changes
-        #[cfg(not(target_arch = "wasm32"))]
-        let reqwest_client = reqwest::ClientBuilder::new()
-            .timeout(timeout.unwrap_or(DEFAULT_TIMEOUT))
-            .user_agent(format!("nym-http-api-client/{}", env!("CARGO_PKG_VERSION")))
-            .build()
-            .expect("Client::new()");
-
-        Client {
-            base_url,
-            reqwest_client,
-
-            #[cfg(target_arch = "wasm32")]
-            request_timeout: timeout.unwrap_or(DEFAULT_TIMEOUT),
-        }
+        Self::new_url::<_, String>(base_url, timeout).expect(
+            "we provided valid url and we were unwrapping previous construction errors anyway",
+        )
    }

    pub fn new_url<U, E>(url: U, timeout: Option<Duration>) -> Result<Self, HttpClientError<E>>
@@ -91,19 +160,21 @@ impl Client {
        U: IntoUrl,
        E: Display,
    {
-        // a naive check: if the provided URL does not start with http(s), add that scheme
-        let str_url = url.as_str();
-
-        if !str_url.starts_with("http") {
-            let alt = format!("http://{str_url}");
-            warn!("the provided url ('{str_url}') does not contain scheme information. Changing it to '{alt}' ...");
-            // TODO: or should we maybe default to https?
-            Self::new_url(alt, timeout)
-        } else {
-            Ok(Self::new(url.into_url()?, timeout))
+        let builder = Self::builder(url)?;
+        match timeout {
+            Some(timeout) => builder.with_timeout(timeout).build(),
+            None => builder.build(),
        }
    }

+    pub fn builder<U, E>(url: U) -> Result<ClientBuilder, HttpClientError<E>>
+    where
+        U: IntoUrl,
+        E: Display,
+    {
+        ClientBuilder::new(url)
+    }
+
    pub fn change_base_url(&mut self, new_url: Url) {
        self.base_url = new_url
    }
@@ -112,6 +183,19 @@ impl Client {
        &self.base_url
    }

+    pub fn create_get_request<K, V>(
+        &self,
+        path: PathSegments<'_>,
+        params: Params<'_, K, V>,
+    ) -> RequestBuilder
+    where
+        K: AsRef<str>,
+        V: AsRef<str>,
+    {
+        let url = sanitize_url(&self.base_url, path, params);
+        self.reqwest_client.get(url)
+    }
+
    async fn send_get_request<K, V, E>(
        &self,
        path: PathSegments<'_>,
@@ -142,6 +226,21 @@ impl Client {
        }
    }

+    pub fn create_post_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.post(url).json(json_body)
+    }
+
    async fn send_post_request<B, K, V, E>(
        &self,
        path: PathSegments<'_>,
@@ -407,7 +506,7 @@ pub fn sanitize_url<K: AsRef<str>, V: AsRef<str>>(
    url
 }

-async fn parse_response<T, E>(res: Response, allow_empty: bool) -> Result<T, HttpClientError<E>>
+pub async fn parse_response<T, E>(res: Response, allow_empty: bool) -> Result<T, HttpClientError<E>>
 where
    T: DeserializeOwned,
    E: DeserializeOwned + Display,
@@ -12,9 +12,9 @@ license.workspace = true

 [dependencies]
 axum.workspace = true
-bytes = "1.5.0"
-mime = "0.3.17"
+bytes = { workspace = true }
+mime = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json.workspace = true
-serde_yaml = "0.9.25"
+serde_yaml = { workspace = true }
 utoipa = { workspace = true }
@@ -9,12 +9,14 @@ edition.workspace = true
 license.workspace = true

 [dependencies]
-bincode = "1.3.3"
-bytes = "1.5.0"
+bincode = { workspace = true }
+bytes = { workspace = true }
 nym-bin-common = { path = "../bin-common" }
+nym-crypto = { path = "../crypto" }
 nym-sphinx = { path = "../nymsphinx" }
 rand = "0.8.5"
 serde = { workspace = true, features = ["derive"] }
 thiserror = { workspace = true }
+time = { workspace = true }
 tokio = { workspace = true, features = ["time"] }
 tokio-util = { workspace = true, features = ["codec"] }
@@ -12,11 +12,13 @@ pub use v6::response;

 pub mod codec;
 pub mod v6;
+pub mod v7;

 // version 3: initial version
 // version 4: IPv6 support
 // version 5: Add severity level to info response
 // version 6: Increase the available IPs
+// version 7: Add signature support (for the future)
 pub const CURRENT_VERSION: u8 = 6;

 #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
@@ -1,2 +1,4 @@
 pub mod request;
 pub mod response;
+
+const VERSION: u8 = 6;
@@ -1,7 +1,9 @@
 use nym_sphinx::addressing::clients::Recipient;
 use serde::{Deserialize, Serialize};

-use crate::{make_bincode_serializer, IpPair, CURRENT_VERSION};
+use crate::{make_bincode_serializer, IpPair};
+
+use super::VERSION;

 fn generate_random() -> u64 {
    use rand::RngCore;
@@ -26,7 +28,7 @@ impl IpPacketRequest {
        let request_id = generate_random();
        (
            Self {
-                version: CURRENT_VERSION,
+                version: VERSION,
                data: IpPacketRequestData::StaticConnect(StaticConnectRequest {
                    request_id,
                    ips,
@@ -49,7 +51,7 @@ impl IpPacketRequest {
        let request_id = generate_random();
        (
            Self {
-                version: CURRENT_VERSION,
+                version: VERSION,
                data: IpPacketRequestData::DynamicConnect(DynamicConnectRequest {
                    request_id,
                    reply_to,
@@ -66,7 +68,7 @@ impl IpPacketRequest {
        let request_id = generate_random();
        (
            Self {
-                version: CURRENT_VERSION,
+                version: VERSION,
                data: IpPacketRequestData::Disconnect(DisconnectRequest {
                    request_id,
                    reply_to,
@@ -78,7 +80,7 @@ impl IpPacketRequest {

    pub fn new_data_request(ip_packets: bytes::Bytes) -> Self {
        Self {
-            version: CURRENT_VERSION,
+            version: VERSION,
            data: IpPacketRequestData::Data(DataRequest { ip_packets }),
        }
    }
@@ -87,7 +89,7 @@ impl IpPacketRequest {
        let request_id = generate_random();
        (
            Self {
-                version: CURRENT_VERSION,
+                version: VERSION,
                data: IpPacketRequestData::Ping(PingRequest {
                    request_id,
                    reply_to,
@@ -101,7 +103,7 @@ impl IpPacketRequest {
        let request_id = generate_random();
        (
            Self {
-                version: CURRENT_VERSION,
+                version: VERSION,
                data: IpPacketRequestData::Health(HealthRequest {
                    request_id,
                    reply_to,
@@ -1,7 +1,9 @@
 use nym_sphinx::addressing::clients::Recipient;
 use serde::{Deserialize, Serialize};

-use crate::{make_bincode_serializer, IpPair, CURRENT_VERSION};
+use crate::{make_bincode_serializer, IpPair};
+
+use super::VERSION;

 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct IpPacketResponse {
@@ -12,7 +14,7 @@ pub struct IpPacketResponse {
 impl IpPacketResponse {
    pub fn new_static_connect_success(request_id: u64, reply_to: Recipient) -> Self {
        Self {
-            version: CURRENT_VERSION,
+            version: VERSION,
            data: IpPacketResponseData::StaticConnect(StaticConnectResponse {
                request_id,
                reply_to,
@@ -27,7 +29,7 @@ impl IpPacketResponse {
        reason: StaticConnectFailureReason,
    ) -> Self {
        Self {
-            version: CURRENT_VERSION,
+            version: VERSION,
            data: IpPacketResponseData::StaticConnect(StaticConnectResponse {
                request_id,
                reply_to,
@@ -38,7 +40,7 @@ impl IpPacketResponse {

    pub fn new_dynamic_connect_success(request_id: u64, reply_to: Recipient, ips: IpPair) -> Self {
        Self {
-            version: CURRENT_VERSION,
+            version: VERSION,
            data: IpPacketResponseData::DynamicConnect(DynamicConnectResponse {
                request_id,
                reply_to,
@@ -53,7 +55,7 @@ impl IpPacketResponse {
        reason: DynamicConnectFailureReason,
    ) -> Self {
        Self {
-            version: CURRENT_VERSION,
+            version: VERSION,
            data: IpPacketResponseData::DynamicConnect(DynamicConnectResponse {
                request_id,
                reply_to,
@@ -64,7 +66,7 @@ impl IpPacketResponse {

    pub fn new_disconnect_success(request_id: u64, reply_to: Recipient) -> Self {
        Self {
-            version: CURRENT_VERSION,
+            version: VERSION,
            data: IpPacketResponseData::Disconnect(DisconnectResponse {
                request_id,
                reply_to,
@@ -79,7 +81,7 @@ impl IpPacketResponse {
        reason: DisconnectFailureReason,
    ) -> Self {
        Self {
-            version: CURRENT_VERSION,
+            version: VERSION,
            data: IpPacketResponseData::Disconnect(DisconnectResponse {
                request_id,
                reply_to,
@@ -93,7 +95,7 @@ impl IpPacketResponse {
        reason: UnrequestedDisconnectReason,
    ) -> Self {
        Self {
-            version: CURRENT_VERSION,
+            version: VERSION,
            data: IpPacketResponseData::UnrequestedDisconnect(UnrequestedDisconnect {
                reply_to,
                reason,
@@ -103,7 +105,7 @@ impl IpPacketResponse {

    pub fn new_ip_packet(ip_packet: bytes::Bytes) -> Self {
        Self {
-            version: CURRENT_VERSION,
+            version: VERSION,
            data: IpPacketResponseData::Data(DataResponse { ip_packet }),
        }
    }
@@ -115,7 +117,7 @@ impl IpPacketResponse {
        our_version: u8,
    ) -> Self {
        Self {
-            version: CURRENT_VERSION,
+            version: VERSION,
            data: IpPacketResponseData::Info(InfoResponse {
                request_id,
                reply_to,
@@ -134,7 +136,7 @@ impl IpPacketResponse {
        level: InfoLevel,
    ) -> Self {
        Self {
-            version: CURRENT_VERSION,
+            version: VERSION,
            data: IpPacketResponseData::Info(InfoResponse {
                request_id: 0,
                reply_to,
@@ -146,7 +148,7 @@ impl IpPacketResponse {

    pub fn new_pong(request_id: u64, reply_to: Recipient) -> Self {
        Self {
-            version: CURRENT_VERSION,
+            version: VERSION,
            data: IpPacketResponseData::Pong(PongResponse {
                request_id,
                reply_to,
@@ -161,7 +163,7 @@ impl IpPacketResponse {
        routable: Option<bool>,
    ) -> Self {
        Self {
-            version: CURRENT_VERSION,
+            version: VERSION,
            data: IpPacketResponseData::Health(HealthResponse {
                request_id,
                reply_to,
@@ -0,0 +1,124 @@
+use time::OffsetDateTime;
+
+use crate::{v6, v7};
+
+impl From<v6::request::IpPacketRequest> for v7::request::IpPacketRequest {
+    fn from(ip_packet_request: v6::request::IpPacketRequest) -> Self {
+        Self {
+            version: 7,
+            data: ip_packet_request.data.into(),
+        }
+    }
+}
+
+impl From<v6::request::IpPacketRequestData> for v7::request::IpPacketRequestData {
+    fn from(ip_packet_request_data: v6::request::IpPacketRequestData) -> Self {
+        match ip_packet_request_data {
+            v6::request::IpPacketRequestData::StaticConnect(r) => {
+                v7::request::IpPacketRequestData::StaticConnect(
+                    v7::request::SignedStaticConnectRequest {
+                        request: r.into(),
+                        signature: None,
+                    },
+                )
+            }
+            v6::request::IpPacketRequestData::DynamicConnect(r) => {
+                v7::request::IpPacketRequestData::DynamicConnect(
+                    v7::request::SignedDynamicConnectRequest {
+                        request: r.into(),
+                        signature: None,
+                    },
+                )
+            }
+            v6::request::IpPacketRequestData::Disconnect(r) => {
+                v7::request::IpPacketRequestData::Disconnect(v7::request::SignedDisconnectRequest {
+                    request: r.into(),
+                    signature: None,
+                })
+            }
+            v6::request::IpPacketRequestData::Data(r) => {
+                v7::request::IpPacketRequestData::Data(r.into())
+            }
+            v6::request::IpPacketRequestData::Ping(r) => {
+                v7::request::IpPacketRequestData::Ping(r.into())
+            }
+            v6::request::IpPacketRequestData::Health(r) => {
+                v7::request::IpPacketRequestData::Health(r.into())
+            }
+        }
+    }
+}
+
+impl From<v6::request::StaticConnectRequest> for v7::request::StaticConnectRequest {
+    fn from(static_connect_request: v6::request::StaticConnectRequest) -> Self {
+        Self {
+            request_id: static_connect_request.request_id,
+            ips: static_connect_request.ips,
+            reply_to: static_connect_request.reply_to,
+            reply_to_hops: static_connect_request.reply_to_hops,
+            reply_to_avg_mix_delays: static_connect_request.reply_to_avg_mix_delays,
+            buffer_timeout: static_connect_request.buffer_timeout,
+            timestamp: OffsetDateTime::now_utc(),
+        }
+    }
+}
+
+impl From<v6::request::DynamicConnectRequest> for v7::request::DynamicConnectRequest {
+    fn from(dynamic_connect_request: v6::request::DynamicConnectRequest) -> Self {
+        Self {
+            request_id: dynamic_connect_request.request_id,
+            reply_to: dynamic_connect_request.reply_to,
+            reply_to_hops: dynamic_connect_request.reply_to_hops,
+            reply_to_avg_mix_delays: dynamic_connect_request.reply_to_avg_mix_delays,
+            buffer_timeout: dynamic_connect_request.buffer_timeout,
+            timestamp: OffsetDateTime::now_utc(),
+        }
+    }
+}
+
+impl From<v6::request::DisconnectRequest> for v7::request::SignedDisconnectRequest {
+    fn from(disconnect_request: v6::request::DisconnectRequest) -> Self {
+        Self {
+            request: disconnect_request.into(),
+            signature: None,
+        }
+    }
+}
+
+impl From<v6::request::DisconnectRequest> for v7::request::DisconnectRequest {
+    fn from(disconnect_request: v6::request::DisconnectRequest) -> Self {
+        Self {
+            request_id: disconnect_request.request_id,
+            reply_to: disconnect_request.reply_to,
+            timestamp: OffsetDateTime::now_utc(),
+        }
+    }
+}
+
+impl From<v6::request::DataRequest> for v7::request::DataRequest {
+    fn from(data_request: v6::request::DataRequest) -> Self {
+        Self {
+            ip_packets: data_request.ip_packets,
+        }
+    }
+}
+
+impl From<v6::request::PingRequest> for v7::request::PingRequest {
+    fn from(ping_request: v6::request::PingRequest) -> Self {
+        Self {
+            request_id: ping_request.request_id,
+            reply_to: ping_request.reply_to,
+            timestamp: OffsetDateTime::now_utc(),
+        }
+    }
+}
+
+impl From<v6::request::HealthRequest> for v7::request::HealthRequest {
+    fn from(health_request: v6::request::HealthRequest) -> Self {
+        Self {
+            request_id: health_request.request_id,
+            reply_to: health_request.reply_to,
+            timestamp: OffsetDateTime::now_utc(),
+        }
+    }
+}
@@ -0,0 +1,6 @@
+pub mod conversion;
+pub mod request;
+pub mod response;
+pub mod signature;
+
+const VERSION: u8 = 7;
@@ -0,0 +1,470 @@
+use nym_crypto::asymmetric::identity;
+use nym_sphinx::addressing::clients::Recipient;
+use serde::{Deserialize, Serialize};
+use time::OffsetDateTime;
+
+use crate::{make_bincode_serializer, IpPair};
+
+use super::{
+    signature::{SignatureError, SignedRequest},
+    VERSION,
+};
+
+fn generate_random() -> u64 {
+    use rand::RngCore;
+    let mut rng = rand::rngs::OsRng;
+    rng.next_u64()
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct IpPacketRequest {
+    pub version: u8,
+    pub data: IpPacketRequestData,
+}
+
+impl IpPacketRequest {
+    pub fn new_static_connect_request(
+        ips: IpPair,
+        reply_to: Recipient,
+        reply_to_hops: Option<u8>,
+        reply_to_avg_mix_delays: Option<f64>,
+        buffer_timeout: Option<u64>,
+    ) -> (Self, u64) {
+        let request_id = generate_random();
+        (
+            Self {
+                version: VERSION,
+                data: IpPacketRequestData::StaticConnect(SignedStaticConnectRequest {
+                    request: StaticConnectRequest {
+                        request_id,
+                        ips,
+                        reply_to,
+                        reply_to_hops,
+                        reply_to_avg_mix_delays,
+                        buffer_timeout,
+                        timestamp: OffsetDateTime::now_utc(),
+                    },
+                    signature: None,
+                }),
+            },
+            request_id,
+        )
+    }
+
+    pub fn new_dynamic_connect_request(
+        reply_to: Recipient,
+        reply_to_hops: Option<u8>,
+        reply_to_avg_mix_delays: Option<f64>,
+        buffer_timeout: Option<u64>,
+    ) -> (Self, u64) {
+        let request_id = generate_random();
+        (
+            Self {
+                version: VERSION,
+                data: IpPacketRequestData::DynamicConnect(SignedDynamicConnectRequest {
+                    request: DynamicConnectRequest {
+                        request_id,
+                        reply_to,
+                        reply_to_hops,
+                        reply_to_avg_mix_delays,
+                        buffer_timeout,
+                        timestamp: OffsetDateTime::now_utc(),
+                    },
+                    signature: None,
+                }),
+            },
+            request_id,
+        )
+    }
+
+    pub fn new_disconnect_request(reply_to: Recipient) -> (Self, u64) {
+        let request_id = generate_random();
+        (
+            Self {
+                version: VERSION,
+                data: IpPacketRequestData::Disconnect(SignedDisconnectRequest {
+                    request: DisconnectRequest {
+                        request_id,
+                        reply_to,
+                        timestamp: OffsetDateTime::now_utc(),
+                    },
+                    signature: None,
+                }),
+            },
+            request_id,
+        )
+    }
+
+    pub fn new_data_request(ip_packets: bytes::Bytes) -> Self {
+        Self {
+            version: VERSION,
+            data: IpPacketRequestData::Data(DataRequest { ip_packets }),
+        }
+    }
+
+    pub fn new_ping(reply_to: Recipient) -> (Self, u64) {
+        let request_id = generate_random();
+        (
+            Self {
+                version: VERSION,
+                data: IpPacketRequestData::Ping(PingRequest {
+                    request_id,
+                    reply_to,
+                    timestamp: OffsetDateTime::now_utc(),
+                }),
+            },
+            request_id,
+        )
+    }
+
+    pub fn new_health_request(reply_to: Recipient) -> (Self, u64) {
+        let request_id = generate_random();
+        (
+            Self {
+                version: VERSION,
+                data: IpPacketRequestData::Health(HealthRequest {
+                    request_id,
+                    reply_to,
+                    timestamp: OffsetDateTime::now_utc(),
+                }),
+            },
+            request_id,
+        )
+    }
+
+    pub fn id(&self) -> Option<u64> {
+        match &self.data {
+            IpPacketRequestData::StaticConnect(request) => Some(request.request.request_id),
+            IpPacketRequestData::DynamicConnect(request) => Some(request.request.request_id),
+            IpPacketRequestData::Disconnect(request) => Some(request.request.request_id),
+            IpPacketRequestData::Data(_) => None,
+            IpPacketRequestData::Ping(request) => Some(request.request_id),
+            IpPacketRequestData::Health(request) => Some(request.request_id),
+        }
+    }
+
+    pub fn recipient(&self) -> Option<&Recipient> {
+        match &self.data {
+            IpPacketRequestData::StaticConnect(request) => Some(&request.request.reply_to),
+            IpPacketRequestData::DynamicConnect(request) => Some(&request.request.reply_to),
+            IpPacketRequestData::Disconnect(request) => Some(&request.request.reply_to),
+            IpPacketRequestData::Data(_) => None,
+            IpPacketRequestData::Ping(request) => Some(&request.reply_to),
+            IpPacketRequestData::Health(request) => Some(&request.reply_to),
+        }
+    }
+
+    pub fn to_bytes(&self) -> Result<Vec<u8>, bincode::Error> {
+        use bincode::Options;
+        make_bincode_serializer().serialize(self)
+    }
+
+    pub fn from_reconstructed_message(
+        message: &nym_sphinx::receiver::ReconstructedMessage,
+    ) -> Result<Self, bincode::Error> {
+        use bincode::Options;
+        make_bincode_serializer().deserialize(&message.message)
+    }
+}
+
+#[allow(clippy::large_enum_variant)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
+pub enum IpPacketRequestData {
+    StaticConnect(SignedStaticConnectRequest),
+    DynamicConnect(SignedDynamicConnectRequest),
+    Disconnect(SignedDisconnectRequest),
+    Data(DataRequest),
+    Ping(PingRequest),
+    Health(HealthRequest),
+}
+
+impl IpPacketRequestData {
+    pub fn add_signature(&mut self, signature: identity::Signature) -> Option<identity::Signature> {
+        match self {
+            IpPacketRequestData::StaticConnect(request) => {
+                request.signature = Some(signature);
+                request.signature
+            }
+            IpPacketRequestData::DynamicConnect(request) => {
+                request.signature = Some(signature);
+                request.signature
+            }
+            IpPacketRequestData::Disconnect(request) => {
+                request.signature = Some(signature);
+                request.signature
+            }
+            IpPacketRequestData::Data(_)
+            | IpPacketRequestData::Ping(_)
+            | IpPacketRequestData::Health(_) => None,
+        }
+    }
+}
+
+// A static connect request is when the client provides the internal IP address it will use on the
+// ip packet router.
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
+pub struct StaticConnectRequest {
+    pub request_id: u64,
+
+    pub ips: IpPair,
+
+    // The nym-address the response should be sent back to
+    pub reply_to: Recipient,
+
+    // The number of mix node hops that responses should take, in addition to the entry and exit
+    // node. Zero means only client -> entry -> exit -> client.
+    pub reply_to_hops: Option<u8>,
+
+    // The average delay at each mix node, in milliseconds. Currently this is not supported by the
+    // ip packet router.
+    pub reply_to_avg_mix_delays: Option<f64>,
+
+    // The maximum time in milliseconds the IPR should wait when filling up a mix packet
+    // with ip packets.
+    pub buffer_timeout: Option<u64>,
+
+    // Timestamp of when the request was sent by the client.
+    pub timestamp: OffsetDateTime,
+}
+
+impl StaticConnectRequest {
+    pub fn to_bytes(&self) -> Result<Vec<u8>, bincode::Error> {
+        use bincode::Options;
+        make_bincode_serializer().serialize(self)
+    }
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
+pub struct SignedStaticConnectRequest {
+    pub request: StaticConnectRequest,
+    pub signature: Option<identity::Signature>,
+}
+
+impl SignedRequest for SignedStaticConnectRequest {
+    fn identity(&self) -> &identity::PublicKey {
+        self.request.reply_to.identity()
+    }
+
+    fn request(&self) -> Result<Vec<u8>, SignatureError> {
+        self.request
+            .to_bytes()
+            .map_err(|error| SignatureError::RequestSerializationError {
+                message: "failed to serialize request to binary".to_string(),
+                error,
+            })
+    }
+
+    fn signature(&self) -> Option<&identity::Signature> {
+        self.signature.as_ref()
+    }
+
+    fn timestamp(&self) -> OffsetDateTime {
+        self.request.timestamp
+    }
+}
+
+// A dynamic connect request is when the client does not provide the internal IP address it will use
+// on the ip packet router, and instead requests one to be assigned to it.
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
+pub struct DynamicConnectRequest {
+    pub request_id: u64,
+
+    // The nym-address the response should be sent back to
+    pub reply_to: Recipient,
+
+    // The number of mix node hops that responses should take, in addition to the entry and exit
+    // node. Zero means only client -> entry -> exit -> client.
+    pub reply_to_hops: Option<u8>,
+
+    // The average delay at each mix node, in milliseconds. Currently this is not supported by the
+    // ip packet router.
+    pub reply_to_avg_mix_delays: Option<f64>,
+
+    // The maximum time in milliseconds the IPR should wait when filling up a mix packet
+    // with ip packets.
+    pub buffer_timeout: Option<u64>,
+
+    // Timestamp of when the request was sent by the client.
+    pub timestamp: OffsetDateTime,
+}
+
+impl DynamicConnectRequest {
+    pub fn to_bytes(&self) -> Result<Vec<u8>, bincode::Error> {
+        use bincode::Options;
+        make_bincode_serializer().serialize(self)
+    }
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
+pub struct SignedDynamicConnectRequest {
+    pub request: DynamicConnectRequest,
+    pub signature: Option<identity::Signature>,
+}
+
+impl SignedRequest for SignedDynamicConnectRequest {
+    fn identity(&self) -> &identity::PublicKey {
+        self.request.reply_to.identity()
+    }
+
+    fn request(&self) -> Result<Vec<u8>, SignatureError> {
+        self.request
+            .to_bytes()
+            .map_err(|error| SignatureError::RequestSerializationError {
+                message: "failed to serialize request to binary".to_string(),
+                error,
+            })
+    }
+
+    fn signature(&self) -> Option<&identity::Signature> {
+        self.signature.as_ref()
+    }
+
+    fn timestamp(&self) -> OffsetDateTime {
+        self.request.timestamp
+    }
+}
+
+// A disconnect request is when the client wants to disconnect from the ip packet router and free
+// up the allocated IP address.
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
+pub struct DisconnectRequest {
+    pub request_id: u64,
+
+    // The nym-address the response should be sent back to
+    pub reply_to: Recipient,
+
+    // Timestamp of when the request was sent by the client.
+    pub timestamp: OffsetDateTime,
+}
+
+impl DisconnectRequest {
+    pub fn to_bytes(&self) -> Result<Vec<u8>, bincode::Error> {
+        use bincode::Options;
+        make_bincode_serializer().serialize(self)
+    }
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
+pub struct SignedDisconnectRequest {
+    pub request: DisconnectRequest,
+    pub signature: Option<identity::Signature>,
+}
+
+impl SignedRequest for SignedDisconnectRequest {
+    fn identity(&self) -> &identity::PublicKey {
+        self.request.reply_to.identity()
+    }
+
+    fn request(&self) -> Result<Vec<u8>, SignatureError> {
+        self.request
+            .to_bytes()
+            .map_err(|error| SignatureError::RequestSerializationError {
+                message: "failed to serialize request to binary".to_string(),
+                error,
+            })
+    }
+
+    fn signature(&self) -> Option<&identity::Signature> {
+        self.signature.as_ref()
+    }
+
+    fn timestamp(&self) -> OffsetDateTime {
+        self.request.timestamp
+    }
+}
+
+// A data request is when the client wants to send an IP packet to a destination.
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
+pub struct DataRequest {
+    pub ip_packets: bytes::Bytes,
+}
+
+// A ping request is when the client wants to check if the ip packet router is still alive.
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
+pub struct PingRequest {
+    pub request_id: u64,
+
+    // The nym-address the response should be sent back to
+    pub reply_to: Recipient,
+
+    // Timestamp of when the request was sent by the client.
+    pub timestamp: OffsetDateTime,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
+pub struct HealthRequest {
+    pub request_id: u64,
+
+    // The nym-address the response should be sent back to
+    pub reply_to: Recipient,
+
+    // Timestamp of when the request was sent by the client.
+    pub timestamp: OffsetDateTime,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::net::{Ipv4Addr, Ipv6Addr};
+    use std::str::FromStr;
+
+    #[test]
+    fn check_size_of_request() {
+        let connect = IpPacketRequest {
+            version: 4,
+            data: IpPacketRequestData::StaticConnect(
+                SignedStaticConnectRequest {
+                    request: StaticConnectRequest {
+                        request_id: 123,
+                        ips: IpPair::new(Ipv4Addr::from_str("10.0.0.1").unwrap(), Ipv6Addr::from_str("2001:db8:a160::1").unwrap()),
+                        reply_to: Recipient::try_from_base58_string("D1rrpsysCGCYXy9saP8y3kmNpGtJZUXN9SvFoUcqAsM9.9Ssso1ea5NfkbMASdiseDSjTN1fSWda5SgEVjdSN4CvV@GJqd3ZxpXWSNxTfx7B1pPtswpetH4LnJdFeLeuY5KUuN").unwrap(),
+                        reply_to_hops: None,
+                        reply_to_avg_mix_delays: None,
+                        buffer_timeout: None,
+                        timestamp: OffsetDateTime::now_utc(),
+                    },
+                    signature: None,
+                }
+            ),
+        };
+        assert_eq!(connect.to_bytes().unwrap().len(), 139);
+    }
+
+    #[test]
+    fn check_size_of_data() {
+        let data = IpPacketRequest {
+            version: 4,
+            data: IpPacketRequestData::Data(DataRequest {
+                ip_packets: bytes::Bytes::from(vec![1u8; 32]),
+            }),
+        };
+        assert_eq!(data.to_bytes().unwrap().len(), 35);
+    }
+
+    #[test]
+    fn serialize_and_deserialize_data_request() {
+        let data = IpPacketRequest {
+            version: 4,
+            data: IpPacketRequestData::Data(DataRequest {
+                ip_packets: bytes::Bytes::from(vec![1, 2, 4, 2, 5]),
+            }),
+        };
+
+        let serialized = data.to_bytes().unwrap();
+        let deserialized = IpPacketRequest::from_reconstructed_message(
+            &nym_sphinx::receiver::ReconstructedMessage {
+                message: serialized,
+                sender_tag: None,
+            },
+        )
+        .unwrap();
+
+        assert_eq!(deserialized.version, 4);
+        assert_eq!(
+            deserialized.data,
+            IpPacketRequestData::Data(DataRequest {
+                ip_packets: bytes::Bytes::from(vec![1, 2, 4, 2, 5]),
+            })
+        );
+    }
+}
@@ -0,0 +1,414 @@
+use nym_sphinx::addressing::clients::Recipient;
+use serde::{Deserialize, Serialize};
+
+use crate::{make_bincode_serializer, IpPair};
+
+use super::VERSION;
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct IpPacketResponse {
+    pub version: u8,
+    pub data: IpPacketResponseData,
+}
+
+impl IpPacketResponse {
+    pub fn new_static_connect_success(request_id: u64, reply_to: Recipient) -> Self {
+        Self {
+            version: VERSION,
+            data: IpPacketResponseData::StaticConnect(StaticConnectResponse {
+                request_id,
+                reply_to,
+                reply: StaticConnectResponseReply::Success,
+            }),
+        }
+    }
+
+    pub fn new_static_connect_failure(
+        request_id: u64,
+        reply_to: Recipient,
+        reason: StaticConnectFailureReason,
+    ) -> Self {
+        Self {
+            version: VERSION,
+            data: IpPacketResponseData::StaticConnect(StaticConnectResponse {
+                request_id,
+                reply_to,
+                reply: StaticConnectResponseReply::Failure(reason),
+            }),
+        }
+    }
+
+    pub fn new_dynamic_connect_success(request_id: u64, reply_to: Recipient, ips: IpPair) -> Self {
+        Self {
+            version: VERSION,
+            data: IpPacketResponseData::DynamicConnect(DynamicConnectResponse {
+                request_id,
+                reply_to,
+                reply: DynamicConnectResponseReply::Success(DynamicConnectSuccess { ips }),
+            }),
+        }
+    }
+
+    pub fn new_dynamic_connect_failure(
+        request_id: u64,
+        reply_to: Recipient,
+        reason: DynamicConnectFailureReason,
+    ) -> Self {
+        Self {
+            version: VERSION,
+            data: IpPacketResponseData::DynamicConnect(DynamicConnectResponse {
+                request_id,
+                reply_to,
+                reply: DynamicConnectResponseReply::Failure(reason),
+            }),
+        }
+    }
+
+    pub fn new_disconnect_success(request_id: u64, reply_to: Recipient) -> Self {
+        Self {
+            version: VERSION,
+            data: IpPacketResponseData::Disconnect(DisconnectResponse {
+                request_id,
+                reply_to,
+                reply: DisconnectResponseReply::Success,
+            }),
+        }
+    }
+
+    pub fn new_disconnect_failure(
+        request_id: u64,
+        reply_to: Recipient,
+        reason: DisconnectFailureReason,
+    ) -> Self {
+        Self {
+            version: VERSION,
+            data: IpPacketResponseData::Disconnect(DisconnectResponse {
+                request_id,
+                reply_to,
+                reply: DisconnectResponseReply::Failure(reason),
+            }),
+        }
+    }
+
+    pub fn new_unrequested_disconnect(
+        reply_to: Recipient,
+        reason: UnrequestedDisconnectReason,
+    ) -> Self {
+        Self {
+            version: VERSION,
+            data: IpPacketResponseData::UnrequestedDisconnect(UnrequestedDisconnect {
+                reply_to,
+                reason,
+            }),
+        }
+    }
+
+    pub fn new_ip_packet(ip_packet: bytes::Bytes) -> Self {
+        Self {
+            version: VERSION,
+            data: IpPacketResponseData::Data(DataResponse { ip_packet }),
+        }
+    }
+
+    pub fn new_version_mismatch(
+        request_id: u64,
+        reply_to: Recipient,
+        request_version: u8,
+        our_version: u8,
+    ) -> Self {
+        Self {
+            version: VERSION,
+            data: IpPacketResponseData::Info(InfoResponse {
+                request_id,
+                reply_to,
+                reply: InfoResponseReply::VersionMismatch {
+                    request_version,
+                    response_version: our_version,
+                },
+                level: InfoLevel::Error,
+            }),
+        }
+    }
+
+    pub fn new_data_info_response(
+        reply_to: Recipient,
+        reply: InfoResponseReply,
+        level: InfoLevel,
+    ) -> Self {
+        Self {
+            version: VERSION,
+            data: IpPacketResponseData::Info(InfoResponse {
+                request_id: 0,
+                reply_to,
+                reply,
+                level,
+            }),
+        }
+    }
+
+    pub fn new_pong(request_id: u64, reply_to: Recipient) -> Self {
+        Self {
+            version: VERSION,
+            data: IpPacketResponseData::Pong(PongResponse {
+                request_id,
+                reply_to,
+            }),
+        }
+    }
+
+    pub fn new_health_response(
+        request_id: u64,
+        reply_to: Recipient,
+        build_info: nym_bin_common::build_information::BinaryBuildInformationOwned,
+        routable: Option<bool>,
+    ) -> Self {
+        Self {
+            version: VERSION,
+            data: IpPacketResponseData::Health(HealthResponse {
+                request_id,
+                reply_to,
+                reply: HealthResponseReply {
+                    build_info,
+                    routable,
+                },
+            }),
+        }
+    }
+
+    pub fn id(&self) -> Option<u64> {
+        match &self.data {
+            IpPacketResponseData::StaticConnect(response) => Some(response.request_id),
+            IpPacketResponseData::DynamicConnect(response) => Some(response.request_id),
+            IpPacketResponseData::Disconnect(response) => Some(response.request_id),
+            IpPacketResponseData::UnrequestedDisconnect(_) => None,
+            IpPacketResponseData::Data(_) => None,
+            IpPacketResponseData::Pong(response) => Some(response.request_id),
+            IpPacketResponseData::Health(response) => Some(response.request_id),
+            IpPacketResponseData::Info(response) => Some(response.request_id),
+        }
+    }
+
+    pub fn recipient(&self) -> Option<&Recipient> {
+        match &self.data {
+            IpPacketResponseData::StaticConnect(response) => Some(&response.reply_to),
+            IpPacketResponseData::DynamicConnect(response) => Some(&response.reply_to),
+            IpPacketResponseData::Disconnect(response) => Some(&response.reply_to),
+            IpPacketResponseData::UnrequestedDisconnect(response) => Some(&response.reply_to),
+            IpPacketResponseData::Data(_) => None,
+            IpPacketResponseData::Pong(response) => Some(&response.reply_to),
+            IpPacketResponseData::Health(response) => Some(&response.reply_to),
+            IpPacketResponseData::Info(response) => Some(&response.reply_to),
+        }
+    }
+
+    pub fn to_bytes(&self) -> Result<Vec<u8>, bincode::Error> {
+        use bincode::Options;
+        make_bincode_serializer().serialize(self)
+    }
+
+    pub fn from_reconstructed_message(
+        message: &nym_sphinx::receiver::ReconstructedMessage,
+    ) -> Result<Self, bincode::Error> {
+        use bincode::Options;
+        make_bincode_serializer().deserialize(&message.message)
+    }
+}
+
+#[allow(clippy::large_enum_variant)]
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub enum IpPacketResponseData {
+    // Response for a static connect request
+    StaticConnect(StaticConnectResponse),
+
+    // Response for a dynamic connect request
+    DynamicConnect(DynamicConnectResponse),
+
+    // Response for a disconnect initiqated by the client
+    Disconnect(DisconnectResponse),
+
+    // Message from the server that the client got disconnected without the client initiating it
+    UnrequestedDisconnect(UnrequestedDisconnect),
+
+    // Response to a data request
+    Data(DataResponse),
+
+    // Response to ping request
+    Pong(PongResponse),
+
+    // Response for a health request
+    Health(HealthResponse),
+
+    // Info response. This can be anything from informative messages to errors
+    Info(InfoResponse),
+}
+
+impl IpPacketResponseData {
+    pub fn to_bytes(&self) -> Result<Vec<u8>, bincode::Error> {
+        use bincode::Options;
+        make_bincode_serializer().serialize(self)
+    }
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct StaticConnectResponse {
+    pub request_id: u64,
+    pub reply_to: Recipient,
+    pub reply: StaticConnectResponseReply,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub enum StaticConnectResponseReply {
+    Success,
+    Failure(StaticConnectFailureReason),
+}
+
+impl StaticConnectResponseReply {
+    pub fn is_success(&self) -> bool {
+        match self {
+            StaticConnectResponseReply::Success => true,
+            StaticConnectResponseReply::Failure(_) => false,
+        }
+    }
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize, thiserror::Error)]
+pub enum StaticConnectFailureReason {
+    #[error("requested ip address is already in use")]
+    RequestedIpAlreadyInUse,
+    #[error("requested nym-address is already in use")]
+    RequestedNymAddressAlreadyInUse,
+    #[error("request timestamp is out of date")]
+    OutOfDateTimestamp,
+    #[error("{0}")]
+    Other(String),
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct DynamicConnectResponse {
+    pub request_id: u64,
+    pub reply_to: Recipient,
+    pub reply: DynamicConnectResponseReply,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub enum DynamicConnectResponseReply {
+    Success(DynamicConnectSuccess),
+    Failure(DynamicConnectFailureReason),
+}
+
+impl DynamicConnectResponseReply {
+    pub fn is_success(&self) -> bool {
+        match self {
+            DynamicConnectResponseReply::Success(_) => true,
+            DynamicConnectResponseReply::Failure(_) => false,
+        }
+    }
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct DynamicConnectSuccess {
+    pub ips: IpPair,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize, thiserror::Error)]
+pub enum DynamicConnectFailureReason {
+    #[error("requested nym-address is already in use")]
+    RequestedNymAddressAlreadyInUse,
+    #[error("no available ip address")]
+    NoAvailableIp,
+    #[error("{0}")]
+    Other(String),
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct DisconnectResponse {
+    pub request_id: u64,
+    pub reply_to: Recipient,
+    pub reply: DisconnectResponseReply,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub enum DisconnectResponseReply {
+    Success,
+    Failure(DisconnectFailureReason),
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize, thiserror::Error)]
+pub enum DisconnectFailureReason {
+    #[error("requested nym-address is not currently connected")]
+    RequestedNymAddressNotConnected,
+    #[error("{0}")]
+    Other(String),
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct UnrequestedDisconnect {
+    pub reply_to: Recipient,
+    pub reason: UnrequestedDisconnectReason,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize, thiserror::Error)]
+pub enum UnrequestedDisconnectReason {
+    #[error("client mixnet traffic timeout")]
+    ClientMixnetTrafficTimeout,
+    #[error("client tun traffic timeout")]
+    ClientTunTrafficTimeout,
+    #[error("{0}")]
+    Other(String),
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct DataResponse {
+    pub ip_packet: bytes::Bytes,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct PongResponse {
+    pub request_id: u64,
+    pub reply_to: Recipient,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct HealthResponse {
+    pub request_id: u64,
+    pub reply_to: Recipient,
+    pub reply: HealthResponseReply,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct HealthResponseReply {
+    // Return the binary build information of the IPR
+    pub build_info: nym_bin_common::build_information::BinaryBuildInformationOwned,
+    // Return if the IPR has performed a successful routing test.
+    pub routable: Option<bool>,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct InfoResponse {
+    pub request_id: u64,
+    pub reply_to: Recipient,
+    pub reply: InfoResponseReply,
+    pub level: InfoLevel,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize, thiserror::Error)]
+pub enum InfoResponseReply {
+    #[error("{msg}")]
+    Generic { msg: String },
+    #[error(
+        "version mismatch: response is v{request_version} and response is v{response_version}"
+    )]
+    VersionMismatch {
+        request_version: u8,
+        response_version: u8,
+    },
+    #[error("destination failed exit policy filter check: {dst}")]
+    ExitPolicyFilterCheckFailed { dst: String },
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub enum InfoLevel {
+    Info,
+    Warn,
+    Error,
+}
@@ -0,0 +1,57 @@
+use std::time::Duration;
+
+use nym_crypto::asymmetric::identity;
+
+// For reply protection, if a request is older than this, it will be rejected
+const MAX_REQUEST_AGE: Duration = Duration::from_secs(10);
+
+#[derive(thiserror::Error, Debug)]
+pub enum SignatureError {
+    #[error("signature is missing")]
+    MissingSignature,
+
+    #[error("failed to serialize request to binary: {message}")]
+    RequestSerializationError {
+        message: String,
+        error: Box<bincode::ErrorKind>,
+    },
+
+    #[error("signature verification failed: request out of date")]
+    RequestOutOfDate,
+
+    #[error("signature verification failed")]
+    VerificationFailed {
+        message: String,
+        error: identity::SignatureError,
+    },
+}
+
+pub trait SignedRequest {
+    fn identity(&self) -> &identity::PublicKey;
+
+    fn request(&self) -> Result<Vec<u8>, SignatureError>;
+
+    fn signature(&self) -> Option<&identity::Signature>;
+
+    fn timestamp(&self) -> time::OffsetDateTime;
+
+    fn verify(&self) -> Result<(), SignatureError> {
+        if let Some(signature) = self.signature() {
+            // First check that the request is recent enough
+            if time::OffsetDateTime::now_utc() - self.timestamp() > MAX_REQUEST_AGE {
+                return Err(SignatureError::RequestOutOfDate);
+            }
+
+            let request_as_bytes = self.request()?;
+
+            self.identity()
+                .verify(request_as_bytes, signature)
+                .map_err(|error| SignatureError::VerificationFailed {
+                    message: "signature verification failed".to_string(),
+                    error,
+                })
+        } else {
+            Err(SignatureError::MissingSignature)
+        }
+    }
+}
@@ -7,8 +7,8 @@ license.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-bip32 = "0.5.1"
+bip32 = { workspace = true }
 k256 = { workspace = true }
-ledger-transport = "0.10.0"
-ledger-transport-hid = "0.10.0"
+ledger-transport = { workspace = true }
+ledger-transport-hid = { workspace = true }
 thiserror = { workspace = true }
@@ -8,7 +8,7 @@ license.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-bytes = "1.0"
+bytes = { workspace = true }
 futures = { workspace = true }
 humantime-serde = { workspace = true }
 log = { workspace = true }
@@ -38,4 +38,4 @@ nym-task = { path = "../task" }
 nym-validator-client = { path = "../client-libs/validator-client" }
 nym-bin-common = { path = "../bin-common" }
 nym-metrics = { path = "../nym-metrics" }
-nym-node-http-api = { path = "../../nym-node/nym-node-http-api" } 
+nym-node-http-api = { path = "../../nym-node/nym-node-http-api" } 
@@ -10,7 +10,7 @@ repository.workspace = true
 [dependencies]
 cfg-if = { workspace = true }
 dotenvy = { workspace = true }
-hex-literal = "0.3.3"
+hex-literal = { workspace = true }
 log = { workspace = true }
 once_cell = { workspace = true }
 schemars = { workspace = true, features = ["preserve_order"] }
@@ -18,9 +18,12 @@ pub const VESTING_CONTRACT_ADDRESS: &str =
    "n1nc5tatafv6eyq7llkr2gv50ff9e22mnf70qgjlv737ktmt4eswrq73f2nw";

 pub const COCONUT_BANDWIDTH_CONTRACT_ADDRESS: &str = "";
-pub const GROUP_CONTRACT_ADDRESS: &str = "";
-pub const MULTISIG_CONTRACT_ADDRESS: &str = "";
-pub const COCONUT_DKG_CONTRACT_ADDRESS: &str = "";
+pub const GROUP_CONTRACT_ADDRESS: &str =
+    "n1e2zq4886zzewpvpucmlw8v9p7zv692f6yck4zjzxh699dkcmlrfqk2knsr";
+pub const MULTISIG_CONTRACT_ADDRESS: &str =
+    "n1txayqfz5g9qww3rlflpg025xd26m9payz96u54x4fe3s2ktz39xqk67gzx";
+pub const COCONUT_DKG_CONTRACT_ADDRESS: &str =
+    "n19604yflqggs9mk2z26mqygq43q2kr3n932egxx630svywd5mpxjsztfpvx";
 pub const EPHEMERA_CONTRACT_ADDRESS: &str = "";

 pub const REWARDING_VALIDATOR_ADDRESS: &str = "n10yyd98e2tuwu0f7ypz9dy3hhjw7v772q6287gy";
@@ -8,7 +8,7 @@ license.workspace = true

 [dependencies]
 futures = { workspace = true }
-rand = "0.7.3"
+rand = { workspace = true }

 serde = { workspace = true }
 serde_json = { workspace = true }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Tommy Verrall	b6617eb34c	Update PULL_REQUEST_TEMPLATE.md	2024-06-11 12:11:52 +02:00
Jon Häggblad	f43a2a1e42	Merge pull request #4603 from nymtech/jon/purge-name-service-and-sp-dir-contracts Purge name service and service provider directory contracts	2024-06-11 11:50:13 +02:00
Jon Häggblad	4666e91820	Merge pull request #4620 from nymtech/jon/ipr-read-both-v6-and-v7 Handle v6 and v7 requests in the IPR, but reply with v6	2024-06-11 11:48:00 +02:00
Tommy Verrall	7d0a25d570	Merge pull request #4619 from stefanopier/develop fix typo	2024-06-11 11:06:27 +02:00
Bogdan-Ștefan Neacşu	bb46235b54	Add generic wg private network routing (#4636 )	2024-06-10 16:55:05 +03:00
Bogdan-Ștefan Neacşu	70fa41c165	Update kernel peers on peer modification (#4622 ) * Include wireguard in gw config * Support nym node first * Create wg keypair * Activate wg feature in gw dep * Move key paths to separate structure * Use client reg * Generate and use own private key * Rename network to ip for wg gw * Propagate wireguard setup error message * Remove logs * Bump gateway version number * Remove upgrade code * Init wireguard on migration * Upgrade code for nym-node too * Wireguard paths upgrade * Init wg keys on upgrade * Simplify pub key translatations * Fix clippy * Undo comment change * Fix tests * Don't bump version just yet * Remove redundant source attr * Remove unused wg details * Rename wg device * Init for mixnode migration as well * Add upgrade for gw wireguard deleted field * Move interface removal to Drop trait impl * Fix clippy * Wgapi could be included on other platforms * Handle peer control msgs * Send add peer msg * Handle double registration * Fix deadlock * Fix clippy * More clippy * Use same defguard * Fix unit test * Fix wasm build * Move implementations from types to wireguard crate * Fix linux	2024-06-07 14:02:47 +03:00
Jon Häggblad	065d416305	Update lock files after merging in develop	2024-06-07 12:46:46 +02:00
Jon Häggblad	3e93d2a250	Merge remote-tracking branch 'origin/develop' into jon/purge-name-service-and-sp-dir-contracts	2024-06-07 12:41:46 +02:00
Jon Häggblad	8bc85191d5	Replace Vec<u8> signature with strong type	2024-06-07 12:33:07 +02:00
Jędrzej Stuczyński	102a8a0d8b	Merge pull request #4607 from nymtech/simon/sphinx_update Update crypto and rand crates	2024-06-05 10:34:42 +01:00
Tommy Verrall	ae28a45915	Merge pull request #4618 from vitorsantanna2/patch-1 Update isp-sheet.csv	2024-06-05 11:09:11 +02:00
import this	cffb8d98af	[DOCs/operators]: fix wireguard syntax (#4628 ) * fix wireguard syntax * simplify syntax * clean	2024-06-03 14:16:30 +00:00
import this	a40c2239d7	[DOCs/operators]: Routine update && Fix a probe syntax (#4627 ) * update probe and simplify nym gw flow * add gw troubleshooting	2024-06-03 07:45:27 +00:00
Jon Häggblad	5a990a58ff	Extend the return error when connecting to gateway fails (#4626 )	2024-05-31 19:18:31 +02:00
Simon Wicky	2a1d37dd22	update crypto and rand crates	2024-05-31 11:33:16 +01:00
Bogdan-Ștefan Neacşu	be79042a23	Bump defguard wg (#4625 )	2024-05-30 16:00:51 +02:00
Jon Häggblad	7019dcc11f	Clean up parsing request	2024-05-28 22:26:13 +02:00
Jon Häggblad	bab842d277	Move comment	2024-05-28 19:35:23 +02:00
Jon Häggblad	a374bca601	Check timestamp	2024-05-28 15:10:45 +02:00
Jon Häggblad	d4d3041816	Verify signature if present	2024-05-28 12:22:39 +02:00
Bogdan-Ștefan Neacşu	3acf521fc1	Refine wireguard on gateway side (#4615 ) * Include wireguard in gw config * Support nym node first * Create wg keypair * Activate wg feature in gw dep * Move key paths to separate structure * Use client reg * Generate and use own private key * Rename network to ip for wg gw * Propagate wireguard setup error message * Remove logs * Bump gateway version number * Remove upgrade code * Init wireguard on migration * Upgrade code for nym-node too * Wireguard paths upgrade * Init wg keys on upgrade * Simplify pub key translatations * Fix clippy * Undo comment change * Fix tests * Don't bump version just yet * Remove redundant source attr * Remove unused wg details * Rename wg device * Init for mixnode migration as well * Add upgrade for gw wireguard deleted field * Move interface removal to Drop trait impl * Fix clippy * Wgapi could be included on other platforms	2024-05-28 11:52:14 +02:00
Jon Häggblad	70766b6d3e	Handle v6 and v7 requests in the IPR, but reply with v6	2024-05-28 09:00:08 +02:00
Stefano Piermatteo	437c66ad0b	fix typo	2024-05-24 20:18:06 +02:00
Vitor Santanna	1afcfb0842	Update isp-sheet.csv Add Misaka and IsHosting VPS	2024-05-24 12:55:10 -03:00
benedetta davico	759e2fa2c5	Merge pull request #4617 from nymtech/master Merge Master into Develop with the recent Ragusa changes	2024-05-24 14:06:57 +02:00
Tommy Verrall	489914fb42	Merge pull request #4608 from nymtech/release/2024.5-ragusa Release 2024.5-ragusa into master - DO NO MERGE	2024-05-24 12:35:01 +01:00
import this	bca8992115	[DOCs/operators]: 2024.5-ragusa updates (#4609 ) * initialise changelog updates * fix formatting * finalise changelog * change formating - PR ready for review * review comments resolved	2024-05-23 16:49:17 +00:00
mx	f94d900d18	update mixfetch docs (#4614 ) * * added info on gateway habourmaster * fixed broken examples with new infra addresses * bump node version in ts sdk docs ci script --------- Co-authored-by: mfahampshire <mfahampshire@pm.me>	2024-05-23 15:15:51 +00:00
Tommy Verrall	dab55a12c7	update changelog	2024-05-23 16:26:09 +02:00
Tommy Verrall	82f722936f	Merge branch 'release/2024.5-ragusa' of https://github.com/nymtech/nym into release/2024.5-ragusa	2024-05-23 16:09:07 +02:00
benedettadavico	7f08020d4f	update changelog and bump versions	2024-05-23 16:08:37 +02:00
Tommy Verrall	579e41d57e	Merge pull request #4613 from nymtech/bugfix/last_polled-backwards-compat make sure 'OffsetDateTimeJsonSchemaWrapper' is serialised with legacy format	2024-05-23 15:00:38 +01:00
Jędrzej Stuczyński	06953298eb	ibid for nym-connect	2024-05-23 12:10:41 +01:00
Jędrzej Stuczyński	1d78f8747f	update wallet 'time' dep due to broken semver	2024-05-23 10:21:08 +01:00
Tommy Verrall	a6e9414cb8	Update ci-contracts-upload-binaries.yml use version 1.77 so it's compatible with ecash	2024-05-23 11:03:40 +02:00
Jędrzej Stuczyński	23d7230d33	make sure 'OffsetDateTimeJsonSchemaWrapper' is serialised with legacy format	2024-05-23 10:01:46 +01:00
benedettadavico	496f172070	update changelog and bump versions	2024-05-22 10:28:38 +02:00
Tommy Verrall	76953df4bb	Merge pull request #4605 from nymtech/feature/nym-node-api-location Feature/nym node api location	2024-05-21 17:28:53 +01:00
Tommy Verrall	ce2449f86a	Merge pull request #4599 from nymtech/feature/expose-all-api-reports nym-api: make report/avg_uptime endpoints ignore blacklist	2024-05-21 17:28:07 +01:00
Jędrzej Stuczyński	598014bf30	fixed deserialisation of 'AuxiliaryDetails' api response	2024-05-21 17:06:15 +01:00
Jędrzej Stuczyński	73fe7618db	removing needless clones	2024-05-21 17:06:15 +01:00
Jędrzej Stuczyński	7a416f8cf5	aggregate new data with nym-api	2024-05-21 17:06:14 +01:00
Jędrzej Stuczyński	3077c2ea8d	create '/api/v1/auxiliary-details' that exposes nodes location	2024-05-21 17:06:13 +01:00
Tommy Verrall	be6c63723c	Merge pull request #4553 from nymtech/jon/autoinherit Run cargo autoinherit on the main workspace	2024-05-21 16:33:38 +01:00
Jon Häggblad	c5a3cb7707	Update to handle changes in develop	2024-05-21 17:15:38 +02:00
Jon Häggblad	cce9f0b183	Merge remote-tracking branch 'origin/develop' into jon/autoinherit	2024-05-21 17:10:02 +02:00
Tommy Verrall	84b74703b2	Merge pull request #4604 from nymtech/jon/ipr-request-sign Add optional signature to IPR request/response	2024-05-21 15:01:43 +01:00
Tommy Verrall	9bf3600e5b	Merge pull request #4601 from nymtech/feature/unstable-tested-nodes-endpoint Feature/unstable tested nodes endpoint	2024-05-21 14:51:46 +01:00
Jędrzej Stuczyński	9f20c8ed1f	Merge pull request #4598 from nymtech/feature/remove-coconut-wait-buffer removed blocking for coconut in the final epoch state	2024-05-21 10:19:38 +01:00
Jędrzej Stuczyński	84e66c34f2	Merge pull request #4584 from nymtech/feature/wasm-coconut Feature/wasm coconut	2024-05-21 10:08:40 +01:00
Jędrzej Stuczyński	e04df37988	Merge pull request #4595 from nymtech/feature/freepass-admin allow using explicit admin address for issuing freepasses	2024-05-21 10:07:44 +01:00
Jon Häggblad	b617729873	Remove from contract Makefile	2024-05-20 15:08:18 +02:00
import this	0eb6eb855b	[DOCs/operators]: Create a Nym ISP sheet, write gateway-probe guide & clean FnF docs (#4590 ) * initialise nym versin of good-bad isps by tor community * syntax edit * finalise csv2md * initialise isp-list page * add last update info * add python3 plugis to ci/cd runnners * remove argparse installation * python3 syntax edit * pip install attempt * pip install attempt * change python version in cmdrun command * fix python modules installation * correct command python version * workflows python env update * add probe guide, clean FnF pages * fix typos	2024-05-20 12:27:18 +00:00
Jon Häggblad	c91412f949	Restore exact same serde import for common contract crates	2024-05-20 13:45:18 +02:00
Jon Häggblad	0a89f31a29	Merge in new deps in the main list	2024-05-20 13:19:47 +02:00
Jon Häggblad	9badeac832	cargo autoinherit in root workspace	2024-05-20 13:16:25 +02:00
Jon Häggblad	b59c41d9cd	Fix test	2024-05-20 12:24:39 +02:00
Jon Häggblad	8f083ff91e	Add signatures to dynamic connect and disconect, and remove from response	2024-05-20 12:18:28 +02:00
Jon Häggblad	0f44836025	Move signature one layer down	2024-05-20 12:04:05 +02:00
Jon Häggblad	68ee2d747d	Add timestamps to requests	2024-05-20 11:53:00 +02:00
Jon Häggblad	e29c76678d	Add optional signature field to requests and responses	2024-05-20 10:58:10 +02:00
Jon Häggblad	a4005c7d81	Add v7 request/responses	2024-05-20 10:57:56 +02:00
Jędrzej Stuczyński	efe6d916e2	order results by timestamp desc	2024-05-20 09:29:09 +01:00
Jon Häggblad	a06ae48e2f	Add methods to MixnetClient to sign messages (#4602 )	2024-05-20 10:22:28 +02:00
Jon Häggblad	c5e1ea289c	nym-connect and nym-wallet lock files	2024-05-20 09:50:32 +02:00
Jon Häggblad	266c98a80e	Don't upload in ci workflow	2024-05-20 09:48:48 +02:00
Jon Häggblad	4540b3b41a	lock file for contracts	2024-05-20 09:43:07 +02:00
Jon Häggblad	a9beb13189	Remove references in Makefile	2024-05-20 09:42:23 +02:00
Jon Häggblad	ebc30ec248	Remove everywhere sp contract is used	2024-05-20 09:38:22 +02:00
Jon Häggblad	3cd9c6ad13	Remove nym-service-provider-directory-common	2024-05-20 09:27:40 +02:00
Jon Häggblad	b83d4e964b	Remove nym-service-provider-directory from workspace	2024-05-20 09:27:09 +02:00
Jon Häggblad	bceb59a832	Remove nym-service-provider-directory	2024-05-20 09:26:14 +02:00
Jon Häggblad	50a48603e3	Remove everywhere name-service contract is used	2024-05-20 09:25:10 +02:00
Jon Häggblad	1ae718c345	Purge nym-name-service-common	2024-05-20 09:13:17 +02:00
Jon Häggblad	12c4450527	Remove nym-name-service from workspace	2024-05-20 09:12:06 +02:00
Jon Häggblad	5bf34950ab	Delete nym-name-service contract	2024-05-20 09:11:25 +02:00
Jędrzej Stuczyński	910b6a1369	adding explicit 'unstable' path segment	2024-05-19 10:27:33 +01:00
Jędrzej Stuczyński	7818658ee8	flatten the response	2024-05-17 18:36:50 +01:00
Jędrzej Stuczyński	89e34b4fd3	queries for detailed node statuses with broken pagination	2024-05-17 17:02:29 +01:00
Jędrzej Stuczyński	2f5a00dbda	removed blocking for coconut in the final epoch state	2024-05-17 11:04:19 +01:00
Jędrzej Stuczyński	7f87d42f9a	nym-api: make report/avg_uptime endpoints ignore blacklist	2024-05-17 11:01:16 +01:00
Fouad	e5f41731ae	Explorer NextJS Rebuild (#4534 ) * bootstrap next app + add overview page * fix AssetList type * fix up nav stuff * Refactor Nav component and add network components pages * Refactor WorldMap component and update TelegramIcon, GitHubIcon, NymVpnIcon, DiscordIcon, and TwitterIcon components * add service providers page * mixnodes page * delegations page + use material react table for all tables * nodes map page * Refactor StyledLink component and remove unnecessary console.log statements * Refactor ESLint configuration, remove unused dependencies, and update component imports * update deps * Refactor imports and update dependencies * fix dark mode * build single mixnode page * build single gateway page * Refactor handleOnDelegate function to use useCallback in mixnodes page.tsx * Add defaults for constants --------- Co-authored-by: Mark Sinclair <mmsinclair@users.noreply.github.com>	2024-05-16 16:12:06 +01:00
Jędrzej Stuczyński	a6fda391ae	Feature/rewarder voucher issuance (#4548 ) * retrieve ed25519 identities of issuers * signature verification on issued credentials * wip * persisting information about verified deposits, any failures and foul plays * clippy	2024-05-16 10:15:24 +02:00
Tommy Verrall	1ded24dcfc	Merge pull request #4586 from nymtech/bugfix/nym-api-noop-nobanner [bugfix] noop flag for nym-api for nymvisor compatibility	2024-05-15 14:07:30 +01:00
Tommy Verrall	8c42640853	Merge pull request #4591 from nymtech/jon/described-offsettime-parsing Use rfc3339 for last_polled in described nym-api endpoint	2024-05-15 14:03:42 +01:00
Tommy Verrall	38aabc7983	Merge pull request #4593 from nymtech/feature/extend-max-freepass-validity change maximum validity of issuable freepass	2024-05-15 13:40:49 +01:00
Tommy Verrall	4324845d29	Merge pull request #4596 from nymtech/update-contract-addr update mainnet contract addresses	2024-05-15 10:07:08 +01:00
Jędrzej Stuczyński	93b12bccca	updated the lock file after the rebasing fixes	2024-05-14 17:47:43 +01:00
Jędrzej Stuczyński	89fb4ef03f	fixing more build issues	2024-05-14 17:45:17 +01:00
Jędrzej Stuczyński	b8ab187db0	fixed wrong version of gloo-net and removed reduntant imports	2024-05-14 17:45:17 +01:00
Jędrzej Stuczyński	a9790c1f66	removed duplicate 'set_panic_hook' symbol in the browser extension code	2024-05-14 17:45:17 +01:00
Jędrzej Stuczyński	b46634b8f7	fixed test import paths	2024-05-14 17:45:17 +01:00
Jędrzej Stuczyński	633e7ffb46	no idea what happened here	2024-05-14 17:45:16 +01:00
Jędrzej Stuczyński	dd2077bf12	updated the makefile	2024-05-14 17:45:16 +01:00
Jędrzej Stuczyński	0323ba2bb9	ability to obtain bandwidth voucher from wasm via vpn-api	2024-05-14 17:45:14 +01:00
Jędrzej Stuczyński	b9524a0f58	Chore/additional helpers (#4585 ) * exposed additional helpers * changes lost in rebasing	2024-05-14 18:33:56 +02:00
Sachin Kamath	e7cd417894	update mainnet contract addresses	2024-05-14 21:30:31 +05:30
Jędrzej Stuczyński	07cc47a0ff	allow using explicit admin address for issuing freepasses	2024-05-14 16:58:11 +01:00
benedetta davico	ca25db845a	Merge pull request #4573 from nymtech/feature/axum-upgrade upgraded axum and related deps to the most recent version	2024-05-14 17:38:15 +02:00
benedetta davico	64a0ce31a8	Merge branch 'develop' into feature/axum-upgrade	2024-05-14 17:21:44 +02:00
Jędrzej Stuczyński	a8fe8d9bfb	change maximum validity of issuable freepass	2024-05-14 14:35:53 +01:00
Jędrzej Stuczyński	c346f145d1	backwards compatibility to fallback to default in case of failures	2024-05-14 10:15:16 +01:00
Jon Häggblad	45dd6f2632	Fix typo for StorageError::ConstraintUnique (#4592 )	2024-05-13 17:48:58 +02:00
Jon Häggblad	22d28759ab	Explicitly use rfc3339 for last_polled	2024-05-13 15:55:32 +02:00
Jędrzej Stuczyński	890d0f7440	fixed incorrect dependency path for 'axum-extra'	2024-05-13 14:18:33 +01:00
Jędrzej Stuczyński	b342eb870e	removed explicit drops	2024-05-13 11:31:34 +01:00
Jędrzej Stuczyński	fc71e0cafd	fixed tests	2024-05-13 11:31:33 +01:00
Tommy Verrall	1ecb57fda0	Merge pull request #4588 from nymtech/jon/explicitly-handle-sqlite-constraint-violation Explicitly handle constraint unique violation when importing credential	2024-05-13 11:30:31 +01:00
Tommy Verrall	3c1ec82289	Merge pull request #4588 from nymtech/jon/explicitly-handle-sqlite-constraint-violation Explicitly handle constraint unique violation when importing credential	2024-05-13 09:57:42 +01:00
Tommy Verrall	089e403d87	Merge pull request #4589 from nymtech/master merge latest master to develop	2024-05-13 09:56:34 +01:00
Tommy Verrall	dd2b477cda	Merge pull request #4587 from nymtech/jon/lock-files Update stale lock files	2024-05-13 09:54:52 +01:00
benedetta davico	0902539332	Merge pull request #4583 from nymtech/release/2024.4-nutella Release 2024.4-nutella to master	2024-05-13 10:27:08 +02:00
Jon Häggblad	0783c532de	Explicitly handle constraint unique violation when importing credential	2024-05-13 10:19:01 +02:00
Jon Häggblad	8817ae7805	Update stale lock files	2024-05-13 08:57:49 +02:00
Jędrzej Stuczyński	6a900c3c42	fixed linter issue in nyxd-scraper	2024-05-10 15:05:37 +01:00
Jędrzej Stuczyński	0ba80c9a86	moved startup 'Starting nym api...' message from stdout to stderr	2024-05-10 11:16:10 +01:00
Jędrzej Stuczyński	d712b65ec5	[bugfix] noop flag for nym-api for nymvisor compatibility	2024-05-10 11:02:21 +01:00
Tommy Verrall	383b2c1351	Merge pull request #4552 from nymtech/jon/validator-client-rustls Add rustls-tls to reqwest in validator-client	2024-05-08 16:51:46 +01:00
benedettadavico	f0a4350e83	pruning version bump and changelog updates	2024-05-08 11:01:50 +02:00
Jon Häggblad	6f4b00b5c2	Add default-features = true for tungstenite and non-wasm in client-core	2024-04-30 14:14:44 +02:00
Jon Häggblad	d681ad20cf	Keep default features off for tungstenite and wasm	2024-04-30 14:14:44 +02:00
Jon Häggblad	5818d58caf	tweak feature args to tungstenite	2024-04-30 14:14:42 +02:00
Jon Häggblad	da4eab8fdb	Add rustls-tls to reqwest in validator-client	2024-04-30 14:14:00 +02:00