Fix Box ws_fd

.github/workflows/ci-build-upload-binaries.yml

@@ -9,17 +9,12 @@ on:
         default: false
         type: boolean
       enable_wireguard:
-        description: "Add --features wireguard"
+        description: 'Add --features wireguard'
         required: true
         default: false
         type: boolean
-      enable_deb:
-        description: "True to enable cargo-deb installation and .deb package building"
-        required: false
-        default: false
-        type: boolean
   schedule:
-    - cron: "14 0 * * *"
+    - cron: '14 0 * * *'
   pull_request:
     paths:
       - "clients/**"
@@ -35,7 +30,6 @@ on:
       - "sdk/rust/nym-sdk/**"
       - "service-providers/**"
       - "tools/**"
-      - "nymvisor/**"
 
 jobs:
   publish-nym:
@@ -90,12 +84,12 @@ jobs:
         with:
           command: install
           args: cargo-deb
-        if: github.event_name == 'workflow_dispatch' && inputs.enable_deb == true
 
       - name: Build deb packages
         shell: bash
         run: make deb
-        if: github.event_name == 'workflow_dispatch' && inputs.enable_deb == true
+
+      # If this was a manual workflow_dispatch, publish binaries.
 
       - name: Upload Artifact
         if: github.event_name == 'workflow_dispatch'
@@ -111,7 +105,6 @@ jobs:
             target/release/nym-network-requester
             target/release/nym-network-statistics
             target/release/nym-cli
-            target/release/nymvisor
           retention-days: 30
 
       # If this was a pull_request or nightly, upload to build server
@@ -129,14 +122,12 @@ jobs:
           cp target/release/nym-api $OUTPUT_DIR
           cp target/release/nym-network-requester $OUTPUT_DIR
           cp target/release/nym-network-statistics $OUTPUT_DIR
-          cp target/release/nymvisor $OUTPUT_DIR
           cp target/release/nym-cli $OUTPUT_DIR
           cp target/release/explorer-api $OUTPUT_DIR
-          if [ ${{ github.event_name == 'workflow_dispatch' && inputs.enable_deb == true }} = true ]; then
-            cp target/debian/*.deb $OUTPUT_DIR
-          fi
+          cp target/debian/*.deb $OUTPUT_DIR
 
       - name: Deploy branch to CI www
+        # if: github.event_name == 'schedule' || github.event_name == 'pull_request'
         continue-on-error: true
         uses: easingthemes/ssh-deploy@main
         env:

.github/workflows/publish-nym-binaries.yml

@@ -29,7 +29,6 @@ jobs:
       client_hash: ${{ steps.binary-hashes.outputs.client_hash }}
       mixnode_hash: ${{ steps.binary-hashes.outputs.mixnode_hash }}
       gateway_hash: ${{ steps.binary-hashes.outputs.gateway_hash }}
-      nymvisor_hash: ${{ steps.binary-hashes.outputs.nymvisor_hash }}
       socks5_hash: ${{ steps.binary-hashes.outputs.socks5_hash }}
       netreq_hash: ${{ steps.binary-hashes.outputs.netreq_hash }}
       cli_hash: ${{ steps.binary-hashes.outputs.cli_hash }}
@@ -37,7 +36,6 @@ jobs:
       client_version: ${{ steps.binary-versions.outputs.client_version }}
       mixnode_version: ${{ steps.binary-versions.outputs.mixnode_version }}
       gateway_version: ${{ steps.binary-versions.outputs.gateway_version }}
-      nymvisor_version: ${{ steps.binary-versions.outputs.nymvisor_version }}
       socks5_version: ${{ steps.binary-versions.outputs.socks5_version }}
       netreq_version: ${{ steps.binary-versions.outputs.netreq_version }}
       cli_version: ${{ steps.binary-versions.outputs.cli_version }}
@@ -80,7 +78,6 @@ jobs:
             target/release/nym-network-requester
             target/release/nym-network-statistics
             target/release/nym-cli
-            target/release/nymvisor
           retention-days: 30
 
       - id: create-release
@@ -98,7 +95,6 @@ jobs:
             target/release/nym-network-requester
             target/release/nym-network-statistics
             target/release/nym-cli
-            target/release/nymvisor
 
   push-release-data-client:
     if: ${{ (startsWith(github.ref, 'refs/tags/nym-binaries-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}

CHANGELOG.md

@@ -4,23 +4,6 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 
 ## [Unreleased]
 
-## [2024.1-marabou] (2024-02-15)
-
-**New Features:**
-- Introduced nymvisor support for nym-api, gateway, and mixnode binaries ([#4158])
-- Revamped nym-api execution with the addition of init and run commands ([#4225])
-
-**Enhancements:**
-- Implemented internal improvements for gateways to optimize internal packet routing
-- Improved routing score calculation
-
-**Bug Fixes:**
-- Resolved various bugs to enhance overall stability
-
-[#4158]: https://github.com/nymtech/nym/pull/4158
-[#4225]: https://github.com/nymtech/nym/pull/4225
-
-
 ## [2023.5-rolo] (2023-11-28)
 
 - Gateway won't open websocket listener until embedded Network Requester becomes available ([#4166])

Cargo.toml

@@ -27,12 +27,13 @@ members = [
     "common/client-libs/gateway-client",
     "common/client-libs/mixnet-client",
     "common/client-libs/validator-client",
+    "common/coconut-interface",
     "common/commands",
     "common/config",
     "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/ephemera",
     "common/cosmwasm-smart-contracts/group-contract",
     "common/cosmwasm-smart-contracts/mixnet-contract",
     "common/cosmwasm-smart-contracts/multisig-contract",
@@ -42,7 +43,6 @@ members = [
     "common/credential-storage",
     "common/credentials",
     "common/credential-utils",
-    "common/credentials-interface",
     "common/crypto",
     "common/dkg",
     "common/execute",
@@ -56,7 +56,6 @@ members = [
     "common/node-tester-utils",
     "common/nonexhaustive-delayqueue",
     "common/nymcoconut",
-    "common/nym-id",
     "common/nymsphinx",
     "common/nymsphinx/acknowledgements",
     "common/nymsphinx/addressing",
@@ -105,9 +104,8 @@ members = [
     "nym-outfox",
     "nym-validator-rewarder",
     "tools/internal/ssl-inject",
-    # "tools/internal/sdk-version-bump",
+    "tools/internal/sdk-version-bump",
     "tools/nym-cli",
-    "tools/nym-id-cli",
     "tools/nym-nr-query",
     "tools/nymvisor",
     "tools/ts-rs-cli",
@@ -145,7 +143,6 @@ anyhow = "1.0.71"
 async-trait = "0.1.68"
 axum = "0.6.20"
 base64 = "0.21.4"
-bs58 = "0.5.0"
 bip39 = { version = "2.0.0", features = ["zeroize"] }
 clap = "4.4.7"
 cfg-if = "1.0.0"
@@ -161,7 +158,7 @@ log = "0.4"
 once_cell = "1.7.2"
 parking_lot = "0.12.1"
 rand = "0.8.5"
-reqwest = { version = "0.11.22", default_features = false }
+reqwest = "0.11.22"
 schemars = "0.8.1"
 serde = "1.0.152"
 serde_json = "1.0.91"
@@ -171,7 +168,7 @@ time = "0.3.30"
 thiserror = "1.0.48"
 tokio = "1.33.0"
 tokio-util = "0.7.10"
-tokio-tungstenite = { version = "0.20.1" }
+tokio-tungstenite = "0.20.1"
 tracing = "0.1.37"
 tungstenite = { version = "0.20.1", default-features = false }
 ts-rs = "7.0.0"

clients/native/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nym-client"
-version = "1.1.33"
+version = "1.1.32"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 description = "Implementation of the Nym Client"
 edition = "2021"
@@ -21,24 +21,24 @@ futures = { workspace = true } # bunch of futures stuff, however, now that I thi
 # and the single instance of abortable we have should really be refactored anyway
 url = { workspace = true }
 
-bs58 = { workspace = true }
 clap = { workspace = true, features = ["cargo", "derive"] }
 dirs = "4.0"
+lazy_static = "1.4.0"
 log = { workspace = true } # self explanatory
+pretty_env_logger = "0.4" # for formatting log messages
 rand = { version = "0.7.3", features = ["wasm-bindgen"] } # rng-related traits + some rng implementation to use
 serde = { workspace = true, features = ["derive"] } # for config serialization/deserialization
 serde_json = { workspace = true }
 thiserror = { workspace = true }
 tap = "1.0.1"
-time = { workspace = true }
 tokio = { workspace = true, features = ["rt-multi-thread", "net", "signal"] } # async runtime
 tokio-tungstenite = { workspace = true }
-zeroize = { workspace = true }
 
 ## internal
 nym-bandwidth-controller = { path = "../../common/bandwidth-controller" }
 nym-bin-common = { path = "../../common/bin-common", features = ["output_format"] }
 nym-client-core = { path = "../../common/client-core", features = ["fs-surb-storage", "cli"] }
+nym-coconut-interface = { path = "../../common/coconut-interface" }
 nym-config = { path = "../../common/config" }
 nym-credential-storage = { path = "../../common/credential-storage" }
 nym-credentials = { path = "../../common/credentials" }
@@ -51,6 +51,5 @@ nym-task = { path = "../../common/task" }
 nym-topology = { path = "../../common/topology" }
 nym-validator-client = { path = "../../common/client-libs/validator-client", features = ["http-client"] }
 nym-client-websocket-requests = { path = "websocket-requests" }
-nym-id = { path = "../../common/nym-id" }
 
 [dev-dependencies]

clients/native/examples/js-examples/websocket/package-lock.json

@@ -2160,9 +2160,9 @@
       }
     },
     "node_modules/ip": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz",
-      "integrity": "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ==",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
+      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
       "dev": true
     },
     "node_modules/ipaddr.js": {
@@ -6157,9 +6157,9 @@
       "dev": true
     },
     "ip": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz",
-      "integrity": "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ==",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
+      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
       "dev": true
     },
     "ipaddr.js": {

clients/native/src/commands/import_credential.rs

@@ -1,54 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::commands::try_load_current_config;
-use crate::error::ClientError;
-use clap::ArgGroup;
-
-use nym_id::import_credential;
-use std::fs;
-use std::path::PathBuf;
-
-fn parse_encoded_credential_data(raw: &str) -> bs58::decode::Result<Vec<u8>> {
-    bs58::decode(raw).into_vec()
-}
-
-#[derive(clap::Args)]
-#[clap(group(ArgGroup::new("cred_data").required(true)))]
-pub(crate) struct Args {
-    /// Id of client that is going to import the credential
-    #[clap(long)]
-    pub id: String,
-
-    /// Explicitly provide the encoded credential data (as base58)
-    #[clap(long, group = "cred_data", value_parser = parse_encoded_credential_data)]
-    pub(crate) credential_data: Option<Vec<u8>>,
-
-    /// Specifies the path to file containing binary credential data
-    #[clap(long, group = "cred_data")]
-    pub(crate) credential_path: Option<PathBuf>,
-
-    // currently hidden as there exists only a single serialization standard
-    #[clap(long, hide = true)]
-    pub(crate) version: Option<u8>,
-}
-
-pub(crate) async fn execute(args: Args) -> Result<(), ClientError> {
-    let config = try_load_current_config(&args.id)?;
-
-    let credentials_store = nym_credential_storage::initialise_persistent_storage(
-        &config.storage_paths.common_paths.credentials_database,
-    )
-    .await;
-
-    let raw_credential = match args.credential_data {
-        Some(data) => data,
-        None => {
-            // SAFETY: one of those arguments must have been set
-            fs::read(args.credential_path.unwrap())?
-        }
-    };
-
-    import_credential(credentials_store, raw_credential, args.version).await?;
-    Ok(())
-}

clients/native/src/commands/mod.rs

@@ -8,6 +8,7 @@ use crate::client::config::{BaseClientConfig, Config};
 use crate::error::ClientError;
 use clap::CommandFactory;
 use clap::{Parser, Subcommand};
+use lazy_static::lazy_static;
 use log::{error, info};
 use nym_bin_common::bin_info;
 use nym_bin_common::completions::{fig_generate, ArgShell};
@@ -20,16 +21,18 @@ use nym_client_core::error::ClientCoreError;
 use nym_config::OptionalSet;
 use std::error::Error;
 use std::net::IpAddr;
-use std::sync::OnceLock;
 
 pub(crate) mod build_info;
-pub(crate) mod import_credential;
 pub(crate) mod init;
 pub(crate) mod run;
 
+lazy_static! {
+    pub static ref PRETTY_BUILD_INFORMATION: String = bin_info!().pretty_print();
+}
+
+// Helper for passing LONG_VERSION to clap
 fn pretty_build_info_static() -> &'static str {
-    static PRETTY_BUILD_INFORMATION: OnceLock<String> = OnceLock::new();
-    PRETTY_BUILD_INFORMATION.get_or_init(|| bin_info!().pretty_print())
+    &PRETTY_BUILD_INFORMATION
 }
 
 #[derive(Parser)]
@@ -55,9 +58,6 @@ pub(crate) enum Commands {
     /// Run the Nym client with provided configuration client optionally overriding set parameters
     Run(run::Run),
 
-    /// Import a pre-generated credential
-    ImportCredential(import_credential::Args),
-
     /// Show build information of this binary
     BuildInfo(build_info::BuildInfo),
 
@@ -86,7 +86,6 @@ pub(crate) async fn execute(args: Cli) -> Result<(), Box<dyn Error + Send + Sync
     match args.command {
         Commands::Init(m) => init::execute(m).await?,
         Commands::Run(m) => run::execute(m).await?,
-        Commands::ImportCredential(m) => import_credential::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),

clients/native/src/error.rs

@@ -1,13 +1,11 @@
 use nym_client_core::error::ClientCoreError;
 
-use nym_id::NymIdError;
-
 #[derive(thiserror::Error, Debug)]
 pub enum ClientError {
     #[error("I/O error: {0}")]
     IoError(#[from] std::io::Error),
 
-    #[error(transparent)]
+    #[error("client-core error: {0}")]
     ClientCoreError(#[from] ClientCoreError),
 
     #[error("Failed to load config for: {0}")]
@@ -22,7 +20,4 @@ pub enum ClientError {
 
     #[error("Attempted to start the client in invalid socket mode")]
     InvalidSocketMode,
-
-    #[error(transparent)]
-    NymIdError(#[from] NymIdError),
 }

clients/socks5/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nym-socks5-client"
-version = "1.1.33"
+version = "1.1.32"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 description = "A SOCKS5 localhost proxy that converts incoming messages to Sphinx and sends them to a Nym address"
 edition = "2021"
@@ -8,22 +8,22 @@ rust-version = "1.56"
 license.workspace = true
 
 [dependencies]
-bs58 = { workspace = true }
 clap = { workspace = true, features = ["cargo", "derive"] }
+lazy_static = "1.4.0"
 log = { workspace = true }
+pretty_env_logger = "0.4"
 serde = { workspace = true, features = ["derive"] } # for config serialization/deserialization
 serde_json = { workspace = true }
 tap = "1.0.1"
 thiserror = { workspace = true }
 tokio = { version = "1.24.1", features = ["rt-multi-thread", "net", "signal"] }
 rand = "0.7.3"
-time = { workspace = true }
 url = { workspace = true }
-zeroize = { workspace = true }
 
 # internal
 nym-bin-common = { path = "../../common/bin-common", features = ["output_format"] }
 nym-client-core = { path = "../../common/client-core", features = ["fs-surb-storage", "cli"] }
+nym-coconut-interface = { path = "../../common/coconut-interface" }
 nym-config = { path = "../../common/config" }
 nym-credentials = { path = "../../common/credentials" }
 nym-crypto = { path = "../../common/crypto" }
@@ -34,9 +34,7 @@ nym-sphinx = { path = "../../common/nymsphinx" }
 nym-ordered-buffer = { path = "../../common/socks5/ordered-buffer" }
 nym-pemstore = { path = "../../common/pemstore" }
 nym-topology = { path = "../../common/topology" }
-nym-topology-control = { path = "../../common/topology-control" }
 nym-socks5-client-core = { path = "../../common/socks5-client-core" }
-nym-id = { path = "../../common/nym-id" }
 
 [features]
 default = []

clients/socks5/src/commands/import_credential.rs

@@ -1,54 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::commands::try_load_current_config;
-use crate::error::Socks5ClientError;
-use clap::ArgGroup;
-
-use nym_id::import_credential;
-use std::fs;
-use std::path::PathBuf;
-
-fn parse_encoded_credential_data(raw: &str) -> bs58::decode::Result<Vec<u8>> {
-    bs58::decode(raw).into_vec()
-}
-
-#[derive(clap::Args)]
-#[clap(group(ArgGroup::new("cred_data").required(true)))]
-pub(crate) struct Args {
-    /// Id of client that is going to import the credential
-    #[clap(long)]
-    pub id: String,
-
-    /// Explicitly provide the encoded credential data (as base58)
-    #[clap(long, group = "cred_data", value_parser = parse_encoded_credential_data)]
-    pub(crate) credential_data: Option<Vec<u8>>,
-
-    /// Specifies the path to file containing binary credential data
-    #[clap(long, group = "cred_data")]
-    pub(crate) credential_path: Option<PathBuf>,
-
-    // currently hidden as there exists only a single serialization standard
-    #[clap(long, hide = true)]
-    pub(crate) version: Option<u8>,
-}
-
-pub(crate) async fn execute(args: Args) -> Result<(), Socks5ClientError> {
-    let config = try_load_current_config(&args.id)?;
-
-    let credentials_store = nym_credential_storage::initialise_persistent_storage(
-        &config.storage_paths.common_paths.credentials_database,
-    )
-    .await;
-
-    let raw_credential = match args.credential_data {
-        Some(data) => data,
-        None => {
-            // SAFETY: one of those arguments must have been set
-            fs::read(args.credential_path.unwrap())?
-        }
-    };
-
-    import_credential(credentials_store, raw_credential, args.version).await?;
-    Ok(())
-}

clients/socks5/src/commands/mod.rs

@@ -9,6 +9,7 @@ use crate::config::{BaseClientConfig, Config, SocksClientPaths};
 use crate::error::Socks5ClientError;
 use clap::CommandFactory;
 use clap::{Parser, Subcommand};
+use lazy_static::lazy_static;
 use log::{error, info};
 use nym_bin_common::bin_info;
 use nym_bin_common::completions::{fig_generate, ArgShell};
@@ -16,23 +17,25 @@ use nym_client_core::client::base_client::storage::gateway_details::{
     OnDiskGatewayDetails, PersistedGatewayDetails,
 };
 use nym_client_core::client::key_manager::persistence::OnDiskKeys;
-use nym_client_core::config::{GatewayEndpointConfig, TopologyStructure};
+use nym_client_core::client::topology_control::geo_aware_provider::CountryGroup;
+use nym_client_core::config::{GatewayEndpointConfig, GroupBy, TopologyStructure};
 use nym_client_core::error::ClientCoreError;
 use nym_config::OptionalSet;
 use nym_sphinx::params::{PacketSize, PacketType};
-use nym_topology_control::geo_aware_provider::{CountryGroup, GroupBy};
 use std::error::Error;
 use std::net::IpAddr;
-use std::sync::OnceLock;
 
 pub(crate) mod build_info;
-mod import_credential;
 pub mod init;
 pub(crate) mod run;
 
+lazy_static! {
+    pub static ref PRETTY_BUILD_INFORMATION: String = bin_info!().pretty_print();
+}
+
+// Helper for passing LONG_VERSION to clap
 fn pretty_build_info_static() -> &'static str {
-    static PRETTY_BUILD_INFORMATION: OnceLock<String> = OnceLock::new();
-    PRETTY_BUILD_INFORMATION.get_or_init(|| bin_info!().pretty_print())
+    &PRETTY_BUILD_INFORMATION
 }
 
 #[derive(Parser)]
@@ -58,9 +61,6 @@ pub(crate) enum Commands {
     /// Run the Nym client with provided configuration client optionally overriding set parameters
     Run(run::Run),
 
-    /// Import a pre-generated credential
-    ImportCredential(import_credential::Args),
-
     /// Show build information of this binary
     BuildInfo(build_info::BuildInfo),
 
@@ -92,7 +92,6 @@ pub(crate) async fn execute(args: Cli) -> Result<(), Box<dyn Error + Send + Sync
     match args.command {
         Commands::Init(m) => init::execute(m).await?,
         Commands::Run(m) => run::execute(m).await?,
-        Commands::ImportCredential(m) => import_credential::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),

clients/socks5/src/commands/run.rs

@@ -12,9 +12,9 @@ use log::*;
 use nym_bin_common::version_checker::is_minor_version_compatible;
 use nym_client_core::cli_helpers::client_run::CommonClientRunArgs;
 use nym_client_core::client::base_client::storage::OnDiskPersistent;
+use nym_client_core::client::topology_control::geo_aware_provider::CountryGroup;
 use nym_socks5_client_core::NymClient;
 use nym_sphinx::addressing::clients::Recipient;
-use nym_topology_control::geo_aware_provider::CountryGroup;
 use std::net::IpAddr;
 
 #[derive(Args, Clone)]

clients/socks5/src/error.rs

@@ -1,7 +1,5 @@
 use nym_client_core::error::ClientCoreError;
 
-use nym_id::NymIdError;
-
 #[derive(thiserror::Error, Debug)]
 pub enum Socks5ClientError {
     #[error("I/O error: {0}")]
@@ -20,9 +18,6 @@ pub enum Socks5ClientError {
     #[error("Fail to bind address")]
     FailToBindAddress,
 
-    #[error(transparent)]
+    #[error("client-core error: {0}")]
     ClientCoreError(#[from] ClientCoreError),
-
-    #[error(transparent)]
-    NymIdError(#[from] NymIdError),
 }

common/bandwidth-controller/Cargo.toml

@@ -8,16 +8,14 @@ license.workspace = true
 
 [dependencies]
 bip39 = { workspace = true }
-log = { workspace = true }
 rand = "0.7.3"
 thiserror = { workspace = true }
 url = { workspace = true }
 zeroize = { workspace = true }
 
-nym-coconut = { path = "../nymcoconut" }
+nym-coconut-interface = { path = "../coconut-interface" }
 nym-credential-storage = { path = "../credential-storage" }
 nym-credentials = { path = "../credentials" }
-nym-credentials-interface = { path = "../credentials-interface" }
 nym-crypto = { path = "../crypto", features = ["rand", "asymmetric", "symmetric", "aes", "hashing"] }
 nym-network-defaults = { path = "../network-defaults" }
 nym-validator-client = { path = "../client-libs/validator-client", default-features = false }

common/bandwidth-controller/src/acquire/mod.rs

@@ -2,18 +2,18 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::error::BandwidthControllerError;
-use nym_credential_storage::models::StorableIssuedCredential;
+use nym_coconut_interface::Base58;
 use nym_credential_storage::storage::Storage;
-use nym_credentials::coconut::bandwidth::{CredentialType, IssuanceBandwidthCredential};
+use nym_credentials::coconut::bandwidth::BandwidthVoucher;
 use nym_credentials::coconut::utils::obtain_aggregate_signature;
 use nym_crypto::asymmetric::{encryption, identity};
+use nym_network_defaults::VOUCHER_INFO;
 use nym_validator_client::coconut::all_coconut_api_clients;
 use nym_validator_client::nyxd::contract_traits::CoconutBandwidthSigningClient;
 use nym_validator_client::nyxd::contract_traits::DkgQueryClient;
 use nym_validator_client::nyxd::Coin;
 use rand::rngs::OsRng;
 use state::State;
-use zeroize::Zeroizing;
 
 pub mod state;
 
@@ -24,11 +24,13 @@ where
     let mut rng = OsRng;
     let signing_key = identity::PrivateKey::new(&mut rng);
     let encryption_key = encryption::PrivateKey::new(&mut rng);
+    let params = BandwidthVoucher::default_parameters();
+    let voucher_value = amount.amount.to_string();
 
     let tx_hash = client
         .deposit(
-            amount.clone(),
-            CredentialType::Voucher.to_string(),
+            amount,
+            String::from(VOUCHER_INFO),
             signing_key.public_key().to_base58_string(),
             encryption_key.public_key().to_base58_string(),
             None,
@@ -36,15 +38,21 @@ where
         .await?
         .transaction_hash;
 
-    let voucher =
-        IssuanceBandwidthCredential::new_voucher(amount, tx_hash, signing_key, encryption_key);
+    let voucher = BandwidthVoucher::new(
+        &params,
+        voucher_value,
+        VOUCHER_INFO.to_string(),
+        tx_hash,
+        signing_key,
+        encryption_key,
+    );
 
-    let state = State { voucher };
+    let state = State { voucher, params };
 
     Ok(state)
 }
 
-pub async fn get_bandwidth_voucher<C, St>(
+pub async fn get_credential<C, St>(
     state: &State,
     client: &C,
     storage: &St,
@@ -54,9 +62,6 @@ where
     St: Storage,
     <St as Storage>::StorageError: Send + Sync + 'static,
 {
-    // temporary
-    assert!(state.voucher.typ().is_voucher());
-
     let epoch_id = client.get_current_epoch().await?.epoch_id;
     let threshold = client
         .get_current_epoch_threshold()
@@ -65,23 +70,22 @@ where
 
     let coconut_api_clients = all_coconut_api_clients(client, epoch_id).await?;
 
-    let signature =
-        obtain_aggregate_signature(&state.voucher, &coconut_api_clients, threshold).await?;
-    let issued = state.voucher.to_issued_credential(signature, epoch_id);
-
-    // make sure the data gets zeroized after persisting it
-    let credential_data = Zeroizing::new(issued.pack_v1());
-    let storable = StorableIssuedCredential {
-        serialization_revision: issued.current_serialization_revision(),
-        credential_data: credential_data.as_ref(),
-        credential_type: issued.typ().to_string(),
-        epoch_id: epoch_id
-            .try_into()
-            .expect("our epoch is has run over u32::MAX!"),
-    };
-
+    let signature = obtain_aggregate_signature(
+        &state.params,
+        &state.voucher,
+        &coconut_api_clients,
+        threshold,
+    )
+    .await?;
     storage
-        .insert_issued_credential(storable)
+        .insert_coconut_credential(
+            state.voucher.get_voucher_value(),
+            VOUCHER_INFO.to_string(),
+            state.voucher.get_private_attributes()[0].to_bs58(),
+            state.voucher.get_private_attributes()[1].to_bs58(),
+            signature.to_bs58(),
+            epoch_id.to_string(),
+        )
         .await
         .map_err(|err| BandwidthControllerError::CredentialStorageError(Box::new(err)))
 }

common/bandwidth-controller/src/acquire/state.rs

@@ -1,14 +1,19 @@
-// Copyright 2022-2024 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2022-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use nym_credentials::coconut::bandwidth::IssuanceBandwidthCredential;
+use nym_coconut_interface::Parameters;
+use nym_credentials::coconut::bandwidth::BandwidthVoucher;
 
 pub struct State {
-    pub voucher: IssuanceBandwidthCredential,
+    pub voucher: BandwidthVoucher,
+    pub params: Parameters,
 }
 
 impl State {
-    pub fn new(voucher: IssuanceBandwidthCredential) -> Self {
-        State { voucher }
+    pub fn new(voucher: BandwidthVoucher) -> Self {
+        State {
+            voucher,
+            params: BandwidthVoucher::default_parameters(),
+        }
     }
 }

common/bandwidth-controller/src/error.rs

@@ -1,7 +1,7 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use nym_coconut::CoconutError;
+use nym_coconut_interface::CoconutError;
 use nym_credential_storage::error::StorageError;
 use nym_credentials::error::Error as CredentialsError;
 use nym_crypto::asymmetric::encryption::KeyRecoveryError;
@@ -21,9 +21,6 @@ pub enum BandwidthControllerError {
     #[error("There was a credential storage error - {0}")]
     CredentialStorageError(Box<dyn std::error::Error + Send + Sync>),
 
-    #[error("the credential storage does not contain any usable credentials")]
-    NoCredentialsAvailable,
-
     // this should really be fully incorporated into the above, but messing with coconut is the last thing I want to do now
     #[error(transparent)]
     StorageError(#[from] StorageError),
@@ -48,7 +45,4 @@ pub enum BandwidthControllerError {
 
     #[error("Threshold not set yet")]
     NoThreshold,
-
-    #[error("can't handle recovering storage with revision {stored}. {expected} was expected")]
-    UnsupportedCredentialStorageRevision { stored: u8, expected: u8 },
 }

common/bandwidth-controller/src/lib.rs

@@ -1,140 +1,80 @@
-// Copyright 2021-2024 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::error::BandwidthControllerError;
-use crate::utils::stored_credential_to_issued_bandwidth;
-use log::{debug, error, warn};
+use nym_credential_storage::error::StorageError;
 use nym_credential_storage::storage::Storage;
-use nym_credentials::coconut::bandwidth::issued::BandwidthCredentialIssuedDataVariant;
-use nym_credentials::coconut::bandwidth::CredentialSpendingData;
-use nym_credentials::coconut::utils::obtain_aggregate_verification_key;
-use nym_credentials::IssuedBandwidthCredential;
-use nym_credentials_interface::VerificationKey;
 use nym_validator_client::coconut::all_coconut_api_clients;
-use nym_validator_client::nym_api::EpochId;
 use nym_validator_client::nyxd::contract_traits::DkgQueryClient;
+use std::str::FromStr;
+use zeroize::Zeroizing;
+use {
+    nym_coconut_interface::Base58,
+    nym_credentials::coconut::{
+        bandwidth::prepare_for_spending, utils::obtain_aggregate_verification_key,
+    },
+};
 
 pub mod acquire;
 pub mod error;
-mod utils;
 
 pub struct BandwidthController<C, St> {
     storage: St,
     client: C,
 }
 
-pub struct PreparedCredential {
-    /// The cryptographic material required for spending the underlying credential.
-    pub data: CredentialSpendingData,
-
-    /// The (DKG) epoch id under which the credential has been issued so that the verifier
-    /// could use correct verification key for validation.
-    pub epoch_id: EpochId,
-
-    /// The database id of the stored credential.
-    pub credential_id: i64,
-}
-
-pub struct RetrievedCredential {
-    pub credential: IssuedBandwidthCredential,
-    pub credential_id: i64,
-}
-
 impl<C, St: Storage> BandwidthController<C, St> {
     pub fn new(storage: St, client: C) -> Self {
         BandwidthController { storage, client }
     }
 
-    /// Tries to retrieve one of the stored, unused credentials that hasn't yet expired.
-    /// It marks any retrieved intermediate credentials as expired.
-    pub async fn get_next_usable_credential(
-        &self,
-    ) -> Result<RetrievedCredential, BandwidthControllerError>
-    where
-        <St as Storage>::StorageError: Send + Sync + 'static,
-    {
-        loop {
-            let Some(maybe_next) = self
-                .storage
-                .get_next_unspent_credential()
-                .await
-                .map_err(|err| BandwidthControllerError::CredentialStorageError(Box::new(err)))?
-            else {
-                return Err(BandwidthControllerError::NoCredentialsAvailable);
-            };
-            let id = maybe_next.id;
-
-            // try to deserialize it
-            let valid_credential = match stored_credential_to_issued_bandwidth(maybe_next) {
-                // check if it has already expired
-                Ok(credential) => match credential.variant_data() {
-                    BandwidthCredentialIssuedDataVariant::Voucher(_) => {
-                        debug!("credential {id} is a bandwidth voucher");
-                        credential
-                    }
-                    BandwidthCredentialIssuedDataVariant::FreePass(freepass_info) => {
-                        debug!("credential {id} is a free pass");
-                        if freepass_info.expired() {
-                            warn!("the free pass (id: {id}) has already expired! The expiration was set to {}", freepass_info.expiry_date());
-                            self.storage.mark_expired(id).await.map_err(|err| {
-                                BandwidthControllerError::CredentialStorageError(Box::new(err))
-                            })?;
-                            continue;
-                        }
-                        credential
-                    }
-                },
-                Err(err) => {
-                    error!("failed to deserialize credential with id {id}: {err}. it may need to be manually removed from the storage");
-                    return Err(err);
-                }
-            };
-            return Ok(RetrievedCredential {
-                credential: valid_credential,
-                credential_id: id,
-            });
-        }
-    }
-
     pub fn storage(&self) -> &St {
         &self.storage
     }
 
-    async fn get_aggregate_verification_key(
+    pub async fn prepare_coconut_credential(
         &self,
-        epoch_id: EpochId,
-    ) -> Result<VerificationKey, BandwidthControllerError>
+    ) -> Result<(nym_coconut_interface::Credential, i64), BandwidthControllerError>
     where
         C: DkgQueryClient + Sync + Send,
         <St as Storage>::StorageError: Send + Sync + 'static,
     {
+        let bandwidth_credential = self
+            .storage
+            .get_next_coconut_credential()
+            .await
+            .map_err(|err| BandwidthControllerError::CredentialStorageError(Box::new(err)))?;
+        let voucher_value = u64::from_str(&bandwidth_credential.voucher_value)
+            .map_err(|_| StorageError::InconsistentData)?;
+        let voucher_info = bandwidth_credential.voucher_info.clone();
+        let serial_number = Zeroizing::new(nym_coconut_interface::Attribute::try_from_bs58(
+            bandwidth_credential.serial_number,
+        )?);
+        let binding_number = Zeroizing::new(nym_coconut_interface::Attribute::try_from_bs58(
+            bandwidth_credential.binding_number,
+        )?);
+        let signature =
+            nym_coconut_interface::Signature::try_from_bs58(bandwidth_credential.signature)?;
+        let epoch_id = u64::from_str(&bandwidth_credential.epoch_id)
+            .map_err(|_| StorageError::InconsistentData)?;
+
         let coconut_api_clients = all_coconut_api_clients(&self.client, epoch_id).await?;
-        Ok(obtain_aggregate_verification_key(&coconut_api_clients)?)
-    }
 
-    pub async fn prepare_bandwidth_credential(
-        &self,
-    ) -> Result<PreparedCredential, BandwidthControllerError>
-    where
-        C: DkgQueryClient + Sync + Send,
-        <St as Storage>::StorageError: Send + Sync + 'static,
-    {
-        let retrieved_credential = self.get_next_usable_credential().await?;
+        let verification_key = obtain_aggregate_verification_key(&coconut_api_clients).await?;
 
-        let epoch_id = retrieved_credential.credential.epoch_id();
-        let credential_id = retrieved_credential.credential_id;
-
-        let verification_key = self.get_aggregate_verification_key(epoch_id).await?;
-
-        let spend_request = retrieved_credential
-            .credential
-            .prepare_for_spending(&verification_key)?;
-
-        Ok(PreparedCredential {
-            data: spend_request,
-            epoch_id,
-            credential_id,
-        })
+        // the below would only be executed once we know where we want to spend it (i.e. which gateway and stuff)
+        Ok((
+            prepare_for_spending(
+                voucher_value,
+                voucher_info,
+                &serial_number,
+                &binding_number,
+                epoch_id,
+                &signature,
+                &verification_key,
+            )?,
+            bandwidth_credential.id,
+        ))
     }
 
     pub async fn consume_credential(&self, id: i64) -> Result<(), BandwidthControllerError>
@@ -153,7 +93,7 @@ impl<C, St: Storage> BandwidthController<C, St> {
 impl<C, St> Clone for BandwidthController<C, St>
 where
     C: Clone,
-    St: Clone,
+    St: Storage + Clone,
 {
     fn clone(&self) -> Self {
         BandwidthController {

common/bandwidth-controller/src/utils.rs

@@ -1,22 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::error::BandwidthControllerError;
-use nym_credential_storage::models::StoredIssuedCredential;
-use nym_credentials::coconut::bandwidth::issued::CURRENT_SERIALIZATION_REVISION;
-use nym_credentials::coconut::bandwidth::IssuedBandwidthCredential;
-
-pub fn stored_credential_to_issued_bandwidth(
-    cred: StoredIssuedCredential,
-) -> Result<IssuedBandwidthCredential, BandwidthControllerError> {
-    if cred.serialization_revision != CURRENT_SERIALIZATION_REVISION {
-        return Err(
-            BandwidthControllerError::UnsupportedCredentialStorageRevision {
-                stored: cred.serialization_revision,
-                expected: CURRENT_SERIALIZATION_REVISION,
-            },
-        );
-    }
-
-    Ok(IssuedBandwidthCredential::unpack_v1(&cred.credential_data)?)
-}

common/bin-common/src/build_information/mod.rs

@@ -69,35 +69,6 @@ impl BinaryBuildInformation {
         }
     }
 
-    // Varient where we want to use the metadata generated by vergen in the consuming crate.
-    pub const fn new_with_local_vergen(
-        binary_name: &'static str,
-        build_timestamp: &'static str,
-        build_version: &'static str,
-        commit_sha: &'static str,
-        commit_timestamp: &'static str,
-        commit_branch: &'static str,
-    ) -> Self {
-        let cargo_debug = env!("VERGEN_CARGO_DEBUG");
-        let cargo_profile = if const_str::equal!(cargo_debug, "true") {
-            "debug"
-        } else {
-            "release"
-        };
-
-        BinaryBuildInformation {
-            binary_name,
-            build_timestamp,
-            build_version,
-            commit_sha,
-            commit_timestamp,
-            commit_branch,
-            rustc_version: env!("VERGEN_RUSTC_SEMVER"),
-            rustc_channel: env!("VERGEN_RUSTC_CHANNEL"),
-            cargo_profile,
-        }
-    }
-
     pub fn to_owned(&self) -> BinaryBuildInformationOwned {
         BinaryBuildInformationOwned {
             binary_name: self.binary_name.to_owned(),
@@ -216,33 +187,3 @@ macro_rules! bin_info_owned {
         .to_owned()
     };
 }
-
-// variant that picks up the vergen build information generated by the build.rs in the consumer
-// crate.
-#[macro_export]
-macro_rules! bin_info_local_vergen {
-    () => {
-        $crate::build_information::BinaryBuildInformation::new_with_local_vergen(
-            env!("CARGO_PKG_NAME"),
-            env!("VERGEN_BUILD_TIMESTAMP"),
-            env!("CARGO_PKG_VERSION"),
-            env!("VERGEN_GIT_SHA"),
-            env!("VERGEN_GIT_COMMIT_TIMESTAMP"),
-            env!("VERGEN_GIT_BRANCH"),
-        )
-    };
-}
-
-#[macro_export]
-macro_rules! bin_info_local_vergen_owned {
-    () => {
-        $crate::build_information::BinaryBuildInformation::new_with_local_vergen(
-            env!("CARGO_PKG_NAME"),
-            env!("VERGEN_BUILD_TIMESTAMP"),
-            env!("CARGO_PKG_VERSION"),
-            env!("VERGEN_GIT_SHA"),
-            env!("VERGEN_GIT_COMMIT_TIMESTAMP"),
-            env!("VERGEN_GIT_BRANCH"),
-        )
-    };
-}

common/client-core/Cargo.toml

@@ -42,7 +42,6 @@ nym-nonexhaustive-delayqueue = { path = "../nonexhaustive-delayqueue" }
 nym-sphinx = { path = "../nymsphinx" }
 nym-pemstore = { path = "../pemstore" }
 nym-topology = { path = "../topology", features = ["serializable"] }
-nym-topology-control = { path = "../topology-control" }
 nym-validator-client = { path = "../client-libs/validator-client", default-features = false }
 nym-task = { path = "../task" }
 nym-credential-storage = { path = "../credential-storage" }

common/client-core/src/client/base_client/mod.rs

@@ -3,6 +3,7 @@
 
 use super::packet_statistics_control::PacketStatisticsReporter;
 use super::received_buffer::ReceivedBufferMessage;
+use super::topology_control::geo_aware_provider::GeoAwareTopologyProvider;
 use crate::client::base_client::storage::gateway_details::GatewayDetailsStore;
 use crate::client::base_client::storage::MixnetClientStorage;
 use crate::client::cover_traffic_stream::LoopCoverTrafficStream;
@@ -21,6 +22,10 @@ use crate::client::replies::reply_controller::{ReplyControllerReceiver, ReplyCon
 use crate::client::replies::reply_storage::{
     CombinedReplyStorage, PersistentReplyStorage, ReplyStorageBackend, SentReplyKeys,
 };
+use crate::client::topology_control::nym_api_provider::NymApiTopologyProvider;
+use crate::client::topology_control::{
+    TopologyAccessor, TopologyRefresher, TopologyRefresherConfig,
+};
 use crate::config::{Config, DebugConfig};
 use crate::error::ClientCoreError;
 use crate::init::{
@@ -45,12 +50,9 @@ use nym_task::connections::{ConnectionCommandReceiver, ConnectionCommandSender,
 use nym_task::{TaskClient, TaskHandle};
 use nym_topology::provider_trait::TopologyProvider;
 use nym_topology::HardcodedTopologyProvider;
-use nym_topology_control::geo_aware_provider::GeoAwareTopologyProvider;
-use nym_topology_control::nym_api_provider::NymApiTopologyProvider;
-use nym_topology_control::{TopologyAccessor, TopologyRefresher, TopologyRefresherConfig};
 use nym_validator_client::nyxd::contract_traits::DkgQueryClient;
 use std::fmt::Debug;
-use std::os::raw::c_int as RawFd;
+use std::os::fd::RawFd;
 use std::path::Path;
 use std::sync::Arc;
 use url::Url;
@@ -102,12 +104,6 @@ pub struct ClientState {
     pub shared_lane_queue_lengths: LaneQueueLengths,
     pub reply_controller_sender: ReplyControllerSender,
     pub topology_accessor: TopologyAccessor,
-    pub gateway_connection: GatewayConnection,
-}
-
-#[derive(Clone, Copy, Debug)]
-pub struct GatewayConnection {
-    pub gateway_ws_fd: Option<RawFd>,
 }
 
 pub enum ClientInputStatus {
@@ -671,7 +667,6 @@ where
             shutdown.fork("gateway_transceiver"),
         )
         .await?;
-        let gateway_ws_fd = gateway_transceiver.ws_fd();
 
         let reply_storage = Self::setup_persistent_reply_storage(
             reply_storage_backend,
@@ -689,6 +684,7 @@ where
             packet_stats_reporter.clone(),
         );
 
+        let gateway_fd = gateway_transceiver.ws_fd();
         // The message_sender is the transmitter for any component generating sphinx packets
         // that are to be sent to the mixnet. They are used by cover traffic stream and real
         // traffic stream.
@@ -761,11 +757,11 @@ where
                     received_buffer_request_sender,
                 },
             },
+            gateway_fd,
             client_state: ClientState {
                 shared_lane_queue_lengths,
                 reply_controller_sender,
                 topology_accessor: shared_topology_accessor,
-                gateway_connection: GatewayConnection { gateway_ws_fd },
             },
             task_handle: shutdown,
         })
@@ -777,6 +773,7 @@ pub struct BaseClient {
     pub client_input: ClientInputStatus,
     pub client_output: ClientOutputStatus,
     pub client_state: ClientState,
+    pub gateway_fd: Option<RawFd>,
 
     pub task_handle: TaskHandle,
 }

common/client-core/src/client/cover_traffic_stream.rs

@@ -3,6 +3,7 @@
 
 use crate::client::mix_traffic::BatchMixMessageSender;
 use crate::client::packet_statistics_control::{PacketStatisticsEvent, PacketStatisticsReporter};
+use crate::client::topology_control::TopologyAccessor;
 use crate::{config, spawn_future};
 use futures::task::{Context, Poll};
 use futures::{Future, Stream, StreamExt};
@@ -12,7 +13,6 @@ use nym_sphinx::addressing::clients::Recipient;
 use nym_sphinx::cover::generate_loop_cover_packet;
 use nym_sphinx::params::{PacketSize, PacketType};
 use nym_sphinx::utils::sample_poisson_duration;
-use nym_topology_control::TopologyAccessor;
 use rand::{rngs::OsRng, CryptoRng, Rng};
 use std::pin::Pin;
 use std::sync::Arc;

common/client-core/src/client/mix_traffic/transceiver.rs

@@ -8,7 +8,7 @@ use nym_gateway_client::GatewayClient;
 pub use nym_gateway_client::{GatewayPacketRouter, PacketRouter};
 use nym_sphinx::forwarding::packet::MixPacket;
 use std::fmt::Debug;
-use std::os::raw::c_int as RawFd;
+use std::os::fd::RawFd;
 use thiserror::Error;
 
 #[cfg(not(target_arch = "wasm32"))]

common/client-core/src/client/mod.rs

@@ -11,4 +11,5 @@ pub(crate) mod packet_statistics_control;
 pub mod real_messages_control;
 pub mod received_buffer;
 pub mod replies;
+pub mod topology_control;
 pub(crate) mod transmission_buffer;

common/client-core/src/client/real_messages_control/message_handler.rs

@@ -7,6 +7,7 @@ use crate::client::real_messages_control::real_traffic_stream::{
 };
 use crate::client::real_messages_control::{AckActionSender, Action};
 use crate::client::replies::reply_storage::{ReceivedReplySurbsMap, SentReplyKeys, UsedSenderTags};
+use crate::client::topology_control::{TopologyAccessor, TopologyReadPermit};
 use log::{debug, error, info, trace, warn};
 use nym_sphinx::acknowledgements::AckKey;
 use nym_sphinx::addressing::clients::Recipient;
@@ -19,7 +20,6 @@ use nym_sphinx::preparer::{MessagePreparer, PreparedFragment};
 use nym_sphinx::Delay;
 use nym_task::connections::TransmissionLane;
 use nym_topology::{NymTopology, NymTopologyError};
-use nym_topology_control::{TopologyAccessor, TopologyReadPermit};
 use rand::{CryptoRng, Rng};
 use std::collections::HashMap;
 use std::sync::Arc;

common/client-core/src/client/real_messages_control/mod.rs

@@ -17,6 +17,7 @@ use crate::{
     client::{
         inbound_messages::InputMessageReceiver, mix_traffic::BatchMixMessageSender,
         real_messages_control::acknowledgement_control::AcknowledgementControllerConnectors,
+        topology_control::TopologyAccessor,
     },
     spawn_future,
 };
@@ -27,7 +28,6 @@ use nym_sphinx::acknowledgements::AckKey;
 use nym_sphinx::addressing::clients::Recipient;
 use nym_sphinx::params::PacketType;
 use nym_task::connections::{ConnectionCommandReceiver, LaneQueueLengths};
-use nym_topology_control::TopologyAccessor;
 use rand::{rngs::OsRng, CryptoRng, Rng};
 use std::sync::Arc;
 

common/client-core/src/client/real_messages_control/real_traffic_stream.rs

@@ -5,6 +5,7 @@ use self::sending_delay_controller::SendingDelayController;
 use crate::client::mix_traffic::BatchMixMessageSender;
 use crate::client::packet_statistics_control::{PacketStatisticsEvent, PacketStatisticsReporter};
 use crate::client::real_messages_control::acknowledgement_control::SentPacketNotificationSender;
+use crate::client::topology_control::TopologyAccessor;
 use crate::client::transmission_buffer::TransmissionBuffer;
 use crate::config;
 use futures::task::{Context, Poll};
@@ -21,7 +22,6 @@ use nym_sphinx::utils::sample_poisson_duration;
 use nym_task::connections::{
     ConnectionCommand, ConnectionCommandReceiver, ConnectionId, LaneQueueLengths, TransmissionLane,
 };
-use nym_topology_control::TopologyAccessor;
 use rand::{CryptoRng, Rng};
 use std::pin::Pin;
 use std::sync::Arc;

common/client-core/src/client/topology_control/accessor.rs

@@ -49,7 +49,7 @@ impl<'a> Deref for TopologyReadPermit<'a> {
 impl<'a> TopologyReadPermit<'a> {
     /// Using provided topology read permit, tries to get an immutable reference to the underlying
     /// topology. For obvious reasons the lifetime of the topology reference is bound to the permit.
-    pub fn try_get_valid_topology_ref(
+    pub(crate) fn try_get_valid_topology_ref(
         &'a self,
         ack_recipient: &Recipient,
         packet_recipient: Option<&Recipient>,
@@ -83,16 +83,6 @@ impl<'a> TopologyReadPermit<'a> {
 
         Ok(topology)
     }
-
-    pub fn try_get_raw_topology_ref(&'a self) -> Result<&'a NymTopology, NymTopologyError> {
-        // 1. Have we managed to get anything from the refresher, i.e. have the nym-api queries gone through?
-        let topology = self
-            .permit
-            .as_ref()
-            .ok_or(NymTopologyError::EmptyNetworkTopology)?;
-
-        Ok(topology)
-    }
 }
 
 impl<'a> From<RwLockReadGuard<'a, Option<NymTopology>>> for TopologyReadPermit<'a> {

common/client-core/src/client/topology_control/geo_aware_provider.rs

@@ -3,7 +3,6 @@ use std::{collections::HashMap, fmt};
 use log::{debug, error, info};
 use nym_explorer_client::{ExplorerClient, PrettyDetailedMixNodeBond};
 use nym_network_defaults::var_names::EXPLORER_API;
-use nym_sphinx::addressing::clients::Recipient;
 use nym_topology::{
     nym_topology_from_detailed,
     provider_trait::{async_trait, TopologyProvider},
@@ -15,6 +14,8 @@ use serde::{Deserialize, Serialize};
 use tap::TapOptional;
 use url::Url;
 
+use crate::config::GroupBy;
+
 const MIN_NODES_PER_LAYER: usize = 1;
 
 fn create_explorer_client() -> Option<ExplorerClient> {
@@ -37,22 +38,6 @@ fn create_explorer_client() -> Option<ExplorerClient> {
     Some(client)
 }
 
-#[allow(clippy::large_enum_variant)]
-#[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub enum GroupBy {
-    CountryGroup(CountryGroup),
-    NymAddress(Recipient),
-}
-
-impl std::fmt::Display for GroupBy {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            GroupBy::CountryGroup(group) => write!(f, "group: {}", group),
-            GroupBy::NymAddress(address) => write!(f, "address: {}", address),
-        }
-    }
-}
-
 #[derive(Copy, Clone, Hash, PartialEq, Eq, Serialize, Deserialize, Debug)]
 pub enum CountryGroup {
     Europe,
@@ -294,14 +279,6 @@ impl GeoAwareTopologyProvider {
             Ok(gateways) => gateways,
         };
 
-        let nodes_described = match self.validator_client.get_cached_described_nodes().await {
-            Err(err) => {
-                error!("failed to get described nodes - {err}");
-                return None;
-            }
-            Ok(epoch) => epoch,
-        };
-
         // Also fetch mixnodes cached by explorer-api, with the purpose of getting their
         // geolocation.
         debug!("Fetching mixnodes from explorer-api...");
@@ -361,7 +338,7 @@ impl GeoAwareTopologyProvider {
             .filter(|m| filtered_mixnode_ids.contains(&m.mix_id()))
             .collect::<Vec<_>>();
 
-        let topology = nym_topology_from_detailed(mixnodes, gateways, nodes_described)
+        let topology = nym_topology_from_detailed(mixnodes, gateways)
             .filter_system_version(&self.client_version);
 
         // TODO: return real error type

common/client-core/src/client/topology_control/mod.rs

@@ -1,11 +1,11 @@
 // Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-pub use accessor::{TopologyAccessor, TopologyReadPermit};
+use crate::spawn_future;
+pub(crate) use accessor::{TopologyAccessor, TopologyReadPermit};
 use futures::StreamExt;
 use log::*;
 use nym_sphinx::addressing::nodes::NodeIdentity;
-use nym_task::spawn;
 use nym_topology::provider_trait::TopologyProvider;
 use nym_topology::NymTopologyError;
 use std::time::Duration;
@@ -16,9 +16,9 @@ use tokio::time::sleep;
 #[cfg(target_arch = "wasm32")]
 use wasmtimer::tokio::sleep;
 
-pub mod accessor;
+mod accessor;
 pub mod geo_aware_provider;
-pub mod nym_api_provider;
+pub(crate) mod nym_api_provider;
 
 // TODO: move it to config later
 const MAX_FAILURE_COUNT: usize = 10;
@@ -142,7 +142,7 @@ impl TopologyRefresher {
     }
 
     pub fn start_with_shutdown(mut self, mut shutdown: nym_task::TaskClient) {
-        spawn(async move {
+        spawn_future(async move {
             debug!("Started TopologyRefresher with graceful shutdown support");
 
             #[cfg(not(target_arch = "wasm32"))]

common/client-core/src/client/topology_control/nym_api_provider.rs

@@ -9,7 +9,7 @@ use rand::prelude::SliceRandom;
 use rand::thread_rng;
 use url::Url;
 
-pub struct NymApiTopologyProvider {
+pub(crate) struct NymApiTopologyProvider {
     validator_client: nym_validator_client::client::NymApiClient,
     nym_api_urls: Vec<Url>,
 
@@ -18,7 +18,7 @@ pub struct NymApiTopologyProvider {
 }
 
 impl NymApiTopologyProvider {
-    pub fn new(mut nym_api_urls: Vec<Url>, client_version: String) -> Self {
+    pub(crate) fn new(mut nym_api_urls: Vec<Url>, client_version: String) -> Self {
         nym_api_urls.shuffle(&mut thread_rng());
 
         NymApiTopologyProvider {
@@ -77,22 +77,13 @@ impl NymApiTopologyProvider {
             Ok(gateways) => gateways,
         };
 
-        let nodes_described = match self.validator_client.get_cached_described_nodes().await {
-            Err(err) => {
-                error!("failed to get described nodes - {err}");
-                return None;
-            }
-            Ok(epoch) => epoch,
-        };
-
-        let topology = nym_topology_from_detailed(mixnodes, gateways, nodes_described.clone())
+        let topology = nym_topology_from_detailed(mixnodes, gateways)
             .filter_system_version(&self.client_version);
 
         if let Err(err) = self.check_layer_distribution(&topology) {
             warn!("The current filtered active topology has extremely skewed layer distribution. It cannot be used: {err}");
             self.use_next_nym_api();
-            let empty_topology = NymTopology::empty().with_described_nodes(nodes_described);
-            Some(empty_topology)
+            None
         } else {
             Some(topology)
         }

common/client-core/src/config/mod.rs

@@ -1,12 +1,14 @@
 // Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::error::ClientCoreError;
+use crate::{client::topology_control::geo_aware_provider::CountryGroup, error::ClientCoreError};
 use nym_config::defaults::NymNetworkDetails;
 use nym_crypto::asymmetric::identity;
 use nym_gateway_client::client::GatewayConfig;
-use nym_sphinx::params::{PacketSize, PacketType};
-use nym_topology_control::geo_aware_provider::GroupBy;
+use nym_sphinx::{
+    addressing::clients::Recipient,
+    params::{PacketSize, PacketType},
+};
 use serde::{Deserialize, Serialize};
 use std::time::Duration;
 use url::Url;
@@ -539,6 +541,22 @@ pub enum TopologyStructure {
     GeoAware(GroupBy),
 }
 
+#[allow(clippy::large_enum_variant)]
+#[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)]
+pub enum GroupBy {
+    CountryGroup(CountryGroup),
+    NymAddress(Recipient),
+}
+
+impl std::fmt::Display for GroupBy {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            GroupBy::CountryGroup(group) => write!(f, "group: {}", group),
+            GroupBy::NymAddress(address) => write!(f, "address: {}", address),
+        }
+    }
+}
+
 impl Default for Topology {
     fn default() -> Self {
         Topology {

common/client-core/src/config/old_config_v1_1_30.rs

@@ -1,15 +1,15 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::client::topology_control::geo_aware_provider::CountryGroup;
 use crate::config::{
-    Acknowledgements, Client, Config, CoverTraffic, DebugConfig, GatewayConnection, ReplySurbs,
-    Topology, TopologyStructure, Traffic,
+    Acknowledgements, Client, Config, CoverTraffic, DebugConfig, GatewayConnection, GroupBy,
+    ReplySurbs, Topology, TopologyStructure, Traffic,
 };
 use nym_sphinx::{
     addressing::clients::Recipient,
     params::{PacketSize, PacketType},
 };
-use nym_topology_control::geo_aware_provider::{CountryGroup, GroupBy};
 use serde::{Deserialize, Serialize};
 use std::time::Duration;
 use url::Url;

common/client-libs/gateway-client/Cargo.toml

@@ -19,7 +19,7 @@ tokio = { version = "1.24.1", features = ["macros"] }
 
 # internal
 nym-bandwidth-controller = { path = "../../bandwidth-controller" }
-nym-credentials = { path = "../../credentials" }
+nym-coconut-interface = { path = "../../coconut-interface" }
 nym-credential-storage = { path = "../../credential-storage" }
 nym-crypto = { path = "../../crypto" }
 nym-gateway-requests = { path = "../../../gateway/gateway-requests" }
@@ -48,7 +48,7 @@ features = ["net", "sync", "time"]
 workspace = true
 # the choice of this particular tls feature was arbitrary;
 # if you reckon a different one would be more appropriate, feel free to change it
-# features = ["native-tls"]
+features = ["native-tls"]
 
 # wasm-only dependencies
 [target."cfg(target_arch = \"wasm32\")".dependencies.wasm-bindgen]

common/client-libs/gateway-client/src/client.rs

@@ -1,4 +1,4 @@
-// Copyright 2021-2024 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::error::GatewayClientError;
@@ -6,42 +6,38 @@ use crate::packet_router::PacketRouter;
 pub use crate::packet_router::{
     AcknowledgementReceiver, AcknowledgementSender, MixnetMessageReceiver, MixnetMessageSender,
 };
-use crate::socket_state::{ws_fd, PartiallyDelegated, SocketState};
+use crate::socket_state::{PartiallyDelegated, SocketState};
 use crate::traits::GatewayPacketRouter;
 use crate::{cleanup_socket_message, try_decrypt_binary_message};
 use futures::{SinkExt, StreamExt};
 use log::*;
 use nym_bandwidth_controller::BandwidthController;
+use nym_coconut_interface::Credential;
 use nym_credential_storage::ephemeral_storage::EphemeralStorage as EphemeralCredentialStorage;
 use nym_credential_storage::storage::Storage as CredentialStorage;
-use nym_credentials::CredentialSpendingData;
 use nym_crypto::asymmetric::identity;
 use nym_gateway_requests::authentication::encrypted_address::EncryptedAddressBytes;
 use nym_gateway_requests::iv::IV;
 use nym_gateway_requests::registration::handshake::{client_handshake, SharedKeys};
-use nym_gateway_requests::{
-    BinaryRequest, ClientControlRequest, ServerResponse, CREDENTIAL_UPDATE_V1_PROTOCOL_VERSION,
-    CURRENT_PROTOCOL_VERSION,
-};
+use nym_gateway_requests::{BinaryRequest, ClientControlRequest, ServerResponse, PROTOCOL_VERSION};
 use nym_network_defaults::{REMAINING_BANDWIDTH_THRESHOLD, TOKENS_TO_BURN};
 use nym_sphinx::forwarding::packet::MixPacket;
 use nym_task::TaskClient;
 use nym_validator_client::nyxd::contract_traits::DkgQueryClient;
 use rand::rngs::OsRng;
 use std::convert::TryFrom;
+use std::os::fd::AsRawFd;
+use std::os::fd::RawFd;
 use std::sync::Arc;
 use std::time::Duration;
 use tungstenite::protocol::Message;
 
-#[cfg(unix)]
-use std::os::fd::RawFd;
 #[cfg(not(target_arch = "wasm32"))]
 use tokio::time::sleep;
 #[cfg(not(target_arch = "wasm32"))]
 use tokio_tungstenite::connect_async;
+use tokio_tungstenite::MaybeTlsStream;
 
-#[cfg(not(unix))]
-use std::os::raw::c_int as RawFd;
 #[cfg(target_arch = "wasm32")]
 use wasm_utils::websocket::JSWebsocket;
 #[cfg(target_arch = "wasm32")]
@@ -86,9 +82,6 @@ pub struct GatewayClient<C, St = EphemeralCredentialStorage> {
     /// Delay between each subsequent reconnection attempt.
     reconnection_backoff: Duration,
 
-    // currently unused (but populated)
-    negotiated_protocol: Option<u8>,
-
     /// Listen to shutdown messages.
     shutdown: TaskClient,
 }
@@ -118,7 +111,6 @@ impl<C, St> GatewayClient<C, St> {
             should_reconnect_on_failure: true,
             reconnection_attempts: DEFAULT_RECONNECTION_ATTEMPTS,
             reconnection_backoff: DEFAULT_RECONNECTION_BACKOFF,
-            negotiated_protocol: None,
             shutdown,
         }
     }
@@ -159,9 +151,16 @@ impl<C, St> GatewayClient<C, St> {
 
     pub fn ws_fd(&self) -> Option<RawFd> {
         match &self.connection {
-            SocketState::Available(conn) => ws_fd(conn.as_ref()),
-            SocketState::PartiallyDelegated(conn) => conn.ws_fd(),
-            _ => None,
+            SocketState::Available(conn) => match conn.get_ref() {
+                MaybeTlsStream::Plain(stream) => Some(stream.as_raw_fd()),
+                MaybeTlsStream::NativeTls(stream) => Some(stream.as_raw_fd()),
+                &_ => None,
+            },
+            SocketState::PartiallyDelegated(conn) => Some(conn.ws_fd()),
+            _ => {
+                log::warn!("No fd yet");
+                None
+            }
         }
     }
 
@@ -395,8 +394,6 @@ impl<C, St> GatewayClient<C, St> {
         &self,
         gateway_protocol: Option<u8>,
     ) -> Result<(), GatewayClientError> {
-        debug!("gateway protocol: {gateway_protocol:?}, ours: {CURRENT_PROTOCOL_VERSION}");
-
         // right now there are no failure cases here, but this might change in the future
         match gateway_protocol {
             None => {
@@ -404,17 +401,17 @@ impl<C, St> GatewayClient<C, St> {
                 // note: in +1.2.0 we will have to return a hard error here
                 Ok(())
             }
-            Some(v) if v > CURRENT_PROTOCOL_VERSION => {
+            Some(v) if v != PROTOCOL_VERSION => {
                 let err = GatewayClientError::IncompatibleProtocol {
                     gateway: Some(v),
-                    current: CURRENT_PROTOCOL_VERSION,
+                    current: PROTOCOL_VERSION,
                 };
                 error!("{err}");
                 Err(err)
             }
 
             Some(_) => {
-                info!("the gateway is using exactly the same (or older) protocol version as we are. We're good to continue!");
+                info!("the gateway is using exactly the same protocol version as we are. We're good to continue!");
                 Ok(())
             }
         }
@@ -460,10 +457,6 @@ impl<C, St> GatewayClient<C, St> {
         if self.authenticated {
             self.shared_key = Some(Arc::new(shared_key));
         }
-
-        // populate the negotiated protocol for future uses
-        self.negotiated_protocol = gateway_protocol;
-
         Ok(())
     }
 
@@ -506,7 +499,6 @@ impl<C, St> GatewayClient<C, St> {
                 self.check_gateway_protocol(protocol_version)?;
                 self.authenticated = status;
                 self.bandwidth_remaining = bandwidth_remaining;
-                self.negotiated_protocol = protocol_version;
                 Ok(())
             }
             ServerResponse::Error { message } => Err(GatewayClientError::GatewayError(message)),
@@ -541,13 +533,13 @@ impl<C, St> GatewayClient<C, St> {
 
     async fn claim_coconut_bandwidth(
         &mut self,
-        credential: CredentialSpendingData,
+        credential: Credential,
     ) -> Result<(), GatewayClientError> {
         let mut rng = OsRng;
         let iv = IV::new_random(&mut rng);
 
-        let msg = ClientControlRequest::new_enc_coconut_bandwidth_credential_v2(
-            credential,
+        let msg = ClientControlRequest::new_enc_coconut_bandwidth_credential(
+            &credential,
             self.shared_key.as_ref().unwrap(),
             iv,
         )
@@ -593,31 +585,18 @@ impl<C, St> GatewayClient<C, St> {
             return self.try_claim_testnet_bandwidth().await;
         }
 
-        let Some(gateway_protocol) = self.negotiated_protocol else {
-            return Err(GatewayClientError::OutdatedGatewayCredentialVersion {
-                negotiated_protocol: None,
-            });
-        };
-
-        if gateway_protocol < CREDENTIAL_UPDATE_V1_PROTOCOL_VERSION {
-            return Err(GatewayClientError::OutdatedGatewayCredentialVersion {
-                negotiated_protocol: Some(gateway_protocol),
-            });
-        }
-
-        let prepared_credential = self
+        let (credential, credential_id) = self
             .bandwidth_controller
             .as_ref()
             .unwrap()
-            .prepare_bandwidth_credential()
+            .prepare_coconut_credential()
             .await?;
 
-        self.claim_coconut_bandwidth(prepared_credential.data)
-            .await?;
+        self.claim_coconut_bandwidth(credential).await?;
         self.bandwidth_controller
             .as_ref()
             .unwrap()
-            .consume_credential(prepared_credential.credential_id)
+            .consume_credential(credential_id)
             .await?;
 
         Ok(())
@@ -856,7 +835,6 @@ impl GatewayClient<InitOnly, EphemeralCredentialStorage> {
             should_reconnect_on_failure: false,
             reconnection_attempts: DEFAULT_RECONNECTION_ATTEMPTS,
             reconnection_backoff: DEFAULT_RECONNECTION_BACKOFF,
-            negotiated_protocol: None,
             shutdown,
         }
     }
@@ -888,7 +866,6 @@ impl GatewayClient<InitOnly, EphemeralCredentialStorage> {
             should_reconnect_on_failure: self.should_reconnect_on_failure,
             reconnection_attempts: self.reconnection_attempts,
             reconnection_backoff: self.reconnection_backoff,
-            negotiated_protocol: self.negotiated_protocol,
             shutdown,
         }
     }

common/client-libs/gateway-client/src/error.rs

@@ -47,9 +47,6 @@ pub enum GatewayClientError {
     #[error("Credential could not be serialized")]
     SerializeCredential,
 
-    #[error("can not spend bandwidth credential with the gateway as it's using outdated protocol (version: {negotiated_protocol:?})")]
-    OutdatedGatewayCredentialVersion { negotiated_protocol: Option<u8> },
-
     #[error("Client is not authenticated")]
     NotAuthenticated,
 

common/client-libs/gateway-client/src/socket_state.rs

@@ -11,12 +11,10 @@ use futures::{SinkExt, StreamExt};
 use log::*;
 use nym_gateway_requests::registration::handshake::SharedKeys;
 use nym_task::TaskClient;
-use std::os::raw::c_int as RawFd;
+use std::os::fd::{AsRawFd, RawFd};
 use std::sync::Arc;
 use tungstenite::Message;
 
-#[cfg(unix)]
-use std::os::fd::AsRawFd;
 #[cfg(not(target_arch = "wasm32"))]
 use tokio::net::TcpStream;
 #[cfg(not(target_arch = "wasm32"))]
@@ -40,25 +38,16 @@ type WsConn = JSWebsocket;
 
 type SplitStreamReceiver = oneshot::Receiver<Result<SplitStream<WsConn>, GatewayClientError>>;
 
-pub(crate) fn ws_fd(_conn: &WsConn) -> Option<RawFd> {
-    #[cfg(unix)]
-    match _conn.get_ref() {
-        MaybeTlsStream::Plain(stream) => Some(stream.as_raw_fd()),
-        &_ => unreachable!(
-            "If tls features are enabled, the inner stream needs to be unpacked into raw fd"
-        ),
-    }
-    #[cfg(not(unix))]
-    None
-}
-
 pub(crate) struct PartiallyDelegated {
+    ws_fd: RawFd,
     sink_half: SplitSink<WsConn, Message>,
     delegated_stream: (SplitStreamReceiver, oneshot::Sender<()>),
-    ws_fd: Option<RawFd>,
 }
 
 impl PartiallyDelegated {
+    pub fn ws_fd(&self) -> RawFd {
+        self.ws_fd
+    }
     fn recover_received_plaintexts(ws_msgs: Vec<Message>, shared_key: &SharedKeys) -> Vec<Vec<u8>> {
         let mut plaintexts = Vec::with_capacity(ws_msgs.len());
         for ws_msg in ws_msgs {
@@ -108,8 +97,11 @@ impl PartiallyDelegated {
         let (notify_sender, notify_receiver) = oneshot::channel();
         let (stream_sender, stream_receiver) = oneshot::channel();
 
-        let ws_fd = ws_fd(&conn);
-
+        let ws_fd = match conn.get_ref() {
+            MaybeTlsStream::Plain(stream) => stream.as_raw_fd(),
+            MaybeTlsStream::NativeTls(stream) => stream.as_raw_fd(),
+            _ => 0.into(),
+        };
         let (sink, mut stream) = conn.split();
 
         let mixnet_receiver_future = async move {
@@ -165,10 +157,6 @@ impl PartiallyDelegated {
         }
     }
 
-    pub(crate) fn ws_fd(&self) -> Option<RawFd> {
-        self.ws_fd
-    }
-
     // if we want to send a message and don't care about response, we can don't need to reunite the split,
     // the sink itself is enough
     pub(crate) async fn send_without_response(

common/client-libs/mixnet-client/Cargo.toml

@@ -16,11 +16,3 @@ tokio-util = { workspace = true, features = ["codec"] }
 # internal
 nym-sphinx = { path = "../../nymsphinx" }
 nym-task = { path = "../../task" }
-nym-topology-control = { path = "../../topology-control" }
-nym-noise = { path = "../../nymnoise"}
-nym-crypto = { path = "../../crypto" }
-nym-validator-client = { path = "../validator-client"}
-
-[dev-dependencies]
-url = { workspace = true }
-rand = "0.7.3"

common/client-libs/mixnet-client/src/client.rs

@@ -4,15 +4,11 @@
 use futures::channel::mpsc;
 use futures::StreamExt;
 use log::*;
-use nym_crypto::asymmetric::encryption;
-use nym_noise::upgrade_noise_initiator_with_topology;
 use nym_sphinx::addressing::nodes::NymNodeRoutingAddress;
 use nym_sphinx::framing::codec::NymCodec;
 use nym_sphinx::framing::packet::FramedNymPacket;
 use nym_sphinx::params::PacketType;
 use nym_sphinx::NymPacket;
-use nym_topology_control::accessor::TopologyAccessor;
-use nym_validator_client::NymApiClient;
 use std::collections::HashMap;
 use std::io;
 use std::net::SocketAddr;
@@ -63,9 +59,6 @@ pub trait SendWithoutResponse {
 pub struct Client {
     conn_new: HashMap<NymNodeRoutingAddress, ConnectionSender>,
     config: Config,
-    topology_access: TopologyAccessor,
-    api_client: NymApiClient,
-    local_identity: Arc<encryption::KeyPair>,
 }
 
 struct ConnectionSender {
@@ -83,18 +76,10 @@ impl ConnectionSender {
 }
 
 impl Client {
-    pub fn new(
-        config: Config,
-        topology_access: TopologyAccessor,
-        api_client: NymApiClient,
-        local_identity: Arc<encryption::KeyPair>,
-    ) -> Client {
+    pub fn new(config: Config) -> Client {
         Client {
             conn_new: HashMap::new(),
             config,
-            topology_access,
-            api_client,
-            local_identity,
         }
     }
 
@@ -103,60 +88,25 @@ impl Client {
         receiver: mpsc::Receiver<FramedNymPacket>,
         connection_timeout: Duration,
         current_reconnection: &AtomicU32,
-        topology_access: TopologyAccessor,
-        api_client: NymApiClient,
-        local_identity: Arc<encryption::KeyPair>,
     ) {
         let connection_fut = TcpStream::connect(address);
 
         let conn = match tokio::time::timeout(connection_timeout, connection_fut).await {
-            Ok(stream_res) => {
-                match stream_res {
-                    Ok(stream) => {
-                        debug!("Managed to establish connection to {}", address);
-                        // if we managed to connect, reset the reconnection count (whatever it might have been)
-                        current_reconnection.store(0, Ordering::Release);
-                        //Get the topology, because we need the keys for the handshake
-                        let Some(topology) = topology_access.current_topology().await else {
-                            error!("Cannot perform Noise handshake to {address}, due to topology error");
-                            return;
-                        };
-
-                        let epoch_id = match api_client.get_current_epoch_id().await {
-                            Ok(id) => id,
-                            Err(err) => {
-                                error!("Cannot perform Noise handshake to {address}, due to epoch id error - {err}");
-                                return;
-                            }
-                        };
-
-                        let noise_stream = match upgrade_noise_initiator_with_topology(
-                            stream,
-                            Default::default(),
-                            &topology,
-                            epoch_id,
-                            local_identity.private_key(),
-                        )
-                        .await
-                        {
-                            Ok(noise_stream) => noise_stream,
-                            Err(err) => {
-                                error!("Failed to perform Noise handshake with {address} - {err}");
-                                return;
-                            }
-                        };
-                        debug!("Noise initiator handshake completed for {:?}", address);
-                        Framed::new(noise_stream, NymCodec)
-                    }
-                    Err(err) => {
-                        debug!(
-                            "failed to establish connection to {} (err: {})",
-                            address, err
-                        );
-                        return;
-                    }
+            Ok(stream_res) => match stream_res {
+                Ok(stream) => {
+                    debug!("Managed to establish connection to {}", address);
+                    // if we managed to connect, reset the reconnection count (whatever it might have been)
+                    current_reconnection.store(0, Ordering::Release);
+                    Framed::new(stream, NymCodec)
                 }
-            }
+                Err(err) => {
+                    debug!(
+                        "failed to establish connection to {} (err: {})",
+                        address, err
+                    );
+                    return;
+                }
+            },
             Err(_) => {
                 debug!(
                     "failed to connect to {} within {:?}",
@@ -225,10 +175,6 @@ impl Client {
         // copy the value before moving into another task
         let initial_connection_timeout = self.config.initial_connection_timeout;
 
-        let topology_access_clone = self.topology_access.clone();
-        let api_client_clone = self.api_client.clone();
-        let local_id_key = self.local_identity.clone();
-
         tokio::spawn(async move {
             // before executing the manager, wait for what was specified, if anything
             if let Some(backoff) = backoff {
@@ -241,9 +187,6 @@ impl Client {
                 receiver,
                 initial_connection_timeout,
                 &current_reconnection_attempt,
-                topology_access_clone,
-                api_client_clone,
-                local_id_key,
             )
             .await
         });
@@ -310,23 +253,15 @@ impl SendWithoutResponse for Client {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use rand::rngs::OsRng;
-    use url::Url;
 
     fn dummy_client() -> Client {
-        let mut rng = OsRng;
-        Client::new(
-            Config {
-                initial_reconnection_backoff: Duration::from_millis(10_000),
-                maximum_reconnection_backoff: Duration::from_millis(300_000),
-                initial_connection_timeout: Duration::from_millis(1_500),
-                maximum_connection_buffer_size: 128,
-                use_legacy_version: false,
-            },
-            TopologyAccessor::new(),
-            NymApiClient::new(Url::parse("http://dummy.url").unwrap()),
-            Arc::new(encryption::KeyPair::new(&mut rng)),
-        )
+        Client::new(Config {
+            initial_reconnection_backoff: Duration::from_millis(10_000),
+            maximum_reconnection_backoff: Duration::from_millis(300_000),
+            initial_connection_timeout: Duration::from_millis(1_500),
+            maximum_connection_buffer_size: 128,
+            use_legacy_version: false,
+        })
     }
 
     #[test]

common/client-libs/mixnet-client/src/forwarder.rs

@@ -5,11 +5,8 @@ use crate::client::{Client, Config, SendWithoutResponse};
 use futures::channel::mpsc;
 use futures::StreamExt;
 use log::*;
-use nym_crypto::asymmetric::encryption;
 use nym_sphinx::forwarding::packet::MixPacket;
-use nym_topology_control::accessor::TopologyAccessor;
-use nym_validator_client::NymApiClient;
-use std::sync::Arc;
+use std::time::Duration;
 
 pub type MixForwardingSender = mpsc::UnboundedSender<MixPacket>;
 type MixForwardingReceiver = mpsc::UnboundedReceiver<MixPacket>;
@@ -24,22 +21,26 @@ pub struct PacketForwarder {
 
 impl PacketForwarder {
     pub fn new(
-        client_config: Config,
-        topology_access: TopologyAccessor,
-        api_client: NymApiClient,
-        local_identity: Arc<encryption::KeyPair>,
+        initial_reconnection_backoff: Duration,
+        maximum_reconnection_backoff: Duration,
+        initial_connection_timeout: Duration,
+        maximum_connection_buffer_size: usize,
+        use_legacy_version: bool,
         shutdown: nym_task::TaskClient,
     ) -> (PacketForwarder, MixForwardingSender) {
+        let client_config = Config::new(
+            initial_reconnection_backoff,
+            maximum_reconnection_backoff,
+            initial_connection_timeout,
+            maximum_connection_buffer_size,
+            use_legacy_version,
+        );
+
         let (packet_sender, packet_receiver) = mpsc::unbounded();
 
         (
             PacketForwarder {
-                mixnet_client: Client::new(
-                    client_config,
-                    topology_access,
-                    api_client,
-                    local_identity,
-                ),
+                mixnet_client: Client::new(client_config),
                 packet_receiver,
                 shutdown,
             },

common/client-libs/validator-client/Cargo.toml

@@ -31,8 +31,9 @@ log = { workspace = true }
 url = { workspace = true, features = ["serde"] }
 tokio = { workspace = true, features = ["sync", "time"] }
 futures = { workspace = true }
+openssl = { version = "^0.10.55", features = ["vendored"], optional = true }
 
-nym-coconut = { path = "../../nymcoconut" }
+nym-coconut-interface = { path = "../../coconut-interface" }
 nym-network-defaults = { path = "../../network-defaults" }
 nym-api-requests = { path = "../../../nym-api/nym-api-requests" }
 
@@ -89,7 +90,7 @@ required-features = ["http-client"]
 
 [features]
 default = ["http-client"]
-http-client = ["cosmrs/rpc"]
+http-client = ["cosmrs/rpc", "openssl"]
 generate-ts = []
 contract-testing = ["nym-mixnet-contract-common/contract-testing"]
 

common/client-libs/validator-client/src/client.rs

@@ -8,12 +8,10 @@ use crate::{
     nym_api, DirectSigningReqwestRpcValidatorClient, QueryReqwestRpcValidatorClient,
     ReqwestRpcClient, ValidatorClientError,
 };
-use nym_api_requests::coconut::models::FreePassNonceResponse;
 use nym_api_requests::coconut::{
-    BlindSignRequestBody, BlindedSignatureResponse, FreePassRequest, VerifyCredentialBody,
-    VerifyCredentialResponse,
+    BlindSignRequestBody, BlindedSignatureResponse, VerifyCredentialBody, VerifyCredentialResponse,
 };
-use nym_api_requests::models::{DescribedGateway, DescribedNymNode, MixNodeBondAnnotated};
+use nym_api_requests::models::{DescribedGateway, MixNodeBondAnnotated};
 use nym_api_requests::models::{
     GatewayCoreStatusResponse, MixnodeCoreStatusResponse, MixnodeStatusResponse,
     RewardEstimationResponse, StakeSaturationResponse,
@@ -291,18 +289,6 @@ impl NymApiClient {
         Ok(self.nym_api.get_gateways_described().await?)
     }
 
-    pub async fn get_cached_described_nodes(
-        &self,
-    ) -> Result<Vec<DescribedNymNode>, ValidatorClientError> {
-        Ok(self.nym_api.get_nym_nodes_described().await?)
-    }
-
-    pub async fn get_current_epoch_id(
-        &self,
-    ) -> Result<nym_mixnet_contract_common::EpochId, ValidatorClientError> {
-        Ok(self.nym_api.get_current_epoch().await?.current_epoch_id())
-    }
-
     pub async fn get_gateway_core_status_count(
         &self,
         identity: IdentityKeyRef<'_>,
@@ -362,15 +348,4 @@ impl NymApiClient {
             .verify_bandwidth_credential(request_body)
             .await?)
     }
-
-    pub async fn free_pass_nonce(&self) -> Result<FreePassNonceResponse, ValidatorClientError> {
-        Ok(self.nym_api.free_pass_nonce().await?)
-    }
-
-    pub async fn issue_free_pass_credential(
-        &self,
-        request: &FreePassRequest,
-    ) -> Result<BlindedSignatureResponse, ValidatorClientError> {
-        Ok(self.nym_api.free_pass(request).await?)
-    }
 }

common/client-libs/validator-client/src/coconut/mod.rs

@@ -4,9 +4,9 @@
 use crate::nyxd::contract_traits::{DkgQueryClient, PagedDkgQueryClient};
 use crate::nyxd::error::NyxdError;
 use crate::NymApiClient;
-use nym_coconut::{Base58, CoconutError, VerificationKey};
 use nym_coconut_dkg_common::types::{EpochId, NodeIndex};
 use nym_coconut_dkg_common::verification_key::ContractVKShare;
+use nym_coconut_interface::{Base58, CoconutError, VerificationKey};
 use thiserror::Error;
 use url::Url;
 

common/client-libs/validator-client/src/nym_api/mod.rs

@@ -15,16 +15,16 @@ pub use nym_api_requests::{
         VerifyCredentialBody, VerifyCredentialResponse,
     },
     models::{
-        ComputeRewardEstParam, DescribedGateway, DescribedNymNode, GatewayBondAnnotated,
-        GatewayCoreStatusResponse, GatewayStatusReportResponse, GatewayUptimeHistoryResponse,
-        InclusionProbabilityResponse, MixNodeBondAnnotated, MixnodeCoreStatusResponse,
-        MixnodeStatusReportResponse, MixnodeStatusResponse, MixnodeUptimeHistoryResponse,
-        RewardEstimationResponse, StakeSaturationResponse, UptimeResponse,
+        ComputeRewardEstParam, DescribedGateway, GatewayBondAnnotated, GatewayCoreStatusResponse,
+        GatewayStatusReportResponse, GatewayUptimeHistoryResponse, InclusionProbabilityResponse,
+        MixNodeBondAnnotated, MixnodeCoreStatusResponse, MixnodeStatusReportResponse,
+        MixnodeStatusResponse, MixnodeUptimeHistoryResponse, RewardEstimationResponse,
+        StakeSaturationResponse, UptimeResponse,
     },
 };
 pub use nym_coconut_dkg_common::types::EpochId;
 use nym_mixnet_contract_common::mixnode::MixNodeDetails;
-use nym_mixnet_contract_common::{GatewayBond, IdentityKeyRef, Interval, MixId};
+use nym_mixnet_contract_common::{GatewayBond, IdentityKeyRef, MixId};
 use nym_name_service_common::response::NamesListResponse;
 use nym_service_provider_directory_common::response::ServicesListResponse;
 
@@ -32,8 +32,6 @@ pub mod error;
 pub mod routes;
 
 pub use http_api_client::Client;
-use nym_api_requests::coconut::models::FreePassNonceResponse;
-use nym_api_requests::coconut::FreePassRequest;
 
 #[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
 #[cfg_attr(not(target_arch = "wasm32"), async_trait)]
@@ -97,14 +95,6 @@ pub trait NymApiClientExt: ApiClient {
         .await
     }
 
-    async fn get_nym_nodes_described(&self) -> Result<Vec<DescribedNymNode>, NymAPIError> {
-        self.get_json(
-            &[routes::API_VERSION, routes::NYM_NODES, routes::DESCRIBED],
-            NO_PARAMS,
-        )
-        .await
-    }
-
     async fn get_active_mixnodes(&self) -> Result<Vec<MixNodeDetails>, NymAPIError> {
         self.get_json(
             &[routes::API_VERSION, routes::MIXNODES, routes::ACTIVE],
@@ -152,14 +142,6 @@ pub trait NymApiClientExt: ApiClient {
         .await
     }
 
-    async fn get_current_epoch(&self) -> Result<Interval, NymAPIError> {
-        self.get_json(
-            &[routes::API_VERSION, routes::EPOCH, routes::CURRENT],
-            NO_PARAMS,
-        )
-        .await
-    }
-
     async fn get_gateway_report(
         &self,
         identity: IdentityKeyRef<'_>,
@@ -391,36 +373,6 @@ pub trait NymApiClientExt: ApiClient {
         .await
     }
 
-    async fn free_pass_nonce(&self) -> Result<FreePassNonceResponse, NymAPIError> {
-        self.get_json(
-            &[
-                routes::API_VERSION,
-                routes::COCONUT_ROUTES,
-                routes::BANDWIDTH,
-                routes::COCONUT_FREE_PASS_NONCE,
-            ],
-            NO_PARAMS,
-        )
-        .await
-    }
-
-    async fn free_pass(
-        &self,
-        request: &FreePassRequest,
-    ) -> Result<BlindedSignatureResponse, NymAPIError> {
-        self.post_json(
-            &[
-                routes::API_VERSION,
-                routes::COCONUT_ROUTES,
-                routes::BANDWIDTH,
-                routes::COCONUT_FREE_PASS,
-            ],
-            NO_PARAMS,
-            request,
-        )
-        .await
-    }
-
     async fn blind_sign(
         &self,
         request_body: &BlindSignRequestBody,

common/client-libs/validator-client/src/nym_api/routes.rs

@@ -6,12 +6,8 @@ use nym_network_defaults::NYM_API_VERSION;
 pub const API_VERSION: &str = NYM_API_VERSION;
 pub const MIXNODES: &str = "mixnodes";
 pub const GATEWAYS: &str = "gateways";
-pub const NYM_NODES: &str = "nym-nodes";
 pub const DESCRIBED: &str = "described";
 
-pub const EPOCH: &str = "epoch";
-pub const CURRENT: &str = "current";
-
 pub const DETAILED: &str = "detailed";
 pub const DETAILED_UNFILTERED: &str = "detailed-unfiltered";
 pub const ACTIVE: &str = "active";
@@ -19,8 +15,6 @@ pub const REWARDED: &str = "rewarded";
 pub const COCONUT_ROUTES: &str = "coconut";
 pub const BANDWIDTH: &str = "bandwidth";
 
-pub const COCONUT_FREE_PASS: &str = "free-pass";
-pub const COCONUT_FREE_PASS_NONCE: &str = "free-pass-nonce";
 pub const COCONUT_BLIND_SIGN: &str = "blind-sign";
 pub const COCONUT_VERIFY_BANDWIDTH_CREDENTIAL: &str = "verify-bandwidth-credential";
 pub const COCONUT_EPOCH_CREDENTIALS: &str = "epoch-credentials";

common/client-libs/validator-client/src/nyxd/contract_traits/dkg_query_client.rs

@@ -7,20 +7,19 @@ use crate::nyxd::error::NyxdError;
 use crate::nyxd::CosmWasmClient;
 use async_trait::async_trait;
 use cosmrs::AccountId;
-use cosmwasm_std::Addr;
-use log::trace;
-use nym_coconut_dkg_common::types::{ChunkIndex, NodeIndex, StateAdvanceResponse};
+use nym_coconut_dkg_common::types::ChunkIndex;
 use serde::Deserialize;
 
-use nym_coconut_dkg_common::dealer::RegisteredDealerDetails;
 pub use nym_coconut_dkg_common::{
-    dealer::{DealerDetailsResponse, PagedDealerIndexResponse, PagedDealerResponse},
+    dealer::{DealerDetailsResponse, PagedDealerResponse},
     dealing::{
         DealerDealingsStatusResponse, DealingChunkResponse, DealingChunkStatusResponse,
         DealingMetadataResponse, DealingStatusResponse,
     },
     msg::QueryMsg as DkgQueryMsg,
-    types::{DealerDetails, DealingIndex, Epoch, EpochId, EpochState, State},
+    types::{
+        DealerDetails, DealingIndex, Epoch, EpochId, EpochState, InitialReplacementData, State,
+    },
     verification_key::{ContractVKShare, PagedVKSharesResponse, VkShareResponse},
 };
 
@@ -41,25 +40,13 @@ pub trait DkgQueryClient {
         self.query_dkg_contract(request).await
     }
 
-    async fn can_advance_state(&self) -> Result<StateAdvanceResponse, NyxdError> {
-        let request = DkgQueryMsg::CanAdvanceState {};
-        self.query_dkg_contract(request).await
-    }
-
     async fn get_current_epoch_threshold(&self) -> Result<Option<u64>, NyxdError> {
         let request = DkgQueryMsg::GetCurrentEpochThreshold {};
         self.query_dkg_contract(request).await
     }
 
-    async fn get_registered_dealer_details(
-        &self,
-        address: &AccountId,
-        epoch_id: Option<EpochId>,
-    ) -> Result<RegisteredDealerDetails, NyxdError> {
-        let request = DkgQueryMsg::GetRegisteredDealer {
-            dealer_address: address.to_string(),
-            epoch_id,
-        };
+    async fn get_initial_dealers(&self) -> Result<Option<InitialReplacementData>, NyxdError> {
+        let request = DkgQueryMsg::GetInitialDealers {};
         self.query_dkg_contract(request).await
     }
 
@@ -82,12 +69,12 @@ pub trait DkgQueryClient {
         self.query_dkg_contract(request).await
     }
 
-    async fn get_dealer_indices_paged(
+    async fn get_past_dealers_paged(
         &self,
         start_after: Option<String>,
         limit: Option<u32>,
-    ) -> Result<PagedDealerIndexResponse, NyxdError> {
-        let request = DkgQueryMsg::GetDealerIndices { start_after, limit };
+    ) -> Result<PagedDealerResponse, NyxdError> {
+        let request = DkgQueryMsg::GetPastDealers { start_after, limit };
         self.query_dkg_contract(request).await
     }
 
@@ -203,8 +190,8 @@ pub trait PagedDkgQueryClient: DkgQueryClient {
         collect_paged!(self, get_current_dealers_paged, dealers)
     }
 
-    async fn get_all_dealer_indices(&self) -> Result<Vec<(Addr, NodeIndex)>, NyxdError> {
-        collect_paged!(self, get_dealer_indices_paged, indices)
+    async fn get_all_past_dealers(&self) -> Result<Vec<DealerDetails>, NyxdError> {
+        collect_paged!(self, get_past_dealers_paged, dealers)
     }
 
     async fn get_all_verification_key_shares(
@@ -231,7 +218,6 @@ where
         let dkg_contract_address = &self
             .dkg_contract_address()
             .ok_or_else(|| NyxdError::unavailable_contract_address("dkg contract"))?;
-        trace!("using the following dkg contract: {dkg_contract_address}");
         self.query_contract_smart(dkg_contract_address, &query)
             .await
     }
@@ -252,24 +238,18 @@ mod tests {
         match msg {
             DkgQueryMsg::GetState {} => client.get_state().ignore(),
             DkgQueryMsg::GetCurrentEpochState {} => client.get_current_epoch().ignore(),
-            DkgQueryMsg::CanAdvanceState {} => client.can_advance_state().ignore(),
             DkgQueryMsg::GetCurrentEpochThreshold {} => {
                 client.get_current_epoch_threshold().ignore()
             }
-            DkgQueryMsg::GetRegisteredDealer {
-                dealer_address,
-                epoch_id,
-            } => client
-                .get_registered_dealer_details(&dealer_address.parse().unwrap(), epoch_id)
-                .ignore(),
+            DkgQueryMsg::GetInitialDealers {} => client.get_initial_dealers().ignore(),
             DkgQueryMsg::GetDealerDetails { dealer_address } => client
                 .get_dealer_details(&dealer_address.parse().unwrap())
                 .ignore(),
             DkgQueryMsg::GetCurrentDealers { limit, start_after } => client
                 .get_current_dealers_paged(start_after, limit)
                 .ignore(),
-            DkgQueryMsg::GetDealerIndices { limit, start_after } => {
-                client.get_dealer_indices_paged(start_after, limit).ignore()
+            DkgQueryMsg::GetPastDealers { limit, start_after } => {
+                client.get_past_dealers_paged(start_after, limit).ignore()
             }
             DkgQueryMsg::GetDealingStatus {
                 epoch_id,

common/client-libs/validator-client/src/nyxd/contract_traits/dkg_signing_client.rs

@@ -39,6 +39,13 @@ pub trait DkgSigningClient {
             .await
     }
 
+    async fn surpass_threshold(&self, fee: Option<Fee>) -> Result<ExecuteResult, NyxdError> {
+        let req = DkgExecuteMsg::SurpassedThreshold {};
+
+        self.execute_dkg_contract(fee, req, "surpass DKG threshold".to_string(), vec![])
+            .await
+    }
+
     async fn register_dealer(
         &self,
         bte_key: EncodedBTEPublicKeyWithProof,
@@ -78,9 +85,10 @@ pub trait DkgSigningClient {
     async fn submit_dealing_chunk(
         &self,
         chunk: PartialContractDealing,
+        resharing: bool,
         fee: Option<Fee>,
     ) -> Result<ExecuteResult, NyxdError> {
-        let req = DkgExecuteMsg::CommitDealingsChunk { chunk };
+        let req = DkgExecuteMsg::CommitDealingsChunk { chunk, resharing };
 
         self.execute_dkg_contract(fee, req, "dealing chunk commitment".to_string(), vec![])
             .await
@@ -122,20 +130,6 @@ pub trait DkgSigningClient {
         )
         .await
     }
-
-    async fn trigger_dkg_reset(&self, fee: Option<Fee>) -> Result<ExecuteResult, NyxdError> {
-        let req = DkgExecuteMsg::TriggerReset {};
-
-        self.execute_dkg_contract(fee, req, "trigger DKG reset".to_string(), vec![])
-            .await
-    }
-
-    async fn trigger_dkg_resharing(&self, fee: Option<Fee>) -> Result<ExecuteResult, NyxdError> {
-        let req = DkgExecuteMsg::TriggerResharing {};
-
-        self.execute_dkg_contract(fee, req, "trigger DKG resharing".to_string(), vec![])
-            .await
-    }
 }
 
 #[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
@@ -198,8 +192,8 @@ mod tests {
             } => client
                 .submit_dealing_metadata(dealing_index, chunks, resharing, None)
                 .ignore(),
-            DkgExecuteMsg::CommitDealingsChunk { chunk } => {
-                client.submit_dealing_chunk(chunk, None).ignore()
+            DkgExecuteMsg::CommitDealingsChunk { chunk, resharing } => {
+                client.submit_dealing_chunk(chunk, resharing, None).ignore()
             }
             DkgExecuteMsg::CommitVerificationKeyShare { share, resharing } => client
                 .submit_verification_key_share(share, resharing, None)
@@ -207,9 +201,8 @@ mod tests {
             DkgExecuteMsg::VerifyVerificationKeyShare { owner, resharing } => client
                 .verify_verification_key_share(&owner.parse().unwrap(), resharing, None)
                 .ignore(),
+            DkgExecuteMsg::SurpassedThreshold {} => client.surpass_threshold(None).ignore(),
             DkgExecuteMsg::AdvanceEpochState {} => client.advance_dkg_epoch_state(None).ignore(),
-            DkgExecuteMsg::TriggerReset {} => client.trigger_dkg_reset(None).ignore(),
-            DkgExecuteMsg::TriggerResharing {} => client.trigger_dkg_resharing(None).ignore(),
         };
     }
 }

common/client-libs/validator-client/src/nyxd/error.rs

@@ -140,6 +140,9 @@ pub enum NyxdError {
     #[error("Cosmwasm std error: {0}")]
     CosmwasmStdError(#[from] cosmwasm_std::StdError),
 
+    #[error("Coconut interface error: {0}")]
+    CoconutInterfaceError(#[from] nym_coconut_interface::error::CoconutInterfaceError),
+
     #[error("Account had an unexpected bech32 prefix. Expected: {expected}, got: {got}")]
     UnexpectedBech32Prefix { got: String, expected: String },
 }

common/client-libs/validator-client/src/nyxd/mod.rs

@@ -358,10 +358,6 @@ where
     S: OfflineSigner + Send + Sync,
     NyxdError: From<<S as OfflineSigner>::Error>,
 {
-    pub fn signing_account(&self) -> Result<AccountData, NyxdError> {
-        Ok(self.find_account(&self.address())?)
-    }
-
     pub fn address(&self) -> AccountId {
         match self.client.signer_addresses() {
             Ok(addresses) => addresses[0].clone(),

common/coconut-interface/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "nym-coconut-interface"
+version = "0.1.0"
+edition = "2021"
+description = "Crutch library until there is proper SerDe support for coconut structs"
+license.workspace = true
+
+[dependencies]
+bs58 = "0.4.0"
+getset = "0.1.1"
+serde = { workspace = true, features = ["derive"] }
+thiserror = { workspace = true }
+
+nym-coconut = {path = "../nymcoconut" }

common/coconut-interface/src/error.rs

@@ -0,0 +1,17 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use nym_coconut::CoconutError;
+use thiserror::Error;
+
+#[derive(Debug, Error)]
+pub enum CoconutInterfaceError {
+    #[error("not enough bytes: {0} received, minimum {1} required")]
+    InvalidByteLength(usize, usize),
+
+    #[error("Could not decode base 58 string - {0}")]
+    MalformedString(#[from] bs58::decode::Error),
+
+    #[error("Coconut error - {0}")]
+    CoconutError(#[from] CoconutError),
+}

common/coconut-interface/src/lib.rs

@@ -0,0 +1,196 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod error;
+
+use getset::{CopyGetters, Getters};
+use serde::{Deserialize, Serialize};
+
+use error::CoconutInterfaceError;
+
+// We list these explicity instead of glob export due to shadowing warnings with the pub tests
+// module.
+pub use nym_coconut::{
+    aggregate_signature_shares, aggregate_verification_keys, blind_sign, hash_to_scalar,
+    prepare_blind_sign, prove_bandwidth_credential, Attribute, Base58, BlindSignRequest,
+    BlindedSignature, Bytable, CoconutError, KeyPair, Parameters, PrivateAttribute,
+    PublicAttribute, SecretKey, Signature, SignatureShare, Theta, VerificationKey,
+};
+
+#[derive(Debug, Serialize, Deserialize, Getters, CopyGetters, Clone, PartialEq, Eq)]
+pub struct Credential {
+    #[getset(get = "pub")]
+    n_params: u32,
+
+    #[getset(get = "pub")]
+    theta: Theta,
+
+    voucher_value: u64,
+
+    voucher_info: String,
+
+    #[getset(get = "pub")]
+    epoch_id: u64,
+}
+impl Credential {
+    pub fn new(
+        n_params: u32,
+        theta: Theta,
+        voucher_value: u64,
+        voucher_info: String,
+        epoch_id: u64,
+    ) -> Credential {
+        Credential {
+            n_params,
+            theta,
+            voucher_value,
+            voucher_info,
+            epoch_id,
+        }
+    }
+
+    pub fn blinded_serial_number(&self) -> String {
+        self.theta.blinded_serial_number_bs58()
+    }
+
+    pub fn has_blinded_serial_number(
+        &self,
+        blinded_serial_number_bs58: &str,
+    ) -> Result<bool, CoconutInterfaceError> {
+        Ok(self
+            .theta
+            .has_blinded_serial_number(blinded_serial_number_bs58)?)
+    }
+
+    pub fn voucher_value(&self) -> u64 {
+        self.voucher_value
+    }
+
+    pub fn verify(&self, verification_key: &VerificationKey) -> bool {
+        let params = Parameters::new(self.n_params).unwrap();
+
+        let hashed_value = hash_to_scalar(self.voucher_value.to_string());
+        let hashed_info = hash_to_scalar(&self.voucher_info);
+        let public_attributes = &[&hashed_value, &hashed_info];
+
+        nym_coconut::verify_credential(&params, verification_key, &self.theta, public_attributes)
+    }
+
+    pub fn as_bytes(&self) -> Vec<u8> {
+        let n_params_bytes = self.n_params.to_be_bytes();
+        let theta_bytes = self.theta.to_bytes();
+        let theta_bytes_len = theta_bytes.len();
+        let voucher_value_bytes = self.voucher_value.to_be_bytes();
+        let epoch_id_bytes = self.epoch_id.to_be_bytes();
+        let voucher_info_bytes = self.voucher_info.as_bytes();
+        let voucher_info_len = voucher_info_bytes.len();
+
+        let mut bytes = Vec::with_capacity(28 + theta_bytes_len + voucher_info_len);
+        bytes.extend_from_slice(&n_params_bytes);
+        bytes.extend_from_slice(&(theta_bytes_len as u64).to_be_bytes());
+        bytes.extend_from_slice(&theta_bytes);
+        bytes.extend_from_slice(&voucher_value_bytes);
+        bytes.extend_from_slice(&epoch_id_bytes);
+        bytes.extend_from_slice(voucher_info_bytes);
+
+        bytes
+    }
+
+    pub fn from_bytes(bytes: &[u8]) -> Result<Self, CoconutError> {
+        if bytes.len() < 28 {
+            return Err(CoconutError::Deserialization(String::from(
+                "To few bytes in credential",
+            )));
+        }
+        let mut four_byte = [0u8; 4];
+        let mut eight_byte = [0u8; 8];
+
+        four_byte.copy_from_slice(&bytes[..4]);
+        let n_params = u32::from_be_bytes(four_byte);
+        eight_byte.copy_from_slice(&bytes[4..12]);
+        let theta_len = u64::from_be_bytes(eight_byte);
+        if bytes.len() < 28 + theta_len as usize {
+            return Err(CoconutError::Deserialization(String::from(
+                "To few bytes in credential",
+            )));
+        }
+        let theta = Theta::from_bytes(&bytes[12..12 + theta_len as usize])
+            .map_err(|e| CoconutError::Deserialization(e.to_string()))?;
+        eight_byte.copy_from_slice(&bytes[12 + theta_len as usize..20 + theta_len as usize]);
+        let voucher_value = u64::from_be_bytes(eight_byte);
+        eight_byte.copy_from_slice(&bytes[20 + theta_len as usize..28 + theta_len as usize]);
+        let epoch_id = u64::from_be_bytes(eight_byte);
+        let voucher_info = String::from_utf8(bytes[28 + theta_len as usize..].to_vec())
+            .map_err(|e| CoconutError::Deserialization(e.to_string()))?;
+
+        Ok(Credential {
+            n_params,
+            theta,
+            voucher_value,
+            voucher_info,
+            epoch_id,
+        })
+    }
+}
+
+impl Bytable for Credential {
+    fn to_byte_vec(&self) -> Vec<u8> {
+        self.as_bytes()
+    }
+
+    fn try_from_byte_slice(slice: &[u8]) -> Result<Self, CoconutError> {
+        Credential::from_bytes(slice)
+    }
+}
+
+impl Base58 for Credential {}
+
+#[cfg(test)]
+mod tests {
+    use nym_coconut::{prove_bandwidth_credential, Signature};
+
+    use super::*;
+
+    #[test]
+    fn serde_coconut_credential() {
+        let voucher_value = 1000000u64;
+        let voucher_info = String::from("BandwidthVoucher");
+        let serial_number =
+            Attribute::try_from_bs58("7Rp3imcuNX3w9se9wm5th8gSvc2czsnMrGsdt5HsrycA").unwrap();
+        let binding_number =
+            Attribute::try_from_bs58("Auf8yVEgyEAWNHaXUZmimS4n9g5YiYnNYqp6F9BtBe9E").unwrap();
+        let signature = Signature::try_from_bs58(
+            "ta3pM9ffj5T6YGbwjSBp2W118rcwyP9PXStc\
+        7ssb91g5GQYMQHhuTNajbdZcjxUFBFL5rhED8EHpRzE8r432ss3qbPBfpNev4CdkfMkQ3wepyM7hy7q1W6Rn9WmFoZL\
+        ZR9j",
+        )
+        .unwrap();
+        let params = Parameters::new(4).unwrap();
+        let verification_key = VerificationKey::try_from_bs58("8CFtVVXdwLy4WHMQPE4\
+        woe89q3DRHoNxBSchftrEjSBPWA4r4xZv4Y9qSvS5x5bMmFtp7BX6ikECAnuXr5EjXWSsgjirZJmpS5XDUynVfht1cD\
+        FWGDvy2XFrRCuoCMotNXi3PoF6wYqdTR9Rqcfoj3i2H5Nid422WBaLtVoC9QNobvpvaqq6vX5PbsSyPayvU8HCXFxM6\
+        JjScYpbRTxQtdwefWLrk3LmXyJQBWi7c2VAhSxu9msp7VTBycqdwQNgxHETStZuwXsozxaGQ2KssVUCaaoYPR4g2RqK\
+        UAvtWwA7pMiAQNcbkXcbsjCgVjWaCpMWC37XA31cLcFf3zbjHD9e5tXjAcqa4M89fbFhuvvSXxowSAZ5NoWrN32kd5d\
+        wxJm1JW3Tt2h6yDDBe84oMy71462dZn7N78DVk2mFNGwBCibrZWA7oUzRBMfYxiQrksoFcou7QfLLd58zoNYmPQPt84\
+        1VpQopEBfdQ7Nf9zoXxBt3zMy7g5NsFGvzh7KTbDUyeeXrdkKJPQBs6dqaizr9sS8CPPmR4uk96vDTRh8CJ5FbSsmb8\
+        nP71dRvvwRZJHGzwYirMo6SXS3ZYxFuiA3mkxYuqDHCwkTWDuRCcAaztrDYRZg7VCMo4Q446AaEso5eqpeWpHZQt53E\
+        ZRpqmNYKASGwMhTeEHPSLgSmtoAAUcaRWpGRzYfd6kzEma8tdGLwyP4rLXgvSvtDLP37dU7YgF3LEXbGAz57U9ATy46\
+        6sroLpHPdaCWB8RF11wvB6Tu196JnJd2KyQBP1iUWP3rtZs3GhAF1QVcxquh8BqDZzAcpQ6wCS1P9c5GxKgww77FVF5\
+        Kp83XtoxSrw3GaYVyKTGxNh3vcKPR31txCjTxPaN2fg7TaPLhoQJX4YaAroFSXqrqbbRsisuHhhCeUP2YwDjHedes9y")
+            .unwrap();
+        let theta = prove_bandwidth_credential(
+            &params,
+            &verification_key,
+            &signature,
+            &serial_number,
+            &binding_number,
+        )
+        .unwrap();
+        let credential = Credential::new(4, theta, voucher_value, voucher_info, 42);
+
+        let serialized_credential = credential.as_bytes();
+        let deserialized_credential = Credential::from_bytes(&serialized_credential).unwrap();
+
+        assert_eq!(credential, deserialized_credential);
+    }
+}

common/commands/Cargo.toml

@@ -9,13 +9,12 @@ license.workspace = true
 anyhow = { workspace = true }
 base64 = "0.13.0"
 bip39 = { workspace = true }
-bs58 = { workspace = true }
+bs58 = "0.4"
 comfy-table = "6.0.0"
 cfg-if = "1.0.0"
 clap = { workspace = true, features = ["derive"] }
 csv = "1.3.0"
 cw-utils = { workspace = true }
-futures = { workspace = true }
 handlebars = "3.0.1"
 humantime-serde = "1.0"
 inquire = "0.6.2"
@@ -26,11 +25,9 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = { workspace = true }
 thiserror = { workspace = true }
 time = { workspace = true, features = ["parsing", "formatting"] }
-tokio = { workspace = true, features = ["sync"]}
 toml = "0.5.6"
 url = { workspace = true }
 tap = "1"
-zeroize = { workspace = true }
 
 cosmrs = { workspace = true }
 cosmwasm-std = { workspace = true }
@@ -52,10 +49,8 @@ nym-sphinx = { path = "../../common/nymsphinx" }
 nym-client-core = { path = "../../common/client-core" }
 nym-config = { path = "../../common/config" }
 nym-credentials = { path = "../../common/credentials" }
-nym-credentials-interface = { path = "../../common/credentials-interface" }
 nym-credential-storage = { path = "../../common/credential-storage" }
 nym-credential-utils = { path = "../../common/credential-utils" }
-nym-id = { path = "../nym-id" }
 
 nym-pemstore = { path = "../../common/pemstore", version = "0.3.0" }
 nym-types = { path = "../../common/types" }

common/commands/src/coconut/generate_freepass.rs

@@ -1,190 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::context::SigningClient;
-use anyhow::{anyhow, bail};
-use clap::ArgGroup;
-use clap::Parser;
-use futures::StreamExt;
-use log::{error, info};
-use nym_coconut_dkg_common::types::EpochId;
-use nym_credential_utils::utils::block_until_coconut_is_available;
-use nym_credentials::coconut::bandwidth::freepass::MAX_FREE_PASS_VALIDITY;
-use nym_credentials::{
-    obtain_aggregate_verification_key, IssuanceBandwidthCredential, IssuedBandwidthCredential,
-};
-use nym_credentials_interface::VerificationKey;
-use nym_validator_client::coconut::all_coconut_api_clients;
-use nym_validator_client::nyxd::contract_traits::{DkgQueryClient, NymContractsProvider};
-use nym_validator_client::nyxd::CosmWasmClient;
-use nym_validator_client::signing::AccountData;
-use nym_validator_client::CoconutApiClient;
-use std::fs::File;
-use std::io::Write;
-use std::path::PathBuf;
-use std::sync::Arc;
-use time::format_description::well_known::Rfc3339;
-use time::OffsetDateTime;
-use zeroize::Zeroizing;
-
-fn parse_rfc3339_expiration_date(raw: &str) -> Result<OffsetDateTime, time::error::Parse> {
-    OffsetDateTime::parse(raw, &Rfc3339)
-}
-
-#[derive(Debug, Parser)]
-#[clap(group(ArgGroup::new("expiration").required(true)))]
-pub struct Args {
-    /// Specifies the expiration date of the free pass(es)
-    /// Can't be set to more than a week into the future.
-    #[clap(long, group = "expiration", value_parser = parse_rfc3339_expiration_date)]
-    pub(crate) expiration_date: Option<OffsetDateTime>,
-
-    /// The expiration of the free pass(es) expresses as unix timestamp.
-    /// Can't be set to more than a week into the future.
-    #[clap(long, group = "expiration")]
-    pub(crate) expiration_timestamp: Option<i64>,
-
-    /// The number of free passes to issue
-    #[clap(long, default_value = "1")]
-    pub(crate) amount: u64,
-
-    /// Path to the output directory for generated free passes.
-    #[clap(long)]
-    pub(crate) output_dir: PathBuf,
-}
-
-async fn get_freepass(
-    api_clients: Vec<CoconutApiClient>,
-    aggregate_vk: &VerificationKey,
-    threshold: u64,
-    epoch_id: EpochId,
-    signing_account: &AccountData,
-    expiration_date: OffsetDateTime,
-) -> anyhow::Result<IssuedBandwidthCredential> {
-    let issuance_pass = IssuanceBandwidthCredential::new_freepass(Some(expiration_date));
-    let signing_data = issuance_pass.prepare_for_signing();
-
-    let credential_shares = Arc::new(tokio::sync::Mutex::new(Vec::new()));
-
-    futures::stream::iter(api_clients)
-        .for_each_concurrent(None, |client| async {
-            // move the client into the block
-            let client = client;
-            let api_url = client.api_client.api_url();
-
-            info!("contacting {api_url} for blinded free pass");
-
-            match issuance_pass
-                .obtain_partial_freepass_credential(
-                    &client.api_client,
-                    signing_account,
-                    &client.verification_key,
-                    signing_data.clone(),
-                )
-                .await
-            {
-                Ok(partial_credential) => {
-                    credential_shares
-                        .lock()
-                        .await
-                        .push((partial_credential, client.node_id).into());
-                }
-                Err(err) => {
-                    error!("failed to obtain partial free pass from {api_url}: {err}")
-                }
-            }
-        })
-        .await;
-
-    // SAFETY: the futures have completed, so we MUST have the only arc reference
-    #[allow(clippy::unwrap_used)]
-    let credential_shares = Arc::into_inner(credential_shares).unwrap().into_inner();
-
-    if credential_shares.len() < threshold as usize {
-        bail!("we managed to obtain only {} partial credentials while the minimum threshold is {threshold}", credential_shares.len());
-    }
-
-    let signature = issuance_pass.aggregate_signature_shares(aggregate_vk, &credential_shares)?;
-    Ok(issuance_pass.into_issued_credential(signature, epoch_id))
-}
-
-pub async fn execute(args: Args, client: SigningClient) -> anyhow::Result<()> {
-    let address = client.address();
-
-    if !args.output_dir.is_dir() {
-        bail!("the provided output directory is not a directory!");
-    }
-
-    if args.output_dir.read_dir()?.next().is_some() {
-        bail!("the provided output directory is not empty!");
-    }
-
-    let Some(bandwidth_contract) = client.coconut_bandwidth_contract_address() else {
-        bail!("the bandwidth contract address is not set")
-    };
-
-    let Some(bandwidth_admin) = client
-        .get_contract(bandwidth_contract)
-        .await
-        .map(|c| c.contract_info.admin)?
-    else {
-        bail!("the bandwidth contract doesn't have any admin set")
-    };
-
-    // sanity checks since nym-apis will reject invalid requests anyway
-    if address != bandwidth_admin {
-        bail!("the provided mnemonic does not correspond to the current admin of the bandwidth contract")
-    }
-
-    let expiration_date = match args.expiration_date {
-        Some(date) => date,
-        // SAFETY: one of those arguments must have been set
-        None => OffsetDateTime::from_unix_timestamp(args.expiration_timestamp.unwrap())?,
-    };
-
-    let now = OffsetDateTime::now_utc();
-
-    if expiration_date > now + MAX_FREE_PASS_VALIDITY {
-        bail!("the provided free pass request has too long expiry (expiry is set to on {expiration_date})")
-    }
-
-    // issuance start
-    block_until_coconut_is_available(&client).await?;
-
-    let signing_account = client.signing_account()?;
-
-    let epoch_id = client.get_current_epoch().await?.epoch_id;
-    let threshold = client
-        .get_current_epoch_threshold()
-        .await?
-        .ok_or(anyhow!("no threshold available"))?;
-    let api_clients = all_coconut_api_clients(&client, epoch_id).await?;
-
-    if api_clients.len() < threshold as usize {
-        bail!(
-            "we have only {} api clients available while the minimum threshold is {threshold}",
-            api_clients.len()
-        )
-    }
-    let aggregate_vk = obtain_aggregate_verification_key(&api_clients)?;
-
-    for i in 0..args.amount {
-        let human_index = i + 1;
-        info!("trying to obtain free pass {human_index}/{}", args.amount);
-        let free_pass = get_freepass(
-            api_clients.clone(),
-            &aggregate_vk,
-            threshold,
-            epoch_id,
-            &signing_account,
-            expiration_date,
-        )
-        .await?;
-        let credential_data = Zeroizing::new(free_pass.pack_v1());
-        let output = args.output_dir.join(format!("freepass_{i}.nym"));
-        info!("saving the freepass to '{}'", output.display());
-        File::create(output)?.write_all(&credential_data)?;
-    }
-
-    Ok(())
-}

common/commands/src/coconut/import_credential.rs

@@ -1,64 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::utils::CommonConfigsWrapper;
-use anyhow::bail;
-use clap::ArgGroup;
-use clap::Parser;
-use nym_credential_storage::initialise_persistent_storage;
-use nym_id::import_credential;
-use std::fs;
-use std::path::PathBuf;
-
-fn parse_encoded_credential_data(raw: &str) -> bs58::decode::Result<Vec<u8>> {
-    bs58::decode(raw).into_vec()
-}
-
-#[derive(Debug, Parser)]
-#[clap(group(ArgGroup::new("cred_data").required(true)))]
-pub struct Args {
-    /// Config file of the client that is supposed to use the credential.
-    #[clap(long)]
-    pub(crate) client_config: PathBuf,
-
-    /// Explicitly provide the encoded credential data (as base58)
-    #[clap(long, group = "cred_data", value_parser = parse_encoded_credential_data)]
-    pub(crate) credential_data: Option<Vec<u8>>,
-
-    /// Specifies the path to file containing binary credential data
-    #[clap(long, group = "cred_data")]
-    pub(crate) credential_path: Option<PathBuf>,
-
-    // currently hidden as there exists only a single serialization standard
-    #[clap(long, hide = true)]
-    pub(crate) version: Option<u8>,
-}
-
-pub async fn execute(args: Args) -> anyhow::Result<()> {
-    let loaded = CommonConfigsWrapper::try_load(args.client_config)?;
-
-    if let Ok(id) = loaded.try_get_id() {
-        println!("loaded config file for client '{id}'");
-    }
-
-    let Ok(credentials_store) = loaded.try_get_credentials_store() else {
-        bail!("the loaded config does not have a credentials store information")
-    };
-
-    println!(
-        "using credentials store at '{}'",
-        credentials_store.display()
-    );
-    let credentials_store = initialise_persistent_storage(credentials_store).await;
-
-    let raw_credential = match args.credential_data {
-        Some(data) => data,
-        None => {
-            // SAFETY: one of those arguments must have been set
-            fs::read(args.credential_path.unwrap())?
-        }
-    };
-
-    import_credential(credentials_store, raw_credential, args.version).await?;
-    Ok(())
-}

common/commands/src/coconut/mod.rs

@@ -3,8 +3,6 @@
 
 use clap::{Args, Subcommand};
 
-pub mod generate_freepass;
-pub mod import_credential;
 pub mod issue_credentials;
 pub mod recover_credentials;
 
@@ -17,8 +15,6 @@ pub struct Coconut {
 
 #[derive(Debug, Subcommand)]
 pub enum CoconutCommands {
-    GenerateFreepass(generate_freepass::Args),
     IssueCredentials(issue_credentials::Args),
     RecoverCredentials(recover_credentials::Args),
-    ImportCredential(import_credential::Args),
 }

common/cosmwasm-smart-contracts/coconut-dkg/src/dealer.rs

@@ -14,32 +14,20 @@ pub struct DealerDetails {
     pub assigned_index: NodeIndex,
 }
 
-#[cw_serde]
-pub struct DealerRegistrationDetails {
-    pub bte_public_key_with_proof: EncodedBTEPublicKeyWithProof,
-    pub ed25519_identity: String,
-    pub announce_address: String,
-}
-
 #[cw_serde]
 #[derive(Copy)]
 pub enum DealerType {
-    Current { assigned_index: NodeIndex },
-    Past { assigned_index: NodeIndex },
+    Current,
+    Past,
     Unknown,
 }
 
 impl DealerType {
     pub fn is_current(&self) -> bool {
-        matches!(&self, DealerType::Current { .. })
+        matches!(&self, DealerType::Current)
     }
 }
 
-#[cw_serde]
-pub struct RegisteredDealerDetails {
-    pub details: Option<DealerRegistrationDetails>,
-}
-
 #[cw_serde]
 pub struct DealerDetailsResponse {
     pub details: Option<DealerDetails>,
@@ -77,20 +65,3 @@ impl PagedDealerResponse {
         }
     }
 }
-
-#[cw_serde]
-pub struct PagedDealerIndexResponse {
-    pub indices: Vec<(Addr, NodeIndex)>,
-
-    /// Field indicating paging information for the following queries if the caller wishes to get further entries.
-    pub start_next_after: Option<Addr>,
-}
-
-impl PagedDealerIndexResponse {
-    pub fn new(indices: Vec<(Addr, NodeIndex)>, start_next_after: Option<Addr>) -> Self {
-        PagedDealerIndexResponse {
-            indices,
-            start_next_after,
-        }
-    }
-}

common/cosmwasm-smart-contracts/coconut-dkg/src/msg.rs

@@ -11,15 +11,12 @@ use cosmwasm_schema::cw_serde;
 
 #[cfg(feature = "schema")]
 use crate::{
-    dealer::{
-        DealerDetailsResponse, PagedDealerIndexResponse, PagedDealerResponse,
-        RegisteredDealerDetails,
-    },
+    dealer::{DealerDetailsResponse, PagedDealerResponse},
     dealing::{
         DealerDealingsStatusResponse, DealingChunkResponse, DealingChunkStatusResponse,
         DealingMetadataResponse, DealingStatusResponse,
     },
-    types::{Epoch, State, StateAdvanceResponse},
+    types::{Epoch, InitialReplacementData, State},
     verification_key::{PagedVKSharesResponse, VkShareResponse},
 };
 #[cfg(feature = "schema")]
@@ -56,6 +53,7 @@ pub enum ExecuteMsg {
 
     CommitDealingsChunk {
         chunk: PartialContractDealing,
+        resharing: bool,
     },
 
     CommitVerificationKeyShare {
@@ -68,11 +66,9 @@ pub enum ExecuteMsg {
         resharing: bool,
     },
 
+    SurpassedThreshold {},
+
     AdvanceEpochState {},
-
-    TriggerReset {},
-
-    TriggerResharing {},
 }
 
 #[cw_serde]
@@ -87,14 +83,8 @@ pub enum QueryMsg {
     #[cfg_attr(feature = "schema", returns(u64))]
     GetCurrentEpochThreshold {},
 
-    #[cfg_attr(feature = "schema", returns(StateAdvanceResponse))]
-    CanAdvanceState {},
-
-    #[cfg_attr(feature = "schema", returns(RegisteredDealerDetails))]
-    GetRegisteredDealer {
-        dealer_address: String,
-        epoch_id: Option<EpochId>,
-    },
+    #[cfg_attr(feature = "schema", returns(Option<InitialReplacementData>))]
+    GetInitialDealers {},
 
     #[cfg_attr(feature = "schema", returns(DealerDetailsResponse))]
     GetDealerDetails { dealer_address: String },
@@ -105,8 +95,8 @@ pub enum QueryMsg {
         start_after: Option<String>,
     },
 
-    #[cfg_attr(feature = "schema", returns(PagedDealerIndexResponse))]
-    GetDealerIndices {
+    #[cfg_attr(feature = "schema", returns(PagedDealerResponse))]
+    GetPastDealers {
         limit: Option<u32>,
         start_after: Option<String>,
     },

common/cosmwasm-smart-contracts/coconut-dkg/src/types.rs

@@ -5,7 +5,7 @@ use cosmwasm_schema::cw_serde;
 use std::fmt::{Display, Formatter};
 use std::str::FromStr;
 
-pub use crate::dealer::{DealerDetails, DealerRegistrationDetails, PagedDealerResponse};
+pub use crate::dealer::{DealerDetails, PagedDealerResponse};
 pub use contracts_common::dealings::ContractSafeBytes;
 pub use cosmwasm_std::{Addr, Coin, Timestamp};
 pub use cw4::Cw4Contract;
@@ -22,19 +22,9 @@ pub type ChunkIndex = u16;
 pub type PartialContractDealingData = ContractSafeBytes;
 
 #[cw_serde]
-#[derive(Copy, Default)]
-pub struct StateAdvanceResponse {
-    pub current_state: EpochState,
-    pub progress: StateProgress,
-    pub deadline: Option<Timestamp>,
-    pub reached_deadline: bool,
-    pub is_complete: bool,
-}
-
-impl StateAdvanceResponse {
-    pub fn can_advance(&self) -> bool {
-        self.reached_deadline || self.is_complete
-    }
+pub struct InitialReplacementData {
+    pub initial_dealers: Vec<Addr>,
+    pub initial_height: u64,
 }
 
 #[cw_serde]
@@ -50,26 +40,6 @@ pub struct TimeConfiguration {
     pub in_progress_time_secs: u64,
 }
 
-impl TimeConfiguration {
-    pub fn state_duration(&self, state: EpochState) -> Option<u64> {
-        match state {
-            EpochState::WaitingInitialisation => None,
-            EpochState::PublicKeySubmission { .. } => Some(self.public_key_submission_time_secs),
-            EpochState::DealingExchange { .. } => Some(self.dealing_exchange_time_secs),
-            EpochState::VerificationKeySubmission { .. } => {
-                Some(self.verification_key_submission_time_secs)
-            }
-            EpochState::VerificationKeyValidation { .. } => {
-                Some(self.verification_key_validation_time_secs)
-            }
-            EpochState::VerificationKeyFinalization { .. } => {
-                Some(self.verification_key_finalization_time_secs)
-            }
-            EpochState::InProgress => Some(self.in_progress_time_secs),
-        }
-    }
-}
-
 impl FromStr for TimeConfiguration {
     type Err = String;
 
@@ -117,41 +87,13 @@ pub struct State {
     pub key_size: u32,
 }
 
-#[cw_serde]
-#[derive(Copy, Default)]
-pub struct StateProgress {
-    /// Counts the number of dealers that have registered in this epoch.
-    // ideally we want to have here all group members
-    pub registered_dealers: u32,
-
-    /// Counts the number of resharing dealers that have registered in this epoch.
-    /// This field is only populated during a resharing exchange.
-    /// It is always <= registered_dealers.
-    pub registered_resharing_dealers: u32,
-
-    /// Counts the number of fully received dealings (i.e. full chunks) from all the allowed dealers.
-    // we expect registered_dealers * state.key_size number of dealings here (each dealer has to submit key_size number of dealings)
-    pub submitted_dealings: u32,
-
-    /// Counts the number of submitted verification key shared from the dealers.
-    // we expect registered_dealers number of keys here
-    pub submitted_key_shares: u32,
-
-    /// Counts the number of verified key shares.
-    // we expect submitted_key_shares number of verified keys here
-    pub verified_keys: u32,
-}
-
 #[cw_serde]
 #[derive(Copy, Default)]
 pub struct Epoch {
     pub state: EpochState,
     pub epoch_id: EpochId,
-    pub state_progress: StateProgress,
     pub time_configuration: TimeConfiguration,
-
-    #[serde(alias = "finish_timestamp")]
-    pub deadline: Option<Timestamp>,
+    pub finish_timestamp: Option<Timestamp>,
 }
 
 impl Epoch {
@@ -161,45 +103,35 @@ impl Epoch {
         time_configuration: TimeConfiguration,
         current_timestamp: Timestamp,
     ) -> Self {
-        let duration = time_configuration.state_duration(state);
-
+        let duration = match state {
+            EpochState::WaitingInitialisation => None,
+            EpochState::PublicKeySubmission { .. } => {
+                Some(time_configuration.public_key_submission_time_secs)
+            }
+            EpochState::DealingExchange { .. } => {
+                Some(time_configuration.dealing_exchange_time_secs)
+            }
+            EpochState::VerificationKeySubmission { .. } => {
+                Some(time_configuration.verification_key_submission_time_secs)
+            }
+            EpochState::VerificationKeyValidation { .. } => {
+                Some(time_configuration.verification_key_validation_time_secs)
+            }
+            EpochState::VerificationKeyFinalization { .. } => {
+                Some(time_configuration.verification_key_finalization_time_secs)
+            }
+            EpochState::InProgress => Some(time_configuration.in_progress_time_secs),
+        };
         Epoch {
             state,
             epoch_id,
-            state_progress: Default::default(),
             time_configuration,
-            deadline: duration.map(|d| current_timestamp.plus_seconds(d)),
+            finish_timestamp: duration.map(|d| current_timestamp.plus_seconds(d)),
         }
     }
 
-    pub fn update(mut self, next_state: EpochState, current_timestamp: Timestamp) -> Self {
-        self.state = next_state;
-        let duration = self.time_configuration.state_duration(next_state);
-        self.deadline = duration.map(|d| current_timestamp.plus_seconds(d));
-
-        self
-    }
-
-    pub fn next_reset(self, current_timestamp: Timestamp) -> Self {
-        Epoch::new(
-            EpochState::PublicKeySubmission { resharing: false },
-            self.epoch_id + 1,
-            self.time_configuration,
-            current_timestamp,
-        )
-    }
-
-    pub fn next_resharing(self, current_timestamp: Timestamp) -> Self {
-        Epoch::new(
-            EpochState::PublicKeySubmission { resharing: true },
-            self.epoch_id + 1,
-            self.time_configuration,
-            current_timestamp,
-        )
-    }
-
     pub fn final_timestamp_secs(&self) -> Option<u64> {
-        let mut finish = self.deadline?.seconds();
+        let mut finish = self.finish_timestamp?.seconds();
         let time_configuration = self.time_configuration;
         let mut curr_epoch_state = self.state;
         while let Some(state) = curr_epoch_state.next() {
@@ -324,8 +256,4 @@ impl EpochState {
     pub fn is_in_progress(&self) -> bool {
         matches!(self, EpochState::InProgress)
     }
-
-    pub fn is_dealing_exchange(&self) -> bool {
-        matches!(self, EpochState::DealingExchange { .. })
-    }
 }

common/cosmwasm-smart-contracts/contracts-common/Cargo.toml

@@ -8,7 +8,7 @@ license = { workspace = true }
 repository = { workspace = true }
 
 [dependencies]
-bs58 = { workspace = true }
+bs58 = "0.4.0"
 cosmwasm-std = { workspace = true }
 cosmwasm-schema = { workspace = true }
 schemars = "0.8"

common/credential-storage/Cargo.toml

@@ -11,9 +11,7 @@ async-trait = { workspace = true }
 
 log = { workspace = true }
 thiserror = { workspace = true }
-tokio = { workspace = true, features = ["sync"]}
-zeroize = { workspace = true, features = ["zeroize_derive"] }
-
+tokio = { version = "1.24.1", features = ["sync"]}
 
 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.sqlx]
 workspace = true

common/credential-storage/migrations/20240206120000_add_credential_types.sql

@@ -1,18 +0,0 @@
-/*
- * Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
- * SPDX-License-Identifier: Apache-2.0
- */
-
-DROP TABLE coconut_credentials;
-CREATE TABLE coconut_credentials
-(
-    id                     INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-
---     introduce a way for us to introduce breaking changes in serialization
-    serialization_revision INTEGER NOT NULL,
-    credential_type        TEXT    NOT NULL,
-    credential_data        BLOB    NOT NULL,
-    epoch_id               INTEGER NOT NULL,
-    consumed               BOOLEAN NOT NULL,
-    expired                BOOLEAN NOT NULL
-);

common/credential-storage/src/backends/memory.rs

@@ -1,65 +1,59 @@
-// Copyright 2023-2024 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::models::StoredIssuedCredential;
+use crate::models::CoconutCredential;
 use std::sync::Arc;
 use tokio::sync::RwLock;
 
 #[derive(Clone)]
 pub struct CoconutCredentialManager {
-    inner: Arc<RwLock<CoconutCredentialManagerInner>>,
-}
-
-#[derive(Default)]
-struct CoconutCredentialManagerInner {
-    data: Vec<StoredIssuedCredential>,
-    _next_id: i64,
-}
-
-impl CoconutCredentialManagerInner {
-    fn next_id(&mut self) -> i64 {
-        let next = self._next_id;
-        self._next_id += 1;
-        next
-    }
+    inner: Arc<RwLock<Vec<CoconutCredential>>>,
 }
 
 impl CoconutCredentialManager {
     /// Creates new empty instance of the `CoconutCredentialManager`.
     pub fn new() -> Self {
         CoconutCredentialManager {
-            inner: Default::default(),
+            inner: Arc::new(RwLock::new(Vec::new())),
         }
     }
 
-    pub async fn insert_issued_credential(
+    /// Inserts provided signature into the database.
+    ///
+    /// # Arguments
+    ///
+    /// * `voucher_value`: Plaintext bandwidth value of the credential.
+    /// * `voucher_info`: Plaintext information of the credential.
+    /// * `serial_number`: Base58 representation of the serial number attribute.
+    /// * `binding_number`: Base58 representation of the binding number attribute.
+    /// * `signature`: Coconut credential in the form of a signature.
+    pub async fn insert_coconut_credential(
         &self,
-        credential_type: String,
-        serialization_revision: u8,
-        credential_data: &[u8],
-        epoch_id: u32,
+        voucher_value: String,
+        voucher_info: String,
+        serial_number: String,
+        binding_number: String,
+        signature: String,
+        epoch_id: String,
     ) {
-        let mut inner = self.inner.write().await;
-        let id = inner.next_id();
-        inner.data.push(StoredIssuedCredential {
+        let mut creds = self.inner.write().await;
+        let id = creds.len() as i64;
+        creds.push(CoconutCredential {
             id,
-            serialization_revision,
-            credential_data: credential_data.to_vec(),
-            credential_type,
+            voucher_value,
+            voucher_info,
+            serial_number,
+            binding_number,
+            signature,
             epoch_id,
             consumed: false,
-            expired: false,
-        })
+        });
     }
 
     /// Tries to retrieve one of the stored, unused credentials.
-    pub async fn get_next_unspent_credential(&self) -> Option<StoredIssuedCredential> {
+    pub async fn get_next_coconut_credential(&self) -> Option<CoconutCredential> {
         let creds = self.inner.read().await;
-        creds
-            .data
-            .iter()
-            .find(|c| !c.consumed && !c.expired)
-            .cloned()
+        creds.iter().find(|c| !c.consumed).cloned()
     }
 
     /// Consumes in the database the specified credential.
@@ -69,20 +63,8 @@ impl CoconutCredentialManager {
     /// * `id`: Database id.
     pub async fn consume_coconut_credential(&self, id: i64) {
         let mut creds = self.inner.write().await;
-        if let Some(cred) = creds.data.get_mut(id as usize) {
+        if let Some(cred) = creds.get_mut(id as usize) {
             cred.consumed = true;
         }
     }
-
-    /// Marks the specified credential as expired
-    ///
-    /// # Arguments
-    ///
-    /// * `id`: Id of the credential to mark as expired.
-    pub async fn mark_expired(&self, id: i64) {
-        let mut creds = self.inner.write().await;
-        if let Some(cred) = creds.data.get_mut(id as usize) {
-            cred.expired = true;
-        }
-    }
 }

common/credential-storage/src/backends/sqlite.rs

@@ -1,7 +1,7 @@
-// Copyright 2022-2024 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::models::StoredIssuedCredential;
+use crate::models::CoconutCredential;
 
 #[derive(Clone)]
 pub struct CoconutCredentialManager {
@@ -18,28 +18,40 @@ impl CoconutCredentialManager {
         CoconutCredentialManager { connection_pool }
     }
 
-    pub async fn insert_issued_credential(
+    /// Inserts provided signature into the database.
+    ///
+    /// # Arguments
+    ///
+    /// * `voucher_value`: Plaintext bandwidth value of the credential.
+    /// * `voucher_info`: Plaintext information of the credential.
+    /// * `serial_number`: Base58 representation of the serial number attribute.
+    /// * `binding_number`: Base58 representation of the binding number attribute.
+    /// * `signature`: Coconut credential in the form of a signature.
+    pub async fn insert_coconut_credential(
         &self,
-        credential_type: String,
-        serialization_revision: u8,
-        credential_data: &[u8],
-        epoch_id: u32,
+        voucher_value: String,
+        voucher_info: String,
+        serial_number: String,
+        binding_number: String,
+        signature: String,
+        epoch_id: String,
     ) -> Result<(), sqlx::Error> {
         sqlx::query!(
-            r#"
-                INSERT INTO coconut_credentials(serialization_revision, credential_type, credential_data, epoch_id, consumed, expired)
-                VALUES (?, ?, ?, ?, false, false)
-            "#,
-            serialization_revision, credential_type, credential_data, epoch_id
-        ).execute(&self.connection_pool).await?;
+            "INSERT INTO coconut_credentials(voucher_value, voucher_info, serial_number, binding_number, signature, epoch_id, consumed) VALUES (?, ?, ?, ?, ?, ?, ?)",
+            voucher_value, voucher_info, serial_number, binding_number, signature, epoch_id, false
+        )
+        .execute(&self.connection_pool)
+        .await?;
         Ok(())
     }
 
-    pub async fn get_next_unspent_credential(
+    /// Tries to retrieve one of the stored, unused credentials.
+    pub async fn get_next_coconut_credential(
         &self,
-    ) -> Result<Option<StoredIssuedCredential>, sqlx::Error> {
-        sqlx::query_as(
-            "SELECT * FROM coconut_credentials WHERE NOT consumed AND NOT expired LIMIT 1",
+    ) -> Result<Option<CoconutCredential>, sqlx::Error> {
+        sqlx::query_as!(
+            CoconutCredential,
+            "SELECT * FROM coconut_credentials WHERE NOT consumed"
         )
         .fetch_optional(&self.connection_pool)
         .await
@@ -59,19 +71,4 @@ impl CoconutCredentialManager {
         .await?;
         Ok(())
     }
-
-    /// Marks the specified credential as expired
-    ///
-    /// # Arguments
-    ///
-    /// * `id`: Id of the credential to mark as expired.
-    pub async fn mark_expired(&self, id: i64) -> Result<(), sqlx::Error> {
-        sqlx::query!(
-            "UPDATE coconut_credentials SET expired = TRUE WHERE id = ?",
-            id
-        )
-        .execute(&self.connection_pool)
-        .await?;
-        Ok(())
-    }
 }

common/credential-storage/src/ephemeral_storage.rs

@@ -3,7 +3,7 @@
 
 use crate::backends::memory::CoconutCredentialManager;
 use crate::error::StorageError;
-use crate::models::{StorableIssuedCredential, StoredIssuedCredential};
+use crate::models::CoconutCredential;
 use crate::storage::Storage;
 use async_trait::async_trait;
 
@@ -27,28 +27,37 @@ impl Default for EphemeralStorage {
 impl Storage for EphemeralStorage {
     type StorageError = StorageError;
 
-    async fn insert_issued_credential<'a>(
+    async fn insert_coconut_credential(
         &self,
-        bandwidth_credential: StorableIssuedCredential<'a>,
+        voucher_value: String,
+        voucher_info: String,
+        serial_number: String,
+        binding_number: String,
+        signature: String,
+        epoch_id: String,
     ) -> Result<(), StorageError> {
         self.coconut_credential_manager
-            .insert_issued_credential(
-                bandwidth_credential.credential_type,
-                bandwidth_credential.serialization_revision,
-                bandwidth_credential.credential_data,
-                bandwidth_credential.epoch_id,
+            .insert_coconut_credential(
+                voucher_value,
+                voucher_info,
+                serial_number,
+                binding_number,
+                signature,
+                epoch_id,
             )
             .await;
+
         Ok(())
     }
 
-    async fn get_next_unspent_credential(
-        &self,
-    ) -> Result<Option<StoredIssuedCredential>, Self::StorageError> {
-        Ok(self
+    async fn get_next_coconut_credential(&self) -> Result<CoconutCredential, StorageError> {
+        let credential = self
             .coconut_credential_manager
-            .get_next_unspent_credential()
-            .await)
+            .get_next_coconut_credential()
+            .await
+            .ok_or(StorageError::NoCredential)?;
+
+        Ok(credential)
     }
 
     async fn consume_coconut_credential(&self, id: i64) -> Result<(), StorageError> {
@@ -58,10 +67,4 @@ impl Storage for EphemeralStorage {
 
         Ok(())
     }
-
-    async fn mark_expired(&self, id: i64) -> Result<(), Self::StorageError> {
-        self.coconut_credential_manager.mark_expired(id).await;
-
-        Ok(())
-    }
 }

common/credential-storage/src/models.rs

@@ -1,39 +1,15 @@
-// Copyright 2022-2024 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use zeroize::{Zeroize, ZeroizeOnDrop};
-
-// #[derive(Clone)]
-// pub struct CoconutCredential {
-//     #[allow(dead_code)]
-//     pub id: i64,
-//     pub voucher_value: String,
-//     pub voucher_info: String,
-//     pub serial_number: String,
-//     pub binding_number: String,
-//     pub signature: String,
-//     pub epoch_id: String,
-//     pub consumed: bool,
-// }
-
-#[cfg_attr(not(target_arch = "wasm32"), derive(sqlx::FromRow))]
-#[derive(Zeroize, ZeroizeOnDrop, Clone)]
-pub struct StoredIssuedCredential {
+#[derive(Clone)]
+pub struct CoconutCredential {
+    #[allow(dead_code)]
     pub id: i64,
-
-    pub serialization_revision: u8,
-    pub credential_data: Vec<u8>,
-    pub credential_type: String,
-
-    pub epoch_id: u32,
+    pub voucher_value: String,
+    pub voucher_info: String,
+    pub serial_number: String,
+    pub binding_number: String,
+    pub signature: String,
+    pub epoch_id: String,
     pub consumed: bool,
-    pub expired: bool,
-}
-
-pub struct StorableIssuedCredential<'a> {
-    pub serialization_revision: u8,
-    pub credential_data: &'a [u8],
-    pub credential_type: String,
-
-    pub epoch_id: u32,
 }

common/credential-storage/src/persistent_storage.rs

@@ -5,7 +5,7 @@ use crate::backends::sqlite::CoconutCredentialManager;
 use crate::error::StorageError;
 use crate::storage::Storage;
 
-use crate::models::{StorableIssuedCredential, StoredIssuedCredential};
+use crate::models::CoconutCredential;
 use async_trait::async_trait;
 use log::{debug, error};
 use sqlx::ConnectOptions;
@@ -58,29 +58,37 @@ impl PersistentStorage {
 impl Storage for PersistentStorage {
     type StorageError = StorageError;
 
-    async fn insert_issued_credential<'a>(
+    async fn insert_coconut_credential(
         &self,
-        bandwidth_credential: StorableIssuedCredential<'a>,
-    ) -> Result<(), Self::StorageError> {
+        voucher_value: String,
+        voucher_info: String,
+        serial_number: String,
+        binding_number: String,
+        signature: String,
+        epoch_id: String,
+    ) -> Result<(), StorageError> {
         self.coconut_credential_manager
-            .insert_issued_credential(
-                bandwidth_credential.credential_type,
-                bandwidth_credential.serialization_revision,
-                bandwidth_credential.credential_data,
-                bandwidth_credential.epoch_id,
+            .insert_coconut_credential(
+                voucher_value,
+                voucher_info,
+                serial_number,
+                binding_number,
+                signature,
+                epoch_id,
             )
             .await?;
 
         Ok(())
     }
 
-    async fn get_next_unspent_credential(
-        &self,
-    ) -> Result<Option<StoredIssuedCredential>, Self::StorageError> {
-        Ok(self
+    async fn get_next_coconut_credential(&self) -> Result<CoconutCredential, StorageError> {
+        let credential = self
             .coconut_credential_manager
-            .get_next_unspent_credential()
-            .await?)
+            .get_next_coconut_credential()
+            .await?
+            .ok_or(StorageError::NoCredential)?;
+
+        Ok(credential)
     }
 
     async fn consume_coconut_credential(&self, id: i64) -> Result<(), StorageError> {
@@ -90,10 +98,4 @@ impl Storage for PersistentStorage {
 
         Ok(())
     }
-
-    async fn mark_expired(&self, id: i64) -> Result<(), Self::StorageError> {
-        self.coconut_credential_manager.mark_expired(id).await?;
-
-        Ok(())
-    }
 }

common/credential-storage/src/storage.rs

@@ -1,7 +1,7 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::models::{StorableIssuedCredential, StoredIssuedCredential};
+use crate::models::CoconutCredential;
 use async_trait::async_trait;
 use std::error::Error;
 
@@ -9,16 +9,28 @@ use std::error::Error;
 pub trait Storage: Send + Sync {
     type StorageError: Error;
 
-    async fn insert_issued_credential<'a>(
+    /// Inserts provided signature into the database.
+    ///
+    /// # Arguments
+    ///
+    /// * `voucher_value`: How much bandwidth is in the credential.
+    /// * `voucher_info`: What type of credential it is.
+    /// * `serial_number`: Serial number of the credential.
+    /// * `binding_number`: Binding number of the credential.
+    /// * `signature`: Coconut credential in the form of a signature.
+    /// * `epoch_id`: The epoch when it was signed.
+    async fn insert_coconut_credential(
         &self,
-        bandwidth_credential: StorableIssuedCredential<'a>,
+        voucher_value: String,
+        voucher_info: String,
+        serial_number: String,
+        binding_number: String,
+        signature: String,
+        epoch_id: String,
     ) -> Result<(), Self::StorageError>;
 
-    /// Tries to retrieve one of the stored, unused credentials,
-    /// that is also not marked as expired
-    async fn get_next_unspent_credential(
-        &self,
-    ) -> Result<Option<StoredIssuedCredential>, Self::StorageError>;
+    /// Tries to retrieve one of the stored, unused credentials.
+    async fn get_next_coconut_credential(&self) -> Result<CoconutCredential, Self::StorageError>;
 
     /// Marks as consumed in the database the specified credential.
     ///
@@ -26,11 +38,4 @@ pub trait Storage: Send + Sync {
     ///
     /// * `id`: Id of the credential to be consumed.
     async fn consume_coconut_credential(&self, id: i64) -> Result<(), Self::StorageError>;
-
-    /// Marks the specified credential as expired
-    ///
-    /// # Arguments
-    ///
-    /// * `id`: Id of the credential to mark as expired.
-    async fn mark_expired(&self, id: i64) -> Result<(), Self::StorageError>;
 }

common/credential-utils/Cargo.toml

@@ -12,7 +12,6 @@ thiserror = { workspace = true }
 tokio = { workspace = true }
 
 nym-bandwidth-controller = { path = "../../common/bandwidth-controller" }
-nym-coconut = { path = "../nymcoconut" }
 nym-credentials = { path = "../../common/credentials" }
 nym-credential-storage = { path = "../../common/credential-storage" }
 nym-validator-client = { path = "../../common/client-libs/validator-client" }

common/credential-utils/src/recovery_storage.rs

@@ -3,13 +3,11 @@
 
 use crate::errors::Result;
 use log::error;
-use nym_credentials::coconut::bandwidth::IssuanceBandwidthCredential;
+use nym_credentials::coconut::bandwidth::BandwidthVoucher;
 use std::fs::{create_dir_all, read_dir, File};
 use std::io::{Read, Write};
 use std::path::PathBuf;
 
-pub const DUMPED_VOUCHER_EXTENSION: &str = "credentialrecovery";
-
 pub struct RecoveryStorage {
     recovery_dir: PathBuf,
 }
@@ -20,16 +18,14 @@ impl RecoveryStorage {
         Ok(Self { recovery_dir })
     }
 
-    pub fn unconsumed_vouchers(&self) -> Result<Vec<IssuanceBandwidthCredential>> {
+    pub fn unconsumed_vouchers(&self) -> Result<Vec<BandwidthVoucher>> {
         let entries = read_dir(&self.recovery_dir)?;
 
         let mut paths = vec![];
         for entry in entries.flatten() {
             let path = entry.path();
-            if let Some(extension) = path.extension() {
-                if extension == DUMPED_VOUCHER_EXTENSION {
-                    paths.push(path)
-                }
+            if path.is_file() {
+                paths.push(path)
             }
         }
 
@@ -38,7 +34,7 @@ impl RecoveryStorage {
             if let Ok(mut file) = File::open(&path) {
                 let mut buff = Vec::new();
                 if file.read_to_end(&mut buff).is_ok() {
-                    match IssuanceBandwidthCredential::try_from_recovered_bytes(&buff) {
+                    match BandwidthVoucher::try_from_bytes(&buff) {
                         Ok(voucher) => vouchers.push(voucher),
                         Err(err) => {
                             error!("failed to parse the voucher at {}: {err}", path.display())
@@ -51,17 +47,11 @@ impl RecoveryStorage {
         Ok(vouchers)
     }
 
-    pub fn voucher_filename(voucher: &IssuanceBandwidthCredential) -> String {
-        let prefix = voucher.typ().to_string();
-        let suffix = voucher.blinded_serial_number_bs58();
-        format!("{prefix}-{suffix}.{DUMPED_VOUCHER_EXTENSION}")
-    }
-
-    pub fn insert_voucher(&self, voucher: &IssuanceBandwidthCredential) -> Result<PathBuf> {
-        let file_name = Self::voucher_filename(voucher);
+    pub fn insert_voucher(&self, voucher: &BandwidthVoucher) -> Result<PathBuf> {
+        let file_name = voucher.tx_hash().to_string();
         let file_path = self.recovery_dir.join(file_name);
         let mut file = File::create(&file_path)?;
-        let buff = voucher.to_recovery_bytes();
+        let buff = voucher.to_bytes();
         file.write_all(&buff)?;
 
         Ok(file_path)

common/credential-utils/src/utils.rs

@@ -5,7 +5,6 @@ use nym_bandwidth_controller::acquire::state::State;
 use nym_client_core::config::disk_persistence::CommonClientPaths;
 use nym_config::DEFAULT_DATA_DIR;
 use nym_credential_storage::persistent_storage::PersistentStorage;
-use nym_credentials::coconut::bandwidth::CredentialType;
 use nym_validator_client::nyxd::contract_traits::{
     dkg_query_client::EpochState, CoconutBandwidthSigningClient, DkgQueryClient,
 };
@@ -44,7 +43,7 @@ where
 
     let state = nym_bandwidth_controller::acquire::deposit(client, amount.clone()).await?;
 
-    if nym_bandwidth_controller::acquire::get_bandwidth_voucher(&state, client, persistent_storage)
+    if nym_bandwidth_controller::acquire::get_credential(&state, client, persistent_storage)
         .await
         .is_err()
     {
@@ -92,7 +91,7 @@ where
             .as_secs();
 
         if epoch.state.is_final() {
-            if let Some(finish_timestamp) = epoch.deadline {
+            if let Some(finish_timestamp) = epoch.finish_timestamp {
                 if current_timestamp_secs + SAFETY_BUFFER_SECS >= finish_timestamp.seconds() {
                     info!("In the next {} minute(s), a transition will take place in the coconut system. Deposits should be halted in this time for safety reasons.", SAFETY_BUFFER_SECS / 60);
                     exit(0);
@@ -129,29 +128,19 @@ where
 {
     let mut recovered_amount: u128 = 0;
     for voucher in recovery_storage.unconsumed_vouchers()? {
-        let voucher_value = match voucher.typ() {
-            CredentialType::Voucher => voucher.get_bandwidth_attribute(),
-            CredentialType::FreePass => {
-                error!("unimplemented recovery of free pass credentials");
-                continue;
-            }
-        };
+        let voucher_value = voucher.get_voucher_value();
         recovered_amount += voucher_value.parse::<u128>()?;
 
-        let voucher_name = RecoveryStorage::voucher_filename(&voucher);
         let state = State::new(voucher);
-
+        let voucher = state.voucher.tx_hash();
         if let Err(e) =
-            nym_bandwidth_controller::acquire::get_bandwidth_voucher(&state, client, shared_storage)
-                .await
+            nym_bandwidth_controller::acquire::get_credential(&state, client, shared_storage).await
         {
-            error!("Could not recover deposit {voucher_name} due to {e}, try again later",)
+            error!("Could not recover deposit {voucher} due to {e}, try again later",)
         } else {
-            info!(
-                "Converted deposit {voucher_name} to a credential, removing recovery data for it",
-            );
-            if let Err(err) = recovery_storage.remove_voucher(voucher_name) {
-                warn!("Could not remove recovery data: {err}");
+            info!("Converted deposit {voucher} to a credential, removing recovery data for it",);
+            if let Err(e) = recovery_storage.remove_voucher(voucher.to_string()) {
+                warn!("Could not remove recovery data: {e}");
             }
         }
     }

common/credentials-interface/Cargo.toml

@@ -1,18 +0,0 @@
-[package]
-name = "nym-credentials-interface"
-version = "0.1.0"
-authors.workspace = true
-repository.workspace = true
-homepage.workspace = true
-documentation.workspace = true
-edition.workspace = true
-license.workspace = true
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-bls12_381 = { workspace = true, default-features = false }
-serde = { workspace = true, features = ["derive"] }
-thiserror = { workspace = true }
-
-nym-coconut = { path = "../nymcoconut" }

common/credentials-interface/src/lib.rs

@@ -1,136 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use bls12_381::Scalar;
-use serde::{Deserialize, Serialize};
-use std::fmt::{Display, Formatter};
-use std::str::FromStr;
-use thiserror::Error;
-
-pub use nym_coconut::{
-    aggregate_signature_shares, aggregate_verification_keys, blind_sign, hash_to_scalar, keygen,
-    prepare_blind_sign, prove_bandwidth_credential, verify_credential, Attribute, Base58,
-    BlindSignRequest, BlindedSerialNumber, BlindedSignature, Bytable, CoconutError, KeyPair,
-    Parameters, PrivateAttribute, PublicAttribute, SecretKey, Signature, SignatureShare,
-    VerificationKey, VerifyCredentialRequest,
-};
-
-pub const VOUCHER_INFO_TYPE: &str = "BandwidthVoucher";
-pub const FREE_PASS_INFO_TYPE: &str = "FreeBandwidthPass";
-
-// pub trait NymCredential {
-//     fn prove_credential(&self) -> Result<(), ()>;
-// }
-
-#[derive(Debug, Error)]
-#[error("{0} is not a valid credential type")]
-pub struct UnknownCredentialType(String);
-
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq, Hash)]
-pub enum CredentialType {
-    Voucher,
-    FreePass,
-}
-
-impl FromStr for CredentialType {
-    type Err = UnknownCredentialType;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        if s == VOUCHER_INFO_TYPE {
-            Ok(CredentialType::Voucher)
-        } else if s == FREE_PASS_INFO_TYPE {
-            Ok(CredentialType::FreePass)
-        } else {
-            Err(UnknownCredentialType(s.to_string()))
-        }
-    }
-}
-
-impl CredentialType {
-    pub fn validate(&self, type_plain: &str) -> bool {
-        match self {
-            CredentialType::Voucher => type_plain == VOUCHER_INFO_TYPE,
-            CredentialType::FreePass => type_plain == FREE_PASS_INFO_TYPE,
-        }
-    }
-
-    pub fn is_free_pass(&self) -> bool {
-        matches!(self, CredentialType::FreePass)
-    }
-
-    pub fn is_voucher(&self) -> bool {
-        matches!(self, CredentialType::Voucher)
-    }
-}
-
-impl Display for CredentialType {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        match self {
-            CredentialType::Voucher => VOUCHER_INFO_TYPE.fmt(f),
-            CredentialType::FreePass => FREE_PASS_INFO_TYPE.fmt(f),
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct CredentialSigningData {
-    pub pedersen_commitments_openings: Vec<Scalar>,
-
-    pub blind_sign_request: BlindSignRequest,
-
-    pub public_attributes_plain: Vec<String>,
-
-    pub typ: CredentialType,
-}
-
-#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone)]
-pub struct CredentialSpendingData {
-    pub embedded_private_attributes: usize,
-
-    pub verify_credential_request: VerifyCredentialRequest,
-
-    pub public_attributes_plain: Vec<String>,
-
-    pub typ: CredentialType,
-
-    /// The (DKG) epoch id under which the credential has been issued so that the verifier could use correct verification key for validation.
-    pub epoch_id: u64,
-}
-
-impl CredentialSpendingData {
-    pub fn verify(&self, params: &Parameters, verification_key: &VerificationKey) -> bool {
-        let hashed_public_attributes = self
-            .public_attributes_plain
-            .iter()
-            .map(hash_to_scalar)
-            .collect::<Vec<_>>();
-
-        // get references to the attributes
-        let public_attributes = hashed_public_attributes.iter().collect::<Vec<_>>();
-
-        verify_credential(
-            params,
-            verification_key,
-            &self.verify_credential_request,
-            &public_attributes,
-        )
-    }
-
-    pub fn validate_type_attribute(&self) -> bool {
-        // the first attribute is variant specific bandwidth encoding, the second one should be the type
-        let Some(type_plain) = self.public_attributes_plain.get(1) else {
-            return false;
-        };
-
-        self.typ.validate(type_plain)
-    }
-
-    pub fn get_bandwidth_attribute(&self) -> Option<&String> {
-        // the first attribute is variant specific bandwidth encoding, the second one should be the type
-        self.public_attributes_plain.first()
-    }
-
-    pub fn blinded_serial_number(&self) -> BlindedSerialNumber {
-        self.verify_credential_request.blinded_serial_number()
-    }
-}

common/credentials/Cargo.toml

@@ -8,17 +8,14 @@ license.workspace = true
 
 [dependencies]
 bls12_381 = { workspace = true, default-features = false, features = ["pairings", "alloc", "experimental"] }
-bincode = "1.3.3"
 cosmrs = { workspace = true }
 thiserror = { workspace = true }
 log = { workspace = true }
-time = { workspace = true, features = ["serde"] }
-serde = { workspace = true, features = ["derive"] }
 zeroize = { workspace = true }
 
 # I guess temporarily until we get serde support in coconut up and running
-nym-credentials-interface = { path = "../credentials-interface" }
-nym-crypto = { path = "../crypto", features = ["rand", "asymmetric", "serde"] }
+nym-coconut-interface = { path = "../coconut-interface" }
+nym-crypto = { path = "../crypto", features = ["rand", "asymmetric"] }
 nym-api-requests = { path = "../../nym-api/nym-api-requests" }
 nym-validator-client = { path = "../client-libs/validator-client", default-features = false }
 

common/credentials/src/coconut/bandwidth.rs

@@ -0,0 +1,428 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+// for time being assume the bandwidth credential consists of public identity of the requester
+// and private (though known... just go along with it) infinite bandwidth value
+// 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 zeroize::{Zeroize, ZeroizeOnDrop};
+
+use super::utils::prepare_credential_for_spending;
+use crate::error::Error;
+
+#[derive(Zeroize, ZeroizeOnDrop)]
+pub struct BandwidthVoucher {
+    // private attributes
+    /// a random secret value generated by the client used for double-spending detection
+    serial_number: PrivateAttribute,
+
+    /// a random secret value generated by the client used to bind multiple credentials together
+    binding_number: PrivateAttribute,
+
+    // public atttributes:
+    /// the plain text value (e.g., bandwidth) encoded in this voucher
+    // TODO: in another PR change the value from `"1000"` to `"1000unym"`
+    voucher_value_plain: String,
+
+    /// the plain text information
+    voucher_info_plain: String,
+
+    /// the precomputed value (e.g., bandwidth) encoded in this voucher
+    _voucher_value_prehashed: PublicAttribute,
+
+    /// the precomputed field with public information, e.g., type of voucher, interval etc.
+    _voucher_info_prehashed: PublicAttribute,
+
+    /// the hash of the deposit transaction
+    #[zeroize(skip)]
+    tx_hash: Hash,
+
+    /// base58 encoded private key ensuring the depositer requested these attributes
+    signing_key: identity::PrivateKey,
+
+    /// base58 encoded private key ensuring only this client receives the signature share
+    unused_ed25519: encryption::PrivateKey,
+
+    pedersen_commitments_openings: Vec<Attribute>,
+
+    #[zeroize(skip)]
+    blind_sign_request: BlindSignRequest,
+}
+
+impl BandwidthVoucher {
+    pub const PUBLIC_ATTRIBUTES: u32 = 2;
+    pub const PRIVATE_ATTRIBUTES: u32 = 2;
+    pub const ENCODED_ATTRIBUTES: u32 = 4;
+
+    pub fn default_parameters() -> Parameters {
+        // safety: the unwrap is fine here as Self::ENCODED_ATTRIBUTES is non-zero
+        Parameters::new(Self::ENCODED_ATTRIBUTES).unwrap()
+    }
+
+    pub fn new(
+        params: &Parameters,
+        voucher_value: String,
+        voucher_info: String,
+        tx_hash: Hash,
+        signing_key: identity::PrivateKey,
+        encryption_key: encryption::PrivateKey,
+    ) -> Self {
+        let serial_number = params.random_scalar();
+        let binding_number = params.random_scalar();
+        let voucher_value_plain = voucher_value.clone();
+        let voucher_info_plain = voucher_info.clone();
+
+        let _voucher_value_prehashed = hash_to_scalar(voucher_value);
+        let _voucher_info_prehashed = hash_to_scalar(voucher_info);
+
+        let (pedersen_commitments_openings, blind_sign_request) = prepare_blind_sign(
+            params,
+            &[&serial_number, &binding_number],
+            &[&_voucher_value_prehashed, &_voucher_info_prehashed],
+        )
+        .unwrap();
+        BandwidthVoucher {
+            serial_number,
+            binding_number,
+            _voucher_value_prehashed,
+            voucher_value_plain,
+            _voucher_info_prehashed,
+            voucher_info_plain,
+            tx_hash,
+            signing_key,
+            unused_ed25519: encryption_key,
+            pedersen_commitments_openings,
+            blind_sign_request,
+        }
+    }
+
+    pub fn to_bytes(&self) -> Vec<u8> {
+        let serial_number_b = self.serial_number.to_bytes();
+        let binding_number_b = self.binding_number.to_bytes();
+        let voucher_value_plain_b = self.voucher_value_plain.as_bytes();
+        let voucher_info_plain_b = self.voucher_info_plain.as_bytes();
+        let tx_hash_b = self.tx_hash.as_bytes();
+        let signing_key_b = self.signing_key.to_bytes();
+        let encryption_key_b = self.unused_ed25519.to_bytes();
+        let blind_sign_request_b = self.blind_sign_request.to_bytes();
+
+        let mut ret = Vec::new();
+
+        ret.extend_from_slice(&serial_number_b);
+        ret.extend_from_slice(&binding_number_b);
+        ret.extend_from_slice(tx_hash_b);
+        ret.extend_from_slice(&signing_key_b);
+        ret.extend_from_slice(&encryption_key_b);
+        ret.extend_from_slice(&(voucher_value_plain_b.len() as u64).to_be_bytes());
+        ret.extend_from_slice(&(voucher_info_plain_b.len() as u64).to_be_bytes());
+        ret.extend_from_slice(&(blind_sign_request_b.len() as u64).to_be_bytes());
+        ret.extend_from_slice(&(self.pedersen_commitments_openings.len() as u64).to_be_bytes());
+        ret.extend_from_slice(voucher_value_plain_b);
+        ret.extend_from_slice(voucher_info_plain_b);
+        ret.extend_from_slice(&blind_sign_request_b);
+        for commitment in self.pedersen_commitments_openings.iter() {
+            ret.extend_from_slice(&commitment.to_bytes());
+        }
+
+        ret
+    }
+
+    pub fn try_from_bytes(bytes: &[u8]) -> Result<Self, Error> {
+        if bytes.len() < 32 * 5 + 4 * 8 {
+            return Err(Error::BandwidthVoucherDeserializationError(format!(
+                "Less then {} bytes needed",
+                32 * 5 + 4 * 8
+            )));
+        }
+        let mut buff = [0u8; 32];
+        let mut small_buff = [0u8; 8];
+        let scalar_err =
+            || Error::BandwidthVoucherDeserializationError(String::from("Invalid Scalar"));
+        buff.copy_from_slice(&bytes[..32]);
+        let serial_number = Option::<PrivateAttribute>::from(PrivateAttribute::from_bytes(&buff))
+            .ok_or_else(scalar_err)?;
+        buff.copy_from_slice(&bytes[32..2 * 32]);
+        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::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"))
+        })?;
+        buff.copy_from_slice(&bytes[4 * 32..5 * 32]);
+        let encryption_key = encryption::PrivateKey::from_bytes(&buff).map_err(|_| {
+            Error::BandwidthVoucherDeserializationError(String::from("Invalid key"))
+        })?;
+        small_buff.copy_from_slice(&bytes[5 * 32..5 * 32 + 8]);
+        let voucher_value_plain_no = u64::from_be_bytes(small_buff) as usize;
+        small_buff.copy_from_slice(&bytes[5 * 32 + 8..5 * 32 + 2 * 8]);
+        let voucher_info_plain_no = u64::from_be_bytes(small_buff) as usize;
+        small_buff.copy_from_slice(&bytes[5 * 32 + 2 * 8..5 * 32 + 3 * 8]);
+        let blind_sign_request_no = u64::from_be_bytes(small_buff) as usize;
+        small_buff.copy_from_slice(&bytes[5 * 32 + 3 * 8..5 * 32 + 4 * 8]);
+        let pedersen_commitments_openings_no = u64::from_be_bytes(small_buff) as usize;
+
+        let total_length = 32 * 5
+            + 4 * 8
+            + voucher_value_plain_no
+            + voucher_info_plain_no
+            + blind_sign_request_no
+            + pedersen_commitments_openings_no * 32;
+        if bytes.len() != total_length {
+            return Err(Error::BandwidthVoucherDeserializationError(format!(
+                "Expected {total_length} bytes",
+            )));
+        }
+
+        let utf_err = |_| {
+            Err(Error::BandwidthVoucherDeserializationError(String::from(
+                "Invalid UTF8 string",
+            )))
+        };
+        let mut var_length_pointer = 5 * 32 + 4 * 8;
+        let voucher_value_plain = String::from_utf8(
+            bytes[var_length_pointer..var_length_pointer + voucher_value_plain_no].to_vec(),
+        )
+        .or_else(utf_err)?;
+        let _voucher_value_prehashed = hash_to_scalar(&voucher_value_plain);
+        var_length_pointer += voucher_value_plain_no;
+        let voucher_info_plain = String::from_utf8(
+            bytes[var_length_pointer..var_length_pointer + voucher_info_plain_no].to_vec(),
+        )
+        .or_else(utf_err)?;
+        let _voucher_info_prehashed = hash_to_scalar(&voucher_info_plain);
+        var_length_pointer += voucher_info_plain_no;
+        let blind_sign_request = BlindSignRequest::from_bytes(
+            &bytes[var_length_pointer..var_length_pointer + blind_sign_request_no],
+        )?;
+        var_length_pointer += blind_sign_request_no;
+
+        let mut pedersen_commitments_openings = Vec::new();
+        for _ in 0..pedersen_commitments_openings_no {
+            buff.copy_from_slice(&bytes[var_length_pointer..var_length_pointer + 32]);
+            let commitment =
+                Option::<Attribute>::from(Attribute::from_bytes(&buff)).ok_or_else(scalar_err)?;
+            var_length_pointer += 32;
+            pedersen_commitments_openings.push(commitment);
+        }
+
+        Ok(Self {
+            serial_number,
+            binding_number,
+            _voucher_value_prehashed,
+            voucher_value_plain,
+            _voucher_info_prehashed,
+            voucher_info_plain,
+            tx_hash,
+            signing_key,
+            unused_ed25519: encryption_key,
+            pedersen_commitments_openings,
+            blind_sign_request,
+        })
+    }
+
+    /// Check if the plain values correspond to the PublicAttributes
+    pub fn verify_against_plain(values: &[&PublicAttribute], plain_values: &[String]) -> bool {
+        values.len() == 2
+            && plain_values.len() == 2
+            && values[0] == &hash_to_scalar(&plain_values[0])
+            && values[1] == &hash_to_scalar(&plain_values[1])
+    }
+
+    pub fn tx_hash(&self) -> Hash {
+        self.tx_hash
+    }
+
+    pub fn get_public_attributes(&self) -> Vec<&PublicAttribute> {
+        vec![
+            &self._voucher_value_prehashed,
+            &self._voucher_info_prehashed,
+        ]
+    }
+
+    pub fn identity_key(&self) -> &identity::PrivateKey {
+        &self.signing_key
+    }
+
+    pub fn encryption_key(&self) -> &encryption::PrivateKey {
+        &self.unused_ed25519
+    }
+
+    pub fn pedersen_commitments_openings(&self) -> &Vec<Attribute> {
+        &self.pedersen_commitments_openings
+    }
+
+    pub fn blind_sign_request(&self) -> &BlindSignRequest {
+        &self.blind_sign_request
+    }
+
+    pub fn get_voucher_value(&self) -> String {
+        self.voucher_value_plain.clone()
+    }
+
+    pub fn get_public_attributes_plain(&self) -> Vec<String> {
+        vec![
+            self.voucher_value_plain.clone(),
+            self.voucher_info_plain.clone(),
+        ]
+    }
+
+    pub fn get_private_attributes(&self) -> Vec<&PrivateAttribute> {
+        vec![&self.serial_number, &self.binding_number]
+    }
+
+    pub fn signable_plaintext(request: &BlindSignRequest, tx_hash: Hash) -> Vec<u8> {
+        let mut message = request.to_bytes();
+        message.extend_from_slice(tx_hash.as_bytes());
+        message
+    }
+
+    pub fn sign(&self) -> identity::Signature {
+        let message = Self::signable_plaintext(&self.blind_sign_request, self.tx_hash);
+        self.signing_key.sign(message)
+    }
+}
+
+pub fn prepare_for_spending(
+    voucher_value: u64,
+    voucher_info: String,
+    serial_number: &PrivateAttribute,
+    binding_number: &PrivateAttribute,
+    epoch_id: u64,
+    signature: &Signature,
+    verification_key: &VerificationKey,
+) -> Result<Credential, Error> {
+    let params = Parameters::new(BandwidthVoucher::ENCODED_ATTRIBUTES)?;
+
+    prepare_credential_for_spending(
+        &params,
+        voucher_value,
+        voucher_info,
+        serial_number,
+        binding_number,
+        epoch_id,
+        signature,
+        verification_key,
+    )
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use cosmrs::tendermint::hash::Algorithm;
+    use nym_coconut_interface::Base58;
+    use rand::rngs::OsRng;
+
+    fn voucher_fixture() -> BandwidthVoucher {
+        let params = Parameters::new(4).unwrap();
+        let mut rng = OsRng;
+        BandwidthVoucher::new(
+            &params,
+            "1234".to_string(),
+            "voucher info".to_string(),
+            Hash::from_bytes(Algorithm::Sha256, &[0; 32]).unwrap(),
+            identity::PrivateKey::from_base58_string(
+                identity::KeyPair::new(&mut rng)
+                    .private_key()
+                    .to_base58_string(),
+            )
+            .unwrap(),
+            encryption::PrivateKey::from_bytes(
+                &encryption::KeyPair::new(&mut rng).private_key().to_bytes(),
+            )
+            .unwrap(),
+        )
+    }
+
+    #[test]
+    fn serde_voucher() {
+        let voucher = voucher_fixture();
+        let bytes = voucher.to_bytes();
+        let deserialized_voucher = BandwidthVoucher::try_from_bytes(&bytes).unwrap();
+        assert_eq!(voucher.serial_number, deserialized_voucher.serial_number);
+        assert_eq!(voucher.binding_number, deserialized_voucher.binding_number);
+        assert_eq!(
+            voucher.voucher_value_plain,
+            deserialized_voucher.voucher_value_plain
+        );
+        assert_eq!(
+            voucher.voucher_info_plain,
+            deserialized_voucher.voucher_info_plain
+        );
+        assert_eq!(
+            voucher._voucher_value_prehashed,
+            deserialized_voucher._voucher_value_prehashed
+        );
+        assert_eq!(
+            voucher._voucher_info_prehashed,
+            deserialized_voucher._voucher_info_prehashed
+        );
+        assert_eq!(voucher.tx_hash, deserialized_voucher.tx_hash);
+        assert_eq!(
+            voucher.signing_key.to_string(),
+            deserialized_voucher.signing_key.to_string()
+        );
+        assert_eq!(
+            voucher.unused_ed25519.to_string(),
+            deserialized_voucher.unused_ed25519.to_string()
+        );
+        assert_eq!(
+            voucher.pedersen_commitments_openings,
+            deserialized_voucher.pedersen_commitments_openings
+        );
+        assert_eq!(
+            voucher.blind_sign_request.to_bs58(),
+            deserialized_voucher.blind_sign_request.to_bs58()
+        );
+    }
+
+    #[test]
+    fn voucher_consistency() {
+        let voucher = voucher_fixture();
+        assert!(!BandwidthVoucher::verify_against_plain(
+            &[],
+            &voucher.get_public_attributes_plain()
+        ));
+        assert!(!BandwidthVoucher::verify_against_plain(
+            &voucher.get_public_attributes(),
+            &[],
+        ));
+        assert!(!BandwidthVoucher::verify_against_plain(
+            &voucher.get_public_attributes(),
+            &[
+                voucher.get_public_attributes_plain()[0].clone(),
+                String::new()
+            ]
+        ));
+        assert!(!BandwidthVoucher::verify_against_plain(
+            &voucher.get_public_attributes(),
+            &[
+                String::new(),
+                voucher.get_public_attributes_plain()[1].clone()
+            ]
+        ));
+        assert!(!BandwidthVoucher::verify_against_plain(
+            &[voucher.get_public_attributes()[0], &Attribute::one()],
+            &voucher.get_public_attributes_plain()
+        ));
+        assert!(!BandwidthVoucher::verify_against_plain(
+            &[&Attribute::one(), voucher.get_public_attributes()[1]],
+            &voucher.get_public_attributes_plain()
+        ));
+        assert!(BandwidthVoucher::verify_against_plain(
+            &voucher.get_public_attributes(),
+            &voucher.get_public_attributes_plain()
+        ));
+    }
+}

common/credentials/src/coconut/bandwidth/freepass.rs

@@ -1,141 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::coconut::utils::scalar_serde_helper;
-use crate::error::Error;
-use nym_api_requests::coconut::FreePassRequest;
-use nym_credentials_interface::{
-    hash_to_scalar, Attribute, BlindedSignature, CredentialSigningData, PublicAttribute,
-};
-use nym_validator_client::signing::AccountData;
-use serde::{Deserialize, Serialize};
-use time::{Duration, OffsetDateTime, Time};
-use zeroize::{Zeroize, ZeroizeOnDrop};
-
-pub const MAX_FREE_PASS_VALIDITY: Duration = Duration::WEEK; // 1 week
-
-#[derive(Debug, Zeroize, ZeroizeOnDrop, Serialize, Deserialize)]
-pub struct FreePassIssuedData {
-    /// the plain validity value of this credential expressed as unix timestamp
-    #[zeroize(skip)]
-    expiry_date: OffsetDateTime,
-}
-
-impl<'a> From<&'a FreePassIssuanceData> for FreePassIssuedData {
-    fn from(value: &'a FreePassIssuanceData) -> Self {
-        FreePassIssuedData {
-            expiry_date: value.expiry_date,
-        }
-    }
-}
-
-impl FreePassIssuedData {
-    pub fn expired(&self) -> bool {
-        self.expiry_date <= OffsetDateTime::now_utc()
-    }
-
-    pub fn expiry_date(&self) -> OffsetDateTime {
-        self.expiry_date
-    }
-
-    pub fn expiry_date_plain(&self) -> String {
-        self.expiry_date.unix_timestamp().to_string()
-    }
-}
-
-#[derive(Zeroize, Serialize, Deserialize)]
-pub struct FreePassIssuanceData {
-    /// the plain validity value of this credential expressed as unix timestamp
-    #[zeroize(skip)]
-    expiry_date: OffsetDateTime,
-
-    // the expiry date, as unix timestamp, hashed into a scalar
-    #[serde(with = "scalar_serde_helper")]
-    expiry_date_prehashed: PublicAttribute,
-}
-
-impl FreePassIssuanceData {
-    pub fn new(expiry_date: Option<OffsetDateTime>) -> Self {
-        // ideally we should have implemented a proper error handling here, sure.
-        // but given it's meant to only be used by nym, imo it's fine to just panic here in case of invalid arguments
-        let expiry_date = if let Some(provided) = expiry_date {
-            if provided - OffsetDateTime::now_utc() > MAX_FREE_PASS_VALIDITY {
-                panic!("the provided expiry date is bigger than the maximum value of {MAX_FREE_PASS_VALIDITY}");
-            }
-
-            provided
-        } else {
-            Self::default_expiry_date()
-        };
-
-        let expiry_date_prehashed = hash_to_scalar(expiry_date.unix_timestamp().to_string());
-
-        FreePassIssuanceData {
-            expiry_date,
-            expiry_date_prehashed,
-        }
-    }
-
-    pub fn default_expiry_date() -> OffsetDateTime {
-        // set it to furthest midnight in the future such as it's no more than a week away,
-        // i.e. if it's currently for example 9:43 on 2nd March 2024, it will set it to 0:00 on 9th March 2024
-        (OffsetDateTime::now_utc() + MAX_FREE_PASS_VALIDITY).replace_time(Time::MIDNIGHT)
-    }
-
-    pub fn expiry_date_attribute(&self) -> &Attribute {
-        &self.expiry_date_prehashed
-    }
-
-    pub fn expiry_date_plain(&self) -> String {
-        self.expiry_date.unix_timestamp().to_string()
-    }
-
-    pub async fn obtain_free_pass_nonce(
-        &self,
-        client: &nym_validator_client::client::NymApiClient,
-    ) -> Result<[u8; 16], Error> {
-        let server_response = client.free_pass_nonce().await?;
-        Ok(server_response.current_nonce)
-    }
-
-    pub fn create_free_pass_request(
-        &self,
-        signing_request: &CredentialSigningData,
-        account_data: &AccountData,
-        issuer_nonce: [u8; 16],
-    ) -> Result<FreePassRequest, Error> {
-        let nonce_signature = account_data
-            .private_key()
-            .sign(&issuer_nonce)
-            .map_err(|_| Error::Secp256k1SignFailure)?;
-
-        Ok(FreePassRequest {
-            cosmos_pubkey: account_data.public_key(),
-            inner_sign_request: signing_request.blind_sign_request.clone(),
-            used_nonce: issuer_nonce,
-            nonce_signature,
-            public_attributes_plain: signing_request.public_attributes_plain.clone(),
-        })
-    }
-
-    pub async fn obtain_blinded_credential(
-        &self,
-        client: &nym_validator_client::client::NymApiClient,
-        request: &FreePassRequest,
-    ) -> Result<BlindedSignature, Error> {
-        let server_response = client.issue_free_pass_credential(request).await?;
-        Ok(server_response.blinded_signature)
-    }
-
-    pub async fn request_blinded_credential(
-        &self,
-        signing_request: &CredentialSigningData,
-        account_data: &AccountData,
-        client: &nym_validator_client::client::NymApiClient,
-    ) -> Result<BlindedSignature, Error> {
-        let signing_nonce = self.obtain_free_pass_nonce(client).await?;
-        let request =
-            self.create_free_pass_request(signing_request, account_data, signing_nonce)?;
-        self.obtain_blinded_credential(client, &request).await
-    }
-}

common/credentials/src/coconut/bandwidth/issuance.rs

@@ -1,347 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::coconut::bandwidth::freepass::FreePassIssuanceData;
-use crate::coconut::bandwidth::issued::IssuedBandwidthCredential;
-use crate::coconut::bandwidth::voucher::BandwidthVoucherIssuanceData;
-use crate::coconut::bandwidth::{
-    bandwidth_credential_params, CredentialSigningData, CredentialType,
-};
-use crate::coconut::utils::scalar_serde_helper;
-use crate::error::Error;
-use nym_credentials_interface::{
-    aggregate_signature_shares, hash_to_scalar, prepare_blind_sign, Attribute, BlindedSerialNumber,
-    BlindedSignature, Parameters, PrivateAttribute, PublicAttribute, Signature, SignatureShare,
-    VerificationKey,
-};
-use nym_crypto::asymmetric::{encryption, identity};
-use nym_validator_client::nym_api::EpochId;
-use nym_validator_client::nyxd::{Coin, Hash};
-use nym_validator_client::signing::AccountData;
-use serde::{Deserialize, Serialize};
-use time::OffsetDateTime;
-use zeroize::{Zeroize, ZeroizeOnDrop};
-
-#[derive(Zeroize, ZeroizeOnDrop, Serialize, Deserialize)]
-pub enum BandwidthCredentialIssuanceDataVariant {
-    Voucher(BandwidthVoucherIssuanceData),
-    FreePass(FreePassIssuanceData),
-}
-
-impl From<FreePassIssuanceData> for BandwidthCredentialIssuanceDataVariant {
-    fn from(value: FreePassIssuanceData) -> Self {
-        BandwidthCredentialIssuanceDataVariant::FreePass(value)
-    }
-}
-
-impl From<BandwidthVoucherIssuanceData> for BandwidthCredentialIssuanceDataVariant {
-    fn from(value: BandwidthVoucherIssuanceData) -> Self {
-        BandwidthCredentialIssuanceDataVariant::Voucher(value)
-    }
-}
-
-impl BandwidthCredentialIssuanceDataVariant {
-    pub fn info(&self) -> CredentialType {
-        match self {
-            BandwidthCredentialIssuanceDataVariant::Voucher(..) => CredentialType::Voucher,
-            BandwidthCredentialIssuanceDataVariant::FreePass(..) => CredentialType::FreePass,
-        }
-    }
-
-    // currently this works under the assumption of there being a single unique public attribute for given variant
-    pub fn public_value(&self) -> &Attribute {
-        match self {
-            BandwidthCredentialIssuanceDataVariant::Voucher(voucher) => voucher.value_attribute(),
-            BandwidthCredentialIssuanceDataVariant::FreePass(freepass) => {
-                freepass.expiry_date_attribute()
-            }
-        }
-    }
-
-    // currently this works under the assumption of there being a single unique public attribute for given variant
-    pub fn public_value_plain(&self) -> String {
-        match self {
-            BandwidthCredentialIssuanceDataVariant::Voucher(voucher) => voucher.value_plain(),
-            BandwidthCredentialIssuanceDataVariant::FreePass(freepass) => {
-                freepass.expiry_date_plain()
-            }
-        }
-    }
-
-    pub fn voucher_data(&self) -> Option<&BandwidthVoucherIssuanceData> {
-        match self {
-            BandwidthCredentialIssuanceDataVariant::Voucher(voucher) => Some(voucher),
-            _ => None,
-        }
-    }
-}
-
-// all types of bandwidth credentials contain serial number and binding number
-#[derive(Zeroize, ZeroizeOnDrop, Serialize, Deserialize)]
-pub struct IssuanceBandwidthCredential {
-    // private attributes
-    /// a random secret value generated by the client used for double-spending detection
-    #[serde(with = "scalar_serde_helper")]
-    serial_number: PrivateAttribute,
-
-    /// a random secret value generated by the client used to bind multiple credentials together
-    #[serde(with = "scalar_serde_helper")]
-    binding_number: PrivateAttribute,
-
-    /// data specific to given bandwidth credential, for example a value for bandwidth voucher and expiry date for the free pass
-    variant_data: BandwidthCredentialIssuanceDataVariant,
-
-    /// type of the bandwdith credential hashed onto a scalar
-    #[serde(with = "scalar_serde_helper")]
-    type_prehashed: PublicAttribute,
-}
-
-impl IssuanceBandwidthCredential {
-    pub const PUBLIC_ATTRIBUTES: u32 = 2;
-    pub const PRIVATE_ATTRIBUTES: u32 = 2;
-    pub const ENCODED_ATTRIBUTES: u32 = Self::PUBLIC_ATTRIBUTES + Self::PRIVATE_ATTRIBUTES;
-
-    pub fn default_parameters() -> Parameters {
-        // safety: the unwrap is fine here as Self::ENCODED_ATTRIBUTES is non-zero
-        Parameters::new(Self::ENCODED_ATTRIBUTES).unwrap()
-    }
-
-    pub fn new<B: Into<BandwidthCredentialIssuanceDataVariant>>(variant_data: B) -> Self {
-        let variant_data = variant_data.into();
-        let type_prehashed = hash_to_scalar(variant_data.info().to_string());
-
-        let params = bandwidth_credential_params();
-        let serial_number = params.random_scalar();
-        let binding_number = params.random_scalar();
-
-        IssuanceBandwidthCredential {
-            serial_number,
-            binding_number,
-            variant_data,
-            type_prehashed,
-        }
-    }
-
-    pub fn new_voucher(
-        value: impl Into<Coin>,
-        deposit_tx_hash: Hash,
-        signing_key: identity::PrivateKey,
-        unused_ed25519: encryption::PrivateKey,
-    ) -> Self {
-        Self::new(BandwidthVoucherIssuanceData::new(
-            value,
-            deposit_tx_hash,
-            signing_key,
-            unused_ed25519,
-        ))
-    }
-
-    pub fn new_freepass(expiry_date: Option<OffsetDateTime>) -> Self {
-        Self::new(FreePassIssuanceData::new(expiry_date))
-    }
-
-    pub fn blind_serial_number(&self) -> BlindedSerialNumber {
-        (bandwidth_credential_params().gen2() * self.serial_number).into()
-    }
-
-    pub fn blinded_serial_number_bs58(&self) -> String {
-        use nym_credentials_interface::Base58;
-
-        self.blind_serial_number().to_bs58()
-    }
-
-    pub fn typ(&self) -> CredentialType {
-        self.variant_data.info()
-    }
-
-    pub fn get_private_attributes(&self) -> Vec<&PrivateAttribute> {
-        vec![&self.serial_number, &self.binding_number]
-    }
-
-    pub fn get_public_attributes(&self) -> Vec<&PublicAttribute> {
-        vec![self.variant_data.public_value(), &self.type_prehashed]
-    }
-
-    pub fn get_plain_public_attributes(&self) -> Vec<String> {
-        vec![
-            self.variant_data.public_value_plain(),
-            self.typ().to_string(),
-        ]
-    }
-
-    pub fn get_variant_data(&self) -> &BandwidthCredentialIssuanceDataVariant {
-        &self.variant_data
-    }
-
-    pub fn get_bandwidth_attribute(&self) -> String {
-        self.variant_data.public_value_plain()
-    }
-
-    pub fn prepare_for_signing(&self) -> CredentialSigningData {
-        let params = bandwidth_credential_params();
-
-        // safety: the creation of the request can only fail if one provided invalid parameters
-        // and we created then specific to this type of the credential so the unwrap is fine
-        let (pedersen_commitments_openings, blind_sign_request) = prepare_blind_sign(
-            params,
-            &[&self.serial_number, &self.binding_number],
-            &self.get_public_attributes(),
-        )
-        .unwrap();
-
-        CredentialSigningData {
-            pedersen_commitments_openings,
-            blind_sign_request,
-            public_attributes_plain: self.get_plain_public_attributes(),
-            typ: self.typ(),
-        }
-    }
-
-    pub fn unblind_signature(
-        &self,
-        validator_vk: &VerificationKey,
-        signing_data: &CredentialSigningData,
-        blinded_signature: BlindedSignature,
-    ) -> Result<Signature, Error> {
-        let public_attributes = self.get_public_attributes();
-        let private_attributes = self.get_private_attributes();
-
-        let params = bandwidth_credential_params();
-        let unblinded_signature = blinded_signature.unblind_and_verify(
-            params,
-            validator_vk,
-            &private_attributes,
-            &public_attributes,
-            &signing_data.blind_sign_request.get_commitment_hash(),
-            &signing_data.pedersen_commitments_openings,
-        )?;
-
-        Ok(unblinded_signature)
-    }
-
-    pub async fn obtain_partial_freepass_credential(
-        &self,
-        client: &nym_validator_client::client::NymApiClient,
-        account_data: &AccountData,
-        validator_vk: &VerificationKey,
-        signing_data: impl Into<Option<CredentialSigningData>>,
-    ) -> Result<Signature, Error> {
-        // if we provided signing data, do use them, otherwise generate fresh data
-        let signing_data = signing_data
-            .into()
-            .unwrap_or_else(|| self.prepare_for_signing());
-
-        let blinded_signature = match &self.variant_data {
-            BandwidthCredentialIssuanceDataVariant::FreePass(freepass) => {
-                freepass
-                    .request_blinded_credential(&signing_data, account_data, client)
-                    .await?
-            }
-            _ => return Err(Error::NotAFreePass),
-        };
-        self.unblind_signature(validator_vk, &signing_data, blinded_signature)
-    }
-
-    // ideally this would have been generic over credential type, but we really don't need secp256k1 keys for bandwidth vouchers
-    pub async fn obtain_partial_bandwidth_voucher_credential(
-        &self,
-        client: &nym_validator_client::client::NymApiClient,
-        validator_vk: &VerificationKey,
-        signing_data: impl Into<Option<CredentialSigningData>>,
-    ) -> Result<Signature, Error> {
-        // if we provided signing data, do use them, otherwise generate fresh data
-        let signing_data = signing_data
-            .into()
-            .unwrap_or_else(|| self.prepare_for_signing());
-
-        let blinded_signature = match &self.variant_data {
-            BandwidthCredentialIssuanceDataVariant::Voucher(voucher) => {
-                // TODO: the request can be re-used between different apis
-                let request = voucher.create_blind_sign_request_body(&signing_data);
-                voucher.obtain_blinded_credential(client, &request).await?
-            }
-            _ => return Err(Error::NotABandwdithVoucher),
-        };
-        self.unblind_signature(validator_vk, &signing_data, blinded_signature)
-    }
-
-    pub fn aggregate_signature_shares(
-        &self,
-        verification_key: &VerificationKey,
-        shares: &[SignatureShare],
-    ) -> Result<Signature, Error> {
-        let public_attributes = self.get_public_attributes();
-        let private_attributes = self.get_private_attributes();
-
-        let params = bandwidth_credential_params();
-
-        let mut attributes = Vec::with_capacity(private_attributes.len() + public_attributes.len());
-        attributes.extend_from_slice(&private_attributes);
-        attributes.extend_from_slice(&public_attributes);
-
-        aggregate_signature_shares(params, verification_key, &attributes, shares)
-            .map_err(Error::SignatureAggregationError)
-    }
-
-    // also drops self after the conversion
-    pub fn into_issued_credential(
-        self,
-        aggregate_signature: Signature,
-        epoch_id: EpochId,
-    ) -> IssuedBandwidthCredential {
-        self.to_issued_credential(aggregate_signature, epoch_id)
-    }
-
-    pub fn to_issued_credential(
-        &self,
-        aggregate_signature: Signature,
-        epoch_id: EpochId,
-    ) -> IssuedBandwidthCredential {
-        IssuedBandwidthCredential::new(
-            self.serial_number,
-            self.binding_number,
-            aggregate_signature,
-            (&self.variant_data).into(),
-            self.type_prehashed,
-            epoch_id,
-        )
-    }
-
-    // TODO: is that actually needed?
-    pub fn to_recovery_bytes(&self) -> Vec<u8> {
-        use bincode::Options;
-        // safety: our data format is stable and thus the serialization should not fail
-        make_recovery_bincode_serializer().serialize(self).unwrap()
-    }
-
-    // TODO: is that actually needed?
-    // idea: make it consistent with the issued credential and its vX serde
-    pub fn try_from_recovered_bytes(bytes: &[u8]) -> Result<Self, Error> {
-        use bincode::Options;
-        make_recovery_bincode_serializer()
-            .deserialize(bytes)
-            .map_err(|source| Error::RecoveryCredentialDeserializationFailure { source })
-    }
-}
-
-fn make_recovery_bincode_serializer() -> impl bincode::Options {
-    use bincode::Options;
-    bincode::DefaultOptions::new()
-        .with_big_endian()
-        .with_varint_encoding()
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn assert_zeroize_on_drop<T: ZeroizeOnDrop>() {}
-
-    fn assert_zeroize<T: Zeroize>() {}
-
-    #[test]
-    fn credential_is_zeroized() {
-        assert_zeroize::<IssuanceBandwidthCredential>();
-        assert_zeroize_on_drop::<IssuanceBandwidthCredential>();
-    }
-}

common/credentials/src/coconut/bandwidth/issued.rs

@@ -1,222 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::coconut::bandwidth::bandwidth_credential_params;
-use crate::coconut::bandwidth::freepass::FreePassIssuedData;
-use crate::coconut::bandwidth::issuance::{
-    BandwidthCredentialIssuanceDataVariant, IssuanceBandwidthCredential,
-};
-use crate::coconut::bandwidth::voucher::BandwidthVoucherIssuedData;
-use crate::coconut::bandwidth::{CredentialSpendingData, CredentialType};
-use crate::coconut::utils::scalar_serde_helper;
-use crate::error::Error;
-use nym_credentials_interface::prove_bandwidth_credential;
-use nym_credentials_interface::{
-    Parameters, PrivateAttribute, PublicAttribute, Signature, VerificationKey,
-};
-use nym_validator_client::nym_api::EpochId;
-use serde::{Deserialize, Serialize};
-use zeroize::{Zeroize, ZeroizeOnDrop};
-
-pub const CURRENT_SERIALIZATION_REVISION: u8 = 1;
-
-#[derive(Debug, Zeroize, Serialize, Deserialize)]
-pub enum BandwidthCredentialIssuedDataVariant {
-    Voucher(BandwidthVoucherIssuedData),
-    FreePass(FreePassIssuedData),
-}
-
-impl<'a> From<&'a BandwidthCredentialIssuanceDataVariant> for BandwidthCredentialIssuedDataVariant {
-    fn from(value: &'a BandwidthCredentialIssuanceDataVariant) -> Self {
-        match value {
-            BandwidthCredentialIssuanceDataVariant::Voucher(voucher) => {
-                BandwidthCredentialIssuedDataVariant::Voucher(voucher.into())
-            }
-            BandwidthCredentialIssuanceDataVariant::FreePass(freepass) => {
-                BandwidthCredentialIssuedDataVariant::FreePass(freepass.into())
-            }
-        }
-    }
-}
-
-impl From<FreePassIssuedData> for BandwidthCredentialIssuedDataVariant {
-    fn from(value: FreePassIssuedData) -> Self {
-        BandwidthCredentialIssuedDataVariant::FreePass(value)
-    }
-}
-
-impl From<BandwidthVoucherIssuedData> for BandwidthCredentialIssuedDataVariant {
-    fn from(value: BandwidthVoucherIssuedData) -> Self {
-        BandwidthCredentialIssuedDataVariant::Voucher(value)
-    }
-}
-
-impl BandwidthCredentialIssuedDataVariant {
-    pub fn info(&self) -> CredentialType {
-        match self {
-            BandwidthCredentialIssuedDataVariant::Voucher(..) => CredentialType::Voucher,
-            BandwidthCredentialIssuedDataVariant::FreePass(..) => CredentialType::FreePass,
-        }
-    }
-
-    // currently this works under the assumption of there being a single unique public attribute for given variant
-    pub fn public_value_plain(&self) -> String {
-        match self {
-            BandwidthCredentialIssuedDataVariant::Voucher(voucher) => voucher.value_plain(),
-            BandwidthCredentialIssuedDataVariant::FreePass(freepass) => {
-                freepass.expiry_date_plain()
-            }
-        }
-    }
-}
-
-// the only important thing to zeroize here are the private attributes, the rest can be made fully public for what we're concerned
-#[derive(Zeroize, ZeroizeOnDrop, Serialize, Deserialize)]
-pub struct IssuedBandwidthCredential {
-    // private attributes
-    /// a random secret value generated by the client used for double-spending detection
-    #[serde(with = "scalar_serde_helper")]
-    serial_number: PrivateAttribute,
-
-    /// a random secret value generated by the client used to bind multiple credentials together
-    #[serde(with = "scalar_serde_helper")]
-    binding_number: PrivateAttribute,
-
-    /// the underlying aggregated signature on the attributes
-    #[zeroize(skip)]
-    signature: Signature,
-
-    /// data specific to given bandwidth credential, for example a value for bandwidth voucher and expiry date for the free pass
-    variant_data: BandwidthCredentialIssuedDataVariant,
-
-    /// type of the bandwdith credential hashed onto a scalar
-    #[serde(with = "scalar_serde_helper")]
-    type_prehashed: PublicAttribute,
-
-    /// Specifies the (DKG) epoch id when this credential has been issued
-    epoch_id: EpochId,
-}
-
-impl IssuedBandwidthCredential {
-    pub fn new(
-        serial_number: PrivateAttribute,
-        binding_number: PrivateAttribute,
-        signature: Signature,
-        variant_data: BandwidthCredentialIssuedDataVariant,
-        type_prehashed: PublicAttribute,
-        epoch_id: EpochId,
-    ) -> Self {
-        IssuedBandwidthCredential {
-            serial_number,
-            binding_number,
-            signature,
-            variant_data,
-            type_prehashed,
-            epoch_id,
-        }
-    }
-
-    pub fn try_unpack(bytes: &[u8], revision: impl Into<Option<u8>>) -> Result<Self, Error> {
-        let revision = revision.into().unwrap_or(CURRENT_SERIALIZATION_REVISION);
-
-        match revision {
-            1 => Self::unpack_v1(bytes),
-            _ => Err(Error::UnknownSerializationRevision { revision }),
-        }
-    }
-
-    pub fn epoch_id(&self) -> EpochId {
-        self.epoch_id
-    }
-
-    pub fn variant_data(&self) -> &BandwidthCredentialIssuedDataVariant {
-        &self.variant_data
-    }
-
-    pub fn current_serialization_revision(&self) -> u8 {
-        CURRENT_SERIALIZATION_REVISION
-    }
-
-    /// Pack (serialize) this credential data into a stream of bytes using v1 serializer.
-    pub fn pack_v1(&self) -> Vec<u8> {
-        use bincode::Options;
-        // safety: our data format is stable and thus the serialization should not fail
-        make_storable_bincode_serializer().serialize(self).unwrap()
-    }
-
-    /// Unpack (deserialize) the credential data from the given bytes using v1 serializer.
-    pub fn unpack_v1(bytes: &[u8]) -> Result<Self, Error> {
-        use bincode::Options;
-        make_storable_bincode_serializer()
-            .deserialize(bytes)
-            .map_err(|source| Error::SerializationFailure {
-                source,
-                revision: 1,
-            })
-    }
-
-    pub fn randomise_signature(&mut self) {
-        let signature_prime = self.signature.randomise(bandwidth_credential_params());
-        self.signature = signature_prime.0
-    }
-
-    pub fn default_parameters() -> Parameters {
-        IssuanceBandwidthCredential::default_parameters()
-    }
-
-    pub fn typ(&self) -> CredentialType {
-        self.variant_data.info()
-    }
-
-    pub fn get_plain_public_attributes(&self) -> Vec<String> {
-        vec![
-            self.variant_data.public_value_plain(),
-            self.typ().to_string(),
-        ]
-    }
-
-    pub fn prepare_for_spending(
-        &self,
-        verification_key: &VerificationKey,
-    ) -> Result<CredentialSpendingData, Error> {
-        let params = bandwidth_credential_params();
-
-        let verify_credential_request = prove_bandwidth_credential(
-            params,
-            verification_key,
-            &self.signature,
-            &self.serial_number,
-            &self.binding_number,
-        )?;
-
-        Ok(CredentialSpendingData {
-            embedded_private_attributes: IssuanceBandwidthCredential::PRIVATE_ATTRIBUTES as usize,
-            verify_credential_request,
-            public_attributes_plain: self.get_plain_public_attributes(),
-            typ: self.typ(),
-            epoch_id: self.epoch_id,
-        })
-    }
-}
-
-fn make_storable_bincode_serializer() -> impl bincode::Options {
-    use bincode::Options;
-    bincode::DefaultOptions::new()
-        .with_big_endian()
-        .with_varint_encoding()
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn assert_zeroize_on_drop<T: ZeroizeOnDrop>() {}
-
-    fn assert_zeroize<T: Zeroize>() {}
-
-    #[test]
-    fn credential_is_zeroized() {
-        assert_zeroize::<IssuedBandwidthCredential>();
-        assert_zeroize_on_drop::<IssuedBandwidthCredential>();
-    }
-}

common/credentials/src/coconut/bandwidth/mod.rs

@@ -1,22 +0,0 @@
-// Copyright 2021-2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use std::sync::OnceLock;
-
-pub use issuance::IssuanceBandwidthCredential;
-pub use issued::IssuedBandwidthCredential;
-pub use nym_credentials_interface::{
-    CredentialSigningData, CredentialSpendingData, CredentialType, Parameters,
-    UnknownCredentialType,
-};
-
-pub mod freepass;
-pub mod issuance;
-pub mod issued;
-pub mod voucher;
-
-// works under the assumption of having 4 attributes in the underlying credential(s)
-pub fn bandwidth_credential_params() -> &'static Parameters {
-    static BANDWIDTH_CREDENTIAL_PARAMS: OnceLock<Parameters> = OnceLock::new();
-    BANDWIDTH_CREDENTIAL_PARAMS.get_or_init(IssuanceBandwidthCredential::default_parameters)
-}

common/credentials/src/coconut/bandwidth/voucher.rs

@@ -1,137 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::coconut::bandwidth::CredentialSigningData;
-use crate::coconut::utils::scalar_serde_helper;
-use crate::error::Error;
-use nym_api_requests::coconut::BlindSignRequestBody;
-use nym_credentials_interface::{
-    hash_to_scalar, Attribute, BlindSignRequest, BlindedSignature, PublicAttribute,
-};
-use nym_crypto::asymmetric::{encryption, identity};
-use nym_validator_client::nyxd::{Coin, Hash};
-use serde::{Deserialize, Serialize};
-use zeroize::{Zeroize, ZeroizeOnDrop};
-
-#[derive(Debug, Zeroize, ZeroizeOnDrop, Serialize, Deserialize)]
-pub struct BandwidthVoucherIssuedData {
-    /// the plain value (e.g., bandwidth) encoded in this voucher
-    // note: for legacy reasons we're only using the value of the coin and ignoring the denom
-    #[zeroize(skip)]
-    value: Coin,
-}
-
-impl<'a> From<&'a BandwidthVoucherIssuanceData> for BandwidthVoucherIssuedData {
-    fn from(value: &'a BandwidthVoucherIssuanceData) -> Self {
-        BandwidthVoucherIssuedData {
-            value: value.value.clone(),
-        }
-    }
-}
-
-impl BandwidthVoucherIssuedData {
-    pub fn value(&self) -> &Coin {
-        &self.value
-    }
-
-    pub fn value_plain(&self) -> String {
-        self.value.amount.to_string()
-    }
-}
-
-#[derive(Zeroize, ZeroizeOnDrop, Serialize, Deserialize)]
-pub struct BandwidthVoucherIssuanceData {
-    /// the plain value (e.g., bandwidth) encoded in this voucher
-    // note: for legacy reasons we're only using the value of the coin and ignoring the denom
-    #[zeroize(skip)]
-    value: Coin,
-
-    // note: as mentioned above, we're only hashing the value of the coin!
-    #[serde(with = "scalar_serde_helper")]
-    value_prehashed: PublicAttribute,
-
-    /// the hash of the deposit transaction
-    #[zeroize(skip)]
-    deposit_tx_hash: Hash,
-
-    /// base58 encoded private key ensuring the depositer requested these attributes
-    signing_key: identity::PrivateKey,
-
-    /// base58 encoded private key ensuring only this client receives the signature share
-    unused_ed25519: encryption::PrivateKey,
-}
-
-impl BandwidthVoucherIssuanceData {
-    pub fn new(
-        value: impl Into<Coin>,
-        deposit_tx_hash: Hash,
-        signing_key: identity::PrivateKey,
-        unused_ed25519: encryption::PrivateKey,
-    ) -> Self {
-        let value = value.into();
-        let value_prehashed = hash_to_scalar(value.amount.to_string());
-
-        BandwidthVoucherIssuanceData {
-            value,
-            value_prehashed,
-            deposit_tx_hash,
-            signing_key,
-            unused_ed25519,
-        }
-    }
-
-    pub fn request_plaintext(request: &BlindSignRequest, tx_hash: Hash) -> Vec<u8> {
-        let mut message = request.to_bytes();
-        message.extend_from_slice(tx_hash.as_bytes());
-        message
-    }
-
-    fn request_signature(&self, signing_request: &CredentialSigningData) -> identity::Signature {
-        let message =
-            Self::request_plaintext(&signing_request.blind_sign_request, self.deposit_tx_hash);
-        self.signing_key.sign(message)
-    }
-
-    pub fn create_blind_sign_request_body(
-        &self,
-        signing_request: &CredentialSigningData,
-    ) -> BlindSignRequestBody {
-        let request_signature = self.request_signature(signing_request);
-
-        BlindSignRequestBody::new(
-            signing_request.blind_sign_request.clone(),
-            self.deposit_tx_hash,
-            request_signature,
-            signing_request.public_attributes_plain.clone(),
-        )
-    }
-
-    pub async fn obtain_blinded_credential(
-        &self,
-        client: &nym_validator_client::client::NymApiClient,
-        request_body: &BlindSignRequestBody,
-    ) -> Result<BlindedSignature, Error> {
-        let server_response = client.blind_sign(request_body).await?;
-        Ok(server_response.blinded_signature)
-    }
-
-    pub fn value_plain(&self) -> String {
-        self.value.amount.to_string()
-    }
-
-    pub fn value_attribute(&self) -> &Attribute {
-        &self.value_prehashed
-    }
-
-    pub fn tx_hash(&self) -> Hash {
-        self.deposit_tx_hash
-    }
-
-    pub fn identity_key(&self) -> &identity::PrivateKey {
-        &self.signing_key
-    }
-
-    pub fn encryption_key(&self) -> &encryption::PrivateKey {
-        &self.unused_ed25519
-    }
-}

common/credentials/src/coconut/mod.rs

@@ -1,4 +1,4 @@
-// Copyright 2021-2024 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
 pub mod bandwidth;

common/credentials/src/coconut/utils.rs

@@ -1,15 +1,17 @@
-// Copyright 2021-2024 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::coconut::bandwidth::IssuanceBandwidthCredential;
+use crate::coconut::bandwidth::BandwidthVoucher;
 use crate::error::Error;
 use log::{debug, warn};
-use nym_credentials_interface::{
-    aggregate_verification_keys, Signature, SignatureShare, VerificationKey,
+use nym_api_requests::coconut::BlindSignRequestBody;
+use nym_coconut_interface::{
+    aggregate_signature_shares, aggregate_verification_keys, prove_bandwidth_credential, Attribute,
+    Credential, Parameters, Signature, SignatureShare, VerificationKey,
 };
 use nym_validator_client::client::CoconutApiClient;
 
-pub fn obtain_aggregate_verification_key(
+pub async fn obtain_aggregate_verification_key(
     api_clients: &[CoconutApiClient],
 ) -> Result<VerificationKey, Error> {
     if api_clients.is_empty() {
@@ -28,8 +30,44 @@ pub fn obtain_aggregate_verification_key(
     Ok(aggregate_verification_keys(&shares, Some(&indices))?)
 }
 
+async fn obtain_partial_credential(
+    params: &Parameters,
+    voucher: &BandwidthVoucher,
+    client: &nym_validator_client::client::NymApiClient,
+    validator_vk: &VerificationKey,
+) -> Result<Signature, Error> {
+    let public_attributes_plain = voucher.get_public_attributes_plain();
+    let blind_sign_request = voucher.blind_sign_request();
+    let request_signature = voucher.sign();
+
+    let blind_sign_request_body = BlindSignRequestBody::new(
+        blind_sign_request.clone(),
+        voucher.tx_hash(),
+        request_signature,
+        public_attributes_plain,
+    );
+    let response = client.blind_sign(&blind_sign_request_body).await?;
+
+    let blinded_signature = response.blinded_signature;
+
+    let public_attributes = voucher.get_public_attributes();
+    let private_attributes = voucher.get_private_attributes();
+
+    let unblinded_signature = blinded_signature.unblind_and_verify(
+        params,
+        validator_vk,
+        &private_attributes,
+        &public_attributes,
+        &blind_sign_request.get_commitment_hash(),
+        voucher.pedersen_commitments_openings(),
+    )?;
+
+    Ok(unblinded_signature)
+}
+
 pub async fn obtain_aggregate_signature(
-    voucher: &IssuanceBandwidthCredential,
+    params: &Parameters,
+    voucher: &BandwidthVoucher,
     coconut_api_clients: &[CoconutApiClient],
     threshold: u64,
 ) -> Result<Signature, Error> {
@@ -37,9 +75,16 @@ pub async fn obtain_aggregate_signature(
         return Err(Error::NoValidatorsAvailable);
     }
     let mut shares = Vec::with_capacity(coconut_api_clients.len());
-    let verification_key = obtain_aggregate_verification_key(coconut_api_clients)?;
-
-    let request = voucher.prepare_for_signing();
+    let validators_partial_vks: Vec<_> = coconut_api_clients
+        .iter()
+        .map(|api_client| api_client.verification_key.clone())
+        .collect();
+    let indices: Vec<_> = coconut_api_clients
+        .iter()
+        .map(|api_client| api_client.node_id)
+        .collect();
+    let verification_key =
+        aggregate_verification_keys(&validators_partial_vks, Some(indices.as_ref()))?;
 
     for coconut_api_client in coconut_api_clients.iter() {
         debug!(
@@ -47,13 +92,13 @@ pub async fn obtain_aggregate_signature(
             coconut_api_client.api_client.api_url()
         );
 
-        match voucher
-            .obtain_partial_bandwidth_voucher_credential(
-                &coconut_api_client.api_client,
-                &coconut_api_client.verification_key,
-                Some(request.clone()),
-            )
-            .await
+        match obtain_partial_credential(
+            params,
+            voucher,
+            &coconut_api_client.api_client,
+            &coconut_api_client.verification_key,
+        )
+        .await
         {
             Ok(signature) => {
                 let share = SignatureShare::new(signature, coconut_api_client.node_id);
@@ -71,27 +116,42 @@ pub async fn obtain_aggregate_signature(
         return Err(Error::NotEnoughShares);
     }
 
-    voucher.aggregate_signature_shares(&verification_key, &shares)
+    let public_attributes = voucher.get_public_attributes();
+    let private_attributes = voucher.get_private_attributes();
+
+    let mut attributes = Vec::with_capacity(private_attributes.len() + public_attributes.len());
+    attributes.extend_from_slice(&private_attributes);
+    attributes.extend_from_slice(&public_attributes);
+
+    aggregate_signature_shares(params, &verification_key, &attributes, &shares)
+        .map_err(Error::SignatureAggregationError)
 }
 
-pub(crate) mod scalar_serde_helper {
-    use bls12_381::Scalar;
-    use serde::{Deserialize, Deserializer, Serialize, Serializer};
-    use zeroize::Zeroizing;
+// TODO: better type flow
+#[allow(clippy::too_many_arguments)]
+pub fn prepare_credential_for_spending(
+    params: &Parameters,
+    voucher_value: u64,
+    voucher_info: String,
+    serial_number: &Attribute,
+    binding_number: &Attribute,
+    epoch_id: u64,
+    signature: &Signature,
+    verification_key: &VerificationKey,
+) -> Result<Credential, Error> {
+    let theta = prove_bandwidth_credential(
+        params,
+        verification_key,
+        signature,
+        serial_number,
+        binding_number,
+    )?;
 
-    pub fn serialize<S: Serializer>(scalar: &Scalar, serializer: S) -> Result<S::Ok, S::Error> {
-        scalar.to_bytes().serialize(serializer)
-    }
-
-    pub fn deserialize<'de, D: Deserializer<'de>>(deserializer: D) -> Result<Scalar, D::Error> {
-        let b = <[u8; 32]>::deserialize(deserializer)?;
-
-        // make sure the bytes get zeroed
-        let bytes = Zeroizing::new(b);
-
-        let maybe_scalar: Option<Scalar> = Scalar::from_bytes(&bytes).into();
-        maybe_scalar.ok_or(serde::de::Error::custom(
-            "did not construct a valid bls12-381 scalar out of the provided bytes",
-        ))
-    }
+    Ok(Credential::new(
+        BandwidthVoucher::ENCODED_ATTRIBUTES,
+        theta,
+        voucher_value,
+        voucher_info,
+        epoch_id,
+    ))
 }

common/credentials/src/error.rs

@@ -1,11 +1,10 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use nym_credentials_interface::CoconutError;
+use nym_coconut_interface::CoconutError;
 use nym_crypto::asymmetric::encryption::KeyRecoveryError;
 use nym_validator_client::ValidatorClientError;
 
-use crate::coconut::bandwidth::issued::CURRENT_SERIALIZATION_REVISION;
 use thiserror::Error;
 
 #[derive(Debug, Error)]
@@ -13,19 +12,6 @@ pub enum Error {
     #[error("IO error")]
     IOError(#[from] std::io::Error),
 
-    #[error("failed to deserialize a recovery credential: {source}")]
-    RecoveryCredentialDeserializationFailure { source: bincode::Error },
-
-    #[error("failed to (de)serialize provided credential using revision {revision}: {source}")]
-    SerializationFailure {
-        #[source]
-        source: bincode::Error,
-        revision: u8,
-    },
-
-    #[error("unknown credential serializatio revision {revision}. the current (and max supported) version is {CURRENT_SERIALIZATION_REVISION}")]
-    UnknownSerializationRevision { revision: u8 },
-
     #[error("The detailed description is yet to be determined")]
     BandwidthCredentialError,
 
@@ -55,13 +41,4 @@ pub enum Error {
 
     #[error("Could not deserialize bandwidth voucher - {0}")]
     BandwidthVoucherDeserializationError(String),
-
-    #[error("the provided issuance data wasn't prepared for a bandwidth voucher")]
-    NotABandwdithVoucher,
-
-    #[error("the provided issuance data wasn't prepared for a free pass")]
-    NotAFreePass,
-
-    #[error("failed to create a secp256k1 signature")]
-    Secp256k1SignFailure,
 }

common/credentials/src/lib.rs

@@ -4,9 +4,4 @@
 pub mod coconut;
 pub mod error;
 
-pub use coconut::bandwidth::{
-    CredentialSigningData, CredentialSpendingData, IssuanceBandwidthCredential,
-    IssuedBandwidthCredential,
-};
 pub use coconut::utils::{obtain_aggregate_signature, obtain_aggregate_verification_key};
-pub use error::Error;

common/crypto/Cargo.toml

@@ -9,7 +9,7 @@ repository = { workspace = true }
 
 [dependencies]
 aes = { version = "0.8.1", optional = true }
-bs58 = { workspace = true }
+bs58 = "0.4.0"
 blake3 = { version = "1.3.1", features = ["traits-preview"], optional = true }
 ctr = { version = "0.9.1", optional = true }
 digest = { version = "0.10.3", optional = true }

common/dkg/Cargo.toml

@@ -14,7 +14,7 @@ bitvec = "1.0.0"
 # as we need to be able to serialize Gt so that we could create the lookup table for baby-step-giant-step algorithm
 bls12_381 = { workspace = true, default-features = false, features = ["alloc", "pairings", "experimental", "zeroize"] }
 nym-contracts-common = { path = "../cosmwasm-smart-contracts/contracts-common", optional = true }
-bs58 = { workspace = true }
+bs58 = "0.4"
 
 
 lazy_static = "1.4.0"

common/ip-packet-requests/src/lib.rs

@@ -1,33 +1,8 @@
-use serde::{Deserialize, Serialize};
-use std::fmt::{Display, Formatter};
-use std::net::{Ipv4Addr, Ipv6Addr};
-
 pub mod codec;
 pub mod request;
 pub mod response;
 
-// version 3: initial version
-// version 4: IPv6 support
-// version 5: Add severity level to info response
-pub const CURRENT_VERSION: u8 = 5;
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
-pub struct IpPair {
-    pub ipv4: Ipv4Addr,
-    pub ipv6: Ipv6Addr,
-}
-
-impl IpPair {
-    pub fn new(ipv4: Ipv4Addr, ipv6: Ipv6Addr) -> Self {
-        IpPair { ipv4, ipv6 }
-    }
-}
-
-impl Display for IpPair {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        writeln!(f, "IPv4: {}, IPV6: {}", self.ipv4, self.ipv6)
-    }
-}
+pub const CURRENT_VERSION: u8 = 3;
 
 fn make_bincode_serializer() -> impl bincode::Options {
     use bincode::Options;

common/ip-packet-requests/src/request.rs

@@ -1,7 +1,9 @@
+use std::net::IpAddr;
+
 use nym_sphinx::addressing::clients::Recipient;
 use serde::{Deserialize, Serialize};
 
-use crate::{make_bincode_serializer, IpPair, CURRENT_VERSION};
+use crate::{make_bincode_serializer, CURRENT_VERSION};
 
 fn generate_random() -> u64 {
     use rand::RngCore;
@@ -17,7 +19,7 @@ pub struct IpPacketRequest {
 
 impl IpPacketRequest {
     pub fn new_static_connect_request(
-        ips: IpPair,
+        ip: IpAddr,
         reply_to: Recipient,
         reply_to_hops: Option<u8>,
         reply_to_avg_mix_delays: Option<f64>,
@@ -29,7 +31,7 @@ impl IpPacketRequest {
                 version: CURRENT_VERSION,
                 data: IpPacketRequestData::StaticConnect(StaticConnectRequest {
                     request_id,
-                    ips,
+                    ip,
                     reply_to,
                     reply_to_hops,
                     reply_to_avg_mix_delays,
@@ -135,7 +137,7 @@ pub enum IpPacketRequestData {
 pub struct StaticConnectRequest {
     pub request_id: u64,
 
-    pub ips: IpPair,
+    pub ip: IpAddr,
 
     // The nym-address the response should be sent back to
     pub reply_to: Recipient,
@@ -208,8 +210,6 @@ pub struct HealthRequest {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use std::net::{Ipv4Addr, Ipv6Addr};
-    use std::str::FromStr;
 
     #[test]
     fn check_size_of_request() {
@@ -218,15 +218,15 @@ mod tests {
             data: IpPacketRequestData::StaticConnect(
                 StaticConnectRequest {
                     request_id: 123,
-                    ips: IpPair::new(Ipv4Addr::from_str("10.0.0.1").unwrap(), Ipv6Addr::from_str("2001:db8:a160::1").unwrap()),
+                    ip: IpAddr::from([10, 0, 0, 1]),
                     reply_to: Recipient::try_from_base58_string("D1rrpsysCGCYXy9saP8y3kmNpGtJZUXN9SvFoUcqAsM9.9Ssso1ea5NfkbMASdiseDSjTN1fSWda5SgEVjdSN4CvV@GJqd3ZxpXWSNxTfx7B1pPtswpetH4LnJdFeLeuY5KUuN").unwrap(),
                     reply_to_hops: None,
                     reply_to_avg_mix_delays: None,
                     buffer_timeout: None,
                 },
-            ),
+            )
         };
-        assert_eq!(connect.to_bytes().unwrap().len(), 123);
+        assert_eq!(connect.to_bytes().unwrap().len(), 108);
     }
 
     #[test]

common/ip-packet-requests/src/response.rs

@@ -1,7 +1,9 @@
+use std::net::IpAddr;
+
 use nym_sphinx::addressing::clients::Recipient;
 use serde::{Deserialize, Serialize};
 
-use crate::{make_bincode_serializer, IpPair, CURRENT_VERSION};
+use crate::{make_bincode_serializer, CURRENT_VERSION};
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct IpPacketResponse {
@@ -36,13 +38,13 @@ impl IpPacketResponse {
         }
     }
 
-    pub fn new_dynamic_connect_success(request_id: u64, reply_to: Recipient, ips: IpPair) -> Self {
+    pub fn new_dynamic_connect_success(request_id: u64, reply_to: Recipient, ip: IpAddr) -> Self {
         Self {
             version: CURRENT_VERSION,
             data: IpPacketResponseData::DynamicConnect(DynamicConnectResponse {
                 request_id,
                 reply_to,
-                reply: DynamicConnectResponseReply::Success(DynamicConnectSuccess { ips }),
+                reply: DynamicConnectResponseReply::Success(DynamicConnectSuccess { ip }),
             }),
         }
     }
@@ -116,30 +118,24 @@ impl IpPacketResponse {
     ) -> Self {
         Self {
             version: CURRENT_VERSION,
-            data: IpPacketResponseData::Info(InfoResponse {
+            data: IpPacketResponseData::Error(ErrorResponse {
                 request_id,
                 reply_to,
-                reply: InfoResponseReply::VersionMismatch {
+                reply: ErrorResponseReply::VersionMismatch {
                     request_version,
                     response_version: our_version,
                 },
-                level: InfoLevel::Error,
             }),
         }
     }
 
-    pub fn new_data_info_response(
-        reply_to: Recipient,
-        reply: InfoResponseReply,
-        level: InfoLevel,
-    ) -> Self {
+    pub fn new_data_error_response(reply_to: Recipient, reply: ErrorResponseReply) -> Self {
         Self {
             version: CURRENT_VERSION,
-            data: IpPacketResponseData::Info(InfoResponse {
+            data: IpPacketResponseData::Error(ErrorResponse {
                 request_id: 0,
                 reply_to,
                 reply,
-                level,
             }),
         }
     }
@@ -153,7 +149,7 @@ impl IpPacketResponse {
             IpPacketResponseData::Data(_) => None,
             IpPacketResponseData::Pong(response) => Some(response.request_id),
             IpPacketResponseData::Health(response) => Some(response.request_id),
-            IpPacketResponseData::Info(response) => Some(response.request_id),
+            IpPacketResponseData::Error(response) => Some(response.request_id),
         }
     }
 
@@ -166,7 +162,7 @@ impl IpPacketResponse {
             IpPacketResponseData::Data(_) => None,
             IpPacketResponseData::Pong(response) => Some(&response.reply_to),
             IpPacketResponseData::Health(response) => Some(&response.reply_to),
-            IpPacketResponseData::Info(response) => Some(&response.reply_to),
+            IpPacketResponseData::Error(response) => Some(&response.reply_to),
         }
     }
 
@@ -207,8 +203,8 @@ pub enum IpPacketResponseData {
     // Response for a health request
     Health(HealthResponse),
 
-    // Info response. This can be anything from informative messages to errors
-    Info(InfoResponse),
+    // Error response
+    Error(ErrorResponse),
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
@@ -267,7 +263,7 @@ impl DynamicConnectResponseReply {
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct DynamicConnectSuccess {
-    pub ips: IpPair,
+    pub ip: IpAddr,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize, thiserror::Error)]
@@ -344,15 +340,14 @@ pub struct HealthResponseReply {
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct InfoResponse {
+pub struct ErrorResponse {
     pub request_id: u64,
     pub reply_to: Recipient,
-    pub reply: InfoResponseReply,
-    pub level: InfoLevel,
+    pub reply: ErrorResponseReply,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize, thiserror::Error)]
-pub enum InfoResponseReply {
+pub enum ErrorResponseReply {
     #[error("{msg}")]
     Generic { msg: String },
     #[error(
@@ -365,10 +360,3 @@ pub enum InfoResponseReply {
     #[error("destination failed exit policy filter check: {dst}")]
     ExitPolicyFilterCheckFailed { dst: String },
 }
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub enum InfoLevel {
-    Info,
-    Warn,
-    Error,
-}

common/network-defaults/src/lib.rs

@@ -457,9 +457,6 @@ pub const ETH_ERC20_APPROVE_FUNCTION_NAME: &str = "approve";
 /// How much bandwidth (in bytes) one token can buy
 pub const BYTES_PER_UTOKEN: u64 = 1024;
 
-/// How much bandwidth (in bytes) one freepass provides
-pub const BYTES_PER_FREEPASS: u64 = 1024 * 1024 * 1024; // 1GB
-
 /// Threshold for claiming more bandwidth: 1 MB
 pub const REMAINING_BANDWIDTH_THRESHOLD: i64 = 1024 * 1024;
 /// How many ERC20 tokens should be burned to buy bandwidth
@@ -469,6 +466,10 @@ pub const UTOKENS_TO_BURN: u64 = TOKENS_TO_BURN * 1000000;
 /// Default bandwidth (in bytes) that we try to buy
 pub const BANDWIDTH_VALUE: u64 = UTOKENS_TO_BURN * BYTES_PER_UTOKEN;
 
+pub const VOUCHER_INFO: &str = "BandwidthVoucher";
+
+pub const ETH_MIN_BLOCK_DEPTH: usize = 7;
+
 /// Defaults Cosmos Hub/ATOM path
 pub const COSMOS_DERIVATION_PATH: &str = "m/44'/118'/0'/0/0";
 // as set by validators in their configs

common/nym-id/Cargo.toml

@@ -1,20 +0,0 @@
-[package]
-name = "nym-id"
-version = "0.1.0"
-authors.workspace = true
-repository.workspace = true
-homepage.workspace = true
-documentation.workspace = true
-edition.workspace = true
-license.workspace = true
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-thiserror.workspace = true
-time.workspace = true
-tracing.workspace = true
-zeroize.workspace = true
-
-nym-credential-storage = { path = "../credential-storage" }
-nym-credentials = { path = "../credentials" }

common/nym-id/src/error.rs

@@ -1,20 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use std::error::Error;
-use thiserror::Error;
-use time::OffsetDateTime;
-
-#[derive(Debug, Error)]
-pub enum NymIdError {
-    #[error("failed to deserialize provided credential: {source}")]
-    CredentialDeserializationFailure { source: nym_credentials::Error },
-
-    #[error("attempted to import an expired credential (it expired on {expiration})")]
-    ExpiredCredentialImport { expiration: OffsetDateTime },
-
-    #[error("failed to store credential in the provided store: {source}")]
-    StorageError {
-        source: Box<dyn Error + Send + Sync>,
-    },
-}

common/nym-id/src/import_credential.rs

@@ -1,71 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::NymIdError;
-use nym_credential_storage::models::StorableIssuedCredential;
-use nym_credential_storage::storage::Storage;
-use nym_credentials::coconut::bandwidth::issued::BandwidthCredentialIssuedDataVariant;
-use nym_credentials::IssuedBandwidthCredential;
-use tracing::{debug, warn};
-use zeroize::Zeroizing;
-
-pub async fn import_credential<S>(
-    credentials_store: S,
-    raw_credential: Vec<u8>,
-    credential_version: impl Into<Option<u8>>,
-) -> Result<(), NymIdError>
-where
-    S: Storage,
-    <S as Storage>::StorageError: Send + Sync + 'static,
-{
-    let raw_credential = Zeroizing::new(raw_credential);
-
-    // note: the type itself implements ZeroizeOnDrop
-    let credential = IssuedBandwidthCredential::try_unpack(&raw_credential, credential_version)
-        .map_err(|source| NymIdError::CredentialDeserializationFailure { source })?;
-
-    debug!(
-        "attempting to import credential of type {}",
-        credential.typ()
-    );
-
-    match credential.variant_data() {
-        BandwidthCredentialIssuedDataVariant::Voucher(voucher_info) => {
-            debug!("with value of {}", voucher_info.value())
-        }
-        BandwidthCredentialIssuedDataVariant::FreePass(freepass_info) => {
-            debug!("with expiry at {}", freepass_info.expiry_date());
-            if freepass_info.expired() {
-                warn!("the free pass has already expired!");
-
-                // technically we can import it, but the gateway will just reject it so what's the point
-                return Err(NymIdError::ExpiredCredentialImport {
-                    expiration: freepass_info.expiry_date(),
-                });
-            }
-        }
-    }
-
-    // SAFETY:
-    // for the epoch to run over u32::MAX, we'd have to advance it for few centuries every block...
-    // the alternative is a very particularly malformed serialized data, but at that point blowing up is the right call
-    // because we can't rely on it anyway
-    #[allow(clippy::expect_used)]
-    let storable = StorableIssuedCredential {
-        serialization_revision: credential.current_serialization_revision(),
-        credential_data: &raw_credential,
-        credential_type: credential.typ().to_string(),
-        epoch_id: credential
-            .epoch_id()
-            .try_into()
-            .expect("our epoch is has run over u32::MAX!"),
-    };
-
-    credentials_store
-        .insert_issued_credential(storable)
-        .await
-        .map_err(|source| NymIdError::StorageError {
-            source: Box::new(source),
-        })?;
-    Ok(())
-}

common/nym-id/src/lib.rs

@@ -1,11 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-#![warn(clippy::expect_used)]
-#![warn(clippy::unwrap_used)]
-
-pub mod error;
-pub mod import_credential;
-
-pub use error::NymIdError;
-pub use import_credential::import_credential;

common/nymcoconut/Cargo.toml

@@ -15,7 +15,7 @@ rand = "0.8"
 thiserror = { workspace = true }
 serde = { workspace = true }
 serde_derive = "1.0"
-bs58 = { workspace = true }
+bs58 = "0.4.0"
 sha2 = "0.9"
 zeroize = { workspace = true, optional = true }
 

common/nymcoconut/src/impls/clone.rs

@@ -1,4 +1,4 @@
-use crate::{BlindSignRequest, BlindedSignature, Bytable, VerifyCredentialRequest};
+use crate::{BlindSignRequest, BlindedSignature, Bytable, Theta};
 
 macro_rules! impl_clone {
     ($struct:ident) => {
@@ -12,4 +12,4 @@ macro_rules! impl_clone {
 
 impl_clone!(BlindSignRequest);
 impl_clone!(BlindedSignature);
-impl_clone!(VerifyCredentialRequest);
+impl_clone!(Theta);

common/nymcoconut/src/impls/serde.rs

@@ -1,8 +1,7 @@
 use crate::elgamal::PrivateKey;
 use crate::scheme::SecretKey;
 use crate::{
-    Base58, BlindSignRequest, BlindedSignature, PublicKey, Signature, VerificationKey,
-    VerifyCredentialRequest,
+    Base58, BlindSignRequest, BlindedSignature, PublicKey, Signature, Theta, VerificationKey,
 };
 use serde::de::Unexpected;
 use serde::{de::Error, de::Visitor, Deserialize, Deserializer, Serialize, Serializer};
@@ -54,4 +53,4 @@ impl_serde!(PrivateKey, V4);
 impl_serde!(BlindSignRequest, V5);
 impl_serde!(BlindedSignature, V6);
 impl_serde!(Signature, V7);
-impl_serde!(VerifyCredentialRequest, V8);
+impl_serde!(Theta, V8);