Update contract-cache-mixnode.test.ts

Update config.yaml
Merge pull request #3728 from nymtech/qa/fix-api-tests
2023-08-02 13:25:05 +02:00 · 2023-08-02 13:23:45 +02:00 · 2023-08-02 13:21:00 +02:00 · 2023-08-02 13:02:29 +02:00 · 2023-08-02 12:55:46 +02:00 · 2023-08-02 12:54:09 +02:00
407 changed files with 7400 additions and 21322 deletions
@@ -109,7 +109,6 @@ jobs:
          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
-          cp contracts/target/wasm32-unknown-unknown/release/nym_ephemera.wasm $OUTPUT_DIR

      - name: Deploy branch to CI www
        continue-on-error: true
@@ -23,7 +23,12 @@ jobs:
        node-version: 18
    - name: Install Yarn
      run: npm install -g yarn
-    
+    - name: Install Rust stable
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable
+    - name: Install wasm-pack
+      run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
    - name: Install project dependencies
      run: cd ../.. && yarn --network-timeout 100000
      
@@ -31,10 +31,20 @@ jobs:
        uses: actions/setup-node@v3
        with:
          node-version: 18
+
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
          toolchain: stable
+          target: wasm32-unknown-unknown
+
+      - name: Install wasm-pack
+        run: |
+          export WASM_PACK_VERSION="v0.12.1" 
+          curl -LO https://github.com/rustwasm/wasm-pack/releases/download/${WASM_PACK_VERSION}/wasm-pack-${WASM_PACK_VERSION}-x86_64-apple-darwin.tar.gz
+          tar xvzf wasm-pack-${WASM_PACK_VERSION}-x86_64-apple-darwin.tar.gz -C $HOME/.cargo/bin --strip-components=1
+          rm wasm-pack-${WASM_PACK_VERSION}-x86_64-apple-darwin.tar.gz
+
      - name: Install the Apple developer certificate for code signing
        env:
          APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
@@ -78,6 +88,8 @@ jobs:
          APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+          SENTRY_DSN_RUST: ${{ secrets.SENTRY_DSN_RUST }}
+          SENTRY_DSN_JS: ${{ secrets.SENTRY_DSN_JS }}
        run: yarn && yarn build

      - name: Upload Artifact
@@ -103,9 +115,10 @@ jobs:
      - id: release-info
        name: Prepare release info
        run: |
-          semver="${${{ github.ref_name }}##nym-connect-}" && semver="${semver##v}"
-          echo "version=$semver" >> "$GITHUB_OUTPUT"
-          echo "filename=nym-connect_$version_x64.dmg" >> "$GITHUB_OUTPUT"
+          ref=${{ github.ref_name }}
+          semver="${ref##nym-connect-}" && semver="${semver##v}"
+          echo "version=${semver}" >> "$GITHUB_OUTPUT"
+          echo "filename=nym-connect_${semver}_x64.dmg " >> "$GITHUB_OUTPUT"
          echo "file_hash=${{ hashFiles('nym-connect/desktop/target/release/bundle/dmg/nym-connect_*_x64.dmg') }}" >> "$GITHUB_OUTPUT"

  push-release-data:
@@ -61,6 +61,8 @@ jobs:
        env:
          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+          SENTRY_DSN_RUST: ${{ secrets.SENTRY_DSN_RUST }}
+          SENTRY_DSN_JS: ${{ secrets.SENTRY_DSN_JS }}

      - name: Upload Artifact
        uses: actions/upload-artifact@v3
@@ -80,9 +82,10 @@ jobs:
      - id: release-info
        name: Prepare release info
        run: |
-          semver="${${{ github.ref_name }}##nym-connect-}" && semver="${semver##v}"
-          echo "version=$semver" >> "$GITHUB_OUTPUT"
-          echo "filename=nym-connect_$version_amd64.AppImage" >> "$GITHUB_OUTPUT"
+          ref=${{ github.ref_name }}
+          semver="${ref##nym-connect-}" && semver="${semver##v}"
+          echo "version=${semver}" >> "$GITHUB_OUTPUT"
+          echo "filename=nym-connect_${semver}_amd64.AppImage" >> "$GITHUB_OUTPUT"
          echo "file_hash=${{ hashFiles('nym-connect/desktop/target/release/bundle/appimage/nym-connect_*_amd64.AppImage') }}" >> "$GITHUB_OUTPUT"

  push-release-data:
@@ -79,6 +79,8 @@ jobs:
          WINDOWS_CERTIFICATE_PASSWORD: ${{ secrets.WINDOWS_CERTIFICATE_PASSWORD }}
          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+          SENTRY_DSN_RUST: ${{ secrets.SENTRY_DSN_RUST }}
+          SENTRY_DSN_JS: ${{ secrets.SENTRY_DSN_JS }}
        run: yarn build

      - name: Upload Artifact
@@ -99,9 +101,10 @@ jobs:
      - id: release-info
        name: Prepare release info
        run: |
-          semver="${${{ github.ref_name }}##nym-connect-}" && semver="${semver##v}"
-          echo "version=$semver" >> "$GITHUB_OUTPUT"
-          echo "filename=nym-connect_$version_x64_en-US.msi" >> "$GITHUB_OUTPUT"
+          ref=${{ github.ref_name }}
+          semver="${ref##nym-connect-}" && semver="${semver##v}"
+          echo "version=${semver}" >> "$GITHUB_OUTPUT"
+          echo "filename=nym-connect_${semver}_x64_en-US.msi" >> "$GITHUB_OUTPUT"
          echo "file_hash=${{ hashFiles('nym-connect/desktop/target/release/bundle/msi/nym-connect_*_x64_en-US.msi') }}" >> "$GITHUB_OUTPUT"

  push-release-data:
@@ -1,104 +0,0 @@
-name: Publish Nym Connect - desktop (MacOS)
-on:
-  workflow_dispatch:
-    inputs:
-      release_tag:
-        required: true
-        description: Release tag (nym-connect-s-v*)
-        type: string
-        default: 'nym-connect-s-v1.0.0'
-  push:
-    tags:
-      - nym-connect-s-v*
-
-defaults:
-  run:
-    working-directory: nym-connect/desktop
-
-jobs:
-  publish-tauri:
-    if: ${{ (startsWith(github.ref, 'refs/tags/nym-connect-s-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: [macos-latest]
-    runs-on: ${{ matrix.platform }}
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 18
-      - name: Install Rust stable
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-      - name: Install the Apple developer certificate for code signing
-        env:
-          APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
-          APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
-          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
-        run: |
-          # create variables
-          CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
-          KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
-
-          # import certificate and provisioning profile from secrets
-          echo -n "$APPLE_CERTIFICATE" | base64 --decode --output $CERTIFICATE_PATH
-
-          # create temporary keychain
-          security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
-          security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
-          security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
-
-          # import certificate to keychain
-          security import $CERTIFICATE_PATH -P "$APPLE_CERTIFICATE_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
-          security list-keychain -d user -s $KEYCHAIN_PATH
-
-      - name: Create env file
-        uses: timheuer/base64-to-file@v1.2
-        with:
-          fileName: '.env'
-          encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }}
-
-      - name: Prepare for build
-        env:
-          RELEASE_TAG: ${{ github.ref_name || inputs.release_tag }}
-        run: ./scripts/pre_medium_build.sh
-
-      - name: Install app dependencies and build it
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          ENABLE_CODE_SIGNING: ${{ secrets.APPLE_CERTIFICATE }}
-          APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
-          APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
-          APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_IDENTITY_ID }}
-          APPLE_ID: ${{ secrets.APPLE_ID }}
-          APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
-          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
-          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
-          NYM_CONNECT_ENABLE_MEDIUM: 1
-        run: yarn && yarn build
-
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: nym-connect-s_1.0.0_x64.dmg
-          path: nym-connect/desktop/target/release/bundle/dmg/nym-connect-s_1*_x64.dmg
-          retention-days: 30
-
-      - name: Clean up keychain
-        if: ${{ always() }}
-        run: |
-          security delete-keychain $RUNNER_TEMP/app-signing.keychain-db
-
-      - id: create-release
-        name: Upload to release based on tag name
-        uses: softprops/action-gh-release@v1
-        if: github.event_name == 'release'
-        with:
-          files: |
-            nym-connect/desktop/target/release/bundle/dmg/*.dmg
-            nym-connect/desktop/target/release/bundle/macos/*.app.tar.gz*
@@ -1,85 +0,0 @@
-name: Publish NymConnect S - desktop (Ubuntu)
-on:
-  workflow_dispatch:
-    inputs:
-      release_tag:
-        required: true
-        description: Release tag (nym-connect-s-v*)
-        type: string
-        default: 'nym-connect-s-v1.0.0'
-  push:
-    tags:
-      - nym-connect-s-v*
-
-defaults:
-  run:
-    working-directory: nym-connect/desktop
-
-jobs:
-  publish-tauri:
-    if: ${{ (startsWith(github.ref, 'refs/tags/nym-connect-s-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: [custom-runner-linux]
-    runs-on: ${{ matrix.platform }}
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Tauri dependencies
-        run: >
-          sudo apt-get update &&
-          sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev
-        continue-on-error: true
-
-      - name: Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 18
-
-      - name: Install Rust stable
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-
-      - name: Install project dependencies
-        shell: bash
-        run: cd .. && yarn --network-timeout 100000
-
-      - name: Install app dependencies
-        run: yarn
-
-      - name: Create env file
-        uses: timheuer/base64-to-file@v1.2
-        with:
-          fileName: '.env'
-          encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }}
-
-      - name: Prepare for build
-        env:
-          RELEASE_TAG: ${{ github.ref_name || inputs.release_tag }}
-        run: ./scripts/pre_medium_build.sh
-
-      - name: Build app
-        run: yarn build
-        env:
-          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
-          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
-          NYM_CONNECT_ENABLE_MEDIUM: 1
-
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: nym-connect-s.AppImage.tar.gz
-          path: nym-connect/desktop/target/release/bundle/appimage/nym-connect-s_1*_amd64.AppImage
-          retention-days: 30
-
-      - id: create-release
-        name: Upload to release based on tag name
-        uses: softprops/action-gh-release@v1
-        if: github.event_name == 'release'
-        with:
-          files: |
-            nym-connect/desktop/target/release/bundle/appimage/*.AppImage
-            nym-connect/desktop/target/release/bundle/appimage/*.AppImage.tar.gz*
@@ -1,104 +0,0 @@
-name: Publish Nym Connect - desktop (Windows 10)
-on:
-  workflow_dispatch:
-    inputs:
-      release_tag:
-        required: true
-        description: Release tag (nym-connect-s-v*)
-        type: string
-        default: 'nym-connect-s-v1.0.0'
-  push:
-    tags:
-      - nym-connect-s-v*
-
-defaults:
-  run:
-    working-directory: nym-connect/desktop
-
-jobs:
-  publish-tauri:
-    if: ${{ (startsWith(github.ref, 'refs/tags/nym-connect-s-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: [windows10]
-    runs-on: ${{ matrix.platform }}
-
-    steps:
-      - name: Clean up first
-        continue-on-error: true
-        working-directory: .
-        run: |
-          cd ..
-          del /s /q /A:H nym
-          rmdir /s /q nym
-
-      - uses: actions/checkout@v3
-
-      - name: Import signing certificate
-        env:
-          WINDOWS_CERTIFICATE: ${{ secrets.WINDOWS_CERTIFICATE }}
-          WINDOWS_CERTIFICATE_PASSWORD: ${{ secrets.WINDOWS_CERTIFICATE_PASSWORD }}
-        run: |
-          New-Item -ItemType directory -Path certificate
-          Set-Content -Path certificate/tempCert.txt -Value $env:WINDOWS_CERTIFICATE
-          certutil -decode certificate/tempCert.txt certificate/certificate.pfx
-          Remove-Item -path certificate -include tempCert.txt
-          Import-PfxCertificate -FilePath certificate/certificate.pfx -CertStoreLocation Cert:\CurrentUser\My -Password (ConvertTo-SecureString -String $env:WINDOWS_CERTIFICATE_PASSWORD -Force -AsPlainText)
-
-      - name: Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 18
-
-      - name: Install Rust stable
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-
-      - name: Create env file
-        uses: timheuer/base64-to-file@v1.2
-        with:
-          fileName: '.env'
-          encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }}
-
-      - name: Install project dependencies
-        shell: bash
-        run: cd .. && yarn --network-timeout 100000
-
-      - name: Install app dependencies
-        shell: bash
-        run: yarn --network-timeout 100000
-
-      - name: Prepare for build
-        env:
-          RELEASE_TAG: ${{ github.ref_name || inputs.release_tag }}
-        run: ./scripts/pre_medium_build.sh
-
-      - name: Build and sign it
-        shell: bash
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          ENABLE_CODE_SIGNING: ${{ secrets.WINDOWS_CERTIFICATE }}
-          WINDOWS_CERTIFICATE: ${{ secrets.WINDOWS_CERTIFICATE }}
-          WINDOWS_CERTIFICATE_PASSWORD: ${{ secrets.WINDOWS_CERTIFICATE_PASSWORD }}
-          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
-          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
-          NYM_CONNECT_ENABLE_MEDIUM: 1
-        run: yarn build
-
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: nym-connect-s_1.0.0_x64_en-US.msi
-          path: nym-connect/desktop/target/release/bundle/msi/nym-connect-s_1*_x64_en-US.msi
-          retention-days: 30
-
-      - id: create-release
-        name: Upload to release based on tag name
-        uses: softprops/action-gh-release@v1
-        if: github.event_name == 'release'
-        with:
-          files: |
-            nym-connect/desktop/target/release/bundle/msi/*.msi
-            nym-connect/desktop/target/release/bundle/msi/*.msi.zip*
@@ -99,12 +99,14 @@ jobs:
          files: |
            nym-wallet/target/release/bundle/dmg/*.dmg
            nym-wallet/target/release/bundle/macos/*.app.tar.gz*
+
      - id: release-info
        name: Prepare release info
        run: |
-          semver="${${{ github.ref_name }}##nym-wallet-}" && semver="${semver##v}"
-          echo "version=$semver" >> "$GITHUB_OUTPUT"
-          echo "filename=nym-wallet_$version_x64.dmg" >> "$GITHUB_OUTPUT"
+          ref=${{ github.ref_name }}
+          semver="${ref##nym-wallet-}" && semver="${semver##v}"
+          echo "version=${semver}" >> "$GITHUB_OUTPUT"
+          echo "filename=nym-wallet_${semver}_x64.dmg" >> "$GITHUB_OUTPUT"
          echo "file_hash=${{ hashFiles('nym-wallet/target/release/bundle/dmg/nym-wallet_*_x64.dmg') }}" >> "$GITHUB_OUTPUT"

  push-release-data:
@@ -61,6 +61,13 @@ jobs:
          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}

+      - name: Upload Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: nym-wallet_1.0.0_amd64.AppImage.tar.gz
+          path: nym-wallet/target/release/bundle/appimage/nym-wallet*.AppImage.tar.gz
+          retention-days: 30
+
      - id: create-release
        name: Upload to release based on tag name
        uses: softprops/action-gh-release@v1
@@ -73,9 +80,10 @@ jobs:
      - id: release-info
        name: Prepare release info
        run: |
-          semver="${${{ github.ref_name }}##nym-wallet-}" && semver="${semver##v}"
-          echo "version=$semver" >> "$GITHUB_OUTPUT"
-          echo "filename=nym-wallet_$version_amd64.AppImage" >> "$GITHUB_OUTPUT"
+          ref=${{ github.ref_name }}
+          semver="${ref##nym-wallet-}" && semver="${semver##v}"
+          echo "version=${semver}" >> "$GITHUB_OUTPUT"
+          echo "filename=nym-wallet_${semver}_amd64.AppImage" >> "$GITHUB_OUTPUT"
          echo "file_hash=${{ hashFiles('nym-wallet/target/release/bundle/appimage/nym-wallet_*_amd64.AppImage') }}" >> "$GITHUB_OUTPUT"

  push-release-data:
@@ -96,12 +96,14 @@ jobs:
          files: |
            nym-wallet/target/release/bundle/msi/*.msi
            nym-wallet/target/release/bundle/msi/*.msi.zip*
+
      - id: release-info
        name: Prepare release info
        run: |
-          semver="${${{ github.ref_name }}##nym-wallet-}" && semver="${semver##v}"
-          echo "version=$semver" >> "$GITHUB_OUTPUT"
-          echo "filename=nym-wallet_$version_x64_en-US.msi" >> "$GITHUB_OUTPUT"
+          ref=${{ github.ref_name }}
+          semver="${ref##nym-wallet-}" && semver="${semver##v}"
+          echo "version=${semver}" >> "$GITHUB_OUTPUT"
+          echo "filename=nym-wallet_${semver}_x64_en-US.msi" >> "$GITHUB_OUTPUT"
          echo "file_hash=${{ hashFiles('nym-wallet/target/release/bundle/msi/nym-wallet_*_x64_en-US.msi') }}" >> "$GITHUB_OUTPUT"

  push-release-data:
@@ -34,7 +34,6 @@ members = [
    "common/cosmwasm-smart-contracts/coconut-bandwidth-contract",
    "common/cosmwasm-smart-contracts/coconut-dkg",
    "common/cosmwasm-smart-contracts/contracts-common",
-    "common/cosmwasm-smart-contracts/ephemera",
    "common/cosmwasm-smart-contracts/group-contract",
    "common/cosmwasm-smart-contracts/mixnet-contract",
    "common/cosmwasm-smart-contracts/multisig-contract",
@@ -122,7 +121,9 @@ cosmwasm-derive = "=1.2.5"
 cosmwasm-schema = "=1.2.5"
 cosmwasm-std = "=1.2.5"
 cosmwasm-storage = "=1.2.5"
-cosmrs = "=0.8.0"
+cosmrs = "=0.14.0"
+# same version as used by cosmrs
+tendermint-rpc = "=0.32"
 cw-utils = "=1.0.1"
 cw-storage-plus = "=1.0.1"
 cw2 = { version = "=1.0.1" }
@@ -132,7 +133,7 @@ cw4 = { version = "=1.0.1" }
 cw-controllers = { version = "=1.0.1" }
 dotenvy = "0.15.6"
 generic-array = "0.14.7"
-k256 = "0.11"
+k256 = "0.13"
 getrandom = "0.2.10"
 lazy_static = "1.4.0"
 log = "0.4"
@@ -21,5 +21,5 @@ nym-credential-storage = { path = "../../common/credential-storage" }
 nym-bin-common = { path = "../../common/bin-common"}
 nym-network-defaults = { path = "../../common/network-defaults" }
 nym-pemstore = { path = "../../common/pemstore" }
-nym-validator-client = { path = "../../common/client-libs/validator-client", features = ["nyxd-client"] }
+nym-validator-client = { path = "../../common/client-libs/validator-client" }

@@ -48,7 +48,7 @@ nym-sphinx = { path = "../../common/nymsphinx" }
 nym-pemstore = { path = "../../common/pemstore" }
 nym-task = { path = "../../common/task" }
 nym-topology = { path = "../../common/topology" }
-nym-validator-client = { path = "../../common/client-libs/validator-client", features = ["nyxd-client"] }
+nym-validator-client = { path = "../../common/client-libs/validator-client", features = ["http-client"] }
 nym-client-websocket-requests = { path = "websocket-requests" }

 [dev-dependencies]
@@ -0,0 +1,16 @@
+// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use clap::Args;
+use nym_bin_common::bin_info_owned;
+use nym_bin_common::output_format::OutputFormat;
+
+#[derive(Args)]
+pub(crate) struct BuildInfo {
+    #[clap(short, long, default_value_t = OutputFormat::default())]
+    output: OutputFormat,
+}
+
+pub(crate) fn execute(args: BuildInfo) {
+    println!("{}", args.output.format(&bin_info_owned!()))
+}
@@ -10,7 +10,7 @@ use clap::CommandFactory;
 use clap::{Parser, Subcommand};
 use lazy_static::lazy_static;
 use log::{error, info};
-use nym_bin_common::build_information::BinaryBuildInformation;
+use nym_bin_common::bin_info;
 use nym_bin_common::completions::{fig_generate, ArgShell};
 use nym_client_core::client::base_client::storage::gateway_details::{
    OnDiskGatewayDetails, PersistedGatewayDetails,
@@ -22,12 +22,12 @@ use nym_config::OptionalSet;
 use std::error::Error;
 use std::net::IpAddr;

+pub(crate) mod build_info;
 pub(crate) mod init;
 pub(crate) mod run;

 lazy_static! {
-    pub static ref PRETTY_BUILD_INFORMATION: String =
-        BinaryBuildInformation::new(env!("CARGO_PKG_VERSION")).pretty_print();
+    pub static ref PRETTY_BUILD_INFORMATION: String = bin_info!().pretty_print();
 }

 // Helper for passing LONG_VERSION to clap
@@ -42,6 +42,10 @@ pub(crate) struct Cli {
    #[clap(short, long)]
    pub(crate) config_env_file: Option<std::path::PathBuf>,

+    /// Flag used for disabling the printed banner in tty.
+    #[clap(long)]
+    pub(crate) no_banner: bool,
+
    #[clap(subcommand)]
    command: Commands,
 }
@@ -54,6 +58,9 @@ pub(crate) enum Commands {
    /// Run the Nym client with provided configuration client optionally overriding set parameters
    Run(run::Run),

+    /// Show build information of this binary
+    BuildInfo(build_info::BuildInfo),
+
    /// Generate shell completions
    Completions(ArgShell),

@@ -73,12 +80,13 @@ pub(crate) struct OverrideConfig {
    enabled_credentials_mode: Option<bool>,
 }

-pub(crate) async fn execute(args: &Cli) -> Result<(), Box<dyn Error + Send + Sync>> {
+pub(crate) async fn execute(args: Cli) -> Result<(), Box<dyn Error + Send + Sync>> {
    let bin_name = "nym-native-client";

-    match &args.command {
-        Commands::Init(m) => init::execute(m).await?,
-        Commands::Run(m) => run::execute(m).await?,
+    match args.command {
+        Commands::Init(m) => init::execute(&m).await?,
+        Commands::Run(m) => run::execute(&m).await?,
+        Commands::BuildInfo(m) => build_info::execute(m),
        Commands::Completions(s) => s.generate(&mut Cli::command(), bin_name),
        Commands::GenerateFigSpec => fig_generate(&mut Cli::command(), bin_name),
    }
@@ -14,10 +14,13 @@ pub mod websocket;

 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
-    setup_logging();
-    maybe_print_banner(crate_name!(), crate_version!());
-
    let args = commands::Cli::parse();
    setup_env(args.config_env_file.as_ref());
-    commands::execute(&args).await
+
+    if !args.no_banner {
+        maybe_print_banner(crate_name!(), crate_version!());
+    }
+    setup_logging();
+
+    commands::execute(args).await
 }
@@ -0,0 +1,16 @@
+// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use clap::Args;
+use nym_bin_common::bin_info_owned;
+use nym_bin_common::output_format::OutputFormat;
+
+#[derive(Args)]
+pub(crate) struct BuildInfo {
+    #[clap(short, long, default_value_t = OutputFormat::default())]
+    output: OutputFormat,
+}
+
+pub(crate) fn execute(args: BuildInfo) {
+    println!("{}", args.output.format(&bin_info_owned!()))
+}
@@ -10,7 +10,7 @@ use clap::CommandFactory;
 use clap::{Parser, Subcommand};
 use lazy_static::lazy_static;
 use log::{error, info};
-use nym_bin_common::build_information::BinaryBuildInformation;
+use nym_bin_common::bin_info;
 use nym_bin_common::completions::{fig_generate, ArgShell};
 use nym_client_core::client::base_client::storage::gateway_details::{
    OnDiskGatewayDetails, PersistedGatewayDetails,
@@ -22,12 +22,12 @@ use nym_config::OptionalSet;
 use nym_sphinx::params::{PacketSize, PacketType};
 use std::error::Error;

+pub(crate) mod build_info;
 pub mod init;
 pub(crate) mod run;

 lazy_static! {
-    pub static ref PRETTY_BUILD_INFORMATION: String =
-        BinaryBuildInformation::new(env!("CARGO_PKG_VERSION")).pretty_print();
+    pub static ref PRETTY_BUILD_INFORMATION: String = bin_info!().pretty_print();
 }

 // Helper for passing LONG_VERSION to clap
@@ -42,6 +42,10 @@ pub(crate) struct Cli {
    #[clap(short, long)]
    pub(crate) config_env_file: Option<std::path::PathBuf>,

+    /// Flag used for disabling the printed banner in tty.
+    #[clap(long)]
+    pub(crate) no_banner: bool,
+
    #[clap(subcommand)]
    command: Commands,
 }
@@ -54,6 +58,9 @@ pub(crate) enum Commands {
    /// Run the Nym client with provided configuration client optionally overriding set parameters
    Run(run::Run),

+    /// Show build information of this binary
+    BuildInfo(build_info::BuildInfo),
+
    /// Generate shell completions
    Completions(ArgShell),

@@ -74,12 +81,13 @@ pub(crate) struct OverrideConfig {
    outfox: bool,
 }

-pub(crate) async fn execute(args: &Cli) -> Result<(), Box<dyn Error + Send + Sync>> {
+pub(crate) async fn execute(args: Cli) -> Result<(), Box<dyn Error + Send + Sync>> {
    let bin_name = "nym-socks5-client";

-    match &args.command {
-        Commands::Init(m) => init::execute(m).await?,
-        Commands::Run(m) => run::execute(m).await?,
+    match args.command {
+        Commands::Init(m) => init::execute(&m).await?,
+        Commands::Run(m) => run::execute(&m).await?,
+        Commands::BuildInfo(m) => build_info::execute(m),
        Commands::Completions(s) => s.generate(&mut Cli::command(), bin_name),
        Commands::GenerateFigSpec => fig_generate(&mut Cli::command(), bin_name),
    }
@@ -13,10 +13,13 @@ pub mod error;

 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
-    setup_logging();
-    maybe_print_banner(crate_name!(), crate_version!());
-
    let args = commands::Cli::parse();
    setup_env(args.config_env_file.as_ref());
-    commands::execute(&args).await
+
+    if !args.no_banner {
+        maybe_print_banner(crate_name!(), crate_version!());
+    }
+    setup_logging();
+
+    commands::execute(args).await
 }
@@ -217,6 +217,12 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce"

+[[package]]
+name = "base16ct"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
+
 [[package]]
 name = "base64"
 version = "0.13.1"
@@ -237,13 +243,13 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"

 [[package]]
 name = "bip32"
-version = "0.4.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b30ed1d6f8437a487a266c8293aeb95b61a23261273e3e02912cdb8b68bf798b"
+checksum = "7e141fb0f8be1c7b45887af94c88b182472b57c96b56773250ae00cd6a14a164"
 dependencies = [
- "bs58",
+ "bs58 0.5.0",
 "hmac 0.12.1",
- "k256",
+ "k256 0.13.1",
 "once_cell",
 "pbkdf2",
 "rand_core 0.6.4",
@@ -309,7 +315,7 @@ version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe"
 dependencies = [
- "digest 0.10.6",
+ "digest 0.10.7",
 ]

 [[package]]
@@ -323,7 +329,7 @@ dependencies = [
 "cc",
 "cfg-if 1.0.0",
 "constant_time_eq",
- "digest 0.10.6",
+ "digest 0.10.7",
 ]

 [[package]]
@@ -377,8 +383,14 @@ name = "bs58"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
+
+[[package]]
+name = "bs58"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896"
 dependencies = [
- "sha2 0.9.9",
+ "sha2 0.10.6",
 ]

 [[package]]
@@ -404,6 +416,9 @@ name = "bytes"
 version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+dependencies = [
+ "serde",
+]

 [[package]]
 name = "cc"
@@ -598,9 +613,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"

 [[package]]
 name = "cosmos-sdk-proto"
-version = "0.13.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bb61f3d2224c90ea78e1fa7444787761a549170c46b6b0ed09b93f9b7e4076a"
+checksum = "73c9d2043a9e617b0d602fbc0a0ecd621568edbf3a9774890a6d562389bd8e1c"
 dependencies = [
 "prost",
 "prost-types",
@@ -609,18 +624,16 @@ dependencies = [

 [[package]]
 name = "cosmrs"
-version = "0.8.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20d5890dac07a62337e5841adb8f2074a66a962a098a48df9460f64d483beaf4"
+checksum = "af13955d6f356272e6def9ff5e2450a7650df536d8934f47052a20c76513d2f6"
 dependencies = [
 "bip32",
 "cosmos-sdk-proto",
- "ecdsa",
+ "ecdsa 0.16.8",
 "eyre",
 "getrandom 0.2.10",
- "k256",
- "prost",
- "prost-types",
+ "k256 0.13.1",
 "rand_core 0.6.4",
 "serde",
 "serde_json",
@@ -636,9 +649,9 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d076a08ec01ed23c4396aca98ec73a38fa1fee5f310465add52b4108181c7a8"
 dependencies = [
- "digest 0.10.6",
+ "digest 0.10.7",
 "ed25519-zebra",
- "k256",
+ "k256 0.11.6",
 "rand_core 0.6.4",
 "thiserror",
 ]
@@ -815,6 +828,18 @@ dependencies = [
 "zeroize",
 ]

+[[package]]
+name = "crypto-bigint"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15"
+dependencies = [
+ "generic-array 0.14.7",
+ "rand_core 0.6.4",
+ "subtle 2.4.1",
+ "zeroize",
+]
+
 [[package]]
 name = "crypto-common"
 version = "0.1.6"
@@ -887,6 +912,19 @@ dependencies = [
 "zeroize",
 ]

+[[package]]
+name = "curve25519-dalek-ng"
+version = "4.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c359b7249347e46fb28804470d071c921156ad62b3eef5d34e2ba867533dec8"
+dependencies = [
+ "byteorder",
+ "digest 0.9.0",
+ "rand_core 0.6.4",
+ "subtle-ng",
+ "zeroize",
+]
+
 [[package]]
 name = "cw-controllers"
 version = "1.0.1"
@@ -1005,6 +1043,16 @@ dependencies = [
 "zeroize",
 ]

+[[package]]
+name = "der"
+version = "0.7.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c7ed52955ce76b1554f509074bb357d3fb8ac9b51288a65a3fd480d1dfba946"
+dependencies = [
+ "const-oid",
+ "zeroize",
+]
+
 [[package]]
 name = "derivative"
 version = "2.2.0"
@@ -1036,11 +1084,12 @@ dependencies = [

 [[package]]
 name = "digest"
-version = "0.10.6"
+version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
 "block-buffer 0.10.4",
+ "const-oid",
 "crypto-common",
 "subtle 2.4.1",
 ]
@@ -1110,10 +1159,24 @@ version = "0.14.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c"
 dependencies = [
- "der",
- "elliptic-curve",
- "rfc6979",
- "signature",
+ "der 0.6.1",
+ "elliptic-curve 0.12.3",
+ "rfc6979 0.3.1",
+ "signature 1.6.4",
+]
+
+[[package]]
+name = "ecdsa"
+version = "0.16.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4"
+dependencies = [
+ "der 0.7.7",
+ "digest 0.10.7",
+ "elliptic-curve 0.13.5",
+ "rfc6979 0.4.0",
+ "signature 2.1.0",
+ "spki 0.7.2",
 ]

 [[package]]
@@ -1123,7 +1186,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7"
 dependencies = [
 "serde",
- "signature",
+ "signature 1.6.4",
+]
+
+[[package]]
+name = "ed25519"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fb04eee5d9d907f29e80ee6b0e78f7e2c82342c63e3580d8c4f69d9d5aad963"
+dependencies = [
+ "pkcs8 0.10.2",
+ "signature 2.1.0",
+]
+
+[[package]]
+name = "ed25519-consensus"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c8465edc8ee7436ffea81d21a019b16676ee3db267aa8d5a8d729581ecf998b"
+dependencies = [
+ "curve25519-dalek-ng",
+ "hex",
+ "rand_core 0.6.4",
+ "sha2 0.9.9",
+ "zeroize",
 ]

 [[package]]
@@ -1133,7 +1219,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
 dependencies = [
 "curve25519-dalek",
- "ed25519",
+ "ed25519 1.5.3",
 "rand 0.7.3",
 "serde",
 "serde_bytes",
@@ -1168,16 +1254,35 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3"
 dependencies = [
- "base16ct",
- "crypto-bigint",
- "der",
- "digest 0.10.6",
+ "base16ct 0.1.1",
+ "crypto-bigint 0.4.9",
+ "der 0.6.1",
+ "digest 0.10.7",
 "ff 0.12.1",
 "generic-array 0.14.7",
 "group 0.12.1",
- "pkcs8",
+ "pkcs8 0.9.0",
 "rand_core 0.6.4",
- "sec1",
+ "sec1 0.3.0",
+ "subtle 2.4.1",
+ "zeroize",
+]
+
+[[package]]
+name = "elliptic-curve"
+version = "0.13.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b"
+dependencies = [
+ "base16ct 0.2.0",
+ "crypto-bigint 0.5.2",
+ "digest 0.10.7",
+ "ff 0.13.0",
+ "generic-array 0.14.7",
+ "group 0.13.0",
+ "pkcs8 0.10.2",
+ "rand_core 0.6.4",
+ "sec1 0.7.3",
 "subtle 2.4.1",
 "zeroize",
 ]
@@ -1300,6 +1405,16 @@ dependencies = [
 "subtle 2.4.1",
 ]

+[[package]]
+name = "ff"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
+dependencies = [
+ "rand_core 0.6.4",
+ "subtle 2.4.1",
+]
+
 [[package]]
 name = "flate2"
 version = "1.0.26"
@@ -1603,6 +1718,17 @@ dependencies = [
 "subtle 2.4.1",
 ]

+[[package]]
+name = "group"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
+dependencies = [
+ "ff 0.13.0",
+ "rand_core 0.6.4",
+ "subtle 2.4.1",
+]
+
 [[package]]
 name = "h2"
 version = "0.3.19"
@@ -1786,7 +1912,7 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
 dependencies = [
- "digest 0.10.6",
+ "digest 0.10.7",
 ]

 [[package]]
@@ -2062,19 +2188,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b"
 dependencies = [
 "cfg-if 1.0.0",
- "ecdsa",
- "elliptic-curve",
+ "ecdsa 0.14.8",
+ "elliptic-curve 0.12.3",
 "sha2 0.10.6",
- "sha3",
 ]

 [[package]]
-name = "keccak"
-version = "0.1.4"
+name = "k256"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940"
+checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc"
 dependencies = [
- "cpufeatures",
+ "cfg-if 1.0.0",
+ "ecdsa 0.16.8",
+ "elliptic-curve 0.13.5",
+ "once_cell",
+ "sha2 0.10.6",
+ "signature 2.1.0",
 ]

 [[package]]
@@ -2290,7 +2420,7 @@ dependencies = [
 name = "nym-api-requests"
 version = "0.1.0"
 dependencies = [
- "bs58",
+ "bs58 0.4.0",
 "cosmrs",
 "cosmwasm-std",
 "getset",
@@ -2382,7 +2512,7 @@ version = "1.1.1"
 dependencies = [
 "anyhow",
 "async-trait",
- "bs58",
+ "bs58 0.4.0",
 "console_error_panic_hook",
 "futures",
 "js-sys",
@@ -2420,7 +2550,7 @@ name = "nym-coconut"
 version = "0.5.0"
 dependencies = [
 "bls12_381 0.6.0",
- "bs58",
+ "bs58 0.4.0",
 "digest 0.9.0",
 "ff 0.11.1",
 "getrandom 0.2.10",
@@ -2461,7 +2591,7 @@ dependencies = [
 name = "nym-coconut-interface"
 version = "0.1.0"
 dependencies = [
- "bs58",
+ "bs58 0.4.0",
 "getset",
 "nym-coconut",
 "serde",
@@ -2485,7 +2615,7 @@ dependencies = [
 name = "nym-contracts-common"
 version = "0.5.0"
 dependencies = [
- "bs58",
+ "bs58 0.4.0",
 "cosmwasm-std",
 "schemars",
 "serde",
@@ -2522,10 +2652,10 @@ version = "0.4.0"
 dependencies = [
 "aes 0.8.2",
 "blake3",
- "bs58",
+ "bs58 0.4.0",
 "cipher 0.4.4",
 "ctr 0.9.2",
- "digest 0.10.6",
+ "digest 0.10.7",
 "ed25519-dalek",
 "generic-array 0.14.7",
 "hkdf 0.12.3",
@@ -2547,7 +2677,7 @@ version = "0.1.0"
 dependencies = [
 "bitvec",
 "bls12_381 0.6.0",
- "bs58",
+ "bs58 0.4.0",
 "ff 0.11.1",
 "group 0.11.0",
 "lazy_static",
@@ -2562,17 +2692,6 @@ dependencies = [
 "zeroize",
 ]

-[[package]]
-name = "nym-ephemera-common"
-version = "0.1.0"
-dependencies = [
- "cosmwasm-std",
- "cw-utils",
- "nym-contracts-common",
- "schemars",
- "serde",
-]
-
 [[package]]
 name = "nym-gateway-client"
 version = "0.1.0"
@@ -2608,7 +2727,7 @@ dependencies = [
 name = "nym-gateway-requests"
 version = "0.1.0"
 dependencies = [
- "bs58",
+ "bs58 0.4.0",
 "futures",
 "generic-array 0.14.7",
 "log",
@@ -2640,7 +2759,7 @@ dependencies = [
 name = "nym-mixnet-contract-common"
 version = "0.6.0"
 dependencies = [
- "bs58",
+ "bs58 0.4.0",
 "cosmwasm-std",
 "humantime-serde",
 "log",
@@ -2817,7 +2936,7 @@ dependencies = [
 name = "nym-sphinx-anonymous-replies"
 version = "0.1.0"
 dependencies = [
- "bs58",
+ "bs58 0.4.0",
 "nym-crypto",
 "nym-sphinx-addressing",
 "nym-sphinx-params",
@@ -2941,7 +3060,7 @@ name = "nym-topology"
 version = "0.1.0"
 dependencies = [
 "async-trait",
- "bs58",
+ "bs58 0.4.0",
 "log",
 "nym-bin-common",
 "nym-crypto",
@@ -2976,7 +3095,6 @@ dependencies = [
 "nym-coconut-interface",
 "nym-config",
 "nym-contracts-common",
- "nym-ephemera-common",
 "nym-group-contract-common",
 "nym-mixnet-contract-common",
 "nym-multisig-contract-common",
@@ -2991,6 +3109,7 @@ dependencies = [
 "serde",
 "serde_json",
 "sha2 0.9.9",
+ "tendermint-rpc",
 "thiserror",
 "tokio",
 "url",
@@ -3179,11 +3298,12 @@ checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79"

 [[package]]
 name = "pbkdf2"
-version = "0.11.0"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
+checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
 dependencies = [
- "digest 0.10.6",
+ "digest 0.10.7",
+ "hmac 0.12.1",
 ]

 [[package]]
@@ -3312,8 +3432,18 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba"
 dependencies = [
- "der",
- "spki",
+ "der 0.6.1",
+ "spki 0.6.0",
+]
+
+[[package]]
+name = "pkcs8"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
+dependencies = [
+ "der 0.7.7",
+ "spki 0.7.2",
 ]

 [[package]]
@@ -3396,9 +3526,9 @@ dependencies = [

 [[package]]
 name = "prost"
-version = "0.10.4"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e"
+checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd"
 dependencies = [
 "bytes",
 "prost-derive",
@@ -3406,9 +3536,9 @@ dependencies = [

 [[package]]
 name = "prost-derive"
-version = "0.10.1"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc"
+checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
 dependencies = [
 "anyhow",
 "itertools",
@@ -3419,11 +3549,10 @@ dependencies = [

 [[package]]
 name = "prost-types"
-version = "0.10.1"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68"
+checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13"
 dependencies = [
- "bytes",
 "prost",
 ]

@@ -3646,11 +3775,21 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb"
 dependencies = [
- "crypto-bigint",
+ "crypto-bigint 0.4.9",
 "hmac 0.12.1",
 "zeroize",
 ]

+[[package]]
+name = "rfc6979"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
+dependencies = [
+ "hmac 0.12.1",
+ "subtle 2.4.1",
+]
+
 [[package]]
 name = "ring"
 version = "0.16.20"
@@ -3672,18 +3811,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f"
 dependencies = [
- "digest 0.10.6",
-]
-
-[[package]]
-name = "ripemd160"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eca4ecc81b7f313189bf73ce724400a07da2a6dac19588b03c8bd76a2dcc251"
-dependencies = [
- "block-buffer 0.9.0",
- "digest 0.9.0",
- "opaque-debug 0.3.0",
+ "digest 0.10.7",
 ]

 [[package]]
@@ -3848,10 +3976,24 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
 dependencies = [
- "base16ct",
- "der",
+ "base16ct 0.1.1",
+ "der 0.6.1",
 "generic-array 0.14.7",
- "pkcs8",
+ "pkcs8 0.9.0",
+ "subtle 2.4.1",
+ "zeroize",
+]
+
+[[package]]
+name = "sec1"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
+dependencies = [
+ "base16ct 0.2.0",
+ "der 0.7.7",
+ "generic-array 0.14.7",
+ "pkcs8 0.10.2",
 "subtle 2.4.1",
 "zeroize",
 ]
@@ -4036,7 +4178,7 @@ checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
 dependencies = [
 "cfg-if 1.0.0",
 "cpufeatures",
- "digest 0.10.6",
+ "digest 0.10.7",
 ]

 [[package]]
@@ -4060,17 +4202,7 @@ checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
 dependencies = [
 "cfg-if 1.0.0",
 "cpufeatures",
- "digest 0.10.6",
-]
-
-[[package]]
-name = "sha3"
-version = "0.10.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
-dependencies = [
- "digest 0.10.6",
- "keccak",
+ "digest 0.10.7",
 ]

 [[package]]
@@ -4088,7 +4220,17 @@ version = "1.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
 dependencies = [
- "digest 0.10.6",
+ "digest 0.10.7",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "signature"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500"
+dependencies = [
+ "digest 0.10.7",
 "rand_core 0.6.4",
 ]

@@ -4126,7 +4268,7 @@ dependencies = [
 "aes 0.7.5",
 "arrayref",
 "blake2 0.8.1",
- "bs58",
+ "bs58 0.4.0",
 "byteorder",
 "chacha",
 "curve25519-dalek",
@@ -4163,7 +4305,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b"
 dependencies = [
 "base64ct",
- "der",
+ "der 0.6.1",
+]
+
+[[package]]
+name = "spki"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a"
+dependencies = [
+ "base64ct",
+ "der 0.7.7",
 ]

 [[package]]
@@ -4402,6 +4554,12 @@ dependencies = [
 "zeroize",
 ]

+[[package]]
+name = "subtle-ng"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142"
+
 [[package]]
 name = "syn"
 version = "1.0.109"
@@ -4445,28 +4603,28 @@ dependencies = [

 [[package]]
 name = "tendermint"
-version = "0.23.8"
+version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a199518e0366ba0aeb0d0e0a59dbd99ea0bdc14280f414ecc758c9228a454ad8"
+checksum = "3f0a7d05cf78524782337f8edd55cbc578d159a16ad4affe2135c92f7dbac7f0"
 dependencies = [
- "async-trait",
 "bytes",
- "ed25519",
- "ed25519-dalek",
+ "digest 0.10.7",
+ "ed25519 2.2.1",
+ "ed25519-consensus",
 "flex-error",
 "futures",
- "k256",
+ "k256 0.13.1",
 "num-traits",
 "once_cell",
 "prost",
 "prost-types",
- "ripemd160",
+ "ripemd",
 "serde",
 "serde_bytes",
 "serde_json",
 "serde_repr",
- "sha2 0.9.9",
- "signature",
+ "sha2 0.10.6",
+ "signature 2.1.0",
 "subtle 2.4.1",
 "subtle-encoding",
 "tendermint-proto",
@@ -4476,9 +4634,9 @@ dependencies = [

 [[package]]
 name = "tendermint-config"
-version = "0.23.8"
+version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6d8f6a64ae3b59ea3c73efad727271ee085b544b817d7f46901817ca6bb1773"
+checksum = "71a72dbbea6dde12045d261f2c70c0de039125675e8a026c8d5ad34522756372"
 dependencies = [
 "flex-error",
 "serde",
@@ -4490,9 +4648,9 @@ dependencies = [

 [[package]]
 name = "tendermint-proto"
-version = "0.23.8"
+version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b303d6387aaea38cea7ef924476d1f798573044e7b4f6ddd1166ac5184b2281"
+checksum = "c0cec054567d16d85e8c3f6a3139963d1a66d9d3051ed545d31562550e9bcc3d"
 dependencies = [
 "bytes",
 "flex-error",
@@ -4508,9 +4666,9 @@ dependencies = [

 [[package]]
 name = "tendermint-rpc"
-version = "0.23.8"
+version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3036f0b65baa11e767dabd22a0663e842b595b0a1903f149b7b8b1e09b2b443d"
+checksum = "d119d83a130537fc4a98c3c9eb6899ebe857fea4860400a61675bfb5f0b35129"
 dependencies = [
 "async-trait",
 "bytes",
@@ -4523,9 +4681,11 @@ dependencies = [
 "hyper-rustls",
 "peg",
 "pin-project",
+ "semver 1.0.17",
 "serde",
 "serde_bytes",
 "serde_json",
+ "subtle 2.4.1",
 "subtle-encoding",
 "tendermint",
 "tendermint-config",
@@ -18,7 +18,6 @@ nym-crypto = { path = "../crypto", features = ["rand", "asymmetric", "symmetric"
 nym-network-defaults = { path = "../network-defaults" }
 nym-validator-client = { path = "../client-libs/validator-client", default-features = false }

-
 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.nym-validator-client]
 path = "../client-libs/validator-client"
-features = ["nyxd-client"]
+features = ["signing"]
@@ -10,8 +10,8 @@ use nym_crypto::asymmetric::{encryption, identity};
 use nym_network_defaults::VOUCHER_INFO;
 use nym_validator_client::nyxd::traits::CoconutBandwidthSigningClient;
 use nym_validator_client::nyxd::traits::DkgQueryClient;
-use nym_validator_client::nyxd::tx::Hash;
 use nym_validator_client::nyxd::Coin;
+use nym_validator_client::nyxd::Hash;
 use nym_validator_client::CoconutApiClient;
 use rand::rngs::OsRng;
 use state::{KeyPair, State};
@@ -5,9 +5,13 @@
 // and be used by our smart contracts

 use serde::{Deserialize, Serialize};
+use std::fmt::{Display, Formatter};

 #[derive(Debug)]
 pub struct BinaryBuildInformation {
+    /// Provides the name of the binary, i.e. the content of `CARGO_PKG_NAME` environmental variable.
+    pub binary_name: &'static str,
+
    // VERGEN_BUILD_TIMESTAMP
    /// Provides the build timestamp, for example `2021-02-23T20:14:46.558472672+00:00`.
    pub build_timestamp: &'static str,
@@ -43,8 +47,9 @@ pub struct BinaryBuildInformation {

 impl BinaryBuildInformation {
    // explicitly require the build_version to be passed as it's binary specific
-    pub const fn new(build_version: &'static str) -> Self {
+    pub const fn new(binary_name: &'static str, build_version: &'static str) -> Self {
        BinaryBuildInformation {
+            binary_name,
            build_timestamp: env!("VERGEN_BUILD_TIMESTAMP"),
            build_version,
            commit_sha: env!("VERGEN_GIT_SHA"),
@@ -58,6 +63,7 @@ impl BinaryBuildInformation {

    pub fn to_owned(&self) -> BinaryBuildInformationOwned {
        BinaryBuildInformationOwned {
+            binary_name: self.binary_name.to_owned(),
            build_timestamp: self.build_timestamp.to_owned(),
            build_version: self.build_version.to_owned(),
            commit_sha: self.commit_sha.to_owned(),
@@ -70,39 +76,15 @@ impl BinaryBuildInformation {
    }

    pub fn pretty_print(&self) -> String {
-        format!(
-            r#"
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-"#,
-            "Build Timestamp:",
-            self.build_timestamp,
-            "Build Version:",
-            self.build_version,
-            "Commit SHA:",
-            self.commit_sha,
-            "Commit Date:",
-            self.commit_timestamp,
-            "Commit Branch:",
-            self.commit_branch,
-            "rustc Version:",
-            self.rustc_version,
-            "rustc Channel:",
-            self.rustc_channel,
-            "cargo Profile:",
-            self.cargo_profile,
-        )
+        self.to_owned().to_string()
    }
 }

 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct BinaryBuildInformationOwned {
+    /// Provides the name of the binary, i.e. the content of `CARGO_PKG_NAME` environmental variable.
+    pub binary_name: String,
+
    // VERGEN_BUILD_TIMESTAMP
    /// Provides the build timestamp, for example `2021-02-23T20:14:46.558472672+00:00`.
    pub build_timestamp: String,
@@ -135,3 +117,62 @@ pub struct BinaryBuildInformationOwned {
    /// Provides the cargo profile that was used for the build, for example `debug`.
    pub cargo_profile: String,
 }
+
+impl Display for BinaryBuildInformationOwned {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            r#"
+{:<20}{}
+{:<20}{}
+{:<20}{}
+{:<20}{}
+{:<20}{}
+{:<20}{}
+{:<20}{}
+{:<20}{}
+{:<20}{}
+"#,
+            "Binary Name:",
+            self.binary_name,
+            "Build Timestamp:",
+            self.build_timestamp,
+            "Build Version:",
+            self.build_version,
+            "Commit SHA:",
+            self.commit_sha,
+            "Commit Date:",
+            self.commit_timestamp,
+            "Commit Branch:",
+            self.commit_branch,
+            "rustc Version:",
+            self.rustc_version,
+            "rustc Channel:",
+            self.rustc_channel,
+            "cargo Profile:",
+            self.cargo_profile,
+        )
+    }
+}
+
+// since this macro will get expanded at the callsite, it will pull in correct binary version
+#[macro_export]
+macro_rules! bin_info {
+    () => {
+        $crate::build_information::BinaryBuildInformation::new(
+            env!("CARGO_PKG_NAME"),
+            env!("CARGO_PKG_VERSION"),
+        )
+    };
+}
+
+#[macro_export]
+macro_rules! bin_info_owned {
+    () => {
+        $crate::build_information::BinaryBuildInformation::new(
+            env!("CARGO_PKG_NAME"),
+            env!("CARGO_PKG_VERSION"),
+        )
+        .to_owned()
+    };
+}
@@ -45,7 +45,7 @@ nym-network-defaults = { path = "../network-defaults" }

 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.nym-validator-client]
 path = "../client-libs/validator-client"
-features = ["nyxd-client"]
+features = ["signing", "http-client"]

 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio-stream]
 version = "0.1.11"
@@ -38,6 +38,7 @@ use wasm_utils::websocket::JSWebsocket;
 #[cfg(target_arch = "wasm32")]
 type WsConn = JSWebsocket;

+const CONCURRENT_GATEWAYS_MEASURED: usize = 20;
 const MEASUREMENTS: usize = 3;

 #[cfg(not(target_arch = "wasm32"))]
@@ -158,23 +159,29 @@ pub(super) async fn choose_gateway_by_latency<R: Rng>(
    rng: &mut R,
    gateways: &[gateway::Node],
 ) -> Result<gateway::Node, ClientCoreError> {
-    info!("choosing gateway by latency...");
+    info!(
+        "choosing gateway by latency, pinging {} gateways ...",
+        gateways.len()
+    );

-    let mut gateways_with_latency = Vec::new();
-    for gateway in gateways {
-        let id = *gateway.identity();
-        trace!("measuring latency to {id}...");
-        let with_latency = match measure_latency(gateway).await {
-            Ok(res) => res,
-            Err(err) => {
-                warn!("failed to measure {id}: {err}");
-                continue;
-            }
-        };
-        debug!("{id}: {:?}", with_latency.latency);
-        gateways_with_latency.push(with_latency)
-    }
+    let gateways_with_latency = Arc::new(tokio::sync::Mutex::new(Vec::new()));
+    futures::stream::iter(gateways)
+        .for_each_concurrent(CONCURRENT_GATEWAYS_MEASURED, |gateway| async {
+            let id = *gateway.identity();
+            trace!("measuring latency to {id}...");
+            match measure_latency(gateway).await {
+                Ok(with_latency) => {
+                    debug!("{id}: {:?}", with_latency.latency);
+                    gateways_with_latency.lock().await.push(with_latency);
+                }
+                Err(err) => {
+                    warn!("failed to measure {id}: {err}");
+                }
+            };
+        })
+        .await;

+    let gateways_with_latency = gateways_with_latency.lock().await;
    let chosen = gateways_with_latency
        .choose_weighted(rng, |item| 1. / item.latency.as_secs_f32())
        .expect("invalid selection weight!");
@@ -13,7 +13,6 @@ colored = "2.0"

 nym-coconut-dkg-common = { path = "../../cosmwasm-smart-contracts/coconut-dkg" }
 nym-contracts-common = { path = "../../cosmwasm-smart-contracts/contracts-common" }
-nym-ephemera-common = { path = "../../cosmwasm-smart-contracts/ephemera" }
 nym-mixnet-contract-common = { path = "../../cosmwasm-smart-contracts/mixnet-contract" }
 nym-vesting-contract-common = { path = "../../cosmwasm-smart-contracts/vesting-contract" }
 nym-coconut-bandwidth-contract-common = { path = "../../cosmwasm-smart-contracts/coconut-bandwidth-contract" }
@@ -36,27 +35,30 @@ nym-coconut-interface = { path = "../../coconut-interface" }
 nym-network-defaults = { path = "../../network-defaults" }
 nym-api-requests = { path = "../../../nym-api/nym-api-requests" }

-# required for nyxd-client
-# at some point it might be possible to make it wasm-compatible
-# perhaps after https://github.com/cosmos/cosmos-rust/pull/97 is resolved (and tendermint-rs is updated)
-async-trait = { workspace = true, optional = true }
+async-trait = { workspace = true }
 bip39 = { workspace = true, features = ["rand"], optional = true }
-nym-config = { path = "../../config", optional = true }
-cosmrs = { workspace = true, features = ["rpc", "bip32", "cosmwasm"], optional = true }
+nym-config = { path = "../../config" }
+cosmrs = { workspace = true, features = ["bip32", "cosmwasm"] }
+#cosmrs = { workspace = true, features = ["bip32", "rpc", "cosmwasm"], optional = true }
 # note that this has the same version as used by cosmrs
+
+# import it just for the `Client` trait
+tendermint-rpc = { workspace = true }
+
 eyre = { version = "0.6", optional = true }
-cw3 = { workspace = true, optional = true }
-cw4 = { workspace = true, optional = true }
-prost = { version = "0.10", default-features = false, optional = true }
-flate2 = { version = "1.0.20", optional = true }
-sha2 = { version = "0.9.5", optional = true }
-itertools = { version = "0.10", optional = true }
+cw3 = { workspace = true }
+cw4 = { workspace = true }
+prost = { version = "0.11", default-features = false }
+flate2 = { version = "1.0.20" }
+sha2 = { version = "0.9.5" }
+itertools = { version = "0.10" }
 zeroize = { version = "1.5.7", optional = true, features = ["zeroize_derive"] }
-cosmwasm-std = { workspace = true, optional = true }
+cosmwasm-std = { workspace = true }

 [dev-dependencies]
 bip39 = { workspace = true }
-cosmrs = { workspace = true, features = ["rpc", "bip32"] }
+#cosmrs = { workspace = true, features = ["rpc", "bip32"] }
+cosmrs = { workspace = true, features = ["bip32"] }
 tokio = { version = "1.24.1", features = ["rt-multi-thread", "macros"] }
 ts-rs = "6.1.2"

@@ -65,35 +67,23 @@ name = "offline_signing"
 # it should only really require the "signing" feature,
 # but that would require another round of refactoring to make it possible
 # (traits would need to be moved around and refactored themselves)
-required-features = ["nyxd-client"]
+required-features = ["http-client", "signing"]

 [[example]]
 name = "query_service_provider_directory"
-required-features = ["nyxd-client"]
+# TODO: validate the requirements
+required-features = ["http-client", "signing"]

 [[example]]
 name = "query_name_service"
-required-features = ["nyxd-client"]
+# TODO: validate the requirements
+required-features = ["http-client", "signing"]

 [features]
-nyxd-client = [
-    "async-trait",
-    "cosmrs",
-    "cosmwasm-std",
-    "cw3",
-    "cw4",
-    "flate2",
-    "itertools",
-    "openssl",
-    "prost",
-    "sha2",
-    "signing"
-]
+http-client = ["cosmrs/rpc", "openssl"]
 signing = [
    "bip39",
-    "cosmrs",
    "eyre",
-    "nym-config",
    "zeroize"
 ]
 generate-ts = []
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0

 use cosmrs::bank::MsgSend;
-use cosmrs::rpc::{self, HttpClient};
+use cosmrs::rpc::HttpClient;
 use cosmrs::tx::Msg;
 use cosmrs::{tx, AccountId, Coin, Denom};
 use nym_validator_client::nyxd::CosmWasmClient;
@@ -54,7 +54,7 @@ async fn main() {
            denom,
            amount: 2500u32.into(),
        },
-        100000,
+        100000u32,
    );

    let tx_raw = tx_signer
@@ -70,7 +70,7 @@ async fn main() {
        .unwrap();

    // broadcast the tx
-    let res = rpc::Client::broadcast_tx_commit(&broadcaster, tx_bytes.into())
+    let res = tendermint_rpc::client::Client::broadcast_tx_commit(&broadcaster, tx_bytes)
        .await
        .unwrap();

@@ -16,39 +16,35 @@ pub use nym_mixnet_contract_common::{
 };
 use url::Url;

-#[cfg(feature = "nyxd-client")]
-use crate::nyxd::traits::{DkgQueryClient, EphemeraQueryClient, MixnetQueryClient};
-#[cfg(feature = "nyxd-client")]
-use crate::nyxd::{self, CosmWasmClient, NyxdClient, QueryNyxdClient, SigningNyxdClient};
-#[cfg(feature = "nyxd-client")]
-use crate::signing::direct_wallet::DirectSecp256k1HdWallet;
-#[cfg(feature = "nyxd-client")]
+use crate::nyxd::traits::{DkgQueryClient, MixnetQueryClient};
+#[cfg(feature = "http-client")]
+use crate::nyxd::QueryNyxdClient;
+use crate::nyxd::{self, CosmWasmClient, NyxdClient};
 use nym_api_requests::models::MixNodeBondAnnotated;
-#[cfg(feature = "nyxd-client")]
 use nym_coconut_dkg_common::{types::EpochId, verification_key::ContractVKShare};
-#[cfg(feature = "nyxd-client")]
 use nym_coconut_interface::Base58;
-#[cfg(feature = "nyxd-client")]
-use nym_ephemera_common::types::JsonPeerInfo;
-#[cfg(feature = "nyxd-client")]
 use nym_mixnet_contract_common::{
    families::{Family, FamilyHead},
    mixnode::MixNodeBond,
    pending_events::{PendingEpochEvent, PendingIntervalEvent},
    Delegation, RewardedSetNodeStatus, UnbondedMixnode,
 };
-#[cfg(feature = "nyxd-client")]
 use nym_network_defaults::NymNetworkDetails;
-#[cfg(feature = "nyxd-client")]
 use std::str::FromStr;

-#[cfg(feature = "nyxd-client")]
+#[cfg(all(feature = "signing", feature = "http-client"))]
+use crate::nyxd::SigningNyxdClient;
+#[cfg(all(feature = "signing", feature = "http-client"))]
+use crate::signing::direct_wallet::DirectSecp256k1HdWallet;
+
 #[must_use]
 #[derive(Debug, Clone)]
 pub struct Config {
    api_url: Url,
    nyxd_url: Url,

+    // TODO: until refactored, this is a dead field under some features
+    #[allow(dead_code)]
    nyxd_config: nyxd::Config,

    mixnode_page_limit: Option<u32>,
@@ -57,7 +53,6 @@ pub struct Config {
    rewarded_set_page_limit: Option<u32>,
 }

-#[cfg(feature = "nyxd-client")]
 impl Config {
    pub fn try_from_nym_network_details(
        details: &NymNetworkDetails,
@@ -121,7 +116,6 @@ impl Config {
    }
 }

-#[cfg(feature = "nyxd-client")]
 pub struct Client<C> {
    mixnode_page_limit: Option<u32>,
    gateway_page_limit: Option<u32>,
@@ -133,7 +127,7 @@ pub struct Client<C> {
    pub nyxd: NyxdClient<C>,
 }

-#[cfg(feature = "nyxd-client")]
+#[cfg(all(feature = "signing", feature = "http-client"))]
 impl Client<SigningNyxdClient<DirectSecp256k1HdWallet>> {
    pub fn new_signing(
        config: Config,
@@ -167,7 +161,7 @@ impl Client<SigningNyxdClient<DirectSecp256k1HdWallet>> {
    }
 }

-#[cfg(feature = "nyxd-client")]
+#[cfg(feature = "http-client")]
 impl Client<QueryNyxdClient> {
    pub fn new_query(config: Config) -> Result<Client<QueryNyxdClient>, ValidatorClientError> {
        let nym_api_client = nym_api::Client::new(config.api_url.clone());
@@ -191,7 +185,6 @@ impl Client<QueryNyxdClient> {
 }

 // nyxd wrappers
-#[cfg(feature = "nyxd-client")]
 impl<C> Client<C> {
    // use case: somebody initialised client without a contract in order to upload and initialise one
    // and now they want to actually use it without making new client
@@ -571,30 +564,9 @@ impl<C> Client<C> {

        Ok(events)
    }
-
-    pub async fn get_all_ephemera_peers(&self) -> Result<Vec<JsonPeerInfo>, ValidatorClientError>
-    where
-        C: CosmWasmClient + Sync + Send,
-    {
-        let mut peers = Vec::new();
-        let mut start_after = None;
-        loop {
-            let mut paged_response = self.get_peers_paged(start_after.take(), None).await?;
-            peers.append(&mut paged_response.peers);
-
-            if let Some(start_after_res) = paged_response.start_next_after {
-                start_after = Some(start_after_res.to_string())
-            } else {
-                break;
-            }
-        }
-
-        Ok(peers)
-    }
 }

 // validator-api wrappers
-#[cfg(feature = "nyxd-client")]
 impl<C> Client<C> {
    pub fn change_nym_api(&mut self, new_endpoint: Url) {
        self.nym_api.change_url(new_endpoint)
@@ -657,11 +629,9 @@ pub struct CoconutApiClient {
    pub api_client: NymApiClient,
    pub verification_key: VerificationKey,
    pub node_id: NodeIndex,
-    #[cfg(feature = "nyxd-client")]
    pub cosmos_address: cosmrs::AccountId,
 }

-#[cfg(feature = "nyxd-client")]
 impl CoconutApiClient {
    pub async fn all_coconut_api_clients<C>(
        client: &C,
@@ -120,7 +120,7 @@ async fn test_nyxd_connection(
    )
    .await
    {
-        Ok(Err(NyxdError::TendermintError(e))) => {
+        Ok(Err(NyxdError::TendermintErrorRpc(e))) => {
            // If we get a tendermint-rpc error, we classify the node as not contactable
            log::warn!("Checking: nyxd url: {url}: {}: {}", "failed".red(), e);
            false
@@ -15,7 +15,6 @@ pub enum ValidatorClientError {
    #[error("One of the provided URLs was malformed - {0}")]
    MalformedUrlProvided(#[from] url::ParseError),

-    #[cfg(feature = "nyxd-client")]
    #[error("nyxd request failed - {0}")]
    NyxdError(#[from] crate::nyxd::error::NyxdError),

@@ -2,11 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0

 pub mod client;
-#[cfg(feature = "nyxd-client")]
+#[cfg(feature = "http-client")]
 pub mod connection_tester;
 pub mod error;
 pub mod nym_api;
-#[cfg(feature = "nyxd-client")]
 pub mod nyxd;

 #[cfg(feature = "signing")]
@@ -16,5 +15,4 @@ pub use crate::error::ValidatorClientError;
 pub use client::NymApiClient;
 pub use nym_api_requests::*;

-#[cfg(feature = "nyxd-client")]
 pub use client::{Client, CoconutApiClient, Config};
@@ -52,7 +52,6 @@ impl<'a> Div<GasPrice> for &'a Coin {
        } else {
            implicit_gas_limit.u128() as u64
        }
-        .into()
    }
 }

@@ -191,32 +190,32 @@ mod tests {
        let amount = Coin::new(3938, "unym");
        let gas_price = "0.025unym".parse().unwrap();
        let res = amount / gas_price;
-        assert_eq!(157520, res.value());
+        assert_eq!(157520, res);

        let amount = Coin::new(1234567890, "unym");
        let gas_price = "0.025unym".parse().unwrap();
        let res = amount / gas_price;
-        assert_eq!(49382715600, res.value());
+        assert_eq!(49382715600, res);

        let amount = Coin::new(1, "unym");
        let gas_price = "0.025unym".parse().unwrap();
        let res = amount / gas_price;
-        assert_eq!(40, res.value());
+        assert_eq!(40, res);

        let amount = Coin::new(150_000_000, "unym");
        let gas_price = "0.001234unym".parse().unwrap();
        let res = amount / gas_price;
-        assert_eq!(121555915721, res.value());
+        assert_eq!(121555915721, res);

        let amount = Coin::new(150_000_000, "unym");
        let gas_price = "1unym".parse().unwrap();
        let res = amount / gas_price;
-        assert_eq!(150_000_000, res.value());
+        assert_eq!(150_000_000, res);

        let amount = Coin::new(150_000_000, "unym");
        let gas_price = "1234.56unym".parse().unwrap();
        let res = amount / gas_price;
-        assert_eq!(121500, res.value());
+        assert_eq!(121500, res);
    }

    #[test]
@@ -1,15 +1,16 @@
-// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

 use crate::nyxd;
 use crate::nyxd::coin::Coin;
 use crate::nyxd::cosmwasm_client::helpers::{create_pagination, next_page_key};
 use crate::nyxd::cosmwasm_client::types::{
-    Account, Code, CodeDetails, Contract, ContractCodeHistoryEntry, ContractCodeId,
-    SequenceResponse, SimulateResponse,
+    Account, CodeDetails, Contract, ContractCodeId, SequenceResponse, SimulateResponse,
 };
 use crate::nyxd::error::NyxdError;
+use crate::nyxd::TendermintClient;
 use async_trait::async_trait;
+use cosmrs::cosmwasm::{CodeInfoResponse, ContractCodeHistoryEntry};
 use cosmrs::proto::cosmos::auth::v1beta1::{QueryAccountRequest, QueryAccountResponse};
 use cosmrs::proto::cosmos::bank::v1beta1::{
    QueryAllBalancesRequest, QueryAllBalancesResponse, QueryBalanceRequest, QueryBalanceResponse,
@@ -18,22 +19,28 @@ use cosmrs::proto::cosmos::bank::v1beta1::{
 use cosmrs::proto::cosmos::tx::v1beta1::{
    SimulateRequest, SimulateResponse as ProtoSimulateResponse,
 };
-use cosmrs::proto::cosmwasm::wasm::v1::*;
-use cosmrs::rpc::endpoint::block::Response as BlockResponse;
-use cosmrs::rpc::endpoint::broadcast;
-use cosmrs::rpc::endpoint::tx::Response as TxResponse;
-use cosmrs::rpc::query::Query;
-use cosmrs::rpc::{self, HttpClient, Order};
-use cosmrs::tendermint::abci::Transaction;
-use cosmrs::tendermint::{abci, block, chain};
-use cosmrs::{tx, AccountId, Coin as CosmosCoin, Tx};
+use cosmrs::proto::cosmwasm::wasm::v1::{
+    QueryCodeRequest, QueryCodeResponse, QueryCodesRequest, QueryCodesResponse,
+    QueryContractHistoryRequest, QueryContractHistoryResponse, QueryContractInfoRequest,
+    QueryContractInfoResponse, QueryContractsByCodeRequest, QueryContractsByCodeResponse,
+    QueryRawContractStateRequest, QueryRawContractStateResponse, QuerySmartContractStateRequest,
+    QuerySmartContractStateResponse,
+};
+use cosmrs::tendermint::{block, chain, Hash};
+use cosmrs::{AccountId, Coin as CosmosCoin, Tx};
 use prost::Message;
 use serde::{Deserialize, Serialize};
-use std::convert::{TryFrom, TryInto};
+use std::convert::TryFrom;
 use std::time::Duration;
+use tendermint_rpc::{
+    endpoint::{block::Response as BlockResponse, broadcast, tx::Response as TxResponse},
+    query::Query,
+    Order,
+};

+#[cfg(feature = "http-client")]
 #[async_trait]
-impl CosmWasmClient for HttpClient {
+impl CosmWasmClient for cosmrs::rpc::HttpClient {
    fn broadcast_polling_rate(&self) -> Duration {
        Duration::from_secs(4)
    }
@@ -44,7 +51,7 @@ impl CosmWasmClient for HttpClient {
 }

 #[async_trait]
-pub trait CosmWasmClient: rpc::Client {
+pub trait CosmWasmClient: TendermintClient {
    // this should probably get redesigned, but I'm leaving those like that temporarily to fix
    // the underlying issue more quickly
    fn broadcast_polling_rate(&self) -> Duration;
@@ -55,7 +62,7 @@ pub trait CosmWasmClient: rpc::Client {
    // require proof?
    async fn make_abci_query<Req, Res>(
        &self,
-        path: Option<abci::Path>,
+        path: Option<String>,
        req: Req,
    ) -> Result<Res, NyxdError>
    where
@@ -81,7 +88,7 @@ pub trait CosmWasmClient: rpc::Client {

    // TODO: the return type should probably be changed to a non-proto, type-safe Account alternative
    async fn get_account(&self, address: &AccountId) -> Result<Option<Account>, NyxdError> {
-        let path = Some("/cosmos.auth.v1beta1.Query/Account".parse().unwrap());
+        let path = Some("/cosmos.auth.v1beta1.Query/Account".to_owned());

        let req = QueryAccountRequest {
            address: address.to_string(),
@@ -119,7 +126,7 @@ pub trait CosmWasmClient: rpc::Client {
        address: &AccountId,
        search_denom: String,
    ) -> Result<Option<Coin>, NyxdError> {
-        let path = Some("/cosmos.bank.v1beta1.Query/Balance".parse().unwrap());
+        let path = Some("/cosmos.bank.v1beta1.Query/Balance".to_owned());

        let req = QueryBalanceRequest {
            address: address.to_string(),
@@ -137,7 +144,7 @@ pub trait CosmWasmClient: rpc::Client {
    }

    async fn get_all_balances(&self, address: &AccountId) -> Result<Vec<Coin>, NyxdError> {
-        let path = Some("/cosmos.bank.v1beta1.Query/AllBalances".parse().unwrap());
+        let path = Some("/cosmos.bank.v1beta1.Query/AllBalances".to_owned());

        let mut raw_balances = Vec::new();
        let mut pagination = None;
@@ -168,7 +175,7 @@ pub trait CosmWasmClient: rpc::Client {
    }

    async fn get_total_supply(&self) -> Result<Vec<Coin>, NyxdError> {
-        let path = Some("/cosmos.bank.v1beta1.Query/TotalSupply".parse().unwrap());
+        let path = Some("/cosmos.bank.v1beta1.Query/TotalSupply".to_owned());

        let mut supply = Vec::new();
        let mut pagination = None;
@@ -195,7 +202,7 @@ pub trait CosmWasmClient: rpc::Client {
            .map_err(|_| NyxdError::SerializationError("Coins".to_owned()))
    }

-    async fn get_tx(&self, id: tx::Hash) -> Result<TxResponse, NyxdError> {
+    async fn get_tx(&self, id: Hash) -> Result<TxResponse, NyxdError> {
        Ok(self.tx(id, false).await?)
    }

@@ -231,30 +238,36 @@ pub trait CosmWasmClient: rpc::Client {
    }

    /// Broadcast a transaction, returning immediately.
-    async fn broadcast_tx_async(
-        &self,
-        tx: Transaction,
-    ) -> Result<broadcast::tx_async::Response, NyxdError> {
-        Ok(rpc::Client::broadcast_tx_async(self, tx).await?)
+    async fn broadcast_tx_async<T>(&self, tx: T) -> Result<broadcast::tx_async::Response, NyxdError>
+    where
+        T: Into<Vec<u8>> + Send,
+    {
+        Ok(tendermint_rpc::client::Client::broadcast_tx_async(self, tx).await?)
    }

    /// Broadcast a transaction, returning the response from `CheckTx`.
-    async fn broadcast_tx_sync(
-        &self,
-        tx: Transaction,
-    ) -> Result<broadcast::tx_sync::Response, NyxdError> {
-        Ok(rpc::Client::broadcast_tx_sync(self, tx).await?)
+    async fn broadcast_tx_sync<T>(&self, tx: T) -> Result<broadcast::tx_sync::Response, NyxdError>
+    where
+        T: Into<Vec<u8>> + Send,
+    {
+        Ok(tendermint_rpc::client::Client::broadcast_tx_sync(self, tx).await?)
    }

    /// Broadcast a transaction, returning the response from `DeliverTx`.
-    async fn broadcast_tx_commit(
+    async fn broadcast_tx_commit<T>(
        &self,
-        tx: Transaction,
-    ) -> Result<broadcast::tx_commit::Response, NyxdError> {
-        Ok(rpc::Client::broadcast_tx_commit(self, tx).await?)
+        tx: T,
+    ) -> Result<broadcast::tx_commit::Response, NyxdError>
+    where
+        T: Into<Vec<u8>> + Send,
+    {
+        Ok(tendermint_rpc::client::Client::broadcast_tx_commit(self, tx).await?)
    }

-    async fn broadcast_tx(&self, tx: Transaction) -> Result<TxResponse, NyxdError> {
+    async fn broadcast_tx<T>(&self, tx: T) -> Result<TxResponse, NyxdError>
+    where
+        T: Into<Vec<u8>> + Send,
+    {
        let broadcasted = CosmWasmClient::broadcast_tx_sync(self, tx).await?;

        if broadcasted.code.is_err() {
@@ -290,8 +303,8 @@ pub trait CosmWasmClient: rpc::Client {
        }
    }

-    async fn get_codes(&self) -> Result<Vec<Code>, NyxdError> {
-        let path = Some("/cosmwasm.wasm.v1.Query/Codes".parse().unwrap());
+    async fn get_codes(&self) -> Result<Vec<CodeInfoResponse>, NyxdError> {
+        let path = Some("/cosmwasm.wasm.v1.Query/Codes".to_owned());

        let mut raw_codes = Vec::new();
        let mut pagination = None;
@@ -311,14 +324,14 @@ pub trait CosmWasmClient: rpc::Client {
            }
        }

-        raw_codes
+        Ok(raw_codes
            .into_iter()
            .map(TryFrom::try_from)
-            .collect::<Result<_, _>>()
+            .collect::<Result<_, _>>()?)
    }

    async fn get_code_details(&self, code_id: ContractCodeId) -> Result<CodeDetails, NyxdError> {
-        let path = Some("/cosmwasm.wasm.v1.Query/Code".parse().unwrap());
+        let path = Some("/cosmwasm.wasm.v1.Query/Code".to_owned());

        let req = QueryCodeRequest { code_id };

@@ -333,7 +346,7 @@ pub trait CosmWasmClient: rpc::Client {
        }
    }
    async fn get_contracts(&self, code_id: ContractCodeId) -> Result<Vec<AccountId>, NyxdError> {
-        let path = Some("/cosmwasm.wasm.v1.Query/ContractsByCode".parse().unwrap());
+        let path = Some("/cosmwasm.wasm.v1.Query/ContractsByCode".to_owned());

        let mut raw_contracts = Vec::new();
        let mut pagination = None;
@@ -364,7 +377,7 @@ pub trait CosmWasmClient: rpc::Client {
    }

    async fn get_contract(&self, address: &AccountId) -> Result<Contract, NyxdError> {
-        let path = Some("/cosmwasm.wasm.v1.Query/ContractInfo".parse().unwrap());
+        let path = Some("/cosmwasm.wasm.v1.Query/ContractInfo".to_owned());

        let req = QueryContractInfoRequest {
            address: address.to_string(),
@@ -389,7 +402,7 @@ pub trait CosmWasmClient: rpc::Client {
        &self,
        address: &AccountId,
    ) -> Result<Vec<ContractCodeHistoryEntry>, NyxdError> {
-        let path = Some("/cosmwasm.wasm.v1.Query/ContractHistory".parse().unwrap());
+        let path = Some("/cosmwasm.wasm.v1.Query/ContractHistory".to_owned());

        let mut raw_entries = Vec::new();
        let mut pagination = None;
@@ -412,10 +425,10 @@ pub trait CosmWasmClient: rpc::Client {
            }
        }

-        raw_entries
+        Ok(raw_entries
            .into_iter()
            .map(TryFrom::try_from)
-            .collect::<Result<_, _>>()
+            .collect::<Result<_, _>>()?)
    }

    async fn query_contract_raw(
@@ -423,7 +436,7 @@ pub trait CosmWasmClient: rpc::Client {
        address: &AccountId,
        query_data: Vec<u8>,
    ) -> Result<Vec<u8>, NyxdError> {
-        let path = Some("/cosmwasm.wasm.v1.Query/RawContractState".parse().unwrap());
+        let path = Some("/cosmwasm.wasm.v1.Query/RawContractState".to_owned());

        let req = QueryRawContractStateRequest {
            address: address.to_string(),
@@ -479,7 +492,7 @@ pub trait CosmWasmClient: rpc::Client {
        tx: Option<Tx>,
        tx_bytes: Vec<u8>,
    ) -> Result<SimulateResponse, NyxdError> {
-        let path = Some("/cosmos.tx.v1beta1.Service/Simulate".parse().unwrap());
+        let path = Some("/cosmos.tx.v1beta1.Service/Simulate".to_owned());

        let req = SimulateRequest {
            tx: tx.map(Into::into),
@@ -3,12 +3,7 @@

 use crate::nyxd::error::NyxdError;
 use cosmrs::proto::cosmos::base::query::v1beta1::{PageRequest, PageResponse};
-use cosmrs::proto::cosmos::base::v1beta1::Coin as ProtoCoin;
-use cosmrs::rpc::endpoint::broadcast;
-use cosmrs::Coin;
-use flate2::write::GzEncoder;
-use flate2::Compression;
-use std::io::Write;
+use tendermint_rpc::endpoint::broadcast;

 pub(crate) trait CheckResponse: Sized {
    fn check_response(self) -> Result<Self, NyxdError>;
@@ -21,7 +16,7 @@ impl CheckResponse for broadcast::tx_commit::Response {
                hash: self.hash,
                height: Some(self.height),
                code: self.check_tx.code.value(),
-                raw_log: self.check_tx.log.value().to_owned(),
+                raw_log: self.check_tx.log,
            });
        }

@@ -30,7 +25,7 @@ impl CheckResponse for broadcast::tx_commit::Response {
                hash: self.hash,
                height: Some(self.height),
                code: self.deliver_tx.code.value(),
-                raw_log: self.deliver_tx.log.value().to_owned(),
+                raw_log: self.deliver_tx.log,
            });
        }

@@ -45,7 +40,7 @@ impl CheckResponse for crate::nyxd::TxResponse {
                hash: self.hash,
                height: Some(self.height),
                code: self.tx_result.code.value(),
-                raw_log: self.tx_result.log.value().to_owned(),
+                raw_log: self.tx_result.log,
            });
        }

@@ -53,7 +48,12 @@ impl CheckResponse for crate::nyxd::TxResponse {
    }
 }

+#[cfg(feature = "signing")]
 pub(crate) fn compress_wasm_code(code: &[u8]) -> Result<Vec<u8>, NyxdError> {
+    use flate2::write::GzEncoder;
+    use flate2::Compression;
+    use std::io::Write;
+
    // using compression level 9, same as cosmjs, that optimises for size
    let mut encoder = GzEncoder::new(Vec::new(), Compression::best());
    encoder
@@ -83,14 +83,3 @@ pub(crate) fn next_page_key(pagination_info: Option<PageResponse>) -> Option<Vec

    None
 }
-
-pub(crate) fn parse_proto_coin_vec(value: Vec<ProtoCoin>) -> Result<Vec<Coin>, NyxdError> {
-    value
-        .into_iter()
-        .map(|proto_coin| {
-            Coin::try_from(&proto_coin).map_err(|_| NyxdError::MalformedCoin {
-                coin_representation: format!("{:?}", proto_coin),
-            })
-        })
-        .collect()
-}
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0

 use crate::nyxd::error::NyxdError;
-use cosmrs::tendermint::abci;
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};

@@ -49,7 +48,7 @@ fn parse_raw_str_logs(raw: &str) -> Result<Vec<Log>, NyxdError> {
    Ok(logs)
 }

-pub fn parse_raw_logs(raw: abci::Log) -> Result<Vec<Log>, NyxdError> {
+pub fn parse_raw_logs(raw: String) -> Result<Vec<Log>, NyxdError> {
    parse_raw_str_logs(raw.as_ref())
 }

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

+#[cfg(feature = "http-client")]
 use crate::nyxd::error::NyxdError;
-use crate::nyxd::GasPrice;
+#[cfg(feature = "http-client")]
 use cosmrs::rpc::{Error as TendermintRpcError, HttpClient, HttpClientUrl};
+#[cfg(feature = "http-client")]
 use std::convert::TryInto;

 pub mod client;
 mod helpers;
 pub mod logs;
-pub mod signing_client;
 pub mod types;

+#[cfg(feature = "signing")]
+pub mod signing_client;
+
+#[cfg(feature = "http-client")]
 pub fn connect<U>(endpoint: U) -> Result<HttpClient, NyxdError>
 where
    U: TryInto<HttpClientUrl, Error = TendermintRpcError>,
@@ -19,10 +24,11 @@ where
    Ok(HttpClient::new(endpoint)?)
 }

+#[cfg(all(feature = "signing", feature = "http-client"))]
 pub fn connect_with_signer<S, U: Clone>(
    endpoint: U,
    signer: S,
-    gas_price: GasPrice,
+    gas_price: crate::nyxd::GasPrice,
 ) -> Result<signing_client::Client<S>, NyxdError>
 where
    U: TryInto<HttpClientUrl, Error = TendermintRpcError>,
@@ -9,29 +9,37 @@ use crate::nyxd::error::NyxdError;
 use crate::nyxd::fee::{Fee, DEFAULT_SIMULATED_GAS_MULTIPLIER};
 use crate::nyxd::{Coin, GasAdjustable, GasPrice, TxResponse};
 use crate::signing::signer::OfflineSigner;
-use crate::signing::tx_signer::TxSigner;
 use crate::signing::SignerData;
 use async_trait::async_trait;
+use cosmrs::abci::GasInfo;
 use cosmrs::bank::MsgSend;
 use cosmrs::distribution::MsgWithdrawDelegatorReward;
 use cosmrs::feegrant::{
    AllowedMsgAllowance, BasicAllowance, MsgGrantAllowance, MsgRevokeAllowance,
 };
 use cosmrs::proto::cosmos::tx::signing::v1beta1::SignMode;
-use cosmrs::rpc::endpoint::broadcast;
-use cosmrs::rpc::{Error as TendermintRpcError, HttpClient, HttpClientUrl, SimpleRequest};
 use cosmrs::staking::{MsgDelegate, MsgUndelegate};
-use cosmrs::tx::{self, Msg, Raw};
-use cosmrs::{cosmwasm, rpc, AccountId, Any, Tx};
+use cosmrs::tx::{self, Msg};
+use cosmrs::{cosmwasm, AccountId, Any, Tx};
 use log::debug;
 use serde::Serialize;
 use sha2::Digest;
 use sha2::Sha256;
 use std::convert::TryInto;
 use std::time::{Duration, SystemTime};
+use tendermint_rpc::endpoint::broadcast;

-const DEFAULT_BROADCAST_POLLING_RATE: Duration = Duration::from_secs(4);
-const DEFAULT_BROADCAST_TIMEOUT: Duration = Duration::from_secs(60);
+#[cfg(feature = "http-client")]
+use crate::signing::tx_signer::TxSigner;
+
+#[cfg(feature = "http-client")]
+use tendermint_rpc::{Error as TendermintRpcError, SimpleRequest};
+
+#[cfg(feature = "http-client")]
+use cosmrs::rpc::{HttpClient, HttpClientUrl};
+
+pub const DEFAULT_BROADCAST_POLLING_RATE: Duration = Duration::from_secs(4);
+pub const DEFAULT_BROADCAST_TIMEOUT: Duration = Duration::from_secs(60);

 fn empty_fee() -> tx::Fee {
    tx::Fee {
@@ -123,7 +131,10 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
            .check_response()?;

        let logs = parse_raw_logs(tx_res.tx_result.log)?;
-        let gas_info = GasInfo::new(tx_res.tx_result.gas_wanted, tx_res.tx_result.gas_used);
+        let gas_info = GasInfo {
+            gas_wanted: tx_res.tx_result.gas_wanted.try_into().unwrap_or_default(),
+            gas_used: tx_res.tx_result.gas_used.try_into().unwrap_or_default(),
+        };

        // TODO: should those strings be extracted into some constants?
        // the reason I think unwrap here is fine is that if the transaction succeeded and those
@@ -184,8 +195,10 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
            .check_response()?;

        let logs = parse_raw_logs(tx_res.tx_result.log)?;
-        let gas_info = GasInfo::new(tx_res.tx_result.gas_wanted, tx_res.tx_result.gas_used);
-
+        let gas_info = GasInfo {
+            gas_wanted: tx_res.tx_result.gas_wanted.try_into().unwrap_or_default(),
+            gas_used: tx_res.tx_result.gas_used.try_into().unwrap_or_default(),
+        };
        // TODO: should those strings be extracted into some constants?
        // the reason I think unwrap here is fine is that if the transaction succeeded and those
        // fields do not exist or address is malformed, there's no way we can recover, we're probably connected
@@ -212,7 +225,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
        fee: Fee,
        memo: impl Into<String> + Send + 'static,
    ) -> Result<ChangeAdminResult, NyxdError> {
-        let change_admin_msg = cosmwasm::MsgUpdateAdmin {
+        let change_admin_msg = sealed::cosmwasm::MsgUpdateAdmin {
            sender: sender_address.clone(),
            new_admin: new_admin.clone(),
            contract: contract_address.clone(),
@@ -225,8 +238,10 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
            .await?
            .check_response()?;

-        let gas_info = GasInfo::new(tx_res.tx_result.gas_wanted, tx_res.tx_result.gas_used);
-
+        let gas_info = GasInfo {
+            gas_wanted: tx_res.tx_result.gas_wanted.try_into().unwrap_or_default(),
+            gas_used: tx_res.tx_result.gas_used.try_into().unwrap_or_default(),
+        };
        Ok(ChangeAdminResult {
            logs: parse_raw_logs(tx_res.tx_result.log)?,
            transaction_hash: tx_res.hash,
@@ -241,7 +256,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
        fee: Fee,
        memo: impl Into<String> + Send + 'static,
    ) -> Result<ChangeAdminResult, NyxdError> {
-        let change_admin_msg = cosmwasm::MsgClearAdmin {
+        let change_admin_msg = sealed::cosmwasm::MsgClearAdmin {
            sender: sender_address.clone(),
            contract: contract_address.clone(),
        }
@@ -253,8 +268,10 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
            .await?
            .check_response()?;

-        let gas_info = GasInfo::new(tx_res.tx_result.gas_wanted, tx_res.tx_result.gas_used);
-
+        let gas_info = GasInfo {
+            gas_wanted: tx_res.tx_result.gas_wanted.try_into().unwrap_or_default(),
+            gas_used: tx_res.tx_result.gas_used.try_into().unwrap_or_default(),
+        };
        Ok(ChangeAdminResult {
            logs: parse_raw_logs(tx_res.tx_result.log)?,
            transaction_hash: tx_res.hash,
@@ -288,8 +305,10 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
            .await?
            .check_response()?;

-        let gas_info = GasInfo::new(tx_res.tx_result.gas_wanted, tx_res.tx_result.gas_used);
-
+        let gas_info = GasInfo {
+            gas_wanted: tx_res.tx_result.gas_wanted.try_into().unwrap_or_default(),
+            gas_used: tx_res.tx_result.gas_used.try_into().unwrap_or_default(),
+        };
        Ok(MigrateResult {
            logs: parse_raw_logs(tx_res.tx_result.log)?,
            transaction_hash: tx_res.hash,
@@ -323,11 +342,13 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
            .await?
            .check_response()?;

-        let gas_info = GasInfo::new(tx_res.tx_result.gas_wanted, tx_res.tx_result.gas_used);
-
+        let gas_info = GasInfo {
+            gas_wanted: tx_res.tx_result.gas_wanted.try_into().unwrap_or_default(),
+            gas_used: tx_res.tx_result.gas_used.try_into().unwrap_or_default(),
+        };
        Ok(ExecuteResult {
            logs: parse_raw_logs(tx_res.tx_result.log)?,
-            data: tx_res.tx_result.data,
+            data: tx_res.tx_result.data.into(),
            transaction_hash: tx_res.hash,
            gas_info,
        })
@@ -364,11 +385,13 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
            .await?
            .check_response()?;

-        let gas_info = GasInfo::new(tx_res.tx_result.gas_wanted, tx_res.tx_result.gas_used);
-
+        let gas_info = GasInfo {
+            gas_wanted: tx_res.tx_result.gas_wanted.try_into().unwrap_or_default(),
+            gas_used: tx_res.tx_result.gas_used.try_into().unwrap_or_default(),
+        };
        Ok(ExecuteResult {
            logs: parse_raw_logs(tx_res.tx_result.log)?,
-            data: tx_res.tx_result.data,
+            data: tx_res.tx_result.data.into(),
            transaction_hash: tx_res.hash,
            gas_info,
        })
@@ -602,7 +625,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
            .to_bytes()
            .map_err(|_| NyxdError::SerializationError("Tx".to_owned()))?;

-        CosmWasmClient::broadcast_tx_async(self, tx_bytes.into()).await
+        CosmWasmClient::broadcast_tx_async(self, tx_bytes).await
    }

    /// Broadcast a transaction, returning the response from `CheckTx`.
@@ -622,7 +645,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
            .to_bytes()
            .map_err(|_| NyxdError::SerializationError("Tx".to_owned()))?;

-        CosmWasmClient::broadcast_tx_sync(self, tx_bytes.into()).await
+        CosmWasmClient::broadcast_tx_sync(self, tx_bytes).await
    }

    /// Broadcast a transaction, returning the response from `DeliverTx`.
@@ -643,7 +666,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
            .to_bytes()
            .map_err(|_| NyxdError::SerializationError("Tx".to_owned()))?;

-        CosmWasmClient::broadcast_tx_commit(self, tx_bytes.into()).await
+        CosmWasmClient::broadcast_tx_commit(self, tx_bytes).await
    }

    /// Broadcast a transaction to the network and monitors its inclusion in a block.
@@ -664,7 +687,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
            .to_bytes()
            .map_err(|_| NyxdError::SerializationError("Tx".to_owned()))?;

-        self.broadcast_tx(tx_bytes.into()).await
+        self.broadcast_tx(tx_bytes).await
    }

    async fn sign(
@@ -709,6 +732,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
    ) -> Result<tx::Raw, NyxdError>;
 }

+#[cfg(feature = "http-client")]
 #[derive(Debug)]
 pub struct Client<S> {
    // TODO: somehow nicely hide this guy if we decide to use our client in offline mode,
@@ -722,6 +746,7 @@ pub struct Client<S> {
    broadcast_timeout: Duration,
 }

+#[cfg(feature = "http-client")]
 impl<S> Client<S> {
    pub fn connect_with_signer<U: Clone>(
        endpoint: U,
@@ -770,12 +795,13 @@ impl<S> Client<S> {
    }
 }

+#[cfg(feature = "http-client")]
 #[async_trait]
-impl<S> rpc::Client for Client<S>
+impl<S> tendermint_rpc::client::Client for Client<S>
 where
    S: Send + Sync,
 {
-    async fn perform<R>(&self, request: R) -> Result<R::Response, rpc::Error>
+    async fn perform<R>(&self, request: R) -> Result<R::Output, tendermint_rpc::Error>
    where
        R: SimpleRequest,
    {
@@ -783,6 +809,7 @@ where
    }
 }

+#[cfg(feature = "http-client")]
 #[async_trait]
 impl<S> CosmWasmClient for Client<S>
 where
@@ -797,6 +824,7 @@ where
    }
 }

+#[cfg(feature = "http-client")]
 #[async_trait]
 impl<S> SigningCosmWasmClient for Client<S>
 where
@@ -820,7 +848,7 @@ where
        fee: tx::Fee,
        memo: impl Into<String> + Send + 'static,
        signer_data: SignerData,
-    ) -> Result<Raw, NyxdError> {
+    ) -> Result<tx::Raw, NyxdError> {
        Ok(self
            .tx_signer
            .sign_amino(signer_address, messages, fee, memo, signer_data)?)
@@ -833,9 +861,173 @@ where
        fee: tx::Fee,
        memo: impl Into<String> + Send + 'static,
        signer_data: SignerData,
-    ) -> Result<Raw, NyxdError> {
+    ) -> Result<tx::Raw, NyxdError> {
        Ok(self
            .tx_signer
            .sign_direct(signer_address, messages, fee, memo, signer_data)?)
    }
 }
+
+// a temporary bypass until https://github.com/cosmos/cosmos-rust/pull/419 is merged
+mod sealed {
+    pub mod cosmwasm {
+        use cosmrs::{proto, tx::Msg, AccountId, ErrorReport, Result};
+
+        /// MsgUpdateAdmin sets a new admin for a smart contract
+        #[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Ord)]
+        pub struct MsgUpdateAdmin {
+            /// Sender is the that actor that signed the messages
+            pub sender: AccountId,
+
+            /// NewAdmin address to be set
+            pub new_admin: AccountId,
+
+            /// Contract is the address of the smart contract
+            pub contract: AccountId,
+        }
+
+        impl Msg for MsgUpdateAdmin {
+            type Proto = proto::cosmwasm::wasm::v1::MsgUpdateAdmin;
+        }
+
+        impl TryFrom<proto::cosmwasm::wasm::v1::MsgUpdateAdmin> for MsgUpdateAdmin {
+            type Error = ErrorReport;
+
+            fn try_from(
+                proto: proto::cosmwasm::wasm::v1::MsgUpdateAdmin,
+            ) -> Result<MsgUpdateAdmin> {
+                MsgUpdateAdmin::try_from(&proto)
+            }
+        }
+
+        impl TryFrom<&proto::cosmwasm::wasm::v1::MsgUpdateAdmin> for MsgUpdateAdmin {
+            type Error = ErrorReport;
+
+            fn try_from(
+                proto: &proto::cosmwasm::wasm::v1::MsgUpdateAdmin,
+            ) -> Result<MsgUpdateAdmin> {
+                Ok(MsgUpdateAdmin {
+                    sender: proto.sender.parse()?,
+                    new_admin: proto.new_admin.parse()?,
+                    contract: proto.contract.parse()?,
+                })
+            }
+        }
+
+        impl From<MsgUpdateAdmin> for proto::cosmwasm::wasm::v1::MsgUpdateAdmin {
+            fn from(msg: MsgUpdateAdmin) -> proto::cosmwasm::wasm::v1::MsgUpdateAdmin {
+                proto::cosmwasm::wasm::v1::MsgUpdateAdmin::from(&msg)
+            }
+        }
+
+        impl From<&MsgUpdateAdmin> for proto::cosmwasm::wasm::v1::MsgUpdateAdmin {
+            fn from(msg: &MsgUpdateAdmin) -> proto::cosmwasm::wasm::v1::MsgUpdateAdmin {
+                proto::cosmwasm::wasm::v1::MsgUpdateAdmin {
+                    sender: msg.sender.to_string(),
+                    new_admin: msg.new_admin.to_string(),
+                    contract: msg.contract.to_string(),
+                }
+            }
+        }
+
+        /// MsgUpdateAdminResponse returns empty data
+        #[derive(Clone, Copy, Debug, Eq, PartialEq, PartialOrd, Ord)]
+        pub struct MsgUpdateAdminResponse {}
+
+        impl Msg for MsgUpdateAdminResponse {
+            type Proto = proto::cosmwasm::wasm::v1::MsgUpdateAdminResponse;
+        }
+
+        impl TryFrom<proto::cosmwasm::wasm::v1::MsgUpdateAdminResponse> for MsgUpdateAdminResponse {
+            type Error = ErrorReport;
+
+            fn try_from(
+                _proto: proto::cosmwasm::wasm::v1::MsgUpdateAdminResponse,
+            ) -> Result<MsgUpdateAdminResponse> {
+                Ok(MsgUpdateAdminResponse {})
+            }
+        }
+
+        impl From<MsgUpdateAdminResponse> for proto::cosmwasm::wasm::v1::MsgUpdateAdminResponse {
+            fn from(
+                _msg: MsgUpdateAdminResponse,
+            ) -> proto::cosmwasm::wasm::v1::MsgUpdateAdminResponse {
+                proto::cosmwasm::wasm::v1::MsgUpdateAdminResponse {}
+            }
+        }
+
+        /// MsgClearAdmin removes any admin stored for a smart contract
+        #[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Ord)]
+        pub struct MsgClearAdmin {
+            /// Sender is the that actor that signed the messages
+            pub sender: AccountId,
+
+            /// Contract is the address of the smart contract
+            pub contract: AccountId,
+        }
+
+        impl Msg for MsgClearAdmin {
+            type Proto = proto::cosmwasm::wasm::v1::MsgClearAdmin;
+        }
+
+        impl TryFrom<proto::cosmwasm::wasm::v1::MsgClearAdmin> for MsgClearAdmin {
+            type Error = ErrorReport;
+
+            fn try_from(proto: proto::cosmwasm::wasm::v1::MsgClearAdmin) -> Result<MsgClearAdmin> {
+                MsgClearAdmin::try_from(&proto)
+            }
+        }
+
+        impl TryFrom<&proto::cosmwasm::wasm::v1::MsgClearAdmin> for MsgClearAdmin {
+            type Error = ErrorReport;
+
+            fn try_from(proto: &proto::cosmwasm::wasm::v1::MsgClearAdmin) -> Result<MsgClearAdmin> {
+                Ok(MsgClearAdmin {
+                    sender: proto.sender.parse()?,
+                    contract: proto.contract.parse()?,
+                })
+            }
+        }
+
+        impl From<MsgClearAdmin> for proto::cosmwasm::wasm::v1::MsgClearAdmin {
+            fn from(msg: MsgClearAdmin) -> proto::cosmwasm::wasm::v1::MsgClearAdmin {
+                proto::cosmwasm::wasm::v1::MsgClearAdmin::from(&msg)
+            }
+        }
+
+        impl From<&MsgClearAdmin> for proto::cosmwasm::wasm::v1::MsgClearAdmin {
+            fn from(msg: &MsgClearAdmin) -> proto::cosmwasm::wasm::v1::MsgClearAdmin {
+                proto::cosmwasm::wasm::v1::MsgClearAdmin {
+                    sender: msg.sender.to_string(),
+                    contract: msg.contract.to_string(),
+                }
+            }
+        }
+
+        /// MsgClearAdminResponse returns empty data
+        #[derive(Clone, Copy, Debug, Eq, PartialEq, PartialOrd, Ord)]
+        pub struct MsgClearAdminResponse {}
+
+        impl Msg for MsgClearAdminResponse {
+            type Proto = proto::cosmwasm::wasm::v1::MsgClearAdminResponse;
+        }
+
+        impl TryFrom<proto::cosmwasm::wasm::v1::MsgClearAdminResponse> for MsgClearAdminResponse {
+            type Error = ErrorReport;
+
+            fn try_from(
+                _proto: proto::cosmwasm::wasm::v1::MsgClearAdminResponse,
+            ) -> Result<MsgClearAdminResponse> {
+                Ok(MsgClearAdminResponse {})
+            }
+        }
+
+        impl From<MsgClearAdminResponse> for proto::cosmwasm::wasm::v1::MsgClearAdminResponse {
+            fn from(
+                _msg: MsgClearAdminResponse,
+            ) -> proto::cosmwasm::wasm::v1::MsgClearAdminResponse {
+                proto::cosmwasm::wasm::v1::MsgClearAdminResponse {}
+            }
+        }
+    }
+}
@@ -3,36 +3,35 @@

 // TODO: There's a significant argument to pull those out of the package and make a PR on https://github.com/cosmos/cosmos-rust/

-use crate::nyxd::cosmwasm_client::helpers::parse_proto_coin_vec;
 use crate::nyxd::cosmwasm_client::logs::Log;
 use crate::nyxd::error::NyxdError;
-use cosmrs::crypto::PublicKey;
+use cosmrs::auth::{BaseAccount, ModuleAccount};
+use cosmrs::cosmwasm::{CodeInfoResponse, ContractInfo};
 use cosmrs::proto::cosmos::auth::v1beta1::{
    BaseAccount as ProtoBaseAccount, ModuleAccount as ProtoModuleAccount,
 };
-use cosmrs::proto::cosmos::base::abci::v1beta1::{
-    GasInfo as ProtoGasInfo, Result as ProtoAbciResult,
-};
+use cosmrs::proto::cosmos::base::abci::v1beta1::Result as ProtoAbciResult;
 use cosmrs::proto::cosmos::tx::v1beta1::SimulateResponse as ProtoSimulateResponse;
 use cosmrs::proto::cosmos::vesting::v1beta1::{
    BaseVestingAccount as ProtoBaseVestingAccount,
    ContinuousVestingAccount as ProtoContinuousVestingAccount,
-    DelayedVestingAccount as ProtoDelayedVestingAccount, Period as ProtoPeriod,
+    DelayedVestingAccount as ProtoDelayedVestingAccount,
    PeriodicVestingAccount as ProtoPeriodicVestingAccount,
    PermanentLockedAccount as ProtoPermanentLockedAccount,
 };
-use cosmrs::proto::cosmwasm::wasm::v1::{
-    CodeInfoResponse, ContractCodeHistoryEntry as ProtoContractCodeHistoryEntry,
-    ContractCodeHistoryOperationType, ContractInfo as ProtoContractInfo,
+use cosmrs::tendermint::{abci, Hash};
+use cosmrs::tx::{AccountNumber, SequenceNumber};
+use cosmrs::vesting::{
+    BaseVestingAccount, ContinuousVestingAccount, DelayedVestingAccount, PeriodicVestingAccount,
+    PermanentLockedAccount,
 };
-use cosmrs::tendermint::abci;
-use cosmrs::tendermint::abci::Data;
-use cosmrs::tx::{AccountNumber, Gas, SequenceNumber};
-use cosmrs::{tx, AccountId, Any, Coin as CosmosCoin};
+use cosmrs::{AccountId, Any, Coin as CosmosCoin};
 use prost::Message;
 use serde::Serialize;
 use std::convert::{TryFrom, TryInto};

+pub use cosmrs::abci::GasInfo;
+
 pub type ContractCodeId = u64;

 #[derive(Serialize)]
@@ -44,215 +43,6 @@ pub struct SequenceResponse {
    pub sequence: SequenceNumber,
 }

-/// BaseAccount defines a base account type. It contains all the necessary fields
-/// for basic account functionality. Any custom account type should extend this
-/// type for additional functionality (e.g. vesting).
-#[derive(Debug)]
-pub struct BaseAccount {
-    /// Bech32 account address
-    pub address: AccountId,
-    pub pubkey: Option<PublicKey>,
-    pub account_number: AccountNumber,
-    pub sequence: SequenceNumber,
-}
-
-impl TryFrom<ProtoBaseAccount> for BaseAccount {
-    type Error = NyxdError;
-
-    fn try_from(value: ProtoBaseAccount) -> Result<Self, Self::Error> {
-        let address: AccountId = value
-            .address
-            .parse()
-            .map_err(|_| NyxdError::MalformedAccountAddress(value.address.clone()))?;
-
-        let pubkey = value
-            .pub_key
-            .map(PublicKey::try_from)
-            .transpose()
-            .map_err(|_| NyxdError::InvalidPublicKey(address.clone()))?;
-
-        Ok(BaseAccount {
-            address,
-            pubkey,
-            account_number: value.account_number,
-            sequence: value.sequence,
-        })
-    }
-}
-
-/// ModuleAccount defines an account for modules that holds coins on a pool.
-#[derive(Debug)]
-pub struct ModuleAccount {
-    pub base_account: Option<BaseAccount>,
-    pub name: String,
-    pub permissions: Vec<String>,
-}
-
-impl TryFrom<ProtoModuleAccount> for ModuleAccount {
-    type Error = NyxdError;
-
-    fn try_from(value: ProtoModuleAccount) -> Result<Self, Self::Error> {
-        let base_account = value.base_account.map(TryFrom::try_from).transpose()?;
-
-        Ok(ModuleAccount {
-            base_account,
-            name: value.name,
-            permissions: value.permissions,
-        })
-    }
-}
-
-/// BaseVestingAccount implements the VestingAccount interface. It contains all
-/// the necessary fields needed for any vesting account implementation.
-#[derive(Debug)]
-pub struct BaseVestingAccount {
-    pub base_account: Option<BaseAccount>,
-    pub original_vesting: Vec<CosmosCoin>,
-    pub delegated_free: Vec<CosmosCoin>,
-    pub delegated_vesting: Vec<CosmosCoin>,
-    pub end_time: i64,
-}
-
-impl TryFrom<ProtoBaseVestingAccount> for BaseVestingAccount {
-    type Error = NyxdError;
-
-    fn try_from(value: ProtoBaseVestingAccount) -> Result<Self, Self::Error> {
-        let base_account = value.base_account.map(TryFrom::try_from).transpose()?;
-
-        let original_vesting = parse_proto_coin_vec(value.original_vesting)?;
-        let delegated_free = parse_proto_coin_vec(value.delegated_free)?;
-        let delegated_vesting = parse_proto_coin_vec(value.delegated_vesting)?;
-
-        Ok(BaseVestingAccount {
-            base_account,
-            original_vesting,
-            delegated_free,
-            delegated_vesting,
-            end_time: value.end_time,
-        })
-    }
-}
-
-/// ContinuousVestingAccount implements the VestingAccount interface. It
-/// continuously vests by unlocking coins linearly with respect to time.
-#[derive(Debug)]
-pub struct ContinuousVestingAccount {
-    pub base_vesting_account: Option<BaseVestingAccount>,
-    pub start_time: i64,
-}
-
-impl TryFrom<ProtoContinuousVestingAccount> for ContinuousVestingAccount {
-    type Error = NyxdError;
-
-    fn try_from(value: ProtoContinuousVestingAccount) -> Result<Self, Self::Error> {
-        let base_vesting_account = value
-            .base_vesting_account
-            .map(TryFrom::try_from)
-            .transpose()?;
-
-        Ok(ContinuousVestingAccount {
-            base_vesting_account,
-            start_time: value.start_time,
-        })
-    }
-}
-
-/// DelayedVestingAccount implements the VestingAccount interface. It vests all
-/// coins after a specific time, but non prior. In other words, it keeps them
-/// locked until a specified time.
-#[derive(Debug)]
-pub struct DelayedVestingAccount {
-    pub base_vesting_account: Option<BaseVestingAccount>,
-}
-
-impl TryFrom<ProtoDelayedVestingAccount> for DelayedVestingAccount {
-    type Error = NyxdError;
-
-    fn try_from(value: ProtoDelayedVestingAccount) -> Result<Self, Self::Error> {
-        let base_vesting_account = value
-            .base_vesting_account
-            .map(TryFrom::try_from)
-            .transpose()?;
-
-        Ok(DelayedVestingAccount {
-            base_vesting_account,
-        })
-    }
-}
-
-/// Period defines a length of time and amount of coins that will vest.
-#[derive(Debug)]
-pub struct Period {
-    pub length: i64,
-    pub amount: Vec<CosmosCoin>,
-}
-
-impl TryFrom<ProtoPeriod> for Period {
-    type Error = NyxdError;
-
-    fn try_from(value: ProtoPeriod) -> Result<Self, Self::Error> {
-        Ok(Period {
-            length: value.length,
-            amount: parse_proto_coin_vec(value.amount)?,
-        })
-    }
-}
-
-/// PeriodicVestingAccount implements the VestingAccount interface. It
-/// periodically vests by unlocking coins during each specified period.
-#[derive(Debug)]
-pub struct PeriodicVestingAccount {
-    pub base_vesting_account: Option<BaseVestingAccount>,
-    pub start_time: i64,
-    pub vesting_periods: Vec<Period>,
-}
-
-impl TryFrom<ProtoPeriodicVestingAccount> for PeriodicVestingAccount {
-    type Error = NyxdError;
-
-    fn try_from(value: ProtoPeriodicVestingAccount) -> Result<Self, Self::Error> {
-        let base_vesting_account = value
-            .base_vesting_account
-            .map(TryFrom::try_from)
-            .transpose()?;
-
-        let vesting_periods = value
-            .vesting_periods
-            .into_iter()
-            .map(TryFrom::try_from)
-            .collect::<Result<_, _>>()?;
-
-        Ok(PeriodicVestingAccount {
-            base_vesting_account,
-            start_time: value.start_time,
-            vesting_periods,
-        })
-    }
-}
-
-/// PermanentLockedAccount implements the VestingAccount interface. It does
-/// not ever release coins, locking them indefinitely. Coins in this account can
-/// still be used for delegating and for governance votes even while locked.
-#[derive(Debug)]
-pub struct PermanentLockedAccount {
-    pub base_vesting_account: Option<BaseVestingAccount>,
-}
-
-impl TryFrom<ProtoPermanentLockedAccount> for PermanentLockedAccount {
-    type Error = NyxdError;
-
-    fn try_from(value: ProtoPermanentLockedAccount) -> Result<Self, Self::Error> {
-        let base_vesting_account = value
-            .base_vesting_account
-            .map(TryFrom::try_from)
-            .transpose()?;
-
-        Ok(PermanentLockedAccount {
-            base_vesting_account,
-        })
-    }
-}
-
 #[derive(Debug)]
 pub enum Account {
    Base(BaseAccount),
@@ -335,183 +125,32 @@ impl TryFrom<Any> for Account {
    }
 }

-#[derive(Debug)]
-pub struct Code {
-    pub code_id: ContractCodeId,
-
-    /// Bech32 account address
-    pub creator: AccountId,
-
-    /// sha256 hash of the code stored
-    pub data_hash: Vec<u8>,
-}
-
-impl TryFrom<CodeInfoResponse> for Code {
-    type Error = NyxdError;
-
-    fn try_from(value: CodeInfoResponse) -> Result<Self, Self::Error> {
-        let CodeInfoResponse {
-            code_id,
-            creator,
-            data_hash,
-        } = value;
-
-        let creator = creator
-            .parse()
-            .map_err(|_| NyxdError::MalformedAccountAddress(creator))?;
-
-        Ok(Code {
-            code_id,
-            creator,
-            data_hash,
-        })
-    }
-}
-
 #[derive(Debug)]
 pub struct CodeDetails {
-    pub code_info: Code,
+    pub code_info: CodeInfoResponse,

    /// The original wasm bytes
    pub data: Vec<u8>,
 }

 impl CodeDetails {
-    pub fn new(code_info: Code, data: Vec<u8>) -> Self {
+    pub fn new(code_info: CodeInfoResponse, data: Vec<u8>) -> Self {
        CodeDetails { code_info, data }
    }
 }

-#[derive(Debug)]
-pub(crate) struct ContractInfo {
-    code_id: ContractCodeId,
-    creator: AccountId,
-    admin: Option<AccountId>,
-    label: String,
-}
-
-impl TryFrom<ProtoContractInfo> for ContractInfo {
-    type Error = NyxdError;
-
-    fn try_from(value: ProtoContractInfo) -> Result<Self, Self::Error> {
-        let ProtoContractInfo {
-            code_id,
-            creator,
-            admin,
-            label,
-            ..
-        } = value;
-
-        let admin = if admin.is_empty() {
-            None
-        } else {
-            Some(
-                admin
-                    .parse()
-                    .map_err(|_| NyxdError::MalformedAccountAddress(admin))?,
-            )
-        };
-
-        Ok(ContractInfo {
-            code_id,
-            creator: creator
-                .parse()
-                .map_err(|_| NyxdError::MalformedAccountAddress(creator))?,
-            admin,
-            label,
-        })
-    }
-}
-
 #[derive(Debug)]
 pub struct Contract {
    pub address: AccountId,

-    pub code_id: ContractCodeId,
-
-    /// Bech32 account address
-    pub creator: AccountId,
-
-    /// Bech32-encoded admin address
-    pub admin: Option<AccountId>,
-
-    pub label: String,
+    pub contract_info: ContractInfo,
 }

 impl Contract {
    pub(crate) fn new(address: AccountId, contract_info: ContractInfo) -> Self {
        Contract {
            address,
-            code_id: contract_info.code_id,
-            creator: contract_info.creator,
-            admin: contract_info.admin,
-            label: contract_info.label,
-        }
-    }
-}
-
-#[derive(Clone, Copy, Debug)]
-pub enum ContractCodeHistoryEntryOperation {
-    Init,
-    Genesis,
-    Migrate,
-}
-
-#[derive(Debug)]
-pub struct ContractCodeHistoryEntry {
-    /// The source of this history entry
-    pub operation: ContractCodeHistoryEntryOperation,
-    pub code_id: ContractCodeId,
-    pub msg_json: String,
-}
-
-impl TryFrom<ProtoContractCodeHistoryEntry> for ContractCodeHistoryEntry {
-    type Error = NyxdError;
-
-    fn try_from(value: ProtoContractCodeHistoryEntry) -> Result<Self, Self::Error> {
-        let operation = match ContractCodeHistoryOperationType::from_i32(value.operation)
-            .ok_or(NyxdError::InvalidContractHistoryOperation)?
-        {
-            ContractCodeHistoryOperationType::Unspecified => {
-                return Err(NyxdError::InvalidContractHistoryOperation)
-            }
-            ContractCodeHistoryOperationType::Init => ContractCodeHistoryEntryOperation::Init,
-            ContractCodeHistoryOperationType::Genesis => ContractCodeHistoryEntryOperation::Genesis,
-            ContractCodeHistoryOperationType::Migrate => ContractCodeHistoryEntryOperation::Migrate,
-        };
-
-        Ok(ContractCodeHistoryEntry {
-            operation,
-            code_id: value.code_id,
-            msg_json: String::from_utf8(value.msg)
-                .map_err(|_| NyxdError::DeserializationError("Contract history msg".to_owned()))?,
-        })
-    }
-}
-
-#[derive(Copy, Clone, Debug, Default, Eq, PartialEq, Serialize)]
-pub struct GasInfo {
-    /// GasWanted is the maximum units of work we allow this tx to perform.
-    pub gas_wanted: Gas,
-
-    /// GasUsed is the amount of gas actually consumed.
-    pub gas_used: Gas,
-}
-
-impl From<ProtoGasInfo> for GasInfo {
-    fn from(value: ProtoGasInfo) -> Self {
-        GasInfo {
-            gas_wanted: value.gas_wanted.into(),
-            gas_used: value.gas_used.into(),
-        }
-    }
-}
-
-impl GasInfo {
-    pub fn new(gas_wanted: Gas, gas_used: Gas) -> Self {
-        GasInfo {
-            gas_wanted,
-            gas_used,
+            contract_info,
        }
    }
 }
@@ -535,31 +174,15 @@ impl TryFrom<ProtoAbciResult> for AbciResult {
    type Error = NyxdError;

    fn try_from(value: ProtoAbciResult) -> Result<Self, Self::Error> {
-        let mut events = Vec::with_capacity(value.events.len());
-
-        for proto_event in value.events.into_iter() {
-            let type_str = proto_event.r#type;
-
-            let mut attributes = Vec::with_capacity(proto_event.attributes.len());
-            for proto_attribute in proto_event.attributes.into_iter() {
-                let stringified_ked = String::from_utf8(proto_attribute.key)
-                    .map_err(|_| NyxdError::DeserializationError("EventAttributeKey".to_owned()))?;
-                let stringified_value = String::from_utf8(proto_attribute.value)
-                    .map_err(|_| NyxdError::DeserializationError("EventAttributeKey".to_owned()))?;
-
-                attributes.push(abci::tag::Tag {
-                    key: stringified_ked.parse().unwrap(),
-                    value: stringified_value.parse().unwrap(),
-                })
-            }
-
-            events.push(abci::Event {
-                type_str,
-                attributes,
-            })
-        }
+        let events = value
+            .events
+            .into_iter()
+            .map(TryInto::try_into)
+            .collect::<Result<Vec<_>, _>>()?;

+        #[allow(deprecated)]
        Ok(AbciResult {
+            // TODO: make sure this actually works since technically we're converting from 0.37 protobuf definition as opposed to 0.34...
            data: value.data,
            log: value.log,
            events,
@@ -578,7 +201,10 @@ impl TryFrom<ProtoSimulateResponse> for SimulateResponse {

    fn try_from(value: ProtoSimulateResponse) -> Result<Self, Self::Error> {
        Ok(SimulateResponse {
-            gas_info: value.gas_info.map(|gas_info| gas_info.into()),
+            gas_info: value
+                .gas_info
+                .map(|gas_info| gas_info.try_into())
+                .transpose()?,
            result: value.result.map(|result| result.try_into()).transpose()?,
        })
    }
@@ -608,7 +234,7 @@ pub struct UploadResult {
    pub logs: Vec<Log>,

    /// Transaction hash (might be used as transaction ID)
-    pub transaction_hash: tx::Hash,
+    pub transaction_hash: Hash,

    pub gas_info: GasInfo,
 }
@@ -645,7 +271,7 @@ pub struct InstantiateResult {
    pub logs: Vec<Log>,

    /// Transaction hash (might be used as transaction ID)
-    pub transaction_hash: tx::Hash,
+    pub transaction_hash: Hash,

    pub gas_info: GasInfo,
 }
@@ -655,7 +281,7 @@ pub struct ChangeAdminResult {
    pub logs: Vec<Log>,

    /// Transaction hash (might be used as transaction ID)
-    pub transaction_hash: tx::Hash,
+    pub transaction_hash: Hash,

    pub gas_info: GasInfo,
 }
@@ -665,7 +291,7 @@ pub struct MigrateResult {
    pub logs: Vec<Log>,

    /// Transaction hash (might be used as transaction ID)
-    pub transaction_hash: tx::Hash,
+    pub transaction_hash: Hash,

    pub gas_info: GasInfo,
 }
@@ -674,10 +300,10 @@ pub struct MigrateResult {
 pub struct ExecuteResult {
    pub logs: Vec<Log>,

-    pub data: Data,
+    pub data: Vec<u8>,

    /// Transaction hash (might be used as transaction ID)
-    pub transaction_hash: tx::Hash,
+    pub transaction_hash: Hash,

    pub gas_info: GasInfo,
 }
@@ -2,34 +2,39 @@
 // SPDX-License-Identifier: Apache-2.0

 use crate::nyxd::cosmwasm_client::types::ContractCodeId;
+use cosmrs::tendermint::Hash;
 use cosmrs::{
-    rpc::endpoint::abci_query::AbciQuery,
-    tendermint::{
-        abci::{self, Code as AbciCode},
-        block,
-    },
-    tx, AccountId,
+    tendermint::{abci::Code as AbciCode, block},
+    AccountId,
 };
+use std::{io, time::Duration};
+use tendermint_rpc::endpoint::abci_query::AbciQuery;
 use thiserror::Error;

+#[cfg(feature = "signing")]
 use crate::signing::direct_wallet::DirectSecp256k1HdWalletError;
-pub use cosmrs::rpc::{
+
+pub use cosmrs::tendermint::error::Error as TendermintError;
+pub use tendermint_rpc::{
    error::{Error as TendermintRpcError, ErrorDetail as TendermintRpcErrorDetail},
    response_error::{Code, ResponseError},
 };
-use std::{io, time::Duration};

 #[derive(Debug, Error)]
 pub enum NyxdError {
    #[error("No contract address is available to perform the call: {0}")]
    NoContractAddressAvailable(String),

+    #[cfg(feature = "signing")]
    #[error(transparent)]
    WalletError(#[from] DirectSecp256k1HdWalletError),

-    #[error("There was an issue on the cosmrs side - {0}")]
+    #[error("There was an issue on the cosmrs side: {0}")]
    CosmrsError(#[from] cosmrs::Error),

+    #[error("There was an issue on the cosmrs side: {0}")]
+    CosmrsErrorReport(#[from] cosmrs::ErrorReport),
+
    #[error("Failed to derive account address")]
    AccountDerivationError,

@@ -43,7 +48,10 @@ pub enum NyxdError {
    InvalidTxHash(String),

    #[error("Tendermint RPC request failed - {0}")]
-    TendermintError(#[from] TendermintRpcError),
+    TendermintErrorRpc(#[from] TendermintRpcError),
+
+    #[error("tendermint library failure: {0}")]
+    TendermintError(#[from] TendermintError),

    #[error("Failed when attempting to serialize data ({0})")]
    SerializationError(String),
@@ -91,7 +99,7 @@ pub enum NyxdError {
    "Error when broadcasting tx {hash} at height {height:?}. Error occurred during CheckTx phase. Code: {code}; Raw log: {raw_log}"
    )]
    BroadcastTxErrorCheckTx {
-        hash: tx::Hash,
+        hash: Hash,
        height: Option<block::Height>,
        code: u32,
        raw_log: String,
@@ -101,7 +109,7 @@ pub enum NyxdError {
    "Error when broadcasting tx {hash} at height {height:?}. Error occurred during DeliverTx phase. Code: {code}; Raw log: {raw_log}"
    )]
    BroadcastTxErrorDeliverTx {
-        hash: tx::Hash,
+        hash: Hash,
        height: Option<block::Height>,
        code: u32,
        raw_log: String,
@@ -116,7 +124,7 @@ pub enum NyxdError {
    #[error("Abci query failed with code {code} - {log}")]
    AbciError {
        code: u32,
-        log: abci::Log,
+        log: String,
        pretty_log: Option<String>,
    },

@@ -130,7 +138,7 @@ pub enum NyxdError {
    NoBaseAccountInformationAvailable,

    #[error("Transaction with ID {hash} has been submitted but not yet found on the chain. You might want to check for it later. There was a total wait of {} seconds", .timeout.as_secs())]
-    BroadcastTimeout { hash: tx::Hash, timeout: Duration },
+    BroadcastTimeout { hash: Hash, timeout: Duration },

    #[error("Cosmwasm std error: {0}")]
    CosmwasmStdError(#[from] cosmwasm_std::StdError),
@@ -148,7 +156,7 @@ pub fn parse_abci_query_result(query_result: AbciQuery) -> Result<AbciQuery, Nyx
    match query_result.code {
        AbciCode::Ok => Ok(query_result),
        AbciCode::Err(code) => Err(NyxdError::AbciError {
-            code,
+            code: code.into(),
            log: query_result.log.clone(),
            pretty_log: try_parse_abci_log(&query_result.log),
        }),
@@ -157,11 +165,8 @@ pub fn parse_abci_query_result(query_result: AbciQuery) -> Result<AbciQuery, Nyx

 // Some of the error strings returned by the query are a bit too technical to present to the
 // enduser. So we special case some commonly encountered errors.
-fn try_parse_abci_log(log: &abci::Log) -> Option<String> {
-    if log
-        .value()
-        .contains("Maximum amount of locked coins has already been pledged")
-    {
+fn try_parse_abci_log(log: &str) -> Option<String> {
+    if log.contains("Maximum amount of locked coins has already been pledged") {
        Some("Maximum amount of locked tokens has already been used. You can only use up to 10% of your locked tokens for bonding and delegating.".to_string())
    } else {
        None
@@ -171,7 +176,7 @@ fn try_parse_abci_log(log: &abci::Log) -> Option<String> {
 impl NyxdError {
    pub fn is_tendermint_response_timeout(&self) -> bool {
        match &self {
-            NyxdError::TendermintError(TendermintRpcError(
+            NyxdError::TendermintErrorRpc(TendermintRpcError(
                TendermintRpcErrorDetail::Response(err),
                _,
            )) => {
@@ -198,7 +203,7 @@ impl NyxdError {

    pub fn is_tendermint_response_duplicate(&self) -> bool {
        match &self {
-            NyxdError::TendermintError(TendermintRpcError(
+            NyxdError::TendermintErrorRpc(TendermintRpcError(
                TendermintRpcErrorDetail::Response(err),
                _,
            )) => {
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0

 use crate::nyxd::error::NyxdError;
-use cosmrs::tx::Gas;
 use cosmrs::Coin;
+use cosmrs::Gas;
 use cosmwasm_std::{Decimal, Fraction, Uint128};
 use nym_config::defaults;
 use std::ops::Mul;
@@ -25,7 +25,7 @@ impl<'a> Mul<Gas> for &'a GasPrice {
    type Output = Coin;

    fn mul(self, gas_limit: Gas) -> Self::Output {
-        let limit_uint128 = Uint128::from(gas_limit.value());
+        let limit_uint128 = Uint128::from(gas_limit);
        let mut amount = self.amount * limit_uint128;

        let gas_price_numerator = self.amount.numerator();
@@ -122,7 +122,7 @@ mod tests {
    fn gas_limit_multiplication() {
        // real world example that caused an issue when the result was rounded down
        let gas_price: GasPrice = "0.025upunk".parse().unwrap();
-        let gas_limit: Gas = 157500u64.into();
+        let gas_limit: Gas = 157500u64;

        let fee = &gas_price * gas_limit;
        // the failing behaviour was result value of 3937
@@ -116,8 +116,8 @@ impl GasAdjustable for Gas {
        if adjustment == 1.0 {
            *self
        } else {
-            let adjusted = (self.value() as f32 * adjustment).ceil();
-            (adjusted as u64).into()
+            let adjusted = (*self as f32 * adjustment).ceil();
+            adjusted as u64
        }
    }
 }
@@ -125,9 +125,9 @@ impl GasAdjustable for Gas {
 // a workaround to provide serde implementation for tx::Fee. We don't want to ever expose any of those
 // types to the public and ideally they will get replaced by proper implementation inside comrs
 mod sealed {
-    use cosmrs::tx::{self, Gas};
-    use cosmrs::Coin as CosmosCoin;
+    use cosmrs::tx::{self};
    use cosmrs::{AccountId, Denom as CosmosDenom};
+    use cosmrs::{Coin as CosmosCoin, Gas};
    use serde::{Deserialize, Deserializer, Serialize, Serializer};

    #[derive(Serialize, Deserialize, Clone)]
@@ -1,51 +1,67 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::nyxd::cosmwasm_client::signing_client;
-use crate::nyxd::cosmwasm_client::types::{
-    Account, ChangeAdminResult, ContractCodeId, ExecuteResult, InstantiateOptions,
-    InstantiateResult, MigrateResult, SequenceResponse, SimulateResponse, UploadResult,
-};
+use crate::nyxd::cosmwasm_client::types::Account;
 use crate::nyxd::error::NyxdError;
-use crate::nyxd::fee::DEFAULT_SIMULATED_GAS_MULTIPLIER;
-use crate::signing::direct_wallet::DirectSecp256k1HdWallet;
-use crate::signing::signer::OfflineSigner;
-use cosmrs::cosmwasm;
-use cosmrs::rpc::endpoint::block::Response as BlockResponse;
-use cosmrs::rpc::query::Query;
-use cosmrs::rpc::Error as TendermintRpcError;
-use cosmrs::rpc::HttpClientUrl;
-use cosmrs::tx::Msg;
 use log::{debug, trace};
 use nym_network_defaults::{ChainDetails, NymNetworkDetails};
 use serde::{Deserialize, Serialize};
-use std::convert::TryInto;
-use std::time::SystemTime;
+use tendermint_rpc::{endpoint::block::Response as BlockResponse, query::Query};
+
+#[cfg(feature = "http-client")]
+use tendermint_rpc::Error as TendermintRpcError;

 pub use crate::nyxd::cosmwasm_client::client::CosmWasmClient;
-pub use crate::nyxd::cosmwasm_client::signing_client::SigningCosmWasmClient;
 pub use crate::nyxd::fee::Fee;
 pub use coin::Coin;
 pub use cosmrs::bank::MsgSend;
-pub use cosmrs::rpc::endpoint::tx::Response as TxResponse;
-pub use cosmrs::rpc::endpoint::validators::Response as ValidatorResponse;
-pub use cosmrs::rpc::HttpClient as QueryNyxdClient;
-pub use cosmrs::rpc::Paging;
-pub use cosmrs::tendermint::abci::responses::{DeliverTx, Event};
-pub use cosmrs::tendermint::abci::tag::Tag;
+pub use cosmrs::tendermint::abci::{response::DeliverTx, Event, EventAttribute};
 pub use cosmrs::tendermint::block::Height;
-pub use cosmrs::tendermint::hash;
+pub use cosmrs::tendermint::hash::{self, Algorithm, Hash};
 pub use cosmrs::tendermint::validator::Info as TendermintValidatorInfo;
 pub use cosmrs::tendermint::Time as TendermintTime;
-pub use cosmrs::tx::{self, Gas};
+pub use cosmrs::tx::{self};
 pub use cosmrs::Coin as CosmosCoin;
+pub use cosmrs::Gas;
 pub use cosmrs::{bip32, AccountId, Denom};
-use cosmwasm_std::Addr;
 pub use cosmwasm_std::Coin as CosmWasmCoin;
 pub use fee::{gas_price::GasPrice, GasAdjustable, GasAdjustment};
-pub use signing_client::Client as SigningNyxdClient;
-pub use traits::{VestingQueryClient, VestingSigningClient};
+pub use tendermint_rpc::{client::Client as TendermintClient, Request, Response, SimpleRequest};
+pub use tendermint_rpc::{
+    endpoint::{tx::Response as TxResponse, validators::Response as ValidatorResponse},
+    Paging,
+};

+#[cfg(feature = "http-client")]
+pub use cosmrs::rpc::{HttpClient as QueryNyxdClient, HttpClientUrl};
+
+#[cfg(all(feature = "signing", feature = "http-client"))]
+use crate::nyxd::cosmwasm_client::signing_client;
+#[cfg(feature = "signing")]
+use crate::nyxd::cosmwasm_client::types::{
+    ChangeAdminResult, ContractCodeId, ExecuteResult, InstantiateOptions, InstantiateResult,
+    MigrateResult, SequenceResponse, SimulateResponse, UploadResult,
+};
+#[cfg(all(feature = "signing", feature = "http-client"))]
+use crate::signing::direct_wallet::DirectSecp256k1HdWallet;
+#[cfg(all(feature = "signing", feature = "http-client"))]
+use crate::signing::signer::OfflineSigner;
+#[cfg(feature = "signing")]
+use cosmrs::cosmwasm;
+#[cfg(feature = "signing")]
+use cosmrs::tx::Msg;
+#[cfg(feature = "signing")]
+use cosmwasm_std::Addr;
+#[cfg(feature = "signing")]
+use std::time::SystemTime;
+
+#[cfg(feature = "signing")]
+pub use crate::nyxd::cosmwasm_client::signing_client::SigningCosmWasmClient;
+
+#[cfg(all(feature = "signing", feature = "http-client"))]
+pub use signing_client::Client as SigningNyxdClient;
+
+#[cfg(all(feature = "signing", feature = "http-client"))]
 pub type DirectSigningNyxdClient = SigningNyxdClient<DirectSecp256k1HdWallet>;

 pub mod coin;
@@ -67,7 +83,6 @@ pub struct Config {
    pub(crate) group_contract_address: Option<AccountId>,
    pub(crate) multisig_contract_address: Option<AccountId>,
    pub(crate) coconut_dkg_contract_address: Option<AccountId>,
-    pub(crate) ephemera_contract_address: Option<AccountId>,
    pub(crate) service_provider_contract_address: Option<AccountId>,
    pub(crate) name_service_contract_address: Option<AccountId>,
    // TODO: add this in later commits
@@ -134,10 +149,6 @@ impl Config {
                details.contracts.coconut_dkg_contract_address.as_ref(),
                prefix,
            )?,
-            ephemera_contract_address: Self::parse_optional_account(
-                details.contracts.ephemera_contract_address.as_ref(),
-                prefix,
-            )?,
            service_provider_contract_address: Self::parse_optional_account(
                details
                    .contracts
@@ -157,10 +168,13 @@ impl Config {
 pub struct NyxdClient<C> {
    client: C,
    config: Config,
+    // TODO: refactor because that field is only really used for signing
+    #[allow(dead_code)]
    client_address: Option<Vec<AccountId>>,
    simulated_gas_multiplier: f32,
 }

+#[cfg(feature = "http-client")]
 impl NyxdClient<QueryNyxdClient> {
    pub fn connect<U>(config: Config, endpoint: U) -> Result<NyxdClient<QueryNyxdClient>, NyxdError>
    where
@@ -170,11 +184,12 @@ impl NyxdClient<QueryNyxdClient> {
            client: QueryNyxdClient::new(endpoint)?,
            config,
            client_address: None,
-            simulated_gas_multiplier: DEFAULT_SIMULATED_GAS_MULTIPLIER,
+            simulated_gas_multiplier: crate::nyxd::fee::DEFAULT_SIMULATED_GAS_MULTIPLIER,
        })
    }
 }

+#[cfg(all(feature = "signing", feature = "http-client"))]
 impl NyxdClient<SigningNyxdClient<DirectSecp256k1HdWallet>> {
    // TODO: rename this one
    pub fn connect_with_mnemonic<U: Clone>(
@@ -192,12 +207,14 @@ impl NyxdClient<SigningNyxdClient<DirectSecp256k1HdWallet>> {
    }
 }

+#[cfg(all(feature = "signing", feature = "http-client"))]
 impl<S> NyxdClient<SigningNyxdClient<S>>
 where
    S: OfflineSigner,
    // I have no idea why S::Error: Into<NyxdError> bound wouldn't do the trick
    NyxdError: From<S::Error>,
 {
+    #[cfg(feature = "http-client")]
    pub fn connect_with_signer<U: Clone>(
        config: Config,
        endpoint: U,
@@ -219,10 +236,11 @@ where
            client: SigningNyxdClient::connect_with_signer(endpoint, signer, gas_price)?,
            config,
            client_address: Some(client_address),
-            simulated_gas_multiplier: DEFAULT_SIMULATED_GAS_MULTIPLIER,
+            simulated_gas_multiplier: crate::nyxd::fee::DEFAULT_SIMULATED_GAS_MULTIPLIER,
        })
    }

+    #[cfg(feature = "http-client")]
    pub fn change_endpoint<U>(&mut self, new_endpoint: U) -> Result<(), NyxdError>
    where
        U: TryInto<HttpClientUrl, Error = TendermintRpcError>,
@@ -235,145 +253,47 @@ where
    }
 }

-impl<C> NyxdClient<C> {
-    pub fn current_config(&self) -> &Config {
-        &self.config
-    }
-
-    pub fn current_chain_details(&self) -> &ChainDetails {
-        &self.config.chain_details
-    }
-
-    pub fn set_mixnet_contract_address(&mut self, address: AccountId) {
-        self.config.mixnet_contract_address = Some(address);
-    }
-
-    pub fn set_vesting_contract_address(&mut self, address: AccountId) {
-        self.config.vesting_contract_address = Some(address);
-    }
-
-    pub fn set_bandwidth_claim_contract_address(&mut self, address: AccountId) {
-        self.config.bandwidth_claim_contract_address = Some(address);
-    }
-
-    pub fn set_coconut_bandwidth_contract_address(&mut self, address: AccountId) {
-        self.config.coconut_bandwidth_contract_address = Some(address);
-    }
-
-    pub fn set_multisig_contract_address(&mut self, address: AccountId) {
-        self.config.multisig_contract_address = Some(address);
-    }
-
-    pub fn set_service_provider_contract_address(&mut self, address: AccountId) {
-        self.config.service_provider_contract_address = Some(address);
-    }
-
-    pub fn set_ephemera_contract_address(&mut self, address: AccountId) {
-        self.config.ephemera_contract_address = Some(address);
-    }
-
-    // TODO: this should get changed into Result<&AccountId, NyxdError> (or Option<&AccountId> in future commits
-    // note: what unwrap is doing here is just moving a failure that would have normally
-    // occurred in `connect` when attempting to parse an empty address,
-    // so it's not introducing new source of failure (just moves it)
-    pub fn mixnet_contract_address(&self) -> &AccountId {
-        self.config.mixnet_contract_address.as_ref().unwrap()
-    }
-
-    // TODO: this should get changed into Result<&AccountId, NyxdError> (or Option<&AccountId> in future commits
-    // note: what unwrap is doing here is just moving a failure that would have normally
-    // occurred in `connect` when attempting to parse an empty address,
-    // so it's not introducing new source of failure (just moves it)
-    pub fn vesting_contract_address(&self) -> &AccountId {
-        self.config.vesting_contract_address.as_ref().unwrap()
-    }
-
-    // TODO: this should get changed into Result<&AccountId, NyxdError> (or Option<&AccountId> in future commits
-    // note: what unwrap is doing here is just moving a failure that would have normally
-    // occurred in `connect` when attempting to parse an empty address,
-    // so it's not introducing new source of failure (just moves it)
-    pub fn bandwidth_claim_contract_address(&self) -> &AccountId {
-        self.config
-            .bandwidth_claim_contract_address
-            .as_ref()
-            .unwrap()
-    }
-
-    // TODO: this should get changed into Result<&AccountId, NyxdError> (or Option<&AccountId> in future commits
-    // note: what unwrap is doing here is just moving a failure that would have normally
-    // occurred in `connect` when attempting to parse an empty address,
-    // so it's not introducing new source of failure (just moves it)
-    pub fn coconut_bandwidth_contract_address(&self) -> &AccountId {
-        self.config
-            .coconut_bandwidth_contract_address
-            .as_ref()
-            .unwrap()
-    }
-
-    pub fn group_contract_address(&self) -> &AccountId {
-        self.config.group_contract_address.as_ref().unwrap()
-    }
-
-    // TODO: this should get changed into Result<&AccountId, NyxdError> (or Option<&AccountId> in future commits
-    // note: what unwrap is doing here is just moving a failure that would have normally
-    // occurred in `connect` when attempting to parse an empty address,
-    // so it's not introducing new source of failure (just moves it)
-    pub fn multisig_contract_address(&self) -> &AccountId {
-        self.config.multisig_contract_address.as_ref().unwrap()
-    }
-
-    // TODO: this should get changed into Result<&AccountId, NyxdError> (or Option<&AccountId> in future commits
-    // note: what unwrap is doing here is just moving a failure that would have normally
-    // occurred in `connect` when attempting to parse an empty address,
-    // so it's not introducing new source of failure (just moves it)
-    pub fn coconut_dkg_contract_address(&self) -> &AccountId {
-        self.config.coconut_dkg_contract_address.as_ref().unwrap()
-    }
-
-    // TODO: this should get changed into Result<&AccountId, NyxdError> (or Option<&AccountId> in future commits
-    // note: what unwrap is doing here is just moving a failure that would have normally
-    // occurred in `connect` when attempting to parse an empty address,
-    // so it's not introducing new source of failure (just moves it)
-    pub fn ephemera_contract_address(&self) -> &AccountId {
-        self.config.ephemera_contract_address.as_ref().unwrap()
-    }
-
-    // The service provider directory contract is optional, so we return an Option not a Result
-    pub fn service_provider_contract_address(&self) -> Option<&AccountId> {
-        self.config.service_provider_contract_address.as_ref()
-    }
-
-    // The name service contract is optional, so we return an Option not a Result
-    pub fn name_service_contract_address(&self) -> Option<&AccountId> {
-        self.config.name_service_contract_address.as_ref()
-    }
-
-    pub fn set_simulated_gas_multiplier(&mut self, multiplier: f32) {
-        self.simulated_gas_multiplier = multiplier;
-    }
-
-    pub async fn query_contract_smart<M, T>(
-        &self,
-        contract: &AccountId,
-        query_msg: &M,
-    ) -> Result<T, NyxdError>
+#[cfg(feature = "signing")]
+impl<C> NyxdClient<C>
+where
+    C: SigningCosmWasmClient + Sync,
+{
+    pub fn address(&self) -> &AccountId
    where
-        C: CosmWasmClient + Sync,
-        M: ?Sized + Serialize + Sync,
-        for<'a> T: Deserialize<'a>,
+        C: SigningCosmWasmClient,
    {
-        self.client.query_contract_smart(contract, query_msg).await
+        // if this is a signing client (as required by the trait bound), it must have the address set
+        &self.client_address.as_ref().unwrap()[0]
    }

-    pub async fn query_contract_raw(
-        &self,
-        contract: &AccountId,
-        query_data: Vec<u8>,
-    ) -> Result<Vec<u8>, NyxdError>
+    pub fn cw_address(&self) -> Addr
    where
-        C: CosmWasmClient + Sync,
+        C: SigningCosmWasmClient,
    {
-        self.client.query_contract_raw(contract, query_data).await
+        // the call to unchecked is fine here as we're converting directly from `AccountId`
+        // which must have been a valid bech32 address
+        Addr::unchecked(self.address().as_ref())
+    }
+
+    pub async fn account_sequence(&self) -> Result<SequenceResponse, NyxdError>
+    where
+        C: SigningCosmWasmClient + Sync,
+    {
+        self.client.get_sequence(self.address()).await
+    }
+
+    pub fn signer(&self) -> &<C as SigningCosmWasmClient>::Signer
+    where
+        C: SigningCosmWasmClient,
+    {
+        self.client.signer()
+    }
+
+    pub fn gas_price(&self) -> &GasPrice
+    where
+        C: SigningCosmWasmClient,
+    {
+        self.client.gas_price()
    }

    pub fn wrap_contract_execute_message<M>(
@@ -394,175 +314,6 @@ impl<C> NyxdClient<C> {
        })
    }

-    pub fn address(&self) -> &AccountId
-    where
-        C: SigningCosmWasmClient,
-    {
-        // if this is a signing client (as required by the trait bound), it must have the address set
-        &self.client_address.as_ref().unwrap()[0]
-    }
-
-    pub fn cw_address(&self) -> Addr
-    where
-        C: SigningCosmWasmClient,
-    {
-        // the call to unchecked is fine here as we're converting directly from `AccountId`
-        // which must have been a valid bech32 address
-        Addr::unchecked(self.address().as_ref())
-    }
-
-    pub fn signer(&self) -> &<C as SigningCosmWasmClient>::Signer
-    where
-        C: SigningCosmWasmClient,
-    {
-        self.client.signer()
-    }
-
-    pub fn gas_price(&self) -> &GasPrice
-    where
-        C: SigningCosmWasmClient,
-    {
-        self.client.gas_price()
-    }
-
-    pub fn gas_adjustment(&self) -> GasAdjustment {
-        self.simulated_gas_multiplier
-    }
-
-    // =============
-    // CHAIN RELATED
-    // =============
-
-    // CHAIN QUERIES
-
-    pub async fn account_sequence(&self) -> Result<SequenceResponse, NyxdError>
-    where
-        C: SigningCosmWasmClient + Sync,
-    {
-        self.client.get_sequence(self.address()).await
-    }
-
-    pub async fn get_account_details(
-        &self,
-        address: &AccountId,
-    ) -> Result<Option<Account>, NyxdError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        self.client.get_account(address).await
-    }
-
-    pub async fn get_account_public_key(
-        &self,
-        address: &AccountId,
-    ) -> Result<Option<cosmrs::crypto::PublicKey>, NyxdError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        if let Some(account) = self.client.get_account(address).await? {
-            let base_account = account.try_get_base_account()?;
-            return Ok(base_account.pubkey);
-        }
-
-        Ok(None)
-    }
-
-    pub async fn get_current_block_timestamp(&self) -> Result<TendermintTime, NyxdError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        self.get_block_timestamp(None).await
-    }
-
-    pub async fn get_block_timestamp(
-        &self,
-        height: Option<u32>,
-    ) -> Result<TendermintTime, NyxdError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        Ok(self.client.get_block(height).await?.block.header.time)
-    }
-
-    pub async fn get_block(&self, height: Option<u32>) -> Result<BlockResponse, NyxdError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        self.client.get_block(height).await
-    }
-
-    pub async fn get_current_block_height(&self) -> Result<Height, NyxdError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        self.client.get_height().await
-    }
-
-    /// Obtains the hash of a block specified by the provided height.
-    ///
-    /// # Arguments
-    ///
-    /// * `height`: height of the block for which we want to obtain the hash.
-    pub async fn get_block_hash(&self, height: u32) -> Result<hash::Hash, NyxdError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        self.client
-            .get_block(Some(height))
-            .await
-            .map(|block| block.block_id.hash)
-    }
-
-    pub async fn get_validators(
-        &self,
-        height: u64,
-        paging: Paging,
-    ) -> Result<ValidatorResponse, NyxdError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        Ok(self.client.validators(height as u32, paging).await?)
-    }
-
-    pub async fn get_balance(
-        &self,
-        address: &AccountId,
-        denom: String,
-    ) -> Result<Option<Coin>, NyxdError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        self.client.get_balance(address, denom).await
-    }
-
-    pub async fn get_all_balances(&self, address: &AccountId) -> Result<Vec<Coin>, NyxdError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        self.client.get_all_balances(address).await
-    }
-
-    pub async fn get_tx(&self, id: tx::Hash) -> Result<TxResponse, NyxdError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        self.client.get_tx(id).await
-    }
-
-    pub async fn search_tx(&self, query: Query) -> Result<Vec<TxResponse>, NyxdError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        self.client.search_tx(query).await
-    }
-
-    pub async fn get_total_supply(&self) -> Result<Vec<Coin>, NyxdError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        self.client.get_total_supply().await
-    }
-
    pub async fn simulate<I, M>(&self, messages: I) -> Result<SimulateResponse, NyxdError>
    where
        C: SigningCosmWasmClient + Sync,
@@ -779,3 +530,264 @@ impl<C> NyxdClient<C> {
            .await
    }
 }
+
+impl<C> NyxdClient<C> {
+    pub fn current_config(&self) -> &Config {
+        &self.config
+    }
+
+    pub fn current_chain_details(&self) -> &ChainDetails {
+        &self.config.chain_details
+    }
+
+    pub fn set_mixnet_contract_address(&mut self, address: AccountId) {
+        self.config.mixnet_contract_address = Some(address);
+    }
+
+    pub fn set_vesting_contract_address(&mut self, address: AccountId) {
+        self.config.vesting_contract_address = Some(address);
+    }
+
+    pub fn set_bandwidth_claim_contract_address(&mut self, address: AccountId) {
+        self.config.bandwidth_claim_contract_address = Some(address);
+    }
+
+    pub fn set_coconut_bandwidth_contract_address(&mut self, address: AccountId) {
+        self.config.coconut_bandwidth_contract_address = Some(address);
+    }
+
+    pub fn set_multisig_contract_address(&mut self, address: AccountId) {
+        self.config.multisig_contract_address = Some(address);
+    }
+
+    pub fn set_service_provider_contract_address(&mut self, address: AccountId) {
+        self.config.service_provider_contract_address = Some(address);
+    }
+
+    // TODO: this should get changed into Result<&AccountId, NyxdError> (or Option<&AccountId> in future commits
+    // note: what unwrap is doing here is just moving a failure that would have normally
+    // occurred in `connect` when attempting to parse an empty address,
+    // so it's not introducing new source of failure (just moves it)
+    pub fn mixnet_contract_address(&self) -> &AccountId {
+        self.config.mixnet_contract_address.as_ref().unwrap()
+    }
+
+    // TODO: this should get changed into Result<&AccountId, NyxdError> (or Option<&AccountId> in future commits
+    // note: what unwrap is doing here is just moving a failure that would have normally
+    // occurred in `connect` when attempting to parse an empty address,
+    // so it's not introducing new source of failure (just moves it)
+    pub fn vesting_contract_address(&self) -> &AccountId {
+        self.config.vesting_contract_address.as_ref().unwrap()
+    }
+
+    // TODO: this should get changed into Result<&AccountId, NyxdError> (or Option<&AccountId> in future commits
+    // note: what unwrap is doing here is just moving a failure that would have normally
+    // occurred in `connect` when attempting to parse an empty address,
+    // so it's not introducing new source of failure (just moves it)
+    pub fn bandwidth_claim_contract_address(&self) -> &AccountId {
+        self.config
+            .bandwidth_claim_contract_address
+            .as_ref()
+            .unwrap()
+    }
+
+    // TODO: this should get changed into Result<&AccountId, NyxdError> (or Option<&AccountId> in future commits
+    // note: what unwrap is doing here is just moving a failure that would have normally
+    // occurred in `connect` when attempting to parse an empty address,
+    // so it's not introducing new source of failure (just moves it)
+    pub fn coconut_bandwidth_contract_address(&self) -> &AccountId {
+        self.config
+            .coconut_bandwidth_contract_address
+            .as_ref()
+            .unwrap()
+    }
+
+    pub fn group_contract_address(&self) -> &AccountId {
+        self.config.group_contract_address.as_ref().unwrap()
+    }
+
+    // TODO: this should get changed into Result<&AccountId, NyxdError> (or Option<&AccountId> in future commits
+    // note: what unwrap is doing here is just moving a failure that would have normally
+    // occurred in `connect` when attempting to parse an empty address,
+    // so it's not introducing new source of failure (just moves it)
+    pub fn multisig_contract_address(&self) -> &AccountId {
+        self.config.multisig_contract_address.as_ref().unwrap()
+    }
+
+    // TODO: this should get changed into Result<&AccountId, NyxdError> (or Option<&AccountId> in future commits
+    // note: what unwrap is doing here is just moving a failure that would have normally
+    // occurred in `connect` when attempting to parse an empty address,
+    // so it's not introducing new source of failure (just moves it)
+    pub fn coconut_dkg_contract_address(&self) -> &AccountId {
+        self.config.coconut_dkg_contract_address.as_ref().unwrap()
+    }
+
+    // The service provider directory contract is optional, so we return an Option not a Result
+    pub fn service_provider_contract_address(&self) -> Option<&AccountId> {
+        self.config.service_provider_contract_address.as_ref()
+    }
+
+    // The name service contract is optional, so we return an Option not a Result
+    pub fn name_service_contract_address(&self) -> Option<&AccountId> {
+        self.config.name_service_contract_address.as_ref()
+    }
+
+    pub fn set_simulated_gas_multiplier(&mut self, multiplier: f32) {
+        self.simulated_gas_multiplier = multiplier;
+    }
+
+    pub async fn query_contract_smart<M, T>(
+        &self,
+        contract: &AccountId,
+        query_msg: &M,
+    ) -> Result<T, NyxdError>
+    where
+        C: CosmWasmClient + Sync,
+        M: ?Sized + Serialize + Sync,
+        for<'a> T: Deserialize<'a>,
+    {
+        self.client.query_contract_smart(contract, query_msg).await
+    }
+
+    pub async fn query_contract_raw(
+        &self,
+        contract: &AccountId,
+        query_data: Vec<u8>,
+    ) -> Result<Vec<u8>, NyxdError>
+    where
+        C: CosmWasmClient + Sync,
+    {
+        self.client.query_contract_raw(contract, query_data).await
+    }
+
+    pub fn gas_adjustment(&self) -> GasAdjustment {
+        self.simulated_gas_multiplier
+    }
+
+    // =============
+    // CHAIN RELATED
+    // =============
+
+    // CHAIN QUERIES
+
+    pub async fn get_account_details(
+        &self,
+        address: &AccountId,
+    ) -> Result<Option<Account>, NyxdError>
+    where
+        C: CosmWasmClient + Sync,
+    {
+        self.client.get_account(address).await
+    }
+
+    pub async fn get_account_public_key(
+        &self,
+        address: &AccountId,
+    ) -> Result<Option<cosmrs::crypto::PublicKey>, NyxdError>
+    where
+        C: CosmWasmClient + Sync,
+    {
+        if let Some(account) = self.client.get_account(address).await? {
+            let base_account = account.try_get_base_account()?;
+            return Ok(base_account.pubkey);
+        }
+
+        Ok(None)
+    }
+
+    pub async fn get_current_block_timestamp(&self) -> Result<TendermintTime, NyxdError>
+    where
+        C: CosmWasmClient + Sync,
+    {
+        self.get_block_timestamp(None).await
+    }
+
+    pub async fn get_block_timestamp(
+        &self,
+        height: Option<u32>,
+    ) -> Result<TendermintTime, NyxdError>
+    where
+        C: CosmWasmClient + Sync,
+    {
+        Ok(self.client.get_block(height).await?.block.header.time)
+    }
+
+    pub async fn get_block(&self, height: Option<u32>) -> Result<BlockResponse, NyxdError>
+    where
+        C: CosmWasmClient + Sync,
+    {
+        self.client.get_block(height).await
+    }
+
+    pub async fn get_current_block_height(&self) -> Result<Height, NyxdError>
+    where
+        C: CosmWasmClient + Sync,
+    {
+        self.client.get_height().await
+    }
+
+    /// Obtains the hash of a block specified by the provided height.
+    ///
+    /// # Arguments
+    ///
+    /// * `height`: height of the block for which we want to obtain the hash.
+    pub async fn get_block_hash(&self, height: u32) -> Result<Hash, NyxdError>
+    where
+        C: CosmWasmClient + Sync,
+    {
+        self.client
+            .get_block(Some(height))
+            .await
+            .map(|block| block.block_id.hash)
+    }
+
+    pub async fn get_validators(
+        &self,
+        height: u64,
+        paging: Paging,
+    ) -> Result<ValidatorResponse, NyxdError>
+    where
+        C: CosmWasmClient + Sync,
+    {
+        Ok(self.client.validators(height as u32, paging).await?)
+    }
+
+    pub async fn get_balance(
+        &self,
+        address: &AccountId,
+        denom: String,
+    ) -> Result<Option<Coin>, NyxdError>
+    where
+        C: CosmWasmClient + Sync,
+    {
+        self.client.get_balance(address, denom).await
+    }
+
+    pub async fn get_all_balances(&self, address: &AccountId) -> Result<Vec<Coin>, NyxdError>
+    where
+        C: CosmWasmClient + Sync,
+    {
+        self.client.get_all_balances(address).await
+    }
+
+    pub async fn get_tx(&self, id: Hash) -> Result<TxResponse, NyxdError>
+    where
+        C: CosmWasmClient + Sync,
+    {
+        self.client.get_tx(id).await
+    }
+
+    pub async fn search_tx(&self, query: Query) -> Result<Vec<TxResponse>, NyxdError>
+    where
+        C: CosmWasmClient + Sync,
+    {
+        self.client.search_tx(query).await
+    }
+
+    pub async fn get_total_supply(&self) -> Result<Vec<Coin>, NyxdError>
+    where
+        C: CosmWasmClient + Sync,
+    {
+        self.client.get_total_supply().await
+    }
+}
@@ -1,53 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::nyxd::error::NyxdError;
-use crate::nyxd::{CosmWasmClient, NyxdClient};
-use async_trait::async_trait;
-use nym_ephemera_common::msg::QueryMsg as EphemeraQueryMsg;
-use nym_ephemera_common::peers::PagedPeerResponse;
-use serde::Deserialize;
-
-#[async_trait]
-pub trait EphemeraQueryClient {
-    async fn query_ephemera_contract<T>(&self, query: EphemeraQueryMsg) -> Result<T, NyxdError>
-    where
-        for<'a> T: Deserialize<'a>;
-
-    async fn get_peers_paged(
-        &self,
-        start_after: Option<String>,
-        limit: Option<u32>,
-    ) -> Result<PagedPeerResponse, NyxdError> {
-        let request = EphemeraQueryMsg::GetPeers { start_after, limit };
-        self.query_ephemera_contract(request).await
-    }
-}
-
-#[async_trait]
-impl<C> EphemeraQueryClient for NyxdClient<C>
-where
-    C: CosmWasmClient + Send + Sync,
-{
-    async fn query_ephemera_contract<T>(&self, query: EphemeraQueryMsg) -> Result<T, NyxdError>
-    where
-        for<'a> T: Deserialize<'a>,
-    {
-        self.client
-            .query_contract_smart(self.ephemera_contract_address(), &query)
-            .await
-    }
-}
-
-#[async_trait]
-impl<C> EphemeraQueryClient for crate::Client<C>
-where
-    C: CosmWasmClient + Sync + Send,
-{
-    async fn query_ephemera_contract<T>(&self, query: EphemeraQueryMsg) -> Result<T, NyxdError>
-    where
-        for<'a> T: Deserialize<'a>,
-    {
-        self.nyxd.query_ephemera_contract(query).await
-    }
-}
@@ -1,43 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::nyxd::cosmwasm_client::types::ExecuteResult;
-use crate::nyxd::error::NyxdError;
-use crate::nyxd::{Fee, NyxdClient, SigningCosmWasmClient};
-use async_trait::async_trait;
-use nym_ephemera_common::msg::ExecuteMsg as EphemeraExecuteMsg;
-use nym_ephemera_common::types::JsonPeerInfo;
-
-#[async_trait]
-pub trait EphemeraSigningClient {
-    async fn register_as_peer(
-        &self,
-        peer_info: JsonPeerInfo,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NyxdError>;
-}
-
-#[async_trait]
-impl<C> EphemeraSigningClient for NyxdClient<C>
-where
-    C: SigningCosmWasmClient + Send + Sync,
-{
-    async fn register_as_peer(
-        &self,
-        peer_info: JsonPeerInfo,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NyxdError> {
-        let req = EphemeraExecuteMsg::RegisterPeer { peer_info };
-
-        self.client
-            .execute(
-                self.address(),
-                self.ephemera_contract_address(),
-                &req,
-                fee.unwrap_or_default(),
-                format!("registering {} as an ephemera peer", self.address()),
-                vec![],
-            )
-            .await
-    }
-}
@@ -5,28 +5,30 @@

 mod coconut_bandwidth_query_client;
 mod dkg_query_client;
-mod ephemera_query_client;
-mod ephemera_signing_client;
 mod group_query_client;
 mod mixnet_query_client;
 mod multisig_query_client;
+mod name_service_query_client;
+mod sp_directory_query_client;
 mod vesting_query_client;

+#[cfg(feature = "signing")]
 mod coconut_bandwidth_signing_client;
+#[cfg(feature = "signing")]
 mod dkg_signing_client;
+#[cfg(feature = "signing")]
 mod mixnet_signing_client;
+#[cfg(feature = "signing")]
 mod multisig_signing_client;
-mod vesting_signing_client;
-
-mod sp_directory_query_client;
-mod sp_directory_signing_client;
-
-mod name_service_query_client;
+#[cfg(feature = "signing")]
 mod name_service_signing_client;
+#[cfg(feature = "signing")]
+mod sp_directory_signing_client;
+#[cfg(feature = "signing")]
+mod vesting_signing_client;

 pub use coconut_bandwidth_query_client::CoconutBandwidthQueryClient;
 pub use dkg_query_client::DkgQueryClient;
-pub use ephemera_query_client::EphemeraQueryClient;
 pub use group_query_client::GroupQueryClient;
 pub use mixnet_query_client::MixnetQueryClient;
 pub use multisig_query_client::MultisigQueryClient;
@@ -34,11 +36,17 @@ pub use name_service_query_client::NameServiceQueryClient;
 pub use sp_directory_query_client::SpDirectoryQueryClient;
 pub use vesting_query_client::VestingQueryClient;

+#[cfg(feature = "signing")]
 pub use coconut_bandwidth_signing_client::CoconutBandwidthSigningClient;
+#[cfg(feature = "signing")]
 pub use dkg_signing_client::DkgSigningClient;
-pub use ephemera_signing_client::EphemeraSigningClient;
+#[cfg(feature = "signing")]
 pub use mixnet_signing_client::MixnetSigningClient;
+#[cfg(feature = "signing")]
 pub use multisig_signing_client::MultisigSigningClient;
+#[cfg(feature = "signing")]
 pub use name_service_signing_client::NameServiceSigningClient;
+#[cfg(feature = "signing")]
 pub use sp_directory_signing_client::SpDirectorySigningClient;
+#[cfg(feature = "signing")]
 pub use vesting_signing_client::VestingSigningClient;
@@ -63,7 +63,6 @@ impl SignerData {
        }
    }

-    #[cfg(feature = "nyxd-client")]
    pub fn new_from_sequence_response(
        response: crate::nyxd::cosmwasm_client::types::SequenceResponse,
        chain_id: chain::Id,
@@ -28,7 +28,7 @@ tap = "1"
 cosmrs = { workspace = true }
 cosmwasm-std = { workspace = true }

-nym-validator-client = { path = "../client-libs/validator-client", features = ["nyxd-client"] }
+nym-validator-client = { path = "../client-libs/validator-client", features = ["signing", "http-client"] }
 nym-bin-common = { path = "../../common/bin-common", features = ["output_format"] }
 nym-crypto = { path = "../../common/crypto", features = ["asymmetric"] }
 nym-network-defaults = { path = "../network-defaults" }
@@ -6,7 +6,7 @@ use log::info;

 use nym_mixnet_contract_common::{Coin, MixId};
 use nym_validator_client::nyxd::traits::MixnetQueryClient;
-use nym_validator_client::nyxd::VestingSigningClient;
+use nym_validator_client::nyxd::traits::VestingSigningClient;

 use crate::context::SigningClient;

@@ -5,7 +5,7 @@ use clap::Parser;
 use log::info;
 use nym_mixnet_contract_common::MixId;
 use nym_validator_client::nyxd::traits::MixnetQueryClient;
-use nym_validator_client::nyxd::VestingSigningClient;
+use nym_validator_client::nyxd::traits::VestingSigningClient;

 use crate::context::SigningClient;

@@ -6,7 +6,7 @@ use clap::Parser;
 use log::info;
 use nym_mixnet_contract_common::GatewayConfigUpdate;
 use nym_validator_client::nyxd::traits::MixnetQueryClient;
-use nym_validator_client::nyxd::VestingSigningClient;
+use nym_validator_client::nyxd::traits::VestingSigningClient;

 #[derive(Debug, Parser)]
 pub struct Args {
@@ -7,7 +7,7 @@ use log::{info, warn};
 use nym_contracts_common::signing::MessageSignature;
 use nym_mixnet_contract_common::{Coin, Gateway};
 use nym_network_defaults::{DEFAULT_CLIENT_LISTENING_PORT, DEFAULT_MIX_LISTENING_PORT};
-use nym_validator_client::nyxd::VestingSigningClient;
+use nym_validator_client::nyxd::traits::VestingSigningClient;

 #[derive(Debug, Parser)]
 pub struct Args {
@@ -5,7 +5,7 @@ use crate::context::SigningClient;
 use clap::Parser;
 use log::info;
 use nym_validator_client::nyxd::traits::MixnetSigningClient;
-use nym_validator_client::nyxd::VestingSigningClient;
+use nym_validator_client::nyxd::traits::VestingSigningClient;

 #[derive(Debug, Parser)]
 pub struct Args {
@@ -8,7 +8,7 @@ use nym_contracts_common::signing::MessageSignature;
 use nym_crypto::asymmetric::identity;
 use nym_mixnet_contract_common::families::FamilyHead;
 use nym_validator_client::nyxd::traits::MixnetSigningClient;
-use nym_validator_client::nyxd::VestingSigningClient;
+use nym_validator_client::nyxd::traits::VestingSigningClient;

 #[derive(Debug, Parser)]
 pub struct Args {
@@ -6,7 +6,7 @@ use clap::Parser;
 use log::info;
 use nym_crypto::asymmetric::identity;
 use nym_validator_client::nyxd::traits::MixnetSigningClient;
-use nym_validator_client::nyxd::VestingSigningClient;
+use nym_validator_client::nyxd::traits::VestingSigningClient;

 #[derive(Debug, Parser)]
 pub struct Args {
@@ -7,7 +7,7 @@ use log::info;
 use nym_crypto::asymmetric::identity;
 use nym_mixnet_contract_common::families::FamilyHead;
 use nym_validator_client::nyxd::traits::MixnetSigningClient;
-use nym_validator_client::nyxd::VestingSigningClient;
+use nym_validator_client::nyxd::traits::VestingSigningClient;

 #[derive(Debug, Parser)]
 pub struct Args {
@@ -6,7 +6,7 @@ use clap::Parser;
 use log::info;
 use nym_mixnet_contract_common::MixNodeConfigUpdate;
 use nym_validator_client::nyxd::traits::MixnetQueryClient;
-use nym_validator_client::nyxd::VestingSigningClient;
+use nym_validator_client::nyxd::traits::VestingSigningClient;

 #[derive(Debug, Parser)]
 pub struct Args {
@@ -11,7 +11,7 @@ use nym_mixnet_contract_common::{MixNode, Percent};
 use nym_network_defaults::{
    DEFAULT_HTTP_API_LISTENING_PORT, DEFAULT_MIX_LISTENING_PORT, DEFAULT_VERLOC_LISTENING_PORT,
 };
-use nym_validator_client::nyxd::{CosmWasmCoin, VestingSigningClient};
+use nym_validator_client::nyxd::{traits::VestingSigningClient, CosmWasmCoin};

 #[derive(Debug, Parser)]
 pub struct Args {
@@ -5,7 +5,7 @@ use crate::context::SigningClient;
 use clap::Parser;
 use log::info;
 use nym_mixnet_contract_common::Coin;
-use nym_validator_client::nyxd::VestingSigningClient;
+use nym_validator_client::nyxd::traits::VestingSigningClient;

 #[derive(Debug, Parser)]
 pub struct Args {
@@ -4,7 +4,7 @@
 use clap::Parser;
 use log::info;
 use nym_mixnet_contract_common::Coin;
-use nym_validator_client::nyxd::VestingSigningClient;
+use nym_validator_client::nyxd::traits::VestingSigningClient;

 use crate::context::SigningClient;

@@ -4,7 +4,7 @@
 use crate::context::SigningClient;
 use clap::Parser;
 use log::info;
-use nym_validator_client::nyxd::VestingSigningClient;
+use nym_validator_client::nyxd::traits::VestingSigningClient;

 #[derive(Debug, Parser)]
 pub struct Args {
@@ -10,7 +10,7 @@ pub fn secp256k1_verify_with_public_key(
    public_key_as_bytes: &[u8],
    signature_as_hex: String,
    message: String,
-) -> Result<(), k256::ecdsa::signature::Error> {
+) -> Result<(), k256::ecdsa::Error> {
    let verifying_key = VerifyingKey::from_sec1_bytes(public_key_as_bytes)?;
    let signature = Signature::from_str(&signature_as_hex)?;
    let message_as_bytes = message.into_bytes();
@@ -6,7 +6,7 @@ use std::str::FromStr;

 use crate::context::QueryClient;
 use crate::utils::show_error;
-use cosmrs::tx::Hash;
+use cosmrs::tendermint::Hash;
 use serde_json::json;

 #[derive(Debug, Parser)]
@@ -5,7 +5,7 @@ use clap::Parser;
 use cosmrs::AccountId;
 use log::{error, info};

-use nym_validator_client::nyxd::{Coin, VestingQueryClient};
+use nym_validator_client::nyxd::{traits::VestingQueryClient, Coin};

 use crate::context::QueryClient;
 use crate::utils::show_error;
@@ -8,8 +8,8 @@ use log::info;

 use nym_mixnet_contract_common::Coin;
 use nym_network_defaults::NymNetworkDetails;
+use nym_validator_client::nyxd::traits::VestingSigningClient;
 use nym_validator_client::nyxd::AccountId;
-use nym_validator_client::nyxd::VestingSigningClient;
 use nym_validator_client::nyxd::{CosmosCoin, Denom};
 use nym_vesting_contract_common::messages::VestingSpecification;
 use nym_vesting_contract_common::PledgeCap;
@@ -6,7 +6,7 @@ use cosmrs::AccountId;
 use cosmwasm_std::Coin as CosmWasmCoin;
 use log::{error, info};

-use nym_validator_client::nyxd::{Coin, VestingQueryClient};
+use nym_validator_client::nyxd::{traits::VestingQueryClient, Coin};

 use crate::context::QueryClient;
 use crate::utils::show_error;
@@ -4,7 +4,10 @@
 use clap::Parser;
 use log::info;

-use nym_validator_client::nyxd::{Coin, VestingQueryClient, VestingSigningClient};
+use nym_validator_client::nyxd::{
+    traits::{VestingQueryClient, VestingSigningClient},
+    Coin,
+};

 use crate::context::SigningClient;
 use crate::utils::show_error;
@@ -17,7 +17,6 @@ pub mod helpers;
 pub mod legacy_helpers;

 pub const NYM_DIR: &str = ".nym";
-pub const DEFAULT_NYM_APIS_DIR: &str = "nym-api";
 pub const DEFAULT_CONFIG_DIR: &str = "config";
 pub const DEFAULT_DATA_DIR: &str = "data";
 pub const DEFAULT_CONFIG_FILENAME: &str = "config.toml";
@@ -1,14 +0,0 @@
-[package]
-name = "nym-ephemera-common"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-cosmwasm-std = { workspace = true }
-cw-utils = { workspace = true }
-schemars = "0.8"
-serde = { version = "1.0.103", default-features = false, features = ["derive"] }
-
-contracts-common = { path = "../contracts-common", package = "nym-contracts-common" }
@@ -1,3 +0,0 @@
-pub mod msg;
-pub mod peers;
-pub mod types;
@@ -1,31 +0,0 @@
-// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::types::JsonPeerInfo;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
-pub struct InstantiateMsg {
-    pub group_addr: String,
-    pub mix_denom: String,
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum ExecuteMsg {
-    RegisterPeer { peer_info: JsonPeerInfo },
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum QueryMsg {
-    GetPeers {
-        limit: Option<u32>,
-        start_after: Option<String>,
-    },
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub struct MigrateMsg {}
@@ -1,24 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::types::JsonPeerInfo;
-use cosmwasm_std::Addr;
-use serde::{Deserialize, Serialize};
-
-#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
-#[serde(rename_all = "snake_case")]
-pub struct PagedPeerResponse {
-    pub peers: Vec<JsonPeerInfo>,
-    pub per_page: usize,
-    pub start_next_after: Option<Addr>,
-}
-
-impl PagedPeerResponse {
-    pub fn new(peers: Vec<JsonPeerInfo>, per_page: usize, start_next_after: Option<Addr>) -> Self {
-        PagedPeerResponse {
-            peers,
-            per_page,
-            start_next_after,
-        }
-    }
-}
@@ -1,30 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use cosmwasm_std::Addr;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema)]
-pub struct JsonPeerInfo {
-    /// The cosmos address of the peer, used in interacting with the chain.
-    pub cosmos_address: Addr,
-    /// The TCP/IP address of the peer.
-    /// Expected formats:
-    /// 1. `<IP>:<PORT>`
-    /// 2. `/ip4/<IP>/tcp/<PORT>` - this is the format used by libp2p multiaddr
-    pub ip_address: String,
-    ///Serialized public key.
-    pub public_key: String,
-}
-
-impl JsonPeerInfo {
-    #[must_use]
-    pub fn new(cosmos_address: Addr, ip_address: String, public_key: String) -> Self {
-        Self {
-            cosmos_address,
-            ip_address,
-            public_key,
-        }
-    }
-}
@@ -6,14 +6,14 @@
 // right now this has no double-spending protection, spender binding, etc
 // it's the simplest possible case

+use cosmrs::tendermint::hash::Algorithm;
+use cosmrs::tendermint::Hash;
 use nym_coconut_interface::{
    hash_to_scalar, prepare_blind_sign, Attribute, BlindSignRequest, Credential, Parameters,
    PrivateAttribute, PublicAttribute, Signature, VerificationKey,
 };
 use nym_crypto::asymmetric::{encryption, identity};

-use cosmrs::tx::Hash;
-
 use super::utils::prepare_credential_for_spending;
 use crate::error::Error;

@@ -129,7 +129,9 @@ impl BandwidthVoucher {
        let binding_number = Option::<PrivateAttribute>::from(PrivateAttribute::from_bytes(&buff))
            .ok_or_else(scalar_err)?;
        buff.copy_from_slice(&bytes[2 * 32..3 * 32]);
-        let tx_hash = Hash::new(buff);
+        let tx_hash = Hash::from_bytes(Algorithm::Sha256, &buff).map_err(|_| {
+            Error::BandwidthVoucherDeserializationError(String::from("Invalid transaction Hash"))
+        })?;
        buff.copy_from_slice(&bytes[3 * 32..4 * 32]);
        let signing_key = identity::PrivateKey::from_bytes(&buff).map_err(|_| {
            Error::BandwidthVoucherDeserializationError(String::from("Invalid key"))
@@ -282,6 +284,7 @@ pub fn prepare_for_spending(
 #[cfg(test)]
 mod test {
    use super::*;
+    use cosmrs::tendermint::hash::Algorithm;
    use nym_coconut_interface::Base58;
    use rand::rngs::OsRng;

@@ -292,7 +295,7 @@ mod test {
            &params,
            "1234".to_string(),
            "voucher info".to_string(),
-            Hash::new([0; 32]),
+            Hash::from_bytes(Algorithm::Sha256, &[0; 32]).unwrap(),
            identity::PrivateKey::from_base58_string(
                identity::KeyPair::new(&mut rng)
                    .private_key()
@@ -38,4 +38,5 @@ serde = ["serde_crate", "serde_bytes", "ed25519-dalek/serde", "x25519-dalek/serd
 asymmetric = ["x25519-dalek", "ed25519-dalek", "zeroize"]
 hashing = ["blake3", "digest", "hkdf", "hmac", "generic-array"]
 symmetric = ["aes", "ctr", "cipher", "generic-array"]
-sphinx-only = ["nym-sphinx-types/sphinx-only"]
+sphinx = ["nym-sphinx-types/sphinx"]
+outfox = ["nym-sphinx-types/outfox"]
@@ -273,36 +273,42 @@ impl PemStorableKey for PrivateKey {
 }

 // compatibility with sphinx keys:
+#[cfg(feature = "sphinx")]
 impl From<PublicKey> for nym_sphinx_types::PublicKey {
    fn from(key: PublicKey) -> Self {
        nym_sphinx_types::PublicKey::from(key.to_bytes())
    }
 }

+#[cfg(feature = "sphinx")]
 impl<'a> From<&'a PublicKey> for nym_sphinx_types::PublicKey {
    fn from(key: &'a PublicKey) -> Self {
        nym_sphinx_types::PublicKey::from((*key).to_bytes())
    }
 }

+#[cfg(feature = "sphinx")]
 impl From<nym_sphinx_types::PublicKey> for PublicKey {
    fn from(pub_key: nym_sphinx_types::PublicKey) -> Self {
        Self(x25519_dalek::PublicKey::from(*pub_key.as_bytes()))
    }
 }

+#[cfg(feature = "sphinx")]
 impl From<PrivateKey> for nym_sphinx_types::PrivateKey {
    fn from(key: PrivateKey) -> Self {
        nym_sphinx_types::PrivateKey::from(key.to_bytes())
    }
 }

+#[cfg(feature = "sphinx")]
 impl<'a> From<&'a PrivateKey> for nym_sphinx_types::PrivateKey {
    fn from(key: &'a PrivateKey) -> Self {
        nym_sphinx_types::PrivateKey::from(key.to_bytes())
    }
 }

+#[cfg(feature = "sphinx")]
 impl From<nym_sphinx_types::PrivateKey> for PrivateKey {
    fn from(private_key: nym_sphinx_types::PrivateKey) -> Self {
        let private_key_bytes = private_key.to_bytes();
@@ -5,6 +5,7 @@ pub use ed25519_dalek::ed25519::signature::Signature as SignatureTrait;
 pub use ed25519_dalek::SignatureError;
 pub use ed25519_dalek::{Verifier, PUBLIC_KEY_LENGTH, SECRET_KEY_LENGTH, SIGNATURE_LENGTH};
 use nym_pemstore::traits::{PemStorableKey, PemStorableKeyPair};
+#[cfg(feature = "sphinx")]
 use nym_sphinx_types::{DestinationAddressBytes, DESTINATION_ADDRESS_LENGTH};
 use std::fmt::{self, Display, Formatter};
 use std::str::FromStr;
@@ -113,6 +114,7 @@ impl Display for PublicKey {
 }

 impl PublicKey {
+    #[cfg(feature = "sphinx")]
    pub fn derive_destination_address(&self) -> DestinationAddressBytes {
        let mut temporary_address = [0u8; DESTINATION_ADDRESS_LENGTH];
        let public_key_bytes = self.to_bytes();
@@ -10,10 +10,10 @@ use nym_dkg::bte::proof_discrete_log::ProofOfDiscreteLog;
 use nym_dkg::bte::proof_sharing::ProofOfSecretSharing;
 use nym_dkg::bte::{
    decrypt_share, encrypt_shares, keygen, proof_chunking, proof_sharing, setup, DecryptionKey,
-    PublicKey,
+    Params, PublicKey,
 };
 use nym_dkg::interpolation::polynomial::Polynomial;
-use nym_dkg::{Dealing, NodeIndex, Share};
+use nym_dkg::{combine_shares, Dealing, NodeIndex, Share, Threshold};
 use rand_core::{RngCore, SeedableRng};
 use std::collections::BTreeMap;

@@ -49,6 +49,37 @@ fn prepare_keys(
    (receivers, dks)
 }

+fn prepare_resharing(
+    mut rng: impl RngCore,
+    params: &Params,
+    nodes: usize,
+    threshold: Threshold,
+) -> (BTreeMap<NodeIndex, PublicKey>, Vec<Scalar>) {
+    let (receivers, mut dks) = prepare_keys(&mut rng, nodes);
+
+    let first_dealings = receivers
+        .keys()
+        .map(|&dealer_index| {
+            Dealing::create(&mut rng, params, dealer_index, threshold, &receivers, None).0
+        })
+        .collect::<Vec<_>>();
+
+    let mut derived_secrets = Vec::new();
+    for (i, ref mut dk) in dks.iter_mut().enumerate() {
+        let shares = first_dealings
+            .iter()
+            .map(|dealing| decrypt_share(dk, i, &dealing.ciphertexts, None).unwrap())
+            .collect();
+
+        let recovered_secret =
+            combine_shares(shares, &receivers.keys().copied().collect::<Vec<_>>()).unwrap();
+
+        derived_secrets.push(recovered_secret)
+    }
+
+    (receivers, derived_secrets)
+}
+
 pub fn creating_dealing_for_3_parties(c: &mut Criterion) {
    let dummy_seed = [42u8; 32];
    let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
@@ -73,6 +104,33 @@ pub fn creating_dealing_for_3_parties(c: &mut Criterion) {
    });
 }

+pub fn creating_reshared_dealing_for_3_parties(c: &mut Criterion) {
+    let dummy_seed = [42u8; 32];
+    let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
+    let params = setup();
+    let threshold = 2;
+
+    let (receivers, mut derived_secrets) = prepare_resharing(&mut rng, &params, 3, threshold);
+
+    c.bench_function(
+        "creating single re-shared dealing for 3 parties (threshold 2)",
+        |b| {
+            b.iter(|| {
+                black_box({
+                    Dealing::create(
+                        &mut rng,
+                        &params,
+                        receivers.keys().next().copied().unwrap(),
+                        threshold,
+                        &receivers,
+                        Some(derived_secrets.pop().unwrap()),
+                    )
+                })
+            })
+        },
+    );
+}
+
 pub fn verifying_dealing_made_for_3_parties_and_recovering_share(c: &mut Criterion) {
    let dummy_seed = [42u8; 32];
    let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
@@ -129,6 +187,33 @@ pub fn creating_dealing_for_20_parties(c: &mut Criterion) {
    );
 }

+pub fn creating_reshared_dealing_for_20_parties(c: &mut Criterion) {
+    let dummy_seed = [42u8; 32];
+    let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
+    let params = setup();
+    let threshold = 14;
+
+    let (receivers, mut derived_secrets) = prepare_resharing(&mut rng, &params, 20, threshold);
+
+    c.bench_function(
+        "creating single re-shared dealing for 20 parties (threshold 14)",
+        |b| {
+            b.iter(|| {
+                black_box({
+                    Dealing::create(
+                        &mut rng,
+                        &params,
+                        receivers.keys().next().copied().unwrap(),
+                        threshold,
+                        &receivers,
+                        Some(derived_secrets.pop().unwrap()),
+                    )
+                })
+            })
+        },
+    );
+}
+
 pub fn verifying_dealing_made_for_20_parties_and_recovering_share(c: &mut Criterion) {
    let dummy_seed = [42u8; 32];
    let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
@@ -185,6 +270,33 @@ pub fn creating_dealing_for_100_parties(c: &mut Criterion) {
    );
 }

+pub fn creating_reshared_dealing_for_100_parties(c: &mut Criterion) {
+    let dummy_seed = [42u8; 32];
+    let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
+    let params = setup();
+    let threshold = 67;
+
+    let (receivers, mut derived_secrets) = prepare_resharing(&mut rng, &params, 100, threshold);
+
+    c.bench_function(
+        "creating single re-shared dealing for 100 parties (threshold 67)",
+        |b| {
+            b.iter(|| {
+                black_box({
+                    Dealing::create(
+                        &mut rng,
+                        &params,
+                        receivers.keys().next().copied().unwrap(),
+                        threshold,
+                        &receivers,
+                        Some(derived_secrets.pop().unwrap()),
+                    )
+                })
+            })
+        },
+    );
+}
+
 pub fn verifying_dealing_made_for_100_parties_and_recovering_share(c: &mut Criterion) {
    let dummy_seed = [42u8; 32];
    let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
@@ -472,6 +584,13 @@ criterion_group!(
    creating_dealing_for_100_parties,
 );

+criterion_group!(
+    reshared_dealings_creation,
+    creating_reshared_dealing_for_3_parties,
+    creating_reshared_dealing_for_20_parties,
+    creating_reshared_dealing_for_100_parties,
+);
+
 // note: in our setting each party will have to create at least 4 dealings (one per attribute in credential)
 // and verify 99 * 4 of them (4 from each other dealer)
 criterion_group!(
@@ -501,6 +620,7 @@ criterion_group!(
 criterion_main!(
    utils,
    dealings_creation,
+    reshared_dealings_creation,
    dealings_verification,
    proofs_of_knowledge,
    encryption
@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-bip32 = "0.4.0"
+bip32 = "0.5.1"
 k256 = { workspace = true }
 ledger-transport = "0.10.0"
 ledger-transport-hid = "0.10.0"
@@ -27,7 +27,7 @@ impl TryFrom<APDUAnswer<Vec<u8>>> for AddrSecp256k1Response {
        }

        let (pub_key, addr) = bytes.split_at(33);
-        let public_key = k256::PublicKey::from_bytes(
+        let public_key = PublicKey::from_bytes(
            PublicKeyBytes::try_from(pub_key).expect("Public key should be 33 bytes"),
        )?;
        let address = String::from_utf8(addr.to_vec()).unwrap();
@@ -36,9 +36,7 @@ nym-sphinx-framing = { path = "../nymsphinx/framing" }
 nym-sphinx-params = { path = "../nymsphinx/params" }
 nym-sphinx-types = { path = "../nymsphinx/types" }
 nym-task = { path = "../task" }
-nym-validator-client = { path = "../client-libs/validator-client", features = [
-    "nyxd-client",
-] }
+nym-validator-client = { path = "../client-libs/validator-client" }
 nym-bin-common = { path = "../bin-common" }

 cfg-if = "1.0.0"
@@ -30,7 +30,6 @@ pub struct NymContracts {
    pub group_contract_address: Option<String>,
    pub multisig_contract_address: Option<String>,
    pub coconut_dkg_contract_address: Option<String>,
-    pub ephemera_contract_address: Option<String>,
    pub service_provider_directory_contract_address: Option<String>,
    pub name_service_contract_address: Option<String>,
 }
@@ -130,9 +129,6 @@ impl NymNetworkDetails {
            .with_coconut_dkg_contract(Some(
                var(var_names::COCONUT_DKG_CONTRACT_ADDRESS).expect("coconut dkg contract not set"),
            ))
-            .with_ephemera_contract(Some(
-                var(var_names::EPHEMERA_CONTRACT_ADDRESS).expect("ephemera contract not set"),
-            ))
            .with_service_provider_directory_contract(get_optional_env(
                var_names::SERVICE_PROVIDER_DIRECTORY_CONTRACT_ADDRESS,
            ))
@@ -166,7 +162,6 @@ impl NymNetworkDetails {
                coconut_dkg_contract_address: parse_optional_str(
                    mainnet::COCONUT_DKG_CONTRACT_ADDRESS,
                ),
-                ephemera_contract_address: parse_optional_str(mainnet::EPHEMERA_CONTRACT_ADDRESS),
                service_provider_directory_contract_address: None,
                name_service_contract_address: None,
            },
@@ -251,12 +246,6 @@ impl NymNetworkDetails {
        self
    }

-    #[must_use]
-    pub fn with_ephemera_contract<S: Into<String>>(mut self, contract: Option<S>) -> Self {
-        self.contracts.ephemera_contract_address = contract.map(Into::into);
-        self
-    }
-
    #[must_use]
    pub fn with_service_provider_directory_contract<S: Into<String>>(
        mut self,
@@ -20,7 +20,6 @@ pub(crate) const COCONUT_BANDWIDTH_CONTRACT_ADDRESS: &str =
 pub(crate) const GROUP_CONTRACT_ADDRESS: &str = "n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0";
 pub(crate) const MULTISIG_CONTRACT_ADDRESS: &str = "n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0";
 pub(crate) const COCONUT_DKG_CONTRACT_ADDRESS: &str = "n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0";
-pub(crate) const EPHEMERA_CONTRACT_ADDRESS: &str = "n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0";
 pub(crate) const REWARDING_VALIDATOR_ADDRESS: &str = "n10yyd98e2tuwu0f7ypz9dy3hhjw7v772q6287gy";

 pub const STATISTICS_SERVICE_DOMAIN_ADDRESS: &str = "https://mainnet-stats.nymte.ch:8090/";
@@ -88,10 +87,6 @@ pub fn export_to_env() {
        var_names::COCONUT_DKG_CONTRACT_ADDRESS,
        COCONUT_DKG_CONTRACT_ADDRESS,
    );
-    set_var_to_default(
-        var_names::EPHEMERA_CONTRACT_ADDRESS,
-        EPHEMERA_CONTRACT_ADDRESS,
-    );
    set_var_to_default(
        var_names::REWARDING_VALIDATOR_ADDRESS,
        REWARDING_VALIDATOR_ADDRESS,
@@ -137,10 +132,6 @@ pub fn export_to_env_if_not_set() {
        var_names::COCONUT_DKG_CONTRACT_ADDRESS,
        COCONUT_DKG_CONTRACT_ADDRESS,
    );
-    set_var_conditionally_to_default(
-        var_names::EPHEMERA_CONTRACT_ADDRESS,
-        EPHEMERA_CONTRACT_ADDRESS,
-    );
    set_var_conditionally_to_default(
        var_names::REWARDING_VALIDATOR_ADDRESS,
        REWARDING_VALIDATOR_ADDRESS,
@@ -17,7 +17,6 @@ pub const COCONUT_BANDWIDTH_CONTRACT_ADDRESS: &str = "COCONUT_BANDWIDTH_CONTRACT
 pub const GROUP_CONTRACT_ADDRESS: &str = "GROUP_CONTRACT_ADDRESS";
 pub const MULTISIG_CONTRACT_ADDRESS: &str = "MULTISIG_CONTRACT_ADDRESS";
 pub const COCONUT_DKG_CONTRACT_ADDRESS: &str = "COCONUT_DKG_CONTRACT_ADDRESS";
-pub const EPHEMERA_CONTRACT_ADDRESS: &str = "EPHEMERA_CONTRACT_ADDRESS";
 pub const REWARDING_VALIDATOR_ADDRESS: &str = "REWARDING_VALIDATOR_ADDRESS";
 pub const STATISTICS_SERVICE_DOMAIN_ADDRESS: &str = "STATISTICS_SERVICE_DOMAIN_ADDRESS";
 pub const SERVICE_PROVIDER_DIRECTORY_CONTRACT_ADDRESS: &str =
@@ -19,7 +19,7 @@ nym-pemstore = { path = "../../pemstore" }
 nym-sphinx-addressing = { path = "../addressing" }
 nym-sphinx-params = { path = "../params" }
 nym-sphinx-routing = { path = "../routing" }
-nym-sphinx-types = { path = "../types" }
+nym-sphinx-types = { path = "../types", features = ["sphinx"] }
 nym-topology = { path = "../../topology" }

 [features]
@@ -9,7 +9,7 @@ repository = { workspace = true }

 [dependencies]
 nym-crypto = { path = "../../crypto", features = ["asymmetric"] } # all addresses are expressed in terms on their crypto keys
-nym-sphinx-types = { path = "../types" } # we need to be able to refer to some types defined inside sphinx crate
+nym-sphinx-types = { path = "../types", features = ["sphinx"] } # we need to be able to refer to some types defined inside sphinx crate
 serde = "1.0" # implementing serialization/deserialization for some types, like `Recipient`
 thiserror = "1.0.37"

@@ -10,6 +10,6 @@ repository = { workspace = true }
 [dependencies]
 nym-sphinx-addressing = { path = "../addressing" }
 nym-sphinx-params = { path = "../params" }
-nym-sphinx-types = { path = "../types" }
+nym-sphinx-types = { path = "../types", features = ["sphinx", "outfox"] }
 nym-outfox = { path = "../../../nym-outfox" }
 thiserror = "1"
@@ -13,3 +13,7 @@ serde = { workspace = true, features = ["derive"] }

 nym-crypto = { path = "../../crypto", features = ["hashing", "symmetric"] }
 nym-sphinx-types = { path = "../types" }
+
+[features]
+sphinx = ["nym-crypto/sphinx", "nym-sphinx-types/outfox"]
+outfox = ["nym-crypto/outfox", "nym-sphinx-types/outfox"]
@@ -1,10 +1,10 @@
 // Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::{PacketType, FRAG_ID_LEN};
-use nym_sphinx_types::header::HEADER_SIZE;
+use crate::PacketType;
 use nym_sphinx_types::{
-    MIN_PACKET_SIZE, MIX_PARAMS_LEN, OUTFOX_PACKET_OVERHEAD, PAYLOAD_OVERHEAD_SIZE,
+    header::HEADER_SIZE, MIN_PACKET_SIZE, MIX_PARAMS_LEN, OUTFOX_PACKET_OVERHEAD,
+    PAYLOAD_OVERHEAD_SIZE,
 };
 use serde::{Deserialize, Serialize};
 use std::cmp::Ordering;
@@ -22,9 +22,10 @@ const SPHINX_PACKET_OVERHEAD: usize = HEADER_SIZE + PAYLOAD_OVERHEAD_SIZE;

 // TODO: I'm not entirely sure if we can easily extract `<AckEncryptionAlgorithm as NewStreamCipher>::NonceSize`
 // into a const usize before relevant stuff is stabilised in rust...
+
 const ACK_IV_SIZE: usize = 16;

-const ACK_PACKET_SIZE: usize = ACK_IV_SIZE + FRAG_ID_LEN + SPHINX_PACKET_OVERHEAD;
+const ACK_PACKET_SIZE: usize = ACK_IV_SIZE + crate::FRAG_ID_LEN + SPHINX_PACKET_OVERHEAD;
 const REGULAR_PACKET_SIZE: usize = 2 * 1024 + SPHINX_PACKET_OVERHEAD;
 const EXTENDED_PACKET_SIZE_8: usize = 8 * 1024 + SPHINX_PACKET_OVERHEAD;
 const EXTENDED_PACKET_SIZE_16: usize = 16 * 1024 + SPHINX_PACKET_OVERHEAD;
@@ -176,6 +177,7 @@ impl PacketSize {
    }

    pub const fn payload_overhead(&self) -> usize {
+        #[allow(unreachable_patterns)]
        match self {
            PacketSize::RegularPacket
            | PacketSize::AckPacket
@@ -11,4 +11,6 @@ repository = { workspace = true }
 thiserror = { workspace = true }

 nym-sphinx-addressing = { path = "../addressing" }
-nym-sphinx-types = { path = "../types" }
+nym-sphinx-types = { path = "../types", features = ["sphinx"] }
+
+[features]
@@ -8,10 +8,10 @@ license = { workspace = true }
 repository = { workspace = true }

 [dependencies]
-sphinx-packet = { version = "0.1.0" }
+sphinx-packet = { version = "0.1.0", optional = true }
 nym-outfox = { path = "../../../nym-outfox", optional = true }
 thiserror = "1"

 [features]
-default = ["nym-outfox"]
-sphinx-only = []
+sphinx = ["sphinx-packet"]
+outfox = ["nym-outfox"]
@@ -1,14 +1,15 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-#[cfg(not(feature = "sphinx-only"))]
+#[cfg(feature = "outfox")]
 pub use nym_outfox::{
    constants::MIN_PACKET_SIZE, constants::MIX_PARAMS_LEN, constants::OUTFOX_PACKET_OVERHEAD,
    error::OutfoxError,
 };
 // re-exporting types and constants available in sphinx
-#[cfg(not(feature = "sphinx-only"))]
+#[cfg(feature = "outfox")]
 use nym_outfox::packet::{OutfoxPacket, OutfoxProcessedPacket};
+#[cfg(feature = "sphinx")]
 pub use sphinx_packet::{
    constants::{
        self, DESTINATION_ADDRESS_LENGTH, IDENTIFIER_LENGTH, MAX_PATH_LENGTH, NODE_ADDRESS_LENGTH,
@@ -22,6 +23,7 @@ pub use sphinx_packet::{
    surb::{SURBMaterial, SURB},
    Error as SphinxError, ProcessedPacket,
 };
+#[cfg(feature = "sphinx")]
 use sphinx_packet::{SphinxPacket, SphinxPacketBuilder};
 use std::{array::TryFromSliceError, fmt};
 use thiserror::Error;
@@ -29,10 +31,11 @@ use thiserror::Error;
 #[derive(Error, Debug)]
 pub enum NymPacketError {
    #[error("Sphinx error: {0}")]
+    #[cfg(feature = "sphinx")]
    Sphinx(#[from] sphinx_packet::Error),

    #[error("Outfox error: {0}")]
-    #[cfg(not(feature = "sphinx-only"))]
+    #[cfg(feature = "outfox")]
    Outfox(#[from] nym_outfox::error::OutfoxError),

    #[error("{0}")]
@@ -41,34 +44,40 @@ pub enum NymPacketError {

 #[allow(clippy::large_enum_variant)]
 pub enum NymPacket {
+    #[cfg(feature = "sphinx")]
    Sphinx(SphinxPacket),
-    #[cfg(not(feature = "sphinx-only"))]
+    #[cfg(feature = "outfox")]
    Outfox(OutfoxPacket),
 }

 pub enum NymProcessedPacket {
+    #[cfg(feature = "sphinx")]
    Sphinx(ProcessedPacket),
-    #[cfg(not(feature = "sphinx-only"))]
+    #[cfg(feature = "outfox")]
    Outfox(OutfoxProcessedPacket),
 }

 impl fmt::Debug for NymPacket {
    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        #[allow(unreachable_patterns)]
        match &self {
+            #[cfg(feature = "sphinx")]
            NymPacket::Sphinx(packet) => f
                .debug_struct("NymPacket::Sphinx")
                .field("len", &packet.len())
                .finish(),
-            #[cfg(not(feature = "sphinx-only"))]
+            #[cfg(feature = "outfox")]
            NymPacket::Outfox(packet) => f
                .debug_struct("NymPacket::Outfox")
                .field("len", &packet.len())
                .finish(),
+            _ => write!(f, ""),
        }
    }
 }

 impl NymPacket {
+    #[cfg(feature = "sphinx")]
    pub fn sphinx_build<M: AsRef<[u8]>>(
        size: usize,
        message: M,
@@ -82,11 +91,12 @@ impl NymPacket {
                .build_packet(message, route, destination, delays)?,
        ))
    }
+    #[cfg(feature = "sphinx")]
    pub fn sphinx_from_bytes(bytes: &[u8]) -> Result<NymPacket, NymPacketError> {
        Ok(NymPacket::Sphinx(SphinxPacket::from_bytes(bytes)?))
    }

-    #[cfg(not(feature = "sphinx-only"))]
+    #[cfg(feature = "outfox")]
    pub fn outfox_build<M: AsRef<[u8]>>(
        payload: M,
        route: &[Node],
@@ -101,16 +111,19 @@ impl NymPacket {
        )?))
    }

-    #[cfg(not(feature = "sphinx-only"))]
+    #[cfg(feature = "outfox")]
    pub fn outfox_from_bytes(bytes: &[u8]) -> Result<NymPacket, NymPacketError> {
        Ok(NymPacket::Outfox(OutfoxPacket::try_from(bytes)?))
    }

    pub fn len(&self) -> usize {
+        #[allow(unreachable_patterns)]
        match self {
+            #[cfg(feature = "sphinx")]
            NymPacket::Sphinx(packet) => packet.len(),
-            #[cfg(not(feature = "sphinx-only"))]
+            #[cfg(feature = "outfox")]
            NymPacket::Outfox(packet) => packet.len(),
+            _ => 0,
        }
    }

@@ -119,13 +132,17 @@ impl NymPacket {
    }

    pub fn to_bytes(&self) -> Result<Vec<u8>, NymPacketError> {
+        #[allow(unreachable_patterns)]
        match self {
+            #[cfg(feature = "sphinx")]
            NymPacket::Sphinx(packet) => Ok(packet.to_bytes()),
-            #[cfg(not(feature = "sphinx-only"))]
+            #[cfg(feature = "outfox")]
            NymPacket::Outfox(packet) => Ok(packet.to_bytes()?),
+            _ => Ok(vec![]),
        }
    }

+    #[cfg(feature = "sphinx")]
    pub fn process(
        self,
        node_secret_key: &PrivateKey,
@@ -134,7 +151,7 @@ impl NymPacket {
            NymPacket::Sphinx(packet) => {
                Ok(NymProcessedPacket::Sphinx(packet.process(node_secret_key)?))
            }
-            #[cfg(not(feature = "sphinx-only"))]
+            #[cfg(feature = "outfox")]
            NymPacket::Outfox(mut packet) => {
                let next_address = packet.decode_next_layer(node_secret_key)?;
                Ok(NymProcessedPacket::Outfox(OutfoxProcessedPacket::new(
@@ -26,7 +26,7 @@ nym-service-providers-common = { path = "../../service-providers/common" }
 nym-socks5-requests = { path = "../socks5/requests" }
 nym-sphinx = { path = "../nymsphinx" }
 nym-task = { path = "../task" }
-nym-validator-client = { path = "../client-libs/validator-client", features = ["nyxd-client"] }
+nym-validator-client = { path = "../client-libs/validator-client" }

 [features]
 default = []
@@ -19,10 +19,10 @@ thiserror = "1.0.37"
 async-trait = { workspace = true, optional = true }

 ## internal
-nym-crypto = { path = "../crypto" }
+nym-crypto = { path = "../crypto", features = ["sphinx", "outfox"] }
 nym-mixnet-contract-common = { path = "../cosmwasm-smart-contracts/mixnet-contract" }
 nym-sphinx-addressing = { path = "../nymsphinx/addressing" }
-nym-sphinx-types = { path = "../nymsphinx/types" }
+nym-sphinx-types = { path = "../nymsphinx/types", features = ["sphinx", "outfox"] }
 nym-sphinx-routing = { path = "../nymsphinx/routing" }
 nym-bin-common = { path = "../bin-common" }

@@ -41,6 +41,7 @@ pub enum NymTopologyError {
    PayloadBuilder,

    #[error("Outfox: {0}")]
+    #[cfg(feature = "outfox")]
    Outfox(#[from] nym_sphinx_types::OutfoxError),

    #[error("{0}")]
@@ -22,9 +22,7 @@ ts-rs = "6.1.2"
 cosmwasm-std = { workspace = true }
 cosmrs = { workspace = true }

-nym-validator-client = { path = "../../common/client-libs/validator-client", features = [
-    "nyxd-client",
-] }
+nym-validator-client = { path = "../../common/client-libs/validator-client" }
 nym-mixnet-contract-common = { path = "../../common/cosmwasm-smart-contracts/mixnet-contract" }
 nym-vesting-contract-common = { path = "../../common/cosmwasm-smart-contracts/vesting-contract" }
 nym-config = { path = "../../common/config" }
@@ -1,4 +1,4 @@
-use cosmrs::tx::Gas as CosmrsGas;
+use cosmrs::Gas as CosmrsGas;
 use nym_validator_client::nyxd::cosmwasm_client::types::GasInfo as ValidatorClientGasInfo;
 use serde::{Deserialize, Serialize};

@@ -21,8 +21,14 @@ impl Gas {

 impl From<CosmrsGas> for Gas {
    fn from(gas: CosmrsGas) -> Self {
+        Gas { gas_units: gas }
+    }
+}
+
+impl From<i64> for Gas {
+    fn from(value: i64) -> Self {
        Gas {
-            gas_units: gas.value(),
+            gas_units: value.try_into().unwrap_or_default(),
        }
    }
 }
@@ -2,19 +2,6 @@
 # It is not intended for manual editing.
 version = 3

-[[package]]
-name = "aes"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8"
-dependencies = [
- "cfg-if",
- "cipher",
- "cpufeatures",
- "ctr",
- "opaque-debug 0.3.0",
-]
-
 [[package]]
 name = "ahash"
 version = "0.7.6"
@@ -32,12 +19,6 @@ version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"

-[[package]]
-name = "arrayref"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
-
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -74,25 +55,13 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"

-[[package]]
-name = "blake2"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94cb07b0da6a73955f8fb85d24c466778e70cda767a568229b104f0264089330"
-dependencies = [
- "byte-tools",
- "crypto-mac 0.7.0",
- "digest 0.8.1",
- "opaque-debug 0.2.3",
-]
-
 [[package]]
 name = "block-buffer"
 version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
 dependencies = [
- "generic-array 0.14.6",
+ "generic-array",
 ]

 [[package]]
@@ -101,7 +70,7 @@ version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
 dependencies = [
- "generic-array 0.14.6",
+ "generic-array",
 ]

 [[package]]
@@ -116,12 +85,6 @@ version = "3.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8"

-[[package]]
-name = "byte-tools"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
-
 [[package]]
 name = "byteorder"
 version = "1.4.3"
@@ -149,25 +112,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

-[[package]]
-name = "chacha"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddf3c081b5fba1e5615640aae998e0fbd10c24cbd897ee39ed754a77601a4862"
-dependencies = [
- "byteorder",
- "keystream",
-]
-
-[[package]]
-name = "cipher"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7"
-dependencies = [
- "generic-array 0.14.6",
-]
-
 [[package]]
 name = "coconut-test"
 version = "0.1.0"
@@ -296,9 +240,9 @@ version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
 dependencies = [
- "generic-array 0.14.6",
+ "generic-array",
 "rand_core 0.6.4",
- "subtle 2.4.1",
+ "subtle",
 "zeroize",
 ]

@@ -308,39 +252,10 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
 dependencies = [
- "generic-array 0.14.6",
+ "generic-array",
 "typenum",
 ]

-[[package]]
-name = "crypto-mac"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5"
-dependencies = [
- "generic-array 0.12.4",
- "subtle 1.0.0",
-]
-
-[[package]]
-name = "crypto-mac"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714"
-dependencies = [
- "generic-array 0.14.6",
- "subtle 2.4.1",
-]
-
-[[package]]
-name = "ctr"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea"
-dependencies = [
- "cipher",
-]
-
 [[package]]
 name = "curve25519-dalek"
 version = "3.2.0"
@@ -350,7 +265,7 @@ dependencies = [
 "byteorder",
 "digest 0.9.0",
 "rand_core 0.5.1",
- "subtle 2.4.1",
+ "subtle",
 "zeroize",
 ]

@@ -561,22 +476,13 @@ dependencies = [
 "syn 1.0.109",
 ]

-[[package]]
-name = "digest"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
-dependencies = [
- "generic-array 0.12.4",
-]
-
 [[package]]
 name = "digest"
 version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
 dependencies = [
- "generic-array 0.14.6",
+ "generic-array",
 ]

 [[package]]
@@ -587,7 +493,7 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
 "block-buffer 0.10.4",
 "crypto-common",
- "subtle 2.4.1",
+ "subtle",
 ]

 [[package]]
@@ -663,12 +569,12 @@ dependencies = [
 "der",
 "digest 0.10.7",
 "ff",
- "generic-array 0.14.6",
+ "generic-array",
 "group",
 "pkcs8",
 "rand_core 0.6.4",
 "sec1",
- "subtle 2.4.1",
+ "subtle",
 "zeroize",
 ]

@@ -729,7 +635,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
 dependencies = [
 "rand_core 0.6.4",
- "subtle 2.4.1",
+ "subtle",
 ]

 [[package]]
@@ -848,15 +754,6 @@ dependencies = [
 "slab",
 ]

-[[package]]
-name = "generic-array"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd"
-dependencies = [
- "typenum",
-]
-
 [[package]]
 name = "generic-array"
 version = "0.14.6"
@@ -924,7 +821,7 @@ checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
 dependencies = [
 "ff",
 "rand_core 0.6.4",
- "subtle 2.4.1",
+ "subtle",
 ]

 [[package]]
@@ -948,26 +845,6 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"

-[[package]]
-name = "hkdf"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01706d578d5c281058480e673ae4086a9f4710d8df1ad80a5b03e39ece5f886b"
-dependencies = [
- "digest 0.9.0",
- "hmac 0.11.0",
-]
-
-[[package]]
-name = "hmac"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b"
-dependencies = [
- "crypto-mac 0.11.1",
- "digest 0.9.0",
-]
-
 [[package]]
 name = "hmac"
 version = "0.12.1"
@@ -1068,12 +945,6 @@ dependencies = [
 "sha2 0.10.6",
 ]

-[[package]]
-name = "keystream"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c33070833c9ee02266356de0c43f723152bd38bd96ddf52c82b3af10c9138b28"
-
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -1098,12 +969,6 @@ dependencies = [
 "pkg-config",
 ]

-[[package]]
-name = "libm"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb"
-
 [[package]]
 name = "libz-sys"
 version = "1.1.8"
@@ -1122,18 +987,6 @@ version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f"

-[[package]]
-name = "lioness"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae926706ba42c425c9457121178330d75e273df2e82e28b758faf3de3a9acb9"
-dependencies = [
- "arrayref",
- "blake2",
- "chacha",
- "keystream",
-]
-
 [[package]]
 name = "log"
 version = "0.4.17"
@@ -1165,16 +1018,6 @@ dependencies = [
 "rand_chacha 0.2.2",
 ]

-[[package]]
-name = "num-traits"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
-dependencies = [
- "autocfg",
- "libm",
-]
-
 [[package]]
 name = "nym-coconut-bandwidth"
 version = "0.1.0"
@@ -1258,37 +1101,6 @@ dependencies = [
 "zeroize",
 ]

-[[package]]
-name = "nym-ephemera"
-version = "0.1.0"
-dependencies = [
- "cosmwasm-std",
- "cosmwasm-storage",
- "cw-controllers",
- "cw-multi-test",
- "cw-storage-plus",
- "cw4",
- "cw4-group",
- "lazy_static",
- "nym-ephemera-common",
- "nym-group-contract-common",
- "rusty-fork",
- "schemars",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "nym-ephemera-common"
-version = "0.1.0"
-dependencies = [
- "cosmwasm-std",
- "cw-utils",
- "nym-contracts-common",
- "schemars",
- "serde",
-]
-
 [[package]]
 name = "nym-group-contract-common"
 version = "0.1.0"
@@ -1440,7 +1252,6 @@ dependencies = [
 name = "nym-sphinx-types"
 version = "0.2.0"
 dependencies = [
- "sphinx-packet",
 "thiserror",
 ]

@@ -1484,12 +1295,6 @@ version = "1.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"

-[[package]]
-name = "opaque-debug"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
-
 [[package]]
 name = "opaque-debug"
 version = "0.3.0"
@@ -1680,16 +1485,6 @@ dependencies = [
 "getrandom 0.2.10",
 ]

-[[package]]
-name = "rand_distr"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e9532ada3929fb8b2e9dbe28d1e06c9b2cc65813f074fcb6bd5fbefeff9d56"
-dependencies = [
- "num-traits",
- "rand 0.7.3",
-]
-
 [[package]]
 name = "rand_hc"
 version = "0.2.0"
@@ -1730,7 +1525,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb"
 dependencies = [
 "crypto-bigint",
- "hmac 0.12.1",
+ "hmac",
 "zeroize",
 ]

@@ -1839,9 +1634,9 @@ checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
 dependencies = [
 "base16ct",
 "der",
- "generic-array 0.14.6",
+ "generic-array",
 "pkcs8",
- "subtle 2.4.1",
+ "subtle",
 "zeroize",
 ]

@@ -1932,7 +1727,7 @@ dependencies = [
 "cfg-if",
 "cpufeatures",
 "digest 0.9.0",
- "opaque-debug 0.3.0",
+ "opaque-debug",
 ]

 [[package]]
@@ -1965,30 +1760,6 @@ dependencies = [
 "autocfg",
 ]

-[[package]]
-name = "sphinx-packet"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc43eda802856ee82a7555c7b75ceb9e07451741c7a2f5f23d036020e01189d4"
-dependencies = [
- "aes",
- "arrayref",
- "blake2",
- "bs58",
- "byteorder",
- "chacha",
- "curve25519-dalek",
- "digest 0.9.0",
- "hkdf",
- "hmac 0.11.0",
- "lioness",
- "log",
- "rand 0.7.3",
- "rand_distr",
- "sha2 0.9.9",
- "subtle 2.4.1",
-]
-
 [[package]]
 name = "spki"
 version = "0.6.0"
@@ -2005,12 +1776,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"

-[[package]]
-name = "subtle"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
-
 [[package]]
 name = "subtle"
 version = "2.4.1"
@@ -3,7 +3,6 @@ members = [
    "coconut-bandwidth",
    "coconut-dkg",
    "coconut-test",
-    "ephemera",
    "mixnet",
    "mixnet-vesting-integration-tests",
    "multisig/cw3-flex-multisig",
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Tommy Verrall	2dba352365	Update contract-cache-mixnode.test.ts	2023-08-02 13:25:05 +02:00
Tommy Verrall	32739ce19e	Update config.yaml	2023-08-02 13:23:45 +02:00
Tommy Verrall	e537359c73	Merge pull request #3728 from nymtech/qa/fix-api-tests fix api tests for no blacklisted nodes	2023-08-02 13:21:00 +02:00
Tommy Verrall	2ed3e646be	linting and removing unused imports	2023-08-02 13:02:29 +02:00
Tommy Verrall	c725ae4e2b	remove console	2023-08-02 12:55:46 +02:00
Tommy Verrall	5ab2c738df	fix api tests for no blacklisted nodes	2023-08-02 12:54:09 +02:00
pierre	cd70b0de75	build(nc-android): disable sentry upload proguard mapping files	2023-08-02 11:18:30 +02:00
Tommy Verrall	6359b38a5d	Merge pull request #3660 from nymtech/dependabot/npm_and_yarn/nym-wallet/webdriver/semver-5.7.2 Bump semver from 5.7.1 to 5.7.2 in /nym-wallet/webdriver	2023-08-02 10:36:36 +02:00
dependabot[bot]	00b5a46cbc	Bump semver from 5.7.1 to 5.7.2 in /nym-wallet/webdriver Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2. - [Release notes](https://github.com/npm/node-semver/releases) - [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md) - [Commits](https://github.com/npm/node-semver/compare/v5.7.1...v5.7.2) --- updated-dependencies: - dependency-name: semver dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2023-08-01 15:22:00 +00:00
Fouad	e97a068bf0	Type documentation for NymSDK (#3701 ) * set up development process for docs * set up development process for docs * Add local installs for Typedoc on gitignore * Add Typedoc comments on types.ts file * add typedoc config file * update types and add annotations * Add updates on types file * add examples + manage sort order for doc items * update client methods with examples * add description of NymMixnetClientOptions * add description of NymMixnetClientOptions * fix linting --------- Co-authored-by: Lorexia <alexia.lorenza.martinel@protonmail.com>	2023-08-01 16:21:12 +01:00
Lorexia	15a6af49f0	Add updates to community list projects	2023-08-01 10:49:02 +02:00
mfahampshire	97956afdf6	removed old wallet address flag again	2023-08-01 10:48:52 +02:00
pierre	5fbccc3406	build(nc-android): moving build config to kotlin	2023-07-27 19:11:33 +02:00
pierre	ac8afe133f	fix(nc-desktop): typo	2023-07-27 15:53:55 +02:00
Bogdan-Ștefan Neacşu	19736b1204	Fix develop after bad automerge (#3712 )	2023-07-27 13:25:34 +03:00
pierre	6e5f6bf0df	ci: fix release strapi actions	2023-07-27 11:42:42 +02:00
Jędrzej Stuczyński	67435e9cdf	Feature/simplify cli parsing (#3699 ) * added a global flag to disable the printed out banner inside tty * added a 'build-info' command to our binaries * added binary name to BinaryBuildInformation * clippy	2023-07-27 10:20:07 +01:00
Bogdan-Ștefan Neacşu	a47899aa77	Apply fix from feature/ephemera to develop too (#3698 )	2023-07-27 12:18:08 +03:00
pierre	44fa52a7a7	ci: fix release strapi actions	2023-07-27 11:08:24 +02:00
Tommy Verrall	f6e20c8201	Merge branch 'release/v1.1.25' into develop	2023-07-26 17:39:34 +02:00
pierre	1da6ee2058	fix workflows (try)	2023-07-26 17:37:54 +02:00
pierre	109fb96fca	fix workflows	2023-07-26 17:37:54 +02:00
benedetta davico	557bfa7b34	Update CHANGELOG.md	2023-07-26 17:37:25 +02:00
Tommy Verrall	4c9727b1ef	Update nym-connect-publish-ubuntu.yml (#3706 ) * Update nym-connect-publish-ubuntu.yml * Update nym-connect-publish-ubuntu.yml * Update nym-connect-publish-macos.yml * Update nym-connect-publish-windows10.yml	2023-07-26 17:37:25 +02:00
Tommy Verrall	a0408b74dc	Update nym-connect-publish-macos.yml (#3705 ) * Update nym-connect-publish-macos.yml install wasm and build * Update nym-connect-publish-macos.yml use the correct download	2023-07-26 17:37:25 +02:00
Tommy Verrall	8a1ed12f58	bump versions for NC	2023-07-26 17:37:25 +02:00
mfahampshire	c38c5c2f0d	fixed clippy warning	2023-07-26 17:37:25 +02:00
pierre	03300a859e	build(nc-desktop): sentry dsn as env var	2023-07-26 17:37:22 +02:00
mfahampshire	2fe5401a38	ran fmt	2023-07-26 17:37:22 +02:00
mfahampshire	d8a44cd9c1	added reply with surbs example to rust sdk examples dir	2023-07-26 17:37:22 +02:00
mfahampshire	a0b41db22d	added rust sdk surb example	2023-07-26 17:37:22 +02:00
Pierre Dommerc	7d6d8669b0	feat(nc-desktop): add sentry to backend (#3652 )	2023-07-26 17:37:18 +02:00
mfahampshire	a1a2f37fce	included url	2023-07-26 17:23:20 +02:00
mfahampshire	91341733c1	updated NR guide with list explainer + info on comments in local allow list	2023-07-26 17:23:20 +02:00
mfahampshire	93cd8821c3	version update	2023-07-26 17:23:20 +02:00
mfahampshire	b79ec60381	* added serinko + alexia to book authors * version bumps for next release	2023-07-26 17:23:20 +02:00
mfahampshire	2c2dd54028	updated sdk documentation with surb example	2023-07-26 17:23:20 +02:00
mfahampshire	4306cec49c	version bumps	2023-07-26 17:23:14 +02:00
mfahampshire	5781d3043f	removed command information from mix node + gateway guide	2023-07-26 17:23:14 +02:00
⚡️2FakTor⚡️	d843407ba7	Update network-requester-setup.md	2023-07-26 17:23:14 +02:00
⚡️2FakTor⚡️	053e047cca	Update network-requester-setup.md	2023-07-26 17:23:14 +02:00
Jędrzej Stuczyński	516561dcf9	Feature/wasm nyxd client (#3708 ) * separated signing and nyxd-client features * updated cosmrs to the most recent version * using tendermint_rpc directly for the Client trait * fixed rest of the codebase * removed nyxd-client feature * export more types * clippy that seems to have been skipped in makefile	2023-07-26 15:49:45 +01:00
Jon Häggblad	290dbc1a03	client-core: make latency based gateway selection concurrent (#3709 )	2023-07-26 13:08:06 +02:00
Jon Häggblad	524863aae7	Uncouple gateways and network-requester in nym-connect (#3639 ) * Split fetching network-requesters from gateways * Tidy names * Select gateway independenty in frontend * Fix threshold value * Fix gateway type * Fix naming for setGateway and setServiceProvider * Unshadow variable * Naming conventions * Missing semicolon * Explicit types in invoke calls * Dedup random function * Inline some functions * Silence handlebars in log * Emojis in healthcheck log statements * Remove gateway from service provider type * Remove unneeded type cast * fix linting * Remove gateway field from harbour master response type --------- Co-authored-by: fmtabbara <fmtabbara@hotmail.co.uk>	2023-07-25 13:51:27 +02:00
Tommy Verrall	61ad336b18	Merge pull request #3598 from nymtech/bug-fix/balanceVSfeeWarning TX warning when fee > balance	2023-07-25 09:55:34 +02:00
pierre	867b745a38	fix(nc-android): http requests	2023-07-25 08:53:34 +02:00
fmtabbara	78e54287da	include tx amount when checking balance	2023-07-24 16:57:28 +01:00
fmtabbara	96c29b974b	add warning for more txs	2023-07-24 16:57:28 +01:00
fmtabbara	eadd116ae4	add warning modal for more txs	2023-07-24 16:57:28 +01:00
fmtabbara	f1175280cf	add warning to tx modals when fee exceeds balance	2023-07-24 16:57:28 +01:00
pierre	34a47a9449	build(nc-desktop): sentry dsn as env var	2023-07-21 15:56:08 +02:00
Bogdan-Ștefan Neacşu	dff11df2bd	Add DKG resharing benchmark (#3692 ) * Add DKG resharing benchmark * Fix clippy	2023-07-21 11:25:14 +01:00
benedettadavico	feb888a154	updating sandbox .env	2023-07-20 17:20:00 +02:00
Pierre Dommerc	415fe4605c	feat(nc-desktop): add sentry to backend (#3652 )	2023-07-20 13:17:49 +02:00
Pierre Dommerc	70e6539298	refactor(nc-desktop): add privacy level user settings (#3664 )	2023-07-19 15:56:00 +02:00
pierre	fe76ba68a0	ci: fix connect-desktop-ci workflow	2023-07-19 15:41:00 +02:00
pierre	863580a6f2	ci: fix workflow for strapi data publish	2023-07-18 19:23:31 +02:00
pierre	4c558db08e	add alephium to supported wallets	2023-07-18 17:08:20 +02:00
Mark Sinclair	9d5b582908	SDK - fix unsubscribe function for events (#3659 ) Co-authored-by: Mark Sinclair <mmsinclair@users.noreply.github.com>	2023-07-18 14:12:00 +01:00
Fouad	c12b20f1d6	Feature/sdk browser extension examples (#3673 ) * New TypeScript SDK example: Google Chrome Example of a simple manifest v3 extension to load a Nym client within a popup view. * Firefox Extension example for Nym TypeScript SDK * Fix typo * Add basic install script * fix up html files * remove unnecessary background page * bundle extensions with webpack * use icons from shared assets * ignore sdk index file * import sdk lib * create new build script for non-inline workers * import workers and build as separate files using webpack * update html titles * create react app node tester example * add readme file * update readme for FF extension * code formatting --------- Co-authored-by: Nadim Kobeissi <nadim@symbolic.software> Co-authored-by: Mark Sinclair <mmsinclair@users.noreply.github.com>	2023-07-18 14:09:40 +01:00
farbanas	edeb8369df	Merge branch 'master' into develop	2023-07-18 14:22:46 +02:00
farbanas	22b2405aa2	Merge branch 'release/v1.1.24'	2023-07-18 13:43:47 +02:00
farbanas	63254ecffe	update versions and changelogs for the release	2023-07-18 13:43:30 +02:00
farbanas	407d280019	fixes to GH action	2023-07-18 11:23:15 +02:00
farbanas	1fafc126fb	debugging	2023-07-18 11:06:45 +02:00
farbanas	9a51135d22	debugging	2023-07-18 10:43:27 +02:00
Tommy Verrall	1b2790da80	Merge pull request #3676 from nymtech/bugfix/#3630 [wallet] bugfix: don't send funds for pledge decrease simulation	2023-07-17 12:08:32 +02:00
Jędrzej Stuczyński	f8943eebce	preemptively resolving future clippy issue	2023-07-17 11:01:45 +01:00
Jędrzej Stuczyński	d7b53cba40	don't send funds for pledge decrease simulation	2023-07-17 11:01:45 +01:00
mx	89d2f0ac12	Merge pull request #3665 from nymtech/dev-portal/communityupdates Dev portal/communityupdates	2023-07-17 09:49:52 +00:00
wigy	110b4d384e	fix: typo in Rust SDK docs (#3655 )	2023-07-17 10:29:28 +01:00
Lorexia	4631c72c6b	Update quickstart overview, delete project comments in community-applications-and-guides	2023-07-13 10:36:27 +02:00
Lorexia	12aa5f1f4f	Add Minibolt to community projects list	2023-07-12 18:37:06 +02:00
Lorexia	825f25800a	Add Nymster email info, update Nostr-Nym link, update deployed apps text	2023-07-12 14:44:51 +02:00
Lorexia	d9b4d8fde6	Add preprocessors for build, update NIsNymUp issue, update DarkFi picture	2023-07-12 11:05:42 +02:00
Lorexia	a98613d83c	Update community application list, merge community and guides pages, update SUMMARY file, update overview file	2023-07-11 19:57:21 +02:00
mfahampshire	34de42fe7a	updated validator docs: upgrade to 0.32.0 instructions	2023-07-11 15:51:02 +02:00
serinko	6e2eaf29e7	edited NC-Matrix user manual - changed setup for Mac - fixed typo	2023-07-10 15:32:23 +02:00
mx	c6b193eb4f	Merge pull request #3657 from nymtech/serinko-dev-portal-patch update NC-Matrix user manual	2023-07-10 08:17:17 +00:00
serinko	92b9edf0da	edited NC-Matrix user manual - changed setup for Mac - fixed typo	2023-07-04 14:52:05 +00:00