Trigger rewarded_set update on bootstrap error

2022-03-30 14:35:03 +02:00
312 changed files with 2851 additions and 23417 deletions
@@ -75,6 +75,7 @@ jobs:
          command: clippy
          args: --workspace --all-targets -- -D warnings

+
      # COCONUT stuff
      - name: Build all binaries with coconut enabled
        uses: actions-rs/cargo@v1
@@ -88,12 +89,6 @@ jobs:
          command: test
          args: --workspace --features=coconut

-      - name: Reclaim some disk space (because Windows is being annoying)
-        uses: actions-rs/cargo@v1
-        if: ${{ matrix.os == 'windows-latest' }}
-        with:
-          command: clean
-
      - name: Run clippy with coconut enabled
        uses: actions-rs/cargo@v1
        if: ${{ matrix.rust != 'nightly' }}
@@ -2,9 +2,6 @@ name: Publish Nym binaries
 on:
  release:
    types: [created]
-    
-env:
-  NETWORK: mainnet    

 jobs:
  publish-nym:
@@ -64,16 +64,12 @@ jobs:
          APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_IDENTITY_ID }}
          APPLE_ID: ${{ secrets.APPLE_ID }}
          APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
-          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
-          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
        run: yarn && yarn build

      - name: Upload to release based on tag name
        uses: softprops/action-gh-release@v1
        with:
-          files: |
-            nym-wallet/target/release/bundle/dmg/*.dmg
-            nym-wallet/target/release/bundle/macos/*.app.tar.gz*
+          files: nym-wallet/target/release/bundle/dmg/*.dmg

      - name: Clean up keychain
        if: ${{ always() }}
@@ -37,16 +37,10 @@ jobs:
        uses: actions-rs/toolchain@v1
        with:
          toolchain: stable
-      - name: Install app dependencies
-        run: yarn
-      - name: Build app
-        run: yarn build
-        env:
-          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
-          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+      - name: Install app dependencies and build it
+        run: yarn && yarn build
+
      - name: Upload to release based on tag name
        uses: softprops/action-gh-release@v1
        with:
-          files: |
-            nym-wallet/target/release/bundle/appimage/*.AppImage
-            nym-wallet/target/release/bundle/appimage/*.AppImage.tar.gz*
+          files: nym-wallet/target/release/bundle/appimage/*.AppImage
@@ -63,13 +63,9 @@ jobs:
          ENABLE_CODE_SIGNING: ${{ secrets.WINDOWS_CERTIFICATE }}
          WINDOWS_CERTIFICATE: ${{ secrets.WINDOWS_CERTIFICATE }}
          WINDOWS_CERTIFICATE_PASSWORD: ${{ secrets.WINDOWS_CERTIFICATE_PASSWORD }}
-          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
-          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
        run: yarn build

      - name: Upload to release based on tag name
        uses: softprops/action-gh-release@v1
        with:
-          files: |
-            nym-wallet/target/release/bundle/msi/*.msi
-            nym-wallet/target/release/bundle/msi/*.msi.zip*
+          files: nym-wallet/target/release/bundle/msi/*.msi
@@ -1,55 +0,0 @@
-name: Nym Wallet Storybook
-
-on:
-  push:
-    paths:
-      - 'nym-wallet/**'
-
-jobs:
-  build:
-    runs-on: custom-runner-linux
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install rsync
-      run: sudo apt-get install rsync
-    - uses: rlespinasse/github-slug-action@v3.x
-    - uses: actions/setup-node@v2
-      with:
-        node-version: '16'
-    - name: Setup yarn
-      run: npm install -g yarn
-    - name: Build dependencies
-      run: yarn && yarn build
-    - name: Build storybook
-      run: yarn storybook:build
-      working-directory: ./nym-wallet
-    - name: Deploy branch to CI www (storybook)
-      continue-on-error: true
-      uses: easingthemes/ssh-deploy@main
-      env:
-        SSH_PRIVATE_KEY: ${{ secrets.CI_WWW_SSH_PRIVATE_KEY }}
-        ARGS: "-rltgoDzvO --delete"
-        SOURCE: "nym-wallet/storybook-static/"
-        REMOTE_HOST: ${{ secrets.CI_WWW_REMOTE_HOST }}
-        REMOTE_USER: ${{ secrets.CI_WWW_REMOTE_USER }}
-        TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/wallet-${{ env.GITHUB_REF_SLUG }}
-        EXCLUDE: "/dist/, /node_modules/"
-    - name: Keybase - Node Install
-      run: npm install
-      working-directory: .github/workflows/support-files
-    - name: Keybase - Send Notification
-      env:
-        NYM_NOTIFICATION_KIND: nym-wallet
-        NYM_PROJECT_NAME: "nym-wallet"
-        NYM_CI_WWW_BASE: "${{ secrets.NYM_CI_WWW_BASE }}"
-        NYM_CI_WWW_LOCATION: "wallet-${{ env.GITHUB_REF_SLUG }}"
-        GIT_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
-        GIT_BRANCH: "${GITHUB_REF##*/}"
-        KEYBASE_NYMBOT_USERNAME: "${{ secrets.KEYBASE_NYMBOT_USERNAME }}"
-        KEYBASE_NYMBOT_PAPERKEY: "${{ secrets.KEYBASE_NYMBOT_PAPERKEY }}"
-        KEYBASE_NYMBOT_TEAM: "${{ secrets.KEYBASE_NYMBOT_TEAM }}"
-        KEYBASE_NYM_CHANNEL: "ci-nym-wallet"
-        IS_SUCCESS: "${{ job.status == 'success' }}"
-      uses: docker://keybaseio/client:stable-node
-      with:
-        args: .github/workflows/support-files/notifications/entry_point.sh
@@ -3,7 +3,7 @@ require('dotenv').config();
 const Bot = require('keybase-bot');

 let context = {
-  kinds: ['nym-wallet', 'ts-packages', 'network-explorer', 'nightly'],
+  kinds: ['ts-packages', 'network-explorer', 'nightly'],
 };

 /**
@@ -1,29 +0,0 @@
-const Handlebars = require('handlebars');
-const fs = require('fs');
-const path = require('path');
-
-async function addToContextAndValidate(context) {
-  if (!context.env.NYM_CI_WWW_LOCATION) {
-    throw new Error('Please ensure the env var NYM_CI_WWW_LOCATION is set');
-  }
-  if (!context.env.NYM_CI_WWW_BASE) {
-    throw new Error('Please ensure the env var NYM_CI_WWW_BASE is set');
-  }
-}
-
-async function getMessageBody(context) {
-  const source = fs
-    .readFileSync(
-      context.env.IS_SUCCESS === 'true'
-        ? path.resolve(__dirname, 'templates', 'success')
-        : path.resolve(__dirname, 'templates', 'failure'),
-    )
-    .toString();
-  const template = Handlebars.compile(source);
-  return template(context);
-}
-
-module.exports = {
-  addToContextAndValidate,
-  getMessageBody,
-};
@@ -1,11 +0,0 @@
-🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥
-> :rocket: {{ env.NYM_PROJECT_NAME }}
-> 🔴 **FAILURE** :cry:
-> `branch` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/tree/{{ env.GIT_BRANCH_NAME }}
-> `commit` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/commit/{{ env.GITHUB_SHA }}
-> `build ` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/actions/runs/{{ env.GITHUB_RUN_ID }}
-
-Commit message:
-```
-{{ env.GIT_COMMIT_MESSAGE }}
-```
@@ -1,15 +0,0 @@
-🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩
-> :rocket: {{ env.NYM_PROJECT_NAME }}
-> ✅ **SUCCESS**
-
-> ➡️➡️➡️➡️➡️ **View output:**
-> `storybook`: https://{{ env.NYM_CI_WWW_LOCATION }}.{{ env.NYM_CI_WWW_BASE }}
-
-> `branch` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/tree/{{ env.GIT_BRANCH_NAME }}
-> `commit` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/commit/{{ env.GITHUB_SHA }}
-> `build ` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/actions/runs/{{ env.GITHUB_RUN_ID }}
-
-Commit message by `{{ env.GITHUB_ACTOR }}` at {{ timestamp }}:
-```
-{{ env.GIT_COMMIT_MESSAGE }}
-```
@@ -14,21 +14,18 @@ panic = "abort"
 resolver = "2"
 members = [
    "clients/client-core",
-    "clients/credential",
    "clients/native",
    "clients/native/websocket-requests",
    "clients/socks5",
+    # "clients/tauri-client/src-tauri",
    "common/client-libs/gateway-client",
    "common/client-libs/mixnet-client",
    "common/client-libs/validator-client",
-    "common/credential-storage",
    "common/coconut-interface",
    "common/config",
    "common/credentials",
    "common/crypto",
-    "common/crypto/dkg",
    "common/bandwidth-claim-contract",
-    "common/cosmwasm-smart-contracts/coconut-bandwidth-contract",
    "common/cosmwasm-smart-contracts/contracts-common",
    "common/cosmwasm-smart-contracts/mixnet-contract",
    "common/cosmwasm-smart-contracts/vesting-contract",
@@ -26,7 +26,7 @@ clippy-all-wallet:
 	cargo clippy --workspace --manifest-path nym-wallet/Cargo.toml --all-features -- -D warnings

 test-main:
-	cargo test --all-features --workspace --release
+	cargo test --all-features --workspace

 test-contracts:
 	cargo test --manifest-path contracts/Cargo.toml --all-features
@@ -40,40 +40,36 @@ Node, node operator and delegator rewards are determined according to the princi

 |Symbol|Definition|
 |---|---|
-|<img src="https://render.githubusercontent.com/render/math?math=R#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}R#gh-dark-mode-only">|global share of rewards available, starts at 2% of the reward pool.
-|<img src="https://render.githubusercontent.com/render/math?math=R_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}R_{i}#gh-dark-mode-only">|node reward for mixnode `i`.
-|<img src="https://render.githubusercontent.com/render/math?math=\sigma_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}\sigma_{i}#gh-dark-mode-only">|ratio of total node stake (node bond + all delegations) to the token circulating supply.
-|<img src="https://render.githubusercontent.com/render/math?math=\lambda_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}\lambda_{i}#gh-dark-mode-only">|ratio of stake operator has pledged to their node to the token circulating supply.
-|<img src="https://render.githubusercontent.com/render/math?math=\omega_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}\omega_{i}#gh-dark-mode-only">|fraction of total effort undertaken by node `i`, set to `1/k`.
-|<img src="https://render.githubusercontent.com/render/math?math=k#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}k#gh-dark-mode-only">|number of nodes stakeholders are incentivised to create, set by the validators, a matter of governance. Currently determined by the `reward set` size, and set to 720 in testnet Sandbox.
-|<img src="https://render.githubusercontent.com/render/math?math=\alpha#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}\alpha#gh-dark-mode-only">|Sybil attack resistance parameter - the higher this parameter is set the stronger the reduction in competitivness gets for a Sybil attacker.
-|<img src="https://render.githubusercontent.com/render/math?math=PM_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}PM_{i}#gh-dark-mode-only">|declared profit margin of operator `i`, defaults to 10% in.
-|<img src="https://render.githubusercontent.com/render/math?math=PF_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}PF_{i}#gh-dark-mode-only">|uptime of node `i`, scaled to 0 - 1, for the rewarding epoch
-|<img src="https://render.githubusercontent.com/render/math?math=PP_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}PP_{i}#gh-dark-mode-only">|cost of operating node `i` for the duration of the rewarding epoch, set to 40 NYMT.
+|<img src="https://render.githubusercontent.com/render/math?math=R">|global share of rewards available, starts at 2% of the reward pool. 
+|<img src="https://render.githubusercontent.com/render/math?math=R_{i}">|node reward for mixnode `i`.
+|<img src="https://render.githubusercontent.com/render/math?math=\sigma_{i}">|ratio of total node stake (node bond + all delegations) to the token circulating supply.
+|<img src="https://render.githubusercontent.com/render/math?math=\lambda_{i}">|ratio of stake operator has pledged to their node to the token circulating supply.
+|<img src="https://render.githubusercontent.com/render/math?math=\omega_{i}">|fraction of total effort undertaken by node `i`, set to `1/k`.
+|<img src="https://render.githubusercontent.com/render/math?math=k">|number of nodes stakeholders are incentivised to create, set by the validators, a matter of governance. Currently determined by the `reward set` size, and set to 720 in testnet Sandbox.
+|<img src="https://render.githubusercontent.com/render/math?math=\alpha">|Sybil attack resistance parameter - the higher this parameter is set the stronger the reduction in competitivness gets for a Sybil attacker.
+|<img src="https://render.githubusercontent.com/render/math?math=PM_{i}">|declared profit margin of operator `i`, defaults to 10% in.
+|<img src="https://render.githubusercontent.com/render/math?math=PF_{i}">|uptime of node `i`, scaled to 0 - 1, for the rewarding epoch
+|<img src="https://render.githubusercontent.com/render/math?math=PP_{i}">|cost of operating node `i` for the duration of the rewarding eopoch, set to 40 NYMT.

 Node reward for node `i` is determined as:

-<img src="https://render.githubusercontent.com/render/math?math=R_{i}=PF_{i} \cdot R \cdot (\sigma^'_{i} \cdot \omega_{i} \cdot k %2b \alpha \cdot \lambda^'_{i} \cdot \sigma^'_{i} \cdot k)/(1 %2b \alpha)#gh-light-mode-only">
-<img src="https://render.githubusercontent.com/render/math?math=\color{white}R_{i}=PF_{i} \cdot R \cdot (\sigma^'_{i} \cdot \omega_{i} \cdot k %2b \alpha \cdot \lambda^'_{i} \cdot \sigma^'_{i} \cdot k)/(1 %2b \alpha)#gh-dark-mode-only">
+<img src="https://render.githubusercontent.com/render/math?math=R_{i}=PF_{i} \cdot R \cdot (\sigma^'_{i} \cdot \omega_{i} \cdot k %2b \alpha \cdot \lambda^'_{i} \cdot \sigma^'_{i} \cdot k)/(1 %2b \alpha)">
+
 where:

-<img src="https://render.githubusercontent.com/render/math?math=\sigma^'_{i} = min\{\sigma_{i}, 1/k\}#gh-light-mode-only">
-<img src="https://render.githubusercontent.com/render/math?math=\color{white}\sigma^'_{i} = min\{\sigma_{i}, 1/k\}#gh-dark-mode-only">
+<img src="https://render.githubusercontent.com/render/math?math=\sigma^'_{i} = min\{\sigma_{i}, 1/k\}">

 and

-<img src="https://render.githubusercontent.com/render/math?math=\lambda^'_{i} = min\{\lambda_{i}, 1/k\}#gh-light-mode-only">
-<img src="https://render.githubusercontent.com/render/math?math=\color{white}\lambda^'_{i} = min\{\lambda_{i}, 1/k\}#gh-dark-mode-only">
+<img src="https://render.githubusercontent.com/render/math?math=\lambda^'_{i} = min\{\lambda_{i}, 1/k\}">

 Operator of node `i` is credited with the following amount:

-<img src="https://render.githubusercontent.com/render/math?math=min\{PP_{i},R_{i})\} %2b max\{0, (PM_{i} %2b (1 - PM_{i}) \cdot \lambda_{i}/\delta_{i}) \cdot (R_{i} - PP_{i})\}#gh-light-mode-only">
-<img src="https://render.githubusercontent.com/render/math?math=\color{white}min\{PP_{i},R_{i})\} %2b max\{0, (PM_{i} %2b (1 - PM_{i}) \cdot \lambda_{i}/\delta_{i}) \cdot (R_{i} - PP_{i})\}#gh-dark-mode-only">
+<img src="https://render.githubusercontent.com/render/math?math=min\{PP_{i},R_{i})\} %2b max\{0, (PM_{i} %2b (1 - PM_{i}) \cdot \lambda_{i}/\delta_{i}) \cdot (R_{i} - PP_{i})\}">

 Delegate with stake `s` recieves:

-<img src="https://render.githubusercontent.com/render/math?math=max\{0, (1-PM_{i}) \cdot (s^'/\sigma_{i}) \cdot (R_{i} - PP_{i})\}#gh-light-mode-only">
-<img src="https://render.githubusercontent.com/render/math?math=\color{white}max\{0, (1-PM_{i}) \cdot (s^'/\sigma_{i}) \cdot (R_{i} - PP_{i})\}#gh-dark-mode-only">
+<img src="https://render.githubusercontent.com/render/math?math=max\{0, (1-PM_{i}) \cdot (s^'/\sigma_{i}) \cdot (R_{i} - PP_{i})\}">

 where `s'` is stake `s` scaled over total token circulating supply.

@@ -1,10 +0,0 @@
-Critical bug or security issue 💥
-
-If you're here because you're trying to figure out how to notify us of a security issue, go to Discord, and alert the core engineers:
-
-    Dave Hrycyszyn futurechimp#5430
-    Drazen Urch drazen#4873
-    Jedrzej Stuczynski "Jedrzej | Nym#5666"
-
-
-Please avoid opening public issues on GitHub that contain information about a potential security vulnerability as this makes it difficult to reduce the impact and harm of valid security issues.
@@ -1,4 +1,4 @@
-<svg viewBox="0 0 210 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="210" height="56" viewBox="0 0 210 56" fill="none" xmlns="http://www.w3.org/2000/svg">
    <path d="M45.8829 0.142822H45.7169V0.28114V48.637L25.3289 0.225818L25.3012 0.142822H25.1905H13.6272H0.652966H0.514648V0.28114V55.7189V55.8572H0.652966H13.6272H13.7655V55.7189V7.28002L34.2365 55.7742L34.2642 55.8572H34.3748H45.8829H58.8294H58.9677V55.7189V0.28114V0.142822H58.8294H45.8829Z"/>
    <path d="M209.347 0.142822H184.616H184.477L184.45 0.253483L171.78 48.8583L159.082 0.253483L159.054 0.142822H158.944H134.157H133.991V0.28114V55.7189V55.8572H134.157H147.104H147.242V55.7189V7.66731L159.774 55.7466L159.801 55.8572H159.94H183.564H183.675L183.703 55.7466L196.234 7.66731V55.7189V55.8572H196.373H209.347H209.485V55.7189V0.28114V0.142822H209.347Z"/>
    <path d="M112.663 0.142822H112.58L112.552 0.198153L96.8116 27.5574L80.988 0.198153L80.9604 0.142822H80.8774H65.9114H65.6348L65.7731 0.364136L90.1447 42.5787V55.7189V55.8572H90.283H103.257H103.396V55.7189V42.5787L127.767 0.364136L127.905 0.142822H127.629H112.663Z"/>
@@ -1,6 +1,6 @@
 [package]
 name = "client-core"
-version = "1.0.0-rc.2"
+version = "1.0.0-rc.1"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 edition = "2021"

@@ -32,4 +32,4 @@ validator-client = { path = "../../common/client-libs/validator-client" }
 tempfile = "3.1.0"

 [features]
-coconut = ["gateway-client/coconut", "gateway-requests/coconut"]
+coconut = []
@@ -103,8 +103,15 @@ impl<T: NymConfig> Config<T> {
                self::Client::<T>::default_reply_encryption_key_store_path(&id);
        }

-        if self.client.database_path.as_os_str().is_empty() {
-            self.client.database_path = self::Client::<T>::default_database_path(&id);
+        #[cfg(not(feature = "coconut"))]
+        if self
+            .client
+            .backup_bandwidth_token_keys_dir
+            .as_os_str()
+            .is_empty()
+        {
+            self.client.backup_bandwidth_token_keys_dir =
+                self::Client::<T>::default_backup_bandwidth_token_keys_dir(&id);
        }

        self.client.id = id;
@@ -206,8 +213,9 @@ impl<T: NymConfig> Config<T> {
        self.client.gateway_endpoint.gateway_listener.clone()
    }

-    pub fn get_database_path(&self) -> PathBuf {
-        self.client.database_path.clone()
+    #[cfg(not(feature = "coconut"))]
+    pub fn get_backup_bandwidth_token_keys_dir(&self) -> PathBuf {
+        self.client.backup_bandwidth_token_keys_dir.clone()
    }

    #[cfg(not(feature = "coconut"))]
@@ -329,8 +337,11 @@ pub struct Client<T> {
    /// Information regarding how the client should send data to gateway.
    gateway_endpoint: GatewayEndpoint,

-    /// Path to the database containing bandwidth credentials of this client.
-    database_path: PathBuf,
+    /// Path to directory containing public/private keys used for bandwidth token purchase.
+    /// Those are saved in case of emergency, to be able to reclaim bandwidth tokens.
+    /// The public key is the name of the file, while the private key is the content.
+    #[cfg(not(feature = "coconut"))]
+    backup_bandwidth_token_keys_dir: PathBuf,

    /// Ethereum private key.
    #[cfg(not(feature = "coconut"))]
@@ -364,7 +375,8 @@ impl<T: NymConfig> Default for Client<T> {
            ack_key_file: Default::default(),
            reply_encryption_key_store_path: Default::default(),
            gateway_endpoint: Default::default(),
-            database_path: Default::default(),
+            #[cfg(not(feature = "coconut"))]
+            backup_bandwidth_token_keys_dir: Default::default(),
            #[cfg(not(feature = "coconut"))]
            eth_private_key: "".to_string(),
            #[cfg(not(feature = "coconut"))]
@@ -403,8 +415,10 @@ impl<T: NymConfig> Client<T> {
    fn default_reply_encryption_key_store_path(id: &str) -> PathBuf {
        T::default_data_directory(Some(id)).join("reply_key_store")
    }
-    fn default_database_path(id: &str) -> PathBuf {
-        T::default_data_directory(Some(id)).join("db.sqlite")
+
+    #[cfg(not(feature = "coconut"))]
+    fn default_backup_bandwidth_token_keys_dir(id: &str) -> PathBuf {
+        T::default_data_directory(Some(id)).join("backup_bandwidth_token_keys")
    }
 }

@@ -1,30 +0,0 @@
-[package]
-name = "credential"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-async-trait = "0.1.52"
-bip39 = "1.0.1"
-cfg-if = "0.1"
-clap = { version = "3.0.10", features = ["cargo", "derive"] }
-pickledb = "0.4.1"
-rand = "0.7.3"
-serde = { version = "1.0", features = ["derive"] }
-thiserror = "1.0"
-url = "2.2"
-tokio = { version = "1.4", features = ["rt-multi-thread", "net", "signal", "macros"] } # async runtime
-
-coconut-bandwidth-contract-common = { path = "../../common/cosmwasm-smart-contracts/coconut-bandwidth-contract" }
-coconut-interface = { path = "../../common/coconut-interface" }
-credentials = { path = "../../common/credentials" }
-credential-storage = { path = "../../common/credential-storage" }
-crypto = { path = "../../common/crypto", features = ["rand", "asymmetric", "symmetric", "aes", "hashing"] }
-network-defaults = { path = "../../common/network-defaults" }
-pemstore = { path = "../../common/pemstore" }
-validator-client = { path = "../../common/client-libs/validator-client", features = ["nymd-client"] }
-
-[features]
-coconut = ["credentials/coconut"]
@@ -1,69 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use bip39::Mnemonic;
-use coconut_bandwidth_contract_common::deposit::DepositData;
-use std::str::FromStr;
-use url::Url;
-
-use crate::error::Result;
-use crate::{CONTRACT_ADDRESS, MNEMONIC, NYMD_URL};
-
-use coconut_bandwidth_contract_common::msg::ExecuteMsg;
-use network_defaults::DEFAULT_NETWORK;
-use validator_client::nymd::{
-    AccountId, CosmosCoin, Decimal, Denom, NymdClient, SigningNymdClient,
-};
-
-pub(crate) struct Client {
-    nymd_client: NymdClient<SigningNymdClient>,
-    denom: Denom,
-    contract_address: AccountId,
-}
-
-impl Client {
-    pub fn new() -> Self {
-        let nymd_url = Url::from_str(NYMD_URL).unwrap();
-        let mnemonic = Mnemonic::from_str(MNEMONIC).unwrap();
-        let nymd_client = NymdClient::connect_with_mnemonic(
-            DEFAULT_NETWORK,
-            nymd_url.as_ref(),
-            None,
-            None,
-            None,
-            mnemonic,
-            None,
-        )
-        .unwrap();
-        let denom = Denom::from_str(network_defaults::DENOM).unwrap();
-        let contract_address = AccountId::from_str(CONTRACT_ADDRESS).unwrap();
-
-        Client {
-            nymd_client,
-            denom,
-            contract_address,
-        }
-    }
-
-    pub async fn deposit(
-        &self,
-        amount: u64,
-        info: &str,
-        verification_key: String,
-        encryption_key: String,
-    ) -> Result<String> {
-        let req = ExecuteMsg::DepositFunds {
-            data: DepositData::new(info.to_string(), verification_key, encryption_key),
-        };
-        let funds = vec![CosmosCoin {
-            denom: self.denom.clone(),
-            amount: Decimal::from(amount),
-        }];
-        Ok(self
-            .nymd_client
-            .execute(&self.contract_address, &req, Default::default(), "", funds)
-            .await?
-            .transaction_hash
-            .to_string())
-    }
-}
@@ -1,183 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use async_trait::async_trait;
-use clap::{Args, Subcommand};
-use pickledb::PickleDb;
-use rand::rngs::OsRng;
-use std::str::FromStr;
-use url::Url;
-
-use coconut_interface::{Attribute, Base58, BlindSignRequest, Bytable, Parameters};
-use credential_storage::storage::Storage;
-use credential_storage::PersistentStorage;
-use credentials::coconut::bandwidth::{BandwidthVoucher, TOTAL_ATTRIBUTES};
-use credentials::coconut::utils::obtain_aggregate_signature;
-use crypto::asymmetric::{encryption, identity};
-use network_defaults::VOUCHER_INFO;
-use validator_client::nymd::tx::Hash;
-
-use crate::client::Client;
-use crate::error::{CredentialClientError, Result};
-use crate::state::{KeyPair, RequestData, State};
-use crate::SIGNER_AUTHORITIES;
-
-#[derive(Subcommand)]
-pub(crate) enum Commands {
-    /// Deposit funds for buying coconut credential
-    Deposit(Deposit),
-    /// Lists the tx hashes of previous deposits
-    ListDeposits(ListDeposits),
-    /// Get a credential for a given deposit
-    GetCredential(GetCredential),
-}
-
-#[async_trait]
-pub(crate) trait Execute {
-    async fn execute(&self, db: &mut PickleDb, shared_storage: PersistentStorage) -> Result<()>;
-}
-
-#[derive(Args, Clone)]
-pub(crate) struct Deposit {
-    /// The amount that needs to be deposited
-    #[clap(long)]
-    amount: u64,
-}
-
-#[async_trait]
-impl Execute for Deposit {
-    async fn execute(&self, db: &mut PickleDb, _shared_storage: PersistentStorage) -> Result<()> {
-        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 client = Client::new();
-        let tx_hash = client
-            .deposit(
-                self.amount,
-                VOUCHER_INFO,
-                signing_keypair.public_key.clone(),
-                encryption_keypair.public_key.clone(),
-            )
-            .await?;
-
-        let state = State {
-            amount: self.amount,
-            tx_hash: tx_hash.clone(),
-            signing_keypair,
-            encryption_keypair,
-            blind_request_data: None,
-            signature: None,
-        };
-        db.set(&tx_hash, &state).unwrap();
-
-        println!("{:?}", state);
-
-        Ok(())
-    }
-}
-
-#[derive(Args, Clone)]
-pub(crate) struct ListDeposits {}
-
-#[async_trait]
-impl Execute for ListDeposits {
-    async fn execute(&self, db: &mut PickleDb, _shared_storage: PersistentStorage) -> Result<()> {
-        for kv in db.iter() {
-            println!("{:?}", kv.get_value::<State>());
-        }
-
-        Ok(())
-    }
-}
-
-#[derive(Args, Clone)]
-pub(crate) struct GetCredential {
-    /// The hash of a successful deposit transaction
-    #[clap(long)]
-    tx_hash: String,
-    /// If we want to get the signature without attaching a blind sign request; it is expected that
-    /// there is already a signature stored on the signer
-    #[clap(long, parse(from_flag))]
-    __no_request: bool,
-}
-
-#[async_trait]
-impl Execute for GetCredential {
-    async fn execute(&self, db: &mut PickleDb, shared_storage: PersistentStorage) -> Result<()> {
-        let mut state = db
-            .get::<State>(&self.tx_hash)
-            .ok_or(CredentialClientError::NoDeposit)?;
-        let urls = SIGNER_AUTHORITIES.map(|addr| Url::from_str(addr).unwrap());
-
-        let params = Parameters::new(TOTAL_ATTRIBUTES).unwrap();
-        let bandwidth_credential_attributes = if self.__no_request {
-            if let Some(blind_request_data) = state.blind_request_data {
-                let serial_number =
-                    Attribute::try_from_byte_slice(&blind_request_data.serial_number)
-                        .map_err(|_| CredentialClientError::CorruptedBlindSignRequest)?;
-                let binding_number =
-                    Attribute::try_from_byte_slice(&blind_request_data.binding_number)
-                        .map_err(|_| CredentialClientError::CorruptedBlindSignRequest)?;
-                let pedersen_commitments_openings = vec![
-                    Attribute::try_from_byte_slice(&blind_request_data.first_attribute)
-                        .map_err(|_| CredentialClientError::CorruptedBlindSignRequest)?,
-                    Attribute::try_from_byte_slice(&blind_request_data.second_attribute)
-                        .map_err(|_| CredentialClientError::CorruptedBlindSignRequest)?,
-                ];
-                let blind_sign_request =
-                    BlindSignRequest::from_bytes(blind_request_data.blind_sign_req.as_slice())
-                        .map_err(|_| CredentialClientError::CorruptedBlindSignRequest)?;
-                BandwidthVoucher::new_with_blind_sign_req(
-                    [serial_number, binding_number],
-                    [&state.amount.to_string(), VOUCHER_INFO],
-                    Hash::from_str(&self.tx_hash)
-                        .map_err(|_| CredentialClientError::InvalidTxHash)?,
-                    identity::PrivateKey::from_base58_string(&state.signing_keypair.private_key)?,
-                    encryption::PrivateKey::from_base58_string(
-                        &state.encryption_keypair.private_key,
-                    )?,
-                    pedersen_commitments_openings,
-                    blind_sign_request,
-                )
-            } else {
-                return Err(CredentialClientError::NoLocalBlindSignRequest);
-            }
-        } else {
-            BandwidthVoucher::new(
-                &params,
-                state.amount.to_string(),
-                VOUCHER_INFO.to_string(),
-                Hash::from_str(&self.tx_hash).map_err(|_| CredentialClientError::InvalidTxHash)?,
-                identity::PrivateKey::from_base58_string(&state.signing_keypair.private_key)?,
-                encryption::PrivateKey::from_base58_string(&state.encryption_keypair.private_key)?,
-            )
-        };
-
-        // Back up the blind sign req data, in case of sporadic failures
-        state.blind_request_data = Some(RequestData::new(
-            bandwidth_credential_attributes.get_private_attributes(),
-            bandwidth_credential_attributes.pedersen_commitments_openings(),
-            bandwidth_credential_attributes.blind_sign_request(),
-        )?);
-        db.set(&self.tx_hash, &state).unwrap();
-
-        let signature =
-            obtain_aggregate_signature(&params, &bandwidth_credential_attributes, &urls).await?;
-        shared_storage
-            .insert_coconut_credential(
-                state.amount.to_string(),
-                VOUCHER_INFO.to_string(),
-                bandwidth_credential_attributes.get_private_attributes()[0].to_bs58(),
-                bandwidth_credential_attributes.get_private_attributes()[1].to_bs58(),
-                signature.to_bs58(),
-            )
-            .await?;
-        state.signature = Some(signature.to_bs58());
-        db.set(&self.tx_hash, &state).unwrap();
-
-        println!("Signature: {:?}", state.signature);
-
-        Ok(())
-    }
-}
@@ -1,45 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use thiserror::Error;
-
-use credential_storage::error::StorageError;
-use credentials::error::Error as CredentialError;
-use crypto::asymmetric::encryption::KeyRecoveryError;
-use crypto::asymmetric::identity::Ed25519RecoveryError;
-use validator_client::nymd::error::NymdError;
-
-pub type Result<T> = std::result::Result<T, CredentialClientError>;
-
-#[derive(Error, Debug)]
-pub enum CredentialClientError {
-    #[error("Nymd error: {0}")]
-    Nymd(#[from] NymdError),
-
-    #[error("Credential error: {0}")]
-    Credential(#[from] CredentialError),
-
-    #[error("No previous deposit with that tx hash")]
-    NoDeposit,
-
-    #[error("Wrong number of attributes")]
-    WrongAttributeNumber,
-
-    #[error("Could not find any backed up blind sign request data")]
-    NoLocalBlindSignRequest,
-
-    #[error("The local blind sign request data is corrupted")]
-    CorruptedBlindSignRequest,
-
-    #[error("The tx hash provided is not valid")]
-    InvalidTxHash,
-
-    #[error("Could not parse Ed25519 data")]
-    Ed25519ParseError(#[from] Ed25519RecoveryError),
-
-    #[error("Could not parse X25519 data")]
-    X25519ParseError(#[from] KeyRecoveryError),
-
-    #[error("Could not use shared storage")]
-    SharedStorageError(#[from] StorageError),
-}
@@ -1,63 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-cfg_if::cfg_if! {
-    if #[cfg(feature = "coconut")] {
-
-        mod client;
-        mod commands;
-        mod error;
-        mod state;
-
-        use commands::{Commands, Execute};
-        use error::Result;
-
-        use clap::Parser;
-        use pickledb::{PickleDb, PickleDbDumpPolicy, SerializationMethod};
-
-        pub const MNEMONIC: &str = "jazz fatigue diagram account outer wrist slide cherry mother grid network pause wolf pig round answer mail junior better hair dismiss toward access end";
-        pub const NYMD_URL: &str = "http://127.0.0.1:26657";
-        pub const CONTRACT_ADDRESS: &str = "nymt1nc5tatafv6eyq7llkr2gv50ff9e22mnfp9pc5s";
-        pub const SIGNER_AUTHORITIES: [&str; 1] = [
-            "http://127.0.0.1:8080",
-        ];
-
-        #[derive(Parser)]
-        #[clap(author = "Nymtech", version, about)]
-        struct Cli {
-            #[clap(subcommand)]
-            command: Commands,
-        }
-
-        #[tokio::main]
-        async fn main() -> Result<()> {
-            let args = Cli::parse();
-
-            let shared_storage = credential_storage::initialise_storage(std::path::PathBuf::from("/tmp/credential.db")).await;
-            let mut db = match PickleDb::load(
-                "credential.db",
-                PickleDbDumpPolicy::AutoDump,
-                SerializationMethod::Json,
-            ) {
-                Ok(db) => db,
-                Err(_) => PickleDb::new(
-                    "credential.db",
-                    PickleDbDumpPolicy::AutoDump,
-                    SerializationMethod::Json,
-                ),
-            };
-
-            match &args.command {
-                Commands::Deposit(m) => m.execute(&mut db, shared_storage).await?,
-                Commands::ListDeposits(m) => m.execute(&mut db, shared_storage).await?,
-                Commands::GetCredential(m) => m.execute(&mut db, shared_storage).await?,
-            }
-
-            Ok(())
-        }
-    } else {
-        fn main() {
-            println!("Crate only designed for coconut feature");
-        }
-    }
-}
@@ -1,72 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use coconut_interface::{Attribute, BlindSignRequest, Bytable, PrivateAttribute};
-use serde::{Deserialize, Serialize};
-
-use crypto::asymmetric::{encryption, identity};
-
-use crate::error::{CredentialClientError, Result};
-
-#[derive(Clone, Debug, Deserialize, Serialize)]
-pub(crate) struct KeyPair {
-    pub public_key: String,
-    pub private_key: String,
-}
-
-impl From<identity::KeyPair> for KeyPair {
-    fn from(kp: identity::KeyPair) -> Self {
-        Self {
-            public_key: kp.public_key().to_base58_string(),
-            private_key: kp.private_key().to_base58_string(),
-        }
-    }
-}
-
-impl From<encryption::KeyPair> for KeyPair {
-    fn from(kp: encryption::KeyPair) -> Self {
-        Self {
-            public_key: kp.public_key().to_base58_string(),
-            private_key: kp.private_key().to_base58_string(),
-        }
-    }
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize)]
-pub(crate) struct State {
-    pub amount: u64,
-    pub tx_hash: String,
-    pub signing_keypair: KeyPair,
-    pub encryption_keypair: KeyPair,
-    pub blind_request_data: Option<RequestData>,
-    pub signature: Option<String>,
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize)]
-pub(crate) struct RequestData {
-    pub serial_number: Vec<u8>,
-    pub binding_number: Vec<u8>,
-    pub first_attribute: Vec<u8>,
-    pub second_attribute: Vec<u8>,
-    pub blind_sign_req: Vec<u8>,
-}
-
-impl RequestData {
-    pub fn new(
-        private_attributes: Vec<PrivateAttribute>,
-        attributes: &[Attribute],
-        blind_sign_request: &BlindSignRequest,
-    ) -> Result<Self> {
-        if private_attributes.len() != 2 || attributes.len() != 2 {
-            Err(CredentialClientError::WrongAttributeNumber)
-        } else {
-            Ok(RequestData {
-                serial_number: private_attributes[0].to_byte_vec(),
-                binding_number: private_attributes[1].to_byte_vec(),
-                first_attribute: attributes[0].to_byte_vec(),
-                second_attribute: attributes[1].to_byte_vec(),
-                blind_sign_req: blind_sign_request.to_bytes(),
-            })
-        }
-    }
-}
@@ -1,6 +1,6 @@
 [package]
 name = "nym-client"
-version = "1.0.0-rc.2"
+version = "1.0.0-rc.1"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 edition = "2021"
 rust-version = "1.56"
@@ -34,7 +34,6 @@ tokio-tungstenite = "0.14" # websocket
 client-core = { path = "../client-core" }
 coconut-interface = { path = "../../common/coconut-interface", optional = true }
 credentials = { path = "../../common/credentials", optional = true }
-credential-storage = { path = "../../common/credential-storage" }
 config = { path = "../../common/config" }
 crypto = { path = "../../common/crypto" }
 gateway-client = { path = "../../common/client-libs/gateway-client" }
@@ -43,12 +42,12 @@ nymsphinx = { path = "../../common/nymsphinx" }
 pemstore = { path = "../../common/pemstore" }
 topology = { path = "../../common/topology" }
 websocket-requests = { path = "websocket-requests" }
-validator-client = { path = "../../common/client-libs/validator-client", features = ["nymd-client"] }
+validator-client = { path = "../../common/client-libs/validator-client" }
 version-checker = { path = "../../common/version-checker" }
 network-defaults = { path = "../../common/network-defaults" }

 [features]
-coconut = ["coconut-interface", "credentials", "credentials/coconut", "gateway-requests/coconut", "gateway-client/coconut", "client-core/coconut"]
+coconut = ["coconut-interface", "credentials", "gateway-requests/coconut", "gateway-client/coconut"]
 eth = []

 [dev-dependencies]
@@ -46,8 +46,10 @@ public_encryption_key_file = '{{ client.public_encryption_key_file }}'
 # sent but not received back.
 reply_encryption_key_store_path = '{{ client.reply_encryption_key_store_path }}'

-# Path to the database containing bandwidth credentials
-database_path = '{{ client.database_path }}'
+# Path to directory containing public/private keys used for bandwidth token purchase.
+# Those are saved in case of emergency, to be able to reclaim bandwidth tokens.
+# The public key is the name of the file, while the private key is the content.
+backup_bandwidth_token_keys_dir = '{{ client.backup_bandwidth_token_keys_dir }}'

 # Ethereum private key.
 eth_private_key = '{{ client.eth_private_key }}'
@@ -174,16 +174,14 @@ impl NymClient {

        #[cfg(feature = "coconut")]
        let bandwidth_controller = BandwidthController::new(
-            credential_storage::initialise_storage(self.config.get_base().get_database_path())
-                .await,
            self.config.get_base().get_validator_api_endpoints(),
+            *self.key_manager.identity_keypair().public_key(),
        );
        #[cfg(not(feature = "coconut"))]
        let bandwidth_controller = BandwidthController::new(
-            credential_storage::initialise_storage(self.config.get_base().get_database_path())
-                .await,
            self.config.get_base().get_eth_endpoint(),
            self.config.get_base().get_eth_private_key(),
+            self.config.get_base().get_backup_bandwidth_token_keys_dir(),
        )
        .expect("Could not create bandwidth controller");

@@ -4,10 +4,20 @@
 use clap::{App, Arg, ArgMatches};
 use client_core::client::key_manager::KeyManager;
 use client_core::config::persistence::key_pathfinder::ClientKeyPathfinder;
+#[cfg(feature = "coconut")]
+use coconut_interface::{hash_to_scalar, Credential, Parameters};
 use config::NymConfig;
+#[cfg(feature = "coconut")]
+use credentials::coconut::bandwidth::{
+    obtain_signature, prepare_for_spending, BandwidthVoucherAttributes, TOTAL_ATTRIBUTES,
+};
+#[cfg(feature = "coconut")]
+use credentials::obtain_aggregate_verification_key;
 use crypto::asymmetric::{encryption, identity};
 use gateway_client::GatewayClient;
 use gateway_requests::registration::handshake::SharedKeys;
+#[cfg(feature = "coconut")]
+use network_defaults::BANDWIDTH_VALUE;
 use nymsphinx::addressing::clients::Recipient;
 use nymsphinx::addressing::nodes::NodeIdentity;
 use rand::rngs::OsRng;
@@ -88,6 +98,36 @@ pub fn command_args<'a, 'b>() -> clap::App<'a, 'b> {
    app
 }

+// this behaviour should definitely be changed, we shouldn't
+// need to get bandwidth credential for registration
+#[cfg(feature = "coconut")]
+async fn _prepare_temporary_credential(validators: &[Url], raw_identity: &[u8]) -> Credential {
+    let verification_key = obtain_aggregate_verification_key(validators)
+        .await
+        .expect("could not obtain aggregate verification key of validators");
+
+    let params = Parameters::new(TOTAL_ATTRIBUTES).unwrap();
+    let bandwidth_credential_attributes = BandwidthVoucherAttributes {
+        serial_number: params.random_scalar(),
+        binding_number: params.random_scalar(),
+        voucher_value: hash_to_scalar(BANDWIDTH_VALUE.to_be_bytes()),
+        voucher_info: hash_to_scalar(String::from("BandwidthVoucher").as_bytes()),
+    };
+
+    let bandwidth_credential =
+        obtain_signature(&params, &bandwidth_credential_attributes, validators)
+            .await
+            .expect("could not obtain bandwidth credential");
+
+    prepare_for_spending(
+        raw_identity,
+        &bandwidth_credential,
+        &bandwidth_credential_attributes,
+        &verification_key,
+    )
+    .expect("could not prepare out bandwidth credential for spending")
+}
+
 async fn register_with_gateway(
    gateway: &gateway::Node,
    our_identity: Arc<identity::KeyPair>,
@@ -1,6 +1,6 @@
 [package]
 name = "nym-socks5-client"
-version = "1.0.0-rc.2"
+version = "1.0.0-rc.1"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 edition = "2021"
 rust-version = "1.56"
@@ -27,7 +27,6 @@ url = "2.2"
 client-core = { path = "../client-core" }
 coconut-interface = { path = "../../common/coconut-interface", optional = true }
 credentials = { path = "../../common/credentials", optional = true }
-credential-storage = { path = "../../common/credential-storage" }
 config = { path = "../../common/config" }
 crypto = { path = "../../common/crypto" }
 gateway-client = { path = "../../common/client-libs/gateway-client" }
@@ -38,12 +37,12 @@ socks5-requests = { path = "../../common/socks5/requests" }
 topology = { path = "../../common/topology" }
 pemstore = { path = "../../common/pemstore" }
 proxy-helpers = { path = "../../common/socks5/proxy-helpers" }
-validator-client = { path = "../../common/client-libs/validator-client", features = ["nymd-client"] }
+validator-client = { path = "../../common/client-libs/validator-client" }
 version-checker = { path = "../../common/version-checker" }
 network-defaults = { path = "../../common/network-defaults" }

 [features]
-coconut = ["coconut-interface", "credentials", "gateway-requests/coconut", "gateway-client/coconut", "credentials/coconut", "client-core/coconut"]
+coconut = ["coconut-interface", "credentials", "gateway-requests/coconut", "gateway-client/coconut"]
 eth = []

 [build-dependencies]
@@ -46,8 +46,10 @@ public_encryption_key_file = '{{ client.public_encryption_key_file }}'
 # sent but not received back.
 reply_encryption_key_store_path = '{{ client.reply_encryption_key_store_path }}'

-# Path to the database containing bandwidth credentials
-database_path = '{{ client.database_path }}'
+# Path to directory containing public/private keys used for bandwidth token purchase.
+# Those are saved in case of emergency, to be able to reclaim bandwidth tokens.
+# The public key is the name of the file, while the private key is the content.
+backup_bandwidth_token_keys_dir = '{{ client.backup_bandwidth_token_keys_dir }}'

 # Ethereum private key.
 eth_private_key = '{{ client.eth_private_key }}'
@@ -162,16 +162,14 @@ impl NymClient {

        #[cfg(feature = "coconut")]
        let bandwidth_controller = BandwidthController::new(
-            credential_storage::initialise_storage(self.config.get_base().get_database_path())
-                .await,
            self.config.get_base().get_validator_api_endpoints(),
+            *self.key_manager.identity_keypair().public_key(),
        );
        #[cfg(not(feature = "coconut"))]
        let bandwidth_controller = BandwidthController::new(
-            credential_storage::initialise_storage(self.config.get_base().get_database_path())
-                .await,
            self.config.get_base().get_eth_endpoint(),
            self.config.get_base().get_eth_private_key(),
+            self.config.get_base().get_backup_bandwidth_token_keys_dir(),
        )
        .expect("Could not create bandwidth controller");

@@ -4,10 +4,20 @@
 use clap::{App, Arg, ArgMatches};
 use client_core::client::key_manager::KeyManager;
 use client_core::config::persistence::key_pathfinder::ClientKeyPathfinder;
+#[cfg(feature = "coconut")]
+use coconut_interface::{hash_to_scalar, Credential, Parameters};
 use config::NymConfig;
+#[cfg(feature = "coconut")]
+use credentials::coconut::bandwidth::{
+    obtain_signature, prepare_for_spending, BandwidthVoucherAttributes, TOTAL_ATTRIBUTES,
+};
+#[cfg(feature = "coconut")]
+use credentials::obtain_aggregate_verification_key;
 use crypto::asymmetric::{encryption, identity};
 use gateway_client::GatewayClient;
 use gateway_requests::registration::handshake::SharedKeys;
+#[cfg(feature = "coconut")]
+use network_defaults::BANDWIDTH_VALUE;
 use nymsphinx::addressing::clients::Recipient;
 use nymsphinx::addressing::nodes::NodeIdentity;
 use rand::{prelude::SliceRandom, rngs::OsRng, thread_rng};
@@ -88,6 +98,36 @@ pub fn command_args<'a, 'b>() -> clap::App<'a, 'b> {
    app
 }

+// this behaviour should definitely be changed, we shouldn't
+// need to get bandwidth credential for registration
+#[cfg(feature = "coconut")]
+async fn _prepare_temporary_credential(validators: &[Url], raw_identity: &[u8]) -> Credential {
+    let verification_key = obtain_aggregate_verification_key(validators)
+        .await
+        .expect("could not obtain aggregate verification key of validators");
+
+    let params = Parameters::new(TOTAL_ATTRIBUTES).unwrap();
+    let bandwidth_credential_attributes = BandwidthVoucherAttributes {
+        serial_number: params.random_scalar(),
+        binding_number: params.random_scalar(),
+        voucher_value: hash_to_scalar(BANDWIDTH_VALUE.to_be_bytes()),
+        voucher_info: hash_to_scalar("BandwidthVoucher"),
+    };
+
+    let bandwidth_credential =
+        obtain_signature(&params, &bandwidth_credential_attributes, validators)
+            .await
+            .expect("could not obtain bandwidth credential");
+
+    prepare_for_spending(
+        raw_identity,
+        &bandwidth_credential,
+        &bandwidth_credential_attributes,
+        &verification_key,
+    )
+    .expect("could not prepare out bandwidth credential for spending")
+}
+
 async fn register_with_gateway(
    gateway: &gateway::Node,
    our_identity: Arc<identity::KeyPair>,
@@ -1,7 +1,7 @@
 [package]
 name = "nym-client-wasm"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jedrzej Stuczynski <andrew@nymtech.net>"]
-version = "1.0.0-rc.2"
+version = "1.0.0-rc.1"
 edition = "2021"
 keywords = ["nym", "sphinx", "wasm", "webassembly", "privacy", "client"]
 license = "Apache-2.0"
@@ -109,6 +109,12 @@ impl NymClient {
    pub async fn initial_setup(self) -> Self {
        let testnet_mode = self.testnet_mode;

+        #[cfg(feature = "coconut")]
+        let bandwidth_controller = Some(gateway_client::bandwidth::BandwidthController::new(
+            vec![self.validator_server.clone()],
+            *self.identity.public_key(),
+        ));
+        #[cfg(not(feature = "coconut"))]
        let bandwidth_controller = None;

        let mut client = self.get_and_update_topology().await;
@@ -17,7 +17,6 @@ url = "2.2"
 rand = { version = "0.7.3", features = ["wasm-bindgen"] }
 secp256k1 = "0.20.3"
 web3 = { version = "0.17.0", default-features = false }
-async-trait = { version = "0.1.51" }

 # internal
 credentials = { path = "../../credentials" }
@@ -27,7 +26,6 @@ nymsphinx = { path = "../../nymsphinx" }
 pemstore = { path = "../../pemstore" }
 coconut-interface = { path = "../../coconut-interface", optional = true }
 network-defaults = { path = "../../network-defaults" }
-validator-client = { path = "../validator-client", optional = true }

 [dependencies.tungstenite]
 version = "0.13"
@@ -41,9 +39,6 @@ features = ["macros", "rt", "net", "sync", "time"]
 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio-tungstenite]
 version = "0.14"

-[target."cfg(not(target_arch = \"wasm32\"))".dependencies.credential-storage]
-path = "../../credential-storage"
-
 # wasm-only dependencies
 [target."cfg(target_arch = \"wasm32\")".dependencies.wasm-bindgen]
 version = "0.2"
@@ -72,6 +67,6 @@ features = ["js"]
 #url = "2.1"

 [features]
-coconut = ["gateway-requests/coconut", "coconut-interface", "validator-client", "credentials/coconut"]
+coconut = ["gateway-requests/coconut", "coconut-interface"]
 wasm = ["web3/wasm", "web3/http", "web3/signing"]
 default = ["web3/default"]
@@ -1,28 +1,24 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-#[cfg(target_arch = "wasm32")]
-use crate::wasm_storage::{Storage, StorageError};
-#[cfg(feature = "coconut")]
-use coconut_interface::Base58;
-#[cfg(feature = "coconut")]
-#[cfg(not(target_arch = "wasm32"))]
-use credential_storage::error::StorageError;
-#[cfg(not(target_arch = "wasm32"))]
-use credential_storage::storage::Storage;
 #[cfg(feature = "coconut")]
 use credentials::coconut::{
-    bandwidth::prepare_for_spending, utils::obtain_aggregate_verification_key,
+    bandwidth::{
+        obtain_signature, prepare_for_spending, BandwidthVoucherAttributes, TOTAL_ATTRIBUTES,
+    },
+    utils::obtain_aggregate_verification_key,
 };
 #[cfg(not(feature = "coconut"))]
 use credentials::token::bandwidth::TokenCredential;
 #[cfg(not(feature = "coconut"))]
 use crypto::asymmetric::identity;
+use crypto::asymmetric::identity::PublicKey;
+use network_defaults::BANDWIDTH_VALUE;
 #[cfg(not(feature = "coconut"))]
 use network_defaults::{
-    eth_contract::ETH_ERC20_JSON_ABI, eth_contract::ETH_JSON_ABI, BANDWIDTH_VALUE,
-    ETH_BURN_FUNCTION_NAME, ETH_CONTRACT_ADDRESS, ETH_ERC20_APPROVE_FUNCTION_NAME,
-    ETH_ERC20_CONTRACT_ADDRESS, ETH_MIN_BLOCK_DEPTH, TOKENS_TO_BURN, UTOKENS_TO_BURN,
+    eth_contract::ETH_ERC20_JSON_ABI, eth_contract::ETH_JSON_ABI, ETH_BURN_FUNCTION_NAME,
+    ETH_CONTRACT_ADDRESS, ETH_ERC20_APPROVE_FUNCTION_NAME, ETH_ERC20_CONTRACT_ADDRESS,
+    ETH_MIN_BLOCK_DEPTH, TOKENS_TO_BURN, UTOKENS_TO_BURN,
 };
 #[cfg(not(feature = "coconut"))]
 use pemstore::traits::PemStorableKeyPair;
@@ -30,6 +26,9 @@ use pemstore::traits::PemStorableKeyPair;
 use rand::rngs::OsRng;
 #[cfg(not(feature = "coconut"))]
 use secp256k1::SecretKey;
+#[cfg(not(feature = "coconut"))]
+use std::io::{Read, Write};
+#[cfg(not(feature = "coconut"))]
 use std::str::FromStr;
 #[cfg(not(feature = "coconut"))]
 use web3::{
@@ -70,35 +69,35 @@ pub fn eth_erc20_contract(web3: Web3<Http>) -> Contract<Http> {
 }

 #[derive(Clone)]
-pub struct BandwidthController<St: Storage> {
-    storage: St,
+pub struct BandwidthController {
    #[cfg(feature = "coconut")]
    validator_endpoints: Vec<url::Url>,
+    #[cfg(feature = "coconut")]
+    identity: PublicKey,
    #[cfg(not(feature = "coconut"))]
    contract: Contract<Http>,
    #[cfg(not(feature = "coconut"))]
    erc20_contract: Contract<Http>,
    #[cfg(not(feature = "coconut"))]
    eth_private_key: SecretKey,
+    #[cfg(not(feature = "coconut"))]
+    backup_bandwidth_token_keys_dir: std::path::PathBuf,
 }

-impl<St> BandwidthController<St>
-where
-    St: Storage + Clone + 'static,
-{
+impl BandwidthController {
    #[cfg(feature = "coconut")]
-    pub fn new(storage: St, validator_endpoints: Vec<url::Url>) -> Self {
+    pub fn new(validator_endpoints: Vec<url::Url>, identity: PublicKey) -> Self {
        BandwidthController {
-            storage,
            validator_endpoints,
+            identity,
        }
    }

    #[cfg(not(feature = "coconut"))]
    pub fn new(
-        storage: St,
        eth_endpoint: String,
        eth_private_key: String,
+        backup_bandwidth_token_keys_dir: std::path::PathBuf,
    ) -> Result<Self, GatewayClientError> {
        // Fail early, on invalid url
        let transport =
@@ -111,42 +110,60 @@ where
            .map_err(|_| GatewayClientError::InvalidEthereumPrivateKey)?;

        Ok(BandwidthController {
-            storage,
            contract,
            erc20_contract,
            eth_private_key,
+            backup_bandwidth_token_keys_dir,
        })
    }

    #[cfg(not(feature = "coconut"))]
-    async fn backup_keypair(&self, keypair: &identity::KeyPair) -> Result<(), GatewayClientError> {
-        self.storage
-            .insert_erc20_credential(
-                keypair.public_key().to_base58_string(),
-                keypair.private_key().to_base58_string(),
-            )
-            .await?;
+    fn backup_keypair(&self, keypair: &identity::KeyPair) -> Result<(), GatewayClientError> {
+        std::fs::create_dir_all(&self.backup_bandwidth_token_keys_dir)?;
+        let file_path = self
+            .backup_bandwidth_token_keys_dir
+            .join(keypair.public_key().to_base58_string());
+        let mut file = std::fs::File::create(file_path)?;
+        file.write_all(&keypair.private_key().to_bytes())?;

        Ok(())
    }

    #[cfg(not(feature = "coconut"))]
-    async fn restore_keypair(&self) -> Result<identity::KeyPair, GatewayClientError> {
-        let data = self.storage.get_next_erc20_credential().await?;
-        let public_key = identity::PublicKey::from_base58_string(data.public_key).unwrap();
-        let private_key = identity::PrivateKey::from_base58_string(data.private_key).unwrap();
-
-        Ok(identity::KeyPair::from_keys(private_key, public_key))
+    fn restore_keypair(&self) -> Result<identity::KeyPair, GatewayClientError> {
+        std::fs::create_dir_all(&self.backup_bandwidth_token_keys_dir)?;
+        let file = std::fs::read_dir(&self.backup_bandwidth_token_keys_dir)?
+            .find(|entry| {
+                entry
+                    .as_ref()
+                    .map(|entry| entry.path().is_file())
+                    .unwrap_or(false)
+            })
+            .unwrap_or_else(|| Err(std::io::Error::from(std::io::ErrorKind::NotFound)))?;
+        let file_path = file.path();
+        let pub_key = file_path
+            .file_name()
+            .ok_or_else(|| std::io::Error::from(std::io::ErrorKind::NotFound))?
+            .to_str()
+            .ok_or_else(|| std::io::Error::from(std::io::ErrorKind::NotFound))?;
+        let mut priv_key = vec![];
+        std::fs::File::open(file_path.clone())?.read_to_end(&mut priv_key)?;
+        Ok(identity::KeyPair::from_keys(
+            identity::PrivateKey::from_bytes(&priv_key).unwrap(),
+            identity::PublicKey::from_base58_string(pub_key).unwrap(),
+        ))
    }

    #[cfg(not(feature = "coconut"))]
-    async fn mark_keypair_as_spent(
-        &self,
-        keypair: &identity::KeyPair,
-    ) -> Result<(), GatewayClientError> {
-        self.storage
-            .consume_erc20_credential(keypair.public_key().to_base58_string())
-            .await?;
+    fn mark_keypair_as_spent(&self, keypair: &identity::KeyPair) -> Result<(), GatewayClientError> {
+        let mut spent_dir = self.backup_bandwidth_token_keys_dir.clone();
+        spent_dir.push("spent");
+        std::fs::create_dir_all(&spent_dir)?;
+        let file_path_old = self
+            .backup_bandwidth_token_keys_dir
+            .join(keypair.public_key().to_base58_string());
+        let file_path_new = spent_dir.join(keypair.public_key().to_base58_string());
+        std::fs::rename(file_path_old, file_path_new)?;

        Ok(())
    }
@@ -156,24 +173,31 @@ where
        &self,
    ) -> Result<coconut_interface::Credential, GatewayClientError> {
        let verification_key = obtain_aggregate_verification_key(&self.validator_endpoints).await?;
-        let bandwidth_credential = self.storage.get_next_coconut_credential().await?;
-        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 =
-            coconut_interface::Attribute::try_from_bs58(bandwidth_credential.serial_number)?;
-        let binding_number =
-            coconut_interface::Attribute::try_from_bs58(bandwidth_credential.binding_number)?;
-        let signature =
-            coconut_interface::Signature::try_from_bs58(bandwidth_credential.signature)?;
+        let params = coconut_interface::Parameters::new(TOTAL_ATTRIBUTES).unwrap();
+
+        // TODO: Decide what is the value and additional info associated with the bandwidth voucher
+        let bandwidth_credential_attributes = BandwidthVoucherAttributes {
+            serial_number: params.random_scalar(),
+            binding_number: params.random_scalar(),
+            voucher_value: coconut_interface::hash_to_scalar(BANDWIDTH_VALUE.to_be_bytes()),
+            voucher_info: coconut_interface::hash_to_scalar(
+                String::from("BandwidthVoucher").as_bytes(),
+            ),
+        };
+
+        let bandwidth_credential = obtain_signature(
+            &params,
+            &bandwidth_credential_attributes,
+            &self.validator_endpoints,
+        )
+        .await?;
+        // the above would presumably be loaded from a file

        // the below would only be executed once we know where we want to spend it (i.e. which gateway and stuff)
        Ok(prepare_for_spending(
-            voucher_value,
-            voucher_info,
-            serial_number,
-            binding_number,
-            &signature,
+            &self.identity.to_bytes(),
+            &bandwidth_credential,
+            &bandwidth_credential_attributes,
            &verification_key,
        )?)
    }
@@ -181,15 +205,15 @@ where
    #[cfg(not(feature = "coconut"))]
    pub async fn prepare_token_credential(
        &self,
-        gateway_identity: identity::PublicKey,
+        gateway_identity: PublicKey,
        gateway_owner: String,
    ) -> Result<TokenCredential, GatewayClientError> {
-        let kp = match self.restore_keypair().await {
+        let kp = match self.restore_keypair() {
            Ok(kp) => kp,
            Err(_) => {
                let mut rng = OsRng;
                let kp = identity::KeyPair::new(&mut rng);
-                self.backup_keypair(&kp).await?;
+                self.backup_keypair(&kp)?;
                kp
            }
        };
@@ -199,7 +223,7 @@ where
        self.buy_token_credential(verification_key, signed_verification_key, gateway_owner)
            .await?;

-        self.mark_keypair_as_spent(&kp).await?;
+        self.mark_keypair_as_spent(&kp)?;

        let message: Vec<u8> = verification_key
            .to_bytes()
@@ -220,7 +244,7 @@ where
    #[cfg(not(feature = "coconut"))]
    pub async fn buy_token_credential(
        &self,
-        verification_key: identity::PublicKey,
+        verification_key: PublicKey,
        signed_verification_key: identity::Signature,
        gateway_owner: String,
    ) -> Result<(), GatewayClientError> {
@@ -9,12 +9,8 @@ pub use crate::packet_router::{
    AcknowledgementReceiver, AcknowledgementSender, MixnetMessageReceiver, MixnetMessageSender,
 };
 use crate::socket_state::{PartiallyDelegated, SocketState};
-#[cfg(target_arch = "wasm32")]
-use crate::wasm_storage::PersistentStorage;
 #[cfg(feature = "coconut")]
 use coconut_interface::Credential;
-#[cfg(not(target_arch = "wasm32"))]
-use credential_storage::PersistentStorage;
 #[cfg(not(feature = "coconut"))]
 use credentials::token::bandwidth::TokenCredential;
 use crypto::asymmetric::identity;
@@ -55,7 +51,7 @@ pub struct GatewayClient {
    connection: SocketState,
    packet_router: PacketRouter,
    response_timeout_duration: Duration,
-    bandwidth_controller: Option<BandwidthController<PersistentStorage>>,
+    bandwidth_controller: Option<BandwidthController>,

    // reconnection related variables
    /// Specifies whether client should try to reconnect to gateway on connection failure.
@@ -79,7 +75,7 @@ impl GatewayClient {
        mixnet_message_sender: MixnetMessageSender,
        ack_sender: AcknowledgementSender,
        response_timeout_duration: Duration,
-        bandwidth_controller: Option<BandwidthController<PersistentStorage>>,
+        bandwidth_controller: Option<BandwidthController>,
    ) -> Self {
        GatewayClient {
            authenticated: false,
@@ -1,10 +1,6 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-#[cfg(target_arch = "wasm32")]
-use crate::wasm_storage::StorageError;
-#[cfg(not(target_arch = "wasm32"))]
-use credential_storage::error::StorageError;
 use gateway_requests::registration::handshake::error::HandshakeError;
 use std::io;
 use thiserror::Error;
@@ -25,18 +21,15 @@ pub enum GatewayClientError {
    #[error("There was a network error - {0}")]
    NetworkError(#[from] WsError),

-    #[error("There was a credential storage error - {0}")]
-    CredentialStorageError(#[from] StorageError),
-
-    #[cfg(feature = "coconut")]
-    #[error("Coconut error - {0}")]
-    CoconutError(#[from] coconut_interface::CoconutError),
-
    // TODO: see if `JsValue` is a reasonable type for this
    #[cfg(target_arch = "wasm32")]
    #[error("There was a network error")]
    NetworkErrorWasm(JsValue),

+    #[cfg(not(feature = "coconut"))]
+    #[error("Keypair IO error - {0}")]
+    IOError(#[from] std::io::Error),
+
    #[cfg(not(feature = "coconut"))]
    #[error("Could not burn ERC20 token in Ethereum smart contract - {0}")]
    BurnTokenError(#[from] Web3Error),
@@ -76,9 +69,6 @@ pub enum GatewayClientError {
    #[error("Client does not have enough bandwidth: estimated {0}, remaining: {1}")]
    NotEnoughBandwidth(i64, i64),

-    #[error("There are no more bandwidth credentials acquired. Please buy some more if you want to use the mixnet")]
-    NoMoreBandwidthCredentials,
-
    #[error("Received an unexpected response")]
    UnexpectedResponse,

@@ -13,8 +13,6 @@ pub mod client;
 pub mod error;
 pub mod packet_router;
 pub mod socket_state;
-#[cfg(feature = "wasm")]
-mod wasm_storage;

 /// Helper method for reading from websocket stream. Helps to flatten the structure.
 pub(crate) fn cleanup_socket_message(
@@ -72,12 +72,7 @@ impl PacketRouter {

        if !received_acks.is_empty() {
            trace!("routing acks");
-            match self.ack_sender.unbounded_send(received_acks) {
-                Ok(_) => {}
-                Err(e) => {
-                    error!("failed to send ack: {:?}", e);
-                }
-            };
+            self.ack_sender.unbounded_send(received_acks).unwrap();
        }
    }
 }
@@ -74,7 +74,7 @@ impl PartiallyDelegated {
            // This would also require NOT discarding any text responses here.

            // TODO: those can return the "send confirmations" - perhaps it should be somehow worked around?
-            Message::Text(text) => trace!(
+            Message::Text(text) => debug!(
                "received a text message - probably a response to some previous query! - {}",
                text
            ),
@@ -1,98 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use async_trait::async_trait;
-use thiserror::Error;
-
-#[derive(Error, Debug)]
-pub enum StorageError {
-    #[error("Wasm client is not yet supported")]
-    WasmNotSupported,
-
-    #[allow(dead_code)]
-    #[error("Code shouldn't reach this point")]
-    InconsistentData,
-}
-
-#[derive(Clone)]
-pub struct PersistentStorage {}
-
-pub struct CoconutCredential {
-    pub id: i64,
-    pub voucher_value: String,
-    pub voucher_info: String,
-    pub serial_number: String,
-    pub binding_number: String,
-    pub signature: String,
-}
-
-pub struct ERC20Credential {
-    pub id: i64,
-    pub public_key: String,
-    pub private_key: String,
-    pub consumed: bool,
-}
-
-#[async_trait]
-pub trait Storage: Send + Sync {
-    async fn insert_coconut_credential(
-        &self,
-        voucher_value: String,
-        voucher_info: String,
-        serial_number: String,
-        binding_number: String,
-        signature: String,
-    ) -> Result<(), StorageError>;
-
-    async fn get_next_coconut_credential(&self) -> Result<CoconutCredential, StorageError>;
-
-    async fn remove_coconut_credential(&self, id: i64) -> Result<(), StorageError>;
-
-    async fn insert_erc20_credential(
-        &self,
-        public_key: String,
-        private_key: String,
-    ) -> Result<(), StorageError>;
-
-    async fn get_next_erc20_credential(&self) -> Result<ERC20Credential, StorageError>;
-
-    async fn consume_erc20_credential(&self, public_key: String) -> Result<(), StorageError>;
-}
-
-#[async_trait]
-impl Storage for PersistentStorage {
-    async fn insert_coconut_credential(
-        &self,
-        _voucher_value: String,
-        _voucher_info: String,
-        _serial_number: String,
-        _binding_number: String,
-        _signature: String,
-    ) -> Result<(), StorageError> {
-        Err(StorageError::WasmNotSupported)
-    }
-
-    async fn get_next_coconut_credential(&self) -> Result<CoconutCredential, StorageError> {
-        Err(StorageError::WasmNotSupported)
-    }
-
-    async fn remove_coconut_credential(&self, _id: i64) -> Result<(), StorageError> {
-        Err(StorageError::WasmNotSupported)
-    }
-
-    async fn insert_erc20_credential(
-        &self,
-        _public_key: String,
-        _private_key: String,
-    ) -> Result<(), StorageError> {
-        Err(StorageError::WasmNotSupported)
-    }
-
-    async fn get_next_erc20_credential(&self) -> Result<ERC20Credential, StorageError> {
-        Err(StorageError::WasmNotSupported)
-    }
-
-    async fn consume_erc20_credential(&self, _public_key: String) -> Result<(), StorageError> {
-        Err(StorageError::WasmNotSupported)
-    }
-}
@@ -9,7 +9,6 @@ rust-version = "1.56"

 [dependencies]
 base64 = "0.13"
-colored = "2.0"
 mixnet-contract-common = { path= "../../cosmwasm-smart-contracts/mixnet-contract" }
 vesting-contract-common = { path= "../../cosmwasm-smart-contracts/vesting-contract" }
 vesting-contract = { path = "../../../contracts/vesting" }
@@ -19,8 +18,6 @@ reqwest = { version = "0.11", features = ["json"] }
 thiserror = "1"
 log = "0.4"
 url = { version = "2.2", features = ["serde"] }
-tokio = { version = "1.10", features = ["sync", "time"] }
-futures = "0.3"

 coconut-interface = { path = "../../coconut-interface" }
 network-defaults = { path = "../../network-defaults" }
@@ -32,12 +29,16 @@ validator-api-requests = { path = "../../../validator-api/validator-api-requests
 async-trait = { version = "0.1.51", optional = true }
 bip39 = { version = "1", features = ["rand"], optional = true }
 config = { path = "../../config", optional = true }
-cosmrs = { git = "https://github.com/nymtech/cosmos-rust", branch = "bugfix/account-id-length-validation", features = ["rpc", "bip32", "cosmwasm"], optional = true}
+cosmrs = { version = "0.4.1", features = [
+    "rpc",
+    "bip32",
+    "cosmwasm",
+], optional = true }
 prost = { version = "0.9", default-features = false, optional = true }
 flate2 = { version = "1.0.20", optional = true }
 sha2 = { version = "0.9.5", optional = true }
 itertools = { version = "0.10", optional = true }
-cosmwasm-std = { version = "1.0.0-beta8", optional = true }
+cosmwasm-std = { version = "1.0.0-beta6", optional = true }

 [dev-dependencies]
 ts-rs = "6.1.2"
@@ -153,10 +153,6 @@ impl Client<SigningNymdClient> {
        )?;
        Ok(())
    }
-
-    pub fn set_nymd_simulated_gas_multiplier(&mut self, multiplier: f32) {
-        self.nymd.set_simulated_gas_multiplier(multiplier)
-    }
 }

 #[cfg(feature = "nymd-client")]
@@ -264,14 +260,13 @@ impl<C> Client<C> {
        &self,
        address: String,
        mix_identity: IdentityKey,
-        proxy: Option<String>,
    ) -> Result<u128, ValidatorClientError>
    where
        C: CosmWasmClient + Sync,
    {
        Ok(self
            .nymd
-            .get_delegator_rewards(address, mix_identity, proxy)
+            .get_delegator_rewards(address, mix_identity)
            .await?
            .u128())
    }
@@ -279,14 +274,13 @@ impl<C> Client<C> {
    pub async fn get_pending_delegation_events(
        &self,
        owner_address: String,
-        proxy_address: Option<String>,
    ) -> Result<Vec<DelegationEvent>, ValidatorClientError>
    where
        C: CosmWasmClient + Sync,
    {
        Ok(self
            .nymd
-            .get_pending_delegation_events(owner_address, proxy_address)
+            .get_pending_delegation_events(owner_address)
            .await?)
    }

@@ -691,16 +685,6 @@ impl ApiClient {
        Ok(self.validator_api.blind_sign(request_body).await?)
    }

-    pub async fn partial_bandwidth_credential(
-        &self,
-        request_body: &str,
-    ) -> Result<BlindedSignatureResponse, ValidatorClientError> {
-        Ok(self
-            .validator_api
-            .partial_bandwidth_credential(request_body)
-            .await?)
-    }
-
    pub async fn get_coconut_verification_key(
        &self,
    ) -> Result<VerificationKeyResponse, ValidatorClientError> {
@@ -1,238 +0,0 @@
-use crate::nymd::error::NymdError;
-use crate::nymd::{NymdClient, QueryNymdClient};
-use crate::ApiClient;
-use network_defaults::all::Network;
-
-use colored::Colorize;
-use core::fmt;
-use itertools::Itertools;
-use std::collections::HashMap;
-use std::hash::BuildHasher;
-use std::time::Duration;
-use tokio::time::timeout;
-use url::Url;
-
-const MAX_URLS_TESTED: usize = 200;
-const CONNECTION_TEST_TIMEOUT_SEC: u64 = 2;
-
-// Run connection tests for all specified nymd and api urls. These are all run concurrently.
-pub async fn run_validator_connection_test<H: BuildHasher + 'static>(
-    nymd_urls: impl Iterator<Item = (Network, Url)>,
-    api_urls: impl Iterator<Item = (Network, Url)>,
-    mixnet_contract_address: HashMap<Network, Option<cosmrs::AccountId>, H>,
-) -> (
-    HashMap<Network, Vec<(Url, bool)>>,
-    HashMap<Network, Vec<(Url, bool)>>,
-) {
-    // Setup all the clients for the connection tests
-    let connection_test_clients =
-        setup_connection_tests(nymd_urls, api_urls, mixnet_contract_address);
-
-    // Run all tests concurrently
-    let connection_results = futures::future::join_all(
-        connection_test_clients
-            .into_iter()
-            .take(MAX_URLS_TESTED)
-            .map(ClientForConnectionTest::run_connection_check),
-    )
-    .await;
-
-    // Seperate and collect results into HashMaps
-    (
-        extract_and_collect_results_into_map(&connection_results, &UrlType::Nymd),
-        extract_and_collect_results_into_map(&connection_results, &UrlType::Api),
-    )
-}
-
-fn setup_connection_tests<H: BuildHasher + 'static>(
-    nymd_urls: impl Iterator<Item = (Network, Url)>,
-    api_urls: impl Iterator<Item = (Network, Url)>,
-    mixnet_contract_address: HashMap<Network, Option<cosmrs::AccountId>, H>,
-) -> impl Iterator<Item = ClientForConnectionTest> {
-    let nymd_connection_test_clients = nymd_urls.filter_map(move |(network, url)| {
-        let address = mixnet_contract_address
-            .get(&network)
-            .expect("No configured contract address")
-            .clone();
-        NymdClient::<QueryNymdClient>::connect(url.as_str(), address, None, None)
-            .map(move |client| ClientForConnectionTest::Nymd(network, url, Box::new(client)))
-            .ok()
-    });
-
-    let api_connection_test_clients = api_urls.map(|(network, url)| {
-        ClientForConnectionTest::Api(network, url.clone(), ApiClient::new(url))
-    });
-
-    nymd_connection_test_clients.chain(api_connection_test_clients)
-}
-
-fn extract_and_collect_results_into_map(
-    connection_results: &[ConnectionResult],
-    url_type: &UrlType,
-) -> HashMap<Network, Vec<(Url, bool)>> {
-    connection_results
-        .iter()
-        .filter(|c| &c.url_type() == url_type)
-        .map(|c| {
-            let (network, url, result) = c.result();
-            (*network, (url.clone(), *result))
-        })
-        .into_group_map()
-}
-
-async fn test_nymd_connection(
-    network: Network,
-    url: &Url,
-    client: &NymdClient<QueryNymdClient>,
-) -> ConnectionResult {
-    let result = match timeout(
-        Duration::from_secs(CONNECTION_TEST_TIMEOUT_SEC),
-        client.get_mixnet_contract_version(),
-    )
-    .await
-    {
-        Ok(Err(NymdError::TendermintError(e))) => {
-            // If we get a tendermint-rpc error, we classify the node as not contactable
-            log::debug!(
-                "Checking: nymd_url: {network}: {url}: {}: {}",
-                "failed".red(),
-                e
-            );
-            false
-        }
-        Ok(Err(NymdError::AbciError(code, log))) => {
-            // We accept the mixnet contract not found as ok from a connection standpoint. This happens
-            // for example on a pre-launch network.
-            log::debug!(
-                "Checking: nymd_url: {network}: {url}: {}, but with abci error: {code}: {log}",
-                "success".green()
-            );
-            code == 18
-        }
-        Ok(Err(error @ NymdError::NoContractAddressAvailable)) => {
-            log::debug!(
-                "Checking: nymd_url: {network}: {url}: {}: {error}",
-                "failed".red()
-            );
-            false
-        }
-        Ok(Err(e)) => {
-            // For any other error, we're optimistic and just try anyway.
-            log::debug!(
-                "Checking: nymd_url: {network}: {url}: {}, but with error: {e}",
-                "success".green()
-            );
-            true
-        }
-        Ok(Ok(_)) => {
-            log::debug!(
-                "Checking: nymd_url: {network}: {url}: {}",
-                "success".green()
-            );
-            true
-        }
-        Err(e) => {
-            log::debug!(
-                "Checking: nymd_url: {network}: {url}: {}: {e}",
-                "failed".red()
-            );
-            false
-        }
-    };
-    ConnectionResult::Nymd(network, url.clone(), result)
-}
-
-async fn test_api_connection(network: Network, url: &Url, client: &ApiClient) -> ConnectionResult {
-    let result = match timeout(
-        Duration::from_secs(CONNECTION_TEST_TIMEOUT_SEC),
-        client.get_cached_mixnodes(),
-    )
-    .await
-    {
-        Ok(Ok(_)) => {
-            log::debug!("Checking: api_url: {network}: {url}: {}", "success".green());
-            true
-        }
-        Ok(Err(e)) => {
-            log::debug!(
-                "Checking: api_url: {network}: {url}: {}: {e}",
-                "failed".red()
-            );
-            false
-        }
-        Err(e) => {
-            log::debug!(
-                "Checking: api_url: {network}: {url}: {}: {e}",
-                "failed".red()
-            );
-            false
-        }
-    };
-    ConnectionResult::Api(network, url.clone(), result)
-}
-
-enum ClientForConnectionTest {
-    Nymd(Network, Url, Box<NymdClient<QueryNymdClient>>),
-    Api(Network, Url, ApiClient),
-}
-
-impl ClientForConnectionTest {
-    async fn run_connection_check(self) -> ConnectionResult {
-        match self {
-            ClientForConnectionTest::Nymd(network, ref url, ref client) => {
-                test_nymd_connection(network, url, client).await
-            }
-            ClientForConnectionTest::Api(network, ref url, ref client) => {
-                test_api_connection(network, url, client).await
-            }
-        }
-    }
-}
-
-#[derive(Debug, PartialEq, Eq)]
-enum UrlType {
-    Nymd,
-    Api,
-}
-
-impl fmt::Display for UrlType {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            UrlType::Nymd => write!(f, "nymd"),
-            UrlType::Api => write!(f, "api"),
-        }
-    }
-}
-
-#[derive(Debug)]
-enum ConnectionResult {
-    Nymd(Network, Url, bool),
-    Api(Network, Url, bool),
-}
-
-impl ConnectionResult {
-    fn result(&self) -> (&Network, &Url, &bool) {
-        match self {
-            ConnectionResult::Nymd(network, url, result)
-            | ConnectionResult::Api(network, url, result) => (network, url, result),
-        }
-    }
-
-    fn url_type(&self) -> UrlType {
-        match self {
-            ConnectionResult::Nymd(..) => UrlType::Nymd,
-            ConnectionResult::Api(..) => UrlType::Api,
-        }
-    }
-}
-
-impl fmt::Display for ConnectionResult {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let (network, url, result) = self.result();
-        let url_type = self.url_type();
-        write!(
-            f,
-            "{network}: {url}: {url_type}: connection is successful: {result}"
-        )
-    }
-}
@@ -2,8 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0

 pub mod client;
-#[cfg(feature = "nymd-client")]
-pub mod connection_tester;
 mod error;
 #[cfg(feature = "nymd-client")]
 pub mod nymd;
@@ -8,7 +8,9 @@ use crate::nymd::cosmwasm_client::types::{
 };
 use crate::nymd::error::NymdError;
 use async_trait::async_trait;
-use cosmrs::proto::cosmos::auth::v1beta1::{QueryAccountRequest, QueryAccountResponse};
+use cosmrs::proto::cosmos::auth::v1beta1::{
+    BaseAccount, QueryAccountRequest, QueryAccountResponse,
+};
 use cosmrs::proto::cosmos::bank::v1beta1::{
    QueryAllBalancesRequest, QueryAllBalancesResponse, QueryBalanceRequest, QueryBalanceResponse,
    QueryTotalSupplyRequest, QueryTotalSupplyResponse,
@@ -81,16 +83,21 @@ pub trait CosmWasmClient: rpc::Client {
            .make_abci_query::<_, QueryAccountResponse>(path, req)
            .await?;

-        res.account.map(TryFrom::try_from).transpose()
+        let base_account = res
+            .account
+            .map(|account| BaseAccount::decode(account.value.as_ref()))
+            .transpose()?;
+
+        base_account
+            .map(|base_account| base_account.try_into())
+            .transpose()
    }

    async fn get_sequence(&self, address: &AccountId) -> Result<SequenceResponse, NymdError> {
-        let account = self
+        let base_account = self
            .get_account(address)
            .await?
            .ok_or_else(|| NymdError::NonExistentAccountError(address.clone()))?;
-        let base_account = account.try_get_base_account()?;
-
        Ok(SequenceResponse {
            account_number: base_account.account_number,
            sequence: base_account.sequence,
@@ -3,9 +3,7 @@

 use crate::nymd::error::NymdError;
 use cosmrs::proto::cosmos::base::query::v1beta1::{PageRequest, PageResponse};
-use cosmrs::proto::cosmos::base::v1beta1::Coin as ProtoCoin;
 use cosmrs::rpc::endpoint::broadcast;
-use cosmrs::Coin;
 use flate2::write::GzEncoder;
 use flate2::Compression;
 use std::io::Write;
@@ -67,14 +65,3 @@ pub(crate) fn next_page_key(pagination_info: Option<PageResponse>) -> Option<Vec

    None
 }
-
-pub(crate) fn parse_proto_coin_vec(value: Vec<ProtoCoin>) -> Result<Vec<Coin>, NymdError> {
-    value
-        .into_iter()
-        .map(|proto_coin| {
-            Coin::try_from(&proto_coin).map_err(|_| NymdError::MalformedCoin {
-                coin_representation: format!("{:?}", proto_coin),
-            })
-        })
-        .collect()
-}
@@ -1,34 +1,23 @@
-// Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

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

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

@@ -43,11 +32,8 @@ pub struct SequenceResponse {
    pub sequence: SequenceNumber,
 }

-/// BaseAccount defines a base account type. It contains all the necessary fields
-/// for basic account functionality. Any custom account type should extend this
-/// type for additional functionality (e.g. vesting).
 #[derive(Debug)]
-pub struct BaseAccount {
+pub struct Account {
    /// Bech32 account address
    pub address: AccountId,
    pub pubkey: Option<PublicKey>,
@@ -55,10 +41,10 @@ pub struct BaseAccount {
    pub sequence: SequenceNumber,
 }

-impl TryFrom<ProtoBaseAccount> for BaseAccount {
+impl TryFrom<BaseAccount> for Account {
    type Error = NymdError;

-    fn try_from(value: ProtoBaseAccount) -> Result<Self, Self::Error> {
+    fn try_from(value: BaseAccount) -> Result<Self, Self::Error> {
        let address: AccountId = value
            .address
            .parse()
@@ -70,7 +56,7 @@ impl TryFrom<ProtoBaseAccount> for BaseAccount {
            .transpose()
            .map_err(|_| NymdError::InvalidPublicKey(address.clone()))?;

-        Ok(BaseAccount {
+        Ok(Account {
            address,
            pubkey,
            account_number: value.account_number,
@@ -79,261 +65,6 @@ impl TryFrom<ProtoBaseAccount> for BaseAccount {
    }
 }

-/// ModuleAccount defines an account for modules that holds coins on a pool.
-#[derive(Debug)]
-pub struct ModuleAccount {
-    pub base_account: Option<BaseAccount>,
-    pub name: String,
-    pub permissions: Vec<String>,
-}
-
-impl TryFrom<ProtoModuleAccount> for ModuleAccount {
-    type Error = NymdError;
-
-    fn try_from(value: ProtoModuleAccount) -> Result<Self, Self::Error> {
-        let base_account = value.base_account.map(TryFrom::try_from).transpose()?;
-
-        Ok(ModuleAccount {
-            base_account,
-            name: value.name,
-            permissions: value.permissions,
-        })
-    }
-}
-
-/// BaseVestingAccount implements the VestingAccount interface. It contains all
-/// the necessary fields needed for any vesting account implementation.
-#[derive(Debug)]
-pub struct BaseVestingAccount {
-    pub base_account: Option<BaseAccount>,
-    pub original_vesting: Vec<Coin>,
-    pub delegated_free: Vec<Coin>,
-    pub delegated_vesting: Vec<Coin>,
-    pub end_time: i64,
-}
-
-impl TryFrom<ProtoBaseVestingAccount> for BaseVestingAccount {
-    type Error = NymdError;
-
-    fn try_from(value: ProtoBaseVestingAccount) -> Result<Self, Self::Error> {
-        let base_account = value.base_account.map(TryFrom::try_from).transpose()?;
-
-        let original_vesting = parse_proto_coin_vec(value.original_vesting)?;
-        let delegated_free = parse_proto_coin_vec(value.delegated_free)?;
-        let delegated_vesting = parse_proto_coin_vec(value.delegated_vesting)?;
-
-        Ok(BaseVestingAccount {
-            base_account,
-            original_vesting,
-            delegated_free,
-            delegated_vesting,
-            end_time: value.end_time,
-        })
-    }
-}
-
-/// ContinuousVestingAccount implements the VestingAccount interface. It
-/// continuously vests by unlocking coins linearly with respect to time.
-#[derive(Debug)]
-pub struct ContinuousVestingAccount {
-    pub base_vesting_account: Option<BaseVestingAccount>,
-    pub start_time: i64,
-}
-
-impl TryFrom<ProtoContinuousVestingAccount> for ContinuousVestingAccount {
-    type Error = NymdError;
-
-    fn try_from(value: ProtoContinuousVestingAccount) -> Result<Self, Self::Error> {
-        let base_vesting_account = value
-            .base_vesting_account
-            .map(TryFrom::try_from)
-            .transpose()?;
-
-        Ok(ContinuousVestingAccount {
-            base_vesting_account,
-            start_time: value.start_time,
-        })
-    }
-}
-
-/// DelayedVestingAccount implements the VestingAccount interface. It vests all
-/// coins after a specific time, but non prior. In other words, it keeps them
-/// locked until a specified time.
-#[derive(Debug)]
-pub struct DelayedVestingAccount {
-    pub base_vesting_account: Option<BaseVestingAccount>,
-}
-
-impl TryFrom<ProtoDelayedVestingAccount> for DelayedVestingAccount {
-    type Error = NymdError;
-
-    fn try_from(value: ProtoDelayedVestingAccount) -> Result<Self, Self::Error> {
-        let base_vesting_account = value
-            .base_vesting_account
-            .map(TryFrom::try_from)
-            .transpose()?;
-
-        Ok(DelayedVestingAccount {
-            base_vesting_account,
-        })
-    }
-}
-
-/// Period defines a length of time and amount of coins that will vest.
-#[derive(Debug)]
-pub struct Period {
-    pub length: i64,
-    pub amount: Vec<Coin>,
-}
-
-impl TryFrom<ProtoPeriod> for Period {
-    type Error = NymdError;
-
-    fn try_from(value: ProtoPeriod) -> Result<Self, Self::Error> {
-        Ok(Period {
-            length: value.length,
-            amount: parse_proto_coin_vec(value.amount)?,
-        })
-    }
-}
-
-/// PeriodicVestingAccount implements the VestingAccount interface. It
-/// periodically vests by unlocking coins during each specified period.
-#[derive(Debug)]
-pub struct PeriodicVestingAccount {
-    pub base_vesting_account: Option<BaseVestingAccount>,
-    pub start_time: i64,
-    pub vesting_periods: Vec<Period>,
-}
-
-impl TryFrom<ProtoPeriodicVestingAccount> for PeriodicVestingAccount {
-    type Error = NymdError;
-
-    fn try_from(value: ProtoPeriodicVestingAccount) -> Result<Self, Self::Error> {
-        let base_vesting_account = value
-            .base_vesting_account
-            .map(TryFrom::try_from)
-            .transpose()?;
-
-        let vesting_periods = value
-            .vesting_periods
-            .into_iter()
-            .map(TryFrom::try_from)
-            .collect::<Result<_, _>>()?;
-
-        Ok(PeriodicVestingAccount {
-            base_vesting_account,
-            start_time: value.start_time,
-            vesting_periods,
-        })
-    }
-}
-
-/// PermanentLockedAccount implements the VestingAccount interface. It does
-/// not ever release coins, locking them indefinitely. Coins in this account can
-/// still be used for delegating and for governance votes even while locked.
-#[derive(Debug)]
-pub struct PermanentLockedAccount {
-    pub base_vesting_account: Option<BaseVestingAccount>,
-}
-
-impl TryFrom<ProtoPermanentLockedAccount> for PermanentLockedAccount {
-    type Error = NymdError;
-
-    fn try_from(value: ProtoPermanentLockedAccount) -> Result<Self, Self::Error> {
-        let base_vesting_account = value
-            .base_vesting_account
-            .map(TryFrom::try_from)
-            .transpose()?;
-
-        Ok(PermanentLockedAccount {
-            base_vesting_account,
-        })
-    }
-}
-
-#[derive(Debug)]
-pub enum Account {
-    Base(BaseAccount),
-    Module(ModuleAccount),
-    BaseVesting(BaseVestingAccount),
-    ContinuousVesting(ContinuousVestingAccount),
-    DelayedVesting(DelayedVestingAccount),
-    PeriodicVesting(PeriodicVestingAccount),
-    PermanentLockedVesting(PermanentLockedAccount),
-}
-
-impl Account {
-    pub fn try_get_base_account(&self) -> Result<&BaseAccount, NymdError> {
-        match self {
-            Account::Base(acc) => Ok(acc),
-            Account::Module(acc) => acc
-                .base_account
-                .as_ref()
-                .ok_or(NymdError::NoBaseAccountInformationAvailable),
-            Account::BaseVesting(acc) => acc
-                .base_account
-                .as_ref()
-                .ok_or(NymdError::NoBaseAccountInformationAvailable),
-            Account::ContinuousVesting(acc) => acc
-                .base_vesting_account
-                .as_ref()
-                .and_then(|vesting_acc| vesting_acc.base_account.as_ref())
-                .ok_or(NymdError::NoBaseAccountInformationAvailable),
-            Account::DelayedVesting(acc) => acc
-                .base_vesting_account
-                .as_ref()
-                .and_then(|vesting_acc| vesting_acc.base_account.as_ref())
-                .ok_or(NymdError::NoBaseAccountInformationAvailable),
-            Account::PeriodicVesting(acc) => acc
-                .base_vesting_account
-                .as_ref()
-                .and_then(|vesting_acc| vesting_acc.base_account.as_ref())
-                .ok_or(NymdError::NoBaseAccountInformationAvailable),
-            Account::PermanentLockedVesting(acc) => acc
-                .base_vesting_account
-                .as_ref()
-                .and_then(|vesting_acc| vesting_acc.base_account.as_ref())
-                .ok_or(NymdError::NoBaseAccountInformationAvailable),
-        }
-    }
-}
-
-impl TryFrom<Any> for Account {
-    type Error = NymdError;
-
-    fn try_from(raw_account: Any) -> Result<Self, Self::Error> {
-        match raw_account.type_url.as_ref() {
-            "/cosmos.auth.v1beta1.BaseAccount" => Ok(Account::Base(
-                ProtoBaseAccount::decode(raw_account.value.as_ref())?.try_into()?,
-            )),
-            "/cosmos.auth.v1beta1.ModuleAccount" => Ok(Account::Module(
-                ProtoModuleAccount::decode(raw_account.value.as_ref())?.try_into()?,
-            )),
-            "/cosmos.vesting.v1beta1.BaseVestingAccount" => Ok(Account::BaseVesting(
-                ProtoBaseVestingAccount::decode(raw_account.value.as_ref())?.try_into()?,
-            )),
-            "/cosmos.vesting.v1beta1.ContinuousVestingAccount" => Ok(Account::ContinuousVesting(
-                ProtoContinuousVestingAccount::decode(raw_account.value.as_ref())?.try_into()?,
-            )),
-            "/cosmos.vesting.v1beta1.DelayedVestingAccount" => Ok(Account::DelayedVesting(
-                ProtoDelayedVestingAccount::decode(raw_account.value.as_ref())?.try_into()?,
-            )),
-            "/cosmos.vesting.v1beta1.PeriodicVestingAccount" => Ok(Account::PeriodicVesting(
-                ProtoPeriodicVestingAccount::decode(raw_account.value.as_ref())?.try_into()?,
-            )),
-            "/cosmos.vesting.v1beta1.PermanentLockedAccount" => {
-                Ok(Account::PermanentLockedVesting(
-                    ProtoPermanentLockedAccount::decode(raw_account.value.as_ref())?.try_into()?,
-                ))
-            }
-            _ => Err(NymdError::UnsupportedAccountType {
-                type_url: raw_account.type_url,
-            }),
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct Code {
    pub code_id: ContractCodeId,
@@ -108,15 +108,6 @@ pub enum NymdError {

    #[error("Abci query failed with code {0} - {1}")]
    AbciError(u32, abci::Log),
-
-    #[error("Unsupported account type: {type_url}")]
-    UnsupportedAccountType { type_url: String },
-
-    #[error("{coin_representation} is not a valid Cosmos Coin")]
-    MalformedCoin { coin_representation: String },
-
-    #[error("This account does not have BaseAccount information available to it")]
-    NoBaseAccountInformationAvailable,
 }

 impl NymdError {
@@ -3,8 +3,8 @@

 use crate::nymd::cosmwasm_client::signing_client;
 use crate::nymd::cosmwasm_client::types::{
-    Account, ChangeAdminResult, ContractCodeId, ExecuteResult, InstantiateOptions,
-    InstantiateResult, MigrateResult, SequenceResponse, UploadResult,
+    ChangeAdminResult, ContractCodeId, ExecuteResult, InstantiateOptions, InstantiateResult,
+    MigrateResult, SequenceResponse, UploadResult,
 };
 use crate::nymd::error::NymdError;
 use crate::nymd::wallet::DirectSecp256k1HdWallet;
@@ -29,12 +29,9 @@ pub use crate::nymd::cosmwasm_client::client::CosmWasmClient;
 pub use crate::nymd::cosmwasm_client::signing_client::SigningCosmWasmClient;
 pub use crate::nymd::fee::Fee;
 use crate::nymd::fee::DEFAULT_SIMULATED_GAS_MULTIPLIER;
-pub use cosmrs::rpc::endpoint::tx::Response as TxResponse;
 pub use cosmrs::rpc::endpoint::validators::Response as ValidatorResponse;
 pub use cosmrs::rpc::HttpClient as QueryNymdClient;
 pub use cosmrs::rpc::Paging;
-pub use cosmrs::tendermint::abci::responses::{DeliverTx, Event};
-pub use cosmrs::tendermint::abci::tag::Tag;
 pub use cosmrs::tendermint::block::Height;
 pub use cosmrs::tendermint::hash;
 pub use cosmrs::tendermint::validator::Info as TendermintValidatorInfo;
@@ -171,10 +168,6 @@ impl<C> NymdClient<C> {
            .ok_or(NymdError::NoContractAddressAvailable)
    }

-    pub fn set_simulated_gas_multiplier(&mut self, multiplier: f32) {
-        self.simulated_gas_multiplier = multiplier;
-    }
-
    pub fn address(&self) -> &AccountId
    where
        C: SigningCosmWasmClient,
@@ -230,16 +223,6 @@ impl<C> NymdClient<C> {
        self.client.get_sequence(self.address()).await
    }

-    pub async fn get_account_details(
-        &self,
-        address: &AccountId,
-    ) -> Result<Option<Account>, NymdError>
-    where
-        C: SigningCosmWasmClient + Sync,
-    {
-        self.client.get_account(address).await
-    }
-
    pub async fn get_current_block_timestamp(&self) -> Result<TendermintTime, NymdError>
    where
        C: CosmWasmClient + Sync,
@@ -291,13 +274,6 @@ impl<C> NymdClient<C> {
        self.client.get_balance(address, denom).await
    }

-    pub async fn get_tx(&self, id: tx::Hash) -> Result<TxResponse, NymdError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        self.client.get_tx(id).await
-    }
-
    pub async fn get_total_supply(&self) -> Result<Vec<Coin>, NymdError>
    where
        C: CosmWasmClient + Sync,
@@ -329,7 +305,6 @@ impl<C> NymdClient<C> {
        &self,
        address: String,
        mix_identity: IdentityKey,
-        proxy: Option<String>,
    ) -> Result<Uint128, NymdError>
    where
        C: CosmWasmClient + Sync,
@@ -337,7 +312,6 @@ impl<C> NymdClient<C> {
        let request = QueryMsg::QueryDelegatorReward {
            address,
            mix_identity,
-            proxy,
        };
        self.client
            .query_contract_smart(self.mixnet_contract_address()?, &request)
@@ -347,15 +321,11 @@ impl<C> NymdClient<C> {
    pub async fn get_pending_delegation_events(
        &self,
        owner_address: String,
-        proxy_address: Option<String>,
    ) -> Result<Vec<DelegationEvent>, NymdError>
    where
        C: CosmWasmClient + Sync,
    {
-        let request = QueryMsg::GetPendingDelegationEvents {
-            owner_address,
-            proxy_address,
-        };
+        let request = QueryMsg::GetPendingDelegationEvents { owner_address };
        self.client
            .query_contract_smart(self.mixnet_contract_address()?, &request)
            .await
@@ -256,7 +256,7 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
                self.vesting_contract_address()?,
                &req,
                fee,
-                "VestingContract::DelegateToMixnode",
+                "VestingContract::DeledateToMixnode",
                vec![],
            )
            .await
@@ -7,7 +7,4 @@ pub enum ValidatorAPIError {
        #[from]
        source: reqwest::Error,
    },
-
-    #[error("Request failed with error message - {0}")]
-    GenericRequestFailure(String),
 }
@@ -14,7 +14,7 @@ use validator_api_requests::models::{
 };

 pub mod error;
-pub mod routes;
+pub(crate) mod routes;

 type PathSegments<'a> = &'a [&'a str];
 type Params<'a, K, V> = &'a [(K, V)];
@@ -39,10 +39,6 @@ impl Client {
        self.url = new_url
    }

-    pub fn current_url(&self) -> &Url {
-        &self.url
-    }
-
    async fn query_validator_api<T, K, V>(
        &self,
        path: PathSegments<'_>,
@@ -70,14 +66,14 @@ impl Client {
        V: AsRef<str>,
    {
        let url = create_api_url(&self.url, path, params);
-        let response = self.reqwest_client.post(url).json(json_body).send().await?;
-        if response.status().is_success() {
-            Ok(response.json().await?)
-        } else {
-            Err(ValidatorAPIError::GenericRequestFailure(
-                response.text().await?,
-            ))
-        }
+        Ok(self
+            .reqwest_client
+            .post(url)
+            .json(json_body)
+            .send()
+            .await?
+            .json()
+            .await?)
    }

    pub async fn get_mixnodes(&self) -> Result<Vec<MixNodeBond>, ValidatorAPIError> {
@@ -258,29 +254,7 @@ impl Client {
        request_body: &BlindSignRequestBody,
    ) -> Result<BlindedSignatureResponse, ValidatorAPIError> {
        self.post_validator_api(
-            &[
-                routes::API_VERSION,
-                routes::COCONUT_ROUTES,
-                routes::BANDWIDTH,
-                routes::COCONUT_BLIND_SIGN,
-            ],
-            NO_PARAMS,
-            request_body,
-        )
-        .await
-    }
-
-    pub async fn partial_bandwidth_credential(
-        &self,
-        request_body: &str,
-    ) -> Result<BlindedSignatureResponse, ValidatorAPIError> {
-        self.post_validator_api(
-            &[
-                routes::API_VERSION,
-                routes::COCONUT_ROUTES,
-                routes::BANDWIDTH,
-                routes::COCONUT_PARTIAL_BANDWIDTH_CREDENTIAL,
-            ],
+            &[routes::API_VERSION, routes::COCONUT_BLIND_SIGN],
            NO_PARAMS,
            request_body,
        )
@@ -291,12 +265,7 @@ impl Client {
        &self,
    ) -> Result<VerificationKeyResponse, ValidatorAPIError> {
        self.query_validator_api(
-            &[
-                routes::API_VERSION,
-                routes::COCONUT_ROUTES,
-                routes::BANDWIDTH,
-                routes::COCONUT_VERIFICATION_KEY,
-            ],
+            &[routes::API_VERSION, routes::COCONUT_VERIFICATION_KEY],
            NO_PARAMS,
        )
        .await
@@ -10,11 +10,7 @@ pub const GATEWAYS: &str = "gateways";
 pub const ACTIVE: &str = "active";
 pub const REWARDED: &str = "rewarded";

-pub const COCONUT_ROUTES: &str = "coconut";
-pub const BANDWIDTH: &str = "bandwidth";
-
 pub const COCONUT_BLIND_SIGN: &str = "blind-sign";
-pub const COCONUT_PARTIAL_BANDWIDTH_CREDENTIAL: &str = "partial-bandwidth-credential";
 pub const COCONUT_VERIFICATION_KEY: &str = "verification-key";

 pub const STATUS_ROUTES: &str = "status";
@@ -5,9 +5,7 @@ edition = "2021"
 description = "Crutch library until there is proper SerDe support for coconut structs"

 [dependencies]
-bs58 = "0.4.0"
-getset = "0.1.1"
 serde = { version = "1.0", features = ["derive"] }
-thiserror = "1"
+getset = "0.1.1"

 nymcoconut = {path = "../nymcoconut" }
@@ -5,15 +5,21 @@ use thiserror::Error;

 #[derive(Debug, Error)]
 pub enum CoconutInterfaceError {
-    #[error("not enough bytes: {0} received, minimum {1} required")]
-    InvalidByteLength(usize, usize),
+    #[error("could not parse validator URL: {source}")]
+    UrlParsingError {
+        #[from]
+        source: url::ParseError,
+    },

-    #[error("Could not decode base 58 string - {0}")]
-    MalformedString(#[from] bs58::decode::Error),
+    #[error("could not aggregate verification key: {0}")]
+    AggregateVerificationKeyError(coconut_rs::CoconutError),

-    #[error("Not enough public attributes were specified")]
-    NotEnoughPublicAttributes,
+    #[error("could not prove credential: {0}")]
+    ProveCredentialError(coconut_rs::CoconutError),

-    #[error("Could not recover bandwidth value")]
-    InvalidBandwidth,
+    #[error("got invalid signature index: {0}")]
+    InvalidSignatureIdx(usize),
+
+    #[error("got too many total attributes(public + private): {0} received, {1} is the maximum")]
+    TooManyTotalAttributes(usize, u32),
 }
@@ -1,13 +1,8 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-pub mod error;
-
 use getset::{CopyGetters, Getters};
 use serde::{Deserialize, Serialize};
-use std::str::FromStr;
-
-use error::CoconutInterfaceError;

 pub use nymcoconut::*;

@@ -25,11 +20,9 @@ impl Credential {
    pub fn new(
        n_params: u32,
        theta: Theta,
-        voucher_value: String,
-        voucher_info: String,
+        public_attributes: Vec<Vec<u8>>,
        signature: &Signature,
    ) -> Credential {
-        let public_attributes = vec![voucher_value.into_bytes(), voucher_info.into_bytes()];
        Credential {
            n_params,
            theta,
@@ -38,18 +31,8 @@ impl Credential {
        }
    }

-    pub fn voucher_value(&self) -> Result<u64, CoconutInterfaceError> {
-        let bandwidth_vec = self
-            .public_attributes
-            .get(0)
-            .ok_or(CoconutInterfaceError::NotEnoughPublicAttributes)?
-            .to_owned();
-        let bandwidth_str = String::from_utf8(bandwidth_vec)
-            .map_err(|_| CoconutInterfaceError::InvalidBandwidth)?;
-        let value =
-            u64::from_str(&bandwidth_str).map_err(|_| CoconutInterfaceError::InvalidBandwidth)?;
-
-        Ok(value)
+    pub fn public_attributes(&self) -> Vec<Vec<u8>> {
+        self.public_attributes.clone()
    }

    pub fn verify(&self, verification_key: &VerificationKey) -> bool {
@@ -96,39 +79,27 @@ impl VerifyCredentialBody {
    }
 }
 //  All strings are base58 encoded representations of structs
-#[derive(Clone, Serialize, Deserialize, Debug, Getters, CopyGetters)]
+#[derive(Serialize, Deserialize, Debug, Getters, CopyGetters)]
 pub struct BlindSignRequestBody {
    #[getset(get = "pub")]
    blind_sign_request: BlindSignRequest,
-    #[getset(get = "pub")]
-    tx_hash: String,
-    #[getset(get = "pub")]
-    signature: String,
    public_attributes: Vec<String>,
    #[getset(get = "pub")]
-    public_attributes_plain: Vec<String>,
-    #[getset(get = "pub")]
    total_params: u32,
 }

 impl BlindSignRequestBody {
    pub fn new(
        blind_sign_request: &BlindSignRequest,
-        tx_hash: String,
-        signature: String,
        public_attributes: &[Attribute],
-        public_attributes_plain: Vec<String>,
        total_params: u32,
    ) -> BlindSignRequestBody {
        BlindSignRequestBody {
            blind_sign_request: blind_sign_request.clone(),
-            tx_hash,
-            signature,
            public_attributes: public_attributes
                .iter()
                .map(|attr| attr.to_bs58())
                .collect(),
-            public_attributes_plain,
            total_params,
        }
    }
@@ -141,46 +112,14 @@ impl BlindSignRequestBody {
    }
 }

-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Serialize, Deserialize)]
 pub struct BlindedSignatureResponse {
-    pub remote_key: [u8; 32],
-    pub encrypted_signature: Vec<u8>,
+    pub blinded_signature: BlindedSignature,
 }

 impl BlindedSignatureResponse {
-    pub fn new(encrypted_signature: Vec<u8>, remote_key: [u8; 32]) -> BlindedSignatureResponse {
-        BlindedSignatureResponse {
-            encrypted_signature,
-            remote_key,
-        }
-    }
-
-    pub fn to_base58_string(&self) -> String {
-        bs58::encode(&self.to_bytes()).into_string()
-    }
-
-    pub fn from_base58_string<I: AsRef<[u8]>>(val: I) -> Result<Self, CoconutInterfaceError> {
-        let bytes = bs58::decode(val).into_vec()?;
-        Self::from_bytes(&bytes)
-    }
-
-    pub fn to_bytes(&self) -> Vec<u8> {
-        let mut bytes = self.remote_key.to_vec();
-        bytes.extend_from_slice(&self.encrypted_signature);
-        bytes
-    }
-
-    pub fn from_bytes(bytes: &[u8]) -> Result<Self, CoconutInterfaceError> {
-        if bytes.len() < 32 {
-            return Err(CoconutInterfaceError::InvalidByteLength(bytes.len(), 32));
-        }
-        let mut remote_key = [0u8; 32];
-        remote_key.copy_from_slice(&bytes[..32]);
-        let encrypted_signature = bytes[32..].to_vec();
-        Ok(BlindedSignatureResponse {
-            remote_key,
-            encrypted_signature,
-        })
+    pub fn new(blinded_signature: BlindedSignature) -> BlindedSignatureResponse {
+        BlindedSignatureResponse { blinded_signature }
    }
 }

@@ -9,9 +9,8 @@ edition = "2021"
 [dependencies]
 handlebars = "3.0.1"
 humantime-serde = "1.0"
-log = "0.4"
 serde = { version = "1.0", features = ["derive"] }
 toml = "0.5.6"
 url = "2.2"

-network-defaults = { path = "../network-defaults" }
+network-defaults = { path = "../network-defaults" }
@@ -4,8 +4,6 @@
 use handlebars::Handlebars;
 use serde::de::DeserializeOwned;
 use serde::Serialize;
-#[cfg(unix)]
-use std::os::unix::fs::PermissionsExt;
 use std::path::PathBuf;
 use std::{fs, io};

@@ -15,7 +13,6 @@ pub trait NymConfig: Default + Serialize + DeserializeOwned {
    fn template() -> &'static str;

    fn config_file_name() -> String {
-        log::trace!("NymdConfig::config_file_name");
        "config.toml".to_string()
    }

@@ -23,7 +20,6 @@ pub trait NymConfig: Default + Serialize + DeserializeOwned {

    // default, most probable, implementations; can be easily overridden where required
    fn default_config_directory(id: Option<&str>) -> PathBuf {
-        log::trace!("NymdConfig::default_config_directory");
        if let Some(id) = id {
            Self::default_root_directory().join(id).join("config")
        } else {
@@ -32,7 +28,6 @@ pub trait NymConfig: Default + Serialize + DeserializeOwned {
    }

    fn default_data_directory(id: Option<&str>) -> PathBuf {
-        log::trace!("NymdConfig::default_data_path");
        if let Some(id) = id {
            Self::default_root_directory().join(id).join("data")
        } else {
@@ -41,7 +36,6 @@ pub trait NymConfig: Default + Serialize + DeserializeOwned {
    }

    fn default_config_file_path(id: Option<&str>) -> PathBuf {
-        log::trace!("NymdConfig::default_config_file_path");
        Self::default_config_directory(id).join(Self::config_file_name())
    }

@@ -66,25 +60,15 @@ pub trait NymConfig: Default + Serialize + DeserializeOwned {
            None => fs::create_dir_all(self.config_directory()),
        }?;

-        let location = custom_location
-            .unwrap_or_else(|| self.config_directory().join(Self::config_file_name()));
-
-        fs::write(location.clone(), templated_config)?;
-
-        #[cfg(unix)]
-        let mut perms = fs::metadata(location.clone())?.permissions();
-        #[cfg(unix)]
-        perms.set_mode(0o600);
-        #[cfg(unix)]
-        fs::set_permissions(location, perms)?;
-
-        Ok(())
+        fs::write(
+            custom_location
+                .unwrap_or_else(|| self.config_directory().join(Self::config_file_name())),
+            templated_config,
+        )
    }

    fn load_from_file(id: Option<&str>) -> io::Result<Self> {
-        let file = Self::default_config_file_path(id);
-        log::trace!("Loading from file: {:#?}", file);
-        let config_contents = fs::read_to_string(file)?;
+        let config_contents = fs::read_to_string(Self::default_config_file_path(id))?;

        toml::from_str(&config_contents)
            .map_err(|toml_err| io::Error::new(io::ErrorKind::Other, toml_err))
@@ -1,11 +0,0 @@
-[package]
-name = "coconut-bandwidth-contract-common"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-cosmwasm-std = "1.0.0-beta6"
-schemars = "0.8"
-serde = { version = "1.0.103", default-features = false, features = ["derive"] }
@@ -1,34 +0,0 @@
-// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
-pub struct DepositData {
-    deposit_info: String,
-    identity_key: String,
-    encryption_key: String,
-}
-
-impl DepositData {
-    pub fn new(deposit_info: String, identity_key: String, encryption_key: String) -> Self {
-        DepositData {
-            deposit_info,
-            identity_key,
-            encryption_key,
-        }
-    }
-
-    pub fn deposit_info(&self) -> &str {
-        &self.deposit_info
-    }
-
-    pub fn identity_key(&self) -> &str {
-        &self.identity_key
-    }
-
-    pub fn encryption_key(&self) -> &str {
-        &self.encryption_key
-    }
-}
@@ -1,11 +0,0 @@
-// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-// event types
-pub const DEPOSITED_FUNDS_EVENT_TYPE: &str = "deposited-funds";
-
-// attributes that are used in multiple places
-pub const DEPOSIT_VALUE: &str = "deposit-value";
-pub const DEPOSIT_INFO: &str = "deposit-info";
-pub const DEPOSIT_IDENTITY_KEY: &str = "deposit-identity-key";
-pub const DEPOSIT_ENCRYPTION_KEY: &str = "deposit-encryption-key";
@@ -1,3 +0,0 @@
-pub mod deposit;
-pub mod events;
-pub mod msg;
@@ -1,29 +0,0 @@
-// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use cosmwasm_std::Coin;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-
-use crate::deposit::DepositData;
-
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
-pub struct InstantiateMsg {
-    pub multisig_addr: String,
-    pub pool_addr: String,
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum ExecuteMsg {
-    DepositFunds { data: DepositData },
-    ReleaseFunds { funds: Coin },
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum QueryMsg {}
-
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub struct MigrateMsg {}
@@ -7,4 +7,4 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-cosmwasm-std = "1.0.0-beta8"
+cosmwasm-std = "1.0.0-beta6"
@@ -7,7 +7,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-cosmwasm-std = "1.0.0-beta8"
+cosmwasm-std = "1.0.0-beta6"

 serde = { version = "1.0", features = ["derive"] }
 serde_repr = "0.1"
@@ -2,9 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0

 use cosmwasm_std::Env;
-use schemars::gen::SchemaGenerator;
-use schemars::schema::{InstanceType, Schema, SchemaObject};
-use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::convert::TryInto;
 use std::fmt::{Display, Formatter};
@@ -67,39 +64,6 @@ pub struct Interval {
    length: Duration,
 }

-impl JsonSchema for Interval {
-    fn schema_name() -> String {
-        "Interval".to_owned()
-    }
-
-    fn json_schema(gen: &mut SchemaGenerator) -> Schema {
-        let mut schema_object = SchemaObject {
-            instance_type: Some(InstanceType::Object.into()),
-            ..SchemaObject::default()
-        };
-
-        let object_validation = schema_object.object();
-        object_validation
-            .properties
-            .insert("id".to_owned(), gen.subschema_for::<u32>());
-        object_validation.required.insert("id".to_owned());
-
-        // PrimitiveDateTime does not implement JsonSchema. However it has a custom
-        // serialization to string, so we just specify the schema to be String.
-        object_validation
-            .properties
-            .insert("start".to_owned(), gen.subschema_for::<String>());
-        object_validation.required.insert("start".to_owned());
-
-        object_validation
-            .properties
-            .insert("length".to_owned(), gen.subschema_for::<Duration>());
-        object_validation.required.insert("length".to_owned());
-
-        Schema::Object(schema_object)
-    }
-}
-
 impl Interval {
    /// Initialize epoch in the contract with default values.
    pub fn init_epoch(env: Env) -> Self {
@@ -228,7 +228,7 @@ impl DelegatorRewardParams {

        let scaled_delegation_amount = delegation_amount / circulating_supply;
        let delegator_reward =
-            (ONE - self.profit_margin) * (scaled_delegation_amount / self.sigma) * self.node_profit;
+            (ONE - self.profit_margin) * scaled_delegation_amount / self.sigma * self.node_profit;

        let reward = delegator_reward.max(U128::ZERO);
        if let Some(int_reward) = reward.checked_cast() {
@@ -426,17 +426,17 @@ impl MixNodeBond {
        &self,
        params: &RewardParams,
    ) -> Result<(u64, u64, u64), MixnetContractError> {
-        let total_node_reward = self
-            .reward(params)
-            .reward()
-            .checked_to_num::<u128>()
-            .unwrap_or_default();
+        let total_node_reward = self.reward(params);
        let operator_reward = self.operator_reward(params);
-        // Total reward has to be the sum of operator and delegator rewards
-        let delegators_reward = total_node_reward - operator_reward;
+        // TODO: This overestimates the reward by a lot, it should take a Uint128 and return estiamte for that
+        let delegators_reward = self.reward_delegation(self.total_delegation().amount, params);

        Ok((
-            total_node_reward.try_into()?,
+            total_node_reward
+                .reward()
+                .checked_to_num::<u128>()
+                .unwrap_or_default()
+                .try_into()?,
            operator_reward.try_into()?,
            delegators_reward.try_into()?,
        ))
@@ -15,9 +15,6 @@ pub struct InstantiateMsg {
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum ExecuteMsg {
-    UpdateRewardingValidatorAddress {
-        address: String,
-    },
    InitEpoch {},
    ReconcileDelegations {},
    CheckpointMixnodes {},
@@ -104,7 +101,6 @@ pub enum ExecuteMsg {
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum QueryMsg {
-    GetRewardingValidatorAddress {},
    GetAllDelegationKeys {},
    DebugGetAllDelegationValues {},
    GetContractVersion {},
@@ -171,11 +167,9 @@ pub enum QueryMsg {
    QueryDelegatorReward {
        address: String,
        mix_identity: IdentityKey,
-        proxy: Option<String>,
    },
    GetPendingDelegationEvents {
        owner_address: String,
-        proxy_address: Option<String>,
    },
 }

@@ -6,11 +6,11 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-cosmwasm-std = "1.0.0-beta8"
+cosmwasm-std = "1.0.0-beta6"
 mixnet-contract-common = { path = "../mixnet-contract" }
 serde = { version = "1.0", features = ["derive"] }
 schemars = "0.8"
-cw-storage-plus = "0.13.2"
+cw-storage-plus = "0.13.1"
 config = { path = "../../config" }

 [dev-dependencies]
@@ -49,10 +49,6 @@ impl VestingSpecification {
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum ExecuteMsg {
-    CompoundDelegatorReward {
-        mix_identity: String,
-    },
-    CompoundOperatorReward {},
    UpdateMixnodeConfig {
        profit_margin_percent: u8,
    },
@@ -1,20 +0,0 @@
-[package]
-name = "credential-storage"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-async-trait = { version = "0.1.51" }
-nymcoconut = { path = "../nymcoconut" }
-
-log = "0.4"
-sqlx = { version = "0.5", features = ["runtime-tokio-rustls", "sqlite", "macros", "migrate"]}
-thiserror = "1.0"
-tokio = { version = "1.4", features = [ "rt-multi-thread", "net", "signal", "fs" ] }
-
-
-[build-dependencies]
-sqlx = { version = "0.5", features = ["runtime-tokio-rustls", "sqlite", "macros", "migrate"] }
-tokio = { version = "1.4", features = ["rt-multi-thread", "macros"] }
@@ -1,30 +0,0 @@
-/*
- * Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
- * SPDX-License-Identifier: Apache-2.0
- */
-
-use sqlx::{Connection, SqliteConnection};
-use std::env;
-
-#[tokio::main]
-async fn main() {
-    let out_dir = env::var("OUT_DIR").unwrap();
-    let database_path = format!("{}/coconut-credential-example.sqlite", out_dir);
-
-    let mut conn = SqliteConnection::connect(&*format!("sqlite://{}?mode=rwc", database_path))
-        .await
-        .expect("Failed to create SQLx database connection");
-
-    sqlx::migrate!("./migrations")
-        .run(&mut conn)
-        .await
-        .expect("Failed to perform SQLx migrations");
-
-    #[cfg(target_family = "unix")]
-    println!("cargo:rustc-env=DATABASE_URL=sqlite://{}", &database_path);
-
-    #[cfg(target_family = "windows")]
-    // for some strange reason we need to add a leading `/` to the windows path even though it's
-    // not a valid windows path... but hey, it works...
-    println!("cargo:rustc-env=DATABASE_URL=sqlite:///{}", &database_path);
-}
@@ -1,22 +0,0 @@
-/*
- * Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
- * SPDX-License-Identifier: Apache-2.0
- */
-
-CREATE TABLE coconut_credentials
-(
-    id                  INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-    voucher_value       TEXT    NOT NULL,
-    voucher_info        TEXT    NOT NULL,
-    serial_number       TEXT    NOT NULL,
-    binding_number      TEXT    NOT NULL,
-    signature           TEXT    NOT NULL UNIQUE
-);
-
-CREATE TABLE erc20_credentials
-(
-    id                  INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-    public_key          TEXT    NOT NULL,
-    private_key         TEXT    NOT NULL,
-    consumed            BOOLEAN NOT NULL
-);
@@ -1,67 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::models::CoconutCredential;
-
-#[derive(Clone)]
-pub(crate) struct CoconutCredentialManager {
-    connection_pool: sqlx::SqlitePool,
-}
-
-impl CoconutCredentialManager {
-    /// Creates new instance of the `CoconutCredentialManager` with the provided sqlite connection pool.
-    ///
-    /// # Arguments
-    ///
-    /// * `connection_pool`: database connection pool to use.
-    pub(crate) fn new(connection_pool: sqlx::SqlitePool) -> Self {
-        CoconutCredentialManager { connection_pool }
-    }
-
-    /// Inserts provided signature into the database.
-    ///
-    /// # Arguments
-    ///
-    /// * `voucher_value`: Plaintext bandwidth value of the credential.
-    /// * `voucher_info`: Plaintext information of the credential.
-    /// * `serial_number`: Base58 representation of the serial number attribute.
-    /// * `binding_number`: Base58 representation of the binding number attribute.
-    /// * `signature`: Coconut credential in the form of a signature.
-    pub(crate) async fn insert_coconut_credential(
-        &self,
-        voucher_value: String,
-        voucher_info: String,
-        serial_number: String,
-        binding_number: String,
-        signature: String,
-    ) -> Result<(), sqlx::Error> {
-        sqlx::query!(
-            "INSERT INTO coconut_credentials(voucher_value, voucher_info, serial_number, binding_number, signature) VALUES (?, ?, ?, ?, ?)",
-            voucher_value, voucher_info, serial_number, binding_number, signature
-        )
-        .execute(&self.connection_pool)
-        .await?;
-        Ok(())
-    }
-
-    /// Tries to retrieve one of the stored, unused credentials.
-    pub(crate) async fn get_next_coconut_credential(
-        &self,
-    ) -> Result<CoconutCredential, sqlx::Error> {
-        sqlx::query_as!(CoconutCredential, "SELECT * FROM coconut_credentials")
-            .fetch_one(&self.connection_pool)
-            .await
-    }
-
-    /// Removes from the database the specified credential.
-    ///
-    /// # Arguments
-    ///
-    /// * `id`: Database id.
-    pub(crate) async fn remove_coconut_credential(&self, id: i64) -> Result<(), sqlx::Error> {
-        sqlx::query!("DELETE FROM coconut_credentials WHERE id = ?", id)
-            .execute(&self.connection_pool)
-            .await?;
-        Ok(())
-    }
-}
@@ -1,71 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::models::ERC20Credential;
-
-#[derive(Clone)]
-pub(crate) struct ERC20CredentialManager {
-    connection_pool: sqlx::SqlitePool,
-}
-
-impl ERC20CredentialManager {
-    /// Creates new instance of the `ERC20CredentialManager` with the provided sqlite connection pool.
-    ///
-    /// # Arguments
-    ///
-    /// * `connection_pool`: database connection pool to use.
-    pub(crate) fn new(connection_pool: sqlx::SqlitePool) -> Self {
-        ERC20CredentialManager { connection_pool }
-    }
-
-    /// Inserts provided signature into the database.
-    ///
-    /// # Arguments
-    ///
-    /// * `public_key`: Base58 representation of a public key.
-    /// * `private_key`: Base58 representation of a private key.
-    pub(crate) async fn insert_erc20_credential(
-        &self,
-        public_key: String,
-        private_key: String,
-    ) -> Result<(), sqlx::Error> {
-        sqlx::query!(
-            "INSERT INTO erc20_credentials(public_key, private_key, consumed) VALUES (?, ?, ?)",
-            public_key,
-            private_key,
-            false,
-        )
-        .execute(&self.connection_pool)
-        .await?;
-        Ok(())
-    }
-
-    /// Tries to retrieve one of the stored, unused credentials.
-    pub(crate) async fn get_next_erc20_credential(&self) -> Result<ERC20Credential, sqlx::Error> {
-        sqlx::query_as!(
-            ERC20Credential,
-            "SELECT * FROM erc20_credentials WHERE consumed = false"
-        )
-        .fetch_one(&self.connection_pool)
-        .await
-    }
-
-    /// Mark a credential as being consumed.
-    pub(crate) async fn consume_erc20_credential(
-        &self,
-        public_key: String,
-    ) -> Result<(), sqlx::Error> {
-        sqlx::query!(
-            r#"
-                UPDATE erc20_credentials
-                SET consumed = true
-                WHERE public_key = ?
-            "#,
-            public_key
-        )
-        .execute(&self.connection_pool)
-        .await?;
-
-        Ok(())
-    }
-}
@@ -1,16 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use thiserror::Error;
-
-#[derive(Error, Debug)]
-pub enum StorageError {
-    #[error("Database experienced an internal error - {0}")]
-    InternalDatabaseError(#[from] sqlx::Error),
-
-    #[error("Failed to perform database migration - {0}")]
-    MigrationError(#[from] sqlx::migrate::MigrateError),
-
-    #[error("Inconsistent data in database")]
-    InconsistentData,
-}
@@ -1,144 +0,0 @@
-/*
- * Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
- * SPDX-License-Identifier: Apache-2.0
- */
-
-use crate::coconut::CoconutCredentialManager;
-use crate::erc20::ERC20CredentialManager;
-use crate::error::StorageError;
-use crate::storage::Storage;
-
-use crate::models::{CoconutCredential, ERC20Credential};
-use async_trait::async_trait;
-use log::{debug, error};
-use sqlx::ConnectOptions;
-use std::path::{Path, PathBuf};
-
-mod coconut;
-mod erc20;
-pub mod error;
-mod models;
-pub mod storage;
-
-// note that clone here is fine as upon cloning the same underlying pool will be used
-#[derive(Clone)]
-pub struct PersistentStorage {
-    coconut_credential_manager: CoconutCredentialManager,
-    erc20_credential_manager: ERC20CredentialManager,
-}
-
-impl PersistentStorage {
-    /// Initialises `PersistentStorage` using the provided path.
-    ///
-    /// # Arguments
-    ///
-    /// * `database_path`: path to the database.
-    pub async fn init<P: AsRef<Path> + Send>(database_path: P) -> Result<Self, StorageError> {
-        debug!(
-            "Attempting to connect to database {:?}",
-            database_path.as_ref().as_os_str()
-        );
-
-        let mut opts = sqlx::sqlite::SqliteConnectOptions::new()
-            .filename(database_path)
-            .create_if_missing(true);
-
-        opts.disable_statement_logging();
-
-        let connection_pool = match sqlx::SqlitePool::connect_with(opts).await {
-            Ok(db) => db,
-            Err(err) => {
-                error!("Failed to connect to SQLx database: {}", err);
-                return Err(err.into());
-            }
-        };
-
-        if let Err(err) = sqlx::migrate!("./migrations").run(&connection_pool).await {
-            error!("Failed to perform migration on the SQLx database: {}", err);
-            return Err(err.into());
-        }
-
-        Ok(PersistentStorage {
-            coconut_credential_manager: CoconutCredentialManager::new(connection_pool.clone()),
-            erc20_credential_manager: ERC20CredentialManager::new(connection_pool),
-        })
-    }
-}
-
-#[async_trait]
-impl Storage for PersistentStorage {
-    async fn insert_coconut_credential(
-        &self,
-        voucher_value: String,
-        voucher_info: String,
-        serial_number: String,
-        binding_number: String,
-        signature: String,
-    ) -> Result<(), StorageError> {
-        self.coconut_credential_manager
-            .insert_coconut_credential(
-                voucher_value,
-                voucher_info,
-                serial_number,
-                binding_number,
-                signature,
-            )
-            .await?;
-
-        Ok(())
-    }
-
-    async fn get_next_coconut_credential(&self) -> Result<CoconutCredential, StorageError> {
-        let credential = self
-            .coconut_credential_manager
-            .get_next_coconut_credential()
-            .await?;
-
-        Ok(credential)
-    }
-
-    async fn remove_coconut_credential(&self, id: i64) -> Result<(), StorageError> {
-        self.coconut_credential_manager
-            .remove_coconut_credential(id)
-            .await?;
-
-        Ok(())
-    }
-
-    async fn insert_erc20_credential(
-        &self,
-        public_key: String,
-        private_key: String,
-    ) -> Result<(), StorageError> {
-        self.erc20_credential_manager
-            .insert_erc20_credential(public_key, private_key)
-            .await?;
-
-        Ok(())
-    }
-
-    async fn get_next_erc20_credential(&self) -> Result<ERC20Credential, StorageError> {
-        let credential = self
-            .erc20_credential_manager
-            .get_next_erc20_credential()
-            .await?;
-
-        Ok(credential)
-    }
-
-    async fn consume_erc20_credential(&self, public_key: String) -> Result<(), StorageError> {
-        let credential = self
-            .erc20_credential_manager
-            .consume_erc20_credential(public_key)
-            .await?;
-
-        Ok(credential)
-    }
-}
-
-pub async fn initialise_storage(path: PathBuf) -> PersistentStorage {
-    match PersistentStorage::init(path).await {
-        Err(err) => panic!("failed to initialise credential storage - {}", err),
-        Ok(storage) => storage,
-    }
-}
@@ -1,20 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-pub struct CoconutCredential {
-    #[allow(dead_code)]
-    pub id: i64,
-    pub voucher_value: String,
-    pub voucher_info: String,
-    pub serial_number: String,
-    pub binding_number: String,
-    pub signature: String,
-}
-
-pub struct ERC20Credential {
-    #[allow(dead_code)]
-    pub id: i64,
-    pub public_key: String,
-    pub private_key: String,
-    pub consumed: bool,
-}
@@ -1,52 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use async_trait::async_trait;
-
-use crate::models::{CoconutCredential, ERC20Credential};
-use crate::StorageError;
-
-#[async_trait]
-pub trait Storage: Send + Sync {
-    /// Inserts provided signature into the database.
-    ///
-    /// # Arguments
-    ///
-    /// * `signature`: Coconut credential in the form of a signature.
-    async fn insert_coconut_credential(
-        &self,
-        voucher_value: String,
-        voucher_info: String,
-        serial_number: String,
-        binding_number: String,
-        signature: String,
-    ) -> Result<(), StorageError>;
-
-    /// Tries to retrieve one of the stored, unused credentials.
-    async fn get_next_coconut_credential(&self) -> Result<CoconutCredential, StorageError>;
-
-    /// Removes from the database the specified credential.
-    ///
-    /// # Arguments
-    ///
-    /// * `signature`: Coconut credential in the form of a signature.
-    async fn remove_coconut_credential(&self, id: i64) -> Result<(), StorageError>;
-
-    /// Inserts provided signature into the database.
-    ///
-    /// # Arguments
-    ///
-    /// * `public_key`: Base58 representation of a public key.
-    /// * `private_key`: Base58 representation of a private key.
-    async fn insert_erc20_credential(
-        &self,
-        public_key: String,
-        private_key: String,
-    ) -> Result<(), StorageError>;
-
-    /// Tries to retrieve one of the stored, unused credential data.
-    async fn get_next_erc20_credential(&self) -> Result<ERC20Credential, StorageError>;
-
-    /// Mark a credential as being consumed.
-    async fn consume_erc20_credential(&self, public_key: String) -> Result<(), StorageError>;
-}
@@ -7,18 +7,11 @@ edition = "2021"

 [dependencies]
 bls12_381 = { version = "0.5", default-features = false, features = ["pairings", "alloc", "experimental"] }
-cosmrs = { version = "0.4.1", optional = true }
 thiserror = "1.0"
 url = "2.2"

 # I guess temporarily until we get serde support in coconut up and running
 coconut-interface = { path = "../coconut-interface" }
-crypto = { path = "../crypto", features = ["rand", "asymmetric", "symmetric", "hashing"] }
+crypto = { path = "../crypto", features = ["asymmetric"] }
 network-defaults = { path = "../network-defaults" }
 validator-client = { path = "../client-libs/validator-client" }
-
-[dev-dependencies]
-rand = "0.7.3"
-
-[features]
-coconut = ["cosmrs"]
@@ -7,238 +7,71 @@
 // it's the simplest possible case

 use coconut_interface::{
-    hash_to_scalar, prepare_blind_sign, Attribute, BlindSignRequest, Credential, Parameters,
-    PrivateAttribute, PublicAttribute, Signature, VerificationKey,
+    Credential, Parameters, PrivateAttribute, PublicAttribute, Signature, VerificationKey,
 };
-use crypto::asymmetric::{encryption, identity};
+use network_defaults::BANDWIDTH_VALUE;
+use url::Url;

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

+use super::utils::{obtain_aggregate_signature, prepare_credential_for_spending};
+
 pub const PUBLIC_ATTRIBUTES: u32 = 2;
 pub const PRIVATE_ATTRIBUTES: u32 = 2;
 pub const TOTAL_ATTRIBUTES: u32 = PUBLIC_ATTRIBUTES + PRIVATE_ATTRIBUTES;

-pub struct BandwidthVoucher {
+pub struct BandwidthVoucherAttributes {
    // a random secret value generated by the client used for double-spending detection
-    serial_number: PrivateAttribute,
+    pub serial_number: PrivateAttribute,
    // a random secret value generated by the client used to bind multiple credentials together
-    binding_number: PrivateAttribute,
+    pub 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,
+    pub voucher_value: PublicAttribute,
    // 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
-    tx_hash: Hash,
-    // base58 encoded private key ensuring the depositer requested these attributes
-    signing_key: identity::PrivateKey,
-    // base58 encoded private key ensuring only this client receives the signature share
-    encryption_key: encryption::PrivateKey,
-    pedersen_commitments_openings: Vec<Attribute>,
-    blind_sign_request: BlindSignRequest,
-    use_request: bool,
+    pub voucher_info: PublicAttribute,
 }

-impl BandwidthVoucher {
-    pub fn new_with_blind_sign_req(
-        private_attributes: [PrivateAttribute; PRIVATE_ATTRIBUTES as usize],
-        public_attributes_plain: [&str; PUBLIC_ATTRIBUTES as usize],
-        tx_hash: Hash,
-        signing_key: identity::PrivateKey,
-        encryption_key: encryption::PrivateKey,
-        pedersen_commitments_openings: Vec<Attribute>,
-        blind_sign_request: BlindSignRequest,
-    ) -> Self {
-        let voucher_value = public_attributes_plain[0];
-        let voucher_info = public_attributes_plain[1];
-        let voucher_value_plain = voucher_value.to_string();
-        let voucher_info_plain = voucher_info.to_string();
-        let voucher_value = hash_to_scalar(voucher_value.as_bytes());
-        let voucher_info = hash_to_scalar(voucher_info.as_bytes());
-
-        BandwidthVoucher {
-            serial_number: private_attributes[0],
-            binding_number: private_attributes[1],
-            voucher_value,
-            voucher_value_plain,
-            voucher_info,
-            voucher_info_plain,
-            tx_hash,
-            signing_key,
-            encryption_key,
-            pedersen_commitments_openings,
-            blind_sign_request,
-            use_request: false,
-        }
-    }
-    pub fn new(
-        params: &Parameters,
-        voucher_value: String,
-        voucher_info: String,
-        tx_hash: Hash,
-        signing_key: identity::PrivateKey,
-        encryption_key: encryption::PrivateKey,
-    ) -> Self {
-        let serial_number = params.random_scalar();
-        let binding_number = params.random_scalar();
-        let voucher_value_plain = voucher_value.clone();
-        let voucher_info_plain = voucher_info.clone();
-        let voucher_value = 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,
-            pedersen_commitments_openings,
-            blind_sign_request,
-            use_request: true,
-        }
-    }
-
-    /// 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
-    }
-
+impl BandwidthVoucherAttributes {
    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 pedersen_commitments_openings(&self) -> &Vec<Attribute> {
-        &self.pedersen_commitments_openings
-    }
-
-    pub fn blind_sign_request(&self) -> &BlindSignRequest {
-        &self.blind_sign_request
-    }
-
-    pub fn use_request(&self) -> bool {
-        self.use_request
-    }
-
-    pub fn get_public_attributes_plain(&self) -> Vec<String> {
-        vec![
-            self.voucher_value_plain.clone(),
-            self.voucher_info_plain.clone(),
-        ]
-    }
-
    pub fn get_private_attributes(&self) -> Vec<PrivateAttribute> {
        vec![self.serial_number, self.binding_number]
    }
+}

-    pub fn 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)
-    }
+// TODO: this definitely has to be moved somewhere else. It's just a temporary solution
+pub async fn obtain_signature(
+    params: &Parameters,
+    attributes: &BandwidthVoucherAttributes,
+    validators: &[Url],
+) -> Result<Signature, Error> {
+    let public_attributes = attributes.get_public_attributes();
+    let private_attributes = attributes.get_private_attributes();
+
+    obtain_aggregate_signature(params, &public_attributes, &private_attributes, validators).await
 }

 pub fn prepare_for_spending(
-    voucher_value: u64,
-    voucher_info: String,
-    serial_number: PrivateAttribute,
-    binding_number: PrivateAttribute,
+    raw_identity: &[u8],
    signature: &Signature,
+    attributes: &BandwidthVoucherAttributes,
    verification_key: &VerificationKey,
 ) -> Result<Credential, Error> {
+    let public_attributes = vec![
+        raw_identity.to_vec(),
+        BANDWIDTH_VALUE.to_be_bytes().to_vec(),
+    ];
+
    let params = Parameters::new(TOTAL_ATTRIBUTES)?;

    prepare_credential_for_spending(
        &params,
-        voucher_value,
-        voucher_info,
-        serial_number,
-        binding_number,
+        public_attributes,
+        attributes.serial_number,
+        attributes.binding_number,
        signature,
        verification_key,
    )
 }
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use rand::rngs::OsRng;
-
-    #[test]
-    fn voucher_consistency() {
-        let params = Parameters::new(4).unwrap();
-        let mut rng = OsRng;
-        let voucher = BandwidthVoucher::new(
-            &params,
-            "1234".to_string(),
-            "voucher info".to_string(),
-            Hash::new([0; 32]),
-            identity::PrivateKey::from_base58_string(
-                identity::KeyPair::new(&mut rng)
-                    .private_key()
-                    .to_base58_string(),
-            )
-            .unwrap(),
-            encryption::KeyPair::new(&mut rng).private_key().clone(),
-        );
-        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()
-        ));
-    }
-}
@@ -2,5 +2,4 @@
 // SPDX-License-Identifier: Apache-2.0

 pub mod bandwidth;
-pub mod params;
 pub mod utils;
@@ -1,15 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crypto::aes::Aes128;
-use crypto::blake3;
-use crypto::ctr;
-
-type Aes128Ctr = ctr::Ctr64LE<Aes128>;
-
-/// Hashing algorithm used during hkdf for ephemeral shared key generation per blinded signature
-/// response encryption.
-pub type ValidatorApiCredentialHkdfAlgorithm = blake3::Hasher;
-
-/// Encryption algorithm used for end-to-end encryption of blinded signature response
-pub type ValidatorApiCredentialEncryptionAlgorithm = Aes128Ctr;
@@ -1,20 +1,15 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

+use bls12_381::Scalar;
 use coconut_interface::{
-    aggregate_signature_shares, aggregate_verification_keys, prove_bandwidth_credential, Attribute,
-    BlindSignRequestBody, BlindedSignature, Credential, Parameters, Signature, SignatureShare,
-    VerificationKey,
+    aggregate_signature_shares, aggregate_verification_keys, prepare_blind_sign,
+    prove_bandwidth_credential, Attribute, BlindSignRequest, BlindSignRequestBody, Credential,
+    Parameters, Signature, SignatureShare, VerificationKey,
 };
-use crypto::asymmetric::encryption::PublicKey;
-use crypto::shared_key::recompute_shared_key;
-use crypto::symmetric::stream_cipher;
 use url::Url;

-use crate::coconut::bandwidth::{BandwidthVoucher, PRIVATE_ATTRIBUTES, PUBLIC_ATTRIBUTES};
-use crate::coconut::params::{
-    ValidatorApiCredentialEncryptionAlgorithm, ValidatorApiCredentialHkdfAlgorithm,
-};
+use crate::coconut::bandwidth::PRIVATE_ATTRIBUTES;
 use crate::error::Error;

 /// Contacts all provided validators and then aggregate their verification keys.
@@ -68,53 +63,31 @@ pub async fn obtain_aggregate_verification_key(

 async fn obtain_partial_credential(
    params: &Parameters,
-    attributes: &BandwidthVoucher,
+    public_attributes: &[Attribute],
+    private_attributes: &[Attribute],
+    pedersen_commitments_openings: &[Scalar],
+    blind_sign_request: &BlindSignRequest,
    client: &validator_client::ApiClient,
    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 blind_sign_request = attributes.blind_sign_request();
-
-    let response = if attributes.use_request() {
-        let blind_sign_request_body = BlindSignRequestBody::new(
-            blind_sign_request,
-            attributes.tx_hash().to_string(),
-            attributes.sign(blind_sign_request).to_base58_string(),
-            &public_attributes,
-            public_attributes_plain,
-            (public_attributes.len() + private_attributes.len()) as u32,
-        );
-        client.blind_sign(&blind_sign_request_body).await?
-    } else {
-        client
-            .partial_bandwidth_credential(&attributes.tx_hash().to_string())
-            .await?
-    };
-    let encrypted_signature = response.encrypted_signature;
-    let remote_key = PublicKey::from_bytes(&response.remote_key)?;
-
-    let encryption_key = recompute_shared_key::<
-        ValidatorApiCredentialEncryptionAlgorithm,
-        ValidatorApiCredentialHkdfAlgorithm,
-    >(&remote_key, attributes.encryption_key());
-    let zero_iv = stream_cipher::zero_iv::<ValidatorApiCredentialEncryptionAlgorithm>();
-    let blinded_signature_bytes = stream_cipher::decrypt::<ValidatorApiCredentialEncryptionAlgorithm>(
-        &encryption_key,
-        &zero_iv,
-        &encrypted_signature,
+    let blind_sign_request_body = BlindSignRequestBody::new(
+        blind_sign_request,
+        public_attributes,
+        (public_attributes.len() + private_attributes.len()) as u32,
    );

-    let blinded_signature = BlindedSignature::from_bytes(&blinded_signature_bytes)?;
+    let blinded_signature = client
+        .blind_sign(&blind_sign_request_body)
+        .await?
+        .blinded_signature;

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

    Ok(unblinded_signature)
@@ -122,14 +95,13 @@ async fn obtain_partial_credential(

 pub async fn obtain_aggregate_signature(
    params: &Parameters,
-    attributes: &BandwidthVoucher,
+    public_attributes: &[Attribute],
+    private_attributes: &[Attribute],
    validators: &[Url],
 ) -> Result<Signature, Error> {
    if validators.is_empty() {
        return Err(Error::NoValidatorsAvailable);
    }
-    let public_attributes = attributes.get_public_attributes();
-    let private_attributes = attributes.get_private_attributes();

    let mut shares = Vec::with_capacity(validators.len());
    let mut validators_partial_vks: Vec<VerificationKey> = Vec::with_capacity(validators.len());
@@ -138,24 +110,42 @@ pub async fn obtain_aggregate_signature(
    let validator_partial_vk = client.get_coconut_verification_key().await?;
    validators_partial_vks.push(validator_partial_vk.key.clone());

-    let first =
-        obtain_partial_credential(params, attributes, &client, &validator_partial_vk.key).await?;
+    let (pedersen_commitments_openings, blind_sign_request) =
+        prepare_blind_sign(params, private_attributes, public_attributes)?;
+
+    let first = obtain_partial_credential(
+        params,
+        public_attributes,
+        private_attributes,
+        &pedersen_commitments_openings,
+        &blind_sign_request,
+        &client,
+        &validator_partial_vk.key,
+    )
+    .await?;
    shares.push(SignatureShare::new(first, 1));

    for (id, validator_url) in validators.iter().enumerate().skip(1) {
        client.change_validator_api(validator_url.clone());
        let validator_partial_vk = client.get_coconut_verification_key().await?;
        validators_partial_vks.push(validator_partial_vk.key.clone());
-        let signature =
-            obtain_partial_credential(params, attributes, &client, &validator_partial_vk.key)
-                .await?;
+        let signature = obtain_partial_credential(
+            params,
+            public_attributes,
+            private_attributes,
+            &pedersen_commitments_openings,
+            &blind_sign_request,
+            &client,
+            &validator_partial_vk.key,
+        )
+        .await?;
        let share = SignatureShare::new(signature, (id + 1) as u64);
        shares.push(share)
    }

    let mut attributes = Vec::with_capacity(private_attributes.len() + public_attributes.len());
-    attributes.extend_from_slice(&private_attributes);
-    attributes.extend_from_slice(&public_attributes);
+    attributes.extend_from_slice(private_attributes);
+    attributes.extend_from_slice(public_attributes);

    let mut indices: Vec<u64> = Vec::with_capacity(validators_partial_vks.len());
    for i in 0..validators_partial_vks.len() {
@@ -175,8 +165,7 @@ pub async fn obtain_aggregate_signature(
 // TODO: better type flow
 pub fn prepare_credential_for_spending(
    params: &Parameters,
-    voucher_value: u64,
-    voucher_info: String,
+    public_attributes: Vec<Vec<u8>>,
    serial_number: Attribute,
    binding_number: Attribute,
    signature: &Signature,
@@ -191,10 +180,9 @@ pub fn prepare_credential_for_spending(
    )?;

    Ok(Credential::new(
-        PUBLIC_ATTRIBUTES + PRIVATE_ATTRIBUTES,
+        (public_attributes.len() + PRIVATE_ATTRIBUTES as usize) as u32,
        theta,
-        voucher_value.to_string(),
-        voucher_info,
+        public_attributes,
        signature,
    ))
 }
@@ -1,12 +1,9 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-#[cfg(feature = "coconut")]
-use coconut_interface::{error::CoconutInterfaceError, CoconutError};
-use crypto::asymmetric::encryption::KeyRecoveryError;
-use validator_client::ValidatorClientError;
-
+use coconut_interface::CoconutError;
 use thiserror::Error;
+use validator_client::ValidatorClientError;

 #[derive(Debug, Error)]
 pub enum Error {
@@ -16,23 +13,21 @@ pub enum Error {
    #[error("Could not contact any validator")]
    NoValidatorsAvailable,

-    #[cfg(feature = "coconut")]
-    #[error("Ran into a coconut error - {0}")]
+    #[error("Run into a coconut error - {0}")]
    CoconutError(#[from] CoconutError),

-    #[cfg(feature = "coconut")]
-    #[error("Ran into a coconut interface error - {0}")]
-    CoconutInterfaceError(#[from] CoconutInterfaceError),
-
-    #[error("Ran into a validator client error - {0}")]
+    #[error("Run into a validato client error - {0}")]
    ValidatorClientError(#[from] ValidatorClientError),

+    #[error("Not enough public attributes were specified")]
+    NotEnoughPublicAttributes,
+
+    #[error("Bandwidth is expected to be represented on 8 bytes")]
+    InvalidBandwidthSize,
+
    #[error("Bandwidth operation overflowed. {0}")]
    BandwidthOverflow(String),

    #[error("There is not associated bandwidth for the given client")]
    MissingBandwidth,
-
-    #[error("Could not parse the key - {0}")]
-    ParsePublicKey(#[from] KeyRecoveryError),
 }
@@ -1,11 +1,8 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-#[cfg(feature = "coconut")]
 pub mod coconut;
 pub mod error;
-#[cfg(not(feature = "coconut"))]
 pub mod token;

-#[cfg(feature = "coconut")]
 pub use coconut::utils::{obtain_aggregate_signature, obtain_aggregate_verification_key};
@@ -6,6 +6,7 @@ use crypto::asymmetric::identity::{PublicKey, Signature, PUBLIC_KEY_LENGTH, SIGN
 use crate::error::Error;
 use std::convert::TryInto;

+#[cfg(not(feature = "coconut"))]
 pub struct TokenCredential {
    verification_key: PublicKey,
    gateway_identity: PublicKey,
@@ -13,6 +14,7 @@ pub struct TokenCredential {
    signature: Signature,
 }

+#[cfg(not(feature = "coconut"))]
 impl TokenCredential {
    pub fn new(
        verification_key: PublicKey,
@@ -97,6 +99,7 @@ impl TokenCredential {
 mod tests {
    use super::*;

+    #[cfg(not(feature = "coconut"))]
    #[test]
    fn token_serde() {
        // pre-generated, valid values
@@ -1,41 +0,0 @@
-[package]
-name = "dkg"
-version = "0.1.0"
-edition = "2021"
-resolver = "2"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-bitvec = "1.0.0"
-
-# unfortunately until https://github.com/zkcrypto/bls12_381/issues/10 is resolved, we have to rely on the fork
-# as we need to be able to serialize Gt so that we could create the lookup table for baby-step-giant-step algorithm
-bls12_381 = { git = "https://github.com/jstuczyn/bls12_381", branch ="gt-serialisation", default-features = false, features = ["alloc", "pairings", "experimental", "zeroize"] }
-
-bs58 = "0.4"
-
-lazy_static = "1.4.0"
-rand = { version = "0.8.5", default-features = false}
-rand_chacha = "0.3"
-rand_core = "0.6.3"
-sha2 = "0.9"
-serde = "1.0"
-serde_derive = "1.0"
-thiserror = "1.0"
-zeroize = { version = "1.4", features = ["zeroize_derive"] }
-
-[dependencies.group]
-version = "0.11"
-default-features = false
-
-[dependencies.ff]
-version = "0.11"
-default-features = false
-
-[dev-dependencies]
-criterion = "0.3"
-
-[[bench]]
-name = "benchmarks"
-harness = false
@@ -1,541 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use bls12_381::{G1Projective, G2Affine, G2Prepared, Scalar};
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
-use dkg::bte::encryption::BabyStepGiantStepLookup;
-use dkg::bte::proof_chunking::ProofOfChunking;
-use dkg::bte::proof_discrete_log::ProofOfDiscreteLog;
-use dkg::bte::proof_sharing::ProofOfSecretSharing;
-use dkg::bte::{
-    decrypt_share, encrypt_shares, keygen, proof_chunking, proof_sharing, setup, DecryptionKey,
-    Epoch, PublicKey,
-};
-use dkg::interpolation::polynomial::Polynomial;
-use dkg::{Dealing, NodeIndex, Share};
-use ff::Field;
-use rand_core::{RngCore, SeedableRng};
-use std::collections::BTreeMap;
-
-pub fn precompute_default_bsgs_table(c: &mut Criterion) {
-    c.bench_function("bsgs default table", |b| {
-        b.iter(|| black_box(BabyStepGiantStepLookup::default()))
-    });
-}
-
-pub fn precomputing_g2_generator_for_miller_loop(c: &mut Criterion) {
-    let g2 = G2Affine::generator();
-    c.bench_function("precomputing G2Prepared", |b| {
-        b.iter(|| black_box(G2Prepared::from(g2)))
-    });
-}
-
-fn prepare_keys(
-    mut rng: impl RngCore,
-    nodes: usize,
-) -> (BTreeMap<NodeIndex, PublicKey>, Vec<DecryptionKey>) {
-    let params = setup();
-    let mut node_indices = (0..nodes).map(|_| rng.next_u64()).collect::<Vec<_>>();
-    node_indices.sort_unstable();
-
-    let mut receivers = BTreeMap::new();
-    let mut dks = Vec::new();
-    for index in &node_indices {
-        let (dk, pk) = keygen(&params, &mut rng);
-        receivers.insert(*index, *pk.public_key());
-        dks.push(dk)
-    }
-
-    (receivers, dks)
-}
-
-pub fn creating_dealing_for_3_parties(c: &mut Criterion) {
-    let dummy_seed = [42u8; 32];
-    let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-    let params = setup();
-    let threshold = 2;
-    let epoch = Epoch::new(2);
-
-    let (receivers, _) = prepare_keys(&mut rng, 3);
-
-    c.bench_function("creating single dealing for 3 parties (threshold 2)", |b| {
-        b.iter(|| {
-            black_box({
-                Dealing::create(
-                    &mut rng,
-                    &params,
-                    receivers.keys().next().copied().unwrap(),
-                    threshold,
-                    epoch,
-                    &receivers,
-                )
-            })
-        })
-    });
-}
-
-pub fn verifying_dealing_made_for_3_parties_and_recovering_share(c: &mut Criterion) {
-    let dummy_seed = [42u8; 32];
-    let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-    let params = setup();
-    let threshold = 2;
-    let epoch = Epoch::new(2);
-
-    let (receivers, mut dks) = prepare_keys(&mut rng, 3);
-    let (dealing, _) = Dealing::create(
-        &mut rng,
-        &params,
-        receivers.keys().next().copied().unwrap(),
-        threshold,
-        epoch,
-        &receivers,
-    );
-
-    let first_key = dks.get_mut(0).unwrap();
-    first_key.try_update_to(epoch, &params, &mut rng).unwrap();
-
-    c.bench_function(
-        "verifying single dealing made for 3 parties (threshold 2) and recovering share",
-        |b| {
-            b.iter(|| {
-                assert!(dealing
-                    .verify(&params, epoch, threshold, &receivers)
-                    .is_ok());
-                black_box(decrypt_share(first_key, 0, &dealing.ciphertexts, epoch, None).unwrap());
-            })
-        },
-    );
-}
-
-pub fn creating_dealing_for_20_parties(c: &mut Criterion) {
-    let dummy_seed = [42u8; 32];
-    let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-    let params = setup();
-    let threshold = 14;
-    let epoch = Epoch::new(2);
-
-    let (receivers, _) = prepare_keys(&mut rng, 20);
-
-    c.bench_function(
-        "creating single dealing for 20 parties (threshold 14)",
-        |b| {
-            b.iter(|| {
-                black_box({
-                    Dealing::create(
-                        &mut rng,
-                        &params,
-                        receivers.keys().next().copied().unwrap(),
-                        threshold,
-                        epoch,
-                        &receivers,
-                    )
-                })
-            })
-        },
-    );
-}
-
-pub fn verifying_dealing_made_for_20_parties_and_recovering_share(c: &mut Criterion) {
-    let dummy_seed = [42u8; 32];
-    let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-    let params = setup();
-    let threshold = 14;
-    let epoch = Epoch::new(2);
-
-    let (receivers, mut dks) = prepare_keys(&mut rng, 20);
-    let (dealing, _) = Dealing::create(
-        &mut rng,
-        &params,
-        receivers.keys().next().copied().unwrap(),
-        threshold,
-        epoch,
-        &receivers,
-    );
-
-    let first_key = dks.get_mut(0).unwrap();
-    first_key.try_update_to(epoch, &params, &mut rng).unwrap();
-
-    c.bench_function(
-        "verifying single dealing made for 20 parties (threshold 14) and recovering share",
-        |b| {
-            b.iter(|| {
-                assert!(dealing
-                    .verify(&params, epoch, threshold, &receivers)
-                    .is_ok());
-                black_box(decrypt_share(first_key, 0, &dealing.ciphertexts, epoch, None).unwrap());
-            })
-        },
-    );
-}
-
-pub fn creating_dealing_for_100_parties(c: &mut Criterion) {
-    let dummy_seed = [42u8; 32];
-    let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-    let params = setup();
-    let threshold = 67;
-    let epoch = Epoch::new(2);
-
-    let (receivers, _) = prepare_keys(&mut rng, 100);
-
-    c.bench_function(
-        "creating single dealing for 100 parties (threshold 67)",
-        |b| {
-            b.iter(|| {
-                black_box({
-                    Dealing::create(
-                        &mut rng,
-                        &params,
-                        receivers.keys().next().copied().unwrap(),
-                        threshold,
-                        epoch,
-                        &receivers,
-                    )
-                })
-            })
-        },
-    );
-}
-
-pub fn verifying_dealing_made_for_100_parties_and_recovering_share(c: &mut Criterion) {
-    let dummy_seed = [42u8; 32];
-    let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-    let params = setup();
-    let threshold = 67;
-    let epoch = Epoch::new(2);
-
-    let (receivers, mut dks) = prepare_keys(&mut rng, 100);
-    let (dealing, _) = Dealing::create(
-        &mut rng,
-        &params,
-        receivers.keys().next().copied().unwrap(),
-        threshold,
-        epoch,
-        &receivers,
-    );
-
-    let first_key = dks.get_mut(0).unwrap();
-    first_key.try_update_to(epoch, &params, &mut rng).unwrap();
-
-    c.bench_function(
-        "verifying single dealing made for 100 parties (threshold 67) and recovering share",
-        |b| {
-            b.iter(|| {
-                assert!(dealing
-                    .verify(&params, epoch, threshold, &receivers)
-                    .is_ok());
-                black_box(decrypt_share(first_key, 0, &dealing.ciphertexts, epoch, None).unwrap());
-            })
-        },
-    );
-}
-
-pub fn creating_proof_of_key_possession(c: &mut Criterion) {
-    let dummy_seed = [42u8; 32];
-    let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-
-    let g1 = G1Projective::generator();
-    let x = Scalar::random(&mut rng);
-    let y = g1 * x;
-
-    c.bench_function("creating proof of key possession", |b| {
-        b.iter(|| black_box(ProofOfDiscreteLog::construct(&mut rng, &y, &x)))
-    });
-}
-
-pub fn verifying_proof_of_key_possession(c: &mut Criterion) {
-    let dummy_seed = [42u8; 32];
-    let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-
-    let g1 = G1Projective::generator();
-    let x = Scalar::random(&mut rng);
-    let y = g1 * x;
-
-    let zk_proof = ProofOfDiscreteLog::construct(&mut rng, &y, &x);
-    c.bench_function("verifying proof of key possession", |b| {
-        b.iter(|| black_box(zk_proof.verify(&y)))
-    });
-}
-
-pub fn creating_proof_of_chunking_for_100_parties(c: &mut Criterion) {
-    let dummy_seed = [42u8; 32];
-    let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-    let params = setup();
-    let epoch = Epoch::new(2);
-
-    let (receivers, _) = prepare_keys(&mut rng, 100);
-
-    let polynomial = Polynomial::new_random(&mut rng, 67);
-    let shares = receivers
-        .keys()
-        .map(|&node_index| polynomial.evaluate_at(&Scalar::from(node_index)).into())
-        .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, epoch, &params, &mut rng);
-
-    c.bench_function("creating proof of chunking for 100 parties", |b| {
-        b.iter(|| {
-            let chunking_instance =
-                proof_chunking::Instance::new(&ordered_public_keys, &ciphertexts);
-            black_box(
-                ProofOfChunking::construct(&mut rng, chunking_instance, hazmat.r(), &shares)
-                    .expect("failed to construct proof of chunking"),
-            )
-        })
-    });
-}
-
-pub fn verifying_proof_of_chunking_for_100_parties(c: &mut Criterion) {
-    let dummy_seed = [42u8; 32];
-    let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-    let params = setup();
-    let epoch = Epoch::new(2);
-
-    let (receivers, _) = prepare_keys(&mut rng, 100);
-
-    let polynomial = Polynomial::new_random(&mut rng, 67);
-    let shares = receivers
-        .keys()
-        .map(|&node_index| polynomial.evaluate_at(&Scalar::from(node_index)).into())
-        .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, epoch, &params, &mut rng);
-
-    let chunking_instance = proof_chunking::Instance::new(&ordered_public_keys, &ciphertexts);
-    let proof_of_chunking =
-        ProofOfChunking::construct(&mut rng, chunking_instance, hazmat.r(), &shares)
-            .expect("failed to construct proof of chunking");
-
-    c.bench_function("verifying proof of chunking for 100 parties", |b| {
-        b.iter(|| {
-            let chunking_instance =
-                proof_chunking::Instance::new(&ordered_public_keys, &ciphertexts);
-            black_box(proof_of_chunking.verify(chunking_instance))
-        })
-    });
-}
-
-pub fn creating_proof_of_secret_sharing_for_100_parties(c: &mut Criterion) {
-    let dummy_seed = [42u8; 32];
-    let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-    let params = setup();
-    let epoch = Epoch::new(2);
-
-    let (receivers, _) = prepare_keys(&mut rng, 100);
-
-    let polynomial = Polynomial::new_random(&mut rng, 67);
-    let shares = receivers
-        .keys()
-        .map(|&node_index| polynomial.evaluate_at(&Scalar::from(node_index)).into())
-        .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, epoch, &params, &mut rng);
-
-    let combined_ciphertexts = ciphertexts.combine_ciphertexts();
-    let combined_r = hazmat.combine_rs();
-    let combined_rr = ciphertexts.combine_rs();
-    let public_coefficients = polynomial.public_coefficients();
-
-    c.bench_function("creating proof of secret sharing for 100 parties", |b| {
-        b.iter(|| {
-            let sharing_instance = proof_sharing::Instance::new(
-                &receivers,
-                &public_coefficients,
-                &combined_rr,
-                &combined_ciphertexts,
-            );
-            black_box(
-                ProofOfSecretSharing::construct(&mut rng, sharing_instance, &combined_r, &shares)
-                    .expect("failed to construct proof of secret sharing"),
-            )
-        })
-    });
-}
-
-pub fn verifying_proof_of_secret_sharing_for_100_parties(c: &mut Criterion) {
-    let dummy_seed = [42u8; 32];
-    let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-    let params = setup();
-    let epoch = Epoch::new(2);
-
-    let (receivers, _) = prepare_keys(&mut rng, 100);
-
-    let polynomial = Polynomial::new_random(&mut rng, 67);
-    let shares = receivers
-        .keys()
-        .map(|&node_index| polynomial.evaluate_at(&Scalar::from(node_index)).into())
-        .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, epoch, &params, &mut rng);
-
-    let combined_ciphertexts = ciphertexts.combine_ciphertexts();
-    let combined_r = hazmat.combine_rs();
-    let combined_rr = ciphertexts.combine_rs();
-    let public_coefficients = polynomial.public_coefficients();
-    let sharing_instance = proof_sharing::Instance::new(
-        &receivers,
-        &public_coefficients,
-        &combined_rr,
-        &combined_ciphertexts,
-    );
-    let proof_of_secret_sharing =
-        ProofOfSecretSharing::construct(&mut rng, sharing_instance, &combined_r, &shares)
-            .expect("failed to construct proof of secret sharing");
-
-    c.bench_function("verifying proof of secret sharing for 100 parties", |b| {
-        b.iter(|| {
-            let sharing_instance = proof_sharing::Instance::new(
-                &receivers,
-                &public_coefficients,
-                &combined_rr,
-                &combined_ciphertexts,
-            );
-            black_box(proof_of_secret_sharing.verify(sharing_instance))
-        })
-    });
-}
-
-pub fn single_share_encryption(c: &mut Criterion) {
-    let dummy_seed = [42u8; 32];
-    let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-    let params = setup();
-    let epoch = Epoch::new(2);
-    let (_, pk) = keygen(&params, &mut rng);
-
-    let polynomial = Polynomial::new_random(&mut rng, 3);
-    let share: Share = polynomial.evaluate_at(&Scalar::from(42)).into();
-
-    c.bench_function("single share encryption", |b| {
-        b.iter(|| {
-            black_box(encrypt_shares(
-                &[(&share, pk.public_key())],
-                epoch,
-                &params,
-                &mut rng,
-            ))
-        })
-    });
-}
-
-pub fn share_encryption_100(c: &mut Criterion) {
-    let dummy_seed = [42u8; 32];
-    let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-    let params = setup();
-    let epoch = Epoch::new(2);
-
-    let (receivers, _) = prepare_keys(&mut rng, 100);
-    let polynomial = Polynomial::new_random(&mut rng, 3);
-    let shares = receivers
-        .keys()
-        .map(|&node_index| polynomial.evaluate_at(&Scalar::from(node_index)).into())
-        .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,
-                epoch,
-                &params,
-                &mut rng,
-            ))
-        })
-    });
-}
-
-pub fn share_decryption(c: &mut Criterion) {
-    let dummy_seed = [42u8; 32];
-    let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-    let params = setup();
-    let epoch = Epoch::new(2);
-    let (mut dk, pk) = keygen(&params, &mut rng);
-
-    let polynomial = Polynomial::new_random(&mut rng, 3);
-    let share: Share = polynomial.evaluate_at(&Scalar::from(42)).into();
-    let (ciphertexts, _) = encrypt_shares(&[(&share, pk.public_key())], epoch, &params, &mut rng);
-    dk.try_update_to(epoch, &params, &mut rng).unwrap();
-
-    c.bench_function("single share decryption", |b| {
-        b.iter(|| black_box(decrypt_share(&dk, 0, &ciphertexts, epoch, None)))
-    });
-}
-
-criterion_group!(
-    utils,
-    precompute_default_bsgs_table,
-    precomputing_g2_generator_for_miller_loop,
-);
-
-criterion_group!(
-    dealings_creation,
-    creating_dealing_for_3_parties,
-    creating_dealing_for_20_parties,
-    creating_dealing_for_100_parties,
-);
-
-// note: in our setting each party will have to create at least 4 dealings (one per attribute in credential)
-// and verify 99 * 4 of them (4 from each other dealer)
-criterion_group!(
-    dealings_verification,
-    verifying_dealing_made_for_3_parties_and_recovering_share,
-    verifying_dealing_made_for_20_parties_and_recovering_share,
-    verifying_dealing_made_for_100_parties_and_recovering_share,
-);
-
-criterion_group!(
-    proofs_of_knowledge,
-    creating_proof_of_key_possession,
-    verifying_proof_of_key_possession,
-    creating_proof_of_chunking_for_100_parties,
-    verifying_proof_of_chunking_for_100_parties,
-    creating_proof_of_secret_sharing_for_100_parties,
-    verifying_proof_of_secret_sharing_for_100_parties
-);
-
-criterion_group!(
-    encryption,
-    single_share_encryption,
-    share_encryption_100,
-    share_decryption,
-);
-
-criterion_main!(
-    utils,
-    dealings_creation,
-    dealings_verification,
-    proofs_of_knowledge,
-    encryption
-);
-
-// TODO: benchmark using affine vs projective representation throughout the crate
-// (when conversion / serialization / computation is involved)
@@ -1,772 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::bte::keys::{DecryptionKey, PublicKey};
-use crate::bte::{Epoch, Params, CHUNK_SIZE, G2_GENERATOR_PREPARED, NUM_CHUNKS, PAIRING_BASE};
-use crate::error::DkgError;
-use crate::utils::{combine_g1_chunks, combine_scalar_chunks, deserialize_g1, deserialize_g2};
-use crate::{Chunk, ChunkedShare, Share};
-use bls12_381::{G1Affine, G1Projective, G2Prepared, G2Projective, Gt, Scalar};
-use ff::Field;
-use group::{Curve, Group, GroupEncoding};
-use rand_core::RngCore;
-use std::collections::HashMap;
-use std::ops::Neg;
-use zeroize::Zeroize;
-
-#[derive(Debug)]
-#[cfg_attr(test, derive(Clone, PartialEq))]
-pub struct Ciphertexts {
-    pub rr: [G1Projective; NUM_CHUNKS],
-    pub ss: [G1Projective; NUM_CHUNKS],
-    pub zz: [G2Projective; NUM_CHUNKS],
-    pub ciphertext_chunks: Vec<[G1Projective; NUM_CHUNKS]>,
-}
-
-impl Ciphertexts {
-    pub fn verify_integrity(&self, params: &Params, epoch: Epoch) -> bool {
-        // if this checks fails it means the ciphertext is undefined as values
-        // in `r`, `s` and `z` are meaningless since technically this ciphertext
-        // has been created for 0 parties
-        if self.ciphertext_chunks.is_empty() {
-            return false;
-        }
-
-        let g1_neg = G1Affine::generator().neg();
-        let f = epoch
-            .as_extended_tau(&self.rr, &self.ss, &self.ciphertext_chunks)
-            .evaluate_f(params);
-
-        // we have to use `f` in up to `NUM_CHUNKS` pairings (if everything is valid),
-        // so perform some precomputation on it
-        let f_prepared = G2Prepared::from(f.to_affine());
-
-        // for each triple (R_i, S_i, Z_i) check whether e(g1, Z_i) == e(R_j, f) • e(S_i, h),
-        // which is equivalent to checking whether e(R_j, f) • e(S_i, h) • e(g1, Z_i)^-1 == id
-        // and due to bilinear property whether e(R_j, f) • e(S_i, h) • e(g1^-1, Z_i) == id
-        for i in 0..self.rr.len() {
-            let miller = bls12_381::multi_miller_loop(&[
-                (&self.rr[i].to_affine(), &f_prepared),
-                (&self.ss[i].to_affine(), &params._h_prepared),
-                (&g1_neg, &G2Prepared::from(self.zz[i].to_affine())),
-            ]);
-            let res = miller.final_exponentiation();
-            if !bool::from(res.is_identity()) {
-                return false;
-            }
-        }
-
-        true
-    }
-
-    pub fn combine_rs(&self) -> G1Projective {
-        combine_g1_chunks(&self.rr)
-    }
-
-    // required for the purposes of the proof of secret sharing
-    pub fn combine_ciphertexts(&self) -> Vec<G1Projective> {
-        self.ciphertext_chunks
-            .iter()
-            .map(|share_ciphertext| combine_g1_chunks(share_ciphertext))
-            .collect()
-    }
-
-    pub(crate) fn to_bytes(&self) -> Vec<u8> {
-        let num_receivers = self.ciphertext_chunks.len();
-
-        let mut bytes = Vec::with_capacity(NUM_CHUNKS * ((num_receivers + 2) * 48 + 96) + 4);
-        for r_i in &self.rr {
-            bytes.extend_from_slice(r_i.to_bytes().as_ref())
-        }
-        for s_i in &self.ss {
-            bytes.extend_from_slice(s_i.to_bytes().as_ref())
-        }
-        for z_i in &self.zz {
-            bytes.extend_from_slice(z_i.to_bytes().as_ref())
-        }
-
-        bytes.extend_from_slice(&(num_receivers as u32).to_be_bytes());
-        for c_i in &self.ciphertext_chunks {
-            for c_ij in c_i {
-                bytes.extend_from_slice(c_ij.to_bytes().as_ref())
-            }
-        }
-
-        bytes
-    }
-
-    pub(crate) fn try_from_bytes(bytes: &[u8]) -> Result<Self, DkgError> {
-        // at the very minimum we must have enough bytes for a single receiver
-        if bytes.len() < NUM_CHUNKS * (3 * 48 + 96) + 4 {
-            return Err(DkgError::new_deserialization_failure(
-                "Ciphertexts",
-                "insufficient number of bytes provided",
-            ));
-        }
-
-        let mut rr = Vec::with_capacity(NUM_CHUNKS);
-        let mut ss = Vec::with_capacity(NUM_CHUNKS);
-        let mut zz = Vec::with_capacity(NUM_CHUNKS);
-
-        let mut i = 0;
-        for _ in 0..NUM_CHUNKS {
-            rr.push(deserialize_g1(&bytes[i..i + 48]).ok_or_else(|| {
-                DkgError::new_deserialization_failure("Ciphertexts.r", "invalid curve point")
-            })?);
-            i += 48;
-        }
-        for _ in 0..NUM_CHUNKS {
-            ss.push(deserialize_g1(&bytes[i..i + 48]).ok_or_else(|| {
-                DkgError::new_deserialization_failure("Ciphertexts.s", "invalid curve point")
-            })?);
-            i += 48;
-        }
-        for _ in 0..NUM_CHUNKS {
-            zz.push(deserialize_g2(&bytes[i..i + 96]).ok_or_else(|| {
-                DkgError::new_deserialization_failure("Ciphertexts.z", "invalid curve point")
-            })?);
-            i += 96;
-        }
-
-        let num_receivers = u32::from_be_bytes(bytes[i..i + 4].try_into().unwrap()) as usize;
-        i += 4;
-
-        if bytes[i..].len() != num_receivers * NUM_CHUNKS * 48 {
-            return Err(DkgError::new_deserialization_failure(
-                "Ciphertexts",
-                "invalid number of bytes provided",
-            ));
-        }
-
-        let mut ciphertext_chunks = Vec::with_capacity(num_receivers);
-
-        for _ in 0..num_receivers {
-            let mut ci = Vec::with_capacity(NUM_CHUNKS);
-            for _ in 0..NUM_CHUNKS {
-                ci.push(deserialize_g1(&bytes[i..i + 48]).ok_or_else(|| {
-                    DkgError::new_deserialization_failure(
-                        "Ciphertexts.ciphertext_chunks",
-                        "invalid curve point",
-                    )
-                })?);
-                i += 48;
-            }
-
-            // this unwrap is fine as we have exactly NUM_CHUNKS elements in each vector
-            ciphertext_chunks.push(ci.try_into().unwrap())
-        }
-
-        // and the same is true here, the unwraps are fine as we have exactly NUM_CHUNKS elements in each as required
-        Ok(Ciphertexts {
-            rr: rr.try_into().unwrap(),
-            ss: ss.try_into().unwrap(),
-            zz: zz.try_into().unwrap(),
-            ciphertext_chunks,
-        })
-    }
-}
-
-#[derive(Zeroize)]
-#[zeroize(drop)]
-/// Randomness generated during ciphertext generation that is required for proofs of knowledge.
-/// It must be handled with extreme care as its misuse might help malicious parties to recover
-/// the underlying plaintext.
-pub struct HazmatRandomness {
-    r: [Scalar; NUM_CHUNKS],
-    s: [Scalar; NUM_CHUNKS],
-}
-
-impl HazmatRandomness {
-    pub fn r(&self) -> &[Scalar; NUM_CHUNKS] {
-        &self.r
-    }
-
-    pub fn s(&self) -> &[Scalar; NUM_CHUNKS] {
-        &self.s
-    }
-
-    pub fn combine_rs(&self) -> Scalar {
-        combine_scalar_chunks(&self.r)
-    }
-}
-
-pub fn encrypt_shares(
-    shares: &[(&Share, &PublicKey)],
-    epoch: Epoch,
-    params: &Params,
-    mut rng: impl RngCore,
-) -> (Ciphertexts, HazmatRandomness) {
-    let g1 = G1Projective::generator();
-
-    let mut rand_rs = Vec::with_capacity(NUM_CHUNKS);
-    let mut rand_ss = Vec::with_capacity(NUM_CHUNKS);
-    let mut rr = Vec::with_capacity(NUM_CHUNKS);
-    let mut ss = Vec::with_capacity(NUM_CHUNKS);
-
-    // generate relevant re-usable pseudorandom data
-    for _ in 0..NUM_CHUNKS {
-        let rand_r = Scalar::random(&mut rng);
-        let rand_s = Scalar::random(&mut rng);
-
-        // g1^r
-        let rr_i = g1 * rand_r;
-        // g1^s
-        let ss_i = g1 * rand_s;
-
-        rand_rs.push(rand_r);
-        rand_ss.push(rand_s);
-
-        rr.push(rr_i);
-        ss.push(ss_i);
-    }
-
-    // produce per-chunk ciphertexts
-    let mut cc = Vec::with_capacity(shares.len());
-
-    for (share, pk) in shares {
-        let m = share.to_chunks();
-
-        let mut ci = Vec::with_capacity(NUM_CHUNKS);
-
-        for (j, chunk) in m.chunks.iter().enumerate() {
-            // can't really have a more efficient implementation until https://github.com/zkcrypto/bls12_381/pull/70 is merged...
-            let c = pk.0 * rand_rs[j] + g1 * Scalar::from(*chunk as u64);
-            ci.push(c)
-        }
-
-        // the conversion must succeed since we must have EXACTLY `NUM_CHUNKS` elements
-        cc.push(ci.try_into().unwrap())
-    }
-
-    // convert into arrays, note that the unwraps are fine as we have exactly `NUM_CHUNKS` elements in each vector
-    let rr = rr.try_into().unwrap();
-    let ss = ss.try_into().unwrap();
-
-    let f = epoch.as_extended_tau(&rr, &ss, &cc).evaluate_f(params);
-
-    let mut zz = Vec::with_capacity(NUM_CHUNKS);
-    for i in 0..NUM_CHUNKS {
-        zz.push(f * rand_rs[i] + params.h * rand_ss[i]);
-    }
-
-    // the conversions here must also succeed since the other vecs also have `NUM_CHUNKS` elements
-    (
-        Ciphertexts {
-            rr,
-            ss,
-            zz: zz.try_into().unwrap(),
-            ciphertext_chunks: cc,
-        },
-        HazmatRandomness {
-            r: rand_rs.try_into().unwrap(),
-            s: rand_ss.try_into().unwrap(),
-        },
-    )
-}
-
-pub fn decrypt_share(
-    dk: &DecryptionKey,
-    // in the case of multiple receivers, specifies which index of ciphertext chunks should be used
-    i: usize,
-    ciphertext: &Ciphertexts,
-    epoch: Epoch,
-    lookup_table: Option<&BabyStepGiantStepLookup>,
-) -> Result<Share, DkgError> {
-    let mut plaintext = ChunkedShare::default();
-
-    let decryption_node = dk.try_get_compatible_node(epoch)?;
-    let extended_tau = epoch.as_extended_tau(
-        &ciphertext.rr,
-        &ciphertext.ss,
-        &ciphertext.ciphertext_chunks,
-    );
-
-    if i >= ciphertext.ciphertext_chunks.len() {
-        return Err(DkgError::UnavailableCiphertext(i));
-    }
-
-    let height = decryption_node.tau.height();
-    let b_neg = decryption_node
-        .ds
-        .iter()
-        .chain(decryption_node.dh.iter())
-        .zip(extended_tau.0.iter().by_vals().skip(height))
-        .filter(|(_, i)| *i)
-        .map(|(d_i, _)| d_i)
-        .fold(decryption_node.b, |acc, d_i| acc + d_i)
-        .neg()
-        .to_affine();
-
-    let e_neg = decryption_node.e.neg().to_affine();
-
-    for j in 0..NUM_CHUNKS {
-        let rr_j = &ciphertext.rr[j];
-        let ss_j = &ciphertext.ss[j];
-        let zz_j = ciphertext.zz[j].to_affine();
-        let cc_ij = &ciphertext.ciphertext_chunks[i][j];
-
-        let miller = bls12_381::multi_miller_loop(&[
-            (&cc_ij.to_affine(), &G2_GENERATOR_PREPARED),
-            (&rr_j.to_affine(), &G2Prepared::from(b_neg)),
-            (&decryption_node.a.to_affine(), &G2Prepared::from(zz_j)),
-            (&ss_j.to_affine(), &G2Prepared::from(e_neg)),
-        ]);
-        let m = miller.final_exponentiation();
-
-        plaintext.chunks[j] = baby_step_giant_step(&m, &PAIRING_BASE, lookup_table)?;
-    }
-
-    plaintext.try_into()
-}
-
-pub struct BabyStepGiantStepLookup {
-    base: Gt,
-    m: Chunk,
-    lookup: HashMap<[u8; 576], Chunk>,
-}
-
-impl BabyStepGiantStepLookup {
-    pub fn precompute(base: &Gt) -> Self {
-        let mut lookup = HashMap::new();
-        let mut g = Gt::identity();
-
-        // 1. m ← Ceiling(√n)
-        let m = (CHUNK_SIZE as f32).sqrt().ceil() as Chunk;
-
-        // 2. For all j where 0 ≤ j < m:
-        for j in 0..m {
-            // Compute α^j and store the pair (j, α^j) in a table.
-            lookup.insert(g.to_uncompressed(), j);
-            g += base;
-        }
-
-        BabyStepGiantStepLookup {
-            base: *base,
-            m,
-            lookup,
-        }
-    }
-
-    pub fn try_solve(&self, target: &Gt) -> Result<Chunk, DkgError> {
-        // 3. Compute α^{−m}
-        let m_neg = Scalar::from(self.m as u64).neg();
-        let alpha_m = self.base * m_neg;
-
-        // 4. γ ← β. (set γ = β)
-        let mut gamma = *target;
-
-        // 5. For all i where 0 ≤ i < m:
-        for i in 0..self.m {
-            // 1. Check to see if γ is the second component (αj) of any pair in the table.
-            if let Some(j) = self.lookup.get(&gamma.to_uncompressed()) {
-                // 2. If so, return im + j.
-                return Ok(i * self.m + j);
-            } else {
-                // 3. If not, γ ← γ • α^{−m}.
-                gamma += alpha_m;
-            }
-        }
-
-        Err(DkgError::UnsolvableDiscreteLog)
-    }
-}
-
-impl Default for BabyStepGiantStepLookup {
-    fn default() -> Self {
-        BabyStepGiantStepLookup::precompute(&PAIRING_BASE)
-    }
-}
-
-/// Attempts to solve the discrete log problem g^m, where g is in the Gt group and
-/// m should be within the [0, CHUNK_MAX] range.
-///
-/// The implementation follows the following algorithm: https://en.wikipedia.org/wiki/Baby-step_giant-step#The_algorithm
-///
-/// # Arguments
-///
-/// * `target`: the result of the exponentiation, M in M = g^m,
-/// * `base`: the base used for exponentiation, g in M = g^m
-/// * `lookup_table`: precomputed table containing (j, α^j) pairs
-pub fn baby_step_giant_step(
-    target: &Gt,
-    base: &Gt,
-    lookup_table: Option<&BabyStepGiantStepLookup>,
-) -> Result<Chunk, DkgError> {
-    if let Some(lookup_table) = lookup_table {
-        // compute expected m to make sure the provided lookup is valid
-        let m = (CHUNK_SIZE as f32).sqrt().ceil() as Chunk;
-
-        if &lookup_table.base != base || lookup_table.lookup.len() != m as usize {
-            return Err(DkgError::MismatchedLookupTable);
-        }
-
-        lookup_table.try_solve(target)
-    } else {
-        BabyStepGiantStepLookup::precompute(base).try_solve(target)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::bte::{keygen, setup, DEFAULT_BSGS_TABLE};
-    use rand_core::SeedableRng;
-
-    fn verify_hazmat_rand(ciphertext: &Ciphertexts, randomness: &HazmatRandomness) {
-        let g1 = G1Projective::generator();
-
-        for i in 0..ciphertext.rr.len() {
-            assert_eq!(ciphertext.rr[i], g1 * randomness.r[i]);
-            assert_eq!(ciphertext.ss[i], g1 * randomness.s[i]);
-        }
-    }
-
-    #[test]
-    fn baby_giant_100_without_table() {
-        let dummy_seed = [1u8; 32];
-        let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-
-        for i in 0u64..100 {
-            let base = Gt::random(&mut rng);
-            let x = (rng.next_u64() + i) % CHUNK_SIZE as u64;
-            let target = base * Scalar::from(x);
-
-            assert_eq!(
-                baby_step_giant_step(&target, &base, None).unwrap(),
-                x as Chunk
-            );
-        }
-    }
-
-    #[test]
-    fn baby_giant_100_with_table() {
-        let dummy_seed = [1u8; 32];
-        let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-        let base = Gt::random(&mut rng);
-        let lookup_table = BabyStepGiantStepLookup::precompute(&base);
-        let table = Some(&lookup_table);
-
-        for i in 0u64..100 {
-            let x = (rng.next_u64() + i) % CHUNK_SIZE as u64;
-            let target = base * Scalar::from(x);
-
-            assert_eq!(
-                baby_step_giant_step(&target, &base, table).unwrap(),
-                x as Chunk
-            );
-        }
-    }
-
-    #[test]
-    fn share_decryption_20() {
-        let dummy_seed = [1u8; 32];
-        let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-        let params = setup();
-
-        let (decryption_key1, public_key1) = keygen(&params, &mut rng);
-        let (decryption_key2, public_key2) = keygen(&params, &mut rng);
-        let epoch = Epoch::new(0);
-
-        let lookup_table = &DEFAULT_BSGS_TABLE;
-
-        for _ in 0..10 {
-            let m1 = Share::random(&mut rng);
-            let m2 = Share::random(&mut rng);
-            let shares = &[(&m1, &public_key1.key), (&m2, &public_key2.key)];
-
-            let (ciphertext, hazmat) = encrypt_shares(shares, epoch, &params, &mut rng);
-            verify_hazmat_rand(&ciphertext, &hazmat);
-
-            let recovered1 =
-                decrypt_share(&decryption_key1, 0, &ciphertext, epoch, Some(lookup_table)).unwrap();
-            let recovered2 =
-                decrypt_share(&decryption_key2, 1, &ciphertext, epoch, Some(lookup_table)).unwrap();
-            assert_eq!(m1, recovered1);
-            assert_eq!(m2, recovered2);
-        }
-    }
-
-    #[test]
-    fn share_encryption_under_nonzero_epoch() {
-        let dummy_seed = [1u8; 32];
-        let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-        let params = setup();
-
-        let (mut decryption_key1, public_key1) = keygen(&params, &mut rng);
-        let (mut decryption_key2, public_key2) = keygen(&params, &mut rng);
-        let epoch = Epoch::new(12345);
-        decryption_key1
-            .try_update_to(epoch, &params, &mut rng)
-            .unwrap();
-        decryption_key2
-            .try_update_to(epoch, &params, &mut rng)
-            .unwrap();
-
-        let lookup_table = &DEFAULT_BSGS_TABLE;
-
-        for _ in 0..10 {
-            let m1 = Share::random(&mut rng);
-            let m2 = Share::random(&mut rng);
-            let shares = &[(&m1, &public_key1.key), (&m2, &public_key2.key)];
-
-            let (ciphertext, hazmat) = encrypt_shares(shares, epoch, &params, &mut rng);
-            verify_hazmat_rand(&ciphertext, &hazmat);
-
-            let recovered1 =
-                decrypt_share(&decryption_key1, 0, &ciphertext, epoch, Some(lookup_table)).unwrap();
-            let recovered2 =
-                decrypt_share(&decryption_key2, 1, &ciphertext, epoch, Some(lookup_table)).unwrap();
-            assert_eq!(m1, recovered1);
-            assert_eq!(m2, recovered2);
-        }
-    }
-
-    #[test]
-    fn decryption_with_root_key() {
-        let dummy_seed = [42u8; 32];
-        let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-        let params = setup();
-
-        let (root_key, public_key) = keygen(&params, &mut rng);
-
-        let share = Share::random(&mut rng);
-
-        let epoch0 = Epoch::new(0);
-        let epoch42 = Epoch::new(42);
-        let epoch_big = Epoch::new(3292547435);
-
-        let (ciphertext1, hazmat1) =
-            encrypt_shares(&[(&share, &public_key.key)], epoch0, &params, &mut rng);
-        verify_hazmat_rand(&ciphertext1, &hazmat1);
-
-        let (ciphertext2, hazmat2) =
-            encrypt_shares(&[(&share, &public_key.key)], epoch42, &params, &mut rng);
-        verify_hazmat_rand(&ciphertext2, &hazmat2);
-
-        let (ciphertext3, hazmat3) =
-            encrypt_shares(&[(&share, &public_key.key)], epoch_big, &params, &mut rng);
-        verify_hazmat_rand(&ciphertext3, &hazmat3);
-
-        let recovered1 = decrypt_share(&root_key, 0, &ciphertext1, epoch0, None).unwrap();
-        let recovered2 = decrypt_share(&root_key, 0, &ciphertext2, epoch42, None).unwrap();
-        let recovered3 = decrypt_share(&root_key, 0, &ciphertext3, epoch_big, None).unwrap();
-
-        assert_eq!(share, recovered1);
-        assert_eq!(share, recovered2);
-        assert_eq!(share, recovered3);
-    }
-
-    #[test]
-    fn update_and_decrypt_10() {
-        let dummy_seed = [1u8; 32];
-        let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-        let params = setup();
-
-        let (mut decryption_key, public_key) = keygen(&params, &mut rng);
-
-        for epoch_value in 0..10 {
-            let epoch = Epoch::new(epoch_value);
-            let share = Share::random(&mut rng);
-            decryption_key
-                .try_update_to(epoch, &params, &mut rng)
-                .unwrap();
-
-            let (ciphertext, hazmat) =
-                encrypt_shares(&[(&share, &public_key.key)], epoch, &params, &mut rng);
-            verify_hazmat_rand(&ciphertext, &hazmat);
-
-            let recovered = decrypt_share(&decryption_key, 0, &ciphertext, epoch, None).unwrap();
-            assert_eq!(share, recovered);
-        }
-    }
-
-    #[test]
-    fn reblinding_node_doesnt_affect_decryption() {
-        let dummy_seed = [1u8; 32];
-        let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-        let params = setup();
-
-        let (mut decryption_key, public_key) = keygen(&params, &mut rng);
-
-        let epoch = Epoch::new(12345);
-        decryption_key
-            .try_update_to(epoch, &params, &mut rng)
-            .unwrap();
-        for node in decryption_key.nodes.iter_mut() {
-            node.reblind(&params, &mut rng);
-        }
-        let share = Share::random(&mut rng);
-
-        let (ciphertext, hazmat) =
-            encrypt_shares(&[(&share, &public_key.key)], epoch, &params, &mut rng);
-        verify_hazmat_rand(&ciphertext, &hazmat);
-
-        let recovered = decrypt_share(&decryption_key, 0, &ciphertext, epoch, None).unwrap();
-        assert_eq!(share, recovered);
-
-        // attempt to update the key again so we have to derive fresh nodes using previous reblinded results
-        let epoch2 = Epoch::new(67890);
-        decryption_key
-            .try_update_to(epoch2, &params, &mut rng)
-            .unwrap();
-        for node in decryption_key.nodes.iter_mut() {
-            node.reblind(&params, &mut rng);
-        }
-        let share2 = Share::random(&mut rng);
-
-        let (ciphertext, hazmat) =
-            encrypt_shares(&[(&share2, &public_key.key)], epoch2, &params, &mut rng);
-        verify_hazmat_rand(&ciphertext, &hazmat);
-
-        let recovered = decrypt_share(&decryption_key, 0, &ciphertext, epoch2, None).unwrap();
-        assert_eq!(share2, recovered);
-    }
-
-    #[test]
-    fn ciphertext_integrity_check_passes_for_valid_data() {
-        let params = setup();
-
-        let dummy_seed = [1u8; 32];
-        let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-
-        let (mut dk, public_key) = keygen(&params, &mut rng);
-        let epoch = Epoch::new(1);
-
-        dk.try_update_to(epoch, &params, &mut rng).unwrap();
-        let share = Share::random(&mut rng);
-        let (ciphertext, _) =
-            encrypt_shares(&[(&share, &public_key.key)], epoch, &params, &mut rng);
-        assert!(ciphertext.verify_integrity(&params, epoch))
-    }
-
-    #[test]
-    fn ciphertext_integrity_check_passes_fails_for_malformed_data() {
-        let params = setup();
-
-        let dummy_seed = [1u8; 32];
-        let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-
-        let (mut dk, public_key) = keygen(&params, &mut rng);
-        let epoch = Epoch::new(1);
-
-        dk.try_update_to(epoch, &params, &mut rng).unwrap();
-        let share = Share::random(&mut rng);
-        let (ciphertext, _) =
-            encrypt_shares(&[(&share, &public_key.key)], epoch, &params, &mut rng);
-
-        let mut bad_cipher1 = ciphertext.clone();
-        bad_cipher1.rr[4] = G1Projective::generator();
-        assert!(!bad_cipher1.verify_integrity(&params, epoch));
-
-        let mut bad_cipher2 = ciphertext.clone();
-        bad_cipher2.ss[4] = G1Projective::generator();
-        assert!(!bad_cipher2.verify_integrity(&params, epoch));
-
-        let mut bad_cipher3 = ciphertext;
-        bad_cipher3.zz[4] = G2Projective::generator();
-        assert!(!bad_cipher3.verify_integrity(&params, epoch));
-    }
-
-    #[test]
-    fn ciphertext_integrity_check_passes_fails_for_wrong_epoch() {
-        let params = setup();
-
-        let dummy_seed = [1u8; 32];
-        let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-
-        let (mut dk, public_key) = keygen(&params, &mut rng);
-        let epoch = Epoch::new(1);
-
-        dk.try_update_to(epoch, &params, &mut rng).unwrap();
-        let share = Share::random(&mut rng);
-        let (ciphertext, _) =
-            encrypt_shares(&[(&share, &public_key.key)], epoch, &params, &mut rng);
-
-        let another_epoch = Epoch::new(2);
-        assert!(!ciphertext.verify_integrity(&params, another_epoch))
-    }
-
-    #[test]
-    fn ciphertext_combining() {
-        let params = setup();
-
-        let dummy_seed = [1u8; 32];
-        let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-
-        let nodes = 3;
-
-        let mut shares = Vec::new();
-        let mut public_keys = Vec::new();
-        for _ in 0..nodes {
-            shares.push(Share::random(&mut rng));
-            let (_, pk) = keygen(&params, &mut rng);
-            public_keys.push(*pk.public_key());
-        }
-
-        let refs = shares.iter().zip(public_keys.iter()).collect::<Vec<_>>();
-        let (ciphertext, hazmat) = encrypt_shares(&refs, Epoch::new(42), &params, &mut rng);
-
-        let combined_r = combine_scalar_chunks(hazmat.r());
-        let combined_rr = ciphertext.combine_rs();
-        let combined_ciphertexts = ciphertext.combine_ciphertexts();
-
-        let g1 = G1Projective::generator();
-        for i in 0..nodes {
-            let expected = public_keys[i].0 * combined_r + g1 * shares[i].0;
-            assert_eq!(expected, combined_ciphertexts[i]);
-            assert_eq!(combined_rr, g1 * combined_r);
-        }
-    }
-
-    #[test]
-    fn ciphertexts_roundtrip() {
-        fn random_ciphertexts(mut rng: impl RngCore, num_receivers: usize) -> Ciphertexts {
-            Ciphertexts {
-                rr: (0..NUM_CHUNKS)
-                    .map(|_| G1Projective::random(&mut rng))
-                    .collect::<Vec<_>>()
-                    .try_into()
-                    .unwrap(),
-                ss: (0..NUM_CHUNKS)
-                    .map(|_| G1Projective::random(&mut rng))
-                    .collect::<Vec<_>>()
-                    .try_into()
-                    .unwrap(),
-                zz: (0..NUM_CHUNKS)
-                    .map(|_| G2Projective::random(&mut rng))
-                    .collect::<Vec<_>>()
-                    .try_into()
-                    .unwrap(),
-                ciphertext_chunks: (0..num_receivers)
-                    .map(|_| {
-                        (0..NUM_CHUNKS)
-                            .map(|_| G1Projective::random(&mut rng))
-                            .collect::<Vec<_>>()
-                            .try_into()
-                            .unwrap()
-                    })
-                    .collect(),
-            }
-        }
-
-        let dummy_seed = [1u8; 32];
-        let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-
-        let good_ciphertexts = vec![
-            random_ciphertexts(&mut rng, 1),
-            random_ciphertexts(&mut rng, 2),
-            random_ciphertexts(&mut rng, 10),
-        ];
-
-        for ciphertexts in &good_ciphertexts {
-            let bytes = ciphertexts.to_bytes();
-            let recovered = Ciphertexts::try_from_bytes(&bytes).unwrap();
-            assert_eq!(ciphertexts, &recovered);
-        }
-
-        // ciphertext for 0 receivers is invalid by default
-        let ciphertexts = random_ciphertexts(&mut rng, 0);
-        let bytes = ciphertexts.to_bytes();
-        assert!(Ciphertexts::try_from_bytes(&bytes).is_err());
-    }
-}
@@ -1,875 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::bte::proof_discrete_log::ProofOfDiscreteLog;
-use crate::bte::{Epoch, Params, Tau};
-use crate::error::DkgError;
-use crate::utils::{deserialize_g1, deserialize_g2, deserialize_scalar};
-use bls12_381::{G1Projective, G2Projective, Scalar};
-use ff::Field;
-use group::GroupEncoding;
-use rand_core::RngCore;
-use zeroize::Zeroize;
-
-#[derive(Debug, Zeroize)]
-#[zeroize(drop)]
-#[cfg_attr(test, derive(Clone, PartialEq))]
-pub(crate) struct Node {
-    pub(crate) tau: Tau,
-
-    // g1^rho
-    pub(crate) a: G1Projective,
-
-    // g2^x
-    pub(crate) b: G2Projective,
-
-    // f_i^rho, up to lambda_t elements
-    pub(crate) ds: Vec<G2Projective>,
-
-    // fh_i^rho, always lambda_h elements
-    pub(crate) dh: Vec<G2Projective>,
-
-    // h^rho
-    pub(crate) e: G2Projective,
-}
-
-impl Node {
-    fn new_root(
-        a: G1Projective,
-        b: G2Projective,
-        ds: Vec<G2Projective>,
-        dh: Vec<G2Projective>,
-        e: G2Projective,
-    ) -> Self {
-        Node {
-            tau: Tau::new_root(),
-            a,
-            b,
-            ds,
-            dh,
-            e,
-        }
-    }
-
-    fn is_root(&self) -> bool {
-        self.tau.0.is_empty()
-    }
-
-    pub(crate) fn reblind(&mut self, params: &Params, mut rng: impl RngCore) {
-        let delta = Scalar::random(&mut rng);
-        self.a += G1Projective::generator() * delta;
-
-        // TODO: or do we have to do full tau evaluation here?
-        self.b += self.tau.evaluate_partial_f(params) * delta;
-        self.ds
-            .iter_mut()
-            .zip(params.fs.iter().skip(self.tau.height()))
-            .for_each(|(d_i, f_i)| *d_i += f_i * delta);
-        self.dh
-            .iter_mut()
-            .zip(params.fh.iter())
-            .for_each(|(d_i, f_i)| *d_i += f_i * delta);
-
-        self.e += params.h * delta;
-    }
-
-    // note: it's unsafe to use this method outside `try_update_to` as
-    // we have guaranteed there that `self` is parent of the target
-    // and that `self.tau != target_tau`
-    /// Given `self` with `Tau1` and `target_tau` with `Tau2`, such that `Tau1` prefixes `Tau2`,
-    /// i.e. `Tau2 == Tau1 || SUFFIX`, and `Tau2` is a leaf node, derive all required crypto material
-    /// for its construction.
-    fn derive_target_child_with_partials(
-        &self,
-        params: &Params,
-        target_tau: Tau,
-        partial_b: &G2Projective,
-        partial_f: &G2Projective,
-        mut rng: impl RngCore,
-    ) -> Self {
-        debug_assert!(self.tau.is_parent_of(&target_tau));
-        debug_assert_ne!(self.tau, target_tau);
-
-        let delta = Scalar::random(&mut rng);
-        let a = self.a + G1Projective::generator() * delta;
-        let b = partial_b + partial_f * delta;
-        let ds = self
-            .ds
-            .iter()
-            .zip(params.fs.iter())
-            .skip(target_tau.height())
-            .map(|(d_i, f_i)| d_i + f_i * delta)
-            .collect();
-        let dh = self
-            .dh
-            .iter()
-            .zip(params.fh.iter())
-            .map(|(dh_i, fh_i)| dh_i + fh_i * delta)
-            .collect();
-        let e = self.e + params.h * delta;
-
-        Node {
-            tau: target_tau,
-            a,
-            b,
-            ds,
-            dh,
-            e,
-        }
-    }
-
-    // note: it's unsafe to use this method outside `try_update_to` as
-    // we have guaranteed there that `self` is parent of the target
-    // and that `self.tau != target_tau`
-    /// Given `self` with `Tau1` and `most_direct_parent` with `Tau2`, such that `Tau1` prefixes `Tau2`,
-    /// i.e. `Tau2 == Tau1 || SUFFIX`, derive node with `Tau3 = Tau2 || 1`
-    fn derive_right_nonfinal_child_of_with_partials(
-        &self,
-        params: &Params,
-        most_direct_parent: Tau,
-        partial_b: &G2Projective,
-        partial_f: &G2Projective,
-        mut rng: impl RngCore,
-    ) -> Self {
-        let right_branch = most_direct_parent.right_child();
-
-        debug_assert!(self.tau.is_parent_of(&most_direct_parent));
-        debug_assert!(self.tau.is_parent_of(&right_branch));
-        debug_assert_ne!(self.tau, right_branch);
-
-        // n is height difference between self and the child
-        let n = right_branch.height() - self.tau.height();
-
-        // i is the index of the last bit we just added
-        let i = right_branch.height() - 1;
-
-        let delta = Scalar::random(&mut rng);
-        let a = self.a + G1Projective::generator() * delta;
-        let d0 = self.ds[n - 1];
-        let b = partial_b + d0 + (partial_f + params.fs[i]) * delta;
-        let ds = self
-            .ds
-            .iter()
-            .skip(n)
-            .zip(params.fs.iter().skip(right_branch.height()))
-            .map(|(d_i, f_i)| d_i + f_i * delta)
-            .collect();
-        let dh = self
-            .dh
-            .iter()
-            .zip(params.fh.iter())
-            .map(|(dh_i, fh_i)| dh_i + fh_i * delta)
-            .collect();
-
-        let e = self.e + params.h * delta;
-
-        Node {
-            tau: right_branch,
-            a,
-            b,
-            ds,
-            dh,
-            e,
-        }
-    }
-
-    // tau_bytes_len || tau || a || b || len_ds || ds || len_dh || dh || e
-    pub(crate) fn to_bytes(&self) -> Vec<u8> {
-        let g1_elements = 1;
-        let g2_elements = self.ds.len() + self.dh.len() + 2;
-
-        let tau_bytes = self.tau.to_bytes();
-
-        // the extra 12 comes from the triple u32 we use for encoding lengths of tau, ds and dh
-        let mut bytes =
-            Vec::with_capacity(tau_bytes.len() + g1_elements * 48 + g2_elements * 96 + 12);
-
-        bytes.extend_from_slice(&((tau_bytes.len() as u32).to_be_bytes()));
-        bytes.extend_from_slice(&tau_bytes);
-        bytes.extend_from_slice(self.a.to_bytes().as_ref());
-        bytes.extend_from_slice(self.b.to_bytes().as_ref());
-        bytes.extend_from_slice(&((self.ds.len() as u32).to_be_bytes()));
-        for d_i in &self.ds {
-            bytes.extend_from_slice(d_i.to_bytes().as_ref());
-        }
-        bytes.extend_from_slice(&((self.dh.len() as u32).to_be_bytes()));
-        for dh_i in &self.dh {
-            bytes.extend_from_slice(dh_i.to_bytes().as_ref());
-        }
-        bytes.extend_from_slice(self.e.to_bytes().as_ref());
-
-        bytes
-    }
-
-    pub fn try_from_bytes(bytes: &[u8]) -> Result<Self, DkgError> {
-        // at the very least we require bytes for:
-        // - tau_len ( 4 )
-        // - tau ( could be 0 for root node )
-        // - a ( 48 )
-        // - b ( 96 )
-        // - length indication of ds ( 4 )
-        // - length indication of dh ( 4 )
-        // - e ( 96 )
-        if bytes.len() < 4 + 48 + 96 + 4 + 4 + 96 {
-            return Err(DkgError::new_deserialization_failure(
-                "Node",
-                "insufficient number of bytes provided",
-            ));
-        }
-
-        let tau_len = u32::from_be_bytes((&bytes[..4]).try_into().unwrap()) as usize;
-        let mut i = 4;
-
-        let tau = Tau::try_from_bytes(&bytes[i..i + tau_len])?;
-        i += tau_len;
-
-        // perform another length check to account for bytes consumed by tau
-        if bytes[i..].len() < 48 + 96 + 4 + 4 + 96 {
-            return Err(DkgError::new_deserialization_failure(
-                "Node",
-                "insufficient number of bytes provided",
-            ));
-        }
-
-        let a = deserialize_g1(&bytes[i..i + 48]).ok_or_else(|| {
-            DkgError::new_deserialization_failure("Node.a", "invalid curve point")
-        })?;
-        i += 48;
-
-        let b = deserialize_g2(&bytes[i..i + 96]).ok_or_else(|| {
-            DkgError::new_deserialization_failure("Node.b", "invalid curve point")
-        })?;
-        i += 96;
-
-        let ds_len = u32::from_be_bytes((&bytes[i..i + 4]).try_into().unwrap()) as usize;
-        i += 4;
-
-        if bytes[i..].len() < ds_len * 96 + 4 {
-            return Err(DkgError::new_deserialization_failure(
-                "Node",
-                "insufficient number of bytes provided (ds)",
-            ));
-        }
-
-        let mut ds = Vec::with_capacity(ds_len);
-        for j in 0..ds_len {
-            let d_i = deserialize_g2(&bytes[i..i + 96]).ok_or_else(|| {
-                DkgError::new_deserialization_failure(
-                    format!("Node.ds_{}", j),
-                    "invalid curve point",
-                )
-            })?;
-
-            ds.push(d_i);
-            i += 96;
-        }
-
-        let dh_len = u32::from_be_bytes((&bytes[i..i + 4]).try_into().unwrap()) as usize;
-        i += 4;
-
-        if bytes[i..].len() != (dh_len + 1) * 96 {
-            return Err(DkgError::new_deserialization_failure(
-                "Node",
-                "insufficient number of bytes provided (dh)",
-            ));
-        }
-
-        let mut dh = Vec::with_capacity(dh_len);
-        for j in 0..dh_len {
-            let dh_i = deserialize_g2(&bytes[i..i + 96]).ok_or_else(|| {
-                DkgError::new_deserialization_failure(
-                    format!("Node.dh_{}", j),
-                    "invalid curve point",
-                )
-            })?;
-
-            dh.push(dh_i);
-            i += 96;
-        }
-
-        let e = deserialize_g2(&bytes[i..]).ok_or_else(|| {
-            DkgError::new_deserialization_failure("Node.h", "invalid curve point")
-        })?;
-
-        Ok(Node {
-            tau,
-            a,
-            b,
-            ds,
-            dh,
-            e,
-        })
-    }
-}
-
-// produces public key and a decryption key for the root of the tree
-pub fn keygen(params: &Params, mut rng: impl RngCore) -> (DecryptionKey, PublicKeyWithProof) {
-    let g1 = G1Projective::generator();
-    let g2 = G2Projective::generator();
-
-    let mut x = Scalar::random(&mut rng);
-    let y = g1 * x;
-
-    let proof = ProofOfDiscreteLog::construct(&mut rng, &y, &x);
-
-    let mut rho = Scalar::random(&mut rng);
-
-    let a = g1 * rho;
-    let b = g2 * x + params.f0 * rho;
-
-    let ds = params.fs.iter().map(|f_i| f_i * rho).collect();
-    let dh = params.fh.iter().map(|fh_i| fh_i * rho).collect();
-    let e = params.h * rho;
-
-    let dk = DecryptionKey::new_root(Node::new_root(a, b, ds, dh, e));
-
-    let public_key = PublicKey(y);
-    let key_with_proof = PublicKeyWithProof {
-        key: public_key,
-        proof,
-    };
-
-    x.zeroize();
-    rho.zeroize();
-
-    (dk, key_with_proof)
-}
-
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub struct PublicKey(pub(crate) G1Projective);
-
-impl PublicKey {
-    pub fn verify(&self, proof: &ProofOfDiscreteLog) -> bool {
-        proof.verify(&self.0)
-    }
-}
-
-#[derive(Debug)]
-#[cfg_attr(test, derive(PartialEq))]
-pub struct PublicKeyWithProof {
-    pub(crate) key: PublicKey,
-    pub(crate) proof: ProofOfDiscreteLog,
-}
-
-impl PublicKeyWithProof {
-    pub fn verify(&self) -> bool {
-        self.key.verify(&self.proof)
-    }
-
-    pub fn public_key(&self) -> &PublicKey {
-        &self.key
-    }
-
-    pub fn to_bytes(&self) -> Vec<u8> {
-        // we have 2 G1 elements and 1 Scalar
-        let mut bytes = Vec::with_capacity(2 * 48 + 32);
-        bytes.extend_from_slice(self.key.0.to_bytes().as_ref());
-        bytes.extend_from_slice(self.proof.rand_commitment.to_bytes().as_ref());
-        bytes.extend_from_slice(self.proof.response.to_bytes().as_ref());
-
-        bytes
-    }
-
-    pub fn try_from_bytes(bytes: &[u8]) -> Result<Self, DkgError> {
-        if bytes.len() != 2 * 48 + 32 {
-            return Err(DkgError::new_deserialization_failure(
-                "PublicKeyWithProof",
-                "provided bytes had invalid length",
-            ));
-        }
-
-        let y_bytes = &bytes[..48];
-        let commitment_bytes = &bytes[48..96];
-        let response_bytes = &bytes[96..];
-
-        let y = deserialize_g1(y_bytes).ok_or_else(|| {
-            DkgError::new_deserialization_failure("PublicKeyWithProof.key.0", "invalid curve point")
-        })?;
-
-        let rand_commitment = deserialize_g1(commitment_bytes).ok_or_else(|| {
-            DkgError::new_deserialization_failure(
-                "PublicKeyWithProof.proof.rand_commitment",
-                "invalid curve point",
-            )
-        })?;
-
-        let response = deserialize_scalar(response_bytes).ok_or_else(|| {
-            DkgError::new_deserialization_failure(
-                "PublicKeyWithProof.proof.response",
-                "invalid scalar",
-            )
-        })?;
-
-        Ok(PublicKeyWithProof {
-            key: PublicKey(y),
-            proof: ProofOfDiscreteLog {
-                rand_commitment,
-                response,
-            },
-        })
-    }
-}
-
-#[derive(Debug, Zeroize)]
-#[zeroize(drop)]
-#[cfg_attr(test, derive(PartialEq))]
-pub struct DecryptionKey {
-    // note that the nodes are ordered from "right" to "left"
-    pub(crate) nodes: Vec<Node>,
-}
-
-impl DecryptionKey {
-    fn new_root(root_node: Node) -> Self {
-        DecryptionKey {
-            nodes: vec![root_node],
-        }
-    }
-
-    fn current(&self) -> Result<&Node, DkgError> {
-        // we must have at least a single node, otherwise we have a malformed key
-        self.nodes.last().ok_or(DkgError::MalformedDecryptionKey)
-    }
-
-    pub fn current_epoch(&self, params: &Params) -> Result<Option<Epoch>, DkgError> {
-        let current_node = self.current()?;
-        if current_node.is_root() {
-            Ok(None)
-        } else {
-            Epoch::try_from_tau(&current_node.tau, params).map(Option::Some)
-        }
-    }
-
-    pub(crate) fn try_get_compatible_node(&self, epoch: Epoch) -> Result<&Node, DkgError> {
-        let tau = epoch.as_tau();
-        self.nodes
-            .iter()
-            .rev()
-            .find(|node| node.tau.is_parent_of(&tau))
-            .ok_or(DkgError::ExpiredKey)
-    }
-
-    pub fn try_update_to_next_epoch(
-        &mut self,
-        params: &Params,
-        mut rng: impl RngCore,
-    ) -> Result<(), DkgError> {
-        if self.nodes.is_empty() {
-            return Err(DkgError::MalformedDecryptionKey);
-        }
-
-        let mut target_epoch = Epoch::new(0);
-        if self.nodes.len() == 1 && self.nodes[0].is_root() {
-            return self.try_update_to(target_epoch, params, &mut rng);
-        }
-
-        // unwrap is fine as we have asserted self.nodes is not empty
-        self.nodes.pop().unwrap();
-
-        if let Some(tail) = self.nodes.last() {
-            target_epoch = tail.tau.lowest_valid_epoch_child(params)?;
-        } else {
-            // essentially our key consisted of only a single node and it wasn't a root,
-            // so either it was malformed or we somehow reached the final epoch and wanted to update
-            // beyond that. Either way, update to l + 1 is impossible
-            return Err(DkgError::MalformedDecryptionKey);
-        }
-
-        self.try_update_to(target_epoch, params, &mut rng)
-    }
-
-    /// Attempts to update `self` to the provided `epoch`. If the update is not possible,
-    /// because the target was in the past or the key is malformed, an error is returned.
-    ///
-    /// Note that this method mutates the key in place and if the original key was malformed,
-    /// there are no guarantees about its internal state post-call.
-    pub fn try_update_to(
-        &mut self,
-        target_epoch: Epoch,
-        params: &Params,
-        mut rng: impl RngCore,
-    ) -> Result<(), DkgError> {
-        if self.nodes.is_empty() {
-            // somehow we have an empty decryption key
-            return Err(DkgError::MalformedDecryptionKey);
-        }
-
-        // makes it easier to work with since we will be generating non-leaf nodes
-        let target_tau = target_epoch.as_tau();
-        let current_tau = &self.current()?.tau;
-
-        if current_tau == &target_tau {
-            // our key is already updated to the target
-            return Ok(());
-        }
-
-        if current_tau > &target_tau {
-            // we cannot derive keys for past epochs
-            return Err(DkgError::TargetEpochUpdateInThePast);
-        }
-
-        // drop the nodes that are no longer required and get the most direct parent for the target epoch available
-        let mut parent = loop {
-            // if pop() fails the key is malformed since we checked that the target_epoch > current_epoch,
-            // hence the update should have been possible
-            let tail = self.nodes.pop().ok_or(DkgError::MalformedDecryptionKey)?;
-            if tail.tau.is_parent_of(&target_tau) {
-                break tail;
-            }
-        };
-
-        // essentially the case of updating epoch n to n + 1, where n is even;
-        // in that case the last two nodes are [..., epoch_{n+1}, epoch_n]
-        // so we just have to reblind the n+1 node and we're done
-        if parent.tau == target_tau {
-            parent.reblind(params, &mut rng);
-            self.nodes.push(parent);
-            return Ok(());
-        }
-
-        // accumulators, note that the previous elements have already been included by the parent,
-        // i.e. for example for parent at height l <= n, b = g2^x * f0^rho * d1^{tau_1} * ... * dl^{tau_l}
-        // new_b_accumulator = b * d1^{tau_1} * d2^{tau_2} * ... * dn^{tau_n}
-        // new_f_accumulator = f0 * f1^{tau_1} * f2^{tau_2} * ... * fn^{tau_n} (up to lambda_t)
-        let mut new_b_accumulator = parent.b;
-        let mut new_f_accumulator = parent.tau.evaluate_partial_f(params);
-
-        let parent_height = parent.tau.height();
-
-        // path from the parent to the child
-        for (n, bit) in target_tau
-            .0
-            .iter()
-            .by_vals()
-            .skip(parent.tau.height())
-            .enumerate()
-        {
-            // ith bit of the [child] epoch
-            // note that n represents height difference between parent and the current bit
-            let i = n + parent_height;
-
-            // if the bit is NOT set, push the right '1' subtree (for future keys)
-            // so for example if given parent with some `PREFIX` tau and target_epoch being `PREFIX || 010`,
-            // in the first loop iteration we're going to look at bit `0` and
-            // derive child node `PREFIX || 1` so that in the future we could derive keys for all other epochs starting with `PREFIX || 1`
-            // in the next loop iteration we're going to look at bit `1` and simply update the accumulators,
-            // as we don't need to generate any "left" nodes as all of them would have constructed epochs that are already in the past
-            // finally, in the last iteration, we look at the bit `0` and derive node `PREFIX || 011`,
-            // i.e. the one that FOLLOWS the target node.
-            if !bit {
-                let direct_parent = target_tau.try_get_parent_at_height(i)?;
-
-                self.nodes
-                    .push(parent.derive_right_nonfinal_child_of_with_partials(
-                        params,
-                        direct_parent,
-                        &new_b_accumulator,
-                        &new_f_accumulator,
-                        &mut rng,
-                    ));
-            } else {
-                // only update the accumulators when the bit is set, as d^0 == identity, so there's
-                // no point in doing anything else;
-                // note that we don't have to generate any new nodes when going into the right branch
-                // of the tree as everything on the left would have been in the past, so we don't care about them
-                new_b_accumulator += parent.ds[n]; // add d0
-                new_f_accumulator += params.fs[i]; // f_i
-            }
-        }
-
-        self.nodes.push(parent.derive_target_child_with_partials(
-            params,
-            target_epoch.as_tau(),
-            &new_b_accumulator,
-            &new_f_accumulator,
-            &mut rng,
-        ));
-
-        Ok(())
-    }
-
-    pub fn to_bytes(&self) -> Vec<u8> {
-        let num_nodes = self.nodes.len() as u32;
-
-        // unfortunately we're not going to know the expected capacity
-        let mut bytes = Vec::new();
-        bytes.extend_from_slice(&num_nodes.to_be_bytes());
-
-        for node in &self.nodes {
-            let mut node_bytes = node.to_bytes();
-            bytes.extend_from_slice(&((node_bytes.len() as u32).to_be_bytes()));
-            bytes.append(&mut node_bytes)
-        }
-
-        bytes
-    }
-
-    pub fn try_from_bytes(b: &[u8]) -> Result<Self, DkgError> {
-        // we have to be able to read the length of nodes
-        if b.len() < 4 {
-            return Err(DkgError::new_deserialization_failure(
-                "DecryptionKey",
-                "insufficient number of bytes provided",
-            ));
-        }
-        let nodes_len = u32::from_be_bytes([b[0], b[1], b[2], b[3]]) as usize;
-        let mut nodes = Vec::with_capacity(nodes_len);
-
-        let mut i = 4;
-        for _ in 0..nodes_len {
-            // check if we can actually read the length...
-            if b[i..].len() < 4 {
-                return Err(DkgError::new_deserialization_failure(
-                    "DecryptionKey.Node",
-                    "insufficient number of bytes provided for BTE Node recovery",
-                ));
-            }
-
-            let node_bytes = u32::from_be_bytes([b[i], b[i + 1], b[i + 2], b[i + 3]]) as usize;
-            if b[i + 4..].len() < node_bytes {
-                return Err(DkgError::new_deserialization_failure(
-                    "DecryptionKey.Node",
-                    "insufficient number of bytes provided for BTE Node recovery",
-                ));
-            }
-            i += 4;
-
-            let node = Node::try_from_bytes(&b[i..i + node_bytes])?;
-            nodes.push(node);
-            i += node_bytes;
-        }
-
-        Ok(DecryptionKey { nodes })
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::bte::setup;
-    use bitvec::bitvec;
-    use bitvec::order::Msb0;
-    use rand_core::SeedableRng;
-
-    #[test]
-    fn basic_coverage_nodes() {
-        // it's some basic test I've been performing when writing the update function, but figured
-        // might as well put it into a unit test. note that it doesn't check the entire structure,
-        // but just the few last nodes of low height
-
-        let params = setup();
-
-        let dummy_seed = [1u8; 32];
-        let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-
-        let (mut dk, _) = keygen(&params, &mut rng);
-
-        let root_node_copy = dk.nodes.clone();
-
-        // this is a root node
-        assert_eq!(dk.nodes.len(), 1);
-        assert!(dk.nodes[0].is_root());
-
-        // we have to have a node for right branch on each height (1, 01, 001, ... etc)
-        // plus an additional one for the two left-most leaves (epochs "0" and "1")
-        dk.try_update_to(Epoch::new(0), &params, &mut rng).unwrap();
-        assert_eq!(dk.nodes.len(), 33);
-
-        let expected_last = Tau::new(0);
-        // (and yes, I had to look up those names in a thesaurus)
-        let expected_penultimate = Tau::new(1);
-        // note that this value is 31bit long
-        let expected_antepenultimate = Tau(bitvec![u32, Msb0;
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 1
-        ]);
-
-        let mut nodes_iter = dk.nodes.iter().rev();
-        assert_eq!(expected_last, nodes_iter.next().unwrap().tau);
-        assert_eq!(expected_penultimate, nodes_iter.next().unwrap().tau);
-        assert_eq!(expected_antepenultimate, nodes_iter.next().unwrap().tau);
-
-        let mut epoch_zero_nodes = dk.nodes.clone();
-
-        // nodes for epoch1 should be identical for those for epoch0 minus the 00..00 leaf
-        dk.try_update_to(Epoch::new(1), &params, &mut rng).unwrap();
-        assert_eq!(dk.nodes.len(), 32);
-        epoch_zero_nodes.pop().unwrap();
-        assert_eq!(
-            epoch_zero_nodes
-                .iter()
-                .map(|node| node.tau.clone())
-                .collect::<Vec<_>>(),
-            dk.nodes
-                .iter()
-                .map(|node| node.tau.clone())
-                .collect::<Vec<_>>()
-        );
-
-        dk.try_update_to(Epoch::new(2), &params, &mut rng).unwrap();
-        dk.try_update_to(Epoch::new(3), &params, &mut rng).unwrap();
-        dk.try_update_to(Epoch::new(4), &params, &mut rng).unwrap();
-
-        let expected_last = Tau::new(4);
-        let expected_penultimate = Tau::new(5);
-        let expected_antepenultimate = Tau(bitvec![u32, Msb0;
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1
-        ]);
-        let expected_preantepenultimate = Tau(bitvec![u32, Msb0;
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1
-        ]);
-        assert_eq!(dk.nodes.len(), 32);
-        let mut nodes_iter = dk.nodes.iter().rev();
-        assert_eq!(expected_last, nodes_iter.next().unwrap().tau);
-        assert_eq!(expected_penultimate, nodes_iter.next().unwrap().tau);
-        assert_eq!(expected_antepenultimate, nodes_iter.next().unwrap().tau);
-        assert_eq!(expected_preantepenultimate, nodes_iter.next().unwrap().tau);
-
-        // the result should be the same of regardless if we update incrementally or go to the target immediately
-        let mut new_root = DecryptionKey {
-            nodes: root_node_copy,
-        };
-        new_root
-            .try_update_to(Epoch::new(4), &params, &mut rng)
-            .unwrap();
-        assert_eq!(
-            dk.nodes
-                .iter()
-                .map(|node| node.tau.clone())
-                .collect::<Vec<_>>(),
-            new_root
-                .nodes
-                .iter()
-                .map(|node| node.tau.clone())
-                .collect::<Vec<_>>()
-        );
-
-        // getting expected nodes for those epochs is non-trivial for test purposes, but the last node
-        // should ALWAYS be equal to the target epoch
-        dk.try_update_to(Epoch::new(42), &params, &mut rng).unwrap();
-        assert_eq!(dk.nodes.last().unwrap().tau, Tau::new(42));
-        dk.try_update_to(Epoch::new(123456), &params, &mut rng)
-            .unwrap();
-        assert_eq!(dk.nodes.last().unwrap().tau, Tau::new(123456));
-        dk.try_update_to(Epoch::new(3292547435), &params, &mut rng)
-            .unwrap();
-        assert_eq!(dk.nodes.last().unwrap().tau, Tau::new(3292547435));
-
-        // trying to go to past epochs fails
-        assert!(dk
-            .try_update_to(Epoch::new(531), &params, &mut rng)
-            .is_err())
-    }
-
-    #[test]
-    fn updating_to_next_epoch() {
-        let params = setup();
-
-        let dummy_seed = [1u8; 32];
-        let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-
-        let (mut dk, _) = keygen(&params, &mut rng);
-
-        // for root node current epoch is `None`
-        assert_eq!(None, dk.current_epoch(&params).unwrap());
-
-        // for root node it should result in epoch 0
-        dk.try_update_to_next_epoch(&params, &mut rng).unwrap();
-        assert_eq!(Some(Epoch::new(0)), dk.current_epoch(&params).unwrap());
-
-        dk.try_update_to_next_epoch(&params, &mut rng).unwrap();
-        assert_eq!(Some(Epoch::new(1)), dk.current_epoch(&params).unwrap());
-
-        dk.try_update_to_next_epoch(&params, &mut rng).unwrap();
-        assert_eq!(Some(Epoch::new(2)), dk.current_epoch(&params).unwrap());
-
-        // if we start from some non-root epoch, it should result in l + 1
-        dk.try_update_to(Epoch::new(42), &params, &mut rng).unwrap();
-        dk.try_update_to_next_epoch(&params, &mut rng).unwrap();
-        assert_eq!(Some(Epoch::new(43)), dk.current_epoch(&params).unwrap());
-
-        dk.try_update_to(Epoch::new(12345), &params, &mut rng)
-            .unwrap();
-        dk.try_update_to_next_epoch(&params, &mut rng).unwrap();
-        assert_eq!(Some(Epoch::new(12346)), dk.current_epoch(&params).unwrap());
-
-        dk.try_update_to(Epoch::new(3292547435), &params, &mut rng)
-            .unwrap();
-        dk.try_update_to_next_epoch(&params, &mut rng).unwrap();
-        assert_eq!(
-            Some(Epoch::new(3292547436)),
-            dk.current_epoch(&params).unwrap()
-        );
-    }
-
-    #[test]
-    fn public_key_with_proof_roundtrip() {
-        let params = setup();
-
-        let dummy_seed = [1u8; 32];
-        let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-
-        let (_, pk) = keygen(&params, &mut rng);
-        let bytes = pk.to_bytes();
-        let recovered = PublicKeyWithProof::try_from_bytes(&bytes).unwrap();
-
-        assert_eq!(pk, recovered)
-    }
-
-    #[test]
-    fn bte_node_roundtrip() {
-        let params = setup();
-
-        let dummy_seed = [1u8; 32];
-        let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-
-        let (mut dk, _) = keygen(&params, &mut rng);
-
-        let root_node = dk.nodes[0].clone();
-        let bytes = root_node.to_bytes();
-        let recovered = Node::try_from_bytes(&bytes).unwrap();
-        assert_eq!(root_node, recovered);
-
-        dk.try_update_to(Epoch::new(3292547435), &params, &mut rng)
-            .unwrap();
-        for node in &dk.nodes {
-            let bytes = node.to_bytes();
-            let recovered = Node::try_from_bytes(&bytes).unwrap();
-            assert_eq!(node, &recovered);
-        }
-    }
-
-    #[test]
-    fn decryption_key_node_roundtrip() {
-        let params = setup();
-
-        let dummy_seed = [1u8; 32];
-        let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-
-        let (mut dk, _) = keygen(&params, &mut rng);
-
-        let bytes = dk.to_bytes();
-        let recovered = DecryptionKey::try_from_bytes(&bytes).unwrap();
-        assert_eq!(dk, recovered);
-
-        dk.try_update_to(Epoch::new(0), &params, &mut rng).unwrap();
-        let bytes = dk.to_bytes();
-        let recovered = DecryptionKey::try_from_bytes(&bytes).unwrap();
-        assert_eq!(dk, recovered);
-
-        dk.try_update_to(Epoch::new(1), &params, &mut rng).unwrap();
-        let bytes = dk.to_bytes();
-        let recovered = DecryptionKey::try_from_bytes(&bytes).unwrap();
-        assert_eq!(dk, recovered);
-
-        dk.try_update_to(Epoch::new(42), &params, &mut rng).unwrap();
-        let bytes = dk.to_bytes();
-        let recovered = DecryptionKey::try_from_bytes(&bytes).unwrap();
-        assert_eq!(dk, recovered);
-
-        dk.try_update_to(Epoch::new(3292547435), &params, &mut rng)
-            .unwrap();
-        let bytes = dk.to_bytes();
-        let recovered = DecryptionKey::try_from_bytes(&bytes).unwrap();
-        assert_eq!(dk, recovered);
-    }
-}
@@ -1,463 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::error::DkgError;
-use crate::utils::{hash_g2, RandomOracleBuilder};
-use crate::{Chunk, Share};
-use bitvec::field::BitField;
-use bitvec::order::Msb0;
-use bitvec::vec::BitVec;
-use bitvec::view::BitView;
-use bls12_381::{G1Affine, G1Projective, G2Affine, G2Prepared, G2Projective, Gt};
-use group::Curve;
-use lazy_static::lazy_static;
-use zeroize::Zeroize;
-
-pub mod encryption;
-pub mod keys;
-pub mod proof_chunking;
-pub mod proof_discrete_log;
-pub mod proof_sharing;
-
-pub use encryption::{decrypt_share, encrypt_shares, Ciphertexts};
-pub use keys::{keygen, DecryptionKey, PublicKey, PublicKeyWithProof};
-
-lazy_static! {
-    pub(crate) static ref PAIRING_BASE: Gt =
-        bls12_381::pairing(&G1Affine::generator(), &G2Affine::generator());
-    pub(crate) static ref G2_GENERATOR_PREPARED: G2Prepared =
-        G2Prepared::from(G2Affine::generator());
-    pub(crate) static ref DEFAULT_BSGS_TABLE: encryption::BabyStepGiantStepLookup =
-        encryption::BabyStepGiantStepLookup::default();
-}
-
-// Domain tries to follow guidelines specified by:
-// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-hash-to-curve-11#section-3.1
-const SETUP_DOMAIN: &[u8] = b"NYM_COCONUT_NIDKG_V01_CS01_WITH_BLS12381G2_XMD:SHA-256_SSWU_RO_SETUP";
-
-// this particular domain is not for curve hashing, but might as well also follow the same naming pattern
-const TREE_TAU_EXTENSION_DOMAIN: &[u8] = b"NYM_COCONUT_NIDKG_V01_CS01_SHA-256_TREE_EXTENSION";
-
-const MAX_EPOCHS_EXP: usize = 32;
-const HASH_SECURITY_PARAM: usize = 256;
-
-// note: CHUNK_BYTES * NUM_CHUNKS must equal to SCALAR_SIZE
-pub const CHUNK_BYTES: usize = 2;
-pub const NUM_CHUNKS: usize = 16;
-pub const SCALAR_SIZE: usize = 32;
-
-/// In paper B; number of distinct chunks
-pub const CHUNK_SIZE: usize = 1 << (CHUNK_BYTES << 3);
-
-pub(crate) type EpochStore = u32;
-
-#[derive(Clone, Debug, PartialEq, PartialOrd)]
-// None empty bitvec implies this is a root node
-pub(crate) struct Tau(BitVec<EpochStore, Msb0>);
-
-impl Tau {
-    pub fn new_root() -> Self {
-        Tau(BitVec::new())
-    }
-
-    // TODO: perhaps this should be explicitly moved to some test module
-    #[cfg(test)]
-    pub(crate) fn new(epoch: EpochStore) -> Self {
-        Tau(epoch.view_bits().to_bitvec())
-    }
-
-    #[allow(unused)]
-    pub fn left_child(&self) -> Self {
-        let mut child = self.0.clone();
-        child.push(false);
-        Tau(child)
-    }
-
-    pub fn right_child(&self) -> Self {
-        let mut child = self.0.clone();
-        child.push(true);
-        Tau(child)
-    }
-
-    pub fn is_leaf(&self, params: &Params) -> bool {
-        self.height() == params.lambda_t
-    }
-
-    pub fn try_get_parent_at_height(&self, height: usize) -> Result<Self, DkgError> {
-        if height > self.0.len() {
-            return Err(DkgError::NotAValidParent);
-        }
-
-        Ok(Tau(self.0[..height].to_bitvec()))
-    }
-
-    // essentially is this tau prefixing the other
-    pub fn is_parent_of(&self, other: &Tau) -> bool {
-        if self.0.len() > other.0.len() {
-            return false;
-        }
-
-        for (i, b) in self.0.iter().enumerate() {
-            if b != other.0[i] {
-                return false;
-            }
-        }
-
-        true
-    }
-
-    pub fn lowest_valid_epoch_child(&self, params: &Params) -> Result<Epoch, DkgError> {
-        if self.0.len() > params.lambda_t {
-            // this node is already BELOW a valid leaf-epoch node. it can only happen
-            // if either some invariant was broken or additional data was pushed to `tau`
-            // in order compute some intermediate results, but in that case this method should have
-            // never been called anyway. tl;dr: if this is called, the underlying key is malformed
-            return Err(DkgError::NotAValidParent);
-        }
-        let mut child = self.0.clone();
-        for _ in 0..(params.lambda_t - self.0.len()) {
-            child.push(false)
-        }
-
-        // the unwrap here is fine as we ensure we have exactly `params.tree_height` bits here
-        // (we could just propagate the error instead of unwraping and putting it behind an `Ok` anyway
-        // but I'd prefer to just blow up since this would be a serious error
-        Ok(Epoch::try_from_tau(&Tau(child), params).unwrap())
-    }
-
-    pub fn height(&self) -> usize {
-        self.0.len()
-    }
-
-    fn extend(
-        &self,
-        rr: &[G1Projective; NUM_CHUNKS],
-        ss: &[G1Projective; NUM_CHUNKS],
-        cc: &[[G1Projective; NUM_CHUNKS]],
-    ) -> Self {
-        let mut random_oracle_builder = RandomOracleBuilder::new(TREE_TAU_EXTENSION_DOMAIN);
-        random_oracle_builder.update_with_g1_elements(rr.iter());
-        random_oracle_builder.update_with_g1_elements(ss.iter());
-        for ciphertext_chunks in cc {
-            random_oracle_builder.update_with_g1_elements(ciphertext_chunks.iter());
-        }
-
-        let tau_mem = self.0.as_raw_slice();
-        assert_eq!(tau_mem.len(), 1, "tau length invariant was broken");
-        random_oracle_builder.update(&tau_mem[0].to_be_bytes());
-
-        let oracle_output = random_oracle_builder.finalize();
-        debug_assert_eq!(oracle_output.len() * 8, HASH_SECURITY_PARAM);
-
-        let mut extended_tau = self.clone();
-        for byte in oracle_output {
-            extended_tau
-                .0
-                .extend_from_bitslice(byte.view_bits::<Msb0>())
-        }
-
-        extended_tau
-    }
-
-    // considers all lambda_t + lambda_h bits
-    fn evaluate_f(&self, params: &Params) -> G2Projective {
-        self.0
-            .iter()
-            .by_vals()
-            .zip(params.fs.iter().chain(params.fh.iter()))
-            .filter(|(i, _)| *i)
-            .map(|(_, f_i)| f_i)
-            .fold(params.f0, |acc, f_i| acc + f_i)
-    }
-
-    // only considers up to lambda_t bits
-    fn evaluate_partial_f(&self, params: &Params) -> G2Projective {
-        self.0
-            .iter()
-            .by_vals()
-            .zip(params.fs.iter())
-            .filter(|(i, _)| *i)
-            .map(|(_, f_i)| f_i)
-            .fold(params.f0, |acc, f_i| acc + f_i)
-    }
-
-    pub(crate) fn to_bytes(&self) -> Vec<u8> {
-        let len_bytes = (self.0.len() as u32).to_be_bytes();
-        len_bytes
-            .into_iter()
-            .chain(self.0.chunks(8).map(BitField::load_be))
-            .collect()
-    }
-
-    pub(crate) fn try_from_bytes(b: &[u8]) -> Result<Self, DkgError> {
-        if b.len() < 4 {
-            return Err(DkgError::new_deserialization_failure(
-                "Tau",
-                "insufficient number of bytes provided",
-            ));
-        }
-        let tau_len = u32::from_be_bytes([b[0], b[1], b[2], b[3]]) as usize;
-
-        // maximum theoretical length
-        if tau_len > MAX_EPOCHS_EXP + HASH_SECURITY_PARAM {
-            return Err(DkgError::new_deserialization_failure(
-                "Tau",
-                format!(
-                    "malformed length {} is greater than maximum {}",
-                    tau_len,
-                    MAX_EPOCHS_EXP + HASH_SECURITY_PARAM
-                ),
-            ));
-        }
-
-        if tau_len == 0 {
-            if b.len() != 4 {
-                Err(DkgError::new_deserialization_failure(
-                    "Tau",
-                    "malformed bytes",
-                ))
-            } else {
-                Ok(Tau::new_root())
-            }
-        } else if b.len() == 4 {
-            Err(DkgError::new_deserialization_failure(
-                "Tau",
-                "insufficient number of bytes provided",
-            ))
-        } else {
-            let mut inner = BitVec::repeat(false, tau_len);
-            for (slot, &byte) in inner.chunks_mut(8).zip(b[4..].iter()) {
-                slot.store_be(byte);
-            }
-
-            Ok(Tau(inner))
-        }
-    }
-}
-
-impl Zeroize for Tau {
-    fn zeroize(&mut self) {
-        for v in self.0.as_raw_mut_slice() {
-            v.zeroize()
-        }
-    }
-}
-
-#[derive(Copy, Clone, Debug, PartialEq, PartialOrd)]
-pub struct Epoch(EpochStore);
-
-impl Epoch {
-    pub fn new(value: EpochStore) -> Self {
-        Epoch(value)
-    }
-
-    pub(crate) fn as_tau(&self) -> Tau {
-        (*self).into()
-    }
-
-    pub(crate) fn as_extended_tau(
-        &self,
-        rr: &[G1Projective; NUM_CHUNKS],
-        ss: &[G1Projective; NUM_CHUNKS],
-        cc: &[[G1Projective; NUM_CHUNKS]],
-    ) -> Tau {
-        self.as_tau().extend(rr, ss, cc)
-    }
-
-    pub(crate) fn try_from_tau(tau: &Tau, params: &Params) -> Result<Self, DkgError> {
-        if !tau.is_leaf(params) {
-            Err(DkgError::MalformedEpoch)
-        } else {
-            Ok(Epoch(tau.0.load_be()))
-        }
-    }
-}
-
-impl From<Epoch> for Tau {
-    fn from(epoch: Epoch) -> Self {
-        Tau(epoch.0.view_bits().to_bitvec())
-    }
-}
-
-impl From<EpochStore> for Epoch {
-    fn from(epoch: EpochStore) -> Self {
-        Epoch(epoch)
-    }
-}
-
-pub struct Params {
-    /// Maximum size of an epoch, in bits.
-    pub lambda_t: usize,
-
-    /// Security parameter of our $H_{\Lamda_H}$ hash function
-    pub lambda_h: usize,
-
-    // keeping f0 separate from the rest of the curve points makes it easier to work with tau
-    f0: G2Projective,
-    fs: Vec<G2Projective>, // f_1, f_2, .... f_{lambda_t} in the paper
-    fh: Vec<G2Projective>, // f_{lambda_t+1}, f_{lambda_t+1}, .... f_{lambda_t+lambda_h} in the paper
-    h: G2Projective,
-
-    /// Precomputed `h` used for the miller loop
-    _h_prepared: G2Prepared,
-}
-
-pub fn setup() -> Params {
-    let f0 = hash_g2(b"f0", SETUP_DOMAIN);
-
-    let fs = (1..=MAX_EPOCHS_EXP)
-        .map(|i| hash_g2(format!("f{}", i), SETUP_DOMAIN))
-        .collect();
-
-    let fh = (0..HASH_SECURITY_PARAM)
-        .map(|i| hash_g2(format!("fh{}", i), SETUP_DOMAIN))
-        .collect();
-
-    let h = hash_g2(b"h", SETUP_DOMAIN);
-
-    Params {
-        lambda_t: MAX_EPOCHS_EXP,
-        lambda_h: HASH_SECURITY_PARAM,
-        f0,
-        fs,
-        fh,
-        h,
-        _h_prepared: G2Prepared::from(h.to_affine()),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use bitvec::bitvec;
-    use bitvec::order::Msb0;
-
-    #[test]
-    fn creating_tau_from_epoch() {
-        assert!(Tau::new_root().0.is_empty());
-
-        let zero = Tau::new(0);
-        assert!(zero.0.iter().by_vals().all(|b| !b));
-
-        let one = Tau::new(1);
-        let mut iter = one.0.iter().by_vals();
-        // first 31 bits are 0, the last one is 1
-        for _ in 0..31 {
-            assert!(!iter.next().unwrap())
-        }
-        assert!(iter.next().unwrap());
-
-        // 101010 in binary
-        let forty_two = Tau::new(42);
-        // first 26 bits are not set
-        let mut iter = forty_two.0.iter().by_vals();
-        for _ in 0..26 {
-            assert!(!iter.next().unwrap())
-        }
-        assert!(iter.next().unwrap());
-        assert!(!iter.next().unwrap());
-        assert!(iter.next().unwrap());
-        assert!(!iter.next().unwrap());
-        assert!(iter.next().unwrap());
-        assert!(!iter.next().unwrap());
-
-        // value that requires an actual u32 (i.e. takes 4 bytes to represent)
-        // 11000100_01000000_01001001_01101011 in binary
-        let big_val = Tau::new(3292547435);
-        let expected = bitvec![u32, Msb0;
-            1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1,
-            0, 1, 1
-        ];
-        assert_eq!(expected, big_val.0)
-    }
-
-    #[test]
-    fn getting_parent_at_height() {
-        let tau = Tau(bitvec![u32, Msb0; 1,0,1,1,0,0,1]);
-
-        let expected_0 = Tau(BitVec::new());
-        let expected_1 = Tau(bitvec![u32, Msb0; 1]);
-        let expected_5 = Tau(bitvec![u32, Msb0; 1,0,1,1,0]);
-
-        assert_eq!(expected_0, tau.try_get_parent_at_height(0).unwrap());
-        assert_eq!(expected_1, tau.try_get_parent_at_height(1).unwrap());
-        assert_eq!(expected_5, tau.try_get_parent_at_height(5).unwrap());
-        assert_eq!(tau, tau.try_get_parent_at_height(7).unwrap());
-        assert!(tau.try_get_parent_at_height(8).is_err())
-    }
-
-    #[test]
-    fn converting_tau_to_epoch() {
-        let params = setup();
-
-        let tau0: Tau = Epoch::new(0).into();
-        let tau1: Tau = Epoch::new(1).into();
-        let tau42: Tau = Epoch::new(42).into();
-        let tau_big: Tau = Epoch::new(3292547435).into();
-
-        assert_eq!(Epoch::new(0), Epoch::try_from_tau(&tau0, &params).unwrap());
-        assert_eq!(Epoch::new(1), Epoch::try_from_tau(&tau1, &params).unwrap());
-        assert_eq!(
-            Epoch::new(42),
-            Epoch::try_from_tau(&tau42, &params).unwrap()
-        );
-        assert_eq!(
-            Epoch::new(3292547435),
-            Epoch::try_from_tau(&tau_big, &params).unwrap()
-        );
-
-        assert!(Epoch::try_from_tau(&Tau(BitVec::new()), &params).is_err());
-        assert!(Epoch::try_from_tau(&Tau(bitvec![u32, Msb0; 1,0,1,1,0]), &params).is_err());
-        let _31bit_tau = Tau(bitvec![u32, Msb0;
-            1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1,
-            0, 1
-        ]);
-        assert!(Epoch::try_from_tau(&_31bit_tau, &params).is_err());
-
-        let _33bit_tau = Tau(bitvec![u32, Msb0;
-            1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1,
-            0, 1, 1, 0
-        ]);
-        assert!(Epoch::try_from_tau(&_33bit_tau, &params).is_err());
-    }
-
-    #[test]
-    fn tau_roundtrip() {
-        let good_taus = vec![
-            Tau::new_root(),
-            Tau::new(0),
-            Tau::new(1),
-            Tau::new(2),
-            Tau::new(42),
-            Tau::new(123456),
-            Tau::new(3292547435),
-            Tau::new(u32::MAX),
-        ];
-
-        for tau in good_taus {
-            let bytes = tau.to_bytes();
-            let recovered = Tau::try_from_bytes(&bytes).unwrap();
-            assert_eq!(tau, recovered);
-        }
-
-        // more valid variants
-        let mut another_tau = Tau::new(u32::MAX);
-        another_tau.0.push(true);
-        another_tau.0.push(false);
-        another_tau.0.push(true);
-
-        let bytes = another_tau.to_bytes();
-        let recovered = Tau::try_from_bytes(&bytes).unwrap();
-        assert_eq!(another_tau, recovered);
-
-        // ensure there are no panics
-        let big_length_bytes = [255, 255, 255, 255, 42];
-        assert!(Tau::try_from_bytes(&big_length_bytes).is_err());
-
-        assert!(Tau::try_from_bytes(&[]).is_err());
-        assert!(Tau::try_from_bytes(&[1, 1, 1, 1]).is_err());
-        assert!(Tau::try_from_bytes(&[0, 0, 0, 1]).is_err());
-        assert!(Tau::try_from_bytes(&[1, 0, 0, 0]).is_err());
-        assert!(Tau::try_from_bytes(&[1, 0, 0]).is_err());
-    }
-}
@@ -1,94 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::utils::hash_to_scalar;
-use bls12_381::{G1Projective, Scalar};
-use ff::Field;
-use group::GroupEncoding;
-use rand_core::RngCore;
-use zeroize::Zeroize;
-
-// Domain tries to follow guidelines specified by:
-// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-hash-to-curve-11#section-3.1
-const DISCRETE_LOG_DOMAIN: &[u8] =
-    b"NYM_COCONUT_NIDKG_V01_CS01_WITH_BLS12381_XMD:SHA-256_SSWU_RO_PROOF_DISCRETE_LOG";
-
-#[derive(Debug)]
-#[cfg_attr(test, derive(PartialEq))]
-pub struct ProofOfDiscreteLog {
-    pub(crate) rand_commitment: G1Projective,
-    pub(crate) response: Scalar,
-}
-
-impl ProofOfDiscreteLog {
-    pub fn construct(mut rng: impl RngCore, public: &G1Projective, witness: &Scalar) -> Self {
-        let mut rand_x = Scalar::random(&mut rng);
-        let rand_commitment = G1Projective::generator() * rand_x;
-        let challenge = Self::compute_challenge(public, &rand_commitment);
-
-        let response = rand_x + challenge * witness;
-        rand_x.zeroize();
-
-        ProofOfDiscreteLog {
-            rand_commitment,
-            response,
-        }
-    }
-
-    // note: we don't have to explicitly check whether points are on correct curves / fields
-    // as if they weren't, they'd fail to get deserialized
-    pub fn verify(&self, public: &G1Projective) -> bool {
-        let challenge = Self::compute_challenge(public, &self.rand_commitment);
-
-        // y^c • a == g1^rand_x
-        public * challenge + self.rand_commitment == G1Projective::generator() * self.response
-    }
-
-    pub(crate) fn compute_challenge(public: &G1Projective, rand_commit: &G1Projective) -> Scalar {
-        let public_bytes = public.to_bytes();
-        let rand_commit_bytes = rand_commit.to_bytes();
-
-        let mut bytes = Vec::with_capacity(96);
-        bytes.extend_from_slice(public_bytes.as_ref());
-        bytes.extend_from_slice(rand_commit_bytes.as_ref());
-
-        hash_to_scalar(bytes, DISCRETE_LOG_DOMAIN)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use rand_core::SeedableRng;
-
-    #[test]
-    fn should_verify_a_valid_proof() {
-        let dummy_seed = [1u8; 32];
-        let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-
-        let witness = Scalar::random(&mut rng);
-        let public = G1Projective::generator() * witness;
-
-        let proof = ProofOfDiscreteLog::construct(&mut rng, &public, &witness);
-
-        assert!(proof.verify(&public))
-    }
-
-    #[test]
-    fn should_fail_on_invalid_proof() {
-        let dummy_seed = [1u8; 32];
-        let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-
-        let witness = Scalar::random(&mut rng);
-        let public = G1Projective::generator() * witness;
-
-        let other_witness = Scalar::random(&mut rng);
-        let other_public = G1Projective::generator() * other_witness;
-
-        let proof = ProofOfDiscreteLog::construct(&mut rng, &public, &witness);
-        let other_proof = ProofOfDiscreteLog::construct(&mut rng, &other_public, &other_witness);
-
-        assert!(!proof.verify(&other_public));
-        assert!(!other_proof.verify(&public));
-    }
-}
@@ -1,615 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::bte::PublicKey;
-use crate::error::DkgError;
-use crate::interpolation::polynomial::PublicCoefficients;
-use crate::utils::{deserialize_g1, deserialize_g2, deserialize_scalar, hash_to_scalar};
-use crate::{NodeIndex, Share};
-use bls12_381::{G1Projective, G2Projective, Scalar};
-use ff::Field;
-use group::GroupEncoding;
-use rand_core::RngCore;
-use std::collections::BTreeMap;
-
-// Domain tries to follow guidelines specified by:
-// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-hash-to-curve-11#section-3.1
-const INSTANCE_DOMAIN: &[u8] =
-    b"NYM_COCONUT_NIDKG_V01_CS01_WITH_BLS12381_XMD:SHA-256_SSWU_RO_PROOF_SECRET_SHARING_INSTANCE";
-
-const CHALLENGE_DOMAIN: &[u8] =
-    b"NYM_COCONUT_NIDKG_V01_CS01_WITH_BLS12381_XMD:SHA-256_SSWU_RO_PROOF_SECRET_SHARING_CHALLENGE";
-
-#[cfg_attr(test, derive(Clone))]
-pub struct Instance<'a> {
-    public_keys: &'a BTreeMap<NodeIndex, PublicKey>,
-    public_coefficients: &'a PublicCoefficients,
-    combined_randomizer: &'a G1Projective,
-    combined_ciphertexts: &'a [G1Projective],
-}
-
-impl<'a> Instance<'a> {
-    pub fn new(
-        public_keys: &'a BTreeMap<NodeIndex, PublicKey>,
-        public_coefficients: &'a PublicCoefficients,
-        combined_randomizer: &'a G1Projective,
-        combined_ciphertexts: &'a [G1Projective],
-    ) -> Instance<'a> {
-        Instance {
-            public_keys,
-            public_coefficients,
-            combined_randomizer,
-            combined_ciphertexts,
-        }
-    }
-
-    fn hash_to_scalar(&self) -> Scalar {
-        let g1s = self.public_keys.len() + 1 + self.combined_ciphertexts.len();
-        let g2s = self.public_coefficients.size();
-        let mut bytes = Vec::with_capacity(g1s * 48 + g2s * 96);
-
-        for pk in self.public_keys.values() {
-            bytes.extend_from_slice(pk.0.to_bytes().as_ref())
-        }
-        for coeff in self.public_coefficients.inner() {
-            bytes.extend_from_slice(coeff.to_bytes().as_ref())
-        }
-        bytes.extend_from_slice(self.combined_randomizer.to_bytes().as_ref());
-
-        for ciphertext in self.combined_ciphertexts {
-            bytes.extend_from_slice(ciphertext.to_bytes().as_ref())
-        }
-
-        hash_to_scalar(&bytes, INSTANCE_DOMAIN)
-    }
-
-    fn validate(&self) -> bool {
-        if self.public_keys.is_empty() || self.public_coefficients.is_empty() {
-            return false;
-        }
-
-        if self.public_keys.len() != self.combined_ciphertexts.len() {
-            return false;
-        }
-
-        true
-    }
-}
-
-#[derive(Debug)]
-#[cfg_attr(test, derive(Clone, PartialEq))]
-pub struct ProofOfSecretSharing {
-    ff: G1Projective,
-    aa: G2Projective,
-    yy: G1Projective,
-    response_r: Scalar,
-    response_alpha: Scalar,
-}
-
-impl ProofOfSecretSharing {
-    pub fn construct(
-        mut rng: impl RngCore,
-        instance: Instance,
-        witness_r: &Scalar,
-        witnesses_s: &[Share],
-    ) -> Result<Self, DkgError> {
-        if !instance.validate() {
-            return Err(DkgError::MalformedProofOfSharingInstance);
-        }
-
-        let g1 = G1Projective::generator();
-        let g2 = G2Projective::generator();
-
-        let x = instance.hash_to_scalar();
-
-        // alpha, rho ← random_scalars
-        let alpha = Scalar::random(&mut rng);
-        let rho = Scalar::random(&mut rng);
-
-        // F = g1^rho
-        let ff = g1 * rho;
-        // A = g2^alpha
-        let aa = g2 * alpha;
-
-        // Y = (y_1^{x^1} • ...  y_n^{x^n})^rho • g1^alpha
-        // produce intermediate product (y_1^{x^1} • ...  y_n^{x^n})
-        let product =
-            instance
-                .public_keys
-                .values()
-                .rev()
-                .fold(G1Projective::identity(), |mut acc, pk| {
-                    acc += pk.0;
-                    acc *= x;
-                    acc
-                });
-        let yy = product * rho + g1 * alpha;
-
-        let challenge = Self::compute_challenge(&x, &ff, &aa, &yy);
-
-        // response_r = r • challenge + rho
-        let response_r = witness_r * challenge + rho;
-
-        // response_alpha = (share_1 • x^1 + ... share_n • x^n) • challenge + alpha
-        // produce intermediate sum (share_1 • x^1 + ... share_n • x^n)
-        let sum = witnesses_s
-            .iter()
-            .rev()
-            .fold(Scalar::zero(), |mut acc, witness| {
-                acc += witness.inner();
-                acc *= x;
-                acc
-            });
-        let response_alpha = sum * challenge + alpha;
-
-        Ok(ProofOfSecretSharing {
-            ff,
-            aa,
-            yy,
-            response_r,
-            response_alpha,
-        })
-    }
-
-    pub fn verify(&self, instance: Instance) -> bool {
-        if !instance.validate() {
-            return false;
-        }
-
-        let g1 = G1Projective::generator();
-        let g2 = G2Projective::generator();
-
-        let x = instance.hash_to_scalar();
-        let challenge = Self::compute_challenge(&x, &self.ff, &self.aa, &self.yy);
-
-        // check if R^challenge * F == g1^response_r
-        if instance.combined_randomizer * challenge + self.ff != g1 * self.response_r {
-            return false;
-        }
-
-        // check if
-        // (A_0 ^ (id1^0 • x^1 + ... idn^0 • x^n) • ... A_{t-1} ^ (id1^{t-1} • x^{t-1} + ... idn^{t-1} • x^n))^challenge * A
-        // ==
-        // g2^response_alpha
-        let product = instance
-            .public_coefficients
-            .inner()
-            .iter()
-            .enumerate()
-            .fold(G2Projective::identity(), |mut acc, (k, coeff)| {
-                // intermediate (id1^k • x^1 + ... + idn^k • x^n) sum
-                let sum: Scalar = instance
-                    .public_keys
-                    .keys()
-                    .enumerate()
-                    .map(|(i, node_id)| {
-                        let id_scalar = Scalar::from(*node_id);
-                        id_scalar.pow(&[k as u64, 0, 0, 0]) * x.pow(&[(i + 1) as u64, 0, 0, 0])
-                    })
-                    .sum();
-
-                acc += coeff * sum;
-                acc
-            });
-
-        if product * challenge + self.aa != g2 * self.response_alpha {
-            return false;
-        }
-
-        // check if
-        // (ciphertext_1 ^ (x^1) • ... ciphertext_n ^ (x^n)) ^ challenge • Y
-        // ==
-        // (pk_1 ^ (x^1) • ... pk_n ^ (x^n)) ^ response_r • g1^response_alpha
-
-        let product_1 = instance.combined_ciphertexts.iter().rev().fold(
-            G1Projective::identity(),
-            |mut acc, ciphertext| {
-                acc += ciphertext;
-                acc *= x;
-                acc
-            },
-        );
-
-        let product_2 =
-            instance
-                .public_keys
-                .values()
-                .rev()
-                .fold(G1Projective::identity(), |mut acc, pk| {
-                    acc += pk.0;
-                    acc *= x;
-                    acc
-                });
-
-        if product_1 * challenge + self.yy != product_2 * self.response_r + g1 * self.response_alpha
-        {
-            return false;
-        }
-
-        true
-    }
-
-    pub(crate) fn compute_challenge(
-        commitment: &Scalar,
-        blinder_g1: &G1Projective,
-        blinder_g2: &G2Projective,
-        blinded_instance: &G1Projective,
-    ) -> Scalar {
-        let mut bytes = Vec::with_capacity(224);
-
-        bytes.extend_from_slice(commitment.to_bytes().as_ref());
-        bytes.extend_from_slice(blinder_g1.to_bytes().as_ref());
-        bytes.extend_from_slice(blinder_g2.to_bytes().as_ref());
-        bytes.extend_from_slice(blinded_instance.to_bytes().as_ref());
-
-        hash_to_scalar(&bytes, CHALLENGE_DOMAIN)
-    }
-
-    pub(crate) fn to_bytes(&self) -> Vec<u8> {
-        // we have 2 G1 elements, single G2 element and 2 scalars
-        let mut bytes = Vec::with_capacity(2 * 48 + 96 + 2 * 32);
-        bytes.extend_from_slice(self.ff.to_bytes().as_ref());
-        bytes.extend_from_slice(self.aa.to_bytes().as_ref());
-        bytes.extend_from_slice(self.yy.to_bytes().as_ref());
-        bytes.extend_from_slice(self.response_r.to_bytes().as_ref());
-        bytes.extend_from_slice(self.response_alpha.to_bytes().as_ref());
-        bytes
-    }
-
-    pub(crate) fn try_from_bytes(bytes: &[u8]) -> Result<Self, DkgError> {
-        if bytes.len() != 2 * 48 + 96 + 2 * 32 {
-            return Err(DkgError::new_deserialization_failure(
-                "ProofOfSecretSharing",
-                "invalid number of bytes provided",
-            ));
-        }
-
-        let mut i = 0;
-        let f = deserialize_g1(&bytes[i..i + 48]).ok_or_else(|| {
-            DkgError::new_deserialization_failure("ProofOfSecretSharing.f", "invalid curve point")
-        })?;
-        i += 48;
-
-        let a = deserialize_g2(&bytes[i..i + 96]).ok_or_else(|| {
-            DkgError::new_deserialization_failure("ProofOfSecretSharing.a", "invalid curve point")
-        })?;
-        i += 96;
-
-        let y = deserialize_g1(&bytes[i..i + 48]).ok_or_else(|| {
-            DkgError::new_deserialization_failure("ProofOfSecretSharing.y", "invalid curve point")
-        })?;
-        i += 48;
-
-        let response_r = deserialize_scalar(&bytes[i..i + 32]).ok_or_else(|| {
-            DkgError::new_deserialization_failure(
-                "ProofOfSecretSharing.response_r",
-                "invalid scalar",
-            )
-        })?;
-        i += 32;
-
-        let response_alpha = deserialize_scalar(&bytes[i..]).ok_or_else(|| {
-            DkgError::new_deserialization_failure(
-                "ProofOfSecretSharing.response_alpha",
-                "invalid scalar",
-            )
-        })?;
-
-        Ok(ProofOfSecretSharing {
-            ff: f,
-            aa: a,
-            yy: y,
-            response_r,
-            response_alpha,
-        })
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::interpolation::polynomial::Polynomial;
-    use group::Group;
-    use rand_core::SeedableRng;
-
-    const NODES: u64 = 50;
-    const THRESHOLD: u64 = 40;
-
-    fn setup(
-        mut rng: impl RngCore,
-    ) -> (
-        BTreeMap<NodeIndex, PublicKey>,
-        PublicCoefficients,
-        G1Projective,
-        Vec<G1Projective>,
-        Scalar,
-        Vec<Share>,
-    ) {
-        let g1 = G1Projective::generator();
-
-        let mut pks = BTreeMap::new();
-        let polynomial = Polynomial::new_random(&mut rng, THRESHOLD - 1);
-        let public_coefficients = polynomial.public_coefficients();
-
-        let mut shares: Vec<Share> = Vec::new();
-        let mut node_indices = (0..NODES).map(|_| rng.next_u64()).collect::<Vec<_>>();
-        node_indices.sort_unstable();
-
-        for node_index in node_indices {
-            let share = polynomial.evaluate_at(&Scalar::from(node_index));
-            shares.push(share.into());
-            pks.insert(node_index, PublicKey(g1 * Scalar::random(&mut rng)));
-        }
-
-        let r = Scalar::random(&mut rng);
-        let rr = g1 * r;
-
-        let ciphertexts = pks
-            .values()
-            .zip(&shares)
-            .map(|(pk, share)| pk.0 * r + g1 * share.inner())
-            .collect();
-        (pks, public_coefficients, rr, ciphertexts, r, shares)
-    }
-
-    #[test]
-    fn should_fail_to_create_proof_with_invalid_instance() {
-        let dummy_seed = [1u8; 32];
-        let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-
-        let g1 = G1Projective::generator();
-
-        let mut pks = BTreeMap::new();
-        let polynomial = Polynomial::new_random(&mut rng, THRESHOLD - 1);
-        let public_coefficients = polynomial.public_coefficients();
-
-        let mut shares: Vec<Share> = Vec::new();
-        for _ in 0..NODES {
-            let node_index = rng.next_u64();
-            let share = polynomial.evaluate_at(&Scalar::from(node_index));
-            shares.push(share.into());
-            pks.insert(node_index, PublicKey(g1 * Scalar::random(&mut rng)));
-        }
-
-        let r = Scalar::random(&mut rng);
-        let rr = g1 * r;
-
-        let mut shares = Vec::new();
-        for node_id in 1..NODES + 1 {
-            let share = polynomial.evaluate_at(&Scalar::from(node_id));
-            shares.push(share);
-        }
-
-        let ciphertexts = pks
-            .values()
-            .zip(&shares)
-            .map(|(pk, share)| pk.0 * r + g1 * share)
-            .collect::<Vec<_>>();
-
-        // no public keys
-        let bad_instance1 = Instance {
-            public_keys: &BTreeMap::new(),
-            public_coefficients: &public_coefficients,
-            combined_randomizer: &rr,
-            combined_ciphertexts: &ciphertexts,
-        };
-        assert!(!bad_instance1.validate());
-
-        // no public coefficients
-        let bad_instance2 = Instance {
-            public_keys: &pks,
-            public_coefficients: &PublicCoefficients {
-                coefficients: Vec::new(),
-            },
-            combined_randomizer: &rr,
-            combined_ciphertexts: &ciphertexts,
-        };
-        assert!(!bad_instance2.validate());
-
-        // no ciphertexts
-        let bad_instance3 = Instance {
-            public_keys: &pks,
-            public_coefficients: &public_coefficients,
-            combined_randomizer: &rr,
-            combined_ciphertexts: &[],
-        };
-        assert!(!bad_instance3.validate());
-
-        // public_keys.len() != combined_ciphertexts.len()
-        let bad_ciphertexts = ciphertexts.iter().skip(1).cloned().collect::<Vec<_>>();
-
-        let bad_instance4 = Instance {
-            public_keys: &pks,
-            public_coefficients: &public_coefficients,
-            combined_randomizer: &rr,
-            combined_ciphertexts: &bad_ciphertexts,
-        };
-        assert!(!bad_instance4.validate());
-
-        // changed index of one of the keys
-        let mut bad_pks = pks.clone();
-        let first_id = bad_pks.keys().copied().take(1).collect::<Vec<_>>();
-        let first_val = bad_pks.remove(&first_id[0]).unwrap();
-        bad_pks.insert(rng.next_u64(), first_val);
-
-        let bad_instance5 = Instance {
-            public_keys: &bad_pks,
-            public_coefficients: &public_coefficients,
-            combined_randomizer: &rr,
-            combined_ciphertexts: &bad_ciphertexts,
-        };
-        assert!(!bad_instance5.validate());
-
-        let good_instance = Instance {
-            public_keys: &pks,
-            public_coefficients: &public_coefficients,
-            combined_randomizer: &rr,
-            combined_ciphertexts: &ciphertexts,
-        };
-        assert!(good_instance.validate())
-    }
-
-    #[test]
-    fn should_verify_a_valid_proof() {
-        let dummy_seed = [1u8; 32];
-        let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-
-        let (public_keys, public_coefficients, rr, ciphertexts, r, shares) = setup(&mut rng);
-
-        let instance = Instance {
-            public_keys: &public_keys,
-            public_coefficients: &public_coefficients,
-            combined_randomizer: &rr,
-            combined_ciphertexts: &ciphertexts,
-        };
-
-        let sharing_proof =
-            ProofOfSecretSharing::construct(&mut rng, instance.clone(), &r, &shares).unwrap();
-
-        assert!(sharing_proof.verify(instance))
-    }
-
-    #[test]
-    fn should_fail_to_verify_proof_with_invalid_instance() {
-        let dummy_seed = [1u8; 32];
-        let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-
-        let (public_keys, public_coefficients, rr, ciphertexts, r, shares) = setup(&mut rng);
-
-        let instance = Instance {
-            public_keys: &public_keys,
-            public_coefficients: &public_coefficients,
-            combined_randomizer: &rr,
-            combined_ciphertexts: &ciphertexts,
-        };
-
-        let sharing_proof =
-            ProofOfSecretSharing::construct(&mut rng, instance.clone(), &r, &shares).unwrap();
-
-        // no public keys
-        let bad_instance1 = Instance {
-            public_keys: &BTreeMap::new(),
-            public_coefficients: &public_coefficients,
-            combined_randomizer: &rr,
-            combined_ciphertexts: &ciphertexts,
-        };
-        assert!(!sharing_proof.verify(bad_instance1));
-
-        // no public coefficients
-        let bad_instance2 = Instance {
-            public_keys: &public_keys,
-            public_coefficients: &PublicCoefficients {
-                coefficients: Vec::new(),
-            },
-            combined_randomizer: &rr,
-            combined_ciphertexts: &ciphertexts,
-        };
-        assert!(!sharing_proof.verify(bad_instance2));
-
-        // no ciphertexts
-        let bad_instance3 = Instance {
-            public_keys: &public_keys,
-            public_coefficients: &public_coefficients,
-            combined_randomizer: &rr,
-            combined_ciphertexts: &[],
-        };
-        assert!(!sharing_proof.verify(bad_instance3));
-
-        // public_keys.len() != combined_ciphertexts.len()
-        let bad_ciphertexts = ciphertexts.iter().skip(1).cloned().collect::<Vec<_>>();
-
-        let bad_instance4 = Instance {
-            public_keys: &public_keys,
-            public_coefficients: &public_coefficients,
-            combined_randomizer: &rr,
-            combined_ciphertexts: &bad_ciphertexts,
-        };
-        assert!(!sharing_proof.verify(bad_instance4));
-    }
-
-    #[test]
-    fn should_fail_to_verify_proof_with_wrong_instance() {
-        let dummy_seed = [1u8; 32];
-        let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-
-        let (public_keys, public_coefficients, rr, ciphertexts, r, shares) = setup(&mut rng);
-
-        let instance = Instance {
-            public_keys: &public_keys,
-            public_coefficients: &public_coefficients,
-            combined_randomizer: &rr,
-            combined_ciphertexts: &ciphertexts,
-        };
-
-        let sharing_proof =
-            ProofOfSecretSharing::construct(&mut rng, instance.clone(), &r, &shares).unwrap();
-
-        let (public_keys, public_coefficients, rr, ciphertexts, _, _) = setup(&mut rng);
-        let bad_instance = Instance {
-            public_keys: &public_keys,
-            public_coefficients: &public_coefficients,
-            combined_randomizer: &rr,
-            combined_ciphertexts: &ciphertexts,
-        };
-
-        assert!(!sharing_proof.verify(bad_instance));
-    }
-
-    #[test]
-    fn should_fail_to_verify_invalid_proof() {
-        let dummy_seed = [1u8; 32];
-        let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-
-        let (public_keys, public_coefficients, rr, ciphertexts, r, shares) = setup(&mut rng);
-
-        let instance = Instance {
-            public_keys: &public_keys,
-            public_coefficients: &public_coefficients,
-            combined_randomizer: &rr,
-            combined_ciphertexts: &ciphertexts,
-        };
-
-        let good_proof =
-            ProofOfSecretSharing::construct(&mut rng, instance.clone(), &r, &shares).unwrap();
-
-        let mut bad_proof = good_proof.clone();
-        bad_proof.ff = G1Projective::generator();
-        assert!(!bad_proof.verify(instance.clone()));
-
-        let mut bad_proof = good_proof.clone();
-        bad_proof.aa = G2Projective::generator();
-        assert!(!bad_proof.verify(instance.clone()));
-
-        let mut bad_proof = good_proof.clone();
-        bad_proof.yy = G1Projective::generator();
-        assert!(!bad_proof.verify(instance.clone()));
-
-        let mut bad_proof = good_proof.clone();
-        bad_proof.response_r = Scalar::from(42);
-        assert!(!bad_proof.verify(instance.clone()));
-
-        let mut bad_proof = good_proof;
-        bad_proof.response_alpha = Scalar::from(42);
-        assert!(!bad_proof.verify(instance));
-    }
-
-    #[test]
-    fn proof_of_secret_sharing_roundtrip() {
-        let dummy_seed = [1u8; 32];
-        let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-
-        let proof_fixture = ProofOfSecretSharing {
-            ff: G1Projective::random(&mut rng),
-            aa: G2Projective::random(&mut rng),
-            yy: G1Projective::random(&mut rng),
-            response_r: Scalar::random(&mut rng),
-            response_alpha: Scalar::random(&mut rng),
-        };
-
-        let bytes = proof_fixture.to_bytes();
-        let recovered = ProofOfSecretSharing::try_from_bytes(&bytes).unwrap();
-        assert_eq!(proof_fixture, recovered);
-
-        assert!(ProofOfSecretSharing::try_from_bytes(&bytes[1..]).is_err())
-    }
-}
@@ -1,500 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::bte::proof_chunking::ProofOfChunking;
-use crate::bte::proof_sharing::ProofOfSecretSharing;
-use crate::bte::{
-    encrypt_shares, proof_chunking, proof_sharing, Ciphertexts, Epoch, Params, PublicKey,
-};
-use crate::error::DkgError;
-use crate::interpolation::polynomial::{Polynomial, PublicCoefficients};
-use crate::interpolation::{
-    perform_lagrangian_interpolation_at_origin, perform_lagrangian_interpolation_at_x,
-};
-use crate::{NodeIndex, Share, Threshold};
-use bls12_381::{G2Projective, Scalar};
-use rand_core::RngCore;
-use std::collections::BTreeMap;
-use zeroize::Zeroize;
-
-#[derive(Debug)]
-#[cfg_attr(test, derive(PartialEq))]
-pub struct Dealing {
-    pub public_coefficients: PublicCoefficients,
-    pub ciphertexts: Ciphertexts,
-    pub proof_of_chunking: ProofOfChunking,
-    pub proof_of_sharing: ProofOfSecretSharing,
-}
-
-impl Dealing {
-    // I'm not a big fan of this function signature, but I'm not clear on how to improve it while
-    // allowing the dealer to skip decryption of its own share if it was also one of the receivers
-    pub fn create(
-        mut rng: impl RngCore,
-        params: &Params,
-        dealer_index: NodeIndex,
-        threshold: Threshold,
-        epoch: Epoch,
-        // BTreeMap ensures the keys are sorted by their indices
-        receivers: &BTreeMap<NodeIndex, PublicKey>,
-        prior_resharing_secret: Option<Scalar>,
-    ) -> (Self, Option<Share>) {
-        assert!(threshold > 0);
-
-        let mut polynomial = Polynomial::new_random(&mut rng, threshold - 1);
-        if let Some(prior_secret) = prior_resharing_secret {
-            polynomial.set_constant_coefficient(prior_secret)
-        }
-
-        let mut shares = receivers
-            .keys()
-            .map(|&node_index| polynomial.evaluate_at(&Scalar::from(node_index)).into())
-            .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, epoch, params, &mut rng);
-
-        // create proofs of knowledge
-        let chunking_instance = proof_chunking::Instance::new(&ordered_public_keys, &ciphertexts);
-        let proof_of_chunking =
-            ProofOfChunking::construct(&mut rng, chunking_instance, hazmat.r(), &shares)
-                .expect("failed to construct proof of chunking");
-
-        let combined_ciphertexts = ciphertexts.combine_ciphertexts();
-        let mut combined_r = hazmat.combine_rs();
-        let combined_rr = ciphertexts.combine_rs();
-
-        let public_coefficients = polynomial.public_coefficients();
-        let sharing_instance = proof_sharing::Instance::new(
-            receivers,
-            &public_coefficients,
-            &combined_rr,
-            &combined_ciphertexts,
-        );
-        let proof_of_sharing =
-            ProofOfSecretSharing::construct(&mut rng, sharing_instance, &combined_r, &shares)
-                .expect("failed to construct proof of secret sharing");
-
-        combined_r.zeroize();
-
-        let dealing = Dealing {
-            public_coefficients,
-            ciphertexts,
-            proof_of_chunking,
-            proof_of_sharing,
-        };
-
-        let dealers_key_index = receivers
-            .keys()
-            .position(|node_index| node_index == &dealer_index);
-        if let Some(dealer_key_index) = dealers_key_index {
-            let dealers_share = shares.remove(dealer_key_index);
-            shares.zeroize();
-            (dealing, Some(dealers_share))
-        } else {
-            (dealing, None)
-        }
-    }
-
-    // rather than returning a bool for whether the dealing is valid or not, a Result is returned
-    // instead so that we would have more information regarding a possible failure cause
-    pub fn verify(
-        &self,
-        params: &Params,
-        epoch: Epoch,
-        threshold: Threshold,
-        receivers: &BTreeMap<NodeIndex, PublicKey>,
-        prior_resharing_public: Option<G2Projective>,
-    ) -> Result<(), DkgError> {
-        if threshold == 0 || threshold as usize > receivers.len() {
-            return Err(DkgError::InvalidThreshold {
-                actual: threshold as usize,
-                participating: receivers.len(),
-            });
-        }
-
-        if self.ciphertexts.ciphertext_chunks.len() != receivers.len() {
-            return Err(DkgError::WrongCiphertextSize {
-                actual: self.ciphertexts.ciphertext_chunks.len(),
-                expected: receivers.len(),
-            });
-        }
-
-        if self.public_coefficients.size() != threshold as usize {
-            return Err(DkgError::WrongPublicCoefficientsSize {
-                actual: self.public_coefficients.size(),
-                expected: threshold as usize,
-            });
-        }
-
-        if !self.ciphertexts.verify_integrity(params, epoch) {
-            return Err(DkgError::FailedCiphertextIntegrityCheck);
-        }
-
-        // TODO: perhaps change the underlying arguments in proofs of knowledge to avoid this allocation?
-        let sorted_receivers = receivers.values().copied().collect::<Vec<_>>();
-
-        let chunking_instance = proof_chunking::Instance::new(&sorted_receivers, &self.ciphertexts);
-        if !self.proof_of_chunking.verify(chunking_instance) {
-            return Err(DkgError::InvalidProofOfChunking);
-        }
-
-        let combined_randomizer = &self.ciphertexts.combine_rs();
-        let combined_ciphertexts = &self.ciphertexts.combine_ciphertexts();
-
-        let sharing_instance = proof_sharing::Instance::new(
-            receivers,
-            &self.public_coefficients,
-            combined_randomizer,
-            combined_ciphertexts,
-        );
-
-        if !self.proof_of_sharing.verify(sharing_instance) {
-            return Err(DkgError::InvalidProofOfSharing);
-        }
-
-        if let Some(prior_public) = prior_resharing_public {
-            let dealt_public = &self.public_coefficients[0];
-            if dealt_public != &prior_public {
-                return Err(DkgError::InvalidResharing);
-            }
-        }
-
-        Ok(())
-    }
-
-    // coeff_len || coeff || cc_len || cc || pi_c_len || pi_c || pi_s_len || pi_s
-    pub fn to_bytes(&self) -> Vec<u8> {
-        let mut bytes = Vec::new();
-
-        let mut coefficients_bytes = self.public_coefficients.to_bytes();
-        bytes.extend_from_slice(&(coefficients_bytes.len() as u32).to_be_bytes());
-        bytes.append(&mut coefficients_bytes);
-
-        let mut ciphertexts_bytes = self.ciphertexts.to_bytes();
-        bytes.extend_from_slice(&(ciphertexts_bytes.len() as u32).to_be_bytes());
-        bytes.append(&mut ciphertexts_bytes);
-
-        let mut proof_sharing_bytes = self.proof_of_sharing.to_bytes();
-        bytes.extend_from_slice(&(proof_sharing_bytes.len() as u32).to_be_bytes());
-        bytes.append(&mut proof_sharing_bytes);
-
-        let mut proof_chunking_bytes = self.proof_of_chunking.to_bytes();
-        bytes.extend_from_slice(&(proof_chunking_bytes.len() as u32).to_be_bytes());
-        bytes.append(&mut proof_chunking_bytes);
-
-        bytes
-    }
-
-    pub fn try_from_bytes(bytes: &[u8]) -> Result<Self, DkgError> {
-        // can we read the length of serialized public coefficients?
-        if bytes.len() < 4 {
-            return Err(DkgError::new_deserialization_failure(
-                "Dealing",
-                "insufficient number of bytes provided",
-            ));
-        }
-
-        let mut i = 0;
-        let coefficients_bytes_len =
-            u32::from_be_bytes((&bytes[i..i + 4]).try_into().unwrap()) as usize;
-        i += 4;
-        let public_coefficients =
-            PublicCoefficients::try_from_bytes(&bytes[i..i + coefficients_bytes_len])?;
-        i += coefficients_bytes_len;
-
-        let ciphertexts_bytes_len =
-            u32::from_be_bytes((&bytes[i..i + 4]).try_into().unwrap()) as usize;
-        i += 4;
-        let ciphertexts = Ciphertexts::try_from_bytes(&bytes[i..i + ciphertexts_bytes_len])?;
-        i += ciphertexts_bytes_len;
-
-        let proof_of_sharing_bytes_len =
-            u32::from_be_bytes((&bytes[i..i + 4]).try_into().unwrap()) as usize;
-        i += 4;
-        let proof_of_sharing =
-            ProofOfSecretSharing::try_from_bytes(&bytes[i..i + proof_of_sharing_bytes_len])?;
-        i += proof_of_sharing_bytes_len;
-
-        let proof_of_chunking_bytes_len =
-            u32::from_be_bytes((&bytes[i..i + 4]).try_into().unwrap()) as usize;
-        i += 4;
-
-        if bytes[i..].len() != proof_of_chunking_bytes_len {
-            return Err(DkgError::new_deserialization_failure(
-                "Dealing",
-                "invalid number of bytes provided",
-            ));
-        }
-
-        let proof_of_chunking = ProofOfChunking::try_from_bytes(&bytes[i..])?;
-
-        Ok(Dealing {
-            public_coefficients,
-            ciphertexts,
-            proof_of_chunking,
-            proof_of_sharing,
-        })
-    }
-}
-
-// this assumes all dealings have been verified
-pub fn try_recover_verification_keys(
-    dealings: &[Dealing],
-    threshold: Threshold,
-    receivers: &BTreeMap<NodeIndex, PublicKey>,
-) -> Result<(G2Projective, Vec<G2Projective>), DkgError> {
-    if dealings.is_empty() {
-        return Err(DkgError::NoDealingsAvailable);
-    }
-
-    let threshold_usize = threshold as usize;
-
-    if !dealings
-        .iter()
-        .all(|dealing| dealing.public_coefficients.size() == threshold_usize)
-    {
-        return Err(DkgError::MismatchedDealings);
-    }
-
-    // currently we expect every dealer to also be a receiver. This restriction might be relaxed in the future
-    if dealings.len() != receivers.len() {
-        return Err(DkgError::MismatchedDealings);
-    }
-
-    let indices = receivers.keys().collect::<Vec<_>>();
-
-    // Compute A0, ..., A_{t-1}
-    let mut interpolated_coefficients = Vec::with_capacity(threshold_usize);
-    for k in 0..threshold_usize {
-        let mut samples = Vec::with_capacity(indices.len());
-        for (j, dealing) in dealings.iter().enumerate() {
-            samples.push((
-                Scalar::from(*indices[j]),
-                *dealing.public_coefficients.nth(k),
-            ))
-        }
-        let interpolated = perform_lagrangian_interpolation_at_origin(&samples)?;
-        interpolated_coefficients.push(interpolated);
-    }
-
-    let master_verification_key = interpolated_coefficients[0];
-
-    let interpolated_coefficients = PublicCoefficients {
-        coefficients: interpolated_coefficients,
-    };
-
-    // shvk_j = A0^{j^0} * A1^{j^1} * ... * A_{t-1}^{j^{t-1}}
-    let verification_key_shares = receivers
-        .keys()
-        .map(|index| interpolated_coefficients.evaluate_at(&Scalar::from(*index)))
-        .collect();
-
-    Ok((master_verification_key, verification_key_shares))
-}
-
-pub fn verify_verification_keys(
-    master_key: &G2Projective,
-    shares: &[G2Projective],
-    receivers: &BTreeMap<NodeIndex, PublicKey>,
-    threshold: Threshold,
-) -> Result<(), DkgError> {
-    if shares.len() != receivers.len() {
-        return Err(DkgError::NotEnoughReceiversProvided);
-    }
-
-    if threshold as usize > receivers.len() {
-        return Err(DkgError::InvalidThreshold {
-            actual: threshold as usize,
-            participating: receivers.len(),
-        });
-    }
-
-    let indices = receivers.keys().copied().collect::<Vec<_>>();
-
-    let indices_with_origin = std::iter::once(&0)
-        .chain(receivers.keys())
-        .collect::<Vec<_>>();
-    let all_shares = std::iter::once(master_key)
-        .chain(shares.iter())
-        .collect::<Vec<_>>();
-
-    for (i, share) in shares.iter().enumerate() {
-        let samples = indices_with_origin
-            .iter()
-            .zip(all_shares.iter())
-            .map(|(&node_index, &share)| (Scalar::from(*node_index), *share))
-            .take(threshold as usize)
-            .collect::<Vec<_>>();
-        let interpolated =
-            perform_lagrangian_interpolation_at_x(&Scalar::from(indices[i]), &samples)?;
-        if share != &interpolated {
-            return Err(DkgError::MismatchedVerificationKey);
-        }
-    }
-
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::bte::{decrypt_share, keygen, setup};
-    use crate::combine_shares;
-    use rand_core::SeedableRng;
-
-    #[test]
-    fn recovering_partial_verification_keys() {
-        // START OF SETUP
-        let dummy_seed = [42u8; 32];
-        let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-        let params = setup();
-
-        let threshold = 2;
-        let node_indices = vec![1, 4, 7];
-
-        let mut receivers = BTreeMap::new();
-        let mut full_keys = Vec::new();
-        for index in &node_indices {
-            let (dk, pk) = keygen(&params, &mut rng);
-            receivers.insert(*index, *pk.public_key());
-            full_keys.push((dk, pk))
-        }
-
-        // start off in a defined epoch (i.e. not root);
-        let epoch = Epoch::new(2);
-
-        let dealings = node_indices
-            .iter()
-            .map(|&dealer_index| {
-                Dealing::create(
-                    &mut rng,
-                    &params,
-                    dealer_index,
-                    threshold,
-                    epoch,
-                    &receivers,
-                    None,
-                )
-                .0
-            })
-            .collect::<Vec<_>>();
-
-        let mut derived_secrets = Vec::new();
-        for (i, (ref mut dk, _)) in full_keys.iter_mut().enumerate() {
-            dk.try_update_to(epoch, &params, &mut rng).unwrap();
-
-            let shares = dealings
-                .iter()
-                .map(|dealing| decrypt_share(dk, i, &dealing.ciphertexts, epoch, None).unwrap())
-                .collect();
-            derived_secrets.push(
-                combine_shares(shares, &receivers.keys().copied().collect::<Vec<_>>()).unwrap(),
-            )
-        }
-
-        let master_secret = perform_lagrangian_interpolation_at_origin(&[
-            (Scalar::from(node_indices[2]), derived_secrets[2]),
-            (Scalar::from(node_indices[1]), derived_secrets[1]),
-        ])
-        .unwrap();
-
-        // END OF SETUP
-        let (recovered_master, recovered_partials) =
-            try_recover_verification_keys(&dealings, threshold, &receivers).unwrap();
-
-        let g2 = G2Projective::generator();
-        assert_eq!(g2 * master_secret, recovered_master);
-
-        assert_eq!(g2 * derived_secrets[0], recovered_partials[0]);
-        assert_eq!(g2 * derived_secrets[1], recovered_partials[1]);
-        assert_eq!(g2 * derived_secrets[2], recovered_partials[2]);
-    }
-
-    #[test]
-    fn verifying_partial_verification_keys() {
-        let dummy_seed = [42u8; 32];
-        let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-        let params = setup();
-
-        let threshold = 2;
-        let node_indices = vec![1, 4, 7];
-
-        let mut receivers = BTreeMap::new();
-        let mut full_keys = Vec::new();
-        for index in &node_indices {
-            let (dk, pk) = keygen(&params, &mut rng);
-            receivers.insert(*index, *pk.public_key());
-            full_keys.push((dk, pk))
-        }
-
-        // start off in a defined epoch (i.e. not root);
-        let epoch = Epoch::new(2);
-
-        let dealings = node_indices
-            .iter()
-            .map(|&dealer_index| {
-                Dealing::create(
-                    &mut rng,
-                    &params,
-                    dealer_index,
-                    threshold,
-                    epoch,
-                    &receivers,
-                    None,
-                )
-                .0
-            })
-            .collect::<Vec<_>>();
-
-        let (recovered_master, recovered_partials) =
-            try_recover_verification_keys(&dealings, threshold, &receivers).unwrap();
-
-        assert!(verify_verification_keys(
-            &recovered_master,
-            &recovered_partials,
-            &receivers,
-            threshold
-        )
-        .is_ok())
-    }
-
-    #[test]
-    fn dealing_roundtrip() {
-        let dummy_seed = [1u8; 32];
-        let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
-        let params = setup();
-
-        let parties = 5;
-        let threshold = ((parties as f32 * 2.) / 3. + 1.) as Threshold;
-        let node_indices = (1..=parties).collect::<Vec<_>>();
-        let epoch = Epoch::new(2);
-
-        let mut receivers = BTreeMap::new();
-        for index in &node_indices {
-            let (_, pk) = keygen(&params, &mut rng);
-            receivers.insert(*index, *pk.public_key());
-        }
-
-        let (dealing, _) = Dealing::create(
-            &mut rng,
-            &params,
-            node_indices[0],
-            threshold,
-            epoch,
-            &receivers,
-            None,
-        );
-
-        let bytes = dealing.to_bytes();
-        let recovered = Dealing::try_from_bytes(&bytes).unwrap();
-        assert_eq!(dealing, recovered);
-    }
-}
@@ -1,114 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use thiserror::Error;
-
-#[derive(Debug, Error)]
-pub enum DkgError {
-    #[error("Provided set of values contained duplicate coordinate")]
-    DuplicateCoordinate,
-
-    #[error("The public key is malformed")]
-    MalformedPublicKey,
-
-    #[error("The decryption key is malformed")]
-    MalformedDecryptionKey,
-
-    #[error("Could not solve the discrete log")]
-    UnsolvableDiscreteLog,
-
-    #[error("Received share is malformed")]
-    MalformedShare,
-
-    #[error("The share encrypted under index {0} doesn't exist")]
-    UnavailableCiphertext(usize),
-
-    #[error("The provided lookup table is mismatched")]
-    MismatchedLookupTable,
-
-    #[error("Failed to verify proof of discrete logarithm")]
-    InvalidProofOfDiscreteLog,
-
-    #[error("Tried to construct proof of sharing with an invalid instance")]
-    MalformedProofOfSharingInstance,
-
-    #[error("Tried to construct proof of chunking with an invalid instance")]
-    MalformedProofOfChunkingInstance,
-
-    #[error("Aborted construction of proof of chunking - could not complete it within specified number of attempts")]
-    AbortedProofOfChunking,
-
-    #[error("Tried to update the decryption key to an epoch in the past")]
-    TargetEpochUpdateInThePast,
-
-    #[error("Provided epoch is malformed")]
-    MalformedEpoch,
-
-    #[error("Provided node is not a valid parent")]
-    NotAValidParent,
-
-    #[error("Provided decryption key has expired")]
-    ExpiredKey,
-
-    #[error("Provided threshold value ({actual}) is either 0 or larger than the total number of the participating parties ({participating})")]
-    InvalidThreshold { actual: usize, participating: usize },
-
-    #[error(
-    "Provided ciphertext has been generated for a different number of participating parties (expected: {expected}, actual: {actual})"
-    )]
-    WrongCiphertextSize { actual: usize, expected: usize },
-
-    #[error(
-    "Provided public coefficients have been generated for a different number of participating parties (expected: {expected}, actual: {actual})"
-    )]
-    WrongPublicCoefficientsSize { actual: usize, expected: usize },
-
-    #[error("The provided ciphertexts failed integrity check")]
-    FailedCiphertextIntegrityCheck,
-
-    #[error("The provided proof of secret sharing was invalid")]
-    InvalidProofOfSharing,
-
-    #[error("The provided proof of chunking was invalid")]
-    InvalidProofOfChunking,
-
-    #[error("Failed to deserialize {name} - {reason}")]
-    DeserializationFailure { name: String, reason: String },
-
-    #[error("No dealings were provided")]
-    NoDealingsAvailable,
-
-    #[error("Provided dealings were created under different parameters")]
-    MismatchedDealings,
-
-    #[error(
-        "Not enough dealings are available. We have {available} while require at least {required}"
-    )]
-    NotEnoughDealingsAvailable { available: usize, required: usize },
-
-    #[error("Received different number of x and y coordinates for lagrangian interpolation (xs: {x}, ys: {y})")]
-    MismatchedLagrangianSamplesLengths { x: usize, y: usize },
-
-    #[error("Derived partial verification key is mismatched")]
-    MismatchedVerificationKey,
-
-    #[error("Insufficient number of receivers was provided")]
-    NotEnoughReceiversProvided,
-
-    #[error(
-        "The reshared dealing has different public constant coefficient than its prior variant"
-    )]
-    InvalidResharing,
-}
-
-impl DkgError {
-    pub fn new_deserialization_failure<S: Into<String>, T: Into<String>>(
-        name: S,
-        reason: T,
-    ) -> DkgError {
-        DkgError::DeserializationFailure {
-            name: name.into(),
-            reason: reason.into(),
-        }
-    }
-}
--- a/Show More
+++ b/Show More