windows build for the wallet

. removing windows menu . change build script in package.json . change path in webpack
Feature/removal of monitor good nodes (#833 )
2021-11-10 11:00:45 +00:00 · 2021-11-09 12:25:41 +00:00 · 2021-11-09 11:56:43 +00:00 · 2021-11-09 11:42:00 +00:00 · 2021-11-08 15:01:21 +00:00 · 2021-11-08 15:31:58 +01:00
175 changed files with 78084 additions and 7042 deletions
@@ -1,6 +1,12 @@
 name: Continuous integration

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

 jobs:
  build:
@@ -1,6 +1,9 @@
 name: Clippy check

-on: push
+on:
+  push:
+    paths-ignore:
+      - 'explorer/**'

 jobs:
  clippy_check:
@@ -1,6 +1,12 @@
 name: Mixnet Contract

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

 jobs:
  mixnet-contract:
@@ -0,0 +1,23 @@
+name: Linting for Network Explorer (eslint/prettier)
+
+on:
+  pull_request:
+    paths:
+      - 'explorer/**'
+
+defaults:
+  run:
+    working-directory: explorer
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '14'
+      - run: npm install
+      - name: Run ESLint
+        # GitHub should automatically annotate the PR
+        run: npm run lint
@@ -35,7 +35,7 @@ jobs:
        SOURCE: "explorer/dist/"
        REMOTE_HOST: ${{ secrets.CI_WWW_REMOTE_HOST }}
        REMOTE_USER: ${{ secrets.CI_WWW_REMOTE_USER }}
-        TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/${{ env.GITHUB_REF_SLUG }}
+        TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/network-explorer-${{ env.GITHUB_REF_SLUG }}
        EXCLUDE: "/dist/, /node_modules/"
    - name: Keybase - Node Install
      run: npm install
@@ -44,6 +44,7 @@ jobs:
      env:
        NYM_PROJECT_NAME: "Network Explorer"
        NYM_CI_WWW_BASE: "${{ secrets.NYM_CI_WWW_BASE }}"
+        NYM_CI_WWW_LOCATION: "network-explorer-${{ env.GITHUB_REF_SLUG }}"
        GIT_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
        GIT_BRANCH: "${GITHUB_REF##*/}"
        KEYBASE_NYMBOT_USERNAME: "${{ secrets.KEYBASE_NYMBOT_USERNAME }}"
@@ -73,5 +73,5 @@ jobs:
          args: tauri-driver

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

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

 jobs:
  tauri-wallet-types:
    runs-on: ubuntu-latest
+    if: github.event_name != 'pull_request'
    steps:
      - name: Prepare
        run: sudo apt-get update && sudo apt-get install -y libpango1.0-dev libatk1.0-dev libgdk-pixbuf2.0-dev libsoup2.4-dev librust-gdk-dev libwebkit2gtk-4.0-dev
@@ -1,6 +1,12 @@
 name: Wasm Client

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

 jobs:
  wasm:
@@ -11,7 +11,6 @@ target
 /.vscode/settings.json
 validator/.vscode
 sample-configs/validator-config.toml
-.vscode
 scripts/deploy_qa.sh
 scripts/run_gate.sh
 scripts/run_mix.sh
@@ -30,6 +29,3 @@ validator-api/v4.json
 validator-api/v6.json
 **/node_modules
 validator-api/keypair
-contracts/mixnet/code_id
-contracts/mixnet/Justfile
-contracts/mixnet/Makefile
@@ -12,15 +12,6 @@ dependencies = [
 "regex",
 ]

-[[package]]
-name = "addr2line"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e61f2b7f93d2c7d2b08263acaa4a363b3e276806c68af6134c44f523bf1aacd"
-dependencies = [
- "gimli",
-]
-
 [[package]]
 name = "adler"
 version = "1.0.2"
@@ -66,15 +57,6 @@ dependencies = [
 "memchr",
 ]

-[[package]]
-name = "anomaly"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "550632e31568ae1a5f47998c3aa48563030fc49b9ec91913ca337cf64fbc5ccb"
-dependencies = [
- "backtrace",
-]
-
 [[package]]
 name = "ansi_term"
 version = "0.11.0"
@@ -246,27 +228,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"

-[[package]]
-name = "az"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d6dff4a1892b54d70af377bf7a17064192e822865791d812957f21e3108c325"
-
-[[package]]
-name = "backtrace"
-version = "0.3.61"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7a905d892734eea339e896738c14b9afce22b5318f64b951e70bf3844419b01"
-dependencies = [
- "addr2line",
- "cc",
- "cfg-if 1.0.0",
- "libc",
- "miniz_oxide 0.4.4",
- "object",
- "rustc-demangle",
-]
-
 [[package]]
 name = "base-x"
 version = "0.2.8"
@@ -450,12 +411,6 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"

-[[package]]
-name = "bytemuck"
-version = "1.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72957246c41db82b8ef88a5486143830adeb8227ef9837740bdec67724cf2c5b"
-
 [[package]]
 name = "byteorder"
 version = "1.4.3"
@@ -692,7 +647,7 @@ dependencies = [
 "ff",
 "getrandom 0.2.3",
 "group",
- "itertools 0.10.1",
+ "itertools",
 "rand 0.8.4",
 "serde",
 "serde_derive",
@@ -883,9 +838,9 @@ dependencies = [

 [[package]]
 name = "cosmos-sdk-proto"
-version = "0.6.3"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7115eae4b8518967b8e737a3ef76025f2d007de7906d88c18f00b8bbfc70f51e"
+checksum = "edb5204c6ddc4352c74297638b5561f2929d6334866c156e5f3c75e1e1a1436a"
 dependencies = [
 "prost",
 "prost-types",
@@ -894,9 +849,9 @@ dependencies = [

 [[package]]
 name = "cosmrs"
-version = "0.1.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "609eba7eee6d9929927cbdf15f9fe96d250c316c5e1b983c4a47a10f60da5ea7"
+checksum = "d31147fe89e547e74e2692e4bec35387e1ea406fe8cfb14c0ea177b58fd2a8a9"
 dependencies = [
 "bip32",
 "cosmos-sdk-proto",
@@ -907,6 +862,8 @@ dependencies = [
 "prost",
 "prost-types",
 "rand_core 0.6.3",
+ "serde",
+ "serde_json",
 "subtle-encoding",
 "tendermint",
 "tendermint-rpc",
@@ -1488,7 +1445,6 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4620d40f6d2601794401d6dd95a5cf69b6c157852539470eeda433a99b3c0efc"
 dependencies = [
- "serde",
 "signature",
 ]

@@ -1502,7 +1458,6 @@ dependencies = [
 "ed25519",
 "rand 0.7.3",
 "serde",
- "serde_bytes",
 "sha2",
 "zeroize",
 ]
@@ -1687,18 +1642,6 @@ dependencies = [
 "winapi",
 ]

-[[package]]
-name = "fixed"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d333a26ec13a023c6dff4b7584de4d323cfee2e508f5dd2bbee6669e4f7efdf"
-dependencies = [
- "az",
- "bytemuck",
- "half",
- "typenum",
-]
-
 [[package]]
 name = "flate2"
 version = "1.0.22"
@@ -1711,6 +1654,16 @@ dependencies = [
 "miniz_oxide 0.4.4",
 ]

+[[package]]
+name = "flex-error"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c606d892c9de11507fa0dcffc116434f94e105d0bbdc4e405b61519464c49d7b"
+dependencies = [
+ "eyre",
+ "paste",
+]
+
 [[package]]
 name = "fluvio-wasm-timer"
 version = "0.2.5"
@@ -2093,12 +2046,6 @@ dependencies = [
 "syn",
 ]

-[[package]]
-name = "gimli"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7"
-
 [[package]]
 name = "gio"
 version = "0.14.6"
@@ -2324,12 +2271,6 @@ dependencies = [
 "tracing",
 ]

-[[package]]
-name = "half"
-version = "1.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
-
 [[package]]
 name = "handlebars"
 version = "3.5.5"
@@ -2581,6 +2522,7 @@ dependencies = [
 "tokio",
 "tokio-rustls",
 "webpki",
+ "webpki-roots",
 ]

 [[package]]
@@ -2741,15 +2683,6 @@ dependencies = [
 "thiserror",
 ]

-[[package]]
-name = "itertools"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itertools"
 version = "0.10.1"
@@ -3053,15 +2986,10 @@ dependencies = [
 name = "mixnet-contract"
 version = "0.1.0"
 dependencies = [
- "az",
 "cosmwasm-std",
- "fixed",
- "log",
- "network-defaults",
 "schemars",
 "serde",
 "serde_repr",
- "thiserror",
 "ts-rs",
 ]

@@ -3673,15 +3601,6 @@ dependencies = [
 "objc",
 ]

-[[package]]
-name = "object"
-version = "0.26.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39f37e50073ccad23b6d09bcb5b263f4e76d3bb6038e4a3c08e52162ffa8abc2"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "okapi"
 version = "0.6.0-alpha-1"
@@ -3825,6 +3744,12 @@ dependencies = [
 "winapi",
 ]

+[[package]]
+name = "paste"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58"
+
 [[package]]
 name = "pbkdf2"
 version = "0.8.0"
@@ -3857,6 +3782,33 @@ dependencies = [
 "syn",
 ]

+[[package]]
+name = "peg"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07c0b841ea54f523f7aa556956fbd293bcbe06f2e67d2eb732b7278aaf1d166a"
+dependencies = [
+ "peg-macros",
+ "peg-runtime",
+]
+
+[[package]]
+name = "peg-macros"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5aa52829b8decbef693af90202711348ab001456803ba2a98eb4ec8fb70844c"
+dependencies = [
+ "peg-runtime",
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "peg-runtime"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c719dcf55f09a3a7e764c6649ab594c18a177e3599c467983cdf644bfc0a4088"
+
 [[package]]
 name = "pem"
 version = "0.8.3"
@@ -4206,9 +4158,9 @@ dependencies = [

 [[package]]
 name = "prost"
-version = "0.7.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e6984d2f1a23009bd270b8bb56d0926810a3d483f59c987d77969e9d8e840b2"
+checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001"
 dependencies = [
 "bytes",
 "prost-derive",
@@ -4216,12 +4168,12 @@ dependencies = [

 [[package]]
 name = "prost-derive"
-version = "0.7.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "169a15f3008ecb5160cba7d37bcd690a7601b6d30cfb87a117d45e59d52af5d4"
+checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe"
 dependencies = [
 "anyhow",
- "itertools 0.9.0",
+ "itertools",
 "proc-macro2",
 "quote",
 "syn",
@@ -4229,9 +4181,9 @@ dependencies = [

 [[package]]
 name = "prost-types"
-version = "0.7.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b518d7cdd93dab1d1122cf07fa9a60771836c668dde9d9e2a139f957f0d9f1bb"
+checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a"
 dependencies = [
 "bytes",
 "prost",
@@ -4844,12 +4796,6 @@ dependencies = [
 "quote",
 ]

-[[package]]
-name = "rustc-demangle"
-version = "0.1.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
-
 [[package]]
 name = "rustc_version"
 version = "0.2.3"
@@ -5411,7 +5357,7 @@ version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4b7922be017ee70900be125523f38bdd644f4f06a1b16e8fa5a8ee8c34bffd4"
 dependencies = [
- "itertools 0.10.1",
+ "itertools",
 "nom",
 "unicode_categories",
 ]
@@ -5897,7 +5843,7 @@ dependencies = [
 "anyhow",
 "cfg-expr",
 "heck",
- "itertools 0.10.1",
+ "itertools",
 "pkg-config",
 "strum 0.21.0",
 "strum_macros 0.21.1",
@@ -6112,16 +6058,16 @@ dependencies = [

 [[package]]
 name = "tendermint"
-version = "0.21.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0752808f59b612916614e92e43be64e9ba566b762a266bcfcf7dce1b324e9319"
+checksum = "50d1cdb0236becb17ab35a2ed1566503e412fd910944dc940239857bb7663652"
 dependencies = [
- "anomaly",
 "async-trait",
 "bytes",
 "chrono",
 "ed25519",
 "ed25519-dalek",
+ "flex-error",
 "futures",
 "k256",
 "num-traits",
@@ -6138,21 +6084,32 @@ dependencies = [
 "subtle 2.4.1",
 "subtle-encoding",
 "tendermint-proto",
- "thiserror",
- "toml",
- "url",
 "zeroize",
 ]

 [[package]]
-name = "tendermint-proto"
-version = "0.21.0"
+name = "tendermint-config"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfd0371c6b0c7fc4f6b053b8a1bc868a2a47c49a1408c4cd6f595d9f3bd3c238"
+checksum = "2a1f94250d30e3011130a09756b05985d8dbfbd562cf261b5a17e36d89a37992"
+dependencies = [
+ "flex-error",
+ "serde",
+ "serde_json",
+ "tendermint",
+ "toml",
+ "url",
+]
+
+[[package]]
+name = "tendermint-proto"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff16a7b42bdbcf31c8cd10a4cffc7631f2a301360ba3a3f71dde48eabfa5bced"
 dependencies = [
- "anomaly",
 "bytes",
 "chrono",
+ "flex-error",
 "num-derive",
 "num-traits",
 "prost",
@@ -6160,30 +6117,32 @@ dependencies = [
 "serde",
 "serde_bytes",
 "subtle-encoding",
- "thiserror",
 ]

 [[package]]
 name = "tendermint-rpc"
-version = "0.21.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0fa8d172e3129802d28de980531993dd25cc01841c5bc8fe4a87c7750a7f222"
+checksum = "c7842dcd5edb60b077572aa92ff8b29fc810b9b463310f9810a2607474130db4"
 dependencies = [
 "async-trait",
 "bytes",
 "chrono",
+ "flex-error",
 "futures",
 "getrandom 0.1.16",
 "http",
 "hyper",
 "hyper-proxy",
 "hyper-rustls",
+ "peg",
 "pin-project",
 "serde",
 "serde_bytes",
 "serde_json",
 "subtle-encoding",
 "tendermint",
+ "tendermint-config",
 "tendermint-proto",
 "thiserror",
 "tokio",
@@ -6465,21 +6424,9 @@ checksum = "84f96e095c0c82419687c20ddf5cb3eadb61f4e1405923c9dc8e53a1adacbda8"
 dependencies = [
 "cfg-if 1.0.0",
 "pin-project-lite",
- "tracing-attributes",
 "tracing-core",
 ]

-[[package]]
-name = "tracing-attributes"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98863d0dd09fa59a1b79c6750ad80dbda6b75f4e71c437a6a1a8cb91a8bcbd77"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "tracing-core"
 version = "0.1.20"
@@ -6700,7 +6647,7 @@ dependencies = [
 "cosmrs",
 "cosmwasm-std",
 "flate2",
- "itertools 0.10.1",
+ "itertools",
 "log",
 "mixnet-contract",
 "network-defaults",
@@ -62,4 +62,4 @@ default-members = [
    "validator-api",
 ]

-exclude = ["explorer", "contracts", "tokenomics-py"]
+exclude = ["explorer", "contracts"]
@@ -257,7 +257,7 @@ impl TopologyRefresher {
            Ok(mixes) => mixes,
        };

-        let gateways = match self.validator_client.get_cached_active_gateways().await {
+        let gateways = match self.validator_client.get_cached_gateways().await {
            Err(err) => {
                error!("failed to get network gateways - {}", err);
                return None;
@@ -3,6 +3,7 @@ name = "nym-client"
 version = "0.11.0"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 edition = "2018"
+rust-version = "1.56"

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

@@ -3,6 +3,7 @@ name = "nym-socks5-client"
 version = "0.11.0"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 edition = "2018"
+rust-version = "1.56"

 [lib]
 name = "nym_socks5"
@@ -7,6 +7,7 @@ keywords = ["nym", "sphinx", "wasm", "webassembly", "privacy", "client"]
 license = "Apache-2.0"
 repository = "https://github.com/nymtech/nym"
 description = "A webassembly client which can be used to interact with the the Nym privacy platform. Wasm is used for Sphinx packet generation."
+rust-version = "1.56"

 [lib]
 crate-type = ["cdylib", "rlib"]
@@ -279,7 +279,7 @@ impl NymClient {
            Ok(mixes) => mixes,
        };

-        let gateways = match validator_client.get_cached_active_gateways().await {
+        let gateways = match validator_client.get_cached_gateways().await {
            Err(err) => panic!("{}", err),
            Ok(gateways) => gateways,
        };
@@ -139,6 +139,11 @@ impl GatewayClient {
        self.gateway_identity
    }

+    #[cfg(feature = "coconut")]
+    pub fn remaining_bandwidth(&self) -> i64 {
+        self.bandwidth_remaining
+    }
+
    #[cfg(not(target_arch = "wasm32"))]
    async fn _close_connection(&mut self) -> Result<(), GatewayClientError> {
        match std::mem::replace(&mut self.connection, SocketState::NotConnected) {
@@ -518,12 +523,8 @@ impl GatewayClient {
            return Err(GatewayClientError::NotAuthenticated);
        }
        #[cfg(feature = "coconut")]
-        if self.bandwidth_remaining <= self.estimate_required_bandwidth(&packets) {
-            return Err(GatewayClientError::NotEnoughBandwidth((
-                line!(),
-                self.estimate_required_bandwidth(&packets),
-                self.bandwidth_remaining,
-            )));
+        if self.estimate_required_bandwidth(&packets) < self.bandwidth_remaining {
+            return Err(GatewayClientError::NotEnoughBandwidth);
        }
        if !self.connection.is_established() {
            return Err(GatewayClientError::ConnectionNotEstablished);
@@ -591,11 +592,7 @@ impl GatewayClient {
        }
        #[cfg(feature = "coconut")]
        if (mix_packet.sphinx_packet().len() as i64) > self.bandwidth_remaining {
-            return Err(GatewayClientError::NotEnoughBandwidth((
-                line!(),
-                (mix_packet.sphinx_packet().len() as i64),
-                self.bandwidth_remaining,
-            )));
+            return Err(GatewayClientError::NotEnoughBandwidth);
        }
        if !self.connection.is_established() {
            return Err(GatewayClientError::ConnectionNotEstablished);
@@ -634,11 +631,7 @@ impl GatewayClient {
        }
        #[cfg(feature = "coconut")]
        if self.bandwidth_remaining <= 0 {
-            return Err(GatewayClientError::NotEnoughBandwidth((
-                line!(),
-                0,
-                self.bandwidth_remaining,
-            )));
+            return Err(GatewayClientError::NotEnoughBandwidth);
        }
        if self.connection.is_partially_delegated() {
            return Ok(());
@@ -23,7 +23,7 @@ pub enum GatewayClientError {
    MalformedResponse,
    SerializeCredential,
    NotAuthenticated,
-    NotEnoughBandwidth((u32, i64, i64)),
+    NotEnoughBandwidth,
    UnexpectedResponse,
    ConnectionInInvalidState,
    RegistrationFailure(HandshakeError),
@@ -102,12 +102,8 @@ impl fmt::Display for GatewayClientError {
                write!(f, "gateway returned an error response - {}", err)
            }
            GatewayClientError::UnexpectedResponse => write!(f, "received an unexpected response"),
-            GatewayClientError::NotEnoughBandwidth((line_number, estimated, remaining)) => {
-                write!(
-                    f,
-                    "line: {} - client does not have enough bandwidth: estimated {}, remaining: {}",
-                    line_number, estimated, remaining
-                )
+            GatewayClientError::NotEnoughBandwidth => {
+                write!(f, "client does not have enough bandwidth")
            }
            GatewayClientError::SerializeCredential => {
                write!(f, "credential could not be serialized")
@@ -119,7 +119,7 @@ impl PartiallyDelegated {
            }
            .is_err()
            {
-                info!("failed to send back `mixnet_receiver_future` result on the oneshot channel")
+                panic!("failed to send back `mixnet_receiver_future` result on the oneshot channel")
            }
        };

@@ -3,6 +3,7 @@ name = "validator-client"
 version = "0.1.0"
 authors = ["Jędrzej Stuczyński <andrew@nymtech.net>"]
 edition = "2018"
+rust-version = "1.56"

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

@@ -25,8 +26,8 @@ network-defaults = { path = "../../network-defaults" }
 async-trait = { version = "0.1.51", optional = true }
 bip39 = { version = "1", features = ["rand"], optional = true }
 config = { path = "../../config", optional = true }
-cosmrs = { version = "0.1", features = ["rpc", "bip32", "cosmwasm"], optional = true }
-prost = { version = "0.7", default-features = false, optional = true }
+cosmrs = { version = "0.3", 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 }
@@ -24,7 +24,6 @@ pub struct Config {
    mixnode_page_limit: Option<u32>,
    gateway_page_limit: Option<u32>,
    mixnode_delegations_page_limit: Option<u32>,
-    gateway_delegations_page_limit: Option<u32>,
 }

 #[cfg(feature = "nymd-client")]
@@ -41,7 +40,6 @@ impl Config {
            mixnode_page_limit: None,
            gateway_page_limit: None,
            mixnode_delegations_page_limit: None,
-            gateway_delegations_page_limit: None,
        }
    }

@@ -59,11 +57,6 @@ impl Config {
        self.mixnode_delegations_page_limit = limit;
        self
    }
-
-    pub fn with_gateway_delegations_page_limit(mut self, limit: Option<u32>) -> Config {
-        self.gateway_delegations_page_limit = limit;
-        self
-    }
 }

 #[cfg(feature = "nymd-client")]
@@ -74,7 +67,6 @@ pub struct Client<C> {
    mixnode_page_limit: Option<u32>,
    gateway_page_limit: Option<u32>,
    mixnode_delegations_page_limit: Option<u32>,
-    gateway_delegations_page_limit: Option<u32>,

    // ideally they would have been read-only, but unfortunately rust doesn't have such features
    pub validator_api: validator_api::Client,
@@ -100,7 +92,6 @@ impl Client<SigningNymdClient> {
            mixnode_page_limit: config.mixnode_page_limit,
            gateway_page_limit: config.gateway_page_limit,
            mixnode_delegations_page_limit: config.mixnode_delegations_page_limit,
-            gateway_delegations_page_limit: config.gateway_delegations_page_limit,
            validator_api: validator_api_client,
            nymd: nymd_client,
        })
@@ -136,7 +127,6 @@ impl Client<QueryNymdClient> {
            mixnode_page_limit: config.mixnode_page_limit,
            gateway_page_limit: config.gateway_page_limit,
            mixnode_delegations_page_limit: config.mixnode_delegations_page_limit,
-            gateway_delegations_page_limit: config.gateway_delegations_page_limit,
            validator_api: validator_api_client,
            nymd: nymd_client,
        })
@@ -182,34 +172,6 @@ impl<C> Client<C> {
        Ok(self.nymd.get_state_params().await?)
    }

-    pub async fn get_reward_pool(&self) -> Result<u128, ValidatorClientError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        Ok(self.nymd.get_reward_pool().await?.u128())
-    }
-
-    pub async fn get_circulating_supply(&self) -> Result<u128, ValidatorClientError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        Ok(self.nymd.get_circulating_supply().await?.u128())
-    }
-
-    pub async fn get_sybil_resistance_percent(&self) -> Result<u8, ValidatorClientError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        Ok(self.nymd.get_sybil_resistance_percent().await?)
-    }
-
-    pub async fn get_epoch_reward_percent(&self) -> Result<u8, ValidatorClientError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        Ok(self.nymd.get_epoch_reward_percent().await?)
-    }
-
    // basically handles paging for us
    pub async fn get_all_nymd_mixnodes(&self) -> Result<Vec<MixNodeBond>, ValidatorClientError>
    where
@@ -367,116 +329,6 @@ impl<C> Client<C> {
        Ok(delegations)
    }

-    pub async fn get_all_nymd_single_gateway_delegations(
-        &self,
-        identity: mixnet_contract::IdentityKey,
-    ) -> Result<Vec<mixnet_contract::Delegation>, ValidatorClientError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        let mut delegations = Vec::new();
-        let mut start_after = None;
-        loop {
-            let mut paged_response = self
-                .nymd
-                .get_gateway_delegations(
-                    identity.clone(),
-                    start_after.take(),
-                    self.gateway_delegations_page_limit,
-                )
-                .await?;
-            delegations.append(&mut paged_response.delegations);
-
-            if let Some(start_after_res) = paged_response.start_next_after {
-                start_after = Some(start_after_res)
-            } else {
-                break;
-            }
-        }
-
-        Ok(delegations)
-    }
-
-    pub async fn get_all_nymd_gateway_delegations(
-        &self,
-    ) -> Result<Vec<mixnet_contract::UnpackedDelegation<RawDelegationData>>, ValidatorClientError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        let mut delegations = Vec::new();
-        let mut start_after = None;
-        loop {
-            let mut paged_response = self
-                .nymd
-                .get_all_gateway_delegations(
-                    start_after.take(),
-                    self.gateway_delegations_page_limit,
-                )
-                .await?;
-            delegations.append(&mut paged_response.delegations);
-
-            if let Some(start_after_res) = paged_response.start_next_after {
-                start_after = Some(start_after_res)
-            } else {
-                break;
-            }
-        }
-
-        Ok(delegations)
-    }
-
-    pub async fn get_all_nymd_reverse_gateway_delegations(
-        &self,
-        delegation_owner: &cosmrs::AccountId,
-    ) -> Result<Vec<mixnet_contract::IdentityKey>, ValidatorClientError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        let mut delegations = Vec::new();
-        let mut start_after = None;
-        loop {
-            let mut paged_response = self
-                .nymd
-                .get_reverse_gateway_delegations_paged(
-                    mixnet_contract::Addr::unchecked(delegation_owner.as_ref()),
-                    start_after.take(),
-                    self.mixnode_delegations_page_limit,
-                )
-                .await?;
-            delegations.append(&mut paged_response.delegated_nodes);
-
-            if let Some(start_after_res) = paged_response.start_next_after {
-                start_after = Some(start_after_res)
-            } else {
-                break;
-            }
-        }
-
-        Ok(delegations)
-    }
-
-    pub async fn get_all_nymd_gateway_delegations_of_owner(
-        &self,
-        delegation_owner: &cosmrs::AccountId,
-    ) -> Result<Vec<mixnet_contract::Delegation>, ValidatorClientError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        let mut delegations = Vec::new();
-        for node_identity in self
-            .get_all_nymd_reverse_gateway_delegations(delegation_owner)
-            .await?
-        {
-            let delegation = self
-                .nymd
-                .get_gateway_delegation(node_identity, delegation_owner)
-                .await?;
-            delegations.push(delegation);
-        }
-
-        Ok(delegations)
-    }
-
    pub async fn blind_sign(
        &self,
        request_body: &BlindSignRequestBody,
@@ -516,12 +368,6 @@ impl ApiClient {
        Ok(self.validator_api.get_active_mixnodes().await?)
    }

-    pub async fn get_cached_active_gateways(
-        &self,
-    ) -> Result<Vec<GatewayBond>, ValidatorClientError> {
-        Ok(self.validator_api.get_active_gateways().await?)
-    }
-
    pub async fn get_cached_mixnodes(&self) -> Result<Vec<MixNodeBond>, ValidatorClientError> {
        Ok(self.validator_api.get_mixnodes().await?)
    }
@@ -22,7 +22,7 @@ use cosmrs::rpc::query::Query;
 use cosmrs::rpc::{self, HttpClient, Order};
 use cosmrs::tendermint::abci::Transaction;
 use cosmrs::tendermint::{abci, block, chain};
-use cosmrs::{AccountId, Coin, Denom};
+use cosmrs::{tx, AccountId, Coin, Denom};
 use prost::Message;
 use serde::{Deserialize, Serialize};
 use std::convert::{TryFrom, TryInto};
@@ -153,12 +153,9 @@ pub trait CosmWasmClient: rpc::Client {
            .map_err(|_| NymdError::SerializationError("Coins".to_owned()))
    }

-    // disabled until https://github.com/tendermint/tendermint/issues/6802
-    // and consequently https://github.com/informalsystems/tendermint-rs/issues/942 is resolved
-    //
-    // async fn get_tx(&self, id: tx::Hash) -> Result<TxResponse, NymdError> {
-    //     Ok(self.tx(id, false).await?)
-    // }
+    async fn get_tx(&self, id: tx::Hash) -> Result<TxResponse, NymdError> {
+        Ok(self.tx(id, false).await?)
+    }

    async fn search_tx(&self, query: Query) -> Result<Vec<TxResponse>, NymdError> {
        // according to https://docs.tendermint.com/master/rpc/#/Info/tx_search
@@ -13,8 +13,8 @@ use cosmrs::distribution::MsgWithdrawDelegatorReward;
 use cosmrs::rpc::endpoint::broadcast;
 use cosmrs::rpc::{Error as TendermintRpcError, HttpClient, HttpClientUrl, SimpleRequest};
 use cosmrs::staking::{MsgDelegate, MsgUndelegate};
-use cosmrs::tx::{Fee, Msg, MsgType, SignDoc, SignerInfo};
-use cosmrs::{cosmwasm, rpc, tx, AccountId, Coin};
+use cosmrs::tx::{Fee, Msg, SignDoc, SignerInfo};
+use cosmrs::{cosmwasm, rpc, tx, AccountId, Any, Coin};
 use log::debug;
 use serde::Serialize;
 use sha2::Digest;
@@ -52,7 +52,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
                .unwrap_or_default(),
            instantiate_permission: Default::default(),
        }
-        .to_msg()
+        .to_any()
        .map_err(|_| NymdError::SerializationError("MsgStoreCode".to_owned()))?;

        let tx_res = self
@@ -114,7 +114,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
            init_msg: serde_json::to_vec(msg)?,
            funds: options.map(|options| options.funds).unwrap_or_default(),
        }
-        .to_msg()
+        .to_any()
        .map_err(|_| NymdError::SerializationError("MsgInstantiateContract".to_owned()))?;

        let tx_res = self
@@ -154,7 +154,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
            new_admin: new_admin.clone(),
            contract: contract_address.clone(),
        }
-        .to_msg()
+        .to_any()
        .map_err(|_| NymdError::SerializationError("MsgUpdateAdmin".to_owned()))?;

        let tx_res = self
@@ -179,7 +179,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
            sender: sender_address.clone(),
            contract: contract_address.clone(),
        }
-        .to_msg()
+        .to_any()
        .map_err(|_| NymdError::SerializationError("MsgClearAdmin".to_owned()))?;

        let tx_res = self
@@ -211,7 +211,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
            code_id,
            migrate_msg: serde_json::to_vec(msg)?,
        }
-        .to_msg()
+        .to_any()
        .map_err(|_| NymdError::SerializationError("MsgMigrateContract".to_owned()))?;

        let tx_res = self
@@ -243,7 +243,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
            msg: serde_json::to_vec(msg)?,
            funds,
        }
-        .to_msg()
+        .to_any()
        .map_err(|_| NymdError::SerializationError("MsgExecuteContract".to_owned()))?;

        let tx_res = self
@@ -278,7 +278,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
                    msg: serde_json::to_vec(&msg)?,
                    funds,
                }
-                .to_msg()
+                .to_any()
                .map_err(|_| NymdError::SerializationError("MsgExecuteContract".to_owned()))
            })
            .collect::<Result<_, _>>()?;
@@ -312,7 +312,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
            to_address: recipient_address.clone(),
            amount,
        }
-        .to_msg()
+        .to_any()
        .map_err(|_| NymdError::SerializationError("MsgSend".to_owned()))?;

        self.sign_and_broadcast_commit(sender_address, vec![send_msg], fee, memo)
@@ -332,7 +332,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
            validator_address: validator_address.to_owned(),
            amount,
        }
-        .to_msg()
+        .to_any()
        .map_err(|_| NymdError::SerializationError("MsgDelegate".to_owned()))?;

        self.sign_and_broadcast_commit(delegator_address, vec![delegate_msg], fee, memo)
@@ -352,7 +352,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
            validator_address: validator_address.to_owned(),
            amount: Some(amount),
        }
-        .to_msg()
+        .to_any()
        .map_err(|_| NymdError::SerializationError("MsgUndelegate".to_owned()))?;

        self.sign_and_broadcast_commit(delegator_address, vec![undelegate_msg], fee, memo)
@@ -370,7 +370,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
            delegator_address: delegator_address.to_owned(),
            validator_address: validator_address.to_owned(),
        }
-        .to_msg()
+        .to_any()
        .map_err(|_| NymdError::SerializationError("MsgWithdrawDelegatorReward".to_owned()))?;

        self.sign_and_broadcast_commit(delegator_address, vec![withdraw_msg], fee, memo)
@@ -381,7 +381,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
    async fn sign_and_broadcast_async(
        &self,
        signer_address: &AccountId,
-        messages: Vec<Msg>,
+        messages: Vec<Any>,
        fee: Fee,
        memo: impl Into<String> + Send + 'static,
    ) -> Result<broadcast::tx_async::Response, NymdError> {
@@ -397,7 +397,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
    async fn sign_and_broadcast_sync(
        &self,
        signer_address: &AccountId,
-        messages: Vec<Msg>,
+        messages: Vec<Any>,
        fee: Fee,
        memo: impl Into<String> + Send + 'static,
    ) -> Result<broadcast::tx_sync::Response, NymdError> {
@@ -413,7 +413,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
    async fn sign_and_broadcast_commit(
        &self,
        signer_address: &AccountId,
-        messages: Vec<Msg>,
+        messages: Vec<Any>,
        fee: Fee,
        memo: impl Into<String> + Send + 'static,
    ) -> Result<broadcast::tx_commit::Response, NymdError> {
@@ -428,7 +428,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
    fn sign_direct(
        &self,
        signer_address: &AccountId,
-        messages: Vec<Msg>,
+        messages: Vec<Any>,
        fee: Fee,
        memo: impl Into<String> + Send + 'static,
        signer_data: SignerData,
@@ -466,7 +466,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
    async fn sign(
        &self,
        signer_address: &AccountId,
-        messages: Vec<Msg>,
+        messages: Vec<Any>,
        fee: Fee,
        memo: impl Into<String> + Send + 'static,
    ) -> Result<tx::Raw, NymdError> {
@@ -506,7 +506,7 @@ impl Client {

 #[async_trait]
 impl rpc::Client for Client {
-    async fn perform<R>(&self, request: R) -> rpc::Result<R::Response>
+    async fn perform<R>(&self, request: R) -> Result<R::Response, rpc::Error>
    where
        R: SimpleRequest,
    {
@@ -7,7 +7,10 @@ use cosmrs::{bip32, tx, AccountId};
 use std::io;
 use thiserror::Error;

-pub use cosmrs::rpc::error::{Code, Error as TendermintRpcError};
+pub use cosmrs::rpc::error::{
+    Error as TendermintRpcError, ErrorDetail as TendermintRpcErrorDetail,
+};
+pub use cosmrs::rpc::response_error::{Code, ResponseError};

 #[derive(Debug, Error)]
 pub enum NymdError {
@@ -102,17 +105,21 @@ pub enum NymdError {
 }

 impl NymdError {
-    pub fn is_tendermint_timeout(&self) -> bool {
+    pub fn is_tendermint_response_timeout(&self) -> bool {
        match &self {
-            NymdError::TendermintError(tm_err) => {
-                if tm_err.code() == Code::InternalError {
+            NymdError::TendermintError(TendermintRpcError(
+                TendermintRpcErrorDetail::Response(err),
+                _,
+            )) => {
+                let response = &err.source;
+                if response.code() == Code::InternalError {
                    // 0.34 (and earlier) versions of tendermint seemed to be using phrase "timed out waiting ..."
                    // (https://github.com/tendermint/tendermint/blob/v0.34.13/rpc/core/mempool.go#L124)
                    // while 0.35+ has "timeout waiting for ..."
                    // https://github.com/tendermint/tendermint/blob/v0.35.0-rc3/internal/rpc/core/mempool.go#L99
                    // note that as of the time of writing this comment (08.10.2021), the most recent version
                    // of cosmos-sdk (v0.44.1) uses tendermint 0.34.13
-                    if let Some(data) = tm_err.data() {
+                    if let Some(data) = response.data() {
                        data.contains("timed out") || data.contains("timeout")
                    } else {
                        false
@@ -125,14 +132,18 @@ impl NymdError {
        }
    }

-    pub fn is_tendermint_duplicate(&self) -> bool {
+    pub fn is_tendermint_response_duplicate(&self) -> bool {
        match &self {
-            NymdError::TendermintError(tm_err) => {
-                if tm_err.code() == Code::InternalError {
+            NymdError::TendermintError(TendermintRpcError(
+                TendermintRpcErrorDetail::Response(err),
+                _,
+            )) => {
+                let response = &err.source;
+                if response.code() == Code::InternalError {
                    // this particular error message seems to be unchanged between 0.34 and newer versions
                    // https://github.com/tendermint/tendermint/blob/v0.34.13/mempool/errors.go#L10
                    // https://github.com/tendermint/tendermint/blob/v0.35.0-rc3/types/mempool.go#L10
-                    if let Some(data) = tm_err.data() {
+                    if let Some(data) = response.data() {
                        data.contains("tx already exists in cache")
                    } else {
                        false
@@ -11,12 +11,11 @@ use crate::nymd::fee_helpers::Operation;
 use crate::nymd::wallet::DirectSecp256k1HdWallet;
 use cosmrs::rpc::endpoint::broadcast;
 use cosmrs::rpc::{Error as TendermintRpcError, HttpClientUrl};
-use cosmwasm_std::{Coin, Uint128};
+use cosmwasm_std::Coin;
 use mixnet_contract::{
    Addr, Delegation, ExecuteMsg, Gateway, GatewayOwnershipResponse, IdentityKey,
    LayerDistribution, MixNode, MixOwnershipResponse, PagedAllDelegationsResponse,
-    PagedGatewayDelegationsResponse, PagedGatewayResponse, PagedMixDelegationsResponse,
-    PagedMixnodeResponse, PagedReverseGatewayDelegationsResponse,
+    PagedGatewayResponse, PagedMixDelegationsResponse, PagedMixnodeResponse,
    PagedReverseMixDelegationsResponse, QueryMsg, RawDelegationData, StateParams,
 };
 use serde::Serialize;
@@ -212,46 +211,6 @@ impl<C> NymdClient<C> {
            .await
    }

-    pub async fn get_reward_pool(&self) -> Result<Uint128, NymdError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        let request = QueryMsg::GetRewardPool {};
-        self.client
-            .query_contract_smart(self.contract_address()?, &request)
-            .await
-    }
-
-    pub async fn get_circulating_supply(&self) -> Result<Uint128, NymdError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        let request = QueryMsg::GetCirculatingSupply {};
-        self.client
-            .query_contract_smart(self.contract_address()?, &request)
-            .await
-    }
-
-    pub async fn get_sybil_resistance_percent(&self) -> Result<u8, NymdError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        let request = QueryMsg::GetSybilResistancePercent {};
-        self.client
-            .query_contract_smart(self.contract_address()?, &request)
-            .await
-    }
-
-    pub async fn get_epoch_reward_percent(&self) -> Result<u8, NymdError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        let request = QueryMsg::GetEpochRewardPercent {};
-        self.client
-            .query_contract_smart(self.contract_address()?, &request)
-            .await
-    }
-
    /// Checks whether there is a bonded mixnode associated with the provided client's address
    pub async fn owns_mixnode(&self, address: &AccountId) -> Result<bool, NymdError>
    where
@@ -394,82 +353,6 @@ impl<C> NymdClient<C> {
            .await
    }

-    /// Gets list of all delegations towards particular gateway on particular page.
-    pub async fn get_gateway_delegations(
-        &self,
-        gateway_identity: IdentityKey,
-        start_after: Option<Addr>,
-        page_limit: Option<u32>,
-    ) -> Result<PagedGatewayDelegationsResponse, NymdError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        let request = QueryMsg::GetGatewayDelegations {
-            gateway_identity,
-            start_after,
-            limit: page_limit,
-        };
-        self.client
-            .query_contract_smart(self.contract_address()?, &request)
-            .await
-    }
-
-    /// Gets list of all gateway delegations on particular page.
-    pub async fn get_all_gateway_delegations(
-        &self,
-        start_after: Option<Vec<u8>>,
-        page_limit: Option<u32>,
-    ) -> Result<PagedAllDelegationsResponse<RawDelegationData>, NymdError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        let request = QueryMsg::GetAllGatewayDelegations {
-            start_after,
-            limit: page_limit,
-        };
-        self.client
-            .query_contract_smart(self.contract_address()?, &request)
-            .await
-    }
-
-    /// Gets list of all the gateways on which a particular address delegated.
-    pub async fn get_reverse_gateway_delegations_paged(
-        &self,
-        delegation_owner: Addr,
-        start_after: Option<IdentityKey>,
-        page_limit: Option<u32>,
-    ) -> Result<PagedReverseGatewayDelegationsResponse, NymdError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        let request = QueryMsg::GetReverseGatewayDelegations {
-            delegation_owner,
-            start_after,
-            limit: page_limit,
-        };
-        self.client
-            .query_contract_smart(self.contract_address()?, &request)
-            .await
-    }
-
-    /// Checks value of delegation of given client towards particular gateway.
-    pub async fn get_gateway_delegation(
-        &self,
-        gateway_identity: IdentityKey,
-        delegator: &AccountId,
-    ) -> Result<Delegation, NymdError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        let request = QueryMsg::GetGatewayDelegation {
-            gateway_identity,
-            address: Addr::unchecked(delegator.as_ref()),
-        };
-        self.client
-            .query_contract_smart(self.contract_address()?, &request)
-            .await
-    }
-
    /// Send funds from one address to another
    pub async fn send(
        &self,
@@ -738,57 +621,6 @@ impl<C> NymdClient<C> {
            .await
    }

-    /// Delegates specified amount of stake to particular gateway.
-    pub async fn delegate_to_gateway(
-        &self,
-        gateway_identity: &str,
-        amount: &Coin,
-    ) -> Result<ExecuteResult, NymdError>
-    where
-        C: SigningCosmWasmClient + Sync,
-    {
-        let fee = self.get_fee(Operation::DelegateToGateway);
-
-        let req = ExecuteMsg::DelegateToGateway {
-            gateway_identity: gateway_identity.to_string(),
-        };
-        self.client
-            .execute(
-                self.address(),
-                self.contract_address()?,
-                &req,
-                fee,
-                "Delegating to gateway from rust!",
-                vec![cosmwasm_coin_ptr_to_cosmos_coin(amount)],
-            )
-            .await
-    }
-
-    /// Removes stake delegation from a particular gateway.
-    pub async fn remove_gateway_delegation(
-        &self,
-        gateway_identity: &str,
-    ) -> Result<ExecuteResult, NymdError>
-    where
-        C: SigningCosmWasmClient + Sync,
-    {
-        let fee = self.get_fee(Operation::UndelegateFromGateway);
-
-        let req = ExecuteMsg::UndelegateFromGateway {
-            gateway_identity: gateway_identity.to_string(),
-        };
-        self.client
-            .execute(
-                self.address(),
-                self.contract_address()?,
-                &req,
-                fee,
-                "Removing gateway delegation from rust!",
-                Vec::new(),
-            )
-            .await
-    }
-
    pub async fn update_state_params(
        &self,
        new_params: StateParams,
@@ -73,11 +73,6 @@ impl Client {
            .await
    }

-    pub async fn get_active_gateways(&self) -> Result<Vec<GatewayBond>, ValidatorAPIError> {
-        self.query_validator_api(&[routes::API_VERSION, routes::GATEWAYS, routes::ACTIVE])
-            .await
-    }
-
    pub async fn blind_sign(
        &self,
        request_body: &BlindSignRequestBody,
@@ -8,18 +8,10 @@ edition = "2018"

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

 serde = { version = "1.0", features = ["derive"] }
 serde_repr = "0.1"
 schemars = "0.8"
-ts-rs = { version = "3.0", optional = true }
-thiserror = "1.0"
-network-defaults = { path = "../network-defaults" }
-fixed = "1.1"
-az = "1.1"
-log = "0.4.14"
-
-[features]
-default = ["ts-rs"]
+ts-rs = "3.0"
@@ -120,48 +120,6 @@ impl PagedReverseMixDelegationsResponse {
    }
 }

-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
-pub struct PagedGatewayDelegationsResponse {
-    pub node_identity: IdentityKey,
-    pub delegations: Vec<Delegation>,
-    pub start_next_after: Option<Addr>,
-}
-
-impl PagedGatewayDelegationsResponse {
-    pub fn new(
-        node_identity: IdentityKey,
-        delegations: Vec<Delegation>,
-        start_next_after: Option<Addr>,
-    ) -> Self {
-        PagedGatewayDelegationsResponse {
-            node_identity,
-            delegations,
-            start_next_after,
-        }
-    }
-}
-
-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
-pub struct PagedReverseGatewayDelegationsResponse {
-    pub delegation_owner: Addr,
-    pub delegated_nodes: Vec<IdentityKey>,
-    pub start_next_after: Option<IdentityKey>,
-}
-
-impl PagedReverseGatewayDelegationsResponse {
-    pub fn new(
-        delegation_owner: Addr,
-        delegated_nodes: Vec<IdentityKey>,
-        start_next_after: Option<IdentityKey>,
-    ) -> Self {
-        PagedReverseGatewayDelegationsResponse {
-            delegation_owner,
-            delegated_nodes,
-            start_next_after,
-        }
-    }
-}
-
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct PagedAllDelegationsResponse<T> {
    pub delegations: Vec<UnpackedDelegation<T>>,
@@ -1,9 +0,0 @@
-use thiserror::Error;
-
-#[derive(Error, Debug, PartialEq)]
-pub enum MixnetContractError {
-    #[error("Overflow Error")]
-    OverflowError(#[from] cosmwasm_std::OverflowError),
-    #[error("reward_blockstamp field not set, set_reward_blockstamp must be called before attempting to issue rewards")]
-    BlockstampNotSet,
-}
@@ -2,16 +2,14 @@
 #![allow(clippy::field_reassign_with_default)]

 use crate::{IdentityKey, SphinxKey};
-use cosmwasm_std::{coin, Addr, Coin};
+use cosmwasm_std::{Addr, Coin};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::cmp::Ordering;
 use std::fmt::Display;
+use ts_rs::TS;

-use crate::current_block_height;
-
-#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
-#[derive(Clone, Debug, Deserialize, PartialEq, PartialOrd, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, PartialOrd, Serialize, JsonSchema, TS)]
 pub struct Gateway {
    pub host: String,
    pub mix_port: u16,
@@ -26,9 +24,7 @@ pub struct Gateway {
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct GatewayBond {
    pub bond_amount: Coin,
-    pub total_delegation: Coin,
    pub owner: Addr,
-    #[serde(default = "current_block_height")]
    pub block_height: u64,
    pub gateway: Gateway,
 }
@@ -36,7 +32,6 @@ pub struct GatewayBond {
 impl GatewayBond {
    pub fn new(bond_amount: Coin, owner: Addr, block_height: u64, gateway: Gateway) -> Self {
        GatewayBond {
-            total_delegation: coin(0, &bond_amount.denom),
            bond_amount,
            owner,
            block_height,
@@ -59,36 +54,16 @@ impl GatewayBond {
    pub fn gateway(&self) -> &Gateway {
        &self.gateway
    }
-
-    pub fn total_delegation(&self) -> Coin {
-        self.total_delegation.clone()
-    }
 }

 impl PartialOrd for GatewayBond {
    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
        // first remove invalid cases
-        if self.bond_amount.denom != self.total_delegation.denom {
-            return None;
-        }
-
-        if other.bond_amount.denom != other.total_delegation.denom {
-            return None;
-        }
-
        if self.bond_amount.denom != other.bond_amount.denom {
            return None;
        }

-        // try to order by total bond + delegation
-        let total_cmp = (self.bond_amount.amount + self.total_delegation.amount)
-            .partial_cmp(&(self.bond_amount.amount + self.total_delegation.amount))?;
-
-        if total_cmp != Ordering::Equal {
-            return Some(total_cmp);
-        }
-
-        // then if those are equal, prefer higher bond over delegation
+        // try to order by total bond
        let bond_cmp = self
            .bond_amount
            .amount
@@ -97,15 +72,6 @@ impl PartialOrd for GatewayBond {
            return Some(bond_cmp);
        }

-        // then look at delegation (I'm not sure we can get here, but better safe than sorry)
-        let delegation_cmp = self
-            .total_delegation
-            .amount
-            .partial_cmp(&other.total_delegation.amount)?;
-        if delegation_cmp != Ordering::Equal {
-            return Some(delegation_cmp);
-        }
-
        // then check block height
        let height_cmp = self.block_height.partial_cmp(&other.block_height)?;
        if height_cmp != Ordering::Equal {
@@ -179,20 +145,19 @@ mod tests {
    #[test]
    fn gateway_bond_partial_ord() {
        let _150foos = Coin::new(150, "foo");
+        let _140foos = Coin::new(140, "foo");
        let _50foos = Coin::new(50, "foo");
        let _0foos = Coin::new(0, "foo");

        let gate1 = GatewayBond {
            bond_amount: _150foos.clone(),
-            total_delegation: _50foos.clone(),
            owner: Addr::unchecked("foo1"),
            block_height: 100,
            gateway: gateway_fixture(),
        };

        let gate2 = GatewayBond {
-            bond_amount: _150foos.clone(),
-            total_delegation: _50foos.clone(),
+            bond_amount: _150foos,
            owner: Addr::unchecked("foo2"),
            block_height: 120,
            gateway: gateway_fixture(),
@@ -200,15 +165,13 @@ mod tests {

        let gate3 = GatewayBond {
            bond_amount: _50foos,
-            total_delegation: _150foos.clone(),
            owner: Addr::unchecked("foo3"),
            block_height: 120,
            gateway: gateway_fixture(),
        };

        let gate4 = GatewayBond {
-            bond_amount: _150foos.clone(),
-            total_delegation: _0foos.clone(),
+            bond_amount: _140foos,
            owner: Addr::unchecked("foo4"),
            block_height: 120,
            gateway: gateway_fixture(),
@@ -216,21 +179,19 @@ mod tests {

        let gate5 = GatewayBond {
            bond_amount: _0foos,
-            total_delegation: _150foos,
            owner: Addr::unchecked("foo5"),
            block_height: 120,
            gateway: gateway_fixture(),
        };

        // summary:
-        // gate1: 150bond + 50delegation, foo1, 100
-        // gate2: 150bond + 50delegation, foo2, 120
-        // gate3: 50bond + 150delegation, foo3, 120
-        // gate4: 150bond + 0delegation, foo4, 120
-        // gate5: 0bond + 150delegation, foo5, 120
+        // gate1: 150bond, foo1, 100
+        // gate2: 150bond, foo2, 120
+        // gate3: 50bond, foo3, 120
+        // gate4: 140bond, foo4, 120
+        // gate5: 0bond, foo5, 120

-        // highest total bond+delegation is used
-        // then bond followed by delegation
+        // highest total bond is used
        // finally just the rest of the fields

        // gate1 has higher total than gate4 or gate5
@@ -2,26 +2,17 @@
 // SPDX-License-Identifier: Apache-2.0

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

 pub use cosmwasm_std::{Addr, Coin};
 pub use delegation::{
-    Delegation, PagedAllDelegationsResponse, PagedGatewayDelegationsResponse,
-    PagedMixDelegationsResponse, PagedReverseGatewayDelegationsResponse,
+    Delegation, PagedAllDelegationsResponse, PagedMixDelegationsResponse,
    PagedReverseMixDelegationsResponse, RawDelegationData, UnpackedDelegation,
 };
 pub use gateway::{Gateway, GatewayBond, GatewayOwnershipResponse, PagedGatewayResponse};
 pub use mixnode::{Layer, MixNode, MixNodeBond, MixOwnershipResponse, PagedMixnodeResponse};
 pub use msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
 pub use types::{IdentityKey, IdentityKeyRef, LayerDistribution, SphinxKey, StateParams};
-
-use std::sync::atomic::{AtomicU64, Ordering};
-pub static CURRENT_BLOCK_HEIGHT: AtomicU64 = AtomicU64::new(0);
-
-pub fn current_block_height() -> u64 {
-    CURRENT_BLOCK_HEIGHT.load(Ordering::Relaxed)
-}
@@ -2,22 +2,15 @@
 #![allow(clippy::field_reassign_with_default)]

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

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

 #[derive(
-    Copy, Clone, Debug, Serialize_repr, PartialEq, PartialOrd, Deserialize_repr, JsonSchema,
+    Copy,
+    Clone,
+    Debug,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Hash,
+    Serialize_repr,
+    Deserialize_repr,
+    JsonSchema,
 )]
 #[repr(u8)]
 pub enum Layer {
@@ -40,111 +43,14 @@ pub enum Layer {
    Three = 3,
 }

-#[derive(Debug, Clone, JsonSchema, PartialEq, Serialize, Deserialize, Copy)]
-pub struct NodeRewardParams {
-    period_reward_pool: Uint128,
-    k: Uint128,
-    total_epoch_uptime: Uint128,
-    #[serde(default = "current_block_height")]
-    reward_blockstamp: u64,
-    circulating_supply: Uint128,
-    uptime: Uint128,
-    sybil_resistance_percent: u8,
-}
-
-impl NodeRewardParams {
-    pub fn new(
-        period_reward_pool: u128,
-        k: u128,
-        total_epoch_uptime: u128,
-        reward_blockstamp: u64,
-        circulating_supply: u128,
-        uptime: u128,
-        sybil_resistance_percent: u8,
-    ) -> NodeRewardParams {
-        NodeRewardParams {
-            period_reward_pool: Uint128(period_reward_pool),
-            k: Uint128(k),
-            total_epoch_uptime: Uint128(total_epoch_uptime),
-            reward_blockstamp,
-            circulating_supply: Uint128(circulating_supply),
-            uptime: Uint128(uptime),
-            sybil_resistance_percent,
-        }
-    }
-
-    pub fn performance(&self) -> U128 {
-        U128::from_num(self.uptime.u128()) / U128::from_num(100)
-    }
-
-    pub fn operator_cost(&self) -> U128 {
-        U128::from_num(self.uptime.u128() / 100u128 * DEFAULT_OPERATOR_EPOCH_COST as u128)
-    }
-
-    pub fn set_reward_blockstamp(&mut self, blockstamp: u64) {
-        self.reward_blockstamp = blockstamp;
-    }
-
-    pub fn period_reward_pool(&self) -> u128 {
-        self.period_reward_pool.u128()
-    }
-
-    pub fn k(&self) -> u128 {
-        self.k.u128()
-    }
-
-    pub fn circulating_supply(&self) -> u128 {
-        self.circulating_supply.u128()
-    }
-
-    pub fn reward_blockstamp(&self) -> u64 {
-        self.reward_blockstamp
-    }
-
-    pub fn uptime(&self) -> u128 {
-        self.uptime.u128()
-    }
-
-    pub fn one_over_k(&self) -> U128 {
-        U128::from_num(1) / U128::from_num(self.k.u128())
-    }
-
-    pub fn alpha(&self) -> U128 {
-        U128::from_num(self.sybil_resistance_percent) / U128::from_num(100)
-    }
-}
-
-#[derive(Debug)]
-pub struct NodeRewardResult {
-    reward: U128,
-    lambda: U128,
-    sigma: U128,
-}
-
-impl NodeRewardResult {
-    pub fn reward(&self) -> U128 {
-        self.reward
-    }
-
-    pub fn lambda(&self) -> U128 {
-        self.lambda
-    }
-
-    pub fn sigma(&self) -> U128 {
-        self.sigma
-    }
-}
-
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct MixNodeBond {
    pub bond_amount: Coin,
    pub total_delegation: Coin,
    pub owner: Addr,
    pub layer: Layer,
-    #[serde(default = "current_block_height")]
    pub block_height: u64,
    pub mix_node: MixNode,
-    pub profit_margin_percent: Option<u8>,
 }

 impl MixNodeBond {
@@ -154,7 +60,6 @@ impl MixNodeBond {
        layer: Layer,
        block_height: u64,
        mix_node: MixNode,
-        profit_margin_percent: Option<u8>,
    ) -> Self {
        MixNodeBond {
            total_delegation: coin(0, &bond_amount.denom),
@@ -163,14 +68,9 @@ impl MixNodeBond {
            layer,
            block_height,
            mix_node,
-            profit_margin_percent,
        }
    }

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

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

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

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

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

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

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

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

-    DelegateToGateway {
-        gateway_identity: IdentityKey,
-    },
-
-    UndelegateFromGateway {
-        gateway_identity: IdentityKey,
-    },
-
    RewardMixnode {
        identity: IdentityKey,
        // percentage value in range 0-100
        uptime: u32,
    },
-
-    RewardMixnodeV2 {
-        identity: IdentityKey,
-        // percentage value in range 0-100
-        params: NodeRewardParams,
-    },
-
-    RewardGateway {
-        identity: IdentityKey,
-        // percentage value in range 0-100
-        uptime: u32,
-    },
 }

 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
@@ -95,29 +74,7 @@ pub enum QueryMsg {
        mix_identity: IdentityKey,
        address: Addr,
    },
-    GetGatewayDelegations {
-        gateway_identity: IdentityKey,
-        start_after: Option<Addr>,
-        limit: Option<u32>,
-    },
-    GetAllGatewayDelegations {
-        start_after: Option<Vec<u8>>,
-        limit: Option<u32>,
-    },
-    GetReverseGatewayDelegations {
-        delegation_owner: Addr,
-        start_after: Option<IdentityKey>,
-        limit: Option<u32>,
-    },
-    GetGatewayDelegation {
-        gateway_identity: IdentityKey,
-        address: Addr,
-    },
    LayerDistribution {},
-    GetRewardPool {},
-    GetCirculatingSupply {},
-    GetEpochRewardPercent {},
-    GetSybilResistancePercent {},
 }

 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
@@ -32,12 +32,10 @@ pub struct StateParams {

    pub minimum_mixnode_bond: Uint128, // minimum amount a mixnode must bond to get into the system
    pub minimum_gateway_bond: Uint128, // minimum amount a gateway must bond to get into the system
+
    pub mixnode_bond_reward_rate: Decimal, // annual reward rate, expressed as a decimal like 1.25
-    pub gateway_bond_reward_rate: Decimal, // annual reward rate, expressed as a decimal like 1.25
    pub mixnode_delegation_reward_rate: Decimal, // annual reward rate, expressed as a decimal like 1.25
-    pub gateway_delegation_reward_rate: Decimal, // annual reward rate, expressed as a decimal like 1.25
    pub mixnode_active_set_size: u32,
-    pub gateway_active_set_size: u32,
 }

 impl Display for StateParams {
@@ -51,30 +49,15 @@ impl Display for StateParams {
            "mixnode bond reward rate: {}; ",
            self.mixnode_bond_reward_rate
        )?;
-        write!(
-            f,
-            "gateway bond reward rate: {}; ",
-            self.gateway_bond_reward_rate
-        )?;
        write!(
            f,
            "mixnode delegation reward rate: {}; ",
            self.mixnode_delegation_reward_rate
        )?;
-        write!(
-            f,
-            "gateway delegation reward rate: {}; ",
-            self.gateway_delegation_reward_rate
-        )?;
        write!(
            f,
            "mixnode active set size: {}",
            self.mixnode_active_set_size
-        )?;
-        write!(
-            f,
-            "gateway active set size: {} ]",
-            self.gateway_active_set_size
        )
    }
 }
@@ -93,11 +93,4 @@ pub const VALIDATOR_API_VERSION: &str = "v1";

 // REWARDING
 pub const DEFAULT_FIRST_EPOCH_START: OffsetDateTime = time::macros::datetime!(2021-08-23 12:00 UTC);
-pub const DEFAULT_EPOCH_LENGTH: Duration = Duration::from_secs(24 * 60 * 60 * 30); // 30 days
-/// We'll be assuming a few more things, profit margin and cost function. Since we don't have relialable package measurement, we'll be using uptime. We'll also set the value of 1 Nym to 1 $, to be able to translate epoch costs to Nyms. We'll also assume a cost of 40$ per epoch(month), converting that to Nym at our 1$ rate translates to 40_000_000 uNyms
-pub const DEFAULT_OPERATOR_EPOCH_COST: u64 = 40_000_000; // 40$/(30 days) at 1 Nym == 1$
-
-// TODO: is there a way to get this from the chain
-pub const TOTAL_SUPPLY: u128 = 1_000_000_000_000_000;
-
-pub const DEFAULT_PROFIT_MARGIN: u8 = 10;
+pub const DEFAULT_EPOCH_LENGTH: Duration = Duration::from_secs(24 * 60 * 60); // 24h
@@ -268,7 +268,6 @@ mod message_receiver {
            vec![gateway::Node {
                owner: "foomp4".to_string(),
                stake: 123,
-                delegation: 456,
                location: "unknown".to_string(),
                host: "1.2.3.4".parse().unwrap(),
                mix_host: "1.2.3.4:1789".parse().unwrap(),
@@ -72,7 +72,6 @@ pub struct Node {
    // somebody correct me if I'm wrong, but we should only ever have a single denom of currency
    // on the network at a type, right?
    pub stake: u128,
-    pub delegation: u128,
    pub location: String,
    pub host: NetworkAddress,
    // we're keeping this as separate resolved field since we do not want to be resolving the potential
@@ -127,7 +126,6 @@ impl<'a> TryFrom<&'a GatewayBond> for Node {
        Ok(Node {
            owner: bond.owner.as_str().to_owned(),
            stake: bond.bond_amount.amount.into(),
-            delegation: bond.total_delegation.amount.into(),
            location: bond.gateway.location.clone(),
            host,
            mix_host,
@@ -1 +0,0 @@
-.envrc
@@ -23,9 +23,9 @@ dependencies = [

 [[package]]
 name = "ast_node"
-version = "0.7.4"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96d5444b02f3080edac8a144f6baf29b2fb6ff589ad4311559731a7c7529381"
+checksum = "f93f52ce8fac3d0e6720a92b0576d737c01b1b5db4dd786e962e5925f00bf755"
 dependencies = [
 "darling",
 "pmutil",
@@ -41,24 +41,12 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"

-[[package]]
-name = "az"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d6dff4a1892b54d70af377bf7a17064192e822865791d812957f21e3108c325"
-
 [[package]]
 name = "base64"
 version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"

-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
 [[package]]
 name = "block-buffer"
 version = "0.7.3"
@@ -91,9 +79,9 @@ dependencies = [

 [[package]]
 name = "bumpalo"
-version = "3.8.0"
+version = "3.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c"
+checksum = "d9df67f7bf9ef8498769f994239c45613ef0c5899415fb58e9add412d2c1a538"

 [[package]]
 name = "byte-tools"
@@ -101,12 +89,6 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"

-[[package]]
-name = "bytemuck"
-version = "1.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72957246c41db82b8ef88a5486143830adeb8227ef9837740bdec67724cf2c5b"
-
 [[package]]
 name = "byteorder"
 version = "1.4.3"
@@ -139,9 +121,9 @@ dependencies = [

 [[package]]
 name = "const-oid"
-version = "0.6.2"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d6f2aa4d0537bcc1c74df8755072bd31c1ef1a3a1b85a68e8404a8c353b7b8b"
+checksum = "44c32f031ea41b4291d695026c023b95d59db2d8a2c7640800ed56bc8f510f22"

 [[package]]
 name = "cosmwasm-crypto"
@@ -165,9 +147,9 @@ dependencies = [

 [[package]]
 name = "cosmwasm-schema"
-version = "0.14.1"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04159eec9b583671db7923ff2b979736dfb8f0152347cab9fd02373c22e1a870"
+checksum = "d6a9a6a4ca3b4d7b56f943312a65857cdfc84424f9c2773889f4cd17f36fba61"
 dependencies = [
 "schemars",
 "serde_json",
@@ -199,9 +181,9 @@ dependencies = [

 [[package]]
 name = "cpufeatures"
-version = "0.2.1"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469"
+checksum = "ed00c67cb5d0a7d64a44f6ad2668db7e7530311dd53ea79bcd4fb022c64911c8"
 dependencies = [
 "libc",
 ]
@@ -214,9 +196,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"

 [[package]]
 name = "crypto-bigint"
-version = "0.2.11"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f83bd3bb4314701c568e340cd8cf78c975aa0ca79e03d3f6d1677d5b0c9c0c03"
+checksum = "b32a398eb1ccfbe7e4f452bc749c44d38dd732e9a253f19da224c416f00ee7f4"
 dependencies = [
 "generic-array 0.14.4",
 "rand_core 0.6.3",
@@ -236,9 +218,9 @@ dependencies = [

 [[package]]
 name = "curve25519-dalek"
-version = "3.2.0"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61"
+checksum = "639891fde0dbea823fc3d798a0fdf9d2f9440a42d64a78ab3488b0ca025117b3"
 dependencies = [
 "byteorder",
 "digest 0.9.0",
@@ -284,9 +266,9 @@ dependencies = [

 [[package]]
 name = "der"
-version = "0.4.4"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28e98c534e9c8a0483aa01d6f6913bc063de254311bd267c9cf535e9b70e15b2"
+checksum = "49f215f706081a44cb702c71c39a52c05da637822e9c1645a50b7202689e982d"
 dependencies = [
 "const-oid",
 ]
@@ -356,9 +338,9 @@ checksum = "ee2626afccd7561a06cf1367e2950c4718ea04565e20fb5029b6c7d8ad09abcf"

 [[package]]
 name = "ecdsa"
-version = "0.12.4"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43ee23aa5b4f68c7a092b5c3beb25f50c406adc75e2363634f242f28ab255372"
+checksum = "713c32426287891008edb98f8b5c6abb2130aa043c93a818728fcda78606f274"
 dependencies = [
 "der",
 "elliptic-curve",
@@ -388,9 +370,9 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"

 [[package]]
 name = "elliptic-curve"
-version = "0.10.6"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "beca177dcb8eb540133e7680baff45e7cc4d93bf22002676cec549f82343721b"
+checksum = "83e5c176479da93a0983f0a6fdc3c1b8e7d5be0d7fe3fe05a99f15b96582b9a8"
 dependencies = [
 "crypto-bigint",
 "ff",
@@ -422,26 +404,14 @@ checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"

 [[package]]
 name = "ff"
-version = "0.10.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0f40b2dcd8bc322217a5f6559ae5f9e9d1de202a2ecee2e9eafcbece7562a4f"
+checksum = "63eec06c61e487eecf0f7e6e6372e596a81922c28d33e645d6983ca6493a1af0"
 dependencies = [
 "rand_core 0.6.3",
 "subtle",
 ]

-[[package]]
-name = "fixed"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d333a26ec13a023c6dff4b7584de4d323cfee2e508f5dd2bbee6669e4f7efdf"
-dependencies = [
- "az",
- "bytemuck",
- "half",
- "typenum",
-]
-
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -531,12 +501,6 @@ dependencies = [
 "subtle",
 ]

-[[package]]
-name = "half"
-version = "1.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
-
 [[package]]
 name = "handlebars"
 version = "3.5.5"
@@ -600,15 +564,6 @@ dependencies = [
 "unicode-normalization",
 ]

-[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
 [[package]]
 name = "is-macro"
 version = "0.1.9"
@@ -624,15 +579,15 @@ dependencies = [

 [[package]]
 name = "itoa"
-version = "0.4.8"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
+checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"

 [[package]]
 name = "k256"
-version = "0.9.6"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "903ae2481bcdfdb7b68e0a9baa4b7c9aff600b9ae2e8e5bb5833b8c91ab851ea"
+checksum = "008b0281ca8032567c9711cd48631781c15228301860a39b32deb28d63125e46"
 dependencies = [
 "cfg-if 1.0.0",
 "ecdsa",
@@ -648,18 +603,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

 [[package]]
 name = "libc"
-version = "0.2.105"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "869d572136620d55835903746bcb5cdc54cb2851fd0aeec53220b4bb65ef3013"
-
-[[package]]
-name = "lock_api"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109"
-dependencies = [
- "scopeguard",
-]
+checksum = "a1fa8cddc8fbbee11227ef194b5317ed014b8acbf15139bd716a18ad3fe99ec5"

 [[package]]
 name = "log"
@@ -678,9 +624,9 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"

 [[package]]
 name = "matches"
-version = "0.1.9"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
+checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"

 [[package]]
 name = "memchr"
@@ -692,15 +638,10 @@ checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
 name = "mixnet-contract"
 version = "0.1.0"
 dependencies = [
- "az",
 "cosmwasm-std",
- "fixed",
- "log",
- "network-defaults",
 "schemars",
 "serde",
 "serde_repr",
- "thiserror",
 "ts-rs",
 ]

@@ -712,7 +653,6 @@ dependencies = [
 "cosmwasm-schema",
 "cosmwasm-std",
 "cosmwasm-storage",
- "fixed",
 "mixnet-contract",
 "schemars",
 "serde",
@@ -792,31 +732,6 @@ dependencies = [
 "stable_deref_trait",
 ]

-[[package]]
-name = "parking_lot"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
-dependencies = [
- "instant",
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
-dependencies = [
- "cfg-if 1.0.0",
- "instant",
- "libc",
- "redox_syscall",
- "smallvec",
- "winapi",
-]
-
 [[package]]
 name = "percent-encoding"
 version = "2.1.0"
@@ -887,9 +802,9 @@ dependencies = [

 [[package]]
 name = "pkcs8"
-version = "0.7.6"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee3ef9b64d26bad0536099c816c6734379e45bbd5f14798def6809e5cc350447"
+checksum = "fbee84ed13e44dd82689fa18348a49934fa79cc774a344c42fc9b301c71b140a"
 dependencies = [
 "der",
 "spki",
@@ -908,9 +823,9 @@ dependencies = [

 [[package]]
 name = "ppv-lite86"
-version = "0.2.15"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba"
+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"

 [[package]]
 name = "precomputed-hash"
@@ -920,9 +835,9 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"

 [[package]]
 name = "proc-macro2"
-version = "1.0.32"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43"
+checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
 dependencies = [
 "unicode-xid",
 ]
@@ -935,9 +850,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"

 [[package]]
 name = "quote"
-version = "1.0.10"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05"
+checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df"
 dependencies = [
 "proc-macro2",
 ]
@@ -1002,15 +917,6 @@ dependencies = [
 "rand_core 0.5.1",
 ]

-[[package]]
-name = "redox_syscall"
-version = "0.2.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
-dependencies = [
- "bitflags",
-]
-
 [[package]]
 name = "regex"
 version = "1.5.4"
@@ -1036,9 +942,9 @@ checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"

 [[package]]
 name = "schemars"
-version = "0.8.6"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7a48d098c2a7fdf5740b19deb1181b4fb8a9e68e03ae517c14cde04b5725409"
+checksum = "bc6ab463ae35acccb5cba66c0084c985257b797d288b6050cc2f6ac1b266cb78"
 dependencies = [
 "dyn-clone",
 "schemars_derive",
@@ -1048,9 +954,9 @@ dependencies = [

 [[package]]
 name = "schemars_derive"
-version = "0.8.6"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a9ea2a613fe4cd7118b2bb101a25d8ae6192e1975179b67b2f17afd11e70ac8"
+checksum = "902fdfbcf871ae8f653bddf4b2c05905ddaabc08f69d32a915787e3be0d31356"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1064,17 +970,11 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"

-[[package]]
-name = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
 [[package]]
 name = "serde"
-version = "1.0.130"
+version = "1.0.122"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913"
+checksum = "974ef1bd2ad8a507599b336595454081ff68a9599b4890af7643c0c0ed73a62c"
 dependencies = [
 "serde_derive",
 ]
@@ -1090,9 +990,9 @@ dependencies = [

 [[package]]
 name = "serde_derive"
-version = "1.0.130"
+version = "1.0.122"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b"
+checksum = "8dee1f300f838c8ac340ecb0112b3ac472464fa67e87292bdb3dfc9c49128e17"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1112,9 +1012,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.68"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8"
+checksum = "4fceb2595057b6891a4ee808f70054bd2d12f0e97f1cbb78689b59f676df325a"
 dependencies = [
 "itoa",
 "ryu",
@@ -1146,9 +1046,9 @@ dependencies = [

 [[package]]
 name = "sha2"
-version = "0.9.8"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa"
+checksum = "b362ae5752fd2137731f9fa25fd4d9058af34666ca1966fb969119cc35719f12"
 dependencies = [
 "block-buffer 0.9.0",
 "cfg-if 1.0.0",
@@ -1159,9 +1059,9 @@ dependencies = [

 [[package]]
 name = "signature"
-version = "1.3.2"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2807892cfa58e081aa1f1111391c7a0649d4fa127a4ffbe34bcbfb35a1171a4"
+checksum = "c19772be3c4dd2ceaacf03cb41d5885f2a02c4d8804884918e3a258480803335"
 dependencies = [
 "digest 0.9.0",
 "rand_core 0.6.3",
@@ -1175,15 +1075,15 @@ checksum = "533494a8f9b724d33625ab53c6c4800f7cc445895924a8ef649222dcb76e938b"

 [[package]]
 name = "smallvec"
-version = "1.7.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309"
+checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"

 [[package]]
 name = "spki"
-version = "0.4.1"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c01a0c15da1b0b0e1494112e7af814a678fec9bd157881b49beac661e9b6f32"
+checksum = "987637c5ae6b3121aba9d513f869bd2bff11c4cc086c22473befd6649c0bd521"
 dependencies = [
 "der",
 ]
@@ -1202,13 +1102,12 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"

 [[package]]
 name = "string_cache"
-version = "0.8.2"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "923f0f39b6267d37d23ce71ae7235602134b250ace715dd2c90421998ddac0c6"
+checksum = "8ddb1139b5353f96e429e1a5e19fbaf663bddedaa06d1dbd49f82e352601209a"
 dependencies = [
 "lazy_static",
 "new_debug_unreachable",
- "parking_lot",
 "phf_shared",
 "precomputed-hash",
 "serde",
@@ -1247,15 +1146,15 @@ checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"

 [[package]]
 name = "subtle"
-version = "2.4.1"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
+checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2"

 [[package]]
 name = "swc_atoms"
-version = "0.2.9"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f5229fe227ff0060e13baa386d6e368797700eab909523f730008d191ee53ae"
+checksum = "837a3ef86c2817228e733b6f173c821fd76f9eb21a0bc9001a826be48b00b4e7"
 dependencies = [
 "string_cache",
 "string_cache_codegen",
@@ -1355,9 +1254,9 @@ dependencies = [

 [[package]]
 name = "swc_macros_common"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf7c68e78ffbcba3d38abe6d0b76a0e1a37888b5c9301db3426537207090ada3"
+checksum = "08ed2e930f5a1a4071fe62c90fd3a296f6030e5d94bfe13993244423caf59a78"
 dependencies = [
 "pmutil",
 "proc-macro2",
@@ -1367,9 +1266,9 @@ dependencies = [

 [[package]]
 name = "swc_visit"
-version = "0.2.8"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8511a4788ab29daf00bee23e425aac92c9be4eec74c98fec4a45d0e710be695"
+checksum = "a423caa0b4585118164dbad8f1ad52b592a9a9370b25decc4d84c6b4309132c0"
 dependencies = [
 "either",
 "swc_visit_macros",
@@ -1391,9 +1290,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "1.0.81"
+version = "1.0.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2afee18b8beb5a596ecb4a2dce128c719b4ba399d34126b9e4396e3f9860966"
+checksum = "f3a1d708c221c5a612956ef9f75b37e454e88d1f7b899fbd3a18d4252012d663"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1402,18 +1301,18 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "1.0.30"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417"
+checksum = "76cc616c6abf8c8928e2fdcc0dbfab37175edd8fb49a4641066ad1364fdab146"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.30"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b"
+checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1422,9 +1321,9 @@ dependencies = [

 [[package]]
 name = "time"
-version = "0.3.4"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99beeb0daeac2bd1e86ac2c21caddecb244b39a093594da1a661ec2060c7aedd"
+checksum = "1a776787d9c5d455bec3db044586ccdd8a9c74d5da5dc319fb80f3db08808fe6"
 dependencies = [
 "libc",
 "time-macros",
@@ -1432,15 +1331,15 @@ dependencies = [

 [[package]]
 name = "time-macros"
-version = "0.2.3"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25eb0ca3468fc0acc11828786797f6ef9aa1555e4a211a60d64cc8e4d1be47d6"
+checksum = "04a153416002296880a3b51329a0e3df31c779c53ec827993e865ce427982843"

 [[package]]
 name = "tinyvec"
-version = "1.5.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f83b2a3d4d9091d0abd7eba4dc2710b1718583bd4d8992e2190720ea38f391f7"
+checksum = "848a1e1181b9f6753b5e96a092749e29b11d19ede67dfbbd6c7dc7e0f49b5338"
 dependencies = [
 "tinyvec_macros",
 ]
@@ -1484,9 +1383,9 @@ dependencies = [

 [[package]]
 name = "typenum"
-version = "1.14.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec"
+checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06"

 [[package]]
 name = "ucd-trie"
@@ -1496,9 +1395,9 @@ checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"

 [[package]]
 name = "uint"
-version = "0.9.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6470ab50f482bde894a037a57064480a246dbfdd5960bd65a44824693f08da5f"
+checksum = "e11fe9a9348741cf134085ad57c249508345fe16411b3d7fb4ff2da2f1d6382e"
 dependencies = [
 "byteorder",
 "crunchy",
@@ -1508,9 +1407,12 @@ dependencies = [

 [[package]]
 name = "unicode-bidi"
-version = "0.3.7"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f"
+checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0"
+dependencies = [
+ "matches",
+]

 [[package]]
 name = "unicode-normalization"
@@ -1529,9 +1431,9 @@ checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"

 [[package]]
 name = "unicode-xid"
-version = "0.2.2"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"

 [[package]]
 name = "url"
@@ -1563,30 +1465,8 @@ version = "0.10.2+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"

-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
 [[package]]
 name = "zeroize"
-version = "1.4.2"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf68b08513768deaa790264a7fac27a58cbf2705cfcdc9448362229217d7e970"
+checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd"
@@ -49,4 +49,3 @@ thiserror = { version = "1.0.23" }

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

-use std::u128;
-
 use crate::helpers::calculate_epoch_reward_rate;
 use crate::state::State;
 use crate::storage::{config, layer_distribution};
@@ -12,7 +10,7 @@ use cosmwasm_std::{
    entry_point, to_binary, Addr, Decimal, Deps, DepsMut, Env, MessageInfo, QueryResponse,
    Response, Uint128,
 };
-use mixnet_contract::{ExecuteMsg, InstantiateMsg, MigrateMsg, MixNode, QueryMsg, StateParams};
+use mixnet_contract::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg, StateParams};

 pub const INITIAL_DEFAULT_EPOCH_LENGTH: u32 = 2;

@@ -24,22 +22,13 @@ pub const INITIAL_MIXNODE_BOND: Uint128 = Uint128(100_000000);

 // percentage annual increase. Given starting value of x, we expect to have 1.1x at the end of the year
 pub const INITIAL_MIXNODE_BOND_REWARD_RATE: u64 = 110;
-pub const INITIAL_GATEWAY_BOND_REWARD_RATE: u64 = 110;
 pub const INITIAL_MIXNODE_DELEGATION_REWARD_RATE: u64 = 110;
-pub const INITIAL_GATEWAY_DELEGATION_REWARD_RATE: u64 = 110;

-pub const INITIAL_MIXNODE_ACTIVE_SET_SIZE: u32 = 5000;
-pub const INITIAL_GATEWAY_ACTIVE_SET_SIZE: u32 = 20;
-
-pub const INITIAL_REWARD_POOL: u128 = 250_000_000_000_000;
-pub const EPOCH_REWARD_PERCENT: u8 = 2; // Used to calculate epoch reward pool
-pub const DEFAULT_SYBIL_RESISTANCE_PERCENT: u8 = 30;
+pub const INITIAL_MIXNODE_ACTIVE_SET_SIZE: u32 = 100;

 fn default_initial_state(owner: Addr) -> State {
    let mixnode_bond_reward_rate = Decimal::percent(INITIAL_MIXNODE_BOND_REWARD_RATE);
-    let gateway_bond_reward_rate = Decimal::percent(INITIAL_GATEWAY_BOND_REWARD_RATE);
    let mixnode_delegation_reward_rate = Decimal::percent(INITIAL_MIXNODE_DELEGATION_REWARD_RATE);
-    let gateway_delegation_reward_rate = Decimal::percent(INITIAL_GATEWAY_DELEGATION_REWARD_RATE);

    State {
        owner,
@@ -49,28 +38,17 @@ fn default_initial_state(owner: Addr) -> State {
            minimum_mixnode_bond: INITIAL_MIXNODE_BOND,
            minimum_gateway_bond: INITIAL_GATEWAY_BOND,
            mixnode_bond_reward_rate,
-            gateway_bond_reward_rate,
            mixnode_delegation_reward_rate,
-            gateway_delegation_reward_rate,
            mixnode_active_set_size: INITIAL_MIXNODE_ACTIVE_SET_SIZE,
-            gateway_active_set_size: INITIAL_GATEWAY_ACTIVE_SET_SIZE,
        },
        mixnode_epoch_bond_reward: calculate_epoch_reward_rate(
            INITIAL_DEFAULT_EPOCH_LENGTH,
            mixnode_bond_reward_rate,
        ),
-        gateway_epoch_bond_reward: calculate_epoch_reward_rate(
-            INITIAL_DEFAULT_EPOCH_LENGTH,
-            gateway_bond_reward_rate,
-        ),
        mixnode_epoch_delegation_reward: calculate_epoch_reward_rate(
            INITIAL_DEFAULT_EPOCH_LENGTH,
            mixnode_delegation_reward_rate,
        ),
-        gateway_epoch_delegation_reward: calculate_epoch_reward_rate(
-            INITIAL_DEFAULT_EPOCH_LENGTH,
-            gateway_delegation_reward_rate,
-        ),
    }
 }

@@ -116,24 +94,12 @@ pub fn execute(
        ExecuteMsg::RewardMixnode { identity, uptime } => {
            transactions::try_reward_mixnode(deps, env, info, identity, uptime)
        }
-        ExecuteMsg::RewardMixnodeV2 { identity, params } => {
-            transactions::try_reward_mixnode_v2(deps, env, info, identity, params)
-        }
-        ExecuteMsg::RewardGateway { identity, uptime } => {
-            transactions::try_reward_gateway(deps, env, info, identity, uptime)
-        }
        ExecuteMsg::DelegateToMixnode { mix_identity } => {
            transactions::try_delegate_to_mixnode(deps, env, info, mix_identity)
        }
        ExecuteMsg::UndelegateFromMixnode { mix_identity } => {
            transactions::try_remove_delegation_from_mixnode(deps, info, mix_identity)
        }
-        ExecuteMsg::DelegateToGateway { gateway_identity } => {
-            transactions::try_delegate_to_gateway(deps, env, info, gateway_identity)
-        }
-        ExecuteMsg::UndelegateFromGateway { gateway_identity } => {
-            transactions::try_remove_delegation_from_gateway(deps, info, gateway_identity)
-        }
    }
 }

@@ -185,87 +151,13 @@ pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> Result<QueryResponse, Cont
            mix_identity,
            address,
        )?),
-        QueryMsg::GetGatewayDelegations {
-            gateway_identity,
-            start_after,
-            limit,
-        } => to_binary(&queries::query_gateway_delegations_paged(
-            deps,
-            gateway_identity,
-            start_after,
-            limit,
-        )?),
-        QueryMsg::GetAllGatewayDelegations { start_after, limit } => to_binary(
-            &queries::query_all_gateway_delegations_paged(deps, start_after, limit)?,
-        ),
-        QueryMsg::GetReverseGatewayDelegations {
-            delegation_owner,
-            start_after,
-            limit,
-        } => to_binary(&queries::query_reverse_gateway_delegations_paged(
-            deps,
-            delegation_owner,
-            start_after,
-            limit,
-        )?),
-        QueryMsg::GetGatewayDelegation {
-            gateway_identity,
-            address,
-        } => to_binary(&queries::query_gateway_delegation(
-            deps,
-            gateway_identity,
-            address,
-        )?),
-        QueryMsg::GetRewardPool {} => to_binary(&queries::query_reward_pool(deps)),
-        QueryMsg::GetCirculatingSupply {} => to_binary(&queries::query_circulating_supply(deps)),
-        QueryMsg::GetEpochRewardPercent {} => to_binary(&EPOCH_REWARD_PERCENT),
-        QueryMsg::GetSybilResistancePercent {} => to_binary(&DEFAULT_SYBIL_RESISTANCE_PERCENT),
    };

    Ok(query_res?)
 }
+
 #[entry_point]
-pub fn migrate(deps: DepsMut, _env: Env, _msg: MigrateMsg) -> Result<Response, ContractError> {
-    use crate::storage::{mixnodes, PREFIX_MIXNODES};
-    use cosmwasm_std::{Coin, Order};
-    use cosmwasm_storage::bucket_read;
-    use mixnet_contract::{Layer, MixNodeBond};
-    use serde::{Deserialize, Serialize};
-    #[derive(Serialize, Deserialize)]
-    struct OldMixNodeBond {
-        pub bond_amount: Coin,
-        pub total_delegation: Coin,
-        pub owner: Addr,
-        pub layer: Layer,
-        pub block_height: u64,
-        pub mix_node: MixNode,
-    }
-
-    impl From<OldMixNodeBond> for MixNodeBond {
-        fn from(o: OldMixNodeBond) -> MixNodeBond {
-            MixNodeBond {
-                bond_amount: o.bond_amount,
-                total_delegation: o.total_delegation,
-                owner: o.owner,
-                layer: o.layer,
-                block_height: o.block_height,
-                mix_node: o.mix_node,
-                profit_margin_percent: Some(10),
-            }
-        }
-    }
-
-    let mixnode_bonds = bucket_read(deps.storage, PREFIX_MIXNODES)
-        .range(None, None, Order::Ascending)
-        .take_while(Result::is_ok)
-        .map(Result::unwrap)
-        .map(|(key, bond): (Vec<u8>, OldMixNodeBond)| (key, bond.into()))
-        .collect::<Vec<(Vec<u8>, MixNodeBond)>>();
-
-    for (key, bond) in mixnode_bonds {
-        mixnodes(deps.storage).save(&key, &bond)?;
-    }
-
+pub fn migrate(_deps: DepsMut, _env: Env, _msg: MigrateMsg) -> Result<Response, ContractError> {
    Ok(Default::default())
 }

@@ -48,15 +48,9 @@ pub enum ContractError {
    #[error("The bond reward rate for mixnode was set to be lower than 1")]
    DecreasingMixnodeBondReward,

-    #[error("The bond reward rate for gateway was set to be lower than 1")]
-    DecreasingGatewayBondReward,
-
    #[error("The delegation reward rate for mixnode was set to be lower than 1")]
    DecreasingMixnodeDelegationReward,

-    #[error("The delegation reward rate for gateway was set to be lower than 1")]
-    DecreasingGatewayDelegationReward,
-
    #[error("The node had uptime larger than 100%")]
    UnexpectedUptime,

@@ -83,16 +77,4 @@ pub enum ContractError {
        identity: IdentityKey,
        address: Addr,
    },
-
-    #[error("Could not find any delegation information associated with gateway {identity} for {address}")]
-    NoGatewayDelegationFound {
-        identity: IdentityKey,
-        address: Addr,
-    },
-
-    #[error("Overflow error!")]
-    Overflow(#[from] cosmwasm_std::OverflowError),
-
-    #[error("Invalid ratio")]
-    Ratio(#[from] mixnet_contract::error::MixnetContractError),
 }
@@ -19,11 +19,11 @@ const DECIMAL_FRACTIONAL: Uint128 = Uint128(1_000_000_000_000_000_000u128);
 // cosmwasm bucket internal value
 const NAMESPACE_LENGTH: usize = 2;

-pub fn decimal_to_uint128(value: Decimal) -> Uint128 {
+fn decimal_to_uint128(value: Decimal) -> Uint128 {
    value * DECIMAL_FRACTIONAL
 }

-pub fn uint128_to_decimal(value: Uint128) -> Decimal {
+fn uint128_to_decimal(value: Uint128) -> Decimal {
    Decimal::from_ratio(value, DECIMAL_FRACTIONAL)
 }

@@ -209,10 +209,7 @@ impl<'a, T: Clone + Serialize + DeserializeOwned> Iterator for Delegations<'a, T
 mod tests {
    use super::*;
    use crate::queries::tests::store_n_mix_delegations;
-    use crate::storage::{
-        all_gateway_delegations_read, all_mix_delegations_read, gateway_delegations,
-        mix_delegations,
-    };
+    use crate::storage::{all_mix_delegations_read, mix_delegations};
    use crate::support::tests::helpers;
    use cosmwasm_std::testing::mock_dependencies;
    use mixnet_contract::RawDelegationData;
@@ -389,66 +386,4 @@ mod tests {
            UnpackedDelegation::new(delegation_owner2, node_identity2, raw_delegation.clone()),
        );
    }
-
-    #[test]
-    fn all_gateway_delegations() {
-        let mut deps = mock_dependencies(&[]);
-        let node_identity1: IdentityKey = "foo1".into();
-        let delegation_owner1 = Addr::unchecked("bar1");
-        let node_identity2: IdentityKey = "foo2".into();
-        let delegation_owner2 = Addr::unchecked("bar2");
-        let raw_delegation = RawDelegationData::new(1000u128.into(), 42);
-        let mut start_after = None;
-
-        gateway_delegations(&mut deps.storage, &node_identity1)
-            .save(delegation_owner1.as_bytes(), &raw_delegation)
-            .unwrap();
-
-        let bucket = all_gateway_delegations_read::<RawDelegationData>(&deps.storage);
-        let response =
-            get_all_delegations_paged::<RawDelegationData>(&bucket, &start_after, 10).unwrap();
-        start_after = response.start_next_after;
-        let delegations = response.delegations;
-        assert_eq!(delegations.len(), 1);
-        assert_eq!(
-            delegations[0],
-            UnpackedDelegation::new(
-                delegation_owner1.clone(),
-                node_identity1.clone(),
-                raw_delegation.clone()
-            )
-        );
-
-        gateway_delegations(&mut deps.storage, &node_identity2)
-            .save(delegation_owner2.as_bytes(), &raw_delegation)
-            .unwrap();
-
-        let bucket = all_gateway_delegations_read::<RawDelegationData>(&deps.storage);
-        let response =
-            get_all_delegations_paged::<RawDelegationData>(&bucket, &start_after, 10).unwrap();
-        start_after = response.start_next_after;
-        let delegations = response.delegations;
-        assert_eq!(delegations.len(), 2);
-        assert_eq!(
-            delegations[1],
-            UnpackedDelegation::new(
-                delegation_owner2.clone(),
-                node_identity2.clone(),
-                raw_delegation.clone()
-            )
-        );
-
-        gateway_delegations(&mut deps.storage, &node_identity1)
-            .remove(delegation_owner1.as_bytes());
-
-        let bucket = all_gateway_delegations_read::<RawDelegationData>(&deps.storage);
-        let response =
-            get_all_delegations_paged::<RawDelegationData>(&bucket, &start_after, 10).unwrap();
-        let delegations = response.delegations;
-        assert_eq!(delegations.len(), 1);
-        assert_eq!(
-            delegations[0],
-            UnpackedDelegation::new(delegation_owner2, node_identity2, raw_delegation.clone()),
-        );
-    }
 }
@@ -4,19 +4,17 @@
 use crate::error::ContractError;
 use crate::helpers::get_all_delegations_paged;
 use crate::storage::{
-    all_gateway_delegations_read, all_mix_delegations_read, circulating_supply,
-    gateway_delegations_read, gateways_owners_read, gateways_read, mix_delegations_read,
+    all_mix_delegations_read, gateways_owners_read, gateways_read, mix_delegations_read,
    mixnodes_owners_read, mixnodes_read, read_layer_distribution, read_state_params,
-    reverse_gateway_delegations_read, reverse_mix_delegations_read, reward_pool_value,
+    reverse_mix_delegations_read,
 };
 use config::defaults::DENOM;
-use cosmwasm_std::{coin, Addr, Deps, Order, StdResult, Uint128};
+use cosmwasm_std::{coin, Addr, Deps, Order, StdResult};
 use mixnet_contract::{
    Delegation, GatewayBond, GatewayOwnershipResponse, IdentityKey, LayerDistribution, MixNodeBond,
-    MixOwnershipResponse, PagedAllDelegationsResponse, PagedGatewayDelegationsResponse,
-    PagedGatewayResponse, PagedMixDelegationsResponse, PagedMixnodeResponse,
-    PagedReverseGatewayDelegationsResponse, PagedReverseMixDelegationsResponse, RawDelegationData,
-    StateParams,
+    MixOwnershipResponse, PagedAllDelegationsResponse, PagedGatewayResponse,
+    PagedMixDelegationsResponse, PagedMixnodeResponse, PagedReverseMixDelegationsResponse,
+    RawDelegationData, StateParams,
 };

 const BOND_PAGE_MAX_LIMIT: u32 = 100;
@@ -93,14 +91,6 @@ pub(crate) fn query_layer_distribution(deps: Deps) -> LayerDistribution {
    read_layer_distribution(deps.storage)
 }

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

-pub(crate) fn query_gateway_delegations_paged(
-    deps: Deps,
-    gateway_identity: IdentityKey,
-    start_after: Option<Addr>,
-    limit: Option<u32>,
-) -> StdResult<PagedGatewayDelegationsResponse> {
-    let limit = limit
-        .unwrap_or(DELEGATION_PAGE_DEFAULT_LIMIT)
-        .min(DELEGATION_PAGE_MAX_LIMIT) as usize;
-    let start = calculate_start_value(start_after);
-
-    let delegations = gateway_delegations_read(deps.storage, &gateway_identity)
-        .range(start.as_deref(), None, Order::Ascending)
-        .take(limit)
-        .map(|res| {
-            res.map(|entry| {
-                Delegation::new(
-                    Addr::unchecked(String::from_utf8(entry.0).expect(
-                        "Non-UTF8 address used as key in bucket. The storage is corrupted!",
-                    )),
-                    coin(entry.1.amount.u128(), DENOM),
-                    entry.1.block_height,
-                )
-            })
-        })
-        .collect::<StdResult<Vec<Delegation>>>()?;
-
-    let start_next_after = delegations.last().map(|delegation| delegation.owner());
-
-    Ok(PagedGatewayDelegationsResponse::new(
-        gateway_identity,
-        delegations,
-        start_next_after,
-    ))
-}
-
-pub(crate) fn query_all_gateway_delegations_paged(
-    deps: Deps,
-    start_after: Option<Vec<u8>>,
-    limit: Option<u32>,
-) -> StdResult<PagedAllDelegationsResponse<RawDelegationData>> {
-    let limit = limit
-        .unwrap_or(DELEGATION_PAGE_DEFAULT_LIMIT)
-        .min(DELEGATION_PAGE_MAX_LIMIT) as usize;
-
-    let bucket = all_gateway_delegations_read::<RawDelegationData>(deps.storage);
-    let start = start_after.map(|mut v| {
-        v.push(0);
-        v
-    });
-    get_all_delegations_paged::<RawDelegationData>(&bucket, &start, limit)
-}
-
-pub(crate) fn query_reverse_gateway_delegations_paged(
-    deps: Deps,
-    delegation_owner: Addr,
-    start_after: Option<IdentityKey>,
-    limit: Option<u32>,
-) -> StdResult<PagedReverseGatewayDelegationsResponse> {
-    let limit = limit
-        .unwrap_or(DELEGATION_PAGE_DEFAULT_LIMIT)
-        .min(DELEGATION_PAGE_MAX_LIMIT) as usize;
-    let start = calculate_start_value(start_after);
-
-    let delegations = reverse_gateway_delegations_read(deps.storage, &delegation_owner)
-        .range(start.as_deref(), None, Order::Ascending)
-        .take(limit)
-        .map(|res| {
-            res.map(|entry| {
-                String::from_utf8(entry.0)
-                    .expect("Non-UTF8 address used as key in bucket. The storage is corrupted!")
-            })
-        })
-        .collect::<StdResult<Vec<IdentityKey>>>()?;
-
-    let start_next_after = delegations.last().cloned();
-
-    Ok(PagedReverseGatewayDelegationsResponse::new(
-        delegation_owner,
-        delegations,
-        start_next_after,
-    ))
-}
-
-// queries for delegation value of given address for particular node
-pub(crate) fn query_gateway_delegation(
-    deps: Deps,
-    gateway_identity: IdentityKey,
-    address: Addr,
-) -> Result<Delegation, ContractError> {
-    match gateway_delegations_read(deps.storage, &gateway_identity).may_load(address.as_bytes())? {
-        Some(delegation_value) => Ok(Delegation::new(
-            address,
-            coin(delegation_value.amount.u128(), DENOM),
-            delegation_value.block_height,
-        )),
-        None => Err(ContractError::NoGatewayDelegationFound {
-            identity: gateway_identity,
-            address,
-        }),
-    }
-}
-
 #[cfg(test)]
 pub(crate) mod tests {
    use super::*;
    use crate::state::State;
-    use crate::storage::{config, gateway_delegations, gateways, mix_delegations, mixnodes};
+    use crate::storage::{config, gateways, mix_delegations, mixnodes};
    use crate::support::tests::helpers;
    use crate::support::tests::helpers::{
        good_gateway_bond, good_mixnode_bond, raw_delegation_fixture,
@@ -681,16 +568,11 @@ pub(crate) mod tests {
                minimum_mixnode_bond: 123u128.into(),
                minimum_gateway_bond: 456u128.into(),
                mixnode_bond_reward_rate: "1.23".parse().unwrap(),
-                gateway_bond_reward_rate: "4.56".parse().unwrap(),
                mixnode_delegation_reward_rate: "7.89".parse().unwrap(),
-                gateway_delegation_reward_rate: "0.12".parse().unwrap(),
                mixnode_active_set_size: 1000,
-                gateway_active_set_size: 20,
            },
            mixnode_epoch_bond_reward: "1.23".parse().unwrap(),
-            gateway_epoch_bond_reward: "4.56".parse().unwrap(),
            mixnode_epoch_delegation_reward: "7.89".parse().unwrap(),
-            gateway_epoch_delegation_reward: "0.12".parse().unwrap(),
        };

        config(deps.as_mut().storage).save(&dummy_state).unwrap();
@@ -1211,524 +1093,4 @@ pub(crate) mod tests {
            assert_eq!(2, page2.delegated_nodes.len());
        }
    }
-
-    pub fn store_n_gateway_delegations(
-        n: u32,
-        storage: &mut dyn Storage,
-        node_identity: &IdentityKey,
-    ) {
-        for i in 0..n {
-            let address = format!("address{}", i);
-            gateway_delegations(storage, node_identity)
-                .save(address.as_bytes(), &raw_delegation_fixture(42))
-                .unwrap();
-        }
-    }
-
-    #[cfg(test)]
-    mod querying_for_gateway_delegations_paged {
-        use super::*;
-        use crate::storage::gateway_delegations;
-
-        #[test]
-        fn retrieval_obeys_limits() {
-            let mut deps = helpers::init_contract();
-            let limit = 2;
-            let node_identity: IdentityKey = "foo".into();
-            store_n_gateway_delegations(100, &mut deps.storage, &node_identity);
-
-            let page1 = query_gateway_delegations_paged(
-                deps.as_ref(),
-                node_identity,
-                None,
-                Option::from(limit),
-            )
-            .unwrap();
-            assert_eq!(limit, page1.delegations.len() as u32);
-        }
-
-        #[test]
-        fn retrieval_has_default_limit() {
-            let mut deps = helpers::init_contract();
-            let node_identity: IdentityKey = "foo".into();
-            store_n_gateway_delegations(
-                DELEGATION_PAGE_DEFAULT_LIMIT * 10,
-                &mut deps.storage,
-                &node_identity,
-            );
-
-            // query without explicitly setting a limit
-            let page1 =
-                query_gateway_delegations_paged(deps.as_ref(), node_identity, None, None).unwrap();
-            assert_eq!(
-                DELEGATION_PAGE_DEFAULT_LIMIT,
-                page1.delegations.len() as u32
-            );
-        }
-
-        #[test]
-        fn retrieval_has_max_limit() {
-            let mut deps = helpers::init_contract();
-            let node_identity: IdentityKey = "foo".into();
-            store_n_gateway_delegations(
-                DELEGATION_PAGE_DEFAULT_LIMIT * 10,
-                &mut deps.storage,
-                &node_identity,
-            );
-
-            // query with a crazily high limit in an attempt to use too many resources
-            let crazy_limit = 1000 * DELEGATION_PAGE_DEFAULT_LIMIT;
-            let page1 = query_gateway_delegations_paged(
-                deps.as_ref(),
-                node_identity,
-                None,
-                Option::from(crazy_limit),
-            )
-            .unwrap();
-
-            // we default to a decent sized upper bound instead
-            let expected_limit = DELEGATION_PAGE_MAX_LIMIT;
-            assert_eq!(expected_limit, page1.delegations.len() as u32);
-        }
-
-        #[test]
-        fn pagination_works() {
-            let mut deps = helpers::init_contract();
-            let node_identity: IdentityKey = "foo".into();
-
-            gateway_delegations(&mut deps.storage, &node_identity)
-                .save("1".as_bytes(), &raw_delegation_fixture(42))
-                .unwrap();
-
-            let per_page = 2;
-            let page1 = query_gateway_delegations_paged(
-                deps.as_ref(),
-                node_identity.clone(),
-                None,
-                Option::from(per_page),
-            )
-            .unwrap();
-
-            // page should have 1 result on it
-            assert_eq!(1, page1.delegations.len());
-
-            // save another
-            gateway_delegations(&mut deps.storage, &node_identity)
-                .save("2".as_bytes(), &raw_delegation_fixture(42))
-                .unwrap();
-
-            // page1 should have 2 results on it
-            let page1 = query_gateway_delegations_paged(
-                deps.as_ref(),
-                node_identity.clone(),
-                None,
-                Option::from(per_page),
-            )
-            .unwrap();
-            assert_eq!(2, page1.delegations.len());
-
-            gateway_delegations(&mut deps.storage, &node_identity)
-                .save("3".as_bytes(), &raw_delegation_fixture(42))
-                .unwrap();
-
-            // page1 still has 2 results
-            let page1 = query_gateway_delegations_paged(
-                deps.as_ref(),
-                node_identity.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 = Addr::unchecked("2");
-            let page2 = query_gateway_delegations_paged(
-                deps.as_ref(),
-                node_identity.clone(),
-                Option::from(start_after),
-                Option::from(per_page),
-            )
-            .unwrap();
-
-            assert_eq!(1, page2.delegations.len());
-
-            // save another one
-            gateway_delegations(&mut deps.storage, &node_identity)
-                .save("4".as_bytes(), &raw_delegation_fixture(42))
-                .unwrap();
-
-            let start_after = Addr::unchecked("2");
-            let page2 = query_gateway_delegations_paged(
-                deps.as_ref(),
-                node_identity,
-                Option::from(start_after),
-                Option::from(per_page),
-            )
-            .unwrap();
-
-            // now we have 2 pages, with 2 results on the second page
-            assert_eq!(2, page2.delegations.len());
-        }
-    }
-
-    #[test]
-    fn gateway_deletion_query_returns_current_delegation_value() {
-        let mut deps = helpers::init_contract();
-        let node_identity: IdentityKey = "foo".into();
-        let delegation_owner = Addr::unchecked("bar");
-
-        gateway_delegations(&mut deps.storage, &node_identity)
-            .save(
-                delegation_owner.as_bytes(),
-                &&RawDelegationData::new(42u128.into(), 12_345),
-            )
-            .unwrap();
-
-        assert_eq!(
-            Ok(Delegation::new(
-                delegation_owner.clone(),
-                coin(42, DENOM),
-                12_345
-            )),
-            query_gateway_delegation(deps.as_ref(), node_identity, delegation_owner)
-        )
-    }
-
-    #[test]
-    fn gateway_deletion_query_returns_error_if_delegation_doesnt_exist() {
-        let mut deps = helpers::init_contract();
-
-        let node_identity1: IdentityKey = "foo1".into();
-        let node_identity2: IdentityKey = "foo2".into();
-        let delegation_owner1 = Addr::unchecked("bar");
-        let delegation_owner2 = Addr::unchecked("bar2");
-
-        assert_eq!(
-            Err(ContractError::NoGatewayDelegationFound {
-                identity: node_identity1.clone(),
-                address: delegation_owner1.clone(),
-            }),
-            query_gateway_delegation(
-                deps.as_ref(),
-                node_identity1.clone(),
-                delegation_owner1.clone()
-            )
-        );
-
-        // add delegation from a different address
-        gateway_delegations(&mut deps.storage, &node_identity1)
-            .save(delegation_owner2.as_bytes(), &raw_delegation_fixture(42))
-            .unwrap();
-
-        assert_eq!(
-            Err(ContractError::NoGatewayDelegationFound {
-                identity: node_identity1.clone(),
-                address: delegation_owner1.clone(),
-            }),
-            query_gateway_delegation(
-                deps.as_ref(),
-                node_identity1.clone(),
-                delegation_owner1.clone()
-            )
-        );
-
-        // add delegation for a different node
-        gateway_delegations(&mut deps.storage, &node_identity2)
-            .save(delegation_owner1.as_bytes(), &raw_delegation_fixture(42))
-            .unwrap();
-
-        assert_eq!(
-            Err(ContractError::NoGatewayDelegationFound {
-                identity: node_identity1.clone(),
-                address: delegation_owner1.clone()
-            }),
-            query_gateway_delegation(deps.as_ref(), node_identity1, delegation_owner1)
-        )
-    }
-
-    #[cfg(test)]
-    mod querying_for_all_gateway_delegations_paged {
-        use super::*;
-        use crate::helpers::identity_and_owner_to_bytes;
-        use crate::storage::gateway_delegations;
-
-        #[test]
-        fn retrieval_obeys_limits() {
-            let mut deps = helpers::init_contract();
-            let limit = 2;
-            let node_identity: IdentityKey = "foo".into();
-            store_n_gateway_delegations(100, &mut deps.storage, &node_identity);
-
-            let page1 =
-                query_all_gateway_delegations_paged(deps.as_ref(), None, Option::from(limit))
-                    .unwrap();
-            assert_eq!(limit, page1.delegations.len() as u32);
-        }
-
-        #[test]
-        fn retrieval_has_default_limit() {
-            let mut deps = helpers::init_contract();
-            let node_identity: IdentityKey = "foo".into();
-            store_n_gateway_delegations(
-                DELEGATION_PAGE_DEFAULT_LIMIT * 10,
-                &mut deps.storage,
-                &node_identity,
-            );
-
-            // query without explicitly setting a limit
-            let page1 = query_all_gateway_delegations_paged(deps.as_ref(), None, None).unwrap();
-            assert_eq!(
-                DELEGATION_PAGE_DEFAULT_LIMIT,
-                page1.delegations.len() as u32
-            );
-        }
-
-        #[test]
-        fn retrieval_has_max_limit() {
-            let mut deps = helpers::init_contract();
-            let node_identity: IdentityKey = "foo".into();
-            store_n_gateway_delegations(
-                DELEGATION_PAGE_DEFAULT_LIMIT * 10,
-                &mut deps.storage,
-                &node_identity,
-            );
-
-            // query with a crazily high limit in an attempt to use too many resources
-            let crazy_limit = 1000 * DELEGATION_PAGE_DEFAULT_LIMIT;
-            let page1 =
-                query_all_gateway_delegations_paged(deps.as_ref(), None, Option::from(crazy_limit))
-                    .unwrap();
-
-            // we default to a decent sized upper bound instead
-            let expected_limit = DELEGATION_PAGE_MAX_LIMIT;
-            assert_eq!(expected_limit, page1.delegations.len() as u32);
-        }
-
-        #[test]
-        fn pagination_works() {
-            let mut deps = helpers::init_contract();
-            let node_identity: IdentityKey = "foo".into();
-
-            gateway_delegations(&mut deps.storage, &node_identity)
-                .save("1".as_bytes(), &raw_delegation_fixture(42))
-                .unwrap();
-
-            let per_page = 2;
-            let page1 =
-                query_all_gateway_delegations_paged(deps.as_ref(), None, Option::from(per_page))
-                    .unwrap();
-
-            // page should have 1 result on it
-            assert_eq!(1, page1.delegations.len());
-
-            // save another
-            gateway_delegations(&mut deps.storage, &node_identity)
-                .save("2".as_bytes(), &raw_delegation_fixture(42))
-                .unwrap();
-
-            // page1 should have 2 results on it
-            let page1 =
-                query_all_gateway_delegations_paged(deps.as_ref(), None, Option::from(per_page))
-                    .unwrap();
-            assert_eq!(2, page1.delegations.len());
-
-            gateway_delegations(&mut deps.storage, &node_identity)
-                .save("3".as_bytes(), &raw_delegation_fixture(42))
-                .unwrap();
-
-            // page1 still has 2 results
-            let page1 =
-                query_all_gateway_delegations_paged(deps.as_ref(), 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 = identity_and_owner_to_bytes(&node_identity, &Addr::unchecked("2"));
-            let page2 = query_all_gateway_delegations_paged(
-                deps.as_ref(),
-                Option::from(start_after.clone()),
-                Option::from(per_page),
-            )
-            .unwrap();
-
-            assert_eq!(1, page2.delegations.len());
-
-            // save another one
-            gateway_delegations(&mut deps.storage, &node_identity)
-                .save("4".as_bytes(), &raw_delegation_fixture(42))
-                .unwrap();
-
-            let page2 = query_all_gateway_delegations_paged(
-                deps.as_ref(),
-                Option::from(start_after),
-                Option::from(per_page),
-            )
-            .unwrap();
-
-            // now we have 2 pages, with 2 results on the second page
-            assert_eq!(2, page2.delegations.len());
-        }
-    }
-
-    #[cfg(test)]
-    mod querying_for_reverse_gateway_delegations_paged {
-        use super::*;
-        use crate::storage::reverse_gateway_delegations;
-
-        fn store_n_reverse_delegations(n: u32, storage: &mut dyn Storage, delegation_owner: &Addr) {
-            for i in 0..n {
-                let node_identity = format!("node{}", i);
-                reverse_gateway_delegations(storage, delegation_owner)
-                    .save(node_identity.as_bytes(), &())
-                    .unwrap();
-            }
-        }
-
-        #[test]
-        fn retrieval_obeys_limits() {
-            let mut deps = helpers::init_contract();
-            let limit = 2;
-            let delegation_owner = Addr::unchecked("foo");
-            store_n_reverse_delegations(100, &mut deps.storage, &delegation_owner);
-
-            let page1 = query_reverse_gateway_delegations_paged(
-                deps.as_ref(),
-                delegation_owner,
-                None,
-                Option::from(limit),
-            )
-            .unwrap();
-            assert_eq!(limit, page1.delegated_nodes.len() as u32);
-        }
-
-        #[test]
-        fn retrieval_has_default_limit() {
-            let mut deps = helpers::init_contract();
-            let delegation_owner = Addr::unchecked("foo");
-            store_n_reverse_delegations(
-                DELEGATION_PAGE_DEFAULT_LIMIT * 10,
-                &mut deps.storage,
-                &delegation_owner,
-            );
-
-            // query without explicitly setting a limit
-            let page1 = query_reverse_gateway_delegations_paged(
-                deps.as_ref(),
-                delegation_owner,
-                None,
-                None,
-            )
-            .unwrap();
-            assert_eq!(
-                DELEGATION_PAGE_DEFAULT_LIMIT,
-                page1.delegated_nodes.len() as u32
-            );
-        }
-
-        #[test]
-        fn retrieval_has_max_limit() {
-            let mut deps = helpers::init_contract();
-            let delegation_owner = Addr::unchecked("foo");
-            store_n_reverse_delegations(
-                DELEGATION_PAGE_DEFAULT_LIMIT * 10,
-                &mut deps.storage,
-                &delegation_owner,
-            );
-
-            // query with a crazy high limit in an attempt to use too many resources
-            let crazy_limit = 1000 * DELEGATION_PAGE_DEFAULT_LIMIT;
-            let page1 = query_reverse_gateway_delegations_paged(
-                deps.as_ref(),
-                delegation_owner,
-                None,
-                Option::from(crazy_limit),
-            )
-            .unwrap();
-
-            // we default to a decent sized upper bound instead
-            let expected_limit = DELEGATION_PAGE_MAX_LIMIT;
-            assert_eq!(expected_limit, page1.delegated_nodes.len() as u32);
-        }
-
-        #[test]
-        fn pagination_works() {
-            let mut deps = helpers::init_contract();
-            let delegation_owner = Addr::unchecked("bar");
-
-            reverse_gateway_delegations(&mut deps.storage, &delegation_owner)
-                .save("1".as_bytes(), &())
-                .unwrap();
-
-            let per_page = 2;
-            let page1 = query_reverse_gateway_delegations_paged(
-                deps.as_ref(),
-                delegation_owner.clone(),
-                None,
-                Option::from(per_page),
-            )
-            .unwrap();
-
-            // page should have 1 result on it
-            assert_eq!(1, page1.delegated_nodes.len());
-
-            // save another
-            reverse_gateway_delegations(&mut deps.storage, &delegation_owner)
-                .save("2".as_bytes(), &())
-                .unwrap();
-
-            // page1 should have 2 results on it
-            let page1 = query_reverse_gateway_delegations_paged(
-                deps.as_ref(),
-                delegation_owner.clone(),
-                None,
-                Option::from(per_page),
-            )
-            .unwrap();
-            assert_eq!(2, page1.delegated_nodes.len());
-
-            reverse_gateway_delegations(&mut deps.storage, &delegation_owner)
-                .save("3".as_bytes(), &())
-                .unwrap();
-
-            // page1 still has 2 results
-            let page1 = query_reverse_gateway_delegations_paged(
-                deps.as_ref(),
-                delegation_owner.clone(),
-                None,
-                Option::from(per_page),
-            )
-            .unwrap();
-            assert_eq!(2, page1.delegated_nodes.len());
-
-            // retrieving the next page should start after the last key on this page
-            let start_after: IdentityKey = String::from("2");
-            let page2 = query_reverse_gateway_delegations_paged(
-                deps.as_ref(),
-                delegation_owner.clone(),
-                Option::from(start_after),
-                Option::from(per_page),
-            )
-            .unwrap();
-
-            assert_eq!(1, page2.delegated_nodes.len());
-
-            // save another one
-            reverse_gateway_delegations(&mut deps.storage, &delegation_owner)
-                .save("4".as_bytes(), &())
-                .unwrap();
-
-            let start_after = String::from("2");
-            let page2 = query_reverse_gateway_delegations_paged(
-                deps.as_ref(),
-                delegation_owner,
-                Option::from(start_after),
-                Option::from(per_page),
-            )
-            .unwrap();
-
-            // now we have 2 pages, with 2 results on the second page
-            assert_eq!(2, page2.delegated_nodes.len());
-        }
-    }
 }
@@ -14,7 +14,5 @@ pub struct State {

    // helper values to avoid having to recalculate them on every single payment operation
    pub mixnode_epoch_bond_reward: Decimal, // reward per epoch expressed as a decimal like 0.05
-    pub gateway_epoch_bond_reward: Decimal, // reward per epoch expressed as a decimal like 0.05
    pub mixnode_epoch_delegation_reward: Decimal, // reward per epoch expressed as a decimal like 0.05
-    pub gateway_epoch_delegation_reward: Decimal, // reward per epoch expressed as a decimal like 0.05
 }
@@ -1,16 +1,14 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
-use crate::contract::INITIAL_REWARD_POOL;
+
+use crate::queries;
 use crate::state::State;
 use crate::transactions::MINIMUM_BLOCK_AGE_FOR_REWARDING;
-use crate::{error::ContractError, queries};
-use config::defaults::TOTAL_SUPPLY;
 use cosmwasm_std::{Decimal, Order, StdResult, Storage, Uint128};
 use cosmwasm_storage::{
    bucket, bucket_read, singleton, singleton_read, Bucket, ReadonlyBucket, ReadonlySingleton,
    Singleton,
 };
-use mixnet_contract::mixnode::NodeRewardParams;
 use mixnet_contract::{
    Addr, GatewayBond, IdentityKey, IdentityKeyRef, Layer, LayerDistribution, MixNodeBond,
    RawDelegationData, StateParams,
@@ -26,18 +24,15 @@ use serde::Serialize;
 // singletons
 const CONFIG_KEY: &[u8] = b"config";
 const LAYER_DISTRIBUTION_KEY: &[u8] = b"layers";
-const REWARD_POOL_PREFIX: &[u8] = b"pool";

 // buckets
-pub const PREFIX_MIXNODES: &[u8] = b"mn";
+const PREFIX_MIXNODES: &[u8] = b"mn";
 const PREFIX_MIXNODES_OWNERS: &[u8] = b"mo";
 const PREFIX_GATEWAYS: &[u8] = b"gt";
 const PREFIX_GATEWAYS_OWNERS: &[u8] = b"go";

 const PREFIX_MIX_DELEGATION: &[u8] = b"md";
-const PREFIX_GATEWAY_DELEGATION: &[u8] = b"gd";
 const PREFIX_REVERSE_MIX_DELEGATION: &[u8] = b"dm";
-const PREFIX_REVERSE_GATEWAY_DELEGATION: &[u8] = b"dg";

 // Contract-level stuff

@@ -51,46 +46,6 @@ pub fn config_read(storage: &dyn Storage) -> ReadonlySingleton<State> {
    singleton_read(storage, CONFIG_KEY)
 }

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

-pub(crate) fn read_gateway_epoch_bond_reward_rate(storage: &dyn Storage) -> Decimal {
-    // same justification as in `read_state_params` for the unwrap
-    config_read(storage)
-        .load()
-        .unwrap()
-        .gateway_epoch_bond_reward
-}
-
 pub(crate) fn read_mixnode_epoch_delegation_reward_rate(storage: &dyn Storage) -> Decimal {
    // same justification as in `read_state_params` for the unwrap
    config_read(storage)
@@ -122,14 +69,6 @@ pub(crate) fn read_mixnode_epoch_delegation_reward_rate(storage: &dyn Storage) -
        .mixnode_epoch_delegation_reward
 }

-pub(crate) fn read_gateway_epoch_delegation_reward_rate(storage: &dyn Storage) -> Decimal {
-    // same justification as in `read_state_params` for the unwrap
-    config_read(storage)
-        .load()
-        .unwrap()
-        .gateway_epoch_delegation_reward
-}
-
 pub fn layer_distribution(storage: &mut dyn Storage) -> Singleton<LayerDistribution> {
    singleton(storage, LAYER_DISTRIBUTION_KEY)
 }
@@ -257,106 +196,6 @@ pub(crate) fn increase_mix_delegated_stakes(
    Ok(total_rewarded)
 }

-pub(crate) fn increase_mix_delegated_stakes_v2(
-    storage: &mut dyn Storage,
-    bond: &MixNodeBond,
-    params: &NodeRewardParams,
-) -> Result<Uint128, ContractError> {
-    let chunk_size = queries::DELEGATION_PAGE_MAX_LIMIT as usize;
-
-    let mut total_rewarded = Uint128::zero();
-    let mut chunk_start: Option<Vec<_>> = None;
-    loop {
-        // get `chunk_size` of delegations
-        let delegations_chunk = mix_delegations_read(storage, bond.identity())
-            .range(chunk_start.as_deref(), None, Order::Ascending)
-            .take(chunk_size)
-            .collect::<StdResult<Vec<_>>>()?;
-
-        if delegations_chunk.is_empty() {
-            break;
-        }
-
-        // append 0 byte to the last value to start with whatever is the next succeeding key
-        chunk_start = Some(
-            delegations_chunk
-                .last()
-                .unwrap()
-                .0
-                .iter()
-                .cloned()
-                .chain(std::iter::once(0u8))
-                .collect(),
-        );
-
-        // and for each of them increase the stake proportionally to the reward
-        // if at least `MINIMUM_BLOCK_AGE_FOR_REWARDING` blocks have been created
-        // since they delegated
-        for (delegator_address, mut delegation) in delegations_chunk.into_iter() {
-            if delegation.block_height + MINIMUM_BLOCK_AGE_FOR_REWARDING
-                <= params.reward_blockstamp()
-            {
-                let reward = bond.reward_delegation(delegation.amount, params);
-                delegation.amount += Uint128(reward);
-                total_rewarded += Uint128(reward);
-                mix_delegations(storage, bond.identity()).save(&delegator_address, &delegation)?;
-            }
-        }
-    }
-
-    Ok(total_rewarded)
-}
-
-pub(crate) fn increase_gateway_delegated_stakes(
-    storage: &mut dyn Storage,
-    gateway_identity: IdentityKeyRef,
-    scaled_reward_rate: Decimal,
-    reward_blockstamp: u64,
-) -> StdResult<Uint128> {
-    let chunk_size = queries::DELEGATION_PAGE_MAX_LIMIT as usize;
-
-    let mut total_rewarded = Uint128::zero();
-    let mut chunk_start: Option<Vec<_>> = None;
-    loop {
-        // get `chunk_size` of delegations
-        let delegations_chunk = gateway_delegations_read(storage, gateway_identity)
-            .range(chunk_start.as_deref(), None, Order::Ascending)
-            .take(chunk_size)
-            .collect::<StdResult<Vec<_>>>()?;
-
-        if delegations_chunk.is_empty() {
-            break;
-        }
-
-        // append 0 byte to the last value to start with whatever is the next suceeding key
-        chunk_start = Some(
-            delegations_chunk
-                .last()
-                .unwrap()
-                .0
-                .iter()
-                .cloned()
-                .chain(std::iter::once(0u8))
-                .collect(),
-        );
-
-        // and for each of them increase the stake proportionally to the reward
-        // if at least `MINIMUM_BLOCK_AGE_FOR_REWARDING` blocks have been created
-        // since they delegated
-        for (delegator_address, mut delegation) in delegations_chunk.into_iter() {
-            if delegation.block_height + MINIMUM_BLOCK_AGE_FOR_REWARDING <= reward_blockstamp {
-                let reward = delegation.amount * scaled_reward_rate;
-                delegation.amount += reward;
-                total_rewarded += reward;
-                gateway_delegations(storage, gateway_identity)
-                    .save(&delegator_address, &delegation)?;
-            }
-        }
-    }
-
-    Ok(total_rewarded)
-}
-
 // currently not used outside tests
 #[cfg(test)]
 pub(crate) fn read_mixnode_bond(
@@ -431,53 +270,6 @@ pub fn reverse_mix_delegations_read<'a>(
    ReadonlyBucket::multilevel(storage, &[PREFIX_REVERSE_MIX_DELEGATION, owner.as_bytes()])
 }

-pub fn all_gateway_delegations_read<T>(storage: &dyn Storage) -> ReadonlyBucket<T>
-where
-    T: Serialize + DeserializeOwned,
-{
-    bucket_read(storage, PREFIX_GATEWAY_DELEGATION)
-}
-
-pub fn gateway_delegations<'a>(
-    storage: &'a mut dyn Storage,
-    gateway_identity: IdentityKeyRef,
-) -> Bucket<'a, RawDelegationData> {
-    Bucket::multilevel(
-        storage,
-        &[PREFIX_GATEWAY_DELEGATION, gateway_identity.as_bytes()],
-    )
-}
-
-pub fn gateway_delegations_read<'a>(
-    storage: &'a dyn Storage,
-    gateway_identity: IdentityKeyRef,
-) -> ReadonlyBucket<'a, RawDelegationData> {
-    ReadonlyBucket::multilevel(
-        storage,
-        &[PREFIX_GATEWAY_DELEGATION, gateway_identity.as_bytes()],
-    )
-}
-
-pub fn reverse_gateway_delegations<'a>(
-    storage: &'a mut dyn Storage,
-    owner: &Addr,
-) -> Bucket<'a, ()> {
-    Bucket::multilevel(
-        storage,
-        &[PREFIX_REVERSE_GATEWAY_DELEGATION, owner.as_bytes()],
-    )
-}
-
-pub fn reverse_gateway_delegations_read<'a>(
-    storage: &'a dyn Storage,
-    owner: &Addr,
-) -> ReadonlyBucket<'a, ()> {
-    ReadonlyBucket::multilevel(
-        storage,
-        &[PREFIX_REVERSE_GATEWAY_DELEGATION, owner.as_bytes()],
-    )
-}
-
 // currently not used outside tests
 #[cfg(test)]
 pub(crate) fn read_gateway_bond(
@@ -489,17 +281,6 @@ pub(crate) fn read_gateway_bond(
    Ok(node.bond_amount.amount)
 }

-// currently not used outside tests
-#[cfg(test)]
-pub(crate) fn read_gateway_delegation(
-    storage: &dyn Storage,
-    identity: &[u8],
-) -> StdResult<cosmwasm_std::Uint128> {
-    let bucket = gateways_read(storage);
-    let node = bucket.load(identity)?;
-    Ok(node.total_delegation.amount)
-}
-
 #[cfg(test)]
 mod tests {
    use super::*;
@@ -564,7 +345,6 @@ mod tests {
                identity_key: node_identity.clone(),
                ..mix_node_fixture()
            },
-            profit_margin_percent: Some(10),
        };

        mixnodes(&mut storage)
@@ -593,7 +373,6 @@ mod tests {

        let gateway_bond = GatewayBond {
            bond_amount: coin(bond_value, DENOM),
-            total_delegation: coin(0, DENOM),
            owner: node_owner.clone(),
            block_height: 12_345,
            gateway: Gateway {
@@ -645,39 +424,6 @@ mod tests {
        assert_eq!(raw_delegation2, res2);
    }

-    #[test]
-    fn all_gateway_delegations_read_retrieval() {
-        let mut deps = mock_dependencies(&[]);
-        let node_identity1: IdentityKey = "foo1".into();
-        let delegation_owner1 = Addr::unchecked("bar1");
-        let node_identity2: IdentityKey = "foo2".into();
-        let delegation_owner2 = Addr::unchecked("bar2");
-        let raw_delegation1 = RawDelegationData::new(1u128.into(), 1000);
-        let raw_delegation2 = RawDelegationData::new(2u128.into(), 2000);
-
-        gateway_delegations(&mut deps.storage, &node_identity1)
-            .save(delegation_owner1.as_bytes(), &raw_delegation1)
-            .unwrap();
-        gateway_delegations(&mut deps.storage, &node_identity2)
-            .save(delegation_owner2.as_bytes(), &raw_delegation2)
-            .unwrap();
-
-        let res1 = all_gateway_delegations_read::<RawDelegationData>(&deps.storage)
-            .load(&*identity_and_owner_to_bytes(
-                &node_identity1,
-                &delegation_owner1,
-            ))
-            .unwrap();
-        let res2 = all_gateway_delegations_read::<RawDelegationData>(&deps.storage)
-            .load(&*identity_and_owner_to_bytes(
-                &node_identity2,
-                &delegation_owner2,
-            ))
-            .unwrap();
-        assert_eq!(raw_delegation1, res1);
-        assert_eq!(raw_delegation2, res2);
-    }
-
    #[cfg(test)]
    mod increasing_mix_delegated_stakes {
        use super::*;
@@ -952,279 +698,4 @@ mod tests {
            );
        }
    }
-
-    #[cfg(test)]
-    mod increasing_gateway_delegated_stakes {
-        use super::*;
-        use crate::queries::query_gateway_delegations_paged;
-        use cosmwasm_std::testing::mock_dependencies;
-
-        #[test]
-        fn when_there_are_no_delegations() {
-            let mut deps = mock_dependencies(&[]);
-            let node_identity: IdentityKey = "nodeidentity".into();
-
-            // 0.001
-            let reward = Decimal::from_ratio(1u128, 1000u128);
-
-            let total_increase = increase_gateway_delegated_stakes(
-                &mut deps.storage,
-                node_identity.as_ref(),
-                reward,
-                42,
-            )
-            .unwrap();
-
-            // there was no increase
-            assert!(total_increase.is_zero());
-
-            // there are no 'new' delegations magically added
-            assert!(
-                query_gateway_delegations_paged(deps.as_ref(), node_identity, None, None)
-                    .unwrap()
-                    .delegations
-                    .is_empty()
-            )
-        }
-
-        #[test]
-        fn when_there_is_a_single_delegation() {
-            let mut deps = mock_dependencies(&[]);
-            let node_identity: IdentityKey = "nodeidentity".into();
-            let delegation_blockstamp = 42;
-
-            // 0.001
-            let reward = Decimal::from_ratio(1u128, 1000u128);
-
-            let delegator_address = Addr::unchecked("bob");
-            gateway_delegations(&mut deps.storage, &node_identity)
-                .save(
-                    delegator_address.as_bytes(),
-                    &RawDelegationData::new(1000u128.into(), delegation_blockstamp),
-                )
-                .unwrap();
-
-            let total_increase = increase_gateway_delegated_stakes(
-                &mut deps.storage,
-                node_identity.as_ref(),
-                reward,
-                delegation_blockstamp + 2 * MINIMUM_BLOCK_AGE_FOR_REWARDING,
-            )
-            .unwrap();
-
-            assert_eq!(Uint128(1), total_increase);
-
-            // amount is incremented, block height remains the same
-            assert_eq!(
-                RawDelegationData::new(1001u128.into(), 42),
-                gateway_delegations_read(&mut deps.storage, &node_identity)
-                    .load(delegator_address.as_bytes())
-                    .unwrap()
-            )
-        }
-
-        #[test]
-        fn when_there_is_a_single_delegation_depending_on_blockstamp() {
-            let mut deps = mock_dependencies(&[]);
-            let node_identity: IdentityKey = "nodeidentity".into();
-            let delegation_blockstamp = 42;
-
-            // 0.001
-            let reward = Decimal::from_ratio(1u128, 1000u128);
-
-            let delegator_address = Addr::unchecked("bob");
-            gateway_delegations(&mut deps.storage, &node_identity)
-                .save(
-                    delegator_address.as_bytes(),
-                    &RawDelegationData::new(1000u128.into(), delegation_blockstamp),
-                )
-                .unwrap();
-
-            let total_increase = increase_gateway_delegated_stakes(
-                &mut deps.storage,
-                node_identity.as_ref(),
-                reward,
-                delegation_blockstamp + MINIMUM_BLOCK_AGE_FOR_REWARDING - 1,
-            )
-            .unwrap();
-
-            // there was no increase
-            assert!(total_increase.is_zero());
-
-            // amount is not incremented
-            assert_eq!(
-                RawDelegationData::new(1000u128.into(), delegation_blockstamp),
-                gateway_delegations_read(&mut deps.storage, &node_identity)
-                    .load(delegator_address.as_bytes())
-                    .unwrap()
-            );
-
-            let total_increase = increase_gateway_delegated_stakes(
-                &mut deps.storage,
-                node_identity.as_ref(),
-                reward,
-                delegation_blockstamp + MINIMUM_BLOCK_AGE_FOR_REWARDING,
-            )
-            .unwrap();
-
-            // there is an increase now, that the lock period has passed
-            assert_eq!(Uint128(1), total_increase);
-
-            // amount is incremented
-            assert_eq!(
-                RawDelegationData::new(1001u128.into(), delegation_blockstamp),
-                gateway_delegations_read(&mut deps.storage, &node_identity)
-                    .load(delegator_address.as_bytes())
-                    .unwrap()
-            )
-        }
-
-        #[test]
-        fn when_there_are_multiple_delegations() {
-            let mut deps = mock_dependencies(&[]);
-            let node_identity: IdentityKey = "nodeidentity".into();
-            let delegation_blockstamp = 42;
-
-            // 0.001
-            let reward = Decimal::from_ratio(1u128, 1000u128);
-
-            for i in 0..100 {
-                let delegator_address = Addr::unchecked(format!("address{}", i));
-                gateway_delegations(&mut deps.storage, &node_identity)
-                    .save(
-                        delegator_address.as_bytes(),
-                        &RawDelegationData::new(1000u128.into(), delegation_blockstamp),
-                    )
-                    .unwrap();
-            }
-
-            let total_increase = increase_gateway_delegated_stakes(
-                &mut deps.storage,
-                node_identity.as_ref(),
-                reward,
-                delegation_blockstamp + 2 * MINIMUM_BLOCK_AGE_FOR_REWARDING,
-            )
-            .unwrap();
-
-            assert_eq!(Uint128(100), total_increase);
-
-            for i in 0..100 {
-                let delegator_address = Addr::unchecked(format!("address{}", i));
-                assert_eq!(
-                    raw_delegation_fixture(1001),
-                    gateway_delegations_read(&mut deps.storage, &node_identity)
-                        .load(delegator_address.as_bytes())
-                        .unwrap()
-                )
-            }
-        }
-
-        #[test]
-        fn when_there_are_more_delegations_than_page_size() {
-            let mut deps = mock_dependencies(&[]);
-            let node_identity: IdentityKey = "nodeidentity".into();
-            let delegation_blockstamp = 42;
-
-            // 0.001
-            let reward = Decimal::from_ratio(1u128, 1000u128);
-
-            for i in 0..queries::DELEGATION_PAGE_MAX_LIMIT * 10 {
-                let delegator_address = Addr::unchecked(format!("address{}", i));
-                gateway_delegations(&mut deps.storage, &node_identity)
-                    .save(
-                        delegator_address.as_bytes(),
-                        &RawDelegationData::new(1000u128.into(), delegation_blockstamp),
-                    )
-                    .unwrap();
-            }
-
-            let total_increase = increase_gateway_delegated_stakes(
-                &mut deps.storage,
-                node_identity.as_ref(),
-                reward,
-                delegation_blockstamp + 2 * MINIMUM_BLOCK_AGE_FOR_REWARDING,
-            )
-            .unwrap();
-
-            assert_eq!(
-                Uint128(queries::DELEGATION_PAGE_MAX_LIMIT as u128 * 10),
-                total_increase
-            );
-
-            for i in 0..queries::DELEGATION_PAGE_MAX_LIMIT * 10 {
-                let delegator_address = Addr::unchecked(format!("address{}", i));
-                assert_eq!(
-                    raw_delegation_fixture(1001),
-                    gateway_delegations_read(&mut deps.storage, &node_identity)
-                        .load(delegator_address.as_bytes())
-                        .unwrap()
-                )
-            }
-        }
-    }
-
-    #[cfg(test)]
-    mod reverse_gateway_delegations {
-        use super::*;
-        use crate::support::tests::helpers;
-
-        #[test]
-        fn reverse_gateway_delegation_exists() {
-            let mut deps = helpers::init_contract();
-            let node_identity: IdentityKey = "foo".into();
-            let delegation_owner = Addr::unchecked("bar");
-
-            reverse_gateway_delegations(&mut deps.storage, &delegation_owner)
-                .save(node_identity.as_bytes(), &())
-                .unwrap();
-
-            assert!(
-                reverse_gateway_delegations_read(deps.as_ref().storage, &delegation_owner)
-                    .may_load(node_identity.as_bytes())
-                    .unwrap()
-                    .is_some(),
-            );
-        }
-
-        #[test]
-        fn reverse_gateway_delegation_returns_none_if_delegation_doesnt_exist() {
-            let mut deps = helpers::init_contract();
-
-            let node_identity1: IdentityKey = "foo1".into();
-            let node_identity2: IdentityKey = "foo2".into();
-            let delegation_owner1 = Addr::unchecked("bar");
-            let delegation_owner2 = Addr::unchecked("bar2");
-
-            assert!(
-                reverse_gateway_delegations_read(deps.as_ref().storage, &delegation_owner1)
-                    .may_load(node_identity1.as_bytes())
-                    .unwrap()
-                    .is_none()
-            );
-
-            // add delegation for a different node
-            reverse_gateway_delegations(&mut deps.storage, &delegation_owner1)
-                .save(node_identity2.as_bytes(), &())
-                .unwrap();
-
-            assert!(
-                reverse_gateway_delegations_read(deps.as_ref().storage, &delegation_owner1)
-                    .may_load(node_identity1.as_bytes())
-                    .unwrap()
-                    .is_none()
-            );
-
-            // add delegation from a different owner
-            reverse_gateway_delegations(&mut deps.storage, &delegation_owner2)
-                .save(node_identity1.as_bytes(), &())
-                .unwrap();
-
-            assert!(
-                reverse_gateway_delegations_read(deps.as_ref().storage, &delegation_owner1)
-                    .may_load(node_identity1.as_bytes())
-                    .unwrap()
-                    .is_none()
-            );
-        }
-    }
 }
@@ -133,7 +133,6 @@ pub mod helpers {
            Layer::One,
            12_345,
            mix_node,
-            None,
        )
    }

@@ -0,0 +1,3 @@
+{
+  "presets": ["@babel/env", "@babel/react"]
+}
@@ -0,0 +1,18 @@
+# See http://editorconfig.org/
+# EditorConfig helps developers define and maintain consistent coding styles
+# between different editors and IDEs. The EditorConfig project consists of a
+# file format for defining coding styles and a collection of text editor plugins
+# that enable editors to read the file format and adhere to defined styles.
+# EditorConfig files are easily readable and they work nicely with version
+# control systems.
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
@@ -0,0 +1,103 @@
+{
+  "env": {
+    "browser": true,
+    "es6": true,
+    "node": true,
+    "jest": true
+  },
+  "parserOptions": {
+    "ecmaFeatures": {
+      "jsx": true
+    },
+    "ecmaVersion": 2019,
+    "sourceType": "module"
+  },
+  "globals": {
+    "Atomics": "readonly",
+    "SharedArrayBuffer": "readonly"
+  },
+  "plugins": ["react", "react-hooks", "jsx-a11y", "prettier", "jest"],
+  "extends": ["plugin:react/recommended", "airbnb", "prettier", "plugin:jest/recommended", "plugin:jest/style"],
+  "rules": {
+    "jest/prefer-strict-equal": "error",
+    "jest/prefer-to-have-length": "warn",
+    "prettier/prettier": "error",
+    "import/prefer-default-export": "off",
+    "react/prop-types": "off",
+    "react/jsx-filename-extension": "off",
+    "react/jsx-props-no-spreading": "off",
+    "import/no-extraneous-dependencies": [
+      "error",
+      {
+        "devDependencies": [
+          "**/*.test.[jt]s",
+          "**/*.spec.[jt]s",
+          "**/*.test.[jt]sx",
+          "**/*.spec.[jt]sx"
+        ]
+      }
+    ],
+    "import/extensions": [
+      "error",
+      "ignorePackages",
+      {
+        "ts": "never",
+        "tsx": "never",
+        "js": "never",
+        "jsx": "never"
+      }
+    ]
+  },
+  "overrides": [
+    {
+      "files": "**/*.+(ts|tsx)",
+      "parser": "@typescript-eslint/parser",
+      "parserOptions": {
+        "project": "./tsconfig.json"
+      },
+      "plugins": ["@typescript-eslint/eslint-plugin"],
+      "extends": [
+        "plugin:@typescript-eslint/eslint-recommended",
+        "plugin:@typescript-eslint/recommended",
+        "prettier"
+      ],
+      "rules": {
+        "@typescript-eslint/explicit-function-return-type": "off",
+        "@typescript-eslint/no-explicit-any": "off",
+        "@typescript-eslint/no-var-requires": "off",
+        "no-use-before-define": [0],
+        "@typescript-eslint/no-use-before-define": [1],
+        "import/no-unresolved": 0,
+        "import/no-extraneous-dependencies": [
+          "error",
+          {
+            "devDependencies": [
+              "**/*.test.ts",
+              "**/*.spec.ts",
+              "**/*.test.tsx",
+              "**/*.spec.tsx"
+            ]
+          }
+        ],
+        "quotes": "off",
+        "@typescript-eslint/quotes": [
+          2,
+          "single",
+          {
+            "avoidEscape": true
+          }
+        ],
+        "@typescript-eslint/no-unused-vars": [2, { "argsIgnorePattern": "^_" }]
+      }
+    }
+  ],
+  "settings": {
+    "import/resolver": {
+      "root-import": {
+        "rootPathPrefix": "@",
+        "rootPathSuffix": "src",
+        "extensions": [".js", ".ts", ".tsx", ".jsx", ".mdx"]
+      }
+    }
+  }
+}
@@ -0,0 +1,3 @@
+dist
+.DS_Store
+detailAPI.md
@@ -0,0 +1 @@
+14
@@ -0,0 +1,6 @@
+{
+  "trailingComma": "all",
+  "singleQuote": true,
+  "printWidth": 80,
+  "tabWidth": 2
+}
@@ -0,0 +1,5 @@
+{
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": true
+  }
+}
@@ -0,0 +1,50 @@
+# Nym Network Explorer
+
+The network explorer lets you explore the Nym network.
+
+## Getting started
+
+You will need:
+
+- NodeJS (use `nvm install` to automatically install the correct version)
+- `npm`
+
+From the `explorer` directory of the `nym` monorepo, run:
+
+```
+npm install
+npm run start
+```
+
+You can then open a browser to http://localhost:3000 and start development.
+
+## Development
+
+Documentation for developers [can be found here](./docs).
+
+## Deployment
+
+Build the UI with:
+
+```
+npm install
+npm run build
+```
+
+The output will be in the `dist` directory. Serve this with `nginx` or `httpd`.
+
+Make sure you have built the [explorer-api](./explorer-api) and are running it as a service proxied through 
+`nginx` or `httpd` so that both the UI and API are running on the same host. 
+
+## License
+
+Please see the [project README](./README.md) and the [LICENSES directory](../LICENSES) for license details for all Nym software.
+
+## Contributing
+
+If you would like to contribute to the Network Explorer send us a PR or
+[raise an issue on GitHub](https://github.com/nymtech/nym/issues) and tag them with `network-explorer`.
+
+## Development
+
+Please see [development docs](./docs) here for more information on the structure and design of this app.
@@ -0,0 +1,46 @@
+# Nym Network Explorer - Development Docs
+
+## Getting started
+
+You will need:
+
+- NodeJS
+- `nvm`
+
+We use the following:
+
+- Typescript
+- `eslint`
+- `webpack`
+- `jest`
+- `react-material-ui`
+- `react` 17
+
+## Development mode
+
+Run the following:
+
+```
+npm install
+npm run start
+```
+
+A development server with hot reloading will be running on http://localhost:3000.
+
+## Linting
+
+`eslint` and `prettier` are configured.
+
+You can lint the code by running:
+
+```
+npm run lint
+```
+
+> **Note:** this will only show linting errors and will not fix them
+ 
+To fix all linting errors automatically run:
+
+```
+npm run lint:fix
+```
@@ -0,0 +1,5 @@
+/** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+};
@@ -0,0 +1,108 @@
+{
+  "name": "@nym/network-explorer",
+  "version": "1.0.0",
+  "private": true,
+  "license": "Apache-2.0",
+  "dependencies": {
+    "@cosmjs/math": "^0.26.2",
+    "@emotion/react": "^11.4.1",
+    "@emotion/styled": "^11.3.0",
+    "@mui/icons-material": "^5.0.0",
+    "@mui/material": "^5.0.1",
+    "@mui/styles": "^5.0.1",
+    "@mui/system": "^5.0.1",
+    "@mui/x-data-grid": "^5.0.0-beta.2",
+    "@nymproject/nym-validator-client": "^0.18.0",
+    "d3-scale": "^4.0.0",
+    "date-fns": "^2.24.0",
+    "i18n-iso-countries": "^6.8.0",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "react-google-charts": "^3.0.15",
+    "react-router-dom": "^5.3.0",
+    "react-simple-maps": "^2.3.0",
+    "react-tooltip": "^4.2.21"
+  },
+  "devDependencies": {
+    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.0-rc.3",
+    "@testing-library/jest-dom": "^5.14.1",
+    "@testing-library/react": "^12.0.0",
+    "@types/d3-fetch": "^3.0.1",
+    "@types/d3-geo": "^3.0.2",
+    "@types/d3-scale": "^4.0.1",
+    "@types/geojson": "^7946.0.8",
+    "@types/jest": "^27.0.1",
+    "@types/node": "^16.7.13",
+    "@types/react": "^17.0.34",
+    "@types/react-dom": "^17.0.9",
+    "@types/react-router-dom": "^5.1.8",
+    "@types/react-simple-maps": "^1.0.6",
+    "@types/react-tooltip": "^4.2.4",
+    "@types/topojson-client": "^3.1.0",
+    "@typescript-eslint/eslint-plugin": "4.31.0",
+    "@typescript-eslint/parser": "4.31.0",
+    "babel-plugin-root-import": "^6.6.0",
+    "clean-webpack-plugin": "^4.0.0",
+    "css-loader": "^6.2.0",
+    "css-minimizer-webpack-plugin": "^3.0.2",
+    "eslint": "7.32.0",
+    "eslint-config-airbnb": "18.2.1",
+    "eslint-config-prettier": "8.3.0",
+    "eslint-import-resolver-root-import": "1.0.4",
+    "eslint-plugin-import": "2.24.2",
+    "eslint-plugin-jest": "^24.4.0",
+    "eslint-plugin-jsx-a11y": "6.4.1",
+    "eslint-plugin-prettier": "4.0.0",
+    "eslint-plugin-react": "7.25.1",
+    "eslint-plugin-react-hooks": "4.2.0",
+    "fork-ts-checker-webpack-plugin": "^6.3.3",
+    "html-webpack-plugin": "^5.3.2",
+    "imports-loader": "^3.0.0",
+    "jest": "^27.1.0",
+    "loader-utils": "^2.0.0",
+    "mini-css-extract-plugin": "^2.2.2",
+    "prettier": "2.3.2",
+    "react-refresh": "^0.10.0",
+    "react-refresh-typescript": "^2.0.2",
+    "style-loader": "^3.2.1",
+    "ts-jest": "^27.0.5",
+    "ts-loader": "^9.2.5",
+    "tsconfig-paths-webpack-plugin": "^3.5.1",
+    "typescript": "^4.4.2",
+    "webpack": "^5.52.0",
+    "webpack-cli": "^4.8.0",
+    "webpack-dev-server": "^4.1.0",
+    "webpack-favicons": "^1.0.7",
+    "webpack-merge": "^5.8.0",
+    "yaml-loader": "^0.6.0"
+  },
+  "scripts": {
+    "start": "webpack serve --progress --port 3000",
+    "build": "webpack build --progress --config webpack.prod.js",
+    "build:serve": "npx serve dist",
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "tsc": "tsc",
+    "tsc:watch": "tsc --watch",
+    "lint": "eslint src",
+    "lint:fix": "eslint src --fix"
+  },
+  "eslintConfig": {
+    "extends": [
+      "react-app",
+      "react-app/jest"
+    ]
+  },
+  "browserslist": {
+    "production": [
+      ">0.2%",
+      "not dead",
+      "not op_mini all"
+    ],
+    "development": [
+      "last 1 chrome version",
+      "last 1 firefox version",
+      "last 1 safari version"
+    ]
+  }
+}
@@ -0,0 +1,9 @@
+import * as React from 'react';
+import { Nav } from './components/Nav';
+import { Routes } from './routes/index';
+
+export const App: React.FC = () => (
+  <Nav>
+    <Routes />
+  </Nav>
+);
@@ -0,0 +1,24 @@
+// master APIs
+export const MASTER_URL = 'https://testnet-milhon-explorer.nymtech.net';
+export const MASTER_VALIDATOR_URL =
+  'https://testnet-milhon-validator1.nymtech.net';
+export const BIG_DIPPER = 'https://testnet-milhon-blocks.nymtech.net';
+
+// specific API routes
+export const MIXNODE_PING = `${MASTER_URL}/api/ping`;
+export const MIXNODES_API = `${MASTER_URL}/api/mix-node`;
+export const GATEWAYS_API = `${MASTER_VALIDATOR_URL}/api/v1/gateways`;
+export const VALIDATORS_API = `${MASTER_VALIDATOR_URL}/validators`;
+export const BLOCK_API = `${MASTER_VALIDATOR_URL}/block`;
+export const COUNTRY_DATA_API = `${MASTER_URL}/api/countries`;
+export const UPTIME_STORY_API = `${MASTER_VALIDATOR_URL}/api/v1/status/mixnode`; // add ID then '/history' to this.
+
+// errors
+export const MIXNODE_API_ERROR =
+  "We're having trouble finding that record, please try again or Contact Us.";
+
+// socials
+export const TELEGRAM_LINK = 'https://t.me/nymchan';
+export const TWITTER_LINK = 'https://twitter.com/nymproject';
+export const GITHUB_LINK = 'https://github.com/nymtech';
+export const NYM_WEBSITE = 'https://nymtech.net';
@@ -0,0 +1,102 @@
+import {
+  GATEWAYS_API,
+  MIXNODES_API,
+  VALIDATORS_API,
+  BLOCK_API,
+  COUNTRY_DATA_API,
+  MIXNODE_PING,
+  UPTIME_STORY_API,
+} from './constants';
+
+import {
+  MixNodeResponse,
+  GatewayResponse,
+  ValidatorsResponse,
+  CountryDataResponse,
+  MixNodeResponseItem,
+  DelegationsResponse,
+  StatsResponse,
+  StatusResponse,
+  UptimeStoryResponse,
+} from '../typeDefs/explorer-api';
+
+function getFromCache(key: string) {
+  const ts = Number(localStorage.getItem('ts'));
+  const hasExpired = Date.now() - ts > 200000;
+  const curr = localStorage.getItem(key);
+  if (curr && !hasExpired) {
+    return JSON.parse(curr);
+  }
+  return undefined;
+}
+
+function storeInCache(key: string, data: any) {
+  localStorage.setItem(key, data);
+}
+export class Api {
+  static fetchMixnodes = async (): Promise<MixNodeResponse> => {
+    const cachedMixnodes = getFromCache('mixnodes');
+    if (cachedMixnodes) {
+      return cachedMixnodes;
+    }
+    const res = await fetch(MIXNODES_API);
+    const json = await res.json();
+    storeInCache('mixnodes', JSON.stringify(json));
+    storeInCache('ts', Date.now());
+    return json;
+  };
+
+  static fetchMixnodeByID = async (
+    id: string,
+  ): Promise<MixNodeResponseItem | undefined> => {
+    const allMixnodes: MixNodeResponse = await Api.fetchMixnodes();
+    const matchedByID = allMixnodes.filter(
+      (eachRecord) => eachRecord.mix_node.identity_key === id,
+    );
+    return (matchedByID.length && matchedByID[0]) || undefined;
+  };
+
+  static fetchGateways = async (): Promise<GatewayResponse> => {
+    const res = await fetch(GATEWAYS_API);
+    return res.json();
+  };
+
+  static fetchValidators = async (): Promise<ValidatorsResponse> => {
+    const res = await fetch(VALIDATORS_API);
+    const json = await res.json();
+    return json.result;
+  };
+
+  static fetchBlock = async (): Promise<number> => {
+    const res = await fetch(BLOCK_API);
+    const json = await res.json();
+    const { height } = json.result.block.header;
+    return height;
+  };
+
+  static fetchCountryData = async (): Promise<CountryDataResponse> => {
+    const result: CountryDataResponse = {};
+    const res = await fetch(COUNTRY_DATA_API);
+    const json = await res.json();
+    Object.keys(json).forEach((ISO3) => {
+      result[ISO3] = { ISO3, nodes: json[ISO3] };
+    });
+    return result;
+  };
+
+  static fetchDelegationsById = async (
+    id: string,
+  ): Promise<DelegationsResponse> =>
+    (await fetch(`${MIXNODES_API}/${id}/delegations`)).json();
+
+  static fetchStatsById = async (id: string): Promise<StatsResponse> =>
+    (await fetch(`${MIXNODES_API}/${id}/stats`)).json();
+
+  static fetchStatusById = async (id: string): Promise<StatusResponse> =>
+    (await fetch(`${MIXNODE_PING}/${id}`)).json();
+
+  static fetchUptimeStoryById = async (
+    id: string,
+  ): Promise<UptimeStoryResponse> =>
+    (await fetch(`${UPTIME_STORY_API}/${id}/history`)).json();
+}
@@ -0,0 +1,217 @@
+import * as React from 'react';
+import { printableCoin } from '@nymproject/nym-validator-client';
+import { Alert, CircularProgress, useMediaQuery, Box } from '@mui/material';
+import { useTheme } from '@mui/material/styles';
+import Table from '@mui/material/Table';
+import TableBody from '@mui/material/TableBody';
+import TableCell from '@mui/material/TableCell';
+import TableContainer from '@mui/material/TableContainer';
+import TableHead from '@mui/material/TableHead';
+import TableRow from '@mui/material/TableRow';
+import Paper from '@mui/material/Paper';
+import { useMainContext } from 'src/context/main';
+import { ExpandMore } from '@mui/icons-material';
+
+export const BondBreakdownTable: React.FC = () => {
+  const { mixnodeDetailInfo, delegations } = useMainContext();
+  const [allContentLoaded, setAllContentLoaded] =
+    React.useState<boolean>(false);
+  const [showError, setShowError] = React.useState<boolean>(false);
+  const [showDelegations, toggleShowDelegations] =
+    React.useState<boolean>(false);
+
+  const [bonds, setBonds] = React.useState({
+    delegations: '0',
+    pledges: '0',
+    bondsTotal: '0',
+    hasLoaded: false,
+  });
+  const theme = useTheme();
+  const matches = useMediaQuery(theme.breakpoints.down('sm'));
+
+  React.useEffect(() => {
+    if (mixnodeDetailInfo && mixnodeDetailInfo.data?.length) {
+      const thisMixnode = mixnodeDetailInfo?.data[0];
+
+      // delegations
+      const decimalisedDelegations = printableCoin({
+        amount: thisMixnode.total_delegation.amount.toString(),
+        denom: thisMixnode.total_delegation.denom,
+      });
+
+      // pledges
+      const decimalisedPledges = printableCoin({
+        amount: thisMixnode.bond_amount.amount.toString(),
+        denom: thisMixnode.bond_amount.denom,
+      });
+
+      // bonds total (del + pledges)
+      const pledgesSum = Number(thisMixnode.bond_amount.amount);
+      const delegationsSum = Number(thisMixnode.total_delegation.amount);
+      const bondsTotal = printableCoin({
+        amount: (delegationsSum + pledgesSum).toString(),
+        denom: 'upunk',
+      });
+
+      setBonds({
+        delegations: decimalisedDelegations,
+        pledges: decimalisedPledges,
+        bondsTotal,
+        hasLoaded: true,
+      });
+    }
+  }, [mixnodeDetailInfo]);
+
+  React.useEffect(() => {
+    const hasError = Boolean(mixnodeDetailInfo?.error || delegations?.error);
+    const hasAllMixnodeInfo = Boolean(
+      mixnodeDetailInfo?.data !== undefined &&
+        mixnodeDetailInfo?.data[0].mix_node,
+    );
+    const hasAllDelegationsInfo = Boolean(
+      delegations?.data !== undefined && delegations?.data,
+    );
+    const hasAllData = Boolean(
+      !hasError && hasAllMixnodeInfo && hasAllDelegationsInfo,
+    );
+    setShowError(hasError);
+    setAllContentLoaded(hasAllData);
+  }, [mixnodeDetailInfo, delegations]);
+
+  const expandDelegations = () => {
+    if (delegations?.data && delegations.data.length > 0) {
+      toggleShowDelegations(!showDelegations);
+    }
+  };
+  const calcBondPercentage = (num: number) => {
+    if (mixnodeDetailInfo?.data !== undefined && mixnodeDetailInfo?.data[0]) {
+      const rawDeligationAmount = Number(
+        mixnodeDetailInfo.data[0].total_delegation.amount,
+      );
+      const rawPledgeAmount = Number(
+        mixnodeDetailInfo.data[0].bond_amount.amount,
+      );
+      const rawTotalBondsAmount = rawDeligationAmount + rawPledgeAmount;
+      return ((num * 100) / rawTotalBondsAmount).toFixed(1);
+    }
+    return 0;
+  };
+
+  if (mixnodeDetailInfo?.isLoading) {
+    return <CircularProgress />;
+  }
+
+  if (showError) {
+    return (
+      <Alert severity="warning">
+        We are unable to retrieve a Mixnode with that ID. Please try later or
+        Contact Us.
+      </Alert>
+    );
+  }
+
+  if (!showError && allContentLoaded) {
+    return (
+      <>
+        <TableContainer component={Paper}>
+          <Table sx={{ minWidth: 650 }} aria-label="bond breakdown totals">
+            <TableBody>
+              <TableRow sx={matches ? { minWidth: '70vw' } : null}>
+                <TableCell
+                  sx={{
+                    fontWeight: 'bold',
+                    width: '150px',
+                  }}
+                  align="left"
+                >
+                  Bond total
+                </TableCell>
+                <TableCell align="left">{bonds.bondsTotal}</TableCell>
+              </TableRow>
+              <TableRow>
+                <TableCell align="left">Pledge total</TableCell>
+                <TableCell align="left">{bonds.pledges}</TableCell>
+              </TableRow>
+              <TableRow>
+                <TableCell onClick={expandDelegations} align="left">
+                  <Box
+                    sx={{
+                      display: 'flex',
+                      alignItems: 'center',
+                    }}
+                  >
+                    Delegation total {'\u00A0'}
+                    {delegations?.data && delegations?.data?.length > 0 && (
+                      <ExpandMore />
+                    )}
+                  </Box>
+                </TableCell>
+                <TableCell align="left">{bonds.delegations}</TableCell>
+              </TableRow>
+            </TableBody>
+          </Table>
+
+          {showDelegations && (
+            <Box
+              sx={{
+                maxHeight: 400,
+                overflowY: 'scroll',
+              }}
+            >
+              <Table stickyHeader>
+                <TableHead>
+                  <TableRow>
+                    <TableCell
+                      sx={{ fontWeight: 'bold', background: '#242C3D' }}
+                      align="left"
+                    >
+                      Delegators
+                    </TableCell>
+                    <TableCell
+                      sx={{ fontWeight: 'bold', background: '#242C3D' }}
+                      align="left"
+                    >
+                      Stake
+                    </TableCell>
+                    <TableCell
+                      sx={{
+                        fontWeight: 'bold',
+                        background: '#242C3D',
+                        width: '200px',
+                      }}
+                      align="left"
+                    >
+                      Share from bond
+                    </TableCell>
+                  </TableRow>
+                </TableHead>
+
+                <TableBody>
+                  {delegations?.data?.map(
+                    ({ owner, amount: { amount, denom } }) => (
+                      <TableRow key={owner}>
+                        <TableCell
+                          sx={matches ? { width: 190 } : null}
+                          align="left"
+                        >
+                          {owner}
+                        </TableCell>
+                        <TableCell align="left">
+                          {printableCoin({ amount: amount.toString(), denom })}
+                        </TableCell>
+                        <TableCell align="left">
+                          {calcBondPercentage(amount)}%
+                        </TableCell>
+                      </TableRow>
+                    ),
+                  )}
+                </TableBody>
+              </Table>
+            </Box>
+          )}
+        </TableContainer>
+      </>
+    );
+  }
+  return null;
+};
@@ -0,0 +1,11 @@
+import { Typography } from '@mui/material';
+import * as React from 'react';
+
+export const ComponentError: React.FC<{ text: string }> = ({ text }) => (
+  <Typography
+    sx={{ marginTop: 2, color: 'primary.main', fontSize: 10 }}
+    variant="body1"
+  >
+    {text}
+  </Typography>
+);
@@ -0,0 +1,47 @@
+import { Card, CardHeader, CardContent, Typography } from '@mui/material';
+import React, { ReactEventHandler } from 'react';
+
+type ContentCardProps = {
+  title?: string | React.ReactNode;
+  subtitle?: string;
+  Icon?: React.ReactNode;
+  Action?: React.ReactNode;
+  errorMsg?: string;
+  onClick?: ReactEventHandler;
+};
+
+export const ContentCard: React.FC<ContentCardProps> = ({
+  title,
+  Icon,
+  Action,
+  subtitle,
+  errorMsg,
+  children,
+  onClick,
+}) => (
+  <Card onClick={onClick} sx={{ height: '100%' }}>
+    {title && (
+      <CardHeader
+        title={title || ''}
+        avatar={Icon}
+        action={Action}
+        subheader={subtitle}
+      />
+    )}
+    {children && <CardContent>{children}</CardContent>}
+    {errorMsg && (
+      <Typography variant="body2" sx={{ color: 'danger', padding: 2 }}>
+        {errorMsg}
+      </Typography>
+    )}
+  </Card>
+);
+
+ContentCard.defaultProps = {
+  title: undefined,
+  subtitle: undefined,
+  Icon: null,
+  Action: null,
+  errorMsg: undefined,
+  onClick: () => null,
+};
@@ -0,0 +1,27 @@
+import * as React from 'react';
+import { Box, Typography } from '@mui/material';
+import { ExpandLess, ExpandMore } from '@mui/icons-material';
+
+export const CustomColumnHeading: React.FC<{ headingTitle: string }> = ({
+  headingTitle,
+}) => {
+  const [filter, toggleFilter] = React.useState<boolean>(false);
+
+  const handleClick = () => {
+    toggleFilter(!filter);
+  };
+  return (
+    <Box alignItems="center" display="flex" onClick={handleClick}>
+      <Typography
+        sx={{
+          fontWeight: 'bold',
+          fontSize: 14,
+          padding: 0,
+        }}
+      >
+        {headingTitle}&nbsp;
+      </Typography>
+      {filter ? <ExpandMore /> : <ExpandLess />}
+    </Box>
+  );
+};
@@ -0,0 +1,49 @@
+import * as React from 'react';
+import Box from '@mui/material/Box';
+import { Typography, useMediaQuery } from '@mui/material';
+import { useTheme } from '@mui/material/styles';
+import { Socials } from './Socials';
+
+export const Footer: React.FC = () => {
+  const theme = useTheme();
+  const isMobile = useMediaQuery(theme.breakpoints.down('md'));
+
+  return (
+    <Box
+      sx={{
+        display: 'flex',
+        flexDirection: 'column',
+        justifyContent: 'center',
+        width: '100%',
+        height: 'auto',
+        mt: 3,
+        pt: 3,
+        pb: 3,
+      }}
+    >
+      {isMobile && (
+        <Box
+          sx={{
+            display: 'flex',
+            flexDirection: 'row',
+            width: 'auto',
+            justifyContent: 'center',
+            alignItems: 'center',
+            mb: 2,
+          }}
+        >
+          <Socials isFooter />
+        </Box>
+      )}
+      <Typography
+        sx={{
+          fontSize: 12,
+          textAlign: isMobile ? 'center' : 'end',
+          color: theme.palette.nym.text.footer,
+        }}
+      >
+        © 2021 Nym Technologies SA, all rights reserved
+      </Typography>
+    </Box>
+  );
+};
@@ -0,0 +1,397 @@
+/* eslint-disable no-nested-ternary */
+import * as React from 'react';
+import { Link } from 'react-router-dom';
+import { ChevronLeft, ExpandLess, ExpandMore, Menu } from '@mui/icons-material';
+import { CSSObject, styled, Theme, useTheme } from '@mui/material/styles';
+import MuiLink from '@mui/material/Link';
+import Box from '@mui/material/Box';
+import ListItem from '@mui/material/ListItem';
+import MuiDrawer from '@mui/material/Drawer';
+import AppBar from '@mui/material/AppBar';
+import Toolbar from '@mui/material/Toolbar';
+import List from '@mui/material/List';
+import Typography from '@mui/material/Typography';
+import IconButton from '@mui/material/IconButton';
+import ListItemButton from '@mui/material/ListItemButton';
+import ListItemIcon from '@mui/material/ListItemIcon';
+import ListItemText from '@mui/material/ListItemText';
+import { NymLogoSVG } from 'src/icons/NymLogoSVG';
+import { BIG_DIPPER, NYM_WEBSITE } from 'src/api/constants';
+import { useMediaQuery } from '@mui/material';
+import { OverviewSVG } from '../icons/OverviewSVG';
+import { NetworkComponentsSVG } from '../icons/NetworksSVG';
+import { NodemapSVG } from '../icons/NodemapSVG';
+import { Socials } from './Socials';
+import { Footer } from './Footer';
+import { DarkLightSwitchDesktop, DarkLightSwitchMobile } from './Switch';
+
+const drawerWidth = 300;
+
+const openedMixin = (theme: Theme): CSSObject => ({
+  width: drawerWidth,
+  transition: theme.transitions.create('width', {
+    easing: theme.transitions.easing.sharp,
+    duration: theme.transitions.duration.enteringScreen,
+  }),
+  overflowX: 'hidden',
+});
+
+const closedMixin = (theme: Theme): CSSObject => ({
+  transition: theme.transitions.create('width', {
+    easing: theme.transitions.easing.sharp,
+    duration: theme.transitions.duration.leavingScreen,
+  }),
+  overflowX: 'hidden',
+  width: `calc(${theme.spacing(7)} + 1px)`,
+});
+
+const DrawerHeader = styled('div')(({ theme }) => ({
+  display: 'flex',
+  alignItems: 'center',
+  justifyContent: 'flex-end',
+  padding: theme.spacing(0, 1),
+  height: 64,
+}));
+
+const Drawer = styled(MuiDrawer, {
+  shouldForwardProp: (prop) => prop !== 'open',
+})(({ theme, open }) => ({
+  width: drawerWidth,
+  flexShrink: 0,
+  whiteSpace: 'nowrap',
+  boxSizing: 'border-box',
+  ...(open && {
+    ...openedMixin(theme),
+    '& .MuiDrawer-paper': openedMixin(theme),
+  }),
+  ...(!open && {
+    ...closedMixin(theme),
+    '& .MuiDrawer-paper': closedMixin(theme),
+  }),
+}));
+
+type navOptionType = {
+  id: number;
+  isActive?: boolean;
+  url: string;
+  title: string;
+  Icon?: React.ReactNode;
+  nested?: navOptionType[];
+  isExpandedChild?: boolean;
+};
+
+const originalNavOptions: navOptionType[] = [
+  {
+    id: 0,
+    isActive: false,
+    url: '/overview',
+    title: 'Overview',
+    Icon: <OverviewSVG />,
+  },
+  {
+    id: 1,
+    isActive: false,
+    url: '/network-components',
+    title: 'Network Components',
+    Icon: <NetworkComponentsSVG />,
+    nested: [
+      {
+        id: 3,
+        url: '/network-components/mixnodes',
+        title: 'Mixnodes',
+      },
+      {
+        id: 4,
+        url: '/network-components/gateways',
+        title: 'Gateways',
+      },
+      {
+        id: 5,
+        url: `${BIG_DIPPER}/validators`,
+        title: 'Validators',
+      },
+    ],
+  },
+  {
+    id: 2,
+    isActive: false,
+    url: '/nodemap',
+    title: 'Nodemap',
+    Icon: <NodemapSVG />,
+  },
+];
+
+type ExpandableButtonType = {
+  id: number;
+  title: string;
+  url: string;
+  isActive?: boolean;
+  Icon?: React.ReactNode;
+  nested?: navOptionType[];
+  isChild?: boolean;
+  openDrawer: () => void;
+  closeDrawer: () => void;
+  drawIsOpen: boolean;
+  setToActive: (num: number) => void;
+};
+
+const ExpandableButton: React.FC<ExpandableButtonType> = ({
+  id,
+  url,
+  setToActive,
+  isActive,
+  openDrawer,
+  closeDrawer,
+  drawIsOpen,
+  Icon,
+  title,
+  nested,
+  isChild,
+}) => {
+  const [dynamicStyle, setDynamicStyle] = React.useState({});
+  const [nestedOptions, toggleNestedOptions] = React.useState(false);
+  const [isExternal, setIsExternal] = React.useState<boolean>(false);
+  const { palette } = useTheme();
+
+  const handleClick = () => {
+    openDrawer();
+    if (title === 'Network Components' && nested) {
+      toggleNestedOptions(!nestedOptions);
+    }
+    setToActive(id);
+  };
+
+  React.useEffect(() => {
+    if (url) {
+      setIsExternal(url.includes('http'));
+    }
+    if (nested) {
+      setDynamicStyle({
+        background: '#242C3D',
+        borderRight: `3px solid ${palette.nym.highlight}`,
+      });
+    }
+    if (isChild) {
+      setDynamicStyle({
+        background: '#3C4558',
+        fontWeight: 800,
+      });
+    }
+    if (!nested && !isChild) {
+      setDynamicStyle({
+        background: '#242C3D',
+        borderRight: `3px solid ${palette.nym.highlight}`,
+      });
+    }
+  }, [url]);
+
+  React.useEffect(() => {
+    if (!drawIsOpen && nestedOptions) {
+      toggleNestedOptions(false);
+    }
+  }, [drawIsOpen]);
+
+  return (
+    <>
+      <ListItem
+        disablePadding
+        disableGutters
+        component={!nested ? Link : 'div'}
+        to={isExternal ? { pathname: url } : url}
+        target={isExternal ? '_blank' : ''}
+        sx={
+          isActive
+            ? dynamicStyle
+            : { background: '#111826', borderRight: 'none' }
+        }
+      >
+        <ListItemButton
+          onClick={handleClick}
+          sx={{
+            pt: 2,
+            pb: 2,
+            background: isChild ? '#3C4558' : 'none',
+          }}
+        >
+          <ListItemIcon>{Icon}</ListItemIcon>
+          <ListItemText
+            primary={title}
+            sx={{
+              color: palette.nym.networkExplorer.nav.text,
+            }}
+            primaryTypographyProps={{
+              style: {
+                fontWeight: isActive ? 800 : 300,
+              },
+            }}
+          />
+          {nested && nestedOptions && <ExpandLess />}
+          {nested && !nestedOptions && <ExpandMore />}
+        </ListItemButton>
+      </ListItem>
+      {nestedOptions &&
+        nested?.map((each) => (
+          <ExpandableButton
+            id={each.id}
+            url={each.url}
+            key={each.title}
+            title={each.title}
+            openDrawer={openDrawer}
+            drawIsOpen={drawIsOpen}
+            closeDrawer={closeDrawer}
+            setToActive={setToActive}
+            isChild
+          />
+        ))}
+    </>
+  );
+};
+
+ExpandableButton.defaultProps = {
+  Icon: null,
+  nested: undefined,
+  isChild: false,
+  isActive: false,
+};
+
+export const Nav: React.FC = ({ children }) => {
+  const [navOptionsState, updateNavOptionsState] =
+    React.useState(originalNavOptions);
+  const [open, setOpen] = React.useState(false);
+  const theme = useTheme();
+  const isMobile = useMediaQuery(theme.breakpoints.down('md'));
+
+  const setToActive = (id: number) => {
+    const updated = navOptionsState.map((option) => ({
+      ...option,
+      isActive: option.id === id,
+    }));
+    updateNavOptionsState(updated);
+  };
+
+  const handleDrawerOpen = () => {
+    setOpen(true);
+  };
+
+  const handleDrawerClose = () => {
+    setOpen(false);
+  };
+
+  return (
+    <>
+      <Box sx={{ display: 'flex' }}>
+        <AppBar
+          sx={{
+            background: theme.palette.nym.networkExplorer.nav.background,
+          }}
+        >
+          <Toolbar
+            disableGutters
+            sx={{
+              display: 'flex',
+              justifyContent: 'space-between',
+            }}
+          >
+            <Box
+              sx={{
+                display: 'flex',
+                flexDirection: 'row',
+                alignItems: 'center',
+                justifyContent: 'space-between',
+                width: 205,
+              }}
+            >
+              <IconButton component="a" href={NYM_WEBSITE} target="_blank">
+                <NymLogoSVG />
+              </IconButton>
+              <Typography
+                variant="h6"
+                noWrap
+                sx={{
+                  color: theme.palette.nym.networkExplorer.nav.text,
+                  fontSize: '18px',
+                }}
+              >
+                <MuiLink
+                  component={Link}
+                  to="/overview"
+                  underline="none"
+                  color="inherit"
+                >
+                  Network Explorer
+                </MuiLink>
+              </Typography>
+            </Box>
+            <Box
+              sx={{
+                mr: 2,
+                alignItems: 'center',
+                display: 'flex',
+              }}
+            >
+              {!isMobile && (
+                <Box
+                  sx={{
+                    display: 'flex',
+                    flexDirection: 'row',
+                    width: 'auto',
+                    pr: 0,
+                    pl: 2,
+                    justifyContent: 'flex-end',
+                    alignItems: 'center',
+                  }}
+                >
+                  <Socials />
+                  <DarkLightSwitchDesktop defaultChecked />
+                </Box>
+              )}
+              {isMobile && <DarkLightSwitchMobile />}
+            </Box>
+          </Toolbar>
+        </AppBar>
+        <Drawer
+          variant="permanent"
+          open={open}
+          sx={{
+            background: theme.palette.nym.networkExplorer.nav.background,
+          }}
+        >
+          <DrawerHeader
+            sx={{
+              justifyContent: open ? 'flex-end' : 'center',
+              paddingLeft: 0,
+            }}
+          >
+            <IconButton
+              onClick={open ? handleDrawerClose : handleDrawerOpen}
+              sx={{
+                padding: 0,
+                ml: '7px',
+                color: theme.palette.nym.networkExplorer.nav.text,
+              }}
+            >
+              {open ? <ChevronLeft /> : <Menu />}
+            </IconButton>
+          </DrawerHeader>
+
+          <List sx={{ pt: 0, pb: 0 }}>
+            {navOptionsState.map((props) => (
+              <ExpandableButton
+                setToActive={setToActive}
+                key={props.url}
+                openDrawer={handleDrawerOpen}
+                drawIsOpen={open}
+                closeDrawer={handleDrawerClose}
+                {...props}
+              />
+            ))}
+          </List>
+        </Drawer>
+        <Box sx={{ width: '100%', p: 4, mt: 7 }}>
+          {children}
+          <Footer />
+        </Box>
+      </Box>
+    </>
+  );
+};
@@ -0,0 +1,31 @@
+import * as React from 'react';
+import { Box, IconButton } from '@mui/material';
+import { useTheme } from '@mui/material/styles';
+import TelegramIcon from '@mui/icons-material/Telegram';
+import GitHubIcon from '@mui/icons-material/GitHub';
+import TwitterIcon from '@mui/icons-material/Twitter';
+import { GITHUB_LINK, TELEGRAM_LINK, TWITTER_LINK } from 'src/api/constants';
+
+export const Socials: React.FC<{ isFooter?: boolean }> = ({ isFooter }) => {
+  const theme = useTheme();
+  const color = isFooter
+    ? theme.palette.nym.networkExplorer.footer.socialIcons
+    : theme.palette.nym.networkExplorer.topNav.socialIcons;
+  return (
+    <Box>
+      <IconButton component="a" href={TELEGRAM_LINK} target="_blank">
+        <TelegramIcon sx={{ color }} />
+      </IconButton>
+      <IconButton component="a" href={GITHUB_LINK} target="_blank">
+        <GitHubIcon sx={{ color }} />
+      </IconButton>
+      <IconButton component="a" href={TWITTER_LINK} target="_blank">
+        <TwitterIcon sx={{ color }} />
+      </IconButton>
+    </Box>
+  );
+};
+
+Socials.defaultProps = {
+  isFooter: false,
+};
@@ -0,0 +1,57 @@
+import * as React from 'react';
+import { Box, Card, CardContent, IconButton, Typography } from '@mui/material';
+import ArrowRightAltIcon from '@mui/icons-material/ArrowRightAlt';
+
+interface StatsCardProps {
+  icon: React.ReactNode;
+  title: string;
+  count: string | number;
+  errorMsg?: Error | string;
+  onClick?: () => void;
+}
+export const StatsCard: React.FC<StatsCardProps> = ({
+  icon,
+  title,
+  count,
+  onClick,
+  errorMsg,
+}) => (
+  <Card onClick={onClick} sx={{ height: '100%' }}>
+    <CardContent
+      sx={{
+        padding: 2,
+        '&:last-child': {
+          paddingBottom: 2,
+        },
+        cursor: 'pointer',
+      }}
+    >
+      <Box
+        display="flex"
+        alignItems="center"
+        sx={{ color: (theme) => theme.palette.text.primary, fontSize: 18 }}
+      >
+        {icon}
+        <Typography ml={3} mr={0.75} fontSize="inherit">
+          {count}
+        </Typography>
+        <Typography mr={1} fontSize="inherit">
+          {title}
+        </Typography>
+        <IconButton color="inherit">
+          <ArrowRightAltIcon />
+        </IconButton>
+      </Box>
+      {errorMsg && (
+        <Typography variant="body2" sx={{ color: 'danger', padding: 2 }}>
+          {errorMsg}
+        </Typography>
+      )}
+    </CardContent>
+  </Card>
+);
+
+StatsCard.defaultProps = {
+  onClick: undefined,
+  errorMsg: undefined,
+};
@@ -0,0 +1,72 @@
+import * as React from 'react';
+import { styled } from '@mui/material/styles';
+import Switch from '@mui/material/Switch';
+import { Button } from '@mui/material';
+import { useMainContext } from 'src/context/main';
+import { LightSwitchSVG } from '../icons/LightSwitchSVG';
+
+export const DarkLightSwitch = styled(Switch)(({ theme }) => ({
+  width: 55,
+  height: 34,
+  padding: 7,
+  '& .MuiSwitch-switchBase': {
+    margin: 1,
+    padding: 2,
+    transform: 'translateX(4px)',
+    '&.Mui-checked': {
+      color: '#fff',
+      transform: 'translateX(22px)',
+      '& .MuiSwitch-thumb:before': {
+        backgroundImage:
+          'url(\'data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 20 20"><path fill="black" d="M4.2 2.5l-.7 1.8-1.8.7 1.8.7.7 1.8.6-1.8L6.7 5l-1.9-.7-.6-1.8zm15 8.3a6.7 6.7 0 11-6.6-6.6 5.8 5.8 0 006.6 6.6z"/></svg>\')',
+      },
+      '& + .MuiSwitch-track': {
+        opacity: 1,
+        backgroundColor: theme.palette.mode === 'dark' ? '#8796A5' : '#aab4be',
+      },
+    },
+  },
+  '& .MuiSwitch-thumb': {
+    backgroundColor: theme.palette.nym.networkExplorer.nav.text,
+    width: 25,
+    height: 25,
+    marginTop: '2px',
+    '&:before': {
+      content: "''",
+      position: 'absolute',
+      width: '100%',
+      height: '100%',
+      left: 0,
+      top: 0,
+      backgroundRepeat: 'no-repeat',
+      backgroundPosition: 'center',
+      backgroundImage:
+        'url(\'data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 20 20"><path fill="black" d="M9.305 1.667V3.75h1.389V1.667h-1.39zm-4.707 1.95l-.982.982L5.09 6.072l.982-.982-1.473-1.473zm10.802 0L13.927 5.09l.982.982 1.473-1.473-.982-.982zM10 5.139a4.872 4.872 0 00-4.862 4.86A4.872 4.872 0 0010 14.862 4.872 4.872 0 0014.86 10 4.872 4.872 0 0010 5.139zm0 1.389A3.462 3.462 0 0113.471 10a3.462 3.462 0 01-3.473 3.472A3.462 3.462 0 016.527 10 3.462 3.462 0 0110 6.528zM1.665 9.305v1.39h2.083v-1.39H1.666zm14.583 0v1.39h2.084v-1.39h-2.084zM5.09 13.928L3.616 15.4l.982.982 1.473-1.473-.982-.982zm9.82 0l-.982.982 1.473 1.473.982-.982-1.473-1.473zM9.305 16.25v2.083h1.389V16.25h-1.39z"/></svg>\')',
+    },
+  },
+  '& .MuiSwitch-track': {
+    opacity: 1,
+    backgroundColor: theme.palette.mode === 'dark' ? '#8796A5' : '#aab4be',
+    borderRadius: 20 / 2,
+  },
+}));
+
+export const DarkLightSwitchMobile: React.FC = () => {
+  const { toggleMode } = useMainContext();
+  return (
+    <Button onClick={() => toggleMode()}>
+      <LightSwitchSVG />
+    </Button>
+  );
+};
+
+export const DarkLightSwitchDesktop: React.FC<{ defaultChecked: boolean }> = ({
+  defaultChecked,
+}) => {
+  const { toggleMode } = useMainContext();
+  return (
+    <Button onClick={() => toggleMode()}>
+      <DarkLightSwitch defaultChecked={defaultChecked} />
+    </Button>
+  );
+};
@@ -0,0 +1,56 @@
+import * as React from 'react';
+import { Box, useMediaQuery, TextField, MenuItem } from '@mui/material';
+import { useTheme } from '@mui/material/styles';
+import Select, { SelectChangeEvent } from '@mui/material/Select';
+
+type TableToolBarProps = {
+  onChangeSearch: (arg: string) => void;
+  onChangePageSize: (event: SelectChangeEvent<string>) => void;
+  pageSize: string;
+  searchTerm: string;
+};
+
+export const TableToolbar: React.FC<TableToolBarProps> = ({
+  searchTerm,
+  onChangeSearch,
+  onChangePageSize,
+  pageSize,
+}) => {
+  const theme = useTheme();
+  const matches = useMediaQuery(theme.breakpoints.down('sm'));
+  return (
+    <>
+      <Box
+        sx={{
+          width: '100%',
+          marginBottom: 2,
+          display: 'flex',
+          flexDirection: matches ? 'column' : 'row',
+          justifyContent: 'space-between',
+        }}
+      >
+        <Select
+          labelId="demo-simple-select-label"
+          id="demo-simple-select"
+          value={pageSize}
+          onChange={onChangePageSize}
+          sx={{
+            width: 200,
+            marginBottom: matches ? 2 : 0,
+          }}
+        >
+          <MenuItem value={10}>10</MenuItem>
+          <MenuItem value={30}>30</MenuItem>
+          <MenuItem value={50}>50</MenuItem>
+          <MenuItem value={100}>100</MenuItem>
+        </Select>
+        <TextField
+          sx={{ width: 350 }}
+          value={searchTerm}
+          placeholder="search"
+          onChange={(event) => onChangeSearch(event.target.value)}
+        />
+      </Box>
+    </>
+  );
+};
@@ -0,0 +1,13 @@
+import * as React from 'react';
+import { Typography } from '@mui/material';
+
+export const Title: React.FC<{ text: string }> = ({ text }) => (
+  <Typography
+    variant="h5"
+    sx={{
+      mb: 3,
+    }}
+  >
+    {text}
+  </Typography>
+);
@@ -0,0 +1,79 @@
+import * as React from 'react';
+import { CircularProgress, Typography } from '@mui/material';
+import Table from '@mui/material/Table';
+import TableBody from '@mui/material/TableBody';
+import TableCell from '@mui/material/TableCell';
+import TableContainer from '@mui/material/TableContainer';
+import TableRow from '@mui/material/TableRow';
+import Paper from '@mui/material/Paper';
+import CheckCircleSharpIcon from '@mui/icons-material/CheckCircleSharp';
+import ErrorIcon from '@mui/icons-material/Error';
+
+interface TableProps {
+  title?: string;
+  icons?: boolean[];
+  keys: string[];
+  values: number[];
+  marginBottom?: boolean;
+  error?: string;
+  loading: boolean;
+}
+
+export const TwoColSmallTable: React.FC<TableProps> = ({
+  loading,
+  title,
+  icons,
+  keys,
+  values,
+  marginBottom,
+  error,
+}) => (
+  <>
+    {title && <Typography sx={{ marginTop: 2 }}>{title}</Typography>}
+
+    <TableContainer
+      component={Paper}
+      sx={marginBottom ? { marginBottom: 4, marginTop: 2 } : { marginTop: 2 }}
+    >
+      <Table aria-label="two col small table">
+        <TableBody>
+          {keys.map((each: string, i: number) => (
+            <TableRow key={each}>
+              {icons && (
+                <TableCell>
+                  {icons[i] ? <CheckCircleSharpIcon /> : <ErrorIcon />}
+                </TableCell>
+              )}
+              <TableCell sx={error ? { opacity: 0.4 } : null}>{each}</TableCell>
+              <TableCell sx={error ? { opacity: 0.4 } : null} align="right">
+                {values[i]}
+              </TableCell>
+              {error && (
+                <TableCell align="right" sx={{ opacity: 0.4 }}>
+                  {values[i]}
+                </TableCell>
+              )}
+              {!error && loading && (
+                <TableCell align="right">
+                  <CircularProgress />
+                </TableCell>
+              )}
+              {error && !icons && (
+                <TableCell sx={{ opacity: 0.2 }} align="right">
+                  <ErrorIcon />
+                </TableCell>
+              )}
+            </TableRow>
+          ))}
+        </TableBody>
+      </Table>
+    </TableContainer>
+  </>
+);
+
+TwoColSmallTable.defaultProps = {
+  title: undefined,
+  icons: undefined,
+  marginBottom: false,
+  error: undefined,
+};
@@ -0,0 +1,107 @@
+import * as React from 'react';
+import { makeStyles } from '@mui/styles';
+import {
+  DataGrid,
+  GridColumns,
+  GridRowData,
+  GridSortModel,
+  useGridSlotComponentProps,
+} from '@mui/x-data-grid';
+import Pagination from '@mui/material/Pagination';
+import { SxProps } from '@mui/system';
+
+const useStyles = makeStyles({
+  root: {
+    display: 'flex',
+  },
+});
+
+type DataGridProps = {
+  loading?: boolean;
+  rows: GridRowData[];
+  columnsData: GridColumns;
+  pageSize?: string;
+  pagination?: boolean;
+  hideFooter?: boolean;
+  sortModel?: GridSortModel;
+};
+
+export const cellStyles: SxProps = {
+  width: '100%',
+  padding: 0,
+  maxHeight: 100,
+  color: 'inherit',
+  textDecoration: 'none',
+  fontWeight: 400,
+  fontSize: 12,
+  lineHeight: 2,
+  textAlign: 'start',
+  wordBreak: 'break-word',
+  whiteSpace: 'break-spaces',
+};
+
+function CustomPagination() {
+  const { state, apiRef } = useGridSlotComponentProps();
+  const classes = useStyles();
+
+  return (
+    <Pagination
+      className={classes.root}
+      color="primary"
+      count={state.pagination.pageCount}
+      page={state.pagination.page + 1}
+      onChange={(event, value) => apiRef.current.setPage(value - 1)}
+    />
+  );
+}
+
+export const UniversalDataGrid: React.FC<DataGridProps> = ({
+  loading,
+  rows,
+  columnsData,
+  pageSize,
+  pagination,
+  hideFooter,
+  sortModel,
+}) => {
+  const [sortModelState, setSortModelState] = React.useState<
+    GridSortModel | undefined
+  >(sortModel);
+  if (columnsData && rows) {
+    return (
+      <DataGrid
+        pagination
+        components={{
+          Pagination: CustomPagination,
+        }}
+        loading={loading}
+        columns={columnsData}
+        rows={rows}
+        pageSize={Number(pageSize)}
+        rowsPerPageOptions={[5]}
+        hideFooterPagination={!pagination}
+        disableColumnFilter
+        disableColumnMenu
+        disableSelectionOnClick
+        columnBuffer={0}
+        autoHeight
+        hideFooter={hideFooter}
+        sortModel={sortModelState}
+        onSortModelChange={setSortModelState}
+        style={{
+          width: '100%',
+          border: 'none',
+        }}
+      />
+    );
+  }
+  return null;
+};
+
+UniversalDataGrid.defaultProps = {
+  loading: false,
+  pageSize: undefined,
+  pagination: false,
+  hideFooter: true,
+  sortModel: undefined,
+};
@@ -0,0 +1,129 @@
+import * as React from 'react';
+import { CircularProgress, Typography } from '@mui/material';
+import { useTheme } from '@mui/material/styles';
+import { Chart } from 'react-google-charts';
+import { ApiState, UptimeStoryResponse } from 'src/typeDefs/explorer-api';
+import { format } from 'date-fns';
+
+interface ChartProps {
+  title?: string;
+  xLabel: string;
+  yLabel: string;
+  uptimeStory: ApiState<UptimeStoryResponse>;
+  loading: boolean;
+}
+
+type FormattedDateRecord = [string, number, number];
+type FormattedChartHeadings = string[];
+type FormattedChartData = [FormattedChartHeadings | FormattedDateRecord];
+
+export const UptimeChart: React.FC<ChartProps> = ({
+  title,
+  xLabel,
+  yLabel,
+  uptimeStory,
+  loading,
+}) => {
+  const [formattedChartData, setFormattedChartData] =
+    React.useState<FormattedChartData>();
+  const theme = useTheme();
+  const color = theme.palette.text.primary;
+  React.useEffect(() => {
+    if (uptimeStory.data?.history) {
+      const allFormattedChartData: FormattedChartData = [
+        ['Date', 'UptimeV4', 'UptimeV6'],
+      ];
+      uptimeStory.data.history.forEach((eachDate) => {
+        const formattedDateUptimeRecord: FormattedDateRecord = [
+          format(new Date(eachDate.date), 'MMM dd'),
+          eachDate.ipv4_uptime,
+          eachDate.ipv6_uptime,
+        ];
+        allFormattedChartData.push(formattedDateUptimeRecord);
+      });
+      setFormattedChartData(allFormattedChartData);
+    } else {
+      const emptyData: any = [
+        ['Date', 'UptimeV4', 'UptimeV6'],
+        ['Jul 27', 10, 10],
+      ];
+      setFormattedChartData(emptyData);
+    }
+  }, [uptimeStory]);
+
+  return (
+    <>
+      {title && <Typography>{title}</Typography>}
+      {loading && <CircularProgress />}
+
+      {!loading && uptimeStory && (
+        <Chart
+          style={{ minHeight: 480 }}
+          chartType="LineChart"
+          loader={<p>...</p>}
+          data={
+            uptimeStory.data
+              ? formattedChartData
+              : [
+                  ['Date', 'UptimeV4', 'UptimeV6'],
+                  [format(new Date(Date.now()), 'MMM dd'), 0, 0],
+                ]
+          }
+          options={{
+            backgroundColor:
+              theme.palette.mode === 'dark'
+                ? theme.palette.nym.networkExplorer.background.tertiary
+                : undefined,
+            color: uptimeStory.error
+              ? 'rgba(255, 255, 255, 0.4)'
+              : 'rgba(255, 255, 255, 1)',
+            colors: ['#FB7A21', '#CC808A'],
+            legend: {
+              textStyle: {
+                color,
+                opacity: uptimeStory.error ? 0.4 : 1,
+              },
+            },
+
+            intervals: { style: 'sticks' },
+            hAxis: {
+              // horizontal / date
+              title: xLabel,
+              titleTextStyle: {
+                color,
+              },
+              textStyle: {
+                color,
+                // fontSize: 11
+              },
+              gridlines: {
+                count: -1,
+              },
+            },
+            vAxis: {
+              // % uptime vertical
+              viewWindow: {
+                min: 0,
+                max: 100,
+              },
+              title: yLabel,
+              titleTextStyle: {
+                color,
+                opacity: uptimeStory.error ? 0.4 : 1,
+              },
+              textStyle: {
+                color,
+                fontSize: 11,
+                opacity: uptimeStory.error ? 0.4 : 1,
+              },
+            },
+          }}
+        />
+      )}
+    </>
+  );
+};
+
+UptimeChart.defaultProps = {
+  title: undefined,
+};
@@ -0,0 +1,132 @@
+/* eslint-disable @typescript-eslint/ban-ts-comment */
+import * as React from 'react';
+import { scaleLinear } from 'd3-scale';
+import {
+  ComposableMap,
+  Geographies,
+  Geography,
+  Marker,
+  ZoomableGroup,
+} from 'react-simple-maps';
+import ReactTooltip from 'react-tooltip';
+import { ApiState, CountryDataResponse } from 'src/typeDefs/explorer-api';
+import { CircularProgress } from '@mui/material';
+import { useTheme } from '@mui/material/styles';
+import MAP_TOPOJSON from '../assets/world-110m.json';
+
+type MapProps = {
+  userLocation?: [number, number];
+  countryData?: ApiState<CountryDataResponse>;
+  loading: boolean;
+};
+
+export const WorldMap: React.FC<MapProps> = ({
+  countryData,
+  userLocation,
+  loading,
+}) => {
+  const { palette } = useTheme();
+
+  const colorScale = React.useMemo(() => {
+    if (countryData?.data) {
+      const heighestNumberOfNodes = Math.max(
+        ...Object.values(countryData.data).map((country) => country.nodes),
+      );
+      return scaleLinear<string, string>()
+        .domain([
+          0,
+          heighestNumberOfNodes / 4,
+          heighestNumberOfNodes / 2,
+          heighestNumberOfNodes,
+        ])
+        .range(palette.nym.networkExplorer.map.fills)
+        .unknown(palette.nym.networkExplorer.map.fills[0]);
+    }
+    return () => palette.nym.networkExplorer.map.fills[0];
+  }, [countryData, palette]);
+
+  const [tooltipContent, setTooltipContent] = React.useState<string | null>(
+    null,
+  );
+
+  if (loading) {
+    return <CircularProgress />;
+  }
+
+  return (
+    <>
+      <ComposableMap
+        data-tip=""
+        style={{
+          backgroundColor: palette.nym.networkExplorer.background.tertiary,
+          width: '100%',
+          height: 'auto',
+        }}
+        viewBox="0, 50, 800, 350"
+        projection="geoMercator"
+        projectionConfig={{
+          scale: userLocation ? 200 : 100,
+          center: userLocation,
+        }}
+      >
+        <ZoomableGroup>
+          <Geographies geography={MAP_TOPOJSON}>
+            {({ geographies }) =>
+              geographies.map((geo) => {
+                const d = (countryData?.data || {})[geo.properties.ISO_A3];
+                return (
+                  <Geography
+                    key={geo.rsmKey}
+                    geography={geo}
+                    fill={colorScale(d?.nodes || 0)}
+                    stroke={palette.nym.networkExplorer.map.stroke}
+                    strokeWidth={0.2}
+                    onMouseEnter={() => {
+                      const { NAME_LONG } = geo.properties;
+                      if (!userLocation) {
+                        setTooltipContent(`${NAME_LONG} | ${d?.nodes || 0}`);
+                      }
+                    }}
+                    onMouseLeave={() => {
+                      setTooltipContent('');
+                    }}
+                    style={{
+                      hover:
+                        !userLocation && countryData
+                          ? {
+                              fill: palette.nym.highlight,
+                              outline: 'white',
+                            }
+                          : undefined,
+                    }}
+                  />
+                );
+              })
+            }
+          </Geographies>
+
+          {userLocation && (
+            <Marker coordinates={userLocation}>
+              <g
+                fill="grey"
+                stroke="#FF5533"
+                strokeWidth="2"
+                strokeLinecap="round"
+                strokeLinejoin="round"
+                transform="translate(-12, -10)"
+              >
+                <circle cx="12" cy="10" r="5" />
+              </g>
+            </Marker>
+          )}
+        </ZoomableGroup>
+      </ComposableMap>
+      <ReactTooltip>{tooltipContent}</ReactTooltip>
+    </>
+  );
+};
+
+WorldMap.defaultProps = {
+  userLocation: undefined,
+  countryData: undefined,
+};
@@ -0,0 +1,295 @@
+import { PaletteMode } from '@mui/material';
+import * as React from 'react';
+import { MIXNODE_API_ERROR } from 'src/api/constants';
+import {
+  CountryDataResponse,
+  GatewayResponse,
+  MixNodeResponse,
+  ValidatorsResponse,
+  BlockResponse,
+  ApiState,
+  MixNodeResponseItem,
+  DelegationsResponse,
+  StatsResponse,
+  StatusResponse,
+  UptimeStoryResponse,
+} from 'src/typeDefs/explorer-api';
+import { Api } from '../api';
+
+interface State {
+  mode: PaletteMode;
+  toggleMode: () => void;
+  mixnodes?: ApiState<MixNodeResponse>;
+  fetchMixnodes: () => void;
+  filterMixnodes: (arg: MixNodeResponse) => void;
+  gateways?: ApiState<GatewayResponse>;
+  validators?: ApiState<ValidatorsResponse>;
+  block?: ApiState<BlockResponse>;
+  countryData?: ApiState<CountryDataResponse>;
+  globalError?: string | undefined;
+  mixnodeDetailInfo?: ApiState<MixNodeResponse>;
+  fetchMixnodeById: (arg: string) => void;
+  fetchDelegationsById: (arg: string) => void;
+  delegations?: ApiState<DelegationsResponse>;
+  stats?: ApiState<StatsResponse>;
+  fetchStatsById: (arg: string) => void;
+  status?: ApiState<StatusResponse>;
+  fetchStatusById: (arg: string) => void;
+  fetchUptimeStoryById: (arg: string) => void;
+  uptimeStory?: ApiState<UptimeStoryResponse>;
+}
+
+// TODO: remove the export and replace all uses with `useMainContext()` hook
+export const MainContext = React.createContext<State>({
+  mode: 'dark',
+  fetchMixnodeById: () => null,
+  toggleMode: () => undefined,
+  fetchDelegationsById: () => null,
+  fetchStatsById: () => null,
+  fetchStatusById: () => null,
+  fetchUptimeStoryById: () => null,
+  filterMixnodes: () => null,
+  fetchMixnodes: () => null,
+  status: { data: undefined, isLoading: false, error: undefined },
+  stats: { data: undefined, isLoading: false, error: undefined },
+  mixnodeDetailInfo: { data: undefined, isLoading: false, error: undefined },
+  delegations: { data: undefined, isLoading: false, error: undefined },
+});
+
+export const useMainContext = (): React.ContextType<typeof MainContext> =>
+  React.useContext<State>(MainContext);
+
+export const MainContextProvider: React.FC = ({ children }) => {
+  // light/dark mode
+  const [mode, setMode] = React.useState<PaletteMode>('dark');
+
+  // global / banner error messaging
+  const [globalError, setGlobalError] = React.useState<string>();
+
+  // various APIs for Overview page
+  const [mixnodes, setMixnodes] = React.useState<ApiState<MixNodeResponse>>();
+  const [gateways, setGateways] = React.useState<ApiState<GatewayResponse>>();
+  const [validators, setValidators] =
+    React.useState<ApiState<ValidatorsResponse>>();
+  const [block, setBlock] = React.useState<ApiState<BlockResponse>>();
+  const [countryData, setCountryData] =
+    React.useState<ApiState<CountryDataResponse>>();
+  const [mixnodeDetailInfo, setMixnodeDetailInfo] =
+    React.useState<ApiState<MixNodeResponse>>();
+
+  // various APIs for Detail page
+  const [delegations, setDelegations] =
+    React.useState<ApiState<DelegationsResponse>>();
+  const [status, setStatus] = React.useState<ApiState<StatusResponse>>();
+  const [stats, setStats] = React.useState<ApiState<StatsResponse>>();
+  const [uptimeStory, setUptimeStory] =
+    React.useState<ApiState<UptimeStoryResponse>>();
+
+  const toggleMode = () => setMode((m) => (m !== 'light' ? 'light' : 'dark'));
+
+  // actions passed down to Overview and Detail pages
+  const fetchUptimeStoryById = async (id: string) => {
+    setUptimeStory({
+      data: uptimeStory?.data,
+      isLoading: true,
+      error: uptimeStory?.error,
+    });
+    try {
+      const data = await Api.fetchUptimeStoryById(id);
+      setUptimeStory({ data, isLoading: false });
+    } catch (error) {
+      setUptimeStory({
+        error:
+          error instanceof Error ? error : new Error('Uptime Story api fail'),
+        isLoading: false,
+      });
+    }
+  };
+
+  const fetchDelegationsById = async (id: string) => {
+    setDelegations({ data: delegations?.data, isLoading: true });
+    try {
+      const data = await Api.fetchDelegationsById(id);
+      setDelegations({ data, isLoading: false });
+    } catch (error) {
+      setDelegations({
+        error:
+          error instanceof Error ? error : new Error('Delegations api fail'),
+        isLoading: false,
+      });
+    }
+  };
+
+  const fetchStatusById = async (id: string) => {
+    setStatus({ data: status?.data, isLoading: true, error: status?.error });
+    try {
+      const data = await Api.fetchStatusById(id);
+      setStatus({ data, isLoading: false });
+    } catch (error) {
+      setStatus({
+        error: error instanceof Error ? error : new Error('Status api fail'),
+        isLoading: false,
+      });
+    }
+  };
+
+  const fetchStatsById = async (id: string) => {
+    setStats({ data: stats?.data, isLoading: true, error: stats?.error });
+    try {
+      const data = await Api.fetchStatsById(id);
+      setStats({ data, isLoading: false });
+    } catch (error) {
+      setStats({
+        error: error instanceof Error ? error : new Error('Stats api fail'),
+        isLoading: false,
+      });
+    }
+  };
+
+  const fetchMixnodeById = async (id: string) => {
+    setMixnodeDetailInfo({ data: mixnodeDetailInfo?.data, isLoading: true });
+
+    // 1. if mixnode data already exists filter down to this ID
+    if (mixnodes && mixnodes.data) {
+      const [matchedToID] = mixnodes.data.filter(
+        (eachMixnode: MixNodeResponseItem) =>
+          eachMixnode.mix_node.identity_key === id,
+      );
+
+      // b) SUCCESS | if there *IS* a matched ID in mixnodes
+      if (matchedToID) {
+        setMixnodeDetailInfo({ data: [matchedToID], isLoading: false });
+      }
+      // b) FAIL | if there is no matching ID in mixnodes
+      if (!matchedToID) {
+        setGlobalError(MIXNODE_API_ERROR);
+        setMixnodeDetailInfo({
+          isLoading: false,
+          error: new Error(MIXNODE_API_ERROR),
+        });
+      }
+    } else {
+      // 2. if mixnode data DOESNT already exist, fetch this specific ID's information.
+      try {
+        const data = await Api.fetchMixnodeByID(id);
+        // a) fetches from cache^, then API, then filters down then dumps in `mixnodes` context.
+        if (data) {
+          setMixnodeDetailInfo({ data: [data], isLoading: false });
+        } else {
+          throw Error('api failed to retrieve mixnode via id');
+        }
+        // NOTE: Only returning mixnodes api info at the moment. Other `ping` api required also.
+      } catch (error) {
+        setGlobalError(MIXNODE_API_ERROR);
+        setMixnodeDetailInfo({
+          isLoading: false,
+          error: new Error(MIXNODE_API_ERROR),
+        });
+      }
+    }
+  };
+  const fetchMixnodes = async () => {
+    setMixnodes((d) => ({ ...d, isLoading: true }));
+    try {
+      const data = await Api.fetchMixnodes();
+      setMixnodes({ data, isLoading: false });
+    } catch (error) {
+      setMixnodes({
+        error: error instanceof Error ? error : new Error('Mixnode api fail'),
+        isLoading: false,
+      });
+    }
+  };
+  const filterMixnodes = (arr: MixNodeResponse) => {
+    setMixnodes({ data: arr, isLoading: false });
+  };
+  const fetchGateways = async () => {
+    try {
+      const data = await Api.fetchGateways();
+      setGateways({ data, isLoading: false });
+    } catch (error) {
+      setGateways({
+        error: error instanceof Error ? error : new Error('Gateways api fail'),
+        isLoading: false,
+      });
+    }
+  };
+
+  const fetchValidators = async () => {
+    try {
+      const data = await Api.fetchValidators();
+      setValidators({ data, isLoading: false });
+    } catch (error) {
+      setValidators({
+        error:
+          error instanceof Error ? error : new Error('Validators api fail'),
+        isLoading: false,
+      });
+    }
+  };
+
+  const fetchBlock = async () => {
+    try {
+      const data = await Api.fetchBlock();
+      setBlock({ data, isLoading: false });
+    } catch (error) {
+      setBlock({
+        error: error instanceof Error ? error : new Error('Block api fail'),
+        isLoading: false,
+      });
+    }
+  };
+
+  const fetchCountryData = async () => {
+    setCountryData({ data: undefined, isLoading: true });
+    try {
+      const res = await Api.fetchCountryData();
+      setCountryData({ data: res, isLoading: false });
+    } catch (error) {
+      setCountryData({
+        error:
+          error instanceof Error ? error : new Error('Country Data api fail'),
+        isLoading: false,
+      });
+    }
+  };
+
+  React.useEffect(() => {
+    Promise.all([
+      fetchMixnodes(),
+      fetchGateways(),
+      fetchValidators(),
+      fetchBlock(),
+      fetchCountryData(),
+    ]);
+  }, []);
+
+  return (
+    <MainContext.Provider
+      value={{
+        mode,
+        toggleMode,
+        mixnodes,
+        filterMixnodes,
+        fetchMixnodes,
+        gateways,
+        validators,
+        block,
+        countryData,
+        globalError,
+        mixnodeDetailInfo,
+        fetchMixnodeById,
+        fetchDelegationsById,
+        delegations,
+        stats,
+        fetchStatsById,
+        status,
+        fetchStatusById,
+        uptimeStory,
+        fetchUptimeStoryById,
+      }}
+    >
+      {children}
+    </MainContext.Provider>
+  );
+};
@@ -0,0 +1,14 @@
+import { useRef, useEffect, useCallback } from 'react';
+
+export function useIsMounted(): () => boolean {
+  const ref = useRef(false);
+
+  useEffect(() => {
+    ref.current = true;
+    return () => {
+      ref.current = false;
+    };
+  }, []);
+
+  return useCallback(() => ref.current, [ref]);
+}
@@ -0,0 +1,46 @@
+import * as React from 'react';
+import { useTheme } from '@mui/material/styles';
+
+export const GatewaysSVG: React.FC = () => {
+  const theme = useTheme();
+  const color = theme.palette.text.primary;
+  return (
+    <svg
+      width="26"
+      height="26"
+      viewBox="0 0 26 26"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M16.2 12H22.7"
+        stroke={color}
+        strokeWidth="1.3"
+        strokeMiterlimit="10"
+        strokeLinecap="round"
+      />
+      <path
+        d="M1.30005 12H12"
+        stroke={color}
+        strokeWidth="1.3"
+        strokeMiterlimit="10"
+        strokeLinecap="round"
+      />
+      <path
+        d="M20.1 9.40015L22.7 12.0001L20.1 14.6001"
+        stroke={color}
+        strokeWidth="1.3"
+        strokeMiterlimit="10"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M13.2 22.7001H8.59998C6.89998 22.7001 5.59998 21.4001 5.59998 19.7001V4.30005C5.59998 2.60005 6.89998 1.30005 8.59998 1.30005H13.2C14.9 1.30005 16.2 2.60005 16.2 4.30005V19.6C16.2 21.3001 14.8 22.7001 13.2 22.7001Z"
+        stroke={color}
+        strokeWidth="1.3"
+        strokeMiterlimit="10"
+        strokeLinecap="round"
+      />
+    </svg>
+  );
+};
@@ -0,0 +1,24 @@
+import * as React from 'react';
+import { useTheme } from '@mui/material/styles';
+
+export const LightSwitchSVG: React.FC = () => {
+  const { palette } = useTheme();
+  return (
+    <svg
+      width="26"
+      height="26"
+      viewBox="0 0 26 26"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M12 2C6.5 2 2 6.5 2 12C2 17.5 6.5 22 12 22C17.5 22 22 17.5 22 12C22 6.5 17.5 2 12 2Z"
+        fill={palette.background.default}
+      />
+      <path
+        d="M12 20C7.6 20 4 16.4 4 12C4 7.6 7.6 4 12 4V20Z"
+        fill={palette.text.primary}
+      />
+    </svg>
+  );
+};
@@ -0,0 +1,114 @@
+import * as React from 'react';
+import { useTheme } from '@mui/material/styles';
+
+export const MixnodesSVG: React.FC = () => {
+  const theme = useTheme();
+  const color = theme.palette.text.primary;
+
+  return (
+    <svg
+      width="26"
+      height="26"
+      viewBox="0 0 26 26"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path d="M23.0437 13.0291H2.97681" stroke={color} strokeMiterlimit="10" />
+      <path d="M23.0437 2.99512H2.97681" stroke={color} strokeMiterlimit="10" />
+      <path d="M23.0437 23.0625H2.97681" stroke={color} strokeMiterlimit="10" />
+      <path
+        d="M2.97681 23.0621L23.0437 2.99512"
+        stroke={color}
+        strokeMiterlimit="10"
+      />
+      <path
+        d="M23.0437 23.0621L2.97681 2.99512"
+        stroke={color}
+        strokeMiterlimit="10"
+      />
+      <path
+        d="M13.0103 23.0621L23.0437 2.99512"
+        stroke={color}
+        strokeMiterlimit="10"
+      />
+      <path
+        d="M2.97681 2.99512L13.0103 23.0621"
+        stroke={color}
+        strokeMiterlimit="10"
+      />
+      <path
+        d="M13.0099 13.0289L23.0437 23.0621L13.0099 2.99512L2.97681 23.0621L13.0099 2.99512"
+        stroke={color}
+        strokeMiterlimit="10"
+      />
+      <path
+        d="M23.097 12.9846L13.0892 2.97681L3.08142 12.9846L13.0892 22.9924L23.097 12.9846Z"
+        stroke={color}
+        strokeMiterlimit="10"
+      />
+      <path
+        d="M23.0232 4.9536C24.1149 4.9536 25 4.06856 25 2.9768C25 1.88504 24.1149 1 23.0232 1C21.9314 1 21.0464 1.88504 21.0464 2.9768C21.0464 4.06856 21.9314 4.9536 23.0232 4.9536Z"
+        fill="#242C3D"
+        stroke={color}
+        strokeWidth="1.2"
+        strokeMiterlimit="10"
+      />
+      <path
+        d="M12.9731 4.9536C14.0648 4.9536 14.9499 4.06856 14.9499 2.9768C14.9499 1.88504 14.0648 1 12.9731 1C11.8813 1 10.9963 1.88504 10.9963 2.9768C10.9963 4.06856 11.8813 4.9536 12.9731 4.9536Z"
+        fill="#242C3D"
+        stroke={color}
+        strokeWidth="1.2"
+        strokeMiterlimit="10"
+      />
+      <path
+        d="M2.9768 4.9536C4.06856 4.9536 4.9536 4.06856 4.9536 2.9768C4.9536 1.88504 4.06856 1 2.9768 1C1.88504 1 1 1.88504 1 2.9768C1 4.06856 1.88504 4.9536 2.9768 4.9536Z"
+        fill="#242C3D"
+        stroke={color}
+        strokeWidth="1.2"
+        strokeMiterlimit="10"
+      />
+      <path
+        d="M23.0232 15.0029C24.1149 15.0029 25 14.1179 25 13.0261C25 11.9344 24.1149 11.0493 23.0232 11.0493C21.9314 11.0493 21.0464 11.9344 21.0464 13.0261C21.0464 14.1179 21.9314 15.0029 23.0232 15.0029Z"
+        fill="#242C3D"
+        stroke={color}
+        strokeWidth="1.2"
+        strokeMiterlimit="10"
+      />
+      <path
+        d="M12.9731 15.0029C14.0648 15.0029 14.9499 14.1179 14.9499 13.0261C14.9499 11.9344 14.0648 11.0493 12.9731 11.0493C11.8813 11.0493 10.9963 11.9344 10.9963 13.0261C10.9963 14.1179 11.8813 15.0029 12.9731 15.0029Z"
+        fill="#242C3D"
+        stroke={color}
+        strokeWidth="1.2"
+        strokeMiterlimit="10"
+      />
+      <path
+        d="M2.9768 15.0029C4.06856 15.0029 4.9536 14.1179 4.9536 13.0261C4.9536 11.9344 4.06856 11.0493 2.9768 11.0493C1.88504 11.0493 1 11.9344 1 13.0261C1 14.1179 1.88504 15.0029 2.9768 15.0029Z"
+        fill="#242C3D"
+        stroke={color}
+        strokeWidth="1.2"
+        strokeMiterlimit="10"
+      />
+      <path
+        d="M23.0232 25C24.1149 25 25 24.1149 25 23.0232C25 21.9314 24.1149 21.0464 23.0232 21.0464C21.9314 21.0464 21.0464 21.9314 21.0464 23.0232C21.0464 24.1149 21.9314 25 23.0232 25Z"
+        fill="#242C3D"
+        stroke={color}
+        strokeWidth="1.2"
+        strokeMiterlimit="10"
+      />
+      <path
+        d="M12.9731 25C14.0648 25 14.9499 24.1149 14.9499 23.0232C14.9499 21.9314 14.0648 21.0464 12.9731 21.0464C11.8813 21.0464 10.9963 21.9314 10.9963 23.0232C10.9963 24.1149 11.8813 25 12.9731 25Z"
+        fill="#242C3D"
+        stroke={color}
+        strokeWidth="1.2"
+        strokeMiterlimit="10"
+      />
+      <path
+        d="M2.9768 25C4.06856 25 4.9536 24.1149 4.9536 23.0232C4.9536 21.9314 4.06856 21.0464 2.9768 21.0464C1.88504 21.0464 1 21.9314 1 23.0232C1 24.1149 1.88504 25 2.9768 25Z"
+        fill="#242C3D"
+        stroke={color}
+        strokeWidth="1.2"
+        strokeMiterlimit="10"
+      />
+    </svg>
+  );
+};
@@ -0,0 +1,32 @@
+import * as React from 'react';
+import { useTheme } from '@mui/material/styles';
+
+export const NetworkComponentsSVG: React.FC = () => {
+  const theme = useTheme();
+  const color = theme.palette.nym.networkExplorer.nav.text;
+  return (
+    <svg
+      width="25"
+      height="25"
+      viewBox="0 0 24 24"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M17.2 10.5V4.40002L12 1.40002L6.8 4.40002V10.5L12 13.5L17.2 10.5Z"
+        stroke={color}
+        strokeMiterlimit="10"
+      />
+      <path
+        d="M12 19.6V13.5L6.8 10.5L1.5 13.5V19.6L6.8 22.6L12 19.6Z"
+        stroke={color}
+        strokeMiterlimit="10"
+      />
+      <path
+        d="M22.5 19.6V13.5L17.2 10.5L12 13.5V19.6L17.2 22.6L22.5 19.6Z"
+        stroke={color}
+        strokeMiterlimit="10"
+      />
+    </svg>
+  );
+};
@@ -0,0 +1,33 @@
+import * as React from 'react';
+import { useTheme } from '@mui/material/styles';
+
+export const NodemapSVG: React.FC = () => {
+  const theme = useTheme();
+  const color = theme.palette.nym.networkExplorer.nav.text;
+  return (
+    <svg
+      width="25"
+      height="25"
+      viewBox="0 0 19 24"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M1 9.6999C1 5.0999 4.7 1.3999 9.3 1.3999C13.9 1.3999 17.6 5.0999 17.6 9.6999C17.6 14.2999 9.3 21.5999 9.3 21.5999C9.3 21.5999 1 14.2999 1 9.6999Z"
+        stroke={color}
+        strokeMiterlimit="10"
+      />
+      <path
+        d="M9.30005 12C11.233 12 12.8 10.433 12.8 8.5C12.8 6.567 11.233 5 9.30005 5C7.36705 5 5.80005 6.567 5.80005 8.5C5.80005 10.433 7.36705 12 9.30005 12Z"
+        stroke={color}
+        strokeMiterlimit="10"
+      />
+      <path
+        d="M1.5 22.5999H17.1"
+        stroke={color}
+        strokeMiterlimit="10"
+        strokeLinecap="round"
+      />
+    </svg>
+  );
+};
@@ -0,0 +1,33 @@
+import * as React from 'react';
+
+export const NymLogoSVG: React.FC = (props) => (
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 5389.9 5389.9"
+    width="40px"
+    height="40px"
+    {...props}
+  >
+    <circle cx={2695} cy={2695} r={2585} fill="#121726" />
+    <linearGradient
+      id="nym_logo_svg__a"
+      gradientUnits="userSpaceOnUse"
+      x1={0}
+      y1={8058.165}
+      x2={5390}
+      y2={8058.165}
+      gradientTransform="matrix(1 0 0 -1 0 10753.165)"
+    >
+      <stop offset={0} stopColor="#f77846" />
+      <stop offset={1} stopColor="#ed3572" />
+    </linearGradient>
+    <path
+      d="M2695 5390c-182.8 0-365.5-18.4-543-54.8-173.1-35.4-343.3-88.3-506-157.1-159.7-67.6-313.7-151.2-457.8-248.5-142.7-96.4-276.8-207.1-398.8-329-121.9-121.9-232.6-256.1-329-398.8-97.4-144-181-298-248.6-457.8-68.8-162.6-121.6-332.9-157-506C18.4 3060.5 0 2877.8 0 2695s18.4-365.5 54.8-543c35.4-173.1 88.3-343.3 157.1-506 67.6-159.7 151.2-313.7 248.5-457.8 96.4-142.7 207.1-276.8 329-398.8s256.1-232.6 398.8-329c144.1-97.3 298.1-180.9 457.8-248.5 162.7-68.8 332.9-121.7 506-157.1C2329.5 18.4 2512.2 0 2695 0s365.5 18.4 543 54.8c173.1 35.4 343.3 88.3 506 157.1 159.7 67.6 313.7 151.2 457.8 248.5 142.7 96.4 276.8 207.1 398.8 329 121.9 121.9 232.6 256.1 329 398.8 97.3 144.1 180.9 298.1 248.5 457.8 68.8 162.7 121.7 332.9 157.1 506 36.3 177.5 54.8 360.2 54.8 543s-18.4 365.5-54.8 543c-35.4 173.1-88.3 343.3-157.1 506-67.6 159.7-151.2 313.7-248.5 457.8-96.4 142.7-207.1 276.8-329 398.8-121.9 121.9-256.1 232.6-398.8 329-144.1 97.3-298.1 180.9-457.8 248.5-162.7 68.8-332.9 121.7-506 157.1-177.5 36.4-360.2 54.8-543 54.8zm0-5170c-168 0-335.9 16.9-498.9 50.3-158.9 32.5-315.1 81-464.4 144.2-146.6 62-288.1 138.8-420.4 228.2C1180.2 731.3 1057 833 944.9 945c-112 112-213.7 235.3-302.3 366.4-89.4 132.3-166.2 273.7-228.2 420.4-63.2 149.3-111.7 305.6-144.2 464.4C236.9 2359.1 220 2527 220 2695s16.9 335.9 50.3 498.9c32.5 158.9 81 315.1 144.2 464.4 62 146.6 138.8 288.1 228.2 420.4C731.3 4209.8 833 4333 945 4445.1c112 112 235.3 213.7 366.4 302.3 132.3 89.4 273.7 166.2 420.4 228.2 149.3 63.2 305.6 111.7 464.4 144.2 163.1 33.4 330.9 50.3 498.9 50.3s335.9-16.9 498.9-50.3c158.9-32.5 315.1-81 464.4-144.2 146.6-62 288.1-138.8 420.4-228.2 131.1-88.6 254.3-190.3 366.4-302.3 112-112 213.7-235.3 302.3-366.4 89.4-132.3 166.2-273.7 228.2-420.4 63.2-149.3 111.7-305.6 144.2-464.4 33.4-163.1 50.3-330.9 50.3-498.9s-16.9-335.9-50.3-498.9c-32.5-158.9-81-315.1-144.2-464.4-62-146.6-138.8-288.1-228.2-420.4-88.6-131.1-190.3-254.3-302.3-366.4-112-112-235.3-213.7-366.4-302.3-132.3-89.4-273.7-166.2-420.4-228.2-149.3-63.2-305.6-111.7-464.4-144.2-163.1-33.3-331-50.2-499-50.2z"
+      fill="url(#nym_logo_svg__a)"
+    />
+    <path
+      d="M1958.5 3160.4h-269.6l-735.8-725.3v725.3H734.6v-930.9h276.2l735.8 725.1v-725.1h211.9v930.9zm2420.4-930.9l-335.7 330.9-335.7-330.9h-276.2v930.9h218.4v-725.3l345.4 340.6c26.7 26.3 69.6 26.3 96.3 0l345.4-340.6v725.3h218.4v-930.9h-276.3zm-1789.8 485.9v445h218.4v-445l502.7-485.9H3034l-335.9 330.9-335.7-330.9h-276.2l502.9 485.9z"
+      fill="#fff"
+    />
+  </svg>
+);
@@ -0,0 +1,42 @@
+import * as React from 'react';
+import { useTheme } from '@mui/material/styles';
+
+export const OverviewSVG: React.FC = () => {
+  const theme = useTheme();
+  const color = theme.palette.nym.networkExplorer.nav.text;
+
+  return (
+    <svg
+      width="25"
+      height="25"
+      viewBox="0 0 24 24"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M1.4 21.6H22.6"
+        stroke={color}
+        strokeMiterlimit="10"
+        strokeLinecap="round"
+      />
+      <path
+        d="M14.1 2.40002H9.9V21.5H14.1V2.40002Z"
+        stroke={color}
+        strokeMiterlimit="10"
+        strokeLinecap="round"
+      />
+      <path
+        d="M20.8 6.59998H16.6V21.5H20.8V6.59998Z"
+        stroke={color}
+        strokeMiterlimit="10"
+        strokeLinecap="round"
+      />
+      <path
+        d="M7.4 11.8H3.2V21.6H7.4V11.8Z"
+        stroke={color}
+        strokeMiterlimit="10"
+        strokeLinecap="round"
+      />
+    </svg>
+  );
+};
@@ -0,0 +1,53 @@
+import * as React from 'react';
+import { useTheme } from '@mui/material/styles';
+
+export const ValidatorsSVG: React.FC = () => {
+  const theme = useTheme();
+  const color = theme.palette.text.primary;
+  return (
+    <svg
+      width="26"
+      height="26"
+      viewBox="0 0 26 26"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <g clipPath="url(#clip0)">
+        <path
+          d="M18.2001 18.4V19.7001C18.2001 21.4001 16.9 22.7001 15.2 22.7001H4.30005C2.60005 22.7001 1.30005 21.4001 1.30005 19.7001V4.30005C1.30005 2.60005 2.60005 1.30005 4.30005 1.30005H15.1C16.8 1.30005 18.1 2.60005 18.1 4.30005V5.60005V18.4H18.2001Z"
+          stroke={color}
+          strokeWidth="1.3"
+          strokeMiterlimit="10"
+          strokeLinecap="round"
+        />
+        <path
+          d="M13.4 22.7001H17.4C19.1 22.7001 20.4 21.4001 20.4 19.7001V18.4V5.60005V4.30005C20.4 2.60005 19.1 1.30005 17.4 1.30005H11.5"
+          stroke={color}
+          strokeWidth="1.3"
+          strokeMiterlimit="10"
+          strokeLinecap="round"
+        />
+        <path
+          d="M15.2 22.7001H19.7C21.4 22.7001 22.7 21.4001 22.7 19.7001V18.4V5.60005V4.30005C22.7 2.60005 21.4 1.30005 19.7 1.30005H13.8"
+          stroke={color}
+          strokeWidth="1.3"
+          strokeMiterlimit="10"
+          strokeLinecap="round"
+        />
+        <path
+          d="M5 12.3L7.9 15.3L14.5 8.69995"
+          stroke={color}
+          strokeWidth="2"
+          strokeMiterlimit="10"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+      </g>
+      <defs>
+        <clipPath id="clip0">
+          <rect width="24" height="24" fill="white" />
+        </clipPath>
+      </defs>
+    </svg>
+  );
+};
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="utf-8" />
+  <title>Nym Network Explorer</title>
+  <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:wght@300&display=swap" rel="stylesheet">
+</head>
+
+<body>
+  <div id="app"></div>
+</body>
+
+</html>
@@ -0,0 +1,18 @@
+import * as React from 'react';
+import ReactDOM from 'react-dom';
+import { BrowserRouter as Router } from 'react-router-dom';
+import { App } from './App';
+import { MainContextProvider } from './context/main';
+import './styles.css';
+import { NetworkExplorerThemeProvider } from './theme';
+
+ReactDOM.render(
+  <MainContextProvider>
+    <NetworkExplorerThemeProvider>
+      <Router>
+        <App />
+      </Router>
+    </NetworkExplorerThemeProvider>
+  </MainContextProvider>,
+  document.getElementById('app'),
+);
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.3.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+     viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#121726;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:#FFFFFF;}
+</style>
+  <g>
+	<g>
+		<circle class="st0" cx="250" cy="250.1" r="239.8"/>
+
+    <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="4.980469e-02" y1="5613.9395" x2="500.0498" y2="5613.9395" gradientTransform="matrix(1 0 0 -1 0 5863.9897)">
+			<stop  offset="0" style="stop-color:#E1864B"/>
+      <stop  offset="1" style="stop-color:#DA465B"/>
+		</linearGradient>
+    <path class="st1" d="M250,500.1c-17,0-33.9-1.7-50.4-5.1c-16.1-3.3-31.8-8.2-46.9-14.6c-14.8-6.3-29.1-14-42.5-23.1
+			c-13.2-8.9-25.7-19.2-37-30.5c-11.3-11.3-21.6-23.8-30.5-37c-9-13.4-16.8-27.6-23.1-42.5c-6.4-15.1-11.3-30.9-14.6-46.9
+			C1.8,284,0,267,0,250.1s1.7-33.9,5.1-50.4c3.3-16.1,8.2-31.8,14.6-46.9c6.3-14.8,14-29.1,23.1-42.5C51.7,97,62,84.6,73.3,73.3
+			s23.8-21.6,37-30.5c13.4-9,27.7-16.8,42.5-23.1c15.1-6.4,30.9-11.3,46.9-14.6c16.5-3.4,33.4-5.1,50.4-5.1c17,0,33.9,1.7,50.4,5.1
+			c16.1,3.3,31.8,8.2,46.9,14.6c14.8,6.3,29.1,14,42.5,23.1c13.2,8.9,25.7,19.2,37,30.5c11.3,11.3,21.6,23.8,30.5,37
+			c9,13.4,16.8,27.7,23.1,42.5c6.4,15.1,11.3,30.9,14.6,46.9c3.4,16.5,5.1,33.4,5.1,50.4s-1.7,33.9-5.1,50.4
+			c-3.3,16.1-8.2,31.8-14.6,46.9c-6.3,14.8-14,29.1-23.1,42.5c-8.9,13.2-19.2,25.7-30.5,37c-11.3,11.3-23.8,21.6-37,30.5
+			c-13.4,9-27.7,16.8-42.5,23.1c-15.1,6.4-30.9,11.3-46.9,14.6C284,498.3,267,500.1,250,500.1z M250,20.5c-15.6,0-31.2,1.6-46.3,4.7
+			c-14.7,3-29.2,7.5-43.1,13.4c-13.6,5.8-26.7,12.9-39,21.2c-12.2,8.2-23.6,17.7-34,28c-10.4,10.4-19.8,21.8-28,34
+			c-8.3,12.3-15.4,25.4-21.2,39c-5.9,13.8-10.4,28.3-13.4,43.1c-3.1,15.1-4.7,30.7-4.7,46.3s1.6,31.2,4.7,46.3
+			c3,14.7,7.5,29.2,13.4,43.1c5.8,13.6,12.9,26.7,21.2,39c8.2,12.2,17.7,23.6,28,34c10.4,10.4,21.8,19.8,34,28
+			c12.3,8.3,25.4,15.4,39,21.2c13.8,5.9,28.3,10.4,43.1,13.4c15.1,3.1,30.7,4.7,46.3,4.7c15.6,0,31.2-1.6,46.3-4.7
+			c14.7-3,29.2-7.5,43.1-13.4c13.6-5.8,26.7-12.9,39-21.2c12.2-8.2,23.6-17.7,34-28c10.4-10.4,19.8-21.8,28-34
+			c8.3-12.3,15.4-25.4,21.2-39c5.9-13.8,10.4-28.3,13.4-43.1c3.1-15.1,4.7-30.7,4.7-46.3s-1.6-31.2-4.7-46.3
+			c-3-14.7-7.5-29.2-13.4-43.1c-5.8-13.6-12.9-26.7-21.2-39c-8.2-12.2-17.7-23.6-28-34c-10.4-10.4-21.8-19.8-34-28
+			c-12.3-8.3-25.4-15.4-39-21.2c-13.8-5.9-28.3-10.4-43.1-13.4C281.2,22,265.6,20.5,250,20.5z"/>
+	</g>
+</g>
+  <path class="st2" d="M369.8,341.2h-52.8l-144-142v142h-42.8V158.9h54.1l144,141.9V158.9h41.5V341.2z"/>
+</svg>
@@ -0,0 +1,54 @@
+import * as React from 'react';
+import { Box, Button, Grid, Paper, Typography } from '@mui/material';
+import { useTheme } from '@mui/material/styles';
+import { useHistory } from 'react-router-dom';
+import { useMainContext } from 'src/context/main';
+import { NymLogoSVG } from 'src/icons/NymLogoSVG';
+
+export const Page404: React.FC = () => {
+  const history = useHistory();
+  const { mode } = useMainContext();
+  const theme = useTheme();
+  return (
+    <Box component="main" sx={{ flexGrow: 1 }}>
+      <Grid container spacing={0} alignItems="center" justifyContent="center">
+        <Grid item xs={12} sm={12} md={6}>
+          <Paper
+            sx={{
+              p: 3,
+              height: 450,
+              display: 'flex',
+              alignItems: 'center',
+              justifyContent: 'space-evenly',
+              flexDirection: 'column',
+              background:
+                mode === 'dark'
+                  ? theme.palette.secondary.dark
+                  : theme.palette.primary.light,
+              borderRadius: 10,
+            }}
+          >
+            <NymLogoSVG />
+            <Typography variant="h2">Oh No!</Typography>
+            <Typography variant="body1">
+              It looks like you might be lost.
+            </Typography>
+            <Typography variant="body1" textAlign="center">
+              Please try the link again or navigate back to{' '}
+            </Typography>
+            <Button
+              sx={{
+                fontWeight: 'bold',
+                bgcolor: theme.palette.primary.main,
+                color: theme.palette.secondary.main,
+              }}
+              onClick={() => history.push('/overview')}
+            >
+              Overview
+            </Button>
+          </Paper>
+        </Grid>
+      </Grid>
+    </Box>
+  );
+};
@@ -0,0 +1,150 @@
+import * as React from 'react';
+import { Button, Grid, Typography } from '@mui/material';
+import { GridColDef, GridRenderCellParams } from '@mui/x-data-grid';
+import { printableCoin } from '@nymproject/nym-validator-client';
+import { SelectChangeEvent } from '@mui/material/Select';
+import {
+  cellStyles,
+  UniversalDataGrid,
+} from 'src/components/Universal-DataGrid';
+import { useMainContext } from 'src/context/main';
+import { gatewayToGridRow } from 'src/utils';
+import { GatewayResponse } from 'src/typeDefs/explorer-api';
+import { TableToolbar } from 'src/components/TableToolbar';
+import { ContentCard } from 'src/components/ContentCard';
+import { CustomColumnHeading } from 'src/components/CustomColumnHeading';
+import { Title } from 'src/components/Title';
+
+export const PageGateways: React.FC = () => {
+  const { gateways } = useMainContext();
+  const [filteredGateways, setFilteredGateways] =
+    React.useState<GatewayResponse>([]);
+  const [pageSize, setPageSize] = React.useState<string>('50');
+  const [searchTerm, setSearchTerm] = React.useState<string>('');
+
+  const handleSearch = (str: string) => {
+    setSearchTerm(str.toLowerCase());
+  };
+
+  React.useEffect(() => {
+    if (searchTerm === '' && gateways?.data) {
+      setFilteredGateways(gateways?.data);
+    } else {
+      const filtered = gateways?.data?.filter((g) => {
+        if (
+          g.gateway.location.toLowerCase().includes(searchTerm) ||
+          g.gateway.identity_key.toLocaleLowerCase().includes(searchTerm) ||
+          g.owner.toLowerCase().includes(searchTerm)
+        ) {
+          return g;
+        }
+        return null;
+      });
+      if (filtered) {
+        setFilteredGateways(filtered);
+      }
+    }
+  }, [searchTerm, gateways?.data]);
+
+  const columns: GridColDef[] = [
+    {
+      field: 'owner',
+      renderHeader: () => <CustomColumnHeading headingTitle="Owner" />,
+      width: 200,
+      headerAlign: 'left',
+      headerClassName: 'MuiDataGrid-header-override',
+      renderCell: (params: GridRenderCellParams) => (
+        <Typography sx={cellStyles}>{params.value}</Typography>
+      ),
+    },
+    {
+      field: 'identity_key',
+      renderHeader: () => <CustomColumnHeading headingTitle="Identity Key" />,
+      width: 200,
+      headerAlign: 'left',
+      headerClassName: 'MuiDataGrid-header-override',
+      renderCell: (params: GridRenderCellParams) => (
+        <Typography sx={cellStyles}>{params.value}</Typography>
+      ),
+    },
+    {
+      field: 'bond',
+      width: 120,
+      type: 'number',
+      renderHeader: () => <CustomColumnHeading headingTitle="Bond" />,
+      headerClassName: 'MuiDataGrid-header-override',
+      headerAlign: 'left',
+      renderCell: (params: GridRenderCellParams) => {
+        const bondAsPunk = printableCoin({
+          amount: params.value as string,
+          denom: 'upunk',
+        });
+        return <Typography sx={cellStyles}>{bondAsPunk}</Typography>;
+      },
+    },
+    {
+      field: 'host',
+      renderHeader: () => <CustomColumnHeading headingTitle="IP:Port" />,
+      width: 150,
+      headerAlign: 'left',
+      headerClassName: 'MuiDataGrid-header-override',
+      renderCell: (params: GridRenderCellParams) => (
+        <Typography sx={cellStyles}>{params.value}</Typography>
+      ),
+    },
+    {
+      field: 'location',
+      renderHeader: () => <CustomColumnHeading headingTitle="Location" />,
+      flex: 1,
+      headerAlign: 'left',
+      headerClassName: 'MuiDataGrid-header-override',
+      renderCell: (params: GridRenderCellParams) => (
+        <Button
+          onClick={() => handleSearch(params.value as string)}
+          sx={{ ...cellStyles, justifyContent: 'flex-start' }}
+        >
+          {params.value}
+        </Button>
+      ),
+    },
+  ];
+
+  const handlePageSize = (event: SelectChangeEvent<string>) => {
+    setPageSize(event.target.value);
+  };
+
+  if (gateways?.data) {
+    return (
+      <>
+        <Title text="Gateways" />
+        <Grid>
+          <Grid item>
+            <ContentCard>
+              <TableToolbar
+                onChangeSearch={handleSearch}
+                onChangePageSize={handlePageSize}
+                pageSize={pageSize}
+                searchTerm={searchTerm}
+              />
+              <UniversalDataGrid
+                loading={gateways?.isLoading}
+                columnsData={columns}
+                rows={gatewayToGridRow(filteredGateways)}
+                pageSize={pageSize}
+                pagination={gateways?.data?.length >= 12}
+                hideFooter={gateways?.data?.length < 12}
+                sortModel={[
+                  {
+                    field: 'bond',
+                    sort: 'desc',
+                  },
+                ]}
+              />
+            </ContentCard>
+          </Grid>
+        </Grid>
+      </>
+    );
+  }
+  return null;
+};
@@ -0,0 +1,283 @@
+import * as React from 'react';
+import { GridColDef, GridRenderCellParams } from '@mui/x-data-grid';
+import { Box, Grid, Typography } from '@mui/material';
+import { useMainContext } from 'src/context/main';
+import { useParams } from 'react-router-dom';
+import { ContentCard } from 'src/components/ContentCard';
+import { WorldMap } from 'src/components/WorldMap';
+import { BondBreakdownTable } from 'src/components/BondBreakdown';
+import { TwoColSmallTable } from 'src/components/TwoColSmallTable';
+import { UptimeChart } from 'src/components/UptimeChart';
+import { mixnodeToGridRow, scrollToRef } from 'src/utils';
+import { ComponentError } from 'src/components/ComponentError';
+import {
+  cellStyles,
+  UniversalDataGrid,
+} from 'src/components/Universal-DataGrid';
+import { MixNodeResponseItem } from 'src/typeDefs/explorer-api';
+import { CustomColumnHeading } from 'src/components/CustomColumnHeading';
+import { printableCoin } from '@nymproject/nym-validator-client';
+import { Title } from 'src/components/Title';
+
+const columns: GridColDef[] = [
+  {
+    field: 'owner',
+    renderHeader: () => <CustomColumnHeading headingTitle="Owner" />,
+    width: 200,
+    headerAlign: 'left',
+    headerClassName: 'MuiDataGrid-header-override',
+    renderCell: (params: GridRenderCellParams) => (
+      <div>
+        <Typography sx={cellStyles}>{params.value}</Typography>
+      </div>
+    ),
+  },
+  {
+    field: 'identity_key',
+    renderHeader: () => <CustomColumnHeading headingTitle="Identity Key" />,
+    width: 200,
+    headerAlign: 'left',
+    headerClassName: 'MuiDataGrid-header-override',
+    renderCell: (params: GridRenderCellParams) => (
+      <div>
+        <Typography sx={cellStyles}>{params.value}</Typography>
+      </div>
+    ),
+  },
+  {
+    field: 'bond',
+    headerName: 'Bond',
+    type: 'number',
+    renderHeader: () => <CustomColumnHeading headingTitle="Bond" />,
+    flex: 1,
+    headerAlign: 'left',
+    headerClassName: 'MuiDataGrid-header-override',
+    renderCell: (params: GridRenderCellParams) => {
+      const bondAsPunk = printableCoin({
+        amount: params.value as string,
+        denom: 'upunk',
+      });
+      return <Typography sx={cellStyles}>{bondAsPunk}</Typography>;
+    },
+  },
+  {
+    field: 'self_percentage',
+    headerName: 'Self %',
+    headerAlign: 'left',
+    type: 'number',
+    width: 99,
+    headerClassName: 'MuiDataGrid-header-override',
+    renderHeader: () => <CustomColumnHeading headingTitle="Self %" />,
+    renderCell: (params: GridRenderCellParams) => (
+      <div>
+        <Typography sx={cellStyles}>{params.value}%</Typography>
+      </div>
+    ),
+  },
+  {
+    field: 'host',
+    renderHeader: () => <CustomColumnHeading headingTitle="IP:Port" />,
+    flex: 1,
+    headerAlign: 'left',
+    headerClassName: 'MuiDataGrid-header-override',
+    renderCell: (params: GridRenderCellParams) => (
+      <div>
+        <Typography sx={cellStyles}>{params.value}</Typography>
+      </div>
+    ),
+  },
+  {
+    field: 'location',
+    renderHeader: () => <CustomColumnHeading headingTitle="Location" />,
+    flex: 1,
+    headerAlign: 'left',
+    headerClassName: 'MuiDataGrid-header-override',
+    renderCell: (params: GridRenderCellParams) => (
+      <div>
+        <Typography sx={cellStyles}>{params.value}</Typography>
+      </div>
+    ),
+  },
+  {
+    field: 'layer',
+    renderHeader: () => <CustomColumnHeading headingTitle="Layer" />,
+    flex: 1,
+    headerAlign: 'left',
+    headerClassName: 'MuiDataGrid-header-override',
+    type: 'number',
+    renderCell: (params: GridRenderCellParams) => (
+      <Typography sx={cellStyles}>{params.value}</Typography>
+    ),
+  },
+];
+
+export const PageMixnodeDetail: React.FC = () => {
+  const ref = React.useRef();
+  const [row, setRow] = React.useState<MixNodeResponseItem[]>([]);
+  const {
+    fetchMixnodeById,
+    mixnodeDetailInfo,
+    fetchStatsById,
+    fetchDelegationsById,
+    fetchUptimeStoryById,
+    fetchStatusById,
+    stats,
+    status,
+    uptimeStory,
+  } = useMainContext();
+  const { id }: any = useParams();
+
+  React.useEffect(() => {
+    const hasNoDetail = id && !mixnodeDetailInfo;
+    const hasIncorrectDetail =
+      id &&
+      mixnodeDetailInfo?.data &&
+      mixnodeDetailInfo?.data[0].mix_node.identity_key !== id;
+    if (hasNoDetail || hasIncorrectDetail) {
+      fetchMixnodeById(id);
+      fetchDelegationsById(id);
+      fetchStatsById(id);
+      fetchStatusById(id);
+      fetchUptimeStoryById(id);
+    } else if (mixnodeDetailInfo?.data !== undefined) {
+      setRow(mixnodeDetailInfo?.data);
+    }
+  }, [id, mixnodeDetailInfo]);
+
+  React.useEffect(() => {
+    scrollToRef(ref);
+  }, [ref]);
+
+  return (
+    <>
+      <Box component="main" ref={ref}>
+        <Grid container spacing={2}>
+          <Grid item xs={12}>
+            <Title text="Mixnode Detail" />
+          </Grid>
+        </Grid>
+
+        <Grid container>
+          <Grid item xs={12}>
+            {mixnodeDetailInfo && (
+              <ContentCard>
+                <UniversalDataGrid
+                  columnsData={columns}
+                  rows={mixnodeToGridRow(row)}
+                  loading={mixnodeDetailInfo.isLoading}
+                  pageSize="1"
+                  pagination={false}
+                  hideFooter
+                />
+              </ContentCard>
+            )}
+          </Grid>
+        </Grid>
+
+        <Grid container spacing={2} mt={0}>
+          <Grid item xs={12}>
+            <ContentCard title="Bond Breakdown">
+              <BondBreakdownTable />
+            </ContentCard>
+          </Grid>
+        </Grid>
+
+        <Grid container spacing={2} mt={0}>
+          <Grid item xs={12} md={4}>
+            <ContentCard title="Mixnode Stats">
+              {stats && (
+                <>
+                  {stats.error && (
+                    <ComponentError text="There was a problem retrieving this nodes stats." />
+                  )}
+                  <TwoColSmallTable
+                    loading={stats.isLoading}
+                    error={stats?.error?.message}
+                    title="Since startup"
+                    keys={['Received', 'Sent', 'Explicitly dropped']}
+                    values={[
+                      stats?.data?.packets_received_since_startup || 0,
+                      stats?.data?.packets_sent_since_startup || 0,
+                      stats?.data?.packets_explicitly_dropped_since_startup ||
+                        0,
+                    ]}
+                  />
+                  <TwoColSmallTable
+                    loading={stats.isLoading}
+                    error={stats?.error?.message}
+                    title="Since last update"
+                    keys={['Received', 'Sent', 'Explicitly dropped']}
+                    values={[
+                      stats?.data?.packets_received_since_last_update || 0,
+                      stats?.data?.packets_sent_since_last_update || 0,
+                      stats?.data
+                        ?.packets_explicitly_dropped_since_last_update || 0,
+                    ]}
+                    marginBottom
+                  />
+                </>
+              )}
+              {!stats && <Typography>No stats information</Typography>}
+            </ContentCard>
+          </Grid>
+          <Grid item xs={12} md={8}>
+            {uptimeStory && (
+              <ContentCard title="Uptime story">
+                {uptimeStory.error && (
+                  <ComponentError text="There was a problem retrieving uptime history." />
+                )}
+                <UptimeChart
+                  loading={uptimeStory.isLoading}
+                  xLabel="date"
+                  yLabel="uptime"
+                  uptimeStory={uptimeStory}
+                />
+              </ContentCard>
+            )}
+          </Grid>
+        </Grid>
+
+        <Grid container spacing={2} mt={0}>
+          <Grid item xs={12} md={4}>
+            {status && (
+              <ContentCard title="Mixnode Status">
+                {status.error && (
+                  <ComponentError text="There was a problem retrieving port information" />
+                )}
+                <TwoColSmallTable
+                  loading={status.isLoading}
+                  error={status?.error?.message}
+                  keys={['Mix port', 'Verloc port', 'HTTP port']}
+                  values={[1789, 1790, 8000].map((each) => each)}
+                  icons={
+                    (status?.data?.ports &&
+                      Object.values(status.data.ports)) || [false, false, false]
+                  }
+                />
+              </ContentCard>
+            )}
+          </Grid>
+          <Grid item xs={12} md={8}>
+            {mixnodeDetailInfo && (
+              <ContentCard title="Location">
+                {mixnodeDetailInfo?.error && (
+                  <ComponentError text="There was a problem retrieving this mixnode location" />
+                )}
+                {mixnodeDetailInfo.data &&
+                  mixnodeDetailInfo?.data[0]?.location && (
+                    <WorldMap
+                      loading={mixnodeDetailInfo.isLoading}
+                      userLocation={[
+                        mixnodeDetailInfo?.data[0]?.location?.lng,
+                        mixnodeDetailInfo?.data[0]?.location?.lat,
+                      ]}
+                    />
+                  )}
+              </ContentCard>
+            )}
+          </Grid>
+        </Grid>
+      </Box>
+    </>
+  );
+};
@@ -0,0 +1,211 @@
+import * as React from 'react';
+import { GridColDef, GridRenderCellParams } from '@mui/x-data-grid';
+import { printableCoin } from '@nymproject/nym-validator-client';
+import { Link as RRDLink } from 'react-router-dom';
+import { Button, Grid, Link as MuiLink } from '@mui/material';
+import { SelectChangeEvent } from '@mui/material/Select';
+import {
+  cellStyles,
+  UniversalDataGrid,
+} from 'src/components/Universal-DataGrid';
+import { useMainContext } from 'src/context/main';
+import { mixnodeToGridRow } from 'src/utils';
+import { TableToolbar } from 'src/components/TableToolbar';
+import { MixNodeResponse } from 'src/typeDefs/explorer-api';
+import { BIG_DIPPER } from 'src/api/constants';
+import { ContentCard } from 'src/components/ContentCard';
+import { CustomColumnHeading } from 'src/components/CustomColumnHeading';
+import { Title } from 'src/components/Title';
+
+export const PageMixnodes: React.FC = () => {
+  const { mixnodes } = useMainContext();
+  const [filteredMixnodes, setFilteredMixnodes] =
+    React.useState<MixNodeResponse>([]);
+  const [pageSize, setPageSize] = React.useState<string>('10');
+  const [searchTerm, setSearchTerm] = React.useState<string>('');
+
+  const handleSearch = (str: string) => {
+    setSearchTerm(str.toLowerCase());
+  };
+
+  React.useEffect(() => {
+    if (searchTerm === '' && mixnodes?.data) {
+      setFilteredMixnodes(mixnodes?.data);
+    } else {
+      const filtered = mixnodes?.data?.filter((m) => {
+        if (
+          m.location?.country_name.toLowerCase().includes(searchTerm) ||
+          m.mix_node.identity_key.toLocaleLowerCase().includes(searchTerm) ||
+          m.owner.toLowerCase().includes(searchTerm)
+        ) {
+          return m;
+        }
+        return null;
+      });
+      if (filtered) {
+        setFilteredMixnodes(filtered);
+      }
+    }
+  }, [searchTerm, mixnodes?.data]);
+
+  const columns: GridColDef[] = [
+    {
+      field: 'owner',
+      renderHeader: () => <CustomColumnHeading headingTitle="Owner" />,
+      flex: 3,
+      headerAlign: 'left',
+      headerClassName: 'MuiDataGrid-header-override',
+      renderCell: (params: GridRenderCellParams) => (
+        <MuiLink
+          href={`${BIG_DIPPER}/account/${params.value}`}
+          target="_blank"
+          sx={cellStyles}
+        >
+          {params.value}
+        </MuiLink>
+      ),
+    },
+    {
+      field: 'identity_key',
+      renderHeader: () => <CustomColumnHeading headingTitle="Identity Key" />,
+      flex: 3,
+      headerAlign: 'left',
+      headerClassName: 'MuiDataGrid-header-override',
+      renderCell: (params: GridRenderCellParams) => (
+        <MuiLink
+          sx={cellStyles}
+          component={RRDLink}
+          to={`/network-components/mixnodes/${params.value}`}
+        >
+          {params.value}
+        </MuiLink>
+      ),
+    },
+    {
+      field: 'bond',
+      headerName: 'Bond',
+      type: 'number',
+      headerAlign: 'left',
+      flex: 1,
+      headerClassName: 'MuiDataGrid-header-override',
+      renderHeader: () => <CustomColumnHeading headingTitle="Bond" />,
+      renderCell: (params: GridRenderCellParams) => {
+        const bondAsPunk = printableCoin({
+          amount: params.value as string,
+          denom: 'upunk',
+        });
+        return (
+          <MuiLink
+            sx={cellStyles}
+            component={RRDLink}
+            to={`/network-components/mixnodes/${params.row.identity_key}`}
+          >
+            {bondAsPunk}
+          </MuiLink>
+        );
+      },
+    },
+    {
+      field: 'self_percentage',
+      headerName: 'Self %',
+      headerAlign: 'left',
+      type: 'number',
+      width: 99,
+      headerClassName: 'MuiDataGrid-header-override',
+      renderHeader: () => <CustomColumnHeading headingTitle="Self %" />,
+      renderCell: (params: GridRenderCellParams) => (
+        <MuiLink
+          sx={cellStyles}
+          component={RRDLink}
+          to={`/network-components/mixnodes/${params.row.identity_key}`}
+        >
+          {params.value}%
+        </MuiLink>
+      ),
+    },
+    {
+      field: 'host',
+      renderHeader: () => <CustomColumnHeading headingTitle="Host" />,
+      flex: 1,
+      headerAlign: 'left',
+      headerClassName: 'MuiDataGrid-header-override',
+      renderCell: (params: GridRenderCellParams) => (
+        <MuiLink
+          sx={cellStyles}
+          component={RRDLink}
+          to={`/network-components/mixnodes/${params.row.identity_key}`}
+        >
+          {params.value}
+        </MuiLink>
+      ),
+    },
+    {
+      field: 'location',
+      renderHeader: () => <CustomColumnHeading headingTitle="Location" />,
+      flex: 1,
+      headerAlign: 'left',
+      headerClassName: 'MuiDataGrid-header-override',
+      renderCell: (params: GridRenderCellParams) => (
+        <Button
+          onClick={() => handleSearch(params.value as string)}
+          sx={{ ...cellStyles, justifyContent: 'flex-start' }}
+        >
+          {params.value}
+        </Button>
+      ),
+    },
+    {
+      field: 'layer',
+      headerAlign: 'left',
+      headerClassName: 'MuiDataGrid-header-override',
+      renderHeader: () => <CustomColumnHeading headingTitle="Layer" />,
+      flex: 1,
+      type: 'number',
+      renderCell: (params: GridRenderCellParams) => (
+        <MuiLink
+          sx={{ ...cellStyles, textAlign: 'left' }}
+          component={RRDLink}
+          to={`/network-components/mixnodes/${params.row.identity_key}`}
+        >
+          {params.value}
+        </MuiLink>
+      ),
+    },
+  ];
+
+  const handlePageSize = (event: SelectChangeEvent<string>) => {
+    setPageSize(event.target.value);
+  };
+
+  return (
+    <>
+      <Title text="Mixnodes" />
+      <Grid>
+        <Grid item>
+          <ContentCard>
+            <TableToolbar
+              onChangeSearch={handleSearch}
+              onChangePageSize={handlePageSize}
+              pageSize={pageSize}
+              searchTerm={searchTerm}
+            />
+            <UniversalDataGrid
+              loading={mixnodes?.isLoading}
+              columnsData={columns}
+              rows={mixnodeToGridRow(filteredMixnodes)}
+              pageSize={pageSize}
+              pagination
+              hideFooter={false}
+              sortModel={[
+                {
+                  field: 'bond',
+                  sort: 'desc',
+                },
+              ]}
+            />
+          </ContentCard>
+        </Grid>
+      </Grid>
+    </>
+  );
+};
@@ -0,0 +1,135 @@
+import * as React from 'react';
+import {
+  Alert,
+  Box,
+  CircularProgress,
+  Grid,
+  SelectChangeEvent,
+  Typography,
+} from '@mui/material';
+import { WorldMap } from 'src/components/WorldMap';
+import { useMainContext } from 'src/context/main';
+import {
+  cellStyles,
+  UniversalDataGrid,
+} from 'src/components/Universal-DataGrid';
+import { CustomColumnHeading } from 'src/components/CustomColumnHeading';
+import { GridColDef, GridRenderCellParams } from '@mui/x-data-grid';
+import { TableToolbar } from 'src/components/TableToolbar';
+import { CountryDataRowType, countryDataToGridRow } from 'src/utils';
+import { Title } from 'src/components/Title';
+import { ContentCard } from '../../components/ContentCard';
+
+export const PageMixnodesMap: React.FC = () => {
+  const { countryData } = useMainContext();
+  const [pageSize, setPageSize] = React.useState<string>('10');
+  const [formattedCountries, setFormattedCountries] = React.useState<
+    CountryDataRowType[]
+  >([]);
+  const [searchTerm, setSearchTerm] = React.useState<string>('');
+
+  const handleSearch = (str: string) => {
+    setSearchTerm(str.toLowerCase());
+  };
+
+  const handlePageSize = (event: SelectChangeEvent<string>) => {
+    setPageSize(event.target.value);
+  };
+
+  const columns: GridColDef[] = [
+    {
+      field: 'countryName',
+      renderHeader: () => <CustomColumnHeading headingTitle="Location" />,
+      flex: 1,
+      headerAlign: 'left',
+      headerClassName: 'MuiDataGrid-header-override',
+      renderCell: (params: GridRenderCellParams) => (
+        <Typography sx={cellStyles}>{params.value}</Typography>
+      ),
+    },
+    {
+      field: 'nodes',
+      renderHeader: () => (
+        <CustomColumnHeading headingTitle="Number of Nodes" />
+      ),
+      flex: 1,
+      headerAlign: 'left',
+      headerClassName: 'MuiDataGrid-header-override',
+      renderCell: (params: GridRenderCellParams) => (
+        <Typography sx={cellStyles}>{params.value}</Typography>
+      ),
+    },
+    {
+      field: 'percentage',
+      renderHeader: () => <CustomColumnHeading headingTitle="Percentage %" />,
+      flex: 1,
+      headerAlign: 'left',
+      headerClassName: 'MuiDataGrid-header-override',
+      renderCell: (params: GridRenderCellParams) => (
+        <Typography sx={cellStyles}>{params.value}</Typography>
+      ),
+    },
+  ];
+
+  React.useEffect(() => {
+    if (countryData?.data && searchTerm === '') {
+      setFormattedCountries(
+        countryDataToGridRow(Object.values(countryData.data)),
+      );
+    } else if (countryData?.data !== undefined && searchTerm !== '') {
+      const formatted = countryDataToGridRow(Object.values(countryData?.data));
+      const filtered = formatted.filter((m) => {
+        if (
+          m.countryName.toLowerCase().includes(searchTerm) ||
+          m.ISO3.toLowerCase().includes(searchTerm)
+        ) {
+          return m;
+        }
+        return null;
+      });
+      if (filtered) {
+        setFormattedCountries(filtered);
+      }
+    }
+  }, [searchTerm, countryData?.data]);
+
+  if (countryData?.isLoading) {
+    return <CircularProgress />;
+  }
+
+  if (countryData?.data && !countryData.isLoading) {
+    return (
+      <Box component="main" sx={{ flexGrow: 1 }}>
+        <Grid container spacing={1} sx={{ mb: 4 }}>
+          <Grid item xs={12}>
+            <Title text="Mixnodes Around the Globe" />
+          </Grid>
+          <Grid item xs={12} lg={9}>
+            <Grid container spacing={2}>
+              <Grid item xs={12}>
+                <ContentCard title="Distribution of nodes">
+                  <WorldMap loading={false} countryData={countryData} />
+                  <Box sx={{ marginTop: 2 }} />
+                  <TableToolbar
+                    onChangeSearch={handleSearch}
+                    onChangePageSize={handlePageSize}
+                    pageSize={pageSize}
+                    searchTerm={searchTerm}
+                  />
+                  <UniversalDataGrid
+                    loading={countryData?.isLoading}
+                    columnsData={columns}
+                    rows={formattedCountries}
+                    pageSize={pageSize}
+                    pagination
+                  />
+                </ContentCard>
+              </Grid>
+            </Grid>
+          </Grid>
+        </Grid>
+      </Box>
+    );
+  }
+  return <Alert severity="error">{countryData?.error}</Alert>;
+};
@@ -0,0 +1,90 @@
+import * as React from 'react';
+import { Box, Grid, Link } from '@mui/material';
+import { WorldMap } from 'src/components/WorldMap';
+import { useHistory } from 'react-router-dom';
+import { useMainContext } from 'src/context/main';
+import { formatNumber } from 'src/utils';
+import { BIG_DIPPER } from 'src/api/constants';
+import { ValidatorsSVG } from 'src/icons/ValidatorsSVG';
+import { GatewaysSVG } from 'src/icons/GatewaysSVG';
+import { MixnodesSVG } from 'src/icons/MixnodesSVG';
+import { Title } from 'src/components/Title';
+import { ContentCard } from '../../components/ContentCard';
+import { StatsCard } from '../../components/StatsCard';
+
+export const PageOverview: React.FC = () => {
+  const history = useHistory();
+  const { mixnodes, gateways, validators, block, countryData } =
+    useMainContext();
+  return (
+    <>
+      <Box component="main" sx={{ flexGrow: 1 }}>
+        <Grid>
+          <Grid item>
+            <Title text="Overview" />
+          </Grid>
+          <Grid item>
+            <Grid container spacing={2}>
+              {mixnodes && (
+                <Grid item xs={12} md={4}>
+                  <StatsCard
+                    onClick={() => history.push('/network-components/mixnodes')}
+                    title="Mixnodes"
+                    icon={<MixnodesSVG />}
+                    count={mixnodes?.data?.length || ''}
+                    errorMsg={mixnodes?.error}
+                  />
+                </Grid>
+              )}
+              {gateways && (
+                <Grid item xs={12} md={4}>
+                  <StatsCard
+                    onClick={() => history.push('/network-components/gateways')}
+                    title="Gateways"
+                    count={gateways?.data?.length || ''}
+                    errorMsg={gateways?.error}
+                    icon={<GatewaysSVG />}
+                  />
+                </Grid>
+              )}
+
+              {validators && (
+                <Grid item xs={12} md={4}>
+                  <StatsCard
+                    onClick={() => window.open(`${BIG_DIPPER}/validators`)}
+                    title="Validators"
+                    count={validators?.data?.count || ''}
+                    errorMsg={validators?.error}
+                    icon={<ValidatorsSVG />}
+                  />
+                </Grid>
+              )}
+              {block?.data && (
+                <Grid item xs={12}>
+                  <ContentCard
+                    title={
+                      <Link
+                        href={`${BIG_DIPPER}/blocks`}
+                        target="_blank"
+                        rel="noreferrer"
+                        underline="none"
+                        color="inherit"
+                      >
+                        Current block height is {formatNumber(block.data)}
+                      </Link>
+                    }
+                  />
+                </Grid>
+              )}
+              <Grid item xs={12}>
+                <ContentCard title="Distribution of nodes around the world">
+                  <WorldMap loading={false} countryData={countryData} />
+                </ContentCard>
+              </Grid>
+            </Grid>
+          </Grid>
+        </Grid>
+      </Box>
+    </>
+  );
+};
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Tommy Verrall	ba36b436ad	windows build for the wallet . removing windows menu . change build script in package.json . change path in webpack	2021-11-10 11:00:45 +00:00
Jędrzej Stuczyński	8bcc931d9b	Feature/removal of monitor good nodes (#833 ) * Removed separated ipv4 and ipv6 testing * Testing network using chosen core nodes This should have probably been like 20 independent commits... sorry... * SQL migrations for updated schema * SQL updates * Using absolute uptime directly * New uptime calculations * Config entries, more DB work, some cleanup * Additional API query routes * More SQL and API work * Changed `_` to `-` in new routes * Removed good topology from config * Fixed gateways reader yield condition * Initial gateways pinger * Minor cleanup and logging level decreases * Missing trait derivations * Further logging adjustments * Unused commented out import * Claiming additional bandwidth in coconut feature when low * Fixed build with coconut feature * Minimum number of test routes * Making beta/nightly clippy happier	2021-11-09 12:25:41 +00:00
Mark Sinclair	955ef7b871	GitHub Actions: only run job to generate types when not in a pull request (#886 )	2021-11-09 11:56:43 +00:00
Mark Sinclair	9ee7ad4fa8	GitHub Actions: only run job to generate types when not in a pull request	2021-11-09 11:42:00 +00:00
Tommy Verrall	79aa1febbe	Run all the tests	2021-11-08 15:01:21 +00:00
Fouad	32c4974c44	Merge pull request #873 from nymtech/update/remove-gateway-delegation remove gateway selection on delegation and undelegation pages	2021-11-08 15:31:58 +01:00
Mark Sinclair	5dadd73dfd	Network Explorer (#881 ) * fixed styled component * dynamic colour for isSelected * corrected type names * wrapped nav for routing and positioning of main section and dynamic colour for selected section * overview info panes added * quick refactor break out components separately * WorldMap implemented but not data * map changed and updated to shades correctly * live data in cards * added any types for react simple map * nested routing added but needs tidying and types refactored * added tooltip to worldmap * worldmap killed unused props * updated MUI version to stable v5 * dark mode and ContentCard refactor complete * refactor of DarkMode context and API into class and context setup * context refactor for multiple APIs at top level * mui typography used for error msging instead of jsx/html * added typeDefs for node api types * small changes to sx styling * added types for api responses and main context * promiseAll for better error handling of individual async calls * switch out to live API for country nodes * removal of unnecessary type any and shortening sx style block * routing and basic mixnodes table and linking * fixed TS error handling and ts exclude files * refactor of class API fetch reqs * renaming to more appropriate explorer-api * broken - passing to Fouad * fix for types in context main * mixnode detail page * rebasing back before fetch mixnode by ID was implemented * added basic cache for huge dump of mixnode data * broken mixnodes context * fixed mixnode detail fetch * added hardcoded BondBreakdown section * added 2 col table for detail page and small refactor of ApiState type for consistent use throughout app * basic chart with basic dark/theme implemented - no live data * added scrollToTop useRef for Detail page * tidied grid items * media qry for smaller screens * small changes * added live data to bonds breakdown 1/2 * small changes/tweaks * Bondbreakdown retrieves live data * mixnode stats using live data * added node status live data * uptime story added with live data * date formatting added * mixnode map * error handling for mixnode stats * error handling for port stats * improved error handling for table - unfinished * error handling for mixnode table * handle Loading state for 2colSmallTable * Uptime story loading handling * set up data grid component * remove mixnode value check as handled inside MixnodesDataGrid component * use loading prop in data grid component * undo unintentional code formatting * map blur and linkable data-grid added * getting ready for gateways and removing con logs * quickfix for map blur * PR comment changes * refactored data grid for reuseability * Link to open Big Dipper for Blocks * passing element to title instead of string for routing to Big Dipper * quick fix for element passed as title for contentCard * fix for colour coding nodes * nuts and bolts of search and results per page are working * media query for responsive search and no-per-page toolbar * broke out search and pagesize to separate toolbar * fix for going back to mixnodes datagrid and refetching * corrected typings for WorldMap * removed API for topojson * Cleaner implementation of formatting inline for datagrid * added Type to Datagrid Rows for mixnode * removed optional from type for Datagrid * added page listing the Gateway nodes * adding clickable location to handleSearch * tidying util functions and removing dead useEffect * Add missing constant * Validators link to Big Dipper * added validators link to side nav as per Issues card * SVG icons * PR tweak to move logic to routes * removed dead code post rebase * fixed light dark mode for DataGrid * light dark mode works on SVGs in Nav * moving logic back to Nav to avoid window object issues * neater ternary for SVG icons dark mode * Better Linking/Styling for cells * corrected prop/attr name in svg to Reactify it * moved api url to constants * SVGs dark now governed by context not props so reverting renderIcon method back to key value setup * percentage for bond total added * SVGs for Overview cards Mixnodes Gateways and Validators * decimalised formatted punks and % of bond for BondBreakdown card * number formatting via validator module * adding cossmjs math pkg * unfinished refactor BondBreakdown * first few ui tweaks * Adding google font Open Sans as per designs * DataGrid unstylable in theme so nuking in css * adding theming to Block Height card not hardcoded colours * DataGrid styling * Nav styling colours but without hover fix * theme for bond breakdown * killing con logs * Datagrid styling * Nav bar working * added lines to nav * removed cursive from fallback fonts * trimming and refactoring * removed dead isActive code from nav options * Color correction for theme on 2col table * Moved cell styles out to UniversalDatagrid for reuseability * Nav colors moved to theme * Removing comments and dead code * DataGrid UI improvements * theming for Overview content card * Bonds updated from UPUNK to PUNK * corrected SVG warning on stroke-width * added Boolean class instead of ternary * fixing up svg attr to jsx props * merging UPUNK changes into ui-tweaks * corrected SVG warning on stroke-width * added Boolean class instead of ternary * last instance of Boolean * BondBreakdown handles 0 delegations * formatting for webpack config and svgs * Add `npm run lint` and `npm run lint:fix` targets to `package.json` * Allow `.vscode` directories - exclude them individually like has been done already in the `.gitignore` directory * Add `vscode` action to run `eslint` on save for the `/explorer/*` sub-directory eslint auto fix * Fix some easy eslint issues * removing grid pipes and pastel map colors * Grid xl lg values to align with Search Toolbar * GitHub Actions: do not trigger Rust actions when the paths are only `/explorer/*` See https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions#onpushpull_requestpaths for details. GitHub Actions: run eslint and annotate pull requests * socials added to Appbar and Footer * smaller darkmode icon for mobile * cleaner code for nav dark light selector * almost all lint fixes * post linting Nav fix * killed con log and removed unused dep * ref type and removed 1x ts ignore from worldMap * disabl nested tern w/ nav is refactored on diff br * icons smaller put into mui List format * Added hover effect to match DarkLight switch * ts ignore for worldMap vs no ts decl * parking changes * Flipped to MUI SVGs * re-added external links to Socials * nav functionality working * spacing on Mixnode detail page * datagrid alignment & detail page spacing * map but no datagrid yet * killed old SVGs now using mui icons * added palette instead of strings * Mixnode Map page working still needs tidying * better lg xl responsive on Overview and sanitized Page Titles * removed typography from imports as unused now * search, sort working & added LG XL responsiveness * Routing root reqs direct to Overview * basic 404 page and btn back to overview * killed fragments and comments * updated Bond total in column * Change bond col to type number not text * Added field to DataGrid and updated MixnodeToGridrow logic * Added type number so sorting works properly. * added %self to Detail page * basic scroll working desktop * delegations now popout and scroll according to designs * added stickyHeader and killed dead code * ExpandMore only renders if delegations exist * killed old svg icons * added theme to Overview SVGs * bringing Title into other pages * linting fix * pagination and spacing of gateways cols * linting fix * style override for pagination * added hamburger and changed appbar to fixed * bringing in other lint fix to pass linting * PR feedback changes * Add README.md for theme customisation * Add hook to get app state context * Add Nym theme typings to MUI `Theme` types * Use new theme provider * Fixing up components to use theme typings Updated Overview Footer and ContentCard Footer and Nav socials Title, Nav chevron and Nav SVGs Overview SVGs Light Dark switch BondBreakdown and 2 col table DataGrid and 2col Tables WorldMap UptimeChart and theme changes WorldMap colors merge changes added StatsCard for overview * Bug fix: do no close drawer when clicking on mixnodes or gateways * Theme primary colour set to orange highlight, so that default/primary actions are clear to the user. This fixes colours on the pagination page list. * Fixing up map projection * Map view uses stroke colour from theme * added useTheme from correct pkg * react types upgrade to kill SXProps issue * SXProps fix removing dead mixins from fixed AppBar * Scale of Map changed to see more countries * return type for main Context required * Fixed map so more countries show * type for useMainContext hook added * Remove unused file * Tidy up imports * Remove use of `any` by using strongly typed hook to get the app state * Remove module declaration so that @types/react-simple-maps is used * API map response changed to indexed object * Map view uses correct typings from `@types/react-simple-maps` and `d3-scale` * Make content responsive and fills the view when screen widest * Link network explorer in title to overview page * Increase size of card headers to differentiate * Fix column widths * Fixed icons showing incorrectly the stats card in mixnode detail view * Set default sort on mixnodes and gateways to be `bond` descending. There is an error in MUI data-grid that does not adjust the sort caret based on initial `sortModel` value. Needs investigation. * GitHub Action for deployment: prefix with network explorer to stop collisions with other deployment projects * Mixnode list: fix up header title for `host` * Fix up notification URLs and tidy up readme * Fix up license information Co-authored-by: Adrian Thompson <adrian@nymtech.net> Co-authored-by: Adrian Thompson <adrianthompson@Adrians-MacBook-Air.local> Co-authored-by: fmtabbara <fmtabbara@hotmail.co.uk> Co-authored-by: Aid19801 <adrianThompson19801@gmail.com>	2021-11-08 12:23:27 +00:00
Mark Sinclair	6ad5badef4	GitHub Action to publish wallet This is placeholder to allow the action to trigger in branches	2021-11-08 11:03:49 +00:00
Bogdan-Ștefan Neacşu	480ad18b2e	Put client_address and id in the correct order (#875 )	2021-11-04 16:33:18 +02:00
Jędrzej Stuczyński	cdb21f418b	Made daily uptime calculation be independent of epoch rewarding (#860 ) * Made daily uptime calculation be independent of epoch rewarding It was moved into a separate timer * Don't lookup active gateways during rewarding	2021-11-04 13:06:20 +00:00
Jędrzej Stuczyński	bd4c18c723	Set MSRV on all binaries to 1.56 (#872 )	2021-11-03 20:07:43 +00:00
fmtabbara	e7716ae852	remove gateway selection on delegation and undelegation pages	2021-11-03 15:50:36 +00:00
Jędrzej Stuczyński	b19528d47e	Removed gateway rewarding and delegation (#856 ) * Removed gateway rewarding and delegation * Removed redundant error variants * [ci skip] Generate TS types * Test fixes Co-authored-by: jstuczyn <jstuczyn@users.noreply.github.com>	2021-11-03 15:01:59 +00:00
Tommy Verrall	ef88ce9252	Merge pull request #871 from nymtech/bug-fix/keyboard-shortcuts-macos add native window items (copy/paste) via tauri	2021-11-03 14:24:00 +00:00
Bogdan-Ștefan Neacşu	488f1c7742	Remove stale migration code (#868 )	2021-11-03 16:01:13 +02:00
fmtabbara	63c698d903	add native menu items via tauri	2021-11-03 11:42:47 +00:00
Jędrzej Stuczyński	7e1c3b4501	Chore/cosmrs update (#862 ) * Re-enabled `get_tx` endpoint * Updated cosmrs to 0.3 and prost to 0.9 * [ci skip] Generate TS types Co-authored-by: jstuczyn <jstuczyn@users.noreply.github.com>	2021-11-03 11:03:18 +00:00
Jędrzej Stuczyński	e1d7772a78	Removed epoch rewarding variance (#857 )	2021-11-03 11:02:44 +00:00
Tommy Verrall	9db589e0b3	Merge pull request #842 from nymtech/bug-fix/success-overflow fix delegate success overflow	2021-11-03 10:33:31 +00:00
Tommy Verrall	57c8d69785	Merge branch 'develop' into bug-fix/success-overflow	2021-11-03 10:32:55 +00:00
fmtabbara	7aad7daa5e	fix overflow	2021-10-22 17:52:15 +01:00