fix rust install

2023-12-11 23:07:56 -05:00 · 2023-12-11 23:04:28 -05:00 · 2023-12-11 22:59:28 -05:00 · 2023-12-11 22:45:18 -05:00 · 2023-12-11 22:35:28 -05:00 · 2023-12-11 22:26:40 -05:00
1087 changed files with 48642 additions and 31477 deletions
@@ -3,27 +3,8 @@ import fetch from "node-fetch";
 import { Octokit } from "@octokit/rest";
 import fs from "fs";
 import path from "path";
-import { execSync } from "child_process";
-
-function getBinInfo(path) {
-    // let's be super naive about it. add a+x bits on the file and try to run the command
-    try {
-        let mode = fs.statSync(path).mode
-        fs.chmodSync(path, mode | 0o111)
-
-        const raw = execSync(`${path} build-info --output=json`, { stdio: 'pipe', encoding: "utf8" });
-        const parsed = JSON.parse(raw)
-        return parsed
-    } catch (_) {
-        return undefined
-    }
-}

 async function run(assets, algorithm, filename, cache) {
-    if (!cache) {
-        console.warn("cache is set to 'false', but we we no longer support it")
-    }
-
    try {
        fs.mkdirSync('.tmp');
    } catch(e) {
@@ -38,25 +19,26 @@ async function run(assets, algorithm, filename, cache) {

            let buffer = null;
            let sig = null;
+            if(cache) {
+                // cache in `${WORKING_DIR}/.tmp/`
+                const cacheFilename = path.resolve(`.tmp/${asset.name}`);
+                if(!fs.existsSync(cacheFilename)) {
+                    console.log(`Downloading ${asset.browser_download_url}... to ${cacheFilename}`);
+                    buffer = Buffer.from(await fetch(asset.browser_download_url).then(res => res.arrayBuffer()));
+                    fs.writeFileSync(cacheFilename, buffer);
+                } else {
+                    console.log(`Loading from ${cacheFilename}`);
+                    buffer = Buffer.from(fs.readFileSync(cacheFilename));

-            // cache in `${WORKING_DIR}/.tmp/`
-            const cacheFilename = path.resolve(`.tmp/${asset.name}`);
-            if(!fs.existsSync(cacheFilename)) {
-                console.log(`Downloading ${asset.browser_download_url}... to ${cacheFilename}`);
-                buffer = Buffer.from(await fetch(asset.browser_download_url).then(res => res.arrayBuffer()));
-                fs.writeFileSync(cacheFilename, buffer);
+                    // console.log('Reading signature from content');
+                    // if(asset.name.endsWith('.sig')) {
+                    //     sig = fs.readFileSync(cacheFilename).toString();
+                    // }
+                }
            } else {
-                console.log(`Loading from ${cacheFilename}`);
-                buffer = Buffer.from(fs.readFileSync(cacheFilename));
-
-                // console.log('Reading signature from content');
-                // if(asset.name.endsWith('.sig')) {
-                //     sig = fs.readFileSync(cacheFilename).toString();
-                // }
+                // fetch always
+                buffer = Buffer.from(await fetch(asset.browser_download_url).then(res => res.arrayBuffer()));
            }
-
-            const binInfo = getBinInfo(cacheFilename)
-
            if(!hashes[asset.name]) {
                hashes[asset.name] = {};
            }
@@ -117,9 +99,6 @@ async function run(assets, algorithm, filename, cache) {
            if(kind) {
                hashes[asset.name].kind = kind;
            }
-            if(binInfo) {
-                hashes[asset.name].details = binInfo;
-            }

            // process Tauri signature files
            if(asset.name.endsWith('.sig')) {
@@ -246,8 +225,6 @@ export async function createHashesFromReleaseTagOrNameOrId({ releaseTagOrNameOrI
            assets: hashes,
        };

-        console.log(output)
-
        if(upload) {
            console.log(`🚚 Uploading ${filename} to release name="${release.name}" id=${release.id} (${release.upload_url})...`);

@@ -2,14 +2,15 @@ name: cd-docs

 on:
  workflow_dispatch:
+  push:
+    paths:
+      - 'documentation/docs/**'

 jobs:
  build:
-    runs-on: ubuntu-20.04-16-core
+    runs-on: custom-linux
    steps:
      - uses: actions/checkout@v3
-      - name: Install Dependencies (Linux)
-        run: sudo apt-get update && sudo apt-get install -y build-essential curl wget libssl-dev libudev-dev squashfs-tools protobuf-compiler
      - name: Install rsync
        run: sudo apt-get install rsync
      - uses: rlespinasse/github-slug-action@v3.x
@@ -25,11 +26,14 @@ jobs:
        with:
          command: build
          args: --workspace --release
-      - name: Install mdbook and plugins
-        run: cd documentation && ./install_mdbook_deps.sh
-      - name: Remove existing Nym config directory (`~/.nym/`)
-        run: cd documentation && ./remove_existing_config.sh
-        continue-on-error: false
+      - name: Install mdbook
+        run: (test -x $HOME/.cargo/bin/mdbook || cargo install --vers "^0.4.33" mdbook)
+      - name: Install mdbook plugins
+        run: |
+          cargo install --vers "=0.2.2" mdbook-variables && cargo install \
+            --vers "^1.8.0" mdbook-admonish && cargo install --vers \
+            "^0.1.2" mdbook-last-changed && cargo install --vers "^0.1.2" mdbook-theme \
+            && cargo install --vers "^0.7.7" mdbook-linkcheck
      - name: Build all projects in documentation/ & move to ~/dist/docs/
        run: cd documentation && ./build_all_to_dist.sh
        continue-on-error: false
@@ -48,7 +52,6 @@ jobs:

      - name: Install Vercel CLI
        run: npm install --global vercel@latest
-        continue-on-error: false

      - name: Pull Vercel Environment Information (preview)
        if: github.ref != 'refs/heads/master'
@@ -58,18 +61,15 @@ jobs:
        if: github.ref == 'refs/heads/master'
        run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }}
        working-directory: dist/docs
-        continue-on-error: false

      - name: Build Project Artifacts (preview)
        if: github.ref != 'refs/heads/master'
        run: vercel build --token=${{ secrets.VERCEL_TOKEN }}
        working-directory: dist/docs
-        continue-on-error: false
      - name: Build Project Artifacts (production)
        if: github.ref == 'refs/heads/master'
        run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }}
        working-directory: dist/docs
-        continue-on-error: false

      - name: Deploy Project Artifacts to Vercel (preview)
        if: github.ref != 'refs/heads/master'
@@ -79,7 +79,6 @@ jobs:
        if: github.ref == 'refs/heads/master'
        run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }}
        working-directory: dist/docs
-        continue-on-error: false

      - name: Matrix - Node Install
        run: npm install
@@ -9,11 +9,9 @@ on:

 jobs:
  build:
-    runs-on: ubuntu-20.04-16-core
+    runs-on: custom-linux
    steps:
      - uses: actions/checkout@v3
-      - name: Install Dependencies (Linux)
-        run: sudo apt-get update && sudo apt-get install -y build-essential curl wget libssl-dev libudev-dev squashfs-tools protobuf-compiler
      - name: Install rsync
        run: sudo apt-get install rsync
      - uses: rlespinasse/github-slug-action@v3.x
@@ -29,15 +27,22 @@ jobs:
        with:
          command: build
          args: --workspace --release
-      - name: Install mdbook and plugins
-        run: cd documentation && ./install_mdbook_deps.sh
-      - name: Remove existing Nym config directory (`~/.nym/`)
-        run: cd documentation && ./remove_existing_config.sh
-        continue-on-error: false
-      - name: Build all projects in documentation/ & move to ~/dist/docs/
-        run: cd documentation && ./build_all_to_dist.sh
-        continue-on-error: false
+      - name: Install mdbook
+        run: (test -x $HOME/.cargo/bin/mdbook || cargo install --vers "^0.4.35" mdbook)
+      - name: Install mdbook plugins
+        run: |
+          cargo install --vers "=0.2.2" mdbook-variables && cargo install \
+            --vers "^1.8.0" mdbook-admonish --force && cargo install --vers \
+            "^0.1.2" mdbook-last-changed && cargo install --vers "^0.1.2" mdbook-theme \
+            && cargo install --vers "^0.7.7" mdbook-linkcheck \
+            # && cd documentation \
+            # && mdbook-admonish install dev-portal \
+            # && mdbook-admonish install docs \
+            # && mdbook-admonish install operators

+      - name: Build all projects in documentation/ & move to ~/dist/docs/
+        run: cd documentation && ./build_all_to_dist.sh 
+        continue-on-error: false
      - name: Deploy branch to CI www
        continue-on-error: true
        uses: easingthemes/ssh-deploy@main
@@ -49,7 +54,6 @@ jobs:
          REMOTE_USER: ${{ secrets.CI_WWW_REMOTE_USER }}
          TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/docs-${{ env.GITHUB_REF_SLUG }}
          EXCLUDE: "/node_modules/"
-
      - name: Matrix - Node Install
        run: npm install
        working-directory: .github/workflows/support-files
@@ -35,7 +35,7 @@ jobs:
        uses: actions-rs/cargo@v1
        with:
          command: build
-          args: --manifest-path ${{ env.CARGOTOML_PATH }} --features custom-protocol
+          args: --manifest-path ${{ env.CARGOTOML_PATH }} --lib --features custom-protocol

 #      - name: Run all tests
 #        uses: actions-rs/cargo@v1
@@ -1,43 +0,0 @@
-# Simple workflow for deploying static content to GitHub Pages
-name: Deploy static content to Pages
-
-on:
-  # Runs on pushes targeting the default branch
-  push:
-    branches: ["feature/ppa-repo"]
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
-permissions:
-  contents: read
-  pages: write
-  id-token: write
-
-# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
-# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
-concurrency:
-  group: "pages"
-  cancel-in-progress: false
-
-jobs:
-  # Single deploy job since we're just deploying
-  deploy:
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Setup Pages
-        uses: actions/configure-pages@v3
-      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v2
-        with:
-          # Upload entire repository
-          path: './ppa'
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v2
@@ -45,6 +45,4 @@ envs/qwerty.env
 cpu-cycles/libcpucycles/build
 foxyfox.env

-.next
-ppa-private-key.b64
-ppa-private-key.asc
+.next
@@ -4,41 +4,17 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://

 ## [Unreleased]

-## [2023.5-rolo] (2023-11-28)
-
- Gateway won't open websocket listener until embedded Network Requester becomes available ([#4166])
- Feature/gateway described nr ([#4147])
- Bugfix/prerelease versionbump ([#4145])
- returning 'nil' for non-existing origin as opposed to an empty string ([#4135])
- using performance^20 when calculating active set selection weight ([#4126])
- Change default http API timeout from 3s to 10s ([#4117])
-
-[#4166]: https://github.com/nymtech/nym/issues/4166
-[#4147]: https://github.com/nymtech/nym/pull/4147
-[#4145]: https://github.com/nymtech/nym/pull/4145
-[#4135]: https://github.com/nymtech/nym/pull/4135
-[#4126]: https://github.com/nymtech/nym/pull/4126
-[#4117]: https://github.com/nymtech/nym/pull/4117
-
-## [2023.nyxd-upgrade] (2023-11-22)
-
- Chore/nyxd 043 upgrade ([#3968])
-
-[#3968]: https://github.com/nymtech/nym/pull/3968
-
 ## [2023.4-galaxy] (2023-11-07)

 - DRY up client cli ([#4077])
 - [mixnode] replace rocket with axum ([#4071])
 - incorporate the nym node HTTP api into the mixnode ([#4070])
 - replaced '--disable-sign-ext' with '--signext-lowering' when running wasm-opt ([#3896])
- Added PPA repo hosting support and nym-mixnode package with tooling for publishing ([#4165])

 [#4077]: https://github.com/nymtech/nym/pull/4077
 [#4071]: https://github.com/nymtech/nym/pull/4071
 [#4070]: https://github.com/nymtech/nym/issues/4070
 [#3896]: https://github.com/nymtech/nym/pull/3896
-[#4165]: https://github.com/nymtech/nym/pull/4165

 ## [2023.3-kinder] (2023-10-31)

@@ -49,16 +49,12 @@ members = [
    "common/exit-policy",
    "common/http-api-client",
    "common/inclusion-probability",
-    "common/ip-packet-requests",
    "common/ledger",
    "common/mixnode-common",
    "common/network-defaults",
    "common/node-tester-utils",
    "common/nonexhaustive-delayqueue",
    "common/nymcoconut",
-    "common/nym_offline_compact_ecash",
-    "common/nym_offline_divisible_ecash",
-    "common/nym_online_divisible_ecash",
    "common/nymsphinx",
    "common/nymsphinx/acknowledgements",
    "common/nymsphinx/addressing",
@@ -78,7 +74,6 @@ members = [
    "common/store-cipher",
    "common/task",
    "common/topology",
-    "common/tun",
    "common/types",
    "common/wasm/client-core",
    "common/wasm/storage",
@@ -108,10 +103,9 @@ members = [
    "tools/internal/sdk-version-bump",
    "tools/nym-cli",
    "tools/nym-nr-query",
-    "tools/nymvisor",
    "tools/ts-rs-cli",
    "wasm/client",
-    #    "wasm/full-nym-wasm",
+#    "wasm/full-nym-wasm",
    "wasm/mix-fetch",
    "wasm/node-tester",
 ]
@@ -124,19 +118,10 @@ default-members = [
    "service-providers/network-statistics",
    "mixnode",
    "nym-api",
-    "tools/nymvisor",
    "explorer-api",
 ]

-exclude = [
-    "explorer",
-    "contracts",
-    "nym-wallet",
-    "nym-connect/mobile/src-tauri",
-    "nym-connect/desktop",
-    "nym-vpn/ui/src-tauri",
-    "cpu-cycles",
-]
+exclude = ["explorer", "contracts", "nym-wallet", "nym-connect/mobile/src-tauri", "nym-connect/desktop", "nym-vpn/ui/src-tauri", "cpu-cycles"]

 [workspace.package]
 authors = ["Nym Technologies SA"]
@@ -152,8 +137,24 @@ async-trait = "0.1.68"
 axum = "0.6.20"
 base64 = "0.21.4"
 bip39 = { version = "2.0.0", features = ["zeroize"] }
+boringtun = { git = "https://github.com/cloudflare/boringtun", rev = "e1d6360d6ab4529fc942a078e4c54df107abe2ba" }
 clap = "4.4.7"
 cfg-if = "1.0.0"
+cosmwasm-derive = "=1.3.0"
+cosmwasm-schema = "=1.3.0"
+cosmwasm-std = "=1.3.0"
+# use 0.5.0 as that's the version used by cosmwasm-std 1.3.0
+# (and ideally we don't want to pull the same dependency twice)
+serde-json-wasm = "=0.5.0"
+cosmwasm-storage = "=1.3.0"
+cosmrs = "=0.14.0"
+# same version as used by cosmrs
+cw-utils = "=1.0.1"
+cw-storage-plus = "=1.1.0"
+cw2 = { version = "=1.1.0" }
+cw3 = { version = "=1.1.0" }
+cw4 = { version = "=1.1.0" }
+cw-controllers = { version = "=1.1.0" }
 dashmap = "5.5.3"
 dotenvy = "0.15.6"
 futures = "0.3.28"
@@ -171,7 +172,7 @@ schemars = "0.8.1"
 serde = "1.0.152"
 serde_json = "1.0.91"
 tap = "1.0.1"
-time = "0.3.30"
+tendermint-rpc = "0.32" # same version as used by cosmrs
 thiserror = "1.0.48"
 tokio = "1.24.1"
 tokio-tungstenite = "0.20.1"
@@ -183,28 +184,6 @@ utoipa-swagger-ui = "3.1.5"
 url = "2.4"
 zeroize = "1.6.0"

-# cosmwasm-related
-cosmwasm-derive = "=1.3.0"
-cosmwasm-schema = "=1.3.0"
-cosmwasm-std = "=1.3.0"
-# use 0.5.0 as that's the version used by cosmwasm-std 1.3.0
-# (and ideally we don't want to pull the same dependency twice)
-serde-json-wasm = "=0.5.0"
-cosmwasm-storage = "=1.3.0"
-# same version as used by cosmwasm
-cw-utils = "=1.0.1"
-cw-storage-plus = "=1.1.0"
-cw2 = { version = "=1.1.0" }
-cw3 = { version = "=1.1.0" }
-cw4 = { version = "=1.1.0" }
-cw-controllers = { version = "=1.1.0" }
-
-# cosmrs-related
-bip32 = "0.5.1"
-cosmrs = "=0.15.0"
-tendermint-rpc = "0.34" # same version as used by cosmrs
-prost = "0.12"
-
 # wasm-related dependencies
 gloo-utils = "0.1.7"
 js-sys = "0.3.63"
@@ -215,15 +194,6 @@ wasm-bindgen-futures = "0.4.37"
 wasmtimer = "0.2.0"
 web-sys = "0.3.63"

-bls12_381 = { path = "/Users/drazen/nym/bls12_381", default-features = false, features = [
-    "alloc",
-    "pairings",
-    "experimental",
-    "zeroize",
-] }
-ff = { version = "0.13", default-features = false }
-group = { version = "0.13", default-features = false }
-
 # Profile settings for individual crates

 [profile.release.package.nym-socks5-listener]
@@ -1,439 +0,0 @@
-Attribution-NonCommercial-ShareAlike 4.0 International
-
-=======================================================================
-
-Creative Commons Corporation ("Creative Commons") is not a law firm and
-does not provide legal services or legal advice. Distribution of
-Creative Commons public licenses does not create a lawyer-client or
-other relationship. Creative Commons makes its licenses and related
-information available on an "as-is" basis. Creative Commons gives no
-warranties regarding its licenses, any material licensed under their
-terms and conditions, or any related information. Creative Commons
-disclaims all liability for damages resulting from their use to the
-fullest extent possible.
-
-Using Creative Commons Public Licenses
-
-Creative Commons public licenses provide a standard set of terms and
-conditions that creators and other rights holders may use to share
-original works of authorship and other material subject to copyright
-and certain other rights specified in the public license below. The
-following considerations are for informational purposes only, are not
-exhaustive, and do not form part of our licenses.
-
-     Considerations for licensors: Our public licenses are
-     intended for use by those authorized to give the public
-     permission to use material in ways otherwise restricted by
-     copyright and certain other rights. Our licenses are
-     irrevocable. Licensors should read and understand the terms
-     and conditions of the license they choose before applying it.
-     Licensors should also secure all rights necessary before
-     applying our licenses so that the public can reuse the
-     material as expected. Licensors should clearly mark any
-     material not subject to the license. This includes other CC-
-     licensed material, or material used under an exception or
-     limitation to copyright. More considerations for licensors:
-    wiki.creativecommons.org/Considerations_for_licensors
-
-     Considerations for the public: By using one of our public
-     licenses, a licensor grants the public permission to use the
-     licensed material under specified terms and conditions. If
-     the licensor's permission is not necessary for any reason--for
-     example, because of any applicable exception or limitation to
-     copyright--then that use is not regulated by the license. Our
-     licenses grant only permissions under copyright and certain
-     other rights that a licensor has authority to grant. Use of
-     the licensed material may still be restricted for other
-     reasons, including because others have copyright or other
-     rights in the material. A licensor may make special requests,
-     such as asking that all changes be marked or described.
-     Although not required by our licenses, you are encouraged to
-     respect those requests where reasonable. More considerations
-     for the public:
-    wiki.creativecommons.org/Considerations_for_licensees
-
-=======================================================================
-
-Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International
-Public License
-
-By exercising the Licensed Rights (defined below), You accept and agree
-to be bound by the terms and conditions of this Creative Commons
-Attribution-NonCommercial-ShareAlike 4.0 International Public License
-("Public License"). To the extent this Public License may be
-interpreted as a contract, You are granted the Licensed Rights in
-consideration of Your acceptance of these terms and conditions, and the
-Licensor grants You such rights in consideration of benefits the
-Licensor receives from making the Licensed Material available under
-these terms and conditions.
-
-
-Section 1 -- Definitions.
-
-  a. Adapted Material means material subject to Copyright and Similar
-     Rights that is derived from or based upon the Licensed Material
-     and in which the Licensed Material is translated, altered,
-     arranged, transformed, or otherwise modified in a manner requiring
-     permission under the Copyright and Similar Rights held by the
-     Licensor. For purposes of this Public License, where the Licensed
-     Material is a musical work, performance, or sound recording,
-     Adapted Material is always produced where the Licensed Material is
-     synched in timed relation with a moving image.
-
-  b. Adapter's License means the license You apply to Your Copyright
-     and Similar Rights in Your contributions to Adapted Material in
-     accordance with the terms and conditions of this Public License.
-
-  c. BY-NC-SA Compatible License means a license listed at
-     creativecommons.org/compatiblelicenses, approved by Creative
-     Commons as essentially the equivalent of this Public License.
-
-  d. Copyright and Similar Rights means copyright and/or similar rights
-     closely related to copyright including, without limitation,
-     performance, broadcast, sound recording, and Sui Generis Database
-     Rights, without regard to how the rights are labeled or
-     categorized. For purposes of this Public License, the rights
-     specified in Section 2(b)(1)-(2) are not Copyright and Similar
-     Rights.
-
-  e. Effective Technological Measures means those measures that, in the
-     absence of proper authority, may not be circumvented under laws
-     fulfilling obligations under Article 11 of the WIPO Copyright
-     Treaty adopted on December 20, 1996, and/or similar international
-     agreements.
-
-  f. Exceptions and Limitations means fair use, fair dealing, and/or
-     any other exception or limitation to Copyright and Similar Rights
-     that applies to Your use of the Licensed Material.
-
-  g. License Elements means the license attributes listed in the name
-     of a Creative Commons Public License. The License Elements of this
-     Public License are Attribution, NonCommercial, and ShareAlike.
-
-  h. Licensed Material means the artistic or literary work, database,
-     or other material to which the Licensor applied this Public
-     License.
-
-  i. Licensed Rights means the rights granted to You subject to the
-     terms and conditions of this Public License, which are limited to
-     all Copyright and Similar Rights that apply to Your use of the
-     Licensed Material and that the Licensor has authority to license.
-
-  j. Licensor means the individual(s) or entity(ies) granting rights
-     under this Public License.
-
-  k. NonCommercial means not primarily intended for or directed towards
-     commercial advantage or monetary compensation. For purposes of
-     this Public License, the exchange of the Licensed Material for
-     other material subject to Copyright and Similar Rights by digital
-     file-sharing or similar means is NonCommercial provided there is
-     no payment of monetary compensation in connection with the
-     exchange.
-
-  l. Share means to provide material to the public by any means or
-     process that requires permission under the Licensed Rights, such
-     as reproduction, public display, public performance, distribution,
-     dissemination, communication, or importation, and to make material
-     available to the public including in ways that members of the
-     public may access the material from a place and at a time
-     individually chosen by them.
-
-  m. Sui Generis Database Rights means rights other than copyright
-     resulting from Directive 96/9/EC of the European Parliament and of
-     the Council of 11 March 1996 on the legal protection of databases,
-     as amended and/or succeeded, as well as other essentially
-     equivalent rights anywhere in the world.
-
-  n. You means the individual or entity exercising the Licensed Rights
-     under this Public License. Your has a corresponding meaning.
-
-
-Section 2 -- Scope.
-
-  a. License grant.
-
-       1. Subject to the terms and conditions of this Public License,
-          the Licensor hereby grants You a worldwide, royalty-free,
-          non-sublicensable, non-exclusive, irrevocable license to
-          exercise the Licensed Rights in the Licensed Material to:
-
-            a. reproduce and Share the Licensed Material, in whole or
-               in part, for NonCommercial purposes only; and
-
-            b. produce, reproduce, and Share Adapted Material for
-               NonCommercial purposes only.
-
-       2. Exceptions and Limitations. For the avoidance of doubt, where
-          Exceptions and Limitations apply to Your use, this Public
-          License does not apply, and You do not need to comply with
-          its terms and conditions.
-
-       3. Term. The term of this Public License is specified in Section
-          6(a).
-
-       4. Media and formats; technical modifications allowed. The
-          Licensor authorizes You to exercise the Licensed Rights in
-          all media and formats whether now known or hereafter created,
-          and to make technical modifications necessary to do so. The
-          Licensor waives and/or agrees not to assert any right or
-          authority to forbid You from making technical modifications
-          necessary to exercise the Licensed Rights, including
-          technical modifications necessary to circumvent Effective
-          Technological Measures. For purposes of this Public License,
-          simply making modifications authorized by this Section 2(a)
-          (4) never produces Adapted Material.
-
-       5. Downstream recipients.
-
-            a. Offer from the Licensor -- Licensed Material. Every
-               recipient of the Licensed Material automatically
-               receives an offer from the Licensor to exercise the
-               Licensed Rights under the terms and conditions of this
-               Public License.
-
-            b. Additional offer from the Licensor -- Adapted Material.
-               Every recipient of Adapted Material from You
-               automatically receives an offer from the Licensor to
-               exercise the Licensed Rights in the Adapted Material
-               under the conditions of the Adapter's License You apply.
-
-            c. No downstream restrictions. You may not offer or impose
-               any additional or different terms or conditions on, or
-               apply any Effective Technological Measures to, the
-               Licensed Material if doing so restricts exercise of the
-               Licensed Rights by any recipient of the Licensed
-               Material.
-
-       6. No endorsement. Nothing in this Public License constitutes or
-          may be construed as permission to assert or imply that You
-          are, or that Your use of the Licensed Material is, connected
-          with, or sponsored, endorsed, or granted official status by,
-          the Licensor or others designated to receive attribution as
-          provided in Section 3(a)(1)(A)(i).
-
-  b. Other rights.
-
-       1. Moral rights, such as the right of integrity, are not
-          licensed under this Public License, nor are publicity,
-          privacy, and/or other similar personality rights; however, to
-          the extent possible, the Licensor waives and/or agrees not to
-          assert any such rights held by the Licensor to the limited
-          extent necessary to allow You to exercise the Licensed
-          Rights, but not otherwise.
-
-       2. Patent and trademark rights are not licensed under this
-          Public License.
-
-       3. To the extent possible, the Licensor waives any right to
-          collect royalties from You for the exercise of the Licensed
-          Rights, whether directly or through a collecting society
-          under any voluntary or waivable statutory or compulsory
-          licensing scheme. In all other cases the Licensor expressly
-          reserves any right to collect such royalties, including when
-          the Licensed Material is used other than for NonCommercial
-          purposes.
-
-
-Section 3 -- License Conditions.
-
-Your exercise of the Licensed Rights is expressly made subject to the
-following conditions.
-
-  a. Attribution.
-
-       1. If You Share the Licensed Material (including in modified
-          form), You must:
-
-            a. retain the following if it is supplied by the Licensor
-               with the Licensed Material:
-
-                 i. identification of the creator(s) of the Licensed
-                    Material and any others designated to receive
-                    attribution, in any reasonable manner requested by
-                    the Licensor (including by pseudonym if
-                    designated);
-
-                ii. a copyright notice;
-
-               iii. a notice that refers to this Public License;
-
-                iv. a notice that refers to the disclaimer of
-                    warranties;
-
-                 v. a URI or hyperlink to the Licensed Material to the
-                    extent reasonably practicable;
-
-            b. indicate if You modified the Licensed Material and
-               retain an indication of any previous modifications; and
-
-            c. indicate the Licensed Material is licensed under this
-               Public License, and include the text of, or the URI or
-               hyperlink to, this Public License.
-
-       2. You may satisfy the conditions in Section 3(a)(1) in any
-          reasonable manner based on the medium, means, and context in
-          which You Share the Licensed Material. For example, it may be
-          reasonable to satisfy the conditions by providing a URI or
-          hyperlink to a resource that includes the required
-          information.
-       3. If requested by the Licensor, You must remove any of the
-          information required by Section 3(a)(1)(A) to the extent
-          reasonably practicable.
-
-  b. ShareAlike.
-
-     In addition to the conditions in Section 3(a), if You Share
-     Adapted Material You produce, the following conditions also apply.
-
-       1. The Adapter's License You apply must be a Creative Commons
-          license with the same License Elements, this version or
-          later, or a BY-NC-SA Compatible License.
-
-       2. You must include the text of, or the URI or hyperlink to, the
-          Adapter's License You apply. You may satisfy this condition
-          in any reasonable manner based on the medium, means, and
-          context in which You Share Adapted Material.
-
-       3. You may not offer or impose any additional or different terms
-          or conditions on, or apply any Effective Technological
-          Measures to, Adapted Material that restrict exercise of the
-          rights granted under the Adapter's License You apply.
-
-
-Section 4 -- Sui Generis Database Rights.
-
-Where the Licensed Rights include Sui Generis Database Rights that
-apply to Your use of the Licensed Material:
-
-  a. for the avoidance of doubt, Section 2(a)(1) grants You the right
-     to extract, reuse, reproduce, and Share all or a substantial
-     portion of the contents of the database for NonCommercial purposes
-     only;
-
-  b. if You include all or a substantial portion of the database
-     contents in a database in which You have Sui Generis Database
-     Rights, then the database in which You have Sui Generis Database
-     Rights (but not its individual contents) is Adapted Material,
-     including for purposes of Section 3(b); and
-
-  c. You must comply with the conditions in Section 3(a) if You Share
-     all or a substantial portion of the contents of the database.
-
-For the avoidance of doubt, this Section 4 supplements and does not
-replace Your obligations under this Public License where the Licensed
-Rights include other Copyright and Similar Rights.
-
-
-Section 5 -- Disclaimer of Warranties and Limitation of Liability.
-
-  a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
-     EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
-     AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
-     ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
-     IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
-     WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
-     PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
-     ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
-     KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
-     ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
-
-  b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
-     TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
-     NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
-     INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
-     COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
-     USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
-     ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
-     DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
-     IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
-
-  c. The disclaimer of warranties and limitation of liability provided
-     above shall be interpreted in a manner that, to the extent
-     possible, most closely approximates an absolute disclaimer and
-     waiver of all liability.
-
-
-Section 6 -- Term and Termination.
-
-  a. This Public License applies for the term of the Copyright and
-     Similar Rights licensed here. However, if You fail to comply with
-     this Public License, then Your rights under this Public License
-     terminate automatically.
-
-  b. Where Your right to use the Licensed Material has terminated under
-     Section 6(a), it reinstates:
-
-       1. automatically as of the date the violation is cured, provided
-          it is cured within 30 days of Your discovery of the
-          violation; or
-
-       2. upon express reinstatement by the Licensor.
-
-     For the avoidance of doubt, this Section 6(b) does not affect any
-     right the Licensor may have to seek remedies for Your violations
-     of this Public License.
-
-  c. For the avoidance of doubt, the Licensor may also offer the
-     Licensed Material under separate terms or conditions or stop
-     distributing the Licensed Material at any time; however, doing so
-     will not terminate this Public License.
-
-  d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
-     License.
-
-
-Section 7 -- Other Terms and Conditions.
-
-  a. The Licensor shall not be bound by any additional or different
-     terms or conditions communicated by You unless expressly agreed.
-
-  b. Any arrangements, understandings, or agreements regarding the
-     Licensed Material not stated herein are separate from and
-     independent of the terms and conditions of this Public License.
-
-
-Section 8 -- Interpretation.
-
-  a. For the avoidance of doubt, this Public License does not, and
-     shall not be interpreted to, reduce, limit, restrict, or impose
-     conditions on any use of the Licensed Material that could lawfully
-     be made without permission under this Public License.
-
-  b. To the extent possible, if any provision of this Public License is
-     deemed unenforceable, it shall be automatically reformed to the
-     minimum extent necessary to make it enforceable. If the provision
-     cannot be reformed, it shall be severed from this Public License
-     without affecting the enforceability of the remaining terms and
-     conditions.
-
-  c. No term or condition of this Public License will be waived and no
-     failure to comply consented to unless expressly agreed to by the
-     Licensor.
-
-  d. Nothing in this Public License constitutes or may be interpreted
-     as a limitation upon, or waiver of, any privileges and immunities
-     that apply to the Licensor or You, including from the legal
-     processes of any jurisdiction or authority.
-
-=======================================================================
-
-Creative Commons is not a party to its public
-licenses. Notwithstanding, Creative Commons may elect to apply one of
-its public licenses to material it publishes and in those instances
-will be considered the â€œLicensor.â€ The text of the Creative Commons
-public licenses is dedicated to the public domain under the CC0 Public
-Domain Dedication. Except for the limited purpose of indicating that
-material is shared under a Creative Commons public license or as
-otherwise permitted by the Creative Commons policies published at
-creativecommons.org/policies, Creative Commons does not authorize the
-use of the trademark "Creative Commons" or any other trademark or logo
-of Creative Commons without its prior written consent including,
-without limitation, in connection with any unauthorized modifications
-to any of its public licenses or any other arrangements,
-understandings, or agreements concerning use of licensed material. For
-the avoidance of doubt, this paragraph does not form part of the
-public licenses.
-
-Creative Commons may be contacted at creativecommons.org.
-
-
@@ -168,7 +168,3 @@ generate-typescript:
 run-api-tests:
 	cd nym-api/tests/functional_test && yarn test:qa

-# Build debian package, and update PPA
-# Requires base64 encode GPG key to be set up in environment PPA_SIGNING_KEY
-deb:
-	scripts/ppa.sh
@@ -15,6 +15,7 @@ The platform is composed of multiple Rust crates. Top-level executable binary cr
 * nym-explorer - a (projected) block explorer and (existing) mixnet viewer.
 * nym-wallet - a desktop wallet implemented using the [Tauri](https://tauri.studio/en/docs/about/intro) framework.

+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg?style=for-the-badge)](https://opensource.org/licenses/Apache-2.0)
 [![Build Status](https://img.shields.io/github/actions/workflow/status/nymtech/nym/build.yml?branch=develop&style=for-the-badge&logo=github-actions)](https://github.com/nymtech/nym/actions?query=branch%3Adevelop)


@@ -82,11 +83,4 @@ where `s'` is stake `s` scaled over total token circulating supply.

 ### Licensing and copyright information

-This is a monorepo and components that make up Nym as a system are licensed individually, so for accurate information, please check individual files.
-
-As a general approach, licensing is as follows this pattern:
- applications and binaries are GPLv3
- libraries and components are Apache 2.0 or MIT
- documentation is Apache 2.0 or CC0-1.0
-
-Again, for accurate information, please check individual files.
+This program is available as open source under the terms of the Apache 2.0 license. However, some elements are being licensed under CC0-1.0 and MIT. For accurate information, please check individual files.
@@ -0,0 +1,19 @@
+#!/bin/sh
+#  ci_post_clone.sh
+cd /nym-vpn/desktop && \
+curl https://sh.rustup.rs -sSf | sh && \
+cargo install cargo-deb;
+cargo install --force cargo-make;
+cargo install sd;
+cargo install ripgrep;
+cargo install cargo-about;
+cargo install cargo-generate-rpm;
+brew install protobuf;
+APPLICATION_SIGNING_IDENTITY="Developer ID Application: Nym Technologies SA (VW5DZLFHM5)" \
+INSTALLER_SIGNING_IDENTITY="3rd Party Mac Developer Installer: Nym Technologies SA (VW5DZLFHM5)"  \
+APPLE_TEAM_ID=VW5DZLFHM5 \
+cargo make pkg;
+
+
+
+
@@ -1,6 +1,6 @@
 [package]
 name = "nym-client"
-version = "1.1.32"
+version = "1.1.31"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 description = "Implementation of the Nym Client"
 edition = "2021"
@@ -38,7 +38,6 @@ 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-compact-ecash = { path = "../../common/nym_offline_compact_ecash" }
 nym-config = { path = "../../common/config" }
 nym-credential-storage = { path = "../../common/credential-storage" }
 nym-credentials = { path = "../../common/credentials" }
@@ -5,9 +5,8 @@ use crate::client::config::old_config_v1_1_20_2::{
    ClientPathsV1_1_20_2, ConfigV1_1_20_2, SocketTypeV1_1_20_2, SocketV1_1_20_2,
 };
 use nym_bin_common::logging::LoggingSettings;
-use nym_client_core::config::disk_persistence::old_v1_1_20_2::{
-    ClientKeysPathsV1_1_20_2, CommonClientPathsV1_1_20_2,
-};
+use nym_client_core::config::disk_persistence::keys_paths::ClientKeysPaths;
+use nym_client_core::config::disk_persistence::old_v1_1_20_2::CommonClientPathsV1_1_20_2;
 use nym_client_core::config::old_config_v1_1_20::ConfigV1_1_20 as BaseConfigV1_1_20;
 use nym_client_core::config::old_config_v1_1_20_2::{
    ClientV1_1_20_2, ConfigV1_1_20_2 as BaseConfigV1_1_20_2,
@@ -61,7 +60,7 @@ impl From<ConfigV1_1_20> for ConfigV1_1_20_2 {
            socket: value.socket.into(),
            storage_paths: ClientPathsV1_1_20_2 {
                common_paths: CommonClientPathsV1_1_20_2 {
-                    keys: ClientKeysPathsV1_1_20_2 {
+                    keys: ClientKeysPaths {
                        private_identity_key_file: value.base.client.private_identity_key_file,
                        public_identity_key_file: value.base.client.public_identity_key_file,
                        private_encryption_key_file: value.base.client.private_encryption_key_file,
@@ -50,12 +50,6 @@ keys.private_encryption_key_file = '{{ storage_paths.keys.private_encryption_key
 # Path to file containing public encryption key.
 keys.public_encryption_key_file = '{{ storage_paths.keys.public_encryption_key_file }}'

-# Path to file containing private ecash key.
-keys.private_ecash_key_file = '{{ storage_paths.keys.private_ecash_key_file }}'
-
-# Path to file containing public ecash key.
-keys.public_ecash_key_file = '{{ storage_paths.keys.public_ecash_key_file }}'
-
 # A gateway specific, optional, base58 stringified shared key used for
 # communication with particular gateway.
 keys.gateway_shared_key_file = '{{ storage_paths.keys.gateway_shared_key_file }}'
@@ -18,7 +18,6 @@ use nym_client_core::client::base_client::storage::gateway_details::{
 use nym_client_core::client::key_manager::persistence::OnDiskKeys;
 use nym_client_core::config::GatewayEndpointConfig;
 use nym_client_core::error::ClientCoreError;
-use nym_compact_ecash::{generate_keypair_user, setup::GroupParameters};
 use nym_config::OptionalSet;
 use std::error::Error;
 use std::net::IpAddr;
@@ -122,28 +121,6 @@ pub(crate) fn override_config(config: Config, args: OverrideConfig) -> Config {
        )
 }

-fn init_ecash_keypair(config: &Config) -> Result<(), ClientError> {
-    let kp = generate_keypair_user(&GroupParameters::new().unwrap());
-    nym_pemstore::store_keypair(
-        &kp,
-        &nym_pemstore::KeyPairPath::new(
-            config
-                .storage_paths
-                .common_paths
-                .keys
-                .private_ecash_key_file
-                .clone(),
-            config
-                .storage_paths
-                .common_paths
-                .keys
-                .public_ecash_key_file
-                .clone(),
-        ),
-    )?;
-    Ok(())
-}
-
 fn persist_gateway_details(
    config: &Config,
    details: GatewayEndpointConfig,
@@ -182,7 +159,6 @@ fn try_upgrade_v1_1_13_config(id: &str) -> Result<bool, ClientError> {
    let updated_step2: ConfigV1_1_20_2 = updated_step1.into();
    let (updated, gateway_config) = updated_step2.upgrade()?;
    persist_gateway_details(&updated, gateway_config)?;
-    init_ecash_keypair(&updated)?; //SW does that belong here?

    updated.save_to_default_location()?;
    Ok(true)
@@ -203,7 +179,6 @@ fn try_upgrade_v1_1_20_config(id: &str) -> Result<bool, ClientError> {
    let updated_step1: ConfigV1_1_20_2 = old_config.into();
    let (updated, gateway_config) = updated_step1.upgrade()?;
    persist_gateway_details(&updated, gateway_config)?;
-    init_ecash_keypair(&updated)?; //SW does that belong here?

    updated.save_to_default_location()?;
    Ok(true)
@@ -221,7 +196,6 @@ fn try_upgrade_v1_1_20_2_config(id: &str) -> Result<bool, ClientError> {

    let (updated, gateway_config) = old_config.upgrade()?;
    persist_gateway_details(&updated, gateway_config)?;
-    init_ecash_keypair(&updated)?; //SW does that belong here?

    updated.save_to_default_location()?;
    Ok(true)
@@ -22,10 +22,5 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
    }
    setup_logging();

-    if let Err(err) = commands::execute(args).await {
-        log::error!("{err}");
-        println!("An error occurred: {err}");
-        std::process::exit(1);
-    }
-    Ok(())
+    commands::execute(args).await
 }
@@ -1,6 +1,6 @@
 [package]
 name = "nym-socks5-client"
-version = "1.1.32"
+version = "1.1.31"
 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"
@@ -5,9 +5,8 @@ use crate::config::old_config_v1_1_20_2::{
    ConfigV1_1_20_2, CoreConfigV1_1_20_2, SocksClientPathsV1_1_20_2,
 };
 use nym_bin_common::logging::LoggingSettings;
-use nym_client_core::config::disk_persistence::old_v1_1_20_2::{
-    ClientKeysPathsV1_1_20_2, CommonClientPathsV1_1_20_2,
-};
+use nym_client_core::config::disk_persistence::keys_paths::ClientKeysPaths;
+use nym_client_core::config::disk_persistence::old_v1_1_20_2::CommonClientPathsV1_1_20_2;
 use nym_client_core::config::old_config_v1_1_20::ConfigV1_1_20 as BaseConfigV1_1_20;
 use nym_client_core::config::old_config_v1_1_20_2::ClientV1_1_20_2;
 use nym_config::legacy_helpers::nym_config::MigrationNymConfig;
@@ -51,7 +50,7 @@ impl From<ConfigV1_1_20> for ConfigV1_1_20_2 {
            },
            storage_paths: SocksClientPathsV1_1_20_2 {
                common_paths: CommonClientPathsV1_1_20_2 {
-                    keys: ClientKeysPathsV1_1_20_2 {
+                    keys: ClientKeysPaths {
                        private_identity_key_file: value.base.client.private_identity_key_file,
                        public_identity_key_file: value.base.client.public_identity_key_file,
                        private_encryption_key_file: value.base.client.private_encryption_key_file,
@@ -50,12 +50,6 @@ keys.private_encryption_key_file = '{{ storage_paths.keys.private_encryption_key
 # Path to file containing public encryption key.
 keys.public_encryption_key_file = '{{ storage_paths.keys.public_encryption_key_file }}'

-# Path to file containing private ecash key.
-keys.private_ecash_key_file = '{{ storage_paths.keys.private_ecash_key_file }}'
-
-# Path to file containing public ecash key.
-keys.public_ecash_key_file = '{{ storage_paths.keys.public_ecash_key_file }}'
-
 # A gateway specific, optional, base58 stringified shared key used for
 # communication with particular gateway.
 keys.gateway_shared_key_file = '{{ storage_paths.keys.gateway_shared_key_file }}'
@@ -21,10 +21,5 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
    }
    setup_logging();

-    if let Err(err) = commands::execute(args).await {
-        log::error!("{err}");
-        println!("An error occurred: {err}");
-        std::process::exit(1);
-    }
-    Ok(())
+    commands::execute(args).await
 }
@@ -10,8 +10,6 @@ use std::path::{Path, PathBuf};
 use std::time::Duration;
 use tokio::time::Instant;

-pub use notify::{Error as NotifyError, Result as NotifyResult};
-
 pub type FileWatcherEventSender = mpsc::UnboundedSender<Event>;
 pub type FileWatcherEventReceiver = mpsc::UnboundedReceiver<Event>;

@@ -24,7 +22,7 @@ pub struct AsyncFileWatcher {
    last_received: HashMap<EventKind, Instant>,
    tick_duration: Duration,

-    inner_rx: mpsc::UnboundedReceiver<NotifyResult<Event>>,
+    inner_rx: mpsc::UnboundedReceiver<notify::Result<Event>>,
    event_sender: FileWatcherEventSender,
 }

@@ -32,7 +30,7 @@ impl AsyncFileWatcher {
    pub fn new_file_changes_watcher<P: AsRef<Path>>(
        path: P,
        event_sender: FileWatcherEventSender,
-    ) -> NotifyResult<Self> {
+    ) -> notify::Result<Self> {
        Self::new(
            path,
            event_sender,
@@ -50,7 +48,7 @@ impl AsyncFileWatcher {
        event_sender: FileWatcherEventSender,
        filters: Option<Vec<EventKind>>,
        tick_duration: Option<Duration>,
-    ) -> NotifyResult<Self> {
+    ) -> notify::Result<Self> {
        let watcher_config = Config::default();
        let (inner_tx, inner_rx) = mpsc::unbounded();
        let watcher = RecommendedWatcher::new(
@@ -114,17 +112,17 @@ impl AsyncFileWatcher {
        false
    }

-    fn start_watching(&mut self) -> NotifyResult<()> {
+    fn start_watching(&mut self) -> notify::Result<()> {
        self.is_watching = true;
        self.watcher.watch(&self.path, RecursiveMode::NonRecursive)
    }

-    fn stop_watching(&mut self) -> NotifyResult<()> {
+    fn stop_watching(&mut self) -> notify::Result<()> {
        self.is_watching = false;
        self.watcher.unwatch(&self.path)
    }

-    pub async fn watch(&mut self) -> NotifyResult<()> {
+    pub async fn watch(&mut self) -> notify::Result<()> {
        self.start_watching()?;

        while let Some(event) = self.inner_rx.next().await {
@@ -12,7 +12,6 @@ thiserror = { workspace = true }
 url = { workspace = true }

 nym-coconut-interface = { path = "../coconut-interface" }
-nym-compact-ecash = { path = "../nym_offline_compact_ecash" }
 nym-credential-storage = { path = "../credential-storage" }
 nym-credentials = { path = "../credentials" }
 nym-crypto = { path = "../crypto", features = ["rand", "asymmetric", "symmetric", "aes", "hashing"] }
@@ -2,15 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0

 use crate::error::BandwidthControllerError;
-use nym_compact_ecash::scheme::keygen::KeyPairUser;
-use nym_compact_ecash::setup::GroupParameters;
-use nym_compact_ecash::Base58;
+use nym_coconut_interface::{Base58, Parameters};
 use nym_credential_storage::storage::Storage;
-use nym_credentials::coconut::bandwidth::BandwidthVoucher;
+use nym_credentials::coconut::bandwidth::{BandwidthVoucher, TOTAL_ATTRIBUTES};
 use nym_credentials::coconut::utils::obtain_aggregate_signature;
 use nym_crypto::asymmetric::{encryption, identity};
-use nym_network_defaults::ECASH_INFO;
-use nym_validator_client::coconut::all_ecash_api_clients;
+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;
@@ -21,24 +19,20 @@ use std::str::FromStr;

 pub mod state;

-pub async fn deposit<C>(
-    client: &C,
-    amount: Coin,
-    ecash_keypair: KeyPairUser,
-) -> Result<State, BandwidthControllerError>
+pub async fn deposit<C>(client: &C, amount: Coin) -> Result<State, BandwidthControllerError>
 where
    C: CoconutBandwidthSigningClient + Sync,
 {
    let mut rng = OsRng;
    let signing_keypair = KeyPair::from(identity::KeyPair::new(&mut rng));
    let encryption_keypair = KeyPair::from(encryption::KeyPair::new(&mut rng));
-    let params = GroupParameters::new().unwrap();
+    let params = Parameters::new(TOTAL_ATTRIBUTES).unwrap();
    let voucher_value = amount.amount.to_string();

    let tx_hash = client
        .deposit(
            amount,
-            String::from(ECASH_INFO),
+            String::from(VOUCHER_INFO),
            signing_keypair.public_key.clone(),
            encryption_keypair.public_key.clone(),
            None,
@@ -50,11 +44,10 @@ where
    let voucher = BandwidthVoucher::new(
        &params,
        voucher_value,
-        ECASH_INFO.to_string(),
+        VOUCHER_INFO.to_string(),
        Hash::from_str(&tx_hash).map_err(|_| BandwidthControllerError::InvalidTxHash)?,
        identity::PrivateKey::from_base58_string(&signing_keypair.private_key)?,
        encryption::PrivateKey::from_base58_string(&encryption_keypair.private_key)?,
-        ecash_keypair,
    );

    let state = State { voucher, params };
@@ -78,16 +71,22 @@ where
        .await?
        .ok_or(BandwidthControllerError::NoThreshold)?;

-    let ecash_api_clients = all_ecash_api_clients(client, epoch_id).await?;
+    let coconut_api_clients = all_coconut_api_clients(client, epoch_id).await?;

-    let wallet =
-        obtain_aggregate_signature(&state.params, &state.voucher, &ecash_api_clients, threshold)
-            .await?;
+    let signature = obtain_aggregate_signature(
+        &state.params,
+        &state.voucher,
+        &coconut_api_clients,
+        threshold,
+    )
+    .await?;
    storage
-        .insert_ecash_wallet(
-            ECASH_INFO.to_string(),
-            wallet.to_bs58(),
+        .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
@@ -1,8 +1,8 @@
 // Copyright 2022-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use nym_compact_ecash::setup::GroupParameters;
-use nym_credentials::coconut::bandwidth::BandwidthVoucher;
+use nym_coconut_interface::Parameters;
+use nym_credentials::coconut::bandwidth::{BandwidthVoucher, TOTAL_ATTRIBUTES};

 use nym_crypto::asymmetric::{encryption, identity};

@@ -31,14 +31,14 @@ impl From<encryption::KeyPair> for KeyPair {

 pub struct State {
    pub voucher: BandwidthVoucher,
-    pub params: GroupParameters,
+    pub params: Parameters,
 }

 impl State {
    pub fn new(voucher: BandwidthVoucher) -> Self {
        State {
            voucher,
-            params: GroupParameters::new().unwrap(),
+            params: Parameters::new(TOTAL_ATTRIBUTES).unwrap(),
        }
    }
 }
@@ -1,7 +1,7 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use nym_compact_ecash::error::CompactEcashError;
+use nym_coconut_interface::CoconutError;
 use nym_credential_storage::error::StorageError;
 use nym_credentials::error::Error as CredentialsError;
 use nym_crypto::asymmetric::encryption::KeyRecoveryError;
@@ -25,8 +25,8 @@ pub enum BandwidthControllerError {
    #[error(transparent)]
    StorageError(#[from] StorageError),

-    #[error("Ecash error - {0}")]
-    EcashError(#[from] CompactEcashError),
+    #[error("Coconut error - {0}")]
+    CoconutError(#[from] CoconutError),

    #[error("Validator client error - {0}")]
    ValidatorError(#[from] ValidatorClientError),
@@ -2,16 +2,17 @@
 // SPDX-License-Identifier: Apache-2.0

 use crate::error::BandwidthControllerError;
-use nym_compact_ecash::scheme::keygen::KeyPairUser;
-use nym_compact_ecash::scheme::{EcashCredential, Wallet};
-use nym_compact_ecash::setup::{setup, Parameters};
-use nym_compact_ecash::{Base58, PayInfo};
 use nym_credential_storage::error::StorageError;
 use nym_credential_storage::storage::Storage;
-use nym_credentials::obtain_aggregate_verification_key;
-use nym_validator_client::coconut::all_ecash_api_clients;
+use nym_validator_client::coconut::all_coconut_api_clients;
 use nym_validator_client::nyxd::contract_traits::DkgQueryClient;
 use std::str::FromStr;
+use {
+    nym_coconut_interface::Base58,
+    nym_credentials::coconut::{
+        bandwidth::prepare_for_spending, utils::obtain_aggregate_verification_key,
+    },
+};

 pub mod acquire;
 pub mod error;
@@ -19,89 +20,68 @@ pub mod error;
 pub struct BandwidthController<C, St> {
    storage: St,
    client: C,
-    ecash_keypair: KeyPairUser,
-    ecash_params: Parameters,
 }

 impl<C, St: Storage> BandwidthController<C, St> {
-    pub fn new(
-        storage: St,
-        client: C,
-        ecash_keypair: KeyPairUser,
-        ecash_params: Parameters,
-    ) -> Self {
-        BandwidthController {
-            storage,
-            client,
-            ecash_keypair,
-            ecash_params,
-        }
+    pub fn new(storage: St, client: C) -> Self {
+        BandwidthController { storage, client }
    }

    pub fn storage(&self) -> &St {
        &self.storage
    }

-    pub async fn prepare_ecash_credential(
+    pub async fn prepare_coconut_credential(
        &self,
-        provider_pk: [u8; 32],
-    ) -> Result<(EcashCredential, Wallet, i64), BandwidthControllerError>
+    ) -> Result<(nym_coconut_interface::Credential, i64), BandwidthControllerError>
    where
        C: DkgQueryClient + Sync + Send,
        <St as Storage>::StorageError: Send + Sync + 'static,
    {
-        let ecash_wallet = self
+        let bandwidth_credential = self
            .storage
-            .get_next_ecash_wallet()
+            .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 =
+            nym_coconut_interface::Attribute::try_from_bs58(bandwidth_credential.serial_number)?;
+        let binding_number =
+            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 wallet = Wallet::try_from_bs58(ecash_wallet.wallet)?;
-        let epoch_id =
-            u64::from_str(&ecash_wallet.epoch_id).map_err(|_| StorageError::InconsistentData)?;
+        let coconut_api_clients = all_coconut_api_clients(&self.client, epoch_id).await?;

-        let ecash_api_clients = all_ecash_api_clients(&self.client, epoch_id).await?;
-
-        let verification_key = obtain_aggregate_verification_key(&ecash_api_clients).await?;
-
-        let sk_user = self.ecash_keypair.secret_key();
-        let pay_info = PayInfo::generate_payinfo(provider_pk);
-        let nb_tickets = 1u64; //SW: TEMPORARY VALUE, what should we put there?
-        let wallet_value = u64::from_str(&ecash_wallet.value)
-            .map_err(|err| BandwidthControllerError::CredentialStorageError(Box::new(err)))?;
-        let credential_value = nb_tickets * wallet_value / (self.ecash_params.ll());
+        let verification_key = obtain_aggregate_verification_key(&coconut_api_clients).await?;

        // the below would only be executed once we know where we want to spend it (i.e. which gateway and stuff)
-
-        let (payment, _) = wallet.spend(
-            &self.ecash_params,
-            &verification_key,
-            &sk_user,
-            &pay_info,
-            false,
-            nb_tickets,
-        )?;
-
-        let credential = EcashCredential::new(payment, credential_value, pay_info, epoch_id);
-
-        Ok((credential, wallet, ecash_wallet.id))
+        Ok((
+            prepare_for_spending(
+                voucher_value,
+                voucher_info,
+                serial_number,
+                binding_number,
+                epoch_id,
+                &signature,
+                &verification_key,
+            )?,
+            bandwidth_credential.id,
+        ))
    }

-    pub async fn update_ecash_wallet(
-        &self,
-        wallet: Wallet,
-        id: i64,
-    ) -> Result<(), BandwidthControllerError>
+    pub async fn consume_credential(&self, id: i64) -> Result<(), BandwidthControllerError>
    where
        <St as Storage>::StorageError: Send + Sync + 'static,
    {
        // JS: shouldn't we send some contract/validator/gateway message here to actually, you know,
        // consume it?
-        let consumed = wallet.l() >= setup(100).ll(); //temporary, depends on parameters distribution
-        let wallet_string = wallet.to_bs58();
-
        self.storage
-            .update_ecash_wallet(wallet_string, id, consumed)
+            .consume_coconut_credential(id)
            .await
            .map_err(|err| BandwidthControllerError::CredentialStorageError(Box::new(err)))
    }
@@ -116,8 +96,6 @@ where
        BandwidthController {
            storage: self.storage.clone(),
            client: self.client.clone(),
-            ecash_keypair: self.ecash_keypair.clone(),
-            ecash_params: self.ecash_params.clone(),
        }
    }
 }
@@ -47,9 +47,8 @@ default = []
 openapi = ["utoipa"]
 output_format = ["serde_json"]
 bin_info_schema = ["schemars"]
-basic_tracing = ["tracing-subscriber"]
 tracing = [
-    "basic_tracing",
+    "tracing-subscriber",
    "tracing-tree",
    "opentelemetry-jaeger",
    "tracing-opentelemetry",
@@ -80,7 +80,7 @@ impl BinaryBuildInformation {
    }
 }

-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[derive(Clone, Debug, Serialize, Deserialize)]
 #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))]
 #[cfg_attr(feature = "bin_info_schema", derive(schemars::JsonSchema))]
 pub struct BinaryBuildInformationOwned {
@@ -43,30 +43,6 @@ pub fn setup_logging() {
        .init();
 }

-#[cfg(feature = "basic_tracing")]
-pub fn setup_tracing_logger() {
-    let log_builder = tracing_subscriber::fmt()
-        // Use a more compact, abbreviated log format
-        .compact()
-        // Display source code file paths
-        .with_file(true)
-        // Display source code line numbers
-        .with_line_number(true)
-        // Don't display the event's target (module path)
-        .with_target(false);
-
-    if ::std::env::var("RUST_LOG").is_ok() {
-        log_builder
-            .with_env_filter(tracing_subscriber::filter::EnvFilter::from_default_env())
-            .init()
-    } else {
-        // default to 'Info
-        log_builder
-            .with_max_level(tracing_subscriber::filter::LevelFilter::INFO)
-            .init()
-    }
-}
-
 // TODO: This has to be a macro, running it as a function does not work for the file_appender for some reason
 #[cfg(feature = "tracing")]
 #[macro_export]
@@ -34,7 +34,6 @@ zeroize = { workspace = true }
 nym-bandwidth-controller = { path = "../bandwidth-controller" }
 nym-config = { path = "../config" }
 nym-crypto = { path = "../crypto" }
-nym-compact-ecash = { path = "../nym_offline_compact_ecash" }
 nym-explorer-client = { path = "../../explorer-api/explorer-client" }
 nym-gateway-client = { path = "../client-libs/gateway-client" }
 nym-gateway-requests = { path = "../../gateway/gateway-requests" }
@@ -34,7 +34,6 @@ use crate::{config, spawn_future};
 use futures::channel::mpsc;
 use log::{debug, error, info};
 use nym_bandwidth_controller::BandwidthController;
-use nym_compact_ecash::setup::Parameters;
 use nym_credential_storage::storage::Storage as CredentialStorage;
 use nym_crypto::asymmetric::encryption;
 use nym_gateway_client::{
@@ -50,10 +49,7 @@ use nym_task::{TaskClient, TaskHandle};
 use nym_topology::provider_trait::TopologyProvider;
 use nym_topology::HardcodedTopologyProvider;
 use nym_validator_client::nyxd::contract_traits::DkgQueryClient;
-use rand::seq::SliceRandom;
-use rand::thread_rng;
 use std::fmt::Debug;
-use std::ops::Deref;
 use std::path::Path;
 use std::sync::Arc;
 use url::Url;
@@ -560,23 +556,6 @@ where
        setup_gateway(setup_method, key_store, details_store).await
    }

-    async fn get_ecash_parameters(nym_api_urls: Vec<Url>) -> Result<Parameters, ClientCoreError> {
-        let nym_api = nym_api_urls
-            .choose(&mut thread_rng())
-            .ok_or(ClientCoreError::ListOfNymApisIsEmpty)?;
-
-        let validator_client = nym_validator_client::NymApiClient::new(nym_api.clone());
-        match validator_client.ecash_parameters().await {
-            Err(err) => {
-                error!(
-                    "Failed to grab ecash parameters - {err}\n Plesae try again in a few minutes"
-                );
-                Err(ClientCoreError::ValidatorClientError(err))
-            }
-            Ok(response) => Ok(response.params),
-        }
-    }
-
    pub async fn start_base(mut self) -> Result<BaseClient, ClientCoreError>
    where
        S::ReplyStore: Send + Sync,
@@ -633,16 +612,9 @@ where

        // the components are started in very specific order. Unless you know what you are doing,
        // do not change that.
-        let ecash_parameters =
-            Self::get_ecash_parameters(self.config.get_nym_api_endpoints()).await?;
-        let bandwidth_controller = self.dkg_query_client.map(|client| {
-            BandwidthController::new(
-                credential_store,
-                client,
-                init_res.managed_keys.ecash_keypair().deref().clone(),
-                ecash_parameters,
-            )
-        });
+        let bandwidth_controller = self
+            .dkg_query_client
+            .map(|client| BandwidthController::new(credential_store, client));

        let topology_provider = Self::setup_topology_provider(
            self.custom_topology_provider.take(),
@@ -9,8 +9,6 @@ use crate::config::Config;
 use crate::error::ClientCoreError;
 use log::{error, info};
 use nym_bandwidth_controller::BandwidthController;
-use nym_compact_ecash::scheme::keygen::KeyPairUser;
-use nym_compact_ecash::setup::Parameters;
 use nym_credential_storage::storage::Storage as CredentialStorage;
 use nym_validator_client::nyxd;
 use nym_validator_client::QueryHttpRpcNyxdClient;
@@ -103,30 +101,25 @@ pub async fn setup_fs_reply_surb_backend<P: AsRef<Path>>(
    }
 }

-//SW Is this used anywhere?
 pub fn create_bandwidth_controller<St: CredentialStorage>(
    config: &Config,
    storage: St,
-    ecash_keypair: KeyPairUser,
-    ecash_params: Parameters,
 ) -> BandwidthController<QueryHttpRpcNyxdClient, St> {
    let nyxd_url = config
        .get_validator_endpoints()
        .pop()
        .expect("No nyxd validator endpoint provided");

-    create_bandwidth_controller_with_urls(nyxd_url, storage, ecash_keypair, ecash_params)
+    create_bandwidth_controller_with_urls(nyxd_url, storage)
 }

 pub fn create_bandwidth_controller_with_urls<St: CredentialStorage>(
    nyxd_url: Url,
    storage: St,
-    ecash_keypair: KeyPairUser,
-    ecash_params: Parameters,
 ) -> BandwidthController<QueryHttpRpcNyxdClient, St> {
    let client = default_query_dkg_client(nyxd_url);

-    BandwidthController::new(storage, client, ecash_keypair, ecash_params)
+    BandwidthController::new(storage, client)
 }

 pub fn default_query_dkg_client_from_config(config: &Config) -> QueryHttpRpcNyxdClient {
@@ -77,7 +77,7 @@ pub struct PersistedGatewayConfig {
    key_hash: Vec<u8>,

    /// Actual gateway details being persisted.
-    pub details: GatewayEndpointConfig,
+    pub(crate) details: GatewayEndpointConfig,
 }

 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -28,7 +28,6 @@ pub enum InputMessage {
        recipient: Recipient,
        data: Vec<u8>,
        lane: TransmissionLane,
-        mix_hops: Option<u8>,
    },

    /// Creates a message used for a duplex anonymous communication where the recipient
@@ -44,7 +43,6 @@ pub enum InputMessage {
        data: Vec<u8>,
        reply_surbs: u32,
        lane: TransmissionLane,
-        mix_hops: Option<u8>,
    },

    /// Attempt to use our internally received and stored `ReplySurb` to send the message back
@@ -94,29 +92,6 @@ impl InputMessage {
            recipient,
            data,
            lane,
-            mix_hops: None,
-        };
-        if let Some(packet_type) = packet_type {
-            InputMessage::new_wrapper(message, packet_type)
-        } else {
-            message
-        }
-    }
-
-    // IMHO `new_regular` should take `mix_hops: Option<u8>` as an argument instead of creating
-    // this function, but that would potentially break backwards compatibility with the current API
-    pub fn new_regular_with_custom_hops(
-        recipient: Recipient,
-        data: Vec<u8>,
-        lane: TransmissionLane,
-        packet_type: Option<PacketType>,
-        mix_hops: Option<u8>,
-    ) -> Self {
-        let message = InputMessage::Regular {
-            recipient,
-            data,
-            lane,
-            mix_hops,
        };
        if let Some(packet_type) = packet_type {
            InputMessage::new_wrapper(message, packet_type)
@@ -137,31 +112,6 @@ impl InputMessage {
            data,
            reply_surbs,
            lane,
-            mix_hops: None,
-        };
-        if let Some(packet_type) = packet_type {
-            InputMessage::new_wrapper(message, packet_type)
-        } else {
-            message
-        }
-    }
-
-    // IMHO `new_anonymous` should take `mix_hops: Option<u8>` as an argument instead of creating
-    // this function, but that would potentially break backwards compatibility with the current API
-    pub fn new_anonymous_with_custom_hops(
-        recipient: Recipient,
-        data: Vec<u8>,
-        reply_surbs: u32,
-        lane: TransmissionLane,
-        packet_type: Option<PacketType>,
-        mix_hops: Option<u8>,
-    ) -> Self {
-        let message = InputMessage::Anonymous {
-            recipient,
-            data,
-            reply_surbs,
-            lane,
-            mix_hops,
        };
        if let Some(packet_type) = packet_type {
            InputMessage::new_wrapper(message, packet_type)
@@ -2,9 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0

 use crate::client::key_manager::persistence::KeyStore;
-use nym_compact_ecash::scheme::keygen::KeyPairUser;
-use nym_compact_ecash::setup::GroupParameters;
-use nym_compact_ecash::{generate_keypair_user, PublicKeyUser};
 use nym_crypto::asymmetric::{encryption, identity};
 use nym_gateway_requests::registration::handshake::SharedKeys;
 use nym_sphinx::acknowledgements::AckKey;
@@ -90,14 +87,6 @@ impl ManagedKeys {
        }
    }

-    pub fn ecash_keypair(&self) -> Arc<KeyPairUser> {
-        match self {
-            ManagedKeys::Initial(keys) => keys.ecash_keypair(),
-            ManagedKeys::FullyDerived(keys) => keys.ecash_keypair(),
-            ManagedKeys::Invalidated => unreachable!("the managed keys got invalidated"),
-        }
-    }
-
    pub fn ack_key(&self) -> Arc<AckKey> {
        match self {
            ManagedKeys::Initial(keys) => keys.ack_key(),
@@ -135,14 +124,6 @@ impl ManagedKeys {
        }
    }

-    pub fn ecash_public_key(&self) -> PublicKeyUser {
-        match self {
-            ManagedKeys::Initial(keys) => keys.ecash_keypair().public_key(),
-            ManagedKeys::FullyDerived(keys) => keys.ecash_keypair().public_key(),
-            ManagedKeys::Invalidated => unreachable!("the managed keys got invalidated"),
-        }
-    }
-
    pub fn ensure_gateway_key(&self, gateway_shared_key: Option<Arc<SharedKeys>>) {
        if let ManagedKeys::FullyDerived(key_manager) = &self {
            if self.gateway_shared_key().is_none() && gateway_shared_key.is_none() {
@@ -204,9 +185,6 @@ pub struct KeyManagerBuilder {

    /// key used for producing and processing acknowledgement packets.
    ack_key: Arc<AckKey>,
-
-    /// key used for ecash wallet
-    ecash_keypair: Arc<KeyPairUser>,
 }

 impl KeyManagerBuilder {
@@ -219,7 +197,6 @@ impl KeyManagerBuilder {
            identity_keypair: Arc::new(identity::KeyPair::new(rng)),
            encryption_keypair: Arc::new(encryption::KeyPair::new(rng)),
            ack_key: Arc::new(AckKey::new(rng)),
-            ecash_keypair: Arc::new(generate_keypair_user(&GroupParameters::new().unwrap())),
        }
    }

@@ -230,7 +207,6 @@ impl KeyManagerBuilder {
        KeyManager {
            identity_keypair: self.identity_keypair,
            encryption_keypair: self.encryption_keypair,
-            ecash_keypair: self.ecash_keypair,
            gateway_shared_key,
            ack_key: self.ack_key,
        }
@@ -244,10 +220,6 @@ impl KeyManagerBuilder {
        Arc::clone(&self.encryption_keypair)
    }

-    pub fn ecash_keypair(&self) -> Arc<KeyPairUser> {
-        Arc::clone(&self.ecash_keypair)
-    }
-
    pub fn ack_key(&self) -> Arc<AckKey> {
        Arc::clone(&self.ack_key)
    }
@@ -268,9 +240,6 @@ pub struct KeyManager {
    /// encryption key associated with the client instance.
    encryption_keypair: Arc<encryption::KeyPair>,

-    /// ecash key associated with the client instance
-    ecash_keypair: Arc<KeyPairUser>,
-
    /// shared key derived with the gateway during "registration handshake"
    // I'm not a fan of how we broke the nice transition of `KeyManagerBuilder` -> `KeyManager`
    // by making this field optional.
@@ -286,14 +255,12 @@ impl KeyManager {
    pub fn from_keys(
        id_keypair: identity::KeyPair,
        enc_keypair: encryption::KeyPair,
-        ecash_keypair: KeyPairUser,
        gateway_shared_key: Option<SharedKeys>,
        ack_key: AckKey,
    ) -> Self {
        Self {
            identity_keypair: Arc::new(id_keypair),
            encryption_keypair: Arc::new(enc_keypair),
-            ecash_keypair: Arc::new(ecash_keypair),
            gateway_shared_key: gateway_shared_key.map(Arc::new),
            ack_key: Arc::new(ack_key),
        }
@@ -316,12 +283,6 @@ impl KeyManager {
    pub fn encryption_keypair(&self) -> Arc<encryption::KeyPair> {
        Arc::clone(&self.encryption_keypair)
    }
-
-    /// Gets an atomically reference counted pointer to [`encryption::KeyPair`].
-    pub fn ecash_keypair(&self) -> Arc<KeyPairUser> {
-        Arc::clone(&self.ecash_keypair)
-    }
-
    /// Gets an atomically reference counted pointer to [`AckKey`].
    pub fn ack_key(&self) -> Arc<AckKey> {
        Arc::clone(&self.ack_key)
@@ -349,7 +310,6 @@ impl KeyManager {
        KeyManagerBuilder {
            identity_keypair: self.identity_keypair,
            encryption_keypair: self.encryption_keypair,
-            ecash_keypair: self.ecash_keypair,
            ack_key: self.ack_key,
        }
    }
@@ -360,7 +320,6 @@ fn _assert_keys_zeroize_on_drop() {

    _assert_zeroize_on_drop::<identity::KeyPair>();
    _assert_zeroize_on_drop::<encryption::KeyPair>();
-    _assert_zeroize_on_drop::<KeyPairUser>();
    _assert_zeroize_on_drop::<AckKey>();
    _assert_zeroize_on_drop::<SharedKeys>();
 }
@@ -3,7 +3,6 @@

 use crate::client::key_manager::KeyManager;
 use async_trait::async_trait;
-use nym_compact_ecash::scheme::keygen::KeyPairUser;
 use std::error::Error;
 use tokio::sync::Mutex;

@@ -105,12 +104,6 @@ impl OnDiskKeys {
        self.load_keypair(identity_paths, "identity")
    }

-    #[doc(hidden)]
-    pub fn load_ecash_keypair(&self) -> Result<KeyPairUser, OnDiskKeysError> {
-        let ecash_paths = self.paths.ecash_key_pair_path();
-        self.load_keypair(ecash_paths, "ecash")
-    }
-
    fn load_key<T: PemStorableKey>(
        &self,
        path: &std::path::Path,
@@ -166,7 +159,6 @@ impl OnDiskKeys {
    fn load_keys(&self) -> Result<KeyManager, OnDiskKeysError> {
        let identity_keypair = self.load_identity_keypair()?;
        let encryption_keypair = self.load_encryption_keypair()?;
-        let ecash_keypair = self.load_ecash_keypair()?;

        let ack_key: AckKey = self.load_key(self.paths.ack_key(), "ack key")?;
        let gateway_shared_key: Option<SharedKeys> = self
@@ -176,7 +168,6 @@ impl OnDiskKeys {
        Ok(KeyManager::from_keys(
            identity_keypair,
            encryption_keypair,
-            ecash_keypair,
            gateway_shared_key,
            ack_key,
        ))
@@ -187,7 +178,6 @@ impl OnDiskKeys {

        let identity_paths = self.paths.identity_key_pair_path();
        let encryption_paths = self.paths.encryption_key_pair_path();
-        let ecash_paths = self.paths.ecash_key_pair_path();

        self.store_keypair(
            keys.identity_keypair.as_ref(),
@@ -199,7 +189,6 @@ impl OnDiskKeys {
            encryption_paths,
            "encryption keys",
        )?;
-        self.store_keypair(keys.ecash_keypair.as_ref(), ecash_paths, "ecash keys")?;

        self.store_key(keys.ack_key.as_ref(), self.paths.ack_key(), "ack key")?;

@@ -263,7 +263,7 @@ impl ActionController {
    pub(super) async fn run_with_shutdown(&mut self, mut shutdown: nym_task::TaskClient) {
        debug!("Started ActionController with graceful shutdown support");

-        loop {
+        while !shutdown.is_shutdown() {
            tokio::select! {
                action = self.incoming_actions.next() => match action {
                    Some(action) => self.process_action(action),
@@ -283,7 +283,6 @@ impl ActionController {
                },
                _ = shutdown.recv_with_delay() => {
                    log::trace!("ActionController: Received shutdown");
-                    break;
                }
            }
        }
@@ -73,11 +73,10 @@ where
        content: Vec<u8>,
        lane: TransmissionLane,
        packet_type: PacketType,
-        mix_hops: Option<u8>,
    ) {
        if let Err(err) = self
            .message_handler
-            .try_send_plain_message(recipient, content, lane, packet_type, mix_hops)
+            .try_send_plain_message(recipient, content, lane, packet_type)
            .await
        {
            warn!("failed to send a plain message - {err}")
@@ -91,18 +90,10 @@ where
        reply_surbs: u32,
        lane: TransmissionLane,
        packet_type: PacketType,
-        mix_hops: Option<u8>,
    ) {
        if let Err(err) = self
            .message_handler
-            .try_send_message_with_reply_surbs(
-                recipient,
-                content,
-                reply_surbs,
-                lane,
-                packet_type,
-                mix_hops,
-            )
+            .try_send_message_with_reply_surbs(recipient, content, reply_surbs, lane, packet_type)
            .await
        {
            warn!("failed to send a repliable message - {err}")
@@ -115,9 +106,8 @@ where
                recipient,
                data,
                lane,
-                mix_hops,
            } => {
-                self.handle_plain_message(recipient, data, lane, PacketType::Mix, mix_hops)
+                self.handle_plain_message(recipient, data, lane, PacketType::Mix)
                    .await
            }
            InputMessage::Anonymous {
@@ -125,17 +115,9 @@ where
                data,
                reply_surbs,
                lane,
-                mix_hops,
            } => {
-                self.handle_repliable_message(
-                    recipient,
-                    data,
-                    reply_surbs,
-                    lane,
-                    PacketType::Mix,
-                    mix_hops,
-                )
-                .await
+                self.handle_repliable_message(recipient, data, reply_surbs, lane, PacketType::Mix)
+                    .await
            }
            InputMessage::Reply {
                recipient_tag,
@@ -153,9 +135,8 @@ where
                    recipient,
                    data,
                    lane,
-                    mix_hops,
                } => {
-                    self.handle_plain_message(recipient, data, lane, packet_type, mix_hops)
+                    self.handle_plain_message(recipient, data, lane, packet_type)
                        .await
                }
                InputMessage::Anonymous {
@@ -163,17 +144,9 @@ where
                    data,
                    reply_surbs,
                    lane,
-                    mix_hops,
                } => {
-                    self.handle_repliable_message(
-                        recipient,
-                        data,
-                        reply_surbs,
-                        lane,
-                        packet_type,
-                        mix_hops,
-                    )
-                    .await
+                    self.handle_repliable_message(recipient, data, reply_surbs, lane, packet_type)
+                        .await
                }
                InputMessage::Reply {
                    recipient_tag,
@@ -69,7 +69,6 @@ pub(crate) struct PendingAcknowledgement {
    message_chunk: Fragment,
    delay: SphinxDelay,
    destination: PacketDestination,
-    mix_hops: Option<u8>,
 }

 impl PendingAcknowledgement {
@@ -78,13 +77,11 @@ impl PendingAcknowledgement {
        message_chunk: Fragment,
        delay: SphinxDelay,
        recipient: Recipient,
-        mix_hops: Option<u8>,
    ) -> Self {
        PendingAcknowledgement {
            message_chunk,
            delay,
            destination: PacketDestination::KnownRecipient(recipient.into()),
-            mix_hops,
        }
    }

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

@@ -49,18 +49,12 @@ where
        packet_recipient: Recipient,
        chunk_data: Fragment,
        packet_type: PacketType,
-        mix_hops: Option<u8>,
    ) -> Result<PreparedFragment, PreparationError> {
        debug!("retransmitting normal packet...");

        // TODO: Figure out retransmission packet type signaling
        self.message_handler
-            .try_prepare_single_chunk_for_sending(
-                packet_recipient,
-                chunk_data,
-                packet_type,
-                mix_hops,
-            )
+            .try_prepare_single_chunk_for_sending(packet_recipient, chunk_data, packet_type)
            .await
    }

@@ -95,7 +89,6 @@ where
                    **recipient,
                    timed_out_ack.message_chunk.clone(),
                    packet_type,
-                    timed_out_ack.mix_hops,
                )
                .await
            }
@@ -40,7 +40,7 @@ impl SentNotificationListener {
    pub(super) async fn run_with_shutdown(&mut self, mut shutdown: nym_task::TaskClient) {
        debug!("Started SentNotificationListener with graceful shutdown support");

-        loop {
+        while !shutdown.is_shutdown() {
            tokio::select! {
                frag_id = self.sent_notifier.next() => match frag_id {
                    Some(frag_id) => {
@@ -53,7 +53,6 @@ impl SentNotificationListener {
                },
                _ = shutdown.recv_with_delay() => {
                    log::trace!("SentNotificationListener: Received shutdown");
-                    break;
                }
            }
        }
@@ -418,10 +418,9 @@ where
        message: Vec<u8>,
        lane: TransmissionLane,
        packet_type: PacketType,
-        mix_hops: Option<u8>,
    ) -> Result<(), PreparationError> {
        let message = NymMessage::new_plain(message);
-        self.try_split_and_send_non_reply_message(message, recipient, lane, packet_type, mix_hops)
+        self.try_split_and_send_non_reply_message(message, recipient, lane, packet_type)
            .await
    }

@@ -431,7 +430,6 @@ where
        recipient: Recipient,
        lane: TransmissionLane,
        packet_type: PacketType,
-        mix_hops: Option<u8>,
    ) -> Result<(), PreparationError> {
        debug!("Sending non-reply message with packet type {packet_type}");
        // TODO: I really dislike existence of this assertion, it implies code has to be re-organised
@@ -463,7 +461,6 @@ where
                &self.config.ack_key,
                &recipient,
                packet_type,
-                mix_hops,
            )?;

            let real_message = RealMessage::new(
@@ -471,8 +468,7 @@ where
                Some(fragment.fragment_identifier()),
            );
            let delay = prepared_fragment.total_delay;
-            let pending_ack =
-                PendingAcknowledgement::new_known(fragment, delay, recipient, mix_hops);
+            let pending_ack = PendingAcknowledgement::new_known(fragment, delay, recipient);

            real_messages.push(real_message);
            pending_acks.push(pending_ack);
@@ -489,7 +485,6 @@ where
        recipient: Recipient,
        amount: u32,
        packet_type: PacketType,
-        mix_hops: Option<u8>,
    ) -> Result<(), PreparationError> {
        debug!("Sending additional reply SURBs with packet type {packet_type}");
        let sender_tag = self.get_or_create_sender_tag(&recipient);
@@ -506,7 +501,6 @@ where
            recipient,
            TransmissionLane::AdditionalReplySurbs,
            packet_type,
-            mix_hops,
        )
        .await?;

@@ -523,7 +517,6 @@ where
        num_reply_surbs: u32,
        lane: TransmissionLane,
        packet_type: PacketType,
-        mix_hops: Option<u8>,
    ) -> Result<(), SurbWrappedPreparationError> {
        debug!("Sending message with reply SURBs with packet type {packet_type}");
        let sender_tag = self.get_or_create_sender_tag(&recipient);
@@ -534,7 +527,7 @@ where
        let message =
            NymMessage::new_repliable(RepliableMessage::new_data(message, sender_tag, reply_surbs));

-        self.try_split_and_send_non_reply_message(message, recipient, lane, packet_type, mix_hops)
+        self.try_split_and_send_non_reply_message(message, recipient, lane, packet_type)
            .await?;

        log::trace!("storing {} reply keys", reply_keys.len());
@@ -548,7 +541,6 @@ where
        recipient: Recipient,
        chunk: Fragment,
        packet_type: PacketType,
-        mix_hops: Option<u8>,
    ) -> Result<PreparedFragment, PreparationError> {
        debug!("Sending single chunk with packet type {packet_type}");
        let topology_permit = self.topology_access.get_read_permit().await;
@@ -562,7 +554,6 @@ where
                &self.config.ack_key,
                &recipient,
                packet_type,
-                mix_hops,
            )
            .unwrap();

@@ -500,12 +500,11 @@ where
        {
            let mut status_timer = tokio::time::interval(Duration::from_secs(5));

-            loop {
+            while !shutdown.is_shutdown() {
                tokio::select! {
                    biased;
                    _ = shutdown.recv_with_delay() => {
                        log::trace!("OutQueueControl: Received shutdown");
-                        break;
                    }
                    _ = status_timer.tick() => {
                        self.log_status(&mut shutdown);
@@ -516,7 +516,6 @@ where
                    recipient,
                    to_send,
                    nym_sphinx::params::PacketType::Mix,
-                    self.config.reply_surbs.surb_mix_hops,
                )
                .await
            {
@@ -39,7 +39,7 @@ where
        mem_state: CombinedReplyStorage,
        mut shutdown: nym_task::TaskClient,
    ) {
-        use log::{debug, error, info};
+        use log::{debug, error, info, warn};

        debug!("Started PersistentReplyStorage");
        if let Err(err) = self.backend.start_storage_session().await {
@@ -50,7 +50,7 @@ where
        shutdown.recv().await;

        info!("PersistentReplyStorage is flushing all reply-related data to underlying storage");
-        info!("you MUST NOT forcefully shutdown now or you risk data corruption!");
+        warn!("you MUST NOT forcefully shutdown now or you risk data corruption!");
        if let Err(err) = self.backend.flush_surb_storage(&mem_state).await {
            error!("failed to flush our reply-related data to the persistent storage: {err}")
        } else {
@@ -8,8 +8,6 @@ pub const DEFAULT_PRIVATE_IDENTITY_KEY_FILENAME: &str = "private_identity.pem";
 pub const DEFAULT_PUBLIC_IDENTITY_KEY_FILENAME: &str = "public_identity.pem";
 pub const DEFAULT_PRIVATE_ENCRYPTION_KEY_FILENAME: &str = "private_encryption.pem";
 pub const DEFAULT_PUBLIC_ENCRYPTION_KEY_FILENAME: &str = "public_encryption.pem";
-pub const DEFAULT_PRIVATE_ECASH_KEY_FILENAME: &str = "private_ecash.pem";
-pub const DEFAULT_PUBLIC_ECASH_KEY_FILENAME: &str = "public_ecash.pem";
 pub const DEFAULT_GATEWAY_SHARED_KEY_FILENAME: &str = "gateway_shared.pem";
 pub const DEFAULT_ACK_KEY_FILENAME: &str = "ack_key.pem";

@@ -27,12 +25,6 @@ pub struct ClientKeysPaths {
    /// Path to file containing public encryption key.
    pub public_encryption_key_file: PathBuf,

-    /// Path to file containing private ecash key.
-    pub private_ecash_key_file: PathBuf,
-
-    /// Path to file containing public ecash key.
-    pub public_ecash_key_file: PathBuf,
-
    /// Path to file containing shared key derived with the specified gateway that is used
    /// for all communication with it.
    pub gateway_shared_key_file: PathBuf,
@@ -51,8 +43,6 @@ impl ClientKeysPaths {
            public_identity_key_file: base_dir.join(DEFAULT_PUBLIC_IDENTITY_KEY_FILENAME),
            private_encryption_key_file: base_dir.join(DEFAULT_PRIVATE_ENCRYPTION_KEY_FILENAME),
            public_encryption_key_file: base_dir.join(DEFAULT_PUBLIC_ENCRYPTION_KEY_FILENAME),
-            private_ecash_key_file: base_dir.join(DEFAULT_PRIVATE_ECASH_KEY_FILENAME),
-            public_ecash_key_file: base_dir.join(DEFAULT_PUBLIC_ECASH_KEY_FILENAME),
            gateway_shared_key_file: base_dir.join(DEFAULT_GATEWAY_SHARED_KEY_FILENAME),
            ack_key_file: base_dir.join(DEFAULT_ACK_KEY_FILENAME),
        }
@@ -72,20 +62,11 @@ impl ClientKeysPaths {
        )
    }

-    pub fn ecash_key_pair_path(&self) -> nym_pemstore::KeyPairPath {
-        nym_pemstore::KeyPairPath::new(
-            self.private_ecash_key().to_path_buf(),
-            self.public_ecash_key().to_path_buf(),
-        )
-    }
-
    pub fn any_file_exists(&self) -> bool {
        matches!(self.public_identity_key_file.try_exists(), Ok(true))
            || matches!(self.private_identity_key_file.try_exists(), Ok(true))
            || matches!(self.public_encryption_key_file.try_exists(), Ok(true))
            || matches!(self.private_encryption_key_file.try_exists(), Ok(true))
-            || matches!(self.public_ecash_key_file.try_exists(), Ok(true))
-            || matches!(self.private_ecash_key_file.try_exists(), Ok(true))
            || matches!(self.gateway_shared_key_file.try_exists(), Ok(true))
            || matches!(self.ack_key_file.try_exists(), Ok(true))
    }
@@ -95,8 +76,6 @@ impl ClientKeysPaths {
            .or_else(|| file_exists(&self.private_identity_key_file))
            .or_else(|| file_exists(&self.public_encryption_key_file))
            .or_else(|| file_exists(&self.private_encryption_key_file))
-            .or_else(|| file_exists(&self.public_ecash_key_file))
-            .or_else(|| file_exists(&self.private_ecash_key_file))
            .or_else(|| file_exists(&self.gateway_shared_key_file))
            .or_else(|| file_exists(&self.ack_key_file))
    }
@@ -121,14 +100,6 @@ impl ClientKeysPaths {
        &self.public_encryption_key_file
    }

-    pub fn private_ecash_key(&self) -> &Path {
-        &self.private_ecash_key_file
-    }
-
-    pub fn public_ecash_key(&self) -> &Path {
-        &self.public_ecash_key_file
-    }
-
    pub fn gateway_shared_key(&self) -> &Path {
        &self.gateway_shared_key_file
    }
@@ -1,9 +1,7 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::config::disk_persistence::keys_paths::{
-    ClientKeysPaths, DEFAULT_PRIVATE_ECASH_KEY_FILENAME, DEFAULT_PUBLIC_ECASH_KEY_FILENAME,
-};
+use crate::config::disk_persistence::keys_paths::ClientKeysPaths;
 use crate::config::disk_persistence::{CommonClientPaths, DEFAULT_GATEWAY_DETAILS_FILENAME};
 use crate::error::ClientCoreError;
 use serde::{Deserialize, Serialize};
@@ -12,7 +10,7 @@ use std::path::PathBuf;
 #[derive(Debug, Clone, Deserialize, PartialEq, Eq, Serialize)]
 #[serde(deny_unknown_fields)]
 pub struct CommonClientPathsV1_1_20_2 {
-    pub keys: ClientKeysPathsV1_1_20_2,
+    pub keys: ClientKeysPaths,
    pub credentials_database: PathBuf,
    pub reply_surb_database: PathBuf,
 }
@@ -25,53 +23,10 @@ impl CommonClientPathsV1_1_20_2 {
            }
        })?;
        Ok(CommonClientPaths {
-            keys: self.keys.upgrade_default()?,
+            keys: self.keys,
            gateway_details: data_dir.join(DEFAULT_GATEWAY_DETAILS_FILENAME),
            credentials_database: self.credentials_database,
            reply_surb_database: self.reply_surb_database,
        })
    }
 }
-#[derive(Debug, Clone, Deserialize, PartialEq, Eq, Serialize)]
-#[serde(deny_unknown_fields)]
-pub struct ClientKeysPathsV1_1_20_2 {
-    /// Path to file containing private identity key.
-    pub private_identity_key_file: PathBuf,
-
-    /// Path to file containing public identity key.
-    pub public_identity_key_file: PathBuf,
-
-    /// Path to file containing private encryption key.
-    pub private_encryption_key_file: PathBuf,
-
-    /// Path to file containing public encryption key.
-    pub public_encryption_key_file: PathBuf,
-
-    /// Path to file containing shared key derived with the specified gateway that is used
-    /// for all communication with it.
-    pub gateway_shared_key_file: PathBuf,
-
-    /// Path to file containing key used for encrypting and decrypting the content of an
-    /// acknowledgement so that nobody besides the client knows which packet it refers to.
-    pub ack_key_file: PathBuf,
-}
-
-impl ClientKeysPathsV1_1_20_2 {
-    pub fn upgrade_default(self) -> Result<ClientKeysPaths, ClientCoreError> {
-        let data_dir = self.gateway_shared_key_file.parent().ok_or_else(|| {
-            ClientCoreError::UnableToUpgradeConfigFile {
-                new_version: "1.1.20-2".to_string(),
-            }
-        })?;
-        Ok(ClientKeysPaths {
-            private_identity_key_file: self.private_identity_key_file,
-            public_identity_key_file: self.public_identity_key_file,
-            private_encryption_key_file: self.private_encryption_key_file,
-            public_encryption_key_file: self.public_encryption_key_file,
-            private_ecash_key_file: data_dir.join(DEFAULT_PRIVATE_ECASH_KEY_FILENAME),
-            public_ecash_key_file: data_dir.join(DEFAULT_PUBLIC_ECASH_KEY_FILENAME),
-            gateway_shared_key_file: self.gateway_shared_key_file,
-            ack_key_file: self.ack_key_file,
-        })
-    }
-}
@@ -607,10 +607,6 @@ pub struct ReplySurbs {
    /// This is going to be superseded by key rotation once implemented.
    #[serde(with = "humantime_serde")]
    pub maximum_reply_key_age: Duration,
-
-    /// Specifies the number of mixnet hops the packet should go through. If not specified, then
-    /// the default value is used.
-    pub surb_mix_hops: Option<u8>,
 }

 impl Default for ReplySurbs {
@@ -626,7 +622,6 @@ impl Default for ReplySurbs {
            maximum_reply_surb_drop_waiting_period: DEFAULT_MAXIMUM_REPLY_SURB_DROP_WAITING_PERIOD,
            maximum_reply_surb_age: DEFAULT_MAXIMUM_REPLY_SURB_AGE,
            maximum_reply_key_age: DEFAULT_MAXIMUM_REPLY_KEY_AGE,
-            surb_mix_hops: None,
        }
    }
 }
@@ -155,7 +155,6 @@ impl From<ConfigV1_1_30> for Config {
                        .maximum_reply_surb_drop_waiting_period,
                    maximum_reply_surb_age: value.debug.reply_surbs.maximum_reply_surb_age,
                    maximum_reply_key_age: value.debug.reply_surbs.maximum_reply_key_age,
-                    surb_mix_hops: None,
                },
            },
        }
@@ -15,34 +15,34 @@ pub enum ClientCoreError {
    #[error("I/O error: {0}")]
    IoError(#[from] std::io::Error),

-    #[error("gateway client error ({gateway_id}): {source}")]
+    #[error("Gateway client error ({gateway_id}): {source}")]
    GatewayClientError {
        gateway_id: String,
        source: GatewayClientError,
    },

-    #[error("custom gateway client error: {source}")]
+    #[error("Custom gateway client error: {source}")]
    ErasedGatewayClientError {
        #[from]
        source: ErasedGatewayError,
    },

-    #[error("ed25519 error: {0}")]
+    #[error("Ed25519 error: {0}")]
    Ed25519RecoveryError(#[from] Ed25519RecoveryError),

-    #[error("validator client error: {0}")]
+    #[error("Validator client error: {0}")]
    ValidatorClientError(#[from] ValidatorClientError),

-    #[error("no gateway with id: {0}")]
+    #[error("No gateway with id: {0}")]
    NoGatewayWithId(String),

-    #[error("no gateways on network")]
+    #[error("No gateways on network")]
    NoGatewaysOnNetwork,

-    #[error("list of nym apis is empty")]
+    #[error("List of nym apis is empty")]
    ListOfNymApisIsEmpty,

-    #[error("the current network topology seem to be insufficient to route any packets through")]
+    #[error("The current network topology seem to be insufficient to route any packets through")]
    InsufficientNetworkTopology(#[from] NymTopologyError),

    #[error("experienced a failure with our reply surb persistent storage: {source}")]
@@ -60,7 +60,7 @@ pub enum ClientCoreError {
        source: Box<dyn Error + Send + Sync>,
    },

-    #[error("the gateway id is invalid - {0}")]
+    #[error("The gateway id is invalid - {0}")]
    UnableToCreatePublicKeyFromGatewayId(Ed25519RecoveryError),

    #[error("The gateway is malformed: {source}")]
@@ -79,23 +79,23 @@ pub enum ClientCoreError {
    #[error("failed to establish gateway connection (wasm)")]
    GatewayJsConnectionFailure,

-    #[error("gateway connection was abruptly closed")]
+    #[error("Gateway connection was abruptly closed")]
    GatewayConnectionAbruptlyClosed,

-    #[error("timed out while trying to establish gateway connection")]
+    #[error("Timed out while trying to establish gateway connection")]
    GatewayConnectionTimeout,

-    #[error("no ping measurements for the gateway ({identity}) performed")]
+    #[error("No ping measurements for the gateway ({identity}) performed")]
    NoGatewayMeasurements { identity: String },

    #[error("failed to register receiver for reconstructed mixnet messages")]
    FailedToRegisterReceiver,

-    #[error("unexpected exit")]
+    #[error("Unexpected exit")]
    UnexpectedExit,

    #[error(
-        "this operation would have resulted in clients keys being overwritten without permission"
+        "This operation would have resulted in clients keys being overwritten without permission"
    )]
    ForbiddenKeyOverwrite,

@@ -68,23 +68,13 @@ pub async fn current_gateways<R: Rng>(
    log::trace!("Fetching list of gateways from: {nym_api}");

    let gateways = client.get_cached_described_gateways().await?;
-    log::debug!("Found {} gateways", gateways.len());
-    log::trace!("Gateways: {:#?}", gateways);
-
    let valid_gateways = gateways
        .into_iter()
        .filter_map(|gateway| gateway.try_into().ok())
        .collect::<Vec<gateway::Node>>();
-    log::debug!("Ater checking validity: {}", valid_gateways.len());
-    log::trace!("Valid gateways: {:#?}", valid_gateways);

    // we were always filtering by version so I'm not removing that 'feature'
    let filtered_gateways = valid_gateways.filter_by_version(env!("CARGO_PKG_VERSION"));
-    log::debug!("After filtering for version: {}", filtered_gateways.len());
-    log::trace!("Filtered gateways: {:#?}", filtered_gateways);
-
-    log::info!("nym-api reports {} valid gateways", filtered_gateways.len());
-
    Ok(filtered_gateways)
 }

@@ -94,8 +94,6 @@ where
    D::StorageError: Send + Sync + 'static,
    T: DeserializeOwned + Serialize + Send + Sync,
 {
-    log::trace!("Setting up new gateway");
-
    // if we're setting up new gateway, failing to load existing information is fine.
    // as a matter of fact, it's only potentially a problem if we DO succeed
    if _load_gateway_details(details_store).await.is_ok() && !overwrite_data {
@@ -212,7 +210,6 @@ where
    D::StorageError: Send + Sync + 'static,
    T: DeserializeOwned + Serialize + Send + Sync,
 {
-    log::trace!("Setting up gateway");
    match setup {
        GatewaySetup::MustLoad => use_loaded_gateway_details(key_store, details_store).await,
        GatewaySetup::New {
@@ -19,7 +19,6 @@ tokio = { version = "1.24.1", features = ["macros"] }
 # internal
 nym-bandwidth-controller = { path = "../../bandwidth-controller" }
 nym-coconut-interface = { path = "../../coconut-interface" }
-nym-compact-ecash = { path = "../../nym_offline_compact_ecash" }
 nym-credential-storage = { path = "../../credential-storage" }
 nym-crypto = { path = "../../crypto" }
 nym-gateway-requests = { path = "../../../gateway/gateway-requests" }
@@ -12,7 +12,7 @@ use crate::{cleanup_socket_message, try_decrypt_binary_message};
 use futures::{SinkExt, StreamExt};
 use log::*;
 use nym_bandwidth_controller::BandwidthController;
-use nym_compact_ecash::scheme::EcashCredential;
+use nym_coconut_interface::Credential;
 use nym_credential_storage::ephemeral_storage::EphemeralStorage as EphemeralCredentialStorage;
 use nym_credential_storage::storage::Storage as CredentialStorage;
 use nym_crypto::asymmetric::identity;
@@ -513,14 +513,14 @@ impl<C, St> GatewayClient<C, St> {
        }
    }

-    async fn claim_ecash_bandwidth(
+    async fn claim_coconut_bandwidth(
        &mut self,
-        credential: EcashCredential,
+        credential: Credential,
    ) -> Result<(), GatewayClientError> {
        let mut rng = OsRng;
        let iv = IV::new_random(&mut rng);

-        let msg = ClientControlRequest::new_enc_ecash_credential(
+        let msg = ClientControlRequest::new_enc_coconut_bandwidth_credential(
            &credential,
            self.shared_key.as_ref().unwrap(),
            iv,
@@ -567,18 +567,18 @@ impl<C, St> GatewayClient<C, St> {
            return self.try_claim_testnet_bandwidth().await;
        }

-        let (credential, new_wallet, wallet_id) = self
+        let (credential, credential_id) = self
            .bandwidth_controller
            .as_ref()
            .unwrap()
-            .prepare_ecash_credential(self.gateway_identity.to_bytes())
+            .prepare_coconut_credential()
            .await?;

-        self.claim_ecash_bandwidth(credential).await?;
+        self.claim_coconut_bandwidth(credential).await?;
        self.bandwidth_controller
            .as_ref()
            .unwrap()
-            .update_ecash_wallet(new_wallet, wallet_id)
+            .consume_credential(credential_id)
            .await?;

        Ok(())
@@ -671,7 +671,6 @@ impl<C, St> GatewayClient<C, St> {
        if !self.authenticated {
            return Err(GatewayClientError::NotAuthenticated);
        }
-        //SW NOTE : Logic to stop sending packet is there already. We only need to update bandwidth_remaining
        if (mix_packet.packet().len() as i64) > self.bandwidth_remaining {
            return Err(GatewayClientError::NotEnoughBandwidth(
                mix_packet.packet().len() as i64,
@@ -33,7 +33,6 @@ futures = { workspace = true }
 openssl = { version = "^0.10.55", features = ["vendored"], optional = true }

 nym-coconut-interface = { path = "../../coconut-interface" }
-nym-compact-ecash = { path = "../../nym_offline_compact_ecash" }
 nym-network-defaults = { path = "../../network-defaults" }
 nym-api-requests = { path = "../../../nym-api/nym-api-requests" }

@@ -46,17 +45,13 @@ cosmrs = { workspace = true, features = ["bip32", "cosmwasm"] }
 # import it just for the `Client` trait
 tendermint-rpc = { workspace = true }

-# this is an extremely nasty import. we're explicitly bringing in bip32 so that via the magic (or curse, pick your poison)
-# of cargo's feature unification we'd get `bip32/std` meaning we'd get `std::error::Error` for the re-exported (via cosmrs) bip32::Error type
-bip32 = { workspace = true, default-features = false, features = ["std"] }
-
 eyre = { version = "0.6" }
 cw-utils = { workspace = true }
 cw2 = { workspace = true }
 cw3 = { workspace = true }
 cw4 = { workspace = true }
 cw-controllers = { workspace = true }
-prost = { workspace = true, default-features = false }
+prost = { version = "0.11", default-features = false }
 flate2 = { version = "1.0.20" }
 sha2 = { version = "0.9.5" }
 itertools = { version = "0.10" }
@@ -9,8 +9,7 @@ use crate::{
    ReqwestRpcClient, ValidatorClientError,
 };
 use nym_api_requests::coconut::{
-    BlindSignRequestBody, BlindedSignatureResponse, EcashParametersResponse,
-    OfflineVerifyCredentialBody, OnlineVerifyCredentialBody, VerifyCredentialResponse,
+    BlindSignRequestBody, BlindedSignatureResponse, VerifyCredentialBody, VerifyCredentialResponse,
 };
 use nym_api_requests::models::{DescribedGateway, MixNodeBondAnnotated};
 use nym_api_requests::models::{
@@ -332,21 +331,13 @@ impl NymApiClient {
        Ok(self.nym_api.blind_sign(request_body).await?)
    }

-    pub async fn verify_offline_credential(
+    pub async fn verify_bandwidth_credential(
        &self,
-        request_body: &OfflineVerifyCredentialBody,
+        request_body: &VerifyCredentialBody,
    ) -> Result<VerifyCredentialResponse, ValidatorClientError> {
-        Ok(self.nym_api.verify_offline_credential(request_body).await?)
-    }
-
-    pub async fn verify_online_credential(
-        &self,
-        request_body: &OnlineVerifyCredentialBody,
-    ) -> Result<VerifyCredentialResponse, ValidatorClientError> {
-        Ok(self.nym_api.verify_online_credential(request_body).await?)
-    }
-
-    pub async fn ecash_parameters(&self) -> Result<EcashParametersResponse, ValidatorClientError> {
-        Ok(self.nym_api.ecash_parameters().await?)
+        Ok(self
+            .nym_api
+            .verify_bandwidth_credential(request_body)
+            .await?)
    }
 }
@@ -6,8 +6,7 @@ use crate::nyxd::error::NyxdError;
 use crate::NymApiClient;
 use nym_coconut_dkg_common::types::{EpochId, NodeIndex};
 use nym_coconut_dkg_common::verification_key::ContractVKShare;
-use nym_compact_ecash::error::CompactEcashError;
-use nym_compact_ecash::{Base58, VerificationKeyAuth};
+use nym_coconut_interface::{Base58, CoconutError, VerificationKey};
 use thiserror::Error;
 use url::Url;

@@ -15,7 +14,7 @@ use url::Url;
 #[derive(Clone)]
 pub struct CoconutApiClient {
    pub api_client: NymApiClient,
-    pub verification_key: VerificationKeyAuth,
+    pub verification_key: VerificationKey,
    pub node_id: NodeIndex,
    pub cosmos_address: cosmrs::AccountId,
 }
@@ -44,7 +43,7 @@ pub enum CoconutApiError {
    #[error("the provided verification key is malformed: {source}")]
    MalformedVerificationKey {
        #[from]
-        source: CompactEcashError,
+        source: CoconutError,
    },

    #[error("the provided account address is malformed: {source}")]
@@ -66,14 +65,14 @@ impl TryFrom<ContractVKShare> for CoconutApiClient {

        Ok(CoconutApiClient {
            api_client: NymApiClient::new(url_address),
-            verification_key: VerificationKeyAuth::try_from_bs58(&share.share)?,
+            verification_key: VerificationKey::try_from_bs58(&share.share)?,
            node_id: share.node_index,
            cosmos_address: share.owner.as_str().parse()?,
        })
    }
 }

-pub async fn all_ecash_api_clients<C>(
+pub async fn all_coconut_api_clients<C>(
    client: &C,
    epoch_id: EpochId,
 ) -> Result<Vec<CoconutApiClient>, CoconutApiError>
@@ -6,8 +6,7 @@ use crate::nym_api::routes::{CORE_STATUS_COUNT, SINCE_ARG};
 use async_trait::async_trait;
 use http_api_client::{ApiClient, NO_PARAMS};
 use nym_api_requests::coconut::{
-    BlindSignRequestBody, BlindedSignatureResponse, EcashParametersResponse,
-    OfflineVerifyCredentialBody, OnlineVerifyCredentialBody, VerifyCredentialResponse,
+    BlindSignRequestBody, BlindedSignatureResponse, VerifyCredentialBody, VerifyCredentialResponse,
 };
 use nym_api_requests::models::{
    ComputeRewardEstParam, DescribedGateway, GatewayBondAnnotated, GatewayCoreStatusResponse,
@@ -383,16 +382,16 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    async fn verify_offline_credential(
+    async fn verify_bandwidth_credential(
        &self,
-        request_body: &OfflineVerifyCredentialBody,
+        request_body: &VerifyCredentialBody,
    ) -> Result<VerifyCredentialResponse, NymAPIError> {
        self.post_json(
            &[
                routes::API_VERSION,
                routes::COCONUT_ROUTES,
                routes::BANDWIDTH,
-                routes::ECASH_VERIFY_OFFLINE_CREDENTIAL,
+                routes::COCONUT_VERIFY_BANDWIDTH_CREDENTIAL,
            ],
            NO_PARAMS,
            request_body,
@@ -400,36 +399,6 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    async fn verify_online_credential(
-        &self,
-        request_body: &OnlineVerifyCredentialBody,
-    ) -> Result<VerifyCredentialResponse, NymAPIError> {
-        self.post_json(
-            &[
-                routes::API_VERSION,
-                routes::COCONUT_ROUTES,
-                routes::BANDWIDTH,
-                routes::ECASH_VERIFY_ONLINE_CREDENTIAL,
-            ],
-            NO_PARAMS,
-            request_body,
-        )
-        .await
-    }
-
-    async fn ecash_parameters(&self) -> Result<EcashParametersResponse, NymAPIError> {
-        self.get_json(
-            &[
-                routes::API_VERSION,
-                routes::COCONUT_ROUTES,
-                routes::BANDWIDTH,
-                routes::ECASH_PARAMETERS,
-            ],
-            NO_PARAMS,
-        )
-        .await
-    }
-
    async fn get_service_providers(&self) -> Result<ServicesListResponse, NymAPIError> {
        log::trace!("Getting service providers");
        self.get_json(&[routes::API_VERSION, routes::SERVICE_PROVIDERS], NO_PARAMS)
@@ -16,9 +16,7 @@ pub const COCONUT_ROUTES: &str = "coconut";
 pub const BANDWIDTH: &str = "bandwidth";

 pub const COCONUT_BLIND_SIGN: &str = "blind-sign";
-pub const ECASH_VERIFY_OFFLINE_CREDENTIAL: &str = "verify-offline-credential";
-pub const ECASH_VERIFY_ONLINE_CREDENTIAL: &str = "verify-online-credential";
-pub const ECASH_PARAMETERS: &str = "ecash-parameters";
+pub const COCONUT_VERIFY_BANDWIDTH_CREDENTIAL: &str = "verify-bandwidth-credential";

 pub const STATUS_ROUTES: &str = "status";
 pub const MIXNODE: &str = "mixnode";
@@ -20,12 +20,12 @@ impl CheckResponse for broadcast::tx_commit::Response {
            });
        }

-        if self.tx_result.code.is_err() {
+        if self.deliver_tx.code.is_err() {
            return Err(NyxdError::BroadcastTxErrorDeliverTx {
                hash: self.hash,
                height: Some(self.height),
-                code: self.tx_result.code.value(),
-                raw_log: self.tx_result.log,
+                code: self.deliver_tx.code.value(),
+                raw_log: self.deliver_tx.log,
            });
        }

@@ -11,7 +11,7 @@ pub mod gas_price;

 pub type GasAdjustment = f32;

-pub const DEFAULT_SIMULATED_GAS_MULTIPLIER: GasAdjustment = 1.5;
+pub const DEFAULT_SIMULATED_GAS_MULTIPLIER: GasAdjustment = 1.3;

 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct AutoFeeGrant {
@@ -34,9 +34,7 @@ pub use crate::nyxd::fee::Fee;
 pub use crate::rpc::TendermintRpcClient;
 pub use coin::Coin;
 pub use cosmrs::bank::MsgSend;
-pub use cosmrs::tendermint::abci::{
-    response::DeliverTx, types::ExecTxResult, Event, EventAttribute,
-};
+pub use cosmrs::tendermint::abci::{response::DeliverTx, Event, EventAttribute};
 pub use cosmrs::tendermint::block::Height;
 pub use cosmrs::tendermint::hash::{self, Algorithm, Hash};
 pub use cosmrs::tendermint::validator::Info as TendermintValidatorInfo;
@@ -28,7 +28,7 @@ where
    U: TryInto<HttpClientUrl, Error = Error>,
 {
    HttpRpcClient::builder(url.try_into()?)
-        .compat_mode(CompatMode::V0_37)
+        .compat_mode(CompatMode::V0_34)
        .build()
 }

@@ -36,8 +36,7 @@ pub struct ReqwestRpcClient {
 impl ReqwestRpcClient {
    pub fn new(url: Url) -> Self {
        ReqwestRpcClient {
-            // after updating to nyxd 0.42 and thus updating to cometbft, the compat mode changed
-            compat: CompatMode::V0_37,
+            compat: CompatMode::V0_34,
            inner: reqwest::Client::new(),
            url,
        }
@@ -21,7 +21,7 @@ rand = {version = "0.6", features = ["std"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { workspace = true }
 thiserror = { workspace = true }
-time = { workspace = true, features = ["parsing", "formatting"] }
+time = { version = "0.3.6", features = ["parsing", "formatting"] }
 toml = "0.5.6"
 url = { workspace = true }
 tap = "1"
@@ -36,14 +36,6 @@ pub async fn execute(args: Args, client: SigningClient) -> anyhow::Result<()> {
        bail!("the loaded config does not have a credentials store information")
    };

-    let Ok(ecash_key_path) = loaded.try_get_ecash_key() else {
-        bail!("the loaded config does not have an ecash key path information")
-    };
-
-    let Ok(ecash_keypair) = nym_pemstore::load_keypair(&ecash_key_path) else {
-        bail!("invalid secret key in the config path")
-    };
-
    println!(
        "using credentials store at '{}'",
        credentials_store.display()
@@ -53,14 +45,7 @@ pub async fn execute(args: Args, client: SigningClient) -> anyhow::Result<()> {
    let coin = Coin::new(args.amount as u128, denom);

    let persistent_storage = initialise_persistent_storage(credentials_store).await;
-    utils::issue_credential(
-        &client,
-        coin,
-        ecash_keypair,
-        &persistent_storage,
-        args.recovery_dir,
-    )
-    .await?;
+    utils::issue_credential(&client, coin, &persistent_storage, args.recovery_dir).await?;

    Ok(())
 }
@@ -123,18 +123,6 @@ impl CommonConfigsWrapper {
        }
    }

-    pub(crate) fn try_get_ecash_key(&self) -> anyhow::Result<nym_pemstore::KeyPairPath> {
-        match self {
-            CommonConfigsWrapper::NymClients(cfg) => {
-                Ok(cfg.storage_paths.inner.keys.ecash_key_pair_path())
-            }
-            CommonConfigsWrapper::NymApi(cfg) => {
-                Ok(cfg.network_monitor.storage_paths.ecash_keypair_path())
-            }
-            CommonConfigsWrapper::Unknown(cfg) => cfg.try_get_ecash_key(),
-        }
-    }
-
    pub(crate) fn try_get_credentials_store(&self) -> anyhow::Result<PathBuf> {
        match self {
            CommonConfigsWrapper::NymClients(cfg) => {
@@ -171,17 +159,6 @@ struct NymApiConfigNetworkMonitorLight {
 #[derive(Deserialize, Debug)]
 struct NetworkMonitorPaths {
    credentials_database_path: PathBuf,
-    ecash_private_key_path: PathBuf,
-    ecash_public_key_path: PathBuf,
-}
-
-impl NetworkMonitorPaths {
-    fn ecash_keypair_path(&self) -> nym_pemstore::KeyPairPath {
-        nym_pemstore::KeyPairPath::new(
-            self.ecash_private_key_path.clone(),
-            self.ecash_public_key_path.clone(),
-        )
-    }
 }

 // a hacky way of reading common data from client configs (native, socks5, etc.)
@@ -238,10 +215,6 @@ impl UnknownConfigWrapper {
        }
    }

-    pub(crate) fn try_get_ecash_key(&self) -> anyhow::Result<nym_pemstore::KeyPairPath> {
-        todo!()
-    }
-
    pub(crate) fn try_get_credentials_store(&self) -> anyhow::Result<PathBuf> {
        let id_val = self
            .find_value("credentials_database_path")
@@ -4,7 +4,7 @@
 use handlebars::{Handlebars, TemplateRenderError};
 use serde::de::DeserializeOwned;
 use serde::Serialize;
-use std::fs::{create_dir_all, File};
+use std::fs::File;
 use std::io::Write;
 use std::path::{Path, PathBuf};
 use std::{fs, io};
@@ -72,22 +72,16 @@ where
    C: NymConfigTemplate,
    P: AsRef<Path>,
 {
-    let path = path.as_ref();
-    log::debug!("trying to save config file to {}", path.display());
+    log::debug!("trying to save config file to {}", path.as_ref().display());
+    let file = File::create(path.as_ref())?;

-    if let Some(parent) = path.parent() {
-        create_dir_all(parent)?;
-    }
-
-    let file = File::create(path)?;
-
-    // TODO: check for whether any of our configs store anything sensitive
+    // TODO: check for whether any of our configs stores anything sensitive
    // and change that to 0o644 instead
    #[cfg(target_family = "unix")]
    {
        use std::os::unix::fs::PermissionsExt;

-        let mut perms = fs::metadata(path)?.permissions();
+        let mut perms = fs::metadata(path.as_ref())?.permissions();
        perms.set_mode(0o600);
        fs::set_permissions(path, perms)?;
    }
@@ -142,7 +142,7 @@ pub fn funds_from_cosmos_msgs(msgs: Vec<CosmosMsg>) -> Option<Coin> {
        contract_addr: _,
        msg,
        funds: _,
-    })) = msgs.first()
+    })) = msgs.get(0)
    {
        if let Ok(ExecuteMsg::ReleaseFunds { funds }) = from_binary::<ExecuteMsg>(msg) {
            return Some(funds);
@@ -62,7 +62,7 @@ pub fn owner_from_cosmos_msgs(msgs: &[CosmosMsg]) -> Option<Addr> {
        contract_addr: _,
        msg,
        funds: _,
-    })) = msgs.first()
+    })) = msgs.get(0)
    {
        if let Ok(ExecuteMsg::VerifyVerificationKeyShare { owner, .. }) =
            from_binary::<ExecuteMsg>(msg)
@@ -3,7 +3,6 @@

 use cosmwasm_schema::cw_serde;
 use cosmwasm_std::Decimal;
-use cosmwasm_std::OverflowError;
 use cosmwasm_std::Uint128;
 use serde::de::Error;
 use serde::{Deserialize, Deserializer};
@@ -72,10 +71,6 @@ impl Percent {
        // we know the cast from u128 to u8 is a safe one since the internal value must be within 0 - 1 range
        truncate_decimal(hundred * self.0).u128() as u8
    }
-
-    pub fn checked_pow(&self, exp: u32) -> Result<Self, OverflowError> {
-        self.0.checked_pow(exp).map(Percent)
-    }
 }

 impl Display for Percent {
@@ -25,12 +25,12 @@ humantime-serde = "1.1.1"

 # TO CHECK WHETHER STILL NEEDED:
 log = { workspace = true }
-time = { workspace = true, features = ["parsing", "formatting"] }
+time = { version = "0.3.6", features = ["parsing", "formatting"] }
 ts-rs = { workspace = true, optional = true }

 [dev-dependencies]
 rand_chacha = "0.3"
-time = { workspace = true, features = ["serde", "macros"] }
+time = { version = "0.3.5", features = ["serde", "macros"] }

 [features]
 default = []
@@ -49,7 +49,7 @@ impl Account {

    pub fn period_duration(&self) -> Result<u64, VestingContractError> {
        self.periods
-            .first()
+            .get(0)
            .ok_or(VestingContractError::UnpopulatedVestingPeriods {
                owner: self.owner_address.clone(),
            })
@@ -1,14 +0,0 @@
-/*
- * Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
- * SPDX-License-Identifier: Apache-2.0
- */
-
-CREATE TABLE ecash_wallets
-(
-    id                  INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-    voucher_info        TEXT    NOT NULL,
-    wallet              TEXT    NOT NULL UNIQUE,
-    value               TEXT    NOT NULL,
-    epoch_id            TEXT    NOT NULL,
-    consumed            BOOLEAN NOT NULL
-);
@@ -1,14 +1,13 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::models::{CoconutCredential, EcashWallet};
+use crate::models::CoconutCredential;
 use std::sync::Arc;
 use tokio::sync::RwLock;

 #[derive(Clone)]
 pub struct CoconutCredentialManager {
    inner: Arc<RwLock<Vec<CoconutCredential>>>,
-    ecash: Arc<RwLock<Vec<EcashWallet>>>,
 }

 impl CoconutCredentialManager {
@@ -16,7 +15,6 @@ impl CoconutCredentialManager {
    pub fn new() -> Self {
        CoconutCredentialManager {
            inner: Arc::new(RwLock::new(Vec::new())),
-            ecash: Arc::new(RwLock::new(Vec::new())),
        }
    }

@@ -52,39 +50,6 @@ impl CoconutCredentialManager {
        });
    }

-    /// Inserts provided signature into the database.
-    ///
-    /// # Arguments
-    ///
-    /// * `voucher_info`: What type of credential it is.
-    /// * `signature`: Ecash wallet credential in the form of a wallet.
-    /// * `value` : The value of the ecash wallet
-    /// * `epoch_id`: The epoch when it was signed.
-    pub async fn insert_ecash_wallet(
-        &self,
-        voucher_info: String,
-        wallet: String,
-        value: String,
-        epoch_id: String,
-    ) {
-        let mut creds = self.ecash.write().await;
-        let id = creds.len() as i64;
-        creds.push(EcashWallet {
-            id,
-            voucher_info,
-            wallet,
-            value,
-            epoch_id,
-            consumed: false,
-        });
-    }
-
-    /// Tries to retrieve one of the stored, unused credentials.
-    pub async fn get_next_ecash_wallet(&self) -> Option<EcashWallet> {
-        let creds = self.ecash.read().await;
-        creds.iter().find(|c| !c.consumed).cloned()
-    }
-
    /// Tries to retrieve one of the stored, unused credentials.
    pub async fn get_next_coconut_credential(&self) -> Option<CoconutCredential> {
        let creds = self.inner.read().await;
@@ -102,12 +67,4 @@ impl CoconutCredentialManager {
            cred.consumed = true;
        }
    }
-
-    pub async fn update_ecash_wallet(&self, wallet: String, id: i64, consumed: bool) {
-        let mut creds = self.ecash.write().await;
-        if let Some(cred) = creds.get_mut(id as usize) {
-            cred.wallet = wallet;
-            cred.consumed = consumed;
-        }
-    }
 }
@@ -1,7 +1,7 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::models::{CoconutCredential, EcashWallet};
+use crate::models::CoconutCredential;

 #[derive(Clone)]
 pub struct CoconutCredentialManager {
@@ -45,41 +45,6 @@ impl CoconutCredentialManager {
        Ok(())
    }

-    /// Inserts provided signature into the database.
-    ///
-    /// # Arguments
-    ///
-    /// * `voucher_info`: What type of credential it is.
-    /// * `signature`: Ecash wallet credential in the form of a wallet.
-    /// * `value` : The value of the ecash wallet
-    /// * `epoch_id`: The epoch when it was signed.
-
-    pub async fn insert_ecash_wallet(
-        &self,
-        voucher_info: String,
-        wallet: String,
-        value: String,
-        epoch_id: String,
-    ) -> Result<(), sqlx::Error> {
-        sqlx::query!(
-            "INSERT INTO ecash_wallets(voucher_info, wallet, value, epoch_id, consumed) VALUES (?, ?, ?, ?, ?)",
-            voucher_info, wallet, value, epoch_id, false
-        )
-        .execute(&self.connection_pool)
-        .await?;
-        Ok(())
-    }
-
-    /// Tries to retrieve one of the stored, unused credentials.
-    pub async fn get_next_ecash_wallet(&self) -> Result<Option<EcashWallet>, sqlx::Error> {
-        sqlx::query_as!(
-            EcashWallet,
-            "SELECT * FROM ecash_wallets WHERE NOT consumed"
-        )
-        .fetch_optional(&self.connection_pool)
-        .await
-    }
-
    /// Tries to retrieve one of the stored, unused credentials.
    pub async fn get_next_coconut_credential(
        &self,
@@ -106,29 +71,4 @@ impl CoconutCredentialManager {
        .await?;
        Ok(())
    }
-
-    /// Consumes in the database the specified credential.
-    ///
-    /// # Arguments
-    ///
-    /// * `wallet` : New wallet string to update with
-    /// * `id`: Database id.
-    /// * `consumed` : If the wallet is entirely consumed
-    ///
-    pub async fn update_ecash_wallet(
-        &self,
-        wallet: String,
-        id: i64,
-        consumed: bool,
-    ) -> Result<(), sqlx::Error> {
-        sqlx::query!(
-            "UPDATE ecash_wallets SET wallet = ?, consumed = ? WHERE id = ?",
-            wallet,
-            consumed,
-            id
-        )
-        .execute(&self.connection_pool)
-        .await?;
-        Ok(())
-    }
 }
@@ -3,7 +3,7 @@

 use crate::backends::memory::CoconutCredentialManager;
 use crate::error::StorageError;
-use crate::models::{CoconutCredential, EcashWallet};
+use crate::models::CoconutCredential;
 use crate::storage::Storage;
 use async_trait::async_trait;

@@ -50,30 +50,6 @@ impl Storage for EphemeralStorage {
        Ok(())
    }

-    async fn insert_ecash_wallet(
-        &self,
-        voucher_info: String,
-        wallet: String,
-        value: String,
-        epoch_id: String,
-    ) -> Result<(), StorageError> {
-        self.coconut_credential_manager
-            .insert_ecash_wallet(voucher_info, wallet, value, epoch_id)
-            .await;
-
-        Ok(())
-    }
-
-    async fn get_next_ecash_wallet(&self) -> Result<EcashWallet, StorageError> {
-        let credential = self
-            .coconut_credential_manager
-            .get_next_ecash_wallet()
-            .await
-            .ok_or(StorageError::NoCredential)?;
-
-        Ok(credential)
-    }
-
    async fn get_next_coconut_credential(&self) -> Result<CoconutCredential, StorageError> {
        let credential = self
            .coconut_credential_manager
@@ -91,16 +67,4 @@ impl Storage for EphemeralStorage {

        Ok(())
    }
-
-    async fn update_ecash_wallet(
-        &self,
-        wallet: String,
-        id: i64,
-        consumed: bool,
-    ) -> Result<(), StorageError> {
-        self.coconut_credential_manager
-            .update_ecash_wallet(wallet, id, consumed)
-            .await;
-        Ok(())
-    }
 }
@@ -13,14 +13,3 @@ pub struct CoconutCredential {
    pub epoch_id: String,
    pub consumed: bool,
 }
-
-#[derive(Clone)]
-pub struct EcashWallet {
-    #[allow(dead_code)]
-    pub id: i64,
-    pub voucher_info: String,
-    pub wallet: String,
-    pub value: String,
-    pub epoch_id: String,
-    pub consumed: bool,
-}
@@ -1,9 +1,9 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

+use crate::backends::sqlite::CoconutCredentialManager;
 use crate::error::StorageError;
 use crate::storage::Storage;
-use crate::{backends::sqlite::CoconutCredentialManager, models::EcashWallet};

 use crate::models::CoconutCredential;
 use async_trait::async_trait;
@@ -81,30 +81,6 @@ impl Storage for PersistentStorage {
        Ok(())
    }

-    async fn insert_ecash_wallet(
-        &self,
-        voucher_info: String,
-        wallet: String,
-        value: String,
-        epoch_id: String,
-    ) -> Result<(), StorageError> {
-        self.coconut_credential_manager
-            .insert_ecash_wallet(voucher_info, wallet, value, epoch_id)
-            .await?;
-
-        Ok(())
-    }
-
-    async fn get_next_ecash_wallet(&self) -> Result<EcashWallet, StorageError> {
-        let credential = self
-            .coconut_credential_manager
-            .get_next_ecash_wallet()
-            .await?
-            .ok_or(StorageError::NoCredential)?;
-
-        Ok(credential)
-    }
-
    async fn get_next_coconut_credential(&self) -> Result<CoconutCredential, StorageError> {
        let credential = self
            .coconut_credential_manager
@@ -122,16 +98,4 @@ impl Storage for PersistentStorage {

        Ok(())
    }
-
-    async fn update_ecash_wallet(
-        &self,
-        wallet: String,
-        id: i64,
-        consumed: bool,
-    ) -> Result<(), StorageError> {
-        self.coconut_credential_manager
-            .update_ecash_wallet(wallet, id, consumed)
-            .await?;
-        Ok(())
-    }
 }
@@ -1,7 +1,7 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::models::{CoconutCredential, EcashWallet};
+use crate::models::CoconutCredential;
 use async_trait::async_trait;
 use std::error::Error;

@@ -29,25 +29,6 @@ pub trait Storage: Send + Sync {
        epoch_id: String,
    ) -> Result<(), Self::StorageError>;

-    /// Inserts provided wallet into the database.
-    ///
-    /// # Arguments
-    ///
-    /// * `voucher_info`: What type of credential it is.
-    /// * `signature`: Ecash wallet credential in the form of a wallet.
-    /// * `value` : The value of the ecash wallet
-    /// * `epoch_id`: The epoch when it was signed.
-    async fn insert_ecash_wallet(
-        &self,
-        voucher_info: String,
-        signature: String,
-        value: String,
-        epoch_id: String,
-    ) -> Result<(), Self::StorageError>;
-
-    /// Tries to retrieve one of the stored, unused credentials.
-    async fn get_next_ecash_wallet(&self) -> Result<EcashWallet, Self::StorageError>;
-
    /// Tries to retrieve one of the stored, unused credentials.
    async fn get_next_coconut_credential(&self) -> Result<CoconutCredential, Self::StorageError>;

@@ -57,19 +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>;
-
-    /// Update in the database the specified credential.
-    ///
-    /// # Arguments
-    ///
-    /// * `wallet` : New Ecash wallet credential
-    /// * `id`: Id of the credential to be updated.
-    /// * `consumed`: if the credential is consumed or not
-    ///
-    async fn update_ecash_wallet(
-        &self,
-        wallet: String,
-        id: i64,
-        consumed: bool,
-    ) -> Result<(), Self::StorageError>;
 }
@@ -16,4 +16,3 @@ nym-credential-storage = { path = "../../common/credential-storage" }
 nym-validator-client = { path = "../../common/client-libs/validator-client" }
 nym-config = { path = "../../common/config" }
 nym-client-core = { path = "../../common/client-core" }
-nym-compact-ecash = { path = "../../common/nym_offline_compact_ecash" }
@@ -3,7 +3,6 @@ use crate::recovery_storage::RecoveryStorage;
 use log::*;
 use nym_bandwidth_controller::acquire::state::State;
 use nym_client_core::config::disk_persistence::CommonClientPaths;
-use nym_compact_ecash::scheme::keygen::KeyPairUser;
 use nym_config::DEFAULT_DATA_DIR;
 use nym_credential_storage::persistent_storage::PersistentStorage;
 use nym_validator_client::nyxd::contract_traits::{CoconutBandwidthSigningClient, DkgQueryClient};
@@ -17,7 +16,6 @@ const SAFETY_BUFFER_SECS: u64 = 60; // 1 minute
 pub async fn issue_credential<C>(
    client: &C,
    amount: Coin,
-    ecash_keypair: KeyPairUser,
    persistent_storage: &PersistentStorage,
    recovery_storage_path: PathBuf,
 ) -> Result<()>
@@ -41,8 +39,7 @@ where
        }
    };

-    let state =
-        nym_bandwidth_controller::acquire::deposit(client, amount.clone(), ecash_keypair).await?;
+    let state = nym_bandwidth_controller::acquire::deposit(client, amount.clone()).await?;

    if nym_bandwidth_controller::acquire::get_credential(&state, client, persistent_storage)
        .await
@@ -13,7 +13,6 @@ log = { workspace = true }

 # I guess temporarily until we get serde support in coconut up and running
 nym-coconut-interface = { path = "../coconut-interface" }
-nym-compact-ecash = { path = "../nym_offline_compact_ecash" }
 nym-crypto = { path = "../crypto", features = ["rand", "asymmetric", "symmetric", "hashing"] }
 nym-api-requests = { path = "../../nym-api/nym-api-requests" }
 nym-validator-client = { path = "../client-libs/validator-client", default-features = false }
@@ -8,16 +8,13 @@

 use cosmrs::tendermint::hash::Algorithm;
 use cosmrs::tendermint::Hash;
-use nym_compact_ecash::{
-    scheme::{
-        keygen::KeyPairUser,
-        withdrawal::{RequestInfo, WithdrawalRequest},
-    },
-    setup::GroupParameters,
-    withdrawal_request,
+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 super::utils::prepare_credential_for_spending;
 use crate::error::Error;

 pub const PUBLIC_ATTRIBUTES: u32 = 2;
@@ -25,8 +22,16 @@ pub const PRIVATE_ATTRIBUTES: u32 = 2;
 pub const TOTAL_ATTRIBUTES: u32 = PUBLIC_ATTRIBUTES + PRIVATE_ATTRIBUTES;

 pub struct BandwidthVoucher {
+    // 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,
+    // the value (e.g., bandwidth) encoded in this voucher
+    voucher_value: PublicAttribute,
    // the plain text value (e.g., bandwidth) encoded in this voucher
    voucher_value_plain: String,
+    // a field with public information, e.g., type of voucher, interval etc.
+    voucher_info: PublicAttribute,
    // the plain text information
    voucher_info_plain: String,
    // the hash of the deposit transaction
@@ -35,109 +40,121 @@ pub struct BandwidthVoucher {
    signing_key: identity::PrivateKey,
    // base58 encoded private key ensuring only this client receives the signature share
    encryption_key: encryption::PrivateKey,
-    ecash_keypair: KeyPairUser,
-    withdrawal_request_info: RequestInfo,
-    withdrawal_request: WithdrawalRequest,
+    pedersen_commitments_openings: Vec<Attribute>,
+    blind_sign_request: BlindSignRequest,
 }

 impl BandwidthVoucher {
    pub fn new(
-        params: &GroupParameters,
+        params: &Parameters,
        voucher_value: String,
        voucher_info: String,
        tx_hash: Hash,
        signing_key: identity::PrivateKey,
        encryption_key: encryption::PrivateKey,
-        ecash_keypair: KeyPairUser,
    ) -> 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 (withdrawal_request, withdrawal_request_info) =
-            withdrawal_request(params, &ecash_keypair.secret_key()).unwrap();
+        let voucher_value = hash_to_scalar(voucher_value.as_bytes());
+        let voucher_info = hash_to_scalar(voucher_info.as_bytes());
+        let (pedersen_commitments_openings, blind_sign_request) = prepare_blind_sign(
+            params,
+            &[serial_number, binding_number],
+            &[voucher_value, voucher_info],
+        )
+        .unwrap();
        BandwidthVoucher {
+            serial_number,
+            binding_number,
+            voucher_value,
            voucher_value_plain,
+            voucher_info,
            voucher_info_plain,
            tx_hash,
            signing_key,
            encryption_key,
-            ecash_keypair,
-            withdrawal_request_info,
-            withdrawal_request,
+            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.encryption_key.to_bytes();
-        let ecash_key_b = self.ecash_keypair.to_bytes();
-        let withdrawal_request_b = self.withdrawal_request.to_bytes();
-        let withdrawal_request_info_b = self.withdrawal_request_info.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(&ecash_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(&(withdrawal_request_b.len() as u64).to_be_bytes());
-        ret.extend_from_slice(&(withdrawal_request_info_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(&withdrawal_request_b);
-        ret.extend_from_slice(&withdrawal_request_info_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 * 3 + 80 + 4 * 8 {
+        if bytes.len() < 32 * 5 + 4 * 8 {
            return Err(Error::BandwidthVoucherDeserializationError(format!(
                "Less then {} bytes needed",
-                32 * 3 + 80 + 4 * 8
+                32 * 5 + 4 * 8
            )));
        }
        let mut buff = [0u8; 32];
        let mut small_buff = [0u8; 8];
-
-        buff.copy_from_slice(&bytes[0..32]);
+        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[32..2 * 32]);
+        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[2 * 32..3 * 32]);
+        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"))
        })?;
-
-        //ecash key
-        let ecash_keypair = KeyPairUser::from_bytes(&bytes[3 * 32..3 * 32 + 80])?;
-
-        small_buff.copy_from_slice(&bytes[3 * 32 + 80..3 * 32 + 80 + 8]);
+        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[3 * 32 + 80 + 8..3 * 32 + 80 + 2 * 8]);
+        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[3 * 32 + 80 + 2 * 8..3 * 32 + 80 + 3 * 8]);
-        let withdrawal_request_no = u64::from_be_bytes(small_buff) as usize;
-        small_buff.copy_from_slice(&bytes[3 * 32 + 80 + 3 * 8..3 * 32 + 80 + 4 * 8]);
-        let withdrawal_request_info_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 * 3
-            + 80
+        let total_length = 32 * 5
            + 4 * 8
            + voucher_value_plain_no
            + voucher_info_plain_no
-            + withdrawal_request_no
-            + withdrawal_request_info_no;
+            + blind_sign_request_no
+            + pedersen_commitments_openings_no * 32;
        if bytes.len() != total_length {
            return Err(Error::BandwidthVoucherDeserializationError(format!(
                "Expected {total_length} bytes",
@@ -149,58 +166,74 @@ impl BandwidthVoucher {
                "Invalid UTF8 string",
            )))
        };
-        let mut var_length_pointer = 32 * 3 + 80 + 4 * 8;
+        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 = 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 = hash_to_scalar(&voucher_info_plain);
        var_length_pointer += voucher_info_plain_no;
-
-        let withdrawal_request = WithdrawalRequest::try_from(
-            &bytes[var_length_pointer..var_length_pointer + withdrawal_request_no],
+        let blind_sign_request = BlindSignRequest::from_bytes(
+            &bytes[var_length_pointer..var_length_pointer + blind_sign_request_no],
        )?;
-        var_length_pointer += withdrawal_request_no;
+        var_length_pointer += blind_sign_request_no;

-        let withdrawal_request_info = RequestInfo::try_from(
-            &bytes[var_length_pointer..var_length_pointer + withdrawal_request_info_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,
            voucher_value_plain,
+            voucher_info,
            voucher_info_plain,
            tx_hash,
            signing_key,
            encryption_key,
-            ecash_keypair,
-            withdrawal_request,
-            withdrawal_request_info,
+            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, self.voucher_info]
+    }
+
    pub fn encryption_key(&self) -> &encryption::PrivateKey {
        &self.encryption_key
    }

-    pub fn ecash_keypair(&self) -> &KeyPairUser {
-        &self.ecash_keypair
+    pub fn pedersen_commitments_openings(&self) -> &Vec<Attribute> {
+        &self.pedersen_commitments_openings
    }

-    pub fn withdrawal_request(&self) -> &WithdrawalRequest {
-        &self.withdrawal_request
-    }
-
-    pub fn withdrawal_request_info(&self) -> &RequestInfo {
-        &self.withdrawal_request_info
+    pub fn blind_sign_request(&self) -> &BlindSignRequest {
+        &self.blind_sign_request
    }

    pub fn get_voucher_value(&self) -> String {
@@ -214,22 +247,49 @@ impl BandwidthVoucher {
        ]
    }

-    pub fn sign(&self, request: &WithdrawalRequest) -> identity::Signature {
+    pub fn get_private_attributes(&self) -> Vec<PrivateAttribute> {
+        vec![self.serial_number, self.binding_number]
+    }
+
+    pub fn sign(&self, request: &BlindSignRequest) -> identity::Signature {
        let mut message = request.to_bytes();
        message.extend_from_slice(self.tx_hash.to_string().as_bytes());
        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(TOTAL_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_compact_ecash::{generate_keypair_user, Base58};
+    use nym_coconut_interface::Base58;
    use rand::rngs::OsRng;

    fn voucher_fixture() -> BandwidthVoucher {
-        let params = GroupParameters::new().unwrap();
+        let params = Parameters::new(4).unwrap();
        let mut rng = OsRng;
        BandwidthVoucher::new(
            &params,
@@ -246,7 +306,6 @@ mod test {
                &encryption::KeyPair::new(&mut rng).private_key().to_bytes(),
            )
            .unwrap(),
-            generate_keypair_user(&params),
        )
    }

@@ -255,10 +314,14 @@ mod test {
        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, deserialized_voucher.voucher_value);
        assert_eq!(
            voucher.voucher_value_plain,
            deserialized_voucher.voucher_value_plain
        );
+        assert_eq!(voucher.voucher_info, deserialized_voucher.voucher_info);
        assert_eq!(
            voucher.voucher_info_plain,
            deserialized_voucher.voucher_info_plain
@@ -273,12 +336,51 @@ mod test {
            deserialized_voucher.encryption_key.to_string()
        );
        assert_eq!(
-            voucher.withdrawal_request_info.to_bytes(),
-            deserialized_voucher.withdrawal_request_info.to_bytes()
+            voucher.pedersen_commitments_openings,
+            deserialized_voucher.pedersen_commitments_openings
        );
        assert_eq!(
-            voucher.withdrawal_request.to_bs58(),
-            deserialized_voucher.withdrawal_request.to_bs58()
+            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()
+        ));
+    }
 }
@@ -1,17 +1,14 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::coconut::bandwidth::BandwidthVoucher;
+use crate::coconut::bandwidth::{BandwidthVoucher, PRIVATE_ATTRIBUTES, PUBLIC_ATTRIBUTES};
 use crate::coconut::params::{NymApiCredentialEncryptionAlgorithm, NymApiCredentialHkdfAlgorithm};
 use crate::error::Error;
 use log::{debug, warn};
 use nym_api_requests::coconut::BlindSignRequestBody;
-use nym_compact_ecash::scheme::Wallet;
-use nym_compact_ecash::setup::GroupParameters;
-use nym_compact_ecash::utils::BlindedSignature;
-use nym_compact_ecash::{
-    aggregate_verification_keys, aggregate_wallets, issue_verify, PartialWallet,
-    VerificationKeyAuth,
+use nym_coconut_interface::{
+    aggregate_signature_shares, aggregate_verification_keys, prove_bandwidth_credential, Attribute,
+    BlindedSignature, Credential, Parameters, Signature, SignatureShare, VerificationKey,
 };
 use nym_crypto::asymmetric::encryption::PublicKey;
 use nym_crypto::shared_key::recompute_shared_key;
@@ -20,7 +17,7 @@ use nym_validator_client::client::CoconutApiClient;

 pub async fn obtain_aggregate_verification_key(
    api_clients: &[CoconutApiClient],
-) -> Result<VerificationKeyAuth, Error> {
+) -> Result<VerificationKey, Error> {
    if api_clients.is_empty() {
        return Err(Error::NoValidatorsAvailable);
    }
@@ -38,24 +35,23 @@ pub async fn obtain_aggregate_verification_key(
 }

 async fn obtain_partial_credential(
-    params: &GroupParameters,
+    params: &Parameters,
    attributes: &BandwidthVoucher,
    client: &nym_validator_client::client::NymApiClient,
-    validator_vk: &VerificationKeyAuth,
-) -> Result<PartialWallet, Error> {
-    //let public_attributes = attributes.get_public_attributes();
+    validator_vk: &VerificationKey,
+) -> Result<Signature, Error> {
+    let public_attributes = attributes.get_public_attributes();
    let public_attributes_plain = attributes.get_public_attributes_plain();
-    //let private_attributes = attributes.get_private_attributes();
-    let withdrawal_request = attributes.withdrawal_request();
+    let private_attributes = attributes.get_private_attributes();
+    let blind_sign_request = attributes.blind_sign_request();

    let blind_sign_request_body = BlindSignRequestBody::new(
-        withdrawal_request,
+        blind_sign_request,
        attributes.tx_hash().to_string(),
-        attributes.sign(withdrawal_request).to_base58_string(),
-        attributes.ecash_keypair().public_key().to_base58_string(),
-        // &public_attributes,
-        public_attributes_plain.clone(),
-        (public_attributes_plain.len()) as u32,
+        attributes.sign(blind_sign_request).to_base58_string(),
+        &public_attributes,
+        public_attributes_plain,
+        (public_attributes.len() + private_attributes.len()) as u32,
    );
    let response = client.blind_sign(&blind_sign_request_body).await?;
    let encrypted_signature = response.encrypted_signature;
@@ -74,42 +70,43 @@ async fn obtain_partial_credential(

    let blinded_signature = BlindedSignature::from_bytes(&blinded_signature_bytes)?;

-    let unblinded_signature = issue_verify(
+    let unblinded_signature = blinded_signature.unblind(
        params,
        validator_vk,
-        &attributes.ecash_keypair().secret_key(),
-        &blinded_signature,
-        attributes.withdrawal_request_info(),
+        &private_attributes,
+        &public_attributes,
+        &blind_sign_request.get_commitment_hash(),
+        attributes.pedersen_commitments_openings(),
    )?;

    Ok(unblinded_signature)
 }

 pub async fn obtain_aggregate_signature(
-    params: &GroupParameters,
+    params: &Parameters,
    attributes: &BandwidthVoucher,
-    ecash_api_clients: &[CoconutApiClient],
+    coconut_api_clients: &[CoconutApiClient],
    threshold: u64,
-) -> Result<Wallet, Error> {
-    if ecash_api_clients.is_empty() {
+) -> Result<Signature, Error> {
+    if coconut_api_clients.is_empty() {
        return Err(Error::NoValidatorsAvailable);
    }
-    //let public_attributes = attributes.get_public_attributes();
-    //let private_attributes = attributes.get_private_attributes();
+    let public_attributes = attributes.get_public_attributes();
+    let private_attributes = attributes.get_private_attributes();

-    let mut wallets = Vec::with_capacity(ecash_api_clients.len());
-    let validators_partial_vks: Vec<_> = ecash_api_clients
+    let mut shares = Vec::with_capacity(coconut_api_clients.len());
+    let validators_partial_vks: Vec<_> = coconut_api_clients
        .iter()
        .map(|api_client| api_client.verification_key.clone())
        .collect();
-    let indices: Vec<_> = ecash_api_clients
+    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 ecash_api_clients.iter() {
+    for coconut_api_client in coconut_api_clients.iter() {
        debug!(
            "attempting to obtain partial credential from {}",
            coconut_api_client.api_client.api_url()
@@ -123,7 +120,10 @@ pub async fn obtain_aggregate_signature(
        )
        .await
        {
-            Ok(wallet) => wallets.push(wallet),
+            Ok(signature) => {
+                let share = SignatureShare::new(signature, coconut_api_client.node_id);
+                shares.push(share)
+            }
            Err(err) => {
                warn!(
                    "failed to obtain partial credential from {}: {err}",
@@ -132,49 +132,43 @@ pub async fn obtain_aggregate_signature(
            }
        };
    }
-    if wallets.len() < threshold as usize {
+    if shares.len() < threshold as usize {
        return Err(Error::NotEnoughShares);
    }

-    // let mut attributes = Vec::with_capacity(private_attributes.len() + public_attributes.len());
-    // attributes.extend_from_slice(&private_attributes);
-    // attributes.extend_from_slice(&public_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_wallets(
-        params,
-        &verification_key,
-        &attributes.ecash_keypair().secret_key(),
-        &wallets,
-        attributes.withdrawal_request_info(),
-    )
-    .map_err(Error::CompactEcashError)
+    aggregate_signature_shares(params, &verification_key, &attributes, &shares)
+        .map_err(Error::SignatureAggregationError)
 }

 // TODO: better type flow
-// #[allow(clippy::too_many_arguments)]
-// pub fn prepare_credential_for_spending(
-//     params: &nym_coconut_interface::Parameters,
-//     voucher_value: u64,
-//     voucher_info: String,
-//     serial_number: nym_coconut_interface::Attribute,
-//     binding_number: nym_coconut_interface::Attribute,
-//     epoch_id: u64,
-//     signature: &nym_coconut_interface::Signature,
-//     verification_key: &nym_coconut_interface::VerificationKey,
-// ) -> Result<nym_coconut_interface::Credential, Error> {
-//     let theta = nym_coconut_interface::prove_bandwidth_credential(
-//         params,
-//         verification_key,
-//         signature,
-//         serial_number,
-//         binding_number,
-//     )?;
+#[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,
+    )?;

-//     Ok(nym_coconut_interface::Credential::new(
-//         PUBLIC_ATTRIBUTES + PRIVATE_ATTRIBUTES,
-//         theta,
-//         voucher_value,
-//         voucher_info,
-//         epoch_id,
-//     ))
-// }
+    Ok(Credential::new(
+        PUBLIC_ATTRIBUTES + PRIVATE_ATTRIBUTES,
+        theta,
+        voucher_value,
+        voucher_info,
+        epoch_id,
+    ))
+}
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0

 use nym_coconut_interface::CoconutError;
-use nym_compact_ecash::error::CompactEcashError;
 use nym_crypto::asymmetric::encryption::KeyRecoveryError;
 use nym_validator_client::ValidatorClientError;

@@ -22,9 +21,6 @@ pub enum Error {
    #[error("Ran into a coconut error - {0}")]
    CoconutError(#[from] CoconutError),

-    #[error("Ran into a Compact ecash error - {0}")]
-    CompactEcashError(#[from] CompactEcashError),
-
    #[error("Ran into a validator client error - {0}")]
    ValidatorClientError(#[from] ValidatorClientError),

@@ -366,7 +366,11 @@ pub fn creating_proof_of_chunking_for_100_parties(c: &mut Criterion) {
        .map(|&node_index| polynomial.evaluate_at(&Scalar::from(node_index)).into())
        .collect::<Vec<_>>();

-    let remote_share_key_pairs = shares.iter().zip(receivers.values()).collect::<Vec<_>>();
+    let remote_share_key_pairs = shares
+        .iter()
+        .zip(receivers.values())
+        .map(|(share, key)| (share, key))
+        .collect::<Vec<_>>();
    let ordered_public_keys = receivers.values().copied().collect::<Vec<_>>();

    let (ciphertexts, hazmat) = encrypt_shares(&remote_share_key_pairs, &params, &mut rng);
@@ -396,7 +400,11 @@ pub fn verifying_proof_of_chunking_for_100_parties(c: &mut Criterion) {
        .map(|&node_index| polynomial.evaluate_at(&Scalar::from(node_index)).into())
        .collect::<Vec<_>>();

-    let remote_share_key_pairs = shares.iter().zip(receivers.values()).collect::<Vec<_>>();
+    let remote_share_key_pairs = shares
+        .iter()
+        .zip(receivers.values())
+        .map(|(share, key)| (share, key))
+        .collect::<Vec<_>>();
    let ordered_public_keys = receivers.values().copied().collect::<Vec<_>>();

    let (ciphertexts, hazmat) = encrypt_shares(&remote_share_key_pairs, &params, &mut rng);
@@ -428,7 +436,11 @@ pub fn creating_proof_of_secret_sharing_for_100_parties(c: &mut Criterion) {
        .map(|&node_index| polynomial.evaluate_at(&Scalar::from(node_index)).into())
        .collect::<Vec<_>>();

-    let remote_share_key_pairs = shares.iter().zip(receivers.values()).collect::<Vec<_>>();
+    let remote_share_key_pairs = shares
+        .iter()
+        .zip(receivers.values())
+        .map(|(share, key)| (share, key))
+        .collect::<Vec<_>>();

    let (ciphertexts, hazmat) = encrypt_shares(&remote_share_key_pairs, &params, &mut rng);

@@ -466,7 +478,11 @@ pub fn verifying_proof_of_secret_sharing_for_100_parties(c: &mut Criterion) {
        .map(|&node_index| polynomial.evaluate_at(&Scalar::from(node_index)).into())
        .collect::<Vec<_>>();

-    let remote_share_key_pairs = shares.iter().zip(receivers.values()).collect::<Vec<_>>();
+    let remote_share_key_pairs = shares
+        .iter()
+        .zip(receivers.values())
+        .map(|(share, key)| (share, key))
+        .collect::<Vec<_>>();

    let (ciphertexts, hazmat) = encrypt_shares(&remote_share_key_pairs, &params, &mut rng);

@@ -529,7 +545,11 @@ pub fn share_encryption_100(c: &mut Criterion) {
        .map(|&node_index| polynomial.evaluate_at(&Scalar::from(node_index)).into())
        .collect::<Vec<_>>();

-    let remote_share_key_pairs = shares.iter().zip(receivers.values()).collect::<Vec<_>>();
+    let remote_share_key_pairs = shares
+        .iter()
+        .zip(receivers.values())
+        .map(|(share, key)| (share, key))
+        .collect::<Vec<_>>();

    c.bench_function("100 shares encryption", |b| {
        b.iter(|| black_box(encrypt_shares(&remote_share_key_pairs, &params, &mut rng)))
@@ -115,7 +115,11 @@ impl Dealing {
            .map(|&node_index| polynomial.evaluate_at(&Scalar::from(node_index)).into())
            .collect::<Vec<_>>();

-        let remote_share_key_pairs = shares.iter().zip(receivers.values()).collect::<Vec<_>>();
+        let remote_share_key_pairs = shares
+            .iter()
+            .zip(receivers.values())
+            .map(|(share, key)| (share, key))
+            .collect::<Vec<_>>();
        let ordered_public_keys = receivers.values().copied().collect::<Vec<_>>();

        let (ciphertexts, hazmat) = encrypt_shares(&remote_share_key_pairs, params, &mut rng);
@@ -11,7 +11,7 @@ use thiserror::Error;
 use tracing::warn;
 use url::Url;

-pub const DEFAULT_TIMEOUT: Duration = Duration::from_secs(6);
+pub const DEFAULT_TIMEOUT: Duration = Duration::from_secs(10);

 pub type PathSegments<'a> = &'a [&'a str];
 pub type Params<'a, K, V> = &'a [(K, V)];
@@ -1,19 +0,0 @@
-[package]
-name = "nym-ip-packet-requests"
-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]
-bincode = "1.3.3"
-bytes = "1.5.0"
-nym-sphinx = { path = "../nymsphinx" }
-rand = "0.8.5"
-serde = { workspace = true, features = ["derive"] }
-thiserror = { workspace = true }
@@ -1,383 +0,0 @@
-use std::net::IpAddr;
-
-use nym_sphinx::addressing::clients::Recipient;
-use serde::{Deserialize, Serialize};
-
-pub const CURRENT_VERSION: u8 = 1;
-
-fn generate_random() -> u64 {
-    use rand::RngCore;
-    let mut rng = rand::rngs::OsRng;
-    rng.next_u64()
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct IpPacketRequest {
-    pub version: u8,
-    pub data: IpPacketRequestData,
-}
-
-impl IpPacketRequest {
-    pub fn new_static_connect_request(
-        ip: IpAddr,
-        reply_to: Recipient,
-        reply_to_hops: Option<u8>,
-        reply_to_avg_mix_delays: Option<f64>,
-    ) -> (Self, u64) {
-        let request_id = generate_random();
-        (
-            Self {
-                version: CURRENT_VERSION,
-                data: IpPacketRequestData::StaticConnect(StaticConnectRequest {
-                    request_id,
-                    ip,
-                    reply_to,
-                    reply_to_hops,
-                    reply_to_avg_mix_delays,
-                }),
-            },
-            request_id,
-        )
-    }
-
-    pub fn new_dynamic_connect_request(
-        reply_to: Recipient,
-        reply_to_hops: Option<u8>,
-        reply_to_avg_mix_delays: Option<f64>,
-    ) -> (Self, u64) {
-        let request_id = generate_random();
-        (
-            Self {
-                version: CURRENT_VERSION,
-                data: IpPacketRequestData::DynamicConnect(DynamicConnectRequest {
-                    request_id,
-                    reply_to,
-                    reply_to_hops,
-                    reply_to_avg_mix_delays,
-                }),
-            },
-            request_id,
-        )
-    }
-
-    pub fn new_ip_packet(ip_packet: bytes::Bytes) -> Self {
-        Self {
-            version: CURRENT_VERSION,
-            data: IpPacketRequestData::Data(DataRequest { ip_packet }),
-        }
-    }
-
-    pub fn id(&self) -> Option<u64> {
-        match &self.data {
-            IpPacketRequestData::StaticConnect(request) => Some(request.request_id),
-            IpPacketRequestData::DynamicConnect(request) => Some(request.request_id),
-            IpPacketRequestData::Data(_) => None,
-        }
-    }
-
-    pub fn recipient(&self) -> Option<&Recipient> {
-        match &self.data {
-            IpPacketRequestData::StaticConnect(request) => Some(&request.reply_to),
-            IpPacketRequestData::DynamicConnect(request) => Some(&request.reply_to),
-            IpPacketRequestData::Data(_) => None,
-        }
-    }
-
-    pub fn to_bytes(&self) -> Result<Vec<u8>, bincode::Error> {
-        use bincode::Options;
-        make_bincode_serializer().serialize(self)
-    }
-
-    pub fn from_reconstructed_message(
-        message: &nym_sphinx::receiver::ReconstructedMessage,
-    ) -> Result<Self, bincode::Error> {
-        use bincode::Options;
-        make_bincode_serializer().deserialize(&message.message)
-    }
-}
-
-#[allow(clippy::large_enum_variant)]
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
-pub enum IpPacketRequestData {
-    StaticConnect(StaticConnectRequest),
-    DynamicConnect(DynamicConnectRequest),
-    Data(DataRequest),
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
-pub struct StaticConnectRequest {
-    pub request_id: u64,
-    pub ip: IpAddr,
-    // The nym-address the response should be sent back to
-    pub reply_to: Recipient,
-    // The number of mix node hops that responses should take, in addition to the entry and exit
-    // node. Zero means only client -> entry -> exit -> client.
-    pub reply_to_hops: Option<u8>,
-    // The average delay at each mix node, in milliseconds. Currently this is not supported by the
-    // ip packet router.
-    pub reply_to_avg_mix_delays: Option<f64>,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
-pub struct DynamicConnectRequest {
-    pub request_id: u64,
-    // The nym-address the response should be sent back to
-    pub reply_to: Recipient,
-    // The number of mix node hops that responses should take, in addition to the entry and exit
-    // node. Zero means only client -> entry -> exit -> client.
-    pub reply_to_hops: Option<u8>,
-    // The average delay at each mix node, in milliseconds. Currently this is not supported by the
-    // ip packet router.
-    pub reply_to_avg_mix_delays: Option<f64>,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
-pub struct DataRequest {
-    pub ip_packet: bytes::Bytes,
-}
-
-// ---
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct IpPacketResponse {
-    pub version: u8,
-    pub data: IpPacketResponseData,
-}
-
-impl IpPacketResponse {
-    pub fn new_static_connect_success(request_id: u64, reply_to: Recipient) -> Self {
-        Self {
-            version: CURRENT_VERSION,
-            data: IpPacketResponseData::StaticConnect(StaticConnectResponse {
-                request_id,
-                reply_to,
-                reply: StaticConnectResponseReply::Success,
-            }),
-        }
-    }
-
-    pub fn new_static_connect_failure(
-        request_id: u64,
-        reply_to: Recipient,
-        reason: StaticConnectFailureReason,
-    ) -> Self {
-        Self {
-            version: CURRENT_VERSION,
-            data: IpPacketResponseData::StaticConnect(StaticConnectResponse {
-                request_id,
-                reply_to,
-                reply: StaticConnectResponseReply::Failure(reason),
-            }),
-        }
-    }
-
-    pub fn new_dynamic_connect_success(request_id: u64, reply_to: Recipient, ip: IpAddr) -> Self {
-        Self {
-            version: CURRENT_VERSION,
-            data: IpPacketResponseData::DynamicConnect(DynamicConnectResponse {
-                request_id,
-                reply_to,
-                reply: DynamicConnectResponseReply::Success(DynamicConnectSuccess { ip }),
-            }),
-        }
-    }
-
-    pub fn new_dynamic_connect_failure(
-        request_id: u64,
-        reply_to: Recipient,
-        reason: DynamicConnectFailureReason,
-    ) -> Self {
-        Self {
-            version: CURRENT_VERSION,
-            data: IpPacketResponseData::DynamicConnect(DynamicConnectResponse {
-                request_id,
-                reply_to,
-                reply: DynamicConnectResponseReply::Failure(reason),
-            }),
-        }
-    }
-
-    pub fn new_ip_packet(ip_packet: bytes::Bytes) -> Self {
-        Self {
-            version: CURRENT_VERSION,
-            data: IpPacketResponseData::Data(DataResponse { ip_packet }),
-        }
-    }
-
-    pub fn id(&self) -> Option<u64> {
-        match &self.data {
-            IpPacketResponseData::StaticConnect(response) => Some(response.request_id),
-            IpPacketResponseData::DynamicConnect(response) => Some(response.request_id),
-            IpPacketResponseData::Data(_) => None,
-        }
-    }
-
-    pub fn recipient(&self) -> Option<&Recipient> {
-        match &self.data {
-            IpPacketResponseData::StaticConnect(response) => Some(&response.reply_to),
-            IpPacketResponseData::DynamicConnect(response) => Some(&response.reply_to),
-            IpPacketResponseData::Data(_) => None,
-        }
-    }
-
-    pub fn to_bytes(&self) -> Result<Vec<u8>, bincode::Error> {
-        use bincode::Options;
-        make_bincode_serializer().serialize(self)
-    }
-
-    pub fn from_reconstructed_message(
-        message: &nym_sphinx::receiver::ReconstructedMessage,
-    ) -> Result<Self, bincode::Error> {
-        use bincode::Options;
-        make_bincode_serializer().deserialize(&message.message)
-    }
-}
-
-#[allow(clippy::large_enum_variant)]
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub enum IpPacketResponseData {
-    StaticConnect(StaticConnectResponse),
-    DynamicConnect(DynamicConnectResponse),
-    Data(DataResponse),
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct StaticConnectResponse {
-    pub request_id: u64,
-    pub reply_to: Recipient,
-    pub reply: StaticConnectResponseReply,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub enum StaticConnectResponseReply {
-    Success,
-    Failure(StaticConnectFailureReason),
-}
-
-impl StaticConnectResponseReply {
-    pub fn is_success(&self) -> bool {
-        match self {
-            StaticConnectResponseReply::Success => true,
-            StaticConnectResponseReply::Failure(_) => false,
-        }
-    }
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, thiserror::Error)]
-pub enum StaticConnectFailureReason {
-    #[error("requested ip address is already in use")]
-    RequestedIpAlreadyInUse,
-    #[error("requested nym-address is already in use")]
-    RequestedNymAddressAlreadyInUse,
-    #[error("{0}")]
-    Other(String),
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct DynamicConnectResponse {
-    pub request_id: u64,
-    pub reply_to: Recipient,
-    pub reply: DynamicConnectResponseReply,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub enum DynamicConnectResponseReply {
-    Success(DynamicConnectSuccess),
-    Failure(DynamicConnectFailureReason),
-}
-
-impl DynamicConnectResponseReply {
-    pub fn is_success(&self) -> bool {
-        match self {
-            DynamicConnectResponseReply::Success(_) => true,
-            DynamicConnectResponseReply::Failure(_) => false,
-        }
-    }
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct DynamicConnectSuccess {
-    pub ip: IpAddr,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, thiserror::Error)]
-pub enum DynamicConnectFailureReason {
-    #[error("requested nym-address is already in use")]
-    RequestedNymAddressAlreadyInUse,
-    #[error("no available ip address")]
-    NoAvailableIp,
-    #[error("{0}")]
-    Other(String),
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct DataResponse {
-    pub ip_packet: bytes::Bytes,
-}
-
-fn make_bincode_serializer() -> impl bincode::Options {
-    use bincode::Options;
-    bincode::DefaultOptions::new()
-        .with_big_endian()
-        .with_varint_encoding()
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn check_size_of_request() {
-        let connect = IpPacketRequest {
-            version: 4,
-            data: IpPacketRequestData::StaticConnect(
-                StaticConnectRequest {
-                    request_id: 123,
-                    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,
-                },
-            )
-        };
-        assert_eq!(connect.to_bytes().unwrap().len(), 107);
-    }
-
-    #[test]
-    fn check_size_of_data() {
-        let data = IpPacketRequest {
-            version: 4,
-            data: IpPacketRequestData::Data(DataRequest {
-                ip_packet: bytes::Bytes::from(vec![1u8; 32]),
-            }),
-        };
-        assert_eq!(data.to_bytes().unwrap().len(), 35);
-    }
-
-    #[test]
-    fn serialize_and_deserialize_data_request() {
-        let data = IpPacketRequest {
-            version: 4,
-            data: IpPacketRequestData::Data(DataRequest {
-                ip_packet: bytes::Bytes::from(vec![1, 2, 4, 2, 5]),
-            }),
-        };
-
-        let serialized = data.to_bytes().unwrap();
-        let deserialized = IpPacketRequest::from_reconstructed_message(
-            &nym_sphinx::receiver::ReconstructedMessage {
-                message: serialized,
-                sender_tag: None,
-            },
-        )
-        .unwrap();
-
-        assert_eq!(deserialized.version, 4);
-        assert_eq!(
-            deserialized.data,
-            IpPacketRequestData::Data(DataRequest {
-                ip_packet: bytes::Bytes::from(vec![1, 2, 4, 2, 5]),
-            })
-        );
-    }
-}
@@ -434,8 +434,6 @@ pub const BANDWIDTH_VALUE: u64 = UTOKENS_TO_BURN * BYTES_PER_UTOKEN;

 pub const VOUCHER_INFO: &str = "BandwidthVoucher";

-pub const ECASH_INFO: &str = "TicketBook";
-
 pub const ETH_MIN_BLOCK_DEPTH: usize = 7;

 /// Defaults Cosmos Hub/ATOM path
@@ -478,11 +476,3 @@ pub const DEFAULT_NYM_NODE_HTTP_PORT: u16 = 8080;
 pub const TOTAL_SUPPLY: u128 = 1_000_000_000_000_000;

 pub const DEFAULT_PROFIT_MARGIN: u8 = 10;
-
-// WIREGUARD
-pub const WG_PORT: u16 = 51822;
-
-// The interface used to route traffic
-pub const WG_TUN_BASE_NAME: &str = "nymwg";
-pub const WG_TUN_DEVICE_ADDRESS: &str = "10.1.0.1";
-pub const WG_TUN_DEVICE_NETMASK: &str = "255.255.255.0";
@@ -258,7 +258,6 @@ where
            &address,
            &address,
            PacketType::Mix,
-            None,
        )?)
    }

@@ -1,34 +0,0 @@
-[package]
-name = "nym-compact-ecash"
-version = "0.1.0"
-authors = ["Ania Piotrowska <ania@nymtech.net>"]
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-bls12_381 = { workspace = true }
-bs58 = "0.4.0"
-chrono = "0.4.19"
-digest = "0.9"
-ff = { workspace = true }
-getset = "0.1.1"
-group = { workspace = true }
-itertools = "0.10"
-rand = "0.8"
-serde = "1.0.189"
-sha2 = "0.9"
-thiserror = "1.0"
-zeroize = { workspace = true }
-
-
-# internal
-nym-pemstore = { path = "../pemstore", version = "0.3.0" }
-
-[dev-dependencies]
-criterion = { version = "0.3", features = ["html_reports"] }
-
-
-[[bench]]
-name = "benchmarks"
-harness = false
@@ -1,374 +0,0 @@
-// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use std::ops::Neg;
-use std::time::Duration;
-
-use bls12_381::{
-    multi_miller_loop, G1Affine, G1Projective, G2Affine, G2Prepared, G2Projective, Gt, Scalar,
-};
-use criterion::{criterion_group, criterion_main, Criterion};
-use ff::Field;
-use group::{Curve, Group};
-use itertools::izip;
-use rand::seq::SliceRandom;
-
-use nym_compact_ecash::identify::{identify, IdentifyResult};
-use nym_compact_ecash::setup::setup;
-use nym_compact_ecash::{
-    aggregate_verification_keys, aggregate_wallets, generate_keypair_user, issue_verify,
-    issue_wallet, ttp_keygen, withdrawal_request, PartialWallet, PayInfo, PublicKeyUser,
-    SecretKeyUser, VerificationKeyAuth,
-};
-
-#[allow(unused)]
-fn double_pairing(g11: &G1Affine, g21: &G2Affine, g12: &G1Affine, g22: &G2Affine) {
-    let gt1 = bls12_381::pairing(g11, g21);
-    let gt2 = bls12_381::pairing(g12, g22);
-    assert_eq!(gt1, gt2)
-}
-
-#[allow(unused)]
-fn single_pairing(g11: &G1Affine, g21: &G2Affine) {
-    let gt1 = bls12_381::pairing(g11, g21);
-}
-
-#[allow(unused)]
-fn exponent_in_g1(g1: G1Projective, r: Scalar) {
-    let g11 = (g1 * r);
-}
-
-#[allow(unused)]
-fn exponent_in_g2(g2: G2Projective, r: Scalar) {
-    let g22 = (g2 * r);
-}
-
-#[allow(unused)]
-fn exponent_in_gt(gt: Gt, r: Scalar) {
-    let gtt = (gt * r);
-}
-
-#[allow(unused)]
-fn multi_miller_pairing_affine(g11: &G1Affine, g21: &G2Affine, g12: &G1Affine, g22: &G2Affine) {
-    let miller_loop_result = multi_miller_loop(&[
-        (g11, &G2Prepared::from(*g21)),
-        (&g12.neg(), &G2Prepared::from(*g22)),
-    ]);
-    assert!(bool::from(
-        miller_loop_result.final_exponentiation().is_identity()
-    ))
-}
-
-#[allow(unused)]
-fn multi_miller_pairing_with_prepared(
-    g11: &G1Affine,
-    g21: &G2Prepared,
-    g12: &G1Affine,
-    g22: &G2Prepared,
-) {
-    let miller_loop_result = multi_miller_loop(&[(g11, g21), (&g12.neg(), g22)]);
-    assert!(bool::from(
-        miller_loop_result.final_exponentiation().is_identity()
-    ))
-}
-
-// the case of being able to prepare G2 generator
-#[allow(unused)]
-fn multi_miller_pairing_with_semi_prepared(
-    g11: &G1Affine,
-    g21: &G2Affine,
-    g12: &G1Affine,
-    g22: &G2Prepared,
-) {
-    let miller_loop_result =
-        multi_miller_loop(&[(g11, &G2Prepared::from(*g21)), (&g12.neg(), g22)]);
-    assert!(bool::from(
-        miller_loop_result.final_exponentiation().is_identity()
-    ))
-}
-
-#[allow(unused)]
-fn bench_pairings(c: &mut Criterion) {
-    let mut group = c.benchmark_group("benchmark-pairings");
-    group.measurement_time(Duration::from_secs(200));
-
-    let mut rng = rand::thread_rng();
-
-    let g1 = G1Affine::generator();
-    let g2 = G2Affine::generator();
-    let r = Scalar::random(&mut rng);
-    let s = Scalar::random(&mut rng);
-
-    let g11 = (g1 * r).to_affine();
-    let g21 = (g2 * s).to_affine();
-    let g21_prep = G2Prepared::from(g21);
-
-    let g12 = (g1 * s).to_affine();
-    let g22 = (g2 * r).to_affine();
-    let g22_prep = G2Prepared::from(g22);
-
-    let gt = bls12_381::pairing(&g11, &g21);
-    let gen1 = G1Projective::generator();
-    let gen2 = G2Projective::generator();
-
-    group.bench_function("exponent operation in G1", |b| {
-        b.iter(|| exponent_in_g1(gen1, r))
-    });
-
-    group.bench_function("exponent operation in G2", |b| {
-        b.iter(|| exponent_in_g2(gen2, r))
-    });
-
-    group.bench_function("exponent operation in Gt", |b| {
-        b.iter(|| exponent_in_gt(gt, r))
-    });
-
-    group.bench_function("single pairing", |b| b.iter(|| single_pairing(&g11, &g21)));
-
-    group.bench_function("double pairing", |b| {
-        b.iter(|| double_pairing(&g11, &g21, &g12, &g22))
-    });
-
-    group.bench_function("multi miller in affine", |b| {
-        b.iter(|| multi_miller_pairing_affine(&g11, &g21, &g12, &g22))
-    });
-
-    group.bench_function("multi miller with prepared g2", |b| {
-        b.iter(|| multi_miller_pairing_with_prepared(&g11, &g21_prep, &g12, &g22_prep))
-    });
-
-    group.bench_function("multi miller with semi-prepared g2", |b| {
-        b.iter(|| multi_miller_pairing_with_semi_prepared(&g11, &g21, &g12, &g22_prep))
-    });
-}
-
-struct BenchCase {
-    num_authorities: u64,
-    threshold_p: f32,
-    L: u64,
-    spend_vv: u64,
-    case_nr_pub_keys: u64,
-}
-
-fn bench_compact_ecash(c: &mut Criterion) {
-    let mut group = c.benchmark_group("benchmark-compact-ecash");
-    // group.sample_size(300);
-    // group.measurement_time(Duration::from_secs(1500));
-
-    let case = BenchCase {
-        num_authorities: 100,
-        threshold_p: 0.7,
-        L: 100,
-        spend_vv: 1,
-        case_nr_pub_keys: 99,
-    };
-
-    let params = setup(case.L);
-    let grp = params.grp();
-    let user_keypair = generate_keypair_user(&grp);
-    let threshold = (case.threshold_p * case.num_authorities as f32).round() as u64;
-    let authorities_keypairs = ttp_keygen(&grp, threshold, case.num_authorities).unwrap();
-    let verification_keys_auth: Vec<VerificationKeyAuth> = authorities_keypairs
-        .iter()
-        .map(|keypair| keypair.verification_key())
-        .collect();
-
-    let indices: Vec<u64> = (1..case.num_authorities + 1).collect();
-    let verification_key =
-        aggregate_verification_keys(&verification_keys_auth, Some(&indices)).unwrap();
-    // ISSUANCE PHASE
-
-    let (req, req_info) = withdrawal_request(grp, &user_keypair.secret_key()).unwrap();
-
-    // CLIENT BENCHMARK: prepare a single withdrawal request
-    // group.bench_function(
-    //     &format!(
-    //         "[Client] withdrawal_request_{}_authorities_{}_L_{}_threshold",
-    //         case.num_authorities, case.L, case.threshold_p,
-    //     ),
-    //     |b| b.iter(|| withdrawal_request(grp, &user_keypair.secret_key()).unwrap()),
-    // );
-
-    // ISSUING AUTHRORITY BENCHMARK: Benchmark the issue_wallet function
-    // called by an authority to issue a blind signature on a partial wallet
-    let mut rng = rand::thread_rng();
-    let keypair = authorities_keypairs.choose(&mut rng).unwrap();
-    // group.bench_function(
-    //     &format!("[Issuing Authority] issue_partial_wallet_with_L_{}", case.L, ),
-    //     |b| {
-    //         b.iter(|| {
-    //             issue_wallet(
-    //                 &grp,
-    //                 keypair.secret_key(),
-    //                 user_keypair.public_key(),
-    //                 &req,
-    //             ).unwrap()
-    //         })
-    //     },
-    // );
-
-    let mut wallet_blinded_signatures = Vec::new();
-    for auth_keypair in authorities_keypairs {
-        let blind_signature = issue_wallet(
-            &grp,
-            auth_keypair.secret_key(),
-            user_keypair.public_key(),
-            &req,
-        );
-        wallet_blinded_signatures.push(blind_signature.unwrap());
-    }
-
-    // CLIENT BENCHMARK: verify the issued partial wallet
-    let w = wallet_blinded_signatures.get(0).clone().unwrap();
-    let vk = verification_keys_auth.get(0).clone().unwrap();
-    // group.bench_function(
-    //     &format!("[Client] issue_verify_a_partial_wallet_with_L_{}", case.L, ),
-    //     |b| b.iter(|| issue_verify(&grp, vk, &user_keypair.secret_key(), w, &req_info).unwrap()),
-    // );
-
-    let unblinded_wallet_shares: Vec<PartialWallet> = izip!(
-        wallet_blinded_signatures.iter(),
-        verification_keys_auth.iter()
-    )
-    .map(|(w, vk)| issue_verify(&grp, vk, &user_keypair.secret_key(), w, &req_info).unwrap())
-    .collect();
-
-    // CLIENT BENCHMARK: aggregating all partial wallets
-    // group.bench_function(
-    //     &format!(
-    //         "[Client] aggregate_wallets_with_L_{}_threshold_{}",
-    //         case.L, case.threshold_p,
-    //     ),
-    //     |b| {
-    //         b.iter(|| {
-    //             aggregate_wallets(
-    //                 &grp,
-    //                 &verification_key,
-    //                 &user_keypair.secret_key(),
-    //                 &unblinded_wallet_shares,
-    //                 &req_info,
-    //             )
-    //                 .unwrap()
-    //         })
-    //     },
-    // );
-
-    // Aggregate partial wallets
-    let aggr_wallet = aggregate_wallets(
-        &grp,
-        &verification_key,
-        &user_keypair.secret_key(),
-        &unblinded_wallet_shares,
-        &req_info,
-    )
-    .unwrap();
-
-    // SPENDING PHASE
-    let pay_info = PayInfo { payinfo: [6u8; 32] };
-    // CLIENT BENCHMARK: spend a single coin from the wallet
-    // group.bench_function(
-    //     &format!(
-    //         "[Client] spend_a_single_coin_L_{}_threshold_{}",
-    //         case.L, case.threshold_p,
-    //     ),
-    //     |b| {
-    //         b.iter(|| {
-    //             aggr_wallet
-    //                 .spend(
-    //                     &params,
-    //                     &verification_key,
-    //                     &user_keypair.secret_key(),
-    //                     &pay_info,
-    //                     true,
-    //                     case.spend_vv,
-    //                 )
-    //                 .unwrap()
-    //         })
-    //     },
-    // );
-
-    let (payment, upd_wallet) = aggr_wallet
-        .spend(
-            &params,
-            &verification_key,
-            &user_keypair.secret_key(),
-            &pay_info,
-            false,
-            case.spend_vv,
-        )
-        .unwrap();
-
-    // MERCHANT BENCHMARK: verify whether the submitted payment is legit
-    // group.bench_function(
-    //     &format!(
-    //         "[Merchant] spend_verify_of_a_single_payment_L_{}_threshold_{}",
-    //         case.L, case.threshold_p,
-    //     ),
-    //     |b| {
-    //         b.iter(|| {
-    //             payment
-    //                 .spend_verify(&params, &verification_key, &pay_info)
-    //                 .unwrap()
-    //         })
-    //     },
-    // );
-
-    // BENCHMARK IDENTIFICATION
-    // Let's generate a double spending payment
-
-    // let's reverse the spending counter in the wallet to create a double spending payment
-    let current_l = aggr_wallet.l.get();
-    aggr_wallet.l.set(current_l - case.spend_vv);
-
-    let pay_info2 = PayInfo { payinfo: [7u8; 32] };
-    let (payment2, _) = aggr_wallet
-        .spend(
-            &params,
-            &verification_key,
-            &user_keypair.secret_key(),
-            &pay_info2,
-            true,
-            case.spend_vv,
-        )
-        .unwrap();
-
-    //  GENERATE KEYS FOR OTHER USERS
-    let mut public_keys: Vec<PublicKeyUser> = Default::default();
-    for i in 0..case.case_nr_pub_keys {
-        let sk = grp.random_scalar();
-        let sk_user = SecretKeyUser { sk };
-        let pk_user = sk_user.public_key(&grp);
-        public_keys.push(pk_user);
-    }
-    public_keys.push(user_keypair.public_key());
-
-    // MERCHANT BENCHMARK: identify double spending
-    group.bench_function(
-        &format!(
-            "[Merchant] identify_L_{}_threshold_{}_spend_vv_{}_pks_{}",
-            case.L,
-            case.threshold_p,
-            case.spend_vv,
-            public_keys.len()
-        ),
-        |b| {
-            b.iter(|| {
-                identify(
-                    payment.clone(),
-                    payment2.clone(),
-                    pay_info.clone(),
-                    pay_info2.clone(),
-                )
-                .unwrap()
-            })
-        },
-    );
-    let identify_result = identify(payment, payment2, pay_info.clone(), pay_info2.clone()).unwrap();
-    assert_eq!(
-        identify_result,
-        IdentifyResult::DoubleSpendingPublicKeys(user_keypair.public_key())
-    );
-}
-
-criterion_group!(benches, bench_compact_ecash);
-criterion_main!(benches);
@@ -1,55 +0,0 @@
-use thiserror::Error;
-
-pub type Result<T> = std::result::Result<T, CompactEcashError>;
-
-#[derive(Error, Debug)]
-pub enum CompactEcashError {
-    #[error("Setup error: {0}")]
-    Setup(String),
-
-    #[error("Aggregation error: {0}")]
-    Aggregation(String),
-
-    #[error("Withdrawal Request Verification related error: {0}")]
-    WithdrawalRequestVerification(String),
-
-    #[error("Deserialization error: {0}")]
-    Deserialization(String),
-
-    #[error("Interpolation error: {0}")]
-    Interpolation(String),
-
-    #[error("Issuance Verification related error: {0}")]
-    IssuanceVfy(String),
-
-    #[error("Spend Verification related error: {0}")]
-    Spend(String),
-
-    #[error("ZKP Proof related error: {0}")]
-    RangeProofOutOfBound(String),
-
-    #[error("Identify Verification related error: {0}")]
-    Identify(String),
-
-    #[error("Could not decode base 58 string - {0}")]
-    MalformedString(#[from] bs58::decode::Error),
-
-    #[error("Payment did not verify")]
-    PaymentVerification,
-
-    #[error(
-        "Deserailization error, expected at least {} bytes, got {}",
-        min,
-        actual
-    )]
-    DeserializationMinLength { min: usize, actual: usize },
-
-    #[error("Tried to deserialize {object} with bytes of invalid length. Expected {actual} < {target} or {modulus_target} % {modulus} == 0")]
-    DeserializationInvalidLength {
-        actual: usize,
-        target: usize,
-        modulus_target: usize,
-        modulus: usize,
-        object: String,
-    },
-}
@@ -1,18 +0,0 @@
-use crate::scheme::withdrawal::WithdrawalRequest;
-use crate::scheme::EcashCredential;
-use crate::setup::Parameters;
-use crate::traits::Bytable;
-
-macro_rules! impl_clone {
-    ($struct:ident) => {
-        impl Clone for $struct {
-            fn clone(&self) -> Self {
-                Self::try_from_byte_slice(&self.to_byte_vec()).unwrap()
-            }
-        }
-    };
-}
-
-impl_clone!(WithdrawalRequest);
-impl_clone!(EcashCredential);
-impl_clone!(Parameters);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Zane Schepke	92fcb1b929	fix rust install	2023-12-11 23:07:56 -05:00
Zane Schepke	db2005a4a0	fix rust install	2023-12-11 23:04:28 -05:00
Zane Schepke	7d41b0d2ba	fix rust install	2023-12-11 22:59:28 -05:00
Zane Schepke	4314f53139	fix rust install	2023-12-11 22:45:18 -05:00
Zane Schepke	3e3f305f0b	fix script	2023-12-11 22:35:28 -05:00
Zane Schepke	dc33f078a1	fix script	2023-12-11 22:26:40 -05:00
Zane Schepke	d76d1bb876	fix script	2023-12-11 22:16:57 -05:00
Zane Schepke	c9ea25a157	move ci scripts	2023-12-11 22:07:33 -05:00
Zane Schepke	a79b91ae00	fix script	2023-12-11 22:01:50 -05:00
Zane Schepke	8e855960f9	Create ci_post_clone.sh	2023-12-11 21:50:33 -05:00
Zane Schepke	4545f7e3e0	add xcode proj	2023-12-11 05:57:20 -05:00
Zane Schepke	89c97c684e	add keychain path again	2023-12-08 09:27:47 -05:00
Zane Schepke	776693b0ef	remove keychain path	2023-12-08 07:41:11 -05:00
Zane Schepke	0eac90783d	add keychain path signing arg	2023-12-06 10:11:45 -05:00
Mark Sinclair	e0dd29898a	Fix up some paths for MacOS package	2023-12-05 20:09:58 +00:00
Zane Schepke	8e43a5ce1d	Update sign.sh	2023-11-27 04:44:43 -05:00
Zane Schepke	ef30cafaa4	Update sign.sh	2023-11-27 03:31:23 -05:00
Zane Schepke	80f81f1c4a	Update sign.sh	2023-11-27 00:02:31 -05:00
Zane Schepke	3e98fee06e	Update sign.sh	2023-11-26 20:55:50 -05:00
Zane Schepke	099d23b568	update bundle id and package	2023-11-24 12:49:28 -05:00
Zane Schepke	874aecb0a4	Update sign.sh	2023-11-24 09:04:22 -05:00
Zane Schepke	acf9de0f74	Add protoc optionals arg	2023-11-24 06:56:13 -05:00
Zane Schepke	064624d8ec	use x86 for signtool	2023-11-24 06:39:28 -05:00
Zane Schepke	ced32da018	Update sign.sh	2023-11-23 18:23:50 -05:00
Zane Schepke	ad5c0991c0	Add desktop vpn app project	2023-11-20 08:51:23 -05:00
Zane Schepke	2c63518735	Merge branch 'develop' of https://github.com/nymtech/nym into develop	2023-11-16 08:57:21 -05:00
Zane Schepke	2c32ce8cf0	Update README.md	2023-11-15 09:39:18 -05:00