Testing CI

Merge pull request #915 from nymtech/fix-mob-datagrids
Fix Mobile View for MUI data-grid (CARD 108)
2021-11-24 18:01:32 +00:00 · 2021-11-24 13:28:36 +00:00 · 2021-11-24 10:45:54 +00:00 · 2021-11-23 16:36:48 +00:00 · 2021-11-23 16:03:39 +00:00 · 2021-11-23 15:49:05 +00:00
390 changed files with 87474 additions and 6377 deletions
@@ -36,5 +36,5 @@ Cargo.* @durch @futurechimp @jstuczyn @neacsu

 # Explorer and wallet should probably get looked by the product team
 /explorer/ @nymtech/product 
-/tauri-wallet/ @nymtech/product 
+/nym-wallet/ @nymtech/product 
 /wallet-web/ @nymtech/product
@@ -1,16 +1,32 @@
 name: Continuous integration

-on: [push, pull_request]
+on:
+  push:
+    paths-ignore:
+      - 'explorer/**'
+  pull_request:
+    paths-ignore:
+      - 'explorer/**'

 jobs:
+  matrix_prep:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+    steps:
+      # creates the matrix strategy from build_matrix_includes.json
+      - uses: actions/checkout@v2
+      - id: set-matrix
+        uses: JoshuaTheMiller/conditional-build-matrix@main
+        with:
+          inputFile: '.github/workflows/build_matrix_includes.json'
+          filter: '[?runOnEvent==`${{ github.event_name }}` || runOnEvent==`always`]'
  build:
+    needs: matrix_prep
+    strategy:
+      matrix: ${{fromJson(needs.matrix_prep.outputs.matrix)}}
    runs-on: ${{ matrix.os }}
    continue-on-error: ${{ matrix.rust == 'nightly' || matrix.rust == 'beta' || matrix.os == 'windows-latest' }}
-    strategy:
-      matrix:
-        rust: [stable, beta, nightly]
-        os: [ubuntu-latest, macos-latest, windows-latest]
-
    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 squashfs-tools
@@ -45,6 +61,13 @@ jobs:
          command: fmt
          args: --all -- --check

+      - uses: actions-rs/clippy-check@v1
+        name: Clippy checks
+#        if: matrix.os == 'ubuntu-latest' && matrix.rust == 'stable'
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          args: --all-features
+
      - name: Run clippy
        uses: actions-rs/cargo@v1
        if: ${{ matrix.rust != 'nightly' }}
@@ -59,78 +82,21 @@ jobs:
        with:
          command: clean

-      # BUILD
-      - name: Build gateway with coconut feature
+      - name: Build all binaries with coconut enabled
        uses: actions-rs/cargo@v1
        with:
          command: build
-          args: --bin nym-gateway --features=coconut
+          args: --all --features=coconut

-      - name: Build native client with coconut feature
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --bin nym-client --features=coconut
-
-      - name: Build socks5 client with coconut feature
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --bin nym-socks5-client --features=coconut
-
-      - name: Build validator-api with coconut feature
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --bin nym-validator-api --features=coconut
-
-# TEST
-      - name: Test gateway with coconut feature
+      - name: Run all tests with coconut enabled
        uses: actions-rs/cargo@v1
        with:
          command: test
-          args: --bin nym-gateway --features=coconut
+          args: --all --features=coconut

-      - name: Test native client with coconut feature
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --bin nym-client --features=coconut
-
-      - name: Test socks5 client with coconut feature
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --bin nym-socks5-client --features=coconut
-
-      - name: Test validator-api with coconut feature
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --bin nym-validator-api --features=coconut
-
-# CLIPPY
-
-      - name: Run clippy on gateway with coconut feature
+      - name: Run clippy with coconut enabled
        uses: actions-rs/cargo@v1
+        if: ${{ matrix.rust != 'nightly' }}
        with:
          command: clippy
-          args: --bin nym-gateway --features=coconut -- -D warnings
-
-      - name: Run clippy on native client with coconut feature
-        uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: --bin nym-client --features=coconut -- -D warnings
-
-      - name: Run clippy on socks5 client with coconut feature
-        uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: --bin nym-socks5-client --features=coconut -- -D warnings
-
-      - name: Run clippy on validator-api with coconut feature
-        uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: --bin nym-validator-api --features=coconut -- -D warnings
+          args: --features=coconut -- -D warnings
@@ -0,0 +1,50 @@
+[
+  {
+    "os":"ubuntu-latest",
+    "rust":"stable",
+    "runOnEvent":"always"
+  },
+
+  {
+    "os":"windows-latest",
+    "rust":"stable",
+    "runOnEvent":"pull_request"
+  },
+  {
+    "os":"macos-latest",
+    "rust":"stable",
+    "runOnEvent":"pull_request"
+  },
+
+  {
+    "os":"ubuntu-latest",
+    "rust":"beta",
+    "runOnEvent":"pull_request"
+  },
+  {
+    "os":"windows-latest",
+    "rust":"beta",
+    "runOnEvent":"pull_request"
+  },
+  {
+    "os":"macos-latest",
+    "rust":"beta",
+    "runOnEvent":"pull_request"
+  },
+
+  {
+    "os":"ubuntu-latest",
+    "rust":"nightly",
+    "runOnEvent":"pull_request"
+  },
+  {
+    "os":"windows-latest",
+    "rust":"nightly",
+    "runOnEvent":"pull_request"
+  },
+  {
+    "os":"macos-latest",
+    "rust":"nightly",
+    "runOnEvent":"pull_request"
+  }
+]
@@ -1,14 +0,0 @@
-name: Clippy check
-
-on: push
-
-jobs:
-  clippy_check:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - run: rustup component add clippy
-      - uses: actions-rs/clippy-check@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          args: --all-features 
@@ -0,0 +1,14 @@
+[
+  {
+    "rust":"stable",
+    "runOnEvent":"always"
+  },
+  {
+    "rust":"beta",
+    "runOnEvent":"pull_request"
+  },
+  {
+    "rust":"nightly",
+    "runOnEvent":"pull_request"
+  }
+]
@@ -0,0 +1,58 @@
+name: ERC20 Bridge Contract
+
+on: [ push, pull_request ]
+
+jobs:
+  matrix_prep:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+    steps:
+      # creates the matrix strategy from build_matrix_includes.json
+      - uses: actions/checkout@v2
+      - id: set-matrix
+        uses: JoshuaTheMiller/conditional-build-matrix@main
+        with:
+          inputFile: '.github/workflows/contract_matrix_includes.json'
+          filter: '[?runOnEvent==`${{ github.event_name }}` || runOnEvent==`always`]'
+  erc20-bridge-contract:
+    needs: matrix_prep
+    strategy:
+      matrix: ${{fromJson(needs.matrix_prep.outputs.matrix)}}
+    # 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
+    continue-on-error: ${{ matrix.rust == 'nightly' }}
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: ${{ matrix.rust }}
+          target: wasm32-unknown-unknown
+          override: true
+          components: rustfmt, clippy
+
+      - uses: actions-rs/cargo@v1
+        env:
+          RUSTFLAGS: '-C link-arg=-s'
+        with:
+          command: build
+          args: --manifest-path contracts/erc20-bridge/Cargo.toml --target wasm32-unknown-unknown
+
+      - uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --manifest-path contracts/erc20-bridge/Cargo.toml
+
+      - uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --manifest-path contracts/erc20-bridge/Cargo.toml -- --check
+
+      - uses: actions-rs/cargo@v1
+        if: ${{ matrix.rust != 'nightly' }}
+        with:
+          command: clippy
+          args: --manifest-path contracts/erc20-bridge/Cargo.toml -- -D warnings
@@ -1,16 +1,34 @@
 name: Mixnet Contract

-on: [push, pull_request]
+on:
+  push:
+    paths-ignore:
+      - 'explorer/**'
+  pull_request:
+    paths-ignore:
+      - 'explorer/**'

 jobs:
+  matrix_prep:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+    steps:
+      # creates the matrix strategy from build_matrix_includes.json
+      - uses: actions/checkout@v2
+      - id: set-matrix
+        uses: JoshuaTheMiller/conditional-build-matrix@main
+        with:
+          inputFile: '.github/workflows/contract_matrix_includes.json'
+          filter: '[?runOnEvent==`${{ github.event_name }}` || runOnEvent==`always`]'
  mixnet-contract:
    # 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
    continue-on-error: ${{ matrix.rust == 'nightly' }}
+    needs: matrix_prep
    strategy:
-      matrix:
-        rust: [ stable, beta, nightly ]
+      matrix: ${{fromJson(needs.matrix_prep.outputs.matrix)}}
    steps:
      - uses: actions/checkout@v2

@@ -23,6 +41,8 @@ jobs:
          components: rustfmt, clippy

      - uses: actions-rs/cargo@v1
+        env:
+          RUSTFLAGS: '-C link-arg=-s'
        with:
          command: build
          args: --manifest-path contracts/mixnet/Cargo.toml --target wasm32-unknown-unknown
@@ -0,0 +1,23 @@
+name: Linting for Network Explorer (eslint/prettier)
+
+on:
+  pull_request:
+    paths:
+      - 'explorer/**'
+
+defaults:
+  run:
+    working-directory: explorer
+
+jobs:
+  build:
+    runs-on: custom-runner-linux
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '14'
+      - run: npm install
+      - name: Run ESLint
+        # GitHub should automatically annotate the PR
+        run: npm run lint
@@ -11,7 +11,7 @@ defaults:

 jobs:
  build:
-    runs-on: ubuntu-latest
+    runs-on: custom-runner-linux
    steps:
    - uses: actions/checkout@v2
    - name: Install rsync
@@ -35,7 +35,7 @@ jobs:
        SOURCE: "explorer/dist/"
        REMOTE_HOST: ${{ secrets.CI_WWW_REMOTE_HOST }}
        REMOTE_USER: ${{ secrets.CI_WWW_REMOTE_USER }}
-        TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/${{ env.GITHUB_REF_SLUG }}
+        TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/network-explorer-${{ env.GITHUB_REF_SLUG }}
        EXCLUDE: "/dist/, /node_modules/"
    - name: Keybase - Node Install
      run: npm install
@@ -44,6 +44,7 @@ jobs:
      env:
        NYM_PROJECT_NAME: "Network Explorer"
        NYM_CI_WWW_BASE: "${{ secrets.NYM_CI_WWW_BASE }}"
+        NYM_CI_WWW_LOCATION: "network-explorer-${{ env.GITHUB_REF_SLUG }}"
        GIT_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
        GIT_BRANCH: "${GITHUB_REF##*/}"
        KEYBASE_NYMBOT_USERNAME: "${{ secrets.KEYBASE_NYMBOT_USERNAME }}"
@@ -1,18 +1,18 @@
 name: Webdriverio tests for nym wallet

-on: 
- push:
+on:
+  push:
    paths:
-      - 'tauri-wallet/**'
-      
+      - "nym-wallet/**"
+
 defaults:
  run:
-    working-directory: tauri-wallet
+    working-directory: nym-wallet

 jobs:
  test:
    name: wallet tests
-    runs-on: ubuntu-latest 
+    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2

@@ -30,8 +30,8 @@ jobs:
      - name: Install minimal stable
        uses: actions-rs/toolchain@v1
        with:
-         profile: minimal
-         toolchain: stable
+          profile: minimal
+          toolchain: stable

      - name: Node v16
        uses: actions/setup-node@v1
@@ -39,32 +39,32 @@ jobs:
          node-version: 16.x

      - name: Install yarn for building application
-        run: yarn install    
+        run: yarn install

      - name: Build application
        run: yarn run webpack:build & yarn run tauri:build
-        
+
      - name: Check binary exists
        run: |
-             cd target/release/
-             (test -f nym-wallet && echo nym binary exists) || echo wallet does not exist
+          cd target/release/
+          (test -f nym-wallet && echo nym binary exists) || echo wallet does not exist

      - name: Install dependencies
        run: yarn install
-        working-directory: tauri-wallet/webdriver
+        working-directory: nym-wallet/webdriver

      - name: Remove existing user datafile
        uses: JesseTG/rm@v1.0.2
        with:
-          path: tauri-wallet/webdriver/common/data/user-data.json
+          path: nym-wallet/webdriver/common/data/user-data.json

      - name: Create user data json file
        id: create-json
        uses: jsdaniell/create-json@1.1.2
        with:
-           name: "user-data.json"
-           json: ${{ secrets.WALLET_USERDATA }}
-           dir: 'tauri-wallet/webdriver/common/data/'
+          name: "user-data.json"
+          json: ${{ secrets.WALLET_USERDATA }}
+          dir: "nym-wallet/webdriver/common/data/"

      - name: Install tauri-driver
        uses: actions-rs/cargo@v1
@@ -73,5 +73,5 @@ jobs:
          args: tauri-driver

      - name: Launch tests
-        run: xvfb-run yarn test:newuser
-        working-directory: tauri-wallet/webdriver
+        run: xvfb-run yarn test:runall
+        working-directory: nym-wallet/webdriver
@@ -1,5 +1,5 @@
 🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩
-> :rocket: {{ env.NYM_PROJECT_NAME }}  ➡️➡️➡️➡️➡️ **View output:** https://{{ env.GITHUB_REF_SLUG }}.{{ env.NYM_CI_WWW_BASE }}/
+> :rocket: {{ env.NYM_PROJECT_NAME }}  ➡️➡️➡️➡️➡️ **View output:** https://{{ env.NYM_CI_WWW_LOCATION }}.{{ env.NYM_CI_WWW_BASE }}/
 > ✅ **SUCCESS**
 > `branch` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/tree/{{ env.GIT_BRANCH_NAME }}
 > `commit` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/commit/{{ env.GITHUB_SHA }}
@@ -0,0 +1,12 @@
+name: Publish Tauri Wallet
+on:
+  push:
+    tags:
+      - nym-wallet-*
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Run a one-line script
+        run: echo Hello, world!
@@ -1,10 +1,17 @@
 name: Generate TS types

-on: push
+on:
+  push:
+    paths-ignore:
+      - "explorer/**"
+  pull_request:
+    paths-ignore:
+      - "explorer/**"

 jobs:
-  tauri-wallet-types:
+  nym-wallet-types:
    runs-on: ubuntu-latest
+    if: ${{ github.event_name != 'pull_request' }}
    steps:
      - name: Prepare
        run: sudo apt-get update && sudo apt-get install -y libpango1.0-dev libatk1.0-dev libgdk-pixbuf2.0-dev libsoup2.4-dev librust-gdk-dev libwebkit2gtk-4.0-dev
@@ -13,10 +20,10 @@ jobs:
        with:
          toolchain: stable
      - name: Generate TS
-        run: cd tauri-wallet/src-tauri && cargo test
+        run: cd nym-wallet/src-tauri && cargo test
      - uses: EndBug/add-and-commit@v7.2.1 # https://github.com/marketplace/actions/add-commit
        with:
-          add: '["tauri-wallet"]'
-          message: '[ci skip] Generate TS types'
+          add: '["nym-wallet"]'
+          message: "[ci skip] Generate TS types"
        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -1,6 +1,9 @@
 name: Wasm Client

-on: [push, pull_request]
+on:
+  pull_request:
+    paths-ignore:
+      - 'explorer/**'

 jobs:
  wasm:
@@ -16,10 +19,11 @@ jobs:
          override: true
          components: rustfmt, clippy

-      - uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --manifest-path clients/webassembly/Cargo.toml --target wasm32-unknown-unknown
+# token credentials (non-coconut) don't work for wasm right now
+#      - uses: actions-rs/cargo@v1
+#        with:
+#          command: build
+#          args: --manifest-path clients/webassembly/Cargo.toml --target wasm32-unknown-unknown

      - uses: actions-rs/cargo@v1
        with:
@@ -41,4 +45,4 @@ jobs:
 #      - uses: actions-rs/cargo@v1
 #        with:
 #          command: clippy
-#          args: --manifest-path clients/webassembly/Cargo.toml --target wasm32-unknown-unknown -- -D warnings
+#          args: --manifest-path clients/webassembly/Cargo.toml --target wasm32-unknown-unknown -- -D warnings
@@ -11,7 +11,6 @@ target
 /.vscode/settings.json
 validator/.vscode
 sample-configs/validator-config.toml
-.vscode
 scripts/deploy_qa.sh
 scripts/run_gate.sh
 scripts/run_mix.sh
@@ -25,8 +24,14 @@ v6-topology.json
 /explorer/downloads/topology.json
 /explorer/public/downloads/mixmining.json
 /explorer/public/downloads/topology.json
+/nym-wallet/dist/*
 /clients/validator/examples/nym-driver-example/current-contract.txt
 validator-api/v4.json
 validator-api/v6.json
 **/node_modules
 validator-api/keypair
+contracts/mixnet/code_id
+contracts/mixnet/Justfile
+contracts/mixnet/Makefile
+validator-config
+*.patch
@@ -93,6 +93,12 @@ version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"

+[[package]]
+name = "arrayvec"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
+
 [[package]]
 name = "arrayvec"
 version = "0.7.1"
@@ -228,6 +234,12 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"

+[[package]]
+name = "az"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d6dff4a1892b54d70af377bf7a17064192e822865791d812957f21e3108c325"
+
 [[package]]
 name = "base-x"
 version = "0.2.8"
@@ -296,6 +308,18 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"

+[[package]]
+name = "bitvec"
+version = "0.20.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848"
+dependencies = [
+ "funty",
+ "radium",
+ "tap",
+ "wyz",
+]
+
 [[package]]
 name = "blake2"
 version = "0.8.1"
@@ -315,7 +339,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dcd555c66291d5f836dbb6883b48660ece810fe25a31f3bdfb911945dff2691f"
 dependencies = [
 "arrayref",
- "arrayvec",
+ "arrayvec 0.7.1",
 "cc",
 "cfg-if 1.0.0",
 "constant_time_eq",
@@ -408,12 +432,24 @@ version = "3.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9df67f7bf9ef8498769f994239c45613ef0c5899415fb58e9add412d2c1a538"

+[[package]]
+name = "byte-slice-cast"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca0796d76a983651b4a0ddda16203032759f2fd9103d9181f7c65c06ee8872e6"
+
 [[package]]
 name = "byte-tools"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"

+[[package]]
+name = "bytemuck"
+version = "1.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72957246c41db82b8ef88a5486143830adeb8227ef9837740bdec67724cf2c5b"
+
 [[package]]
 name = "byteorder"
 version = "1.4.3"
@@ -936,6 +972,8 @@ name = "credentials"
 version = "0.1.0"
 dependencies = [
 "coconut-interface",
+ "crypto",
+ "network-defaults",
 "thiserror",
 "url",
 "validator-client",
@@ -1589,6 +1627,14 @@ dependencies = [
 "termcolor",
 ]

+[[package]]
+name = "erc20-bridge-contract"
+version = "0.1.0"
+dependencies = [
+ "schemars",
+ "serde",
+]
+
 [[package]]
 name = "error-chain"
 version = "0.12.4"
@@ -1598,6 +1644,49 @@ dependencies = [
 "version_check",
 ]

+[[package]]
+name = "ethabi"
+version = "14.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a01317735d563b3bad2d5f90d2e1799f414165408251abb762510f40e790e69a"
+dependencies = [
+ "anyhow",
+ "ethereum-types",
+ "hex",
+ "serde",
+ "serde_json",
+ "sha3",
+ "thiserror",
+ "uint",
+]
+
+[[package]]
+name = "ethbloom"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfb684ac8fa8f6c5759f788862bb22ec6fe3cb392f6bfd08e3c64b603661e3f8"
+dependencies = [
+ "crunchy",
+ "fixed-hash",
+ "impl-rlp",
+ "impl-serde",
+ "tiny-keccak",
+]
+
+[[package]]
+name = "ethereum-types"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f64b5df66a228d85e4b17e5d6c6aa43b0310898ffe8a85988c4c032357aaabfd"
+dependencies = [
+ "ethbloom",
+ "fixed-hash",
+ "impl-rlp",
+ "impl-serde",
+ "primitive-types",
+ "uint",
+]
+
 [[package]]
 name = "explorer-api"
 version = "0.1.0"
@@ -1693,6 +1782,31 @@ dependencies = [
 "winapi",
 ]

+[[package]]
+name = "fixed"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d333a26ec13a023c6dff4b7584de4d323cfee2e508f5dd2bbee6669e4f7efdf"
+dependencies = [
+ "az",
+ "bytemuck",
+ "half",
+ "serde",
+ "typenum",
+]
+
+[[package]]
+name = "fixed-hash"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c"
+dependencies = [
+ "byteorder",
+ "rand 0.8.4",
+ "rustc-hex",
+ "static_assertions",
+]
+
 [[package]]
 name = "flate2"
 version = "1.0.22"
@@ -1789,6 +1903,12 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"

+[[package]]
+name = "funty"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
+
 [[package]]
 name = "futf"
 version = "0.1.4"
@@ -1898,6 +2018,12 @@ version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99"

+[[package]]
+name = "futures-timer"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
+
 [[package]]
 name = "futures-util"
 version = "0.3.17"
@@ -1933,20 +2059,27 @@ name = "gateway-client"
 version = "0.1.0"
 dependencies = [
 "coconut-interface",
+ "credentials",
 "crypto",
 "fluvio-wasm-timer",
 "futures",
 "gateway-requests",
 "getrandom 0.2.3",
+ "json",
 "log",
+ "network-defaults",
 "nymsphinx",
 "rand 0.7.3",
+ "secp256k1",
+ "thiserror",
 "tokio",
 "tokio-tungstenite",
 "tungstenite",
+ "url",
 "wasm-bindgen",
 "wasm-bindgen-futures",
 "wasm-utils",
+ "web3",
 ]

 [[package]]
@@ -2324,9 +2457,9 @@ dependencies = [

 [[package]]
 name = "half"
-version = "1.7.1"
+version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62aca2aba2d62b4a7f5b33f3712cb1b0692779a56fb510499d5c0aa594daeaf3"
+checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"

 [[package]]
 name = "handlebars"
@@ -2409,6 +2542,12 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"

+[[package]]
+name = "hex-literal"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21e4590e13640f19f249fe3e4eca5113bc4289f2497710378190e7f4bd96f45b"
+
 [[package]]
 name = "hkd32"
 version = "0.6.0"
@@ -2640,6 +2779,44 @@ dependencies = [
 "winapi-util",
 ]

+[[package]]
+name = "impl-codec"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "161ebdfec3c8e3b52bf61c4f3550a1eea4f9579d10dc1b936f3171ebdcd6c443"
+dependencies = [
+ "parity-scale-codec",
+]
+
+[[package]]
+name = "impl-rlp"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808"
+dependencies = [
+ "rlp",
+]
+
+[[package]]
+name = "impl-serde"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b47ca4d2b6931707a55fce5cf66aff80e2178c8b63bbb4ecb5695cbc870ddf6f"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "impl-trait-for-tuples"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5dacb10c5b3bb92d46ba347505a9041e676bb20ad220101326bffb0c93031ee"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "indenter"
 version = "0.3.3"
@@ -2798,6 +2975,27 @@ dependencies = [
 "wasm-bindgen",
 ]

+[[package]]
+name = "json"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd"
+
+[[package]]
+name = "jsonrpc-core"
+version = "18.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb"
+dependencies = [
+ "futures",
+ "futures-executor",
+ "futures-util",
+ "log",
+ "serde",
+ "serde_derive",
+ "serde_json",
+]
+
 [[package]]
 name = "k256"
 version = "0.9.6"
@@ -3043,10 +3241,15 @@ dependencies = [
 name = "mixnet-contract"
 version = "0.1.0"
 dependencies = [
+ "az",
 "cosmwasm-std",
+ "fixed",
+ "log",
+ "network-defaults",
 "schemars",
 "serde",
 "serde_repr",
+ "thiserror",
 "ts-rs",
 ]

@@ -3164,6 +3367,7 @@ checksum = "c44922cb3dbb1c70b5e5f443d63b64363a898564d739ba5198e3a9138442868d"
 name = "network-defaults"
 version = "0.1.0"
 dependencies = [
+ "hex-literal",
 "serde",
 "time 0.3.3",
 "url",
@@ -3312,6 +3516,7 @@ dependencies = [
 "gateway-client",
 "gateway-requests",
 "log",
+ "network-defaults",
 "nymsphinx",
 "pemstore",
 "pretty_env_logger",
@@ -3356,6 +3561,7 @@ dependencies = [
 name = "nym-gateway"
 version = "0.11.0"
 dependencies = [
+ "bip39",
 "clap",
 "coconut-interface",
 "config",
@@ -3364,12 +3570,15 @@ dependencies = [
 "dashmap",
 "dirs",
 "dotenv",
+ "erc20-bridge-contract",
 "futures",
+ "gateway-client",
 "gateway-requests",
 "humantime-serde",
 "log",
 "mixnet-client",
 "mixnode-common",
+ "network-defaults",
 "nymsphinx",
 "pemstore",
 "pretty_env_logger",
@@ -3384,6 +3593,7 @@ dependencies = [
 "url",
 "validator-client",
 "version-checker",
+ "web3",
 ]

 [[package]]
@@ -3456,6 +3666,7 @@ dependencies = [
 "gateway-client",
 "gateway-requests",
 "log",
+ "network-defaults",
 "nymsphinx",
 "ordered-buffer",
 "pemstore",
@@ -3495,6 +3706,8 @@ dependencies = [
 "pin-project",
 "pretty_env_logger",
 "rand 0.7.3",
+ "rand 0.8.4",
+ "rand_chacha 0.3.1",
 "reqwest",
 "rocket",
 "rocket_cors",
@@ -3797,6 +4010,32 @@ dependencies = [
 "system-deps 3.2.0",
 ]

+[[package]]
+name = "parity-scale-codec"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909"
+dependencies = [
+ "arrayvec 0.7.1",
+ "bitvec",
+ "byte-slice-cast",
+ "impl-trait-for-tuples",
+ "parity-scale-codec-derive",
+ "serde",
+]
+
+[[package]]
+name = "parity-scale-codec-derive"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27"
+dependencies = [
+ "proc-macro-crate 1.1.0",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "parking"
 version = "2.0.0"
@@ -4191,6 +4430,19 @@ dependencies = [
 "log",
 ]

+[[package]]
+name = "primitive-types"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06345ee39fbccfb06ab45f3a1a5798d9dafa04cb8921a76d227040003a234b0e"
+dependencies = [
+ "fixed-hash",
+ "impl-codec",
+ "impl-rlp",
+ "impl-serde",
+ "uint",
+]
+
 [[package]]
 name = "proc-macro-crate"
 version = "0.1.5"
@@ -4361,6 +4613,12 @@ dependencies = [
 "scheduled-thread-pool",
 ]

+[[package]]
+name = "radium"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb"
+
 [[package]]
 name = "rand"
 version = "0.6.5"
@@ -4766,6 +5024,16 @@ dependencies = [
 "opaque-debug 0.3.0",
 ]

+[[package]]
+name = "rlp"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "999508abb0ae792aabed2460c45b89106d97fe4adac593bdaef433c2605847b5"
+dependencies = [
+ "bytes",
+ "rustc-hex",
+]
+
 [[package]]
 name = "rocket"
 version = "0.5.0-rc.1"
@@ -4914,6 +5182,12 @@ dependencies = [
 "quote",
 ]

+[[package]]
+name = "rustc-hex"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6"
+
 [[package]]
 name = "rustc_version"
 version = "0.2.3"
@@ -5053,6 +5327,24 @@ dependencies = [
 "untrusted",
 ]

+[[package]]
+name = "secp256k1"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97d03ceae636d0fed5bae6a7f4f664354c5f4fcedf6eef053fef17e49f837d0a"
+dependencies = [
+ "secp256k1-sys",
+]
+
+[[package]]
+name = "secp256k1-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "827cb7cce42533829c792fc51b82fbf18b125b45a702ef2c8be77fce65463a7b"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "security-framework"
 version = "2.4.2"
@@ -5429,6 +5721,21 @@ dependencies = [
 "ordered-buffer",
 ]

+[[package]]
+name = "soketto"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4919971d141dbadaa0e82b5d369e2d7666c98e4625046140615ca363e50d4daa"
+dependencies = [
+ "base64",
+ "bytes",
+ "futures",
+ "httparse",
+ "log",
+ "rand 0.8.4",
+ "sha-1 0.9.8",
+]
+
 [[package]]
 name = "soup-sys"
 version = "0.10.0"
@@ -6028,6 +6335,12 @@ dependencies = [
 "x11-dl",
 ]

+[[package]]
+name = "tap"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+
 [[package]]
 name = "tar"
 version = "0.4.37"
@@ -6420,6 +6733,15 @@ dependencies = [
 "syn",
 ]

+[[package]]
+name = "tiny-keccak"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
+dependencies = [
+ "crunchy",
+]
+
 [[package]]
 name = "tinytemplate"
 version = "1.2.1"
@@ -6527,6 +6849,7 @@ checksum = "08d3725d3efa29485e87311c5b699de63cde14b00ed4d256b8318aa30ca452cd"
 dependencies = [
 "bytes",
 "futures-core",
+ "futures-io",
 "futures-sink",
 "log",
 "pin-project-lite",
@@ -6591,9 +6914,9 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"

 [[package]]
 name = "ts-rs"
-version = "3.1.0"
+version = "5.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "369e48de67506679b3a576b0faf666fa9f9acf2fd00b4c61e28bdb6c8e08ec06"
+checksum = "f34750e8cbb4d87d09f6d7441921cc6d9435dcc58df53bbaec01f5f9945d4801"
 dependencies = [
 "dprint-plugin-typescript",
 "ts-rs-macros",
@@ -6601,9 +6924,9 @@ dependencies = [

 [[package]]
 name = "ts-rs-macros"
-version = "3.1.0"
+version = "5.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f269e8fd28e26b4cdbd01f81f345aaf666131511e54a735a76a614b5062d0a5a"
+checksum = "4c78e4905e64bb23c814098885e08778dfed7fd796ea503df29aa3ba5fead009"
 dependencies = [
 "Inflector",
 "proc-macro2",
@@ -6998,6 +7321,52 @@ dependencies = [
 "wasm-bindgen",
 ]

+[[package]]
+name = "web3"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd24abe6f2b68e0677f843059faea87bcbd4892e39f02886f366d8222c3c540d"
+dependencies = [
+ "arrayvec 0.5.2",
+ "base64",
+ "bytes",
+ "derive_more",
+ "ethabi",
+ "ethereum-types",
+ "futures",
+ "futures-timer",
+ "headers",
+ "hex",
+ "jsonrpc-core",
+ "log",
+ "parking_lot",
+ "pin-project",
+ "reqwest",
+ "rlp",
+ "secp256k1",
+ "serde",
+ "serde_json",
+ "soketto",
+ "tiny-keccak",
+ "tokio",
+ "tokio-stream",
+ "tokio-util",
+ "url",
+ "web3-async-native-tls",
+]
+
+[[package]]
+name = "web3-async-native-tls"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f6d8d1636b2627fe63518d5a9b38a569405d9c9bc665c43c9c341de57227ebb"
+dependencies = [
+ "native-tls",
+ "thiserror",
+ "tokio",
+ "url",
+]
+
 [[package]]
 name = "webkit2gtk"
 version = "0.14.0"
@@ -7208,6 +7577,12 @@ dependencies = [
 "winapi",
 ]

+[[package]]
+name = "wyz"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"
+
 [[package]]
 name = "x11-dl"
 version = "2.19.1"
@@ -25,6 +25,7 @@ members = [
    "common/config",
    "common/credentials",
    "common/crypto",
+    "common/erc20-bridge-contract",
    "common/mixnet-contract",
    "common/mixnode-common",
    "common/network-defaults",
@@ -63,4 +64,4 @@ default-members = [
    "validator-api",
 ]

-exclude = ["explorer", "contracts"]
+exclude = ["explorer", "contracts", "tokenomics-py"]
@@ -5,8 +5,6 @@ SPDX-License-Identifier: Apache-2.0

 ## The Nym Privacy Platform

-This repository contains the Nym mixnet.
-
 The platform is composed of multiple Rust crates. Top-level executable binary crates include:

 * nym-mixnode - shuffles [Sphinx](https://github.com/nymtech/sphinx) packets together to provide privacy against network-level attackers.
@@ -33,6 +31,45 @@ There's a `.env.sample-dev` file provided which you can rename to `.env` if you

 You can chat to us in [Keybase](https://keybase.io). Download their chat app, then click **Teams -> Join a team**. Type **nymtech.friends** into the team name and hit **continue**. For general chat, hang out in the **#general** channel. Our development takes places in the **#dev** channel. Node operators should be in the **#node-operators** channel.

+### Rewards
+
+Node, node operator and delegator rewards are determined according to the principles laid out in the section 6 of [Nym Whitepaper](https://nymtech.net/nym-whitepaper.pdf). Below is a TLDR of the variables and formulas involved in calculating the epoch rewards. Initial reward pool is set to 250 million Nym, making the circulating supply 750 million Nym.
+
+|Symbol|Definition|
+|---|---|
+|<img src="https://render.githubusercontent.com/render/math?math=R">|global share of rewards available, starts at 2% of the reward pool. 
+|<img src="https://render.githubusercontent.com/render/math?math=R_{i}">|node reward for mixnode `i`.
+|<img src="https://render.githubusercontent.com/render/math?math=\sigma_{i}">|ratio of total node stake (node bond + all delegations) to the token circulating supply.
+|<img src="https://render.githubusercontent.com/render/math?math=\lambda_{i}">|ratio of stake operator has plaged to their node to the token circulating supply.
+|<img src="https://render.githubusercontent.com/render/math?math=\omega_{i}">|fraction of total effort undertaken by node `i`, set to `1/k` in testnet Milhon.
+|<img src="https://render.githubusercontent.com/render/math?math=k">|number of nodes stakeholders are incentivised to create, set by the validators, a matter of governance. Currently determined by the `active set` size, and set to 5000 in testnet Milhon.
+|<img src="https://render.githubusercontent.com/render/math?math=\alpha">|Sybil attack resistance parameter - the higher this parameter is set the stronger the reduction in competitivness gets for a Sybil attacker.
+|<img src="https://render.githubusercontent.com/render/math?math=PM_{i}">|declared profit margin of operator `i`, defaults to 10% in testnet Milhon.
+|<img src="https://render.githubusercontent.com/render/math?math=PF_{i}">|uptime of node `i`, scaled to 0 - 1, for the rewarding epoch
+|<img src="https://render.githubusercontent.com/render/math?math=PP_{i}">|cost of operating node `i` for the duration of the rewarding eopoch, set to 40 Nym for testnet Milhon.
+
+Node reward for node `i` is determined as:
+
+<img src="https://render.githubusercontent.com/render/math?math=R_{i}=PF_{i} \cdot R \cdot (\sigma^'_{i} \cdot \omega_{i} \cdot k %2b \alpha \cdot \lambda^'_{i} \cdot \sigma^'_{i} \cdot k)/(1 %2b \alpha)">
+
+where:
+
+<img src="https://render.githubusercontent.com/render/math?math=\sigma^'_{i} = min\{\sigma_{i}, 1/k\}">
+
+and
+
+<img src="https://render.githubusercontent.com/render/math?math=\lambda^'_{i} = min\{\lambda_{i}, 1/k\}">
+
+Operator of node `i` is credited with the following amount:
+
+<img src="https://render.githubusercontent.com/render/math?math=min\{PP_{i},R_{i})\} %2b max\{0, (PM_{i} %2b (1 - PM_{i}) \cdot \lambda_{i}/\delta_{i}) \cdot (R_{i} - PP_{i})\}">
+
+Delegate with stake `s` recieves:
+
+<img src="https://render.githubusercontent.com/render/math?math=max\{0, (1-PM_{i}) \cdot (s^'/\sigma_{i}) \cdot (R_{i} - PP_{i})\}">
+
+where `s'` is stake `s` scaled over total token circulating supply.
+
 ### Licensing and copyright information

 This program is available as open source under the terms of the Apache 2.0 license. However, some elements are being licensed under CC0-1.0 and MIT. For accurate information, please check individual files.
@@ -30,3 +30,6 @@ validator-client = { path = "../../common/client-libs/validator-client" }

 [dev-dependencies]
 tempfile = "3.1.0"
+
+[features]
+coconut = []
@@ -22,7 +22,10 @@ const DEFAULT_MESSAGE_STREAM_AVERAGE_DELAY: Duration = Duration::from_millis(20)
 const DEFAULT_AVERAGE_PACKET_DELAY: Duration = Duration::from_millis(50);
 const DEFAULT_TOPOLOGY_REFRESH_RATE: Duration = Duration::from_secs(5 * 60); // every 5min
 const DEFAULT_TOPOLOGY_RESOLUTION_TIMEOUT: Duration = Duration::from_millis(5_000);
-const DEFAULT_GATEWAY_RESPONSE_TIMEOUT: Duration = Duration::from_millis(1_500);
+// Set this to a high value for now, so that we don't risk sporadic timeouts that might cause
+// bought bandwidth tokens to not have time to be spent; Once we remove the gateway from the
+// bandwidth bridging protocol, we can come back to a smaller timeout value
+const DEFAULT_GATEWAY_RESPONSE_TIMEOUT: Duration = Duration::from_secs(5 * 60);

 pub fn missing_string_value() -> String {
    MISSING_VALUE.to_string()
@@ -100,6 +103,17 @@ impl<T: NymConfig> Config<T> {
                self::Client::<T>::default_reply_encryption_key_store_path(&id);
        }

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

@@ -111,6 +125,16 @@ impl<T: NymConfig> Config<T> {
        self.client.gateway_listener = gateway_listener.into();
    }

+    #[cfg(not(feature = "coconut"))]
+    pub fn with_eth_private_key<S: Into<String>>(&mut self, eth_private_key: S) {
+        self.client.eth_private_key = eth_private_key.into();
+    }
+
+    #[cfg(not(feature = "coconut"))]
+    pub fn with_eth_endpoint<S: Into<String>>(&mut self, eth_endpoint: S) {
+        self.client.eth_endpoint = eth_endpoint.into();
+    }
+
    pub fn set_custom_validator_apis(&mut self, validator_api_urls: Vec<Url>) {
        self.client.validator_api_urls = validator_api_urls;
    }
@@ -173,6 +197,21 @@ impl<T: NymConfig> Config<T> {
        self.client.gateway_listener.clone()
    }

+    #[cfg(not(feature = "coconut"))]
+    pub fn get_backup_bandwidth_token_keys_dir(&self) -> PathBuf {
+        self.client.backup_bandwidth_token_keys_dir.clone()
+    }
+
+    #[cfg(not(feature = "coconut"))]
+    pub fn get_eth_endpoint(&self) -> String {
+        self.client.eth_endpoint.clone()
+    }
+
+    #[cfg(not(feature = "coconut"))]
+    pub fn get_eth_private_key(&self) -> String {
+        self.client.eth_private_key.clone()
+    }
+
    // Debug getters
    pub fn get_average_packet_delay(&self) -> Duration {
        self.debug.average_packet_delay
@@ -268,6 +307,20 @@ pub struct Client<T> {
    /// Address of the gateway listener to which all client requests should be sent.
    gateway_listener: String,

+    /// Path to directory containing public/private keys used for bandwidth token purchase.
+    /// Those are saved in case of emergency, to be able to reclaim bandwidth tokens.
+    /// The public key is the name of the file, while the private key is the content.
+    #[cfg(not(feature = "coconut"))]
+    backup_bandwidth_token_keys_dir: PathBuf,
+
+    /// Ethereum private key.
+    #[cfg(not(feature = "coconut"))]
+    eth_private_key: String,
+
+    /// Address to an Ethereum full node.
+    #[cfg(not(feature = "coconut"))]
+    eth_endpoint: String,
+
    /// nym_home_directory specifies absolute path to the home nym Clients directory.
    /// It is expected to use default value and hence .toml file should not redefine this field.
    nym_root_directory: PathBuf,
@@ -292,6 +345,12 @@ impl<T: NymConfig> Default for Client<T> {
            reply_encryption_key_store_path: Default::default(),
            gateway_id: "".to_string(),
            gateway_listener: "".to_string(),
+            #[cfg(not(feature = "coconut"))]
+            backup_bandwidth_token_keys_dir: Default::default(),
+            #[cfg(not(feature = "coconut"))]
+            eth_private_key: "".to_string(),
+            #[cfg(not(feature = "coconut"))]
+            eth_endpoint: "".to_string(),
            nym_root_directory: T::default_root_directory(),
            super_struct: Default::default(),
        }
@@ -326,6 +385,11 @@ impl<T: NymConfig> Client<T> {
    fn default_reply_encryption_key_store_path(id: &str) -> PathBuf {
        T::default_data_directory(Some(id)).join("reply_key_store")
    }
+
+    #[cfg(not(feature = "coconut"))]
+    fn default_backup_bandwidth_token_keys_dir(id: &str) -> PathBuf {
+        T::default_data_directory(Some(id)).join("backup_bandwidth_token_keys")
+    }
 }

 #[derive(Debug, Default, Deserialize, PartialEq, Serialize)]
@@ -24,7 +24,7 @@ dirs = "3.0" # for determining default store directories in config
 dotenv = "0.15.0" # for obtaining environmental variables (only used for RUST_LOG for time being)
 log = "0.4" # self explanatory
 pretty_env_logger = "0.4" # for formatting log messages
-rand = {version = "0.7.3", features = ["wasm-bindgen"]} # rng-related traits + some rng implementation to use
+rand = { version = "0.7.3", features = ["wasm-bindgen"] } # rng-related traits + some rng implementation to use
 serde = { version = "1.0.104", features = ["derive"] } # for config serialization/deserialization
 sled = "0.34" # for storage of replySURB decryption keys
 tokio = { version = "1.4", features = ["rt-multi-thread", "net", "signal"] } # async runtime
@@ -44,6 +44,7 @@ topology = { path = "../../common/topology" }
 websocket-requests = { path = "websocket-requests" }
 validator-client = { path = "../../common/client-libs/validator-client" }
 version-checker = { path = "../../common/version-checker" }
+network-defaults = { path = "../../common/network-defaults" }

 [features]
 coconut = ["coconut-interface", "credentials", "gateway-requests/coconut", "gateway-client/coconut"]
@@ -42,6 +42,17 @@ public_encryption_key_file = '{{ client.public_encryption_key_file }}'
 # sent but not received back.
 reply_encryption_key_store_path = '{{ client.reply_encryption_key_store_path }}'

+# Path to directory containing public/private keys used for bandwidth token purchase.
+# Those are saved in case of emergency, to be able to reclaim bandwidth tokens.
+# The public key is the name of the file, while the private key is the content.
+backup_bandwidth_token_keys_dir = '{{ client.backup_bandwidth_token_keys_dir }}'
+
+# Ethereum private key.
+eth_private_key = '{{ client.eth_private_key }}'
+
+# Addess to an Ethereum full node.
+eth_endpoint = '{{ client.eth_endpoint }}'
+
 ##### additional client config options #####

 # ID of the gateway from which the client should be fetching messages.
@@ -1,10 +1,6 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use futures::channel::mpsc;
-use log::*;
-use tokio::runtime::Runtime;
-
 use client_core::client::cover_traffic_stream::LoopCoverTrafficStream;
 use client_core::client::inbound_messages::{
    InputMessage, InputMessageReceiver, InputMessageSender,
@@ -24,23 +20,19 @@ use client_core::client::topology_control::{
    TopologyAccessor, TopologyRefresher, TopologyRefresherConfig,
 };
 use client_core::config::persistence::key_pathfinder::ClientKeyPathfinder;
-#[cfg(feature = "coconut")]
-use coconut_interface::{hash_to_scalar, Credential, Parameters};
-#[cfg(feature = "coconut")]
-use credentials::bandwidth::{
-    prepare_for_spending, BandwidthVoucherAttributes, BANDWIDTH_VALUE, TOTAL_ATTRIBUTES,
-};
-#[cfg(feature = "coconut")]
-use credentials::obtain_aggregate_verification_key;
 use crypto::asymmetric::identity;
+use futures::channel::mpsc;
+use gateway_client::bandwidth::BandwidthController;
 use gateway_client::{
    AcknowledgementReceiver, AcknowledgementSender, GatewayClient, MixnetMessageReceiver,
    MixnetMessageSender,
 };
+use log::*;
 use nymsphinx::addressing::clients::Recipient;
 use nymsphinx::addressing::nodes::NodeIdentity;
 use nymsphinx::anonymous_replies::ReplySurb;
 use nymsphinx::receiver::ReconstructedMessage;
+use tokio::runtime::Runtime;

 use crate::client::config::{Config, SocketType};
 use crate::websocket;
@@ -173,41 +165,6 @@ impl NymClient {
        .start(self.runtime.handle())
    }

-    #[cfg(feature = "coconut")]
-    async fn prepare_coconut_credential(&self) -> Credential {
-        let verification_key = obtain_aggregate_verification_key(
-            &self.config.get_base().get_validator_api_endpoints(),
-        )
-        .await
-        .expect("could not obtain aggregate verification key of validators");
-
-        let params = Parameters::new(TOTAL_ATTRIBUTES).unwrap();
-        let bandwidth_credential_attributes = BandwidthVoucherAttributes {
-            serial_number: params.random_scalar(),
-            binding_number: params.random_scalar(),
-            voucher_value: hash_to_scalar(BANDWIDTH_VALUE.to_be_bytes()),
-            voucher_info: hash_to_scalar(String::from("BandwidthVoucher").as_bytes()),
-        };
-
-        let bandwidth_credential = credentials::bandwidth::obtain_signature(
-            &params,
-            &bandwidth_credential_attributes,
-            &self.config.get_base().get_validator_api_endpoints(),
-        )
-        .await
-        .expect("could not obtain bandwidth credential");
-        // the above would presumably be loaded from a file
-
-        // the below would only be executed once we know where we want to spend it (i.e. which gateway and stuff)
-        prepare_for_spending(
-            &self.key_manager.identity_keypair().public_key().to_bytes(),
-            &bandwidth_credential,
-            &bandwidth_credential_attributes,
-            &verification_key,
-        )
-        .expect("could not prepare out bandwidth credential for spending")
-    }
-
    fn start_gateway_client(
        &mut self,
        mixnet_message_sender: MixnetMessageSender,
@@ -227,7 +184,17 @@ impl NymClient {

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

            let mut gateway_client = GatewayClient::new(
                gateway_address,
@@ -237,13 +204,11 @@ impl NymClient {
                mixnet_message_sender,
                ack_sender,
                self.config.get_base().get_gateway_response_timeout(),
+                Some(bandwidth_controller),
            );

            gateway_client
-                .authenticate_and_start(
-                    #[cfg(feature = "coconut")]
-                    Some(coconut_credential),
-                )
+                .authenticate_and_start()
                .await
                .expect("could not authenticate and start up the gateway connection");

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

-use std::convert::TryInto;
-use std::sync::Arc;
-use std::time::Duration;
-
 use clap::{App, Arg, ArgMatches};
-use rand::rngs::OsRng;
-use rand::seq::SliceRandom;
-use rand::thread_rng;
-use url::Url;
-
 use client_core::client::key_manager::KeyManager;
 use client_core::config::persistence::key_pathfinder::ClientKeyPathfinder;
 #[cfg(feature = "coconut")]
 use coconut_interface::{hash_to_scalar, Credential, Parameters};
 use config::NymConfig;
 #[cfg(feature = "coconut")]
-use credentials::bandwidth::{
-    prepare_for_spending, BandwidthVoucherAttributes, BANDWIDTH_VALUE, TOTAL_ATTRIBUTES,
+use credentials::coconut::bandwidth::{
+    obtain_signature, prepare_for_spending, BandwidthVoucherAttributes, TOTAL_ATTRIBUTES,
 };
 #[cfg(feature = "coconut")]
 use credentials::obtain_aggregate_verification_key;
 use crypto::asymmetric::{encryption, identity};
 use gateway_client::GatewayClient;
 use gateway_requests::registration::handshake::SharedKeys;
+#[cfg(feature = "coconut")]
+use network_defaults::BANDWIDTH_VALUE;
 use nymsphinx::addressing::clients::Recipient;
 use nymsphinx::addressing::nodes::NodeIdentity;
+use rand::rngs::OsRng;
+use rand::seq::SliceRandom;
+use rand::thread_rng;
+use std::convert::TryInto;
+use std::sync::Arc;
+use std::time::Duration;
 use topology::{filter::VersionFilterable, gateway};
+use url::Url;

 use crate::client::config::Config;
 use crate::commands::override_config;

 pub fn command_args<'a, 'b>() -> clap::App<'a, 'b> {
-    App::new("init")
+    let app = App::new("init")
        .about("Initialise a Nym client. Do this first!")
        .arg(Arg::with_name("id")
            .long("id")
@@ -65,7 +65,21 @@ pub fn command_args<'a, 'b>() -> clap::App<'a, 'b> {
            .long("fastmode")
            .hidden(true) // this will prevent this flag from being displayed in `--help`
            .help("Mostly debug-related option to increase default traffic rate so that you would not need to modify config post init")
-        )
+        );
+    #[cfg(not(feature = "coconut"))]
+        let app = app
+        .arg(Arg::with_name("eth_endpoint")
+            .long("eth_endpoint")
+            .help("URL of an Ethereum full node that we want to use for getting bandwidth tokens from ERC20 tokens")
+            .takes_value(true)
+            .required(true))
+        .arg(Arg::with_name("eth_private_key")
+            .long("eth_private_key")
+            .help("Ethereum private key used for obtaining bandwidth tokens from ERC20 tokens")
+            .takes_value(true)
+            .required(true));
+
+    app
 }

 // this behaviour should definitely be changed, we shouldn't
@@ -84,13 +98,10 @@ async fn _prepare_temporary_credential(validators: &[Url], raw_identity: &[u8])
        voucher_info: hash_to_scalar(String::from("BandwidthVoucher").as_bytes()),
    };

-    let bandwidth_credential = credentials::bandwidth::obtain_signature(
-        &params,
-        &bandwidth_credential_attributes,
-        validators,
-    )
-    .await
-    .expect("could not obtain bandwidth credential");
+    let bandwidth_credential =
+        obtain_signature(&params, &bandwidth_credential_attributes, validators)
+            .await
+            .expect("could not obtain bandwidth credential");

    prepare_for_spending(
        raw_identity,
@@ -43,5 +43,14 @@ pub(crate) fn override_config(mut config: Config, matches: &ArgMatches) -> Confi
        config = config.with_port(port.unwrap());
    }

+    #[cfg(not(feature = "coconut"))]
+    if let Some(eth_endpoint) = matches.value_of("eth_endpoint") {
+        config.get_base_mut().with_eth_endpoint(eth_endpoint);
+    }
+    #[cfg(not(feature = "coconut"))]
+    if let Some(eth_private_key) = matches.value_of("eth_private_key") {
+        config.get_base_mut().with_eth_private_key(eth_private_key);
+    }
+
    config
 }
@@ -10,7 +10,7 @@ use log::*;
 use version_checker::is_minor_version_compatible;

 pub fn command_args<'a, 'b>() -> clap::App<'a, 'b> {
-    App::new("run")
+    let app = App::new("run")
        .about("Run the Nym client with provided configuration client optionally overriding set parameters")
        .arg(Arg::with_name("id")
            .long("id")
@@ -38,7 +38,19 @@ pub fn command_args<'a, 'b>() -> clap::App<'a, 'b> {
            .long("port")
            .help("Port for the socket (if applicable) to listen on")
            .takes_value(true)
-        )
+        );
+    #[cfg(not(feature = "coconut"))]
+        let app = app
+        .arg(Arg::with_name("eth_endpoint")
+            .long("eth_endpoint")
+            .help("URL of an Ethereum full node that we want to use for getting bandwidth tokens from ERC20 tokens")
+            .takes_value(true))
+        .arg(Arg::with_name("eth_private_key")
+            .long("eth_private_key")
+            .help("Ethereum private key used for obtaining bandwidth tokens from ERC20 tokens")
+            .takes_value(true));
+
+    app
 }

 // this only checks compatibility between config the binary. It does not take into consideration
@@ -1,8 +1,8 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-pub(crate) mod handler;
-pub(crate) mod listener;
-
 pub(crate) use handler::Handler;
 pub(crate) use listener::Listener;
+
+pub(crate) mod handler;
+pub(crate) mod listener;
@@ -32,13 +32,14 @@ crypto = { path = "../../common/crypto" }
 gateway-client = { path = "../../common/client-libs/gateway-client" }
 gateway-requests = { path = "../../gateway/gateway-requests" }
 nymsphinx = { path = "../../common/nymsphinx" }
-ordered-buffer = {path = "../../common/socks5/ordered-buffer"}
+ordered-buffer = { path = "../../common/socks5/ordered-buffer" }
 socks5-requests = { path = "../../common/socks5/requests" }
 topology = { path = "../../common/topology" }
 pemstore = { path = "../../common/pemstore" }
 proxy-helpers = { path = "../../common/socks5/proxy-helpers" }
 validator-client = { path = "../../common/client-libs/validator-client" }
 version-checker = { path = "../../common/version-checker" }
+network-defaults = { path = "../../common/network-defaults" }

 [features]
 coconut = ["coconut-interface", "credentials", "gateway-requests/coconut", "gateway-client/coconut"]
@@ -42,6 +42,17 @@ public_encryption_key_file = '{{ client.public_encryption_key_file }}'
 # sent but not received back.
 reply_encryption_key_store_path = '{{ client.reply_encryption_key_store_path }}'

+# Path to directory containing public/private keys used for bandwidth token purchase.
+# Those are saved in case of emergency, to be able to reclaim bandwidth tokens.
+# The public key is the name of the file, while the private key is the content.
+backup_bandwidth_token_keys_dir = '{{ client.backup_bandwidth_token_keys_dir }}'
+
+# Ethereum private key.
+eth_private_key = '{{ client.eth_private_key }}'
+
+# Addess to an Ethereum full node.
+eth_endpoint = '{{ client.eth_endpoint }}'
+
 ##### additional client config options #####

 # ID of the gateway from which the client should be fetching messages.
@@ -1,10 +1,6 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use futures::channel::mpsc;
-use log::*;
-use tokio::runtime::Runtime;
-
 use client_core::client::cover_traffic_stream::LoopCoverTrafficStream;
 use client_core::client::inbound_messages::{
    InputMessage, InputMessageReceiver, InputMessageSender,
@@ -22,21 +18,17 @@ use client_core::client::topology_control::{
    TopologyAccessor, TopologyRefresher, TopologyRefresherConfig,
 };
 use client_core::config::persistence::key_pathfinder::ClientKeyPathfinder;
-#[cfg(feature = "coconut")]
-use coconut_interface::{hash_to_scalar, Credential, Parameters};
-#[cfg(feature = "coconut")]
-use credentials::bandwidth::{
-    prepare_for_spending, BandwidthVoucherAttributes, BANDWIDTH_VALUE, TOTAL_ATTRIBUTES,
-};
-#[cfg(feature = "coconut")]
-use credentials::obtain_aggregate_verification_key;
 use crypto::asymmetric::identity;
+use futures::channel::mpsc;
+use gateway_client::bandwidth::BandwidthController;
 use gateway_client::{
    AcknowledgementReceiver, AcknowledgementSender, GatewayClient, MixnetMessageReceiver,
    MixnetMessageSender,
 };
+use log::*;
 use nymsphinx::addressing::clients::Recipient;
 use nymsphinx::addressing::nodes::NodeIdentity;
+use tokio::runtime::Runtime;

 use crate::client::config::Config;
 use crate::socks::{
@@ -161,41 +153,6 @@ impl NymClient {
        .start(self.runtime.handle())
    }

-    #[cfg(feature = "coconut")]
-    async fn prepare_coconut_credential(&self) -> Credential {
-        let verification_key = obtain_aggregate_verification_key(
-            &self.config.get_base().get_validator_api_endpoints(),
-        )
-        .await
-        .expect("could not obtain aggregate verification key of validators");
-
-        let params = Parameters::new(TOTAL_ATTRIBUTES).unwrap();
-        let bandwidth_credential_attributes = BandwidthVoucherAttributes {
-            serial_number: params.random_scalar(),
-            binding_number: params.random_scalar(),
-            voucher_value: hash_to_scalar(BANDWIDTH_VALUE.to_be_bytes()),
-            voucher_info: hash_to_scalar(String::from("BandwidthVoucher").as_bytes()),
-        };
-
-        let bandwidth_credential = credentials::bandwidth::obtain_signature(
-            &params,
-            &bandwidth_credential_attributes,
-            &self.config.get_base().get_validator_api_endpoints(),
-        )
-        .await
-        .expect("could not obtain bandwidth credential");
-        // the above would presumably be loaded from a file
-
-        // the below would only be executed once we know where we want to spend it (i.e. which gateway and stuff)
-        prepare_for_spending(
-            &self.key_manager.identity_keypair().public_key().to_bytes(),
-            &bandwidth_credential,
-            &bandwidth_credential_attributes,
-            &verification_key,
-        )
-        .expect("could not prepare out bandwidth credential for spending")
-    }
-
    fn start_gateway_client(
        &mut self,
        mixnet_message_sender: MixnetMessageSender,
@@ -215,7 +172,17 @@ impl NymClient {

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

            let mut gateway_client = GatewayClient::new(
                gateway_address,
@@ -225,13 +192,11 @@ impl NymClient {
                mixnet_message_sender,
                ack_sender,
                self.config.get_base().get_gateway_response_timeout(),
+                Some(bandwidth_controller),
            );

            gateway_client
-                .authenticate_and_start(
-                    #[cfg(feature = "coconut")]
-                    Some(coconut_credential),
-                )
+                .authenticate_and_start()
                .await
                .expect("could not authenticate and start up the gateway connection");

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

-use std::convert::TryInto;
-use std::sync::Arc;
-use std::time::Duration;
-
 use clap::{App, Arg, ArgMatches};
-use rand::{prelude::SliceRandom, rngs::OsRng, thread_rng};
-use url::Url;
-
 use client_core::client::key_manager::KeyManager;
 use client_core::config::persistence::key_pathfinder::ClientKeyPathfinder;
 #[cfg(feature = "coconut")]
 use coconut_interface::{hash_to_scalar, Credential, Parameters};
 use config::NymConfig;
 #[cfg(feature = "coconut")]
-use credentials::bandwidth::{
-    prepare_for_spending, BandwidthVoucherAttributes, BANDWIDTH_VALUE, TOTAL_ATTRIBUTES,
+use credentials::coconut::bandwidth::{
+    obtain_signature, prepare_for_spending, BandwidthVoucherAttributes, TOTAL_ATTRIBUTES,
 };
 #[cfg(feature = "coconut")]
 use credentials::obtain_aggregate_verification_key;
 use crypto::asymmetric::{encryption, identity};
 use gateway_client::GatewayClient;
 use gateway_requests::registration::handshake::SharedKeys;
+#[cfg(feature = "coconut")]
+use network_defaults::BANDWIDTH_VALUE;
 use nymsphinx::addressing::clients::Recipient;
 use nymsphinx::addressing::nodes::NodeIdentity;
+use rand::{prelude::SliceRandom, rngs::OsRng, thread_rng};
+use std::convert::TryInto;
+use std::sync::Arc;
+use std::time::Duration;
 use topology::{filter::VersionFilterable, gateway};
+use url::Url;

 use crate::client::config::Config;
 use crate::commands::override_config;

 pub fn command_args<'a, 'b>() -> clap::App<'a, 'b> {
-    App::new("init")
+    let app = App::new("init")
        .about("Initialise a Nym client. Do this first!")
        .arg(Arg::with_name("id")
            .long("id")
@@ -65,7 +65,21 @@ pub fn command_args<'a, 'b>() -> clap::App<'a, 'b> {
            .long("fastmode")
            .hidden(true) // this will prevent this flag from being displayed in `--help`
            .help("Mostly debug-related option to increase default traffic rate so that you would not need to modify config post init")
-        )
+        );
+    #[cfg(not(feature = "coconut"))]
+        let app = app
+        .arg(Arg::with_name("eth_endpoint")
+            .long("eth_endpoint")
+            .help("URL of an Ethereum full node that we want to use for getting bandwidth tokens from ERC20 tokens")
+            .takes_value(true)
+            .required(true))
+        .arg(Arg::with_name("eth_private_key")
+            .long("eth_private_key")
+            .help("Ethereum private key used for obtaining bandwidth tokens from ERC20 tokens")
+            .takes_value(true)
+            .required(true));
+
+    app
 }

 // this behaviour should definitely be changed, we shouldn't
@@ -84,13 +98,10 @@ async fn _prepare_temporary_credential(validators: &[Url], raw_identity: &[u8])
        voucher_info: hash_to_scalar("BandwidthVoucher"),
    };

-    let bandwidth_credential = credentials::bandwidth::obtain_signature(
-        &params,
-        &bandwidth_credential_attributes,
-        validators,
-    )
-    .await
-    .expect("could not obtain bandwidth credential");
+    let bandwidth_credential =
+        obtain_signature(&params, &bandwidth_credential_attributes, validators)
+            .await
+            .expect("could not obtain bandwidth credential");

    prepare_for_spending(
        raw_identity,
@@ -39,5 +39,14 @@ pub(crate) fn override_config(mut config: Config, matches: &ArgMatches) -> Confi
        config = config.with_port(port.unwrap());
    }

+    #[cfg(not(feature = "coconut"))]
+    if let Some(eth_endpoint) = matches.value_of("eth_endpoint") {
+        config.get_base_mut().with_eth_endpoint(eth_endpoint);
+    }
+    #[cfg(not(feature = "coconut"))]
+    if let Some(eth_private_key) = matches.value_of("eth_private_key") {
+        config.get_base_mut().with_eth_private_key(eth_private_key);
+    }
+
    config
 }
@@ -10,7 +10,7 @@ use log::*;
 use version_checker::is_minor_version_compatible;

 pub fn command_args<'a, 'b>() -> clap::App<'a, 'b> {
-    App::new("run")
+    let app = App::new("run")
        .about("Run the Nym client with provided configuration client optionally overriding set parameters")
        .arg(Arg::with_name("id")
            .long("id")
@@ -44,7 +44,19 @@ pub fn command_args<'a, 'b>() -> clap::App<'a, 'b> {
            .long("port")
            .help("Port for the socket to listen on")
            .takes_value(true)
-        )
+        );
+    #[cfg(not(feature = "coconut"))]
+    let app = app
+        .arg(Arg::with_name("eth_endpoint")
+            .long("eth_endpoint")
+            .help("URL of an Ethereum full node that we want to use for getting bandwidth tokens from ERC20 tokens")
+            .takes_value(true))
+        .arg(Arg::with_name("eth_private_key")
+            .long("eth_private_key")
+            .help("Ethereum private key used for obtaining bandwidth tokens from ERC20 tokens")
+            .takes_value(true));
+
+    app
 }

 // this only checks compatibility between config the binary. It does not take into consideration
@@ -1,30 +1,21 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use std::sync::Arc;
-use std::time::Duration;
-
-use futures::channel::mpsc;
-use rand::rngs::OsRng;
-use url::Url;
-use wasm_bindgen::prelude::*;
-use wasm_bindgen_futures::spawn_local;
-
-#[cfg(feature = "coconut")]
-use coconut_interface::Credential;
-#[cfg(feature = "coconut")]
-use coconut_interface::{hash_to_scalar, Parameters};
-#[cfg(feature = "coconut")]
-use credentials::bandwidth::{BandwidthVoucherAttributes, BANDWIDTH_VALUE, TOTAL_ATTRIBUTES};
-#[cfg(feature = "coconut")]
-use credentials::{bandwidth::prepare_for_spending, obtain_aggregate_verification_key};
 use crypto::asymmetric::{encryption, identity};
+use futures::channel::mpsc;
+use gateway_client::bandwidth::BandwidthController;
 use gateway_client::GatewayClient;
 use nymsphinx::acknowledgements::AckKey;
 use nymsphinx::addressing::clients::Recipient;
 use nymsphinx::preparer::MessagePreparer;
+use rand::rngs::OsRng;
 use received_processor::ReceivedMessagesProcessor;
+use std::sync::Arc;
+use std::time::Duration;
 use topology::{gateway, nym_topology_from_bonds, NymTopology};
+use url::Url;
+use wasm_bindgen::prelude::*;
+use wasm_bindgen_futures::spawn_local;
 use wasm_utils::{console_log, console_warn};

 pub(crate) mod received_processor;
@@ -108,51 +99,15 @@ impl NymClient {
        self.self_recipient().to_string()
    }

-    #[cfg(feature = "coconut")]
-    async fn prepare_coconut_credential(validators: &[Url], identity_bytes: &[u8]) -> Credential {
-        let verification_key = obtain_aggregate_verification_key(validators)
-            .await
-            .expect("could not obtain aggregate verification key of validators");
-
-        let params = Parameters::new(TOTAL_ATTRIBUTES).unwrap();
-        let bandwidth_credential_attributes = BandwidthVoucherAttributes {
-            serial_number: params.random_scalar(),
-            binding_number: params.random_scalar(),
-            voucher_value: hash_to_scalar(BANDWIDTH_VALUE.to_be_bytes()),
-            voucher_info: hash_to_scalar(String::from("BandwidthVoucher").as_bytes()),
-        };
-
-        let bandwidth_credential = credentials::bandwidth::obtain_signature(
-            &params,
-            &bandwidth_credential_attributes,
-            validators,
-        )
-        .await
-        .expect("could not obtain bandwidth credential");
-        // the above would presumably be loaded from a file
-
-        // the below would only be executed once we know where we want to spend it (i.e. which gateway and stuff)
-        prepare_for_spending(
-            identity_bytes,
-            &bandwidth_credential,
-            &bandwidth_credential_attributes,
-            &verification_key,
-        )
-        .expect("could not prepare out bandwidth credential for spending")
-    }
-
    // Right now it's impossible to have async exported functions to take `&self` rather than self
    pub async fn initial_setup(self) -> Self {
        #[cfg(feature = "coconut")]
-        let coconut_credential = {
-            let validator_server = self.validator_server.clone();
-            let identity_public_key = self.identity.public_key().clone();
-            Self::prepare_coconut_credential(
-                &vec![validator_server],
-                &identity_public_key.to_bytes(),
-            )
-            .await
-        };
+        let bandwidth_controller = Some(BandwidthController::new(
+            vec![self.validator_server.clone()],
+            *self.identity.public_key(),
+        ));
+        #[cfg(not(feature = "coconut"))]
+        let bandwidth_controller = None;

        let mut client = self.get_and_update_topology().await;
        let gateway = client.choose_gateway();
@@ -168,13 +123,11 @@ impl NymClient {
            mixnet_messages_sender,
            ack_sender,
            DEFAULT_GATEWAY_RESPONSE_TIMEOUT,
+            bandwidth_controller,
        );

        gateway_client
-            .authenticate_and_start(
-                #[cfg(feature = "coconut")]
-                Some(coconut_credential),
-            )
+            .authenticate_and_start()
            .await
            .expect("could not authenticate and start up the gateway connection");

@@ -10,14 +10,19 @@ edition = "2018"
 # TODO: (for this and other crates), similarly to 'tokio', import only required "futures" modules rather than
 # the entire crate
 futures = "0.3"
+json = "0.12.4"
 log = "0.4"
+thiserror = "1.0"
+url = "2.2"
 rand = { version = "0.7.3", features = ["wasm-bindgen"] }

 # internal
+credentials = { path = "../../credentials" }
 crypto = { path = "../../crypto" }
 gateway-requests = { path = "../../../gateway/gateway-requests" }
 nymsphinx = { path = "../../nymsphinx" }
 coconut-interface = { path = "../../coconut-interface", optional = true }
+network-defaults = { path = "../../network-defaults" }

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

+[target."cfg(not(target_arch = \"wasm32\"))".dependencies.secp256k1]
+version = "0.20.3"
+
+[target."cfg(not(target_arch = \"wasm32\"))".dependencies.web3]
+version = "0.17.0"
+
 # wasm-only dependencies
 [target."cfg(target_arch = \"wasm32\")".dependencies.wasm-bindgen]
 version = "0.2"
@@ -0,0 +1,247 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+#[cfg(feature = "coconut")]
+use credentials::coconut::{
+    bandwidth::{
+        obtain_signature, prepare_for_spending, BandwidthVoucherAttributes, TOTAL_ATTRIBUTES,
+    },
+    utils::obtain_aggregate_verification_key,
+};
+#[cfg(not(feature = "coconut"))]
+use credentials::token::bandwidth::TokenCredential;
+#[cfg(not(feature = "coconut"))]
+use crypto::asymmetric::identity;
+use crypto::asymmetric::identity::PublicKey;
+use network_defaults::BANDWIDTH_VALUE;
+#[cfg(not(feature = "coconut"))]
+use network_defaults::{
+    eth_contract::ETH_JSON_ABI, ETH_BURN_FUNCTION_NAME, ETH_CONTRACT_ADDRESS, ETH_MIN_BLOCK_DEPTH,
+    TOKENS_TO_BURN,
+};
+#[cfg(not(feature = "coconut"))]
+use rand::rngs::OsRng;
+#[cfg(not(feature = "coconut"))]
+use secp256k1::SecretKey;
+#[cfg(not(feature = "coconut"))]
+use std::io::Write;
+#[cfg(not(feature = "coconut"))]
+use std::str::FromStr;
+#[cfg(not(feature = "coconut"))]
+use web3::{
+    contract::{Contract, Options},
+    transports::Http,
+    types::{Address, Bytes, U256, U64},
+    Web3,
+};
+
+use crate::error::GatewayClientError;
+
+#[cfg(not(feature = "coconut"))]
+pub fn eth_contract(web3: Web3<Http>) -> Contract<Http> {
+    Contract::from_json(
+        web3.eth(),
+        Address::from(ETH_CONTRACT_ADDRESS),
+        json::parse(ETH_JSON_ABI)
+            .expect("Invalid json abi")
+            .dump()
+            .as_bytes(),
+    )
+    .expect("Invalid json abi")
+}
+
+#[derive(Clone)]
+pub struct BandwidthController {
+    #[cfg(feature = "coconut")]
+    validator_endpoints: Vec<url::Url>,
+    #[cfg(feature = "coconut")]
+    identity: PublicKey,
+    #[cfg(not(feature = "coconut"))]
+    contract: Contract<Http>,
+    #[cfg(not(feature = "coconut"))]
+    eth_private_key: SecretKey,
+    #[cfg(not(feature = "coconut"))]
+    backup_bandwidth_token_keys_dir: std::path::PathBuf,
+}
+
+impl BandwidthController {
+    #[cfg(feature = "coconut")]
+    pub fn new(validator_endpoints: Vec<url::Url>, identity: PublicKey) -> Self {
+        BandwidthController {
+            validator_endpoints,
+            identity,
+        }
+    }
+
+    #[cfg(not(feature = "coconut"))]
+    pub fn new(
+        eth_endpoint: String,
+        eth_private_key: String,
+        backup_bandwidth_token_keys_dir: std::path::PathBuf,
+    ) -> Result<Self, GatewayClientError> {
+        // Fail early, on invalid url
+        let transport =
+            Http::new(&eth_endpoint).map_err(|_| GatewayClientError::InvalidURL(eth_endpoint))?;
+        let web3 = web3::Web3::new(transport);
+        // Fail early, on invalid abi
+        let contract = eth_contract(web3);
+        let eth_private_key = secp256k1::SecretKey::from_str(&eth_private_key)
+            .map_err(|_| GatewayClientError::InvalidEthereumPrivateKey)?;
+
+        Ok(BandwidthController {
+            contract,
+            eth_private_key,
+            backup_bandwidth_token_keys_dir,
+        })
+    }
+
+    #[cfg(not(feature = "coconut"))]
+    fn backup_keypair(&self, keypair: &identity::KeyPair) -> Result<(), GatewayClientError> {
+        std::fs::create_dir_all(&self.backup_bandwidth_token_keys_dir)?;
+        let file_path = self
+            .backup_bandwidth_token_keys_dir
+            .join(keypair.public_key().to_base58_string());
+        let mut file = std::fs::File::create(file_path)?;
+        file.write_all(&keypair.private_key().to_bytes())?;
+
+        Ok(())
+    }
+
+    #[cfg(feature = "coconut")]
+    pub async fn prepare_coconut_credential(
+        &self,
+    ) -> Result<coconut_interface::Credential, GatewayClientError> {
+        let verification_key = obtain_aggregate_verification_key(&self.validator_endpoints).await?;
+        let params = coconut_interface::Parameters::new(TOTAL_ATTRIBUTES).unwrap();
+
+        // TODO: Decide what is the value and additional info associated with the bandwidth voucher
+        let bandwidth_credential_attributes = BandwidthVoucherAttributes {
+            serial_number: params.random_scalar(),
+            binding_number: params.random_scalar(),
+            voucher_value: coconut_interface::hash_to_scalar(BANDWIDTH_VALUE.to_be_bytes()),
+            voucher_info: coconut_interface::hash_to_scalar(
+                String::from("BandwidthVoucher").as_bytes(),
+            ),
+        };
+
+        let bandwidth_credential = obtain_signature(
+            &params,
+            &bandwidth_credential_attributes,
+            &self.validator_endpoints,
+        )
+        .await?;
+        // the above would presumably be loaded from a file
+
+        // the below would only be executed once we know where we want to spend it (i.e. which gateway and stuff)
+        Ok(prepare_for_spending(
+            &self.identity.to_bytes(),
+            &bandwidth_credential,
+            &bandwidth_credential_attributes,
+            &verification_key,
+        )?)
+    }
+
+    #[cfg(not(feature = "coconut"))]
+    pub async fn prepare_token_credential(
+        &self,
+        gateway_identity: PublicKey,
+    ) -> Result<TokenCredential, GatewayClientError> {
+        let mut rng = OsRng;
+
+        let kp = identity::KeyPair::new(&mut rng);
+        self.backup_keypair(&kp)?;
+
+        let verification_key = *kp.public_key();
+        let signed_verification_key = kp.private_key().sign(&verification_key.to_bytes());
+        self.buy_token_credential(verification_key, signed_verification_key)
+            .await?;
+
+        let message: Vec<u8> = verification_key
+            .to_bytes()
+            .iter()
+            .chain(gateway_identity.to_bytes().iter())
+            .copied()
+            .collect();
+        let signature = kp.private_key().sign(&message);
+
+        Ok(TokenCredential::new(
+            verification_key,
+            gateway_identity,
+            BANDWIDTH_VALUE,
+            signature,
+        ))
+    }
+
+    #[cfg(not(feature = "coconut"))]
+    pub async fn buy_token_credential(
+        &self,
+        verification_key: PublicKey,
+        signed_verification_key: identity::Signature,
+    ) -> Result<(), GatewayClientError> {
+        // 0 means a transaction failure, 1 means success
+        let confirmations = if cfg!(debug_assertions) {
+            1
+        } else {
+            ETH_MIN_BLOCK_DEPTH
+        };
+        // 15 seconds per confirmation block + 10 seconds of network overhead
+        log::info!(
+            "Waiting for Ethereum transaction. This should take about {} seconds",
+            confirmations * 15 + 10
+        );
+        let recipt = self
+            .contract
+            .signed_call_with_confirmations(
+                ETH_BURN_FUNCTION_NAME,
+                (
+                    U256::from(TOKENS_TO_BURN),
+                    U256::from(&verification_key.to_bytes()),
+                    Bytes(signed_verification_key.to_bytes().to_vec()),
+                ),
+                Options::default(),
+                confirmations,
+                &self.eth_private_key,
+            )
+            .await?;
+        if Some(U64::from(0)) == recipt.status {
+            Err(GatewayClientError::BurnTokenError(
+                web3::Error::InvalidResponse(format!(
+                    "Transaction status is 0 (failure): {:?}",
+                    recipt.logs,
+                )),
+            ))
+        } else {
+            log::info!(
+                "Bought bandwidth on Ethereum: {} MB",
+                BANDWIDTH_VALUE / 1024 / 1024
+            );
+            Ok(())
+        }
+    }
+}
+
+#[cfg(not(feature = "coconut"))]
+#[cfg(test)]
+mod tests {
+    use network_defaults::ETH_EVENT_NAME;
+
+    use super::*;
+
+    #[test]
+    fn parse_contract() {
+        let transport =
+            Http::new("https://rinkeby.infura.io/v3/00000000000000000000000000000000").unwrap();
+        let web3 = web3::Web3::new(transport);
+        // test no panic occurs
+        eth_contract(web3);
+    }
+
+    #[test]
+    fn check_event_name_constant_against_abi() {
+        let transport =
+            Http::new("https://rinkeby.infura.io/v3/00000000000000000000000000000000").unwrap();
+        let web3 = web3::Web3::new(transport);
+        let contract = eth_contract(web3);
+        assert!(contract.abi().event(ETH_EVENT_NAME).is_ok());
+    }
+}
@@ -1,6 +1,7 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

+use crate::bandwidth::BandwidthController;
 use crate::cleanup_socket_message;
 use crate::error::GatewayClientError;
 use crate::packet_router::PacketRouter;
@@ -8,6 +9,10 @@ pub use crate::packet_router::{
    AcknowledgementReceiver, AcknowledgementSender, MixnetMessageReceiver, MixnetMessageSender,
 };
 use crate::socket_state::{PartiallyDelegated, SocketState};
+#[cfg(feature = "coconut")]
+use coconut_interface::Credential;
+#[cfg(not(feature = "coconut"))]
+use credentials::token::bandwidth::TokenCredential;
 use crypto::asymmetric::identity;
 use futures::{FutureExt, SinkExt, StreamExt};
 use gateway_requests::authentication::encrypted_address::EncryptedAddressBytes;
@@ -30,15 +35,11 @@ use fluvio_wasm_timer as wasm_timer;
 #[cfg(target_arch = "wasm32")]
 use wasm_utils::websocket::JSWebsocket;

-#[cfg(feature = "coconut")]
-use coconut_interface::Credential;
-
 const DEFAULT_RECONNECTION_ATTEMPTS: usize = 10;
 const DEFAULT_RECONNECTION_BACKOFF: Duration = Duration::from_secs(5);

 pub struct GatewayClient {
    authenticated: bool,
-    #[cfg(feature = "coconut")]
    bandwidth_remaining: i64,
    gateway_address: String,
    gateway_identity: identity::PublicKey,
@@ -47,6 +48,7 @@ pub struct GatewayClient {
    connection: SocketState,
    packet_router: PacketRouter,
    response_timeout_duration: Duration,
+    bandwidth_controller: Option<BandwidthController>,

    // reconnection related variables
    /// Specifies whether client should try to reconnect to gateway on connection failure.
@@ -69,20 +71,19 @@ impl GatewayClient {
        mixnet_message_sender: MixnetMessageSender,
        ack_sender: AcknowledgementSender,
        response_timeout_duration: Duration,
+        bandwidth_controller: Option<BandwidthController>,
    ) -> Self {
        GatewayClient {
            authenticated: false,
-
-            #[cfg(feature = "coconut")]
            bandwidth_remaining: 0,
            gateway_address,
-
            gateway_identity,
            local_identity,
            shared_key,
            connection: SocketState::NotConnected,
            packet_router: PacketRouter::new(ack_sender, mixnet_message_sender),
            response_timeout_duration,
+            bandwidth_controller,
            should_reconnect_on_failure: true,
            reconnection_attempts: DEFAULT_RECONNECTION_ATTEMPTS,
            reconnection_backoff: DEFAULT_RECONNECTION_BACKOFF,
@@ -118,10 +119,7 @@ impl GatewayClient {

        GatewayClient {
            authenticated: false,
-
-            #[cfg(feature = "coconut")]
            bandwidth_remaining: 0,
-
            gateway_address,
            gateway_identity,
            local_identity,
@@ -129,6 +127,7 @@ impl GatewayClient {
            connection: SocketState::NotConnected,
            packet_router,
            response_timeout_duration,
+            bandwidth_controller: None,
            should_reconnect_on_failure: false,
            reconnection_attempts: DEFAULT_RECONNECTION_ATTEMPTS,
            reconnection_backoff: DEFAULT_RECONNECTION_BACKOFF,
@@ -139,6 +138,10 @@ impl GatewayClient {
        self.gateway_identity
    }

+    pub fn remaining_bandwidth(&self) -> i64 {
+        self.bandwidth_remaining
+    }
+
    #[cfg(not(target_arch = "wasm32"))]
    async fn _close_connection(&mut self) -> Result<(), GatewayClientError> {
        match std::mem::replace(&mut self.connection, SocketState::NotConnected) {
@@ -203,14 +206,7 @@ impl GatewayClient {

        for i in 1..self.reconnection_attempts {
            info!("attempt {}...", i);
-            if self
-                .authenticate_and_start(
-                    #[cfg(feature = "coconut")]
-                    None,
-                )
-                .await
-                .is_ok()
-            {
+            if self.authenticate_and_start().await.is_ok() {
                info!("managed to reconnect!");
                return Ok(());
            }
@@ -229,13 +225,7 @@ impl GatewayClient {

        // final attempt (done separately to be able to return a proper error)
        info!("attempt {}", self.reconnection_attempts);
-        match self
-            .authenticate_and_start(
-                #[cfg(feature = "coconut")]
-                None,
-            )
-            .await
-        {
+        match self.authenticate_and_start().await {
            Ok(_) => {
                info!("managed to reconnect!");
                Ok(())
@@ -446,8 +436,12 @@ impl GatewayClient {
            ClientControlRequest::new_authenticate(self_address, encrypted_address, iv).into();

        match self.send_websocket_message(msg).await? {
-            ServerResponse::Authenticate { status } => {
+            ServerResponse::Authenticate {
+                status,
+                bandwidth_remaining,
+            } => {
                self.authenticated = status;
+                self.bandwidth_remaining = bandwidth_remaining;
                Ok(())
            }
            ServerResponse::Error { message } => Err(GatewayClientError::GatewayError(message)),
@@ -473,22 +467,15 @@ impl GatewayClient {
    }

    #[cfg(feature = "coconut")]
-    pub async fn claim_coconut_bandwidth(
+    async fn claim_coconut_bandwidth(
        &mut self,
-        coconut_credential: Credential,
+        credential: Credential,
    ) -> Result<(), GatewayClientError> {
-        if !self.authenticated {
-            return Err(GatewayClientError::NotAuthenticated);
-        }
-        if self.shared_key.is_none() {
-            return Err(GatewayClientError::NoSharedKeyAvailable);
-        }
-
        let mut rng = OsRng;
        let iv = IV::new_random(&mut rng);

        let msg = ClientControlRequest::new_enc_coconut_bandwidth_credential(
-            &coconut_credential,
+            &credential,
            self.shared_key.as_ref().unwrap(),
            iv,
        )
@@ -502,7 +489,64 @@ impl GatewayClient {
        Ok(())
    }

-    #[cfg(feature = "coconut")]
+    #[cfg(not(feature = "coconut"))]
+    async fn claim_token_bandwidth(
+        &mut self,
+        credential: TokenCredential,
+    ) -> Result<(), GatewayClientError> {
+        let mut rng = OsRng;
+
+        let iv = IV::new_random(&mut rng);
+
+        let msg = ClientControlRequest::new_enc_token_bandwidth_credential(
+            &credential,
+            self.shared_key.as_ref().unwrap(),
+            iv,
+        )
+        .into();
+        self.bandwidth_remaining = match self.send_websocket_message(msg).await? {
+            ServerResponse::Bandwidth { available_total } => Ok(available_total),
+            ServerResponse::Error { message } => Err(GatewayClientError::GatewayError(message)),
+            _ => Err(GatewayClientError::UnexpectedResponse),
+        }?;
+
+        Ok(())
+    }
+
+    pub async fn claim_bandwidth(&mut self) -> Result<(), GatewayClientError> {
+        if !self.authenticated {
+            return Err(GatewayClientError::NotAuthenticated);
+        }
+        if self.shared_key.is_none() {
+            return Err(GatewayClientError::NoSharedKeyAvailable);
+        }
+        if self.bandwidth_controller.is_none() {
+            return Err(GatewayClientError::NoBandwidthControllerAvailable);
+        }
+
+        warn!("Not enough bandwidth. Trying to get more bandwidth, this might take a while");
+
+        #[cfg(feature = "coconut")]
+        let credential = self
+            .bandwidth_controller
+            .as_ref()
+            .unwrap()
+            .prepare_coconut_credential()
+            .await?;
+        #[cfg(not(feature = "coconut"))]
+        let credential = self
+            .bandwidth_controller
+            .as_ref()
+            .unwrap()
+            .prepare_token_credential(self.gateway_identity)
+            .await?;
+
+        #[cfg(feature = "coconut")]
+        return self.claim_coconut_bandwidth(credential).await;
+        #[cfg(not(feature = "coconut"))]
+        return self.claim_token_bandwidth(credential).await;
+    }
+
    fn estimate_required_bandwidth(&self, packets: &[MixPacket]) -> i64 {
        packets
            .iter()
@@ -517,9 +561,16 @@ impl GatewayClient {
        if !self.authenticated {
            return Err(GatewayClientError::NotAuthenticated);
        }
-        #[cfg(feature = "coconut")]
-        if self.estimate_required_bandwidth(&packets) < self.bandwidth_remaining {
-            return Err(GatewayClientError::NotEnoughBandwidth);
+        if self.estimate_required_bandwidth(&packets) > self.bandwidth_remaining {
+            // Try to claim more bandwidth first, and return an error only if that is still not
+            // enough (the current granularity for bandwidth should be sufficient)
+            self.claim_bandwidth().await?;
+            if self.estimate_required_bandwidth(&packets) > self.bandwidth_remaining {
+                return Err(GatewayClientError::NotEnoughBandwidth(
+                    self.estimate_required_bandwidth(&packets),
+                    self.bandwidth_remaining,
+                ));
+            }
        }
        if !self.connection.is_established() {
            return Err(GatewayClientError::ConnectionNotEstablished);
@@ -585,9 +636,16 @@ impl GatewayClient {
        if !self.authenticated {
            return Err(GatewayClientError::NotAuthenticated);
        }
-        #[cfg(feature = "coconut")]
        if (mix_packet.sphinx_packet().len() as i64) > self.bandwidth_remaining {
-            return Err(GatewayClientError::NotEnoughBandwidth);
+            // Try to claim more bandwidth first, and return an error only if that is still not
+            // enough
+            self.claim_bandwidth().await?;
+            if (mix_packet.sphinx_packet().len() as i64) > self.bandwidth_remaining {
+                return Err(GatewayClientError::NotEnoughBandwidth(
+                    mix_packet.sphinx_packet().len() as i64,
+                    self.bandwidth_remaining,
+                ));
+            }
        }
        if !self.connection.is_established() {
            return Err(GatewayClientError::ConnectionNotEstablished);
@@ -624,10 +682,6 @@ impl GatewayClient {
        if !self.authenticated {
            return Err(GatewayClientError::NotAuthenticated);
        }
-        #[cfg(feature = "coconut")]
-        if self.bandwidth_remaining <= 0 {
-            return Err(GatewayClientError::NotEnoughBandwidth);
-        }
        if self.connection.is_partially_delegated() {
            return Ok(());
        }
@@ -655,22 +709,12 @@ impl GatewayClient {
        Ok(())
    }

-    pub async fn authenticate_and_start(
-        &mut self,
-        #[cfg(feature = "coconut")] coconut_credential: Option<Credential>,
-    ) -> Result<Arc<SharedKeys>, GatewayClientError> {
+    pub async fn authenticate_and_start(&mut self) -> Result<Arc<SharedKeys>, GatewayClientError> {
        if !self.connection.is_established() {
            self.establish_connection().await?;
        }
        let shared_key = self.perform_initial_authentication().await?;

-        #[cfg(feature = "coconut")]
-        {
-            if let Some(coconut_credential) = coconut_credential {
-                self.claim_coconut_bandwidth(coconut_credential).await?;
-            }
-        }
-
        // this call is NON-blocking
        self.start_listening_for_mixnet_messages()?;

@@ -2,39 +2,83 @@
 // SPDX-License-Identifier: Apache-2.0

 use gateway_requests::registration::handshake::error::HandshakeError;
-use std::fmt::{self, Error, Formatter};
 use std::io;
+use thiserror::Error;
 use tungstenite::Error as WsError;
 #[cfg(target_arch = "wasm32")]
 use wasm_bindgen::JsValue;
+#[cfg(not(feature = "coconut"))]
+use web3::Error as Web3Error;

-#[derive(Debug)]
+#[derive(Debug, Error)]
 pub enum GatewayClientError {
+    #[error("Connection to the gateway is not established")]
    ConnectionNotEstablished,
+
+    #[error("Gateway returned an error response - {0}")]
    GatewayError(String),
-    NetworkError(WsError),
+
+    #[error("There was a network error - {0}")]
+    NetworkError(#[from] WsError),

    // TODO: see if `JsValue` is a reasonable type for this
    #[cfg(target_arch = "wasm32")]
+    #[error("There was a network error")]
    NetworkErrorWasm(JsValue),

-    NoSharedKeyAvailable,
-    ConnectionAbruptlyClosed,
-    MalformedResponse,
-    SerializeCredential,
-    NotAuthenticated,
-    NotEnoughBandwidth,
-    UnexpectedResponse,
-    ConnectionInInvalidState,
-    RegistrationFailure(HandshakeError),
-    AuthenticationFailure,
-    Timeout,
-}
+    #[cfg(not(feature = "coconut"))]
+    #[error("Could not backup keypair - {0}")]
+    IOError(#[from] std::io::Error),

-impl From<WsError> for GatewayClientError {
-    fn from(err: WsError) -> Self {
-        GatewayClientError::NetworkError(err)
-    }
+    #[cfg(not(feature = "coconut"))]
+    #[error("Could not burn ERC20 token in Ethereum smart contract - {0}")]
+    BurnTokenError(#[from] Web3Error),
+
+    #[cfg(not(feature = "coconut"))]
+    #[error("Invalid Ethereum private key")]
+    InvalidEthereumPrivateKey,
+
+    #[error("Invalid URL - {0}")]
+    InvalidURL(String),
+
+    #[error("No shared key was provided or obtained")]
+    NoSharedKeyAvailable,
+
+    #[error("No bandwidth controller provided")]
+    NoBandwidthControllerAvailable,
+
+    #[error("Credential error - {0}")]
+    CredentialError(#[from] credentials::error::Error),
+
+    #[error("Connection was abruptly closed")]
+    ConnectionAbruptlyClosed,
+
+    #[error("Received response was malformed")]
+    MalformedResponse,
+
+    #[error("Credential could not be serialized")]
+    SerializeCredential,
+
+    #[error("Client is not authenticated")]
+    NotAuthenticated,
+
+    #[error("Client does not have enough bandwidth: estimated {0}, remaining: {1}")]
+    NotEnoughBandwidth(i64, i64),
+
+    #[error("Received an unexpected response")]
+    UnexpectedResponse,
+
+    #[error("Connection is in an invalid state - please send a bug report")]
+    ConnectionInInvalidState,
+
+    #[error("Failed to finish registration handshake - {0}")]
+    RegistrationFailure(HandshakeError),
+
+    #[error("Authentication failure")]
+    AuthenticationFailure,
+
+    #[error("Timed out")]
+    Timeout,
 }

 impl GatewayClientError {
@@ -54,60 +98,3 @@ impl GatewayClientError {
        }
    }
 }
-
-#[cfg(target_arch = "wasm32")]
-impl From<JsValue> for GatewayClientError {
-    fn from(err: JsValue) -> Self {
-        GatewayClientError::NetworkErrorWasm(err)
-    }
-}
-
-// better human readable representation of the error, mostly so that GatewayClientError
-// would implement std::error::Error
-impl fmt::Display for GatewayClientError {
-    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), Error> {
-        match self {
-            GatewayClientError::ConnectionNotEstablished => {
-                write!(f, "connection to the gateway is not established")
-            }
-            GatewayClientError::NoSharedKeyAvailable => {
-                write!(f, "no shared key was provided or obtained")
-            }
-            GatewayClientError::NotAuthenticated => write!(f, "client is not authenticated"),
-
-            GatewayClientError::NetworkError(err) => {
-                write!(f, "there was a network error - {}", err)
-            }
-            #[cfg(target_arch = "wasm32")]
-            GatewayClientError::NetworkErrorWasm(err) => {
-                write!(f, "there was a network error - {:?}", err)
-            }
-
-            GatewayClientError::ConnectionAbruptlyClosed => {
-                write!(f, "connection was abruptly closed")
-            }
-            GatewayClientError::Timeout => write!(f, "timed out"),
-            GatewayClientError::MalformedResponse => write!(f, "received response was malformed"),
-            GatewayClientError::ConnectionInInvalidState => write!(
-                f,
-                "connection is in an invalid state - please send a bug report"
-            ),
-            GatewayClientError::RegistrationFailure(handshake_err) => write!(
-                f,
-                "failed to finish registration handshake - {}",
-                handshake_err
-            ),
-            GatewayClientError::AuthenticationFailure => write!(f, "authentication failure"),
-            GatewayClientError::GatewayError(err) => {
-                write!(f, "gateway returned an error response - {}", err)
-            }
-            GatewayClientError::UnexpectedResponse => write!(f, "received an unexpected response"),
-            GatewayClientError::NotEnoughBandwidth => {
-                write!(f, "client does not have enough bandwidth")
-            }
-            GatewayClientError::SerializeCredential => {
-                write!(f, "credential could not be serialized")
-            }
-        }
-    }
-}
@@ -8,6 +8,7 @@ pub use packet_router::{
 };
 use tungstenite::{protocol::Message, Error as WsError};

+pub mod bandwidth;
 pub mod client;
 pub mod error;
 pub mod packet_router;
@@ -119,7 +119,7 @@ impl PartiallyDelegated {
            }
            .is_err()
            {
-                panic!("failed to send back `mixnet_receiver_future` result on the oneshot channel")
+                warn!("failed to send back `mixnet_receiver_future` result on the oneshot channel")
            }
        };

@@ -32,7 +32,7 @@ flate2 = { version = "1.0.20", optional = true }
 sha2 = { version = "0.9.5", optional = true }
 itertools = { version = "0.10", optional = true }
 cosmwasm-std = { git = "https://github.com/jstuczyn/cosmwasm", branch="0.14.1-updatedk256", optional = true }
-ts-rs = "3.0"
+ts-rs = {version = "5.1", optional = true}

 [features]
 nymd-client = ["async-trait", "bip39", "config", "cosmrs", "prost", "flate2", "sha2", "itertools", "cosmwasm-std"]
@@ -10,9 +10,9 @@ use mixnet_contract::StateParams;

 use crate::{validator_api, ValidatorClientError};
 use coconut_interface::{BlindSignRequestBody, BlindedSignatureResponse, VerificationKeyResponse};
+use mixnet_contract::{GatewayBond, MixNodeBond, MixnodeRewardingStatusResponse};
 #[cfg(feature = "nymd-client")]
-use mixnet_contract::RawDelegationData;
-use mixnet_contract::{GatewayBond, MixNodeBond};
+use mixnet_contract::{RawDelegationData, RewardingIntervalResponse};
 use url::Url;

 #[cfg(feature = "nymd-client")]
@@ -172,6 +172,57 @@ impl<C> Client<C> {
        Ok(self.nymd.get_state_params().await?)
    }

+    pub async fn get_current_rewarding_interval(
+        &self,
+    ) -> Result<RewardingIntervalResponse, ValidatorClientError>
+    where
+        C: CosmWasmClient + Sync,
+    {
+        Ok(self.nymd.get_current_rewarding_interval().await?)
+    }
+
+    pub async fn get_rewarding_status(
+        &self,
+        mix_identity: mixnet_contract::IdentityKey,
+        rewarding_interval_nonce: u32,
+    ) -> Result<MixnodeRewardingStatusResponse, ValidatorClientError>
+    where
+        C: CosmWasmClient + Sync,
+    {
+        Ok(self
+            .nymd
+            .get_rewarding_status(mix_identity, rewarding_interval_nonce)
+            .await?)
+    }
+
+    pub async fn get_reward_pool(&self) -> Result<u128, ValidatorClientError>
+    where
+        C: CosmWasmClient + Sync,
+    {
+        Ok(self.nymd.get_reward_pool().await?.u128())
+    }
+
+    pub async fn get_circulating_supply(&self) -> Result<u128, ValidatorClientError>
+    where
+        C: CosmWasmClient + Sync,
+    {
+        Ok(self.nymd.get_circulating_supply().await?.u128())
+    }
+
+    pub async fn get_sybil_resistance_percent(&self) -> Result<u8, ValidatorClientError>
+    where
+        C: CosmWasmClient + Sync,
+    {
+        Ok(self.nymd.get_sybil_resistance_percent().await?)
+    }
+
+    pub async fn get_epoch_reward_percent(&self) -> Result<u8, ValidatorClientError>
+    where
+        C: CosmWasmClient + Sync,
+    {
+        Ok(self.nymd.get_epoch_reward_percent().await?)
+    }
+
    // basically handles paging for us
    pub async fn get_all_nymd_mixnodes(&self) -> Result<Vec<MixNodeBond>, ValidatorClientError>
    where
@@ -6,9 +6,9 @@ use cosmrs::tx::{Fee, Gas};
 use cosmrs::Coin;
 use serde::{Deserialize, Serialize};
 use std::fmt;
-use ts_rs::TS;

-#[derive(Debug, Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, Serialize, Deserialize, TS)]
+#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
+#[derive(Debug, Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, Serialize, Deserialize)]
 pub enum Operation {
    Upload,
    Init,
@@ -23,10 +23,11 @@ pub enum Operation {

    BondGateway,
    UnbondGateway,
-    DelegateToGateway,
-    UndelegateFromGateway,

    UpdateStateParams,
+
+    BeginMixnodeRewarding,
+    FinishMixnodeRewarding,
 }

 pub(crate) fn calculate_fee(gas_price: &GasPrice, gas_limit: Gas) -> Coin {
@@ -43,13 +44,13 @@ impl fmt::Display for Operation {
            Operation::Send => f.write_str("Send"),
            Operation::BondMixnode => f.write_str("BondMixnode"),
            Operation::UnbondMixnode => f.write_str("UnbondMixnode"),
-            Operation::DelegateToMixnode => f.write_str("DelegateToMixnode"),
-            Operation::UndelegateFromMixnode => f.write_str("UndelegateFromMixnode"),
            Operation::BondGateway => f.write_str("BondGateway"),
            Operation::UnbondGateway => f.write_str("UnbondGateway"),
-            Operation::DelegateToGateway => f.write_str("DelegateToGateway"),
-            Operation::UndelegateFromGateway => f.write_str("UndelegateFromGateway"),
+            Operation::DelegateToMixnode => f.write_str("DelegateToMixnode"),
+            Operation::UndelegateFromMixnode => f.write_str("UndelegateFromMixnode"),
            Operation::UpdateStateParams => f.write_str("UpdateStateParams"),
+            Operation::BeginMixnodeRewarding => f.write_str("BeginMixnodeRewarding"),
+            Operation::FinishMixnodeRewarding => f.write_str("FinishMixnodeRewarding"),
        }
    }
 }
@@ -71,10 +72,10 @@ impl Operation {

            Operation::BondGateway => 175_000u64.into(),
            Operation::UnbondGateway => 175_000u64.into(),
-            Operation::DelegateToGateway => 175_000u64.into(),
-            Operation::UndelegateFromGateway => 175_000u64.into(),

            Operation::UpdateStateParams => 175_000u64.into(),
+            Operation::BeginMixnodeRewarding => 175_000u64.into(),
+            Operation::FinishMixnodeRewarding => 175_000u64.into(),
        }
    }

@@ -11,12 +11,13 @@ use crate::nymd::fee_helpers::Operation;
 use crate::nymd::wallet::DirectSecp256k1HdWallet;
 use cosmrs::rpc::endpoint::broadcast;
 use cosmrs::rpc::{Error as TendermintRpcError, HttpClientUrl};
-use cosmwasm_std::Coin;
+use cosmwasm_std::{Coin, Uint128};
 use mixnet_contract::{
    Addr, Delegation, ExecuteMsg, Gateway, GatewayOwnershipResponse, IdentityKey,
-    LayerDistribution, MixNode, MixOwnershipResponse, PagedAllDelegationsResponse,
-    PagedGatewayResponse, PagedMixDelegationsResponse, PagedMixnodeResponse,
-    PagedReverseMixDelegationsResponse, QueryMsg, RawDelegationData, StateParams,
+    LayerDistribution, MixNode, MixOwnershipResponse, MixnodeRewardingStatusResponse,
+    PagedAllDelegationsResponse, PagedGatewayResponse, PagedMixDelegationsResponse,
+    PagedMixnodeResponse, PagedReverseMixDelegationsResponse, QueryMsg, RawDelegationData,
+    RewardingIntervalResponse, StateParams,
 };
 use serde::Serialize;
 use std::collections::HashMap;
@@ -27,10 +28,11 @@ pub use crate::nymd::cosmwasm_client::signing_client::SigningCosmWasmClient;
 pub use crate::nymd::gas_price::GasPrice;
 pub use cosmrs::rpc::HttpClient as QueryNymdClient;
 pub use cosmrs::tendermint::block::Height;
+pub use cosmrs::tendermint::hash;
 pub use cosmrs::tendermint::Time as TendermintTime;
 pub use cosmrs::tx::{Fee, Gas};
 pub use cosmrs::Coin as CosmosCoin;
-pub use cosmrs::{AccountId, Denom};
+pub use cosmrs::{AccountId, Decimal, Denom};
 pub use signing_client::Client as SigningNymdClient;

 pub mod cosmwasm_client;
@@ -184,6 +186,21 @@ impl<C> NymdClient<C> {
        self.client.get_height().await
    }

+    /// Obtains the hash of a block specified by the provided height.
+    ///
+    /// # Arguments
+    ///
+    /// * `height`: height of the block for which we want to obtain the hash.
+    pub async fn get_block_hash(&self, height: u32) -> Result<hash::Hash, NymdError>
+    where
+        C: CosmWasmClient + Sync,
+    {
+        self.client
+            .get_block(Some(height))
+            .await
+            .map(|block| block.block_id.hash)
+    }
+
    pub async fn get_balance(&self, address: &AccountId) -> Result<Option<CosmosCoin>, NymdError>
    where
        C: CosmWasmClient + Sync,
@@ -201,6 +218,35 @@ impl<C> NymdClient<C> {
            .await
    }

+    pub async fn get_current_rewarding_interval(
+        &self,
+    ) -> Result<RewardingIntervalResponse, NymdError>
+    where
+        C: CosmWasmClient + Sync,
+    {
+        let request = QueryMsg::CurrentRewardingInterval {};
+        self.client
+            .query_contract_smart(self.contract_address()?, &request)
+            .await
+    }
+
+    pub async fn get_rewarding_status(
+        &self,
+        mix_identity: mixnet_contract::IdentityKey,
+        rewarding_interval_nonce: u32,
+    ) -> Result<MixnodeRewardingStatusResponse, NymdError>
+    where
+        C: CosmWasmClient + Sync,
+    {
+        let request = QueryMsg::GetRewardingStatus {
+            mix_identity,
+            rewarding_interval_nonce,
+        };
+        self.client
+            .query_contract_smart(self.contract_address()?, &request)
+            .await
+    }
+
    pub async fn get_layer_distribution(&self) -> Result<LayerDistribution, NymdError>
    where
        C: CosmWasmClient + Sync,
@@ -211,6 +257,46 @@ impl<C> NymdClient<C> {
            .await
    }

+    pub async fn get_reward_pool(&self) -> Result<Uint128, NymdError>
+    where
+        C: CosmWasmClient + Sync,
+    {
+        let request = QueryMsg::GetRewardPool {};
+        self.client
+            .query_contract_smart(self.contract_address()?, &request)
+            .await
+    }
+
+    pub async fn get_circulating_supply(&self) -> Result<Uint128, NymdError>
+    where
+        C: CosmWasmClient + Sync,
+    {
+        let request = QueryMsg::GetCirculatingSupply {};
+        self.client
+            .query_contract_smart(self.contract_address()?, &request)
+            .await
+    }
+
+    pub async fn get_sybil_resistance_percent(&self) -> Result<u8, NymdError>
+    where
+        C: CosmWasmClient + Sync,
+    {
+        let request = QueryMsg::GetSybilResistancePercent {};
+        self.client
+            .query_contract_smart(self.contract_address()?, &request)
+            .await
+    }
+
+    pub async fn get_epoch_reward_percent(&self) -> Result<u8, NymdError>
+    where
+        C: CosmWasmClient + Sync,
+    {
+        let request = QueryMsg::GetEpochRewardPercent {};
+        self.client
+            .query_contract_smart(self.contract_address()?, &request)
+            .await
+    }
+
    /// Checks whether there is a bonded mixnode associated with the provided client's address
    pub async fn owns_mixnode(&self, address: &AccountId) -> Result<bool, NymdError>
    where
@@ -642,6 +728,54 @@ impl<C> NymdClient<C> {
            )
            .await
    }
+
+    pub async fn begin_mixnode_rewarding(
+        &self,
+        rewarding_interval_nonce: u32,
+    ) -> Result<ExecuteResult, NymdError>
+    where
+        C: SigningCosmWasmClient + Sync,
+    {
+        let fee = self.get_fee(Operation::BeginMixnodeRewarding);
+
+        let req = ExecuteMsg::BeginMixnodeRewarding {
+            rewarding_interval_nonce,
+        };
+        self.client
+            .execute(
+                self.address(),
+                self.contract_address()?,
+                &req,
+                fee,
+                "Beginning mixnode rewarding procedure",
+                Vec::new(),
+            )
+            .await
+    }
+
+    pub async fn finish_mixnode_rewarding(
+        &self,
+        rewarding_interval_nonce: u32,
+    ) -> Result<ExecuteResult, NymdError>
+    where
+        C: SigningCosmWasmClient + Sync,
+    {
+        let fee = self.get_fee(Operation::FinishMixnodeRewarding);
+
+        let req = ExecuteMsg::FinishMixnodeRewarding {
+            rewarding_interval_nonce,
+        };
+        self.client
+            .execute(
+                self.address(),
+                self.contract_address()?,
+                &req,
+                fee,
+                "Finishing mixnode rewarding procedure",
+                Vec::new(),
+            )
+            .await
+    }
 }

 fn cosmwasm_coin_to_cosmos_coin(coin: Coin) -> CosmosCoin {
@@ -11,4 +11,6 @@ url = "2.2"

 # I guess temporarily until we get serde support in coconut up and running
 coconut-interface = { path = "../coconut-interface" }
+crypto = { path = "../crypto" }
+network-defaults = { path = "../network-defaults" }
 validator-client = { path = "../client-libs/validator-client" }
@@ -6,25 +6,20 @@
 // right now this has no double-spending protection, spender binding, etc
 // it's the simplest possible case

-use url::Url;
-
 use coconut_interface::{
    Credential, Parameters, PrivateAttribute, PublicAttribute, Signature, VerificationKey,
 };
+use network_defaults::BANDWIDTH_VALUE;
+use url::Url;

 use crate::error::Error;
-use crate::utils::{obtain_aggregate_signature, prepare_credential_for_spending};

-pub const BANDWIDTH_VALUE: u64 = 10 * 1024 * 1024 * 1024; // 10 GB
+use super::utils::{obtain_aggregate_signature, prepare_credential_for_spending};

 pub const PUBLIC_ATTRIBUTES: u32 = 2;
 pub const PRIVATE_ATTRIBUTES: u32 = 2;
 pub const TOTAL_ATTRIBUTES: u32 = PUBLIC_ATTRIBUTES + PRIVATE_ATTRIBUTES;

-pub const SERIAL_NUMBER_LEN: usize = 47;
-pub const BINDING_NUMBER_LEN: usize = 47;
-pub const VOUCHER_INFO_LEN: usize = 47;
-
 pub struct BandwidthVoucherAttributes {
    // a random secret value generated by the client used for double-spending detection
    pub serial_number: PrivateAttribute,
@@ -0,0 +1,5 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod bandwidth;
+pub mod utils;
@@ -3,13 +3,12 @@

 use coconut_interface::{
    aggregate_signature_shares, aggregate_verification_keys, prepare_blind_sign,
-    prove_bandwidth_credential, Attribute, BlindSignRequest, BlindSignRequestBody,
-    BlindedSignature, Credential, ElGamalKeyPair, Parameters, Signature, SignatureShare,
-    VerificationKey,
+    prove_bandwidth_credential, Attribute, BlindSignRequestBody, Credential, Parameters, Signature,
+    SignatureShare, VerificationKey,
 };
 use url::Url;

-use crate::bandwidth::PRIVATE_ATTRIBUTES;
+use crate::coconut::bandwidth::PRIVATE_ATTRIBUTES;
 use crate::error::Error;

 /// Contacts all provided validators and then aggregate their verification keys.
@@ -35,43 +34,6 @@ use crate::error::Error;
 ///     Ok(())
 /// }
 /// ```
-pub async fn get_verification_keys(validators: &[Url]) -> Result<Vec<VerificationKey>, Error> {
-    if validators.is_empty() {
-        return Err(Error::NoValidatorsAvailable);
-    }
-
-    let mut shares = Vec::with_capacity(validators.len());
-
-    let mut client = validator_client::ApiClient::new(validators[0].clone());
-    let response = client.get_coconut_verification_key().await?;
-
-    shares.push(response.key);
-
-    for validator_url in validators.iter().enumerate().skip(1) {
-        client.change_validator_api(validator_url.1.clone());
-        let response = client.get_coconut_verification_key().await?;
-        shares.push(response.key);
-    }
-
-    Ok(shares)
-}
-
-pub fn create_aggregate_verification_key(
-    verification_keys: &Vec<VerificationKey>,
-) -> Result<VerificationKey, Error> {
-    if verification_keys.is_empty() {
-        return Err(Error::NoValidatorsAvailable);
-    }
-
-    // creates a vec of [1, 2, .. n] where n is length of verification_keys, e.g. [1,2,3] for 3 keys
-    let indices: Vec<u64> = (1u64..(verification_keys.len() + 1) as u64).collect();
-
-    Ok(aggregate_verification_keys(
-        &verification_keys,
-        Some(&indices.as_slice()),
-    )?)
-}
-
 pub async fn obtain_aggregate_verification_key(
    validators: &[Url],
 ) -> Result<VerificationKey, Error> {
@@ -98,28 +60,6 @@ pub async fn obtain_aggregate_verification_key(
    Ok(aggregate_verification_keys(&shares, Some(&indices))?)
 }

-pub async fn blind_sign_partial_credential(
-    validator_url: &Url,
-    elgamal_keypair: &ElGamalKeyPair,
-    blind_sign_request: &BlindSignRequest,
-    public_attributes: &[Attribute],
-    total_params: u32,
-) -> Result<BlindedSignature, Error> {
-    let client = validator_client::ApiClient::new(validator_url.clone());
-
-    let blind_sign_request_body = BlindSignRequestBody::new(
-        &blind_sign_request,
-        elgamal_keypair.public_key(),
-        public_attributes,
-        total_params,
-    );
-
-    Ok(client
-        .blind_sign(&blind_sign_request_body)
-        .await?
-        .blinded_signature)
-}
-
 async fn obtain_partial_credential(
    params: &Parameters,
    public_attributes: &[Attribute],
@@ -146,16 +86,17 @@ async fn obtain_partial_credential(
        .blind_sign(&blind_sign_request_body)
        .await?
        .blinded_signature;
-    Ok(blinded_signature
-        .unblind(
-            params,
-            elgamal_keypair.private_key(),
-            validator_vk,
-            private_attributes,
-            public_attributes,
-            &blind_sign_request.get_commitment_hash(),
-        )
-        .unwrap())
+
+    let unblinded_signature = blinded_signature.unblind(
+        params,
+        elgamal_keypair.private_key(),
+        validator_vk,
+        private_attributes,
+        public_attributes,
+        &blind_sign_request.get_commitment_hash(),
+    )?;
+
+    Ok(unblinded_signature)
 }

 pub async fn obtain_aggregate_signature(
@@ -210,7 +151,8 @@ pub async fn obtain_aggregate_signature(
        indices.push(i as u64);
    }
    let verification_key =
-        aggregate_verification_keys(&validators_partial_vks, Some(indices.as_ref())).unwrap();
+        aggregate_verification_keys(&validators_partial_vks, Some(indices.as_ref()))?;
+
    Ok(aggregate_signature_shares(
        params,
        &verification_key,
@@ -1,11 +1,8 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-pub mod bandwidth;
+pub mod coconut;
 pub mod error;
-mod utils;
+pub mod token;

-pub use utils::{
-    blind_sign_partial_credential, create_aggregate_verification_key, get_verification_keys,
-    obtain_aggregate_signature, obtain_aggregate_verification_key,
-};
+pub use coconut::utils::{obtain_aggregate_signature, obtain_aggregate_verification_key};
@@ -0,0 +1,140 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crypto::asymmetric::identity::{PublicKey, Signature, PUBLIC_KEY_LENGTH, SIGNATURE_LENGTH};
+
+use crate::error::Error;
+use std::convert::TryInto;
+
+#[cfg(not(feature = "coconut"))]
+pub struct TokenCredential {
+    verification_key: PublicKey,
+    gateway_identity: PublicKey,
+    bandwidth: u64,
+    signature: Signature,
+}
+
+#[cfg(not(feature = "coconut"))]
+impl TokenCredential {
+    pub fn new(
+        verification_key: PublicKey,
+        gateway_identity: PublicKey,
+        bandwidth: u64,
+        signature: Signature,
+    ) -> Self {
+        TokenCredential {
+            verification_key,
+            gateway_identity,
+            bandwidth,
+            signature,
+        }
+    }
+
+    pub fn verification_key(&self) -> PublicKey {
+        self.verification_key
+    }
+
+    pub fn gateway_identity(&self) -> PublicKey {
+        self.gateway_identity
+    }
+
+    pub fn bandwidth(&self) -> u64 {
+        self.bandwidth
+    }
+
+    pub fn signature_bytes(&self) -> [u8; 64] {
+        self.signature.to_bytes()
+    }
+
+    pub fn verify_signature(&self) -> bool {
+        let message: Vec<u8> = self
+            .verification_key
+            .to_bytes()
+            .iter()
+            .chain(self.gateway_identity.to_bytes().iter())
+            .copied()
+            .collect();
+        self.verification_key
+            .verify(&message, &self.signature)
+            .is_ok()
+    }
+
+    pub fn to_bytes(&self) -> Vec<u8> {
+        self.verification_key
+            .to_bytes()
+            .iter()
+            .chain(self.gateway_identity.to_bytes().iter())
+            .chain(self.bandwidth.to_be_bytes().iter())
+            .chain(self.signature.to_bytes().iter())
+            .copied()
+            .collect()
+    }
+
+    pub fn from_bytes(b: &[u8]) -> Result<Self, Error> {
+        if b.len() != 2 * PUBLIC_KEY_LENGTH + 8 + SIGNATURE_LENGTH {
+            return Err(Error::BandwidthCredentialError);
+        }
+        let verification_key = PublicKey::from_bytes(&b[..PUBLIC_KEY_LENGTH])
+            .map_err(|_| Error::BandwidthCredentialError)?;
+        let gateway_identity = PublicKey::from_bytes(&b[PUBLIC_KEY_LENGTH..2 * PUBLIC_KEY_LENGTH])
+            .map_err(|_| Error::BandwidthCredentialError)?;
+        let bandwidth = u64::from_be_bytes(
+            b[2 * PUBLIC_KEY_LENGTH..2 * PUBLIC_KEY_LENGTH + 8]
+                .try_into()
+                // unwrapping is safe because we know we have 8 bytes
+                .unwrap(),
+        );
+        let signature = Signature::from_bytes(&b[2 * PUBLIC_KEY_LENGTH + 8..])
+            .map_err(|_| Error::BandwidthCredentialError)?;
+        Ok(TokenCredential {
+            verification_key,
+            gateway_identity,
+            bandwidth,
+            signature,
+        })
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[cfg(not(feature = "coconut"))]
+    #[test]
+    fn token_serde() {
+        // pre-generated, valid values
+        let verification_key = PublicKey::from_bytes(&[
+            103, 105, 71, 177, 149, 245, 26, 32, 73, 121, 76, 50, 94, 88, 119, 231, 91, 229, 167,
+            56, 39, 62, 185, 39, 83, 246, 153, 27, 17, 155, 109, 73,
+        ])
+        .unwrap();
+        let gateway_identity = PublicKey::from_bytes(&[
+            37, 113, 137, 189, 157, 82, 35, 2, 187, 136, 61, 119, 98, 5, 245, 82, 46, 124, 67, 45,
+            165, 255, 53, 222, 185, 252, 6, 148, 128, 15, 206, 19,
+        ])
+        .unwrap();
+        let signature = Signature::from_bytes(&[
+            117, 251, 162, 217, 57, 2, 50, 210, 206, 81, 236, 90, 74, 201, 69, 237, 240, 247, 214,
+            158, 220, 89, 235, 222, 85, 134, 73, 73, 8, 60, 25, 39, 183, 28, 83, 193, 31, 174, 25,
+            24, 38, 215, 205, 228, 159, 135, 35, 4, 171, 59, 100, 157, 12, 249, 77, 52, 143, 4, 32,
+            28, 147, 70, 182, 14,
+        ])
+        .unwrap();
+        let credential = TokenCredential::new(verification_key, gateway_identity, 1024, signature);
+        let serialized_credential = credential.to_bytes();
+        let deserialized_credential = TokenCredential::from_bytes(&serialized_credential).unwrap();
+        assert_eq!(
+            credential.verification_key,
+            deserialized_credential.verification_key
+        );
+        assert_eq!(
+            credential.gateway_identity,
+            deserialized_credential.gateway_identity
+        );
+        assert_eq!(credential.bandwidth, deserialized_credential.bandwidth);
+        assert_eq!(
+            credential.signature.to_bytes(),
+            deserialized_credential.signature.to_bytes()
+        );
+    }
+}
@@ -0,0 +1,4 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod bandwidth;
@@ -0,0 +1,10 @@
+[package]
+name = "erc20-bridge-contract"
+version = "0.1.0"
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+schemars = "0.8"
+serde = { version = "1.0.103", default-features = false, features = ["derive"] }
@@ -0,0 +1,45 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+
+// Serializable structures for what we find in common/crypto
+#[derive(Serialize, Deserialize, Copy, Clone, Debug, PartialEq, JsonSchema)]
+pub struct PublicKey([u8; 32]);
+
+impl PublicKey {
+    pub fn new(bytes: [u8; 32]) -> Self {
+        PublicKey(bytes)
+    }
+    pub fn to_bytes(&self) -> [u8; 32] {
+        self.0
+    }
+}
+
+impl AsRef<[u8]> for PublicKey {
+    #[inline]
+    fn as_ref(&self) -> &[u8] {
+        &self.0
+    }
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+pub struct Signature([u8; 32], [u8; 32]);
+
+impl Signature {
+    pub fn new(bytes: [u8; 64]) -> Self {
+        let mut sig1 = [0u8; 32];
+        let mut sig2 = [0u8; 32];
+        sig1.copy_from_slice(&bytes[..32]);
+        sig2.copy_from_slice(&bytes[32..]);
+
+        Signature(sig1, sig2)
+    }
+    pub fn to_bytes(&self) -> [u8; 64] {
+        let mut res = [0u8; 64];
+        res[..32].copy_from_slice(&self.0);
+        res[32..].copy_from_slice(&self.1);
+        res
+    }
+}
@@ -0,0 +1,3 @@
+pub mod keys;
+pub mod msg;
+pub mod payment;
@@ -0,0 +1,30 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+
+use crate::keys::PublicKey;
+use crate::payment::LinkPaymentData;
+
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+pub struct InstantiateMsg {}
+
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+#[serde(rename_all = "snake_case")]
+pub enum ExecuteMsg {
+    LinkPayment { data: LinkPaymentData },
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+#[serde(rename_all = "snake_case")]
+pub enum QueryMsg {
+    GetPayments {
+        limit: Option<u32>,
+        start_after: Option<PublicKey>,
+    },
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+#[serde(rename_all = "snake_case")]
+pub struct MigrateMsg {}
@@ -0,0 +1,73 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+
+use crate::keys::{PublicKey, Signature};
+
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
+pub struct Payment {
+    verification_key: PublicKey,
+    gateway_identity: PublicKey,
+    bandwidth: u64,
+}
+
+impl Payment {
+    pub fn new(verification_key: PublicKey, gateway_identity: PublicKey, bandwidth: u64) -> Self {
+        Payment {
+            verification_key,
+            gateway_identity,
+            bandwidth,
+        }
+    }
+
+    pub fn verification_key(&self) -> PublicKey {
+        self.verification_key
+    }
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+pub struct LinkPaymentData {
+    pub verification_key: PublicKey,
+    pub gateway_identity: PublicKey,
+    pub bandwidth: u64,
+    pub signature: Signature,
+}
+
+impl LinkPaymentData {
+    pub fn new(
+        verification_key: [u8; 32],
+        gateway_identity: [u8; 32],
+        bandwidth: u64,
+        signature: [u8; 64],
+    ) -> Self {
+        LinkPaymentData {
+            verification_key: PublicKey::new(verification_key),
+            gateway_identity: PublicKey::new(gateway_identity),
+            bandwidth,
+            signature: Signature::new(signature),
+        }
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
+pub struct PagedPaymentResponse {
+    pub payments: Vec<Payment>,
+    pub per_page: usize,
+    pub start_next_after: Option<PublicKey>,
+}
+
+impl PagedPaymentResponse {
+    pub fn new(
+        payments: Vec<Payment>,
+        per_page: usize,
+        start_next_after: Option<PublicKey>,
+    ) -> Self {
+        PagedPaymentResponse {
+            payments,
+            per_page,
+            start_next_after,
+        }
+    }
+}
@@ -8,10 +8,18 @@ edition = "2018"

 [dependencies]
 # this branch is identical to 0.14.1 with addition of updated k256 dependency required to help poor cargo choose correct version
-cosmwasm-std = { git = "https://github.com/jstuczyn/cosmwasm", branch="0.14.1-updatedk256" }
+cosmwasm-std = { git = "https://github.com/jstuczyn/cosmwasm", branch = "0.14.1-updatedk256" }
 #cosmwasm-std = { version = "0.14.1" }

 serde = { version = "1.0", features = ["derive"] }
 serde_repr = "0.1"
 schemars = "0.8"
-ts-rs = "3.0"
+ts-rs = { version = "5.1", optional = true }
+thiserror = "1.0"
+network-defaults = { path = "../network-defaults" }
+fixed = { version = "1.1", features = ["serde"] }
+az = "1.1"
+log = "0.4.14"
+
+[features]
+default = []
@@ -0,0 +1,9 @@
+use thiserror::Error;
+
+#[derive(Error, Debug, PartialEq)]
+pub enum MixnetContractError {
+    #[error("Overflow Error")]
+    OverflowError(#[from] cosmwasm_std::OverflowError),
+    #[error("reward_blockstamp field not set, set_reward_blockstamp must be called before attempting to issue rewards")]
+    BlockstampNotSet,
+}
@@ -7,9 +7,9 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::cmp::Ordering;
 use std::fmt::Display;
-use ts_rs::TS;

-#[derive(Clone, Debug, Deserialize, PartialEq, PartialOrd, Serialize, JsonSchema, TS)]
+#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
+#[derive(Clone, Debug, Deserialize, PartialEq, PartialOrd, Serialize, JsonSchema)]
 pub struct Gateway {
    pub host: String,
    pub mix_port: u16,
@@ -2,11 +2,14 @@
 // SPDX-License-Identifier: Apache-2.0

 mod delegation;
+pub mod error;
 mod gateway;
-mod mixnode;
+pub mod mixnode;
 mod msg;
 mod types;

+pub const MIXNODE_DELEGATORS_PAGE_LIMIT: usize = 250;
+
 pub use cosmwasm_std::{Addr, Coin};
 pub use delegation::{
    Delegation, PagedAllDelegationsResponse, PagedMixDelegationsResponse,
@@ -15,4 +18,4 @@ pub use delegation::{
 pub use gateway::{Gateway, GatewayBond, GatewayOwnershipResponse, PagedGatewayResponse};
 pub use mixnode::{Layer, MixNode, MixNodeBond, MixOwnershipResponse, PagedMixnodeResponse};
 pub use msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
-pub use types::{IdentityKey, IdentityKeyRef, LayerDistribution, SphinxKey, StateParams};
+pub use types::*;
@@ -2,15 +2,24 @@
 #![allow(clippy::field_reassign_with_default)]

 use crate::{IdentityKey, SphinxKey};
-use cosmwasm_std::{coin, Addr, Coin};
+use az::CheckedCast;
+use cosmwasm_std::{coin, Addr, Coin, Uint128};
+use log::error;
+use network_defaults::{DEFAULT_OPERATOR_EPOCH_COST, DEFAULT_PROFIT_MARGIN};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use serde_repr::{Deserialize_repr, Serialize_repr};
 use std::cmp::Ordering;
 use std::fmt::Display;
-use ts_rs::TS;

-#[derive(Clone, Debug, Deserialize, PartialEq, PartialOrd, Serialize, JsonSchema, TS)]
+type U128 = fixed::types::U75F53; // u128 with 18 significant digits
+
+fixed::const_fixed_from_int! {
+    const ONE: U128 = 1;
+}
+
+#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
+#[derive(Clone, Debug, Deserialize, PartialEq, PartialOrd, Serialize, JsonSchema)]
 pub struct MixNode {
    pub host: String,
    pub mix_port: u16,
@@ -23,7 +32,17 @@ pub struct MixNode {
 }

 #[derive(
-    Copy, Clone, Debug, Serialize_repr, PartialEq, PartialOrd, Deserialize_repr, JsonSchema,
+    Copy,
+    Clone,
+    Debug,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Hash,
+    Serialize_repr,
+    Deserialize_repr,
+    JsonSchema,
 )]
 #[repr(u8)]
 pub enum Layer {
@@ -33,6 +52,181 @@ pub enum Layer {
    Three = 3,
 }

+#[derive(Debug, Clone, JsonSchema, PartialEq, Serialize, Deserialize, Copy)]
+pub struct NodeRewardParams {
+    period_reward_pool: Uint128,
+    k: Uint128,
+    reward_blockstamp: u64,
+    circulating_supply: Uint128,
+    uptime: Uint128,
+    sybil_resistance_percent: u8,
+}
+
+impl NodeRewardParams {
+    pub fn new(
+        period_reward_pool: u128,
+        k: u128,
+        reward_blockstamp: u64,
+        circulating_supply: u128,
+        uptime: u128,
+        sybil_resistance_percent: u8,
+    ) -> NodeRewardParams {
+        NodeRewardParams {
+            period_reward_pool: Uint128(period_reward_pool),
+            k: Uint128(k),
+            reward_blockstamp,
+            circulating_supply: Uint128(circulating_supply),
+            uptime: Uint128(uptime),
+            sybil_resistance_percent,
+        }
+    }
+
+    pub fn performance(&self) -> U128 {
+        U128::from_num(self.uptime.u128()) / U128::from_num(100)
+    }
+
+    pub fn operator_cost(&self) -> U128 {
+        U128::from_num(self.uptime.u128() / 100u128 * DEFAULT_OPERATOR_EPOCH_COST as u128)
+    }
+
+    pub fn set_reward_blockstamp(&mut self, blockstamp: u64) {
+        self.reward_blockstamp = blockstamp;
+    }
+
+    pub fn period_reward_pool(&self) -> u128 {
+        self.period_reward_pool.u128()
+    }
+
+    pub fn k(&self) -> u128 {
+        self.k.u128()
+    }
+
+    pub fn circulating_supply(&self) -> u128 {
+        self.circulating_supply.u128()
+    }
+
+    pub fn reward_blockstamp(&self) -> u64 {
+        self.reward_blockstamp
+    }
+
+    pub fn uptime(&self) -> u128 {
+        self.uptime.u128()
+    }
+
+    pub fn one_over_k(&self) -> U128 {
+        ONE / U128::from_num(self.k.u128())
+    }
+
+    pub fn alpha(&self) -> U128 {
+        U128::from_num(self.sybil_resistance_percent) / U128::from_num(100)
+    }
+}
+
+// cosmwasm's limited serde doesn't work with U128 directly
+#[allow(non_snake_case)]
+pub mod fixed_U128_as_string {
+    use super::U128;
+    use serde::de::Error;
+    use serde::Deserialize;
+    use std::str::FromStr;
+
+    pub fn serialize<S>(val: &U128, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        let s = (*val).to_string();
+        serializer.serialize_str(&s)
+    }
+
+    pub fn deserialize<'de, D>(deserializer: D) -> Result<U128, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        let s = String::deserialize(deserializer)?;
+        U128::from_str(&s).map_err(|err| {
+            D::Error::custom(format!(
+                "failed to deserialize U128 with its string representation - {}",
+                err
+            ))
+        })
+    }
+}
+
+// everything required to reward delegator of given mixnode
+#[derive(Debug, Clone, Copy, Serialize, Deserialize, JsonSchema)]
+pub struct DelegatorRewardParams {
+    node_reward_params: NodeRewardParams,
+
+    // to be completely honest I don't understand all consequences of using `#[schemars(with = "String")]`
+    // for U128 here, but it seems that CosmWasm is using the same attribute for their Uint128
+    #[schemars(with = "String")]
+    #[serde(with = "fixed_U128_as_string")]
+    sigma: U128,
+    #[schemars(with = "String")]
+    #[serde(with = "fixed_U128_as_string")]
+    profit_margin: U128,
+    #[schemars(with = "String")]
+    #[serde(with = "fixed_U128_as_string")]
+    node_profit: U128,
+}
+
+impl DelegatorRewardParams {
+    pub fn new(mixnode_bond: &MixNodeBond, node_reward_params: NodeRewardParams) -> Self {
+        DelegatorRewardParams {
+            sigma: mixnode_bond.sigma(&node_reward_params),
+            profit_margin: mixnode_bond.profit_margin(),
+            node_profit: mixnode_bond.node_profit(&node_reward_params),
+            node_reward_params,
+        }
+    }
+
+    pub fn determine_delegation_reward(&self, delegation_amount: Uint128) -> u128 {
+        // change all values into their fixed representations
+        let delegation_amount = U128::from_num(delegation_amount.u128());
+        let circulating_supply = U128::from_num(self.node_reward_params.circulating_supply());
+
+        let scaled_delegation_amount = delegation_amount / circulating_supply;
+        let delegator_reward =
+            (ONE - self.profit_margin) * scaled_delegation_amount / self.sigma * self.node_profit;
+
+        let reward = delegator_reward.max(U128::ZERO);
+        if let Some(int_reward) = reward.checked_cast() {
+            int_reward
+        } else {
+            error!(
+                "Could not cast delegator reward ({}) to u128, returning 0",
+                reward,
+            );
+            0u128
+        }
+    }
+
+    pub fn node_reward_params(&self) -> &NodeRewardParams {
+        &self.node_reward_params
+    }
+}
+
+#[derive(Debug)]
+pub struct NodeRewardResult {
+    reward: U128,
+    lambda: U128,
+    sigma: U128,
+}
+
+impl NodeRewardResult {
+    pub fn reward(&self) -> U128 {
+        self.reward
+    }
+
+    pub fn lambda(&self) -> U128 {
+        self.lambda
+    }
+
+    pub fn sigma(&self) -> U128 {
+        self.sigma
+    }
+}
+
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct MixNodeBond {
    pub bond_amount: Coin,
@@ -41,6 +235,7 @@ pub struct MixNodeBond {
    pub layer: Layer,
    pub block_height: u64,
    pub mix_node: MixNode,
+    pub profit_margin_percent: Option<u8>,
 }

 impl MixNodeBond {
@@ -50,6 +245,7 @@ impl MixNodeBond {
        layer: Layer,
        block_height: u64,
        mix_node: MixNode,
+        profit_margin_percent: Option<u8>,
    ) -> Self {
        MixNodeBond {
            total_delegation: coin(0, &bond_amount.denom),
@@ -58,9 +254,15 @@ impl MixNodeBond {
            layer,
            block_height,
            mix_node,
+            profit_margin_percent,
        }
    }

+    pub fn profit_margin(&self) -> U128 {
+        U128::from_num(self.profit_margin_percent.unwrap_or(DEFAULT_PROFIT_MARGIN))
+            / U128::from_num(100)
+    }
+
    pub fn identity(&self) -> &String {
        &self.mix_node.identity_key
    }
@@ -76,6 +278,107 @@ impl MixNodeBond {
    pub fn mix_node(&self) -> &MixNode {
        &self.mix_node
    }
+
+    pub fn total_stake(&self) -> Option<u128> {
+        if self.bond_amount.denom != self.total_delegation.denom {
+            None
+        } else {
+            Some(self.bond_amount.amount.u128() + self.total_delegation.amount.u128())
+        }
+    }
+
+    pub fn total_delegation(&self) -> Coin {
+        self.total_delegation.clone()
+    }
+
+    pub fn bond_to_circulating_supply(&self, circulating_supply: u128) -> U128 {
+        U128::from_num(self.bond_amount().amount.u128()) / U128::from_num(circulating_supply)
+    }
+
+    pub fn total_stake_to_circulating_supply(&self, circulating_supply: u128) -> U128 {
+        U128::from_num(self.bond_amount().amount.u128() + self.total_delegation().amount.u128())
+            / U128::from_num(circulating_supply)
+    }
+
+    pub fn lambda(&self, params: &NodeRewardParams) -> U128 {
+        // Ratio of a bond to the token circulating supply
+        let bond_to_circulating_supply_ratio =
+            self.bond_to_circulating_supply(params.circulating_supply());
+        bond_to_circulating_supply_ratio.min(params.one_over_k())
+    }
+
+    pub fn sigma(&self, params: &NodeRewardParams) -> U128 {
+        // Ratio of a delegation to the the token circulating supply
+        let total_stake_to_circulating_supply_ratio =
+            self.total_stake_to_circulating_supply(params.circulating_supply());
+        total_stake_to_circulating_supply_ratio.min(params.one_over_k())
+    }
+
+    pub fn reward(&self, params: &NodeRewardParams) -> NodeRewardResult {
+        // Assuming uniform work distribution across the network this is one_over_k * k
+        let omega_k = ONE;
+        let lambda = self.lambda(params);
+        let sigma = self.sigma(params);
+
+        let reward = params.performance()
+            * params.period_reward_pool()
+            * (sigma * omega_k + params.alpha() * lambda * sigma * params.k())
+            / (ONE + params.alpha());
+
+        NodeRewardResult {
+            reward,
+            lambda,
+            sigma,
+        }
+    }
+
+    pub fn node_profit(&self, params: &NodeRewardParams) -> U128 {
+        if self.reward(params).reward() < params.operator_cost() {
+            U128::from_num(0)
+        } else {
+            self.reward(params).reward() - params.operator_cost()
+        }
+    }
+
+    pub fn operator_reward(&self, params: &NodeRewardParams) -> u128 {
+        let reward = self.reward(params);
+        let profit = if reward.reward < params.operator_cost() {
+            U128::from_num(0)
+        } else {
+            reward.reward - params.operator_cost()
+        };
+        let operator_base_reward = reward.reward.min(params.operator_cost());
+        let operator_reward = (self.profit_margin()
+            + (ONE - self.profit_margin()) * reward.lambda / reward.sigma)
+            * profit;
+
+        let reward = (operator_reward + operator_base_reward).max(U128::from_num(0));
+
+        if let Some(int_reward) = reward.checked_cast() {
+            int_reward
+        } else {
+            error!(
+                "Could not cast reward ({}) to u128, returning 0 - mixnode {}",
+                reward,
+                self.identity()
+            );
+            0u128
+        }
+    }
+
+    pub fn sigma_ratio(&self, params: &NodeRewardParams) -> U128 {
+        if self.total_stake_to_circulating_supply(params.circulating_supply()) < params.one_over_k()
+        {
+            self.total_stake_to_circulating_supply(params.circulating_supply())
+        } else {
+            params.one_over_k()
+        }
+    }
+
+    pub fn reward_delegation(&self, delegation_amount: Uint128, params: &NodeRewardParams) -> u128 {
+        let reward_params = DelegatorRewardParams::new(self, *params);
+        reward_params.determine_delegation_reward(delegation_amount)
+    }
 }

 impl PartialOrd for MixNodeBond {
@@ -207,6 +510,7 @@ mod tests {
            layer: Layer::One,
            block_height: 100,
            mix_node: mixnode_fixture(),
+            profit_margin_percent: Some(10),
        };

        let mix2 = MixNodeBond {
@@ -216,6 +520,7 @@ mod tests {
            layer: Layer::One,
            block_height: 120,
            mix_node: mixnode_fixture(),
+            profit_margin_percent: Some(10),
        };

        let mix3 = MixNodeBond {
@@ -225,6 +530,7 @@ mod tests {
            layer: Layer::One,
            block_height: 120,
            mix_node: mixnode_fixture(),
+            profit_margin_percent: Some(10),
        };

        let mix4 = MixNodeBond {
@@ -234,6 +540,7 @@ mod tests {
            layer: Layer::One,
            block_height: 120,
            mix_node: mixnode_fixture(),
+            profit_margin_percent: Some(10),
        };

        let mix5 = MixNodeBond {
@@ -243,6 +550,7 @@ mod tests {
            layer: Layer::One,
            block_height: 120,
            mix_node: mixnode_fixture(),
+            profit_margin_percent: Some(10),
        };

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

+use crate::mixnode::NodeRewardParams;
 use crate::StateParams;
 use crate::{Gateway, IdentityKey, MixNode};
 use cosmwasm_std::Addr;
@@ -31,10 +32,29 @@ pub enum ExecuteMsg {
        mix_identity: IdentityKey,
    },

-    RewardMixnode {
+    BeginMixnodeRewarding {
+        // nonce of the current rewarding interval
+        rewarding_interval_nonce: u32,
+    },
+
+    FinishMixnodeRewarding {
+        // nonce of the current rewarding interval
+        rewarding_interval_nonce: u32,
+    },
+
+    RewardMixnodeV2 {
        identity: IdentityKey,
        // percentage value in range 0-100
-        uptime: u32,
+        params: NodeRewardParams,
+
+        // nonce of the current rewarding interval
+        rewarding_interval_nonce: u32,
+    },
+
+    RewardNextMixDelegators {
+        mix_identity: IdentityKey,
+        // nonce of the current rewarding interval
+        rewarding_interval_nonce: u32,
    },
 }

@@ -56,6 +76,7 @@ pub enum QueryMsg {
        address: Addr,
    },
    StateParams {},
+    CurrentRewardingInterval {},
    GetMixDelegations {
        mix_identity: IdentityKey,
        start_after: Option<Addr>,
@@ -75,6 +96,14 @@ pub enum QueryMsg {
        address: Addr,
    },
    LayerDistribution {},
+    GetRewardPool {},
+    GetCirculatingSupply {},
+    GetEpochRewardPercent {},
+    GetSybilResistancePercent {},
+    GetRewardingStatus {
+        mix_identity: IdentityKey,
+        rewarding_interval_nonce: u32,
+    },
 }

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

+use crate::mixnode::DelegatorRewardParams;
 use crate::Layer;
-use cosmwasm_std::{Decimal, Uint128};
+use cosmwasm_std::Uint128;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::fmt::{self, Display, Formatter};
@@ -26,33 +27,40 @@ impl LayerDistribution {
    }
 }

+#[derive(Debug, Default, Serialize, Deserialize, Copy, Clone, Eq, PartialEq)]
+pub struct RewardingIntervalResponse {
+    pub current_rewarding_interval_starting_block: u64,
+    pub current_rewarding_interval_nonce: u32,
+    pub rewarding_in_progress: bool,
+}
+
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub struct StateParams {
-    pub epoch_length: u32, // length of an epoch, expressed in hours
-
+    // so currently epoch_length is being unused and validator API performs rewarding
+    // based on its own epoch length config value. I guess that's fine for time being
+    // however, in the future, the contract constant should be controlling it instead.
+    // pub epoch_length: u32, // length of a rewarding epoch/interval, expressed in hours
    pub minimum_mixnode_bond: Uint128, // minimum amount a mixnode must bond to get into the system
    pub minimum_gateway_bond: Uint128, // minimum amount a gateway must bond to get into the system

-    pub mixnode_bond_reward_rate: Decimal, // annual reward rate, expressed as a decimal like 1.25
-    pub mixnode_delegation_reward_rate: Decimal, // annual reward rate, expressed as a decimal like 1.25
+    // number of mixnode that are going to get rewarded during current rewarding interval (k_m)
+    // based on overall demand for private bandwidth-
+    pub mixnode_rewarded_set_size: u32,
+
+    // subset of rewarded mixnodes that are actively receiving mix traffic
+    // used to handle shorter-term (e.g. hourly) fluctuations of demand
    pub mixnode_active_set_size: u32,
 }

 impl Display for StateParams {
    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
        write!(f, "Contract state parameters: [ ")?;
-        write!(f, "epoch length: {}; ", self.epoch_length)?;
        write!(f, "minimum mixnode bond: {}; ", self.minimum_mixnode_bond)?;
        write!(f, "minimum gateway bond: {}; ", self.minimum_gateway_bond)?;
        write!(
            f,
-            "mixnode bond reward rate: {}; ",
-            self.mixnode_bond_reward_rate
-        )?;
-        write!(
-            f,
-            "mixnode delegation reward rate: {}; ",
-            self.mixnode_delegation_reward_rate
+            "mixnode rewarded set size: {}",
+            self.mixnode_rewarded_set_size
        )?;
        write!(
            f,
@@ -62,6 +70,33 @@ impl Display for StateParams {
    }
 }

+#[derive(Default, Debug, Serialize, Deserialize, PartialEq)]
+pub struct RewardingResult {
+    pub operator_reward: Uint128,
+    pub total_delegator_reward: Uint128,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct PendingDelegatorRewarding {
+    // keep track of the running rewarding results so we'd known how much was the operator and its delegators rewarded
+    pub running_results: RewardingResult,
+
+    pub next_start: String,
+
+    pub rewarding_params: DelegatorRewardParams,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub enum RewardingStatus {
+    Complete(RewardingResult),
+    PendingNextDelegatorPage(PendingDelegatorRewarding),
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct MixnodeRewardingStatusResponse {
+    pub status: Option<RewardingStatus>,
+}
+
 // type aliases for better reasoning about available data
 pub type IdentityKey = String;
 pub type IdentityKeyRef<'a> = &'a str;
@@ -7,6 +7,7 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
+hex-literal = "0.3.3"
 serde = {version = "1.0", features = ["derive"]}
 url = "2.2"
 time = { version = "0.3", features = ["macros"] }
@@ -0,0 +1,132 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+// This should be modified whenever an updated Ethereum contract is uploaded
+pub const ETH_JSON_ABI: &str = r#"
+[
+  {
+    "inputs": [
+      {
+        "internalType": "contract ERC20Burnable",
+        "name": "_erc20",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "Bandwidth",
+        "type": "uint256"
+      },
+      {
+        "indexed": true,
+        "internalType": "uint256",
+        "name": "VerificationKey",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "internalType": "bytes",
+        "name": "SignedVerificationKey",
+        "type": "bytes"
+      }
+    ],
+    "name": "Burned",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "previousOwner",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "newOwner",
+        "type": "address"
+      }
+    ],
+    "name": "OwnershipTransferred",
+    "type": "event"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "amount",
+        "type": "uint256"
+      },
+      {
+        "internalType": "uint256",
+        "name": "verificationKey",
+        "type": "uint256"
+      },
+      {
+        "internalType": "bytes",
+        "name": "signedVerificationKey",
+        "type": "bytes"
+      }
+    ],
+    "name": "burnTokenForAccessCode",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "erc20",
+    "outputs": [
+      {
+        "internalType": "contract ERC20Burnable",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "owner",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "renounceOwnership",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "newOwner",
+        "type": "address"
+      }
+    ],
+    "name": "transferOwnership",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  }
+]
+        "#;
@@ -5,6 +5,8 @@ use std::time::Duration;
 use time::OffsetDateTime;
 use url::Url;

+pub mod eth_contract;
+
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct ValidatorDetails {
    // it is assumed those values are always valid since they're being provided in our defaults file
@@ -61,7 +63,24 @@ pub fn default_api_endpoints() -> Vec<Url> {
 }

 pub const DEFAULT_MIXNET_CONTRACT_ADDRESS: &str = "punk10pyejy66429refv3g35g2t7am0was7yalwrzen";
-pub const NETWORK_MONITOR_ADDRESS: &str = "punk1v9qauwdq5terag6uvfsdytcs2d0sdmfdy7hgk3";
+pub const REWARDING_VALIDATOR_ADDRESS: &str = "punk1v9qauwdq5terag6uvfsdytcs2d0sdmfdy7hgk3";
+
+/// How much bandwidth (in bytes) one token can buy
+const BYTES_PER_TOKEN: u64 = 1024 * 1024 * 1024;
+/// How many ERC20 tokens should be burned to buy bandwidth
+pub const TOKENS_TO_BURN: u64 = 10;
+/// Default bandwidth (in bytes) that we try to buy
+pub const BANDWIDTH_VALUE: u64 = TOKENS_TO_BURN * BYTES_PER_TOKEN;
+
+// Ethereum constants used for token bridge
+pub const ETH_CONTRACT_ADDRESS: [u8; 20] =
+    hex_literal::hex!("9fEE3e28c17dbB87310A51F13C4fbf4331A6f102");
+pub const ETH_MIN_BLOCK_DEPTH: usize = 7;
+pub const COSMOS_CONTRACT_ADDRESS: &str = "punk1jld76tqw4wnpfenmay2xkv86nr3j0w426eka82";
+// Name of the event triggered by the eth contract. If the event name is changed,
+// this would also need to be changed; It is currently tested against the json abi
+pub const ETH_EVENT_NAME: &str = "Burned";
+pub const ETH_BURN_FUNCTION_NAME: &str = "burnTokenForAccessCode";

 /// Defaults Cosmos Hub/ATOM path
 pub const COSMOS_DERIVATION_PATH: &str = "m/44'/118'/0'/0/0";
@@ -93,4 +112,11 @@ pub const VALIDATOR_API_VERSION: &str = "v1";

 // REWARDING
 pub const DEFAULT_FIRST_EPOCH_START: OffsetDateTime = time::macros::datetime!(2021-08-23 12:00 UTC);
-pub const DEFAULT_EPOCH_LENGTH: Duration = Duration::from_secs(24 * 60 * 60); // 24h
+pub const DEFAULT_EPOCH_LENGTH: Duration = Duration::from_secs(24 * 60 * 60 * 30); // 30 days
+/// We'll be assuming a few more things, profit margin and cost function. Since we don't have relialable package measurement, we'll be using uptime. We'll also set the value of 1 Nym to 1 $, to be able to translate epoch costs to Nyms. We'll also assume a cost of 40$ per epoch(month), converting that to Nym at our 1$ rate translates to 40_000_000 uNyms
+pub const DEFAULT_OPERATOR_EPOCH_COST: u64 = 40_000_000; // 40$/(30 days) at 1 Nym == 1$
+
+// TODO: is there a way to get this from the chain
+pub const TOTAL_SUPPLY: u128 = 1_000_000_000_000_000;
+
+pub const DEFAULT_PROFIT_MARGIN: u8 = 10;
@@ -1,16 +1,5 @@
-// Copyright 2021 Nym Technologies SA
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0

 use core::ops::{Deref, Mul};
 use std::convert::TryFrom;
@@ -1,16 +1,5 @@
-// Copyright 2021 Nym Technologies SA
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0

 use thiserror::Error;

@@ -1,16 +1,5 @@
-// Copyright 2021 Nym Technologies SA
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0

 use std::convert::TryInto;

@@ -44,11 +33,11 @@ use crate::traits::Bytable;
 pub mod elgamal;
 mod error;
 mod impls;
-pub mod proofs;
-pub mod scheme;
+mod proofs;
+mod scheme;
 #[cfg(test)]
 mod tests;
-pub mod traits;
+mod traits;
 mod utils;

 pub type Attribute = Scalar;
@@ -1,16 +1,5 @@
-// Copyright 2021 Nym Technologies SA
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0

 // TODO: look at https://crates.io/crates/merlin to perhaps use it instead?

@@ -49,7 +38,7 @@ pub struct ProofCmCs {
 // representations together and hash that.
 // note2: G1 and G2 elements are using their compressed representations
 // and as per the bls12-381 library all elements are using big-endian form
-/// Generates a Scalar [or Fp] challenge by hashing a number of elliptic curve points.
+/// Generates a Scalar [or Fp] challenge by hashing a number of elliptic curve points.  
 fn compute_challenge<D, I, B>(iter: I) -> Scalar
 where
    D: Digest,
@@ -282,7 +271,7 @@ impl ProofCmCs {
        challenge == self.challenge
    }

-    // challenge || rr || rk.len() || rk || rm.len() || rm
+    // challenge || response opening || response private elgamal key || keys len || response keys || attributes len || response attributes
    pub(crate) fn to_bytes(&self) -> Vec<u8> {
        let keys_len = self.response_keys.len() as u64;
        let attributes_len = self.response_attributes.len() as u64;
@@ -309,7 +298,7 @@ impl ProofCmCs {

    pub(crate) fn from_bytes(bytes: &[u8]) -> Result<Self> {
        // at the very minimum there must be a single attribute being proven
-        if bytes.len() < 32 * 4 + 16 || (bytes.len() - 16) % 32 != 0 {
+        if bytes.len() < 32 * 5 + 16 || (bytes.len() - 16) % 32 != 0 {
            return Err(
                CoconutError::Deserialization(
                    "tried to deserialize proof of ciphertexts and commitment with bytes of invalid length".to_string())
@@ -376,163 +365,7 @@ impl ProofCmCs {

 #[derive(Debug)]
 #[cfg_attr(test, derive(PartialEq))]
-pub struct ProofKappa {
-    challenge: Scalar,
-    response_attributes: Vec<Scalar>,
-    response_blinder: Scalar,
-}
-
-impl ProofKappa {
-    pub fn construct(
-        params: &Parameters,
-        verification_key: &VerificationKey,
-        blinding_factor: &Scalar,
-        blinded_message: &G2Projective,
-        private_attributes: &[Attribute],
-        verifier_id: &[u8; 32],
-        timestamp: &[u8; 32],
-    ) -> Self {
-        // create the witnesses
-        let witness_blinder = params.random_scalar();
-        let witness_attributes = params.n_random_scalars(private_attributes.len());
-
-        let beta_bytes = verification_key
-            .beta
-            .iter()
-            .map(|beta_i| beta_i.to_bytes())
-            .collect::<Vec<_>>();
-
-        // witnesses commitments
-        // Aw = g2 * wt + alpha + beta[0] * wm[0] + ... + beta[i] * wm[i]
-        let commitment_kappa = params.gen2() * witness_blinder
-            + verification_key.alpha
-            + witness_attributes
-                .iter()
-                .zip(verification_key.beta.iter())
-                .map(|(wm_i, beta_i)| beta_i * wm_i)
-                .sum::<G2Projective>();
-
-        let challenge = compute_challenge::<ChallengeDigest, _, _>(
-            std::iter::once(params.gen2().to_bytes().as_ref())
-                .chain(std::iter::once(blinded_message.to_bytes().as_ref())) //kappa
-                .chain(std::iter::once(verification_key.alpha.to_bytes().as_ref()))
-                .chain(beta_bytes.iter().map(|b| b.as_ref()))
-                .chain(std::iter::once(commitment_kappa.to_bytes().as_ref()))
-                .chain(std::iter::once(verifier_id.as_ref()))
-                .chain(std::iter::once(timestamp.as_ref())),
-        );
-
-        // responses
-        let response_blinder = produce_response(&witness_blinder, &challenge, blinding_factor);
-        let response_attributes =
-            produce_responses(&witness_attributes, &challenge, private_attributes);
-
-        ProofKappa {
-            challenge,
-            response_attributes,
-            response_blinder,
-        }
-    }
-
-    pub fn private_attributes_len(&self) -> usize {
-        self.response_attributes.len()
-    }
-
-    pub fn verify(
-        &self,
-        params: &Parameters,
-        verification_key: &VerificationKey,
-        kappa: &G2Projective,
-        verifier_id: &[u8; 32],
-        timestamp: &[u8; 32],
-    ) -> bool {
-        let beta_bytes = verification_key
-            .beta
-            .iter()
-            .map(|beta_i| beta_i.to_bytes())
-            .collect::<Vec<_>>();
-
-        // re-compute witnesses commitments
-        // Aw = (c * kappa) + (rt * g2) + ((1 - c) * alpha) + (rm[0] * beta[0]) + ... + (rm[i] * beta[i])
-        let commitment_kappa = kappa * self.challenge
-            + params.gen2() * self.response_blinder
-            + verification_key.alpha * (Scalar::one() - self.challenge)
-            + self
-                .response_attributes
-                .iter()
-                .zip(verification_key.beta.iter())
-                .map(|(priv_attr, beta_i)| beta_i * priv_attr)
-                .sum::<G2Projective>();
-
-        // compute the challenge
-        let challenge = compute_challenge::<ChallengeDigest, _, _>(
-            std::iter::once(params.gen2().to_bytes().as_ref())
-                .chain(std::iter::once(kappa.to_bytes().as_ref()))
-                .chain(std::iter::once(verification_key.alpha.to_bytes().as_ref()))
-                .chain(beta_bytes.iter().map(|b| b.as_ref()))
-                .chain(std::iter::once(commitment_kappa.to_bytes().as_ref()))
-                .chain(std::iter::once(verifier_id.as_ref()))
-                .chain(std::iter::once(timestamp.as_ref())),
-        );
-
-        challenge == self.challenge
-    }
-
-    pub fn to_bytes(&self) -> Vec<u8> {
-        let attributes_len = self.response_attributes.len() as u64;
-        let mut bytes = Vec::with_capacity(8 + (attributes_len + 2) as usize * 32);
-
-        bytes.extend_from_slice(&self.challenge.to_bytes());
-        bytes.extend_from_slice(&self.response_blinder.to_bytes());
-
-        bytes.extend_from_slice(&attributes_len.to_le_bytes());
-
-        for rm in &self.response_attributes {
-            bytes.extend_from_slice(&rm.to_bytes());
-        }
-
-        bytes
-    }
-
-    pub fn from_bytes(bytes: &[u8]) -> Result<Self> {
-        // at the very minimum there must be a single attribute being proven
-        if bytes.len() < 32 * 2 + 8 || (bytes.len() - 8) % 32 != 0 {
-            return Err(
-                CoconutError::Deserialization(
-                    "tried to deserialize proof of ciphertexts and commitment with bytes of invalid length".to_string())
-            );
-        }
-
-        let challenge_bytes = bytes[..32].try_into().unwrap();
-        let challenge = try_deserialize_scalar(
-            &challenge_bytes,
-            CoconutError::Deserialization("Failed to deserialize challenge".to_string()),
-        )?;
-
-        let blinder_bytes = bytes[32..64].try_into().unwrap();
-        let response_blinder = try_deserialize_scalar(
-            &blinder_bytes,
-            CoconutError::Deserialization("failed to deserialize the blinder".to_string()),
-        )?;
-
-        let rm_len = u64::from_le_bytes(bytes[64..64 + 8].try_into().unwrap());
-        let response_attributes = try_deserialize_scalar_vec(
-            rm_len,
-            &bytes[64 + 8..],
-            CoconutError::Deserialization("Failed to deserialize attributes response".to_string()),
-        )?;
-
-        Ok(ProofKappa {
-            challenge,
-            response_attributes,
-            response_blinder,
-        })
-    }
-}
-
-#[derive(Debug)]
-#[cfg_attr(test, derive(PartialEq))]
-pub struct ProofKappaNu {
+pub struct ProofKappaZeta {
    // c
    challenge: Scalar,

@@ -542,7 +375,7 @@ pub struct ProofKappaNu {
    response_blinder: Scalar,
 }

-impl ProofKappaNu {
+impl ProofKappaZeta {
    pub(crate) fn construct(
        params: &Parameters,
        verification_key: &VerificationKey,
@@ -580,7 +413,7 @@ impl ProofKappaNu {
        let challenge = compute_challenge::<ChallengeDigest, _, _>(
            std::iter::once(params.gen2().to_bytes().as_ref())
                .chain(std::iter::once(blinded_message.to_bytes().as_ref()))
-                .chain(std::iter::once(blinded_serial_number.to_bytes().as_ref())) //kappa
+                .chain(std::iter::once(blinded_serial_number.to_bytes().as_ref()))
                .chain(std::iter::once(verification_key.alpha.to_bytes().as_ref()))
                .chain(beta_bytes.iter().map(|b| b.as_ref()))
                .chain(std::iter::once(commitment_kappa.to_bytes().as_ref()))
@@ -594,7 +427,7 @@ impl ProofKappaNu {
        let response_binding_number =
            produce_response(&witness_binding_number, &challenge, binding_number);

-        ProofKappaNu {
+        ProofKappaZeta {
            challenge,
            response_serial_number,
            response_binding_number,
@@ -648,11 +481,10 @@ impl ProofKappaNu {
        challenge == self.challenge
    }

-    // challenge || rm.len() || rm || rt
+    // challenge || response serial number || response binding number || repose blinder
    pub(crate) fn to_bytes(&self) -> Vec<u8> {
-        //let attributes_len = self.response_attributes.len() as u64;
-        let attributes_len = 2;
-        let mut bytes = Vec::with_capacity((attributes_len + 1) as usize * 32);
+        let attributes_len = 2; // because we have serial number and the binding number
+        let mut bytes = Vec::with_capacity((1 + attributes_len + 1) as usize * 32);

        bytes.extend_from_slice(&self.challenge.to_bytes());
        bytes.extend_from_slice(&self.response_serial_number.to_bytes());
@@ -665,13 +497,13 @@ impl ProofKappaNu {

    pub(crate) fn from_bytes(bytes: &[u8]) -> Result<Self> {
        // at the very minimum there must be a single attribute being proven
-        if bytes.len() < 32 * 3 || (bytes.len()) % 32 != 0 {
+        if bytes.len() < 32 * 4 || (bytes.len()) % 32 != 0 {
            return Err(CoconutError::DeserializationInvalidLength {
                actual: bytes.len(),
                modulus_target: bytes.len(),
                modulus: 32,
                object: "kappa and zeta".to_string(),
-                target: 32 * 3 + 8,
+                target: 32 * 4,
            });
        }

@@ -681,15 +513,6 @@ impl ProofKappaNu {
            CoconutError::Deserialization("Failed to deserialize challenge".to_string()),
        )?;

-        // let rm_len = u64::from_le_bytes(bytes[32..40].try_into().unwrap());
-        if bytes[32..].len() != (2 + 1) as usize * 32 {
-            return Err(
-                CoconutError::Deserialization(
-                    format!("Tried to deserialize proof of kappa and zeta with insufficient number of bytes provided, expected {} got {}.", (2 + 1) as usize * 32, bytes[32..].len())
-                )
-            );
-        }
-
        let serial_number_bytes = &bytes[32..64].try_into().unwrap();
        let response_serial_number = try_deserialize_scalar(
            serial_number_bytes,
@@ -708,7 +531,7 @@ impl ProofKappaNu {
            CoconutError::Deserialization("failed to deserialize the blinder".to_string()),
        )?;

-        Ok(ProofKappaNu {
+        Ok(ProofKappaZeta {
            challenge,
            response_serial_number,
            response_binding_number,
@@ -788,8 +611,8 @@ mod tests {
    }

    #[test]
-    fn proof_kappa_nu_bytes_roundtrip() {
-        let mut params = setup(1).unwrap();
+    fn proof_kappa_zeta_bytes_roundtrip() {
+        let mut params = setup(4).unwrap();

        let keypair = keygen(&mut params);

@@ -803,7 +626,7 @@ mod tests {
        let zeta = compute_zeta(&params, serial_number);

        // 0 public 2 private
-        let pi_v = ProofKappaNu::construct(
+        let pi_v = ProofKappaZeta::construct(
            &mut params,
            &keypair.verification_key(),
            &serial_number,
@@ -813,14 +636,16 @@ mod tests {
            &zeta,
        );

-        let bytes = pi_v.to_bytes();
-        assert_eq!(ProofKappaNu::from_bytes(&bytes).unwrap(), pi_v);
+        let proof_bytes = pi_v.to_bytes();
+
+        let proof_from_bytes = ProofKappaZeta::from_bytes(&proof_bytes).unwrap();
+        assert_eq!(proof_from_bytes, pi_v);

        // 2 public 2 private
        let mut params = setup(4).unwrap();
        let keypair = keygen(&mut params);

-        let pi_v = ProofKappaNu::construct(
+        let pi_v = ProofKappaZeta::construct(
            &mut params,
            &keypair.verification_key(),
            &serial_number,
@@ -830,7 +655,9 @@ mod tests {
            &zeta,
        );

-        let bytes = pi_v.to_bytes();
-        assert_eq!(ProofKappaNu::from_bytes(&bytes).unwrap(), pi_v);
+        let proof_bytes = pi_v.to_bytes();
+
+        let proof_from_bytes = ProofKappaZeta::from_bytes(&proof_bytes).unwrap();
+        assert_eq!(proof_from_bytes, pi_v);
    }
 }
@@ -1,16 +1,5 @@
-// Copyright 2021 Nym Technologies SA
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0

 use core::iter::Sum;
 use core::ops::Mul;
@@ -1,16 +1,5 @@
-// Copyright 2021 Nym Technologies SA
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0

 use std::convert::TryFrom;
 use std::convert::TryInto;
@@ -55,7 +44,7 @@ impl TryFrom<&[u8]> for BlindSignRequest {
    fn try_from(bytes: &[u8]) -> Result<BlindSignRequest> {
        if bytes.len() < 48 + 48 + 8 + 96 {
            return Err(CoconutError::DeserializationMinLength {
-                min: 48 + 48 + 8 + 9,
+                min: 48 + 48 + 8 + 96,
                actual: bytes.len(),
            });
        }
@@ -151,10 +140,6 @@ impl BlindSignRequest {
        self.commitment_hash
    }

-    // TODO: perhaps also include pi_s.len()?
-    // to be determined once we implement serde to make sure its 1:1 compatible
-    // with bincode
-    // cm || c.len() || c || pi_s
    pub fn to_bytes(&self) -> Vec<u8> {
        self.to_byte_vec()
    }
@@ -1,16 +1,5 @@
-// Copyright 2021 Nym Technologies SA
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0

 use core::borrow::Borrow;
 use core::iter::Sum;
@@ -124,8 +113,8 @@ impl Base58 for SecretKey {}
 #[derive(Debug, PartialEq, Clone)]
 pub struct VerificationKey {
    // TODO add gen2 as per the paper or imply it from the fact library is using bls381?
-    pub alpha: G2Projective,
-    pub beta: Vec<G2Projective>,
+    pub(crate) alpha: G2Projective,
+    pub(crate) beta: Vec<G2Projective>,
 }

 impl TryFrom<&[u8]> for VerificationKey {
@@ -1,16 +1,5 @@
-// Copyright 2021 Nym Technologies SA
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0

 // TODO: implement https://crates.io/crates/signature traits?

@@ -41,7 +30,7 @@ pub type SignerIndex = u64;
 // (h, s)
 #[derive(Debug, Clone, Copy)]
 #[cfg_attr(test, derive(PartialEq))]
-pub struct Signature(pub G1Projective, pub G1Projective);
+pub struct Signature(pub(crate) G1Projective, pub(crate) G1Projective);

 pub type PartialSignature = Signature;

@@ -237,13 +226,85 @@ impl SignatureShare {

 #[cfg(test)]
 mod tests {
+    use group::GroupEncoding;
+
+    use crate::hash_to_scalar;
    use crate::scheme::aggregation::{aggregate_signatures, aggregate_verification_keys};
    use crate::scheme::issuance::{blind_sign, prepare_blind_sign, sign};
    use crate::scheme::keygen::{keygen, ttp_keygen};
    use crate::scheme::verification::{prove_bandwidth_credential, verify, verify_credential};
+    use crate::utils::hash_g1;

    use super::*;

+    #[test]
+    fn unblind_returns_error_if_integrity_check_on_commitment_hash_fails() {
+        let mut params = Parameters::new(2).unwrap();
+        let private_attributes = params.n_random_scalars(2 as usize);
+        let elgamal_keypair = elgamal::elgamal_keygen(&mut params);
+
+        let lambda =
+            prepare_blind_sign(&mut params, &elgamal_keypair, &private_attributes, &[]).unwrap();
+
+        let keypair1 = keygen(&mut params);
+
+        let sig1 = blind_sign(
+            &mut params,
+            &keypair1.secret_key(),
+            elgamal_keypair.public_key(),
+            &lambda,
+            &[],
+        )
+        .unwrap();
+
+        let wrong_commitment_opening = params.random_scalar();
+        let wrong_commitment = params.gen1() * wrong_commitment_opening;
+        let fake_commitment_hash = hash_g1(wrong_commitment.to_bytes());
+        assert!(sig1
+            .unblind(
+                &params,
+                elgamal_keypair.private_key(),
+                &keypair1.verification_key(),
+                &private_attributes,
+                &[],
+                &fake_commitment_hash,
+            )
+            .is_err());
+    }
+
+    #[test]
+    fn unblind_returns_error_if_signature_verification_fails() {
+        let mut params = Parameters::new(2).unwrap();
+        let private_attributes = vec![hash_to_scalar("Attribute1"), hash_to_scalar("Attribute2")];
+        let private_attributes2 = vec![hash_to_scalar("Attribute3"), hash_to_scalar("Attribute4")];
+        let elgamal_keypair = elgamal::elgamal_keygen(&mut params);
+
+        let lambda =
+            prepare_blind_sign(&mut params, &elgamal_keypair, &private_attributes, &[]).unwrap();
+
+        let keypair1 = keygen(&mut params);
+
+        let sig1 = blind_sign(
+            &mut params,
+            &keypair1.secret_key(),
+            elgamal_keypair.public_key(),
+            &lambda,
+            &[],
+        )
+        .unwrap();
+
+        assert!(sig1
+            .unblind(
+                &params,
+                elgamal_keypair.private_key(),
+                &keypair1.verification_key(),
+                &private_attributes2,
+                &[],
+                &lambda.get_commitment_hash(),
+            )
+            .is_err());
+    }
+
    #[test]
    fn verification_on_two_private_attributes() {
        let mut params = Parameters::new(2).unwrap();
@@ -1,23 +1,14 @@
-// Copyright 2021 Nym Technologies SA
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0

-use crate::error::{CoconutError, Result};
-use crate::utils::hash_g1;
 use bls12_381::{G1Affine, G2Affine, G2Prepared, Scalar};
 use ff::Field;
 use group::Curve;
 use rand::thread_rng;
+
+use crate::error::{CoconutError, Result};
+use crate::utils::hash_g1;
+
 /// System-wide parameters used for the protocol
 pub struct Parameters {
    /// Generator of the G1 group
@@ -57,15 +48,15 @@ impl Parameters {
        &self.g1
    }

-    pub fn gen2(&self) -> &G2Affine {
+    pub(crate) fn gen2(&self) -> &G2Affine {
        &self.g2
    }

-    pub fn prepared_miller_g2(&self) -> &G2Prepared {
+    pub(crate) fn prepared_miller_g2(&self) -> &G2Prepared {
        &self._g2_prepared_miller
    }

-    pub fn gen_hs(&self) -> &[G1Affine] {
+    pub(crate) fn gen_hs(&self) -> &[G1Affine] {
        &self.hs
    }

@@ -1,16 +1,5 @@
-// Copyright 2021 Nym Technologies SA
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0

 use core::ops::Neg;
 use std::convert::TryFrom;
@@ -20,7 +9,7 @@ use bls12_381::{multi_miller_loop, G1Affine, G2Prepared, G2Projective, Scalar};
 use group::{Curve, Group};

 use crate::error::{CoconutError, Result};
-use crate::proofs::{ProofKappa, ProofKappaNu};
+use crate::proofs::ProofKappaZeta;
 use crate::scheme::setup::Parameters;
 use crate::scheme::Signature;
 use crate::scheme::VerificationKey;
@@ -30,83 +19,6 @@ use crate::Attribute;

 // TODO NAMING: this whole thing
 // Theta
-
-#[derive(Debug)]
-#[cfg_attr(test, derive(PartialEq))]
-pub struct ThetaCovid {
-    // blinded_message (kappa)
-    pub blinded_message: G2Projective,
-    // sigma
-    pub credential: Signature,
-    // pi_v
-    pub pi_v: ProofKappa,
-}
-
-impl ThetaCovid {
-    pub fn verify_proof(
-        &self,
-        params: &Parameters,
-        verification_key: &VerificationKey,
-        verifier_id: &[u8; 32],
-        timestamp: &[u8; 32],
-    ) -> bool {
-        self.pi_v.verify(
-            params,
-            verification_key,
-            &self.blinded_message,
-            verifier_id,
-            timestamp,
-        )
-    }
-
-    // kappa || credential || proof
-    pub fn to_bytes(&self) -> Vec<u8> {
-        let blinded_message_bytes = self.blinded_message.to_affine().to_compressed();
-        let credential_bytes = self.credential.to_bytes();
-        let proof_bytes = self.pi_v.to_bytes();
-
-        let mut bytes = Vec::with_capacity(192 + proof_bytes.len());
-        bytes.extend_from_slice(&blinded_message_bytes);
-        bytes.extend_from_slice(&credential_bytes);
-        bytes.extend_from_slice(&proof_bytes);
-
-        bytes
-    }
-
-    pub fn to_bytes_tuple(&self) -> ([u8; 96], [u8; 96], Vec<u8>) {
-        let blinded_message_bytes = self.blinded_message.to_affine().to_compressed();
-        let credential_bytes = self.credential.to_bytes();
-        let proof_bytes = self.pi_v.to_bytes();
-
-        (blinded_message_bytes, credential_bytes, proof_bytes)
-    }
-
-    pub fn from_bytes(bytes: &[u8]) -> Result<ThetaCovid> {
-        if bytes.len() < 192 {
-            return Err(
-                CoconutError::Deserialization(
-                    format!("Tried to deserialize theta with insufficient number of bytes, expected >= 192, got {}", bytes.len()),
-                ));
-        }
-
-        let blinded_message_bytes = bytes[..96].try_into().unwrap();
-        let blinded_message = try_deserialize_g2_projective(
-            &blinded_message_bytes,
-            CoconutError::Deserialization("failed to deserialize kappa".to_string()),
-        )?;
-
-        let credential = Signature::try_from(&bytes[96..192])?;
-
-        let pi_v = ProofKappa::from_bytes(&bytes[192..])?;
-
-        Ok(ThetaCovid {
-            blinded_message,
-            credential,
-            pi_v,
-        })
-    }
-}
-
 #[derive(Debug)]
 #[cfg_attr(test, derive(PartialEq))]
 pub struct Theta {
@@ -117,7 +29,7 @@ pub struct Theta {
    // sigma
    pub credential: Signature,
    // pi_v
-    pub pi_v: ProofKappaNu,
+    pub pi_v: ProofKappaZeta,
 }

 impl TryFrom<&[u8]> for Theta {
@@ -134,17 +46,21 @@ impl TryFrom<&[u8]> for Theta {
        let blinded_message_bytes = bytes[..96].try_into().unwrap();
        let blinded_message = try_deserialize_g2_projective(
            &blinded_message_bytes,
-            CoconutError::Deserialization("failed to deserialize kappa".to_string()),
+            CoconutError::Deserialization(
+                "failed to deserialize the blinded message (kappa)".to_string(),
+            ),
        )?;

        let blinded_serial_number_bytes = bytes[96..192].try_into().unwrap();
        let blinded_serial_number = try_deserialize_g2_projective(
            &blinded_serial_number_bytes,
-            CoconutError::Deserialization("failed to deserialize zeta".to_string()),
+            CoconutError::Deserialization(
+                "failed to deserialize the blinded serial number (zeta)".to_string(),
+            ),
        )?;
        let credential = Signature::try_from(&bytes[192..288])?;

-        let pi_v = ProofKappaNu::from_bytes(&bytes[288..])?;
+        let pi_v = ProofKappaZeta::from_bytes(&bytes[288..])?;

        Ok(Theta {
            blinded_message,
@@ -165,10 +81,7 @@ impl Theta {
        )
    }

-    // TODO: perhaps also include pi_v.len()?
-    // to be determined once we implement serde to make sure its 1:1 compatible
-    // with bincode
-    // kappa || nu || credential || pi_v
+    // blinded message (kappa)  || blinded serial number (zeta) || credential || pi_v
    pub fn to_bytes(&self) -> Vec<u8> {
        let blinded_message_bytes = self.blinded_message.to_affine().to_compressed();
        let blinded_serial_number_bytes = self.blinded_serial_number.to_affine().to_compressed();
@@ -220,56 +133,6 @@ pub fn compute_zeta(params: &Parameters, serial_number: Attribute) -> G2Projecti
    params.gen2() * serial_number
 }

-pub fn prove_covid_credential(
-    params: &Parameters,
-    verification_key: &VerificationKey,
-    signature: &Signature,
-    private_attributes: &[Attribute],
-    verifier_id: &[u8; 32],
-    timestamp: &[u8; 32],
-) -> Result<ThetaCovid> {
-    if verification_key.beta.len() < params.gen_hs().len() {
-        return Err(
-            CoconutError::Verification(
-                format!("Tried to prove a credential for higher than supported by the provided verification key number of attributes (max: {}, requested: 2)",
-                        verification_key.beta.len()
-                )));
-    }
-
-    // Randomize the signature
-    let (signature_prime, sign_blinding_factor) = signature.randomise(params);
-
-    // blinded_message : kappa in the paper.
-    // Value kappa is needed since we want to show a signature sigma'.
-    // In order to verify sigma' we need both the verification key vk and the message m.
-    // However, we do not want to reveal m to whomever we are showing the signature.
-    // Thus, we need kappa which allows us to verify sigma'. In particular,
-    // kappa is computed on m as input, but thanks to the use or random value r,
-    // it does not reveal any information about m.
-    let blinded_message = compute_kappa(
-        params,
-        verification_key,
-        &private_attributes,
-        sign_blinding_factor,
-    );
-
-    let pi_v = ProofKappa::construct(
-        params,
-        verification_key,
-        &sign_blinding_factor,
-        &blinded_message,
-        &private_attributes,
-        verifier_id,
-        timestamp,
-    );
-
-    Ok(ThetaCovid {
-        blinded_message,
-        credential: signature_prime,
-        pi_v,
-    })
-}
-
 pub fn prove_bandwidth_credential(
    params: &Parameters,
    verification_key: &VerificationKey,
@@ -306,7 +169,7 @@ pub fn prove_bandwidth_credential(
    // zeta is a commitment to the serial number (i.e., a public value associated with the serial number)
    let blinded_serial_number = compute_zeta(params, serial_number);

-    let pi_v = ProofKappaNu::construct(
+    let pi_v = ProofKappaZeta::construct(
        params,
        verification_key,
        &serial_number,
@@ -336,47 +199,6 @@ pub fn check_bilinear_pairing(p: &G1Affine, q: &G2Prepared, r: &G1Affine, s: &G2
    multi_miller.final_exponentiation().is_identity().into()
 }

-pub fn verify_covid_credential(
-    params: &Parameters,
-    verification_key: &VerificationKey,
-    theta: &ThetaCovid,
-    public_attributes: &[Attribute],
-    verifier_id: &[u8; 32],
-    timestamp: &[u8; 32],
-) -> bool {
-    if public_attributes.len() + theta.pi_v.private_attributes_len() > verification_key.beta.len() {
-        return false;
-    }
-
-    if !theta.verify_proof(params, verification_key, verifier_id, timestamp) {
-        return false;
-    }
-
-    let kappa = if public_attributes.is_empty() {
-        theta.blinded_message
-    } else {
-        let signed_public_attributes = public_attributes
-            .iter()
-            .zip(
-                verification_key
-                    .beta
-                    .iter()
-                    .skip(theta.pi_v.private_attributes_len()),
-            )
-            .map(|(pub_attr, beta_i)| beta_i * pub_attr)
-            .sum::<G2Projective>();
-
-        theta.blinded_message + signed_public_attributes
-    };
-
-    check_bilinear_pairing(
-        &theta.credential.0.to_affine(),
-        &G2Prepared::from(kappa.to_affine()),
-        &(theta.credential.1).to_affine(),
-        params.prepared_miller_g2(),
-    ) && !bool::from(theta.credential.0.is_identity())
-}
-
 pub fn verify_credential(
    params: &Parameters,
    verification_key: &VerificationKey,
@@ -1,7 +1,7 @@
 use crate::{
    aggregate_signature_shares, aggregate_verification_keys, blind_sign, elgamal_keygen,
-    hash_to_scalar, prepare_blind_sign, prove_bandwidth_credential, setup, ttp_keygen,
-    verify_credential, CoconutError, Signature, SignatureShare, VerificationKey,
+    prepare_blind_sign, prove_bandwidth_credential, setup, ttp_keygen, verify_credential,
+    CoconutError, Signature, SignatureShare, VerificationKey,
 };

 #[test]
@@ -1,153 +0,0 @@
-use crate::scheme::verification::{prove_covid_credential, verify_covid_credential, ThetaCovid};
-use crate::{
-    aggregate_signature_shares, aggregate_verification_keys, blind_sign, elgamal_keygen,
-    hash_to_scalar, prepare_blind_sign, setup, ttp_keygen, CoconutError, Signature, SignatureShare,
-    VerificationKey,
-};
-
-#[test]
-fn main() -> Result<(), CoconutError> {
-    let params = setup(15)?;
-
-    // validators keys
-    let coconut_keypairs = ttp_keygen(&params, 2, 3)?;
-    let verification_keys: Vec<VerificationKey> = coconut_keypairs
-        .iter()
-        .map(|keypair| keypair.verification_key())
-        .collect();
-    let verification_key = aggregate_verification_keys(&verification_keys, Some(&[1, 2, 3]))?;
-
-    // user's ElGamal keypair
-    let elgamal_keypair = elgamal_keygen(&params);
-
-    // attributes to consider
-    let patient_id = hash_to_scalar(String::from("NHS678777").as_bytes());
-    let full_name = hash_to_scalar(String::from("JaneDoe").as_bytes());
-    let vaccine_medication_product_id = hash_to_scalar(String::from("EU/1/20/1528").as_bytes());
-    let country_of_vaccination = hash_to_scalar(String::from("UK").as_bytes());
-    let issuer = hash_to_scalar(String::from("NHS").as_bytes());
-    let dob = hash_to_scalar(String::from("2021-11-05").as_bytes());
-
-    let public_attributes = vec![
-        patient_id,
-        full_name,
-        vaccine_medication_product_id,
-        country_of_vaccination,
-        issuer,
-        dob,
-    ];
-    let user_secret = params.random_scalar();
-    let private_attributes = vec![user_secret];
-
-    // ISSUANCE PROTOCOL
-    let blind_sign_request = prepare_blind_sign(
-        &params,
-        &elgamal_keypair,
-        &private_attributes,
-        &public_attributes,
-    )?;
-
-    // generate blinded signatures
-    let mut blinded_signatures = Vec::new();
-
-    let is_vaccinated = hash_to_scalar(String::from("TRUE").as_bytes());
-    let is_over_18 = hash_to_scalar(String::from("TRUE").as_bytes());
-    let is_over_21 = hash_to_scalar(String::from("TRUE").as_bytes());
-
-    // These are the attributes on which the validator issues a signature
-    let public_attributes = [
-        patient_id,
-        full_name,
-        vaccine_medication_product_id,
-        country_of_vaccination,
-        issuer,
-        dob,
-        is_vaccinated,
-        is_over_18,
-        is_over_21,
-    ];
-
-    for keypair in coconut_keypairs {
-        let blinded_signature = blind_sign(
-            &params,
-            &keypair.secret_key(),
-            &elgamal_keypair.public_key(),
-            &blind_sign_request,
-            &public_attributes,
-        )?;
-        blinded_signatures.push(blinded_signature)
-    }
-
-    let unblinded_signatures: Vec<Signature> = blinded_signatures
-        .into_iter()
-        .zip(verification_keys.iter())
-        .map(|(signature, verification_key)| {
-            signature
-                .unblind(
-                    &params,
-                    &elgamal_keypair.private_key(),
-                    &verification_key,
-                    &private_attributes,
-                    &public_attributes,
-                    &blind_sign_request.get_commitment_hash(),
-                )
-                .unwrap()
-        })
-        .collect();
-
-    let signature_shares: Vec<SignatureShare> = unblinded_signatures
-        .iter()
-        .enumerate()
-        .map(|(idx, signature)| SignatureShare::new(*signature, (idx + 1) as u64))
-        .collect();
-
-    let mut attributes = Vec::with_capacity(1 + 9);
-    attributes.extend_from_slice(&private_attributes);
-    attributes.extend_from_slice(&public_attributes);
-
-    // Randomize credentials and generate any cryptographic material to verify them
-    let signature =
-        aggregate_signature_shares(&params, &verification_key, &attributes, &signature_shares)?;
-
-    // SHOW PROTOCOL
-    let verifier_id = [11u8; 32];
-    let timestamp = [12u8; 32];
-
-    let show_private_attributes = vec![
-        user_secret,
-        patient_id,
-        full_name,
-        vaccine_medication_product_id,
-        country_of_vaccination,
-        issuer,
-        dob,
-    ];
-
-    // Prove covid credential
-    let theta_covid = prove_covid_credential(
-        &params,
-        &verification_key,
-        &signature,
-        &show_private_attributes,
-        &verifier_id,
-        &timestamp,
-    )?;
-
-    let theta_covid_bytes = theta_covid.to_bytes();
-    println!("Length of theta in bytes: {:?}", theta_covid_bytes.len());
-
-    let theta_covid_from_bytes = ThetaCovid::from_bytes(&*theta_covid_bytes).unwrap();
-
-    // Verify covid credentials
-    let disclosed_attributes = vec![is_vaccinated, is_over_18, is_over_21];
-    assert!(verify_covid_credential(
-        &params,
-        &verification_key,
-        &theta_covid_from_bytes,
-        disclosed_attributes.as_ref(),
-        &verifier_id,
-        &timestamp,
-    ));
-
-    Ok(())
-}
@@ -1,2 +1 @@
 mod e2e;
-mod e2e_covid;
@@ -1,16 +1,5 @@
-// Copyright 2021 Nym Technologies SA
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0

 use core::iter::Sum;
 use core::ops::Mul;
@@ -0,0 +1,863 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "base64"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
+
+[[package]]
+name = "block-buffer"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
+dependencies = [
+ "block-padding",
+ "byte-tools",
+ "byteorder",
+ "generic-array 0.12.4",
+]
+
+[[package]]
+name = "block-buffer"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
+dependencies = [
+ "generic-array 0.14.4",
+]
+
+[[package]]
+name = "block-padding"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
+dependencies = [
+ "byte-tools",
+]
+
+[[package]]
+name = "byte-tools"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
+
+[[package]]
+name = "byteorder"
+version = "1.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "config"
+version = "0.1.0"
+dependencies = [
+ "handlebars",
+ "humantime-serde",
+ "network-defaults",
+ "serde",
+ "toml",
+ "url",
+]
+
+[[package]]
+name = "const-oid"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdab415d6744056100f40250a66bc430c1a46f7a02e20bc11c94c79a0f0464df"
+
+[[package]]
+name = "cosmos_contract"
+version = "0.1.0"
+dependencies = [
+ "config",
+ "cosmwasm-std",
+ "cosmwasm-storage",
+ "erc20-bridge-contract",
+ "schemars",
+ "serde",
+ "thiserror",
+]
+
+[[package]]
+name = "cosmwasm-crypto"
+version = "0.14.1"
+source = "git+https://github.com/jstuczyn/cosmwasm?branch=0.14.1-updatedk256#308781cd5f33b0e996176c6b500793d3648c0f7b"
+dependencies = [
+ "digest 0.9.0",
+ "ed25519-zebra",
+ "k256",
+ "rand_core 0.5.1",
+ "thiserror",
+]
+
+[[package]]
+name = "cosmwasm-derive"
+version = "0.14.1"
+source = "git+https://github.com/jstuczyn/cosmwasm?branch=0.14.1-updatedk256#308781cd5f33b0e996176c6b500793d3648c0f7b"
+dependencies = [
+ "syn",
+]
+
+[[package]]
+name = "cosmwasm-std"
+version = "0.14.1"
+source = "git+https://github.com/jstuczyn/cosmwasm?branch=0.14.1-updatedk256#308781cd5f33b0e996176c6b500793d3648c0f7b"
+dependencies = [
+ "base64",
+ "cosmwasm-crypto",
+ "cosmwasm-derive",
+ "schemars",
+ "serde",
+ "serde-json-wasm",
+ "thiserror",
+ "uint",
+]
+
+[[package]]
+name = "cosmwasm-storage"
+version = "0.14.1"
+source = "git+https://github.com/jstuczyn/cosmwasm?branch=0.14.1-updatedk256#308781cd5f33b0e996176c6b500793d3648c0f7b"
+dependencies = [
+ "cosmwasm-std",
+ "serde",
+]
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crunchy"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
+[[package]]
+name = "crypto-bigint"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d12477e115c0d570c12a2dfd859f80b55b60ddb5075df210d3af06d133a69f45"
+dependencies = [
+ "generic-array 0.14.4",
+ "rand_core 0.6.3",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "crypto-mac"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714"
+dependencies = [
+ "generic-array 0.14.4",
+ "subtle",
+]
+
+[[package]]
+name = "curve25519-dalek"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61"
+dependencies = [
+ "byteorder",
+ "digest 0.9.0",
+ "rand_core 0.5.1",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "der"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28e98c534e9c8a0483aa01d6f6913bc063de254311bd267c9cf535e9b70e15b2"
+dependencies = [
+ "const-oid",
+]
+
+[[package]]
+name = "digest"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
+dependencies = [
+ "generic-array 0.12.4",
+]
+
+[[package]]
+name = "digest"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
+dependencies = [
+ "generic-array 0.14.4",
+]
+
+[[package]]
+name = "dyn-clone"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee2626afccd7561a06cf1367e2950c4718ea04565e20fb5029b6c7d8ad09abcf"
+
+[[package]]
+name = "ecdsa"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43ee23aa5b4f68c7a092b5c3beb25f50c406adc75e2363634f242f28ab255372"
+dependencies = [
+ "der",
+ "elliptic-curve",
+ "hmac",
+ "signature",
+]
+
+[[package]]
+name = "ed25519-zebra"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a128b76af6dd4b427e34a6fd43dc78dbfe73672ec41ff615a2414c1a0ad0409"
+dependencies = [
+ "curve25519-dalek",
+ "hex",
+ "rand_core 0.5.1",
+ "serde",
+ "sha2",
+ "thiserror",
+]
+
+[[package]]
+name = "elliptic-curve"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "beca177dcb8eb540133e7680baff45e7cc4d93bf22002676cec549f82343721b"
+dependencies = [
+ "crypto-bigint",
+ "ff",
+ "generic-array 0.14.4",
+ "group",
+ "pkcs8",
+ "rand_core 0.6.3",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "erc20-bridge-contract"
+version = "0.1.0"
+dependencies = [
+ "schemars",
+ "serde",
+]
+
+[[package]]
+name = "fake-simd"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
+
+[[package]]
+name = "ff"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0f40b2dcd8bc322217a5f6559ae5f9e9d1de202a2ecee2e9eafcbece7562a4f"
+dependencies = [
+ "rand_core 0.6.3",
+ "subtle",
+]
+
+[[package]]
+name = "form_urlencoded"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
+dependencies = [
+ "matches",
+ "percent-encoding",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd"
+dependencies = [
+ "typenum",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.9.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.10.2+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "group"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c363a5301b8f153d80747126a04b3c82073b9fe3130571a9d170cacdeaf7912"
+dependencies = [
+ "ff",
+ "rand_core 0.6.3",
+ "subtle",
+]
+
+[[package]]
+name = "handlebars"
+version = "3.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4498fc115fa7d34de968184e473529abb40eeb6be8bc5f7faba3d08c316cb3e3"
+dependencies = [
+ "log",
+ "pest",
+ "pest_derive",
+ "quick-error",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "hex-literal"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21e4590e13640f19f249fe3e4eca5113bc4289f2497710378190e7f4bd96f45b"
+
+[[package]]
+name = "hmac"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b"
+dependencies = [
+ "crypto-mac",
+ "digest 0.9.0",
+]
+
+[[package]]
+name = "humantime"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+
+[[package]]
+name = "humantime-serde"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac34a56cfd4acddb469cc7fff187ed5ac36f498ba085caf8bbc725e3ff474058"
+dependencies = [
+ "humantime",
+ "serde",
+]
+
+[[package]]
+name = "idna"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
+dependencies = [
+ "matches",
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "itoa"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
+
+[[package]]
+name = "k256"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "903ae2481bcdfdb7b68e0a9baa4b7c9aff600b9ae2e8e5bb5833b8c91ab851ea"
+dependencies = [
+ "cfg-if",
+ "ecdsa",
+ "elliptic-curve",
+ "sha2",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.103"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd8f7255a17a627354f321ef0055d63b898c6fb27eff628af4d1b66b7331edf6"
+
+[[package]]
+name = "log"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "maplit"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
+
+[[package]]
+name = "matches"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
+
+[[package]]
+name = "network-defaults"
+version = "0.1.0"
+dependencies = [
+ "hex-literal",
+ "serde",
+ "time",
+ "url",
+]
+
+[[package]]
+name = "opaque-debug"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
+
+[[package]]
+name = "opaque-debug"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
+
+[[package]]
+name = "percent-encoding"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
+
+[[package]]
+name = "pest"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
+dependencies = [
+ "ucd-trie",
+]
+
+[[package]]
+name = "pest_derive"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0"
+dependencies = [
+ "pest",
+ "pest_generator",
+]
+
+[[package]]
+name = "pest_generator"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55"
+dependencies = [
+ "pest",
+ "pest_meta",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "pest_meta"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d"
+dependencies = [
+ "maplit",
+ "pest",
+ "sha-1",
+]
+
+[[package]]
+name = "pkcs8"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee3ef9b64d26bad0536099c816c6734379e45bbd5f14798def6809e5cc350447"
+dependencies = [
+ "der",
+ "spki",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d"
+dependencies = [
+ "unicode-xid",
+]
+
+[[package]]
+name = "quick-error"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
+
+[[package]]
+name = "quote"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+dependencies = [
+ "getrandom 0.1.16",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
+dependencies = [
+ "getrandom 0.2.3",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
+
+[[package]]
+name = "schemars"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7a48d098c2a7fdf5740b19deb1181b4fb8a9e68e03ae517c14cde04b5725409"
+dependencies = [
+ "dyn-clone",
+ "schemars_derive",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "schemars_derive"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a9ea2a613fe4cd7118b2bb101a25d8ae6192e1975179b67b2f17afd11e70ac8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "serde_derive_internals",
+ "syn",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.130"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde-json-wasm"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50eef3672ec8fa45f3457fd423ba131117786784a895548021976117c1ded449"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.130"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_derive_internals"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1dbab34ca63057a1f15280bdf3c39f2b1eb1b54c17e98360e511637aef7418c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "sha-1"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df"
+dependencies = [
+ "block-buffer 0.7.3",
+ "digest 0.8.1",
+ "fake-simd",
+ "opaque-debug 0.2.3",
+]
+
+[[package]]
+name = "sha2"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa"
+dependencies = [
+ "block-buffer 0.9.0",
+ "cfg-if",
+ "cpufeatures",
+ "digest 0.9.0",
+ "opaque-debug 0.3.0",
+]
+
+[[package]]
+name = "signature"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c19772be3c4dd2ceaacf03cb41d5885f2a02c4d8804884918e3a258480803335"
+dependencies = [
+ "digest 0.9.0",
+ "rand_core 0.6.3",
+]
+
+[[package]]
+name = "spki"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c01a0c15da1b0b0e1494112e7af814a678fec9bd157881b49beac661e9b6f32"
+dependencies = [
+ "der",
+]
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "subtle"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
+
+[[package]]
+name = "syn"
+version = "1.0.65"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3a1d708c221c5a612956ef9f75b37e454e88d1f7b899fbd3a18d4252012d663"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "602eca064b2d83369e2b2f34b09c70b605402801927c65c11071ac911d299b88"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bad553cc2c78e8de258400763a647e80e6d1b31ee237275d756f6836d204494c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "time"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99beeb0daeac2bd1e86ac2c21caddecb244b39a093594da1a661ec2060c7aedd"
+dependencies = [
+ "libc",
+ "time-macros",
+]
+
+[[package]]
+name = "time-macros"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25eb0ca3468fc0acc11828786797f6ef9aa1555e4a211a60d64cc8e4d1be47d6"
+
+[[package]]
+name = "tinyvec"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f83b2a3d4d9091d0abd7eba4dc2710b1718583bd4d8992e2190720ea38f391f7"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
+
+[[package]]
+name = "toml"
+version = "0.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "typenum"
+version = "1.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec"
+
+[[package]]
+name = "ucd-trie"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
+
+[[package]]
+name = "uint"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6470ab50f482bde894a037a57064480a246dbfdd5960bd65a44824693f08da5f"
+dependencies = [
+ "byteorder",
+ "crunchy",
+ "hex",
+ "static_assertions",
+]
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
+
+[[package]]
+name = "url"
+version = "2.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "matches",
+ "percent-encoding",
+]
+
+[[package]]
+name = "version_check"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
+
+[[package]]
+name = "wasi"
+version = "0.9.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+
+[[package]]
+name = "wasi"
+version = "0.10.2+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
+
+[[package]]
+name = "zeroize"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd"
@@ -0,0 +1,40 @@
+[package]
+name = "cosmos_contract"
+version = "0.1.0"
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[workspace] # adding a blank workspace to keep it out of the global workspace.
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[profile.release]
+opt-level = 3
+debug = false
+rpath = false
+lto = true
+debug-assertions = false
+codegen-units = 1
+panic = 'abort'
+incremental = false
+overflow-checks = true
+
+[features]
+# for more explicit tests, cargo test --features=backtraces
+backtraces = ["cosmwasm-std/backtraces"]
+
+[dev-dependencies]
+config = { path = "../../common/config"}
+
+[dependencies]
+erc20-bridge-contract = { path = "../../common/erc20-bridge-contract" }
+
+# this branch is identical to 0.14.1 with addition of updated k256 dependency required to help poor cargo choose correct version
+cosmwasm-std = { git = "https://github.com/jstuczyn/cosmwasm", branch="0.14.1-updatedk256", features = ["iterator"] }
+cosmwasm-storage = { git = "https://github.com/jstuczyn/cosmwasm", branch="0.14.1-updatedk256", features = ["iterator"] }
+
+schemars = "0.8"
+serde = { version = "1.0.103", default-features = false, features = ["derive"] }
+thiserror = "1.0.23"
@@ -0,0 +1,27 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use cosmwasm_std::{StdError, VerificationError};
+use thiserror::Error;
+
+/// Custom errors for contract failure conditions.
+///
+/// Add any other custom errors you like here.
+/// Look at https://docs.rs/thiserror/1.0.21/thiserror/ for details.
+#[derive(Error, Debug, PartialEq)]
+pub enum ContractError {
+    #[error("{0}")]
+    Std(#[from] StdError),
+
+    #[error("Invalid size for signature items")]
+    InvalidSignatureSize,
+
+    #[error("This payment has already been claimed by someone")]
+    PaymentAlreadyClaimed,
+
+    #[error("Error while verifying ed25519 signature - {0}")]
+    VerificationError(#[from] VerificationError),
+
+    #[error("The payment is not properly signed")]
+    BadSignature,
+}
@@ -0,0 +1,102 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+mod error;
+mod queries;
+mod storage;
+mod support;
+mod transactions;
+
+use cosmwasm_std::{
+    entry_point, to_binary, Deps, DepsMut, Env, MessageInfo, QueryResponse, Response,
+};
+
+use crate::error::ContractError;
+use erc20_bridge_contract::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
+
+/// 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(
+    _deps: DepsMut,
+    _env: Env,
+    _info: MessageInfo,
+    _msg: InstantiateMsg,
+) -> Result<Response, ContractError> {
+    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::LinkPayment { data } => transactions::link_payment(deps, env, info, data),
+    }
+}
+
+#[entry_point]
+pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> Result<QueryResponse, ContractError> {
+    let query_res = match msg {
+        QueryMsg::GetPayments { start_after, limit } => {
+            to_binary(&queries::query_payments_paged(deps, start_after, limit)?)
+        }
+    };
+
+    Ok(query_res?)
+}
+
+#[entry_point]
+pub fn migrate(_deps: DepsMut, _env: Env, _msg: MigrateMsg) -> Result<Response, ContractError> {
+    Ok(Default::default())
+}
+
+#[cfg(test)]
+pub mod tests {
+    use super::*;
+    use config::defaults::DENOM;
+    use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info};
+    use cosmwasm_std::{coins, from_binary};
+    use erc20_bridge_contract::payment::PagedPaymentResponse;
+
+    #[test]
+    fn initialize_contract() {
+        let mut deps = mock_dependencies(&[]);
+        let env = mock_env();
+        let msg = InstantiateMsg {};
+        let info = mock_info("creator", &[]);
+
+        let res = instantiate(deps.as_mut(), env.clone(), info, msg).unwrap();
+        assert_eq!(0, res.messages.len());
+
+        // payments should be empty after initialization
+        let res = query(
+            deps.as_ref(),
+            env.clone(),
+            QueryMsg::GetPayments {
+                start_after: None,
+                limit: Option::from(2),
+            },
+        )
+        .unwrap();
+        let page: PagedPaymentResponse = from_binary(&res).unwrap();
+        assert_eq!(0, page.payments.len()); // there are no payments in the list when it's just been initialized
+
+        // Contract balance should match what we initialized it as
+        assert_eq!(
+            coins(0, DENOM),
+            vec![deps
+                .as_ref()
+                .querier
+                .query_balance(env.contract.address, DENOM)
+                .unwrap()]
+        );
+    }
+}
@@ -0,0 +1,191 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use cosmwasm_std::{Deps, Order, StdResult};
+
+use crate::storage::payments_read;
+use erc20_bridge_contract::keys::PublicKey;
+use erc20_bridge_contract::payment::{PagedPaymentResponse, Payment};
+
+const PAYMENT_PAGE_MAX_LIMIT: u32 = 100;
+const PAYMENT_PAGE_DEFAULT_LIMIT: u32 = 50;
+
+/// Adds a 0 byte to terminate the `start_after` value given. This allows CosmWasm
+/// to get the succeeding key as the start of the next page.
+fn calculate_start_value<B: AsRef<[u8]>>(start_after: Option<B>) -> Option<Vec<u8>> {
+    start_after.as_ref().map(|identity| {
+        identity
+            .as_ref()
+            .iter()
+            .cloned()
+            .chain(std::iter::once(0))
+            .collect()
+    })
+}
+
+pub fn query_payments_paged(
+    deps: Deps,
+    start_after: Option<PublicKey>,
+    limit: Option<u32>,
+) -> StdResult<PagedPaymentResponse> {
+    let limit = limit
+        .unwrap_or(PAYMENT_PAGE_DEFAULT_LIMIT)
+        .min(PAYMENT_PAGE_MAX_LIMIT) as usize;
+    let start = calculate_start_value(start_after);
+
+    let payments = payments_read(deps.storage)
+        .range(start.as_deref(), None, Order::Ascending)
+        .take(limit)
+        .map(|res| res.map(|item| item.1))
+        .collect::<StdResult<Vec<Payment>>>()?;
+
+    let start_next_after = payments.last().map(|payment| payment.verification_key());
+
+    Ok(PagedPaymentResponse::new(payments, limit, start_next_after))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::storage::payments;
+    use crate::support::tests::helpers;
+    use std::convert::TryInto;
+
+    #[test]
+    fn payments_empty_on_init() {
+        let deps = helpers::init_contract();
+        let response = query_payments_paged(deps.as_ref(), None, Option::from(2)).unwrap();
+        assert_eq!(0, response.payments.len());
+    }
+
+    #[test]
+    fn payments_paged_retrieval_obeys_limits() {
+        let mut deps = helpers::init_contract();
+        let storage = deps.as_mut().storage;
+        let limit = 2;
+        for n in 0u32..10000 {
+            let bytes: Vec<u8> = std::iter::repeat(n.to_be_bytes())
+                .take(8)
+                .flatten()
+                .collect();
+            let verification_key = PublicKey::new(bytes.try_into().unwrap());
+            let payment = helpers::payment_fixture();
+            payments(storage)
+                .save(&verification_key.to_bytes(), &payment)
+                .unwrap();
+        }
+
+        let page1 = query_payments_paged(deps.as_ref(), None, Option::from(limit)).unwrap();
+        assert_eq!(limit, page1.payments.len() as u32);
+    }
+
+    #[test]
+    fn payments_paged_retrieval_has_default_limit() {
+        let mut deps = helpers::init_contract();
+        let storage = deps.as_mut().storage;
+        for n in 0u32..100 {
+            let bytes: Vec<u8> = std::iter::repeat(n.to_be_bytes())
+                .take(8)
+                .flatten()
+                .collect();
+            let verification_key = PublicKey::new(bytes.try_into().unwrap());
+            let payment = helpers::payment_fixture();
+            payments(storage)
+                .save(&verification_key.to_bytes(), &payment)
+                .unwrap();
+        }
+
+        // query without explicitly setting a limit
+        let page1 = query_payments_paged(deps.as_ref(), None, None).unwrap();
+
+        assert_eq!(PAYMENT_PAGE_DEFAULT_LIMIT, page1.payments.len() as u32);
+    }
+
+    #[test]
+    fn payments_paged_retrieval_has_max_limit() {
+        let mut deps = helpers::init_contract();
+        let storage = deps.as_mut().storage;
+        for n in 0u32..10000 {
+            let bytes: Vec<u8> = std::iter::repeat(n.to_be_bytes())
+                .take(8)
+                .flatten()
+                .collect();
+            let verification_key = PublicKey::new(bytes.try_into().unwrap());
+            let payment = helpers::payment_fixture();
+            payments(storage)
+                .save(&verification_key.to_bytes(), &payment)
+                .unwrap();
+        }
+
+        // query with a crazily high limit in an attempt to use too many resources
+        let crazy_limit = 1000;
+        let page1 = query_payments_paged(deps.as_ref(), None, Option::from(crazy_limit)).unwrap();
+
+        // we default to a decent sized upper bound instead
+        assert_eq!(PAYMENT_PAGE_MAX_LIMIT, page1.payments.len() as u32);
+    }
+
+    #[test]
+    fn payments_pagination_works() {
+        let key1 = PublicKey::new([1; 32]);
+        let key2 = PublicKey::new([2; 32]);
+        let key3 = PublicKey::new([3; 32]);
+        let key4 = PublicKey::new([4; 32]);
+
+        let mut deps = helpers::init_contract();
+        let payment = helpers::payment_fixture();
+        payments(&mut deps.storage)
+            .save(&key1.to_bytes(), &payment)
+            .unwrap();
+
+        let per_page = 2;
+        let page1 = query_payments_paged(deps.as_ref(), None, Option::from(per_page)).unwrap();
+
+        // page should have 1 result on it
+        assert_eq!(1, page1.payments.len());
+
+        // save another
+        payments(&mut deps.storage)
+            .save(&key2.to_bytes(), &payment)
+            .unwrap();
+
+        // page1 should have 2 results on it
+        let page1 = query_payments_paged(deps.as_ref(), None, Option::from(per_page)).unwrap();
+        assert_eq!(2, page1.payments.len());
+
+        payments(&mut deps.storage)
+            .save(&key3.to_bytes(), &payment)
+            .unwrap();
+
+        // page1 still has 2 results
+        let page1 = query_payments_paged(deps.as_ref(), None, Option::from(per_page)).unwrap();
+        assert_eq!(2, page1.payments.len());
+
+        // retrieving the next page should start after the last key on this page
+        let start_after = key2;
+        let page2 = query_payments_paged(
+            deps.as_ref(),
+            Option::from(start_after),
+            Option::from(per_page),
+        )
+        .unwrap();
+
+        assert_eq!(1, page2.payments.len());
+
+        // save another one
+        payments(&mut deps.storage)
+            .save(&key4.to_bytes(), &payment)
+            .unwrap();
+
+        let start_after = key2;
+        let page2 = query_payments_paged(
+            deps.as_ref(),
+            Option::from(start_after),
+            Option::from(per_page),
+        )
+        .unwrap();
+
+        // now we have 2 pages, with 2 results on the second page
+        assert_eq!(2, page2.payments.len());
+    }
+}
@@ -0,0 +1,79 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use cosmwasm_std::Storage;
+use cosmwasm_storage::{bucket, bucket_read, Bucket, ReadonlyBucket};
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+
+use erc20_bridge_contract::payment::Payment;
+
+// buckets
+const PREFIX_PAYMENTS: &[u8] = b"payments";
+const PREFIX_STATUS: &[u8] = b"status";
+
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
+pub enum Status {
+    Unchecked,
+    Checked,
+    Spent,
+}
+
+pub fn payments(storage: &mut dyn Storage) -> Bucket<Payment> {
+    bucket(storage, PREFIX_PAYMENTS)
+}
+
+pub fn payments_read(storage: &dyn Storage) -> ReadonlyBucket<Payment> {
+    bucket_read(storage, PREFIX_PAYMENTS)
+}
+
+pub fn status(storage: &mut dyn Storage) -> Bucket<Status> {
+    bucket(storage, PREFIX_STATUS)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::support::tests::helpers;
+    use cosmwasm_std::testing::MockStorage;
+    use erc20_bridge_contract::keys::PublicKey;
+
+    #[test]
+    fn payments_single_read_retrieval() {
+        let mut storage = MockStorage::new();
+        let key1 = PublicKey::new([1; 32]);
+        let key2 = PublicKey::new([2; 32]);
+        let payment1 = helpers::payment_fixture();
+        let payment2 = helpers::payment_fixture();
+        payments(&mut storage)
+            .save(key1.as_ref(), &payment1)
+            .unwrap();
+        payments(&mut storage)
+            .save(key2.as_ref(), &payment2)
+            .unwrap();
+
+        let res1 = payments_read(&storage).load(key1.as_ref()).unwrap();
+        let res2 = payments_read(&storage).load(key2.as_ref()).unwrap();
+        assert_eq!(payment1, res1);
+        assert_eq!(payment2, res2);
+    }
+
+    #[test]
+    fn status_single_read_retrieval() {
+        let mut storage = MockStorage::new();
+        let key1 = PublicKey::new([1; 32]);
+        let key2 = PublicKey::new([2; 32]);
+        let status_value = Status::Unchecked;
+        status(&mut storage)
+            .save(key1.as_ref(), &status_value)
+            .unwrap();
+        status(&mut storage)
+            .save(key2.as_ref(), &status_value)
+            .unwrap();
+
+        let res1 = status(&mut storage).load(key1.as_ref()).unwrap();
+        assert_eq!(status_value, res1);
+        let res2 = status(&mut storage).load(key2.as_ref()).unwrap();
+        assert_eq!(status_value, res2);
+    }
+}
@@ -0,0 +1,3 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+pub mod tests;
@@ -0,0 +1,28 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+#[cfg(test)]
+pub mod helpers {
+    use crate::instantiate;
+    use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info, MockApi, MockQuerier};
+    use cosmwasm_std::{Empty, MemoryStorage, OwnedDeps};
+    use erc20_bridge_contract::keys::PublicKey;
+    use erc20_bridge_contract::msg::InstantiateMsg;
+    use erc20_bridge_contract::payment::Payment;
+
+    pub fn init_contract() -> OwnedDeps<MemoryStorage, MockApi, MockQuerier<Empty>> {
+        let mut deps = mock_dependencies(&[]);
+        let msg = InstantiateMsg {};
+        let env = mock_env();
+        let info = mock_info("creator", &[]);
+        instantiate(deps.as_mut(), env.clone(), info, msg).unwrap();
+        return deps;
+    }
+
+    pub fn payment_fixture() -> Payment {
+        let public_key = PublicKey::new([1; 32]);
+        let gateway_identity = PublicKey::new([2; 32]);
+        let bandwidth = 42;
+        Payment::new(public_key, gateway_identity, bandwidth)
+    }
+}
@@ -0,0 +1,146 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use cosmwasm_std::{DepsMut, Env, MessageInfo, Response};
+
+use crate::error::ContractError;
+use crate::storage::{payments, status, Status};
+use erc20_bridge_contract::payment::{LinkPaymentData, Payment};
+
+pub(crate) fn link_payment(
+    deps: DepsMut,
+    _env: Env,
+    _info: MessageInfo,
+    data: LinkPaymentData,
+) -> Result<Response, ContractError> {
+    let mut status_bucket = status(deps.storage);
+
+    let verification_key = data.verification_key.to_bytes();
+    let gateway_identity = data.gateway_identity.to_bytes();
+    let message: Vec<u8> = verification_key
+        .iter()
+        .chain(gateway_identity.iter())
+        .copied()
+        .collect();
+    let signature = data.signature.to_bytes();
+
+    if let Ok(Some(_)) = status_bucket.may_load(&verification_key) {
+        return Err(ContractError::PaymentAlreadyClaimed);
+    }
+
+    if !deps
+        .api
+        .ed25519_verify(&message, &signature, &verification_key)?
+    {
+        return Err(ContractError::BadSignature);
+    }
+
+    status_bucket.save(&verification_key, &Status::Unchecked)?;
+    payments(deps.storage).save(
+        &verification_key,
+        &Payment::new(data.verification_key, data.gateway_identity, data.bandwidth),
+    )?;
+
+    Ok(Response::default())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::storage::payments_read;
+    use crate::support::tests::helpers;
+    use cosmwasm_std::testing::{mock_env, mock_info};
+    use erc20_bridge_contract::keys::PublicKey;
+
+    #[test]
+    fn bad_signature_payment() {
+        let mut deps = helpers::init_contract();
+        let env = mock_env();
+        let info = mock_info("owner", &[]);
+
+        let payment_data = LinkPaymentData::new([1; 32], [2; 32], 42, [3; 64]);
+
+        assert_eq!(
+            link_payment(deps.as_mut(), env, info, payment_data),
+            Err(ContractError::BadSignature)
+        );
+    }
+
+    #[test]
+    fn good_payment() {
+        let mut deps = helpers::init_contract();
+        let env = mock_env();
+        let info = mock_info("owner", &[]);
+
+        let verification_key = [
+            78, 142, 213, 13, 39, 169, 76, 205, 242, 206, 129, 208, 190, 51, 139, 206, 245, 199,
+            120, 151, 181, 250, 192, 153, 123, 104, 129, 139, 60, 254, 243, 98,
+        ];
+        let gateway_identity = [
+            106, 76, 76, 238, 214, 177, 233, 112, 56, 33, 21, 201, 89, 42, 69, 196, 175, 56, 6,
+            110, 184, 167, 203, 63, 1, 167, 134, 102, 165, 215, 3, 212,
+        ];
+        let bandwidth = 42;
+        let signature = [
+            200, 134, 156, 198, 113, 180, 129, 90, 70, 28, 176, 201, 35, 208, 145, 28, 15, 16, 9,
+            110, 148, 188, 193, 75, 157, 201, 206, 211, 128, 215, 66, 207, 175, 155, 48, 24, 171,
+            254, 9, 37, 108, 205, 143, 37, 77, 189, 162, 52, 44, 130, 173, 60, 220, 22, 193, 3,
+            111, 90, 123, 147, 206, 8, 137, 1,
+        ];
+
+        let payment_data =
+            LinkPaymentData::new(verification_key, gateway_identity, bandwidth, signature);
+
+        assert!(link_payment(deps.as_mut(), env, info, payment_data).is_ok());
+
+        assert_eq!(
+            payments_read(&deps.storage)
+                .load(&verification_key)
+                .unwrap(),
+            Payment::new(
+                PublicKey::new(verification_key),
+                PublicKey::new(gateway_identity),
+                bandwidth
+            )
+        );
+        assert_eq!(
+            status(&mut deps.storage).load(&verification_key).unwrap(),
+            Status::Unchecked
+        )
+    }
+
+    #[test]
+    fn double_spend_protection() {
+        let mut deps = helpers::init_contract();
+        let env = mock_env();
+        let info = mock_info("owner", &[]);
+
+        let verification_key = [
+            78, 142, 213, 13, 39, 169, 76, 205, 242, 206, 129, 208, 190, 51, 139, 206, 245, 199,
+            120, 151, 181, 250, 192, 153, 123, 104, 129, 139, 60, 254, 243, 98,
+        ];
+        let gateway_identity = [
+            106, 76, 76, 238, 214, 177, 233, 112, 56, 33, 21, 201, 89, 42, 69, 196, 175, 56, 6,
+            110, 184, 167, 203, 63, 1, 167, 134, 102, 165, 215, 3, 212,
+        ];
+        let bandwidth = 42;
+        let signature = [
+            200, 134, 156, 198, 113, 180, 129, 90, 70, 28, 176, 201, 35, 208, 145, 28, 15, 16, 9,
+            110, 148, 188, 193, 75, 157, 201, 206, 211, 128, 215, 66, 207, 175, 155, 48, 24, 171,
+            254, 9, 37, 108, 205, 143, 37, 77, 189, 162, 52, 44, 130, 173, 60, 220, 22, 193, 3,
+            111, 90, 123, 147, 206, 8, 137, 1,
+        ];
+
+        let payment_data =
+            LinkPaymentData::new(verification_key, gateway_identity, bandwidth, signature);
+
+        link_payment(deps.as_mut(), env.clone(), info.clone(), payment_data).unwrap();
+
+        // Only the verification key is used for double spending protection, the other data is irrelevant
+        let second_payment_data = LinkPaymentData::new(verification_key, [1; 32], 10, [2; 64]);
+        assert_eq!(
+            link_payment(deps.as_mut(), env, info, second_payment_data),
+            Err(ContractError::PaymentAlreadyClaimed)
+        )
+    }
+}
@@ -0,0 +1 @@
+.envrc
@@ -49,3 +49,4 @@ thiserror = { version = "1.0.23" }

 [dev-dependencies]
 cosmwasm-schema = { version = "0.14.0" }
+fixed = "1.1"
@@ -1,54 +1,46 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::helpers::calculate_epoch_reward_rate;
+use std::u128;
+
 use crate::state::State;
 use crate::storage::{config, layer_distribution};
 use crate::{error::ContractError, queries, transactions};
-use config::defaults::NETWORK_MONITOR_ADDRESS;
+use config::defaults::REWARDING_VALIDATOR_ADDRESS;
 use cosmwasm_std::{
-    entry_point, to_binary, Addr, Decimal, Deps, DepsMut, Env, MessageInfo, QueryResponse,
-    Response, Uint128,
+    entry_point, to_binary, Addr, Deps, DepsMut, Env, MessageInfo, QueryResponse, Response, Uint128,
 };
 use mixnet_contract::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg, StateParams};

-pub const INITIAL_DEFAULT_EPOCH_LENGTH: u32 = 2;
-
 /// Constant specifying minimum of coin required to bond a gateway
 pub const INITIAL_GATEWAY_BOND: Uint128 = Uint128(100_000000);

 /// Constant specifying minimum of coin required to bond a mixnode
 pub const INITIAL_MIXNODE_BOND: Uint128 = Uint128(100_000000);

-// percentage annual increase. Given starting value of x, we expect to have 1.1x at the end of the year
-pub const INITIAL_MIXNODE_BOND_REWARD_RATE: u64 = 110;
-pub const INITIAL_MIXNODE_DELEGATION_REWARD_RATE: u64 = 110;
-
+pub const INITIAL_MIXNODE_REWARDED_SET_SIZE: u32 = 200;
 pub const INITIAL_MIXNODE_ACTIVE_SET_SIZE: u32 = 100;

-fn default_initial_state(owner: Addr) -> State {
-    let mixnode_bond_reward_rate = Decimal::percent(INITIAL_MIXNODE_BOND_REWARD_RATE);
-    let mixnode_delegation_reward_rate = Decimal::percent(INITIAL_MIXNODE_DELEGATION_REWARD_RATE);
+pub const INITIAL_REWARD_POOL: u128 = 250_000_000_000_000;
+pub const EPOCH_REWARD_PERCENT: u8 = 2; // Used to calculate epoch reward pool
+pub const DEFAULT_SYBIL_RESISTANCE_PERCENT: u8 = 30;

+// We'll be assuming a few more things, profit margin and cost function. Since we don't have reliable package measurement, we'll be using uptime. We'll also set the value of 1 Nym to 1 $, to be able to translate epoch costs to Nyms. We'll also assume a cost of 40$ per epoch(month), converting that to Nym at our 1$ rate translates to 40_000_000 uNyms
+pub const DEFAULT_COST_PER_EPOCH: u32 = 40_000_000;
+
+fn default_initial_state(owner: Addr, env: Env) -> State {
    State {
        owner,
-        network_monitor_address: Addr::unchecked(NETWORK_MONITOR_ADDRESS), // we trust our hardcoded value
+        rewarding_validator_address: Addr::unchecked(REWARDING_VALIDATOR_ADDRESS), // we trust our hardcoded value
        params: StateParams {
-            epoch_length: INITIAL_DEFAULT_EPOCH_LENGTH,
            minimum_mixnode_bond: INITIAL_MIXNODE_BOND,
            minimum_gateway_bond: INITIAL_GATEWAY_BOND,
-            mixnode_bond_reward_rate,
-            mixnode_delegation_reward_rate,
+            mixnode_rewarded_set_size: INITIAL_MIXNODE_REWARDED_SET_SIZE,
            mixnode_active_set_size: INITIAL_MIXNODE_ACTIVE_SET_SIZE,
        },
-        mixnode_epoch_bond_reward: calculate_epoch_reward_rate(
-            INITIAL_DEFAULT_EPOCH_LENGTH,
-            mixnode_bond_reward_rate,
-        ),
-        mixnode_epoch_delegation_reward: calculate_epoch_reward_rate(
-            INITIAL_DEFAULT_EPOCH_LENGTH,
-            mixnode_delegation_reward_rate,
-        ),
+        rewarding_interval_starting_block: env.block.height,
+        latest_rewarding_interval_nonce: 0,
+        rewarding_in_progress: false,
    }
 }

@@ -60,11 +52,11 @@ fn default_initial_state(owner: Addr) -> State {
 #[entry_point]
 pub fn instantiate(
    deps: DepsMut,
-    _env: Env,
+    env: Env,
    info: MessageInfo,
    _msg: InstantiateMsg,
 ) -> Result<Response, ContractError> {
-    let state = default_initial_state(info.sender);
+    let state = default_initial_state(info.sender, env);

    config(deps.storage).save(&state)?;
    layer_distribution(deps.storage).save(&Default::default())?;
@@ -91,15 +83,39 @@ pub fn execute(
        ExecuteMsg::UpdateStateParams(params) => {
            transactions::try_update_state_params(deps, info, params)
        }
-        ExecuteMsg::RewardMixnode { identity, uptime } => {
-            transactions::try_reward_mixnode(deps, env, info, identity, uptime)
-        }
+        ExecuteMsg::RewardMixnodeV2 {
+            identity,
+            params,
+            rewarding_interval_nonce,
+        } => transactions::try_reward_mixnode_v2(
+            deps,
+            env,
+            info,
+            identity,
+            params,
+            rewarding_interval_nonce,
+        ),
        ExecuteMsg::DelegateToMixnode { mix_identity } => {
            transactions::try_delegate_to_mixnode(deps, env, info, mix_identity)
        }
        ExecuteMsg::UndelegateFromMixnode { mix_identity } => {
            transactions::try_remove_delegation_from_mixnode(deps, info, mix_identity)
        }
+        ExecuteMsg::BeginMixnodeRewarding {
+            rewarding_interval_nonce,
+        } => transactions::try_begin_mixnode_rewarding(deps, env, info, rewarding_interval_nonce),
+        ExecuteMsg::FinishMixnodeRewarding {
+            rewarding_interval_nonce,
+        } => transactions::try_finish_mixnode_rewarding(deps, info, rewarding_interval_nonce),
+        ExecuteMsg::RewardNextMixDelegators {
+            mix_identity,
+            rewarding_interval_nonce,
+        } => transactions::try_reward_next_mixnode_delegators_v2(
+            deps,
+            info,
+            mix_identity,
+            rewarding_interval_nonce,
+        ),
    }
 }

@@ -119,6 +135,9 @@ pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> Result<QueryResponse, Cont
            to_binary(&queries::query_owns_gateway(deps, address)?)
        }
        QueryMsg::StateParams {} => to_binary(&queries::query_state_params(deps)),
+        QueryMsg::CurrentRewardingInterval {} => {
+            to_binary(&queries::query_rewarding_interval(deps))
+        }
        QueryMsg::LayerDistribution {} => to_binary(&queries::query_layer_distribution(deps)),
        QueryMsg::GetMixDelegations {
            mix_identity,
@@ -151,11 +170,22 @@ pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> Result<QueryResponse, Cont
            mix_identity,
            address,
        )?),
+        QueryMsg::GetRewardPool {} => to_binary(&queries::query_reward_pool(deps)),
+        QueryMsg::GetCirculatingSupply {} => to_binary(&queries::query_circulating_supply(deps)),
+        QueryMsg::GetEpochRewardPercent {} => to_binary(&EPOCH_REWARD_PERCENT),
+        QueryMsg::GetSybilResistancePercent {} => to_binary(&DEFAULT_SYBIL_RESISTANCE_PERCENT),
+        QueryMsg::GetRewardingStatus {
+            mix_identity,
+            rewarding_interval_nonce,
+        } => to_binary(&queries::query_rewarding_status(
+            deps,
+            mix_identity,
+            rewarding_interval_nonce,
+        )?),
    };

    Ok(query_res?)
 }
-
 #[entry_point]
 pub fn migrate(_deps: DepsMut, _env: Env, _msg: MigrateMsg) -> Result<Response, ContractError> {
    Ok(Default::default())
@@ -45,11 +45,14 @@ pub enum ContractError {
    #[error("No coin was sent for the bonding, you must send {}", DENOM)]
    NoBondFound,

-    #[error("The bond reward rate for mixnode was set to be lower than 1")]
-    DecreasingMixnodeBondReward,
+    #[error("Provided active set size is bigger than the demanded set")]
+    InvalidActiveSetSize,

-    #[error("The delegation reward rate for mixnode was set to be lower than 1")]
-    DecreasingMixnodeDelegationReward,
+    #[error("Provided active set size is zero")]
+    ZeroActiveSet,
+
+    #[error("Provided rewarded set size is zero")]
+    ZeroRewardedSet,

    #[error("The node had uptime larger than 100%")]
    UnexpectedUptime,
@@ -77,4 +80,25 @@ pub enum ContractError {
        identity: IdentityKey,
        address: Addr,
    },
+
+    #[error("We tried to remove more funds then are available in the Reward pool. Wanted to remove {to_remove}, but have only {reward_pool}")]
+    OutOfFunds { to_remove: u128, reward_pool: u128 },
+
+    #[error("Received invalid rewarding interval nonce. Expected {expected}, received {received}")]
+    InvalidRewardingIntervalNonce { received: u32, expected: u32 },
+
+    #[error("Rewarding distribution is currently in progress")]
+    RewardingInProgress,
+
+    #[error("Rewarding distribution is currently not in progress")]
+    RewardingNotInProgress,
+
+    #[error("Mixnode {identity} has already been rewarded during the current rewarding interval")]
+    MixnodeAlreadyRewarded { identity: IdentityKey },
+
+    #[error("Some of mixnodes {identity} delegators are still pending reward")]
+    DelegatorsPendingReward { identity: IdentityKey },
+
+    #[error("Mixnode's {identity} operator has not been rewarded yet - cannot perform delegator rewarding until that happens")]
+    MixnodeOperatorNotRewarded { identity: IdentityKey },
 }
@@ -1,78 +1,16 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::error::ContractError;
 use crate::transactions::OLD_DELEGATIONS_CHUNK_SIZE;
-use cosmwasm_std::{Decimal, Order, StdError, StdResult, Uint128};
+use cosmwasm_std::{Order, StdError, StdResult};
 use cosmwasm_storage::ReadonlyBucket;
 use mixnet_contract::{Addr, IdentityKey, PagedAllDelegationsResponse, UnpackedDelegation};
 use serde::de::DeserializeOwned;
 use serde::Serialize;
-use std::ops::Sub;
-
-// for time being completely ignore concept of a leap year and assume each year is exactly 365 days
-// i.e. 8760 hours
-const HOURS_IN_YEAR: u128 = 8760;
-
-const DECIMAL_FRACTIONAL: Uint128 = Uint128(1_000_000_000_000_000_000u128);

 // cosmwasm bucket internal value
 const NAMESPACE_LENGTH: usize = 2;

-fn decimal_to_uint128(value: Decimal) -> Uint128 {
-    value * DECIMAL_FRACTIONAL
-}
-
-fn uint128_to_decimal(value: Uint128) -> Decimal {
-    Decimal::from_ratio(value, DECIMAL_FRACTIONAL)
-}
-
-pub(crate) fn calculate_epoch_reward_rate(
-    epoch_length: u32,
-    annual_reward_rate: Decimal,
-) -> Decimal {
-    // this is more of a sanity check as the contract does not allow setting annual reward rates
-    // to be lower than 1.
-    debug_assert!(annual_reward_rate >= Decimal::one());
-
-    // converts reward rate, like 1.25 into the expected gain, like 0.25
-    let annual_reward = annual_reward_rate.sub(Decimal::one());
-    // do a simple cross-multiplication:
-    // `annual_reward`  -    `HOURS_IN_YEAR`
-    //          x       -    `epoch_length`
-    //
-    // x = `annual_reward` * `epoch_length` / `HOURS_IN_YEAR`
-
-    // converts reward, like 0.25 into 250000000000000000
-    let annual_reward_uint128 = decimal_to_uint128(annual_reward);
-
-    // calculates `annual_reward_uint128` * `epoch_length` / `HOURS_IN_YEAR`
-    let epoch_reward_uint128 = annual_reward_uint128.multiply_ratio(epoch_length, HOURS_IN_YEAR);
-
-    // note: this returns a % reward, like 0.05 rather than reward rate (like 1.05)
-    uint128_to_decimal(epoch_reward_uint128)
-}
-
-pub(crate) fn scale_reward_by_uptime(
-    reward: Decimal,
-    uptime: u32,
-) -> Result<Decimal, ContractError> {
-    if uptime > 100 {
-        return Err(ContractError::UnexpectedUptime);
-    }
-    let uptime_ratio = Decimal::from_ratio(uptime, 100u128);
-    // if we do not convert into a more precise representation, we might end up with, for example,
-    // reward 0.05 and uptime of 50% which would produce 0.50 * 0.05 = 0 (because of u128 representation)
-    // and also the above would be impossible to compute as Mul<Decimal> for Decimal is not implemented
-    //
-    // but with the intermediate conversion, we would have
-    // 0.50 * 50_000_000_000_000_000 = 25_000_000_000_000_000
-    // which converted back would give us the proper 0.025
-    let uptime_ratio_u128 = decimal_to_uint128(uptime_ratio);
-    let scaled = reward * uptime_ratio_u128;
-    Ok(uint128_to_decimal(scaled))
-}
-
 // Extracts the node identity and owner of a delegation from the bytes used as
 // key in the delegation buckets.
 fn extract_identity_and_owner(bytes: Vec<u8>) -> StdResult<(Addr, IdentityKey)> {
@@ -161,6 +99,7 @@ pub struct Delegations<'a, T: Clone + Serialize + DeserializeOwned> {
    last_page: bool,
 }

+#[cfg(test)]
 impl<'a, T: Clone + Serialize + DeserializeOwned> Delegations<'a, T> {
    pub fn new(delegations_bucket: ReadonlyBucket<'a, T>) -> Self {
        Delegations {
@@ -213,7 +152,6 @@ mod tests {
    use crate::support::tests::helpers;
    use cosmwasm_std::testing::mock_dependencies;
    use mixnet_contract::RawDelegationData;
-    use std::str::FromStr;

    #[test]
    fn delegations_iterator() {
@@ -249,61 +187,6 @@ mod tests {
        assert!(delegations.next().is_none());
    }

-    #[test]
-    fn calculating_epoch_reward_rate() {
-        // 1.10
-        let annual_reward_rate = Decimal::from_ratio(110u128, 100u128);
-
-        // if the epoch is (for some reason) exactly one year,
-        // the reward rate should be unchanged
-        let per_epoch_rate = calculate_epoch_reward_rate(HOURS_IN_YEAR as u32, annual_reward_rate);
-        // 0.10
-        let expected = annual_reward_rate.sub(Decimal::one());
-        assert_eq!(expected, per_epoch_rate);
-
-        // 24 hours
-        let per_epoch_rate = calculate_epoch_reward_rate(24, annual_reward_rate);
-        // 0.1 / 365
-        let expected = Decimal::from_ratio(1u128, 3650u128);
-        assert_eq!(expected, per_epoch_rate);
-
-        let expected_per_epoch_rate_excel = Decimal::from_str("0.000273972602739726").unwrap();
-        assert_eq!(expected_per_epoch_rate_excel, per_epoch_rate);
-
-        // 1 hour
-        let per_epoch_rate = calculate_epoch_reward_rate(1, annual_reward_rate);
-        // 0.1 / 8760
-        let expected = Decimal::from_ratio(1u128, 87600u128);
-        assert_eq!(expected, per_epoch_rate);
-    }
-
-    #[test]
-    fn scaling_reward_by_uptime() {
-        // 0.05
-        let epoch_reward = Decimal::from_ratio(5u128, 100u128);
-
-        // scaling by 100 does nothing
-        let scaled = scale_reward_by_uptime(epoch_reward, 100).unwrap();
-        assert_eq!(epoch_reward, scaled);
-
-        // scaling by 0 makes the reward 0
-        let scaled = scale_reward_by_uptime(epoch_reward, 0).unwrap();
-        assert_eq!(Decimal::zero(), scaled);
-
-        // 50 halves it
-        let scaled = scale_reward_by_uptime(epoch_reward, 50).unwrap();
-        let expected = Decimal::from_ratio(25u128, 1000u128);
-        assert_eq!(expected, scaled);
-
-        // 10 takes 1/10th
-        let scaled = scale_reward_by_uptime(epoch_reward, 10).unwrap();
-        let expected = Decimal::from_ratio(5u128, 1000u128);
-        assert_eq!(expected, scaled);
-
-        // anything larger than 100 returns an error
-        assert!(scale_reward_by_uptime(epoch_reward, 101).is_err())
-    }
-
    #[test]
    fn identity_and_owner_deserialization() {
        assert!(extract_identity_and_owner(vec![]).is_err());
@@ -4,25 +4,26 @@
 use crate::error::ContractError;
 use crate::helpers::get_all_delegations_paged;
 use crate::storage::{
-    all_mix_delegations_read, gateways_owners_read, gateways_read, mix_delegations_read,
-    mixnodes_owners_read, mixnodes_read, read_layer_distribution, read_state_params,
-    reverse_mix_delegations_read,
+    all_mix_delegations_read, circulating_supply, config_read, gateways_owners_read, gateways_read,
+    mix_delegations_read, mixnodes_owners_read, mixnodes_read, read_layer_distribution,
+    read_state_params, reverse_mix_delegations_read, reward_pool_value, rewarded_mixnodes_read,
+    total_delegation_read,
 };
 use config::defaults::DENOM;
-use cosmwasm_std::{coin, Addr, Deps, Order, StdResult};
+use cosmwasm_std::{coin, Addr, Deps, Order, StdResult, Uint128};
 use mixnet_contract::{
    Delegation, GatewayBond, GatewayOwnershipResponse, IdentityKey, LayerDistribution, MixNodeBond,
-    MixOwnershipResponse, PagedAllDelegationsResponse, PagedGatewayResponse,
-    PagedMixDelegationsResponse, PagedMixnodeResponse, PagedReverseMixDelegationsResponse,
-    RawDelegationData, StateParams,
+    MixOwnershipResponse, MixnodeRewardingStatusResponse, PagedAllDelegationsResponse,
+    PagedGatewayResponse, PagedMixDelegationsResponse, PagedMixnodeResponse,
+    PagedReverseMixDelegationsResponse, RawDelegationData, RewardingIntervalResponse, StateParams,
 };

-const BOND_PAGE_MAX_LIMIT: u32 = 100;
+const BOND_PAGE_MAX_LIMIT: u32 = 75;
 const BOND_PAGE_DEFAULT_LIMIT: u32 = 50;

 // currently the maximum limit before running into memory issue is somewhere between 1150 and 1200
-pub(crate) const DELEGATION_PAGE_MAX_LIMIT: u32 = 750;
-pub(crate) const DELEGATION_PAGE_DEFAULT_LIMIT: u32 = 500;
+const DELEGATION_PAGE_MAX_LIMIT: u32 = 500;
+const DELEGATION_PAGE_DEFAULT_LIMIT: u32 = 250;

 pub fn query_mixnodes_paged(
    deps: Deps,
@@ -38,7 +39,16 @@ pub fn query_mixnodes_paged(
        .range(start.as_deref(), None, Order::Ascending)
        .take(limit)
        .map(|res| res.map(|item| item.1))
-        .collect::<StdResult<Vec<MixNodeBond>>>()?;
+        .map(|stored_bond| {
+            // I really don't like this additional read per entry, but I don't see an obvious way to remove it
+            stored_bond.map(|stored_bond| {
+                let total_delegation =
+                    total_delegation_read(deps.storage).load(stored_bond.identity().as_bytes());
+                total_delegation
+                    .map(|total_delegation| stored_bond.attach_delegation(total_delegation))
+            })
+        })
+        .collect::<StdResult<StdResult<Vec<MixNodeBond>>>>()??;

    let start_next_after = nodes.last().map(|node| node.identity().clone());

@@ -87,10 +97,27 @@ pub(crate) fn query_state_params(deps: Deps) -> StateParams {
    read_state_params(deps.storage)
 }

+pub(crate) fn query_rewarding_interval(deps: Deps) -> RewardingIntervalResponse {
+    let state = config_read(deps.storage).load().unwrap();
+    RewardingIntervalResponse {
+        current_rewarding_interval_starting_block: state.rewarding_interval_starting_block,
+        current_rewarding_interval_nonce: state.latest_rewarding_interval_nonce,
+        rewarding_in_progress: state.rewarding_in_progress,
+    }
+}
+
 pub(crate) fn query_layer_distribution(deps: Deps) -> LayerDistribution {
    read_layer_distribution(deps.storage)
 }

+pub(crate) fn query_reward_pool(deps: Deps) -> Uint128 {
+    reward_pool_value(deps.storage)
+}
+
+pub(crate) fn query_circulating_supply(deps: Deps) -> Uint128 {
+    circulating_supply(deps.storage)
+}
+
 /// Adds a 0 byte to terminate the `start_after` value given. This allows CosmWasm
 /// to get the succeeding key as the start of the next page.
 // S works for both `String` and `Addr` and that's what we wanted
@@ -209,11 +236,22 @@ pub(crate) fn query_mixnode_delegation(
    }
 }

+pub(crate) fn query_rewarding_status(
+    deps: Deps,
+    mix_identity: IdentityKey,
+    rewarding_interval_nonce: u32,
+) -> StdResult<MixnodeRewardingStatusResponse> {
+    let status = rewarded_mixnodes_read(deps.storage, rewarding_interval_nonce)
+        .may_load(mix_identity.as_bytes())?;
+
+    Ok(MixnodeRewardingStatusResponse { status })
+}
+
 #[cfg(test)]
 pub(crate) mod tests {
    use super::*;
    use crate::state::State;
-    use crate::storage::{config, gateways, mix_delegations, mixnodes};
+    use crate::storage::{config, gateways, mix_delegations};
    use crate::support::tests::helpers;
    use crate::support::tests::helpers::{
        good_gateway_bond, good_mixnode_bond, raw_delegation_fixture,
@@ -233,12 +271,10 @@ pub(crate) mod tests {
    #[test]
    fn mixnodes_paged_retrieval_obeys_limits() {
        let mut deps = helpers::init_contract();
-        let storage = deps.as_mut().storage;
        let limit = 2;
        for n in 0..10000 {
            let key = format!("bond{}", n);
-            let node = helpers::mixnode_bond_fixture();
-            mixnodes(storage).save(key.as_bytes(), &node).unwrap();
+            helpers::add_mixnode(&key, good_mixnode_bond(), deps.as_mut());
        }

        let page1 = query_mixnodes_paged(deps.as_ref(), None, Option::from(limit)).unwrap();
@@ -248,11 +284,9 @@ pub(crate) mod tests {
    #[test]
    fn mixnodes_paged_retrieval_has_default_limit() {
        let mut deps = helpers::init_contract();
-        let storage = deps.as_mut().storage;
        for n in 0..100 {
            let key = format!("bond{}", n);
-            let node = helpers::mixnode_bond_fixture();
-            mixnodes(storage).save(key.as_bytes(), &node).unwrap();
+            helpers::add_mixnode(&key, good_mixnode_bond(), deps.as_mut());
        }

        // query without explicitly setting a limit
@@ -265,11 +299,9 @@ pub(crate) mod tests {
    #[test]
    fn mixnodes_paged_retrieval_has_max_limit() {
        let mut deps = helpers::init_contract();
-        let storage = deps.as_mut().storage;
        for n in 0..10000 {
            let key = format!("bond{}", n);
-            let node = helpers::mixnode_bond_fixture();
-            mixnodes(storage).save(key.as_bytes(), &node).unwrap();
+            helpers::add_mixnode(&key, good_mixnode_bond(), deps.as_mut());
        }

        // query with a crazily high limit in an attempt to use too many resources
@@ -277,7 +309,7 @@ pub(crate) mod tests {
        let page1 = query_mixnodes_paged(deps.as_ref(), None, Option::from(crazy_limit)).unwrap();

        // we default to a decent sized upper bound instead
-        let expected_limit = 100;
+        let expected_limit = BOND_PAGE_MAX_LIMIT;
        assert_eq!(expected_limit, page1.nodes.len() as u32);
    }

@@ -289,10 +321,7 @@ pub(crate) mod tests {
        let addr4 = "hal103";

        let mut deps = helpers::init_contract();
-        let node = helpers::mixnode_bond_fixture();
-        mixnodes(&mut deps.storage)
-            .save(addr1.as_bytes(), &node)
-            .unwrap();
+        let _identity1 = helpers::add_mixnode(&addr1, good_mixnode_bond(), deps.as_mut());

        let per_page = 2;
        let page1 = query_mixnodes_paged(deps.as_ref(), None, Option::from(per_page)).unwrap();
@@ -301,24 +330,20 @@ pub(crate) mod tests {
        assert_eq!(1, page1.nodes.len());

        // save another
-        mixnodes(&mut deps.storage)
-            .save(addr2.as_bytes(), &node)
-            .unwrap();
+        let identity2 = helpers::add_mixnode(&addr2, good_mixnode_bond(), deps.as_mut());

        // page1 should have 2 results on it
        let page1 = query_mixnodes_paged(deps.as_ref(), None, Option::from(per_page)).unwrap();
        assert_eq!(2, page1.nodes.len());

-        mixnodes(&mut deps.storage)
-            .save(addr3.as_bytes(), &node)
-            .unwrap();
+        let _identity3 = helpers::add_mixnode(&addr3, good_mixnode_bond(), deps.as_mut());

        // page1 still has 2 results
        let page1 = query_mixnodes_paged(deps.as_ref(), None, Option::from(per_page)).unwrap();
        assert_eq!(2, page1.nodes.len());

        // retrieving the next page should start after the last key on this page
-        let start_after = String::from(addr2);
+        let start_after = identity2.clone();
        let page2 = query_mixnodes_paged(
            deps.as_ref(),
            Option::from(start_after),
@@ -329,11 +354,9 @@ pub(crate) mod tests {
        assert_eq!(1, page2.nodes.len());

        // save another one
-        mixnodes(&mut deps.storage)
-            .save(addr4.as_bytes(), &node)
-            .unwrap();
+        helpers::add_mixnode(&addr4, good_mixnode_bond(), deps.as_mut());

-        let start_after = String::from(addr2);
+        let start_after = identity2;
        let page2 = query_mixnodes_paged(
            deps.as_ref(),
            Option::from(start_after),
@@ -562,17 +585,16 @@ pub(crate) mod tests {

        let dummy_state = State {
            owner: Addr::unchecked("someowner"),
-            network_monitor_address: Addr::unchecked("monitor"),
+            rewarding_validator_address: Addr::unchecked("monitor"),
            params: StateParams {
-                epoch_length: 1,
                minimum_mixnode_bond: 123u128.into(),
                minimum_gateway_bond: 456u128.into(),
-                mixnode_bond_reward_rate: "1.23".parse().unwrap(),
-                mixnode_delegation_reward_rate: "7.89".parse().unwrap(),
-                mixnode_active_set_size: 1000,
+                mixnode_rewarded_set_size: 1000,
+                mixnode_active_set_size: 500,
            },
-            mixnode_epoch_bond_reward: "1.23".parse().unwrap(),
-            mixnode_epoch_delegation_reward: "7.89".parse().unwrap(),
+            rewarding_interval_starting_block: 123,
+            latest_rewarding_interval_nonce: 0,
+            rewarding_in_progress: false,
        };

        config(deps.as_mut().storage).save(&dummy_state).unwrap();
@@ -1093,4 +1115,245 @@ pub(crate) mod tests {
            assert_eq!(2, page2.delegated_nodes.len());
        }
    }
+
+    #[cfg(test)]
+    mod querying_for_rewarding_status {
+        use super::*;
+        use crate::support::tests::helpers::{add_mixnode, node_rewarding_params_fixture};
+        use crate::transactions::{
+            try_add_mixnode, try_begin_mixnode_rewarding, try_delegate_to_mixnode,
+            try_finish_mixnode_rewarding, try_reward_mixnode_v2,
+            try_reward_next_mixnode_delegators_v2, MINIMUM_BLOCK_AGE_FOR_REWARDING,
+        };
+        use mixnet_contract::{RewardingResult, RewardingStatus, MIXNODE_DELEGATORS_PAGE_LIMIT};
+
+        #[test]
+        fn returns_empty_status_for_unrewarded_nodes() {
+            let mut deps = helpers::init_contract();
+            let env = mock_env();
+            let current_state = config_read(deps.as_mut().storage).load().unwrap();
+            let rewarding_validator_address = current_state.rewarding_validator_address;
+
+            let node_identity = add_mixnode("bob", good_mixnode_bond(), deps.as_mut());
+
+            assert!(
+                query_rewarding_status(deps.as_ref(), node_identity.clone(), 1)
+                    .unwrap()
+                    .status
+                    .is_none()
+            );
+
+            // node was rewarded but for different epoch
+            let info = mock_info(rewarding_validator_address.as_ref(), &[]);
+            try_begin_mixnode_rewarding(deps.as_mut(), env.clone(), info.clone(), 1).unwrap();
+            try_reward_mixnode_v2(
+                deps.as_mut(),
+                env.clone(),
+                info.clone(),
+                node_identity.clone(),
+                node_rewarding_params_fixture(100),
+                1,
+            )
+            .unwrap();
+            try_finish_mixnode_rewarding(deps.as_mut(), info.clone(), 1).unwrap();
+
+            assert!(query_rewarding_status(deps.as_ref(), node_identity, 2)
+                .unwrap()
+                .status
+                .is_none());
+        }
+
+        #[test]
+        fn returns_complete_status_for_fully_rewarded_node() {
+            // with single page
+            let mut deps = helpers::init_contract();
+            let mut env = mock_env();
+            let current_state = config_read(deps.as_mut().storage).load().unwrap();
+            let rewarding_validator_address = current_state.rewarding_validator_address;
+
+            let node_identity = "bobsnode".to_string();
+            try_add_mixnode(
+                deps.as_mut(),
+                env.clone(),
+                mock_info("bob", &good_mixnode_bond()),
+                MixNode {
+                    identity_key: node_identity.clone(),
+                    ..helpers::mix_node_fixture()
+                },
+            )
+            .unwrap();
+
+            env.block.height += MINIMUM_BLOCK_AGE_FOR_REWARDING;
+
+            let info = mock_info(rewarding_validator_address.as_ref(), &[]);
+            try_begin_mixnode_rewarding(deps.as_mut(), env.clone(), info.clone(), 1).unwrap();
+            try_reward_mixnode_v2(
+                deps.as_mut(),
+                env.clone(),
+                info.clone(),
+                node_identity.clone(),
+                node_rewarding_params_fixture(100),
+                1,
+            )
+            .unwrap();
+            try_finish_mixnode_rewarding(deps.as_mut(), info.clone(), 1).unwrap();
+
+            let res = query_rewarding_status(deps.as_ref(), node_identity, 1).unwrap();
+            assert!(matches!(res.status, Some(RewardingStatus::Complete(..))));
+
+            match res.status.unwrap() {
+                RewardingStatus::Complete(result) => {
+                    assert_ne!(
+                        RewardingResult::default().operator_reward,
+                        result.operator_reward
+                    );
+                    assert_eq!(
+                        RewardingResult::default().total_delegator_reward,
+                        result.total_delegator_reward
+                    );
+                }
+                _ => unreachable!(),
+            }
+
+            // with multiple pages
+
+            let node_identity = "alicesnode".to_string();
+            try_add_mixnode(
+                deps.as_mut(),
+                env.clone(),
+                mock_info("alice", &good_mixnode_bond()),
+                MixNode {
+                    identity_key: node_identity.clone(),
+                    ..helpers::mix_node_fixture()
+                },
+            )
+            .unwrap();
+
+            for i in 0..MIXNODE_DELEGATORS_PAGE_LIMIT + 123 {
+                try_delegate_to_mixnode(
+                    deps.as_mut(),
+                    env.clone(),
+                    mock_info(
+                        &*format!("delegator{:04}", i),
+                        &vec![coin(200_000000, DENOM)],
+                    ),
+                    node_identity.clone(),
+                )
+                .unwrap();
+            }
+
+            env.block.height += MINIMUM_BLOCK_AGE_FOR_REWARDING;
+
+            let info = mock_info(rewarding_validator_address.as_ref(), &[]);
+            try_begin_mixnode_rewarding(deps.as_mut(), env.clone(), info.clone(), 2).unwrap();
+
+            try_reward_mixnode_v2(
+                deps.as_mut(),
+                env.clone(),
+                info.clone(),
+                node_identity.clone(),
+                node_rewarding_params_fixture(100),
+                2,
+            )
+            .unwrap();
+
+            // rewards all pending
+            try_reward_next_mixnode_delegators_v2(
+                deps.as_mut(),
+                info.clone(),
+                node_identity.to_string(),
+                2,
+            )
+            .unwrap();
+
+            let res = query_rewarding_status(deps.as_ref(), node_identity, 2).unwrap();
+            assert!(matches!(res.status, Some(RewardingStatus::Complete(..))));
+
+            match res.status.unwrap() {
+                RewardingStatus::Complete(result) => {
+                    assert_ne!(
+                        RewardingResult::default().operator_reward,
+                        result.operator_reward
+                    );
+                    assert_ne!(
+                        RewardingResult::default().total_delegator_reward,
+                        result.total_delegator_reward
+                    );
+                }
+                _ => unreachable!(),
+            }
+        }
+
+        #[test]
+        fn returns_pending_next_delegator_page_status_when_there_are_more_delegators_to_reward() {
+            let mut deps = helpers::init_contract();
+            let mut env = mock_env();
+            let current_state = config_read(deps.as_mut().storage).load().unwrap();
+            let rewarding_validator_address = current_state.rewarding_validator_address;
+
+            let node_identity = "bobsnode".to_string();
+            try_add_mixnode(
+                deps.as_mut(),
+                env.clone(),
+                mock_info("bob", &good_mixnode_bond()),
+                MixNode {
+                    identity_key: node_identity.clone(),
+                    ..helpers::mix_node_fixture()
+                },
+            )
+            .unwrap();
+
+            for i in 0..MIXNODE_DELEGATORS_PAGE_LIMIT + 123 {
+                try_delegate_to_mixnode(
+                    deps.as_mut(),
+                    env.clone(),
+                    mock_info(
+                        &*format!("delegator{:04}", i),
+                        &vec![coin(200_000000, DENOM)],
+                    ),
+                    node_identity.clone(),
+                )
+                .unwrap();
+            }
+
+            env.block.height += MINIMUM_BLOCK_AGE_FOR_REWARDING;
+
+            let info = mock_info(rewarding_validator_address.as_ref(), &[]);
+            try_begin_mixnode_rewarding(deps.as_mut(), env.clone(), info.clone(), 1).unwrap();
+
+            try_reward_mixnode_v2(
+                deps.as_mut(),
+                env.clone(),
+                info,
+                node_identity.clone(),
+                node_rewarding_params_fixture(100),
+                1,
+            )
+            .unwrap();
+
+            let res = query_rewarding_status(deps.as_ref(), node_identity, 1).unwrap();
+            assert!(matches!(
+                res.status,
+                Some(RewardingStatus::PendingNextDelegatorPage(..))
+            ));
+
+            match res.status.unwrap() {
+                RewardingStatus::PendingNextDelegatorPage(result) => {
+                    assert_ne!(
+                        RewardingResult::default().operator_reward,
+                        result.running_results.operator_reward
+                    );
+                    assert_ne!(
+                        RewardingResult::default().total_delegator_reward,
+                        result.running_results.total_delegator_reward
+                    );
+                    assert_eq!(
+                        &*format!("delegator{:04}", MIXNODE_DELEGATORS_PAGE_LIMIT),
+                        result.next_start
+                    );
+                }
+                _ => unreachable!(),
+            }
+        }
+    }
 }
@@ -1,7 +1,7 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use cosmwasm_std::{Addr, Decimal};
+use cosmwasm_std::Addr;
 use mixnet_contract::StateParams;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -9,10 +9,13 @@ use serde::{Deserialize, Serialize};
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub struct State {
    pub owner: Addr, // only the owner account can update state
-    pub network_monitor_address: Addr,
+    pub rewarding_validator_address: Addr,
    pub params: StateParams,

-    // helper values to avoid having to recalculate them on every single payment operation
-    pub mixnode_epoch_bond_reward: Decimal, // reward per epoch expressed as a decimal like 0.05
-    pub mixnode_epoch_delegation_reward: Decimal, // reward per epoch expressed as a decimal like 0.05
+    // keep track of the changes to the current rewarding interval,
+    // i.e. at which block has the latest rewarding occurred
+    // and whether another run is already in progress
+    pub rewarding_interval_starting_block: u64,
+    pub latest_rewarding_interval_nonce: u32,
+    pub rewarding_in_progress: bool,
 }
@@ -1,20 +1,21 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
-
-use crate::queries;
+use crate::contract::INITIAL_REWARD_POOL;
+use crate::error::ContractError;
 use crate::state::State;
-use crate::transactions::MINIMUM_BLOCK_AGE_FOR_REWARDING;
-use cosmwasm_std::{Decimal, Order, StdResult, Storage, Uint128};
+use config::defaults::{DENOM, TOTAL_SUPPLY};
+use cosmwasm_std::{Coin, StdResult, Storage, Uint128};
 use cosmwasm_storage::{
    bucket, bucket_read, singleton, singleton_read, Bucket, ReadonlyBucket, ReadonlySingleton,
    Singleton,
 };
 use mixnet_contract::{
-    Addr, GatewayBond, IdentityKey, IdentityKeyRef, Layer, LayerDistribution, MixNodeBond,
-    RawDelegationData, StateParams,
+    Addr, GatewayBond, IdentityKey, IdentityKeyRef, Layer, LayerDistribution, MixNode, MixNodeBond,
+    RawDelegationData, RewardingStatus, StateParams,
 };
 use serde::de::DeserializeOwned;
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
+use std::fmt::{Display, Formatter};

 // storage prefixes
 // all of them must be unique and presumably not be a prefix of a different one
@@ -24,6 +25,7 @@ use serde::Serialize;
 // singletons
 const CONFIG_KEY: &[u8] = b"config";
 const LAYER_DISTRIBUTION_KEY: &[u8] = b"layers";
+const REWARD_POOL_PREFIX: &[u8] = b"pool";

 // buckets
 const PREFIX_MIXNODES: &[u8] = b"mn";
@@ -34,6 +36,73 @@ const PREFIX_GATEWAYS_OWNERS: &[u8] = b"go";
 const PREFIX_MIX_DELEGATION: &[u8] = b"md";
 const PREFIX_REVERSE_MIX_DELEGATION: &[u8] = b"dm";

+const PREFIX_REWARDED_MIXNODES: &[u8] = b"rm";
+
+const PREFIX_TOTAL_DELEGATION: &[u8] = b"td";
+
+#[derive(Serialize, Deserialize, Debug, PartialEq)]
+pub(crate) struct StoredMixnodeBond {
+    pub bond_amount: Coin,
+    pub owner: Addr,
+    pub layer: Layer,
+    pub block_height: u64,
+    pub mix_node: MixNode,
+    pub profit_margin_percent: Option<u8>,
+}
+
+impl StoredMixnodeBond {
+    pub(crate) fn new(
+        bond_amount: Coin,
+        owner: Addr,
+        layer: Layer,
+        block_height: u64,
+        mix_node: MixNode,
+        profit_margin_percent: Option<u8>,
+    ) -> Self {
+        StoredMixnodeBond {
+            bond_amount,
+            owner,
+            layer,
+            block_height,
+            mix_node,
+            profit_margin_percent,
+        }
+    }
+
+    pub(crate) fn attach_delegation(self, total_delegation: Uint128) -> MixNodeBond {
+        MixNodeBond {
+            total_delegation: Coin {
+                denom: self.bond_amount.denom.clone(),
+                amount: total_delegation,
+            },
+            bond_amount: self.bond_amount,
+            owner: self.owner,
+            layer: self.layer,
+            block_height: self.block_height,
+            mix_node: self.mix_node,
+            profit_margin_percent: self.profit_margin_percent,
+        }
+    }
+
+    pub(crate) fn identity(&self) -> &String {
+        &self.mix_node.identity_key
+    }
+
+    pub(crate) fn bond_amount(&self) -> Coin {
+        self.bond_amount.clone()
+    }
+}
+
+impl Display for StoredMixnodeBond {
+    fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
+        write!(
+            f,
+            "amount: {}, owner: {}, identity: {}",
+            self.bond_amount, self.owner, self.mix_node.identity_key
+        )
+    }
+}
+
 // Contract-level stuff

 // TODO Unify bucket and mixnode storage functions
@@ -46,6 +115,53 @@ pub fn config_read(storage: &dyn Storage) -> ReadonlySingleton<State> {
    singleton_read(storage, CONFIG_KEY)
 }

+fn reward_pool(storage: &dyn Storage) -> ReadonlySingleton<Uint128> {
+    singleton_read(storage, REWARD_POOL_PREFIX)
+}
+
+pub fn mut_reward_pool(storage: &mut dyn Storage) -> Singleton<Uint128> {
+    singleton(storage, REWARD_POOL_PREFIX)
+}
+
+pub fn reward_pool_value(storage: &dyn Storage) -> Uint128 {
+    match reward_pool(storage).load() {
+        Ok(value) => value,
+        Err(_e) => Uint128(INITIAL_REWARD_POOL),
+    }
+}
+
+#[allow(dead_code)]
+pub fn incr_reward_pool(
+    amount: Uint128,
+    storage: &mut dyn Storage,
+) -> Result<Uint128, ContractError> {
+    let stake = reward_pool_value(storage).saturating_add(amount);
+    mut_reward_pool(storage).save(&stake)?;
+    Ok(stake)
+}
+
+pub fn decr_reward_pool(
+    amount: Uint128,
+    storage: &mut dyn Storage,
+) -> Result<Uint128, ContractError> {
+    let stake = match reward_pool_value(storage).checked_sub(amount) {
+        Ok(stake) => stake,
+        Err(_e) => {
+            return Err(ContractError::OutOfFunds {
+                to_remove: amount.u128(),
+                reward_pool: reward_pool_value(storage).u128(),
+            })
+        }
+    };
+    mut_reward_pool(storage).save(&stake)?;
+    Ok(stake)
+}
+
+pub fn circulating_supply(storage: &dyn Storage) -> Uint128 {
+    let reward_pool = reward_pool_value(storage).u128();
+    Uint128(TOTAL_SUPPLY - reward_pool)
+}
+
 pub(crate) fn read_state_params(storage: &dyn Storage) -> StateParams {
    // note: In any other case, I wouldn't have attempted to unwrap this result, but in here
    // if we fail to load the stored state we would already be in the undefined behaviour land,
@@ -53,22 +169,6 @@ pub(crate) fn read_state_params(storage: &dyn Storage) -> StateParams {
    config_read(storage).load().unwrap().params
 }

-pub(crate) fn read_mixnode_epoch_bond_reward_rate(storage: &dyn Storage) -> Decimal {
-    // same justification as in `read_state_params` for the unwrap
-    config_read(storage)
-        .load()
-        .unwrap()
-        .mixnode_epoch_bond_reward
-}
-
-pub(crate) fn read_mixnode_epoch_delegation_reward_rate(storage: &dyn Storage) -> Decimal {
-    // same justification as in `read_state_params` for the unwrap
-    config_read(storage)
-        .load()
-        .unwrap()
-        .mixnode_epoch_delegation_reward
-}
-
 pub fn layer_distribution(storage: &mut dyn Storage) -> Singleton<LayerDistribution> {
    singleton(storage, LAYER_DISTRIBUTION_KEY)
 }
@@ -129,11 +229,11 @@ pub fn decrement_layer_count(storage: &mut dyn Storage, layer: Layer) -> StdResu

 // Mixnode-related stuff

-pub fn mixnodes(storage: &mut dyn Storage) -> Bucket<MixNodeBond> {
+pub(crate) fn mixnodes(storage: &mut dyn Storage) -> Bucket<StoredMixnodeBond> {
    bucket(storage, PREFIX_MIXNODES)
 }

-pub fn mixnodes_read(storage: &dyn Storage) -> ReadonlyBucket<MixNodeBond> {
+pub(crate) fn mixnodes_read(storage: &dyn Storage) -> ReadonlyBucket<StoredMixnodeBond> {
    bucket_read(storage, PREFIX_MIXNODES)
 }

@@ -146,59 +246,73 @@ pub fn mixnodes_owners_read(storage: &dyn Storage) -> ReadonlyBucket<IdentityKey
    bucket_read(storage, PREFIX_MIXNODES_OWNERS)
 }

-// helpers
-pub(crate) fn increase_mix_delegated_stakes(
+pub fn total_delegation(storage: &mut dyn Storage) -> Bucket<Uint128> {
+    bucket(storage, PREFIX_TOTAL_DELEGATION)
+}
+
+pub fn total_delegation_read(storage: &dyn Storage) -> ReadonlyBucket<Uint128> {
+    bucket_read(storage, PREFIX_TOTAL_DELEGATION)
+}
+
+// we want to treat this bucket as a set so we don't really care about what type of data is being stored.
+// I went with u8 as after serialization it takes only a single byte of space, while if a `()` was used,
+// it would have taken 4 bytes (representation of 'null')
+pub(crate) fn rewarded_mixnodes(
    storage: &mut dyn Storage,
+    rewarding_interval_nonce: u32,
+) -> Bucket<RewardingStatus> {
+    Bucket::multilevel(
+        storage,
+        &[
+            rewarding_interval_nonce.to_be_bytes().as_ref(),
+            PREFIX_REWARDED_MIXNODES,
+        ],
+    )
+}
+
+pub(crate) fn rewarded_mixnodes_read(
+    storage: &dyn Storage,
+    rewarding_interval_nonce: u32,
+) -> ReadonlyBucket<RewardingStatus> {
+    ReadonlyBucket::multilevel(
+        storage,
+        &[
+            rewarding_interval_nonce.to_be_bytes().as_ref(),
+            PREFIX_REWARDED_MIXNODES,
+        ],
+    )
+}
+
+// helpers
+pub(crate) fn read_mixnode_bond(
+    storage: &dyn Storage,
    mix_identity: IdentityKeyRef,
-    scaled_reward_rate: Decimal,
-    reward_blockstamp: u64,
-) -> StdResult<Uint128> {
-    let chunk_size = queries::DELEGATION_PAGE_MAX_LIMIT as usize;
-
-    let mut total_rewarded = Uint128::zero();
-    let mut chunk_start: Option<Vec<_>> = None;
-    loop {
-        // get `chunk_size` of delegations
-        let delegations_chunk = mix_delegations_read(storage, mix_identity)
-            .range(chunk_start.as_deref(), None, Order::Ascending)
-            .take(chunk_size)
-            .collect::<StdResult<Vec<_>>>()?;
-
-        if delegations_chunk.is_empty() {
-            break;
-        }
-
-        // append 0 byte to the last value to start with whatever is the next succeeding key
-        chunk_start = Some(
-            delegations_chunk
-                .last()
-                .unwrap()
-                .0
-                .iter()
-                .cloned()
-                .chain(std::iter::once(0u8))
-                .collect(),
-        );
-
-        // and for each of them increase the stake proportionally to the reward
-        // if at least `MINIMUM_BLOCK_AGE_FOR_REWARDING` blocks have been created
-        // since they delegated
-        for (delegator_address, mut delegation) in delegations_chunk.into_iter() {
-            if delegation.block_height + MINIMUM_BLOCK_AGE_FOR_REWARDING <= reward_blockstamp {
-                let reward = delegation.amount * scaled_reward_rate;
-                delegation.amount += reward;
-                total_rewarded += reward;
-                mix_delegations(storage, mix_identity).save(&delegator_address, &delegation)?;
-            }
+) -> StdResult<Option<MixNodeBond>> {
+    let stored_bond = mixnodes_read(storage).may_load(mix_identity.as_bytes())?;
+    match stored_bond {
+        None => Ok(None),
+        Some(stored_bond) => {
+            let total_delegation =
+                total_delegation_read(storage).may_load(mix_identity.as_bytes())?;
+            Ok(Some(MixNodeBond {
+                bond_amount: stored_bond.bond_amount,
+                total_delegation: Coin {
+                    denom: DENOM.to_owned(),
+                    amount: total_delegation.unwrap_or_default(),
+                },
+                owner: stored_bond.owner,
+                layer: stored_bond.layer,
+                block_height: stored_bond.block_height,
+                mix_node: stored_bond.mix_node,
+                profit_margin_percent: stored_bond.profit_margin_percent,
+            }))
        }
    }
-
-    Ok(total_rewarded)
 }

 // currently not used outside tests
 #[cfg(test)]
-pub(crate) fn read_mixnode_bond(
+pub(crate) fn read_mixnode_bond_amount(
    storage: &dyn Storage,
    identity: &[u8],
 ) -> StdResult<cosmwasm_std::Uint128> {
@@ -207,17 +321,6 @@ pub(crate) fn read_mixnode_bond(
    Ok(node.bond_amount.amount)
 }

-// currently not used outside tests
-#[cfg(test)]
-pub(crate) fn read_mixnode_delegation(
-    storage: &dyn Storage,
-    identity: &[u8],
-) -> StdResult<cosmwasm_std::Uint128> {
-    let bucket = mixnodes_read(storage);
-    let node = bucket.load(identity)?;
-    Ok(node.total_delegation.amount)
-}
-
 // Gateway-related stuff

 pub fn gateways(storage: &mut dyn Storage) -> Bucket<GatewayBond> {
@@ -286,8 +389,7 @@ mod tests {
    use super::*;
    use crate::helpers::identity_and_owner_to_bytes;
    use crate::support::tests::helpers::{
-        gateway_bond_fixture, gateway_fixture, mix_node_fixture, mixnode_bond_fixture,
-        raw_delegation_fixture,
+        gateway_bond_fixture, gateway_fixture, mix_node_fixture, stored_mixnode_bond_fixture,
    };
    use config::defaults::DENOM;
    use cosmwasm_std::testing::{mock_dependencies, MockStorage};
@@ -297,8 +399,8 @@ mod tests {
    #[test]
    fn mixnode_single_read_retrieval() {
        let mut storage = MockStorage::new();
-        let bond1 = mixnode_bond_fixture();
-        let bond2 = mixnode_bond_fixture();
+        let bond1 = stored_mixnode_bond_fixture();
+        let bond2 = stored_mixnode_bond_fixture();
        mixnodes(&mut storage).save(b"bond1", &bond1).unwrap();
        mixnodes(&mut storage).save(b"bond2", &bond2).unwrap();

@@ -329,15 +431,14 @@ mod tests {
        let node_identity: IdentityKey = "nodeidentity".into();

        // produces an error if target mixnode doesn't exist
-        let res = read_mixnode_bond(&storage, node_owner.as_bytes());
+        let res = read_mixnode_bond_amount(&storage, node_owner.as_bytes());
        assert!(res.is_err());

        // returns appropriate value otherwise
        let bond_value = 1000;

-        let mixnode_bond = MixNodeBond {
+        let mixnode_bond = StoredMixnodeBond {
            bond_amount: coin(bond_value, DENOM),
-            total_delegation: coin(0, DENOM),
            owner: node_owner.clone(),
            layer: Layer::One,
            block_height: 12_345,
@@ -345,6 +446,7 @@ mod tests {
                identity_key: node_identity.clone(),
                ..mix_node_fixture()
            },
+            profit_margin_percent: Some(10),
        };

        mixnodes(&mut storage)
@@ -353,7 +455,7 @@ mod tests {

        assert_eq!(
            Uint128(bond_value),
-            read_mixnode_bond(&storage, node_identity.as_bytes()).unwrap()
+            read_mixnode_bond_amount(&storage, node_identity.as_bytes()).unwrap()
        );
    }

@@ -424,216 +526,6 @@ mod tests {
        assert_eq!(raw_delegation2, res2);
    }

-    #[cfg(test)]
-    mod increasing_mix_delegated_stakes {
-        use super::*;
-        use crate::queries::query_mixnode_delegations_paged;
-        use cosmwasm_std::testing::mock_dependencies;
-
-        #[test]
-        fn when_there_are_no_delegations() {
-            let mut deps = mock_dependencies(&[]);
-            let node_identity: IdentityKey = "nodeidentity".into();
-
-            // 0.001
-            let reward = Decimal::from_ratio(1u128, 1000u128);
-
-            let total_increase = increase_mix_delegated_stakes(
-                &mut deps.storage,
-                node_identity.as_ref(),
-                reward,
-                42,
-            )
-            .unwrap();
-
-            // there was no increase
-            assert!(total_increase.is_zero());
-
-            // there are no 'new' delegations magically added
-            assert!(
-                query_mixnode_delegations_paged(deps.as_ref(), node_identity, None, None)
-                    .unwrap()
-                    .delegations
-                    .is_empty()
-            )
-        }
-
-        #[test]
-        fn when_there_is_a_single_delegation() {
-            let mut deps = mock_dependencies(&[]);
-            let node_identity: IdentityKey = "nodeidentity".into();
-            let delegation_blockstamp = 42;
-
-            // 0.001
-            let reward = Decimal::from_ratio(1u128, 1000u128);
-
-            let delegator_address = Addr::unchecked("bob");
-            mix_delegations(&mut deps.storage, &node_identity)
-                .save(
-                    delegator_address.as_bytes(),
-                    &RawDelegationData::new(1000u128.into(), delegation_blockstamp),
-                )
-                .unwrap();
-
-            let total_increase = increase_mix_delegated_stakes(
-                &mut deps.storage,
-                node_identity.as_ref(),
-                reward,
-                delegation_blockstamp + 2 * MINIMUM_BLOCK_AGE_FOR_REWARDING,
-            )
-            .unwrap();
-
-            assert_eq!(Uint128(1), total_increase);
-
-            // amount is incremented, block height remains the same
-            assert_eq!(
-                RawDelegationData::new(1001u128.into(), 42),
-                mix_delegations_read(&mut deps.storage, &node_identity)
-                    .load(delegator_address.as_bytes())
-                    .unwrap()
-            )
-        }
-
-        #[test]
-        fn when_there_is_a_single_delegation_depending_on_blockstamp() {
-            let mut deps = mock_dependencies(&[]);
-            let node_identity: IdentityKey = "nodeidentity".into();
-            let delegation_blockstamp = 42;
-
-            // 0.001
-            let reward = Decimal::from_ratio(1u128, 1000u128);
-
-            let delegator_address = Addr::unchecked("bob");
-            mix_delegations(&mut deps.storage, &node_identity)
-                .save(
-                    delegator_address.as_bytes(),
-                    &RawDelegationData::new(1000u128.into(), delegation_blockstamp),
-                )
-                .unwrap();
-
-            let total_increase = increase_mix_delegated_stakes(
-                &mut deps.storage,
-                node_identity.as_ref(),
-                reward,
-                delegation_blockstamp + MINIMUM_BLOCK_AGE_FOR_REWARDING - 1,
-            )
-            .unwrap();
-
-            // there was no increase
-            assert!(total_increase.is_zero());
-
-            // amount is not incremented
-            assert_eq!(
-                RawDelegationData::new(1000u128.into(), delegation_blockstamp),
-                mix_delegations_read(&mut deps.storage, &node_identity)
-                    .load(delegator_address.as_bytes())
-                    .unwrap()
-            );
-
-            let total_increase = increase_mix_delegated_stakes(
-                &mut deps.storage,
-                node_identity.as_ref(),
-                reward,
-                delegation_blockstamp + MINIMUM_BLOCK_AGE_FOR_REWARDING,
-            )
-            .unwrap();
-
-            // there is an increase now, that the lock period has passed
-            assert_eq!(Uint128(1), total_increase);
-
-            // amount is incremented
-            assert_eq!(
-                RawDelegationData::new(1001u128.into(), delegation_blockstamp),
-                mix_delegations_read(&mut deps.storage, &node_identity)
-                    .load(delegator_address.as_bytes())
-                    .unwrap()
-            )
-        }
-
-        #[test]
-        fn when_there_are_multiple_delegations() {
-            let mut deps = mock_dependencies(&[]);
-            let node_identity: IdentityKey = "nodeidentity".into();
-            let delegation_blockstamp = 42;
-
-            // 0.001
-            let reward = Decimal::from_ratio(1u128, 1000u128);
-
-            for i in 0..100 {
-                let delegator_address = Addr::unchecked(format!("address{}", i));
-                mix_delegations(&mut deps.storage, &node_identity)
-                    .save(
-                        delegator_address.as_bytes(),
-                        &RawDelegationData::new(1000u128.into(), delegation_blockstamp),
-                    )
-                    .unwrap();
-            }
-
-            let total_increase = increase_mix_delegated_stakes(
-                &mut deps.storage,
-                node_identity.as_ref(),
-                reward,
-                delegation_blockstamp + 2 * MINIMUM_BLOCK_AGE_FOR_REWARDING,
-            )
-            .unwrap();
-
-            assert_eq!(Uint128(100), total_increase);
-
-            for i in 0..100 {
-                let delegator_address = Addr::unchecked(format!("address{}", i));
-                assert_eq!(
-                    raw_delegation_fixture(1001),
-                    mix_delegations_read(&mut deps.storage, &node_identity)
-                        .load(delegator_address.as_bytes())
-                        .unwrap()
-                )
-            }
-        }
-
-        #[test]
-        fn when_there_are_more_delegations_than_page_size() {
-            let mut deps = mock_dependencies(&[]);
-            let node_identity: IdentityKey = "nodeidentity".into();
-            let delegation_blockstamp = 42;
-
-            // 0.001
-            let reward = Decimal::from_ratio(1u128, 1000u128);
-
-            for i in 0..queries::DELEGATION_PAGE_MAX_LIMIT * 10 {
-                let delegator_address = Addr::unchecked(format!("address{}", i));
-                mix_delegations(&mut deps.storage, &node_identity)
-                    .save(
-                        delegator_address.as_bytes(),
-                        &RawDelegationData::new(1000u128.into(), delegation_blockstamp),
-                    )
-                    .unwrap();
-            }
-
-            let total_increase = increase_mix_delegated_stakes(
-                &mut deps.storage,
-                node_identity.as_ref(),
-                reward,
-                delegation_blockstamp + 2 * MINIMUM_BLOCK_AGE_FOR_REWARDING,
-            )
-            .unwrap();
-
-            assert_eq!(
-                Uint128(queries::DELEGATION_PAGE_MAX_LIMIT as u128 * 10),
-                total_increase
-            );
-
-            for i in 0..queries::DELEGATION_PAGE_MAX_LIMIT * 10 {
-                let delegator_address = Addr::unchecked(format!("address{}", i));
-                assert_eq!(
-                    raw_delegation_fixture(1001),
-                    mix_delegations_read(&mut deps.storage, &node_identity)
-                        .load(delegator_address.as_bytes())
-                        .unwrap()
-                )
-            }
-        }
-    }
-
    #[cfg(test)]
    mod reverse_mix_delegations {
        use super::*;
@@ -1,11 +1,13 @@
 #[cfg(test)]
 pub mod helpers {
    use super::*;
-    use crate::contract::query;
    use crate::contract::{instantiate, INITIAL_MIXNODE_BOND};
+    use crate::contract::{
+        query, DEFAULT_SYBIL_RESISTANCE_PERCENT, EPOCH_REWARD_PERCENT, INITIAL_REWARD_POOL,
+    };
+    use crate::storage::StoredMixnodeBond;
    use crate::transactions::{try_add_gateway, try_add_mixnode};
-    use config::defaults::DENOM;
-    use cosmwasm_std::from_binary;
+    use config::defaults::{DENOM, TOTAL_SUPPLY};
    use cosmwasm_std::testing::mock_dependencies;
    use cosmwasm_std::testing::mock_env;
    use cosmwasm_std::testing::mock_info;
@@ -16,21 +18,19 @@ pub mod helpers {
    use cosmwasm_std::Coin;
    use cosmwasm_std::OwnedDeps;
    use cosmwasm_std::{coin, Uint128};
+    use cosmwasm_std::{from_binary, DepsMut};
    use cosmwasm_std::{Empty, MemoryStorage};
+    use mixnet_contract::mixnode::NodeRewardParams;
    use mixnet_contract::{
        Gateway, GatewayBond, InstantiateMsg, Layer, MixNode, MixNodeBond, PagedGatewayResponse,
        PagedMixnodeResponse, QueryMsg, RawDelegationData,
    };

-    pub fn add_mixnode(
-        sender: &str,
-        stake: Vec<Coin>,
-        deps: &mut OwnedDeps<MockStorage, MockApi, MockQuerier>,
-    ) -> String {
+    pub fn add_mixnode(sender: &str, stake: Vec<Coin>, deps: DepsMut) -> String {
        let info = mock_info(sender, &stake);
        let key = format!("{}mixnode", sender);
        try_add_mixnode(
-            deps.as_mut(),
+            deps,
            mock_env(),
            info,
            MixNode {
@@ -133,6 +133,18 @@ pub mod helpers {
            Layer::One,
            12_345,
            mix_node,
+            None,
+        )
+    }
+
+    pub(crate) fn stored_mixnode_bond_fixture() -> StoredMixnodeBond {
+        StoredMixnodeBond::new(
+            coin(50, DENOM),
+            Addr::unchecked("foo"),
+            Layer::One,
+            12_345,
+            mix_node_fixture(),
+            None,
        )
    }

@@ -187,4 +199,16 @@ pub mod helpers {
            amount: INITIAL_MIXNODE_BOND,
        }]
    }
+
+    // when exact values are irrelevant and what matters is the action of rewarding
+    pub fn node_rewarding_params_fixture(uptime: u128) -> NodeRewardParams {
+        NodeRewardParams::new(
+            (INITIAL_REWARD_POOL / 100) * EPOCH_REWARD_PERCENT as u128,
+            50 as u128,
+            0,
+            TOTAL_SUPPLY - INITIAL_REWARD_POOL,
+            uptime,
+            DEFAULT_SYBIL_RESISTANCE_PERCENT,
+        )
+    }
 }
--- a/Show More
+++ b/Show More