Merge branch 'release/1.0.0-rc.1' into release/nym-wallet-v1.0.1

Using fork of cosmrs with different address length validation
Updated mainnet defaults to the most recent values
2022-04-05 17:45:47 +01:00 · 2022-04-05 17:35:50 +01:00 · 2022-04-05 16:52:16 +01:00 · 2022-04-05 16:45:39 +01:00 · 2022-04-05 16:17:40 +01:00 · 2022-04-05 15:37:38 +01:00
83 changed files with 1380 additions and 454 deletions
@@ -0,0 +1,43 @@
+name: Publish Nym binaries
+on:
+  release:
+    types: [created]
+
+jobs:
+  publish-nym:
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [ubuntu-latest]
+
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Check the release tag starts with `nym-binaries-`
+        if: startsWith(github.ref, 'refs/tags/nym-binaries-') == false
+        uses: actions/github-script@v3
+        with:
+          script: |
+            core.setFailed('Release tag did not start with nym-binaries-...')
+
+      - name: Install Rust stable
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+
+      - name: Build all binaries
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: --workspace --release
+
+      - name: Upload to release based on tag name
+        uses: softprops/action-gh-release@v1
+        with:
+          files: |
+            target/release/nym-client
+            target/release/nym-gateway
+            target/release/nym-mixnode
+            target/release/nym-socks5-client
+            target/release/nym-validator-api
@@ -64,12 +64,16 @@ jobs:
          APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_IDENTITY_ID }}
          APPLE_ID: ${{ secrets.APPLE_ID }}
          APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
+          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
+          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
        run: yarn && yarn build

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

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

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

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

 /**
@@ -0,0 +1,29 @@
+const Handlebars = require('handlebars');
+const fs = require('fs');
+const path = require('path');
+
+async function addToContextAndValidate(context) {
+  if (!context.env.NYM_CI_WWW_LOCATION) {
+    throw new Error('Please ensure the env var NYM_CI_WWW_LOCATION is set');
+  }
+  if (!context.env.NYM_CI_WWW_BASE) {
+    throw new Error('Please ensure the env var NYM_CI_WWW_BASE is set');
+  }
+}
+
+async function getMessageBody(context) {
+  const source = fs
+    .readFileSync(
+      context.env.IS_SUCCESS === 'true'
+        ? path.resolve(__dirname, 'templates', 'success')
+        : path.resolve(__dirname, 'templates', 'failure'),
+    )
+    .toString();
+  const template = Handlebars.compile(source);
+  return template(context);
+}
+
+module.exports = {
+  addToContextAndValidate,
+  getMessageBody,
+};
@@ -0,0 +1,11 @@
+🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥
+> :rocket: {{ env.NYM_PROJECT_NAME }}
+> 🔴 **FAILURE** :cry:
+> `branch` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/tree/{{ env.GIT_BRANCH_NAME }}
+> `commit` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/commit/{{ env.GITHUB_SHA }}
+> `build ` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/actions/runs/{{ env.GITHUB_RUN_ID }}
+
+Commit message:
+```
+{{ env.GIT_COMMIT_MESSAGE }}
+```
@@ -0,0 +1,15 @@
+🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩
+> :rocket: {{ env.NYM_PROJECT_NAME }}
+> ✅ **SUCCESS**
+
+> ➡️➡️➡️➡️➡️ **View output:**
+> `storybook`: https://{{ env.NYM_CI_WWW_LOCATION }}.{{ env.NYM_CI_WWW_BASE }}
+
+> `branch` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/tree/{{ env.GIT_BRANCH_NAME }}
+> `commit` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/commit/{{ env.GITHUB_SHA }}
+> `build ` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/actions/runs/{{ env.GITHUB_RUN_ID }}
+
+Commit message by `{{ env.GITHUB_ACTOR }}` at {{ timestamp }}:
+```
+{{ env.GIT_COMMIT_MESSAGE }}
+```
@@ -549,7 +549,7 @@ dependencies = [

 [[package]]
 name = "client-core"
-version = "0.12.0"
+version = "1.0.0-rc.1"
 dependencies = [
 "config",
 "crypto",
@@ -750,31 +750,31 @@ dependencies = [

 [[package]]
 name = "cosmwasm-crypto"
-version = "1.0.0-beta6"
+version = "1.0.0-beta7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dddc1443004c6340e55ca66d98e9d2f1a44aadf4ce2bed2c4f29baa8a15e7b7"
+checksum = "88c2565b1e73a816fb659ef4838fc356143fbd35f43c48a51d2d7d4e5d6679d3"
 dependencies = [
 "digest 0.9.0",
 "ed25519-zebra",
 "k256 0.9.6",
- "rand_core 0.5.1",
+ "rand_core 0.6.3",
 "thiserror",
 ]

 [[package]]
 name = "cosmwasm-derive"
-version = "1.0.0-beta6"
+version = "1.0.0-beta7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe4f0f10f165b8bcc558a13cddb498140960544519aa0581532c766dd80b5598"
+checksum = "fa89fcdf8dbbe0088e663d0a814aa7368e7ebe8fb045a3a150fb5fdc2ffe3b45"
 dependencies = [
 "syn",
 ]

 [[package]]
 name = "cosmwasm-std"
-version = "1.0.0-beta6"
+version = "1.0.0-beta7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f0f3145097b692b2d95fa5d2c7c6fdd60f193ccc709857e7e1987a608725300"
+checksum = "bcb8f99a61d0b9069e1afc80a4ffea87dcc3523edd992080923870b13a677da0"
 dependencies = [
 "base64",
 "cosmwasm-crypto",
@@ -1071,20 +1071,9 @@ dependencies = [

 [[package]]
 name = "cw-storage-plus"
-version = "0.11.1"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d7ee1963302b0ac2a9d42fe0faec826209c17452bfd36fbfd9d002a88929261"
-dependencies = [
- "cosmwasm-std",
- "schemars",
- "serde",
-]
-
-[[package]]
-name = "cw-storage-plus"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c087ff98fb0475db4c2b5298a5fd12b2848d2854b39d1115d930ee6da24d1eed"
+checksum = "5e8b7f9a758c030d375520df947323c052704f784561fc28dcaab4f988c50a30"
 dependencies = [
 "cosmwasm-std",
 "schemars",
@@ -1322,16 +1311,17 @@ dependencies = [

 [[package]]
 name = "ed25519-zebra"
-version = "2.2.0"
+version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a128b76af6dd4b427e34a6fd43dc78dbfe73672ec41ff615a2414c1a0ad0409"
+checksum = "403ef3e961ab98f0ba902771d29f842058578bb1ce7e3c59dad5a6a93e784c69"
 dependencies = [
 "curve25519-dalek",
 "hex",
- "rand_core 0.5.1",
+ "rand_core 0.6.3",
 "serde",
 "sha2",
 "thiserror",
+ "zeroize",
 ]

 [[package]]
@@ -1470,7 +1460,7 @@ dependencies = [

 [[package]]
 name = "explorer-api"
-version = "0.1.0"
+version = "1.0.0-rc.1"
 dependencies = [
 "chrono",
 "humantime-serde",
@@ -2902,7 +2892,7 @@ dependencies = [

 [[package]]
 name = "nym-client"
-version = "0.12.1"
+version = "1.0.0-rc.1"
 dependencies = [
 "clap 2.34.0",
 "client-core",
@@ -2936,7 +2926,7 @@ dependencies = [

 [[package]]
 name = "nym-gateway"
-version = "0.12.1"
+version = "1.0.0-rc.1"
 dependencies = [
 "anyhow",
 "async-trait",
@@ -2982,7 +2972,7 @@ dependencies = [

 [[package]]
 name = "nym-mixnode"
-version = "0.12.1"
+version = "1.0.0-rc.1"
 dependencies = [
 "anyhow",
 "bs58",
@@ -3020,7 +3010,7 @@ dependencies = [

 [[package]]
 name = "nym-network-requester"
-version = "0.12.0"
+version = "1.0.0-rc.1"
 dependencies = [
 "clap 2.34.0",
 "dirs",
@@ -3041,7 +3031,7 @@ dependencies = [

 [[package]]
 name = "nym-socks5-client"
-version = "0.12.1"
+version = "1.0.0-rc.1"
 dependencies = [
 "clap 2.34.0",
 "client-core",
@@ -3076,7 +3066,7 @@ dependencies = [

 [[package]]
 name = "nym-validator-api"
-version = "0.12.0"
+version = "1.0.0-rc.1"
 dependencies = [
 "anyhow",
 "attohttpc",
@@ -6062,11 +6052,11 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"

 [[package]]
 name = "vesting-contract"
-version = "0.1.0"
+version = "1.0.0"
 dependencies = [
 "config",
 "cosmwasm-std",
- "cw-storage-plus 0.12.1",
+ "cw-storage-plus",
 "mixnet-contract-common",
 "schemars",
 "serde",
@@ -6080,7 +6070,7 @@ version = "0.1.0"
 dependencies = [
 "config",
 "cosmwasm-std",
- "cw-storage-plus 0.11.1",
+ "cw-storage-plus",
 "mixnet-contract-common",
 "schemars",
 "serde",
@@ -1,4 +1,4 @@
-<svg width="210" height="56" viewBox="0 0 210 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg viewBox="0 0 210 56" fill="none" xmlns="http://www.w3.org/2000/svg">
    <path d="M45.8829 0.142822H45.7169V0.28114V48.637L25.3289 0.225818L25.3012 0.142822H25.1905H13.6272H0.652966H0.514648V0.28114V55.7189V55.8572H0.652966H13.6272H13.7655V55.7189V7.28002L34.2365 55.7742L34.2642 55.8572H34.3748H45.8829H58.8294H58.9677V55.7189V0.28114V0.142822H58.8294H45.8829Z"/>
    <path d="M209.347 0.142822H184.616H184.477L184.45 0.253483L171.78 48.8583L159.082 0.253483L159.054 0.142822H158.944H134.157H133.991V0.28114V55.7189V55.8572H134.157H147.104H147.242V55.7189V7.66731L159.774 55.7466L159.801 55.8572H159.94H183.564H183.675L183.703 55.7466L196.234 7.66731V55.7189V55.8572H196.373H209.347H209.485V55.7189V0.28114V0.142822H209.347Z"/>
    <path d="M112.663 0.142822H112.58L112.552 0.198153L96.8116 27.5574L80.988 0.198153L80.9604 0.142822H80.8774H65.9114H65.6348L65.7731 0.364136L90.1447 42.5787V55.7189V55.8572H90.283H103.257H103.396V55.7189V42.5787L127.767 0.364136L127.905 0.142822H127.629H112.663Z"/>
@@ -1,6 +1,6 @@
 [package]
 name = "client-core"
-version = "0.12.0"
+version = "1.0.0-rc.1"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 edition = "2021"

@@ -1,6 +1,6 @@
 [package]
 name = "nym-client"
-version = "0.12.1"
+version = "1.0.0-rc.1"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 edition = "2021"
 rust-version = "1.56"
@@ -1,6 +1,6 @@
 [package]
 name = "nym-socks5-client"
-version = "0.12.1"
+version = "1.0.0-rc.1"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 edition = "2021"
 rust-version = "1.56"
@@ -1,7 +1,7 @@
 [package]
 name = "nym-client-wasm"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jedrzej Stuczynski <andrew@nymtech.net>"]
-version = "0.12.0"
+version = "1.0.0-rc.1"
 edition = "2021"
 keywords = ["nym", "sphinx", "wasm", "webassembly", "privacy", "client"]
 license = "Apache-2.0"
@@ -29,16 +29,12 @@ validator-api-requests = { path = "../../../validator-api/validator-api-requests
 async-trait = { version = "0.1.51", optional = true }
 bip39 = { version = "1", features = ["rand"], optional = true }
 config = { path = "../../config", optional = true }
-cosmrs = { version = "0.4.1", features = [
-    "rpc",
-    "bip32",
-    "cosmwasm",
-], optional = true }
+cosmrs = { git = "https://github.com/nymtech/cosmos-rust", branch = "bugfix/account-id-length-validation", features = ["rpc", "bip32", "cosmwasm"], optional = true}
 prost = { version = "0.9", default-features = false, optional = true }
 flate2 = { version = "1.0.20", optional = true }
 sha2 = { version = "0.9.5", optional = true }
 itertools = { version = "0.10", optional = true }
-cosmwasm-std = { version = "1.0.0-beta3", optional = true }
+cosmwasm-std = { version = "1.0.0-beta6", optional = true }

 [dev-dependencies]
 ts-rs = "6.1.2"
@@ -589,6 +589,7 @@ impl<C> NymdClient<C> {
        &self,
        mix_identity: IdentityKey,
        delegator: &AccountId,
+        proxy: Option<String>,
    ) -> Result<Delegation, NymdError>
    where
        C: CosmWasmClient + Sync,
@@ -596,6 +597,7 @@ impl<C> NymdClient<C> {
        let request = QueryMsg::GetDelegationDetails {
            mix_identity,
            delegator: delegator.to_string(),
+            proxy,
        };
        self.client
            .query_contract_smart(self.mixnet_contract_address()?, &request)
@@ -7,4 +7,4 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

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

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

 serde = { version = "1.0", features = ["derive"] }
 serde_repr = "0.1"
@@ -9,6 +9,23 @@ use cosmwasm_std::{Coin, Uint128};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::fmt::Display;
+use std::hash::{Hash, Hasher};
+
+type OwnerAddressBytes = Vec<u8>;
+type BlockHeight = u64;
+
+pub fn generate_storage_key(address: &Addr, proxy: Option<&Addr>) -> Vec<u8> {
+    if let Some(proxy) = &proxy {
+        address
+            .as_bytes()
+            .iter()
+            .zip(proxy.as_bytes())
+            .map(|(x, y)| x ^ y)
+            .collect()
+    } else {
+        address.as_bytes().to_vec()
+    }
+}

 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq, JsonSchema)]
 pub struct Delegation {
@@ -19,12 +36,24 @@ pub struct Delegation {
    pub proxy: Option<Addr>, // proxy address used to delegate the funds on behalf of anouther address
 }

+impl Eq for Delegation {}
+
+#[allow(clippy::derive_hash_xor_eq)]
+impl Hash for Delegation {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        self.owner.hash(state);
+        self.node_identity.hash(state);
+        self.block_height.hash(state);
+        self.proxy.hash(state);
+    }
+}
+
 impl Delegation {
    pub fn new(
        owner: Addr,
        node_identity: IdentityKey,
        amount: Coin,
-        block_height: u64,
+        block_height: BlockHeight,
        proxy: Option<Addr>,
    ) -> Self {
        Delegation {
@@ -36,15 +65,30 @@ impl Delegation {
        }
    }

-    // TODO: change that to use .joined_key() and return Vec<u8>
-    pub fn storage_key(&self) -> (IdentityKey, Vec<u8>, u64) {
+    pub fn storage_key(&self) -> (IdentityKey, OwnerAddressBytes, BlockHeight) {
        (
            self.node_identity(),
-            self.owner().as_bytes().to_vec(),
+            self.proxy_storage_key(),
            self.block_height(),
        )
    }

+    pub fn event_storage_key(&self) -> (OwnerAddressBytes, BlockHeight, IdentityKey) {
+        (
+            self.proxy_storage_key(),
+            self.block_height(),
+            self.node_identity(),
+        )
+    }
+
+    pub fn proxy_storage_key(&self) -> OwnerAddressBytes {
+        generate_storage_key(&self.owner, self.proxy.as_ref())
+    }
+
+    pub fn proxy(&self) -> Option<&Addr> {
+        self.proxy.as_ref()
+    }
+
    pub fn increment_amount(&mut self, amount: Uint128, at_height: Option<u64>) {
        self.amount.amount += amount;
        if let Some(at_height) = at_height {
@@ -86,10 +130,10 @@ pub struct PagedMixDelegationsResponse {
 }

 impl PagedMixDelegationsResponse {
-    pub fn new(delegations: Vec<Delegation>, start_next_after: Option<(Addr, u64)>) -> Self {
+    pub fn new(delegations: Vec<Delegation>, start_next_after: Option<(String, u64)>) -> Self {
        PagedMixDelegationsResponse {
            delegations,
-            start_next_after: start_next_after.map(|(s, h)| (s.to_string(), h)),
+            start_next_after,
        }
    }
 }
@@ -1,7 +1,7 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-mod delegation;
+pub mod delegation;
 pub mod error;
 pub mod events;
 mod gateway;
@@ -78,6 +78,35 @@ impl PendingUndelegate {
    pub fn block_height(&self) -> u64 {
        self.block_height
    }
+
+    pub fn proxy_storage_key(&self) -> Vec<u8> {
+        if let Some(proxy) = &self.proxy {
+            self.delegate()
+                .as_bytes()
+                .iter()
+                .zip(proxy.as_bytes())
+                .map(|(x, y)| x ^ y)
+                .collect()
+        } else {
+            self.delegate().as_bytes().to_vec()
+        }
+    }
+
+    pub fn storage_key(&self) -> (IdentityKey, Vec<u8>) {
+        (self.mix_identity(), self.proxy_storage_key())
+    }
+
+    pub fn delegation_key(&self, block_height: u64) -> (IdentityKey, Vec<u8>, u64) {
+        (self.mix_identity(), self.proxy_storage_key(), block_height)
+    }
+
+    pub fn event_storage_key(&self) -> (Vec<u8>, u64, IdentityKey) {
+        (
+            self.proxy_storage_key(),
+            self.block_height(),
+            self.mix_identity(),
+        )
+    }
 }

 #[cfg_attr(test, derive(ts_rs::TS))]
@@ -15,6 +15,9 @@ pub struct InstantiateMsg {
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum ExecuteMsg {
+    UpdateRewardingValidatorAddress {
+        address: String,
+    },
    InitEpoch {},
    ReconcileDelegations {},
    CheckpointMixnodes {},
@@ -101,6 +104,9 @@ pub enum ExecuteMsg {
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum QueryMsg {
+    GetRewardingValidatorAddress {},
+    GetAllDelegationKeys {},
+    DebugGetAllDelegationValues {},
    GetContractVersion {},
    GetMixNodes {
        limit: Option<u32>,
@@ -137,6 +143,7 @@ pub enum QueryMsg {
    GetDelegationDetails {
        mix_identity: IdentityKey,
        delegator: String,
+        proxy: Option<String>,
    },
    LayerDistribution {},
    GetRewardPool {},
@@ -6,11 +6,11 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

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

 [dev-dependencies]
@@ -6,15 +6,17 @@ use crate::ValidatorDetails;
 pub(crate) const BECH32_PREFIX: &str = "n";
 pub const DENOM: &str = "unym";

-pub(crate) const MIXNET_CONTRACT_ADDRESS: &str = "n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0";
-pub(crate) const VESTING_CONTRACT_ADDRESS: &str = "n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0";
+pub(crate) const MIXNET_CONTRACT_ADDRESS: &str =
+    "n14hj2tavq8fpesdwxxcu44rty3hh90vhujrvcmstl4zr3txmfvw9sjyvg3g";
+pub(crate) const VESTING_CONTRACT_ADDRESS: &str =
+    "n1nc5tatafv6eyq7llkr2gv50ff9e22mnf70qgjlv737ktmt4eswrq73f2nw";
 pub(crate) const BANDWIDTH_CLAIM_CONTRACT_ADDRESS: &str =
    "n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0";
 pub(crate) const _ETH_CONTRACT_ADDRESS: [u8; 20] =
    hex_literal::hex!("0000000000000000000000000000000000000000");
 pub(crate) const _ETH_ERC20_CONTRACT_ADDRESS: [u8; 20] =
    hex_literal::hex!("0000000000000000000000000000000000000000");
-pub(crate) const REWARDING_VALIDATOR_ADDRESS: &str = "n17zujduc46wvkwvp6f062mm5xhr7jc3fewvqu9e";
+pub(crate) const REWARDING_VALIDATOR_ADDRESS: &str = "n10yyd98e2tuwu0f7ypz9dy3hhjw7v772q6287gy";

 pub(crate) fn validators() -> Vec<ValidatorDetails> {
    vec![ValidatorDetails::new(
@@ -41,7 +41,7 @@ checksum = "f771a5d1f5503f7f4279a30f3643d3421ba149848b89ecaaec0ea2acf04a5ac4"

 [[package]]
 name = "bandwidth-claim"
-version = "0.1.0"
+version = "1.0.0-rc.1"
 dependencies = [
 "bandwidth-claim-contract",
 "config",
@@ -218,22 +218,22 @@ dependencies = [

 [[package]]
 name = "cosmwasm-crypto"
-version = "1.0.0-beta6"
+version = "1.0.0-beta7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dddc1443004c6340e55ca66d98e9d2f1a44aadf4ce2bed2c4f29baa8a15e7b7"
+checksum = "88c2565b1e73a816fb659ef4838fc356143fbd35f43c48a51d2d7d4e5d6679d3"
 dependencies = [
 "digest 0.9.0",
 "ed25519-zebra",
 "k256",
- "rand_core 0.5.1",
+ "rand_core 0.6.3",
 "thiserror",
 ]

 [[package]]
 name = "cosmwasm-derive"
-version = "1.0.0-beta6"
+version = "1.0.0-beta7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe4f0f10f165b8bcc558a13cddb498140960544519aa0581532c766dd80b5598"
+checksum = "fa89fcdf8dbbe0088e663d0a814aa7368e7ebe8fb045a3a150fb5fdc2ffe3b45"
 dependencies = [
 "syn",
 ]
@@ -250,9 +250,9 @@ dependencies = [

 [[package]]
 name = "cosmwasm-std"
-version = "1.0.0-beta6"
+version = "1.0.0-beta7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f0f3145097b692b2d95fa5d2c7c6fdd60f193ccc709857e7e1987a608725300"
+checksum = "bcb8f99a61d0b9069e1afc80a4ffea87dcc3523edd992080923870b13a677da0"
 dependencies = [
 "base64",
 "cosmwasm-crypto",
@@ -267,9 +267,9 @@ dependencies = [

 [[package]]
 name = "cosmwasm-storage"
-version = "1.0.0-beta3"
+version = "1.0.0-beta7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4a4e55f0d64fed54cd2202301b8d466af8de044589247dabd77a4222f52f749"
+checksum = "07f856099c824aa8f2488e62d1da3fc06383d3fdbc764573595f451be43441a2"
 dependencies = [
 "cosmwasm-std",
 "serde",
@@ -360,20 +360,9 @@ dependencies = [

 [[package]]
 name = "cw-storage-plus"
-version = "0.11.1"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d7ee1963302b0ac2a9d42fe0faec826209c17452bfd36fbfd9d002a88929261"
-dependencies = [
- "cosmwasm-std",
- "schemars",
- "serde",
-]
-
-[[package]]
-name = "cw-storage-plus"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c087ff98fb0475db4c2b5298a5fd12b2848d2854b39d1115d930ee6da24d1eed"
+checksum = "5e8b7f9a758c030d375520df947323c052704f784561fc28dcaab4f988c50a30"
 dependencies = [
 "cosmwasm-std",
 "schemars",
@@ -450,16 +439,17 @@ dependencies = [

 [[package]]
 name = "ed25519-zebra"
-version = "2.2.0"
+version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a128b76af6dd4b427e34a6fd43dc78dbfe73672ec41ff615a2414c1a0ad0409"
+checksum = "403ef3e961ab98f0ba902771d29f842058578bb1ce7e3c59dad5a6a93e784c69"
 dependencies = [
 "curve25519-dalek",
 "hex",
- "rand_core 0.5.1",
+ "rand_core 0.6.3",
 "serde",
 "sha2",
 "thiserror",
+ "zeroize",
 ]

 [[package]]
@@ -820,7 +810,7 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"

 [[package]]
 name = "mixnet-contract"
-version = "0.1.0"
+version = "1.0.0-rc.1"
 dependencies = [
 "az",
 "bs58",
@@ -829,8 +819,9 @@ dependencies = [
 "cosmwasm-std",
 "cosmwasm-storage",
 "crypto",
- "cw-storage-plus 0.12.1",
+ "cw-storage-plus",
 "fixed",
+ "hex",
 "mixnet-contract-common",
 "rand",
 "rand_chacha",
@@ -1527,11 +1518,11 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"

 [[package]]
 name = "vesting-contract"
-version = "0.1.0"
+version = "1.0.0-rc.1"
 dependencies = [
 "config",
 "cosmwasm-std",
- "cw-storage-plus 0.12.1",
+ "cw-storage-plus",
 "mixnet-contract-common",
 "schemars",
 "serde",
@@ -1545,7 +1536,7 @@ version = "0.1.0"
 dependencies = [
 "config",
 "cosmwasm-std",
- "cw-storage-plus 0.11.1",
+ "cw-storage-plus",
 "mixnet-contract-common",
 "schemars",
 "serde",
@@ -1,6 +1,6 @@
 [package]
 name = "bandwidth-claim"
-version = "0.1.0"
+version = "1.0.0-rc.1"
 edition = "2021"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -14,8 +14,8 @@ config = { path = "../../common/config"}
 [dependencies]
 bandwidth-claim-contract = { path = "../../common/bandwidth-claim-contract" }

-cosmwasm-std = "1.0.0-beta3"
-cosmwasm-storage = "1.0.0-beta3"
+cosmwasm-std = "1.0.0-beta6"
+cosmwasm-storage = "1.0.0-beta6"

 schemars = "0.8"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
@@ -1,6 +1,6 @@
 [package]
 name = "mixnet-contract"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 edition = "2021"

@@ -20,9 +20,9 @@ mixnet-contract-common = { path = "../../common/cosmwasm-smart-contracts/mixnet-
 vesting-contract-common = { path = "../../common/cosmwasm-smart-contracts/vesting-contract" }
 config = { path = "../../common/config"}

-cosmwasm-std = "1.0.0-beta3"
-cosmwasm-storage = "1.0.0-beta3"
-cw-storage-plus = "0.12.1"
+cosmwasm-std = "1.0.0-beta6"
+cosmwasm-storage = "1.0.0-beta6"
+cw-storage-plus = "0.13.1"

 az = "1.2.0"
 bs58 = "0.4.0"
@@ -30,6 +30,7 @@ schemars = "0.8"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.23" }
 time = { version = "0.3", features = ["macros"] }
+hex = "0.4.3"

 [dev-dependencies]
 cosmwasm-schema = "1.0.0-beta3"
@@ -18,9 +18,10 @@ use crate::interval::queries::{
 use crate::interval::transactions::{init_epoch, try_init_epoch};
 use crate::mixnet_contract_settings::models::ContractState;
 use crate::mixnet_contract_settings::queries::{
-    query_contract_settings_params, query_contract_version,
+    query_contract_settings_params, query_contract_version, query_rewarding_validator_address,
 };
 use crate::mixnet_contract_settings::storage as mixnet_params_storage;
+use crate::mixnet_contract_settings::transactions::try_update_rewarding_validator_address;
 use crate::mixnodes::bonding_queries as mixnode_queries;
 use crate::mixnodes::bonding_queries::query_mixnodes_paged;
 use crate::mixnodes::layer_queries::query_layer_distribution;
@@ -32,7 +33,7 @@ use cosmwasm_std::{
    entry_point, to_binary, Addr, Deps, DepsMut, Env, MessageInfo, QueryResponse, Response, Uint128,
 };
 use mixnet_contract_common::{
-    ContractStateParams, Delegation, ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg,
+    ContractStateParams, ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg,
 };
 use time::OffsetDateTime;

@@ -96,6 +97,9 @@ pub fn execute(
    msg: ExecuteMsg,
 ) -> Result<Response, ContractError> {
    match msg {
+        ExecuteMsg::UpdateRewardingValidatorAddress { address } => {
+            try_update_rewarding_validator_address(deps, info, address)
+        }
        ExecuteMsg::InitEpoch {} => try_init_epoch(info, deps.storage, env),
        ExecuteMsg::BondMixnode {
            mix_node,
@@ -276,6 +280,9 @@ pub fn execute(
 #[entry_point]
 pub fn query(deps: Deps<'_>, env: Env, msg: QueryMsg) -> Result<QueryResponse, ContractError> {
    let query_res = match msg {
+        QueryMsg::GetRewardingValidatorAddress {} => {
+            to_binary(&query_rewarding_validator_address(deps)?)
+        }
        QueryMsg::GetContractVersion {} => to_binary(&query_contract_version()),
        QueryMsg::GetMixNodes { start_after, limit } => {
            to_binary(&query_mixnodes_paged(deps, start_after, limit)?)
@@ -312,11 +319,13 @@ pub fn query(deps: Deps<'_>, env: Env, msg: QueryMsg) -> Result<QueryResponse, C
        QueryMsg::GetDelegationDetails {
            mix_identity,
            delegator,
+            proxy,
        } => to_binary(&query_mixnode_delegation(
            deps.storage,
            deps.api,
            mix_identity,
            delegator,
+            proxy,
        )?),
        QueryMsg::GetRewardPool {} => to_binary(&query_reward_pool(deps)?),
        QueryMsg::GetCirculatingSupply {} => to_binary(&query_circulating_supply(deps)?),
@@ -363,66 +372,19 @@ pub fn query(deps: Deps<'_>, env: Env, msg: QueryMsg) -> Result<QueryResponse, C
        QueryMsg::GetPendingDelegationEvents { owner_address } => to_binary(
            &query_pending_delegation_events(deps.storage, owner_address)?,
        ),
+        QueryMsg::GetAllDelegationKeys {} => to_binary(
+            &crate::delegations::queries::query_all_delegation_keys(deps.storage)?,
+        ),
+        QueryMsg::DebugGetAllDelegationValues {} => to_binary(
+            &crate::delegations::queries::debug_query_all_delegation_values(deps.storage)?,
+        ),
    };

    Ok(query_res?)
 }

-// MIGRATE OLD DELEGATION STORAGE
-// applied on QAnet
-#[allow(dead_code)]
-fn migrate_delegations(deps: DepsMut<'_>) -> Result<(), ContractError> {
-    use crate::delegations::storage::{
-        DelegationIndex, DELEGATION_MIXNODE_IDX_NAMESPACE, DELEGATION_OWNER_IDX_NAMESPACE,
-        DELEGATION_PK_NAMESPACE,
-    };
-    use cosmwasm_std::Order;
-    use cw_storage_plus::{IndexedMap, MultiIndex};
-
-    type PrimaryKey = Vec<u8>;
-
-    fn old_delegations<'a>() -> IndexedMap<'a, PrimaryKey, Delegation, DelegationIndex<'a>> {
-        let indexes = DelegationIndex {
-            owner: MultiIndex::new(
-                |d| d.owner.clone(),
-                DELEGATION_PK_NAMESPACE,
-                DELEGATION_OWNER_IDX_NAMESPACE,
-            ),
-            mixnode: MultiIndex::new(
-                |d| d.node_identity.clone(),
-                DELEGATION_PK_NAMESPACE,
-                DELEGATION_MIXNODE_IDX_NAMESPACE,
-            ),
-        };
-
-        IndexedMap::new(DELEGATION_PK_NAMESPACE, indexes)
-    }
-
-    let old_delegations = old_delegations()
-        .range(deps.storage, None, None, Order::Ascending)
-        .filter_map(|r| r.ok())
-        .map(|(_key, delegation)| delegation)
-        .collect::<Vec<Delegation>>();
-
-    for delegation in old_delegations {
-        crate::delegations::storage::delegations().save(
-            deps.storage,
-            (
-                delegation.node_identity(),
-                delegation.owner().as_bytes().to_vec(),
-                delegation.block_height(),
-            ),
-            &delegation,
-        )?;
-    }
-    Ok(())
-}
-
 #[entry_point]
 pub fn migrate(_deps: DepsMut<'_>, _env: Env, _msg: MigrateMsg) -> Result<Response, ContractError> {
-    // TODO: Uncomment mainnet
-    // migrate_delegations(deps)?;
-
    Ok(Default::default())
 }

@@ -43,14 +43,18 @@ pub(crate) fn query_delegator_delegations_paged(
        .idx
        .owner
        .prefix(validated_owner)
-        .range(deps.storage, start, None, Order::Ascending)
+        .range_raw(deps.storage, start, None, Order::Ascending)
        .take(limit)
        .map(|record| record.map(|r| r.1))
        .collect::<StdResult<Vec<_>>>()?;

-    let start_next_after = delegations
-        .last()
-        .map(|delegation| delegation.node_identity());
+    let start_next_after = if delegations.len() < limit {
+        None
+    } else {
+        delegations
+            .last()
+            .map(|delegation| delegation.node_identity())
+    };

    Ok(PagedDelegatorDelegationsResponse::new(
        delegations,
@@ -58,17 +62,70 @@ pub(crate) fn query_delegator_delegations_paged(
    ))
 }

+pub fn query_all_delegation_keys(storage: &dyn Storage) -> Result<Vec<String>, ContractError> {
+    Ok(storage::delegations()
+        .keys_raw(storage, None, None, Order::Ascending)
+        .map(hex::encode)
+        .collect())
+}
+
+use std::collections::HashSet;
+
+// This should only be exposed directly on the contract via nymd binary, not through the nymd clients
+pub fn debug_query_all_delegation_values(
+    storage: &dyn Storage,
+) -> Result<HashSet<Delegation>, ContractError> {
+    use crate::delegations::storage::{
+        DelegationIndex, DELEGATION_MIXNODE_IDX_NAMESPACE, DELEGATION_OWNER_IDX_NAMESPACE,
+        DELEGATION_PK_NAMESPACE,
+    };
+
+    use cw_storage_plus::{IndexedMap, MultiIndex};
+
+    type PrimaryKey = Vec<u8>;
+
+    fn all_delegations<'a>() -> IndexedMap<'a, PrimaryKey, Delegation, DelegationIndex<'a>> {
+        let indexes = DelegationIndex {
+            owner: MultiIndex::new(
+                |d| d.owner.clone(),
+                DELEGATION_PK_NAMESPACE,
+                DELEGATION_OWNER_IDX_NAMESPACE,
+            ),
+            mixnode: MultiIndex::new(
+                |d| d.node_identity.clone(),
+                DELEGATION_PK_NAMESPACE,
+                DELEGATION_MIXNODE_IDX_NAMESPACE,
+            ),
+        };
+
+        IndexedMap::new(DELEGATION_PK_NAMESPACE, indexes)
+    }
+
+    let all_delegations = all_delegations()
+        .range(storage, None, None, Order::Ascending)
+        .filter_map(|r| r.ok())
+        .map(|(_key, delegation)| delegation)
+        .collect::<HashSet<Delegation>>();
+
+    Ok(all_delegations)
+}
+
 // queries for delegation value of given address for particular node
 pub(crate) fn query_mixnode_delegation(
    storage: &dyn Storage,
    api: &dyn Api,
    mix_identity: IdentityKey,
    delegator: String,
+    proxy: Option<String>,
 ) -> Result<Vec<Delegation>, ContractError> {
    let validated_delegator = api.addr_validate(&delegator)?;
+    let proxy = proxy.map(|p| api.addr_validate(&p).expect("Invalid proxy address"));
    let storage_key = (
        mix_identity.clone(),
-        validated_delegator.as_bytes().to_vec(),
+        mixnet_contract_common::delegation::generate_storage_key(
+            &validated_delegator,
+            proxy.as_ref(),
+        ),
    );

    let delegations = storage::delegations()
@@ -99,21 +156,30 @@ pub(crate) fn query_mixnode_delegations_paged(
        .min(storage::DELEGATION_PAGE_MAX_LIMIT) as usize;

    let start = start_after.map(|(addr, height)| {
-        Bound::ExclusiveRaw((mix_identity.clone(), addr.as_bytes(), height).joined_key())
+        Bound::exclusive((
+            hex::decode(addr).expect("Could not hex decode proxy_storage_key"),
+            height,
+        ))
    });

    let delegations = storage::delegations()
-        .idx
-        .mixnode
-        .prefix(mix_identity)
+        .sub_prefix(mix_identity)
        .range(deps.storage, start, None, Order::Ascending)
        .take(limit)
-        .map(|record| record.map(|r| r.1))
-        .collect::<StdResult<Vec<_>>>()?;
+        .filter_map(|r| r.ok())
+        .map(|record| record.1)
+        .collect::<Vec<Delegation>>();

-    let start_next_after = delegations
-        .last()
-        .map(|delegation| (delegation.owner(), delegation.block_height()));
+    let start_next_after = if delegations.len() < limit {
+        None
+    } else {
+        delegations.last().map(|delegation| {
+            (
+                hex::encode(delegation.proxy_storage_key()),
+                delegation.block_height(),
+            )
+        })
+    };

    Ok(PagedMixDelegationsResponse::new(
        delegations,
@@ -127,18 +193,22 @@ pub(crate) mod tests {
    use crate::support::tests::test_helpers;
    use config::defaults::DENOM;
    use cosmwasm_std::{coin, Addr, Storage};
+    use rand::Rng;

    pub fn store_n_mix_delegations(n: u32, storage: &mut dyn Storage, node_identity: &str) {
        for i in 0..n {
            let address = format!("address{}", i);
-            test_helpers::save_dummy_delegation(storage, node_identity, address);
+            test_helpers::save_dummy_delegation(storage, node_identity, address, 1);
        }
    }

    #[cfg(test)]
    mod querying_for_mixnode_delegations_paged {
+        use std::collections::HashSet;
+
        use super::*;
        use mixnet_contract_common::IdentityKey;
+        use rand::{distributions::Alphanumeric, SeedableRng};

        #[test]
        fn retrieval_obeys_limits() {
@@ -203,39 +273,37 @@ pub(crate) mod tests {

        #[test]
        fn pagination_works() {
+            let dummy_seed = [42u8; 32];
+            let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
+
            let mut deps = test_helpers::init_contract();
            let node_identity: IdentityKey = "foo".into();
-            let node_identity2: IdentityKey = "bar".into();

-            test_helpers::save_dummy_delegation(&mut deps.storage, &node_identity, "100");
-            test_helpers::save_dummy_delegation(&mut deps.storage, &node_identity2, "100");
+            let mut delegation_test_data = vec![];
+            let mut returned_delegation_data = HashSet::new();

-            let per_page = 2;
-            let page1 = query_mixnode_delegations_paged(
-                deps.as_ref(),
-                node_identity.clone(),
-                None,
-                Option::from(per_page),
-            )
-            .unwrap();
+            // Crete a bunch of randomly ordered (in storage) delegations
+            for _ in 0..200 {
+                delegation_test_data.push((
+                    rng.clone()
+                        .sample_iter(&Alphanumeric)
+                        .take(30)
+                        .map(char::from)
+                        .collect::<String>(),
+                    rng.gen::<u32>() as u64,
+                ))
+            }

-            // page should have 1 result on it
-            assert_eq!(1, page1.delegations.len());
+            for (address, block_height) in delegation_test_data.iter() {
+                test_helpers::save_dummy_delegation(
+                    &mut deps.storage,
+                    &node_identity,
+                    address,
+                    *block_height,
+                );
+            }

-            // save another
-            test_helpers::save_dummy_delegation(&mut deps.storage, &node_identity, "200");
-
-            // page1 should have 2 results on it
-            let page1 = query_mixnode_delegations_paged(
-                deps.as_ref(),
-                node_identity.clone(),
-                None,
-                Option::from(per_page),
-            )
-            .unwrap();
-            assert_eq!(2, page1.delegations.len());
-
-            test_helpers::save_dummy_delegation(&mut deps.storage, &node_identity, "300");
+            let per_page = 100;

            // page1 still has 2 results
            let page1 = query_mixnode_delegations_paged(
@@ -245,10 +313,20 @@ pub(crate) mod tests {
                Option::from(per_page),
            )
            .unwrap();
-            println!("{:?}", page1);
+
            let start_after = page1.start_next_after.unwrap();
-            assert_eq!(2, page1.delegations.len());
-            assert_eq!(("200".to_string(), 12345), start_after);
+            assert_eq!(100, page1.delegations.len());
+            assert_eq!(
+                ((
+                    "5874735a724c52587679656777795a446a754a746c59694735423165694a".to_string(),
+                    1594717548
+                )),
+                start_after
+            );
+
+            for delegation in page1.delegations {
+                returned_delegation_data.insert(delegation.owner().to_string());
+            }

            // retrieving the next page should start after the last key on this page

@@ -259,37 +337,33 @@ pub(crate) mod tests {
                Option::from(per_page),
            )
            .unwrap();
-            println!("{:?}", page2);
-            assert_eq!(1, page2.delegations.len());
-            assert_eq!(page2.delegations.last().unwrap().owner(), "300");

-            // save another one
-            test_helpers::save_dummy_delegation(&mut deps.storage, &node_identity, "400");
+            let start_after = page2.start_next_after.unwrap();
+            assert_eq!(
+                (
+                    "7a6b48546c63674f57417948384e6f494a326c6b5a63767668597346696b".to_string(),
+                    3448133410
+                ),
+                start_after
+            );

-            let page2 = query_mixnode_delegations_paged(
+            for delegation in page2.delegations {
+                returned_delegation_data.insert(delegation.owner().to_string());
+            }
+
+            let page3 = query_mixnode_delegations_paged(
                deps.as_ref(),
                node_identity.clone(),
                Option::from(start_after),
                Option::from(per_page),
            )
            .unwrap();
-            // println!("{:?}", page2);

-            // now we have 2 pages, with 2 results on the second page
-            assert_eq!(2, page2.delegations.len());
-            assert_eq!(page2.delegations.last().unwrap().owner(), "400");
-
-            // Should be empty
-            let page3 = query_mixnode_delegations_paged(
-                deps.as_ref(),
-                node_identity,
-                page2.start_next_after,
-                Option::from(per_page),
-            )
-            .unwrap();
-
-            assert!(page3.delegations.is_empty());
            assert!(page3.start_next_after.is_none());
+
+            for delegation in delegation_test_data {
+                assert!(returned_delegation_data.contains(&*delegation.0));
+            }
        }
    }

@@ -317,7 +391,8 @@ pub(crate) mod tests {
                &deps.storage,
                &deps.api,
                node_identity,
-                delegation_owner.to_string()
+                delegation_owner.to_string(),
+                None
            )
        )
    }
@@ -340,7 +415,8 @@ pub(crate) mod tests {
                &deps.storage,
                &deps.api,
                node_identity1.clone(),
-                delegation_owner1.to_string()
+                delegation_owner1.to_string(),
+                None
            )
        );

@@ -366,7 +442,8 @@ pub(crate) mod tests {
                &deps.storage,
                &deps.api,
                node_identity1.clone(),
-                delegation_owner1.to_string()
+                delegation_owner1.to_string(),
+                None
            )
        );

@@ -392,7 +469,8 @@ pub(crate) mod tests {
                &deps.storage,
                &deps.api,
                node_identity1,
-                delegation_owner1.to_string()
+                delegation_owner1.to_string(),
+                None
            )
        )
    }
@@ -404,7 +482,7 @@ pub(crate) mod tests {
        fn store_n_reverse_delegations(n: u32, storage: &mut dyn Storage, delegation_owner: &str) {
            for i in 0..n {
                let node_identity = format!("node{}", i);
-                test_helpers::save_dummy_delegation(storage, node_identity, delegation_owner);
+                test_helpers::save_dummy_delegation(storage, node_identity, delegation_owner, 1);
            }
        }

@@ -475,9 +553,18 @@ pub(crate) mod tests {
            let mut deps = test_helpers::init_contract();
            let delegation_owner = "bar".to_string();

-            test_helpers::save_dummy_delegation(&mut deps.storage, "100", &delegation_owner);
+            for j in 0..20 {
+                for i in 0..10 {
+                    test_helpers::save_dummy_delegation(
+                        &mut deps.storage,
+                        format!("{}-{}", j, i),
+                        delegation_owner.clone(),
+                        i,
+                    );
+                }
+            }

-            let per_page = 2;
+            let per_page = 100;
            let page1 = query_delegator_delegations_paged(
                deps.as_ref(),
                delegation_owner.clone(),
@@ -486,60 +573,30 @@ pub(crate) mod tests {
            )
            .unwrap();

-            // page should have 1 result on it
-            assert_eq!(1, page1.delegations.len());
+            let start_after = page1.start_next_after.unwrap();
+            assert_eq!(per_page as usize, page1.delegations.len());
+            assert_eq!(start_after, "9-9".to_string());

-            // save another
-            test_helpers::save_dummy_delegation(&mut deps.storage, "200", &delegation_owner);
-
-            // page1 should have 2 results on it
-            let page1 = query_delegator_delegations_paged(
-                deps.as_ref(),
-                delegation_owner.clone(),
-                None,
-                Option::from(per_page),
-            )
-            .unwrap();
-            assert_eq!(2, page1.delegations.len());
-
-            test_helpers::save_dummy_delegation(&mut deps.storage, "300", &delegation_owner);
-
-            // page1 still has 2 results
-            let page1 = query_delegator_delegations_paged(
-                deps.as_ref(),
-                delegation_owner.clone(),
-                None,
-                Option::from(per_page),
-            )
-            .unwrap();
-            assert_eq!(2, page1.delegations.len());
-
-            // retrieving the next page should start after the last key on this page
-            let start_after: IdentityKey = page1.start_next_after.unwrap();
            let page2 = query_delegator_delegations_paged(
                deps.as_ref(),
                delegation_owner.clone(),
-                Option::from(start_after),
+                Some(start_after),
                Option::from(per_page),
            )
            .unwrap();

-            assert_eq!(1, page2.delegations.len());
+            let start_after = page2.start_next_after.unwrap();
+            assert_eq!(start_after, "19-9".to_string());

-            // save another one
-            test_helpers::save_dummy_delegation(&mut deps.storage, "400", &delegation_owner);
-
-            let start_after = String::from("2");
-            let page2 = query_delegator_delegations_paged(
+            let page3 = query_delegator_delegations_paged(
                deps.as_ref(),
-                delegation_owner,
-                Option::from(start_after),
+                delegation_owner.clone(),
+                Some(start_after),
                Option::from(per_page),
            )
            .unwrap();

-            // now we have 2 pages, with 2 results on the second page
-            assert_eq!(2, page2.delegations.len());
+            assert!(page3.start_next_after.is_none());
        }
    }
 }
@@ -24,9 +24,9 @@ type OwnerAddress = Vec<u8>;
 type PrimaryKey = (IdentityKey, OwnerAddress, BlockHeight);

 pub(crate) struct DelegationIndex<'a> {
-    pub(crate) owner: MultiIndex<'a, Addr, Delegation>,
+    pub(crate) owner: MultiIndex<'a, Addr, Delegation, PrimaryKey>,

-    pub(crate) mixnode: MultiIndex<'a, IdentityKey, Delegation>,
+    pub(crate) mixnode: MultiIndex<'a, IdentityKey, Delegation, PrimaryKey>,
 }

 impl<'a> IndexList<Delegation> for DelegationIndex<'a> {
@@ -4,7 +4,6 @@ use super::storage::{self, PENDING_DELEGATION_EVENTS};
 use crate::error::ContractError;
 use crate::mixnet_contract_settings::storage as mixnet_params_storage;
 use crate::mixnodes::storage as mixnodes_storage;
-use crate::support::helpers::generate_storage_key;
 use config::defaults::DENOM;
 use cosmwasm_std::{
    coins, wasm_execute, Addr, Api, BankMsg, Coin, DepsMut, Env, Event, MessageInfo, Order,
@@ -192,19 +191,18 @@ pub(crate) fn _try_delegate_to_mixnode(
        });
    }

-    let maybe_proxy_storage = generate_storage_key(&delegate, proxy.as_ref());
-    let storage_key = (maybe_proxy_storage, block_height, mix_identity.to_string());
+    let delegation = Delegation::new(
+        delegate.to_owned(),
+        mix_identity.to_string(),
+        amount.clone(),
+        block_height,
+        proxy.clone(),
+    );

    storage::PENDING_DELEGATION_EVENTS.save(
        storage,
-        storage_key,
-        &DelegationEvent::Delegate(Delegation::new(
-            delegate.to_owned(),
-            mix_identity.to_string(),
-            amount.clone(),
-            block_height,
-            proxy.clone(),
-        )),
+        delegation.event_storage_key(),
+        &DelegationEvent::Delegate(delegation),
    )?;

    Ok(Response::new().add_event(new_pending_delegation_event(
@@ -246,17 +244,9 @@ pub(crate) fn try_reconcile_undelegation(
    pending_undelegate: &PendingUndelegate,
 ) -> Result<ReconcileUndelegateResponse, ContractError> {
    let delegation_map = storage::delegations();
-    let maybe_proxy_storage = generate_storage_key(
-        &pending_undelegate.delegate(),
-        pending_undelegate.proxy().as_ref(),
-    );
-    let storage_key = (
-        pending_undelegate.mix_identity(),
-        maybe_proxy_storage.clone(),
-    );

    let any_delegations = delegation_map
-        .prefix(storage_key.clone())
+        .prefix(pending_undelegate.storage_key())
        .keys(storage, None, None, cosmwasm_std::Order::Ascending)
        .filter_map(|v| v.ok())
        .next()
@@ -287,7 +277,7 @@ pub(crate) fn try_reconcile_undelegation(

    // Might want to introduce paging here
    let delegation_heights = delegation_map
-        .prefix(storage_key)
+        .prefix(pending_undelegate.storage_key())
        .keys(storage, None, None, cosmwasm_std::Order::Ascending)
        .filter_map(|v| v.ok())
        .collect::<Vec<u64>>();
@@ -317,14 +307,15 @@ pub(crate) fn try_reconcile_undelegation(
    }

    for h in delegation_heights {
-        let storage_key = (
-            pending_undelegate.mix_identity(),
-            maybe_proxy_storage.clone(),
-            h,
-        );
-        let delegation = delegation_map.load(storage, storage_key.clone())?;
+        let delegation =
+            delegation_map.load(storage, pending_undelegate.delegation_key(h).clone())?;
        total_delegation += delegation.amount.amount;
-        delegation_map.replace(storage, storage_key, None, Some(&delegation))?;
+        delegation_map.replace(
+            storage,
+            pending_undelegate.delegation_key(h),
+            None,
+            Some(&delegation),
+        )?;
    }

    let bank_msg = BankMsg::Send {
@@ -386,19 +377,17 @@ pub(crate) fn _try_remove_delegation_from_mixnode(
 ) -> Result<Response, ContractError> {
    let delegate = deps.api.addr_validate(delegate)?;

+    let event = PendingUndelegate::new(
+        mix_identity.to_string(),
+        delegate.clone(),
+        proxy.clone(),
+        env.block.height,
+    );
+
    PENDING_DELEGATION_EVENTS.save(
        deps.storage,
-        (
-            delegate.as_bytes().to_vec(),
-            env.block.height,
-            mix_identity.to_string(),
-        ),
-        &DelegationEvent::Undelegate(PendingUndelegate::new(
-            mix_identity.to_string(),
-            delegate.clone(),
-            proxy.clone(),
-            env.block.height,
-        )),
+        event.event_storage_key(),
+        &DelegationEvent::Undelegate(event),
    )?;

    Ok(Response::new().add_event(new_pending_undelegation_event(
@@ -738,6 +727,7 @@ mod tests {
                &deps.api,
                identity,
                delegation_owner.to_string(),
+                None,
            )
            .unwrap();

@@ -1074,6 +1064,7 @@ mod tests {
                &deps.api,
                identity.clone(),
                delegation_owner.clone().into_string(),
+                None,
            )
            .unwrap();

@@ -1143,6 +1134,7 @@ mod tests {
                &deps.api,
                identity.clone(),
                delegation_owner.clone().into_string(),
+                None,
            )
            .unwrap();

@@ -11,6 +11,12 @@ pub(crate) fn query_contract_settings_params(deps: Deps<'_>) -> StdResult<Contra
        .map(|settings| settings.params)
 }

+pub fn query_rewarding_validator_address(deps: Deps<'_>) -> StdResult<String> {
+    storage::CONTRACT_STATE
+        .load(deps.storage)
+        .map(|settings| settings.rewarding_validator_address.to_string())
+}
+
 pub(crate) fn query_contract_version() -> MixnetContractVersion {
    // as per docs
    // env! macro will expand to the value of the named environment variable at
@@ -3,12 +3,30 @@

 use super::storage;
 use crate::error::ContractError;
+use cosmwasm_std::Addr;
 use cosmwasm_std::DepsMut;
 use cosmwasm_std::MessageInfo;
 use cosmwasm_std::Response;
 use mixnet_contract_common::events::new_settings_update_event;
 use mixnet_contract_common::ContractStateParams;

+pub fn try_update_rewarding_validator_address(
+    deps: DepsMut<'_>,
+    info: MessageInfo,
+    address: String,
+) -> Result<Response, ContractError> {
+    let mut state = storage::CONTRACT_STATE.load(deps.storage)?;
+
+    if info.sender != state.owner {
+        return Err(ContractError::Unauthorized);
+    }
+
+    state.rewarding_validator_address = Addr::unchecked(address);
+    storage::CONTRACT_STATE.save(deps.storage, &state)?;
+
+    Ok(Response::default())
+}
+
 pub(crate) fn try_update_contract_settings(
    deps: DepsMut<'_>,
    info: MessageInfo,
@@ -48,12 +66,45 @@ pub mod tests {
    use super::*;
    use crate::contract::{INITIAL_GATEWAY_PLEDGE, INITIAL_MIXNODE_PLEDGE};
    use crate::error::ContractError;
+    use crate::mixnet_contract_settings::queries::query_rewarding_validator_address;
    use crate::mixnet_contract_settings::transactions::try_update_contract_settings;
    use crate::support::tests::test_helpers;
    use cosmwasm_std::testing::mock_info;
    use cosmwasm_std::Response;
    use mixnet_contract_common::ContractStateParams;

+    #[test]
+    fn update_contract_rewarding_validtor_address() {
+        let mut deps = test_helpers::init_contract();
+
+        let info = mock_info("not-the-creator", &[]);
+        let res = try_update_rewarding_validator_address(
+            deps.as_mut(),
+            info,
+            "not-the-creator".to_string(),
+        );
+        assert_eq!(res, Err(ContractError::Unauthorized));
+
+        let info = mock_info("creator", &[]);
+        let res = try_update_rewarding_validator_address(
+            deps.as_mut(),
+            info,
+            "new-good-address".to_string(),
+        );
+        assert_eq!(res, Ok(Response::default()));
+
+        let state = storage::CONTRACT_STATE.load(&deps.storage).unwrap();
+        assert_eq!(
+            state.rewarding_validator_address,
+            Addr::unchecked("new-good-address")
+        );
+
+        assert_eq!(
+            state.rewarding_validator_address,
+            query_rewarding_validator_address(deps.as_ref()).unwrap()
+        );
+    }
+
    #[test]
    fn updating_contract_settings() {
        let mut deps = test_helpers::init_contract();
@@ -40,19 +40,6 @@ pub(crate) fn epoch_reward_params(
    Ok(epoch_reward_params)
 }

-pub fn generate_storage_key(address: &Addr, proxy: Option<&Addr>) -> Vec<u8> {
-    if let Some(proxy) = &proxy {
-        address
-            .as_bytes()
-            .iter()
-            .zip(proxy.as_bytes())
-            .map(|(x, y)| x ^ y)
-            .collect()
-    } else {
-        address.as_bytes().to_vec()
-    }
-}
-
 // check if the target address has already bonded a mixnode or gateway,
 // in either case, return an appropriate error
 pub(crate) fn ensure_no_existing_bond(
@@ -103,12 +103,13 @@ pub mod test_helpers {
        storage: &mut dyn Storage,
        mix: impl Into<String>,
        owner: impl Into<String>,
+        block_height: u64,
    ) {
        let delegation = Delegation {
            owner: Addr::unchecked(owner.into()),
            node_identity: mix.into(),
            amount: coin(12345, DENOM),
-            block_height: 12345,
+            block_height: block_height,
            proxy: None,
        };

@@ -1,6 +1,6 @@
 [package]
 name = "vesting-contract"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Drazen Urch <durch@users.noreply.github.com>"]
 edition = "2021"

@@ -18,8 +18,8 @@ mixnet-contract-common = { path = "../../common/cosmwasm-smart-contracts/mixnet-
 vesting-contract-common = { path = "../../common/cosmwasm-smart-contracts/vesting-contract" }
 config = { path = "../../common/config" }

-cosmwasm-std = { version = "1.0.0-beta4"}
-cw-storage-plus = { version = "0.12.1", features = ["iterator"] }
+cosmwasm-std = { version = "1.0.0-beta6"}
+cw-storage-plus = { version = "0.13.1", features = ["iterator"] }

 schemars = "0.8"
 serde = { version = "1.0", default-features = false, features = ["derive"] }
@@ -1,6 +1,6 @@
 [package]
 name = "explorer-api"
-version = "0.1.0"
+version = "1.0.0-rc.1"
 edition = "2021"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -3,7 +3,7 @@

 [package]
 name = "nym-gateway"
-version = "0.12.1"
+version = "1.0.0-rc.1"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 description = "Implementation of the Nym Mixnet Gateway"
 edition = "2021"
@@ -3,7 +3,7 @@

 [package]
 name = "nym-mixnode"
-version = "0.12.1"
+version = "1.0.0-rc.1"
 authors = [
    "Dave Hrycyszyn <futurechimp@users.noreply.github.com>",
    "Jędrzej Stuczyński <andrew@nymtech.net>",
@@ -0,0 +1,57 @@
+/* eslint-disable no-param-reassign */
+const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
+const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
+
+module.exports = {
+  stories: ['../src/**/*.stories.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'],
+  addons: ['@storybook/addon-links', '@storybook/addon-essentials', '@storybook/addon-interactions'],
+  framework: '@storybook/react',
+  core: {
+    builder: 'webpack5',
+  },
+  // webpackFinal: async (config, { configType }) => {
+  //   // `configType` has a value of 'DEVELOPMENT' or 'PRODUCTION'
+  //   // You can change the configuration based on that.
+  //   // 'PRODUCTION' is used when building the static version of storybook.
+  webpackFinal: async (config) => {
+    config.module.rules.forEach((rule) => {
+      // look for SVG import rule and replace
+      // NOTE: the rule before modification is /\.(svg|ico|jpg|jpeg|png|apng|gif|eot|otf|webp|ttf|woff|woff2|cur|ani|pdf)(\?.*)?$/
+      if (rule.test?.toString().includes('svg')) {
+        rule.test = /\.(ico|jpg|jpeg|png|apng|gif|eot|otf|webp|ttf|woff|woff2|cur|ani|pdf)(\?.*)?$/;
+      }
+    });
+
+    // handle asset loading with this
+    config.module.rules.unshift({
+      test: /\.svg(\?.*)?$/i,
+      issuer: /\.[jt]sx?$/,
+      use: ['@svgr/webpack'],
+    });
+
+    config.resolve.extensions = ['.tsx', '.ts', '.js'];
+    config.resolve.plugins = [new TsconfigPathsPlugin()];
+
+    config.plugins.push(new ForkTsCheckerWebpackPlugin({
+      typescript: {
+        mode: 'write-references',
+        diagnosticOptions: {
+          semantic: true,
+          syntactic: true,
+        },
+      },
+    }));
+
+    if (!config.resolve.alias) {
+      config.resolve.alias = {};
+    }
+
+    config.resolve.alias['@tauri-apps/api'] = `${__dirname}/mocks/tauri`;
+
+    // Return the altered config
+    return config;
+  },
+  features: {
+    emotionAlias: false,
+  },
+};
@@ -0,0 +1,13 @@
+/**
+ * This is a mock for Tauri's API package (@tauri-apps/api), to prevent stories from being excluded, because they either use
+ * or import dependencies that use Tauri.
+ */
+
+module.exports = {
+  invoke: (operation) => {
+    console.error(`Tauri cannot be used in Storybook. The operation requested was "${operation}". You can add mock responses to "nym_wallet/.storybook/mocks/tauri.js" if you need. The default response is "void".`);
+    return new Promise((resolve, reject) => {
+      reject(new Error(`Tauri operation ${operation} not available in storybook.`));
+    });
+  },
+}
@@ -0,0 +1,10 @@
+/**
+ * This is a mock for Tauri's API package (@tauri-apps/api/window), to prevent stories from being excluded, because they either use
+ * or import dependencies that use Tauri.
+ */
+
+module.exports = {
+  appWindow: {
+    maximize: () => undefined,
+  }
+}
@@ -0,0 +1,19 @@
+import { NymWalletThemeWithMode } from '../src/theme/NymWalletTheme';
+
+export const parameters = {
+  actions: { argTypesRegex: "^on[A-Z].*" },
+  controls: {
+    matchers: {
+      color: /(background|color)$/i,
+      date: /Date$/,
+    },
+  },
+}
+
+const withThemeProvider = (Story, context) => (
+  <NymWalletThemeWithMode mode="light">
+    <Story {...context} />
+  </NymWalletThemeWithMode>
+);
+
+export const decorators = [withThemeProvider];
@@ -103,6 +103,101 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"

+[[package]]
+name = "ashpd"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5eea0a7a98b3bd2832eb087e1078f6f58db5a54447574d3007cdac6309c1e9f1"
+dependencies = [
+ "enumflags2",
+ "futures",
+ "rand 0.8.5",
+ "serde",
+ "serde_repr",
+ "zbus",
+]
+
+[[package]]
+name = "async-broadcast"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90622698a1218e0b2fb846c97b5f19a0831f6baddee73d9454156365ccfa473b"
+dependencies = [
+ "easy-parallel",
+ "event-listener",
+ "futures-core",
+]
+
+[[package]]
+name = "async-channel"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319"
+dependencies = [
+ "concurrent-queue",
+ "event-listener",
+ "futures-core",
+]
+
+[[package]]
+name = "async-executor"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965"
+dependencies = [
+ "async-task",
+ "concurrent-queue",
+ "fastrand",
+ "futures-lite",
+ "once_cell",
+ "slab",
+]
+
+[[package]]
+name = "async-io"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a811e6a479f2439f0c04038796b5cfb3d2ad56c230e0f2d3f7b04d68cfee607b"
+dependencies = [
+ "concurrent-queue",
+ "futures-lite",
+ "libc",
+ "log",
+ "once_cell",
+ "parking",
+ "polling",
+ "slab",
+ "socket2",
+ "waker-fn",
+ "winapi",
+]
+
+[[package]]
+name = "async-lock"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e97a171d191782fba31bb902b14ad94e24a68145032b7eedf871ab0bc0d077b6"
+dependencies = [
+ "event-listener",
+]
+
+[[package]]
+name = "async-recursion"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7d78656ba01f1b93024b7c3a0467f1608e4be67d725749fdcd7d2c7678fd7a2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "async-task"
+version = "4.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30696a84d817107fc028e049980e09d5e140e8da8f1caeb17e8e950658a3cea9"
+
 [[package]]
 name = "async-trait"
 version = "0.1.52"
@@ -138,6 +233,24 @@ dependencies = [
 "system-deps 6.0.2",
 ]

+[[package]]
+name = "attohttpc"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e69e13a99a7e6e070bb114f7ff381e58c7ccc188630121fc4c2fe4bcf24cd072"
+dependencies = [
+ "flate2",
+ "http",
+ "log",
+ "native-tls",
+ "openssl",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "url",
+ "wildmatch",
+]
+
 [[package]]
 name = "atty"
 version = "0.2.14"
@@ -411,6 +524,12 @@ dependencies = [
 "pkg-config",
 ]

+[[package]]
+name = "cache-padded"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
+
 [[package]]
 name = "cairo-rs"
 version = "0.15.6"
@@ -572,6 +691,15 @@ dependencies = [
 "serde",
 ]

+[[package]]
+name = "concurrent-queue"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3"
+dependencies = [
+ "cache-padded",
+]
+
 [[package]]
 name = "config"
 version = "0.1.0"
@@ -692,35 +820,36 @@ dependencies = [

 [[package]]
 name = "cosmwasm-crypto"
-version = "1.0.0-beta5"
+version = "1.0.0-beta7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8904127a5b9e325ef5d6b2b3f997dcd74943cd35097139b1a4d15b1b6bccae66"
+checksum = "88c2565b1e73a816fb659ef4838fc356143fbd35f43c48a51d2d7d4e5d6679d3"
 dependencies = [
 "digest 0.9.0",
 "ed25519-zebra",
 "k256 0.9.6",
- "rand_core 0.5.1",
+ "rand_core 0.6.3",
 "thiserror",
 ]

 [[package]]
 name = "cosmwasm-derive"
-version = "1.0.0-beta5"
+version = "1.0.0-beta7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a14364ac4d9d085867929d0cf3e94b1d2100121ce02c33c72961406830002613"
+checksum = "fa89fcdf8dbbe0088e663d0a814aa7368e7ebe8fb045a3a150fb5fdc2ffe3b45"
 dependencies = [
 "syn",
 ]

 [[package]]
 name = "cosmwasm-std"
-version = "1.0.0-beta5"
+version = "1.0.0-beta7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2ece12e5bbde434b93937d7b2107e6291f11d69ffa72398c50e8bab41d451d3"
+checksum = "bcb8f99a61d0b9069e1afc80a4ffea87dcc3523edd992080923870b13a677da0"
 dependencies = [
 "base64",
 "cosmwasm-crypto",
 "cosmwasm-derive",
+ "forward_ref",
 "schemars",
 "serde",
 "serde-json-wasm",
@@ -952,20 +1081,9 @@ dependencies = [

 [[package]]
 name = "cw-storage-plus"
-version = "0.11.1"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d7ee1963302b0ac2a9d42fe0faec826209c17452bfd36fbfd9d002a88929261"
-dependencies = [
- "cosmwasm-std",
- "schemars",
- "serde",
-]
-
-[[package]]
-name = "cw-storage-plus"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c087ff98fb0475db4c2b5298a5fd12b2848d2854b39d1115d930ee6da24d1eed"
+checksum = "5e8b7f9a758c030d375520df947323c052704f784561fc28dcaab4f988c50a30"
 dependencies = [
 "cosmwasm-std",
 "schemars",
@@ -1080,6 +1198,17 @@ dependencies = [
 "const-oid 0.7.1",
 ]

+[[package]]
+name = "derivative"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "derive_more"
 version = "0.99.17"
@@ -1190,6 +1319,12 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee2626afccd7561a06cf1367e2950c4718ea04565e20fb5029b6c7d8ad09abcf"

+[[package]]
+name = "easy-parallel"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6907e25393cdcc1f4f3f513d9aac1e840eb1cc341a0fccb01171f7d14d10b946"
+
 [[package]]
 name = "ecdsa"
 version = "0.12.4"
@@ -1239,16 +1374,17 @@ dependencies = [

 [[package]]
 name = "ed25519-zebra"
-version = "2.2.0"
+version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a128b76af6dd4b427e34a6fd43dc78dbfe73672ec41ff615a2414c1a0ad0409"
+checksum = "403ef3e961ab98f0ba902771d29f842058578bb1ce7e3c59dad5a6a93e784c69"
 dependencies = [
 "curve25519-dalek",
 "hex",
- "rand_core 0.5.1",
+ "rand_core 0.6.3",
 "serde",
 "sha2 0.9.9",
 "thiserror",
+ "zeroize",
 ]

 [[package]]
@@ -1306,6 +1442,27 @@ dependencies = [
 "cfg-if",
 ]

+[[package]]
+name = "enumflags2"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b3ab37dc79652c9d85f1f7b6070d77d321d2467f5fe7b00d6b7a86c57b092ae"
+dependencies = [
+ "enumflags2_derive",
+ "serde",
+]
+
+[[package]]
+name = "enumflags2_derive"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f58dc3c5e468259f19f2d46304a6b28f1c3d034442e14b322d2b850e36f6d5ae"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "env_logger"
 version = "0.7.1"
@@ -1319,6 +1476,12 @@ dependencies = [
 "termcolor",
 ]

+[[package]]
+name = "event-listener"
+version = "2.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71"
+
 [[package]]
 name = "eyre"
 version = "0.6.7"
@@ -1452,6 +1615,12 @@ dependencies = [
 "percent-encoding",
 ]

+[[package]]
+name = "forward_ref"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8cbd1169bd7b4a0a20d92b9af7a7e0422888bd38a6f5ec29c1fd8c1558a272e"
+
 [[package]]
 name = "fuchsia-cprng"
 version = "0.1.1"
@@ -2591,6 +2760,12 @@ version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"

+[[package]]
+name = "minisign-verify"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881"
+
 [[package]]
 name = "miniz_oxide"
 version = "0.3.7"
@@ -2738,6 +2913,19 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"

+[[package]]
+name = "nix"
+version = "0.23.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6"
+dependencies = [
+ "bitflags",
+ "cc",
+ "cfg-if",
+ "libc",
+ "memoffset",
+]
+
 [[package]]
 name = "nodrop"
 version = "0.1.14"
@@ -2837,7 +3025,7 @@ dependencies = [

 [[package]]
 name = "nym_wallet"
-version = "1.0.1"
+version = "1.0.2"
 dependencies = [
 "aes-gcm",
 "argon2",
@@ -2910,6 +3098,17 @@ dependencies = [
 "malloc_buf",
 ]

+[[package]]
+name = "objc-foundation"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
+dependencies = [
+ "block",
+ "objc",
+ "objc_id",
+]
+
 [[package]]
 name = "objc_id"
 version = "0.1.1"
@@ -2980,6 +3179,16 @@ dependencies = [
 "vcpkg",
 ]

+[[package]]
+name = "ordered-stream"
+version = "0.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44630c059eacfd6e08bdaa51b1db2ce33119caa4ddc1235e923109aa5f25ccb1"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "pairing"
 version = "0.20.0"
@@ -3352,6 +3561,25 @@ dependencies = [
 "miniz_oxide 0.3.7",
 ]

+[[package]]
+name = "polling"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "log",
+ "wepoll-ffi",
+ "winapi",
+]
+
+[[package]]
+name = "pollster"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5da3b0203fd7ee5720aa0b5e790b591aa5d3f41c3ed2c34a3a393382198af2f7"
+
 [[package]]
 name = "polyval"
 version = "0.5.3"
@@ -3839,6 +4067,32 @@ dependencies = [
 "zeroize",
 ]

+[[package]]
+name = "rfd"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2aaf1d71ccd44689f7c2c72da1117fd8db71f72a76fe9b5c5dbb17ab903007e0"
+dependencies = [
+ "ashpd",
+ "block",
+ "dispatch",
+ "glib-sys 0.15.6",
+ "gobject-sys 0.15.5",
+ "gtk-sys",
+ "js-sys",
+ "lazy_static",
+ "log",
+ "objc",
+ "objc-foundation",
+ "objc_id",
+ "pollster",
+ "raw-window-handle",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "windows",
+]
+
 [[package]]
 name = "ring"
 version = "0.16.20"
@@ -4226,6 +4480,21 @@ dependencies = [
 "digest 0.10.3",
 ]

+[[package]]
+name = "sha1"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770"
+dependencies = [
+ "sha1_smol",
+]
+
+[[package]]
+name = "sha1_smol"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
+
 [[package]]
 name = "sha2"
 version = "0.9.9"
@@ -4637,6 +4906,8 @@ version = "1.0.0-rc.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3571de0bcfd1f4f7599cbb3fe42f28ea9f52c3e89914ff04eaba68b5ee36bb51"
 dependencies = [
+ "attohttpc",
+ "base64",
 "bincode",
 "cfg_aliases",
 "dirs-next",
@@ -4650,12 +4921,14 @@ dependencies = [
 "gtk",
 "http",
 "ignore",
+ "minisign-verify",
 "once_cell",
 "open",
 "percent-encoding",
 "rand 0.8.5",
 "raw-window-handle",
 "regex",
+ "rfd",
 "semver 1.0.6",
 "serde",
 "serde_json",
@@ -5318,11 +5591,11 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"

 [[package]]
 name = "vesting-contract"
-version = "0.1.0"
+version = "1.0.0-rc.1"
 dependencies = [
 "config",
 "cosmwasm-std",
- "cw-storage-plus 0.12.1",
+ "cw-storage-plus",
 "mixnet-contract-common",
 "schemars",
 "serde",
@@ -5336,7 +5609,7 @@ version = "0.1.0"
 dependencies = [
 "config",
 "cosmwasm-std",
- "cw-storage-plus 0.11.1",
+ "cw-storage-plus",
 "mixnet-contract-common",
 "schemars",
 "serde",
@@ -5559,6 +5832,21 @@ dependencies = [
 "windows-bindgen",
 ]

+[[package]]
+name = "wepoll-ffi"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "wildmatch"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6c48bd20df7e4ced539c12f570f937c6b4884928a87fee70a479d72f031d4e0"
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -5766,6 +6054,67 @@ dependencies = [
 "libc",
 ]

+[[package]]
+name = "zbus"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7bb86f3d4592e26a48b2719742aec94f8ae6238ebde20d98183ee185d1275e9a"
+dependencies = [
+ "async-broadcast",
+ "async-channel",
+ "async-executor",
+ "async-io",
+ "async-lock",
+ "async-recursion",
+ "async-task",
+ "async-trait",
+ "byteorder",
+ "derivative",
+ "enumflags2",
+ "event-listener",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "hex",
+ "lazy_static",
+ "nix",
+ "once_cell",
+ "ordered-stream",
+ "rand 0.8.5",
+ "serde",
+ "serde_repr",
+ "sha1",
+ "static_assertions",
+ "winapi",
+ "zbus_macros",
+ "zbus_names",
+ "zvariant",
+]
+
+[[package]]
+name = "zbus_macros"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36823cc10fddc3c6b19f048903262dacaf8274170e9a255784bdd8b4570a8040"
+dependencies = [
+ "proc-macro-crate 1.1.3",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "syn",
+]
+
+[[package]]
+name = "zbus_names"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45dfcdcf87b71dad505d30cc27b1b7b88a64b6d1c435648f48f9dbc1fdc4b7e1"
+dependencies = [
+ "serde",
+ "static_assertions",
+ "zvariant",
+]
+
 [[package]]
 name = "zeroize"
 version = "1.4.3"
@@ -5829,3 +6178,29 @@ dependencies = [
 "cc",
 "libc",
 ]
+
+[[package]]
+name = "zvariant"
+version = "3.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49ea5dc38b2058fae6a5b79009388143dadce1e91c26a67f984a0fc0381c8033"
+dependencies = [
+ "byteorder",
+ "enumflags2",
+ "libc",
+ "serde",
+ "static_assertions",
+ "zvariant_derive",
+]
+
+[[package]]
+name = "zvariant_derive"
+version = "3.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c2cecc5a61c2a053f7f653a24cd15b3b0195d7f7ddb5042c837fb32e161fb7a"
+dependencies = [
+ "proc-macro-crate 1.1.3",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
@@ -10,11 +10,15 @@
    "tauri:dev": "yarn tauri dev",
    "tauri:build": "yarn tauri build",
    "tsc": "tsc --noEmit true",
+    "tsc:watch": "tsc --noEmit true --watch",
    "dev": "yarn run webpack:dev & yarn run tauri:dev",
    "prebuild": "yarn --cwd .. build",
    "build": "run-s webpack:prod tauri:build",
    "lint": "eslint src",
-    "lint:fix": "eslint src --fix"
+    "lint:fix": "eslint src --fix",
+    "prestorybook": "yarn --cwd .. build",
+    "storybook": "start-storybook -p 6006",
+    "storybook:build": "build-storybook"
  },
  "dependencies": {
    "@babel/preset-typescript": "^7.15.0",
@@ -47,6 +51,12 @@
    "@babel/preset-react": "^7.14.5",
    "@nymproject/eslint-config-react-typescript": "^1.0.0",
    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.4",
+    "@storybook/addon-actions": "^6.4.19",
+    "@storybook/addon-essentials": "^6.4.19",
+    "@storybook/addon-interactions": "^6.4.19",
+    "@storybook/addon-links": "^6.4.19",
+    "@storybook/react": "^6.4.19",
+    "@storybook/testing-library": "^0.0.9",
    "@svgr/webpack": "^6.1.1",
    "@tauri-apps/cli": "^1.0.0-rc.5",
    "@testing-library/jest-dom": "^5.14.1",
@@ -1,17 +1,11 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <link rel="preconnect" href="https://fonts.googleapis.com" />
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
-    <link
-      href="https://fonts.googleapis.com/css2?family=Open+Sans&display=swap"
-      rel="stylesheet"
-    />
-    <title>Nym Wallet</title>
-  </head>
-  <body>
-    <div id="root"></div>
-  </body>
+<head>
+  <meta charset='utf-8' />
+  <meta name='viewport' content='width=device-width, initial-scale=1' />
+  <title>Nym Wallet</title>
+</head>
+<body>
+<div id='root'></div>
+</body>
 </html>
@@ -30,7 +30,7 @@ reqwest = "0.11.9"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 strum = { version = "0.23", features = ["derive"] }
-tauri = { version = "=1.0.0-rc.2", features = ["clipboard-all", "shell-open", "window-maximize"] }
+tauri = { version = "=1.0.0-rc.2", features = ["clipboard-all", "shell-open", "updater", "window-maximize"] }
 tendermint-rpc = "0.23.0"
 thiserror = "1.0"
 tokio = { version = "1.10", features = ["sync", "time"] }
@@ -42,7 +42,7 @@ argon2 = { version = "0.3.2", features = ["std"] }
 base64 = "0.13"
 zeroize = "1.4.3"

-cosmrs = { version = "0.4.1", features = ["rpc", "bip32", "cosmwasm"] }
+cosmrs = { git = "https://github.com/nymtech/cosmos-rust", branch = "bugfix/account-id-length-validation", features = ["rpc", "bip32", "cosmwasm"] }
 cosmwasm-std = "1.0.0-beta3"

 validator-client = { path = "../../common/client-libs/validator-client", features = [
@@ -46,7 +46,12 @@
      }
    },
    "updater": {
-      "active": false
+      "active": true,
+      "endpoints": [
+        "https://nymtech.net/.wellknown/wallet/updater.json"
+      ],
+      "dialog": true,
+      "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IENCNzQ2M0E5N0VFODE2NApSV1JrZ2U2WE9rYTNETTg1OTBKdE5uWUEra0hML2syOVUvQ2lxZmFZRzZ1T3NWbGM0eVRzUTVhVwo="
    },
    "allowlist": {
      "window": {
@@ -0,0 +1,48 @@
+import * as React from 'react';
+import { ComponentMeta, ComponentStory } from '@storybook/react';
+import { Box, Typography } from '@mui/material';
+import { ClientAddressDisplay } from './ClientAddress';
+
+export default {
+  title: 'Wallet / Client Address',
+  component: ClientAddressDisplay,
+} as ComponentMeta<typeof ClientAddressDisplay>;
+
+const Template: ComponentStory<typeof ClientAddressDisplay> = (args) => (
+  <Box display="flex" alignContent="center">
+    <ClientAddressDisplay {...args} />
+  </Box>
+);
+
+export const Default = Template.bind({});
+Default.args = {
+  address: 'n222gnd9k6rytn6tz7pf8d2d4dawl7e9cr26111',
+};
+
+export const WithCopy = Template.bind({});
+WithCopy.args = {
+  address: 'n222gnd9k6rytn6tz7pf8d2d4dawl7e9cr26111',
+  withCopy: true,
+};
+
+export const WithLabel = Template.bind({});
+WithLabel.args = {
+  withLabel: true,
+  address: 'n222gnd9k6rytn6tz7pf8d2d4dawl7e9cr26111',
+};
+
+export const ShowEntireAddress = Template.bind({});
+ShowEntireAddress.args = {
+  withLabel: true,
+  showEntireAddress: true,
+  address: 'n222gnd9k6rytn6tz7pf8d2d4dawl7e9cr26111',
+};
+
+export const Empty = Template.bind({});
+Empty.args = {};
+
+export const EmptyWithLabelAndCopy = Template.bind({});
+EmptyWithLabelAndCopy.args = {
+  withLabel: true,
+  withCopy: true,
+};
@@ -1,20 +1,58 @@
-import React, { useContext } from 'react';
-import { Box, Typography } from '@mui/material';
+import React, { FC, useContext } from 'react';
+import { Box, Typography, Tooltip } from '@mui/material';
 import { ClientContext } from '../context/main';
 import { CopyToClipboard } from './CopyToClipboard';
 import { splice } from '../utils';

-export const ClientAddress = ({ withCopy }: { withCopy?: boolean }) => {
-  const { clientDetails } = useContext(ClientContext);
+const AddressTooltip: FC<{ visible?: boolean; address?: string; children: React.ReactElement<any, any> }> = ({
+  visible,
+  address,
+  children,
+}) => {
+  if (!visible) {
+    return children;
+  }
+  if (!address) {
+    return children;
+  }
  return (
-    <Box>
-      <Typography variant="body2" component="span" sx={{ color: 'grey.600' }}>
-        Address:
-      </Typography>{' '}
-      <Typography variant="body2" component="span" color="nym.background.dark" sx={{ mr: 1 }}>
-        {splice(4, 35, clientDetails?.client_address)}
-      </Typography>
-      {withCopy && <CopyToClipboard text={clientDetails?.client_address} iconButton />}
-    </Box>
+    <Tooltip title={address} arrow>
+      {children}
+    </Tooltip>
  );
 };
+
+type ClientAddressProps = {
+  withLabel?: boolean;
+  withCopy?: boolean;
+  showEntireAddress?: boolean;
+};
+
+export const ClientAddressDisplay: FC<ClientAddressProps & { address?: string }> = ({
+  withLabel,
+  withCopy,
+  showEntireAddress,
+  address,
+}) => (
+  <Box>
+    {withLabel && (
+      <>
+        <Typography variant="body2" component="span" sx={{ color: 'grey.600' }}>
+          Address:
+        </Typography>{' '}
+      </>
+    )}
+
+    <AddressTooltip address={address} visible={!showEntireAddress}>
+      <Typography variant="body2" component="span" color="nym.background.dark" sx={{ mr: 1 }}>
+        {showEntireAddress ? address || '' : splice(6, address)}
+      </Typography>
+    </AddressTooltip>
+    {withCopy && <CopyToClipboard text={address} iconButton />}
+  </Box>
+);
+
+export const ClientAddress: FC<ClientAddressProps> = ({ ...props }) => {
+  const { clientDetails } = useContext(ClientContext);
+  return <ClientAddressDisplay {...props} address={clientDetails?.client_address} />;
+};
@@ -1,40 +1,44 @@
 import React from 'react';
-import { NymLogo } from '@nymproject/react';
+import { NymWordmark } from '@nymproject/react';
 import { Box, Container } from '@mui/material';
+import { useTheme } from '@mui/material/styles';
 import { AppBar, Nav } from '../components';

-export const ApplicationLayout: React.FC = ({ children }) => (
-  <Box
-    sx={{
-      height: '100vh',
-      width: '100vw',
-      display: 'grid',
-      gridTemplateColumns: '240px auto',
-      gridTemplateRows: '100%',
-      overflow: 'hidden',
-    }}
-  >
+export const ApplicationLayout: React.FC = ({ children }) => {
+  const theme = useTheme();
+  return (
    <Box
      sx={{
-        background: '#121726',
-        overflow: 'auto',
-        py: 4,
-        px: 5,
+        height: '100vh',
+        width: '100vw',
+        display: 'grid',
+        gridTemplateColumns: '240px auto',
+        gridTemplateRows: '100%',
+        overflow: 'hidden',
      }}
-      display="flex"
-      flexDirection="column"
-      justifyContent="space-between"
    >
-      <Box>
-        <Box sx={{ mb: 3 }}>
-          <NymLogo width={45} />
+      <Box
+        sx={{
+          background: '#121726',
+          overflow: 'auto',
+          py: 4,
+          px: 5,
+        }}
+        display="flex"
+        flexDirection="column"
+        justifyContent="space-between"
+      >
+        <Box>
+          <Box sx={{ mb: 4 }}>
+            <NymWordmark height={14} fill={theme.palette.background.paper} />
+          </Box>
+          <Nav />
        </Box>
-        <Nav />
      </Box>
+      <Container>
+        <AppBar />
+        {children}
+      </Container>
    </Box>
-    <Container>
-      <AppBar />
-      {children}
-    </Container>
-  </Box>
-);
+  );
+};
@@ -16,7 +16,7 @@ export const Receive = () => {
            You can receive tokens by providing this address to the sender
          </Alert>
          <Box>
-            <ClientAddress withCopy />
+            <ClientAddress withCopy showEntireAddress />
          </Box>
          {clientDetails && <QRCode data-testid="qr-code" value={clientDetails?.client_address} />}
        </Stack>
@@ -1,9 +1,10 @@
 import React, { useContext, useEffect, useState } from 'react';
 import { Alert, Box, Button, CircularProgress } from '@mui/material';
+import { useSnackbar } from 'notistack';
 import { Fee, NymCard } from '../../components';
 import { useCheckOwnership } from '../../hooks/useCheckOwnership';
 import { ClientContext } from '../../context/main';
-import { unbond } from '../../requests';
+import { unbond, vestingUnbond } from '../../requests';
 import { PageLayout } from '../../layouts';

 export const Unbond = () => {
@@ -11,6 +12,8 @@ export const Unbond = () => {
  const { checkOwnership, ownership } = useCheckOwnership();
  const { userBalance, getBondDetails } = useContext(ClientContext);

+  const { enqueueSnackbar } = useSnackbar();
+
  useEffect(() => {
    const initialiseForm = async () => {
      await checkOwnership();
@@ -32,11 +35,20 @@ export const Unbond = () => {
                  disabled={isLoading}
                  onClick={async () => {
                    setIsLoading(true);
-                    await unbond(ownership.nodeType!);
-                    await userBalance.fetchBalance();
-                    await getBondDetails();
-                    await checkOwnership();
-                    setIsLoading(false);
+                    try {
+                      if (ownership.vestingPledge) {
+                        await vestingUnbond(ownership.nodeType!);
+                      } else {
+                        await unbond(ownership.nodeType!);
+                      }
+                    } catch (e) {
+                      enqueueSnackbar(`Failed to unbond ${ownership.nodeType}}`, { variant: 'error' });
+                    } finally {
+                      await getBondDetails();
+                      await checkOwnership();
+                      await userBalance.fetchBalance();
+                      setIsLoading(false);
+                    }
                  }}
                  color="inherit"
                >
@@ -0,0 +1,7 @@
+import { Meta } from '@storybook/addon-docs';
+
+<Meta title="Introduction" />
+
+# Nym Wallet Storybook
+
+This is the Storybook for the Nym Wallet.
@@ -0,0 +1,15 @@
+import React from 'react';
+import { CssBaseline, PaletteMode } from '@mui/material';
+import { createTheme, ThemeProvider } from '@mui/material/styles';
+import { getDesignTokens } from './theme';
+import '@assets/fonts/fonts.css';
+
+export const NymWalletThemeWithMode: React.FC<{ mode: PaletteMode }> = ({ mode, children }) => {
+  const theme = React.useMemo(() => createTheme(getDesignTokens(mode)), [mode]);
+  return (
+    <ThemeProvider theme={theme}>
+      <CssBaseline />
+      {children}
+    </ThemeProvider>
+  );
+};
@@ -3,19 +3,14 @@ import { createTheme, ThemeProvider } from '@mui/material/styles';
 import { CssBaseline } from '@mui/material';
 import { getDesignTokens } from './theme';
 import { ClientContext } from '../context/main';
+import { NymWalletThemeWithMode } from './NymWalletTheme';

 /**
 * Provides the theme for the Network Explorer by reacting to the light/dark mode choice stored in the app context.
 */
 export const NymWalletTheme: React.FC = ({ children }) => {
  const { mode } = useContext(ClientContext);
-  const theme = React.useMemo(() => createTheme(getDesignTokens(mode)), [mode]);
-  return (
-    <ThemeProvider theme={theme}>
-      <CssBaseline />
-      {children}
-    </ThemeProvider>
-  );
+  return <NymWalletThemeWithMode mode={mode}>{children}</NymWalletThemeWithMode>;
 };

 export const WelcomeTheme: React.FC = ({ children }) => {
@@ -134,11 +134,9 @@ export const currencyMap = (network?: Network): TCurrency => {
  }
 };

-export const splice = (start: number, deleteCount: number, address?: string): string => {
+export const splice = (size: number, address?: string): string => {
  if (address) {
-    const array = address.split('');
-    array.splice(start, deleteCount, '...');
-    return array.join('');
+    return `${address.slice(0, size)}...${address.slice(-size)}`;
  }
  return '';
 };
@@ -9,7 +9,8 @@
    "explorer"
  ],
  "scripts": {
-    "build": "lerna run --scope @nymproject/mui-theme --scope @nymproject/react build --stream",
+    "build": "run-s build:packages",
+    "build:packages": "lerna run --scope @nymproject/mui-theme --scope @nymproject/react --stream build",
    "build:react-example": "lerna run --scope @nymproject/react-webpack-with-theme-example build --stream",
    "build:playground": "lerna run --scope @nymproject/react storybook:build --stream",
    "build:ci": "yarn build && run-p build:react-example build:playground && yarn build:ci:collect-artifacts",
@@ -3,7 +3,7 @@

 [package]
 name = "nym-network-requester"
-version = "0.12.0"
+version = "1.0.0-rc.1"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 edition = "2021"

@@ -3,7 +3,7 @@ import Wordmark from '@assets/logo/logo-wordmark.svg';
 import { useTheme } from '@mui/material';
 import { LogoProps } from './LogoProps';

-export const NymWordmark: React.FC<LogoProps> = ({ height, width }) => {
+export const NymWordmark: React.FC<LogoProps & { fill?: string }> = ({ height, width, fill }) => {
  const theme = useTheme();
-  return <Wordmark height={height} width={width} fill={theme.palette.text.primary} />;
+  return <Wordmark height={height} width={width} fill={fill || theme.palette.text.primary} />;
 };
@@ -3,7 +3,7 @@

 [package]
 name = "nym-validator-api"
-version = "0.12.0"
+version = "1.0.0-rc.1"
 authors = [
    "Dave Hrycyszyn <futurechimp@users.noreply.github.com>",
    "Jędrzej Stuczyński <andrew@nymtech.net>",
@@ -34,7 +34,8 @@ const DEFAULT_PER_NODE_TEST_PACKETS: usize = 3;

 const DEFAULT_CACHE_INTERVAL: Duration = Duration::from_secs(30);
 const DEFAULT_MONITOR_THRESHOLD: u8 = 60;
-const DEFAULT_MIN_RELIABILITY: u8 = 50;
+const DEFAULT_MIN_MIXNODE_RELIABILITY: u8 = 50;
+const DEFAULT_MIN_GATEWAY_RELIABILITY: u8 = 20;

 #[derive(Debug, Default, Deserialize, PartialEq, Serialize)]
 pub struct Config {
@@ -109,8 +110,8 @@ impl Default for Base {
 #[serde(default)]
 pub struct NetworkMonitor {
    //  Mixnodes and gateways with relialability lower the this get blacklisted by network monitor, get no traffic and cannot be selected into a rewarded set.
-    min_reliability: u8,
-
+    min_mixnode_reliability: u8, // defaults to 50
+    min_gateway_reliability: u8, // defaults to 20
    /// Specifies whether network monitoring service is enabled in this process.
    enabled: bool,

@@ -192,7 +193,8 @@ impl NetworkMonitor {
 impl Default for NetworkMonitor {
    fn default() -> Self {
        NetworkMonitor {
-            min_reliability: DEFAULT_MIN_RELIABILITY,
+            min_mixnode_reliability: DEFAULT_MIN_MIXNODE_RELIABILITY,
+            min_gateway_reliability: DEFAULT_MIN_GATEWAY_RELIABILITY,
            enabled: false,
            testnet_mode: false,
            all_validator_apis: default_api_endpoints(),
@@ -334,6 +336,16 @@ impl Config {
        self
    }

+    pub fn with_min_mixnode_reliability(mut self, min_mixnode_reliability: u8) -> Self {
+        self.network_monitor.min_mixnode_reliability = min_mixnode_reliability;
+        self
+    }
+
+    pub fn with_min_gateway_reliability(mut self, min_gateway_reliability: u8) -> Self {
+        self.network_monitor.min_gateway_reliability = min_gateway_reliability;
+        self
+    }
+
    #[cfg(not(feature = "coconut"))]
    pub fn with_eth_private_key(mut self, eth_private_key: String) -> Self {
        self.network_monitor.eth_private_key = eth_private_key;
@@ -423,8 +435,12 @@ impl Config {
        self.network_monitor.minimum_test_routes
    }

-    pub fn get_min_reliability(&self) -> u8 {
-        self.network_monitor.min_reliability
+    pub fn get_min_mixnode_reliability(&self) -> u8 {
+        self.network_monitor.min_mixnode_reliability
+    }
+
+    pub fn get_min_gateway_reliability(&self) -> u8 {
+        self.network_monitor.min_gateway_reliability
    }

    pub fn get_route_test_packets(&self) -> usize {
@@ -21,7 +21,8 @@ mixnet_contract_address = '{{ base.mixnet_contract_address }}'
 [network_monitor]

 # Mixnodes and gateways with relialability lower the this get blacklisted by network monitor, get no traffic and cannot be selected into a rewarded set.
-min_reliability = {{ network_monitor.min_reliability }}
+min_mixnode_reliability = {{ network_monitor.min_mixnode_reliability }} # deafults to 50
+min_gateway_reliability = {{ network_monitor.min_gateway_reliability }} # defaults to 20

 # Specifies whether network monitoring service is enabled in this process.
 enabled = {{ network_monitor.enabled }}
@@ -64,6 +64,9 @@ const ETH_PRIVATE_KEY: &str = "eth_private_key";

 const REWARDING_MONITOR_THRESHOLD_ARG: &str = "monitor-threshold";

+const MIN_MIXNODE_RELIABILITY_ARG: &str = "min_mixnode_reliability";
+const MIN_GATEWAY_RELIABILITY_ARG: &str = "min_gateway_reliability";
+
 fn parse_validators(raw: &str) -> Vec<Url> {
    raw.split(',')
        .map(|raw_validator| {
@@ -276,6 +279,24 @@ fn override_config(mut config: Config, matches: &ArgMatches<'_>) -> Config {
        config = config.with_minimum_interval_monitor_threshold(monitor_threshold)
    }

+    if let Some(reliability) = matches
+        .value_of(MIN_MIXNODE_RELIABILITY_ARG)
+        .map(|t| t.parse::<u8>())
+    {
+        config = config.with_min_mixnode_reliability(
+            reliability.expect("Provided reliability is not a u8 number!"),
+        )
+    }
+
+    if let Some(reliability) = matches
+        .value_of(MIN_GATEWAY_RELIABILITY_ARG)
+        .map(|t| t.parse::<u8>())
+    {
+        config = config.with_min_gateway_reliability(
+            reliability.expect("Provided reliability is not a u8 number!"),
+        )
+    }
+
    #[cfg(feature = "coconut")]
    if let Some(keypair_path) = matches.value_of(KEYPAIR_ARG) {
        let keypair_bs58 = std::fs::read_to_string(keypair_path)
@@ -42,7 +42,8 @@ pub(super) struct Monitor {
    /// The minimum number of test routes that need to be constructed (and working) in order for
    /// a monitor test run to be valid.
    minimum_test_routes: usize,
-    min_reliability: u8,
+    min_mixnode_reliability: u8,
+    min_gateway_reliability: u8,
 }

 impl Monitor {
@@ -67,7 +68,8 @@ impl Monitor {
            route_test_packets: config.get_route_test_packets(),
            test_routes: config.get_test_routes(),
            minimum_test_routes: config.get_minimum_test_routes(),
-            min_reliability: config.get_min_reliability(),
+            min_mixnode_reliability: config.get_min_mixnode_reliability(),
+            min_gateway_reliability: config.get_min_gateway_reliability(),
        }
    }

@@ -78,7 +80,7 @@ impl Monitor {
        // uptime calculations

        for result in test_summary.mixnode_results.iter() {
-            if result.reliability < self.min_reliability {
+            if result.reliability < self.min_mixnode_reliability {
                self.packet_preparer
                    .validator_cache()
                    .insert_mixnodes_blacklist(result.identity.clone())
@@ -92,7 +94,7 @@ impl Monitor {
        }

        for result in test_summary.gateway_results.iter() {
-            if result.reliability < self.min_reliability {
+            if result.reliability < self.min_gateway_reliability {
                self.packet_preparer
                    .validator_cache()
                    .insert_gateways_blacklist(result.identity.clone())
Author	SHA1	Message	Date
Dave Hrycyszyn	ca1ec81563	Merge branch 'release/1.0.0-rc.1' into release/nym-wallet-v1.0.1	2022-04-05 17:45:47 +01:00
Jędrzej Stuczyński	c177f14073	Using fork of cosmrs with different address length validation	2022-04-05 17:35:50 +01:00
Jędrzej Stuczyński	515d4b73f7	Updated mainnet defaults to the most recent values	2022-04-05 16:52:16 +01:00
Mark Sinclair	d924551361	Merge pull request #1177 from nymtech/feature/wallet-1.0.1-tweaks Wallet 1.0.1 tweaks	2022-04-05 16:45:39 +01:00
Mark Sinclair	999f458070	Update Nym Wallet app icon	2022-04-05 16:17:40 +01:00
Dave Hrycyszyn	c056269f0e	Tagging release contracts	2022-04-05 15:37:38 +01:00
Mark Sinclair	ca49fe2293	GitHub Actions fixes for publishing wallet	2022-04-05 09:42:37 +01:00
Mark Sinclair	1b37ff2242	Update wallet lock file	2022-04-04 18:17:42 +01:00
Mark Sinclair	3712b38230	Fix wallet lock file version	2022-04-04 18:17:13 +01:00
Mark Sinclair	467bda8ddd	Add tauri updater feature	2022-04-04 18:15:33 +01:00
Mark Sinclair	b083335f56	Add updater config to `tauri.conf.json`	2022-04-04 18:15:25 +01:00
Drazen Urch	a63a94623f	Update and query rewarding validator address (#1193 )	2022-04-04 16:55:46 +02:00
Drazen Urch	95b6ac50be	Type safe bounds (#1179 ) * Type safe bounds * Debug get_all_delegations * List raw delegations * query all delegation values * Get all keys and values * Differentiate on len * Clean up duplicates * Remove stop gap * Cleanup, fix paged query key * Reduce queries required to get all delegations * Sandbox migration * Delete migration	2022-03-30 12:20:03 +02:00
Tommy Verrall	5f2247ab83	Merge pull request #1180 from nymtech/update-wallet-unbond fix unbond page	2022-03-30 09:35:22 +01:00
Tommy Verrall	842bcfa782	fix unbond page	2022-03-30 09:34:17 +01:00
Mark Sinclair	5eb6ec4e37	Add story for ClientAddress	2022-03-29 17:58:07 +01:00
Mark Sinclair	4b26ed9452	Bundle fonts into wallet	2022-03-29 17:48:47 +01:00
Mark Sinclair	398b93de97	Add storybook to nym-wallet	2022-03-29 17:48:36 +01:00
Mark Sinclair	649fa60585	Tweaks to client address display	2022-03-29 17:45:55 +01:00
Mark Sinclair	d89f48b4b7	Add `fill` prop to Nym wordmark component	2022-03-29 17:45:55 +01:00
Mark Sinclair	5a628f3dc6	Make wordmark asset variable size	2022-03-29 17:45:55 +01:00
Drazen Urch	c2938e0672	Fix delegation paging (#1174 ) * Fix delegation paging and tests * Circuit breaker, upgrade storage and cosmwasm * beta6 * Cleanup delegation events	2022-03-29 17:02:56 +02:00
Tommy Verrall	278516ad11	Merge pull request #1172 from nymtech/feature/update-binary-version Update binaries to rc version	2022-03-29 10:02:48 +01:00
Mark Sinclair	ce241339bf	Create nym-release-publish.yml	2022-03-28 18:16:08 +01:00
Tommy Verrall	8d7428923a	Update binaries to rc version	2022-03-28 15:32:31 +01:00
Drazen Urch	4a1a4b6415	Different values for mixes and gateways (#1169 )	2022-03-28 13:33:55 +02:00