Merge branch 'release/v1.1.2'

docs: updated changelog for contracts release v1.1.2 and updated versions of mixnet and vesting contracts as well
changed ubuntu-latest on GH actions to ubuntu-20.04
2022-12-07 12:37:14 +01:00 · 2022-12-07 12:36:24 +01:00 · 2022-12-06 17:23:08 +01:00 · 2022-12-06 13:58:59 +00:00 · 2022-12-06 14:42:12 +01:00 · 2022-12-06 14:08:33 +01:00
182 changed files with 5935 additions and 2725 deletions
@@ -5,7 +5,7 @@ on:
    - cron: '5 9 * * *'
 jobs:
  cargo-deny:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
    steps:
      - name: Checkout repository code
        uses: actions/checkout@v2
@@ -26,7 +26,7 @@ jobs:
          path: .github/workflows/support-files/notifications/deny.message
  notification:
    needs: cargo-deny
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
    steps:
      - name: Check out repository code
        uses: actions/checkout@v2
@@ -1,6 +1,6 @@
 [
  {
-    "os":"ubuntu-latest",
+    "os":"ubuntu-20.04",
    "rust":"stable",
    "runOnEvent":"always"
  },
@@ -6,7 +6,7 @@ on:

 jobs:
  build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
    steps:
      - uses: actions/checkout@v2
      
@@ -10,7 +10,7 @@ on:

 jobs:
  matrix_prep:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
    outputs:
      matrix: ${{ steps.set-matrix.outputs.matrix }}
    steps:
@@ -24,7 +24,7 @@ jobs:
  contracts:
    # since it's going to be compiled into wasm, there's absolutely
    # no point in running CI on different OS-es
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
    continue-on-error: ${{ matrix.rust == 'nightly' }}
    needs: matrix_prep
    strategy:
@@ -13,7 +13,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        platform: [ubuntu-latest]
+        platform: [ubuntu-20.04]

    runs-on: ${{ matrix.platform }}
    steps:
@@ -5,7 +5,7 @@ on:
    - cron: '14 1 * * *'
 jobs:
  matrix_prep:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
    outputs:
      matrix: ${{ steps.set-matrix.outputs.matrix }}
    steps:
@@ -25,7 +25,7 @@ jobs:
    steps:
      - name: Install Dependencies (Linux)
        run: sudo apt-get update && sudo apt-get install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools
-        if: matrix.os == 'ubuntu-latest'
+        if: matrix.os == 'ubuntu-20.04'

      - name: Check out repository code
        uses: actions/checkout@v2
@@ -96,7 +96,7 @@ jobs:

      - name: Reclaim some disk space
        uses: actions-rs/cargo@v1
-        if: ${{ matrix.os == 'windows-latest' || matrix.os == 'ubuntu-latest' }}
+        if: ${{ matrix.os == 'windows-latest' || matrix.os == 'ubuntu-20.04' }}
        with:
          command: clean

@@ -160,7 +160,7 @@ jobs:

  notification:
    needs: build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
    steps:
      - name: Collect jobs status
        uses: technote-space/workflow-conclusion-action@v2
@@ -1,6 +1,6 @@
 [
  {
-    "os":"ubuntu-latest",
+    "os":"ubuntu-20.04",
    "rust":"stable",
    "runOnEvent":"schedule"
  },
@@ -17,7 +17,7 @@
  },

  {
-    "os":"ubuntu-latest",
+    "os":"ubuntu-20.04",
    "rust":"beta",
    "runOnEvent":"schedule"
  },
@@ -33,7 +33,7 @@
  },

  {
-    "os":"ubuntu-latest",
+    "os":"ubuntu-20.04",
    "rust":"nightly",
    "runOnEvent":"schedule"
  },
@@ -5,19 +5,19 @@ on:
    - cron: '14 2 * * *'
 jobs:
  matrix_prep:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
    outputs:
      matrix: ${{ steps.set-matrix.outputs.matrix }}
    steps:
-      # creates the matrix strategy from nightly_build_release_matrix.json
+      # creates the matrix strategy from nightly_build_matrix_includes.json
      - uses: actions/checkout@v3
      - id: set-matrix
        uses: JoshuaTheMiller/conditional-build-matrix@main
        with:
-          inputFile: '.github/workflows/nightly_build_release_matrix.json'
+          inputFile: '.github/workflows/nightly_build_matrix_includes.json'
          filter: '[?runOnEvent==`${{ github.event_name }}` || runOnEvent==`always`]'
  get_release:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
    needs: matrix_prep
    outputs:
      output1: ${{ steps.step2.outputs.latest_release }}
@@ -38,7 +38,7 @@ jobs:
    steps:
      - name: Install Dependencies (Linux)
        run: sudo apt-get update && sudo apt-get install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools
-        if: matrix.os == 'ubuntu-latest'
+        if: matrix.os == 'ubuntu-20.04'

      - name: Check out latest release branch
        uses: actions/checkout@v3
@@ -111,7 +111,7 @@ jobs:

      - name: Reclaim some disk space
        uses: actions-rs/cargo@v1
-        if: ${{ matrix.os == 'windows-latest' || matrix.os == 'ubuntu-latest' }}
+        if: ${{ matrix.os == 'windows-latest' || matrix.os == 'ubuntu-20.04' }}
        with:
          command: clean

@@ -174,8 +174,8 @@ jobs:
          args: --manifest-path nym-wallet/Cargo.toml --workspace --all-targets -- -D warnings

  notification:
-    needs: build
-    runs-on: ubuntu-latest
+    needs: [build,get_release]
+    runs-on: ubuntu-20.04
    steps:
      - name: Collect jobs status
        uses: technote-space/workflow-conclusion-action@v2
@@ -192,7 +192,7 @@ jobs:
          NYM_PROJECT_NAME: "Nym nightly build on latest release"
          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
          GIT_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
-          GIT_BRANCH: "${GITHUB_REF##*/}"
+          GIT_BRANCH: "https://github.com/nymtech/nym/tree/${{needs.get_release.outputs.output1}}"
          KEYBASE_NYMBOT_USERNAME: "${{ secrets.KEYBASE_NYMBOT_USERNAME }}"
          KEYBASE_NYMBOT_PAPERKEY: "${{ secrets.KEYBASE_NYMBOT_PAPERKEY }}"
          KEYBASE_NYMBOT_TEAM: "${{ secrets.KEYBASE_NYMBOT_TEAM }}"
@@ -0,0 +1,203 @@
+name: Nightly builds on second latest release
+
+on:
+  schedule:
+    - cron: '24 2 * * *'
+jobs:
+  matrix_prep:
+    runs-on: ubuntu-20.04
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+    steps:
+      # creates the matrix strategy from nightly_build_matrix_includes.json
+      - uses: actions/checkout@v3
+      - id: set-matrix
+        uses: JoshuaTheMiller/conditional-build-matrix@main
+        with:
+          inputFile: '.github/workflows/nightly_build_matrix_includes.json'
+          filter: '[?runOnEvent==`${{ github.event_name }}` || runOnEvent==`always`]'
+  get_release:
+    runs-on: ubuntu-20.04
+    needs: matrix_prep
+    outputs:
+      output1: ${{ steps.step2.outputs.latest_release }}
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v3
+      - name: Fetch all branches
+        run: git fetch --all
+      - name: Set output variable to latest release branch
+        id: step2
+        run: echo "latest_release=$(git branch -r | grep -E 'release/v[0-9]+\.[0-9]+\.[0-9]+' | tail -n 2 | head -n 1 | sed 's/  origin\///')" >> $GITHUB_OUTPUT
+  build:
+    needs: [get_release,matrix_prep]
+    strategy:
+      matrix: ${{fromJson(needs.matrix_prep.outputs.matrix)}}
+    runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.rust == 'nightly' || matrix.rust == 'beta' || matrix.rust == 'stable' }}
+    steps:
+      - name: Install Dependencies (Linux)
+        run: sudo apt-get update && sudo apt-get install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools
+        if: matrix.os == 'ubuntu-20.04'
+
+      - name: Check out latest release branch
+        uses: actions/checkout@v3
+        with:
+          ref: ${{needs.get_release.outputs.output1}}
+
+      - name: Install rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: ${{ matrix.rust }}
+          override: true
+          components: rustfmt, clippy
+
+      - name: Build all binaries
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: --workspace
+
+      - 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 all tests
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --workspace
+
+      - 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 expensive tests
+        if: github.ref == 'refs/heads/develop' || github.event.pull_request.base.ref == 'develop' || github.event.pull_request.base.ref == 'master'
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --workspace --all-features -- --ignored
+
+      - name: Check formatting
+        uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --all -- --check
+
+      - name: Reclaim some disk space (because Windows is being annoying)
+        uses: actions-rs/cargo@v1
+        if: ${{ matrix.os == 'windows-latest' }}
+        with:
+          command: clean
+
+      - uses: actions-rs/clippy-check@v1
+        name: Clippy checks
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          args: --all-features
+
+      - name: Run clippy
+        uses: actions-rs/cargo@v1
+        if: ${{ matrix.rust != 'nightly' }}
+        with:
+          command: clippy
+          args: --workspace --all-targets -- -D warnings
+
+      - name: Reclaim some disk space
+        uses: actions-rs/cargo@v1
+        if: ${{ matrix.os == 'windows-latest' || matrix.os == 'ubuntu-20.04' }}
+        with:
+          command: clean
+
+      # COCONUT stuff
+      - name: Build all binaries with coconut enabled
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+          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 all tests with coconut enabled
+        uses: actions-rs/cargo@v1
+        with:
+          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' }}
+        with:
+          command: clippy
+          args: --workspace --all-targets --features=coconut -- -D warnings
+
+      # nym-wallet (the rust part)
+      - name: Build nym-wallet rust code
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: --manifest-path nym-wallet/Cargo.toml --workspace
+
+      - name: Run nym-wallet tests
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --manifest-path nym-wallet/Cargo.toml --workspace
+
+      - name: Check nym-wallet formatting
+        uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --manifest-path nym-wallet/Cargo.toml --all -- --check
+
+      - name: Run clippy for nym-wallet
+        uses: actions-rs/cargo@v1
+        if: ${{ matrix.rust != 'nightly' }}
+        with:
+          command: clippy
+          args: --manifest-path nym-wallet/Cargo.toml --workspace --all-targets -- -D warnings
+
+  notification:
+    needs: [build,get_release]
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Collect jobs status
+        uses: technote-space/workflow-conclusion-action@v2
+      - name: Check out repository code
+        uses: actions/checkout@v3
+      - name: Keybase - Node Install
+        if: env.WORKFLOW_CONCLUSION == 'failure'
+        run: npm install
+        working-directory: .github/workflows/support-files
+      - name: Keybase - Send Notification
+        if: env.WORKFLOW_CONCLUSION == 'failure'
+        env:
+          NYM_NOTIFICATION_KIND: nightly
+          NYM_PROJECT_NAME: "Nym nightly build on latest release"
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          GIT_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
+          GIT_BRANCH: "https://github.com/nymtech/nym/tree/${{needs.get_release.outputs.output1}}"
+          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-nightly-release"
+          IS_SUCCESS: "${{ env.WORKFLOW_CONCLUSION == 'success' }}"
+        uses: docker://keybaseio/client:stable-node
+        with:
+          args: .github/workflows/support-files/notifications/entry_point.sh
@@ -1,50 +0,0 @@
-[
-  {
-    "os":"ubuntu-latest",
-    "rust":"stable",
-    "runOnEvent":"workflow_dispatch"
-  },
-
-  {
-    "os":"windows-latest",
-    "rust":"stable",
-    "runOnEvent":"workflow_dispatch"
-  },
-  {
-    "os":"macos-latest",
-    "rust":"stable",
-    "runOnEvent":"workflow_dispatch"
-  },
-
-  {
-    "os":"ubuntu-latest",
-    "rust":"beta",
-    "runOnEvent":"workflow_dispatch"
-  },
-  {
-    "os":"windows-latest",
-    "rust":"beta",
-    "runOnEvent":"workflow_dispatch"
-  },
-  {
-    "os":"macos-latest",
-    "rust":"beta",
-    "runOnEvent":"workflow_dispatch"
-  },
-
-  {
-    "os":"ubuntu-latest",
-    "rust":"nightly",
-    "runOnEvent":"workflow_dispatch"
-  },
-  {
-    "os":"windows-latest",
-    "rust":"nightly",
-    "runOnEvent":"workflow_dispatch"
-  },
-  {
-    "os":"macos-latest",
-    "rust":"nightly",
-    "runOnEvent":"workflow_dispatch"
-  }
-]
@@ -13,7 +13,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        platform: [ubuntu-latest, windows-latest, macos-latest]
+        platform: [ubuntu-20.04, windows-latest, macos-latest]

    runs-on: ${{ matrix.platform }}
    steps:
@@ -13,7 +13,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        platform: [ubuntu-latest]
+        platform: [ubuntu-20.04]

    runs-on: ${{ matrix.platform }}
    steps:
@@ -19,7 +19,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        platform: [ubuntu-latest]
+        platform: [ubuntu-20.04]

    runs-on: ${{ matrix.platform }}
    steps:
@@ -12,7 +12,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        platform: [ubuntu-latest]
+        platform: [ubuntu-20.04]

    runs-on: ${{ matrix.platform }}
    steps:
@@ -12,7 +12,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        platform: [ubuntu-latest]
+        platform: [ubuntu-20.04]
    runs-on: ${{ matrix.platform }}
    steps:
      - uses: actions/checkout@v2
@@ -12,7 +12,7 @@ defaults:
 jobs:
  test:
    name: wallet tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
    steps:
      - uses: actions/checkout@v2

@@ -85,7 +85,7 @@ async function getMessageBody(context) {
            ...
          ],
          check_run_url: 'https://api.github.com/repos/nymtech/nym/check-runs/5182940024',
-          labels: [ 'ubuntu-latest' ],
+          labels: [ 'ubuntu-20.04' ],
          runner_id: 1,
          runner_name: 'Hosted Agent',
          runner_group_id: 2,
@@ -7,7 +7,7 @@ on:

 jobs:
  wasm:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
    steps:
      - uses: actions/checkout@v2

@@ -2,6 +2,14 @@

 Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

+## [v1.1.2]
+
+### Changed
+
+- gateway: Renamed flag from `enabled/disabled_credentials_mode` to `only-coconut-credentials`
+- "Family" feature for node families + layers
+- Initial coconut functionality including credentials and distributed key generation 
+
 ## [v1.1.1](https://github.com/nymtech/nym/tree/v1.1.1) (2022-11-29)

 ### Added
@@ -17,6 +25,11 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 - clients,validator-api: take coconut signers from the chain instead of specifying them via CLI ([#1747])
 - multisig contract: add DKG contract to the list of addresses that can create proposals ([#1747])
 - socks5-client: wait closing inbound connection until data is sent, and throttle incoming data in general ([#1783])
+- nym-cli: improve error reporting/handling and changed `vesting-schedule` queries to use query client instead of signing client
+
+### Fixed
+
+- gateway-client: fix decrypting stored messages on reconnect ([#1786])

 ### Fixed

@@ -923,7 +923,6 @@ dependencies = [
 name = "credential"
 version = "0.1.0"
 dependencies = [
- "async-trait",
 "bip39",
 "cfg-if 0.1.10",
 "clap 3.2.8",
@@ -935,7 +934,6 @@ dependencies = [
 "crypto",
 "network-defaults",
 "pemstore",
- "pickledb",
 "rand 0.7.3",
 "serde",
 "thiserror",
@@ -2745,12 +2743,6 @@ dependencies = [
 "vcpkg",
 ]

-[[package]]
-name = "linked-hash-map"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
-
 [[package]]
 name = "lioness"
 version = "0.1.2"
@@ -3139,6 +3131,7 @@ dependencies = [
 "pretty_env_logger",
 "serde",
 "serde_json",
+ "tap",
 "tokio",
 "validator-client",
 ]
@@ -3164,6 +3157,7 @@ dependencies = [
 "rand 0.6.5",
 "serde",
 "serde_json",
+ "tap",
 "thiserror",
 "time 0.3.14",
 "toml",
@@ -3932,19 +3926,6 @@ dependencies = [
 "indexmap",
 ]

-[[package]]
-name = "pickledb"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9161694d67f6c5163519d42be942ae36bbdb55f439460144f105bc4f9f7d1d61"
-dependencies = [
- "bincode",
- "serde",
- "serde_cbor",
- "serde_json",
- "serde_yaml",
-]
-
 [[package]]
 name = "pin-project"
 version = "1.0.10"
@@ -5055,18 +5036,6 @@ dependencies = [
 "serde",
 ]

-[[package]]
-name = "serde_yaml"
-version = "0.8.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a521f2940385c165a24ee286aa8599633d162077a54bdcae2a6fd5a7bfa7a0"
-dependencies = [
- "indexmap",
- "ryu",
- "serde",
- "yaml-rust",
-]
-
 [[package]]
 name = "sha-1"
 version = "0.8.2"
@@ -6936,15 +6905,6 @@ dependencies = [
 "zeroize",
 ]

-[[package]]
-name = "yaml-rust"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
-dependencies = [
- "linked-hash-map",
-]
-
 [[package]]
 name = "yansi"
 version = "0.5.1"
@@ -1,6 +1,6 @@
 [package]
 name = "client-core"
-version = "1.1.1"
+version = "1.1.2"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 edition = "2021"

@@ -186,13 +186,10 @@ impl TopologyRefresher {
    /// # Arguments
    ///
    /// * `topology`: active topology constructed from validator api data
-    /// * `mixnodes_count`: total number of active mixnodes
-    fn check_layer_distribution(
-        &self,
-        active_topology: &NymTopology,
-        mixnodes_count: usize,
-    ) -> bool {
+    fn check_layer_distribution(&self, active_topology: &NymTopology) -> bool {
        let mixes = active_topology.mixes();
+        let mixnodes_count = active_topology.num_mixnodes();
+
        if active_topology.gateways().is_empty() {
            return false;
        }
@@ -257,11 +254,10 @@ impl TopologyRefresher {
            Ok(gateways) => gateways,
        };

-        let mixnodes_count = mixnodes.len();
        let topology = nym_topology_from_detailed(mixnodes, gateways)
            .filter_system_version(&self.client_version);

-        if !self.check_layer_distribution(&topology, mixnodes_count) {
+        if !self.check_layer_distribution(&topology) {
            warn!("The current filtered active topology has extremely skewed layer distribution. It cannot be used.");
            None
        } else {
@@ -1,7 +1,7 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use config::NymConfig;
+use config::{NymConfig, DB_FILE_NAME};
 use nymsphinx::params::PacketSize;
 use serde::{Deserialize, Serialize};
 use std::marker::PhantomData;
@@ -412,7 +412,7 @@ impl<T: NymConfig> Client<T> {
        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")
+        T::default_data_directory(Some(id)).join(DB_FILE_NAME)
    }
 }

@@ -6,11 +6,9 @@ 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.2", features = ["cargo", "derive"] }
-pickledb = "0.4.1"
 rand = "0.7.3"
 serde = { version = "1.0", features = ["derive"] }
 thiserror = "1.0"
@@ -1,14 +1,12 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use async_trait::async_trait;
 use clap::{Args, Subcommand};
 use completions::ArgShell;
-use pickledb::PickleDb;
 use rand::rngs::OsRng;
 use std::str::FromStr;

-use coconut_interface::{Attribute, Base58, BlindSignRequest, Bytable, Parameters};
+use coconut_interface::{Base58, Parameters};
 use credential_storage::storage::Storage;
 use credential_storage::PersistentStorage;
 use credentials::coconut::bandwidth::{BandwidthVoucher, TOTAL_ATTRIBUTES};
@@ -20,16 +18,12 @@ use validator_client::{CoconutApiClient, Config};

 use crate::client::Client;
 use crate::error::{CredentialClientError, Result};
-use crate::state::{KeyPair, RequestData, State};
+use crate::state::{KeyPair, State};

 #[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),
+pub(crate) enum Command {
+    /// Run the binary
+    Run(Run),

    /// Generate shell completions
    Completions(ArgShell),
@@ -38,169 +32,81 @@ pub(crate) enum Commands {
    GenerateFigSpec,
 }

-#[async_trait]
-pub(crate) trait Execute {
-    async fn execute(&self, db: &mut PickleDb, shared_storage: PersistentStorage) -> Result<()>;
-}
+#[derive(Args)]
+pub(crate) struct Run {
+    /// Home directory of the client that is supposed to use the credential.
+    #[clap(long)]
+    pub(crate) client_home_directory: std::path::PathBuf,

-#[derive(Args, Clone)]
-pub(crate) struct Deposit {
    /// The nymd URL that should be used
    #[clap(long)]
-    nymd_url: String,
-    /// A mnemonic for the account that does the deposit
+    pub(crate) nymd_url: String,
+
+    /// A mnemonic for the account that buys the credential
    #[clap(long)]
-    mnemonic: String,
-    /// The amount that needs to be deposited
+    pub(crate) mnemonic: String,
+
+    /// The amount of utokens the credential will hold
    #[clap(long)]
-    amount: u64,
+    pub(crate) 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));
+pub(crate) async fn deposit(nymd_url: &str, mnemonic: &str, amount: u64) -> Result<State> {
+    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(&self.nymd_url, &self.mnemonic);
-        let tx_hash = client
-            .deposit(
-                self.amount,
-                signing_keypair.public_key.clone(),
-                encryption_keypair.public_key.clone(),
-                None,
-            )
-            .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,
-    /// The nymd URL that should be used
-    #[clap(long)]
-    nymd_url: 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 network_details = NymNetworkDetails::new_from_env();
-        let config = Config::try_from_nym_network_details(&network_details)?;
-        let client = validator_client::Client::new_query(config)?;
-        let coconut_api_clients = CoconutApiClient::all_coconut_api_clients(&client).await?;
-
-        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,
-            &coconut_api_clients,
+    let client = Client::new(nymd_url, mnemonic);
+    let tx_hash = client
+        .deposit(
+            amount,
+            signing_keypair.public_key.clone(),
+            encryption_keypair.public_key.clone(),
+            None,
        )
        .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);
+    let state = State {
+        amount,
+        tx_hash,
+        signing_keypair,
+        encryption_keypair,
+    };

-        Ok(())
-    }
+    Ok(state)
+}
+
+pub(crate) async fn get_credential(state: &State, shared_storage: PersistentStorage) -> Result<()> {
+    let network_details = NymNetworkDetails::new_from_env();
+    let config = Config::try_from_nym_network_details(&network_details)?;
+    let client = validator_client::Client::new_query(config)?;
+    let coconut_api_clients = CoconutApiClient::all_coconut_api_clients(&client).await?;
+
+    let params = Parameters::new(TOTAL_ATTRIBUTES).unwrap();
+    let bandwidth_credential_attributes = BandwidthVoucher::new(
+        &params,
+        state.amount.to_string(),
+        VOUCHER_INFO.to_string(),
+        Hash::from_str(&state.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)?,
+    );
+
+    let signature = obtain_aggregate_signature(
+        &params,
+        &bandwidth_credential_attributes,
+        &coconut_api_clients,
+    )
+    .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?;
+
+    Ok(())
 }
@@ -23,18 +23,6 @@ pub enum CredentialClientError {
    #[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,

@@ -9,14 +9,13 @@ cfg_if::cfg_if! {
        mod error;
        mod state;

-        use commands::{Commands, Execute};
        use error::Result;
        use network_defaults::setup_env;
-        use clap::CommandFactory;
        use completions::fig_generate;
+        use commands::*;
+        use config::{DATA_DIR, DB_FILE_NAME};

-        use clap::Parser;
-        use pickledb::{PickleDb, PickleDbDumpPolicy, SerializationMethod};
+        use clap::{CommandFactory, Parser};

        #[derive(Parser)]
        #[clap(author = "Nymtech", version, about)]
@@ -25,43 +24,26 @@ cfg_if::cfg_if! {
            #[clap(short, long)]
            pub(crate) config_env_file: Option<std::path::PathBuf>,

-            /// Path where the sqlite credental database will be located.
-            /// It should point to a $HOME/$CLIENT_ID/data/db.sqlite file of
-            /// the client that is supposed to use the credential.
-            #[clap(long)]
-            pub(crate) credential_db_path: std::path::PathBuf,
-
            #[clap(subcommand)]
-            command: Commands,
+            pub(crate) command: Command,
        }

        #[tokio::main]
        async fn main() -> Result<()> {
            let args = Cli::parse();
            setup_env(args.config_env_file.clone());
-
-            let shared_storage = credential_storage::initialise_storage(args.credential_db_path.clone()).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,
-                ),
-            };
-
            let bin_name = "nym-credential-client";

-            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?,
-                Commands::Completions(s) => s.generate(&mut crate::Cli::into_app(), bin_name),
-                Commands::GenerateFigSpec => fig_generate(&mut crate::Cli::into_app(), bin_name)
+            match args.command {
+                Command::Run(r) => {
+                    let db_path = r.client_home_directory.join(DATA_DIR).join(DB_FILE_NAME);
+                    let shared_storage = credential_storage::initialise_storage(db_path).await;
+
+                    let state = deposit(&r.nymd_url, &r.mnemonic, r.amount).await?;
+                    get_credential(&state, shared_storage).await?;
+                }
+                Command::Completions(c) => c.generate(&mut crate::Cli::into_app(), bin_name),
+                Command::GenerateFigSpec => fig_generate(&mut crate::Cli::into_app(), bin_name)
            }

            Ok(())
@@ -1,13 +1,10 @@
 // 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,
@@ -38,35 +35,4 @@ pub(crate) struct State {
    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.1.1"
+version = "1.1.2"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 description = "Implementation of the Nym Client"
 edition = "2021"
@@ -203,8 +203,23 @@ impl NymClient {
        #[cfg(feature = "coconut")]
        let bandwidth_controller = {
            let details = network_defaults::NymNetworkDetails::new_from_env();
-            let client_config = validator_client::Config::try_from_nym_network_details(&details)
-                .expect("failed to construct validator client config");
+            let mut client_config =
+                validator_client::Config::try_from_nym_network_details(&details)
+                    .expect("failed to construct validator client config");
+            let nymd_url = self
+                .config
+                .get_base()
+                .get_validator_endpoints()
+                .pop()
+                .expect("No nymd validator endpoint provided");
+            let api_url = self
+                .config
+                .get_base()
+                .get_validator_api_endpoints()
+                .pop()
+                .expect("No validator api endpoint provided");
+            // overwrite env configuration with config URLs
+            client_config = client_config.with_urls(nymd_url, api_url);
            let client = validator_client::Client::new_query(client_config)
                .expect("Could not construct query client");
            let coconut_api_clients =
@@ -1,6 +1,6 @@
 [package]
 name = "nym-socks5-client"
-version = "1.1.1"
+version = "1.1.2"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 description = "A SOCKS5 localhost proxy that converts incoming messages to Sphinx and sends them to a Nym address"
 edition = "2021"
@@ -201,8 +201,23 @@ impl NymClient {
        #[cfg(feature = "coconut")]
        let bandwidth_controller = {
            let details = network_defaults::NymNetworkDetails::new_from_env();
-            let client_config = validator_client::Config::try_from_nym_network_details(&details)
-                .expect("failed to construct validator client config");
+            let mut client_config =
+                validator_client::Config::try_from_nym_network_details(&details)
+                    .expect("failed to construct validator client config");
+            let nymd_url = self
+                .config
+                .get_base()
+                .get_validator_endpoints()
+                .pop()
+                .expect("No nymd validator endpoint provided");
+            let api_url = self
+                .config
+                .get_base()
+                .get_validator_api_endpoints()
+                .pop()
+                .expect("No validator api endpoint provided");
+            // overwrite env configuration with config URLs
+            client_config = client_config.with_urls(nymd_url, api_url);
            let client = validator_client::Client::new_query(client_config)
                .expect("Could not construct query client");
            let coconut_api_clients =
@@ -168,9 +168,13 @@ impl SocksClient {
        controller_sender: ControllerSender,
        self_address: Recipient,
        lane_queue_lengths: LaneQueueLengths,
-        shutdown_listener: ShutdownListener,
+        mut shutdown_listener: ShutdownListener,
    ) -> Self {
+        // If this task fails and exits, we don't want to send shutdown signal
+        shutdown_listener.mark_as_success();
+
        let connection_id = Self::generate_random();
+
        SocksClient {
            controller_sender,
            connection_id,
@@ -252,10 +256,15 @@ impl SocksClient {
            .await;

        let stream = self.stream.run_proxy();
-        let local_stream_remote = stream
-            .peer_addr()
-            .expect("failed to extract peer address")
-            .to_string();
+        let peer_addr = match stream.peer_addr() {
+            Ok(peer_addr) => peer_addr,
+            Err(err) => {
+                log::error!("Unable to extract the remote peer address: {err}");
+                return;
+            }
+        };
+        let local_stream_remote = peer_addr.to_string();
+
        let connection_id = self.connection_id;
        let input_sender = self.input_sender.clone();

@@ -319,7 +328,6 @@ impl SocksClient {
            SocksCommand::UdpAssociate => unimplemented!(), // not handled
        };

-        self.shutdown_listener.mark_as_success();
        Ok(())
    }

@@ -14,7 +14,7 @@ use futures::{FutureExt, SinkExt, StreamExt};
 use gateway_requests::authentication::encrypted_address::EncryptedAddressBytes;
 use gateway_requests::iv::IV;
 use gateway_requests::registration::handshake::{client_handshake, SharedKeys};
-use gateway_requests::{BinaryRequest, ClientControlRequest, ServerResponse};
+use gateway_requests::{BinaryRequest, ClientControlRequest, ServerResponse, PROTOCOL_VERSION};
 use log::*;
 use network_defaults::{REMAINING_BANDWIDTH_THRESHOLD, TOKENS_TO_BURN};
 use nymsphinx::forwarding::packet::MixPacket;
@@ -447,6 +447,33 @@ impl GatewayClient {
        }
    }

+    fn check_gateway_protocol(
+        &self,
+        gateway_protocol: Option<u8>,
+    ) -> Result<(), GatewayClientError> {
+        // right now there are no failure cases here, but this might change in the future
+        match gateway_protocol {
+            None => {
+                warn!("the gateway we're connected to has not specified its protocol version. It's probably running version < 1.1.X, but that's still fine for now. It will become a hard error in 1.2.0");
+                // note: in 1.2.0 we will have to return a hard error here
+                Ok(())
+            }
+            Some(v) if v != PROTOCOL_VERSION => {
+                let err = GatewayClientError::IncompatibleProtocol {
+                    gateway: Some(v),
+                    current: PROTOCOL_VERSION,
+                };
+                error!("{err}");
+                Err(err)
+            }
+
+            Some(_) => {
+                info!("the gateway is using exactly the same protocol version as we are. We're good to continue!");
+                Ok(())
+            }
+        }
+    }
+
    async fn register(&mut self) -> Result<(), GatewayClientError> {
        if !self.connection.is_established() {
            return Err(GatewayClientError::ConnectionNotEstablished);
@@ -469,11 +496,20 @@ impl GatewayClient {
            .map_err(GatewayClientError::RegistrationFailure),
            _ => unreachable!(),
        }?;
-        self.authenticated = match self.read_control_response().await? {
-            ServerResponse::Register { status } => Ok(status),
-            ServerResponse::Error { message } => Err(GatewayClientError::GatewayError(message)),
-            _ => Err(GatewayClientError::UnexpectedResponse),
-        }?;
+        let (authentication_status, gateway_protocol) = match self.read_control_response().await? {
+            ServerResponse::Register {
+                protocol_version,
+                status,
+            } => (status, protocol_version),
+            ServerResponse::Error { message } => {
+                return Err(GatewayClientError::GatewayError(message))
+            }
+            _ => return Err(GatewayClientError::UnexpectedResponse),
+        };
+
+        self.check_gateway_protocol(gateway_protocol)?;
+        self.authenticated = authentication_status;
+
        if self.authenticated {
            self.shared_key = Some(Arc::new(shared_key));
        }
@@ -512,9 +548,11 @@ impl GatewayClient {

        match self.send_websocket_message(msg).await? {
            ServerResponse::Authenticate {
+                protocol_version,
                status,
                bandwidth_remaining,
            } => {
+                self.check_gateway_protocol(protocol_version)?;
                self.authenticated = status;
                self.bandwidth_remaining = bandwidth_remaining;
                Ok(())
@@ -85,6 +85,9 @@ pub enum GatewayClientError {

    #[error("Failed to send mixnet message")]
    MixnetMsgSenderFailedToSend,
+
+    #[error("Attempted to negotiate connection with gateway using incompatible protocol version. Ours is {current} and the gateway reports {gateway:?}")]
+    IncompatibleProtocol { gateway: Option<u8>, current: u8 },
 }

 impl GatewayClientError {
@@ -1,6 +1,5 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
-
 use crate::{validator_api, ValidatorClientError};
 use coconut_dkg_common::types::NodeIndex;
 #[cfg(feature = "nymd-client")]
@@ -10,9 +9,10 @@ use coconut_dkg_common::{
 #[cfg(feature = "nymd-client")]
 use coconut_interface::Base58;
 use coconut_interface::VerificationKey;
+use mixnet_contract_common::families::{Family, FamilyHead};
 use mixnet_contract_common::mixnode::MixNodeDetails;
-use mixnet_contract_common::MixId;
 use mixnet_contract_common::{GatewayBond, IdentityKeyRef};
+use mixnet_contract_common::{IdentityKey, MixId};
 #[cfg(feature = "nymd-client")]
 use std::str::FromStr;
 use validator_api_requests::coconut::{
@@ -220,6 +220,7 @@ impl Client<QueryNymdClient> {
 impl<C> Client<C> {
    // use case: somebody initialised client without a contract in order to upload and initialise one
    // and now they want to actually use it without making new client
+
    pub fn set_mixnet_contract_address(&mut self, mixnet_contract_address: cosmrs::AccountId) {
        self.nymd
            .set_mixnet_contract_address(mixnet_contract_address)
@@ -229,6 +230,56 @@ impl<C> Client<C> {
        self.nymd.mixnet_contract_address().clone()
    }

+    pub async fn get_all_node_families(&self) -> Result<Vec<Family>, ValidatorClientError>
+    where
+        C: CosmWasmClient + Sync + Send,
+    {
+        let mut families = Vec::new();
+        let mut start_after = None;
+
+        loop {
+            let paged_response = self
+                .nymd
+                .get_all_node_families_paged(start_after.take(), None)
+                .await?;
+            families.extend(paged_response.families);
+
+            if let Some(start_after_res) = paged_response.start_next_after {
+                start_after = Some(start_after_res)
+            } else {
+                break;
+            }
+        }
+
+        Ok(families)
+    }
+
+    pub async fn get_all_family_members(
+        &self,
+    ) -> Result<Vec<(IdentityKey, FamilyHead)>, ValidatorClientError>
+    where
+        C: CosmWasmClient + Sync + Send,
+    {
+        let mut members = Vec::new();
+        let mut start_after = None;
+
+        loop {
+            let paged_response = self
+                .nymd
+                .get_all_family_members_paged(start_after.take(), None)
+                .await?;
+            members.extend(paged_response.members);
+
+            if let Some(start_after_res) = paged_response.start_next_after {
+                start_after = Some(start_after_res)
+            } else {
+                break;
+            }
+        }
+
+        Ok(members)
+    }
+
    // basically handles paging for us
    pub async fn get_all_nymd_rewarded_set_mixnodes(
        &self,
@@ -15,12 +15,12 @@ pub use coconut_dkg_common::event_attributes::*;
 pub struct Log {
    #[serde(default)]
    // weird thing is that the first msg_index seems to always be undefined on the raw logs
-    msg_index: usize,
+    pub msg_index: usize,
    // unless I'm missing something obvious, the "log" type in cosmjs is always an empty string
    // and launchpad cosmos validator was setting it to what essentially is just the raw version of what
    // we received (and we don't care about launchpad, we, as the time of writing this, work on the stargate)
    // log: String,
-    events: Vec<cosmwasm_std::Event>,
+    pub events: Vec<cosmwasm_std::Event>,
 }

 /// Searches in logs for the first event of the given event type and in that event
@@ -7,6 +7,7 @@ use crate::nymd::NymdClient;
 use async_trait::async_trait;
 use cosmrs::AccountId;
 use mixnet_contract_common::delegation::{MixNodeDelegationResponse, OwnerProxySubKey};
+use mixnet_contract_common::families::Family;
 use mixnet_contract_common::mixnode::{
    MixNodeDetails, MixnodeRewardingDetailsResponse, PagedMixnodesDetailsResponse,
    PagedUnbondedMixnodesResponse, StakeSaturationResponse, UnbondedMixnodeResponse,
@@ -20,9 +21,9 @@ use mixnet_contract_common::{
    CurrentIntervalResponse, EpochEventId, GatewayBondResponse, GatewayOwnershipResponse,
    IdentityKey, IntervalEventId, LayerDistribution, MixId, MixOwnershipResponse,
    MixnodeDetailsResponse, PagedAllDelegationsResponse, PagedDelegatorDelegationsResponse,
-    PagedGatewayResponse, PagedMixNodeDelegationsResponse, PagedMixnodeBondsResponse,
-    PagedRewardedSetResponse, PendingEpochEventsResponse, PendingIntervalEventsResponse,
-    QueryMsg as MixnetQueryMsg,
+    PagedFamiliesResponse, PagedGatewayResponse, PagedMembersResponse,
+    PagedMixNodeDelegationsResponse, PagedMixnodeBondsResponse, PagedRewardedSetResponse,
+    PendingEpochEventsResponse, PendingIntervalEventsResponse, QueryMsg as MixnetQueryMsg,
 };
 use serde::Deserialize;

@@ -73,6 +74,24 @@ pub trait MixnetQueryClient {
            .await
    }

+    async fn get_all_node_families_paged(
+        &self,
+        start_after: Option<String>,
+        limit: Option<u32>,
+    ) -> Result<PagedFamiliesResponse, NymdError> {
+        self.query_mixnet_contract(MixnetQueryMsg::GetAllFamiliesPaged { limit, start_after })
+            .await
+    }
+
+    async fn get_all_family_members_paged(
+        &self,
+        start_after: Option<String>,
+        limit: Option<u32>,
+    ) -> Result<PagedMembersResponse, NymdError> {
+        self.query_mixnet_contract(MixnetQueryMsg::GetAllMembersPaged { limit, start_after })
+            .await
+    }
+
    // mixnode-related:

    async fn get_mixnode_bonds_paged(
@@ -357,6 +376,20 @@ pub trait MixnetQueryClient {
        })
        .await
    }
+
+    async fn get_node_family_by_label(&self, label: &str) -> Result<Option<Family>, NymdError> {
+        self.query_mixnet_contract(MixnetQueryMsg::GetFamilyByLabel {
+            label: label.to_string(),
+        })
+        .await
+    }
+
+    async fn get_node_family_by_head(&self, head: &str) -> Result<Option<Family>, NymdError> {
+        self.query_mixnet_contract(MixnetQueryMsg::GetFamilyByHead {
+            head: head.to_string(),
+        })
+        .await
+    }
 }

 #[async_trait]
@@ -11,7 +11,7 @@ use cosmrs::AccountId;
 use mixnet_contract_common::mixnode::{MixNodeConfigUpdate, MixNodeCostParams};
 use mixnet_contract_common::reward_params::{IntervalRewardingParamsUpdate, Performance};
 use mixnet_contract_common::{
-    ContractStateParams, ExecuteMsg as MixnetExecuteMsg, Gateway, MixId, MixNode,
+    ContractStateParams, ExecuteMsg as MixnetExecuteMsg, Gateway, LayerAssignment, MixId, MixNode,
 };

 #[async_trait]
@@ -108,7 +108,7 @@ pub trait MixnetSigningClient {

    async fn advance_current_epoch(
        &self,
-        new_rewarded_set: Vec<MixId>,
+        new_rewarded_set: Vec<LayerAssignment>,
        expected_active_set_size: u32,
        fee: Option<Fee>,
    ) -> Result<ExecuteResult, NymdError> {
@@ -136,6 +136,147 @@ pub trait MixnetSigningClient {
        .await
    }

+    // family related
+    async fn create_family(
+        &self,
+        owner_signature: String,
+        label: String,
+        fee: Option<Fee>,
+    ) -> Result<ExecuteResult, NymdError> {
+        self.execute_mixnet_contract(
+            fee,
+            MixnetExecuteMsg::CreateFamily {
+                owner_signature,
+                label,
+            },
+            vec![],
+        )
+        .await
+    }
+
+    async fn create_family_on_behalf(
+        &self,
+        owner_address: String,
+        owner_signature: String,
+        label: String,
+        fee: Option<Fee>,
+    ) -> Result<ExecuteResult, NymdError> {
+        self.execute_mixnet_contract(
+            fee,
+            MixnetExecuteMsg::CreateFamilyOnBehalf {
+                owner_address,
+                owner_signature,
+                label,
+            },
+            vec![],
+        )
+        .await
+    }
+
+    async fn join_family(
+        &self,
+        signature: String,
+        family_head: String,
+        fee: Option<Fee>,
+    ) -> Result<ExecuteResult, NymdError> {
+        self.execute_mixnet_contract(
+            fee,
+            MixnetExecuteMsg::JoinFamily {
+                signature,
+                family_head,
+            },
+            vec![],
+        )
+        .await
+    }
+
+    async fn join_family_on_behalf(
+        &self,
+        member_address: String,
+        signature: String,
+        family_head: String,
+        fee: Option<Fee>,
+    ) -> Result<ExecuteResult, NymdError> {
+        self.execute_mixnet_contract(
+            fee,
+            MixnetExecuteMsg::JoinFamilyOnBehalf {
+                member_address,
+                signature,
+                family_head,
+            },
+            vec![],
+        )
+        .await
+    }
+
+    async fn leave_family(
+        &self,
+        signature: String,
+        family_head: String,
+        fee: Option<Fee>,
+    ) -> Result<ExecuteResult, NymdError> {
+        self.execute_mixnet_contract(
+            fee,
+            MixnetExecuteMsg::LeaveFamily {
+                signature,
+                family_head,
+            },
+            vec![],
+        )
+        .await
+    }
+
+    async fn leave_family_on_behalf(
+        &self,
+        member_address: String,
+        signature: String,
+        family_head: String,
+        fee: Option<Fee>,
+    ) -> Result<ExecuteResult, NymdError> {
+        self.execute_mixnet_contract(
+            fee,
+            MixnetExecuteMsg::LeaveFamilyOnBehalf {
+                member_address,
+                signature,
+                family_head,
+            },
+            vec![],
+        )
+        .await
+    }
+
+    async fn kick_family_member(
+        &self,
+        signature: String,
+        member: String,
+        fee: Option<Fee>,
+    ) -> Result<ExecuteResult, NymdError> {
+        self.execute_mixnet_contract(
+            fee,
+            MixnetExecuteMsg::KickFamilyMember { signature, member },
+            vec![],
+        )
+        .await
+    }
+
+    async fn kick_family_member_on_behalf(
+        &self,
+        head_address: String,
+        signature: String,
+        member: String,
+        fee: Option<Fee>,
+    ) -> Result<ExecuteResult, NymdError> {
+        self.execute_mixnet_contract(
+            fee,
+            MixnetExecuteMsg::KickFamilyMemberOnBehalf {
+                head_address,
+                signature,
+                member,
+            },
+            vec![],
+        )
+        .await
+    }
    // mixnode-related:

    async fn bond_mixnode(
@@ -180,6 +321,35 @@ pub trait MixnetSigningClient {
        .await
    }

+    async fn pledge_more(
+        &self,
+        additional_pledge: Coin,
+        fee: Option<Fee>,
+    ) -> Result<ExecuteResult, NymdError> {
+        self.execute_mixnet_contract(
+            fee,
+            MixnetExecuteMsg::PledgeMore {},
+            vec![additional_pledge],
+        )
+        .await
+    }
+
+    async fn pledge_more_on_behalf(
+        &self,
+        owner: AccountId,
+        additional_pledge: Coin,
+        fee: Option<Fee>,
+    ) -> Result<ExecuteResult, NymdError> {
+        self.execute_mixnet_contract(
+            fee,
+            MixnetExecuteMsg::PledgeMoreOnBehalf {
+                owner: owner.to_string(),
+            },
+            vec![additional_pledge],
+        )
+        .await
+    }
+
    async fn unbond_mixnode(&self, fee: Option<Fee>) -> Result<ExecuteResult, NymdError> {
        self.execute_mixnet_contract(fee, MixnetExecuteMsg::UnbondMixnode {}, vec![])
            .await
@@ -64,6 +64,21 @@ pub trait VestingSigningClient {
        fee: Option<Fee>,
    ) -> Result<ExecuteResult, NymdError>;

+    async fn vesting_pledge_more(
+        &self,
+        additional_pledge: Coin,
+        fee: Option<Fee>,
+    ) -> Result<ExecuteResult, NymdError> {
+        self.execute_vesting_contract(
+            fee,
+            VestingExecuteMsg::PledgeMore {
+                amount: additional_pledge.into(),
+            },
+            vec![],
+        )
+        .await
+    }
+
    async fn vesting_unbond_mixnode(&self, fee: Option<Fee>) -> Result<ExecuteResult, NymdError>;

    async fn vesting_track_unbond_mixnode(
@@ -22,6 +22,7 @@ thiserror = "1"
 time = { version = "0.3.6", features = ["parsing", "formatting"] }
 toml = "0.5.6"
 url = "2.2"
+tap = "1"

 cosmrs = { git = "https://github.com/neacsu/cosmos-rust", branch = "neacsu/feegrant_support" }
 cosmwasm-std = { version = "1.0.0" }
@@ -15,4 +15,10 @@ pub enum ContextError {
    // TODO: improve this to return known errors
    #[error("failed to create client - {0}")]
    NymdError(String),
+
+    #[error("{0}")]
+    NymdErrorPassthrough(#[from] validator_client::nymd::error::NymdError),
+
+    #[error("{0}")]
+    ValidatorClientError(#[from] validator_client::ValidatorClientError),
 }
@@ -6,6 +6,7 @@ use network_defaults::{
    var_names::{API_VALIDATOR, MIXNET_CONTRACT_ADDRESS, NYMD_VALIDATOR, VESTING_CONTRACT_ADDRESS},
    NymNetworkDetails,
 };
+use tap::prelude::*;
 use validator_client::nymd::{self, AccountId, NymdClient, QueryNymdClient, SigningNymdClient};
 pub use validator_client::validator_api::Client as ValidatorApiClient;

@@ -58,7 +59,7 @@ pub fn create_signing_client(
    network_details: &NymNetworkDetails,
 ) -> Result<SigningClient, ContextError> {
    let client_config = nymd::Config::try_from_nym_network_details(network_details)
-        .expect("failed to construct valid validator client config with the provided network");
+        .tap_err(|e| log::error!("Failed to get client config - {:?}", e))?;

    // get mnemonic
    let mnemonic = match std::env::var("MNEMONIC") {
@@ -87,7 +88,7 @@ pub fn create_query_client(
    network_details: &NymNetworkDetails,
 ) -> Result<QueryClient, ContextError> {
    let client_config = nymd::Config::try_from_nym_network_details(network_details)
-        .expect("failed to construct valid validator client config with the provided network");
+        .tap_err(|e| log::error!("Failed to get client config - {:?}", e))?;

    let nymd_url = network_details
        .endpoints
@@ -107,7 +108,7 @@ pub fn create_signing_client_with_validator_api(
    network_details: &NymNetworkDetails,
 ) -> Result<SigningClientWithValidatorAPI, ContextError> {
    let client_config = validator_client::Config::try_from_nym_network_details(network_details)
-        .expect("failed to construct valid validator client config with the provided network");
+        .tap_err(|e| log::error!("Failed to get client config - {:?}", e))?;

    // get mnemonic
    let mnemonic = match std::env::var("MNEMONIC") {
@@ -129,7 +130,7 @@ pub fn create_query_client_with_validator_api(
    network_details: &NymNetworkDetails,
 ) -> Result<QueryClientWithValidatorAPI, ContextError> {
    let client_config = validator_client::Config::try_from_nym_network_details(network_details)
-        .expect("failed to construct valid validator client config with the provided network");
+        .tap_err(|e| log::error!("Failed to get client config - {:?}", e))?;

    match validator_client::client::Client::new_query(client_config) {
        Ok(client) => Ok(client),
@@ -3,11 +3,11 @@

 use clap::Parser;
 use cosmrs::AccountId;
-use log::info;
+use log::{error, info};

 use validator_client::nymd::{Coin, VestingQueryClient};

-use crate::context::SigningClient;
+use crate::context::QueryClient;
 use crate::utils::show_error;
 use crate::utils::{pretty_coin, pretty_cosmwasm_coin};

@@ -18,8 +18,16 @@ pub struct Args {
    pub address: Option<AccountId>,
 }

-pub async fn balance(args: Args, client: SigningClient) {
-    let account_id = args.address.unwrap_or_else(|| client.address().clone());
+pub async fn balance(args: Args, client: QueryClient, address_from_mnemonic: Option<AccountId>) {
+    if args.address.is_none() && address_from_mnemonic.is_none() {
+        error!("Please specify an account address or a mnemonic to get the balance for");
+        return;
+    }
+
+    let account_id = args
+        .address
+        .unwrap_or_else(|| address_from_mnemonic.expect("please provide a mnemonic"));
+
    let vesting_address = account_id.to_string();
    let denom = client.current_chain_details().mix_denom.base.as_str();

@@ -4,11 +4,11 @@
 use clap::Parser;
 use cosmrs::AccountId;
 use cosmwasm_std::Coin as CosmWasmCoin;
-use log::info;
+use log::{error, info};

 use validator_client::nymd::{Coin, VestingQueryClient};

-use crate::context::SigningClient;
+use crate::context::QueryClient;
 use crate::utils::show_error;
 use crate::utils::{pretty_coin, pretty_cosmwasm_coin};

@@ -19,8 +19,18 @@ pub struct Args {
    pub address: Option<AccountId>,
 }

-pub async fn query(args: Args, client: SigningClient) {
-    let account_id = args.address.unwrap_or_else(|| client.address().clone());
+pub async fn query(args: Args, client: QueryClient, address_from_mnemonic: Option<AccountId>) {
+    if args.address.is_none() && address_from_mnemonic.is_none() {
+        error!("Please specify an account address or a mnemonic to get the balance for");
+        return;
+    }
+
+    let account_id = args
+        .address
+        .unwrap_or_else(|| address_from_mnemonic.expect("please provide a mnemonic"));
+
+    info!("Checking account {} for a vesting schedule...", account_id);
+
    let vesting_address = account_id.to_string();
    let denom = client.current_chain_details().mix_denom.base.as_str();

@@ -11,6 +11,10 @@ use std::{fs, io};

 pub mod defaults;

+pub const CONFIG_DIR: &str = "config";
+pub const DATA_DIR: &str = "data";
+pub const DB_FILE_NAME: &str = "db.sqlite";
+
 pub trait NymConfig: Default + Serialize + DeserializeOwned {
    fn template() -> &'static str;

@@ -23,17 +27,17 @@ pub trait NymConfig: Default + Serialize + DeserializeOwned {
    // default, most probable, implementations; can be easily overridden where required
    fn default_config_directory(id: Option<&str>) -> PathBuf {
        if let Some(id) = id {
-            Self::default_root_directory().join(id).join("config")
+            Self::default_root_directory().join(id).join(CONFIG_DIR)
        } else {
-            Self::default_root_directory().join("config")
+            Self::default_root_directory().join(CONFIG_DIR)
        }
    }

    fn default_data_directory(id: Option<&str>) -> PathBuf {
        if let Some(id) = id {
-            Self::default_root_directory().join(id).join("data")
+            Self::default_root_directory().join(id).join(DATA_DIR)
        } else {
-            Self::default_root_directory().join("data")
+            Self::default_root_directory().join(DATA_DIR)
        }
    }

@@ -47,17 +51,17 @@ pub trait NymConfig: Default + Serialize + DeserializeOwned {

    fn try_default_config_directory(id: Option<&str>) -> Option<PathBuf> {
        if let Some(id) = id {
-            Self::try_default_root_directory().map(|d| d.join(id).join("config"))
+            Self::try_default_root_directory().map(|d| d.join(id).join(CONFIG_DIR))
        } else {
-            Self::try_default_root_directory().map(|d| d.join("config"))
+            Self::try_default_root_directory().map(|d| d.join(CONFIG_DIR))
        }
    }

    fn try_default_data_directory(id: Option<&str>) -> Option<PathBuf> {
        if let Some(id) = id {
-            Self::try_default_root_directory().map(|d| d.join(id).join("data"))
+            Self::try_default_root_directory().map(|d| d.join(id).join(DATA_DIR))
        } else {
-            Self::try_default_root_directory().map(|d| d.join("data"))
+            Self::try_default_root_directory().map(|d| d.join(DATA_DIR))
        }
    }

@@ -15,7 +15,7 @@ pub const MAX_DISPLAY_SIZE: usize = 128;
 // TODO: if we are to use this for different types, it might make sense to introduce something like
 // CommitmentTypeId field on the below for distinguishing different ones. it would somehow become part of the trait
 #[derive(Debug, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, JsonSchema)]
-pub struct ContractSafeBytes(Vec<u8>);
+pub struct ContractSafeBytes(pub Vec<u8>);

 impl Deref for ContractSafeBytes {
    type Target = Vec<u8>;
@@ -1,7 +1,7 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::MixId;
+use crate::{IdentityKey, MixId};
 use cosmwasm_std::{Addr, Coin, Decimal};
 use thiserror::Error;

@@ -133,4 +133,40 @@ pub enum MixnetContractError {

    #[error("Mixnode {mix_id} appears multiple times in the provided rewarded set update!")]
    DuplicateRewardedSetNode { mix_id: MixId },
+
+    #[error("Family with head {head} does not exist!")]
+    FamilyDoesNotExist { head: String },
+
+    #[error("Family with label '{0}' already exists")]
+    FamilyWithLabelExists(String),
+
+    #[error("Invalid layer expected 1, 2 or 3, got {0}")]
+    InvalidLayer(u8),
+
+    #[error("Head already has a family")]
+    FamilyCanHaveOnlyOne,
+
+    #[error("Already member of family {0}")]
+    AlreadyMemberOfFamily(String),
+
+    #[error("Can't join own family, family head {head}, member {member}")]
+    CantJoinOwnFamily {
+        head: IdentityKey,
+        member: IdentityKey,
+    },
+
+    #[error("Can't leave own family, family head {head}, member {member}")]
+    CantLeaveOwnFamily {
+        head: IdentityKey,
+        member: IdentityKey,
+    },
+
+    #[error("{member} is not a member of family {head}")]
+    NotAMember {
+        head: IdentityKey,
+        member: IdentityKey,
+    },
+
+    #[error("Feature is not yet implemented")]
+    NotImplemented,
 }
@@ -12,6 +12,8 @@ pub const EVENT_VERSION_PREFIX: &str = "v2_";

 pub enum MixnetEventType {
    MixnodeBonding,
+    PendingPledgeIncrease,
+    PledgeIncrease,
    GatewayBonding,
    GatewayUnbonding,
    PendingMixnodeUnbonding,
@@ -51,6 +53,8 @@ impl ToString for MixnetEventType {
    fn to_string(&self) -> String {
        let event_name = match self {
            MixnetEventType::MixnodeBonding => "mixnode_bonding",
+            MixnetEventType::PendingPledgeIncrease => "pending_pledge_increase",
+            MixnetEventType::PledgeIncrease => "pledge_increase",
            MixnetEventType::GatewayBonding => "gateway_bonding",
            MixnetEventType::GatewayUnbonding => "gateway_unbonding",
            MixnetEventType::PendingMixnodeUnbonding => "pending_mixnode_unbonding",
@@ -330,6 +334,19 @@ pub fn new_mixnode_bonding_event(
        .add_attribute(AMOUNT_KEY, amount.to_string())
 }

+pub fn new_pending_pledge_increase_event(mix_id: MixId, amount: &Coin) -> Event {
+    Event::new(MixnetEventType::PendingPledgeIncrease)
+        .add_attribute(MIX_ID_KEY, mix_id.to_string())
+        .add_attribute(AMOUNT_KEY, amount.to_string())
+}
+
+pub fn new_pledge_increase_event(created_at: BlockHeight, mix_id: MixId, amount: &Coin) -> Event {
+    Event::new(MixnetEventType::PledgeIncrease)
+        .add_attribute(EVENT_CREATION_HEIGHT_KEY, created_at.to_string())
+        .add_attribute(MIX_ID_KEY, mix_id.to_string())
+        .add_attribute(AMOUNT_KEY, amount.to_string())
+}
+
 pub fn new_mixnode_unbonding_event(created_at: BlockHeight, mix_id: MixId) -> Event {
    Event::new(MixnetEventType::MixnodeUnbonding)
        .add_attribute(EVENT_CREATION_HEIGHT_KEY, created_at.to_string())
@@ -0,0 +1,63 @@
+use crate::{IdentityKey, IdentityKeyRef};
+use cosmwasm_std::Addr;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+
+#[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
+#[cfg_attr(
+    feature = "generate-ts",
+    ts(export_to = "ts-packages/types/src/types/rust/NodeFamily.ts")
+)]
+#[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq, JsonSchema)]
+pub struct Family {
+    head: FamilyHead,
+    proxy: Option<String>,
+    label: String,
+}
+
+#[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
+#[cfg_attr(
+    feature = "generate-ts",
+    ts(export_to = "ts-packages/types/src/types/rust/NodeFamilyHead.ts")
+)]
+#[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq, JsonSchema)]
+pub struct FamilyHead(IdentityKey);
+
+impl FamilyHead {
+    pub fn new(identity: IdentityKeyRef<'_>) -> Self {
+        FamilyHead(identity.to_string())
+    }
+
+    pub fn identity(&self) -> IdentityKeyRef<'_> {
+        &self.0
+    }
+}
+
+impl Family {
+    pub fn new(head: FamilyHead, proxy: Option<Addr>, label: &str) -> Self {
+        Family {
+            head,
+            proxy: proxy.map(|p| p.to_string()),
+            label: label.to_string(),
+        }
+    }
+
+    #[allow(dead_code)]
+    pub fn head(&self) -> &FamilyHead {
+        &self.head
+    }
+
+    pub fn head_identity(&self) -> IdentityKeyRef<'_> {
+        self.head.identity()
+    }
+
+    #[allow(dead_code)]
+    pub fn proxy(&self) -> Option<&String> {
+        self.proxy.as_ref()
+    }
+
+    #[allow(dead_code)]
+    pub fn label(&self) -> &str {
+        &self.label
+    }
+}
@@ -8,6 +8,7 @@ mod constants;
 pub mod delegation;
 pub mod error;
 pub mod events;
+pub mod families;
 pub mod gateway;
 pub mod helpers;
 mod interval;
@@ -36,7 +36,6 @@ impl RewardedSetNodeStatus {
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct MixNodeDetails {
    pub bond_information: MixNodeBond,
-
    pub rewarding_details: MixNodeRewarding,
 }

@@ -325,6 +324,14 @@ impl MixNodeRewarding {
        Ok(())
    }

+    pub fn increase_operator_uint128(
+        &mut self,
+        amount: Uint128,
+    ) -> Result<(), MixnetContractError> {
+        self.operator += amount.into_base_decimal()?;
+        Ok(())
+    }
+
    pub fn increase_delegates_uint128(
        &mut self,
        amount: Uint128,
@@ -571,6 +578,29 @@ impl From<Layer> for String {
    }
 }

+impl TryFrom<u8> for Layer {
+    type Error = MixnetContractError;
+
+    fn try_from(i: u8) -> Result<Layer, MixnetContractError> {
+        match i {
+            1 => Ok(Layer::One),
+            2 => Ok(Layer::Two),
+            3 => Ok(Layer::Three),
+            _ => Err(MixnetContractError::InvalidLayer(i)),
+        }
+    }
+}
+
+impl From<Layer> for u8 {
+    fn from(layer: Layer) -> u8 {
+        match layer {
+            Layer::One => 1,
+            Layer::Two => 2,
+            Layer::Three => 3,
+        }
+    }
+}
+
 #[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
 #[cfg_attr(
    feature = "generate-ts",
@@ -8,7 +8,7 @@ use crate::mixnode::{MixNodeConfigUpdate, MixNodeCostParams};
 use crate::reward_params::{
    IntervalRewardParams, IntervalRewardingParamsUpdate, Performance, RewardingParams,
 };
-use crate::{delegation, ContractStateParams, MixId, Percent};
+use crate::{delegation, ContractStateParams, Layer, LayerAssignment, MixId, Percent};
 use crate::{Gateway, IdentityKey, MixNode};
 use cosmwasm_std::Decimal;
 use schemars::JsonSchema;
@@ -73,6 +73,51 @@ impl InitialRewardingParams {
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum ExecuteMsg {
+    AssignNodeLayer {
+        mix_id: MixId,
+        layer: Layer,
+    },
+    // Families
+    /// Only owner of the node can crate the family with node as head
+    CreateFamily {
+        owner_signature: String,
+        label: String,
+    },
+    /// Family head needs to sign the joining node IdentityKey
+    JoinFamily {
+        signature: String,
+        family_head: IdentityKey,
+    },
+    LeaveFamily {
+        signature: String,
+        family_head: IdentityKey,
+    },
+    KickFamilyMember {
+        signature: String,
+        member: IdentityKey,
+    },
+    CreateFamilyOnBehalf {
+        owner_address: String,
+        owner_signature: String,
+        label: String,
+    },
+    /// Family head needs to sign the joining node IdentityKey
+    JoinFamilyOnBehalf {
+        member_address: String,
+        signature: String,
+        family_head: IdentityKey,
+    },
+    LeaveFamilyOnBehalf {
+        member_address: String,
+        signature: String,
+        family_head: IdentityKey,
+    },
+    KickFamilyMemberOnBehalf {
+        head_address: String,
+        signature: String,
+        member: IdentityKey,
+    },
+
    // state/sys-params-related
    UpdateRewardingValidatorAddress {
        address: String,
@@ -94,7 +139,8 @@ pub enum ExecuteMsg {
        force_immediately: bool,
    },
    AdvanceCurrentEpoch {
-        new_rewarded_set: Vec<MixId>,
+        new_rewarded_set: Vec<LayerAssignment>,
+        // families_in_layer: HashMap<String, Layer>,
        expected_active_set_size: u32,
    },
    ReconcileEpochEvents {
@@ -113,6 +159,10 @@ pub enum ExecuteMsg {
        owner_signature: String,
        owner: String,
    },
+    PledgeMore {},
+    PledgeMoreOnBehalf {
+        owner: String,
+    },
    UnbondMixnode {},
    UnbondMixnodeOnBehalf {
        owner: String,
@@ -190,6 +240,29 @@ pub enum ExecuteMsg {
 impl ExecuteMsg {
    pub fn default_memo(&self) -> String {
        match self {
+            ExecuteMsg::AssignNodeLayer { mix_id, layer } => {
+                format!("assigning mix {} for layer {:?}", mix_id, layer)
+            }
+            ExecuteMsg::CreateFamily { .. } => "crating node family with".to_string(),
+            ExecuteMsg::JoinFamily { family_head, .. } => {
+                format!("joining family {}", family_head)
+            }
+            ExecuteMsg::LeaveFamily { family_head, .. } => {
+                format!("leaving family {}", family_head)
+            }
+            ExecuteMsg::KickFamilyMember { member, .. } => {
+                format!("kicking {} from family", member)
+            }
+            ExecuteMsg::CreateFamilyOnBehalf { .. } => "crating node family with".to_string(),
+            ExecuteMsg::JoinFamilyOnBehalf { family_head, .. } => {
+                format!("joining family {}", family_head)
+            }
+            ExecuteMsg::LeaveFamilyOnBehalf { family_head, .. } => {
+                format!("leaving family {}", family_head)
+            }
+            ExecuteMsg::KickFamilyMemberOnBehalf { member, .. } => {
+                format!("kicking {} from family", member)
+            }
            ExecuteMsg::UpdateRewardingValidatorAddress { address } => {
                format!("updating rewarding validator to {}", address)
            }
@@ -223,6 +296,8 @@ impl ExecuteMsg {
            ExecuteMsg::BondMixnodeOnBehalf { mix_node, .. } => {
                format!("bonding mixnode {} on behalf", mix_node.identity_key)
            }
+            ExecuteMsg::PledgeMore {} => "pledging additional tokens".into(),
+            ExecuteMsg::PledgeMoreOnBehalf { .. } => "pledging additional tokens on behalf".into(),
            ExecuteMsg::UnbondMixnode { .. } => "unbonding mixnode".into(),
            ExecuteMsg::UnbondMixnodeOnBehalf { .. } => "unbonding mixnode on behalf".into(),
            ExecuteMsg::UpdateMixnodeCostParams { .. } => "updating mixnode cost parameters".into(),
@@ -280,6 +355,27 @@ impl ExecuteMsg {
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum QueryMsg {
+    // families
+    GetAllFamiliesPaged {
+        limit: Option<u32>,
+        start_after: Option<String>,
+    },
+    GetAllMembersPaged {
+        limit: Option<u32>,
+        start_after: Option<String>,
+    },
+    GetFamilyByHead {
+        head: String,
+    },
+    GetFamilyByLabel {
+        label: String,
+    },
+    GetFamilyMembersByHead {
+        head: String,
+    },
+    GetFamilyMembersByLabel {
+        label: String,
+    },
    // state/sys-params-related
    GetContractVersion {},
    GetRewardingValidatorAddress {},
@@ -334,7 +430,6 @@ pub enum QueryMsg {
        mix_identity: IdentityKey,
    },
    GetLayerDistribution {},
-
    // gateway-related:
    GetGateways {
        start_after: Option<IdentityKey>,
@@ -34,6 +34,10 @@ pub enum PendingEpochEventKind {
        mix_id: MixId,
        proxy: Option<Addr>,
    },
+    PledgeMore {
+        mix_id: MixId,
+        amount: Coin,
+    },
    UnbondMixnode {
        mix_id: MixId,
    },
@@ -78,7 +82,6 @@ pub enum PendingIntervalEventKind {
        mix_id: MixId,
        new_costs: MixNodeCostParams,
    },
-
    UpdateRewardingParams {
        update: IntervalRewardingParamsUpdate,
    },
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0

 use crate::error::MixnetContractError;
+use crate::families::{Family, FamilyHead};
 use crate::{Layer, RewardedSetNodeStatus};
 use cosmwasm_std::Addr;
 use cosmwasm_std::Coin;
@@ -21,6 +22,27 @@ pub type BlockHeight = u64;
 pub type EpochEventId = u32;
 pub type IntervalEventId = u32;

+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Serialize, Deserialize, Debug, Clone, JsonSchema, PartialEq)]
+pub struct LayerAssignment {
+    mix_id: MixId,
+    layer: Layer,
+}
+
+impl LayerAssignment {
+    pub fn new(mix_id: MixId, layer: Layer) -> Self {
+        LayerAssignment { mix_id, layer }
+    }
+
+    pub fn mix_id(&self) -> MixId {
+        self.mix_id
+    }
+
+    pub fn layer(&self) -> Layer {
+        self.layer
+    }
+}
+
 #[derive(Debug, Default, Serialize, Deserialize, Copy, Clone, Eq, PartialEq)]
 pub struct LayerDistribution {
    pub layer1: u64,
@@ -126,3 +148,15 @@ pub struct PagedRewardedSetResponse {
    pub nodes: Vec<(MixId, RewardedSetNodeStatus)>,
    pub start_next_after: Option<MixId>,
 }
+
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq, JsonSchema)]
+pub struct PagedFamiliesResponse {
+    pub families: Vec<Family>,
+    pub start_next_after: Option<String>,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq, JsonSchema)]
+pub struct PagedMembersResponse {
+    pub members: Vec<(IdentityKey, FamilyHead)>,
+    pub start_next_after: Option<String>,
+}
@@ -14,6 +14,7 @@ pub const VESTING_UNDELEGATION_EVENT_TYPE: &str = "vesting_undelegation";
 pub const VESTING_GATEWAY_BONDING_EVENT_TYPE: &str = "vesting_gateway_bonding";
 pub const VESTING_GATEWAY_UNBONDING_EVENT_TYPE: &str = "vesting_gateway_unbonding";
 pub const VESTING_MIXNODE_BONDING_EVENT_TYPE: &str = "vesting_mixnode_bonding";
+pub const VESTING_PLEDGE_MORE_EVENT_TYPE: &str = "vesting_pledge_more";
 pub const VESTING_MIXNODE_UNBONDING_EVENT_TYPE: &str = "vesting_mixnode_unbonding";
 pub const VESTING_UPDATE_MIXNODE_CONFIG_EVENT_TYPE: &str = "vesting_update_mixnode_config";
 pub const VESTING_UPDATE_MIXNODE_COST_PARAMS_EVENT_TYPE: &str =
@@ -112,6 +113,10 @@ pub fn new_vesting_mixnode_bonding_event() -> Event {
    Event::new(VESTING_MIXNODE_BONDING_EVENT_TYPE)
 }

+pub fn new_vesting_pledge_more_event() -> Event {
+    Event::new(VESTING_PLEDGE_MORE_EVENT_TYPE)
+}
+
 pub fn new_vesting_update_mixnode_config_event() -> Event {
    Event::new(VESTING_UPDATE_MIXNODE_CONFIG_EVENT_TYPE)
 }
@@ -1,7 +1,7 @@
 use cosmwasm_std::{Coin, Timestamp};
 use mixnet_contract_common::{
    mixnode::{MixNodeConfigUpdate, MixNodeCostParams},
-    Gateway, MixId, MixNode,
+    Gateway, IdentityKey, MixId, MixNode,
 };
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -57,6 +57,25 @@ impl VestingSpecification {
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum ExecuteMsg {
+    // Families
+    /// Only owner of the node can crate the family with node as head
+    CreateFamily {
+        owner_signature: String,
+        label: String,
+    },
+    /// Family head needs to sign the joining node IdentityKey
+    JoinFamily {
+        signature: String,
+        family_head: IdentityKey,
+    },
+    LeaveFamily {
+        signature: String,
+        family_head: IdentityKey,
+    },
+    KickFamilyMember {
+        signature: String,
+        member: IdentityKey,
+    },
    TrackReward {
        amount: Coin,
        address: String,
@@ -101,6 +120,9 @@ pub enum ExecuteMsg {
        owner_signature: String,
        amount: Coin,
    },
+    PledgeMore {
+        amount: Coin,
+    },
    UnbondMixnode {},
    TrackUnbondMixnode {
        owner: String,
@@ -131,6 +153,10 @@ pub enum ExecuteMsg {
 impl ExecuteMsg {
    pub fn name(&self) -> &str {
        match self {
+            ExecuteMsg::CreateFamily { .. } => "VestingExecuteMsg::CreateFamily",
+            ExecuteMsg::JoinFamily { .. } => "VestingExecuteMsg::JoinFamily",
+            ExecuteMsg::LeaveFamily { .. } => "VestingExecuteMsg::LeaveFamily",
+            ExecuteMsg::KickFamilyMember { .. } => "VestingExecuteMsg::KickFamilyMember",
            ExecuteMsg::TrackReward { .. } => "VestingExecuteMsg::TrackReward",
            ExecuteMsg::ClaimOperatorReward { .. } => "VestingExecuteMsg::ClaimOperatorReward",
            ExecuteMsg::ClaimDelegatorReward { .. } => "VestingExecuteMsg::ClaimDelegatorReward",
@@ -145,6 +171,7 @@ impl ExecuteMsg {
            ExecuteMsg::WithdrawVestedCoins { .. } => "VestingExecuteMsg::WithdrawVestedCoins",
            ExecuteMsg::TrackUndelegation { .. } => "VestingExecuteMsg::TrackUndelegation",
            ExecuteMsg::BondMixnode { .. } => "VestingExecuteMsg::BondMixnode",
+            ExecuteMsg::PledgeMore { .. } => "VestingExecuteMsg::PledgeMore",
            ExecuteMsg::UnbondMixnode { .. } => "VestingExecuteMsg::UnbondMixnode",
            ExecuteMsg::TrackUnbondMixnode { .. } => "VestingExecuteMsg::TrackUnbondMixnode",
            ExecuteMsg::BondGateway { .. } => "VestingExecuteMsg::BondGateway",
@@ -1,20 +0,0 @@
-CONFIGURED=true
-
-RUST_LOG=info
-RUST_BACKTRACE=1
-
-BECH32_PREFIX=n
-MIX_DENOM=unym
-MIX_DENOM_DISPLAY=nym
-STAKE_DENOM=unyx
-STAKE_DENOM_DISPLAY=nyx
-DENOMS_EXPONENT=6
-MIXNET_CONTRACT_ADDRESS=n14hj2tavq8fpesdwxxcu44rty3hh90vhujrvcmstl4zr3txmfvw9sjyvg3g
-VESTING_CONTRACT_ADDRESS=n1nc5tatafv6eyq7llkr2gv50ff9e22mnf70qgjlv737ktmt4eswrq73f2nw
-BANDWIDTH_CLAIM_CONTRACT_ADDRESS=n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0
-COCONUT_BANDWIDTH_CONTRACT_ADDRESS=n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0
-MULTISIG_CONTRACT_ADDRESS=n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0
-REWARDING_VALIDATOR_ADDRESS=n10yyd98e2tuwu0f7ypz9dy3hhjw7v772q6287gy
-STATISTICS_SERVICE_DOMAIN_ADDRESS="http://127.0.0.1:8090"
-NYMD_VALIDATOR="https://rpc.nyx.nodes.guru/"
-API_VALIDATOR="https://validator.nymtech.net/api/"
@@ -1,20 +0,0 @@
-CONFIGURED=true
-
-RUST_LOG=info
-RUST_BACKTRACE=1
-
-BECH32_PREFIX=n
-MIX_DENOM=unym
-MIX_DENOM_DISPLAY=nym
-STAKE_DENOM=unyx
-STAKE_DENOM_DISPLAY=nyx
-DENOMS_EXPONENT=6
-MIXNET_CONTRACT_ADDRESS=n1suhgf5svhu4usrurvxzlgn54ksxmn8gljarjtxqnapv8kjnp4nrsd3qaep
-VESTING_CONTRACT_ADDRESS=n1xr3rq8yvd7qplsw5yx90ftsr2zdhg4e9z60h5duusgxpv72hud3sjkxkav
-BANDWIDTH_CLAIM_CONTRACT_ADDRESS=n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0
-COCONUT_BANDWIDTH_CONTRACT_ADDRESS=n1ghd753shjuwexxywmgs4xz7x2q732vcn7ty4yw
-MULTISIG_CONTRACT_ADDRESS=n17p9rzwnnfxcjp32un9ug7yhhzgtkhvl988qccs
-REWARDING_VALIDATOR_ADDRESS=n1tfzd4qz3a45u8p4mr5zmzv66457uwjgcl05jdq
-STATISTICS_SERVICE_DOMAIN_ADDRESS="http://0.0.0.0"
-NYMD_VALIDATOR="https://qa-validator.nymtech.net"
-API_VALIDATOR="https://qa-validator-api.nymtech.net/api"
@@ -85,6 +85,10 @@ pub fn export_to_env() {
        var_names::MULTISIG_CONTRACT_ADDRESS,
        MULTISIG_CONTRACT_ADDRESS,
    );
+    set_var_to_default(
+        var_names::COCONUT_DKG_CONTRACT_ADDRESS,
+        COCONUT_DKG_CONTRACT_ADDRESS,
+    );
    set_var_to_default(
        var_names::REWARDING_VALIDATOR_ADDRESS,
        REWARDING_VALIDATOR_ADDRESS,
@@ -125,6 +129,10 @@ pub fn export_to_env_if_not_set() {
        var_names::MULTISIG_CONTRACT_ADDRESS,
        MULTISIG_CONTRACT_ADDRESS,
    );
+    set_var_conditionally_to_default(
+        var_names::COCONUT_DKG_CONTRACT_ADDRESS,
+        COCONUT_DKG_CONTRACT_ADDRESS,
+    );
    set_var_conditionally_to_default(
        var_names::REWARDING_VALIDATOR_ADDRESS,
        REWARDING_VALIDATOR_ADDRESS,
@@ -84,6 +84,10 @@ impl NymTopology {
        &self.mixes
    }

+    pub fn num_mixnodes(&self) -> usize {
+        self.mixes.values().flat_map(|m| m.iter()).count()
+    }
+
    pub fn mixes_as_vec(&self) -> Vec<mix::Node> {
        let mut mixes: Vec<mix::Node> = vec![];

@@ -209,18 +213,14 @@ impl NymTopology {

    #[must_use]
    pub fn filter_system_version(&self, expected_version: &str) -> Self {
-        self.filter_node_versions(expected_version, expected_version)
+        self.filter_node_versions(expected_version)
    }

    #[must_use]
-    pub fn filter_node_versions(
-        &self,
-        expected_mix_version: &str,
-        expected_gateway_version: &str,
-    ) -> Self {
+    pub fn filter_node_versions(&self, expected_mix_version: &str) -> Self {
        NymTopology {
            mixes: self.mixes.filter_by_version(expected_mix_version),
-            gateways: self.gateways.filter_by_version(expected_gateway_version),
+            gateways: self.gateways.clone(),
        }
    }
 }
@@ -57,6 +57,10 @@ pub enum PendingEpochEventData {
        mix_id: MixId,
        proxy: Option<String>,
    },
+    PledgeMore {
+        mix_id: MixId,
+        amount: DecCoin,
+    },
    UnbondMixnode {
        mix_id: MixId,
    },
@@ -91,6 +95,12 @@ impl PendingEpochEventData {
                mix_id,
                proxy: proxy.map(|p| p.into_string()),
            }),
+            MixnetContractPendingEpochEventKind::PledgeMore { mix_id, amount } => {
+                Ok(PendingEpochEventData::PledgeMore {
+                    mix_id,
+                    amount: reg.attempt_convert_to_display_dec_coin(amount.into())?,
+                })
+            }
            MixnetContractPendingEpochEventKind::UnbondMixnode { mix_id } => {
                Ok(PendingEpochEventData::UnbondMixnode { mix_id })
            }
@@ -0,0 +1 @@
+Cargo.lock
@@ -1,9 +1,15 @@
 ## Unreleased

-## Added
+## [nym-contracts-v1.1.2](https://github.com/nymtech/nym/tree/nym-contracts-v1.1.2) (2022-12-07)
+
+### Added

 - Added migration code to the mixnet contract to allow updating stored vesting contract address to make it easier to deploy any future environments ([#1759],[#1769])
+- Added an option to pledge additional tokens without the need to rebond minxode ([#1679])
+- Added support for node families ([#1670])

+[#1670]: https://github.com/nymtech/nym/pull/1670
+[#1679]: https://github.com/nymtech/nym/pull/1679
 [#1759]: https://github.com/nymtech/nym/pull/1759
 [#1769]: https://github.com/nymtech/nym/pull/1769

@@ -93,4 +99,4 @@
 [#1292]: https://github.com/nymtech/nym/pull/1292
 [#1331]: https://github.com/nymtech/nym/pull/1331
 [#1369]: https://github.com/nymtech/nym/pull/1369
-[#1373]: https://github.com/nymtech/nym/pull/1373
+[#1373]: https://github.com/nymtech/nym/pull/1373
@@ -25,7 +25,7 @@ impl<'a> IndexList<SpendCredential> for SpendCredentialIndex<'a> {
    }
 }

-// gateways() is the storage access function.
+// spent_credentials() is the storage access function.
 pub(crate) fn spent_credentials<'a>(
 ) -> IndexedMap<'a, &'a str, SpendCredential, SpendCredentialIndex<'a>> {
    let indexes = SpendCredentialIndex {
@@ -19,4 +19,8 @@ cw4 = { version = "0.13.4" }

 schemars = "0.8"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
-thiserror = "1.0.23"
+thiserror = "1.0.23"
+
+[dev-dependencies]
+cw-multi-test = { version = "0.13.4" }
+cw4-group = { path = "../multisig/cw4-group" }
@@ -0,0 +1,264 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::dealers::queries::{
+    query_current_dealers_paged, query_dealer_details, query_past_dealers_paged,
+};
+use crate::dealers::transactions::try_add_dealer;
+use crate::dealings::queries::query_dealings_paged;
+use crate::dealings::transactions::try_commit_dealings;
+use crate::epoch_state::queries::query_current_epoch_state;
+use crate::epoch_state::storage::CURRENT_EPOCH_STATE;
+use crate::epoch_state::transactions::advance_epoch_state;
+use crate::error::ContractError;
+use crate::state::{State, ADMIN, MULTISIG, STATE};
+use crate::verification_key_shares::queries::query_vk_shares_paged;
+use crate::verification_key_shares::transactions::try_commit_verification_key_share;
+use crate::verification_key_shares::transactions::try_verify_verification_key_share;
+use coconut_dkg_common::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
+use coconut_dkg_common::types::EpochState;
+use cosmwasm_std::{
+    entry_point, to_binary, Deps, DepsMut, Env, MessageInfo, QueryResponse, Response,
+};
+use cw4::Cw4Contract;
+
+/// Instantiate the contract.
+///
+/// `deps` contains Storage, API and Querier
+/// `env` contains block, message and contract info
+/// `msg` is the contract initialization message, sort of like a constructor call.
+#[entry_point]
+pub fn instantiate(
+    mut deps: DepsMut<'_>,
+    _env: Env,
+    _info: MessageInfo,
+    msg: InstantiateMsg,
+) -> Result<Response, ContractError> {
+    let admin_addr = deps.api.addr_validate(&msg.admin)?;
+    let multisig_addr = deps.api.addr_validate(&msg.multisig_addr)?;
+    ADMIN.set(deps.branch(), Some(admin_addr))?;
+    MULTISIG.set(deps.branch(), Some(multisig_addr.clone()))?;
+
+    let group_addr = Cw4Contract(deps.api.addr_validate(&msg.group_addr).map_err(|_| {
+        ContractError::InvalidGroup {
+            addr: msg.group_addr.clone(),
+        }
+    })?);
+
+    let state = State {
+        group_addr,
+        multisig_addr,
+        mix_denom: msg.mix_denom,
+    };
+    STATE.save(deps.storage, &state)?;
+
+    CURRENT_EPOCH_STATE.save(deps.storage, &EpochState::default())?;
+
+    Ok(Response::default())
+}
+
+/// Handle an incoming message
+#[entry_point]
+pub fn execute(
+    deps: DepsMut<'_>,
+    env: Env,
+    info: MessageInfo,
+    msg: ExecuteMsg,
+) -> Result<Response, ContractError> {
+    match msg {
+        ExecuteMsg::RegisterDealer {
+            bte_key_with_proof,
+            announce_address,
+        } => try_add_dealer(deps, info, bte_key_with_proof, announce_address),
+        ExecuteMsg::CommitDealing { dealing_bytes } => {
+            try_commit_dealings(deps, info, dealing_bytes)
+        }
+        ExecuteMsg::CommitVerificationKeyShare { share } => {
+            try_commit_verification_key_share(deps, env, info, share)
+        }
+        ExecuteMsg::VerifyVerificationKeyShare { owner } => {
+            try_verify_verification_key_share(deps, info, owner)
+        }
+        ExecuteMsg::AdvanceEpochState {} => advance_epoch_state(deps, info),
+    }
+}
+
+#[entry_point]
+pub fn query(deps: Deps<'_>, _env: Env, msg: QueryMsg) -> Result<QueryResponse, ContractError> {
+    let response = match msg {
+        QueryMsg::GetCurrentEpochState {} => to_binary(&query_current_epoch_state(deps.storage)?)?,
+        QueryMsg::GetDealerDetails { dealer_address } => {
+            to_binary(&query_dealer_details(deps, dealer_address)?)?
+        }
+        QueryMsg::GetCurrentDealers { limit, start_after } => {
+            to_binary(&query_current_dealers_paged(deps, start_after, limit)?)?
+        }
+        QueryMsg::GetPastDealers { limit, start_after } => {
+            to_binary(&query_past_dealers_paged(deps, start_after, limit)?)?
+        }
+        QueryMsg::GetDealing {
+            idx,
+            limit,
+            start_after,
+        } => to_binary(&query_dealings_paged(deps, idx, start_after, limit)?)?,
+        QueryMsg::GetVerificationKeys { limit, start_after } => {
+            to_binary(&query_vk_shares_paged(deps, start_after, limit)?)?
+        }
+    };
+
+    Ok(response)
+}
+
+#[entry_point]
+pub fn migrate(_deps: DepsMut<'_>, _env: Env, _msg: MigrateMsg) -> Result<Response, ContractError> {
+    Ok(Default::default())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::support::tests::fixtures::{dealer_details_fixture, TEST_MIX_DENOM};
+    use crate::support::tests::helpers::{ADMIN_ADDRESS, MULTISIG_CONTRACT};
+    use coconut_dkg_common::dealer::DealerDetails;
+    use coconut_dkg_common::msg::ExecuteMsg::RegisterDealer;
+    use coconut_dkg_common::types::NodeIndex;
+    use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info};
+    use cosmwasm_std::{coins, Addr};
+    use cw4::Member;
+    use cw4_group::msg::InstantiateMsg as GroupInstantiateMsg;
+    use cw_multi_test::{App, AppBuilder, AppResponse, ContractWrapper, Executor};
+
+    fn instantiate_with_group(app: &mut App, members: &[Addr]) -> Addr {
+        let group_code_id = app.store_code(Box::new(ContractWrapper::new(
+            cw4_group::contract::execute,
+            cw4_group::contract::instantiate,
+            cw4_group::contract::query,
+        )));
+        let msg = GroupInstantiateMsg {
+            admin: Some(ADMIN_ADDRESS.to_string()),
+            members: members
+                .iter()
+                .map(|member| Member {
+                    addr: member.to_string(),
+                    weight: 10,
+                })
+                .collect(),
+        };
+        let group_contract_addr = app
+            .instantiate_contract(
+                group_code_id,
+                Addr::unchecked(ADMIN_ADDRESS),
+                &msg,
+                &[],
+                "group",
+                None,
+            )
+            .unwrap();
+
+        let coconut_dkg_code_id =
+            app.store_code(Box::new(ContractWrapper::new(execute, instantiate, query)));
+        let msg = InstantiateMsg {
+            group_addr: group_contract_addr.to_string(),
+            multisig_addr: MULTISIG_CONTRACT.to_string(),
+            admin: Addr::unchecked(ADMIN_ADDRESS).to_string(),
+            mix_denom: TEST_MIX_DENOM.to_string(),
+        };
+        app.instantiate_contract(
+            coconut_dkg_code_id,
+            Addr::unchecked(ADMIN_ADDRESS),
+            &msg,
+            &[],
+            "coconut dkg",
+            None,
+        )
+        .unwrap()
+    }
+
+    fn parse_node_index(res: AppResponse) -> NodeIndex {
+        res.events
+            .into_iter()
+            .find(|e| &e.ty == "wasm")
+            .unwrap()
+            .attributes
+            .into_iter()
+            .find(|attr| &attr.key == "node_index")
+            .unwrap()
+            .value
+            .parse::<u64>()
+            .unwrap()
+    }
+
+    #[test]
+    fn initialize_contract() {
+        let mut deps = mock_dependencies();
+        let env = mock_env();
+        let msg = InstantiateMsg {
+            group_addr: "group_addr".to_string(),
+            multisig_addr: "multisig_addr".to_string(),
+            admin: "admin".to_string(),
+            mix_denom: "nym".to_string(),
+        };
+        let info = mock_info("creator", &[]);
+
+        let res = instantiate(deps.as_mut(), env.clone(), info, msg);
+        assert!(res.is_ok())
+    }
+
+    #[test]
+    fn execute_add_dealer() {
+        let init_funds = coins(100, TEST_MIX_DENOM);
+        const MEMBER_SIZE: usize = 100;
+        let members: [Addr; MEMBER_SIZE] =
+            std::array::from_fn(|idx| Addr::unchecked(format!("member{}", idx)));
+
+        let mut app = AppBuilder::new().build(|router, _, storage| {
+            router
+                .bank
+                .init_balance(storage, &Addr::unchecked(ADMIN_ADDRESS), init_funds)
+                .unwrap();
+        });
+        let coconut_dkg_contract_addr = instantiate_with_group(&mut app, &members);
+
+        for (idx, member) in members.iter().enumerate() {
+            let res = app
+                .execute_contract(
+                    member.clone(),
+                    coconut_dkg_contract_addr.clone(),
+                    &RegisterDealer {
+                        bte_key_with_proof: "bte_key_with_proof".to_string(),
+                        announce_address: "127.0.0.1:8000".to_string(),
+                    },
+                    &vec![],
+                )
+                .unwrap();
+            assert_eq!(parse_node_index(res), (idx + 1) as u64);
+
+            let err = app
+                .execute_contract(
+                    member.clone(),
+                    coconut_dkg_contract_addr.clone(),
+                    &RegisterDealer {
+                        bte_key_with_proof: "bte_key_with_proof".to_string(),
+                        announce_address: "127.0.0.1:8000".to_string(),
+                    },
+                    &vec![],
+                )
+                .unwrap_err();
+            assert_eq!(ContractError::AlreadyADealer, err.downcast().unwrap());
+        }
+
+        let unauthorized_member = Addr::unchecked("not_a_member");
+        let err = app
+            .execute_contract(
+                unauthorized_member,
+                coconut_dkg_contract_addr.clone(),
+                &RegisterDealer {
+                    bte_key_with_proof: "bte_key_with_proof".to_string(),
+                    announce_address: "127.0.0.1:8000".to_string(),
+                },
+                &vec![],
+            )
+            .unwrap_err();
+        assert_eq!(ContractError::Unauthorized, err.downcast().unwrap());
+    }
+}
@@ -10,7 +10,7 @@ fn query_dealers(
    deps: Deps<'_>,
    start_after: Option<String>,
    limit: Option<u32>,
-    underlying_map: IndexedDealersMap<'_>,
+    underlying_map: &IndexedDealersMap<'_>,
 ) -> StdResult<PagedDealerResponse> {
    let limit = limit
        .unwrap_or(storage::DEALERS_PAGE_DEFAULT_LIMIT)
@@ -55,7 +55,7 @@ pub fn query_current_dealers_paged(
    start_after: Option<String>,
    limit: Option<u32>,
 ) -> StdResult<PagedDealerResponse> {
-    query_dealers(deps, start_after, limit, storage::current_dealers())
+    query_dealers(deps, start_after, limit, &storage::current_dealers())
 }

 pub fn query_past_dealers_paged(
@@ -63,5 +63,166 @@ pub fn query_past_dealers_paged(
    start_after: Option<String>,
    limit: Option<u32>,
 ) -> StdResult<PagedDealerResponse> {
-    query_dealers(deps, start_after, limit, storage::past_dealers())
+    query_dealers(deps, start_after, limit, &storage::past_dealers())
+}
+
+#[cfg(test)]
+pub(crate) mod tests {
+    use super::*;
+    use crate::dealers::storage::{DEALERS_PAGE_DEFAULT_LIMIT, DEALERS_PAGE_MAX_LIMIT};
+    use crate::support::tests::fixtures::dealer_details_fixture;
+    use crate::support::tests::helpers::init_contract;
+    use cosmwasm_std::testing::mock_env;
+    use cosmwasm_std::{Addr, DepsMut};
+
+    fn fill_dealers(deps: DepsMut<'_>, mapping: &IndexedDealersMap<'_>, size: usize) {
+        for n in 0..size {
+            let dealer_details = dealer_details_fixture(n as u64);
+            mapping
+                .save(deps.storage, &dealer_details.address, &dealer_details)
+                .unwrap();
+        }
+    }
+
+    fn remove_dealers(deps: DepsMut<'_>, mapping: &IndexedDealersMap<'_>, size: usize) {
+        for n in 0..size {
+            let dealer_details = dealer_details_fixture(n as u64);
+            mapping
+                .remove(deps.storage, &dealer_details.address)
+                .unwrap();
+        }
+    }
+
+    #[test]
+    fn dealers_empty_on_init() {
+        let mut deps = init_contract();
+        let env = mock_env();
+
+        for mapping in [storage::current_dealers(), storage::past_dealers()] {
+            let page1 = query_dealers(deps.as_ref(), None, None, &mapping).unwrap();
+            assert_eq!(0, page1.dealers.len() as u32);
+        }
+    }
+
+    #[test]
+    fn dealers_paged_retrieval_obeys_limits() {
+        let mut deps = init_contract();
+        let env = mock_env();
+        let owner = Addr::unchecked("owner");
+        let limit = 2;
+
+        for mapping in [storage::current_dealers(), storage::past_dealers()] {
+            fill_dealers(deps.as_mut(), &mapping, 1000);
+
+            let page1 = query_dealers(deps.as_ref(), None, Option::from(limit), &mapping).unwrap();
+            assert_eq!(limit, page1.dealers.len() as u32);
+
+            remove_dealers(deps.as_mut(), &mapping, 1000);
+        }
+    }
+
+    #[test]
+    fn dealers_paged_retrieval_has_default_limit() {
+        let mut deps = init_contract();
+        let env = mock_env();
+
+        for mapping in [storage::current_dealers(), storage::past_dealers()] {
+            fill_dealers(deps.as_mut(), &mapping, 1000);
+
+            // query without explicitly setting a limit
+            let page1 = query_dealers(deps.as_ref(), None, None, &mapping).unwrap();
+
+            assert_eq!(DEALERS_PAGE_DEFAULT_LIMIT, page1.dealers.len() as u32);
+
+            remove_dealers(deps.as_mut(), &mapping, 1000);
+        }
+    }
+
+    #[test]
+    fn dealers_paged_retrieval_has_max_limit() {
+        let mut deps = init_contract();
+        let env = mock_env();
+
+        // query with a crazily high limit in an attempt to use too many resources
+        let crazy_limit = 1000 * DEALERS_PAGE_MAX_LIMIT;
+
+        for mapping in [storage::current_dealers(), storage::past_dealers()] {
+            fill_dealers(deps.as_mut(), &mapping, 1000);
+
+            let page1 =
+                query_dealers(deps.as_ref(), None, Option::from(crazy_limit), &mapping).unwrap();
+
+            // we default to a decent sized upper bound instead
+            let expected_limit = DEALERS_PAGE_MAX_LIMIT;
+            assert_eq!(expected_limit, page1.dealers.len() as u32);
+
+            remove_dealers(deps.as_mut(), &mapping, 1000);
+        }
+    }
+
+    #[test]
+    fn dealers_pagination_works() {
+        let mut deps = init_contract();
+        let env = mock_env();
+
+        let per_page = 2;
+
+        for mapping in [storage::current_dealers(), storage::past_dealers()] {
+            fill_dealers(deps.as_mut(), &mapping, 1);
+            let page1 =
+                query_dealers(deps.as_ref(), None, Option::from(per_page), &mapping).unwrap();
+
+            // page should have 1 result on it
+            assert_eq!(1, page1.dealers.len());
+            remove_dealers(deps.as_mut(), &mapping, 1);
+        }
+
+        for mapping in [storage::current_dealers(), storage::past_dealers()] {
+            fill_dealers(deps.as_mut(), &mapping, 2);
+            // page1 should have 2 results on it
+            let page1 =
+                query_dealers(deps.as_ref(), None, Option::from(per_page), &mapping).unwrap();
+            assert_eq!(2, page1.dealers.len());
+            remove_dealers(deps.as_mut(), &mapping, 2);
+        }
+
+        for mapping in [storage::current_dealers(), storage::past_dealers()] {
+            fill_dealers(deps.as_mut(), &mapping, 3);
+            // page1 still has 2 results
+            let page1 =
+                query_dealers(deps.as_ref(), None, Option::from(per_page), &mapping).unwrap();
+            assert_eq!(2, page1.dealers.len());
+
+            // retrieving the next page should start after the last key on this page
+            let start_after = page1.start_next_after.unwrap();
+            let page2 = query_dealers(
+                deps.as_ref(),
+                Option::from(start_after.to_string()),
+                Option::from(per_page),
+                &mapping,
+            )
+            .unwrap();
+
+            assert_eq!(1, page2.dealers.len());
+            remove_dealers(deps.as_mut(), &mapping, 3);
+        }
+
+        for mapping in [storage::current_dealers(), storage::past_dealers()] {
+            fill_dealers(deps.as_mut(), &mapping, 4);
+            let page1 =
+                query_dealers(deps.as_ref(), None, Option::from(per_page), &mapping).unwrap();
+            let start_after = page1.start_next_after.unwrap();
+            let page2 = query_dealers(
+                deps.as_ref(),
+                Option::from(start_after.to_string()),
+                Option::from(per_page),
+                &mapping,
+            )
+            .unwrap();
+
+            // now we have 2 pages, with 2 results on the second page
+            assert_eq!(2, page2.dealers.len());
+            remove_dealers(deps.as_mut(), &mapping, 4);
+        }
+    }
 }
@@ -3,7 +3,8 @@

 use crate::dealers::storage as dealers_storage;
 use crate::epoch_state::utils::check_epoch_state;
-use crate::{ContractError, State, STATE};
+use crate::error::ContractError;
+use crate::state::{State, STATE};
 use coconut_dkg_common::types::{DealerDetails, EncodedBTEPublicKeyWithProof, EpochState};
 use cosmwasm_std::{Addr, DepsMut, MessageInfo, Response};

@@ -64,3 +65,40 @@ pub fn try_add_dealer(

    Ok(Response::new().add_attribute("node_index", node_index.to_string()))
 }
+
+#[cfg(test)]
+pub(crate) mod tests {
+    use super::*;
+    use crate::epoch_state::transactions::advance_epoch_state;
+    use crate::support::tests::fixtures::dealer_details_fixture;
+    use crate::support::tests::helpers;
+    use crate::support::tests::helpers::ADMIN_ADDRESS;
+    use cosmwasm_std::testing::mock_info;
+
+    #[test]
+    fn invalid_state() {
+        let mut deps = helpers::init_contract();
+        let owner = Addr::unchecked("owner");
+        let info = mock_info(owner.as_str(), &[]);
+        let dealer_details = dealer_details_fixture(1);
+        let bte_key_with_proof = String::from("bte_key_with_proof");
+        let announce_address = String::from("localhost:8000");
+
+        advance_epoch_state(deps.as_mut(), mock_info(ADMIN_ADDRESS, &[])).unwrap();
+
+        let ret = try_add_dealer(
+            deps.as_mut(),
+            info.clone(),
+            bte_key_with_proof.clone(),
+            announce_address.clone(),
+        )
+        .unwrap_err();
+        assert_eq!(
+            ret,
+            ContractError::IncorrectEpochState {
+                current_state: EpochState::DealingExchange.to_string(),
+                expected_state: EpochState::default().to_string(),
+            }
+        );
+    }
+}
@@ -43,3 +43,159 @@ pub fn query_dealings_paged(
        start_next_after,
    ))
 }
+
+#[cfg(test)]
+pub(crate) mod tests {
+    use super::*;
+    use crate::dealings::storage::{DEALINGS_PAGE_DEFAULT_LIMIT, DEALINGS_PAGE_MAX_LIMIT};
+    use crate::support::tests::fixtures::dealing_bytes_fixture;
+    use crate::support::tests::helpers::init_contract;
+    use cosmwasm_std::testing::mock_env;
+    use cosmwasm_std::{Addr, DepsMut};
+
+    fn fill_dealings(deps: DepsMut<'_>, size: usize) {
+        for n in 0..size {
+            let dealing_share = dealing_bytes_fixture();
+            let sender = Addr::unchecked(format!("owner{}", n));
+            for idx in 0..TOTAL_DEALINGS {
+                DEALINGS_BYTES[idx]
+                    .save(deps.storage, &sender, &dealing_share)
+                    .unwrap();
+            }
+        }
+    }
+
+    #[test]
+    fn empty_on_bad_idx() {
+        let mut deps = init_contract();
+        let env = mock_env();
+        fill_dealings(deps.as_mut(), 1000);
+
+        for idx in TOTAL_DEALINGS as u64..100 * TOTAL_DEALINGS as u64 {
+            let page1 = query_dealings_paged(deps.as_ref(), idx, None, None).unwrap();
+            assert_eq!(0, page1.dealings.len() as u32);
+        }
+    }
+
+    #[test]
+    fn dealings_empty_on_init() {
+        let deps = init_contract();
+        for idx in 0..TOTAL_DEALINGS as u64 {
+            let response = query_dealings_paged(deps.as_ref(), idx, None, Option::from(2)).unwrap();
+            assert_eq!(0, response.dealings.len());
+        }
+    }
+
+    #[test]
+    fn dealings_paged_retrieval_obeys_limits() {
+        let mut deps = init_contract();
+        let env = mock_env();
+        let limit = 2;
+        fill_dealings(deps.as_mut(), 1000);
+
+        for idx in 0..TOTAL_DEALINGS as u64 {
+            let page1 =
+                query_dealings_paged(deps.as_ref(), idx, None, Option::from(limit)).unwrap();
+            assert_eq!(limit, page1.dealings.len() as u32);
+        }
+    }
+
+    #[test]
+    fn dealings_paged_retrieval_has_default_limit() {
+        let mut deps = init_contract();
+        let env = mock_env();
+        fill_dealings(deps.as_mut(), 1000);
+
+        for idx in 0..TOTAL_DEALINGS as u64 {
+            // query without explicitly setting a limit
+            let page1 = query_dealings_paged(deps.as_ref(), idx, None, None).unwrap();
+
+            assert_eq!(DEALINGS_PAGE_DEFAULT_LIMIT, page1.dealings.len() as u32);
+        }
+    }
+
+    #[test]
+    fn dealings_paged_retrieval_has_max_limit() {
+        let mut deps = init_contract();
+        let env = mock_env();
+        fill_dealings(deps.as_mut(), 1000);
+
+        // query with a crazily high limit in an attempt to use too many resources
+        let crazy_limit = 1000 * DEALINGS_PAGE_MAX_LIMIT;
+        for idx in 0..TOTAL_DEALINGS as u64 {
+            let page1 =
+                query_dealings_paged(deps.as_ref(), idx, None, Option::from(crazy_limit)).unwrap();
+
+            // we default to a decent sized upper bound instead
+            let expected_limit = DEALINGS_PAGE_MAX_LIMIT;
+            assert_eq!(expected_limit, page1.dealings.len() as u32);
+        }
+    }
+
+    #[test]
+    fn dealings_pagination_works() {
+        let mut deps = init_contract();
+        let env = mock_env();
+
+        fill_dealings(deps.as_mut(), 1);
+
+        let per_page = 2;
+
+        for idx in 0..TOTAL_DEALINGS as u64 {
+            let page1 =
+                query_dealings_paged(deps.as_ref(), idx, None, Option::from(per_page)).unwrap();
+
+            // page should have 1 result on it
+            assert_eq!(1, page1.dealings.len());
+        }
+
+        // save another
+        fill_dealings(deps.as_mut(), 2);
+
+        for idx in 0..TOTAL_DEALINGS as u64 {
+            // page1 should have 2 results on it
+            let page1 =
+                query_dealings_paged(deps.as_ref(), idx, None, Option::from(per_page)).unwrap();
+            assert_eq!(2, page1.dealings.len());
+        }
+
+        fill_dealings(deps.as_mut(), 3);
+
+        for idx in 0..TOTAL_DEALINGS as u64 {
+            // page1 still has 2 results
+            let page1 =
+                query_dealings_paged(deps.as_ref(), idx, None, Option::from(per_page)).unwrap();
+            assert_eq!(2, page1.dealings.len());
+
+            // retrieving the next page should start after the last key on this page
+            let start_after = page1.start_next_after.unwrap();
+            let page2 = query_dealings_paged(
+                deps.as_ref(),
+                idx,
+                Option::from(start_after.to_string()),
+                Option::from(per_page),
+            )
+            .unwrap();
+
+            assert_eq!(1, page2.dealings.len());
+        }
+
+        fill_dealings(deps.as_mut(), 4);
+
+        for idx in 0..TOTAL_DEALINGS as u64 {
+            let page1 =
+                query_dealings_paged(deps.as_ref(), idx, None, Option::from(per_page)).unwrap();
+            let start_after = page1.start_next_after.unwrap();
+            let page2 = query_dealings_paged(
+                deps.as_ref(),
+                idx,
+                Option::from(start_after.to_string()),
+                Option::from(per_page),
+            )
+            .unwrap();
+
+            // now we have 2 pages, with 2 results on the second page
+            assert_eq!(2, page2.dealings.len());
+        }
+    }
+}
@@ -4,7 +4,7 @@
 use crate::dealers::storage as dealers_storage;
 use crate::dealings::storage::DEALINGS_BYTES;
 use crate::epoch_state::utils::check_epoch_state;
-use crate::ContractError;
+use crate::error::ContractError;
 use coconut_dkg_common::types::{ContractSafeBytes, EpochState};
 use cosmwasm_std::{DepsMut, MessageInfo, Response};

@@ -35,3 +35,65 @@ pub fn try_commit_dealings(
        commitment: String::from("dealing"),
    })
 }
+
+#[cfg(test)]
+pub(crate) mod tests {
+    use super::*;
+    use crate::epoch_state::transactions::advance_epoch_state;
+    use crate::support::tests::fixtures::dealing_bytes_fixture;
+    use crate::support::tests::helpers;
+    use crate::support::tests::helpers::ADMIN_ADDRESS;
+    use coconut_dkg_common::dealer::DealerDetails;
+    use coconut_dkg_common::types::TOTAL_DEALINGS;
+    use cosmwasm_std::testing::mock_info;
+    use cosmwasm_std::Addr;
+
+    #[test]
+    fn invalid_commit_dealing() {
+        let mut deps = helpers::init_contract();
+        let owner = Addr::unchecked("owner");
+        let info = mock_info(owner.as_str(), &[]);
+        let dealing_bytes = dealing_bytes_fixture();
+
+        let ret =
+            try_commit_dealings(deps.as_mut(), info.clone(), dealing_bytes.clone()).unwrap_err();
+        assert_eq!(
+            ret,
+            ContractError::IncorrectEpochState {
+                current_state: EpochState::default().to_string(),
+                expected_state: EpochState::DealingExchange.to_string()
+            }
+        );
+
+        advance_epoch_state(deps.as_mut(), mock_info(ADMIN_ADDRESS, &[])).unwrap();
+
+        let ret =
+            try_commit_dealings(deps.as_mut(), info.clone(), dealing_bytes.clone()).unwrap_err();
+        assert_eq!(ret, ContractError::NotADealer);
+
+        let dealer_details = DealerDetails {
+            address: owner.clone(),
+            bte_public_key_with_proof: String::new(),
+            announce_address: String::new(),
+            assigned_index: 1,
+        };
+        dealers_storage::current_dealers()
+            .save(deps.as_mut().storage, &owner, &dealer_details)
+            .unwrap();
+
+        for dealings in DEALINGS_BYTES {
+            assert!(!dealings.has(deps.as_mut().storage, &owner));
+            let ret = try_commit_dealings(deps.as_mut(), info.clone(), dealing_bytes.clone());
+            assert!(ret.is_ok());
+            assert!(dealings.has(deps.as_mut().storage, &owner));
+        }
+        let ret =
+            try_commit_dealings(deps.as_mut(), info.clone(), dealing_bytes.clone()).unwrap_err();
+        assert_eq!(
+            ret,
+            ContractError::AlreadyCommitted {
+                commitment: String::from("dealing"),
+            }
+        );
+    }
+}
@@ -3,4 +3,5 @@

 pub mod queries;
 pub mod storage;
+pub mod transactions;
 pub mod utils;
@@ -1,13 +1,28 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use super::storage;
-use crate::ContractError;
+use crate::epoch_state::storage::CURRENT_EPOCH_STATE;
+use crate::error::ContractError;
 use coconut_dkg_common::types::EpochState;
 use cosmwasm_std::Storage;

 pub(crate) fn query_current_epoch_state(
    storage: &dyn Storage,
 ) -> Result<EpochState, ContractError> {
-    storage::current_epoch_state(storage)
+    CURRENT_EPOCH_STATE
+        .load(storage)
+        .map_err(|_| ContractError::EpochNotInitialised)
+}
+
+#[cfg(test)]
+pub(crate) mod test {
+    use super::*;
+    use crate::support::tests::helpers::init_contract;
+
+    #[test]
+    fn query_state() {
+        let mut deps = init_contract();
+        let state = query_current_epoch_state(deps.as_mut().storage).unwrap();
+        assert_eq!(state, EpochState::PublicKeySubmission);
+    }
 }
@@ -1,29 +1,7 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::{ContractError, ADMIN};
 use coconut_dkg_common::types::EpochState;
-use cosmwasm_std::{DepsMut, MessageInfo, Response, Storage};
 use cw_storage_plus::Item;

 pub(crate) const CURRENT_EPOCH_STATE: Item<'_, EpochState> = Item::new("current_epoch_state");
-
-pub(crate) fn current_epoch_state(storage: &dyn Storage) -> Result<EpochState, ContractError> {
-    CURRENT_EPOCH_STATE
-        .load(storage)
-        .map_err(|_| ContractError::EpochNotInitialised)
-}
-
-pub(crate) fn advance_epoch_state(
-    deps: DepsMut<'_>,
-    info: MessageInfo,
-) -> Result<Response, ContractError> {
-    ADMIN.assert_admin(deps.as_ref(), &info.sender)?;
-    CURRENT_EPOCH_STATE.update::<_, ContractError>(deps.storage, |mut epoch_state| {
-        // TODO: When defaulting to the first state, some action will probably need to be taken on the
-        // rest of the contract, as we're starting with a new set of signers
-        epoch_state = epoch_state.next().unwrap_or_default();
-        Ok(epoch_state)
-    })?;
-    Ok(Response::default())
-}
@@ -0,0 +1,78 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::epoch_state::storage::CURRENT_EPOCH_STATE;
+use crate::error::ContractError;
+use crate::state::ADMIN;
+use cosmwasm_std::{DepsMut, MessageInfo, Response};
+
+pub(crate) fn advance_epoch_state(
+    deps: DepsMut<'_>,
+    info: MessageInfo,
+) -> Result<Response, ContractError> {
+    ADMIN.assert_admin(deps.as_ref(), &info.sender)?;
+    CURRENT_EPOCH_STATE.update::<_, ContractError>(deps.storage, |mut epoch_state| {
+        // TODO: When defaulting to the first state, some action will probably need to be taken on the
+        // rest of the contract, as we're starting with a new set of signers
+        epoch_state = epoch_state.next().unwrap_or_default();
+        Ok(epoch_state)
+    })?;
+    Ok(Response::default())
+}
+
+#[cfg(test)]
+pub(crate) mod tests {
+    use super::*;
+    use crate::support::tests::helpers::{init_contract, ADMIN_ADDRESS};
+    use coconut_dkg_common::types::EpochState;
+    use cosmwasm_std::testing::mock_info;
+    use cw_controllers::AdminError;
+
+    #[test]
+    fn advance_state() {
+        let mut deps = init_contract();
+        let info = mock_info("requester", &[]);
+        let admin_info = mock_info(ADMIN_ADDRESS, &[]);
+
+        assert_eq!(
+            advance_epoch_state(deps.as_mut(), info).unwrap_err(),
+            ContractError::Admin(AdminError::NotAdmin {})
+        );
+
+        advance_epoch_state(deps.as_mut(), admin_info.clone()).unwrap();
+        assert_eq!(
+            CURRENT_EPOCH_STATE.load(deps.as_mut().storage).unwrap(),
+            EpochState::DealingExchange
+        );
+
+        advance_epoch_state(deps.as_mut(), admin_info.clone()).unwrap();
+        assert_eq!(
+            CURRENT_EPOCH_STATE.load(deps.as_mut().storage).unwrap(),
+            EpochState::VerificationKeySubmission
+        );
+
+        advance_epoch_state(deps.as_mut(), admin_info.clone()).unwrap();
+        assert_eq!(
+            CURRENT_EPOCH_STATE.load(deps.as_mut().storage).unwrap(),
+            EpochState::VerificationKeyValidation
+        );
+
+        advance_epoch_state(deps.as_mut(), admin_info.clone()).unwrap();
+        assert_eq!(
+            CURRENT_EPOCH_STATE.load(deps.as_mut().storage).unwrap(),
+            EpochState::VerificationKeyFinalization
+        );
+
+        advance_epoch_state(deps.as_mut(), admin_info.clone()).unwrap();
+        assert_eq!(
+            CURRENT_EPOCH_STATE.load(deps.as_mut().storage).unwrap(),
+            EpochState::InProgress
+        );
+
+        advance_epoch_state(deps.as_mut(), admin_info.clone()).unwrap();
+        assert_eq!(
+            CURRENT_EPOCH_STATE.load(deps.as_mut().storage).unwrap(),
+            EpochState::PublicKeySubmission
+        );
+    }
+}
@@ -1,7 +1,8 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::{ContractError, CURRENT_EPOCH_STATE};
+use crate::epoch_state::storage::CURRENT_EPOCH_STATE;
+use crate::error::ContractError;
 use coconut_dkg_common::types::EpochState;
 use cosmwasm_std::Storage;

@@ -19,3 +20,28 @@ pub(crate) fn check_epoch_state(
        Ok(())
    }
 }
+
+#[cfg(test)]
+pub(crate) mod test {
+    use super::*;
+    use crate::support::tests::helpers::init_contract;
+
+    #[test]
+    pub fn check_state() {
+        let mut deps = init_contract();
+
+        for fixed_state in EpochState::default().all_until(EpochState::InProgress) {
+            CURRENT_EPOCH_STATE
+                .save(deps.as_mut().storage, &fixed_state)
+                .unwrap();
+            for against_state in EpochState::default().all_until(EpochState::InProgress) {
+                let ret = check_epoch_state(deps.as_mut().storage, against_state);
+                if fixed_state == against_state {
+                    assert!(ret.is_ok());
+                } else {
+                    assert!(ret.is_err());
+                }
+            }
+        }
+    }
+}
@@ -1,7 +1,7 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use cosmwasm_std::{Addr, StdError, VerificationError};
+use cosmwasm_std::StdError;
 use cw_controllers::AdminError;
 use thiserror::Error;

@@ -17,24 +17,6 @@ pub enum ContractError {
    #[error("Group contract invalid address '{addr}'")]
    InvalidGroup { addr: String },

-    #[error("No coin was sent for the deposit, you must send {denom}")]
-    NoDepositFound { denom: String },
-
-    #[error("Received multiple coin types")]
-    MultipleDenoms,
-
-    #[error("Wrong coin denomination, you must send {denom}")]
-    WrongDenom { denom: String },
-
-    #[error("Not enough funds sent for deposit. (received {received}, minimum {minimum})")]
-    InsufficientDeposit { received: u128, minimum: u128 },
-
-    #[error("Failed to perform ed25519 signature verification - {0}. This dealer will be temporarily blacklisted now.")]
-    Ed25519VerificationError(#[from] VerificationError),
-
-    #[error("Provided ed25519 signature did not verify correctly. This dealer will be temporarily blacklisted now.")]
-    InvalidEd25519Signature,
-
    #[error("This potential dealer is not in the coconut signer group")]
    Unauthorized,

@@ -52,11 +34,6 @@ pub enum ContractError {
        expected_state: String,
    },

-    // we should never ever see this error (famous last words in programming), therefore, I'd want to
-    // explicitly declare it so that when we ultimate do see it, it's gonna be more informative over "normal" panic
-    #[error("Somehow our validated address {address} is not using correct bech32 encoding")]
-    InvalidValidatedAddress { address: Addr },
-
    #[error("This sender is not a dealer for the current epoch")]
    NotADealer,

@@ -1,146 +1,12 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::dealers::queries::{
-    query_current_dealers_paged, query_dealer_details, query_past_dealers_paged,
-};
-use crate::dealings::queries::query_dealings_paged;
-use crate::epoch_state::queries::query_current_epoch_state;
-use crate::error::ContractError;
-use crate::state::{State, ADMIN, MULTISIG, STATE};
-use crate::verification_key_shares::queries::query_vk_shares_paged;
-use coconut_dkg_common::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
-use coconut_dkg_common::types::EpochState;
-use cosmwasm_std::{
-    entry_point, to_binary, Deps, DepsMut, Env, MessageInfo, QueryResponse, Response,
-};
-use cw4::Cw4Contract;
-use epoch_state::storage::{advance_epoch_state, CURRENT_EPOCH_STATE};
-
 mod constants;
+pub mod contract;
 mod dealers;
 mod dealings;
 mod epoch_state;
-mod error;
+pub mod error;
 mod state;
+mod support;
 mod verification_key_shares;
-
-/// Instantiate the contract.
-///
-/// `deps` contains Storage, API and Querier
-/// `env` contains block, message and contract info
-/// `msg` is the contract initialization message, sort of like a constructor call.
-#[entry_point]
-pub fn instantiate(
-    mut deps: DepsMut<'_>,
-    _env: Env,
-    _info: MessageInfo,
-    msg: InstantiateMsg,
-) -> Result<Response, ContractError> {
-    let admin_addr = deps.api.addr_validate(&msg.admin)?;
-    let multisig_addr = deps.api.addr_validate(&msg.multisig_addr)?;
-    ADMIN.set(deps.branch(), Some(admin_addr))?;
-    MULTISIG.set(deps.branch(), Some(multisig_addr.clone()))?;
-
-    let group_addr = Cw4Contract(deps.api.addr_validate(&msg.group_addr).map_err(|_| {
-        ContractError::InvalidGroup {
-            addr: msg.group_addr.clone(),
-        }
-    })?);
-
-    let state = State {
-        group_addr,
-        multisig_addr,
-        mix_denom: msg.mix_denom,
-    };
-    STATE.save(deps.storage, &state)?;
-
-    CURRENT_EPOCH_STATE.save(deps.storage, &EpochState::default())?;
-
-    Ok(Response::default())
-}
-
-/// Handle an incoming message
-#[entry_point]
-pub fn execute(
-    deps: DepsMut<'_>,
-    env: Env,
-    info: MessageInfo,
-    msg: ExecuteMsg,
-) -> Result<Response, ContractError> {
-    match msg {
-        ExecuteMsg::RegisterDealer {
-            bte_key_with_proof,
-            announce_address,
-        } => {
-            dealers::transactions::try_add_dealer(deps, info, bte_key_with_proof, announce_address)
-        }
-        ExecuteMsg::CommitDealing { dealing_bytes } => {
-            dealings::transactions::try_commit_dealings(deps, info, dealing_bytes)
-        }
-        ExecuteMsg::CommitVerificationKeyShare { share } => {
-            verification_key_shares::transactions::try_commit_verification_key_share(
-                deps, env, info, share,
-            )
-        }
-        ExecuteMsg::VerifyVerificationKeyShare { owner } => {
-            verification_key_shares::transactions::try_verify_verification_key_share(
-                deps, info, owner,
-            )
-        }
-        ExecuteMsg::AdvanceEpochState {} => advance_epoch_state(deps, info),
-    }
-}
-
-#[entry_point]
-pub fn query(deps: Deps<'_>, _env: Env, msg: QueryMsg) -> Result<QueryResponse, ContractError> {
-    let response = match msg {
-        QueryMsg::GetCurrentEpochState {} => to_binary(&query_current_epoch_state(deps.storage)?)?,
-        QueryMsg::GetDealerDetails { dealer_address } => {
-            to_binary(&query_dealer_details(deps, dealer_address)?)?
-        }
-        QueryMsg::GetCurrentDealers { limit, start_after } => {
-            to_binary(&query_current_dealers_paged(deps, start_after, limit)?)?
-        }
-        QueryMsg::GetPastDealers { limit, start_after } => {
-            to_binary(&query_past_dealers_paged(deps, start_after, limit)?)?
-        }
-        QueryMsg::GetDealing {
-            idx,
-            limit,
-            start_after,
-        } => to_binary(&query_dealings_paged(deps, idx, start_after, limit)?)?,
-        QueryMsg::GetVerificationKeys { limit, start_after } => {
-            to_binary(&query_vk_shares_paged(deps, start_after, limit)?)?
-        }
-    };
-
-    Ok(response)
-}
-
-#[entry_point]
-pub fn migrate(_deps: DepsMut<'_>, _env: Env, _msg: MigrateMsg) -> Result<Response, ContractError> {
-    Ok(Default::default())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info};
-
-    #[test]
-    fn initialize_contract() {
-        let mut deps = mock_dependencies();
-        let env = mock_env();
-        let msg = InstantiateMsg {
-            group_addr: "group_addr".to_string(),
-            multisig_addr: "multisig_addr".to_string(),
-            admin: "admin".to_string(),
-            mix_denom: "nym".to_string(),
-        };
-        let info = mock_info("creator", &[]);
-
-        let res = instantiate(deps.as_mut(), env.clone(), info, msg);
-        assert!(res.is_ok())
-    }
-}
@@ -0,0 +1,5 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+#[cfg(test)]
+pub mod tests;
@@ -0,0 +1,32 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use coconut_dkg_common::dealer::{ContractDealing, DealerDetails};
+use coconut_dkg_common::types::ContractSafeBytes;
+use coconut_dkg_common::verification_key::ContractVKShare;
+use cosmwasm_std::Addr;
+
+pub const TEST_MIX_DENOM: &str = "unym";
+
+pub fn vk_share_fixture(index: u64) -> ContractVKShare {
+    ContractVKShare {
+        share: format!("share{}", index),
+        announce_address: format!("localhost:{}", index),
+        node_index: index,
+        owner: Addr::unchecked(format!("owner{}", index)),
+        verified: index % 2 == 0,
+    }
+}
+
+pub fn dealing_bytes_fixture() -> ContractSafeBytes {
+    ContractSafeBytes(vec![])
+}
+
+pub fn dealer_details_fixture(assigned_index: u64) -> DealerDetails {
+    DealerDetails {
+        address: Addr::unchecked(format!("owner{}", assigned_index)),
+        bte_public_key_with_proof: "".to_string(),
+        announce_address: "".to_string(),
+        assigned_index,
+    }
+}
@@ -0,0 +1,27 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::contract::instantiate;
+use coconut_dkg_common::msg::InstantiateMsg;
+use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info, MockApi, MockQuerier};
+use cosmwasm_std::{Empty, MemoryStorage, OwnedDeps};
+
+use super::fixtures::TEST_MIX_DENOM;
+
+pub const ADMIN_ADDRESS: &str = "admin address";
+pub const GROUP_CONTRACT: &str = "group contract address";
+pub const MULTISIG_CONTRACT: &str = "multisig contract address";
+
+pub fn init_contract() -> OwnedDeps<MemoryStorage, MockApi, MockQuerier<Empty>> {
+    let mut deps = mock_dependencies();
+    let msg = InstantiateMsg {
+        group_addr: String::from(GROUP_CONTRACT),
+        multisig_addr: String::from(MULTISIG_CONTRACT),
+        admin: String::from(ADMIN_ADDRESS),
+        mix_denom: TEST_MIX_DENOM.to_string(),
+    };
+    let env = mock_env();
+    let info = mock_info(ADMIN_ADDRESS, &[]);
+    instantiate(deps.as_mut(), env.clone(), info, msg).unwrap();
+    deps
+}
@@ -0,0 +1,5 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod fixtures;
+pub mod helpers;
@@ -36,3 +36,147 @@ pub fn query_vk_shares_paged(
        start_next_after,
    })
 }
+
+#[cfg(test)]
+pub(crate) mod tests {
+    use super::*;
+    use crate::support::tests::fixtures::vk_share_fixture;
+    use crate::support::tests::helpers::init_contract;
+    use crate::verification_key_shares::storage::{
+        VERIFICATION_KEY_SHARES_PAGE_DEFAULT_LIMIT, VERIFICATION_KEY_SHARES_PAGE_MAX_LIMIT,
+    };
+    use cosmwasm_std::testing::mock_env;
+    use cosmwasm_std::Addr;
+
+    #[test]
+    fn vk_shares_empty_on_init() {
+        let deps = init_contract();
+        let response = query_vk_shares_paged(deps.as_ref(), None, Option::from(2)).unwrap();
+        assert_eq!(0, response.shares.len());
+    }
+
+    #[test]
+    fn vk_shares_paged_retrieval_obeys_limits() {
+        let mut deps = init_contract();
+        let env = mock_env();
+        let limit = 2;
+        for n in 0..1000 {
+            let vk_share = vk_share_fixture(n);
+            let sender = Addr::unchecked(format!("owner{}", n));
+            VK_SHARES
+                .save(&mut deps.storage, &sender, &vk_share)
+                .unwrap();
+        }
+
+        let page1 = query_vk_shares_paged(deps.as_ref(), None, Option::from(limit)).unwrap();
+        assert_eq!(limit, page1.shares.len() as u32);
+    }
+
+    #[test]
+    fn vk_shares_paged_retrieval_has_default_limit() {
+        let mut deps = init_contract();
+        let env = mock_env();
+        for n in 0..1000 {
+            let vk_share = vk_share_fixture(n);
+            let sender = Addr::unchecked(format!("owner{}", n));
+            VK_SHARES
+                .save(&mut deps.storage, &sender, &vk_share)
+                .unwrap();
+        }
+
+        // query without explicitly setting a limit
+        let page1 = query_vk_shares_paged(deps.as_ref(), None, None).unwrap();
+
+        assert_eq!(
+            VERIFICATION_KEY_SHARES_PAGE_DEFAULT_LIMIT,
+            page1.shares.len() as u32
+        );
+    }
+
+    #[test]
+    fn vk_shares_paged_retrieval_has_max_limit() {
+        let mut deps = init_contract();
+        let env = mock_env();
+        for n in 0..1000 {
+            let vk_share = vk_share_fixture(n);
+            let sender = Addr::unchecked(format!("owner{}", n));
+            VK_SHARES
+                .save(&mut deps.storage, &sender, &vk_share)
+                .unwrap();
+        }
+
+        // query with a crazily high limit in an attempt to use too many resources
+        let crazy_limit = 1000 * VERIFICATION_KEY_SHARES_PAGE_MAX_LIMIT;
+        let page1 = query_vk_shares_paged(deps.as_ref(), None, Option::from(crazy_limit)).unwrap();
+
+        // we default to a decent sized upper bound instead
+        let expected_limit = VERIFICATION_KEY_SHARES_PAGE_MAX_LIMIT;
+        assert_eq!(expected_limit, page1.shares.len() as u32);
+    }
+
+    #[test]
+    fn vk_shares_pagination_works() {
+        let mut deps = init_contract();
+        let env = mock_env();
+
+        let vk_share = vk_share_fixture(1);
+        let sender = Addr::unchecked(format!("owner{}", 1));
+        VK_SHARES
+            .save(&mut deps.storage, &sender, &vk_share)
+            .unwrap();
+
+        let per_page = 2;
+        let page1 = query_vk_shares_paged(deps.as_ref(), None, Option::from(per_page)).unwrap();
+
+        // page should have 1 result on it
+        assert_eq!(1, page1.shares.len());
+
+        // save another
+        let vk_share = vk_share_fixture(2);
+        let sender = Addr::unchecked(format!("owner{}", 2));
+        VK_SHARES
+            .save(&mut deps.storage, &sender, &vk_share)
+            .unwrap();
+
+        // page1 should have 2 results on it
+        let page1 = query_vk_shares_paged(deps.as_ref(), None, Option::from(per_page)).unwrap();
+        assert_eq!(2, page1.shares.len());
+
+        let vk_share = vk_share_fixture(3);
+        let sender = Addr::unchecked(format!("owner{}", 3));
+        VK_SHARES
+            .save(&mut deps.storage, &sender, &vk_share)
+            .unwrap();
+
+        // page1 still has 2 results
+        let page1 = query_vk_shares_paged(deps.as_ref(), None, Option::from(per_page)).unwrap();
+        assert_eq!(2, page1.shares.len());
+
+        // retrieving the next page should start after the last key on this page
+        let start_after = page1.start_next_after.unwrap();
+        let page2 = query_vk_shares_paged(
+            deps.as_ref(),
+            Option::from(start_after.to_string()),
+            Option::from(per_page),
+        )
+        .unwrap();
+
+        assert_eq!(1, page2.shares.len());
+
+        let vk_share = vk_share_fixture(4);
+        let sender = Addr::unchecked(format!("owner{}", 4));
+        VK_SHARES
+            .save(&mut deps.storage, &sender, &vk_share)
+            .unwrap();
+
+        let page2 = query_vk_shares_paged(
+            deps.as_ref(),
+            Option::from(start_after.to_string()),
+            Option::from(per_page),
+        )
+        .unwrap();
+
+        // now we have 2 pages, with 2 results on the second page
+        assert_eq!(2, page2.shares.len());
+    }
+}
@@ -69,3 +69,144 @@ pub fn try_verify_verification_key_share(

    Ok(Response::default())
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::epoch_state::storage::CURRENT_EPOCH_STATE;
+    use crate::epoch_state::transactions::advance_epoch_state;
+    use crate::support::tests::helpers;
+    use crate::support::tests::helpers::{ADMIN_ADDRESS, MULTISIG_CONTRACT};
+    use coconut_dkg_common::dealer::DealerDetails;
+    use coconut_dkg_common::types::EpochState;
+    use cosmwasm_std::testing::{mock_env, mock_info};
+    use cosmwasm_std::Storage;
+    use cw_controllers::AdminError;
+
+    #[test]
+    fn commit_vk_share() {
+        let mut deps = helpers::init_contract();
+        let env = mock_env();
+        let info = mock_info("requester", &[]);
+        let share = "share".to_string();
+
+        let ret = try_commit_verification_key_share(
+            deps.as_mut(),
+            env.clone(),
+            info.clone(),
+            share.clone(),
+        )
+        .unwrap_err();
+        assert_eq!(
+            ret,
+            ContractError::IncorrectEpochState {
+                current_state: EpochState::default().to_string(),
+                expected_state: EpochState::VerificationKeySubmission.to_string()
+            }
+        );
+        advance_epoch_state(deps.as_mut(), mock_info(ADMIN_ADDRESS, &[])).unwrap();
+        advance_epoch_state(deps.as_mut(), mock_info(ADMIN_ADDRESS, &[])).unwrap();
+        let ret = try_commit_verification_key_share(
+            deps.as_mut(),
+            env.clone(),
+            info.clone(),
+            share.clone(),
+        )
+        .unwrap_err();
+        assert_eq!(ret, ContractError::NotADealer);
+
+        let dealer = Addr::unchecked("requester");
+        let dealer_details = DealerDetails {
+            address: dealer.clone(),
+            bte_public_key_with_proof: String::new(),
+            announce_address: String::new(),
+            assigned_index: 1,
+        };
+        dealers_storage::current_dealers()
+            .save(deps.as_mut().storage, &dealer, &dealer_details)
+            .unwrap();
+
+        try_commit_verification_key_share(deps.as_mut(), env.clone(), info.clone(), share.clone())
+            .unwrap();
+
+        let ret = try_commit_verification_key_share(
+            deps.as_mut(),
+            env.clone(),
+            info.clone(),
+            share.clone(),
+        )
+        .unwrap_err();
+        assert_eq!(
+            ret,
+            ContractError::AlreadyCommitted {
+                commitment: String::from("verification key share")
+            }
+        );
+    }
+
+    #[test]
+    fn invalid_verify_vk_share() {
+        let mut deps = helpers::init_contract();
+        let info = mock_info("requester", &[]);
+        let owner = Addr::unchecked("owner");
+        let multisig_info = mock_info(MULTISIG_CONTRACT, &[]);
+
+        let ret = try_verify_verification_key_share(deps.as_mut(), info.clone(), owner.clone())
+            .unwrap_err();
+        assert_eq!(
+            ret,
+            ContractError::IncorrectEpochState {
+                current_state: EpochState::default().to_string(),
+                expected_state: EpochState::VerificationKeyFinalization.to_string()
+            }
+        );
+
+        advance_epoch_state(deps.as_mut(), mock_info(ADMIN_ADDRESS, &[])).unwrap();
+        advance_epoch_state(deps.as_mut(), mock_info(ADMIN_ADDRESS, &[])).unwrap();
+        advance_epoch_state(deps.as_mut(), mock_info(ADMIN_ADDRESS, &[])).unwrap();
+        advance_epoch_state(deps.as_mut(), mock_info(ADMIN_ADDRESS, &[])).unwrap();
+
+        let ret =
+            try_verify_verification_key_share(deps.as_mut(), info, owner.clone()).unwrap_err();
+        assert_eq!(ret, ContractError::Admin(AdminError::NotAdmin {}));
+
+        let ret = try_verify_verification_key_share(deps.as_mut(), multisig_info, owner.clone())
+            .unwrap_err();
+        assert_eq!(
+            ret,
+            ContractError::NoCommitForOwner {
+                owner: owner.to_string()
+            }
+        );
+    }
+
+    #[test]
+    fn verify_vk_share() {
+        let mut deps = helpers::init_contract();
+        let env = mock_env();
+        let owner = Addr::unchecked("owner");
+        let info = mock_info(owner.as_ref(), &[]);
+        let share = "share".to_string();
+        let multisig_info = mock_info(MULTISIG_CONTRACT, &[]);
+
+        advance_epoch_state(deps.as_mut(), mock_info(ADMIN_ADDRESS, &[])).unwrap();
+        advance_epoch_state(deps.as_mut(), mock_info(ADMIN_ADDRESS, &[])).unwrap();
+
+        let dealer_details = DealerDetails {
+            address: owner.clone(),
+            bte_public_key_with_proof: String::new(),
+            announce_address: String::new(),
+            assigned_index: 1,
+        };
+        dealers_storage::current_dealers()
+            .save(deps.as_mut().storage, &owner, &dealer_details)
+            .unwrap();
+        try_commit_verification_key_share(deps.as_mut(), env.clone(), info.clone(), share.clone())
+            .unwrap();
+
+        advance_epoch_state(deps.as_mut(), mock_info(ADMIN_ADDRESS, &[])).unwrap();
+        advance_epoch_state(deps.as_mut(), mock_info(ADMIN_ADDRESS, &[])).unwrap();
+
+        try_verify_verification_key_share(deps.as_mut(), multisig_info, owner.clone()).unwrap();
+    }
+}
@@ -13,6 +13,7 @@ multisig-contract-common = { path = "../../common/cosmwasm-smart-contracts/multi

 cosmwasm-std = "1.0.0"
 cosmwasm-storage = "1.0.0"
+cw3 = "0.13.4"
 cw4 = "0.13.4"
 cw-storage-plus = "0.13.4"
 cw-controllers = "0.13.4"
@@ -42,9 +42,9 @@ pub fn mock_app(init_funds: &[Coin]) -> App {
 }
 pub fn contract_dkg() -> Box<dyn Contract<Empty>> {
    let contract = ContractWrapper::new(
-        coconut_dkg::execute,
-        coconut_dkg::instantiate,
-        coconut_dkg::query,
+        coconut_dkg::contract::execute,
+        coconut_dkg::contract::instantiate,
+        coconut_dkg::contract::query,
    );
    Box::new(contract)
 }
@@ -11,15 +11,18 @@ use coconut_dkg_common::msg::ExecuteMsg::{
    AdvanceEpochState, CommitVerificationKeyShare, RegisterDealer,
 };
 use coconut_dkg_common::msg::InstantiateMsg as DkgInstantiateMsg;
+use coconut_dkg_common::msg::QueryMsg::GetVerificationKeys;
+use coconut_dkg_common::verification_key::PagedVKSharesResponse;
 use cosmwasm_std::{coins, Addr, Decimal};
 use cw4::Member;
 use cw4_group::msg::InstantiateMsg as GroupInstantiateMsg;
 use cw_multi_test::Executor;
 use cw_utils::{Duration, Threshold};
+use multisig_contract_common::msg::ExecuteMsg::{Execute, Vote};
 use multisig_contract_common::msg::InstantiateMsg as MultisigInstantiateMsg;

 #[test]
-fn dkg_create_proposal() {
+fn dkg_proposal() {
    let init_funds = coins(10000000000, TEST_COIN_DENOM);
    let mut app = mock_app(&init_funds);
    let member1 = Member {
@@ -47,7 +50,7 @@ fn dkg_create_proposal() {
    let msg = MultisigInstantiateMsg {
        group_addr: group_contract_addr.to_string(),
        threshold: Threshold::AbsolutePercentage {
-            percentage: Decimal::from_ratio(2u128, 3u128),
+            percentage: Decimal::from_ratio(1u128, 1u128),
        },
        max_voting_period: Duration::Time(1000),
        coconut_bandwidth_contract_address: TEST_COCONUT_BANDWIDTH_CONTRACT_ADDRESS.to_string(),
@@ -88,7 +91,7 @@ fn dkg_create_proposal() {
    };
    app.migrate_contract(
        Addr::unchecked(OWNER),
-        multisig_contract_addr,
+        multisig_contract_addr.clone(),
        &msg,
        multisig_code_id,
    )
@@ -115,6 +118,9 @@ fn dkg_create_proposal() {
        .unwrap();
    }

+    // Proposal needs to be later then the member became part of the group
+    app.update_block(|block| block.height += 1);
+
    let msg = CommitVerificationKeyShare {
        share: "share".to_string(),
    };
@@ -126,6 +132,7 @@ fn dkg_create_proposal() {
            &vec![],
        )
        .unwrap();
+
    let proposal_id = res
        .events
        .into_iter()
@@ -138,5 +145,62 @@ fn dkg_create_proposal() {
        .value
        .parse::<u64>()
        .unwrap();
-    assert_eq!(1, proposal_id);
+
+    let mut res: PagedVKSharesResponse = app
+        .wrap()
+        .query_wasm_smart(
+            coconut_dkg_contract_addr.clone(),
+            &GetVerificationKeys {
+                limit: None,
+                start_after: None,
+            },
+        )
+        .unwrap();
+    let share = res.shares.pop().unwrap();
+    assert_eq!(share.share, "share".to_string());
+    assert_eq!(share.announce_address, "127.0.0.1:8000".to_string());
+    assert_eq!(share.node_index, 1);
+    assert_eq!(share.owner, Addr::unchecked(MEMBER1));
+    assert!(!share.verified);
+
+    app.execute_contract(
+        Addr::unchecked(MEMBER1),
+        multisig_contract_addr.clone(),
+        &Vote {
+            proposal_id,
+            vote: cw3::Vote::Yes,
+        },
+        &vec![],
+    )
+    .unwrap();
+
+    for _ in 0..2 {
+        app.execute_contract(
+            Addr::unchecked(OWNER),
+            coconut_dkg_contract_addr.clone(),
+            &AdvanceEpochState {},
+            &vec![],
+        )
+        .unwrap();
+    }
+
+    app.execute_contract(
+        Addr::unchecked(MEMBER1),
+        multisig_contract_addr.clone(),
+        &Execute { proposal_id },
+        &vec![],
+    )
+    .unwrap();
+
+    let res: PagedVKSharesResponse = app
+        .wrap()
+        .query_wasm_smart(
+            coconut_dkg_contract_addr,
+            &GetVerificationKeys {
+                limit: None,
+                start_after: None,
+            },
+        )
+        .unwrap();
+    assert!(res.shares[0].verified);
 }
@@ -1,6 +1,6 @@
 [package]
 name = "mixnet-contract"
-version = "1.1.0"
+version = "1.1.2"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 edition = "2021"

@@ -35,6 +35,9 @@ pub const INTERVAL_EVENTS_MAX_RETRIEVAL_LIMIT: u32 = 250;
 pub const REWARDED_SET_DEFAULT_RETRIEVAL_LIMIT: u32 = 500;
 pub const REWARDED_SET_MAX_RETRIEVAL_LIMIT: u32 = 1000;

+pub const FAMILIES_DEFAULT_RETRIEVAL_LIMIT: u32 = 10;
+pub const FAMILIES_MAX_RETRIEVAL_LIMIT: u32 = 20;
+
 // storage keys
 pub(crate) const DELEGATION_PK_NAMESPACE: &str = "dl";
 pub(crate) const DELEGATION_OWNER_IDX_NAMESPACE: &str = "dlo";
@@ -69,3 +72,7 @@ pub(crate) const UNBONDED_MIXNODES_IDENTITY_IDX_NAMESPACE: &str = "umi";
 pub(crate) const REWARDING_PARAMS_KEY: &str = "rparams";
 pub(crate) const PENDING_REWARD_POOL_KEY: &str = "prp";
 pub(crate) const MIXNODES_REWARDING_PK_NAMESPACE: &str = "mnr";
+
+pub(crate) const FAMILIES_INDEX_NAMESPACE: &str = "faml2";
+pub(crate) const FAMILIES_MAP_NAMESPACE: &str = "fam2";
+pub(crate) const MEMBERS_MAP_NAMESPACE: &str = "memb2";
@@ -1,6 +1,5 @@
 // Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
-
 use crate::constants::{INITIAL_GATEWAY_PLEDGE_AMOUNT, INITIAL_MIXNODE_PLEDGE_AMOUNT};
 use crate::interval::storage as interval_storage;
 use crate::mixnet_contract_settings::storage as mixnet_params_storage;
@@ -82,6 +81,69 @@ pub fn execute(
    msg: ExecuteMsg,
 ) -> Result<Response, MixnetContractError> {
    match msg {
+        ExecuteMsg::AssignNodeLayer { mix_id, layer } => {
+            crate::mixnodes::transactions::assign_mixnode_layer(deps, info, mix_id, layer)
+        }
+        // families
+        ExecuteMsg::CreateFamily {
+            owner_signature,
+            label,
+        } => crate::families::transactions::try_create_family(deps, info, owner_signature, &label),
+        ExecuteMsg::JoinFamily {
+            signature,
+            family_head,
+        } => crate::families::transactions::try_join_family(deps, info, signature, family_head),
+        ExecuteMsg::LeaveFamily {
+            signature,
+            family_head,
+        } => crate::families::transactions::try_leave_family(deps, info, signature, family_head),
+        ExecuteMsg::KickFamilyMember { signature, member } => {
+            crate::families::transactions::try_head_kick_member(deps, info, signature, &member)
+        }
+        ExecuteMsg::CreateFamilyOnBehalf {
+            owner_address,
+            owner_signature,
+            label,
+        } => crate::families::transactions::try_create_family_on_behalf(
+            deps,
+            info,
+            owner_address,
+            owner_signature,
+            &label,
+        ),
+        ExecuteMsg::JoinFamilyOnBehalf {
+            member_address,
+            signature,
+            family_head,
+        } => crate::families::transactions::try_join_family_on_behalf(
+            deps,
+            info,
+            member_address,
+            signature,
+            family_head,
+        ),
+        ExecuteMsg::LeaveFamilyOnBehalf {
+            member_address,
+            signature,
+            family_head,
+        } => crate::families::transactions::try_leave_family_on_behalf(
+            deps,
+            info,
+            member_address,
+            signature,
+            family_head,
+        ),
+        ExecuteMsg::KickFamilyMemberOnBehalf {
+            head_address,
+            signature,
+            member,
+        } => crate::families::transactions::try_head_kick_member_on_behalf(
+            deps,
+            info,
+            head_address,
+            signature,
+            &member,
+        ),
        // state/sys-params-related
        ExecuteMsg::UpdateRewardingValidatorAddress { address } => {
            crate::mixnet_contract_settings::transactions::try_update_rewarding_validator_address(
@@ -129,6 +191,7 @@ pub fn execute(
        ),
        ExecuteMsg::AdvanceCurrentEpoch {
            new_rewarded_set,
+            // families_in_layer,
            expected_active_set_size,
        } => crate::interval::transactions::try_advance_epoch(
            deps,
@@ -168,6 +231,12 @@ pub fn execute(
            owner,
            owner_signature,
        ),
+        ExecuteMsg::PledgeMore {} => {
+            crate::mixnodes::transactions::try_increase_pledge(deps, env, info)
+        }
+        ExecuteMsg::PledgeMoreOnBehalf { owner } => {
+            crate::mixnodes::transactions::try_increase_pledge_on_behalf(deps, env, info, owner)
+        }
        ExecuteMsg::UnbondMixnode {} => {
            crate::mixnodes::transactions::try_remove_mixnode(deps, env, info)
        }
@@ -279,6 +348,24 @@ pub fn query(
    msg: QueryMsg,
 ) -> Result<QueryResponse, MixnetContractError> {
    let query_res = match msg {
+        QueryMsg::GetAllFamiliesPaged { limit, start_after } => to_binary(
+            &crate::families::queries::get_all_families_paged(deps.storage, start_after, limit)?,
+        ),
+        QueryMsg::GetAllMembersPaged { limit, start_after } => to_binary(
+            &crate::families::queries::get_all_members_paged(deps.storage, start_after, limit)?,
+        ),
+        QueryMsg::GetFamilyByHead { head } => to_binary(
+            &crate::families::queries::get_family_by_head(&head, deps.storage)?,
+        ),
+        QueryMsg::GetFamilyByLabel { label } => to_binary(
+            &crate::families::queries::get_family_by_label(&label, deps.storage)?,
+        ),
+        QueryMsg::GetFamilyMembersByHead { head } => to_binary(
+            &crate::families::queries::get_family_members_by_head(&head, deps.storage)?,
+        ),
+        QueryMsg::GetFamilyMembersByLabel { label } => to_binary(
+            &crate::families::queries::get_family_members_by_label(&label, deps.storage)?,
+        ),
        QueryMsg::GetContractVersion {} => {
            to_binary(&crate::mixnet_contract_settings::queries::query_contract_version())
        }
@@ -0,0 +1,3 @@
+pub mod queries;
+pub mod storage;
+pub mod transactions;
@@ -0,0 +1,107 @@
+use std::collections::HashSet;
+
+use crate::constants::{FAMILIES_DEFAULT_RETRIEVAL_LIMIT, FAMILIES_MAX_RETRIEVAL_LIMIT};
+
+use super::storage::{families, get_family, get_members, MEMBERS};
+use cosmwasm_std::{Order, Storage};
+use cw_storage_plus::Bound;
+use mixnet_contract_common::families::{Family, FamilyHead};
+use mixnet_contract_common::{error::MixnetContractError, IdentityKeyRef};
+use mixnet_contract_common::{IdentityKey, PagedFamiliesResponse, PagedMembersResponse};
+
+pub fn get_family_by_label(
+    label: &str,
+    storage: &dyn Storage,
+) -> Result<Option<Family>, MixnetContractError> {
+    Ok(families()
+        .idx
+        .label
+        .item(storage, label.to_string())?
+        .map(|o| o.1))
+}
+
+pub fn get_family_by_head(
+    head: IdentityKeyRef<'_>,
+    storage: &dyn Storage,
+) -> Result<Family, MixnetContractError> {
+    let family_head = FamilyHead::new(head);
+    get_family(&family_head, storage)
+}
+
+pub fn get_family_members_by_head(
+    head: IdentityKeyRef<'_>,
+    storage: &dyn Storage,
+) -> Result<HashSet<String>, MixnetContractError> {
+    let family_head = FamilyHead::new(head);
+    let family = get_family(&family_head, storage)?;
+    get_members(&family, storage)
+}
+
+pub fn get_family_members_by_label(
+    label: &str,
+    storage: &dyn Storage,
+) -> Result<Option<HashSet<String>>, MixnetContractError> {
+    if let Some(family) = families()
+        .idx
+        .label
+        .item(storage, label.to_string())?
+        .map(|o| o.1)
+    {
+        Ok(Some(get_members(&family, storage)?))
+    } else {
+        Ok(None)
+    }
+}
+
+pub fn get_all_families_paged(
+    storage: &dyn Storage,
+    start_after: Option<String>,
+    limit: Option<u32>,
+) -> Result<PagedFamiliesResponse, MixnetContractError> {
+    let limit = limit
+        .unwrap_or(FAMILIES_DEFAULT_RETRIEVAL_LIMIT)
+        .min(FAMILIES_MAX_RETRIEVAL_LIMIT) as usize;
+
+    let start = start_after.map(Bound::exclusive);
+
+    let response = families()
+        .range(storage, start, None, Order::Ascending)
+        .take(limit)
+        .filter_map(|r| r.ok())
+        .map(|(_key, family)| family)
+        .collect::<Vec<Family>>();
+
+    let start_next_after = response
+        .last()
+        .map(|response| response.head_identity().to_string());
+
+    Ok(PagedFamiliesResponse {
+        families: response,
+        start_next_after,
+    })
+}
+
+pub fn get_all_members_paged(
+    storage: &dyn Storage,
+    start_after: Option<String>,
+    limit: Option<u32>,
+) -> Result<PagedMembersResponse, MixnetContractError> {
+    let limit = limit
+        .unwrap_or(FAMILIES_DEFAULT_RETRIEVAL_LIMIT)
+        .min(FAMILIES_MAX_RETRIEVAL_LIMIT) as usize;
+
+    let start = start_after.map(Bound::exclusive);
+
+    let response = MEMBERS
+        .range(storage, start, None, Order::Ascending)
+        .take(limit)
+        .filter_map(|r| r.ok())
+        .collect::<Vec<(IdentityKey, FamilyHead)>>();
+
+    let start_next_after = response.last().map(|r| r.0.clone());
+
+    Ok(PagedMembersResponse {
+        members: response,
+        start_next_after,
+    })
+}
@@ -0,0 +1,99 @@
+use std::collections::HashSet;
+
+use cosmwasm_std::{Order, StdError, Storage};
+use cw_storage_plus::{Index, IndexList, IndexedMap, Map, UniqueIndex};
+use mixnet_contract_common::families::{Family, FamilyHead};
+use mixnet_contract_common::{error::MixnetContractError, IdentityKey, IdentityKeyRef};
+
+use crate::constants::{FAMILIES_INDEX_NAMESPACE, FAMILIES_MAP_NAMESPACE, MEMBERS_MAP_NAMESPACE};
+
+pub struct FamilyIndex<'a> {
+    pub label: UniqueIndex<'a, String, Family>,
+}
+
+impl<'a> IndexList<Family> for FamilyIndex<'a> {
+    fn get_indexes(&'_ self) -> Box<dyn Iterator<Item = &'_ dyn Index<Family>> + '_> {
+        let v: Vec<&dyn Index<Family>> = vec![&self.label];
+        Box::new(v.into_iter())
+    }
+}
+
+// storage access function.
+pub fn families<'a>() -> IndexedMap<'a, String, Family, FamilyIndex<'a>> {
+    let indexes = FamilyIndex {
+        label: UniqueIndex::new(|d| d.label().to_string(), FAMILIES_INDEX_NAMESPACE),
+    };
+    IndexedMap::new(FAMILIES_MAP_NAMESPACE, indexes)
+}
+
+pub const MEMBERS: Map<IdentityKey, FamilyHead> = Map::new(MEMBERS_MAP_NAMESPACE);
+
+pub fn get_members(
+    family: &Family,
+    store: &dyn Storage,
+) -> Result<HashSet<IdentityKey>, MixnetContractError> {
+    Ok(MEMBERS
+        .range(store, None, None, Order::Ascending)
+        .filter_map(|res| res.ok())
+        .filter(|(_member, head)| head == family.head())
+        .map(|(member, _storage_key)| member)
+        .collect())
+}
+
+pub fn get_family(head: &FamilyHead, store: &dyn Storage) -> Result<Family, MixnetContractError> {
+    let key = head.identity();
+    if let Some(family) = families().may_load(store, key.to_string())? {
+        Ok(family)
+    } else {
+        Err(MixnetContractError::FamilyDoesNotExist {
+            head: head.identity().to_string(),
+        })
+    }
+}
+
+pub fn create_family(f: &Family, store: &mut dyn Storage) -> Result<(), MixnetContractError> {
+    match families().save(store, f.head_identity().to_string(), f) {
+        Ok(()) => Ok(()),
+        Err(e) => match &e {
+            StdError::GenericErr { msg } => {
+                if msg.starts_with("Violates unique constraint") {
+                    Err(MixnetContractError::FamilyWithLabelExists(
+                        f.label().to_string(),
+                    ))
+                } else {
+                    Err(e.into())
+                }
+            }
+            _ => Err(e.into()),
+        },
+    }
+}
+
+pub fn add_family_member(
+    f: &Family,
+    store: &mut dyn Storage,
+    member: IdentityKeyRef<'_>,
+) -> Result<(), MixnetContractError> {
+    Ok(MEMBERS.save(store, member.to_string(), f.head())?)
+}
+
+pub fn remove_family_member(store: &mut dyn Storage, member: IdentityKeyRef<'_>) {
+    MEMBERS.remove(store, member.to_string())
+}
+
+#[allow(dead_code)]
+pub fn is_family_member(
+    store: &dyn Storage,
+    f: &Family,
+    member: IdentityKeyRef<'_>,
+) -> Result<bool, MixnetContractError> {
+    let m = get_members(f, store)?;
+    Ok(m.contains(member))
+}
+
+pub fn is_any_member(
+    store: &dyn Storage,
+    member: IdentityKeyRef<'_>,
+) -> Result<Option<FamilyHead>, MixnetContractError> {
+    Ok(MEMBERS.may_load(store, member.to_string())?)
+}
@@ -0,0 +1,414 @@
+use crate::support::helpers::{
+    ensure_bonded, validate_family_signature, validate_node_identity_signature,
+};
+
+use cosmwasm_std::{Addr, DepsMut, MessageInfo, Response};
+use mixnet_contract_common::families::{Family, FamilyHead};
+use mixnet_contract_common::{error::MixnetContractError, IdentityKey, IdentityKeyRef};
+
+use super::storage::{
+    add_family_member, create_family, get_family, is_any_member, is_family_member,
+    remove_family_member,
+};
+
+/// Creates a new MixNode family with senders node as head
+pub fn try_create_family(
+    deps: DepsMut,
+    info: MessageInfo,
+    owner_signature: String,
+    label: &str,
+) -> Result<Response, MixnetContractError> {
+    _try_create_family(deps, &info.sender, owner_signature, label, None)
+}
+
+pub fn try_create_family_on_behalf(
+    deps: DepsMut,
+    info: MessageInfo,
+    owner_address: String,
+    owner_signature: String,
+    label: &str,
+) -> Result<Response, MixnetContractError> {
+    let owner_address = deps.api.addr_validate(&owner_address)?;
+    _try_create_family(
+        deps,
+        &owner_address,
+        owner_signature,
+        label,
+        Some(info.sender),
+    )
+}
+
+fn _try_create_family(
+    deps: DepsMut,
+    owner: &Addr,
+    owner_signature: String,
+    label: &str,
+    proxy: Option<Addr>,
+) -> Result<Response, MixnetContractError> {
+    let existing_bond = crate::mixnodes::storage::mixnode_bonds()
+        .idx
+        .owner
+        .item(deps.storage, owner.clone())?
+        .ok_or(MixnetContractError::NoAssociatedMixNodeBond {
+            owner: owner.clone(),
+        })?
+        .1;
+
+    ensure_bonded(&existing_bond)?;
+
+    validate_node_identity_signature(
+        deps.as_ref(),
+        owner,
+        &owner_signature,
+        existing_bond.identity(),
+    )?;
+
+    let family_head = FamilyHead::new(existing_bond.identity());
+
+    if let Ok(_family) = get_family(&family_head, deps.storage) {
+        return Err(MixnetContractError::FamilyCanHaveOnlyOne);
+    }
+
+    let family = Family::new(family_head, proxy, label);
+    create_family(&family, deps.storage)?;
+    Ok(Response::default())
+}
+
+pub fn try_join_family(
+    deps: DepsMut,
+    info: MessageInfo,
+    signature: String,
+    family_head: IdentityKey,
+) -> Result<Response, MixnetContractError> {
+    let family_head = FamilyHead::new(&family_head);
+    _try_join_family(deps, &info.sender, signature, family_head)
+}
+
+pub fn try_join_family_on_behalf(
+    deps: DepsMut,
+    _info: MessageInfo,
+    member_address: String,
+    signature: String,
+    family_head: IdentityKey,
+) -> Result<Response, MixnetContractError> {
+    let member_address = deps.api.addr_validate(&member_address)?;
+    let family_head = FamilyHead::new(&family_head);
+    _try_join_family(deps, &member_address, signature, family_head)
+}
+
+fn _try_join_family(
+    deps: DepsMut,
+    owner: &Addr,
+    signature: String,
+    family_head: FamilyHead,
+) -> Result<Response, MixnetContractError> {
+    let existing_bond = crate::mixnodes::storage::mixnode_bonds()
+        .idx
+        .owner
+        .item(deps.storage, owner.clone())?
+        .ok_or(MixnetContractError::NoAssociatedMixNodeBond {
+            owner: owner.clone(),
+        })?
+        .1;
+
+    ensure_bonded(&existing_bond)?;
+
+    if family_head.identity() == existing_bond.identity() {
+        return Err(MixnetContractError::CantJoinOwnFamily {
+            head: family_head.identity().to_string(),
+            member: existing_bond.identity().to_string(),
+        });
+    }
+
+    if let Some(family) = is_any_member(deps.storage, existing_bond.identity())? {
+        return Err(MixnetContractError::AlreadyMemberOfFamily(
+            family.identity().to_string(),
+        ));
+    }
+
+    validate_family_signature(
+        deps.as_ref(),
+        existing_bond.identity(),
+        &signature,
+        family_head.identity(),
+    )?;
+
+    let family = get_family(&family_head, deps.storage)?;
+
+    add_family_member(&family, deps.storage, existing_bond.identity())?;
+
+    Ok(Response::default())
+}
+
+pub fn try_leave_family(
+    deps: DepsMut,
+    info: MessageInfo,
+    signature: String,
+    family_head: IdentityKey,
+) -> Result<Response, MixnetContractError> {
+    let family_head = FamilyHead::new(&family_head);
+    _try_leave_family(deps, &info.sender, signature, family_head)
+}
+
+pub fn try_leave_family_on_behalf(
+    deps: DepsMut,
+    _info: MessageInfo,
+    member_address: String,
+    signature: String,
+    family_head: IdentityKey,
+) -> Result<Response, MixnetContractError> {
+    let family_head = FamilyHead::new(&family_head);
+    let member_address = deps.api.addr_validate(&member_address)?;
+    _try_leave_family(deps, &member_address, signature, family_head)
+}
+
+fn _try_leave_family(
+    deps: DepsMut,
+    owner: &Addr,
+    signature: String,
+    family_head: FamilyHead,
+) -> Result<Response, MixnetContractError> {
+    let existing_bond = crate::mixnodes::storage::mixnode_bonds()
+        .idx
+        .owner
+        .item(deps.storage, owner.clone())?
+        .ok_or(MixnetContractError::NoAssociatedMixNodeBond {
+            owner: owner.clone(),
+        })?
+        .1;
+
+    ensure_bonded(&existing_bond)?;
+
+    if family_head.identity() == existing_bond.identity() {
+        return Err(MixnetContractError::CantLeaveOwnFamily {
+            head: family_head.identity().to_string(),
+            member: existing_bond.identity().to_string(),
+        });
+    }
+
+    let family = get_family(&family_head, deps.storage)?;
+    if !is_family_member(deps.storage, &family, existing_bond.identity())? {
+        return Err(MixnetContractError::NotAMember {
+            head: family_head.identity().to_string(),
+            member: existing_bond.identity().to_string(),
+        });
+    }
+
+    validate_family_signature(
+        deps.as_ref(),
+        existing_bond.identity(),
+        &signature,
+        family_head.identity(),
+    )?;
+
+    remove_family_member(deps.storage, existing_bond.identity());
+
+    Ok(Response::default())
+}
+
+pub fn try_head_kick_member(
+    deps: DepsMut,
+    info: MessageInfo,
+    owner_signature: String,
+    member: IdentityKeyRef,
+) -> Result<Response, MixnetContractError> {
+    _try_head_kick_member(deps, &info.sender, owner_signature, member)
+}
+
+pub fn try_head_kick_member_on_behalf(
+    deps: DepsMut,
+    _info: MessageInfo,
+    head_address: String,
+    owner_signature: String,
+    member: IdentityKeyRef,
+) -> Result<Response, MixnetContractError> {
+    let head_address = deps.api.addr_validate(&head_address)?;
+    _try_head_kick_member(deps, &head_address, owner_signature, member)
+}
+
+#[allow(unused_variables)]
+fn _try_head_kick_member(
+    deps: DepsMut,
+    owner: &Addr,
+    owner_signature: String,
+    member: IdentityKeyRef<'_>,
+) -> Result<Response, MixnetContractError> {
+    Err(MixnetContractError::NotImplemented)
+    // let existing_bond = crate::mixnodes::storage::mixnode_bonds()
+    //     .idx
+    //     .owner
+    //     .item(deps.storage, owner.clone())?
+    //     .ok_or(MixnetContractError::NoAssociatedMixNodeBond {
+    //         owner: owner.clone(),
+    //     })?
+    //     .1;
+
+    // ensure_bonded(&existing_bond)?;
+
+    // validate_node_identity_signature(
+    //     deps.as_ref(),
+    //     owner,
+    //     &owner_signature,
+    //     existing_bond.identity(),
+    // )?;
+
+    // let family_head = FamilyHead::new(existing_bond.identity());
+    // let family = get_family(&family_head, deps.storage)?;
+    // if !is_family_member(deps.storage, &family, member)? {
+    //     return Err(MixnetContractError::NotAMember {
+    //         head: family_head.identity().to_string(),
+    //         member: existing_bond.identity().to_string(),
+    //     });
+    // }
+
+    // remove_family_member(deps.storage, member);
+    // Ok(Response::default())
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::families::queries::{get_family_by_head, get_family_by_label};
+    use crate::families::storage::is_family_member;
+    use crate::mixnet_contract_settings::storage::minimum_mixnode_pledge;
+    use crate::support::tests::{fixtures, test_helpers};
+    use cosmwasm_std::testing::{mock_env, mock_info};
+
+    #[test]
+    fn test_family_crud() {
+        let mut deps = test_helpers::init_contract();
+        let env = mock_env();
+        let mut rng = test_helpers::test_rng();
+
+        let head = "alice";
+        let malicious_head = "timmy";
+
+        let minimum_pledge = minimum_mixnode_pledge(deps.as_ref().storage).unwrap();
+
+        let (head_mixnode, head_sig, head_keypair) =
+            test_helpers::mixnode_with_signature(&mut rng, head);
+
+        let (malicious_mixnode, malicious_sig, _malicious_keypair) =
+            test_helpers::mixnode_with_signature(&mut rng, malicious_head);
+
+        let cost_params = fixtures::mix_node_cost_params_fixture();
+
+        let member = "bob";
+        let (member_mixnode, member_sig, _) =
+            test_helpers::mixnode_with_signature(&mut rng, member);
+
+        // we are informed that we didn't send enough funds
+        crate::mixnodes::transactions::try_add_mixnode(
+            deps.as_mut(),
+            env.clone(),
+            mock_info(head, &[minimum_pledge.clone()]),
+            head_mixnode.clone(),
+            cost_params.clone(),
+            head_sig.clone(),
+        )
+        .unwrap();
+
+        crate::mixnodes::transactions::try_add_mixnode(
+            deps.as_mut(),
+            env.clone(),
+            mock_info(malicious_head, &[minimum_pledge.clone()]),
+            malicious_mixnode.clone(),
+            cost_params.clone(),
+            malicious_sig.clone(),
+        )
+        .unwrap();
+
+        crate::mixnodes::transactions::try_add_mixnode(
+            deps.as_mut(),
+            env.clone(),
+            mock_info(member, &[minimum_pledge.clone()]),
+            member_mixnode.clone(),
+            cost_params.clone(),
+            member_sig.clone(),
+        )
+        .unwrap();
+
+        try_create_family(
+            deps.as_mut(),
+            mock_info(head.clone(), &[]),
+            head_sig.clone(),
+            "test",
+        )
+        .unwrap();
+        let family_head = FamilyHead::new(&head_mixnode.identity_key);
+        assert!(get_family(&family_head, &deps.storage).is_ok());
+
+        let nope = try_create_family(
+            deps.as_mut(),
+            mock_info(malicious_head.clone(), &[]),
+            malicious_sig.clone(),
+            "test",
+        );
+
+        match nope {
+            Ok(_) => panic!("This should fail, since family with label already exists"),
+            Err(e) => match e {
+                MixnetContractError::FamilyWithLabelExists(label) => assert_eq!(label, "test"),
+                _ => panic!("This should return FamilyWithLabelExists"),
+            },
+        }
+
+        let family = get_family_by_label("test", &deps.storage).unwrap();
+        assert!(family.is_some());
+        assert_eq!(family.unwrap().head_identity(), family_head.identity());
+
+        let family = get_family_by_head(family_head.identity(), &deps.storage).unwrap();
+        assert_eq!(family.head_identity(), family_head.identity());
+
+        let join_signature = head_keypair
+            .private_key()
+            .sign(member_mixnode.identity_key.as_bytes())
+            .to_base58_string();
+
+        try_join_family(
+            deps.as_mut(),
+            mock_info(member, &[]),
+            join_signature.clone(),
+            head_mixnode.identity_key.clone(),
+        )
+        .unwrap();
+
+        let family = get_family(&family_head, &deps.storage).unwrap();
+
+        assert!(is_family_member(&deps.storage, &family, &member_mixnode.identity_key).unwrap());
+
+        try_leave_family(
+            deps.as_mut(),
+            mock_info(member, &[]),
+            join_signature.clone(),
+            head_mixnode.identity_key.clone(),
+        )
+        .unwrap();
+
+        let family = get_family(&family_head, &deps.storage).unwrap();
+        assert!(!is_family_member(&deps.storage, &family, &member_mixnode.identity_key).unwrap());
+
+        try_join_family(
+            deps.as_mut(),
+            mock_info(member, &[]),
+            join_signature.clone(),
+            head_mixnode.identity_key.clone(),
+        )
+        .unwrap();
+
+        let family = get_family(&family_head, &deps.storage).unwrap();
+
+        assert!(is_family_member(&deps.storage, &family, &member_mixnode.identity_key).unwrap());
+
+        // try_head_kick_member(
+        //     deps.as_mut(),
+        //     mock_info(&head, &[]),
+        //     head_sig.clone(),
+        //     &member_mixnode.identity_key.clone(),
+        // )
+        // .unwrap();
+
+        // let family = get_family(&family_head, &deps.storage).unwrap();
+        // assert!(!is_family_member(&deps.storage, &family, &member_mixnode.identity_key).unwrap());
+    }
+}
@@ -82,7 +82,7 @@ pub(crate) fn _try_add_gateway(
    validate_node_identity_signature(
        deps.as_ref(),
        &owner,
-        owner_signature,
+        &owner_signature,
        &gateway.identity_key,
    )?;

@@ -7,13 +7,14 @@ use crate::interval::helpers::change_interval_config;
 use crate::interval::storage;
 use crate::mixnet_contract_settings::storage as mixnet_params_storage;
 use crate::mixnodes::helpers::{cleanup_post_unbond_mixnode_storage, get_mixnode_details_by_id};
+use crate::mixnodes::storage as mixnodes_storage;
 use crate::rewards::storage as rewards_storage;
 use crate::support::helpers::send_to_proxy_or_owner;
 use cosmwasm_std::{wasm_execute, Addr, Coin, DepsMut, Env, Response};
 use mixnet_contract_common::error::MixnetContractError;
 use mixnet_contract_common::events::{
    new_active_set_update_event, new_delegation_event, new_delegation_on_unbonded_node_event,
-    new_mixnode_cost_params_update_event, new_mixnode_unbonding_event,
+    new_mixnode_cost_params_update_event, new_mixnode_unbonding_event, new_pledge_increase_event,
    new_rewarding_params_update_event, new_undelegation_event,
 };
 use mixnet_contract_common::mixnode::MixNodeCostParams;
@@ -258,6 +259,42 @@ pub(crate) fn update_active_set_size(
    Ok(Response::new().add_event(new_active_set_update_event(created_at, active_set_size)))
 }

+pub(crate) fn increase_pledge(
+    deps: DepsMut<'_>,
+    created_at: BlockHeight,
+    mix_id: MixId,
+    increase: Coin,
+) -> Result<Response, MixnetContractError> {
+    // note: we have already validated the amount to know it has the correct denomination
+
+    // the target node MUST exist - we have checked it at the time of putting this event onto the queue
+    // we have also verified there were no preceding unbond events
+    let mix_details = get_mixnode_details_by_id(deps.storage, mix_id)?.ok_or(
+        MixnetContractError::InconsistentState {
+            comment:
+                "mixnode getting processed to increase its pledge doesn't exist in the storage"
+                    .into(),
+        },
+    )?;
+
+    let mut updated_bond = mix_details.bond_information.clone();
+    let mut updated_rewarding = mix_details.rewarding_details;
+
+    updated_bond.original_pledge.amount += increase.amount;
+    updated_rewarding.increase_operator_uint128(increase.amount)?;
+
+    // update both, bond information and rewarding details
+    mixnodes_storage::mixnode_bonds().replace(
+        deps.storage,
+        mix_id,
+        Some(&updated_bond),
+        Some(&mix_details.bond_information),
+    )?;
+    rewards_storage::MIXNODE_REWARDING.save(deps.storage, mix_id, &updated_rewarding)?;
+
+    Ok(Response::new().add_event(new_pledge_increase_event(created_at, mix_id, &increase)))
+}
+
 impl ContractExecutableEvent for PendingEpochEventData {
    fn execute(self, deps: DepsMut<'_>, env: &Env) -> Result<Response, MixnetContractError> {
        // note that the basic validation on all those events was already performed before
@@ -274,6 +311,9 @@ impl ContractExecutableEvent for PendingEpochEventData {
                mix_id,
                proxy,
            } => undelegate(deps, self.created_at, owner, mix_id, proxy),
+            PendingEpochEventKind::PledgeMore { mix_id, amount } => {
+                increase_pledge(deps, self.created_at, mix_id, amount)
+            }
            PendingEpochEventKind::UnbondMixnode { mix_id } => {
                unbond_mixnode(deps, env, self.created_at, mix_id)
            }
@@ -1135,6 +1175,228 @@ mod tests {
        }
    }

+    #[cfg(test)]
+    mod increasing_pledge {
+        use super::*;
+        use cosmwasm_std::Uint128;
+        use mixnet_contract_common::rewarding::helpers::truncate_reward_amount;
+
+        #[test]
+        fn returns_hard_error_if_mixnode_doesnt_exist() {
+            // this should have never happened so hard error MUST be thrown here
+            let mut test = TestSetup::new();
+
+            let amount = test.coin(123);
+            let res = increase_pledge(test.deps_mut(), 123, 1, amount);
+            assert!(matches!(
+                res,
+                Err(MixnetContractError::InconsistentState { .. })
+            ));
+        }
+
+        #[test]
+        fn updates_stored_bond_information_and_rewarding_details() {
+            let mut test = TestSetup::new();
+            let mix_id = test.add_dummy_mixnode("mix-owner", None);
+
+            let old_details = get_mixnode_details_by_id(test.deps().storage, mix_id)
+                .unwrap()
+                .unwrap();
+
+            let amount = test.coin(12345);
+            increase_pledge(test.deps_mut(), 123, mix_id, amount.clone()).unwrap();
+
+            let updated_details = get_mixnode_details_by_id(test.deps().storage, mix_id)
+                .unwrap()
+                .unwrap();
+
+            assert_eq!(
+                updated_details.bond_information.original_pledge.amount,
+                old_details.bond_information.original_pledge.amount + amount.amount
+            );
+
+            assert_eq!(
+                updated_details.rewarding_details.operator,
+                old_details.rewarding_details.operator
+                    + Decimal::from_atomics(amount.amount, 0).unwrap()
+            );
+        }
+
+        #[test]
+        fn without_any_events_in_between_is_equivalent_to_pledging_the_same_amount_immediately() {
+            let mut test = TestSetup::new();
+            let pledge1 = Uint128::new(150_000_000);
+            let pledge2 = Uint128::new(50_000_000);
+            let pledge3 = Uint128::new(200_000_000);
+
+            let mix_id_repledge = test.add_dummy_mixnode("mix-owner1", Some(pledge1));
+            let increase = test.coin(pledge2.u128());
+            increase_pledge(test.deps_mut(), 123, mix_id_repledge, increase).unwrap();
+
+            let mix_id_full_pledge = test.add_dummy_mixnode("mix-owner2", Some(pledge3));
+
+            test.add_immediate_delegation("alice", 123_456_789u128, mix_id_repledge);
+            test.add_immediate_delegation("bob", 500_000_000u128, mix_id_repledge);
+            test.add_immediate_delegation("carol", 111_111_111u128, mix_id_repledge);
+
+            test.add_immediate_delegation("alice", 123_456_789u128, mix_id_full_pledge);
+            test.add_immediate_delegation("bob", 500_000_000u128, mix_id_full_pledge);
+            test.add_immediate_delegation("carol", 111_111_111u128, mix_id_full_pledge);
+
+            test.skip_to_next_epoch_end();
+            test.update_rewarded_set(vec![mix_id_repledge, mix_id_full_pledge]);
+
+            let dist1 =
+                test.reward_with_distribution(mix_id_repledge, test_helpers::performance(100.0));
+            let dist2 =
+                test.reward_with_distribution(mix_id_full_pledge, test_helpers::performance(100.0));
+
+            assert_eq!(dist1, dist2)
+        }
+
+        #[test]
+        fn correctly_increases_future_rewards() {
+            let mut test = TestSetup::new();
+            let pledge1 = Uint128::new(150_000_000_000);
+            let pledge2 = Uint128::new(50_000_000_000);
+
+            let mix_id_repledge = test.add_dummy_mixnode("mix-owner1", Some(pledge1));
+
+            test.add_immediate_delegation("alice", 123_456_789_000u128, mix_id_repledge);
+            test.add_immediate_delegation("bob", 500_000_000_000u128, mix_id_repledge);
+            test.add_immediate_delegation("carol", 111_111_111_000u128, mix_id_repledge);
+
+            test.skip_to_next_epoch_end();
+            test.update_rewarded_set(vec![mix_id_repledge]);
+
+            let dist =
+                test.reward_with_distribution(mix_id_repledge, test_helpers::performance(100.0));
+
+            let increase = test.coin(pledge2.u128());
+            increase_pledge(test.deps_mut(), 123, mix_id_repledge, increase).unwrap();
+
+            let pledge3 = Uint128::new(200_000_000_000) + truncate_reward_amount(dist.operator);
+            let mix_id_full_pledge = test.add_dummy_mixnode("mix-owner2", Some(pledge3));
+
+            test.add_immediate_delegation("alice", 123_456_789_000u128, mix_id_full_pledge);
+            test.add_immediate_delegation("bob", 500_000_000_000u128, mix_id_full_pledge);
+            test.add_immediate_delegation("carol", 111_111_111_000u128, mix_id_full_pledge);
+
+            let lost_operator = dist.operator
+                - Decimal::from_atomics(truncate_reward_amount(dist.operator), 0).unwrap();
+            let lost_delegates = dist.delegates
+                - Decimal::from_atomics(truncate_reward_amount(dist.delegates), 0).unwrap();
+
+            // add the tiny bit of lost precision manually
+            let mut mix_rewarding_full = test.mix_rewarding(mix_id_full_pledge);
+            mix_rewarding_full.delegates += lost_delegates;
+            mix_rewarding_full.operator += lost_operator;
+            rewards_storage::MIXNODE_REWARDING
+                .save(
+                    test.deps_mut().storage,
+                    mix_id_full_pledge,
+                    &mix_rewarding_full,
+                )
+                .unwrap();
+
+            test.add_immediate_delegation(
+                "dave",
+                truncate_reward_amount(dist.delegates).u128(),
+                mix_id_full_pledge,
+            );
+
+            test.skip_to_next_epoch_end();
+            test.update_rewarded_set(vec![mix_id_repledge, mix_id_full_pledge]);
+
+            // go through few epochs of rewarding
+            for _ in 0..500 {
+                test.skip_to_next_epoch_end();
+                let dist1 = test
+                    .reward_with_distribution(mix_id_repledge, test_helpers::performance(100.0));
+                let dist2 = test
+                    .reward_with_distribution(mix_id_full_pledge, test_helpers::performance(100.0));
+
+                assert_eq!(dist1, dist2)
+            }
+        }
+
+        #[test]
+        fn correctly_increases_future_rewards_with_more_passed_epochs() {
+            let mut test = TestSetup::new();
+            let pledge1 = Uint128::new(150_000_000_000);
+            let pledge2 = Uint128::new(50_000_000_000);
+
+            let mix_id_repledge = test.add_dummy_mixnode("mix-owner1", Some(pledge1));
+
+            test.add_immediate_delegation("alice", 123_456_789_000u128, mix_id_repledge);
+            test.add_immediate_delegation("bob", 500_000_000_000u128, mix_id_repledge);
+            test.add_immediate_delegation("carol", 111_111_111_000u128, mix_id_repledge);
+
+            test.skip_to_next_epoch_end();
+            test.update_rewarded_set(vec![mix_id_repledge]);
+
+            let mut cumulative_op_reward = Decimal::zero();
+            let mut cumulative_del_reward = Decimal::zero();
+
+            // go few epochs of rewarding before adding more pledge
+            for _ in 0..500 {
+                test.skip_to_next_epoch_end();
+                let dist = test
+                    .reward_with_distribution(mix_id_repledge, test_helpers::performance(100.0));
+                cumulative_op_reward += dist.operator;
+                cumulative_del_reward += dist.delegates;
+            }
+
+            let increase = test.coin(pledge2.u128());
+            increase_pledge(test.deps_mut(), 123, mix_id_repledge, increase).unwrap();
+
+            let pledge3 =
+                Uint128::new(200_000_000_000) + truncate_reward_amount(cumulative_op_reward);
+            let mix_id_full_pledge = test.add_dummy_mixnode("mix-owner2", Some(pledge3));
+
+            test.add_immediate_delegation("alice", 123_456_789_000u128, mix_id_full_pledge);
+            test.add_immediate_delegation("bob", 500_000_000_000u128, mix_id_full_pledge);
+            test.add_immediate_delegation("carol", 111_111_111_000u128, mix_id_full_pledge);
+
+            let lost_operator = cumulative_op_reward
+                - Decimal::from_atomics(truncate_reward_amount(cumulative_op_reward), 0).unwrap();
+            let lost_delegates = cumulative_del_reward
+                - Decimal::from_atomics(truncate_reward_amount(cumulative_del_reward), 0).unwrap();
+
+            // add the tiny bit of lost precision manually
+            let mut mix_rewarding_full = test.mix_rewarding(mix_id_full_pledge);
+            mix_rewarding_full.delegates += lost_delegates;
+            mix_rewarding_full.operator += lost_operator;
+            rewards_storage::MIXNODE_REWARDING
+                .save(
+                    test.deps_mut().storage,
+                    mix_id_full_pledge,
+                    &mix_rewarding_full,
+                )
+                .unwrap();
+
+            test.add_immediate_delegation(
+                "dave",
+                truncate_reward_amount(cumulative_del_reward).u128(),
+                mix_id_full_pledge,
+            );
+
+            test.skip_to_next_epoch_end();
+            test.update_rewarded_set(vec![mix_id_repledge, mix_id_full_pledge]);
+
+            // go through few more epochs of rewarding
+            for _ in 0..500 {
+                test.skip_to_next_epoch_end();
+                let dist1 = test
+                    .reward_with_distribution(mix_id_repledge, test_helpers::performance(100.0));
+                let dist2 = test
+                    .reward_with_distribution(mix_id_full_pledge, test_helpers::performance(100.0));
+
+                assert_eq!(dist1, dist2)
+            }
+        }
+    }
+
    #[test]
    fn updating_active_set_updates_rewarding_params() {
        let mut test = TestSetup::new();
@@ -5,6 +5,7 @@ use super::storage;
 use crate::interval::helpers::change_interval_config;
 use crate::interval::pending_events::ContractExecutableEvent;
 use crate::interval::storage::push_new_interval_event;
+use crate::mixnodes::transactions::update_mixnode_layer;
 use crate::rewards;
 use crate::rewards::storage as rewards_storage;
 use crate::support::helpers::{ensure_is_authorized, ensure_is_owner};
@@ -16,7 +17,7 @@ use mixnet_contract_common::events::{
    new_reconcile_pending_events,
 };
 use mixnet_contract_common::pending_events::PendingIntervalEventKind;
-use mixnet_contract_common::MixId;
+use mixnet_contract_common::{LayerAssignment, MixId};
 use std::collections::BTreeSet;

 // those two should be called in separate tx (from advancing epoch),
@@ -202,7 +203,7 @@ pub fn try_advance_epoch(
    mut deps: DepsMut<'_>,
    env: Env,
    info: MessageInfo,
-    new_rewarded_set: Vec<MixId>,
+    layer_assignments: Vec<LayerAssignment>,
    expected_active_set_size: u32,
 ) -> Result<Response, MixnetContractError> {
    // Only rewarding validator can attempt to advance epoch
@@ -247,12 +248,18 @@ pub fn try_advance_epoch(
    }

    let updated_interval = current_interval.advance_epoch();
-    let num_nodes = new_rewarded_set.len();
+    let num_nodes = layer_assignments.len();
+
+    let new_rewarded_set = layer_assignments.iter().map(|l| l.mix_id()).collect();

    // finally save updated interval and the rewarded set
    storage::save_interval(deps.storage, &updated_interval)?;
    update_rewarded_set(deps.storage, new_rewarded_set, expected_active_set_size)?;

+    for a in layer_assignments {
+        update_mixnode_layer(a.mix_id(), a.layer(), deps.storage)?;
+    }
+
    Ok(response.add_event(new_advance_epoch_event(updated_interval, num_nodes as u32)))
 }

@@ -1133,30 +1140,40 @@ mod tests {
    #[cfg(test)]
    mod advancing_epoch {
        use super::*;
+        use crate::mixnodes::queries::query_mixnode_details;
        use crate::rewards::models::RewardPoolChange;
        use crate::support::tests::fixtures::TEST_COIN_DENOM;
        use cosmwasm_std::testing::mock_info;
-        use cosmwasm_std::{coin, coins, BankMsg, Decimal, Empty, SubMsg};
+        use cosmwasm_std::{coin, coins, BankMsg, Decimal, Empty, SubMsg, Uint128};
        use mixnet_contract_common::events::{
            new_delegation_on_unbonded_node_event, new_rewarding_params_update_event,
        };
        use mixnet_contract_common::reward_params::IntervalRewardingParamsUpdate;
-        use mixnet_contract_common::RewardedSetNodeStatus;
+        use mixnet_contract_common::{Layer, RewardedSetNodeStatus};

        #[test]
        fn can_only_be_performed_by_specified_rewarding_validator() {
            let mut test = TestSetup::new();
+            test.add_dummy_mixnode("1", Some(Uint128::new(100000000)));
+            test.add_dummy_mixnode("2", Some(Uint128::new(100000000)));
+            test.add_dummy_mixnode("3", Some(Uint128::new(100000000)));
            let current_active_set = test.rewarding_params().active_set_size;
            let some_sender = mock_info("foomper", &[]);

            test.skip_to_current_epoch_end();

+            let layer_assignments = vec![
+                LayerAssignment::new(1, Layer::One),
+                LayerAssignment::new(2, Layer::Two),
+                LayerAssignment::new(3, Layer::Three),
+            ];
+
            let env = test.env();
            let res = try_advance_epoch(
                test.deps_mut(),
                env,
                some_sender,
-                vec![1, 2, 3],
+                layer_assignments.clone(),
                current_active_set,
            );
            assert_eq!(res, Err(MixnetContractError::Unauthorized));
@@ -1168,9 +1185,10 @@ mod tests {
                test.deps_mut(),
                env,
                sender,
-                vec![1, 2, 3],
+                layer_assignments,
                current_active_set,
            );
+            println!("{:?}", res);
            assert!(res.is_ok())
        }

@@ -1179,13 +1197,23 @@ mod tests {
            let mut test = TestSetup::new();
            let current_active_set = test.rewarding_params().active_set_size;

+            test.add_dummy_mixnode("1", Some(Uint128::new(100000000)));
+            test.add_dummy_mixnode("2", Some(Uint128::new(100000000)));
+            test.add_dummy_mixnode("3", Some(Uint128::new(100000000)));
+
+            let layer_assignments = vec![
+                LayerAssignment::new(1, Layer::One),
+                LayerAssignment::new(2, Layer::Two),
+                LayerAssignment::new(3, Layer::Three),
+            ];
+
            let env = test.env();
            let sender = test.rewarding_validator();
            let res = try_advance_epoch(
                test.deps_mut(),
                env,
                sender.clone(),
-                vec![1, 2, 3],
+                layer_assignments.clone(),
                current_active_set,
            );
            assert!(matches!(
@@ -1193,6 +1221,24 @@ mod tests {
                Err(MixnetContractError::EpochInProgress { .. })
            ));

+            let mixnode_1 = query_mixnode_details(test.deps.as_ref(), 1).unwrap();
+            assert_eq!(
+                mixnode_1.mixnode_details.unwrap().bond_information.layer,
+                Layer::One
+            );
+
+            let mixnode_1 = query_mixnode_details(test.deps.as_ref(), 2).unwrap();
+            assert_eq!(
+                mixnode_1.mixnode_details.unwrap().bond_information.layer,
+                Layer::Two
+            );
+
+            let mixnode_1 = query_mixnode_details(test.deps.as_ref(), 3).unwrap();
+            assert_eq!(
+                mixnode_1.mixnode_details.unwrap().bond_information.layer,
+                Layer::Three
+            );
+
            // sanity check
            test.skip_to_current_epoch_end();
            let env = test.env();
@@ -1200,7 +1246,7 @@ mod tests {
                test.deps_mut(),
                env,
                sender,
-                vec![1, 2, 3],
+                layer_assignments,
                current_active_set,
            );
            assert!(res.is_ok())
@@ -1211,17 +1257,27 @@ mod tests {
            let mut test = TestSetup::new();
            let current_active_set = test.rewarding_params().active_set_size;

+            test.add_dummy_mixnode("1", Some(Uint128::new(100000000)));
+            test.add_dummy_mixnode("2", Some(Uint128::new(100000000)));
+            test.add_dummy_mixnode("3", Some(Uint128::new(100000000)));
+
            push_n_dummy_epoch_actions(&mut test, 10);
            push_n_dummy_interval_actions(&mut test, 10);
            test.skip_to_current_epoch_end();

+            let layer_assignments = vec![
+                LayerAssignment::new(1, Layer::One),
+                LayerAssignment::new(2, Layer::Two),
+                LayerAssignment::new(3, Layer::Three),
+            ];
+
            let env = test.env();
            let sender = test.rewarding_validator();
            try_advance_epoch(
                test.deps_mut(),
                env,
                sender,
-                vec![1, 2, 3],
+                layer_assignments,
                current_active_set,
            )
            .unwrap();
@@ -1237,17 +1293,27 @@ mod tests {
            let mut test = TestSetup::new();
            let current_active_set = test.rewarding_params().active_set_size;

+            test.add_dummy_mixnode("1", Some(Uint128::new(100000000)));
+            test.add_dummy_mixnode("2", Some(Uint128::new(100000000)));
+            test.add_dummy_mixnode("3", Some(Uint128::new(100000000)));
+
            push_n_dummy_epoch_actions(&mut test, 10);
            push_n_dummy_interval_actions(&mut test, 10);
            test.skip_to_current_interval_end();

+            let layer_assignments = vec![
+                LayerAssignment::new(1, Layer::One),
+                LayerAssignment::new(2, Layer::Two),
+                LayerAssignment::new(3, Layer::Three),
+            ];
+
            let env = test.env();
            let sender = test.rewarding_validator();
            try_advance_epoch(
                test.deps_mut(),
                env,
                sender,
-                vec![1, 2, 3],
+                layer_assignments,
                current_active_set,
            )
            .unwrap();
@@ -1264,6 +1330,10 @@ mod tests {
            let env = test.env();
            let current_active_set = test.rewarding_params().active_set_size;

+            test.add_dummy_mixnode("1", Some(Uint128::new(100000000)));
+            test.add_dummy_mixnode("2", Some(Uint128::new(100000000)));
+            test.add_dummy_mixnode("3", Some(Uint128::new(100000000)));
+
            let mut expected_events = Vec::new();
            let mut expected_messages: Vec<SubMsg<Empty>> = Vec::new();

@@ -1310,13 +1380,19 @@ mod tests {

            test.skip_to_current_interval_end();

+            let layer_assignments = vec![
+                LayerAssignment::new(1, Layer::One),
+                LayerAssignment::new(2, Layer::Two),
+                LayerAssignment::new(3, Layer::Three),
+            ];
+
            let env = test.env();
            let sender = test.rewarding_validator();
            let res = try_advance_epoch(
                test.deps_mut(),
                env,
                sender,
-                vec![1, 2, 3],
+                layer_assignments,
                current_active_set,
            )
            .unwrap();
@@ -1343,6 +1419,10 @@ mod tests {
            let mut test = TestSetup::new();
            let current_active_set = test.rewarding_params().active_set_size;

+            test.add_dummy_mixnode("1", Some(Uint128::new(100000000)));
+            test.add_dummy_mixnode("2", Some(Uint128::new(100000000)));
+            test.add_dummy_mixnode("3", Some(Uint128::new(100000000)));
+
            let start_params = test.rewarding_params();

            let pool_update = Decimal::from_atomics(100_000_000u32, 0).unwrap();
@@ -1357,6 +1437,12 @@ mod tests {
                )
                .unwrap();

+            let layer_assignments = vec![
+                LayerAssignment::new(1, Layer::One),
+                LayerAssignment::new(2, Layer::Two),
+                LayerAssignment::new(3, Layer::Three),
+            ];
+
            // end of epoch - nothing has happened
            let sender = test.rewarding_validator();
            test.skip_to_current_epoch_end();
@@ -1365,7 +1451,7 @@ mod tests {
                test.deps_mut(),
                env,
                sender,
-                vec![1, 2, 3],
+                layer_assignments.clone(),
                current_active_set,
            )
            .unwrap();
@@ -1384,7 +1470,7 @@ mod tests {
                test.deps_mut(),
                env,
                sender,
-                vec![1, 2, 3],
+                layer_assignments,
                current_active_set,
            )
            .unwrap();
@@ -1413,10 +1499,20 @@ mod tests {
            let mut test = TestSetup::new();
            let current_active_set = test.rewarding_params().active_set_size;

+            test.add_dummy_mixnode("1", Some(Uint128::new(100000000)));
+            test.add_dummy_mixnode("2", Some(Uint128::new(100000000)));
+            test.add_dummy_mixnode("3", Some(Uint128::new(100000000)));
+
            let interval_pre = test.current_interval();
            let rewarded_set_pre = test.rewarded_set();
            assert!(rewarded_set_pre.is_empty());

+            let layer_assignments = vec![
+                LayerAssignment::new(1, Layer::One),
+                LayerAssignment::new(2, Layer::Two),
+                LayerAssignment::new(3, Layer::Three),
+            ];
+
            let sender = test.rewarding_validator();
            test.skip_to_current_interval_end();
            let env = test.env();
@@ -1424,7 +1520,7 @@ mod tests {
                test.deps_mut(),
                env,
                sender,
-                vec![1, 2, 3],
+                layer_assignments,
                current_active_set,
            )
            .unwrap();
@@ -7,6 +7,7 @@
 mod constants;
 pub mod contract;
 mod delegations;
+mod families;
 mod gateways;
 mod interval;
 mod mixnet_contract_settings;
@@ -37,7 +37,6 @@ pub(crate) fn minimum_delegation_stake(
        .map(|state| state.params.minimum_mixnode_delegation)?)
 }

-#[allow(unused)]
 pub(crate) fn rewarding_denom(storage: &dyn Storage) -> Result<String, MixnetContractError> {
    Ok(CONTRACT_STATE
        .load(storage)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
farbanas	d9b6823106	Merge branch 'release/v1.1.2'	2022-12-07 12:37:14 +01:00
farbanas	7f7d30c9b5	docs: updated changelog for contracts release v1.1.2 and updated versions of mixnet and vesting contracts as well	2022-12-07 12:36:24 +01:00
farbanas	89bcb5649b	changed ubuntu-latest on GH actions to ubuntu-20.04	2022-12-06 17:23:08 +01:00
Dave Hrycyszyn	c39afd0b65	Updated changelog for wallet	2022-12-06 13:58:59 +00:00
farbanas	31be7a6170	update nym-connect CHANGELOG	2022-12-06 14:42:12 +01:00
farbanas	fee780489c	changed nym-connect version to 1.1.2	2022-12-06 14:08:33 +01:00
Dave Hrycyszyn	957c6fbba0	Modifying changelog for v1.1.2	2022-12-06 13:04:31 +00:00
farbanas	7e56a7a8b2	changed nym-connect version to 1.1.1	2022-12-06 13:53:35 +01:00
farbanas	b273df297a	update versions for platfrom, nym-connect and nym-wallet to v1.1.2	2022-12-06 13:50:45 +01:00
Dave Hrycyszyn	d4979c1f0a	Merge branch 'feature/buy' into release/v1.1.2	2022-12-06 12:35:26 +00:00
Bogdan-Ștefan Neacșu	1171f18399	Fix clippy	2022-12-06 10:48:32 +02:00
Bogdan-Ștefan Neacşu	2515646075	Feature/simplify credential binary (#1841 ) * Expose name of standard directories * Use one command instead of two	2022-12-05 16:58:36 +02:00
Jon Häggblad	74d34aeebc	nym-connect/changelog: add note about disconnect fix	2022-12-05 14:53:05 +01:00
Bogdan-Ștefan Neacşu	d495aefb0d	Fix comment in configuration file (#1836 )	2022-12-05 15:03:01 +02:00
Bogdan-Ștefan Neacşu	ce4fd0588c	Use better naming on gateway credential handling (#1834 )	2022-12-05 14:02:30 +02:00
Jędrzej Stuczyński	29c073d25c	Fixed layer distribution skewness check (#1766 )	2022-12-05 09:28:32 +00:00
Drazen Urch	7e3bc2d6bb	Node family management (#1670 ) * Family management messages * Add family queries * Add queries to client * Layer assignment message * Paged family queries, annotate mixnodes with family * Add layer assignments to epoch operations * Remove family layer peristence * Add NotImplemented error for kick Co-authored-by: Jędrzej Stuczyński <jedrzej.stuczynski@gmail.com>	2022-12-05 09:36:06 +01:00
pierre	e15183029b	fix(wallet): buy tutorial ui responsivness	2022-12-01 16:39:27 +01:00
pierre	39ab252941	fix(wallet): typo	2022-12-01 16:00:42 +01:00
pierre	4ccd4d258a	fix(wallet): typo	2022-12-01 15:40:09 +01:00
Jon Häggblad	ab4e39e1b3	Fix a few errors in socks5 client and network-requester (backport) (#1824 ) * Fix two unwraps in socks5 and network-requester * Make sure client task never sends shutdown signal	2022-12-01 14:25:59 +01:00
Jędrzej Stuczyński	66e5119114	Feature/pledge more (#1679 ) * New transactions for increasing amount of pledged tokens * unit tests * Added an option to pledge extra tokens through the vesting contract * Introduced wallet endpoints for new operations * Using updated pledge cap in the vesting contract * Changelog update	2022-12-01 12:51:32 +00:00
Jon Häggblad	eedf3d996a	Merge remote-tracking branch 'origin/release/v1.1.1' into release/v1.1.3	2022-12-01 11:38:36 +01:00
Bogdan-Ștefan Neacşu	5d51f4dc71	Feature/dkg integration tests (#1815 ) * DKG contract e2e test * Refactor to the same format as other contracts * Vk share tests * State tests * Dealings tests * Dealer tests * Api dkg tests * Fix path to contract after refactor * Fix test target clippy	2022-11-29 18:32:37 +02:00
Jon Häggblad	9d60de0091	Merge remote-tracking branch 'origin/release/v1.1.2' into release/v1.1.3	2022-11-29 12:57:48 +01:00
Bogdan-Ștefan Neacşu	ca7c5d80ce	Use config URLs in clients before the env values (#1813 )	2022-11-29 13:52:08 +02:00
Gala	bdb724e9ca	Merge pull request #1812 from nymtech/no-display-maintenance No display maintenance banner	2022-11-29 09:51:55 +01:00
Gala	76ef50dc17	Merge branch 'develop' into no-display-maintenance	2022-11-29 09:32:55 +01:00
Gala	f663623768	set flag to false	2022-11-29 09:32:22 +01:00
pierre	731780993f	refactor(wallet): clean code	2022-11-28 16:01:08 +01:00
Jon Häggblad	136202f329	Merge remote-tracking branch 'origin/release/v1.1.2' into develop	2022-11-28 13:49:46 +01:00
pierre	c02bcb460f	feat(wallet): add link to nym exchange interface	2022-11-28 13:36:17 +01:00
Raphaël Walther	d25848e6f8	Added nightly build workflow on second latest release	2022-11-28 10:41:17 +01:00
pierre	bdb6aa848e	feat(wallet-buy-nym): update signature modal ui	2022-11-28 10:35:15 +01:00
pierre	32b535d67f	fix(wallet-buy-nym): signature output	2022-11-28 10:35:15 +01:00
pierre	9e1109a577	feat(wallet-buy-nym): buy page new ui	2022-11-28 10:35:15 +01:00
pierre	247a7ba1dc	Revert "feat(explorer-api): add route to fetch nym terms&cdts" This reverts commit 876f752697d89061b1904e1ddd1d5bcb7045dc5c.	2022-11-28 10:35:15 +01:00
pierre	77d10358d4	feat(explorer-api): add route to fetch nym terms&cdts	2022-11-28 10:35:15 +01:00
pierre	fb2a61bed3	feat(wallet-buy): tutorial	2022-11-28 10:35:15 +01:00
pierre	4c2c101e57	feat(wallet): buy page bootstrap	2022-11-28 10:35:15 +01:00
Raphaël Walther	0084ba221b	Set build on latest release on schedule event	2022-11-25 16:03:43 +01:00
Jędrzej Stuczyński	186896bb37	Feature/gateway client protocol version (#1795 ) * Introducing concept of gateway protocol version * Remove version-based gateway filtering * Fixed the unit test * grammar	2022-11-25 13:29:42 +00:00
Mark Sinclair	df90ff8658	nym-cli: improve error reporting/handling and changed `vesting-schedule` queries to use query client instead of signing client	2022-11-25 13:16:44 +00:00
Bogdan-Ștefan Neacşu	bff079a3f8	Fix export dkg contract addr (#1800 ) * Export dkg contract for mainnet when no config file present * Remove redundant env files	2022-11-25 14:18:07 +02:00
Jon Häggblad	9c361385a7	websocket-requests: fix length check before deserialize (#1799 )	2022-11-24 23:45:25 +01:00
Jon Häggblad	a9983003d4	changelog: add missing entry for fixing message decrypt in gateway-client	2022-11-24 23:29:37 +01:00
Jon Häggblad	e645d14005	Make connection_id optional in ClientRequest::Send (#1798 )	2022-11-24 23:13:51 +01:00
Jędrzej Stuczyński	cbf9db91ab	Feature/use expect instead of panicking (#1797 ) * Implementation of 'Debug' on 'RealMessage' * expect with failed channel name instead of throwing empty panics * Introduced Debug trait constraint in ProxyRunner * Derive Debug for socks5_requests::Message	2022-11-24 17:02:31 +00:00
Jon Häggblad	8304146195	Fix decrypting stored received msg (#1786 ) * Fix decrypting stored received msg * rustfmt * Moving binary message recovery to separate function Co-authored-by: Jędrzej Stuczyński <jedrzej.stuczynski@gmail.com>	2022-11-24 10:26:09 +01:00
Jon Häggblad	c5c16cd6b0	client-core: add warning when delay multiplier is larger than 1	2022-11-23 21:00:48 +01:00
Jon Häggblad	258fa41271	Update wallet and connect lock files (#1793 )	2022-11-23 20:59:12 +01:00
Jon Häggblad	0a41834fbe	real_traffic_stream: reduce frequency of status print (#1794 )	2022-11-23 16:56:09 +01:00
Mark Sinclair	9637afea85	Update contracts-build.yml	2022-11-23 15:51:21 +00:00
cgi-bin/	c8b454a085	Possibilty to change gateway ws listener (#1779 ) * add: set gatewayListener * Update types.ts * Update worker.ts	2022-11-23 15:14:43 +00:00
Fran Arbanas	81f7457e0e	Add step to release GH actions (#1792 ) * feat: add a release step to nym contracts GH action * feat: add shrinking the size of wasm	2022-11-23 15:13:18 +00:00
Jon Häggblad	63ae568cc2	rust: bump required version to 1.65 in some crates that need it	2022-11-23 15:52:58 +01:00
Jon Häggblad	f3c1ff02e2	Network-requester: throttle inbound connections (#1789 ) * Return and handle ClientRequest::LaneQueueLenghts * Pass lane queue lengths to inbound future * Remove unused self reference * Request lane queue lengths periodically for all open connections * Add timeouts * Rename to ConnectionCommandSender and Receiver * Rename to client_connection_tx/rx * Fix wasm build * Replace bool with enum	2022-11-23 12:03:58 +01:00